[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.4+dfsg1-3-6-gf62b814
José Manuel Santamar?==?UTF-8?Q?ía Lema
panfaust at gmail.com
Tue Jan 22 02:42:29 UTC 2013
The following commit has been merged in the master branch:
commit d092ba8b1402745c730eb3c8c79af6b5789ba34d
Author: José Manuel SantamarÃa Lema <panfaust at gmail.com>
Date: Tue Jan 22 02:45:48 2013 +0100
Imported Upstream version 6.1.6+dfsg1
diff --git a/AUTHORS b/AUTHORS
index 5433cae..a250a0f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
#
-# $Id: AUTHORS,v 1.1.1.1 2006/04/11 17:56:09 source Exp $
+# $Id$
#
# List of Authors/Contributors
#
diff --git a/COPYING b/COPYING
index d60c31a..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/CREDITS b/CREDITS
index 5eff8e3..7561519 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,12 +1,12 @@
#
-# $Id: CREDITS,v 1.8.2.6 2010/02/03 15:08:59 source Exp $
+# $Id$
#
# CREDITS
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# Copyright (C) 1998-2012 OpenLink Software
#
Included Functionality
diff --git a/ChangeLog b/ChangeLog
index e516b4e..38c08ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8130 +1,17753 @@
-2011-10-28 23:28 source
+2012-08-01 VOS Maintainer <vos.admin at openlinksw.com>
- * Updated version to 6.1.4 for final release
+ * Fixed issue with Bison 2.6 code generation
-2011-10-28 23:22 source
+ * Updated Changelog
- * Enabled check for bad index due to XML fragment
+ * Updated NEWS
-2011-10-28 23:21 source
+ * Fixed files for distribution
- * Added information about upgrading from previous 6.1.x to 6.1.4
+2012-07-30 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-28 21:46 source
+ * Updated version number to 6.1.6 for final release
- * Fixed prototype
+ * Updated ChangeLog
-2011-10-28 21:41 source
+ * Updated NEWS
- * Fixed datetime fraction
+2012-07-27 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-28 21:10 source
+ * Fixed use http_value
- * Rebuild drivers
+ * Updated version to 6.1.6-rc3
-2011-10-28 16:09 source
+ * Merged conductor VAD
+ - Fixed priority flag
+ - Fixed ACLs
- * Fixed disable strict void var checking as /fct sometimes generates
- undefined vars
+ * Fixed wrong place for flags in argument list
-2011-10-28 16:00 source
+ * Fixed use webid verifier module
- * Added support for setting syslog facility
+2012-07-25 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-28 15:56 source
+ * Fixed bad acl file creation
- * Fixed call auth check only when needed
+ * Updated version of vad package
-2011-10-28 15:55 source
+ * Added missing user param
- * Fixed flags for ods
+ * Fixed use position to get correct entry
-2011-10-28 13:16 source
+2012-07-24 VOS Maintainer <vos.admin at openlinksw.com>
- * Added common function for testing extensions for rdfxml
+ * Updated version to 6.1.6-rc2
-2011-10-28 13:14 source
+ * Fixed resource name encoding problem
- * Fixed encoding issues
+ * Merged DET_S3.sql
+ - Fixed resource server side encryption problem
+ - Fixed file permissions (after file update)
-2011-10-26 15:38 source
+ * Merged cutter tool
+ - Added new -KP command-line option
+ - Added new -BE command-line option
+ - Fixed ISQL normalizations
+ - Fixed compiler warnings
- * 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
+ * Updated version numbers
-2011-10-26 15:22 source
+ * Fixed typos
- * Added AddThis share buttons
+ * Merged Briefcase VAD
+ - Added refresh function
+ - Fixed resource server side encryption problem
-2011-10-26 09:34 source
+ * Fixed role binding can be one to many
- * Fixed Compiled for line in usage
- * Fixed compiler warning
+ * Added loading for rdb2rdf vad
-2011-10-26 00:21 source
+ * Fixed initialize ot_rds
- * Updated documentation
+ * Fixed IN operator
+ Optimization by ssg_print_builtin_expre so that it does not complete
+ RDF boxes (for IRIs only at right side).
-2011-10-26 00:00 source
+ * Fixed disabled accounts can still be used in set_user_id
- * Fixed run check init on local
+ * Fixed small issues for VOS release
-2011-10-25 23:56 source
+ * Added initial support for rdb2rdf VAD
- * Fixed package uninstall
+2012-07-23 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-25 23:54 source
+ * Updated documentation
- * Added async rdf extraction
+ * Fixed file permission
-2011-10-25 23:36 source
+ * Fixed date format
- * Added opl:mentions and opl:NamedEntity class to OpenLink Attribution
+ * Added optimizations to JSON parser
-2011-10-25 23:31 source
+ * Added BIF get_plaintext_row
- * Added missing location support
+ * Fixed reset both pairs
-2011-10-25 23:28 source
+2012-07-20 VOS Maintainer <vos.admin at openlinksw.com>
- * Added finger print from twitter entry
- * Fixed minor issues
+ * Added debug code for sponger
-2011-10-25 23:25 source
+ * Merged ODS Framework VAD
+ - Added initial API documentation
+ - Fixed advanced acl settings for sparql or services auth
- * Added support for Google+ comments
+ * Merged ODS Calendar VAD
+ - Added initial API documentation
-2011-10-25 23:20 source
+ * Merged ODS Bookmark VAD
+ - Added initial API documentation
+ - Added support for WebDAV DET
- * 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 initial data for doxify
-2011-10-25 19:36 source
+ * Added initial data for doxify
- * Added new implementation of search_excerpt that can handle both
- ANSI/UTF8 and Wide strings
+ * Merged DBpedia VAD fixes
+ - Usse foaf:isPrimaryTopicOf for dbpedia 3.8 dataset
+ - Fixed use proper encoding for wikipedia link
-2011-10-25 10:54 source
+ * Fixed Base URI of DirectMapping R2RML into a configurable param
- * Fixed problems re-creating quad map
+ * Fixed permissions for ' -,acl' files
-2011-10-21 12:03 source
+ * Fixed indentation
- * Fixed drop stmt gr
+ * Fixed ETag calculation
-2011-10-21 11:53 source
+2012-07-19 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed bad conversion of utf8 in rdf/xml
+ * Fixed R2RML PK format
-2011-10-19 15:22 source
+2012-07-18 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed dtp check
+ * Added WebDAV DET folder type
-2011-10-19 15:18 source
+ * Fixed issue editing mounted resources
- * Fixed reset bitmap flag as previous insert might have set it to true
+ * Fixed COPYRIGHT to use current address of FSF
-2011-10-19 15:14 source
+ * Updated version to 6.1.6-rc1
- * Fixed missing cast
+ * Added openSUSE layout
-2011-10-18 12:45 source
+ * Fixed buffer overflow when using wide chars
- * 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
+ * Fixed potential buffer overwrite
-2011-10-18 12:41 source
+ * Fixed compiler warning
- * Fixed error adding inherited roles as they can overlap
+ * Fixed memset should use sizeof struct, not sizeof pointer to struct
-2011-10-18 09:15 source
+2012-07-17 VOS Maintainer <vos.admin at openlinksw.com>
- * Updated default settings file
+ * Merged Framework VAD
+ - Added advanced acl settings for sparql or services authentication
+ - Fixed ACL UI
+ - Fixed UTF-8 problem
-2011-10-17 15:50 source
+ * Merged Briefcase VAD
+ - Added ACL for IMAP DET folder
+ - Fixed problem with editing mounted sources
+ - Fixed host and port in IMAP server address
+ - Fixed ACL UI
+ - Fixed ' -,acl' files
- * Fixed issue building with Mono
+ * Fixed use absolute path to prevent looking for local part
-2011-10-17 14:06 source
+ * Added advanced ACL settings for sparql or services authentication
- * Fixed log info about row state
+ * Added webid protected endpoints template
-2011-10-17 09:55 source
+2012-07-16 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed labels
+ * Fixed indentation
-2011-10-17 09:48 source
+ * Fixed return HTML body
- * Fixed issue with SPASQL and ADONET3 named parameters
- * Fixed ADO.Net Provider failure retrieving RDF datetime literal values
- * Removed duplicate functions
+ * Merged S3 DET fixes
+ - Fixed ACL rules update
+ - Fixed property list function
+ - Fixed bad owner in some DET resources
+ - Fixed problem with editing mounted resources
-2011-10-14 17:02 source
+ * Fixed removed BOM
- * Fixed issue with rdfview generation
+ * Fixed http_ses_arg is supposed to return ws_session
-2011-10-14 12:54 source
+ * Added missing stringdate
- * Fixed if BeginTransaction is called with an Unspecified isolation
- level, use a default of ReadCommitted
+ * Fixed datetime conversion
-2011-10-14 12:47 source
+2012-07-12 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed recompile all qr's cached on cli connection when dropping
- a group or creating new graph group
+ * Removed test for @rel, @rev or @property from application/xhtml+xml
-2011-10-14 10:33 source
+2012-07-04 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed labels
+ * Merged Framework VAD
+ - Fixed remove session when acl is altered
+ - Fixed check if user exists
-2011-10-14 00:32 source
+ * Merged Briefcase VAD
+ - Fixed bad owner in some DET resources
+ - Fixed properties list function
+ - Updated S3 DET folder
- * Fixed missing Diagnostic
+ * Fixed ACL
-2011-10-13 22:14 source
+2012-07-03 VOS Maintainer <vos.admin at openlinksw.com>
- * Rebuild driver
+ * Added alias SSLPublicKey
-2011-10-13 22:07 source
+ * Added support for SSL Chain Certificates
- * Upgraded driver to Sesame 2.5.1
+ * Added error reporting if query compilation fails
-2011-10-13 18:36 source
+2012-07-02 VOS Maintainer <vos.admin at openlinksw.com>
- * 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
+ * Fixed XHTML+RDFa validation
-2011-10-13 18:33 source
+ * Added support for rel="nofollow" on external links
- * Added new tabs to Linked Data
- * Added PSH tabs
- * Fixed labels and texts
+2012-06-30 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 18:32 source
+ * Added support for new S3
- * Fixed issue displayong characters in isql.vspx
+2012-06-29 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 18:29 source
+ * Fixed GPF on TTLP with flag 4096 and named bnodes
- * Fixed uninitialized var
+ * Merged ODS Framework VAD
+ - Update xml creation function
+ - Fixed ACLs
+ - Fixed bad cast
+ - Fixed typos
-2011-10-13 18:28 source
+ * Fixed datatypes and missing return types from functions
- * 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
+ * Fixed datatypes and missing return types from functions
-2011-10-13 17:08 source
+ * Fixed typo in label
- * 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
+ * Fixed datatype
-2011-10-13 16:52 source
+2012-06-27 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed copyright year to 2011
+ * Fixed run authentication function as dba
-2011-10-13 16:50 source
+ * Fixed ACL
- * Fixed buggy comparison when installing VAD packages
+ * Added missing check for theads or locks
-2011-10-13 16:48 source
+ * Added deadlock handler
- * Added stats for time waiting on a mutex
+2012-06-26 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 16:29 source
+ * Fixed issues loading microdata with namespace decls
- * Removed duplicate stored procedures
+2012-06-25 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 14:39 source
+ * Fixed missing txn mtx when resetting flag
- * Fixed use openssl md5 where available
+ * Fixed compiler issue
-2011-10-13 14:24 source
+ * Added support for nested relative xml:base-s
- * Fixed check for min async queue size
+ * Merged briefcase VAD
+ - Added default values for cartridges
+ - Fixed 'Box Net' typo
+ - Fixed folder typo
+ - Fixed SkyDrive authentication button name
+ - Fixed resource uploade
+ - Fixed issues with Box DET
-2011-10-13 14:21 source
+2012-06-23 VOS Maintainer <vos.admin at openlinksw.com>
- * Added new setting RdfFreeTextRulesSize
+ * Added support for maintaining SSL Chain certificates
-2011-10-13 14:08 source
+ * Added support for exporting keys
- * Fixed execute on all partitions at same time
+2012-06-22 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 14:06 source
+ * Added support for loading extra SSL Chain certificates
- * Fixed undefined Inference rule error when rule created from graph
- created from SPARUL insert statement
- * Fixed issue loading inf rules on cluster
+ * Fixed flag must be set inside txn mutex
-2011-10-13 14:00 source
+2012-06-21 VOS Maintainer <vos.admin at openlinksw.com>
- * Added support to sql_bif_excerpt for using wide string
+ * Added http_limited() function
+ This restricts certain slow pages from claiming all threads
-2011-10-13 13:59 source
+ * Added support for protocol switching e.g. using websockets
- * Fixed memleak
+2012-06-20 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 13:58 source
+ * Merged Framework VAD
+ - Added access page and API keys for Box
+ - Added Help links
+ - Added expiration check box
+ - Added support for private graphs
+ - Fixed deadlock handler
+ - Fixed inst list
+ - Fixed input pars
+ - Removed debug info
- * Fixed issue with fulltext indexing
+ * Merged Briefcase VAD
+ - Added support for Box
+ - Added box.net folder definition
+ - Added support for private graphs
+ - Fixed permission problem for some DETs
-2011-10-13 13:56 source
+ * Fixed missing grant
- * Fixed issue with bif:contains
+ * Added support for Skydrive and Box DET
-2011-10-13 13:54 source
+2012-06-19 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed deadlock on attempt of qr_recompile during the run of
- SPARQL-to_SQL front-end
+ * Fixed do not signal eror when dummy cartridge is installed
-2011-10-13 13:28 source
+ * Fixed compare rdfbox with IN values using box value
- * Fixed http recording
+ * Fixed handling of literals with language tag
+ Literals with language are now generated as RDF boxes even for SQL
+ valmode
-2011-10-13 13:27 source
+ * Added initial support for SPARQL 1.1 BINDINGS clause
- * Fixed crash when array is bad
+2012-06-18 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 13:26 source
+ * Added RDFa and MTML+Microdata autodetection
- * Fixed function name in argument
+ * Merged tutorial VAD
+ - Added note for sparql-ssl endpoint
+ - Fixed regex expression
+ - Fixed RDF DET is in server
+ - Fixed make clean
-2011-10-13 13:11 source
+ * Added encoding field
- * Fixed SSL verification context
+ * Added sponger ACL
-2011-10-13 13:00 source
+2012-06-17 VOS Maintainer <vos.admin at openlinksw.com>
- * Added inproved support for inference and RDF views to "non-default"
- storages
- * Added option to register pos-processing callbacks to DESCRIBE
+ * Fixed issue with regexp_replace
-2011-10-13 12:54 source
+ * Fixed check len before calling second memcpy
- * Added new BIF functions for handling dictionaries of triples
+ * Fixed compiler warnings
-2011-10-13 12:15 source
+ * Fixed valgrind warnings
- * Added iri range size setting
+2012-06-15 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 12:14 source
+ * Fixed check Pls for non-empty string value
- * Added new "mode" flag to TURTLE parser, so it adds source line
- numbers (and source text labels) to blank nodes of the parsed
- document
+ * Fixed memory access after free
-2011-10-13 12:12 source
+ * Fixed memory leak
- * Fixed check for DAV
+ * Fixed mime for images
-2011-10-13 11:09 source
+ * Updated images
- * Added dbs id hash to log
+2012-06-14 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 11:05 source
+ * Fixed memory leak
- * Fixed compiler warning
+2012-06-13 VOS Maintainer <vos.admin at openlinksw.com>
-2011-10-13 11:04 source
+ * Use long iris by default
- * Fixed private key protection
+ * Fixed check len before calling memcpy
-2011-10-13 11:03 source
+ * Fixed typo
- * Fixed checks
+ * Added support for per datasource default refresh interval
-2011-10-13 11:03 source
+ * Fixed check key col is used in sampling before guessing about it
- * Fixed inlist to mean equality, not a lt of the one_of_these call
- comparison
+ * Fixed memory leak
-2011-10-13 11:01 source
+ * Merge remote-tracking branch 'origin/develop/6' into develop/6
- * Fixed label
+ * Merged iSPARQL vad
+ - Added control for raw URIs in sparql result set view
+ - Added persistence in permalinks
-2011-10-13 11:00 source
+2012-06-07 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed use cartridge if such is defined
+ * Updated documentation
-2011-10-13 10:59 source
+ * Updated images
- * Fixed moved assignment before loop, as sqlerror can lead to a
- double free
+ * Remember options on /sparql endpoints upon recreation
-2011-10-13 10:58 source
+ * Added support for tab-separated-values (TSV) format in sparql
- * Fixed issue with foreignkey handling inside rdfview
+ * Added backtrace in assert
-2011-09-28 17:04 source
+2012-06-06 VOS Maintainer <vos.admin at openlinksw.com>
- * Rewrite HTML generation for /sparql endpoint
+ * Fixed portability issue on freebsd
-2011-09-28 17:01 source
+ * Fixed issue with make clean on freebsd
- * Added new function virtuoso_ini_item_value which can read settings
- from the virtuoso.ini, without having to open/parse it for every
- request
+2012-06-05 VOS Maintainer <vos.admin at openlinksw.com>
-2011-09-27 09:42 source
+ * Added support for text/turtle
- * 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
+ * Added support for more patterns
-2011-09-27 09:40 source
+ * Merged Framework VAD
+ - Added support for SkyDrive
+ - Added JSON output option for certgen
+ - Updated Google API access
- * Fixed do not cache samples indefinitely
+ * Merged Briefcase VAD
+ - Added support for SkyDrive
+ - Added mail notification for webid sharing
+ - Fixed file name encoding
+ - Fixed sponge feature
+ - Fixed download problem
-2011-09-23 19:22 source
+ * Merged dbpedia vad
+ - Fixed check if modified
+ - Fixed reset timezone
- * 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
+ * Fixed if scalar is rdf_box, print as string
-2011-09-23 19:12 source
+ * Fixed free path at the end of processing the request
- * Added extra mime types to accept header
+ * Added generation of url rewrite rules
-2011-09-23 15:20 source
+ * Added expiration_function to http options map
- * Fixed overflow in bif_date_diff
+ * Fixed json-ld encoding
-2011-09-21 15:23 source
+ * Fixed string type support
- * FIxed do not make UNAMEs in SQL texts immortal
+2012-06-02 VOS Maintainer <vos.admin at openlinksw.com>
-2011-09-21 15:22 source
+ * Fixed skip _IDN cols
- * Fixed must save IN list as it will be reset to 0 inside
+ * Added support for rdf import of gzipped content
-2011-09-21 13:27 source
+ * Merged dbpedia vad
+ - Added support for If-Modified-Since
+ - Added registry setting dbp_last_modification to get SP returning last
+ modified date
+ - Fixed use owl graph for properties
- * Fixed use len of the N leading chars represented as UTF8
+2012-06-01 VOS Maintainer <vos.admin at openlinksw.com>
-2011-09-21 13:23 source
+ * Removed temp files
- * Added support for DV_BIN
+ * Small cleanups
-2011-09-20 12:03 source
+2012-05-30 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed issues detecting images
+ * Fixed issue with gdrive/dropbox
-2011-09-20 11:58 source
+ * Fixed issue with cyclic references
- * Fixed handling of sparql endpoint in Pivot permalink generation
+ * Added new predicates to load as JSO triples
-2011-09-19 13:37 source
+ * Improved error diagnostics for ALTER QUAD STORAGE <> { DROP }
- * Fixed do not check byte-order on crash recovery replay
+ * Fixed ignore _IDN columns
-2011-09-15 16:02 source
+ * Fixed recursion limit in order to save runing out of stackspace
- * Updated version to 6.1.4-rc1
+ * Add xml comment around ill-formed property xml elements
-2011-09-15 10:42 source
+ * Fixed ODBC driver
+ - Fixed clear errors on connection handle
+ - Fixed use provided password from connect handle
+ - Fixed debug statements
- * Fixed mem leaks
+ * Added aliases for ssl key/cert
-2011-09-14 19:06 source
+ * Fixed access rights and status for SPARUL_LOAD_SERVICE_DATA
- * Fixed uninitialized variable
+ * Fixed grants for SPARQL LOAD SERVICE <...> DATA
-2011-09-14 15:38 source
+ * Fixed service SPARQL codegen with zero retvals
- * Fixed memory leaks
+ * Added procedure view for SPARQL BINDINDS
-2011-09-14 15:38 source
+ * Merged SPARQL fixes
+ - Added support for self-description
+ - Fixed SPARQL LOAD SERVICE <...> DATA
- * Fixed valgrind warning when using DEBUG
+ * Merged SPARQL fixes
+ - Added support for BINDINGS
+ - Fixed support for SERVICE
+ (with new SPARQL LOAD SERVICE <...> DATA statement)
-2011-09-13 14:50 source
+2012-05-23 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed memory leaks
+ * Added option to download ca key
-2011-09-12 21:05 source
+ * Fixed jump to individual grants if user is edited
- * Fixed GPF on optimization of DELETE/INSERT/MODIFY due to lists
- of known vars that were not deALIASed properly
+ * Merged Briefcase VAD
+ - Added ACL for GDrive and Dropbox
+ - Added Dropbox DET
-2011-09-12 20:08 source
+2012-05-21 VOS Maintainer <vos.admin at openlinksw.com>
- * Added log when built-in procedure has duplicate in the db
+ * Fixed missing end of LSB comment
-2011-09-12 20:04 source
+ * Fixed copy col opts else tables with xml cols cannot be altered
- * Fixed removed duplicate procedures
+ * Fixed code should come after declarations
-2011-09-12 20:01 source
+ * Added Dropbox API keys
- * Fixed crash
+ * Added new function bif_jso_triples_del
-2011-09-12 12:30 source
+ * Fixed compiler warnings
- * Fixed mime type of JSON-ld to application/ld+json
+ * Fixes for date
+ - Adding days to date results in date
+ - Adding seconds to date results in datetime
+ - Fixed debugging
-2011-09-12 11:02 source
+ * Added virtrdf:dialect static uname
- * Updated documentation
+ * Added new mime type application/n-triples
-2011-09-12 10:52 source
+ * Fixed compiler warnings
- * 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
+ * Changed NULL is treated like 0 element array for bif_get_keyword
-2011-09-12 10:47 source
+ * Fixed compiler warning
- * Added initial support for PHP 5.3
+ * Added new BIF functions
-2011-09-12 10:36 source
+ * Fixed compiler warnings
- * Fixed indentation
+ * Added better MALLOC_DEBUG handling of box_iri_id
-2011-09-12 10:28 source
+ * Added new function hash_list_keys
- * Fixed use shorter names
+ * Added new aliases
-2011-09-12 10:21 source
+2012-05-16 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed WebID demo pages
+ * Fixed disble repl user login via odbc or dav
-2011-09-09 14:09 source
+ * Fixed datatype should be iri_id8
- * Updated documentation
+2012-05-14 VOS Maintainer <vos.admin at openlinksw.com>
-2011-09-09 13:30 source
+ * Added support for Google Drive
- * Fixed warning about uninitialized data
+ * Fixed typo in ACL filters
-2011-09-09 13:21 source
+ * Fixed small issue in testsuite
- * Added option for explicit graph
- * Fixed SyncML Folder Types in drop-down list
- * Fixed labels
+ * Added option to wait for last request in an aq first
-2011-09-09 13:20 source
+2012-05-13 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed do not remove trailing cr/lf
+ * Fixed compiler issue on Solaris
-2011-09-09 13:19 source
+2012-05-11 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed issue when dirname is a blob
+ * Fixed text index is not possible on views at this time
-2011-09-09 13:12 source
+ * Added function RDFA_LOAD_DICT
- * 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
+ * Fixed bug in regeneration of permalink when RDFMini view changed
-2011-09-09 13:11 source
+ * Merged fixes to MAP code
+ - Upgraded MAP support for latest OpenLayers/OpenStreetmap
+ - Disabled dysfunctional NASA blue marble tiles
- * Added support for switchable favicon to Sponger front page
+ * Upgraded to OpenLayers v2.12-rc2
-2011-09-09 12:51 source
+ * Fixed typo
- * Fixed issues with linked data upload
+ * Fixed graph name to /DAV/
-2011-09-09 11:16 source
+ * Fixed removed missing define
- * Added HTTP status codes in SPARQL graph store protocol
+ * Merged SPARQL fixes
+ - Added propagation of LIMIT restrictions
+ - Fixed issues with SERVICE
+ - Fixed issues with UNIONs
-2011-09-09 11:13 source
+ * Added support for Sparql Service Description
- * Fixed issue with SPARUL LOAD INTO command creating duplicate graphs
+ * Merged Briefcase fixes
+ - Added support for Google Drive
-2011-09-09 00:10 source
+ * Fixed check lang box
- * Fixed issue when pragma list was empty
- * Fixed issues generating Pivot Permalink
- * Fixed whitespace and stray > char from Raw formats line
+ * Fixed issue with semaphores on Mac OS X 10.7
+ When signalled, make sure we do not miss another signal, as signals
+ on a condvar w/o wating thread is a NOOP
-2011-09-08 18:54 source
+ * Fixed det resources for google drive
- * Fixed handling of GROUP BY and ORDER BY using expressions
+ * Fixed formatting
-2011-09-08 15:29 source
+2012-05-10 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed re-definition of a quad map that is a single user of a quad
- map format
+ * Merged Framework fixes
+ - Added Google API
+ - Fixed Resource /dataspace/doc/services/user not found error
+ - Fixed interop
+ - Fixed annotation bug - not unique primary key
-2011-09-08 15:28 source
+ * Merged Calendar fixes
+ - Fixed WebID write access
+ - Fixed redirect
- * Fixed codegeneration issue with awk 4.0
+ * Merged Briefcase fixes
+ - Added Google Drive DET folder type create
-2011-09-08 12:51 source
+ * Merged Addressbook fixes
+ - Fixed redirect
- * Fixed UI for sponger options
+ * Added support for CORS in web services
-2011-09-08 12:19 source
+ * Added missing prototypes
- * Fixed issue with sparql LOAD from file
+ * Fixed compiler warning and small code cleanup
-2011-09-07 22:44 source
+2012-05-04 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed crash running FILTER query containing IN clause with only
- one item in it
- * Fixed issue with ORDER BY expression optimization
+ * Merged iSPARQL fixes
+ - Added alternate links in HEAD
+ - Added support to remember rdf display/tab
-2011-09-05 15:27 source
+ * Added support to remember previous tab
- * 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
+ * Fixed do not use DBA as soap user as it takes ages to recompile PL
-2011-09-05 15:26 source
+ * Added files to ignore
- * Added support for replacing existing content on OAT.Notify.send
+ * Added extra checks for db slices
-2011-08-30 15:02 source
+ * Added dsn name to explain output
- * Fixed issue with code generation using gawk 4
+ * Fixed set pn_query to nil to avoid using free mem
-2011-08-29 10:37 source
+2012-05-03 VOS Maintainer <vos.admin at openlinksw.com>
- * 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
+ * Updated version of facet browser
-2011-08-29 10:27 source
+ * Added graph to qrcode
- * 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
+ * Updated version of conductor
-2011-08-29 10:23 source
+ * Remove old view before creating newer one
- * Added support for oplzilw:latitude and longitude
- * Fixed rdftabs notification to use PUSHBAR
- * Fixed problem in geo coordinates detection
+2012-05-02 VOS Maintainer <vos.admin at openlinksw.com>
-2011-08-29 10:22 source
+ * Fixed issue with incomplete box
- * Added new option to rdfmini to facilitate placing of view control
- outside its container
+ * Fixed version number
-2011-08-29 10:21 source
+ * Added macro t_revlist_to_array_or_null
- * Added new notification widget types PUSHBAR and BAR
- * Added target class for notify content for skinning
+ * Fixed escape chars in CSV output
-2011-08-29 10:19 source
+2012-05-01 VOS Maintainer <vos.admin at openlinksw.com>
- * Added support for HEAD requests in AJAX
+ * Fixed use internal call to set proper user for exec
-2011-08-29 10:18 source
+2012-04-27 VOS Maintainer <vos.admin at openlinksw.com>
- * Added limit to number of open statements
+ * Removed rdf det as it is already embedded in server itself
-2011-08-26 19:34 source
+ * Added missing account in check
- * Fixed if we have a wide string and want typed string we cast to utf-8
+ * Added mp_set_nreverse and t_set_nreverse
-2011-08-26 18:04 source
+ * Fixed multi-column transitivity
- * Fixed /sparql/ endpoint to produce more accurate diagnostics for
- failed INSERT DATA statements
+ * Fixed re-use of "similar" constants of different types
-2011-08-26 18:03 source
+2012-04-26 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed timeout should be specified in miliseconds according to docs
+ * Fixed check for MAC_OS_X_VERSION_10_7
-2011-08-26 17:59 source
+ * Fixed typo
- * Added limit to number of open statements
+ * Fixed graph level security
-2011-08-26 17:57 source
+ * Added indication to log when backup is done
- * Added mem debug support for sqlp_box_id_upcase
+2012-04-25 VOS Maintainer <vos.admin at openlinksw.com>
-2011-08-26 17:55 source
+ * Added printing of soap struct tags
- * Fixed memory leak
+2012-04-24 VOS Maintainer <vos.admin at openlinksw.com>
-2011-08-26 10:58 source
+ * Fixed use proper semping rest endpoint
- * Fixed crash when un-expected array is passed as argument
+ * Updated IMAP DET options and actions
-2011-08-26 10:57 source
+ * Fixed negation to use SPARQL 1.1 FILTER NOT EXISTS
- * Fixed loading member functions of UDT that refer to XML namespace
- declarations and other items loaded after the loading of the UTD
- declaration
+ * Fixed clear variables after report
-2011-08-26 10:54 source
+ * Added support for FROM SUBQUERY { .. } in quad map
- * Fixed issue with trim('test', null)
+ * Added support for subqueries inside QUAP MAP { .. } groups
-2011-08-21 12:54 source
+ * Fixed issue with _UDBC_ always set
- * 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-04-20 VOS Maintainer <vos.admin at openlinksw.com>
-2011-08-21 12:52 source
+ * Added support for new name for cartridges vad
- * Fixed display of RDF store stats
+ * Fixed error reporting
-2011-08-21 12:51 source
+ * Fixed if no one is verified to match, return NULL
- * Fixed set default anchorMode back to 0
+ * Updated CKeditor to version 3.6.3
-2011-08-21 12:50 source
+ * Fixed popup forms UI
- * Fixed footer background
+2012-04-19 VOS Maintainer <vos.admin at openlinksw.com>
-2011-08-21 12:50 source
+ * Updated version
- * 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
+ * Fixed labels
-2011-08-21 12:34 source
+ * Added check for policy_manager vad
- * Rebuild drivers
+ * Merged Polls fixes
+ - Added ACL filters
+ - Fixed IE UI
+ - Fixed icons
-2011-08-21 12:33 source
+ * Merged Framework fixes
+ - Added ACL filters
+ - Moved common functions to framework
+ - Fixed front page
+ - Fixed rest interface page
+ - Fixed semping protocol
- * Removed deprecated functions and files
+ * Merged Feedmanager fixes
+ - Added ACL filters
+ - Fixed icons
-2011-08-18 09:16 source
+ * Merged Calendar fixes
+ - Added ACL filters
+ - Fixed daylight savings time on import to calendar
+ - Fixed issue with IE UI
+ - Fixed minor issue with CalDav
+ - Fixed icons
- * Fixed connection leak in connection pool during long checkpoints
+ * Merged Briefcase fixes
+ - Added ACL filters
+ - Fixed icons
-2011-08-17 17:46 source
+ * Merged Bookmark fixes
+ - Added ACL filters
+ - Fixed icons
- * Fixed memory leak in statement when using connectionpooling
+ * Merged Addressbook fixes
+ - Added ACL filters
+ - Fixed minor problem with CardDav
+ - Fixed icons
-2011-08-17 17:36 source
+ * Fixed r2rml
+ - Fixed error handling
+ - Fixed syntax
+ - Fixed validation to report errors with line numbers
+ - Fixed import of R2RML turtle files to provide debugging
+ information about blank nodes
- * Rebuild drivers
+ * Added references view mode
-2011-08-17 17:20 source
+ * Fixed VAD checks
+ - Added proper check for vad versions
+ - Fixed show r2rml tab only when rdb2rdf vad is installed
- * Rebuild driver
+ * Disable repl user
-2011-08-17 17:20 source
+ * Fixed rdf repl security
- * Updated hibernate support to work with Hibernate 3.6.6-Final
+ * Fixed issue compiling with malloc debug
-2011-08-15 15:30 source
+ * Added format for MSACCESS with special column types
- * Fixed bad merge
+2012-04-18 VOS Maintainer <vos.admin at openlinksw.com>
-2011-08-14 14:48 source
+ * Fixed swapped pk and fk column
- * Fixed check for NULL IRI before printing
+ * Fixed error message
-2011-08-09 11:19 source
+ * Rebuild driver for Sesame version 2.6.5
- * Fixed indentation and whitespace
+ * Fixed do not search in rdf views when checking for graphs
-2011-08-09 11:17 source
+ * Upgraded driver to use Sesame 2.5.6
- * Fixed missing namespave declarations
+ * Updated vad version
-2011-08-09 11:11 source
+ * Merged FCT fixes
+ - Added NOT IN conditional
+ - Fixed problem in conditional literals with LANG
- * Fixed minor issue
+ * Changed Graph column label
-2011-08-09 10:58 source
+ * Added start new facet option in description of classes
- * Added SimpleGeo cartridge
- * Added Eventful cartridge
- * Fixed use standard properties for Latitude and Longitude
- * Fixed use /about to sponge URL
+ * Fixed debug code
-2011-08-03 11:36 source
+ * Fixed link for dset
- * Added show photo in WebID login/registrer
- * Fixed typo in messages
- * Fixed facebook accounts
+ * Fixed link for dset
-2011-08-03 11:34 source
+ * Added Graph column to the output of text matches
- * Added missing files
+ * Fixed problem counting ancestry with nested property, etc. pred.
-2011-08-01 14:19 source
+ * Fixed check for vector
- * 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
+ * Added making class contraint
+ - When ?S is rdfs:Class or owl:Class, or <something> a ?S
-2011-08-01 14:17 source
+2012-04-17 VOS Maintainer <vos.admin at openlinksw.com>
- * Added check for XML
- * Fixed update must do delta and remove all entries which are not
- from this source
+ * Fixed rdf replication security
-2011-08-01 14:15 source
+ * Fixed issue mixing declarations and code
- * Fixed SIOC data
+ * Added support for SOUNDEX and DIFFERENCE
-2011-08-01 14:13 source
+2012-04-16 VOS Maintainer <vos.admin at openlinksw.com>
- * Updated CKeditor to version 3.6.1
+ * Added cfg_parse_size_with_modifier to parse stripe size
-2011-08-01 14:12 source
+ * Added advanced ACL filters
- * Added RDF links in header and head
+ * Added X -options of foaf response
-2011-08-01 14:12 source
+ * Fixed digest split function
- * FIxed Delicious publish
+ * Fixed issue with 'Edit Properties'
-2011-08-01 14:09 source
+ * Fixed image path to /ods
- * Fixed undefined function
+ * Removed deprecated images
-2011-08-01 14:08 source
+2012-04-12 VOS Maintainer <vos.admin at openlinksw.com>
- * 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
+ * Fixed st_cli_n_http_threads should be int32
-2011-08-01 14:05 source
+ * Fixed issue with unknown BIF msg in SPARQL compiler error
- * Added ACL eXecute flag
- * Fixed ACl issue with editing .acl file
- * Fixed API functions
+ * Fixed issue with content type if already set by rewrite rule
-2011-08-01 14:04 source
+2012-04-10 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed encryption and signing
- * Fixed security properties
- * Fixed mail parameters
+ * Added meetup pattern
-2011-08-01 13:18 source
+ * Fixed indentation
- * Fixed throw away old content before starting execute
+ * Fixed internal error on spar_selid_pop()
-2011-07-29 10:04 source
+ * Merged Framework fixes
+ - Added link tags to user's pages
+ - Fixed private graphs init
+ - Fixed 'Enable Automatic WebID Login' value
+ - Fixed format arg
+ - Fixed void dset
+ - Fixed clean bad application creation
- * Fixed debug code
+ * Merged Calendar fixes
+ - Added CalDAV import
+ - Fixed source labels in imports
+ - Fixed CalDAV DET imports
+ - Updated CalDAV Import
-2011-07-29 10:03 source
+ * Merged Addressbook fixes
+ - Fixed CardDAV DET imports
+ - Added CalDAV Import
- * Fixed must redirect on OPTIONS
+2012-04-09 VOS Maintainer <vos.admin at openlinksw.com>
-2011-07-29 10:03 source
+ * Fixed issue with xsd:dateTime in SPARQL results
- * Fixed calculate lenght before inserting the row
+2012-04-08 VOS Maintainer <vos.admin at openlinksw.com>
-2011-07-29 10:00 source
+ * Fixed issue with join on Solaris
- * Fixed unnamed GPF
+ * Added extra debugging code to SPARQL engine
-2011-07-20 15:56 source
+2012-04-06 VOS Maintainer <vos.admin at openlinksw.com>
- * Added check for %nn
+ * FIxed issue with box_length
-2011-07-20 09:50 source
+ * Fixed issue with graph level security check in SPARQL-FED subquery
- * Added Idp
- * Added Domain check
- * Added WebID
+ * Fixed check for MS SQL Server
-2011-07-20 08:58 source
+2012-04-05 VOS Maintainer <vos.admin at openlinksw.com>
- * Added Hyperpublic cartridge
+ * Fixed keep ssl flag when https redir to https
-2011-07-20 08:56 source
+ * Fixed file not found error when virtuoso.ini changed
- * Added configuration option for page title
+2012-04-03 VOS Maintainer <vos.admin at openlinksw.com>
-2011-07-20 08:51 source
+ * Added virtuoso.ini setting to configure page compress mode
- * Added webid_check option to control execution flag
+ * Fixed syntax metadata backups of TTL format
-2011-07-20 08:51 source
+ * Fixed possible stack overflow on long UNIONs
- * Fixed problems with big tokens
+ * Fixed get string instead of iri_id on cluster
-2011-07-20 08:29 source
+ * Fixed issue with transitive query
- * Added support for dumping v5 in v6 log format
+ * Fixed GPF on DBpedia query
+ select distinct ?ci fn:lang(?la)
+ where {
+ ?si dbpedia-owl:country dbpedia:Germany.
+ } limit 10
-2011-07-20 00:01 source
+ * Fixed safe cloning of equivalence classes
- * Reverted merge from wrong branch
+ * Fixed issues with RDF View, bif:contains and option(?score)
-2011-07-19 23:58 source
+ * Fixed allocation of nodes during tree duplication
- * Fixed DV_RDF serialization
+ * Fixed compiler warnings
-2011-07-19 23:43 source
+2012-03-31 VOS Maintainer <vos.admin at openlinksw.com>
- * Fixed small issue for single engine
+ * Merged Calendar fixes
+ - Added CalDAV import
+ - Added CalDAV, CardDAV DETs and RESTful CRUD
+ - Fixed CalDAV to Subscription options
-2011-07-19 23:40 source
+ * Merged Framework fixes
+ - Added foreign key for certificates table
+ - Added html rule for /mv/data
+ - Fixed bad certificate related info
- * 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-29 VOS Maintainer <vos.admin at openlinksw.com>
-2011-07-19 23:38 source
+ * Added support for slash proxy IRIs
- * Added support to call XPath/XQuery functions in SPARQL
- * Added bif functions xpath_funcall and xpath_apply
+ * Fixed iframes and scripts
-2011-07-19 23:34 source
+ * Added check if mail actually exists
- * Fixed moved macros isdatechar, isfloatchar and inplainURIchar
+ * Fixed check for null
-2011-07-19 23:33 source
+ * Exclude certain sites from iframe
- * Added option 'exec_as_get' to http map
- * Added support for SPARQL Graph CRUD
+ * Removed debug statements
-2011-07-19 23:30 source
+ * Added Wolfram|Alpha cartridge
- * Added function isfinitenumeric()
+ * Added support for sponging of ftp urls
-2011-07-19 23:30 source
+ * Fixed using fix_identified_case
- * Fixed memleak
+ * Fixed minor issues
-2011-07-19 23:29 source
+ * Fixed LinkedIn cartridge
+ - Added support for sponging job postings and company profiles
+ - Added accept_lang option to override locale sensitive
+ output in job postings
- * Fixed compiler warnings
+ * Fixed version control properties
-2011-07-19 23:27 source
+ * Merged Framework fixes
+ - Added di: scheme
+ - Added check for WebID validation
+ - Fixed quotes on sparql vars
- * Added optimized codegen for built-in aggregate functions
+ * Fixed CalDAV, CardDAV DETs and RESTful CRUD
-2011-07-19 23:26 source
+ * Added di: scheme
- * Fixed DV_RDF serializationo
- * Added upgrade procedure for RDF_QUAD
+ * Fixed CalDAV, CardDAV DETs and RESTful CRUD
-2011-07-19 19:36 source
+ * Fixed digest mode should not report it accepts basic
- * 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
+ * Fixed issue joining two federated queries to the same host
-2011-07-19 19:27 source
+ * Fixed debug print of wide strings
- * Fixed bug in endpoint setting persistence
- * Fixed visibility of pager in navigator
- * Improved recovery from some proxy-AJAX-related errors
+2012-03-27 VOS Maintainer <vos.admin at openlinksw.com>
-2011-07-19 19:25 source
+ * Added REPORT method
- * Changed handling of anchors in map bubbles
+ * Fixed issue with SPARQL-FED code generation
-2011-07-15 11:17 source
+ * Added support for INF, -INF and NaN in SPARQL
- * Added missing opl:provided by property
+2012-03-23 VOS Maintainer <vos.admin at openlinksw.com>
-2011-07-15 11:16 source
+ * Set version to 6.1.6-dev to indicate development cycle
- * Added option to set site logo in banner text
- * Added new serialization format examples
+ * Use .gitignore instead of .cvsignore
-2011-07-15 11:15 source
+ * Added check to prevent out of range seek
- * Added Seevl cartridge
- * Added Guardian cartridge
+ * Fixed initialization issue
-2011-07-15 11:15 source
+ * Added support for long nvarchar
- * Fixed minor issue
+ * Fixed check to see if stmt returned a resultset
-2011-07-15 11:07 source
+ * Fixed DDL logging
- * Added new export formats
+ * Fixed missing unbox else check is always true
-2011-07-15 11:06 source
+ * Fixed wrong pointer indirection calling itc_bust_this_trx
- * Added generation of CV from LinkedIn using the oplcv ontology
+ * Fixed number of issues with _UDBC_
+ - Fixed issue with transitive subqueries
+ - Fixed external vars in table subqueries of scalar subqueries
+ - Fixed print of builtin expressions with multipart alias name
+ - Fixed issue with double "AS" for lang in resultset
+ - Fixed bad code for clear graph <xxxx>
-2011-07-15 11:02 source
+ * Fixed issue with RDF_DICT_OF_TRIPLES_TO_THREE_COLS
- * Added OpenLink CV/Resume ontology
+ * Fixed escaping of weird IRIs in RDF/XML output
-2011-07-14 19:14 source
+ * Fixed some checks of XPATH from MALLOC_DEBUG to XTREE_DEBUG
- * Fixed use the actual length of the string in cli_utf82narrow not max len
+ * Fixed moved some checks of XPATH from DEBUG to XPATH_DEBUG
-2011-07-13 19:09 source
+ * Fixed use of dt encapsulation
- * Added check for cert
+2012-03-15 17:16 source
-2011-07-12 14:46 source
+ * Updated version to 6.1.5 for final release
- * Fixed extra debugging
+2012-03-15 16:41 source
-2011-07-08 13:44 source
+ * Fixed labels
- * Merged first part of V7
+2012-03-15 16:41 source
-2011-07-05 21:09 source
+ * Fixed minor issues to xbrl
- * Fixed GPF as stmt not available at this point
+2012-03-15 16:35 source
-2011-07-04 09:59 source
+ * Fixed minor issues
- * Fixed XML escape data
- * Fixed issues with mail addresses and encrypted mails
+2012-03-15 14:44 source
-2011-07-04 09:57 source
+ * Fixed column name back to __ask_retval for odbc/jdbc connections
- * Added header and head links for IRIs
+2012-03-15 13:57 source
-2011-07-04 09:56 source
+ * Moved define to more logical place
- * 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-15 13:41 source
-2011-07-04 09:54 source
+ * Fixed set default catalog name to %
- * 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-15 13:06 source
-2011-07-04 09:33 source
+ * Fixed enabled tests to run on jdk4
- * Added loading NS prefixes into IRIDB through virtuoso defaults page
+2012-03-15 12:56 source
-2011-06-29 10:10 source
+ * Removed old _JAVA_ pragma
- * Fixed cannot perform file_stat as it runs on a different node
+2012-03-15 12:00 source
-2011-06-27 19:45 source
+ * Fixed unhandled rdf type
- * Added nsprefix and rulelist pages
+2012-03-15 11:48 source
-2011-06-27 11:24 source
+ * Rebuild drivers
- * Fixed do not perform keyset update on non pk ref
+2012-03-15 11:17 source
-2011-06-24 19:05 source
+ * Fixed leak with statement handles
- * Added initial support for HTML+Microformat, Microformat/JSON and
- JSON-LD output formats
+2012-03-15 11:08 source
-2011-06-24 11:25 source
+ * Added stub isgeometry so point data can be inserted normally
- * Added result type detection
- * Fixed SVG capability detection
+2012-03-15 10:32 source
-2011-06-24 11:25 source
+ * Fixed check for odbc/jdbc connection
- * Fixed .isparql serialization in FF4 and IE9
+2012-03-14 20:46 source
-2011-06-24 11:24 source
+ * Added missing files to distribution
- * Fixed JSON output for native parsers
+2012-03-14 19:47 source
-2011-06-24 11:22 source
+ * Fixed meta information on ANY type
- * 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-14 14:12 source
-2011-06-24 11:20 source
+ * Updated documentation
- * Fixed MSIE detection in opacity anim
+2012-03-14 14:07 source
-2011-06-24 11:20 source
+ * Fixed allow http client session to be put on hold and leave thread free
- * Fixed handling of decoding url values with + instead of spaces
+2012-03-14 13:59 source
-2011-06-22 13:30 source
+ * Updated version to 6.1.5-rc3
- * Fixed no not crash when key is empty
+2012-03-14 13:58 source
-2011-06-22 13:29 source
+ * Updated SSL support
- * Fixed check for NULL pred
+2012-03-14 12:50 source
-2011-06-21 18:11 source
+ * Fixed compiler warning
- * Fixed make sure all required dfe are placed before making a decision
+2012-03-14 12:46 source
-2011-06-20 19:27 source
+ * Fixed set default value for CheckExtentFreePages to 1
- * Fixed replay as we need to take into account non txn mode
+2012-03-14 11:40 source
-2011-06-20 19:25 source
+ * Added option to accept pragma
- * Fixed memory leak
+2012-03-14 11:39 source
-2011-06-20 14:15 source
+ * Added entries for entity types and scores
- * Fixed cast to uint32 instead of long as this is a serialized type
+2012-03-14 11:17 source
-2011-06-17 15:21 source
+ * Fixed version of vad package
- * Fixed when sas, O is considered to be an iri
+2012-03-14 11:10 source
-2011-06-17 15:20 source
+ * Fixed use new xlat cb
- * Fixed if result is empty but input is same variable as input then
- pesumable we have distinct and have to send input
+2012-03-14 11:06 source
-2011-06-17 00:11 source
+ * Fixed small issue
- * Fixed placement of ifdef
+2012-03-14 11:05 source
-2011-06-16 22:53 source
+ * Fixed issue awol:content on stackoverflow.com
- * Added check for errors on bitmap insert
+2012-03-14 00:46 source
-2011-06-13 14:25 source
+ * Added new SPARQL DESCRIBE modes OBJCBD and SCBD
- * Fixed if too many cursors, do not crash server, just kill txn
+2012-03-14 00:43 source
-2011-06-13 09:31 source
+ * Fixed issue with Oracle double which should be decimal
- * Fixed "delayed" filters like
- ?x p1 ?o1 ; p2 ?o2 . optional { ... } . filter (?o1 = ?o2)
+2012-03-14 00:42 source
-2011-06-13 09:29 source
+ * Fixed call to xlat_cbk to detect rdf:type etc
- * Added function to backup index to log
+2012-03-13 12:07 source
-2011-06-11 16:41 source
+ * Fixed metadata for S, P and O
- * Added support for SQLQUERY syntax in declaration of RDF views
- * Fixed SQL codegen bug in SPARQL queries of R2RML rewriter
+2012-03-13 12:05 source
-2011-06-11 16:39 source
+ * Fixed set default output:format to _UDBC_ for ODBC/JDBC/.NET apps
- * Fixed issue with variable argument list
+2012-03-13 11:51 source
-2011-06-11 16:28 source
+ * Fixed typo in subcode
- * Fixed fill can get out of bounds
+2012-03-13 11:50 source
-2011-06-10 22:45 source
+ * Fixed when row is deleted, place the single bm entry over it
- * Fixed disable debug code from standard binary
+2012-03-13 11:48 source
-2011-06-10 22:44 source
+ * Fixed issue when codegen takes dtp from 1st param and no ssl exists yet
- * Fixed skip rules which perform http redirect when doing a POST
+2012-03-13 11:46 source
-2011-06-10 21:39 source
+ * Fixed issue with union
- * Fixed check if instance has trx and it has thread, else we do not
- run
+2012-03-12 22:50 source
-2011-06-09 17:41 source
+ * Updated version to 6.1.5-rc2
- * Fixed problem with non-existing item and get API function
- * Fixed myA JS error
+2012-03-12 22:45 source
-2011-06-09 17:39 source
+ * Added additional tests
+ * Fixed building/checking vads on VOS
- * 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-12 17:43 source
-2011-06-09 17:26 source
+ * Fixed ignore log files
- * Fixed crash when trying to unbox non-boxed item from tree
+2012-03-12 17:41 source
-2011-06-09 15:32 source
+ * Fixed issue with Bookmark app that caused user to be logged out
- * Added sponger splash page
+2012-03-12 14:28 source
-2011-06-09 15:29 source
+ * Fixed issue with semaphores on Mac OS X 10.7
- * Added sponger splash page
- * Fixed minor issues
+2012-03-12 14:25 source
-2011-06-09 13:27 source
+ * Fixed wrong function name
- * Added option to enable/disable ?P statistics
+2012-03-12 14:24 source
-2011-06-09 13:25 source
+ * FIxed typo in function name
- * FIxed added option to enable/disable ?P statistics
+2012-03-12 10:28 source
-2011-06-09 13:24 source
+ * Added SET EXPLAIN ON and SET SPARQL_TRANSLATE ON options
- * Fixed memory leak
+2012-03-12 10:28 source
-2011-06-07 18:53 source
+ * Fixed issue with fd in binary mode
- * Fixed compiler warning
+2012-03-12 10:18 source
-2011-06-07 18:52 source
+ * Added alias _UDBC_ for _JAVA_
- * Added new functions
+2012-03-12 10:17 source
-2011-06-07 18:51 source
+ * Fixed issue if dfe is not initialized yet and used inside gdb
- * Fixed if cannot ensure sas then return proper error not null
+2012-03-11 13:30 source
-2011-06-07 12:30 source
+ * Updated vad version
- * Fixed print ins options
+2012-03-11 13:26 source
-2011-06-07 12:29 source
+ * Fixed use of foaf_check_ssl function
- * Fixed issue with int32 stats
+2012-03-09 17:33 source
-2011-06-06 08:06 source
+ * Fixed issue with uninitialized variables
- * Added function to create certificate from CSR
+2012-03-09 15:07 source
-2011-06-06 08:02 source
+ * Fixed do not output NULL triples
- * Fixed memory leaks
+2012-03-09 14:42 source
-2011-06-03 15:13 source
+ * Added README.GIT
+ * Added discontinuation notice to README.CVS
- * Fixed memory leak
+2012-03-09 14:41 source
-2011-06-02 12:32 source
+ * Added information for Mac OS X 10.7
- * Fixed bad URL in typeahead.css
- * Fixed issue with external ccount creation
- * Fixed WebDAV selection
+2012-03-09 13:42 source
-2011-06-02 12:25 source
+ * Fixed compiler warnings
- * Fixed iCalendar parser
+2012-03-08 16:22 source
-2011-06-02 12:24 source
+ * Fixed CRLF
- * Added daylight saving time
- * Fixed issue with validation
- * Fixed WebDAV selection
+2012-03-08 15:52 source
-2011-06-02 12:22 source
+ * Fixed list of files to distribute for Windows build
- * Fixed WebDAV selection
+2012-03-08 13:52 source
-2011-06-02 12:22 source
+ * Fixed use portable method for escaping symbol for gawk 3 and 4
- * Fixed issue with validation
- * Fixed WebDAV selection
+2012-03-08 13:30 source
-2011-06-02 12:21 source
+ * Updated vad_version
- * Fixed issue with validation
- * Fixed WebDAV selection
- * Fixed uninstall some views
+2012-03-08 13:25 source
-2011-06-02 12:20 source
+ * Updated version to 6.1.5-rc1
- * Added user's rewrite rules
- * Added WebID verify service
+2012-03-08 12:14 source
-2011-06-02 12:08 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
- * Added ProgrammableWeb cartridge
+2012-03-08 12:08 source
-2011-06-02 12:08 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 minor issue
+2012-03-08 12:03 source
-2011-06-02 11:18 source
+ * Fixed issues with patching versions automatically
+ * Fixed wrong ctype
+ * Fixed bad url
+ * Fixed all columns in the table def
- * Fixed check vdb col for nullable
+2012-03-08 12:00 source
-2011-06-01 09:20 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
- * Fixed signal error instead of GPF in normal build
+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-05-31 15:34 source
+2012-03-08 11:48 source
- * Fixed set rehash factor if expecting large number of inserts in hash
+ * 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-05-31 15:33 source
+2012-03-08 11:46 source
- * Added function for CSR generation
+ * Fixed whitespace
-2011-05-31 15:32 source
+2012-03-08 11:46 source
- * Fixed use max number to avoid buffer overrun
+ * Fixed minor issues
-2011-05-30 20:19 source
+2012-03-08 11:44 source
- * Fixed translation from nodeiD://xxx to _:xxx
+ * 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-05-30 20:17 source
+2012-03-08 11:41 source
- * Fixed issue with cost based optimizer
+ * Fixed html encoding in title
-2011-05-24 18:57 source
+2012-03-08 11:19 source
- * Fixed when iri exceeds 2KB limit and flag is enabled then shorten
- the iri, instead of rejecting it
+ * Fixed issue with vad_version
-2011-05-24 18:56 source
+2012-03-08 11:18 source
- * Fixed loop so it only uses local files
+ * Added files to ignore
-2011-05-23 13:44 source
+2012-03-08 10:49 source
- * Added initial support for SPARQL 1.1. build-in IF and COALISCE
+ * Fixed attachemt problem with rights
+ * Fixed upstream URL
+ * Fixed ordering of acl triggers
+ * Fixed issue with blobs in triggers
-2011-05-23 11:24 source
+2012-03-08 10:46 source
- * Fixed minor issue
+ * Fixed copyright year
-2011-05-23 11:23 source
+2012-03-08 10:39 source
- * Fixed LastFM cartridge
+ * Fixed use monospace font for textedit area
-2011-05-23 09:02 source
+2012-03-07 23:45 source
- * Added support for CREATE LITERAL CLASS "format string" ...
+ * Added function xenc_pubkey_ssh_export
-2011-05-20 16:20 source
+2012-03-07 21:14 source
- * Fixed WebID selection
+ * Fixed encoding problems
-2011-05-20 16:20 source
+2012-03-07 16:16 source
- * Fixed use certificate to verify the signature as an option
- * Fixed use ldap&webid login
+ * Added function xenc_pubkey_DER_export
-2011-05-20 16:11 source
+2012-03-07 15:28 source
- * Fixed add sponger ACL when installed
+ * Updated documentation
-2011-05-20 12:01 source
+2012-03-07 14:57 source
- * Fixed comments
+ * Added missing file
-2011-05-20 12:00 source
+2012-03-07 13:16 source
- * Added support for WebID idp
- * Fixed WebID selection
+ * Fixed use vad_version when generating vad packages in VOS
-2011-05-20 11:51 source
+2012-03-07 11:37 source
- * Added csv bulk loader script
+ * Fixed indentation and whitespace
-2011-05-20 11:46 source
+2012-03-07 11:29 source
- * Fixed CSV import failed importing NULL values
+ * Fixed typo in json-ld output
-2011-05-20 11:44 source
+2012-03-07 11:28 source
- * Fixed dav_enable should not be touched for dba account
+ * Fixed debug lines
-2011-05-19 18:32 source
+2012-03-07 11:27 source
- * Fixed NULL value is not an error in lax mode
+ * Added empty RDF_TRIPLES_BATCH_COMPLETE
-2011-05-19 18:22 source
+2012-03-07 11:23 source
- * Fixed wrong arg
+ * Fixed compiler warnings on trigraphs in generated code
-2011-05-19 13:34 source
+2012-03-07 11:16 source
- * Added ldap schema support to WebID
+ * Fixed initialization on db creation
-2011-05-19 13:15 source
+2012-03-07 10:56 source
- * Added version and timeout argument
+ * Fixed windows build
-2011-05-19 13:11 source
+2012-03-07 10:47 source
- * Fixed duplicate symbol
+ * Added new Visual Studio 11 project files containing rules for both
+ 32bit and 64bit builds
+ * Removed old win32 and win64 build environments
-2011-05-19 10:17 source
+2012-03-07 02:16 source
- * Fixed API contact edit function
+ * Fixed missing var decl
-2011-05-19 09:58 source
+2012-03-07 02:16 source
- * Fixed compiler warning
+ * Updated vad version
-2011-05-19 09:57 source
+2012-03-07 02:09 source
- * Fixed add user to bootstrap as it can run procs in this context
+ * Updated vad version to 1.85.83
-2011-05-18 21:15 source
+2012-03-07 02:09 source
- * Fixed SIOC object services
+ * Fixed demo
-2011-05-18 21:12 source
+2012-03-07 02:08 source
- * Fixed install/uninstall bugs
+ * Fixed remove duplicate lines
-2011-05-18 09:19 source
+2012-03-07 02:02 source
- * Added Eventbrite cartridge
- * Fixed guard against using revoked long-lived FB access token
+ * Fixed use of common WebID verifier
-2011-05-18 09:10 source
+2012-03-07 02:00 source
- * Added instructions on revoking access tokens to FB on retrieval
- confirmation page
+ * Fixed bad code
-2011-05-18 09:09 source
+2012-03-07 01:59 source
- * Fixed issue with properties
+ * Added /sparql-oauth
-2011-05-18 09:01 source
+2012-03-07 01:59 source
- * Added Upcoming cartridge
- * Added Plancast cartridge
- * Fixed use labels by default
- * Fixed remove pro
- * Fixed minor issues
+ * Fixed sparql-webid
-2011-05-17 22:53 source
+2012-03-07 01:59 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
+ * Fixed JS errors
-2011-05-17 22:51 source
+2012-03-07 01:58 source
- * Added SIOC object services
- * Fixed IE JS problems
- * Fixed UI bug
+ * Fixed WebID check procedure
-2011-05-17 22:50 source
+2012-03-07 01:57 source
- * Added SIOC object services
- * Fixed changing/deleting events does not trigger re-sync with publication
- * Fixed import/export bug
- * Fixed IE JS problems
+ * Fixed graph issues
-2011-05-17 22:48 source
+2012-03-07 01:56 source
- * Added SIOC object services
- * Added annotation rules
- * Fixed navigation and UI
- * Fixed css
- * Fixed IE bug
- * Fixed UI bug
+ * Fixed return on sparql errors
-2011-05-17 22:46 source
+2012-03-07 01:56 source
- * Added SIOC object services
- * Fixed IE bug
- * Fixed UI bug
+ * Fixed grant permission for API to sponge
-2011-05-17 22:45 source
+2012-03-07 01:55 source
- * Fixed IE JS problems
- * Fixed UI bugs
+ * Fixed output from verifier
-2011-05-17 22:44 source
+2012-03-07 01:54 source
- * Added SIOC object services
+ * Fixed new param in WebID verifier
-2011-05-17 22:43 source
+2012-03-07 01:54 source
- * Fixed issue with Wiki after delete and restore VVC folder
+ * Fixed return if no user
-2011-05-17 22:42 source
+2012-03-07 01:53 source
- * Added SIOC object services
- * Fixed a++
+ * Fixed openid registration
-2011-05-17 21:14 source
+2012-03-07 01:53 source
- * Fixed compiler warnings
+ * Fixed date check
-2011-05-17 14:06 source
+2012-03-07 01:52 source
- * Added optimization for %g specifier for "Decimal" types in RDFViews
+ * Fixed selecting identifier
-2011-05-17 13:51 source
+2012-03-07 01:51 source
- * Rebuild drivers
+ * Fixed use 15s timeout
-2011-05-17 13:48 source
+2012-03-07 01:51 source
- * Added function to get/set Query timeout (default = 0 = unlimited)
+ * Fixed error condition checks
-2011-05-16 09:04 source
+2012-03-07 01:51 source
- * Added initial support for SPARQL 1.1 Graph Store HTTP Protocol
+ * Fixed use vector of vectors
-2011-05-16 08:51 source
+2012-03-07 01:50 source
- * Fixed usage of http_request_header
- * Fixed useage of last modified
+ * Fixed handling of di:
-2011-05-16 08:50 source
+2012-03-07 01:50 source
- * Fixed empty subject
- * Fixed WebID selection
- * Fixed problem with certificate generation using Safari on windows
- * Fixed topic of interests
- * Fixed a++
+ * Fixed copyright year to include 2012
-2011-05-16 08:35 source
+2012-03-07 01:49 source
- * Fixed setting name
+ * Fixed rdf_sink folder creation for new users
-2011-05-16 08:34 source
+2012-03-07 01:49 source
- * Fixed entry page for sponged Facebook user's profile to top level
- container document
+ * Fixed expiration check
-2011-05-12 20:53 source
+2012-03-07 01:49 source
- * Fixed compiler warning
+ * Fixed get WebID function
-2011-05-12 20:53 source
+2012-03-07 01:48 source
- * Added more system unames
+ * Fixed copyright year to 2012
-2011-05-11 14:49 source
+2012-03-07 01:48 source
+
+ * Fixed DI URI
+
+2012-03-07 01:47 source
* Fixed small issue
-2011-05-11 13:32 source
+2012-03-07 01:47 source
- * Fixed issue compiling zip support on Mac OS X
+ * Fixed same-as
-2011-05-11 13:19 source
+2012-03-07 01:46 source
- * Fixed typo in Content-Type header
+ * Fixed to preserve content
-2011-05-11 13:15 source
+2012-03-07 01:46 source
- * Added missing file
+ * Added new rule for /mv
-2011-05-11 13:11 source
+2012-03-07 01:46 source
- * Fixed rdf_sink is not a DET
+ * Added void to graph
-2011-05-11 13:09 source
+2012-03-07 01:45 source
- * Added more parameters for crawling
- * Fixed top proc must run as dba
- * Fixed use array for values
+ * Fixed image show in login
-2011-05-11 09:39 source
+2012-03-07 01:44 source
- * Added WebID support to dynares
- * Added optional async mode for dav meta extraction
+ * Fixed multiple values in SAN
-2011-05-11 08:08 source
+2012-03-07 01:44 source
- * Added missing files
+ * Fixed VAD upgrade
-2011-05-10 18:57 source
+2012-03-07 01:44 source
- * Fixed write processing status to sponger queue
- * Fixed access tokens for OpenGraph cartridge save/restore from table
- instead of the API key
+ * Added support to enable automatic login
-2011-05-10 18:43 source
+2012-03-07 01:43 source
- * Fixed access tokens for OpenGraph cartridge save/restore from table
- instead of the API key
+ * Fixed grant
-2011-05-10 18:42 source
+2012-03-07 01:43 source
- * Fixed minor issues
+ * FIxed key usage
-2011-05-10 18:40 source
+2012-03-07 01:42 source
- * Fixed disabled pg_check_map by default to make cpt faster
+ * Fixed primary topic should be the profile
-2011-05-10 18:37 source
+2012-03-07 01:41 source
- * Fixed disable pg_check_map by default to make cpt faster
+ * Fixed VAD install problem
-2011-05-10 12:20 source
+2012-03-07 01:41 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
+ * Added private graphs data
-2011-05-10 12:18 source
+2012-03-07 01:39 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
+ * Fixed use get:soft "add"
-2011-05-09 12:06 source
+2012-03-07 01:38 source
- * Fixed internal error in sparql_detalize on SPARUL statement
+ * Fixed vhosts define
-2011-05-09 12:05 source
+2012-03-07 01:37 source
- * Added new statistic counters
+ * Fixed typo
-2011-05-08 22:24 source
+2012-03-07 01:37 source
- * Added GROUP_CONCAT and SAMPLE
+ * Fixed twitter sha1 post
-2011-05-08 22:23 source
+2012-03-07 01:36 source
- * Added common function to set certificate server-side
+ * Added private data in graph
-2011-05-08 22:18 source
+2012-03-07 01:34 source
- * Added option to use certificates stored in the db
+ * Fixed try sha1 for fingerprint
-2011-05-06 11:34 source
+2012-03-07 01:33 source
- * Fixed call to sponger status procedure
+ * Added rule for briefcase folder IRIs
-2011-05-05 12:55 source
+2012-03-07 01:32 source
- * Fixed do not use aq if in sponger queue
+ * Fixed user's image on profile page
-2011-05-05 12:54 source
+2012-03-07 01:32 source
- * Fixed print literals with meta info only when html is requested
+ * Fixed use proper digest
-2011-05-03 18:00 source
+2012-03-07 01:32 source
- * Fixed workaround for missing offers
+ * Fixed proper namespace
-2011-05-03 18:00 source
+2012-03-07 01:31 source
- * Fixed minor issue
+ * Fixed use new property
-2011-05-03 17:55 source
+2012-03-07 01:30 source
- * Fixed compiling on VC10
+ * Added option to ask to delete data
-2011-05-03 17:51 source
+2012-03-07 01:29 source
- * Fixed function signature for windows build
+ * Fixed use sponger
-2011-05-03 17:50 source
+2012-03-07 01:28 source
- * Fixed error checking
+ * Fixed verification
-2011-05-03 14:03 source
+2012-03-07 01:28 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
+ * Added more checks
-2011-05-03 11:50 source
+2012-03-07 01:27 source
- * Fixed set rehash pct
+ * Fixed search twitter for tweet
-2011-05-03 11:15 source
+2012-03-07 01:26 source
- * Fixed SPARQL OPTIONAL keyword sometimes causing queries to not
- return graph matches
+ * Fixed check for fingerprint
-2011-05-02 14:16 source
+2012-03-07 01:26 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
+ * Fixed page show and SIOC data
-2011-05-02 14:09 source
+2012-03-07 01:25 source
- * Added support for social bookmarking
- * Fixed use 404 when no data is found
- * Fixed links in footer
- * Fixed escape the single quote char
+ * Fixed labels
-2011-05-02 14:06 source
+2012-03-07 01:25 source
- * Fixed labels
+ * Fixed ampersand
-2011-05-02 14:02 source
+2012-03-07 01:24 source
- * Fixed links
+ * Fixed MIME type for JSON-LD to application/ld+json
-2011-05-02 12:48 source
+2012-03-07 01:24 source
- * Fixed popup windows
+ * Fixed ODS upgrade proc
-2011-05-02 12:44 source
+2012-03-07 01:23 source
- * Added annotation rules
- * Added discussion IRIs
- * Fixed navigation and standardize UI
- * Fixed popup windows
+ * Fixed row selection style
-2011-05-02 12:30 source
+2012-03-07 01:23 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
+ * Fixed issues with session expire in new ODS UI
-2011-05-02 12:22 source
+2012-03-07 01:21 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
+ * Fixed SPARQL clear graph
-2011-05-02 08:24 source
+2012-03-07 01:20 source
- * Fixed col_default to be same dtp as col_dtp to prevent default value
- misuse
+ * Fixed path to OAT style sheets
-2011-05-02 08:23 source
+2012-03-07 01:19 source
- * Fixed wrong deref of default int value
+ * Fixed missing CSS file
-2011-04-29 11:56 source
+2012-03-07 01:18 source
- * Fixed when redirect is to secure site, setup the appropriate flags
+ * Fixed call to obsolete hostip
-2011-04-26 12:16 source
+2012-03-07 01:17 source
- * Fixed loading TriG
+ * Upgraded ODS css
-2011-04-26 12:14 source
+2012-03-07 01:16 source
- * Fixed loading NQuads
+ * Fixed JS table API
-2011-04-26 12:13 source
+2012-03-07 01:16 source
- * Fixed check webid only if not uathenticated
+ * Fixed photo value
-2011-04-21 13:09 source
+2012-03-07 01:16 source
- * Added session counters for read/write/seek on gzip file
+ * Fixed deactivate user
-2011-04-21 11:41 source
+2012-03-07 01:15 source
- * Upgraded to zlib 1.2.5
+ * Fixed photo show
-2011-04-20 15:12 source
+2012-03-07 01:14 source
- * FIxed hang or crash after cpt over
+ * Fixed triggers
-2011-04-20 15:12 source
+2012-03-07 01:13 source
- * Fixed disable dep cols check
+ * Added option to deactivate user
-2011-04-20 15:11 source
+2012-03-07 01:12 source
- * Added debug code to detect mutex hang on same thread
+ * Fixed common applications CSS
-2011-04-19 20:50 source
+2012-03-07 01:11 source
- * Fixed lock status report
+ * Fixed tab labels
-2011-04-19 20:49 source
+2012-03-07 01:10 source
- * Fixed key dep cols check for sample
+ * Fixed WebID login
-2011-04-19 16:16 source
+2012-03-07 01:09 source
- * Fixed bad bnode syntax in output
+ * Fixed login dialog with unregistered users
-2011-04-19 16:15 source
+2012-03-07 01:09 source
- * Added session read waits statistic
+ * Fixed labels and CSS for Firefox
-2011-04-18 16:03 source
+2012-03-07 01:07 source
- * Fixed default mode for sponger should be sync instead of async
+ * Added new verification proc
-2011-04-18 16:03 source
+2012-03-07 01:06 source
- * Fixed http_lock requires that maintenance page is set
+ * Added QRCode
-2011-04-18 16:02 source
+2012-03-07 01:05 source
- * Added statistics on read/write/seek session via file/gzip counters
+ * Updated WebID demo pages
-2011-04-15 12:42 source
+2012-03-07 01:04 source
- * Added deadlock retry handler
- * Added support to use redirect and timeout options
+ * Added WebID WaterMark
-2011-04-15 12:39 source
+2012-03-07 00:57 source
- * Added Foursquare cartridge
- * Added Zappos cartridge
- * Added enhancements to Facebook OpenGraph cartridge
- * Fixed minor issues
+ * Fixed HREF to not need proxy
-2011-04-15 12:33 source
+2012-03-07 00:56 source
- * Added "Raw linked data format" permalinks
- * Fixed CSS
+ * Added proxy url
-2011-04-15 12:05 source
+2012-03-07 00:56 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
+ * Added data graph associated with the WebID
+ * Fixed present WebID as link
+ * Fixed syntax
-2011-04-15 12:04 source
+2012-03-07 00:54 source
- * Fixed support for xsd:time() in sparql when the argument value
- is safe for SQL CASET instead of function call
+ * Fixed WebID to be presented as link
-2011-04-13 22:51 source
+2012-03-07 00:53 source
- * Added initial variant for estimate taking dep cols in account
- (by default disabled)
+ * Fixed warning if no key found
-2011-04-13 22:50 source
+2012-03-07 00:52 source
- * Added missing param for http_get
+ * Removed fixed link from webid_demo pages
-2011-04-13 10:16 source
+2012-03-07 00:49 source
- * Fixed if tf_xx signals an error, xn_children were released twice
+ * Added new /ods/webid endpoint
-2011-04-12 18:29 source
+2012-03-07 00:47 source
- * Fixed check bnode subject
- * Fixed clear avalues array before possible jump
- * Fixed compiler warnings
+ * Updated WebID 1.0 spec
-2011-04-11 21:44 source
+2012-03-07 00: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
+ * Added callback
-2011-04-11 21:42 source
+2012-03-07 00:42 source
- * Added option top copy/clone crawler target
- * Added option for crawl-delay
+ * Fixed webid_demo https requirements
-2011-04-11 21:39 source
+2012-03-07 00:41 source
- * Added support for crawl-delay
+ * Fixed photo url
-2011-04-11 21:01 source
+2012-03-07 00:38 source
- * Fixed removed leading CRLF
+ * Added WebID demo pages
-2011-04-11 21:01 source
+2012-03-06 23:46 source
- * Fixed wrong function call
- * Fixed bad inference tag
+ * Fixed SPARQL initialization
-2011-04-11 20:55 source
+2012-03-06 20:12 source
- * Fixed error message in spar_find_sc_for_big_ssl_const
+ * Added extra MALLOC_DEBUG checks
-2011-04-11 20:54 source
+2012-03-06 17:10 source
- * Added support for RDFa 1.1
+ * Fixed MALLOC_DEBUG support for box_iri_id()
-2011-04-11 20:53 source
+2012-03-06 16:54 source
- * Fixed compiler warnings
+ * Updated vad_version to 1.34.22
-2011-04-11 15:36 source
+2012-03-06 16:48 source
- * Added DB.DBA.RDF_RDFA11_FETCH_PROFILES() to sponge and return
- RDFa 1.1 external profile data
+ * Fixed copyright comment
-2011-04-11 15:35 source
+2012-03-06 16:32 source
- * Added rdfa: namespace prefix
+ * Added StackOverflow cartridge
-2011-04-11 15:05 source
+2012-03-06 16:31 source
- * Added w3-1999-xhtml/vocab for RDFa 1.1
+ * Added support for DI: in mail address
-2011-04-11 09:15 source
+2012-03-06 16:28 source
- * Fxed issue with rdf_type attr
+ * Fixed tsuite failure
-2011-04-11 08:28 source
+2012-03-06 16:28 source
- * Fixed double free
+ * Fixed qualify opl:mentions with cartridge identifier
-2011-04-11 08:27 source
+2012-03-06 16:27 source
- * Added support for trig
+ * Added function dbpedia_url_label
-2011-04-11 08:27 source
+2012-03-06 16:26 source
- * Fixed check if file is present on local fs
+ * Fixed issues with RM_CLEAN_DEST
-2011-04-07 21:19 source
+2012-03-06 16:25 source
- * Added function to validate rdfxml
+ * Added logging to NYT Article cartridge
-2011-04-07 21:17 source
+2012-03-06 16:25 source
- * Fixed do not flush immediately, as client may ask for gzip later
+ * Added Angellist ontology and cartridge
+ * Added generic blog-URL links to oplbase
-2011-04-07 21:16 source
+2012-03-06 16:23 source
- * FIxed if bitmap error on a cursor, kill the transaction instead of GPF
+ * Added oplbase ontology
-2011-04-07 11:11 source
+2012-03-06 16:22 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
+ * Added binding subproperty in new oplbase: ontology
+ * Aligned social-profile-url property across some social cartridges
-2011-04-06 12:09 source
+2012-03-06 16:21 source
- * Fixed issue with multiple transitive subqueries in sql optimizer
+ * Added Crunchbase ontology
+ * Added DBpedia Spotlight ontology
-2011-04-06 12:01 source
+2012-03-06 16:16 source
- * Fixed when doing subseq, session will return session handle, which
- needs to be converted to string
+ * Fixed LinkedIn cartridge
-2011-04-05 14:38 source
+2012-03-06 16:15 source
- * Fixed issues with RDFa 1.1 test
+ * Fixed Amazon cartridge to work with new Product Advertising API
-2011-04-05 14:37 source
+2012-03-06 16:14 source
- * Fixed possible mutex deadlock
+ * Added support for extracting all meta and link head-element data from
+ XHTML documents
-2011-04-04 12:32 source
+2012-03-06 16:13 source
- * Added support for javascript-like hrefs in RDFa
+ * Fixed handling of # in About header
-2011-04-04 12:31 source
+2012-03-06 16:08 source
- * Fixed when not a string, use a cast to string
+ * Fixed DI: handling
-2011-04-04 12:31 source
+2012-03-06 16:07 source
- * Fixed use mtx in proper order
+ * Addded webid via DI: text link
-2011-03-31 21:33 source
+2012-03-06 16:07 source
- * Fixed issues with RDFa parsing
+ * Fixed DI: like mask
-2011-03-31 21:32 source
+2012-03-06 16:06 source
- * Added check for MacDataSourceSize with default of 20MB
+ * Fixed DI: detection
-2011-03-29 23:20 source
+2012-03-06 16:06 source
- * Updated version to 6.1.3 for final release
+ * Fixed twitter profile
-2011-03-29 22:55 source
+2012-03-06 16:06 source
- * Fixed do not check immutable graph when dba is running
+ * Added post-processing script for generating owl:sameAs links for
+ co-reference resolution
-2011-03-29 22:52 source
+2012-03-06 15:41 source
- * FIxed minor issue
+ * Fixed typos
-2011-03-29 22:52 source
+2012-03-06 15:35 source
- * FIxed ACL
+ * Added DI spoort for certs
+ * Fixed xslt, no xmlns
-2011-03-29 22:49 source
+2012-03-06 15:34 source
- * Fixed minor issue with prices
+ * Fixed copyright year
-2011-03-29 22:46 source
+2012-03-06 15:33 source
- * Fixed swapped menu items
+ * Added support for ld+json and microdata+json
-2011-03-29 22:43 source
+2012-03-06 15:32 source
- * Fixed use INFORMATION_SCHEMA.TABLES
+ * Added curl examples for other structured data formats
-2011-03-29 21:08 source
+2012-03-06 15:32 source
- * Fixed menu layout
+ * Fixed rdf mapper logging
-2011-03-29 20:14 source
+2012-03-06 15:31 source
- * Fixed JS IE bug on profile page
- * Small code cleanup
+ * Fixed bad fmt
-2011-03-29 14:06 source
+2012-03-06 15:31 source
- * Fixed typo in Makefile.am
+ * Fixed extraction of a cert:key from sioc:content
-2011-03-29 12:45 source
+2012-03-06 15:29 source
- * Fixed put absolute path for database in default virtuoso.ini
+ * Fixed key in vcard
-2011-03-29 11:02 source
+2012-03-06 15:29 source
- * Added alt to images in rdftab
+ * Fixed link to the dataset
-2011-03-29 10:58 source
+2012-03-06 15:28 source
- * Fixed tuned handling of page params
- * Fixed permalinks now encode information of which editor was used
- to produce the query
+ * Added Klout extractor cartridge
-2011-03-29 10:53 source
+2012-03-06 15:28 source
- * Fixed must return error when cast fails
+ * Added New York Times Article cartridge
-2011-03-29 10:53 source
+2012-03-06 15:27 source
- * Fixed issue with sparql filter with two optionals
+ * Added get:cartridge option
-2011-03-29 00:31 source
+2012-03-06 15:21 source
- * FIxed issue locating jvm runtime library location on linux x86_64
+ * Fixed sponger front pages
-2011-03-29 00:09 source
+2012-03-06 15:21 source
- * Fixed build issue when prerequisite support .jar files not present
+ * Added NTY ontology
-2011-03-28 23:11 source
+2012-03-06 15:20 source
- * Fixed check for demo data before continuing
+ * Fixed check to ensure only access tokens granted to sponger are used
-2011-03-28 17:29 source
+2012-03-06 15:19 source
- * Added configure option for enabling mutex debugging
+ * Added Klout ontology
-2011-03-28 16:04 source
+2012-03-06 15:19 source
- * Fixed dependency for VOS
+ * Added twitter v2 screen_name
-2011-03-28 15:56 source
+2012-03-06 15:18 source
- * Rolled back previous patch
+ * Fixed sponger frontpage
+ * Added Foursquare button
-2011-03-28 13:52 source
+2012-03-06 15:13 source
- * Added missing files to distribution
+ * Added support for flagging access tokens as invalid in FB cartridge
-2011-03-28 12:57 source
+2012-03-06 15:13 source
- * Fixed minor layout issue
+ * Added sponger param
-2011-03-28 12:53 source
+2012-03-06 15:13 source
- * Added support for posh triples
+ * Fixed Facebook cartridge
-2011-03-28 12:52 source
+2012-03-06 15:12 source
- * Fixed labels
+ * Fixed equivproperties etc
-2011-03-28 12:22 source
+2012-03-06 15:12 source
- * Fixed allow varbinary as input for obj
+ * Fixed long descs
-2011-03-26 14:22 source
+2012-03-06 15:11 source
- * Fixed user's pages to start with profile page
+ * Added OpenGraph mapping
-2011-03-26 14:21 source
+2012-03-06 15:10 source
- * Fixed skin handling
+ * Added FB Parrot specification classes/properties
-2011-03-25 21:33 source
+2012-03-06 15:10 source
- * Updated version
+ * Fixed ordering needs an int
-2011-03-25 21:29 source
+2012-03-06 15:09 source
- * Updated build environment for win32 and win64
+ * Added code to delete orig triples
-2011-03-25 17:47 source
+2012-03-06 15:08 source
- * Fixed possible copy overlap on some newer C libs
+ * Fixed minor issues
-2011-03-25 16:23 source
+2012-03-06 15:06 source
- * Fixed vcard handling
+ * Added support for paging over large collections to FB cartridge
-2011-03-25 16:19 source
+2012-03-06 15:05 source
- * Fixed encoding
+ * Fixed shadow var
-2011-03-25 15:10 source
+2012-03-06 15:04 source
- * Updated testsuite
+ * Fixed use triple dict
-2011-03-25 12:20 source
+2012-03-06 15:04 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
+ * Added cert ontology
-2011-03-24 16:15 source
+2012-03-06 15:03 source
- * Added bulk-loader to virtuoso binary
+ * Fixed cert in html
-2011-03-24 16:04 source
+2012-03-06 15:03 source
- * Updated documentation
+ * Fixed syntax
-2011-03-24 15:50 source
+2012-03-06 15:02 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
+ * Added equivalence triples for linkedin
-2011-03-24 15:47 source
+2012-03-06 15:02 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
+ * Fixed use batch request for facebook
+ * Added hasCertificate property in relevant cartridges
-2011-03-24 13:48 source
+2012-03-06 15:01 source
- * Fixed additional xml document parser error handling for Opera
+ * Fixed run fb only on facebook uri
-2011-03-23 16:45 source
+2012-03-06 15:00 source
- * Added function to format rdf object for printing in html
+ * Fixed cert property
+ * Fixed opengraph returns 1/-1 depending on mime type
-2011-03-23 12:25 source
+2012-03-06 14:59 source
- * Fixed typo
+ * Fixed favour activity_title over providerTitle for Google+
-2011-03-23 12:17 source
+2012-03-06 14:58 source
- * Added LinkedIn import
- * Fixed duplicate addressbook entries issue
+ * Fixed wrong property
-2011-03-23 12:13 source
+2012-03-06 14:58 source
- * Added rdfs schema
- * Fixed datetime format
- * Fixed minor issues
+ * Fixed google plus cartridge
-2011-03-23 12:13 source
+2012-03-06 14:52 source
- * Added more properties
+ * Added Twitter ontology to dbpedia, foaf, sioc, vcard etc ontologies
-2011-03-23 12:13 source
+2012-03-06 14:52 source
- * Fixed minor issues
+ * Removed equivalent triples
-2011-03-23 12:03 source
+2012-03-06 14:51 source
- * Added more options for exporting a site
- * Added more delimiters
- * Fixed folder DET type presentation
- * Fixed export as text
+ * Fixed check if operation returned triples and set flag appropriately
-2011-03-23 12:01 source
+2012-03-06 14:50 source
- * Fixed wrong serialization of VirtuosoExplicitString when it is
- binding with DV_ANY parameter
+ * Fixed use uppercase proedure names
-2011-03-23 11:05 source
+2012-03-06 14:49 source
- * Rebuild drivers
+ * Identify application agent used for posting to twitter v2 cartridge
-2011-03-23 11:04 source
+2012-03-06 14:48 source
- * Fixed issue with using _JAVA_ on sparql select
+ * Moved mappings from google plus
-2011-03-23 10:49 source
+2012-03-06 14:47 source
- * Fixed duplicate addressbook entries issue
+ * Added mappings to BIBO, Dublin Core, FOAF, vCard, SIOC, Dbpedia
-2011-03-23 10:48 source
+2012-03-06 14:44 source
- * Fixed broken show filter
+ * Fixed bad expression
-2011-03-23 10:48 source
+2012-03-06 14:44 source
- * Fixed feeds aggregator
+ * Added check for RDF content-type
+ * Added doc links
-2011-03-23 10:47 source
+2012-03-06 14:42 source
- * Updated folder type list with 'Dynamic Resource'
+ * Changed datatype of oplgp:published/oplgp:updated to xsd:dateTime
-2011-03-23 10:37 source
+2012-03-06 14:41 source
- * Added support for DV_RDF in v:isql rendering
+ * Fixed status handling
-2011-03-23 10:35 source
+2012-03-06 14:37 source
- * Added custom UA
- * Fixed gunzip the zipped rdfs
- * Fixed large pages in results
+ * Fixed missing stop timer
-2011-03-23 10:33 source
+2012-03-06 14: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
+ * Fixed status
-2011-03-23 10:28 source
+2012-03-06 14:33 source
- * Added code to facilitate better error recovery when parsing
- invalid RDF+XML
- * Fixed small code cosmetics
+ * Added status
-2011-03-22 23:50 source
+2012-03-06 14:29 source
- * Fixed missing globals
+ * Fixed minor issue
-2011-03-21 13:30 source
+2012-03-06 14:28 source
- * Fixed missing variable initialization
+ * Fixed do not use bnodes for labels
-2011-03-21 10:44 source
+2012-03-06 14:27 source
- * Fixed check if subselect has a recursive ref
+ * Fixed need triple dict as 1st argument
-2011-03-18 10:51 source
+2012-03-06 14:27 source
- * Fixed use new pages & disk reads to trigger the startup values
+ * Fixed use dictionary
-2011-03-17 16:30 source
+2012-03-06 14:22 source
- * Added lax mode in csv import
+ * Fixed SocialStatistics
-2011-03-17 13:55 source
+2012-03-06 14:22 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
+ * Added function XSLT_SANEURI
-2011-03-17 13:53 source
+2012-03-06 14:21 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
+ * Added support for sponging Albums in Facebook cartridge
-2011-03-16 10:34 source
+2012-03-06 14:20 source
- * Fixed issue with partial index when no path is followed
+ * Replaced namedEntityConcept by entityType property
-2011-03-14 15:52 source
+2012-03-06 14:18 source
- * Fixed return byte[] data from column with datatype = DV_ANY
+ * Fixed date parsing
-2011-03-14 15:47 source
+2012-03-06 14:18 source
- * Fixed disable debug messages
+ * Added SocialStatistics cartridge
-2011-03-14 15:46 source
+2012-03-06 14:16 source
- * Fixed use dv_bin where needed like for dav-res
+ * Fixed make html default choice
-2011-03-12 00:17 source
+2012-03-06 14:16 source
- * Fixed increase delay on sequential deadlock
+ * Added Linkedin Shares cartridge
-2011-03-12 00:17 source
+2012-03-06 14:15 source
- * Fixed labels
+ * Added new FP signature
-2011-03-11 18:26 source
+2012-03-06 14:09 source
- * Fixed use exclusive locks when doing sparul ops
+ * Fixed match mime type
-2011-03-11 13:08 source
+2012-03-06 14:08 source
- * Fixed comment about missing io sect
+ * Fixed deprecated items
-2011-03-11 13:08 source
+2012-03-06 12:45 source
- * Added retry deadlock if session is not flushed
+ * Added option to specify the accept header
-2011-03-11 13:07 source
+2012-03-06 12:43 source
- * Fixed do not do read ahead with less than 10k buffers available
+ * Added support for XHTML+Microdata
+ * Added common infrastructure for RDF-specific XML parsers
+ * Fixed memory leaks
-2011-03-11 12:17 source
+2012-03-06 12:40 source
- * Fixed if no free buffer available, signal an error
+ * Fixed redundant self-comparison in min_nonnull and max_nonnull
-2011-03-11 11:28 source
+2012-03-06 12:34 source
- * Fixed do not do read-ahead on extent map
+ * Fixed compiler warnings
-2011-03-10 23:24 source
+2012-03-06 12:30 source
- * Added index to search over label text
+ * Fixed permission check reading XML file
-2011-03-09 16:41 source
+2012-03-06 12:28 source
- * FIxed _java_ should not have effect on select
+ * Fixed MALLOC_DEBUG support
-2011-03-08 15:46 source
+2012-03-06 10:43 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
+ * Added function to get local filename from "path" portion of IRIs
-2011-03-08 15:44 source
+2012-03-06 10:22 source
- * Fixed hide value ranges option for now
+ * Ignore generated files
-2011-03-08 15:43 source
+2012-03-06 10:21 source
- * Fixed copyright year
+ * Fixed integer overflow
-2011-03-08 14:32 source
+2012-03-06 10:20 source
- * Added missing files to distribution
+ * Fixed build dependancy
-2011-03-08 13:56 source
+2012-03-05 17:38 source
- * Added workaround to tell _JAVA_ driver the input is string as it is
- confused on DV_ANY and breaks utf-8 support
+ * Fixed whitespace
-2011-03-08 13:44 source
+2012-03-05 17:25 source
- * Added quick rule to check version string
+ * Fixed issue saving state
-2011-03-08 13:44 source
+2012-03-05 17:22 source
- * Rebuild driver
+ * Fixed typo
-2011-03-08 13:44 source
+2012-03-05 17:21 source
- * Fixed only allow URI or Blank nodes as subjects
+ * Added XSL for setting location in COND
-2011-03-08 13:38 source
+2012-03-05 17:14 source
- * Added additional crawler params
- * Fixed show status without errors
- * Fixed label
+ * Fixed missing image
-2011-03-08 13:36 source
+2012-03-05 17:11 source
- * Added Described By
- * Added ProductWiki cartridge
- * Fixed do not use triple dicts on long files
- * Fixed OWL
- * Fixed labels
- * Fixed minor issues
+ * Updated vad version to 1.11.70
-2011-03-08 13:24 source
+2012-03-05 17:10 source
- * Updated to CKeditor version 3.5.2
+ * Fixed issue distinguishing lables between various NLP cartridges
-2011-03-08 13:08 source
+2012-03-05 17:09 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
+ * Fixed keep info in permalink
-2011-03-08 12:48 source
+2012-03-05 17:08 source
- * Fixed mime types
- * Fixed mail rendering
+ * Added oplweb ontology
-2011-03-08 12:47 source
+2012-03-05 17:07 source
- * Fixed attendees
+ * Fixed suppress errors if any
-2011-03-08 12:47 source
+2012-03-05 17:07 source
- * Fixed Twitter and LinkedIn registration/login
- * Fixed RDF object properties
- * Fixed UI
- * Fixed escape params
- * Fixed scroll bars
+ * Fixed functionality between /about and /describe
-2011-03-08 12:35 source
+2012-03-05 17:06 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
+ * Added generation of Pivot link for entities-list view type
-2011-03-08 12:24 source
+2012-03-05 17:06 source
- * Fixed debug defines
+ * Added registry setting for CSS stylesheet
+ * Fixed copyright statements
+ * Fixed map initialization
+ * Fixed problem with Class URIs
-2011-03-08 12:19 source
+2012-03-05 17:04 source
- * Added support for robots.txt
+ * Fixed debug statements
-2011-03-08 12:18 source
+2012-03-05 17:03 source
- * Fixed update crawler entries using id and avoid table scans
+ * Fixed check if data is returned as it can timeout transaction without
+ any data
-2011-03-08 11:52 source
+2012-03-05 17:02 source
- * Fixed size of input buffer of an XML parser is now adaptive
+ * Added check for wide labels
-2011-03-08 10:38 source
+2012-03-05 17:01 source
- * Updated version to 6.1.3-rc7
+ * Fixed copyright statement on describe page
-2011-03-07 21:49 source
+2012-03-05 17:00 source
- * Fixed when there is a gb node, test the sort node for dep part in
- the sort spec
+ * Added more labels in the ontology
-2011-03-05 00:03 source
+2012-03-05 17:00 source
- * Updated documentation
+ * Added registry key for data license markup
+ * Fixed missing datatype in some conditionals
+ * Fixed datatype selector to reflect last clicked value dtp
-2011-03-04 14:46 source
+2012-03-05 16:55 source
- * Fixed moved mutex lock/unlock calls to avoid deadlock
+ * Fixed missing initialization
-2011-03-03 17:12 source
+2012-03-05 16:54 source
- * Added read-ahead on extent
+ * Fixed initialization of the main page
-2011-03-03 17:10 source
+2012-03-05 16:54 source
- * Fixed immutable graph setting can be a pattern, so we can disable
- sponging on all graphs
+ * Added encoding page in permalink in describe
+ * Fixed regression disabling the COND UI
-2011-03-03 11:56 source
+2012-03-05 16:53 source
- * Fixed DATETIME to DATE conversions
+ * Added permalink for usage stats page
-2011-03-02 12:24 source
+2012-03-05 16:52 source
- * Fixed issue with special sparql variables
+ * Fixed small bug
-2011-03-02 12:24 source
+2012-03-05 16:51 source
- * Fixed issue with qualifier in SQLForeignKeys
+ * Fixed missing menu on Metadata page
+ * Fixed header on Metadata and Settings pages
+ * Fixed formatting of SID in sponger link
-2011-03-01 19:35 source
+2012-03-05 16:50 source
- * Fixed initialization of defaults
+ * Fixed qrcode link
-2011-03-01 19:32 source
+2012-03-05 16:49 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
+ * Added support for AddThis
+ * Added registry keys to override debug output
+ * Fixed bad icons by using text links
+ * Small CSS tweaks
-2011-02-28 17:02 source
+2012-03-05 13:15 source
- * Fixed issue if data did not generate prefix2iri hash
+ * Fixed handing of wide/narrow labels
-2011-02-28 13:47 source
+2012-03-05 13:15 source
- * Fixed check for 5xx or 4xx status codes
+ * Fixed label order
-2011-02-26 08:35 source
+2012-03-05 13:14 source
- * Added http maintenance functions
+ * Fixed guessing Type label for entities
+ * Fixed rendering of set class UI when no class is found
-2011-02-25 17:31 source
+2012-03-05 13:13 source
- * Fixed only start from the beginning when there is a thread else we
- could get into a busy loop
+ * Fixed sponger parameter
-2011-02-23 21:35 source
+2012-03-05 13:13 source
- * Fixed bad regexp
+ * Added prefixes
+ * Fixed sponger call
-2011-02-23 17:31 source
+2012-03-05 13:12 source
- * Fixed size of input buffer of an XML parser is made adaptive
+ * 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.
-2011-02-21 13:36 source
+2012-03-05 13:01 source
- * Added support for named parameters
+ * Fixed permalink
-2011-02-20 16:14 source
+2012-03-05 13:00 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
+ * Fixed description page to not generate a sid in sponger link
-2011-02-18 15:49 source
+2012-03-05 13:00 source
- * Updated version to 6.1.3-rc6
+ * Fixed default mode in /about
-2011-02-18 15:49 source
+2012-03-05 12:59 source
- * Fixed issue with scalar subq with SSG_VALMODE_NUM output as in TPCD
+ * Added mode for sponger
-2011-02-18 15:37 source
+2012-03-05 12:59 source
- * Updated version
+ * Fixed pager button
-2011-02-18 15:36 source
+2012-03-05 12:58 source
- * Added language and type options for offers
+ * Fixed check for lang
-2011-02-18 15:32 source
+2012-03-05 12:57 source
- * Fixed issues with map sizing
+ * Added new pager to allow change page lenght and jump to row number
-2011-02-18 15:30 source
+2012-03-05 12:56 source
- * Fixed rdftab height for maps
+ * Fixed description page when encountering labels of numeric DTP
-2011-02-18 11:19 source
+2012-03-05 12:56 source
- * Added initial codegen for ASK subquery
- * Fixed issue with sponging options and DESCRIBE on /sparql endpoint
+ * Added better remore debug logging facility
-2011-02-18 11:16 source
+2012-03-05 12:54 source
- * Fixed "serialize" debugging output of many threads and label
- messages of different threads
+ * Fixed use EN if no language specified
-2011-02-18 11:14 source
+2012-03-05 12:54 source
- * Added better support of "seealso" predicate in case of recursive
- sponging
+ * Fixed use short summary when available
-2011-02-18 10:37 source
+2012-03-05 12:53 source
- * Fixed use mem pool to release all objects if an error occurs
+ * Fixed description page dropdown to show distinct IRI
+ * Fixed description page to show curie of page resource uri in title
-2011-02-18 10:24 source
+2012-03-05 12:52 source
+
+ * Fixed description page to use CURIEs in the constrain facet to type
+ dropdown
+
+2012-03-05 12:51 source
+
+ * Fixed description page to allow selection of class as FCT starting
+ point when the entity is member of many classes
+
+2012-03-05 12:50 source
+
+ * Fixed layout of demo queries page
+ * Fixed display of detailed information in error handler
+ * Fixed setting empty default graph in SPARQL query link
+
+2012-03-05 12:47 source
+
+ * Fixed check lenght
+
+2012-03-05 12:46 source
+
+ * Added better handling of strings with LAND for BETWEEN condition
+
+2012-03-05 12:46 source
+
+ * Added workaround for narrow cset in literals
+
+2012-03-05 12:45 source
+
+ * Added check for bnodes
+
+2012-03-05 12:45 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
+
+2012-03-05 12:43 source
+
+ * Added xsl to strip lat/long from autoacquire cond permalinks
+
+2012-03-05 12:42 source
+
+ * Fixed bug causing addig NEAR COND in Firefox to fail
+
+2012-03-05 12:41 source
+
+ * Fixed bug adding location marker
+
+2012-03-05 12:39 source
+
+ * Added support for autolocating proximity queries
+
+2012-03-05 12:32 source
+
+ * Fixed small bugs
+
+2012-03-05 12:30 source
+
+ * Fixed datatype field showing up in contains cond UX
+ * Fixed generation of conds without enclosing property pattern
+
+2012-03-05 12:28 source
+
+ * Fixed fct_view_pos to return value 0 in case of an empty tree
+
+2012-03-05 12:06 source
+
+ * Updated vad version
+
+2012-03-05 12:05 source
+
+ * Merged replication pages
+
+2012-03-05 12:04 source
+
+ * Added option to browse table definitions
+
+2012-03-05 12:03 source
+
+ * Fixed message
+
+2012-03-05 12:02 source
+
+ * Added option to scope ACL to a VD
+
+2012-03-05 12:01 source
+
+ * Fixed rdfmapper logging
+
+2012-03-05 12:01 source
+
+ * Added support for r2rml graph generation
+
+2012-03-05 12:00 source
+
+ * Fixed do not use autoritykeyid
+
+2012-03-05 11:59 source
+
+ * Added initial pages for r2rml
+
+2012-03-05 11:57 source
+
+ * Added support for unicode strings in password
+
+2012-03-05 11:47 source
+
+ * Fixed copyright to include 2012
+
+2012-03-05 11:45 source
+
+ * Updated copyright to include 2012
+
+2012-03-05 11:45 source
+
+ * Fixed use dbpedia url for testing
+
+2012-03-05 11:43 source
+
+ * Added asynchronous connection detection for DAV
+
+2012-03-05 11:42 source
+
+ * Fixed use Grid View as initial tab
+ * Fixed use raw iris instead of shortened
+
+2012-03-05 11:40 source
+
+ * Fixed copyright year to include 2012
+
+2012-03-05 11:37 source
+
+ * Fixed issue with rdf_mappers
+
+2012-03-05 11:34 source
+
+ * Added more types to check
+
+2012-03-05 11:33 source
+
+ * Fixed use new WebiD module
+
+2012-03-05 11:32 source
+
+ * Fixed issue with sink folder
+
+2012-03-05 11:31 source
+
+ * Fixed return http status 500 when execution fails
+
+2012-03-05 00:08 source
+
+ * Updated version to 3.60
+
+2012-03-04 23:58 source
+
+ * Fixed problem with blobs when using getString()
+
+2012-03-03 10:36 source
+
+ * Fixed XMLA Columns, PrimaryKey and Foreignkey
+
+2012-03-03 09:56 source
+
+ * Fixed ignore generated files
+
+2012-03-03 09:55 source
+
+ * Removed bad symbol
+
+2012-03-03 02:09 source
+
+ * Added function virt_mbrlen
+
+2012-03-03 02:08 source
+
+ * Fixed skip internal options
+
+2012-03-03 02:07 source
+
+ * Fixed memleak
+
+2012-03-03 02:06 source
+
+ * Fixed potential filedesc leak
+
+2012-03-03 02:05 source
+
+ * Added function strses_wide_string
+
+2012-03-03 00:03 source
+
+ * Added TRIG formatter
+ * Updated TRIG parser to comply with latest draft spec
+
+2012-03-02 23:57 source
+
+ * Added support for SPARQL 1.1 WITH, USING, NAMED
+ * Added support for SPARQL 1.1 Update
+
+2012-03-02 23:37 source
+
+ * Added human-readable HTML output for DESCRIBE (list and table)
+
+2012-03-02 23:10 source
+
+ * Added functionnumeric_rescale_noround
+
+2012-03-02 22:48 source
+
+ * Added support for long nvarchar
+
+2012-03-02 22:34 source
+
+ * Fixed dump of all subject entries
+
+2012-03-02 22:33 source
+
+ * Fixed use graph in the r2rml graph
+
+2012-03-02 22:32 source
+
+ * Fixed FOAF query
+
+2012-03-02 22:15 source
+
+ * Updated version of sparql internals to match cached resources
+
+2012-03-02 22:11 source
+
+ * Fixed warning from gperf by using different way to calculate hash key
+
+2012-03-02 22:09 source
+
+ * Applied missing patch
+
+2012-03-02 21:53 source
+
+ * Small cleanups
+
+2012-03-02 21:52 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
+
+2012-03-02 21:48 source
+
+ * Fixed additional case of SPARQL OPTIONAL bug
+
+2012-03-02 21:45 source
+
+ * Fixed buildin call to IN
+
+2012-03-02 21:42 source
+
+ * Fixed problem where /sparql endpoint seems to retain graph data
+ after deletion
+
+2012-03-02 21:37 source
+
+ * Added difference between DB.DBA.rdf_...impl() stored procedures
+ and rdf_.._impl() BIFs for SPARQL 1.1
+
+2012-03-02 21:32 source
+
+ * Added additional checking if two variables are equal
+
+2012-03-02 21:26 source
+
+ * Added nice syntax for declarations of macro libraries
+
+2012-03-02 21:22 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
+
+2012-03-02 19:23 source
+
+ * Fixed debug code
+
+2012-03-02 18:54 source
+
+ * Fixed JSON-LD syntax to match recent draft of the spec
+
+2012-03-02 18:51 source
+
+ * Fixed compiler warnings
+
+2012-03-02 18:49 source
+
+ * Fixed need to escape amp etc in rdf/xml
+
+2012-03-02 18:48 source
+
+ * Fixed mixed declarations and code
+
+2012-03-02 18:47 source
+
+ * Added support for wide strings in all SPARQL serializers
+ (Turtle-like, NT, JSONs and SPARQL-XML result set)
+
+2012-03-02 18:45 source
+
+ * Fixed output of bnodes in RDF/XML format
+
+2012-03-02 18:42 source
+
+ * Fixed warnings
+
+2012-03-02 18:40 source
+
+ * Fixed CONTRUCT with constant "string"@lang
+
+2012-03-02 18:37 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
+
+2012-03-02 18:32 source
+
+ * Fixed memory leak
+
+2012-03-02 18:24 source
+
+ * Fixed whitespace
+
+2012-03-02 18:23 source
+
+ * Fixed do not use etag when using no-cache
+
+2012-03-02 18:19 source
+
+ * Added support for base64url encode/decode functions
+
+2012-03-02 18:14 source
+
+ * Added missing setting for ShortenLongURIs in SPARQL section
+
+2012-03-02 12:43 source
+
+ * Removed debug code
+
+2012-03-02 11:13 source
+
+ * Added DBpedia vad package to VOS release
+
+2012-02-27 01:16 source
+
+ * Added initial r2rml generator
+
+2012-02-27 01:13 source
+
+ * Fixed whitespace
+
+2012-02-27 01:08 source
+
+ * Added support for new SPARQL 1.1 BIFs
+
+2012-02-26 17:11 source
+
+ * Added initial implementation of SPARQL 1.1 functions
+
+2012-02-26 15:28 source
+
+ * Added support of comparions of DV_WIDE with DV_STRINGs flaged by
+ BF_UTF8 or BF_IRI
+
+2012-02-26 15:17 source
+
+ * Fixed show http threads vs. internal calls
+
+2012-02-26 15:16 source
+
+ * Fixed get full name for procedure
+
+2012-02-26 15:07 source
+
+ * Added support of comparision of DV_WIDE with DV_STRING flagged
+ by BF_URF8 or BF_IRI
+
+2012-02-26 15:04 source
+
+ * Added different digest for fingerprint
+
+2012-02-26 15:03 source
+
+ * Added hex2bin function
+
+2012-02-26 15:01 source
+
+ * Fixed low selectivity of min bnode call
+
+2012-02-26 15:00 source
+
+ * Fixed copyright year to 2012
+
+2012-02-26 14:59 source
+
+ * Fixed issue with ORDER BY
+
+2012-02-26 14:56 source
+
+ * Added flag for binary blob in sqlgetdata
+
+2012-02-26 14:52 source
+
+ * Added check for rd & tmp key when page check is enabled
+
+2012-02-26 14:49 source
+
+ * Added optional digest for x509 generator
+
+2012-02-26 13:54 source
+
+ * Extended SPARQL macro syntax to allow any IRI syntax
+
+2012-02-26 13:16 source
+
+ * Fixed invalid SQL
+
+2012-02-26 13:15 source
+
+ * Fixed resultSet of xmla_dbschema_columns
+ * Fixed call parameters to xmla_dbchema_tables
+
+2012-02-26 13:13 source
+
+ * Fixed describe should return 3 rows
+
+2012-02-15 13:46 source
+
+ * Added check for out slots
+
+2012-02-15 01:16 source
+
+ * Added flag to create text index in silent mode
+
+2012-02-15 01:14 source
+
+ * Fixed do not check preds are placed when there is no from clause
+
+2012-01-31 13:50 source
+
+ * Fixed handling of primarykeys and foreignkeys in XMLA
+
+2012-01-24 00:43 source
+
+ * Added alt link in header
+
+2012-01-24 00:39 source
+
+ * Fixed DET ACLs
+
+2012-01-24 00:34 source
+
+ * Fixed issues with CalDav and Mac OS X 10.6
+
+2012-01-18 20:46 source
+
+ * Added ld+json
+
+2012-01-17 12:15 source
+
+ * Fixed cannot use inline macro as it may read past end of buffer
+
+2012-01-12 19:15 source
+
+ * Added support for scoping ACL to a virtual dir
+
+2012-01-12 11:21 source
+
+ * Added flag to know if conten-len actually is read
+
+2012-01-10 14:22 source
+
+ * Added pragma "get:cartridge"
+
+2012-01-10 14:21 source
+
+ * Added support for "define get:..." options in SPARUL LOAD
+
+2012-01-10 14:17 source
+
+ * Fixed debug output
+
+2012-01-10 14:16 source
+
+ * Fixed allow underline in ?actor_name as part of regular SPARQL
+
+2012-01-10 14:04 source
+
+ * Fixed indentation
+
+2012-01-10 14:02 source
+
+ * Fixed do not write end of message to output
+
+2012-01-10 13:57 source
+
+ * Fixed should not kill transactions when checkpoint is pending
+
+2012-01-10 13:54 source
+
+ * Added support functions for SPARQL Macro library syntax
+
+2012-01-10 13:53 source
+
+ * Fixed minor issues
+
+2012-01-10 13:50 source
+
+ * Added support for get:soft add to proxy service
+
+2012-01-09 14:42 source
+
+ * Added support for CardDAV
+ * Fixed updating Apple calendars
+
+2012-01-09 14:41 source
+
+ * Fixed must have certain permissions to do cleanup
+
+2011-12-14 16:05 source
+
+ * Added human readable HTML outputs for DESCRIBE (list and table)
+
+2011-12-14 15:57 source
+
+ * Fixed check for scope
+
+2011-12-14 15:56 source
+
+ * Fixed support for sparql load <file:///....> i.e. with absolute path
+ from system root
+
+2011-12-14 15:52 source
+
+ * Added support for wide and long-wide blobs
+
+2011-12-14 15:50 source
+
+ * Added atomic mode
+ * Added log mode parameter
+
+2011-12-14 15:48 source
+
+ * Fixed crash if stmt is invalid
+
+2011-12-08 21:25 source
+
+ * Added support for get:soft "add"
+
+2011-12-08 21:23 source
+
+ * Fixed RDF/XML parser to pass w3c tests dated 2003-Nov.
+
+2011-12-08 21:19 source
+
+ * Fixed if ssl session, make it regular as an error can leave it as ssl
+
+2011-12-08 21:16 source
+
+ * Added new function RDF_VIEW_DROP_STMT_BY_GRAPH
+
+2011-12-08 21:15 source
+
+ * Fixed only kill txn when we have the lt, else we should wait
+
+2011-12-08 21:11 source
+
+ * Fixed issue in IRI splitter used by RDFa serializer when namespace
+ ends in '%' if the last char of the original IRI was %nn
+
+2011-12-08 21:08 source
+
+ * Added new function DB.DBA.RDF_GRAPH_USER_PERMS_DEL
+
+2011-11-29 14:31 source
+
+ * Fixed reduntant lock on DB.DBA.RDF_QUAD is removed in cases where
+ RDF_QUAD was used as a stub
+
+2011-11-29 14:14 source
+
+ * Fixed labels
+
+2011-11-29 14:14 source
+
+ * Fixed use different physical graphs
+
+2011-11-29 13:53 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
+
+2011-11-29 13:35 source
+
+ * Fixed conditional on long/short in mutex_try_enter
+ * Fixed problem with MTX_DEBUG
+
+2011-11-29 10:11 source
+
+ * Fixed webid
+
+2011-11-29 10:10 source
+
+ * Removed duplicate procedure
+
+2011-11-29 10:06 source
+
+ * Updated sparql metadata version
+
+2011-11-29 00:01 source
+
+ * Fixed int64 comparision
+
+2011-11-28 21:18 source
+
+ * Added initial support for SPARQL MACRO
+
+2011-11-28 21:15 source
+
+ * Fixed types
+
+2011-11-28 20:59 source
+
+ * Fixed expression logic
+
+2011-11-28 12:15 source
+
+ * Added RDF_VIEW_SYNC_TO_PHYSICAL API call
+
+2011-11-28 10:11 source
+
+ * Added extra alias E_MAIL to options field
+
+2011-11-28 10:10 source
+
+ * Added support for nvarchar passwords
+
+2011-11-28 10:09 source
+
+ * Fixed show maintenance page when database is in atomic lock
+
+2011-11-28 10:07 source
+
+ * Fixed crash on passing NULLs to xpath_funcall with functions that
+ do not support NULLs
+
+2011-11-28 09:58 source
+
+ * Fixed issue with bad characters in long doublequoted strings
+
+2011-11-21 14:13 source
+
+ * Added support function for sponger to use dictionary for loading
+ the main stream
+
+2011-11-21 14:10 source
+
+ * Added argument to sparql_rdb2rdf_codegen() that describes the
+ translation of graph IRIs
+
+2011-11-21 13:43 source
+
+ * Fixed use options to make a physical graph different than a virtual
+
+2011-11-17 14:41 source
+
+ * Added aq_max_threads to sys_stat
+
+2011-11-17 14:39 source
+
+ * Fixed do not reset memcache flag for non-numeric dtps
+
+2011-11-16 15:27 source
+
+ * Fixed expressions should use NOT NULL
+
+2011-11-16 10:24 source
+
+ * FIxed if arg is already an XML entity, just copy it
+
+2011-11-16 10:23 source
+
+ * Fixed if dfe_tree is changed we cannot find the dfe later, so
+ make full copy, modify and pass it on
+
+2011-11-16 10:21 source
+
+ * Fixed integrity of graph security objects
+
+2011-11-16 10:18 source
+
+ * Fixed when left hand side of expr returns unknown, test the right hand
+ side for false, if so then return false
+
+2011-10-28 23:28 source
+
+ * Updated version to 6.1.4 for final release
+
+2011-10-28 23:22 source
+
+ * Enabled check for bad index due to XML fragment
+
+2011-10-28 23:21 source
+
+ * Added information about upgrading from previous 6.1.x to 6.1.4
+
+2011-10-28 21:46 source
+
+ * Fixed prototype
+
+2011-10-28 21:41 source
+
+ * Fixed datetime fraction
+
+2011-10-28 21:10 source
+
+ * Rebuild drivers
+
+2011-10-28 16:09 source
+
+ * Fixed disable strict void var checking as /fct sometimes generates
+ undefined vars
+
+2011-10-28 16:00 source
+
+ * Added support for setting syslog facility
+
+2011-10-28 15:56 source
+
+ * Fixed call auth check only when needed
+
+2011-10-28 15:55 source
+
+ * Fixed flags for ods
+
+2011-10-28 13:16 source
+
+ * Added common function for testing extensions for rdfxml
+
+2011-10-28 13:14 source
+
+ * Fixed encoding issues
+
+2011-10-26 15:38 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
+
+2011-10-26 15:22 source
+
+ * Added AddThis share buttons
+
+2011-10-26 09:34 source
+
+ * Fixed Compiled for line in usage
+ * Fixed compiler warning
+
+2011-10-26 00:21 source
+
+ * Updated documentation
+
+2011-10-26 00:00 source
+
+ * Fixed run check init on local
+
+2011-10-25 23:56 source
+
+ * Fixed package uninstall
+
+2011-10-25 23:56 source
+
+ file syncml_drop.sql was added on branch V6_0_0-DEVEL on 2011-10-25 23:58:36 +0000
+
+2011-10-25 23:54 source
+
+ * Added async rdf extraction
+
+2011-10-25 23:36 source
+
+ * Added opl:mentions and opl:NamedEntity class to OpenLink Attribution
+
+2011-10-25 23:31 source
+
+ file location.js was added on branch V6_0_0-DEVEL on 2011-10-25 23:37:37 +0000
+
+2011-10-25 23:31 source
+
+ * Added missing location support
+
+2011-10-25 23:28 source
+
+ * Added finger print from twitter entry
+ * Fixed minor issues
+
+2011-10-25 23:28 source
+
+ file twitter_fp2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-10-25 23:36:21 +0000
+
+2011-10-25 23:25 source
+
+ * Added support for Google+ comments
+
+2011-10-25 23:20 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
+
+2011-10-25 19:36 source
+
+ * Added new implementation of search_excerpt that can handle both
+ ANSI/UTF8 and Wide strings
+
+2011-10-25 10:54 source
+
+ * Fixed problems re-creating quad map
+
+2011-10-21 12:03 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
+
+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
+
+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
-2011-02-18 10:24 source
+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
+
+2010-01-25 20:45 source
+
+ * Fixed must commit before aq_wait
+
+2010-01-25 16:20 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 issue with closing XAConnection and connectionpool
+ * Fixed problem with MaxMempoolSize
+ * Fixed problem with driver properties
-2011-02-17 15:23 source
+2010-01-25 15:41 source
- * Fixed more log info
+ * Fixed shortened long URLs in the crawlers view to avoid UI breakage
-2011-02-16 21:08 source
+2010-01-25 15:12 source
- * Updated documentation
+ file googlebase2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-01-25 15:36:26 +0000
-2011-02-16 20:55 source
+2010-01-25 15:12 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
+ file oplgooglebase.owl was added on branch V6_0_0-DEVEL on 2010-01-25 15:36:26 +0000
-2011-02-16 20:53 source
+2010-01-25 15:12 source
- * FIxed avoid long URLs to generate wacky error
+ * Fixed support for Google Base 'products' item type
+ * Fixed headers
-2011-02-16 20:51 source
+2010-01-25 14:57 source
- * Fixed missing line
+ * Fixed use pipeline client in crawler
-2011-02-16 17:33 source
+2010-01-25 10:39 source
- * Fixed offers SIOC data
+ * Fixed accept different headers in pipeline request; add header only if
+ it contains something
-2011-02-16 17:32 source
+2010-01-15 13:47 source
- * Fixed if no svc and FF then show generator page
+ * Fixed crash when timeout was sent using dv_array_of_long
-2011-02-16 17:32 source
+2010-01-15 13:02 source
- * Fixed typo
+ * Fixed small lang conversion issue
-2011-02-16 17:31 source
+2010-01-15 12:16 source
- * Fixed missing case
+ * Rebuild driver
-2011-02-16 17:25 source
+2010-01-15 12:15 source
- * Fixed status controls
+ * Fixed issue with disconnect
+ * Fixed issue with XA exception
-2011-02-16 17:25 source
+2010-01-14 16:21 source
- * Fixed proper position
+ * Fixed bug calculating todays date
-2011-02-16 17:20 source
+2010-01-14 16:06 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
+ * 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
-2011-02-16 17:16 source
+2010-01-14 16:04 source
- * Fixed separate virtrdf:label into own file
+ * Added new popup calendar based on OAT
+ * Fixed use current OAT API function names
+ * FIxed explicit references to ymaps, gmaps
-2011-02-16 17:08 source
+2010-01-14 15:57 source
- * Fixed ADO.NET datatype handling
- * Fixed null pointer exception
+ * Added LICENSE and COPYING from OAT project
+ * Removed custom map loaders
+ * Fixed use current OAT API function names instead of backward compat
-2011-02-15 14:45 source
+2010-01-14 01:49 source
- * Fixed memory leaks
+ file COPYING was added on branch V6_0_0-DEVEL on 2010-01-14 15:57:39 +0000
-2011-02-15 14:11 source
+2010-01-14 01:49 source
- * Fixed signal errors other than deadlock
+ file LICENSE was added on branch V6_0_0-DEVEL on 2010-01-14 15:57:39 +0000
-2011-02-15 14:05 source
+2010-01-13 15:05 source
- * Fixed issues with --with-debug and setting CFLAGS
+ * Fixed non-rfc method to make URL
-2011-02-15 10:11 source
+2010-01-13 15:02 source
- * Fixed missing prototype
- * Fixed after free data_col make sure it is nil
+ * Fixed missing type cast
-2011-02-14 13:05 source
+2010-01-13 08:51 source
- * Updated version to 6.1.3-rc5
+ * Fixed user UI login pages
+ * Fixed user UI pages
+ * Fixed user home page field size
-2011-02-14 13:04 source
+2010-01-12 23:21 source
- * Fixed certificates
+ * Fixed decoding unicode escape sequences in post request
-2011-02-14 13:03 source
+2010-01-12 12:19 source
- * Fixed page load bug
+ * Fixed automated labels extraction
-2011-02-14 13:03 source
+2010-01-12 12:15 source
- * Added RSS and Atom imports
+ * Fixed memory leak
-2011-02-14 13:03 source
+2010-01-12 11:06 source
- * Fixed issue with dashboard
+ * Added doap:name for labeling
-2011-02-14 13:03 source
+2010-01-11 16:02 source
- * Fixed mail selection from private instances
- * Fixed encrypted emails
+ * Fixed primary topic from Offering to Product
-2011-02-14 12:51 source
+2010-01-11 14:19 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
+ * Fixed missing dcterms:publisher
-2011-02-14 12:49 source
+2010-01-07 17:09 source
- * Fixed try to resize map in a more mobile friendly way
+ * Imported docbook-xsl-1.75.2
-2011-02-14 12:48 source
+2010-01-07 16:56 source
- * Added more properties to virtlabel ontology
- * Fixed issues reported by W3C Validator
+ * Fixed copyright year to 2010
-2011-02-14 12:33 source
+2010-01-07 16:55 source
- * Fixed compiler warnings on SOlaris with openssl 1.0
+ * Fixed sync Contact UI with Profile UI
+ * Fixed copyright year to 2010
-2011-02-14 11:48 source
+2010-01-07 16:55 source
- * Fixed when P is known get stats on it to make better decision on
- execution plan
+ * 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
-2011-02-14 11:48 source
+2010-01-06 21:33 source
- * Fixed infinite loop when dealing with string like abc&def and no token
+ * Updated documentation
-2011-02-14 01:25 source
+2010-01-06 17:33 source
- * Fixed dump all mem references before dying
+ * Fixed bad transformation in feed when author has no name
+ * Fixed process media:contain properly re images
-2011-02-14 01:14 source
+2010-01-06 16:49 source
- * Fixed issue when client disconnects inside compile where no reset ctx
+ * 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.
-2011-02-11 13:19 source
+2010-01-06 16:47 source
- * Added ssl const decoration in explain
+ * Fixed default log mode in SPARUL MDW operations to distinquish
+ between NULL and 0 log mode
-2011-02-10 20:58 source
+2010-01-06 16:45 source
- * Added new bif getenv
+ * Fixed check if qi is actually available in this context
-2011-02-07 15:07 source
+2010-01-06 12:12 source
- * Fixed attribution
+ * Fixed handling of default graph URI param
-2011-02-04 15:36 source
+2010-01-05 19:12 source
- * Added check for max number of elements
+ * Added extra tests
-2011-02-03 13:30 source
+2010-01-05 18:24 source
- * Fixed check if there is dpipes to be placed before trans node
+ * Fixed moved commit work else async exec might generate new rdf_obj
-2011-02-03 11:27 source
+2010-01-04 11:54 source
- * Fixed when compiling statement with sparqre_qi == CALLER_LOCAL, do
- not pass this value to box_cast
+ * Fixed if null box then use 0 to prevent core dump
-2011-02-03 10:32 source
+2010-01-04 11:47 source
- * Fixed issue with namespace pollution in FireFox
+ * Fixed dependency
-2011-02-03 10:30 source
+2010-01-04 11:42 source
- * Added separate sponge and ack for rdf flags
- * Fixed copyright year
+ * Removed deprecated file
+
+2010-01-04 11:25 source
+
+ * Fixed typo
+
+2010-01-04 11:01 source
+
+ file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file autoidx-ng.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file autoidx.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file autotoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file biblio-iso690.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file biblio.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file block.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file callout.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file chunk-changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file chunk-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file chunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file chunkfast.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file chunktoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file component.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file division.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file ebnf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file footnote.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file formal.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
+
+ file glossary.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+
+2010-01-04 11:01 source
-2011-02-03 10:29 source
+ file graphics.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added pure RDFa cartridge
- * Fixed copyright year
+2010-01-04 11:01 source
-2011-02-03 10:28 source
+ file highlight.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * 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
+2010-01-04 11:01 source
-2011-02-03 09:26 source
+ file html-rtf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed box_cast when qst is CALLER_LOCAL
+2010-01-04 11:01 source
-2011-02-03 09:25 source
+ file html.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed copyright year
+2010-01-04 11:01 source
-2011-02-02 15:36 source
+ file htmltbl.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed make sure boxlen is within limits
+2010-01-04 11:01 source
-2011-02-02 12:06 source
+ file index.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added separate sponge and ack for rdf flags
+2010-01-04 11:01 source
-2011-02-02 11:28 source
+ file info.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added new location properties and datatypes
+2010-01-04 11:01 source
-2011-02-01 00:07 source
+ file inline.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed use origin as base
+2010-01-04 11:01 source
-2011-02-01 00:07 source
+ file keywords.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added support for virtrdf:image
+2010-01-04 11:01 source
-2011-01-31 20:47 source
+ file lists.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed declaration after statement
+2010-01-04 11:01 source
-2011-01-31 15:23 source
+ file maketoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed to follow http redirects
+2010-01-04 11:01 source
-2011-01-31 15:23 source
+ file manifest.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed memory leak if QUIETCAST query operates with ill formed
- data such as invalid date/time
+2010-01-04 11:01 source
-2011-01-31 11:17 source
+ file math.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed problem with upstreaming of updated and deleted posts
- * Fixed problem with triggers
+2010-01-04 11:01 source
-2011-01-31 11:16 source
+ file oldchunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added virtrdf-label for iCalendar
+2010-01-04 11:01 source
-2011-01-31 11:15 source
+ file onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed CSS of execution grid
+2010-01-04 11:01 source
-2011-01-31 10:48 source
+ file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed RDFa cartridge
+2010-01-04 11:01 source
-2011-01-31 10:45 source
+ file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added UI for Login Authentication Keys
+2010-01-04 11:01 source
-2011-01-30 15:23 source
+ file profile-chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed box_cast so QUIETCAST mode returns NULL instead of error
- even if the problem is detected in some nested function
+2010-01-04 11:01 source
-2011-01-28 17:34 source
+ file profile-chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed when on a queue, i.e. waiting for compile to finish, we freeze
- the thread so cpt can proceed
+2010-01-04 11:01 source
-2011-01-28 13:35 source
+ file profile-chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added namespace prefix 'fn' for 'http://www.w3.org/2005/xpath-functions/#'
- for XPATH 2.0 and XQuery 1.0 Core Functions library
+2010-01-04 11:01 source
-2011-01-28 13:34 source
+ file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed detection of bad blank nodes
+2010-01-04 11:01 source
-2011-01-28 13:32 source
+ file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed compiler warnings
+2010-01-04 11:01 source
-2011-01-28 13:31 source
+ file profile-onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added numeric_from_string_is_ok to do quick syntax check on string
- without actual parsing
+2010-01-04 11:01 source
-2011-01-28 13:29 source
+ file profile-onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added support for "xpath:function_IRI" syntax, which is usally an
- internal syntax for functions automatically recognized as XPATH
+2010-01-04 11:01 source
-2011-01-28 13:28 source
+ file qandaset.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed compiler warning
+2010-01-04 11:01 source
-2011-01-28 13:28 source
+ file qandaset.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Added xqr_stub_for_funcall
- * Fixed memory leak
+2010-01-04 11:01 source
-2011-01-28 13:26 source
+ file refentry.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed cast to xsd:float
+2010-01-04 11:01 source
-2011-01-28 13:26 source
+ file refentry.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed moved free inside of semaphore
+2010-01-04 11:01 source
-2011-01-27 14:19 source
+ file sections.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed use default smime
+2010-01-04 11:01 source
-2011-01-27 13:30 source
+ file sections.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed wrong condition check
+2010-01-04 11:01 source
-2011-01-27 12:43 source
+ file synop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added support for S/MIME encrypt and decrypt
+2010-01-04 11:01 source
-2011-01-26 17:52 source
+ file synop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed missing namespace in </results>
+2010-01-04 11:01 source
-2011-01-25 19:15 source
+ file table.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed cost model to count inx cond and scale card at end
+2010-01-04 11:01 source
-2011-01-25 18:54 source
+ file table.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed in log replay we can drop the old objects to free memory
+2010-01-04 11:01 source
-2011-01-25 14:51 source
+ file task.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Updated version to 6.1.3-rc4
+2010-01-04 11:01 source
-2011-01-25 14:39 source
+ file task.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed allocate space for \0 terminator
+2010-01-04 11:01 source
-2011-01-25 14:38 source
+ file titlepage.templates.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed memory leak
+2010-01-04 11:01 source
-2011-01-25 14:36 source
+ file titlepage.templates.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed compiler warning
+2010-01-04 11:01 source
-2011-01-25 14:35 source
+ file titlepage.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added configurable normalization of accented characters
+2010-01-04 11:01 source
-2011-01-25 14:33 source
+ file titlepage.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed compiler warnings
+2010-01-04 11:01 source
-2011-01-25 14:32 source
+ file toc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed wrong buffer
+2010-01-04 11:01 source
-2011-01-25 14:30 source
+ file toc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed crawling aside of the target
- * Fixed no more need of dummy targets
- * Fixed decrease use of lock on site table
+2010-01-04 11:01 source
-2011-01-25 14:29 source
+ file verbatim.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed python initialization
+2010-01-04 11:01 source
-2011-01-25 14:11 source
+ file verbatim.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Aded linkedIn login/register
- * Fixed bad profile UI
- * FIxed hyperlink session expire issue
+2010-01-04 11:01 source
-2011-01-25 14:09 source
+ file xref.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed use base as origin on zillow
+2010-01-04 11:01 source
-2011-01-25 14:09 source
+ file xref.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
- * Fixed do not try to put headers when an error is detected
+2010-01-04 11:01 source
-2011-01-25 14:07 source
+ file Makefile.DocBook was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed connection check page
- * Fixed error message generation in execute
- * Fixed Preferences dialog
+2010-01-04 11:01 source
-2011-01-25 14:00 source
+ file Makefile.combine was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed cosmetics and layout
+2010-01-04 11:01 source
-2011-01-25 13:53 source
+ file Makefile.docParam was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added RDF graph property for links
+2010-01-04 11:01 source
-2011-01-25 13:52 source
+ file admon.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added IMAP support
+2010-01-04 11:01 source
-2011-01-25 13:51 source
+ file annotations.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed install issue with new DB
- * Fixed parent
+2010-01-04 11:01 source
-2011-01-25 13:50 source
+ file autoidx-kimber.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed UI
+2010-01-04 11:01 source
-2011-01-25 13:17 source
+ file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2011-01-22 14:12 source
+ file autoidx-ng.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed check for blank node in wrong places
+2010-01-04 11:01 source
-2011-01-21 13:43 source
+ file autoidx.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed no need to access .cfg file for plain ?query= call
+2010-01-04 11:01 source
-2011-01-19 13:17 source
+ file autolayout.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed codegen for xsd:decimal() and similar cast operations
+2010-01-04 11:01 source
-2011-01-18 14:36 source
+ file autotoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added configurable normalization of accented characters
+2010-01-04 11:01 source
-2011-01-18 10:41 source
+ file biblio-iso690.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added normalization of accented characters
+2010-01-04 11:01 source
-2011-01-18 10:32 source
+ file biblio.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed debug code
+2010-01-04 11:01 source
-2011-01-18 10:31 source
+ file block.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed more debug output for xte_word_range
+2010-01-04 11:01 source
-2011-01-11 22:41 source
+ file callout.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed compiler warnings
+2010-01-04 11:01 source
-2011-01-11 22:38 source
+ file changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed whitespace
+2010-01-04 11:01 source
-2011-01-11 13:18 source
+ file chunk-changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added mime_header function to parse rfc header of mail message
+2010-01-04 11:01 source
-2011-01-11 13:14 source
+ file chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed commented out bogus help button
+2010-01-04 11:01 source
-2011-01-11 13:13 source
+ file chunk-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added more prefixes
+2010-01-04 11:01 source
-2011-01-11 13:12 source
+ file chunk-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added new entries to virtrdf-label
+2010-01-04 11:01 source
-2011-01-11 10:33 source
+ file chunk-tabular.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added new SPARQL-to-SQL codegen for type cast functions
+2010-01-04 11:01 source
-2011-01-11 10:32 source
+ file chunk-website.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed set box flags to BF_IRI in this special case as graphs are IRIs
+2010-01-04 11:01 source
-2011-01-10 20:49 source
+ file chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added transitivity cache
+2010-01-04 11:01 source
-2011-01-10 16:56 source
+ file chunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed bifs returning int or date should use same cast as auto
+2010-01-04 11:01 source
-2011-01-10 13:23 source
+ file chunkfast.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed width of users, capabilities listings
+2010-01-04 11:01 source
-2011-01-10 13:22 source
+ file chunktoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed use sitemaps for default crawling, option for depth
- * Fixed links conversion should be off by default
- * Fixed issue with listing
+2010-01-04 11:01 source
-2011-01-10 11:51 source
+ file component.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * FIxed missing initialization
+2010-01-04 11:01 source
-2011-01-07 17:18 source
+ file division.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed set timeout only when non empty
+2010-01-04 11:01 source
-2011-01-07 15:42 source
+ file docbook-xsl-update was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed when explicit output format is give, make it part of the
- query text so don't cache eventual internal guess to turtle output
+2010-01-04 11:01 source
-2011-01-07 15:08 source
+ file ebnf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added cxml and csv links
- * Fixed link layout
+2010-01-04 11:01 source
-2011-01-07 14:12 source
+ file footnote.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed allow bigger header values to be returned
+2010-01-04 11:01 source
-2011-01-05 20:58 source
+ file formal.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * 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
+2010-01-04 11:01 source
-2011-01-05 20:14 source
+ file glossary.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed declaration after statement warning
+2010-01-04 11:01 source
-2011-01-05 13:58 source
+ file graphics.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed search and page load behaviour
- * Fixed RefByAll result page
+2010-01-04 11:01 source
-2011-01-05 12:45 source
+ file head.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed align at 8 when double align defined
- * Fixed always return NULL when allocation failed
+2010-01-04 11:01 source
-2011-01-05 12:44 source
+ file highlight.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed compiler warnings
+2010-01-04 11:01 source
-2011-01-05 12:36 source
+ file html-rtf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added OWL mime type
+2010-01-04 11:01 source
-2011-01-05 01:58 source
+ file html.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed stats on inference
+2010-01-04 11:01 source
-2011-01-03 23:37 source
+ file htmltbl.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * 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
+2010-01-04 11:01 source
-2011-01-03 21:23 source
+ file index.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed json tcn
+2010-01-04 11:01 source
-2011-01-03 21:22 source
+ file info.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added optional vCal QRCode
- * Fixed date change in events/tasks
+2010-01-04 11:01 source
-2011-01-03 21:21 source
+ file inline.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added optional vCard QRCode
+2010-01-04 11:01 source
-2011-01-03 21:21 source
+ file keywords.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed UI of maintenance page
- * Fixed ref-by command output
+2010-01-04 11:01 source
-2011-01-03 21:14 source
+ file lists.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * 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
+2010-01-04 11:01 source
-2011-01-03 21:11 source
+ file makefile-dep.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * 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
+2010-01-04 11:01 source
-2011-01-03 21:09 source
+ file maketoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added properties to enable HTTP DIGEST auth on some browsers
+2010-01-04 11:01 source
-2011-01-03 21:02 source
+ file manifest.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added Groupon cartridge
- * Added RDFohloh cartridge
- * Added EOL cartridge
- * Fixed use common API to delete target
- * Fixed minor issues
+2010-01-04 11:01 source
-2011-01-03 10:21 source
+ file math.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added support for FILTER EXISTST and FILTER NOT EXISTS
- * Added partial support for MINUS
+2010-01-04 11:01 source
-2011-01-03 10:18 source
+ file oldchunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * FIxed minor issues
+2010-01-04 11:01 source
-2011-01-03 10:17 source
+ file olink.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed issue with large number of namespace declarations
+2010-01-04 11:01 source
-2010-12-23 16:33 source
+ file onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed JSON tcn for host-meta
+2010-01-04 11:01 source
-2010-12-22 20:58 source
+ file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed default options
+2010-01-04 11:01 source
-2010-12-22 10:31 source
+ file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed issue with aggregates and ORDER BY
+2010-01-04 11:01 source
-2010-12-22 10:27 source
+ file profile-chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed issue with DATATYPE
+2010-01-04 11:01 source
-2010-12-22 10:25 source
+ file refentry.007.ns.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed string is aligned to 8
- * Fixed wide data must be presented as UTF8 before hash chksum
+2010-01-04 11:01 source
-2010-12-21 12:27 source
+ file refentry.007.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed whitespace
+2010-01-04 11:01 source
-2010-12-21 10:42 source
+ file rss.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added retry on deadlock when sponging on multiple threads
+2010-01-04 11:01 source
-2010-12-20 21:43 source
+ file tabular.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Updated version to 6.1.3-rc2
+2010-01-04 11:01 source
-2010-12-20 19:12 source
+ file titlepage.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed minor issue
+2010-01-04 11:01 source
-2010-12-20 18:20 source
+ file titlepage.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed layout to make optional qrcode fit without wasting space
- * Fixed tabs CSS and overall margins etc
+2010-01-04 11:01 source
-2010-12-20 18:09 source
+ file toc-tabular.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed sqltype and display size of DV_IRI_ID column
+2010-01-04 11:01 source
-2010-12-20 13:26 source
+ file toc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed merge error
+2010-01-04 11:01 source
-2010-12-20 12:31 source
+ file website-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed missing column error in SPARQL-to-SQL preprocessor
+2010-01-04 11:01 source
-2010-12-20 12:27 source
+ file website-targets.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added support for Twitter
- * Added JSON format for webfinger
- * Added optional qrcode
+2010-01-04 11:01 source
-2010-12-20 12:26 source
+ file website.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Fixed missing files from vad
+2010-01-04 11:01 source
-2010-12-20 12:26 source
+ file xbel.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
- * Added progress bar, ping and ACL
+2010-01-04 11:01 source
-2010-12-20 12:22 source
+ file CTOCWidget.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added option to use tidy before loading rdfa
+2010-01-04 11:01 source
-2010-12-20 11:34 source
+ file arr-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-12-17 17:40 source
+ file arr-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added support for connection string parameters with or without
- spaces in name
- * Fixed removed workaround for rollback msg
+2010-01-04 11:01 source
-2010-12-17 11:27 source
+ file arrow.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed must not return error during rollback on killed txn
+2010-01-04 11:01 source
-2010-12-16 19:47 source
+ file blank.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed sparql select (1) { { ?:sss ?p ?o } optional { ?s1 ?p1 ?o1 }}
- (t1.S=sss condition was lost before)
+2010-01-04 11:01 source
-2010-12-15 15:25 source
+ file blank.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed index_only on partial can return has data even if main row
- does not
+2010-01-04 11:01 source
-2010-12-15 12:47 source
+ file blocks-spec.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added small optimizations
+2010-01-04 11:01 source
-2010-12-15 12:19 source
+ file blocks2dbk.dtd was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added optimization to look at GS index only
+2010-01-04 11:01 source
-2010-12-15 10:42 source
+ file blocks2dbk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added support for define input:inference in SAPRQL DESCRIBE
+2010-01-04 11:01 source
-2010-12-14 19:18 source
+ file bullet.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added JSON format for /.well-known/host-meta
+2010-01-04 11:01 source
-2010-12-14 13:22 source
+ file but-fforward.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed cxml generation options
+2010-01-04 11:01 source
-2010-12-14 13:22 source
+ file but-info.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed compiler warning
+2010-01-04 11:01 source
-2010-12-14 12:10 source
+ file but-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed use CURI to make smaller footprint
+2010-01-04 11:01 source
-2010-12-14 12:07 source
+ file but-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed hreview aggreates
- * Fixed use CURI to make smaller qrcode
- * Fixed CRLF
+2010-01-04 11:01 source
-2010-12-13 21:32 source
+ file but-rewind.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed 'none' is a special case with value 1
+2010-01-04 11:01 source
-2010-12-13 15:08 source
+ file closed.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed crash when only option inference is given without define
+2010-01-04 11:01 source
-2010-12-13 15:08 source
+ file cmp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed cxml
+2010-01-04 11:01 source
-2010-12-13 11:17 source
+ file css.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed utf8_exec server issue
+2010-01-04 11:01 source
-2010-12-13 10:24 source
+ file date-time.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed comparison of VARCHAR and UNAME box whith identical content
+2010-01-04 11:01 source
-2010-12-13 10:23 source
+ file dbk2ooo.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added three new aggregates mostly for use with SPARQL-BI
+2010-01-04 11:01 source
-2010-12-13 10:22 source
+ file dbk2pages.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added support for passing NVARCHAR arguments to thread-safe dicts
+2010-01-04 11:01 source
-2010-12-13 10:20 source
+ file dbk2wordml.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed check for mobile devices
+2010-01-04 11:01 source
-2010-12-12 18:09 source
+ file dbk2wp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * 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-01-04 11:01 source
-2010-12-10 16:12 source
+ file default.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2010-12-10 16:02 source
+ file example.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Removed extra debugging
- * Fixed comments
+2010-01-04 11:01 source
-2010-12-10 15:43 source
+ file flat.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-12-10 15:28 source
+ file frames.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * 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-01-04 11:01 source
-2010-12-10 15:27 source
+ file graphics.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * 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-01-04 11:01 source
-2010-12-10 15:19 source
+ file hidetoc.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Merged from V5
+2010-01-04 11:01 source
-2010-12-10 15:18 source
+ file htmlhelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed do not do row autocommit when uploading with DAV api
- as this will break trigger logic
+2010-01-04 11:01 source
-2010-12-10 12:24 source
+ file jscript.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added new testcases
+2010-01-04 11:01 source
-2010-12-10 12:00 source
+ file markup.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed deref of uninitialized memory
+2010-01-04 11:01 source
-2010-12-10 11:59 source
+ file math.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * FIxed uninitialized variable
+2010-01-04 11:01 source
-2010-12-10 11:58 source
+ file nav-home.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed deref of uninited memory
+2010-01-04 11:01 source
-2010-12-09 14:00 source
+ file nav-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed FOAF import
+2010-01-04 11:01 source
-2010-12-09 13:57 source
+ file nav-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed convert link option
+2010-01-04 11:01 source
-2010-12-09 12:16 source
+ file nav-toc.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added hRecipe cartridge
+2010-01-04 11:01 source
-2010-12-09 09:53 source
+ file nav-toc.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed NULL case in patch_restricted_xml_chars()
+2010-01-04 11:01 source
-2010-12-08 16:08 source
+ file nav-up.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed sparql aggregate
+2010-01-04 11:01 source
-2010-12-08 16:04 source
+ file nav-up.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * 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-01-04 11:01 source
-2010-12-07 11:30 source
+ file node.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Updated version of adapter
+2010-01-04 11:01 source
-2010-12-07 11:11 source
+ file normalise-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added 'Owns', 'Knows' and 'Social Network'
- * Added profile security for offers, likes etc
- * Enhanced import procedure
- * Fixed small issues
+2010-01-04 11:01 source
-2010-12-07 10:38 source
+ file normalise2sections.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added microblog template
+2010-01-04 11:01 source
-2010-12-07 10:32 source
+ file open.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added 'Knows' to the import
- * Enhanced import procedure
+2010-01-04 11:01 source
-2010-12-06 17:10 source
+ file overlay.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added MinExpiration param for sponger
+2010-01-04 11:01 source
-2010-12-06 17:09 source
+ file pages2normalise.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-12-06 17:08 source
+ file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * FIxed show better message instead of error on url parse
+2010-01-04 11:01 source
-2010-12-06 10:34 source
+ file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed max dns name is 250 chars
+2010-01-04 11:01 source
-2010-12-06 10:34 source
+ file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added copy_list_to_array and revlist_to_array for plugins
+2010-01-04 11:01 source
-2010-12-06 10:33 source
+ file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed if we have bad fd in saved sessions, check which one and
- remove, to avoid busy loop on unix
+2010-01-04 11:01 source
-2010-11-30 12:34 source
+ file plain-titlepage.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed use char flags instead of bitfield
+2010-01-04 11:01 source
-2010-11-30 12:33 source
+ file plain-titlepage.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added optimization for case when there is no locality
+2010-01-04 11:01 source
-2010-11-30 12:33 source
+ file plain.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed must lock mtx before reading cache
+2010-01-04 11:01 source
-2010-11-29 14:37 source
+ file plain.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * FIxed minor issues
+2010-01-04 11:01 source
-2010-11-29 14:36 source
+ file plus.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added statistics on how many remaps are free
+2010-01-04 11:01 source
-2010-11-26 21:23 source
+ file pointer.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed busy loop when no free remaps
+2010-01-04 11:01 source
-2010-11-26 10:47 source
+ file profile-mode.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added extra debugging on shared cache
+2010-01-04 11:01 source
-2010-11-26 10:46 source
+ file profile.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed issue compiling extensions in debug mode
+2010-01-04 11:01 source
-2010-11-25 19:53 source
+ file sections-spec.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed must cut before print else will return wrong error
+2010-01-04 11:01 source
-2010-11-24 11:41 source
+ file sections2blocks.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed use external bif_tidy in the crawler
+2010-01-04 11:01 source
-2010-11-24 11:36 source
+ file showtoc.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed mark transaction as ended in provider if virtuoso server kills
- the transaction
+2010-01-04 11:01 source
-2010-11-23 19:30 source
+ file slides-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * FIxed issue with DISTINCT and ORDER BY
+2010-01-04 11:01 source
-2010-11-23 19:28 source
+ file slides-default.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * FIxed "delayed" crash in case of passing wrong argument
+2010-01-04 11:01 source
-2010-11-23 19:27 source
+ file slides-frames.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added check for tidy in crawler
+2010-01-04 11:01 source
-2010-11-23 19:26 source
+ file slides-plain.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed minor issue
+2010-01-04 11:01 source
-2010-11-23 10:20 source
+ file slides-table.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed bad test
+2010-01-04 11:01 source
-2010-11-22 20:40 source
+ file slides-w3c.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed issue with sparql-fed
+2010-01-04 11:01 source
-2010-11-22 20:39 source
+ file slides.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed prevent assert on large box
+2010-01-04 11:01 source
-2010-11-22 14:26 source
+ file slides.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed issue with bnode
+2010-01-04 11:01 source
-2010-11-22 11:28 source
+ file specifications.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added VirtuosoQueryEngine auto registration was added to VirtGraph
- static initilization
+2010-01-04 11:01 source
-2010-11-22 11:06 source
+ file stdlib.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Rebuild driver
+2010-01-04 11:01 source
-2010-11-22 11:00 source
+ file string.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Rebuild drivers
+2010-01-04 11:01 source
-2010-11-22 10:59 source
+ file strip-attributes.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed JDBC driver lost prepared data after execution query, so next
- execute of prepared query throws exception
+2010-01-04 11:01 source
-2010-11-20 10:57 source
+ file svg.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added bif patch_restrictec_xml_chars()
+2010-01-04 11:01 source
-2010-11-19 16:50 source
+ file tables.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added Likes and DisLikes
+2010-01-04 11:01 source
-2010-11-19 16:49 source
+ file template-pages.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added group sharing
- * Fixed extended user's select
+2010-01-04 11:01 source
-2010-11-19 16:47 source
+ file template.dot was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Updated to ckeditor version 3.4.2
+2010-01-04 11:01 source
-2010-11-19 16:45 source
+ file template.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added optimizations
- * Added checking for rdfa dtd
+2010-01-04 11:01 source
-2010-11-19 16:43 source
+ file ua.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed use integer for https_verity and https_cv_depth
- * Fixed use uppercase for SSL auth
+2010-01-04 11:01 source
-2010-11-19 16:41 source
+ file uri.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Added setup for DET on collections
+2010-01-04 11:01 source
-2010-11-19 14:25 source
+ file use.local.olink.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed wrong number of params
+2010-01-04 11:01 source
-2010-11-19 14:25 source
+ file use.role.as.xrefstyle.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed busy loop
+2010-01-04 11:01 source
-2010-11-17 21:30 source
+ file use.role.for.mediaobject.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added function to get DTD identifiers
+2010-01-04 11:01 source
-2010-11-17 21:29 source
+ file use.svg.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed dimension is not in triples
+2010-01-04 11:01 source
-2010-11-17 21:29 source
+ file variablelist.as.blocks.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed page debug
+2010-01-04 11:01 source
-2010-11-17 21:28 source
+ file variablelist.as.table.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed name in footer
+2010-01-04 11:01 source
-2010-11-17 21:27 source
+ file variablelist.max.termlength.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added initialize query text option for /sparql
+2010-01-04 11:01 source
-2010-11-16 20:17 source
+ file variablelist.term.break.after.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed do not try to close bad filedescriptor as windows does not
- like this
+2010-01-04 11:01 source
-2010-11-16 14:30 source
+ file variablelist.term.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added imap client support
+2010-01-04 11:01 source
-2010-11-15 20:12 source
+ file variablelist.term.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed if we have a qr with no params at all, exec should signal error
+2010-01-04 11:01 source
-2010-11-15 16:51 source
+ file verbatim.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed issue with combination of UNION in the argument of IN causing
- General internal Optimized compiler error
+2010-01-04 11:01 source
-2010-11-15 16:47 source
+ file vslides.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed record the thread which entered/left the buffer in debug mode
+2010-01-04 11:01 source
-2010-11-15 10:13 source
+ file w3c-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed do not attempt to parse empty content
+2010-01-04 11:01 source
-2010-11-12 21:01 source
+ file w3c-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed only check pages in online backup
+2010-01-04 11:01 source
-2010-11-12 21:00 source
+ file w3c-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed recovery mode
+2010-01-04 11:01 source
-2010-11-12 21:00 source
+ file w3c-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed send body of 509 bandwidth error
+2010-01-04 11:01 source
-2010-11-11 16:06 source
+ file w3c-toc.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Updated version to 6.1.3-rc1
+2010-01-04 11:01 source
-2010-11-11 15:53 source
+ file w3c-toc.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed check for sql disabled flag
+2010-01-04 11:01 source
-2010-11-11 12:38 source
+ file w3c.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
- * Fixed group editing
- * Fixed WebID for Briefcase instances
+2010-01-04 11:01 source
-2010-11-11 12:34 source
+ file wordml.template.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added group sharing
+2010-01-04 11:01 source
-2010-11-11 11:23 source
+ file wordml2normalise.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added special immutable setting for inf rules
+2010-01-04 11:01 source
-2010-11-10 15:59 source
+ file writing.mode.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed use dsn from content-location when it exists
+2010-01-04 11:01 source
-2010-11-10 15:45 source
+ file xbCollapsibleLists.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed pass headers as options so every cartridge can read
+2010-01-04 11:01 source
-2010-11-10 12:00 source
+ file xbCollapsibleLists.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added magic key export
+2010-01-04 11:01 source
-2010-11-10 11:59 source
+ file xbDOM.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed stack corruption on 64bit
+2010-01-04 11:01 source
-2010-11-09 21:47 source
+ file xbDOM.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed memleak when error is signalled
+2010-01-04 11:01 source
-2010-11-09 21:44 source
+ file xbDebug.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed avoid re-define
+2010-01-04 11:01 source
-2010-11-09 21:42 source
+ file xbLibrary.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed remove call to SP before it is defined
+2010-01-04 11:01 source
-2010-11-09 20:19 source
+ file xbLibrary.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed https access
- * Fixed ACL UI
+2010-01-04 11:01 source
-2010-11-09 20:18 source
+ file xbStyle-css.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * 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-01-04 11:01 source
-2010-11-09 20:15 source
+ file xbStyle-nn4.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added initial support for Salmon protocol
- * Fixed check for email
- * Fixed uninstall problem
+2010-01-04 11:01 source
-2010-11-09 20:12 source
+ file xbStyle-not-supported.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added signed mails
- * Fixed https access
+2010-01-04 11:01 source
-2010-11-09 20:12 source
+ file xbStyle.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed move groups from briefcase into ODS framework
- * Fixed https access
+2010-01-04 11:01 source
-2010-11-09 20:11 source
+ file xbStyle.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed https access
- * Fixed labels
+2010-01-04 11:01 source
-2010-11-09 20:11 source
+ file xep.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed https access
+2010-01-04 11:01 source
-2010-11-09 20:01 source
+ file xep.index.item.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed properly encode the query before passing it to PivotViewer
+2010-01-04 11:01 source
-2010-11-09 19:59 source
+ file xref.label-page.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed more labels
+2010-01-04 11:01 source
-2010-11-09 10:59 source
+ file xref.label-title.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed split part of MTX_DEBUG into PAGE_DEBUG
+2010-01-04 11:01 source
-2010-11-08 15:42 source
+ file xref.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed prevent bad data to crash system during deserialization
+2010-01-04 11:01 source
-2010-11-08 12:37 source
+ file xref.title-page.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Added http://loc.openlinksw.com/sparql as registered endpoint
- * Fixed URIs in resultview anchors
+2010-01-04 11:01 source
-2010-11-08 12:35 source
+ file xref.with.number.and.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * 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-01-04 11:01 source
-2010-11-08 12:21 source
+ file xsl2profile.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
- * Fixed ACL update
+2010-01-04 11:01 source
-2010-11-08 11:46 source
+ file qanda.title.level5.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed minor issue
+2010-01-04 11:01 source
-2010-11-08 11:45 source
+ file qanda.title.level6.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added ACL settings
- * Added new type
- * Added CORS options
- * Fixed layout of cert generation form
- * Fixed label of cartridges
+2010-01-04 11:01 source
-2010-11-08 11:08 source
+ file qanda.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added check by entity type
+2010-01-04 11:01 source
-2010-11-05 20:23 source
+ file qandadiv.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed check dp before processing
+2010-01-04 11:01 source
-2010-11-05 10:57 source
+ file rebuild-all.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed explanation of rdf inf failures
+2010-01-04 11:01 source
-2010-11-05 10:56 source
+ file refclass.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed bad condition of extension, do not push local imports
+2010-01-04 11:01 source
-2010-11-05 10:54 source
+ file refentry.date.profile.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed /sparql/ endpoint to show/hide controls
- * Fixed show supported formats depending on configuration
+2010-01-04 11:01 source
-2010-11-05 10:53 source
+ file refentry.date.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed CXML desc support
+2010-01-04 11:01 source
-2010-11-04 18:18 source
+ file refentry.generate.name.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed typo
+2010-01-04 11:01 source
-2010-11-02 19:14 source
+ file refentry.generate.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added cxml det
+2010-01-04 11:01 source
-2010-11-02 19:12 source
+ file refentry.manual.fallback.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed top/skip should only work for non-multistate
- * Fixed recover when itc is unregistered
+2010-01-04 11:01 source
-2010-11-01 14:15 source
+ file refentry.manual.profile.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * FIxed only skip when initialized
+2010-01-04 11:01 source
-2010-10-29 14:12 source
+ file refentry.manual.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed when pl stats collection is enabled, the hash must be
- protected in order to avoid crash
+2010-01-04 11:01 source
-2010-10-29 14:11 source
+ file refentry.meta.get.quietly.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * 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-01-04 11:01 source
-2010-10-29 14:09 source
+ file refentry.pagebreak.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed unbalanced } outside ifdef
+2010-01-04 11:01 source
-2010-10-29 14:08 source
+ file refentry.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added function alias
+2010-01-04 11:01 source
-2010-10-29 14:08 source
+ file refentry.source.fallback.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed when selection list contains expressions with constants do
- not inline OJ
+2010-01-04 11:01 source
-2010-10-27 12:59 source
+ file refentry.source.name.profile.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed issues with sparql fed
+2010-01-04 11:01 source
-2010-10-27 12:56 source
+ file refentry.source.name.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added new bif functions dict_iter_hash and dict_key_eq
+2010-01-04 11:01 source
-2010-10-27 12:55 source
+ file refentry.source.name.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added page enter debugging
+2010-01-04 11:01 source
-2010-10-27 12:53 source
+ file refentry.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support for CORS
+2010-01-04 11:01 source
-2010-10-27 12:52 source
+ file refentry.version.profile.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed check all the cos in gby to be numeric types
+2010-01-04 11:01 source
-2010-10-27 12:51 source
+ file refentry.version.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added debug line pragmas
+2010-01-04 11:01 source
-2010-10-27 12:50 source
+ file refentry.version.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed debug assert for itc_is_registered
+2010-01-04 11:01 source
-2010-10-25 13:23 source
+ file refentry.xref.manvolnum.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed compiler warnings
+2010-01-04 11:01 source
-2010-10-25 13:19 source
+ file reference.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed rdf boxes cmp
- * Fixed rdf inf loading
+2010-01-04 11:01 source
-2010-10-25 13:15 source
+ file region.after.extent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed allow all users to have user_t so they can have their own
- encryption keys
+2010-01-04 11:01 source
-2010-10-22 21:12 source
+ file region.before.extent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-10-22 16:34 source
+ file revhistory.table.cell.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed link warning
+2010-01-04 11:01 source
-2010-10-22 16:31 source
+ file revhistory.table.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed issue with shadowing local variable in java hosting
+2010-01-04 11:01 source
-2010-10-22 14:58 source
+ file revhistory.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed temporary disabled code
+2010-01-04 11:01 source
-2010-10-22 12:31 source
+ file root.filename.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed single does not have a dpipe
+2010-01-04 11:01 source
-2010-10-22 10:28 source
+ file root.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-10-22 09:52 source
+ file rootid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed missing symbol
+2010-01-04 11:01 source
-2010-10-22 09:50 source
+ file runinhead.default.title.end.punct.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed rb can be twice as it is a ref
+2010-01-04 11:01 source
-2010-10-20 16:04 source
+ file runinhead.title.end.punct.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed problem with extremely large XML doc
+2010-01-04 11:01 source
-2010-10-19 12:38 source
+ file running.foot.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added dynamic resizing of result block
+2010-01-04 11:01 source
-2010-10-18 18:50 source
+ file sans.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed issue with SPARQL CONSTRUCT/INSERT/DELETE/MODIFY queries
+2010-01-04 11:01 source
-2010-10-18 12:18 source
+ file saxon.callouts.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-10-18 12:14 source
+ file saxon.character.representation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed when operation is count etc, aggregate returning a number
- does not do memcache only in order to avoid running out of memory
+2010-01-04 11:01 source
-2010-10-18 12:01 source
+ file saxon.linenumbering.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added new functions to ImageMagick plugin
+2010-01-04 11:01 source
-2010-10-15 11:37 source
+ file saxon.tablecolumns.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed fct_label on v6 single
+2010-01-04 11:01 source
-2010-10-13 13:59 source
+ file script.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed the xe_make_copy is valid only for XMLTYPE, not for every UDT
+2010-01-04 11:01 source
-2010-10-13 13:59 source
+ file section.autolabel.max.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed gpf
+2010-01-04 11:01 source
-2010-10-13 12:12 source
+ file section.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added rsh-sha256
- * Added xenc_dsig_verify, xenc_dsig_sign and xenc_key_RDA_construct
+2010-01-04 11:01 source
-2010-10-13 12:11 source
+ file section.container.element.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Removed old upgrade code
+2010-01-04 11:01 source
-2010-10-13 12:09 source
+ file section.label.includes.component.label.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed BestBuy cartridge
+2010-01-04 11:01 source
-2010-10-13 12:07 source
+ file section.level1.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added checks for value ranges
- * Added paging through 'Related Collections' links
+2010-01-04 11:01 source
-2010-10-13 12:02 source
+ file section.level2.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-10-13 12:00 source
+ file section.level3.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL semantic ping
- * Fixed encoding problems
- * Fixed JS error
+2010-01-04 11:01 source
-2010-10-13 11:59 source
+ file section.level4.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL semantic ping
- * Fixed encoding problems
- * Optimized page load
+2010-01-04 11:01 source
-2010-10-13 11:58 source
+ file section.level5.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed encoding problems
- * Fixed and optimized users and webIDs
- * Fixed sharings
- * Optimized page load
+2010-01-04 11:01 source
-2010-10-13 10:36 source
+ file section.level6.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL semantic ping
- * Fixed and optimized users and webIDs
- * Fixed empty lists
- * Fixed encoding problems
- * Optimized page load
+2010-01-04 11:01 source
-2010-10-13 10:35 source
+ file section.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL semantic ping
- * Fixed encoding problems
+2010-01-04 11:01 source
-2010-10-13 10:34 source
+ file section.title.level1.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL semantic ping
- * Fixed and optimized users and webIDs
- * Fixed encoding problems
- * Fixed empty lists
- * Optimized page load
+2010-01-04 11:01 source
-2010-10-13 10:33 source
+ file section.title.level2.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL semantic ping
- * Fixed and optimized users and webIDs
- * Fixed JS map error
- * Fixed JS errors
- * Fixed tabs
- * Fixed encoding problems
+2010-01-04 11:01 source
-2010-10-12 17:35 source
+ file section.title.level3.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed bug when filer (num <>= (subq))
+2010-01-04 11:01 source
-2010-10-12 12:23 source
+ file section.title.level4.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added support for latest tidylib
+2010-01-04 11:01 source
-2010-10-07 23:31 source
+ file section.title.level5.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed some issues with dsig_verify
+2010-01-04 11:01 source
-2010-10-07 13:29 source
+ file section.title.level6.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed new debug macro DK_ALLOC_BOX_DEBUG for basic integrety checks
- without overhead of full MALLOC_DEBUG
+2010-01-04 11:01 source
-2010-10-07 13:24 source
+ file section.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added item ACL
- * Added ACL Inheritance
- * Fixed update
- * Fixed tag bug
+2010-01-04 11:01 source
-2010-10-07 13:07 source
+ file segmentedlist.as.table.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed minor issue
+2010-01-04 11:01 source
-2010-10-07 13:00 source
+ file sequential.links.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL Inheritance
- * Fixed updated UI
+2010-01-04 11:01 source
-2010-10-07 13:00 source
+ file shade.verbatim.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-10-07 12:58 source
+ file shade.verbatim.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL Inheritance
- * Fixed optimized progress bar
- * Fixed read/unread actions
- * Fixed encoding problem
- * Fixed updated UI
- * Removed deprecated icons
+2010-01-04 11:01 source
-2010-10-07 12:56 source
+ file show.comments.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL Inheritance
- * Fixed ACL recalc bug
- * Fixed updated UI
+2010-01-04 11:01 source
-2010-10-07 12:55 source
+ file show.foil.number.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL Inheritance
- * Fixed optimized update
- * Fixed sharing problem
- * Fixed updated UI
+2010-01-04 11:01 source
-2010-10-07 12:54 source
+ file show.revisionflag.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL Inheritance
- * Fixed ACL recalc bug
- * Fixed optimize progress bar
- * Removed deprecated images
+2010-01-04 11:01 source
-2010-10-07 12:53 source
+ file showtoc.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed swat0
+2010-01-04 11:01 source
-2010-10-07 12:44 source
+ file side.float.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2010-10-07 12:20 source
+ file sidebar.float.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added option not to convert HTML pages
+2010-01-04 11:01 source
-2010-10-06 21:39 source
+ file sidebar.float.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-10-06 21:37 source
+ file sidebar.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed prevent buggy IRI to hit compiler
+2010-01-04 11:01 source
-2010-10-06 09:40 source
+ file sidebar.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed problem compiling certain SPARQL constructions
+2010-01-04 11:01 source
-2010-10-06 09:35 source
+ file simplesect.in.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added some new functions to XPATH virtual table
- * Added optimizations to boolean expression evaluation
+2010-01-04 11:01 source
-2010-10-06 09:27 source
+ file slide.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed added qualifier to stored proc creation
+2010-01-04 11:01 source
-2010-10-06 09:26 source
+ file slide.title.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed moved some checks to header file for macro expansion
+2010-01-04 11:01 source
-2010-10-06 09:15 source
+ file slides.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added support for CSV output mode
+2010-01-04 11:01 source
-2010-10-06 09:15 source
+ file slides.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed compatibility with openssl 0.9.7
+2010-01-04 11:01 source
-2010-10-05 09:39 source
+ file spacing.paras.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed when enlist starts we should have new xid or not listed
+2010-01-04 11:01 source
-2010-10-04 18:39 source
+ file speakernote.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed if resource is not free e.q. count = 2 we most restore as other
- thread can kill it in the middle
+2010-01-04 11:01 source
-2010-10-04 14:40 source
+ file subscript.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed save should happen after checks, as jump would leave members
- NULL
+2010-01-04 11:01 source
-2010-09-27 22:37 source
+ file superscript.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed missing text from cache
+2010-01-04 11:01 source
-2010-09-27 19:41 source
+ file suppress.footer.navigation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * FIxed label
+2010-01-04 11:01 source
-2010-09-27 14:45 source
+ file suppress.header.navigation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added linkblog pages
- * Fixed smaller tweet me button on bottom
- * Fixed template list
+2010-01-04 11:01 source
-2010-09-27 14:44 source
+ file suppress.homepage.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL inheritance
+2010-01-04 11:01 source
-2010-09-27 14:44 source
+ file suppress.navigation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed date update change in events/tasks
+2010-01-04 11:01 source
-2010-09-27 14:37 source
+ file symbol.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Rebuild drivers
+2010-01-04 11:01 source
-2010-09-27 14:29 source
+ file table.borders.with.css.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed issue with connection timeout
+2010-01-04 11:01 source
-2010-09-27 14:23 source
+ file table.cell.border.color.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed split uiedit into separate pages to get better response time
- when compiling
- * Fixed 'Generate Certificate'
+2010-01-04 11:01 source
-2010-09-27 14:13 source
+ file table.cell.border.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-09-27 14:11 source
+ file table.cell.border.thickness.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed ACL implementation
+2010-01-04 11:01 source
-2010-09-27 14:11 source
+ file table.cell.padding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed take DynamicLocal into account
+2010-01-04 11:01 source
-2010-09-27 13:51 source
+ file table.entry.padding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * FIxed client must not redefine mutex_enter as this will crash single
+2010-01-04 11:01 source
-2010-09-27 08:58 source
+ file table.footnote.number.format.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed use x-forwarded-for and remember it is forwarded
+2010-01-04 11:01 source
-2010-09-27 08:57 source
+ file table.footnote.number.symbols.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed use the redirect link for base when supplied
+2010-01-04 11:01 source
-2010-09-27 08:56 source
+ file table.footnote.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed check if m2 is a box
+2010-01-04 11:01 source
-2010-09-22 15:11 source
+ file table.frame.border.color.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Reverted patch
+2010-01-04 11:01 source
-2010-09-22 14:01 source
+ file table.frame.border.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added xml_sign() for making pure XML signatures
- * Added signature in host-meta xrd
- * FIxed memleaks when doing xml signatures
+2010-01-04 11:01 source
-2010-09-22 13:56 source
+ file table.frame.border.thickness.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed bad procedure name
+2010-01-04 11:01 source
-2010-09-22 13:06 source
+ file table.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed unified login pages
- * Fixed upgraded ACL implementation
- * Fixed Linkedin link
+2010-01-04 11:01 source
-2010-09-22 13:03 source
+ file table.spacer.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed upgraded ACL implementation
+2010-01-04 11:01 source
-2010-09-22 13:02 source
+ file table.table.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added archive and summary pages
- * Added new templates to vad
+2010-01-04 11:01 source
-2010-09-22 12:50 source
+ file tablecolumns.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-09-22 12:48 source
+ file target.database.document.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed vcard and vcal file import
+2010-01-04 11:01 source
-2010-09-22 12:48 source
+ file targets.filename.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed group ACL access
+2010-01-04 11:01 source
-2010-09-21 13:12 source
+ file template.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed load demo vad after tutorial
+2010-01-04 11:01 source
-2010-09-21 13:11 source
+ file tex.math.delims.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added missing file
+2010-01-04 11:01 source
-2010-09-21 11:34 source
+ file tex.math.file.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed focus issue
- * Fixed typo
- * Fixed XRDS
+2010-01-04 11:01 source
-2010-09-21 11:33 source
+ file tex.math.in.alt.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added new templates
+2010-01-04 11:01 source
-2010-09-21 11:20 source
+ file text.home.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed serialize access to connection struct
+2010-01-04 11:01 source
-2010-09-20 10:14 source
+ file text.next.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed Id
+2010-01-04 11:01 source
-2010-09-20 09:51 source
+ file text.prev.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added RDFa doctype
- * Added new feature of fct to show certain graph
+2010-01-04 11:01 source
-2010-09-20 09:50 source
+ file text.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed http://dbpedia.org/property/name is not the name of the subject
+2010-01-04 11:01 source
-2010-09-20 09:23 source
+ file text.up.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added new feature of fct to show certain graph when fct is installed
+2010-01-04 11:01 source
-2010-09-20 09:20 source
+ file textbgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-09-20 09:14 source
+ file textdata.default.encoding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed filter problem with WebID
+2010-01-04 11:01 source
-2010-09-20 09:13 source
+ file textinsert.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL support for tasks
- * Fixed group ACL access
- * Fixed ACL table UI
- * Fixed private access
- * Fixed validation ACLs
+2010-01-04 11:01 source
-2010-09-20 09:12 source
+ file title.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed group ACL access
- * Fixed ACL group select
- * Fixed ACL UI
- * Fixed validation ACLs
+2010-01-04 11:01 source
-2010-09-20 09:11 source
+ file title.margin.left.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACLs
- * Fixed group ACL access
- * Fixed private access
+2010-01-04 11:01 source
-2010-09-20 09:09 source
+ file titlefoil.html.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed group ACL access
- * Fixed ACL table UI
- * Fixed private access
- * Fixed validation ACLs
+2010-01-04 11:01 source
-2010-09-20 08:55 source
+ file toc.bg.color.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-09-20 08:27 source
+ file toc.blank.graphic.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed ACL testing now http returns 509
+2010-01-04 11:01 source
-2010-09-17 23:11 source
+ file toc.blank.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed when fct is installed, use the new feature of fct to show
- certain graphs
+2010-01-04 11:01 source
-2010-09-17 23:10 source
+ file toc.blank.text.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed hang in prefix check if there is single dot in prefix
+2010-01-04 11:01 source
-2010-09-17 23:10 source
+ file toc.hide.show.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed check log text should always be DV_STRING
+2010-01-04 11:01 source
-2010-09-17 23:08 source
+ file toc.html.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added support for CXML
+2010-01-04 11:01 source
-2010-09-17 23:03 source
+ file toc.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added strong optimization of SPARQL arithmatic and numerical
- comparisons
+2010-01-04 11:01 source
-2010-09-17 22:49 source
+ file toc.indent.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added initial support for RDB2RDF
+2010-01-04 11:01 source
-2010-09-17 22:05 source
+ file toc.line.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added improvements for SPARQL-FED esp. to let XSLT access data
- from remote SPARQL endpoint
+2010-01-04 11:01 source
-2010-09-17 20:49 source
+ file toc.list.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed rendezvous thread should never handle any signals
+2010-01-04 11:01 source
-2010-09-17 16:50 source
+ file toc.margin.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed moved include file to more appropriate place
+2010-01-04 11:01 source
-2010-09-17 16:48 source
+ file toc.max.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed do not try when in V6 single mode
+2010-01-04 11:01 source
-2010-09-17 16:45 source
+ file toc.pointer.graphic.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-09-17 16:42 source
+ file toc.pointer.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-09-17 16:40 source
+ file toc.pointer.text.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed let some string BIFs accept UNAME arguments
+2010-01-04 11:01 source
-2010-09-17 16:35 source
+ file toc.row.height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Removed deprecated repl code
+2010-01-04 11:01 source
-2010-09-17 11:18 source
+ file toc.section.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed isalnum needs unsigned char as negative values might trip asserts
- on some systems like Windows
+2010-01-04 11:01 source
-2010-09-15 23:54 source
+ file toc.spacer.graphic.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed handling format like 2010-09-15T14:24:28Z without fraction part
- * Fixed set local timezone
+2010-01-04 11:01 source
-2010-09-15 08:10 source
+ file toc.spacer.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed redirects for tcn
- * Fixed set default to html
- * Fixed in order of browser preference
+2010-01-04 11:01 source
-2010-09-13 16:03 source
+ file toc.spacer.text.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed issue with xs_q_4/foaf.vsp demo
+2010-01-04 11:01 source
-2010-09-09 19:19 source
+ file toc.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added check
+2010-01-04 11:01 source
-2010-09-09 19:18 source
+ file ua.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * FIxed print dict in dbg_* functions
+2010-01-04 11:01 source
-2010-09-09 16:02 source
+ file ulink.footnotes.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed minor issue
+2010-01-04 11:01 source
-2010-09-09 15:32 source
+ file ulink.hyphenate.chars.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added MIME types for .NET click-once, MS Office and MS WPF applications
- * Added additional MIME types based on apache mime.types.txt
+2010-01-04 11:01 source
-2010-09-07 21:56 source
+ file ulink.hyphenate.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
-2010-09-07 21:37 source
+ file ulink.show.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added fingerpoint hook
+2010-01-04 11:01 source
-2010-09-07 21:28 source
+ file ulink.target.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * 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-01-04 11:01 source
+
+ file up.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+
+2010-01-04 11:01 source
-2010-09-07 21:24 source
+ file use.embed.for.svg.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed ACL
+2010-01-04 11:01 source
-2010-09-07 21:24 source
+ file use.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Added ACL
+2010-01-04 11:01 source
-2010-09-07 21:23 source
+ file use.id.as.filename.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed private access error
+2010-01-04 11:01 source
-2010-09-07 21:23 source
+ file use.id.function.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
- * Fixed private access error
- * Fixed typo
+2010-01-04 11:01 source
-2010-09-07 19:55 source
+ file man.string.subst.map.local.pre.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Minor fixes
+2010-01-04 11:01 source
-2010-09-07 19:55 source
+ file man.string.subst.map.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added XRD meta
+2010-01-04 11:01 source
-2010-09-07 19:54 source
+ file man.subheading.divider.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added attribution ontology
+2010-01-04 11:01 source
-2010-09-01 10:15 source
+ file man.subheading.divider.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support headers from url rewrite for static resources such
- as files
+2010-01-04 11:01 source
-2010-09-01 10:11 source
+ file man.table.footnotes.divider.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed link headers
+2010-01-04 11:01 source
-2010-08-31 12:12 source
+ file man.th.extra1.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added missing function
+2010-01-04 11:01 source
-2010-08-31 12:12 source
+ file man.th.extra2.max.length.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support for IUD ops to XMLA endpoint
+2010-01-04 11:01 source
-2010-08-31 12:09 source
+ file man.th.extra2.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed return appropriate message based on the type of ACL result
+2010-01-04 11:01 source
-2010-08-31 11:45 source
+ file man.th.extra3.max.length.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support for host-meta
+2010-01-04 11:01 source
-2010-08-30 13:46 source
+ file man.th.extra3.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2010-08-30 13:37 source
+ file man.th.title.max.length.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed use short representations to make sorted by
+2010-01-04 11:01 source
-2010-08-30 13:35 source
+ file manifest.in.base.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed missing prototype
+2010-01-04 11:01 source
-2010-08-30 12:34 source
+ file manifest.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed use webfinger to do ssl authentication
+2010-01-04 11:01 source
-2010-08-30 12:21 source
+ file manual.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed error message generation in execute
- * Fixed encoding issue in directory listings generated from
- filesystem-hosted virtual directories
+2010-01-04 11:01 source
-2010-08-26 22:49 source
+ file margin.note.float.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * FIxed i18n support for subject and address list
+2010-01-04 11:01 source
-2010-08-26 22:41 source
+ file margin.note.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed typo
+2010-01-04 11:01 source
-2010-08-26 22:40 source
+ file margin.note.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added Evri cartridge and ontology
- * Added hNews cartridge
+2010-01-04 11:01 source
-2010-08-26 22:34 source
+ file margin.note.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support for acct: scheme
+2010-01-04 11:01 source
-2010-08-26 22:33 source
+ file marker.section.level.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * 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-01-04 11:01 source
-2010-08-26 22:30 source
+ file menuchoice.menu.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed application settings page url
+2010-01-04 11:01 source
-2010-08-26 18:04 source
+ file menuchoice.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support for host-meta
+2010-01-04 11:01 source
-2010-08-26 18:03 source
+ file minus.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed if position is not valid, skip the iob and go to next
+2010-01-04 11:01 source
-2010-08-24 22:34 source
+ file monospace.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed set to NULL after free
+2010-01-04 11:01 source
-2010-08-22 16:04 source
+ file monospace.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added option for to validate in hours
+2010-01-04 11:01 source
-2010-08-22 13:06 source
+ file monospace.verbatim.font.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * 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-01-04 11:01 source
-2010-08-20 10:12 source
+ file monospace.verbatim.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed typo in BIF name
- * Fixed SPARQL resultset output if some objects of an RDF storage are
- corrupted
+2010-01-04 11:01 source
-2010-08-20 10:10 source
+ file multiframe.bottom.bgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed error on INSERT DATA with literals of non-default types
+2010-01-04 11:01 source
-2010-08-20 10:09 source
+ file multiframe.navigation.height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed issue with ill formed SPARQL requests send by SPARQL SERVICE
- clause with dynamic parameters
+2010-01-04 11:01 source
-2010-08-20 10:07 source
+ file multiframe.top.bgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed issue parsing sparql function calls with zero arguments
+2010-01-04 11:01 source
-2010-08-18 08:41 source
+ file multiframe.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed check dirsallowed before loading file
+2010-01-04 11:01 source
-2010-08-17 21:40 source
+ file nav.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed use webfinger to do SSL authentication
+2010-01-04 11:01 source
-2010-08-17 18:29 source
+ file nav.table.summary.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support to use webfinger for SSL authentication
- * Disabled rel=me tweak
+2010-01-04 11:01 source
-2010-08-17 18:05 source
+ file navbgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added Google Book cartridge
+2010-01-04 11:01 source
-2010-08-17 18:05 source
+ file navbodywidth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed use foaf ssl procedure
+2010-01-04 11:01 source
-2010-08-17 18:01 source
+ file navig.graphics.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added get-certificate_info (10,cert,type, pass, 'subject field name
- e.g. emailAddress, OU etc.')
+2010-01-04 11:01 source
-2010-08-17 11:06 source
+ file navig.graphics.path.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * 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-01-04 11:01 source
-2010-08-17 10:23 source
+ file navig.graphics.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * 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-01-04 11:01 source
-2010-08-17 10:22 source
+ file navig.showtitles.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed build rules
+2010-01-04 11:01 source
-2010-08-17 09:25 source
+ file navtocwidth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed moved constant declarations of commonly used UNAMEs into
- separate file
+2010-01-04 11:01 source
-2010-08-16 10:10 source
+ file next.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added webfinger protocol
- * Fixed cert gen on firefox with .net addon
+2010-01-04 11:01 source
-2010-08-16 10:09 source
+ file no.home.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed bug in re-install
+2010-01-04 11:01 source
-2010-08-16 10:07 source
+ file no.next.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed labels
+2010-01-04 11:01 source
-2010-08-16 10:07 source
+ file no.prev.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * FIxed missing data for interval column
+2010-01-04 11:01 source
-2010-08-11 11:07 source
+ file no.toc.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support for define output:format "NT"
+2010-01-04 11:01 source
-2010-08-11 10:53 source
+ file no.up.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed issue with sparql subcode gen
+2010-01-04 11:01 source
-2010-08-10 18:47 source
+ file nominal.image.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed should not use escape here
+2010-01-04 11:01 source
-2010-08-10 18:45 source
+ file nominal.image.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added WebID share
- * Fixed secure sponged VD setup
+2010-01-04 11:01 source
-2010-08-10 14:52 source
+ file nominal.table.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed wrong URL
+2010-01-04 11:01 source
-2010-08-09 20:08 source
+ file nongraphical.admonition.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed some URL links
+2010-01-04 11:01 source
-2010-08-09 19:44 source
+ file normal.para.spacing.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed support for source_uri attribute in sticker
+2010-01-04 11:01 source
-2010-08-08 11:55 source
+ file olink.base.uri.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed enhanced type recognition
- * Fixed return errors when loading fails
+2010-01-04 11:01 source
-2010-08-08 11:55 source
+ file olink.debug.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed TOP has argument order of offset, limit
+2010-01-04 11:01 source
-2010-08-06 10:29 source
+ file olink.doctitle.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed issues with Rename
- * Fixed issues with Upstreaming
+2010-01-04 11:01 source
-2010-08-06 10:03 source
+ file olink.fragid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support for SSL and WebID
+2010-01-04 11:01 source
-2010-08-06 09:46 source
+ file olink.lang.fallback.sequence.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed skip constant ssl returned from temp table output
+2010-01-04 11:01 source
-2010-08-04 18:50 source
+ file olink.outline.ext.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed clear conn vars after trx replay
+2010-01-04 11:01 source
-2010-08-04 09:34 source
+ file olink.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2010-08-04 07:37 source
+ file olink.pubid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added UI for rdb2rdf
+2010-01-04 11:01 source
-2010-08-04 07:37 source
+ file olink.resolver.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed use subseq to handle blobs
+2010-01-04 11:01 source
-2010-08-04 07:35 source
+ file olink.sysid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed Activity log
- * Fixed /about virtual dir
- * Fixed rewrite http header in cert output
+2010-01-04 11:01 source
-2010-08-04 07:33 source
+ file orderedlist.label.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed Activity log
- * Fixed file view
- * Fixed filenames with .acl extension properties editing
+2010-01-04 11:01 source
-2010-08-04 07:32 source
+ file orderedlist.label.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed encoding problem
+2010-01-04 11:01 source
-2010-08-04 07:30 source
+ file orderedlist.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed Activity log
+2010-01-04 11:01 source
-2010-08-04 07:30 source
+ file othercredit.like.author.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed Activity log
- * Fixed uninstall DET folders
- * Fixed 'ResFolder' type filters
+2010-01-04 11:01 source
-2010-08-04 07:10 source
+ file output-root.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added persistent xmlns UI
+2010-01-04 11:01 source
-2010-08-04 07:03 source
+ file output.indent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added WebID based ACL support via https
+2010-01-04 11:01 source
-2010-08-04 07:02 source
+ file overlay.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed Tesco cartridge
+2010-01-04 11:01 source
-2010-08-04 06:58 source
+ file overlay.logo.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed avoid errors later in process
+2010-01-04 11:01 source
-2010-08-04 06:53 source
+ file overlay.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * FIxed use X-Forwarded-Host when the instance is behind gateway
+2010-01-04 11:01 source
-2010-08-02 11:31 source
+ file page.height.portrait.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed when result from authentication is negative then return
- else WebID fals
- * Fixed http auth checks
+2010-01-04 11:01 source
-2010-08-02 11:25 source
+ file page.height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed keep mime hash in sync
+2010-01-04 11:01 source
-2010-08-02 11:23 source
+ file page.margin.bottom.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed do not allow sponger to change log mode explicitly to no-lock and
- row-autocommit
+2010-01-04 11:01 source
-2010-08-02 11:20 source
+ file page.margin.inner.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added support for POP3 over SSL
+2010-01-04 11:01 source
-2010-08-02 07:40 source
+ file page.margin.outer.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added global X509 CA repository
+2010-01-04 11:01 source
-2010-07-29 16:25 source
+ file page.margin.top.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2010-07-29 16:17 source
+ file page.orientation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed dynlocal format must be replaced by host as in host header
+2010-01-04 11:01 source
-2010-07-29 16:14 source
+ file page.width.portrait.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * 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-01-04 11:01 source
-2010-07-28 12:26 source
+ file page.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed size of res column to fit side menu on smaller screens like
- iPhone
+2010-01-04 11:01 source
-2010-07-28 12:10 source
+ file pages.template.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-07-26 21:01 source
+ file paper.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed when http auth fails, must keep the http status as 401
+2010-01-04 11:01 source
-2010-07-26 12:59 source
+ file para.propagates.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed alt names can have multiple values
- * Fixed paths creation
- * Fixed users select
- * Fixed renamed User Login to Identify Yourself
+2010-01-04 11:01 source
-2010-07-26 12:58 source
+ file part.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed path creation
- * Fixed URLs
- * Fixed users select
+2010-01-04 11:01 source
-2010-07-26 12:58 source
+ file passivetex.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed path creation
- * Fixed URLs
+2010-01-04 11:01 source
-2010-07-23 19:44 source
+ file pgwide.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed bug with WebDAVFS client
+2010-01-04 11:01 source
-2010-07-23 19:43 source
+ file phrase.propagates.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Added continue handler to catch missing graph group signal
+2010-01-04 11:01 source
-2010-07-23 19:42 source
+ file pixels.per.inch.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed URL after login
- * FIxed view.vsp not found problem
+2010-01-04 11:01 source
-2010-07-23 19:39 source
+ file plus.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Adde additional endpoint
- * Fixed splash screen
- * Fixed error message when JavaScript is not available
- * Fixed geo location
+2010-01-04 11:01 source
-2010-07-23 19:36 source
+ file points.per.em.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * 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-01-04 11:01 source
-2010-07-23 19:31 source
+ file preface.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Removed deprecated files
+2010-01-04 11:01 source
-2010-07-23 15:56 source
+ file prefer.internal.olink.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed auth bug with WebDAVFS client
+2010-01-04 11:01 source
-2010-07-20 13:08 source
+ file preferred.mediaobject.role.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-07-20 13:01 source
+ file prev.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+
+2010-01-04 11:01 source
- * Fixed WebKit problems with UI profile
+ file procedure.properties.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 process.empty.source.toc.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 process.source.toc.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.arch.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.attribute.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.audience.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.condition.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.conformance.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.lang.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.os.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.revision.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.revisionflag.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.role.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.security.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.separator.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.status.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.userlevel.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.value.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 profile.vendor.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 profile.wordsize.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 punct.honorific.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.defaultlabel.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.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.inherit.numeration.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.nested.in.toc.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.level1.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.level2.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 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:21 source
+2010-01-04 11:01 source
- * Fixed add escape to CR/LF in JSON format
+ file qanda.title.level4.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
-2010-07-07 18:53 source
+2010-01-04 11:01 source
- * Fixed openid to work with personal iri
+ file htmlhelp.hhc.binary.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.folders.instead.books.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.section.depth.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.show.root.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.hhc.width.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.hhc.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.hhk.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.tail.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.window.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.hhp.windows.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.hhp.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.map.file.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.only.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.remember.window.position.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.advanced.search.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.favorities.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.show.menu.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.show.toolbar.text.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.title.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 htmlhelp.use.hhk.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 htmlhelp.window.geometry.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.verbatim.characters.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 hyphenate.verbatim.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 hyphenate.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 id.warnings.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 ignore.image.scaling.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 img.src.path.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.div.title.properties.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.entry.properties.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.links.to.section.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.method.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.number.separator.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.on.role.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.on.type.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.page.number.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.prefer.titleabbrev.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.preferred.page.properties.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 index.range.separator.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 index.term.separator.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 informal.object.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 informalequation.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 informalexample.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 informalfigure.properties.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 informaltable.properties.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 inherit.keywords.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.link.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
- * Fixed handling of items in alt name
+ file insert.olink.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 insert.olink.pdf.frag.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 insert.xref.page.number.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.label.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 itemizedlist.label.width.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 itemizedlist.properties.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 javahelp.encoding.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 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:14 source
+2010-01-04 11:01 source
- * Added support for using VirtuosoDataSource
- * Fixed handling of quote chars in literals
+ file keyboard.nav.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.default.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.gentext.language.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 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: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 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:08 source
+2010-01-04 11:01 source
- * Updated Favorites
+ 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:07 source
+2010-01-04 11:01 source
- * Added Semantic Pingback client/server
+ file line-height.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.everyNth.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.extension.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 linenumbering.separator.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 linenumbering.width.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 link.mailto.url.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.block.properties.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 list.block.spacing.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 list.item.spacing.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.graphic.viewport.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.index.markup.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.single.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 make.valid.html.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 make.year.ranges.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.authors.section.enabled.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.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 08:20 source
+2010-01-04 11:01 source
- * Fixed listener serialization
- * Fixed hash
+ 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 08:14 source
+2010-01-04 11:01 source
- * Fixed reorganized rdf tab
+ file man.charmap.enabled.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.subset.profile.english.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.subset.profile.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.charmap.uri.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.charmap.use.subset.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.copyright.section.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.are.numbered.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.endnotes.list.enabled.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.endnotes.list.heading.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.funcprototype.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.funcsynopsisinfo.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.links.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.font.table.headings.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.font.table.title.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.funcsynopsis.style.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.computer.inlines.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.filenames.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.hyphenate.urls.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.hyphenate.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.blurbs.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.lists.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.refsect.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.indent.verbatims.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.indent.width.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.justify.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.base.dir.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.better.ps.enabled.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.encoding.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.in.separate.dir.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.lang.in.name.enabled.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.manifest.enabled.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.manifest.filename.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.output.quietly.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.output.subdirs.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
-2010-05-31 21:49 source
+2010-01-04 11:01 source
- * Added support for PubSubHub
+ file man.segtitle.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
-2010-05-31 20:49 source
+2010-01-04 11:01 source
- * Added setting for GatewayIpAddress
+ 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 20:48 source
+2010-01-04 11:01 source
- * Fixed missing external
+ 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:47 source
+2010-01-04 11:01 source
- * Fixed incomplete check condition as locks with pos at end do not
- count
+ 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:45 source
+2010-01-04 11:01 source
- * Fixed use request line for ID
+ file citerefentry.link.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 collect.xref.targets.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.back.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.body.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.front.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.index.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.count.lot.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.count.titlepage.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.back.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.body.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.front.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.index.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 column.gap.lot.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 column.gap.titlepage.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 compact.list.item.spacing.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.label.includes.part.label.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 component.title.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
- * Fixed incorrect check for VDB functionality
+ file component.titlepage.properties.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 contrib.inline.enabled.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.bleed.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.mark.offset.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 crop.mark.width.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 crop.marks.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.decoration.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 css.stylesheet.dir.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 css.stylesheet.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 current.docid.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 currentpage.marker.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.float.class.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.image.width.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.frame.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.table.rules.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 default.table.width.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 default.units.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 dingbat.font.family.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 double.sided.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 draft.mode.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 draft.watermark.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +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 dry-run.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +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 dynamic.toc.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.assignment.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.statement.terminator.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 ebnf.table.bgcolor.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 ebnf.table.border.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.autolabel.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.id.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 eclipse.plugin.name.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 eclipse.plugin.provider.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 editedby.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 email.delimiters.enabled.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 email.mailto.enabled.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 emphasis.propagates.style.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 entry.propagates.style.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 epub.autolabel.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 equation.properties.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 example.properties.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 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: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.href.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 feedback.link.text.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 feedback.with.ids.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 figure.properties.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 filename-prefix.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 firstterm.only.link.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.properties.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.subtitle.properties.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 foil.title.master.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 foil.title.size.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 foilgroup.properties.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 foilgroup.toc.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.column.widths.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.content.properties.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.hr.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.rule.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 footer.table.height.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 footer.table.properties.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 footers.on.blank.pages.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.font.size.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.mark.properties.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.number.format.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.number.symbols.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 footnote.properties.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 footnote.sep.leader.properties.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 fop.extensions.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 fop1.extensions.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.object.properties.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.procedures.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 formal.title.placement.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 formal.title.properties.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 funcsynopsis.decoration.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 funcsynopsis.style.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 function.parens.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.id.attributes.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.index.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.legalnotice.link.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.manifest.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.meta.abstract.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.revhistory.link.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 generate.section.toc.level.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 generate.toc.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.as.blocks.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 glossary.collection.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 glossary.sort.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 glossdef.block.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 glossdef.list.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 toolbar
+ 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 14:05 source
+2010-01-04 11:01 source
- * Fixed memleak when error in bif and no error var given
+ file glossentry.show.acronym.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 glosslist.as.blocks.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.auto.link.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.block.properties.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.list.properties.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 glossterm.separation.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 glossterm.width.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 graphic.default.extension.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 graphical.admonition.properties.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 graphics.dir.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 graphicsize.extension.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 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:39 source
+2010-01-04 11:01 source
- * Minor fix
+ file header.column.widths.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.content.properties.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.hr.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.rule.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 header.table.height.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 header.table.properties.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 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:34 source
+2010-01-04 11:01 source
- * Fixed problem with Chrome browser and JS loading
- * Fixed Relation ontology data
+ file hidetoc.image.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.default.language.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 highlight.source.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 highlight.xslthl.config.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 home.image.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.append.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.base.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.cellpadding.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.cellspacing.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.cleanup.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.ext.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.extra.head.links.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.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:31 source
+2010-01-04 11:01 source
- * Added CSV cartridge
- * Fixed odata cartridge
- * Fixed webcal support
- * Fixed geo coords
+ 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: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.longdesc.link.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.longdesc.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 html.stylesheet.type.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 html.stylesheet.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.alias.file.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.autolabel.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.back.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.forward.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.hideshow.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.home.url.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.home.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.title.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.jump1.url.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.jump1.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.title.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.jump2.url.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.jump2.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.locate.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.next.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.options.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.prev.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.print.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.refresh.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.button.stop.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.button.zoom.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.chm.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.default.topic.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.display.progress.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
+
+ file htmlhelp.encoding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
- * Rebuild drivers
+2010-01-04 11:01 source
-2010-03-26 19:43 source
+ file htmlhelp.enhanced.decompilation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
- * Fixed memory leak
+2010-01-04 11:01 source
-2010-03-26 19:43 source
+ file htmlhelp.enumerate.images.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
- * Fixed missing check for ROLLEDBACK
+2010-01-04 11:01 source
-2010-03-26 19:35 source
+ file htmlhelp.force.map.and.alias.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
- * Added options to CSV parser for delimiter and quote char
+2010-01-04 11:01 source
-2010-03-26 16:14 source
+ file 20.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added support for CSV import
+2010-01-04 11:01 source
-2010-03-25 19:31 source
+ file 21.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added csv_parse function
+2010-01-04 11:01 source
-2010-03-24 22:31 source
+ file 22.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed preserve content-type field
+2010-01-04 11:01 source
-2010-03-24 22:21 source
+ file 23.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added support for reading CSV files into tables
+2010-01-04 11:01 source
-2010-03-24 22:18 source
+ file 24.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added support for setMaxRows
- * Fixed check argument values
+2010-01-04 11:01 source
-2010-03-24 21:47 source
+ file 25.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Regenerated drivers
+2010-01-04 11:01 source
-2010-03-24 16:43 source
+ file 26.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed typo
+2010-01-04 11:01 source
-2010-03-24 10:23 source
+ file 27.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added options for /sparql
- * Added function http_header_array_get to retrieve headers as an
- array of strings
+2010-01-04 11:01 source
-2010-03-24 01:03 source
+ file 28.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added optimization of sprintf_inverse(const)
+2010-01-04 11:01 source
-2010-03-24 01:02 source
+ file 29.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * 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-01-04 11:01 source
-2010-03-24 01:00 source
+ file 3.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed compiler warning
+2010-01-04 11:01 source
-2010-03-23 10:07 source
+ file 3.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * 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-01-04 11:01 source
-2010-03-23 10:01 source
+ file 3.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed incorrect codegen of formatter in ssg_select_known_graphs_codegen
+2010-01-04 11:01 source
-2010-03-22 22:29 source
+ file 30.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2010-03-22 22:01 source
+ file 4.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added a++ otion in user's pages
- * Fixed ontology APIs
- * Fixed 'Creator of'
- * Fixed nickName
- * Fixed php POST request
+2010-01-04 11:01 source
-2010-03-22 21:48 source
+ file 4.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed also check for ctype
+2010-01-04 11:01 source
-2010-03-22 21:46 source
+ file 4.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed Back button
+2010-01-04 11:01 source
-2010-03-22 21:46 source
+ file 5.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added support for WebID
+2010-01-04 11:01 source
-2010-03-22 21:43 source
+ file 5.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed fetching img id
- * Fixed issue with multiple URL params
+2010-01-04 11:01 source
-2010-03-22 13:40 source
+ file 5.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed use sk_X509_ALGOR_* macros
+2010-01-04 11:01 source
-2010-03-22 12:36 source
+ file 6.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed X509ClientVerify flag of 0/1/2/3 to accept self signed or
- optional certificates
+2010-01-04 11:01 source
-2010-03-22 12:35 source
+ file 6.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added support for FOAF+SSL login for SQL connections
+2010-01-04 11:01 source
-2010-03-22 11:54 source
+ file 6.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed do not encode default graph
+2010-01-04 11:01 source
-2010-03-22 11:54 source
+ file 7.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed SPARQL 1.1 compatibility in result set syntax
+2010-01-04 11:01 source
-2010-03-19 14:59 source
+ file 7.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed use newer OAT functions
+2010-01-04 11:01 source
-2010-03-19 10:08 source
+ file 7.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added improved version of xsl:for-each-row for both SPARQL and SQL
+2010-01-04 11:01 source
-2010-03-19 10:05 source
+ file 8.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * FIxed issue with backup
+2010-01-04 11:01 source
-2010-03-18 15:45 source
+ file 8.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * 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-01-04 11:01 source
-2010-03-18 15:43 source
+ file 8.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed better serialization on lt_lock_mtx
+2010-01-04 11:01 source
-2010-03-18 10:59 source
+ file 9.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * 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-01-04 11:01 source
-2010-03-18 10:50 source
+ file 9.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed use new OAT toolkit
+2010-01-04 11:01 source
-2010-03-18 10:48 source
+ file 9.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * 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-01-04 11:01 source
-2010-03-18 10:47 source
+ file ChangeLog.20020917 was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed deadlock retry
+2010-01-04 11:01 source
-2010-03-18 10:46 source
+ file abstract.notitle.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed missing date conversion
+2010-01-04 11:01 source
-2010-03-18 10:45 source
+ file abstract.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed alert text
- * Fixed typo in styles path
- * Fixed use new API functions
- * Fixed support for Google map v3
+2010-01-04 11:01 source
-2010-03-18 10:20 source
+ file abstract.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed rebuild driver
+2010-01-04 11:01 source
-2010-03-18 09:58 source
+ file active.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed user's login
- * Fixed UI buttons
- * Fixed unique name message
- * Fixed wishlist UI pages
- * Fixed rename FOAF+SSL to WebID
+2010-01-04 11:01 source
-2010-03-18 09:56 source
+ file ade.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed rename FOAF+SSL to WebID
+2010-01-04 11:01 source
-2010-03-17 14:54 source
+ file admon.graphics.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed check proper prefetch value
+2010-01-04 11:01 source
-2010-03-16 23:53 source
+ file admon.graphics.path.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed check lt
+2010-01-04 11:01 source
-2010-03-16 18:21 source
+ file admon.graphics.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed when txn error remove trx from global pool. It cannot be
- committed anyway
+2010-01-04 11:01 source
-2010-03-16 18:20 source
+ file admon.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed properly set lt_threads
+2010-01-04 11:01 source
-2010-03-16 11:39 source
+ file admon.textlabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed when writing log entries always check the mtx
+2010-01-04 11:01 source
-2010-03-16 11:39 source
+ file admonition.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed when setting up a XA trx wait for any checkpoint in progress
- to finish before proceeding
+2010-01-04 11:01 source
-2010-03-16 10:54 source
+ file admonition.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed if not box or dfe false, skip rest
+2010-01-04 11:01 source
-2010-03-16 10:51 source
+ file alignment.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added virtuoso.ttl to sesame jar
- * Added csl pages for Sesame HTTP repository configuration
- * Rebuild driver
+2010-01-04 11:01 source
-2010-03-16 10:26 source
+ file annotate.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added support for vad_version
- * FIxed use new OAT toolkit
- * Removed debug code
+2010-01-04 11:01 source
-2010-03-16 10:24 source
+ file annotation.css.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * FIxed encoding of URL params
+2010-01-04 11:01 source
-2010-03-15 16:46 source
+ file annotation.graphic.close.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed resume waiting
+2010-01-04 11:01 source
-2010-03-15 15:51 source
+ file annotation.graphic.open.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed check array index not out of bound
+2010-01-04 11:01 source
-2010-03-15 15:50 source
+ file annotation.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixdd FOAF+SSL user pages
+2010-01-04 11:01 source
-2010-03-15 15:49 source
+ file annotation.support.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * FIxed removed debugging code
+2010-01-04 11:01 source
-2010-03-15 15:27 source
+ file appendix.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed use new OAT toolkit
- * Fixed version check for ODS Framework
+2010-01-04 11:01 source
-2010-03-15 13:16 source
+ file arbortext.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed missing case for LT_PREPARE_PENDING
+2010-01-04 11:01 source
-2010-03-12 14:04 source
+ file article.appendix.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed invitation problem with multiple users
+2010-01-04 11:01 source
-2010-03-12 13:34 source
+ file author.othername.in.middle.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Merged new version of OAT toolkit
- * Fixed Google Maps v3 support
+2010-01-04 11:01 source
-2010-03-12 13:34 source
+ file autolayout-file.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * FIxed IRIs
+2010-01-04 11:01 source
-2010-03-12 09:13 source
+ file autotoc.label.in.hyperlink.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Merged newer version of OAT toolkit
- * Fixed dependency to later version of ODS Framework
- * Fixed SIOC subscriptions
+2010-01-04 11:01 source
-2010-03-12 09:13 source
+ file autotoc.label.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Merged newer version of OAT toolkit
- * Fixed dependency to later version of ODS Framework
+2010-01-04 11:01 source
-2010-03-12 09:12 source
+ file axf.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Merged new version of OAT toolkit
- * Fixed icons - delete and add
- * Fixed dependency to later version of ODS framework
+2010-01-04 11:01 source
-2010-03-12 09:10 source
+ file banner.before.navigation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * 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-01-04 11:01 source
-2010-03-12 09:04 source
+ file base.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added uStream cartridge
- * Fixed PPTX cartridge to work with latest description.vsp
+2010-01-04 11:01 source
-2010-03-12 09:01 source
+ file biblioentry.item.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Merged new version of OAT toolkit
- * Added location macro support
- * Fixed numerous issues
+2010-01-04 11:01 source
-2010-03-11 17:02 source
+ file biblioentry.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Merged new version of OAT toolkit
+2010-01-04 11:01 source
-2010-03-10 20:28 source
+ file bibliography.collection.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed JSON support
+2010-01-04 11:01 source
-2010-03-10 15:09 source
+ file bibliography.numbered.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed wide character when getting procedure columns information
+2010-01-04 11:01 source
-2010-03-10 15:08 source
+ file bibliography.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added OPTIONS for http server
- * Added trace method
+2010-01-04 11:01 source
-2010-03-10 14:43 source
+ file block.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed support of old and new schema for FOAF+SSL
+2010-01-04 11:01 source
-2010-03-10 10:34 source
+ file blockquote.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed allow nulls, DV_C_STRING and memleak
+2010-01-04 11:01 source
-2010-03-09 20:14 source
+ file blurb.on.titlepage.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added support for nvarchar to __like_min and __like_max
+2010-01-04 11:01 source
-2010-03-09 20:12 source
+ file body.attributes.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed possible dfe_false in context
+2010-01-04 11:01 source
-2010-03-08 20:39 source
+ file body.bg.color.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed setting pooling params
+2010-01-04 11:01 source
-2010-03-08 20:37 source
+ file body.end.indent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Rebuild driver
+2010-01-04 11:01 source
-2010-03-08 14:20 source
+ file body.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed allow chunked content to be read as strses
+2010-01-04 11:01 source
-2010-03-08 12:04 source
+ file body.font.master.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed typos
+2010-01-04 11:01 source
-2010-03-08 12:02 source
+ file body.font.size.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed typo in tag MusicianCreditsList
+2010-01-04 11:01 source
-2010-03-08 11:54 source
+ file body.margin.bottom.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added wide char support to set_qualifier
+2010-01-04 11:01 source
-2010-03-08 11:53 source
+ file body.margin.top.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed issue when no content len is give but content is sent as
- http/1.0 protocol e.g. with connection-close
+2010-01-04 11:01 source
-2010-03-08 09:21 source
+ file body.start.indent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed typo in scovo:dimension
+2010-01-04 11:01 source
-2010-03-07 08:20 source
+ file bookmarks.collapse.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed typo
+2010-01-04 11:01 source
-2010-03-07 08:18 source
+ file bridgehead.in.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed SERVICE parameter passing
- * Fixed (!ask(...)) in filters
+2010-01-04 11:01 source
-2010-03-04 23:49 source
+ file bullet.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added tests
+2010-01-04 11:01 source
-2010-03-04 23:44 source
+ file callout.defaultcolumn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed improved codegen for FILTER (?local = IRI(?:global)) .
+2010-01-04 11:01 source
-2010-03-04 23:43 source
+ file callout.graphics.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added support for fractions of second in bif_dateadd
+2010-01-04 11:01 source
-2010-03-04 23:38 source
+ file callout.graphics.number.limit.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed tests
+2010-01-04 11:01 source
-2010-03-04 20:45 source
+ file callout.graphics.path.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Updated docs
+2010-01-04 11:01 source
-2010-03-04 16:39 source
+ file callout.graphics.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * 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-01-04 11:01 source
-2010-03-04 14:15 source
+ file callout.icon.size.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed typo
+2010-01-04 11:01 source
-2010-03-04 13:39 source
+ file callout.list.table.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added initial support for JDBC hibernate
+2010-01-04 11:01 source
-2010-03-04 12:18 source
+ file callout.unicode.font.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Rebuild driver
+2010-01-04 11:01 source
-2010-03-04 12:18 source
+ file callout.unicode.number.limit.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed driver version
+2010-01-04 11:01 source
-2010-03-04 12:12 source
+ file callout.unicode.start.character.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed connection pooling
+2010-01-04 11:01 source
-2010-03-04 12:11 source
+ file callout.unicode.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed remove xa transaction
+2010-01-04 11:01 source
-2010-03-03 22:55 source
+ file callouts.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed do not setup unknown for special methods
+2010-01-04 11:01 source
-2010-03-03 09:21 source
+ file caution.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Rebuild driver
+2010-01-04 11:01 source
-2010-03-03 09:20 source
+ file chapter.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed problem with jar packaging
+2010-01-04 11:01 source
-2010-03-02 10:01 source
+ file charmap.groff.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added OPTIONS support for http server
+2010-01-04 11:01 source
-2010-03-01 21:05 source
+ file chunk.append.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added initial support for basic SPARQL federation
+2010-01-04 11:01 source
-2010-03-01 20:46 source
+ file chunk.first.sections.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added DefaultServiceMap and DefaultServiceStorage
+2010-01-04 11:01 source
-2010-03-01 20:42 source
+ file chunk.quietly.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed support for positional and named parameters from exec() or
- similar in SPARQL, as if they where global variables of other
- sorts
+2010-01-04 11:01 source
-2010-03-01 10:26 source
+ file chunk.section.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed use unzip_file function
+2010-01-04 11:01 source
-2010-03-01 10:18 source
+ file chunk.sections.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed Import
+2010-01-04 11:01 source
-2010-03-01 10:16 source
+ file chunk.separate.lots.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed CSS
+2010-01-04 11:01 source
-2010-03-01 10:15 source
+ file chunk.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-03-01 10:12 source
+ file chunk.tocs.and.lots.has.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed compatiblity with jdk1.5
+2010-01-04 11:01 source
-2010-03-01 10:07 source
+ file chunk.tocs.and.lots.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Upgraded to Jena 2.6.2
- * Fixed backward compatiblity with jdk 1.5
+2010-01-04 11:01 source
-2010-03-01 10:06 source
+ file chunker.output.cdata-section-elements.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Fixed make sesame2 backward compatible with jdk1.5
+2010-01-04 11:01 source
-2010-03-01 09:31 source
+ file chunker.output.doctype-public.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Regenerated driver
+2010-01-04 11:01 source
-2010-03-01 09:17 source
+ file chunker.output.doctype-system.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Rebuild driver
+2010-01-04 11:01 source
-2010-03-01 01:03 source
+ file chunker.output.encoding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added immortal IRI for uname_virtrdf_ns_uri_DefaultServiceStorage
+2010-01-04 11:01 source
-2010-03-01 01:01 source
+ file chunker.output.indent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Added support for unzip_file ()
+2010-01-04 11:01 source
-2010-03-01 00:50 source
+ file chunker.output.media-type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2010-03-01 00:39 source
+ file chunker.output.method.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
- * Upgraded to Sesame 2.3.1
+2010-01-04 11:01 source
-2010-03-01 00:38 source
+ file docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed typo
+2010-01-04 11:01 source
-2010-03-01 00:35 source
+ file endnotes.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added swapguard option
+2010-01-04 11:01 source
-2010-03-01 00:28 source
+ file home.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added columns for api type and id
+2010-01-04 11:01 source
-2010-03-01 00:03 source
+ file html-synop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added support for saving history to disk
+2010-01-04 11:01 source
-2010-02-28 23:58 source
+ file important.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed geo:point matching
- * Fixed regex to remove default ns from XML - single quotes are valid
- for enclosed attribute values
+2010-01-04 11:01 source
-2010-02-28 23:57 source
+ file info.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed positioned update problem on cluster
+2010-01-04 11:01 source
-2010-02-28 23:55 source
+ file inline.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added refresh parameter
+2010-01-04 11:01 source
-2010-02-28 23:52 source
+ file javahelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added setting for RoundRobin scheduling
+2010-01-04 11:01 source
-2010-02-27 22:21 source
+ file lists.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed diagnosics of async_queue specific errors like aq invocation
- on log replay or security issues
+2010-01-04 11:01 source
-2010-02-26 17:31 source
+ file next.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed missing label
+2010-01-04 11:01 source
-2010-02-26 17:28 source
+ file note.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed use union for local automatic variables to avoid alignment
- problems
+2010-01-04 11:01 source
-2010-02-26 10:24 source
+ file other.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Regenerated driver
+2010-01-04 11:01 source
-2010-02-26 10:05 source
+ file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Upgraded to Sesame 2.3.1
- * Removed deprecated file
- * Fixed inference support
+2010-01-04 11:01 source
-2010-02-25 20:24 source
+ file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Updated to Sesame 2.2.4
+2010-01-04 11:01 source
-2010-02-25 20:23 source
+ file pi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added support for Sesame 2 HTTP respository
- * Updated toSesame 2.2.4
+2010-01-04 11:01 source
-2010-02-25 20:21 source
+ file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Rebuild driver
+2010-01-04 11:01 source
-2010-02-25 16:09 source
+ file prev.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * FIxed url param for metadata selection
+2010-01-04 11:01 source
-2010-02-25 16:09 source
+ file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added 'Import' to user pages (vsp, php etc)
- * Fixed pass interface too
+2010-01-04 11:01 source
-2010-02-25 16:08 source
+ file profile-javahelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added tweet gizmo
+2010-01-04 11:01 source
-2010-02-25 16:07 source
+ file refentry.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed groups
+2010-01-04 11:01 source
-2010-02-24 20:55 source
+ file synop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * 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-01-04 11:01 source
-2010-02-24 20:53 source
+ file table.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added swap guard to kill trx and log ws when swapping is over 300 pages
+2010-01-04 11:01 source
-2010-02-24 13:02 source
+ file tip.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed use unsigned for lower parts else we risk sign extent on large
- numbers
+2010-01-04 11:01 source
-2010-02-23 22:35 source
+ file up.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed metadata
+2010-01-04 11:01 source
-2010-02-23 14:50 source
+ file utility.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed when looking at col_preds and seeking for column, make sure cp
- dfe is a column
+2010-01-04 11:01 source
-2010-02-23 14:49 source
+ file warning.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added prototype
+2010-01-04 11:01 source
-2010-02-23 14:49 source
+ file 1.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed when unbox iri make sure value is of type DV_IRI_ID
+2010-01-04 11:01 source
-2010-02-23 14:48 source
+ file 1.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * FIxed 2pc file name does not change with log file if log trail on
+2010-01-04 11:01 source
-2010-02-23 10:44 source
+ file 1.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed rewriting of group patterns with filters replaced with restrictions on
- equivs
+2010-01-04 11:01 source
-2010-02-23 10:21 source
+ file 10.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed stop compilation where comp time over run time
+2010-01-04 11:01 source
-2010-02-19 00:22 source
+ file 10.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed when doing a log replay, mark prepared XA trx as such
+2010-01-04 11:01 source
-2010-02-19 00:22 source
+ file 10.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed more macros for 64bit fs
+2010-01-04 11:01 source
-2010-02-18 21:37 source
+ file 11.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Use macros for file calls for 64bit fs
+2010-01-04 11:01 source
-2010-02-18 21:36 source
+ file 11.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Merged XA fixes from HEAD
+2010-01-04 11:01 source
-2010-02-18 20:46 source
+ file 11.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * FIxed mem leak
+2010-01-04 11:01 source
-2010-02-18 14:22 source
+ file 12.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed minor issue
+2010-01-04 11:01 source
-2010-02-18 14:13 source
+ file 12.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed if avail always use ro_id for hash
+2010-01-04 11:01 source
-2010-02-18 14:12 source
+ file 12.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed text for NOT pred
+2010-01-04 11:01 source
-2010-02-18 10:57 source
+ file 13.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed use separate macro for COL_DOTTED
+2010-01-04 11:01 source
-2010-02-18 10:01 source
+ file 13.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed SIOC subscriptions
- * Fixed bad item descriptions
+2010-01-04 11:01 source
-2010-02-18 10:00 source
+ file 13.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed groups
- * Fixed bookmarklet
- * Fixed typo
+2010-01-04 11:01 source
-2010-02-17 22:06 source
+ file 14.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed order must be greater than 0
+2010-01-04 11:01 source
-2010-02-17 16:58 source
+ file 14.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed remove null in gby as it is not needed
- * Fixed jts to check for call
+2010-01-04 11:01 source
-2010-02-17 16:56 source
+ file 14.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed do not print default port for http and https in urls
+2010-01-04 11:01 source
-2010-02-17 10:21 source
+ file 15.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed labels and added new columns
+2010-01-04 11:01 source
-2010-02-16 15:03 source
+ file 15.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed IN pred as iterator before index path
+2010-01-04 11:01 source
-2010-02-16 13:49 source
+ file 15.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Added slidesix cartridge
- * Fixed run microformats independent of rdfa
+2010-01-04 11:01 source
-2010-02-16 13:48 source
+ file 16.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed owl:sameAS is not a:id
+2010-01-04 11:01 source
-2010-02-16 13:48 source
+ file 17.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed minor issues
+2010-01-04 11:01 source
-2010-02-16 13:48 source
+ file 18.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Rolled back fix for GR data
+2010-01-04 11:01 source
-2010-02-16 12:47 source
+ file 19.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed leave semaphore before jump
+2010-01-04 11:01 source
-2010-02-16 11:58 source
+ file 2.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed detection of n3 and nt formats
+2010-01-04 11:01 source
-2010-02-15 21:23 source
+ file 2.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * Fixed use macro
+2010-01-04 11:01 source
-2010-02-15 19:46 source
+ file 2.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
- * FIxed GPF when 2nd argument is not a string
+2010-01-04 11:01 source
-2010-02-15 19:46 source
+ file annot-close.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed inx int not applicable to keys with no pk ref
+2010-01-04 11:01 source
-2010-02-15 10:05 source
+ file annot-open.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed problem with shared files
+2010-01-04 11:01 source
-2010-02-12 22:14 source
+ file biblio-iso690.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed bad array index check
+2010-01-04 11:01 source
-2010-02-12 22:13 source
+ file blank.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Added option for user WebID
+2010-01-04 11:01 source
-2010-02-12 22:12 source
+ file caution.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed table editing fields
+2010-01-04 11:01 source
-2010-02-12 20:05 source
+ file caution.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed NT serializations (_:_ is not a valid bnode in NT so it is
- replaced with _:ResultSet2053 )
+2010-01-04 11:01 source
-2010-02-12 13:00 source
+ file caution.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Updated version to 3127
+2010-01-04 11:01 source
-2010-02-12 12:56 source
+ file caution.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Rebuild driver
+2010-01-04 11:01 source
-2010-02-12 12:56 source
+ file changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed use bitmask check
+2010-01-04 11:01 source
-2010-02-12 11:53 source
+ file chunk-changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed combination of RDF_OBJ_OF_LONG(RDF_LONG_OF_SQLVAL(string))
- that screwed up RDF_DELETE_TRIPLES_AGG()
+2010-01-04 11:01 source
-2010-02-12 11:20 source
+ file chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Added "Create New Resource" option
+2010-01-04 11:01 source
-2010-02-12 11:20 source
+ file chunk-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed always refresh robot status
+2010-01-04 11:01 source
-2010-02-12 10:34 source
+ file chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Regenerated drivers
+2010-01-04 11:01 source
-2010-02-12 10:26 source
+ file chunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed issues with Literal data
- * Small bugfixes
+2010-01-04 11:01 source
-2010-02-11 23:23 source
+ file chunkfast.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Updated documentation
+2010-01-04 11:01 source
-2010-02-11 23:17 source
+ file chunktoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed serialize ha_hits hash lookups
+2010-01-04 11:01 source
-2010-02-11 16:25 source
+ file draft.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed bug with ITF-8 encoded strings in box
+2010-01-04 11:01 source
-2010-02-11 14:00 source
+ file highlight.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed codegen in LIMIT ?:global-variable and OFFSET ?:global-variable
+2010-01-04 11:01 source
-2010-02-11 13:19 source
+ file home.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Added new demo queries
+2010-01-04 11:01 source
-2010-02-11 13:16 source
+ file home.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Added 'create file' action
+2010-01-04 11:01 source
-2010-02-11 13:15 source
+ file home.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed removed status bar
+2010-01-04 11:01 source
-2010-02-10 22:18 source
+ file html-rtf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed DAV path normalize
- * Fixed Feeds rights
- * Fixed UI Profile JS
- * Fixed UI Profile pages
+2010-01-04 11:01 source
-2010-02-10 22:17 source
+ file htmlhelp-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed WebID selection
- * Fixed calling proc from packages other than Framework
+2010-01-04 11:01 source
-2010-02-10 22:09 source
+ file htmlhelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed Anotea, CSS
- * Fixed Annotation SIOC Data
+2010-01-04 11:01 source
-2010-02-10 16:10 source
+ file htmltbl.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed move assignment of oplval_len before jump since we know
- oplval_strval is a string box already
+2010-01-04 11:01 source
-2010-02-10 16:09 source
+ file important.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed whitespace
+2010-01-04 11:01 source
-2010-02-10 16:08 source
+ file important.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed compiler warning about possible uninitialized vars
+2010-01-04 11:01 source
-2010-02-10 16:05 source
+ file important.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed typo in if expression
+2010-01-04 11:01 source
-2010-02-10 16:05 source
+ file important.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed use err_ret
+2010-01-04 11:01 source
-2010-02-10 16:04 source
+ file maketoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed should use int64 type
+2010-01-04 11:01 source
-2010-02-10 14:05 source
+ file manifest.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed SPARQL_SELECT_KNOWN_GRAPHS
+2010-01-04 11:01 source
-2010-02-10 14:04 source
+ file next.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed define dpipe before anything else is called
+2010-01-04 11:01 source
-2010-02-10 12:58 source
+ file next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed check for array boundary
+2010-01-04 11:01 source
-2010-02-10 12:57 source
+ file next.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed compiler warnings
+2010-01-04 11:01 source
-2010-02-10 11:03 source
+ file note.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Added DKS box serialization flag DKS_TO_HA_DISK_ROW to preserve
- box flags in procedure views temp tables
+2010-01-04 11:01 source
-2010-02-10 11:03 source
+ file note.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed missing initialization in calculation of cost and cardinality
+2010-01-04 11:01 source
-2010-02-09 17:38 source
+ file note.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed workaround for non-iri g1
+2010-01-04 11:01 source
-2010-02-09 17:37 source
+ file note.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed check to include iri_to_id
+2010-01-04 11:01 source
-2010-02-09 16:11 source
+ file oldchunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed bug with UTF-8 encoded strings
+2010-01-04 11:01 source
-2010-02-09 15:13 source
+ file onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Added new SPARQL endpoints
- * Added missing file
- * FIxed missing execute permalink
- * Fixed css to make tab effect more consistent
+2010-01-04 11:01 source
-2010-02-09 15:11 source
+ file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed do not make an artm op 0-n for neg literal -n
+2010-01-04 11:01 source
-2010-02-09 14:47 source
+ file pi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed check against abnormally big number of distinct datatypes
- or languages
+2010-01-04 11:01 source
-2010-02-09 14:34 source
+ file prev.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed version number in http headers
+2010-01-04 11:01 source
-2010-02-09 14:33 source
+ file prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed check trans node max mem when reading rows
+2010-01-04 11:01 source
-2010-02-09 14:23 source
+ file prev.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed mem leaks in client
+2010-01-04 11:01 source
-2010-02-09 11:39 source
+ file profile-chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed memory leak in trans node compilation
+2010-01-04 11:01 source
-2010-02-08 21:24 source
+ file profile-chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Added protection against abnormally bif number of distinct datatypes
- or languages
+2010-01-04 11:01 source
-2010-02-08 21:22 source
+ file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed SQL codegen for NOT() retval expression
+2010-01-04 11:01 source
-2010-02-08 21:22 source
+ file profile-htmlhelp-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed memory leak
+2010-01-04 11:01 source
-2010-02-08 12:38 source
+ file profile-htmlhelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * FIxed gpf in serializer when using default constand
- * Fixed gpf when type is bad or zero
+2010-01-04 11:01 source
-2010-02-08 12:34 source
+ file profile-onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed log replay for rdfs_load_schema on cluster
+2010-01-04 11:01 source
-2010-02-08 12:33 source
+ file task.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed loading literals of type xsd:Token
+2010-01-04 11:01 source
-2010-02-03 20:49 source
+ file tip.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Updated version to 6.1.0 for final release
+2010-01-04 11:01 source
-2010-02-03 20:37 source
+ file tip.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Removed deprecated directory
+2010-01-04 11:01 source
-2010-02-03 19:39 source
+ file tip.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Updated version to 06.01
+2010-01-04 11:01 source
-2010-02-03 19:38 source
+ file tip.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Updated version number
+2010-01-04 11:01 source
-2010-02-03 19:37 source
+ file toc-blank.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Updated version to 6.1.0-rc1
+2010-01-04 11:01 source
-2010-02-03 19:17 source
+ file toc-minus.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed missing include files
+2010-01-04 11:01 source
-2010-02-03 19:06 source
+ file toc-plus.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Regenerated drivers
+2010-01-04 11:01 source
-2010-02-03 18:37 source
+ file up.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed comment
+2010-01-04 11:01 source
-2010-02-03 18:34 source
+ file up.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Added missing file to distribution
+2010-01-04 11:01 source
-2010-02-03 18:03 source
+ file up.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed building with external zlib
+2010-01-04 11:01 source
-2010-02-03 17:09 source
+ file warning.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed no need to build this dir when using external zlib
+2010-01-04 11:01 source
-2010-02-03 17:06 source
+ file warning.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed generated by comment
+2010-01-04 11:01 source
-2010-02-03 16:58 source
+ file warning.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed CRLF
+2010-01-04 11:01 source
-2010-02-03 16:53 source
+ file warning.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
- * Fixed make clean
+2010-01-04 11:01 source
-2010-02-03 15:46 source
+ file README was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed changelog
+2010-01-04 11:01 source
-2010-02-03 15:44 source
+ file annotations.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * Fixed dependency
+2010-01-04 11:01 source
-2010-02-03 15:40 source
+ file autoidx-kimber.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
- * 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
+2010-01-04 11:01 source
- NOTE: sites which have multiple virtual directories hosting iSPARQL will
- all need the new /d efaults VHOST added manually.
+ file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-03 15:28 source
+2010-01-04 11:01 source
- * Updated version
+ file autoidx-ng.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-03 15:21 source
+2010-01-04 11:01 source
- * Fixed changelog rule
+ file autoidx.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-03 15:05 source
+2010-01-04 11:01 source
- * Added support for CKEditor
+ file c-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-03 15:05 source
+2010-01-04 11:01 source
- * Added new examples
+ file common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-03 15:04 source
+2010-01-04 11:01 source
- * Added new SKOS-trans inference rule
+ file cpp-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-03 14:54 source
+2010-01-04 11:01 source
- * Fixed do not put sort node as ks_stp if the sort node has precode that
- hs a dpipe part
+ file csharp-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-03 13:54 source
+2010-01-04 11:01 source
- * Fixed setting
+ file delphi-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-03 10:29 source
+2010-01-04 11:01 source
- * Added DB.DBA.BEST_LANGMATCH() and bif_langmatches_pct_http()
+ file fop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-03 10:29 source
+2010-01-04 11:01 source
- * Fixed bad init in trans node if multiple inputs or step output values
+ file fop1.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-03 00:41 source
+2010-01-04 11:01 source
- * Fixed CREDITS
+ file highlight.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-02 23:57 source
+2010-01-04 11:01 source
- * Fixed install LICENSE, CREDITS, AUTHORS, READMEs etc in doc dir
+ file htmltbl.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-02 23:24 source
+2010-01-04 11:01 source
- * Fixed redundant trailing '>' in results of TTL load when IRIs contain
- special chars
+ file ini-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 23:04 source
+2010-01-04 11:01 source
- * Added support for Virtuoso JDBC Driver documentation
+ file java-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 22:52 source
+2010-01-04 11:01 source
- * Fixed comments
+ file javascript-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 20:24 source
+2010-01-04 11:01 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
+ file m2-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 19:38 source
+2010-01-04 11:01 source
- * Fixed windows math.h needs this define for M_PI etc
+ file myxml-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 17:59 source
+2010-01-04 11:01 source
- * Fixed php, jsp and vsp users update pages
+ file pagesetup.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-02 14:32 source
+2010-01-04 11:01 source
- * Fixed bug in Doc and Main wiki clusters
+ file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-02 14:20 source
+2010-01-04 11:01 source
- * Fixed "option (score ...)" in a gp with multiple OPTIONAL (...)
+ file passivetex.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 14:18 source
+2010-01-04 11:01 source
- * Fixed align buffer to sizeof pointer to avoid crash on strict
- checking platforms like sparc
+ file pdf2index was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 14:17 source
+2010-01-04 11:01 source
- * FIxed memleak when cache is used
+ file perl-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 14:16 source
+2010-01-04 11:01 source
- * Fixed compiler warnings
+ file php-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-02 14:15 source
+2010-01-04 11:01 source
- * Fixed problem with rfc1808_expand_uri not using proper macros
- and allocate byte extra for strings
+ file pi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 23:16 source
+2010-01-04 11:01 source
- * Updated windows project file
+ file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 23:15 source
+2010-01-04 11:01 source
- * Updated win32 and win64 build scripts
+ file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 23:14 source
+2010-01-04 11:01 source
- * Fixed compiler warning
+ file ptc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 23:13 source
+2010-01-04 11:01 source
- * Fixed bad cast
+ file python-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 23:10 source
+2010-01-04 11:01 source
- * Fixed typo
+ file qandaset.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 15:15 source
+2010-01-04 11:01 source
- * Added conversion code to migrate DB to 2+3 index
+ file ruby-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 15:10 source
+2010-01-04 11:01 source
- * Added check for XA ROLLBACKONLY
+ file spaces.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 14:59 source
+2010-01-04 11:01 source
- * Rebuild drivers
+ file table.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 14:58 source
+2010-01-04 11:01 source
- * Fixed when different TZ is used, must find offset and transform via GMT
+ file task.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 13:08 source
+2010-01-04 11:01 source
- * Fixed missing prototype
+ file tcl-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 13:02 source
+2010-01-04 11:01 source
- * Added missing file
+ file titlepage.templates.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 12:54 source
+2010-01-04 11:01 source
- * Updated version to 6.0.1-pre2
+ file titlepage.templates.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 12:53 source
+2010-01-04 11:01 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 { ...}}
+ file xep.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 12:44 source
+2010-01-04 11:01 source
- * Merged 2+3 index into VOS
- * Added new sample queries
- * Fixed text recoding to UTF8
+ file xslthl-config.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
-2010-02-01 12:40 source
+2010-01-04 11:01 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
+ file README was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 12:36 source
+2010-01-04 11:01 source
- * Added stubs
+ file README.LIBXSLT was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 12:35 source
+2010-01-04 11:01 source
- * Fixed check db size and exit if not correct
- * Fixed text of version mismatch messages
+ file annotations.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 09:26 source
+2010-01-04 11:01 source
- * Removed unused variables
+ file authors.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-02-01 02:45 source
+2010-01-04 11:01 source
- * Fixed function prototypes
+ file autoidx-kimber.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 02:43 source
+2010-01-04 11:01 source
- * Fixed xper not supported in cluster
+ file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 02:39 source
+2010-01-04 11:01 source
- * Improved SPARQL parsing and SQL codegen for negative numbers
+ file autoidx-ng.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 02:36 source
+2010-01-04 11:01 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
+ file autoidx.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 02:32 source
+2010-01-04 11:01 source
- * Added new rdf box function
+ file axf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 02:18 source
+2010-01-04 11:01 source
- * Fixed inside cpt do not notice anytimes and disconnects
+ file biblio-iso690.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 02:16 source
+2010-01-04 11:01 source
- * Fixed security in cluster
+ file copyright.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-02-01 02:10 source
+2010-01-04 11:01 source
- * Partial rollback of patch
+ file dbtoepub was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 02:08 source
+2010-01-04 11:01 source
- * Fixed look up rdf lit ids in cost model to get the card
+ file docbook.py was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 02:00 source
+2010-01-04 11:01 source
- * Added initial support for owl:inverseOf, owl:SymmetricProperty
- and owl:TransitiveProperty
+ file docbook.rb was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 01:45 source
+2010-01-04 11:01 source
- * Fixed index path outer join
+ file docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 01:45 source
+2010-01-04 11:01 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.
+ file ebnf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 01:08 source
+2010-01-04 11:01 source
- * Fixed gpf during rfwd containing XA transaction
+ file eclipse.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 01:00 source
+2010-01-04 11:01 source
- * Fixed atomic must proceed even if uncommitted 2pc prepared
+ file fo-rtf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-02-01 00:53 source
+2010-01-04 11:01 source
- * Added function __uname
+ file license.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 23:07 source
+2010-01-04 11:01 source
- * Added new function __rdf_rng_min
+ file page.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 23:06 source
+2010-01-04 11:01 source
- * Added new implementation of log_text and log_text_array
+ file profile-eclipse.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-01-31 23:04 source
+2010-01-04 11:01 source
- * Fixed compiler warnings
+ file reference.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 20:48 source
+2010-01-04 11:01 source
- * Fixed reading of last chunk
+ file reference.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 20:46 source
+2010-01-04 11:01 source
- * Added debug flag for sponger
+ file reference.xml.included was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 20:44 source
+2010-01-04 11:01 source
- * Fixed declare iri to ir et all as no cluster
+ file saxon65.jar was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-01-31 20:43 source
+2010-01-04 11:01 source
- * Fixed missing externals
+ file ta.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 20:41 source
+2010-01-04 11:01 source
- * Fixed checkpoint messages in log
+ file table.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 20:37 source
+2010-01-04 11:01 source
- * Fixed do not run dav init on cluster before cluster is up
+ file targetdatabase.dtd was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 20:36 source
+2010-01-04 11:01 source
- * Fixed rdf init on dav does not need to be done on empty db, thus run
- only in single when update is needed
+ file targets.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 20:32 source
+2010-01-04 11:01 source
- * Fixed fault tolerance
+ file th.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 20:18 source
+2010-01-04 11:01 source
- * Updated testsuite
+ file titles.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 16:47 source
+2010-01-04 11:01 source
- * Updated documentation
+ file tl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-31 12:43 source
+2010-01-04 11:01 source
- * Fixed if negative numeric literal, do not make it 0 - litt
+ file tr.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-30 01:12 source
+2010-01-04 11:01 source
- * Added debug flag for sponger
- * Fixed use http_host connection var in aq mode
+ file uk.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-29 23:59 source
+2010-01-04 11:01 source
- * Fixed whitespace
+ file utility.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-29 21:29 source
+2010-01-04 11:01 source
- * Removed deprecated file
+ file utility.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-29 20:54 source
+2010-01-04 11:01 source
- * Fixed for building without SSL
+ file vi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-29 20:21 source
+2010-01-04 11:01 source
- * Added support for ckeditor
- * Removed deprecated rte and kupu editors
+ file warranty.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-01-29 16:18 source
+2010-01-04 11:01 source
- * Fixed library version
+ file xalan27.jar was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-01-29 16:16 source
+2010-01-04 11:01 source
+
+ file xh.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+
+2010-01-04 11:01 source
- * Removed unused include file
+ file xslt.py was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
-2010-01-29 15:21 source
+2010-01-04 11:01 source
- * Fixed minor issues
+ file zh.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-29 15:09 source
+2010-01-04 11:01 source
- * Fixed use sparql load instead of soft
+ file zh_cn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-29 15:07 source
+2010-01-04 11:01 source
- * Removed support for IE 5 and 6 compatibility
+ file zh_tw.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-29 15:00 source
+2010-01-04 11:01 source
- * Fixed crawler pages
+ file eu.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-29 14:52 source
+2010-01-04 11:01 source
- * Fixed use newer version of wsa
+ file fa.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-29 13:23 source
+2010-01-04 11:01 source
- * Fixed removed deprecated samples
+ file ga.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-29 13:20 source
+2010-01-04 11:01 source
- * Fixed build issue with md5
+ file gentext.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-29 11:34 source
+2010-01-04 11:01 source
- * Removed deprecated samples/demos
+ file gl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-29 02:41 source
+2010-01-04 11:01 source
- * Fixed uploading large files
+ file gu.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-29 01:56 source
+2010-01-04 11:01 source
- * Fixed use MD5 from OpenSSL when possible
+ file he.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-29 00:15 source
+2010-01-04 11:01 source
- * Fixed build to use generate script
- * Removed deprecated file
+ file hi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 17:08 source
+2010-01-04 11:01 source
- * Fixed make sure version is intact as changes to .ttl file must
- reflect in sparql.sql
+ file hr.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 14:33 source
+2010-01-04 11:01 source
- * Fixed non-portable sleep argument
+ file hu.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 14:19 source
+2010-01-04 11:01 source
- * Fixed API rename
+ file id.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 14:19 source
+2010-01-04 11:01 source
- * Fixed typo
+ file insertfile.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 13:36 source
+2010-01-04 11:01 source
- * Fixed missing qualification of aggregate
+ file is.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 01:14 source
+2010-01-04 11:01 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
+ file kn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 01:11 source
+2010-01-04 11:01 source
- * Fixed automatically allocate bufs
+ file ko.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 00:36 source
+2010-01-04 11:01 source
- * Added option BuffersAllocation
- * Added option AsyncQueueMaxThreads
+ file ky.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 00:31 source
+2010-01-04 11:01 source
- * Fixed default sitemap crawling functions
- * Fixed wrong variable
- * Fixed wait before update
+ file l10n.dtd was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-28 00:30 source
+2010-01-04 11:01 source
- * Updated php, jsp and vsp user pages
+ file la.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-27 20:43 source
+2010-01-04 11:01 source
- * Added FOAF+SSL groups
+ file labels.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-27 20:31 source
+2010-01-04 11:01 source
- * Added support for Google Base items types 'wanted ads', 'business
- location' and 'product catalogs'
+ file lt.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-27 20:31 source
+2010-01-04 11:01 source
- * Fixed virtrdf_label
+ file lv.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-27 12:55 source
+2010-01-04 11:01 source
- * Fixed use DV_SHORT_STRING_SERIAL tag when serializing short strings
+ file mn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-27 12:54 source
+2010-01-04 11:01 source
- * Fixed varlgrind warning about using uninitialized memory read
+ file nb.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-27 12:52 source
+2010-01-04 11:01 source
- * Fixed in getting page_row reset rd leaf if not a leaf.
+ file nn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-27 12:51 source
+2010-01-04 11:01 source
- * Fixed do not POST when no post parameters
+ file olink.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-27 01:29 source
+2010-01-04 11:01 source
- * Fixed read after allocated memory
+ file or.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-25 23:46 source
+2010-01-04 11:01 source
- * Removed deprecated files
+ file pa.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-25 22:42 source
+2010-01-04 11:01 source
- * Fixed copyright and license clarification
+ file pi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
-2010-01-25 20:45 source
+2010-01-04 11:01 source
- * Fixed must commit before aq_wait
+ file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 16:20 source
+2010-01-04 11:01 source
- * Updated documentation
+ file refentry.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 16:10 source
+2010-01-04 11:01 source
- * Added php, jsp and vsp users update
- * Fixed problem with activity pages
+ file refentry.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 16:09 source
+2010-01-04 11:01 source
- * FIxed copyright
+ file sl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 16:09 source
+2010-01-04 11:01 source
- * Fixed SSL check
+ file sq.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 16:05 source
+2010-01-04 11:01 source
- * Fixed bug in permissions
+ file sr.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 15:42 source
+2010-01-04 11:01 source
- * Fixed problem with MaxMempoolSize
- * Fixed problem with driver properties
+ file sr_Latn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 15:41 source
+2010-01-04 11:01 source
- * Fixed shortened long URLs in the crawlers view to avoid UI breakage
+ file stripns.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 15:12 source
+2010-01-04 11:01 source
- * Fixed support for Google Base 'products' item type
- * Fixed headers
+ file subtitles.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
-2010-01-25 14:57 source
+2010-01-04 11:01 source
- * Fixed use pipeline client in crawler
+ * Imported docbook-xsl-1.75.2
-2010-01-25 10:39 source
+2010-01-04 11:01 source
- * Fixed accept different headers in pipeline request; add header only if
- it contains something
+ file .CatalogManager.properties.example was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:41 +0000
-2010-01-15 13:47 source
+2010-01-04 11:01 source
- * Fixed crash when timeout was sent using dv_array_of_long
+ file .cshrc.incl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:41 +0000
-2010-01-15 13:02 source
+2010-01-04 11:01 source
- * Fixed small lang conversion issue
+ file .emacs.el was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:41 +0000
-2010-01-15 12:16 source
+2010-01-04 11:01 source
- * Rebuild driver
+ file .profile.incl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:41 +0000
-2010-01-15 12:15 source
+2010-01-04 11:01 source
- * Fixed issue with disconnect
- * Fixed issue with XA exception
+ file .urilist was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-14 16:21 source
+2010-01-04 11:01 source
- * Fixed bug calculating todays date
+ file AUTHORS was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-14 16:06 source
+2010-01-04 11:01 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
+ file COPYING was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-14 16:04 source
+2010-01-04 11:01 source
- * Added new popup calendar based on OAT
- * Fixed use current OAT API function names
- * FIxed explicit references to ymaps, gmaps
+ file INSTALL was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-14 15:57 source
+2010-01-04 11:01 source
- * Added LICENSE and COPYING from OAT project
- * Removed custom map loaders
- * Fixed use current OAT API function names instead of backward compat
+ file NEWS was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-13 15:05 source
+2010-01-04 11:01 source
- * Fixed non-rfc method to make URL
+ file NEWS.html was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-13 15:02 source
+2010-01-04 11:01 source
- * Fixed missing type cast
+ file NEWS.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-13 08:51 source
+2010-01-04 11:01 source
- * Fixed user UI login pages
- * Fixed user UI pages
- * Fixed user home page field size
+ file RELEASE-NOTES.html was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-12 23:21 source
+2010-01-04 11:01 source
- * Fixed decoding unicode escape sequences in post request
+ file RELEASE-NOTES.txt was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-12 12:19 source
+2010-01-04 11:01 source
- * Fixed automated labels extraction
+ file RELEASE-NOTES.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-12 12:15 source
+2010-01-04 11:01 source
- * Fixed memory leak
+ file af.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-12 11:06 source
+2010-01-04 11:01 source
- * Added doap:name for labeling
+ file am.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-11 16:02 source
+2010-01-04 11:01 source
- * Fixed primary topic from Offering to Product
+ file ar.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-11 14:19 source
+2010-01-04 11:01 source
- * Fixed missing dcterms:publisher
+ file autoidx-kimber.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-07 17:09 source
+2010-01-04 11:01 source
- * Imported docbook-xsl-1.75.2
+ file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-07 16:56 source
+2010-01-04 11:01 source
- * Fixed copyright year to 2010
+ file az.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-07 16:55 source
+2010-01-04 11:01 source
- * Fixed sync Contact UI with Profile UI
- * Fixed copyright year to 2010
+ file bg.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-07 16:55 source
+2010-01-04 11:01 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
+ file bn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-06 21:33 source
+2010-01-04 11:01 source
- * Updated documentation
+ file bs.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-06 17:33 source
+2010-01-04 11:01 source
- * Fixed bad transformation in feed when author has no name
- * Fixed process media:contain properly re images
+ file catalog.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-06 16:49 source
+2010-01-04 11:01 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.
+ file charmap.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-06 16:47 source
+2010-01-04 11:01 source
- * Fixed default log mode in SPARUL MDW operations to distinquish
- between NULL and 0 log mode
+ file charmap.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-06 16:45 source
+2010-01-04 11:01 source
- * Fixed check if qi is actually available in this context
+ file common.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-06 12:12 source
+2010-01-04 11:01 source
- * Fixed handling of default graph URI param
+ file cy.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-05 19:12 source
+2010-01-04 11:01 source
- * Added extra tests
+ file entities.ent was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-05 18:24 source
+2010-01-04 11:01 source
- * Fixed moved commit work else async exec might generate new rdf_obj
+ file eo.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-04 11:54 source
+2010-01-04 11:01 source
- * Fixed if null box then use 0 to prevent core dump
+ file et.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-04 11:47 source
+2010-01-04 11:01 source
- * Fixed dependency
+ file install.sh was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-04 11:42 source
+2010-01-04 11:01 source
- * Removed deprecated file
+ file test.sh was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
-2010-01-04 11:25 source
+2010-01-04 11:01 source
- * Fixed typo
+ file uninstall.sh was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
2010-01-04 08:33 source
@@ -8132,6 +17755,14 @@
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
@@ -8182,6 +17813,10 @@
* 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
@@ -8248,6 +17883,9 @@
* 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
@@ -8358,6 +17996,9 @@
* 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
@@ -8386,6 +18027,22 @@
* 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
@@ -8394,6 +18051,10 @@
* 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
@@ -8633,6 +18294,10 @@
* 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
@@ -8673,6 +18338,10 @@
* 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
@@ -8693,6 +18362,10 @@
* 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
@@ -8723,6 +18396,10 @@
* 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
@@ -8983,6 +18660,10 @@
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
@@ -9050,6 +18731,14 @@
* 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
@@ -9109,6 +18798,14 @@
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
@@ -9153,6 +18850,22 @@
* 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
@@ -9173,6 +18886,10 @@
* 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
@@ -9220,10 +18937,34 @@
* 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 33f11a8..4e83c45 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
OpenLink Software's Virtuoso Open-Source (VOS) project
-Copyright (C) 1998-2010 OpenLink Software
+Copyright (C) 1998-2012 OpenLink Software
This software is licensed under the GNU General Public License (see
COPYING).
diff --git a/Makefile.am b/Makefile.am
index 8e5e9fc..15f4826 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-2009 OpenLink Software
+# 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
@@ -103,10 +103,6 @@ EXTRA_DIST = \
debian/virtuoso-opensource.postrm.debhelper \
debian/virtuoso-opensource.prerm.debhelper \
debian/virtuoso-opensource.substvars \
- win32/mkperlenv.pl \
- win32/mkpythonenv.py \
- win32/*.bat \
- win32/*.vcproj \
- win32/*.sln \
- win64/*.vcproj \
- win64/*.sln
+ windows/*.bat \
+ windows/*.sln \
+ windows/*.vcxproj
diff --git a/Makefile.in b/Makefile.in
index 4e4e784..7d2e1cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -77,7 +75,6 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -92,29 +89,12 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(docdir)"
+dist_docDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_doc_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -122,34 +102,9 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -241,7 +196,6 @@ 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@
@@ -325,7 +279,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -346,7 +299,6 @@ 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@
@@ -395,13 +347,9 @@ EXTRA_DIST = \
debian/virtuoso-opensource.postrm.debhelper \
debian/virtuoso-opensource.prerm.debhelper \
debian/virtuoso-opensource.substvars \
- win32/mkperlenv.pl \
- win32/mkpythonenv.py \
- win32/*.bat \
- win32/*.vcproj \
- win32/*.sln \
- win64/*.vcproj \
- win64/*.sln
+ windows/*.bat \
+ windows/*.sln \
+ windows/*.vcxproj
all: all-recursive
@@ -412,15 +360,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -436,10 +384,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- $(am__cd) $(srcdir) && $(AUTOCONF)
+ cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
mostlyclean-libtool:
-rm -f *.lo
@@ -448,27 +395,24 @@ clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
- -rm -f libtool config.lt
+ -rm -f libtool
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
- @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
- for p in $$list; do \
+ @list='$(dist_doc_DATA)'; 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)$(docdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+ f=$(am__strip_dir) \
+ echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
done
uninstall-dist_docDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(docdir)" && rm -f $$files
+ @list='$(dist_doc_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(docdir)/$$f"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -477,7 +421,7 @@ uninstall-dist_docDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -494,7 +438,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -502,7 +446,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -528,16 +472,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -545,14 +489,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -564,50 +508,46 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ test -d $(distdir) || mkdir $(distdir)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -623,55 +563,38 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
done
- -test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -755 \
- -exec chmod u+rwx,go+rx {} \; -o \
+ -find $(distdir) -type d ! -perm -755 -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r "$(distdir)"
+ || chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
@@ -680,14 +603,6 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
-dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -711,17 +626,13 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -729,11 +640,9 @@ distcheck: dist
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
- test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
+ && cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
@@ -755,15 +664,13 @@ distcheck: dist
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
- && cd "$$am__cwd" \
- || exit 1
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
+ @cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
@@ -808,7 +715,6 @@ clean-generic:
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"
@@ -830,8 +736,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -840,28 +744,18 @@ install-data-am: install-dist_docDATA
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -884,17 +778,17 @@ ps-am:
uninstall-am: uninstall-dist_docDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-generic distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dist_docDATA install-dvi \
+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-libtool distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dist_docDATA install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
@@ -933,7 +827,6 @@ uninstall-am: uninstall-dist_docDATA
#
snapshot:
$(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"`
-
# 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/NEWS b/NEWS
index 0e39f69..792a4f8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,211 @@
+Jul 30, 2012, V6.1.6:
+ * Database engine
+ - Added support for Sparql Service Description
+ - Added support for SOUNDEX and DIFFERENCE
+ - Added support for FROM SUBQUERY { .. } in quad map
+ - Added optimizations to JSON parser
+ - Added support for SSL Chain Certificates
+ - Added webid protected endpoints template
+ - Added error reporting if query compilation fails
+ - Added extra checks for db slices
+ - Added dsn name to explain output
+ - Added support for CORS in web services
+ - Added propagation of LIMIT restrictions
+ - Added support for protocol switching e.g. using websockets
+ - Added generation of url rewrite rules
+ - Fixed ETag calculation
+ - Fixed bad code for clear graph <xxxx>
+ - Fixed buffer overflow when using wide chars
+ - Fixed check to prevent out of range seek
+ - Fixed clear errors on ODBC connection handle
+ - Fixed compiler warnings
+ - Fixed datetime conversion
+ - Fixed external vars in table subqueries of scalar subqueries
+ - Fixed http_ses_arg is supposed to return ws_session
+ - Fixed issue with content type if already set by rewrite rule
+ - Fixed issue with transitive subqueries
+ - Fixed issue with unknown BIF msg in SPARQL compiler error
+ - Fixed issue with Bison 2.6 code generation
+ - Fixed issue with SERVICE
+ - Fixed issue with UNIONs
+ - Fixed issue with incomplete rdf box
+ - Fixed memory leaks
+ - Fixed multi-column transitivity
+ - Fixed portability issues on FreeBSD, Solaris and Mac OS X
+ - Fixed print of builtin expressions with multipart alias name
+ - Fixed use provided password from ODBC connect handle
+ - Fixed valgrind warnings
+ - Updated documentation
+
+ * SPARQL and RDF
+ - Added RDFa and MTML+Microdata autodetection
+ - Added REPORT method
+ - Added WebDAV DET folder type
+ - Added Wolfram|Alpha cartridge
+ - Added debug code for sponger
+ - Added di: scheme
+ - Added extra debugging code to SPARQL engine
+ - Added new mime type application/n-triples
+ - Added procedure view for SPARQL BINDINDS
+ - Added rdb2rdf VAD
+ - Added support for INF, -INF and NaN
+ - Added support for SPARQL 1.1 BINDINGS
+ - Added support for self-description
+ - Added support for slash proxy IRIs
+ - Added support for sponging of ftp urls
+ - Added support for subqueries inside QUAP MAP { .. } groups
+ - Added support for tab-separated-values (TSV) format in sparql
+ - Added support for text/turtle
+ - Fixed SPARQL LOAD SERVICE <...> DATA
+ - Fixed access rights and status for SPARUL_LOAD_SERVICE_DATA
+ - Fixed escaping of weird IRIs in RDF/XML output
+ - Fixed grants for SPARQL LOAD SERVICE <...> DATA
+ - Fixed issue joining two federated queries to the same host
+ - Fixed issue with double "AS" for lang in resultset
+ - Fixed issue with RDF View, bif:contains and option(?score)
+ - Fixed issue with SPARQL-FED code generation
+ - Fixed issue with graph level security check in SPARQL-FED subquery
+ - Fixed issue with transitive query
+ - Fixed issue with xsd:dateTime in SPARQL results
+ - Fixed issues loading microdata with namespace decls
+ - Fixed negation to use SPARQL 1.1 FILTER NOT EXISTS
+ - Fixed possible stack overflow on long UNIONs
+ - Fixed resource name encoding problem
+ - Fixed service SPARQL codegen with zero retvals
+ - Fixed support for SERVICE
+ - Improved error diagnostics for ALTER QUAD STORAGE <> { DROP }
+ - Removed test for @rel, @rev or @property from application/xhtml+xml
+ - Upgraded sesame driver to use Sesame 2.5.6
+
+ - Merged DBpedia VAD fixes
+ + Added registry setting dbp_last_modification to get SP returning last modified date
+ + Added support for If-Modified-Since
+ + Added support for rel="nofollow" on external links
+ + Fixed XHTML+RDFa validation
+ + Fixed check if modified
+ + Fixed reset timezone
+ + Fixed use owl graph for properties
+
+ - Merged iSPARQL vad
+ + Added control for raw URIs in sparql result set view
+ + Added persistence in permalinks
+ + Added alternate links in HEAD
+ + Added support to remember rdf display/tab
+ + Added support to remember previous tab
+ + Upgraded MAP support for latest OpenLayers/OpenStreetmap
+ + Disabled dysfunctional NASA blue marble tiles
+
+ * ODS Applications
+ - Added initial API documentation + doxify templates
+ - Added advanced ACL settings for sparql or services authentication
+ - Added ACL filters
+ - Added support for Box, Google Drive and Skydrive + ACLs
+ - Added support for private graphs
+ - Fixed redirect
+
+ - Merged ODS Addressbook fixes
+ + Added CalDAV Import
+
+ - Merged ODS Bookmark VAD
+ + Added box.net folder definition
+ + Added default values for cartridges
+ + Added support for WebDAV DET
+ + Added support for private graphs
+ + Fixed bad owner in some DET resources
+ + Fixed permission problem for some DETs
+ + Updated S3 DET folder
+
+ - Merged ODS Briefcase VAD
+ + Added ACL for IMAP DET folder
+ + Added mail notification for webid sharing
+ + Fixed ' -,acl' files
+ + Fixed problem with editing mounted sources
+ + Fixed resource server side encryption problem
+ + Fixed sponge feature
+
+ - Merged ODS Calendar VAD
+ + Added CalDAV, CardDAV DETs and RESTful CRUD
+ + Fixed WebID write access
+ + Fixed daylight savings time on import to calendar
+
+ - Merged ODS Framework VAD
+ + Added Help links
+ + Added JSON output option for certgen
+ + Added link tags to user's pages
+ + Fixed 'Enable Automatic WebID Login' value
+ + Fixed private graphs init
+ + Fixed quotes on sparql vars
+ + Fixed remove session when acl is altered
+ + Fixed rest interface page
+ + Fixed semping protocol
+ + Fixed typos
+ + Fixed void dset
+ + Updated CKeditor to version 3.6.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 5899fe4..32302d5 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
Virtuoso Open-Source Edition: Building
======================================
-Copyright (C) 1998-2010 OpenLink Software <vos.admin at openlinksw.com>
+Copyright (C) 1998-2012 OpenLink Software <vos.admin at openlinksw.com>
Table of Contents
@@ -34,6 +34,9 @@ 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
@@ -313,6 +316,24 @@ 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 40b42a3..93f435a 100644
--- a/README.CVS
+++ b/README.CVS
@@ -1,7 +1,21 @@
Using Virtuoso Open Source Edition CVS Tree
===========================================
-Copyright (C) 1998-2010 by OpenLink Software <vos.admin at openlinksw.com>
+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
Introduction
diff --git a/README.GIT b/README.GIT
new file mode 100644
index 0000000..8cf774e
--- /dev/null
+++ b/README.GIT
@@ -0,0 +1,152 @@
+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/aclocal.m4 b/aclocal.m4
index ac48335..95c1bb7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# 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.
@@ -11,15 +11,12 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,10 +28,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -48,12 +45,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -110,14 +105,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# 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 9
+# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -130,7 +125,6 @@ AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -144,14 +138,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# 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 10
+# serial 9
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -208,16 +202,6 @@ AC_CACHE_CHECK([dependency style of $depcc],
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
- am__universal=false
- m4_case([$1], [CC],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac],
- [CXX],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac])
-
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -235,17 +219,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -255,23 +229,19 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
none) break ;;
esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -328,68 +298,57 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# 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
+#serial 3
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+[for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
done
-}
+done
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -421,13 +380,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# 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 16
+# serial 12
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -444,7 +403,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -495,8 +454,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -504,37 +463,24 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
@@ -545,19 +491,18 @@ m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
-_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -568,14 +513,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
- esac
-fi
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -623,38 +561,27 @@ fi])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# 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
+# serial 4
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well. Anyway, the user
-# can override the default with the --enable/--disable switch.
AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
- [enable], [m4_define([am_maintainer_other], [disable])],
- [disable], [m4_define([am_maintainer_other], [enable])],
- [m4_define([am_maintainer_other], [enable])
- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
- AC_ARG_ENABLE([maintainer-mode],
-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
- [USE_MAINTAINER_MODE=$enableval],
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST([MAINT])dnl
+ AC_SUBST(MAINT)dnl
]
)
@@ -662,13 +589,13 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
#
# 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 4
+# serial 3
# AM_MAKE_INCLUDE()
# -----------------
@@ -677,7 +604,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo done
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -687,24 +614,24 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
@@ -714,14 +641,14 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# 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 6
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -738,14 +665,7 @@ AC_SUBST($1)])
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
-fi
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -783,13 +703,13 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
#
# 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 4
+# serial 3
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -806,7 +726,7 @@ AC_DEFUN([_AM_SET_OPTION],
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
@@ -833,14 +753,14 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# 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
+# serial 4
# AM_SANITY_CHECK
# ---------------
@@ -849,29 +769,16 @@ AC_DEFUN([AM_SANITY_CHECK],
# Just in case
sleep 1
echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name. Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
- *[[\\\"\#\$\&\'\`$am_lf]]*)
- AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
+ set X `ls -t $srcdir/configure conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -924,25 +831,18 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006 Free Software Foundation, Inc.
#
# 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 2
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
diff --git a/appsrc/Makefile.am b/appsrc/Makefile.am
index d271b54..80e4fc4 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-2006 OpenLink Software
+# 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
diff --git a/appsrc/Makefile.in b/appsrc/Makefile.in
index ef7a5fe..704267b 100644
--- a/appsrc/Makefile.in
+++ b/appsrc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -81,38 +78,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -200,7 +169,6 @@ 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@
@@ -284,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -305,7 +272,6 @@ 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@
@@ -331,14 +297,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -356,7 +322,6 @@ $(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
@@ -371,7 +336,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -388,7 +353,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -396,7 +361,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -422,16 +387,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -439,14 +404,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -458,43 +423,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -515,44 +476,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -582,7 +528,6 @@ clean-generic:
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"
@@ -601,8 +546,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -611,28 +554,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -653,8 +586,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -670,7 +603,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
-
# 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/appsrc/ODS-Addressbook/Makefile.am b/appsrc/ODS-Addressbook/Makefile.am
index b4ce644..aa7f85e 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-2007 OpenLink Software
+# 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
@@ -44,8 +44,10 @@ clean-local:
-rm -rf vad
EXTRA_DIST = \
+ *.dox \
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 356db60..27335d1 100644
--- a/appsrc/ODS-Addressbook/Makefile.in
+++ b/appsrc/ODS-Addressbook/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2007 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -307,8 +287,10 @@ CLEANFILES = \
virtuoso.trx
EXTRA_DIST = \
+ *.dox \
make_vad.sh \
sql/*.sql \
+ vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
@@ -327,14 +309,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Addressbook/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Addressbook/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Addressbook/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Addressbook/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -352,7 +334,6 @@ $(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
@@ -362,23 +343,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -402,17 +380,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -444,7 +418,6 @@ clean-generic:
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"
@@ -463,8 +436,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -473,28 +444,18 @@ 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
@@ -535,7 +496,6 @@ ods_addressbook_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Addressbook/ODS-Addressbook.dox b/appsrc/ODS-Addressbook/ODS-Addressbook.dox
new file mode 100644
index 0000000..5930f15
--- /dev/null
+++ b/appsrc/ODS-Addressbook/ODS-Addressbook.dox
@@ -0,0 +1,30 @@
+/**
+\defgroup ods_module_addressbook ODS Addressbook API
+
+ODS-Addressbook offers features to add, manage, and organize contacts for every ODS user.
+
+\section oids_addressbook_features Feature Highlights
+
+- Create/Update/Delete Contact.
+- Organize information in four main tabs: Personal, Contact, Home and Business
+- Tag Contacts. One or more contacts can be selected in order to add (n) tags to them. An additional option is to add tags from the user's tags list, so-called "My Tags".
+- Import Contacts: User can import contacts from:
+ - The following file types, found in the local file system or WebDAV?:
+ - vCard
+ - FOAF
+ - CSV (the user will be given the opportunity to map fields from the file to Addressbook properties)
+ - LDAP Servers: depends on what servers the user has defined at his User Profile Page->Tab "LDAP Servers"
+- Export contact(s) to vCard, FOAF, or CSV files
+- Share contact(s) with other users
+- View contact(s) others have shared with the user
+- Simple/Advanced Search
+ - Advanced search adds options to:
+ - search among own and/or shared contact(s)
+ - set max rows
+ - order by Name, Link, or Folder
+ - Set Direction of the search results: Desc or Asc
+ - Show a Tag Cloud within search results
+- RSS, Atom, and RDF support
+- SIOC(RDF/XML), SIOC(N3/Turtle) support
+- SyncML? support
+*/
diff --git a/appsrc/ODS-Addressbook/make_vad.sh b/appsrc/ODS-Addressbook/make_vad.sh
index 325abc6..756dd3a 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.34 2011/07/04 10:04:00 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2007 OpenLink Software
+# 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
@@ -30,7 +30,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.4.71"
+VERSION="1.0.0"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -87,6 +87,56 @@ 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
@@ -222,7 +272,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-2011 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
@@ -234,8 +284,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.82.42\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.86.16\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2012-04-18 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -263,6 +313,7 @@ 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
@@ -377,6 +428,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
+version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -393,7 +445,6 @@ 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"
@@ -403,5 +454,7 @@ 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
new file mode 100755
index 0000000..f955e13
--- /dev/null
+++ b/appsrc/ODS-Addressbook/sql/DET_CardDAV.sql
@@ -0,0 +1,1091 @@
+--
+--
+-- $Id$
+--
+-- 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 "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 what char(1),
+ in path varchar) returns any
+{
+ -- dbg_obj_princ ('CardDAV_DAV_GET_PARENT (', id, what, path, ')');
+ if ('R' = what)
+{
+ id[4] := 0;
+
+ return id;
+ }
+ if ('C' = what)
+ return id[1];
+
+ 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, owner_uid, domain_id integer;
+
+ if ('C' = what)
+ return -20;
+
+ top_id := "CardDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, 'R', owner_uid, 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 owner_uid, domain_id, item_id, rc integer;
+
+ top_id := "CardDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, 'R', owner_uid, domain_id);
+ if (top_id <> -1)
+ {
+ rc := AB.WA.contact_delete (top_id[4], domain_id);
+ 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
+ }
+ if ((length (content) = 0) and (top_id = -1))
+ {
+ item_id := AB.WA.contact_update2 (-1, domain_id, 'P_NAME', 'UNLOCK');
+ AB.WA.contact_update2 (item_id, domain_id, 'P_UID', path_parts[1]);
+ return vector (CardDAV__UNAME (), detcol_id, uid, domain_id, item_id, 0);
+ }
+ res := AB.WA.import_vcard (domain_id, content);
+ if (length(res) > 0)
+ return vector (CardDAV__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 "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));
+ }
+ 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 "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)
+ {
+ return CardDAV__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 "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
+{
+ -- dbg_obj_princ ('CardDAV_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;
+
+ "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, 'text/vcard', 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, 'text/vcard', colname );
+ }
+ for (select "CardDAV__COMPOSE_ICS_NAME"(P_UID) as orig_mname, P_CREATED, 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_CREATED, '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 (CardDAV__UNAME (), 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 (CardDAV__UNAME (), detcol_id, owner_uid, dom_id, 0, 0),
+ access, owner_gid, owner_uid, now(), 'text/vcard', orig_name) ) );
+ }
+ return res;
+ }
+ }
+ for select "CardDAV__COMPOSE_ICS_NAME"(P_UID) as orig_mname, P_ID, P_CREATED, 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 (CardDAV__UNAME (), detcol_id, owner_uid, top_id[3], P_ID, 0),
+ access, owner_gid, owner_uid, P_CREATED, 'text/vcard', orig_mname) ) );
+ }
+ return res;
+}
+;
+
+create procedure "CardDAV_DAV_FC_PRED_METAS" (inout pred_metas any)
+{
+ pred_metas := vector(
+ 'P_ID', vector ('PERSONS' , 0, 'integer' , 'P_ID' ),
+ 'P_DOMAIN_ID', vector ('PERSONS' , 0, 'integer' , 'P_DOMAIN_ID' ),
+ 'RES_NAME', vector ('PERSONS' , 0, 'varchar' , '"CardDAV__COMPOSE_ICS_NAME"(_top.P_UID)'),
+ 'RES_FULL_PATH', vector ('PERSONS' , 0, 'varchar' , 'concat (DAV_CONCAT_PATH (_param.detcolpath, ''addressbook''), "CardDAV__FIXNAME" (WAI_NAME), ''/'', "CardDAV__COMPOSE_ICS_NAME" (_top.P_UID)'),
+ 'RES_TYPE', vector ('PERSONS' , 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 ('PERSONS' , 0, 'varchar' , 'concat (DAV_CONCAT_PATH (_param.detcolpath, ''addressbook''), "CardDAV__FIXNAME" (WAI_NAME), ''/'')' ),
+ 'RES_COL_NAME', vector ('PERSONS' , 0, 'varchar' , '"CardDAV__FIXNAME" (WAI_NAME)' ),
+ 'RES_CR_TIME', vector ('PERSONS' , 0, 'datetime', 'P_CREATED' ),
+ 'RES_MOD_TIME', vector ('PERSONS' , 0, 'datetime', 'P_UPDATED' ),
+ 'RES_PERMS', vector ('PERSONS' , 0, 'varchar' , '(''110100000RR'')' ),
+ 'RES_CONTENT', vector ('PERSONS' , 0, 'text' , 'P_INTERESTS' ),
+ 'PROP_NAME', vector ('PERSONS' , 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
+{
+ -- dbg_obj_princ ('CardDAV_DAV_FC_PRINT_WHERE (', filter, param_uid, ')');
+ declare pred_metas, cmp_metas, table_metas any;
+ declare used_tables any;
+
+ "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 (CardDAV__UNAME (), ?, _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 "CardDAV_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 ('CardDAV_DAV_SEARCH_ID_IMPL (', detcol_id, path_parts, what, muser_id, domain_id, ')');
+ declare owner_gid, ctr, len integer;
+ declare hitlist any;
+ declare access, colpath varchar;
+
+ "CardDAV__ACCESS_PARAMS" (detcol_id, access, owner_gid, owner_uid);
+ if (0 = length(path_parts))
+ {
+ if ('C' <> what)
+ return -1;
+
+ return vector (CardDAV__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 = '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 (CardDAV__UNAME (), 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] or 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 (CardDAV__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 "CardDAV_DAV_SEARCH_ID" (
+ in detcol_id any,
+ in path_parts any,
+ in what char(1)) returns any
+{
+ --dbg_obj_princ ('CardDAV_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
+ declare owner_uid, domain_id integer;
+
+ return "CardDAV_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 "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 what 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 (', path, id, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
+ declare rc any;
+ declare domain_id, item_id integer;
+ declare name, uid varchar;
+
+ rc := 0;
+ if (what = 'C')
+ {
+ rc := -27;
+ goto _exit;
+ }
+
+ domain_id := id[3];
+ item_id := id[4];
+ if (exists (select 1 from AB.WA.PERSONS where P_DOMAIN_ID = domain_id and P_ID = item_id and P_NAME = 'UNLOCK'))
+ {
+ rc := lower (uuid());
+ update AB.WA.PERSONS
+ set P_NAME = 'LOCK',
+ P_FIRST_NAME = rc
+ where P_DOMAIN_ID = domain_id
+ and P_ID = item_id;
+
+ goto _exit;
+}
+
+ if (exists (select 1 from AB.WA.PERSONS where P_DOMAIN_ID = domain_id and P_ID = item_id and P_NAME = 'LOCK' and dateadd ('second', -1, now()) > P_UPDATED))
+ {
+ rc := lower (uuid());
+ update AB.WA.PERSONS
+ set P_NAME = 'LOCK',
+ P_FIRST_NAME = rc
+ where P_DOMAIN_ID = domain_id
+ and P_ID = item_id;
+
+ goto _exit;
+ }
+
+ uid := (select P_UID from AB.WA.PERSONS where P_DOMAIN_ID = domain_id and P_ID = item_id);
+ if (path like ('%' || CardDAV__COMPOSE_ICS_NAME (uid)))
+ {
+ rc := lower (uuid());
+
+ goto _exit;
+ }
+
+ rc := -20;
+
+_exit:;
+ return rc;
+}
+;
+
+--| 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 what char(1),
+ in token varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('CardDAV_DAV_UNLOCK (', id, what, token, auth_uid, ')');
+ declare rc any;
+ declare domain_id, item_id integer;
+
+ rc := 0;
+ domain_id := id[3];
+ item_id := id[4];
+ if (exists (select 1 from AB.WA.PERSONS where P_DOMAIN_ID = domain_id and P_ID = item_id and P_NAME = 'LOCK'))
+ {
+ update AB.WA.PERSONS
+ set P_NAME = 'UNLOCK',
+ P_FIRST_NAME = null
+ where P_DOMAIN_ID = domain_id
+ and P_ID = item_id;
+
+ rc := -27;
+ goto _exit;
+ }
+
+_exit:;
+ return rc;
+}
+;
+
+--| 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 what char(1),
+ in owned_tokens varchar) returns integer
+{
+ -- dbg_obj_princ ('CardDAV_DAV_IS_LOCKED (', id, what, owned_tokens, ')');
+ declare rc, if_token any;
+
+ rc := 0;
+ if (what = 'C')
+ goto _exit;
+
+ for (select P_FIRST_NAME from AB.WA.PERSONS where P_DOMAIN_ID = id[3] and P_ID = id[4] and P_NAME = 'LOCK') do
+ {
+ rc := 2;
+ if (not isnull (strstr (owned_tokens, P_FIRST_NAME)))
+ rc := 0;
+}
+
+_exit:;
+ return rc;
+}
+;
+
+--| 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 what char(1),
+ in recursive integer) returns any
+{
+ -- dbg_obj_princ ('CardDAV_DAV_LIST_LOCKS" (', id, what, recursive);
+ return vector ();
+}
+;
+
+create function CardDAV__UNAME () returns any
+{
+ return UNAME'CardDAV';
+}
+;
+
+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: ;
+}
+;
+
+create procedure DB.DBA.HP_AUTH_DAV_PROTOCOL_CARDDAV (in realm varchar)
+{
+ declare _u_name, _u_password, _perms varchar;
+ declare _u_id, _u_group integer;
+ declare auth any;
+ declare _user, lev varchar;
+ declare our_auth_vec, lines, sec, path, req_perms, cmp_perms, def_page varchar;
+ declare _method, allow_basic, authenticated integer;
+ authenticated := 0;
+ lines := http_request_header ();
+ path := http_physical_path ();
+ sec := http_map_get ('security_level');
+ if (isstring (sec))
+ sec := ucase (sec);
+ if (sec = 'DIGEST')
+ allow_basic := 0;
+ else
+ allow_basic := 1;
+ auth := DB.DBA.vsp_auth_vec (lines);
+ if (0 <> auth)
+ {
+ lev := get_keyword ('authtype', auth, '');
+ if (allow_basic = 0 and 'basic' = lev)
+ goto nf;
+ _user := get_keyword ('username', auth);
+ if (_user = '' or isnull (_user))
+ {
+ goto nf;
+ }
+ whenever not found goto nf;
+ select U_NAME, pwd_magic_calc (U_NAME, U_PWD, 1), U_GROUP, U_ID, U_METHODS, U_DEF_PERMS
+ into _u_name, _u_password, _u_group, _u_id, _method, _perms from WS.WS.SYS_DAV_USER
+ where U_NAME = _user and U_ACCOUNT_DISABLED = 0 with (exclusive, prefetch 1);
+ if (_u_password is null)
+ goto nf;
+ if (DB.DBA.vsp_auth_verify_pass (auth, _u_name,
+ coalesce(get_keyword ('realm', auth), ''),
+ coalesce(get_keyword ('uri', auth), ''),
+ coalesce(get_keyword ('nonce', auth), ''),
+ coalesce(get_keyword ('nc', auth),''),
+ coalesce(get_keyword ('cnonce', auth), ''),
+ coalesce(get_keyword ('qop', auth), ''),
+ _u_password))
+ {
+ update WS.WS.SYS_DAV_USER set U_LOGIN_TIME = now () where U_NAME = _user;
+ if (http_map_get ('persist_ses_vars'))
+ {
+ declare vars any;
+ declare sid varchar;
+ vars := null;
+ sid := http_param ('sid');
+ vars := coalesce ((select deserialize (ASES_VARS) from DB.DBA.ADMIN_SESSION where ASES_ID = sid), null);
+ if (vars is null or isarray (vars))
+ connection_vars_set (vars);
+ if (connection_get ('sid') is null)
+ connection_set ('sid', sid);
+ }
+ if (connection_get ('CardDAVUserID') is null or connection_get ('CardDAVUserID') <> _u_id)
+ connection_set ('CardDAVUserID', _user);
+ authenticated := 1;
+ }
+ }
+ else
+ goto nf;
+ -- Check permissions
+ if (authenticated and _u_id = 1)
+ return 1;
+ else if (not authenticated)
+ return -1;
+ else if (authenticated)
+ return (_u_id);
+nf:
+ DB.DBA.vsp_auth_get (realm, '/DAV', md5 (datestring(now())), md5 ('opaakki'), 'false', lines, allow_basic);
+ return 0;
+}
+;
+
+
+create procedure DB.DBA.install_carddav_vhosts()
+{
+ DB.DBA.VHOST_REMOVE (lpath=>'/.well-known/carddav/');
+ DB.DBA.VHOST_DEFINE (lpath=>'/.well-known/carddav/',
+ ppath => '/!well-known/carddav/',
+ is_dav => 1,
+ vsp_user => 'dba',
+ opts => vector('noinherit', 1, 'exec_as_get', 1),
+ auth_fn=>'DB.DBA.HP_AUTH_DAV_PROTOCOL_CARDDAV',
+ realm=>'CardDAVUserID',
+ sec=>'Basic');
+}
+;
+
+DB.DBA.install_carddav_vhosts()
+;
+
+create procedure WS.WS."/!well-known/carddav/" (inout path varchar, inout params any, inout lines any)
+{
+ declare user_id, inst_name varchar;
+ declare command varchar;
+ declare pos integer;
+ declare exit handler for sqlstate '*'
+ {
+ http_request_status ('HTTP/1.1 404 Not Found');
+ return;
+ };
+ whenever not found goto retr;
+ user_id := connection_get ('CardDAVUserID');
+ inst_name := (select CalDAV__FIXNAME (C.WAI_NAME)
+ from SYS_USERS A,
+ WA_MEMBER B,
+ WA_INSTANCE C
+ where A.U_NAME = user_id
+ 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');
+ if (inst_name is null or length(inst_name) = 0)
+ goto retr;
+ http_request_status ('HTTP/1.1 301 Moved Permanently');
+ http_header (sprintf ('Location: /DAV/home/%s/addressbooks/%s/\r\n', user_id, inst_name));
+ return;
+retr:
+ http_request_status ('HTTP/1.1 404 Not Found');
+ return;
+}
+;
+
+registry_set ('/!well-known/carddav/', 'no_vsp_recompile')
+;
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-api.sql b/appsrc/ODS-Addressbook/sql/ab-a-api.sql
index bf48adb..d40e16e 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.6 2011/06/09 17:43:16 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-code.sql b/appsrc/ODS-Addressbook/sql/ab-a-code.sql
index 02b39c7..751bc00 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.26 2011/06/02 12:33:25 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -119,7 +119,7 @@ _end:;
create procedure AB.WA.session_restore(
inout params any)
{
- declare domain_id, account_id, account_rights any;
+ declare domain_id, account_id 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', account_rights
+ 'account_rights', AB.WA.account_rights (domain_id, account_id),
+ 'person_rights', AB.WA.person_rights (domain_id, account_id)
);
}
;
@@ -218,7 +218,7 @@ create procedure AB.WA.check_grants (
-------------------------------------------------------------------------------
--
-create procedure AB.WA.access_rights (
+create procedure AB.WA.person_rights (
in domain_id integer,
in account_id integer)
{
@@ -284,6 +284,62 @@ create procedure AB.WA.access_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;
@@ -709,6 +765,12 @@ 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;
}
;
@@ -1192,8 +1254,7 @@ _true:;
create procedure AB.WA.dav_home(
inout account_id integer) returns varchar
{
- declare name, home any;
- declare cid integer;
+ declare cid, name, home any;
name := coalesce((select U_NAME from DB.DBA.SYS_USERS where U_ID = account_id), -1);
if (isinteger(name))
@@ -1458,6 +1519,23 @@ _again:
}
;
+-------------------------------------------------------------------------------
+--
+create procedure AB.WA.http_error (
+ in _header any,
+ in _silent integer := 0)
+{
+ if (_header[0] like 'HTTP/1._ 4__ %' or _header[0] like 'HTTP/1._ 5__ %')
+ {
+ if (not _silent)
+ signal ('22023', trim (_header[0], '\r\n'));
+
+ return 0;
+ }
+ return 1;
+}
+;
+
-----------------------------------------------------------------------------
--
create procedure AB.WA.xml_set(
@@ -1637,6 +1715,18 @@ 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)
@@ -2054,7 +2144,7 @@ create procedure AB.WA.ab_path2 (
--
create procedure AB.WA.make_node (
in node_type varchar,
- in node_id any)
+ in node_id any) returns varchar
{
return node_type || '#' || cast(node_id as varchar);
}
@@ -2425,9 +2515,10 @@ create procedure AB.WA.dt_iso8601 (
create procedure AB.WA.test_clear (
in S any)
{
- declare N integer;
+ S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
+ S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
- return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
+ return S;
}
;
@@ -2493,7 +2584,7 @@ create procedure AB.WA.test (
return value;
}
- value := OMAIL.WA.validate2 (valueClass, cast (value as varchar));
+ value := AB.WA.validate2 (valueClass, cast (value as varchar));
if (valueType = 'integer')
{
tmp := get_keyword('minValue', params);
@@ -2578,7 +2669,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)))
@@ -2762,7 +2853,10 @@ create procedure AB.WA.ab_sparql (
create procedure AB.WA.ab_graph_delete (
in graph varchar)
{
- AB.WA.ab_sparql (sprintf ('SPARQL clear graph <%s>', graph));
+ if (is_empty_or_null (graph))
+ return;
+
+ SPARQL clear graph ?:graph;
}
;
@@ -3151,6 +3245,8 @@ create procedure AB.WA.contact_update2 (
if (id = -1)
return id;
+ if (pName = 'P_UID')
+ update AB.WA.PERSONS set P_UID = pValue where P_ID = id;
if (pName = 'P_CATEGORY_ID')
update AB.WA.PERSONS set P_CATEGORY_ID = pValue where P_ID = id;
if (pName = 'P_KIND')
@@ -3168,7 +3264,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 = pValue where P_ID = id;
+ update AB.WA.PERSONS set P_GENDER = lcase (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')
@@ -3321,12 +3417,11 @@ create procedure AB.WA.contact_update4 (
if (not isnull (tmp))
{
if (length (pFields) = 0)
- return 0;
+ return vector ();
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)
@@ -3371,13 +3466,10 @@ 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;
}
@@ -3406,6 +3498,7 @@ create procedure AB.WA.contact_delete (
in domain_id integer)
{
delete from AB.WA.PERSONS where P_ID = id and P_DOMAIN_ID = domain_id;
+ return row_count ();
}
;
@@ -3424,10 +3517,11 @@ create procedure AB.WA.contact_validation (
declare id, st, msg, meta, rows, F, V, T any;
id := null;
- 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 ();
+ 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);
for (N := 0; N < length (validation); N := N + 1)
{
M := AB.WA.vector_index (pFields, validation [N]);
@@ -3437,10 +3531,14 @@ 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') and (length (rows) > 0))
- {
+ if ((st <> '00000') or (length (rows) <> 1))
+ goto _exit;
+
declare validationMode varchar;
id := vector ();
@@ -3527,8 +3625,8 @@ create procedure AB.WA.contact_validation (
}
pFields := F;
pValues := V;
- }
- }
+
+_exit:;
return id;
}
;
@@ -3538,16 +3636,19 @@ create procedure AB.WA.contact_validation (
create procedure AB.WA.contact_rights (
in domain_id integer,
in id integer,
- in access_role varchar)
+ in account_rights varchar,
+ in person_rights varchar)
{
declare retValue varchar;
retValue := '';
if (exists (select 1 from AB.WA.PERSONS where P_ID = id and P_DOMAIN_ID = domain_id))
{
+ if (isnull (person_rights) or (account_rights < person_rights))
retValue := AB.WA.acl_check (domain_id, id);
+
if (retValue = '')
- retValue := access_role;
+ retValue := account_rights;
}
return retValue;
}
@@ -3659,6 +3760,39 @@ create procedure AB.WA.value2str (
}
;
+--------------------------------------------------------------------------------
+--
+create procedure AB.WA.import_CardDAV_check (
+ in _name any,
+ in _options any,
+ in _silent integer := 0)
+{
+ declare _user, _password varchar;
+ declare _page, _body, _resHeader, _reqHeader any;
+ declare exit handler for sqlstate '*'
+ {
+ return 0;
+ };
+
+ _user := get_keyword ('user', _options);
+ _password := get_keyword ('password', _options);
+
+ -- check CardDAV
+ _reqHeader := 'Accept: text/xml\r\nContent-Type: text/xml; charset=utf-8';
+ if (not is_empty_or_null (_user))
+ _reqHeader := _reqHeader || sprintf ('\r\nAuthorization: Basic %s', encode_base64 (_user || ':' || _password));
+
+ _page := http_client_ext (url=>_name, http_method=>'OPTIONS', http_headers=>_reqHeader, headers =>_resHeader, n_redirects=>15);
+ if (not AB.WA.http_error (_resHeader, _silent))
+ return 0;
+
+ if (not (http_request_header (_resHeader, 'DAV') like '%addressbook%'))
+ return 0;
+
+ return 1;
+}
+;
+
-------------------------------------------------------------------------------
--
create procedure AB.WA.import_count (
@@ -3684,6 +3818,10 @@ create procedure AB.WA.import_count (
-- LinkedIn
if (type = 4)
return AB.WA.import_linkedin_count (data);
+
+ -- CardDAV
+ if (type = 5)
+ return AB.WA.import_CardDAV_count (data);
}
;
@@ -3774,6 +3912,49 @@ create procedure AB.WA.import_linkedin_count (
-------------------------------------------------------------------------------
--
+create procedure AB.WA.import_CardDav_count (
+ in _name any,
+ in _options any,
+ in _silent integer := 0)
+{
+ declare _user, _password varchar;
+ declare _page, _body, _resHeader, _reqHeader any;
+ declare _xml, _items any;
+ declare exit handler for sqlstate '*'
+ {
+ return 0;
+ };
+
+ _user := get_keyword ('user', _options);
+ _password := get_keyword ('password', _options);
+
+ -- check CardDAV
+ _reqHeader := 'Accept: text/xml\r\nContent-Type: text/xml; charset=utf-8';
+ if (not is_empty_or_null (_user))
+ _reqHeader := _reqHeader || sprintf ('\r\nAuthorization: Basic %s', encode_base64 (_user || ':' || _password));
+
+ _page := http_client_ext (url=>_name, http_method=>'OPTIONS', http_headers=>_reqHeader, headers =>_resHeader, n_redirects=>15);
+ if (not AB.WA.http_error (_resHeader, _silent))
+ return 0;
+
+ if (not (http_request_header (_resHeader, 'DAV') like '%addressbook%'))
+ return 0;
+
+ _body := null;
+ _reqHeader := _reqHeader || '\r\nDepth: 1';
+ _page := http_client_ext (url=>_name, http_method=>'PROPFIND', http_headers=>_reqHeader, headers =>_resHeader, body=>_body, n_redirects=>15);
+ if (not AB.WA.http_error (_resHeader, _silent))
+ return 0;
+
+ _xml := xml_tree_doc (xml_expand_refs (xml_tree (_page)));
+ _items := xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:carddav:"] /D:multistatus/D:response/D:href/text()', _xml, 0);
+
+ return length (_items)-1;
+}
+;
+
+-------------------------------------------------------------------------------
+--
create procedure AB.WA.import_check_progress_id (
in progress_id any)
{
@@ -3840,6 +4021,20 @@ create procedure AB.WA.import (
-- LinkedIn
AB.WA.import_linkedin (domain_id, data, options, validation, progress_id);
}
+ else if (type = 5)
+ {
+ -- CardDAV
+ AB.WA.import_CardDAV (domain_id, data, options, validation, progress_id);
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure AB.WA.import_vcard_decode (
+ in S varchar)
+{
+ return replace (S, '\\:', ':');
}
;
@@ -3852,9 +4047,9 @@ create procedure AB.WA.import_vcard (
in validation any := null,
in progress_id varchar := null)
{
- 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 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 mode, externalUID, updatedBefore, vcardImported any;
vcardImported := vector ();
@@ -3871,27 +4066,53 @@ create procedure AB.WA.import_vcard (
Meta := vector
(
- '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))'
+ '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')
);
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))
@@ -3902,64 +4123,67 @@ create procedure AB.WA.import_vcard (
xmlItems := xpath_eval ('/*', xmlData, 0);
foreach (any xmlItem in xmlItems) do
{
- itemName := xpath_eval ('name(.)', xmlItem);
- if (itemName = 'IMC-VCARD')
- {
if (not AB.WA.import_check_progress_id (progress_id))
return;
+ if (xpath_eval ('name(.)', xmlItem) <> 'IMC-VCARD')
+ goto _skip;
+
+ xmlItem := xml_cut (xmlItem);
+
id := -1;
uid := null;
pFields := vector ();
pValues := vector ();
- for (N := 0; N < mLength; N := N + 3)
+ for (N := 0; N < mLength; N := N + 2)
{
pField := Meta [N];
- tmp := xquery_eval (Meta [N+2], xmlItem, 0);
- foreach (any T in tmp) do
+ for (M := 0; M < length (Meta[N+1]); M := M + 1)
{
- T := cast (T as varchar);
+ T := serialize_to_UTF8_xml (xpath_eval ('/IMC-VCARD/' || Meta[N+1][M] || '/text()', xmlItem, 1));
if (not is_empty_or_null (T))
{
- pField2 := pField;
- if (pField2 = 'P_UID')
- {
+ if (pField = 'P_UID')
uid := T;
- }
- 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)
+
+ if (not AB.WA.vector_contains (pFields, pField))
{
- if (isnull (strstr (T, ' @TYPE_' || V[L])))
- goto _exit;
- }
- pField2 := Meta [N+1][M+1];
- _exit:;
+ pFields := vector_concat (pFields, vector (pField));
+ pValues := vector_concat (pValues, vector (AB.WA.import_vcard_decode (T)));
}
}
- M := strstr (T, ' @TYPE_');
- if (not isnull (M))
- T := subseq (T, 0, M);
}
}
- if (not AB.WA.vector_contains (pFields, pField2))
+ 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)
{
- pFields := vector_concat (pFields, vector (pField2));
- pValues := vector_concat (pValues, vector (T));
+ 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))
+ {
+ pFields := vector_concat (pFields, vector (pField));
+ pValues := vector_concat (pValues, vector (AB.WA.import_vcard_decode (T)));
}
+ goto _1;
}
}
}
+ _1:;
+ }
+ }
if (isnull (uid) and not isnull (externalUID))
{
N := strchr (externalUID, '_');
@@ -3984,7 +4208,6 @@ create procedure AB.WA.import_vcard (
_skip:;
AB.WA.import_inc_progress_id (progress_id);
}
- }
return vcardImported;
}
;
@@ -4321,8 +4544,7 @@ create procedure AB.WA.import_foaf_content (
if (length (Items))
{
personIRI := Items[0][0];
- tmp := replace (Items[N][3], 'mailto:', '');
- Persons := vector_concat (Persons, vector (vector (1, personIRI, coalesce (Items[N][2], Items[N][1]), tmp)));
+ Persons := vector_concat (Persons, vector (vector (1, personIRI, coalesce (Items[0][2], Items[0][1]), replace (Items[0][3], 'mailto:', ''))));
S := sprintf (' sparql
define input:storage ""
prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -4355,21 +4577,20 @@ create procedure AB.WA.import_foaf_content (
}', contentIRI);
}
Items := AB.WA.ab_sparql (S);
- for (N := 0; N < length (Items); N := N + 1)
- {
- if (not isnull (coalesce (Items[N][2], Items[N][1])))
+ foreach (any Item in Items) do
{
+ if (isnull (coalesce (Item[2], Item[1])))
+ goto _skip;
+
for (M := 0; M < length (Persons); M := M + 1)
{
- if (Persons[M][1] = Items[N][0])
+ if (Persons[M][1] = Item[0])
goto _skip;
}
- tmp := replace (Items[N][3], 'mailto:', '');
- Persons := vector_concat (Persons, vector (vector (0, Items[N][0], coalesce (Items[N][2], Items[N][1]), tmp)));
+ Persons := vector_concat (Persons, vector (vector (0, Item[0], coalesce (Item[2], Item[1]), replace (Item[3], 'mailto:', ''))));
+
_skip:;
}
- }
-
_exit:;
return Persons;
}
@@ -4514,6 +4735,74 @@ create procedure AB.WA.import_linkedin (
}
;
+--------------------------------------------------------------------------------
+--
+create procedure AB.WA.import_CardDAV (
+ in domain_id integer,
+ in name any,
+ in options any := null,
+ in validation any := null,
+ in progress_id varchar := null)
+{
+ declare _user, _password any;
+ declare _page, _body, _bodyTemplate, _resHeader, _reqHeader any;
+ declare _xml, _xml2, _items, _data any;
+
+ _user := get_keyword ('user', options);
+ _password := get_keyword ('password', options);
+ _bodyTemplate :=
+ '<?xml version="1.0" encoding="utf-8" ?>
+ <C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+ <D:prop>
+ <D:getetag/>
+ <C:address-data/>
+ </D:prop>
+ <D:href>%s</D:href>
+ </C:addressbook-multiget>';
+
+ -- check CardDAV
+ _reqHeader := 'Accept: text/xml\r\nContent-Type: text/xml; charset=utf-8';
+ if (not is_empty_or_null (_user))
+ _reqHeader := _reqHeader || sprintf ('\r\nAuthorization: Basic %s', encode_base64 (_user || ':' || _password));
+
+ _page := http_client_ext (url=>name, http_method=>'OPTIONS', http_headers=>_reqHeader, headers =>_resHeader, n_redirects=>15);
+ AB.WA.http_error (_resHeader);
+ if (not (http_request_header (_resHeader, 'DAV') like '%addressbook%'))
+ signal ('AB001', 'Bad import/subscription source!<>');
+
+ _body := null;
+ _reqHeader := _reqHeader || '\r\nDepth: 1';
+ _page := http_client_ext (url=>name, http_method=>'PROPFIND', http_headers=>_reqHeader, headers =>_resHeader, body=>_body, n_redirects=>15);
+ AB.WA.http_error (_resHeader);
+ {
+ declare exit handler for sqlstate '*'
+ {
+ signal ('AB001', 'Bad import/subscription source!<>');
+ };
+ _xml := xml_tree_doc (xml_expand_refs (xml_tree (_page)));
+ _items := xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:carddav:"] /D:multistatus/D:response/D:href/text()', _xml, 0);
+ foreach (any _item in _items) do
+ {
+ if (not AB.WA.import_check_progress_id (progress_id))
+ return;
+
+ _body := sprintf (_bodyTemplate, cast (_item as varchar));
+
+ commit work;
+ _page := http_client_ext (url=>name, http_method=>'REPORT', http_headers=>_reqHeader, headers =>_resHeader, body=>_body, n_redirects=>15);
+ AB.WA.http_error (_resHeader);
+ _xml2 := xml_tree_doc (xml_expand_refs (xml_tree (_page)));
+ if (not isnull (xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:carddav:"] /D:multistatus/D:response/D:href/text()', _xml2, 1)))
+ {
+ _data := cast (xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:carddav:"] /D:multistatus/D:response/D:propstat/D:prop/address-data/text()', _xml2, 1) as varchar);
+ AB.WA.import_vcard (domain_id, _data, options, validation, progress_id);
+ }
+ }
+ }
+ return 1;
+}
+;
+
-------------------------------------------------------------------------------
--
create procedure AB.WA.import_contact_update (
@@ -4632,6 +4921,15 @@ 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,
@@ -4644,6 +4942,24 @@ 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 (
@@ -4668,7 +4984,7 @@ create procedure AB.WA.export_vcard (
if (AB.WA.tags_exchangeTest (P_TAGS, oTagsInclude, oTagsExclude))
{
http ('BEGIN:VCARD\r\n', sStream);
- http ('VERSION:2.1\r\n', sStream);
+ http ('VERSION:3.0\r\n', sStream);
AB.WA.export_vcard_line ('REV', AB.WA.dt_iso8601 (P_UPDATED), sStream);
@@ -4687,6 +5003,7 @@ 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);
@@ -4728,6 +5045,14 @@ 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);
}
}
@@ -5100,15 +5425,16 @@ create procedure AB.WA.exchange_exec_internal (
-- subscribe
else if (_direction = 1)
{
+ if (_type = 3)
+ return AB.WA.exchange_CardDAV (_id);
+
if (_type = 1)
- {
_name := AB.WA.host_url () || _name;
- }
+
_content := AB.WA.dav_content (_name, _user, _password);
if (isnull(_content))
- {
signal ('AB001', 'Bad import/subscription source!<>');
- }
+
AB.WA.import_vcard (_domain_id, _content, _options);
}
-- syncml
@@ -5165,6 +5491,27 @@ create procedure AB.WA.exchange_exec_internal (
--------------------------------------------------------------------------------
--
+create procedure AB.WA.exchange_CardDAV (
+ in _id integer)
+{
+ for (select EX_DOMAIN_ID as _domain_id, EX_TYPE as _direction, deserialize (EX_OPTIONS) as _options from AB.WA.EXCHANGE where EX_ID = _id) do
+ {
+ declare _type, _name, _pName, _user, _password any;
+ declare _page, _body, _bodyTemplate, _resHeader, _reqHeader any;
+ declare _xml, _items, _data any;
+
+ _type := get_keyword ('type', _options);
+ if (_type <> 3)
+ return 0;
+
+ AB.WA.import_CardDAV (_domain_id, get_keyword ('name', _options), _options);
+ }
+ return 1;
+}
+;
+
+--------------------------------------------------------------------------------
+--
create procedure AB.WA.exchange_scheduler ()
{
declare id, days, rc, err integer;
@@ -5280,6 +5627,10 @@ 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')
@@ -5307,11 +5658,8 @@ 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;
@@ -5351,17 +5699,15 @@ 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, http_dav_uid (), http_dav_uid () + 1, null, null, 0);
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_path, _content, 'text/x-vcard', _permissions, _user, _user, null, null, 0);
connection_set ('__sync_ods', '0');
connection_set ('__sync_dav_upl', '0');
}
-
- if (_action = 'D')
+ else if (_action = 'D')
{
declare _id integer;
@@ -5369,7 +5715,7 @@ create procedure AB.WA.syncml_entry_update_internal (
if (isinteger(_id) and (_id > 0))
{
connection_set ('__sync_ods', '1');
- DB.DBA.DAV_DELETE (_path, 1, _user, _password);
+ DB.DBA.DAV_DELETE_INT (_path, 1, _user, _password, 0);
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 a8d00ee..4851855 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.4 2010/11/11 12:37:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-update.sql b/appsrc/ODS-Addressbook/sql/ab-a-update.sql
index 6be1745..4d38288 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.4 2010/10/07 13:24:45 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-wa.sql b/appsrc/ODS-Addressbook/sql/ab-a-wa.sql
index 749213e..1910a87 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.9 2011/05/17 23:00:21 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Addressbook/sql/ab-d.sql b/appsrc/ODS-Addressbook/sql/ab-d.sql
index 6037065..a0414aa 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.8 2011/06/02 12:33:25 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Addressbook/sql/sioc_ab.sql b/appsrc/ODS-Addressbook/sql/sioc_ab.sql
index cc1e4dc..c2cef61 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.15 2011/08/01 14:15:23 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -120,6 +120,7 @@ create procedure fill_ods_addressbook_sioc2 (
fill_ods_addressbook_services ();
for (select WAI_ID,
+ WAI_IS_PUBLIC,
WAI_TYPE_NAME,
WAI_NAME,
WAI_ACL
@@ -129,7 +130,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_TYPE_NAME, WAI_NAME, WAI_ACL);
+ SIOC..wa_instance_acl_insert (WAI_IS_PUBLIC, 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
@@ -216,7 +217,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 (null, coalesce (_access_mode, WAI_IS_PUBLIC), contact_iri);
+ graph_iri := SIOC..get_graph_new (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);
@@ -318,7 +319,7 @@ create procedure fill_ods_addressbook_services ()
-------------------------------------------------------------------------------
--
-create procedure clean_ods_addressbook_sioc2 (
+create procedure clean_ods_addressbook_sioc (
in _wai_name varchar := null,
in _access_mode integer := null)
{
@@ -355,7 +356,7 @@ create procedure clean_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 (null, coalesce (_access_mode, WAI_IS_PUBLIC), contact_iri);
+ graph_iri := SIOC..get_graph_new (coalesce (_access_mode, WAI_IS_PUBLIC), contact_iri);
contact_delete (graph_iri,
P_DOMAIN_ID,
@@ -456,7 +457,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 (domain_id, WAI_IS_PUBLIC, iri);
+ graph_iri := SIOC..get_graph_new (WAI_IS_PUBLIC, iri);
addressbook_iri := addressbook_iri (WAI_NAME);
socialnetwork_iri := socialnetwork_iri (WAI_NAME);
creator_iri := user_iri (WAM_USER);
@@ -706,7 +707,7 @@ create procedure contact_delete (
iri := SIOC..addressbook_contact_iri (domain_id, contact_id);
if (isnull (graph_iri))
{
- graph_iri := SIOC..get_graph_new (domain_id, null, iri);
+ graph_iri := SIOC..get_graph_new (AB.WA.domain_is_public (domain_id), iri);
if (isnull (graph_iri))
return;
}
@@ -1043,7 +1044,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 (domain_id, null, master_iri);
+ graph_iri := get_graph_new (AB.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
@@ -1083,7 +1084,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 (domain_id, null, master_iri);
+ graph_iri := SIOC..get_graph_new (AB.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
@@ -1231,7 +1232,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 (domain_id, null, master_iri);
+ graph_iri := get_graph_new (AB.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
}
@@ -1268,7 +1269,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 (domain_id, null, master_iri);
+ graph_iri := SIOC..get_graph_new (AB.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
}
diff --git a/appsrc/ODS-Addressbook/vad_version b/appsrc/ODS-Addressbook/vad_version
new file mode 100644
index 0000000..7230342
--- /dev/null
+++ b/appsrc/ODS-Addressbook/vad_version
@@ -0,0 +1 @@
+1.9.72
diff --git a/appsrc/ODS-Addressbook/www/ab_login.vspx b/appsrc/ODS-Addressbook/www/ab_login.vspx
index 023b3cf..0d5cb09 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.4 2010/10/07 13:24:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -34,16 +34,16 @@
if (page_name = 'error.vspx')
return;
- if (AB.WA.check_grants (self.account_rights, page_name))
+ if (AB.WA.check_grants (self.person_rights, page_name))
return;
- if (isnull (self.account_rights) and not is_empty_or_null (self.sid))
+ if (isnull (self.person_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.account_rights))
+ if (isnull (self.person_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 79b1996..b413069 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.5 2011/06/09 17:43:16 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Addressbook/www/annotea.vspx b/appsrc/ODS-Addressbook/www/annotea.vspx
index c59d0c6..6363397 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.6 2011/07/04 10:04:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/www/conversation.vspx b/appsrc/ODS-Addressbook/www/conversation.vspx
index c69ff42..22dbdcb 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.3 2011/05/02 14:16:24 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/www/css/style.css b/appsrc/ODS-Addressbook/www/css/style.css
index 0dedb90..ff70ef0 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.11 2011/05/17 23:00:21 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
@@ -28,11 +28,29 @@ 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;
}
@@ -71,46 +89,7 @@ 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;
@@ -120,6 +99,7 @@ a:hover {
font-size: 12px;
background-color: #EFEFEF;
border: 1px solid #7f94a5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
padding: 5px;
@@ -610,6 +590,8 @@ div.tab {
border: 1px solid #000;
border-bottom-width: 0px;
border-color: #7f94a5;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
@@ -790,6 +772,7 @@ div.menu .menuItem:hover {
span.button {
background: none repeat scroll 0 0 #99B3C5;
border: 1px solid #7F94A5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #FFFFFF;
diff --git a/appsrc/ODS-Addressbook/www/error.vspx b/appsrc/ODS-Addressbook/www/error.vspx
index 8824500..7ca3e5e 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.2 2010/09/20 10:14:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/www/export.vspx b/appsrc/ODS-Addressbook/www/export.vspx
index fe1b7ae..3fdf9fb 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.4 2010/10/07 13:24:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/www/gems.vsp b/appsrc/ODS-Addressbook/www/gems.vsp
index ba2e53f..8d32759 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.3 2010/10/07 13:24:46 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Addressbook/www/home.vspx b/appsrc/ODS-Addressbook/www/home.vspx
index 810c43e..c13ecf8 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.29 2011/07/04 10:04:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -51,7 +51,7 @@
self.v_id := atoi(self.abContact);
if (self.v_id = -1)
{
- if (self.account_rights = 'W')
+ if (self.person_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.account_rights <> 'W') or (self.abScope = 'MySharedContacts')))
+ if ((cmd = 'create') and ((self.person_rights <> 'W') or (self.abScope = 'MySharedContacts')))
return 0;
- if ((cmd = 'import') and ((self.account_rights <> 'W') or (self.abScope = 'MySharedContacts')))
+ if ((cmd = 'import') and ((self.person_rights <> 'W') or (self.abScope = 'MySharedContacts')))
return 0;
- if ((cmd = 'export') and ((self.account_rights <> 'W') or (self.abScope = 'MySharedContacts')))
+ if ((cmd = 'export') and ((self.person_rights <> 'W') or (self.abScope = 'MySharedContacts')))
return 0;
return 1;
]]>
@@ -247,7 +247,7 @@
{
http (' ');
} else {
- http (sprintf ('<img class="photo" src="%s"/>', fValue));
+ http (sprintf ('<img class="resize" src="%s" />', fValue));
}
]]>
</v:method>
@@ -329,24 +329,24 @@
http ('<div style="margin-left:12px; white-space: nowrap;">');
}
image := 'plus.gif';
- image2 := 'folder_16.png';
+ image2 := 'image/folder_16.png';
alt := 'Open Node';
if (not AB.WA.ab_node_has_childs (domain_id, user_id, nodes[N+1], nodes[N+2]))
{
image := 'c.gif';
- image2 := 'folder_16.png';
+ image2 := 'image/folder_16.png';
}
else if (AB.WA.vector_contains(self.abState, nodes[N+2]))
{
image := 'minus.gif';
- image2 := 'folder_open_16.png';
+ image2 := 'image/folder_open_16.png';
alt := 'Close Node';
}
if ((AB.WA.node_type(nodes[N+1]) = 'u') and (AB.WA.node_id(nodes[N+1]) = -1))
- image2 := 'group_16.png';
+ image2 := '/ods/images/icons/group_16.png';
if ((AB.WA.node_type(nodes[N+1]) = 'u') and (AB.WA.node_id(nodes[N+1]) >= 0))
- image2 := 'user_16.png';
+ image2 := '/ods/images/icons/user_16.png';
class := 'nolink_b';
if (nodes[N+2] = self.abPath)
@@ -360,7 +360,7 @@
} else {
http(sprintf('<a href="#" name="pt_toggle_%s" onclick="javascript: vspxPost (\'pt_browse\', \'pt_toggle\', \'%s\', \'pt_path\', \'%s\'); return false"><img src="image/%s" border="0" class="nolink" alt="%s" title="%s" /></a>', nodes[N+2], nodes[N+1], nodes[N+2], image, alt, alt));
}
- http(sprintf('<a href="#" name="pt_node_%s" onclick="javascript: vspxPost (\'pt_browse\', \'pt_node\', \'%s\', \'pt_path\', \'%s\'); return false" class="nolink3 %s" alt="%s" title="%s" > <img src="image/%s" border="0" alt="" /> %s</a>', nodes[N+2], nodes[N+1], nodes[N+2], class, nodes[N], nodes[N], image2, nodes[N]));
+ http(sprintf('<a href="#" name="pt_node_%s" onclick="javascript: vspxPost (\'pt_browse\', \'pt_node\', \'%s\', \'pt_path\', \'%s\'); return false" class="nolink3 %s" alt="%s" title="%s" > <img src="%s" border="0" alt="" /> %s</a>', nodes[N+2], nodes[N+1], nodes[N+2], class, nodes[N], nodes[N], image2, nodes[N]));
if (image = 'minus.gif')
self.showTree(level+1, domain_id, user_id, nodes[N+1], nodes[N+2]);
@@ -399,6 +399,8 @@
self.i_source := -1;
self.i_type := -1;
+ self.i_uUser := '';
+ self.i_uPassword := '';
self.i_lName := '';
self.i_lHost := '';
self.i_lPort := '';
@@ -491,7 +493,7 @@
}
}
self.v_grants := trim (self.v_grants, ',');
- self.v_acl := serialize (DB.DBA.wa_acl_params (params));
+ self.v_acl := serialize (DB.DBA.wa_aci_params (params));
]]>
</v:method>
@@ -595,6 +597,8 @@
<v:variable name="i_source" type="any" default="-1"/>
<v:variable name="i_type" type="any" default="-1"/>
+ <v:variable name="i_uUser" type="varchar" default="''" />
+ <v:variable name="i_uPassword" type="varchar" default="''" />
<v:variable name="i_lName" type="varchar" default="''"/>
<v:variable name="i_lHost" type="varchar" default="''"/>
<v:variable name="i_lPort" type="varchar" default="'389'"/>
@@ -641,7 +645,7 @@
self.abSubAction := '';
self.abValue := '';
}
- if ((self.account_rights <> 'W') and (self.abAction = 'settings'))
+ if ((self.person_rights <> 'W') and (self.abAction = 'settings'))
self.abAction := 'browse';
self.mode_test();
@@ -1070,7 +1074,7 @@
{
if (not is_empty_or_null(self.abValue))
{
- image := 'tag_16.png';
+ image := 'image/tag_16.png';
nodeName := nodeName || ', Tag: ' || self.abValue;
}
}
@@ -1086,15 +1090,15 @@
}
if (self.abScope = 'MySharedContacts')
{
- image := 'group_16.png';
+ image := '/ods/images/icons/group_16.png';
if ((AB.WA.node_type (self.abNode) = 'u') and (AB.WA.node_id (self.abNode) >= 0))
- image := 'user_16.png';
+ image := '/ods/images/icons/user_16.png';
nodeName := self.abName;
}
--nodeName := AB.WA.stringCut (coalesce(nodeName, ''), self.chars);
if (image <> '')
- image := sprintf ('<img src="image/%s" border="0" alt="" /> ', image);
+ image := sprintf ('<img src="%s" border="0" alt="" /> ', image);
http('<div id="ab_header">');
if (not is_empty_or_null(nodeName))
@@ -1125,7 +1129,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.account_rights, data);
+ control.ds_sql := AB.WA.search_sql (self.domain_id, self.account_id, self.person_rights, data);
}
else if (self.abScope = 'MySharedContacts')
{
@@ -1181,7 +1185,7 @@
<table class="ODS_grid" style="border: 0px;">
<thead>
<tr>
- <v:template name="t2" type="simple" enabled="--case when ((self.account_rights <> 'W') or (self.abScope = 'MySharedContacts')) then 0 else 1 end">
+ <v:template name="t2" type="simple" enabled="--case when ((self.person_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 +1204,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);
+ permissions := AB.WA.contact_rights (self.domain_id, id, self.account_rights, self.person_rights);
?>
<table>
<tr>
- <vm:if test="(self.account_rights = 'W') and (self.abScope <> 'MySharedContacts')">
+ <vm:if test="(self.person_rights = 'W') and (self.abScope <> 'MySharedContacts')">
<td class="checkbox" valign="top">
<?vsp
if (permissions = 'W')
@@ -1609,7 +1613,7 @@
<table class="form-body n" cellspacing="0">
<tr>
<th>
- <v:label for="ab_foaf" value="Profile Document URL" />
+ <vm:label for="x_foaf" value="Profile Document URL" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -1636,7 +1640,7 @@
</vm:if>
<tr>
<th>
- <v:label for="ab_foaf" value="Profile Document URL" />
+ <vm:label for="ab_foaf" value="Profile Document URL" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -1647,7 +1651,7 @@
</tr>
<tr>
<th>
- <v:label for="ab_iri" value="WebID" />
+ <vm:label for="ab_iri" value="WebID" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -1658,22 +1662,22 @@
</tr>
<tr>
<th width="25%">
- <v:label for="ab_name" value="Name (*)" />
+ <vm:label for="ab_name" value="Name (*)" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_name" value="--self.v_name" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_name" xhtml_id="ab_name" value="--self.v_name" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_name, 'nickname', null); ?>
</td>
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_title" value="Title"/>
+ <vm:label for="ab_title" value="Title" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:select-list name="ab_title">
+ <v:select-list name="ab_title" xhtml_id="ab_title">
<v:item name="" value=""/>
<v:item name="Mr" value="Mr"/>
<v:item name="Mrs" value="Mrs"/>
@@ -1693,55 +1697,55 @@
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_fName" value="First Name"/>
+ <vm:label for="ab_fName" value="First Name" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_fName" value="--self.v_fName" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_fName" xhtml_id="ab_fName" value="--self.v_fName" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_fName, 'given-name', null); ?>
</td>
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_mName" value="Middle Name" />
+ <vm:label for="ab_mName" value="Middle Name" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_mName" value="--self.v_mName" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_mName" xhtml_id="ab_mName" value="--self.v_mName" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_mName, 'additional-name', null); ?>
</td>
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_lName" value="Last Name"/>
+ <vm:label for="ab_lName" value="Last Name" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_lName" value="--self.v_lName" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_lName" xhtml_id="ab_lName" value="--self.v_lName" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_lName, 'family-name', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_fullName" value="Full Name"/>
+ <vm:label for="ab_fullName" value="Full Name" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_fullName" value="--self.v_fullName" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_fullName" xhtml_id="ab_fullName" value="--self.v_fullName" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_fullName, 'fn', null); ?>
</td>
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_gender" value="Gender" />
+ <vm:label for="ab_gender" value="Gender" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:select-list name="ab_gender">
+ <v:select-list name="ab_gender" xhtml_id="ab_gender">
<v:item name="" value=""/>
<v:item name="Male" value="male"/>
<v:item name="Female" value="female"/>
@@ -1758,7 +1762,7 @@
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_birthday" value="Birthday" />
+ <vm:label for="ab_birthday" value="Birthday" />
</th>
<td nowrap="nowrap">
<vm:if test="self.abAction <> 'view'">
@@ -1825,7 +1829,7 @@
</th>
<td class="listing_col" nowrap="nowrap">
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_photo" value="--self.v_photo" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_photo" xhtml_id="ab_photo" value="--self.v_photo" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
<v:button name="ab_photo_preview" value="Preview" action="simple" xhtml_class="button">
<v:on-post>
<![CDATA[
@@ -1934,7 +1938,7 @@
</vm:if>
<tr>
<th>
- <v:label for="ab_category" value="Category" />
+ <vm:label for="ab_category_name" value="Category" />
</th>
<td id="td_cc">
<vm:if test="self.abAction <> 'view'">
@@ -1970,11 +1974,11 @@
}
</script>
<th>
- <v:label for="ab_tags" value="Tags (comma-separated)" />
+ <vm:label for="ab_tags" value="Tags (comma-separated)" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_tags" null-value="''" value="--self.v_tags" xhtml_class="textbox" xhtml_size="60"/>
+ <v:text name="ab_tags" xhtml_id="ab_tags" null-value="''" value="--self.v_tags" xhtml_class="textbox" xhtml_size="60" />
<input type="button" value="Suggest" onclick="javascript: suggestTags();" class="button" />
<input type="button" value="Clear" onclick="javascript: document.F1.elements['ab_tags'].value = ''" class="button" />
</vm:if>
@@ -1990,77 +1994,77 @@
<table class="form-body" cellspacing="0">
<tr>
<th width="25%">
- <v:label for="ab_mail" value="Mail"/>
+ <vm:label for="ab_mail" value="Mail" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_mail" value="--self.v_mail" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_mail" xhtml_id="ab_mail" value="--self.v_mail" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_mail, 'email:internet, pref', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_web" value="Web"/>
+ <vm:label for="ab_web" value="Web" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_web" value="--self.v_web" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_web" xhtml_id="ab_web" value="--self.v_web" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_web, 'url:pref', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_icq" value="Icq"/>
+ <vm:label for="ab_icq" value="Icq" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_icq" value="--self.v_icq" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_icq" xhtml_id="ab_icq" value="--self.v_icq" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_icq, '', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_skype" value="Skype ID"/>
+ <vm:label for="ab_skype" value="Skype ID" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_skype" value="--self.v_skype" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_skype" xhtml_id="ab_skype" value="--self.v_skype" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_skype, '', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_aim" value="AIM Name"/>
+ <vm:label for="ab_aim" value="AIM Name" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_aim" value="--self.v_aim" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_aim" xhtml_id="ab_aim" value="--self.v_aim" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_aim, '', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_yahoo" value="Yahoo! ID"/>
+ <vm:label for="ab_yahoo" value="Yahoo! ID" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_yahoo" value="--self.v_yahoo" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_yahoo" xhtml_id="ab_yahoo" value="--self.v_yahoo" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_yahoo, '', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_msn" value="MSN Messenger"/>
+ <vm:label for="ab_msn" value="MSN Messenger" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_msn" value="--self.v_msn" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_msn" xhtml_id="ab_msn" value="--self.v_msn" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_msn, '', null); ?>
</td>
@@ -2072,7 +2076,7 @@
<table class="form-body" cellspacing="0">
<tr>
<th width="25%">
- <v:label for="ab_hCountry" value="Country"/>
+ <vm:label for="ab_hCountry" value="Country" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -2083,7 +2087,7 @@
</tr>
<tr>
<th>
- <v:label for="ab_hState" value="State/Province" />
+ <vm:label for="ab_hState" value="State/Province" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -2098,55 +2102,55 @@
</tr>
<tr>
<th>
- <v:label for="ab_hCity" value="City/Town"/>
+ <vm:label for="ab_hCity" value="City/Town" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hCity" value="--self.v_hCity" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_hCity" xhtml_id="ab_hCity" value="--self.v_hCity" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_hCity, 'locality', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_hCode" value="Zip/Postal Code" />
+ <vm:label for="ab_hCode" value="Zip/Postal Code" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hCode" value="--self.v_hCode" xhtml_size="30" />
+ <v:text name="ab_hCode" xhtml_id="ab_hCode" value="--self.v_hCode" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_hCode, 'postal-code', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_hAddress1" value="Address1"/>
+ <vm:label for="ab_hAddress1" value="Address1" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hAddress1" value="--self.v_hAddress1" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_hAddress1" xhtml_id="ab_hAddress1" value="--self.v_hAddress1" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_hAddress1, 'street-address', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_hAddress2" value="Address2"/>
+ <vm:label for="ab_hAddress2" value="Address2" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hAddress2" value="--self.v_hAddress2" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_hAddress2" xhtml_id="ab_hAddress2" value="--self.v_hAddress2" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_hAddress2, 'extended-address', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_hTzone" value="Time Zone"/>
+ <vm:label for="ab_hTzone" value="Time Zone" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:select-list name="ab_hTzone">
+ <v:select-list name="ab_hTzone" xhtml_id="ab_hTzone">
<v:on-init>
<![CDATA[
declare x,y any;
@@ -2167,7 +2171,7 @@
</tr>
<tr>
<th>
- <v:label for="ab_hLat" value="Latitude"/>
+ <vm:label for="ab_hLat" value="Latitude" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -2178,7 +2182,7 @@
</tr>
<tr>
<th>
- <v:label for="ab_hLng" value="Longitude" />
+ <vm:label for="ab_hLng" value="Longitude" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -2189,55 +2193,55 @@
</tr>
<tr>
<th>
- <v:label for="ab_hWeb" value="Web"/>
+ <vm:label for="ab_hWeb" value="Web" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hWeb" value="--self.v_hWeb" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_hWeb" xhtml_id="ab_hWeb" value="--self.v_hWeb" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_hWeb, 'url:home', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_hMail" value="Mail"/>
+ <vm:label for="ab_hMail" value="Mail" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hMail" value="--self.v_hMail" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_hMail" xhtml_id="ab_hMail" value="--self.v_hMail" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_hMail, 'email:internet', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_hPhone" value="Phone"/>
+ <vm:label for="ab_hPhone" value="Phone" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hPhone" value="--self.v_hPhone" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_hPhone" xhtml_id="ab_hPhone" value="--self.v_hPhone" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_hPhone, 'tel:home', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_hMobile" value="Mobile"/>
+ <vm:label for="ab_hMobile" value="Mobile" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hMobile" value="--self.v_hMobile" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_hMobile" xhtml_id="ab_hMobile" value="--self.v_hMobile" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_hMobile, 'tel:home,cell', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_hFax" value="Fax" />
+ <vm:label for="ab_hFax" value="Fax" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_hFax" value="--self.v_hFax" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_hFax" xhtml_id="ab_hFax" value="--self.v_hFax" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_hFax, '', null); ?>
</td>
@@ -2249,7 +2253,7 @@
<table class="form-body" cellspacing="0">
<tr>
<th width="25%">
- <v:label for="ab_bCountry" value="Country"/>
+ <vm:label for="ab_bCountry" value="Country" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -2260,7 +2264,7 @@
</tr>
<tr>
<th>
- <v:label for="ab_bState" value="State/Province" />
+ <vm:label for="ab_bState" value="State/Province" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -2275,55 +2279,55 @@
</tr>
<tr>
<th>
- <v:label for="ab_bCity" value="City/Town"/>
+ <vm:label for="ab_bCity" value="City/Town" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bCity" value="--self.v_bCity" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_bCity" xhtml_id="ab_bCity" value="--self.v_bCity" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_bCity, 'locality', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bCode" value="Zip/Postal Code"/>
+ <vm:label for="ab_bCode" value="Zip/Postal Code" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bCode" value="--self.v_bCode" xhtml_size="30" />
+ <v:text name="ab_bCode" xhtml_id="ab_bCode" value="--self.v_bCode" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_bCode, 'postal-code', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bAddress1" value="Address1"/>
+ <vm:label for="ab_bAddress1" value="Address1" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bAddress1" value="--self.v_bAddress1" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_bAddress1" xhtml_id="ab_bAddress1" value="--self.v_bAddress1" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_bAddress1, 'street-address', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bAddress2" value="Address2"/>
+ <vm:label for="ab_bAddress2" value="Address2" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bAddress2" value="--self.v_bAddress2" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_bAddress2" xhtml_id="ab_bAddress2" value="--self.v_bAddress2" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_bAddress2, 'extended-address', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bTzone" value="Time Zone"/>
+ <vm:label for="ab_bTzone" value="Time Zone" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:select-list name="ab_bTzone">
+ <v:select-list name="ab_bTzone" xhtml_id="ab_bTzone">
<v:on-init>
<![CDATA[
declare x,y any;
@@ -2344,7 +2348,7 @@
</tr>
<tr>
<th>
- <v:label for="ab_bLat" value="Latitude"/>
+ <vm:label for="ab_bLat" value="Latitude" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -2355,7 +2359,7 @@
</tr>
<tr>
<th>
- <v:label for="ab_bLng" value="Longitude" />
+ <vm:label for="ab_bLng" value="Longitude" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
@@ -2366,11 +2370,11 @@
</tr>
<tr>
<th>
- <v:label for="ab_bIndustry" value="Industry"/>
+ <vm:label for="ab_bIndustry" value="Industry" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:data-list name="ab_bIndustry" sql="select '' as WI_NAME from WA_INDUSTRY union select WI_NAME from WA_INDUSTRY" key-column="WI_NAME" value-column="WI_NAME">
+ <v:data-list name="ab_bIndustry" xhtml_id="ab_bIndustry" sql="select '' as WI_NAME from WA_INDUSTRY union select WI_NAME from WA_INDUSTRY" key-column="WI_NAME" value-column="WI_NAME">
<v:before-data-bind>
control.ufl_value := self.v_bIndustry;
</v:before-data-bind>
@@ -2381,88 +2385,88 @@
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_bOrganization" value="Organization"/>
+ <vm:label for="ab_bOrganization" value="Organization" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bOrganization" value="--self.v_bOrganization" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_bOrganization" xhtml_id="ab_bOrganization" value="--self.v_bOrganization" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_bOrganization, 'org', null); ?>
</td>
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_bDepartment" value="Department" />
+ <vm:label for="ab_bDepartment" value="Department" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bDepartment" value="--self.v_bDepartment" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_bDepartment" xhtml_id="ab_bDepartment" value="--self.v_bDepartment" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_bDepartment, '', null); ?>
</td>
</tr>
<tr class="contactType">
<th>
- <v:label for="ab_bJob" value="Job Title"/>
+ <vm:label for="ab_bJob" value="Job Title" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bJob" value="--self.v_bJob" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_bJob" xhtml_id="ab_bJob" value="--self.v_bJob" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_bJob, 'title', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bWeb" value="Web"/>
+ <vm:label for="ab_bWeb" value="Web" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bWeb" value="--self.v_bWeb" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_bWeb" xhtml_id="ab_bWeb" value="--self.v_bWeb" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_bWeb, 'url:work', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bMail" value="Mail"/>
+ <vm:label for="ab_bMail" value="Mail" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bMail" value="--self.v_bMail" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
+ <v:text name="ab_bMail" xhtml_id="ab_bMail" value="--self.v_bMail" fmt-function="AB.WA.utf2wide" xhtml_size="60" />
</vm:if>
<?vsp self.viewField (self.v_bMail, 'email:internet', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bPhone" value="Phone"/>
+ <vm:label for="ab_bPhone" value="Phone" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bPhone" value="--self.v_bPhone" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_bPhone" xhtml_id="ab_bPhone" value="--self.v_bPhone" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_bPhone, 'tel:work', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bMobile" value="Mobile"/>
+ <vm:label for="ab_bMobile" value="Mobile" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bMobile" value="--self.v_bMobile" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_bMobile" xhtml_id="ab_bMobile" value="--self.v_bMobile" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_bMobile, 'tel:work,cell', null); ?>
</td>
</tr>
<tr>
<th>
- <v:label for="ab_bFax" value="Fax" />
+ <vm:label for="ab_bFax" value="Fax" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:text name="ab_bFax" value="--self.v_bFax" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
+ <v:text name="ab_bFax" xhtml_id="ab_bFax" value="--self.v_bFax" fmt-function="AB.WA.utf2wide" xhtml_size="30" />
</vm:if>
<?vsp self.viewField (self.v_bFax, '', null); ?>
</td>
@@ -2573,35 +2577,23 @@
<th class="action">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no"><td colspan="4"><b>No Shares</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
- declare N, L integer;
- declare acl, aType, aAccess any;
+ declare acl any;
- L := 0;
acl := (select WAI_ACL from DB.DBA.WA_INSTANCE where WAI_ID = self.domain_id);
acl := case when isnull (acl) then vector () else deserialize (acl) end;
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
+ DB.DBA.wa_aci_lines (acl);
+
acl := deserialize (self.v_acl);
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- if (self.abAction <> 'view')
- {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", value: "%s", readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', acl[N][2], acl[N][1], case when acl[N][2] = 'public' then 'true' else 'false' end, case when acl[N][2] = 'public' then 'display: none;' else '' end, acl[N][3], acl[N][4], acl[N][5]));
- } else {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
- }
+ DB.DBA.wa_aci_lines (acl, self.abAction);
?>
</script>
]]>
- <tr id="s_tr_no" style="display: <?V case when L=0 then '' else 'none' end ?>;"><td colspan="<?V case when self.abAction='view' then 3 else 4 end ?>"><b>No Shares</b></td></tr>
+ </tbody>
</table>
</td>
<vm:if test="self.abAction <> 'view'">
@@ -2649,11 +2641,11 @@
<?vsp } ?>
<tr>
<th width="25%" valign="top">
- <v:label for="ab_Certificate" value="Certificate" />
+ <vm:label for="ab_Certificate" value="Certificate" />
</th>
<td>
<vm:if test="self.abAction <> 'view'">
- <v:textarea name="ab_Certificate" null-value="" value="--self.v_certificate" xhtml_cols="70" xhtml_rows="20" />
+ <v:textarea name="ab_Certificate" xhtml_id="ab_Certificate" null-value="" value="--self.v_certificate" xhtml_cols="70" xhtml_rows="20" />
</vm:if>
<?vsp self.viewField (self.v_certificate, null, null); ?>
</td>
@@ -2945,7 +2937,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) = '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, self.person_rights) = 'W') and (self.abAction = 'view') then 1 else 0 end" xhtml_class="form-button">
<v:on-post>
<![CDATA[
self.abAction := 'edit';
@@ -2984,7 +2976,7 @@
</th>
<td nowrap="nowarap">
<label>
- <v:radio-button name="i_source_0" xhtml_id="i_source_0" group-name="i_source" value="0" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_tr_0\', \'imp_tr_1\', \'imp_tr_2\']});">
+ <v:radio-button name="i_source_0" xhtml_id="i_source_0" group-name="i_source" value="0" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_tr_0\', \'imp_tr_1\', \'imp_tr_2\'], exec: [iType]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either(lte(self.i_source, 0), 1, 0);
@@ -2995,25 +2987,36 @@
</label>
<br />
<label>
- <v:radio-button name="i_source_1" xhtml_id="i_source_1" group-name="i_source" value="1" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_tr_0\', \'imp_tr_1\', \'imp_tr_2\']});">
+ <v:radio-button name="i_source_1" xhtml_id="i_source_1" group-name="i_source" value="1" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_tr_0\', \'imp_tr_1\', \'imp_tr_2\'], exec: [iType]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either(equ(self.i_source, 1), 1, 0);
]]>
</v:before-render>
</v:radio-button>
- <b>WebDAV</b>
+ <b>WebDAV File Path</b>
+ </label>
+ <br />
+ <label>
+ <v:radio-button name="i_source_5" xhtml_id="i_source_5" group-name="i_source" value="5" xhtml_onchange="javascript: destinationChange(this, {hide: [\'imp_tr_0\', \'imp_tr_1\', \'imp_tr_2\']});">
+ <v:before-render>
+ <![CDATA[
+ control.ufl_selected := either (equ (self.i_source, 5), 1, 0);
+ ]]>
+ </v:before-render>
+ </v:radio-button>
+ <b>CardDAV Path</b>
</label>
<br />
<label>
- <v:radio-button name="i_source_2" xhtml_id="i_source_2" group-name="i_source" value="2" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_tr_0\', \'imp_tr_1\', \'imp_tr_2\']});">
+ <v:radio-button name="i_source_2" xhtml_id="i_source_2" group-name="i_source" value="2" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_tr_0\', \'imp_tr_1\', \'imp_tr_2\'], exec: [iType]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either(equ(self.i_source, 2), 1, 0);
]]>
</v:before-render>
</v:radio-button>
- <b>URI</b>
+ <b>URL</b>
</label>
<br />
<label>
@@ -3036,7 +3039,7 @@
]]>
</v:before-render>
</v:radio-button>
- <b>LinkedIn</b>
+ <b>LinkedIn Account</b>
</label>
</vm:if>
</td>
@@ -3081,6 +3084,16 @@
</td>
</tr>
</table>
+ <script type="text/javascript">
+ <![CDATA[
+ destinationChange($('i_source_0'), {show: ['imp_tr_0', 'imp_tr_1', 'imp_tr_2'], exec: [iType]});
+ destinationChange($('i_source_1'), {show: ['imp_tr_0', 'imp_tr_1', 'imp_tr_2'], exec: [iType]});
+ destinationChange($('i_source_5'), {hide: ['imp_tr_0', 'imp_tr_1', 'imp_tr_2']});
+ destinationChange($('i_source_2'), {show: ['imp_tr_0', 'imp_tr_1', 'imp_tr_2'], exec: [iType]});
+ destinationChange($('i_source_3'), {hide: ['imp_tr_0', 'imp_tr_1', 'imp_tr_2']});
+ destinationChange($('i_source_4'), {hide: ['imp_tr_0', 'imp_tr_1', 'imp_tr_2']});
+ ]]>
+ </script>
</div>
<div class="new-form-footer">
@@ -3097,6 +3110,11 @@
self.i_source := 4;
self.i_type := 4;
}
+ else if (self.i_source_5.ufl_selected)
+ {
+ self.i_source := 5;
+ self.i_type := 5;
+ }
else
{
if (self.i_source_0.ufl_selected)
@@ -3199,20 +3217,20 @@
<vm:if test="self.i_source = 0">
<tr>
<th width="30%">
- Select file
+ <label for="f_file">Select file <?V case when self.i_type = 0 then '(.vcf)' when self.i_type = 2 then '(.csv)' end ?></label>
</th>
<td>
- <input type="file" name="f_file" size="40"/>
+ <input type="file" name="f_file" size="60" />
</td>
</tr>
</vm:if>
<vm:if test="self.i_source = 1">
<tr>
<th width="30%">
- Select WebDAV file
+ <label for="f_dav">Select WebDAV file</label>
</th>
<td>
- <v:text name="f_dav" xhtml_id="f_dav" value="" xhtml_size="40" />
+ <v:text name="f_dav" xhtml_id="f_dav" value="" xhtml_size="60" />
<input type="button" value="Browse..." onclick="davBrowse ('f_dav');" />
<![CDATA[
<script type="text/javascript">
@@ -3222,22 +3240,52 @@
</td>
</tr>
</vm:if>
- <vm:if test="self.i_source = 2">
+ <vm:if test="self.i_source = 2 or self.i_source = 5">
<tr>
<th width="30%">
- Select URI
+ <label for="f_uri" ><?V case when self.i_source = 2 then 'Select File URL ' else 'Select CalDAV Path' end ?><?V case when self.i_type = 0 then '(.vcf)' when self.i_type = 2 then '(.csv)' end ?></label>
</th>
<td>
- <v:text name="f_uri" value="--''" xhtml_size="60" />
+ <v:text name="f_uri" xhtml_id="f_uri" value="--''" xhtml_size="60" />
</td>
</tr>
+ <vm:if test="self.i_source = 5">
+ <tr>
+ <th>
+ <label for="f_uUser">User</label>
+ </th>
+ <td>
+ <v:text name="f_uUser" xhtml_id="f_uUser" null-value="--self.i_uUser" value="--''" xhtml_size="30">
+ <v:before-render>
+ <![CDATA[
+ control.ufl_value := self.i_uUser;
+ ]]>
+ </v:before-render>
+ </v:text>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <label for="f_uPassword">Password</label>
+ </th>
+ <td>
+ <v:text name="f_uPassword" xhtml_id="f_uPassword" type="password" null-value="--self.i_uPassword" value="--''" xhtml_size="30">
+ <v:before-render>
+ <![CDATA[
+ control.ufl_value := self.i_uPassword;
+ ]]>
+ </v:before-render>
+ </v:text>
+ </td>
+ </tr>
+ </vm:if>
<vm:if test="self.i_type = 1">
<tr>
<th>
- Grab Depth
+ <label for="i_depth">Grab Depth</label>
</th>
<td>
- <v:select-list name="i_depth">
+ <v:select-list name="i_depth" xhtml_id="i_depth">
<v:item value="0" name="0" />
<v:item value="1" name="1" />
<v:item value="2" name="2" />
@@ -3252,18 +3300,18 @@
</tr>
<tr>
<th>
- Maximum Entity Count
+ <label for="i_limit">Maximum Entity Count</label>
</th>
<td>
- <v:text name="i_limit" value="--self.i_contentLimit" xhtml_size="3" />
+ <v:text name="i_limit" xhtml_id="i_limit" value="--self.i_contentLimit" xhtml_size="3" />
</td>
</tr>
<tr>
<th>
- Follow Property
+ <label for="i_follow">Follow Property</label>
</th>
<td>
- <v:select-list name="i_follow">
+ <v:select-list name="i_follow" xhtml_id="i_follow">
<v:item value="http://xmlns.com/foaf/0.1/knows" name="foaf:knows" />
<v:item value="http://www.w3.org/2002/07/owl#sameAs" name="owl:sameAs" />
<v:item value="http://www.w3.org/2000/01/rdf-schema#seeAlso" name="rdfs:seeAlso" />
@@ -3283,10 +3331,11 @@
<vm:if test="exists (select 1 from LDAP..LDAP_SERVERS where LS_USER_ID = self.account_id)">
<tr>
<th width="30%">
- LDAP server
+ <label for="f_lName">LDAP server</label>
</th>
<td>
<v:data-list name="f_lName"
+ xhtml_id="f_lName"
value="--self.i_lName"
key-column="LS_NAME"
value-column="LS_NAME"
@@ -3327,10 +3376,10 @@
</vm:if>
<tr>
<th width="30%">
- Host URL
+ <label for="f_lHost">Host URL</label>
</th>
<td>
- <v:text name="f_lHost" null-value="--''" value="" xhtml_size="70">
+ <v:text name="f_lHost" xhtml_id="f_lHost" null-value="--''" value="" xhtml_size="70">
<v:before-render>
<![CDATA[
control.ufl_value := self.i_lHost;
@@ -3341,10 +3390,10 @@
</tr>
<tr>
<th>
- Host port
+ <label for="f_lPort">Host port</label>
</th>
<td>
- <v:text name="f_lPort" null-value="--''" value="" xhtml_size="10">
+ <v:text name="f_lPort" xhtml_id="f_lPort" null-value="--''" value="" xhtml_size="10">
<v:before-render>
<![CDATA[
control.ufl_value := self.i_lPort;
@@ -3355,10 +3404,10 @@
</tr>
<tr>
<th>
- Base DN
+ <label for="f_lBase_dn">Base DN</label>
</th>
<td>
- <v:text name="f_lBase_dn" null-value="--''" value="" xhtml_size="70">
+ <v:text name="f_lBase_dn" xhtml_id="f_lBase_dn" null-value="--''" value="" xhtml_size="70">
<v:before-render>
<![CDATA[
control.ufl_value := self.i_lBase_dn;
@@ -3369,10 +3418,10 @@
</tr>
<tr>
<th>
- Bind DN
+ <label for="f_lBind_dn">Bind DN</label>
</th>
<td>
- <v:text name="f_lBind_dn" null-value="--''" value="" xhtml_size="70">
+ <v:text name="f_lBind_dn" xhtml_id="f_lBind_dn" null-value="--''" value="" xhtml_size="70">
<v:before-render>
<![CDATA[
control.ufl_value := self.i_lBind_dn;
@@ -3383,10 +3432,10 @@
</tr>
<tr>
<th>
- Password
+ <label for="f_lPassword">Password</label>
</th>
<td>
- <v:text name="f_lPassword" type="password" null-value="--self.i_lPassword" value="--''" xhtml_size="30">
+ <v:text name="f_lPassword" xhtml_id="f_lPassword" type="password" null-value="--self.i_lPassword" value="--''" xhtml_size="30">
<v:before-render>
<![CDATA[
control.ufl_value := self.i_lPassword;
@@ -3397,10 +3446,10 @@
</tr>
<tr>
<th>
- Search string
+ <label for="f_lSearch">Search string</label>
</th>
<td>
- <v:text name="f_lSearch" null-value="--''" value="--self.i_lSearch" xhtml_size="70"/>
+ <v:text name="f_lSearch" xhtml_id="f_lSearch" null-value="--''" value="--self.i_lSearch" xhtml_size="70" />
</td>
</tr>
</vm:if>
@@ -3485,6 +3534,19 @@
host := 'ldap://' || self.i_lHost || ':' || self.i_lPort;
self.i_data := ldap_search (host, 0, self.i_lBase_dn, self.i_lSearch, self.i_lBind_dn, self.i_lPassword);
}
+ else if (self.i_source = 5)
+ {
+ self.i_uUser := trim (self.f_uUser.ufl_value);
+ self.i_uPassword := trim (self.f_uPassword.ufl_value);
+ self.f_uri.ufl_value := trim (self.f_uri.ufl_value);
+ if (is_empty_or_null (self.f_uri.ufl_value))
+ signal ('TEST', 'Please select correct URL address!');
+
+ if (not AB.WA.import_CardDAV_check (self.f_uri.ufl_value, vector ('user', self.i_uUser, 'password', self.i_uPassword), 1))
+ signal ('TEST', 'Bad CardDAV source!');
+
+ self.i_data := self.f_uri.ufl_value;
+ }
self.i_number := 0;
if (self.i_type = 1)
@@ -3505,15 +3567,19 @@
self.i_number := AB.WA.import_count (self.i_type, self.i_data);
}
+ else if (self.i_type = 5)
+ {
+ self.i_number := AB.WA.import_CardDAV_count (self.f_uri.ufl_value, vector ('user', self.i_uUser, 'password', self.i_uPassword), 1);
+ }
else
{
self.i_number := AB.WA.import_count (self.i_type, self.i_data);
}
if (self.i_number = 0)
- signal ('TEST', 'No persons founded!<>');
+ signal ('TEST', 'Import target data not found!<>');
-- next step
- if (self.i_type = 0)
+ if ((self.i_type = 0) or (self.i_type = 5))
{
self.abStep := '5';
}
@@ -3552,7 +3618,7 @@
<thead>
<tr>
<th class="checkbox">
- <input type="checkbox" name="cb_all" value="Select All" onclick="selectAllCheckboxes(this, 'cb_item')" />
+ <input type="checkbox" name="cb_all" value="Select All" onclick="selectAllCheckboxes(this, 'cb_item', true)" />
</th>
<th>Name</th>
<th>Mail</th>
@@ -3572,7 +3638,7 @@
<td class="checkbox">
<?vsp
if (item[0] = 0)
- http (sprintf ('<input type="checkbox" name="cb_item" value="%s" onclick="selectCheck(this, \'cb_item\')" />', item[1]));
+ http (sprintf ('<input type="checkbox" name="cb_item" value="%s" onclick="selectCheck(this, \'cb_item\', true)" />', item[1]));
?>
</td>
<td>
@@ -3643,7 +3709,9 @@
self.abStep := '4';
AB.WA.push (self.abSteps, '3');
- } else {
+ }
+ else
+ {
self.resetImport (0);
self.abAction := 'import';
}
@@ -3949,33 +4017,29 @@
<table class="form-body" cellspacing="0">
<tr>
<td style="width: 90%; background-color: white;">
- <table id="s_tbl" class="ODS_grid">
+ <table class="ODS_grid">
<thead>
<tr>
<th width="15%">Type</th>
<th>Value</th>
<th width="1%" nowrap="nowrap">ACL: (R)ead, (W)rite</th>
- <th width="50px">Action</th>
+ <th class="action">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no"><td colspan="4"><b>No Shares</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
- declare N, L integer;
- declare acl, aType, aAccess any;
+ declare acl any;
- L := 0;
acl := (select WAI_ACL from DB.DBA.WA_INSTANCE where WAI_ID = self.domain_id);
acl := case when isnull (acl) then vector () else deserialize (acl) end;
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
+ DB.DBA.wa_aci_lines (acl);
?>
</script>
]]>
- <tr id="s_tr_no" style="display: <?V case when L=0 then '' else 'none' end ?>;"><td colspan="4"><b>No Shares</b></td></tr>
+ </tbody>
</table>
</td>
<td valign="top" nowrap="nowrap">
@@ -4019,7 +4083,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());
+ data := coalesce ((select deserialize (LV_FIELDS) from LDAP..LDAP_VALIDATION where LV_USER_ID = self.account_id), vector('P_NAME', '1'));
fields := LDAP..contact_fields ();
M := length (fields) / 2;
for (N := 0; N < M; N := N + 2)
@@ -4104,7 +4168,7 @@
}
}
self.v_grants := trim (self.v_grants, ',');
- tmp := DB.DBA.wa_acl_params (params);
+ tmp := DB.DBA.wa_aci_params (params);
if (length (tmp))
self.v_acl := serialize (tmp);
@@ -4135,7 +4199,9 @@
if (self.i_source = 2)
{
options := vector ('tags', self.v_tags, 'mode', 2);
- } else {
+ }
+ else
+ {
options := vector ('tags', self.v_tags);
}
}
@@ -4159,6 +4225,11 @@
-- LinkedIn
options := vector ('tags', self.v_tags);
}
+ else if (self.i_type = 5)
+ {
+ -- CalDAV
+ options := vector ('tags', self.v_tags, 'user', self.i_uUser, 'password', self.i_uPassword);
+ }
if (self.v_grants <> '')
options := vector_concat (options, vector ('grants', self.v_grants));
@@ -4556,12 +4627,13 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Clear" xhtml_class="form-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: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>
@@ -4686,10 +4758,10 @@
<table class="form-body" cellspacing="0">
<tr>
<th width="30%">
- Name
+ <label for="c_name">Name</label>
</th>
<td>
- <v:text name="c_name" value="--self.v_name" xhtml_size="60" />
+ <v:text name="c_name" xhtml_id="c_name" value="--self.v_name" xhtml_size="60" />
</td>
</tr>
</table>
@@ -4975,10 +5047,10 @@
<table cellspacing="0">
<tr>
<th width="30%">
- <v:label for="exc_name" value="Name" />
+ <vm:label for="exc_name" value="Name" />
</th>
<td>
- <v:text name="exc_name" null-value="--''" value="--self.ve_name" xhtml_size="60" />
+ <v:text name="exc_name" xhtml_id="exc_name" null-value="--''" value="--self.ve_name" xhtml_size="60" />
</td>
</tr>
<vm:if test="self.abSubAction not in ('syncmlCreate', 'syncmlUpdate')">
@@ -5047,26 +5119,42 @@
</tr>
<vm:if test="self.abSubAction not in ('syncmlCreate', 'syncmlUpdate')">
<tr>
- <th rowspan="2" valign="top">
+ <th rowspan="<?V case when (self.abSubAction in ('subscribeCreate', 'subscribeUpdate')) then 3 else 2 end ?>" valign="top">
<?V case when (self.abSubAction in ('publishCreate', 'publishUpdate')) then 'Destination' else 'Source' end ?> type
</th>
<td nowrap="nowarap">
<label>
- <v:radio-button name="exc_options_type_1" group-name="exc_options_type" value="1" xhtml_onchange="javascript: destinationChange(this, {show: [\'exc_options_name_button\'], clear: [\'exc_options_name\']});">
+ <v:radio-button name="exc_options_type_1" xhtml_id="exc_options_type_1" group-name="exc_options_type" value="1" xhtml_onchange="javascript: destinationChange(this, {show: [\'exc_options_name_button\'], clear: [\'exc_options_name\'], exec: [excLabel]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either (lte (get_keyword ('type', coalesce (self.ve_options, vector ()), 1), 1), 1, 0);
]]>
</v:before-render>
</v:radio-button>
- <b>WebDAV Path</b>
+ <b>WebDAV File Path</b>
</label>
</td>
</tr>
+ <vm:if test="self.abSubAction in ('subscribeCreate', 'subscribeUpdate')">
<tr>
<td nowrap="nowarap">
<label>
- <v:radio-button name="exc_options_type_2" group-name="exc_options_type" value="2" xhtml_onchange="javascript: destinationChange(this, {hide: [\'exc_options_name_button\'], clear: [\'exc_options_name\']});">
+ <v:radio-button name="exc_options_type_3" xhtml_id="exc_options_type_3" group-name="exc_options_type" value="3" xhtml_onchange="javascript: destinationChange(this, {hide: [\'exc_options_name_button\'], clear: [\'exc_options_name\'], exec: [excLabel]});">
+ <v:before-render>
+ <![CDATA[
+ control.ufl_selected := either (equ (get_keyword ('type', coalesce (self.ve_options, vector ()), 1), 3), 1, 0);
+ ]]>
+ </v:before-render>
+ </v:radio-button>
+ <b>CardDAV Path</b>
+ </label>
+ </td>
+ </tr>
+ </vm:if>
+ <tr>
+ <td nowrap="nowarap">
+ <label>
+ <v:radio-button name="exc_options_type_2" xhtml_id="exc_options_type_2" group-name="exc_options_type" value="2" xhtml_onchange="javascript: destinationChange(this, {hide: [\'exc_options_name_button\'], clear: [\'exc_options_name\'], exec: [excLabel]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either (equ (get_keyword ('type', coalesce (self.ve_options, vector ()), 1), 2), 1, 0);
@@ -5080,34 +5168,37 @@
</vm:if>
<tr>
<th>
- <v:label for="sr_chars" value="-- case when (self.abSubAction in ('syncmlCreate', 'syncmlUpdate')) then 'WebDAV SyncML Path' else 'WebDAV Path / URL' end" />
+ <vm:if test="self.abAction in ('syncmlCreate', 'syncmlUpdate')">
+ <label for="exc_options_name">WebDAV SyncML Path</label>
+ </vm:if>
+ <vm:if test="self.abAction not in ('syncmlCreate', 'syncmlUpdate')">
+ <label for="exc_options_name"><span id="excLabel">WebDAV File Name (.ics)</span></label>
+ </vm:if>
</th>
<td>
<v:text name="exc_options_name" xhtml_id="exc_options_name" value="--get_keyword ('name', self.ve_options)" xhtml_size="60" />
- <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 ?>" />
+ <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 ?>" />
<![CDATA[
<script type="text/javascript">
OAT.Loader.load(['dav'], function(){OAT.WebDav.init(davOptions);});
</script>
]]>
- </vm:if>
</td>
</tr>
<tr>
<th>
- User
+ <vm:label for="exc_options_user" value="User" />
</th>
<td>
- <v:text name="exc_options_user" value="--get_keyword ('user', self.ve_options)" null-value="''" />
+ <v:text name="exc_options_user" xhtml_id="exc_options_user" value="--get_keyword ('user', self.ve_options)" null-value="''" />
</td>
</tr>
<tr>
<th>
- Password
+ <vm:label for="exc_options_password" value="Password" />
</th>
<td>
- <v:text name="exc_options_password" type="password" value="--get_keyword ('password', self.ve_options)" null-value="''" />
+ <v:text name="exc_options_password" xhtml_id="exc_options_password" type="password" value="--get_keyword ('password', self.ve_options)" null-value="''" />
</td>
</tr>
<tr>
@@ -5118,10 +5209,10 @@
<vm:if test="self.abSubAction in ('syncmlCreate', 'syncmlUpdate')">
<tr>
<th>
- <v:label for="exc_options_mode" value="Sync mode" />
+ <vm:label for="exc_options_mode" value="Sync mode" />
</th>
<td>
- <v:select-list name="exc_options_mode">
+ <v:select-list name="exc_options_mode" xhtml_id="exc_options_mode">
<v:item value="0" name="Update both" />
<v:item value="1" name="Update client" />
<v:item value="-1" name="Update SyncML server" />
@@ -5137,20 +5228,20 @@
</vm:if>
<tr>
<th>
- <v:label for="exc_tags_include" value="Include with tags (comma-separated)" />
+ <vm:label for="exc_tags_include" value="Include with tags (comma-separated)" />
</th>
<td>
- <v:text name="exc_tags_include" value="--get_keyword ('tagsInclude', self.ve_options)" xhtml_class="textbox" xhtml_size="60" />
+ <v:text name="exc_tags_include" xhtml_id="exc_tags_include" value="--get_keyword ('tagsInclude', self.ve_options)" xhtml_class="textbox" xhtml_size="60" />
<input type="button" value="Clear" onclick="javascript: document.F1.elements['exc_tags_include'].value = ''" class="button" />
</td>
</tr>
<?vsp self.myTags ('exc_tags_include'); ?>
<tr>
<th>
- <v:label for="exc_tags_exclude" value="Exclude with tags (comma-separated)" />
+ <vm:label for="exc_tags_exclude" value="Exclude with tags (comma-separated)" />
</th>
<td>
- <v:text name="exc_tags_exclude" value="--get_keyword ('tagsExclude', self.ve_options)" xhtml_class="textbox" xhtml_size="60" />
+ <v:text name="exc_tags_exclude" xhtml_id="exc_tags_exclude" value="--get_keyword ('tagsExclude', self.ve_options)" xhtml_class="textbox" xhtml_size="60" />
<input type="button" value="Clear" onclick="javascript: document.F1.elements['exc_tags_exclude'].value = ''" class="button" />
</td>
</tr>
@@ -5158,16 +5249,23 @@
<vm:if test="self.abSubAction in ('syncmlCreate', 'syncmlUpdate')">
<tr>
<th>
- <v:label for="exc_tags" value="Tags for incoming entries (comma-separated)" />
+ <vm:label for="exc_tags" value="Tags for incoming entries (comma-separated)" />
</th>
<td>
- <v:text name="exc_tags" value="--get_keyword ('tags', self.ve_options)" xhtml_class="textbox" xhtml_size="60" />
+ <v:text name="exc_tags" xhtml_id="exc_tags" value="--get_keyword ('tags', self.ve_options)" xhtml_class="textbox" xhtml_size="60" />
<input type="button" value="Clear" onclick="javascript: document.F1.elements['exc_tags'].value = ''" class="button" />
</td>
</tr>
<?vsp self.myTags ('exc_tags'); ?>
</vm:if>
</table>
+ <script type="text/javascript">
+ <![CDATA[
+ destinationChange($('exc_options_type_1'), {show: ['exc_options_name_button'], clear: ['exc_options_name'], exec: [excLabel]});
+ destinationChange($('exc_options_type_3'), {hide: ['exc_options_name_button'], clear: ['exc_options_name'], exec: [excLabel]});
+ destinationChange($('exc_options_type_2'), {hide: ['exc_options_name_button'], clear: ['exc_options_name'], exec: [excLabel]});
+ ]]>
+ </script>
</div>
<div class="new-form-footer">
<v:button action="simple" value="--case when self.abSubAction in ('publishCreate', 'subscribeCreate', 'syncmlCreate') then 'Create' else 'Update' end" name="exc_save" xhtml_class="form-button">
@@ -5219,6 +5317,10 @@
{
_type := 2;
}
+ else if (self.exc_options_type_3.ufl_selected)
+ {
+ _type := 3;
+ }
}
_name := trim (self.exc_options_name.ufl_value);
if (self.abSubAction in ('syncmlCreate', 'syncmlUpdate'))
@@ -5371,7 +5473,7 @@
</table>
</div>
<div class="new-form-footer">
- <v:button action="simple" value="Sync" name="exc_sync_exec" xhtml_class="form-button">
+ <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:on-post>
<![CDATA[
declare _mode any;
@@ -5383,7 +5485,7 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Cancel" name="exc_sync_cancel" xhtml_class="form-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:on-post>
<![CDATA[
self.abSubAction := 'syncmlBrowse';
diff --git a/appsrc/ODS-Addressbook/www/image/close_16.png b/appsrc/ODS-Addressbook/www/image/close_16.png
deleted file mode 100644
index 2610797..0000000
Binary files a/appsrc/ODS-Addressbook/www/image/close_16.png and /dev/null differ
diff --git a/appsrc/ODS-Addressbook/www/image/edit_16.png b/appsrc/ODS-Addressbook/www/image/edit_16.png
deleted file mode 100644
index f8aaba2..0000000
Binary files a/appsrc/ODS-Addressbook/www/image/edit_16.png and /dev/null differ
diff --git a/appsrc/ODS-Addressbook/www/image/first_16.gif b/appsrc/ODS-Addressbook/www/image/first_16.gif
deleted file mode 100644
index d870e80..0000000
Binary files a/appsrc/ODS-Addressbook/www/image/first_16.gif and /dev/null differ
diff --git a/appsrc/ODS-Addressbook/www/image/last_16.gif b/appsrc/ODS-Addressbook/www/image/last_16.gif
deleted file mode 100644
index afcc7e8..0000000
Binary files a/appsrc/ODS-Addressbook/www/image/last_16.gif and /dev/null differ
diff --git a/appsrc/ODS-Addressbook/www/image/next_16.gif b/appsrc/ODS-Addressbook/www/image/next_16.gif
deleted file mode 100644
index f7e1621..0000000
Binary files a/appsrc/ODS-Addressbook/www/image/next_16.gif and /dev/null differ
diff --git a/appsrc/ODS-Addressbook/www/image/previous_16.gif b/appsrc/ODS-Addressbook/www/image/previous_16.gif
deleted file mode 100644
index b907b15..0000000
Binary files a/appsrc/ODS-Addressbook/www/image/previous_16.gif and /dev/null differ
diff --git a/appsrc/ODS-Addressbook/www/invite.vspx b/appsrc/ODS-Addressbook/www/invite.vspx
index d5c2b73..a021856 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.1 2010/09/20 10:14:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/www/js/ab.js b/appsrc/ODS-Addressbook/www/js/ab.js
index 0707271..fe2b602 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-2007 OpenLink Software
+ * 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
@@ -198,8 +198,10 @@ function confirmAction(confirmMsq, form, txt, selectionMsq) {
return false;
}
-function selectCheck(obj, prefix) {
+function selectCheck(obj, prefix, noToolbars) {
coloriseRow(getParent(obj, 'tr'), obj.checked);
+ if (noToolbars)
+ return;
enableToolbars(obj.form, prefix);
}
@@ -227,7 +229,7 @@ function enableElement(id, id_gray, showFlag) {
}
}
-function selectAllCheckboxes (obj, prefix) {
+function selectAllCheckboxes(obj, prefix, noToolbars) {
var objForm = obj.form;
for (var i = 0; i < objForm.elements.length; i++) {
var o = objForm.elements[i];
@@ -239,12 +241,15 @@ function selectAllCheckboxes (obj, prefix) {
coloriseRow(getParent(o, 'tr'), o.checked);
}
}
+ obj.focus();
if (obj.value == 'Select All')
obj.value = 'Unselect All';
else
obj.value = 'Select All';
- selectCheck (obj, prefix);
- obj.focus();
+
+ if (noToolbars)
+ return;
+ enableToolbars(objForm, prefix);
}
function anySelected (form, txt, selectionMsq) {
@@ -541,11 +546,17 @@ function updateGeodata(mode) {
OAT.AJAX.GET(S, '', function(arg) {cb(arg, mode);});
}
-function davBrowse(fld) {
+function davBrowse(fld, folders) {
+ /* 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;}
};
+ if (!folders) {folders = false;}
+ OAT.WebDav.options.foldersOnly = folders;
OAT.WebDav.open(options);
}
@@ -605,6 +616,36 @@ function destinationChange(obj, actions) {
}
}
}
+ if (actions.exec) {
+ var a = actions.exec;
+ for ( var i = 0; i < a.length; i++) {
+ a[i](obj);
+ }
+ }
+}
+
+function excLabel(obj) {
+ var srcLabel = $('excLabel');
+ if (!srcLabel)
+ return;
+ if ($('exc_options_type_1').checked)
+ srcLabel.innerHTML = 'WebDAV File URL (.ics)';
+ if ($('exc_options_type_3').checked)
+ srcLabel.innerHTML = 'CalDAV URL';
+ if ($('exc_options_type_2').checked)
+ srcLabel.innerHTML = 'File URL (.ics)';
+}
+
+function iType(obj) {
+ var i = -1;
+ if ($('i_type_0').checked)
+ i = 0;
+ if ($('i_type_1').checked)
+ i = 1;
+ if ($('i_type_2').checked)
+ i = 2;
+ if (i < 0)
+ $('i_type_0').checked = true;
}
function urlParam(fldName)
@@ -694,7 +735,9 @@ function checkState()
} else {
progressTimer = null;
progressPollTimer = null;
- $('btn_Stop').click();
+ $('btn_Stop').value = 'Close';
+ OAT.Dom.hide('btn_Background');
+ doPost ('F1', 'btn_Background');
}
}
OAT.AJAX.POST('ajax.vsp', "a=load&sa=state&id="+progressID+urlParam("sid")+urlParam("realm"), x);
@@ -871,21 +914,12 @@ AB.setFOAFValue = function(fValue, fName) {
AB.aboutDialog = function() {
var aboutDiv = $('aboutDiv');
- if (aboutDiv) {
+ if (aboutDiv)
OAT.Dom.unlink(aboutDiv);
- }
- aboutDiv = OAT.Dom.create('div', {
- width : '430px',
- height: '170px',
- overflow: 'hidden'
- });
+
+ aboutDiv = OAT.Dom.create('div', {height: '160px', 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 1e0fd63..cd1ed83 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.1 2010/09/20 10:14:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/www/search.vspx b/appsrc/ODS-Addressbook/www/search.vspx
index 49a7422..bdf9b0c 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.11 2011/05/17 23:00:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -91,7 +91,7 @@
state := '00000';
sqlParams := vector();
- sql := AB.WA.search_sql (self.domain_id, self.account_id, self.account_rights, data, self.v_max);
+ sql := AB.WA.search_sql (self.domain_id, self.account_id, self.person_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 e8c6f15..32abe8d 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.3 2011/05/02 14:16:25 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/www/template/popup.vspx b/appsrc/ODS-Addressbook/www/template/popup.vspx
index 59f1787..83329c3 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.11 2011/07/04 10:04:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -68,6 +68,7 @@
<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>
@@ -82,6 +83,7 @@
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 148c510..b537975 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.16 2011/07/04 10:04:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -65,11 +65,6 @@
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>
@@ -155,6 +150,7 @@
<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>
@@ -169,6 +165,7 @@
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 2702bfe..4b940dd 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.10 2011/05/02 14:16:25 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -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.account_rights = 'W'">
+ <vm:if test="self.person_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>
@@ -221,7 +221,7 @@
<div id="FT" style="display: <?V case when get_keyword ('interface', C, '') = 'js' then 'none' else '' end ?>">
<div id="FT_L">
<a href="http://www.openlinksw.com/virtuoso">
- <img alt="Powered by OpenLink Virtuoso Universal Server" src="image/virt_power_no_border.png" border="0" />
+ <img alt="Powered by OpenLink Virtuoso Universal Server" src="/ods/images/virt_power_no_border.png" border="0" />
</a>
</div>
<div id="FT_R">
diff --git a/appsrc/ODS-Addressbook/xslt/rss2atom.xsl b/appsrc/ODS-Addressbook/xslt/rss2atom.xsl
index 641213c..2390919 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.2 2010/09/20 10:14:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl b/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl
index 2505311..bd79434 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.1 2010/09/20 10:14:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl b/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl
index 6556b06..a171837 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.1 2010/09/20 10:14:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl b/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl
index 59a9eeb..b78984a 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.1 2010/09/20 10:14:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/Makefile.am b/appsrc/ODS-Blog/Makefile.am
index e2d15e3..5961da2 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-2006 OpenLink Software
+# 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
@@ -44,6 +44,7 @@ clean-local:
-rm -rf vad
EXTRA_DIST = \
+ *.dox \
*.sql \
*.vsp \
*.vspx \
diff --git a/appsrc/ODS-Blog/Makefile.in b/appsrc/ODS-Blog/Makefile.in
index d0d0767..9224c72 100644
--- a/appsrc/ODS-Blog/Makefile.in
+++ b/appsrc/ODS-Blog/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -307,6 +287,7 @@ CLEANFILES = \
virtuoso.trx
EXTRA_DIST = \
+ *.dox \
*.sql \
*.vsp \
*.vspx \
@@ -373,14 +354,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Blog/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Blog/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Blog/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Blog/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -398,7 +379,6 @@ $(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
@@ -408,23 +388,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -448,17 +425,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -490,7 +463,6 @@ clean-generic:
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"
@@ -509,8 +481,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -519,28 +489,18 @@ 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
@@ -581,7 +541,6 @@ ods_blog_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Blog/ODS-Blog.dox b/appsrc/ODS-Blog/ODS-Blog.dox
new file mode 100644
index 0000000..5467c1c
--- /dev/null
+++ b/appsrc/ODS-Blog/ODS-Blog.dox
@@ -0,0 +1,3 @@
+/**
+\defgroup ods_module_weblog ODS Weblog
+*/
\ No newline at end of file
diff --git a/appsrc/ODS-Blog/atom_pub.sql b/appsrc/ODS-Blog/atom_pub.sql
index 2eaa139..aca61fb 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.1 2010/09/20 10:14:42 source Exp $
+-- $Id$
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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/x.atom+xml\r\nAuthorization: Basic %s', case when what = 0 then 'Content-Type' else 'Accept' end, b);
+ return sprintf ('%s: application/atom+xml\r\nAuthorization: Basic %s', case when what = 0 then 'Content-Type' else 'Accept' end, b);
}
else
{
- return sprintf ('%s: application/x.atom+xml', case when what = 0 then 'Content-Type' else 'Accept' end);
+ return sprintf ('%s: application/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 167c022..71a7944 100644
--- a/appsrc/ODS-Blog/blog.sql
+++ b/appsrc/ODS-Blog/blog.sql
@@ -1,12 +1,12 @@
--
--- $Id: blog.sql,v 1.20.2.7 2010/12/07 10:59:24 source Exp $
+-- $Id$
--
-- Blogger API support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -666,6 +666,7 @@ 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)
)')
;
@@ -884,7 +885,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 Procotol Table Structure:
+-- Routing Protocol Table Structure:
blog2_exec_no_error ('create table SYS_ROUTING_PROTOCOL
(
RP_ID int primary key,
diff --git a/appsrc/ODS-Blog/blog_api.sql b/appsrc/ODS-Blog/blog_api.sql
index ea529e0..3ee9ca9 100644
--- a/appsrc/ODS-Blog/blog_api.sql
+++ b/appsrc/ODS-Blog/blog_api.sql
@@ -598,5 +598,6 @@ grant execute on ODS.ODS_API."weblog.upstreaming.get" to ODS_API;
grant execute on ODS.ODS_API."weblog.upstreaming.remove" to ODS_API;
grant execute on ODS.ODS_API."weblog.tagging.set" to ODS_API;
grant execute on ODS.ODS_API."weblog.tagging.retag" to ODS_API;
+grant execute on DB.DBA.XML_URI_GET_STRING_OR_ENT to ODS_API;
use DB;
diff --git a/appsrc/ODS-Blog/conv.sql b/appsrc/ODS-Blog/conv.sql
index 1cc1bbc..8e782ae 100644
--- a/appsrc/ODS-Blog/conv.sql
+++ b/appsrc/ODS-Blog/conv.sql
@@ -1,10 +1,10 @@
--
--- $Id: conv.sql,v 1.4.2.1 2010/09/20 10:14:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/dav_browser.sql b/appsrc/ODS-Blog/dav_browser.sql
index 0d5a620..0a5cd33 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.1 2010/09/20 10:14:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/gdata.sql b/appsrc/ODS-Blog/gdata.sql
index 4765976..fde0e09 100644
--- a/appsrc/ODS-Blog/gdata.sql
+++ b/appsrc/ODS-Blog/gdata.sql
@@ -1,12 +1,12 @@
--
--- $Id: gdata.sql,v 1.4.2.1 2010/09/20 10:14:42 source Exp $
+-- $Id$
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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 9f71613..4917d80 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.1 2010/09/20 10:14:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/index.vspx b/appsrc/ODS-Blog/index.vspx
index ed4abd3..8ae9c83 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.1 2010/09/20 10:14:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/install.sql b/appsrc/ODS-Blog/install.sql
index 72f8670..4e76302 100644
--- a/appsrc/ODS-Blog/install.sql
+++ b/appsrc/ODS-Blog/install.sql
@@ -1,10 +1,10 @@
--
--- $Id: install.sql,v 1.25.2.8 2010/11/09 20:15:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/make_vad.sh b/appsrc/ODS-Blog/make_vad.sh
index 7bd3462..9559f77 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.10 2011/05/18 21:17:54 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -59,6 +59,7 @@ TEMPFILE=/tmp/isql.$$
LN="ln -fs"
RM="rm -f"
fi
+
VOS=0
if [ -f ../../autogen.sh ]
then
@@ -84,7 +85,7 @@ else
myrm=rm
fi
-VERSION_INIT()
+version_init()
{
if [ $VOS -eq 1 ]
then
@@ -281,7 +282,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-2011 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 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
@@ -462,7 +463,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
@@ -470,7 +471,6 @@ vad_create
virtuoso_shutdown
chmod 644 ods_blog_dav.vad
#chmod 644 virtuoso.trx
-directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -480,5 +480,7 @@ 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 a4586ef..c2729d3 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.1 2010/09/20 10:14:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/public/c_confirm.vspx b/appsrc/ODS-Blog/public/c_confirm.vspx
index 34727bd..449a4bf 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.1 2010/09/20 10:14:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/public/css/dav.css b/appsrc/ODS-Blog/public/css/dav.css
index 0ac3769..5a50594 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/public/css/default.css b/appsrc/ODS-Blog/public/css/default.css
index bdd10b3..d98f2a2 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/public/css/rte.css b/appsrc/ODS-Blog/public/css/rte.css
index 0dadda8..98c23b4 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/public/css/webdav.css b/appsrc/ODS-Blog/public/css/webdav.css
index df4618a..93bc072 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2007 OpenLink Software
+ * Copyright (C) 2005-2012 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 a645a2e..8efa7e5 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.1 2010/09/20 10:14:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/public/popup_browser.vspx b/appsrc/ODS-Blog/public/popup_browser.vspx
index cf48ffc..088dfdd 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.1 2010/09/20 10:14:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/public/r_unsubscribe.vspx b/appsrc/ODS-Blog/public/r_unsubscribe.vspx
index 76ca18a..086c619 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.1 2010/09/20 10:14:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/public/scripts/browserdetect.js b/appsrc/ODS-Blog/public/scripts/browserdetect.js
index d3b717a..2ab03c2 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/public/scripts/entry.js b/appsrc/ODS-Blog/public/scripts/entry.js
index 38a2bb8..349926c 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/public/scripts/form.js b/appsrc/ODS-Blog/public/scripts/form.js
index 985191f..dbccb2a 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/public/scripts/openid.js b/appsrc/ODS-Blog/public/scripts/openid.js
index 2bc7e9b..30dad93 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/public/scripts/plugins.js b/appsrc/ODS-Blog/public/scripts/plugins.js
index 934dd03..0f0205d 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/public/search.vspx b/appsrc/ODS-Blog/public/search.vspx
index 123203c..962070b 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.2 2010/09/20 10:14:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1285,7 +1285,9 @@
http ('<title>');
http_value (BLOG..blog_utf2wide(elm[2]));
http ('</title>');
- http (sprintf ('<link>http://%s', BLOG.DBA.BLOG_GET_HOST ()));
+ http ('<link>');
+ if (elm[1] not like '%://%')
+ http (sprintf ('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 d2e46a6..5b45597 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.1 2010/09/20 10:14:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/public/view_file.vspx b/appsrc/ODS-Blog/public/view_file.vspx
index 0e6300a..0d61b7c 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.1 2010/09/20 10:14:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/sioc_blog.sql b/appsrc/ODS-Blog/sioc_blog.sql
index a4f7882..5cea211 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.4 2011/05/18 21:17:54 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/template.sql b/appsrc/ODS-Blog/template.sql
index 9dcb8d7..f07774d 100644
--- a/appsrc/ODS-Blog/template.sql
+++ b/appsrc/ODS-Blog/template.sql
@@ -1,10 +1,10 @@
--
--- $Id: template.sql,v 1.4.2.1 2010/09/20 10:14:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/templates/atlantis/default.css b/appsrc/ODS-Blog/templates/atlantis/default.css
index 3734382..030f21e 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.1 2010/09/20 10:14:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/atlantis/index.vspx b/appsrc/ODS-Blog/templates/atlantis/index.vspx
index 0030e47..296f033 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.2 2010/09/20 10:14:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/autumn/default.css b/appsrc/ODS-Blog/templates/autumn/default.css
index 159215d..1868e47 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.2 2010/09/20 10:14:45 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/autumn/index.vspx b/appsrc/ODS-Blog/templates/autumn/index.vspx
index 76baed3..3cf50be 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.2 2010/09/20 10:14:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/blue_left/default.css b/appsrc/ODS-Blog/templates/blue_left/default.css
index e71a434..0702b6c 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.2 2010/09/20 10:14:45 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/blue_left/index.vspx b/appsrc/ODS-Blog/templates/blue_left/index.vspx
index c137b74..52dedbb 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.2 2010/09/20 10:14:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/archive.vspx b/appsrc/ODS-Blog/templates/columns_clean/archive.vspx
index 6fe7b69..2d85075 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.1 2010/09/20 10:14:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/default.css b/appsrc/ODS-Blog/templates/columns_clean/default.css
index de79bef..a4e0427 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.2 2010/09/20 10:14:45 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/index.vspx b/appsrc/ODS-Blog/templates/columns_clean/index.vspx
index ef1a0ac..49685a6 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.2 2010/09/20 10:14:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx b/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx
index 1260422..5c2b979 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.1 2010/09/20 10:14:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/summary.vspx b/appsrc/ODS-Blog/templates/columns_clean/summary.vspx
index 744e85f..c108330 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.1 2010/09/20 10:14:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/default/default.css b/appsrc/ODS-Blog/templates/default/default.css
index 41c6c5d..1f5ff14 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.2 2010/09/20 10:14:45 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/default/index.vspx b/appsrc/ODS-Blog/templates/default/index.vspx
index 6c6ac7c..dfbd203 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.2 2010/09/20 10:14:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/default/red.css b/appsrc/ODS-Blog/templates/default/red.css
index 0c1c97e..06a9084 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.2 2010/09/20 10:14:45 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx
index 19dbf9c..2283363 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.2 2010/09/22 13:56:49 source Exp $
+- $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
-- Copyright (C) 1998-2006 OpenLink Software
+- 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/default.css b/appsrc/ODS-Blog/templates/digital_bazaar/default.css
index a79512d..2ca5100 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.3 2010/09/22 13:56:49 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx
index 5ef5716..aab4977 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.4 2010/10/07 13:24:15 source Exp $
+- $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx
index c6794c6..890aad3 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.2 2010/09/27 14:45:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx
index 4761607..10a6035 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.2 2010/09/22 13:56:49 source Exp $
+- $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
-- Copyright (C) 1998-2006 OpenLink Software
+- 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
diff --git a/appsrc/ODS-Blog/templates/main.vspx b/appsrc/ODS-Blog/templates/main.vspx
index 46f2a92..c88d0aa 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.1 2010/09/20 10:14:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/micro/default.css b/appsrc/ODS-Blog/templates/micro/default.css
index f29b355..28829d3 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.2 2010/12/07 10:59:24 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/micro/index.vspx b/appsrc/ODS-Blog/templates/micro/index.vspx
index 8f85d8b..0aa8940 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.2 2010/12/07 10:59:24 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/modern/default.css b/appsrc/ODS-Blog/templates/modern/default.css
index 70376aa..41c6122 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.2 2010/09/20 10:14:45 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/modern/index.vspx b/appsrc/ODS-Blog/templates/modern/index.vspx
index 9b8a651..aca6e00 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.2 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/modern/red.css b/appsrc/ODS-Blog/templates/modern/red.css
index 2a9839f..149b4c8 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.2 2010/09/20 10:14:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx b/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx
index d536cde..6e99991 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.2 2010/09/22 13:56:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/default.css b/appsrc/ODS-Blog/templates/newspaper_view/default.css
index ff29242..af587b4 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.3 2010/09/22 13:56:49 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/index.vspx b/appsrc/ODS-Blog/templates/newspaper_view/index.vspx
index 752b6ae..b24670b 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.3 2010/09/22 13:56:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx b/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx
index 31b03dd..161176e 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.2 2010/09/27 14:45:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx b/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx
index 3f028ef..ffa1387 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.2 2010/09/22 13:56:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/about.vspx b/appsrc/ODS-Blog/templates/openlink/about.vspx
index a3907d5..09a2273 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/archive.vspx b/appsrc/ODS-Blog/templates/openlink/archive.vspx
index 332f3ee..5c7137f 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/bridge.vspx b/appsrc/ODS-Blog/templates/openlink/bridge.vspx
index 6f76089..c85e1a8 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/category.vspx b/appsrc/ODS-Blog/templates/openlink/category.vspx
index 4623ca3..590465b 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/channel_list.vspx b/appsrc/ODS-Blog/templates/openlink/channel_list.vspx
index a2fcb2a..5fd5863 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/channels.vspx b/appsrc/ODS-Blog/templates/openlink/channels.vspx
index ac8d7f8..100ed66 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx b/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx
index 9794126..78b98c6 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/comments.vspx b/appsrc/ODS-Blog/templates/openlink/comments.vspx
index 0ee2c8c..0ca4370 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/community.vspx b/appsrc/ODS-Blog/templates/openlink/community.vspx
index cac3f11..b2a91e3 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.1 2010/09/20 10:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/contacts.vspx b/appsrc/ODS-Blog/templates/openlink/contacts.vspx
index 0ad9454..fc488b7 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/default.css b/appsrc/ODS-Blog/templates/openlink/default.css
index 1320fe6..0ab034b 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.2 2010/09/20 10:14:47 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/openlink/edit.vspx b/appsrc/ODS-Blog/templates/openlink/edit.vspx
index 4564ff9..06cb0aa 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.2 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx b/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx
index 6e0d74f..b8c971c 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/edit_post.vspx b/appsrc/ODS-Blog/templates/openlink/edit_post.vspx
index 43e249f..777c89c 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx b/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx
index bacb7b0..f5562b3 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/errors.vspx b/appsrc/ODS-Blog/templates/openlink/errors.vspx
index 5f4f3c4..da12da2 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/feed_list.vspx b/appsrc/ODS-Blog/templates/openlink/feed_list.vspx
index f68cad2..3a29ec7 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/feed_view.vspx b/appsrc/ODS-Blog/templates/openlink/feed_view.vspx
index d1a812d..e722b09 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx b/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx
index b5b4cf5..fb477ec 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/get_tags.vspx b/appsrc/ODS-Blog/templates/openlink/get_tags.vspx
index 0a2a0e4..8b75f2e 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/import.vspx b/appsrc/ODS-Blog/templates/openlink/import.vspx
index 79e8611..0ef19ee 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.1 2010/09/20 10:14:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/index.vspx b/appsrc/ODS-Blog/templates/openlink/index.vspx
index c94cf8e..d8163c9 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.5 2010/09/27 14:45:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/linkblog.vspx b/appsrc/ODS-Blog/templates/openlink/linkblog.vspx
index 6eed82c..f896db2 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/list_comments.vspx b/appsrc/ODS-Blog/templates/openlink/list_comments.vspx
index d056a89..505aa61 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/login.vspx b/appsrc/ODS-Blog/templates/openlink/login.vspx
index 1ea5a5d..6ed302f 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/logout.vspx b/appsrc/ODS-Blog/templates/openlink/logout.vspx
index d57ed60..319ad5f 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/member_data.vspx b/appsrc/ODS-Blog/templates/openlink/member_data.vspx
index 4267f1d..8a39035 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/membership.vspx b/appsrc/ODS-Blog/templates/openlink/membership.vspx
index 68c65d9..79ba7cb 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx b/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx
index 4d36575..d93808b 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx b/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx
index bac7b61..df6230a 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx b/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx
index 8d370c0..069b909 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/ping.vspx b/appsrc/ODS-Blog/templates/openlink/ping.vspx
index 4776b24..3bef4e7 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx b/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx
index b50e03a..614eccd 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/posts.vspx b/appsrc/ODS-Blog/templates/openlink/posts.vspx
index c3d8915..58cca78 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/register.vspx b/appsrc/ODS-Blog/templates/openlink/register.vspx
index 734b500..5e5098a 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.1 2010/09/20 10:14:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx b/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx
index c181626..20da221 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.1 2010/09/20 10:14:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx b/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx
index c11be22..4d2cae3 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.1 2010/09/20 10:14:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx b/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx
index 5f06703..f2ce83f 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.1 2010/09/20 10:14:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/summary.vspx b/appsrc/ODS-Blog/templates/openlink/summary.vspx
index 5115582..1fc171a 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.1 2010/09/20 10:14:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/tags.vspx b/appsrc/ODS-Blog/templates/openlink/tags.vspx
index 0785aa7..2f10d43 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.1 2010/09/20 10:14:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/templates.vspx b/appsrc/ODS-Blog/templates/openlink/templates.vspx
index 63b8ab9..c30cd15 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.1 2010/09/20 10:14:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/wa.vspx b/appsrc/ODS-Blog/templates/openlink/wa.vspx
index 18ce034..4153ba5 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.1 2010/09/20 10:14:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/wa_left.vspx b/appsrc/ODS-Blog/templates/openlink/wa_left.vspx
index 5d74377..be9f83f 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.1 2010/09/20 10:14:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink/wa_right.vspx b/appsrc/ODS-Blog/templates/openlink/wa_right.vspx
index 7b266bc..cfd971d 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.1 2010/09/20 10:14:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/openlink_classic/default.css b/appsrc/ODS-Blog/templates/openlink_classic/default.css
index 2942fb6..ea8f903 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.1 2010/09/20 10:14:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/round_the_corner/default.css b/appsrc/ODS-Blog/templates/round_the_corner/default.css
index 15d91fd..d589846 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.2 2010/09/20 10:14:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/round_the_corner/index.vspx b/appsrc/ODS-Blog/templates/round_the_corner/index.vspx
index c8c5c3d..be8f8ad 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.2 2010/09/20 10:14:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/round_wheat/default.css b/appsrc/ODS-Blog/templates/round_wheat/default.css
index 00c74bb..b8fbf7a 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.2 2010/09/20 10:14:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/round_wheat/index.vspx b/appsrc/ODS-Blog/templates/round_wheat/index.vspx
index e588a7d..bc82ca5 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.2 2010/09/20 10:14:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/seattle/default.css b/appsrc/ODS-Blog/templates/seattle/default.css
index d1d2002..264a528 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.1 2010/09/20 10:14:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/seattle/index.vspx b/appsrc/ODS-Blog/templates/seattle/index.vspx
index c3929bb..36f1d3a 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.2 2010/09/20 10:14:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/spring/default.css b/appsrc/ODS-Blog/templates/spring/default.css
index 41da667..bb16dd9 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.1 2010/09/20 10:14:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/spring/index.vspx b/appsrc/ODS-Blog/templates/spring/index.vspx
index 1a22c18..9500964 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.2 2010/09/20 10:14:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx
index 830938e..7814852 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.1 2010/09/20 10:14:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/default.css b/appsrc/ODS-Blog/templates/squeaky_clean/default.css
index fa12836..49912c0 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.2 2010/09/20 10:14:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx
index 56d5b28..a119046 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.2 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx
index 5309bd0..1babe05 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.1 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 1053cfd..405b5c6 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.2 2010/09/20 10:14:51 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx
index 750c846..8306388 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.1 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx
index 669eff7..73b6f03 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.1 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css b/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css
index 7a512b1..1e58c0b 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.2 2010/09/20 10:14:51 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx
index 4e0ed4f..2e19aa9 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.2 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx
index b8fb4a4..50d8262 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.1 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 1053cfd..405b5c6 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.2 2010/09/20 10:14:51 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx
index 63df308..78f8e59 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.1 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/thin_clean/default.css b/appsrc/ODS-Blog/templates/thin_clean/default.css
index 9ad5c12..e49b27a 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.2 2010/09/20 10:14:51 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/thin_clean/index.vspx b/appsrc/ODS-Blog/templates/thin_clean/index.vspx
index c5470e4..ca64e7f 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.2 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/templates/thin_pastel/default.css b/appsrc/ODS-Blog/templates/thin_pastel/default.css
index 615b5ae..46a4397 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.2 2010/09/20 10:14:51 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Blog/templates/thin_pastel/index.vspx b/appsrc/ODS-Blog/templates/thin_pastel/index.vspx
index 5485074..4fa0806 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.2 2010/09/20 10:14:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/trackback.sql b/appsrc/ODS-Blog/trackback.sql
index feaa61b..eb70503 100644
--- a/appsrc/ODS-Blog/trackback.sql
+++ b/appsrc/ODS-Blog/trackback.sql
@@ -1,12 +1,12 @@
--
--- $Id: trackback.sql,v 1.5.2.1 2010/09/20 10:14:43 source Exp $
+-- $Id$
--
-- MT Trackback support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/uninst.sql b/appsrc/ODS-Blog/uninst.sql
index 4a4fdc9..8cc42dd 100644
--- a/appsrc/ODS-Blog/uninst.sql
+++ b/appsrc/ODS-Blog/uninst.sql
@@ -1,10 +1,10 @@
--
--- $Id: uninst.sql,v 1.5.2.2 2010/11/09 20:15:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/vad_version b/appsrc/ODS-Blog/vad_version
index 31c140b..28348f2 100644
--- a/appsrc/ODS-Blog/vad_version
+++ b/appsrc/ODS-Blog/vad_version
@@ -1 +1 @@
-1.34.72
+1.34.81
diff --git a/appsrc/ODS-Blog/wa_integration.sql b/appsrc/ODS-Blog/wa_integration.sql
index f2dbcce..10c1b1d 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.3 2010/10/07 13:24:15 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/wa_search_blog.sql b/appsrc/ODS-Blog/wa_search_blog.sql
index fdf3f90..675a787 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.1 2010/09/20 10:14:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Blog/widgets/blog_template_check.xsl b/appsrc/ODS-Blog/widgets/blog_template_check.xsl
index 534317d..4893f90 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.1 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/blog_tidy.xsl b/appsrc/ODS-Blog/widgets/blog_tidy.xsl
index d5b8ed1..67b9d7b 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.1 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/calendar.xsl b/appsrc/ODS-Blog/widgets/calendar.xsl
index 47433be..8192a13 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.9 2010/12/07 10:59:24 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -369,7 +369,8 @@
</v:before-render>
<v:before-data-bind>
<![CDATA[
- declare _editid, _cf_id, _ch_id, _subj, _msg, _from_preview_mode, params any;
+ declare _editid, _editbid, _cf_id, _ch_id, _subj, _msg, _from_preview_mode, params any;
+
params := self.vc_event.ve_params;
_editid := get_keyword('editid', params);
_cf_id := get_keyword('cf_id', params);
@@ -385,10 +386,12 @@
declare meta BLOG.DBA."MTWeblogPost";
self.text2 := null;
whenever not found goto endb;
- select blob_to_string (B_CONTENT), B_TITLE, B_COMMENTS_NO, B_META, B_STATE, B_TS
- into self.text2, self.mtit1.ufl_value, self.comments_no, meta, self.post_state, self.post_date
+ select blob_to_string (B_CONTENT), B_TITLE, B_COMMENTS_NO, B_META, B_STATE, B_TS, B_BLOG_ID
+ into self.text2, self.mtit1.ufl_value, self.comments_no, meta, self.post_state, self.post_date, _editbid
from BLOG.DBA.SYS_BLOGS
- where (BLOG2_GET_ACCESS (B_BLOG_ID, self.sid, self.realm, 120) in (1, 2)) and B_POST_ID = _editid;
+ where B_POST_ID = _editid;
+ if (not BLOG2_GET_ACCESS (_editbid, self.sid, self.realm, 120) in (1, 2))
+ goto endb;
self.editpost := _editid;
self.mtit1.ufl_value := BLOG..blog_utf2wide(self.mtit1.ufl_value);
if (meta is not null and meta.enclosure is not null)
diff --git a/appsrc/ODS-Blog/widgets/comment_check.xsl b/appsrc/ODS-Blog/widgets/comment_check.xsl
index 612bb25..49fd176 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.1 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/compat.xsl b/appsrc/ODS-Blog/widgets/compat.xsl
index 5d8708c..f6e47f3 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.2 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/dav_browser.xsl b/appsrc/ODS-Blog/widgets/dav_browser.xsl
index 798e2ec..8ff4662 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.1 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/error.xsl b/appsrc/ODS-Blog/widgets/error.xsl
index 51e5073..f51d4e5 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.1 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/foaf.xsl b/appsrc/ODS-Blog/widgets/foaf.xsl
index a37d6b9..2bde12b 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.1 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/main.xsl b/appsrc/ODS-Blog/widgets/main.xsl
index 41b7cfc..d06e90f 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.14 2011/08/01 14:12:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -653,6 +653,7 @@ 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 ();
@@ -1279,16 +1280,8 @@ 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 a688c7c..0d5efee 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.1 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/opml2ocs.xsl b/appsrc/ODS-Blog/widgets/opml2ocs.xsl
index 7eaa131..f4d71b8 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.1 2010/09/20 10:14:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/opml2ocs03.xsl b/appsrc/ODS-Blog/widgets/opml2ocs03.xsl
index 72ad9b8..236a40f 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/opml2xoxo.xsl b/appsrc/ODS-Blog/widgets/opml2xoxo.xsl
index db6c6ed..2fe67b5 100644
--- a/appsrc/ODS-Blog/widgets/opml2xoxo.xsl
+++ b/appsrc/ODS-Blog/widgets/opml2xoxo.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: opml2xoxo.xsl,v 1.1.2.1 2010/09/20 10:14:53 source Exp $ -->
+<!-- $Id$ -->
<!--
Copyright Uche Ogbuji 2005
-->
diff --git a/appsrc/ODS-Blog/widgets/render.xsl b/appsrc/ODS-Blog/widgets/render.xsl
index e10258c..5fe9153 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.2 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/rss11.xsl b/appsrc/ODS-Blog/widgets/rss11.xsl
index e0b5e43..92fed7c 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/rss2atom.xsl b/appsrc/ODS-Blog/widgets/rss2atom.xsl
index 9278af5..cca873e 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.4 2010/11/09 20:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/rss2atom03.xsl b/appsrc/ODS-Blog/widgets/rss2atom03.xsl
index da34dfb..f8a2229 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/rss2mrss.xsl b/appsrc/ODS-Blog/widgets/rss2mrss.xsl
index 4272176..191db5e 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/rss2rdf.xsl b/appsrc/ODS-Blog/widgets/rss2rdf.xsl
index 12e9541..079d5aa 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/rss2wml.xsl b/appsrc/ODS-Blog/widgets/rss2wml.xsl
index 582d481..c1d2609 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/rss2xbel.xsl b/appsrc/ODS-Blog/widgets/rss2xbel.xsl
index ea17d33..4fc1d71 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/store.xsl b/appsrc/ODS-Blog/widgets/store.xsl
index 0d27f75..810bf84 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/store_post.xsl b/appsrc/ODS-Blog/widgets/store_post.xsl
index 2dcf17c..84685b1 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Blog/widgets/xbel.xsl b/appsrc/ODS-Blog/widgets/xbel.xsl
index 0cee1ee..b1fd1f9 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.1 2010/09/20 10:14:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/Makefile.am b/appsrc/ODS-Bookmark/Makefile.am
index d67f527..ed67f19 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-2006 OpenLink Software
+# 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
@@ -44,8 +44,10 @@ clean-local:
-rm -rf vad
EXTRA_DIST = \
+ *.dox \
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 b2942be..fcdbfc5 100644
--- a/appsrc/ODS-Bookmark/Makefile.in
+++ b/appsrc/ODS-Bookmark/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -307,8 +287,10 @@ CLEANFILES = \
virtuoso.trx
EXTRA_DIST = \
+ *.dox \
make_vad.sh \
sql/*.sql \
+ vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
@@ -327,14 +309,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Bookmark/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Bookmark/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Bookmark/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Bookmark/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -352,7 +334,6 @@ $(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
@@ -362,23 +343,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -402,17 +380,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -444,7 +418,6 @@ clean-generic:
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"
@@ -463,8 +436,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -473,28 +444,18 @@ 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
@@ -535,7 +496,6 @@ ods_bookmark_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Bookmark/ODS-Bookmark.dox b/appsrc/ODS-Bookmark/ODS-Bookmark.dox
new file mode 100644
index 0000000..44663ed
--- /dev/null
+++ b/appsrc/ODS-Bookmark/ODS-Bookmark.dox
@@ -0,0 +1,3 @@
+/**
+\defgroup ods_module_bookmark ODS Bookmarks
+*/
\ No newline at end of file
diff --git a/appsrc/ODS-Bookmark/make_vad.sh b/appsrc/ODS-Bookmark/make_vad.sh
index 49776d0..fa6b1e7 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.27 2011/07/04 10:04:01 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -30,7 +30,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.7.98"
+VERSION="1.0.0"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -63,11 +63,6 @@ else
LN="ln -fs"
RM="rm -f"
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
if [ "z$SERVER" = "z" ]
then
@@ -91,6 +86,57 @@ 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
@@ -226,7 +272,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-2011 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
@@ -238,8 +284,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.82.42\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.86.16\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2012-04-18 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -380,6 +426,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
+version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -396,7 +443,6 @@ 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"
@@ -406,5 +452,7 @@ 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 ae5aba3..6f364dc 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.1 2010/09/20 10:14:54 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-api.sql b/appsrc/ODS-Bookmark/sql/bmk-a-api.sql
index ce34d91..9584236 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.5 2011/06/09 17:43:16 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-code.sql b/appsrc/ODS-Bookmark/sql/bmk-a-code.sql
index 963c431..01ddcc3 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.20 2011/08/01 14:12:15 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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', account_rights
+ 'account_rights', BMK.WA.account_rights (domain_id, account_id),
+ 'person_rights', BMK.WA.person_rights (domain_id, account_id)
);
}
;
@@ -219,7 +219,7 @@ create procedure BMK.WA.check_grants (in role_name varchar, in page_name varchar
-------------------------------------------------------------------------------
--
-create procedure BMK.WA.access_rights (
+create procedure BMK.WA.person_rights (
in domain_id integer,
in account_id integer)
{
@@ -288,6 +288,65 @@ create procedure BMK.WA.access_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;
@@ -1163,7 +1222,7 @@ create procedure BMK.WA.bookmark_import_atom (
{
D := '<div>';
foreach (any content in contents) do
- D := concat(D, ENEWS.WA.xml2string(content));
+ D := concat(D, BMK.WA.xml2string(content));
D := concat(D, '</div>');
}
@@ -1324,16 +1383,19 @@ create procedure BMK.WA.bookmark_export_tmp (
create procedure BMK.WA.bookmark_rights (
in domain_id integer,
in id integer,
- in access_role varchar)
+ in account_rights varchar,
+ in person_rights 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 (isnull (person_rights) or (account_rights < person_rights))
retValue := BMK.WA.acl_check (domain_id, id);
+
if (retValue = '')
- retValue := access_role;
+ retValue := account_rights;
}
return retValue;
}
@@ -1423,16 +1485,17 @@ create procedure BMK.WA.folder_id(
declare aPath any;
folder_id := null;
- if (not is_empty_or_null(folder_name))
+ if (not is_empty_or_null (trim (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 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);
+ 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);
}
else
{
@@ -1449,9 +1512,9 @@ create procedure BMK.WA.folder_id(
-------------------------------------------------------------------------------
--
create procedure BMK.WA.folder_create(
- inout domain_id varchar,
- in folder_name any,
- in folder_id any)
+ inout domain_id integer,
+ in folder_name varchar,
+ in folder_id integer)
{
folder_name := trim(folder_name);
if (folder_name <> '')
@@ -1470,8 +1533,8 @@ create procedure BMK.WA.folder_create(
-------------------------------------------------------------------------------
--
create procedure BMK.WA.folder_create2(
- in domain_id varchar,
- in parent_id varchar,
+ in domain_id integer,
+ in parent_id integer,
in folder_name any)
{
declare folder_id integer;
@@ -1686,7 +1749,8 @@ create procedure BMK.WA.sfolder_sql(
in maxRows varchar := '',
in nodeType varchar := 'b')
{
- declare S, T, tmp, where2, delimiter2 varchar;
+ declare tmp any;
+ declare S, T, where2, delimiter2 varchar;
where2 := ' \n ';
delimiter2 := '\n and ';
@@ -3207,10 +3271,9 @@ create procedure BMK.WA.xtree_doc (
create procedure BMK.WA.xml_set(
in id varchar,
inout pXml varchar,
- in value varchar)
+ in value any)
{
declare aEntity any;
-
{
declare exit handler for SQLSTATE '*' {
pXml := xtree_doc('<?xml version="1.0" encoding="UTF-8"?><settings />');
@@ -3379,6 +3442,18 @@ 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)
@@ -3915,7 +3990,7 @@ create procedure BMK.WA.dt_user2gmt(
--
create procedure BMK.WA.dt_value(
in pDate datetime,
- in pUser datetime := null)
+ in pUser varchar := null)
{
if (isnull(pDate))
return pDate;
@@ -4015,21 +4090,23 @@ 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)));
}
;
@@ -4038,16 +4115,16 @@ create procedure BMK.WA.dt_deformat(
--
create procedure BMK.WA.dt_deformat_tmp(
in S varchar,
- inout N varchar)
+ inout N integer)
{
- declare
- V any;
+ declare V any;
V := regexp_parse('[0-9]+', S, N);
- if (length(V) > 1) {
- N := aref(V,1);
- return atoi(subseq(S, aref(V, 0), aref(V,1)));
- };
+ if (length(V) > 1)
+ {
+ N := V[1];
+ return atoi (subseq (S, V[0], V[1]));
+ }
N := N + 1;
return 0;
}
@@ -4061,7 +4138,8 @@ create procedure BMK.WA.dt_reformat(
in pOutFormat varchar := 'm.d.Y')
{
return BMK.WA.dt_format(BMK.WA.dt_deformat(pString, pInFormat), pOutFormat);
-};
+}
+;
-----------------------------------------------------------------------------------------
--
@@ -4115,9 +4193,10 @@ create procedure BMK.WA.data (
create procedure BMK.WA.test_clear (
in S any)
{
- declare N integer;
+ S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
+ S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
- return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
+ return S;
}
;
@@ -4128,8 +4207,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')
@@ -4183,7 +4262,7 @@ create procedure BMK.WA.test (
return value;
}
- value := OMAIL.WA.validate2 (valueClass, cast (value as varchar));
+ value := BMK.WA.validate2 (valueClass, cast (value as varchar));
if (valueType = 'integer')
{
tmp := get_keyword('minValue', params);
@@ -5117,63 +5196,3 @@ 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 a1c502c..77e7058 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.1 2010/09/20 10:14:54 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-table.sql b/appsrc/ODS-Bookmark/sql/bmk-a-table.sql
index 18eac17..b08a9d9 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.3 2011/05/20 16:24:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -694,17 +694,17 @@ BMK.WA.exec_no_error ('
--
create procedure BMK.WA.drop_index ()
{
- if (registry_get ('bmk_index_version') = '2')
+ if (registry_get ('bmk_index_version') = '3')
return;
BMK.WA.exec_no_error ('drop table BMK.WA.BOOKMARK_DOMAIN_BD_DESCRIPTION_WORDS');
- registry_set ('bmk_index_version', '2');
+ registry_set ('bmk_index_version', '3');
}
;
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
+ 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\'
');
-------------------------------------------------------------------------------
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-update.sql b/appsrc/ODS-Bookmark/sql/bmk-a-update.sql
index 2803c8e..612948e 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.3 2010/10/07 13:24:04 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql b/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql
index 7eb0e25..02a5aba 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.6 2011/05/17 22:59:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-d.sql b/appsrc/ODS-Bookmark/sql/bmk-d.sql
index 0f47353..0292edf 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.7 2011/05/20 16:24:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -22,7 +22,6 @@
------------------------------------------------------------------------------
-- 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 525174f..8dececc 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.11 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -111,6 +111,7 @@ 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
@@ -120,7 +121,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_TYPE_NAME, WAI_NAME, WAI_ACL);
+ SIOC..wa_instance_acl_insert (WAI_IS_PUBLIC, 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
@@ -165,7 +166,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 (null, coalesce (_access_mode, WAI_IS_PUBLIC), bookmark_iri);
+ graph_iri := SIOC..get_graph_new (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);
@@ -222,7 +223,7 @@ create procedure fill_ods_bookmark_services ()
-------------------------------------------------------------------------------
--
-create procedure clean_ods_bookmark_sioc2 (
+create procedure clean_ods_bookmark_sioc (
in _wai_name varchar := null,
in _access_mode integer := null)
{
@@ -260,9 +261,9 @@ create procedure clean_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 (WAI_ID, coalesce (_access_mode, WAI_IS_PUBLIC), bookmark_iri);
+ graph_iri := SIOC..get_graph_new (coalesce (_access_mode, WAI_IS_PUBLIC), bookmark_iri);
- bookmark_domain_delete (graph_iri, BD_DOMAIN_ID, BD_ID);
+ SIOC..bookmark_domain_delete (graph_iri, BD_DOMAIN_ID, BD_ID);
cnt := cnt + 1;
if (mod (cnt, 500) = 0)
@@ -315,7 +316,7 @@ create procedure bookmark_domain_insert (
and WAM_INST = WAI_NAME
and U_ID = WAM_USER) do
{
- graph_iri := SIOC..get_graph_new (WAI_ID, WAI_IS_PUBLIC, bookmark_iri);
+ graph_iri := SIOC..get_graph_new (WAI_IS_PUBLIC, bookmark_iri);
forum_iri := SIOC..bmk_iri (WAI_NAME);
creator_iri := SIOC..user_iri (WAM_USER);
@@ -355,7 +356,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 (domain_id, null, bookmark_iri);
+ graph_iri := SIOC..get_graph_new (BMK.WA.domain_is_public (domain_id), bookmark_iri);
if (isnull (graph_iri))
return;
}
@@ -588,7 +589,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 (domain_id, null, master_iri);
+ graph_iri := get_graph_new (BMK.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
}
@@ -629,7 +630,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 (domain_id, null, master_iri);
+ graph_iri := SIOC..get_graph_new (BMK.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
}
@@ -774,7 +775,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 (domain_id, null, master_iri);
+ graph_iri := get_graph_new (BMK.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
}
@@ -811,7 +812,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 (domain_id, null, master_iri);
+ graph_iri := SIOC..get_graph_new (BMK.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
}
diff --git a/appsrc/ODS-Bookmark/vad_version b/appsrc/ODS-Bookmark/vad_version
new file mode 100644
index 0000000..c56d7da
--- /dev/null
+++ b/appsrc/ODS-Bookmark/vad_version
@@ -0,0 +1 @@
+1.12.51
diff --git a/appsrc/ODS-Bookmark/www/ajax.vsp b/appsrc/ODS-Bookmark/www/ajax.vsp
index 66606f6..0438a99 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.7 2011/05/02 14:16:25 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -21,14 +21,13 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
- declare N, M, id, _domain_id, _account_id integer;
+ declare N, M, _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, '');
@@ -38,6 +37,9 @@
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')
@@ -150,7 +152,7 @@
}
http_rewrite ();
http_header ('Content-Type: text/plain\r\n');
- http (BMK.WA.obj2json(returnData, 3));
+ http (ODS..obj2json (returnData, 5));
}
else if (action = 'tags')
{
@@ -204,7 +206,7 @@
tmp := split_and_decode (trim (params[N+1]), 0, '\0\0,');
for (M := 0; M < length (tmp); M := M + 1)
{
- if (ODRIVE.WA.odrive_user_id (trim (tmp[M])) <> -1)
+ if (not isnull (BMK.WA.account_id (trim (tmp[M]))))
grants := grants || ',' || tmp[M];
}
}
@@ -221,7 +223,7 @@
tmp := BMK.WA.tags2vector (tags);
tmp := BMK.WA.vector_unique (tmp);
tags := BMK.WA.vector2tags (tmp);
- acl := serialize (DB.DBA.wa_acl_params (params));
+ acl := serialize (DB.DBA.wa_aci_params (params));
folder_id := BMK.WA.folder_create (_domain_id, folder_name, folder_id);
id := BMK.WA.bookmark_update (id, _domain_id, uri, name, description, tags, folder_id, null, acl);
BMK.WA.shareNode (_account_id, BMK.WA.make_node ('b', id), grants, 1);
@@ -413,7 +415,7 @@
_formExit:;
http_rewrite ();
http_header ('Content-Type: text/plain\r\n');
- http (BMK.WA.obj2json(returnData));
+ http (ODS..obj2json(returnData, 5));
}
else if (action = 'about')
{
diff --git a/appsrc/ODS-Bookmark/www/annotea.vspx b/appsrc/ODS-Bookmark/www/annotea.vspx
index a42887c..897afe9 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.7 2011/07/04 10:04:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/www/bmk_login.vspx b/appsrc/ODS-Bookmark/www/bmk_login.vspx
index ea98db6..be10dda 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.4 2010/10/07 13:24:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -34,7 +34,7 @@
if (page_name = 'error.vspx')
return;
- if (isnull (self.account_rights) and not is_empty_or_null (self.sid))
+ if (isnull (self.person_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.account_rights, page_name))
+ if (BMK.WA.check_grants (self.person_rights, page_name))
return;
- if (isnull (self.account_rights))
+ if (isnull (self.person_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 125e207..c20dac8 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.6 2011/05/17 22:59:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -65,7 +65,7 @@
self.tbLabels := cast (get_keyword ('tbLabels', self.settings, '1') as integer);
self.bNodeAction := '';
- if ((get_keyword ('URI', params, '') <> '') and (self.account_rights = 'W'))
+ if ((get_keyword ('URI', params, '') <> '') and (self.person_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.account_rights <> 'W') or (grant_id >= 0))
+ if ((self.person_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.account_rights = 'W'))
+ else if ((get_keyword ('action', params, '') = 'Smart Folder/Create') and (self.person_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.account_rights = 'W'">
+ <vm:if test="self.person_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 3b79f58..0a21896 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.3 2011/05/02 14:16:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/www/css/style.css b/appsrc/ODS-Bookmark/www/css/style.css
index 8acb610..ddfd469 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.11 2011/05/17 22:59:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -27,11 +27,23 @@ 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,43 +94,6 @@ 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%;
@@ -129,6 +104,7 @@ a:hover, .link:hover
font-size: 12px;
background-color: #EFEFEF;
border: 1px solid #7f94a5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
padding: 5px;
@@ -382,6 +358,7 @@ input.button {
border: solid 1px;
border-color: #7f94a5;
background: #99b3c5;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
@@ -600,6 +577,8 @@ div.tab {
border: 1px solid #000;
border-bottom-width: 0px;
border-color: #7f94a5;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
@@ -736,6 +715,7 @@ font-weight:normal !important;
span.button {
background: none repeat scroll 0 0 #99B3C5;
border: 1px solid #7F94A5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #FFFFFF;
diff --git a/appsrc/ODS-Bookmark/www/error.vspx b/appsrc/ODS-Bookmark/www/error.vspx
index c209c44..052465d 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.2 2010/09/20 10:14:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/www/export.vspx b/appsrc/ODS-Bookmark/www/export.vspx
index c10a1d6..f5e2ebb 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.3 2010/09/20 10:14:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/www/forms.vspx b/appsrc/ODS-Bookmark/www/forms.vspx
index 4a26af8..8539705 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.18 2011/07/04 10:04:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -39,7 +39,7 @@
]]>
</v:method>
- <v:method name="shareSelect" arglist="in node varchar">
+ <v:method name="shareSelect" arglist="in node any">
<![CDATA[
declare grants any;
@@ -55,7 +55,7 @@
if (lcase (BMK.WA.node_type (node)) <> 'b')
return 'visited';
- if (self.account_rights <> 'W')
+ if (self.person_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="varchar" default="'0'"/>
+ <v:variable name="v_folder_id" type="integer" 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.account_rights = 'W') and (not (((node_type = 's') and (node_id = -1)) or (node_type = 'u') or (node_type = 'F'))))
+ if ((self.person_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.account_rights, data);
+ tmp := BMK.WA.sfolder_sql (self.domain_id, self.account_id, self.person_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.account_rights);
+ control.add_parameter (self.person_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.account_rights, data);
+ sql := BMK.WA.sfolder_sql (self.domain_id, self.account_id, self.person_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.account_rights;
+ permissions := self.person_rights;
if (node_type = 'b')
- permissions := BMK.WA.bookmark_rights (self.domain_id, node_id, self.account_rights);
+ permissions := BMK.WA.bookmark_rights (self.domain_id, node_id, self.person_rights, self.account_rights);
?>
<td class="checkbox">
@@ -1044,7 +1044,7 @@
<v:on-post>
<![CDATA[
-- check / create folder
- self.v_folder_id := self.i_folder_id.ufl_value;
+ self.v_folder_id := cast (self.i_folder_id.ufl_value as integer);
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');"/><xsl:call-template name="nbsp"/><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');"/> <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');"/><xsl:call-template name="nbsp"/><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');"/> <label for="e_format_1">XBEL</label>
</td>
</tr>
<tr>
@@ -1406,35 +1406,23 @@
<th class="action">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no"><td colspan="4"><b>No Shares</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
- declare N, L integer;
- declare acl, aType, aAccess any;
+ declare acl any;
- L := 0;
acl := (select WAI_ACL from DB.DBA.WA_INSTANCE where WAI_ID = self.domain_id);
acl := case when isnull (acl) then vector () else deserialize (acl) end;
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
+ DB.DBA.wa_aci_lines (acl);
+
acl := deserialize (self.v_acl);
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- if (self.v_form <> 'Bookmark/View')
- {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", value: "%s", readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', acl[N][2], acl[N][1], case when acl[N][2] = 'public' then 'true' else 'false' end, case when acl[N][2] = 'public' then 'display: none;' else '' end, acl[N][3], acl[N][4], acl[N][5]));
- } else {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
- }
+ DB.DBA.wa_aci_lines (acl, case when self.v_form = 'Bookmark/View' then 'view' else '' end);
?>
</script>
]]>
- <tr id="s_tr_no" style="display: <?V case when L=0 then '' else 'none' end ?>;"><td colspan="<?V case when self.v_form='Bookmark/View' then 3 else 4 end ?>"><b>No Shares</b></td></tr>
+ </tbody>
</table>
</td>
<vm:if test="self.v_form <> 'Bookmark/View'">
diff --git a/appsrc/ODS-Bookmark/www/gems.vsp b/appsrc/ODS-Bookmark/www/gems.vsp
index 8055702..82b8034 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.3 2010/10/07 13:24:04 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Bookmark/www/image/virtuosologo.jpg b/appsrc/ODS-Bookmark/www/image/virtuosologo.jpg
deleted file mode 100644
index 8f15047..0000000
Binary files a/appsrc/ODS-Bookmark/www/image/virtuosologo.jpg and /dev/null differ
diff --git a/appsrc/ODS-Bookmark/www/js/bookmark.js b/appsrc/ODS-Bookmark/www/js/bookmark.js
index df2dcf3..8b31d73 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.15 2011/06/09 17:43:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -677,7 +677,8 @@ function checkState()
setTimeout("checkState()", 500);
} else {
progressTimer = null;
- $('btn_Stop').click();
+ $('btn_Stop').value = 'Close';
+ OAT.Dom.hide('btn_Background');
}
}
OAT.AJAX.POST('ajax.vsp', "a=load&sa=state&id="+progressID+urlParam("sid")+urlParam("realm"), x);
@@ -751,12 +752,17 @@ function readBookmark (id)
OAT.AJAX.POST ('ajax.vsp', "sid="+sid+"&realm="+realm+"&id="+id+"&a=visited", function(){}, {onstart:function(){}, onerror:function(){}});
}
-function davBrowse (fld)
-{
+function davBrowse(fld, folders) {
+ /* 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;}
};
+ if (!folders) {folders = false;}
+ OAT.WebDav.options.foldersOnly = folders;
OAT.WebDav.open(options);
}
@@ -1293,7 +1299,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(nodePath)+BMK.sessionParams();
+ var URL = 'forms.vspx?sa=browse&node='+encodeURIComponent(nodeID)+'&path='+encodeURIComponent('/'+BMK.trim(nodePath, '/'))+BMK.sessionParams();
var v = $('nodeItem');
if (v && (v.value != '')) {
URL += '&item=' + v.value;
@@ -1426,12 +1432,10 @@ BMK.formPostAfter = function (action)
BMK.aboutDialog = function ()
{
var aboutDiv = $('aboutDiv');
- if (aboutDiv) {OAT.Dom.unlink(aboutDiv);}
- aboutDiv = OAT.Dom.create('div', {
- width:'430px',
- height: '170px',
- overflow: 'hidden'
- });
+ if (aboutDiv)
+ OAT.Dom.unlink(aboutDiv);
+
+ aboutDiv = OAT.Dom.create('div', {height: '160px', 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 f6d68a6..cd1ed83 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.1 2010/09/20 10:14:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/www/search.vspx b/appsrc/ODS-Bookmark/www/search.vspx
index 2d159fc..93e5411 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.12 2011/05/02 14:16:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -138,7 +138,7 @@
if (maxRows <> '')
maxRows := 'TOP ' || maxRows;
sql := replace(sql, '<MAX>', maxRows);
- sqlParams := vector (self.domain_id, self.account_id, self.account_rights, data, self.v_max);
+ sqlParams := vector (self.domain_id, self.account_id, self.person_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.account_rights = 'W' then 1 else 0 end" xhtml_class="form-button">
+ <v:button action="simple" value="Save" enabled="-- case when self.person_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 46c1018..87803f2 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.10 2011/05/17 22:59:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -90,11 +90,11 @@
<tr>
<td id="LC">
<div class="lc lc_close">
- <vm:if test="self.account_rights = 'W'">
+ <vm:if test="self.person_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.account_rights = 'W'">
+ <vm:if test="self.person_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,12 +424,13 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Clear" xhtml_class="form-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: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 d50feb8..fdc5d7f 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.3 2011/05/02 14:16:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/www/template/popup.vspx b/appsrc/ODS-Bookmark/www/template/popup.vspx
index 821a860..ea603e7 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.9 2011/07/04 10:04:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -83,6 +83,7 @@
<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>
@@ -96,7 +97,8 @@
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.account_rights := get_keyword ('account_rights', aSessInfo);
+ self.person_rights := get_keyword ('person_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 c8a5bc6..ec6e519 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.15 2011/07/04 10:04:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -66,11 +66,6 @@
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>
@@ -116,6 +111,7 @@
<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>
@@ -124,12 +120,13 @@
set http_charset = 'utf-8';
-- Initialize variables
- declare sessionData any;
+ declare aSessInfo any;
- 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, '');
+ 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.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 903f6c7..231f634 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.7 2011/05/02 14:16:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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.account_rights = 'W'">
+ <vm:if test="self.person_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>
@@ -203,7 +203,7 @@
<div id="FT" style="display: <?V case when get_keyword ('interface', C, '') = 'js' then 'none' else '' end ?>">
<div id="FT_L">
<a href="http://www.openlinksw.com/virtuoso">
- <img alt="Powered by OpenLink Virtuoso Universal Server" src="image/virt_power_no_border.png" border="0" />
+ <img alt="Powered by OpenLink Virtuoso Universal Server" src="/ods/images/virt_power_no_border.png" border="0" />
</a>
</div>
<div id="FT_R">
diff --git a/appsrc/ODS-Bookmark/xslt/Netscape.xsl b/appsrc/ODS-Bookmark/xslt/Netscape.xsl
index d7cf727..bdc801f 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.1 2010/09/20 10:14:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/xslt/XBEL.xsl b/appsrc/ODS-Bookmark/xslt/XBEL.xsl
index b4b5f39..78e249d 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.1 2010/09/20 10:14:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/xslt/rss2atom.xsl b/appsrc/ODS-Bookmark/xslt/rss2atom.xsl
index a8f5bee..2390919 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.2 2010/09/20 10:14:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl b/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl
index 53f03df..bd79434 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.1 2010/09/20 10:14:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl b/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl
index 032e4d8..5276e3b 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.1 2010/09/20 10:14:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl b/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl
index 3ac603e..4fc1d71 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.1 2010/09/20 10:14:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/Makefile.am b/appsrc/ODS-Briefcase/Makefile.am
index 5ea20c0..538470d 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-2006 OpenLink Software
+# 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
@@ -44,9 +44,11 @@ clean-local:
-rm -rf vad
EXTRA_DIST = \
+ *.dox \
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 74dab77..3dee93e 100644
--- a/appsrc/ODS-Briefcase/Makefile.in
+++ b/appsrc/ODS-Briefcase/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -307,9 +287,11 @@ CLEANFILES = \
virtuoso.trx
EXTRA_DIST = \
+ *.dox \
make_vad.sh \
new/*.sql \
schemas/*.rdf \
+ vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
@@ -330,14 +312,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Briefcase/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Briefcase/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Briefcase/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Briefcase/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -355,7 +337,6 @@ $(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
@@ -365,23 +346,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -405,17 +383,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -447,7 +421,6 @@ clean-generic:
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"
@@ -466,8 +439,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -476,28 +447,18 @@ 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
@@ -538,7 +499,6 @@ ods_briefcase_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Briefcase/ODS-Briefcase.dox b/appsrc/ODS-Briefcase/ODS-Briefcase.dox
new file mode 100644
index 0000000..67d9bdf
--- /dev/null
+++ b/appsrc/ODS-Briefcase/ODS-Briefcase.dox
@@ -0,0 +1,74 @@
+/**
+\defgroup ods_module_briefcase ODS Briefcase (WebDAV File Management) API
+
+The ODS Briefcase is a WebDAV-compliant platform that offers file-sharing functionality via a "Briefcase Data Space".
+Its standards-compliance enables the exploitation of File Server functionality via the following methods:
+
+- Web Browser-based interactions
+- Web Services - direct use of the HTTP based WebDAV protocol
+- Semantic Web's SPARQL Query Language - all WebDAV resources are exposed as SIOC Ontology instance data (RDF Data Sets)
+
+\section ods_briefcase_features Key Features
+
+- Automatic Metadata Management - ODS automatically extracts file metadata from a wide array of file formats at file
+ upload time. The metadata is available in two forms:
+ - Pure WebDAV and
+ - RDF-XML or N3/Turtle, optionally synchronized with the underlying Virtuoso Triple Store.
+- Automatic metadata-extraction from many known file types - MS Office, Open Office, Open Document Format, Content
+ Syndication Formats (RSS 1.0, RSS 2.0, Atom, OPML, OCS), (X)HTML, Web Services Contract Files (BPEL, WSDL), XBRL,
+ XBEL, FOAF, iCalendar, hCalendar, vCARD, Google Base Items, and other formats.
+- Powerful Full-Text Search - including WebDAV metadata, physical properties such as path, filename, content words,
+ individual and group ownership, mime type, date range, and tags
+- Flexible Data Access - all Briefcase data is accessible via SPARQL, GData, and Briefcase Service-specific Web Services
+- Open Data Access - transparent integration with any WebDAV-compliant environment, e.g., Mac OS X Finder, Windows
+ Network Places, Linux DAV Mount, and others
+- Security - UNIX-like file-permission system or Access Control Lists (ACLs)
+- Unified Storage - a central storage and access point for all ODS application data
+- Virtual WebDAV Resources - even when the actual data in question isn't a physical WebDAV resource it can still be
+ viewed in the Briefcase via Virtual WebDAV VIEWs
+- Smart Folders for custom association of resource types with virtual folders. For example, you can navigate to, or
+ enter, the path DAV/home/[username]/Items/Graphics/Type/JPEG to list all the graphic images that are of type JPEG for
+ a given user.
+- Resource tagging - enabling the categorization of content by user-defined tags. These tags are also usable within
+ Free Text Searches of Briefcase content
+- Shared Folders View - shows all collections and resources to which the user has been granted access
+- Version Control - Versioning can be enabled for any resource using any client supporting the DeltaV core feature set.
+ Historical versions of resources will appear in a separate virtual folder. DeltaV core WebDAV methods are supported
+ for resources for which versioning has been enabled.
+
+
+\section ods_briefcase_version_control File Version Control in ODS Briefcase
+
+FIXME: document how that works from a RESTful point of view.
+
+\section ods_briefcase_resource_permissions Resource Permissions
+
+Several Briefcase methods such as briefcase.resource.store() or briefcase.collection.create() allow to specify permissions.
+The permissions are encoded as a string which consists of a 9-bit-mask mapping to standard UNIX file permissions
+
+- read, write, and execute for the owner
+- read, write, and execute for the group
+- read, write, and execute for everyone else
+
+and two additional flags indicating that indicate whether resources should be indexed for free-text search and whether
+they should be parsed to extract metadata:
+
+- Free-Text indexing:
+ - \p 'N' will disable free-text indexing.
+ - \p 'T' will enable free-text indexing for a resource or a collection's direct children.
+ - \p 'R' will enable free-text indexing recursively.
+- Metadata extraction:
+ - \p 'N' will disable metadata extraction.
+ - \p 'M' will enable metadata extraction for a resource or a collection's direct children.
+ - \p 'R' will enable metadata extraction recursively.
+
+Thus, a permissions string \p '111110100RM' maps to UNIX permissions \p 'rwxrw-r--' and enables recursive full-text indexing
+and non-recursive metadata extraction.
+
+For more details see <a href="http://docs.openlinksw.com/virtuoso/webdavserver.html#accesspermofwebres">Access Right
+Permissions of Web Resources</a> in the Virtuoso server documentation.
+
+\subsection ods_permissions_acl ODS Access Control Lists (ACL)
+
+FIXME: explain how that works in ODS including WebID and so on.
+*/
diff --git a/appsrc/ODS-Briefcase/make_vad.sh b/appsrc/ODS-Briefcase/make_vad.sh
index 1fec14c..89e01ea 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.42 2011/08/01 14:14:42 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -30,7 +30,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.3.311"
+VERSION="1.0.0"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -63,16 +63,6 @@ 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
@@ -107,6 +97,57 @@ 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
@@ -242,7 +283,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-2011 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
@@ -254,8 +295,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.82.62\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-07-12 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.86.16\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2012-04-18 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -293,6 +334,11 @@ sticker_init() {
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/oDrive/new/od-a-ods.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/oDrive/new/od-a-update.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/oDrive/new/sioc_briefcase.sql', 1, 'report', $ISDAV);" >> $STICKER
+ echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/oDrive/new/DET_GDrive.sql', 1, 'report', $ISDAV);" >> $STICKER
+ echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/oDrive/new/DET_Dropbox.sql', 1, 'report', $ISDAV);" >> $STICKER
+ echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/oDrive/new/DET_SkyDrive.sql', 1, 'report', $ISDAV);" >> $STICKER
+ echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/oDrive/new/DET_Box.sql', 1, 'report', $ISDAV);" >> $STICKER
+ echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/oDrive/new/DET_WebDAV.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " ]]>" >> $STICKER
echo " </sql>" >> $STICKER
echo " <sql purpose=\"pre-uninstall\">" >> $STICKER
@@ -402,6 +448,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
+version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -427,6 +474,7 @@ then
$myrm -f *.vad
exit 1
fi
+
directory_clean
BANNER "COMPLETED VAD PACKAGING"
diff --git a/appsrc/ODS-Briefcase/new/DET_Box.sql b/appsrc/ODS-Briefcase/new/DET_Box.sql
new file mode 100644
index 0000000..e595f13
--- /dev/null
+++ b/appsrc/ODS-Briefcase/new/DET_Box.sql
@@ -0,0 +1,1611 @@
+--
+-- $Id: DET_Box.sql,v 1.2 2012/06/13 13:49:48 ddimitrov 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 "Box_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 ('Box_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE (id[2], what, req, auth_uname, auth_pwd, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "Box_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 ('Box_DAV_AUTHENTICATE_HTTP (', id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE_HTTP (id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);
+
+ return retValue;
+}
+;
+
+--| This should return ID of the collection that contains resource or collection with given ID,
+--| Possible ambiguity (such as symlinks etc.) should be resolved by using path.
+--| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
+create function "Box_DAV_GET_PARENT" (
+ in id any,
+ in what char(1),
+ in path varchar) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_GET_PARENT (', id, what, path, ')');
+ declare retValue any;
+
+ retValue := DAV_GET_PARENT (id[2], what, path);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ retValue := vector (DB.DBA.Box__detName (), id[1], retValue, 'C');
+
+ return retValue;
+}
+;
+
+--| 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 "Box_DAV_COL_CREATE" (
+ in detcol_id any,
+ in path_parts any,
+ in permissions varchar,
+ in uid integer,
+ in gid integer,
+ in auth_uid integer,
+ in extern integer := 0) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_COL_CREATE (', detcol_id, path_parts, permissions, uid, gid, auth_uid, extern, ')');
+ declare ouid, ogid integer;
+ declare title, parentListID, listID, listItem varchar;
+ declare url, body, header any;
+ declare retValue, retHeader, result, save, parentID any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ if (save is null)
+ {
+ title := path_parts[length (path_parts)-2];
+ parentListID := DB.DBA.Box__root ();
+ if (length (path_parts) > 2)
+ {
+ parentID := DB.DBA.DAV_SEARCH_ID (DB.DBA.Box__path (detcol_id, path_parts), 'P');
+ parentListID := DB.DBA.Box__paramGet (parentID, 'C', 'id', 0);
+ }
+ url := sprintf ('https://api.box.com/2.0/folders/%s', parentListID);
+ header := null;
+ body := sprintf ('{"name": "%s"}', title);
+ result := DB.DBA.Box__exec (detcol_id, retHeader, 'POST', url, header, body);
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := subseq (ODS..json2obj (result), 2);
+ listItem := DB.DBA.Box__removeKeyword ('item_collection', listItem);
+ listID := get_keyword ('id', listItem);
+ }
+ connection_set ('dav_store', 1);
+ DB.DBA.Box__owner (detcol_id, path_parts, DB.DBA.Box__user (uid, auth_uid), DB.DBA.Box__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_COL_CREATE_INT (DB.DBA.Box__path (detcol_id, path_parts), permissions, DB.DBA.Box__user (uid, auth_uid), DB.DBA.Box__user (gid, auth_uid), DB.DBA.Box__user (http_dav_uid ()), DB.DBA.Box__password (http_dav_uid ()), 1, 0, 1, ouid, ogid);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ if (save is null)
+ {
+ DB.DBA.Box__paramSet (retValue, 'C', 'Entry', DB.DBA.Box__obj2xml (listItem), 0);
+ DB.DBA.Box__paramSet (retValue, 'C', 'id', listID, 0);
+ }
+ DB.DBA.Box__paramSet (retValue, 'C', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.Box__detName (), detcol_id, retValue, 'C');
+ }
+
+ return retValue;
+}
+;
+
+--| It looks like that this is redundant and should be removed at all.
+create function "Box_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 ('Box_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 "Box_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 ('Box_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 "Box_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 ('Box_DAV_DELETE (', detcol_id, path_parts, what, silent, auth_uid, ')');
+ declare path, listId varchar;
+ declare retValue, save any;
+ declare id, url, header, retHeader, params any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.Box__path (detcol_id, path_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (save is null)
+ {
+ listId := DB.DBA.Box__paramGet (id, what, 'id', 0);
+ header := null;
+ url := sprintf ('https://api.box.com/2.0/%s/%s', case when what = 'R' then 'files' else 'folders' end, listId);
+ retValue := DB.DBA.Box__exec (detcol_id, retHeader, 'DELETE', url, header);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ goto _exit;
+ }
+ connection_set ('dav_store', 1);
+ if (what = 'R')
+ DB.DBA.Box__rdf_delete (detcol_id, id, what);
+ retValue := DAV_DELETE_INT (path, 1, null, null, 0, 0);
+
+_exit:;
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Box_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 ('Box_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', type, permissions, uid, gid, auth_uid, ')');
+ declare ouid, ogid integer;
+ declare name, path, parentListID, listID, listItem, rdf_graph varchar;
+ declare url, header, body, params any;
+ declare retValue, retHeader, result, save, parentID any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.Box__path (detcol_id, path_parts);
+ if (save is null)
+ {
+ 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
+ }
+ name := path_parts[length (path_parts)-1];
+ parentListID := DB.DBA.Box__root ();
+ if (length (path_parts) > 1)
+ {
+ parentID := DB.DBA.DAV_SEARCH_ID (DB.DBA.Box__path (detcol_id, path_parts), 'P');
+ parentListID := DB.DBA.Box__paramGet (parentID, 'C', 'id', 0);
+ }
+ url := 'https://api.box.com/2.0/files/data';
+ header := 'Content-Type: multipart/form-data; boundary=A300x\r\n';
+ body := sprintf (
+ '--A300x\r\n' ||
+ 'content-disposition: form-data; name="folder_id"\r\n' ||
+ '\r\n' ||
+ '%s\r\n' ||
+ '--A300x\r\n' ||
+ 'Content-Disposition: form-data; name="filename"; filename="%s"\r\n' ||
+ 'Content-Type: application/octet-stream\r\n' ||
+ '\r\n' ||
+ '%s\r\n' ||
+ '--A300x--',
+ parentListID,
+ name,
+ blob_to_string (content)
+ );
+ result := DB.DBA.Box__exec (detcol_id, retHeader, 'POST', url, header, body);
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := ODS..json2obj (result);
+ listID := get_keyword ('id', listItem);
+ if (isnull (listID) and (get_keyword ('total_count', listItem) = 1))
+ {
+ listItem := get_keyword ('entries', listItem)[0];
+ listID := get_keyword ('id', listItem);
+ url := sprintf ('https://api.box.com/2.0/files/%s', listID);
+ result := DB.DBA.Box__exec (detcol_id, retHeader, 'GET', url);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := ODS..json2obj (result);
+ }
+ }
+_skip_create:;
+ connection_set ('dav_store', 1);
+ DB.DBA.Box__owner (detcol_id, path_parts, DB.DBA.Box__user (uid, auth_uid), DB.DBA.Box__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, DB.DBA.Box__user (uid, auth_uid), DB.DBA.Box__user (gid, auth_uid), DB.DBA.Box__user (http_dav_uid ()), DB.DBA.Box__password (http_dav_uid ()), 0, ouid=>ouid, ogid=>ogid, check_locks=>0);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ rdf_graph := DB.DBA.Box__paramGet (detcol_id, 'C', 'graph', 0);
+ if (not DB.DBA.is_empty_or_null (rdf_graph))
+ DB.DBA.Box__rdf (detcol_id, retValue, 'R');
+
+ if (save is null)
+ {
+ DB.DBA.Box__paramSet (retValue, 'R', 'Entry', DB.DBA.Box__obj2xml (listItem), 0);
+ DB.DBA.Box__paramSet (retValue, 'R', 'id', listID, 0);
+ }
+ DB.DBA.Box__paramSet (retValue, 'R', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.Box__detName (), detcol_id, retValue, 'R');
+ }
+ return retValue;
+}
+;
+
+--| 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.
+--| It should delete any dead property even if the name looks like system name.
+create function "Box_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 ('Box_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_REMOVE_RAW (id[2], what, propname, silent, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "Box_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 ('Box_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
+ declare retValue any;
+
+ id := id[2];
+ retValue := DB.DBA.DAV_PROP_SET_RAW (id, what, propname, propvalue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
+create function "Box_DAV_PROP_GET" (
+ in id any,
+ in what char(0),
+ in propname varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('Box_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_GET_INT (id[2], what, propname, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
+--| The returned list should contain only user properties.
+create function "Box_DAV_PROP_LIST" (
+ in id any,
+ in what char(0),
+ in propmask varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('Box_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_LIST_INT (id[2], what, propmask, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "Box_DAV_DIR_SINGLE" (
+ in id any,
+ in what char(0),
+ in path any,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_DIR_SINGLE (', id, what, path, auth_uid, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_DIR_SINGLE_INT (id[2], what, null, DB.DBA.Box__user (http_dav_uid ()), DB.DBA.Box__password (http_dav_uid ()), http_dav_uid ());
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null) and (save is null))
+ retValue[4] := vector (DB.DBA.Box__detName (), id[1], retValue[4], what);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "Box_DAV_DIR_LIST" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ in name_mask varchar,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_DIR_LIST (', detcol_id, subPath_parts, detcol_parts, name_mask, recursive, auth_uid, ')');
+ declare colId integer;
+ declare what, colPath, movePath varchar;
+ declare boxItem, boxEntry any;
+ declare retValue, save, downloads, listItems, davItems, colEntry, xmlItems, davEntry, listIds, listId any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', null);
+ what := case when ((length (subPath_parts) = 0) or (subPath_parts[length (subPath_parts) - 1] = '')) then 'C' else 'R' end;
+ if ((what = 'R') or (recursive = -1))
+ return DB.DBA.Box_DAV_DIR_SINGLE (detcol_id, what, null, auth_uid);
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.DAV_SEARCH_ID (colPath, 'C');
+
+ downloads := vector ();
+ listItems := DB.DBA.Box__list (detcol_id, detcol_parts, subPath_parts);
+ if (DAV_HIDE_ERROR (listItems) is null)
+ goto _exit;
+
+ if (isinteger (listItems))
+ goto _exit;
+
+ DB.DBA.Box__activity (detcol_id, 'Sync started');
+ {
+ declare _id, _what, _type, _content any;
+ declare title varchar;
+ {
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.Box__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ goto _exitSync;
+ };
+
+ connection_set ('dav_store', 1);
+ colEntry := DB.DBA.DAV_DIR_SINGLE_INT (colId, 'C', '', null, null, http_dav_uid ());
+ listItems := subseq (ODS..json2obj (listItems), 2);
+ boxItem := DB.DBA.Box__removeKeyword ('item_collection', listItems);
+ boxEntry := DB.DBA.Box__paramGet (colId, 'C', 'Entry', 0);
+ if (not isnull (boxEntry))
+ boxEntry := xtree_doc (boxEntry);
+
+ if (
+ isnull (boxEntry) or
+ isnull (get_keyword ('modified_at', boxItem)) or
+ (get_keyword ('modified_at', boxItem) <> DB.DBA.Box__entryXPath (boxEntry, '/modified_at', 1))
+ )
+ {
+ listItems := get_keyword ('item_collection', listItems, vector ());
+ listItems := get_keyword ('entries', listItems, vector ());
+ listIds := vector ();
+ davItems := DB.DBA.Box__davList (detcol_id, colId);
+ foreach (any davItem in davItems) do
+ {
+ connection_set ('dav_store', 1);
+ listID := DB.DBA.Box__paramGet (davItem[4], davItem[1], 'id', 0);
+ foreach (any listItem in listItems) do
+ {
+ listItem := subseq (listItem, 2);
+ title := get_keyword ('name', listItem);
+ if ((listID = get_keyword ('id', listItem)) and (title = davItem[10]))
+ {
+ listIds := vector_concat (listIds, vector (listID));
+ if (davItem[1] = 'R')
+ {
+ declare downloaded integer;
+
+ downloaded := DB.DBA.Box__paramGet (davItem[4], davItem[1], 'download', 0);
+ if (downloaded is not null)
+ {
+ downloaded := cast (downloaded as integer);
+ if (downloaded <= 5)
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ else
+ {
+ DB.DBA.Box__paramSet (davItem[4], davItem[1], 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ goto _continue;
+ }
+ }
+ if (davItem[1] = 'R')
+ DB.DBA.Box__rdf_delete (detcol_id, davItem[4], davItem[1]);
+ DAV_DELETE_INT (davItem[0], 1, null, null, 0, 0);
+
+ _continue:;
+ commit work;
+ }
+ foreach (any listItem in listItems) do
+ {
+ connection_set ('dav_store', 1);
+ listItem := subseq (listItem, 2);
+ listID := get_keyword ('id', listItem);
+ if (not position (listID, listIDs))
+ {
+ title := get_keyword ('name', listItem);
+ connection_set ('dav_store', 1);
+ if (get_keyword ('type', listItem) = 'folder')
+ {
+ _id := DB.DBA.DAV_COL_CREATE (colPath || title || '/', colEntry[5], colEntry[7], colEntry[6], DB.DBA.Box__user (http_dav_uid ()), DB.DBA.Box__password (http_dav_uid ()));
+ _what := 'C';
+ }
+ else
+ {
+ _content := '';
+ _type := http_mime_type (title);
+ _id := DB.DBA.DAV_RES_UPLOAD (colPath || title, _content, _type, colEntry[5], colEntry[7], colEntry[6], DB.DBA.Box__user (http_dav_uid ()), DB.DBA.Box__password (http_dav_uid ()));
+ _what := 'R';
+ }
+ if (DAV_HIDE_ERROR (_id) is not null)
+ {
+ DB.DBA.Box__paramSet (_id, _what, 'id', listID, 0);
+ DB.DBA.Box__paramSet (_id, _what, 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ if (_what = 'R')
+ {
+ DB.DBA.Box__paramSet (_id, _what, 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (_id, _what)));
+ }
+ }
+ commit work;
+ }
+ }
+ -- save colItem
+ DB.DBA.Box__paramSet (colId, 'C', 'Entry', DB.DBA.Box__obj2xml (boxItem), 0);
+ if (not isinteger (colId))
+ {
+ set triggers off;
+ DB.DBA.Box__paramSet (colId, 'C', ':creationdate', DB.DBA.Box__stringdate (get_keyword ('created_at', boxItem)), 0, 0);
+ DB.DBA.Box__paramSet (colId, 'C', ':getlastmodified', DB.DBA.Box__stringdate (get_keyword ('modified_at', boxItem)), 0, 0);
+ set triggers on;
+ }
+ }
+ }
+ _exitSync:
+ connection_set ('dav_store', save);
+ }
+ DB.DBA.Box__activity (detcol_id, 'Sync ended');
+
+_exit:;
+ retValue := DB.DBA.Box__davList (detcol_id, colId);
+ DB.DBA.Box__downloads (detcol_id, downloads);
+
+ return retValue;
+}
+;
+
+--| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
+create function "Box_DAV_DIR_FILTER" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ inout compilation any,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_DIR_FILTER (', detcol_id, subPath_parts, detcol_parts, compilation, recursive, 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 "Box_DAV_SEARCH_ID" (
+ in detcol_id any,
+ in path_parts any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_SEARCH_ID (DB.DBA.Box__path (detcol_id, path_parts), what);
+ -- dbg_obj_print ('retValue', retValue);
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null))
+ {
+ if (isinteger (retValue) and (save is null))
+ retValue := vector (DB.DBA.Box__detName (), detcol_id, retValue, what);
+
+ else if (isarray (retValue) and (save = 1))
+ retValue := retValue[2];
+ }
+ return retValue;
+}
+;
+
+create function "Box_DAV_MAKE_ID" (
+ in detcol_id any,
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_MAKE_ID (', id, what, ')');
+ declare retValue any;
+
+ retValue := vector (DB.DBA.Box__detName (), detcol_id, id, what);
+
+ return retValue;
+}
+;
+
+--| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
+create function "Box_DAV_SEARCH_PATH" (
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_SEARCH_PATH (', id, what, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DB.DBA.DAV_SEARCH_PATH (davId, what);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Box_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 ('Box_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 "Box_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 ('Box_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 "Box_DAV_RES_CONTENT" (
+ in id any,
+ inout content any,
+ out type varchar,
+ in content_mode integer) returns integer
+{
+ -- dbg_obj_princ ('Box_DAV_RES_CONTENT (', id, ', [content], [type], ', content_mode, ')');
+ declare retValue any;
+
+ retValue := DAV_RES_CONTENT_INT (id[2], content, type, content_mode, 0);
+
+ return retValue;
+}
+;
+
+--| This adds an extra access path to the existing resource or collection.
+create function "Box_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 ('Box_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 "Box_DAV_DEREFERENCE_LIST" (
+ in detcol_id any,
+ inout report_array any) returns any
+{
+ -- dbg_obj_princ ('Box_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 "Box_DAV_RESOLVE_PATH" (
+ in detcol_id any,
+ inout reference_item any,
+ inout old_base varchar,
+ inout new_base varchar) returns any
+{
+ -- dbg_obj_princ ('Box_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 "Box_DAV_LOCK" (
+ in path any,
+ in id any,
+ in what 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 ('Box_DAV_LOCK (', path, id, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LOCK_INT (path, davId, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, DB.DBA.Box__user (auth_uid), DB.DBA.Box__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Box_DAV_UNLOCK" (
+ in id any,
+ in what char(1),
+ in token varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('Box_DAV_UNLOCK (', id, what, token, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_UNLOCK_INT (davId, what, token, DB.DBA.Box__user (auth_uid), DB.DBA.Box__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Box_DAV_IS_LOCKED" (
+ inout id any,
+ inout what char(1),
+ in owned_tokens varchar) returns integer
+{
+ -- dbg_obj_princ ('Box_DAV_IS_LOCKED (', id, what, owned_tokens, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_IS_LOCKED_INT (davId, what, owned_tokens);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Box_DAV_LIST_LOCKS" (
+ in id any,
+ in what char(1),
+ in recursive integer) returns any
+{
+ -- dbg_obj_princ ('Box_DAV_LIST_LOCKS" (', id, what, recursive);
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LIST_LOCKS_INT (davId, what, recursive);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__root ()
+{
+ return '0';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__fileDebug (
+ in value any,
+ in mode integer := -1)
+{
+ string_to_file ('box.txt', cast (value as varchar) || '\r\n', mode);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__detcolId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[1];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__davId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[2];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__stringdate (
+ in dt varchar)
+{
+ declare N integer;
+ declare rs, tzone, tzone_z, tzone_h, tzone_m any;
+
+ rs := stringdate (subseq (dt, 0, 19));
+ if (length (dt) > 19)
+ {
+ tzone := subseq (dt, 19);
+ tzone_z := substring (tzone, 1, 1);
+ tzone_h := atoi (substring (tzone, 2, 2));
+ tzone_m := atoi (substring (tzone, 4, 2));
+ if (tzone_z = '+')
+ {
+ tzone_h := tzone_h - 2 * tzone_h;
+ tzone_m := tzone_m - 2 * tzone_m;
+ }
+ rs := dateadd ('hour', tzone_h, rs);
+ rs := dateadd ('minute', tzone_m, rs);
+ }
+ return rs;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__user (
+ in user_id integer,
+ in default_id integer := null)
+{
+ return coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = coalesce (user_id, default_id)), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__password (
+ in user_id integer)
+{
+ return coalesce ((select pwd_magic_calc(U_NAME, U_PWD, 1) from WS.WS.SYS_DAV_USER where U_ID = user_id), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__detName ()
+{
+ return UNAME'Box';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__owner (
+ in detcol_id any,
+ in subPath_parts any,
+ in uid any,
+ in gid any,
+ inout ouid integer,
+ inout ogid integer)
+{
+ declare id any;
+ declare path varchar;
+
+ DB.DBA.DAV_OWNER_ID (uid, gid, ouid, ogid);
+ if ((ouid = -12) or (ouid = 5))
+ {
+ path := DB.DBA.Box__path (detcol_id, subPath_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, 'P');
+ if (DAV_HIDE_ERROR (id))
+ {
+ select COL_OWNER, COL_GROUP
+ into ouid, ogid
+ from WS.WS.SYS_DAV_COL
+ where COL_ID = id;
+ }
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__xml2string (
+ in _xml any)
+{
+ declare stream any;
+
+ stream := string_output ();
+ http_value (_xml, null, stream);
+ return string_output_string (stream);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__path (
+ in detcol_id any,
+ in subPath_parts any)
+{
+ declare N integer;
+ declare path varchar;
+
+ path := rtrim (DB.DBA.DAV_SEARCH_PATH (detcol_id, 'C'), '/');
+ for (N := 0; N < length (subPath_parts); N := N + 1)
+ path := path || '/' || subPath_parts[N];
+
+ return path;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__params (
+ in colId integer)
+{
+ declare tmp, params any;
+
+ colId := DB.DBA.Box__detcolId (colId);
+ tmp := DB.DBA.Box__paramGet (colId, 'C', 'Authentication', 0);
+ if (tmp = 'Yes')
+ {
+ params := vector (
+ 'authentication', tmp,
+ 'auth_token', DB.DBA.Box__paramGet (colId, 'C', 'auth_token', 0, 1, 1),
+ 'api_key', (select a_key from OAUTH..APP_REG where a_name = 'Box Net API' and a_owner = 0),
+ 'graph', DB.DBA.Box__paramGet (colId, 'C', 'graph', 0)
+ );
+ }
+ else
+ {
+ params := vector ('authentication', 'No');
+ }
+ return params;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__paramSet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _propValue any,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _encrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__paramSet', _propName, _propValue, ')');
+ declare retValue any;
+
+ if (_serialized)
+ _propValue := serialize (_propValue);
+
+ if (_encrypt)
+ _propValue := pwd_magic_calc ('box', _propValue);
+
+ if (_prefixed)
+ _propName := 'virt:Box-' || _propName;
+
+ _id := DB.DBA.Box__davId (_id);
+ retValue := DB.DBA.DAV_PROP_SET_RAW (_id, _what, _propName, _propValue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__paramGet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _decrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__paramGet (', _id, _what, _propName, ')');
+ declare propValue any;
+
+ if (_prefixed)
+ _propName := 'virt:Box-' || _propName;
+
+ propValue := DB.DBA.DAV_PROP_GET_INT (DB.DBA.Box__davId (_id), _what, _propName, 0, DB.DBA.Box__user (http_dav_uid ()), DB.DBA.Box__password (http_dav_uid ()), http_dav_uid ());
+ if (isinteger (propValue))
+ propValue := null;
+
+ if (_serialized and not isnull (propValue))
+ propValue := deserialize (propValue);
+
+ if (_decrypt and not isnull (propValue))
+ propValue := pwd_magic_calc ('box', propValue, 1);
+
+ return propValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__paramRemove (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _prefixed integer := 1)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__paramRemove (', _id, _what, _propName, ')');
+ if (_prefixed)
+ _propName := 'virt:Box-' || _propName;
+
+ DB.DBA.DAV_PROP_REMOVE_RAW (DB.DBA.Box__davId (_id), _what, _propName, 1, http_dav_uid());
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__obj2xml (
+ in item any)
+{
+ return '<entry>' || ODS..obj2xml (item, 10) || '</entry>';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__entryXPath (
+ in _xml any,
+ in _xpath varchar,
+ in _cast integer := 0)
+{
+ declare retValue any;
+
+ if (_cast)
+ {
+ retValue := serialize_to_UTF8_xml (xpath_eval (sprintf ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] string (//entry%s)', _xpath), _xml, 1));
+ } else {
+ retValue := xpath_eval ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] //entry' || _xpath, _xml, 1);
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__removeKeyword (
+ in name varchar,
+ inout params any)
+{
+ declare N integer;
+ declare retValue any;
+
+ retValue := vector ();
+ for (N := 0; N < length (params); N := N + 2)
+ if (params[N] <> name)
+ retValue := vector_concat (retValue, vector (params[N], params[N+1]));
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__exec_error (
+ in _header any,
+ in _silent integer := 0)
+{
+ if ((_header[0] like 'HTTP/1._ 4__ %') or (_header[0] like 'HTTP/1._ 5__ %'))
+ {
+ if (not _silent)
+ signal ('22023', trim (_header[0], '\r\n'));
+
+ return 0;
+ }
+ return 1;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__exec_code (
+ in _header any)
+{
+ return subseq (_header[0], 9, 12);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__exec (
+ inout detcol_id integer,
+ inout retHeader varchar,
+ in method varchar,
+ in url varchar,
+ in header varchar := '',
+ in content varchar := '')
+{
+ -- dbg_obj_princ ('DB.DBA.Box__exec (', detcol_id, method, url, header, ')');
+ declare retValue, params any;
+ declare _client_id, _client_secret, _return_url varchar;
+ declare _expires_in, _access_timestamp, _token_type, _refresh_token any;
+ declare tmp, _json, _prefix, _reqHeader, _resHeader, _body any;
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.Box__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ return -28;
+ };
+
+ params := DB.DBA.Box__params (detcol_id);
+ if (get_keyword ('authentication', params) <> 'Yes')
+ {
+ DB.DBA.Box__activity (detcol_id, 'Error: Not authenticated');
+ return -28;
+ }
+
+ _reqHeader := sprintf ('Authorization: BoxAuth api_key=%s&auth_token=%s\r\n', get_keyword ('api_key', params), get_keyword ('auth_token', params));
+ if (header <> '')
+ _reqHeader := _reqHeader || header;
+
+ retHeader := null;
+ retValue := http_client_ext (url=>url, http_method=>method, http_headers=>_reqHeader, headers =>retHeader, body=>content, n_redirects=>15);
+ -- dbg_obj_print ('retValue', DB.DBA.Box__exec_code (retHeader), url, method, _reqHeader, content);
+ if (not DB.DBA.Box__exec_error (retHeader, 1))
+ {
+ DB.DBA.Box__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__davList (
+ inout detcol_id integer,
+ inout colId integer)
+{
+ declare retValue any;
+
+ vectorbld_init (retValue);
+ for (select vector (RES_FULL_PATH,
+ 'R',
+ length (RES_CONTENT),
+ RES_MOD_TIME,
+ vector (DB.DBA.Box__detName (), detcol_id, RES_ID, 'R'),
+ RES_PERMS,
+ RES_GROUP,
+ RES_OWNER,
+ RES_CR_TIME,
+ RES_TYPE,
+ RES_NAME ) as I
+ from WS.WS.SYS_DAV_RES
+ where RES_COL = DB.DBA.Box__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ for (select vector (WS.WS.COL_PATH (COL_ID),
+ 'C',
+ 0,
+ COL_MOD_TIME,
+ vector (DB.DBA.Box__detName (), detcol_id, COL_ID, 'C'),
+ COL_PERMS,
+ COL_GROUP,
+ COL_OWNER,
+ COL_CR_TIME,
+ 'dav/unix-directory',
+ COL_NAME) as I
+ from WS.WS.SYS_DAV_COL
+ where COL_PARENT = DB.DBA.Box__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ vectorbld_final (retValue);
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__list (
+ inout detcol_id any,
+ inout detcol_parts varchar,
+ inout subPath_parts varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__list (', detcol_id, detcol_parts, subPath_parts, ')');
+ declare colId integer;
+ declare colPath, listId varchar;
+ declare syncTime datetime;
+ declare retValue, retHeader, value, entry any;
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.Box__davId (DB.DBA.DAV_SEARCH_ID (colPath, 'C'));
+ if (DAV_HIDE_ERROR (colId) is null)
+ return -28;
+
+ syncTime := DB.DBA.Box__paramGet (colId, 'C', 'syncTime');
+ if (not isnull (syncTime) and (datediff ('second', syncTime, now ()) < 30))
+ return 0;
+
+ if (length (subPath_parts) = 1)
+ {
+ listId := DB.DBA.Box__root ();
+ }
+ else
+ {
+ listId := DB.DBA.Box__paramGet (colId, 'C', 'id', 0);
+ if (isnull (listId))
+ return -28;
+ }
+ retValue := DB.DBA.Box__exec (detcol_id, retHeader, 'GET', sprintf ('https://api.box.com/2.0/folders/%s', listId));
+ -- dbg_obj_print ('retValue', retValue);
+ if (not isinteger (retValue))
+ DB.DBA.Box__paramSet (colId, 'C', 'syncTime', now ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__activity (
+ in detcol_id integer,
+ in text varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__activity (', detcol_id, text, ')');
+ declare parentId integer;
+ declare parentPath varchar;
+ declare activity_id integer;
+ declare activity, activityName, activityPath, activityContent, activityType varchar;
+ declare davEntry any;
+ declare _errorCount integer;
+ declare exit handler for sqlstate '*'
+ {
+ if (__SQL_STATE = '40001')
+ {
+ rollback work;
+ if (_errorCount > 5)
+ resignal;
+
+ delay (1);
+ _errorCount := _errorCount + 1;
+ goto _start;
+ }
+ return;
+ };
+
+ _errorCount := 0;
+
+_start:;
+ activity := DB.DBA.Box__paramGet (detcol_id, 'C', 'activity', 0);
+ if (activity is null)
+ return;
+
+ if (activity <> 'on')
+ return;
+
+ davEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcol_id, 'C', '', null, null, http_dav_uid ());
+ if (DB.DBA.DAV_HIDE_ERROR (davEntry) is null)
+ return;
+
+ parentId := DB.DBA.DAV_SEARCH_ID (davEntry[0], 'P');
+ if (DB.DBA.DAV_HIDE_ERROR (parentId) is null)
+ return;
+
+ parentPath := DB.DBA.DAV_SEARCH_PATH (parentId, 'C');
+ if (DB.DBA.DAV_HIDE_ERROR (parentPath) is null)
+ return;
+
+ activityContent := '';
+ activityName := davEntry[10] || '_activity.log';
+ activityPath := parentPath || activityName;
+ activity_id := DB.DBA.DAV_SEARCH_ID (activityPath, 'R');
+ if (DB.DBA.DAV_HIDE_ERROR (activity_id) is not null)
+ {
+ DB.DBA.DAV_RES_CONTENT_INT (activity_id, activityContent, activityType, 0, 0);
+ if (activityType <> 'text/plain')
+ return;
+
+ activityContent := cast (activityContent as varchar);
+ }
+ activityContent := activityContent || sprintf ('%s %s\r\n', subseq (datestring (now ()), 0, 19), text);
+ activityType := 'text/plain';
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (activityPath, activityContent, activityType, '110100000RR', DB.DBA.Box__user (davEntry[6]), DB.DBA.Box__user (davEntry[7]), extern=>0, check_locks=>0);
+ commit work;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__downloads (
+ in detcol_id integer,
+ in downloads any)
+{
+ declare aq any;
+
+ if (length (downloads) = 0)
+ return;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.Box__downloads_aq', vector (detcol_id, downloads));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__downloads_aq (
+ in detcol_id integer,
+ in downloads any)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__downloads_aq (', detcol_id, downloads, ')');
+ declare N, downloaded integer;
+ declare url, listID varchar;
+ declare items, boxItem, listEntry any;
+ declare retValue, retHeader any;
+
+ set_user_id ('dba');
+ N := 0;
+ items := vector ();
+ DB.DBA.Box__activity (detcol_id, sprintf ('Downloading %d file(s)', length (downloads)));
+ foreach (any download in downloads) do
+ {
+ downloaded := DB.DBA.Box__paramGet (download[0], download[1], 'download', 0);
+ if (downloaded is null)
+ goto _continue;
+
+ downloaded := cast (downloaded as integer);
+ if (downloaded > 5)
+ goto _continue;
+
+ listID := DB.DBA.Box__paramGet (download[0], download[1], 'id', 0);
+ if (listID is null)
+ goto _continue;
+
+ url := sprintf ('https://api.box.com/2.0/files/%s', listID);
+ retValue := DB.DBA.Box__exec (detcol_id, retHeader, 'GET', url);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ {
+ downloaded := downloaded + 1;
+ DB.DBA.Box__paramSet (download[0], download[1], 'download', cast (downloaded as varchar), 0);
+ }
+ else
+ {
+ boxItem := ODS..json2obj (retValue);
+ listEntry := DB.DBA.Box__paramGet (download[0], download[1], 'Entry', 0);
+
+ if (listEntry is not null)
+ listEntry := xtree_doc (listEntry);
+
+ if (isnull (listEntry) or (get_keyword ('sha1', boxItem) <> DB.DBA.Box__entryXPath (listEntry, '/sha1', 1)))
+ {
+ DB.DBA.Box__paramSet (download[0], download[1], 'Entry', DB.DBA.Box__obj2xml (boxItem), 0);
+ set triggers off;
+ DB.DBA.Box__paramSet (download[0], download[1], ':creationdate', DB.DBA.Box__stringdate (get_keyword ('created_at', boxItem)), 0, 0);
+ DB.DBA.Box__paramSet (download[0], download[1], ':getlastmodified', DB.DBA.Box__stringdate (get_keyword ('modified_at', boxItem)), 0, 0);
+ set triggers on;
+
+ url := sprintf ('https://api.box.com/2.0/files/%s/data', listID);
+ retValue := DB.DBA.Box__exec (detcol_id, retHeader, 'GET', url);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ update WS.WS.SYS_DAV_RES set RES_CONTENT = retValue where RES_ID = DB.DBA.Box__davId (download[0]);
+ DB.DBA.Box__paramRemove (download[0], download[1], 'download');
+ items := vector_concat (items, vector (download));
+ N := N + 1;
+ }
+ }
+ }
+ commit work;
+
+ _continue:;
+ }
+ DB.DBA.Box__activity (detcol_id, sprintf ('Downloaded %d file(s)', N));
+ foreach (any item in items) do
+ {
+ DB.DBA.Box__rdf_delete (detcol_id, item[0], item[1]);
+ DB.DBA.Box__rdf_insert (detcol_id, item[0], item[1]);
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__rdf (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ declare aq any;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.Box__rdf_aq', vector (detcol_id, id, what));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__rdf_aq (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ set_user_id ('dba');
+ DB.DBA.Box__rdf_delete (detcol_id, id, what);
+ DB.DBA.Box__rdf_insert (detcol_id, id, what);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__rdf_insert (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__rdf_insert (', detcol_id, id, what, rdf_graph, ')');
+ declare permissions, rdf_graph2 varchar;
+ declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;
+ declare path, content, type any;
+ declare exit handler for sqlstate '*'
+ {
+ return;
+ };
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.Box__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ permissions := DB.DBA.Box__paramGet (detcol_id, 'C', ':virtpermissions', 0, 0);
+ if (permissions[6] = ascii('0'))
+ {
+ -- add to private graphs
+ if (not SIOC..private_graph_check (rdf_graph))
+ return;
+ }
+
+ id := DB.DBA.Box__davId (id);
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = id);
+ type := (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = id);
+ rdf_sponger := coalesce (DB.DBA.Box__paramGet (detcol_id, 'C', 'sponger', 0), 'on');
+ rdf_cartridges := coalesce (DB.DBA.Box__paramGet (detcol_id, 'C', 'cartridges', 0), '');
+ rdf_metaCartridges := coalesce (DB.DBA.Box__paramGet (detcol_id, 'C', 'metaCartridges', 0), '');
+
+ RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__rdf_delete (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__rdf_delete (', detcol_id, id, what, rdf_graph, ')');
+ declare rdf_graph2 varchar;
+ declare path varchar;
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.Box__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ if (path like '%.gz')
+ path := regexp_replace (path, '\.gz\x24', '');
+
+ rdf_graph2 := 'http://local.virt' || path;
+ SPARQL delete from graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };
+ SPARQL clear graph ?:rdf_graph2;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Box__refresh (
+ in path varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.Box__refresh (', path, ')');
+ declare colId any;
+
+ colId := DB.DBA.DAV_SEARCH_ID (path, 'C');
+ if (DAV_HIDE_ERROR (colId) is not null)
+ DB.DBA.Box__paramRemove (colId, 'C', 'syncTime');
+}
+;
diff --git a/appsrc/ODS-Briefcase/new/DET_Dropbox.sql b/appsrc/ODS-Briefcase/new/DET_Dropbox.sql
new file mode 100644
index 0000000..900b729
--- /dev/null
+++ b/appsrc/ODS-Briefcase/new/DET_Dropbox.sql
@@ -0,0 +1,1594 @@
+--
+-- $Id: DET_Dropbox.sql,v 1.2 2012/05/22 05:50:57 ddimitrov 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 "Dropbox_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 ('Dropbox_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE (id[2], what, req, auth_uname, auth_pwd, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "Dropbox_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 ('Dropbox_DAV_AUTHENTICATE_HTTP (', id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE_HTTP (id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);
+
+ return retValue;
+}
+;
+
+--| This should return ID of the collection that contains resource or collection with given ID,
+--| Possible ambiguity (such as symlinks etc.) should be resolved by using path.
+--| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
+create function "Dropbox_DAV_GET_PARENT" (
+ in id any,
+ in what char(1),
+ in path varchar) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_GET_PARENT (', id, what, path, ')');
+ declare retValue any;
+
+ retValue := DAV_GET_PARENT (id[2], what, path);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ retValue := vector (DB.DBA.Dropbox__detName (), id[1], retValue, 'C');
+
+ return retValue;
+}
+;
+
+--| 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 "Dropbox_DAV_COL_CREATE" (
+ in detcol_id any,
+ in path_parts any,
+ in permissions varchar,
+ in uid integer,
+ in gid integer,
+ in auth_uid integer,
+ in extern integer := 0) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_COL_CREATE (', detcol_id, path_parts, permissions, uid, gid, auth_uid, extern, ')');
+ declare ouid, ogid integer;
+ declare path, listPath, listItem varchar;
+ declare url, urlParams any;
+ declare retValue, retHeader, result, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.Dropbox__path (detcol_id, path_parts);
+ if (save is null)
+ {
+ listPath := '/' || DB.DBA.DAV_CONCAT_PATH (null, subseq (path_parts, 0, length (path_parts)-1));
+ url := 'https://api.dropbox.com/1/fileops/create_folder';
+ urlParams := sprintf ('root=%U&path=%U', DB.DBA.Dropbox__root (), listPath);
+ result := DB.DBA.Dropbox__exec (detcol_id, retHeader, 'GET', url, urlParams);
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := ODS..json2obj (result);
+ listPath := get_keyword ('path', listItem);
+ }
+ connection_set ('dav_store', 1);
+ DB.DBA.Dropbox__owner (detcol_id, path_parts, DB.DBA.Dropbox__user (uid, auth_uid), DB.DBA.Dropbox__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_COL_CREATE_INT (path, permissions, DB.DBA.Dropbox__user (uid, auth_uid), DB.DBA.Dropbox__user (gid, auth_uid), DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()), 1, 0, 1, ouid, ogid);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ if (save is null)
+ {
+ DB.DBA.Dropbox__paramSet (retValue, 'C', 'Entry', DB.DBA.Dropbox__obj2xml (listItem), 0);
+ DB.DBA.Dropbox__paramSet (retValue, 'C', 'path', listPath, 0);
+ }
+ DB.DBA.Dropbox__paramSet (retValue, 'C', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.Dropbox__detName (), detcol_id, retValue, 'C');
+ }
+
+ return retValue;
+}
+;
+
+--| It looks like that this is redundant and should be removed at all.
+create function "Dropbox_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 ('Dropbox_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 "Dropbox_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 ('Dropbox_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 "Dropbox_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 ('Dropbox_DAV_DELETE (', detcol_id, path_parts, what, silent, auth_uid, ')');
+ declare path, listPath varchar;
+ declare retValue, save any;
+ declare id, url, urlParams, retHeader any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.Dropbox__path (detcol_id, path_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (save is null)
+ {
+ listPath := DB.DBA.Dropbox__paramGet (id, what, 'path', 0);
+ url := 'https://api.dropbox.com/1/fileops/delete';
+ urlParams := sprintf ('root=%U&path=%U', DB.DBA.Dropbox__root (), listPath);
+ retValue := DB.DBA.Dropbox__exec (detcol_id, retHeader, 'GET', url, urlParams);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ goto _exit;
+ }
+ connection_set ('dav_store', 1);
+ if (what = 'R')
+ DB.DBA.Dropbox__rdf_delete (detcol_id, id, what);
+ retValue := DAV_DELETE_INT (path, 1, null, null, 0, 0);
+
+_exit:;
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Dropbox_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 ('Dropbox_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', type, permissions, uid, gid, auth_uid, ')');
+ declare L integer;
+ declare ouid, ogid integer;
+ declare name, path, listPath, rdf_graph varchar;
+ declare id any;
+ declare url, urlParams any;
+ declare retValue, retHeader, result, save, listItem any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.Dropbox__path (detcol_id, path_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, 'R');
+ if (save is null)
+ {
+ 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
+ }
+ listPath := '/' || DB.DBA.DAV_CONCAT_PATH (null, path_parts);
+ url := sprintf ('https://api-content.dropbox.com/1/files_put/%s%s', DB.DBA.Dropbox__root (), DB.DBA.Dropbox__pathU (listPath));
+ urlParams := 'override=true';
+ result := DB.DBA.Dropbox__exec (detcol_id, retHeader, 'PUT', url, urlParams, '', blob_to_string (content));
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := ODS..json2obj (result);
+ listPath := get_keyword ('path', listItem);
+ }
+ connection_set ('dav_store', 1);
+ DB.DBA.Dropbox__owner (detcol_id, path_parts, DB.DBA.Dropbox__user (uid, auth_uid), DB.DBA.Dropbox__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, DB.DBA.Dropbox__user (uid, auth_uid), DB.DBA.Dropbox__user (gid, auth_uid), DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()), 0, ouid=>ouid, ogid=>ogid, check_locks=>0);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ rdf_graph := DB.DBA.Dropbox__paramGet (detcol_id, 'C', 'graph', 0);
+ if (not DB.DBA.is_empty_or_null (rdf_graph))
+ DB.DBA.Dropbox__rdf (detcol_id, retValue, 'R');
+
+ if (save is null)
+ {
+ DB.DBA.Dropbox__paramSet (retValue, 'R', 'Entry', DB.DBA.Dropbox__obj2xml (listItem), 0);
+ DB.DBA.Dropbox__paramSet (retValue, 'R', 'path', listPath, 0);
+ }
+ DB.DBA.Dropbox__paramSet (retValue, 'R', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.Dropbox__detName (), detcol_id, retValue, 'R');
+ }
+ return retValue;
+}
+;
+
+--| 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.
+--| It should delete any dead property even if the name looks like system name.
+create function "Dropbox_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 ('Dropbox_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_REMOVE_RAW (id[2], what, propname, silent, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "Dropbox_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 ('Dropbox_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
+ declare retValue any;
+
+ id := id[2];
+ retValue := DB.DBA.DAV_PROP_SET_RAW (id, what, propname, propvalue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
+create function "Dropbox_DAV_PROP_GET" (
+ in id any,
+ in what char(0),
+ in propname varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('Dropbox_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_GET_INT (id[2], what, propname, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
+--| The returned list should contain only user properties.
+create function "Dropbox_DAV_PROP_LIST" (
+ in id any,
+ in what char(0),
+ in propmask varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('Dropbox_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_LIST_INT (id[2], what, propmask, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "Dropbox_DAV_DIR_SINGLE" (
+ in id any,
+ in what char(0),
+ in path any,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_DIR_SINGLE (', id, what, path, auth_uid, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_DIR_SINGLE_INT (id[2], what, null, DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()), http_dav_uid ());
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null) and (save is null))
+ retValue[4] := vector (DB.DBA.Dropbox__detName (), id[1], retValue[4], what);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "Dropbox_DAV_DIR_LIST" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ in name_mask varchar,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_DIR_LIST (', detcol_id, subPath_parts, detcol_parts, name_mask, recursive, auth_uid, ')');
+ declare colId integer;
+ declare what, colPath varchar;
+ declare retValue, save, colEntry, davPaths any;
+ declare downloads, listItems, davItems, davDropbox any;
+ declare _id, _what, _type, _content any;
+ declare path, hashValue, title varchar;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', null);
+ what := case when ((length (subPath_parts) = 0) or (subPath_parts[length (subPath_parts) - 1] = '')) then 'C' else 'R' end;
+ if ((what = 'R') or (recursive = -1))
+ return DB.DBA.Dropbox_DAV_DIR_SINGLE (detcol_id, what, null, auth_uid);
+
+ downloads := vector ();
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.DAV_SEARCH_ID (colPath, 'C');
+ listItems := DB.DBA.Dropbox__list (detcol_id, detcol_parts, subPath_parts);
+ if (DAV_HIDE_ERROR (listItems) is null)
+ goto _exit;
+
+ if (isinteger (listItems))
+ goto _exit;
+
+ DB.DBA.Dropbox__activity (detcol_id, 'Sync started');
+ {
+ declare exit handler for sqlstate '*'
+ {
+ -- dbg_obj_print ('DB.DBA.Dropbox_DAV_DIR_LIST', __SQL_STATE, __SQL_MESSAGE);
+ goto _exit;
+ };
+
+ connection_set ('dav_store', 1);
+ davPaths := vector ();
+ colEntry := DB.DBA.DAV_DIR_SINGLE_INT (colId, 'C', '', null, null, http_dav_uid ());
+ listItems := subseq (ODS..json2obj (listItems), 2);
+ hashValue := get_keyword ('hash', listItems);
+ DB.DBA.Dropbox__paramSet (colId, 'C', 'hash', hashValue, 0);
+ listItems := get_keyword ('contents', listItems);
+ davItems := DB.DBA.Dropbox__davList (detcol_id, colId);
+ foreach (any davItem in davItems) do
+ {
+ path := DB.DBA.Dropbox__paramGet (davItem[4], davItem[1], 'path', 0);
+ foreach (any listItem in listItems) do
+ {
+ if (path = get_keyword ('path', listItem))
+ {
+ davDropbox := DB.DBA.Dropbox__paramGet (davItem[4], davItem[1], 'Entry', 0);
+ if (davDropbox is not null)
+ {
+ davPaths := vector_concat (davPaths, vector (path));
+ davDropbox := xtree_doc (davDropbox);
+ if (DB.DBA.Dropbox__entryXPath (davDropbox, '/rev', 1) <> get_keyword ('rev', listItem))
+ {
+ set triggers off;
+ DB.DBA.Dropbox__paramSet (davItem[4], davItem[1], ':getlastmodified', DB.DBA.Dropbox__stringdate (get_keyword ('modified', listItem)), 0, 0);
+ set triggers on;
+ DB.DBA.Dropbox__paramSet (davItem[4], davItem[1], 'Entry', DB.DBA.Dropbox__obj2xml (listItem), 0);
+ if (davItem[1] = 'R')
+ {
+ DB.DBA.Dropbox__paramSet (davItem[4], davItem[1], 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ else
+ {
+ declare downloaded integer;
+
+ downloaded := DB.DBA.Dropbox__paramGet (davItem[4], davItem[1], 'download', 0);
+ if (downloaded is not null)
+ {
+ downloaded := cast (downloaded as integer);
+ if (downloaded <= 5)
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ goto _continue;
+ }
+ }
+ }
+ if (davItem[1] = 'R')
+ DB.DBA.Dropbox__rdf_delete (detcol_id, davItem[4], davItem[1]);
+
+ DAV_DELETE_INT (davItem[0], 1, null, null, 0, 0);
+
+ _continue:;
+ commit work;
+ }
+ foreach (any listItem in listItems) do
+ {
+ path := get_keyword ('path', listItem);
+ if (not position (path, davPaths))
+ {
+ title := DB.DBA.Dropbox__title (path);
+ connection_set ('dav_store', 1);
+ if (get_keyword ('is_dir', listItem) = 1)
+ {
+ _id := DB.DBA.DAV_COL_CREATE (colPath || title || '/', colEntry[5], colEntry[7], colEntry[6], DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()));
+ _what := 'C';
+ }
+ else
+ {
+ _content := '';
+ _type := get_keyword ('mime_type', listItem);
+ _id := DB.DBA.DAV_RES_UPLOAD (colPath || title, _content, _type, colEntry[5], colEntry[7], colEntry[6], DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()));
+ _what := 'R';
+ }
+ if (DAV_HIDE_ERROR (_id) is not null)
+ {
+ set triggers off;
+ DB.DBA.Dropbox__paramSet (_id, _what, ':creationdate', DB.DBA.Dropbox__stringdate (get_keyword ('client_mtime', listItem)), 0, 0);
+ DB.DBA.Dropbox__paramSet (_id, _what, ':getlastmodified', DB.DBA.Dropbox__stringdate (get_keyword ('modified', listItem)), 0, 0);
+ set triggers on;
+ DB.DBA.Dropbox__paramSet (_id, _what, 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ DB.DBA.Dropbox__paramSet (_id, _what, 'path', path, 0);
+ DB.DBA.Dropbox__paramSet (_id, _what, 'Entry', DB.DBA.Dropbox__obj2xml (listItem), 0);
+ if (_what = 'R')
+ {
+ DB.DBA.Dropbox__paramSet (_id, _what, 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (_id, _what)));
+ }
+ }
+ commit work;
+ }
+ }
+ }
+ DB.DBA.Dropbox__activity (detcol_id, 'Sync ended');
+
+_exit:
+ connection_set ('dav_store', save);
+
+ retValue := DB.DBA.Dropbox__davList (detcol_id, colId);
+ DB.DBA.Dropbox__downloads (detcol_id, downloads);
+
+ return retValue;
+}
+;
+
+--| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
+create function "Dropbox_DAV_DIR_FILTER" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ inout compilation any,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_DIR_FILTER (', detcol_id, subPath_parts, detcol_parts, compilation, recursive, 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 "Dropbox_DAV_SEARCH_ID" (
+ in detcol_id any,
+ in path_parts any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_SEARCH_ID (DB.DBA.Dropbox__path (detcol_id, path_parts), what);
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null))
+ {
+ if (isinteger (retValue) and (save is null))
+ retValue := vector (DB.DBA.Dropbox__detName (), detcol_id, retValue, what);
+
+ else if (isarray (retValue) and (save = 1))
+ retValue := retValue[2];
+ }
+ return retValue;
+}
+;
+
+create function "Dropbox_DAV_MAKE_ID" (
+ in detcol_id any,
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_MAKE_ID (', id, what, ')');
+ declare retValue any;
+
+ retValue := vector (DB.DBA.Dropbox__detName (), detcol_id, id, what);
+
+ return retValue;
+}
+;
+
+--| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
+create function "Dropbox_DAV_SEARCH_PATH" (
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_SEARCH_PATH (', id, what, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DB.DBA.DAV_SEARCH_PATH (davId, what);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Dropbox_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 ('Dropbox_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 "Dropbox_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 ('Dropbox_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 "Dropbox_DAV_RES_CONTENT" (
+ in id any,
+ inout content any,
+ out type varchar,
+ in content_mode integer) returns integer
+{
+ -- dbg_obj_princ ('Dropbox_DAV_RES_CONTENT (', id, ', [content], [type], ', content_mode, ')');
+ declare retValue any;
+
+ retValue := DAV_RES_CONTENT_INT (id[2], content, type, content_mode, 0);
+
+ return retValue;
+}
+;
+
+--| This adds an extra access path to the existing resource or collection.
+create function "Dropbox_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 ('Dropbox_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 "Dropbox_DAV_DEREFERENCE_LIST" (
+ in detcol_id any,
+ inout report_array any) returns any
+{
+ -- dbg_obj_princ ('Dropbox_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 "Dropbox_DAV_RESOLVE_PATH" (
+ in detcol_id any,
+ inout reference_item any,
+ inout old_base varchar,
+ inout new_base varchar) returns any
+{
+ -- dbg_obj_princ ('Dropbox_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 "Dropbox_DAV_LOCK" (
+ in path any,
+ in id any,
+ in what 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 ('Dropbox_DAV_LOCK (', path, id, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LOCK_INT (path, davId, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, DB.DBA.Dropbox__user (auth_uid), DB.DBA.Dropbox__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Dropbox_DAV_UNLOCK" (
+ in id any,
+ in what char(1),
+ in token varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('Dropbox_DAV_UNLOCK (', id, what, token, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_UNLOCK_INT (davId, what, token, DB.DBA.Dropbox__user (auth_uid), DB.DBA.Dropbox__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Dropbox_DAV_IS_LOCKED" (
+ inout id any,
+ inout what char(1),
+ in owned_tokens varchar) returns integer
+{
+ -- dbg_obj_princ ('Dropbox_DAV_IS_LOCKED (', id, what, owned_tokens, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_IS_LOCKED_INT (davId, what, owned_tokens);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "Dropbox_DAV_LIST_LOCKS" (
+ in id any,
+ in what char(1),
+ in recursive integer) returns any
+{
+ -- dbg_obj_princ ('Dropbox_DAV_LIST_LOCKS" (', id, what, recursive);
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LIST_LOCKS_INT (davId, what, recursive);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__root ()
+{
+ return 'dropbox';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__pathU (
+ in path varchar)
+{
+ return replace (sprintf ('%U', ODRIVE.WA.utf2wide (path)), '%2F', '/');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__stringdate (
+ in dt varchar)
+{
+ declare _arr, months, rs, tzone_z, tzone_h, tzone_m any;
+ declare d, m, y, hms, tzone varchar;
+
+ _arr := split_and_decode (trim (dt), 0, '\0\0 ');
+ if (length(_arr) = 5)
+ _arr := vector_concat (vector (''), _arr);
+
+ if (length(_arr) = 6)
+ {
+ months := vector ('JAN', '01', 'FEB', '02', 'MAR', '03', 'APR', '04', 'MAY', '05', 'JUN', '06', 'JUL', '07', 'AUG', '08', 'SEP', '09', 'OCT', '10', 'NOV', '11', 'DEC', '12');
+ d := _arr[1];
+ m := get_keyword (upper(_arr[2]), months);
+ y := _arr[3];
+ hms := _arr[4];
+ tzone := _arr[5];
+ tzone_z := substring (tzone, 1, 1);
+ tzone_h := atoi (substring (tzone, 2, 2));
+ tzone_m := atoi (substring (tzone, 4, 2));
+ if (tzone_z = '+')
+ {
+ tzone_h := tzone_h - 2 * tzone_h;
+ tzone_m := tzone_m - 2 * tzone_m;
+ }
+ rs := stringdate (sprintf ('%s.%s.%s %s', m, d, y, hms));
+ rs := dateadd ('hour', tzone_h, rs);
+ rs := dateadd ('minute', tzone_m, rs);
+ }
+ else
+ {
+ rs := stringdate ('1900.01.01 00:00:00'); -- set system date
+ }
+ return rs;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__datestring (
+ in dt datetime)
+{
+ declare z integer;
+ declare d, e, h, m, y, s, k, zh, zm, zz varchar;
+ declare days, months any;
+
+ if (is_empty_or_null (dt))
+ return '';
+
+ days := vector ('01','SUN','02','Mon','03','Thu','04','Wed','05','Thu','06','Fri','07','Sat');
+ months := vector ('01','Jan','02','Feb','03','Mar','04','Apr','05','May','06','Jun','07','Jul','08','Aug','09','Sep','10','Oct','11','Nov','12','Dec');
+
+ d := xslt_format_number (dayofmonth (dt), '00');
+ m := xslt_format_number (month (dt), '00');
+ h := xslt_format_number (hour (dt), '00');
+ e := xslt_format_number (minute (dt), '00');
+ s := xslt_format_number (second (dt), '00');
+ k := xslt_format_number (dayofweek (dt), '00');
+ y := cast (year (dt) as varchar);
+ z := timezone (dt);
+ if (z < 0)
+ {
+ zz := '-';
+ z := z-(2*z);
+ } else {
+ zz := '+';
+ }
+ zh := xslt_format_number (z/60, '00');
+ zm := xslt_format_number (mod (z, 60), '00');
+
+ return sprintf ('%s, %s %s %s %s:%s:%s %s%s%s', get_keyword (k, days), d, get_keyword (m, months), y, h, e, s, zz, zh, zm);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__fileDebug (
+ in value any,
+ in mode integer := -1)
+{
+ string_to_file ('dropbox.txt', cast (value as varchar) || '\r\n', mode);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__detcolId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[1];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__davId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[2];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__user (
+ in user_id integer,
+ in default_id integer := null)
+{
+ return coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = coalesce (user_id, default_id)), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__password (
+ in user_id integer)
+{
+ return coalesce ((select pwd_magic_calc(U_NAME, U_PWD, 1) from WS.WS.SYS_DAV_USER where U_ID = user_id), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__owner (
+ in detcol_id any,
+ in subPath_parts any,
+ in uid any,
+ in gid any,
+ inout ouid integer,
+ inout ogid integer)
+{
+ declare id any;
+ declare path varchar;
+
+ DB.DBA.DAV_OWNER_ID (uid, gid, ouid, ogid);
+ if ((ouid = -12) or (ouid = 5))
+ {
+ path := DB.DBA.Dropbox__path (detcol_id, subPath_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, 'P');
+ if (DAV_HIDE_ERROR (id))
+ {
+ select COL_OWNER, COL_GROUP
+ into ouid, ogid
+ from WS.WS.SYS_DAV_COL
+ where COL_ID = id;
+ }
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__detName ()
+{
+ return UNAME'Dropbox';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__xml2string (
+ in _xml any)
+{
+ declare stream any;
+
+ stream := string_output ();
+ http_value (_xml, null, stream);
+ return string_output_string (stream);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__path (
+ in detcol_id any,
+ in subPath_parts any)
+{
+ declare N integer;
+ declare path varchar;
+
+ path := rtrim (DB.DBA.DAV_SEARCH_PATH (detcol_id, 'C'), '/');
+ for (N := 0; N < length (subPath_parts); N := N + 1)
+ path := path || '/' || subPath_parts[N];
+
+ return path;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__params (
+ in colId integer)
+{
+ declare tmp, params any;
+
+ colId := DB.DBA.Dropbox__detcolId (colId);
+ tmp := DB.DBA.Dropbox__paramGet (colId, 'C', 'Authentication', 0);
+ if (tmp = 'Yes')
+ {
+ params := vector (
+ 'authentication', tmp,
+ 'sid', DB.DBA.Dropbox__paramGet (colId, 'C', 'sid', 0),
+ 'graph', DB.DBA.Dropbox__paramGet (colId, 'C', 'graph', 0)
+ );
+ }
+ else
+ {
+ params := vector ('authentication', 'No');
+ }
+ return params;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__paramSet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _propValue any,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _encrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__paramSet', _propName, _propValue, ')');
+ declare retValue any;
+
+ if (_serialized)
+ _propValue := serialize (_propValue);
+
+ if (_encrypt)
+ _propValue := pwd_magic_calc ('dropbox2012', _propValue);
+
+ if (_prefixed)
+ _propName := 'virt:Dropbox-' || _propName;
+
+ _id := DB.DBA.Dropbox__davId (_id);
+ retValue := DB.DBA.DAV_PROP_SET_RAW (_id, _what, _propName, _propValue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__paramGet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _decrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__paramGet (', _id, _what, _propName, ')');
+ declare propValue any;
+
+ if (_prefixed)
+ _propName := 'virt:Dropbox-' || _propName;
+
+ propValue := DB.DBA.DAV_PROP_GET_INT (DB.DBA.Dropbox__davId (_id), _what, _propName, 0, DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()), http_dav_uid ());
+ if (isinteger (propValue))
+ propValue := null;
+
+ if (_serialized and not isnull (propValue))
+ propValue := deserialize (propValue);
+
+ if (_decrypt and not isnull (propValue))
+ propValue := pwd_magic_calc ('dropbox2012', propValue, 1);
+
+ return propValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__paramRemove (
+ in _id integer,
+ in _what varchar,
+ in _propName varchar,
+ in _prefixed integer := 1)
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__paramRemove (', _id, _what, _propName, ')');
+ if (_prefixed)
+ _propName := 'virt:Dropbox-' || _propName;
+
+ DB.DBA.DAV_PROP_REMOVE_RAW (DB.DBA.Dropbox__davId (_id), _what, _propName, 1, http_dav_uid());
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__title (
+ in path varchar)
+{
+ return subseq (path, strrchr (path, '/')+1);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__entryXPath (
+ in _xml any,
+ in _xpath varchar,
+ in _cast integer := 0)
+{
+ declare retValue any;
+
+ if (_cast)
+ {
+ retValue := serialize_to_UTF8_xml (xpath_eval (sprintf ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] string (//entry%s)', _xpath), _xml, 1));
+ } else {
+ retValue := xpath_eval ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] //entry' || _xpath, _xml, 1);
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__obj2xml (
+ in item any)
+{
+ return '<entry>' || ODS..obj2xml (item, 10) || '</entry>';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__exec_error (
+ in _header any,
+ in _silent integer := 0)
+{
+ if ((_header[0] like 'HTTP/1._ 4__ %') or (_header[0] like 'HTTP/1._ 5__ %'))
+ {
+ if (not _silent)
+ signal ('22023', trim (_header[0], '\r\n'));
+
+ return 0;
+ }
+ return 1;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__exec_code (
+ in _header any)
+{
+ return subseq (_header[0], 9, 12);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__exec (
+ inout detcol_id integer,
+ inout retHeader varchar,
+ in method varchar,
+ in url varchar,
+ in urlParams varchar := '',
+ in header varchar := '',
+ in content varchar := '')
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__exec', colId, method, url, urlParams, header, ')');
+ declare callUrl, token, sid varchar;
+ declare retValue, params any;
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.Dropbox__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ return -28;
+ };
+
+ params := DB.DBA.Dropbox__params (detcol_id);
+ if (get_keyword ('authentication', params) <> 'Yes')
+ {
+ DB.DBA.Dropbox__activity (detcol_id, 'Error: Not authenticated');
+ return -28;
+ }
+
+ sid := get_keyword ('sid', params);
+ token := ODS.ODS_API.get_oauth_tok ('Dropbox API');
+ callUrl := OAUTH..sign_request (method, url, urlParams, token, sid, 1);
+ if (method <> 'GET')
+ callUrl := url || '?' || callUrl;
+
+ retHeader := null;
+ retValue := http_client_ext (url=>callUrl, http_method=>method, http_headers=>header, headers =>retHeader, body=>content, n_redirects=>15);
+ -- dbg_obj_print ('retValue', DB.DBA.Dropbox__exec_code (retHeader), url, method);
+ if (not DB.DBA.Dropbox__exec_error (retHeader, 1))
+ {
+ DB.DBA.Dropbox__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__davList (
+ inout detcol_id integer,
+ inout colId integer)
+{
+ declare retValue any;
+
+ vectorbld_init (retValue);
+ for (select vector (RES_FULL_PATH,
+ 'R',
+ length (RES_CONTENT),
+ RES_MOD_TIME,
+ vector (DB.DBA.Dropbox__detName (), detcol_id, RES_ID, 'R'),
+ RES_PERMS,
+ RES_GROUP,
+ RES_OWNER,
+ RES_CR_TIME,
+ RES_TYPE,
+ RES_NAME ) as I
+ from WS.WS.SYS_DAV_RES
+ where RES_COL = DB.DBA.Dropbox__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ for (select vector (WS.WS.COL_PATH (COL_ID),
+ 'C',
+ 0,
+ COL_MOD_TIME,
+ vector (DB.DBA.Dropbox__detName (), detcol_id, COL_ID, 'C'),
+ COL_PERMS,
+ COL_GROUP,
+ COL_OWNER,
+ COL_CR_TIME,
+ 'dav/unix-directory',
+ COL_NAME) as I
+ from WS.WS.SYS_DAV_COL
+ where COL_PARENT = DB.DBA.Dropbox__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ vectorbld_final (retValue);
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__list (
+ inout detcol_id any,
+ inout detcol_parts varchar,
+ inout subPath_parts varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__list (', detcol_id, detcol_parts, subPath_parts, ')');
+ declare colId integer;
+ declare colPath, path, hashValue varchar;
+ declare syncTime datetime;
+ declare retValue, url, urlParams, retHeader, value, entry any;
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.Dropbox__davId (DB.DBA.DAV_SEARCH_ID (colPath, 'C'));
+ if (DAV_HIDE_ERROR (colId) is null)
+ return -28;
+
+ syncTime := DB.DBA.Dropbox__paramGet (colId, 'C', 'syncTime');
+ if (not isnull (syncTime) and (datediff ('second', syncTime, now ()) < 300))
+ return 0;
+
+ path := '/';
+ if (length (subPath_parts) > 1)
+ {
+ path := DB.DBA.Dropbox__paramGet (colId, 'C', 'path', 0);
+ if (isnull (path))
+ return -28;
+ }
+ urlParams := '';
+ hashValue := DB.DBA.Dropbox__paramGet (colId, 'C', 'hash', 0);
+ if (not isnull (hashValue))
+ urlParams := sprintf ('hash=%U', hashValue);
+
+ url := sprintf ('https://api.dropbox.com/1/metadata/%s%s', DB.DBA.Dropbox__root (), DB.DBA.Dropbox__pathU (path));
+ retValue := DB.DBA.Dropbox__exec (detcol_id, retHeader, 'GET', url, urlParams);
+ -- dbg_obj_print ('retValue', retValue);
+ if (not isinteger (retValue))
+ {
+ DB.DBA.Dropbox__paramSet (colId, 'C', 'syncTime', now ());
+ if (DB.DBA.Dropbox__exec_code (retHeader) = '304')
+ retValue := null;
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__activity (
+ in detcol_id integer,
+ in text varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__activity (', detcol_id, text, ')');
+ declare parent_id integer;
+ declare parentPath varchar;
+ declare activity_id integer;
+ declare activity, activityName, activityPath, activityContent, activityType varchar;
+ declare davEntry any;
+ declare _errorCount integer;
+ declare exit handler for sqlstate '*'
+ {
+ if (__SQL_STATE = '40001')
+ {
+ rollback work;
+ if (_errorCount > 5)
+ resignal;
+
+ delay (1);
+ _errorCount := _errorCount + 1;
+ goto _start;
+ }
+ return;
+ };
+
+ _errorCount := 0;
+
+_start:;
+ activity := DB.DBA.Dropbox__paramGet (detcol_id, 'C', 'activity', 0);
+ if (activity is null)
+ return;
+
+ if (activity <> 'on')
+ return;
+
+ davEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcol_id, 'C', '', null, null, http_dav_uid ());
+ if (DB.DBA.DAV_HIDE_ERROR (davEntry) is null)
+ return;
+
+ parent_id := DB.DBA.DAV_SEARCH_ID (davEntry[0], 'P');
+ if (DB.DBA.DAV_HIDE_ERROR (parent_id) is null)
+ return;
+
+ parentPath := DB.DBA.DAV_SEARCH_PATH (parent_id, 'C');
+ if (DB.DBA.DAV_HIDE_ERROR (parentPath) is null)
+ return;
+
+ activityContent := '';
+ activityName := davEntry[10] || '_activity.log';
+ activityPath := parentPath || activityName;
+ activity_id := DB.DBA.DAV_SEARCH_ID (activityPath, 'R');
+ if (DB.DBA.DAV_HIDE_ERROR (activity_id) is not null)
+{
+ DB.DBA.DAV_RES_CONTENT_INT (activity_id, activityContent, activityType, 0, 0);
+ if (activityType <> 'text/plain')
+ return;
+
+ activityContent := cast (activityContent as varchar);
+ }
+ activityContent := activityContent || sprintf ('%s %s\r\n', subseq (datestring (now ()), 0, 19), text);
+ activityType := 'text/plain';
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (activityPath, activityContent, activityType, '110100000RR', DB.DBA.Dropbox__user (davEntry[6]), DB.DBA.Dropbox__user (davEntry[7]), extern=>0, check_locks=>0);
+ commit work;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__downloads (
+ in detcol_id integer,
+ in downloads any)
+{
+ declare aq any;
+
+ if (length (downloads) = 0)
+ return;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.Dropbox__downloads_aq', vector (detcol_id, downloads));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__downloads_aq (
+ in detcol_id integer,
+ in downloads any)
+{
+ declare N, downloaded integer;
+ declare url varchar;
+ declare items, listPath any;
+ declare retValue, retHeader any;
+
+ set_user_id ('dba');
+ N := 0;
+ items := vector ();
+ DB.DBA.Dropbox__activity (detcol_id, sprintf ('Downloading %d file(s)', length (downloads)));
+ foreach (any download in downloads) do
+ {
+ downloaded := DB.DBA.Dropbox__paramGet (download[0], download[1], 'download', 0);
+ if (downloaded is null)
+ goto _continue;
+
+ downloaded := cast (downloaded as integer);
+ if (downloaded > 5)
+ goto _continue;
+
+ listPath := DB.DBA.Dropbox__paramGet (download[0], download[1], 'path', 0);
+ if (listPath is null)
+ goto _continue;
+
+ url := sprintf ('https://api-content.dropbox.com/1/files/%s%s', DB.DBA.Dropbox__root (), DB.DBA.Dropbox__pathU (listPath));
+ retValue := DB.DBA.Dropbox__exec (detcol_id, retHeader, 'GET', url);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ {
+ downloaded := downloaded + 1;
+ DB.DBA.Dropbox__paramSet (download[0], download[1], 'download', cast (downloaded as varchar), 0);
+ goto _continue;
+ }
+ update WS.WS.SYS_DAV_RES set RES_CONTENT = retValue where RES_ID = DB.DBA.Dropbox__davId (download[0]);
+ DB.DBA.Dropbox__paramRemove (download[0], download[1], 'download');
+ commit work;
+ items := vector_concat (items, vector (download));
+ N := N + 1;
+
+ _continue:;
+ }
+ DB.DBA.Dropbox__activity (detcol_id, sprintf ('Downloaded %d file(s)', N));
+ foreach (any item in items) do
+ {
+ DB.DBA.Dropbox__rdf_delete (detcol_id, item[0], item[1]);
+ DB.DBA.Dropbox__rdf_insert (detcol_id, item[0], item[1]);
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__rdf (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ declare aq any;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.Dropbox__rdf_aq', vector (detcol_id, id, what));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__rdf_aq (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ set_user_id ('dba');
+ DB.DBA.Dropbox__rdf_delete (detcol_id, id, what);
+ DB.DBA.Dropbox__rdf_insert (detcol_id, id, what);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__rdf_insert (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__rdf_insert (', detcol_id, id, what, rdf_graph, ')');
+ declare permissions, rdf_graph2 varchar;
+ declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;
+ declare path, content, type any;
+ declare exit handler for sqlstate '*'
+ {
+ return;
+ };
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.Dropbox__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ permissions := DB.DBA.Dropbox__paramGet (detcol_id, 'C', ':virtpermissions', 0, 0);
+ if (permissions[6] = ascii('0'))
+ {
+ -- add to private graphs
+ if (not SIOC..private_graph_check (rdf_graph))
+ return;
+ }
+
+ id := DB.DBA.Dropbox__davId (id);
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = id);
+ type := (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = id);
+ rdf_sponger := coalesce (DB.DBA.Dropbox__paramGet (detcol_id, 'C', 'sponger', 0), 'on');
+ rdf_cartridges := coalesce (DB.DBA.Dropbox__paramGet (detcol_id, 'C', 'cartridges', 0), '');
+ rdf_metaCartridges := coalesce (DB.DBA.Dropbox__paramGet (detcol_id, 'C', 'metaCartridges', 0), '');
+
+ RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__rdf_delete (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__rdf_delete (', detcol_id, id, what, rdf_graph, ')');
+ declare rdf_graph2 any;
+ declare path varchar;
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.Dropbox__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ if (path like '%.gz')
+ path := regexp_replace (path, '\.gz\x24', '');
+
+ rdf_graph2 := 'http://local.virt' || path;
+ SPARQL delete from graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };
+ SPARQL clear graph ?:rdf_graph2;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.Dropbox__refresh (
+ in path varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.Dropbox__refresh (', path, ')');
+ declare colId any;
+
+ colId := DB.DBA.DAV_SEARCH_ID (path, 'C');
+ if (DAV_HIDE_ERROR (colId) is not null)
+ DB.DBA.Dropbox__paramRemove (colId, 'C', 'syncTime');
+}
+;
diff --git a/appsrc/ODS-Briefcase/new/DET_GDrive.sql b/appsrc/ODS-Briefcase/new/DET_GDrive.sql
new file mode 100644
index 0000000..f43727c
--- /dev/null
+++ b/appsrc/ODS-Briefcase/new/DET_GDrive.sql
@@ -0,0 +1,1680 @@
+--
+-- $Id: DET_GDrive.sql,v 1.1 2012/05/12 05:50:30 ddimitrov 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 "GDrive_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 ('GDrive_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE (id[2], what, req, auth_uname, auth_pwd, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "GDrive_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 ('GDrive_DAV_AUTHENTICATE_HTTP (', id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE_HTTP (id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);
+
+ return retValue;
+}
+;
+
+--| This should return ID of the collection that contains resource or collection with given ID,
+--| Possible ambiguity (such as symlinks etc.) should be resolved by using path.
+--| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
+create function "GDrive_DAV_GET_PARENT" (
+ in id any,
+ in what char(1),
+ in path varchar) returns any
+{
+ -- dbg_obj_princ ('GDrive_DAV_GET_PARENT (', id, what, path, ')');
+ declare retValue any;
+
+ retValue := DAV_GET_PARENT (id[2], what, path);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ retValue := vector (DB.DBA.GDrive__detName (), id[1], retValue, 'C');
+
+ return retValue;
+}
+;
+
+--| 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 "GDrive_DAV_COL_CREATE" (
+ in detcol_id any,
+ in path_parts any,
+ in permissions varchar,
+ in uid integer,
+ in gid integer,
+ in auth_uid integer,
+ in extern integer := 0) returns any
+{
+ -- dbg_obj_princ ('GDrive_DAV_COL_CREATE (', detcol_id, path_parts, permissions, uid, gid, auth_uid, extern, ')');
+ declare ouid, ogid integer;
+ declare parent_id, parent_path any;
+ declare name, parentResourceId, resourceId varchar;
+ declare url, header, body, params any;
+ declare retValue, retHeader, result, save, xmlEntry any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ if (save is null)
+ {
+ name := path_parts[length (path_parts)-2];
+ parentResourceId := 'folder:root';
+ if (length (path_parts) > 2)
+ {
+ parent_id := DB.DBA.DAV_SEARCH_ID (DB.DBA.GDrive__path (detcol_id, path_parts), 'P');
+ parentResourceId := DB.DBA.GDrive__paramGet (parent_id, 'C', 'resourceId', 0);
+ }
+ url := sprintf ('https://docs.google.com/feeds/default/private/full/%U/contents', parentResourceId);
+ body := sprintf (
+ '<?xml version="1.0" encoding="UTF-8"?>' ||
+ '<entry xmlns="http://www.w3.org/2005/Atom">' ||
+ ' <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/docs/2007#folder"/>' ||
+ ' <title>%V</title>' ||
+ '</entry>',
+ name);
+ header := sprintf (
+ 'Content-Length: %d\r\n' ||
+ 'Content-Type: application/atom+xml\r\n',
+ length (body));
+ result := DB.DBA.GDrive__exec (detcol_id, retHeader, 'POST', url, header, body);
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ xmlEntry := xtree_doc (result);
+ resourceId := DB.DBA.GDrive__entryXPath (xmlEntry, '/gd:resourceId', 1);
+ }
+ connection_set ('dav_store', 1);
+ DB.DBA.GDrive__owner (detcol_id, path_parts, DB.DBA.GDrive__user (uid, auth_uid), DB.DBA.GDrive__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_COL_CREATE_INT (DB.DBA.GDrive__path (detcol_id, path_parts), permissions, DB.DBA.GDrive__user (uid, auth_uid), DB.DBA.GDrive__user (gid, auth_uid), DB.DBA.GDrive__user (http_dav_uid ()), DB.DBA.GDrive__password (http_dav_uid ()), 1, 0, 1, ouid, ogid);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ if (save is null)
+ {
+ DB.DBA.GDrive__paramSet (retValue, 'C', 'Entry', DB.DBA.GDrive__xml2string (xmlEntry), 0);
+ DB.DBA.GDrive__paramSet (retValue, 'C', 'resourceId', resourceId, 0);
+ }
+ DB.DBA.GDrive__paramSet (retValue, 'C', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.GDrive__detName (), detcol_id, retValue, 'C');
+ }
+
+ return retValue;
+}
+;
+
+--| It looks like that this is redundant and should be removed at all.
+create function "GDrive_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 ('GDrive_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 "GDrive_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 ('GDrive_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 "GDrive_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 ('GDrive_DAV_DELETE (', detcol_id, path_parts, what, silent, auth_uid, ')');
+ declare path, resourceId varchar;
+ declare retValue, save any;
+ declare id, url, header, retHeader, params any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.GDrive__path (detcol_id, path_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (save is null)
+ {
+ resourceId := DB.DBA.GDrive__paramGet (id, what, 'resourceId', 0);
+ url := sprintf ('https://docs.google.com/feeds/default/private/full/%U', resourceId);
+ header := 'If-Match: *\n\r';
+ retValue := DB.DBA.GDrive__exec (detcol_id, retHeader, 'DELETE', url, header);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ goto _exit;
+ }
+ connection_set ('dav_store', 1);
+ if (what = 'R')
+ DB.DBA.GDrive__rdf_delete (detcol_id, id, what);
+ retValue := DAV_DELETE_INT (path, 1, null, null, 0, 0);
+
+_exit:;
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "GDrive_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 ('GDrive_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', type, permissions, uid, gid, auth_uid, ')');
+ declare L integer;
+ declare ouid, ogid integer;
+ declare name, path, rdf_graph varchar;
+ declare id any;
+ declare url, header, body, params any;
+ declare retValue, retHeader, retCode, result, save, xmlEntry any;
+ declare resourceId, parent_id any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.GDrive__path (detcol_id, path_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, 'R');
+ if (save is null)
+ {
+ 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
+ }
+ content := blob_to_string (content);
+ if (content = '')
+ content := ' ';
+
+ L := length (content);
+ if (DAV_HIDE_ERROR (id) is not null)
+ {
+ resourceId := DB.DBA.GDrive__paramGet (id, 'R', 'resourceId', 0);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ goto _create;
+
+ url := sprintf ('https://docs.google.com/feeds/default/private/full/%U', resourceId);
+ result := DB.DBA.GDrive__exec (detcol_id, retHeader, 'GET', url);
+ if (DAV_HIDE_ERROR (result) is null)
+ goto _create;
+
+ xmlEntry := xtree_doc (result);
+
+ -- update resource
+
+ -- meatdata
+ url := DB.DBA.GDrive__entryXPath (xmlEntry, '/link[@rel="edit"]/@href', 1);
+
+ -- update content
+ -- new session
+ url := DB.DBA.GDrive__entryXPath (xmlEntry, '/link[@rel="http://schemas.google.com/g/2005#resumable-edit-media"]/@href', 1);
+ if (isnull (url))
+ goto _exit_1;
+
+ url := url || '?convert=false';
+ header := sprintf (
+ 'If-Match: *\r\n' ||
+ 'Content-Length: 0\r\n' ||
+ 'Content-Type: %s\r\n' ||
+ 'X-Upload-Content-Length: %d\r\n' ||
+ 'X-Upload-Content-Type: %s\r\n',
+ type,
+ L,
+ type);
+ result := DB.DBA.GDrive__exec (detcol_id, retHeader, 'PUT', url, header);
+ if (DAV_HIDE_ERROR (result) is null)
+ goto _exit_1;
+
+ retCode := DB.DBA.GDrive__exec_code (retHeader);
+ if (retCode <> '200')
+ goto _exit_1;
+
+ -- content (with resumable protocol)
+ url := http_request_header (retHeader, 'Location');
+ if (isnull (url))
+ goto _exit_1;
+
+ header := sprintf (
+ 'Content-Type: %s\r\n' ||
+ 'Content-Length: %d\r\n' ||
+ 'Content-Range: bytes 0-%d/%d',
+ type,
+ L,
+ L-1,
+ L);
+ result := DB.DBA.GDrive__exec (detcol_id, retHeader, 'PUT', url, header, content);
+ if (DAV_HIDE_ERROR (result) is null)
+ goto _exit_1;
+
+ goto _skip_create;
+ }
+ -- create resource metadata
+ --
+ _create:;
+ name := path_parts[length (path_parts)-1];
+
+ -- get parent edit-media link and next get new session
+ url := 'https://docs.google.com/feeds/upload/create-session/default/private/full';
+ if (length (path_parts) > 1)
+ {
+ parent_id := DB.DBA.DAV_SEARCH_ID (DB.DBA.GDrive__path (detcol_id, path_parts), 'P');
+ xmlEntry := DB.DBA.GDrive__paramGet (parent_id, 'C', 'Entry', 0);
+ if (DAV_HIDE_ERROR (xmlEntry) is null)
+ goto _exit_1;
+
+ xmlEntry := xtree_doc (xmlEntry);
+ url := DB.DBA.GDrive__entryXPath (xmlEntry, '/link[@rel="http://schemas.google.com/g/2005#resumable-create-media"]/@href', 1);
+ if (isnull (url))
+ goto _exit_1;
+ }
+ url := url || '?convert=false';
+ body := sprintf (
+ '<?xml version="1.0" encoding="UTF-8"?>' ||
+ '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:docs="http://schemas.google.com/docs/2007">' ||
+ ' <category scheme="http://schemas.google.com/g/2005#kind"' ||
+ ' term="http://schemas.google.com/docs/2007#file"' ||
+ ' label="file" />' ||
+ ' <title>%V</title>' ||
+ '</entry>',
+ name);
+ header := sprintf (
+ 'Content-Length: %d\r\n' ||
+ 'Content-Type: application/atom+xml\r\n' ||
+ 'X-Upload-Content-Length: %d\r\n' ||
+ 'X-Upload-Content-Type: %s\r\n',
+ length (body),
+ L,
+ type);
+ result := DB.DBA.GDrive__exec (detcol_id, retHeader, 'POST', url, header, body);
+ if (DAV_HIDE_ERROR (result) is null)
+ goto _exit_1;
+
+ retCode := DB.DBA.GDrive__exec_code (retHeader);
+ if (retCode <> '200')
+ goto _exit_1;
+
+ -- upload resource content (with resumable protocol)
+ url := http_request_header (retHeader, 'Location');
+ if (isnull (url))
+ goto _exit_1;
+
+ header := sprintf (
+ 'Content-Length: %d\r\n' ||
+ 'Content-Type: %s\r\n' ||
+ 'Content-Range: bytes 0-%d/%d',
+ L,
+ type,
+ L-1,
+ L);
+ result := DB.DBA.GDrive__exec (detcol_id, retHeader, 'PUT', url, header, content);
+ if (DAV_HIDE_ERROR (result) is null)
+ goto _exit_1;
+
+ retCode := DB.DBA.GDrive__exec_code (retHeader);
+ if (retCode <> '201')
+ goto _exit_1;
+
+ xmlEntry := xtree_doc (result);
+ resourceId := DB.DBA.GDrive__entryXPath (xmlEntry, '/gd:resourceId', 1);
+ }
+_skip_create:;
+ connection_set ('dav_store', 1);
+ DB.DBA.GDrive__owner (detcol_id, path_parts, DB.DBA.GDrive__user (uid, auth_uid), DB.DBA.GDrive__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, DB.DBA.GDrive__user (uid, auth_uid), DB.DBA.GDrive__user (gid, auth_uid), DB.DBA.GDrive__user (http_dav_uid ()), DB.DBA.GDrive__password (http_dav_uid ()), 0, ouid=>ouid, ogid=>ogid, check_locks=>0);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ rdf_graph := DB.DBA.GDrive__paramGet (detcol_id, 'C', 'graph', 0);
+ if (not DB.DBA.is_empty_or_null (rdf_graph))
+ DB.DBA.GDrive__rdf (detcol_id, retValue, 'R');
+
+ if (save is null)
+ {
+ DB.DBA.GDrive__paramSet (retValue, 'R', 'Entry', DB.DBA.GDrive__xml2string (xmlEntry), 0);
+ DB.DBA.GDrive__paramSet (retValue, 'R', ':creationdate', DB.DBA.GDrive__entryXPath (xmlEntry, sprintf ('/published', resourceId), 1), 0, 0);
+ DB.DBA.GDrive__paramSet (retValue, 'R', ':getlastmodified', DB.DBA.GDrive__entryXPath (xmlEntry, sprintf ('/updated', resourceId), 1), 0, 0);
+ DB.DBA.GDrive__paramSet (retValue, 'R', 'resourceId', resourceId, 0);
+ }
+ DB.DBA.GDrive__paramSet (retValue, 'R', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.GDrive__detName (), detcol_id, retValue, 'R');
+ }
+
+ return retValue;
+
+_exit_1:;
+ retValue := -28;
+ goto _exit;
+}
+;
+
+--| 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.
+--| It should delete any dead property even if the name looks like system name.
+create function "GDrive_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 ('GDrive_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_REMOVE_RAW (id[2], what, propname, silent, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "GDrive_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 ('GDrive_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
+ declare retValue any;
+
+ id := id[2];
+ retValue := DB.DBA.DAV_PROP_SET_RAW (id, what, propname, propvalue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
+create function "GDrive_DAV_PROP_GET" (
+ in id any,
+ in what char(0),
+ in propname varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('GDrive_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_GET_INT (id[2], what, propname, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
+--| The returned list should contain only user properties.
+create function "GDrive_DAV_PROP_LIST" (
+ in id any,
+ in what char(0),
+ in propmask varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('GDrive_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_LIST_INT (id[2], what, propmask, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "GDrive_DAV_DIR_SINGLE" (
+ in id any,
+ in what char(0),
+ in path any,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('GDrive_DAV_DIR_SINGLE (', id, what, path, auth_uid, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_DIR_SINGLE_INT (id[2], what, null, DB.DBA.GDrive__user (http_dav_uid ()), DB.DBA.GDrive__password (http_dav_uid ()), http_dav_uid ());
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null) and (save is null))
+ retValue[4] := vector (DB.DBA.GDrive__detName (), id[1], retValue[4], what);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "GDrive_DAV_DIR_LIST" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ in name_mask varchar,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('GDrive_DAV_DIR_LIST (', detcol_id, subPath_parts, detcol_parts, name_mask, recursive, auth_uid, ')');
+ declare colId integer;
+ declare what, colPath varchar;
+ declare retValue, save, downloads, davItems, entries, colEntry, xmlItems, xmlEntries, xmlEntry, davEntry, davResouresId any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', null);
+ what := case when ((length (subPath_parts) = 0) or (subPath_parts[length (subPath_parts) - 1] = '')) then 'C' else 'R' end;
+ if ((what = 'R') or (recursive = -1))
+ return DB.DBA.GDrive_DAV_DIR_SINGLE (detcol_id, what, null, auth_uid);
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.DAV_SEARCH_ID (colPath, 'C');
+
+ downloads := vector ();
+ entries := DB.DBA.GDrive__list (detcol_id, detcol_parts, subPath_parts);
+ if (DAV_HIDE_ERROR (entries) is null)
+ goto _exit;
+
+ if (isinteger (entries))
+ goto _exit;
+
+ DB.DBA.GDrive__activity (detcol_id, 'Sync started');
+ {
+ declare _id, _what, _type, _content any;
+ declare resourceId, ETag, title varchar;
+ {
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.GDrive__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ goto _exitSync;
+ };
+
+ connection_set ('dav_store', 1);
+ colEntry := DB.DBA.DAV_DIR_SINGLE_INT (colId, 'C', '', null, null, http_dav_uid ());
+ davResouresId := vector ();
+ xmlEntries := xtree_doc (entries);
+ davItems := DB.DBA.GDrive__davList (detcol_id, colId);
+ foreach (any davItem in davItems) do
+ {
+ connection_set ('dav_store', 1);
+ resourceId := DB.DBA.GDrive__paramGet (davItem[4], davItem[1], 'resourceId', 0);
+ if (resourceId is not null)
+ {
+ xmlEntry := DB.DBA.GDrive__entryXPath (xmlEntries, sprintf ('[gd:resourceId = "%s"]', resourceId));
+ if (xmlEntry is not null)
+ {
+ xmlEntry := xml_cut (xmlEntry);
+ ETag := DB.DBA.GDrive__entryXPath (xmlEntries, sprintf ('[gd:resourceId = "%s"]/@gd:etag', resourceId), 1);
+ davEntry := DB.DBA.GDrive__paramGet (davItem[4], davItem[1], 'Entry', 0);
+ if (DAV_HIDE_ERROR (davEntry) is not null)
+ {
+ davResouresId := vector_concat (davResouresId, vector (resourceId));
+ davEntry := xtree_doc (davEntry);
+ if (ETag <> DB.DBA.GDrive__entryXPath (davEntry, '/@gd:etag', 1))
+ {
+ set triggers off;
+ DB.DBA.GDrive__paramSet (davItem[4], davItem[1], ':getlastmodified', DB.DBA.GDrive__entryXPath (xmlEntry, sprintf ('/updated', resourceId), 1), 0, 0);
+ set triggers on;
+ DB.DBA.GDrive__paramSet (davItem[4], davItem[1], 'Entry', DB.DBA.GDrive__xml2string (xmlEntry), 0);
+ if (davItem[1] = 'R')
+ {
+ DB.DBA.GDrive__paramSet (davItem[4], davItem[1], 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ else
+ {
+ declare downloaded integer;
+
+ downloaded := DB.DBA.GDrive__paramGet (davItem[4], davItem[1], 'download', 0);
+ if (downloaded is not null)
+ {
+ downloaded := cast (downloaded as integer);
+ if (downloaded <= 5)
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ goto _continue;
+ }
+ }
+ }
+ if (davItem[1] = 'R')
+ DB.DBA.GDrive__rdf_delete (detcol_id, davItem[4], davItem[1]);
+ DAV_DELETE_INT (davItem[0], 1, null, null, 0, 0);
+
+ _continue:;
+ commit work;
+ }
+ xmlItems := xpath_eval ('/feed/entry', xmlEntries, 0);
+ foreach (any xmlItem in xmlItems) do
+ {
+ xmlItem := xml_cut(xmlItem);
+ resourceId := DB.DBA.GDrive__entryXPath (xmlItem, '/gd:resourceId', 1);
+ if (not position (resourceId, davResouresId))
+ {
+ title := DB.DBA.GDrive__entryXPath (xmlItem, '/title', 1);
+ connection_set ('dav_store', 1);
+ if (resourceId like 'folder%')
+ {
+ _id := DB.DBA.DAV_COL_CREATE (colPath || title || '/', colEntry[5], colEntry[7], colEntry[6], DB.DBA.GDrive__user (http_dav_uid ()), DB.DBA.GDrive__password (http_dav_uid ()));
+ _what := 'C';
+ }
+ else
+ {
+ if (DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_ID (colPath || title, 'R')) is not null)
+ title := sprintf ('%s - %s', title, DB.DBA.GDrive__cleanResourceId (resourceId));
+
+ _content := '';
+ _type := DB.DBA.GDrive__entryXPath (xmlItem, '/content/@type', 1);
+ _id := DB.DBA.DAV_RES_UPLOAD (colPath || title, _content, _type, colEntry[5], colEntry[7], colEntry[6], DB.DBA.GDrive__user (http_dav_uid ()), DB.DBA.GDrive__password (http_dav_uid ()));
+ _what := 'R';
+ }
+ if (DAV_HIDE_ERROR (_id) is not null)
+ {
+ set triggers off;
+ DB.DBA.GDrive__paramSet (_id, _what, ':creationdate', DB.DBA.GDrive__entryXPath (xmlItem, sprintf ('/published', resourceId), 1), 0, 0);
+ DB.DBA.GDrive__paramSet (_id, _what, ':getlastmodified', DB.DBA.GDrive__entryXPath (xmlItem, sprintf ('/updated', resourceId), 1), 0, 0);
+ set triggers on;
+ DB.DBA.GDrive__paramSet (_id, _what, 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ DB.DBA.GDrive__paramSet (_id, _what, 'resourceId', resourceId, 0);
+ DB.DBA.GDrive__paramSet (_id, _what, 'Entry', DB.DBA.GDrive__xml2string (xmlItem), 0);
+ if (_what = 'R')
+ {
+ DB.DBA.GDrive__paramSet (_id, _what, 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (_id, _what)));
+ }
+ }
+ commit work;
+ }
+ }
+ }
+ _exitSync:
+ connection_set ('dav_store', save);
+ }
+ DB.DBA.GDrive__activity (detcol_id, 'Sync ended');
+
+_exit:;
+ retValue := DB.DBA.GDrive__davList (detcol_id, colId);
+ DB.DBA.GDrive__downloads (detcol_id, downloads);
+
+ return retValue;
+}
+;
+
+--| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
+create function "GDrive_DAV_DIR_FILTER" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ inout compilation any,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('GDrive_DAV_DIR_FILTER (', detcol_id, subPath_parts, detcol_parts, compilation, recursive, 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 "GDrive_DAV_SEARCH_ID" (
+ in detcol_id any,
+ in path_parts any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('GDrive_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_SEARCH_ID (DB.DBA.GDrive__path (detcol_id, path_parts), what);
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null))
+ {
+ if (isinteger (retValue) and (save is null))
+ retValue := vector (DB.DBA.GDrive__detName (), detcol_id, retValue, what);
+
+ else if (isarray (retValue) and (save = 1))
+ retValue := retValue[2];
+ }
+ return retValue;
+}
+;
+
+create function "GDrive_DAV_MAKE_ID" (
+ in detcol_id any,
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('GDrive_DAV_MAKE_ID (', id, what, ')');
+ declare retValue any;
+
+ retValue := vector (DB.DBA.GDrive__detName (), detcol_id, id, what);
+
+ return retValue;
+}
+;
+
+--| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
+create function "GDrive_DAV_SEARCH_PATH" (
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('Gdrive_DAV_SEARCH_PATH (', id, what, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DB.DBA.DAV_SEARCH_PATH (davId, what);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "GDrive_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 ('GDrive_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 "GDrive_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 ('GDrive_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 "GDrive_DAV_RES_CONTENT" (
+ in id any,
+ inout content any,
+ out type varchar,
+ in content_mode integer) returns integer
+{
+ -- dbg_obj_princ ('GDrive_DAV_RES_CONTENT (', id, ', [content], [type], ', content_mode, ')');
+ declare retValue any;
+
+ retValue := DAV_RES_CONTENT_INT (id[2], content, type, content_mode, 0);
+
+ return retValue;
+}
+;
+
+--| This adds an extra access path to the existing resource or collection.
+create function "GDrive_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 ('GDrive_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 "GDrive_DAV_DEREFERENCE_LIST" (
+ in detcol_id any,
+ inout report_array any) returns any
+{
+ -- dbg_obj_princ ('GDrive_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 "GDrive_DAV_RESOLVE_PATH" (
+ in detcol_id any,
+ inout reference_item any,
+ inout old_base varchar,
+ inout new_base varchar) returns any
+{
+ -- dbg_obj_princ ('GDrive_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 "GDrive_DAV_LOCK" (
+ in path any,
+ in id any,
+ in what 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 ('GDrive_DAV_LOCK (', path, id, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LOCK_INT (path, davId, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, DB.DBA.GDrive__user (auth_uid), DB.DBA.GDrive__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+
+--| 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 "GDrive_DAV_UNLOCK" (
+ in id any,
+ in what char(1),
+ in token varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('GDrive_DAV_UNLOCK (', id, what, token, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_UNLOCK_INT (davId, what, token, DB.DBA.GDrive__user (auth_uid), DB.DBA.GDrive__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "GDrive_DAV_IS_LOCKED" (
+ inout id any,
+ inout what char(1),
+ in owned_tokens varchar) returns integer
+{
+ -- dbg_obj_princ ('GDrive_DAV_IS_LOCKED (', id, what, owned_tokens, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_IS_LOCKED_INT (davId, what, owned_tokens);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "GDrive_DAV_LIST_LOCKS" (
+ in id any,
+ in what char(1),
+ in recursive integer) returns any
+{
+ -- dbg_obj_princ ('GDrive_DAV_LIST_LOCKS" (', id, what, recursive);
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LIST_LOCKS_INT (davId, what, recursive);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__fileDebug (
+ in value any,
+ in mode integer := -1)
+{
+ string_to_file ('gdrive.txt', cast (value as varchar) || '\r\n', mode);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__detcolId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[1];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__davId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[2];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__cleanResourceId (
+ in resourceId varchar)
+{
+ return subseq (resourceId, strstr (resourceId, ':')+1);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__user (
+ in user_id integer,
+ in default_id integer := null)
+{
+ return coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = coalesce (user_id, default_id)), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__password (
+ in user_id integer)
+{
+ return coalesce ((select pwd_magic_calc(U_NAME, U_PWD, 1) from WS.WS.SYS_DAV_USER where U_ID = user_id), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__owner (
+ in detcol_id any,
+ in subPath_parts any,
+ in uid any,
+ in gid any,
+ inout ouid integer,
+ inout ogid integer)
+{
+ declare id any;
+ declare path varchar;
+
+ DB.DBA.DAV_OWNER_ID (uid, gid, ouid, ogid);
+ if ((ouid = -12) or (ouid = 5))
+ {
+ path := DB.DBA.GDrive__path (detcol_id, subPath_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, 'P');
+ if (DAV_HIDE_ERROR (id))
+ {
+ select COL_OWNER, COL_GROUP
+ into ouid, ogid
+ from WS.WS.SYS_DAV_COL
+ where COL_ID = id;
+ }
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__detName ()
+{
+ return UNAME'GDrive';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__xml2string (
+ in _xml any)
+{
+ declare stream any;
+
+ stream := string_output ();
+ http_value (_xml, null, stream);
+ return string_output_string (stream);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__path (
+ in detcol_id any,
+ in subPath_parts any)
+{
+ declare N integer;
+ declare path varchar;
+
+ path := rtrim (DB.DBA.DAV_SEARCH_PATH (detcol_id, 'C'), '/');
+ for (N := 0; N < length (subPath_parts); N := N + 1)
+ path := path || '/' || subPath_parts[N];
+
+ return path;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__params (
+ in colId integer)
+{
+ declare tmp, params any;
+
+ colId := DB.DBA.GDrive__detcolId (colId);
+ tmp := DB.DBA.GDrive__paramGet (colId, 'C', 'Authentication', 0);
+ if (tmp = 'Yes')
+ {
+ params := vector (
+ 'authentication', tmp,
+ 'access_timestamp', stringdate (DB.DBA.GDrive__paramGet (colId, 'C', 'access_timestamp', 0)),
+ 'access_token', DB.DBA.GDrive__paramGet (colId, 'C', 'access_token', 0),
+ 'token_type', DB.DBA.GDrive__paramGet (colId, 'C', 'token_type', 0),
+ 'expires_in', cast (DB.DBA.GDrive__paramGet (colId, 'C', 'expires_in', 0) as integer),
+ 'refresh_token', DB.DBA.GDrive__paramGet (colId, 'C', 'refresh_token', 0),
+ 'graph', DB.DBA.GDrive__paramGet (colId, 'C', 'graph', 0)
+ );
+ }
+ else
+ {
+ params := vector ('authentication', 'No');
+ }
+ return params;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__paramSet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _propValue any,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _encrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__paramSet', _propName, _propValue, ')');
+ declare retValue any;
+
+ if (_serialized)
+ _propValue := serialize (_propValue);
+
+ if (_encrypt)
+ _propValue := pwd_magic_calc ('gdrive', _propValue);
+
+ if (_prefixed)
+ _propName := 'virt:GDrive-' || _propName;
+
+ _id := DB.DBA.GDrive__davId (_id);
+ retValue := DB.DBA.DAV_PROP_SET_RAW (_id, _what, _propName, _propValue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__paramGet (
+ in _id integer,
+ in _what varchar,
+ in _propName varchar,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _decrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__paramGet (', _id, _what, _propName, ')');
+ declare propValue any;
+
+ if (_prefixed)
+ _propName := 'virt:GDrive-' || _propName;
+
+ propValue := DB.DBA.DAV_PROP_GET_INT (DB.DBA.GDrive__davId (_id), _what, _propName, 0, DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()), http_dav_uid ());
+ if (isinteger (propValue))
+ propValue := null;
+
+ if (_serialized and not isnull (propValue))
+ propValue := deserialize (propValue);
+
+ if (_decrypt and not isnull (propValue))
+ propValue := pwd_magic_calc ('gdrive', propValue, 1);
+
+ return propValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__paramRemove (
+ in _id integer,
+ in _what varchar,
+ in _propName varchar,
+ in _prefixed integer := 1)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__paramRemove (', _id, _what, _propName, ')');
+ if (_prefixed)
+ _propName := 'virt:GDrive-' || _propName;
+
+ DB.DBA.DAV_PROP_REMOVE_RAW (DB.DBA.GDrive__davId (_id), _what, _propName, 1, http_dav_uid());
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__entryXPath (
+ in _xml any,
+ in _xpath varchar,
+ in _cast integer := 0)
+{
+ declare retValue any;
+
+ if (_cast)
+ {
+ retValue := serialize_to_UTF8_xml (xpath_eval (sprintf ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] string (//entry%s)', _xpath), _xml, 1));
+ } else {
+ retValue := xpath_eval ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] //entry' || _xpath, _xml, 1);
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__exec_error (
+ in _header any,
+ in _silent integer := 0)
+{
+ if ((_header[0] like 'HTTP/1._ 4__ %') or (_header[0] like 'HTTP/1._ 5__ %'))
+ {
+ if (not _silent)
+ signal ('22023', trim (_header[0], '\r\n'));
+
+ return 0;
+ }
+ return 1;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__exec_code (
+ in _header any)
+{
+ return subseq (_header[0], 9, 12);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__exec (
+ inout detcol_id integer,
+ inout retHeader varchar,
+ in method varchar,
+ in url varchar,
+ in header varchar := '',
+ in content varchar := '')
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__exec', detcol_id, method, url, header, ')');
+ declare retValue, params any;
+ declare _client_id, _client_secret varchar;
+ declare _expires_in, _access_timestamp, _token_type, _refresh_token any;
+ declare tmp, _json, _reqHeader, _resHeader, _body any;
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.GDrive__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ return -28;
+ };
+
+ params := DB.DBA.GDrive__params (detcol_id);
+ if (get_keyword ('authentication', params) <> 'Yes')
+ {
+ DB.DBA.GDrive__activity (detcol_id, 'Error: Not authenticated');
+ return -28;
+ }
+
+ _expires_in := get_keyword ('expires_in', params);
+ _access_timestamp := get_keyword ('access_timestamp', params);
+ _token_type := get_keyword ('token_type', params);
+ if (dateadd ('second', _expires_in, _access_timestamp) < now ())
+ {
+ -- refresh token first
+
+ _client_id := (select a_key from OAUTH..APP_REG where a_name = 'Google API' and a_owner = 0);
+ _client_secret := (select a_secret from OAUTH..APP_REG where a_name = 'Google API' and a_owner = 0);
+ _refresh_token := get_keyword ('refresh_token', params);
+ _reqHeader := null;
+ _resHeader := null;
+ _body := sprintf ('client_id=%U&client_secret=%U&refresh_token=%U&grant_type=%U', _client_id, _client_secret, _refresh_token, 'refresh_token');
+ _json := http_client_ext (url=>'https://accounts.google.com/o/oauth2/token', http_method=>'POST', http_headers=>_reqHeader, headers =>_resHeader, body=>_body, n_redirects=>15);
+ if (not DB.DBA.GDrive__exec_error (_resHeader, 1))
+ return -28;
+
+ tmp := subseq (ODS..json2obj(_json), 2);
+ DB.DBA.GDrive__paramSet (detcol_id, 'C', 'access_timestamp', datestring (now ()), 0);
+ DB.DBA.GDrive__paramSet (detcol_id, 'C', 'access_token', get_keyword ('access_token', tmp), 0);
+ DB.DBA.GDrive__paramSet (detcol_id, 'C', 'token_type', get_keyword ('token_type', tmp), 0);
+ DB.DBA.GDrive__paramSet (detcol_id, 'C', 'expires_in', cast (get_keyword ('expires_in', tmp) as varchar), 0);
+ params := DB.DBA.GDrive__params (detcol_id);
+ }
+
+ _reqHeader := sprintf ('GData-Version: 3.0\r\nAuthorization: %s %s\r\n', get_keyword ('token_type', params), get_keyword ('access_token', params));
+ if (header <> '')
+ _reqHeader := _reqHeader || header;
+
+ retHeader := null;
+ retValue := http_client_ext (url=>url, http_method=>method, http_headers=>_reqHeader, headers =>retHeader, body=>content, n_redirects=>15);
+ -- dbg_obj_print ('retValue', DB.DBA.GDrive__exec_code (retHeader), url, method);
+ if (not DB.DBA.GDrive__exec_error (retHeader, 1))
+ {
+ DB.DBA.GDrive__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__davList (
+ inout detcol_id integer,
+ inout colId integer)
+{
+ declare retValue any;
+
+ vectorbld_init (retValue);
+ for (select vector (RES_FULL_PATH,
+ 'R',
+ length (RES_CONTENT),
+ RES_MOD_TIME,
+ vector (DB.DBA.GDrive__detName (), detcol_id, RES_ID, 'R'),
+ RES_PERMS,
+ RES_GROUP,
+ RES_OWNER,
+ RES_CR_TIME,
+ RES_TYPE,
+ RES_NAME ) as I
+ from WS.WS.SYS_DAV_RES
+ where RES_COL = DB.DBA.GDrive__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ for (select vector (WS.WS.COL_PATH (COL_ID),
+ 'C',
+ 0,
+ COL_MOD_TIME,
+ vector (DB.DBA.GDrive__detName (), detcol_id, COL_ID, 'C'),
+ COL_PERMS,
+ COL_GROUP,
+ COL_OWNER,
+ COL_CR_TIME,
+ 'dav/unix-directory',
+ COL_NAME) as I
+ from WS.WS.SYS_DAV_COL
+ where COL_PARENT = DB.DBA.GDrive__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ vectorbld_final (retValue);
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__list (
+ inout detcol_id any,
+ inout detcol_parts varchar,
+ inout subPath_parts varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__list (', detcol_id, detcol_parts, subPath_parts, ')');
+ declare colId integer;
+ declare colPath, resourceId varchar;
+ declare syncTime datetime;
+ declare retValue, retHeader, value, entry any;
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.GDrive__davId (DB.DBA.DAV_SEARCH_ID (colPath, 'C'));
+ if (DAV_HIDE_ERROR (colId) is null)
+ return -28;
+
+ syncTime := DB.DBA.GDrive__paramGet (colId, 'C', 'syncTime');
+ if (not isnull (syncTime) and (datediff ('second', syncTime, now ()) < 300))
+ return 0;
+
+ if (length (subPath_parts) = 1)
+ {
+ resourceId := 'folder:root';
+ }
+ else
+ {
+ resourceId := DB.DBA.GDrive__paramGet (colId, 'C', 'resourceId', 0);
+ if (isnull (resourceId))
+ return -28;
+ }
+ retValue := DB.DBA.GDrive__exec (detcol_id, retHeader, 'GET', sprintf ('https://docs.google.com/feeds/default/private/full/%U/contents', resourceId));
+ --DB.DBA.GDrive__activity (detcol_id, retValue);
+ -- dbg_obj_print ('retValue', retValue);
+ if (not isinteger (retValue))
+ DB.DBA.GDrive__paramSet (colId, 'C', 'syncTime', now ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__activity (
+ in detcol_id integer,
+ in text varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__activity (', detcol_id, text, ')');
+ declare parent_id integer;
+ declare parentPath varchar;
+ declare activity_id integer;
+ declare activity, activityName, activityPath, activityContent, activityType varchar;
+ declare davEntry any;
+ declare _errorCount integer;
+ declare exit handler for sqlstate '*'
+ {
+ if (__SQL_STATE = '40001')
+{
+ rollback work;
+ if (_errorCount > 5)
+ resignal;
+
+ delay (1);
+ _errorCount := _errorCount + 1;
+ goto _start;
+ }
+ return;
+ };
+
+ _errorCount := 0;
+
+_start:;
+ activity := DB.DBA.GDrive__paramGet (detcol_id, 'C', 'activity', 0);
+ if (activity is null)
+ return;
+
+ if (activity <> 'on')
+ return;
+
+ davEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcol_id, 'C', '', null, null, http_dav_uid ());
+ if (DB.DBA.DAV_HIDE_ERROR (davEntry) is null)
+ return;
+
+ parent_id := DB.DBA.DAV_SEARCH_ID (davEntry[0], 'P');
+ if (DB.DBA.DAV_HIDE_ERROR (parent_id) is null)
+ return;
+
+ parentPath := DB.DBA.DAV_SEARCH_PATH (parent_id, 'C');
+ if (DB.DBA.DAV_HIDE_ERROR (parentPath) is null)
+ return;
+
+ activityContent := '';
+ activityName := davEntry[10] || '_activity.log';
+ activityPath := parentPath || activityName;
+ activity_id := DB.DBA.DAV_SEARCH_ID (activityPath, 'R');
+ if (DB.DBA.DAV_HIDE_ERROR (activity_id) is not null)
+ {
+ DB.DBA.DAV_RES_CONTENT_INT (activity_id, activityContent, activityType, 0, 0);
+ if (activityType <> 'text/plain')
+ return;
+
+ activityContent := cast (activityContent as varchar);
+ }
+ activityContent := activityContent || sprintf ('%s %s\r\n', subseq (datestring (now ()), 0, 19), text);
+ activityType := 'text/plain';
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (activityPath, activityContent, activityType, '110100000RR', DB.DBA.GDrive__user (davEntry[6]), DB.DBA.GDrive__user (davEntry[7]), extern=>0, check_locks=>0);
+ commit work;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__downloads (
+ in detcol_id integer,
+ in downloads any)
+{
+ declare aq any;
+
+ if (length (downloads) = 0)
+ return;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.GDrive__downloads_aq', vector (detcol_id, downloads));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__downloads_aq (
+ in detcol_id integer,
+ in downloads any)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__downloads_aq (', detcol_id, downloads, ')');
+ declare N, downloaded integer;
+ declare url, path varchar;
+ declare items, davEntry any;
+ declare retValue, retHeader any;
+
+ set_user_id ('dba');
+ N := 0;
+ items := vector ();
+ DB.DBA.GDrive__activity (detcol_id, sprintf ('Downloading %d file(s)', length (downloads)));
+ foreach (any download in downloads) do
+ {
+ downloaded := DB.DBA.GDrive__paramGet (download[0], download[1], 'download', 0);
+ if (downloaded is null)
+ goto _continue;
+
+ downloaded := cast (downloaded as integer);
+ if (downloaded > 5)
+ goto _continue;
+
+ davEntry := DB.DBA.GDrive__paramGet (download[0], download[1], 'Entry', 0);
+ if (davEntry is null)
+ goto _continue;
+
+ davEntry := xtree_doc (davEntry);
+ url := DB.DBA.GDrive__entryXPath (davEntry, '/content/@src', 1);
+ if (DB.DBA.is_empty_or_null (url))
+ url := DB.DBA.GDrive__entryXPath (davEntry, '/link[@rel="alternate"]/@href', 1);
+
+ if (isnull (url))
+ goto _continue;
+
+ retValue := DB.DBA.GDrive__exec (detcol_id, retHeader, 'GET', url);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ {
+ downloaded := downloaded + 1;
+ DB.DBA.GDrive__paramSet (download[0], download[1], 'download', cast (downloaded as varchar), 0);
+ }
+ else
+ {
+ update WS.WS.SYS_DAV_RES set RES_CONTENT = retValue where RES_ID = DB.DBA.GDrive__davId (download[0]);
+ DB.DBA.GDrive__paramRemove (download[0], download[1], 'download');
+ items := vector_concat (items, vector (download));
+ N := N + 1;
+ }
+ commit work;
+
+ _continue:;
+ }
+ DB.DBA.GDrive__activity (detcol_id, sprintf ('Downloaded %d file(s)', N));
+ foreach (any item in items) do
+ {
+ DB.DBA.GDrive__rdf_delete (detcol_id, item[0], item[1]);
+ DB.DBA.GDrive__rdf_insert (detcol_id, item[0], item[1]);
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__rdf (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ declare aq any;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.GDrive__rdf_aq', vector (detcol_id, id, what));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__rdf_aq (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ set_user_id ('dba');
+ DB.DBA.GDrive__rdf_delete (detcol_id, id, what);
+ DB.DBA.GDrive__rdf_insert (detcol_id, id, what);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__rdf_insert (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__rdf_insert (', detcol_id, id, what, rdf_graph, ')');
+ declare permissions, rdf_graph2 varchar;
+ declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;
+ declare path, content, type any;
+ declare exit handler for sqlstate '*'
+ {
+ return;
+ };
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.GDrive__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ permissions := DB.DBA.GDrive__paramGet (detcol_id, 'C', ':virtpermissions', 0, 0);
+ if (permissions[6] = ascii('0'))
+ {
+ -- add to private graphs
+ if (not SIOC..private_graph_check (rdf_graph))
+ return;
+ }
+
+ id := DB.DBA.GDrive__davId (id);
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = id);
+ type := (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = id);
+ rdf_sponger := coalesce (DB.DBA.GDrive__paramGet (detcol_id, 'C', 'sponger', 0), 'on');
+ rdf_cartridges := coalesce (DB.DBA.GDrive__paramGet (detcol_id, 'C', 'cartridges', 0), '');
+ rdf_metaCartridges := coalesce (DB.DBA.GDrive__paramGet (detcol_id, 'C', 'metaCartridges', 0), '');
+
+ RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__rdf_delete (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__rdf_delete (', detcol_id, id, what, rdf_graph, ')');
+ declare rdf_graph2 varchar;
+ declare path varchar;
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.GDrive__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ if (path like '%.gz')
+ path := regexp_replace (path, '\.gz\x24', '');
+
+ rdf_graph2 := 'http://local.virt' || path;
+ SPARQL delete from graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };
+ SPARQL clear graph ?:rdf_graph2;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.GDrive__refresh (
+ in path varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.GDrive__refresh (', path, ')');
+ declare colId any;
+
+ colId := DB.DBA.DAV_SEARCH_ID (path, 'C');
+ if (DAV_HIDE_ERROR (colId) is not null)
+ DB.DBA.GDrive__paramRemove (colId, 'C', 'syncTime');
+}
+;
diff --git a/appsrc/ODS-Briefcase/new/DET_SkyDrive.sql b/appsrc/ODS-Briefcase/new/DET_SkyDrive.sql
new file mode 100644
index 0000000..5f3de37
--- /dev/null
+++ b/appsrc/ODS-Briefcase/new/DET_SkyDrive.sql
@@ -0,0 +1,1565 @@
+--
+-- $Id: DET_SkyDrive.sql,v 1.1 2012/06/04 16:33:18 ddimitrov 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 "SkyDrive_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 ('SkyDrive_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE (id[2], what, req, auth_uname, auth_pwd, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "SkyDrive_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 ('SkyDrive_DAV_AUTHENTICATE_HTTP (', id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE_HTTP (id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);
+
+ return retValue;
+}
+;
+
+--| This should return ID of the collection that contains resource or collection with given ID,
+--| Possible ambiguity (such as symlinks etc.) should be resolved by using path.
+--| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
+create function "SkyDrive_DAV_GET_PARENT" (
+ in id any,
+ in what char(1),
+ in path varchar) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_GET_PARENT (', id, what, path, ')');
+ declare retValue any;
+
+ retValue := DAV_GET_PARENT (id[2], what, path);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ retValue := vector (DB.DBA.SkyDrive__detName (), id[1], retValue, 'C');
+
+ return retValue;
+}
+;
+
+--| 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 "SkyDrive_DAV_COL_CREATE" (
+ in detcol_id any,
+ in path_parts any,
+ in permissions varchar,
+ in uid integer,
+ in gid integer,
+ in auth_uid integer,
+ in extern integer := 0) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_COL_CREATE (', detcol_id, path_parts, permissions, uid, gid, auth_uid, extern, ')');
+ declare ouid, ogid integer;
+ declare title, parentID, parentListID, listID, listItem varchar;
+ declare url, body, header any;
+ declare retValue, retHeader, result, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ if (save is null)
+ {
+ title := path_parts[length (path_parts)-2];
+ parentListID := DB.DBA.SkyDrive__root ();
+ if (length (path_parts) > 2)
+ {
+ parentID := DB.DBA.DAV_SEARCH_ID (DB.DBA.SkyDrive__path (detcol_id, path_parts), 'P');
+ parentListID := DB.DBA.SkyDrive__paramGet (parentID, 'C', 'id', 0);
+ }
+ body := sprintf ('{name: "%s"}', title);
+ header := sprintf (
+ 'Content-Length: %d\r\n' ||
+ 'Content-Type: application/json\r\n',
+ length (body));
+ url := sprintf ('https://apis.live.net/v5.0/%U', parentListID);
+ result := DB.DBA.SkyDrive__exec (detcol_id, retHeader, 'POST', url, header, body);
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := ODS..json2obj (result);
+ listID := get_keyword ('id', listItem);
+ }
+ connection_set ('dav_store', 1);
+ DB.DBA.SkyDrive__owner (detcol_id, path_parts, DB.DBA.SkyDrive__user (uid, auth_uid), DB.DBA.SkyDrive__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_COL_CREATE_INT (DB.DBA.SkyDrive__path (detcol_id, path_parts), permissions, DB.DBA.SkyDrive__user (uid, auth_uid), DB.DBA.SkyDrive__user (gid, auth_uid), DB.DBA.SkyDrive__user (http_dav_uid ()), DB.DBA.SkyDrive__password (http_dav_uid ()), 1, 0, 1, ouid, ogid);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ if (save is null)
+ {
+ DB.DBA.SkyDrive__paramSet (retValue, 'C', 'Entry', DB.DBA.SkyDrive__obj2xml (listItem), 0);
+ DB.DBA.SkyDrive__paramSet (retValue, 'C', 'id', listID, 0);
+ }
+ DB.DBA.SkyDrive__paramSet (retValue, 'C', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.SkyDrive__detName (), detcol_id, retValue, 'C');
+ }
+
+ return retValue;
+}
+;
+
+--| It looks like that this is redundant and should be removed at all.
+create function "SkyDrive_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 ('SkyDrive_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 "SkyDrive_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 ('SkyDrive_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 "SkyDrive_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 ('SkyDrive_DAV_DELETE (', detcol_id, path_parts, what, silent, auth_uid, ')');
+ declare path, listId varchar;
+ declare retValue, save any;
+ declare id, url, header, retHeader, params any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.SkyDrive__path (detcol_id, path_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (save is null)
+ {
+ listId := DB.DBA.SkyDrive__paramGet (id, what, 'id', 0);
+ header := null;
+ url := sprintf ('https://apis.live.net/v5.0/%s', listId);
+ retValue := DB.DBA.SkyDrive__exec (detcol_id, retHeader, 'DELETE', url, header);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ goto _exit;
+ }
+ connection_set ('dav_store', 1);
+ if (what = 'R')
+ DB.DBA.SkyDrive__rdf_delete (detcol_id, id, what);
+ retValue := DAV_DELETE_INT (path, 1, null, null, 0, 0);
+
+_exit:;
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "SkyDrive_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 ('SkyDrive_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', type, permissions, uid, gid, auth_uid, ')');
+ declare ouid, ogid integer;
+ declare name, path, parentID, parentListID, listID, listItem, rdf_graph varchar;
+ declare url, body, header any;
+ declare url, header, body, params any;
+ declare retValue, retHeader, result, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.SkyDrive__path (detcol_id, path_parts);
+ if (save is null)
+ {
+ 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
+ }
+ name := path_parts[length (path_parts)-1];
+ parentListID := DB.DBA.SkyDrive__root ();
+ if (length (path_parts) > 2)
+ {
+ parentID := DB.DBA.DAV_SEARCH_ID (DB.DBA.SkyDrive__path (detcol_id, path_parts), 'P');
+ parentListID := DB.DBA.SkyDrive__paramGet (parentID, 'C', 'id', 0);
+ }
+ url := sprintf ('https://apis.live.net/v5.0/%s/files/%U', parentListID, name);
+ result := DB.DBA.SkyDrive__exec (detcol_id, retHeader, 'PUT', url, null, blob_to_string (content));
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := ODS..json2obj (result);
+ listID := get_keyword ('id', listItem);
+ }
+_skip_create:;
+ connection_set ('dav_store', 1);
+ DB.DBA.SkyDrive__owner (detcol_id, path_parts, DB.DBA.SkyDrive__user (uid, auth_uid), DB.DBA.SkyDrive__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, DB.DBA.SkyDrive__user (uid, auth_uid), DB.DBA.SkyDrive__user (gid, auth_uid), DB.DBA.SkyDrive__user (http_dav_uid ()), DB.DBA.SkyDrive__password (http_dav_uid ()), 0, ouid=>ouid, ogid=>ogid, check_locks=>0);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ rdf_graph := DB.DBA.SkyDrive__paramGet (detcol_id, 'C', 'graph', 0);
+ if (not DB.DBA.is_empty_or_null (rdf_graph))
+ DB.DBA.SkyDrive__rdf (detcol_id, retValue, 'R');
+
+ if (save is null)
+ {
+ DB.DBA.SkyDrive__paramSet (retValue, 'R', 'Entry', DB.DBA.SkyDrive__obj2xml (listItem), 0);
+ DB.DBA.SkyDrive__paramSet (retValue, 'R', 'id', listID, 0);
+ }
+ DB.DBA.SkyDrive__paramSet (retValue, 'R', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.SkyDrive__detName (), detcol_id, retValue, 'R');
+ }
+ return retValue;
+}
+;
+
+--| 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.
+--| It should delete any dead property even if the name looks like system name.
+create function "SkyDrive_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 ('SkyDrive_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_REMOVE_RAW (id[2], what, propname, silent, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "SkyDrive_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 ('SkyDrive_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
+ declare retValue any;
+
+ id := id[2];
+ retValue := DB.DBA.DAV_PROP_SET_RAW (id, what, propname, propvalue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
+create function "SkyDrive_DAV_PROP_GET" (
+ in id any,
+ in what char(0),
+ in propname varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_GET_INT (id[2], what, propname, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
+--| The returned list should contain only user properties.
+create function "SkyDrive_DAV_PROP_LIST" (
+ in id any,
+ in what char(0),
+ in propmask varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_LIST_INT (id[2], what, propmask, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "SkyDrive_DAV_DIR_SINGLE" (
+ in id any,
+ in what char(0),
+ in path any,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_DIR_SINGLE (', id, what, path, auth_uid, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_DIR_SINGLE_INT (id[2], what, null, DB.DBA.SkyDrive__user (http_dav_uid ()), DB.DBA.SkyDrive__password (http_dav_uid ()), http_dav_uid ());
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null) and (save is null))
+ retValue[4] := vector (DB.DBA.SkyDrive__detName (), id[1], retValue[4], what);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "SkyDrive_DAV_DIR_LIST" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ in name_mask varchar,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_DIR_LIST (', detcol_id, subPath_parts, detcol_parts, name_mask, recursive, auth_uid, ')');
+ declare colId integer;
+ declare what, colPath varchar;
+ declare retValue, save, downloads, listItems, davItems, colEntry, xmlItems, davEntry, listIds, listId any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', null);
+ what := case when ((length (subPath_parts) = 0) or (subPath_parts[length (subPath_parts) - 1] = '')) then 'C' else 'R' end;
+ if ((what = 'R') or (recursive = -1))
+ return DB.DBA.SkyDrive_DAV_DIR_SINGLE (detcol_id, what, null, auth_uid);
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.DAV_SEARCH_ID (colPath, 'C');
+
+ downloads := vector ();
+ listItems := DB.DBA.SkyDrive__list (detcol_id, detcol_parts, subPath_parts);
+ if (DAV_HIDE_ERROR (listItems) is null)
+ goto _exit;
+
+ if (isinteger (listItems))
+ goto _exit;
+
+ DB.DBA.SkyDrive__activity (detcol_id, 'Sync started');
+ {
+ declare _id, _what, _type, _content any;
+ declare title varchar;
+ {
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.SkyDrive__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ goto _exitSync;
+ };
+
+ connection_set ('dav_store', 1);
+ colEntry := DB.DBA.DAV_DIR_SINGLE_INT (colId, 'C', '', null, null, http_dav_uid ());
+ listItems := subseq (ODS..json2obj (listItems), 2);
+ listItems := get_keyword ('data', listItems);
+ listIds := vector ();
+ davItems := DB.DBA.SkyDrive__davList (detcol_id, colId);
+ foreach (any davItem in davItems) do
+ {
+ listID := DB.DBA.SkyDrive__paramGet (davItem[4], davItem[1], 'id', 0);
+ foreach (any listItem in listItems) do
+ {
+ title := get_keyword ('name', listItem);
+ if ((listID = get_keyword ('id', listItem)) and (title = davItem[10]))
+ {
+ davEntry := DB.DBA.SkyDrive__paramGet (davItem[4], davItem[1], 'Entry', 0);
+ if (davEntry is not null)
+ {
+ listIds := vector_concat (listIds, vector (listID));
+ davEntry := xtree_doc (davEntry);
+ if (DB.DBA.SkyDrive__entryXPath (davEntry, '/updated_time', 1) <> get_keyword ('updated_time', listItem))
+ {
+ set triggers off;
+ DB.DBA.SkyDrive__paramSet (davItem[4], davItem[1], ':getlastmodified', DB.DBA.SkyDrive__stringdate (get_keyword ('updated_time', listItem)), 0, 0);
+ set triggers on;
+ DB.DBA.SkyDrive__paramSet (davItem[4], davItem[1], 'Entry', DB.DBA.SkyDrive__obj2xml (listItem), 0);
+ if (davItem[1] = 'R')
+ {
+ DB.DBA.SkyDrive__paramSet (davItem[4], davItem[1], 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ else
+ {
+ declare downloaded integer;
+
+ downloaded := DB.DBA.SkyDrive__paramGet (davItem[4], davItem[1], 'download', 0);
+ if (downloaded is not null)
+ {
+ downloaded := cast (downloaded as integer);
+ if (downloaded <= 5)
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ goto _continue;
+ }
+ }
+ }
+ if (davItem[1] = 'R')
+ DB.DBA.SkyDrive__rdf_delete (detcol_id, davItem[4], davItem[1]);
+ DAV_DELETE_INT (davItem[0], 1, null, null, 0, 0);
+
+ _continue:;
+ commit work;
+ }
+ foreach (any listItem in listItems) do
+ {
+ listID := get_keyword ('id', listItem);
+ if (not position (listID, listIDs))
+ {
+ title := get_keyword ('name', listItem);
+ connection_set ('dav_store', 1);
+ if (get_keyword ('type', listItem) in ('folder', 'album'))
+ {
+ _id := DB.DBA.DAV_COL_CREATE (colPath || title || '/', colEntry[5], colEntry[7], colEntry[6], DB.DBA.SkyDrive__user (http_dav_uid ()), DB.DBA.SkyDrive__password (http_dav_uid ()));
+ _what := 'C';
+ }
+ else
+ {
+ _content := '';
+ _type := http_mime_type (title);
+ _id := DB.DBA.DAV_RES_UPLOAD (colPath || title, _content, _type, colEntry[5], colEntry[7], colEntry[6], DB.DBA.SkyDrive__user (http_dav_uid ()), DB.DBA.SkyDrive__password (http_dav_uid ()));
+ _what := 'R';
+ }
+ if (DAV_HIDE_ERROR (_id) is not null)
+ {
+ set triggers off;
+ DB.DBA.SkyDrive__paramSet (_id, _what, ':creationdate', DB.DBA.SkyDrive__stringdate (get_keyword ('created_time', listItem)), 0, 0);
+ DB.DBA.SkyDrive__paramSet (_id, _what, ':getlastmodified', DB.DBA.SkyDrive__stringdate (get_keyword ('updated_time', listItem)), 0, 0);
+ set triggers on;
+ DB.DBA.SkyDrive__paramSet (_id, _what, 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ DB.DBA.SkyDrive__paramSet (_id, _what, 'id', listID, 0);
+ DB.DBA.SkyDrive__paramSet (_id, _what, 'Entry', DB.DBA.SkyDrive__obj2xml (listItem), 0);
+ if (_what = 'R')
+ {
+ DB.DBA.SkyDrive__paramSet (_id, _what, 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (_id, _what)));
+ }
+ }
+ commit work;
+ }
+ }
+ }
+ _exitSync:
+ connection_set ('dav_store', save);
+ }
+ DB.DBA.SkyDrive__activity (detcol_id, 'Sync ended');
+
+_exit:;
+ retValue := DB.DBA.SkyDrive__davList (detcol_id, colId);
+ DB.DBA.SkyDrive__downloads (detcol_id, downloads);
+
+ return retValue;
+}
+;
+
+--| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
+create function "SkyDrive_DAV_DIR_FILTER" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ inout compilation any,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_DIR_FILTER (', detcol_id, subPath_parts, detcol_parts, compilation, recursive, 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 "SkyDrive_DAV_SEARCH_ID" (
+ in detcol_id any,
+ in path_parts any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_SEARCH_ID (DB.DBA.SkyDrive__path (detcol_id, path_parts), what);
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null))
+ {
+ if (isinteger (retValue) and (save is null))
+ retValue := vector (DB.DBA.SkyDrive__detName (), detcol_id, retValue, what);
+
+ else if (isarray (retValue) and (save = 1))
+ retValue := retValue[2];
+ }
+ return retValue;
+}
+;
+
+create function "SkyDrive_DAV_MAKE_ID" (
+ in detcol_id any,
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_MAKE_ID (', id, what, ')');
+ declare retValue any;
+
+ retValue := vector (DB.DBA.SkyDrive__detName (), detcol_id, id, what);
+
+ return retValue;
+}
+;
+
+--| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
+create function "SkyDrive_DAV_SEARCH_PATH" (
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_SEARCH_PATH (', id, what, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DB.DBA.DAV_SEARCH_PATH (davId, what);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "SkyDrive_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 ('SkyDrive_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 "SkyDrive_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 ('SkyDrive_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 "SkyDrive_DAV_RES_CONTENT" (
+ in id any,
+ inout content any,
+ out type varchar,
+ in content_mode integer) returns integer
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_RES_CONTENT (', id, ', [content], [type], ', content_mode, ')');
+ declare retValue any;
+
+ retValue := DAV_RES_CONTENT_INT (id[2], content, type, content_mode, 0);
+
+ return retValue;
+}
+;
+
+--| This adds an extra access path to the existing resource or collection.
+create function "SkyDrive_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 ('SkyDrive_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 "SkyDrive_DAV_DEREFERENCE_LIST" (
+ in detcol_id any,
+ inout report_array any) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_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 "SkyDrive_DAV_RESOLVE_PATH" (
+ in detcol_id any,
+ inout reference_item any,
+ inout old_base varchar,
+ inout new_base varchar) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_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 "SkyDrive_DAV_LOCK" (
+ in path any,
+ in id any,
+ in what 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 ('SkyDrive_DAV_LOCK (', path, id, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LOCK_INT (path, davId, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, DB.DBA.SkyDrive__user (auth_uid), DB.DBA.SkyDrive__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "SkyDrive_DAV_UNLOCK" (
+ in id any,
+ in what char(1),
+ in token varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_UNLOCK (', id, what, token, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_UNLOCK_INT (davId, what, token, DB.DBA.SkyDrive__user (auth_uid), DB.DBA.SkyDrive__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "SkyDrive_DAV_IS_LOCKED" (
+ inout id any,
+ inout what char(1),
+ in owned_tokens varchar) returns integer
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_IS_LOCKED (', id, what, owned_tokens, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_IS_LOCKED_INT (davId, what, owned_tokens);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "SkyDrive_DAV_LIST_LOCKS" (
+ in id any,
+ in what char(1),
+ in recursive integer) returns any
+{
+ -- dbg_obj_princ ('SkyDrive_DAV_LIST_LOCKS" (', id, what, recursive);
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LIST_LOCKS_INT (davId, what, recursive);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__root ()
+{
+ return 'me/skydrive';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__fileDebug (
+ in value any,
+ in mode integer := -1)
+{
+ string_to_file ('skydrive.txt', cast (value as varchar) || '\r\n', mode);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__detcolId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[1];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__davId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[2];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__stringdate (
+ in dt varchar)
+{
+ declare N integer;
+ declare rs, tzone, tzone_z, tzone_h, tzone_m any;
+
+ rs := stringdate (subseq (dt, 0, 19));
+ if (length (dt) > 19)
+ {
+ tzone := subseq (dt, 19);
+ tzone_z := substring (tzone, 1, 1);
+ tzone_h := atoi (substring (tzone, 2, 2));
+ tzone_m := atoi (substring (tzone, 4, 2));
+ if (tzone_z = '+')
+ {
+ tzone_h := tzone_h - 2 * tzone_h;
+ tzone_m := tzone_m - 2 * tzone_m;
+ }
+ rs := dateadd ('hour', tzone_h, rs);
+ rs := dateadd ('minute', tzone_m, rs);
+ }
+ return rs;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__user (
+ in user_id integer,
+ in default_id integer := null)
+{
+ return coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = coalesce (user_id, default_id)), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__password (
+ in user_id integer)
+{
+ return coalesce ((select pwd_magic_calc(U_NAME, U_PWD, 1) from WS.WS.SYS_DAV_USER where U_ID = user_id), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__owner (
+ in detcol_id any,
+ in subPath_parts any,
+ in uid any,
+ in gid any,
+ inout ouid integer,
+ inout ogid integer)
+{
+ declare id any;
+ declare path varchar;
+
+ DB.DBA.DAV_OWNER_ID (uid, gid, ouid, ogid);
+ if ((ouid = -12) or (ouid = 5))
+ {
+ path := DB.DBA.SkyDrive__path (detcol_id, subPath_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, 'P');
+ if (DAV_HIDE_ERROR (id))
+ {
+ select COL_OWNER, COL_GROUP
+ into ouid, ogid
+ from WS.WS.SYS_DAV_COL
+ where COL_ID = id;
+ }
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__detName ()
+{
+ return UNAME'SkyDrive';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__xml2string (
+ in _xml any)
+{
+ declare stream any;
+
+ stream := string_output ();
+ http_value (_xml, null, stream);
+ return string_output_string (stream);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__path (
+ in detcol_id any,
+ in subPath_parts any)
+{
+ declare N integer;
+ declare path varchar;
+
+ path := rtrim (DB.DBA.DAV_SEARCH_PATH (detcol_id, 'C'), '/');
+ for (N := 0; N < length (subPath_parts); N := N + 1)
+ path := path || '/' || subPath_parts[N];
+
+ return path;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__params (
+ in colId integer)
+{
+ declare tmp, params any;
+
+ colId := DB.DBA.SkyDrive__detcolId (colId);
+ tmp := DB.DBA.SkyDrive__paramGet (colId, 'C', 'Authentication', 0);
+ if (tmp = 'Yes')
+ {
+ params := vector (
+ 'authentication', tmp,
+ 'access_timestamp', stringdate (DB.DBA.SkyDrive__paramGet (colId, 'C', 'access_timestamp', 0)),
+ 'access_token', DB.DBA.SkyDrive__paramGet (colId, 'C', 'access_token', 0, 1, 1),
+ 'token_type', DB.DBA.SkyDrive__paramGet (colId, 'C', 'token_type', 0),
+ 'expires_in', cast (DB.DBA.SkyDrive__paramGet (colId, 'C', 'expires_in', 0) as integer),
+ 'refresh_token', DB.DBA.SkyDrive__paramGet (colId, 'C', 'refresh_token', 0, 1, 1),
+ 'authentication_token', DB.DBA.SkyDrive__paramGet (colId, 'C', 'authentication_token', 0, 1, 1),
+ 'graph', DB.DBA.SkyDrive__paramGet (colId, 'C', 'graph', 0)
+ );
+ }
+ else
+ {
+ params := vector ('authentication', 'No');
+ }
+ return params;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__paramSet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _propValue any,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _encrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__paramSet', _propName, _propValue, ')');
+ declare retValue any;
+
+ if (_serialized)
+ _propValue := serialize (_propValue);
+
+ if (_encrypt)
+ _propValue := pwd_magic_calc ('skydrive', _propValue);
+
+ if (_prefixed)
+ _propName := 'virt:SkyDrive-' || _propName;
+
+ _id := DB.DBA.SkyDrive__davId (_id);
+ retValue := DB.DBA.DAV_PROP_SET_RAW (_id, _what, _propName, _propValue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__paramGet (
+ in _id integer,
+ in _what varchar,
+ in _propName varchar,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _decrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__paramGet (', _id, _what, _propName, ')');
+ declare propValue any;
+
+ if (_prefixed)
+ _propName := 'virt:SkyDrive-' || _propName;
+
+ propValue := DB.DBA.DAV_PROP_GET_INT (DB.DBA.SkyDrive__davId (_id), _what, _propName, 0, DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()), http_dav_uid ());
+ if (isinteger (propValue))
+ propValue := null;
+
+ if (_serialized and not isnull (propValue))
+ propValue := deserialize (propValue);
+
+ if (_decrypt and not isnull (propValue))
+ propValue := pwd_magic_calc ('skydrive', propValue, 1);
+
+ return propValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__paramRemove (
+ in _id integer,
+ in _what varchar,
+ in _propName varchar,
+ in _prefixed integer := 1)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__paramRemove (', _id, _what, _propName, ')');
+ if (_prefixed)
+ _propName := 'virt:SkyDrive-' || _propName;
+
+ DB.DBA.DAV_PROP_REMOVE_RAW (DB.DBA.SkyDrive__davId (_id), _what, _propName, 1, http_dav_uid());
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__obj2xml (
+ in item any)
+{
+ return '<entry>' || ODS..obj2xml (item, 10) || '</entry>';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__entryXPath (
+ in _xml any,
+ in _xpath varchar,
+ in _cast integer := 0)
+{
+ declare retValue any;
+
+ if (_cast)
+ {
+ retValue := serialize_to_UTF8_xml (xpath_eval (sprintf ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] string (//entry%s)', _xpath), _xml, 1));
+ } else {
+ retValue := xpath_eval ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] //entry' || _xpath, _xml, 1);
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__exec_error (
+ in _header any,
+ in _silent integer := 0)
+{
+ if ((_header[0] like 'HTTP/1._ 4__ %') or (_header[0] like 'HTTP/1._ 5__ %'))
+ {
+ if (not _silent)
+ signal ('22023', trim (_header[0], '\r\n'));
+
+ return 0;
+ }
+ return 1;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__exec_code (
+ in _header any)
+{
+ return subseq (_header[0], 9, 12);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__exec (
+ inout detcol_id integer,
+ inout retHeader varchar,
+ in method varchar,
+ in url varchar,
+ in header varchar := '',
+ in content varchar := '')
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__exec', detcol_id, method, url, header, ')');
+ declare retValue, params any;
+ declare _client_id, _client_secret, _return_url varchar;
+ declare _expires_in, _access_timestamp, _token_type, _refresh_token any;
+ declare tmp, _json, _prefix, _reqHeader, _resHeader, _body any;
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.SkyDrive__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ return -28;
+ };
+
+ params := DB.DBA.SkyDrive__params (detcol_id);
+ if (get_keyword ('authentication', params) <> 'Yes')
+ {
+ DB.DBA.SkyDrive__activity (detcol_id, 'Error: Not authenticated');
+ return -28;
+ }
+
+ _expires_in := get_keyword ('expires_in', params);
+ _access_timestamp := get_keyword ('access_timestamp', params);
+ if (dateadd ('second', _expires_in, _access_timestamp) < now ())
+ {
+ -- refresh token first
+
+ _client_id := (select a_key from OAUTH..APP_REG where a_name = 'SkyDrive API' and a_owner = 0);
+ _client_secret := (select a_secret from OAUTH..APP_REG where a_name = 'SkyDrive API' and a_owner = 0);
+ _return_url := sprintf ('http://%{WSHost}s/ods/access_skydrive.vsp', http_path());
+ _refresh_token := get_keyword ('refresh_token', params);
+ _reqHeader := null;
+ _resHeader := null;
+ _body := sprintf ('client_id=%U&client_secret=%U&redirect_uri=%U&refresh_token=%U&grant_type=%U', _client_id, _client_secret, _return_url, _refresh_token, 'refresh_token');
+ _json := http_client_ext (url=>'https://login.live.com/oauth20_token.srf', http_method=>'POST', http_headers=>_reqHeader, headers =>_resHeader, body=>_body, n_redirects=>15);
+ if (not DB.DBA.SkyDrive__exec_error (_resHeader, 1))
+ return -28;
+
+ tmp := subseq (ODS..json2obj(_json), 2);
+ DB.DBA.SkyDrive__paramSet (detcol_id, 'C', 'access_timestamp', datestring (now ()), 0);
+ DB.DBA.SkyDrive__paramSet (detcol_id, 'C', 'access_token', get_keyword ('access_token', tmp), 0, 1, 1);
+ DB.DBA.SkyDrive__paramSet (detcol_id, 'C', 'token_type', get_keyword ('token_type', tmp), 0);
+ DB.DBA.SkyDrive__paramSet (detcol_id, 'C', 'expires_in', cast (get_keyword ('expires_in', tmp) as varchar), 0);
+ params := DB.DBA.SkyDrive__params (detcol_id);
+ }
+
+ _reqHeader := sprintf ('Authorization: %s %s\r\n', initcap (get_keyword ('token_type', params, 'bearer')), get_keyword ('access_token', params));
+ if (header <> '')
+ _reqHeader := _reqHeader || header;
+
+ retHeader := null;
+ retValue := http_client_ext (url=>url, http_method=>method, http_headers=>_reqHeader, headers =>retHeader, body=>content, n_redirects=>15);
+ -- dbg_obj_print ('retValue', DB.DBA.SkyDrive__exec_code (retHeader), url, method);
+ if (not DB.DBA.SkyDrive__exec_error (retHeader, 1))
+ {
+ DB.DBA.SkyDrive__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__davList (
+ inout detcol_id integer,
+ inout colId integer)
+{
+ declare retValue any;
+
+ vectorbld_init (retValue);
+ for (select vector (RES_FULL_PATH,
+ 'R',
+ length (RES_CONTENT),
+ RES_MOD_TIME,
+ vector (DB.DBA.SkyDrive__detName (), detcol_id, RES_ID, 'R'),
+ RES_PERMS,
+ RES_GROUP,
+ RES_OWNER,
+ RES_CR_TIME,
+ RES_TYPE,
+ RES_NAME ) as I
+ from WS.WS.SYS_DAV_RES
+ where RES_COL = DB.DBA.SkyDrive__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ for (select vector (WS.WS.COL_PATH (COL_ID),
+ 'C',
+ 0,
+ COL_MOD_TIME,
+ vector (DB.DBA.SkyDrive__detName (), detcol_id, COL_ID, 'C'),
+ COL_PERMS,
+ COL_GROUP,
+ COL_OWNER,
+ COL_CR_TIME,
+ 'dav/unix-directory',
+ COL_NAME) as I
+ from WS.WS.SYS_DAV_COL
+ where COL_PARENT = DB.DBA.SkyDrive__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ vectorbld_final (retValue);
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__list (
+ inout detcol_id any,
+ inout detcol_parts varchar,
+ inout subPath_parts varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__list (', detcol_id, detcol_parts, subPath_parts, ')');
+ declare colId integer;
+ declare colPath, listId varchar;
+ declare syncTime datetime;
+ declare retValue, retHeader, value, entry any;
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.SkyDrive__davId (DB.DBA.DAV_SEARCH_ID (colPath, 'C'));
+ if (DAV_HIDE_ERROR (colId) is null)
+ return -28;
+
+ syncTime := DB.DBA.SkyDrive__paramGet (colId, 'C', 'syncTime');
+ if (not isnull (syncTime) and (datediff ('second', syncTime, now ()) < 300))
+ return 0;
+
+ if (length (subPath_parts) = 1)
+ {
+ listId := DB.DBA.SkyDrive__root ();
+ }
+ else
+ {
+ listId := DB.DBA.SkyDrive__paramGet (colId, 'C', 'id', 0);
+ if (isnull (listId))
+ return -28;
+ }
+ retValue := DB.DBA.SkyDrive__exec (detcol_id, retHeader, 'GET', sprintf ('https://apis.live.net/v5.0/%s/files', listId));
+ -- dbg_obj_print ('retValue', retValue);
+ if (not isinteger (retValue))
+ DB.DBA.SkyDrive__paramSet (colId, 'C', 'syncTime', now ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__activity (
+ in detcol_id integer,
+ in text varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__activity (', detcol_id, text, ')');
+ declare parentId integer;
+ declare parentPath varchar;
+ declare activity_id integer;
+ declare activity, activityName, activityPath, activityContent, activityType varchar;
+ declare davEntry any;
+ declare _errorCount integer;
+ declare exit handler for sqlstate '*'
+ {
+ if (__SQL_STATE = '40001')
+ {
+ rollback work;
+ if (_errorCount > 5)
+ resignal;
+
+ delay (1);
+ _errorCount := _errorCount + 1;
+ goto _start;
+ }
+ return;
+ };
+
+ _errorCount := 0;
+
+_start:;
+ activity := DB.DBA.SkyDrive__paramGet (detcol_id, 'C', 'activity', 0);
+ if (activity is null)
+ return;
+
+ if (activity <> 'on')
+ return;
+
+ davEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcol_id, 'C', '', null, null, http_dav_uid ());
+ if (DB.DBA.DAV_HIDE_ERROR (davEntry) is null)
+ return;
+
+ parentId := DB.DBA.DAV_SEARCH_ID (davEntry[0], 'P');
+ if (DB.DBA.DAV_HIDE_ERROR (parentId) is null)
+ return;
+
+ parentPath := DB.DBA.DAV_SEARCH_PATH (parentId, 'C');
+ if (DB.DBA.DAV_HIDE_ERROR (parentPath) is null)
+ return;
+
+ activityContent := '';
+ activityName := davEntry[10] || '_activity.log';
+ activityPath := parentPath || activityName;
+ activity_id := DB.DBA.DAV_SEARCH_ID (activityPath, 'R');
+ if (DB.DBA.DAV_HIDE_ERROR (activity_id) is not null)
+ {
+ DB.DBA.DAV_RES_CONTENT_INT (activity_id, activityContent, activityType, 0, 0);
+ if (activityType <> 'text/plain')
+ return;
+
+ activityContent := cast (activityContent as varchar);
+ }
+ activityContent := activityContent || sprintf ('%s %s\r\n', subseq (datestring (now ()), 0, 19), text);
+ activityType := 'text/plain';
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (activityPath, activityContent, activityType, '110100000RR', DB.DBA.SkyDrive__user (davEntry[6]), DB.DBA.SkyDrive__user (davEntry[7]), extern=>0, check_locks=>0);
+ commit work;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__downloads (
+ in detcol_id integer,
+ in downloads any)
+{
+ declare aq any;
+
+ if (length (downloads) = 0)
+ return;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.SkyDrive__downloads_aq', vector (detcol_id, downloads));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__downloads_aq (
+ in detcol_id integer,
+ in downloads any)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__downloads_aq (', detcol_id, downloads, ')');
+ declare N, downloaded integer;
+ declare url, listID varchar;
+ declare items any;
+ declare retValue, retHeader any;
+
+ set_user_id ('dba');
+ N := 0;
+ items := vector ();
+ DB.DBA.SkyDrive__activity (detcol_id, sprintf ('Downloading %d file(s)', length (downloads)));
+ foreach (any download in downloads) do
+ {
+ downloaded := DB.DBA.SkyDrive__paramGet (download[0], download[1], 'download', 0);
+ if (downloaded is null)
+ goto _continue;
+
+ downloaded := cast (downloaded as integer);
+ if (downloaded > 5)
+ goto _continue;
+
+ listID := DB.DBA.SkyDrive__paramGet (download[0], download[1], 'id', 0);
+ if (listID is null)
+ goto _continue;
+
+ url := sprintf ('https://apis.live.net/v5.0/%s/content', listID);
+ retValue := DB.DBA.SkyDrive__exec (detcol_id, retHeader, 'GET', url);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ {
+ downloaded := downloaded + 1;
+ DB.DBA.SkyDrive__paramSet (download[0], download[1], 'download', cast (downloaded as varchar), 0);
+ }
+ else
+ {
+ update WS.WS.SYS_DAV_RES set RES_CONTENT = retValue where RES_ID = DB.DBA.SkyDrive__davId (download[0]);
+ DB.DBA.SkyDrive__paramRemove (download[0], download[1], 'download');
+ items := vector_concat (items, vector (download));
+ N := N + 1;
+ }
+ commit work;
+
+ _continue:;
+ }
+ DB.DBA.SkyDrive__activity (detcol_id, sprintf ('Downloaded %d file(s)', N));
+ foreach (any item in items) do
+ {
+ DB.DBA.SkyDrive__rdf_delete (detcol_id, item[0], item[1]);
+ DB.DBA.SkyDrive__rdf_insert (detcol_id, item[0], item[1]);
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__rdf (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ declare aq any;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.SkyDrive__rdf_aq', vector (detcol_id, id, what));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__rdf_aq (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ set_user_id ('dba');
+ DB.DBA.SkyDrive__rdf_delete (detcol_id, id, what);
+ DB.DBA.SkyDrive__rdf_insert (detcol_id, id, what);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__rdf_insert (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__rdf_insert (', detcol_id, id, what, rdf_graph, ')');
+ declare permissions, rdf_graph2 varchar;
+ declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;
+ declare path, content, type any;
+ declare exit handler for sqlstate '*'
+ {
+ return;
+ };
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.SkyDrive__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ permissions := DB.DBA.SkyDrive__paramGet (detcol_id, 'C', ':virtpermissions', 0, 0);
+ if (permissions[6] = ascii('0'))
+ {
+ -- add to private graphs
+ if (not SIOC..private_graph_check (rdf_graph))
+ return;
+ }
+
+ id := DB.DBA.SkyDrive__davId (id);
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = id);
+ type := (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = id);
+ rdf_sponger := coalesce (DB.DBA.SkyDrive__paramGet (detcol_id, 'C', 'sponger', 0), 'on');
+ rdf_cartridges := coalesce (DB.DBA.SkyDrive__paramGet (detcol_id, 'C', 'cartridges', 0), '');
+ rdf_metaCartridges := coalesce (DB.DBA.SkyDrive__paramGet (detcol_id, 'C', 'metaCartridges', 0), '');
+
+ RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__rdf_delete (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__rdf_delete (', detcol_id, id, what, rdf_graph, ')');
+ declare rdf_graph2 varchar;
+ declare path varchar;
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.SkyDrive__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ if (path like '%.gz')
+ path := regexp_replace (path, '\.gz\x24', '');
+
+ rdf_graph2 := 'http://local.virt' || path;
+ SPARQL delete from graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };
+ SPARQL clear graph ?:rdf_graph2;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SkyDrive__refresh (
+ in path varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.SkyDrive__refresh (', path, ')');
+ declare colId any;
+
+ colId := DB.DBA.DAV_SEARCH_ID (path, 'C');
+ if (DAV_HIDE_ERROR (colId) is not null)
+ DB.DBA.SkyDrive__paramRemove (colId, 'C', 'syncTime');
+}
+;
diff --git a/appsrc/ODS-Briefcase/new/DET_WebDAV.sql b/appsrc/ODS-Briefcase/new/DET_WebDAV.sql
new file mode 100755
index 0000000..0d3b2b0
--- /dev/null
+++ b/appsrc/ODS-Briefcase/new/DET_WebDAV.sql
@@ -0,0 +1,1668 @@
+--
+-- $Id: DET_WebDAV.sql,v 1.1 2012/07/18 12:45:29 ddimitrov 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 "WebDAV_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 ('WebDAV_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE (id[2], what, req, auth_uname, auth_pwd, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "WebDAV_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 ('WebDAV_DAV_AUTHENTICATE_HTTP (', id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE_HTTP (id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);
+
+ return retValue;
+}
+;
+
+--| This should return ID of the collection that contains resource or collection with given ID,
+--| Possible ambiguity (such as symlinks etc.) should be resolved by using path.
+--| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
+create function "WebDAV_DAV_GET_PARENT" (
+ in id any,
+ in what char(1),
+ in path varchar) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_GET_PARENT (', id, what, path, ')');
+ declare retValue any;
+
+ retValue := DAV_GET_PARENT (id[2], what, path);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ retValue := vector (DB.DBA.WebDAV__detName (), id[1], retValue, 'C');
+
+ return retValue;
+}
+;
+
+--| 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 "WebDAV_DAV_COL_CREATE" (
+ in detcol_id any,
+ in path_parts any,
+ in permissions varchar,
+ in uid integer,
+ in gid integer,
+ in auth_uid integer,
+ in extern integer := 0) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_COL_CREATE (', detcol_id, path_parts, permissions, uid, gid, auth_uid, extern, ')');
+ declare ouid, ogid integer;
+ declare path, title, parentID, parentListHref, listHref, listItem varchar;
+ declare url any;
+ declare V, retValue, retHeader, result, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.WebDAV__path (detcol_id, path_parts);
+ if (save is null)
+ {
+ title := path_parts[length (path_parts)-2];
+ url := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'path', 0);
+ listHref := '/' || title;
+ if (length (path_parts) > 2)
+ {
+ parentID := DB.DBA.DAV_SEARCH_ID (path, 'P');
+ parentListHref := DB.DBA.WebDAV__paramGet (parentID, 'C', 'href', 0);
+ if (isnull (parentListHref))
+ return -28;
+
+ V := rfc1808_parse_uri (url);
+ V[2] := parentListHref;
+ url := DB.DBA.vspx_uri_compose (V);
+ listHref := rtrim (V[2], '/') || listHref;
+ }
+ url := rtrim (url) || '/' || sprintf ('%U', title) || '/';
+ result := DB.DBA.WebDAV__exec (detcol_id, retHeader, 'MKCOL', url);
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := DB.DBA.WebDAV__resource (detcol_id, url);
+ if (DAV_HIDE_ERROR (listItem) is null)
+ {
+ retValue := listItem;
+ goto _exit;
+ }
+ }
+ connection_set ('dav_store', 1);
+ DB.DBA.WebDAV__owner (detcol_id, path_parts, DB.DBA.WebDAV__user (uid, auth_uid), DB.DBA.WebDAV__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_COL_CREATE_INT (path, permissions, DB.DBA.WebDAV__user (uid, auth_uid), DB.DBA.WebDAV__user (gid, auth_uid), DB.DBA.WebDAV__user (http_dav_uid ()), DB.DBA.WebDAV__password (http_dav_uid ()), 1, 0, 1, ouid, ogid);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ if (save is null)
+ {
+ DB.DBA.WebDAV__paramSet (retValue, 'C', 'Entry', listItem, 0);
+ DB.DBA.WebDAV__paramSet (retValue, 'C', 'href', listHref, 0);
+ }
+ DB.DBA.WebDAV__paramSet (retValue, 'C', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.WebDAV__detName (), detcol_id, retValue, 'C');
+ }
+
+ return retValue;
+}
+;
+
+--| It looks like that this is redundant and should be removed at all.
+create function "WebDAV_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 ('WebDAV_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 "WebDAV_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 ('WebDAV_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 "WebDAV_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 ('WebDAV_DAV_DELETE (', detcol_id, path_parts, what, silent, auth_uid, ')');
+ declare path, listHref varchar;
+ declare V, retValue, save any;
+ declare id, url, header, retHeader, params any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.WebDAV__path (detcol_id, path_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (save is null)
+ {
+ listHref := DB.DBA.WebDAV__paramGet (id, what, 'href', 0);
+ if (listHref is null)
+ goto _exit;
+
+ url := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'path', 0);
+ V := rfc1808_parse_uri (url);
+ V[2] := listHref;
+ url := DB.DBA.vspx_uri_compose (V);
+
+ retValue := DB.DBA.WebDAV__exec (detcol_id, retHeader, 'DELETE', url);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ goto _exit;
+ }
+ connection_set ('dav_store', 1);
+ if (what = 'R')
+ DB.DBA.WebDAV__rdf_delete (detcol_id, id, what);
+ retValue := DAV_DELETE_INT (path, 1, null, null, 0, 0);
+
+_exit:;
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "WebDAV_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 ('WebDAV_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', type, permissions, uid, gid, auth_uid, ')');
+ declare ouid, ogid integer;
+ declare title, path, parentID, parentListHref, listHref, listItem, rdf_graph varchar;
+ declare url, body, header any;
+ declare url, header, body, params any;
+ declare V, retValue, retHeader, result, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.WebDAV__path (detcol_id, path_parts);
+ if (save is null)
+ {
+ 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
+ }
+ title := path_parts[length (path_parts)-1];
+ url := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'path', 0);
+ listHref := '/' || title;
+ if (length (path_parts) > 1)
+ {
+ parentID := DB.DBA.DAV_SEARCH_ID (path, 'P');
+ parentListHref := DB.DBA.WebDAV__paramGet (parentID, 'C', 'href', 0);
+ if (isnull (parentListHref))
+ return -28;
+
+ V := rfc1808_parse_uri (url);
+ V[2] := parentListHref;
+ url := DB.DBA.vspx_uri_compose (V);
+ listHref := rtrim (V[2], '/') || listHref;
+ }
+ header := sprintf (
+ 'Content-Length: %d\r\n' ||
+ 'Content-Type: %s\r\n',
+ length (content),
+ type);
+ url := rtrim (url) || '/' || sprintf ('%U', title);
+ result := DB.DBA.WebDAV__exec (detcol_id, retHeader, 'PUT', url, header, blob_to_string (content));
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := DB.DBA.WebDAV__resource (detcol_id, url);
+ if (DAV_HIDE_ERROR (listItem) is null)
+ {
+ retValue := listItem;
+ goto _exit;
+ }
+ }
+_skip_create:;
+ connection_set ('dav_store', 1);
+ DB.DBA.WebDAV__owner (detcol_id, path_parts, DB.DBA.WebDAV__user (uid, auth_uid), DB.DBA.WebDAV__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, DB.DBA.WebDAV__user (uid, auth_uid), DB.DBA.WebDAV__user (gid, auth_uid), DB.DBA.WebDAV__user (http_dav_uid ()), DB.DBA.WebDAV__password (http_dav_uid ()), 0, ouid=>ouid, ogid=>ogid, check_locks=>0);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ rdf_graph := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'graph', 0);
+ if (not DB.DBA.is_empty_or_null (rdf_graph))
+ DB.DBA.WebDAV__rdf (detcol_id, retValue, 'R');
+
+ if (save is null)
+ {
+ DB.DBA.WebDAV__paramSet (retValue, 'R', 'Entry', DB.DBA.WebDAV__obj2xml (listItem), 0);
+ DB.DBA.WebDAV__paramSet (retValue, 'R', 'href', listHref, 0);
+ }
+ DB.DBA.WebDAV__paramSet (retValue, 'R', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.WebDAV__detName (), detcol_id, retValue, 'R');
+ }
+ return retValue;
+}
+;
+
+--| 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.
+--| It should delete any dead property even if the name looks like system name.
+create function "WebDAV_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 ('WebDAV_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_REMOVE_RAW (id[2], what, propname, silent, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "WebDAV_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 ('WebDAV_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
+ declare retValue any;
+
+ id := id[2];
+ retValue := DB.DBA.DAV_PROP_SET_RAW (id, what, propname, propvalue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
+create function "WebDAV_DAV_PROP_GET" (
+ in id any,
+ in what char(0),
+ in propname varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('WebDAV_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_GET_INT (id[2], what, propname, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
+--| The returned list should contain only user properties.
+create function "WebDAV_DAV_PROP_LIST" (
+ in id any,
+ in what char(0),
+ in propmask varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('WebDAV_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_LIST_INT (id[2], what, propmask, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "WebDAV_DAV_DIR_SINGLE" (
+ in id any,
+ in what char(0),
+ in path any,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_DIR_SINGLE (', id, what, path, auth_uid, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_DIR_SINGLE_INT (id[2], what, null, DB.DBA.WebDAV__user (http_dav_uid ()), DB.DBA.WebDAV__password (http_dav_uid ()), http_dav_uid ());
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null) and (save is null))
+ retValue[4] := vector (DB.DBA.WebDAV__detName (), id[1], retValue[4], what);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "WebDAV_DAV_DIR_LIST" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ in name_mask varchar,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_DIR_LIST (', detcol_id, subPath_parts, detcol_parts, name_mask, recursive, auth_uid, ')');
+ declare colId integer;
+ declare what, colPath, colHref varchar;
+ declare tmp, retValue, save, downloads, listItems, listItem, davItems, colEntry, xmlItems, davEntry, listHrefs, listHref any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', null);
+ what := case when ((length (subPath_parts) = 0) or (subPath_parts[length (subPath_parts) - 1] = '')) then 'C' else 'R' end;
+ if ((what = 'R') or (recursive = -1))
+ return DB.DBA.WebDAV_DAV_DIR_SINGLE (detcol_id, what, null, auth_uid);
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.DAV_SEARCH_ID (colPath, 'C');
+
+ downloads := vector ();
+ listItems := DB.DBA.WebDAV__list (detcol_id, detcol_parts, subPath_parts);
+ if (DAV_HIDE_ERROR (listItems) is null)
+ goto _exit;
+
+ if (isinteger (listItems))
+ goto _exit;
+
+ DB.DBA.WebDAV__activity (detcol_id, 'Sync started');
+ {
+ declare _id, _what, _type, _content any;
+ declare title varchar;
+ {
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.WebDAV__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ goto _exitSync;
+ };
+
+ connection_set ('dav_store', 1);
+ colEntry := DB.DBA.DAV_DIR_SINGLE_INT (colId, 'C', '', null, null, http_dav_uid ());
+ colHref := null;
+ if (length (subPath_parts) = 1)
+ {
+ tmp := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'path', 0);
+ tmp := rfc1808_parse_uri (tmp);
+ colHRef := tmp[2];
+ }
+ else
+ {
+ colHref := DB.DBA.WebDAV__paramGet (colId, 'C', 'href', 0);
+ }
+ if (colHref is null)
+ goto _exit;
+
+ connection_set ('dav_store', 1);
+ listItems := xml_tree_doc (xml_expand_refs (xml_tree (listItems)));
+ listHrefs := vector ();
+ davItems := DB.DBA.WebDAV__davList (detcol_id, colId);
+ foreach (any davItem in davItems) do
+ {
+ listHref := DB.DBA.WebDAV__paramGet (davItem[4], davItem[1], 'href', 0);
+ if ((listHref <> colHref) and not position (listHref, listHrefs))
+ {
+ listItem := DB.DBA.WebDAV__entryXPath (listItems, sprintf ('[D:href = "%s"]', listHref), 0);
+ if (listItem is not null)
+ {
+ listItem := xml_cut (listItem);
+ davEntry := DB.DBA.WebDAV__paramGet (davItem[4], davItem[1], 'Entry', 0);
+ if ((davEntry is not null) and (DB.DBA.WebDAV__title (listHref) = davItem[10]))
+ {
+ listHrefs := vector_concat (listHrefs, vector (listHref));
+ davEntry := xtree_doc (davEntry);
+ if (
+ (DB.DBA.WebDAV__propertyXPath (davEntry, '/D:getlastmodified', 1) <> DB.DBA.WebDAV__propertyXPath (listItem, '/D:getlastmodified', 1)) or
+ (DB.DBA.WebDAV__propertyXPath (davEntry, '/D:getetag', 1) <> DB.DBA.WebDAV__propertyXPath (listItem, '/D:getetag', 1))
+ )
+ {
+ set triggers off;
+ DB.DBA.WebDAV__paramSet (davItem[4], davItem[1], ':getlastmodified', DB.DBA.WebDAV__stringdate (DB.DBA.WebDAV__propertyXPath (listItem, '/D:getlastmodified', 1)), 0, 0);
+ set triggers on;
+ DB.DBA.WebDAV__paramSet (davItem[4], davItem[1], 'Entry', DB.DBA.WebDAV__xml2string (listItem), 0);
+ if (davItem[1] = 'R')
+ {
+ DB.DBA.WebDAV__paramSet (davItem[4], davItem[1], 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ else
+ {
+ declare downloaded integer;
+
+ downloaded := DB.DBA.WebDAV__paramGet (davItem[4], davItem[1], 'download', 0);
+ if (downloaded is not null)
+ {
+ downloaded := cast (downloaded as integer);
+ if (downloaded <= 5)
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ goto _continue;
+ }
+ }
+ }
+ if (davItem[1] = 'R')
+ DB.DBA.WebDAV__rdf_delete (detcol_id, davItem[4], davItem[1]);
+ DAV_DELETE_INT (davItem[0], 1, null, null, 0, 0);
+
+ _continue:;
+ commit work;
+ }
+ listItems := xpath_eval ('[xmlns:D="DAV:"] /D:multistatus/D:response', listItems, 0);
+ foreach (any listItem in listItems) do
+ {
+ listItem := xml_cut(listItem);
+ listHref := DB.DBA.WebDAV__entryXPath (listItem, '/D:href', 1);
+ if ((listHref <> colHref) and not position (listHref, listHrefs))
+ {
+ title := DB.DBA.WebDAV__title (listHref);
+ connection_set ('dav_store', 1);
+ if (not isnull (DB.DBA.WebDAV__propertyXPath (listItem, '/D:resourcetype/D:collection', 0)))
+ {
+ _id := DB.DBA.DAV_COL_CREATE (colPath || title || '/', colEntry[5], colEntry[7], colEntry[6], DB.DBA.WebDAV__user (http_dav_uid ()), DB.DBA.WebDAV__password (http_dav_uid ()));
+ _what := 'C';
+ }
+ else
+ {
+ _content := '';
+ _type := DB.DBA.WebDAV__propertyXPath (listItem, '/D:getcontenttype', 1);
+ if (DB.DBA.is_empty_or_null (_type))
+ _type := http_mime_type (title);
+ _id := DB.DBA.DAV_RES_UPLOAD (colPath || title, _content, _type, colEntry[5], colEntry[7], colEntry[6], DB.DBA.WebDAV__user (http_dav_uid ()), DB.DBA.WebDAV__password (http_dav_uid ()));
+ _what := 'R';
+ }
+ if (DAV_HIDE_ERROR (_id) is not null)
+ {
+ set triggers off;
+ DB.DBA.WebDAV__paramSet (_id, _what, ':creationdate', stringdate (DB.DBA.WebDAV__propertyXPath (listItem, '/D:creationdate', 1)), 0, 0);
+ DB.DBA.WebDAV__paramSet (_id, _what, ':getlastmodified', DB.DBA.WebDAV__stringdate (DB.DBA.WebDAV__propertyXPath (listItem, '/D:getlastmodified', 1)), 0, 0);
+ set triggers on;
+ DB.DBA.WebDAV__paramSet (_id, _what, 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ DB.DBA.WebDAV__paramSet (_id, _what, 'href', listHref, 0);
+ DB.DBA.WebDAV__paramSet (_id, _what, 'Entry', DB.DBA.WebDAV__xml2string (listItem), 0);
+ if (_what = 'R')
+ {
+ DB.DBA.WebDAV__paramSet (_id, _what, 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (_id, _what)));
+ }
+ }
+ commit work;
+ }
+ }
+ }
+ _exitSync:
+ connection_set ('dav_store', save);
+ }
+ DB.DBA.WebDAV__activity (detcol_id, 'Sync ended');
+
+_exit:;
+ retValue := DB.DBA.WebDAV__davList (detcol_id, colId);
+ DB.DBA.WebDAV__downloads (detcol_id, downloads);
+
+ return retValue;
+}
+;
+
+--| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
+create function "WebDAV_DAV_DIR_FILTER" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ inout compilation any,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_DIR_FILTER (', detcol_id, subPath_parts, detcol_parts, compilation, recursive, 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 "WebDAV_DAV_SEARCH_ID" (
+ in detcol_id any,
+ in path_parts any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_SEARCH_ID (DB.DBA.WebDAV__path (detcol_id, path_parts), what);
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null))
+ {
+ if (isinteger (retValue) and (save is null))
+ retValue := vector (DB.DBA.WebDAV__detName (), detcol_id, retValue, what);
+
+ else if (isarray (retValue) and (save = 1))
+ retValue := retValue[2];
+ }
+ return retValue;
+}
+;
+
+create function "WebDAV_DAV_MAKE_ID" (
+ in detcol_id any,
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_MAKE_ID (', id, what, ')');
+ declare retValue any;
+
+ retValue := vector (DB.DBA.WebDAV__detName (), detcol_id, id, what);
+
+ return retValue;
+}
+;
+
+--| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
+create function "WebDAV_DAV_SEARCH_PATH" (
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_SEARCH_PATH (', id, what, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DB.DBA.DAV_SEARCH_PATH (davId, what);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "WebDAV_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 ('WebDAV_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 "WebDAV_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 ('WebDAV_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 "WebDAV_DAV_RES_CONTENT" (
+ in id any,
+ inout content any,
+ out type varchar,
+ in content_mode integer) returns integer
+{
+ -- dbg_obj_princ ('WebDAV_DAV_RES_CONTENT (', id, ', [content], [type], ', content_mode, ')');
+ declare retValue any;
+
+ retValue := DAV_RES_CONTENT_INT (id[2], content, type, content_mode, 0);
+
+ return retValue;
+}
+;
+
+--| This adds an extra access path to the existing resource or collection.
+create function "WebDAV_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 ('WebDAV_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 "WebDAV_DAV_DEREFERENCE_LIST" (
+ in detcol_id any,
+ inout report_array any) returns any
+{
+ -- dbg_obj_princ ('WebDAV_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 "WebDAV_DAV_RESOLVE_PATH" (
+ in detcol_id any,
+ inout reference_item any,
+ inout old_base varchar,
+ inout new_base varchar) returns any
+{
+ -- dbg_obj_princ ('WebDAV_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 "WebDAV_DAV_LOCK" (
+ in path any,
+ in id any,
+ in what 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 ('WebDAV_DAV_LOCK (', path, id, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LOCK_INT (path, davId, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, DB.DBA.WebDAV__user (auth_uid), DB.DBA.WebDAV__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "WebDAV_DAV_UNLOCK" (
+ in id any,
+ in what char(1),
+ in token varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('WebDAV_DAV_UNLOCK (', id, what, token, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_UNLOCK_INT (davId, what, token, DB.DBA.WebDAV__user (auth_uid), DB.DBA.WebDAV__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "WebDAV_DAV_IS_LOCKED" (
+ inout id any,
+ inout what char(1),
+ in owned_tokens varchar) returns integer
+{
+ -- dbg_obj_princ ('WebDAV_DAV_IS_LOCKED (', id, what, owned_tokens, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_IS_LOCKED_INT (davId, what, owned_tokens);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "WebDAV_DAV_LIST_LOCKS" (
+ in id any,
+ in what char(1),
+ in recursive integer) returns any
+{
+ -- dbg_obj_princ ('WebDAV_DAV_LIST_LOCKS" (', id, what, recursive);
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LIST_LOCKS_INT (davId, what, recursive);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__root ()
+{
+ return 'me/webdav';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__fileDebug (
+ in value any,
+ in mode integer := -1)
+{
+ string_to_file ('webdav.txt', cast (value as varchar) || '\r\n', mode);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__detcolId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[1];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__davId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[2];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__stringdate (
+ in dt varchar)
+{
+ declare _arr, months, rs, tzone_z, tzone_h, tzone_m any;
+ declare d, m, y, hms, tzone varchar;
+
+ _arr := split_and_decode (trim (dt), 0, '\0\0 ');
+ if (length(_arr) = 5)
+ _arr := vector_concat (vector (''), _arr);
+
+ if (length(_arr) = 6)
+ {
+ months := vector ('JAN', '01', 'FEB', '02', 'MAR', '03', 'APR', '04', 'MAY', '05', 'JUN', '06', 'JUL', '07', 'AUG', '08', 'SEP', '09', 'OCT', '10', 'NOV', '11', 'DEC', '12');
+ d := _arr[1];
+ m := get_keyword (upper(_arr[2]), months);
+ y := _arr[3];
+ hms := _arr[4];
+ tzone := _arr[5];
+ tzone_z := substring (tzone, 1, 1);
+ tzone_h := atoi (substring (tzone, 2, 2));
+ tzone_m := atoi (substring (tzone, 4, 2));
+ if (tzone_z = '+')
+ {
+ tzone_h := tzone_h - 2 * tzone_h;
+ tzone_m := tzone_m - 2 * tzone_m;
+ }
+ rs := stringdate (sprintf ('%s.%s.%s %s', m, d, y, hms));
+ rs := dateadd ('hour', tzone_h, rs);
+ rs := dateadd ('minute', tzone_m, rs);
+ }
+ else
+ {
+ rs := stringdate ('1900.01.01 00:00:00'); -- set system date
+ }
+ return rs;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__user (
+ in user_id integer,
+ in default_id integer := null)
+{
+ return coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = coalesce (user_id, default_id)), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__password (
+ in user_id integer)
+{
+ return coalesce ((select pwd_magic_calc(U_NAME, U_PWD, 1) from WS.WS.SYS_DAV_USER where U_ID = user_id), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__owner (
+ in detcol_id any,
+ in subPath_parts any,
+ in uid any,
+ in gid any,
+ inout ouid integer,
+ inout ogid integer)
+{
+ declare id any;
+ declare path varchar;
+
+ DB.DBA.DAV_OWNER_ID (uid, gid, ouid, ogid);
+ if ((ouid = -12) or (ouid = 5))
+ {
+ path := DB.DBA.WebDAV__path (detcol_id, subPath_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, 'P');
+ if (DAV_HIDE_ERROR (id))
+ {
+ select COL_OWNER, COL_GROUP
+ into ouid, ogid
+ from WS.WS.SYS_DAV_COL
+ where COL_ID = id;
+ }
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__detName ()
+{
+ return UNAME'WebDAV';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__xml2string (
+ in _xml any)
+{
+ declare stream any;
+
+ stream := string_output ();
+ http_value (_xml, null, stream);
+ return string_output_string (stream);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__path (
+ in detcol_id any,
+ in subPath_parts any)
+{
+ declare N integer;
+ declare path varchar;
+
+ path := rtrim (DB.DBA.DAV_SEARCH_PATH (detcol_id, 'C'), '/');
+ for (N := 0; N < length (subPath_parts); N := N + 1)
+ path := path || '/' || subPath_parts[N];
+
+ return path;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__title (
+ in path varchar)
+{
+ path := trim (path, '/');
+ return subseq (path, strrchr (path, '/')+1);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__params (
+ in colId integer)
+{
+ declare params any;
+
+ colId := DB.DBA.WebDAV__detcolId (colId);
+ params := vector (
+ 'authentication', 'Yes',
+ 'path', DB.DBA.WebDAV__paramGet (colId, 'C', 'path', 0),
+ 'user', DB.DBA.WebDAV__paramGet (colId, 'C', 'user', 0),
+ 'password', DB.DBA.WebDAV__paramGet (colId, 'C', 'password', 0, 1, 1),
+ 'graph', DB.DBA.WebDAV__paramGet (colId, 'C', 'graph', 0)
+ );
+ return params;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__paramSet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _propValue any,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _encrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__paramSet', _propName, _propValue, ')');
+ declare retValue any;
+
+ if (_serialized)
+ _propValue := serialize (_propValue);
+
+ if (_encrypt)
+ _propValue := pwd_magic_calc ('webdav', _propValue);
+
+ if (_prefixed)
+ _propName := 'virt:WebDAV-' || _propName;
+
+ _id := DB.DBA.WebDAV__davId (_id);
+ retValue := DB.DBA.DAV_PROP_SET_RAW (_id, _what, _propName, _propValue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__paramGet (
+ in _id integer,
+ in _what varchar,
+ in _propName varchar,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _decrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__paramGet (', _id, _what, _propName, ')');
+ declare propValue any;
+
+ if (_prefixed)
+ _propName := 'virt:WebDAV-' || _propName;
+
+ propValue := DB.DBA.DAV_PROP_GET_INT (DB.DBA.WebDAV__davId (_id), _what, _propName, 0, DB.DBA.Dropbox__user (http_dav_uid ()), DB.DBA.Dropbox__password (http_dav_uid ()), http_dav_uid ());
+ if (isinteger (propValue))
+ propValue := null;
+
+ if (_serialized and not isnull (propValue))
+ propValue := deserialize (propValue);
+
+ if (_decrypt and not isnull (propValue))
+ propValue := pwd_magic_calc ('webdav', propValue, 1);
+
+ return propValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__paramRemove (
+ in _id integer,
+ in _what varchar,
+ in _propName varchar,
+ in _prefixed integer := 1)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__paramRemove (', _id, _what, _propName, ')');
+ if (_prefixed)
+ _propName := 'virt:WebDAV-' || _propName;
+
+ DB.DBA.DAV_PROP_REMOVE_RAW (DB.DBA.WebDAV__davId (_id), _what, _propName, 1, http_dav_uid());
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__obj2xml (
+ in item any)
+{
+ return '<entry>' || ODS..obj2xml (item, 10) || '</entry>';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__entryXPath (
+ in _xml any,
+ in _xpath varchar,
+ in _cast integer := 0)
+{
+ declare retValue any;
+
+ if (_cast)
+ {
+ retValue := serialize_to_UTF8_xml (xpath_eval (sprintf ('[__enc "UTF-8" xmlns:D="DAV:"] string (//D:response/%s)', _xpath), _xml, 1));
+ } else {
+ retValue := xpath_eval ('[__enc "UTF-8" xmlns:D="DAV:"] //D:response' || _xpath, _xml, 1);
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__propertyXPath (
+ in _xml any,
+ in _xpath varchar,
+ in _cast integer := 0)
+{
+ declare retValue any;
+
+ if (_cast)
+ {
+ retValue := serialize_to_UTF8_xml (xpath_eval (sprintf ('[__enc "UTF-8" xmlns:D="DAV:"] string (//D:response/D:propstat[D:status = "HTTP/1.1 200 OK"]/D:prop/%s)', _xpath), _xml, 1));
+ } else {
+ retValue := xpath_eval ('[__enc "UTF-8" xmlns:D="DAV:"] //D:response/D:propstat[D:status = "HTTP/1.1 200 OK"]/D:prop' || _xpath, _xml, 1);
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__exec_error (
+ in _header any,
+ in _silent integer := 0)
+{
+ if ((_header[0] like 'HTTP/1._ 4__ %') or (_header[0] like 'HTTP/1._ 5__ %'))
+ {
+ if (not _silent)
+ signal ('22023', trim (_header[0], '\r\n'));
+
+ return 0;
+ }
+ return 1;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__exec_code (
+ in _header any)
+{
+ return subseq (_header[0], 9, 12);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__exec (
+ inout detcol_id integer,
+ inout retHeader varchar,
+ in method varchar,
+ in url varchar,
+ in header varchar := '',
+ in content varchar := '')
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__exec', detcol_id, method, url, header, ')');
+ declare retValue, params any;
+ declare _reqHeader, _resHeader any;
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.WebDAV__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ return -28;
+ };
+
+ params := DB.DBA.WebDAV__params (detcol_id);
+ if (get_keyword ('authentication', params) <> 'Yes')
+ {
+ DB.DBA.WebDAV__activity (detcol_id, 'Error: Not authenticated');
+ return -28;
+ }
+
+ _reqHeader := sprintf ('Authorization: Basic %s\r\n', encode_base64 (get_keyword ('user', params) || ':' || get_keyword ('password', params)));
+ if (header <> '')
+ _reqHeader := _reqHeader || header;
+
+ retHeader := null;
+ retValue := http_client_ext (url=>url, http_method=>method, http_headers=>_reqHeader, headers =>retHeader, body=>content, n_redirects=>15);
+ -- dbg_obj_print ('retValue', DB.DBA.WebDAV__exec_code (retHeader), url, method);
+ if (not DB.DBA.WebDAV__exec_error (retHeader, 1))
+ {
+ DB.DBA.WebDAV__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__davList (
+ inout detcol_id integer,
+ inout colId integer)
+{
+ declare retValue any;
+
+ vectorbld_init (retValue);
+ for (select vector (RES_FULL_PATH,
+ 'R',
+ length (RES_CONTENT),
+ RES_MOD_TIME,
+ vector (DB.DBA.WebDAV__detName (), detcol_id, RES_ID, 'R'),
+ RES_PERMS,
+ RES_GROUP,
+ RES_OWNER,
+ RES_CR_TIME,
+ RES_TYPE,
+ RES_NAME ) as I
+ from WS.WS.SYS_DAV_RES
+ where RES_COL = DB.DBA.WebDAV__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ for (select vector (WS.WS.COL_PATH (COL_ID),
+ 'C',
+ 0,
+ COL_MOD_TIME,
+ vector (DB.DBA.WebDAV__detName (), detcol_id, COL_ID, 'C'),
+ COL_PERMS,
+ COL_GROUP,
+ COL_OWNER,
+ COL_CR_TIME,
+ 'dav/unix-directory',
+ COL_NAME) as I
+ from WS.WS.SYS_DAV_COL
+ where COL_PARENT = DB.DBA.WebDAV__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ vectorbld_final (retValue);
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__list (
+ inout detcol_id any,
+ inout detcol_parts varchar,
+ inout subPath_parts varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__list (', detcol_id, detcol_parts, subPath_parts, ')');
+ declare colId integer;
+ declare colPath varchar;
+ declare url, href, header, body varchar;
+ declare syncTime datetime;
+ declare V, retValue, retHeader any;
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.WebDAV__davId (DB.DBA.DAV_SEARCH_ID (colPath, 'C'));
+ if (DAV_HIDE_ERROR (colId) is null)
+ return -28;
+
+ syncTime := DB.DBA.WebDAV__paramGet (colId, 'C', 'syncTime');
+ if (not isnull (syncTime) and (datediff ('second', syncTime, now ()) < 15))
+ return 0;
+
+ url := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'path', 0);
+ if (length (subPath_parts) <> 1)
+ {
+ href := DB.DBA.WebDAV__paramGet (colId, 'C', 'href', 0);
+ if (isnull (href))
+ return -28;
+
+ V := rfc1808_parse_uri (url);
+ V[2] := href;
+ url := DB.DBA.vspx_uri_compose (V);
+ }
+ body :=
+ '<?xml version="1.0" encoding="utf-8" ?>' ||
+ '<D:propfind xmlns:D="DAV:">' ||
+ ' <D:prop>' ||
+ ' <D:getlastmodified />' ||
+ ' <D:creationdate />' ||
+ ' <D:getetag />' ||
+ ' <D:getcontenttype />' ||
+ ' <D:getcontentlength />' ||
+ ' <D:resourcetype />' ||
+ ' </D:prop>' ||
+ '</D:propfind>';
+ header := sprintf ('Depth: 1\r\nContent-Type: application/xml; charset="utf-8"\r\nContent-Length: %d\r\n', length (body));
+ retValue := DB.DBA.WebDAV__exec (detcol_id, retHeader, 'PROPFIND', url, header, body);
+ -- dbg_obj_print ('retValue', retValue);
+ if (not isinteger (retValue))
+ DB.DBA.WebDAV__paramSet (colId, 'C', 'syncTime', now ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__resource (
+ inout detcol_id any,
+ inout url any)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__resource (', detcol_id, path, ')');
+ declare header, body, retValue, retHeader any;
+
+ body :=
+ '<?xml version="1.0" encoding="utf-8" ?>' ||
+ '<D:propfind xmlns:D="DAV:">' ||
+ ' <D:prop>' ||
+ ' <D:getlastmodified />' ||
+ ' <D:creationdate />' ||
+ ' <D:getetag />' ||
+ ' <D:getcontenttype />' ||
+ ' <D:getcontentlength />' ||
+ ' <D:resourcetype />' ||
+ ' </D:prop>' ||
+ '</D:propfind>';
+ header := sprintf ('Depth: 0\r\nContent-Type: application/xml; charset="utf-8"\r\nContent-Length: %d\r\n', length (body));
+ retValue := DB.DBA.WebDAV__exec (detcol_id, retHeader, 'PROPFIND', url, header, body);
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__activity (
+ in detcol_id integer,
+ in text varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__activity (', detcol_id, text, ')');
+ declare parentId integer;
+ declare parentPath varchar;
+ declare activity_id integer;
+ declare activity, activityName, activityPath, activityContent, activityType varchar;
+ declare davEntry any;
+ declare _errorCount integer;
+ declare exit handler for sqlstate '*'
+ {
+ if (__SQL_STATE = '40001')
+ {
+ rollback work;
+ if (_errorCount > 5)
+ resignal;
+
+ delay (1);
+ _errorCount := _errorCount + 1;
+ goto _start;
+ }
+ return;
+ };
+
+ _errorCount := 0;
+
+_start:;
+ activity := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'activity', 0);
+ if (activity is null)
+ return;
+
+ if (activity <> 'on')
+ return;
+
+ davEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcol_id, 'C', '', null, null, http_dav_uid ());
+ if (DB.DBA.DAV_HIDE_ERROR (davEntry) is null)
+ return;
+
+ parentId := DB.DBA.DAV_SEARCH_ID (davEntry[0], 'P');
+ if (DB.DBA.DAV_HIDE_ERROR (parentId) is null)
+ return;
+
+ parentPath := DB.DBA.DAV_SEARCH_PATH (parentId, 'C');
+ if (DB.DBA.DAV_HIDE_ERROR (parentPath) is null)
+ return;
+
+ activityContent := '';
+ activityName := davEntry[10] || '_activity.log';
+ activityPath := parentPath || activityName;
+ activity_id := DB.DBA.DAV_SEARCH_ID (activityPath, 'R');
+ if (DB.DBA.DAV_HIDE_ERROR (activity_id) is not null)
+ {
+ DB.DBA.DAV_RES_CONTENT_INT (activity_id, activityContent, activityType, 0, 0);
+ if (activityType <> 'text/plain')
+ return;
+
+ activityContent := cast (activityContent as varchar);
+ }
+ activityContent := activityContent || sprintf ('%s %s\r\n', subseq (datestring (now ()), 0, 19), text);
+ activityType := 'text/plain';
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (activityPath, activityContent, activityType, '110100000RR', DB.DBA.WebDAV__user (davEntry[6]), DB.DBA.WebDAV__user (davEntry[7]), extern=>0, check_locks=>0);
+ commit work;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__downloads (
+ in detcol_id integer,
+ in downloads any)
+{
+ declare aq any;
+
+ if (length (downloads) = 0)
+ return;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.WebDAV__downloads_aq', vector (detcol_id, downloads));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__downloads_aq (
+ in detcol_id integer,
+ in downloads any)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__downloads_aq (', detcol_id, downloads, ')');
+ declare N, downloaded integer;
+ declare url, listHref varchar;
+ declare items any;
+ declare V, retValue, retHeader any;
+
+ set_user_id ('dba');
+ N := 0;
+ items := vector ();
+ DB.DBA.WebDAV__activity (detcol_id, sprintf ('Downloading %d file(s)', length (downloads)));
+ foreach (any download in downloads) do
+ {
+ downloaded := DB.DBA.WebDAV__paramGet (download[0], download[1], 'download', 0);
+ if (downloaded is null)
+ goto _continue;
+
+ downloaded := cast (downloaded as integer);
+ if (downloaded > 5)
+ goto _continue;
+
+ listHref := DB.DBA.WebDAV__paramGet (download[0], download[1], 'href', 0);
+ if (listHref is null)
+ goto _continue;
+
+ url := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'path', 0);
+ V := rfc1808_parse_uri (url);
+ V[2] := listHref;
+ url := DB.DBA.vspx_uri_compose (V);
+ retValue := DB.DBA.WebDAV__exec (detcol_id, retHeader, 'GET', url);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ {
+ downloaded := downloaded + 1;
+ DB.DBA.WebDAV__paramSet (download[0], download[1], 'download', cast (downloaded as varchar), 0);
+ }
+ else
+ {
+ update WS.WS.SYS_DAV_RES set RES_CONTENT = retValue where RES_ID = DB.DBA.WebDAV__davId (download[0]);
+ DB.DBA.WebDAV__paramRemove (download[0], download[1], 'download');
+ items := vector_concat (items, vector (download));
+ N := N + 1;
+ }
+ commit work;
+
+ _continue:;
+ }
+ DB.DBA.WebDAV__activity (detcol_id, sprintf ('Downloaded %d file(s)', N));
+ foreach (any item in items) do
+ {
+ DB.DBA.WebDAV__rdf_delete (detcol_id, item[0], item[1]);
+ DB.DBA.WebDAV__rdf_insert (detcol_id, item[0], item[1]);
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__rdf (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ declare aq any;
+
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.WebDAV__rdf_aq', vector (detcol_id, id, what));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__rdf_aq (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
+{
+ set_user_id ('dba');
+ DB.DBA.WebDAV__rdf_delete (detcol_id, id, what);
+ DB.DBA.WebDAV__rdf_insert (detcol_id, id, what);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__rdf_insert (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__rdf_insert (', detcol_id, id, what, rdf_graph, ')');
+ declare permissions, rdf_graph2 varchar;
+ declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;
+ declare path, content, type any;
+ declare exit handler for sqlstate '*'
+ {
+ return;
+ };
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ permissions := DB.DBA.WebDAV__paramGet (detcol_id, 'C', ':virtpermissions', 0, 0);
+ if (permissions[6] = ascii('0'))
+ {
+ -- add to private graphs
+ if (not SIOC..private_graph_check (rdf_graph))
+ return;
+ }
+
+ id := DB.DBA.WebDAV__davId (id);
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = id);
+ type := (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = id);
+ rdf_sponger := coalesce (DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'sponger', 0), 'on');
+ rdf_cartridges := coalesce (DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'cartridges', 0), '');
+ rdf_metaCartridges := coalesce (DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'metaCartridges', 0), '');
+
+ RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__rdf_delete (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__rdf_delete (', detcol_id, id, what, rdf_graph, ')');
+ declare rdf_graph2 varchar;
+ declare path varchar;
+
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.WebDAV__paramGet (detcol_id, 'C', 'graph', 0);
+
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
+
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ if (path like '%.gz')
+ path := regexp_replace (path, '\.gz\x24', '');
+
+ rdf_graph2 := 'http://local.virt' || path;
+ SPARQL delete from graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };
+ SPARQL clear graph ?:rdf_graph2;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.WebDAV__refresh (
+ in path varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.WebDAV__refresh (', path, ')');
+ declare colId any;
+
+ colId := DB.DBA.DAV_SEARCH_ID (path, 'C');
+ if (DAV_HIDE_ERROR (colId) is not null)
+ DB.DBA.WebDAV__paramRemove (colId, 'C', 'syncTime');
+}
+;
diff --git a/appsrc/ODS-Briefcase/new/od-a-api.sql b/appsrc/ODS-Briefcase/new/od-a-api.sql
index d61a16e..7a9752f 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.7 2011/08/01 14:14:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -124,6 +124,40 @@ create procedure ODS.ODS_API.inheritance2string (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get items list
+--
+-- Retrieve a list of items in a path.
+--
+-- \param path The path to the WebDAV folder to list.
+--
+-- \return An XML representation of the contents of the path. FIXME: link to the schema or a documentation of
+-- the XML format.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.list?path=/DAV/home/demo/Public&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:32:52 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 322
+-- <items>
+-- <item path="/DAV/home/demo/Public/demo.xml">
+-- <name>demo.xml</name>
+-- <mimeType>text/xml</mimeType>
+-- <size>2277</size>
+-- <owner>demo</owner>
+-- <group>demo</group>
+-- <permissions>rw-r-----</permissions>
+-- <modification>2010-12-30</modification>
+-- </item>
+-- <items>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.list" (
in path varchar) __soap_http 'text/xml'
{
@@ -228,6 +262,41 @@ create procedure ODS.ODS_API."briefcase.info" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get information about a resource.
+--
+-- Retrieve detailed information about a WebDAV resource.
+--
+-- \param path The path to the resource in question.
+--
+-- \return An XML document detailing the resource in question. FIXME: document schema.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.info?path=/DAV/home/demo/demo.xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:32:52 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 322
+--
+-- <item path="/DAV/home/demo/demo.xml">
+-- <name>demo.xml</name>
+-- <mimeType>text/xml</mimeType>
+-- <size>2277</size>
+-- <owner>demo</owner>
+-- <group>demo</group>
+-- <permissions>rw-r-----</permissions>
+-- <modification>2010-12-30</modification>
+-- <creation>2010-12-30</creation>
+-- <properties></properties>
+-- <shares></shares>
+-- </item>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.info" (
in path varchar) __soap_http 'text/xml'
{
@@ -237,6 +306,35 @@ create procedure ODS.ODS_API."briefcase.resource.info" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Change the state of version control on a resource.
+--
+-- ODS supports version control for files as discussed in \ref ods_briefcase_version_control. This
+-- method allows to enable or disable version control on single resources.
+--
+-- \param path The path to the resource in question.
+-- \param state Value indicating whether version control should be enabled ("on") or disabled ("off").
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.vc.set?path=/DAV/home/demo/demo.xml&state=on&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:51:49 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.vc.set" (
in path varchar,
in state varchar := 'on') __soap_http 'text/xml'
@@ -280,6 +378,56 @@ create procedure ODS.ODS_API."briefcase.resource.vc.set" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get a specific version of a version controlled resource.
+--
+-- If a resource has version control enabled this method allows to retrieve all versions that have
+-- been checked in.
+--
+-- \param path The path of the resource to get.
+-- \param version The version to get. This can either be an exact numerical version to get or the special version 'last'
+-- which will fetch the last version that has been checked in. FIXME: is this correct?
+--
+-- \return The content of the resource at the time it was checked in with the requested version.
+--
+-- \sa briefcase.resource.vc.set, briefcase.resource.vc.checkin
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.vc.get?path=/DAV/home/demo/demo.xml&version=last&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:01:38 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml
+-- Content-Length: 2277
+--
+-- <?xml version="1.0" ?>
+-- <?xml-stylesheet type="text/xsl" href="/DAV/JS/xslt/formview.xsl"?>
+-- <form showajax="1" >
+-- <ds name="new datasource" type="1" pagesize="30">
+-- <connection type="1" endpoint="/XMLA" dsn="DSN=ora10ma-hr" nocred="0" uid="0"/>
+-- <options table="" limit="30" cursortype="0"/>
+-- <query><![CDATA[]]></query>
+-- <outputFields>
+-- </outputFields>
+-- <inputFields>
+-- </inputFields>
+-- <selfFields>
+-- </selfFields>
+-- <masterFields>
+-- </masterFields>
+-- <masterDSs>
+-- </masterDSs>
+-- <types>
+-- </types>
+-- </ds>
+-- [...]
+-- </form>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.vc.get" (
in path varchar,
in version varchar := 'last') __soap_http 'text/xml'
@@ -316,6 +464,33 @@ create procedure ODS.ODS_API."briefcase.resource.vc.get" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Check-in resource.
+--
+-- FIXME: what does this do?
+--
+-- \param path The path to the resource to check in.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.vc.checkin?path=/DAV/home/demo/demo.xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:57:47 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.vc.checkin" (
in path varchar) __soap_http 'text/xml'
{
@@ -348,6 +523,33 @@ create procedure ODS.ODS_API."briefcase.resource.vc.checkin" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Check-out a resource.
+--
+-- FIXME: What does this do?
+--
+-- \param path The path to the resource to check out.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.vc.checkout?path=/DAV/home/demo/demo.xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:56:28 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.vc.checkout" (
in path varchar) __soap_http 'text/xml'
{
@@ -380,6 +582,33 @@ create procedure ODS.ODS_API."briefcase.resource.vc.checkout" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Lock a resource.
+--
+-- FIXME: explain what locking is.
+--
+-- \param path The path to the resource to lock or unlock.
+-- \param state Can be 'on' or 'off' to either lock or unlock the resource.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.vc.lock?path=/DAV/home/demo/demo.xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:58:44 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>\endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.vc.lock" (
in path varchar,
in state varchar := 'on') __soap_http 'text/xml'
@@ -451,6 +680,38 @@ create procedure ODS.ODS_API."briefcase.resource.vc.info.internal" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get resource version control details
+--
+-- ODS supports version control for files as discussed in \ref ods_briefcase_version_control. This method
+-- allows to retrieve information about the version control status of a resource.
+--
+-- \param path Path to the resource in question.
+--
+-- \return The state of version control for the given file. FIXME: document the XML schema that is used.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.vc.info?path=/DAV/home/demo/demo.xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:53:56 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 173
+--
+-- <item path="/DAV/home/demo/demo.xml">
+-- <versionControl>
+-- <enabled>ON</enabled>
+-- <autoVersioning>OFF</autoVersioning>
+-- <state>Check-In</state>
+-- <lock>OFF</lock>
+-- </versionControl>
+-- </item>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.vc.info" (
in path varchar) __soap_http 'text/xml'
{
@@ -519,6 +780,38 @@ create procedure ODS.ODS_API."briefcase.resource.vc.versions.internal" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get information on the available versions of a resource.
+--
+-- Retrieve details on the available versions of a resource in the WebDAV. The resource
+-- must be version controlled.
+--
+-- \param path The path to the versioned resource.
+--
+-- \return A listing of all available versions encoded as XML. FIXME: describe the scheme
+--
+-- \sa briefcase.resource.vc.set
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.vc.versions?path=/DAV/home/demo/demo.xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:59:49 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 259
+--
+-- <item path="/DAV/home/demo/demo.xml">
+-- <versions>
+-- <version path="/DAV/home/demo/VVC/demo.xml/1" number="1" size="2277" modification="2011-05-10" />
+-- <version path="/DAV/home/demo/VVC/demo.xml/2" number="2" size="2277" modification="2011-05-10" />
+-- </versions>
+-- </item>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.vc.versions" (
in path varchar) __soap_http 'text/xml'
{
@@ -552,6 +845,42 @@ create procedure ODS.ODS_API."briefcase.resource.vc.versions" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get the contents of a resource.
+--
+-- Retrieve the actual resource from WebDAV, ie. download the file.
+--
+-- \param path The path to the resource to retrieve.
+--
+-- \return The contents of the file.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.get?path=/DAV/home/demo/demo.xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:45:08 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml
+-- Content-Length: 2277
+--
+-- <?xml version="1.0" ?>
+-- <?xml-stylesheet type="text/xsl" href="/DAV/JS/xslt/formview.xsl"?>
+-- <form showajax="1" >
+-- <ds name="new datasource" type="1" pagesize="30">
+-- <connection type="1" endpoint="/XMLA" dsn="DSN=ora10ma-hr" nocred="0" uid="0"/>
+-- <options table="" limit="30" cursortype="0"/>
+-- <query><![CDATA[]]></query>
+-- <outputFields>
+-- </outputFields>
+--
+-- [...]
+--
+-- </form>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.get" (
in path varchar) __soap_http 'text/xml'
{
@@ -585,6 +914,38 @@ create procedure ODS.ODS_API."briefcase.resource.get" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Store/upload a resource.
+--
+-- Store a resource/file in the WebDAV system.
+--
+-- FIXME: I suppose using magic folders we can also upload RDF content and maybe more. This should be detailed here.
+--
+-- \param path The target path of the newly created resource.
+-- \param content The content of the resource. FIXME: byte64 encoded for binary files?
+-- \param type The type of the resource. FIXME: what does this mean? mimetype?
+-- \param permissions The permissions of the newly created resource as detailed in \ref ods_briefcase_resource_permissions.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.store?path=/DAV/home/demo/mysimpletext.xml&content=test&type=xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:47:16 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 61
+--
+-- <result>
+-- <code>16795</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.store" (
in path varchar,
in content varchar,
@@ -617,6 +978,31 @@ ret:
-------------------------------------------------------------------------------
--
+--!
+-- \brief Delete a WebDAV resource.
+--
+-- \param path The path to the resource to be deleted.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.resource.delete?path=/DAV/home/demo/mysimpletext.xml&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 11:48:52 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.resource.delete" (
in path varchar) __soap_http 'text/xml'
{
@@ -643,6 +1029,38 @@ create procedure ODS.ODS_API."briefcase.resource.delete" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get details about a WebDAV collection.
+--
+-- \param path The path to the collection.
+--
+-- \return The details of the collection encoded as XML.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.collection.info?path=/DAV/home/demo/mytest&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:08:13 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 309
+--
+-- <item path="/DAV/home/demo/mytest/">
+-- <name>mytest</name>
+-- <mimeType>dav/unix-directory</mimeType>
+-- <owner>demo</owner>
+-- <group>demo</group>
+-- <permissions>rw-r--r--</permissions>
+-- <modification>2011-05-10</modification>
+-- <creation>2011-05-10</creation>
+-- <properties></properties>
+-- <shares></shares>
+-- </item>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.collection.info" (
in path varchar) __soap_http 'text/xml'
{
@@ -652,6 +1070,33 @@ create procedure ODS.ODS_API."briefcase.collection.info" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new WebDAV collection/folder.
+--
+-- \param path The path of the collection to create.
+-- \param permissions The permissions of the newly created collection as detailed in \ref ods_briefcase_resource_permissions
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa briefcase.collection.delete
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.collection.create?path=/DAV/home/demo/mytest&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:07:07 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 60
+--
+-- <result>
+-- <code>1317</code>
+-- <message>Success</message>
+-- </result>\endverbatim
+--/
create procedure ODS.ODS_API."briefcase.collection.create" (
in path varchar,
in permissions varchar := '110100100RM') __soap_http 'text/xml'
@@ -682,6 +1127,33 @@ ret:
-------------------------------------------------------------------------------
--
+--!
+-- \brief Delete a WebDAV collection.
+--
+-- \param path The path to the collection to be deleted.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa briefcase.collection.create
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.collection.delete?path=/DAV/home/demo/mytest&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:09:31 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.collection.delete" (
in path varchar) __soap_http 'text/xml'
{
@@ -708,6 +1180,37 @@ create procedure ODS.ODS_API."briefcase.collection.delete" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Copy a WebDAV resource.
+--
+-- Copies a resource or a collection to a new path. Collections are copied recursively.
+--
+-- \param from_path The resource path.
+-- \param to_path The target path. FIXME: is this like in UNIX shells or is this the new full path of the resource?
+-- \param overwrite Flag to indicate if an already existing resource at \p to_path should be overwritten. If 0 then then
+-- call will fail in case that a resource exists.
+-- \param permissions The permissions of the newly created resource as detailed in \ref ods_briefcase_resource_permissions.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.copy?from_path=/DAV/home/demo/t1/&to_path=/DAV/home/demo/t2/&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:13:41 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.copy" (
in from_path varchar,
in to_path varchar,
@@ -757,6 +1260,36 @@ ret:
-------------------------------------------------------------------------------
--
+--!
+-- \brief Move a WebDAV resource.
+--
+-- Move a resource or collection within the WebDAV tree.
+--
+-- \param from_path The resource path.
+-- \param to_path The target path. FIXME: is this like in UNIX shells or is this the new full path of the resource?
+-- \param overwrite Flag to indicate if an already existing resource at \p to_path should be overwritten. If 0 then then
+-- call will fail in case that a resource exists.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.move?from_path=/DAV/home/demo/t1/&to_path=/DAV/home/demo/t2/&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:15:33 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.move" (
in from_path varchar,
in to_path varchar,
@@ -828,6 +1361,34 @@ create procedure ODS.ODS_API."briefcase.property.list.internal" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief List all WebDAV properties of a resource.
+--
+-- \param path The path of the resource to list properties for.
+-- \param mask FIXME: what is he mask?
+--
+-- \return All properties for the given resource path encoded as XML. FIXME: explain the schema
+--
+-- \sa briefcase.property.set, briefcase.property.get, briefcase.property.remove
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.property.list?path=/DAV/home/demo/tmp1/&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:44:46 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 100
+--
+-- <item path="/DAV/home/demo/tmp1/">
+-- <properties>
+-- <property name="test">1</property>
+-- </prop
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.property.list" (
in path varchar,
in mask varchar := '%') __soap_http 'text/xml'
@@ -862,6 +1423,35 @@ create procedure ODS.ODS_API."briefcase.property.list" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new WebDAV property or update an existing one.
+--
+-- \param path The path of the resource which should be modified.
+-- \param name The name of the property to change.
+-- \param value The value of the property to change.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa briefcase.property.list, briefcase.property.get, briefcase.property.remove
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.property.set?path=/DAV/home/demo/tmp1/&name=test&value=1&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:42:46 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.property.set" (
in path varchar,
in "name" varchar,
@@ -892,6 +1482,34 @@ create procedure ODS.ODS_API."briefcase.property.set" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Remove a WebDAV property.
+--
+-- \param path The path of the resource.
+-- \param name The name of the property to remove.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa briefcase.property.list, briefcase.property.get, briefcase.property.set
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.property.remove?path=/DAV/home/demo/tmp1/&name=test&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:54:12 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.property.remove" (
in path varchar,
in "name" varchar) __soap_http 'text/xml'
@@ -921,6 +1539,31 @@ create procedure ODS.ODS_API."briefcase.property.remove" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get the value of a WebDAV property
+--
+-- \param path The path of the resource.
+-- \param name The name of the property to return.
+--
+-- \return The value of the requested property.
+--
+-- \sa briefcase.property.list
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.property.get?path=/DAV/home/demo/tmp1/&name=test&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 12:51:20 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 1
+--
+-- 1
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.property.get" (
in path varchar,
in name varchar := null) __soap_http 'text/xml'
@@ -950,6 +1593,45 @@ create procedure ODS.ODS_API."briefcase.property.get" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Share a WebDAV resource with a user.
+--
+-- \param path The path to the resource to share.
+-- \param user The user to share the resource with.
+-- \param inheritance The way the given rights should be propagated to children of the given path (in case of a collection).
+-- - \p 'object' will only change the permissions on the resource itself
+-- - \p 'all' will recursively update permissions on all children
+-- - \p 'children' will only update permissions on direct children. FIXME: is this correct?
+-- \param allow The actions the \p user should be allowed to perform. This is a UNIX style permission mask string consisting
+-- of three chars \p "rwx", referring to read, write, and execute permissions respectively. Each of these
+-- permissions can be granted by writing the character or not granted by writing a dash \p - instead. Example:
+-- \p "r--" would grant only read rights while it does not make any changes to the write and execute rights.
+-- \param deny The permissions to deny the user. The value is the same as with \p allow except that the given rights are
+-- revoked instead of granted. Thus, specifying \p "r--" would revoke read rights while leaving the write and
+-- execute rights untouched.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa briefcase.share.remove, briefcase.share.list
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.share.add?path=/DAV/home/demo/tmp1/&user=test1&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 17 May 2011 11:49:52 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.share.add" (
in path varchar,
in "user" varchar,
@@ -1018,6 +1700,40 @@ create procedure ODS.ODS_API."briefcase.share.add" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Remove a share from a resource.
+--
+-- Remove a previously created share for a specific resource and user.
+--
+-- \param path The path to the resource to remove the share from.
+-- \param user The user to revoke the share from.
+-- \param inheritance The way the given rights should be propagated to children of the given path (in case of a collection).
+-- - \p 'object' will only change the permissions on the resource itself
+-- - \p 'all' will recursively update permissions on all children
+-- - \p 'children' will only update permissions on direct children. FIXME: is this correct?
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa briefcase.share.add, briefcase.share.list
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.share.remove?path=/DAV/home/demo/tmp1/&user=demo&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 13:07:45 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.share.remove" (
in path varchar,
in "user" varchar,
@@ -1094,6 +1810,34 @@ create procedure ODS.ODS_API."briefcase.share.list.internal" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief List all the shares on a resource.
+--
+-- \param path The path to the resource for which shares should be listed.
+--
+-- \return The list of all shares created on the given resource encoded as XML.
+--
+-- \sa briefcase.share.add
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.share.list?path=/DAV/home/demo/tmp1/&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 17 May 2011 11:50:55 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 121
+--
+-- <item path="/DAV/home/demo/tmp1/">
+-- <shares>
+-- <share user="test1" inheritance="all" allow="rw-" deny="---" />
+-- </shares>
+-- </item>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.share.list" (
in path varchar) __soap_http 'text/xml'
{
@@ -1127,6 +1871,40 @@ create procedure ODS.ODS_API."briefcase.share.list" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Set an option of an ODS Briefcase instance.
+--
+-- \param inst_id The id of the Briefcase instance. See \ref ods_instance_id for details.
+-- \param options A comma-separated list of \p "key=value" pairs. Supported keys are:
+-- - chars
+-- - rows
+-- - tbLabels
+-- - hiddens
+-- - atomVersion
+-- FIXME: what are these options?
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa briefcase.options.get
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.options.set?inst_id=6&options=rows%3D5&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 13:14:10 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.options.set" (
in inst_id integer := null,
in options any) __soap_http 'text/xml'
@@ -1170,6 +1948,36 @@ create procedure ODS.ODS_API."briefcase.options.set" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get The option values of a ODS Briefcase instance.
+--
+-- \param inst_id The id of the Briefcase instance. See \ref ods_instance_id for details.
+--
+-- \return A list of the option values encoded as XML.
+--
+-- \sa briefcase.options.set
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/briefcase.options.get?inst_id=6&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Solaris) x86_64-pc-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 10 May 2011 13:11:48 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 125
+--
+-- <settings>
+-- <chars>60</chars>
+-- <rows>10</rows>
+-- <tbLabels>1</tbLabels>
+-- <hiddens>.</hiddens>
+-- <atomVersion>1.0</atomVersion>
+-- </settings>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."briefcase.options.get" (
in inst_id integer := null) __soap_http 'text/xml'
{
diff --git a/appsrc/ODS-Briefcase/new/od-a-code.sql b/appsrc/ODS-Briefcase/new/od-a-code.sql
index 9e474ab..746c1f2 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.24 2011/08/01 14:14:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -377,7 +377,7 @@ create procedure ODRIVE.WA.dashboard_rs(
in p0 integer)
{
declare account_id, vspxUser any;
- declare wai_name, link varchar;
+ declare waiName, 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
{
- 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;
+ 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;
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
{
- 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;
+ 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;
result (RES_ID, RES_NAME, link, RES_MOD_TIME, RES_OWNER);
}
}
@@ -798,13 +798,25 @@ 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 varchar)
+ in value any)
{
declare N integer;
@@ -819,7 +831,7 @@ create procedure ODRIVE.WA.vector_contains (
--
create procedure ODRIVE.WA.vector_index (
inout aVector any,
- in value varchar)
+ in value any)
{
declare N integer;
@@ -1195,7 +1207,7 @@ create procedure ODRIVE.WA.odrive_proc(
declare tmp, dirFilter, dirHiddens, dirList, sharedRoot, sharedFilter, sharedPath, sharedList any;
declare vspx_user, user_name, group_name varchar;
declare user_id, group_id integer;
- declare c2 integer;
+ declare c2 any;
declare c0, c1, c3, c4, c5, c6, c7, c8, c9 varchar;
result_names(c0, c1, c2, c3, c4, c5, c6, c7, c8, c9);
@@ -1310,15 +1322,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 <> item[7])
+ if (user_id <> coalesce (item[7], -1))
{
- user_id := item[7];
- user_name := ODRIVE.WA.odrive_user_name(user_id);
+ user_id := coalesce (item[7], -1);
+ user_name := ODRIVE.WA.odrive_user_name (user_id, '');
}
- if (group_id <> item[6])
+ if (group_id <> coalesce (item[6], -1))
{
- group_id := item[6];
- group_name := ODRIVE.WA.odrive_user_name(group_id);
+ group_id := coalesce (item[6], -1);
+ 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);
@@ -1336,8 +1348,9 @@ create procedure ODRIVE.WA.odrive_effective_permissions (
in permission varchar := '1__')
{
declare N, I, nPermission integer;
- declare rc, id, type, item any;
+ declare rc, id, what, item any;
declare lines, name, pwd, uid, gid, permissions any;
+ declare auth_name varchar;
if (isstring(permission))
permission := vector(permission);
@@ -1345,10 +1358,11 @@ create procedure ODRIVE.WA.odrive_effective_permissions (
name := null;
uid := null;
gid := null;
- id := ODRIVE.WA.DAV_SEARCH_ID (path, type);
+ what := case when (path[length (path)-1] <> ascii('/')) then 'R' else 'C' end;
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
for (N := 0; N < length (permission); N := N + 1)
{
- if (DB.DBA.DAV_AUTHENTICATE (id, type, permission[N], name, uid, gid))
+ if (DB.DBA.DAV_AUTHENTICATE (id, what, permission[N], name, uid, gid))
return 1;
}
@@ -1356,9 +1370,6 @@ 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);
@@ -1622,7 +1633,7 @@ create procedure ODRIVE.WA.account_iri (
-------------------------------------------------------------------------------
--
create procedure ODRIVE.WA.account_inverse_iri (
- in account_iri integer)
+ in account_iri varchar)
{
declare params any;
@@ -1775,6 +1786,7 @@ 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;
@@ -2253,9 +2265,9 @@ create procedure ODRIVE.WA.acl_params (
}
for (I := 0; I < length (params); I := I + 2)
{
- if (params[I] like 's_fld_1_%')
+ if (params[I] like 'f_fld_1_%')
{
- acl_seq := replace (params[I], 's_fld_1_', '');
+ acl_seq := replace (params[I], 'f_fld_1_', '');
acl_users := split_and_decode (trim (params[I+1]), 0, '\0\0,');
for (N := 0; N < length (acl_users); N := N + 1)
{
@@ -2264,21 +2276,21 @@ create procedure ODRIVE.WA.acl_params (
acl_user := ODRIVE.WA.odrive_user_id (trim (acl_users[N]));
if (acl_user <> -1)
{
- acl_inheritance := atoi (get_keyword ('s_fld_2_' || acl_seq, params));
+ acl_inheritance := atoi (get_keyword ('f_fld_2_' || acl_seq, params));
if (acl_inheritance <> 3)
{
WS.WS.ACL_ADD_ENTRY (acl_value,
acl_user,
- bit_shift (atoi (get_keyword ('s_fld_3_' || acl_seq || '_r_grant', params, '0')), 2) +
- bit_shift (atoi (get_keyword ('s_fld_3_' || acl_seq || '_w_grant', params, '0')), 1) +
- atoi (get_keyword ('s_fld_3_' || acl_seq || '_x_grant', params, '0')),
+ bit_shift (atoi (get_keyword ('f_fld_3_' || acl_seq || '_r_grant', params, '0')), 2) +
+ bit_shift (atoi (get_keyword ('f_fld_3_' || acl_seq || '_w_grant', params, '0')), 1) +
+ atoi (get_keyword ('f_fld_3_' || acl_seq || '_x_grant', params, '0')),
1,
acl_inheritance);
WS.WS.ACL_ADD_ENTRY (acl_value,
acl_user,
- bit_shift (atoi (get_keyword ('s_fld_4_' || acl_seq || '_r_deny', params, '0')), 2) +
- bit_shift (atoi (get_keyword ('s_fld_4_' || acl_seq || '_w_deny', params, '0')), 1) +
- atoi (get_keyword ('s_fld_4_' || acl_seq || '_x_deny', params, '0')),
+ bit_shift (atoi (get_keyword ('f_fld_4_' || acl_seq || '_r_deny', params, '0')), 2) +
+ bit_shift (atoi (get_keyword ('f_fld_4_' || acl_seq || '_w_deny', params, '0')), 1) +
+ atoi (get_keyword ('f_fld_4_' || acl_seq || '_x_deny', params, '0')),
0,
acl_inheritance);
}
@@ -2331,6 +2343,35 @@ create procedure ODRIVE.WA.acl_vector (
}
;
+-----------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.acl_vector_unique (
+ in acl any)
+{
+ declare N integer;
+ declare retValue any;
+
+ retValue := vector ();
+ for (N := 0; N < length (acl); N := N + 1)
+ {
+ if (exists (select 1 from DB.DBA.SYS_USERS where U_ID = acl[N][0] and U_IS_ROLE = 1))
+ {
+ for (select UG_UID from DB.DBA.SYS_USER_GROUP, DB.DBA.SYS_USERS where UG_GID = acl[N][0] and U_ID = UG_UID and U_IS_ROLE = 0 and U_ACCOUNT_DISABLED = 0) do
+ {
+ if (not ODRIVE.WA.vector_contains (retValue, UG_UID))
+ retValue := vector_concat (retValue, vector (UG_UID));
+ }
+ }
+ else
+ {
+ if (not ODRIVE.WA.vector_contains (retValue, acl[N][0]))
+ retValue := vector_concat (retValue, vector (acl[N][0]));
+ }
+ }
+ return retValue;
+}
+;
+
-------------------------------------------------------------------------------
--
create procedure ODRIVE.WA.odrive_ace_grantee(
@@ -2505,8 +2546,6 @@ 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 := '';
@@ -2752,13 +2791,31 @@ create procedure ODRIVE.WA.auto_version_short (
-------------------------------------------------------------------------------
--
+create procedure ODRIVE.WA.det_type (
+ in path varchar,
+ in what varchar := 'C') returns varchar
+{
+ declare id any;
+
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (ODRIVE.WA.DAV_ERROR (id))
+ return '';
+ return cast (coalesce (DB.DBA.DAV_PROP_GET_INT (id, what, ':virtdet', 0), '') as varchar);
+}
+;
+
+-------------------------------------------------------------------------------
+--
create procedure ODRIVE.WA.det_class(
in path varchar,
- in type varchar := 'C')
+ in what varchar := null) returns varchar
{
declare id any;
- id := ODRIVE.WA.DAV_SEARCH_ID (path);
+ if (isnull (what))
+ what := case when (path[length (path)-1] <> ascii('/')) then 'R' else 'C' end;
+
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
if (not ODRIVE.WA.DAV_ERROR (id) and isarray (id))
return cast (id[0] as varchar);
return '';
@@ -2784,41 +2841,6 @@ 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,
@@ -3001,7 +3023,7 @@ create procedure ODRIVE.WA.DAV_GET_VERSION_CONTROL (
-------------------------------------------------------------------------------
--
create procedure ODRIVE.WA.path_parent (
- in path value)
+ in path varchar)
{
path := trim(path, '/');
if (isnull(strrchr(path, '/')))
@@ -3013,7 +3035,7 @@ create procedure ODRIVE.WA.path_parent (
-------------------------------------------------------------------------------
--
create procedure ODRIVE.WA.path_name (
- in path value)
+ in path varchar)
{
path := trim(path, '/');
if (isnull(strrchr(path, '/')))
@@ -3183,7 +3205,8 @@ create procedure ODRIVE.WA.DAV_INIT_INT (
in auth_pwd varchar := null)
{
declare uid, gid integer;
- declare permissions, uname, gname varchar;
+ declare uname, gname varchar;
+ declare permissions any;
DB.DBA.DAV_OWNER_ID(ODRIVE.WA.account (), null, uid, gid);
ODRIVE.WA.DAV_API_PARAMS (uid, gid, uname, gname, auth_name, auth_pwd);
@@ -3231,25 +3254,6 @@ create procedure ODRIVE.WA.DAV_INIT_COLLECTION (
-------------------------------------------------------------------------------
--
-create procedure ODRIVE.WA.DAV_SEARCH_ID(
- in path varchar,
- out type varchar)
-{
- declare id any;
-
- type := 'C';
- id := DB.DBA.DAV_SEARCH_ID (path, type);
- if (ODRIVE.WA.DAV_ERROR(id))
- {
- type := 'R';
- return DB.DBA.DAV_SEARCH_ID (path, type);
- }
- return id;
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure ODRIVE.WA.DAV_GET (
inout resource any,
in property varchar)
@@ -3267,7 +3271,7 @@ create procedure ODRIVE.WA.DAV_GET (
return resource[2];
if (property = 'modificationTime')
- return resource[3];
+ return case when is_empty_or_null (resource[3]) then now () else resource[3] end;
if (property = 'id')
return resource[4];
@@ -3303,7 +3307,7 @@ create procedure ODRIVE.WA.DAV_GET (
return ODRIVE.WA.odrive_user_name(resource[7]);
if (property = 'creationTime')
- return resource[8];
+ return case when is_empty_or_null (resource[8]) then now () else resource[8] end;
if (property = 'mimeType')
return coalesce(resource[9], '');
@@ -3313,9 +3317,16 @@ create procedure ODRIVE.WA.DAV_GET (
if (property = 'acl')
{
- if (isnull(resource[0]))
+ declare path varchar;
+
+ path := resource[0];
+ if (isnull (path))
return WS.WS.ACL_CREATE();
- return cast(ODRIVE.WA.DAV_PROP_GET (resource[0], ':virtacl', WS.WS.ACL_CREATE()) as varbinary);
+
+ if (isstring (path) and path like '%,acl')
+ path := regexp_replace (path, ',acl\x24', '');
+
+ return cast (ODRIVE.WA.DAV_PROP_GET (path, ':virtacl', WS.WS.ACL_CREATE()) as varbinary);
}
if ((property = 'detType') and (not isnull (resource[0])))
@@ -3327,8 +3338,10 @@ create procedure ODRIVE.WA.DAV_GET (
{
if (ODRIVE.WA.DAV_PROP_GET (resource[0], 'virt:rdf_graph', '') <> '')
detType := 'rdfSink';
- if (ODRIVE.WA.DAV_PROP_GET (resource[0], 'virt:Versioning-History', '') <> '')
+ else 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;
}
@@ -3366,7 +3379,7 @@ create procedure ODRIVE.WA.DAV_GET (
if (property = 'permissions-inheritance')
{
- if ((isnull (resource[0])) or (resource[1] = 'R') or isarray(resource[1]))
+ if (isnull (resource[0]) or (resource[1] = 'R') or ODRIVE.WA.isVector (resource[1]))
return null;
return (select COL_INHERIT from WS.WS.SYS_DAV_COL where COL_ID = resource[4]);
}
@@ -3650,9 +3663,28 @@ create procedure ODRIVE.WA.DAV_DELETE (
in auth_name varchar := null,
in auth_pwd varchar := null)
{
- declare uname, gname varchar;
+ declare id any;
+ declare owner, uname, gname, detType 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);
}
;
@@ -3678,6 +3710,24 @@ 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,
@@ -3796,13 +3846,15 @@ 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, ')');
+ -- dbg_obj_princ ('ODRIVE.WA.DAV_PROP_SET (', path, propName, propValue, ')');
declare uname, gname varchar;
+ declare retValue any;
ODRIVE.WA.DAV_API_PARAMS (null, null, uname, gname, auth_name, auth_pwd);
if (removeBefore)
- DB.DBA.DAV_PROP_REMOVE(path, propname, auth_name, auth_pwd);
- return DB.DBA.DAV_PROP_SET(path, propname, propvalue, auth_name, auth_pwd);
+ 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);
}
;
@@ -3951,7 +4003,10 @@ create procedure ODRIVE.WA.get_rdf (
create procedure ODRIVE.WA.test_clear (
in S any)
{
- return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
+ S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
+ S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
+
+ return S;
}
;
@@ -4022,8 +4077,9 @@ 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));
@@ -4031,8 +4087,9 @@ 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));
@@ -4226,63 +4283,6 @@ 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,
@@ -4290,19 +4290,22 @@ create procedure ODRIVE.WA.ui_image (
{
if (itemType = 'C')
{
- if (ODRIVE.WA.det_category(itemPath) = 'CatFilter')
+ declare det_type varchar;
+
+ det_type := ODRIVE.WA.det_type (itemPath, itemType);
+ if (det_type = 'CatFilter')
return 'image/dav/category_16.png';
- if (ODRIVE.WA.det_category(itemPath) = 'PropFilter')
+ if (det_type = 'PropFilter')
return 'image/dav/property_16.png';
- if (ODRIVE.WA.det_category(itemPath) = 'HostFs')
+ if (det_type = 'HostFs')
return 'image/dav/hostfs_16.png';
- if (ODRIVE.WA.det_category(itemPath) = 'Versioning')
+ if (det_type = 'Versioning')
return 'image/dav/versions_16.png';
- if (ODRIVE.WA.det_category(itemPath) = 'News3')
+ if (det_type = 'News3')
return 'image/dav/enews_16.png';
- if (ODRIVE.WA.det_category(itemPath) = 'Blog')
+ if (det_type = 'Blog')
return 'image/dav/blog_16.png';
- if (ODRIVE.WA.det_category(itemPath) = 'oMail')
+ if (det_type = 'oMail')
return 'image/dav/omail_16.png';
return 'image/dav/foldr_16.png';
}
@@ -4391,12 +4394,15 @@ create procedure ODRIVE.WA.ui_date (
create procedure ODRIVE.WA.send_mail (
in _instance integer,
in _from integer,
- in _to integer,
+ in _to any,
+ in _subject varchar,
in _body varchar,
- in _path varchar)
+ in _path varchar,
+ in _mode integer := 1)
{
- declare N, _id, _what, _iri any;
- declare _smtp_server, _from_address, _to_address, _toUsers, _toBody, _message any;
+ -- dbg_obj_princ ('ODRIVE.WA.send_mail (', _from, _to, _path, ')');
+ declare _id, _what, _iri, _data any;
+ declare _smtp_server, _from_address, _to_address, _message any;
if ((select max (WS_USE_DEFAULT_SMTP) from WA_SETTINGS) = 1 or (select length (max (WS_SMTP)) from WA_SETTINGS) = 0)
{
@@ -4408,30 +4414,34 @@ 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;
- _id := DB.DBA.DAV_SEARCH_ID (_path, _what);
+ if (_what = 'C')
+ _iri := _iri || '/folder';
- if (exists (select 1 from SYS_USERS where U_ID = _to and U_IS_ROLE = 1))
- {
- _toUsers := vector ();
- for (select UG_UID from DB.DBA.SYS_USER_GROUP, DB.DBA.SYS_USERS where UG_GID = _to and U_ID = UG_UID and U_IS_ROLE = 0 and U_ACCOUNT_DISABLED = 0) do
- _toUsers := vector_concat (_toUsers, vector (UG_UID));
- } else {
- _toUsers := vector (_to);
- }
- _toBody := _body;
- for (N := 0; N < length (_toUsers); N := N + 1)
- {
- _to := _toUsers[N];
- _body := _toBody;
+ _id := DB.DBA.DAV_SEARCH_ID (_path, _what);
_body := replace (_body, '%resource_path%', _path);
+ if (isarray (_id) and (cast (_id[0] as varchar) in ('IMAP', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV')))
+ _id := _id[2];
+
+ if (not isarray (_id))
_body := replace (_body, '%resource_uri%', SIOC..post_iri_ex (_iri, _id));
+
_body := replace (_body, '%owner_uri%', SIOC..person_iri (SIOC..user_iri (_from)));
_body := replace (_body, '%owner_name%', ODRIVE.WA.account_name (_from));
+ _from_address := (select U_E_MAIL from SYS_USERS where U_ID = _from);
+ if (_mode)
+ {
_body := replace (_body, '%user_uri%', SIOC..person_iri (SIOC..user_iri (_to)));
_body := replace (_body, '%user_name%', ODRIVE.WA.account_name (_to));
- _message := 'Subject: Sharing notification\r\nContent-Type: text/plain\r\n' || _body;
- _from_address := (select U_E_MAIL from SYS_USERS where U_ID = _from);
_to_address := (select U_E_MAIL from SYS_USERS where U_ID = _to);
+ }
+ else
+ {
+ _data := ODS.ODS_API.getFOAFDataArray (_to);
+ _to_address := get_keyword ('mbox', _data);
+ _body := replace (_body, '%user_uri%', _to);
+ _body := replace (_body, '%user_name%', get_keyword ('name', _data, get_keyword ('nick', _data)));
+ }
+ _message := _subject || '\r\nContent-Type: text/plain\r\n' || _body;
{
declare exit handler for sqlstate '*'
{
@@ -4442,7 +4452,6 @@ create procedure ODRIVE.WA.send_mail (
}
}
}
-}
;
-------------------------------------------------------------------------------
@@ -4454,34 +4463,78 @@ create procedure ODRIVE.WA.acl_send_mail (
in _old_acl any,
in _new_acl any)
{
- declare N, M integer;
- declare oACLs, oACL, nACLs, nACL, settings, text any;
+ declare aq any;
+
+ _old_acl := ODRIVE.WA.acl_vector_unique (ODRIVE.WA.acl_vector (_old_acl));
+ _new_acl := ODRIVE.WA.acl_vector_unique (ODRIVE.WA.acl_vector (_new_acl));
+ aq := async_queue (1);
+ aq_request (aq, 'ODRIVE.WA.acl_send_mail_aq', vector (_instance, _from, _path, _old_acl, _new_acl));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.acl_send_mail_aq (
+ in _instance integer,
+ in _from integer,
+ in _path varchar,
+ in _old_acl any,
+ in _new_acl any)
+{
+ -- dbg_obj_princ ('ODRIVE.WA.acl_send_mail_aq (', _path, _old_acl, _new_acl, ')');
+ declare N integer;
+ declare settings, subject, text any;
settings := ODRIVE.WA.settings (_from);
+ subject := 'Subject: Sharing notification';
text := ODRIVE.WA.settings_mailShare (settings);
- oACLs := ODRIVE.WA.acl_vector (_old_acl);
- nACLs := ODRIVE.WA.acl_vector (_new_acl);
- for (N := 0; N < length (nACLs); N := N + 1)
+ for (N := 0; N < length (_new_acl); N := N + 1)
{
- for (M := 0; M < length (oACLs); M := M + 1)
+ if (not ODRIVE.WA.vector_contains (_old_acl, _new_acl[N]))
+ ODRIVE.WA.send_mail (_instance, _from, _new_acl[N], subject, text, _path);
+ }
+ subject := 'Subject: Unsharing notification';
+ text := ODRIVE.WA.settings_mailUnshare (settings);
+ for (N := 0; N < length (_old_acl); N := N + 1)
{
- if (nACLs[N][0] = oACLs[M][0])
- goto _skip;
+ if (not ODRIVE.WA.vector_contains (_new_acl, _old_acl[N]))
+ ODRIVE.WA.send_mail (_instance, _from, _old_acl[N], subject, text, _path);
}
- ODRIVE.WA.send_mail (_instance, _from, nACLs[N][0], text, _path);
- _skip:;
}
- for (N := 0; N < length (oACLs); N := N + 1)
+;
+
+-----------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.aci_vector (
+ in aci any)
{
- for (M := 0; M < length (nACLs); M := M + 1)
+ declare N, I integer;
+ declare retValue, webIDs any;
+
+ retValue := vector ();
+ for (N := 0; N < length (aci); N := N + 1)
+ {
+ if (aci[N][2] = 'person')
{
- if (oACLs[N][0] = nACLs[M][0])
- goto _skip2;
+ if (not ODRIVE.WA.vector_contains (retValue, aci[N][1]))
+ retValue := vector_concat (retValue, vector (aci[N][1]));
+ }
+ else if (aci[N][2] = 'group')
+ {
+ webIDs := (select WACL_WEBIDS from DB.DBA.WA_GROUPS_ACL where aci[N][1] = SIOC..acl_group_iri (WACL_USER_ID, WACL_NAME));
+ if (not isnull (webIDs))
+ {
+ webIDs := split_and_decode (webIDs, 0, '\0\0\n');
+ for (I := 0; I < length (webIDs); I := I + 1)
+ {
+ if (not ODRIVE.WA.vector_contains (retValue, webIDs[I]))
+ retValue := vector_concat (retValue, vector (webIDs[I]));
}
- ODRIVE.WA.send_mail (_instance, _from, oACLs[N][0], text, _path);
- _skip2:;
}
}
+ }
+ return retValue;
+}
;
-------------------------------------------------------------------------------
@@ -4509,18 +4562,30 @@ create procedure ODRIVE.WA.aci_parents (
create procedure ODRIVE.WA.aci_load (
in path varchar)
{
- declare retValue, graph any;
- declare S, st, msg, data, meta any;
+ declare id, what, retValue, graph any;
+ declare S, st, msg, meta, rows any;
+ --return vector ();
+ what := case when (path[length (path)-1] <> ascii('/')) then 'R' else 'C' end;
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ DB.DBA.DAV_AUTHENTICATE_SSL_ITEM (id, what, path);
+ if (isarray (id) and (cast (id[0] as varchar) not in ('IMAP', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV')))
+ {
+ 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);
+ graph := WS.WS.WAC_GRAPH (path);
S := sprintf (' sparql \n' ||
' define input:storage "" \n' ||
' prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n' ||
' prefix foaf: <http://xmlns.com/foaf/0.1/> \n' ||
' prefix acl: <http://www.w3.org/ns/auth/acl#> \n' ||
- ' select ?rule ?agent ?mode \n' ||
+ ' prefix flt: <http://www.openlinksw.com/schemas/acl/filter#> \n' ||
+ ' select distinct ?rule ?agent ?mode ?filter ?criteria ?operand ?condition ?pattern ?statement \n' ||
' from <%s> \n' ||
' where { \n' ||
' { \n' ||
@@ -4536,36 +4601,64 @@ create procedure ODRIVE.WA.aci_load (
' acl:mode ?mode ; \n' ||
' acl:agentClass ?agent. \n' ||
' } \n' ||
+ ' union \n' ||
+ ' { \n' ||
+ ' ?rule rdf:type acl:Authorization ; \n' ||
+ ' acl:accessTo <%s> ; \n' ||
+ ' acl:mode ?mode ; \n' ||
+ ' flt:hasFilter ?filter . \n' ||
+ ' ?filter flt:hasCriteria ?criteria . \n' ||
+ ' ?criteria flt:operand ?operand ; \n' ||
+ ' flt:condition ?condition ; \n' ||
+ ' flt:value ?pattern . \n' ||
+ ' OPTIONAL { ?criteria flt:statement ?statement . } \n' ||
+ ' } \n' ||
' }\n' ||
- ' order by ?rule\n',
+ ' order by ?rule ?filter ?criteria\n',
+ graph,
graph,
graph,
graph);
commit work;
st := '00000';
- exec (S, st, msg, vector (), 0, meta, data);
- if (st = '00000' and length (data))
+ exec (S, st, msg, vector (), 0, meta, rows);
+ if (st = '00000')
{
- declare N, aclNo, aclRule, aclMode, V any;
+ declare aclNo, aclRule, aclMode, aclCriteria, V, F any;
- V := null;
aclNo := 0;
aclRule := '';
- for (N := 0; N < length (data); N := N + 1)
+ V := null;
+ F := vector ();
+ aclCriteria := '';
+ foreach (any row in rows) do
{
- if (aclRule <> data[N][0])
+ if (aclRule <> row[0])
{
if (not isnull (V))
retValue := vector_concat (retValue, vector (V));
+
aclNo := aclNo + 1;
- aclRule := data[N][0];
- V := vector (aclNo, ODS.ODS_API."ontology.normalize" (data[N][1]), 'person', 0, 0, 0);
+ aclRule := row[0];
+ V := vector (aclNo, ODS.ODS_API."ontology.normalize" (row[1]), 'person', 0, 0, 0);
+ F := vector ();
+ aclCriteria := '';
}
- if (ODS.ODS_API."ontology.normalize" (data[N][1]) = 'foaf:Agent')
+ if (ODS.ODS_API."ontology.normalize" (row[1]) = 'foaf:Agent')
V[2] := 'public';
- if (data[N][1] like SIOC.DBA.get_graph () || '/%/group/%')
+ if (row[1] like SIOC.DBA.get_graph () || '/%/group/%')
V[2] := 'group';
- aclMode := ODS.ODS_API."ontology.normalize" (data[N][2]);
+ if (row[3] like (graph || 'filter_%'))
+ {
+ V[2] := 'advanced';
+ if (aclCriteria <> row[4])
+ {
+ F := vector_concat (F, vector (vector (1, replace (row[5], 'flt:', ''), replace (row[6], 'flt:', ''), row[7], row[8])));
+ aclCriteria := row[4];
+ V[1] := F;
+ }
+ }
+ aclMode := ODS.ODS_API."ontology.normalize" (row[2]);
if (aclMode = 'acl:Read')
V[3] := 1;
if (aclMode = 'acl:Write')
@@ -4576,35 +4669,28 @@ create procedure ODRIVE.WA.aci_load (
if (not isnull (V))
retValue := vector_concat (retValue, vector (V));
}
+ }
return retValue;
}
;
-------------------------------------------------------------------------------
--
-create procedure ODRIVE.WA.aci_params (
- in params any)
+create procedure ODRIVE.WA.aci_save (
+ in path varchar,
+ inout aci any)
{
- declare N, M integer;
- declare aclNo, retValue, V any;
+ declare id, what, retValue, tmp any;
- M := 1;
- retValue := vector ();
- for (N := 0; N < length (params); N := N + 2)
+ what := case when (path[length (path)-1] <> ascii('/')) then 'R' else 'C' end;
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (isarray (id) and (cast (id[0] as varchar) not in ('IMAP', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV')))
{
- if (params[N] like 'f_fld_2_%')
- {
- aclNo := replace (params[N], 'f_fld_2_', '');
- V := vector (M,
- trim (params[N+1]),
- get_keyword ('f_fld_1_' || aclNo, params, 'person'),
- atoi (get_keyword ('f_fld_3_' || aclNo || '_r', params, '0')),
- atoi (get_keyword ('f_fld_3_' || aclNo || '_w', params, '0')),
- atoi (get_keyword ('f_fld_3_' || aclNo || '_x', params, '0'))
- );
- retValue := vector_concat (retValue, vector (V));
- M := M + 1;
- }
+ retValue := ODRIVE.WA.DAV_PROP_SET (path, 'virt:aci_meta', aci);
+ }
+ else
+ {
+ retValue := ODRIVE.WA.DAV_PROP_SET (path, 'virt:aci_meta_n3', ODRIVE.WA.aci_n3 (aci));
}
return retValue;
}
@@ -4615,42 +4701,115 @@ create procedure ODRIVE.WA.aci_params (
create procedure ODRIVE.WA.aci_n3 (
in aciArray any)
{
- declare N integer;
- declare retValue any;
+ declare N, M integer;
+ declare stream any;
if (length (aciArray) = 0)
return null;
- retValue := ' @prefix acl: <http://www.w3.org/ns/auth/acl#> . \n' ||
- ' @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . \n' ||
- ' @prefix foaf: <http://xmlns.com/foaf/0.1/> . \n';
+
+ stream := string_output ();
+ http ('@prefix acl: <http://www.w3.org/ns/auth/acl#> . \n', stream);
+ http ('@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . \n', stream);
+ http ('@prefix foaf: <http://xmlns.com/foaf/0.1/> . \n', stream);
+ http ('@prefix flt: <http://www.openlinksw.com/schemas/acl/filter#> . ', stream);
for (N := 0; N < length (aciArray); N := N + 1)
{
if (length (aciArray[N][1]))
{
- retValue := retValue || sprintf (' <aci_%d> rdf:type acl:Authorization ;\n acl:accessTo <>', aciArray[N][0]);
+ http (sprintf ('\n<aci_%d> rdf:type acl:Authorization ;\n acl:accessTo <>', aciArray[N][0]), stream);
if (aciArray[N][2] = 'person')
{
- retValue := retValue || sprintf (';\n acl:agent <%s>', aciArray[N][1]);
+ http (sprintf ('; \n acl:agent <%s>', aciArray[N][1]), stream);
}
else if (aciArray[N][2] = 'group')
{
- retValue := retValue || sprintf (';\n acl:agentClass <%s>', aciArray[N][1]);
+ http (sprintf ('; \n acl:agentClass <%s>', aciArray[N][1]), stream);
}
else if (aciArray[N][2] = 'public')
{
- retValue := retValue || ';\n acl:agentClass foaf:Agent';
+ http ( '; \n acl:agentClass foaf:Agent', stream);
+ }
+ else if (aciArray[N][2] = 'advanced')
+ {
+ http (sprintf ('; \n flt:hasFilter <filter_%d>', aciArray[N][0]), stream);
}
if (aciArray[N][3])
- retValue := retValue || ';\n acl:mode acl:Read';
+ http ('; \n acl:mode acl:Read', stream);
if (aciArray[N][4])
- retValue := retValue || ';\n acl:mode acl:Write';
+ http ('; \n acl:mode acl:Write', stream);
if (aciArray[N][5])
- retValue := retValue || ';\n acl:mode acl:Execute';
- retValue := retValue || '.\n';
+ http ('; \n acl:mode acl:Execute', stream);
+
+ http ('. ', stream);
+ if (aciArray[N][2] = 'advanced')
+ {
+ http (sprintf ('\n<filter_%d> rdf:type flt:Filter .', aciArray[N][0]), stream);
+ for (M := 0; M < length (aciArray[N][1]); M := M + 1)
+ {
+ http (sprintf ('\n<filter_%d> flt:hasCriteria <criteria_%d_%d> .', aciArray[N][0], aciArray[N][0], aciArray[N][1][M][0]), stream);
+ http (sprintf ('\n<criteria_%d_%d> flt:operand <flt:%s> ;', aciArray[N][0], aciArray[N][1][M][0], aciArray[N][1][M][1]), stream);
+ http (sprintf ('\n flt:condition <flt:%s> ;', aciArray[N][1][M][2]), stream);
+ http ( '\n flt:value ', stream); http_nt_object (aciArray[N][1][M][3], stream);
+ if ((length (aciArray[N][1][M]) > 3) and not DB.DBA.is_empty_or_null (aciArray[N][1][M][4]))
+ {
+ http ( '; \n flt:statement ', stream); http_nt_object (aciArray[N][1][M][4], stream);
+ }
+ http ('. \n', stream);
+ }
}
}
- return retValue;
+ }
+ return string_output_string (stream);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.aci_send_mail (
+ in _instance integer,
+ in _from integer,
+ in _path varchar,
+ in _old_acl any,
+ in _new_acl any)
+{
+ declare aq any;
+
+ _old_acl := ODRIVE.WA.aci_vector (_old_acl);
+ _new_acl := ODRIVE.WA.aci_vector (_new_acl);
+ aq := async_queue (1);
+ aq_request (aq, 'ODRIVE.WA.aci_send_mail_aq', vector (_instance, _from, _path, _old_acl, _new_acl));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.aci_send_mail_aq (
+ in _instance integer,
+ in _from integer,
+ in _path varchar,
+ in _old_acl any,
+ in _new_acl any)
+{
+ -- dbg_obj_princ ('ODRIVE.WA.aci_send_mail_aq (', _path, _old_acl, _new_acl, ')');
+ declare N integer;
+ declare settings, subject, text any;
+
+ settings := ODRIVE.WA.settings (_from);
+ subject := 'Subject: Sharing notification';
+ text := ODRIVE.WA.settings_mailShare (settings);
+ for (N := 0; N < length (_new_acl); N := N + 1)
+ {
+ if (not ODRIVE.WA.vector_contains (_old_acl, _new_acl[N]))
+ ODRIVE.WA.send_mail (_instance, _from, _new_acl[N], subject, text, _path, 0);
+ }
+ subject := 'Subject: Unsharing notification';
+ text := ODRIVE.WA.settings_mailUnshare (settings);
+ for (N := 0; N < length (_old_acl); N := N + 1)
+ {
+ if (not ODRIVE.WA.vector_contains (_new_acl, _old_acl[N]))
+ ODRIVE.WA.send_mail (_instance, _from, _old_acl[N], subject, text, _path, 0);
+ }
}
;
@@ -4686,3 +4845,235 @@ 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';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+-- DB.DBA.RDF_LOAD_HTML_RESPONSE
+--
+create procedure ODRIVE.WA.cartridges_get ()
+{
+ declare selected integer;
+ declare retValue any;
+
+ retValue := vector ();
+ for (select RM_ID, RM_DESCRIPTION, RM_HOOK, ucase (cast (RM_DESCRIPTION as varchar (128))) as RM_SORT from DB.DBA.SYS_RDF_MAPPERS where RM_ENABLED = 1 order by 4) do
+ {
+ selected := 0;
+ if (RM_HOOK in ('DB.DBA.RDF_LOAD_HTML_RESPONSE'))
+ selected := 1;
+ retValue := vector_concat (retValue, vector (vector (RM_ID, RM_DESCRIPTION, selected)));
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+-- DB.DBA.RDF_LOAD_CALAIS,
+-- DB.DBA.RDF_LOAD_ZEMANTA
+-- DB.DBA.RDF_LOAD_ALCHEMY_META
+-- DB.DBA.RDF_LOAD_YAHOO_TERM_META
+-- DB.DBA.RDF_LOAD_DBPEDIA_SPOTLIGHT_META
+--
+create procedure ODRIVE.WA.metaCartridges_get ()
+{
+ declare selected integer;
+ declare items, retValue any;
+
+ retValue := vector ();
+ items := ODRIVE.WA.exec ('select MC_ID, MC_DESC, MC_HOOK, ucase (cast (MC_DESC as varchar (128))) as MC_SORT from DB.DBA.RDF_META_CARTRIDGES where MC_ENABLED = 1 order by 4');
+ foreach (any item in items) do
+ {
+ selected := 0;
+ if (item[2] in ('DB.DBA.RDF_LOAD_CALAIS', 'DB.DBA.RDF_LOAD_ZEMANTA', 'DB.DBA.RDF_LOAD_ALCHEMY_META', 'DB.DBA.RDF_LOAD_YAHOO_CONTENT_ANALYSIS_META', 'DB.DBA.RDF_LOAD_DBPEDIA_SPOTLIGHT_META'))
+ selected := 1;
+ retValue := vector_concat (retValue, vector (vector (item[0], item[1], selected)));
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.graph_private_remove (
+ in path varchar,
+ in what varchar,
+ in graph varchar)
+{
+ -- remove from private graphs
+ if (not DB.DBA.is_empty_or_null (graph))
+ {
+ SIOC..private_graph_remove (graph);
+ DB.DBA.wa_private_graph_remove (graph, 'WebDAV', path, what);
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.graph_private_add (
+ in path varchar,
+ in what varchar,
+ in permissions varchar,
+ in graph varchar)
+{
+ if (not DB.DBA.is_empty_or_null (graph))
+ {
+ if (permissions[6] = ascii('0'))
+ {
+ -- add to private graphs
+ SIOC..private_init ();
+ SIOC..private_graph_add (graph);
+ DB.DBA.wa_private_graph_add (graph, 'WebDAV', path, what);
+ }
+ else
+ {
+ -- remove from private graphs
+ SIOC..private_graph_remove (graph);
+ DB.DBA.wa_private_graph_remove (graph, 'WebDAV', path, what);
+ }
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.graph_update (
+ in path varchar,
+ in det varchar,
+ in oldGraph varchar,
+ in newGraph varchar)
+{
+ declare aq any;
+
+ aq := async_queue (1);
+ aq_request (aq, 'ODRIVE.WA.graph_update_aq', vector (path, det, oldGraph, newGraph));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.graph_update_aq (
+ in path varchar,
+ in det varchar,
+ in oldGraph varchar,
+ in newGraph varchar)
+{
+ declare detcol_id integer;
+
+ detcol_id := DB.DBA.DAV_SEARCH_ID (path, 'C');
+ if ((coalesce (oldGraph, '') <> '') and __proc_exists ('DB.DBA.' || det || '__rdf_delete'))
+ {
+ for (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH like (path || '%')) do
+ {
+ call ('DB.DBA.' || det || '__rdf_delete') (detcol_id, RES_ID, 'R', oldGraph);
+ }
+ }
+
+ if ((coalesce (newGraph, '') <> '') and __proc_exists ('DB.DBA.' || det || '__rdf_insert'))
+ {
+ for (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH like (path || '%')) do
+ {
+ call ('DB.DBA.' || det || '__rdf_insert') (detcol_id, RES_ID, 'R', newGraph);
+ }
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.SPARQL_GS_APP_CALLBACK_ODS (
+ in g_iid IRI_ID,
+ in app_uid varchar := null) returns integer
+{
+ dbg_obj_princ ('DB.DBA.SPARQL_GS_APP_CALLBACK_ODS (', id_to_iri (g_iid), ')');
+
+ return 255;
+}
+;
+
+grant execute on DB.DBA.SPARQL_GS_APP_CALLBACK_ODS to public;
\ No newline at end of file
diff --git a/appsrc/ODS-Briefcase/new/od-a-dc-data.sql b/appsrc/ODS-Briefcase/new/od-a-dc-data.sql
index 88f50ff..55b76db 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.1 2010/09/20 10:14:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-dc.sql b/appsrc/ODS-Briefcase/new/od-a-dc.sql
index 7d389d6..096b080 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.4 2010/09/20 10:14:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-ddk.sql b/appsrc/ODS-Briefcase/new/od-a-ddk.sql
index df5d42a..aca0b05 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.5 2010/11/09 20:12:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-ods.sql b/appsrc/ODS-Briefcase/new/od-a-ods.sql
index a85ed89..b3fa232 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.1 2010/09/20 10:14:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql b/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql
index f6f60a2..e4a364f 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.1 2010/09/20 10:14:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-rdf.sql b/appsrc/ODS-Briefcase/new/od-a-rdf.sql
index 255bfed..9e628da 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.1 2010/09/20 10:14:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-update.sql b/appsrc/ODS-Briefcase/new/od-a-update.sql
index 9668f5f..54570d5 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.2 2010/09/20 10:14:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -79,7 +79,6 @@ create procedure ODRIVE.WA.tmp_upgrade ()
{
if (registry_get ('odrive_items_upgrade') = '1')
return;
- registry_set ('odrive_items_upgrade', '1');
declare I, N, M integer;
declare tmp, oldSearch, newSearch, aXml, aEntity any;
@@ -136,6 +135,119 @@ create procedure ODRIVE.WA.tmp_upgrade ()
ODRIVE.WA.DAV_PROP_SET (COL_FULL_PATH, 'virt:Filter-Params', newSearch, 'dav');
}
+ registry_set ('odrive_items_upgrade', '1');
+}
+;
+
+ODRIVE.WA.tmp_upgrade ();
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.tmp_upgrade ()
+{
+ declare path, graph any;
+
+ if (registry_get ('odrive_acl_update') = '1')
+ return;
+
+ for (select * from WS.WS.SYS_DAV_PROP where PROP_TYPE = 'R' and PROP_NAME = 'virt:aci_meta_n3') do
+ {
+ path := DB.DBA.DAV_SEARCH_PATH (PROP_PARENT_ID, PROP_TYPE);
+ graph := WS.WS.DAV_IRI (path);
+ delete from DB.DBA.RDF_QUAD where G = iri_to_id (graph);
+ graph := rtrim (WS.WS.DAV_IRI (path), '/') || '/';
+ delete from DB.DBA.RDF_QUAD where G = iri_to_id (graph);
+
+ WS.WS.WAC_INSERT (path, PROP_VALUE, null, null, 0);
+ }
+
+ registry_set ('odrive_acl_upgrade', '1');
+}
+;
+
+ODRIVE.WA.tmp_upgrade ();
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.tmp_upgrade (
+ in det varchar)
+{
+ declare path, graph, propName, permissions any;
+
+ if (registry_get ('odrive_graph_update') = '1')
+ return;
+
+ propName := 'virt:' || det || '-graph';
+ for (select * from WS.WS.SYS_DAV_PROP where PROP_TYPE = 'C' and PROP_NAME = propName) do
+ {
+ path := DB.DBA.DAV_SEARCH_PATH (PROP_PARENT_ID, PROP_TYPE);
+ permissions := DB.DBA.DAV_PROP_GET_INT (PROP_PARENT_ID, PROP_TYPE, ':virtpermissions', 0, ODRIVE.WA.account_name (http_dav_uid ()), ODRIVE.WA.account_password (http_dav_uid ()), http_dav_uid ());
+ ODRIVE.WA.graph_private_add (path, 'C', permissions, PROP_VALUE);
+ }
+
+ registry_set ('odrive_graph_update', '1');
+}
+;
+
+ODRIVE.WA.tmp_upgrade ('IMAP');
+ODRIVE.WA.tmp_upgrade ('GDrive');
+ODRIVE.WA.tmp_upgrade ('Dropbox');
+ODRIVE.WA.tmp_upgrade ('SkyDrive');
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.tmp_upgrade ()
+{
+ declare rid, ouid, ogid any;
+
+ if (registry_get ('odrive_nobody_update') = '1')
+ return;
+
+ for (select RES_ID, RES_COL from WS.WS.SYS_DAV_RES where RES_OWNER = -12) do
+ {
+ rid := RES_ID;
+
+ select COL_OWNER, COL_GROUP
+ into ouid, ogid
+ from WS.WS.SYS_DAV_COL
+ where COL_ID = RES_COL;
+
+ update WS.WS.SYS_DAV_RES
+ set RES_OWNER = ouid,
+ RES_GROUP = ogid
+ where RES_ID = rid;
+ }
+ registry_set ('odrive_nobody_update', '1');
+}
+;
+
+ODRIVE.WA.tmp_upgrade ();
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.tmp_upgrade ()
+{
+ declare server, property, propertyValue varchar;
+ declare V any;
+
+ if (registry_get ('odrive_imap_update') = '1')
+ return;
+
+ for (select COL_ID from WS.WS.SYS_DAV_COL where COL_DET = 'IMAP') do
+ {
+ server := DB.DBA.DAV_PROP_GET_INT (COL_ID, 'C', 'virt:IMAP-server', 0);
+ V := sprintf_inverse (server, '%s:%s', 2);
+ property := 'virt:IMAP-server';
+ propertyValue := V[0];
+ if (not isnull (propertyValue))
+ DB.DBA.DAV_PROP_SET_RAW (COL_ID, 'C', property, propertyValue, 1, http_dav_uid ());
+
+ property := 'virt:IMAP-port';
+ propertyValue := V[1];
+ if (not isnull (propertyValue))
+ DB.DBA.DAV_PROP_SET_RAW (COL_ID, 'C', property, propertyValue, 1, http_dav_uid ());
+ }
+ registry_set ('odrive_imap_update', '1');
}
;
diff --git a/appsrc/ODS-Briefcase/new/od-a-wa.sql b/appsrc/ODS-Briefcase/new/od-a-wa.sql
index 72d7099..704fa9c 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.5 2011/05/17 22:59:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/new/od-d.sql b/appsrc/ODS-Briefcase/new/od-d.sql
index 27fded3..9e0e969 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.6 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/new/sioc_briefcase.sql b/appsrc/ODS-Briefcase/new/sioc_briefcase.sql
index c6c57a4..7372c3b 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.13 2011/07/04 10:04:02 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Briefcase/schemas/DOAP.rdf b/appsrc/ODS-Briefcase/schemas/DOAP.rdf
index 4c06515..0ea587a 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.1 2010/09/20 10:14:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/EML.rdf b/appsrc/ODS-Briefcase/schemas/EML.rdf
index 47574cd..1c53b25 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/FOAF.rdf b/appsrc/ODS-Briefcase/schemas/FOAF.rdf
index df88f9f..10e5e29 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/ICS.rdf b/appsrc/ODS-Briefcase/schemas/ICS.rdf
index 2f17927..4eef3d5 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/MODS.rdf b/appsrc/ODS-Briefcase/schemas/MODS.rdf
index a38f2ab..fb7c0e3 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/OPML.rdf b/appsrc/ODS-Briefcase/schemas/OPML.rdf
index e6a4204..8480558 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/Office.rdf b/appsrc/ODS-Briefcase/schemas/Office.rdf
index ccc9fd7..920d381 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/RDF.rdf b/appsrc/ODS-Briefcase/schemas/RDF.rdf
index 3de764d..b8e2468 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/RSS.rdf b/appsrc/ODS-Briefcase/schemas/RSS.rdf
index 18c6bca..38bfede 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/Spotlight.rdf b/appsrc/ODS-Briefcase/schemas/Spotlight.rdf
index c318369..104d4f7 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/VAD.rdf b/appsrc/ODS-Briefcase/schemas/VAD.rdf
index a7579e5..cc2e604 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/VSPX.rdf b/appsrc/ODS-Briefcase/schemas/VSPX.rdf
index d50d849..8858733 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/WSDL.rdf b/appsrc/ODS-Briefcase/schemas/WSDL.rdf
index e3b44f9..4af61c6 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/Wiki.rdf b/appsrc/ODS-Briefcase/schemas/Wiki.rdf
index 2d142f7..e7c0e76 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.1 2010/09/20 10:14:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/XBEL.rdf b/appsrc/ODS-Briefcase/schemas/XBEL.rdf
index cd4c638..73c1327 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/XBRL.rdf b/appsrc/ODS-Briefcase/schemas/XBRL.rdf
index 1b0506c..7ad26b6 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/XDDL.rdf b/appsrc/ODS-Briefcase/schemas/XDDL.rdf
index f276273..aa7189e 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/XHTML.rdf b/appsrc/ODS-Briefcase/schemas/XHTML.rdf
index 85d1ec2..f941bc7 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/annotea.rdf b/appsrc/ODS-Briefcase/schemas/annotea.rdf
index 21a3275..8975720 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/archive.rdf b/appsrc/ODS-Briefcase/schemas/archive.rdf
index 3e4009f..9279448 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/audio.rdf b/appsrc/ODS-Briefcase/schemas/audio.rdf
index bda3c9b..764c69f 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/google-kinds.rdf b/appsrc/ODS-Briefcase/schemas/google-kinds.rdf
index 97c2c48..4b7a4a7 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/image.rdf b/appsrc/ODS-Briefcase/schemas/image.rdf
index 75cb810..e242561 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/opl-lic.rdf b/appsrc/ODS-Briefcase/schemas/opl-lic.rdf
index c7a71b8..6b866aa 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/photo.rdf b/appsrc/ODS-Briefcase/schemas/photo.rdf
index b8e2cf2..920414d 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf b/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf
index 9ccb708..791c86a 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.1 2010/09/20 10:14:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/vad_version b/appsrc/ODS-Briefcase/vad_version
new file mode 100644
index 0000000..ce92333
--- /dev/null
+++ b/appsrc/ODS-Briefcase/vad_version
@@ -0,0 +1 @@
+1.20.74
diff --git a/appsrc/ODS-Briefcase/www/ajax.vsp b/appsrc/ODS-Briefcase/www/ajax.vsp
index 1fd2268..4ec7d22 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.1 2010/09/20 10:14:59 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -71,7 +71,17 @@
}
http_rewrite ();
http_header ('Content-Type: text/plain\r\n');
- http (ODRIVE.WA.obj2json(returnData, 5));
+ 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));
return;
}
if (action = 'about')
diff --git a/appsrc/ODS-Briefcase/www/css/style.css b/appsrc/ODS-Briefcase/www/css/style.css
index a504b69..6dc165d 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.10 2011/05/17 22:59:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -28,11 +28,29 @@ 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;
}
@@ -89,43 +107,6 @@ 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;
@@ -148,6 +129,9 @@ a:hover {
.lc {
background-color: #EFEFEF;
border: 1px solid #7f94a5;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
padding: 5px;
margin-top: 6px;
width: auto;
@@ -405,11 +389,11 @@ table#list th {
/* Fields */
.field-text {
- width: 40em;
+ width: 500px;
}
.field-short {
- width: 20em;
+ width: 250px;
}
.field-max {
@@ -427,6 +411,7 @@ input.button {
border: solid 1px;
border-color: #7f94a5;
background: #99b3c5;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
@@ -613,6 +598,8 @@ div.tab {
border: 1px solid #000;
border-bottom-width: 0px;
border-color: #7f94a5;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
@@ -789,6 +776,7 @@ td.action {
span.button {
background: none repeat scroll 0 0 #99B3C5;
border: 1px solid #7F94A5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #FFFFFF;
diff --git a/appsrc/ODS-Briefcase/www/error.vspx b/appsrc/ODS-Briefcase/www/error.vspx
index 417e7e4..91d3fd1 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.2 2010/09/20 10:15:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -34,7 +34,7 @@
</vm:variables>
<vm:pagebody>
<div class="form-header">
- <img class="dialog_icon" src="image/stop_16.png" alt="Stop" title="Stop"/>
+ <img class="dialog_icon" src="/ods/images/icons/stop_16.png" alt="Stop" title="Stop"/>
An error has occurred when processing "<?V self.page_name ?>" page.
</div>
<div class="error" style="text-align: left;">
diff --git a/appsrc/ODS-Briefcase/www/export.vspx b/appsrc/ODS-Briefcase/www/export.vspx
index 7661975..80c52af 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.4 2010/09/20 10:15:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/www/forms.vspx b/appsrc/ODS-Briefcase/www/forms.vspx
index d3f8974..a758b16 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.16 2011/08/01 14:14:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -57,7 +57,8 @@
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'))));
@@ -71,6 +72,7 @@
}
http (' </tr>');
}
+ }
http (' </table>');
http ('</div>');
http ('<br />');
@@ -182,7 +184,7 @@
acl_value := WS.WS.ACL_PARSE (ODRIVE.WA.acl_params (params));
-- aci properties
- aci_value := ODRIVE.WA.aci_n3 (ODRIVE.WA.aci_params (params));
+ aci_value := ODRIVE.WA.aci_n3 (DB.DBA.wa_aci_params (params));
for (I := 0; I < length (self.items); I := I + 2)
{
@@ -266,8 +268,7 @@
}
-- aci - WebAccess
- item := ODRIVE.WA.DAV_INIT(self.items[I]);
- if ((ODRIVE.WA.DAV_GET (item, 'type') = 'R') and length (aci_value))
+ if (length (aci_value))
{
ODRIVE.WA.DAV_PROP_SET (self.items[I], 'virt:aci_meta_n3', aci_value);
}
@@ -278,10 +279,12 @@
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')
@@ -456,7 +459,7 @@
</td>
</tr>
<tr>
- <th>
+ <th valign="top">
<v:label value="--'Permissions'" />
</th>
<td>
@@ -524,7 +527,7 @@
</td>
</tr>
<tr>
- <th>WebDAV Properties</th>
+ <th valign="top">WebDAV Properties</th>
<td>
<table>
<tr>
@@ -540,7 +543,7 @@
</table>
</td>
<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}, fld_3: {mode: 41}});"><img src="image/add_16.png" class="button" alt="Add Property" title="Add Property" /> Add</span><br /><br />
+ <span class="button pointer" onclick="javascript: TBL.createRow('c', null, {fld_1: {mode: 40, className: '_validate_', onblur: function(){validateField(this);}}, fld_2: {mode: 0}, fld_3: {mode: 41}});"><img src="/ods/images/icons/add_16.png" class="button" alt="Add Property" title="Add Property" /> Add</span><br /><br />
</td>
</tr>
</table>
@@ -555,7 +558,8 @@
<table>
<tr>
<td width="100%">
- <table id="s_tbl" class="form-list" style="width: 100%;" cellspacing="0">
+ <table id="f_tbl" class="form-list" style="width: 100%;" cellspacing="0">
+ <thead>
<tr>
<th nowrap="nowrap">User/Group</th>
<th>Inheritance</th>
@@ -563,11 +567,14 @@
<th width="1%" align="center" nowrap="nowrap">Deny<br />(R)ead, (W)rite, e(X)ecute</th>
<th width="1%">Action</th>
</tr>
- <tr id="s_tr_no"><td colspan="5"><b>No Security Properties</b></td></tr>
+ </thead>
+ <tbody id="f_tbody">
+ <tr id="f_tr_no"><td colspan="5"><b>No Security Properties</b></td></tr>
+ </tbody>
</table>
</td>
<td valign="top" nowrap="nowrap">
- <span class="button pointer" onclick="javascript: TBL.createRow('s', null, {fld_1: {mode: 1, cssText: 'width: 88%;', tdCssText: 'white-space: nowrap;'}, fld_2: {mode: 43, value: 1}, 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" class="button" alt="Add Security" title="Add Security" /> Add</span><br /><br />
+ <span class="button pointer" onclick="javascript: TBL.createRow('f', null, {fld_1: {mode: 1, cssText: 'width: 88%;', tdCssText: 'white-space: nowrap;'}, fld_2: {mode: 43, value: 1}, 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="/ods/images/icons/add_16.png" class="button" alt="Add Security" title="Add Security" /> Add</span><br /><br />
</td>
</tr>
</table>
@@ -578,18 +585,22 @@
<table>
<tr>
<td width="100%">
- <table id="f_tbl" class="form-list" style="width: 100%;" cellspacing="0">
+ <table id="s_tbl" class="form-list" style="width: 100%;" cellspacing="0">
+ <thead>
<tr>
<th width="1%" align="center" nowrap="nowrap">Acces Type</th>
<th nowrap="nowrap">WebID</th>
- <th width="1%" align="center" nowrap="nowrap">ACL: (R)ead, (W)rite</th>
+ <th width="1%" align="center" nowrap="nowrap">Allow<br />(R)ead, (W)rite, e(X)ecute</th>
<th width="1%" >Action</th>
</tr>
- <tr id="f_tr_no"><td colspan="4"><b>No Security Properties</b></td></tr>
+ </thead>
+ <tbody id="s_tbody" >
+ <tr id="s_tr_no"><td colspan="4"><b>No Security Properties</b></td></tr>
+ </tbody>
</table>
</td>
- <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, form: 'F1', tdCssText: 'white-space: nowrap;', className: '_validate_ _uri_'}, fld_3: {mode: 52, value: [1, 0, 0], tdCssText: 'width: 1%; text-align: center;'}});"><img src="image/add_16.png" class="button" alt="Add Security" title="Add Security" /> Add</span><br /><br />
+ <td valign="top" nowrap="nowrap">3
+ <span class="button pointer" onclick="javascript: TBL.createRow('s', null, {fld_1: {mode: 50, onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: 'F1', tdCssText: 'white-space: nowrap;', className: '_validate_ _uri_'}, fld_3: {mode: 52, value: [1, 0, 0], execute: true, tdCssText: 'width: 1%; text-align: center;'}});"><img src="/ods/images/icons/add_16.png" class="button" alt="Add Security" title="Add Security" /> Add</span><br /><br />
</td>
</tr>
</table>
@@ -625,15 +636,20 @@
]]>
</v:before-data-bind>
<div class="new-form-header">
- <?V initcap (self.v_form) ?> resource <?V self.v_path ?>
+ <?V initcap (self.v_form) ?> resource <?V ODRIVE.WA.utf2wide (self.v_path) ?>
</div>
- <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>
+ <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, ODRIVE.WA.utf2wide (cast (ODRIVE.WA.DAV_RES_CONTENT (self.v_path) as varchar))));
+ ?>
<vm:if test="self.mimeType like 'text/html'">
<![CDATA[
<script type="text/javascript" src="/ods/ckeditor/ckeditor.js"></script>
<script type="text/javascript">
- var oEditor = CKEDITOR.replace('f_content', {height: '250px'});
+ var oEditor = CKEDITOR.replace('f_content', {height: '250px', width: '99%'});
</script>
]]>
</vm:if>
diff --git a/appsrc/ODS-Briefcase/www/home.vspx b/appsrc/ODS-Briefcase/www/home.vspx
index 403fc33..ef38508 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.31 2011/08/01 14:14:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -141,6 +141,10 @@
{
return 1;
}
+ if (cmd = 'shared')
+ {
+ return 1;
+ }
if (is_empty_or_null(self.dir_path))
{
return 0;
@@ -174,7 +178,7 @@
if (not ODRIVE.WA.odrive_write_permission(ODRIVE.WA.odrive_real_path(self.dir_path)))
return 0;
}
- if (not ODRIVE.WA.det_action_enable (ODRIVE.WA.odrive_real_path (self.dir_path), cmd))
+ 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))
{
return 0;
}
@@ -335,20 +339,374 @@
tmp := get_keyword (formFieldName, params);
if (not isnull (tmp))
return tmp;
- if (get_keyword ('formRight', params) <> '')
- return tmp;
+ if (get_keyword ('formRight', params, '') <> '')
+ return case when formFieldName = '===' then coalesce (tmp, '') else tmp end;
if ((self.command = 10) and (self.command_mode in (0, 5, 6)))
return defaultValue;
return ODRIVE.WA.DAV_PROP_GET (path, davPropertyName, defaultValue);
]]>
</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') and (detType <> 'Versioning'))
+ {
+ retValue := 1;
+ }
+ else if (action = 'new')
+ {
+ if ((detType = '') or detType in ('HostFS', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'create')
+ {
+ if ((detType = '') or detType in ('HostFS', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'upload')
+ {
+ if ((detType = '') or detType in ('HostFS', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'rename')
+ {
+ if ((detType = '') or detType in ('HostFS'))
+ retValue := 1;
+ }
+ else if (action = 'copy')
+ {
+ if ((detType = '') or detType in ('HostFS'))
+ retValue := 1;
+ }
+ else if (action = 'move')
+ {
+ if ((detType = '') or detType in ('HostFS'))
+ retValue := 1;
+ }
+ if (action = 'delete')
+ {
+ if ((detType = '') or detType in ('HostFS', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'properties')
+ {
+ if (detType = '')
+ 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 = 'new')
+ {
+ if (detClass in ('S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'create')
+ {
+ if (detClass in ('S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'upload')
+ {
+ if (detType in ('', 'CalDAV', 'CardDAV', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'edit')
+ {
+ if (detClass in ('S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'delete')
+ {
+ if (detType in ('', 'CalDAV', 'CardDAV', 'IMAP', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ 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')
+ {
+ retValue := 0;
+ }
+ else if (action = 'permissions')
+ {
+ retValue := 1;
+ }
+ else if (action = 'version')
+ {
+ 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')) and (detType <> 'Versioning'))
+ {
+ retValue := 1;
+ }
+ }
+ else
+ {
+ if (action = 'edit')
+ {
+ if (detClass in ('S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'permissions')
+ {
+ if ((detClass not in ('CalDAV', 'CardDAV')) and detType in ('', 'HostFS', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'tag')
+ {
+ if (detClass in ('CalDAV', 'CardDAV', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ retValue := 1;
+ }
+ else if (action = 'sharing')
+ {
+ if (detClass in ('CalDAV', 'CardDAV', 'IMAP', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV') or detType in (''))
+ retValue := 1;
+ }
+ else if (action = 'sharing_acl')
+ {
+ if (detClass in ('S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV') or detType in (''))
+ retValue := 1;
+ }
+ else if (action = 'sharing_aci')
+ {
+ if (detClass in ('CalDAV', 'CardDAV', 'IMAP', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV') or detType in (''))
+ retValue := 1;
+ }
+ }
+ -- dbg_obj_print (detType, detClass, action, retValue);
+ return retValue;
+ ]]>
+ </v:method>
+
+ <v:method name="detSponger" arglist="in params any, in permissions varchar, in det varchar, in ndx integer">
+ <![CDATA[
+ declare N integer;
+ declare tmp any;
+ declare oldGraph, newGraph varchar;
+ declare cartridges, metaCartridges varchar;
+ declare ca_item, mca_item varchar;
+
+ cartridges := '';
+ metaCartridges := '';
+ tmp := get_keyword (sprintf ('dav_%s_sponger', det), params, 'off');
+ if (tmp = 'on')
+ {
+ ca_item := sprintf ('ca%d_item', ndx);
+ mca_item := sprintf ('mca%d_item', ndx);
+ 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, ',');
+ }
+ oldGraph := ODRIVE.WA.DAV_PROP_GET (self.dav_path, sprintf ('virt:%s-graph', det), '');
+ newGraph := get_keyword (sprintf ('dav_%s_graph', det), params, '');
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, sprintf ('virt:%s-graph', det), newGraph);
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, sprintf ('virt:%s-sponger', det), tmp);
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, sprintf ('virt:%s-cartridges', det), cartridges);
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, sprintf ('virt:%s-metaCartridges', det), metaCartridges);
+ ODRIVE.WA.graph_private_remove (self.dav_path, 'C', oldGraph);
+ ODRIVE.WA.graph_private_add (self.dav_path, 'C', permissions, newGraph);
+ if (oldGraph <> newGraph)
+ ODRIVE.WA.graph_update (self.dav_path, det, oldGraph, newGraph);
+
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, sprintf ('virt:%s-activity', det), get_keyword (sprintf ('dav_%s_activity', det), params, 'off'));
+ ]]>
+ </v:method>
+
+ <v:method name="detSpongerUI" arglist="in det varchar, in ndx integer">
+ <![CDATA[
+ declare S, T varchar;
+ declare N integer;
+ declare cartridges, selectedCartridges any;
+
+ S := self.get_fieldProperty (sprintf ('dav_%s_sponger', det), self.dav_path, sprintf ('virt:%s-sponger', det), 'off');
+ http (sprintf (
+ '<tr>\n' ||
+ ' <th>\n' ||
+ ' <label for="dav_%s_sponger">Sponger (on/off)</label>\n' ||
+ ' </th>\n' ||
+ ' <td>\n' ||
+ ' <input type="checkbox" name="dav_%s_sponger" id="dav_%s_sponger" %s disabled="disabled" onchange="javascript: destinationChange(this, {checked: {show: [''dav%d_cartridge'', ''dav%d_metaCartridge'']}, unchecked: {hide: [''dav%d_cartridge'', ''dav%d_metaCartridge'']}});" value="on" />\n' ||
+ ' </td>\n' ||
+ '</tr>\n',
+ det,
+ det,
+ det,
+ case when S = 'on' then 'checked="checked"' else '' end,
+ ndx,
+ ndx,
+ ndx,
+ ndx
+ ));
+
+ selectedCartridges := self.get_fieldProperty (sprintf ('dav_%s_cartridges', det), self.dav_path, sprintf ('virt:%s-cartridges', det), '');
+ selectedCartridges := split_and_decode (selectedCartridges, 0, '\0\0,');
+ cartridges := ODRIVE.WA.cartridges_get ();
+
+ http (sprintf (
+ '<tr id="dav%d_cartridge" style="display: none;">\n' ||
+ ' <th valign="top">Sponger Extractor Cartridges</th>\n' ||
+ ' <td>\n' ||
+ ' <div style="margin-bottom: 6px; max-height: 200px; overflow: auto;">\n' ||
+ ' <table id="ca%d_tbl" class="ODS_grid" cellspacing="0">\n' ||
+ ' <thead>\n' ||
+ ' <tr>\n' ||
+ ' <th><input type="checkbox" name="ca%d_select" value="Select All" onclick="selectAllCheckboxes (this, ''ca%d_item'', true)" title="Select All" /></th>\n' ||
+ ' <th width="100%%">Cartridge</th>\n' ||
+ ' </tr>\n' ||
+ ' </thead>',
+ ndx,
+ ndx,
+ ndx,
+ ndx
+ ));
+ for (N := 0; N < length (cartridges); N := N + 1)
+ {
+ if (S = 'on')
+ {
+ T := case when ODRIVE.WA.vector_contains (selectedCartridges, cast (cartridges[N][0] as varchar)) then 'checked="checked"' else '' end;
+ } else {
+ T := case when cartridges[N][2] then 'checked="checked"' else '' end;
+ }
+ http (sprintf (
+ ' <tr>\n' ||
+ ' <td class="checkbox"><input type="checkbox" name="ca%d_item" value="%d" disabled="disabled" %s /></td>\n' ||
+ ' <td>%V</td>\n' ||
+ ' </tr>',
+ ndx,
+ cartridges[N][0],
+ T,
+ cartridges[N][1]
+ ));
+ }
+ if (length (cartridges) = 0)
+ http (
+ ' <tr><td colspan="2"><b>No available cartridges</b></td></tr>'
+ );
+
+ http (
+ ' </table>\n' ||
+ ' </div>\n' ||
+ ' </td>\n' ||
+ '</tr>'
+ );
+
+ if (not DB.DBA.wa_check_package ('cartridges'))
+ return;
+
+ selectedCartridges := self.get_fieldProperty (sprintf ('dav_%s_metaCartridges', det), self.dav_path, sprintf ('virt:%s-metaCartridges', det), '');
+ selectedCartridges := split_and_decode (selectedCartridges, 0, '\0\0,');
+ cartridges := ODRIVE.WA.metaCartridges_get ();
+
+ http (sprintf (
+ '<tr id="dav%d_metaCartridge" style="display: none;">\n' ||
+ ' <th valign="top">Sponger Meta Cartridges</th>\n' ||
+ ' <td>\n' ||
+ ' <div style="margin-bottom: 6px; max-height: 200px; overflow: auto;">\n' ||
+ ' <table id="mca%d_tbl" class="ODS_grid" cellspacing="0">\n' ||
+ ' <thead>\n' ||
+ ' <tr>\n' ||
+ ' <th><input type="checkbox" name="mca%d_select" value="Select All" onclick="selectAllCheckboxes (this, ''mca%d_item'', true)" title="Select All" /></th>\n' ||
+ ' <th width="100%%">Meta Cartridge</th>\n' ||
+ ' </tr>\n' ||
+ ' </thead>',
+ ndx,
+ ndx,
+ ndx,
+ ndx
+ ));
+ for (N := 0; N < length (cartridges); N := N + 1)
+ {
+ if (S = 'on')
+ {
+ T := case when ODRIVE.WA.vector_contains (selectedCartridges, cast (cartridges[N][0] as varchar)) then 'checked="checked"' else '' end;
+ } else {
+ T := case when cartridges[N][2] then 'checked="checked"' else '' end;
+ }
+ http (sprintf (
+ ' <tr>\n' ||
+ ' <td class="checkbox"><input type="checkbox" name="mca%d_item" value="%d" disabled="disabled" %s /></td>\n' ||
+ ' <td>%V</td>\n' ||
+ ' </tr>',
+ ndx,
+ cartridges[N][0],
+ T,
+ cartridges[N][1]
+ ));
+ }
+ if (length (cartridges) = 0)
+ http (
+ ' <tr><td colspan="2"><b>No available meta cartridges</b></td></tr>'
+ );
+
+ http (
+ ' </table>\n' ||
+ ' </div>\n' ||
+ ' </td>\n' ||
+ '</tr>'
+ );
+ ]]>
+ </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_aci, dav_acl, dav_filename, dav_file, rdf_content any;
+ declare properties, c_properties, v_properties any;
+ declare dav_acl, dav_aci, old_dav_aci, dav_filename, dav_file, rdf_content any;
declare params, itemList any;
params := self.vc_page.vc_event.ve_params;
@@ -400,15 +758,20 @@
{
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 = 5) and (get_keyword('dav_destination', params, '') = '1'))
+ if ((self.command_mode in (5, 6)) and (get_keyword ('dav_destination', params, '') = '1'))
{
-- RDF Triple Store
+ declare rdf_data, rdf_type, rdf_graph any;
- declare pos integer;
- declare is_ttl, is_xml, rdf_data, rdf_xml, rdf_name, 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
+ {
if (self.dav_source = 0)
{
dav_filename := get_keyword('filename', get_keyword_ucase('attr-dav_file', params));
@@ -418,6 +781,8 @@
}
else
{
+ declare pos integer;
+
pos := position ('dav_file', params);
rdf_data := aref_set_0 (params, pos);
}
@@ -427,48 +792,35 @@
dav_filename := get_keyword('dav_url', params, '');
rdf_data := http_get(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);
- }
- if (not is_ttl)
- {
- {
- declare continue handler for SQLSTATE '*' {
- is_xml := 0;
- };
- is_xml := 1;
- xtree_doc (rdf_data, 0, rdf_graph);
- }
+ rdf_type := http_mime_type (dav_filename);
}
- if (is_xml = 0 and is_ttl = 0)
- {
- 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
+ rdf_graph := trim (get_keyword ('dav_name_rdf', params));
+ retValue := ODRIVE.WA.DAV_RDF_UPLOAD (rdf_data, rdf_type, rdf_graph);
+ if (not retValue)
{
- retValue := DB.DBA.RDF_LOAD_RDFXML (rdf_data, '', rdf_graph);
+ self.vc_error_message := 'You have attempted to upload invalid data to the RDF Data Store.';
+ self.vc_is_valid := 0;
+ return;
}
}
else
{
-- WebDAV
-
+ -- Action test
+ v_properties := vector ();
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!<>');
@@ -479,6 +831,10 @@
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))
@@ -488,8 +844,12 @@
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) and ODRIVE.WA.dav_rdf_has_metadata (self.dav_path))
+ if (self.command_mode = 10)
{
declare param, uri, property, value any;
declare delim integer;
@@ -508,6 +868,15 @@
}
}
}
+
+ _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 || '/';
@@ -518,6 +887,11 @@
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);
@@ -529,8 +903,7 @@
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));
}
-
- if (dav_detType = 'PropFilter')
+ else if (dav_detType = 'PropFilter')
{
declare search_path varchar;
@@ -539,6 +912,26 @@
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_port', params);
+ ODRIVE.WA.test (tmp, vector ('name', 'IMAP Port', 'class', 'integer', 'minLength', 1, 'maxLength', 4));
+ tmp := get_keyword ('dav_IMAP_user', params);
+ ODRIVE.WA.test (tmp, vector('name', 'IMAP User', 'class', 'varchar', 'minLength', 1, 'maxLength', 255));
+ tmp := DB.DBA.IMAP__verify (
+ get_keyword ('dav_IMAP_connection', params),
+ get_keyword ('dav_IMAP_server', params),
+ get_keyword ('dav_IMAP_port', params),
+ get_keyword ('dav_IMAP_user', params),
+ get_keyword ('dav_IMAP_password', params)
+ );
+ if (tmp <> '')
+ signal('TEST', tmp);
+ }
}
if (self.command_mode = 5)
{
@@ -566,6 +959,11 @@
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, ''));
@@ -577,18 +975,28 @@
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))
- 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, ''))))
+ 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)))
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)
{
@@ -603,40 +1011,72 @@
}
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)
- {
- if (not ODRIVE.WA.DAV_ERROR (ODRIVE.WA.DAV_SET (self.dav_path, '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)
- dav_aci := ODRIVE.WA.aci_n3 (ODRIVE.WA.aci_params (params));
- ODRIVE.WA.DAV_PROP_SET (dav_fullPath, 'virt:aci_meta_n3', dav_aci);
+ old_dav_aci := ODRIVE.WA.aci_load (self.dav_path);
+ dav_aci := DB.DBA.wa_aci_params (params);
+ ODRIVE.WA.aci_save (self.dav_path, dav_aci);
+ ODRIVE.WA.aci_send_mail (self.domain_id, self.account_id, self.dav_path, old_dav_aci, dav_aci);
+
+ _nextExec_7:;
}
-- Folder
@@ -652,37 +1092,28 @@
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] <> 'virt:aci_meta_n3')
+ if (item[0] not like ('virt:aci_meta%'))
+ {
+ v_properties := vector_concat (v_properties, vector (item));
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')));
+ }
}
- 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);
- }
-
ODRIVE.WA.DAV_SET (dav_fullPath, 'permissions-inheritance', get_keyword('dav_permissions_inheritance', params, 'N'));
+ if (not self.fieldRights ('edit'))
+ goto _nextExec_8;
+
-- set new properties
if (dav_detType in ('ResFilter', 'CatFilter'))
{
@@ -704,25 +1135,74 @@
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')
{
- 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', get_keyword('dav_rdfSink_rdfSponger', params));
+ 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_graph', 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);
+ }
}
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')
{
- 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));
+ 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-NameFormat', get_keyword('dav_oMail_NameFormat', params));
}
+ else if (dav_detType = 'IMAP')
+ {
+ declare oldGraph, newGraph varchar;
+
+ oldGraph := ODRIVE.WA.DAV_PROP_GET (self.dav_path, 'virt:IMAP-graph', '');
+ newGraph := get_keyword ('dav_IMAP_graph', params, '');
+ 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-port', get_keyword ('dav_IMAP_port', 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));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:IMAP-graph', newGraph);
+ ODRIVE.WA.graph_private_remove (self.dav_path, 'C', oldGraph);
+ ODRIVE.WA.graph_private_add (self.dav_path, 'C', dav_perms, newGraph);
+ }
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/')));
@@ -731,11 +1211,129 @@
}
else if (dav_detType = 'S3')
{
+ foreach (any item in v_properties) do
+ {
+ if (item[0] like ('virt:S3-%'))
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, item[0], item[1]);
+ }
ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:S3-BucketName', get_keyword ('dav_S3_BucketName', params));
ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:S3-AccessKeyID', get_keyword ('dav_S3_AccessKeyID', params));
ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:S3-SecretKey', get_keyword ('dav_S3_SecretKey', params));
+ self.detSponger (params, dav_perms, 'S3', 6);
}
+ else if (dav_detType = 'GDrive')
+ {
+ declare tmp any;
+
+ tmp := trim (get_keyword ('dav_GDrive_JSON', params, ''));
+ if (tmp <> '')
+ {
+ tmp := subseq (ODS..json2obj(tmp), 2);
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:GDrive-Authentication', 'Yes');
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:GDrive-access_timestamp', get_keyword ('access_timestamp', tmp, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:GDrive-access_token', get_keyword ('access_token', tmp, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:GDrive-token_type', get_keyword ('token_type', tmp, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:GDrive-expires_in', cast (get_keyword ('expires_in', tmp, '') as varchar));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:GDrive-refresh_token', get_keyword ('refresh_token', tmp, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:GDrive-display_name', get_keyword ('dav_GDrive_display_name', params, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:GDrive-email', get_keyword ('dav_GDrive_email', params, ''));
+ }
+ else
+ {
+ foreach (any item in v_properties) do
+ {
+ if (item[0] like ('virt:GDrive-%'))
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, item[0], item[1]);
+ }
+ }
+ self.detSponger (params, dav_perms, 'GDrive', 12);
+ }
+ else if (dav_detType = 'Dropbox')
+ {
+ declare tmp any;
+
+ tmp := get_keyword ('dav_Dropbox_authentication', params);
+ if (tmp = 'Yes')
+ {
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:Dropbox-Authentication', tmp);
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:Dropbox-sid', get_keyword ('dav_Dropbox_sid', params, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:Dropbox-display_name', get_keyword ('dav_Dropbox_display_name', params, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:Dropbox-email', get_keyword ('dav_Dropbox_email', params, ''));
+ }
+ else
+ {
+ foreach (any item in v_properties) do
+ {
+ if (item[0] like ('virt:Dropbox-%'))
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, item[0], item[1]);
+ }
+ }
+ self.detSponger (params, dav_perms, 'Dropbox', 13);
+ }
+ else if (dav_detType = 'SkyDrive')
+ {
+ declare tmp any;
+
+ tmp := trim (get_keyword ('dav_SkyDrive_JSON', params, ''));
+ if (tmp <> '')
+ {
+ tmp := subseq (ODS..json2obj(tmp), 2);
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-Authentication', 'Yes');
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-access_timestamp', get_keyword ('access_timestamp', tmp, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-scope', get_keyword ('scope', tmp, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-access_token', pwd_magic_calc ('skydrive', get_keyword ('access_token', tmp, '')));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-token_type', get_keyword ('token_type', tmp, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-expires_in', cast (get_keyword ('expires_in', tmp, '') as varchar));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-refresh_token', pwd_magic_calc ('skydrive', get_keyword ('refresh_token', tmp, '')));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-authentication_token', pwd_magic_calc ('skydrive', get_keyword ('authentication_token', tmp, '')));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:SkyDrive-display_name', get_keyword ('dav_SkyDrive_display_name', params, ''));
+ }
+ else
+ {
+ foreach (any item in v_properties) do
+ {
+ if (item[0] like ('virt:SkyDrive-%'))
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, item[0], item[1]);
+ }
}
+ self.detSponger (params, dav_perms, 'SkyDrive', 14);
+ }
+ else if (dav_detType = 'Box')
+ {
+ declare tmp any;
+
+ tmp := trim (get_keyword ('dav_Box_auth_token', params, ''));
+ if (tmp <> '')
+ {
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:Box-Authentication', 'Yes');
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:Box-auth_token', pwd_magic_calc ('box', tmp));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:Box-display_name', get_keyword ('dav_Box_display_name', params, ''));
+ }
+ else
+ {
+ foreach (any item in v_properties) do
+ {
+ if (item[0] like ('virt:Box-%'))
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, item[0], item[1]);
+ }
+ }
+ self.detSponger (params, dav_perms, 'Box', 15);
+ }
+ else if (dav_detType = 'WebDAV')
+ {
+ foreach (any item in v_properties) do
+ {
+ if (item[0] like ('virt:WebDAV-%'))
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, item[0], item[1]);
+ }
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:WebDAV-path', get_keyword ('dav_WebDAV_path', params, ''));
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:WebDAV-user', get_keyword ('dav_WebDAV_user', params, ''));
+ if (get_keyword ('dav_WebDAV_password', params, '') <> '**********')
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:WebDAV-password', pwd_magic_calc ('webdav', get_keyword ('dav_WebDAV_password', params, '')));
+ self.detSponger (params, dav_perms, 'WebDAV', 16);
+ }
+ }
+ _nextExec_8:;
}
-- File
@@ -753,6 +1351,9 @@
}
rdf_content := dav_file;
+ if (self.dav_detClass = 'S3')
+ connection_set ('amz-server-side-encryption', get_keyword ('dav_S3_encryption', params, 'None'));
+
retValue := ODRIVE.WA.DAV_RES_UPLOAD(dav_fullPath, dav_file, dav_mime, dav_perms, dav_owner, dav_group);
if (ODRIVE.WA.DAV_ERROR(retValue))
signal('TEST', concat(ODRIVE.WA.DAV_PERROR(retValue), '<>'));
@@ -761,7 +1362,7 @@
}
else
{
- if (ODRIVE.WA.dav_rdf_has_metadata(self.dav_path))
+ if (self.fieldRights ('metadata'))
{
declare param, property any;
declare delim integer;
@@ -780,12 +1381,16 @@
}
}
-- 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 (get_keyword ('dav_propEnable', params, '0') <> '0')
+ if (self.fieldRights ('properties'))
{
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)
@@ -846,18 +1451,20 @@
<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" />
<v:variable name="dav_metadata" persist="0" type="varchar" default="null" />
+ <v:variable name="dav_S3_encryption" type="varchar" default="'None'" />
<v:variable name="chars" type="integer" default="60" />
</vm:variables>
<vm:header>
@@ -930,7 +1537,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: document.forms[0].submit();"', 'ref_32.png', '', 0);
+ self.toolbarShow ('refresh', 'Refresh', 'onclick="javascript: vspxPost(\'action\', \'_cmd\', \'refresh\');"', '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" />');
@@ -972,12 +1579,18 @@
<v:button name="action" action="simple" style="url" value="Submit">
<v:on-post>
<![CDATA[
- declare _action, _path, _item, params any;
+ declare _action, _path, _item, _det, params any;
params := e.ve_params;
_action := get_keyword ('_cmd', params, '');
- if (_action = 'home')
+ if (_action = 'refresh')
+ {
+ _det := cast (ODRIVE.WA.DAV_PROP_GET (ODRIVE.WA.odrive_real_path (self.dir_path), ':virtdet') as varchar);
+ if (__proc_exists (sprintf ('DB.DBA.%s__refresh', _det)) is not null)
+ call ('DB.DBA.' || _det || '__refresh') (ODRIVE.WA.odrive_real_path (self.dir_path));
+ }
+ else if (_action = 'home')
{
_home:
self.dir_path := ODRIVE.WA.dav_home2 (self.owner_id, self.account_role);
@@ -1050,6 +1663,7 @@
else if (_action = 'upload')
{
self.command_push (10, 5);
+ self.dav_destination := 0;
self.dav_source := 0;
}
else if (_action = 'create')
@@ -1065,6 +1679,9 @@
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 ())
@@ -1074,8 +1691,6 @@
goto _shared;
}
- if (_path <> '')
- {
if (ODRIVE.WA.odrive_permission (_path) = '')
{
self.vc_error_message := 'You have not rights to read this folder/file!';
@@ -1083,25 +1698,21 @@
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;
@@ -1350,20 +1961,16 @@
<v:template name="tform_4" type="simple" enabled="-- equ(self.command, 10)">
<v:before-data-bind>
<![CDATA[
+ declare parent_path varchar;
+ 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);
+ parent_path := ODRIVE.WA.odrive_real_path_int (self.dir_path, 1, 'C');
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))
{
@@ -1371,11 +1978,9 @@
self.vc_data_bind (e);
return;
}
- 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')) , '');
+ self.dav_type := ODRIVE.WA.DAV_GET (self.dav_item, 'type');
+ self.dav_detClass := ODRIVE.WA.det_class (self.dav_path, self.dav_type);
+ self.dav_detType := coalesce (get_keyword ('dav_det', params, ODRIVE.WA.DAV_GET (self.dav_item, 'detType')), '');
}
else if (self.command_mode in (5, 6))
{
@@ -1384,25 +1989,46 @@
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_category := coalesce (ODRIVE.WA.det_category (ODRIVE.WA.odrive_real_path_int (self.dir_path, 1, 'C'), 'C') , '');
+ self.dav_type := 'R';
+ self.dav_detClass := ODRIVE.WA.det_class (parent_path, 'C');
+ if (self.dav_detClass = '')
+ self.dav_detClass := ODRIVE.WA.det_type (parent_path, 'C');
+
+ self.dav_detType := coalesce (get_keyword ('dav_det', params, ODRIVE.WA.DAV_GET (self.dav_item, 'detType')), '');
}
else
{
self.dav_item := ODRIVE.WA.DAV_INIT_COLLECTION (self.dir_path);
if (self.command_mode = 1)
- 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') , '');
+ params := vector_concat (params, vector ('dav_det', 'ResFilter', 'attr_dav_det', ''));
+
+ self.dav_type := 'C';
+ self.dav_detClass := ODRIVE.WA.det_class (parent_path, 'C');
+ if (self.dav_detClass = '')
+ self.dav_detClass := ODRIVE.WA.det_type (parent_path, 'C');
+
+ self.dav_detType := cast (coalesce (get_keyword ('dav_det', params, ODRIVE.WA.DAV_GET (self.dav_item, 'detType')), '') as varchar);
}
- 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)))
+ 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_acl := ODRIVE.WA.DAV_GET (self.dav_item, 'acl');
+ 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', self.vc_page.vc_event.ve_params)))
+ if (isnull (get_keyword ('dav_group', params)))
{
self.dav_tags_private := '';
self.dav_tags_public := '';
@@ -1417,9 +2043,10 @@
self.search_dc := ODRIVE.WA.DAV_PROP_GET (self.dav_path, 'virt:Filter-Params');
}
}
- if (not isnull(get_keyword ('dav_group', self.vc_page.vc_event.ve_params)))
+ if (not isnull (get_keyword ('dav_group', params)))
self.dc_prepare();
+ self.dav_S3_encryption := 'None';
self.rdf_iri := SIOC..briefcase_resource_iri (self.dav_path);
]]>
</v:before-data-bind>
@@ -1440,87 +2067,85 @@
</div>
<div id="c1">
<div class="tabs">
- <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" />
+ <vm:tabCaption tab="1" tabs="17" caption="Main" />
+ <v:template name="tform_5" type="simple" enabled="-- case when (equ (self.command_mode, 10) and self.fieldRights ('sharing')) then 1 else 0 end">
+ <vm:tabCaption tab="2" tabs="17" caption="Sharing" />
</v:template>
- <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 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="17" 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 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 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="17" caption="Versions" />
</v:template>
<v:template name="tform_8" type="simple" enabled="-- equ(self.dav_type, 'C')">
- <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" />
+ <vm:tabCaption tab="4" tabs="17" caption="WebMail" />
+ <vm:tabCaption tab="5" tabs="176" caption="Filter" />
+ <vm:tabCaption tab="6" tabs="176" caption="S3 Properties" />
+ <vm:tabCaption tab="7" tabs="176" caption="Criteria" />
+ <vm:tabCaption tab="8" tabs="17" 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="17" caption="SyncML" />
+ </v:template>
+ <vm:tabCaption tab="11" tabs="17" caption="IMAP Account" />
+ <v:template name="tform_171" type="simple" enabled="-- case when (self.dav_detClass = '') then 1 else 0 end">
+ <vm:tabCaption tab="12" tabs="17" caption="Google Drive" />
+ <vm:tabCaption tab="13" tabs="17" caption="Dropbox" />
+ <vm:tabCaption tab="14" tabs="17" caption="SkyDrive" />
+ <vm:tabCaption tab="15" tabs="17" caption="Box Net" />
+ <vm:tabCaption tab="16" tabs="17" caption="WebDAV" />
+ </v:template>
</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="-- equ(self.command_mode, 5)">
+ <v:template name="tform_9" type="simple" enabled="-- case when (self.command_mode in (5, 6)) and (self.dav_detClass = '') then 1 else 0 end">
<tr>
- <th width="30%">
- <vm:label for="dav_file" value="--'Destination'" />
+ <th width="30%" valign="top">
+ <vm:label value="--'Destination'" />
</th>
- <td style="padding-left: 4px">
- <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>
+ <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>
+ ]]>
</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_file" value="--'Source'" />
+ <v:label value="--'Source'" />
</th>
<td>
- <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" />
+ <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>
</td>
</tr>
<tr>
+ <th valign="top">
+ <label id="dav_file_label">File</label>
+ </th>
<td>
- <?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>
+ <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;"/>
</td>
</tr>
</v:template>
- <tr>
+ <tr id="davRow_name">
<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="dav_name" value="--'RDF graph name'" /></span>
+ <span id="label_dav_rdf" style="display: none;"><v:label for="label_dav_rdf" value="--'RDF graph name'" /></span>
</th>
<td>
- <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="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_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>
@@ -1537,6 +2162,17 @@
</td>
</tr>
</v:template>
+ <v:template name="tform_10a" type="simple" enabled="-- case when (self.command_mode <> 10) and (self.dav_type = 'R') and (self.dav_detClass = 'S3') then 1 else 0 end">
+ <tr id="davRow_mime">
+ <th>
+ <v:label for="dav_mime" value="--'S3 Server Side Encryption'" />
+ </th>
+ <td>
+ <label><?vsp http (sprintf ('<input type="radio" name="dav_S3_encryption" id="dav_S3_encryption_0" value="None" %s />', case when self.dav_S3_encryption = 'None' then 'checked="checked"' else '' end)); ?> <b>None</b></label>
+ <label><?vsp http (sprintf ('<input type="radio" name="dav_S3_encryption" id="dav_S3_encryption_1" value="AES256" %s />', case when self.dav_S3_encryption <> 'None' then 'checked="checked"' else '' end)); ?> <b>AES-256</b></label>
+ </td>
+ </tr>
+ </v:template>
<v:template name="tform_90" type="simple" enabled="-- equ(self.command_mode, 6)">
<tr>
<th valign="top">
@@ -1558,10 +2194,10 @@
</td>
</tr>
</v:template>
- <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">
+ <v:template name="tform_12" type="simple" enabled="-- case when (((self.dav_type = 'C') and (self.dav_detType in ('', 'UnderVersioning'))) or (self.command_mode <> 10)) and (self.dav_detClass = '') then 1 else 0 end">
<vm:autoVersion />
</v:template>
- <v:template name="tform_13" type="simple" enabled="-- equ(self.dav_type, 'C')">
+ <v:template name="tform_13" type="simple" enabled="-- case when (self.dav_type = 'C') then 1 else 0 end">
<tr>
<th>
<v:label for="dav_det" value="--'Folder type'" />
@@ -1573,23 +2209,78 @@
{
http (self.option_prepare('ResFilter', 'Smart Folder', 'ResFilter'));
}
- else if ((self.command_mode = 10) and (self.dav_detType = 'Versioning'))
+ else if (self.dav_detClass <> '')
{
- http (self.option_prepare('Versioning', 'Version Control Folder', self.dav_detType));
+ http (self.option_prepare('', 'Normal', ''));
+ }
+ else
+ {
+ declare N, M, V any;
+
+ V := vector (
+ 0, '', 'Normal',
+ 1, 'ResFilter', 'Smart Folder',
+ 1, 'CatFilter', 'Category Folder',
+ 1, 'PropFilter', 'Property Filter',
+ 1, 'HostFs', 'Host FS',
+ 0, 'rdfSink', 'Linked Data Import',
+ 1, 'RDFData', 'RDF Data',
+ 1, 'DynaRes', 'Dynamic Resources',
+ 2, 'SyncML', 'SyncML',
+ 1, 'Versioning', 'Version Control',
+ 1, 'S3', 'Amazon S3',
+ 1, 'GDrive', 'Google Drive',
+ 1, 'Dropbox', 'Dropbox',
+ 1, 'SkyDrive', 'SkyDrive',
+ 1, 'Box', 'Box Net',
+ 1, 'WebDAV', 'WebDAV',
+ 1, 'CardDAV', 'CardDAV',
+ 1, 'Blog', 'Blog',
+ 1, 'Bookmark', 'Bookmark',
+ 1, 'calendar', 'Calendar',
+ 1, 'CalDAV', 'CalDAV',
+ 1, 'News3', 'Feed Subscriptions',
+ 1, 'oMail', 'WebMail',
+ 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 ((V[N+1] = 'GDrive') and not exists (select 1 from OAUTH..APP_REG where a_name = 'Google API' and a_owner = 0))
+ goto _0;
+
+ if ((V[N+1] = 'Dropbox') and not exists (select 1 from OAUTH..APP_REG where a_name = 'Dropbox API' and a_owner = 0))
+ goto _0;
+
+ if ((V[N+1] = 'SkyDrive') and not exists (select 1 from OAUTH..APP_REG where a_name = 'SkyDrive API' and a_owner = 0))
+ goto _0;
+
+ if ((V[N+1] = 'Box') and not exists (select 1 from OAUTH..APP_REG where a_name = 'Box Net API' and a_owner = 0))
+ 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));
+ }
}
else
{
- 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));
+ 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));
}
?>
</select>
@@ -1626,11 +2317,11 @@
</td>
</tr>
<tr id="davRow_perms">
- <th>
+ <th valign="top">
<v:label for="dav_group" value="--'Permissions'" />
</th>
<td>
- <table class="permissions-list" cellspacing="0">
+ <table class="permissions-list" cellspacing="0" style="width: 250px;">
<vm:permissions-header1 />
<vm:permissions-header2 />
<tr>
@@ -1656,7 +2347,7 @@
</table>
</td>
</tr>
- <v:template name="tform_120" type="simple" enabled="-- case when (self.dav_category = '') then 1 else 0 end">
+ <v:template name="tform_120" type="simple" enabled="-- case when not length (self.dav_detClass) then 1 else 0 end">
<tr id="davRow_text">
<th>
<vm:label for="dav_index" value="--'Full Text Search'" />
@@ -1696,45 +2387,7 @@
</td>
</tr>
</v:template>
- <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">
+ <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">
<tr>
<th> </th>
<td>
@@ -1767,7 +2420,7 @@
</td>
</tr>
</v:template>
- <v:template name="tform_19" type="simple" enabled="-- gte(self.command_mode, 10)">
+ <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">
<tr>
<th valign="top">WebDAV Properties</th>
<td>
@@ -1779,16 +2432,16 @@
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.dav_propEnable">
- <th> </th>
+ <vm:if test="self.fieldRights ('properties')">
+ <th>Action</th>
</vm:if>
</tr>
+ <tbody id="c_tbody">
<![CDATA[
<script type="text/javascript">
<?vsp
@@ -1798,22 +2451,23 @@
for (N := 0; N < length (properties); N := N + 1)
{
M := M + 1;
- if (self.dav_propEnable)
+ if (self.fieldRights ('properties'))
{
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 {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("c", {fld_1: {value: "%s"}, fld_2: {value: "%s"}});});', properties[N][0], properties[N][1]));
+ http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("c", {fld_1: {value: "%s", tdCssText: "white-space: nowrap;"}, fld_2: {value: "%s", tdCssText: "white-space: nowrap;"}});});', properties[N][0], properties[N][1]));
}
}
?>
</script>
]]>
- <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>
+ <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>
+ </tbody>
</table>
</td>
- <vm:if test="self.dav_propEnable">
+ <vm:if test="self.fieldRights ('properties')">
<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 />
+ <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="/ods/images/icons/add_16.png" border="0" class="button" alt="Add Property" title="Add Property" /> Add</span><br /><br />
</td>
</vm:if>
</tr>
@@ -1826,12 +2480,13 @@
<v:template name="tform_20" type="simple" enabled="-- gte(self.command_mode, 10)">
<div id="2" class="tabContent">
+ <vm:if test='self.fieldRights ('sharing_acl')'>
<fieldset>
<legend><b>ODS users/groups</b></legend>
- <table>
+ <table width="100%">
<tr>
<td width="100%">
- <table id="s_tbl" class="form-list" style="width: 100%;" cellspacing="0">
+ <table id="f_tbl" class="ODS_formList" style="width: 100%;" cellspacing="0">
<tr>
<th nowrap="nowrap">User/Group (WebID)</th>
<th width="1%">Inheritance</th>
@@ -1839,6 +2494,8 @@
<th width="1%" align="center" nowrap="nowrap">Deny<br />(R)ead, (W)rite, e(X)ecute</th>
<th width="1%">Action</th>
</tr>
+ <tbody id="f_tbody">
+ <tr id="f_tr_no"><td colspan="5"><b>No Security</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
@@ -1854,74 +2511,66 @@
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, 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("f", 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)));
} else {
- 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)));
+ http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("f", {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)));
}
}
?>
</script>
]]>
- <tr id="s_tr_no" style="display: <?V case when M=0 then '' else 'none' end ?>;"><td colspan="<?V case when self.dav_enable then 4 else 5 end ?>"><b>No Security</b></td></tr>
+ </tbody>
</table>
</td>
<td valign="top" nowrap="nowrap">
- <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 test="self.dav_enable and self.fieldRights ('sharing_acl')">
+ <span class="button pointer" onclick="javascript: TBL.createRow('f', 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="/ods/images/icons/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 test='not isnull (ODS.ODS_API."server.getInfo"('sslPort'))'>
+ </vm:if>
+ <vm:if test='not isnull (ODS.ODS_API."server.getInfo"('sslPort')) and self.fieldRights ('sharing_aci')'>
<fieldset>
<legend><b>WebID users</b></legend>
- <table>
+ <table width="100%">
<tr>
<td width="100%">
- <table id="f_tbl" class="form-list" style="width: 100%;" cellspacing="0">
+ <table id="s_tbl" class="ODS_formList" style="width: 100%;" cellspacing="0">
+ <thead>
<tr>
<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>
+ </thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no"><td colspan="4"><b>No WebID Security</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
- declare N, L integer;
+ declare L integer;
declare aci_values, aci_parents any;
aci_parents := ODRIVE.WA.aci_parents (self.dav_path);
for (L := 0; L < length (aci_parents); L := L + 1)
{
aci_values := ODRIVE.WA.aci_load (aci_parents[L]);
- for (N := 0; N < length (aci_values); N := N + 1)
- {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("f", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], execute: true, tdCssText: "width: 1%%; text-align: center;"}, fld_4: {value: "Inherited"}});});', aci_values[N][2], aci_values[N][1], aci_values[N][3], aci_values[N][4], aci_values[N][5]));
- }
+ DB.DBA.wa_aci_lines (aci_values);
}
aci_values := ODRIVE.WA.aci_load (self.dav_path);
- for (N := 0; N < length (aci_values); N := N + 1)
- {
- 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 {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("f", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%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], aci_values[N][3], aci_values[N][4], aci_values[N][5]));
- }
- }
+ DB.DBA.wa_aci_lines (aci_values, case when ((self.dav_enable or (self.dav_detClass in ('CalDAV', 'CardDAV', 'IMAP'))) and self.fieldRights ('sharing_aci')) then '' else 'view' end, 'true');
?>
</script>
]]>
- <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>
+ </tbody>
</table>
</td>
- <vm:if test="self.dav_enable">
+ <vm:if test="(self.dav_enable or (self.dav_detClass in ('CalDAV', 'CardDAV', 'IMAP'))) and self.fieldRights ('sharing_aci')">
<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 />
+ <span class="button pointer" onclick="javascript: TBL.createRow('s', null, {fld_1: {mode: 50, onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, tdCssText: 'white-space: nowrap;', className: '_validate2_ _webid2_'}, fld_3: {mode: 52, value: [1, 0, 0], execute: true, execute: true, tdCssText: 'width: 1%; text-align: center;'}});"><img src="/ods/images/icons/add_16.png" border="0" class="button" alt="Add Security" title="Add Security" /> Add</span><br /><br />
</td>
</vm:if>
</tr>
@@ -1931,7 +2580,7 @@
</div>
</v:template>
- <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">
+ <v:template name="tform_21" type="simple" enabled="-- case when (gte(self.command_mode, 10) and self.fieldRights ('metadata')) then 1 else 0 end">
<div id="3" class="tabContent" style="display: none;">
<table id="schema" class="ODS_grid">
<thead>
@@ -2016,6 +2665,13 @@
<vm:search-dc-template6 />
<vm:search-dc-template7 />
<vm:search-dc-template8 />
+ <vm:search-dc-template11 />
+ <vm:search-dc-template12 />
+ <vm:search-dc-template13 />
+ <vm:search-dc-template14 />
+ <vm:search-dc-template15 />
+ <vm:search-dc-template16 />
+ <vm:search-dc-template17 />
</v:template>
<v:template type="simple" enabled="-- equ(self.dav_type, 'R')">
<vm:search-dc-template9 />
@@ -2024,7 +2680,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="--self.dav_enable" 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="--case when (self.dav_enable or self.fieldRights ('sharing')) then 1 else 0 end" xhtml_onclick="return validateInputs(this);"/>
<v:button action="simple" name="cCancel" value="Cancel" >
<v:on-post>
<![CDATA[
@@ -2039,7 +2695,7 @@
if (document.F1.elements['dav_det'])
updateLabel(document.F1.dav_det.options[document.F1.dav_det.selectedIndex].value);
initDisabled();
- initTab(10, 1);
+ initTab(11, 1);
]]>
</script>
</v:template>
@@ -2049,7 +2705,7 @@
<div class="boxHeader">
<b><v:label for="path" value="' Path '" /></b>
<v:text name="path" value="--ODRIVE.WA.utf2wide(ODRIVE.WA.path_show (self.dir_path))" xhtml_onkeypress="return submitEnter(event, \'F1\', \'action\', \'go\')" xhtml_id="path" xhtml_size="60" />
- <img class="pointer" border="0" alt="Browse Path" title="Browse Path" src="image/go_16.png" onclick="javascript: vspxPost('action', '_cmd', 'go');" />
+ <img class="pointer" border="0" alt="Browse Path" title="Browse Path" src="/ods/images/icons/go_16.png" onclick="javascript: vspxPost('action', '_cmd', 'go');" />
<b><v:label for="list_type" value="' View '" /></b>
<v:select-list name="list_type" value="--self.dir_details" xhtml_onchange="javascript: doPost(\'F1\', \'reload\'); return false">
<v:item name="Details" value="0" />
@@ -2058,8 +2714,8 @@
<v:template type="simple" enabled="-- case when ((self.command in (0)) and (self.command_mode in (0,1))) then 1 else 0 end">
<b><v:label for="filter" value="--' Filter Pattern '" /></b>
<v:text name="filter" xhtml_id="filter" value="--self.search_filter" type="simple" />
- <img class="pointer" border="0" alt="Filter" title="Filter" src="image/filter_16.png" onclick="javascript: vspxPost('action', '_cmd', 'filter');" />
- <img class="pointer" border="0" alt="Cancel Filter" title="Cancel Filter" src="image/cancl_16.png" onclick="javascript: vspxPost('action', '_cmd', 'cancelFilter');" />
+ <img class="pointer" border="0" alt="Filter" title="Filter" src="/ods/images/icons/filter_16.png" onclick="javascript: vspxPost('action', '_cmd', 'filter');" />
+ <img class="pointer" border="0" alt="Cancel Filter" title="Cancel Filter" src="/ods/images/icons/close_16.png" onclick="javascript: vspxPost('action', '_cmd', 'cancelFilter');" />
</v:template>
</div>
</v:template>
@@ -2189,12 +2845,12 @@
http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=rss%s"><img src="image/rss-icon-16.gif" border="0" title="RSS 2.0" alt="RSS 2.0" /> RSS</a> ', self.sid, self.realm, self.do_url()));
if (ODRIVE.WA.settings_atomVersion (self.settings) = '1.0')
{
- http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=atom10%s"><img src="image/blue-icon-16.gif" border="0" title="Atom 1.0" alt="Atom 1.0" /> Atom</a> ', self.sid, self.realm, self.do_url()));
+ http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=atom10%s"><img src="/ods/images/blue-icon-16.gif" border="0" title="Atom 1.0" alt="Atom 1.0" /> Atom</a> ', self.sid, self.realm, self.do_url()));
} else {
- http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=atom03%s"><img src="image/blue-icon-16.gif" border="0" title="Atom 0.3" alt="Atom 0.3" /> Atom</a> ', self.sid, self.realm, self.do_url()));
+ http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=atom03%s"><img src="/ods/images/blue-icon-16.gif" border="0" title="Atom 0.3" alt="Atom 0.3" /> Atom</a> ', self.sid, self.realm, self.do_url()));
}
- http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=rdf%s"><img src="image/rdf-icon-16.gif" border="0" title="RDF 1.0" alt="RDF 1.0" /> RDF</a> ', self.sid, self.realm, self.do_url()));
- http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=xbel%s"><img src="image/blue-icon-16.gif" border="0" title="XBEL" alt="XBEL" /> XBEL</a> ', self.sid, self.realm, self.do_url()));
+ http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=rdf%s"><img src="/ods/images/rdf-icon-16.gif" border="0" title="RDF 1.0" alt="RDF 1.0" /> RDF</a> ', self.sid, self.realm, self.do_url()));
+ http (sprintf ('<a href="export.vspx?sid=%s&realm=%s&output=xbel%s"><img src="/ods/images/blue-icon-16.gif" border="0" title="XBEL" alt="XBEL" /> XBEL</a> ', self.sid, self.realm, self.do_url()));
?>
</div>
</v:template>
@@ -2379,12 +3035,21 @@
</v:template>
<td class="action">
<?vsp
+ declare id any;
+
+ id := DB.DBA.DAV_SEARCH_ID (rowset[8], rowset[1]);
if (ODRIVE.WA.odrive_read_permission (rowset[8]))
- {
http (sprintf( ' <img class="pointer" border="0" alt="Update Properties" title="Update Properties"" src="image/dav/item_prop.png" onclick="javascript: vspxPost(\'action\', \'_cmd\', \'update\', \'_path\', \'%s\');" />', replace (rowset[8], '\'', '\\\'')));
- }
- if ((__tag (DB.DBA.DAV_SEARCH_ID (rowset[8], rowset[1])) <> 193)
- and (rowset[0] like '%.vsp'
+
+ if (
+ (
+ (__tag (id) <> 193)
+ or
+ (cast (id[0] as varchar) in ('S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ )
+ and
+ (
+ rowset[0] like '%.vsp'
or rowset[0] like '%.vspx'
or rowset[0] like '%.rdf'
or rowset[0] like '%.xml'
@@ -2395,7 +3060,8 @@
or rowset[0] like '%.htm'
or rowset[0] like '%.sql'
or rowset[0] like '%.ini'
- or rowset[4] like 'text/%')
+ or rowset[4] like 'text/%'
+ )
)
{
declare S varchar;
diff --git a/appsrc/ODS-Briefcase/www/image/PoweredByVirtuoso.gif b/appsrc/ODS-Briefcase/www/image/PoweredByVirtuoso.gif
deleted file mode 100644
index b196db7..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/PoweredByVirtuoso.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/add_16.png b/appsrc/ODS-Briefcase/www/image/add_16.png
deleted file mode 100644
index e948508..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/add_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/atom03.gif b/appsrc/ODS-Briefcase/www/image/atom03.gif
deleted file mode 100644
index b110bdc..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/atom03.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/atom10.gif b/appsrc/ODS-Briefcase/www/image/atom10.gif
deleted file mode 100644
index 3c6367a..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/atom10.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/blue-icon-16.gif b/appsrc/ODS-Briefcase/www/image/blue-icon-16.gif
deleted file mode 100644
index 5745ffa..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/blue-icon-16.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/close_16.png b/appsrc/ODS-Briefcase/www/image/close_16.png
deleted file mode 100644
index 4d84554..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/close_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/dav/blue-icon-16.gif b/appsrc/ODS-Briefcase/www/image/dav/blue-icon-16.gif
deleted file mode 100644
index 5745ffa..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/dav/blue-icon-16.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/dav/rdf-icon-16.gif b/appsrc/ODS-Briefcase/www/image/dav/rdf-icon-16.gif
deleted file mode 100644
index 5d60c9a..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/dav/rdf-icon-16.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/dav/rss-icon-16.gif b/appsrc/ODS-Briefcase/www/image/dav/rss-icon-16.gif
deleted file mode 100644
index b0e4adf..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/dav/rss-icon-16.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/dav/up_16.png b/appsrc/ODS-Briefcase/www/image/dav/up_16.png
deleted file mode 100644
index adb6cf6..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/dav/up_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/del_16.png b/appsrc/ODS-Briefcase/www/image/del_16.png
deleted file mode 100644
index 6670bf3..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/del_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/edit_16.png b/appsrc/ODS-Briefcase/www/image/edit_16.png
deleted file mode 100644
index f8aaba2..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/edit_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/filter_16.png b/appsrc/ODS-Briefcase/www/image/filter_16.png
deleted file mode 100644
index 83890a8..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/filter_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/first_16.png b/appsrc/ODS-Briefcase/www/image/first_16.png
deleted file mode 100644
index 74b9ca0..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/first_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/go_16.png b/appsrc/ODS-Briefcase/www/image/go_16.png
deleted file mode 100644
index c4e49ba..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/go_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/last_16.png b/appsrc/ODS-Briefcase/www/image/last_16.png
deleted file mode 100644
index d657ec4..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/last_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/mail_32.png b/appsrc/ODS-Briefcase/www/image/mail_32.png
deleted file mode 100644
index 825459f..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/mail_32.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/next_16.png b/appsrc/ODS-Briefcase/www/image/next_16.png
deleted file mode 100644
index c9ae06d..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/next_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/ods_main_footer.png b/appsrc/ODS-Briefcase/www/image/ods_main_footer.png
deleted file mode 100644
index f44da81..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/ods_main_footer.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/previous_16.png b/appsrc/ODS-Briefcase/www/image/previous_16.png
deleted file mode 100644
index 81ecf9e..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/previous_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/rdf-icon-16.gif b/appsrc/ODS-Briefcase/www/image/rdf-icon-16.gif
deleted file mode 100644
index 1f5becd..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/rdf-icon-16.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/rdf.gif b/appsrc/ODS-Briefcase/www/image/rdf.gif
deleted file mode 100644
index 9baece1..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/rdf.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/rss20.gif b/appsrc/ODS-Briefcase/www/image/rss20.gif
deleted file mode 100644
index a33d097..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/rss20.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/sel_nav2_grad2.gif b/appsrc/ODS-Briefcase/www/image/sel_nav2_grad2.gif
deleted file mode 100644
index d354682..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/sel_nav2_grad2.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/sky_blu_grad.gif b/appsrc/ODS-Briefcase/www/image/sky_blu_grad.gif
deleted file mode 100644
index 81e07ec..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/sky_blu_grad.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/sky_blu_grad.jpg b/appsrc/ODS-Briefcase/www/image/sky_blu_grad.jpg
deleted file mode 100644
index 8b63700..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/sky_blu_grad.jpg and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/stl_blu1_grad.gif b/appsrc/ODS-Briefcase/www/image/stl_blu1_grad.gif
deleted file mode 100644
index f129e3f..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/stl_blu1_grad.gif and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/stop_16.png b/appsrc/ODS-Briefcase/www/image/stop_16.png
deleted file mode 100644
index 4d84554..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/stop_16.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/image/virt_power_no_border.png b/appsrc/ODS-Briefcase/www/image/virt_power_no_border.png
deleted file mode 100644
index 93fcb80..0000000
Binary files a/appsrc/ODS-Briefcase/www/image/virt_power_no_border.png and /dev/null differ
diff --git a/appsrc/ODS-Briefcase/www/js/odrive.js b/appsrc/ODS-Briefcase/www/js/odrive.js
index 31adf14..40395b9 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.22 2011/08/01 14:14:42 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -29,6 +29,46 @@ 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 != '')
@@ -184,7 +224,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) != -1)
+ if (o != null && o.type == "checkbox" && !o.disabled && o.name.indexOf (prefix) == 0)
{
o.checked = (obj.value == 'Select All');
coloriseRow(getParent(o, 'tr'), o.checked);
@@ -231,7 +271,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>0, doc);
+ enableElement('tb_properties', 'tb_properties_gray', oCount>1, doc);
}
function getParent (o, tag)
@@ -375,17 +415,17 @@ function getFileName(obj)
N = S.indexOf('#');
S = S.substr(0, N);
}
- if (document.F1.dav_destination[1].checked == '1')
- {
+ if (document.forms['F1'].elements['dav_destination']) {
+ if (document.F1.dav_destination[1].checked == '1') {
N = S.indexOf('.rdf');
S = S.substr(0, N);
}
- if ((document.F1.dav_destination[0].checked == '1') && (document.F1.dav_source[2].checked == '1'))
- {
+ if ((document.F1.dav_destination[0].checked == '1') && (document.F1.dav_source[2].checked == '1')) {
N = S.indexOf('.rdf');
if (N == -1)
S = S + '.rdf';
}
+ }
document.F1.dav_name.value = S;
}
@@ -397,19 +437,33 @@ function chkbx(bx1, bx2)
function updateLabel(value)
{
- hideLabel(4, 10);
+ hideLabel(4, 16);
if (value == 'oMail')
showLabel(4, 4);
- if (value == 'PropFilter')
+ else if (value == 'PropFilter')
showLabel(5, 5);
- if (value == 'S3')
+ else if (value == 'S3')
showLabel(6, 6);
- if (value == 'ResFilter')
+ else if (value == 'ResFilter')
showLabel(7, 7);
- if (value == 'CatFilter')
+ else if (value == 'CatFilter')
showLabel(7, 7);
- if (value == 'rdfSink')
+ else if (value == 'rdfSink')
showLabel(8, 8);
+ else if (value == 'SyncML')
+ showLabel(10, 10);
+ else if (value == 'IMAP')
+ showLabel(11, 11);
+ else if (value == 'GDrive')
+ showLabel(12, 12);
+ else if (value == 'Dropbox')
+ showLabel(13, 13);
+ else if (value == 'SkyDrive')
+ showLabel(14, 14);
+ else if (value == 'Box')
+ showLabel(15, 15);
+ else if (value == 'WebDAV')
+ showLabel(16, 16);
}
function showLabel(from, to)
@@ -504,19 +558,23 @@ function webidShow(obj) {
windowShow('/ods/webid_select.vspx?mode='+S.charAt(0)+'¶ms='+obj.id+':s1;');
}
-function windowShow(sPage, sPageName, width, height) {
+function windowShowInternal(sPage, sPageName, width, height) {
if (width == null)
width = 700;
if (height == null)
height = 500;
+ win = window.open(sPage, sPageName, "width="+width+",height="+height+",top=100,left=100,status=yes,toolbar=no,menubar=no,scrollbars=yes,resizable=yes");
+ win.window.focus();
+}
+
+function windowShow(sPage, sPageName, width, height) {
if (sPage.indexOf('form=') == -1)
sPage += '&form=F1';
if (sPage.indexOf('sid=') == -1)
sPage += urlParam('sid');
if (sPage.indexOf('realm=') == -1)
sPage += urlParam('realm');
- win = window.open(sPage, sPageName, "width="+width+",height="+height+",top=100,left=100,status=yes,toolbar=no,menubar=no,scrollbars=yes,resizable=yes");
- win.window.focus();
+ windowShowInternal(sPage, sPageName, width, height);
}
function renameShow(myForm, myPrefix, myPage, width, height) {
@@ -540,9 +598,10 @@ function mailShow(myForm, myPrefix, myPage, width, height)
}
function coloriseRow(obj, checked) {
- obj.className = (obj.className).replace('tr_select', '');
if (checked)
- obj.className = obj.className + ' ' + 'tr_select';
+ OAT.Dom.addClass(obj, 'selected');
+ else
+ OAT.Dom.removeClass(obj, 'selected');
}
function coloriseTable(id)
@@ -710,7 +769,7 @@ function addChecked (form, txt, selectionMsq)
// Hiddens functions
function createHidden(frm_name, fld_name, fld_value)
{
- createHidden2(document, frm_name, fld_name, fld_value);
+ return createHidden2(document, frm_name, fld_name, fld_value);
}
function createHidden2(doc, frm_name, fld_name, fld_value)
@@ -729,6 +788,8 @@ function createHidden2(doc, frm_name, fld_name, fld_value)
doc.forms[frm_name].appendChild(hidden);
}
hidden.value = fld_value;
+
+ return hidden;
}
}
@@ -763,8 +824,9 @@ function hideCell(cell)
function toggleDavRows()
{
- if (document.forms['F1'].elements['dav_destination'])
- {
+ if (!document.forms['F1'].elements['dav_destination'])
+ return;
+
if (document.forms['F1'].elements['dav_destination'][0].checked == '1')
{
showTableRow('davRow_mime');
@@ -777,14 +839,13 @@ function toggleDavRows()
showTableRow('davRow_tagsPublic');
showTableRow('davRow_tagsPrivate');
- showTableRow('rdf_store');
-
+ showCell('dav_source_2');
showCell('label_dav');
hideCell('label_dav_rdf');
showCell('dav_name');
hideCell('dav_name_rdf');
}
- if (document.forms['F1'].elements['dav_destination'][1].checked == '1')
+ else if (document.forms['F1'].elements['dav_destination'][1].checked == '1')
{
hideCell('davRow_tagsPrivate');
hideCell('davRow_tagsPublic');
@@ -795,9 +856,11 @@ function toggleDavRows()
hideCell('davRow_owner');
hideCell('davRow_version');
hideCell('davRow_mime');
+ if ($('dav_content_plain'))
+ showCell('davRow_mime');
- hideCell('rdf_store');
- if (document.forms['F1'].elements['dav_source'][2].checked == '1')
+ hideCell('dav_source_2');
+ if (document.forms['F1'].elements['dav_source'] && (document.forms['F1'].elements['dav_source'][2].checked == '1'))
document.forms['F1'].elements['dav_source'][0].checked = '1';
hideCell('label_dav');
@@ -805,20 +868,48 @@ 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');
}
}
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'};
-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()']};
-ODRIVE.forms['tags'] = {params: {items: true}, height: '360', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
-ODRIVE.forms['rename'] = {params: {items: true}, height: '150', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
-ODRIVE.forms['delete'] = {params: {items: true}, height: '300', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
+ODRIVE.forms['properties'] = {params: {items: true}, width: '900', height: '630', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
+ODRIVE.forms['edit'] = {params: {items: true}, height: '440', postActions:['ODRIVE.formSubmit()']};
+ODRIVE.forms['view'] = {params: {items: true}, height: '440'};
+ODRIVE.forms['copy'] = {params: {items: true}, height: '330', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
+ODRIVE.forms['move'] = {params: {items: true}, height: '330', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
+ODRIVE.forms['tags'] = {params: {items: true}, height: '350', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
+ODRIVE.forms['rename'] = {params: {items: true}, height: '160', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
+ODRIVE.forms['delete'] = {params: {items: true}, height: '290', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
ODRIVE.trim = function (sString, sChar)
{
@@ -975,6 +1066,10 @@ 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)
@@ -988,7 +1083,7 @@ ODRIVE.formShow = function (action, id, params)
if (formDiv) {OAT.Dom.unlink(formDiv);}
formDiv = OAT.Dom.create('div', {width:dx+'px', height:dy+'px'});
formDiv.id = 'formDiv';
- formDialog = new OAT.Dialog('', formDiv, {width:parseInt(dx)+20, buttons: 0, resize: 0, modal: 1, onhide: function(){return false;}});
+ formDialog = new OAT.Dialog('', formDiv, {buttons: 0, resize: 0, modal: 1, onhide: function(){return false;}});
formDialog.cancel = formDialog.hide;
var s = 'forms.vspx?sa='+encodeURIComponent(action)+ODRIVE.sessionParams();
@@ -1396,20 +1491,29 @@ 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);
}
@@ -1430,12 +1534,10 @@ ODRIVE.coloriseTables = function ()
ODRIVE.aboutDialog = function ()
{
var aboutDiv = $('aboutDiv');
- if (aboutDiv) {OAT.Dom.unlink(aboutDiv);}
- aboutDiv = OAT.Dom.create('div', {
- width:'430px',
- height: '170px',
- overflow: 'hidden'
- });
+ if (aboutDiv)
+ OAT.Dom.unlink(aboutDiv);
+
+ aboutDiv = OAT.Dom.create('div', {height: '160px', 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;
@@ -1484,3 +1586,97 @@ ODRIVE.toggleEditor = function ()
$('dav_content_plain').value = $v('dav_content_html');
}
}
+
+ODRIVE.updateRdfGraph = function ()
+{
+ function updateRdfGraphInternal(name) {
+ var graphPrefix;
+ var rdfGraph;
+
+ graphPrefix = $v('rdfGraph_prefix');
+ rdfGraph = $('dav_'+name+'_graph');
+ if ((rdfGraph.value == '') || (rdfGraph.value == (graphPrefix+$v('dav_name_save')+'#this')))
+ rdfGraph.value = graphPrefix + $v('dav_name') + '#this';
+ }
+ updateRdfGraphInternal('rdfSink');
+ updateRdfGraphInternal('S3');
+ updateRdfGraphInternal('IMAP');
+ updateRdfGraphInternal('GDrive');
+ updateRdfGraphInternal('Dropbox');
+ updateRdfGraphInternal('SkyDrive');
+ updateRdfGraphInternal('Box');
+ updateRdfGraphInternal('WebDAV');
+
+ $('dav_name_save').value = $v('dav_name');
+}
+
+ODRIVE.oauthParams = function (json, display_name, email)
+{
+ try {
+ params = OAT.JSON.deserialize(unescape(json));
+ } catch (e) { params = null; }
+ var fld = createHidden('F1', 'dav_GDrive_JSON', null);
+ if (!params || params.error) {
+ alert ('Bad authentication!');
+ fld.value = '';
+ } else {
+ var d = new Date();
+ params.access_timestamp = d.format('Y-m-d H:i');
+ fld.value = OAT.JSON.serialize(params);
+ // $('dav_GDrive_authentication').innerHTML = 'Authenticated';
+ createHidden('F1', 'dav_GDrive_display_name', display_name);
+ createHidden('F1', 'dav_GDrive_email', email);
+
+ OAT.Dom.show('tr_dav_GDrive_display_name');
+ $('td_dav_GDrive_display_name').innerHTML = display_name;
+ OAT.Dom.show('tr_dav_GDrive_email');
+ $('td_dav_GDrive_email').innerHTML = email;
+ $('dav_GDrive_authenticate').value = 'Re-Authenticate';
+ }
+}
+
+ODRIVE.dropboxParams = function (sid, display_name, email)
+{
+ createHidden('F1', 'dav_Dropbox_authentication', 'Yes');
+ createHidden('F1', 'dav_Dropbox_sid', sid);
+ createHidden('F1', 'dav_Dropbox_display_name', display_name);
+ createHidden('F1', 'dav_Dropbox_email', email);
+
+ OAT.Dom.show('tr_dav_Dropbox_display_name');
+ $('td_dav_Dropbox_display_name').innerHTML = display_name;
+ OAT.Dom.show('tr_dav_Dropbox_email');
+ $('td_dav_Dropbox_email').innerHTML = email;
+ $('dav_Dropbox_authenticate').value = 'Re-Authenticate';
+}
+
+ODRIVE.skydriveParams = function (json, display_name)
+{
+ try {
+ params = OAT.JSON.deserialize(unescape(json));
+ } catch (e) { params = null; }
+ var fld = createHidden('F1', 'dav_SkyDrive_JSON', null);
+ if (!params || params.error) {
+ alert ('Bad authentication!');
+ fld.value = '';
+ } else {
+ var d = new Date();
+ params.access_timestamp = d.format('Y-m-d H:i');
+ fld.value = OAT.JSON.serialize(params);
+ createHidden('F1', 'dav_SkyDrive_display_name', display_name);
+
+ OAT.Dom.show('tr_dav_SkyDrive_display_name');
+ $('td_dav_SkyDrive_display_name').innerHTML = display_name;
+ $('dav_SkyDrive_authenticate').value = 'Re-Authenticate';
+ }
+}
+
+ODRIVE.boxParams = function (auth_token, display_name)
+{
+ createHidden('F1', 'dav_Box_authentication', 'Yes');
+ createHidden('F1', 'dav_Box_auth_token', auth_token);
+ createHidden('F1', 'dav_Box_display_name', display_name);
+
+ OAT.Dom.show('tr_dav_Box_display_name');
+ $('td_dav_Box_display_name').innerHTML = display_name;
+ $('dav_Box_authenticate').value = 'Re-Authenticate';
+}
diff --git a/appsrc/ODS-Briefcase/www/js/tbl.js b/appsrc/ODS-Briefcase/www/js/tbl.js
index 6bda4f5..ab4ac6f 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-2010 OpenLink Software
+ * 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
@@ -78,9 +78,7 @@ TBL.createCell42 = function (td, prefix, fldName, No, fldOptions, disabled)
TBL.createCell43 = function (td, prefix, fldName, No, fldOptions)
{
- var fld = OAT.Dom.create("select");
- fld.name = fldName;
- fld.id = fldName;
+ var fld = TBL.createCellSelect(fldName, fldOptions);
TBL.selectOption(fld, fldOptions.value, 'This object only', 0);
if (fldOptions.objectType == 'C') {
TBL.selectOption(fld, fldOptions.value, 'This object, subfolders and files', 1);
@@ -109,3 +107,53 @@ 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 7ec5b96..18c4968 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.5 2011/05/02 14:16:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/www/mimes_select.vspx b/appsrc/ODS-Briefcase/www/mimes_select.vspx
index b9f4eda..7154a40 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.3 2011/05/02 14:16:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/www/odrive_login.vspx b/appsrc/ODS-Briefcase/www/odrive_login.vspx
index 4ad4f24..fe80430 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.8 2010/10/07 13:23:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -44,6 +44,11 @@
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 ff1d596..a09984c 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.6 2010/10/13 12:15:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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));
?>
- <xsl:call-template name="nbsp"/><vm:label for="r_chars_0" value="--'show everything'" />
+ <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));
?>
- <xsl:call-template name="nbsp"/><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'" />
<v:text name="f_chars" null-value="--''" value="--ODRIVE.WA.settings_chars (self.settings)" xhtml_size="3"/>
- <xsl:call-template name="nbsp"/><vm:label for="r_chars_1" value="--'characters'" /><xsl:call-template name="nbsp"/>
+ <vm:label for="r_chars_1" value="--'characters'" />
</td>
</tr>
<tr>
@@ -300,11 +300,12 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Clear" xhtml_class="form-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: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)), ODRIVE.WA.settings (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.vc_data_bind(e);
]]>
</v:on-post>
diff --git a/appsrc/ODS-Briefcase/www/subscriptions.vspx b/appsrc/ODS-Briefcase/www/subscriptions.vspx
index d081fd2..7e930c8 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.4 2011/05/02 14:16:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/www/template/popup.vspx b/appsrc/ODS-Briefcase/www/template/popup.vspx
index 409855a..9af01f2 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.7 2011/07/04 10:04:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -46,15 +46,6 @@
<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 2bf8780..b506a63 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.13 2011/07/04 10:04:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -57,12 +57,6 @@
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 f41009b..aa71acf 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.10 2011/05/02 14:16:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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;">
+ <div id="app_area" style="clear: right; min-width: 1008px;">
<div style="background-color: #fff;">
<div style="float: left;">
<?vsp
@@ -279,7 +279,7 @@
<div id="FT" style="display: <?V case when get_keyword ('interface', C, '') = 'js' then 'none' else '' end ?>">
<div id="FT_L">
<a href="http://www.openlinksw.com/virtuoso">
- <img alt="Powered by OpenLink Virtuoso Universal Server" src="image/virt_power_no_border.png" border="0" />
+ <img alt="Powered by OpenLink Virtuoso Universal Server" src="/ods/images/virt_power_no_border.png" border="0" />
</a>
</div>
<div id="FT_R">
@@ -372,7 +372,7 @@
<!--=========================================================================-->
<xsl:template name="vm:splash">
<div style="padding: 1em; font-size: 0.70em;">
- <a href="http://www.openlinksw.com/virtuoso"><img title="Powered by OpenLink Virtuoso Universal Server" src="image/PoweredByVirtuoso.gif" border="0" /></a>
+ <a href="http://www.openlinksw.com/virtuoso"><img title="Powered by OpenLink Virtuoso Universal Server" src="/ods/images/PoweredByVirtuoso.gif" border="0" /></a>
<br />
Server version: <?V sys_stat('st_dbms_ver') ?><br/>
Server build date: <?V sys_stat('st_build_date') ?><br/>
@@ -516,30 +516,17 @@
<div id="4" class="tabContent" style="display: none;">
<table class="form-body" cellspacing="0">
<tr>
- <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 width="30%">
+ <v:label for="dav_oMail_FolderName" value="--'WebMail 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', 'Inbox');
+ control.ufl_value := self.get_fieldProperty ('dav_oMail_FolderName', self.dav_path, 'virt:oMail-FolderName', 'NULL');
+ if (control.ufl_value = 'NULL')
+ control.ufl_value := '';
]]>
</v:before-data-bind>
</v:text>
@@ -547,7 +534,7 @@
</tr>
<tr>
<th>
- <v:label for="dav_oMail_NameFormat" value="--'oMail name format'" />
+ <v:label for="dav_oMail_NameFormat" value="--'WebMail name format'" />
</th>
<td>
<v:text name="dav_oMail_NameFormat" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
@@ -621,6 +608,19 @@
<div id="6" class="tabContent" style="display: none;">
<table class="form-body" cellspacing="0">
<tr>
+ <th width="30%">
+ <v:label for="dav_S3_activity" value="--'Activity manager (on/off)'" />
+ </th>
+ <td>
+ <?vsp
+ declare S varchar;
+
+ S := self.get_fieldProperty ('dav_S3_activity', self.dav_path, 'virt:S3-activity', 'off');
+ http (sprintf ('<input type="checkbox" name="dav_S3_activity" id="dav_S3_activity" %s disabled="disabled" value="on" />', case when S = 'on' then 'checked="checked"' else '' end));
+ ?>
+ </td>
+ </tr>
+ <tr>
<th>
<v:label for="dav_S3_BucketName" value="Bucket Name" />
</th>
@@ -665,7 +665,31 @@
</v:text>
</td>
</tr>
+ <tr>
+ <th>
+ <v:label for="dav_S3_graph" value="--'Graph name'" />
+ </th>
+ <td>
+ <v:text name="dav_S3_graph" xhtml_id="dav_S3_graph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_S3_graph', self.dav_path, 'virt:S3-graph', '');
+ if ((control.ufl_value = '') and (self.command = 0))
+ 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>
+ </td>
+ </tr>
+ <?vsp
+ self.detSpongerUI ('S3', 6);
+ ?>
</table>
+ <![CDATA[
+ <script type="text/javascript">
+ OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_S3_sponger'), {checked: {show: ['dav6_cartridge', 'dav6_metaCartridge']}})});
+ </script>
+ ]]>
</div>
</xsl:template>
@@ -729,7 +753,7 @@
</table>
</td>
<td valign="top" nowrap="nowrap" width="1%">
- <span class="button pointer" onclick="javascript: ODRIVE.searchRowCreate();"><img src="image/add_16.png" border="0" class="button" alt="Add Criteria" title="Add Criteria" /> Add</span><br /><br />
+ <span class="button pointer" onclick="javascript: ODRIVE.searchRowCreate();"><img src="/ods/images/icons/add_16.png" border="0" class="button" alt="Add Criteria" title="Add Criteria" /> Add</span><br /><br />
</td>
</tr>
</table>
@@ -741,15 +765,17 @@
<div id="8" class="tabContent" style="display: none;">
<table class="form-body" cellspacing="0">
<tr>
- <th>
- <v:label for="dav_rdfSink_rdfGraph" value="--'Graph name'" />
+ <th width="30%">
+ <v:label for="dav_rdfSink_graph" value="--'Graph name'" />
</th>
<td>
- <v:text name="dav_rdfSink_rdfGraph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:text name="dav_rdfSink_graph" xhtml_id="dav_rdfSink_graph" 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', '');
+ control.ufl_value := self.get_fieldProperty ('dav_rdfSink_graph', 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>
@@ -760,17 +786,91 @@
<v:label for="dav_rdfSink_rdfSponger" value="--'Sponger (on/off)'" />
</th>
<td>
- <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>
+ <?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>
</td>
</tr>
+ <vm:if test="DB.DBA.wa_check_package ('cartridges')">
+ <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>
<!--=========================================================================-->
@@ -783,10 +883,10 @@
</th>
<td>
<?vsp
- 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')));
+ 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')));
?>
</td>
</tr>
@@ -803,9 +903,9 @@
if (ODRIVE.WA.DAV_GET (self.dav_item, 'versionControl'))
{
- retValue := ODRIVE.WA.DAV_REMOVE_VERSION_CONTROL (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
+ retValue := ODRIVE.WA.DAV_REMOVE_VERSION_CONTROL (self.dav_path);
} else {
- retValue := ODRIVE.WA.DAV_VERSION_CONTROL (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
+ retValue := ODRIVE.WA.DAV_VERSION_CONTROL (self.dav_path);
}
if (ODRIVE.WA.DAV_ERROR(retValue))
{
@@ -827,12 +927,12 @@
File commands
</th>
<td>
- <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: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:on-post>
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_LOCK (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
+ retValue := ODRIVE.WA.DAV_LOCK (self.dav_path);
if (ODRIVE.WA.DAV_ERROR(retValue))
{
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
@@ -843,12 +943,12 @@
]]>
</v:on-post>
</v: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: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:on-post>
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_UNLOCK (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
+ retValue := ODRIVE.WA.DAV_UNLOCK (self.dav_path);
if (ODRIVE.WA.DAV_ERROR(retValue))
{
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
@@ -871,8 +971,9 @@
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_CHECKIN (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
- if (ODRIVE.WA.DAV_ERROR(retValue)) {
+ retValue := ODRIVE.WA.DAV_CHECKIN (self.dav_path);
+ if (ODRIVE.WA.DAV_ERROR (retValue))
+ {
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
self.vc_is_valid := 0;
return;
@@ -886,7 +987,7 @@
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_CHECKOUT (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
+ retValue := ODRIVE.WA.DAV_CHECKOUT (self.dav_path);
if (ODRIVE.WA.DAV_ERROR(retValue))
{
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
@@ -902,7 +1003,7 @@
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_UNCHECKOUT (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
+ retValue := ODRIVE.WA.DAV_UNCHECKOUT (self.dav_path);
if (ODRIVE.WA.DAV_ERROR(retValue))
{
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
@@ -920,7 +1021,7 @@
Number of Versions in History
</th>
<td>
- <v:label value="--ODRIVE.WA.DAV_GET_VERSION_COUNT(ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'))" format="%d" />
+ <v:label value="--ODRIVE.WA.DAV_GET_VERSION_COUNT (self.dav_path)" format="%d" />
</td>
</tr>
<tr>
@@ -928,12 +1029,12 @@
Root version
</th>
<td>
- <v:button style="url" action="simple" value="--ODRIVE.WA.DAV_GET_VERSION_ROOT(ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'))" format="%s">
+ <v:button style="url" action="simple" value="--ODRIVE.WA.DAV_GET_VERSION_ROOT (self.dav_path)" format="%s">
<v:on-post>
<![CDATA[
declare path varchar;
- path := ODRIVE.WA.DAV_GET_VERSION_ROOT(ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
+ path := ODRIVE.WA.DAV_GET_VERSION_ROOT (self.dav_path);
if (ODRIVE.WA.odrive_permission(path) = '')
{
self.vc_error_message := 'You have not rights to read this folder/file!';
@@ -951,7 +1052,7 @@
</td>
</tr>
<tr>
- <th>Versions</th>
+ <th valign="top">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')" />
@@ -997,7 +1098,7 @@
}
http_request_status ('HTTP/1.1 302 Found');
- http_header (sprintf ('Location: view.vsp?sid=%s&realm=%s&file=%U&mode=download\r\n', self.sid , self.realm, path));
+ 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));
self.vc_data_bind (e);
]]>
</v:on-post>
@@ -1028,7 +1129,7 @@
<v:button name="button_versions_delete" action="simple" style="url" value="Version Delete" enabled="--(control.vc_parent as vspx_row_template).te_column_value('c1')">
<v:after-data-bind>
<![CDATA[
- control.ufl_value := '<img src="image/del_16.png" border="0" alt="Version Delete" title="Version Delete" onclick="javascript: if (!confirm(\'Are you sure you want to delete the chosen version and all previous versions?\')) { event.cancelBubble = true;};" />';
+ control.ufl_value := '<img src="/ods/images/icons/del_16.png" border="0" alt="Version Delete" title="Version Delete" onclick="javascript: if (!confirm(\'Are you sure you want to delete the chosen version and all previous versions?\')) { event.cancelBubble = true;};" />';
]]>
</v:after-data-bind>
<v:on-post>
@@ -1136,9 +1237,549 @@
</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" onchange="javascript: $('dav_IMAP_port').value = (this.value == 'ssl')? '993': '143';">
+ <?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>Server Port</th>
+ <td>
+ <v:text name="dav_IMAP_port" xhtml_id="dav_IMAP_port" format="%s" xhtml_disabled="disabled" xhtml_class="field-short">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_IMAP_port', self.dav_path, 'virt:IMAP-port', '143');
+ ]]>
+ </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>
+ <tr>
+ <th>
+ <v:label for="dav_IMAP_graph" value="--'Graph name'" />
+ </th>
+ <td>
+ <v:text name="dav_IMAP_graph" xhtml_id="dav_IMAP_graph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_IMAP_graph', 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>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </xsl:template>
+
+ <!--=========================================================================-->
+ <xsl:template match="vm:search-dc-template13">
+ <div id="12" class="tabContent" style="display: none;">
+ <?vsp
+ declare _value any;
+
+ _value := self.get_fieldProperty ('===', self.dav_path, 'virt:GDrive-Authentication', 'No');
+ ?>
+ <table class="form-body" cellspacing="0">
+ <tr>
+ <th width="30%">
+ <v:label for="dav_GDrive_activity" value="--'Activity manager (on/off)'" />
+ </th>
+ <td>
+ <?vsp
+ declare S varchar;
+
+ S := self.get_fieldProperty ('dav_GDrive_activity', self.dav_path, 'virt:GDrive-activity', 'off');
+ http (sprintf ('<input type="checkbox" name="dav_GDrive_activity" id="dav_GDrive_activity" %s disabled="disabled" value="on" />', case when S = 'on' then 'checked="checked"' else '' end));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_GDrive_graph" value="--'Graph name'" />
+ </th>
+ <td>
+ <v:text name="dav_GDrive_graph" xhtml_id="dav_GDrive_graph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_GDrive_graph', self.dav_path, 'virt:GDrive-graph', '');
+ if ((control.ufl_value = '') and (self.command = 0))
+ 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>
+ </td>
+ </tr>
+ <?vsp
+ self.detSpongerUI ('GDrive', 12);
+ ?>
+ <tr id="tr_dav_GDrive_display_name" style="display: <?V case when _value = 'Yes' then '' else 'none' end ?>">
+ <th>User name</th>
+ <td id="td_dav_GDrive_display_name">
+ <?vsp
+ http (self.get_fieldProperty ('===', self.dav_path, 'virt:GDrive-display_name', ''));
+ ?>
+ </td>
+ </tr>
+ <tr id="tr_dav_GDrive_email" style="display: <?V case when _value = 'Yes' then '' else 'none' end ?>">
+ <th>User email</th>
+ <td id="td_dav_GDrive_email">
+ <?vsp
+ http (self.get_fieldProperty ('===', self.dav_path, 'virt:GDrive-email', ''));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td>
+ <?vsp
+ declare _name, _client_id, _return_url, _scope, _url any;
+
+ _name := '';
+ if (_value = 'No')
+ _name := 'Authenticate';
+ if (_value = 'Yes')
+ _name := 'Re-Authenticate';
+
+ _client_id := (select a_key from OAUTH..APP_REG where a_name = 'Google API' and a_owner = 0);
+ _return_url := sprintf ('http://%{WSHost}s/ods/access_google.vsp', http_path());
+ _scope := 'https://docs.google.com/feeds/ https://docs.googleusercontent.com/ https://spreadsheets.google.com/feeds/ https://www.googleapis.com/auth/fusiontables https://www.googleapis.com/auth/drive.file';
+ _url := sprintf ('https://accounts.google.com/o/oauth2/auth?client_id=%U&redirect_uri=%U&scope=%U&response_type=%U&access_type=%U&state=%U&approval_prompt=%U', _client_id, _return_url, _scope, 'code', 'offline', self.sid, 'force');
+ http (sprintf ('<input type="button" id="dav_GDrive_authenticate" value="%s" onclick="javascript: windowShowInternal(\'%s\');" disabled="disabled" class="button" />', _name, _url));
+ ?>
+ </td>
+ </tr>
+ </table>
+ <![CDATA[
+ <script type="text/javascript">
+ OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_GDrive_sponger'), {checked: {show: ['dav12_cartridge', 'dav12_metaCartridge']}})});
+ </script>
+ ]]>
+ </div>
+ </xsl:template>
+
+ <!--=========================================================================-->
+ <xsl:template match="vm:search-dc-template14">
+ <div id="13" class="tabContent" style="display: none;">
+ <?vsp
+ declare _value any;
+
+ _value := self.get_fieldProperty ('===', self.dav_path, 'virt:Dropbox-Authentication', 'No');
+ ?>
+ <table class="form-body" cellspacing="0">
+ <tr>
+ <th width="30%">
+ <v:label for="dav_Dropbox_activity" value="--'Activity manager (on/off)'" />
+ </th>
+ <td>
+ <?vsp
+ declare S varchar;
+
+ S := self.get_fieldProperty ('dav_Dropbox_activity', self.dav_path, 'virt:Dropbox-activity', 'off');
+ http (sprintf ('<input type="checkbox" name="dav_Dropbox_activity" id="dav_Dropbox_activity" %s disabled="disabled" value="on" />', case when S = 'on' then 'checked="checked"' else '' end));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_Dropbox_graph" value="--'Graph name'" />
+ </th>
+ <td>
+ <v:text name="dav_Dropbox_graph" xhtml_id="dav_Dropbox_graph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_Dropbox_graph', self.dav_path, 'virt:Dropbox-graph', '');
+ if ((control.ufl_value = '') and (self.command = 0))
+ 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>
+ </td>
+ </tr>
+ <?vsp
+ self.detSpongerUI ('Dropbox', 13);
+ ?>
+ <tr id="tr_dav_Dropbox_display_name" style="display: <?V case when _value = 'Yes' then '' else 'none' end ?>">
+ <th>User name</th>
+ <td id="td_dav_Dropbox_display_name">
+ <?vsp
+ http (self.get_fieldProperty ('===', self.dav_path, 'virt:Dropbox-display_name', ''));
+ ?>
+ </td>
+ </tr>
+ <tr id="tr_dav_Dropbox_email" style="display: <?V case when _value = 'Yes' then '' else 'none' end ?>">
+ <th>User email</th>
+ <td id="td_dav_Dropbox_email">
+ <?vsp
+ http (self.get_fieldProperty ('===', self.dav_path, 'virt:Dropbox-email', ''));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td>
+ <?vsp
+ declare _name, _url any;
+
+ _name := '';
+ if (_value = 'No')
+ _name := 'Authenticate';
+ if (_value = 'Yes')
+ _name := 'Re-Authenticate';
+
+ _url := '/ods/access_dropbox.vsp';
+ http (sprintf ('<input type="button" id="dav_Dropbox_authenticate" value="%s" onclick="javascript: windowShowInternal(\'%s\');" disabled="disabled" class="button" />', _name, _url));
+ ?>
+ </td>
+ </tr>
+ </table>
+ <![CDATA[
+ <script type="text/javascript">
+ OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_Dropbox_sponger'), {checked: {show: ['dav13_cartridge', 'dav13_metaCartridge']}})});
+ </script>
+ ]]>
+ </div>
+ </xsl:template>
+
+ <!--=========================================================================-->
+ <xsl:template match="vm:search-dc-template15">
+ <div id="14" class="tabContent" style="display: none;">
+ <?vsp
+ declare _value any;
+
+ _value := self.get_fieldProperty ('===', self.dav_path, 'virt:SkyDrive-Authentication', 'No');
+ ?>
+ <table class="form-body" cellspacing="0">
+ <tr>
+ <th width="30%">
+ <v:label for="dav_SkyDrive_activity" value="--'Activity manager (on/off)'" />
+ </th>
+ <td>
+ <?vsp
+ declare S varchar;
+
+ S := self.get_fieldProperty ('dav_SkyDrive_activity', self.dav_path, 'virt:SkyDrive-activity', 'off');
+ http (sprintf ('<input type="checkbox" name="dav_SkyDrive_activity" id="dav_SkyDrive_activity" %s disabled="disabled" value="on" />', case when S = 'on' then 'checked="checked"' else '' end));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_SkyDrive_graph" value="--'Graph name'" />
+ </th>
+ <td>
+ <v:text name="dav_SkyDrive_graph" xhtml_id="dav_SkyDrive_graph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_SkyDrive_graph', self.dav_path, 'virt:SkyDrive-graph', '');
+ if ((control.ufl_value = '') and (self.command = 0))
+ 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>
+ </td>
+ </tr>
+ <?vsp
+ self.detSpongerUI ('SkyDrive', 14);
+ ?>
+ <tr id="tr_dav_SkyDrive_display_name" style="display: <?V case when _value = 'Yes' then '' else 'none' end ?>">
+ <th>User name</th>
+ <td id="td_dav_SkyDrive_display_name">
+ <?vsp
+ http (self.get_fieldProperty ('===', self.dav_path, 'virt:SkyDrive-display_name', ''));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td>
+ <?vsp
+ declare _name, _client_id, _return_url, _scope, _url any;
+
+ _name := '';
+ if (_value = 'No')
+ _name := 'Authenticate';
+ if (_value = 'Yes')
+ _name := 'Re-Authenticate';
+
+ _client_id := (select a_key from OAUTH..APP_REG where a_name = 'SkyDrive API' and a_owner = 0);
+ _return_url := sprintf ('http://%{WSHost}s/ods/access_skydrive.vsp', http_path());
+ _scope := 'wl.signin wl.basic wl.offline_access wl.skydrive wl.skydrive_update';
+ _url := sprintf ('https://login.live.com/oauth20_authorize.srf?client_id=%U&redirect_uri=%U&scope=%U&response_type=%U', _client_id, _return_url, _scope, 'code');
+ http (sprintf ('<input type="button" id="dav_SkyDrive_authenticate" value="%s" onclick="javascript: windowShowInternal(\'%s\');" disabled="disabled" class="button" />', _name, _url));
+ ?>
+ </td>
+ </tr>
+ </table>
+ <![CDATA[
+ <script type="text/javascript">
+ OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_SkyDrive_sponger'), {checked: {show: ['dav14_cartridge', 'dav14_metaCartridge']}})});
+ </script>
+ ]]>
+ </div>
+ </xsl:template>
+
+ <!--=========================================================================-->
+ <xsl:template match="vm:search-dc-template16">
+ <div id="15" class="tabContent" style="display: none;">
+ <?vsp
+ declare _value any;
+
+ _value := self.get_fieldProperty ('===', self.dav_path, 'virt:Box-Authentication', 'No');
+ ?>
+ <table class="form-body" cellspacing="0">
+ <tr>
+ <th width="30%">
+ <v:label for="dav_Box_activity" value="--'Activity manager (on/off)'" />
+ </th>
+ <td>
+ <?vsp
+ declare S varchar;
+
+ S := self.get_fieldProperty ('dav_Box_activity', self.dav_path, 'virt:Box-activity', 'off');
+ http (sprintf ('<input type="checkbox" name="dav_Box_activity" id="dav_Box_activity" %s disabled="disabled" value="on" />', case when S = 'on' then 'checked="checked"' else '' end));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_Box_graph" value="--'Graph name'" />
+ </th>
+ <td>
+ <v:text name="dav_Box_graph" xhtml_id="dav_Box_graph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_Box_graph', self.dav_path, 'virt:Box-graph', '');
+ if ((control.ufl_value = '') and (self.command = 0))
+ 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>
+ </td>
+ </tr>
+ <?vsp
+ self.detSpongerUI ('Box', 15);
+ ?>
+ <tr id="tr_dav_Box_display_name" style="display: <?V case when _value = 'Yes' then '' else 'none' end ?>">
+ <th>User name</th>
+ <td id="td_dav_Box_display_name">
+ <?vsp
+ http (self.get_fieldProperty ('===', self.dav_path, 'virt:Box-display_name', ''));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td>
+ <?vsp
+ declare _name, _url any;
+
+ _name := '';
+ if (_value = 'No')
+ _name := 'Authenticate';
+ if (_value = 'Yes')
+ _name := 'Re-Authenticate';
+
+ _url := '/ods/access_box.vsp';
+ http (sprintf ('<input type="button" id="dav_Box_authenticate" value="%s" onclick="javascript: windowShowInternal(\'%s\', \'Box.com access\', 800);" disabled="disabled" class="button" />', _name, _url));
+ ?>
+ </td>
+ </tr>
+ </table>
+ <![CDATA[
+ <script type="text/javascript">
+ OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_Box_sponger'), {checked: {show: ['dav15_cartridge', 'dav15_metaCartridge']}})});
+ </script>
+ ]]>
+ </div>
+ </xsl:template>
+
+ <!--=========================================================================-->
+ <xsl:template match="vm:search-dc-template17">
+ <div id="16" class="tabContent" style="display: none;">
+ <table class="form-body" cellspacing="0">
+ <tr>
+ <th width="30%">
+ <v:label for="dav_WebDAV_activity" value="--'Activity manager (on/off)'" />
+ </th>
+ <td>
+ <?vsp
+ declare S varchar;
+
+ S := self.get_fieldProperty ('dav_WebDAV_activity', self.dav_path, 'virt:WebDAV-activity', 'off');
+ http (sprintf ('<input type="checkbox" name="dav_WebDAV_activity" id="dav_WebDAV_activity" %s disabled="disabled" value="on" />', case when S = 'on' then 'checked="checked"' else '' end));
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_WebDAV_path" value="--'WebDAV path'" />
+ </th>
+ <td>
+ <v:text name="dav_WebDAV_path" xhtml_id="dav_WebDAV_path" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_WebDAV_path', self.dav_path, 'virt:WebDAV-path', '');
+ ]]>
+ </v:before-data-bind>
+ </v:text>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_WebDAV_user" value="--'User Name'" />
+ </th>
+ <td>
+ <v:text name="dav_WebDAV_user" xhtml_id="dav_WebDAV_user" format="%s" xhtml_disabled="disabled" xhtml_class="field-short">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_WebDAV_user', self.dav_path, 'virt:WebDAV-user', '');
+ ]]>
+ </v:before-data-bind>
+ </v:text>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_WebDAV_password" value="--'User Password'" />
+ </th>
+ <td>
+ <v:text type="password" name="dav_WebDAV_password" xhtml_id="dav_WebDAV_password" format="%s" xhtml_disabled="disabled" xhtml_class="field-short">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := '**********';
+ ]]>
+ </v:before-data-bind>
+ </v:text>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_WebDAV_graph" value="--'Graph name'" />
+ </th>
+ <td>
+ <v:text name="dav_WebDAV_graph" xhtml_id="dav_WebDAV_graph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_WebDAV_graph', self.dav_path, 'virt:WebDAV-graph', '');
+ if ((control.ufl_value = '') and (self.command = 0))
+ 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>
+ </td>
+ </tr>
+ <?vsp
+ self.detSpongerUI ('WebDAV', 16);
+ ?>
+ </table>
+ <![CDATA[
+ <script type="text/javascript">
+ OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_WebDAV_sponger'), {checked: {show: ['dav16_cartridge', 'dav16_metaCartridge']}})});
+ </script>
+ ]]>
+ </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'" />
@@ -1150,7 +1791,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">', tmp));
+ http (sprintf ('<select name="dav_autoversion" %s disabled="disabled" class="field-short">', tmp));
tmp := ODRIVE.WA.DAV_GET (self.dav_item, 'autoversion');
if (isnull(tmp) and (self.dav_type = 'R'))
@@ -1165,7 +1806,6 @@
?>
</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 b090da9..ebf4aff 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.5 2010/09/20 10:15:01 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -20,22 +20,13 @@
-- with this program; if not, write to the Free Software Foundation, Inc.,
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
-
- -- declare exit handler for SQLSTATE '*'
- -- {
- -- dbg_obj_print ('', __SQL_STATE, __SQL_MESSAGE);
- -- };
-
declare N integer;
declare auth_uid, auth_pwd, mode, file, uri, saveUri, req_header, res_header, content, contentType varchar;
mode := get_keyword('mode', params, '');
file := get_keyword('file', params);
auth_uid := ODRIVE.WA.session_user(params);
- auth_pwd := coalesce((SELECT U_PWD FROM WS.WS.SYS_DAV_USER WHERE U_NAME = auth_uid), '');
- if (auth_pwd[0] = 0)
- auth_pwd := pwd_magic_calc(auth_uid, auth_pwd, 1);
-
+ auth_pwd := ODRIVE.WA.account_password (ODRIVE.WA.account_id (auth_uid));
uri := ODRIVE.WA.http_escape (ODRIVE.WA.dav_url(file), 7);
if (auth_uid = '')
{
@@ -44,32 +35,21 @@
http_header (sprintf ('Location: %s\r\n', uri));
return;
}
- req_header := 'Accept-Charset: UTF-8,*\n' ||
- 'Keep-Alive: 300\n' ||
- 'Connection: keep-alive\n' ||
- 'Accept: image/png,*/*;q=0.5\n' ||
- sprintf('Authorization: Basic %s\n', encode_base64(concat(auth_uid, ':', auth_pwd)));
-
- N := 0;
-_again:
- N := N + 1;
- saveUri := uri;
commit work;
- content := http_client_ext (url=>uri,
+ req_header :=
+ 'Accept-Charset: UTF-8,*\r\n' ||
+ 'Keep-Alive: 300\r\n' ||
+ 'Connection: keep-alive\r\n' ||
+ 'Accept: image/png,*/*;q=0.5\r\n' ||
+ sprintf('Authorization: Basic %s\r\n', encode_base64(concat(auth_uid, ':', auth_pwd)));
+ content := http_client_ext (
+ url=>uri,
http_method=>'GET',
http_headers=>req_header,
- headers=>res_header);
-
+ headers=>res_header,
+ n_redirects=>15
+ );
contentType := http_request_header (res_header, 'Content-Type');
- if (res_header[0] like 'HTTP/1._ 30_%')
- {
- uri := http_request_header (res_header, 'Location');
- uri := WS.WS.EXPAND_URL (saveUri, uri);
- if (N > 15)
- return 'Too many redirects or redirect loops back, please specify the correct URL.';
- if (uri <> saveUri)
- goto _again;
- }
if (res_header[0] like 'HTTP/1._ 4__%' or res_header[0] like 'HTTP/1._ 5__%')
{
if (is_https_ctx ())
@@ -82,9 +62,12 @@ _again:
}
content := res_header[0];
}
-
http_rewrite();
- if ((contentType = 'text/plain') and (mode <> 'download'))
+ if (length (content) = 0)
+ {
+ http_request_status ('HTTP/1.1 204 No Content');
+ }
+ else if ((contentType = 'text/plain') and (mode <> 'download'))
{
http_header (sprintf('Content-Type: %s\r\n', 'text/html'));
http('<html><body><pre>\r\n');
diff --git a/appsrc/ODS-Briefcase/www/vmds.vspx b/appsrc/ODS-Briefcase/www/vmds.vspx
index 91bfcd2..52f5be7 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.6 2011/05/02 14:16:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/xslt/rss2atom.xsl b/appsrc/ODS-Briefcase/xslt/rss2atom.xsl
index 817d839..2390919 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.2 2010/09/20 10:15:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl b/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl
index 4ff5b07..bd79434 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.2 2010/09/20 10:15:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl b/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl
index 98067ea..5276e3b 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.2 2010/09/20 10:15:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl b/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl
index efb62a9..4fc1d71 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.1 2010/09/20 10:15:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/Makefile.am b/appsrc/ODS-Calendar/Makefile.am
index f1921bb..3c867c2 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-2007 OpenLink Software
+# 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
@@ -44,8 +44,10 @@ clean-local:
-rm -rf vad
EXTRA_DIST = \
+ *.dox \
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 cc39cca..63d5730 100644
--- a/appsrc/ODS-Calendar/Makefile.in
+++ b/appsrc/ODS-Calendar/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2007 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -307,8 +287,10 @@ CLEANFILES = \
virtuoso.trx
EXTRA_DIST = \
+ *.dox \
make_vad.sh \
sql/*.sql \
+ vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
@@ -327,14 +309,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Calendar/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Calendar/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Calendar/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Calendar/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -352,7 +334,6 @@ $(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
@@ -362,23 +343,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -402,17 +380,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -444,7 +418,6 @@ clean-generic:
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"
@@ -463,8 +436,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -473,28 +444,18 @@ 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
@@ -535,7 +496,6 @@ ods_calendar_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Calendar/ODS-Calendar.dox b/appsrc/ODS-Calendar/ODS-Calendar.dox
new file mode 100644
index 0000000..ca7ff99
--- /dev/null
+++ b/appsrc/ODS-Calendar/ODS-Calendar.dox
@@ -0,0 +1,20 @@
+/**
+\defgroup ods_module_calendar ODS Calendar API
+
+The ODS Calendar offers features to organize your Calendar Events, Tasks, and Notes.
+
+\section ods_calendar_features Feature Highlights
+
+- Management of Events, Tasks, Notes
+- Day, Week, Month View of events, tasks, and notes
+- Import Calendar files
+- Export to Calendar file
+- Search: simple and advanced form
+
+\section ods_calendar_syndication_formats Content Syndication Formats
+
+- RSS
+- Atom
+- RDF
+- SIOC
+*/
diff --git a/appsrc/ODS-Calendar/make_vad.sh b/appsrc/ODS-Calendar/make_vad.sh
index aca9740..3149aae 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-2007 OpenLink Software
+# 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
@@ -28,7 +28,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.6.76"
+VERSION="1.0.0"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -62,11 +62,6 @@ else
LN="ln -fs"
RM="rm -f"
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
if [ "z$SERVER" = "z" ]
then
@@ -90,6 +85,57 @@ 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
@@ -225,7 +271,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-2011 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
@@ -237,8 +283,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.82.42\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.86.16\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2012-04-18 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -267,6 +313,7 @@ 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
@@ -381,6 +428,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
+version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -397,7 +445,6 @@ 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"
@@ -407,5 +454,7 @@ 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
new file mode 100755
index 0000000..0274515
--- /dev/null
+++ b/appsrc/ODS-Calendar/sql/DET_CalDAV.sql
@@ -0,0 +1,1183 @@
+--
+--
+-- $Id$
+--
+-- 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 what char(1),
+ in path varchar) returns any
+{
+ -- dbg_obj_princ ('CalDAV_DAV_GET_PARENT (', id, what, path, ')');
+ if ('R' = what)
+{
+ id[4] := 0;
+
+ return id;
+ }
+ if ('C' = what)
+ return id[1];
+
+ 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, item_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
+ }
+ if ((length (content) = 0) and (top_id = -1))
+ {
+ item_id := CAL.WA.event_update (-1, path_parts[1], domain_id, 'UNLOCK', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+ return vector (CalDAV__UNAME(), detcol_id, uid, domain_id, item_id, 0);
+ }
+ 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, 'text/calendar', 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, 'text/calendar', colname );
+ }
+ for (select CalDAV__COMPOSE_ICS_NAME(E_UID) as orig_mname, E_CREATED, 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_CREATED, '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(), 'text/calendar', orig_name) ) );
+ }
+ return res;
+ }
+ }
+ for (select CalDAV__COMPOSE_ICS_NAME(E_UID) as orig_mname, E_ID, E_CREATED, 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_CREATED, '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_CREATED'),
+ '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 ('CalDAV_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] or 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 what 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, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
+ declare rc any;
+ declare domain_id, item_id integer;
+ declare name, uid varchar;
+
+ rc := 0;
+ if (what = 'C')
+ {
+ rc := -27;
+ goto _exit;
+ }
+
+ domain_id := id[3];
+ item_id := id[4];
+ if (exists (select 1 from CAL.WA.EVENTS where E_DOMAIN_ID = domain_id and E_ID = item_id and E_SUBJECT = 'UNLOCK'))
+ {
+ rc := lower (uuid());
+ update CAL.WA.EVENTS
+ set E_SUBJECT = 'LOCK',
+ E_DESCRIPTION = rc
+ where E_DOMAIN_ID = domain_id
+ and E_ID = item_id;
+
+ goto _exit;
+ }
+
+ if (exists (select 1 from CAL.WA.EVENTS where E_DOMAIN_ID = domain_id and E_ID = item_id and E_SUBJECT = 'LOCK' and dateadd ('second', -1, now()) > E_UPDATED))
+ {
+ rc := lower (uuid());
+ update CAL.WA.EVENTS
+ set E_SUBJECT = 'LOCK',
+ E_DESCRIPTION = rc
+ where E_DOMAIN_ID = domain_id
+ and E_ID = item_id;
+
+ goto _exit;
+ }
+
+ uid := (select E_UID from CAL.WA.EVENTS where E_DOMAIN_ID = domain_id and E_ID = item_id);
+ if (path like ('%' || CalDAV__COMPOSE_ICS_NAME (uid)))
+ {
+ rc := lower (uuid());
+
+ goto _exit;
+ }
+
+ rc := -20;
+
+_exit:;
+ return rc;
+}
+;
+
+--| 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 what char(1),
+ in token varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('CalDAV_DAV_UNLOCK (', id, what, token, auth_uid, ')');
+ declare rc any;
+ declare domain_id, item_id integer;
+
+ rc := 0;
+ domain_id := id[3];
+ item_id := id[4];
+ if (exists (select 1 from CAL.WA.EVENTS where E_DOMAIN_ID = domain_id and E_ID = item_id and E_SUBJECT = 'LOCK'))
+ {
+ update CAL.WA.EVENTS
+ set E_SUBJECT = 'UNLOCK',
+ E_DESCRIPTION = null
+ where E_DOMAIN_ID = domain_id
+ and E_ID = item_id;
+
+ rc := -27;
+ goto _exit;
+ }
+
+_exit:;
+ return rc;
+}
+;
+
+--| 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 what char(1),
+ in owned_tokens varchar) returns integer
+{
+ -- dbg_obj_princ ('CalDAV_DAV_IS_LOCKED (', id, what, owned_tokens, ')');
+ declare rc any;
+
+ rc := 0;
+ if (what = 'C')
+ goto _exit;
+
+ for (select E_DESCRIPTION from CAL.WA.EVENTS where E_DOMAIN_ID = id[3] and E_ID = id[4] and E_SUBJECT = 'LOCK') do
+ {
+ rc := 2;
+ if (not isnull (strstr (owned_tokens, E_DESCRIPTION)))
+ rc := 0;
+ }
+
+_exit:;
+ return rc;
+}
+;
+
+--| 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 what char(1),
+ in recursive integer) returns any
+{
+ -- dbg_obj_princ ('CalDAV_DAV_LIST_LOCKS" (', id, what, 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);
+}
+;
+
+create procedure CAL.WA.install_caldav_vhosts()
+{
+ DB.DBA.VHOST_REMOVE (lpath=>'/principals/users/');
+ DB.DBA.VHOST_DEFINE (lpath=>'/principals/users/', ppath => '/!principals/users/',
+ is_dav => 1, vsp_user => 'dba', opts => vector('noinherit', 1, 'exec_as_get', 1));
+}
+;
+
+CAL.WA.install_caldav_vhosts()
+;
+
+create procedure WS.WS."/!principals/users/" (inout path varchar, inout params any, inout lines any)
+{
+ declare user_id, inst_name varchar;
+ declare command varchar;
+ declare pos integer;
+ declare exit handler for sqlstate '*'
+ {
+ http_request_status ('HTTP/1.1 404 Not Found');
+ return;
+ };
+ whenever not found goto retr;
+ command := lines[0];
+ pos := strcasestr(command, '/principals/users/');
+ if (pos is null)
+ return;
+ user_id := subseq(command, pos + 18);
+ pos := strcasestr(user_id, 'HTTP/1.1');
+ if (pos is not null)
+ user_id := subseq(user_id, 0, pos);
+ user_id := trim(user_id, ' /');
+ pos := strchr(user_id, '@');
+ if (pos is not null)
+ user_id := subseq(user_id, 0, pos);
+ inst_name := (select CalDAV__FIXNAME (C.WAI_NAME)
+ from SYS_USERS A,
+ WA_MEMBER B,
+ WA_INSTANCE C
+ where A.U_NAME = user_id
+ 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');
+ http_request_status ('HTTP/1.1 301 Moved Permanently');
+ http_header (sprintf ('Location: /DAV/home/%s/calendars/%s/\r\n', user_id, inst_name));
+ return;
+retr:
+ http_request_status ('HTTP/1.1 404 Not Found');
+ return;
+}
+;
+
+registry_set ('/!principals/users/', 'no_vsp_recompile')
+;
diff --git a/appsrc/ODS-Calendar/sql/DET_Calendar.sql b/appsrc/ODS-Calendar/sql/DET_Calendar.sql
index 13b18fa..31b2521 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.2 2010/09/20 10:15:02 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Calendar/sql/calendar-a-api.sql b/appsrc/ODS-Calendar/sql/calendar-a-api.sql
index d074cfd..2daf379 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.6 2011/06/09 17:43:16 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
@@ -24,60 +24,180 @@ use ODS;
-------------------------------------------------------------------------------
--
-create procedure ODS.ODS_API.calendar_setting_set (
- inout settings any,
- inout options any,
- in settingName varchar,
- in settingTest any := null)
-{
- declare aValue any;
-
- aValue := get_keyword (settingName, options, get_keyword (settingName, settings));
- if (not isnull (settingTest))
- CAL.WA.test (cast (aValue as varchar), settingTest);
- CAL.WA.set_keyword (settingName, settings, aValue);
-}
-;
-
--------------------------------------------------------------------------------
+--!
+-- * \brief Change a configuration setting on the Calendar app
+-- */
+-- create procedure ODS.ODS_API.calendar_setting_set (
+-- inout settings any,
+-- inout options any,
+-- in settingName varchar,
+-- in settingTest any := null)
+-- {
+-- declare aValue any;
--
-create procedure ODS.ODS_API.calendar_setting_xml (
- in settings any,
- in settingName varchar)
-{
- return sprintf ('<%s>%s</%s>', settingName, cast (get_keyword (settingName, settings) as varchar), settingName);
-}
-;
-
--------------------------------------------------------------------------------
+-- aValue := get_keyword (settingName, options, get_keyword (settingName, settings));
+-- if (not isnull (settingTest))
+-- CAL.WA.test (cast (aValue as varchar), settingTest);
+-- CAL.WA.set_keyword (settingName, settings, aValue);
+-- }
+-- ;
--
-create procedure ODS.ODS_API.calendar_type_check (
- in inType varchar,
- in inSource varchar)
-{
- declare outType integer;
-
- if (isnull (inType))
- inType := case when (inSource like 'http://%') then 'url' else 'webdav' end;
-
- if (lcase (inType) = 'webdav')
- {
- outType := 1;
- }
- else if (lcase (inType) = 'url')
- {
- outType := 2;
- }
- else
- {
- signal ('CAL106', 'The source type must be WebDAV or URL.');
- }
- return outType;
-}
-;
-
--------------------------------------------------------------------------------
+-- -------------------------------------------------------------------------------
+-- --
+-- /**
+-- * \brief A Calendar setting encoded as XML.
+-- *
+-- * \param settings
+-- * \param settingName
+-- */
+-- create procedure ODS.ODS_API.calendar_setting_xml (
+-- in settings any,
+-- in settingName varchar)
+-- {
+-- return sprintf ('<%s>%s</%s>', settingName, cast (get_keyword (settingName, settings) as varchar), settingName);
+-- }
+-- ;
+--
+-- -------------------------------------------------------------------------------
+-- --
+-- create procedure ODS.ODS_API.calendar_type_check (
+-- in inType varchar,
+-- in inSource varchar)
+-- {
+-- declare outType integer;
+--
+-- if (isnull (inType))
+-- inType := case when (inSource like 'http://%') then 'url' else 'webdav' end;
+--
+-- if (lcase (inType) = 'webdav')
+-- {
+-- outType := 1;
+-- }
+-- else if (lcase (inType) = 'url')
+-- {
+-- outType := 2;
+-- }
+-- else
+-- {
+-- signal ('CAL106', 'The source type must be WebDAV or URL.');
+-- }
+-- return outType;
+-- }
+-- ;
--
+-- -------------------------------------------------------------------------------
+-- --
+-- /**
+-- \brief Get the details of a specific event or task.
+--
+-- \param event_id The id of the event or task. Event ids are unque across calendar instances.
+--
+-- \return A set of RDF triples detailing the event or task encoded as RDF+XML.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.get?event_id=3286&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 21:05:58 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: application/sparql-results+xml
+-- Content-Length: 7809
+--
+-- <?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://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <sioc:content xmlns:sioc="http://rdfs.org/sioc/ns#">test</sioc:content>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <sioc:has_creator xmlns:sioc="http://rdfs.org/sioc/ns#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo#this"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:description xmlns:n0pred="http://www.w3.org/2002/12/cal#">test</n0pred:description>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <rdf:type rdf:resource="http://atomowl.org/ontologies/atomrdf#Entry"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <rdf:type rdf:resource="http://www.w3.org/2002/12/cal#vevent"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <opl:isDescribedUsing xmlns:opl="http://www.openlinksw.com/schema/attribution#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286/sioc.rdf"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <atom:updated xmlns:atom="http://atomowl.org/ontologies/atomrdf#">2011-05-24T21:01:53Z</atom:updated>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:lastModified xmlns:n0pred="http://www.w3.org/2002/12/cal#" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-24T17:01:53-04:00</n0pred:lastModified>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:dtstamp xmlns:n0pred="http://www.w3.org/2002/12/cal#" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-24T17:01:53.000004-04:00</n0pred:dtstamp>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <foaf:maker xmlns:foaf="http://xmlns.com/foaf/0.1/" rdf:resource="http://ods-qa.openlinksw.com/dataspace/person/demo#this"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:dtstart xmlns:n0pred="http://www.w3.org/2002/12/cal#" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-20T00:00:00-04:00</n0pred:dtstart>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:created xmlns:n0pred="http://www.w3.org/2002/12/cal#" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-24T17:01:53-04:00</n0pred:created>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <sioc:id xmlns:sioc="http://rdfs.org/sioc/ns#">ef922cbdd8636f7829a24af90b522cf3</sioc:id>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:url xmlns:n0pred="http://www.w3.org/2002/12/cal#">http://ods-qa.openlinksw.com:80/calendar/148/home.vspx?id=3286</n0pred:url>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <atom:title xmlns:atom="http://atomowl.org/ontologies/atomrdf#">demoevent</atom:title>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:notes xmlns:n0pred="http://www.w3.org/2002/12/cal#"></n0pred:notes>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:class xmlns:n0pred="http://www.w3.org/2002/12/cal#">PUBLIC</n0pred:class>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <sioc:link xmlns:sioc="http://rdfs.org/sioc/ns#" rdf:resource="http://ods-qa.openlinksw.com:80/calendar/148/home.vspx?id=3286"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:dtend xmlns:n0pred="http://www.w3.org/2002/12/cal#" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-20T00:00:00-04:00</n0pred:dtend>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:has_services xmlns:n0pred="http://rdfs.org/sioc/services#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/services/calendar/event"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">demoevent</dc:title>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <n0pred:summary xmlns:n0pred="http://www.w3.org/2002/12/cal#">demoevent</n0pred:summary>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <sioc:has_container xmlns:sioc="http://rdfs.org/sioc/ns#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <atom:published xmlns:atom="http://atomowl.org/ontologies/atomrdf#">2011-05-24T21:01:53Z</atom:published>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <atom:author xmlns:atom="http://atomowl.org/ontologies/atomrdf#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/person/demo#this"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <rdfs:label>demoevent</rdfs:label>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <dcterms:modified xmlns:dcterms="http://purl.org/dc/terms/" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-24T17:01:53-04:00</dcterms:modified>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <dcterms:created xmlns:dcterms="http://purl.org/dc/terms/" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-24T17:01:53-04:00</dcterms:created>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3286#this">
+-- <atom:source xmlns:atom="http://atomowl.org/ontologies/atomrdf#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar"/>
+-- </rdf:Description>
+-- </rdf:RDF>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.get" (
in event_id integer) __soap_http 'text/xml'
{
@@ -104,6 +224,63 @@ create procedure ODS.ODS_API."calendar.get" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new Calendar event.
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+-- \param uid
+-- \param subject The subject/title of the event.
+-- \param description The optional description of the event, typically longer than \p subject.
+-- \param location
+-- \param attendees An optional comma-separated list of email addresses of people working on the event.
+-- \param privacy Set the new event to be public \p (1) or private \p (0) or controlled by ACL \p (2). See \ref ods_permissions_acl for details.
+-- \param tags An optional comma-separated list of tags to assign to the new event.
+-- \param event The type of the event: An all-day event \p (1) or an intervall event \p (0) for which both \p eventStart and \p eventEnd should contain a time.
+-- \param eventStart The start of the event as a datetime value. This only requires a time if the type of the event
+-- is set to intervall \p (0). Otherwise only the date is required. See also
+-- <a href="http://docs.openlinksw.com/virtuoso/coredbengine.html#DTTIMESTAMP">Virtuoso TIMESTAMP; DATE & TIME</a>.
+-- \param eventEnd The end time of the event. The same rules apply as for \p eventStart.
+-- \param eRepeat Sets the event repetition:
+-- - An empty value (the default) means no repetition
+-- - \p D1 - repeats every Nth day where \p eRepeatParam1 indicates the interval (1 for every day, 3 for every 3rd day, etc.)
+-- - \p D2 - repeats every weekday (Monday to Friday)
+-- - \p W1 - repeats every Nth week (indicated by \p eRepeatParam1) on the week days indicated by \p eRepeatParam2. This is realized as a bitmask where
+-- each day in the week corresponds to one bit. So to specify for example Mon, Tue, and Sat a value of \p 2^0+2^1+2^5=35 needs to be specified as
+-- \p eRepeatParam2.
+-- - \p M1 - repeats on every Nth day (indicated by \p eRepeatParam1) of the Mth month (indicated by \p eRepeatParam2)
+-- - \p M2 - repeats the 1st, 2nd, 3rd, 4th, or last (indicated by 1-5 in \p eRepeatParam1) Mon, Tue, ..., Sun, day, weekday, or weekend (indicated by
+-- 1-10 in \p eRepeatParam2) of every Nth month (indicated by \p eRepeatParam3).
+-- - \p Y1 - repeats every N years (indicated by \p eRepeatParam1) on the month and day indicated by \p eRepeatParam2 and \p eRepeatParam3 respectively.
+-- - \p Y2 - repeats the 1st, 2nd, 3rd, 4th, or last (indicated by 1-5 in \p eRepeatParam1) Mon, Tue, ..., Sun, day, weekday, or weekend (indicated by
+-- 1-10 in \p eRepeatParam2) of the month indicated by \p eRepeatParam3 (Jan to Dec).
+-- \param eRepeatParam1 Additional repetition parameter as detailed above.
+-- \param eRepeatParam2 Additional repetition parameter as detailed above.
+-- \param eRepeatParam3 Additional repetition parameter as detailed above.
+-- \param eRepeatUntil An optional datetime when to end the repetition of the event.
+-- \param eReminder \p 0 to disable the reminder or the time in seconds of how long before the event the reminder should be shown.
+-- \param notes Additional notes on the event. FIXME: what is the difference to description?
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code. If the event
+-- was successfully created the error code will match the id of the newly created event.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.event.new?inst_id=148&subject=test_event&description=test&eventStart=2011.05.20&eventEnd=2011.05.20&event=1&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 05:23:09 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 60
+--
+-- <result>
+-- <code>2517</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.event.new" (
in inst_id integer,
in uid varchar := null,
@@ -171,6 +348,65 @@ create procedure ODS.ODS_API."calendar.event.new" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Modify a Calendar event.
+--
+-- \param event_id The id of the Calendar event. This is returned by calendar.event.new().
+-- \param uid
+-- \param subject The subject/title of the event.
+-- \param description The optional description of the event, typically longer than \p subject.
+-- \param location
+-- \param attendees An optional comma-separated list of email addresses of people working on the event.
+-- \param privacy Set the new event to be public \p (1) or private \p (0) or controlled by ACL \p (2). See \ref ods_permissions_acl for details.
+-- \param tags An optional comma-separated list of tags to assign to the new event.
+-- \param event The type of the event: An all-day event \p (1) or an intervall event \p (0) for which both \p eventStart and \p eventEnd should contain a time.
+-- \param eventStart The start of the event as a datetime value. This only requires a time if the type of the event
+-- is set to intervall \p (0). Otherwise only the date is required. See also
+-- <a href="http://docs.openlinksw.com/virtuoso/coredbengine.html#DTTIMESTAMP">Virtuoso TIMESTAMP; DATE & TIME</a>.
+-- \param eventEnd The end time of the event. The same rules apply as for \p eventStart.
+-- \param eRepeat Sets the event repetition:
+-- - An empty value (the default) means no repetition
+-- - \p D1 - repeats every Nth day where \p eRepeatParam1 indicates the interval (1 for every day, 3 for every 3rd day, etc.)
+-- - \p D2 - repeats every weekday (Monday to Friday)
+-- - \p W1 - repeats every Nth week (indicated by \p eRepeatParam1) on the week days indicated by \p eRepeatParam2. This is realized as a bitmask where
+-- each day in the week corresponds to one bit. So to specify for example Mon, Tue, and Sat a value of \p 2^0+2^1+2^5=35 needs to be specified as
+-- \p eRepeatParam2.
+-- - \p M1 - repeats on every Nth day (indicated by \p eRepeatParam1) of the Mth month (indicated by \p eRepeatParam2)
+-- - \p M2 - repeats the 1st, 2nd, 3rd, 4th, or last (indicated by 1-5 in \p eRepeatParam1) Mon, Tue, ..., Sun, day, weekday, or weekend (indicated by
+-- 1-10 in \p eRepeatParam2) of every Nth month (indicated by \p eRepeatParam3).
+-- - \p Y1 - repeats every N years (indicated by \p eRepeatParam1) on the month and day indicated by \p eRepeatParam2 and \p eRepeatParam3 respectively.
+-- - \p Y2 - repeats the 1st, 2nd, 3rd, 4th, or last (indicated by 1-5 in \p eRepeatParam1) Mon, Tue, ..., Sun, day, weekday, or weekend (indicated by
+-- 1-10 in \p eRepeatParam2) of the month indicated by \p eRepeatParam3 (Jan to Dec).
+-- \param eRepeatParam1 Additional repetition parameter as detailed above.
+-- \param eRepeatParam2 Additional repetition parameter as detailed above.
+-- \param eRepeatParam3 Additional repetition parameter as detailed above.
+-- \param eRepeatUntil An optional datetime when to end the repetition of the event.
+-- \param eReminder \p 0 to disable the reminder or the time in seconds of how long before the event the reminder should be shown.
+-- \param notes Additional notes on the event. FIXME: what is the difference to description?
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code. If the event
+-- was successfully modified the error code will match the id of the event.
+--
+-- \sa calendar.event.create()
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.event.edit?event_id=2517&subject=test_event2&description=test2&eventSt
+-- art=2011.05.20&eventEnd=2011.06.20&event=1&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 05:44:36 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 60
+--
+-- <result>
+-- <code>2517</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.event.edit" (
in event_id integer,
in uid varchar := null,
@@ -240,6 +476,56 @@ create procedure ODS.ODS_API."calendar.event.edit" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new Calendar Task
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+-- \param uid
+-- \param subject The subject/title of the task.
+-- \param description The optional description of the task, typically longer than \p subject.
+-- \param attendees An optional comma-separated list of email addresses of people working on the task.
+-- \param privacy Set the new task to be public \p (1) or private \p (0) or controlled by ACL \p (2). See \ref ods_permissions_acl for details.
+-- \param tags An optional comma-separated list of tags to assign to the new task.
+-- \param eventStart The start of the task as a datetime value. See also
+-- <a href="http://docs.openlinksw.com/virtuoso/coredbengine.html#DTTIMESTAMP">Virtuoso TIMESTAMP; DATE & TIME</a>.
+-- \param eventEnd The end time of the task. The same rules apply as for \p eventStart.
+-- \param priority The priority of the task.
+-- - \p 1 - highest,
+-- - \p 2 - high
+-- - \p 3 - normal,
+-- - \p 4 - low
+-- - \p 5 - lowest
+-- \param status The task status. Can be one of:
+-- - \p "Not Started"
+-- - \p "In Progress"
+-- - \p "Completed"
+-- - \p "Waiting"
+-- - \p "Deferred"
+-- \param complete The completion state as percentage (0%, 25%, 50%, 75%, 100%)
+-- \param completed The time when the task has been completed.
+-- \param notes Additional optional notes.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code. If the task
+-- was successfully created the error code will match the id of the event.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.task.new?inst_id=148&subject=test_task&description=test&eventStart=2011.05.20&eventEnd=2011.05.20&event=1&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 05:46:05 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 60
+--
+-- <result>
+-- <code>2518</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.task.new" (
in inst_id integer,
in uid varchar := null,
@@ -299,6 +585,56 @@ create procedure ODS.ODS_API."calendar.task.new" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new Calendar Task
+--
+-- \param event_id The id of the Calendar task. This is returned by calendar.task.new().
+-- \param uid
+-- \param subject The subject/title of the task.
+-- \param description The optional description of the task, typically longer than \p subject.
+-- \param attendees An optional comma-separated list of email addresses of people working on the task.
+-- \param privacy Set the new task to be public \p (1) or private \p (0) or controlled by ACL \p (2). See \ref ods_permissions_acl for details.
+-- \param tags An optional comma-separated list of tags to assign to the new task.
+-- \param eventStart The start of the task as a datetime value. See also
+-- <a href="http://docs.openlinksw.com/virtuoso/coredbengine.html#DTTIMESTAMP">Virtuoso TIMESTAMP; DATE & TIME</a>.
+-- \param eventEnd The end time of the task. The same rules apply as for \p eventStart.
+-- \param priority The priority of the task.
+-- - \p 1 - highest,
+-- - \p 2 - high
+-- - \p 3 - normal,
+-- - \p 4 - low
+-- - \p 5 - lowest
+-- \param status The task status. Can be one of:
+-- - \p "Not Started"
+-- - \p "In Progress"
+-- - \p "Completed"
+-- - \p "Waiting"
+-- - \p "Deferred"
+-- \param complete The completion state as percentage (0%, 25%, 50%, 75%, 100%)
+-- \param completed The time when the task has been completed.
+-- \param notes Additional optional notes.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code. If the task
+-- was successfully modified the error code will match the id of the event.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.task.edit?event_id=2518&subject=test_task2&description=test2&eventStart=2011.05.20&eventEnd=2011.06.20&event=1&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 05:57:14 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 60
+--
+-- <result>
+-- <code>2518</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.task.edit" (
in event_id integer,
in uid varchar := null,
@@ -360,6 +696,31 @@ create procedure ODS.ODS_API."calendar.task.edit" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Delete a Calendar event or task.
+--
+-- \param event_id The id of the event or task to delete.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.delete?event_id=2520&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 05:59:10 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.delete" (
in event_id integer) __soap_http 'text/xml'
{
@@ -387,6 +748,41 @@ create procedure ODS.ODS_API."calendar.delete" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Import an iCal calendar.
+--
+-- ODS Calendar can import an complete iCal file into a Calendar app instance. This iCal file
+-- can be located in the WebDAV tree or at any public URL.
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+-- \param source The source URL or path depending on the \p sourceType.
+-- \param sourceType Can be one of \p "url" or \p "webdav".
+-- \param userName Optional user name required to access the source. Defaults to the calling user credentials.
+-- \param userPassword Optional password required to access the source. Defaults to the calling user credentials.
+-- \param events If \p 1 events will be imported.
+-- \param tasks If \p 1 tasks will be imported.
+-- \param tags An optional comma-separated list of tags to assign to the imported events and tasks.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.import?inst_id=148&source=http://mysportscal.com/Files_iCal_CSV/iCal_NFL_2010-2011/NFL_2010_complete_season.ics&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 06:29:00 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.import" (
in inst_id integer,
in source varchar,
@@ -455,6 +851,90 @@ create procedure ODS.ODS_API."calendar.import" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Export part of the calendar to into iCal.
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+-- \param events If \p 1 events will be exported.
+-- \param tasks If \p 1 tasks will be exported.
+-- \param periodFrom Optional start time. If given no events or tasks before that time will be exported.
+-- \param periodTo Optional end time. If given no events or tasks after that time will be exported.
+-- \param tagsInclude Optional comma-separated list of tags to include in the export. If given only events and tasks
+-- tagged thusly will be exported.
+-- \param tagsExclude Optional comma-separated list of tags to exclude from the export. If given events and tasks
+-- tagged thusly are excluded from the export.
+--
+-- \return The requested events and tasks encoded in the iCal format.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.export?inst_id=148&events=0&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 06:02:54 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/plain; charset="UTF-8"
+-- Content-Length: 15381
+--
+-- BEGIN:VCALENDAR
+-- VERSION:2.0
+-- BEGIN:VTIMEZONE
+-- TZID:Etc/GMT
+-- BEGIN:STANDARD
+-- TZOFFSETFROM:+0000
+-- TZOFFSETTO:+0000
+-- TZNAME:GMT +00:00
+-- DTSTART:19700101T000000
+-- END:STANDARD
+-- END:VTIMEZONE
+--
+-- BEGIN:VEVENT
+-- UID:4A635748-E5B9-11DF-A902-EA37E85308F4 at domU-12-31-39-02-F9-62.compute-1.internal
+-- URL:http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/1789
+-- DTSTAMP:20110520T060254Z
+-- CREATED:20101101T130942Z
+-- LAST-MODIFIED:20101108T133130Z
+-- SUMMARY:test
+-- DESCRIPTION:Simple event test.
+-- LOCATION:Boston
+-- DTSTART;TZID=Etc/GMT:20101101T150000
+-- DTEND;TZID=Etc/GMT:20101125T220000
+-- BEGIN:VALARM
+-- TRIGGER:-PT604800S
+-- ACTION:DISPLAY
+-- END:VALARM
+-- CLASS:SHARED
+-- END:VEVENT
+--
+-- BEGIN:VEVENT
+-- UID:event_16344435 at meetup.com
+-- URL:http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/2470
+-- DTSTAMP:20110520T060254Z
+-- CREATED:20110131T180658Z
+-- LAST-MODIFIED:20110131T180600Z
+-- SUMMARY:Linked Data Meetup @ Strata Conference
+-- DESCRIPTION:Linked Data Meetup
+--
+-- Santa Clara, CA 95054 - USA
+--
+-- Wednesday, February 2 at 9:30 PM
+--
+-- Photo: http://photos2.meetupstatic.com/photos/event/6/0/8/5/event_9084709.jpeg
+--
+-- Attending: 6
+--
+-- Details: http://www.meetup.com/linkeddata/events/16344435/
+-- LOCATION:Hyatt Regency Santa Clara - 5101 Great American Parkway - Santa Clara, CA 95054 - USA
+-- DTSTART;TZID=Etc/GMT:20110203T023000
+-- DTEND;TZID=Etc/GMT:20110203T043000
+-- CLASS:PUBLIC
+-- END:VEVENT
+--
+-- ....
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.export" (
in inst_id integer,
in events integer := 1,
@@ -486,6 +966,93 @@ create procedure ODS.ODS_API."calendar.export" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get details of a comment.
+--
+-- \param comment_id The id of the comment.
+--
+-- \return The details of the comment encoded as RDF+XML triples.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.comment.get?comment_id=4&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 07:04:08 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: application/sparql-results+xml
+-- Content-Length: 5401
+--
+-- <?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://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <sioc:reply_of xmlns:sioc="http://rdfs.org/sioc/ns#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283#this"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <rdf:type rdf:resource="http://rdfs.org/sioc/ns#Item"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <atom:published xmlns:atom="http://atomowl.org/ontologies/atomrdf#">2011-05-20T07:03:15Z</atom:published>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <dcterms:created xmlns:dcterms="http://purl.org/dc/terms/" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-20T03:03:15.000002-04:00</dcterms:created>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <n0pred:has_services xmlns:n0pred="http://rdfs.org/sioc/services#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/services/calendar/item/comment"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <atom:updated xmlns:atom="http://atomowl.org/ontologies/atomrdf#">2011-05-20T07:03:15Z</atom:updated>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <sioc:has_container xmlns:sioc="http://rdfs.org/sioc/ns#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test</dc:title>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <rdf:type rdf:resource="http://rdfs.org/sioc/types#Comment"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <rdfs:label>test</rdfs:label>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <atom:source xmlns:atom="http://atomowl.org/ontologies/atomrdf#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <rdf:type rdf:resource="http://rdfs.org/sioc/ns#Post"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <sioc:id xmlns:sioc="http://rdfs.org/sioc/ns#">b207403243d98571a0a72876aa34a0f9</sioc:id>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <foaf:maker xmlns:foaf="http://xmlns.com/foaf/0.1/" rdf:resource="http://openlinksw.com"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <dcterms:modified xmlns:dcterms="http://purl.org/dc/terms/" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-20T03:03:15.000002-04:00</dcterms:modified>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <opl:isDescribedUsing xmlns:opl="http://www.openlinksw.com/schema/attribution#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4/sioc.rdf"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <rdf:type rdf:resource="http://atomowl.org/ontologies/atomrdf#Entry"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <atom:title xmlns:atom="http://atomowl.org/ontologies/atomrdf#">test</atom:title>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <sioc:link xmlns:sioc="http://rdfs.org/sioc/ns#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/4">
+-- <sioc:content xmlns:sioc="http://rdfs.org/sioc/ns#">simple</sioc:content>
+-- </rdf:Description>
+-- </rdf:RDF>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.comment.get" (
in comment_id integer) __soap_http 'text/xml'
{
@@ -513,6 +1080,43 @@ _exit:
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new comment on an event or task.
+--
+-- Comments can be put in threads, ie. a comment can have a parent comment. In that
+-- case it is considered a reply to the parent comment.
+--
+-- \param event_id The id of the event or task to comment on.
+-- \param parent_id The optional id of the comment the new comment should reply to.
+-- \param title The title of the comment.
+-- \param text The text body of the comment.
+-- \param name The name of the commenter.
+-- \param email The email address of the commenter.
+-- \param url An optional URL to identify the commenter.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+-- If successful the error code matches the id of the newly created comment.
+--
+-- \sa calendar.comment.delete
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.comment.new?event_id=3283&title=test&text=simple&name=Kate&email=kate@yahoo.com&url=http://openlinksw.com&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 07:03:15 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>4</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.comment.new" (
in event_id integer,
in parent_id integer := null,
@@ -562,6 +1166,33 @@ create procedure ODS.ODS_API."calendar.comment.new" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Delete a comment.
+--
+-- \param comment_id The numerical id of the comment to delete.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa calendar.comment.new
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.comment.delete?comment_id=4&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 07:07:00 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.comment.delete" (
in comment_id integer) __soap_http 'text/xml'
{
@@ -590,6 +1221,48 @@ create procedure ODS.ODS_API."calendar.comment.delete" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get details of an annotation.
+--
+-- \param annotation_id The id of the annotation.
+--
+-- \return The details of the annotation encoded as RDF+XML triples
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.annotation.get?annotation_id=2&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 06:46:30 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: application/sparql-results+xml
+-- Content-Length: 1943
+--
+-- <?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://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/annotation/2">
+-- <n0pred:has_services xmlns:n0pred="http://rdfs.org/sioc/services#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/services/calendar/item/annotation"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/annotation/2">
+-- <n0pred:annotates xmlns:n0pred="http://www.w3.org/2000/10/annotation-ns#" rdf:resource="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283#this"/>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/annotation/2">
+-- <n0pred:body xmlns:n0pred="http://www.w3.org/2000/10/annotation-ns#">test</n0pred:body>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/annotation/2">
+-- <n0pred:modifiedxmlns:n0pred="http://www.w3.org/2000/10/annotation-ns#" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-20T02:45:24-04:00</n0pred:modified>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/annotation/2">
+-- <n0pred:created xmlns:n0pred="http://www.w3.org/2000/10/annotation-ns#" rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2011-05-20T02:45:24-04:00</n0pred:created>
+-- </rdf:Description>
+-- <rdf:Description rdf:about="http://ods-qa.openlinksw.com/dataspace/demo/calendar/Demo%20User%27s%20Calendar/Event/3283/annotation/2">
+-- <n0pred:author xmlns:n0pred="http://www.w3.org/2000/10/annotation-ns#">John</n0pred:author>
+-- </rdf:Description>
+-- </rdf:RDF>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.annotation.get" (
in annotation_id integer) __soap_http 'text/xml'
{
@@ -618,6 +1291,38 @@ _exit:
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new annotation.
+--
+-- Calendar events and tasks can be annotated. An annotation is comparable to a comment.
+--
+-- \param event_id The id of the event or task to annotate.
+-- \param author The name of the author of the annotation.
+-- \param body The content of the annotation.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+-- If successful the returned error code matches the new annotation's numerical id.
+--
+-- \sa annotation.delete
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.annotation.new?event_id=3283&author=John&body=test&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 06:45:24 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>2</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.annotation.new" (
in event_id integer,
in author varchar,
@@ -649,6 +1354,38 @@ create procedure ODS.ODS_API."calendar.annotation.new" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create an annotation claim.
+--
+-- An annotation claim is a triple which makes a statement over the annotation.
+--
+-- FIXME: why do we only have a claim method for annotations and not one for any resource?
+--
+-- \param annotation_id The id of the annotation as returned by annotation.new().
+-- \param claimIri The IRI of the annotation. FIXME: this seems redundant seeing that we also put in the id
+-- \param claimRelation The property to be stored.
+-- \param claimValue The value of the property.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.annotation.claim?annotation_id=2&claimIri=http://mytest.com&claimRelation=test&claimValue=demo&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 07:00:18 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.annotation.claim" (
in annotation_id integer,
in claimIri varchar,
@@ -684,6 +1421,33 @@ create procedure ODS.ODS_API."calendar.annotation.claim" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Delete an annotation.
+--
+-- \param annotation_id The id of the annotation to delete as returned by annotation.new().
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa annotation.new
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.annotation.delete?annotation_id=2&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 07:01:12 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.annotation.delete" (
in annotation_id integer) __soap_http 'text/xml'
{
@@ -712,6 +1476,57 @@ create procedure ODS.ODS_API."calendar.annotation.delete" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new calendar publication.
+--
+-- ODS Calendar allows to publish its contents to WebDAV, CalDAV, or a writable URL. This method
+-- allows to create new publications which are then updated according to the settings.
+--
+-- The published file contains the calendar's events and/or tasks in iCal format.
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+-- \param name A user-readable name for the new publication.
+-- \param updateType Can be one of:
+-- - \p 1 - The publication is updated manually via calendar.publication.sync()
+-- - \p 2 - The publication is updated automatically whenever an entry changes.
+-- - \p 3 - The publication is updated based on the schedule set via \p updatePeriod and \p updateFreq.
+-- \param updatePeriod Can be one of \p "daily" and \p "hourly". Only used for the scheduled updating.
+-- \param updateFreq Specifies the frequency of the scheduled updates. Depending on the value of
+-- \p updatePeriod the publication is updated every N days or hours.
+-- \param destinationType Can be one of the following:
+-- - \p "webdav" - In this case the \p destination is a WebDAV path.
+-- - \p "caldav" - In this case the \p destination is a CalDAV path.
+-- - \p "url" - In this case the \p destination is a URL.
+-- \param destination The location where the events and tasks should be published (depends on the value of \p destinationType)
+-- \param userName An optional userName which might be required to access the \p destination.
+-- \param userPassword The password for the given \p userName.
+-- \param events If \p 1 events are published.
+-- \param tasks If \p 1 tasks are published.
+--
+-- FIXME: the UI provides "mails to attendees" configuration.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa calendar.publication.sync()
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.publication.new?inst_id=148&name=demo_pub&destination=DAV/home/demo/Public/Demo_PUB_Calendar.ics&userName=demo&userPassword=demo&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh9ba13"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 21:42:38 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 58
+--
+-- <result>
+-- <code>20</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.publication.new" (
in inst_id integer,
in name varchar,
@@ -767,6 +1582,42 @@ create procedure ODS.ODS_API."calendar.publication.new" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get details about a calendar publication.
+--
+-- Used to retrieve details of a publication added via calendar.publication.new().
+--
+-- \param publication_id The numerical id of the publication.
+--
+-- \return The configuration of the given publication encoded as XML.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.publication.get?publication_id=20&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 21:45:17 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 385
+--
+-- <publication id="20">
+-- <name>demo_pub</name>
+-- <updatePeriod>daily</updatePeriod>
+-- <updateFreq>1</updateFreq>
+-- <destinationType>WebDAV</destinationType>
+-- <destination>DAV/home/demo/Public/Demo_PUB_Calendar.ics</destination>
+-- <userName>demo</userName>
+-- <userPassword>******</userName>
+-- <options>
+-- <events>1</events>
+-- <tasks>1</tasks>
+-- </options>
+-- </publication>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.publication.get" (
in publication_id integer) __soap_http 'text/xml'
{
@@ -826,6 +1677,57 @@ create procedure ODS.ODS_API."calendar.publication.get" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Modify a calendar publication.
+--
+-- ODS Calendar allows to publish its contents to WebDAV, CalDAV, or a writable URL. This method
+-- allows to create new publications which are then updated according to the settings.
+--
+-- The published file contains the calendar's events and/or tasks in iCal format.
+--
+-- \param publication_id The id of the Calendar publication as returned by calendar.publication.new().
+-- \param name A user-readable name for the publication. FIXME: why is this not optional?
+-- \param updateType Can be one of:
+-- - \p 1 - The publication is updated manually via calendar.publication.sync()
+-- - \p 2 - The publication is updated automatically whenever an entry changes.
+-- - \p 3 - The publication is updated based on the schedule set via \p updatePeriod and \p updateFreq.
+-- \param updatePeriod Can be one of \p "daily" and \p "hourly". Only used for the scheduled updating.
+-- \param updateFreq Specifies the frequency of the scheduled updates. Depending on the value of
+-- \p updatePeriod the publication is updated every N days or hours.
+-- \param destinationType Can be one of the following:
+-- - \p "webdav" - In this case the \p destination is a WebDAV path.
+-- - \p "caldav" - In this case the \p destination is a CalDAV path.
+-- - \p "url" - In this case the \p destination is a URL.
+-- \param destination The location where the events and tasks should be published (depends on the value of \p destinationType)
+-- \param userName An optional userName which might be required to access the \p destination.
+-- \param userPassword The password for the given \p userName.
+-- \param events If \p 1 events are published.
+-- \param tasks If \p 1 tasks are published.
+--
+-- FIXME: the UI provides "mails to attendees" configuration.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa calendar.publication.new()
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.publication.edit?publication_id=20&name=testpub3&destination=DAV/home/demo/Public/Demo_PUB_Calendar.ics&userName=demo&userPassword=demo&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 21:56:16 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 58
+--
+-- <result>
+-- <code>20</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.publication.edit" (
in publication_id integer,
in name varchar,
@@ -887,6 +1789,35 @@ create procedure ODS.ODS_API."calendar.publication.edit" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Synchronize a calendar publication.
+--
+-- Manually synchonizes a calendar publication created with calendar.publication.new(). This is required
+-- if the publication has been configured to be manually updated. However, it can also be used to force an
+-- update on publications with a scheduled update interval.
+--
+-- \param publication_id The numerical id of the publication to update.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.publication.sync?publication_id=20&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 21:57:58 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.publication.sync" (
in publication_id integer) __soap_http 'text/xml'
{
@@ -917,6 +1848,31 @@ create procedure ODS.ODS_API."calendar.publication.sync" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Delete a calendar publication.
+--
+-- \param publication_id The numerical id of the publication created via calendar.publication.new().
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.publication.delete?publication_id=13&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 08:05:56 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.publication.delete" (
in publication_id integer) __soap_http 'text/xml'
{
@@ -946,6 +1902,51 @@ create procedure ODS.ODS_API."calendar.publication.delete" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new calendar subscription.
+--
+-- ODS Calendar can subscribe to external calendars and integrate the events and tasks into
+-- its own. This function allows to set up such a subscription to an iCal file.
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+-- \param name A user-readable name for the new subscription.
+-- \param updateType Can be one of:
+-- - \p 1 - The subscription is updated manually via calendar.subscription.sync()
+-- - \p 2 - The subscription is updated based on the schedule set via \p updatePeriod and \p updateFreq.
+-- \param updatePeriod Can be one of \p "daily" and \p "hourly". Only used for the scheduled updating.
+-- \param updateFreq Specifies the frequency of the scheduled updates. Depending on the value of
+-- \p updatePeriod the subscription is updated every N days or hours.
+-- \param sourceType Can be one of the following:
+-- - \p "webdav" - In this case the \p source is a WebDAV path.
+-- - \p "caldav" - In this case the \p source is a CalDAV path.
+-- - \p "url" - In this case the \p source is a URL.
+-- \param source The location from where the events and tasks should be fetched (depends on the value of \p sourceType)
+-- \param userName An optional userName which might be required to access the \p source.
+-- \param userPassword The password for the given \p userName.
+-- \param events If \p 1 events are included.
+-- \param tasks If \p 1 tasks are included.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+-- If successful the error code matches the numerical id of the newly created subscription.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.subscription.new?inst_id=148&name=testsubscr23&source=DAV/home/demo/Public/Demo_PUB_Calendar.ics&destinationType=WebDAV&userName=demo&userPassword=demo&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 21:59:21 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 58
+--
+-- <result>
+-- <code>21</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.subscription.new" (
in inst_id integer,
in name varchar,
@@ -1001,6 +2002,42 @@ create procedure ODS.ODS_API."calendar.subscription.new" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get details about a calendar subscription.
+--
+-- Used to retrieve details of a subscription added via calendar.subscription.new().
+--
+-- \param subscription_id The numerical id of the subscription.
+--
+-- \return The configuration of the given subscription encoded as XML.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.subscription.get?subscription_id=21&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 22:00:34 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 369
+--
+-- <publication id="21">
+-- <name>testsubscr23</name>
+-- <updatePeriod>daily</updatePeriod>
+-- <updateFreq>1</updateFreq>
+-- <sourceType>WebDAV</sourceType>
+-- <source>DAV/home/demo/Public/Demo_PUB_Calendar.ics</source>
+-- <userName>demo</userName>
+-- <userPassword>******</userName>
+-- <options>
+-- <events>1</events>
+-- <tasks>1</tasks>
+-- </options>
+-- </publication>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.subscription.get" (
in subscription_id integer) __soap_http 'text/xml'
{
@@ -1060,6 +2097,50 @@ create procedure ODS.ODS_API."calendar.subscription.get" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Modify a calendar subscription.
+--
+-- ODS Calendar can subscribe to external calendars and integrate the events and tasks into
+-- its own. This function allows to set up such a subscription to an iCal file.
+--
+-- \param subscription_id The id of the Calendar subscription as returned by calendar.subscription.new().
+-- \param name A user-readable name for the new subscription.
+-- \param updateType Can be one of:
+-- - \p 1 - The subscription is updated manually via calendar.subscription.sync()
+-- - \p 2 - The subscription is updated based on the schedule set via \p updatePeriod and \p updateFreq.
+-- \param updatePeriod Can be one of \p "daily" and \p "hourly". Only used for the scheduled updating.
+-- \param updateFreq Specifies the frequency of the scheduled updates. Depending on the value of
+-- \p updatePeriod the subscription is updated every N days or hours.
+-- \param sourceType Can be one of the following:
+-- - \p "webdav" - In this case the \p source is a WebDAV path.
+-- - \p "caldav" - In this case the \p source is a CalDAV path.
+-- - \p "url" - In this case the \p source is a URL.
+-- \param source The location from where the events and tasks should be fetched (depends on the value of \p sourceType)
+-- \param userName An optional userName which might be required to access the \p source.
+-- \param userPassword The password for the given \p userName.
+-- \param events If \p 1 events are included.
+-- \param tasks If \p 1 tasks are included.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.subscription.edit?subscription_id=21&name=testsubscr24&source=DAV/home/demo/Public/Demo_PUB_Calendar.ics&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 22:01:52 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 58
+--
+-- <result>
+-- <code>21</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.subscription.edit" (
in subscription_id integer,
in name varchar,
@@ -1121,6 +2202,35 @@ create procedure ODS.ODS_API."calendar.subscription.edit" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Synchronize a calendar subscription.
+--
+-- Manually synchonizes a calendar subscription created with calendar.subscription.new(). This is required
+-- if the subscription has been configured to be manually updated. However, it can also be used to force an
+-- update on subscriptions with a scheduled update interval.
+--
+-- \param subscription_id The numerical id of the subscription to update.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.subscription.sync?subscription_id=19&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 24 May 2011 22:40:59 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.subscription.sync" (
in subscription_id integer) __soap_http 'text/xml'
{
@@ -1151,6 +2261,31 @@ create procedure ODS.ODS_API."calendar.subscription.sync" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Delete a calendar subscription.
+--
+-- \param subscription_id The numerical id of the subscription created via calendar.subscription.new().
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.subscription.delete?subscription_id=17&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 08:25:45 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.subscription.delete" (
in subscription_id integer) __soap_http 'text/xml'
{
@@ -1180,6 +2315,40 @@ create procedure ODS.ODS_API."calendar.subscription.delete" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Create a new calendar upstream.
+--
+-- FIXME: what is an upstream?
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+-- \param name A human-readable name for the new upstream.
+-- \param source
+-- \param userName
+-- \param userPassword
+-- \param tagsInclude
+-- \param tagsExclude
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+-- If successful the error code matches the id of the newly created upstream.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.upstream.new?inst_id=148&name=testups&source=http://myopenlink.net/dataspace/test1/calendar/demo%27s%20Calendar/atom-pub&userName=demo&userPassword=demo&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 08:28:58 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/plain; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.upstream.new" (
in inst_id integer,
in name varchar,
@@ -1228,6 +2397,39 @@ create procedure ODS.ODS_API."calendar.upstream.new" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Modify a calendar upstream.
+--
+-- FIXME: what is an upstream?
+--
+-- \param upstream_id The numerical id of the upstream to modify.
+-- \param name A human-readable name for the new upstream.
+-- \param source
+-- \param userName
+-- \param userPassword
+-- \param tagsInclude
+-- \param tagsExclude
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.upstream.edit?upstream_id=1&name=testups2&source=http://myopenlink.net/dataspace/test1/calendar/demo%27s%20Calendar/atom-pub&userName=demo&userPassword=demo&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 08:30:08 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/plain; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.upstream.edit" (
in upstream_id integer,
in name varchar,
@@ -1283,6 +2485,31 @@ create procedure ODS.ODS_API."calendar.upstream.edit" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Delete a calendar upstream.
+--
+-- \param upstream_id The numerical id of the upstream created via calendar.upstream.new().
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.upstream.delete?upstream_id=1&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 08:31:09 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.upstream.delete" (
in upstream_id integer) __soap_http 'text/xml'
{
@@ -1312,6 +2539,55 @@ create procedure ODS.ODS_API."calendar.upstream.delete" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Configure a ODS Calendar instance.
+--
+-- FIXME: most of these options are only valid for the UI which means they should not be in the REST API.
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+-- \param options A comma-separated list of \p "key=value" pairs. Supported keys are:
+-- - chars
+-- - rows
+-- - atomVersion
+-- - defaultView
+-- - weekStarts
+-- - timeFormat
+-- - dateFormat
+-- - timeZone
+-- - showTasks
+-- - conv
+-- - conv_init
+-- - event_E_UPDATED
+-- - event_E_CREATED
+-- - event_E_LOCATION
+-- - task_E_STATUS
+-- - task_E_PRIORITY
+-- - task_E_START
+-- - task_E_END
+-- - task_E_COMPLETED
+-- - task_E_UPDATED
+-- - task_E_CREATED
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.options.set?inst_id=148&options=rows%3D10&user_name=demo&password_ha
+-- sh=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 08:09:04 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.options.set" (
in inst_id int, in options any) __soap_http 'text/xml'
{
@@ -1386,6 +2662,50 @@ create procedure ODS.ODS_API."calendar.options.set" (
-------------------------------------------------------------------------------
--
+--!
+-- \brief Get the configuration of a ODS Calendar instance.
+--
+-- \param inst_id The id of the Calendar app instance. See \ref ods_instance_id for details.
+--
+-- \return The configuration settings encoded as XML.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://ods-qa.openlinksw.com/ods/api/calendar.options.get?inst_id=148&user_name=demo&password_hash=921q783d9e4cbdf5cvs343dafdfvrf6a4fh"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.02.3129 (Linux) x86_64-generic-linux-glibc25-64 VDB
+-- Connection: Keep-Alive
+-- Date: Fri, 20 May 2011 08:10:08 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 625
+--
+-- <settings>
+-- <chars>60</chars>
+-- <rows>10</rows>
+-- <atomVersion>1.0</atomVersion>
+-- <defaultView>week</defaultView>
+-- <weekStarts>m</weekStarts>
+-- <timeFormat>e</timeFormat>
+-- <dateFormat>dd.MM.yyyy</dateFormat>
+-- <timeZone>0</timeZone>
+-- <showTasks>0</showTasks>
+-- <conv>1</conv>
+-- <conv_init>0</conv_init>
+-- <event_E_UPDATED>0</event_E_UPDATED>
+-- <event_E_CREATED>0</event_E_CREATED>
+-- <event_E_LOCATION>0</event_E_LOCATION>
+-- <task_E_STATUS>0</task_E_STATUS>
+-- <task_E_PRIORITY>0</task_E_PRIORITY>
+-- <task_E_START>0</task_E_START>
+-- <task_E_END>0</task_E_END>
+-- <task_E_COMPLETED>0</task_E_COMPLETED>
+-- <task_E_UPDATED>0</task_E_UPDATED>
+-- <task_E_CREATED>0</task_E_CREATED>
+-- </settings>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."calendar.options.get" (
in inst_id int) __soap_http 'text/xml'
{
diff --git a/appsrc/ODS-Calendar/sql/calendar-a-code.sql b/appsrc/ODS-Calendar/sql/calendar-a-code.sql
index f2cadb2..529be3c 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.33 2011/08/01 14:12:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -732,6 +732,11 @@ 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;
}
;
@@ -739,7 +744,7 @@ create procedure CAL.WA.domain_update (
-------------------------------------------------------------------------------
--
create procedure CAL.WA.domain_owner_id (
- inout domain_id integer)
+ in domain_id integer)
{
return (select TOP 1 A.WAM_USER from WA_MEMBER A, WA_INSTANCE B where A.WAM_MEMBER_TYPE = 1 and A.WAM_INST = B.WAI_NAME and B.WAI_ID = domain_id);
}
@@ -748,7 +753,7 @@ create procedure CAL.WA.domain_owner_id (
-------------------------------------------------------------------------------
--
create procedure CAL.WA.domain_owner_name (
- inout domain_id integer)
+ in domain_id integer)
{
return (select TOP 1 C.U_NAME from WA_MEMBER A, WA_INSTANCE B, SYS_USERS C where A.WAM_MEMBER_TYPE = 1 and A.WAM_INST = B.WAI_NAME and B.WAI_ID = domain_id and C.U_ID = A.WAM_USER);
}
@@ -887,6 +892,15 @@ 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,
@@ -1490,6 +1504,23 @@ _again:
-------------------------------------------------------------------------------
--
+create procedure CAL.WA.http_error (
+ in _header any,
+ in _silent integer := 0)
+{
+ if (_header[0] like 'HTTP/1._ 4__ %' or _header[0] like 'HTTP/1._ 5__ %')
+ {
+ if (not _silent)
+ signal ('22023', trim (_header[0], '\r\n'));
+
+ return 0;
+ }
+ return 1;
+}
+;
+
+-------------------------------------------------------------------------------
+--
create procedure CAL.WA.xslt_root()
{
declare sHost varchar;
@@ -1756,6 +1787,18 @@ 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)
@@ -3328,9 +3371,10 @@ create procedure CAL.WA.d_encode (
create procedure CAL.WA.test_clear (
in S any)
{
- declare N integer;
+ S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
+ S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
- return substring (S, 1, coalesce(strstr(S, '<>'), length (S)));
+ return S;
}
;
@@ -3494,7 +3538,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)))
@@ -3971,6 +4015,16 @@ create procedure CAL.WA.settings_set (
-- Events
--
-----------------------------------------------------------------------------------------
+create procedure CAL.WA.event_sioc_iri (
+ in domain_id varchar,
+ in event_id integer)
+{
+ return CAL.WA.iri_fix (SIOC..calendar_event_iri (domain_id, event_id));
+}
+;
+
+-----------------------------------------------------------------------------------------
+--
create procedure CAL.WA.event_kind (
in id integer)
{
@@ -4194,7 +4248,8 @@ create procedure CAL.WA.event_update_acl (
{
update CAL.WA.EVENTS
set E_ACL = acl
- where E_ID = id;
+ where E_ID = id
+ and E_PRIVACY = 2;
}
;
@@ -5550,18 +5605,26 @@ 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, 0);
- tzOffset := get_keyword ('standartTo', tzObject);
+ tzObject := dict_get (tzDict, tzID, null);
+ if (isnull (tzObject))
+ goto _exit;
+
+ tzOffset := get_keyword ('standartFrom', tzObject);
+ if (isnull (tzOffset))
+ goto _exit;
+
tzStartRRule := get_keyword ('daylightRRule', tzObject);
- if (not isnull (tzStartRRule))
- {
+ if (isnull (tzStartRRule))
+ goto _exit;
+
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;
}
;
@@ -5661,7 +5724,8 @@ create procedure CAL.WA.vcal_datetime2str (
create procedure CAL.WA.vcal_date2utc (
in dt datetime)
{
- return CAL.WA.dt_format (dateadd ('minute', -timezone (now ()), dt), 'YMDTHNSZ');
+ return CAL.WA.dt_format (dt, 'YMDTHNSZ');
+ --return CAL.WA.dt_format (dateadd ('minute', -timezone (now ()), dt), 'YMDTHNSZ');
}
;
@@ -6034,16 +6098,24 @@ create procedure CAL.WA.export_vcal_line (
inout sStream any)
{
declare prefix varchar;
+ declare tmp any;
if (is_empty_or_null (value))
return;
prefix := '';
- value := sprintf ('%s:%s', property, replace (cast (value as varchar), '\n', '\\n'));
- while (length (value) > length (prefix))
+ tmp := CAL.WA.utf2wide(sprintf ('%s:%s', property, replace(replace (cast (value as varchar), '\n', '\\n'), '\r', '')));
+ while (length (tmp) > length (prefix))
{
- http (subseq (value, 0, 73) || '\r\n', sStream);
- value := prefix || subseq (value, 73);
+ 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 := '';
+ }
prefix := ' ';
}
}
@@ -6090,6 +6162,7 @@ create procedure CAL.WA.export_vcal (
-- start
http ('BEGIN:VCALENDAR\r\n', sStream);
+ http (sprintf ('PRODID:-//OpenLink Software Ltd//ODS Calendar %s//EN\r\n', registry_get('calendar_version')), sStream);
http ('VERSION:2.0\r\n', sStream);
http (sprintf ('X-WR-CALNAME:%s\r\n', CAL.WA.domain_name (domain_id)), sStream);
@@ -6474,6 +6547,101 @@ create procedure CAL.WA.import_vcal_attendees (
}
;
+--------------------------------------------------------------------------------
+--
+create procedure CAL.WA.import_CalDAV (
+ in _domain_id integer,
+ in _name any,
+ in _options any := null)
+{
+ declare _user, _password varchar;
+ declare _page, _body, _bodyTemplate, _resHeader, _reqHeader any;
+ declare _xml, _items, _data any;
+
+ _user := get_keyword ('user', _options);
+ _password := get_keyword ('password', _options);
+ _bodyTemplate :=
+ '<?xml version="1.0" encoding="utf-8" ?>
+ <C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+ <D:prop>
+ <D:getetag/>
+ <C:calendar-data/>
+ </D:prop>
+ <D:href>%s</D:href>
+ </C:calendar-multiget>';
+
+ -- check CalDAV
+ _reqHeader := 'Accept: text/xml\r\nContent-Type: text/xml; charset=utf-8';
+ if (not is_empty_or_null (_user))
+ _reqHeader := _reqHeader || sprintf ('\r\nAuthorization: Basic %s', encode_base64 (_user || ':' || _password));
+
+ _page := http_client_ext (url=>_name, http_method=>'OPTIONS', http_headers=>_reqHeader, headers =>_resHeader, n_redirects=>15);
+ CAL.WA.http_error (_resHeader);
+ if (not (http_request_header (_resHeader, 'DAV') like '%calendar-access%'))
+ signal ('CAL01', 'Bad import/subscription source!<>');
+
+ _body := null;
+ _reqHeader := _reqHeader || '\r\nDepth: 1';
+ _page := http_client_ext (url=>_name, http_method=>'PROPFIND', http_headers=>_reqHeader, headers =>_resHeader, body=>_body, n_redirects=>15);
+ CAL.WA.http_error (_resHeader);
+ {
+ declare exit handler for sqlstate '*'
+ {
+ signal ('CAL01', 'Bad import/subscription source!<>');
+ };
+ _xml := xml_tree_doc (xml_expand_refs (xml_tree (_page)));
+ _items := xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav:"] /D:multistatus/D:response/D:href/text()', _xml, 0);
+ foreach (any _item in _items) do
+ {
+ commit work;
+ _body := sprintf (_bodyTemplate, cast (_item as varchar));
+ _page := http_client_ext (url=>_name, http_method=>'REPORT', http_headers=>_reqHeader, headers =>_resHeader, body=>_body, n_redirects=>15);
+ CAL.WA.http_error (_resHeader);
+ _xml := xml_tree_doc (xml_expand_refs (xml_tree (_page)));
+ if (not isnull (xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav:"] /D:multistatus/D:response/D:href/text()', _xml, 1)))
+ {
+ _data := cast (xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav:"] /D:multistatus/D:response/D:propstat/D:prop/calendar-data/text()', _xml, 1) as varchar);
+ CAL.WA.import_vcal (_domain_id, _data, _options);
+ }
+ }
+ }
+ return 1;
+}
+;
+
+--------------------------------------------------------------------------------
+--
+create procedure CAL.WA.import_CalDAV_check (
+ in _name any,
+ in _options any,
+ in _silent integer := 0)
+{
+ declare _user, _password varchar;
+ declare _page, _body, _resHeader, _reqHeader any;
+ declare exit handler for sqlstate '*'
+ {
+ return 0;
+ };
+
+ _user := get_keyword ('user', _options);
+ _password := get_keyword ('password', _options);
+
+ -- check CalDAV
+ _reqHeader := 'Accept: text/xml\r\nContent-Type: text/xml; charset=utf-8';
+ if (not is_empty_or_null (_user))
+ _reqHeader := _reqHeader || sprintf ('\r\nAuthorization: Basic %s', encode_base64 (_user || ':' || _password));
+
+ _page := http_client_ext (url=>_name, http_method=>'OPTIONS', http_headers=>_reqHeader, headers =>_resHeader, n_redirects=>15);
+ if (not CAL.WA.http_error (_resHeader, _silent))
+ return 0;
+
+ if (not (http_request_header (_resHeader, 'DAV') like '%calendar-access%'))
+ return 0;
+
+ return 1;
+}
+;
+
-------------------------------------------------------------------------------
--
create procedure CAL.WA.import_feed (
@@ -6829,23 +6997,26 @@ create procedure CAL.WA.exchange_exec_internal (
}
}
}
- -- subscribe
else if (_direction = 1)
{
+ -- subscribe
+
+ if (_type = 3)
+ return CAL.WA.exchange_CalDAV (_id);
+
if (_type = 1)
- {
_name := CAL.WA.host_url () || _name;
- }
+
_content := CAL.WA.dav_content (_name, 0, _user, _password);
if (isnull(_content))
- {
signal ('CAL01', 'Bad import/subscription source!<>');
- }
+
CAL.WA.import_vcal (_domain_id, _content, _options, _id);
}
- -- syncml
else if (_direction = 2)
{
+ -- syncml
+
declare data any;
declare N, _in, _out, _tmp, _rlog_res_id integer;
declare _path, _pathID varchar;
@@ -6909,6 +7080,22 @@ create procedure CAL.WA.exchange_exec_internal (
--------------------------------------------------------------------------------
--
+create procedure CAL.WA.exchange_CalDAV (
+ in _id integer)
+{
+ for (select EX_DOMAIN_ID as _domain_id, EX_TYPE as _direction, deserialize (EX_OPTIONS) as _options from CAL.WA.EXCHANGE where EX_ID = _id) do
+ {
+ if (get_keyword ('type', _options) <> 3)
+ return;
+
+ CAL.WA.import_CalDAV (_domain_id, get_keyword ('name', _options), _options);
+ }
+ return 1;
+}
+;
+
+--------------------------------------------------------------------------------
+--
create procedure CAL.WA.exchange_event_update (
in _domain_id integer)
{
@@ -7042,6 +7229,10 @@ 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')
@@ -7071,6 +7262,8 @@ 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;
@@ -7102,17 +7295,15 @@ 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, http_dav_uid (), http_dav_uid () + 1, null, null, 0);
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_path, _content, 'text/x-vcalendar', _permissions, _user, _user, null, null, 0);
connection_set ('__sync_ods', '0');
connection_set ('__sync_dav_upl', '0');
}
-
- if (_action = 'D')
+ else if (_action = 'D')
{
declare _id integer;
@@ -7120,7 +7311,7 @@ create procedure CAL.WA.syncml_entry_update_internal (
if (isinteger(_id) and (_id > 0))
{
connection_set ('__sync_ods', '1');
- DB.DBA.DAV_DELETE (_path, 1, _user, _password);
+ DB.DBA.DAV_DELETE_INT (_path, 1, _user, _password, 0);
connection_set ('__sync_ods', '0');
}
}
@@ -8441,60 +8632,3 @@ 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 f2a7536..f96fa0c 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.6 2011/05/17 22:59:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -111,7 +111,7 @@ CAL.WA.exec_no_error ('
--
create procedure CAL.WA.my_calendars (
in domain_id any,
- in privacy varchar)
+ in privacy integer)
{
declare calendar_id, calendar_privacy integer;
@@ -475,6 +475,7 @@ 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);
}
');
@@ -485,8 +486,9 @@ 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 (N.E_DOMAIN_ID);
+ CAL.WA.exchange_event_update (O.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 83d3693..9fa44b5 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.3 2010/10/07 13:23:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Calendar/sql/calendar-a-wa.sql b/appsrc/ODS-Calendar/sql/calendar-a-wa.sql
index 8438653..5e326e5 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.5 2010/09/22 13:57:03 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Calendar/sql/calendar-d.sql b/appsrc/ODS-Calendar/sql/calendar-d.sql
index 6523f8a..16434db 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.7 2011/06/02 12:32:02 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Calendar/sql/sioc_calendar.sql b/appsrc/ODS-Calendar/sql/sioc_calendar.sql
index 2c328fd..7c61bd9 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.11 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -106,13 +106,14 @@ create procedure fill_ods_calendar_sioc (
in _wai_name varchar := null)
{
declare id, deadl, cnt integer;
- declare c_iri, creator_iri, iri varchar;
+ declare acl_graph_iri, 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
@@ -120,9 +121,9 @@ create procedure fill_ods_calendar_sioc (
where ((_wai_name is null) or (WAI_NAME = _wai_name))
and WAI_TYPE_NAME = 'Calendar') do
{
- 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);
+ 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);
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
@@ -201,51 +202,7 @@ 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)
{
@@ -323,6 +280,57 @@ 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,
@@ -455,6 +463,9 @@ 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);
}
}
;
@@ -482,6 +493,9 @@ 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);
}
;
@@ -652,6 +666,62 @@ 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,
@@ -722,7 +792,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 (domain_id, null, master_iri);
+ graph_iri := SIOC..get_graph_new (CAL.WA.domain_is_public (domain_id), master_iri);
if (isnull (graph_iri))
return;
@@ -790,6 +860,61 @@ 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
new file mode 100644
index 0000000..2490f1b
--- /dev/null
+++ b/appsrc/ODS-Calendar/vad_version
@@ -0,0 +1 @@
+1.10.73
diff --git a/appsrc/ODS-Calendar/www/ajax.vsp b/appsrc/ODS-Calendar/www/ajax.vsp
index a045bc7..8608c52 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.2 2010/09/20 10:15:03 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -38,8 +38,8 @@
{
if (subAction = 'list')
{
- declare id integer;
- declare cTimeZone, cDateFormat, cTimeFormat varchar;
+ declare id, cTimeZone integer;
+ declare 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 7d5f0cf..737ee3a 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.7 2011/07/04 10:05:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -106,7 +106,7 @@
declare id, iri any;
id := row.te_column_value('A_ID');
- iri := AB.WA.url_fix (SIOC..calendar_annotation_iri (self.domain_id, self.v_oid, id), self.v_sid, self.v_realm);
+ iri := CAL.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 c3f4d76..45968d1 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.4 2011/03/08 13:25:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2008 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/calendar_login.vspx b/appsrc/ODS-Calendar/www/calendar_login.vspx
index 09c162b..ba66847 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.5 2010/10/07 13:23:19 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/calendars.vspx b/appsrc/ODS-Calendar/www/calendars.vspx
index 44ea3af..68f8caa 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.5 2011/05/17 22:59:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/contacts.vspx b/appsrc/ODS-Calendar/www/contacts.vspx
index 830ec44..3d2dbe7 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.5 2011/05/17 22:59:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/conversation.vspx b/appsrc/ODS-Calendar/www/conversation.vspx
index 058fb7c..3f4715c 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.4 2011/05/02 14:16:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/css/style.css b/appsrc/ODS-Calendar/www/css/style.css
index 3fe74a7..df7ce74 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.13 2011/05/17 22:59:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
@@ -27,6 +27,14 @@ 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;
@@ -74,45 +82,7 @@ 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;
@@ -122,6 +92,7 @@ a:hover {
font-size: 12px;
background-color: #EFEFEF;
border: 1px solid #7f94a5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
padding: 5px;
@@ -328,6 +299,7 @@ input.button {
border-color: #7f94a5;
background: #99b3c5;
cursor: pointer;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
@@ -493,6 +465,8 @@ div.tab {
border: 1px solid #000;
border-bottom-width: 0px;
border-color: #7f94a5;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
@@ -538,6 +512,8 @@ a.tab.activeTab {
border: 1px solid #000;
border-bottom-width: 0px;
border-color: #7f94a5;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
@@ -881,6 +857,7 @@ span.button {
padding: 2px 5px 0px;
text-decoration:none;
cursor: pointer;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
diff --git a/appsrc/ODS-Calendar/www/error.vspx b/appsrc/ODS-Calendar/www/error.vspx
index 133517f..756b894 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.2 2010/09/20 10:15:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/export.vspx b/appsrc/ODS-Calendar/www/export.vspx
index 1a44d27..f9bd62d 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.4 2010/09/20 10:15:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/gems.vsp b/appsrc/ODS-Calendar/www/gems.vsp
index 4e16a86..aa27a4d 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.3 2010/10/07 13:23:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Calendar/www/help.vspx b/appsrc/ODS-Calendar/www/help.vspx
index 66b1701..e475b5a 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.1 2010/09/20 10:15:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/home.vspx b/appsrc/ODS-Calendar/www/home.vspx
index dd4851d..83f2c4a 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.36 2011/07/04 10:05:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -83,10 +83,9 @@
<v:method name="actionTest" arglist="">
<![CDATA[
- declare tmp, kind, params, permissions any;
+ declare tmp, params, permissions any;
params := self.vc_page.vc_event.ve_params;
-
tmp := get_keyword ('id', params, '');
if (tmp <> '')
{
@@ -102,10 +101,10 @@
{
self.cAction := 'view';
}
- kind := CAL.WA.event_kind (self.v_id);
- if ((kind = 'event') and (self.cScope in ('tasks', 'search')))
+ self.cSubAction := CAL.WA.event_kind (self.v_id);
+ if ((self.cSubAction = 'event') and (self.cScope not in ('tasks', 'search')))
self.cScope := 'events';
- if (kind = 'task')
+ if (self.cSubAction = 'task')
self.cScope := 'tasks';
}
}
@@ -248,9 +247,9 @@
R := self.showEventSubjectTmp (_id, e_event, e_subject, e_repeat, e_reminder, e_attendees);
if (e_event = 1)
{
- T := sprintf ('<div id="e_%d_%s" class="EV vevent" typeof="sioct:EventCalendar" %s %s about="%V">%s%s%s<span style="display:none;">%s</span>%s</div>', _id, S, color, onclick, SIOC..calendar_event_iri (domain_id, _id), e_continue, showDelete, showAnnotate, self.prepareField (e_start, 'dtstart', null), R);
+ T := sprintf ('<div id="e_%d_%s" class="EV vevent" typeof="sioct:EventCalendar" %s %s about="%V">%s%s%s<span style="display:none;">%s</span>%s</div>', _id, S, color, onclick, CAL.WA.event_sioc_iri (domain_id, _id), e_continue, showDelete, showAnnotate, self.prepareField (e_start, 'dtstart', null), R);
} else {
- T := sprintf ('<div id="e_%d_%s" class="EV vevent" typeof="sioct:EventCalendar" %s %s about="%V">%s%s%s<span class="EV_time">%s-%s</span>%s</div>', _id, S, color, onclick, SIOC..calendar_event_iri (domain_id, _id), e_continue, showDelete, showAnnotate, self.prepareField (e_start, 'dtstart', CAL.WA.dt_timestring (e_start)), self.prepareField (e_end, 'dtend', CAL.WA.dt_timestring (e_end)), R);
+ T := sprintf ('<div id="e_%d_%s" class="EV vevent" typeof="sioct:EventCalendar" %s %s about="%V">%s%s%s<span class="EV_time">%s-%s</span>%s</div>', _id, S, color, onclick, CAL.WA.event_sioc_iri (domain_id, _id), e_continue, showDelete, showAnnotate, self.prepareField (e_start, 'dtstart', CAL.WA.dt_timestring (e_start)), self.prepareField (e_end, 'dtend', CAL.WA.dt_timestring (e_end)), R);
}
return T;
]]>
@@ -352,7 +351,7 @@
onclick := '';
if (not DB.DBA.is_empty_or_null (self.sid))
onclick := sprintf ('onclick="javascript: eView(\'e_%d\'); return false;"', _id);
- return sprintf ('<a id="e_%d" href="%s" %s class="EVL EVL_subject app" about="%V"> %s%s%s%s</a>', _id, CAL.WA.utf2wide (SIOC..calendar_event_iri(domain_id, _id)), onclick, CAL.WA.utf2wide (SIOC..calendar_event_iri(domain_id, _id)), self.repeatableImage (e_repeat), self.reminderImage (e_reminder), self.attendeesImage (e_attendees), self.prepareField (CAL.WA.show_subject (e_subject), 'summary', null));
+ return sprintf ('<a id="e_%d" href="%s" %s class="EVL EVL_subject app" about="%V"> %s%s%s%s</a>', _id, CAL.WA.utf2wide (CAL.WA.event_sioc_iri (domain_id, _id)), onclick, CAL.WA.utf2wide (CAL.WA.event_sioc_iri(domain_id, _id)), self.repeatableImage (e_repeat), self.reminderImage (e_reminder), self.attendeesImage (e_attendees), self.prepareField (CAL.WA.show_subject (e_subject), 'summary', null));
]]>
</v:method>
@@ -405,7 +404,7 @@
<![CDATA[
if (coalesce (eAttendees, -1) <= 0)
return '';
- return '<img border="0" width="11" height="11" title="Has Attendees" alt="Has Attendees" src="image/group_16.png" /> ';
+ return '<img border="0" width="11" height="11" title="Has Attendees" alt="Has Attendees" src="/ods/images/icons/group_16.png" /> ';
]]>
</v:method>
@@ -749,7 +748,7 @@
}
}
self.v_grants := trim (self.v_grants, ',');
- self.v_acl := serialize (DB.DBA.wa_acl_params (params));
+ self.v_acl := serialize (DB.DBA.wa_aci_params (params));
CAL.WA.test (self.v_subject, vector('name', 'Name', 'class', 'varchar', 'minLength', 0, 'maxLength', 255));
CAL.WA.test (self.v_location, vector('name', 'Location', 'class', 'varchar', 'minLength', 0, 'maxLength', 255));
@@ -933,7 +932,7 @@
}
}
self.v_grants := trim (self.v_grants, ',');
- self.v_acl := serialize (DB.DBA.wa_acl_params (params));
+ self.v_acl := serialize (DB.DBA.wa_aci_params (params));
CAL.WA.test (self.v_subject, vector('name', 'Name', 'class', 'varchar', 'minLength', 1, 'maxLength', 255));
CAL.WA.test (self.v_tags, vector ('name', 'Tags', 'class', 'tags'));
@@ -1517,7 +1516,7 @@
<table cellspacing="0">
<tr>
<th width="30%">
- <v:label for="" value="Space delimited keyword list" />
+ <vm:label for="" value="Space delimited keyword list" />
</th>
<td>
<v:text name="s_keywords" value="--CAL.WA.xml_get ('keywords', self.cSearch)" fmt-function="CAL.WA.utf2wide" xhtml_class="textbox" xhtml_size="60" />
@@ -2374,7 +2373,7 @@
<table class="form-body" cellspacing="0">
<tr>
<th width="25%">
- <v:label for="e_subject" value="Name" />
+ <vm:label for="e_subject" value="Name" />
</th>
<td>
<v:text name="e_subject" xhtml_id="e_subject" null-value="''" value="--self.v_subject" fmt-function="CAL.WA.utf2wide" xhtml_class="textbox" xhtml_size="60" />
@@ -2487,7 +2486,7 @@
</tr>
<tr>
<th valign="top">
- <v:label for="e_description" value="Description"/>
+ <vm:label for="e_description" value="Description" />
</th>
<td>
<v:textarea name="e_description" xhtml_id="e_description" null-value="--''" value="--self.v_description" fmt-function="CAL.WA.utf2wide" xhtml_cols="45" xhtml_rows="6" />
@@ -2495,10 +2494,10 @@
</tr>
<tr>
<th>
- <v:label for="e_location" value="Location"/>
+ <vm:label for="e_location" value="Location" />
</th>
<td>
- <v:text name="e_location" null-value="''" value="--self.v_location" fmt-function="CAL.WA.utf2wide" xhtml_class="textbox" xhtml_size="60" />
+ <v:text name="e_location" xhtml_id="e_location" null-value="''" value="--self.v_location" fmt-function="CAL.WA.utf2wide" xhtml_class="textbox" xhtml_size="60" />
</td>
</tr>
<tr>
@@ -2506,7 +2505,7 @@
<vm:label for="e_reminder" value="--'Reminder'" />
</th>
<td>
- <v:select-list name="e_reminder">
+ <v:select-list name="e_reminder" xhtml_id="e_reminder">
<v:on-init>
<![CDATA[
declare N integer;
@@ -2532,7 +2531,7 @@
<vm:label for="e_privacy" value="--'Privacy'" />
</th>
<td>
- <v:select-list name="e_privacy" xhtml_onchange="javascript: (this.value == \'2\')? OAT.Dom.show(\'e_tab_3\'): OAT.Dom.hide(\'e_tab_3\');">
+ <v:select-list name="e_privacy" xhtml_id="e_privacy" xhtml_onchange="javascript: (this.value == \'2\')? OAT.Dom.show(\'e_tab_3\'): OAT.Dom.hide(\'e_tab_3\');">
<v:item value="0" name="Private" />
<v:item value="2" name="ACL" />
<v:item value="1" name="Public" />
@@ -2547,10 +2546,10 @@
</vm:if>
<tr>
<th valign="top">
- <v:label for="e_attendees" value="Attendees" />
+ <vm:label for="e_attendees" value="Attendees" />
</th>
<td valign="top">
- <v:textarea name="e_attendees" null-value="--''" value="--self.v_attendees" fmt-function="CAL.WA.utf2wide" xhtml_cols="45" xhtml_rows="6" />
+ <v:textarea name="e_attendees" xhtml_id="e_attendees" null-value="--''" value="--self.v_attendees" fmt-function="CAL.WA.utf2wide" xhtml_cols="45" xhtml_rows="6" />
<?vsp
if (CAL.WA.instance_check (self.account_id, 'AddressBook'))
http (self.windowOpen('contacts.vspx?dst=mc¶ms=e_attendees:s1;', 'Select', 'Select', 'button'));
@@ -2561,10 +2560,10 @@
</tr>
<tr>
<th>
- <v:label for="e_tags" value="Tags (comma-separated)" />
+ <vm:label for="e_tags" value="Tags (comma-separated)" />
</th>
<td>
- <v:text name="e_tags" null-value="''" value="--self.v_tags" xhtml_class="textbox" xhtml_size="60" />
+ <v:text name="e_tags" xhtml_id="e_tags" null-value="''" value="--self.v_tags" xhtml_class="textbox" xhtml_size="60" />
<?vsp if (CAL.WA.tag_rule_exists (self.account_id)) { ?>
<input type="button" value="Suggest" onclick="javascript: tagsShow('<?V CAL.WA.page_url (self.domain_id, 'tags.vspx?fld=e_tags') ?>', 'e');" class="button" />
<?vsp } ?>
@@ -2578,7 +2577,7 @@
<table class="form-body" cellspacing="0">
<tr>
<th width="25%" valign="top">
- <v:label for="e_repeat" value="Repeats"/>
+ Repeats
</th>
<td>
<table>
@@ -3084,35 +3083,23 @@
<th class="action">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no"><td colspan="4"><b>No Shares</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
- declare N, L integer;
- declare acl, aType, aAccess any;
+ declare acl any;
- L := 0;
acl := (select WAI_ACL from DB.DBA.WA_INSTANCE where WAI_ID = self.domain_id);
acl := case when isnull (acl) then vector () else deserialize (acl) end;
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
+ DB.DBA.wa_aci_lines (acl);
+
acl := deserialize (self.v_acl);
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- if (self.cAction <> 'view')
- {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", value: "%s", readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', acl[N][2], acl[N][1], case when acl[N][2] = 'public' then 'true' else 'false' end, case when acl[N][2] = 'public' then 'display: none;' else '' end, acl[N][3], acl[N][4], acl[N][5]));
- } else {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
- }
+ DB.DBA.wa_aci_lines (acl, self.cAction);
?>
</script>
]]>
- <tr id="s_tr_no" style="display: <?V case when L=0 then '' else 'none' end ?>;"><td colspan="<?V case when self.cAction='view' then 3 else 4 end ?>"><b>No Shares</b></td></tr>
+ </tbody>
</table>
</td>
<vm:if test="self.cAction <> 'view'">
@@ -3140,7 +3127,7 @@
]]>
</v:on-post>
</v:button>
- <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: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:on-post>
<![CDATA[
self.saveEvent ();
@@ -3429,7 +3416,7 @@
<table class="form-body" cellspacing="0">
<tr>
<th width="25%">
- <v:label for="t_subject" value="Name" />
+ <vm:label for="t_subject" value="Name" />
</th>
<td>
<v:text name="t_subject" xhtml_id="t_subject" null-value="''" value="--self.v_subject" fmt-function="CAL.WA.utf2wide" xhtml_class="textbox" xhtml_size="60" />
@@ -3437,7 +3424,7 @@
</tr>
<tr>
<th>
- <v:label for="t_eventEndDate" value="Start Date"/>
+ <vm:label for="t_eventStartDate" value="Start Date" />
</th>
<td>
<input type="hidden" name="t_eventStartDate_save" id="t_eventStartDate_save" value="<?V CAL.WA.dt_datestring (self.v_eventStart, self.cDateFormat) ?>" />
@@ -3449,7 +3436,7 @@
</tr>
<tr>
<th>
- <v:label for="t_eventEndDate" value="Due Date"/>
+ <vm:label for="t_eventEndDate" value="Due Date" />
</th>
<td>
<v:text name="t_eventEndDate" xhtml_id="t_eventEndDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventEnd, self.cDateFormat)" xhtml_onclick="--sprintf ('datePopup(\'t_eventEndDate\', \'%s\');', self.cDateFormat)" xhtml_onchange="dateUpdate(\'t_eventEndDate\', [\'t_eventStartDate\']);" xhtml_class="textbox" xhtml_size="10" />
@@ -3460,10 +3447,10 @@
</tr>
<tr>
<th>
- <v:label for="t_priority" value="Priority"/>
+ <vm:label for="t_priority" value="Priority" />
</th>
<td>
- <v:select-list name="t_priority">
+ <v:select-list name="t_priority" xhtml_id="t_priority">
<v:on-init>
<![CDATA[
declare N integer;
@@ -3493,7 +3480,7 @@
</tr>
<tr>
<th>
- <v:label for="t_status" value="Status"/>
+ <vm:label for="t_status" value="Status" />
</th>
<td>
<v:select-list name="t_status" xhtml_id="t_status" xhtml_onchange="javascript: changeComplete(this);">
@@ -3517,7 +3504,7 @@
</tr>
<tr>
<th>
- <v:label for="t_completed" value="Completed" />
+ <vm:label for="t_completed" value="Completed" />
</th>
<td>
<v:text name="t_completed" xhtml_id="t_completed" null-value="--''" value="--CAL.WA.dt_datestring (self.v_completed, self.cDateFormat)" xhtml_onclick="--sprintf ('datePopup(\'t_completed\', \'%s\'); changeComplete(this);', self.cDateFormat)" xhtml_class="textbox" xhtml_size="10" xhtml_onchange="javascript: changeComplete(this);"/>
@@ -3528,7 +3515,7 @@
</tr>
<tr>
<th>
- <v:label for="t_complete" value="Complete (%)" />
+ <vm:label for="t_complete" value="Complete (%)" />
</th>
<td>
<v:select-list name="t_complete" xhtml_id="t_complete" xhtml_onchange="javascript: changeComplete(this);">
@@ -3552,7 +3539,7 @@
</tr>
<tr>
<th valign="top">
- <v:label for="t_description" value="Description"/>
+ <vm:label for="t_description" value="Description" />
</th>
<td>
<v:textarea name="t_description" xhtml_id="t_description" null-value="--''" value="--self.v_description" fmt-function="CAL.WA.utf2wide" xhtml_cols="45" xhtml_rows="6" />
@@ -3564,7 +3551,7 @@
<vm:label for="t_privacy" value="--'Privacy'" />
</th>
<td>
- <v:select-list name="t_privacy" xhtml_onchange="javascript: (this.value == \'2\')? OAT.Dom.show(\'t_tab_2\'): OAT.Dom.hide(\'t_tab_2\');">
+ <v:select-list name="t_privacy" xhtml_id="t_privacy" xhtml_onchange="javascript: (this.value == \'2\')? OAT.Dom.show(\'t_tab_2\'): OAT.Dom.hide(\'t_tab_2\');">
<v:item value="0" name="Private" />
<v:item value="2" name="ACL" />
<v:item value="1" name="Public" />
@@ -3579,10 +3566,10 @@
</vm:if>
<tr>
<th valign="top">
- <v:label for="t_attendees" value="Attendees" />
+ <vm:label for="t_attendees" value="Attendees" />
</th>
<td>
- <v:textarea name="t_attendees" null-value="--''" value="--self.v_attendees" fmt-function="CAL.WA.utf2wide" xhtml_cols="45" xhtml_rows="6" />
+ <v:textarea name="t_attendees" xhtml_id="t_attendees" null-value="--''" value="--self.v_attendees" fmt-function="CAL.WA.utf2wide" xhtml_cols="45" xhtml_rows="6" />
<?vsp
if (CAL.WA.instance_check (self.account_id, 'AddressBook'))
http (self.windowOpen('contacts.vspx?dst=mc¶ms=t_attendees:s1;', 'Select', 'Select', 'button'));
@@ -3593,10 +3580,10 @@
</tr>
<tr>
<th>
- <v:label for="t_tags" value="Tags (comma-separated)" />
+ <vm:label for="t_tags" value="Tags (comma-separated)" />
</th>
<td>
- <v:text name="t_tags" null-value="''" value="--self.v_tags" xhtml_class="textbox" xhtml_size="60" />
+ <v:text name="t_tags" xhtml_id="t_tags" null-value="''" value="--self.v_tags" xhtml_class="textbox" xhtml_size="60" />
<?vsp if (CAL.WA.tag_rule_exists (self.account_id)) { ?>
<input type="button" value="Suggest" onclick="javascript: tagsShow('<?V CAL.WA.page_url (self.domain_id, 'tags.vspx?fld=t_tags') ?>', 't');" class="button" />
<?vsp } ?>
@@ -3610,7 +3597,7 @@
<table class="form-body" cellspacing="0">
<tr>
<th width="20%" valign="top">
- Notes
+ <vm:label for="t_notes" value="Notes" />
</th>
<td>
<textarea id="t_notes" name="t_notes" style="width: 400; height: 170"><?vsp http (coalesce (self.v_notes, '')); ?></textarea>
@@ -3683,35 +3670,24 @@
<th class="action">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no"><td colspan="4"><b>No Shares</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
- declare N, L integer;
- declare acl, aType, aAccess any;
+ declare acl any;
- L := 0;
+ -- inherited
acl := (select WAI_ACL from DB.DBA.WA_INSTANCE where WAI_ID = self.domain_id);
acl := case when isnull (acl) then vector () else deserialize (acl) end;
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
+ DB.DBA.wa_aci_lines (acl);
+
acl := deserialize (self.v_acl);
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- if (self.cAction <> 'view')
- {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _uri_", value: "%s", readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', acl[N][2], acl[N][1], case when acl[N][2] = 'public' then 'true' else 'false' end, case when acl[N][2] = 'public' then 'display: none;' else '' end, acl[N][3], acl[N][4], acl[N][5]));
- } else {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
- }
+ DB.DBA.wa_aci_lines (acl, self.cAction);
?>
</script>
]]>
- <tr id="s_tr_no" style="display: <?V case when L=0 then '' else 'none' end ?>;"><td colspan="<?V case when self.cAction='view' then 3 else 4 end ?>"><b>No Shares</b></td></tr>
+ </tbody>
</table>
</td>
<vm:if test="self.cAction <> 'view'">
@@ -3739,7 +3715,7 @@
]]>
</v:on-post>
</v: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: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:on-post>
<![CDATA[
self.saveTask ();
@@ -3948,11 +3924,11 @@
<div class="new-form-body">
<table cellspacing="0">
<tr>
- <th rowspan="3" valign="top" width="30%">
- <v:label for="i_file" value="Source type" />
+ <th rowspan="4" valign="top" width="30%">
+ Source type
</th>
<td nowrap="nowarap">
- <v:radio-button name="icSource_0" xhtml_id="icSource_0" group-name="icSource" value="0" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_td_0\'], hide: [\'imp_td_1\', \'imp_td_2\', \'imp_tr_31\', \'imp_tr_32\']});">
+ <v:radio-button name="icSource_0" xhtml_id="icSource_0" group-name="icSource" value="0" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_td_0\'], hide: [\'imp_td_1\', \'imp_td_2\', \'imp_tr_31\', \'imp_tr_32\'], exec: [srcImportLabel]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either(lte(self.icSource, 0), 1, 0);
@@ -3965,7 +3941,7 @@
</tr>
<tr>
<td nowrap="nowarap">
- <v:radio-button name="icSource_1" xhtml_id="icSource_1" group-name="icSource" value="1" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_td_1\', \'imp_tr_31\', \'imp_tr_32\'], hide: [\'imp_td_0\', \'imp_td_2\']});">
+ <v:radio-button name="icSource_1" xhtml_id="icSource_1" group-name="icSource" value="1" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_td_1\', \'imp_tr_31\', \'imp_tr_32\'], hide: [\'imp_td_0\', \'imp_td_2\'], exec: [srcImportLabel]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either(equ(self.icSource, 1), 1, 0);
@@ -3978,7 +3954,20 @@
</tr>
<tr>
<td nowrap="nowarap">
- <v:radio-button name="icSource_2" xhtml_id="icSource_2" group-name="icSource" value="2" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_td_2\', \'imp_tr_31\', \'imp_tr_32\'], hide: [\'imp_td_0\', \'imp_td_1\']});">
+ <v:radio-button name="icSource_3" xhtml_id="icSource_3" group-name="icSource" value="3" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_td_2\', \'imp_tr_31\', \'imp_tr_32\'], hide: [\'imp_td_0\', \'imp_td_1\'], exec: [srcImportLabel]});">
+ <v:before-render>
+ <![CDATA[
+ control.ufl_selected := either(equ(self.icSource, 3), 1, 0);
+ ]]>
+ </v:before-render>
+ </v:radio-button>
+
+ <b><vm:label for="icSource_3" value="--'CalDAV'" /></b>
+ </td>
+ </tr>
+ <tr>
+ <td nowrap="nowarap">
+ <v:radio-button name="icSource_2" xhtml_id="icSource_2" group-name="icSource" value="2" xhtml_onchange="javascript: destinationChange(this, {show: [\'imp_td_2\', \'imp_tr_31\', \'imp_tr_32\'], hide: [\'imp_td_0\', \'imp_td_1\'], exec: [srcImportLabel]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either(equ(self.icSource, 2), 1, 0);
@@ -3991,7 +3980,7 @@
</tr>
<tr>
<th>
- Source name
+ <span id="srcLabel">Local File Name (.ics)</span>
</th>
<td>
<span id="imp_td_0" style="display: <?V case when self.icSource < 1 then '' else 'none' end ?>;">
@@ -4006,42 +3995,42 @@
</script>
]]>
</span>
- <span id="imp_td_2" style="display: <?V case when self.icSource = 2 then '' else 'none' end ?>;">
+ <span id="imp_td_2" style="display: <?V case when self.icSource > 1 then '' else 'none' end ?>;">
<v:text name="f_uri" value="--get_keyword ('f_uri', self.vc_page.vc_event.ve_params, '')" xhtml_size="60" />
</span>
</td>
</tr>
<tr id="imp_tr_31" style="<?V case when self.icSource < 1 then 'display: none;' else '' end ?>;">
<th>
- User
+ <label for="i_user">User</label>
</th>
<td>
- <v:text name="i_user" value="--self.icUser" null-value="''" xhtml_class="" />
+ <v:text name="i_user" xhtml_id="i_user" value="--self.icUser" null-value="''" xhtml_class="" />
</td>
</tr>
<tr id="imp_tr_32" style="<?V case when self.icSource < 1 then 'display: none;' else '' end ?>;">
<th>
- Password
+ <label for="i_password">Password</label>
</th>
<td>
- <v:text name="i_password" type="password" value="--''" null-value="''" xhtml_class="" />
+ <v:text name="i_password" xhtml_id="i_password" type="password" value="--''" null-value="''" xhtml_class="" />
</td>
</tr>
<tr>
<th>
- <v:label for="i_tags" value="Tags (comma-separated)" />
+ <label for="i_tags">Tags (comma-separated)</label>
</th>
<td>
- <v:text name="i_tags" value="--self.v_tags" xhtml_class="textbox" xhtml_size="60" />
+ <v:text name="i_tags" xhtml_id="i_tags" value="--self.v_tags" xhtml_class="textbox" xhtml_size="60" />
</td>
</tr>
<?vsp self.myTags ('i_tags'); ?>
<tr>
<th>
- Mails to attendees
+ <label for="i_attendees">Mails to attendees</label>
</th>
<td>
- <v:select-list name="i_attendees">
+ <v:select-list name="i_attendees" xhtml_id="i_attendees">
<v:item value="0" name="No action" />
<v:item value="1" name="Reset mail status" />
<v:item value="2" name="No mails" />
@@ -4064,6 +4053,14 @@
</td>
</tr>
</table>
+ <script type="text/javascript">
+ <![CDATA[
+ destinationChange($('icSource_0'), {show: ['imp_td_0'], hide: ['imp_td_1', 'imp_td_2', 'imp_tr_31', 'imp_tr_32'], exec: [srcImportLabel]});
+ destinationChange($('icSource_1'), {show: ['imp_td_1', 'imp_tr_31', 'imp_tr_32'], hide: ['imp_td_0', 'imp_td_2'], exec: [srcImportLabel]});
+ destinationChange($('icSource_2'), {show: ['imp_td_2', 'imp_tr_31', 'imp_tr_32'], hide: ['imp_td_0', 'imp_td_1'], exec: [srcImportLabel]});
+ destinationChange($('icSource_3'), {show: ['imp_td_2', 'imp_tr_31', 'imp_tr_32'], hide: ['imp_td_0', 'imp_td_1'], exec: [srcImportLabel]});
+ ]]>
+ </script>
</div>
<div class="form-footer">
@@ -4090,11 +4087,7 @@
self.icSource := 0;
content := trim(get_keyword ('f_file', self.vc_page.vc_event.ve_params, ''));
if (is_empty_or_null (content))
- {
- self.vc_error_message := 'Please select file from your local file system!';
- self.vc_is_valid := 0;
- return;
- }
+ signal ('TEST', 'Please select file from your local file system!');
}
else if (self.icSource_1.ufl_selected)
{
@@ -4103,30 +4096,29 @@
tmp := http_physical_path_resolve (replace (self.f_dav.ufl_value, ' ', '%20'));
content := CAL.WA.dav_content (CAL.WA.host_url () || tmp, 1, self.icUser, self.icPassword);
if (isnull(content))
- {
- self.vc_error_message := 'Bad import source!';
- self.vc_is_valid := 0;
- return;
- }
+ signal ('TEST', 'Bad import source!');
}
else if (self.icSource_2.ufl_selected)
{
self.icSource := 2;
self.f_uri.ufl_value := trim(self.f_uri.ufl_value);
if (is_empty_or_null (self.f_uri.ufl_value))
- {
- self.vc_error_message := 'Please select correct URL address!';
- self.vc_is_valid := 0;
- return;
- }
+ signal ('TEST', 'Please select correct URL address!');
+
content := CAL.WA.dav_content (self.f_uri.ufl_value, 1, self.icUser, self.icPassword);
if (isnull(content))
- {
- self.vc_error_message := 'Bad URL source!';
- self.vc_is_valid := 0;
- return;
- }
+ signal ('TEST', 'Bad URL source!');
}
+ else if (self.icSource_3.ufl_selected)
+ {
+ self.icSource := 3;
+ self.f_uri.ufl_value := trim (self.f_uri.ufl_value);
+ if (is_empty_or_null (self.f_uri.ufl_value))
+ signal ('TEST', 'Please select correct URL address!');
+
+ if (not CAL.WA.import_CalDAV_check (self.f_uri.ufl_value, vector ('user', self.icUser, 'password', self.icPassword), 1))
+ signal ('TEST', 'Bad CalDAV source!');
+ }
-- test tags value
self.v_tags := trim (self.i_tags.ufl_value);
@@ -4136,7 +4128,12 @@
self.v_tags := CAL.WA.vector2tags (tmp);
-- vCard
+ if (self.icSource = 3)
+ {
+ CAL.WA.import_CalDAV (self.domain_id, self.f_uri.ufl_value, vector ('user', self.icUser, 'password', self.icPassword, 'tags', self.v_tags, 'events', 1, 'tasts', 1, 'sync', self.i_sync.ufl_selected, 'mailAttendees', self.i_attendees.ufl_value));
+ } else {
CAL.WA.import_vcal (self.domain_id, content, vector ('tags', self.v_tags, 'events', 1, 'tasts', 1, 'sync', self.i_sync.ufl_selected, 'mailAttendees', self.i_attendees.ufl_value));
+ }
commit work;
self.cAction := 'browse';
@@ -4735,10 +4732,10 @@
<table cellspacing="0">
<tr>
<th width="30%">
- <v:label for="exc_name" value="Name" />
+ <label for="exc_name">Name</label>
</th>
<td>
- <v:text name="exc_name" null-value="--''" value="--self.ve_name" xhtml_size="60" />
+ <v:text name="exc_name" xhtml_id="exc_name" null-value="--''" value="--self.ve_name" xhtml_size="60" />
</td>
</tr>
<vm:if test="self.cAction not in ('syncmlCreate', 'syncmlUpdate')">
@@ -4807,26 +4804,42 @@
</tr>
<vm:if test="self.cAction not in ('syncmlCreate', 'syncmlUpdate')">
<tr>
- <th rowspan="2" valign="top">
+ <th rowspan="<?V case when (self.cAction in ('subscribeCreate', 'subscribeUpdate')) then 3 else 2 end ?>" valign="top">
<?V case when (self.cAction in ('publishCreate', 'publishUpdate')) then 'Destination' else 'Source' end ?> type
</th>
<td nowrap="nowarap">
<label>
- <v:radio-button name="exc_options_type_1" group-name="exc_options_type" value="1" xhtml_onchange="javascript: destinationChange(this, {show: [\'exc_options_name_button\'], clear: [\'exc_options_name\']});">
+ <v:radio-button name="exc_options_type_1" xhtml_id="exc_options_type_1" group-name="exc_options_type" value="1" xhtml_onchange="javascript: destinationChange(this, {show: [\'exc_options_name_button\'], clear: [\'exc_options_name\'], exec: [excLabel]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either (lte (get_keyword ('type', coalesce (self.ve_options, vector ()), 1), 1), 1, 0);
]]>
</v:before-render>
</v:radio-button>
- <b>WebDAV Path</b>
+ <b>WebDAV File URL</b>
</label>
</td>
</tr>
+ <vm:if test="self.cAction in ('subscribeCreate', 'subscribeUpdate')">
<tr>
<td nowrap="nowarap">
<label>
- <v:radio-button name="exc_options_type_2" group-name="exc_options_type" value="2" xhtml_onchange="javascript: destinationChange(this, {hide: [\'exc_options_name_button\'], clear: [\'exc_options_name\']});">
+ <v:radio-button name="exc_options_type_3" xhtml_id="exc_options_type_3" group-name="exc_options_type" value="3" xhtml_onchange="javascript: destinationChange(this, {hide: [\'exc_options_name_button\'], clear: [\'exc_options_name\'], exec: [excLabel]});">
+ <v:before-render>
+ <![CDATA[
+ control.ufl_selected := either (equ (get_keyword ('type', coalesce (self.ve_options, vector ()), 1), 3), 1, 0);
+ ]]>
+ </v:before-render>
+ </v:radio-button>
+ <b>CalDAV Path</b>
+ </label>
+ </td>
+ </tr>
+ </vm:if>
+ <tr>
+ <td nowrap="nowarap">
+ <label>
+ <v:radio-button name="exc_options_type_2" xhtml_id="exc_options_type_2" group-name="exc_options_type" value="2" xhtml_onchange="javascript: destinationChange(this, {hide: [\'exc_options_name_button\'], clear: [\'exc_options_name\'], exec: [excLabel]});">
<v:before-render>
<![CDATA[
control.ufl_selected := either (equ (get_keyword ('type', coalesce (self.ve_options, vector ()), 1), 2), 1, 0);
@@ -4840,34 +4853,37 @@
</vm:if>
<tr>
<th>
- <v:label for="sr_chars" value="-- case when (self.cAction in ('syncmlCreate', 'syncmlUpdate')) then 'WebDAV SyncML Path' else 'WebDAV Path / URL' end" />
+ <vm:if test="self.cAction in ('syncmlCreate', 'syncmlUpdate')">
+ <label for="exc_options_name">WebDAV SyncML Path</label>
+ </vm:if>
+ <vm:if test="self.cAction not in ('syncmlCreate', 'syncmlUpdate')">
+ <label for="exc_options_name"><span id="excLabel">WebDAV File Name (.ics)</span></label>
+ </vm:if>
</th>
<td>
<v:text name="exc_options_name" xhtml_id="exc_options_name" value="--get_keyword ('name', self.ve_options)" xhtml_size="60" />
- <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 ?>;" />
+ <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 ?>" />
<![CDATA[
<script type="text/javascript">
OAT.Loader.load(['dav'], function(){OAT.WebDav.init(davOptions);});
</script>
]]>
- </vm:if>
</td>
</tr>
<tr>
<th>
- User
+ <label for="exc_options_user">User</label>
</th>
<td>
- <v:text name="exc_options_user" value="--get_keyword ('user', self.ve_options)" null-value="''" />
+ <v:text name="exc_options_user" xhtml_id="exc_options_user" value="--get_keyword ('user', self.ve_options)" null-value="''" />
</td>
</tr>
<tr>
<th>
- Password
+ <label for="exc_options_password">Password</label>
</th>
<td>
- <v:text name="exc_options_password" type="password" value="--get_keyword ('password', self.ve_options)" null-value="''" />
+ <v:text name="exc_options_password" xhtml_id="exc_options_password" type="password" value="--get_keyword ('password', self.ve_options)" null-value="''" />
</td>
</tr>
<tr>
@@ -4877,10 +4893,10 @@
</tr>
<tr>
<th>
- Mails to attendees
+ <label for="exc_options_attendees">Mails to attendees</label>
</th>
<td>
- <v:select-list name="exc_options_attendees">
+ <v:select-list name="exc_options_attendees" xhtml_id="exc_options_attendees">
<v:item value="0" name="No action" />
<v:item value="1" name="Reset mail status" />
<v:item value="2" name="No mails" />
@@ -4896,10 +4912,10 @@
<vm:if test="self.cAction in ('syncmlCreate', 'syncmlUpdate')">
<tr>
<th>
- <v:label for="exc_options_mode" value="Sync mode" />
+ <label for="exc_options_mode">Sync mode</label>
</th>
<td>
- <v:select-list name="exc_options_mode">
+ <v:select-list name="exc_options_mode" xhtml_id="exc_options_mode">
<v:item value="0" name="Update both" />
<v:item value="1" name="Update client" />
<v:item value="-1" name="Update SyncML server" />
@@ -4919,17 +4935,36 @@
</th>
<td>
<label>
- <v:check-box name="exc_options_events" is-boolean="1" true-value="1" false-value="0" value="--get_keyword ('events', coalesce (self.ve_options, vector ()), 1)" />
+ <v:check-box name="exc_options_events" is-boolean="1" true-value="1" false-value="0">
+ <v:before-render>
+ <![CDATA[
+ control.ufl_selected := get_keyword ('events', coalesce (self.ve_options, vector ()), 1);
+ ]]>
+ </v:before-render>
+ </v:check-box>
Events
</label>
<br />
<label>
- <v:check-box name="exc_options_tasks" is-boolean="1" true-value="1" false-value="0" value="--get_keyword ('tasks', coalesce (self.ve_options, vector ()), 1)" />
+ <v:check-box name="exc_options_tasks" is-boolean="1" true-value="1" false-value="0">
+ <v:before-render>
+ <![CDATA[
+ control.ufl_selected := get_keyword ('tasks', coalesce (self.ve_options, vector ()), 1);
+ ]]>
+ </v:before-render>
+ </v:check-box>
Tasks
</label>
</td>
</tr>
</table>
+ <script type="text/javascript">
+ <![CDATA[
+ destinationChange($('exc_options_type_1'), {show: ['exc_options_name_button'], clear: ['exc_options_name'], exec: [excLabel]});
+ destinationChange($('exc_options_type_3'), {hide: ['exc_options_name_button'], clear: ['exc_options_name'], exec: [excLabel]});
+ destinationChange($('exc_options_type_2'), {hide: ['exc_options_name_button'], clear: ['exc_options_name'], exec: [excLabel]});
+ ]]>
+ </script>
</div>
<div class="form-footer">
<v:button action="simple" name="exc_save" value="--case when self.cAction in ('publishCreate', 'subscribeCreate', 'syncmlCreate') then 'Create' else 'Update' end" xhtml_class="form-button">
@@ -4981,6 +5016,10 @@
{
_type := 2;
}
+ else if (self.exc_options_type_3.ufl_selected)
+ {
+ _type := 3;
+ }
}
_name := trim (self.exc_options_name.ufl_value);
if (self.cAction in ('syncmlCreate', 'syncmlUpdate'))
@@ -5800,15 +5839,20 @@
]]>
</v:on-post>
</v:button>
- <v:button name="sp_clear" action="simple" value="Clear" xhtml_class="form-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: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 := vector ();
- self.initData ();
+
+ 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);
self.vc_data_bind(e);
]]>
diff --git a/appsrc/ODS-Calendar/www/image/virt_power_no_border.png b/appsrc/ODS-Calendar/www/image/virt_power_no_border.png
deleted file mode 100644
index 93fcb80..0000000
Binary files a/appsrc/ODS-Calendar/www/image/virt_power_no_border.png and /dev/null differ
diff --git a/appsrc/ODS-Calendar/www/js/calendar.js b/appsrc/ODS-Calendar/www/js/calendar.js
index fbba868..d6192da 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-2007 OpenLink Software
+ * 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
@@ -826,13 +826,17 @@ function dismissReminder(prefix, mode) {
reminderDialog.hide ();
}
-function davBrowse(fld) {
+function davBrowse(fld, folders) {
+ /* 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;
- }
+ onConfirmClick: function(path, fname) {$(fld).value = '/DAV' + path + fname;}
};
+ if (!folders) {folders = false;}
+ OAT.WebDav.options.foldersOnly = folders;
OAT.WebDav.open(options);
}
@@ -881,7 +885,39 @@ function destinationChange(obj, actions) {
o.value = '';
}
}
- }
+ if (actions.exec) {
+ var a = actions.exec;
+ for ( var i = 0; i < a.length; i++) {
+ a[i](obj);
+ }
+ }
+}
+
+function srcImportLabel(obj) {
+ var srcLabel = $('srcLabel');
+ if (!srcLabel)
+ return;
+ if ($('icSource_0').checked)
+ srcLabel.innerHTML = 'Local File Name (.ics)';
+ if ($('icSource_1').checked)
+ srcLabel.innerHTML = 'WebDAV File URL (.ics)';
+ if ($('icSource_3').checked)
+ srcLabel.innerHTML = 'CalDAV URL';
+ if ($('icSource_2').checked)
+ srcLabel.innerHTML = 'File URL (.ics)';
+ }
+
+function excLabel(obj) {
+ var srcLabel = $('excLabel');
+ if (!srcLabel)
+ return;
+ if ($('exc_options_type_1').checked)
+ srcLabel.innerHTML = 'WebDAV File URL (.ics)';
+ if ($('exc_options_type_3').checked)
+ srcLabel.innerHTML = 'CalDAV URL';
+ if ($('exc_options_type_2').checked)
+ srcLabel.innerHTML = 'File URL (.ics)';
+}
var CAL = new Object();
diff --git a/appsrc/ODS-Calendar/www/logs.vspx b/appsrc/ODS-Calendar/www/logs.vspx
index 9959f49..f20f409 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.2 2011/05/17 22:59:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/message.vspx b/appsrc/ODS-Calendar/www/message.vspx
index e9cb110..cd1ed83 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.1 2010/09/20 10:15:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/tags.vspx b/appsrc/ODS-Calendar/www/tags.vspx
index 37bf330..fe4d341 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.4 2011/05/17 22:59:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/template/popup.vspx b/appsrc/ODS-Calendar/www/template/popup.vspx
index ae26a34..c3409bf 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.11 2011/07/04 10:05:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/www/template/template.vspx b/appsrc/ODS-Calendar/www/template/template.vspx
index 3b87ba4..0ab3ad5 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.19 2011/07/04 10:05:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -40,6 +40,7 @@
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);
@@ -67,11 +68,6 @@
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 ff62fde..e12269d 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.11 2011/05/02 14:16:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -192,7 +192,7 @@
<div id="FT" style="display: <?V case when get_keyword ('interface', C, '') = 'js' then 'none' else '' end ?>">
<div id="FT_L">
<a href="http://www.openlinksw.com/virtuoso">
- <img alt="Powered by OpenLink Virtuoso Universal Server" src="image/virt_power_no_border.png" border="0" />
+ <img alt="Powered by OpenLink Virtuoso Universal Server" src="/ods/images/virt_power_no_border.png" border="0" />
</a>
</div>
<div id="FT_R">
diff --git a/appsrc/ODS-Calendar/xslt/rss2atom.xsl b/appsrc/ODS-Calendar/xslt/rss2atom.xsl
index e998236..2390919 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.2 2010/09/20 10:15:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/xslt/rss2atom03.xsl b/appsrc/ODS-Calendar/xslt/rss2atom03.xsl
index fff9714..bd79434 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.1 2010/09/20 10:15:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/xslt/rss2rdf.xsl b/appsrc/ODS-Calendar/xslt/rss2rdf.xsl
index 84757c1..a171837 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.1 2010/09/20 10:15:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Calendar/xslt/rss2xbel.xsl b/appsrc/ODS-Calendar/xslt/rss2xbel.xsl
index d03224d..b78984a 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.1 2010/09/20 10:15:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/Makefile.am b/appsrc/ODS-Community/Makefile.am
index 4522f5a..a76d9fa 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-2006 OpenLink Software
+# 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
@@ -48,6 +48,7 @@ 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 ba2502c..0020536 100644
--- a/appsrc/ODS-Community/Makefile.in
+++ b/appsrc/ODS-Community/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -311,6 +291,7 @@ EXTRA_DIST = \
sql/*.sql \
sql/install.bat \
sql/uninstall.bat \
+ vad_version \
www-root/*.vsp \
www-root/*.vspx \
www-root/public/*.html \
@@ -335,14 +316,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Community/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Community/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Community/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Community/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -360,7 +341,6 @@ $(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
@@ -370,23 +350,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -410,17 +387,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -452,7 +425,6 @@ clean-generic:
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"
@@ -471,8 +443,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -481,28 +451,18 @@ 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
@@ -543,7 +503,6 @@ ods_community_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Community/make_vad.sh b/appsrc/ODS-Community/make_vad.sh
index 8123297..fa44417 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.3 2011/02/03 10:26:14 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -28,8 +28,9 @@ LANG=C
LC_ALL=POSIX
export LANG LC_ALL
+
LOGDIR=`pwd`
-VERSION="0.0.996"
+VERSION="1.0.0"
LOGFILE="${LOGDIR}/make_vad.log"
STICKER="make_vad.xml"
PACKDATE=`date +"%Y-%m-%d %H:%M"`
@@ -58,11 +59,6 @@ else
LN="ln -fs"
RM="rm -f"
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
if [ "z$SERVER" = "z" ]
then
@@ -85,16 +81,58 @@ else
myrm=$RM
fi
-VERSION_INIT()
+
+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/"`; do
- cat $i | grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> 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
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=100 } { cnt = cnt + $1 } END { printf "1.%02.02f", cnt/100 }'`
+ 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"
ddate=`date`
@@ -225,7 +263,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-2011 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
@@ -370,7 +408,7 @@ echo '------------------------'
STOP_SERVER
directory_clean
-VERSION_INIT
+version_init
directory_init
virtuoso_init
sticker_init
@@ -378,7 +416,6 @@ vad_create
virtuoso_shutdown
STOP_SERVER
chmod 644 ods_community_dav.vad
-directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -388,5 +425,7 @@ 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 0b0d0e3..a9359d1 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.1 2010/09/20 10:15:04 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Community/sql/install.bat b/appsrc/ODS-Community/sql/install.bat
index 5e42f94..6c7d904 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.1 2010/09/20 10:15:05 source Exp $
+rem $Id$
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 8fc1fc6..4401bad 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.1 2010/09/20 10:15:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Community/sql/run_install.sql b/appsrc/ODS-Community/sql/run_install.sql
index 227ccfe..3daac29 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.1 2010/09/20 10:15:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Community/sql/run_uninstall.sql b/appsrc/ODS-Community/sql/run_uninstall.sql
index d1428a8..4c24e87 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.1 2010/09/20 10:15:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Community/sql/sioc_xd.sql b/appsrc/ODS-Community/sql/sioc_xd.sql
index fc1d0c1..636be62 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.2 2010/09/20 10:15:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Community/sql/tables.sql b/appsrc/ODS-Community/sql/tables.sql
index 99847ca..6c7d465 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.1 2010/09/20 10:15:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Community/sql/uninstall.bat b/appsrc/ODS-Community/sql/uninstall.bat
index a6fc51d..2873a65 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.1 2010/09/20 10:15:05 source Exp $
+rem $Id$
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 57899fa..d3ad52c 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.1 2010/09/20 10:15:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -743,6 +743,14 @@ 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 b0c8bb0..23acca9 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.1 2010/09/20 10:15:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Community/vad_version b/appsrc/ODS-Community/vad_version
new file mode 100644
index 0000000..773e9fd
--- /dev/null
+++ b/appsrc/ODS-Community/vad_version
@@ -0,0 +1 @@
+1.8.46
diff --git a/appsrc/ODS-Community/www-root/index.vsp b/appsrc/ODS-Community/www-root/index.vsp
index ee3fd4b..e23b7f6 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.1 2010/09/20 10:15:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Community/www-root/index.vspx b/appsrc/ODS-Community/www-root/index.vspx
index 37dbbc5..fe370bd 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.1 2010/09/20 10:15:05 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/public/aboutcommunity.html b/appsrc/ODS-Community/www-root/public/aboutcommunity.html
index fbb565e..4789262 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.1 2010/09/20 10:15:05 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/public/css/default.css b/appsrc/ODS-Community/www-root/public/css/default.css
index 252d7f2..f624132 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.1 2010/09/20 10:15:05 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
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 8e7c733..7fc4a4f 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.1 2010/09/20 10:15:05 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
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 35a9924..3f2c33b 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.1 2010/09/20 10:15:06 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
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 431ef30..1052a67 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/default.css b/appsrc/ODS-Community/www-root/templates/openlink/default.css
index 99dac85..92b9b40 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.1 2010/09/20 10:15:06 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx b/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx
index 5ca605f..221f267 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/index.vspx b/appsrc/ODS-Community/www-root/templates/openlink/index.vspx
index c92ed44..a60b5fd 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/login.vspx b/appsrc/ODS-Community/www-root/templates/openlink/login.vspx
index 6c1c2b3..4dec798 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx b/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx
index 2b35468..a95fe60 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx b/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx
index d9a840a..b948293 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 239edf1..ef28fb1 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 0d0c232..4f1e02f 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 def1810..60a9bb1 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.1 2010/09/20 10:15:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 dbd3151..72af88a 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.1 2010/09/20 10:15:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/widgets/dashboard.xsl b/appsrc/ODS-Community/www-root/widgets/dashboard.xsl
index b03b548..52a4a18 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.1 2010/09/20 10:15:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -539,6 +539,7 @@
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 aeec633..a5af90f 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.1 2010/09/20 10:15:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/widgets/main.xsl b/appsrc/ODS-Community/www-root/widgets/main.xsl
index f2b8808..f5b9a61 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.2 2010/09/20 10:15:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/widgets/map_control.xsl b/appsrc/ODS-Community/www-root/widgets/map_control.xsl
index a9edb25..1f7e400 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.1 2010/09/20 10:15:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Community/www-root/widgets/template_check.xsl b/appsrc/ODS-Community/www-root/widgets/template_check.xsl
index 9223985..f84c390 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.1 2010/09/20 10:15:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/DET_nntp.sql b/appsrc/ODS-Discussion/DET_nntp.sql
index 0fea09b..83a3380 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.1 2010/09/20 10:15:07 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/Makefile.am b/appsrc/ODS-Discussion/Makefile.am
index be5c7b5..ea90e63 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-2006 OpenLink Software
+# 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
@@ -44,6 +44,7 @@ clean-local:
-rm -rf vad
EXTRA_DIST = \
+ *.dox \
*.css \
*.js \
*.sql \
diff --git a/appsrc/ODS-Discussion/Makefile.in b/appsrc/ODS-Discussion/Makefile.in
index ea9e243..38bc09b 100644
--- a/appsrc/ODS-Discussion/Makefile.in
+++ b/appsrc/ODS-Discussion/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -307,6 +287,7 @@ CLEANFILES = \
vad.trx
EXTRA_DIST = \
+ *.dox \
*.css \
*.js \
*.sql \
@@ -328,14 +309,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Discussion/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Discussion/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Discussion/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Discussion/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -353,7 +334,6 @@ $(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
@@ -363,23 +343,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -403,17 +380,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -445,7 +418,6 @@ clean-generic:
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"
@@ -464,8 +436,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -474,28 +444,18 @@ 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
@@ -536,7 +496,6 @@ ods_discussion_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Discussion/ODS-Discussion.dox b/appsrc/ODS-Discussion/ODS-Discussion.dox
new file mode 100644
index 0000000..0d60adf
--- /dev/null
+++ b/appsrc/ODS-Discussion/ODS-Discussion.dox
@@ -0,0 +1,5 @@
+/**
+\defgroup ods_module_discussion ODS Discussion API
+
+The ODS Community App does not provide a REST API yet.
+*/
diff --git a/appsrc/ODS-Discussion/attachment.vsp b/appsrc/ODS-Discussion/attachment.vsp
index d18476c..75ed871 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.1 2010/09/20 10:15:07 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/comp/adv_srh.xsl b/appsrc/ODS-Discussion/comp/adv_srh.xsl
index d0fd5bd..b35e01b 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.1 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/attach.xsl b/appsrc/ODS-Discussion/comp/attach.xsl
index bb83562..ac81bd5 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.1 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/common.xsl b/appsrc/ODS-Discussion/comp/common.xsl
index efe9f68..b4f8d14 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.1 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/dialog.xsl b/appsrc/ODS-Discussion/comp/dialog.xsl
index 91bc3bb..2b149aa 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.1 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/group_list.xsl b/appsrc/ODS-Discussion/comp/group_list.xsl
index ef96c7b..25f490b 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.3 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/group_view.xsl b/appsrc/ODS-Discussion/comp/group_view.xsl
index 72d6acb..7975789 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.4 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/login.xsl b/appsrc/ODS-Discussion/comp/login.xsl
index 17c631e..86ac643 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.1 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/menubar.xsl b/appsrc/ODS-Discussion/comp/menubar.xsl
index 04726d7..674316f 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.2 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/nntp_cal.xsl b/appsrc/ODS-Discussion/comp/nntp_cal.xsl
index dab3a4a..790dc42 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.3 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/nntpf_tags.xsl b/appsrc/ODS-Discussion/comp/nntpf_tags.xsl
index 33321ba..c884c38 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.4 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/page.xsl b/appsrc/ODS-Discussion/comp/page.xsl
index 141afe0..950c4d9 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.2 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/post.xsl b/appsrc/ODS-Discussion/comp/post.xsl
index 59064ee..3dcd705 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.2 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/register.xsl b/appsrc/ODS-Discussion/comp/register.xsl
index 1b35200..2f672f2 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.1 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/rss_del.xsl b/appsrc/ODS-Discussion/comp/rss_del.xsl
index dccc2f7..26c3bfe 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.1 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/rss_group.xsl b/appsrc/ODS-Discussion/comp/rss_group.xsl
index d59d3c0..7946ecb 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.1 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/rss_list.xsl b/appsrc/ODS-Discussion/comp/rss_list.xsl
index 1644e23..48a18b4 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.1 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/search.xsl b/appsrc/ODS-Discussion/comp/search.xsl
index c14508c..6807a5d 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.1 2010/09/20 10:15:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/search_res.xsl b/appsrc/ODS-Discussion/comp/search_res.xsl
index 3db1460..f118b54 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.1 2010/09/20 10:15:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/settings.xsl b/appsrc/ODS-Discussion/comp/settings.xsl
index 2f52f5a..7ac061e 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.1 2010/09/20 10:15:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/thread_view.xsl b/appsrc/ODS-Discussion/comp/thread_view.xsl
index 917dcfc..0ccd3a5 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.1 2010/09/20 10:15:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/comp/title.xsl b/appsrc/ODS-Discussion/comp/title.xsl
index e4f8169..6bccaed 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.1 2010/09/20 10:15:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/drop.sql b/appsrc/ODS-Discussion/drop.sql
index f834746..7bd5c81 100644
--- a/appsrc/ODS-Discussion/drop.sql
+++ b/appsrc/ODS-Discussion/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.3.2.1 2010/09/20 10:15:07 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/login.vspx b/appsrc/ODS-Discussion/login.vspx
index 7ecf541..0501026 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.1 2010/09/20 10:15:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/mail_notify.sql b/appsrc/ODS-Discussion/mail_notify.sql
index 2bf9031..868ae32 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.1 2010/09/20 10:15:07 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/main.xsl b/appsrc/ODS-Discussion/main.xsl
index dd0eed6..aceaf01 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.2 2010/09/20 10:15:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/make_vad.sh b/appsrc/ODS-Discussion/make_vad.sh
index 874b6e2..307d69e 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.5 2011/02/03 10:26:14 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -57,11 +57,6 @@ 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
@@ -83,8 +78,13 @@ 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-2011 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
@@ -407,15 +407,13 @@ 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"
@@ -425,5 +423,7 @@ 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 bd67a4f..848d799 100644
--- a/appsrc/ODS-Discussion/nntpf.css
+++ b/appsrc/ODS-Discussion/nntpf.css
@@ -1,10 +1,10 @@
/*
- * $Id: nntpf.css,v 1.9.2.2 2010/09/20 10:15:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Discussion/nntpf_addtorss.vspx b/appsrc/ODS-Discussion/nntpf_addtorss.vspx
index f520a4c..65453c1 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.2 2010/09/20 10:15:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_adv_search.vspx b/appsrc/ODS-Discussion/nntpf_adv_search.vspx
index b7f7cc0..49f71aa 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.2 2010/09/20 10:15:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_api.sql b/appsrc/ODS-Discussion/nntpf_api.sql
index 94e0550..2d8e6d6 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.3 2010/09/20 10:15:08 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/nntpf_browser.vspx b/appsrc/ODS-Discussion/nntpf_browser.vspx
index 7f9940b..d48d229 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.1 2010/09/20 10:15:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_ddl.sql b/appsrc/ODS-Discussion/nntpf_ddl.sql
index daeaf47..8bb9739 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.1 2010/09/20 10:15:08 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/nntpf_disp_article.vspx b/appsrc/ODS-Discussion/nntpf_disp_article.vspx
index 5ee5e56..8653f43 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.1 2010/09/20 10:15:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_edit_rss.vspx b/appsrc/ODS-Discussion/nntpf_edit_rss.vspx
index 9c8cc8a..cb90173 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.1 2010/09/20 10:15:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_error.vsp b/appsrc/ODS-Discussion/nntpf_error.vsp
index eb7e694..e880ac2 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.1 2010/09/20 10:15:08 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/nntpf_error.vspx b/appsrc/ODS-Discussion/nntpf_error.vspx
index 7256f6e..b622373 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.1 2010/09/20 10:15:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -25,12 +25,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_error.vspx,v 1.2.2.1 2010/09/20 10:15:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_logout.vspx b/appsrc/ODS-Discussion/nntpf_logout.vspx
index c34505e..52c793f 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.1 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_main.vspx b/appsrc/ODS-Discussion/nntpf_main.vspx
index f1fc9b0..d1d79a4 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.1 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_nthread_view.vspx b/appsrc/ODS-Discussion/nntpf_nthread_view.vspx
index 2ef3904..16c5430 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.1 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx b/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx
index df80eee..31b4970 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.2 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_post.vspx b/appsrc/ODS-Discussion/nntpf_post.vspx
index a5c321b..458467d 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.1 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_preferences.vspx b/appsrc/ODS-Discussion/nntpf_preferences.vspx
index ac608df..82f6586 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.1 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_rss_del.vspx b/appsrc/ODS-Discussion/nntpf_rss_del.vspx
index a64d186..90e47bc 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.2 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_rss_group.vspx b/appsrc/ODS-Discussion/nntpf_rss_group.vspx
index 0dd8fc3..6e705dd 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.2 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_rss_list.vspx b/appsrc/ODS-Discussion/nntpf_rss_list.vspx
index 57697df..6a2555f 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.2 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_subs.vspx b/appsrc/ODS-Discussion/nntpf_subs.vspx
index 10536e4..667ffac 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.1 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_subs_edit.vspx b/appsrc/ODS-Discussion/nntpf_subs_edit.vspx
index 9b8a16f..4f70811 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.2 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_subs_group.vspx b/appsrc/ODS-Discussion/nntpf_subs_group.vspx
index 8e4d70d..7eade60 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.2 2010/09/20 10:15:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_subs_remove.vspx b/appsrc/ODS-Discussion/nntpf_subs_remove.vspx
index 9836c10..084188e 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.1 2010/09/20 10:15:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_tags.sql b/appsrc/ODS-Discussion/nntpf_tags.sql
index 10251aa..2131ce5 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.2 2010/09/20 10:15:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/nntpf_thread_view.vspx b/appsrc/ODS-Discussion/nntpf_thread_view.vspx
index 9c1c801..83dabae 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.2 2010/09/20 10:15:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/nntpf_warning.vsp b/appsrc/ODS-Discussion/nntpf_warning.vsp
index 935ad7e..815bab9 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.2 2010/09/20 10:15:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/nntpf_yacutia.vspx b/appsrc/ODS-Discussion/nntpf_yacutia.vspx
index fe9f930..ae19d09 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.2 2010/09/20 10:15:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/openid.js b/appsrc/ODS-Discussion/openid.js
index 0115420..96453b8 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-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Discussion/openid_helper.vsp b/appsrc/ODS-Discussion/openid_helper.vsp
index b10e92c..d94845e 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.1 2010/09/20 10:15:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/register.vspx b/appsrc/ODS-Discussion/register.vspx
index b1e4d01..254b48a 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.1 2010/09/20 10:15:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/rss.vsp b/appsrc/ODS-Discussion/rss.vsp
index 24e1078..12d14d2 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.1 2010/09/20 10:15:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/rsscomments.vsp b/appsrc/ODS-Discussion/rsscomments.vsp
index 2a23fb9..54e2a69 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.1 2010/09/20 10:15:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/setup.sql b/appsrc/ODS-Discussion/setup.sql
index 6df545e..c2e06d6 100644
--- a/appsrc/ODS-Discussion/setup.sql
+++ b/appsrc/ODS-Discussion/setup.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup.sql,v 1.27.2.1 2010/09/20 10:15:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/sioc_nntp.sql b/appsrc/ODS-Discussion/sioc_nntp.sql
index f32ea32..c0645f8 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.3 2010/09/20 10:15:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/vad_version b/appsrc/ODS-Discussion/vad_version
index a0903c6..07a8451 100644
--- a/appsrc/ODS-Discussion/vad_version
+++ b/appsrc/ODS-Discussion/vad_version
@@ -1 +1 @@
-1.10.70
+1.10.72
diff --git a/appsrc/ODS-Discussion/virtuoso_app_links.xhtml b/appsrc/ODS-Discussion/virtuoso_app_links.xhtml
index 8cfeafd..61cd95e 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.1 2010/09/20 10:15:11 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Discussion/wa_install.sql b/appsrc/ODS-Discussion/wa_install.sql
index 35911d9..ea7b881 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.2 2010/09/20 10:15:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Discussion/webdav.css b/appsrc/ODS-Discussion/webdav.css
index a5fd354..2386ec9 100644
--- a/appsrc/ODS-Discussion/webdav.css
+++ b/appsrc/ODS-Discussion/webdav.css
@@ -1,5 +1,5 @@
/*
- * $Id: webdav.css,v 1.2.2.1 2010/09/20 10:15:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
diff --git a/appsrc/ODS-FeedManager/Makefile.am b/appsrc/ODS-FeedManager/Makefile.am
index 5c6792e..a16041c 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-2006 OpenLink Software
+# 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
@@ -44,8 +44,10 @@ clean-local:
-rm -rf vad
EXTRA_DIST = \
+ *.dox \
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 51abc9f..b62e110 100644
--- a/appsrc/ODS-FeedManager/Makefile.in
+++ b/appsrc/ODS-FeedManager/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -307,8 +287,10 @@ CLEANFILES = \
virtuoso.trx
EXTRA_DIST = \
+ *.dox \
make_vad.sh \
sql/*.sql \
+ vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
@@ -329,14 +311,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-FeedManager/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-FeedManager/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-FeedManager/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-FeedManager/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -354,7 +336,6 @@ $(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
@@ -364,23 +345,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -404,17 +382,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -446,7 +420,6 @@ clean-generic:
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"
@@ -465,8 +438,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -475,28 +446,18 @@ 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
@@ -537,7 +498,6 @@ ods_feedmanager_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-FeedManager/ODS-FeedManager.dox b/appsrc/ODS-FeedManager/ODS-FeedManager.dox
new file mode 100644
index 0000000..b6be868
--- /dev/null
+++ b/appsrc/ODS-FeedManager/ODS-FeedManager.dox
@@ -0,0 +1,3 @@
+/**
+\defgroup ods_module_feeds ODS Feed Manager API
+*/
diff --git a/appsrc/ODS-FeedManager/make_vad.sh b/appsrc/ODS-FeedManager/make_vad.sh
index f49cda7..a4ab1e4 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.30 2011/07/04 10:04:01 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -30,7 +30,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.8.181"
+VERSION="1.0.0"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -63,11 +63,6 @@ else
LN="ln -fs"
RM="rm -f"
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
if [ "z$SERVER" = "z" ]
then
@@ -90,6 +85,57 @@ 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
@@ -225,7 +271,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-2011 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
@@ -237,8 +283,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.82.42\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.86.16\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2012-04-18 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -397,6 +443,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
+version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -413,7 +460,6 @@ virtuoso_shutdown
STOP_SERVER
chmod 644 $VAD_DAV
chmod 644 $VAD_FS
-directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -423,5 +469,7 @@ 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 a00f403..4913679 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.1 2010/09/20 10:15:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-api.sql b/appsrc/ODS-FeedManager/sql/nws-a-api.sql
index 76b0ef8..8556e89 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.3 2010/09/20 10:15:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-code.sql b/appsrc/ODS-FeedManager/sql/nws-a-code.sql
index d0563ff..33f93a6 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.27 2011/03/23 12:19:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -2307,7 +2307,7 @@ create procedure ENEWS.WA.channel_delete(
-------------------------------------------------------------------------------
--
create procedure ENEWS.WA.channel_feeds(
- inout feed_id integer)
+ in feed_id integer)
{
return (select count(*) from ENEWS.WA.FEED_ITEM where EFI_FEED_ID = feed_id and coalesce(EFI_DELETE_FLAG, 0) = 0);
}
@@ -6152,7 +6152,10 @@ create procedure ENEWS.WA.data (
create procedure ENEWS.WA.test_clear (
in S any)
{
- return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
+ S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
+ S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
+
+ return S;
}
;
@@ -6308,7 +6311,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)))
@@ -7466,63 +7469,6 @@ 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 2bcc5e7..4dd6191 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.1 2010/09/20 10:15:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-table.sql b/appsrc/ODS-FeedManager/sql/nws-a-table.sql
index 6affc20..de52dd7 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.9 2011/05/20 16:24:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-wa.sql b/appsrc/ODS-FeedManager/sql/nws-a-wa.sql
index 69654ce..d955405 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.4 2010/09/22 13:57:03 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-d.sql b/appsrc/ODS-FeedManager/sql/nws-d.sql
index c9f156c..09d53c7 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.5 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/sql/sioc_feeds.sql b/appsrc/ODS-FeedManager/sql/sioc_feeds.sql
index 3b23b6a..201080f 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.10 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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 iri, m_iri, f_iri, t_iri, u_iri, c_iri varchar;
+ declare acl_graph_iri, iri, m_iri, f_iri, t_iri, u_iri, c_iri varchar;
declare tags, linksTo any;
declare id, deadl, cnt any;
@@ -241,6 +241,7 @@ 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
@@ -248,9 +249,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
{
- 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);
+ 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);
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
new file mode 100644
index 0000000..e522eee
--- /dev/null
+++ b/appsrc/ODS-FeedManager/vad_version
@@ -0,0 +1 @@
+1.19.70
diff --git a/appsrc/ODS-FeedManager/www/ajax.vsp b/appsrc/ODS-FeedManager/www/ajax.vsp
index ecf874a..0ca6b5a 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.3 2010/10/07 13:23:02 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2007 OpenLink Software
+-- 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
@@ -107,7 +107,7 @@
}
http_rewrite ();
http_header ('Content-Type: text/plain\r\n');
- http (ENEWS.WA.obj2json(returnData, 3));
+ http (ODS..obj2json(returnData, 5));
}
else if (action = 'tags')
{
diff --git a/appsrc/ODS-FeedManager/www/annotea.vspx b/appsrc/ODS-FeedManager/www/annotea.vspx
index ee65796..4503acb 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.7 2011/07/04 10:04:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/attachment.vsp b/appsrc/ODS-FeedManager/www/attachment.vsp
index e1e3bc7..abc7ace 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.1 2010/09/20 10:15:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/www/blog.vspx b/appsrc/ODS-FeedManager/www/blog.vspx
index 2bcbed2..8dd3b08 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.3 2010/10/07 13:23:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/bookmark.vspx b/appsrc/ODS-FeedManager/www/bookmark.vspx
index dbb21b2..8e7c21d 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.3 2010/09/20 10:15:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/channels.vspx b/appsrc/ODS-FeedManager/www/channels.vspx
index 1cb69fc..7102606 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.14 2011/07/04 10:04:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -445,44 +445,32 @@
<table class="form-body" cellspacing="0">
<tr>
<td style="width: 90%; background-color: white;">
- <table id="s_tbl" width="100%" cellspacing="0">
- <thead class="sortHeader">
+ <table id="s_tbl" class="ODS_grid">
+ <thead>
<tr>
<th width="15%">Type</th>
<th>Value</th>
<th width="1%" nowrap="nowrap">ACL: (R)ead, (W)rite</th>
- <th width="50px">Action</th>
+ <th class="action">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no"><td colspan="4"><b>No Shares</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
- declare N, L integer;
- declare acl, aType, aAccess any;
+ declare acl any;
- L := 0;
acl := (select WAI_ACL from DB.DBA.WA_INSTANCE where WAI_ID = self.domain_id);
acl := case when isnull (acl) then vector () else deserialize (acl) end;
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
+ DB.DBA.wa_aci_lines (acl);
+
acl := deserialize (self.v_acl);
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- if (self.v_mode <> 'view')
- {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", value: "%s", readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', acl[N][2], acl[N][1], case when acl[N][2] = 'public' then 'true' else 'false' end, case when acl[N][2] = 'public' then 'display: none;' else '' end, acl[N][3], acl[N][4], acl[N][5]));
- } else {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
- }
+ DB.DBA.wa_aci_lines (acl, self.v_mode);
?>
</script>
]]>
- <tr id="s_tr_no" style="display: <?V case when L=0 then '' else 'none' end ?>;"><td colspan="<?V case when self.v_mode='view' then 3 else 4 end ?>"><b>No Shares</b></td></tr>
+ </tbody>
</table>
</td>
<vm:if test="self.v_mode <> 'view'">
@@ -579,7 +567,7 @@
-- domain
ENEWS.WA.channel_domain (self.v_id, self.domain_id, self.v_feed_id, self.f_title.ufl_value, self.v_tags, self.v_folder_name, trim (self.f_folder_id.ufl_value), self.f_graph.ufl_value);
- self.v_acl := serialize (DB.DBA.wa_acl_params (params));
+ self.v_acl := serialize (DB.DBA.wa_aci_params (params));
ENEWS.WA.channel_acl (self.v_id, self.v_acl);
-- directory
diff --git a/appsrc/ODS-FeedManager/www/channels_create.vspx b/appsrc/ODS-FeedManager/www/channels_create.vspx
index cc53d2d..5d66ddc 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.7 2011/05/17 23:00:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/channels_select.vspx b/appsrc/ODS-FeedManager/www/channels_select.vspx
index bfa2b21..b482980 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.3 2011/05/02 14:16:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/conversation.vspx b/appsrc/ODS-FeedManager/www/conversation.vspx
index 21de8d2..a8047de 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.4 2011/05/02 14:16:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/css/style.css b/appsrc/ODS-FeedManager/www/css/style.css
index a9ff58c..8d54a07 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.10 2011/05/17 23:00:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -27,11 +27,23 @@ 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;
}
@@ -111,43 +123,6 @@ 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;
@@ -174,6 +149,7 @@ div.app_hdr_cmds_ctr {
.left_container {
background-color: #EFEFEF;
border: 1px solid #7f94a5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
padding: 5px;
@@ -539,6 +515,7 @@ input.button {
border: solid 1px;
border-color: #7f94a5;
background: #99b3c5;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
@@ -586,6 +563,7 @@ input.nolink2 {
border: solid 1px;
border-color: #7f94a5;
background: #99b3c5;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
@@ -815,6 +793,8 @@ div.tab {
border: 1px solid #000;
border-bottom-width: 0px;
border-color: #7f94a5;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
@@ -839,6 +819,8 @@ span.tab {
border: 1px solid #000;
border-bottom-width: 0px;
border-color: #7f94a5;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
@@ -1004,6 +986,7 @@ font-weight:normal !important;
span.button {
background: none repeat scroll 0 0 #99B3C5;
border: 1px solid #7F94A5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #FFFFFF;
diff --git a/appsrc/ODS-FeedManager/www/directories.vspx b/appsrc/ODS-FeedManager/www/directories.vspx
index aa7a575..5950374 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.6 2011/05/02 14:16:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/enews_login.vspx b/appsrc/ODS-FeedManager/www/enews_login.vspx
index dce8090..43d6018 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.5 2010/10/07 13:23:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/error.vspx b/appsrc/ODS-FeedManager/www/error.vspx
index b69ea73..9f9bd07 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.1 2010/09/20 10:15:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/export.vspx b/appsrc/ODS-FeedManager/www/export.vspx
index 9411552..65d3e27 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.5 2010/10/07 13:23:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/folders.vspx b/appsrc/ODS-FeedManager/www/folders.vspx
index cb81e0d..871bd65 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.4 2010/10/13 12:14:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/gems.vsp b/appsrc/ODS-FeedManager/www/gems.vsp
index a4d5e12..8f76dda 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.3 2010/10/07 13:23:03 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/www/image/PoweredByVirtuoso.gif b/appsrc/ODS-FeedManager/www/image/PoweredByVirtuoso.gif
deleted file mode 100644
index b196db7..0000000
Binary files a/appsrc/ODS-FeedManager/www/image/PoweredByVirtuoso.gif and /dev/null differ
diff --git a/appsrc/ODS-FeedManager/www/image/enews_banner.gif b/appsrc/ODS-FeedManager/www/image/enews_banner.gif
deleted file mode 100644
index a5c9323..0000000
Binary files a/appsrc/ODS-FeedManager/www/image/enews_banner.gif and /dev/null differ
diff --git a/appsrc/ODS-FeedManager/www/image/virt_power_no_border.png b/appsrc/ODS-FeedManager/www/image/virt_power_no_border.png
deleted file mode 100644
index 93fcb80..0000000
Binary files a/appsrc/ODS-FeedManager/www/image/virt_power_no_border.png and /dev/null differ
diff --git a/appsrc/ODS-FeedManager/www/image/virtuosologo.jpg b/appsrc/ODS-FeedManager/www/image/virtuosologo.jpg
deleted file mode 100644
index 8f15047..0000000
Binary files a/appsrc/ODS-FeedManager/www/image/virtuosologo.jpg and /dev/null differ
diff --git a/appsrc/ODS-FeedManager/www/item.vspx b/appsrc/ODS-FeedManager/www/item.vspx
index 25cbd58..4e87324 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.6 2011/07/04 10:04:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/items.vspx b/appsrc/ODS-FeedManager/www/items.vspx
index 6820823..ca891ff 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.7 2011/07/04 10:04:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/js/enews.js b/appsrc/ODS-FeedManager/www/js/enews.js
index 6139ceb..2cfc933 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.14 2011/06/09 17:43:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -508,12 +508,10 @@ Feeds.listFavourites = function ()
Feeds.aboutDialog = function ()
{
var aboutDiv = $('aboutDiv');
- if (aboutDiv) {OAT.Dom.unlink(aboutDiv);}
- aboutDiv = OAT.Dom.create('div', {
- width:'430px',
- height: '170px',
- overflow: 'hidden'
- });
+ if (aboutDiv)
+ OAT.Dom.unlink(aboutDiv);
+
+ aboutDiv = OAT.Dom.create('div', {height: '160px', 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;
@@ -1117,7 +1115,8 @@ function checkState()
setTimeout("checkState()", 1000);
} else {
progressTimer = null;
- doPost ('F1', 'btn_Stop');
+ $('btn_Stop').value = 'Close';
+ OAT.Dom.hide('btn_Background');
}
}
OAT.AJAX.POST('ajax.vsp', "a=load&sa=state&id="+progressID+urlParams("sid")+urlParams("realm"), x);
@@ -1186,12 +1185,17 @@ function showProgress(progressIndex)
}
}
-function davBrowse (fld)
-{
+function davBrowse(fld, folders) {
+ /* 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;}
};
+ 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 e0b357a..8939da8 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.2 2010/09/20 10:15:15 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-FeedManager/www/news.vspx b/appsrc/ODS-FeedManager/www/news.vspx
index e41364f..6face9d 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.4 2010/10/07 13:23:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/search.vspx b/appsrc/ODS-FeedManager/www/search.vspx
index e709fad..431cc23 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.9 2010/10/13 12:14:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/settings.vspx b/appsrc/ODS-FeedManager/www/settings.vspx
index 5cb7eff..1bfdbf0 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.4 2010/10/13 12:14:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -212,6 +212,17 @@
]]>
</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 3eec723..5964d2b 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.7 2011/05/02 14:16:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/tags.vspx b/appsrc/ODS-FeedManager/www/tags.vspx
index 6d4ca4a..a01923a 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.1 2010/09/20 10:15:16 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/template/popup.vspx b/appsrc/ODS-FeedManager/www/template/popup.vspx
index 0ad03ea..46f2ace 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.8 2011/07/04 10:04:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/www/template/template.vspx b/appsrc/ODS-FeedManager/www/template/template.vspx
index d1ad474..8830349 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.12 2011/07/04 10:04:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -66,11 +66,6 @@
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 5a3ccec..19882da 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.9 2011/05/02 14:16:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -292,7 +292,7 @@
<div id="FT" style="display: <?V case when get_keyword ('interface', C, '') = 'js' then 'none' else '' end ?>">
<div id="FT_L">
<a href="http://www.openlinksw.com/virtuoso">
- <img alt="Powered by OpenLink Virtuoso Universal Server" src="image/virt_power_no_border.png" border="0" />
+ <img alt="Powered by OpenLink Virtuoso Universal Server" src="/ods/images/virt_power_no_border.png" border="0" />
</a>
</div>
<div id="FT_R">
@@ -427,7 +427,7 @@
<!--=========================================================================-->
<xsl:template name="vm:splash">
<div style="padding: 1em; font-size: 0.70em;">
- <a href="http://www.openlinksw.com/virtuoso"><img title="Powered by OpenLink Virtuoso Universal Server" src="image/PoweredByVirtuoso.gif" border="0" /></a>
+ <a href="http://www.openlinksw.com/virtuoso"><img title="Powered by OpenLink Virtuoso Universal Server" src="/ods/images/PoweredByVirtuoso.gif" border="0" /></a>
<br />
Server version: <?V sys_stat('st_dbms_ver') ?><br/>
Server build date: <?V sys_stat('st_build_date') ?><br/>
diff --git a/appsrc/ODS-FeedManager/www/weblog.vspx b/appsrc/ODS-FeedManager/www/weblog.vspx
index a538aaa..4f7b60d 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.4 2010/10/13 12:14:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/xslt/foaf.xsl b/appsrc/ODS-FeedManager/xslt/foaf.xsl
index 41798cc..a25cb6a 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.1 2010/09/20 10:15:16 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/xslt/rss2atom.xsl b/appsrc/ODS-FeedManager/xslt/rss2atom.xsl
index 86d363d..2390919 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.3 2010/09/20 10:15:16 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl b/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl
index 3f7456d..bd79434 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.2 2010/09/20 10:15:16 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl b/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl
index 26c06dc..5276e3b 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.2 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl b/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl
index 99f98d6..4fc1d71 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/Makefile.am b/appsrc/ODS-Framework/Makefile.am
index 55b20bd..f53a359 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-2010 OpenLink Software
+# 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
@@ -44,15 +44,18 @@ clean-local:
-rm -rf vad
EXTRA_DIST = \
+ *.dox \
*.css \
*.html \
*.js \
+ *.php \
*.sql \
*.txt \
*.vsp \
*.vspx \
*.xml \
*.xsl \
+ ckeditor/*.css \
ckeditor/*.html \
ckeditor/*.js \
ckeditor/images/*.gif \
@@ -135,6 +138,4 @@ EXTRA_DIST = \
users/js/*.js \
users/users.jsp \
users/users.rb \
- vad_version \
- version.base \
- version.curr
+ vad_version
diff --git a/appsrc/ODS-Framework/Makefile.in b/appsrc/ODS-Framework/Makefile.in
index d57c5da..c18741e 100644
--- a/appsrc/ODS-Framework/Makefile.in
+++ b/appsrc/ODS-Framework/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -307,15 +287,18 @@ CLEANFILES = \
virtuoso.trx
EXTRA_DIST = \
+ *.dox \
*.css \
*.html \
*.js \
+ *.php \
*.sql \
*.txt \
*.vsp \
*.vspx \
*.xml \
*.xsl \
+ ckeditor/*.css \
ckeditor/*.html \
ckeditor/*.js \
ckeditor/images/*.gif \
@@ -398,9 +381,7 @@ EXTRA_DIST = \
users/js/*.js \
users/users.jsp \
users/users.rb \
- vad_version \
- version.base \
- version.curr
+ vad_version
all: all-am
@@ -409,14 +390,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Framework/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Framework/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Framework/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Framework/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -434,7 +415,6 @@ $(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
@@ -444,23 +424,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -484,17 +461,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -526,7 +499,6 @@ clean-generic:
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"
@@ -545,8 +517,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -555,28 +525,18 @@ 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
@@ -617,7 +577,6 @@ ods_framework_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Framework/ODS-Framework.dox b/appsrc/ODS-Framework/ODS-Framework.dox
new file mode 100644
index 0000000..e090018
--- /dev/null
+++ b/appsrc/ODS-Framework/ODS-Framework.dox
@@ -0,0 +1,36 @@
+/**
+\defgroup ods_module_instance ODS App Instance Management API
+
+Provides procedures for instance management like creating a new instance or retrieving an instance id.
+
+\section ods_instance_id ODS App Instance Ids
+
+Each application instance in ODS which has been created though instance.create() has a unique numerical id. This id is required
+as parameter in many methods throughout the ODS API.
+
+There are two ways to discover the id of an instance through the ODS API:
+-# If the name of the instance is known a simple call to instance.get.id() is sufficient.
+-# If the exact name is not known the instance can be searched via instance.search().
+
+FIXME: we need a method to list all instances with an optional type restriction.
+ */
+
+/**
+\defgroup ods_module_user ODS User Management API
+The user management API provides procedures for user lookup, creation, and manipulation.
+
+\attention User names in ODS are case-sensitive!
+
+\section ods_user_privacy ODS User Privacy Settings
+
+Most details of a user profile are subject to privacy settings. There are three settings:
+- public - visible to all
+- private - visible to no-one
+- ACL - Fine grained control over who is allowed to read or write the data.
+
+FIXME: add links to the important methods that deal with privacy.
+*/
+
+/**
+\defgroup ods_module_ontology ODS Ontology Management API
+*/
diff --git a/appsrc/ODS-Framework/aboutus.html b/appsrc/ODS-Framework/aboutus.html
index b2abf52..8b89fad 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/access_box.vsp b/appsrc/ODS-Framework/access_box.vsp
new file mode 100644
index 0000000..814a255
--- /dev/null
+++ b/appsrc/ODS-Framework/access_box.vsp
@@ -0,0 +1,56 @@
+<?vsp
+ declare url, sid, token, ticket, auth_token, display_name varchar;
+ declare result, resultHeader any;
+
+ auth_token := null;
+ token := ODS.ODS_API.get_oauth_tok ('Box Net API');
+ if ({?'auth_token'} is not null)
+ {
+ auth_token := get_keyword ('auth_token', params);
+ ticket := get_keyword ('ticket', params);
+ url := sprintf ('https://www.box.com/api/1.0/rest?action=get_auth_token&api_key=%s&ticket=%s', token, ticket);
+ result := http_client_ext (url=>url, http_method=>'GET', headers=>resultHeader, n_redirects=>15);
+ result := xtree_doc (result);
+ if (cast (xpath_eval ('string (/response/status)', result, 1) as varchar) <> 'get_auth_token_ok')
+ return;
+
+ auth_token := xpath_eval ('string (/response/auth_token)', result, 1);
+ display_name := xpath_eval ('string (/response/user/login)', result, 1);;
+ -- person := http_get (url);
+ }
+ else
+ {
+ url := sprintf ('https://www.box.com/api/1.0/rest?action=get_ticket&api_key=%s', token);
+ result := http_client_ext (url=>url, http_method=>'GET', headers=>resultHeader, n_redirects=>15);
+ result := xtree_doc (result);
+ if (cast (xpath_eval ('string (/response/status)', result, 1) as varchar) <> 'get_ticket_ok')
+ return;
+
+ ticket := xpath_eval ('string (/response/ticket)', result, 1);
+ url := sprintf ('https://www.box.com/api/1.0/auth/%s', ticket);
+ http_status_set (302);
+ http_header (sprintf ('Location: %s\r\n', url));
+ return;
+ }
+?>
+<html>
+ <head>
+ </head>
+ <body>
+ <?vsp
+ if (auth_token is not null)
+ {
+ ?>
+ <script type="text/javascript">
+ if (window.opener && window.opener.open && !window.opener.closed) {
+ window.opener.ODRIVE.boxParams('<?V auth_token ?>', '<?V display_name ?>');
+ } else {
+ alert ('Opener not found');
+ }
+ window.close();
+ </script>
+ <?vsp
+ }
+ ?>
+ </body>
+</html>
diff --git a/appsrc/ODS-Framework/access_dropbox.vsp b/appsrc/ODS-Framework/access_dropbox.vsp
new file mode 100644
index 0000000..4a80595
--- /dev/null
+++ b/appsrc/ODS-Framework/access_dropbox.vsp
@@ -0,0 +1,59 @@
+<?vsp
+ declare url, sid, token, oauth_token, return_url, display_name, email varchar;
+ declare result, resultHeader, json any;
+
+ token := ODS.ODS_API.get_oauth_tok ('Dropbox API');
+ if ({?'oauth_token'} is not null)
+ {
+ declare header, auth any;
+
+ sid := {?'sid'};
+ url := OAUTH..sign_request ('GET', 'https://api.dropbox.com/1/oauth/access_token', '', token, sid, 1);
+ -- result := http_get (url);
+ result := http_client_ext (url=>url, http_method=>'GET', headers=>resultHeader, n_redirects=>15);
+ sid := OAUTH..parse_response (sid, token, result);
+
+ url := OAUTH..sign_request ('GET', 'https://api.dropbox.com/1/account/info', '', token, sid, 1);
+ result := http_client_ext (url=>url, http_method=>'GET', headers=>resultHeader, n_redirects=>15);
+ result := subseq (ODS..json2obj(result), 2);
+ display_name := get_keyword ('display_name', result);
+ email := get_keyword ('email', result);
+ -- person := http_get (url);
+ }
+ else
+ {
+ sid := md5 (datestring (now ()));
+ return_url := sprintf ('http://%{WSHost}s%s?sid=%U', http_path(), sid);
+ url := OAUTH..sign_request ('GET', 'https://api.dropbox.com/1/oauth/request_token', '', token, null, 1);
+ result := http_client_ext (url=>url, http_method=>'GET', headers=>resultHeader, n_redirects=>15);
+ sid := OAUTH..parse_response (sid, token, result);
+
+ OAUTH..set_session_data (sid, params);
+ oauth_token := OAUTH..get_auth_token (sid);
+ url := sprintf ('https://www.dropbox.com/1/oauth/authorize?oauth_token=%U&oauth_callback=%U', oauth_token, return_url);
+ http_status_set (302);
+ http_header (sprintf ('Location: %s\r\n', url));
+ return;
+ }
+?>
+<html>
+ <head>
+ </head>
+ <body>
+ <?vsp
+ if ({?'sid'} is not null)
+ {
+ ?>
+ <script type="text/javascript">
+ if (window.opener && window.opener.open && !window.opener.closed) {
+ window.opener.ODRIVE.dropboxParams('<?V sid ?>', '<?V display_name ?>', '<?V email ?>');
+ } else {
+ alert ('Opener not found');
+ }
+ window.close();
+ </script>
+ <?vsp
+ }
+ ?>
+ </body>
+</html>
diff --git a/appsrc/ODS-Framework/access_google.vsp b/appsrc/ODS-Framework/access_google.vsp
new file mode 100644
index 0000000..58b68c5
--- /dev/null
+++ b/appsrc/ODS-Framework/access_google.vsp
@@ -0,0 +1,45 @@
+<?vsp
+ declare _params, _client_id, _client_secret, _return_url, _code, _url, _reqHeader, _retHeader, _body, _retValue, _json, _xml any;
+ declare _display_name, _email varchar;
+
+ _code := get_keyword ('code', params, '');
+ _json := '{\"error\" : \"invalid_request\"}';
+ if (_code <> '')
+ {
+ _client_id := (select a_key from OAUTH..APP_REG where a_name = 'Google API' and a_owner = 0);
+ _client_secret := (select a_secret from OAUTH..APP_REG where a_name = 'Google API' and a_owner = 0);
+ _return_url := sprintf ('http://%{WSHost}s/ods/access_google.vsp', http_path());
+ _url := 'https://accounts.google.com/o/oauth2/token';
+ _reqHeader := 'Content-Type: application/x-www-form-urlencoded\r\n';
+ _body := sprintf ('code=%U&client_id=%U&client_secret=%U&redirect_uri=%U&grant_type=%U', _code, _client_id, _client_secret, _return_url, 'authorization_code');
+ _retValue := http_client (url=>_url, http_method=>'POST', http_headers=>_reqHeader, body=>_body, n_redirects=>15);
+ _json := replace (_retValue, '\n', '\\n');
+
+ -- get owner info
+ _params := subseq (ODS..json2obj (_retValue), 2);
+ _url := sprintf ('https://docs.google.com/feeds/default/private/full/%U/contents/-/folder', 'folder:root');
+ _reqHeader := sprintf ('GData-Version: 3.0\r\nAuthorization: %s %s\r\n', get_keyword ('token_type', _params), get_keyword ('access_token', _params));
+ _retHeader := null;
+ _retValue := http_client_ext (url=>_url, http_method=>'GET', http_headers=>_reqHeader, headers =>_retHeader, n_redirects=>15);
+ if (not ((_retHeader[0] like 'HTTP/1._ 4__ %') or (_retHeader[0] like 'HTTP/1._ 5__ %')))
+ {
+ _xml := xtree_doc (_retValue);
+ _display_name := cast (xpath_eval ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] /feed/author/name', _xml) as varchar);
+ _email := cast (xpath_eval ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] /feed/author/email', _xml) as varchar);
+ }
+ }
+?>
+<html>
+ <head>
+ </head>
+ <body>
+ <script type="text/javascript">
+ if (window.opener && window.opener.open && !window.opener.closed) {
+ window.opener.ODRIVE.oauthParams('<?vsp http (_json); ?>', '<?V _display_name ?>', '<?V _email ?>');
+ } else {
+ alert ('Opener not found');
+ }
+ window.close();
+ </script>
+ </body>
+</html>
diff --git a/appsrc/ODS-Framework/access_skydrive.vsp b/appsrc/ODS-Framework/access_skydrive.vsp
new file mode 100644
index 0000000..14ca840
--- /dev/null
+++ b/appsrc/ODS-Framework/access_skydrive.vsp
@@ -0,0 +1,43 @@
+<?vsp
+ declare _params, _client_id, _client_secret, _return_url, _code, _url, _reqHeader, _retHeader, _body, _retValue, _json, _xml any;
+ declare _display_name, _email varchar;
+
+ _code := get_keyword ('code', params, '');
+ _json := '{\"error\" : \"invalid_request\"}';
+ if (_code <> '')
+ {
+ _client_id := (select a_key from OAUTH..APP_REG where a_name = 'SkyDrive API' and a_owner = 0);
+ _client_secret := (select a_secret from OAUTH..APP_REG where a_name = 'SkyDrive API' and a_owner = 0);
+ _return_url := sprintf ('http://%{WSHost}s/ods/access_skydrive.vsp', http_path());
+ _url := 'https://login.live.com/oauth20_token.srf';
+ _reqHeader := 'Content-Type: application/x-www-form-urlencoded\r\n';
+ _body := sprintf ('code=%U&client_id=%U&client_secret=%U&redirect_uri=%U&grant_type=%U', _code, _client_id, _client_secret, _return_url, 'authorization_code');
+ _retValue := http_client (url=>_url, http_method=>'POST', http_headers=>_reqHeader, body=>_body, n_redirects=>15);
+ _json := replace (_retValue, '\n', '\\n');
+
+ -- get owner info
+ _params := subseq (ODS..json2obj (_retValue), 2);
+ _url := sprintf ('https://apis.live.net/v5.0/me?access_token=%U', get_keyword ('access_token', _params));
+ _retHeader := null;
+ _retValue := http_client_ext (url=>_url, http_method=>'GET', headers =>_retHeader, n_redirects=>15);
+ if (not ((_retHeader[0] like 'HTTP/1._ 4__ %') or (_retHeader[0] like 'HTTP/1._ 5__ %')))
+ {
+ _params := subseq (ODS..json2obj (_retValue), 2);
+ _display_name := get_keyword ('name', _params);
+ }
+ }
+?>
+<html>
+ <head>
+ </head>
+ <body>
+ <script type="text/javascript">
+ if (window.opener && window.opener.open && !window.opener.closed) {
+ window.opener.ODRIVE.skydriveParams('<?vsp http (_json); ?>', '<?V _display_name ?>');
+ } else {
+ alert ('Opener not found');
+ }
+ window.close();
+ </script>
+ </body>
+</html>
diff --git a/appsrc/ODS-Framework/accounts.vspx b/appsrc/ODS-Framework/accounts.vspx
index 6fd0a2e..6f74992 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/add_rule.vspx b/appsrc/ODS-Framework/add_rule.vspx
index 25bf19a..6bd44ad 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/admin.vspx b/appsrc/ODS-Framework/admin.vspx
index 580da4a..7e54bd6 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/advertise.html b/appsrc/ODS-Framework/advertise.html
index d8e99b7..4ffd8be 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/afoaf.xml b/appsrc/ODS-Framework/afoaf.xml
index 9d4a134..3d5e6cc 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/app.js b/appsrc/ODS-Framework/app.js
index 528b78b..3e62452 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-2007 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/app.vspx b/appsrc/ODS-Framework/app.vspx
index 80974f6..7fbcd14 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/app_inst.vspx b/appsrc/ODS-Framework/app_inst.vspx
index bbccd52..15edb7d 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/app_instance_limits.vspx b/appsrc/ODS-Framework/app_instance_limits.vspx
index a2758ca..93c175d 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.1 2010/09/20 10:15:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/app_menu.js b/appsrc/ODS-Framework/app_menu.js
index 96ec3b7..d2fe7e7 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.1 2010/09/20 10:15:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/app_menu_settings.vspx b/appsrc/ODS-Framework/app_menu_settings.vspx
index 2d4b353..ef491ee 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.1 2010/09/20 10:15:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/app_my_inst.vspx b/appsrc/ODS-Framework/app_my_inst.vspx
index 85613d7..5119e6a 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.1 2010/09/20 10:15:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/app_sent_inv.vspx b/appsrc/ODS-Framework/app_sent_inv.vspx
index 834fedd..d28b5e0 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.1 2010/09/20 10:15:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/app_settings.vspx b/appsrc/ODS-Framework/app_settings.vspx
index b269ffd..ddc4fc5 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.3 2011/03/08 13:28:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/back_nav.vspx b/appsrc/ODS-Framework/back_nav.vspx
index d2f27be..351b136 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.1 2010/09/20 10:15:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/cert.vsp b/appsrc/ODS-Framework/cert.vsp
index df7bede..a28659a 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 any;
+ declare exts, login 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,6 +44,8 @@
{
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,
@@ -56,9 +58,10 @@
exts,
hours);
cvalue := xenc_pem_export (kname);
+ login := 1;
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, ''), 0, now ());
- http_rewrite ();
+ values (uid, cvalue, get_certificate_info (6, cvalue, 0, ''), login, 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);
@@ -74,40 +77,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>
@@ -115,7 +118,7 @@
<table border="0">
<tr>
<td nowrap="1">
- Common Name:
+ Common Name:
</td>
<td>
<input type="text" name="cn" value="<?V cn ?>" size="50"/>
@@ -123,7 +126,7 @@
</tr>
<tr>
<td nowrap="1">
- Country:
+ Country:
</td>
<td>
<input type="text" name="c" value="<?V c ?>" size="50"/>
@@ -131,7 +134,7 @@
</tr>
<tr>
<td nowrap="1">
- Organization:
+ Organization:
</td>
<td>
<input type="text" name="o" value="<?V o ?>" size="50"/>
@@ -147,7 +150,7 @@
</tr>
<tr>
<td>
- WebID:
+ WebID:
</td>
<td>
<input type="text" name="webid" value="<?V webid ?>" size="80" />
@@ -155,7 +158,7 @@
</tr>
<tr>
<td>
- Key strength:
+ Key strength:
</td>
<td>
<keygen name="pubkey" />
@@ -163,7 +166,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/ckeditor.js b/appsrc/ODS-Framework/ckeditor/ckeditor.js
index bd85726..4c8557b 100644
--- a/appsrc/ODS-Framework/ckeditor/ckeditor.js
+++ b/appsrc/ODS-Framework/ckeditor/ckeditor.js
@@ -1,147 +1,151 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'B5GJ5GG',version:'3.6.1',revision:'7072',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;if(!d)throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/'&&!/[&?]t=/.test(d))d+=(d.indexOf('?')>=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();var a=CKEDITOR;if(!a.event){a.event=function(){};a.event.implementOn=function(b){var c=a.event.prototype;for(var d in c){if(b[d]==undefined)b[d]=c[d];}};a.event.prototype=(function(){var b=function(d){var e=d.getPrivate&&d.getPrivate()||d._||(d._={});return e.events||(e.events={});},c=function(d){this.name=d;this.listeners=[];};c.prototype={getListenerIndex:function(d){for(var e=0,f=this.listeners;e<f.length;e++){if(f[e].fn==d)return e;}return-1;}};return{on:function(d,e,f,g,h){var i=b(this),j=i[d]||(i[d]=new c(d));if(j.getListenerIndex(e)<0){var k=j.listeners;if(!f)f=this;if(isNaN(h))h=10;var l=this,m=function(o,p,q,r){var s={name:d,sender:this,editor:o,data:p,listenerData:g,stop:q,cancel:r,removeListener:function(){l.removeListener(d,e);}};e.call(f,s);return s.data;};m.fn=e;m.priority=h;for(var n=k.length-1;n>=0;n--){if(k[n].priority<=h){k.splice(n+1,0,m);return;}}k.unshift(m);}},fire:(function(){var d=false,e=function(){d=true;},f=false,g=function(){f=true;};return function(h,i,j){var k=b(this)[h],l=d,m=f;d=f=false;if(k){var n=k.listeners;if(n.length){n=n.slice(0);for(var o=0;o<n.length;o++){var p=n[o].call(this,j,i,e,g);if(typeof p!='undefined')i=p;if(d||f)break;}}}var q=f||(typeof i=='undefined'?false:i);d=l;f=m;return q;};})(),fireOnce:function(d,e,f){var g=this.fire(d,e,f);delete b(this)[d];return g;},removeListener:function(d,e){var f=b(this)[d];if(f){var g=f.getListenerIndex(e);if(g>=0)f.listeners.splice(g,1);
-}},hasListeners:function(d){var e=b(this)[d];return e&&e.listeners.length>0;}};})();}if(!a.editor){a.ELEMENT_MODE_NONE=0;a.ELEMENT_MODE_REPLACE=1;a.ELEMENT_MODE_APPENDTO=2;a.editor=function(b,c,d,e){var f=this;f._={instanceConfig:b,element:c,data:e};f.elementMode=d||0;a.event.call(f);f._init();};a.editor.replace=function(b,c){var d=b;if(typeof d!='object'){d=document.getElementById(b);if(d&&d.tagName.toLowerCase() in {style:1,script:1,base:1,link:1,meta:1,title:1})d=null;if(!d){var e=0,f=document.getElementsByName(b);while((d=f[e++])&&d.tagName.toLowerCase()!='textarea'){}}if(!d)throw '[CKEDITOR.editor.replace] The element with id or name "'+b+'" was not found.';}d.style.visibility='hidden';return new a.editor(c,d,1);};a.editor.appendTo=function(b,c,d){var e=b;if(typeof e!='object'){e=document.getElementById(b);if(!e)throw '[CKEDITOR.editor.appendTo] The element with id "'+b+'" was not found.';}return new a.editor(c,e,2,d);};a.editor.prototype={_init:function(){var b=a.editor._pending||(a.editor._pending=[]);b.push(this);},fire:function(b,c){return a.event.prototype.fire.call(this,b,c,this);},fireOnce:function(b,c){return a.event.prototype.fireOnce.call(this,b,c,this);}};a.event.implementOn(a.editor.prototype,true);}if(!a.env)a.env=(function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,d={ie:/*@cc_on!@*/false,opera:!!c&&c.version,webkit:b.indexOf(' applewebkit/')>-1,air:b.indexOf(' adobeair/')>-1,mac:b.indexOf('macintosh')>-1,quirks:document.compatMode=='BackCompat',mobile:b.indexOf('mobile')>-1,isCustomDomain:function(){if(!this.ie)return false;var g=document.domain,h=window.location.hostname;return g!=h&&g!='['+h+']';},secure:location.protocol=='https:'};d.gecko=navigator.product=='Gecko'&&!d.webkit&&!d.opera;var e=0;if(d.ie){e=parseFloat(b.match(/msie (\d+)/)[1]);d.ie8=!!document.documentMode;d.ie8Compat=document.documentMode==8;d.ie9Compat=document.documentMode==9;d.ie7Compat=e==7&&!document.documentMode||document.documentMode==7;d.ie6Compat=e<7||d.quirks;}if(d.gecko){var f=b.match(/rv:([\d\.]+)/);if(f){f=f[1].split('.');e=f[0]*10000+(f[1]||0)*100+ +(f[2]||0);}}if(d.opera)e=parseFloat(c.version());if(d.air)e=parseFloat(b.match(/ adobeair\/(\d+)/)[1]);if(d.webkit)e=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]);d.version=e;d.isCompatible=!d.mobile&&(d.ie&&e>=6||d.gecko&&e>=10801||d.opera&&e>=9.5||d.air&&e>=1||d.webkit&&e>=522||false);d.cssClass='cke_browser_'+(d.ie?'ie':d.gecko?'gecko':d.opera?'opera':d.webkit?'webkit':'unknown');
+(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'C3HA5RM',version:'3.6.3',revision:'7474',rnd:Math.floor(Math.random()*900)+100,_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;if(!d)throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/'&&!/[&?]t=/.test(d))d+=(d.indexOf('?')>=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();var a=CKEDITOR;if(!a.event){a.event=function(){};a.event.implementOn=function(b){var c=a.event.prototype;for(var d in c){if(b[d]==undefined)b[d]=c[d];}};a.event.prototype=(function(){var b=function(d){var e=d.getPrivate&&d.getPrivate()||d._||(d._={});return e.events||(e.events={});},c=function(d){this.name=d;this.listeners=[];};c.prototype={getListenerIndex:function(d){for(var e=0,f=this.listeners;e<f.length;e++){if(f[e].fn==d)return e;}return-1;}};return{on:function(d,e,f,g,h){var i=b(this),j=i[d]||(i[d]=new c(d));if(j.getListenerIndex(e)<0){var k=j.listeners;if(!f)f=this;if(isNaN(h))h=10;var l=this,m=function(o,p,q,r){var s={name:d,sender:this,editor:o,data:p,listenerData:g,stop:q,cancel:r,removeListener:function(){l.removeListener(d,e);}};e.call(f,s);return s.data;};m.fn=e;m.priority=h;for(var n=k.length-1;n>=0;n--){if(k[n].priority<=h){k.splice(n+1,0,m);return;}}k.unshift(m);}},fire:(function(){var d=false,e=function(){d=true;},f=false,g=function(){f=true;};return function(h,i,j){var k=b(this)[h],l=d,m=f;d=f=false;if(k){var n=k.listeners;if(n.length){n=n.slice(0);for(var o=0;o<n.length;o++){var p=n[o].call(this,j,i,e,g);if(typeof p!='undefined')i=p;if(d||f)break;}}}var q=f||(typeof i=='undefined'?false:i);d=l;f=m;return q;};})(),fireOnce:function(d,e,f){var g=this.fire(d,e,f);delete b(this)[d];return g;},removeListener:function(d,e){var f=b(this)[d];if(f){var g=f.getListenerIndex(e);
+if(g>=0)f.listeners.splice(g,1);}},hasListeners:function(d){var e=b(this)[d];return e&&e.listeners.length>0;}};})();}if(!a.editor){a.ELEMENT_MODE_NONE=0;a.ELEMENT_MODE_REPLACE=1;a.ELEMENT_MODE_APPENDTO=2;a.editor=function(b,c,d,e){var f=this;f._={instanceConfig:b,element:c,data:e};f.elementMode=d||0;a.event.call(f);f._init();};a.editor.replace=function(b,c){var d=b;if(typeof d!='object'){d=document.getElementById(b);if(d&&d.tagName.toLowerCase() in {style:1,script:1,base:1,link:1,meta:1,title:1})d=null;if(!d){var e=0,f=document.getElementsByName(b);while((d=f[e++])&&d.tagName.toLowerCase()!='textarea'){}}if(!d)throw '[CKEDITOR.editor.replace] The element with id or name "'+b+'" was not found.';}d.style.visibility='hidden';return new a.editor(c,d,1);};a.editor.appendTo=function(b,c,d){var e=b;if(typeof e!='object'){e=document.getElementById(b);if(!e)throw '[CKEDITOR.editor.appendTo] The element with id "'+b+'" was not found.';}return new a.editor(c,e,2,d);};a.editor.prototype={_init:function(){var b=a.editor._pending||(a.editor._pending=[]);b.push(this);},fire:function(b,c){return a.event.prototype.fire.call(this,b,c,this);},fireOnce:function(b,c){return a.event.prototype.fireOnce.call(this,b,c,this);}};a.event.implementOn(a.editor.prototype,true);}if(!a.env)a.env=(function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,d={ie:/*@cc_on!@*/false,opera:!!c&&c.version,webkit:b.indexOf(' applewebkit/')>-1,air:b.indexOf(' adobeair/')>-1,mac:b.indexOf('macintosh')>-1,quirks:document.compatMode=='BackCompat',mobile:b.indexOf('mobile')>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var g=document.domain,h=window.location.hostname;return g!=h&&g!='['+h+']';},secure:location.protocol=='https:'};d.gecko=navigator.product=='Gecko'&&!d.webkit&&!d.opera;var e=0;if(d.ie){e=parseFloat(b.match(/msie (\d+)/)[1]);d.ie8=!!document.documentMode;d.ie8Compat=document.documentMode==8;d.ie9Compat=document.documentMode==9;d.ie7Compat=e==7&&!document.documentMode||document.documentMode==7;d.ie6Compat=e<7||d.quirks;}if(d.gecko){var f=b.match(/rv:([\d\.]+)/);if(f){f=f[1].split('.');e=f[0]*10000+(f[1]||0)*100+ +(f[2]||0);}}if(d.opera)e=parseFloat(c.version());if(d.air)e=parseFloat(b.match(/ adobeair\/(\d+)/)[1]);if(d.webkit)e=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]);d.version=e;d.isCompatible=d.iOS&&e>=534||!d.mobile&&(d.ie&&e>=6||d.gecko&&e>=10801||d.opera&&e>=9.5||d.air&&e>=1||d.webkit&&e>=522||false);d.cssClass='cke_browser_'+(d.ie?'ie':d.gecko?'gecko':d.opera?'opera':d.webkit?'webkit':'unknown');
if(d.quirks)d.cssClass+=' cke_browser_quirks';if(d.ie){d.cssClass+=' cke_browser_ie'+(d.version<7?'6':d.version>=8?document.documentMode:'7');if(d.quirks)d.cssClass+=' cke_browser_iequirks';}if(d.gecko&&e<10900)d.cssClass+=' cke_browser_gecko18';if(d.air)d.cssClass+=' cke_browser_air';return d;})();var b=a.env;var c=b.ie;if(a.status=='unloaded')(function(){a.event.implementOn(a);a.loadFullCore=function(){if(a.status!='basic_ready'){a.loadFullCore._load=1;return;}delete a.loadFullCore;var e=document.createElement('script');e.type='text/javascript';e.src=a.basePath+'ckeditor.js';document.getElementsByTagName('head')[0].appendChild(e);};a.loadFullCoreTimeout=0;a.replaceClass='ckeditor';a.replaceByClassEnabled=1;var d=function(e,f,g,h){if(b.isCompatible){if(a.loadFullCore)a.loadFullCore();var i=g(e,f,h);a.add(i);return i;}return null;};a.replace=function(e,f){return d(e,f,a.editor.replace);};a.appendTo=function(e,f,g){return d(e,f,a.editor.appendTo,g);};a.add=function(e){var f=this._.pending||(this._.pending=[]);f.push(e);};a.replaceAll=function(){var e=document.getElementsByTagName('textarea');for(var f=0;f<e.length;f++){var g=null,h=e[f];if(!h.name&&!h.id)continue;if(typeof arguments[0]=='string'){var i=new RegExp('(?:^|\\s)'+arguments[0]+'(?:$|\\s)');if(!i.test(h.className))continue;}else if(typeof arguments[0]=='function'){g={};if(arguments[0](h,g)===false)continue;}this.replace(h,g);}};(function(){var e=function(){var f=a.loadFullCore,g=a.loadFullCoreTimeout;if(a.replaceByClassEnabled)a.replaceAll(a.replaceClass);a.status='basic_ready';if(f&&f._load)f();else if(g)setTimeout(function(){if(a.loadFullCore)a.loadFullCore();},g*1000);};if(window.addEventListener)window.addEventListener('load',e,false);else if(window.attachEvent)window.attachEvent('onload',e);})();a.status='basic_loaded';})();a.dom={};var d=a.dom;(function(){var e=[];a.on('reset',function(){e=[];});a.tools={arrayCompare:function(f,g){if(!f&&!g)return true;if(!f||!g||f.length!=g.length)return false;for(var h=0;h<f.length;h++){if(f[h]!=g[h])return false;}return true;},clone:function(f){var g;if(f&&f instanceof Array){g=[];for(var h=0;h<f.length;h++)g[h]=this.clone(f[h]);return g;}if(f===null||typeof f!='object'||f instanceof String||f instanceof Number||f instanceof Boolean||f instanceof Date||f instanceof RegExp)return f;g=new f.constructor();for(var i in f){var j=f[i];g[i]=this.clone(j);}return g;},capitalize:function(f){return f.charAt(0).toUpperCase()+f.substring(1).toLowerCase();},extend:function(f){var g=arguments.length,h,i;
if(typeof (h=arguments[g-1])=='boolean')g--;else if(typeof (h=arguments[g-2])=='boolean'){i=arguments[g-1];g-=2;}for(var j=1;j<g;j++){var k=arguments[j];for(var l in k){if(h===true||f[l]==undefined)if(!i||l in i)f[l]=k[l];}}return f;},prototypedCopy:function(f){var g=function(){};g.prototype=f;return new g();},isArray:function(f){return!!f&&f instanceof Array;},isEmpty:function(f){for(var g in f){if(f.hasOwnProperty(g))return false;}return true;},cssStyleToDomStyle:(function(){var f=document.createElement('div').style,g=typeof f.cssFloat!='undefined'?'cssFloat':typeof f.styleFloat!='undefined'?'styleFloat':'float';return function(h){if(h=='float')return g;else return h.replace(/-./g,function(i){return i.substr(1).toUpperCase();});};})(),buildStyleHtml:function(f){f=[].concat(f);var g,h=[];for(var i=0;i<f.length;i++){g=f[i];if(/@import|[{}]/.test(g))h.push('<style>'+g+'</style>');else h.push('<link type="text/css" rel=stylesheet href="'+g+'">');}return h.join('');},htmlEncode:function(f){var g=function(k){var l=new d.element('span');l.setText(k);return l.getHtml();},h=g('\n').toLowerCase()=='<br>'?function(k){return g(k).replace(/<br>/gi,'\n');}:g,i=g('>')=='>'?function(k){return h(k).replace(/>/g,'>');}:h,j=g(' ')==' '?function(k){return i(k).replace(/ /g,' ');}:i;this.htmlEncode=j;return this.htmlEncode(f);},htmlEncodeAttr:function(f){return f.replace(/"/g,'"').replace(/</g,'<').replace(/>/g,'>');},getNextNumber:(function(){var f=0;return function(){return++f;};})(),getNextId:function(){return 'cke_'+this.getNextNumber();},override:function(f,g){return g(f);},setTimeout:function(f,g,h,i,j){if(!j)j=window;if(!h)h=j;return j.setTimeout(function(){if(i)f.apply(h,[].concat(i));else f.apply(h);},g||0);},trim:(function(){var f=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(g){return g.replace(f,'');};})(),ltrim:(function(){var f=/^[ \t\n\r]+/g;return function(g){return g.replace(f,'');};})(),rtrim:(function(){var f=/[ \t\n\r]+$/g;return function(g){return g.replace(f,'');};})(),indexOf:Array.prototype.indexOf?function(f,g){return f.indexOf(g);}:function(f,g){for(var h=0,i=f.length;h<i;h++){if(f[h]===g)return h;}return-1;},bind:function(f,g){return function(){return f.apply(g,arguments);};},createClass:function(f){var g=f.$,h=f.base,i=f.privates||f._,j=f.proto,k=f.statics;if(i){var l=g;g=function(){var p=this;var m=p._||(p._={});for(var n in i){var o=i[n];m[n]=typeof o=='function'?a.tools.bind(o,p):o;}l.apply(p,arguments);};}if(h){g.prototype=this.prototypedCopy(h.prototype);
g.prototype['constructor']=g;g.prototype.base=function(){this.base=h.prototype.base;h.apply(this,arguments);this.base=arguments.callee;};}if(j)this.extend(g.prototype,j,true);if(k)this.extend(g,k,true);return g;},addFunction:function(f,g){return e.push(function(){return f.apply(g||this,arguments);})-1;},removeFunction:function(f){e[f]=null;},callFunction:function(f){var g=e[f];return g&&g.apply(window,Array.prototype.slice.call(arguments,1));},cssLength:(function(){return function(f){return f+(!f||isNaN(Number(f))?'':'px');};})(),convertToPx:(function(){var f;return function(g){if(!f){f=d.element.createFromHtml('<div style="position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"></div>',a.document);a.document.getBody().append(f);}if(!/%$/.test(g)){f.setStyle('width',g);return f.$.clientWidth;}return g;};})(),repeat:function(f,g){return new Array(g+1).join(f);},tryThese:function(){var f;for(var g=0,h=arguments.length;g<h;g++){var i=arguments[g];try{f=i();break;}catch(j){}}return f;},genKey:function(){return Array.prototype.slice.call(arguments).join('-');}};})();var e=a.tools;a.dtd=(function(){var f=e.extend,g={isindex:1,fieldset:1},h={input:1,button:1,select:1,textarea:1,label:1},i=f({a:1},h),j=f({iframe:1},i),k={hr:1,ul:1,menu:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,mark:1,time:1,meter:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1},l={ins:1,del:1,script:1,style:1},m=f({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1,wbr:1},l),n=f({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1,mark:1},m),o=f({p:1},n),p=f({iframe:1},n,h),q={img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,mark:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1},r=f({a:1},p),s={tr:1},t={'#':1},u=f({param:1},q),v=f({form:1},g,j,k,o),w={li:1},x={style:1,script:1},y={base:1,link:1,meta:1,title:1},z=f(y,x),A={head:1,body:1},B={html:1},C={address:1,blockquote:1,center:1,dir:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1};
return{$nonBodyContent:f(B,A,y),$block:C,$blockLimit:{body:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,td:1,th:1,caption:1,form:1},$inline:r,$body:f({script:1,style:1},C),$cdata:{script:1,style:1},$empty:{area:1,base:1,br:1,col:1,hr:1,img:1,input:1,link:1,meta:1,param:1,wbr:1},$listItem:{dd:1,dt:1,li:1},$list:{ul:1,ol:1,dl:1},$nonEditable:{applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1,param:1,audio:1,video:1},$captionBlock:{caption:1,legend:1},$removeEmpty:{abbr:1,acronym:1,address:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1,mark:1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},html:A,head:z,style:t,script:t,body:v,base:{},link:{},meta:{},title:t,col:{},tr:{td:1,th:1},img:{},colgroup:{col:1},noscript:v,td:v,br:{},wbr:{},th:v,center:v,kbd:r,button:f(o,k),basefont:{},h5:r,h4:r,samp:r,h6:r,ol:w,h1:r,h3:r,option:t,h2:r,form:f(g,j,k,o),select:{optgroup:1,option:1},font:r,ins:r,menu:w,abbr:r,label:r,table:{thead:1,col:1,tbody:1,tr:1,colgroup:1,caption:1,tfoot:1},code:r,tfoot:s,cite:r,li:v,input:{},iframe:v,strong:r,textarea:t,noframes:v,big:r,small:r,span:r,hr:{},dt:r,sub:r,optgroup:{option:1},param:{},bdo:r,'var':r,div:v,object:u,sup:r,dd:v,strike:r,area:{},dir:w,map:f({area:1,form:1,p:1},g,l,k),applet:u,dl:{dt:1,dd:1},del:r,isindex:{},fieldset:f({legend:1},q),thead:s,ul:w,acronym:r,b:r,a:p,blockquote:v,caption:r,i:r,u:r,tbody:s,s:r,address:f(j,o),tt:r,legend:r,q:r,pre:f(m,i),p:r,em:r,dfn:r,section:v,header:v,footer:v,nav:v,article:v,aside:v,figure:v,dialog:v,hgroup:v,mark:r,time:r,meter:r,menu:r,command:r,keygen:r,output:r,progress:u,audio:u,video:u,details:u,datagrid:u,datalist:u};})();var f=a.dtd;d.event=function(g){this.$=g;};d.event.prototype={getKey:function(){return this.$.keyCode||this.$.which;},getKeystroke:function(){var h=this;var g=h.getKey();if(h.$.ctrlKey||h.$.metaKey)g+=1114112;if(h.$.shiftKey)g+=2228224;if(h.$.altKey)g+=4456448;return g;},preventDefault:function(g){var h=this.$;if(h.preventDefault)h.preventDefault();else h.returnValue=false;if(g)this.stopPropagation();},stopPropagation:function(){var g=this.$;if(g.stopPropagation)g.stopPropagation();else g.cancelBubble=true;
-},getTarget:function(){var g=this.$.target||this.$.srcElement;return g?new d.node(g):null;}};a.CTRL=1114112;a.SHIFT=2228224;a.ALT=4456448;d.domObject=function(g){if(g)this.$=g;};d.domObject.prototype=(function(){var g=function(h,i){return function(j){if(typeof a!='undefined')h.fire(i,new d.event(j));};};return{getPrivate:function(){var h;if(!(h=this.getCustomData('_')))this.setCustomData('_',h={});return h;},on:function(h){var k=this;var i=k.getCustomData('_cke_nativeListeners');if(!i){i={};k.setCustomData('_cke_nativeListeners',i);}if(!i[h]){var j=i[h]=g(k,h);if(k.$.attachEvent)k.$.attachEvent('on'+h,j);else if(k.$.addEventListener)k.$.addEventListener(h,j,!!a.event.useCapture);}return a.event.prototype.on.apply(k,arguments);},removeListener:function(h){var k=this;a.event.prototype.removeListener.apply(k,arguments);if(!k.hasListeners(h)){var i=k.getCustomData('_cke_nativeListeners'),j=i&&i[h];if(j){if(k.$.detachEvent)k.$.detachEvent('on'+h,j);else if(k.$.removeEventListener)k.$.removeEventListener(h,j,false);delete i[h];}}},removeAllListeners:function(){var k=this;var h=k.getCustomData('_cke_nativeListeners');for(var i in h){var j=h[i];if(k.$.detachEvent)k.$.detachEvent('on'+i,j);else if(k.$.removeEventListener)k.$.removeEventListener(i,j,false);delete h[i];}}};})();(function(g){var h={};a.on('reset',function(){h={};});g.equals=function(i){return i&&i.$===this.$;};g.setCustomData=function(i,j){var k=this.getUniqueId(),l=h[k]||(h[k]={});l[i]=j;return this;};g.getCustomData=function(i){var j=this.$['data-cke-expando'],k=j&&h[j];return k&&k[i];};g.removeCustomData=function(i){var j=this.$['data-cke-expando'],k=j&&h[j],l=k&&k[i];if(typeof l!='undefined')delete k[i];return l||null;};g.clearCustomData=function(){this.removeAllListeners();var i=this.$['data-cke-expando'];i&&delete h[i];};g.getUniqueId=function(){return this.$['data-cke-expando']||(this.$['data-cke-expando']=e.getNextNumber());};a.event.implementOn(g);})(d.domObject.prototype);d.window=function(g){d.domObject.call(this,g);};d.window.prototype=new d.domObject();e.extend(d.window.prototype,{focus:function(){if(b.webkit&&this.$.parent)this.$.parent.focus();this.$.focus();},getViewPaneSize:function(){var g=this.$.document,h=g.compatMode=='CSS1Compat';return{width:(h?g.documentElement.clientWidth:g.body.clientWidth)||0,height:(h?g.documentElement.clientHeight:g.body.clientHeight)||0};},getScrollPosition:function(){var g=this.$;if('pageXOffset' in g)return{x:g.pageXOffset||0,y:g.pageYOffset||0};else{var h=g.document;
-return{x:h.documentElement.scrollLeft||h.body.scrollLeft||0,y:h.documentElement.scrollTop||h.body.scrollTop||0};}}});d.document=function(g){d.domObject.call(this,g);};var g=d.document;g.prototype=new d.domObject();e.extend(g.prototype,{appendStyleSheet:function(h){if(this.$.createStyleSheet)this.$.createStyleSheet(h);else{var i=new d.element('link');i.setAttributes({rel:'stylesheet',type:'text/css',href:h});this.getHead().append(i);}},appendStyleText:function(h){var k=this;if(k.$.createStyleSheet){var i=k.$.createStyleSheet('');i.cssText=h;}else{var j=new d.element('style',k);j.append(new d.text(h,k));k.getHead().append(j);}},createElement:function(h,i){var j=new d.element(h,this);if(i){if(i.attributes)j.setAttributes(i.attributes);if(i.styles)j.setStyles(i.styles);}return j;},createText:function(h){return new d.text(h,this);},focus:function(){this.getWindow().focus();},getById:function(h){var i=this.$.getElementById(h);return i?new d.element(i):null;},getByAddress:function(h,i){var j=this.$.documentElement;for(var k=0;j&&k<h.length;k++){var l=h[k];if(!i){j=j.childNodes[l];continue;}var m=-1;for(var n=0;n<j.childNodes.length;n++){var o=j.childNodes[n];if(i===true&&o.nodeType==3&&o.previousSibling&&o.previousSibling.nodeType==3)continue;m++;if(m==l){j=o;break;}}}return j?new d.node(j):null;},getElementsByTag:function(h,i){if(!(c&&!(document.documentMode>8))&&i)h=i+':'+h;return new d.nodeList(this.$.getElementsByTagName(h));},getHead:function(){var h=this.$.getElementsByTagName('head')[0];if(!h)h=this.getDocumentElement().append(new d.element('head'),true);else h=new d.element(h);return(this.getHead=function(){return h;})();},getBody:function(){var h=new d.element(this.$.body);return(this.getBody=function(){return h;})();},getDocumentElement:function(){var h=new d.element(this.$.documentElement);return(this.getDocumentElement=function(){return h;})();},getWindow:function(){var h=new d.window(this.$.parentWindow||this.$.defaultView);return(this.getWindow=function(){return h;})();},write:function(h){var i=this;i.$.open('text/html','replace');b.isCustomDomain()&&(i.$.domain=document.domain);i.$.write(h);i.$.close();}});d.node=function(h){if(h){switch(h.nodeType){case 9:return new g(h);case 1:return new d.element(h);case 3:return new d.text(h);}d.domObject.call(this,h);}return this;};d.node.prototype=new d.domObject();a.NODE_ELEMENT=1;a.NODE_DOCUMENT=9;a.NODE_TEXT=3;a.NODE_COMMENT=8;a.NODE_DOCUMENT_FRAGMENT=11;a.POSITION_IDENTICAL=0;a.POSITION_DISCONNECTED=1;a.POSITION_FOLLOWING=2;
-a.POSITION_PRECEDING=4;a.POSITION_IS_CONTAINED=8;a.POSITION_CONTAINS=16;e.extend(d.node.prototype,{appendTo:function(h,i){h.append(this,i);return h;},clone:function(h,i){var j=this.$.cloneNode(h),k=function(l){if(l.nodeType!=1)return;if(!i)l.removeAttribute('id',false);l.removeAttribute('data-cke-expando',false);if(h){var m=l.childNodes;for(var n=0;n<m.length;n++)k(m[n]);}};k(j);return new d.node(j);},hasPrevious:function(){return!!this.$.previousSibling;},hasNext:function(){return!!this.$.nextSibling;},insertAfter:function(h){h.$.parentNode.insertBefore(this.$,h.$.nextSibling);return h;},insertBefore:function(h){h.$.parentNode.insertBefore(this.$,h.$);return h;},insertBeforeMe:function(h){this.$.parentNode.insertBefore(h.$,this.$);return h;},getAddress:function(h){var i=[],j=this.getDocument().$.documentElement,k=this.$;while(k&&k!=j){var l=k.parentNode;if(l)i.unshift(this.getIndex.call({$:k},h));k=l;}return i;},getDocument:function(){return new g(this.$.ownerDocument||this.$.parentNode.ownerDocument);},getIndex:function(h){var i=this.$,j=0;while(i=i.previousSibling){if(h&&i.nodeType==3&&(!i.nodeValue.length||i.previousSibling&&i.previousSibling.nodeType==3))continue;j++;}return j;},getNextSourceNode:function(h,i,j){if(j&&!j.call){var k=j;j=function(n){return!n.equals(k);};}var l=!h&&this.getFirst&&this.getFirst(),m;if(!l){if(this.type==1&&j&&j(this,true)===false)return null;l=this.getNext();}while(!l&&(m=(m||this).getParent())){if(j&&j(m,true)===false)return null;l=m.getNext();}if(!l)return null;if(j&&j(l)===false)return null;if(i&&i!=l.type)return l.getNextSourceNode(false,i,j);return l;},getPreviousSourceNode:function(h,i,j){if(j&&!j.call){var k=j;j=function(n){return!n.equals(k);};}var l=!h&&this.getLast&&this.getLast(),m;if(!l){if(this.type==1&&j&&j(this,true)===false)return null;l=this.getPrevious();}while(!l&&(m=(m||this).getParent())){if(j&&j(m,true)===false)return null;l=m.getPrevious();}if(!l)return null;if(j&&j(l)===false)return null;if(i&&l.type!=i)return l.getPreviousSourceNode(false,i,j);return l;},getPrevious:function(h){var i=this.$,j;do{i=i.previousSibling;j=i&&new d.node(i);}while(j&&h&&!h(j));return j;},getNext:function(h){var i=this.$,j;do{i=i.nextSibling;j=i&&new d.node(i);}while(j&&h&&!h(j));return j;},getParent:function(){var h=this.$.parentNode;return h&&h.nodeType==1?new d.node(h):null;},getParents:function(h){var i=this,j=[];do j[h?'push':'unshift'](i);while(i=i.getParent());return j;},getCommonAncestor:function(h){var j=this;if(h.equals(j))return j;
-if(h.contains&&h.contains(j))return h;var i=j.contains?j:j.getParent();do{if(i.contains(h))return i;}while(i=i.getParent());return null;},getPosition:function(h){var i=this.$,j=h.$;if(i.compareDocumentPosition)return i.compareDocumentPosition(j);if(i==j)return 0;if(this.type==1&&h.type==1){if(i.contains){if(i.contains(j))return 16+4;if(j.contains(i))return 8+2;}if('sourceIndex' in i)return i.sourceIndex<0||j.sourceIndex<0?1:i.sourceIndex<j.sourceIndex?4:2;}var k=this.getAddress(),l=h.getAddress(),m=Math.min(k.length,l.length);for(var n=0;n<=m-1;n++){if(k[n]!=l[n]){if(n<m)return k[n]<l[n]?4:2;break;}}return k.length<l.length?16+4:8+2;},getAscendant:function(h,i){var j=this.$,k;if(!i)j=j.parentNode;while(j){if(j.nodeName&&(k=j.nodeName.toLowerCase(),typeof h=='string'?k==h:k in h))return new d.node(j);j=j.parentNode;}return null;},hasAscendant:function(h,i){var j=this.$;if(!i)j=j.parentNode;while(j){if(j.nodeName&&j.nodeName.toLowerCase()==h)return true;j=j.parentNode;}return false;},move:function(h,i){h.append(this.remove(),i);},remove:function(h){var i=this.$,j=i.parentNode;if(j){if(h)for(var k;k=i.firstChild;)j.insertBefore(i.removeChild(k),i);j.removeChild(i);}return this;},replace:function(h){this.insertBefore(h);h.remove();},trim:function(){this.ltrim();this.rtrim();},ltrim:function(){var k=this;var h;while(k.getFirst&&(h=k.getFirst())){if(h.type==3){var i=e.ltrim(h.getText()),j=h.getLength();if(!i){h.remove();continue;}else if(i.length<j){h.split(j-i.length);k.$.removeChild(k.$.firstChild);}}break;}},rtrim:function(){var k=this;var h;while(k.getLast&&(h=k.getLast())){if(h.type==3){var i=e.rtrim(h.getText()),j=h.getLength();if(!i){h.remove();continue;}else if(i.length<j){h.split(i.length);k.$.lastChild.parentNode.removeChild(k.$.lastChild);}}break;}if(!c&&!b.opera){h=k.$.lastChild;if(h&&h.type==1&&h.nodeName.toLowerCase()=='br')h.parentNode.removeChild(h);}},isReadOnly:function(){var h=this;while(h){if(h.type==1){if(h.is('body')||!!h.data('cke-editable'))break;if(h.getAttribute('contentEditable')=='false')return h;else if(h.getAttribute('contentEditable')=='true')break;}h=h.getParent();}return false;}});d.nodeList=function(h){this.$=h;};d.nodeList.prototype={count:function(){return this.$.length;},getItem:function(h){var i=this.$[h];return i?new d.node(i):null;}};d.element=function(h,i){if(typeof h=='string')h=(i?i.$:document).createElement(h);d.domObject.call(this,h);};var h=d.element;h.get=function(i){return i&&(i.$?i:new h(i));};h.prototype=new d.node();
-h.createFromHtml=function(i,j){var k=new h('div',j);k.setHtml(i);return k.getFirst().remove();};h.setMarker=function(i,j,k,l){var m=j.getCustomData('list_marker_id')||j.setCustomData('list_marker_id',e.getNextNumber()).getCustomData('list_marker_id'),n=j.getCustomData('list_marker_names')||j.setCustomData('list_marker_names',{}).getCustomData('list_marker_names');i[m]=j;n[k]=1;return j.setCustomData(k,l);};h.clearAllMarkers=function(i){for(var j in i)h.clearMarkers(i,i[j],1);};h.clearMarkers=function(i,j,k){var l=j.getCustomData('list_marker_names'),m=j.getCustomData('list_marker_id');for(var n in l)j.removeCustomData(n);j.removeCustomData('list_marker_names');if(k){j.removeCustomData('list_marker_id');delete i[m];}};e.extend(h.prototype,{type:1,addClass:function(i){var j=this.$.className;if(j){var k=new RegExp('(?:^|\\s)'+i+'(?:\\s|$)','');if(!k.test(j))j+=' '+i;}this.$.className=j||i;},removeClass:function(i){var j=this.getAttribute('class');if(j){var k=new RegExp('(?:^|\\s+)'+i+'(?=\\s|$)','i');if(k.test(j)){j=j.replace(k,'').replace(/^\s+/,'');if(j)this.setAttribute('class',j);else this.removeAttribute('class');}}},hasClass:function(i){var j=new RegExp('(?:^|\\s+)'+i+'(?=\\s|$)','');return j.test(this.getAttribute('class'));},append:function(i,j){var k=this;if(typeof i=='string')i=k.getDocument().createElement(i);if(j)k.$.insertBefore(i.$,k.$.firstChild);else k.$.appendChild(i.$);return i;},appendHtml:function(i){var k=this;if(!k.$.childNodes.length)k.setHtml(i);else{var j=new h('div',k.getDocument());j.setHtml(i);j.moveChildren(k);}},appendText:function(i){if(this.$.text!=undefined)this.$.text+=i;else this.append(new d.text(i));},appendBogus:function(){var k=this;var i=k.getLast();while(i&&i.type==3&&!e.rtrim(i.getText()))i=i.getPrevious();if(!i||!i.is||!i.is('br')){var j=b.opera?k.getDocument().createText(''):k.getDocument().createElement('br');b.gecko&&j.setAttribute('type','_moz');k.append(j);}},breakParent:function(i){var l=this;var j=new d.range(l.getDocument());j.setStartAfter(l);j.setEndAfter(i);var k=j.extractContents();j.insertNode(l.remove());k.insertAfterNode(l);},contains:c||b.webkit?function(i){var j=this.$;return i.type!=1?j.contains(i.getParent().$):j!=i.$&&j.contains(i.$);}:function(i){return!!(this.$.compareDocumentPosition(i.$)&16);},focus:(function(){function i(){try{this.$.focus();}catch(j){}};return function(j){if(j)e.setTimeout(i,100,this);else i.call(this);};})(),getHtml:function(){var i=this.$.innerHTML;return c?i.replace(/<\?[^>]*>/g,''):i;
-},getOuterHtml:function(){var j=this;if(j.$.outerHTML)return j.$.outerHTML.replace(/<\?[^>]*>/,'');var i=j.$.ownerDocument.createElement('div');i.appendChild(j.$.cloneNode(true));return i.innerHTML;},setHtml:function(i){return this.$.innerHTML=i;},setText:function(i){h.prototype.setText=this.$.innerText!=undefined?function(j){return this.$.innerText=j;}:function(j){return this.$.textContent=j;};return this.setText(i);},getAttribute:(function(){var i=function(j){return this.$.getAttribute(j,2);};if(c&&(b.ie7Compat||b.ie6Compat))return function(j){var n=this;switch(j){case 'class':j='className';break;case 'http-equiv':j='httpEquiv';break;case 'name':return n.$.name;case 'tabindex':var k=i.call(n,j);if(k!==0&&n.$.tabIndex===0)k=null;return k;break;case 'checked':var l=n.$.attributes.getNamedItem(j),m=l.specified?l.nodeValue:n.$.checked;return m?'checked':null;case 'hspace':case 'value':return n.$[j];case 'style':return n.$.style.cssText;}return i.call(n,j);};else return i;})(),getChildren:function(){return new d.nodeList(this.$.childNodes);},getComputedStyle:c?function(i){return this.$.currentStyle[e.cssStyleToDomStyle(i)];}:function(i){return this.getWindow().$.getComputedStyle(this.$,'').getPropertyValue(i);},getDtd:function(){var i=f[this.getName()];this.getDtd=function(){return i;};return i;},getElementsByTag:g.prototype.getElementsByTag,getTabIndex:c?function(){var i=this.$.tabIndex;if(i===0&&!f.$tabIndex[this.getName()]&&parseInt(this.getAttribute('tabindex'),10)!==0)i=-1;return i;}:b.webkit?function(){var i=this.$.tabIndex;if(i==undefined){i=parseInt(this.getAttribute('tabindex'),10);if(isNaN(i))i=-1;}return i;}:function(){return this.$.tabIndex;},getText:function(){return this.$.textContent||this.$.innerText||'';},getWindow:function(){return this.getDocument().getWindow();},getId:function(){return this.$.id||null;},getNameAtt:function(){return this.$.name||null;},getName:function(){var i=this.$.nodeName.toLowerCase();if(c&&!(document.documentMode>8)){var j=this.$.scopeName;if(j!='HTML')i=j.toLowerCase()+':'+i;}return(this.getName=function(){return i;})();},getValue:function(){return this.$.value;},getFirst:function(i){var j=this.$.firstChild,k=j&&new d.node(j);if(k&&i&&!i(k))k=k.getNext(i);return k;},getLast:function(i){var j=this.$.lastChild,k=j&&new d.node(j);if(k&&i&&!i(k))k=k.getPrevious(i);return k;},getStyle:function(i){return this.$.style[e.cssStyleToDomStyle(i)];},is:function(){var i=this.getName();for(var j=0;j<arguments.length;j++){if(arguments[j]==i)return true;
-}return false;},isEditable:function(){if(this.isReadOnly())return false;var i=this.getName(),j=!f.$nonEditable[i]&&(f[i]||f.span);return j&&j['#'];},isIdentical:function(i){if(this.getName()!=i.getName())return false;var j=this.$.attributes,k=i.$.attributes,l=j.length,m=k.length;for(var n=0;n<l;n++){var o=j[n];if(o.nodeName=='_moz_dirty')continue;if((!c||o.specified&&o.nodeName!='data-cke-expando')&&o.nodeValue!=i.getAttribute(o.nodeName))return false;}if(c)for(n=0;n<m;n++){o=k[n];if(o.specified&&o.nodeName!='data-cke-expando'&&o.nodeValue!=this.getAttribute(o.nodeName))return false;}return true;},isVisible:function(){var i=!!this.$.offsetHeight&&this.getComputedStyle('visibility')!='hidden',j,k;if(i&&(b.webkit||b.opera)){j=this.getWindow();if(!j.equals(a.document.getWindow())&&(k=j.$.frameElement))i=new h(k).isVisible();}return i;},isEmptyInlineRemoveable:function(){if(!f.$removeEmpty[this.getName()])return false;var i=this.getChildren();for(var j=0,k=i.count();j<k;j++){var l=i.getItem(j);if(l.type==1&&l.data('cke-bookmark'))continue;if(l.type==1&&!l.isEmptyInlineRemoveable()||l.type==3&&e.trim(l.getText()))return false;}return true;},hasAttributes:c&&(b.ie7Compat||b.ie6Compat)?function(){var i=this.$.attributes;for(var j=0;j<i.length;j++){var k=i[j];switch(k.nodeName){case 'class':if(this.getAttribute('class'))return true;case 'data-cke-expando':continue;default:if(k.specified)return true;}}return false;}:function(){var i=this.$.attributes,j=i.length,k={'data-cke-expando':1,_moz_dirty:1};return j>0&&(j>2||!k[i[0].nodeName]||j==2&&!k[i[1].nodeName]);},hasAttribute:(function(){function i(j){var k=this.$.attributes.getNamedItem(j);return!!(k&&k.specified);};return c&&b.version<8?function(j){if(j=='name')return!!this.$.name;return i.call(this,j);}:i;})(),hide:function(){this.setStyle('display','none');},moveChildren:function(i,j){var k=this.$;i=i.$;if(k==i)return;var l;if(j)while(l=k.lastChild)i.insertBefore(k.removeChild(l),i.firstChild);else while(l=k.firstChild)i.appendChild(k.removeChild(l));},mergeSiblings:(function(){function i(j,k,l){if(k&&k.type==1){var m=[];while(k.data('cke-bookmark')||k.isEmptyInlineRemoveable()){m.push(k);k=l?k.getNext():k.getPrevious();if(!k||k.type!=1)return;}if(j.isIdentical(k)){var n=l?j.getLast():j.getFirst();while(m.length)m.shift().move(j,!l);k.moveChildren(j,!l);k.remove();if(n&&n.type==1)n.mergeSiblings();}}};return function(j){var k=this;if(!(j===false||f.$removeEmpty[k.getName()]||k.is('a')))return;i(k,k.getNext(),true);
-i(k,k.getPrevious());};})(),show:function(){this.setStyles({display:'',visibility:''});},setAttribute:(function(){var i=function(j,k){this.$.setAttribute(j,k);return this;};if(c&&(b.ie7Compat||b.ie6Compat))return function(j,k){var l=this;if(j=='class')l.$.className=k;else if(j=='style')l.$.style.cssText=k;else if(j=='tabindex')l.$.tabIndex=k;else if(j=='checked')l.$.checked=k;else i.apply(l,arguments);return l;};else if(b.ie8Compat&&b.secure)return function(j,k){if(j=='src'&&k.match(/^http:\/\//))try{i.apply(this,arguments);}catch(l){}else i.apply(this,arguments);return this;};else return i;})(),setAttributes:function(i){for(var j in i)this.setAttribute(j,i[j]);return this;},setValue:function(i){this.$.value=i;return this;},removeAttribute:(function(){var i=function(j){this.$.removeAttribute(j);};if(c&&(b.ie7Compat||b.ie6Compat))return function(j){if(j=='class')j='className';else if(j=='tabindex')j='tabIndex';i.call(this,j);};else return i;})(),removeAttributes:function(i){if(e.isArray(i))for(var j=0;j<i.length;j++)this.removeAttribute(i[j]);else for(var k in i)i.hasOwnProperty(k)&&this.removeAttribute(k);},removeStyle:function(i){var j=this;j.setStyle(i,'');if(j.$.style.removeAttribute)j.$.style.removeAttribute(e.cssStyleToDomStyle(i));if(!j.$.style.cssText)j.removeAttribute('style');},setStyle:function(i,j){this.$.style[e.cssStyleToDomStyle(i)]=j;return this;},setStyles:function(i){for(var j in i)this.setStyle(j,i[j]);return this;},setOpacity:function(i){if(c){i=Math.round(i*100);this.setStyle('filter',i>=100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+i+')');}else this.setStyle('opacity',i);},unselectable:b.gecko?function(){this.$.style.MozUserSelect='none';this.on('dragstart',function(i){i.data.preventDefault();});}:b.webkit?function(){this.$.style.KhtmlUserSelect='none';this.on('dragstart',function(i){i.data.preventDefault();});}:function(){if(c||b.opera){var i=this.$,j,k=0;i.unselectable='on';while(j=i.all[k++])switch(j.tagName.toLowerCase()){case 'iframe':case 'textarea':case 'input':case 'select':break;default:j.unselectable='on';}}},getPositionedAncestor:function(){var i=this;while(i.getName()!='html'){if(i.getComputedStyle('position')!='static')return i;i=i.getParent();}return null;},getDocumentPosition:function(i){var D=this;var j=0,k=0,l=D.getDocument().getBody(),m=D.getDocument().$.compatMode=='BackCompat',n=D.getDocument();if(document.documentElement.getBoundingClientRect){var o=D.$.getBoundingClientRect(),p=n.$,q=p.documentElement,r=q.clientTop||l.$.clientTop||0,s=q.clientLeft||l.$.clientLeft||0,t=true;
-if(c){var u=n.getDocumentElement().contains(D),v=n.getBody().contains(D);t=m&&v||!m&&u;}if(t){j=o.left+(!m&&q.scrollLeft||l.$.scrollLeft);j-=s;k=o.top+(!m&&q.scrollTop||l.$.scrollTop);k-=r;}}else{var w=D,x=null,y;while(w&&!(w.getName()=='body'||w.getName()=='html')){j+=w.$.offsetLeft-w.$.scrollLeft;k+=w.$.offsetTop-w.$.scrollTop;if(!w.equals(D)){j+=w.$.clientLeft||0;k+=w.$.clientTop||0;}var z=x;while(z&&!z.equals(w)){j-=z.$.scrollLeft;k-=z.$.scrollTop;z=z.getParent();}x=w;w=(y=w.$.offsetParent)?new h(y):null;}}if(i){var A=D.getWindow(),B=i.getWindow();if(!A.equals(B)&&A.$.frameElement){var C=new h(A.$.frameElement).getDocumentPosition(i);j+=C.x;k+=C.y;}}if(!document.documentElement.getBoundingClientRect)if(b.gecko&&!m){j+=D.$.clientLeft?1:0;k+=D.$.clientTop?1:0;}return{x:j,y:k};},scrollIntoView:function(i){var o=this;var j=o.getWindow(),k=j.getViewPaneSize().height,l=k*-1;if(i)l+=k;else{l+=o.$.offsetHeight||0;l+=parseInt(o.getComputedStyle('marginBottom')||0,10)||0;}var m=o.getDocumentPosition();l+=m.y;l=l<0?0:l;var n=j.getScrollPosition().y;if(l>n||l<n-k)j.$.scrollTo(0,l);},setState:function(i){var j=this;switch(i){case 1:j.addClass('cke_on');j.removeClass('cke_off');j.removeClass('cke_disabled');break;case 0:j.addClass('cke_disabled');j.removeClass('cke_off');j.removeClass('cke_on');break;default:j.addClass('cke_off');j.removeClass('cke_on');j.removeClass('cke_disabled');break;}},getFrameDocument:function(){var i=this.$;try{i.contentWindow.document;}catch(j){i.src=i.src;if(c&&b.version<7)window.showModalDialog('javascript:document.write("<script>window.setTimeout(function(){window.close();},50);</script>")');}return i&&new g(i.contentWindow.document);},copyAttributes:function(i,j){var p=this;var k=p.$.attributes;j=j||{};for(var l=0;l<k.length;l++){var m=k[l],n=m.nodeName.toLowerCase(),o;if(n in j)continue;if(n=='checked'&&(o=p.getAttribute(n)))i.setAttribute(n,o);else if(m.specified||c&&m.nodeValue&&n=='value'){o=p.getAttribute(n);if(o===null)o=m.nodeValue;i.setAttribute(n,o);}}if(p.$.style.cssText!=='')i.$.style.cssText=p.$.style.cssText;},renameNode:function(i){var l=this;if(l.getName()==i)return;var j=l.getDocument(),k=new h(i,j);l.copyAttributes(k);l.moveChildren(k);l.getParent()&&l.$.parentNode.replaceChild(k.$,l.$);k.$['data-cke-expando']=l.$['data-cke-expando'];l.$=k.$;},getChild:function(i){var j=this.$;if(!i.slice)j=j.childNodes[i];else while(i.length>0&&j)j=j.childNodes[i.shift()];return j?new d.node(j):null;},getChildCount:function(){return this.$.childNodes.length;
-},disableContextMenu:function(){this.on('contextmenu',function(i){if(!i.data.getTarget().hasClass('cke_enable_context_menu'))i.data.preventDefault();});},getDirection:function(i){var j=this;return i?j.getComputedStyle('direction')||j.getDirection()||j.getDocument().$.dir||j.getDocument().getBody().getDirection(1):j.getStyle('direction')||j.getAttribute('dir');},data:function(i,j){i='data-'+i;if(j===undefined)return this.getAttribute(i);else if(j===false)this.removeAttribute(i);else this.setAttribute(i,j);return null;}});(function(){var i={width:['border-left-width','border-right-width','padding-left','padding-right'],height:['border-top-width','border-bottom-width','padding-top','padding-bottom']};function j(k){var l=0;for(var m=0,n=i[k].length;m<n;m++)l+=parseInt(this.getComputedStyle(i[k][m])||0,10)||0;return l;};h.prototype.setSize=function(k,l,m){if(typeof l=='number'){if(m&&!(c&&b.quirks))l-=j.call(this,k);this.setStyle(k,l+'px');}};h.prototype.getSize=function(k,l){var m=Math.max(this.$['offset'+e.capitalize(k)],this.$['client'+e.capitalize(k)])||0;if(l)m-=j.call(this,k);return m;};})();a.command=function(i,j){this.uiItems=[];this.exec=function(k){if(this.state==0)return false;if(this.editorFocus)i.focus();return j.exec.call(this,i,k)!==false;};e.extend(this,j,{modes:{wysiwyg:1},editorFocus:1,state:2});a.event.call(this);};a.command.prototype={enable:function(){var i=this;if(i.state==0)i.setState(!i.preserveState||typeof i.previousState=='undefined'?2:i.previousState);},disable:function(){this.setState(0);},setState:function(i){var j=this;if(j.state==i)return false;j.previousState=j.state;j.state=i;j.fire('state');return true;},toggleState:function(){var i=this;if(i.state==2)i.setState(1);else if(i.state==1)i.setState(2);}};a.event.implementOn(a.command.prototype,true);a.ENTER_P=1;a.ENTER_BR=2;a.ENTER_DIV=3;a.config={customConfig:'config.js',autoUpdateElement:true,baseHref:'',contentsCss:a.basePath+'contents.css',contentsLangDirection:'ui',contentsLanguage:'',language:'',defaultLanguage:'en',enterMode:1,forceEnterMode:false,shiftEnterMode:2,corePlugins:'',docType:'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',bodyId:'',bodyClass:'',fullPage:false,height:200,plugins:'about,a11yhelp,basicstyles,bidi,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,dialogadvtab,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,iframe,image,indent,justify,keystrokes,link,list,liststyle,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',extraPlugins:'',removePlugins:'',protectedSource:[],tabIndex:0,theme:'default',skin:'kama',width:'',baseFloatZIndex:10000};
-var i=a.config;a.focusManager=function(j){if(j.focusManager)return j.focusManager;this.hasFocus=false;this._={editor:j};return this;};a.focusManager.prototype={focus:function(){var k=this;if(k._.timer)clearTimeout(k._.timer);if(!k.hasFocus){if(a.currentInstance)a.currentInstance.focusManager.forceBlur();var j=k._.editor;j.container.getChild(1).addClass('cke_focus');k.hasFocus=true;j.fire('focus');}},blur:function(){var j=this;if(j._.timer)clearTimeout(j._.timer);j._.timer=setTimeout(function(){delete j._.timer;j.forceBlur();},100);},forceBlur:function(){if(this.hasFocus){var j=this._.editor;j.container.getChild(1).removeClass('cke_focus');this.hasFocus=false;j.fire('blur');}}};(function(){var j={};a.lang={languages:{af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,el:1,'en-au':1,'en-ca':1,'en-gb':1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,'fr-ca':1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,lt:1,lv:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,'pt-br':1,pt:1,ro:1,ru:1,sk:1,sl:1,'sr-latn':1,sr:1,sv:1,th:1,tr:1,uk:1,vi:1,'zh-cn':1,zh:1},load:function(k,l,m){if(!k||!a.lang.languages[k])k=this.detect(l,k);if(!this[k])a.scriptLoader.load(a.getUrl('lang/'+k+'.js'),function(){m(k,this[k]);},this);else m(k,this[k]);},detect:function(k,l){var m=this.languages;l=l||navigator.userLanguage||navigator.language;var n=l.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),o=n[1],p=n[2];if(m[o+'-'+p])o=o+'-'+p;else if(!m[o])o=null;a.lang.detect=o?function(){return o;}:function(q){return q;};return o||k;}};})();a.scriptLoader=(function(){var j={},k={};return{load:function(l,m,n,o){var p=typeof l=='string';if(p)l=[l];if(!n)n=a;var q=l.length,r=[],s=[],t=function(y){if(m)if(p)m.call(n,y);else m.call(n,r,s);};if(q===0){t(true);return;}var u=function(y,z){(z?r:s).push(y);if(--q<=0){o&&a.document.getDocumentElement().removeStyle('cursor');t(z);}},v=function(y,z){j[y]=1;var A=k[y];delete k[y];for(var B=0;B<A.length;B++)A[B](y,z);},w=function(y){if(j[y]){u(y,true);return;}var z=k[y]||(k[y]=[]);z.push(u);if(z.length>1)return;var A=new h('script');A.setAttributes({type:'text/javascript',src:y});if(m)if(c)A.$.onreadystatechange=function(){if(A.$.readyState=='loaded'||A.$.readyState=='complete'){A.$.onreadystatechange=null;v(y,true);}};else{A.$.onload=function(){setTimeout(function(){v(y,true);},0);};A.$.onerror=function(){v(y,false);};}A.appendTo(a.document.getHead());};o&&a.document.getDocumentElement().setStyle('cursor','wait');for(var x=0;x<q;x++)w(l[x]);}};})();a.resourceManager=function(j,k){var l=this;
-l.basePath=j;l.fileName=k;l.registered={};l.loaded={};l.externals={};l._={waitingList:{}};};a.resourceManager.prototype={add:function(j,k){if(this.registered[j])throw '[CKEDITOR.resourceManager.add] The resource name "'+j+'" is already registered.';a.fire(j+e.capitalize(this.fileName)+'Ready',this.registered[j]=k||{});},get:function(j){return this.registered[j]||null;},getPath:function(j){var k=this.externals[j];return a.getUrl(k&&k.dir||this.basePath+j+'/');},getFilePath:function(j){var k=this.externals[j];return a.getUrl(this.getPath(j)+(k&&typeof k.file=='string'?k.file:this.fileName+'.js'));},addExternal:function(j,k,l){j=j.split(',');for(var m=0;m<j.length;m++){var n=j[m];this.externals[n]={dir:k,file:l};}},load:function(j,k,l){if(!e.isArray(j))j=j?[j]:[];var m=this.loaded,n=this.registered,o=[],p={},q={};for(var r=0;r<j.length;r++){var s=j[r];if(!s)continue;if(!m[s]&&!n[s]){var t=this.getFilePath(s);o.push(t);if(!(t in p))p[t]=[];p[t].push(s);}else q[s]=this.get(s);}a.scriptLoader.load(o,function(u,v){if(v.length)throw '[CKEDITOR.resourceManager.load] Resource name "'+p[v[0]].join(',')+'" was not found at "'+v[0]+'".';for(var w=0;w<u.length;w++){var x=p[u[w]];for(var y=0;y<x.length;y++){var z=x[y];q[z]=this.get(z);m[z]=1;}}k.call(l,q);},this);}};a.plugins=new a.resourceManager('plugins/','plugin');var j=a.plugins;j.load=e.override(j.load,function(k){return function(l,m,n){var o={},p=function(q){k.call(this,q,function(r){e.extend(o,r);var s=[];for(var t in r){var u=r[t],v=u&&u.requires;if(v)for(var w=0;w<v.length;w++){if(!o[v[w]])s.push(v[w]);}}if(s.length)p.call(this,s);else{for(t in o){u=o[t];if(u.onLoad&&!u.onLoad._called){u.onLoad();u.onLoad._called=1;}}if(m)m.call(n||window,o);}},this);};p.call(this,l);};});j.setLang=function(k,l,m){var n=this.get(k),o=n.langEntries||(n.langEntries={}),p=n.lang||(n.lang=[]);if(e.indexOf(p,l)==-1)p.push(l);o[l]=m;};a.skins=(function(){var k={},l={},m=function(n,o,p,q){var r=k[o];if(!n.skin){n.skin=r;if(r.init)r.init(n);}var s=function(B){for(var C=0;C<B.length;C++)B[C]=a.getUrl(l[o]+B[C]);};function t(B,C){return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(D,E,F,G){if(/^\/|^\w?:/.test(F))return D;else return 'url('+C+E+F+G+')';});};p=r[p];var u=!p||!!p._isLoaded;if(u)q&&q();else{var v=p._pending||(p._pending=[]);v.push(q);if(v.length>1)return;var w=!p.css||!p.css.length,x=!p.js||!p.js.length,y=function(){if(w&&x){p._isLoaded=1;for(var B=0;B<v.length;B++){if(v[B])v[B]();}}};if(!w){var z=p.css;if(e.isArray(z)){s(z);
-for(var A=0;A<z.length;A++)a.document.appendStyleSheet(z[A]);}else{z=t(z,a.getUrl(l[o]));a.document.appendStyleText(z);}p.css=z;w=1;}if(!x){s(p.js);a.scriptLoader.load(p.js,function(){x=1;y();});}y();}};return{add:function(n,o){k[n]=o;o.skinPath=l[n]||(l[n]=a.getUrl('skins/'+n+'/'));},load:function(n,o,p){var q=n.skinName,r=n.skinPath;if(k[q])m(n,q,o,p);else{l[q]=r;a.scriptLoader.load(a.getUrl(r+'skin.js'),function(){m(n,q,o,p);});}}};})();a.themes=new a.resourceManager('themes/','theme');a.ui=function(k){if(k.ui)return k.ui;this._={handlers:{},items:{},editor:k};return this;};var k=a.ui;k.prototype={add:function(l,m,n){this._.items[l]={type:m,command:n.command||null,args:Array.prototype.slice.call(arguments,2)};},create:function(l){var q=this;var m=q._.items[l],n=m&&q._.handlers[m.type],o=m&&m.command&&q._.editor.getCommand(m.command),p=n&&n.create.apply(q,m.args);m&&(p=e.extend(p,q._.editor.skin[m.type],true));if(o)o.uiItems.push(p);return p;},addHandler:function(l,m){this._.handlers[l]=m;}};a.event.implementOn(k);(function(){var l=0,m=function(){var x='editor'+ ++l;return a.instances&&a.instances[x]?m():x;},n={},o=function(x){var y=x.config.customConfig;if(!y)return false;y=a.getUrl(y);var z=n[y]||(n[y]={});if(z.fn){z.fn.call(x,x.config);if(a.getUrl(x.config.customConfig)==y||!o(x))x.fireOnce('customConfigLoaded');}else a.scriptLoader.load(y,function(){if(a.editorConfig)z.fn=a.editorConfig;else z.fn=function(){};o(x);});return true;},p=function(x,y){x.on('customConfigLoaded',function(){if(y){if(y.on)for(var z in y.on)x.on(z,y.on[z]);e.extend(x.config,y,true);delete x.config.on;}q(x);});if(y&&y.customConfig!=undefined)x.config.customConfig=y.customConfig;if(!o(x))x.fireOnce('customConfigLoaded');},q=function(x){var y=x.config.skin.split(','),z=y[0],A=a.getUrl(y[1]||'skins/'+z+'/');x.skinName=z;x.skinPath=A;x.skinClass='cke_skin_'+z;x.tabIndex=x.config.tabIndex||x.element.getAttribute('tabindex')||0;x.readOnly=!!(x.config.readOnly||x.element.getAttribute('disabled'));x.fireOnce('configLoaded');t(x);},r=function(x){a.lang.load(x.config.language,x.config.defaultLanguage,function(y,z){x.langCode=y;x.lang=e.prototypedCopy(z);if(b.gecko&&b.version<10900&&x.lang.dir=='rtl')x.lang.dir='ltr';x.fire('langLoaded');var A=x.config;A.contentsLangDirection=='ui'&&(A.contentsLangDirection=x.lang.dir);s(x);});},s=function(x){var y=x.config,z=y.plugins,A=y.extraPlugins,B=y.removePlugins;if(A){var C=new RegExp('(?:^|,)(?:'+A.replace(/\s*,\s*/g,'|')+')(?=,|$)','g');z=z.replace(C,'');
-z+=','+A;}if(B){C=new RegExp('(?:^|,)(?:'+B.replace(/\s*,\s*/g,'|')+')(?=,|$)','g');z=z.replace(C,'');}b.air&&(z+=',adobeair');j.load(z.split(','),function(D){var E=[],F=[],G=[];x.plugins=D;for(var H in D){var I=D[H],J=I.lang,K=j.getPath(H),L=null;I.path=K;if(J){L=e.indexOf(J,x.langCode)>=0?x.langCode:J[0];if(!I.langEntries||!I.langEntries[L])G.push(a.getUrl(K+'lang/'+L+'.js'));else{e.extend(x.lang,I.langEntries[L]);L=null;}}F.push(L);E.push(I);}a.scriptLoader.load(G,function(){var M=['beforeInit','init','afterInit'];for(var N=0;N<M.length;N++)for(var O=0;O<E.length;O++){var P=E[O];if(N===0&&F[O]&&P.lang)e.extend(x.lang,P.langEntries[F[O]]);if(P[M[N]])P[M[N]](x);}x.fire('pluginsLoaded');u(x);});});},t=function(x){a.skins.load(x,'editor',function(){r(x);});},u=function(x){var y=x.config.theme;a.themes.load(y,function(){var z=x.theme=a.themes.get(y);z.path=a.themes.getPath(y);z.build(x);if(x.config.autoUpdateElement)v(x);});},v=function(x){var y=x.element;if(x.elementMode==1&&y.is('textarea')){var z=y.$.form&&new h(y.$.form);if(z){function A(){x.updateElement();};z.on('submit',A);if(!z.$.submit.nodeName&&!z.$.submit.length)z.$.submit=e.override(z.$.submit,function(B){return function(){x.updateElement();if(B.apply)B.apply(this,arguments);else B();};});x.on('destroy',function(){z.removeListener('submit',A);});}}};function w(){var x,y=this._.commands,z=this.mode;if(!z)return;for(var A in y){x=y[A];x[x.startDisabled?'disable':this.readOnly&&!x.readOnly?'disable':x.modes[z]?'enable':'disable']();}};a.editor.prototype._init=function(){var z=this;var x=h.get(z._.element),y=z._.instanceConfig;delete z._.element;delete z._.instanceConfig;z._.commands={};z._.styles=[];z.element=x;z.name=x&&z.elementMode==1&&(x.getId()||x.getNameAtt())||m();if(z.name in a.instances)throw '[CKEDITOR.editor] The instance "'+z.name+'" already exists.';z.id=e.getNextId();z.config=e.prototypedCopy(i);z.ui=new k(z);z.focusManager=new a.focusManager(z);a.fire('instanceCreated',null,z);z.on('mode',w,null,null,1);z.on('readOnly',w,null,null,1);p(z,y);};})();e.extend(a.editor.prototype,{addCommand:function(l,m){return this._.commands[l]=new a.command(this,m);},addCss:function(l){this._.styles.push(l);},destroy:function(l){var m=this;if(!l)m.updateElement();m.fire('destroy');m.theme&&m.theme.destroy(m);a.remove(m);a.fire('instanceDestroyed',null,m);},execCommand:function(l,m){var n=this.getCommand(l),o={name:l,commandData:m,command:n};if(n&&n.state!=0)if(this.fire('beforeCommandExec',o)!==true){o.returnValue=n.exec(o.commandData);
-if(!n.async&&this.fire('afterCommandExec',o)!==true)return o.returnValue;}return false;},getCommand:function(l){return this._.commands[l];},getData:function(){var n=this;n.fire('beforeGetData');var l=n._.data;if(typeof l!='string'){var m=n.element;if(m&&n.elementMode==1)l=m.is('textarea')?m.getValue():m.getHtml();else l='';}l={dataValue:l};n.fire('getData',l);return l.dataValue;},getSnapshot:function(){var l=this.fire('getSnapshot');if(typeof l!='string'){var m=this.element;if(m&&this.elementMode==1)l=m.is('textarea')?m.getValue():m.getHtml();}return l;},loadSnapshot:function(l){this.fire('loadSnapshot',l);},setData:function(l,m,n){if(m)this.on('dataReady',function(p){p.removeListener();m.call(p.editor);});var o={dataValue:l};!n&&this.fire('setData',o);this._.data=o.dataValue;!n&&this.fire('afterSetData',o);},setReadOnly:function(l){l=l==undefined||l;if(this.readOnly!=l){this.readOnly=l;this.fire('readOnly');}},insertHtml:function(l){this.fire('insertHtml',l);},insertText:function(l){this.fire('insertText',l);},insertElement:function(l){this.fire('insertElement',l);},checkDirty:function(){return this.mayBeDirty&&this._.previousValue!==this.getSnapshot();},resetDirty:function(){if(this.mayBeDirty)this._.previousValue=this.getSnapshot();},updateElement:function(){var n=this;var l=n.element;if(l&&n.elementMode==1){var m=n.getData();if(n.config.htmlEncodeOutput)m=e.htmlEncode(m);if(l.is('textarea'))l.setValue(m);else l.setHtml(m);}}});a.on('loaded',function(){var l=a.editor._pending;if(l){delete a.editor._pending;for(var m=0;m<l.length;m++)l[m]._init();}});a.htmlParser=function(){this._={htmlPartsRegex:new RegExp("<(?:(?:\\/([^>]+)>)|(?:!--([\\S|\\s]*?)-->)|(?:([^\\s>]+)\\s*((?:(?:\"[^\"]*\")|(?:'[^']*')|[^\"'>])*)\\/?>))",'g')};};(function(){var l=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,m={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};a.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(n){var A=this;var o,p,q=0,r;while(o=A._.htmlPartsRegex.exec(n)){var s=o.index;if(s>q){var t=n.substring(q,s);if(r)r.push(t);else A.onText(t);}q=A._.htmlPartsRegex.lastIndex;if(p=o[1]){p=p.toLowerCase();if(r&&f.$cdata[p]){A.onCDATA(r.join(''));r=null;}if(!r){A.onTagClose(p);continue;}}if(r){r.push(o[0]);continue;}if(p=o[3]){p=p.toLowerCase();if(/="/.test(p))continue;
-var u={},v,w=o[4],x=!!(w&&w.charAt(w.length-1)=='/');if(w)while(v=l.exec(w)){var y=v[1].toLowerCase(),z=v[2]||v[3]||v[4]||'';if(!z&&m[y])u[y]=y;else u[y]=z;}A.onTagOpen(p,u,x);if(!r&&f.$cdata[p])r=[];continue;}if(p=o[2])A.onComment(p);}if(n.length>q)A.onText(n.substring(q,n.length));}};})();a.htmlParser.comment=function(l){this.value=l;this._={isBlockLike:false};};a.htmlParser.comment.prototype={type:8,writeHtml:function(l,m){var n=this.value;if(m){if(!(n=m.onComment(n,this)))return;if(typeof n!='string'){n.parent=this.parent;n.writeHtml(l,m);return;}}l.comment(n);}};(function(){var l=/[\t\r\n ]{2,}|[\t\r\n]/g;a.htmlParser.text=function(m){this.value=m;this._={isBlockLike:false};};a.htmlParser.text.prototype={type:3,writeHtml:function(m,n){var o=this.value;if(n&&!(o=n.onText(o,this)))return;m.text(o);}};})();(function(){a.htmlParser.cdata=function(l){this.value=l;};a.htmlParser.cdata.prototype={type:3,writeHtml:function(l){l.write(this.value);}};})();a.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:true,hasInlineStarted:false};};(function(){var l=e.extend({table:1,ul:1,ol:1,dl:1},f.table,f.ul,f.ol,f.dl),m=c&&b.version<8?{dd:1,dt:1}:{},n={ol:1,ul:1},o=e.extend({},{html:1},f.html,f.body,f.head,{style:1,script:1});a.htmlParser.fragment.fromHtml=function(p,q,r){var s=new a.htmlParser(),t=r||new a.htmlParser.fragment(),u=[],v=[],w=t,x=false;function y(B){var C;if(u.length>0)for(var D=0;D<u.length;D++){var E=u[D],F=E.name,G=f[F],H=w.name&&f[w.name];if((!H||H[F])&&(!B||!G||G[B]||!f[B])){if(!C){z();C=1;}E=E.clone();E.parent=w;w=E;u.splice(D,1);D--;}}};function z(){while(v.length)w.add(v.shift());};function A(B,C,D){if(B.previous!==undefined)return;C=C||w||t;var E=w;if(q&&(!C.type||C.name=='body')){var F,G;if(B.attributes&&(G=B.attributes['data-cke-real-element-type']))F=G;else F=B.name;if(F&&!(F in f.$body||F=='body'||B.isOrphan)){w=C;s.onTagOpen(q,{});B.returnPoint=C=w;}}if(B._.isBlockLike&&B.name!='pre'){var H=B.children.length,I=B.children[H-1],J;if(I&&I.type==3)if(!(J=e.rtrim(I.value)))B.children.length=H-1;else I.value=J;}C.add(B);if(B.returnPoint){w=B.returnPoint;delete B.returnPoint;}else w=D?C:E;};s.onTagOpen=function(B,C,D,E){var F=new a.htmlParser.element(B,C);if(F.isUnknown&&D)F.isEmpty=true;F.isOptionalClose=B in m||E;if(f.$removeEmpty[B]){u.push(F);return;}else if(B=='pre')x=true;else if(B=='br'&&x){w.add(new a.htmlParser.text('\n'));return;}if(B=='br'){v.push(F);return;}while(1){var G=w.name,H=G?f[G]||(w._.isBlockLike?f.div:f.span):o;
-if(!F.isUnknown&&!w.isUnknown&&!H[B]){if(w.isOptionalClose)s.onTagClose(G);else if(B in n&&G in n){var I=w.children,J=I[I.length-1];if(!(J&&J.name=='li'))A(J=new a.htmlParser.element('li'),w);!F.returnPoint&&(F.returnPoint=w);w=J;}else if(B in f.$listItem&&G!=B)s.onTagOpen(B=='li'?'ul':'dl',{},0,1);else if(G in l&&G!=B){!F.returnPoint&&(F.returnPoint=w);w=w.parent;}else{if(G in f.$inline)u.unshift(w);if(w.parent)A(w,w.parent,1);else{F.isOrphan=1;break;}}}else break;}y(B);z();F.parent=w;if(F.isEmpty)A(F);else w=F;};s.onTagClose=function(B){for(var C=u.length-1;C>=0;C--){if(B==u[C].name){u.splice(C,1);return;}}var D=[],E=[],F=w;while(F!=t&&F.name!=B){if(!F._.isBlockLike)E.unshift(F);D.push(F);F=F.returnPoint||F.parent;}if(F!=t){for(C=0;C<D.length;C++){var G=D[C];A(G,G.parent);}w=F;if(w.name=='pre')x=false;if(F._.isBlockLike)z();A(F,F.parent);if(F==w)w=w.parent;u=u.concat(E);}if(B=='body')q=false;};s.onText=function(B){if((!w._.hasInlineStarted||v.length)&&!x){B=e.ltrim(B);if(B.length===0)return;}z();y();if(q&&(!w.type||w.name=='body')&&e.trim(B))this.onTagOpen(q,{},0,1);if(!x)B=B.replace(/[\t\r\n ]{2,}|[\t\r\n]/g,' ');w.add(new a.htmlParser.text(B));};s.onCDATA=function(B){w.add(new a.htmlParser.cdata(B));};s.onComment=function(B){z();y();w.add(new a.htmlParser.comment(B));};s.parse(p);z(!c&&1);while(w!=t)A(w,w.parent,1);return t;};a.htmlParser.fragment.prototype={add:function(p,q){var s=this;isNaN(q)&&(q=s.children.length);var r=q>0?s.children[q-1]:null;if(r){if(p._.isBlockLike&&r.type==3){r.value=e.rtrim(r.value);if(r.value.length===0){s.children.pop();s.add(p);return;}}r.next=p;}p.previous=r;p.parent=s;s.children.splice(q,0,p);s._.hasInlineStarted=p.type==3||p.type==1&&!p._.isBlockLike;},writeHtml:function(p,q){var r;this.filterChildren=function(){var s=new a.htmlParser.basicWriter();this.writeChildrenHtml.call(this,s,q,true);var t=s.getHtml();this.children=new a.htmlParser.fragment.fromHtml(t).children;r=1;};!this.name&&q&&q.onFragment(this);this.writeChildrenHtml(p,r?null:q);},writeChildrenHtml:function(p,q){for(var r=0;r<this.children.length;r++)this.children[r].writeHtml(p,q);}};})();a.htmlParser.element=function(l,m){var s=this;s.name=l;s.attributes=m||(m={});s.children=[];var n=m['data-cke-real-element-type']||l||'',o=n.match(/^cke:(.*)/);o&&(n=o[1]);var p=f,q=!!(p.$nonBodyContent[n]||p.$block[n]||p.$listItem[n]||p.$tableContent[n]||p.$nonEditable[n]||n=='br'),r=!!p.$empty[l];s.isEmpty=r;s.isUnknown=!p[l];s._={isBlockLike:q,hasInlineStarted:r||!q};};
-a.htmlParser.cssStyle=function(){var l,m=arguments[0],n={};l=m instanceof a.htmlParser.element?m.attributes.style:m;(l||'').replace(/"/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(o,p,q){p=='font-family'&&(q=q.replace(/["']/g,''));n[p.toLowerCase()]=q;});return{rules:n,populate:function(o){var p=this.toString();if(p)o instanceof h?o.setAttribute('style',p):o instanceof a.htmlParser.element?o.attributes.style=p:o.style=p;},'toString':function(){var o=[];for(var p in n)n[p]&&o.push(p,':',n[p],';');return o.join('');}};};(function(){var l=function(m,n){m=m[0];n=n[0];return m<n?-1:m>n?1:0;};a.htmlParser.element.prototype={type:1,add:a.htmlParser.fragment.prototype.add,clone:function(){return new a.htmlParser.element(this.name,this.attributes);},writeHtml:function(m,n){var o=this.attributes,p=this,q=p.name,r,s,t,u;p.filterChildren=function(){if(!u){var B=new a.htmlParser.basicWriter();a.htmlParser.fragment.prototype.writeChildrenHtml.call(p,B,n);p.children=new a.htmlParser.fragment.fromHtml(B.getHtml(),0,p.clone()).children;u=1;}};if(n){for(;;){if(!(q=n.onElementName(q)))return;p.name=q;if(!(p=n.onElement(p)))return;p.parent=this.parent;if(p.name==q)break;if(p.type!=1){p.writeHtml(m,n);return;}q=p.name;if(!q){for(var v=0,w=this.children.length;v<w;v++)this.children[v].parent=p.parent;this.writeChildrenHtml.call(p,m,u?null:n);return;}}o=p.attributes;}m.openTag(q,o);var x=[];for(var y=0;y<2;y++)for(r in o){s=r;t=o[r];if(y==1)x.push([r,t]);else if(n){for(;;){if(!(s=n.onAttributeName(r))){delete o[r];break;}else if(s!=r){delete o[r];r=s;continue;}else break;}if(s)if((t=n.onAttribute(p,s,t))===false)delete o[s];else o[s]=t;}}if(m.sortAttributes)x.sort(l);var z=x.length;for(y=0;y<z;y++){var A=x[y];m.attribute(A[0],A[1]);}m.openTagClose(q,p.isEmpty);if(!p.isEmpty){this.writeChildrenHtml.call(p,m,u?null:n);m.closeTag(q);}},writeChildrenHtml:function(m,n){a.htmlParser.fragment.prototype.writeChildrenHtml.apply(this,arguments);}};})();(function(){a.htmlParser.filter=e.createClass({$:function(q){this._={elementNames:[],attributeNames:[],elements:{$length:0},attributes:{$length:0}};if(q)this.addRules(q,10);},proto:{addRules:function(q,r){var s=this;if(typeof r!='number')r=10;m(s._.elementNames,q.elementNames,r);m(s._.attributeNames,q.attributeNames,r);n(s._.elements,q.elements,r);n(s._.attributes,q.attributes,r);s._.text=o(s._.text,q.text,r)||s._.text;s._.comment=o(s._.comment,q.comment,r)||s._.comment;s._.root=o(s._.root,q.root,r)||s._.root;},onElementName:function(q){return l(q,this._.elementNames);
-},onAttributeName:function(q){return l(q,this._.attributeNames);},onText:function(q){var r=this._.text;return r?r.filter(q):q;},onComment:function(q,r){var s=this._.comment;return s?s.filter(q,r):q;},onFragment:function(q){var r=this._.root;return r?r.filter(q):q;},onElement:function(q){var v=this;var r=[v._.elements['^'],v._.elements[q.name],v._.elements.$],s,t;for(var u=0;u<3;u++){s=r[u];if(s){t=s.filter(q,v);if(t===false)return null;if(t&&t!=q)return v.onNode(t);if(q.parent&&!q.name)break;}}return q;},onNode:function(q){var r=q.type;return r==1?this.onElement(q):r==3?new a.htmlParser.text(this.onText(q.value)):r==8?new a.htmlParser.comment(this.onComment(q.value)):null;},onAttribute:function(q,r,s){var t=this._.attributes[r];if(t){var u=t.filter(s,q,this);if(u===false)return false;if(typeof u!='undefined')return u;}return s;}}});function l(q,r){for(var s=0;q&&s<r.length;s++){var t=r[s];q=q.replace(t[0],t[1]);}return q;};function m(q,r,s){if(typeof r=='function')r=[r];var t,u,v=q.length,w=r&&r.length;if(w){for(t=0;t<v&&q[t].pri<s;t++){}for(u=w-1;u>=0;u--){var x=r[u];if(x){x.pri=s;q.splice(t,0,x);}}}};function n(q,r,s){if(r)for(var t in r){var u=q[t];q[t]=o(u,r[t],s);if(!u)q.$length++;}};function o(q,r,s){if(r){r.pri=s;if(q){if(!q.splice){if(q.pri>s)q=[r,q];else q=[q,r];q.filter=p;}else m(q,r,s);return q;}else{r.filter=r;return r;}}};function p(q){var r=q.type||q instanceof a.htmlParser.fragment;for(var s=0;s<this.length;s++){if(r)var t=q.type,u=q.name;var v=this[s],w=v.apply(window,arguments);if(w===false)return w;if(r){if(w&&(w.name!=u||w.type!=t))return w;}else if(typeof w!='string')return w;w!=undefined&&(q=w);}return q;};})();a.htmlParser.basicWriter=e.createClass({$:function(){this._={output:[]};},proto:{openTag:function(l,m){this._.output.push('<',l);},openTagClose:function(l,m){if(m)this._.output.push(' />');else this._.output.push('>');},attribute:function(l,m){if(typeof m=='string')m=e.htmlEncodeAttr(m);this._.output.push(' ',l,'="',m,'"');},closeTag:function(l){this._.output.push('</',l,'>');},text:function(l){this._.output.push(l);},comment:function(l){this._.output.push('<!--',l,'-->');},write:function(l){this._.output.push(l);},reset:function(){this._.output=[];this._.indent=false;},getHtml:function(l){var m=this._.output.join('');if(l)this.reset();return m;}}});delete a.loadFullCore;a.instances={};a.document=new g(document);a.add=function(l){a.instances[l.name]=l;l.on('focus',function(){if(a.currentInstance!=l){a.currentInstance=l;a.fire('currentInstance');
-}});l.on('blur',function(){if(a.currentInstance==l){a.currentInstance=null;a.fire('currentInstance');}});};a.remove=function(l){delete a.instances[l.name];};a.on('instanceDestroyed',function(){if(e.isEmpty(this.instances))a.fire('reset');});a.TRISTATE_ON=1;a.TRISTATE_OFF=2;a.TRISTATE_DISABLED=0;d.comment=e.createClass({base:d.node,$:function(l,m){if(typeof l=='string')l=(m?m.$:document).createComment(l);this.base(l);},proto:{type:8,getOuterHtml:function(){return '<!--'+this.$.nodeValue+'-->';}}});(function(){var l={address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1,legend:1,caption:1},m={body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,form:1,fieldset:1},n=function(o){var p=o.getChildren();for(var q=0,r=p.count();q<r;q++){var s=p.getItem(q);if(s.type==1&&f.$block[s.getName()])return true;}return false;};d.elementPath=function(o){var u=this;var p=null,q=null,r=[],s=o;while(s){if(s.type==1){if(!u.lastElement)u.lastElement=s;var t=s.getName();if(c&&s.$.scopeName!='HTML')t=s.$.scopeName.toLowerCase()+':'+t;if(!q){if(!p&&l[t])p=s;if(m[t])if(!p&&t=='div'&&!n(s))p=s;else q=s;}r.push(s);if(t=='body')break;}s=s.getParent();}u.block=p;u.blockLimit=q;u.elements=r;};})();d.elementPath.prototype={compare:function(l){var m=this.elements,n=l&&l.elements;if(!n||m.length!=n.length)return false;for(var o=0;o<m.length;o++){if(!m[o].equals(n[o]))return false;}return true;},contains:function(l){var m=this.elements;for(var n=0;n<m.length;n++){if(m[n].getName() in l)return m[n];}return null;}};d.text=function(l,m){if(typeof l=='string')l=(m?m.$:document).createTextNode(l);this.$=l;};d.text.prototype=new d.node();e.extend(d.text.prototype,{type:3,getLength:function(){return this.$.nodeValue.length;},getText:function(){return this.$.nodeValue;},setText:function(l){this.$.nodeValue=l;},split:function(l){var q=this;if(c&&l==q.getLength()){var m=q.getDocument().createText('');m.insertAfter(q);return m;}var n=q.getDocument(),o=new d.text(q.$.splitText(l),n);if(b.ie8){var p=new d.text('',n);p.insertAfter(o);p.remove();}return o;},substring:function(l,m){if(typeof m!='number')return this.$.nodeValue.substr(l);else return this.$.nodeValue.substring(l,m);}});d.documentFragment=function(l){l=l||a.document;this.$=l.$.createDocumentFragment();};e.extend(d.documentFragment.prototype,h.prototype,{type:11,insertAfterNode:function(l){l=l.$;l.parentNode.insertBefore(this.$,l.nextSibling);}},true,{append:1,appendBogus:1,getFirst:1,getLast:1,appendTo:1,moveChildren:1,insertBefore:1,insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1});
-(function(){function l(s,t){if(this._.end)return null;var u,v=this.range,w,x=this.guard,y=this.type,z=s?'getPreviousSourceNode':'getNextSourceNode';if(!this._.start){this._.start=1;v.trim();if(v.collapsed){this.end();return null;}}if(!s&&!this._.guardLTR){var A=v.endContainer,B=A.getChild(v.endOffset);this._.guardLTR=function(F,G){return(!G||!A.equals(F))&&(!B||!F.equals(B))&&(F.type!=1||!G||F.getName()!='body');};}if(s&&!this._.guardRTL){var C=v.startContainer,D=v.startOffset>0&&C.getChild(v.startOffset-1);this._.guardRTL=function(F,G){return(!G||!C.equals(F))&&(!D||!F.equals(D))&&(F.type!=1||!G||F.getName()!='body');};}var E=s?this._.guardRTL:this._.guardLTR;if(x)w=function(F,G){if(E(F,G)===false)return false;return x(F,G);};else w=E;if(this.current)u=this.current[z](false,y,w);else if(s){u=v.endContainer;if(v.endOffset>0){u=u.getChild(v.endOffset-1);if(w(u)===false)u=null;}else u=w(u,true)===false?null:u.getPreviousSourceNode(true,y,w);}else{u=v.startContainer;u=u.getChild(v.startOffset);if(u){if(w(u)===false)u=null;}else u=w(v.startContainer,true)===false?null:v.startContainer.getNextSourceNode(true,y,w);}while(u&&!this._.end){this.current=u;if(!this.evaluator||this.evaluator(u)!==false){if(!t)return u;}else if(t&&this.evaluator)return false;u=u[z](false,y,w);}this.end();return this.current=null;};function m(s){var t,u=null;while(t=l.call(this,s))u=t;return u;};d.walker=e.createClass({$:function(s){this.range=s;this._={};},proto:{end:function(){this._.end=1;},next:function(){return l.call(this);},previous:function(){return l.call(this,1);},checkForward:function(){return l.call(this,0,1)!==false;},checkBackward:function(){return l.call(this,1,1)!==false;},lastForward:function(){return m.call(this);},lastBackward:function(){return m.call(this,1);},reset:function(){delete this.current;this._={};}}});var n={block:1,'list-item':1,table:1,'table-row-group':1,'table-header-group':1,'table-footer-group':1,'table-row':1,'table-column-group':1,'table-column':1,'table-cell':1,'table-caption':1};h.prototype.isBlockBoundary=function(s){var t=s?e.extend({},f.$block,s||{}):f.$block;return this.getComputedStyle('float')=='none'&&n[this.getComputedStyle('display')]||t[this.getName()];};d.walker.blockBoundary=function(s){return function(t,u){return!(t.type==1&&t.isBlockBoundary(s));};};d.walker.listItemBoundary=function(){return this.blockBoundary({br:1});};d.walker.bookmark=function(s,t){function u(v){return v&&v.getName&&v.getName()=='span'&&v.data('cke-bookmark');};return function(v){var w,x;
-w=v&&!v.getName&&(x=v.getParent())&&u(x);w=s?w:w||u(v);return!!(t^w);};};d.walker.whitespaces=function(s){return function(t){var u=t&&t.type==3&&!e.trim(t.getText());return!!(s^u);};};d.walker.invisible=function(s){var t=d.walker.whitespaces();return function(u){var v=t(u)||u.is&&!u.$.offsetHeight;return!!(s^v);};};d.walker.nodeType=function(s,t){return function(u){return!!(t^u.type==s);};};var o=/^[\t\r\n ]*(?: |\xa0)$/,p=d.walker.whitespaces(),q=d.walker.bookmark(),r=function(s){return q(s)||p(s)||s.type==1&&s.getName() in f.$inline&&!(s.getName() in f.$empty);};h.prototype.getBogus=function(){var s=this;do s=s.getPreviousSourceNode();while(r(s));if(s&&(!c?s.is&&s.is('br'):s.getText&&o.test(s.getText())))return s;return false;};})();d.range=function(l){var m=this;m.startContainer=null;m.startOffset=null;m.endContainer=null;m.endOffset=null;m.collapsed=true;m.document=l;};(function(){var l=function(t){t.collapsed=t.startContainer&&t.endContainer&&t.startContainer.equals(t.endContainer)&&t.startOffset==t.endOffset;},m=function(t,u,v,w){t.optimizeBookmark();var x=t.startContainer,y=t.endContainer,z=t.startOffset,A=t.endOffset,B,C;if(y.type==3)y=y.split(A);else if(y.getChildCount()>0)if(A>=y.getChildCount()){y=y.append(t.document.createText(''));C=true;}else y=y.getChild(A);if(x.type==3){x.split(z);if(x.equals(y))y=x.getNext();}else if(!z){x=x.getFirst().insertBeforeMe(t.document.createText(''));B=true;}else if(z>=x.getChildCount()){x=x.append(t.document.createText(''));B=true;}else x=x.getChild(z).getPrevious();var D=x.getParents(),E=y.getParents(),F,G,H;for(F=0;F<D.length;F++){G=D[F];H=E[F];if(!G.equals(H))break;}var I=v,J,K,L,M;for(var N=F;N<D.length;N++){J=D[N];if(I&&!J.equals(x))K=I.append(J.clone());L=J.getNext();while(L){if(L.equals(E[N])||L.equals(y))break;M=L.getNext();if(u==2)I.append(L.clone(true));else{L.remove();if(u==1)I.append(L);}L=M;}if(I)I=K;}I=v;for(var O=F;O<E.length;O++){J=E[O];if(u>0&&!J.equals(y))K=I.append(J.clone());if(!D[O]||J.$.parentNode!=D[O].$.parentNode){L=J.getPrevious();while(L){if(L.equals(D[O])||L.equals(x))break;M=L.getPrevious();if(u==2)I.$.insertBefore(L.$.cloneNode(true),I.$.firstChild);else{L.remove();if(u==1)I.$.insertBefore(L.$,I.$.firstChild);}L=M;}}if(I)I=K;}if(u==2){var P=t.startContainer;if(P.type==3){P.$.data+=P.$.nextSibling.data;P.$.parentNode.removeChild(P.$.nextSibling);}var Q=t.endContainer;if(Q.type==3&&Q.$.nextSibling){Q.$.data+=Q.$.nextSibling.data;Q.$.parentNode.removeChild(Q.$.nextSibling);}}else{if(G&&H&&(x.$.parentNode!=G.$.parentNode||y.$.parentNode!=H.$.parentNode)){var R=H.getIndex();
-if(B&&H.$.parentNode==x.$.parentNode)R--;if(w&&G.type==1){var S=h.createFromHtml('<span data-cke-bookmark="1" style="display:none"> </span>',t.document);S.insertAfter(G);G.mergeSiblings(false);t.moveToBookmark({startNode:S});}else t.setStart(H.getParent(),R);}t.collapse(true);}if(B)x.remove();if(C&&y.$.parentNode)y.remove();},n={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1};function o(t){var u=false,v=d.walker.bookmark(true);return function(w){if(v(w))return true;if(w.type==3){if(w.hasAscendant('pre')||e.trim(w.getText()).length)return false;}else if(w.type==1)if(!n[w.getName()])if(!t&&!c&&w.getName()=='br'&&!u)u=true;else return false;return true;};};function p(t){return t.type!=3&&t.getName() in f.$removeEmpty||!e.trim(t.getText())||!!t.getParent().data('cke-bookmark');};var q=new d.walker.whitespaces(),r=new d.walker.bookmark();function s(t){return!q(t)&&!r(t);};d.range.prototype={clone:function(){var u=this;var t=new d.range(u.document);t.startContainer=u.startContainer;t.startOffset=u.startOffset;t.endContainer=u.endContainer;t.endOffset=u.endOffset;t.collapsed=u.collapsed;return t;},collapse:function(t){var u=this;if(t){u.endContainer=u.startContainer;u.endOffset=u.startOffset;}else{u.startContainer=u.endContainer;u.startOffset=u.endOffset;}u.collapsed=true;},cloneContents:function(){var t=new d.documentFragment(this.document);if(!this.collapsed)m(this,2,t);return t;},deleteContents:function(t){if(this.collapsed)return;m(this,0,null,t);},extractContents:function(t){var u=new d.documentFragment(this.document);if(!this.collapsed)m(this,1,u,t);return u;},createBookmark:function(t){var z=this;var u,v,w,x,y=z.collapsed;u=z.document.createElement('span');u.data('cke-bookmark',1);u.setStyle('display','none');u.setHtml(' ');if(t){w='cke_bm_'+e.getNextNumber();u.setAttribute('id',w+'S');}if(!y){v=u.clone();v.setHtml(' ');if(t)v.setAttribute('id',w+'E');x=z.clone();x.collapse();x.insertNode(v);}x=z.clone();x.collapse(true);x.insertNode(u);if(v){z.setStartAfter(u);z.setEndBefore(v);}else z.moveToPosition(u,4);return{startNode:t?w+'S':u,endNode:t?w+'E':v,serializable:t,collapsed:y};},createBookmark2:function(t){var B=this;var u=B.startContainer,v=B.endContainer,w=B.startOffset,x=B.endOffset,y=B.collapsed,z,A;if(!u||!v)return{start:0,end:0};if(t){if(u.type==1){z=u.getChild(w);if(z&&z.type==3&&w>0&&z.getPrevious().type==3){u=z;w=0;
-}if(z&&z.type==1)w=z.getIndex(1);}while(u.type==3&&(A=u.getPrevious())&&A.type==3){u=A;w+=A.getLength();}if(!y){if(v.type==1){z=v.getChild(x);if(z&&z.type==3&&x>0&&z.getPrevious().type==3){v=z;x=0;}if(z&&z.type==1)x=z.getIndex(1);}while(v.type==3&&(A=v.getPrevious())&&A.type==3){v=A;x+=A.getLength();}}}return{start:u.getAddress(t),end:y?null:v.getAddress(t),startOffset:w,endOffset:x,normalized:t,collapsed:y,is2:true};},moveToBookmark:function(t){var B=this;if(t.is2){var u=B.document.getByAddress(t.start,t.normalized),v=t.startOffset,w=t.end&&B.document.getByAddress(t.end,t.normalized),x=t.endOffset;B.setStart(u,v);if(w)B.setEnd(w,x);else B.collapse(true);}else{var y=t.serializable,z=y?B.document.getById(t.startNode):t.startNode,A=y?B.document.getById(t.endNode):t.endNode;B.setStartBefore(z);z.remove();if(A){B.setEndBefore(A);A.remove();}else B.collapse(true);}},getBoundaryNodes:function(){var y=this;var t=y.startContainer,u=y.endContainer,v=y.startOffset,w=y.endOffset,x;if(t.type==1){x=t.getChildCount();if(x>v)t=t.getChild(v);else if(x<1)t=t.getPreviousSourceNode();else{t=t.$;while(t.lastChild)t=t.lastChild;t=new d.node(t);t=t.getNextSourceNode()||t;}}if(u.type==1){x=u.getChildCount();if(x>w)u=u.getChild(w).getPreviousSourceNode(true);else if(x<1)u=u.getPreviousSourceNode();else{u=u.$;while(u.lastChild)u=u.lastChild;u=new d.node(u);}}if(t.getPosition(u)&2)t=u;return{startNode:t,endNode:u};},getCommonAncestor:function(t,u){var y=this;var v=y.startContainer,w=y.endContainer,x;if(v.equals(w)){if(t&&v.type==1&&y.startOffset==y.endOffset-1)x=v.getChild(y.startOffset);else x=v;}else x=v.getCommonAncestor(w);return u&&!x.is?x.getParent():x;},optimize:function(){var v=this;var t=v.startContainer,u=v.startOffset;if(t.type!=1)if(!u)v.setStartBefore(t);else if(u>=t.getLength())v.setStartAfter(t);t=v.endContainer;u=v.endOffset;if(t.type!=1)if(!u)v.setEndBefore(t);else if(u>=t.getLength())v.setEndAfter(t);},optimizeBookmark:function(){var v=this;var t=v.startContainer,u=v.endContainer;if(t.is&&t.is('span')&&t.data('cke-bookmark'))v.setStartAt(t,3);if(u&&u.is&&u.is('span')&&u.data('cke-bookmark'))v.setEndAt(u,4);},trim:function(t,u){var B=this;var v=B.startContainer,w=B.startOffset,x=B.collapsed;if((!t||x)&&v&&v.type==3){if(!w){w=v.getIndex();v=v.getParent();}else if(w>=v.getLength()){w=v.getIndex()+1;v=v.getParent();}else{var y=v.split(w);w=v.getIndex()+1;v=v.getParent();if(B.startContainer.equals(B.endContainer))B.setEnd(y,B.endOffset-B.startOffset);else if(v.equals(B.endContainer))B.endOffset+=1;
-}B.setStart(v,w);if(x){B.collapse(true);return;}}var z=B.endContainer,A=B.endOffset;if(!(u||x)&&z&&z.type==3){if(!A){A=z.getIndex();z=z.getParent();}else if(A>=z.getLength()){A=z.getIndex()+1;z=z.getParent();}else{z.split(A);A=z.getIndex()+1;z=z.getParent();}B.setEnd(z,A);}},enlarge:function(t,u){switch(t){case 1:if(this.collapsed)return;var v=this.getCommonAncestor(),w=this.document.getBody(),x,y,z,A,B,C=false,D,E,F=this.startContainer,G=this.startOffset;if(F.type==3){if(G){F=!e.trim(F.substring(0,G)).length&&F;C=!!F;}if(F)if(!(A=F.getPrevious()))z=F.getParent();}else{if(G)A=F.getChild(G-1)||F.getLast();if(!A)z=F;}while(z||A){if(z&&!A){if(!B&&z.equals(v))B=true;if(!w.contains(z))break;if(!C||z.getComputedStyle('display')!='inline'){C=false;if(B)x=z;else this.setStartBefore(z);}A=z.getPrevious();}while(A){D=false;if(A.type==3){E=A.getText();if(/[^\s\ufeff]/.test(E))A=null;D=/[\s\ufeff]$/.test(E);}else if((A.$.offsetWidth>0||u&&A.is('br'))&&!A.data('cke-bookmark'))if(C&&f.$removeEmpty[A.getName()]){E=A.getText();if(/[^\s\ufeff]/.test(E))A=null;else{var H=A.$.all||A.$.getElementsByTagName('*');for(var I=0,J;J=H[I++];){if(!f.$removeEmpty[J.nodeName.toLowerCase()]){A=null;break;}}}if(A)D=!!E.length;}else A=null;if(D)if(C){if(B)x=z;else if(z)this.setStartBefore(z);}else C=true;if(A){var K=A.getPrevious();if(!z&&!K){z=A;A=null;break;}A=K;}else z=null;}if(z)z=z.getParent();}F=this.endContainer;G=this.endOffset;z=A=null;B=C=false;if(F.type==3){F=!e.trim(F.substring(G)).length&&F;C=!(F&&F.getLength());if(F)if(!(A=F.getNext()))z=F.getParent();}else{A=F.getChild(G);if(!A)z=F;}while(z||A){if(z&&!A){if(!B&&z.equals(v))B=true;if(!w.contains(z))break;if(!C||z.getComputedStyle('display')!='inline'){C=false;if(B)y=z;else if(z)this.setEndAfter(z);}A=z.getNext();}while(A){D=false;if(A.type==3){E=A.getText();if(/[^\s\ufeff]/.test(E))A=null;D=/^[\s\ufeff]/.test(E);}else if((A.$.offsetWidth>0||u&&A.is('br'))&&!A.data('cke-bookmark'))if(C&&f.$removeEmpty[A.getName()]){E=A.getText();if(/[^\s\ufeff]/.test(E))A=null;else{H=A.$.all||A.$.getElementsByTagName('*');for(I=0;J=H[I++];){if(!f.$removeEmpty[J.nodeName.toLowerCase()]){A=null;break;}}}if(A)D=!!E.length;}else A=null;if(D)if(C)if(B)y=z;else this.setEndAfter(z);if(A){K=A.getNext();if(!z&&!K){z=A;A=null;break;}A=K;}else z=null;}if(z)z=z.getParent();}if(x&&y){v=x.contains(y)?y:x;this.setStartBefore(v);this.setEndAfter(v);}break;case 2:case 3:var L=new d.range(this.document);w=this.document.getBody();L.setStartAt(w,1);L.setEnd(this.startContainer,this.startOffset);
-var M=new d.walker(L),N,O,P=d.walker.blockBoundary(t==3?{br:1}:null),Q=function(S){var T=P(S);if(!T)N=S;return T;},R=function(S){var T=Q(S);if(!T&&S.is&&S.is('br'))O=S;return T;};M.guard=Q;z=M.lastBackward();N=N||w;this.setStartAt(N,!N.is('br')&&(!z&&this.checkStartOfBlock()||z&&N.contains(z))?1:4);L=this.clone();L.collapse();L.setEndAt(w,2);M=new d.walker(L);M.guard=t==3?R:Q;N=null;z=M.lastForward();N=N||w;this.setEndAt(N,!z&&this.checkEndOfBlock()||z&&N.contains(z)?2:3);if(O)this.setEndAfter(O);}},shrink:function(t,u){if(!this.collapsed){t=t||2;var v=this.clone(),w=this.startContainer,x=this.endContainer,y=this.startOffset,z=this.endOffset,A=this.collapsed,B=1,C=1;if(w&&w.type==3)if(!y)v.setStartBefore(w);else if(y>=w.getLength())v.setStartAfter(w);else{v.setStartBefore(w);B=0;}if(x&&x.type==3)if(!z)v.setEndBefore(x);else if(z>=x.getLength())v.setEndAfter(x);else{v.setEndAfter(x);C=0;}var D=new d.walker(v),E=d.walker.bookmark();D.evaluator=function(I){return I.type==(t==1?1:3);};var F;D.guard=function(I,J){if(E(I))return true;if(t==1&&I.type==3)return false;if(J&&I.equals(F))return false;if(!J&&I.type==1)F=I;return true;};if(B){var G=D[t==1?'lastForward':'next']();G&&this.setStartAt(G,u?1:3);}if(C){D.reset();var H=D[t==1?'lastBackward':'previous']();H&&this.setEndAt(H,u?2:4);}return!!(B||C);}},insertNode:function(t){var x=this;x.optimizeBookmark();x.trim(false,true);var u=x.startContainer,v=x.startOffset,w=u.getChild(v);if(w)t.insertBefore(w);else u.append(t);if(t.getParent().equals(x.endContainer))x.endOffset++;x.setStartBefore(t);},moveToPosition:function(t,u){this.setStartAt(t,u);this.collapse(true);},selectNodeContents:function(t){this.setStart(t,0);this.setEnd(t,t.type==3?t.getLength():t.getChildCount());},setStart:function(t,u){var v=this;if(t.type==1&&f.$empty[t.getName()])u=t.getIndex(),t=t.getParent();v.startContainer=t;v.startOffset=u;if(!v.endContainer){v.endContainer=t;v.endOffset=u;}l(v);},setEnd:function(t,u){var v=this;if(t.type==1&&f.$empty[t.getName()])u=t.getIndex()+1,t=t.getParent();v.endContainer=t;v.endOffset=u;if(!v.startContainer){v.startContainer=t;v.startOffset=u;}l(v);},setStartAfter:function(t){this.setStart(t.getParent(),t.getIndex()+1);},setStartBefore:function(t){this.setStart(t.getParent(),t.getIndex());},setEndAfter:function(t){this.setEnd(t.getParent(),t.getIndex()+1);},setEndBefore:function(t){this.setEnd(t.getParent(),t.getIndex());},setStartAt:function(t,u){var v=this;switch(u){case 1:v.setStart(t,0);break;case 2:if(t.type==3)v.setStart(t,t.getLength());
-else v.setStart(t,t.getChildCount());break;case 3:v.setStartBefore(t);break;case 4:v.setStartAfter(t);}l(v);},setEndAt:function(t,u){var v=this;switch(u){case 1:v.setEnd(t,0);break;case 2:if(t.type==3)v.setEnd(t,t.getLength());else v.setEnd(t,t.getChildCount());break;case 3:v.setEndBefore(t);break;case 4:v.setEndAfter(t);}l(v);},fixBlock:function(t,u){var x=this;var v=x.createBookmark(),w=x.document.createElement(u);x.collapse(t);x.enlarge(2);x.extractContents().appendTo(w);w.trim();if(!c)w.appendBogus();x.insertNode(w);x.moveToBookmark(v);return w;},splitBlock:function(t){var D=this;var u=new d.elementPath(D.startContainer),v=new d.elementPath(D.endContainer),w=u.blockLimit,x=v.blockLimit,y=u.block,z=v.block,A=null;if(!w.equals(x))return null;if(t!='br'){if(!y){y=D.fixBlock(true,t);z=new d.elementPath(D.endContainer).block;}if(!z)z=D.fixBlock(false,t);}var B=y&&D.checkStartOfBlock(),C=z&&D.checkEndOfBlock();D.deleteContents();if(y&&y.equals(z))if(C){A=new d.elementPath(D.startContainer);D.moveToPosition(z,4);z=null;}else if(B){A=new d.elementPath(D.startContainer);D.moveToPosition(y,3);y=null;}else{z=D.splitElement(y);if(!c&&!y.is('ul','ol'))y.appendBogus();}return{previousBlock:y,nextBlock:z,wasStartOfBlock:B,wasEndOfBlock:C,elementPath:A};},splitElement:function(t){var w=this;if(!w.collapsed)return null;w.setEndAt(t,2);var u=w.extractContents(),v=t.clone(false);u.appendTo(v);v.insertAfter(t);w.moveToPosition(t,4);return v;},checkBoundaryOfElement:function(t,u){var v=u==1,w=this.clone();w.collapse(v);w[v?'setStartAt':'setEndAt'](t,v?1:2);var x=new d.walker(w);x.evaluator=p;return x[v?'checkBackward':'checkForward']();},checkStartOfBlock:function(){var z=this;var t=z.startContainer,u=z.startOffset;if(u&&t.type==3){var v=e.ltrim(t.substring(0,u));if(v.length)return false;}z.trim();var w=new d.elementPath(z.startContainer),x=z.clone();x.collapse(true);x.setStartAt(w.block||w.blockLimit,1);var y=new d.walker(x);y.evaluator=o(true);return y.checkBackward();},checkEndOfBlock:function(){var z=this;var t=z.endContainer,u=z.endOffset;if(t.type==3){var v=e.rtrim(t.substring(u));if(v.length)return false;}z.trim();var w=new d.elementPath(z.endContainer),x=z.clone();x.collapse(false);x.setEndAt(w.block||w.blockLimit,2);var y=new d.walker(x);y.evaluator=o(false);return y.checkForward();},checkReadOnly:(function(){function t(u,v){while(u){if(u.type==1)if(u.getAttribute('contentEditable')=='false'&&!u.data('cke-editable'))return 0;else if(u.is('html')||u.getAttribute('contentEditable')=='true'&&(u.contains(v)||u.equals(v)))break;
-u=u.getParent();}return 1;};return function(){var u=this.startContainer,v=this.endContainer;return!(t(u,v)&&t(v,u));};})(),moveToElementEditablePosition:function(t,u){var v;if(f.$empty[t.getName()])return false;while(t&&t.type==1){v=t.isEditable();if(v)this.moveToPosition(t,u?2:1);else if(f.$inline[t.getName()]){this.moveToPosition(t,u?4:3);return true;}if(f.$empty[t.getName()])t=t[u?'getPrevious':'getNext'](s);else t=t[u?'getLast':'getFirst'](s);if(t&&t.type==3){this.moveToPosition(t,u?4:3);return true;}}return v;},moveToElementEditStart:function(t){return this.moveToElementEditablePosition(t);},moveToElementEditEnd:function(t){return this.moveToElementEditablePosition(t,true);},getEnclosedNode:function(){var t=this.clone();t.optimize();if(t.startContainer.type!=1||t.endContainer.type!=1)return null;var u=new d.walker(t),v=d.walker.bookmark(true),w=d.walker.whitespaces(true),x=function(z){return w(z)&&v(z);};t.evaluator=x;var y=u.next();u.reset();return y&&y.equals(u.previous())?y:null;},getTouchedStartNode:function(){var t=this.startContainer;if(this.collapsed||t.type!=1)return t;return t.getChild(this.startOffset)||t;},getTouchedEndNode:function(){var t=this.endContainer;if(this.collapsed||t.type!=1)return t;return t.getChild(this.endOffset-1)||t;}};})();a.POSITION_AFTER_START=1;a.POSITION_BEFORE_END=2;a.POSITION_BEFORE_START=3;a.POSITION_AFTER_END=4;a.ENLARGE_ELEMENT=1;a.ENLARGE_BLOCK_CONTENTS=2;a.ENLARGE_LIST_ITEM_CONTENTS=3;a.START=1;a.END=2;a.STARTEND=3;a.SHRINK_ELEMENT=1;a.SHRINK_TEXT=2;(function(){d.rangeList=function(n){if(n instanceof d.rangeList)return n;if(!n)n=[];else if(n instanceof d.range)n=[n];return e.extend(n,l);};var l={createIterator:function(){var n=this,o=d.walker.bookmark(),p=function(s){return!(s.is&&s.is('tr'));},q=[],r;return{getNextRange:function(s){r=r==undefined?0:r+1;var t=n[r];if(t&&n.length>1){if(!r)for(var u=n.length-1;u>=0;u--)q.unshift(n[u].createBookmark(true));if(s){var v=0;while(n[r+v+1]){var w=t.document,x=0,y=w.getById(q[v].endNode),z=w.getById(q[v+1].startNode),A;while(1){A=y.getNextSourceNode(false);if(!z.equals(A)){if(o(A)||A.type==1&&A.isBlockBoundary()){y=A;continue;}}else x=1;break;}if(!x)break;v++;}}t.moveToBookmark(q.shift());while(v--){A=n[++r];A.moveToBookmark(q.shift());t.setEnd(A.endContainer,A.endOffset);}}return t;}};},createBookmarks:function(n){var s=this;var o=[],p;for(var q=0;q<s.length;q++){o.push(p=s[q].createBookmark(n,true));for(var r=q+1;r<s.length;r++){s[r]=m(p,s[r]);s[r]=m(p,s[r],true);}}return o;
-},createBookmarks2:function(n){var o=[];for(var p=0;p<this.length;p++)o.push(this[p].createBookmark2(n));return o;},moveToBookmarks:function(n){for(var o=0;o<this.length;o++)this[o].moveToBookmark(n[o]);}};function m(n,o,p){var q=n.serializable,r=o[p?'endContainer':'startContainer'],s=p?'endOffset':'startOffset',t=q?o.document.getById(n.startNode):n.startNode,u=q?o.document.getById(n.endNode):n.endNode;if(r.equals(t.getPrevious())){o.startOffset=o.startOffset-r.getLength()-u.getPrevious().getLength();r=u.getNext();}else if(r.equals(u.getPrevious())){o.startOffset=o.startOffset-r.getLength();r=u.getNext();}r.equals(t.getParent())&&o[s]++;r.equals(u.getParent())&&o[s]++;o[p?'endContainer':'startContainer']=r;return o;};})();(function(){if(b.webkit){b.hc=false;return;}var l=h.createFromHtml('<div style="width:0px;height:0px;position:absolute;left:-10000px;border: 1px solid;border-color: red blue;"></div>',a.document);l.appendTo(a.document.getHead());try{b.hc=l.getComputedStyle('border-top-color')==l.getComputedStyle('border-right-color');}catch(m){b.hc=false;}if(b.hc)b.cssClass+=' cke_hc';l.remove();})();j.load(i.corePlugins.split(','),function(){a.status='loaded';a.fire('loaded');var l=a._.pending;if(l){delete a._.pending;for(var m=0;m<l.length;m++)a.add(l[m]);}});if(c)try{document.execCommand('BackgroundImageCache',false,true);}catch(l){}a.skins.add('kama',(function(){var m='cke_ui_color';return{editor:{css:['editor.css']},dialog:{css:['dialog.css']},richcombo:{canGroup:false},templates:{css:['templates.css']},margins:[0,0,0,0],init:function(n){if(n.config.width&&!isNaN(n.config.width))n.config.width-=12;var o=[],p=/\$color/g,q='/* UI Color Support */.cke_skin_kama .cke_menuitem .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_label,.cke_skin_kama .cke_menuitem a:focus .cke_label,.cke_skin_kama .cke_menuitem a:active .cke_label{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label{\tbackground-color: transparent !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuseparator{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover,.cke_skin_kama .cke_menuitem a:focus,.cke_skin_kama .cke_menuitem a:active{\tbackground-color: $color !important;}';
-if(b.webkit){q=q.split('}').slice(0,-1);for(var r=0;r<q.length;r++)q[r]=q[r].split('{');}function s(v){var w=v.getById(m);if(!w){w=v.getHead().append('style');w.setAttribute('id',m);w.setAttribute('type','text/css');}return w;};function t(v,w,x){var y,z,A;for(var B=0;B<v.length;B++){if(b.webkit)for(z=0;z<w.length;z++){A=w[z][1];for(y=0;y<x.length;y++)A=A.replace(x[y][0],x[y][1]);v[B].$.sheet.addRule(w[z][0],A);}else{A=w;for(y=0;y<x.length;y++)A=A.replace(x[y][0],x[y][1]);if(c)v[B].$.styleSheet.cssText+=A;else v[B].$.innerHTML+=A;}}};var u=/\$color/g;e.extend(n,{uiColor:null,getUiColor:function(){return this.uiColor;},setUiColor:function(v){var w,x=s(a.document),y='.'+n.id,z=[y+' .cke_wrapper',y+'_dialog .cke_dialog_contents',y+'_dialog a.cke_dialog_tab',y+'_dialog .cke_dialog_footer'].join(','),A='background-color: $color !important;';if(b.webkit)w=[[z,A]];else w=z+'{'+A+'}';return(this.setUiColor=function(B){var C=[[u,B]];n.uiColor=B;t([x],w,C);t(o,q,C);})(v);}});n.on('menuShow',function(v){var w=v.data[0],x=w.element.getElementsByTag('iframe').getItem(0).getFrameDocument();if(!x.getById('cke_ui_color')){var y=s(x);o.push(y);var z=n.getUiColor();if(z)t([y],q,[[u,z]]);}});if(n.config.uiColor)n.setUiColor(n.config.uiColor);}};})());(function(){a.dialog?m():a.on('dialogPluginReady',m);function m(){a.dialog.on('resize',function(n){var o=n.data,p=o.width,q=o.height,r=o.dialog,s=r.parts.contents;if(o.skin!='kama')return;s.setStyles({width:p+'px',height:q+'px'});});};})();j.add('about',{requires:['dialog'],init:function(m){var n=m.addCommand('about',new a.dialogCommand('about'));n.modes={wysiwyg:1,source:1};n.canUndo=false;n.readOnly=1;m.ui.addButton('About',{label:m.lang.about.title,command:'about'});a.dialog.add('about',this.path+'dialogs/about.js');}});(function(){var m='a11yhelp',n='a11yHelp';j.add(m,{availableLangs:{en:1,he:1},init:function(o){var p=this;o.addCommand(n,{exec:function(){var q=o.langCode;q=p.availableLangs[q]?q:'en';a.scriptLoader.load(a.getUrl(p.path+'lang/'+q+'.js'),function(){e.extend(o.lang,p.langEntries[q]);o.openDialog(n);});},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:false});a.dialog.add(n,this.path+'dialogs/a11yhelp.js');}});})();j.add('basicstyles',{requires:['styles','button'],init:function(m){var n=function(q,r,s,t){var u=new a.style(t);m.attachStyleStateChange(u,function(v){!m.readOnly&&m.getCommand(s).setState(v);});m.addCommand(s,new a.styleCommand(u));m.ui.addButton(q,{label:r,command:s});},o=m.config,p=m.lang;n('Bold',p.bold,'bold',o.coreStyles_bold);
-n('Italic',p.italic,'italic',o.coreStyles_italic);n('Underline',p.underline,'underline',o.coreStyles_underline);n('Strike',p.strike,'strike',o.coreStyles_strike);n('Subscript',p.subscript,'subscript',o.coreStyles_subscript);n('Superscript',p.superscript,'superscript',o.coreStyles_superscript);}});i.coreStyles_bold={element:'strong',overrides:'b'};i.coreStyles_italic={element:'em',overrides:'i'};i.coreStyles_underline={element:'u'};i.coreStyles_strike={element:'strike'};i.coreStyles_subscript={element:'sub'};i.coreStyles_superscript={element:'sup'};(function(){var m={table:1,ul:1,ol:1,blockquote:1,div:1},n={},o={};e.extend(n,m,{tr:1,p:1,div:1,li:1});e.extend(o,n,{td:1});function p(B){q(B);r(B);};function q(B){var C=B.editor,D=B.data.path;if(C.readOnly)return;var E=C.config.useComputedState,F;E=E===undefined||E;if(!E)F=s(D.lastElement);F=F||D.block||D.blockLimit;if(F.is('body')){var G=C.getSelection().getRanges()[0].getEnclosedNode();G&&G.type==1&&(F=G);}if(!F)return;var H=E?F.getComputedStyle('direction'):F.getStyle('direction')||F.getAttribute('dir');C.getCommand('bidirtl').setState(H=='rtl'?1:2);C.getCommand('bidiltr').setState(H=='ltr'?1:2);};function r(B){var C=B.editor,D=B.data.path.block||B.data.path.blockLimit;C.fire('contentDirChanged',D?D.getComputedStyle('direction'):C.lang.dir);};function s(B){while(B&&!(B.getName() in o||B.is('body'))){var C=B.getParent();if(!C)break;B=C;}return B;};function t(B,C,D,E){if(B.isReadOnly())return;h.setMarker(E,B,'bidi_processed',1);var F=B;while((F=F.getParent())&&!F.is('body')){if(F.getCustomData('bidi_processed')){B.removeStyle('direction');B.removeAttribute('dir');return;}}var G='useComputedState' in D.config?D.config.useComputedState:1,H=G?B.getComputedStyle('direction'):B.getStyle('direction')||B.hasAttribute('dir');if(H==C)return;B.removeStyle('direction');if(G){B.removeAttribute('dir');if(C!=B.getComputedStyle('direction'))B.setAttribute('dir',C);}else B.setAttribute('dir',C);D.forceNextSelectionCheck();};function u(B,C,D){var E=B.getCommonAncestor(false,true);B=B.clone();B.enlarge(D==2?3:2);if(B.checkBoundaryOfElement(E,1)&&B.checkBoundaryOfElement(E,2)){var F;while(E&&E.type==1&&(F=E.getParent())&&F.getChildCount()==1&&!(E.getName() in C))E=F;return E.type==1&&E.getName() in C&&E;}};function v(B){return function(C){var D=C.getSelection(),E=C.config.enterMode,F=D.getRanges();if(F&&F.length){var G={},H=D.createBookmarks(),I=F.createIterator(),J,K=0;while(J=I.getNextRange(1)){var L=J.getEnclosedNode();if(!L||L&&!(L.type==1&&L.getName() in n))L=u(J,m,E);
-L&&t(L,B,C,G);var M,N,O=new d.walker(J),P=H[K].startNode,Q=H[K++].endNode;O.evaluator=function(R){return!!(R.type==1&&R.getName() in m&&!(R.getName()==(E==1?'p':'div')&&R.getParent().type==1&&R.getParent().getName()=='blockquote')&&R.getPosition(P)&2&&(R.getPosition(Q)&4+16)==4);};while(N=O.next())t(N,B,C,G);M=J.createIterator();M.enlargeBr=E!=2;while(N=M.getNextParagraph(E==1?'p':'div'))t(N,B,C,G);}h.clearAllMarkers(G);C.forceNextSelectionCheck();D.selectBookmarks(H);C.focus();}};};j.add('bidi',{requires:['styles','button'],init:function(B){var C=function(E,F,G,H){B.addCommand(G,new a.command(B,{exec:H}));B.ui.addButton(E,{label:F,command:G});},D=B.lang.bidi;C('BidiLtr',D.ltr,'bidiltr',v('ltr'));C('BidiRtl',D.rtl,'bidirtl',v('rtl'));B.on('selectionChange',p);B.on('contentDom',function(){B.document.on('dirChanged',function(E){B.fire('dirChanged',{node:E.data,dir:E.data.getDirection(1)});});});}});function w(B){var C=B.getDocument().getBody().getParent();while(B){if(B.equals(C))return false;B=B.getParent();}return true;};function x(B){var C=B==y.setAttribute,D=B==y.removeAttribute,E=/\bdirection\s*:\s*(.*?)\s*(:?$|;)/;return function(F,G){var J=this;if(!J.getDocument().equals(a.document)){var H;if((F==(C||D?'dir':'direction')||F=='style'&&(D||E.test(G)))&&!w(J)){H=J.getDirection(1);var I=B.apply(J,arguments);if(H!=J.getDirection(1)){J.getDocument().fire('dirChanged',J);return I;}}}return B.apply(J,arguments);};};var y=h.prototype,z=['setStyle','removeStyle','setAttribute','removeAttribute'];for(var A=0;A<z.length;A++)y[z[A]]=e.override(y[z[A]],x);})();(function(){function m(q,r){var s=r.block||r.blockLimit;if(!s||s.getName()=='body')return 2;if(s.getAscendant('blockquote',true))return 1;return 2;};function n(q){var r=q.editor;if(r.readOnly)return;var s=r.getCommand('blockquote');s.state=m(r,q.data.path);s.fire('state');};function o(q){for(var r=0,s=q.getChildCount(),t;r<s&&(t=q.getChild(r));r++){if(t.type==1&&t.isBlockBoundary())return false;}return true;};var p={exec:function(q){var r=q.getCommand('blockquote').state,s=q.getSelection(),t=s&&s.getRanges(true)[0];if(!t)return;var u=s.createBookmarks();if(c){var v=u[0].startNode,w=u[0].endNode,x;if(v&&v.getParent().getName()=='blockquote'){x=v;while(x=x.getNext()){if(x.type==1&&x.isBlockBoundary()){v.move(x,true);break;}}}if(w&&w.getParent().getName()=='blockquote'){x=w;while(x=x.getPrevious()){if(x.type==1&&x.isBlockBoundary()){w.move(x);break;}}}}var y=t.createIterator(),z;y.enlargeBr=q.config.enterMode!=2;if(r==2){var A=[];
-while(z=y.getNextParagraph())A.push(z);if(A.length<1){var B=q.document.createElement(q.config.enterMode==1?'p':'div'),C=u.shift();t.insertNode(B);B.append(new d.text('\ufeff',q.document));t.moveToBookmark(C);t.selectNodeContents(B);t.collapse(true);C=t.createBookmark();A.push(B);u.unshift(C);}var D=A[0].getParent(),E=[];for(var F=0;F<A.length;F++){z=A[F];D=D.getCommonAncestor(z.getParent());}var G={table:1,tbody:1,tr:1,ol:1,ul:1};while(G[D.getName()])D=D.getParent();var H=null;while(A.length>0){z=A.shift();while(!z.getParent().equals(D))z=z.getParent();if(!z.equals(H))E.push(z);H=z;}while(E.length>0){z=E.shift();if(z.getName()=='blockquote'){var I=new d.documentFragment(q.document);while(z.getFirst()){I.append(z.getFirst().remove());A.push(I.getLast());}I.replace(z);}else A.push(z);}var J=q.document.createElement('blockquote');J.insertBefore(A[0]);while(A.length>0){z=A.shift();J.append(z);}}else if(r==1){var K=[],L={};while(z=y.getNextParagraph()){var M=null,N=null;while(z.getParent()){if(z.getParent().getName()=='blockquote'){M=z.getParent();N=z;break;}z=z.getParent();}if(M&&N&&!N.getCustomData('blockquote_moveout')){K.push(N);h.setMarker(L,N,'blockquote_moveout',true);}}h.clearAllMarkers(L);var O=[],P=[];L={};while(K.length>0){var Q=K.shift();J=Q.getParent();if(!Q.getPrevious())Q.remove().insertBefore(J);else if(!Q.getNext())Q.remove().insertAfter(J);else{Q.breakParent(Q.getParent());P.push(Q.getNext());}if(!J.getCustomData('blockquote_processed')){P.push(J);h.setMarker(L,J,'blockquote_processed',true);}O.push(Q);}h.clearAllMarkers(L);for(F=P.length-1;F>=0;F--){J=P[F];if(o(J))J.remove();}if(q.config.enterMode==2){var R=true;while(O.length){Q=O.shift();if(Q.getName()=='div'){I=new d.documentFragment(q.document);var S=R&&Q.getPrevious()&&!(Q.getPrevious().type==1&&Q.getPrevious().isBlockBoundary());if(S)I.append(q.document.createElement('br'));var T=Q.getNext()&&!(Q.getNext().type==1&&Q.getNext().isBlockBoundary());while(Q.getFirst())Q.getFirst().remove().appendTo(I);if(T)I.append(q.document.createElement('br'));I.replace(Q);R=false;}}}}s.selectBookmarks(u);q.focus();}};j.add('blockquote',{init:function(q){q.addCommand('blockquote',p);q.ui.addButton('Blockquote',{label:q.lang.blockquote,command:'blockquote'});q.on('selectionChange',n);},requires:['domiterator']});})();j.add('button',{beforeInit:function(m){m.ui.addHandler('button',k.button.handler);}});a.UI_BUTTON='button';k.button=function(m){e.extend(this,m,{title:m.label,className:m.className||m.command&&'cke_button_'+m.command||'',click:m.click||(function(n){n.execCommand(m.command);
-})});this._={};};k.button.handler={create:function(m){return new k.button(m);}};(function(){k.button.prototype={render:function(m,n){var o=b,p=this._.id=e.getNextId(),q='',r=this.command,s;this._.editor=m;var t={id:p,button:this,editor:m,focus:function(){var z=a.document.getById(p);z.focus();},execute:function(){if(c&&b.version<7)e.setTimeout(function(){this.button.click(m);},0,this);else this.button.click(m);}},u=e.addFunction(function(z){if(t.onkey){z=new d.event(z);return t.onkey(t,z.getKeystroke())!==false;}}),v=e.addFunction(function(z){var A;if(t.onfocus)A=t.onfocus(t,new d.event(z))!==false;if(b.gecko&&b.version<10900)z.preventBubble();return A;});t.clickFn=s=e.addFunction(t.execute,t);if(this.modes){var w={};function x(){var z=m.mode;if(z){var A=this.modes[z]?w[z]!=undefined?w[z]:2:0;this.setState(m.readOnly&&!this.readOnly?0:A);}};m.on('beforeModeUnload',function(){if(m.mode&&this._.state!=0)w[m.mode]=this._.state;},this);m.on('mode',x,this);!this.readOnly&&m.on('readOnly',x,this);}else if(r){r=m.getCommand(r);if(r){r.on('state',function(){this.setState(r.state);},this);q+='cke_'+(r.state==1?'on':r.state==0?'disabled':'off');}}if(!r)q+='cke_off';if(this.className)q+=' '+this.className;n.push('<span class="cke_button'+(this.icon&&this.icon.indexOf('.png')==-1?' cke_noalphafix':'')+'">','<a id="',p,'" class="',q,'"',o.gecko&&o.version>=10900&&!o.hc?'':'" href="javascript:void(\''+(this.title||'').replace("'",'')+"')\"",' title="',this.title,'" tabindex="-1" hidefocus="true" role="button" aria-labelledby="'+p+'_label"'+(this.hasArrow?' aria-haspopup="true"':''));if(o.opera||o.gecko&&o.mac)n.push(' onkeypress="return false;"');if(o.gecko)n.push(' onblur="this.style.cssText = this.style.cssText;"');n.push(' onkeydown="return CKEDITOR.tools.callFunction(',u,', event);" onfocus="return CKEDITOR.tools.callFunction(',v,', event);" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',s,', this); return false;"><span class="cke_icon"');if(this.icon){var y=(this.iconOffset||0)*-16;n.push(' style="background-image:url(',a.getUrl(this.icon),');background-position:0 '+y+'px;"');}n.push('> </span><span id="',p,'_label" class="cke_label">',this.label,'</span>');if(this.hasArrow)n.push('<span class="cke_buttonarrow">'+(b.hc?'▼':' ')+'</span>');n.push('</a>','</span>');if(this.onRender)this.onRender();return t;},setState:function(m){if(this._.state==m)return false;this._.state=m;var n=a.document.getById(this._.id);if(n){n.setState(m);
-m==0?n.setAttribute('aria-disabled',true):n.removeAttribute('aria-disabled');m==1?n.setAttribute('aria-pressed',true):n.removeAttribute('aria-pressed');return true;}else return false;}};})();k.prototype.addButton=function(m,n){this.add(m,'button',n);};(function(){var m=function(y,z){var A=y.document,B=A.getBody(),C=0,D=function(){C=1;};B.on(z,D);(b.version>7?A.$:A.$.selection.createRange()).execCommand(z);B.removeListener(z,D);return C;},n=c?function(y,z){return m(y,z);}:function(y,z){try{return y.document.$.execCommand(z,false,null);}catch(A){return false;}},o=function(y){var z=this;z.type=y;z.canUndo=z.type=='cut';z.startDisabled=true;};o.prototype={exec:function(y,z){this.type=='cut'&&t(y);var A=n(y,this.type);if(!A)alert(y.lang.clipboard[this.type+'Error']);return A;}};var p={canUndo:false,exec:c?function(y){y.focus();if(!y.document.getBody().fire('beforepaste')&&!m(y,'paste')){y.fire('pasteDialog');return false;}}:function(y){try{if(!y.document.getBody().fire('beforepaste')&&!y.document.$.execCommand('Paste',false,null))throw 0;}catch(z){setTimeout(function(){y.fire('pasteDialog');},0);return false;}}},q=function(y){if(this.mode!='wysiwyg')return;switch(y.data.keyCode){case 1114112+86:case 2228224+45:var z=this.document.getBody();if(!c&&z.fire('beforepaste'))y.cancel();else if(b.opera||b.gecko&&b.version<10900)z.fire('paste');return;case 1114112+88:case 2228224+46:var A=this;this.fire('saveSnapshot');setTimeout(function(){A.fire('saveSnapshot');},0);}};function r(y){y.cancel();};function s(y,z,A){var B=this.document;if(B.getById('cke_pastebin'))return;if(z=='text'&&y.data&&y.data.$.clipboardData){var C=y.data.$.clipboardData.getData('text/plain');if(C){y.data.preventDefault();A(C);return;}}var D=this.getSelection(),E=new d.range(B),F=new h(z=='text'?'textarea':b.webkit?'body':'div',B);F.setAttribute('id','cke_pastebin');b.webkit&&F.append(B.createText('\xa0'));B.getBody().append(F);F.setStyles({position:'absolute',top:D.getStartElement().getDocumentPosition().y+'px',width:'1px',height:'1px',overflow:'hidden'});F.setStyle(this.config.contentsLangDirection=='ltr'?'left':'right','-1000px');var G=D.createBookmarks();this.on('selectionChange',r,null,null,0);if(z=='text')F.$.focus();else{E.setStartAt(F,1);E.setEndAt(F,2);E.select(true);}var H=this;window.setTimeout(function(){z=='text'&&b.gecko&&H.focusGrabber.focus();F.remove();H.removeListener('selectionChange',r);var I;F=b.webkit&&(I=F.getFirst())&&I.is&&I.hasClass('Apple-style-span')?I:F;D.selectBookmarks(G);
-A(F['get'+(z=='text'?'Value':'Html')]());},0);};function t(y){if(!c||b.quirks)return;var z=y.getSelection(),A;if(z.getType()==3&&(A=z.getSelectedElement())){var B=z.getRanges()[0],C=y.document.createText('');C.insertBefore(A);B.setStartBefore(C);B.setEndAfter(A);z.selectRanges([B]);setTimeout(function(){if(A.getParent()){C.remove();z.selectElement(A);}},0);}};var u;function v(y,z){c&&(u=1);var A=2;try{A=z.document.$.queryCommandEnabled(y)?2:0;}catch(B){}u=0;return A;};var w;function x(){var z=this;if(z.mode!='wysiwyg')return;z.getCommand('cut').setState(w?0:v('Cut',z));z.getCommand('copy').setState(v('Copy',z));var y=w?0:b.webkit?2:v('Paste',z);z.fire('pasteState',y);};j.add('clipboard',{requires:['dialog','htmldataprocessor'],init:function(y){y.on('paste',function(A){var B=A.data;if(B.html)y.insertHtml(B.html);else if(B.text)y.insertText(B.text);setTimeout(function(){y.fire('afterPaste');},0);},null,null,1000);y.on('pasteDialog',function(A){setTimeout(function(){y.openDialog('paste');},0);});y.on('pasteState',function(A){y.getCommand('paste').setState(A.data);});function z(A,B,C,D){var E=y.lang[B];y.addCommand(B,C);y.ui.addButton(A,{label:E,command:B});if(y.addMenuItems)y.addMenuItem(B,{label:E,command:B,group:'clipboard',order:D});};z('Cut','cut',new o('cut'),1);z('Copy','copy',new o('copy'),4);z('Paste','paste',p,8);a.dialog.add('paste',a.getUrl(this.path+'dialogs/paste.js'));y.on('key',q,y);y.on('contentDom',function(){var A=y.document.getBody();A.on(b.webkit?'paste':'beforepaste',function(B){if(u)return;var C={mode:'html'};y.fire('beforePaste',C);s.call(y,B,C.mode,function(D){if(!(D=e.trim(D.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,''))))return;var E={};E[C.mode]=D;y.fire('paste',E);});});A.on('contextmenu',function(){u=1;setTimeout(function(){u=0;},10);});A.on('beforecut',function(){!u&&t(y);});A.on('mouseup',function(){setTimeout(function(){x.call(y);},0);},y);A.on('keyup',x,y);});y.on('selectionChange',function(A){w=A.data.selection.getRanges()[0].checkReadOnly();x.call(y);});if(y.contextMenu)y.contextMenu.addListener(function(A,B){var C=B.getRanges()[0].checkReadOnly();return{cut:!C&&v('Cut',y),copy:v('Copy',y),paste:!C&&(b.webkit?2:v('Paste',y))};});}});})();j.add('colorbutton',{requires:['panelbutton','floatpanel','styles'],init:function(m){var n=m.config,o=m.lang.colorButton,p;if(!b.hc){q('TextColor','fore',o.textColorTitle);q('BGColor','back',o.bgColorTitle);}function q(t,u,v){var w=e.getNextId()+'_colorBox';m.ui.add(t,'panelbutton',{label:v,title:v,className:'cke_button_'+t.toLowerCase(),modes:{wysiwyg:1},panel:{css:m.skin.editor.css,attributes:{role:'listbox','aria-label':o.panelTitle}},onBlock:function(x,y){y.autoSize=true;
-y.element.addClass('cke_colorblock');y.element.setHtml(r(x,u,w));y.element.getDocument().getBody().setStyle('overflow','hidden');k.fire('ready',this);var z=y.keys,A=m.lang.dir=='rtl';z[A?37:39]='next';z[40]='next';z[9]='next';z[A?39:37]='prev';z[38]='prev';z[2228224+9]='prev';z[32]='click';},onOpen:function(){var x=m.getSelection(),y=x&&x.getStartElement(),z=new d.elementPath(y),A;y=z.block||z.blockLimit||m.document.getBody();do A=y&&y.getComputedStyle(u=='back'?'background-color':'color')||'transparent';while(u=='back'&&A=='transparent'&&y&&(y=y.getParent()));if(!A||A=='transparent')A='#ffffff';this._.panel._.iframe.getFrameDocument().getById(w).setStyle('background-color',A);}});};function r(t,u,v){var w=[],x=n.colorButton_colors.split(','),y=x.length+(n.colorButton_enableMore?2:1),z=e.addFunction(function(F,G){if(F=='?'){var H=arguments.callee;function I(K){this.removeListener('ok',I);this.removeListener('cancel',I);K.name=='ok'&&H(this.getContentElement('picker','selectedColor').getValue(),G);};m.openDialog('colordialog',function(){this.on('ok',I);this.on('cancel',I);});return;}m.focus();t.hide(false);m.fire('saveSnapshot');new a.style(n['colorButton_'+G+'Style'],{color:'inherit'}).remove(m.document);if(F){var J=n['colorButton_'+G+'Style'];J.childRule=G=='back'?function(K){return s(K);}:function(K){return K.getName()!='a'||s(K);};new a.style(J,{color:F}).apply(m.document);}m.fire('saveSnapshot');});w.push('<a class="cke_colorauto" _cke_focus=1 hidefocus=true title="',o.auto,'" onclick="CKEDITOR.tools.callFunction(',z,",null,'",u,"');return false;\" href=\"javascript:void('",o.auto,'\')" role="option" aria-posinset="1" aria-setsize="',y,'"><table role="presentation" cellspacing=0 cellpadding=0 width="100%"><tr><td><span class="cke_colorbox" id="',v,'"></span></td><td colspan=7 align=center>',o.auto,'</td></tr></table></a><table role="presentation" cellspacing=0 cellpadding=0 width="100%">');for(var A=0;A<x.length;A++){if(A%8===0)w.push('</tr><tr>');var B=x[A].split('/'),C=B[0],D=B[1]||C;if(!B[1])C='#'+C.replace(/^(.)(.)(.)$/,'$1$1$2$2$3$3');var E=m.lang.colors[D]||D;w.push('<td><a class="cke_colorbox" _cke_focus=1 hidefocus=true title="',E,'" onclick="CKEDITOR.tools.callFunction(',z,",'",C,"','",u,"'); return false;\" href=\"javascript:void('",E,'\')" role="option" aria-posinset="',A+2,'" aria-setsize="',y,'"><span class="cke_colorbox" style="background-color:#',D,'"></span></a></td>');}if(n.colorButton_enableMore===undefined||n.colorButton_enableMore)w.push('</tr><tr><td colspan=8 align=center><a class="cke_colormore" _cke_focus=1 hidefocus=true title="',o.more,'" onclick="CKEDITOR.tools.callFunction(',z,",'?','",u,"');return false;\" href=\"javascript:void('",o.more,"')\"",' role="option" aria-posinset="',y,'" aria-setsize="',y,'">',o.more,'</a></td>');
-w.push('</tr></table>');return w.join('');};function s(t){return t.getAttribute('contentEditable')=='false'||t.getAttribute('data-nostyle');};}});i.colorButton_colors='000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';i.colorButton_foreStyle={element:'span',styles:{color:'#(color)'},overrides:[{element:'font',attributes:{color:null}}]};i.colorButton_backStyle={element:'span',styles:{'background-color':'#(color)'}};j.colordialog={init:function(m){m.addCommand('colordialog',new a.dialogCommand('colordialog'));a.dialog.add('colordialog',this.path+'dialogs/colordialog.js');}};j.add('colordialog',j.colordialog);j.add('contextmenu',{requires:['menu'],onLoad:function(){j.contextMenu=e.createClass({base:a.menu,$:function(m){this.base.call(this,m,{panel:{className:m.skinClass+' cke_contextmenu',attributes:{'aria-label':m.lang.contextmenu.options}}});},proto:{addTarget:function(m,n){if(b.opera&&!('oncontextmenu' in document.body)){var o;m.on('mousedown',function(s){s=s.data;if(s.$.button!=2){if(s.getKeystroke()==1114112+1)m.fire('contextmenu',s);return;}if(n&&(b.mac?s.$.metaKey:s.$.ctrlKey))return;var t=s.getTarget();if(!o){var u=t.getDocument();o=u.createElement('input');o.$.type='button';u.getBody().append(o);}o.setAttribute('style','position:absolute;top:'+(s.$.clientY-2)+'px;left:'+(s.$.clientX-2)+'px;width:5px;height:5px;opacity:0.01');});m.on('mouseup',function(s){if(o){o.remove();o=undefined;m.fire('contextmenu',s.data);}});}m.on('contextmenu',function(s){var t=s.data;if(n&&(b.webkit?p:b.mac?t.$.metaKey:t.$.ctrlKey))return;t.preventDefault();var u=t.getTarget().getDocument().getDocumentElement(),v=t.$.clientX,w=t.$.clientY;e.setTimeout(function(){this.open(u,null,v,w);},0,this);},this);if(b.opera)m.on('keypress',function(s){var t=s.data;if(t.$.keyCode===0)t.preventDefault();});if(b.webkit){var p,q=function(s){p=b.mac?s.data.$.metaKey:s.data.$.ctrlKey;},r=function(){p=0;};m.on('keydown',q);m.on('keyup',r);m.on('contextmenu',r);}},open:function(m,n,o,p){this.editor.focus();m=m||a.document.getDocumentElement();this.show(m,n,o,p);}}});},beforeInit:function(m){m.contextMenu=new j.contextMenu(m);m.addCommand('contextMenu',{exec:function(){m.contextMenu.open(m.document.getBody());}});}});(function(){function m(o){var p=this.att,q=o&&o.hasAttribute(p)&&o.getAttribute(p)||'';
-if(q!==undefined)this.setValue(q);};function n(){var o;for(var p=0;p<arguments.length;p++){if(arguments[p] instanceof h){o=arguments[p];break;}}if(o){var q=this.att,r=this.getValue();if(r)o.setAttribute(q,r);else o.removeAttribute(q,r);}};j.add('dialogadvtab',{createAdvancedTab:function(o,p){if(!p)p={id:1,dir:1,classes:1,styles:1};var q=o.lang.common,r={id:'advanced',label:q.advancedTab,title:q.advancedTab,elements:[{type:'vbox',padding:1,children:[]}]},s=[];if(p.id||p.dir){if(p.id)s.push({id:'advId',att:'id',type:'text',label:q.id,setup:m,commit:n});if(p.dir)s.push({id:'advLangDir',att:'dir',type:'select',label:q.langDir,'default':'',style:'width:100%',items:[[q.notSet,''],[q.langDirLTR,'ltr'],[q.langDirRTL,'rtl']],setup:m,commit:n});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}if(p.styles||p.classes){s=[];if(p.styles)s.push({id:'advStyles',att:'style',type:'text',label:q.styles,'default':'',onChange:function(){},getStyle:function(t,u){var v=this.getValue().match(new RegExp(t+'\\s*:\\s*([^;]*)','i'));return v?v[1]:u;},updateStyle:function(t,u){var v=this.getValue();if(v)v=v.replace(new RegExp('\\s*'+t+'s*:[^;]*(?:$|;s*)','i'),'').replace(/^[;\s]+/,'').replace(/\s+$/,'');if(u){v&&!/;\s*$/.test(v)&&(v+='; ');v+=t+': '+u;}this.setValue(v,1);},setup:m,commit:n});if(p.classes)s.push({type:'hbox',widths:['45%','55%'],children:[{id:'advCSSClasses',att:'class',type:'text',label:q.cssClasses,'default':'',setup:m,commit:n}]});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}return r;}});})();(function(){j.add('div',{requires:['editingblock','domiterator','styles'],init:function(m){var n=m.lang.div;m.addCommand('creatediv',new a.dialogCommand('creatediv'));m.addCommand('editdiv',new a.dialogCommand('editdiv'));m.addCommand('removediv',{exec:function(o){var p=o.getSelection(),q=p&&p.getRanges(),r,s=p.createBookmarks(),t,u=[];function v(x){var y=new d.elementPath(x),z=y.blockLimit,A=z.is('div')&&z;if(A&&!A.data('cke-div-added')){u.push(A);A.data('cke-div-added');}};for(var w=0;w<q.length;w++){r=q[w];if(r.collapsed)v(p.getStartElement());else{t=new d.walker(r);t.evaluator=v;t.lastForward();}}for(w=0;w<u.length;w++)u[w].remove(true);p.selectBookmarks(s);}});m.ui.addButton('CreateDiv',{label:n.toolbar,command:'creatediv'});if(m.addMenuItems){m.addMenuItems({editdiv:{label:n.edit,command:'editdiv',group:'div',order:1},removediv:{label:n.remove,command:'removediv',group:'div',order:5}});if(m.contextMenu)m.contextMenu.addListener(function(o,p){if(!o||o.isReadOnly())return null;
-var q=new d.elementPath(o),r=q.blockLimit;if(r&&r.getAscendant('div',true))return{editdiv:2,removediv:2};return null;});}a.dialog.add('creatediv',this.path+'dialogs/div.js');a.dialog.add('editdiv',this.path+'dialogs/div.js');}});})();(function(){var m={toolbarFocus:{editorFocus:false,readOnly:1,exec:function(o){var p=o._.elementsPath.idBase,q=a.document.getById(p+'0');q&&q.focus(c||b.air);}}},n='<span class="cke_empty"> </span>';j.add('elementspath',{requires:['selection'],init:function(o){var p='cke_path_'+o.name,q,r=function(){if(!q)q=a.document.getById(p);return q;},s='cke_elementspath_'+e.getNextNumber()+'_';o._.elementsPath={idBase:s,filters:[]};o.on('themeSpace',function(x){if(x.data.space=='bottom')x.data.html+='<span id="'+p+'_label" class="cke_voice_label">'+o.lang.elementsPath.eleLabel+'</span>'+'<div id="'+p+'" class="cke_path" role="group" aria-labelledby="'+p+'_label">'+n+'</div>';});function t(x){o.focus();var y=o._.elementsPath.list[x];if(y.is('body')){var z=new d.range(o.document);z.selectNodeContents(y);z.select();}else o.getSelection().selectElement(y);};var u=e.addFunction(t),v=e.addFunction(function(x,y){var z=o._.elementsPath.idBase,A;y=new d.event(y);var B=o.lang.dir=='rtl';switch(y.getKeystroke()){case B?39:37:case 9:A=a.document.getById(z+(x+1));if(!A)A=a.document.getById(z+'0');A.focus();return false;case B?37:39:case 2228224+9:A=a.document.getById(z+(x-1));if(!A)A=a.document.getById(z+(o._.elementsPath.list.length-1));A.focus();return false;case 27:o.focus();return false;case 13:case 32:t(x);return false;}return true;});o.on('selectionChange',function(x){var y=b,z=x.data.selection,A=z.getStartElement(),B=[],C=x.editor,D=C._.elementsPath.list=[],E=C._.elementsPath.filters;while(A){var F=0,G;if(A.data('cke-display-name'))G=A.data('cke-display-name');else if(A.data('cke-real-element-type'))G=A.data('cke-real-element-type');else G=A.getName();for(var H=0;H<E.length;H++){var I=E[H](A,G);if(I===false){F=1;break;}G=I||G;}if(!F){var J=D.push(A)-1,K='';if(y.opera||y.gecko&&y.mac)K+=' onkeypress="return false;"';if(y.gecko)K+=' onblur="this.style.cssText = this.style.cssText;"';var L=C.lang.elementsPath.eleTitle.replace(/%1/,G);B.unshift('<a id="',s,J,'" href="javascript:void(\'',G,'\')" tabindex="-1" title="',L,'"'+(b.gecko&&b.version<10900?' onfocus="event.preventBubble();"':'')+' hidefocus="true" '+' onkeydown="return CKEDITOR.tools.callFunction(',v,',',J,', event );"'+K,' onclick="CKEDITOR.tools.callFunction('+u,',',J,'); return false;"',' role="button" aria-labelledby="'+s+J+'_label">',G,'<span id="',s,J,'_label" class="cke_label">'+L+'</span>','</a>');
-}if(G=='body')break;A=A.getParent();}var M=r();M.setHtml(B.join('')+n);C.fire('elementsPathUpdate',{space:M});});function w(){q&&q.setHtml(n);delete o._.elementsPath.list;};o.on('readOnly',w);o.on('contentDomUnload',w);o.addCommand('elementsPathFocus',m.toolbarFocus);}});})();(function(){j.add('enterkey',{requires:['keystrokes','indent'],init:function(t){t.addCommand('enter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){r(v);}});t.addCommand('shiftEnter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){q(v);}});var u=t.keystrokeHandler.keystrokes;u[13]='enter';u[2228224+13]='shiftEnter';}});j.enterkey={enterBlock:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=v.checkStartOfBlock(),z=v.checkEndOfBlock(),A=new d.elementPath(v.startContainer),B=A.block;if(y&&z){if(B&&(B.is('li')||B.getParent().is('li'))){t.execCommand('outdent');return;}}else if(B&&B.is('pre')){if(!z){n(t,u,v,w);return;}}else if(B&&f.$captionBlock[B.getName()]){n(t,u,v,w);return;}var C=u==3?'div':'p',D=v.splitBlock(C);if(!D)return;var E=D.previousBlock,F=D.nextBlock,G=D.wasStartOfBlock,H=D.wasEndOfBlock,I;if(F){I=F.getParent();if(I.is('li')){F.breakParent(I);F.move(F.getNext(),1);}}else if(E&&(I=E.getParent())&&I.is('li')){E.breakParent(I);I=E.getNext();v.moveToElementEditStart(I);E.move(E.getPrevious());}if(!G&&!H){if(F.is('li')&&(I=F.getFirst(d.walker.invisible(true)))&&I.is&&I.is('ul','ol'))(c?x.createText('\xa0'):x.createElement('br')).insertBefore(I);if(F)v.moveToElementEditStart(F);}else{var J,K;if(E){if(E.is('li')||!(p.test(E.getName())||E.is('pre')))J=E.clone();}else if(F)J=F.clone();if(!J){if(I&&I.is('li'))J=I;else{J=x.createElement(C);if(E&&(K=E.getDirection()))J.setAttribute('dir',K);}}else if(w&&!J.is('li'))J.renameNode(C);var L=D.elementPath;if(L)for(var M=0,N=L.elements.length;M<N;M++){var O=L.elements[M];if(O.equals(L.block)||O.equals(L.blockLimit))break;if(f.$removeEmpty[O.getName()]){O=O.clone();J.moveChildren(O);J.append(O);}}if(!c)J.appendBogus();if(!J.getParent())v.insertNode(J);J.is('li')&&J.removeAttribute('value');if(c&&G&&(!H||!E.getChildCount())){v.moveToElementEditStart(H?E:J);v.select();}v.moveToElementEditStart(G&&!H?F:J);}if(!c)if(F){var P=x.createElement('span');P.setHtml(' ');v.insertNode(P);P.scrollIntoView();v.deleteContents();}else J.scrollIntoView();v.select();},enterBr:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=u==3?'div':'p',z=v.checkEndOfBlock(),A=new d.elementPath(t.getSelection().getStartElement()),B=A.block,C=B&&A.block.getName(),D=false;
-if(!w&&C=='li'){o(t,u,v,w);return;}if(!w&&z&&p.test(C)){var E,F;if(F=B.getDirection()){E=x.createElement('div');E.setAttribute('dir',F);E.insertAfter(B);v.setStart(E,0);}else{x.createElement('br').insertAfter(B);if(b.gecko)x.createText('').insertAfter(B);v.setStartAt(B.getNext(),c?3:1);}}else{var G;D=C=='pre';if(D&&!b.gecko)G=x.createText(c?'\r':'\n');else G=x.createElement('br');v.deleteContents();v.insertNode(G);if(c)v.setStartAt(G,4);else{x.createText('\ufeff').insertAfter(G);if(z)G.getParent().appendBogus();G.getNext().$.nodeValue='';v.setStartAt(G.getNext(),1);var H=null;if(!b.gecko){H=x.createElement('span');H.setHtml(' ');}else H=x.createElement('br');H.insertBefore(G.getNext());H.scrollIntoView();H.remove();}}v.collapse(true);v.select(D);}};var m=j.enterkey,n=m.enterBr,o=m.enterBlock,p=/^h[1-6]$/;function q(t){if(t.mode!='wysiwyg')return false;return r(t,t.config.shiftEnterMode,1);};function r(t,u,v){v=t.config.forceEnterMode||v;if(t.mode!='wysiwyg')return false;if(!u)u=t.config.enterMode;setTimeout(function(){t.fire('saveSnapshot');if(u==2)n(t,u,null,v);else o(t,u,null,v);},0);return true;};function s(t){var u=t.getSelection().getRanges(true);for(var v=u.length-1;v>0;v--)u[v].deleteContents();return u[0];};})();(function(){var m='nbsp,gt,lt,amp',n='quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro',o='Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml',p='Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv';
-function q(r,s){var t={},u=[],v={nbsp:'\xa0',shy:'Â',gt:'>',lt:'<',amp:'&'};r=r.replace(/\b(nbsp|shy|gt|lt|amp)(?:,|$)/g,function(A,B){var C=s?'&'+B+';':v[B],D=s?v[B]:'&'+B+';';t[C]=D;u.push(C);return '';});if(!s&&r){r=r.split(',');var w=document.createElement('div'),x;w.innerHTML='&'+r.join(';&')+';';x=w.innerHTML;w=null;for(var y=0;y<x.length;y++){var z=x.charAt(y);t[z]='&'+r[y]+';';u.push(z);}}t.regex=u.join(s?'|':'');return t;};j.add('entities',{afterInit:function(r){var s=r.config,t=r.dataProcessor,u=t&&t.htmlFilter;if(u){var v='';if(s.basicEntities!==false)v+=m;if(s.entities){v+=','+n;if(s.entities_latin)v+=','+o;if(s.entities_greek)v+=','+p;if(s.entities_additional)v+=','+s.entities_additional;}var w=q(v),x=w.regex?'['+w.regex+']':'a^';delete w.regex;if(s.entities&&s.entities_processNumerical)x='[^ -~]|'+x;x=new RegExp(x,'g');function y(C){return s.entities_processNumerical=='force'||!w[C]?'&#'+C.charCodeAt(0)+';':w[C];};var z=q([m,'shy'].join(','),true),A=new RegExp(z.regex,'g');function B(C){return z[C];};u.addRules({text:function(C){return C.replace(A,B).replace(x,y);}});}}});})();i.basicEntities=true;i.entities=true;i.entities_latin=true;i.entities_greek=true;i.entities_additional='#39';(function(){function m(v,w){var x=[];if(!w)return v;else for(var y in w)x.push(y+'='+encodeURIComponent(w[y]));return v+(v.indexOf('?')!=-1?'&':'?')+x.join('&');};function n(v){v+='';var w=v.charAt(0).toUpperCase();return w+v.substr(1);};function o(v){var C=this;var w=C.getDialog(),x=w.getParentEditor();x._.filebrowserSe=C;var y=x.config['filebrowser'+n(w.getName())+'WindowWidth']||x.config.filebrowserWindowWidth||'80%',z=x.config['filebrowser'+n(w.getName())+'WindowHeight']||x.config.filebrowserWindowHeight||'70%',A=C.filebrowser.params||{};A.CKEditor=x.name;A.CKEditorFuncNum=x._.filebrowserFn;if(!A.langCode)A.langCode=x.langCode;var B=m(C.filebrowser.url,A);x.popup(B,y,z,x.config.fileBrowserWindowFeatures);};function p(v){var y=this;var w=y.getDialog(),x=w.getParentEditor();x._.filebrowserSe=y;if(!w.getContentElement(y['for'][0],y['for'][1]).getInputElement().$.value)return false;if(!w.getContentElement(y['for'][0],y['for'][1]).getAction())return false;return true;};function q(v,w,x){var y=x.params||{};y.CKEditor=v.name;y.CKEditorFuncNum=v._.filebrowserFn;if(!y.langCode)y.langCode=v.langCode;w.action=m(x.url,y);w.filebrowser=x;};function r(v,w,x,y){var z,A;for(var B in y){z=y[B];if(z.type=='hbox'||z.type=='vbox')r(v,w,x,z.children);if(!z.filebrowser)continue;if(typeof z.filebrowser=='string'){var C={action:z.type=='fileButton'?'QuickUpload':'Browse',target:z.filebrowser};
-z.filebrowser=C;}if(z.filebrowser.action=='Browse'){var D=z.filebrowser.url;if(D===undefined){D=v.config['filebrowser'+n(w)+'BrowseUrl'];if(D===undefined)D=v.config.filebrowserBrowseUrl;}if(D){z.onClick=o;z.filebrowser.url=D;z.hidden=false;}}else if(z.filebrowser.action=='QuickUpload'&&z['for']){D=z.filebrowser.url;if(D===undefined){D=v.config['filebrowser'+n(w)+'UploadUrl'];if(D===undefined)D=v.config.filebrowserUploadUrl;}if(D){var E=z.onClick;z.onClick=function(F){var G=F.sender;if(E&&E.call(G,F)===false)return false;return p.call(G,F);};z.filebrowser.url=D;z.hidden=false;q(v,x.getContents(z['for'][0]).get(z['for'][1]),z.filebrowser);}}}};function s(v,w){var x=w.getDialog(),y=w.filebrowser.target||null;v=v.replace(/#/g,'%23');if(y){var z=y.split(':'),A=x.getContentElement(z[0],z[1]);if(A){A.setValue(v);x.selectPage(z[0]);}}};function t(v,w,x){if(x.indexOf(';')!==-1){var y=x.split(';');for(var z=0;z<y.length;z++){if(t(v,w,y[z]))return true;}return false;}var A=v.getContents(w).get(x).filebrowser;return A&&A.url;};function u(v,w){var A=this;var x=A._.filebrowserSe.getDialog(),y=A._.filebrowserSe['for'],z=A._.filebrowserSe.filebrowser.onSelect;if(y)x.getContentElement(y[0],y[1]).reset();if(typeof w=='function'&&w.call(A._.filebrowserSe)===false)return;if(z&&z.call(A._.filebrowserSe,v,w)===false)return;if(typeof w=='string'&&w)alert(w);if(v)s(v,A._.filebrowserSe);};j.add('filebrowser',{init:function(v,w){v._.filebrowserFn=e.addFunction(u,v);v.on('destroy',function(){e.removeFunction(this._.filebrowserFn);});}});a.on('dialogDefinition',function(v){var w=v.data.definition,x;for(var y in w.contents){if(x=w.contents[y]){r(v.editor,v.data.name,w,x.elements);if(x.hidden&&x.filebrowser)x.hidden=!t(w,x.id,x.filebrowser);}}});})();j.add('find',{init:function(m){var n=j.find;m.ui.addButton('Find',{label:m.lang.findAndReplace.find,command:'find'});var o=m.addCommand('find',new a.dialogCommand('find'));o.canUndo=false;o.readOnly=1;m.ui.addButton('Replace',{label:m.lang.findAndReplace.replace,command:'replace'});var p=m.addCommand('replace',new a.dialogCommand('replace'));p.canUndo=false;a.dialog.add('find',this.path+'dialogs/find.js');a.dialog.add('replace',this.path+'dialogs/find.js');},requires:['styles']});i.find_highlight={element:'span',styles:{'background-color':'#004',color:'#fff'}};(function(){var m=/\.swf(?:$|\?)/i;function n(p){var q=p.attributes;return q.type=='application/x-shockwave-flash'||m.test(q.src||'');};function o(p,q){return p.createFakeParserElement(q,'cke_flash','flash',true);
-};j.add('flash',{init:function(p){p.addCommand('flash',new a.dialogCommand('flash'));p.ui.addButton('Flash',{label:p.lang.common.flash,command:'flash'});a.dialog.add('flash',this.path+'dialogs/flash.js');p.addCss('img.cke_flash{background-image: url('+a.getUrl(this.path+'images/placeholder.png')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 80px;'+'height: 80px;'+'}');if(p.addMenuItems)p.addMenuItems({flash:{label:p.lang.flash.properties,command:'flash',group:'flash'}});p.on('doubleclick',function(q){var r=q.data.element;if(r.is('img')&&r.data('cke-real-element-type')=='flash')q.data.dialog='flash';});if(p.contextMenu)p.contextMenu.addListener(function(q,r){if(q&&q.is('img')&&!q.isReadOnly()&&q.data('cke-real-element-type')=='flash')return{flash:2};});},afterInit:function(p){var q=p.dataProcessor,r=q&&q.dataFilter;if(r)r.addRules({elements:{'cke:object':function(s){var t=s.attributes,u=t.classid&&String(t.classid).toLowerCase();if(!u&&!n(s)){for(var v=0;v<s.children.length;v++){if(s.children[v].name=='cke:embed'){if(!n(s.children[v]))return null;return o(p,s);}}return null;}return o(p,s);},'cke:embed':function(s){if(!n(s))return null;return o(p,s);}}},5);},requires:['fakeobjects']});})();e.extend(i,{flashEmbedTagOnly:false,flashAddEmbedTag:true,flashConvertOnEdit:false});(function(){function m(n,o,p,q,r,s,t){var u=n.config,v=r.split(';'),w=[],x={};for(var y=0;y<v.length;y++){var z=v[y];if(z){z=z.split('/');var A={},B=v[y]=z[0];A[p]=w[y]=z[1]||B;x[B]=new a.style(t,A);x[B]._.definition.name=B;}else v.splice(y--,1);}n.ui.addRichCombo(o,{label:q.label,title:q.panelTitle,className:'cke_'+(p=='size'?'fontSize':'font'),panel:{css:n.skin.editor.css.concat(u.contentsCss),multiSelect:false,attributes:{'aria-label':q.panelTitle}},init:function(){this.startGroup(q.panelTitle);for(var C=0;C<v.length;C++){var D=v[C];this.add(D,x[D].buildPreview(),D);}},onClick:function(C){n.focus();n.fire('saveSnapshot');var D=x[C];if(this.getValue()==C)D.remove(n.document);else D.apply(n.document);n.fire('saveSnapshot');},onRender:function(){n.on('selectionChange',function(C){var D=this.getValue(),E=C.data.path,F=E.elements;for(var G=0,H;G<F.length;G++){H=F[G];for(var I in x){if(x[I].checkElementRemovable(H,true)){if(I!=D)this.setValue(I);return;}}}this.setValue('',s);},this);}});};j.add('font',{requires:['richcombo','styles'],init:function(n){var o=n.config;m(n,'Font','family',n.lang.font,o.font_names,o.font_defaultLabel,o.font_style);
-m(n,'FontSize','size',n.lang.fontSize,o.fontSize_sizes,o.fontSize_defaultLabel,o.fontSize_style);}});})();i.font_names='Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif';i.font_defaultLabel='';i.font_style={element:'span',styles:{'font-family':'#(family)'},overrides:[{element:'font',attributes:{face:null}}]};i.fontSize_sizes='8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px';i.fontSize_defaultLabel='';i.fontSize_style={element:'span',styles:{'font-size':'#(size)'},overrides:[{element:'font',attributes:{size:null}}]};j.add('format',{requires:['richcombo','styles'],init:function(m){var n=m.config,o=m.lang.format,p=n.format_tags.split(';'),q={};for(var r=0;r<p.length;r++){var s=p[r];q[s]=new a.style(n['format_'+s]);q[s]._.enterMode=m.config.enterMode;}m.ui.addRichCombo('Format',{label:o.label,title:o.panelTitle,className:'cke_format',panel:{css:m.skin.editor.css.concat(n.contentsCss),multiSelect:false,attributes:{'aria-label':o.panelTitle}},init:function(){this.startGroup(o.panelTitle);for(var t in q){var u=o['tag_'+t];this.add(t,q[t].buildPreview(u),u);}},onClick:function(t){m.focus();m.fire('saveSnapshot');var u=q[t],v=new d.elementPath(m.getSelection().getStartElement());u[u.checkActive(v)?'remove':'apply'](m.document);setTimeout(function(){m.fire('saveSnapshot');},0);},onRender:function(){m.on('selectionChange',function(t){var u=this.getValue(),v=t.data.path;for(var w in q){if(q[w].checkActive(v)){if(w!=u)this.setValue(w,m.lang.format['tag_'+w]);return;}}this.setValue('');},this);}});}});i.format_tags='p;h1;h2;h3;h4;h5;h6;pre;address;div';i.format_p={element:'p'};i.format_div={element:'div'};i.format_pre={element:'pre'};i.format_address={element:'address'};i.format_h1={element:'h1'};i.format_h2={element:'h2'};i.format_h3={element:'h3'};i.format_h4={element:'h4'};i.format_h5={element:'h5'};i.format_h6={element:'h6'};j.add('forms',{init:function(m){var n=m.lang;m.addCss('form{border: 1px dotted #FF0000;padding: 2px;}\n');m.addCss('img.cke_hidden{background-image: url('+a.getUrl(this.path+'images/hiddenfield.gif')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 16px !important;'+'height: 16px !important;'+'}');
-var o=function(q,r,s){m.addCommand(r,new a.dialogCommand(r));m.ui.addButton(q,{label:n.common[q.charAt(0).toLowerCase()+q.slice(1)],command:r});a.dialog.add(r,s);},p=this.path+'dialogs/';o('Form','form',p+'form.js');o('Checkbox','checkbox',p+'checkbox.js');o('Radio','radio',p+'radio.js');o('TextField','textfield',p+'textfield.js');o('Textarea','textarea',p+'textarea.js');o('Select','select',p+'select.js');o('Button','button',p+'button.js');o('ImageButton','imagebutton',j.getPath('image')+'dialogs/image.js');o('HiddenField','hiddenfield',p+'hiddenfield.js');if(m.addMenuItems)m.addMenuItems({form:{label:n.form.menu,command:'form',group:'form'},checkbox:{label:n.checkboxAndRadio.checkboxTitle,command:'checkbox',group:'checkbox'},radio:{label:n.checkboxAndRadio.radioTitle,command:'radio',group:'radio'},textfield:{label:n.textfield.title,command:'textfield',group:'textfield'},hiddenfield:{label:n.hidden.title,command:'hiddenfield',group:'hiddenfield'},imagebutton:{label:n.image.titleButton,command:'imagebutton',group:'imagebutton'},button:{label:n.button.title,command:'button',group:'button'},select:{label:n.select.title,command:'select',group:'select'},textarea:{label:n.textarea.title,command:'textarea',group:'textarea'}});if(m.contextMenu){m.contextMenu.addListener(function(q){if(q&&q.hasAscendant('form',true)&&!q.isReadOnly())return{form:2};});m.contextMenu.addListener(function(q){if(q&&!q.isReadOnly()){var r=q.getName();if(r=='select')return{select:2};if(r=='textarea')return{textarea:2};if(r=='input')switch(q.getAttribute('type')){case 'button':case 'submit':case 'reset':return{button:2};case 'checkbox':return{checkbox:2};case 'radio':return{radio:2};case 'image':return{imagebutton:2};default:return{textfield:2};}if(r=='img'&&q.data('cke-real-element-type')=='hiddenfield')return{hiddenfield:2};}});}m.on('doubleclick',function(q){var r=q.data.element;if(r.is('form'))q.data.dialog='form';else if(r.is('select'))q.data.dialog='select';else if(r.is('textarea'))q.data.dialog='textarea';else if(r.is('img')&&r.data('cke-real-element-type')=='hiddenfield')q.data.dialog='hiddenfield';else if(r.is('input'))switch(r.getAttribute('type')){case 'button':case 'submit':case 'reset':q.data.dialog='button';break;case 'checkbox':q.data.dialog='checkbox';break;case 'radio':q.data.dialog='radio';break;case 'image':q.data.dialog='imagebutton';break;default:q.data.dialog='textfield';break;}});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.htmlFilter,p=n&&n.dataFilter;if(c)o&&o.addRules({elements:{input:function(q){var r=q.attributes,s=r.type;
-if(!s)r.type='text';if(s=='checkbox'||s=='radio')r.value=='on'&&delete r.value;}}});if(p)p.addRules({elements:{input:function(q){if(q.attributes.type=='hidden')return m.createFakeParserElement(q,'cke_hidden','hiddenfield');}}});},requires:['image','fakeobjects']});if(c)h.prototype.hasAttribute=e.override(h.prototype.hasAttribute,function(m){return function(n){var q=this;var o=q.$.attributes.getNamedItem(n);if(q.getName()=='input')switch(n){case 'class':return q.$.className.length>0;case 'checked':return!!q.$.checked;case 'value':var p=q.getAttribute('type');return p=='checkbox'||p=='radio'?q.$.value!='on':q.$.value;}return m.apply(q,arguments);};});(function(){var m={canUndo:false,exec:function(o){var p=o.document.createElement('hr'),q=new d.range(o.document);o.insertElement(p);q.moveToPosition(p,4);var r=p.getNext();if(!r||r.type==1&&!r.isEditable())q.fixBlock(true,o.config.enterMode==3?'div':'p');q.select();}},n='horizontalrule';j.add(n,{init:function(o){o.addCommand(n,m);o.ui.addButton('HorizontalRule',{label:o.lang.horizontalrule,command:n});}});})();(function(){var m=/^[\t\r\n ]*(?: |\xa0)$/,n='{cke_protected}';function o(T){var U=T.children.length,V=T.children[U-1];while(V&&V.type==3&&!e.trim(V.value))V=T.children[--U];return V;};function p(T,U){var V=T.children,W=o(T);if(W){if((U||!c)&&W.type==1&&W.name=='br')V.pop();if(W.type==3&&m.test(W.value))V.pop();}};function q(T,U,V){if(!U&&(!V||typeof V=='function'&&V(T)===false))return false;if(U&&c&&(document.documentMode>7||T.name in f.tr||T.name in f.$listItem))return false;var W=o(T);return!W||W&&(W.type==1&&W.name=='br'||T.name=='form'&&W.name=='input');};function r(T,U){return function(V){p(V,!T);if(q(V,!T,U))if(T||c)V.add(new a.htmlParser.text('\xa0'));else V.add(new a.htmlParser.element('br',{}));};};var s=f,t=['caption','colgroup','col','thead','tfoot','tbody'],u=e.extend({},s.$block,s.$listItem,s.$tableContent);for(var v in u){if(!('br' in s[v]))delete u[v];}delete u.pre;var w={elements:{},attributeNames:[[/^on/,'data-cke-pa-on']]},x={elements:{}};for(v in u)x.elements[v]=r();var y={elementNames:[[/^cke:/,''],[/^\?xml:namespace$/,'']],attributeNames:[[/^data-cke-(saved|pa)-/,''],[/^data-cke-.*/,''],['hidefocus','']],elements:{$:function(T){var U=T.attributes;if(U){if(U['data-cke-temp'])return false;var V=['name','href','src'],W;for(var X=0;X<V.length;X++){W='data-cke-saved-'+V[X];W in U&&delete U[V[X]];}}return T;},table:function(T){var U=T.children;U.sort(function(V,W){return V.type==1&&W.type==V.type?e.indexOf(t,V.name)>e.indexOf(t,W.name)?1:-1:0;
-});},embed:function(T){var U=T.parent;if(U&&U.name=='object'){var V=U.attributes.width,W=U.attributes.height;V&&(T.attributes.width=V);W&&(T.attributes.height=W);}},param:function(T){T.children=[];T.isEmpty=true;return T;},a:function(T){if(!(T.children.length||T.attributes.name||T.attributes['data-cke-saved-name']))return false;},span:function(T){if(T.attributes['class']=='Apple-style-span')delete T.name;},pre:function(T){c&&p(T);},html:function(T){delete T.attributes.contenteditable;delete T.attributes['class'];},body:function(T){delete T.attributes.spellcheck;delete T.attributes.contenteditable;},style:function(T){var U=T.children[0];U&&U.value&&(U.value=e.trim(U.value));if(!T.attributes.type)T.attributes.type='text/css';},title:function(T){var U=T.children[0];U&&(U.value=T.attributes['data-cke-title']||'');}},attributes:{'class':function(T,U){return e.ltrim(T.replace(/(?:^|\s+)cke_[^\s]*/g,''))||false;}}};if(c)y.attributes.style=function(T,U){return T.replace(/(^|;)([^\:]+)/g,function(V){return V.toLowerCase();});};function z(T){var U=T.attributes;if(U.contenteditable!='false')U['data-cke-editable']=U.contenteditable?'true':1;U.contenteditable='false';};function A(T){var U=T.attributes;switch(U['data-cke-editable']){case 'true':U.contenteditable='true';break;case '1':delete U.contenteditable;break;}};for(v in {input:1,textarea:1}){w.elements[v]=z;y.elements[v]=A;}var B=/<(a|area|img|input)\b([^>]*)>/gi,C=/\b(href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,D=/(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,E=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,F=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,G=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,H=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi;function I(T){return T.replace(B,function(U,V,W){return '<'+V+W.replace(C,function(X,Y){if(W.indexOf('data-cke-saved-'+Y)==-1)return ' data-cke-saved-'+X+' '+X;return X;})+'>';});};function J(T){return T.replace(D,function(U){return '<cke:encoded>'+encodeURIComponent(U)+'</cke:encoded>';});};function K(T){return T.replace(E,function(U,V){return decodeURIComponent(V);});};function L(T){return T.replace(F,'$1cke:$2');};function M(T){return T.replace(G,'$1$2');};function N(T){return T.replace(H,'<cke:$1$2></cke:$1>');};function O(T){return T.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,'$1$2$2');};function P(T){return T.replace(/<!--(?!{cke_protected})[\s\S]+?-->/g,function(U){return '<!--'+n+'{C}'+encodeURIComponent(U).replace(/--/g,'%2D%2D')+'-->';
-});};function Q(T){return T.replace(/<!--\{cke_protected\}\{C\}([\s\S]+?)-->/g,function(U,V){return decodeURIComponent(V);});};function R(T,U){var V=U._.dataStore;return T.replace(/<!--\{cke_protected\}([\s\S]+?)-->/g,function(W,X){return decodeURIComponent(X);}).replace(/\{cke_protected_(\d+)\}/g,function(W,X){return V&&V[X]||'';});};function S(T,U){var V=[],W=U.config.protectedSource,X=U._.dataStore||(U._.dataStore={id:1}),Y=/<\!--\{cke_temp(comment)?\}(\d*?)-->/g,Z=[/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi].concat(W);T=T.replace(/<!--[\s\S]*?-->/g,function(ab){return '<!--{cke_tempcomment}'+(V.push(ab)-1)+'-->';});for(var aa=0;aa<Z.length;aa++)T=T.replace(Z[aa],function(ab){ab=ab.replace(Y,function(ac,ad,ae){return V[ae];});return/cke_temp(comment)?/.test(ab)?ab:'<!--{cke_temp}'+(V.push(ab)-1)+'-->';});T=T.replace(Y,function(ab,ac,ad){return '<!--'+n+(ac?'{C}':'')+encodeURIComponent(V[ad]).replace(/--/g,'%2D%2D')+'-->';});return T.replace(/(['"]).*?\1/g,function(ab){return ab.replace(/<!--\{cke_protected\}([\s\S]+?)-->/g,function(ac,ad){X[X.id]=decodeURIComponent(ad);return '{cke_protected_'+X.id++ +'}';});});};j.add('htmldataprocessor',{requires:['htmlwriter'],init:function(T){var U=T.dataProcessor=new a.htmlDataProcessor(T);U.writer.forceSimpleAmpersand=T.config.forceSimpleAmpersand;U.dataFilter.addRules(w);U.dataFilter.addRules(x);U.htmlFilter.addRules(y);var V={elements:{}};for(v in u)V.elements[v]=r(true,T.config.fillEmptyBlocks);U.htmlFilter.addRules(V);},onLoad:function(){!('fillEmptyBlocks' in i)&&(i.fillEmptyBlocks=1);}});a.htmlDataProcessor=function(T){var U=this;U.editor=T;U.writer=new a.htmlWriter();U.dataFilter=new a.htmlParser.filter();U.htmlFilter=new a.htmlParser.filter();};a.htmlDataProcessor.prototype={toHtml:function(T,U){T=S(T,this.editor);T=I(T);T=J(T);T=L(T);T=N(T);T=O(T);var V=new h('div');V.setHtml('a'+T);T=V.getHtml().substr(1);T=M(T);T=K(T);T=Q(T);var W=a.htmlParser.fragment.fromHtml(T,U),X=new a.htmlParser.basicWriter();W.writeHtml(X,this.dataFilter);T=X.getHtml(true);T=P(T);return T;},toDataFormat:function(T,U){var V=this.writer,W=a.htmlParser.fragment.fromHtml(T,U);V.reset();W.writeHtml(V,this.htmlFilter);var X=V.getHtml(true);X=Q(X);X=R(X,this.editor);return X;}};})();(function(){j.add('iframe',{requires:['dialog','fakeobjects'],init:function(m){var n='iframe',o=m.lang.iframe;a.dialog.add(n,this.path+'dialogs/iframe.js');m.addCommand(n,new a.dialogCommand(n));m.addCss('img.cke_iframe{background-image: url('+a.getUrl(this.path+'images/placeholder.png')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 80px;'+'height: 80px;'+'}');
-m.ui.addButton('Iframe',{label:o.toolbar,command:n});m.on('doubleclick',function(p){var q=p.data.element;if(q.is('img')&&q.data('cke-real-element-type')=='iframe')p.data.dialog='iframe';});if(m.addMenuItems)m.addMenuItems({iframe:{label:o.title,command:'iframe',group:'image'}});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(p&&p.is('img')&&p.data('cke-real-element-type')=='iframe')return{iframe:2};});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.dataFilter;if(o)o.addRules({elements:{iframe:function(p){return m.createFakeParserElement(p,'cke_iframe','iframe',true);}}});}});})();j.add('image',{init:function(m){var n='image';a.dialog.add(n,this.path+'dialogs/image.js');m.addCommand(n,new a.dialogCommand(n));m.ui.addButton('Image',{label:m.lang.common.image,command:n});m.on('doubleclick',function(o){var p=o.data.element;if(p.is('img')&&!p.data('cke-realelement')&&!p.isReadOnly())o.data.dialog='image';});if(m.addMenuItems)m.addMenuItems({image:{label:m.lang.image.menu,command:'image',group:'image'}});if(m.contextMenu)m.contextMenu.addListener(function(o,p){if(!o||!o.is('img')||o.data('cke-realelement')||o.isReadOnly())return null;return{image:2};});}});i.image_removeLinkByEmptyURL=true;(function(){var m={ol:1,ul:1},n=d.walker.whitespaces(true),o=d.walker.bookmark(false,true);function p(t){var B=this;if(t.editor.readOnly)return null;var u=t.editor,v=t.data.path,w=v&&v.contains(m),x=v.block||v.blockLimit;if(w)return B.setState(2);if(!B.useIndentClasses&&B.name=='indent')return B.setState(2);if(!x)return B.setState(0);if(B.useIndentClasses){var y=x.$.className.match(B.classNameRegex),z=0;if(y){y=y[1];z=B.indentClassMap[y];}if(B.name=='outdent'&&!z||B.name=='indent'&&z==u.config.indentClasses.length)return B.setState(0);return B.setState(2);}else{var A=parseInt(x.getStyle(r(x)),10);if(isNaN(A))A=0;if(A<=0)return B.setState(0);return B.setState(2);}};function q(t,u){var w=this;w.name=u;w.useIndentClasses=t.config.indentClasses&&t.config.indentClasses.length>0;if(w.useIndentClasses){w.classNameRegex=new RegExp('(?:^|\\s+)('+t.config.indentClasses.join('|')+')(?=$|\\s)');w.indentClassMap={};for(var v=0;v<t.config.indentClasses.length;v++)w.indentClassMap[t.config.indentClasses[v]]=v+1;}w.startDisabled=u=='outdent';};function r(t,u){return(u||t.getComputedStyle('direction'))=='ltr'?'margin-left':'margin-right';};function s(t){return t.type=1&&t.is('li');};q.prototype={exec:function(t){var u=this,v={};function w(M){var N=C.startContainer,O=C.endContainer;
-while(N&&!N.getParent().equals(M))N=N.getParent();while(O&&!O.getParent().equals(M))O=O.getParent();if(!N||!O)return;var P=N,Q=[],R=false;while(!R){if(P.equals(O))R=true;Q.push(P);P=P.getNext();}if(Q.length<1)return;var S=M.getParents(true);for(var T=0;T<S.length;T++){if(S[T].getName&&m[S[T].getName()]){M=S[T];break;}}var U=u.name=='indent'?1:-1,V=Q[0],W=Q[Q.length-1],X=j.list.listToArray(M,v),Y=X[W.getCustomData('listarray_index')].indent;for(T=V.getCustomData('listarray_index');T<=W.getCustomData('listarray_index');T++){X[T].indent+=U;var Z=X[T].parent;X[T].parent=new h(Z.getName(),Z.getDocument());}for(T=W.getCustomData('listarray_index')+1;T<X.length&&X[T].indent>Y;T++)X[T].indent+=U;var aa=j.list.arrayToList(X,v,null,t.config.enterMode,M.getDirection());if(u.name=='outdent'){var ab;if((ab=M.getParent())&&ab.is('li')){var ac=aa.listNode.getChildren(),ad=[],ae=ac.count(),af;for(T=ae-1;T>=0;T--){if((af=ac.getItem(T))&&af.is&&af.is('li'))ad.push(af);}}}if(aa)aa.listNode.replace(M);if(ad&&ad.length)for(T=0;T<ad.length;T++){var ag=ad[T],ah=ag;while((ah=ah.getNext())&&ah.is&&ah.getName() in m){if(c&&!ag.getFirst(function(ai){return n(ai)&&o(ai);}))ag.append(C.document.createText('\xa0'));ag.append(ah);}ag.insertAfter(ab);}};function x(){var M=C.createIterator(),N=t.config.enterMode;M.enforceRealBlocks=true;M.enlargeBr=N!=2;var O;while(O=M.getNextParagraph(N==1?'p':'div'))y(O);};function y(M,N){if(M.getCustomData('indent_processed'))return false;if(u.useIndentClasses){var O=M.$.className.match(u.classNameRegex),P=0;if(O){O=O[1];P=u.indentClassMap[O];}if(u.name=='outdent')P--;else P++;if(P<0)return false;P=Math.min(P,t.config.indentClasses.length);P=Math.max(P,0);M.$.className=e.ltrim(M.$.className.replace(u.classNameRegex,''));if(P>0)M.addClass(t.config.indentClasses[P-1]);}else{var Q=r(M,N),R=parseInt(M.getStyle(Q),10);if(isNaN(R))R=0;var S=t.config.indentOffset||40;R+=(u.name=='indent'?1:-1)*S;if(R<0)return false;R=Math.max(R,0);R=Math.ceil(R/S)*S;M.setStyle(Q,R?R+(t.config.indentUnit||'px'):'');if(M.getAttribute('style')==='')M.removeAttribute('style');}h.setMarker(v,M,'indent_processed',1);return true;};var z=t.getSelection(),A=z.createBookmarks(1),B=z&&z.getRanges(1),C,D=B.createIterator();while(C=D.getNextRange()){var E=C.getCommonAncestor(),F=E;while(F&&!(F.type==1&&m[F.getName()]))F=F.getParent();if(!F){var G=C.getEnclosedNode();if(G&&G.type==1&&G.getName() in m){C.setStartAt(G,1);C.setEndAt(G,2);F=G;}}if(F&&C.startContainer.type==1&&C.startContainer.getName() in m){var H=new d.walker(C);
-H.evaluator=s;C.startContainer=H.next();}if(F&&C.endContainer.type==1&&C.endContainer.getName() in m){H=new d.walker(C);H.evaluator=s;C.endContainer=H.previous();}if(F){var I=F.getFirst(s),J=!!I.getNext(s),K=C.startContainer,L=I.equals(K)||I.contains(K);if(!(L&&(u.name=='indent'||u.useIndentClasses||parseInt(F.getStyle(r(F)),10))&&y(F,!J&&I.getDirection())))w(F);}else x();}h.clearAllMarkers(v);t.forceNextSelectionCheck();z.selectBookmarks(A);}};j.add('indent',{init:function(t){var u=t.addCommand('indent',new q(t,'indent')),v=t.addCommand('outdent',new q(t,'outdent'));t.ui.addButton('Indent',{label:t.lang.indent,command:'indent'});t.ui.addButton('Outdent',{label:t.lang.outdent,command:'outdent'});t.on('selectionChange',e.bind(p,u));t.on('selectionChange',e.bind(p,v));if(b.ie6Compat||b.ie7Compat)t.addCss('ul,ol{\tmargin-left: 0px;\tpadding-left: 40px;}');t.on('dirChanged',function(w){var x=new d.range(t.document);x.setStartBefore(w.data.node);x.setEndAfter(w.data.node);var y=new d.walker(x),z;while(z=y.next()){if(z.type==1){if(!z.equals(w.data.node)&&z.getDirection()){x.setStartAfter(z);y=new d.walker(x);continue;}var A=t.config.indentClasses;if(A){var B=w.data.dir=='ltr'?['_rtl','']:['','_rtl'];for(var C=0;C<A.length;C++){if(z.hasClass(A[C]+B[0])){z.removeClass(A[C]+B[0]);z.addClass(A[C]+B[1]);}}}var D=z.getStyle('margin-right'),E=z.getStyle('margin-left');D?z.setStyle('margin-left',D):z.removeStyle('margin-left');E?z.setStyle('margin-right',E):z.removeStyle('margin-right');}}});},requires:['domiterator','list']});})();(function(){function m(r,s){var t=s.block||s.blockLimit;if(!t||t.getName()=='body')return 2;return n(t,r.config.useComputedState)==this.value?1:2;};function n(r,s){s=s===undefined||s;var t;if(s)t=r.getComputedStyle('text-align');else{while(!r.hasAttribute||!(r.hasAttribute('align')||r.getStyle('text-align'))){var u=r.getParent();if(!u)break;r=u;}t=r.getStyle('text-align')||r.getAttribute('align')||'';}t&&(t=t.replace(/-moz-|-webkit-|start|auto/i,''));!t&&s&&(t=r.getComputedStyle('direction')=='rtl'?'right':'left');return t;};function o(r){if(r.editor.readOnly)return;var s=r.editor.getCommand(this.name);s.state=m.call(this,r.editor,r.data.path);s.fire('state');};function p(r,s,t){var v=this;v.name=s;v.value=t;var u=r.config.justifyClasses;if(u){switch(t){case 'left':v.cssClassName=u[0];break;case 'center':v.cssClassName=u[1];break;case 'right':v.cssClassName=u[2];break;case 'justify':v.cssClassName=u[3];break;}v.cssClassRegex=new RegExp('(?:^|\\s+)(?:'+u.join('|')+')(?=$|\\s)');
-}};function q(r){var s=r.editor,t=new d.range(s.document);t.setStartBefore(r.data.node);t.setEndAfter(r.data.node);var u=new d.walker(t),v;while(v=u.next()){if(v.type==1){if(!v.equals(r.data.node)&&v.getDirection()){t.setStartAfter(v);u=new d.walker(t);continue;}var w=s.config.justifyClasses;if(w)if(v.hasClass(w[0])){v.removeClass(w[0]);v.addClass(w[2]);}else if(v.hasClass(w[2])){v.removeClass(w[2]);v.addClass(w[0]);}var x='text-align',y=v.getStyle(x);if(y=='left')v.setStyle(x,'right');else if(y=='right')v.setStyle(x,'left');}}};p.prototype={exec:function(r){var D=this;var s=r.getSelection(),t=r.config.enterMode;if(!s)return;var u=s.createBookmarks(),v=s.getRanges(true),w=D.cssClassName,x,y,z=r.config.useComputedState;z=z===undefined||z;for(var A=v.length-1;A>=0;A--){x=v[A].createIterator();x.enlargeBr=t!=2;while(y=x.getNextParagraph(t==1?'p':'div')){y.removeAttribute('align');y.removeStyle('text-align');var B=w&&(y.$.className=e.ltrim(y.$.className.replace(D.cssClassRegex,''))),C=D.state==2&&(!z||n(y,true)!=D.value);if(w){if(C)y.addClass(w);else if(!B)y.removeAttribute('class');}else if(C)y.setStyle('text-align',D.value);}}r.focus();r.forceNextSelectionCheck();s.selectBookmarks(u);}};j.add('justify',{init:function(r){var s=new p(r,'justifyleft','left'),t=new p(r,'justifycenter','center'),u=new p(r,'justifyright','right'),v=new p(r,'justifyblock','justify');r.addCommand('justifyleft',s);r.addCommand('justifycenter',t);r.addCommand('justifyright',u);r.addCommand('justifyblock',v);r.ui.addButton('JustifyLeft',{label:r.lang.justify.left,command:'justifyleft'});r.ui.addButton('JustifyCenter',{label:r.lang.justify.center,command:'justifycenter'});r.ui.addButton('JustifyRight',{label:r.lang.justify.right,command:'justifyright'});r.ui.addButton('JustifyBlock',{label:r.lang.justify.block,command:'justifyblock'});r.on('selectionChange',e.bind(o,s));r.on('selectionChange',e.bind(o,u));r.on('selectionChange',e.bind(o,t));r.on('selectionChange',e.bind(o,v));r.on('dirChanged',q);},requires:['domiterator']});})();j.add('keystrokes',{beforeInit:function(m){m.keystrokeHandler=new a.keystrokeHandler(m);m.specialKeys={};},init:function(m){var n=m.config.keystrokes,o=m.config.blockedKeystrokes,p=m.keystrokeHandler.keystrokes,q=m.keystrokeHandler.blockedKeystrokes;for(var r=0;r<n.length;r++)p[n[r][0]]=n[r][1];for(r=0;r<o.length;r++)q[o[r]]=1;}});a.keystrokeHandler=function(m){var n=this;if(m.keystrokeHandler)return m.keystrokeHandler;n.keystrokes={};n.blockedKeystrokes={};n._={editor:m};
-return n;};(function(){var m,n=function(p){p=p.data;var q=p.getKeystroke(),r=this.keystrokes[q],s=this._.editor;m=s.fire('key',{keyCode:q})===true;if(!m){if(r){var t={from:'keystrokeHandler'};m=s.execCommand(r,t)!==false;}if(!m){var u=s.specialKeys[q];m=u&&u(s)===true;if(!m)m=!!this.blockedKeystrokes[q];}}if(m)p.preventDefault(true);return!m;},o=function(p){if(m){m=false;p.data.preventDefault(true);}};a.keystrokeHandler.prototype={attach:function(p){p.on('keydown',n,this);if(b.opera||b.gecko&&b.mac)p.on('keypress',o,this);}};})();i.blockedKeystrokes=[1114112+66,1114112+73,1114112+85];i.keystrokes=[[4456448+121,'toolbarFocus'],[4456448+122,'elementsPathFocus'],[2228224+121,'contextMenu'],[1114112+2228224+121,'contextMenu'],[1114112+90,'undo'],[1114112+89,'redo'],[1114112+2228224+90,'redo'],[1114112+76,'link'],[1114112+66,'bold'],[1114112+73,'italic'],[1114112+85,'underline'],[4456448+(c||b.webkit?189:109),'toolbarCollapse'],[4456448+48,'a11yHelp']];j.add('link',{init:function(m){m.addCommand('link',new a.dialogCommand('link'));m.addCommand('anchor',new a.dialogCommand('anchor'));m.addCommand('unlink',new a.unlinkCommand());m.addCommand('removeAnchor',new a.removeAnchorCommand());m.ui.addButton('Link',{label:m.lang.link.toolbar,command:'link'});m.ui.addButton('Unlink',{label:m.lang.unlink,command:'unlink'});m.ui.addButton('Anchor',{label:m.lang.anchor.toolbar,command:'anchor'});a.dialog.add('link',this.path+'dialogs/link.js');a.dialog.add('anchor',this.path+'dialogs/anchor.js');var n=m.lang.dir=='rtl'?'right':'left',o='background:url('+a.getUrl(this.path+'images/anchor.gif')+') no-repeat '+n+' center;'+'border:1px dotted #00f;';m.addCss('a.cke_anchor,a.cke_anchor_empty'+(c&&b.version<7?'':',a[name],a[data-cke-saved-name]')+'{'+o+'padding-'+n+':18px;'+'cursor:auto;'+'}'+(c?'a.cke_anchor_empty{display:inline-block;}':'')+'img.cke_anchor'+'{'+o+'width:16px;'+'min-height:15px;'+'height:1.15em;'+'vertical-align:'+(b.opera?'middle':'text-bottom')+';'+'}');m.on('selectionChange',function(p){if(m.readOnly)return;var q=m.getCommand('unlink'),r=p.data.path.lastElement&&p.data.path.lastElement.getAscendant('a',true);if(r&&r.getName()=='a'&&r.getAttribute('href')&&r.getChildCount())q.setState(2);else q.setState(0);});m.on('doubleclick',function(p){var q=j.link.getSelectedLink(m)||p.data.element;if(!q.isReadOnly())if(q.is('a')){p.data.dialog=q.getAttribute('name')&&(!q.getAttribute('href')||!q.getChildCount())?'anchor':'link';m.getSelection().selectElement(q);}else if(j.link.tryRestoreFakeAnchor(m,q))p.data.dialog='anchor';
-});if(m.addMenuItems)m.addMenuItems({anchor:{label:m.lang.anchor.menu,command:'anchor',group:'anchor',order:1},removeAnchor:{label:m.lang.anchor.remove,command:'removeAnchor',group:'anchor',order:5},link:{label:m.lang.link.menu,command:'link',group:'link',order:1},unlink:{label:m.lang.unlink,command:'unlink',group:'link',order:5}});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(!p||p.isReadOnly())return null;var r=j.link.tryRestoreFakeAnchor(m,p);if(!r&&!(r=j.link.getSelectedLink(m)))return null;var s={};if(r.getAttribute('href')&&r.getChildCount())s={link:2,unlink:2};if(r&&r.hasAttribute('name'))s.anchor=s.removeAnchor=2;return s;});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.dataFilter,p=n&&n.htmlFilter,q=m._.elementsPath&&m._.elementsPath.filters;if(o)o.addRules({elements:{a:function(r){var s=r.attributes;if(!s.name)return null;var t=!r.children.length;if(j.link.synAnchorSelector){var u=t?'cke_anchor_empty':'cke_anchor',v=s['class'];if(s.name&&(!v||v.indexOf(u)<0))s['class']=(v||'')+' '+u;if(t&&j.link.emptyAnchorFix){s.contenteditable='false';s['data-cke-editable']=1;}}else if(j.link.fakeAnchor&&t)return m.createFakeParserElement(r,'cke_anchor','anchor');return null;}}});if(j.link.emptyAnchorFix&&p)p.addRules({elements:{a:function(r){delete r.attributes.contenteditable;}}});if(q)q.push(function(r,s){if(s=='a')if(j.link.tryRestoreFakeAnchor(m,r)||r.getAttribute('name')&&(!r.getAttribute('href')||!r.getChildCount()))return 'anchor';});},requires:['fakeobjects']});j.link={getSelectedLink:function(m){try{var n=m.getSelection();if(n.getType()==3){var o=n.getSelectedElement();if(o.is('a'))return o;}var p=n.getRanges(true)[0];p.shrink(2);var q=p.getCommonAncestor();return q.getAscendant('a',true);}catch(r){return null;}},fakeAnchor:b.opera||b.webkit,synAnchorSelector:c,emptyAnchorFix:c&&b.version<8,tryRestoreFakeAnchor:function(m,n){if(n&&n.data('cke-real-element-type')&&n.data('cke-real-element-type')=='anchor'){var o=m.restoreRealElement(n);if(o.data('cke-saved-name'))return o;}}};a.unlinkCommand=function(){};a.unlinkCommand.prototype={exec:function(m){var n=m.getSelection(),o=n.createBookmarks(),p=n.getRanges(),q,r;for(var s=0;s<p.length;s++){q=p[s].getCommonAncestor(true);r=q.getAscendant('a',true);if(!r)continue;p[s].selectNodeContents(r);}n.selectRanges(p);m.document.$.execCommand('unlink',false,null);n.selectBookmarks(o);},startDisabled:true};a.removeAnchorCommand=function(){};a.removeAnchorCommand.prototype={exec:function(m){var n=m.getSelection(),o=n.createBookmarks(),p;
-if(n&&(p=n.getSelectedElement())&&(j.link.fakeAnchor&&!p.getChildCount()?j.link.tryRestoreFakeAnchor(m,p):p.is('a')))p.remove(1);else if(p=j.link.getSelectedLink(m))if(p.hasAttribute('href')){p.removeAttributes({name:1,'data-cke-saved-name':1});p.removeClass('cke_anchor');}else p.remove(1);n.selectBookmarks(o);}};e.extend(i,{linkShowAdvancedTab:true,linkShowTargetTab:true});(function(){var m={ol:1,ul:1},n=/^[\n\r\t ]*$/,o=d.walker.whitespaces(),p=d.walker.bookmark(),q=function(E){return!(o(E)||p(E));};j.list={listToArray:function(E,F,G,H,I){if(!m[E.getName()])return[];if(!H)H=0;if(!G)G=[];for(var J=0,K=E.getChildCount();J<K;J++){var L=E.getChild(J);if(L.type==1&&L.getName() in f.$list)j.list.listToArray(L,F,G,H+1);if(L.$.nodeName.toLowerCase()!='li')continue;var M={parent:E,indent:H,element:L,contents:[]};if(!I){M.grandparent=E.getParent();if(M.grandparent&&M.grandparent.$.nodeName.toLowerCase()=='li')M.grandparent=M.grandparent.getParent();}else M.grandparent=I;if(F)h.setMarker(F,L,'listarray_index',G.length);G.push(M);for(var N=0,O=L.getChildCount(),P;N<O;N++){P=L.getChild(N);if(P.type==1&&m[P.getName()])j.list.listToArray(P,F,G,H+1,M.grandparent);else M.contents.push(P);}}return G;},arrayToList:function(E,F,G,H,I){if(!G)G=0;if(!E||E.length<G+1)return null;var J=E[G].parent.getDocument(),K=new d.documentFragment(J),L=null,M=G,N=Math.max(E[G].indent,0),O=null,P,Q=H==1?'p':'div';while(1){var R=E[M];P=R.element.getDirection(1);if(R.indent==N){if(!L||E[M].parent.getName()!=L.getName()){L=E[M].parent.clone(false,1);I&&L.setAttribute('dir',I);K.append(L);}O=L.append(R.element.clone(0,1));if(P!=L.getDirection(1))O.setAttribute('dir',P);else O.removeAttribute('dir');for(var S=0;S<R.contents.length;S++)O.append(R.contents[S].clone(1,1));M++;}else if(R.indent==Math.max(N,0)+1){var T=E[M-1].element.getDirection(1),U=j.list.arrayToList(E,null,M,H,T!=P?P:null);if(!O.getChildCount()&&c&&!(J.$.documentMode>7))O.append(J.createText('\xa0'));O.append(U.listNode);M=U.nextIndex;}else if(R.indent==-1&&!G&&R.grandparent){if(m[R.grandparent.getName()])O=R.element.clone(false,true);else if(I||R.element.hasAttributes()||H!=2){O=J.createElement(Q);R.element.copyAttributes(O,{type:1,value:1});if(!I&&H==2&&!O.hasAttributes())O=new d.documentFragment(J);}else O=new d.documentFragment(J);if(O.type==1)if(R.grandparent.getDirection(1)!=P)O.setAttribute('dir',P);else O.removeAttribute('dir');for(S=0;S<R.contents.length;S++)O.append(R.contents[S].clone(1,1));if(O.type==11&&M!=E.length-1){var V=O.getLast();
-if(V&&V.type==1&&V.getAttribute('type')=='_moz')V.remove();if(!(V=O.getLast(q)&&V.type==1&&V.getName() in f.$block))O.append(J.createElement('br'));}if(O.type==1&&O.getName()==Q&&O.$.firstChild){O.trim();var W=O.getFirst();if(W.type==1&&W.isBlockBoundary()){var X=new d.documentFragment(J);O.moveChildren(X);O=X;}}var Y=O.$.nodeName.toLowerCase();if(!c&&(Y=='div'||Y=='p'))O.appendBogus();K.append(O);L=null;M++;}else return null;if(E.length<=M||Math.max(E[M].indent,0)<N)break;}if(F){var Z=K.getFirst();while(Z){if(Z.type==1)h.clearMarkers(F,Z);Z=Z.getNextSourceNode();}}return{listNode:K,nextIndex:M};}};function r(E){if(E.editor.readOnly)return null;var F=E.data.path,G=F.blockLimit,H=F.elements,I,J;for(J=0;J<H.length&&(I=H[J])&&!I.equals(G);J++){if(m[H[J].getName()])return this.setState(this.type==H[J].getName()?1:2);}return this.setState(2);};function s(E,F,G,H){var I=j.list.listToArray(F.root,G),J=[];for(var K=0;K<F.contents.length;K++){var L=F.contents[K];L=L.getAscendant('li',true);if(!L||L.getCustomData('list_item_processed'))continue;J.push(L);h.setMarker(G,L,'list_item_processed',true);}var M=F.root,N=M.getDocument().createElement(this.type);M.copyAttributes(N,{start:1,type:1});N.removeStyle('list-style-type');for(K=0;K<J.length;K++){var O=J[K].getCustomData('listarray_index');I[O].parent=N;}var P=j.list.arrayToList(I,G,null,E.config.enterMode),Q,R=P.listNode.getChildCount();for(K=0;K<R&&(Q=P.listNode.getChild(K));K++){if(Q.getName()==this.type)H.push(Q);}P.listNode.replace(F.root);};var t=/^h[1-6]$/;function u(E,F,G){var H=F.contents,I=F.root.getDocument(),J=[];if(H.length==1&&H[0].equals(F.root)){var K=I.createElement('div');H[0].moveChildren&&H[0].moveChildren(K);H[0].append(K);H[0]=K;}var L=F.contents[0].getParent();for(var M=0;M<H.length;M++)L=L.getCommonAncestor(H[M].getParent());var N=E.config.useComputedState,O,P;N=N===undefined||N;for(M=0;M<H.length;M++){var Q=H[M],R;while(R=Q.getParent()){if(R.equals(L)){J.push(Q);if(!P&&Q.getDirection())P=1;var S=Q.getDirection(N);if(O!==null)if(O&&O!=S)O=null;else O=S;break;}Q=R;}}if(J.length<1)return;var T=J[J.length-1].getNext(),U=I.createElement(this.type);G.push(U);var V,W;while(J.length){V=J.shift();W=I.createElement('li');if(V.is('pre')||t.test(V.getName()))V.appendTo(W);else{V.copyAttributes(W);if(O&&V.getDirection()){W.removeStyle('direction');W.removeAttribute('dir');}V.moveChildren(W);V.remove();}W.appendTo(U);}if(O&&P)U.setAttribute('dir',O);if(T)U.insertBefore(T);else U.appendTo(L);};function v(E,F,G){var H=j.list.listToArray(F.root,G),I=[];
-for(var J=0;J<F.contents.length;J++){var K=F.contents[J];K=K.getAscendant('li',true);if(!K||K.getCustomData('list_item_processed'))continue;I.push(K);h.setMarker(G,K,'list_item_processed',true);}var L=null;for(J=0;J<I.length;J++){var M=I[J].getCustomData('listarray_index');H[M].indent=-1;L=M;}for(J=L+1;J<H.length;J++){if(H[J].indent>H[J-1].indent+1){var N=H[J-1].indent+1-H[J].indent,O=H[J].indent;while(H[J]&&H[J].indent>=O){H[J].indent+=N;J++;}J--;}}var P=j.list.arrayToList(H,G,null,E.config.enterMode,F.root.getAttribute('dir')),Q=P.listNode,R,S;function T(U){if((R=Q[U?'getFirst':'getLast']())&&!(R.is&&R.isBlockBoundary())&&(S=F.root[U?'getPrevious':'getNext'](d.walker.whitespaces(true)))&&!(S.is&&S.isBlockBoundary({br:1})))E.document.createElement('br')[U?'insertBefore':'insertAfter'](R);};T(true);T();Q.replace(F.root);};function w(E,F){this.name=E;this.type=F;};w.prototype={exec:function(E){var F=E.document,G=E.config,H=E.getSelection(),I=H&&H.getRanges(true);if(!I||I.length<1)return;if(this.state==2){var J=F.getBody();if(!J.getFirst(q)){G.enterMode==2?J.appendBogus():I[0].fixBlock(1,G.enterMode==1?'p':'div');H.selectRanges(I);}else{var K=I.length==1&&I[0],L=K&&K.getEnclosedNode();if(L&&L.is&&this.type==L.getName())this.setState(1);}}var M=H.createBookmarks(true),N=[],O={},P=I.createIterator(),Q=0;while((K=P.getNextRange())&&++Q){var R=K.getBoundaryNodes(),S=R.startNode,T=R.endNode;if(S.type==1&&S.getName()=='td')K.setStartAt(R.startNode,1);if(T.type==1&&T.getName()=='td')K.setEndAt(R.endNode,2);var U=K.createIterator(),V;U.forceBrBreak=this.state==2;while(V=U.getNextParagraph()){if(V.getCustomData('list_block'))continue;else h.setMarker(O,V,'list_block',1);var W=new d.elementPath(V),X=W.elements,Y=X.length,Z=null,aa=0,ab=W.blockLimit,ac;for(var ad=Y-1;ad>=0&&(ac=X[ad]);ad--){if(m[ac.getName()]&&ab.contains(ac)){ab.removeCustomData('list_group_object_'+Q);var ae=ac.getCustomData('list_group_object');if(ae)ae.contents.push(V);else{ae={root:ac,contents:[V]};N.push(ae);h.setMarker(O,ac,'list_group_object',ae);}aa=1;break;}}if(aa)continue;var af=ab;if(af.getCustomData('list_group_object_'+Q))af.getCustomData('list_group_object_'+Q).contents.push(V);else{ae={root:af,contents:[V]};h.setMarker(O,af,'list_group_object_'+Q,ae);N.push(ae);}}}var ag=[];while(N.length>0){ae=N.shift();if(this.state==2){if(m[ae.root.getName()])s.call(this,E,ae,O,ag);else u.call(this,E,ae,ag);}else if(this.state==1&&m[ae.root.getName()])v.call(this,E,ae,O);}for(ad=0;ad<ag.length;ad++){Z=ag[ad];
-var ah,ai=this;(ah=function(aj){var ak=Z[aj?'getPrevious':'getNext'](d.walker.whitespaces(true));if(ak&&ak.getName&&ak.getName()==ai.type){ak.remove();ak.moveChildren(Z,aj);}})();ah(1);}h.clearAllMarkers(O);H.selectBookmarks(M);E.focus();}};var x=f,y=/[\t\r\n ]*(?: |\xa0)$/;function z(E,F){var G,H=E.children,I=H.length;for(var J=0;J<I;J++){G=H[J];if(G.name&&G.name in F)return J;}return I;};function A(E){return function(F){var G=F.children,H=z(F,x.$list),I=G[H],J=I&&I.previous,K;if(J&&(J.name&&J.name=='br'||J.value&&(K=J.value.match(y)))){var L=J;if(!(K&&K.index)&&L==G[0])G[0]=E||c?new a.htmlParser.text('\xa0'):new a.htmlParser.element('br',{});else if(L.name=='br')G.splice(H-1,1);else L.value=L.value.replace(y,'');}};};var B={elements:{}};for(var C in x.$listItem)B.elements[C]=A();var D={elements:{}};for(C in x.$listItem)D.elements[C]=A(true);j.add('list',{init:function(E){var F=E.addCommand('numberedlist',new w('numberedlist','ol')),G=E.addCommand('bulletedlist',new w('bulletedlist','ul'));E.ui.addButton('NumberedList',{label:E.lang.numberedlist,command:'numberedlist'});E.ui.addButton('BulletedList',{label:E.lang.bulletedlist,command:'bulletedlist'});E.on('selectionChange',e.bind(r,F));E.on('selectionChange',e.bind(r,G));},afterInit:function(E){var F=E.dataProcessor;if(F){F.dataFilter.addRules(B);F.htmlFilter.addRules(D);}},requires:['domiterator']});})();(function(){j.liststyle={requires:['dialog'],init:function(m){m.addCommand('numberedListStyle',new a.dialogCommand('numberedListStyle'));a.dialog.add('numberedListStyle',this.path+'dialogs/liststyle.js');m.addCommand('bulletedListStyle',new a.dialogCommand('bulletedListStyle'));a.dialog.add('bulletedListStyle',this.path+'dialogs/liststyle.js');if(m.addMenuItems){m.addMenuGroup('list',108);m.addMenuItems({numberedlist:{label:m.lang.list.numberedTitle,group:'list',command:'numberedListStyle'},bulletedlist:{label:m.lang.list.bulletedTitle,group:'list',command:'bulletedListStyle'}});}if(m.contextMenu)m.contextMenu.addListener(function(n,o){if(!n||n.isReadOnly())return null;while(n){var p=n.getName();if(p=='ol')return{numberedlist:2};else if(p=='ul')return{bulletedlist:2};n=n.getParent();}return null;});}};j.add('liststyle',j.liststyle);})();(function(){function m(s){if(!s||s.type!=1||s.getName()!='form')return[];var t=[],u=['style','className'];for(var v=0;v<u.length;v++){var w=u[v],x=s.$.elements.namedItem(w);if(x){var y=new h(x);t.push([y,y.nextSibling]);y.remove();}}return t;};function n(s,t){if(!s||s.type!=1||s.getName()!='form')return;
-if(t.length>0)for(var u=t.length-1;u>=0;u--){var v=t[u][0],w=t[u][1];if(w)v.insertBefore(w);else v.appendTo(s);}};function o(s,t){var u=m(s),v={},w=s.$;if(!t){v['class']=w.className||'';w.className='';}v.inline=w.style.cssText||'';if(!t)w.style.cssText='position: static; overflow: visible';n(u);return v;};function p(s,t){var u=m(s),v=s.$;if('class' in t)v.className=t['class'];if('inline' in t)v.style.cssText=t.inline;n(u);};function q(s){var t=a.instances;for(var u in t){var v=t[u];if(v.mode=='wysiwyg'&&!v.readOnly){var w=v.document.getBody();w.setAttribute('contentEditable',false);w.setAttribute('contentEditable',true);}}if(s.focusManager.hasFocus){s.toolbox.focus();s.focus();}};function r(s){if(!c||b.version>6)return null;var t=h.createFromHtml('<iframe frameborder="0" tabindex="-1" src="javascript:void((function(){document.open();'+(b.isCustomDomain()?"document.domain='"+this.getDocument().$.domain+"';":'')+'document.close();'+'})())"'+' style="display:block;position:absolute;z-index:-1;'+'progid:DXImageTransform.Microsoft.Alpha(opacity=0);'+'"></iframe>');return s.append(t,true);};j.add('maximize',{init:function(s){var t=s.lang,u=a.document,v=u.getWindow(),w,x,y,z;function A(){var C=v.getViewPaneSize();z&&z.setStyles({width:C.width+'px',height:C.height+'px'});s.resize(C.width,C.height,null,true);};var B=2;s.addCommand('maximize',{modes:{wysiwyg:1,source:1},readOnly:1,editorFocus:false,exec:function(){var C=s.container.getChild(1),D=s.getThemeSpace('contents');if(s.mode=='wysiwyg'){var E=s.getSelection();w=E&&E.getRanges();x=v.getScrollPosition();}else{var F=s.textarea.$;w=!c&&[F.selectionStart,F.selectionEnd];x=[F.scrollLeft,F.scrollTop];}if(this.state==2){v.on('resize',A);y=v.getScrollPosition();var G=s.container;while(G=G.getParent()){G.setCustomData('maximize_saved_styles',o(G));G.setStyle('z-index',s.config.baseFloatZIndex-1);}D.setCustomData('maximize_saved_styles',o(D,true));C.setCustomData('maximize_saved_styles',o(C,true));var H={overflow:b.webkit?'':'hidden',width:0,height:0};u.getDocumentElement().setStyles(H);!b.gecko&&u.getDocumentElement().setStyle('position','fixed');!(b.gecko&&b.quirks)&&u.getBody().setStyles(H);c?setTimeout(function(){v.$.scrollTo(0,0);},0):v.$.scrollTo(0,0);C.setStyle('position',b.gecko&&b.quirks?'fixed':'absolute');C.$.offsetLeft;C.setStyles({'z-index':s.config.baseFloatZIndex-1,left:'0px',top:'0px'});z=r(C);C.addClass('cke_maximized');A();var I=C.getDocumentPosition();C.setStyles({left:-1*I.x+'px',top:-1*I.y+'px'});b.gecko&&q(s);
-}else if(this.state==1){v.removeListener('resize',A);var J=[D,C];for(var K=0;K<J.length;K++){p(J[K],J[K].getCustomData('maximize_saved_styles'));J[K].removeCustomData('maximize_saved_styles');}G=s.container;while(G=G.getParent()){p(G,G.getCustomData('maximize_saved_styles'));G.removeCustomData('maximize_saved_styles');}c?setTimeout(function(){v.$.scrollTo(y.x,y.y);},0):v.$.scrollTo(y.x,y.y);C.removeClass('cke_maximized');if(b.webkit){C.setStyle('display','inline');setTimeout(function(){C.setStyle('display','block');},0);}if(z){z.remove();z=null;}s.fire('resize');}this.toggleState();var L=this.uiItems[0];if(L){var M=this.state==2?t.maximize:t.minimize,N=s.element.getDocument().getById(L._.id);N.getChild(1).setHtml(M);N.setAttribute('title',M);N.setAttribute('href','javascript:void("'+M+'");');}if(s.mode=='wysiwyg'){if(w){b.gecko&&q(s);s.getSelection().selectRanges(w);var O=s.getSelection().getStartElement();O&&O.scrollIntoView(true);}else v.$.scrollTo(x.x,x.y);}else{if(w){F.selectionStart=w[0];F.selectionEnd=w[1];}F.scrollLeft=x[0];F.scrollTop=x[1];}w=x=null;B=this.state;},canUndo:false});s.ui.addButton('Maximize',{label:t.maximize,command:'maximize'});s.on('mode',function(){var C=s.getCommand('maximize');C.setState(C.state==0?0:B);},null,null,100);}});})();j.add('newpage',{init:function(m){m.addCommand('newpage',{modes:{wysiwyg:1,source:1},exec:function(n){var o=this;n.setData(n.config.newpage_html||'',function(){setTimeout(function(){n.fire('afterCommandExec',{name:o.name,command:o});n.selectionChange();},200);});n.focus();},async:true});m.ui.addButton('NewPage',{label:m.lang.newPage,command:'newpage'});}});j.add('pagebreak',{init:function(m){m.addCommand('pagebreak',j.pagebreakCmd);m.ui.addButton('PageBreak',{label:m.lang.pagebreak,command:'pagebreak'});var n=['{','background: url('+a.getUrl(this.path+'images/pagebreak.gif')+') no-repeat center center;','clear: both;','width:100%; _width:99.9%;','border-top: #999999 1px dotted;','border-bottom: #999999 1px dotted;','padding:0;','height: 5px;','cursor: default;','}'].join('').replace(/;/g,' !important;');m.addCss('div.cke_pagebreak'+n);b.opera&&m.on('contentDom',function(){m.document.on('click',function(o){var p=o.data.getTarget();if(p.is('div')&&p.hasClass('cke_pagebreak'))m.getSelection().selectElement(p);});});},afterInit:function(m){var n=m.lang.pagebreakAlt,o=m.dataProcessor,p=o&&o.dataFilter,q=o&&o.htmlFilter;if(q)q.addRules({attributes:{'class':function(r,s){var t=r.replace('cke_pagebreak','');if(t!=r){var u=a.htmlParser.fragment.fromHtml('<span style="display: none;"> </span>');
-s.children.length=0;s.add(u);var v=s.attributes;delete v['aria-label'];delete v.contenteditable;delete v.title;}return t;}}},5);if(p)p.addRules({elements:{div:function(r){var s=r.attributes,t=s&&s.style,u=t&&r.children.length==1&&r.children[0],v=u&&u.name=='span'&&u.attributes.style;if(v&&/page-break-after\s*:\s*always/i.test(t)&&/display\s*:\s*none/i.test(v)){s.contenteditable='false';s['class']='cke_pagebreak';s['data-cke-display-name']='pagebreak';s['aria-label']=n;s.title=n;r.children.length=0;}}}});},requires:['fakeobjects']});j.pagebreakCmd={exec:function(m){var n=m.lang.pagebreakAlt,o=h.createFromHtml('<div style="page-break-after: always;"contenteditable="false" title="'+n+'" '+'aria-label="'+n+'" '+'data-cke-display-name="pagebreak" '+'class="cke_pagebreak">'+'</div>',m.document),p=m.getSelection().getRanges(true);m.fire('saveSnapshot');for(var q,r=p.length-1;r>=0;r--){q=p[r];if(r<p.length-1)o=o.clone(true);q.splitBlock('p');q.insertNode(o);if(r==p.length-1){var s=o.getNext();q.moveToPosition(o,4);if(!s||s.type==1&&!s.isEditable())q.fixBlock(true,m.config.enterMode==3?'div':'p');q.select();}}m.fire('saveSnapshot');}};(function(){function m(n){n.data.mode='html';};j.add('pastefromword',{init:function(n){var o=0,p=function(q){q&&q.removeListener();n.removeListener('beforePaste',m);o&&setTimeout(function(){o=0;},0);};n.addCommand('pastefromword',{canUndo:false,exec:function(){o=1;n.on('beforePaste',m);if(n.execCommand('paste','html')===false){n.on('dialogShow',function(q){q.removeListener();q.data.on('cancel',p);});n.on('dialogHide',function(q){q.data.removeListener('cancel',p);});}n.on('afterPaste',p);}});n.ui.addButton('PasteFromWord',{label:n.lang.pastefromword.toolbar,command:'pastefromword'});n.on('pasteState',function(q){n.getCommand('pastefromword').setState(q.data);});n.on('paste',function(q){var r=q.data,s;if((s=r.html)&&(o||/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(s))){var t=this.loadFilterRules(function(){if(t)n.fire('paste',r);else if(!n.config.pasteFromWordPromptCleanup||o||confirm(n.lang.pastefromword.confirmCleanup))r.html=a.cleanWord(s,n);});t&&q.cancel();}},this);},loadFilterRules:function(n){var o=a.cleanWord;if(o)n();else{var p=a.getUrl(i.pasteFromWordCleanupFile||this.path+'filter/default.js');a.scriptLoader.load(p,n,null,true);}return!o;},requires:['clipboard']});})();(function(){var m={exec:function(n){var o=e.tryThese(function(){var p=window.clipboardData.getData('Text');if(!p)throw 0;return p;});if(!o){n.openDialog('pastetext');
-return false;}else n.fire('paste',{text:o});return true;}};j.add('pastetext',{init:function(n){var o='pastetext',p=n.addCommand(o,m);n.ui.addButton('PasteText',{label:n.lang.pasteText.button,command:o});a.dialog.add(o,a.getUrl(this.path+'dialogs/pastetext.js'));if(n.config.forcePasteAsPlainText){n.on('beforeCommandExec',function(q){var r=q.data.commandData;if(q.data.name=='paste'&&r!='html'){n.execCommand('pastetext');q.cancel();}},null,null,0);n.on('beforePaste',function(q){q.data.mode='text';});}n.on('pasteState',function(q){n.getCommand('pastetext').setState(q.data);});},requires:['clipboard']});})();j.add('popup');e.extend(a.editor.prototype,{popup:function(m,n,o,p){n=n||'80%';o=o||'70%';if(typeof n=='string'&&n.length>1&&n.substr(n.length-1,1)=='%')n=parseInt(window.screen.width*parseInt(n,10)/100,10);if(typeof o=='string'&&o.length>1&&o.substr(o.length-1,1)=='%')o=parseInt(window.screen.height*parseInt(o,10)/100,10);if(n<640)n=640;if(o<420)o=420;var q=parseInt((window.screen.height-o)/2,10),r=parseInt((window.screen.width-n)/2,10);p=(p||'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes')+',width='+n+',height='+o+',top='+q+',left='+r;var s=window.open('',null,p,true);if(!s)return false;try{s.moveTo(r,q);s.resizeTo(n,o);s.focus();s.location.href=m;}catch(t){s=window.open(m,null,p,true);}return true;}});(function(){var m={modes:{wysiwyg:1,source:1},canUndo:false,readOnly:1,exec:function(o){var p,q=o.config,r=q.baseHref?'<base href="'+q.baseHref+'"/>':'',s=b.isCustomDomain();if(q.fullPage)p=o.getData().replace(/<head>/,'$&'+r).replace(/[^>]*(?=<\/title>)/,'$& — '+o.lang.preview);else{var t='<body ',u=o.document&&o.document.getBody();if(u){if(u.getAttribute('id'))t+='id="'+u.getAttribute('id')+'" ';if(u.getAttribute('class'))t+='class="'+u.getAttribute('class')+'" ';}t+='>';p=o.config.docType+'<html dir="'+o.config.contentsLangDirection+'">'+'<head>'+r+'<title>'+o.lang.preview+'</title>'+e.buildStyleHtml(o.config.contentsCss)+'</head>'+t+o.getData()+'</body></html>';}var v=640,w=420,x=80;try{var y=window.screen;v=Math.round(y.width*0.8);w=Math.round(y.height*0.7);x=Math.round(y.width*0.1);}catch(B){}var z='';if(s){window._cke_htmlToLoad=p;z='javascript:void( (function(){document.open();document.domain="'+document.domain+'";'+'document.write( window.opener._cke_htmlToLoad );'+'document.close();'+'window.opener._cke_htmlToLoad = null;'+'})() )';}var A=window.open(z,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+v+',height='+w+',left='+x);
-if(!s){A.document.open();A.document.write(p);A.document.close();}}},n='preview';j.add(n,{init:function(o){o.addCommand(n,m);o.ui.addButton('Preview',{label:o.lang.preview,command:n});}});})();j.add('print',{init:function(m){var n='print',o=m.addCommand(n,j.print);m.ui.addButton('Print',{label:m.lang.print,command:n});}});j.print={exec:function(m){if(b.opera)return;else if(b.gecko)m.window.$.print();else m.document.$.execCommand('Print');},canUndo:false,readOnly:1,modes:{wysiwyg:!b.opera}};j.add('removeformat',{requires:['selection'],init:function(m){m.addCommand('removeFormat',j.removeformat.commands.removeformat);m.ui.addButton('RemoveFormat',{label:m.lang.removeFormat,command:'removeFormat'});m._.removeFormat={filters:[]};}});j.removeformat={commands:{removeformat:{exec:function(m){var n=m._.removeFormatRegex||(m._.removeFormatRegex=new RegExp('^(?:'+m.config.removeFormatTags.replace(/,/g,'|')+')$','i')),o=m._.removeAttributes||(m._.removeAttributes=m.config.removeFormatAttributes.split(',')),p=j.removeformat.filter,q=m.getSelection().getRanges(1),r=q.createIterator(),s;while(s=r.getNextRange()){if(!s.collapsed)s.enlarge(1);var t=s.createBookmark(),u=t.startNode,v=t.endNode,w,x=function(z){var A=new d.elementPath(z),B=A.elements;for(var C=1,D;D=B[C];C++){if(D.equals(A.block)||D.equals(A.blockLimit))break;if(n.test(D.getName())&&p(m,D))z.breakParent(D);}};x(u);if(v){x(v);w=u.getNextSourceNode(true,1);while(w){if(w.equals(v))break;var y=w.getNextSourceNode(false,1);if(!(w.getName()=='img'&&w.data('cke-realelement'))&&p(m,w))if(n.test(w.getName()))w.remove(1);else{w.removeAttributes(o);m.fire('removeFormatCleanup',w);}w=y;}}s.moveToBookmark(t);}m.getSelection().selectRanges(q);}}},filter:function(m,n){var o=m._.removeFormat.filters;for(var p=0;p<o.length;p++){if(o[p](n)===false)return false;}return true;}};a.editor.prototype.addRemoveFormatFilter=function(m){this._.removeFormat.filters.push(m);};i.removeFormatTags='b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var';i.removeFormatAttributes='class,style,lang,width,height,align,hspace,valign';j.add('resize',{init:function(m){var n=m.config,o=m.element.getDirection(1);!n.resize_dir&&(n.resize_dir='both');n.resize_maxWidth==undefined&&(n.resize_maxWidth=3000);n.resize_maxHeight==undefined&&(n.resize_maxHeight=3000);n.resize_minWidth==undefined&&(n.resize_minWidth=750);n.resize_minHeight==undefined&&(n.resize_minHeight=250);if(n.resize_enabled!==false){var p=null,q,r,s=(n.resize_dir=='both'||n.resize_dir=='horizontal')&&n.resize_minWidth!=n.resize_maxWidth,t=(n.resize_dir=='both'||n.resize_dir=='vertical')&&n.resize_minHeight!=n.resize_maxHeight;
-function u(x){var y=x.data.$.screenX-q.x,z=x.data.$.screenY-q.y,A=r.width,B=r.height,C=A+y*(o=='rtl'?-1:1),D=B+z;if(s)A=Math.max(n.resize_minWidth,Math.min(C,n.resize_maxWidth));if(t)B=Math.max(n.resize_minHeight,Math.min(D,n.resize_maxHeight));m.resize(A,B);};function v(x){a.document.removeListener('mousemove',u);a.document.removeListener('mouseup',v);if(m.document){m.document.removeListener('mousemove',u);m.document.removeListener('mouseup',v);}};var w=e.addFunction(function(x){if(!p)p=m.getResizable();r={width:p.$.offsetWidth||0,height:p.$.offsetHeight||0};q={x:x.screenX,y:x.screenY};n.resize_minWidth>r.width&&(n.resize_minWidth=r.width);n.resize_minHeight>r.height&&(n.resize_minHeight=r.height);a.document.on('mousemove',u);a.document.on('mouseup',v);if(m.document){m.document.on('mousemove',u);m.document.on('mouseup',v);}});m.on('destroy',function(){e.removeFunction(w);});m.on('themeSpace',function(x){if(x.data.space=='bottom'){var y='';if(s&&!t)y=' cke_resizer_horizontal';if(!s&&t)y=' cke_resizer_vertical';var z='<div class="cke_resizer'+y+' cke_resizer_'+o+'"'+' title="'+e.htmlEncode(m.lang.resize)+'"'+' onmousedown="CKEDITOR.tools.callFunction('+w+', event)"'+'></div>';o=='ltr'&&y=='ltr'?x.data.html+=z:x.data.html=z+x.data.html;}},m,null,100);}}});(function(){var m={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(o){var p=o.element.$.form;if(p)try{p.submit();}catch(q){if(p.submit.click)p.submit.click();}}},n='save';j.add(n,{init:function(o){var p=o.addCommand(n,m);p.modes={wysiwyg:!!o.element.$.form};o.ui.addButton('Save',{label:o.lang.save,command:n});}});})();(function(){var m='scaytcheck',n='';function o(t,u){var v=0,w;for(w in u){if(u[w]==t){v=1;break;}}return v;};var p=function(){var t=this,u=function(){var y=t.config,z={};z.srcNodeRef=t.document.getWindow().$.frameElement;z.assocApp='CKEDITOR.'+a.version+'@'+a.revision;z.customerid=y.scayt_customerid||'1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2';z.customDictionaryIds=y.scayt_customDictionaryIds||'';z.userDictionaryName=y.scayt_userDictionaryName||'';z.sLang=y.scayt_sLang||'en_US';z.onLoad=function(){if(!(c&&b.version<8))this.addStyle(this.selectorCss(),'padding-bottom: 2px !important;');if(t.focusManager.hasFocus&&!q.isControlRestored(t))this.focus();};z.onBeforeChange=function(){if(q.getScayt(t)&&!t.checkDirty())setTimeout(function(){t.resetDirty();},0);};var A=window.scayt_custom_params;if(typeof A=='object')for(var B in A)z[B]=A[B];if(q.getControlId(t))z.id=q.getControlId(t);
-var C=new window.scayt(z);C.afterMarkupRemove.push(function(E){new h(E,C.document).mergeSiblings();});var D=q.instances[t.name];if(D){C.sLang=D.sLang;C.option(D.option());C.paused=D.paused;}q.instances[t.name]=C;try{C.setDisabled(q.isPaused(t)===false);}catch(E){}t.fire('showScaytState');};t.on('contentDom',u);t.on('contentDomUnload',function(){var y=a.document.getElementsByTag('script'),z=/^dojoIoScript(\d+)$/i,A=/^https?:\/\/svc\.spellchecker\.net\/spellcheck\/script\/ssrv\.cgi/i;for(var B=0;B<y.count();B++){var C=y.getItem(B),D=C.getId(),E=C.getAttribute('src');if(D&&E&&D.match(z)&&E.match(A))C.remove();}});t.on('beforeCommandExec',function(y){if((y.data.name=='source'||y.data.name=='newpage')&&t.mode=='wysiwyg'){var z=q.getScayt(t);if(z){q.setPaused(t,!z.disabled);q.setControlId(t,z.id);z.destroy(true);delete q.instances[t.name];}}else if(y.data.name=='source'&&t.mode=='source')q.markControlRestore(t);});t.on('afterCommandExec',function(y){if(!q.isScaytEnabled(t))return;if(t.mode=='wysiwyg'&&(y.data.name=='undo'||y.data.name=='redo'))window.setTimeout(function(){q.getScayt(t).refresh();},10);});t.on('destroy',function(y){var z=y.editor,A=q.getScayt(z);if(!A)return;delete q.instances[z.name];q.setControlId(z,A.id);A.destroy(true);});t.on('afterSetData',function(){if(q.isScaytEnabled(t))window.setTimeout(function(){var y=q.getScayt(t);y&&y.refresh();},10);});t.on('insertElement',function(){var y=q.getScayt(t);if(q.isScaytEnabled(t)){if(c)t.getSelection().unlock(true);window.setTimeout(function(){y.focus();y.refresh();},10);}},this,null,50);t.on('insertHtml',function(){var y=q.getScayt(t);if(q.isScaytEnabled(t)){if(c)t.getSelection().unlock(true);window.setTimeout(function(){y.focus();y.refresh();},10);}},this,null,50);t.on('scaytDialog',function(y){y.data.djConfig=window.djConfig;y.data.scayt_control=q.getScayt(t);y.data.tab=n;y.data.scayt=window.scayt;});var v=t.dataProcessor,w=v&&v.htmlFilter;if(w)w.addRules({elements:{span:function(y){if(y.attributes['data-scayt_word']&&y.attributes['data-scaytid']){delete y.name;return y;}}}});var x=j.undo.Image.prototype;x.equals=e.override(x.equals,function(y){return function(z){var E=this;var A=E.contents,B=z.contents,C=q.getScayt(E.editor);if(C&&q.isScaytReady(E.editor)){E.contents=C.reset(A)||'';z.contents=C.reset(B)||'';}var D=y.apply(E,arguments);E.contents=A;z.contents=B;return D;};});if(t.document)u();};j.scayt={engineLoaded:false,instances:{},controlInfo:{},setControlInfo:function(t,u){if(t&&t.name&&typeof this.controlInfo[t.name]!='object')this.controlInfo[t.name]={};
-for(var v in u)this.controlInfo[t.name][v]=u[v];},isControlRestored:function(t){if(t&&t.name&&this.controlInfo[t.name])return this.controlInfo[t.name].restored;return false;},markControlRestore:function(t){this.setControlInfo(t,{restored:true});},setControlId:function(t,u){this.setControlInfo(t,{id:u});},getControlId:function(t){if(t&&t.name&&this.controlInfo[t.name]&&this.controlInfo[t.name].id)return this.controlInfo[t.name].id;return null;},setPaused:function(t,u){this.setControlInfo(t,{paused:u});},isPaused:function(t){if(t&&t.name&&this.controlInfo[t.name])return this.controlInfo[t.name].paused;return undefined;},getScayt:function(t){return this.instances[t.name];},isScaytReady:function(t){return this.engineLoaded===true&&'undefined'!==typeof window.scayt&&this.getScayt(t);},isScaytEnabled:function(t){var u=this.getScayt(t);return u?u.disabled===false:false;},getUiTabs:function(t){var u=[],v=t.config.scayt_uiTabs||'1,1,1';v=v.split(',');v[3]='1';for(var w=0;w<4;w++)u[w]=typeof window.scayt!='undefined'&&typeof window.scayt.uiTags!='undefined'?parseInt(v[w],10)&&window.scayt.uiTags[w]:parseInt(v[w],10);return u;},loadEngine:function(t){if(b.gecko&&b.version<10900||b.opera||b.air)return t.fire('showScaytState');if(this.engineLoaded===true)return p.apply(t);else if(this.engineLoaded==-1)return a.on('scaytReady',function(){p.apply(t);});a.on('scaytReady',p,t);a.on('scaytReady',function(){this.engineLoaded=true;},this,null,0);this.engineLoaded=-1;var u=document.location.protocol;u=u.search(/https?:/)!=-1?u:'http:';var v='svc.spellchecker.net/scayt26/loader__base.js',w=t.config.scayt_srcUrl||u+'//'+v,x=q.parseUrl(w).path+'/';if(window.scayt==undefined){a._djScaytConfig={baseUrl:x,addOnLoad:[function(){a.fireOnce('scaytReady');}],isDebug:false};a.document.getHead().append(a.document.createElement('script',{attributes:{type:'text/javascript',async:'true',src:w}}));}else a.fireOnce('scaytReady');return null;},parseUrl:function(t){var u;if(t.match&&(u=t.match(/(.*)[\/\\](.*?\.\w+)$/)))return{path:u[1],file:u[2]};else return t;}};var q=j.scayt,r=function(t,u,v,w,x,y,z){t.addCommand(w,x);t.addMenuItem(w,{label:v,command:w,group:y,order:z});},s={preserveState:true,editorFocus:false,canUndo:false,exec:function(t){if(q.isScaytReady(t)){var u=q.isScaytEnabled(t);this.setState(u?2:1);var v=q.getScayt(t);v.focus();v.setDisabled(u);}else if(!t.config.scayt_autoStartup&&q.engineLoaded>=0){this.setState(0);q.loadEngine(t);}}};j.add('scayt',{requires:['menubutton'],beforeInit:function(t){var u=t.config.scayt_contextMenuItemsOrder||'suggest|moresuggest|control',v='';
-u=u.split('|');if(u&&u.length)for(var w=0;w<u.length;w++)v+='scayt_'+u[w]+(u.length!=parseInt(w,10)+1?',':'');t.config.menu_groups=v+','+t.config.menu_groups;},init:function(t){var u=t.dataProcessor&&t.dataProcessor.dataFilter,v={elements:{span:function(E){var F=E.attributes;if(F&&F['data-scaytid'])delete E.name;}}};u&&u.addRules(v);var w={},x={},y=t.addCommand(m,s);a.dialog.add(m,a.getUrl(this.path+'dialogs/options.js'));var z=q.getUiTabs(t),A='scaytButton';t.addMenuGroup(A);var B={},C=t.lang.scayt;B.scaytToggle={label:C.enable,command:m,group:A};if(z[0]==1)B.scaytOptions={label:C.options,group:A,onClick:function(){n='options';t.openDialog(m);}};if(z[1]==1)B.scaytLangs={label:C.langs,group:A,onClick:function(){n='langs';t.openDialog(m);}};if(z[2]==1)B.scaytDict={label:C.dictionariesTab,group:A,onClick:function(){n='dictionaries';t.openDialog(m);}};B.scaytAbout={label:t.lang.scayt.about,group:A,onClick:function(){n='about';t.openDialog(m);}};t.addMenuItems(B);t.ui.add('Scayt','menubutton',{label:C.title,title:b.opera?C.opera_title:C.title,className:'cke_button_scayt',modes:{wysiwyg:1},onRender:function(){y.on('state',function(){this.setState(y.state);},this);},onMenu:function(){var E=q.isScaytEnabled(t);t.getMenuItem('scaytToggle').label=C[E?'disable':'enable'];var F=q.getUiTabs(t);return{scaytToggle:2,scaytOptions:E&&F[0]?2:0,scaytLangs:E&&F[1]?2:0,scaytDict:E&&F[2]?2:0,scaytAbout:E&&F[3]?2:0};}});if(t.contextMenu&&t.addMenuItems)t.contextMenu.addListener(function(E,F){if(!q.isScaytEnabled(t)||F.getRanges()[0].checkReadOnly())return null;var G=q.getScayt(t),H=G.getScaytNode();if(!H)return null;var I=G.getWord(H);if(!I)return null;var J=G.getLang(),K={},L=window.scayt.getSuggestion(I,J);if(!L||!L.length)return null;for(var M in w){delete t._.menuItems[M];delete t._.commands[M];}for(M in x){delete t._.menuItems[M];delete t._.commands[M];}w={};x={};var N=t.config.scayt_moreSuggestions||'on',O=false,P=t.config.scayt_maxSuggestions;typeof P!='number'&&(P=5);!P&&(P=L.length);var Q=t.config.scayt_contextCommands||'all';Q=Q.split('|');for(var R=0,S=L.length;R<S;R+=1){var T='scayt_suggestion_'+L[R].replace(' ','_'),U=(function(Y,Z){return{exec:function(){G.replace(Y,Z);}};})(H,L[R]);if(R<P){r(t,'button_'+T,L[R],T,U,'scayt_suggest',R+1);K[T]=2;x[T]=2;}else if(N=='on'){r(t,'button_'+T,L[R],T,U,'scayt_moresuggest',R+1);w[T]=2;O=true;}}if(O){t.addMenuItem('scayt_moresuggest',{label:C.moreSuggestions,group:'scayt_moresuggest',order:10,getItems:function(){return w;}});x.scayt_moresuggest=2;
-}if(o('all',Q)||o('ignore',Q)){var V={exec:function(){G.ignore(H);}};r(t,'ignore',C.ignore,'scayt_ignore',V,'scayt_control',1);x.scayt_ignore=2;}if(o('all',Q)||o('ignoreall',Q)){var W={exec:function(){G.ignoreAll(H);}};r(t,'ignore_all',C.ignoreAll,'scayt_ignore_all',W,'scayt_control',2);x.scayt_ignore_all=2;}if(o('all',Q)||o('add',Q)){var X={exec:function(){window.scayt.addWordToUserDictionary(H);}};r(t,'add_word',C.addWord,'scayt_add_word',X,'scayt_control',3);x.scayt_add_word=2;}if(G.fireOnContextMenu)G.fireOnContextMenu(t);return x;});var D=function(){t.removeListener('showScaytState',D);if(!b.opera&&!b.air)y.setState(q.isScaytEnabled(t)?1:2);else y.setState(0);};t.on('showScaytState',D);if(b.opera||b.air)t.on('instanceReady',function(){D();});if(t.config.scayt_autoStartup)t.on('instanceReady',function(){q.loadEngine(t);});},afterInit:function(t){var u,v=function(w){if(w.hasAttribute('data-scaytid'))return false;};if(t._.elementsPath&&(u=t._.elementsPath.filters))u.push(v);t.addRemoveFormatFilter&&t.addRemoveFormatFilter(v);}});})();j.add('smiley',{requires:['dialog'],init:function(m){m.config.smiley_path=m.config.smiley_path||this.path+'images/';m.addCommand('smiley',new a.dialogCommand('smiley'));m.ui.addButton('Smiley',{label:m.lang.smiley.toolbar,command:'smiley'});a.dialog.add('smiley',this.path+'dialogs/smiley.js');}});i.smiley_images=['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'];i.smiley_descriptions=['smiley','sad','wink','laugh','frown','cheeky','blush','surprise','indecision','angry','angel','cool','devil','crying','enlightened','no','yes','heart','broken heart','kiss','mail'];(function(){var m='.%2 p,.%2 div,.%2 pre,.%2 address,.%2 blockquote,.%2 h1,.%2 h2,.%2 h3,.%2 h4,.%2 h5,.%2 h6{background-repeat: no-repeat;background-position: top %3;border: 1px dotted gray;padding-top: 8px;padding-%3: 8px;}.%2 p{%1p.png);}.%2 div{%1div.png);}.%2 pre{%1pre.png);}.%2 address{%1address.png);}.%2 blockquote{%1blockquote.png);}.%2 h1{%1h1.png);}.%2 h2{%1h2.png);}.%2 h3{%1h3.png);}.%2 h4{%1h4.png);}.%2 h5{%1h5.png);}.%2 h6{%1h6.png);}',n=/%1/g,o=/%2/g,p=/%3/g,q={readOnly:1,preserveState:true,editorFocus:false,exec:function(r){this.toggleState();
-this.refresh(r);},refresh:function(r){if(r.document){var s=this.state==1?'addClass':'removeClass';r.document.getBody()[s]('cke_show_blocks');}}};j.add('showblocks',{requires:['wysiwygarea'],init:function(r){var s=r.addCommand('showblocks',q);s.canUndo=false;if(r.config.startupOutlineBlocks)s.setState(1);r.addCss(m.replace(n,'background-image: url('+a.getUrl(this.path)+'images/block_').replace(o,'cke_show_blocks ').replace(p,r.lang.dir=='rtl'?'right':'left'));r.ui.addButton('ShowBlocks',{label:r.lang.showBlocks,command:'showblocks'});r.on('mode',function(){if(s.state!=0)s.refresh(r);});r.on('contentDom',function(){if(s.state!=0)s.refresh(r);});}});})();(function(){var m='cke_show_border',n,o=(b.ie6Compat?['.%1 table.%2,','.%1 table.%2 td, .%1 table.%2 th','{','border : #d3d3d3 1px dotted','}']:['.%1 table.%2,','.%1 table.%2 > tr > td, .%1 table.%2 > tr > th,','.%1 table.%2 > tbody > tr > td, .%1 table.%2 > tbody > tr > th,','.%1 table.%2 > thead > tr > td, .%1 table.%2 > thead > tr > th,','.%1 table.%2 > tfoot > tr > td, .%1 table.%2 > tfoot > tr > th','{','border : #d3d3d3 1px dotted','}']).join('');n=o.replace(/%2/g,m).replace(/%1/g,'cke_show_borders ');var p={preserveState:true,editorFocus:false,readOnly:1,exec:function(q){this.toggleState();this.refresh(q);},refresh:function(q){if(q.document){var r=this.state==1?'addClass':'removeClass';q.document.getBody()[r]('cke_show_borders');}}};j.add('showborders',{requires:['wysiwygarea'],modes:{wysiwyg:1},init:function(q){var r=q.addCommand('showborders',p);r.canUndo=false;if(q.config.startupShowBorders!==false)r.setState(1);q.addCss(n);q.on('mode',function(){if(r.state!=0)r.refresh(q);},null,null,100);q.on('contentDom',function(){if(r.state!=0)r.refresh(q);});q.on('removeFormatCleanup',function(s){var t=s.data;if(q.getCommand('showborders').state==1&&t.is('table')&&(!t.hasAttribute('border')||parseInt(t.getAttribute('border'),10)<=0))t.addClass(m);});},afterInit:function(q){var r=q.dataProcessor,s=r&&r.dataFilter,t=r&&r.htmlFilter;if(s)s.addRules({elements:{table:function(u){var v=u.attributes,w=v['class'],x=parseInt(v.border,10);if(!x||x<=0)v['class']=(w||'')+' '+m;}}});if(t)t.addRules({elements:{table:function(u){var v=u.attributes,w=v['class'];w&&(v['class']=w.replace(m,'').replace(/\s{2}/,' ').replace(/^\s+|\s+$/,''));}}});}});a.on('dialogDefinition',function(q){var r=q.data.name;if(r=='table'||r=='tableProperties'){var s=q.data.definition,t=s.getContents('info'),u=t.get('txtBorder'),v=u.commit;u.commit=e.override(v,function(y){return function(z,A){y.apply(this,arguments);
-var B=parseInt(this.getValue(),10);A[!B||B<=0?'addClass':'removeClass'](m);};});var w=s.getContents('advanced'),x=w&&w.get('advCSSClasses');if(x){x.setup=e.override(x.setup,function(y){return function(){y.apply(this,arguments);this.setValue(this.getValue().replace(/cke_show_border/,''));};});x.commit=e.override(x.commit,function(y){return function(z,A){y.apply(this,arguments);if(!parseInt(A.getAttribute('border'),10))A.addClass('cke_show_border');};});}}});})();j.add('sourcearea',{requires:['editingblock'],init:function(m){var n=j.sourcearea,o=a.document.getWindow();m.on('editingBlockReady',function(){var p,q;m.addMode('source',{load:function(r,s){if(c&&b.version<8)r.setStyle('position','relative');m.textarea=p=new h('textarea');p.setAttributes({dir:'ltr',tabIndex:b.webkit?-1:m.tabIndex,role:'textbox','aria-label':m.lang.editorTitle.replace('%1',m.name)});p.addClass('cke_source');p.addClass('cke_enable_context_menu');m.readOnly&&p.setAttribute('readOnly','readonly');var t={width:b.ie7Compat?'99%':'100%',height:'100%',resize:'none',outline:'none','text-align':'left'};if(c){q=function(){p.hide();p.setStyle('height',r.$.clientHeight+'px');p.setStyle('width',r.$.clientWidth+'px');p.show();};m.on('resize',q);o.on('resize',q);setTimeout(q,0);}r.setHtml('');r.append(p);p.setStyles(t);m.fire('ariaWidget',p);p.on('blur',function(){m.focusManager.blur();});p.on('focus',function(){m.focusManager.focus();});m.mayBeDirty=true;this.loadData(s);var u=m.keystrokeHandler;if(u)u.attach(p);setTimeout(function(){m.mode='source';m.fire('mode');},b.gecko||b.webkit?100:0);},loadData:function(r){p.setValue(r);m.fire('dataReady');},getData:function(){return p.getValue();},getSnapshotData:function(){return p.getValue();},unload:function(r){p.clearCustomData();m.textarea=p=null;if(q){m.removeListener('resize',q);o.removeListener('resize',q);}if(c&&b.version<8)r.removeStyle('position');},focus:function(){p.focus();}});});m.on('readOnly',function(){if(m.mode=='source')if(m.readOnly)m.textarea.setAttribute('readOnly','readonly');else m.textarea.removeAttribute('readOnly');});m.addCommand('source',n.commands.source);if(m.ui.addButton)m.ui.addButton('Source',{label:m.lang.source,command:'source'});m.on('mode',function(){m.getCommand('source').setState(m.mode=='source'?1:2);});}});j.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:false,readOnly:1,exec:function(m){if(m.mode=='wysiwyg')m.fire('saveSnapshot');m.getCommand('source').setState(0);m.setMode(m.mode=='source'?'wysiwyg':'source');
-},canUndo:false}}};(function(){j.add('stylescombo',{requires:['richcombo','styles'],init:function(n){var o=n.config,p=n.lang.stylesCombo,q={},r=[],s;function t(u){n.getStylesSet(function(v){if(!r.length){var w,x;for(var y=0,z=v.length;y<z;y++){var A=v[y];x=A.name;w=q[x]=new a.style(A);w._name=x;w._.enterMode=o.enterMode;r.push(w);}r.sort(m);}u&&u();});};n.ui.addRichCombo('Styles',{label:p.label,title:p.panelTitle,className:'cke_styles',panel:{css:n.skin.editor.css.concat(o.contentsCss),multiSelect:true,attributes:{'aria-label':p.panelTitle}},init:function(){s=this;t(function(){var u,v,w,x,y,z;for(y=0,z=r.length;y<z;y++){u=r[y];v=u._name;x=u.type;if(x!=w){s.startGroup(p['panelTitle'+String(x)]);w=x;}s.add(v,u.type==3?v:u.buildPreview(),v);}s.commit();});},onClick:function(u){n.focus();n.fire('saveSnapshot');var v=q[u],w=n.getSelection(),x=new d.elementPath(w.getStartElement());v[v.checkActive(x)?'remove':'apply'](n.document);n.fire('saveSnapshot');},onRender:function(){n.on('selectionChange',function(u){var v=this.getValue(),w=u.data.path,x=w.elements;for(var y=0,z=x.length,A;y<z;y++){A=x[y];for(var B in q){if(q[B].checkElementRemovable(A,true)){if(B!=v)this.setValue(B);return;}}}this.setValue('');},this);},onOpen:function(){var B=this;if(c||b.webkit)n.focus();var u=n.getSelection(),v=u.getSelectedElement(),w=new d.elementPath(v||u.getStartElement()),x=[0,0,0,0];B.showAll();B.unmarkAll();for(var y in q){var z=q[y],A=z.type;if(z.checkActive(w))B.mark(y);else if(A==3&&!z.checkApplicable(w)){B.hideItem(y);x[A]--;}x[A]++;}if(!x[1])B.hideGroup(p['panelTitle'+String(1)]);if(!x[2])B.hideGroup(p['panelTitle'+String(2)]);if(!x[3])B.hideGroup(p['panelTitle'+String(3)]);},reset:function(){if(s){delete s._.panel;delete s._.list;s._.committed=0;s._.items={};s._.state=2;}q={};r=[];t();}});n.on('instanceReady',function(){t();});}});function m(n,o){var p=n.type,q=o.type;return p==q?0:p==3?-1:q==3?1:q==1?1:-1;};})();j.add('table',{init:function(m){var n=j.table,o=m.lang.table;m.addCommand('table',new a.dialogCommand('table'));m.addCommand('tableProperties',new a.dialogCommand('tableProperties'));m.ui.addButton('Table',{label:o.toolbar,command:'table'});a.dialog.add('table',this.path+'dialogs/table.js');a.dialog.add('tableProperties',this.path+'dialogs/table.js');if(m.addMenuItems)m.addMenuItems({table:{label:o.menu,command:'tableProperties',group:'table',order:5},tabledelete:{label:o.deleteTable,command:'tableDelete',group:'table',order:1}});m.on('doubleclick',function(p){var q=p.data.element;
-if(q.is('table'))p.data.dialog='tableProperties';});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(!p||p.isReadOnly())return null;var r=p.hasAscendant('table',1);if(r)return{tabledelete:2,table:2};return null;});}});(function(){var m=/^(?:td|th)$/;function n(G){var H=G.createBookmarks(),I=G.getRanges(),J=[],K={};function L(T){if(J.length>0)return;if(T.type==1&&m.test(T.getName())&&!T.getCustomData('selected_cell')){h.setMarker(K,T,'selected_cell',true);J.push(T);}};for(var M=0;M<I.length;M++){var N=I[M];if(N.collapsed){var O=N.getCommonAncestor(),P=O.getAscendant('td',true)||O.getAscendant('th',true);if(P)J.push(P);}else{var Q=new d.walker(N),R;Q.guard=L;while(R=Q.next()){var S=R.getAscendant('td')||R.getAscendant('th');if(S&&!S.getCustomData('selected_cell')){h.setMarker(K,S,'selected_cell',true);J.push(S);}}}}h.clearAllMarkers(K);G.selectBookmarks(H);return J;};function o(G){var H=0,I=G.length-1,J={},K,L,M;while(K=G[H++])h.setMarker(J,K,'delete_cell',true);H=0;while(K=G[H++]){if((L=K.getPrevious())&&!L.getCustomData('delete_cell')||(L=K.getNext())&&!L.getCustomData('delete_cell')){h.clearAllMarkers(J);return L;}}h.clearAllMarkers(J);M=G[0].getParent();if(M=M.getPrevious())return M.getLast();M=G[I].getParent();if(M=M.getNext())return M.getChild(0);return null;};function p(G,H){var I=n(G),J=I[0],K=J.getAscendant('table'),L=J.getDocument(),M=I[0].getParent(),N=M.$.rowIndex,O=I[I.length-1],P=O.getParent().$.rowIndex+O.$.rowSpan-1,Q=new h(K.$.rows[P]),R=H?N:P,S=H?M:Q,T=e.buildTableMap(K),U=T[R],V=H?T[R-1]:T[R+1],W=T[0].length,X=L.createElement('tr');for(var Y=0;Y<W;Y++){var Z;if(U[Y].rowSpan>1&&V&&U[Y]==V[Y]){Z=U[Y];Z.rowSpan+=1;}else{Z=new h(U[Y]).clone();Z.removeAttribute('rowSpan');!c&&Z.appendBogus();X.append(Z);Z=Z.$;}Y+=Z.colSpan-1;}H?X.insertBefore(S):X.insertAfter(S);};function q(G){if(G instanceof d.selection){var H=n(G),I=H[0],J=I.getAscendant('table'),K=e.buildTableMap(J),L=H[0].getParent(),M=L.$.rowIndex,N=H[H.length-1],O=N.getParent().$.rowIndex+N.$.rowSpan-1,P=[];for(var Q=M;Q<=O;Q++){var R=K[Q],S=new h(J.$.rows[Q]);for(var T=0;T<R.length;T++){var U=new h(R[T]),V=U.getParent().$.rowIndex;if(U.$.rowSpan==1)U.remove();else{U.$.rowSpan-=1;if(V==Q){var W=K[Q+1];W[T-1]?U.insertAfter(new h(W[T-1])):new h(J.$.rows[Q+1]).append(U,1);}}T+=U.$.colSpan-1;}P.push(S);}var X=J.$.rows,Y=new h(X[O+1]||(M>0?X[M-1]:null)||J.$.parentNode);for(Q=P.length;Q>=0;Q--)q(P[Q]);return Y;}else if(G instanceof h){J=G.getAscendant('table');if(J.$.rows.length==1)J.remove();
-else G.remove();}return null;};function r(G,H){var I=G.getParent(),J=I.$.cells,K=0;for(var L=0;L<J.length;L++){var M=J[L];K+=H?1:M.colSpan;if(M==G.$)break;}return K-1;};function s(G,H){var I=H?Infinity:0;for(var J=0;J<G.length;J++){var K=r(G[J],H);if(H?K<I:K>I)I=K;}return I;};function t(G,H){var I=n(G),J=I[0],K=J.getAscendant('table'),L=s(I,1),M=s(I),N=H?L:M,O=e.buildTableMap(K),P=[],Q=[],R=O.length;for(var S=0;S<R;S++){P.push(O[S][N]);var T=H?O[S][N-1]:O[S][N+1];T&&Q.push(T);}for(S=0;S<R;S++){var U;if(P[S].colSpan>1&&Q.length&&Q[S]==P[S]){U=P[S];U.colSpan+=1;}else{U=new h(P[S]).clone();U.removeAttribute('colSpan');!c&&U.appendBogus();U[H?'insertBefore':'insertAfter'].call(U,new h(P[S]));U=U.$;}S+=U.rowSpan-1;}};function u(G){var H=n(G),I=H[0],J=H[H.length-1],K=I.getAscendant('table'),L=e.buildTableMap(K),M,N,O=[];for(var P=0,Q=L.length;P<Q;P++)for(var R=0,S=L[P].length;R<S;R++){if(L[P][R]==I.$)M=R;if(L[P][R]==J.$)N=R;}for(P=M;P<=N;P++)for(R=0;R<L.length;R++){var T=L[R],U=new h(K.$.rows[R]),V=new h(T[P]);if(V.$){if(V.$.colSpan==1)V.remove();else V.$.colSpan-=1;R+=V.$.rowSpan-1;if(!U.$.cells.length)O.push(U);}}var W=K.$.rows[0]&&K.$.rows[0].cells,X=new h(W[M]||(M?W[M-1]:K.$.parentNode));if(O.length==Q)K.remove();return X;};function v(G){var H=[],I=G[0]&&G[0].getAscendant('table'),J,K,L,M;for(J=0,K=G.length;J<K;J++)H.push(G[J].$.cellIndex);H.sort();for(J=1,K=H.length;J<K;J++){if(H[J]-H[J-1]>1){L=H[J-1]+1;break;}}if(!L)L=H[0]>0?H[0]-1:H[H.length-1]+1;var N=I.$.rows;for(J=0,K=N.length;J<K;J++){M=N[J].cells[L];if(M)break;}return M?new h(M):I.getPrevious();};function w(G,H){var I=G.getStartElement(),J=I.getAscendant('td',1)||I.getAscendant('th',1);if(!J)return;var K=J.clone();if(!c)K.appendBogus();if(H)K.insertBefore(J);else K.insertAfter(J);};function x(G){if(G instanceof d.selection){var H=n(G),I=H[0]&&H[0].getAscendant('table'),J=o(H);for(var K=H.length-1;K>=0;K--)x(H[K]);if(J)z(J,true);else if(I)I.remove();}else if(G instanceof h){var L=G.getParent();if(L.getChildCount()==1)L.remove();else G.remove();}};function y(G){var H=G.getBogus();H&&H.remove();G.trim();};function z(G,H){var I=new d.range(G.getDocument());if(!I['moveToElementEdit'+(H?'End':'Start')](G)){I.selectNodeContents(G);I.collapse(H?false:true);}I.select(true);};function A(G,H,I){var J=G[H];if(typeof I=='undefined')return J;for(var K=0;J&&K<J.length;K++){if(I.is&&J[K]==I.$)return K;else if(K==I)return new h(J[K]);}return I.is?-1:null;};function B(G,H,I){var J=[];for(var K=0;K<G.length;K++){var L=G[K];
-if(typeof I=='undefined')J.push(L[H]);else if(I.is&&L[H]==I.$)return K;else if(K==I)return new h(L[H]);}return typeof I=='undefined'?J:I.is?-1:null;};function C(G,H,I){var J=n(G),K;if((H?J.length!=1:J.length<2)||(K=G.getCommonAncestor())&&K.type==1&&K.is('table'))return false;var L,M=J[0],N=M.getAscendant('table'),O=e.buildTableMap(N),P=O.length,Q=O[0].length,R=M.getParent().$.rowIndex,S=A(O,R,M);if(H){var T;try{var U=parseInt(M.getAttribute('rowspan'),10)||1,V=parseInt(M.getAttribute('colspan'),10)||1;T=O[H=='up'?R-U:H=='down'?R+U:R][H=='left'?S-V:H=='right'?S+V:S];}catch(an){return false;}if(!T||M.$==T)return false;J[H=='up'||H=='left'?'unshift':'push'](new h(T));}var W=M.getDocument(),X=R,Y=0,Z=0,aa=!I&&new d.documentFragment(W),ab=0;for(var ac=0;ac<J.length;ac++){L=J[ac];var ad=L.getParent(),ae=L.getFirst(),af=L.$.colSpan,ag=L.$.rowSpan,ah=ad.$.rowIndex,ai=A(O,ah,L);ab+=af*ag;Z=Math.max(Z,ai-S+af);Y=Math.max(Y,ah-R+ag);if(!I){if(y(L),L.getChildren().count()){if(ah!=X&&ae&&!(ae.isBlockBoundary&&ae.isBlockBoundary({br:1}))){var aj=aa.getLast(d.walker.whitespaces(true));if(aj&&!(aj.is&&aj.is('br')))aa.append('br');}L.moveChildren(aa);}ac?L.remove():L.setHtml('');}X=ah;}if(!I){aa.moveChildren(M);if(!c)M.appendBogus();if(Z>=Q)M.removeAttribute('rowSpan');else M.$.rowSpan=Y;if(Y>=P)M.removeAttribute('colSpan');else M.$.colSpan=Z;var ak=new d.nodeList(N.$.rows),al=ak.count();for(ac=al-1;ac>=0;ac--){var am=ak.getItem(ac);if(!am.$.cells.length){am.remove();al++;continue;}}return M;}else return Y*Z==ab;};function D(G,H){var I=n(G);if(I.length>1)return false;else if(H)return true;var J=I[0],K=J.getParent(),L=K.getAscendant('table'),M=e.buildTableMap(L),N=K.$.rowIndex,O=A(M,N,J),P=J.$.rowSpan,Q,R,S,T;if(P>1){R=Math.ceil(P/2);S=Math.floor(P/2);T=N+R;var U=new h(L.$.rows[T]),V=A(M,T),W;Q=J.clone();for(var X=0;X<V.length;X++){W=V[X];if(W.parentNode==U.$&&X>O){Q.insertBefore(new h(W));break;}else W=null;}if(!W)U.append(Q,true);}else{S=R=1;U=K.clone();U.insertAfter(K);U.append(Q=J.clone());var Y=A(M,N);for(var Z=0;Z<Y.length;Z++)Y[Z].rowSpan++;}if(!c)Q.appendBogus();J.$.rowSpan=R;Q.$.rowSpan=S;if(R==1)J.removeAttribute('rowSpan');if(S==1)Q.removeAttribute('rowSpan');return Q;};function E(G,H){var I=n(G);if(I.length>1)return false;else if(H)return true;var J=I[0],K=J.getParent(),L=K.getAscendant('table'),M=e.buildTableMap(L),N=K.$.rowIndex,O=A(M,N,J),P=J.$.colSpan,Q,R,S;if(P>1){R=Math.ceil(P/2);S=Math.floor(P/2);}else{S=R=1;var T=B(M,O);for(var U=0;U<T.length;U++)T[U].colSpan++;
-}Q=J.clone();Q.insertAfter(J);if(!c)Q.appendBogus();J.$.colSpan=R;Q.$.colSpan=S;if(R==1)J.removeAttribute('colSpan');if(S==1)Q.removeAttribute('colSpan');return Q;};var F={thead:1,tbody:1,tfoot:1,td:1,tr:1,th:1};j.tabletools={init:function(G){var H=G.lang.table;G.addCommand('cellProperties',new a.dialogCommand('cellProperties'));a.dialog.add('cellProperties',this.path+'dialogs/tableCell.js');G.addCommand('tableDelete',{exec:function(I){var J=I.getSelection(),K=J&&J.getStartElement(),L=K&&K.getAscendant('table',1);if(!L)return;var M=L.getParent();if(M.getChildCount()==1&&!M.is('body','td','th'))L=M;var N=new d.range(I.document);N.moveToPosition(L,3);L.remove();N.select();}});G.addCommand('rowDelete',{exec:function(I){var J=I.getSelection();z(q(J));}});G.addCommand('rowInsertBefore',{exec:function(I){var J=I.getSelection();p(J,true);}});G.addCommand('rowInsertAfter',{exec:function(I){var J=I.getSelection();p(J);}});G.addCommand('columnDelete',{exec:function(I){var J=I.getSelection(),K=u(J);K&&z(K,true);}});G.addCommand('columnInsertBefore',{exec:function(I){var J=I.getSelection();t(J,true);}});G.addCommand('columnInsertAfter',{exec:function(I){var J=I.getSelection();t(J);}});G.addCommand('cellDelete',{exec:function(I){var J=I.getSelection();x(J);}});G.addCommand('cellMerge',{exec:function(I){z(C(I.getSelection()),true);}});G.addCommand('cellMergeRight',{exec:function(I){z(C(I.getSelection(),'right'),true);}});G.addCommand('cellMergeDown',{exec:function(I){z(C(I.getSelection(),'down'),true);}});G.addCommand('cellVerticalSplit',{exec:function(I){z(D(I.getSelection()));}});G.addCommand('cellHorizontalSplit',{exec:function(I){z(E(I.getSelection()));}});G.addCommand('cellInsertBefore',{exec:function(I){var J=I.getSelection();w(J,true);}});G.addCommand('cellInsertAfter',{exec:function(I){var J=I.getSelection();w(J);}});if(G.addMenuItems)G.addMenuItems({tablecell:{label:H.cell.menu,group:'tablecell',order:1,getItems:function(){var I=G.getSelection(),J=n(I);return{tablecell_insertBefore:2,tablecell_insertAfter:2,tablecell_delete:2,tablecell_merge:C(I,null,true)?2:0,tablecell_merge_right:C(I,'right',true)?2:0,tablecell_merge_down:C(I,'down',true)?2:0,tablecell_split_vertical:D(I,true)?2:0,tablecell_split_horizontal:E(I,true)?2:0,tablecell_properties:J.length>0?2:0};}},tablecell_insertBefore:{label:H.cell.insertBefore,group:'tablecell',command:'cellInsertBefore',order:5},tablecell_insertAfter:{label:H.cell.insertAfter,group:'tablecell',command:'cellInsertAfter',order:10},tablecell_delete:{label:H.cell.deleteCell,group:'tablecell',command:'cellDelete',order:15},tablecell_merge:{label:H.cell.merge,group:'tablecell',command:'cellMerge',order:16},tablecell_merge_right:{label:H.cell.mergeRight,group:'tablecell',command:'cellMergeRight',order:17},tablecell_merge_down:{label:H.cell.mergeDown,group:'tablecell',command:'cellMergeDown',order:18},tablecell_split_horizontal:{label:H.cell.splitHorizontal,group:'tablecell',command:'cellHorizontalSplit',order:19},tablecell_split_vertical:{label:H.cell.splitVertical,group:'tablecell',command:'cellVerticalSplit',order:20},tablecell_properties:{label:H.cell.title,group:'tablecellproperties',command:'cellProperties',order:21},tablerow:{label:H.row.menu,group:'tablerow',order:1,getItems:function(){return{tablerow_insertBefore:2,tablerow_insertAfter:2,tablerow_delete:2};
-}},tablerow_insertBefore:{label:H.row.insertBefore,group:'tablerow',command:'rowInsertBefore',order:5},tablerow_insertAfter:{label:H.row.insertAfter,group:'tablerow',command:'rowInsertAfter',order:10},tablerow_delete:{label:H.row.deleteRow,group:'tablerow',command:'rowDelete',order:15},tablecolumn:{label:H.column.menu,group:'tablecolumn',order:1,getItems:function(){return{tablecolumn_insertBefore:2,tablecolumn_insertAfter:2,tablecolumn_delete:2};}},tablecolumn_insertBefore:{label:H.column.insertBefore,group:'tablecolumn',command:'columnInsertBefore',order:5},tablecolumn_insertAfter:{label:H.column.insertAfter,group:'tablecolumn',command:'columnInsertAfter',order:10},tablecolumn_delete:{label:H.column.deleteColumn,group:'tablecolumn',command:'columnDelete',order:15}});if(G.contextMenu)G.contextMenu.addListener(function(I,J){if(!I||I.isReadOnly())return null;while(I){if(I.getName() in F)return{tablecell:2,tablerow:2,tablecolumn:2};I=I.getParent();}return null;});},getSelectedCells:n};j.add('tabletools',j.tabletools);})();e.buildTableMap=function(m){var n=m.$.rows,o=-1,p=[];for(var q=0;q<n.length;q++){o++;!p[o]&&(p[o]=[]);var r=-1;for(var s=0;s<n[q].cells.length;s++){var t=n[q].cells[s];r++;while(p[o][r])r++;var u=isNaN(t.colSpan)?1:t.colSpan,v=isNaN(t.rowSpan)?1:t.rowSpan;for(var w=0;w<v;w++){if(!p[o+w])p[o+w]=[];for(var x=0;x<u;x++)p[o+w][r+x]=n[q].cells[s];}r+=u-1;}}return p;};j.add('specialchar',{availableLangs:{en:1},init:function(m){var n='specialchar',o=this;a.dialog.add(n,this.path+'dialogs/specialchar.js');m.addCommand(n,{exec:function(){var p=m.langCode;p=o.availableLangs[p]?p:'en';a.scriptLoader.load(a.getUrl(o.path+'lang/'+p+'.js'),function(){e.extend(m.lang.specialChar,o.langEntries[p]);m.openDialog(n);});},modes:{wysiwyg:1},canUndo:false});m.ui.addButton('SpecialChar',{label:m.lang.specialChar.toolbar,command:n});}});i.specialChars=['!','"','#','$','%','&',"'",'(',')','*','+','-','.','/','0','1','2','3','4','5','6','7','8','9',':',';','<','=','>','?','@','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','[',']','^','_','`','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','{','|','}','~','€','‘','’','“','”','–','—','¡','¢','£','¤','¥','¦','§','¨','©','ª','«','¬','®','¯','°','&','²','³','´','µ','¶','·','¸','¹','º','&','¼','½','¾','¿','À','Á','Â','Ã','Ä','Å','Æ','Ç','È','É','Ê','Ë','Ì','Í','Î','Ï','Ð','Ñ','Ò','Ó','Ô','Õ','Ö','×','Ø','Ù','Ú','Û','Ü','Ý','Þ','ß','à','á','â','ã','ä','å','æ','ç','è','é','ê','ë','ì','í','î','ï','ð','ñ','ò','ó','ô','õ','ö','÷','ø','ù','ú','û','ü','ü','ý','þ','ÿ','Œ','œ','Ŵ','Ŷ','ŵ','ŷ','‚','‛','„','…','™','►','•','→','⇒','⇔','♦','≈'];
+},getTarget:function(){var g=this.$.target||this.$.srcElement;return g?new d.node(g):null;}};a.CTRL=1114112;a.SHIFT=2228224;a.ALT=4456448;d.domObject=function(g){if(g)this.$=g;};d.domObject.prototype=(function(){var g=function(h,i){return function(j){if(typeof a!='undefined')h.fire(i,new d.event(j));};};return{getPrivate:function(){var h;if(!(h=this.getCustomData('_')))this.setCustomData('_',h={});return h;},on:function(h){var k=this;var i=k.getCustomData('_cke_nativeListeners');if(!i){i={};k.setCustomData('_cke_nativeListeners',i);}if(!i[h]){var j=i[h]=g(k,h);if(k.$.addEventListener)k.$.addEventListener(h,j,!!a.event.useCapture);else if(k.$.attachEvent)k.$.attachEvent('on'+h,j);}return a.event.prototype.on.apply(k,arguments);},removeListener:function(h){var k=this;a.event.prototype.removeListener.apply(k,arguments);if(!k.hasListeners(h)){var i=k.getCustomData('_cke_nativeListeners'),j=i&&i[h];if(j){if(k.$.removeEventListener)k.$.removeEventListener(h,j,false);else if(k.$.detachEvent)k.$.detachEvent('on'+h,j);delete i[h];}}},removeAllListeners:function(){var k=this;var h=k.getCustomData('_cke_nativeListeners');for(var i in h){var j=h[i];if(k.$.detachEvent)k.$.detachEvent('on'+i,j);else if(k.$.removeEventListener)k.$.removeEventListener(i,j,false);delete h[i];}}};})();(function(g){var h={};a.on('reset',function(){h={};});g.equals=function(i){return i&&i.$===this.$;};g.setCustomData=function(i,j){var k=this.getUniqueId(),l=h[k]||(h[k]={});l[i]=j;return this;};g.getCustomData=function(i){var j=this.$['data-cke-expando'],k=j&&h[j];return k&&k[i];};g.removeCustomData=function(i){var j=this.$['data-cke-expando'],k=j&&h[j],l=k&&k[i];if(typeof l!='undefined')delete k[i];return l||null;};g.clearCustomData=function(){this.removeAllListeners();var i=this.$['data-cke-expando'];i&&delete h[i];};g.getUniqueId=function(){return this.$['data-cke-expando']||(this.$['data-cke-expando']=e.getNextNumber());};a.event.implementOn(g);})(d.domObject.prototype);d.window=function(g){d.domObject.call(this,g);};d.window.prototype=new d.domObject();e.extend(d.window.prototype,{focus:function(){if(b.webkit&&this.$.parent)this.$.parent.focus();this.$.focus();},getViewPaneSize:function(){var g=this.$.document,h=g.compatMode=='CSS1Compat';return{width:(h?g.documentElement.clientWidth:g.body.clientWidth)||0,height:(h?g.documentElement.clientHeight:g.body.clientHeight)||0};},getScrollPosition:function(){var g=this.$;if('pageXOffset' in g)return{x:g.pageXOffset||0,y:g.pageYOffset||0};else{var h=g.document;
+return{x:h.documentElement.scrollLeft||h.body.scrollLeft||0,y:h.documentElement.scrollTop||h.body.scrollTop||0};}}});d.document=function(g){d.domObject.call(this,g);};var g=d.document;g.prototype=new d.domObject();e.extend(g.prototype,{appendStyleSheet:function(h){if(this.$.createStyleSheet)this.$.createStyleSheet(h);else{var i=new d.element('link');i.setAttributes({rel:'stylesheet',type:'text/css',href:h});this.getHead().append(i);}},appendStyleText:function(h){var k=this;if(k.$.createStyleSheet){var i=k.$.createStyleSheet('');i.cssText=h;}else{var j=new d.element('style',k);j.append(new d.text(h,k));k.getHead().append(j);}},createElement:function(h,i){var j=new d.element(h,this);if(i){if(i.attributes)j.setAttributes(i.attributes);if(i.styles)j.setStyles(i.styles);}return j;},createText:function(h){return new d.text(h,this);},focus:function(){this.getWindow().focus();},getById:function(h){var i=this.$.getElementById(h);return i?new d.element(i):null;},getByAddress:function(h,i){var j=this.$.documentElement;for(var k=0;j&&k<h.length;k++){var l=h[k];if(!i){j=j.childNodes[l];continue;}var m=-1;for(var n=0;n<j.childNodes.length;n++){var o=j.childNodes[n];if(i===true&&o.nodeType==3&&o.previousSibling&&o.previousSibling.nodeType==3)continue;m++;if(m==l){j=o;break;}}}return j?new d.node(j):null;},getElementsByTag:function(h,i){if(!(c&&!(document.documentMode>8))&&i)h=i+':'+h;return new d.nodeList(this.$.getElementsByTagName(h));},getHead:function(){var h=this.$.getElementsByTagName('head')[0];if(!h)h=this.getDocumentElement().append(new d.element('head'),true);else h=new d.element(h);return(this.getHead=function(){return h;})();},getBody:function(){var h=new d.element(this.$.body);return(this.getBody=function(){return h;})();},getDocumentElement:function(){var h=new d.element(this.$.documentElement);return(this.getDocumentElement=function(){return h;})();},getWindow:function(){var h=new d.window(this.$.parentWindow||this.$.defaultView);return(this.getWindow=function(){return h;})();},write:function(h){var i=this;i.$.open('text/html','replace');b.isCustomDomain()&&(i.$.domain=document.domain);i.$.write(h);i.$.close();}});d.node=function(h){if(h){var i=h.nodeType==9?'document':h.nodeType==1?'element':h.nodeType==3?'text':h.nodeType==8?'comment':'domObject';return new d[i](h);}return this;};d.node.prototype=new d.domObject();a.NODE_ELEMENT=1;a.NODE_DOCUMENT=9;a.NODE_TEXT=3;a.NODE_COMMENT=8;a.NODE_DOCUMENT_FRAGMENT=11;a.POSITION_IDENTICAL=0;a.POSITION_DISCONNECTED=1;
+a.POSITION_FOLLOWING=2;a.POSITION_PRECEDING=4;a.POSITION_IS_CONTAINED=8;a.POSITION_CONTAINS=16;e.extend(d.node.prototype,{appendTo:function(h,i){h.append(this,i);return h;},clone:function(h,i){var j=this.$.cloneNode(h),k=function(l){if(l.nodeType!=1)return;if(!i)l.removeAttribute('id',false);l.removeAttribute('data-cke-expando',false);if(h){var m=l.childNodes;for(var n=0;n<m.length;n++)k(m[n]);}};k(j);return new d.node(j);},hasPrevious:function(){return!!this.$.previousSibling;},hasNext:function(){return!!this.$.nextSibling;},insertAfter:function(h){h.$.parentNode.insertBefore(this.$,h.$.nextSibling);return h;},insertBefore:function(h){h.$.parentNode.insertBefore(this.$,h.$);return h;},insertBeforeMe:function(h){this.$.parentNode.insertBefore(h.$,this.$);return h;},getAddress:function(h){var i=[],j=this.getDocument().$.documentElement,k=this.$;while(k&&k!=j){var l=k.parentNode;if(l)i.unshift(this.getIndex.call({$:k},h));k=l;}return i;},getDocument:function(){return new g(this.$.ownerDocument||this.$.parentNode.ownerDocument);},getIndex:function(h){var i=this.$,j=0;while(i=i.previousSibling){if(h&&i.nodeType==3&&(!i.nodeValue.length||i.previousSibling&&i.previousSibling.nodeType==3))continue;j++;}return j;},getNextSourceNode:function(h,i,j){if(j&&!j.call){var k=j;j=function(n){return!n.equals(k);};}var l=!h&&this.getFirst&&this.getFirst(),m;if(!l){if(this.type==1&&j&&j(this,true)===false)return null;l=this.getNext();}while(!l&&(m=(m||this).getParent())){if(j&&j(m,true)===false)return null;l=m.getNext();}if(!l)return null;if(j&&j(l)===false)return null;if(i&&i!=l.type)return l.getNextSourceNode(false,i,j);return l;},getPreviousSourceNode:function(h,i,j){if(j&&!j.call){var k=j;j=function(n){return!n.equals(k);};}var l=!h&&this.getLast&&this.getLast(),m;if(!l){if(this.type==1&&j&&j(this,true)===false)return null;l=this.getPrevious();}while(!l&&(m=(m||this).getParent())){if(j&&j(m,true)===false)return null;l=m.getPrevious();}if(!l)return null;if(j&&j(l)===false)return null;if(i&&l.type!=i)return l.getPreviousSourceNode(false,i,j);return l;},getPrevious:function(h){var i=this.$,j;do{i=i.previousSibling;j=i&&i.nodeType!=10&&new d.node(i);}while(j&&h&&!h(j));return j;},getNext:function(h){var i=this.$,j;do{i=i.nextSibling;j=i&&new d.node(i);}while(j&&h&&!h(j));return j;},getParent:function(){var h=this.$.parentNode;return h&&h.nodeType==1?new d.node(h):null;},getParents:function(h){var i=this,j=[];do j[h?'push':'unshift'](i);while(i=i.getParent());return j;},getCommonAncestor:function(h){var j=this;
+if(h.equals(j))return j;if(h.contains&&h.contains(j))return h;var i=j.contains?j:j.getParent();do{if(i.contains(h))return i;}while(i=i.getParent());return null;},getPosition:function(h){var i=this.$,j=h.$;if(i.compareDocumentPosition)return i.compareDocumentPosition(j);if(i==j)return 0;if(this.type==1&&h.type==1){if(i.contains){if(i.contains(j))return 16+4;if(j.contains(i))return 8+2;}if('sourceIndex' in i)return i.sourceIndex<0||j.sourceIndex<0?1:i.sourceIndex<j.sourceIndex?4:2;}var k=this.getAddress(),l=h.getAddress(),m=Math.min(k.length,l.length);for(var n=0;n<=m-1;n++){if(k[n]!=l[n]){if(n<m)return k[n]<l[n]?4:2;break;}}return k.length<l.length?16+4:8+2;},getAscendant:function(h,i){var j=this.$,k;if(!i)j=j.parentNode;while(j){if(j.nodeName&&(k=j.nodeName.toLowerCase(),typeof h=='string'?k==h:k in h))return new d.node(j);j=j.parentNode;}return null;},hasAscendant:function(h,i){var j=this.$;if(!i)j=j.parentNode;while(j){if(j.nodeName&&j.nodeName.toLowerCase()==h)return true;j=j.parentNode;}return false;},move:function(h,i){h.append(this.remove(),i);},remove:function(h){var i=this.$,j=i.parentNode;if(j){if(h)for(var k;k=i.firstChild;)j.insertBefore(i.removeChild(k),i);j.removeChild(i);}return this;},replace:function(h){this.insertBefore(h);h.remove();},trim:function(){this.ltrim();this.rtrim();},ltrim:function(){var k=this;var h;while(k.getFirst&&(h=k.getFirst())){if(h.type==3){var i=e.ltrim(h.getText()),j=h.getLength();if(!i){h.remove();continue;}else if(i.length<j){h.split(j-i.length);k.$.removeChild(k.$.firstChild);}}break;}},rtrim:function(){var k=this;var h;while(k.getLast&&(h=k.getLast())){if(h.type==3){var i=e.rtrim(h.getText()),j=h.getLength();if(!i){h.remove();continue;}else if(i.length<j){h.split(i.length);k.$.lastChild.parentNode.removeChild(k.$.lastChild);}}break;}if(!c&&!b.opera){h=k.$.lastChild;if(h&&h.type==1&&h.nodeName.toLowerCase()=='br')h.parentNode.removeChild(h);}},isReadOnly:function(){var h=this;if(this.type!=1)h=this.getParent();if(h&&typeof h.$.isContentEditable!='undefined')return!(h.$.isContentEditable||h.data('cke-editable'));else{var i=h;while(i){if(i.is('body')||!!i.data('cke-editable'))break;if(i.getAttribute('contentEditable')=='false')return true;else if(i.getAttribute('contentEditable')=='true')break;i=i.getParent();}return false;}}});d.nodeList=function(h){this.$=h;};d.nodeList.prototype={count:function(){return this.$.length;},getItem:function(h){var i=this.$[h];return i?new d.node(i):null;}};d.element=function(h,i){if(typeof h=='string')h=(i?i.$:document).createElement(h);
+d.domObject.call(this,h);};var h=d.element;h.get=function(i){return i&&(i.$?i:new h(i));};h.prototype=new d.node();h.createFromHtml=function(i,j){var k=new h('div',j);k.setHtml(i);return k.getFirst().remove();};h.setMarker=function(i,j,k,l){var m=j.getCustomData('list_marker_id')||j.setCustomData('list_marker_id',e.getNextNumber()).getCustomData('list_marker_id'),n=j.getCustomData('list_marker_names')||j.setCustomData('list_marker_names',{}).getCustomData('list_marker_names');i[m]=j;n[k]=1;return j.setCustomData(k,l);};h.clearAllMarkers=function(i){for(var j in i)h.clearMarkers(i,i[j],1);};h.clearMarkers=function(i,j,k){var l=j.getCustomData('list_marker_names'),m=j.getCustomData('list_marker_id');for(var n in l)j.removeCustomData(n);j.removeCustomData('list_marker_names');if(k){j.removeCustomData('list_marker_id');delete i[m];}};e.extend(h.prototype,{type:1,addClass:function(i){var j=this.$.className;if(j){var k=new RegExp('(?:^|\\s)'+i+'(?:\\s|$)','');if(!k.test(j))j+=' '+i;}this.$.className=j||i;},removeClass:function(i){var j=this.getAttribute('class');if(j){var k=new RegExp('(?:^|\\s+)'+i+'(?=\\s|$)','i');if(k.test(j)){j=j.replace(k,'').replace(/^\s+/,'');if(j)this.setAttribute('class',j);else this.removeAttribute('class');}}},hasClass:function(i){var j=new RegExp('(?:^|\\s+)'+i+'(?=\\s|$)','');return j.test(this.getAttribute('class'));},append:function(i,j){var k=this;if(typeof i=='string')i=k.getDocument().createElement(i);if(j)k.$.insertBefore(i.$,k.$.firstChild);else k.$.appendChild(i.$);return i;},appendHtml:function(i){var k=this;if(!k.$.childNodes.length)k.setHtml(i);else{var j=new h('div',k.getDocument());j.setHtml(i);j.moveChildren(k);}},appendText:function(i){if(this.$.text!=undefined)this.$.text+=i;else this.append(new d.text(i));},appendBogus:function(){var k=this;var i=k.getLast();while(i&&i.type==3&&!e.rtrim(i.getText()))i=i.getPrevious();if(!i||!i.is||!i.is('br')){var j=b.opera?k.getDocument().createText(''):k.getDocument().createElement('br');b.gecko&&j.setAttribute('type','_moz');k.append(j);}},breakParent:function(i){var l=this;var j=new d.range(l.getDocument());j.setStartAfter(l);j.setEndAfter(i);var k=j.extractContents();j.insertNode(l.remove());k.insertAfterNode(l);},contains:c||b.webkit?function(i){var j=this.$;return i.type!=1?j.contains(i.getParent().$):j!=i.$&&j.contains(i.$);}:function(i){return!!(this.$.compareDocumentPosition(i.$)&16);},focus:(function(){function i(){try{this.$.focus();}catch(j){}};return function(j){if(j)e.setTimeout(i,100,this);
+else i.call(this);};})(),getHtml:function(){var i=this.$.innerHTML;return c?i.replace(/<\?[^>]*>/g,''):i;},getOuterHtml:function(){var j=this;if(j.$.outerHTML)return j.$.outerHTML.replace(/<\?[^>]*>/,'');var i=j.$.ownerDocument.createElement('div');i.appendChild(j.$.cloneNode(true));return i.innerHTML;},setHtml:function(i){return this.$.innerHTML=i;},setText:function(i){h.prototype.setText=this.$.innerText!=undefined?function(j){return this.$.innerText=j;}:function(j){return this.$.textContent=j;};return this.setText(i);},getAttribute:(function(){var i=function(j){return this.$.getAttribute(j,2);};if(c&&(b.ie7Compat||b.ie6Compat))return function(j){var n=this;switch(j){case 'class':j='className';break;case 'http-equiv':j='httpEquiv';break;case 'name':return n.$.name;case 'tabindex':var k=i.call(n,j);if(k!==0&&n.$.tabIndex===0)k=null;return k;break;case 'checked':var l=n.$.attributes.getNamedItem(j),m=l.specified?l.nodeValue:n.$.checked;return m?'checked':null;case 'hspace':case 'value':return n.$[j];case 'style':return n.$.style.cssText;}return i.call(n,j);};else return i;})(),getChildren:function(){return new d.nodeList(this.$.childNodes);},getComputedStyle:c?function(i){return this.$.currentStyle[e.cssStyleToDomStyle(i)];}:function(i){return this.getWindow().$.getComputedStyle(this.$,'').getPropertyValue(i);},getDtd:function(){var i=f[this.getName()];this.getDtd=function(){return i;};return i;},getElementsByTag:g.prototype.getElementsByTag,getTabIndex:c?function(){var i=this.$.tabIndex;if(i===0&&!f.$tabIndex[this.getName()]&&parseInt(this.getAttribute('tabindex'),10)!==0)i=-1;return i;}:b.webkit?function(){var i=this.$.tabIndex;if(i==undefined){i=parseInt(this.getAttribute('tabindex'),10);if(isNaN(i))i=-1;}return i;}:function(){return this.$.tabIndex;},getText:function(){return this.$.textContent||this.$.innerText||'';},getWindow:function(){return this.getDocument().getWindow();},getId:function(){return this.$.id||null;},getNameAtt:function(){return this.$.name||null;},getName:function(){var i=this.$.nodeName.toLowerCase();if(c&&!(document.documentMode>8)){var j=this.$.scopeName;if(j!='HTML')i=j.toLowerCase()+':'+i;}return(this.getName=function(){return i;})();},getValue:function(){return this.$.value;},getFirst:function(i){var j=this.$.firstChild,k=j&&new d.node(j);if(k&&i&&!i(k))k=k.getNext(i);return k;},getLast:function(i){var j=this.$.lastChild,k=j&&new d.node(j);if(k&&i&&!i(k))k=k.getPrevious(i);return k;},getStyle:function(i){return this.$.style[e.cssStyleToDomStyle(i)];
+},is:function(){var i=this.getName();for(var j=0;j<arguments.length;j++){if(arguments[j]==i)return true;}return false;},isEditable:function(i){var l=this;var j=l.getName();if(l.isReadOnly()||l.getComputedStyle('display')=='none'||l.getComputedStyle('visibility')=='hidden'||l.is('a')&&l.data('cke-saved-name')&&!l.getChildCount()||f.$nonEditable[j])return false;if(i!==false){var k=f[j]||f.span;return k&&k['#'];}return true;},isIdentical:function(i){if(this.getName()!=i.getName())return false;var j=this.$.attributes,k=i.$.attributes,l=j.length,m=k.length;for(var n=0;n<l;n++){var o=j[n];if(o.nodeName=='_moz_dirty')continue;if((!c||o.specified&&o.nodeName!='data-cke-expando')&&o.nodeValue!=i.getAttribute(o.nodeName))return false;}if(c)for(n=0;n<m;n++){o=k[n];if(o.specified&&o.nodeName!='data-cke-expando'&&o.nodeValue!=this.getAttribute(o.nodeName))return false;}return true;},isVisible:function(){var l=this;var i=(l.$.offsetHeight||l.$.offsetWidth)&&l.getComputedStyle('visibility')!='hidden',j,k;if(i&&(b.webkit||b.opera)){j=l.getWindow();if(!j.equals(a.document.getWindow())&&(k=j.$.frameElement))i=new h(k).isVisible();}return!!i;},isEmptyInlineRemoveable:function(){if(!f.$removeEmpty[this.getName()])return false;var i=this.getChildren();for(var j=0,k=i.count();j<k;j++){var l=i.getItem(j);if(l.type==1&&l.data('cke-bookmark'))continue;if(l.type==1&&!l.isEmptyInlineRemoveable()||l.type==3&&e.trim(l.getText()))return false;}return true;},hasAttributes:c&&(b.ie7Compat||b.ie6Compat)?function(){var i=this.$.attributes;for(var j=0;j<i.length;j++){var k=i[j];switch(k.nodeName){case 'class':if(this.getAttribute('class'))return true;case 'data-cke-expando':continue;default:if(k.specified)return true;}}return false;}:function(){var i=this.$.attributes,j=i.length,k={'data-cke-expando':1,_moz_dirty:1};return j>0&&(j>2||!k[i[0].nodeName]||j==2&&!k[i[1].nodeName]);},hasAttribute:(function(){function i(j){var k=this.$.attributes.getNamedItem(j);return!!(k&&k.specified);};return c&&b.version<8?function(j){if(j=='name')return!!this.$.name;return i.call(this,j);}:i;})(),hide:function(){this.setStyle('display','none');},moveChildren:function(i,j){var k=this.$;i=i.$;if(k==i)return;var l;if(j)while(l=k.lastChild)i.insertBefore(k.removeChild(l),i.firstChild);else while(l=k.firstChild)i.appendChild(k.removeChild(l));},mergeSiblings:(function(){function i(j,k,l){if(k&&k.type==1){var m=[];while(k.data('cke-bookmark')||k.isEmptyInlineRemoveable()){m.push(k);k=l?k.getNext():k.getPrevious();if(!k||k.type!=1)return;
+}if(j.isIdentical(k)){var n=l?j.getLast():j.getFirst();while(m.length)m.shift().move(j,!l);k.moveChildren(j,!l);k.remove();if(n&&n.type==1)n.mergeSiblings();}}};return function(j){var k=this;if(!(j===false||f.$removeEmpty[k.getName()]||k.is('a')))return;i(k,k.getNext(),true);i(k,k.getPrevious());};})(),show:function(){this.setStyles({display:'',visibility:''});},setAttribute:(function(){var i=function(j,k){this.$.setAttribute(j,k);return this;};if(c&&(b.ie7Compat||b.ie6Compat))return function(j,k){var l=this;if(j=='class')l.$.className=k;else if(j=='style')l.$.style.cssText=k;else if(j=='tabindex')l.$.tabIndex=k;else if(j=='checked')l.$.checked=k;else i.apply(l,arguments);return l;};else if(b.ie8Compat&&b.secure)return function(j,k){if(j=='src'&&k.match(/^http:\/\//))try{i.apply(this,arguments);}catch(l){}else i.apply(this,arguments);return this;};else return i;})(),setAttributes:function(i){for(var j in i)this.setAttribute(j,i[j]);return this;},setValue:function(i){this.$.value=i;return this;},removeAttribute:(function(){var i=function(j){this.$.removeAttribute(j);};if(c&&(b.ie7Compat||b.ie6Compat))return function(j){if(j=='class')j='className';else if(j=='tabindex')j='tabIndex';i.call(this,j);};else return i;})(),removeAttributes:function(i){if(e.isArray(i))for(var j=0;j<i.length;j++)this.removeAttribute(i[j]);else for(var k in i)i.hasOwnProperty(k)&&this.removeAttribute(k);},removeStyle:function(i){var j=this;j.setStyle(i,'');if(j.$.style.removeAttribute)j.$.style.removeAttribute(e.cssStyleToDomStyle(i));if(!j.$.style.cssText)j.removeAttribute('style');},setStyle:function(i,j){this.$.style[e.cssStyleToDomStyle(i)]=j;return this;},setStyles:function(i){for(var j in i)this.setStyle(j,i[j]);return this;},setOpacity:function(i){if(c){i=Math.round(i*100);this.setStyle('filter',i>=100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+i+')');}else this.setStyle('opacity',i);},unselectable:b.gecko?function(){this.$.style.MozUserSelect='none';this.on('dragstart',function(i){i.data.preventDefault();});}:b.webkit?function(){this.$.style.KhtmlUserSelect='none';this.on('dragstart',function(i){i.data.preventDefault();});}:function(){if(c||b.opera){var i=this.$,j=i.getElementsByTagName('*'),k,l=0;i.unselectable='on';while(k=j[l++])switch(k.tagName.toLowerCase()){case 'iframe':case 'textarea':case 'input':case 'select':break;default:k.unselectable='on';}}},getPositionedAncestor:function(){var i=this;while(i.getName()!='html'){if(i.getComputedStyle('position')!='static')return i;
+i=i.getParent();}return null;},getDocumentPosition:function(i){var D=this;var j=0,k=0,l=D.getDocument(),m=l.getBody(),n=l.$.compatMode=='BackCompat';if(document.documentElement.getBoundingClientRect){var o=D.$.getBoundingClientRect(),p=l.$,q=p.documentElement,r=q.clientTop||m.$.clientTop||0,s=q.clientLeft||m.$.clientLeft||0,t=true;if(c){var u=l.getDocumentElement().contains(D),v=l.getBody().contains(D);t=n&&v||!n&&u;}if(t){j=o.left+(!n&&q.scrollLeft||m.$.scrollLeft);j-=s;k=o.top+(!n&&q.scrollTop||m.$.scrollTop);k-=r;}}else{var w=D,x=null,y;while(w&&!(w.getName()=='body'||w.getName()=='html')){j+=w.$.offsetLeft-w.$.scrollLeft;k+=w.$.offsetTop-w.$.scrollTop;if(!w.equals(D)){j+=w.$.clientLeft||0;k+=w.$.clientTop||0;}var z=x;while(z&&!z.equals(w)){j-=z.$.scrollLeft;k-=z.$.scrollTop;z=z.getParent();}x=w;w=(y=w.$.offsetParent)?new h(y):null;}}if(i){var A=D.getWindow(),B=i.getWindow();if(!A.equals(B)&&A.$.frameElement){var C=new h(A.$.frameElement).getDocumentPosition(i);j+=C.x;k+=C.y;}}if(!document.documentElement.getBoundingClientRect)if(b.gecko&&!n){j+=D.$.clientLeft?1:0;k+=D.$.clientTop?1:0;}return{x:j,y:k};},scrollIntoView:function(i){var j=this.getParent();if(!j)return;do{var k=j.$.clientWidth&&j.$.clientWidth<j.$.scrollWidth||j.$.clientHeight&&j.$.clientHeight<j.$.scrollHeight;if(k)this.scrollIntoParent(j,i,1);if(j.is('html')){var l=j.getWindow();try{var m=l.$.frameElement;m&&(j=new h(m));}catch(n){}}}while(j=j.getParent());},scrollIntoParent:function(i,j,k){!i&&(i=this.getWindow());var l=i.getDocument(),m=l.$.compatMode=='BackCompat';if(i instanceof d.window)i=m?l.getBody():l.getDocumentElement();function n(z,A){if(/body|html/.test(i.getName()))i.getWindow().$.scrollBy(z,A);else{i.$.scrollLeft+=z;i.$.scrollTop+=A;}};function o(z,A){var B={x:0,y:0};if(!z.is(m?'body':'html')){var C=z.$.getBoundingClientRect();B.x=C.left,B.y=C.top;}var D=z.getWindow();if(!D.equals(A)){var E=o(h.get(D.$.frameElement),A);B.x+=E.x,B.y+=E.y;}return B;};function p(z,A){return parseInt(z.getComputedStyle('margin-'+A)||0,10)||0;};var q=i.getWindow(),r=o(this,q),s=o(i,q),t=this.$.offsetHeight,u=this.$.offsetWidth,v=i.$.clientHeight,w=i.$.clientWidth,x,y;x={x:r.x-p(this,'left')-s.x||0,y:r.y-p(this,'top')-s.y||0};y={x:r.x+u+p(this,'right')-(s.x+w)||0,y:r.y+t+p(this,'bottom')-(s.y+v)||0};if(x.y<0||y.y>0)n(0,j===true?x.y:j===false?y.y:x.y<0?x.y:y.y);if(k&&(x.x<0||y.x>0))n(x.x<0?x.x:y.x,0);},setState:function(i){var j=this;switch(i){case 1:j.addClass('cke_on');j.removeClass('cke_off');j.removeClass('cke_disabled');
+break;case 0:j.addClass('cke_disabled');j.removeClass('cke_off');j.removeClass('cke_on');break;default:j.addClass('cke_off');j.removeClass('cke_on');j.removeClass('cke_disabled');break;}},getFrameDocument:function(){var i=this.$;try{i.contentWindow.document;}catch(j){i.src=i.src;if(c&&b.version<7)window.showModalDialog('javascript:document.write("<script>window.setTimeout(function(){window.close();},50);</script>")');}return i&&new g(i.contentWindow.document);},copyAttributes:function(i,j){var p=this;var k=p.$.attributes;j=j||{};for(var l=0;l<k.length;l++){var m=k[l],n=m.nodeName.toLowerCase(),o;if(n in j)continue;if(n=='checked'&&(o=p.getAttribute(n)))i.setAttribute(n,o);else if(m.specified||c&&m.nodeValue&&n=='value'){o=p.getAttribute(n);if(o===null)o=m.nodeValue;i.setAttribute(n,o);}}if(p.$.style.cssText!=='')i.$.style.cssText=p.$.style.cssText;},renameNode:function(i){var l=this;if(l.getName()==i)return;var j=l.getDocument(),k=new h(i,j);l.copyAttributes(k);l.moveChildren(k);l.getParent()&&l.$.parentNode.replaceChild(k.$,l.$);k.$['data-cke-expando']=l.$['data-cke-expando'];l.$=k.$;},getChild:function(i){var j=this.$;if(!i.slice)j=j.childNodes[i];else while(i.length>0&&j)j=j.childNodes[i.shift()];return j?new d.node(j):null;},getChildCount:function(){return this.$.childNodes.length;},disableContextMenu:function(){this.on('contextmenu',function(i){if(!i.data.getTarget().hasClass('cke_enable_context_menu'))i.data.preventDefault();});},getDirection:function(i){var j=this;return i?j.getComputedStyle('direction')||j.getDirection()||j.getDocument().$.dir||j.getDocument().getBody().getDirection(1):j.getStyle('direction')||j.getAttribute('dir');},data:function(i,j){i='data-'+i;if(j===undefined)return this.getAttribute(i);else if(j===false)this.removeAttribute(i);else this.setAttribute(i,j);return null;}});(function(){var i={width:['border-left-width','border-right-width','padding-left','padding-right'],height:['border-top-width','border-bottom-width','padding-top','padding-bottom']};function j(k){var l=0;for(var m=0,n=i[k].length;m<n;m++)l+=parseInt(this.getComputedStyle(i[k][m])||0,10)||0;return l;};h.prototype.setSize=function(k,l,m){if(typeof l=='number'){if(m&&!(c&&b.quirks))l-=j.call(this,k);this.setStyle(k,l+'px');}};h.prototype.getSize=function(k,l){var m=Math.max(this.$['offset'+e.capitalize(k)],this.$['client'+e.capitalize(k)])||0;if(l)m-=j.call(this,k);return m;};})();a.command=function(i,j){this.uiItems=[];this.exec=function(k){var l=this;if(l.state==0)return false;
+if(l.editorFocus)i.focus();if(l.fire('exec')===true)return true;return j.exec.call(l,i,k)!==false;};this.refresh=function(){if(this.fire('refresh')===true)return true;return j.refresh&&j.refresh.apply(this,arguments)!==false;};e.extend(this,j,{modes:{wysiwyg:1},editorFocus:1,state:2});a.event.call(this);};a.command.prototype={enable:function(){var i=this;if(i.state==0)i.setState(!i.preserveState||typeof i.previousState=='undefined'?2:i.previousState);},disable:function(){this.setState(0);},setState:function(i){var j=this;if(j.state==i)return false;j.previousState=j.state;j.state=i;j.fire('state');return true;},toggleState:function(){var i=this;if(i.state==2)i.setState(1);else if(i.state==1)i.setState(2);}};a.event.implementOn(a.command.prototype,true);a.ENTER_P=1;a.ENTER_BR=2;a.ENTER_DIV=3;a.config={customConfig:'config.js',autoUpdateElement:true,baseHref:'',contentsCss:a.basePath+'contents.css',contentsLangDirection:'ui',contentsLanguage:'',language:'',defaultLanguage:'en',enterMode:1,forceEnterMode:false,shiftEnterMode:2,corePlugins:'',docType:'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',bodyId:'',bodyClass:'',fullPage:false,height:200,plugins:'about,a11yhelp,basicstyles,bidi,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,dialogadvtab,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,iframe,image,indent,justify,keystrokes,link,list,liststyle,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',extraPlugins:'',removePlugins:'',protectedSource:[],tabIndex:0,theme:'default',skin:'kama',width:'',baseFloatZIndex:10000};var i=a.config;a.focusManager=function(j){if(j.focusManager)return j.focusManager;this.hasFocus=false;this._={editor:j};return this;};a.focusManager.prototype={focus:function(){var k=this;if(k._.timer)clearTimeout(k._.timer);if(!k.hasFocus){if(a.currentInstance)a.currentInstance.focusManager.forceBlur();var j=k._.editor;j.container.getChild(1).addClass('cke_focus');k.hasFocus=true;j.fire('focus');}},blur:function(){var j=this;if(j._.timer)clearTimeout(j._.timer);j._.timer=setTimeout(function(){delete j._.timer;j.forceBlur();},100);},forceBlur:function(){if(this.hasFocus){var j=this._.editor;j.container.getChild(1).removeClass('cke_focus');
+this.hasFocus=false;j.fire('blur');}}};(function(){var j={};a.lang={languages:{af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,el:1,'en-au':1,'en-ca':1,'en-gb':1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,'fr-ca':1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,lt:1,lv:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,'pt-br':1,pt:1,ro:1,ru:1,sk:1,sl:1,'sr-latn':1,sr:1,sv:1,th:1,tr:1,uk:1,vi:1,'zh-cn':1,zh:1},load:function(k,l,m){if(!k||!a.lang.languages[k])k=this.detect(l,k);if(!this[k])a.scriptLoader.load(a.getUrl('lang/'+k+'.js'),function(){m(k,this[k]);},this);else m(k,this[k]);},detect:function(k,l){var m=this.languages;l=l||navigator.userLanguage||navigator.language||k;var n=l.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),o=n[1],p=n[2];if(m[o+'-'+p])o=o+'-'+p;else if(!m[o])o=null;a.lang.detect=o?function(){return o;}:function(q){return q;};return o||k;}};})();a.scriptLoader=(function(){var j={},k={};return{load:function(l,m,n,o){var p=typeof l=='string';if(p)l=[l];if(!n)n=a;var q=l.length,r=[],s=[],t=function(y){if(m)if(p)m.call(n,y);else m.call(n,r,s);};if(q===0){t(true);return;}var u=function(y,z){(z?r:s).push(y);if(--q<=0){o&&a.document.getDocumentElement().removeStyle('cursor');t(z);}},v=function(y,z){j[y]=1;var A=k[y];delete k[y];for(var B=0;B<A.length;B++)A[B](y,z);},w=function(y){if(j[y]){u(y,true);return;}var z=k[y]||(k[y]=[]);z.push(u);if(z.length>1)return;var A=new h('script');A.setAttributes({type:'text/javascript',src:y});if(m)if(c)A.$.onreadystatechange=function(){if(A.$.readyState=='loaded'||A.$.readyState=='complete'){A.$.onreadystatechange=null;v(y,true);}};else{A.$.onload=function(){setTimeout(function(){v(y,true);},0);};A.$.onerror=function(){v(y,false);};}A.appendTo(a.document.getHead());};o&&a.document.getDocumentElement().setStyle('cursor','wait');for(var x=0;x<q;x++)w(l[x]);}};})();a.resourceManager=function(j,k){var l=this;l.basePath=j;l.fileName=k;l.registered={};l.loaded={};l.externals={};l._={waitingList:{}};};a.resourceManager.prototype={add:function(j,k){if(this.registered[j])throw '[CKEDITOR.resourceManager.add] The resource name "'+j+'" is already registered.';a.fire(j+e.capitalize(this.fileName)+'Ready',this.registered[j]=k||{});},get:function(j){return this.registered[j]||null;},getPath:function(j){var k=this.externals[j];return a.getUrl(k&&k.dir||this.basePath+j+'/');},getFilePath:function(j){var k=this.externals[j];return a.getUrl(this.getPath(j)+(k&&typeof k.file=='string'?k.file:this.fileName+'.js'));},addExternal:function(j,k,l){j=j.split(',');
+for(var m=0;m<j.length;m++){var n=j[m];this.externals[n]={dir:k,file:l};}},load:function(j,k,l){if(!e.isArray(j))j=j?[j]:[];var m=this.loaded,n=this.registered,o=[],p={},q={};for(var r=0;r<j.length;r++){var s=j[r];if(!s)continue;if(!m[s]&&!n[s]){var t=this.getFilePath(s);o.push(t);if(!(t in p))p[t]=[];p[t].push(s);}else q[s]=this.get(s);}a.scriptLoader.load(o,function(u,v){if(v.length)throw '[CKEDITOR.resourceManager.load] Resource name "'+p[v[0]].join(',')+'" was not found at "'+v[0]+'".';for(var w=0;w<u.length;w++){var x=p[u[w]];for(var y=0;y<x.length;y++){var z=x[y];q[z]=this.get(z);m[z]=1;}}k.call(l,q);},this);}};a.plugins=new a.resourceManager('plugins/','plugin');var j=a.plugins;j.load=e.override(j.load,function(k){return function(l,m,n){var o={},p=function(q){k.call(this,q,function(r){e.extend(o,r);var s=[];for(var t in r){var u=r[t],v=u&&u.requires;if(v)for(var w=0;w<v.length;w++){if(!o[v[w]])s.push(v[w]);}}if(s.length)p.call(this,s);else{for(t in o){u=o[t];if(u.onLoad&&!u.onLoad._called){u.onLoad();u.onLoad._called=1;}}if(m)m.call(n||window,o);}},this);};p.call(this,l);};});j.setLang=function(k,l,m){var n=this.get(k),o=n.langEntries||(n.langEntries={}),p=n.lang||(n.lang=[]);if(e.indexOf(p,l)==-1)p.push(l);o[l]=m;};a.skins=(function(){var k={},l={},m=function(n,o,p,q){var r=k[o];if(!n.skin){n.skin=r;if(r.init)r.init(n);}var s=function(B){for(var C=0;C<B.length;C++)B[C]=a.getUrl(l[o]+B[C]);};function t(B,C){return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(D,E,F,G){if(/^\/|^\w?:/.test(F))return D;else return 'url('+C+E+F+G+')';});};p=r[p];var u=!p||!!p._isLoaded;if(u)q&&q();else{var v=p._pending||(p._pending=[]);v.push(q);if(v.length>1)return;var w=!p.css||!p.css.length,x=!p.js||!p.js.length,y=function(){if(w&&x){p._isLoaded=1;for(var B=0;B<v.length;B++){if(v[B])v[B]();}}};if(!w){var z=p.css;if(e.isArray(z)){s(z);for(var A=0;A<z.length;A++)a.document.appendStyleSheet(z[A]);}else{z=t(z,a.getUrl(l[o]));a.document.appendStyleText(z);}p.css=z;w=1;}if(!x){s(p.js);a.scriptLoader.load(p.js,function(){x=1;y();});}y();}};return{add:function(n,o){k[n]=o;o.skinPath=l[n]||(l[n]=a.getUrl('skins/'+n+'/'));},load:function(n,o,p){var q=n.skinName,r=n.skinPath;if(k[q])m(n,q,o,p);else{l[q]=r;a.scriptLoader.load(a.getUrl(r+'skin.js'),function(){m(n,q,o,p);});}}};})();a.themes=new a.resourceManager('themes/','theme');a.ui=function(k){if(k.ui)return k.ui;this._={handlers:{},items:{},editor:k};return this;};var k=a.ui;k.prototype={add:function(l,m,n){this._.items[l]={type:m,command:n.command||null,args:Array.prototype.slice.call(arguments,2)};
+},create:function(l){var q=this;var m=q._.items[l],n=m&&q._.handlers[m.type],o=m&&m.command&&q._.editor.getCommand(m.command),p=n&&n.create.apply(q,m.args);m&&(p=e.extend(p,q._.editor.skin[m.type],true));if(o)o.uiItems.push(p);return p;},addHandler:function(l,m){this._.handlers[l]=m;}};a.event.implementOn(k);(function(){var l=0,m=function(){var x='editor'+ ++l;return a.instances&&a.instances[x]?m():x;},n={},o=function(x){var y=x.config.customConfig;if(!y)return false;y=a.getUrl(y);var z=n[y]||(n[y]={});if(z.fn){z.fn.call(x,x.config);if(a.getUrl(x.config.customConfig)==y||!o(x))x.fireOnce('customConfigLoaded');}else a.scriptLoader.load(y,function(){if(a.editorConfig)z.fn=a.editorConfig;else z.fn=function(){};o(x);});return true;},p=function(x,y){x.on('customConfigLoaded',function(){if(y){if(y.on)for(var z in y.on)x.on(z,y.on[z]);e.extend(x.config,y,true);delete x.config.on;}q(x);});if(y&&y.customConfig!=undefined)x.config.customConfig=y.customConfig;if(!o(x))x.fireOnce('customConfigLoaded');},q=function(x){var y=x.config.skin.split(','),z=y[0],A=a.getUrl(y[1]||'skins/'+z+'/');x.skinName=z;x.skinPath=A;x.skinClass='cke_skin_'+z;x.tabIndex=x.config.tabIndex||x.element.getAttribute('tabindex')||0;x.readOnly=!!(x.config.readOnly||x.element.getAttribute('disabled'));x.fireOnce('configLoaded');t(x);},r=function(x){a.lang.load(x.config.language,x.config.defaultLanguage,function(y,z){x.langCode=y;x.lang=e.prototypedCopy(z);if(b.gecko&&b.version<10900&&x.lang.dir=='rtl')x.lang.dir='ltr';x.fire('langLoaded');var A=x.config;A.contentsLangDirection=='ui'&&(A.contentsLangDirection=x.lang.dir);s(x);});},s=function(x){var y=x.config,z=y.plugins,A=y.extraPlugins,B=y.removePlugins;if(A){var C=new RegExp('(?:^|,)(?:'+A.replace(/\s*,\s*/g,'|')+')(?=,|$)','g');z=z.replace(C,'');z+=','+A;}if(B){C=new RegExp('(?:^|,)(?:'+B.replace(/\s*,\s*/g,'|')+')(?=,|$)','g');z=z.replace(C,'');}b.air&&(z+=',adobeair');j.load(z.split(','),function(D){var E=[],F=[],G=[];x.plugins=D;for(var H in D){var I=D[H],J=I.lang,K=j.getPath(H),L=null;I.path=K;if(J){L=e.indexOf(J,x.langCode)>=0?x.langCode:J[0];if(!I.langEntries||!I.langEntries[L])G.push(a.getUrl(K+'lang/'+L+'.js'));else{e.extend(x.lang,I.langEntries[L]);L=null;}}F.push(L);E.push(I);}a.scriptLoader.load(G,function(){var M=['beforeInit','init','afterInit'];for(var N=0;N<M.length;N++)for(var O=0;O<E.length;O++){var P=E[O];if(N===0&&F[O]&&P.lang)e.extend(x.lang,P.langEntries[F[O]]);if(P[M[N]])P[M[N]](x);}x.fire('pluginsLoaded');u(x);});});},t=function(x){a.skins.load(x,'editor',function(){r(x);
+});},u=function(x){var y=x.config.theme;a.themes.load(y,function(){var z=x.theme=a.themes.get(y);z.path=a.themes.getPath(y);z.build(x);if(x.config.autoUpdateElement)v(x);});},v=function(x){var y=x.element;if(x.elementMode==1&&y.is('textarea')){var z=y.$.form&&new h(y.$.form);if(z){function A(){x.updateElement();};z.on('submit',A);if(!z.$.submit.nodeName&&!z.$.submit.length)z.$.submit=e.override(z.$.submit,function(B){return function(){x.updateElement();if(B.apply)B.apply(this,arguments);else B();};});x.on('destroy',function(){z.removeListener('submit',A);});}}};function w(){var x,y=this._.commands,z=this.mode;if(!z)return;for(var A in y){x=y[A];x[x.startDisabled?'disable':this.readOnly&&!x.readOnly?'disable':x.modes[z]?'enable':'disable']();}};a.editor.prototype._init=function(){var z=this;var x=h.get(z._.element),y=z._.instanceConfig;delete z._.element;delete z._.instanceConfig;z._.commands={};z._.styles=[];z.element=x;z.name=x&&z.elementMode==1&&(x.getId()||x.getNameAtt())||m();if(z.name in a.instances)throw '[CKEDITOR.editor] The instance "'+z.name+'" already exists.';z.id=e.getNextId();z.config=e.prototypedCopy(i);z.ui=new k(z);z.focusManager=new a.focusManager(z);a.fire('instanceCreated',null,z);z.on('mode',w,null,null,1);z.on('readOnly',w,null,null,1);p(z,y);};})();e.extend(a.editor.prototype,{addCommand:function(l,m){return this._.commands[l]=new a.command(this,m);},addCss:function(l){this._.styles.push(l);},destroy:function(l){var m=this;if(!l)m.updateElement();m.fire('destroy');m.theme&&m.theme.destroy(m);a.remove(m);a.fire('instanceDestroyed',null,m);},execCommand:function(l,m){var n=this.getCommand(l),o={name:l,commandData:m,command:n};if(n&&n.state!=0)if(this.fire('beforeCommandExec',o)!==true){o.returnValue=n.exec(o.commandData);if(!n.async&&this.fire('afterCommandExec',o)!==true)return o.returnValue;}return false;},getCommand:function(l){return this._.commands[l];},getData:function(){var n=this;n.fire('beforeGetData');var l=n._.data;if(typeof l!='string'){var m=n.element;if(m&&n.elementMode==1)l=m.is('textarea')?m.getValue():m.getHtml();else l='';}l={dataValue:l};n.fire('getData',l);return l.dataValue;},getSnapshot:function(){var l=this.fire('getSnapshot');if(typeof l!='string'){var m=this.element;if(m&&this.elementMode==1)l=m.is('textarea')?m.getValue():m.getHtml();}return l;},loadSnapshot:function(l){this.fire('loadSnapshot',l);},setData:function(l,m,n){if(m)this.on('dataReady',function(p){p.removeListener();m.call(p.editor);});var o={dataValue:l};
+!n&&this.fire('setData',o);this._.data=o.dataValue;!n&&this.fire('afterSetData',o);},setReadOnly:function(l){l=l==undefined||l;if(this.readOnly!=l){this.readOnly=l;this.fire('readOnly');}},insertHtml:function(l){this.fire('insertHtml',l);},insertText:function(l){this.fire('insertText',l);},insertElement:function(l){this.fire('insertElement',l);},checkDirty:function(){return this.mayBeDirty&&this._.previousValue!==this.getSnapshot();},resetDirty:function(){if(this.mayBeDirty)this._.previousValue=this.getSnapshot();},updateElement:function(){var n=this;var l=n.element;if(l&&n.elementMode==1){var m=n.getData();if(n.config.htmlEncodeOutput)m=e.htmlEncode(m);if(l.is('textarea'))l.setValue(m);else l.setHtml(m);}}});a.on('loaded',function(){var l=a.editor._pending;if(l){delete a.editor._pending;for(var m=0;m<l.length;m++)l[m]._init();}});a.htmlParser=function(){this._={htmlPartsRegex:new RegExp("<(?:(?:\\/([^>]+)>)|(?:!--([\\S|\\s]*?)-->)|(?:([^\\s>]+)\\s*((?:(?:\"[^\"]*\")|(?:'[^']*')|[^\"'>])*)\\/?>))",'g')};};(function(){var l=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,m={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};a.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(n){var A=this;var o,p,q=0,r;while(o=A._.htmlPartsRegex.exec(n)){var s=o.index;if(s>q){var t=n.substring(q,s);if(r)r.push(t);else A.onText(t);}q=A._.htmlPartsRegex.lastIndex;if(p=o[1]){p=p.toLowerCase();if(r&&f.$cdata[p]){A.onCDATA(r.join(''));r=null;}if(!r){A.onTagClose(p);continue;}}if(r){r.push(o[0]);continue;}if(p=o[3]){p=p.toLowerCase();if(/="/.test(p))continue;var u={},v,w=o[4],x=!!(w&&w.charAt(w.length-1)=='/');if(w)while(v=l.exec(w)){var y=v[1].toLowerCase(),z=v[2]||v[3]||v[4]||'';if(!z&&m[y])u[y]=y;else u[y]=z;}A.onTagOpen(p,u,x);if(!r&&f.$cdata[p])r=[];continue;}if(p=o[2])A.onComment(p);}if(n.length>q)A.onText(n.substring(q,n.length));}};})();a.htmlParser.comment=function(l){this.value=l;this._={isBlockLike:false};};a.htmlParser.comment.prototype={type:8,writeHtml:function(l,m){var n=this.value;if(m){if(!(n=m.onComment(n,this)))return;if(typeof n!='string'){n.parent=this.parent;n.writeHtml(l,m);return;}}l.comment(n);}};(function(){a.htmlParser.text=function(l){this.value=l;this._={isBlockLike:false};};a.htmlParser.text.prototype={type:3,writeHtml:function(l,m){var n=this.value;
+if(m&&!(n=m.onText(n,this)))return;l.text(n);}};})();(function(){a.htmlParser.cdata=function(l){this.value=l;};a.htmlParser.cdata.prototype={type:3,writeHtml:function(l){l.write(this.value);}};})();a.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:true,hasInlineStarted:false};};(function(){var l=e.extend({table:1,ul:1,ol:1,dl:1},f.table,f.ul,f.ol,f.dl),m=c&&b.version<8?{dd:1,dt:1}:{},n={ol:1,ul:1},o=e.extend({},{html:1},f.html,f.body,f.head,{style:1,script:1});function p(q){return q.name=='a'&&q.attributes.href||f.$removeEmpty[q.name];};a.htmlParser.fragment.fromHtml=function(q,r,s){var t=new a.htmlParser(),u=s||new a.htmlParser.fragment(),v=[],w=[],x=u,y=false,z=false;function A(D){var E;if(v.length>0)for(var F=0;F<v.length;F++){var G=v[F],H=G.name,I=f[H],J=x.name&&f[x.name];if((!J||J[H])&&(!D||!I||I[D]||!f[D])){if(!E){B();E=1;}G=G.clone();G.parent=x;x=G;v.splice(F,1);F--;}else if(H==x.name)C(x,x.parent,1),F--;}};function B(){while(w.length)x.add(w.shift());};function C(D,E,F){if(D.previous!==undefined)return;E=E||x||u;var G=x;if(r&&(!E.type||E.name=='body')){var H,I;if(D.attributes&&(I=D.attributes['data-cke-real-element-type']))H=I;else H=D.name;if(H&&!(H in f.$body||H=='body'||D.isOrphan)){x=E;t.onTagOpen(r,{});D.returnPoint=E=x;}}if(D._.isBlockLike&&D.name!='pre'&&D.name!='textarea'){var J=D.children.length,K=D.children[J-1],L;if(K&&K.type==3)if(!(L=e.rtrim(K.value)))D.children.length=J-1;else K.value=L;}E.add(D);if(D.name=='pre')z=false;if(D.name=='textarea')y=false;if(D.returnPoint){x=D.returnPoint;delete D.returnPoint;}else x=F?E:G;};t.onTagOpen=function(D,E,F,G){var H=new a.htmlParser.element(D,E);if(H.isUnknown&&F)H.isEmpty=true;H.isOptionalClose=D in m||G;if(p(H)){v.push(H);return;}else if(D=='pre')z=true;else if(D=='br'&&z){x.add(new a.htmlParser.text('\n'));return;}else if(D=='textarea')y=true;if(D=='br'){w.push(H);return;}while(1){var I=x.name,J=I?f[I]||(x._.isBlockLike?f.div:f.span):o;if(!H.isUnknown&&!x.isUnknown&&!J[D]){if(x.isOptionalClose)t.onTagClose(I);else if(D in n&&I in n){var K=x.children,L=K[K.length-1];if(!(L&&L.name=='li'))C(L=new a.htmlParser.element('li'),x);!H.returnPoint&&(H.returnPoint=x);x=L;}else if(D in f.$listItem&&I!=D)t.onTagOpen(D=='li'?'ul':'dl',{},0,1);else if(I in l&&I!=D){!H.returnPoint&&(H.returnPoint=x);x=x.parent;}else{if(I in f.$inline)v.unshift(x);if(x.parent)C(x,x.parent,1);else{H.isOrphan=1;break;}}}else break;}A(D);B();H.parent=x;if(H.isEmpty)C(H);else x=H;};t.onTagClose=function(D){for(var E=v.length-1;
+E>=0;E--){if(D==v[E].name){v.splice(E,1);return;}}var F=[],G=[],H=x;while(H!=u&&H.name!=D){if(!H._.isBlockLike)G.unshift(H);F.push(H);H=H.returnPoint||H.parent;}if(H!=u){for(E=0;E<F.length;E++){var I=F[E];C(I,I.parent);}x=H;if(H._.isBlockLike)B();C(H,H.parent);if(H==x)x=x.parent;v=v.concat(G);}if(D=='body')r=false;};t.onText=function(D){if((!x._.hasInlineStarted||w.length)&&!z&&!y){D=e.ltrim(D);if(D.length===0)return;}var E=x.name,F=E?f[E]||(x._.isBlockLike?f.div:f.span):o;if(!y&&!F['#']&&E in l){t.onTagOpen(E in n?'li':E=='dl'?'dd':E=='table'?'tr':E=='tr'?'td':'');t.onText(D);return;}B();A();if(r&&(!x.type||x.name=='body')&&e.trim(D))this.onTagOpen(r,{},0,1);if(!z&&!y)D=D.replace(/[\t\r\n ]{2,}|[\t\r\n]/g,' ');x.add(new a.htmlParser.text(D));};t.onCDATA=function(D){x.add(new a.htmlParser.cdata(D));};t.onComment=function(D){B();A();x.add(new a.htmlParser.comment(D));};t.parse(q);B(!c&&1);while(x!=u)C(x,x.parent,1);return u;};a.htmlParser.fragment.prototype={add:function(q,r){var t=this;isNaN(r)&&(r=t.children.length);var s=r>0?t.children[r-1]:null;if(s){if(q._.isBlockLike&&s.type==3){s.value=e.rtrim(s.value);if(s.value.length===0){t.children.pop();t.add(q);return;}}s.next=q;}q.previous=s;q.parent=t;t.children.splice(r,0,q);t._.hasInlineStarted=q.type==3||q.type==1&&!q._.isBlockLike;},writeHtml:function(q,r){var s;this.filterChildren=function(){var t=new a.htmlParser.basicWriter();this.writeChildrenHtml.call(this,t,r,true);var u=t.getHtml();this.children=new a.htmlParser.fragment.fromHtml(u).children;s=1;};!this.name&&r&&r.onFragment(this);this.writeChildrenHtml(q,s?null:r);},writeChildrenHtml:function(q,r){for(var s=0;s<this.children.length;s++)this.children[s].writeHtml(q,r);}};})();a.htmlParser.element=function(l,m){var s=this;s.name=l;s.attributes=m||(m={});s.children=[];var n=m['data-cke-real-element-type']||l||'',o=n.match(/^cke:(.*)/);o&&(n=o[1]);var p=f,q=!!(p.$nonBodyContent[n]||p.$block[n]||p.$listItem[n]||p.$tableContent[n]||p.$nonEditable[n]||n=='br'),r=!!p.$empty[l];s.isEmpty=r;s.isUnknown=!p[l];s._={isBlockLike:q,hasInlineStarted:r||!q};};a.htmlParser.cssStyle=function(){var l,m=arguments[0],n={};l=m instanceof a.htmlParser.element?m.attributes.style:m;(l||'').replace(/"/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(o,p,q){p=='font-family'&&(q=q.replace(/["']/g,''));n[p.toLowerCase()]=q;});return{rules:n,populate:function(o){var p=this.toString();if(p)o instanceof h?o.setAttribute('style',p):o instanceof a.htmlParser.element?o.attributes.style=p:o.style=p;
+},'toString':function(){var o=[];for(var p in n)n[p]&&o.push(p,':',n[p],';');return o.join('');}};};(function(){var l=function(m,n){m=m[0];n=n[0];return m<n?-1:m>n?1:0;};a.htmlParser.element.prototype={type:1,add:a.htmlParser.fragment.prototype.add,clone:function(){return new a.htmlParser.element(this.name,this.attributes);},writeHtml:function(m,n){var o=this.attributes,p=this,q=p.name,r,s,t,u;p.filterChildren=function(){if(!u){var B=new a.htmlParser.basicWriter();a.htmlParser.fragment.prototype.writeChildrenHtml.call(p,B,n);p.children=new a.htmlParser.fragment.fromHtml(B.getHtml(),0,p.clone()).children;u=1;}};if(n){for(;;){if(!(q=n.onElementName(q)))return;p.name=q;if(!(p=n.onElement(p)))return;p.parent=this.parent;if(p.name==q)break;if(p.type!=1){p.writeHtml(m,n);return;}q=p.name;if(!q){for(var v=0,w=this.children.length;v<w;v++)this.children[v].parent=p.parent;this.writeChildrenHtml.call(p,m,u?null:n);return;}}o=p.attributes;}m.openTag(q,o);var x=[];for(var y=0;y<2;y++)for(r in o){s=r;t=o[r];if(y==1)x.push([r,t]);else if(n){for(;;){if(!(s=n.onAttributeName(r))){delete o[r];break;}else if(s!=r){delete o[r];r=s;continue;}else break;}if(s)if((t=n.onAttribute(p,s,t))===false)delete o[s];else o[s]=t;}}if(m.sortAttributes)x.sort(l);var z=x.length;for(y=0;y<z;y++){var A=x[y];m.attribute(A[0],A[1]);}m.openTagClose(q,p.isEmpty);if(!p.isEmpty){this.writeChildrenHtml.call(p,m,u?null:n);m.closeTag(q);}},writeChildrenHtml:function(m,n){a.htmlParser.fragment.prototype.writeChildrenHtml.apply(this,arguments);}};})();(function(){a.htmlParser.filter=e.createClass({$:function(q){this._={elementNames:[],attributeNames:[],elements:{$length:0},attributes:{$length:0}};if(q)this.addRules(q,10);},proto:{addRules:function(q,r){var s=this;if(typeof r!='number')r=10;m(s._.elementNames,q.elementNames,r);m(s._.attributeNames,q.attributeNames,r);n(s._.elements,q.elements,r);n(s._.attributes,q.attributes,r);s._.text=o(s._.text,q.text,r)||s._.text;s._.comment=o(s._.comment,q.comment,r)||s._.comment;s._.root=o(s._.root,q.root,r)||s._.root;},onElementName:function(q){return l(q,this._.elementNames);},onAttributeName:function(q){return l(q,this._.attributeNames);},onText:function(q){var r=this._.text;return r?r.filter(q):q;},onComment:function(q,r){var s=this._.comment;return s?s.filter(q,r):q;},onFragment:function(q){var r=this._.root;return r?r.filter(q):q;},onElement:function(q){var v=this;var r=[v._.elements['^'],v._.elements[q.name],v._.elements.$],s,t;for(var u=0;u<3;u++){s=r[u];if(s){t=s.filter(q,v);
+if(t===false)return null;if(t&&t!=q)return v.onNode(t);if(q.parent&&!q.name)break;}}return q;},onNode:function(q){var r=q.type;return r==1?this.onElement(q):r==3?new a.htmlParser.text(this.onText(q.value)):r==8?new a.htmlParser.comment(this.onComment(q.value)):null;},onAttribute:function(q,r,s){var t=this._.attributes[r];if(t){var u=t.filter(s,q,this);if(u===false)return false;if(typeof u!='undefined')return u;}return s;}}});function l(q,r){for(var s=0;q&&s<r.length;s++){var t=r[s];q=q.replace(t[0],t[1]);}return q;};function m(q,r,s){if(typeof r=='function')r=[r];var t,u,v=q.length,w=r&&r.length;if(w){for(t=0;t<v&&q[t].pri<s;t++){}for(u=w-1;u>=0;u--){var x=r[u];if(x){x.pri=s;q.splice(t,0,x);}}}};function n(q,r,s){if(r)for(var t in r){var u=q[t];q[t]=o(u,r[t],s);if(!u)q.$length++;}};function o(q,r,s){if(r){r.pri=s;if(q){if(!q.splice){if(q.pri>s)q=[r,q];else q=[q,r];q.filter=p;}else m(q,r,s);return q;}else{r.filter=r;return r;}}};function p(q){var r=q.type||q instanceof a.htmlParser.fragment;for(var s=0;s<this.length;s++){if(r)var t=q.type,u=q.name;var v=this[s],w=v.apply(window,arguments);if(w===false)return w;if(r){if(w&&(w.name!=u||w.type!=t))return w;}else if(typeof w!='string')return w;w!=undefined&&(q=w);}return q;};})();a.htmlParser.basicWriter=e.createClass({$:function(){this._={output:[]};},proto:{openTag:function(l,m){this._.output.push('<',l);},openTagClose:function(l,m){if(m)this._.output.push(' />');else this._.output.push('>');},attribute:function(l,m){if(typeof m=='string')m=e.htmlEncodeAttr(m);this._.output.push(' ',l,'="',m,'"');},closeTag:function(l){this._.output.push('</',l,'>');},text:function(l){this._.output.push(l);},comment:function(l){this._.output.push('<!--',l,'-->');},write:function(l){this._.output.push(l);},reset:function(){this._.output=[];this._.indent=false;},getHtml:function(l){var m=this._.output.join('');if(l)this.reset();return m;}}});delete a.loadFullCore;a.instances={};a.document=new g(document);a.add=function(l){a.instances[l.name]=l;l.on('focus',function(){if(a.currentInstance!=l){a.currentInstance=l;a.fire('currentInstance');}});l.on('blur',function(){if(a.currentInstance==l){a.currentInstance=null;a.fire('currentInstance');}});};a.remove=function(l){delete a.instances[l.name];};a.on('instanceDestroyed',function(){if(e.isEmpty(this.instances))a.fire('reset');});a.TRISTATE_ON=1;a.TRISTATE_OFF=2;a.TRISTATE_DISABLED=0;d.comment=function(l,m){if(typeof l=='string')l=(m?m.$:document).createComment(l);d.domObject.call(this,l);
+};d.comment.prototype=new d.node();e.extend(d.comment.prototype,{type:8,getOuterHtml:function(){return '<!--'+this.$.nodeValue+'-->';}});(function(){var l={address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1,legend:1,caption:1},m={body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,form:1,fieldset:1},n=function(o){var p=o.getChildren();for(var q=0,r=p.count();q<r;q++){var s=p.getItem(q);if(s.type==1&&f.$block[s.getName()])return true;}return false;};d.elementPath=function(o){var u=this;var p=null,q=null,r=[],s=o;while(s){if(s.type==1){if(!u.lastElement)u.lastElement=s;var t=s.getName();if(!q){if(!p&&l[t])p=s;if(m[t])if(!p&&t=='div'&&!n(s))p=s;else q=s;}r.push(s);if(t=='body')break;}s=s.getParent();}u.block=p;u.blockLimit=q;u.elements=r;};})();d.elementPath.prototype={compare:function(l){var m=this.elements,n=l&&l.elements;if(!n||m.length!=n.length)return false;for(var o=0;o<m.length;o++){if(!m[o].equals(n[o]))return false;}return true;},contains:function(l){var m=this.elements;for(var n=0;n<m.length;n++){if(m[n].getName() in l)return m[n];}return null;}};d.text=function(l,m){if(typeof l=='string')l=(m?m.$:document).createTextNode(l);this.$=l;};d.text.prototype=new d.node();e.extend(d.text.prototype,{type:3,getLength:function(){return this.$.nodeValue.length;},getText:function(){return this.$.nodeValue;},setText:function(l){this.$.nodeValue=l;},split:function(l){var q=this;if(c&&l==q.getLength()){var m=q.getDocument().createText('');m.insertAfter(q);return m;}var n=q.getDocument(),o=new d.text(q.$.splitText(l),n);if(b.ie8){var p=new d.text('',n);p.insertAfter(o);p.remove();}return o;},substring:function(l,m){if(typeof m!='number')return this.$.nodeValue.substr(l);else return this.$.nodeValue.substring(l,m);}});d.documentFragment=function(l){l=l||a.document;this.$=l.$.createDocumentFragment();};e.extend(d.documentFragment.prototype,h.prototype,{type:11,insertAfterNode:function(l){l=l.$;l.parentNode.insertBefore(this.$,l.nextSibling);}},true,{append:1,appendBogus:1,getFirst:1,getLast:1,appendTo:1,moveChildren:1,insertBefore:1,insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1});(function(){function l(s,t){var u=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(u.collapsed){this.end();return null;}u.optimize();}var v,w=u.startContainer,x=u.endContainer,y=u.startOffset,z=u.endOffset,A,B=this.guard,C=this.type,D=s?'getPreviousSourceNode':'getNextSourceNode';
+if(!s&&!this._.guardLTR){var E=x.type==1?x:x.getParent(),F=x.type==1?x.getChild(z):x.getNext();this._.guardLTR=function(J,K){return(!K||!E.equals(J))&&(!F||!J.equals(F))&&(J.type!=1||!K||J.getName()!='body');};}if(s&&!this._.guardRTL){var G=w.type==1?w:w.getParent(),H=w.type==1?y?w.getChild(y-1):null:w.getPrevious();this._.guardRTL=function(J,K){return(!K||!G.equals(J))&&(!H||!J.equals(H))&&(J.type!=1||!K||J.getName()!='body');};}var I=s?this._.guardRTL:this._.guardLTR;if(B)A=function(J,K){if(I(J,K)===false)return false;return B(J,K);};else A=I;if(this.current)v=this.current[D](false,C,A);else{if(s){v=x;if(v.type==1)if(z>0)v=v.getChild(z-1);else v=A(v,true)===false?null:v.getPreviousSourceNode(true,C,A);}else{v=w;if(v.type==1)if(!(v=v.getChild(y)))v=A(w,true)===false?null:w.getNextSourceNode(true,C,A);}if(v&&A(v)===false)v=null;}while(v&&!this._.end){this.current=v;if(!this.evaluator||this.evaluator(v)!==false){if(!t)return v;}else if(t&&this.evaluator)return false;v=v[D](false,C,A);}this.end();return this.current=null;};function m(s){var t,u=null;while(t=l.call(this,s))u=t;return u;};d.walker=e.createClass({$:function(s){this.range=s;this._={};},proto:{end:function(){this._.end=1;},next:function(){return l.call(this);},previous:function(){return l.call(this,1);},checkForward:function(){return l.call(this,0,1)!==false;},checkBackward:function(){return l.call(this,1,1)!==false;},lastForward:function(){return m.call(this);},lastBackward:function(){return m.call(this,1);},reset:function(){delete this.current;this._={};}}});var n={block:1,'list-item':1,table:1,'table-row-group':1,'table-header-group':1,'table-footer-group':1,'table-row':1,'table-column-group':1,'table-column':1,'table-cell':1,'table-caption':1};h.prototype.isBlockBoundary=function(s){var t=s?e.extend({},f.$block,s||{}):f.$block;return this.getComputedStyle('float')=='none'&&n[this.getComputedStyle('display')]||t[this.getName()];};d.walker.blockBoundary=function(s){return function(t,u){return!(t.type==1&&t.isBlockBoundary(s));};};d.walker.listItemBoundary=function(){return this.blockBoundary({br:1});};d.walker.bookmark=function(s,t){function u(v){return v&&v.getName&&v.getName()=='span'&&v.data('cke-bookmark');};return function(v){var w,x;w=v&&!v.getName&&(x=v.getParent())&&u(x);w=s?w:w||u(v);return!!(t^w);};};d.walker.whitespaces=function(s){return function(t){var u=t&&t.type==3&&!e.trim(t.getText());return!!(s^u);};};d.walker.invisible=function(s){var t=d.walker.whitespaces();return function(u){var v=t(u)||u.is&&!u.$.offsetHeight;
+return!!(s^v);};};d.walker.nodeType=function(s,t){return function(u){return!!(t^u.type==s);};};d.walker.bogus=function(s,t){function u(v){return!p(v)&&!q(v);};return function(v){var w=v.getParent(),x=!c?v.is&&v.is('br'):v.getText&&o.test(v.getText());x=x&&w.isBlockBoundary()&&!!w.getLast(u);return!!(t^x);};};var o=/^[\t\r\n ]*(?: |\xa0)$/,p=d.walker.whitespaces(),q=d.walker.bookmark(),r=function(s){return q(s)||p(s)||s.type==1&&s.getName() in f.$inline&&!(s.getName() in f.$empty);};h.prototype.getBogus=function(){var s=this;do s=s.getPreviousSourceNode();while(r(s));if(s&&(!c?s.is&&s.is('br'):s.getText&&o.test(s.getText())))return s;return false;};})();d.range=function(l){var m=this;m.startContainer=null;m.startOffset=null;m.endContainer=null;m.endOffset=null;m.collapsed=true;m.document=l;};(function(){var l=function(u){u.collapsed=u.startContainer&&u.endContainer&&u.startContainer.equals(u.endContainer)&&u.startOffset==u.endOffset;},m=function(u,v,w,x){u.optimizeBookmark();var y=u.startContainer,z=u.endContainer,A=u.startOffset,B=u.endOffset,C,D;if(z.type==3)z=z.split(B);else if(z.getChildCount()>0)if(B>=z.getChildCount()){z=z.append(u.document.createText(''));D=true;}else z=z.getChild(B);if(y.type==3){y.split(A);if(y.equals(z))z=y.getNext();}else if(!A){y=y.getFirst().insertBeforeMe(u.document.createText(''));C=true;}else if(A>=y.getChildCount()){y=y.append(u.document.createText(''));C=true;}else y=y.getChild(A).getPrevious();var E=y.getParents(),F=z.getParents(),G,H,I;for(G=0;G<E.length;G++){H=E[G];I=F[G];if(!H.equals(I))break;}var J=w,K,L,M,N;for(var O=G;O<E.length;O++){K=E[O];if(J&&!K.equals(y))L=J.append(K.clone());M=K.getNext();while(M){if(M.equals(F[O])||M.equals(z))break;N=M.getNext();if(v==2)J.append(M.clone(true));else{M.remove();if(v==1)J.append(M);}M=N;}if(J)J=L;}J=w;for(var P=G;P<F.length;P++){K=F[P];if(v>0&&!K.equals(z))L=J.append(K.clone());if(!E[P]||K.$.parentNode!=E[P].$.parentNode){M=K.getPrevious();while(M){if(M.equals(E[P])||M.equals(y))break;N=M.getPrevious();if(v==2)J.$.insertBefore(M.$.cloneNode(true),J.$.firstChild);else{M.remove();if(v==1)J.$.insertBefore(M.$,J.$.firstChild);}M=N;}}if(J)J=L;}if(v==2){var Q=u.startContainer;if(Q.type==3){Q.$.data+=Q.$.nextSibling.data;Q.$.parentNode.removeChild(Q.$.nextSibling);}var R=u.endContainer;if(R.type==3&&R.$.nextSibling){R.$.data+=R.$.nextSibling.data;R.$.parentNode.removeChild(R.$.nextSibling);}}else{if(H&&I&&(y.$.parentNode!=H.$.parentNode||z.$.parentNode!=I.$.parentNode)){var S=I.getIndex();
+if(C&&I.$.parentNode==y.$.parentNode)S--;if(x&&H.type==1){var T=h.createFromHtml('<span data-cke-bookmark="1" style="display:none"> </span>',u.document);T.insertAfter(H);H.mergeSiblings(false);u.moveToBookmark({startNode:T});}else u.setStart(I.getParent(),S);}u.collapse(true);}if(C)y.remove();if(D&&z.$.parentNode)z.remove();},n={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1};function o(u){var v=false,w=d.walker.bookmark(true);return function(x){if(w(x))return true;if(x.type==3){if(x.hasAscendant('pre')||e.trim(x.getText()).length)return false;}else if(x.type==1)if(!n[x.getName()])if(!u&&!c&&x.getName()=='br'&&!v)v=true;else return false;return true;};};var p=d.walker.bogus();function q(u){return function(v){return!u&&p(v)||(v.type==3?!e.trim(v.getText())||!!v.getParent().data('cke-bookmark'):v.getName() in f.$removeEmpty);};};var r=new d.walker.whitespaces(),s=new d.walker.bookmark();function t(u){return!r(u)&&!s(u);};d.range.prototype={clone:function(){var v=this;var u=new d.range(v.document);u.startContainer=v.startContainer;u.startOffset=v.startOffset;u.endContainer=v.endContainer;u.endOffset=v.endOffset;u.collapsed=v.collapsed;return u;},collapse:function(u){var v=this;if(u){v.endContainer=v.startContainer;v.endOffset=v.startOffset;}else{v.startContainer=v.endContainer;v.startOffset=v.endOffset;}v.collapsed=true;},cloneContents:function(){var u=new d.documentFragment(this.document);if(!this.collapsed)m(this,2,u);return u;},deleteContents:function(u){if(this.collapsed)return;m(this,0,null,u);},extractContents:function(u){var v=new d.documentFragment(this.document);if(!this.collapsed)m(this,1,v,u);return v;},createBookmark:function(u){var A=this;var v,w,x,y,z=A.collapsed;v=A.document.createElement('span');v.data('cke-bookmark',1);v.setStyle('display','none');v.setHtml(' ');if(u){x='cke_bm_'+e.getNextNumber();v.setAttribute('id',x+'S');}if(!z){w=v.clone();w.setHtml(' ');if(u)w.setAttribute('id',x+'E');y=A.clone();y.collapse();y.insertNode(w);}y=A.clone();y.collapse(true);y.insertNode(v);if(w){A.setStartAfter(v);A.setEndBefore(w);}else A.moveToPosition(v,4);return{startNode:u?x+'S':v,endNode:u?x+'E':w,serializable:u,collapsed:z};},createBookmark2:function(u){var C=this;var v=C.startContainer,w=C.endContainer,x=C.startOffset,y=C.endOffset,z=C.collapsed,A,B;if(!v||!w)return{start:0,end:0};if(u){if(v.type==1){A=v.getChild(x);
+if(A&&A.type==3&&x>0&&A.getPrevious().type==3){v=A;x=0;}if(A&&A.type==1)x=A.getIndex(1);}while(v.type==3&&(B=v.getPrevious())&&B.type==3){v=B;x+=B.getLength();}if(!z){if(w.type==1){A=w.getChild(y);if(A&&A.type==3&&y>0&&A.getPrevious().type==3){w=A;y=0;}if(A&&A.type==1)y=A.getIndex(1);}while(w.type==3&&(B=w.getPrevious())&&B.type==3){w=B;y+=B.getLength();}}}return{start:v.getAddress(u),end:z?null:w.getAddress(u),startOffset:x,endOffset:y,normalized:u,collapsed:z,is2:true};},moveToBookmark:function(u){var C=this;if(u.is2){var v=C.document.getByAddress(u.start,u.normalized),w=u.startOffset,x=u.end&&C.document.getByAddress(u.end,u.normalized),y=u.endOffset;C.setStart(v,w);if(x)C.setEnd(x,y);else C.collapse(true);}else{var z=u.serializable,A=z?C.document.getById(u.startNode):u.startNode,B=z?C.document.getById(u.endNode):u.endNode;C.setStartBefore(A);A.remove();if(B){C.setEndBefore(B);B.remove();}else C.collapse(true);}},getBoundaryNodes:function(){var z=this;var u=z.startContainer,v=z.endContainer,w=z.startOffset,x=z.endOffset,y;if(u.type==1){y=u.getChildCount();if(y>w)u=u.getChild(w);else if(y<1)u=u.getPreviousSourceNode();else{u=u.$;while(u.lastChild)u=u.lastChild;u=new d.node(u);u=u.getNextSourceNode()||u;}}if(v.type==1){y=v.getChildCount();if(y>x)v=v.getChild(x).getPreviousSourceNode(true);else if(y<1)v=v.getPreviousSourceNode();else{v=v.$;while(v.lastChild)v=v.lastChild;v=new d.node(v);}}if(u.getPosition(v)&2)u=v;return{startNode:u,endNode:v};},getCommonAncestor:function(u,v){var z=this;var w=z.startContainer,x=z.endContainer,y;if(w.equals(x)){if(u&&w.type==1&&z.startOffset==z.endOffset-1)y=w.getChild(z.startOffset);else y=w;}else y=w.getCommonAncestor(x);return v&&!y.is?y.getParent():y;},optimize:function(){var w=this;var u=w.startContainer,v=w.startOffset;if(u.type!=1)if(!v)w.setStartBefore(u);else if(v>=u.getLength())w.setStartAfter(u);u=w.endContainer;v=w.endOffset;if(u.type!=1)if(!v)w.setEndBefore(u);else if(v>=u.getLength())w.setEndAfter(u);},optimizeBookmark:function(){var w=this;var u=w.startContainer,v=w.endContainer;if(u.is&&u.is('span')&&u.data('cke-bookmark'))w.setStartAt(u,3);if(v&&v.is&&v.is('span')&&v.data('cke-bookmark'))w.setEndAt(v,4);},trim:function(u,v){var C=this;var w=C.startContainer,x=C.startOffset,y=C.collapsed;if((!u||y)&&w&&w.type==3){if(!x){x=w.getIndex();w=w.getParent();}else if(x>=w.getLength()){x=w.getIndex()+1;w=w.getParent();}else{var z=w.split(x);x=w.getIndex()+1;w=w.getParent();if(C.startContainer.equals(C.endContainer))C.setEnd(z,C.endOffset-C.startOffset);
+else if(w.equals(C.endContainer))C.endOffset+=1;}C.setStart(w,x);if(y){C.collapse(true);return;}}var A=C.endContainer,B=C.endOffset;if(!(v||y)&&A&&A.type==3){if(!B){B=A.getIndex();A=A.getParent();}else if(B>=A.getLength()){B=A.getIndex()+1;A=A.getParent();}else{A.split(B);B=A.getIndex()+1;A=A.getParent();}C.setEnd(A,B);}},enlarge:function(u,v){switch(u){case 1:if(this.collapsed)return;var w=this.getCommonAncestor(),x=this.document.getBody(),y,z,A,B,C,D=false,E,F,G=this.startContainer,H=this.startOffset;if(G.type==3){if(H){G=!e.trim(G.substring(0,H)).length&&G;D=!!G;}if(G)if(!(B=G.getPrevious()))A=G.getParent();}else{if(H)B=G.getChild(H-1)||G.getLast();if(!B)A=G;}while(A||B){if(A&&!B){if(!C&&A.equals(w))C=true;if(!x.contains(A))break;if(!D||A.getComputedStyle('display')!='inline'){D=false;if(C)y=A;else this.setStartBefore(A);}B=A.getPrevious();}while(B){E=false;if(B.type==8){B=B.getPrevious();continue;}else if(B.type==3){F=B.getText();if(/[^\s\ufeff]/.test(F))B=null;E=/[\s\ufeff]$/.test(F);}else if((B.$.offsetWidth>0||v&&B.is('br'))&&!B.data('cke-bookmark'))if(D&&f.$removeEmpty[B.getName()]){F=B.getText();if(/[^\s\ufeff]/.test(F))B=null;else{var I=B.$.getElementsByTagName('*');for(var J=0,K;K=I[J++];){if(!f.$removeEmpty[K.nodeName.toLowerCase()]){B=null;break;}}}if(B)E=!!F.length;}else B=null;if(E)if(D){if(C)y=A;else if(A)this.setStartBefore(A);}else D=true;if(B){var L=B.getPrevious();if(!A&&!L){A=B;B=null;break;}B=L;}else A=null;}if(A)A=A.getParent();}G=this.endContainer;H=this.endOffset;A=B=null;C=D=false;if(G.type==3){G=!e.trim(G.substring(H)).length&&G;D=!(G&&G.getLength());if(G)if(!(B=G.getNext()))A=G.getParent();}else{B=G.getChild(H);if(!B)A=G;}while(A||B){if(A&&!B){if(!C&&A.equals(w))C=true;if(!x.contains(A))break;if(!D||A.getComputedStyle('display')!='inline'){D=false;if(C)z=A;else if(A)this.setEndAfter(A);}B=A.getNext();}while(B){E=false;if(B.type==3){F=B.getText();if(/[^\s\ufeff]/.test(F))B=null;E=/^[\s\ufeff]/.test(F);}else if(B.type==1){if((B.$.offsetWidth>0||v&&B.is('br'))&&!B.data('cke-bookmark'))if(D&&f.$removeEmpty[B.getName()]){F=B.getText();if(/[^\s\ufeff]/.test(F))B=null;else{I=B.$.getElementsByTagName('*');for(J=0;K=I[J++];){if(!f.$removeEmpty[K.nodeName.toLowerCase()]){B=null;break;}}}if(B)E=!!F.length;}else B=null;}else E=1;if(E)if(D)if(C)z=A;else this.setEndAfter(A);if(B){L=B.getNext();if(!A&&!L){A=B;B=null;break;}B=L;}else A=null;}if(A)A=A.getParent();}if(y&&z){w=y.contains(z)?z:y;this.setStartBefore(w);this.setEndAfter(w);}break;case 2:case 3:var M=new d.range(this.document);
+x=this.document.getBody();M.setStartAt(x,1);M.setEnd(this.startContainer,this.startOffset);var N=new d.walker(M),O,P,Q=d.walker.blockBoundary(u==3?{br:1}:null),R=function(X){var Y=Q(X);if(!Y)O=X;return Y;},S=function(X){var Y=R(X);if(!Y&&X.is&&X.is('br'))P=X;return Y;};N.guard=R;A=N.lastBackward();O=O||x;this.setStartAt(O,!O.is('br')&&(!A&&this.checkStartOfBlock()||A&&O.contains(A))?1:4);if(u==3){var T=this.clone();N=new d.walker(T);var U=d.walker.whitespaces(),V=d.walker.bookmark();N.evaluator=function(X){return!U(X)&&!V(X);};var W=N.previous();if(W&&W.type==1&&W.is('br'))return;}M=this.clone();M.collapse();M.setEndAt(x,2);N=new d.walker(M);N.guard=u==3?S:R;O=null;A=N.lastForward();O=O||x;this.setEndAt(O,!A&&this.checkEndOfBlock()||A&&O.contains(A)?2:3);if(P)this.setEndAfter(P);}},shrink:function(u,v){if(!this.collapsed){u=u||2;var w=this.clone(),x=this.startContainer,y=this.endContainer,z=this.startOffset,A=this.endOffset,B=this.collapsed,C=1,D=1;if(x&&x.type==3)if(!z)w.setStartBefore(x);else if(z>=x.getLength())w.setStartAfter(x);else{w.setStartBefore(x);C=0;}if(y&&y.type==3)if(!A)w.setEndBefore(y);else if(A>=y.getLength())w.setEndAfter(y);else{w.setEndAfter(y);D=0;}var E=new d.walker(w),F=d.walker.bookmark();E.evaluator=function(J){return J.type==(u==1?1:3);};var G;E.guard=function(J,K){if(F(J))return true;if(u==1&&J.type==3)return false;if(K&&J.equals(G))return false;if(!K&&J.type==1)G=J;return true;};if(C){var H=E[u==1?'lastForward':'next']();H&&this.setStartAt(H,v?1:3);}if(D){E.reset();var I=E[u==1?'lastBackward':'previous']();I&&this.setEndAt(I,v?2:4);}return!!(C||D);}},insertNode:function(u){var y=this;y.optimizeBookmark();y.trim(false,true);var v=y.startContainer,w=y.startOffset,x=v.getChild(w);if(x)u.insertBefore(x);else v.append(u);if(u.getParent().equals(y.endContainer))y.endOffset++;y.setStartBefore(u);},moveToPosition:function(u,v){this.setStartAt(u,v);this.collapse(true);},selectNodeContents:function(u){this.setStart(u,0);this.setEnd(u,u.type==3?u.getLength():u.getChildCount());},setStart:function(u,v){var w=this;if(u.type==1&&f.$empty[u.getName()])v=u.getIndex(),u=u.getParent();w.startContainer=u;w.startOffset=v;if(!w.endContainer){w.endContainer=u;w.endOffset=v;}l(w);},setEnd:function(u,v){var w=this;if(u.type==1&&f.$empty[u.getName()])v=u.getIndex()+1,u=u.getParent();w.endContainer=u;w.endOffset=v;if(!w.startContainer){w.startContainer=u;w.startOffset=v;}l(w);},setStartAfter:function(u){this.setStart(u.getParent(),u.getIndex()+1);},setStartBefore:function(u){this.setStart(u.getParent(),u.getIndex());
+},setEndAfter:function(u){this.setEnd(u.getParent(),u.getIndex()+1);},setEndBefore:function(u){this.setEnd(u.getParent(),u.getIndex());},setStartAt:function(u,v){var w=this;switch(v){case 1:w.setStart(u,0);break;case 2:if(u.type==3)w.setStart(u,u.getLength());else w.setStart(u,u.getChildCount());break;case 3:w.setStartBefore(u);break;case 4:w.setStartAfter(u);}l(w);},setEndAt:function(u,v){var w=this;switch(v){case 1:w.setEnd(u,0);break;case 2:if(u.type==3)w.setEnd(u,u.getLength());else w.setEnd(u,u.getChildCount());break;case 3:w.setEndBefore(u);break;case 4:w.setEndAfter(u);}l(w);},fixBlock:function(u,v){var y=this;var w=y.createBookmark(),x=y.document.createElement(v);y.collapse(u);y.enlarge(2);y.extractContents().appendTo(x);x.trim();if(!c)x.appendBogus();y.insertNode(x);y.moveToBookmark(w);return x;},splitBlock:function(u){var E=this;var v=new d.elementPath(E.startContainer),w=new d.elementPath(E.endContainer),x=v.blockLimit,y=w.blockLimit,z=v.block,A=w.block,B=null;if(!x.equals(y))return null;if(u!='br'){if(!z){z=E.fixBlock(true,u);A=new d.elementPath(E.endContainer).block;}if(!A)A=E.fixBlock(false,u);}var C=z&&E.checkStartOfBlock(),D=A&&E.checkEndOfBlock();E.deleteContents();if(z&&z.equals(A))if(D){B=new d.elementPath(E.startContainer);E.moveToPosition(A,4);A=null;}else if(C){B=new d.elementPath(E.startContainer);E.moveToPosition(z,3);z=null;}else{A=E.splitElement(z);if(!c&&!z.is('ul','ol'))z.appendBogus();}return{previousBlock:z,nextBlock:A,wasStartOfBlock:C,wasEndOfBlock:D,elementPath:B};},splitElement:function(u){var x=this;if(!x.collapsed)return null;x.setEndAt(u,2);var v=x.extractContents(),w=u.clone(false);v.appendTo(w);w.insertAfter(u);x.moveToPosition(u,4);return w;},checkBoundaryOfElement:function(u,v){var w=v==1,x=this.clone();x.collapse(w);x[w?'setStartAt':'setEndAt'](u,w?1:2);var y=new d.walker(x);y.evaluator=q(w);return y[w?'checkBackward':'checkForward']();},checkStartOfBlock:function(){var A=this;var u=A.startContainer,v=A.startOffset;if(v&&u.type==3){var w=e.ltrim(u.substring(0,v));if(w.length)return false;}A.trim();var x=new d.elementPath(A.startContainer),y=A.clone();y.collapse(true);y.setStartAt(x.block||x.blockLimit,1);var z=new d.walker(y);z.evaluator=o(true);return z.checkBackward();},checkEndOfBlock:function(){var A=this;var u=A.endContainer,v=A.endOffset;if(u.type==3){var w=e.rtrim(u.substring(v));if(w.length)return false;}A.trim();var x=new d.elementPath(A.endContainer),y=A.clone();y.collapse(false);y.setEndAt(x.block||x.blockLimit,2);
+var z=new d.walker(y);z.evaluator=o(false);return z.checkForward();},checkReadOnly:(function(){function u(v,w){while(v){if(v.type==1)if(v.getAttribute('contentEditable')=='false'&&!v.data('cke-editable'))return 0;else if(v.is('html')||v.getAttribute('contentEditable')=='true'&&(v.contains(w)||v.equals(w)))break;v=v.getParent();}return 1;};return function(){var v=this.startContainer,w=this.endContainer;return!(u(v,w)&&u(w,v));};})(),moveToElementEditablePosition:function(u,v){function w(y,z){var A;if(y.type==1&&y.isEditable(false)&&!f.$nonEditable[y.getName()])A=y[v?'getLast':'getFirst'](t);if(!z&&!A)A=y[v?'getPrevious':'getNext'](t);return A;};var x=0;while(u){if(u.type==3){this.moveToPosition(u,v?4:3);x=1;break;}if(u.type==1)if(u.isEditable()){this.moveToPosition(u,v?2:1);x=1;}u=w(u,x);}return!!x;},moveToElementEditStart:function(u){return this.moveToElementEditablePosition(u);},moveToElementEditEnd:function(u){return this.moveToElementEditablePosition(u,true);},getEnclosedNode:function(){var u=this.clone();u.optimize();if(u.startContainer.type!=1||u.endContainer.type!=1)return null;var v=new d.walker(u),w=d.walker.bookmark(true),x=d.walker.whitespaces(true),y=function(A){return x(A)&&w(A);};u.evaluator=y;var z=v.next();v.reset();return z&&z.equals(v.previous())?z:null;},getTouchedStartNode:function(){var u=this.startContainer;if(this.collapsed||u.type!=1)return u;return u.getChild(this.startOffset)||u;},getTouchedEndNode:function(){var u=this.endContainer;if(this.collapsed||u.type!=1)return u;return u.getChild(this.endOffset-1)||u;}};})();a.POSITION_AFTER_START=1;a.POSITION_BEFORE_END=2;a.POSITION_BEFORE_START=3;a.POSITION_AFTER_END=4;a.ENLARGE_ELEMENT=1;a.ENLARGE_BLOCK_CONTENTS=2;a.ENLARGE_LIST_ITEM_CONTENTS=3;a.START=1;a.END=2;a.STARTEND=3;a.SHRINK_ELEMENT=1;a.SHRINK_TEXT=2;(function(){d.rangeList=function(n){if(n instanceof d.rangeList)return n;if(!n)n=[];else if(n instanceof d.range)n=[n];return e.extend(n,l);};var l={createIterator:function(){var n=this,o=d.walker.bookmark(),p=function(s){return!(s.is&&s.is('tr'));},q=[],r;return{getNextRange:function(s){r=r==undefined?0:r+1;var t=n[r];if(t&&n.length>1){if(!r)for(var u=n.length-1;u>=0;u--)q.unshift(n[u].createBookmark(true));if(s){var v=0;while(n[r+v+1]){var w=t.document,x=0,y=w.getById(q[v].endNode),z=w.getById(q[v+1].startNode),A;while(1){A=y.getNextSourceNode(false);if(!z.equals(A)){if(o(A)||A.type==1&&A.isBlockBoundary()){y=A;continue;}}else x=1;break;}if(!x)break;v++;}}t.moveToBookmark(q.shift());
+while(v--){A=n[++r];A.moveToBookmark(q.shift());t.setEnd(A.endContainer,A.endOffset);}}return t;}};},createBookmarks:function(n){var s=this;var o=[],p;for(var q=0;q<s.length;q++){o.push(p=s[q].createBookmark(n,true));for(var r=q+1;r<s.length;r++){s[r]=m(p,s[r]);s[r]=m(p,s[r],true);}}return o;},createBookmarks2:function(n){var o=[];for(var p=0;p<this.length;p++)o.push(this[p].createBookmark2(n));return o;},moveToBookmarks:function(n){for(var o=0;o<this.length;o++)this[o].moveToBookmark(n[o]);}};function m(n,o,p){var q=n.serializable,r=o[p?'endContainer':'startContainer'],s=p?'endOffset':'startOffset',t=q?o.document.getById(n.startNode):n.startNode,u=q?o.document.getById(n.endNode):n.endNode;if(r.equals(t.getPrevious())){o.startOffset=o.startOffset-r.getLength()-u.getPrevious().getLength();r=u.getNext();}else if(r.equals(u.getPrevious())){o.startOffset=o.startOffset-r.getLength();r=u.getNext();}r.equals(t.getParent())&&o[s]++;r.equals(u.getParent())&&o[s]++;o[p?'endContainer':'startContainer']=r;return o;};})();(function(){if(b.webkit){b.hc=false;return;}var l=h.createFromHtml('<div style="width:0px;height:0px;position:absolute;left:-10000px;border: 1px solid;border-color: red blue;"></div>',a.document);l.appendTo(a.document.getHead());try{b.hc=l.getComputedStyle('border-top-color')==l.getComputedStyle('border-right-color');}catch(m){b.hc=false;}if(b.hc)b.cssClass+=' cke_hc';l.remove();})();j.load(i.corePlugins.split(','),function(){a.status='loaded';a.fire('loaded');var l=a._.pending;if(l){delete a._.pending;for(var m=0;m<l.length;m++)a.add(l[m]);}});if(c)try{document.execCommand('BackgroundImageCache',false,true);}catch(l){}a.skins.add('kama',(function(){var m='cke_ui_color';return{editor:{css:['editor.css']},dialog:{css:['dialog.css']},richcombo:{canGroup:false},templates:{css:['templates.css']},margins:[0,0,0,0],init:function(n){if(n.config.width&&!isNaN(n.config.width))n.config.width-=12;var o=[],p=/\$color/g,q='/* UI Color Support */.cke_skin_kama .cke_menuitem .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_label,.cke_skin_kama .cke_menuitem a:focus .cke_label,.cke_skin_kama .cke_menuitem a:active .cke_label{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label{\tbackground-color: transparent !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuseparator{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover,.cke_skin_kama .cke_menuitem a:focus,.cke_skin_kama .cke_menuitem a:active{\tbackground-color: $color !important;}';
+if(b.webkit){q=q.split('}').slice(0,-1);for(var r=0;r<q.length;r++)q[r]=q[r].split('{');}function s(v){var w=v.getById(m);if(!w){w=v.getHead().append('style');w.setAttribute('id',m);w.setAttribute('type','text/css');}return w;};function t(v,w,x){var y,z,A;for(var B=0;B<v.length;B++){if(b.webkit)for(z=0;z<w.length;z++){A=w[z][1];for(y=0;y<x.length;y++)A=A.replace(x[y][0],x[y][1]);v[B].$.sheet.addRule(w[z][0],A);}else{A=w;for(y=0;y<x.length;y++)A=A.replace(x[y][0],x[y][1]);if(c)v[B].$.styleSheet.cssText+=A;else v[B].$.innerHTML+=A;}}};var u=/\$color/g;e.extend(n,{uiColor:null,getUiColor:function(){return this.uiColor;},setUiColor:function(v){var w,x=s(a.document),y='.'+n.id,z=[y+' .cke_wrapper',y+'_dialog .cke_dialog_contents',y+'_dialog a.cke_dialog_tab',y+'_dialog .cke_dialog_footer'].join(','),A='background-color: $color !important;';if(b.webkit)w=[[z,A]];else w=z+'{'+A+'}';return(this.setUiColor=function(B){var C=[[u,B]];n.uiColor=B;t([x],w,C);t(o,q,C);})(v);}});n.on('menuShow',function(v){var w=v.data[0],x=w.element.getElementsByTag('iframe').getItem(0).getFrameDocument();if(!x.getById('cke_ui_color')){var y=s(x);o.push(y);var z=n.getUiColor();if(z)t([y],q,[[u,z]]);}});if(n.config.uiColor)n.setUiColor(n.config.uiColor);}};})());(function(){a.dialog?m():a.on('dialogPluginReady',m);function m(){a.dialog.on('resize',function(n){var o=n.data,p=o.width,q=o.height,r=o.dialog,s=r.parts.contents;if(o.skin!='kama')return;s.setStyles({width:p+'px',height:q+'px'});});};})();j.add('about',{requires:['dialog'],init:function(m){var n=m.addCommand('about',new a.dialogCommand('about'));n.modes={wysiwyg:1,source:1};n.canUndo=false;n.readOnly=1;m.ui.addButton('About',{label:m.lang.about.title,command:'about'});a.dialog.add('about',this.path+'dialogs/about.js');}});(function(){var m='a11yhelp',n='a11yHelp';j.add(m,{availableLangs:{cs:1,cy:1,da:1,de:1,el:1,en:1,eo:1,fa:1,fi:1,fr:1,gu:1,he:1,it:1,mk:1,nb:1,nl:1,no:1,tr:1,ug:1,vi:1,'zh-cn':1},init:function(o){var p=this;o.addCommand(n,{exec:function(){var q=o.langCode;q=p.availableLangs[q]?q:'en';a.scriptLoader.load(a.getUrl(p.path+'lang/'+q+'.js'),function(){e.extend(o.lang,p.langEntries[q]);o.openDialog(n);});},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:false});a.dialog.add(n,this.path+'dialogs/a11yhelp.js');}});})();j.add('basicstyles',{requires:['styles','button'],init:function(m){var n=function(q,r,s,t){var u=new a.style(t);m.attachStyleStateChange(u,function(v){!m.readOnly&&m.getCommand(s).setState(v);});m.addCommand(s,new a.styleCommand(u));
+m.ui.addButton(q,{label:r,command:s});},o=m.config,p=m.lang;n('Bold',p.bold,'bold',o.coreStyles_bold);n('Italic',p.italic,'italic',o.coreStyles_italic);n('Underline',p.underline,'underline',o.coreStyles_underline);n('Strike',p.strike,'strike',o.coreStyles_strike);n('Subscript',p.subscript,'subscript',o.coreStyles_subscript);n('Superscript',p.superscript,'superscript',o.coreStyles_superscript);}});i.coreStyles_bold={element:'strong',overrides:'b'};i.coreStyles_italic={element:'em',overrides:'i'};i.coreStyles_underline={element:'u'};i.coreStyles_strike={element:'strike'};i.coreStyles_subscript={element:'sub'};i.coreStyles_superscript={element:'sup'};(function(){var m={table:1,ul:1,ol:1,blockquote:1,div:1},n={},o={};e.extend(n,m,{tr:1,p:1,div:1,li:1});e.extend(o,n,{td:1});function p(B){q(B);r(B);};function q(B){var C=B.editor,D=B.data.path;if(C.readOnly)return;var E=C.config.useComputedState,F;E=E===undefined||E;if(!E)F=s(D.lastElement);F=F||D.block||D.blockLimit;if(F.is('body')){var G=C.getSelection().getRanges()[0].getEnclosedNode();G&&G.type==1&&(F=G);}if(!F)return;var H=E?F.getComputedStyle('direction'):F.getStyle('direction')||F.getAttribute('dir');C.getCommand('bidirtl').setState(H=='rtl'?1:2);C.getCommand('bidiltr').setState(H=='ltr'?1:2);};function r(B){var C=B.editor,D=B.data.path.block||B.data.path.blockLimit;C.fire('contentDirChanged',D?D.getComputedStyle('direction'):C.lang.dir);};function s(B){while(B&&!(B.getName() in o||B.is('body'))){var C=B.getParent();if(!C)break;B=C;}return B;};function t(B,C,D,E){if(B.isReadOnly())return;h.setMarker(E,B,'bidi_processed',1);var F=B;while((F=F.getParent())&&!F.is('body')){if(F.getCustomData('bidi_processed')){B.removeStyle('direction');B.removeAttribute('dir');return;}}var G='useComputedState' in D.config?D.config.useComputedState:1,H=G?B.getComputedStyle('direction'):B.getStyle('direction')||B.hasAttribute('dir');if(H==C)return;B.removeStyle('direction');if(G){B.removeAttribute('dir');if(C!=B.getComputedStyle('direction'))B.setAttribute('dir',C);}else B.setAttribute('dir',C);D.forceNextSelectionCheck();};function u(B,C,D){var E=B.getCommonAncestor(false,true);B=B.clone();B.enlarge(D==2?3:2);if(B.checkBoundaryOfElement(E,1)&&B.checkBoundaryOfElement(E,2)){var F;while(E&&E.type==1&&(F=E.getParent())&&F.getChildCount()==1&&!(E.getName() in C))E=F;return E.type==1&&E.getName() in C&&E;}};function v(B){return function(C){var D=C.getSelection(),E=C.config.enterMode,F=D.getRanges();if(F&&F.length){var G={},H=D.createBookmarks(),I=F.createIterator(),J,K=0;
+while(J=I.getNextRange(1)){var L=J.getEnclosedNode();if(!L||L&&!(L.type==1&&L.getName() in n))L=u(J,m,E);L&&t(L,B,C,G);var M,N,O=new d.walker(J),P=H[K].startNode,Q=H[K++].endNode;O.evaluator=function(R){return!!(R.type==1&&R.getName() in m&&!(R.getName()==(E==1?'p':'div')&&R.getParent().type==1&&R.getParent().getName()=='blockquote')&&R.getPosition(P)&2&&(R.getPosition(Q)&4+16)==4);};while(N=O.next())t(N,B,C,G);M=J.createIterator();M.enlargeBr=E!=2;while(N=M.getNextParagraph(E==1?'p':'div'))t(N,B,C,G);}h.clearAllMarkers(G);C.forceNextSelectionCheck();D.selectBookmarks(H);C.focus();}};};j.add('bidi',{requires:['styles','button'],init:function(B){var C=function(E,F,G,H){B.addCommand(G,new a.command(B,{exec:H}));B.ui.addButton(E,{label:F,command:G});},D=B.lang.bidi;C('BidiLtr',D.ltr,'bidiltr',v('ltr'));C('BidiRtl',D.rtl,'bidirtl',v('rtl'));B.on('selectionChange',p);B.on('contentDom',function(){B.document.on('dirChanged',function(E){B.fire('dirChanged',{node:E.data,dir:E.data.getDirection(1)});});});}});function w(B){var C=B.getDocument().getBody().getParent();while(B){if(B.equals(C))return false;B=B.getParent();}return true;};function x(B){var C=B==y.setAttribute,D=B==y.removeAttribute,E=/\bdirection\s*:\s*(.*?)\s*(:?$|;)/;return function(F,G){var J=this;if(!J.getDocument().equals(a.document)){var H;if((F==(C||D?'dir':'direction')||F=='style'&&(D||E.test(G)))&&!w(J)){H=J.getDirection(1);var I=B.apply(J,arguments);if(H!=J.getDirection(1)){J.getDocument().fire('dirChanged',J);return I;}}}return B.apply(J,arguments);};};var y=h.prototype,z=['setStyle','removeStyle','setAttribute','removeAttribute'];for(var A=0;A<z.length;A++)y[z[A]]=e.override(y[z[A]],x);})();(function(){function m(q,r){var s=r.block||r.blockLimit;if(!s||s.getName()=='body')return 2;if(s.getAscendant('blockquote',true))return 1;return 2;};function n(q){var r=q.editor;if(r.readOnly)return;var s=r.getCommand('blockquote');s.state=m(r,q.data.path);s.fire('state');};function o(q){for(var r=0,s=q.getChildCount(),t;r<s&&(t=q.getChild(r));r++){if(t.type==1&&t.isBlockBoundary())return false;}return true;};var p={exec:function(q){var r=q.getCommand('blockquote').state,s=q.getSelection(),t=s&&s.getRanges(true)[0];if(!t)return;var u=s.createBookmarks();if(c){var v=u[0].startNode,w=u[0].endNode,x;if(v&&v.getParent().getName()=='blockquote'){x=v;while(x=x.getNext()){if(x.type==1&&x.isBlockBoundary()){v.move(x,true);break;}}}if(w&&w.getParent().getName()=='blockquote'){x=w;while(x=x.getPrevious()){if(x.type==1&&x.isBlockBoundary()){w.move(x);
+break;}}}}var y=t.createIterator(),z;y.enlargeBr=q.config.enterMode!=2;if(r==2){var A=[];while(z=y.getNextParagraph())A.push(z);if(A.length<1){var B=q.document.createElement(q.config.enterMode==1?'p':'div'),C=u.shift();t.insertNode(B);B.append(new d.text('\ufeff',q.document));t.moveToBookmark(C);t.selectNodeContents(B);t.collapse(true);C=t.createBookmark();A.push(B);u.unshift(C);}var D=A[0].getParent(),E=[];for(var F=0;F<A.length;F++){z=A[F];D=D.getCommonAncestor(z.getParent());}var G={table:1,tbody:1,tr:1,ol:1,ul:1};while(G[D.getName()])D=D.getParent();var H=null;while(A.length>0){z=A.shift();while(!z.getParent().equals(D))z=z.getParent();if(!z.equals(H))E.push(z);H=z;}while(E.length>0){z=E.shift();if(z.getName()=='blockquote'){var I=new d.documentFragment(q.document);while(z.getFirst()){I.append(z.getFirst().remove());A.push(I.getLast());}I.replace(z);}else A.push(z);}var J=q.document.createElement('blockquote');J.insertBefore(A[0]);while(A.length>0){z=A.shift();J.append(z);}}else if(r==1){var K=[],L={};while(z=y.getNextParagraph()){var M=null,N=null;while(z.getParent()){if(z.getParent().getName()=='blockquote'){M=z.getParent();N=z;break;}z=z.getParent();}if(M&&N&&!N.getCustomData('blockquote_moveout')){K.push(N);h.setMarker(L,N,'blockquote_moveout',true);}}h.clearAllMarkers(L);var O=[],P=[];L={};while(K.length>0){var Q=K.shift();J=Q.getParent();if(!Q.getPrevious())Q.remove().insertBefore(J);else if(!Q.getNext())Q.remove().insertAfter(J);else{Q.breakParent(Q.getParent());P.push(Q.getNext());}if(!J.getCustomData('blockquote_processed')){P.push(J);h.setMarker(L,J,'blockquote_processed',true);}O.push(Q);}h.clearAllMarkers(L);for(F=P.length-1;F>=0;F--){J=P[F];if(o(J))J.remove();}if(q.config.enterMode==2){var R=true;while(O.length){Q=O.shift();if(Q.getName()=='div'){I=new d.documentFragment(q.document);var S=R&&Q.getPrevious()&&!(Q.getPrevious().type==1&&Q.getPrevious().isBlockBoundary());if(S)I.append(q.document.createElement('br'));var T=Q.getNext()&&!(Q.getNext().type==1&&Q.getNext().isBlockBoundary());while(Q.getFirst())Q.getFirst().remove().appendTo(I);if(T)I.append(q.document.createElement('br'));I.replace(Q);R=false;}}}}s.selectBookmarks(u);q.focus();}};j.add('blockquote',{init:function(q){q.addCommand('blockquote',p);q.ui.addButton('Blockquote',{label:q.lang.blockquote,command:'blockquote'});q.on('selectionChange',n);},requires:['domiterator']});})();j.add('button',{beforeInit:function(m){m.ui.addHandler('button',k.button.handler);}});a.UI_BUTTON='button';
+k.button=function(m){e.extend(this,m,{title:m.label,className:m.className||m.command&&'cke_button_'+m.command||'',click:m.click||(function(n){n.execCommand(m.command);})});this._={};};k.button.handler={create:function(m){return new k.button(m);}};(function(){k.button.prototype={render:function(m,n){var o=b,p=this._.id=e.getNextId(),q='',r=this.command,s;this._.editor=m;var t={id:p,button:this,editor:m,focus:function(){var z=a.document.getById(p);z.focus();},execute:function(){if(c&&b.version<7)e.setTimeout(function(){this.button.click(m);},0,this);else this.button.click(m);}},u=e.addFunction(function(z){if(t.onkey){z=new d.event(z);return t.onkey(t,z.getKeystroke())!==false;}}),v=e.addFunction(function(z){var A;if(t.onfocus)A=t.onfocus(t,new d.event(z))!==false;if(b.gecko&&b.version<10900)z.preventBubble();return A;});t.clickFn=s=e.addFunction(t.execute,t);if(this.modes){var w={};function x(){var z=m.mode;if(z){var A=this.modes[z]?w[z]!=undefined?w[z]:2:0;this.setState(m.readOnly&&!this.readOnly?0:A);}};m.on('beforeModeUnload',function(){if(m.mode&&this._.state!=0)w[m.mode]=this._.state;},this);m.on('mode',x,this);!this.readOnly&&m.on('readOnly',x,this);}else if(r){r=m.getCommand(r);if(r){r.on('state',function(){this.setState(r.state);},this);q+='cke_'+(r.state==1?'on':r.state==0?'disabled':'off');}}if(!r)q+='cke_off';if(this.className)q+=' '+this.className;n.push('<span class="cke_button'+(this.icon&&this.icon.indexOf('.png')==-1?' cke_noalphafix':'')+'">','<a id="',p,'" class="',q,'"',o.gecko&&o.version>=10900&&!o.hc?'':'" href="javascript:void(\''+(this.title||'').replace("'",'')+"')\"",' title="',this.title,'" tabindex="-1" hidefocus="true" role="button" aria-labelledby="'+p+'_label"'+(this.hasArrow?' aria-haspopup="true"':''));if(o.opera||o.gecko&&o.mac)n.push(' onkeypress="return false;"');if(o.gecko)n.push(' onblur="this.style.cssText = this.style.cssText;"');n.push(' onkeydown="return CKEDITOR.tools.callFunction(',u,', event);" onfocus="return CKEDITOR.tools.callFunction(',v,', event);" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',s,', this); return false;"><span class="cke_icon"');if(this.icon){var y=(this.iconOffset||0)*-16;n.push(' style="background-image:url(',a.getUrl(this.icon),');background-position:0 '+y+'px;"');}n.push('> </span><span id="',p,'_label" class="cke_label">',this.label,'</span>');if(this.hasArrow)n.push('<span class="cke_buttonarrow">'+(b.hc?'▼':' ')+'</span>');n.push('</a>','</span>');
+if(this.onRender)this.onRender();return t;},setState:function(m){if(this._.state==m)return false;this._.state=m;var n=a.document.getById(this._.id);if(n){n.setState(m);m==0?n.setAttribute('aria-disabled',true):n.removeAttribute('aria-disabled');m==1?n.setAttribute('aria-pressed',true):n.removeAttribute('aria-pressed');return true;}else return false;}};})();k.prototype.addButton=function(m,n){this.add(m,'button',n);};(function(){var m=function(y,z){var A=y.document,B=A.getBody(),C=false,D=function(){C=true;};B.on(z,D);(b.version>7?A.$:A.$.selection.createRange()).execCommand(z);B.removeListener(z,D);return C;},n=c?function(y,z){return m(y,z);}:function(y,z){try{return y.document.$.execCommand(z,false,null);}catch(A){return false;}},o=function(y){var z=this;z.type=y;z.canUndo=z.type=='cut';z.startDisabled=true;};o.prototype={exec:function(y,z){this.type=='cut'&&t(y);var A=n(y,this.type);if(!A)alert(y.lang.clipboard[this.type+'Error']);return A;}};var p={canUndo:false,exec:c?function(y){y.focus();if(!y.document.getBody().fire('beforepaste')&&!m(y,'paste')){y.fire('pasteDialog');return false;}}:function(y){try{if(!y.document.getBody().fire('beforepaste')&&!y.document.$.execCommand('Paste',false,null))throw 0;}catch(z){setTimeout(function(){y.fire('pasteDialog');},0);return false;}}},q=function(y){if(this.mode!='wysiwyg')return;switch(y.data.keyCode){case 1114112+86:case 2228224+45:var z=this.document.getBody();if(b.opera||b.gecko&&b.version<10900)z.fire('paste');return;case 1114112+88:case 2228224+46:var A=this;this.fire('saveSnapshot');setTimeout(function(){A.fire('saveSnapshot');},0);}};function r(y){y.cancel();};function s(y,z,A){var B=this.document;if(B.getById('cke_pastebin'))return;if(z=='text'&&y.data&&y.data.$.clipboardData){var C=y.data.$.clipboardData.getData('text/plain');if(C){y.data.preventDefault();A(C);return;}}var D=this.getSelection(),E=new d.range(B),F=new h(z=='text'?'textarea':b.webkit?'body':'div',B);F.setAttribute('id','cke_pastebin');b.webkit&&F.append(B.createText('\xa0'));B.getBody().append(F);F.setStyles({position:'absolute',top:D.getStartElement().getDocumentPosition().y+'px',width:'1px',height:'1px',overflow:'hidden'});F.setStyle(this.config.contentsLangDirection=='ltr'?'left':'right','-1000px');var G=D.createBookmarks();this.on('selectionChange',r,null,null,0);if(z=='text')F.$.focus();else{E.setStartAt(F,1);E.setEndAt(F,2);E.select(true);}var H=this;window.setTimeout(function(){H.document.getBody().focus();H.removeListener('selectionChange',r);
+var I;F=b.webkit&&(I=F.getFirst())&&I.is&&I.hasClass('Apple-style-span')?I:F;D.selectBookmarks(G);F.remove();A(F['get'+(z=='text'?'Value':'Html')]());},0);};function t(y){if(!c||b.quirks)return;var z=y.getSelection(),A;if(z.getType()==3&&(A=z.getSelectedElement())){var B=z.getRanges()[0],C=y.document.createText('');C.insertBefore(A);B.setStartBefore(C);B.setEndAfter(A);z.selectRanges([B]);setTimeout(function(){if(A.getParent()){C.remove();z.selectElement(A);}},0);}};var u;function v(y,z){c&&(u=1);var A=2;try{A=z.document.$.queryCommandEnabled(y)?2:0;}catch(B){}u=0;return A;};var w;function x(){var z=this;if(z.mode!='wysiwyg')return;z.getCommand('cut').setState(w?0:v('Cut',z));z.getCommand('copy').setState(v('Copy',z));var y=w?0:b.webkit?2:v('Paste',z);z.fire('pasteState',y);};j.add('clipboard',{requires:['dialog','htmldataprocessor'],init:function(y){y.on('paste',function(A){var B=A.data;if(B.html)y.insertHtml(B.html);else if(B.text)y.insertText(B.text);setTimeout(function(){y.fire('afterPaste');},0);},null,null,1000);y.on('pasteDialog',function(A){setTimeout(function(){y.openDialog('paste');},0);});y.on('pasteState',function(A){y.getCommand('paste').setState(A.data);});function z(A,B,C,D){var E=y.lang[B];y.addCommand(B,C);y.ui.addButton(A,{label:E,command:B});if(y.addMenuItems)y.addMenuItem(B,{label:E,command:B,group:'clipboard',order:D});};z('Cut','cut',new o('cut'),1);z('Copy','copy',new o('copy'),4);z('Paste','paste',p,8);a.dialog.add('paste',a.getUrl(this.path+'dialogs/paste.js'));y.on('key',q,y);y.on('contentDom',function(){var A=y.document.getBody();A.on(!c?'paste':'beforepaste',function(B){if(u)return;var C=B.data&&B.data.$;if(c&&C&&!C.ctrlKey)return;var D={mode:'html'};y.fire('beforePaste',D);s.call(y,B,D.mode,function(E){if(!(E=e.trim(E.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,''))))return;var F={};F[D.mode]=E;y.fire('paste',F);});});if(c){A.on('contextmenu',function(){u=1;setTimeout(function(){u=0;},0);});A.on('paste',function(B){if(!y.document.getById('cke_pastebin')){B.data.preventDefault();u=0;p.exec(y);}});}A.on('beforecut',function(){!u&&t(y);});A.on('mouseup',function(){setTimeout(function(){x.call(y);},0);},y);A.on('keyup',x,y);});y.on('selectionChange',function(A){w=A.data.selection.getRanges()[0].checkReadOnly();x.call(y);});if(y.contextMenu)y.contextMenu.addListener(function(A,B){var C=B.getRanges()[0].checkReadOnly();return{cut:!C&&v('Cut',y),copy:v('Copy',y),paste:!C&&(b.webkit?2:v('Paste',y))};});}});})();j.add('colorbutton',{requires:['panelbutton','floatpanel','styles'],init:function(m){var n=m.config,o=m.lang.colorButton,p;
+if(!b.hc){q('TextColor','fore',o.textColorTitle);q('BGColor','back',o.bgColorTitle);}function q(t,u,v){var w=e.getNextId()+'_colorBox';m.ui.add(t,'panelbutton',{label:v,title:v,className:'cke_button_'+t.toLowerCase(),modes:{wysiwyg:1},panel:{css:m.skin.editor.css,attributes:{role:'listbox','aria-label':o.panelTitle}},onBlock:function(x,y){y.autoSize=true;y.element.addClass('cke_colorblock');y.element.setHtml(r(x,u,w));y.element.getDocument().getBody().setStyle('overflow','hidden');k.fire('ready',this);var z=y.keys,A=m.lang.dir=='rtl';z[A?37:39]='next';z[40]='next';z[9]='next';z[A?39:37]='prev';z[38]='prev';z[2228224+9]='prev';z[32]='click';},onOpen:function(){var x=m.getSelection(),y=x&&x.getStartElement(),z=new d.elementPath(y),A;y=z.block||z.blockLimit||m.document.getBody();do A=y&&y.getComputedStyle(u=='back'?'background-color':'color')||'transparent';while(u=='back'&&A=='transparent'&&y&&(y=y.getParent()));if(!A||A=='transparent')A='#ffffff';this._.panel._.iframe.getFrameDocument().getById(w).setStyle('background-color',A);}});};function r(t,u,v){var w=[],x=n.colorButton_colors.split(','),y=e.addFunction(function(E,F){if(E=='?'){var G=arguments.callee;function H(J){this.removeListener('ok',H);this.removeListener('cancel',H);J.name=='ok'&&G(this.getContentElement('picker','selectedColor').getValue(),F);};m.openDialog('colordialog',function(){this.on('ok',H);this.on('cancel',H);});return;}m.focus();t.hide(false);m.fire('saveSnapshot');new a.style(n['colorButton_'+F+'Style'],{color:'inherit'}).remove(m.document);if(E){var I=n['colorButton_'+F+'Style'];I.childRule=F=='back'?function(J){return s(J);}:function(J){return!(J.is('a')||J.getElementsByTag('a').count())||s(J);};new a.style(I,{color:E}).apply(m.document);}m.fire('saveSnapshot');});w.push('<a class="cke_colorauto" _cke_focus=1 hidefocus=true title="',o.auto,'" onclick="CKEDITOR.tools.callFunction(',y,",null,'",u,"');return false;\" href=\"javascript:void('",o.auto,'\')" role="option"><table role="presentation" cellspacing=0 cellpadding=0 width="100%"><tr><td><span class="cke_colorbox" id="',v,'"></span></td><td colspan=7 align=center>',o.auto,'</td></tr></table></a><table role="presentation" cellspacing=0 cellpadding=0 width="100%">');for(var z=0;z<x.length;z++){if(z%8===0)w.push('</tr><tr>');var A=x[z].split('/'),B=A[0],C=A[1]||B;if(!A[1])B='#'+B.replace(/^(.)(.)(.)$/,'$1$1$2$2$3$3');var D=m.lang.colors[C]||C;w.push('<td><a class="cke_colorbox" _cke_focus=1 hidefocus=true title="',D,'" onclick="CKEDITOR.tools.callFunction(',y,",'",B,"','",u,"'); return false;\" href=\"javascript:void('",D,'\')" role="option"><span class="cke_colorbox" style="background-color:#',C,'"></span></a></td>');
+}if(n.colorButton_enableMore===undefined||n.colorButton_enableMore)w.push('</tr><tr><td colspan=8 align=center><a class="cke_colormore" _cke_focus=1 hidefocus=true title="',o.more,'" onclick="CKEDITOR.tools.callFunction(',y,",'?','",u,"');return false;\" href=\"javascript:void('",o.more,"')\"",' role="option">',o.more,'</a></td>');w.push('</tr></table>');return w.join('');};function s(t){return t.getAttribute('contentEditable')=='false'||t.getAttribute('data-nostyle');};}});i.colorButton_colors='000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';i.colorButton_foreStyle={element:'span',styles:{color:'#(color)'},overrides:[{element:'font',attributes:{color:null}}]};i.colorButton_backStyle={element:'span',styles:{'background-color':'#(color)'}};j.colordialog={init:function(m){m.addCommand('colordialog',new a.dialogCommand('colordialog'));a.dialog.add('colordialog',this.path+'dialogs/colordialog.js');}};j.add('colordialog',j.colordialog);j.add('contextmenu',{requires:['menu'],onLoad:function(){j.contextMenu=e.createClass({base:a.menu,$:function(m){this.base.call(this,m,{panel:{className:m.skinClass+' cke_contextmenu',attributes:{'aria-label':m.lang.contextmenu.options}}});},proto:{addTarget:function(m,n){if(b.opera&&!('oncontextmenu' in document.body)){var o;m.on('mousedown',function(s){s=s.data;if(s.$.button!=2){if(s.getKeystroke()==1114112+1)m.fire('contextmenu',s);return;}if(n&&(b.mac?s.$.metaKey:s.$.ctrlKey))return;var t=s.getTarget();if(!o){var u=t.getDocument();o=u.createElement('input');o.$.type='button';u.getBody().append(o);}o.setAttribute('style','position:absolute;top:'+(s.$.clientY-2)+'px;left:'+(s.$.clientX-2)+'px;width:5px;height:5px;opacity:0.01');});m.on('mouseup',function(s){if(o){o.remove();o=undefined;m.fire('contextmenu',s.data);}});}m.on('contextmenu',function(s){var t=s.data;if(n&&(b.webkit?p:b.mac?t.$.metaKey:t.$.ctrlKey))return;t.preventDefault();var u=t.getTarget().getDocument().getDocumentElement(),v=t.$.clientX,w=t.$.clientY;e.setTimeout(function(){this.open(u,null,v,w);},c?200:0,this);},this);if(b.opera)m.on('keypress',function(s){var t=s.data;if(t.$.keyCode===0)t.preventDefault();});if(b.webkit){var p,q=function(s){p=b.mac?s.data.$.metaKey:s.data.$.ctrlKey;},r=function(){p=0;};m.on('keydown',q);m.on('keyup',r);m.on('contextmenu',r);
+}},open:function(m,n,o,p){this.editor.focus();m=m||a.document.getDocumentElement();this.show(m,n,o,p);}}});},beforeInit:function(m){m.contextMenu=new j.contextMenu(m);m.addCommand('contextMenu',{exec:function(){m.contextMenu.open(m.document.getBody());}});}});(function(){function m(o){var p=this.att,q=o&&o.hasAttribute(p)&&o.getAttribute(p)||'';if(q!==undefined)this.setValue(q);};function n(){var o;for(var p=0;p<arguments.length;p++){if(arguments[p] instanceof h){o=arguments[p];break;}}if(o){var q=this.att,r=this.getValue();if(r)o.setAttribute(q,r);else o.removeAttribute(q,r);}};j.add('dialogadvtab',{createAdvancedTab:function(o,p){if(!p)p={id:1,dir:1,classes:1,styles:1};var q=o.lang.common,r={id:'advanced',label:q.advancedTab,title:q.advancedTab,elements:[{type:'vbox',padding:1,children:[]}]},s=[];if(p.id||p.dir){if(p.id)s.push({id:'advId',att:'id',type:'text',label:q.id,setup:m,commit:n});if(p.dir)s.push({id:'advLangDir',att:'dir',type:'select',label:q.langDir,'default':'',style:'width:100%',items:[[q.notSet,''],[q.langDirLTR,'ltr'],[q.langDirRTL,'rtl']],setup:m,commit:n});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}if(p.styles||p.classes){s=[];if(p.styles)s.push({id:'advStyles',att:'style',type:'text',label:q.styles,'default':'',validate:a.dialog.validate.inlineStyle(q.invalidInlineStyle),onChange:function(){},getStyle:function(t,u){var v=this.getValue().match(new RegExp(t+'\\s*:\\s*([^;]*)','i'));return v?v[1]:u;},updateStyle:function(t,u){var v=this.getValue();if(v)v=v.replace(new RegExp('\\s*'+t+'s*:[^;]*(?:$|;s*)','i'),'').replace(/^[;\s]+/,'').replace(/\s+$/,'');if(u){v&&!/;\s*$/.test(v)&&(v+='; ');v+=t+': '+u;}this.setValue(v,1);},setup:m,commit:n});if(p.classes)s.push({type:'hbox',widths:['45%','55%'],children:[{id:'advCSSClasses',att:'class',type:'text',label:q.cssClasses,'default':'',setup:m,commit:n}]});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}return r;}});})();(function(){j.add('div',{requires:['editingblock','domiterator','styles'],init:function(m){var n=m.lang.div;m.addCommand('creatediv',new a.dialogCommand('creatediv'));m.addCommand('editdiv',new a.dialogCommand('editdiv'));m.addCommand('removediv',{exec:function(o){var p=o.getSelection(),q=p&&p.getRanges(),r,s=p.createBookmarks(),t,u=[];function v(x){var y=new d.elementPath(x),z=y.blockLimit,A=z.is('div')&&z;if(A&&!A.data('cke-div-added')){u.push(A);A.data('cke-div-added');}};for(var w=0;w<q.length;w++){r=q[w];
+if(r.collapsed)v(p.getStartElement());else{t=new d.walker(r);t.evaluator=v;t.lastForward();}}for(w=0;w<u.length;w++)u[w].remove(true);p.selectBookmarks(s);}});m.ui.addButton('CreateDiv',{label:n.toolbar,command:'creatediv'});if(m.addMenuItems){m.addMenuItems({editdiv:{label:n.edit,command:'editdiv',group:'div',order:1},removediv:{label:n.remove,command:'removediv',group:'div',order:5}});if(m.contextMenu)m.contextMenu.addListener(function(o,p){if(!o||o.isReadOnly())return null;var q=new d.elementPath(o),r=q.blockLimit;if(r&&r.getAscendant('div',true))return{editdiv:2,removediv:2};return null;});}a.dialog.add('creatediv',this.path+'dialogs/div.js');a.dialog.add('editdiv',this.path+'dialogs/div.js');}});})();(function(){var m={toolbarFocus:{editorFocus:false,readOnly:1,exec:function(o){var p=o._.elementsPath.idBase,q=a.document.getById(p+'0');q&&q.focus(c||b.air);}}},n='<span class="cke_empty"> </span>';j.add('elementspath',{requires:['selection'],init:function(o){var p='cke_path_'+o.name,q,r=function(){if(!q)q=a.document.getById(p);return q;},s='cke_elementspath_'+e.getNextNumber()+'_';o._.elementsPath={idBase:s,filters:[]};o.on('themeSpace',function(x){if(x.data.space=='bottom')x.data.html+='<span id="'+p+'_label" class="cke_voice_label">'+o.lang.elementsPath.eleLabel+'</span>'+'<div id="'+p+'" class="cke_path" role="group" aria-labelledby="'+p+'_label">'+n+'</div>';});function t(x){o.focus();var y=o._.elementsPath.list[x];if(y.is('body')){var z=new d.range(o.document);z.selectNodeContents(y);z.select();}else o.getSelection().selectElement(y);};var u=e.addFunction(t),v=e.addFunction(function(x,y){var z=o._.elementsPath.idBase,A;y=new d.event(y);var B=o.lang.dir=='rtl';switch(y.getKeystroke()){case B?39:37:case 9:A=a.document.getById(z+(x+1));if(!A)A=a.document.getById(z+'0');A.focus();return false;case B?37:39:case 2228224+9:A=a.document.getById(z+(x-1));if(!A)A=a.document.getById(z+(o._.elementsPath.list.length-1));A.focus();return false;case 27:o.focus();return false;case 13:case 32:t(x);return false;}return true;});o.on('selectionChange',function(x){var y=b,z=x.data.selection,A=z.getStartElement(),B=[],C=x.editor,D=C._.elementsPath.list=[],E=C._.elementsPath.filters;while(A){var F=0,G;if(A.data('cke-display-name'))G=A.data('cke-display-name');else if(A.data('cke-real-element-type'))G=A.data('cke-real-element-type');else G=A.getName();for(var H=0;H<E.length;H++){var I=E[H](A,G);if(I===false){F=1;break;}G=I||G;}if(!F){var J=D.push(A)-1,K='';if(y.opera||y.gecko&&y.mac)K+=' onkeypress="return false;"';
+if(y.gecko)K+=' onblur="this.style.cssText = this.style.cssText;"';var L=C.lang.elementsPath.eleTitle.replace(/%1/,G);B.unshift('<a id="',s,J,'" href="javascript:void(\'',G,'\')" tabindex="-1" title="',L,'"'+(b.gecko&&b.version<10900?' onfocus="event.preventBubble();"':'')+' hidefocus="true" '+' onkeydown="return CKEDITOR.tools.callFunction(',v,',',J,', event );"'+K,' onclick="CKEDITOR.tools.callFunction('+u,',',J,'); return false;"',' role="button" aria-labelledby="'+s+J+'_label">',G,'<span id="',s,J,'_label" class="cke_label">'+L+'</span>','</a>');}if(G=='body')break;A=A.getParent();}var M=r();M.setHtml(B.join('')+n);C.fire('elementsPathUpdate',{space:M});});function w(){q&&q.setHtml(n);delete o._.elementsPath.list;};o.on('readOnly',w);o.on('contentDomUnload',w);o.addCommand('elementsPathFocus',m.toolbarFocus);}});})();(function(){j.add('enterkey',{requires:['keystrokes','indent'],init:function(t){t.addCommand('enter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){r(v);}});t.addCommand('shiftEnter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){q(v);}});var u=t.keystrokeHandler.keystrokes;u[13]='enter';u[2228224+13]='shiftEnter';}});j.enterkey={enterBlock:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=v.checkStartOfBlock(),z=v.checkEndOfBlock(),A=new d.elementPath(v.startContainer),B=A.block;if(y&&z){if(B&&(B.is('li')||B.getParent().is('li'))){t.execCommand('outdent');return;}if(B&&B.getParent().is('blockquote')){B.breakParent(B.getParent());if(!B.getPrevious().getFirst(d.walker.invisible(1)))B.getPrevious().remove();if(!B.getNext().getFirst(d.walker.invisible(1)))B.getNext().remove();v.moveToElementEditStart(B);v.select();return;}}else if(B&&B.is('pre')){if(!z){n(t,u,v,w);return;}}else if(B&&f.$captionBlock[B.getName()]){n(t,u,v,w);return;}var C=u==3?'div':'p',D=v.splitBlock(C);if(!D)return;var E=D.previousBlock,F=D.nextBlock,G=D.wasStartOfBlock,H=D.wasEndOfBlock,I;if(F){I=F.getParent();if(I.is('li')){F.breakParent(I);F.move(F.getNext(),1);}}else if(E&&(I=E.getParent())&&I.is('li')){E.breakParent(I);I=E.getNext();v.moveToElementEditStart(I);E.move(E.getPrevious());}if(!G&&!H){if(F.is('li')&&(I=F.getFirst(d.walker.invisible(true)))&&I.is&&I.is('ul','ol'))(c?x.createText('\xa0'):x.createElement('br')).insertBefore(I);if(F)v.moveToElementEditStart(F);}else{var J,K;if(E){if(E.is('li')||!(p.test(E.getName())||E.is('pre')))J=E.clone();}else if(F)J=F.clone();if(!J){if(I&&I.is('li'))J=I;else{J=x.createElement(C);if(E&&(K=E.getDirection()))J.setAttribute('dir',K);
+}}else if(w&&!J.is('li'))J.renameNode(C);var L=D.elementPath;if(L)for(var M=0,N=L.elements.length;M<N;M++){var O=L.elements[M];if(O.equals(L.block)||O.equals(L.blockLimit))break;if(f.$removeEmpty[O.getName()]){O=O.clone();J.moveChildren(O);J.append(O);}}if(!c)J.appendBogus();if(!J.getParent())v.insertNode(J);J.is('li')&&J.removeAttribute('value');if(c&&G&&(!H||!E.getChildCount())){v.moveToElementEditStart(H?E:J);v.select();}v.moveToElementEditStart(G&&!H?F:J);}if(!c)if(F){var P=x.createElement('span');P.setHtml(' ');v.insertNode(P);P.scrollIntoView();v.deleteContents();}else J.scrollIntoView();v.select();},enterBr:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=u==3?'div':'p',z=v.checkEndOfBlock(),A=new d.elementPath(t.getSelection().getStartElement()),B=A.block,C=B&&A.block.getName(),D=false;if(!w&&C=='li'){o(t,u,v,w);return;}if(!w&&z&&p.test(C)){var E,F;if(F=B.getDirection()){E=x.createElement('div');E.setAttribute('dir',F);E.insertAfter(B);v.setStart(E,0);}else{x.createElement('br').insertAfter(B);if(b.gecko)x.createText('').insertAfter(B);v.setStartAt(B.getNext(),c?3:1);}}else{var G;D=C=='pre';if(D&&!b.gecko)G=x.createText(c?'\r':'\n');else G=x.createElement('br');v.deleteContents();v.insertNode(G);if(c)v.setStartAt(G,4);else{x.createText('\ufeff').insertAfter(G);if(z)G.getParent().appendBogus();G.getNext().$.nodeValue='';v.setStartAt(G.getNext(),1);var H=null;if(!b.gecko){H=x.createElement('span');H.setHtml(' ');}else H=x.createElement('br');H.insertBefore(G.getNext());H.scrollIntoView();H.remove();}}v.collapse(true);v.select(D);}};var m=j.enterkey,n=m.enterBr,o=m.enterBlock,p=/^h[1-6]$/;function q(t){if(t.mode!='wysiwyg')return false;return r(t,t.config.shiftEnterMode,1);};function r(t,u,v){v=t.config.forceEnterMode||v;if(t.mode!='wysiwyg')return false;if(!u)u=t.config.enterMode;setTimeout(function(){t.fire('saveSnapshot');if(u==2)n(t,u,null,v);else o(t,u,null,v);t.fire('saveSnapshot');},0);return true;};function s(t){var u=t.getSelection().getRanges(true);for(var v=u.length-1;v>0;v--)u[v].deleteContents();return u[0];};})();(function(){var m='nbsp,gt,lt,amp',n='quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro',o='Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml',p='Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv';
+function q(r,s){var t={},u=[],v={nbsp:'\xa0',shy:'Â',gt:'>',lt:'<',amp:'&',apos:"'",quot:'"'};r=r.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(A,B){var C=s?'&'+B+';':v[B],D=s?v[B]:'&'+B+';';t[C]=D;u.push(C);return '';});if(!s&&r){r=r.split(',');var w=document.createElement('div'),x;w.innerHTML='&'+r.join(';&')+';';x=w.innerHTML;w=null;for(var y=0;y<x.length;y++){var z=x.charAt(y);t[z]='&'+r[y]+';';u.push(z);}}t.regex=u.join(s?'|':'');return t;};j.add('entities',{afterInit:function(r){var s=r.config,t=r.dataProcessor,u=t&&t.htmlFilter;if(u){var v=[];if(s.basicEntities!==false)v.push(m);if(s.entities){if(v.length)v.push(n);if(s.entities_latin)v.push(o);if(s.entities_greek)v.push(p);if(s.entities_additional)v.push(s.entities_additional);}var w=q(v.join(',')),x=w.regex?'['+w.regex+']':'a^';delete w.regex;if(s.entities&&s.entities_processNumerical)x='[^ -~]|'+x;x=new RegExp(x,'g');function y(C){return s.entities_processNumerical=='force'||!w[C]?'&#'+C.charCodeAt(0)+';':w[C];};var z=q([m,'shy'].join(','),true),A=new RegExp(z.regex,'g');function B(C){return z[C];};u.addRules({text:function(C){return C.replace(A,B).replace(x,y);}});}}});})();i.basicEntities=true;i.entities=true;i.entities_latin=true;i.entities_greek=true;i.entities_additional='#39';(function(){function m(v,w){var x=[];if(!w)return v;else for(var y in w)x.push(y+'='+encodeURIComponent(w[y]));return v+(v.indexOf('?')!=-1?'&':'?')+x.join('&');};function n(v){v+='';var w=v.charAt(0).toUpperCase();return w+v.substr(1);};function o(v){var C=this;var w=C.getDialog(),x=w.getParentEditor();x._.filebrowserSe=C;var y=x.config['filebrowser'+n(w.getName())+'WindowWidth']||x.config.filebrowserWindowWidth||'80%',z=x.config['filebrowser'+n(w.getName())+'WindowHeight']||x.config.filebrowserWindowHeight||'70%',A=C.filebrowser.params||{};A.CKEditor=x.name;A.CKEditorFuncNum=x._.filebrowserFn;if(!A.langCode)A.langCode=x.langCode;var B=m(C.filebrowser.url,A);x.popup(B,y,z,x.config.filebrowserWindowFeatures||x.config.fileBrowserWindowFeatures);};function p(v){var y=this;var w=y.getDialog(),x=w.getParentEditor();x._.filebrowserSe=y;if(!w.getContentElement(y['for'][0],y['for'][1]).getInputElement().$.value)return false;if(!w.getContentElement(y['for'][0],y['for'][1]).getAction())return false;return true;};function q(v,w,x){var y=x.params||{};y.CKEditor=v.name;y.CKEditorFuncNum=v._.filebrowserFn;if(!y.langCode)y.langCode=v.langCode;w.action=m(x.url,y);w.filebrowser=x;};function r(v,w,x,y){var z,A;for(var B in y){z=y[B];
+if(z.type=='hbox'||z.type=='vbox'||z.type=='fieldset')r(v,w,x,z.children);if(!z.filebrowser)continue;if(typeof z.filebrowser=='string'){var C={action:z.type=='fileButton'?'QuickUpload':'Browse',target:z.filebrowser};z.filebrowser=C;}if(z.filebrowser.action=='Browse'){var D=z.filebrowser.url;if(D===undefined){D=v.config['filebrowser'+n(w)+'BrowseUrl'];if(D===undefined)D=v.config.filebrowserBrowseUrl;}if(D){z.onClick=o;z.filebrowser.url=D;z.hidden=false;}}else if(z.filebrowser.action=='QuickUpload'&&z['for']){D=z.filebrowser.url;if(D===undefined){D=v.config['filebrowser'+n(w)+'UploadUrl'];if(D===undefined)D=v.config.filebrowserUploadUrl;}if(D){var E=z.onClick;z.onClick=function(F){var G=F.sender;if(E&&E.call(G,F)===false)return false;return p.call(G,F);};z.filebrowser.url=D;z.hidden=false;q(v,x.getContents(z['for'][0]).get(z['for'][1]),z.filebrowser);}}}};function s(v,w){var x=w.getDialog(),y=w.filebrowser.target||null;if(y){var z=y.split(':'),A=x.getContentElement(z[0],z[1]);if(A){A.setValue(v);x.selectPage(z[0]);}}};function t(v,w,x){if(x.indexOf(';')!==-1){var y=x.split(';');for(var z=0;z<y.length;z++){if(t(v,w,y[z]))return true;}return false;}var A=v.getContents(w).get(x).filebrowser;return A&&A.url;};function u(v,w){var A=this;var x=A._.filebrowserSe.getDialog(),y=A._.filebrowserSe['for'],z=A._.filebrowserSe.filebrowser.onSelect;if(y)x.getContentElement(y[0],y[1]).reset();if(typeof w=='function'&&w.call(A._.filebrowserSe)===false)return;if(z&&z.call(A._.filebrowserSe,v,w)===false)return;if(typeof w=='string'&&w)alert(w);if(v)s(v,A._.filebrowserSe);};j.add('filebrowser',{init:function(v,w){v._.filebrowserFn=e.addFunction(u,v);v.on('destroy',function(){e.removeFunction(this._.filebrowserFn);});}});a.on('dialogDefinition',function(v){var w=v.data.definition,x;for(var y in w.contents){if(x=w.contents[y]){r(v.editor,v.data.name,w,x.elements);if(x.hidden&&x.filebrowser)x.hidden=!t(w,x.id,x.filebrowser);}}});})();j.add('find',{init:function(m){var n=j.find;m.ui.addButton('Find',{label:m.lang.findAndReplace.find,command:'find'});var o=m.addCommand('find',new a.dialogCommand('find'));o.canUndo=false;o.readOnly=1;m.ui.addButton('Replace',{label:m.lang.findAndReplace.replace,command:'replace'});var p=m.addCommand('replace',new a.dialogCommand('replace'));p.canUndo=false;a.dialog.add('find',this.path+'dialogs/find.js');a.dialog.add('replace',this.path+'dialogs/find.js');},requires:['styles']});i.find_highlight={element:'span',styles:{'background-color':'#004',color:'#fff'}};
+(function(){var m=/\.swf(?:$|\?)/i;function n(p){var q=p.attributes;return q.type=='application/x-shockwave-flash'||m.test(q.src||'');};function o(p,q){return p.createFakeParserElement(q,'cke_flash','flash',true);};j.add('flash',{init:function(p){p.addCommand('flash',new a.dialogCommand('flash'));p.ui.addButton('Flash',{label:p.lang.common.flash,command:'flash'});a.dialog.add('flash',this.path+'dialogs/flash.js');p.addCss('img.cke_flash{background-image: url('+a.getUrl(this.path+'images/placeholder.png')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 80px;'+'height: 80px;'+'}');if(p.addMenuItems)p.addMenuItems({flash:{label:p.lang.flash.properties,command:'flash',group:'flash'}});p.on('doubleclick',function(q){var r=q.data.element;if(r.is('img')&&r.data('cke-real-element-type')=='flash')q.data.dialog='flash';});if(p.contextMenu)p.contextMenu.addListener(function(q,r){if(q&&q.is('img')&&!q.isReadOnly()&&q.data('cke-real-element-type')=='flash')return{flash:2};});},afterInit:function(p){var q=p.dataProcessor,r=q&&q.dataFilter;if(r)r.addRules({elements:{'cke:object':function(s){var t=s.attributes,u=t.classid&&String(t.classid).toLowerCase();if(!u&&!n(s)){for(var v=0;v<s.children.length;v++){if(s.children[v].name=='cke:embed'){if(!n(s.children[v]))return null;return o(p,s);}}return null;}return o(p,s);},'cke:embed':function(s){if(!n(s))return null;return o(p,s);}}},5);},requires:['fakeobjects']});})();e.extend(i,{flashEmbedTagOnly:false,flashAddEmbedTag:true,flashConvertOnEdit:false});(function(){function m(n,o,p,q,r,s,t){var u=n.config,v=r.split(';'),w=[],x={};for(var y=0;y<v.length;y++){var z=v[y];if(z){z=z.split('/');var A={},B=v[y]=z[0];A[p]=w[y]=z[1]||B;x[B]=new a.style(t,A);x[B]._.definition.name=B;}else v.splice(y--,1);}n.ui.addRichCombo(o,{label:q.label,title:q.panelTitle,className:'cke_'+(p=='size'?'fontSize':'font'),panel:{css:n.skin.editor.css.concat(u.contentsCss),multiSelect:false,attributes:{'aria-label':q.panelTitle}},init:function(){this.startGroup(q.panelTitle);for(var C=0;C<v.length;C++){var D=v[C];this.add(D,x[D].buildPreview(),D);}},onClick:function(C){n.focus();n.fire('saveSnapshot');var D=x[C];if(this.getValue()==C)D.remove(n.document);else D.apply(n.document);n.fire('saveSnapshot');},onRender:function(){n.on('selectionChange',function(C){var D=this.getValue(),E=C.data.path,F=E.elements;for(var G=0,H;G<F.length;G++){H=F[G];for(var I in x){if(x[I].checkElementRemovable(H,true)){if(I!=D)this.setValue(I);
+return;}}}this.setValue('',s);},this);}});};j.add('font',{requires:['richcombo','styles'],init:function(n){var o=n.config;m(n,'Font','family',n.lang.font,o.font_names,o.font_defaultLabel,o.font_style);m(n,'FontSize','size',n.lang.fontSize,o.fontSize_sizes,o.fontSize_defaultLabel,o.fontSize_style);}});})();i.font_names='Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif';i.font_defaultLabel='';i.font_style={element:'span',styles:{'font-family':'#(family)'},overrides:[{element:'font',attributes:{face:null}}]};i.fontSize_sizes='8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px';i.fontSize_defaultLabel='';i.fontSize_style={element:'span',styles:{'font-size':'#(size)'},overrides:[{element:'font',attributes:{size:null}}]};j.add('format',{requires:['richcombo','styles'],init:function(m){var n=m.config,o=m.lang.format,p=n.format_tags.split(';'),q={};for(var r=0;r<p.length;r++){var s=p[r];q[s]=new a.style(n['format_'+s]);q[s]._.enterMode=m.config.enterMode;}m.ui.addRichCombo('Format',{label:o.label,title:o.panelTitle,className:'cke_format',panel:{css:m.skin.editor.css.concat(n.contentsCss),multiSelect:false,attributes:{'aria-label':o.panelTitle}},init:function(){this.startGroup(o.panelTitle);for(var t in q){var u=o['tag_'+t];this.add(t,q[t].buildPreview(u),u);}},onClick:function(t){m.focus();m.fire('saveSnapshot');var u=q[t],v=new d.elementPath(m.getSelection().getStartElement());u[u.checkActive(v)?'remove':'apply'](m.document);setTimeout(function(){m.fire('saveSnapshot');},0);},onRender:function(){m.on('selectionChange',function(t){var u=this.getValue(),v=t.data.path;for(var w in q){if(q[w].checkActive(v)){if(w!=u)this.setValue(w,m.lang.format['tag_'+w]);return;}}this.setValue('');},this);}});}});i.format_tags='p;h1;h2;h3;h4;h5;h6;pre;address;div';i.format_p={element:'p'};i.format_div={element:'div'};i.format_pre={element:'pre'};i.format_address={element:'address'};i.format_h1={element:'h1'};i.format_h2={element:'h2'};i.format_h3={element:'h3'};i.format_h4={element:'h4'};i.format_h5={element:'h5'};i.format_h6={element:'h6'};j.add('forms',{init:function(m){var n=m.lang;m.addCss('form{border: 1px dotted #FF0000;padding: 2px;}\n');
+m.addCss('img.cke_hidden{background-image: url('+a.getUrl(this.path+'images/hiddenfield.gif')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 16px !important;'+'height: 16px !important;'+'}');var o=function(q,r,s){m.addCommand(r,new a.dialogCommand(r));m.ui.addButton(q,{label:n.common[q.charAt(0).toLowerCase()+q.slice(1)],command:r});a.dialog.add(r,s);},p=this.path+'dialogs/';o('Form','form',p+'form.js');o('Checkbox','checkbox',p+'checkbox.js');o('Radio','radio',p+'radio.js');o('TextField','textfield',p+'textfield.js');o('Textarea','textarea',p+'textarea.js');o('Select','select',p+'select.js');o('Button','button',p+'button.js');o('ImageButton','imagebutton',j.getPath('image')+'dialogs/image.js');o('HiddenField','hiddenfield',p+'hiddenfield.js');if(m.addMenuItems)m.addMenuItems({form:{label:n.form.menu,command:'form',group:'form'},checkbox:{label:n.checkboxAndRadio.checkboxTitle,command:'checkbox',group:'checkbox'},radio:{label:n.checkboxAndRadio.radioTitle,command:'radio',group:'radio'},textfield:{label:n.textfield.title,command:'textfield',group:'textfield'},hiddenfield:{label:n.hidden.title,command:'hiddenfield',group:'hiddenfield'},imagebutton:{label:n.image.titleButton,command:'imagebutton',group:'imagebutton'},button:{label:n.button.title,command:'button',group:'button'},select:{label:n.select.title,command:'select',group:'select'},textarea:{label:n.textarea.title,command:'textarea',group:'textarea'}});if(m.contextMenu){m.contextMenu.addListener(function(q){if(q&&q.hasAscendant('form',true)&&!q.isReadOnly())return{form:2};});m.contextMenu.addListener(function(q){if(q&&!q.isReadOnly()){var r=q.getName();if(r=='select')return{select:2};if(r=='textarea')return{textarea:2};if(r=='input')switch(q.getAttribute('type')){case 'button':case 'submit':case 'reset':return{button:2};case 'checkbox':return{checkbox:2};case 'radio':return{radio:2};case 'image':return{imagebutton:2};default:return{textfield:2};}if(r=='img'&&q.data('cke-real-element-type')=='hiddenfield')return{hiddenfield:2};}});}m.on('doubleclick',function(q){var r=q.data.element;if(r.is('form'))q.data.dialog='form';else if(r.is('select'))q.data.dialog='select';else if(r.is('textarea'))q.data.dialog='textarea';else if(r.is('img')&&r.data('cke-real-element-type')=='hiddenfield')q.data.dialog='hiddenfield';else if(r.is('input'))switch(r.getAttribute('type')){case 'button':case 'submit':case 'reset':q.data.dialog='button';break;case 'checkbox':q.data.dialog='checkbox';
+break;case 'radio':q.data.dialog='radio';break;case 'image':q.data.dialog='imagebutton';break;default:q.data.dialog='textfield';break;}});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.htmlFilter,p=n&&n.dataFilter;if(c)o&&o.addRules({elements:{input:function(q){var r=q.attributes,s=r.type;if(!s)r.type='text';if(s=='checkbox'||s=='radio')r.value=='on'&&delete r.value;}}});if(p)p.addRules({elements:{input:function(q){if(q.attributes.type=='hidden')return m.createFakeParserElement(q,'cke_hidden','hiddenfield');}}});},requires:['image','fakeobjects']});if(c)h.prototype.hasAttribute=e.override(h.prototype.hasAttribute,function(m){return function(n){var q=this;var o=q.$.attributes.getNamedItem(n);if(q.getName()=='input')switch(n){case 'class':return q.$.className.length>0;case 'checked':return!!q.$.checked;case 'value':var p=q.getAttribute('type');return p=='checkbox'||p=='radio'?q.$.value!='on':q.$.value;}return m.apply(q,arguments);};});(function(){var m={canUndo:false,exec:function(o){var p=o.document.createElement('hr'),q=new d.range(o.document);o.insertElement(p);q.moveToPosition(p,4);var r=p.getNext();if(!r||r.type==1&&!r.isEditable())q.fixBlock(true,o.config.enterMode==3?'div':'p');q.select();}},n='horizontalrule';j.add(n,{init:function(o){o.addCommand(n,m);o.ui.addButton('HorizontalRule',{label:o.lang.horizontalrule,command:n});}});})();(function(){var m=/^[\t\r\n ]*(?: |\xa0)$/,n='{cke_protected}';function o(T){var U=T.children.length,V=T.children[U-1];while(V&&V.type==3&&!e.trim(V.value))V=T.children[--U];return V;};function p(T,U){var V=T.children,W=o(T);if(W){if((U||!c)&&W.type==1&&W.name=='br')V.pop();if(W.type==3&&m.test(W.value))V.pop();}};function q(T,U,V){if(!U&&(!V||typeof V=='function'&&V(T)===false))return false;if(U&&c&&(document.documentMode>7||T.name in f.tr||T.name in f.$listItem))return false;var W=o(T);return!W||W&&(W.type==1&&W.name=='br'||T.name=='form'&&W.name=='input');};function r(T,U){return function(V){p(V,!T);if(q(V,!T,U))if(T||c)V.add(new a.htmlParser.text('\xa0'));else V.add(new a.htmlParser.element('br',{}));};};var s=f,t=['caption','colgroup','col','thead','tfoot','tbody'],u=e.extend({},s.$block,s.$listItem,s.$tableContent);for(var v in u){if(!('br' in s[v]))delete u[v];}delete u.pre;var w={elements:{},attributeNames:[[/^on/,'data-cke-pa-on']]},x={elements:{}};for(v in u)x.elements[v]=r();var y={elementNames:[[/^cke:/,''],[/^\?xml:namespace$/,'']],attributeNames:[[/^data-cke-(saved|pa)-/,''],[/^data-cke-.*/,''],['hidefocus','']],elements:{$:function(T){var U=T.attributes;
+if(U){if(U['data-cke-temp'])return false;var V=['name','href','src'],W;for(var X=0;X<V.length;X++){W='data-cke-saved-'+V[X];W in U&&delete U[V[X]];}}return T;},table:function(T){var U=T.children;U.sort(function(V,W){return V.type==1&&W.type==V.type?e.indexOf(t,V.name)>e.indexOf(t,W.name)?1:-1:0;});},embed:function(T){var U=T.parent;if(U&&U.name=='object'){var V=U.attributes.width,W=U.attributes.height;V&&(T.attributes.width=V);W&&(T.attributes.height=W);}},param:function(T){T.children=[];T.isEmpty=true;return T;},a:function(T){if(!(T.children.length||T.attributes.name||T.attributes['data-cke-saved-name']))return false;},span:function(T){if(T.attributes['class']=='Apple-style-span')delete T.name;},pre:function(T){c&&p(T);},html:function(T){delete T.attributes.contenteditable;delete T.attributes['class'];},body:function(T){delete T.attributes.spellcheck;delete T.attributes.contenteditable;},style:function(T){var U=T.children[0];U&&U.value&&(U.value=e.trim(U.value));if(!T.attributes.type)T.attributes.type='text/css';},title:function(T){var U=T.children[0];U&&(U.value=T.attributes['data-cke-title']||'');}},attributes:{'class':function(T,U){return e.ltrim(T.replace(/(?:^|\s+)cke_[^\s]*/g,''))||false;}}};if(c)y.attributes.style=function(T,U){return T.replace(/(^|;)([^\:]+)/g,function(V){return V.toLowerCase();});};function z(T){var U=T.attributes;if(U.contenteditable!='false')U['data-cke-editable']=U.contenteditable?'true':1;U.contenteditable='false';};function A(T){var U=T.attributes;switch(U['data-cke-editable']){case 'true':U.contenteditable='true';break;case '1':delete U.contenteditable;break;}};for(v in {input:1,textarea:1}){w.elements[v]=z;y.elements[v]=A;}var B=/<(a|area|img|input)\b([^>]*)>/gi,C=/\b(on\w+|href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,D=/(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,E=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,F=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,G=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,H=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi;function I(T){return T.replace(B,function(U,V,W){return '<'+V+W.replace(C,function(X,Y){if(!/^on/.test(Y)&&W.indexOf('data-cke-saved-'+Y)==-1)return ' data-cke-saved-'+X+' data-cke-'+a.rnd+'-'+X;return X;})+'>';});};function J(T){return T.replace(D,function(U){return '<cke:encoded>'+encodeURIComponent(U)+'</cke:encoded>';});};function K(T){return T.replace(E,function(U,V){return decodeURIComponent(V);});};function L(T){return T.replace(F,'$1cke:$2');
+};function M(T){return T.replace(G,'$1$2');};function N(T){return T.replace(H,'<cke:$1$2></cke:$1>');};function O(T){return T.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,'$1$2$2');};function P(T){return T.replace(/<!--(?!{cke_protected})[\s\S]+?-->/g,function(U){return '<!--'+n+'{C}'+encodeURIComponent(U).replace(/--/g,'%2D%2D')+'-->';});};function Q(T){return T.replace(/<!--\{cke_protected\}\{C\}([\s\S]+?)-->/g,function(U,V){return decodeURIComponent(V);});};function R(T,U){var V=U._.dataStore;return T.replace(/<!--\{cke_protected\}([\s\S]+?)-->/g,function(W,X){return decodeURIComponent(X);}).replace(/\{cke_protected_(\d+)\}/g,function(W,X){return V&&V[X]||'';});};function S(T,U){var V=[],W=U.config.protectedSource,X=U._.dataStore||(U._.dataStore={id:1}),Y=/<\!--\{cke_temp(comment)?\}(\d*?)-->/g,Z=[/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi].concat(W);T=T.replace(/<!--[\s\S]*?-->/g,function(ab){return '<!--{cke_tempcomment}'+(V.push(ab)-1)+'-->';});for(var aa=0;aa<Z.length;aa++)T=T.replace(Z[aa],function(ab){ab=ab.replace(Y,function(ac,ad,ae){return V[ae];});return/cke_temp(comment)?/.test(ab)?ab:'<!--{cke_temp}'+(V.push(ab)-1)+'-->';});T=T.replace(Y,function(ab,ac,ad){return '<!--'+n+(ac?'{C}':'')+encodeURIComponent(V[ad]).replace(/--/g,'%2D%2D')+'-->';});return T.replace(/(['"]).*?\1/g,function(ab){return ab.replace(/<!--\{cke_protected\}([\s\S]+?)-->/g,function(ac,ad){X[X.id]=decodeURIComponent(ad);return '{cke_protected_'+X.id++ +'}';});});};j.add('htmldataprocessor',{requires:['htmlwriter'],init:function(T){var U=T.dataProcessor=new a.htmlDataProcessor(T);U.writer.forceSimpleAmpersand=T.config.forceSimpleAmpersand;U.dataFilter.addRules(w);U.dataFilter.addRules(x);U.htmlFilter.addRules(y);var V={elements:{}};for(v in u)V.elements[v]=r(true,T.config.fillEmptyBlocks);U.htmlFilter.addRules(V);},onLoad:function(){!('fillEmptyBlocks' in i)&&(i.fillEmptyBlocks=1);}});a.htmlDataProcessor=function(T){var U=this;U.editor=T;U.writer=new a.htmlWriter();U.dataFilter=new a.htmlParser.filter();U.htmlFilter=new a.htmlParser.filter();};a.htmlDataProcessor.prototype={toHtml:function(T,U){T=S(T,this.editor);T=I(T);T=J(T);T=L(T);T=N(T);T=O(T);var V=new h('div');V.setHtml('a'+T);T=V.getHtml().substr(1);T=T.replace(new RegExp(' data-cke-'+a.rnd+'-','ig'),' ');T=M(T);T=K(T);T=Q(T);var W=a.htmlParser.fragment.fromHtml(T,U),X=new a.htmlParser.basicWriter();W.writeHtml(X,this.dataFilter);T=X.getHtml(true);T=P(T);return T;},toDataFormat:function(T,U){var V=this.writer,W=a.htmlParser.fragment.fromHtml(T,U);
+V.reset();W.writeHtml(V,this.htmlFilter);var X=V.getHtml(true);X=Q(X);X=R(X,this.editor);return X;}};})();(function(){j.add('iframe',{requires:['dialog','fakeobjects'],init:function(m){var n='iframe',o=m.lang.iframe;a.dialog.add(n,this.path+'dialogs/iframe.js');m.addCommand(n,new a.dialogCommand(n));m.addCss('img.cke_iframe{background-image: url('+a.getUrl(this.path+'images/placeholder.png')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 80px;'+'height: 80px;'+'}');m.ui.addButton('Iframe',{label:o.toolbar,command:n});m.on('doubleclick',function(p){var q=p.data.element;if(q.is('img')&&q.data('cke-real-element-type')=='iframe')p.data.dialog='iframe';});if(m.addMenuItems)m.addMenuItems({iframe:{label:o.title,command:'iframe',group:'image'}});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(p&&p.is('img')&&p.data('cke-real-element-type')=='iframe')return{iframe:2};});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.dataFilter;if(o)o.addRules({elements:{iframe:function(p){return m.createFakeParserElement(p,'cke_iframe','iframe',true);}}});}});})();(function(){j.add('image',{init:function(o){var p='image';a.dialog.add(p,this.path+'dialogs/image.js');o.addCommand(p,new a.dialogCommand(p));o.ui.addButton('Image',{label:o.lang.common.image,command:p});o.on('doubleclick',function(q){var r=q.data.element;if(r.is('img')&&!r.data('cke-realelement')&&!r.isReadOnly())q.data.dialog='image';});if(o.addMenuItems)o.addMenuItems({image:{label:o.lang.image.menu,command:'image',group:'image'}});if(o.contextMenu)o.contextMenu.addListener(function(q,r){if(m(o,q))return{image:2};});},afterInit:function(o){p('left');p('right');p('center');p('block');function p(q){var r=o.getCommand('justify'+q);if(r){if(q=='left'||q=='right')r.on('exec',function(s){var t=m(o),u;if(t){u=n(t);if(u==q){t.removeStyle('float');if(q==n(t))t.removeAttribute('align');}else t.setStyle('float',q);s.cancel();}});r.on('refresh',function(s){var t=m(o),u;if(t){u=n(t);this.setState(u==q?1:q=='right'||q=='left'?2:0);s.cancel();}});}};}});function m(o,p){if(!p){var q=o.getSelection();p=q.getType()==3&&q.getSelectedElement();}if(p&&p.is('img')&&!p.data('cke-realelement')&&!p.isReadOnly())return p;};function n(o){var p=o.getStyle('float');if(p=='inherit'||p=='none')p=0;if(!p)p=o.getAttribute('align');return p;};})();i.image_removeLinkByEmptyURL=true;(function(){var m={ol:1,ul:1},n=d.walker.whitespaces(true),o=d.walker.bookmark(false,true);
+function p(t){var B=this;if(t.editor.readOnly)return null;var u=t.editor,v=t.data.path,w=v&&v.contains(m),x=v.block||v.blockLimit;if(w)return B.setState(2);if(!B.useIndentClasses&&B.name=='indent')return B.setState(2);if(!x)return B.setState(0);if(B.useIndentClasses){var y=x.$.className.match(B.classNameRegex),z=0;if(y){y=y[1];z=B.indentClassMap[y];}if(B.name=='outdent'&&!z||B.name=='indent'&&z==u.config.indentClasses.length)return B.setState(0);return B.setState(2);}else{var A=parseInt(x.getStyle(r(x)),10);if(isNaN(A))A=0;if(A<=0)return B.setState(0);return B.setState(2);}};function q(t,u){var w=this;w.name=u;w.useIndentClasses=t.config.indentClasses&&t.config.indentClasses.length>0;if(w.useIndentClasses){w.classNameRegex=new RegExp('(?:^|\\s+)('+t.config.indentClasses.join('|')+')(?=$|\\s)');w.indentClassMap={};for(var v=0;v<t.config.indentClasses.length;v++)w.indentClassMap[t.config.indentClasses[v]]=v+1;}w.startDisabled=u=='outdent';};function r(t,u){return(u||t.getComputedStyle('direction'))=='ltr'?'margin-left':'margin-right';};function s(t){return t.type==1&&t.is('li');};q.prototype={exec:function(t){var u=this,v={};function w(M){var N=C.startContainer,O=C.endContainer;while(N&&!N.getParent().equals(M))N=N.getParent();while(O&&!O.getParent().equals(M))O=O.getParent();if(!N||!O)return;var P=N,Q=[],R=false;while(!R){if(P.equals(O))R=true;Q.push(P);P=P.getNext();}if(Q.length<1)return;var S=M.getParents(true);for(var T=0;T<S.length;T++){if(S[T].getName&&m[S[T].getName()]){M=S[T];break;}}var U=u.name=='indent'?1:-1,V=Q[0],W=Q[Q.length-1],X=j.list.listToArray(M,v),Y=X[W.getCustomData('listarray_index')].indent;for(T=V.getCustomData('listarray_index');T<=W.getCustomData('listarray_index');T++){X[T].indent+=U;var Z=X[T].parent;X[T].parent=new h(Z.getName(),Z.getDocument());}for(T=W.getCustomData('listarray_index')+1;T<X.length&&X[T].indent>Y;T++)X[T].indent+=U;var aa=j.list.arrayToList(X,v,null,t.config.enterMode,M.getDirection());if(u.name=='outdent'){var ab;if((ab=M.getParent())&&ab.is('li')){var ac=aa.listNode.getChildren(),ad=[],ae=ac.count(),af;for(T=ae-1;T>=0;T--){if((af=ac.getItem(T))&&af.is&&af.is('li'))ad.push(af);}}}if(aa)aa.listNode.replace(M);if(ad&&ad.length)for(T=0;T<ad.length;T++){var ag=ad[T],ah=ag;while((ah=ah.getNext())&&ah.is&&ah.getName() in m){if(c&&!ag.getFirst(function(ai){return n(ai)&&o(ai);}))ag.append(C.document.createText('\xa0'));ag.append(ah);}ag.insertAfter(ab);}};function x(){var M=C.createIterator(),N=t.config.enterMode;M.enforceRealBlocks=true;
+M.enlargeBr=N!=2;var O;while(O=M.getNextParagraph(N==1?'p':'div'))y(O);};function y(M,N){if(M.getCustomData('indent_processed'))return false;if(u.useIndentClasses){var O=M.$.className.match(u.classNameRegex),P=0;if(O){O=O[1];P=u.indentClassMap[O];}if(u.name=='outdent')P--;else P++;if(P<0)return false;P=Math.min(P,t.config.indentClasses.length);P=Math.max(P,0);M.$.className=e.ltrim(M.$.className.replace(u.classNameRegex,''));if(P>0)M.addClass(t.config.indentClasses[P-1]);}else{var Q=r(M,N),R=parseInt(M.getStyle(Q),10);if(isNaN(R))R=0;var S=t.config.indentOffset||40;R+=(u.name=='indent'?1:-1)*S;if(R<0)return false;R=Math.max(R,0);R=Math.ceil(R/S)*S;M.setStyle(Q,R?R+(t.config.indentUnit||'px'):'');if(M.getAttribute('style')==='')M.removeAttribute('style');}h.setMarker(v,M,'indent_processed',1);return true;};var z=t.getSelection(),A=z.createBookmarks(1),B=z&&z.getRanges(1),C,D=B.createIterator();while(C=D.getNextRange()){var E=C.getCommonAncestor(),F=E;while(F&&!(F.type==1&&m[F.getName()]))F=F.getParent();if(!F){var G=C.getEnclosedNode();if(G&&G.type==1&&G.getName() in m){C.setStartAt(G,1);C.setEndAt(G,2);F=G;}}if(F&&C.startContainer.type==1&&C.startContainer.getName() in m){var H=new d.walker(C);H.evaluator=s;C.startContainer=H.next();}if(F&&C.endContainer.type==1&&C.endContainer.getName() in m){H=new d.walker(C);H.evaluator=s;C.endContainer=H.previous();}if(F){var I=F.getFirst(s),J=!!I.getNext(s),K=C.startContainer,L=I.equals(K)||I.contains(K);if(!(L&&(u.name=='indent'||u.useIndentClasses||parseInt(F.getStyle(r(F)),10))&&y(F,!J&&I.getDirection())))w(F);}else x();}h.clearAllMarkers(v);t.forceNextSelectionCheck();z.selectBookmarks(A);}};j.add('indent',{init:function(t){var u=t.addCommand('indent',new q(t,'indent')),v=t.addCommand('outdent',new q(t,'outdent'));t.ui.addButton('Indent',{label:t.lang.indent,command:'indent'});t.ui.addButton('Outdent',{label:t.lang.outdent,command:'outdent'});t.on('selectionChange',e.bind(p,u));t.on('selectionChange',e.bind(p,v));if(b.ie6Compat||b.ie7Compat)t.addCss('ul,ol{\tmargin-left: 0px;\tpadding-left: 40px;}');t.on('dirChanged',function(w){var x=new d.range(t.document);x.setStartBefore(w.data.node);x.setEndAfter(w.data.node);var y=new d.walker(x),z;while(z=y.next()){if(z.type==1){if(!z.equals(w.data.node)&&z.getDirection()){x.setStartAfter(z);y=new d.walker(x);continue;}var A=t.config.indentClasses;if(A){var B=w.data.dir=='ltr'?['_rtl','']:['','_rtl'];for(var C=0;C<A.length;C++){if(z.hasClass(A[C]+B[0])){z.removeClass(A[C]+B[0]);
+z.addClass(A[C]+B[1]);}}}var D=z.getStyle('margin-right'),E=z.getStyle('margin-left');D?z.setStyle('margin-left',D):z.removeStyle('margin-left');E?z.setStyle('margin-right',E):z.removeStyle('margin-right');}}});t.on('key',function(w){if(t.mode=='wysiwyg'&&w.data.keyCode==8){var x=t.getSelection(),y=x.getRanges()[0],z;if(y.collapsed&&(z=y.startContainer.getAscendant('li',1))&&y.checkBoundaryOfElement(z,1)){t.execCommand('outdent');w.cancel();}}});},requires:['domiterator','list']});})();(function(){function m(q,r){r=r===undefined||r;var s;if(r)s=q.getComputedStyle('text-align');else{while(!q.hasAttribute||!(q.hasAttribute('align')||q.getStyle('text-align'))){var t=q.getParent();if(!t)break;q=t;}s=q.getStyle('text-align')||q.getAttribute('align')||'';}s&&(s=s.replace(/(?:-(?:moz|webkit)-)?(?:start|auto)/i,''));!s&&r&&(s=q.getComputedStyle('direction')=='rtl'?'right':'left');return s;};function n(q){if(q.editor.readOnly)return;q.editor.getCommand(this.name).refresh(q.data.path);};function o(q,r,s){var u=this;u.editor=q;u.name=r;u.value=s;var t=q.config.justifyClasses;if(t){switch(s){case 'left':u.cssClassName=t[0];break;case 'center':u.cssClassName=t[1];break;case 'right':u.cssClassName=t[2];break;case 'justify':u.cssClassName=t[3];break;}u.cssClassRegex=new RegExp('(?:^|\\s+)(?:'+t.join('|')+')(?=$|\\s)');}};function p(q){var r=q.editor,s=new d.range(r.document);s.setStartBefore(q.data.node);s.setEndAfter(q.data.node);var t=new d.walker(s),u;while(u=t.next()){if(u.type==1){if(!u.equals(q.data.node)&&u.getDirection()){s.setStartAfter(u);t=new d.walker(s);continue;}var v=r.config.justifyClasses;if(v)if(u.hasClass(v[0])){u.removeClass(v[0]);u.addClass(v[2]);}else if(u.hasClass(v[2])){u.removeClass(v[2]);u.addClass(v[0]);}var w='text-align',x=u.getStyle(w);if(x=='left')u.setStyle(w,'right');else if(x=='right')u.setStyle(w,'left');}}};o.prototype={exec:function(q){var C=this;var r=q.getSelection(),s=q.config.enterMode;if(!r)return;var t=r.createBookmarks(),u=r.getRanges(true),v=C.cssClassName,w,x,y=q.config.useComputedState;y=y===undefined||y;for(var z=u.length-1;z>=0;z--){w=u[z].createIterator();w.enlargeBr=s!=2;while(x=w.getNextParagraph(s==1?'p':'div')){x.removeAttribute('align');x.removeStyle('text-align');var A=v&&(x.$.className=e.ltrim(x.$.className.replace(C.cssClassRegex,''))),B=C.state==2&&(!y||m(x,true)!=C.value);if(v){if(B)x.addClass(v);else if(!A)x.removeAttribute('class');}else if(B)x.setStyle('text-align',C.value);}}q.focus();q.forceNextSelectionCheck();
+r.selectBookmarks(t);},refresh:function(q){var r=q.block||q.blockLimit;this.setState(r.getName()!='body'&&m(r,this.editor.config.useComputedState)==this.value?1:2);}};j.add('justify',{init:function(q){var r=new o(q,'justifyleft','left'),s=new o(q,'justifycenter','center'),t=new o(q,'justifyright','right'),u=new o(q,'justifyblock','justify');q.addCommand('justifyleft',r);q.addCommand('justifycenter',s);q.addCommand('justifyright',t);q.addCommand('justifyblock',u);q.ui.addButton('JustifyLeft',{label:q.lang.justify.left,command:'justifyleft'});q.ui.addButton('JustifyCenter',{label:q.lang.justify.center,command:'justifycenter'});q.ui.addButton('JustifyRight',{label:q.lang.justify.right,command:'justifyright'});q.ui.addButton('JustifyBlock',{label:q.lang.justify.block,command:'justifyblock'});q.on('selectionChange',e.bind(n,r));q.on('selectionChange',e.bind(n,t));q.on('selectionChange',e.bind(n,s));q.on('selectionChange',e.bind(n,u));q.on('dirChanged',p);},requires:['domiterator']});})();j.add('keystrokes',{beforeInit:function(m){m.keystrokeHandler=new a.keystrokeHandler(m);m.specialKeys={};},init:function(m){var n=m.config.keystrokes,o=m.config.blockedKeystrokes,p=m.keystrokeHandler.keystrokes,q=m.keystrokeHandler.blockedKeystrokes;for(var r=0;r<n.length;r++)p[n[r][0]]=n[r][1];for(r=0;r<o.length;r++)q[o[r]]=1;}});a.keystrokeHandler=function(m){var n=this;if(m.keystrokeHandler)return m.keystrokeHandler;n.keystrokes={};n.blockedKeystrokes={};n._={editor:m};return n;};(function(){var m,n=function(p){p=p.data;var q=p.getKeystroke(),r=this.keystrokes[q],s=this._.editor;m=s.fire('key',{keyCode:q})===true;if(!m){if(r){var t={from:'keystrokeHandler'};m=s.execCommand(r,t)!==false;}if(!m){var u=s.specialKeys[q];m=u&&u(s)===true;if(!m)m=!!this.blockedKeystrokes[q];}}if(m)p.preventDefault(true);return!m;},o=function(p){if(m){m=false;p.data.preventDefault(true);}};a.keystrokeHandler.prototype={attach:function(p){p.on('keydown',n,this);if(b.opera||b.gecko&&b.mac)p.on('keypress',o,this);}};})();i.blockedKeystrokes=[1114112+66,1114112+73,1114112+85];i.keystrokes=[[4456448+121,'toolbarFocus'],[4456448+122,'elementsPathFocus'],[2228224+121,'contextMenu'],[1114112+2228224+121,'contextMenu'],[1114112+90,'undo'],[1114112+89,'redo'],[1114112+2228224+90,'redo'],[1114112+76,'link'],[1114112+66,'bold'],[1114112+73,'italic'],[1114112+85,'underline'],[4456448+(c||b.webkit?189:109),'toolbarCollapse'],[4456448+48,'a11yHelp']];j.add('link',{init:function(m){m.addCommand('link',new a.dialogCommand('link'));
+m.addCommand('anchor',new a.dialogCommand('anchor'));m.addCommand('unlink',new a.unlinkCommand());m.addCommand('removeAnchor',new a.removeAnchorCommand());m.ui.addButton('Link',{label:m.lang.link.toolbar,command:'link'});m.ui.addButton('Unlink',{label:m.lang.unlink,command:'unlink'});m.ui.addButton('Anchor',{label:m.lang.anchor.toolbar,command:'anchor'});a.dialog.add('link',this.path+'dialogs/link.js');a.dialog.add('anchor',this.path+'dialogs/anchor.js');var n=m.lang.dir=='rtl'?'right':'left',o='background:url('+a.getUrl(this.path+'images/anchor.gif')+') no-repeat '+n+' center;'+'border:1px dotted #00f;';m.addCss('a.cke_anchor,a.cke_anchor_empty'+(c&&b.version<7?'':',a[name],a[data-cke-saved-name]')+'{'+o+'padding-'+n+':18px;'+'cursor:auto;'+'}'+(c?'a.cke_anchor_empty{display:inline-block;}':'')+'img.cke_anchor'+'{'+o+'width:16px;'+'min-height:15px;'+'height:1.15em;'+'vertical-align:'+(b.opera?'middle':'text-bottom')+';'+'}');m.on('selectionChange',function(p){if(m.readOnly)return;var q=m.getCommand('unlink'),r=p.data.path.lastElement&&p.data.path.lastElement.getAscendant('a',true);if(r&&r.getName()=='a'&&r.getAttribute('href')&&r.getChildCount())q.setState(2);else q.setState(0);});m.on('doubleclick',function(p){var q=j.link.getSelectedLink(m)||p.data.element;if(!q.isReadOnly())if(q.is('a')){p.data.dialog=q.getAttribute('name')&&(!q.getAttribute('href')||!q.getChildCount())?'anchor':'link';m.getSelection().selectElement(q);}else if(j.link.tryRestoreFakeAnchor(m,q))p.data.dialog='anchor';});if(m.addMenuItems)m.addMenuItems({anchor:{label:m.lang.anchor.menu,command:'anchor',group:'anchor',order:1},removeAnchor:{label:m.lang.anchor.remove,command:'removeAnchor',group:'anchor',order:5},link:{label:m.lang.link.menu,command:'link',group:'link',order:1},unlink:{label:m.lang.unlink,command:'unlink',group:'link',order:5}});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(!p||p.isReadOnly())return null;var r=j.link.tryRestoreFakeAnchor(m,p);if(!r&&!(r=j.link.getSelectedLink(m)))return null;var s={};if(r.getAttribute('href')&&r.getChildCount())s={link:2,unlink:2};if(r&&r.hasAttribute('name'))s.anchor=s.removeAnchor=2;return s;});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.dataFilter,p=n&&n.htmlFilter,q=m._.elementsPath&&m._.elementsPath.filters;if(o)o.addRules({elements:{a:function(r){var s=r.attributes;if(!s.name)return null;var t=!r.children.length;if(j.link.synAnchorSelector){var u=t?'cke_anchor_empty':'cke_anchor',v=s['class'];if(s.name&&(!v||v.indexOf(u)<0))s['class']=(v||'')+' '+u;
+if(t&&j.link.emptyAnchorFix){s.contenteditable='false';s['data-cke-editable']=1;}}else if(j.link.fakeAnchor&&t)return m.createFakeParserElement(r,'cke_anchor','anchor');return null;}}});if(j.link.emptyAnchorFix&&p)p.addRules({elements:{a:function(r){delete r.attributes.contenteditable;}}});if(q)q.push(function(r,s){if(s=='a')if(j.link.tryRestoreFakeAnchor(m,r)||r.getAttribute('name')&&(!r.getAttribute('href')||!r.getChildCount()))return 'anchor';});},requires:['fakeobjects']});j.link={getSelectedLink:function(m){try{var n=m.getSelection();if(n.getType()==3){var o=n.getSelectedElement();if(o.is('a'))return o;}var p=n.getRanges(true)[0];p.shrink(2);var q=p.getCommonAncestor();return q.getAscendant('a',true);}catch(r){return null;}},fakeAnchor:b.opera||b.webkit,synAnchorSelector:c,emptyAnchorFix:c&&b.version<8,tryRestoreFakeAnchor:function(m,n){if(n&&n.data('cke-real-element-type')&&n.data('cke-real-element-type')=='anchor'){var o=m.restoreRealElement(n);if(o.data('cke-saved-name'))return o;}}};a.unlinkCommand=function(){};a.unlinkCommand.prototype={exec:function(m){var n=m.getSelection(),o=n.createBookmarks(),p=n.getRanges(),q,r;for(var s=0;s<p.length;s++){q=p[s].getCommonAncestor(true);r=q.getAscendant('a',true);if(!r)continue;p[s].selectNodeContents(r);}n.selectRanges(p);m.document.$.execCommand('unlink',false,null);n.selectBookmarks(o);},startDisabled:true};a.removeAnchorCommand=function(){};a.removeAnchorCommand.prototype={exec:function(m){var n=m.getSelection(),o=n.createBookmarks(),p;if(n&&(p=n.getSelectedElement())&&(j.link.fakeAnchor&&!p.getChildCount()?j.link.tryRestoreFakeAnchor(m,p):p.is('a')))p.remove(1);else if(p=j.link.getSelectedLink(m))if(p.hasAttribute('href')){p.removeAttributes({name:1,'data-cke-saved-name':1});p.removeClass('cke_anchor');}else p.remove(1);n.selectBookmarks(o);}};e.extend(i,{linkShowAdvancedTab:true,linkShowTargetTab:true});(function(){var m={ol:1,ul:1},n=/^[\n\r\t ]*$/,o=d.walker.whitespaces(),p=d.walker.bookmark(),q=function(L){return!(o(L)||p(L));},r=d.walker.bogus();function s(L){var M,N,O;if(M=L.getDirection()){N=L.getParent();while(N&&!(O=N.getDirection()))N=N.getParent();if(M==O)L.removeAttribute('dir');}};j.list={listToArray:function(L,M,N,O,P){if(!m[L.getName()])return[];if(!O)O=0;if(!N)N=[];for(var Q=0,R=L.getChildCount();Q<R;Q++){var S=L.getChild(Q);if(S.type==1&&S.getName() in f.$list)j.list.listToArray(S,M,N,O+1);if(S.$.nodeName.toLowerCase()!='li')continue;var T={parent:L,indent:O,element:S,contents:[]};if(!P){T.grandparent=L.getParent();
+if(T.grandparent&&T.grandparent.$.nodeName.toLowerCase()=='li')T.grandparent=T.grandparent.getParent();}else T.grandparent=P;if(M)h.setMarker(M,S,'listarray_index',N.length);N.push(T);for(var U=0,V=S.getChildCount(),W;U<V;U++){W=S.getChild(U);if(W.type==1&&m[W.getName()])j.list.listToArray(W,M,N,O+1,T.grandparent);else T.contents.push(W);}}return N;},arrayToList:function(L,M,N,O,P){if(!N)N=0;if(!L||L.length<N+1)return null;var Q,R=L[N].parent.getDocument(),S=new d.documentFragment(R),T=null,U=N,V=Math.max(L[N].indent,0),W=null,X,Y,Z=O==1?'p':'div';while(1){var aa=L[U];X=aa.element.getDirection(1);if(aa.indent==V){if(!T||L[U].parent.getName()!=T.getName()){T=L[U].parent.clone(false,1);P&&T.setAttribute('dir',P);S.append(T);}W=T.append(aa.element.clone(0,1));if(X!=T.getDirection(1))W.setAttribute('dir',X);for(Q=0;Q<aa.contents.length;Q++)W.append(aa.contents[Q].clone(1,1));U++;}else if(aa.indent==Math.max(V,0)+1){var ab=L[U-1].element.getDirection(1),ac=j.list.arrayToList(L,null,U,O,ab!=X?X:null);if(!W.getChildCount()&&c&&!(R.$.documentMode>7))W.append(R.createText('\xa0'));W.append(ac.listNode);U=ac.nextIndex;}else if(aa.indent==-1&&!N&&aa.grandparent){if(m[aa.grandparent.getName()])W=aa.element.clone(false,true);else W=new d.documentFragment(R);var ad=aa.grandparent.getDirection(1)!=X,ae=W.type==11&&O!=2,af=aa.element,ag=af.getAttribute('class'),ah=af.getAttribute('style'),ai,aj=aa.contents.length;for(Q=0;Q<aj;Q++){ai=aa.contents[Q];if(ai.type==1&&ai.isBlockBoundary()){if(ad&&!ai.getDirection())ai.setAttribute('dir',X);ah&&ai.setAttribute('style',ah.replace(/([^;])$/,'$1;')+(ai.getAttribute('style')||''));ag&&ai.addClass(ag);}else if(ad||ae||ah||ag){if(!Y){Y=R.createElement(Z);ad&&Y.setAttribute('dir',X);}ah&&Y.setAttribute('style',ah);ag&&Y.setAttribute('class',ag);Y.append(ai.clone(1,1));}W.append(Y||ai.clone(1,1));}if(W.type==11&&U!=L.length-1){var ak=W.getLast();if(ak&&ak.type==1&&ak.getAttribute('type')=='_moz')ak.remove();if(!(ak=W.getLast(q)&&ak.type==1&&ak.getName() in f.$block))W.append(R.createElement('br'));}var al=W.$.nodeName.toLowerCase();if(!c&&(al=='div'||al=='p'))W.appendBogus();S.append(W);T=null;U++;}else return null;Y=null;if(L.length<=U||Math.max(L[U].indent,0)<V)break;}if(M){var am=S.getFirst(),an=L[0].parent;while(am){if(am.type==1){h.clearMarkers(M,am);if(am.getName() in f.$listItem)s(am);}am=am.getNextSourceNode();}}return{listNode:S,nextIndex:U};}};function t(L){if(L.editor.readOnly)return null;var M=L.data.path,N=M.blockLimit,O=M.elements,P,Q;
+for(Q=0;Q<O.length&&(P=O[Q])&&!P.equals(N);Q++){if(m[O[Q].getName()])return this.setState(this.type==O[Q].getName()?1:2);}return this.setState(2);};function u(L,M,N,O){var P=j.list.listToArray(M.root,N),Q=[];for(var R=0;R<M.contents.length;R++){var S=M.contents[R];S=S.getAscendant('li',true);if(!S||S.getCustomData('list_item_processed'))continue;Q.push(S);h.setMarker(N,S,'list_item_processed',true);}var T=M.root,U=T.getDocument().createElement(this.type);T.copyAttributes(U,{start:1,type:1});U.removeStyle('list-style-type');for(R=0;R<Q.length;R++){var V=Q[R].getCustomData('listarray_index');P[V].parent=U;}var W=j.list.arrayToList(P,N,null,L.config.enterMode),X,Y=W.listNode.getChildCount();for(R=0;R<Y&&(X=W.listNode.getChild(R));R++){if(X.getName()==this.type)O.push(X);}W.listNode.replace(M.root);};var v=/^h[1-6]$/;function w(L,M,N){var O=M.contents,P=M.root.getDocument(),Q=[];if(O.length==1&&O[0].equals(M.root)){var R=P.createElement('div');O[0].moveChildren&&O[0].moveChildren(R);O[0].append(R);O[0]=R;}var S=M.contents[0].getParent();for(var T=0;T<O.length;T++)S=S.getCommonAncestor(O[T].getParent());var U=L.config.useComputedState,V,W;U=U===undefined||U;for(T=0;T<O.length;T++){var X=O[T],Y;while(Y=X.getParent()){if(Y.equals(S)){Q.push(X);if(!W&&X.getDirection())W=1;var Z=X.getDirection(U);if(V!==null)if(V&&V!=Z)V=null;else V=Z;break;}X=Y;}}if(Q.length<1)return;var aa=Q[Q.length-1].getNext(),ab=P.createElement(this.type);N.push(ab);var ac,ad;while(Q.length){ac=Q.shift();ad=P.createElement('li');if(ac.is('pre')||v.test(ac.getName()))ac.appendTo(ad);else{ac.copyAttributes(ad);if(V&&ac.getDirection()){ad.removeStyle('direction');ad.removeAttribute('dir');}ac.moveChildren(ad);ac.remove();}ad.appendTo(ab);}if(V&&W)ab.setAttribute('dir',V);if(aa)ab.insertBefore(aa);else ab.appendTo(S);};function x(L,M,N){var O=j.list.listToArray(M.root,N),P=[];for(var Q=0;Q<M.contents.length;Q++){var R=M.contents[Q];R=R.getAscendant('li',true);if(!R||R.getCustomData('list_item_processed'))continue;P.push(R);h.setMarker(N,R,'list_item_processed',true);}var S=null;for(Q=0;Q<P.length;Q++){var T=P[Q].getCustomData('listarray_index');O[T].indent=-1;S=T;}for(Q=S+1;Q<O.length;Q++){if(O[Q].indent>O[Q-1].indent+1){var U=O[Q-1].indent+1-O[Q].indent,V=O[Q].indent;while(O[Q]&&O[Q].indent>=V){O[Q].indent+=U;Q++;}Q--;}}var W=j.list.arrayToList(O,N,null,L.config.enterMode,M.root.getAttribute('dir')),X=W.listNode,Y,Z;function aa(ab){if((Y=X[ab?'getFirst':'getLast']())&&!(Y.is&&Y.isBlockBoundary())&&(Z=M.root[ab?'getPrevious':'getNext'](d.walker.whitespaces(true)))&&!(Z.is&&Z.isBlockBoundary({br:1})))L.document.createElement('br')[ab?'insertBefore':'insertAfter'](Y);
+};aa(true);aa();X.replace(M.root);};function y(L,M){this.name=L;this.type=M;};var z=d.walker.nodeType(1);function A(L,M,N,O){var P,Q;while(P=L.getFirst(z)){if((Q=P.getDirection(1))!==M.getDirection(1))P.setAttribute('dir',Q);P.remove();N?P[O?'insertBefore':'insertAfter'](N):M.append(P,O);}};y.prototype={exec:function(L){var M=L.document,N=L.config,O=L.getSelection(),P=O&&O.getRanges(true);if(!P||P.length<1)return;if(this.state==2){var Q=M.getBody();if(!Q.getFirst(q)){N.enterMode==2?Q.appendBogus():P[0].fixBlock(1,N.enterMode==1?'p':'div');O.selectRanges(P);}else{var R=P.length==1&&P[0],S=R&&R.getEnclosedNode();if(S&&S.is&&this.type==S.getName())this.setState(1);}}var T=O.createBookmarks(true),U=[],V={},W=P.createIterator(),X=0;while((R=W.getNextRange())&&++X){var Y=R.getBoundaryNodes(),Z=Y.startNode,aa=Y.endNode;if(Z.type==1&&Z.getName()=='td')R.setStartAt(Y.startNode,1);if(aa.type==1&&aa.getName()=='td')R.setEndAt(Y.endNode,2);var ab=R.createIterator(),ac;ab.forceBrBreak=this.state==2;while(ac=ab.getNextParagraph()){if(ac.getCustomData('list_block'))continue;else h.setMarker(V,ac,'list_block',1);var ad=new d.elementPath(ac),ae=ad.elements,af=ae.length,ag=null,ah=0,ai=ad.blockLimit,aj;for(var ak=af-1;ak>=0&&(aj=ae[ak]);ak--){if(m[aj.getName()]&&ai.contains(aj)){ai.removeCustomData('list_group_object_'+X);var al=aj.getCustomData('list_group_object');if(al)al.contents.push(ac);else{al={root:aj,contents:[ac]};U.push(al);h.setMarker(V,aj,'list_group_object',al);}ah=1;break;}}if(ah)continue;var am=ai;if(am.getCustomData('list_group_object_'+X))am.getCustomData('list_group_object_'+X).contents.push(ac);else{al={root:am,contents:[ac]};h.setMarker(V,am,'list_group_object_'+X,al);U.push(al);}}}var an=[];while(U.length>0){al=U.shift();if(this.state==2){if(m[al.root.getName()])u.call(this,L,al,V,an);else w.call(this,L,al,an);}else if(this.state==1&&m[al.root.getName()])x.call(this,L,al,V);}for(ak=0;ak<an.length;ak++){ag=an[ak];var ao,ap=this;(ao=function(aq){var ar=ag[aq?'getPrevious':'getNext'](d.walker.whitespaces(true));if(ar&&ar.getName&&ar.getName()==ap.type){A(ag,ar,null,!aq);ag.remove();ag=ar;}})();ao(1);}h.clearAllMarkers(V);O.selectBookmarks(T);L.focus();}};var B=f,C=/[\t\r\n ]*(?: |\xa0)$/;function D(L,M){var N,O=L.children,P=O.length;for(var Q=0;Q<P;Q++){N=O[Q];if(N.name&&N.name in M)return Q;}return P;};function E(L){return function(M){var N=M.children,O=D(M,B.$list),P=N[O],Q=P&&P.previous,R;if(Q&&(Q.name&&Q.name=='br'||Q.value&&(R=Q.value.match(C)))){var S=Q;
+if(!(R&&R.index)&&S==N[0])N[0]=L||c?new a.htmlParser.text('\xa0'):new a.htmlParser.element('br',{});else if(S.name=='br')N.splice(O-1,1);else S.value=S.value.replace(C,'');}};};var F={elements:{}};for(var G in B.$listItem)F.elements[G]=E();var H={elements:{}};for(G in B.$listItem)H.elements[G]=E(true);function I(L){return L.type==1&&(L.getName() in f.$block||L.getName() in f.$listItem)&&f[L.getName()]['#'];};function J(L,M,N){L.fire('saveSnapshot');N.enlarge(3);var O=N.extractContents();M.trim(false,true);var P=new d.elementPath(M.startContainer),Q=P.lastElement.getAscendant('li',1),R=P.block.getBogus();R&&R.remove();var S=O.getLast();if(S&&S.type==1&&S.is('br'))S.remove();var T=M.startContainer.getChild(M.startOffset);if(T)O.insertBefore(T);else M.startContainer.append(O);var U=new d.elementPath(N.startContainer),V=N.startContainer.getAscendant('li',1);if(V){var W=K(V);if(W)if(Q.contains(V)){A(W,V.getParent(),V);W.remove();}else Q.append(W);}if(N.checkStartOfBlock()&&N.checkEndOfBlock()){var X=U.block,Y=X.getParent();X.remove();if(Y&&!Y.getFirst(q)&&!Y.equals(U.blockLimit))Y.remove();}M.select();L.fire('saveSnapshot');};function K(L){var M=L.getLast(q);return M&&M.type==1&&M.getName() in m?M:null;};j.add('list',{init:function(L){var M=L.addCommand('numberedlist',new y('numberedlist','ol')),N=L.addCommand('bulletedlist',new y('bulletedlist','ul'));L.ui.addButton('NumberedList',{label:L.lang.numberedlist,command:'numberedlist'});L.ui.addButton('BulletedList',{label:L.lang.bulletedlist,command:'bulletedlist'});L.on('selectionChange',e.bind(t,M));L.on('selectionChange',e.bind(t,N));if(b.ie8Compat)L.on('key',function(O){var P=O.data.keyCode;if(L.mode=='wysiwyg'&&P in {8:1,46:1}){var Q=L.getSelection(),R=Q.getRanges()[0];if(!R.collapsed)return;var S=P==8,T=L.document.getBody(),U=new d.walker(R.clone());U.evaluator=function(ad){return q(ad)&&!r(ad);};var V=R.clone();if(S){U.range.setStartAt(T,1);U.range.setEnd(R.startContainer,R.startOffset);var W=U.previous();if(W&&W.type==1&&W.getName() in m){U.range.selectNodeContents(W);U.reset();U.evaluator=I;V.moveToElementEditEnd(U.lastForward());J(L,V,R);O.cancel();}}else{var X=R.startContainer.getAscendant('li',1);if(X){U.range.setEndAt(T,2);var Y=X.getLast(q),Z=Y&&I(Y)?Y:X,aa=0,ab=U.next();if(ab&&ab.type==1&&ab.getName() in m&&ab.equals(Y)){aa=1;ab=U.next();}else if(R.checkBoundaryOfElement(Z,2))aa=1;if(aa&&ab){var ac=R.clone();ac.moveToElementEditStart(ab);J(L,V,ac);O.cancel();}}}}});},afterInit:function(L){var M=L.dataProcessor;
+if(M){M.dataFilter.addRules(F);M.htmlFilter.addRules(H);}},requires:['domiterator']});})();(function(){j.liststyle={requires:['dialog'],init:function(m){m.addCommand('numberedListStyle',new a.dialogCommand('numberedListStyle'));a.dialog.add('numberedListStyle',this.path+'dialogs/liststyle.js');m.addCommand('bulletedListStyle',new a.dialogCommand('bulletedListStyle'));a.dialog.add('bulletedListStyle',this.path+'dialogs/liststyle.js');if(m.addMenuItems){m.addMenuGroup('list',108);m.addMenuItems({numberedlist:{label:m.lang.list.numberedTitle,group:'list',command:'numberedListStyle'},bulletedlist:{label:m.lang.list.bulletedTitle,group:'list',command:'bulletedListStyle'}});}if(m.contextMenu)m.contextMenu.addListener(function(n,o){if(!n||n.isReadOnly())return null;while(n){var p=n.getName();if(p=='ol')return{numberedlist:2};else if(p=='ul')return{bulletedlist:2};n=n.getParent();}return null;});}};j.add('liststyle',j.liststyle);})();(function(){function m(s){if(!s||s.type!=1||s.getName()!='form')return[];var t=[],u=['style','className'];for(var v=0;v<u.length;v++){var w=u[v],x=s.$.elements.namedItem(w);if(x){var y=new h(x);t.push([y,y.nextSibling]);y.remove();}}return t;};function n(s,t){if(!s||s.type!=1||s.getName()!='form')return;if(t.length>0)for(var u=t.length-1;u>=0;u--){var v=t[u][0],w=t[u][1];if(w)v.insertBefore(w);else v.appendTo(s);}};function o(s,t){var u=m(s),v={},w=s.$;if(!t){v['class']=w.className||'';w.className='';}v.inline=w.style.cssText||'';if(!t)w.style.cssText='position: static; overflow: visible';n(u);return v;};function p(s,t){var u=m(s),v=s.$;if('class' in t)v.className=t['class'];if('inline' in t)v.style.cssText=t.inline;n(u);};function q(s){var t=a.instances;for(var u in t){var v=t[u];if(v.mode=='wysiwyg'&&!v.readOnly){var w=v.document.getBody();w.setAttribute('contentEditable',false);w.setAttribute('contentEditable',true);}}if(s.focusManager.hasFocus){s.toolbox.focus();s.focus();}};function r(s){if(!c||b.version>6)return null;var t=h.createFromHtml('<iframe frameborder="0" tabindex="-1" src="javascript:void((function(){document.open();'+(b.isCustomDomain()?"document.domain='"+this.getDocument().$.domain+"';":'')+'document.close();'+'})())"'+' style="display:block;position:absolute;z-index:-1;'+'progid:DXImageTransform.Microsoft.Alpha(opacity=0);'+'"></iframe>');return s.append(t,true);};j.add('maximize',{init:function(s){var t=s.lang,u=a.document,v=u.getWindow(),w,x,y,z;function A(){var C=v.getViewPaneSize();z&&z.setStyles({width:C.width+'px',height:C.height+'px'});
+s.resize(C.width,C.height,null,true);};var B=2;s.addCommand('maximize',{modes:{wysiwyg:!b.iOS,source:!b.iOS},readOnly:1,editorFocus:false,exec:function(){var C=s.container.getChild(1),D=s.getThemeSpace('contents');if(s.mode=='wysiwyg'){var E=s.getSelection();w=E&&E.getRanges();x=v.getScrollPosition();}else{var F=s.textarea.$;w=!c&&[F.selectionStart,F.selectionEnd];x=[F.scrollLeft,F.scrollTop];}if(this.state==2){v.on('resize',A);y=v.getScrollPosition();var G=s.container;while(G=G.getParent()){G.setCustomData('maximize_saved_styles',o(G));G.setStyle('z-index',s.config.baseFloatZIndex-1);}D.setCustomData('maximize_saved_styles',o(D,true));C.setCustomData('maximize_saved_styles',o(C,true));var H={overflow:b.webkit?'':'hidden',width:0,height:0};u.getDocumentElement().setStyles(H);!b.gecko&&u.getDocumentElement().setStyle('position','fixed');!(b.gecko&&b.quirks)&&u.getBody().setStyles(H);c?setTimeout(function(){v.$.scrollTo(0,0);},0):v.$.scrollTo(0,0);C.setStyle('position',b.gecko&&b.quirks?'fixed':'absolute');C.$.offsetLeft;C.setStyles({'z-index':s.config.baseFloatZIndex-1,left:'0px',top:'0px'});z=r(C);C.addClass('cke_maximized');A();var I=C.getDocumentPosition();C.setStyles({left:-1*I.x+'px',top:-1*I.y+'px'});b.gecko&&q(s);}else if(this.state==1){v.removeListener('resize',A);var J=[D,C];for(var K=0;K<J.length;K++){p(J[K],J[K].getCustomData('maximize_saved_styles'));J[K].removeCustomData('maximize_saved_styles');}G=s.container;while(G=G.getParent()){p(G,G.getCustomData('maximize_saved_styles'));G.removeCustomData('maximize_saved_styles');}c?setTimeout(function(){v.$.scrollTo(y.x,y.y);},0):v.$.scrollTo(y.x,y.y);C.removeClass('cke_maximized');if(b.webkit){C.setStyle('display','inline');setTimeout(function(){C.setStyle('display','block');},0);}if(z){z.remove();z=null;}s.fire('resize');}this.toggleState();var L=this.uiItems[0];if(L){var M=this.state==2?t.maximize:t.minimize,N=s.element.getDocument().getById(L._.id);N.getChild(1).setHtml(M);N.setAttribute('title',M);N.setAttribute('href','javascript:void("'+M+'");');}if(s.mode=='wysiwyg'){if(w){b.gecko&&q(s);s.getSelection().selectRanges(w);var O=s.getSelection().getStartElement();O&&O.scrollIntoView(true);}else v.$.scrollTo(x.x,x.y);}else{if(w){F.selectionStart=w[0];F.selectionEnd=w[1];}F.scrollLeft=x[0];F.scrollTop=x[1];}w=x=null;B=this.state;},canUndo:false});s.ui.addButton('Maximize',{label:t.maximize,command:'maximize'});s.on('mode',function(){var C=s.getCommand('maximize');C.setState(C.state==0?0:B);},null,null,100);
+}});})();j.add('newpage',{init:function(m){m.addCommand('newpage',{modes:{wysiwyg:1,source:1},exec:function(n){var o=this;n.setData(n.config.newpage_html||'',function(){setTimeout(function(){n.fire('afterCommandExec',{name:o.name,command:o});n.selectionChange();},200);});n.focus();},async:true});m.ui.addButton('NewPage',{label:m.lang.newPage,command:'newpage'});}});j.add('pagebreak',{init:function(m){m.addCommand('pagebreak',j.pagebreakCmd);m.ui.addButton('PageBreak',{label:m.lang.pagebreak,command:'pagebreak'});var n=['{','background: url('+a.getUrl(this.path+'images/pagebreak.gif')+') no-repeat center center;','clear: both;','width:100%; _width:99.9%;','border-top: #999999 1px dotted;','border-bottom: #999999 1px dotted;','padding:0;','height: 5px;','cursor: default;','}'].join('').replace(/;/g,' !important;');m.addCss('div.cke_pagebreak'+n);b.opera&&m.on('contentDom',function(){m.document.on('click',function(o){var p=o.data.getTarget();if(p.is('div')&&p.hasClass('cke_pagebreak'))m.getSelection().selectElement(p);});});},afterInit:function(m){var n=m.lang.pagebreakAlt,o=m.dataProcessor,p=o&&o.dataFilter,q=o&&o.htmlFilter;if(q)q.addRules({attributes:{'class':function(r,s){var t=r.replace('cke_pagebreak','');if(t!=r){var u=a.htmlParser.fragment.fromHtml('<span style="display: none;"> </span>');s.children.length=0;s.add(u);var v=s.attributes;delete v['aria-label'];delete v.contenteditable;delete v.title;}return t;}}},5);if(p)p.addRules({elements:{div:function(r){var s=r.attributes,t=s&&s.style,u=t&&r.children.length==1&&r.children[0],v=u&&u.name=='span'&&u.attributes.style;if(v&&/page-break-after\s*:\s*always/i.test(t)&&/display\s*:\s*none/i.test(v)){s.contenteditable='false';s['class']='cke_pagebreak';s['data-cke-display-name']='pagebreak';s['aria-label']=n;s.title=n;r.children.length=0;}}}});},requires:['fakeobjects']});j.pagebreakCmd={exec:function(m){var n=m.lang.pagebreakAlt,o=h.createFromHtml('<div style="page-break-after: always;"contenteditable="false" title="'+n+'" '+'aria-label="'+n+'" '+'data-cke-display-name="pagebreak" '+'class="cke_pagebreak">'+'</div>',m.document),p=m.getSelection().getRanges(true);m.fire('saveSnapshot');for(var q,r=p.length-1;r>=0;r--){q=p[r];if(r<p.length-1)o=o.clone(true);q.splitBlock('p');q.insertNode(o);if(r==p.length-1){var s=o.getNext();q.moveToPosition(o,4);if(!s||s.type==1&&!s.isEditable())q.fixBlock(true,m.config.enterMode==3?'div':'p');q.select();}}m.fire('saveSnapshot');}};(function(){function m(n){n.data.mode='html';
+};j.add('pastefromword',{init:function(n){var o=0,p=function(q){q&&q.removeListener();n.removeListener('beforePaste',m);o&&setTimeout(function(){o=0;},0);};n.addCommand('pastefromword',{canUndo:false,exec:function(){o=1;n.on('beforePaste',m);if(n.execCommand('paste','html')===false){n.on('dialogShow',function(q){q.removeListener();q.data.on('cancel',p);});n.on('dialogHide',function(q){q.data.removeListener('cancel',p);});}n.on('afterPaste',p);}});n.ui.addButton('PasteFromWord',{label:n.lang.pastefromword.toolbar,command:'pastefromword'});n.on('pasteState',function(q){n.getCommand('pastefromword').setState(q.data);});n.on('paste',function(q){var r=q.data,s;if((s=r.html)&&(o||/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(s))){var t=this.loadFilterRules(function(){if(t)n.fire('paste',r);else if(!n.config.pasteFromWordPromptCleanup||o||confirm(n.lang.pastefromword.confirmCleanup))r.html=a.cleanWord(s,n);});t&&q.cancel();}},this);},loadFilterRules:function(n){var o=a.cleanWord;if(o)n();else{var p=a.getUrl(i.pasteFromWordCleanupFile||this.path+'filter/default.js');a.scriptLoader.load(p,n,null,true);}return!o;},requires:['clipboard']});})();(function(){var m={exec:function(n){var o=e.tryThese(function(){var p=window.clipboardData.getData('Text');if(!p)throw 0;return p;});if(!o){n.openDialog('pastetext');return false;}else n.fire('paste',{text:o});return true;}};j.add('pastetext',{init:function(n){var o='pastetext',p=n.addCommand(o,m);n.ui.addButton('PasteText',{label:n.lang.pasteText.button,command:o});a.dialog.add(o,a.getUrl(this.path+'dialogs/pastetext.js'));if(n.config.forcePasteAsPlainText){n.on('beforeCommandExec',function(q){var r=q.data.commandData;if(q.data.name=='paste'&&r!='html'){n.execCommand('pastetext');q.cancel();}},null,null,0);n.on('beforePaste',function(q){q.data.mode='text';});}n.on('pasteState',function(q){n.getCommand('pastetext').setState(q.data);});},requires:['clipboard']});})();j.add('popup');e.extend(a.editor.prototype,{popup:function(m,n,o,p){n=n||'80%';o=o||'70%';if(typeof n=='string'&&n.length>1&&n.substr(n.length-1,1)=='%')n=parseInt(window.screen.width*parseInt(n,10)/100,10);if(typeof o=='string'&&o.length>1&&o.substr(o.length-1,1)=='%')o=parseInt(window.screen.height*parseInt(o,10)/100,10);if(n<640)n=640;if(o<420)o=420;var q=parseInt((window.screen.height-o)/2,10),r=parseInt((window.screen.width-n)/2,10);p=(p||'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes')+',width='+n+',height='+o+',top='+q+',left='+r;
+var s=window.open('',null,p,true);if(!s)return false;try{var t=navigator.userAgent.toLowerCase();if(t.indexOf(' chrome/18')==-1){s.moveTo(r,q);s.resizeTo(n,o);}s.focus();s.location.href=m;}catch(u){s=window.open(m,null,p,true);}return true;}});(function(){var m={modes:{wysiwyg:1,source:1},canUndo:false,readOnly:1,exec:function(o){var p,q=o.config,r=q.baseHref?'<base href="'+q.baseHref+'"/>':'',s=b.isCustomDomain();if(q.fullPage)p=o.getData().replace(/<head>/,'$&'+r).replace(/[^>]*(?=<\/title>)/,'$& — '+o.lang.preview);else{var t='<body ',u=o.document&&o.document.getBody();if(u){if(u.getAttribute('id'))t+='id="'+u.getAttribute('id')+'" ';if(u.getAttribute('class'))t+='class="'+u.getAttribute('class')+'" ';}t+='>';p=o.config.docType+'<html dir="'+o.config.contentsLangDirection+'">'+'<head>'+r+'<title>'+o.lang.preview+'</title>'+e.buildStyleHtml(o.config.contentsCss)+'</head>'+t+o.getData()+'</body></html>';}var v=640,w=420,x=80;try{var y=window.screen;v=Math.round(y.width*0.8);w=Math.round(y.height*0.7);x=Math.round(y.width*0.1);}catch(C){}var z='';if(s){window._cke_htmlToLoad=p;z='javascript:void( (function(){document.open();document.domain="'+document.domain+'";'+'document.write( window.opener._cke_htmlToLoad );'+'document.close();'+'window.opener._cke_htmlToLoad = null;'+'})() )';}var A=window.open(z,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+v+',height='+w+',left='+x);if(!s){var B=A.document;B.open();B.write(p);B.close();b.webkit&&setTimeout(function(){B.body.innerHTML+='';},0);}}},n='preview';j.add(n,{init:function(o){o.addCommand(n,m);o.ui.addButton('Preview',{label:o.lang.preview,command:n});}});})();j.add('print',{init:function(m){var n='print',o=m.addCommand(n,j.print);m.ui.addButton('Print',{label:m.lang.print,command:n});}});j.print={exec:function(m){if(b.opera)return;else if(b.gecko)m.window.$.print();else m.document.$.execCommand('Print');},canUndo:false,readOnly:1,modes:{wysiwyg:!b.opera}};j.add('removeformat',{requires:['selection'],init:function(m){m.addCommand('removeFormat',j.removeformat.commands.removeformat);m.ui.addButton('RemoveFormat',{label:m.lang.removeFormat,command:'removeFormat'});m._.removeFormat={filters:[]};}});j.removeformat={commands:{removeformat:{exec:function(m){var n=m._.removeFormatRegex||(m._.removeFormatRegex=new RegExp('^(?:'+m.config.removeFormatTags.replace(/,/g,'|')+')$','i')),o=m._.removeAttributes||(m._.removeAttributes=m.config.removeFormatAttributes.split(',')),p=j.removeformat.filter,q=m.getSelection().getRanges(1),r=q.createIterator(),s;
+while(s=r.getNextRange()){if(!s.collapsed)s.enlarge(1);var t=s.createBookmark(),u=t.startNode,v=t.endNode,w,x=function(z){var A=new d.elementPath(z),B=A.elements;for(var C=1,D;D=B[C];C++){if(D.equals(A.block)||D.equals(A.blockLimit))break;if(n.test(D.getName())&&p(m,D))z.breakParent(D);}};x(u);if(v){x(v);w=u.getNextSourceNode(true,1);while(w){if(w.equals(v))break;var y=w.getNextSourceNode(false,1);if(!(w.getName()=='img'&&w.data('cke-realelement'))&&p(m,w))if(n.test(w.getName()))w.remove(1);else{w.removeAttributes(o);m.fire('removeFormatCleanup',w);}w=y;}}s.moveToBookmark(t);}m.getSelection().selectRanges(q);}}},filter:function(m,n){var o=m._.removeFormat.filters;for(var p=0;p<o.length;p++){if(o[p](n)===false)return false;}return true;}};a.editor.prototype.addRemoveFormatFilter=function(m){this._.removeFormat.filters.push(m);};i.removeFormatTags='b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var';i.removeFormatAttributes='class,style,lang,width,height,align,hspace,valign';j.add('resize',{init:function(m){var n=m.config,o=m.element.getDirection(1);!n.resize_dir&&(n.resize_dir='both');n.resize_maxWidth==undefined&&(n.resize_maxWidth=3000);n.resize_maxHeight==undefined&&(n.resize_maxHeight=3000);n.resize_minWidth==undefined&&(n.resize_minWidth=750);n.resize_minHeight==undefined&&(n.resize_minHeight=250);if(n.resize_enabled!==false){var p=null,q,r,s=(n.resize_dir=='both'||n.resize_dir=='horizontal')&&n.resize_minWidth!=n.resize_maxWidth,t=(n.resize_dir=='both'||n.resize_dir=='vertical')&&n.resize_minHeight!=n.resize_maxHeight;function u(x){var y=x.data.$.screenX-q.x,z=x.data.$.screenY-q.y,A=r.width,B=r.height,C=A+y*(o=='rtl'?-1:1),D=B+z;if(s)A=Math.max(n.resize_minWidth,Math.min(C,n.resize_maxWidth));if(t)B=Math.max(n.resize_minHeight,Math.min(D,n.resize_maxHeight));m.resize(s?A:null,B);};function v(x){a.document.removeListener('mousemove',u);a.document.removeListener('mouseup',v);if(m.document){m.document.removeListener('mousemove',u);m.document.removeListener('mouseup',v);}};var w=e.addFunction(function(x){if(!p)p=m.getResizable();r={width:p.$.offsetWidth||0,height:p.$.offsetHeight||0};q={x:x.screenX,y:x.screenY};n.resize_minWidth>r.width&&(n.resize_minWidth=r.width);n.resize_minHeight>r.height&&(n.resize_minHeight=r.height);a.document.on('mousemove',u);a.document.on('mouseup',v);if(m.document){m.document.on('mousemove',u);m.document.on('mouseup',v);}});m.on('destroy',function(){e.removeFunction(w);});m.on('themeSpace',function(x){if(x.data.space=='bottom'){var y='';
+if(s&&!t)y=' cke_resizer_horizontal';if(!s&&t)y=' cke_resizer_vertical';var z='<div class="cke_resizer'+y+' cke_resizer_'+o+'"'+' title="'+e.htmlEncode(m.lang.resize)+'"'+' onmousedown="CKEDITOR.tools.callFunction('+w+', event)"'+'></div>';o=='ltr'&&y=='ltr'?x.data.html+=z:x.data.html=z+x.data.html;}},m,null,100);}}});(function(){var m={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(o){var p=o.element.$.form;if(p)try{p.submit();}catch(q){if(p.submit.click)p.submit.click();}}},n='save';j.add(n,{init:function(o){var p=o.addCommand(n,m);p.modes={wysiwyg:!!o.element.$.form};o.ui.addButton('Save',{label:o.lang.save,command:n});}});})();(function(){var m='scaytcheck',n='';function o(t,u){var v=0,w;for(w in u){if(u[w]==t){v=1;break;}}return v;};var p=function(){var t=this,u=function(){var y=t.config,z={};z.srcNodeRef=t.document.getWindow().$.frameElement;z.assocApp='CKEDITOR.'+a.version+'@'+a.revision;z.customerid=y.scayt_customerid||'1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2';z.customDictionaryIds=y.scayt_customDictionaryIds||'';z.userDictionaryName=y.scayt_userDictionaryName||'';z.sLang=y.scayt_sLang||'en_US';z.onLoad=function(){if(!(c&&b.version<8))this.addStyle(this.selectorCss(),'padding-bottom: 2px !important;');if(t.focusManager.hasFocus&&!q.isControlRestored(t))this.focus();};z.onBeforeChange=function(){if(q.getScayt(t)&&!t.checkDirty())setTimeout(function(){t.resetDirty();},0);};var A=window.scayt_custom_params;if(typeof A=='object')for(var B in A)z[B]=A[B];if(q.getControlId(t))z.id=q.getControlId(t);var C=new window.scayt(z);C.afterMarkupRemove.push(function(E){new h(E,C.document).mergeSiblings();});var D=q.instances[t.name];if(D){C.sLang=D.sLang;C.option(D.option());C.paused=D.paused;}q.instances[t.name]=C;try{C.setDisabled(q.isPaused(t)===false);}catch(E){}t.fire('showScaytState');};t.on('contentDom',u);t.on('contentDomUnload',function(){var y=a.document.getElementsByTag('script'),z=/^dojoIoScript(\d+)$/i,A=/^https?:\/\/svc\.webspellchecker\.net\/spellcheck\/script\/ssrv\.cgi/i;for(var B=0;B<y.count();B++){var C=y.getItem(B),D=C.getId(),E=C.getAttribute('src');if(D&&E&&D.match(z)&&E.match(A))C.remove();}});t.on('beforeCommandExec',function(y){if((y.data.name=='source'||y.data.name=='newpage')&&t.mode=='wysiwyg'){var z=q.getScayt(t);if(z){q.setPaused(t,!z.disabled);q.setControlId(t,z.id);z.destroy(true);delete q.instances[t.name];}}else if(y.data.name=='source'&&t.mode=='source')q.markControlRestore(t);});t.on('afterCommandExec',function(y){if(!q.isScaytEnabled(t))return;
+if(t.mode=='wysiwyg'&&(y.data.name=='undo'||y.data.name=='redo'))window.setTimeout(function(){q.getScayt(t).refresh();},10);});t.on('destroy',function(y){var z=y.editor,A=q.getScayt(z);if(!A)return;delete q.instances[z.name];q.setControlId(z,A.id);A.destroy(true);});t.on('afterSetData',function(){if(q.isScaytEnabled(t))window.setTimeout(function(){var y=q.getScayt(t);y&&y.refresh();},10);});t.on('insertElement',function(){var y=q.getScayt(t);if(q.isScaytEnabled(t)){if(c)t.getSelection().unlock(true);window.setTimeout(function(){y.focus();y.refresh();},10);}},this,null,50);t.on('insertHtml',function(){var y=q.getScayt(t);if(q.isScaytEnabled(t)){if(c)t.getSelection().unlock(true);window.setTimeout(function(){y.focus();y.refresh();},10);}},this,null,50);t.on('scaytDialog',function(y){y.data.djConfig=window.djConfig;y.data.scayt_control=q.getScayt(t);y.data.tab=n;y.data.scayt=window.scayt;});var v=t.dataProcessor,w=v&&v.htmlFilter;if(w)w.addRules({elements:{span:function(y){if(y.attributes['data-scayt_word']&&y.attributes['data-scaytid']){delete y.name;return y;}}}});var x=j.undo.Image.prototype;x.equals=e.override(x.equals,function(y){return function(z){var E=this;var A=E.contents,B=z.contents,C=q.getScayt(E.editor);if(C&&q.isScaytReady(E.editor)){E.contents=C.reset(A)||'';z.contents=C.reset(B)||'';}var D=y.apply(E,arguments);E.contents=A;z.contents=B;return D;};});if(t.document)u();};j.scayt={engineLoaded:false,instances:{},controlInfo:{},setControlInfo:function(t,u){if(t&&t.name&&typeof this.controlInfo[t.name]!='object')this.controlInfo[t.name]={};for(var v in u)this.controlInfo[t.name][v]=u[v];},isControlRestored:function(t){if(t&&t.name&&this.controlInfo[t.name])return this.controlInfo[t.name].restored;return false;},markControlRestore:function(t){this.setControlInfo(t,{restored:true});},setControlId:function(t,u){this.setControlInfo(t,{id:u});},getControlId:function(t){if(t&&t.name&&this.controlInfo[t.name]&&this.controlInfo[t.name].id)return this.controlInfo[t.name].id;return null;},setPaused:function(t,u){this.setControlInfo(t,{paused:u});},isPaused:function(t){if(t&&t.name&&this.controlInfo[t.name])return this.controlInfo[t.name].paused;return undefined;},getScayt:function(t){return this.instances[t.name];},isScaytReady:function(t){return this.engineLoaded===true&&'undefined'!==typeof window.scayt&&this.getScayt(t);},isScaytEnabled:function(t){var u=this.getScayt(t);return u?u.disabled===false:false;},getUiTabs:function(t){var u=[],v=t.config.scayt_uiTabs||'1,1,1';
+v=v.split(',');v[3]='1';for(var w=0;w<4;w++)u[w]=typeof window.scayt!='undefined'&&typeof window.scayt.uiTags!='undefined'?parseInt(v[w],10)&&window.scayt.uiTags[w]:parseInt(v[w],10);return u;},loadEngine:function(t){if(b.gecko&&b.version<10900||b.opera||b.air)return t.fire('showScaytState');if(this.engineLoaded===true)return p.apply(t);else if(this.engineLoaded==-1)return a.on('scaytReady',function(){p.apply(t);});a.on('scaytReady',p,t);a.on('scaytReady',function(){this.engineLoaded=true;},this,null,0);this.engineLoaded=-1;var u=document.location.protocol;u=u.search(/https?:/)!=-1?u:'http:';var v='svc.webspellchecker.net/scayt26/loader__base.js',w=t.config.scayt_srcUrl||u+'//'+v,x=q.parseUrl(w).path+'/';if(window.scayt==undefined){a._djScaytConfig={baseUrl:x,addOnLoad:[function(){a.fireOnce('scaytReady');}],isDebug:false};a.document.getHead().append(a.document.createElement('script',{attributes:{type:'text/javascript',async:'true',src:w}}));}else a.fireOnce('scaytReady');return null;},parseUrl:function(t){var u;if(t.match&&(u=t.match(/(.*)[\/\\](.*?\.\w+)$/)))return{path:u[1],file:u[2]};else return t;}};var q=j.scayt,r=function(t,u,v,w,x,y,z){t.addCommand(w,x);t.addMenuItem(w,{label:v,command:w,group:y,order:z});},s={preserveState:true,editorFocus:false,canUndo:false,exec:function(t){if(q.isScaytReady(t)){var u=q.isScaytEnabled(t);this.setState(u?2:1);var v=q.getScayt(t);v.focus();v.setDisabled(u);}else if(!t.config.scayt_autoStartup&&q.engineLoaded>=0){this.setState(0);q.loadEngine(t);}}};j.add('scayt',{requires:['menubutton'],beforeInit:function(t){var u=t.config.scayt_contextMenuItemsOrder||'suggest|moresuggest|control',v='';u=u.split('|');if(u&&u.length)for(var w=0;w<u.length;w++)v+='scayt_'+u[w]+(u.length!=parseInt(w,10)+1?',':'');t.config.menu_groups=v+','+t.config.menu_groups;},init:function(t){var u=t.dataProcessor&&t.dataProcessor.dataFilter,v={elements:{span:function(E){var F=E.attributes;if(F&&F['data-scaytid'])delete E.name;}}};u&&u.addRules(v);var w={},x={},y=t.addCommand(m,s);a.dialog.add(m,a.getUrl(this.path+'dialogs/options.js'));var z=q.getUiTabs(t),A='scaytButton';t.addMenuGroup(A);var B={},C=t.lang.scayt;B.scaytToggle={label:C.enable,command:m,group:A};if(z[0]==1)B.scaytOptions={label:C.options,group:A,onClick:function(){n='options';t.openDialog(m);}};if(z[1]==1)B.scaytLangs={label:C.langs,group:A,onClick:function(){n='langs';t.openDialog(m);}};if(z[2]==1)B.scaytDict={label:C.dictionariesTab,group:A,onClick:function(){n='dictionaries';t.openDialog(m);
+}};B.scaytAbout={label:t.lang.scayt.about,group:A,onClick:function(){n='about';t.openDialog(m);}};t.addMenuItems(B);t.ui.add('Scayt','menubutton',{label:C.title,title:b.opera?C.opera_title:C.title,className:'cke_button_scayt',modes:{wysiwyg:1},onRender:function(){y.on('state',function(){this.setState(y.state);},this);},onMenu:function(){var E=q.isScaytEnabled(t);t.getMenuItem('scaytToggle').label=C[E?'disable':'enable'];var F=q.getUiTabs(t);return{scaytToggle:2,scaytOptions:E&&F[0]?2:0,scaytLangs:E&&F[1]?2:0,scaytDict:E&&F[2]?2:0,scaytAbout:E&&F[3]?2:0};}});if(t.contextMenu&&t.addMenuItems)t.contextMenu.addListener(function(E,F){if(!q.isScaytEnabled(t)||F.getRanges()[0].checkReadOnly())return null;var G=q.getScayt(t),H=G.getScaytNode();if(!H)return null;var I=G.getWord(H);if(!I)return null;var J=G.getLang(),K={},L=window.scayt.getSuggestion(I,J);if(!L||!L.length)return null;for(var M in w){delete t._.menuItems[M];delete t._.commands[M];}for(M in x){delete t._.menuItems[M];delete t._.commands[M];}w={};x={};var N=t.config.scayt_moreSuggestions||'on',O=false,P=t.config.scayt_maxSuggestions;typeof P!='number'&&(P=5);!P&&(P=L.length);var Q=t.config.scayt_contextCommands||'all';Q=Q.split('|');for(var R=0,S=L.length;R<S;R+=1){var T='scayt_suggestion_'+L[R].replace(' ','_'),U=(function(Y,Z){return{exec:function(){G.replace(Y,Z);}};})(H,L[R]);if(R<P){r(t,'button_'+T,L[R],T,U,'scayt_suggest',R+1);K[T]=2;x[T]=2;}else if(N=='on'){r(t,'button_'+T,L[R],T,U,'scayt_moresuggest',R+1);w[T]=2;O=true;}}if(O){t.addMenuItem('scayt_moresuggest',{label:C.moreSuggestions,group:'scayt_moresuggest',order:10,getItems:function(){return w;}});x.scayt_moresuggest=2;}if(o('all',Q)||o('ignore',Q)){var V={exec:function(){G.ignore(H);}};r(t,'ignore',C.ignore,'scayt_ignore',V,'scayt_control',1);x.scayt_ignore=2;}if(o('all',Q)||o('ignoreall',Q)){var W={exec:function(){G.ignoreAll(H);}};r(t,'ignore_all',C.ignoreAll,'scayt_ignore_all',W,'scayt_control',2);x.scayt_ignore_all=2;}if(o('all',Q)||o('add',Q)){var X={exec:function(){window.scayt.addWordToUserDictionary(H);}};r(t,'add_word',C.addWord,'scayt_add_word',X,'scayt_control',3);x.scayt_add_word=2;}if(G.fireOnContextMenu)G.fireOnContextMenu(t);return x;});var D=function(){t.removeListener('showScaytState',D);if(!b.opera&&!b.air)y.setState(q.isScaytEnabled(t)?1:2);else y.setState(0);};t.on('showScaytState',D);if(b.opera||b.air)t.on('instanceReady',function(){D();});if(t.config.scayt_autoStartup)t.on('instanceReady',function(){q.loadEngine(t);});
+},afterInit:function(t){var u,v=function(w){if(w.hasAttribute('data-scaytid'))return false;};if(t._.elementsPath&&(u=t._.elementsPath.filters))u.push(v);t.addRemoveFormatFilter&&t.addRemoveFormatFilter(v);}});})();j.add('smiley',{requires:['dialog'],init:function(m){m.config.smiley_path=m.config.smiley_path||this.path+'images/';m.addCommand('smiley',new a.dialogCommand('smiley'));m.ui.addButton('Smiley',{label:m.lang.smiley.toolbar,command:'smiley'});a.dialog.add('smiley',this.path+'dialogs/smiley.js');}});i.smiley_images=['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'];i.smiley_descriptions=['smiley','sad','wink','laugh','frown','cheeky','blush','surprise','indecision','angry','angel','cool','devil','crying','enlightened','no','yes','heart','broken heart','kiss','mail'];(function(){var m='.%2 p,.%2 div,.%2 pre,.%2 address,.%2 blockquote,.%2 h1,.%2 h2,.%2 h3,.%2 h4,.%2 h5,.%2 h6{background-repeat: no-repeat;background-position: top %3;border: 1px dotted gray;padding-top: 8px;padding-%3: 8px;}.%2 p{%1p.png);}.%2 div{%1div.png);}.%2 pre{%1pre.png);}.%2 address{%1address.png);}.%2 blockquote{%1blockquote.png);}.%2 h1{%1h1.png);}.%2 h2{%1h2.png);}.%2 h3{%1h3.png);}.%2 h4{%1h4.png);}.%2 h5{%1h5.png);}.%2 h6{%1h6.png);}',n=/%1/g,o=/%2/g,p=/%3/g,q={readOnly:1,preserveState:true,editorFocus:false,exec:function(r){this.toggleState();this.refresh(r);},refresh:function(r){if(r.document){var s=this.state==1?'addClass':'removeClass';r.document.getBody()[s]('cke_show_blocks');}}};j.add('showblocks',{requires:['wysiwygarea'],init:function(r){var s=r.addCommand('showblocks',q);s.canUndo=false;if(r.config.startupOutlineBlocks)s.setState(1);r.addCss(m.replace(n,'background-image: url('+a.getUrl(this.path)+'images/block_').replace(o,'cke_show_blocks ').replace(p,r.lang.dir=='rtl'?'right':'left'));r.ui.addButton('ShowBlocks',{label:r.lang.showBlocks,command:'showblocks'});r.on('mode',function(){if(s.state!=0)s.refresh(r);});r.on('contentDom',function(){if(s.state!=0)s.refresh(r);});}});})();(function(){var m='cke_show_border',n,o=(b.ie6Compat?['.%1 table.%2,','.%1 table.%2 td, .%1 table.%2 th','{','border : #d3d3d3 1px dotted','}']:['.%1 table.%2,','.%1 table.%2 > tr > td, .%1 table.%2 > tr > th,','.%1 table.%2 > tbody > tr > td, .%1 table.%2 > tbody > tr > th,','.%1 table.%2 > thead > tr > td, .%1 table.%2 > thead > tr > th,','.%1 table.%2 > tfoot > tr > td, .%1 table.%2 > tfoot > tr > th','{','border : #d3d3d3 1px dotted','}']).join('');
+n=o.replace(/%2/g,m).replace(/%1/g,'cke_show_borders ');var p={preserveState:true,editorFocus:false,readOnly:1,exec:function(q){this.toggleState();this.refresh(q);},refresh:function(q){if(q.document){var r=this.state==1?'addClass':'removeClass';q.document.getBody()[r]('cke_show_borders');}}};j.add('showborders',{requires:['wysiwygarea'],modes:{wysiwyg:1},init:function(q){var r=q.addCommand('showborders',p);r.canUndo=false;if(q.config.startupShowBorders!==false)r.setState(1);q.addCss(n);q.on('mode',function(){if(r.state!=0)r.refresh(q);},null,null,100);q.on('contentDom',function(){if(r.state!=0)r.refresh(q);});q.on('removeFormatCleanup',function(s){var t=s.data;if(q.getCommand('showborders').state==1&&t.is('table')&&(!t.hasAttribute('border')||parseInt(t.getAttribute('border'),10)<=0))t.addClass(m);});},afterInit:function(q){var r=q.dataProcessor,s=r&&r.dataFilter,t=r&&r.htmlFilter;if(s)s.addRules({elements:{table:function(u){var v=u.attributes,w=v['class'],x=parseInt(v.border,10);if((!x||x<=0)&&(!w||w.indexOf(m)==-1))v['class']=(w||'')+' '+m;}}});if(t)t.addRules({elements:{table:function(u){var v=u.attributes,w=v['class'];w&&(v['class']=w.replace(m,'').replace(/\s{2}/,' ').replace(/^\s+|\s+$/,''));}}});}});a.on('dialogDefinition',function(q){var r=q.data.name;if(r=='table'||r=='tableProperties'){var s=q.data.definition,t=s.getContents('info'),u=t.get('txtBorder'),v=u.commit;u.commit=e.override(v,function(y){return function(z,A){y.apply(this,arguments);var B=parseInt(this.getValue(),10);A[!B||B<=0?'addClass':'removeClass'](m);};});var w=s.getContents('advanced'),x=w&&w.get('advCSSClasses');if(x){x.setup=e.override(x.setup,function(y){return function(){y.apply(this,arguments);this.setValue(this.getValue().replace(/cke_show_border/,''));};});x.commit=e.override(x.commit,function(y){return function(z,A){y.apply(this,arguments);if(!parseInt(A.getAttribute('border'),10))A.addClass('cke_show_border');};});}}});})();j.add('sourcearea',{requires:['editingblock'],init:function(m){var n=j.sourcearea,o=a.document.getWindow();m.on('editingBlockReady',function(){var p,q;m.addMode('source',{load:function(r,s){if(c&&b.version<8)r.setStyle('position','relative');m.textarea=p=new h('textarea');p.setAttributes({dir:'ltr',tabIndex:b.webkit?-1:m.tabIndex,role:'textbox','aria-label':m.lang.editorTitle.replace('%1',m.name)});p.addClass('cke_source');p.addClass('cke_enable_context_menu');m.readOnly&&p.setAttribute('readOnly','readonly');var t={width:b.ie7Compat?'99%':'100%',height:'100%',resize:'none',outline:'none','text-align':'left'};
+if(c){q=function(){p.hide();p.setStyle('height',r.$.clientHeight+'px');p.setStyle('width',r.$.clientWidth+'px');p.show();};m.on('resize',q);o.on('resize',q);setTimeout(q,0);}r.setHtml('');r.append(p);p.setStyles(t);m.fire('ariaWidget',p);p.on('blur',function(){m.focusManager.blur();});p.on('focus',function(){m.focusManager.focus();});m.mayBeDirty=true;this.loadData(s);var u=m.keystrokeHandler;if(u)u.attach(p);setTimeout(function(){m.mode='source';m.fire('mode',{previousMode:m._.previousMode});},b.gecko||b.webkit?100:0);},loadData:function(r){p.setValue(r);m.fire('dataReady');},getData:function(){return p.getValue();},getSnapshotData:function(){return p.getValue();},unload:function(r){p.clearCustomData();m.textarea=p=null;if(q){m.removeListener('resize',q);o.removeListener('resize',q);}if(c&&b.version<8)r.removeStyle('position');},focus:function(){p.focus();}});});m.on('readOnly',function(){if(m.mode=='source')if(m.readOnly)m.textarea.setAttribute('readOnly','readonly');else m.textarea.removeAttribute('readOnly');});m.addCommand('source',n.commands.source);if(m.ui.addButton)m.ui.addButton('Source',{label:m.lang.source,command:'source'});m.on('mode',function(){m.getCommand('source').setState(m.mode=='source'?1:2);});}});j.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:false,readOnly:1,exec:function(m){if(m.mode=='wysiwyg')m.fire('saveSnapshot');m.getCommand('source').setState(0);m.setMode(m.mode=='source'?'wysiwyg':'source');},canUndo:false}}};(function(){j.add('stylescombo',{requires:['richcombo','styles'],init:function(n){var o=n.config,p=n.lang.stylesCombo,q={},r=[],s;function t(u){n.getStylesSet(function(v){if(!r.length){var w,x;for(var y=0,z=v.length;y<z;y++){var A=v[y];x=A.name;w=q[x]=new a.style(A);w._name=x;w._.enterMode=o.enterMode;r.push(w);}r.sort(m);}u&&u();});};n.ui.addRichCombo('Styles',{label:p.label,title:p.panelTitle,className:'cke_styles',panel:{css:n.skin.editor.css.concat(o.contentsCss),multiSelect:true,attributes:{'aria-label':p.panelTitle}},init:function(){s=this;t(function(){var u,v,w,x,y,z;for(y=0,z=r.length;y<z;y++){u=r[y];v=u._name;x=u.type;if(x!=w){s.startGroup(p['panelTitle'+String(x)]);w=x;}s.add(v,u.type==3?v:u.buildPreview(),v);}s.commit();});},onClick:function(u){n.focus();n.fire('saveSnapshot');var v=q[u],w=n.getSelection(),x=new d.elementPath(w.getStartElement());v[v.checkActive(x)?'remove':'apply'](n.document);n.fire('saveSnapshot');},onRender:function(){n.on('selectionChange',function(u){var v=this.getValue(),w=u.data.path,x=w.elements;
+for(var y=0,z=x.length,A;y<z;y++){A=x[y];for(var B in q){if(q[B].checkElementRemovable(A,true)){if(B!=v)this.setValue(B);return;}}}this.setValue('');},this);},onOpen:function(){var B=this;if(c||b.webkit)n.focus();var u=n.getSelection(),v=u.getSelectedElement(),w=new d.elementPath(v||u.getStartElement()),x=[0,0,0,0];B.showAll();B.unmarkAll();for(var y in q){var z=q[y],A=z.type;if(z.checkActive(w))B.mark(y);else if(A==3&&!z.checkApplicable(w)){B.hideItem(y);x[A]--;}x[A]++;}if(!x[1])B.hideGroup(p['panelTitle'+String(1)]);if(!x[2])B.hideGroup(p['panelTitle'+String(2)]);if(!x[3])B.hideGroup(p['panelTitle'+String(3)]);},reset:function(){if(s){delete s._.panel;delete s._.list;s._.committed=0;s._.items={};s._.state=2;}q={};r=[];t();}});n.on('instanceReady',function(){t();});}});function m(n,o){var p=n.type,q=o.type;return p==q?0:p==3?-1:q==3?1:q==1?1:-1;};})();j.add('table',{init:function(m){var n=j.table,o=m.lang.table;m.addCommand('table',new a.dialogCommand('table'));m.addCommand('tableProperties',new a.dialogCommand('tableProperties'));m.ui.addButton('Table',{label:o.toolbar,command:'table'});a.dialog.add('table',this.path+'dialogs/table.js');a.dialog.add('tableProperties',this.path+'dialogs/table.js');if(m.addMenuItems)m.addMenuItems({table:{label:o.menu,command:'tableProperties',group:'table',order:5},tabledelete:{label:o.deleteTable,command:'tableDelete',group:'table',order:1}});m.on('doubleclick',function(p){var q=p.data.element;if(q.is('table'))p.data.dialog='tableProperties';});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(!p||p.isReadOnly())return null;var r=p.hasAscendant('table',1);if(r)return{tabledelete:2,table:2};return null;});}});(function(){var m=/^(?:td|th)$/;function n(G){var H=G.getRanges(),I=[],J={};function K(S){if(I.length>0)return;if(S.type==1&&m.test(S.getName())&&!S.getCustomData('selected_cell')){h.setMarker(J,S,'selected_cell',true);I.push(S);}};for(var L=0;L<H.length;L++){var M=H[L];if(M.collapsed){var N=M.getCommonAncestor(),O=N.getAscendant('td',true)||N.getAscendant('th',true);if(O)I.push(O);}else{var P=new d.walker(M),Q;P.guard=K;while(Q=P.next()){var R=Q.getAscendant('td')||Q.getAscendant('th');if(R&&!R.getCustomData('selected_cell')){h.setMarker(J,R,'selected_cell',true);I.push(R);}}}}h.clearAllMarkers(J);return I;};function o(G){var H=0,I=G.length-1,J={},K,L,M;while(K=G[H++])h.setMarker(J,K,'delete_cell',true);H=0;while(K=G[H++]){if((L=K.getPrevious())&&!L.getCustomData('delete_cell')||(L=K.getNext())&&!L.getCustomData('delete_cell')){h.clearAllMarkers(J);
+return L;}}h.clearAllMarkers(J);M=G[0].getParent();if(M=M.getPrevious())return M.getLast();M=G[I].getParent();if(M=M.getNext())return M.getChild(0);return null;};function p(G,H){var I=n(G),J=I[0],K=J.getAscendant('table'),L=J.getDocument(),M=I[0].getParent(),N=M.$.rowIndex,O=I[I.length-1],P=O.getParent().$.rowIndex+O.$.rowSpan-1,Q=new h(K.$.rows[P]),R=H?N:P,S=H?M:Q,T=e.buildTableMap(K),U=T[R],V=H?T[R-1]:T[R+1],W=T[0].length,X=L.createElement('tr');for(var Y=0;U[Y]&&Y<W;Y++){var Z;if(U[Y].rowSpan>1&&V&&U[Y]==V[Y]){Z=U[Y];Z.rowSpan+=1;}else{Z=new h(U[Y]).clone();Z.removeAttribute('rowSpan');!c&&Z.appendBogus();X.append(Z);Z=Z.$;}Y+=Z.colSpan-1;}H?X.insertBefore(S):X.insertAfter(S);};function q(G){if(G instanceof d.selection){var H=n(G),I=H[0],J=I.getAscendant('table'),K=e.buildTableMap(J),L=H[0].getParent(),M=L.$.rowIndex,N=H[H.length-1],O=N.getParent().$.rowIndex+N.$.rowSpan-1,P=[];for(var Q=M;Q<=O;Q++){var R=K[Q],S=new h(J.$.rows[Q]);for(var T=0;T<R.length;T++){var U=new h(R[T]),V=U.getParent().$.rowIndex;if(U.$.rowSpan==1)U.remove();else{U.$.rowSpan-=1;if(V==Q){var W=K[Q+1];W[T-1]?U.insertAfter(new h(W[T-1])):new h(J.$.rows[Q+1]).append(U,1);}}T+=U.$.colSpan-1;}P.push(S);}var X=J.$.rows,Y=new h(X[O+1]||(M>0?X[M-1]:null)||J.$.parentNode);for(Q=P.length;Q>=0;Q--)q(P[Q]);return Y;}else if(G instanceof h){J=G.getAscendant('table');if(J.$.rows.length==1)J.remove();else G.remove();}return null;};function r(G,H){var I=G.getParent(),J=I.$.cells,K=0;for(var L=0;L<J.length;L++){var M=J[L];K+=H?1:M.colSpan;if(M==G.$)break;}return K-1;};function s(G,H){var I=H?Infinity:0;for(var J=0;J<G.length;J++){var K=r(G[J],H);if(H?K<I:K>I)I=K;}return I;};function t(G,H){var I=n(G),J=I[0],K=J.getAscendant('table'),L=s(I,1),M=s(I),N=H?L:M,O=e.buildTableMap(K),P=[],Q=[],R=O.length;for(var S=0;S<R;S++){P.push(O[S][N]);var T=H?O[S][N-1]:O[S][N+1];T&&Q.push(T);}for(S=0;S<R;S++){var U;if(P[S].colSpan>1&&Q.length&&Q[S]==P[S]){U=P[S];U.colSpan+=1;}else{U=new h(P[S]).clone();U.removeAttribute('colSpan');!c&&U.appendBogus();U[H?'insertBefore':'insertAfter'].call(U,new h(P[S]));U=U.$;}S+=U.rowSpan-1;}};function u(G){var H=n(G),I=H[0],J=H[H.length-1],K=I.getAscendant('table'),L=e.buildTableMap(K),M,N,O=[];for(var P=0,Q=L.length;P<Q;P++)for(var R=0,S=L[P].length;R<S;R++){if(L[P][R]==I.$)M=R;if(L[P][R]==J.$)N=R;}for(P=M;P<=N;P++)for(R=0;R<L.length;R++){var T=L[R],U=new h(K.$.rows[R]),V=new h(T[P]);if(V.$){if(V.$.colSpan==1)V.remove();else V.$.colSpan-=1;R+=V.$.rowSpan-1;if(!U.$.cells.length)O.push(U);
+}}var W=K.$.rows[0]&&K.$.rows[0].cells,X=new h(W[M]||(M?W[M-1]:K.$.parentNode));if(O.length==Q)K.remove();return X;};function v(G){var H=[],I=G[0]&&G[0].getAscendant('table'),J,K,L,M;for(J=0,K=G.length;J<K;J++)H.push(G[J].$.cellIndex);H.sort();for(J=1,K=H.length;J<K;J++){if(H[J]-H[J-1]>1){L=H[J-1]+1;break;}}if(!L)L=H[0]>0?H[0]-1:H[H.length-1]+1;var N=I.$.rows;for(J=0,K=N.length;J<K;J++){M=N[J].cells[L];if(M)break;}return M?new h(M):I.getPrevious();};function w(G,H){var I=G.getStartElement(),J=I.getAscendant('td',1)||I.getAscendant('th',1);if(!J)return;var K=J.clone();if(!c)K.appendBogus();if(H)K.insertBefore(J);else K.insertAfter(J);};function x(G){if(G instanceof d.selection){var H=n(G),I=H[0]&&H[0].getAscendant('table'),J=o(H);for(var K=H.length-1;K>=0;K--)x(H[K]);if(J)z(J,true);else if(I)I.remove();}else if(G instanceof h){var L=G.getParent();if(L.getChildCount()==1)L.remove();else G.remove();}};function y(G){var H=G.getBogus();H&&H.remove();G.trim();};function z(G,H){var I=new d.range(G.getDocument());if(!I['moveToElementEdit'+(H?'End':'Start')](G)){I.selectNodeContents(G);I.collapse(H?false:true);}I.select(true);};function A(G,H,I){var J=G[H];if(typeof I=='undefined')return J;for(var K=0;J&&K<J.length;K++){if(I.is&&J[K]==I.$)return K;else if(K==I)return new h(J[K]);}return I.is?-1:null;};function B(G,H){var I=[];for(var J=0;J<G.length;J++){var K=G[J];I.push(K[H]);if(K[H].rowSpan>1)J+=K[H].rowSpan-1;}return I;};function C(G,H,I){var J=n(G),K;if((H?J.length!=1:J.length<2)||(K=G.getCommonAncestor())&&K.type==1&&K.is('table'))return false;var L,M=J[0],N=M.getAscendant('table'),O=e.buildTableMap(N),P=O.length,Q=O[0].length,R=M.getParent().$.rowIndex,S=A(O,R,M);if(H){var T;try{var U=parseInt(M.getAttribute('rowspan'),10)||1,V=parseInt(M.getAttribute('colspan'),10)||1;T=O[H=='up'?R-U:H=='down'?R+U:R][H=='left'?S-V:H=='right'?S+V:S];}catch(an){return false;}if(!T||M.$==T)return false;J[H=='up'||H=='left'?'unshift':'push'](new h(T));}var W=M.getDocument(),X=R,Y=0,Z=0,aa=!I&&new d.documentFragment(W),ab=0;for(var ac=0;ac<J.length;ac++){L=J[ac];var ad=L.getParent(),ae=L.getFirst(),af=L.$.colSpan,ag=L.$.rowSpan,ah=ad.$.rowIndex,ai=A(O,ah,L);ab+=af*ag;Z=Math.max(Z,ai-S+af);Y=Math.max(Y,ah-R+ag);if(!I){if(y(L),L.getChildren().count()){if(ah!=X&&ae&&!(ae.isBlockBoundary&&ae.isBlockBoundary({br:1}))){var aj=aa.getLast(d.walker.whitespaces(true));if(aj&&!(aj.is&&aj.is('br')))aa.append('br');}L.moveChildren(aa);}ac?L.remove():L.setHtml('');}X=ah;}if(!I){aa.moveChildren(M);
+if(!c)M.appendBogus();if(Z>=Q)M.removeAttribute('rowSpan');else M.$.rowSpan=Y;if(Y>=P)M.removeAttribute('colSpan');else M.$.colSpan=Z;var ak=new d.nodeList(N.$.rows),al=ak.count();for(ac=al-1;ac>=0;ac--){var am=ak.getItem(ac);if(!am.$.cells.length){am.remove();al++;continue;}}return M;}else return Y*Z==ab;};function D(G,H){var I=n(G);if(I.length>1)return false;else if(H)return true;var J=I[0],K=J.getParent(),L=K.getAscendant('table'),M=e.buildTableMap(L),N=K.$.rowIndex,O=A(M,N,J),P=J.$.rowSpan,Q,R,S,T;if(P>1){R=Math.ceil(P/2);S=Math.floor(P/2);T=N+R;var U=new h(L.$.rows[T]),V=A(M,T),W;Q=J.clone();for(var X=0;X<V.length;X++){W=V[X];if(W.parentNode==U.$&&X>O){Q.insertBefore(new h(W));break;}else W=null;}if(!W)U.append(Q,true);}else{S=R=1;U=K.clone();U.insertAfter(K);U.append(Q=J.clone());var Y=A(M,N);for(var Z=0;Z<Y.length;Z++)Y[Z].rowSpan++;}if(!c)Q.appendBogus();J.$.rowSpan=R;Q.$.rowSpan=S;if(R==1)J.removeAttribute('rowSpan');if(S==1)Q.removeAttribute('rowSpan');return Q;};function E(G,H){var I=n(G);if(I.length>1)return false;else if(H)return true;var J=I[0],K=J.getParent(),L=K.getAscendant('table'),M=e.buildTableMap(L),N=K.$.rowIndex,O=A(M,N,J),P=J.$.colSpan,Q,R,S;if(P>1){R=Math.ceil(P/2);S=Math.floor(P/2);}else{S=R=1;var T=B(M,O);for(var U=0;U<T.length;U++)T[U].colSpan++;}Q=J.clone();Q.insertAfter(J);if(!c)Q.appendBogus();J.$.colSpan=R;Q.$.colSpan=S;if(R==1)J.removeAttribute('colSpan');if(S==1)Q.removeAttribute('colSpan');return Q;};var F={thead:1,tbody:1,tfoot:1,td:1,tr:1,th:1};j.tabletools={init:function(G){var H=G.lang.table;G.addCommand('cellProperties',new a.dialogCommand('cellProperties'));a.dialog.add('cellProperties',this.path+'dialogs/tableCell.js');G.addCommand('tableDelete',{exec:function(I){var J=I.getSelection(),K=J&&J.getStartElement(),L=K&&K.getAscendant('table',1);if(!L)return;var M=L.getParent();if(M.getChildCount()==1&&!M.is('body','td','th'))L=M;var N=new d.range(I.document);N.moveToPosition(L,3);L.remove();N.select();}});G.addCommand('rowDelete',{exec:function(I){var J=I.getSelection();z(q(J));}});G.addCommand('rowInsertBefore',{exec:function(I){var J=I.getSelection();p(J,true);}});G.addCommand('rowInsertAfter',{exec:function(I){var J=I.getSelection();p(J);}});G.addCommand('columnDelete',{exec:function(I){var J=I.getSelection(),K=u(J);K&&z(K,true);}});G.addCommand('columnInsertBefore',{exec:function(I){var J=I.getSelection();t(J,true);}});G.addCommand('columnInsertAfter',{exec:function(I){var J=I.getSelection();t(J);}});G.addCommand('cellDelete',{exec:function(I){var J=I.getSelection();
+x(J);}});G.addCommand('cellMerge',{exec:function(I){z(C(I.getSelection()),true);}});G.addCommand('cellMergeRight',{exec:function(I){z(C(I.getSelection(),'right'),true);}});G.addCommand('cellMergeDown',{exec:function(I){z(C(I.getSelection(),'down'),true);}});G.addCommand('cellVerticalSplit',{exec:function(I){z(D(I.getSelection()));}});G.addCommand('cellHorizontalSplit',{exec:function(I){z(E(I.getSelection()));}});G.addCommand('cellInsertBefore',{exec:function(I){var J=I.getSelection();w(J,true);}});G.addCommand('cellInsertAfter',{exec:function(I){var J=I.getSelection();w(J);}});if(G.addMenuItems)G.addMenuItems({tablecell:{label:H.cell.menu,group:'tablecell',order:1,getItems:function(){var I=G.getSelection(),J=n(I);return{tablecell_insertBefore:2,tablecell_insertAfter:2,tablecell_delete:2,tablecell_merge:C(I,null,true)?2:0,tablecell_merge_right:C(I,'right',true)?2:0,tablecell_merge_down:C(I,'down',true)?2:0,tablecell_split_vertical:D(I,true)?2:0,tablecell_split_horizontal:E(I,true)?2:0,tablecell_properties:J.length>0?2:0};}},tablecell_insertBefore:{label:H.cell.insertBefore,group:'tablecell',command:'cellInsertBefore',order:5},tablecell_insertAfter:{label:H.cell.insertAfter,group:'tablecell',command:'cellInsertAfter',order:10},tablecell_delete:{label:H.cell.deleteCell,group:'tablecell',command:'cellDelete',order:15},tablecell_merge:{label:H.cell.merge,group:'tablecell',command:'cellMerge',order:16},tablecell_merge_right:{label:H.cell.mergeRight,group:'tablecell',command:'cellMergeRight',order:17},tablecell_merge_down:{label:H.cell.mergeDown,group:'tablecell',command:'cellMergeDown',order:18},tablecell_split_horizontal:{label:H.cell.splitHorizontal,group:'tablecell',command:'cellHorizontalSplit',order:19},tablecell_split_vertical:{label:H.cell.splitVertical,group:'tablecell',command:'cellVerticalSplit',order:20},tablecell_properties:{label:H.cell.title,group:'tablecellproperties',command:'cellProperties',order:21},tablerow:{label:H.row.menu,group:'tablerow',order:1,getItems:function(){return{tablerow_insertBefore:2,tablerow_insertAfter:2,tablerow_delete:2};}},tablerow_insertBefore:{label:H.row.insertBefore,group:'tablerow',command:'rowInsertBefore',order:5},tablerow_insertAfter:{label:H.row.insertAfter,group:'tablerow',command:'rowInsertAfter',order:10},tablerow_delete:{label:H.row.deleteRow,group:'tablerow',command:'rowDelete',order:15},tablecolumn:{label:H.column.menu,group:'tablecolumn',order:1,getItems:function(){return{tablecolumn_insertBefore:2,tablecolumn_insertAfter:2,tablecolumn_delete:2};
+}},tablecolumn_insertBefore:{label:H.column.insertBefore,group:'tablecolumn',command:'columnInsertBefore',order:5},tablecolumn_insertAfter:{label:H.column.insertAfter,group:'tablecolumn',command:'columnInsertAfter',order:10},tablecolumn_delete:{label:H.column.deleteColumn,group:'tablecolumn',command:'columnDelete',order:15}});if(G.contextMenu)G.contextMenu.addListener(function(I,J){if(!I||I.isReadOnly())return null;while(I){if(I.getName() in F)return{tablecell:2,tablerow:2,tablecolumn:2};I=I.getParent();}return null;});},getSelectedCells:n};j.add('tabletools',j.tabletools);})();e.buildTableMap=function(m){var n=m.$.rows,o=-1,p=[];for(var q=0;q<n.length;q++){o++;!p[o]&&(p[o]=[]);var r=-1;for(var s=0;s<n[q].cells.length;s++){var t=n[q].cells[s];r++;while(p[o][r])r++;var u=isNaN(t.colSpan)?1:t.colSpan,v=isNaN(t.rowSpan)?1:t.rowSpan;for(var w=0;w<v;w++){if(!p[o+w])p[o+w]=[];for(var x=0;x<u;x++)p[o+w][r+x]=n[q].cells[s];}r+=u-1;}}return p;};j.add('specialchar',{availableLangs:{cs:1,cy:1,de:1,en:1,eo:1,et:1,fa:1,fi:1,fr:1,hr:1,it:1,nb:1,nl:1,no:1,tr:1,ug:1,'zh-cn':1},init:function(m){var n='specialchar',o=this;a.dialog.add(n,this.path+'dialogs/specialchar.js');m.addCommand(n,{exec:function(){var p=m.langCode;p=o.availableLangs[p]?p:'en';a.scriptLoader.load(a.getUrl(o.path+'lang/'+p+'.js'),function(){e.extend(m.lang.specialChar,o.langEntries[p]);m.openDialog(n);});},modes:{wysiwyg:1},canUndo:false});m.ui.addButton('SpecialChar',{label:m.lang.specialChar.toolbar,command:n});}});i.specialChars=['!','"','#','$','%','&',"'",'(',')','*','+','-','.','/','0','1','2','3','4','5','6','7','8','9',':',';','<','=','>','?','@','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','[',']','^','_','`','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','{','|','}','~','€','‘','’','“','”','–','—','¡','¢','£','¤','¥','¦','§','¨','©','ª','«','¬','®','¯','°','²','³','´','µ','¶','·','¸','¹','º','»','¼','½','¾','¿','À','Á','Â','Ã','Ä','Å','Æ','Ç','È','É','Ê','Ë','Ì','Í','Î','Ï','Ð','Ñ','Ò','Ó','Ô','Õ','Ö','×','Ø','Ù','Ú','Û','Ü','Ý','Þ','ß','à','á','â','ã','ä','å','æ','ç','è','é','ê','ë','ì','í','î','ï','ð','ñ','ò','ó','ô','õ','ö','÷','ø','ù','ú','û','ü','ý','þ','ÿ','Œ','œ','Ŵ','Ŷ','ŵ','ŷ','‚','‛','„','…','™','►','•','→','⇒','⇔','♦','≈'];
(function(){var m={editorFocus:false,modes:{wysiwyg:1,source:1}},n={exec:function(q){q.container.focusNext(true,q.tabIndex);}},o={exec:function(q){q.container.focusPrevious(true,q.tabIndex);}};function p(q){return{editorFocus:false,canUndo:false,modes:{wysiwyg:1},exec:function(r){if(r.focusManager.hasFocus){var s=r.getSelection(),t=s.getCommonAncestor(),u;if(u=t.getAscendant('td',true)||t.getAscendant('th',true)){var v=new d.range(r.document),w=e.tryThese(function(){var D=u.getParent(),E=D.$.cells[u.$.cellIndex+(q?-1:1)];E.parentNode.parentNode;return E;},function(){var D=u.getParent(),E=D.getAscendant('table'),F=E.$.rows[D.$.rowIndex+(q?-1:1)];return F.cells[q?F.cells.length-1:0];});if(!(w||q)){var x=u.getAscendant('table').$,y=u.getParent().$.cells,z=new h(x.insertRow(-1),r.document);for(var A=0,B=y.length;A<B;A++){var C=z.append(new h(y[A],r.document).clone(false,false));!c&&C.appendBogus();}v.moveToElementEditStart(z);}else if(w){w=new h(w);v.moveToElementEditStart(w);if(!(v.checkStartOfBlock()&&v.checkEndOfBlock()))v.selectNodeContents(w);}else return true;v.select(true);return true;}}return false;}};};j.add('tab',{requires:['keystrokes'],init:function(q){var r=q.config.enableTabKeyTools!==false,s=q.config.tabSpaces||0,t='';while(s--)t+='\xa0';if(t)q.on('key',function(u){if(u.data.keyCode==9){q.insertHtml(t);u.cancel();}});if(r)q.on('key',function(u){if(u.data.keyCode==9&&q.execCommand('selectNextCell')||u.data.keyCode==2228224+9&&q.execCommand('selectPreviousCell'))u.cancel();});if(b.webkit||b.gecko)q.on('key',function(u){var v=u.data.keyCode;if(v==9&&!t){u.cancel();q.execCommand('blur');}if(v==2228224+9){q.execCommand('blurBack');u.cancel();}});q.addCommand('blur',e.extend(n,m));q.addCommand('blurBack',e.extend(o,m));q.addCommand('selectNextCell',p());q.addCommand('selectPreviousCell',p(true));}});})();h.prototype.focusNext=function(m,n){var w=this;var o=w.$,p=n===undefined?w.getTabIndex():n,q,r,s,t,u,v;if(p<=0){u=w.getNextSourceNode(m,1);while(u){if(u.isVisible()&&u.getTabIndex()===0){s=u;break;}u=u.getNextSourceNode(false,1);}}else{u=w.getDocument().getBody().getFirst();while(u=u.getNextSourceNode(false,1)){if(!q)if(!r&&u.equals(w)){r=true;if(m){if(!(u=u.getNextSourceNode(true,1)))break;q=1;}}else if(r&&!w.contains(u))q=1;if(!u.isVisible()||(v=u.getTabIndex())<0)continue;if(q&&v==p){s=u;break;}if(v>p&&(!s||!t||v<t)){s=u;t=v;}else if(!s&&v===0){s=u;t=v;}}}if(s)s.focus();};h.prototype.focusPrevious=function(m,n){var w=this;var o=w.$,p=n===undefined?w.getTabIndex():n,q,r,s,t=0,u,v=w.getDocument().getBody().getLast();
while(v=v.getPreviousSourceNode(false,1)){if(!q)if(!r&&v.equals(w)){r=true;if(m){if(!(v=v.getPreviousSourceNode(true,1)))break;q=1;}}else if(r&&!w.contains(v))q=1;if(!v.isVisible()||(u=v.getTabIndex())<0)continue;if(p<=0){if(q&&u===0){s=v;break;}if(u>t){s=v;t=u;}}else{if(q&&u==p){s=v;break;}if(u<p&&(!s||u>t)){s=v;t=u;}}}if(s)s.focus();};(function(){j.add('templates',{requires:['dialog'],init:function(o){a.dialog.add('templates',a.getUrl(this.path+'dialogs/templates.js'));o.addCommand('templates',new a.dialogCommand('templates'));o.ui.addButton('Templates',{label:o.lang.templates.button,command:'templates'});}});var m={},n={};a.addTemplates=function(o,p){m[o]=p;};a.getTemplates=function(o){return m[o];};a.loadTemplates=function(o,p){var q=[];for(var r=0,s=o.length;r<s;r++){if(!n[o[r]]){q.push(o[r]);n[o[r]]=1;}}if(q.length)a.scriptLoader.load(q,p);else setTimeout(p,0);};})();i.templates_files=[a.getUrl('plugins/templates/templates/default.js')];i.templates_replaceContent=true;(function(){var m=function(){this.toolbars=[];this.focusCommandExecuted=false;};m.prototype.focus=function(){for(var o=0,p;p=this.toolbars[o++];)for(var q=0,r;r=p.items[q++];){if(r.focus){r.focus();return;}}};var n={toolbarFocus:{modes:{wysiwyg:1,source:1},readOnly:1,exec:function(o){if(o.toolbox){o.toolbox.focusCommandExecuted=true;if(c||b.air)setTimeout(function(){o.toolbox.focus();},100);else o.toolbox.focus();}}}};j.add('toolbar',{init:function(o){var p,q=function(r,s){var t,u,v=o.lang.dir=='rtl',w=o.config.toolbarGroupCycling;w=w===undefined||w;switch(s){case 9:case 2228224+9:while(!u||!u.items.length){u=s==9?(u?u.next:r.toolbar.next)||o.toolbox.toolbars[0]:(u?u.previous:r.toolbar.previous)||o.toolbox.toolbars[o.toolbox.toolbars.length-1];if(u.items.length){r=u.items[p?u.items.length-1:0];while(r&&!r.focus){r=p?r.previous:r.next;if(!r)u=0;}}}if(r)r.focus();return false;case v?37:39:case 40:t=r;do{t=t.next;if(!t&&w)t=r.toolbar.items[0];}while(t&&!t.focus);if(t)t.focus();else q(r,9);return false;case v?39:37:case 38:t=r;do{t=t.previous;if(!t&&w)t=r.toolbar.items[r.toolbar.items.length-1];}while(t&&!t.focus);if(t)t.focus();else{p=1;q(r,2228224+9);p=0;}return false;case 27:o.focus();return false;case 13:case 32:r.execute();return false;}return true;};o.on('themeSpace',function(r){if(r.data.space==o.config.toolbarLocation){o.toolbox=new m();var s=e.getNextId(),t=['<div class="cke_toolbox" role="group" aria-labelledby="',s,'" onmousedown="return false;"'],u=o.config.toolbarStartupExpanded!==false,v;
t.push(u?'>':' style="display:none">');t.push('<span id="',s,'" class="cke_voice_label">',o.lang.toolbars,'</span>');var w=o.toolbox.toolbars,x=o.config.toolbar instanceof Array?o.config.toolbar:o.config['toolbar_'+o.config.toolbar];for(var y=0;y<x.length;y++){var z,A=0,B,C=x[y],D;if(!C)continue;if(v){t.push('</div>');v=0;}if(C==='/'){t.push('<div class="cke_break"></div>');continue;}D=C.items||C;for(var E=0;E<D.length;E++){var F,G=D[E],H;F=o.ui.create(G);if(F){H=F.canGroup!==false;if(!A){z=e.getNextId();A={id:z,items:[]};B=C.name&&(o.lang.toolbarGroups[C.name]||C.name);t.push('<span id="',z,'" class="cke_toolbar"',B?' aria-labelledby="'+z+'_label"':'',' role="toolbar">');B&&t.push('<span id="',z,'_label" class="cke_voice_label">',B,'</span>');t.push('<span class="cke_toolbar_start"></span>');var I=w.push(A)-1;if(I>0){A.previous=w[I-1];A.previous.next=A;}}if(H){if(!v){t.push('<span class="cke_toolgroup" role="presentation">');v=1;}}else if(v){t.push('</span>');v=0;}var J=F.render(o,t);I=A.items.push(J)-1;if(I>0){J.previous=A.items[I-1];J.previous.next=J;}J.toolbar=A;J.onkey=q;J.onfocus=function(){if(!o.toolbox.focusCommandExecuted)o.focus();};}}if(v){t.push('</span>');v=0;}if(A)t.push('<span class="cke_toolbar_end"></span></span>');}t.push('</div>');if(o.config.toolbarCanCollapse){var K=e.addFunction(function(){o.execCommand('toolbarCollapse');});o.on('destroy',function(){e.removeFunction(K);});var L=e.getNextId();o.addCommand('toolbarCollapse',{readOnly:1,exec:function(M){var N=a.document.getById(L),O=N.getPrevious(),P=M.getThemeSpace('contents'),Q=O.getParent(),R=parseInt(P.$.style.height,10),S=Q.$.offsetHeight,T=!O.isVisible();if(!T){O.hide();N.addClass('cke_toolbox_collapser_min');N.setAttribute('title',M.lang.toolbarExpand);}else{O.show();N.removeClass('cke_toolbox_collapser_min');N.setAttribute('title',M.lang.toolbarCollapse);}N.getFirst().setText(T?'â–²':'â—€');var U=Q.$.offsetHeight-S;P.setStyle('height',R-U+'px');M.fire('resize');},modes:{wysiwyg:1,source:1}});t.push('<a title="'+(u?o.lang.toolbarCollapse:o.lang.toolbarExpand)+'" id="'+L+'" tabIndex="-1" class="cke_toolbox_collapser');if(!u)t.push(' cke_toolbox_collapser_min');t.push('" onclick="CKEDITOR.tools.callFunction('+K+')">','<span>▲</span>','</a>');}r.data.html+=t.join('');}});o.on('destroy',function(){var r,s=0,t,u,v;r=this.toolbox.toolbars;for(;s<r.length;s++){u=r[s].items;for(t=0;t<u.length;t++){v=u[t];if(v.clickFn)e.removeFunction(v.clickFn);if(v.keyDownFn)e.removeFunction(v.keyDownFn);
-}}});o.addCommand('toolbarFocus',n.toolbarFocus);o.ui.add('-',a.UI_SEPARATOR,{});o.ui.addHandler(a.UI_SEPARATOR,{create:function(){return{render:function(r,s){s.push('<span class="cke_separator" role="separator"></span>');return{};}};}});}});})();a.UI_SEPARATOR='separator';i.toolbarLocation='top';i.toolbar_Basic=[['Bold','Italic','-','NumberedList','BulletedList','-','Link','Unlink','-','About']];i.toolbar_Full=[{name:'document',items:['Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates']},{name:'clipboard',items:['Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo']},{name:'editing',items:['Find','Replace','-','SelectAll','-','SpellChecker','Scayt']},{name:'forms',items:['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField']},'/',{name:'basicstyles',items:['Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat']},{name:'paragraph',items:['NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl']},{name:'links',items:['Link','Unlink','Anchor']},{name:'insert',items:['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe']},'/',{name:'styles',items:['Styles','Format','Font','FontSize']},{name:'colors',items:['TextColor','BGColor']},{name:'tools',items:['Maximize','ShowBlocks','-','About']}];i.toolbar='Full';i.toolbarCanCollapse=true;(function(){j.add('undo',{requires:['selection','wysiwygarea'],init:function(s){var t=new o(s),u=s.addCommand('undo',{exec:function(){if(t.undo()){s.selectionChange();this.fire('afterUndo');}},state:0,canUndo:false}),v=s.addCommand('redo',{exec:function(){if(t.redo()){s.selectionChange();this.fire('afterRedo');}},state:0,canUndo:false});t.onChange=function(){u.setState(t.undoable()?2:0);v.setState(t.redoable()?2:0);};function w(x){if(t.enabled&&x.data.command.canUndo!==false)t.save();};s.on('beforeCommandExec',w);s.on('afterCommandExec',w);s.on('saveSnapshot',function(){t.save();});s.on('contentDom',function(){s.document.on('keydown',function(x){if(!x.data.$.ctrlKey&&!x.data.$.metaKey)t.type(x);});});s.on('beforeModeUnload',function(){s.mode=='wysiwyg'&&t.save(true);});s.on('mode',function(){t.enabled=s.readOnly?false:s.mode=='wysiwyg';t.onChange();});s.ui.addButton('Undo',{label:s.lang.undo,command:'undo'});s.ui.addButton('Redo',{label:s.lang.redo,command:'redo'});s.resetUndo=function(){t.reset();
-s.fire('saveSnapshot');};s.on('updateSnapshot',function(){if(t.currentImage&&new m(s).equals(t.currentImage))setTimeout(function(){t.update();},0);});}});j.undo={};var m=j.undo.Image=function(s){this.editor=s;s.fire('beforeUndoImage');var t=s.getSnapshot(),u=t&&s.getSelection();c&&t&&(t=t.replace(/\s+data-cke-expando=".*?"/g,''));this.contents=t;this.bookmarks=u&&u.createBookmarks2(true);s.fire('afterUndoImage');},n=/\b(?:href|src|name)="[^"]*?"/gi;m.prototype={equals:function(s,t){var u=this.contents,v=s.contents;if(c&&(b.ie7Compat||b.ie6Compat)){u=u.replace(n,'');v=v.replace(n,'');}if(u!=v)return false;if(t)return true;var w=this.bookmarks,x=s.bookmarks;if(w||x){if(!w||!x||w.length!=x.length)return false;for(var y=0;y<w.length;y++){var z=w[y],A=x[y];if(z.startOffset!=A.startOffset||z.endOffset!=A.endOffset||!e.arrayCompare(z.start,A.start)||!e.arrayCompare(z.end,A.end))return false;}}return true;}};function o(s){this.editor=s;this.reset();};var p={8:1,46:1},q={16:1,17:1,18:1},r={37:1,38:1,39:1,40:1};o.prototype={type:function(s){var t=s&&s.data.getKey(),u=t in q,v=t in p,w=this.lastKeystroke in p,x=v&&t==this.lastKeystroke,y=t in r,z=this.lastKeystroke in r,A=!v&&!y,B=v&&!x,C=!(u||this.typing)||A&&(w||z);if(C||B){var D=new m(this.editor);e.setTimeout(function(){var F=this;var E=F.editor.getSnapshot();if(c)E=E.replace(/\s+data-cke-expando=".*?"/g,'');if(D.contents!=E){F.typing=true;if(!F.save(false,D,false))F.snapshots.splice(F.index+1,F.snapshots.length-F.index-1);F.hasUndo=true;F.hasRedo=false;F.typesCount=1;F.modifiersCount=1;F.onChange();}},0,this);}this.lastKeystroke=t;if(v){this.typesCount=0;this.modifiersCount++;if(this.modifiersCount>25){this.save(false,null,false);this.modifiersCount=1;}}else if(!y){this.modifiersCount=0;this.typesCount++;if(this.typesCount>25){this.save(false,null,false);this.typesCount=1;}}},reset:function(){var s=this;s.lastKeystroke=0;s.snapshots=[];s.index=-1;s.limit=s.editor.config.undoStackSize||20;s.currentImage=null;s.hasUndo=false;s.hasRedo=false;s.resetType();},resetType:function(){var s=this;s.typing=false;delete s.lastKeystroke;s.typesCount=0;s.modifiersCount=0;},fireChange:function(){var s=this;s.hasUndo=!!s.getNextImage(true);s.hasRedo=!!s.getNextImage(false);s.resetType();s.onChange();},save:function(s,t,u){var w=this;var v=w.snapshots;if(!t)t=new m(w.editor);if(t.contents===false)return false;if(w.currentImage&&t.equals(w.currentImage,s))return false;v.splice(w.index+1,v.length-w.index-1);if(v.length==w.limit)v.shift();
-w.index=v.push(t)-1;w.currentImage=t;if(u!==false)w.fireChange();return true;},restoreImage:function(s){var u=this;u.editor.loadSnapshot(s.contents);if(s.bookmarks)u.editor.getSelection().selectBookmarks(s.bookmarks);else if(c){var t=u.editor.document.getBody().$.createTextRange();t.collapse(true);t.select();}u.index=s.index;u.update();u.fireChange();},getNextImage:function(s){var x=this;var t=x.snapshots,u=x.currentImage,v,w;if(u)if(s)for(w=x.index-1;w>=0;w--){v=t[w];if(!u.equals(v,true)){v.index=w;return v;}}else for(w=x.index+1;w<t.length;w++){v=t[w];if(!u.equals(v,true)){v.index=w;return v;}}return null;},redoable:function(){return this.enabled&&this.hasRedo;},undoable:function(){return this.enabled&&this.hasUndo;},undo:function(){var t=this;if(t.undoable()){t.save(true);var s=t.getNextImage(true);if(s)return t.restoreImage(s),true;}return false;},redo:function(){var t=this;if(t.redoable()){t.save(true);if(t.redoable()){var s=t.getNextImage(false);if(s)return t.restoreImage(s),true;}}return false;},update:function(){var s=this;s.snapshots.splice(s.index,1,s.currentImage=new m(s.editor));}};})();(function(){var m=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>| |\u00A0| )?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi,n=d.walker.whitespaces(true);function o(C){return C.isBlockBoundary()&&f.$empty[C.getName()];};function p(C){return function(D){if(this.mode=='wysiwyg'){this.focus();this.fire('saveSnapshot');C.call(this,D.data);e.setTimeout(function(){this.fire('saveSnapshot');},0,this);}};};function q(C){var M=this;if(M.dataProcessor)C=M.dataProcessor.toHtml(C);if(!C)return;var D=M.getSelection(),E=D.getRanges()[0];if(E.checkReadOnly())return;if(b.opera){var F=new d.elementPath(E.startContainer);if(F.block){var G=a.htmlParser.fragment.fromHtml(C,false).children;for(var H=0,I=G.length;H<I;H++){if(G[H]._.isBlockLike){E.splitBlock(M.enterMode==3?'div':'p');E.insertNode(E.document.createText(''));E.select();break;}}}}if(c){var J=D.isLocked;if(J)D.unlock();var K=D.getNative();if(K.type=='Control')K.clear();else if(D.getType()==2){E=D.getRanges()[0];var L=E&&E.endContainer;if(L&&L.type==1&&L.getAttribute('contenteditable')=='false'&&E.checkBoundaryOfElement(L,2)){E.setEndAfter(E.endContainer);E.deleteContents();}}try{K.createRange().pasteHTML(C);}catch(N){}if(J)M.getSelection().lock();}else M.document.$.execCommand('inserthtml',false,C);if(b.webkit){D=M.getSelection();D.scrollIntoView();}};function r(C){var D=this.getSelection(),E=D.getStartElement().hasAscendant('pre',true)?2:this.config.enterMode,F=E==2,G=e.htmlEncode(C.replace(/\r\n|\r/g,'\n'));
+}}});o.addCommand('toolbarFocus',n.toolbarFocus);o.ui.add('-',a.UI_SEPARATOR,{});o.ui.addHandler(a.UI_SEPARATOR,{create:function(){return{render:function(r,s){s.push('<span class="cke_separator" role="separator"></span>');return{};}};}});}});})();a.UI_SEPARATOR='separator';i.toolbarLocation='top';i.toolbar_Basic=[['Bold','Italic','-','NumberedList','BulletedList','-','Link','Unlink','-','About']];i.toolbar_Full=[{name:'document',items:['Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates']},{name:'clipboard',items:['Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo']},{name:'editing',items:['Find','Replace','-','SelectAll','-','SpellChecker','Scayt']},{name:'forms',items:['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField']},'/',{name:'basicstyles',items:['Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat']},{name:'paragraph',items:['NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl']},{name:'links',items:['Link','Unlink','Anchor']},{name:'insert',items:['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe']},'/',{name:'styles',items:['Styles','Format','Font','FontSize']},{name:'colors',items:['TextColor','BGColor']},{name:'tools',items:['Maximize','ShowBlocks','-','About']}];i.toolbar='Full';i.toolbarCanCollapse=true;(function(){j.add('undo',{requires:['selection','wysiwygarea'],init:function(s){var t=new o(s),u=s.addCommand('undo',{exec:function(){if(t.undo()){s.selectionChange();this.fire('afterUndo');}},state:0,canUndo:false}),v=s.addCommand('redo',{exec:function(){if(t.redo()){s.selectionChange();this.fire('afterRedo');}},state:0,canUndo:false});t.onChange=function(){u.setState(t.undoable()?2:0);v.setState(t.redoable()?2:0);};function w(x){if(t.enabled&&x.data.command.canUndo!==false)t.save();};s.on('beforeCommandExec',w);s.on('afterCommandExec',w);s.on('saveSnapshot',function(x){t.save(x.data&&x.data.contentOnly);});s.on('contentDom',function(){s.document.on('keydown',function(x){if(!x.data.$.ctrlKey&&!x.data.$.metaKey)t.type(x);});});s.on('beforeModeUnload',function(){s.mode=='wysiwyg'&&t.save(true);});s.on('mode',function(){t.enabled=s.readOnly?false:s.mode=='wysiwyg';t.onChange();});s.ui.addButton('Undo',{label:s.lang.undo,command:'undo'});s.ui.addButton('Redo',{label:s.lang.redo,command:'redo'});
+s.resetUndo=function(){t.reset();s.fire('saveSnapshot');};s.on('updateSnapshot',function(){if(t.currentImage)t.update();});}});j.undo={};var m=j.undo.Image=function(s){this.editor=s;s.fire('beforeUndoImage');var t=s.getSnapshot(),u=t&&s.getSelection();c&&t&&(t=t.replace(/\s+data-cke-expando=".*?"/g,''));this.contents=t;this.bookmarks=u&&u.createBookmarks2(true);s.fire('afterUndoImage');},n=/\b(?:href|src|name)="[^"]*?"/gi;m.prototype={equals:function(s,t){var u=this.contents,v=s.contents;if(c&&(b.ie7Compat||b.ie6Compat)){u=u.replace(n,'');v=v.replace(n,'');}if(u!=v)return false;if(t)return true;var w=this.bookmarks,x=s.bookmarks;if(w||x){if(!w||!x||w.length!=x.length)return false;for(var y=0;y<w.length;y++){var z=w[y],A=x[y];if(z.startOffset!=A.startOffset||z.endOffset!=A.endOffset||!e.arrayCompare(z.start,A.start)||!e.arrayCompare(z.end,A.end))return false;}}return true;}};function o(s){this.editor=s;this.reset();};var p={8:1,46:1},q={16:1,17:1,18:1},r={37:1,38:1,39:1,40:1};o.prototype={type:function(s){var t=s&&s.data.getKey(),u=t in q,v=t in p,w=this.lastKeystroke in p,x=v&&t==this.lastKeystroke,y=t in r,z=this.lastKeystroke in r,A=!v&&!y,B=v&&!x,C=!(u||this.typing)||A&&(w||z);if(C||B){var D=new m(this.editor),E=this.snapshots.length;e.setTimeout(function(){var G=this;var F=G.editor.getSnapshot();if(c)F=F.replace(/\s+data-cke-expando=".*?"/g,'');if(D.contents!=F&&E==G.snapshots.length){G.typing=true;if(!G.save(false,D,false))G.snapshots.splice(G.index+1,G.snapshots.length-G.index-1);G.hasUndo=true;G.hasRedo=false;G.typesCount=1;G.modifiersCount=1;G.onChange();}},0,this);}this.lastKeystroke=t;if(v){this.typesCount=0;this.modifiersCount++;if(this.modifiersCount>25){this.save(false,null,false);this.modifiersCount=1;}}else if(!y){this.modifiersCount=0;this.typesCount++;if(this.typesCount>25){this.save(false,null,false);this.typesCount=1;}}},reset:function(){var s=this;s.lastKeystroke=0;s.snapshots=[];s.index=-1;s.limit=s.editor.config.undoStackSize||20;s.currentImage=null;s.hasUndo=false;s.hasRedo=false;s.resetType();},resetType:function(){var s=this;s.typing=false;delete s.lastKeystroke;s.typesCount=0;s.modifiersCount=0;},fireChange:function(){var s=this;s.hasUndo=!!s.getNextImage(true);s.hasRedo=!!s.getNextImage(false);s.resetType();s.onChange();},save:function(s,t,u){var w=this;var v=w.snapshots;if(!t)t=new m(w.editor);if(t.contents===false)return false;if(w.currentImage&&t.equals(w.currentImage,s))return false;v.splice(w.index+1,v.length-w.index-1);if(v.length==w.limit)v.shift();
+w.index=v.push(t)-1;w.currentImage=t;if(u!==false)w.fireChange();return true;},restoreImage:function(s){var w=this;var t=w.editor,u;if(s.bookmarks){t.focus();u=t.getSelection();}w.editor.loadSnapshot(s.contents);if(s.bookmarks)u.selectBookmarks(s.bookmarks);else if(c){var v=w.editor.document.getBody().$.createTextRange();v.collapse(true);v.select();}w.index=s.index;w.update();w.fireChange();},getNextImage:function(s){var x=this;var t=x.snapshots,u=x.currentImage,v,w;if(u)if(s)for(w=x.index-1;w>=0;w--){v=t[w];if(!u.equals(v,true)){v.index=w;return v;}}else for(w=x.index+1;w<t.length;w++){v=t[w];if(!u.equals(v,true)){v.index=w;return v;}}return null;},redoable:function(){return this.enabled&&this.hasRedo;},undoable:function(){return this.enabled&&this.hasUndo;},undo:function(){var t=this;if(t.undoable()){t.save(true);var s=t.getNextImage(true);if(s)return t.restoreImage(s),true;}return false;},redo:function(){var t=this;if(t.redoable()){t.save(true);if(t.redoable()){var s=t.getNextImage(false);if(s)return t.restoreImage(s),true;}}return false;},update:function(){var s=this;s.snapshots.splice(s.index,1,s.currentImage=new m(s.editor));}};})();(function(){var m=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>| |\u00A0| )?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi,n=d.walker.whitespaces(true);function o(C){return C.isBlockBoundary()&&f.$empty[C.getName()];};function p(C){return function(D){if(this.mode=='wysiwyg'){this.focus();var E=this.getSelection(),F=E.isLocked;F&&E.unlock();this.fire('saveSnapshot');C.call(this,D.data);F&&this.getSelection().lock();e.setTimeout(function(){this.fire('saveSnapshot');},0,this);}};};function q(C){var L=this;if(L.dataProcessor)C=L.dataProcessor.toHtml(C);if(!C)return;var D=L.getSelection(),E=D.getRanges()[0];if(E.checkReadOnly())return;if(b.opera){var F=new d.elementPath(E.startContainer);if(F.block){var G=a.htmlParser.fragment.fromHtml(C,false).children;for(var H=0,I=G.length;H<I;H++){if(G[H]._.isBlockLike){E.splitBlock(L.enterMode==3?'div':'p');E.insertNode(E.document.createText(''));E.select();break;}}}}if(c){var J=D.getNative();if(J.type=='Control')J.clear();else if(D.getType()==2){E=D.getRanges()[0];var K=E&&E.endContainer;if(K&&K.type==1&&K.getAttribute('contenteditable')=='false'&&E.checkBoundaryOfElement(K,2)){E.setEndAfter(E.endContainer);E.deleteContents();}}J.createRange().pasteHTML(C);}else L.document.$.execCommand('inserthtml',false,C);if(b.webkit){D=L.getSelection();D.scrollIntoView();}};function r(C){var D=this.getSelection(),E=D.getStartElement().hasAscendant('pre',true)?2:this.config.enterMode,F=E==2,G=e.htmlEncode(C.replace(/\r\n|\r/g,'\n'));
G=G.replace(/^[ \t]+|[ \t]+$/g,function(M,N,O){if(M.length==1)return ' ';else if(!N)return e.repeat(' ',M.length-1)+' ';else return ' '+e.repeat(' ',M.length-1);});G=G.replace(/[ \t]{2,}/g,function(M){return e.repeat(' ',M.length-1)+' ';});var H=E==1?'p':'div';if(!F)G=G.replace(/(\n{2})([\s\S]*?)(?:$|\1)/g,function(M,N,O){return '<'+H+'>'+O+'</'+H+'>';});G=G.replace(/\n/g,'<br>');if(!(F||c))G=G.replace(new RegExp('<br>(?=</'+H+'>)'),function(M){return e.repeat(M,2);});if(b.gecko||b.webkit){var I=new d.elementPath(D.getStartElement()),J=[];for(var K=0;K<I.elements.length;K++){var L=I.elements[K].getName();if(L in f.$inline)J.unshift(I.elements[K].getOuterHtml().match(/^<.*?>/));else if(L in f.$block)break;}G=J.join('')+G;}q.call(this,G);};function s(C){var D=this.getSelection(),E=D.getRanges(),F=C.getName(),G=f.$block[F],H=D.isLocked;if(H)D.unlock();var I,J,K,L;for(var M=E.length-1;M>=0;M--){I=E[M];if(!I.checkReadOnly()){I.deleteContents(1);J=!M&&C||C.clone(1);var N,O;if(G)while((N=I.getCommonAncestor(0,1))&&(O=f[N.getName()])&&!(O&&O[F])){if(N.getName() in f.span)I.splitElement(N);else if(I.checkStartOfBlock()&&I.checkEndOfBlock()){I.setStartBefore(N);I.collapse(true);N.remove();}else I.splitBlock();}I.insertNode(J);if(!K)K=J;}}if(K){I.moveToPosition(K,4);if(G){var P=K.getNext(n),Q=P&&P.type==1&&P.getName();if(Q&&f.$block[Q]&&f[Q]['#'])I.moveToElementEditStart(P);}}D.selectRanges([I]);if(H)this.getSelection().lock();};function t(C){if(!C.checkDirty())setTimeout(function(){C.resetDirty();},0);};var u=d.walker.whitespaces(true),v=d.walker.bookmark(false,true);function w(C){return u(C)&&v(C);};function x(C){return C.type==3&&e.trim(C.getText()).match(/^(?: |\xa0)$/);};function y(C){if(C.isLocked){C.unlock();setTimeout(function(){C.lock();},0);}};function z(C){return C.getOuterHtml().match(m);};u=d.walker.whitespaces(true);function A(C){var D=C.window,E=C.document,F=C.document.getBody(),G=F.getFirst(),H=F.getChildren().count();if(!H||H==1&&G.type==1&&G.hasAttribute('_moz_editor_bogus_node')){t(C);var I=C.element.getDocument(),J=I.getDocumentElement(),K=J.$.scrollTop,L=J.$.scrollLeft,M=E.$.createEvent('KeyEvents');M.initKeyEvent('keypress',true,true,D.$,false,false,false,false,0,32);E.$.dispatchEvent(M);if(K!=J.$.scrollTop||L!=J.$.scrollLeft)I.getWindow().$.scrollTo(L,K);H&&F.getFirst().remove();E.getBody().appendBogus();var N=new d.range(E);N.setStartAt(F,1);N.select();}};function B(C){var D=C.editor,E=C.data.path,F=E.blockLimit,G=C.data.selection,H=G.getRanges()[0],I=D.document.getBody(),J=D.config.enterMode;
-if(b.gecko){A(D);var K=E.block||E.blockLimit,L=K&&K.getLast(w);if(K&&K.isBlockBoundary()&&!(L&&L.type==1&&L.isBlockBoundary())&&!K.is('pre')&&!K.getBogus()){D.fire('updateSnapshot');t(D);K.appendBogus();}}if(D.config.autoParagraph!==false&&J!=2&&H.collapsed&&F.getName()=='body'&&!E.block){D.fire('updateSnapshot');t(D);c&&y(G);var M=H.fixBlock(true,D.config.enterMode==3?'div':'p');if(c){var N=M.getFirst(w);N&&x(N)&&N.remove();}if(z(M)){var O=M.getNext(u);if(O&&O.type==1&&!o(O)){H.moveToElementEditStart(O);M.remove();}else{O=M.getPrevious(u);if(O&&O.type==1&&!o(O)){H.moveToElementEditEnd(O);M.remove();}}}H.select();C.cancel();}var P=new d.range(D.document);P.moveToElementEditEnd(D.document.getBody());var Q=new d.elementPath(P.startContainer);if(!Q.blockLimit.is('body')){D.fire('updateSnapshot');t(D);c&&y(G);var R;if(J!=2)R=I.append(D.document.createElement(J==1?'p':'div'));else R=I;if(!c)R.appendBogus();}};j.add('wysiwygarea',{requires:['editingblock'],init:function(C){var D=C.config.enterMode!=2&&C.config.autoParagraph!==false?C.config.enterMode==3?'div':'p':false,E=C.lang.editorTitle.replace('%1',C.name),F;C.on('editingBlockReady',function(){var L,M,N,O,P,Q,R=b.isCustomDomain(),S=function(V){if(M)M.remove();var W='document.open();'+(R?'document.domain="'+document.domain+'";':'')+'document.close();';W=b.air?'javascript:void(0)':c?'javascript:void(function(){'+encodeURIComponent(W)+'}())':'';M=h.createFromHtml('<iframe style="width:100%;height:100%" frameBorder="0" title="'+E+'"'+' src="'+W+'"'+' tabIndex="'+(b.webkit?-1:C.tabIndex)+'"'+' allowTransparency="true"'+'></iframe>');if(document.location.protocol=='chrome:')a.event.useCapture=true;M.on('load',function(X){P=1;X.removeListener();var Y=M.getFrameDocument();Y.write(V);b.air&&U(Y.getWindow().$);});if(document.location.protocol=='chrome:')a.event.useCapture=false;L.append(M);};F=e.addFunction(U);var T='<script id="cke_actscrpt" type="text/javascript" data-cke-temp="1">'+(R?'document.domain="'+document.domain+'";':'')+'window.parent.CKEDITOR.tools.callFunction( '+F+', window );'+'</script>';function U(V){if(!P)return;P=0;C.fire('ariaWidget',M);var W=V.document,X=W.body,Y=W.getElementById('cke_actscrpt');Y&&Y.parentNode.removeChild(Y);X.spellcheck=!C.config.disableNativeSpellChecker;var Z=!C.readOnly;if(c){X.hideFocus=true;X.disabled=true;X.contentEditable=Z;X.removeAttribute('disabled');}else setTimeout(function(){if(b.gecko&&b.version>=10900||b.opera)W.$.body.contentEditable=Z;else if(b.webkit)W.$.body.parentNode.contentEditable=Z;
-else W.$.designMode=Z?'off':'on';},0);Z&&b.gecko&&e.setTimeout(A,0,null,C);V=C.window=new d.window(V);W=C.document=new g(W);Z&&W.on('dblclick',function(af){var ag=af.data.getTarget(),ah={element:ag,dialog:''};C.fire('doubleclick',ah);ah.dialog&&C.openDialog(ah.dialog);});c&&W.on('click',function(af){var ag=af.data.getTarget();if(ag.is('input')){var ah=ag.getAttribute('type');if(ah=='submit'||ah=='reset')af.data.preventDefault();}});if(!(c||b.opera))W.on('mousedown',function(af){var ag=af.data.getTarget();if(ag.is('img','hr','input','textarea','select'))C.getSelection().selectElement(ag);});if(b.gecko)W.on('mouseup',function(af){if(af.data.$.button==2){var ag=af.data.getTarget();if(!ag.getOuterHtml().replace(m,'')){var ah=new d.range(W);ah.moveToElementEditStart(ag);ah.select(true);}}});W.on('click',function(af){af=af.data;if(af.getTarget().is('a')&&af.$.button!=2)af.preventDefault();});if(b.webkit){W.on('mousedown',function(){ac=1;});W.on('click',function(af){if(af.data.getTarget().is('input','select'))af.data.preventDefault();});W.on('mouseup',function(af){if(af.data.getTarget().is('input','textarea'))af.data.preventDefault();});}if(Z&&c&&W.$.compatMode=='CSS1Compat'||b.gecko||b.opera){var aa=W.getDocumentElement();aa.on('mousedown',function(af){if(af.data.getTarget().equals(aa)){if(b.gecko&&b.version>=10900)J();K.focus();}});}var ab=c?M:V;ab.on('blur',function(){C.focusManager.blur();});var ac;ab.on('focus',function(){var af=C.document;if(Z&&b.gecko&&b.version>=10900)J();else if(b.opera)af.getBody().focus();else if(b.webkit)if(!ac){C.document.getDocumentElement().focus();ac=1;}C.focusManager.focus();});var ad=C.keystrokeHandler;ad.blockedKeystrokes[8]=!Z;ad.attach(W);if(c){W.getDocumentElement().addClass(W.$.compatMode);Z&&W.on('keydown',function(af){var ag=af.data.getKeystroke();if(ag in {8:1,46:1}){var ah=C.getSelection(),ai=ah.getSelectedElement();if(ai){C.fire('saveSnapshot');var aj=ah.getRanges()[0].createBookmark();ai.remove();ah.selectBookmarks([aj]);C.fire('saveSnapshot');af.data.preventDefault();}}});if(W.$.compatMode=='CSS1Compat'){var ae={33:1,34:1};W.on('keydown',function(af){if(af.data.getKeystroke() in ae)setTimeout(function(){C.getSelection().scrollIntoView();},0);});}C.config.enterMode!=1&&W.on('selectionchange',function(){var af=W.getBody(),ag=C.getSelection().getRanges()[0];if(af.getHtml().match(/^<p> <\/p>$/i)&&ag.startContainer.equals(af))setTimeout(function(){ag=C.getSelection().getRanges()[0];if(!ag.startContainer.equals('body')){af.getFirst().remove(1);
-ag.moveToElementEditEnd(af);ag.select(1);}},0);});}if(C.contextMenu)C.contextMenu.addTarget(W,C.config.browserContextMenuOnCtrl!==false);setTimeout(function(){C.fire('contentDom');if(Q){C.mode='wysiwyg';C.fire('mode');Q=false;}N=false;if(O){C.focus();O=false;}setTimeout(function(){C.fire('dataReady');},0);try{C.document.$.execCommand('enableInlineTableEditing',false,!C.config.disableNativeTableHandles);}catch(af){}if(C.config.disableObjectResizing)try{C.document.$.execCommand('enableObjectResizing',false,false);}catch(ag){C.document.getBody().on(c?'resizestart':'resize',function(ah){ah.data.preventDefault();});}if(c)setTimeout(function(){if(C.document){var ah=C.document.$.body;ah.runtimeStyle.marginBottom='0px';ah.runtimeStyle.marginBottom='';}},1000);},0);};C.addMode('wysiwyg',{load:function(V,W,X){L=V;if(c&&b.quirks)V.setStyle('position','relative');C.mayBeDirty=true;Q=true;if(X)this.loadSnapshotData(W);else this.loadData(W);},loadData:function(V){N=true;C._.dataStore={id:1};var W=C.config,X=W.fullPage,Y=W.docType,Z='<style type="text/css" data-cke-temp="1">'+C._.styles.join('\n')+'</style>';!X&&(Z=e.buildStyleHtml(C.config.contentsCss)+Z);var aa=W.baseHref?'<base href="'+W.baseHref+'" data-cke-temp="1" />':'';if(X)V=V.replace(/<!DOCTYPE[^>]*>/i,function(ab){C.docType=Y=ab;return '';}).replace(/<\?xml\s[^\?]*\?>/i,function(ab){C.xmlDeclaration=ab;return '';});if(C.dataProcessor)V=C.dataProcessor.toHtml(V,D);if(X){if(!/<body[\s|>]/.test(V))V='<body>'+V;if(!/<html[\s|>]/.test(V))V='<html>'+V+'</html>';if(!/<head[\s|>]/.test(V))V=V.replace(/<html[^>]*>/,'$&<head><title></title></head>');else if(!/<title[\s|>]/.test(V))V=V.replace(/<head[^>]*>/,'$&<title></title>');aa&&(V=V.replace(/<head>/,'$&'+aa));V=V.replace(/<\/head\s*>/,Z+'$&');V=Y+V;}else V=W.docType+'<html dir="'+W.contentsLangDirection+'"'+' lang="'+(W.contentsLanguage||C.langCode)+'">'+'<head>'+'<title>'+E+'</title>'+aa+Z+'</head>'+'<body'+(W.bodyId?' id="'+W.bodyId+'"':'')+(W.bodyClass?' class="'+W.bodyClass+'"':'')+'>'+V+'</html>';if(b.gecko)V=V.replace(/<br \/>(?=\s*<\/(:?html|body)>)/,'$&<br type="_moz" />');V+=T;this.onDispose();S(V);},getData:function(){var V=C.config,W=V.fullPage,X=W&&C.docType,Y=W&&C.xmlDeclaration,Z=M.getFrameDocument(),aa=W?Z.getDocumentElement().getOuterHtml():Z.getBody().getHtml();if(b.gecko)aa=aa.replace(/<br>(?=\s*(:?$|<\/body>))/,'');if(C.dataProcessor)aa=C.dataProcessor.toDataFormat(aa,D);if(V.ignoreEmptyParagraph)aa=aa.replace(m,function(ab,ac){return ac;});if(Y)aa=Y+'\n'+aa;
-if(X)aa=X+'\n'+aa;return aa;},getSnapshotData:function(){return M.getFrameDocument().getBody().getHtml();},loadSnapshotData:function(V){M.getFrameDocument().getBody().setHtml(V);},onDispose:function(){if(!C.document)return;C.document.getDocumentElement().clearCustomData();C.document.getBody().clearCustomData();C.window.clearCustomData();C.document.clearCustomData();M.clearCustomData();M.remove();},unload:function(V){this.onDispose();C.window=C.document=M=L=O=null;C.fire('contentDomUnload');},focus:function(){var V=C.window;if(N)O=true;else if(b.opera&&C.document){var W=C.window.$.frameElement;W.blur(),W.focus();C.document.getBody().focus();C.selectionChange();}else if(!b.opera&&V){b.air?setTimeout(function(){V.focus();},0):V.focus();C.selectionChange();}}});C.on('insertHtml',p(q),null,null,20);C.on('insertElement',p(s),null,null,20);C.on('insertText',p(r),null,null,20);C.on('selectionChange',B,null,null,1);});var G;C.on('contentDom',function(){var L=C.document.getElementsByTag('title').getItem(0);L.data('cke-title',C.document.$.title);C.document.$.title=E;});C.on('readOnly',function(){if(C.mode=='wysiwyg'){var L=C.getMode();L.loadData(L.getData());}});if(a.document.$.documentMode>=8){C.addCss('html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}');var H=[];for(var I in f.$removeEmpty)H.push('html.CSS1Compat '+I+'[contenteditable=false]');C.addCss(H.join(',')+'{ display:inline-block;}');}else if(b.gecko){C.addCss('html { height: 100% !important; }');C.addCss('img:-moz-broken { -moz-force-broken-image-icon : 1;\twidth : 24px; height : 24px; }');}C.addCss('html {\t_overflow-y: scroll; cursor: text;\t*cursor:auto;}');C.addCss('img, input, textarea { cursor: default;}');function J(L){if(C.readOnly)return;e.tryThese(function(){C.document.$.designMode='on';setTimeout(function(){C.document.$.designMode='off';if(a.currentInstance==C)C.document.getBody().focus();},50);},function(){C.document.$.designMode='off';var M=C.document.getBody();M.setAttribute('contentEditable',false);M.setAttribute('contentEditable',true);!L&&J(1);});};if(b.gecko||c||b.opera){var K;C.on('uiReady',function(){K=C.container.append(h.createFromHtml('<span tabindex="-1" style="position:absolute;" role="presentation"></span>'));K.on('focus',function(){C.focus();});C.focusGrabber=K;});C.on('destroy',function(){e.removeFunction(F);K.clearCustomData();delete C.focusGrabber;});}C.on('insertElement',function(L){var M=L.data;if(M.type==1&&(M.is('input')||M.is('textarea'))){if(!M.isReadOnly())M.data('cke-editable',M.hasAttribute('contenteditable')?'true':'1');
-M.setAttribute('contentEditable',false);}});}});if(b.gecko)(function(){var C=document.body;if(!C)window.addEventListener('load',arguments.callee,false);else{var D=C.getAttribute('onpageshow');C.setAttribute('onpageshow',(D?D+';':'')+'event.persisted && (function(){'+'var allInstances = CKEDITOR.instances, editor, doc;'+'for ( var i in allInstances )'+'{'+'\teditor = allInstances[ i ];'+'\tdoc = editor.document;'+'\tif ( doc )'+'\t{'+'\t\tdoc.$.designMode = "off";'+'\t\tdoc.$.designMode = "on";'+'\t}'+'}'+'})();');}})();})();i.disableObjectResizing=false;i.disableNativeTableHandles=true;i.disableNativeSpellChecker=true;i.ignoreEmptyParagraph=true;j.add('wsc',{requires:['dialog'],init:function(m){var n='checkspell',o=m.addCommand(n,new a.dialogCommand(n));o.modes={wysiwyg:!b.opera&&!b.air&&document.domain==window.location.hostname};m.ui.addButton('SpellChecker',{label:m.lang.spellCheck.toolbar,command:n});a.dialog.add(n,this.path+'dialogs/wsc.js');}});i.wsc_customerId=i.wsc_customerId||'1:ua3xw1-2XyGJ3-GWruD3-6OFNT1-oXcuB1-nR6Bp4-hgQHc-EcYng3-sdRXG3-NOfFk';i.wsc_customLoaderScript=i.wsc_customLoaderScript||null;a.DIALOG_RESIZE_NONE=0;a.DIALOG_RESIZE_WIDTH=1;a.DIALOG_RESIZE_HEIGHT=2;a.DIALOG_RESIZE_BOTH=3;(function(){var m=e.cssLength;function n(S){return!!this._.tabs[S][0].$.offsetHeight;};function o(){var W=this;var S=W._.currentTabId,T=W._.tabIdList.length,U=e.indexOf(W._.tabIdList,S)+T;for(var V=U-1;V>U-T;V--){if(n.call(W,W._.tabIdList[V%T]))return W._.tabIdList[V%T];}return null;};function p(){var W=this;var S=W._.currentTabId,T=W._.tabIdList.length,U=e.indexOf(W._.tabIdList,S);for(var V=U+1;V<U+T;V++){if(n.call(W,W._.tabIdList[V%T]))return W._.tabIdList[V%T];}return null;};function q(S,T){var U=S.$.getElementsByTagName('input');for(var V=0,W=U.length;V<W;V++){var X=new h(U[V]);if(X.getAttribute('type').toLowerCase()=='text')if(T){X.setAttribute('value',X.getCustomData('fake_value')||'');X.removeCustomData('fake_value');}else{X.setCustomData('fake_value',X.getAttribute('value'));X.setAttribute('value','');}}};function r(S,T){var V=this;var U=V.getInputElement();if(U)S?U.removeAttribute('aria-invalid'):U.setAttribute('aria-invalid',true);if(!S)if(V.select)V.select();else V.focus();T&&alert(T);V.fire('validated',{valid:S,msg:T});};function s(){var S=this.getInputElement();S&&S.removeAttribute('aria-invalid');};a.dialog=function(S,T){var U=a.dialog._.dialogDefinitions[T],V=e.clone(u),W=S.config.dialog_buttonsOrder||'OS',X=S.lang.dir;if(W=='OS'&&b.mac||W=='rtl'&&X=='ltr'||W=='ltr'&&X=='rtl')V.buttons.reverse();
-U=e.extend(U(S),V);U=e.clone(U);U=new y(this,U);var Y=a.document,Z=S.theme.buildDialog(S);this._={editor:S,element:Z.element,name:T,contentSize:{width:0,height:0},size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:false,focusList:[],currentFocusIndex:0,hasFocus:false};this.parts=Z.parts;e.setTimeout(function(){S.fire('ariaWidget',this.parts.contents);},0,this);var aa={position:b.ie6Compat?'absolute':'fixed',top:0,visibility:'hidden'};aa[X=='rtl'?'right':'left']=0;this.parts.dialog.setStyles(aa);a.event.call(this);this.definition=U=a.fire('dialogDefinition',{name:T,definition:U},S).definition;var ab={};if(!('removeDialogTabs' in S._)&&S.config.removeDialogTabs){var ac=S.config.removeDialogTabs.split(';');for(i=0;i<ac.length;i++){var ad=ac[i].split(':');if(ad.length==2){var ae=ad[0];if(!ab[ae])ab[ae]=[];ab[ae].push(ad[1]);}}S._.removeDialogTabs=ab;}if(S._.removeDialogTabs&&(ab=S._.removeDialogTabs[T]))for(i=0;i<ab.length;i++)U.removeContents(ab[i]);if(U.onLoad)this.on('load',U.onLoad);if(U.onShow)this.on('show',U.onShow);if(U.onHide)this.on('hide',U.onHide);if(U.onOk)this.on('ok',function(ar){S.fire('saveSnapshot');setTimeout(function(){S.fire('saveSnapshot');},0);if(U.onOk.call(this,ar)===false)ar.data.hide=false;});if(U.onCancel)this.on('cancel',function(ar){if(U.onCancel.call(this,ar)===false)ar.data.hide=false;});var af=this,ag=function(ar){var as=af._.contents,at=false;for(var au in as)for(var av in as[au]){at=ar.call(this,as[au][av]);if(at)return;}};this.on('ok',function(ar){ag(function(as){if(as.validate){var at=as.validate(this),au=typeof at=='string'||at===false;if(au){ar.data.hide=false;ar.stop();}r.call(as,!au,typeof at=='string'?at:undefined);return au;}});},this,null,0);this.on('cancel',function(ar){ag(function(as){if(as.isChanged()){if(!confirm(S.lang.common.confirmCancel))ar.data.hide=false;return true;}});},this,null,0);this.parts.close.on('click',function(ar){if(this.fire('cancel',{hide:true}).hide!==false)this.hide();ar.data.preventDefault();},this);function ah(){var ar=af._.focusList;ar.sort(function(au,av){if(au.tabIndex!=av.tabIndex)return av.tabIndex-au.tabIndex;else return au.focusIndex-av.focusIndex;});var as=ar.length;for(var at=0;at<as;at++)ar[at].focusIndex=at;};function ai(ar){var as=af._.focusList,at=ar?1:-1;if(as.length<1)return;var au=af._.currentFocusIndex;try{as[au].getInputElement().$.blur();}catch(ax){}var av=(au+at+as.length)%as.length,aw=av;
-while(!as[aw].isFocusable()){aw=(aw+at+as.length)%as.length;if(aw==av)break;}as[aw].focus();if(as[aw].type=='text')as[aw].select();};this.changeFocus=ai;var aj;function ak(ar){var aw=this;if(af!=a.dialog._.currentTop)return;var as=ar.data.getKeystroke(),at=S.lang.dir=='rtl';aj=0;if(as==9||as==2228224+9){var au=as==2228224+9;if(af._.tabBarMode){var av=au?o.call(af):p.call(af);af.selectPage(av);af._.tabs[av][0].focus();}else ai(!au);aj=1;}else if(as==4456448+121&&!af._.tabBarMode&&af.getPageCount()>1){af._.tabBarMode=true;af._.tabs[af._.currentTabId][0].focus();aj=1;}else if((as==37||as==39)&&af._.tabBarMode){av=as==(at?39:37)?o.call(af):p.call(af);af.selectPage(av);af._.tabs[av][0].focus();aj=1;}else if((as==13||as==32)&&af._.tabBarMode){aw.selectPage(aw._.currentTabId);aw._.tabBarMode=false;aw._.currentFocusIndex=-1;ai(true);aj=1;}if(aj){ar.stop();ar.data.preventDefault();}};function al(ar){aj&&ar.data.preventDefault();};var am=this._.element;this.on('show',function(){am.on('keydown',ak,this,null,0);if(b.opera||b.gecko&&b.mac)am.on('keypress',al,this);});this.on('hide',function(){am.removeListener('keydown',ak);if(b.opera||b.gecko&&b.mac)am.removeListener('keypress',al);ag(function(ar){s.apply(ar);});});this.on('iframeAdded',function(ar){var as=new g(ar.data.iframe.$.contentWindow.document);as.on('keydown',ak,this,null,0);});this.on('show',function(){var av=this;ah();if(S.config.dialog_startupFocusTab&&af._.pageCount>1){af._.tabBarMode=true;af._.tabs[af._.currentTabId][0].focus();}else if(!av._.hasFocus){av._.currentFocusIndex=-1;if(U.onFocus){var ar=U.onFocus.call(av);ar&&ar.focus();}else ai(true);if(av._.editor.mode=='wysiwyg'&&c){var as=S.document.$.selection,at=as.createRange();if(at)if(at.parentElement&&at.parentElement().ownerDocument==S.document.$||at.item&&at.item(0).ownerDocument==S.document.$){var au=document.body.createTextRange();au.moveToElementText(av.getElement().getFirst().$);au.collapse(true);au.select();}}}},this,null,4294967295);if(b.ie6Compat)this.on('load',function(ar){var as=this.getElement(),at=as.getFirst();at.remove();at.appendTo(as);},this);A(this);B(this);new d.text(U.title,a.document).appendTo(this.parts.title);for(var an=0;an<U.contents.length;an++){var ao=U.contents[an];ao&&this.addPage(ao);}this.parts.tabs.on('click',function(ar){var au=this;var as=ar.data.getTarget();if(as.hasClass('cke_dialog_tab')){var at=as.$.id;au.selectPage(at.substring(4,at.lastIndexOf('_')));if(au._.tabBarMode){au._.tabBarMode=false;au._.currentFocusIndex=-1;
-ai(true);}ar.data.preventDefault();}},this);var ap=[],aq=a.dialog._.uiElementBuilders.hbox.build(this,{type:'hbox',className:'cke_dialog_footer_buttons',widths:[],children:U.buttons},ap).getChild();this.parts.footer.setHtml(ap.join(''));for(an=0;an<aq.length;an++)this._.buttons[aq[an].id]=aq[an];};function t(S,T,U){this.element=T;this.focusIndex=U;this.tabIndex=0;this.isFocusable=function(){return!T.getAttribute('disabled')&&T.isVisible();};this.focus=function(){S._.currentFocusIndex=this.focusIndex;this.element.focus();};T.on('keydown',function(V){if(V.data.getKeystroke() in {32:1,13:1})this.fire('click');});T.on('focus',function(){this.fire('mouseover');});T.on('blur',function(){this.fire('mouseout');});};a.dialog.prototype={destroy:function(){this.hide();this._.element.remove();},resize:(function(){return function(S,T){var U=this;if(U._.contentSize&&U._.contentSize.width==S&&U._.contentSize.height==T)return;a.dialog.fire('resize',{dialog:U,skin:U._.editor.skinName,width:S,height:T},U._.editor);U.fire('resize',{skin:U._.editor.skinName,width:S,height:T},U._.editor);if(U._.editor.lang.dir=='rtl'&&U._.position)U._.position.x=a.document.getWindow().getViewPaneSize().width-U._.contentSize.width-parseInt(U._.element.getFirst().getStyle('right'),10);U._.contentSize={width:S,height:T};};})(),getSize:function(){var S=this._.element.getFirst();return{width:S.$.offsetWidth||0,height:S.$.offsetHeight||0};},move:(function(){var S;return function(T,U,V){var ac=this;var W=ac._.element.getFirst(),X=ac._.editor.lang.dir=='rtl';if(S===undefined)S=W.getComputedStyle('position')=='fixed';if(S&&ac._.position&&ac._.position.x==T&&ac._.position.y==U)return;ac._.position={x:T,y:U};if(!S){var Y=a.document.getWindow().getScrollPosition();T+=Y.x;U+=Y.y;}if(X){var Z=ac.getSize(),aa=a.document.getWindow().getViewPaneSize();T=aa.width-Z.width-T;}var ab={top:(U>0?U:0)+'px'};ab[X?'right':'left']=(T>0?T:0)+'px';W.setStyles(ab);V&&(ac._.moved=1);};})(),getPosition:function(){return e.extend({},this._.position);},show:function(){var S=this._.element,T=this.definition;if(!(S.getParent()&&S.getParent().equals(a.document.getBody())))S.appendTo(a.document.getBody());else S.setStyle('display','block');if(b.gecko&&b.version<10900){var U=this.parts.dialog;U.setStyle('position','absolute');setTimeout(function(){U.setStyle('position','fixed');},0);}this.resize(this._.contentSize&&this._.contentSize.width||T.width||T.minWidth,this._.contentSize&&this._.contentSize.height||T.height||T.minHeight);this.reset();
-this.selectPage(this.definition.contents[0].id);if(a.dialog._.currentZIndex===null)a.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex;this._.element.getFirst().setStyle('z-index',a.dialog._.currentZIndex+=10);if(a.dialog._.currentTop===null){a.dialog._.currentTop=this;this._.parentDialog=null;G(this._.editor);S.on('keydown',K);S.on(b.opera?'keypress':'keyup',L);for(var V in {keyup:1,keydown:1,keypress:1})S.on(V,R);}else{this._.parentDialog=a.dialog._.currentTop;var W=this._.parentDialog.getElement().getFirst();W.$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2);a.dialog._.currentTop=this;}M(this,this,'\x1b',null,function(){this.getButton('cancel')&&this.getButton('cancel').click();});this._.hasFocus=false;e.setTimeout(function(){this.layout();this.parts.dialog.setStyle('visibility','');this.fireOnce('load',{});k.fire('ready',this);this.fire('show',{});this._.editor.fire('dialogShow',this);this.foreach(function(X){X.setInitValue&&X.setInitValue();});},100,this);},layout:function(){var U=this;var S=a.document.getWindow().getViewPaneSize(),T=U.getSize();U.move(U._.moved?U._.position.x:(S.width-T.width)/2,U._.moved?U._.position.y:(S.height-T.height)/2);},foreach:function(S){var V=this;for(var T in V._.contents)for(var U in V._.contents[T])S.call(V,V._.contents[T][U]);return V;},reset:(function(){var S=function(T){if(T.reset)T.reset(1);};return function(){this.foreach(S);return this;};})(),setupContent:function(){var S=arguments;this.foreach(function(T){if(T.setup)T.setup.apply(T,S);});},commitContent:function(){var S=arguments;this.foreach(function(T){if(c&&this._.currentFocusIndex==T.focusIndex)T.getInputElement().$.blur();if(T.commit)T.commit.apply(T,S);});},hide:function(){if(!this.parts.dialog.isVisible())return;this.fire('hide',{});this._.editor.fire('dialogHide',this);var S=this._.element;S.setStyle('display','none');this.parts.dialog.setStyle('visibility','hidden');N(this);while(a.dialog._.currentTop!=this)a.dialog._.currentTop.hide();if(!this._.parentDialog)H();else{var T=this._.parentDialog.getElement().getFirst();T.setStyle('z-index',parseInt(T.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2));}a.dialog._.currentTop=this._.parentDialog;if(!this._.parentDialog){a.dialog._.currentZIndex=null;S.removeListener('keydown',K);S.removeListener(b.opera?'keypress':'keyup',L);for(var U in {keyup:1,keydown:1,keypress:1})S.removeListener(U,R);var V=this._.editor;V.focus();if(V.mode=='wysiwyg'&&c){var W=V.getSelection();
+if(b.gecko){A(D);var K=E.block||E.blockLimit,L=K&&K.getLast(w);if(K&&K.isBlockBoundary()&&!(L&&L.type==1&&L.isBlockBoundary())&&!K.is('pre')&&!K.getBogus())K.appendBogus();}if(D.config.autoParagraph!==false&&J!=2&&H.collapsed&&F.getName()=='body'&&!E.block){var M=H.fixBlock(true,D.config.enterMode==3?'div':'p');if(c){var N=M.getFirst(w);N&&x(N)&&N.remove();}if(z(M)){var O=M.getNext(u);if(O&&O.type==1&&!o(O)){H.moveToElementEditStart(O);M.remove();}else{O=M.getPrevious(u);if(O&&O.type==1&&!o(O)){H.moveToElementEditEnd(O);M.remove();}}}H.select();C.cancel();}var P=new d.range(D.document);P.moveToElementEditEnd(D.document.getBody());var Q=new d.elementPath(P.startContainer);if(!Q.blockLimit.is('body')){var R;if(J!=2)R=I.append(D.document.createElement(J==1?'p':'div'));else R=I;if(!c)R.appendBogus();}};j.add('wysiwygarea',{requires:['editingblock'],init:function(C){var D=C.config.enterMode!=2&&C.config.autoParagraph!==false?C.config.enterMode==3?'div':'p':false,E=C.lang.editorTitle.replace('%1',C.name),F=a.document.getWindow(),G;C.on('editingBlockReady',function(){var L,M,N,O,P,Q,R,S=b.isCustomDomain(),T=function(W){if(M)M.remove();var X='document.open();'+(S?'document.domain="'+document.domain+'";':'')+'document.close();';X=b.air?'javascript:void(0)':c?'javascript:void(function(){'+encodeURIComponent(X)+'}())':'';M=h.createFromHtml('<iframe style="width:100%;height:100%" frameBorder="0" title="'+E+'"'+' src="'+X+'"'+' tabIndex="'+(b.webkit?-1:C.tabIndex)+'"'+' allowTransparency="true"'+'></iframe>');if(document.location.protocol=='chrome:')a.event.useCapture=true;M.on('load',function(Y){P=1;Y.removeListener();var Z=M.getFrameDocument();Z.write(W);b.air&&V(Z.getWindow().$);});if(document.location.protocol=='chrome:')a.event.useCapture=false;L.append(M);if(b.webkit){R=function(){M.hide();M.setSize('width',L.getSize('width'));M.show();};F.on('resize',R);}};G=e.addFunction(V);var U='<script id="cke_actscrpt" type="text/javascript" data-cke-temp="1">'+(S?'document.domain="'+document.domain+'";':'')+'window.parent.CKEDITOR.tools.callFunction( '+G+', window );'+'</script>';function V(W){if(!P)return;P=0;C.fire('ariaWidget',M);var X=W.document,Y=X.body,Z=X.getElementById('cke_actscrpt');Z&&Z.parentNode.removeChild(Z);Y.spellcheck=!C.config.disableNativeSpellChecker;var aa=!C.readOnly;if(c){Y.hideFocus=true;Y.disabled=true;Y.contentEditable=aa;Y.removeAttribute('disabled');}else setTimeout(function(){if(b.gecko&&b.version>=10900||b.opera)X.$.body.contentEditable=aa;else if(b.webkit)X.$.body.parentNode.contentEditable=aa;
+else X.$.designMode=aa?'off':'on';},0);aa&&b.gecko&&e.setTimeout(A,0,null,C);W=C.window=new d.window(W);X=C.document=new g(X);aa&&X.on('dblclick',function(af){var ag=af.data.getTarget(),ah={element:ag,dialog:''};C.fire('doubleclick',ah);ah.dialog&&C.openDialog(ah.dialog);});c&&X.on('click',function(af){var ag=af.data.getTarget();if(ag.is('input')){var ah=ag.getAttribute('type');if(ah=='submit'||ah=='reset')af.data.preventDefault();}});if(!(c||b.opera))X.on('mousedown',function(af){var ag=af.data.getTarget();if(ag.is('img','hr','input','textarea','select'))C.getSelection().selectElement(ag);});if(b.gecko)X.on('mouseup',function(af){if(af.data.$.button==2){var ag=af.data.getTarget();if(!ag.getOuterHtml().replace(m,'')){var ah=new d.range(X);ah.moveToElementEditStart(ag);ah.select(true);}}});X.on('click',function(af){af=af.data;if(af.getTarget().is('a')&&af.$.button!=2)af.preventDefault();});if(b.webkit){X.on('mousedown',function(){ac=1;});X.on('click',function(af){if(af.data.getTarget().is('input','select'))af.data.preventDefault();});X.on('mouseup',function(af){if(af.data.getTarget().is('input','textarea'))af.data.preventDefault();});}var ab=c?M:W;ab.on('blur',function(){C.focusManager.blur();});var ac;ab.on('focus',function(){var af=C.document;if(aa&&b.gecko&&b.version>=10900)K();else if(b.opera)af.getBody().focus();else if(b.webkit)if(!ac){C.document.getDocumentElement().focus();ac=1;}C.focusManager.focus();});var ad=C.keystrokeHandler;ad.blockedKeystrokes[8]=!aa;ad.attach(X);X.getDocumentElement().addClass(X.$.compatMode);aa&&X.on('keydown',function(af){var ag=af.data.getKeystroke();if(ag in {8:1,46:1}){var ah=C.getSelection(),ai=ah.getSelectedElement(),aj=ah.getRanges()[0];if(ai){C.fire('saveSnapshot');aj.moveToPosition(ai,3);ai.remove();aj.select();C.fire('saveSnapshot');af.data.preventDefault();return;}}if(ag==33||ag==34)if(b.gecko){var ak=X.getBody();if(W.$.innerHeight>ak.$.offsetHeight){aj=new d.range(X);aj[ag==33?'moveToElementEditStart':'moveToElementEditEnd'](ak);aj.select();af.data.preventDefault();}}});if(c&&X.$.compatMode=='CSS1Compat'){var ae={33:1,34:1};X.on('keydown',function(af){if(af.data.getKeystroke() in ae)setTimeout(function(){C.getSelection().scrollIntoView();},0);});}if(c&&C.config.enterMode!=1)X.on('selectionchange',function(){var af=X.getBody(),ag=C.getSelection(),ah=ag&&ag.getRanges()[0];if(ah&&af.getHtml().match(/^<p> <\/p>$/i)&&ah.startContainer.equals(af))setTimeout(function(){ah=C.getSelection().getRanges()[0];if(!ah.startContainer.equals('body')){af.getFirst().remove(1);
+ah.moveToElementEditEnd(af);ah.select(1);}},0);});if(C.contextMenu)C.contextMenu.addTarget(X,C.config.browserContextMenuOnCtrl!==false);setTimeout(function(){C.fire('contentDom');if(Q){C.mode='wysiwyg';C.fire('mode',{previousMode:C._.previousMode});Q=false;}N=false;if(O){C.focus();O=false;}setTimeout(function(){C.fire('dataReady');},0);try{C.document.$.execCommand('enableInlineTableEditing',false,!C.config.disableNativeTableHandles);}catch(af){}if(C.config.disableObjectResizing)try{C.document.$.execCommand('enableObjectResizing',false,false);}catch(ag){C.document.getBody().on(c?'resizestart':'resize',function(ah){ah.data.preventDefault();});}if(c)setTimeout(function(){if(C.document){var ah=C.document.$.body;ah.runtimeStyle.marginBottom='0px';ah.runtimeStyle.marginBottom='';}},1000);},0);};C.addMode('wysiwyg',{load:function(W,X,Y){L=W;if(c&&b.quirks)W.setStyle('position','relative');C.mayBeDirty=true;Q=true;if(Y)this.loadSnapshotData(X);else this.loadData(X);},loadData:function(W){N=true;C._.dataStore={id:1};var X=C.config,Y=X.fullPage,Z=X.docType,aa='<style type="text/css" data-cke-temp="1">'+C._.styles.join('\n')+'</style>';!Y&&(aa=e.buildStyleHtml(C.config.contentsCss)+aa);var ab=X.baseHref?'<base href="'+X.baseHref+'" data-cke-temp="1" />':'';if(Y)W=W.replace(/<!DOCTYPE[^>]*>/i,function(ac){C.docType=Z=ac;return '';}).replace(/<\?xml\s[^\?]*\?>/i,function(ac){C.xmlDeclaration=ac;return '';});if(C.dataProcessor)W=C.dataProcessor.toHtml(W,D);if(Y){if(!/<body[\s|>]/.test(W))W='<body>'+W;if(!/<html[\s|>]/.test(W))W='<html>'+W+'</html>';if(!/<head[\s|>]/.test(W))W=W.replace(/<html[^>]*>/,'$&<head><title></title></head>');else if(!/<title[\s|>]/.test(W))W=W.replace(/<head[^>]*>/,'$&<title></title>');ab&&(W=W.replace(/<head>/,'$&'+ab));W=W.replace(/<\/head\s*>/,aa+'$&');W=Z+W;}else W=X.docType+'<html dir="'+X.contentsLangDirection+'"'+' lang="'+(X.contentsLanguage||C.langCode)+'">'+'<head>'+'<title>'+E+'</title>'+ab+aa+'</head>'+'<body'+(X.bodyId?' id="'+X.bodyId+'"':'')+(X.bodyClass?' class="'+X.bodyClass+'"':'')+'>'+W+'</html>';if(b.gecko)W=W.replace(/<br \/>(?=\s*<\/(:?html|body)>)/,'$&<br type="_moz" />');W+=U;this.onDispose();T(W);},getData:function(){var W=C.config,X=W.fullPage,Y=X&&C.docType,Z=X&&C.xmlDeclaration,aa=M.getFrameDocument(),ab=X?aa.getDocumentElement().getOuterHtml():aa.getBody().getHtml();if(b.gecko)ab=ab.replace(/<br>(?=\s*(:?$|<\/body>))/,'');if(C.dataProcessor)ab=C.dataProcessor.toDataFormat(ab,D);if(W.ignoreEmptyParagraph)ab=ab.replace(m,function(ac,ad){return ad;
+});if(Z)ab=Z+'\n'+ab;if(Y)ab=Y+'\n'+ab;return ab;},getSnapshotData:function(){return M.getFrameDocument().getBody().getHtml();},loadSnapshotData:function(W){M.getFrameDocument().getBody().setHtml(W);},onDispose:function(){if(!C.document)return;C.document.getDocumentElement().clearCustomData();C.document.getBody().clearCustomData();C.window.clearCustomData();C.document.clearCustomData();M.clearCustomData();M.remove();},unload:function(W){this.onDispose();if(R)F.removeListener('resize',R);C.window=C.document=M=L=O=null;C.fire('contentDomUnload');},focus:function(){var W=C.window;if(N)O=true;else if(W){b.air?setTimeout(function(){W.focus();},0):W.focus();C.selectionChange();}}});C.on('insertHtml',p(q),null,null,20);C.on('insertElement',p(s),null,null,20);C.on('insertText',p(r),null,null,20);C.on('selectionChange',function(W){if(C.readOnly)return;var X=C.getSelection();if(X&&!X.isLocked){var Y=C.checkDirty();C.fire('saveSnapshot',{contentOnly:1});B.call(this,W);C.fire('updateSnapshot');!Y&&C.resetDirty();}},null,null,1);});var H;C.on('contentDom',function(){var L=C.document.getElementsByTag('title').getItem(0);L.data('cke-title',C.document.$.title);C.document.$.title=E;});C.on('readOnly',function(){if(C.mode=='wysiwyg'){var L=C.getMode();L.loadData(L.getData());}});if(a.document.$.documentMode>=8){C.addCss('html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}');var I=[];for(var J in f.$removeEmpty)I.push('html.CSS1Compat '+J+'[contenteditable=false]');C.addCss(I.join(',')+'{ display:inline-block;}');}else if(b.gecko){C.addCss('html { height: 100% !important; }');C.addCss('img:-moz-broken { -moz-force-broken-image-icon : 1;\twidth : 24px; height : 24px; }');}else if(c&&b.version<8&&C.config.contentsLangDirection=='ltr')C.addCss('body{margin-right:0;}');C.addCss('html {\t_overflow-y: scroll; cursor: text;\t*cursor:auto;}');C.addCss('img, input, textarea { cursor: default;}');function K(L){if(C.readOnly)return;e.tryThese(function(){C.document.$.designMode='on';setTimeout(function(){C.document.$.designMode='off';if(a.currentInstance==C)C.document.getBody().focus();},50);},function(){C.document.$.designMode='off';var M=C.document.getBody();M.setAttribute('contentEditable',false);M.setAttribute('contentEditable',true);!L&&K(1);});};C.on('insertElement',function(L){var M=L.data;if(M.type==1&&(M.is('input')||M.is('textarea'))){var N=M.getAttribute('contenteditable')=='false';if(!N){M.data('cke-editable',M.hasAttribute('contenteditable')?'true':'1');M.setAttribute('contenteditable',false);
+}}});}});if(b.gecko)(function(){var C=document.body;if(!C)window.addEventListener('load',arguments.callee,false);else{var D=C.getAttribute('onpageshow');C.setAttribute('onpageshow',(D?D+';':'')+'event.persisted && (function(){'+'var allInstances = CKEDITOR.instances, editor, doc;'+'for ( var i in allInstances )'+'{'+'\teditor = allInstances[ i ];'+'\tdoc = editor.document;'+'\tif ( doc )'+'\t{'+'\t\tdoc.$.designMode = "off";'+'\t\tdoc.$.designMode = "on";'+'\t}'+'}'+'})();');}})();})();i.disableObjectResizing=false;i.disableNativeTableHandles=true;i.disableNativeSpellChecker=true;i.ignoreEmptyParagraph=true;j.add('wsc',{requires:['dialog'],init:function(m){var n='checkspell',o=m.addCommand(n,new a.dialogCommand(n));o.modes={wysiwyg:!b.opera&&!b.air&&document.domain==window.location.hostname};m.ui.addButton('SpellChecker',{label:m.lang.spellCheck.toolbar,command:n});a.dialog.add(n,this.path+'dialogs/wsc.js');}});i.wsc_customerId=i.wsc_customerId||'1:ua3xw1-2XyGJ3-GWruD3-6OFNT1-oXcuB1-nR6Bp4-hgQHc-EcYng3-sdRXG3-NOfFk';i.wsc_customLoaderScript=i.wsc_customLoaderScript||null;a.DIALOG_RESIZE_NONE=0;a.DIALOG_RESIZE_WIDTH=1;a.DIALOG_RESIZE_HEIGHT=2;a.DIALOG_RESIZE_BOTH=3;(function(){var m=e.cssLength;function n(S){return!!this._.tabs[S][0].$.offsetHeight;};function o(){var W=this;var S=W._.currentTabId,T=W._.tabIdList.length,U=e.indexOf(W._.tabIdList,S)+T;for(var V=U-1;V>U-T;V--){if(n.call(W,W._.tabIdList[V%T]))return W._.tabIdList[V%T];}return null;};function p(){var W=this;var S=W._.currentTabId,T=W._.tabIdList.length,U=e.indexOf(W._.tabIdList,S);for(var V=U+1;V<U+T;V++){if(n.call(W,W._.tabIdList[V%T]))return W._.tabIdList[V%T];}return null;};function q(S,T){var U=S.$.getElementsByTagName('input');for(var V=0,W=U.length;V<W;V++){var X=new h(U[V]);if(X.getAttribute('type').toLowerCase()=='text')if(T){X.setAttribute('value',X.getCustomData('fake_value')||'');X.removeCustomData('fake_value');}else{X.setCustomData('fake_value',X.getAttribute('value'));X.setAttribute('value','');}}};function r(S,T){var V=this;var U=V.getInputElement();if(U)S?U.removeAttribute('aria-invalid'):U.setAttribute('aria-invalid',true);if(!S)if(V.select)V.select();else V.focus();T&&alert(T);V.fire('validated',{valid:S,msg:T});};function s(){var S=this.getInputElement();S&&S.removeAttribute('aria-invalid');};a.dialog=function(S,T){var U=a.dialog._.dialogDefinitions[T],V=e.clone(u),W=S.config.dialog_buttonsOrder||'OS',X=S.lang.dir,Y={},Z,aa;if(W=='OS'&&b.mac||W=='rtl'&&X=='ltr'||W=='ltr'&&X=='rtl')V.buttons.reverse();
+U=e.extend(U(S),V);U=e.clone(U);U=new y(this,U);var ab=a.document,ac=S.theme.buildDialog(S);this._={editor:S,element:ac.element,name:T,contentSize:{width:0,height:0},size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:false,focusList:[],currentFocusIndex:0,hasFocus:false};this.parts=ac.parts;e.setTimeout(function(){S.fire('ariaWidget',this.parts.contents);},0,this);var ad={position:b.ie6Compat?'absolute':'fixed',top:0,visibility:'hidden'};ad[X=='rtl'?'right':'left']=0;this.parts.dialog.setStyles(ad);a.event.call(this);this.definition=U=a.fire('dialogDefinition',{name:T,definition:U},S).definition;if(!('removeDialogTabs' in S._)&&S.config.removeDialogTabs){var ae=S.config.removeDialogTabs.split(';');for(Z=0;Z<ae.length;Z++){var af=ae[Z].split(':');if(af.length==2){var ag=af[0];if(!Y[ag])Y[ag]=[];Y[ag].push(af[1]);}}S._.removeDialogTabs=Y;}if(S._.removeDialogTabs&&(Y=S._.removeDialogTabs[T]))for(Z=0;Z<Y.length;Z++)U.removeContents(Y[Z]);if(U.onLoad)this.on('load',U.onLoad);if(U.onShow)this.on('show',U.onShow);if(U.onHide)this.on('hide',U.onHide);if(U.onOk)this.on('ok',function(ar){S.fire('saveSnapshot');setTimeout(function(){S.fire('saveSnapshot');},0);if(U.onOk.call(this,ar)===false)ar.data.hide=false;});if(U.onCancel)this.on('cancel',function(ar){if(U.onCancel.call(this,ar)===false)ar.data.hide=false;});var ah=this,ai=function(ar){var as=ah._.contents,at=false;for(var au in as)for(var av in as[au]){at=ar.call(this,as[au][av]);if(at)return;}};this.on('ok',function(ar){ai(function(as){if(as.validate){var at=as.validate(this),au=typeof at=='string'||at===false;if(au){ar.data.hide=false;ar.stop();}r.call(as,!au,typeof at=='string'?at:undefined);return au;}});},this,null,0);this.on('cancel',function(ar){ai(function(as){if(as.isChanged()){if(!confirm(S.lang.common.confirmCancel))ar.data.hide=false;return true;}});},this,null,0);this.parts.close.on('click',function(ar){if(this.fire('cancel',{hide:true}).hide!==false)this.hide();ar.data.preventDefault();},this);function aj(){var ar=ah._.focusList;ar.sort(function(au,av){if(au.tabIndex!=av.tabIndex)return av.tabIndex-au.tabIndex;else return au.focusIndex-av.focusIndex;});var as=ar.length;for(var at=0;at<as;at++)ar[at].focusIndex=at;};function ak(ar){var as=ah._.focusList;ar=ar||0;if(as.length<1)return;var at=ah._.currentFocusIndex;try{as[at].getInputElement().$.blur();}catch(aw){}var au=(at+ar+as.length)%as.length,av=au;
+while(ar&&!as[av].isFocusable()){av=(av+ar+as.length)%as.length;if(av==au)break;}as[av].focus();if(as[av].type=='text')as[av].select();};this.changeFocus=ak;function al(ar){var aw=this;if(ah!=a.dialog._.currentTop)return;var as=ar.data.getKeystroke(),at=S.lang.dir=='rtl';aa=0;if(as==9||as==2228224+9){var au=as==2228224+9;if(ah._.tabBarMode){var av=au?o.call(ah):p.call(ah);ah.selectPage(av);ah._.tabs[av][0].focus();}else ak(au?-1:1);aa=1;}else if(as==4456448+121&&!ah._.tabBarMode&&ah.getPageCount()>1){ah._.tabBarMode=true;ah._.tabs[ah._.currentTabId][0].focus();aa=1;}else if((as==37||as==39)&&ah._.tabBarMode){av=as==(at?39:37)?o.call(ah):p.call(ah);ah.selectPage(av);ah._.tabs[av][0].focus();aa=1;}else if((as==13||as==32)&&ah._.tabBarMode){aw.selectPage(aw._.currentTabId);aw._.tabBarMode=false;aw._.currentFocusIndex=-1;ak(1);aa=1;}if(aa){ar.stop();ar.data.preventDefault();}};function am(ar){aa&&ar.data.preventDefault();};var an=this._.element;this.on('show',function(){an.on('keydown',al,this,null,0);if(b.opera||b.gecko&&b.mac)an.on('keypress',am,this);});this.on('hide',function(){an.removeListener('keydown',al);if(b.opera||b.gecko&&b.mac)an.removeListener('keypress',am);ai(function(ar){s.apply(ar);});});this.on('iframeAdded',function(ar){var as=new g(ar.data.iframe.$.contentWindow.document);as.on('keydown',al,this,null,0);});this.on('show',function(){var av=this;aj();if(S.config.dialog_startupFocusTab&&ah._.pageCount>1){ah._.tabBarMode=true;ah._.tabs[ah._.currentTabId][0].focus();}else if(!av._.hasFocus){av._.currentFocusIndex=-1;if(U.onFocus){var ar=U.onFocus.call(av);ar&&ar.focus();}else ak(1);if(av._.editor.mode=='wysiwyg'&&c){var as=S.document.$.selection,at=as.createRange();if(at)if(at.parentElement&&at.parentElement().ownerDocument==S.document.$||at.item&&at.item(0).ownerDocument==S.document.$){var au=document.body.createTextRange();au.moveToElementText(av.getElement().getFirst().$);au.collapse(true);au.select();}}}},this,null,4294967295);if(b.ie6Compat)this.on('load',function(ar){var as=this.getElement(),at=as.getFirst();at.remove();at.appendTo(as);},this);A(this);B(this);new d.text(U.title,a.document).appendTo(this.parts.title);for(Z=0;Z<U.contents.length;Z++){var ao=U.contents[Z];ao&&this.addPage(ao);}this.parts.tabs.on('click',function(ar){var au=this;var as=ar.data.getTarget();if(as.hasClass('cke_dialog_tab')){var at=as.$.id;au.selectPage(at.substring(4,at.lastIndexOf('_')));if(au._.tabBarMode){au._.tabBarMode=false;au._.currentFocusIndex=-1;ak(1);
+}ar.data.preventDefault();}},this);var ap=[],aq=a.dialog._.uiElementBuilders.hbox.build(this,{type:'hbox',className:'cke_dialog_footer_buttons',widths:[],children:U.buttons},ap).getChild();this.parts.footer.setHtml(ap.join(''));for(Z=0;Z<aq.length;Z++)this._.buttons[aq[Z].id]=aq[Z];};function t(S,T,U){this.element=T;this.focusIndex=U;this.tabIndex=0;this.isFocusable=function(){return!T.getAttribute('disabled')&&T.isVisible();};this.focus=function(){S._.currentFocusIndex=this.focusIndex;this.element.focus();};T.on('keydown',function(V){if(V.data.getKeystroke() in {32:1,13:1})this.fire('click');});T.on('focus',function(){this.fire('mouseover');});T.on('blur',function(){this.fire('mouseout');});};a.dialog.prototype={destroy:function(){this.hide();this._.element.remove();},resize:(function(){return function(S,T){var U=this;if(U._.contentSize&&U._.contentSize.width==S&&U._.contentSize.height==T)return;a.dialog.fire('resize',{dialog:U,skin:U._.editor.skinName,width:S,height:T},U._.editor);U.fire('resize',{skin:U._.editor.skinName,width:S,height:T},U._.editor);if(U._.editor.lang.dir=='rtl'&&U._.position)U._.position.x=a.document.getWindow().getViewPaneSize().width-U._.contentSize.width-parseInt(U._.element.getFirst().getStyle('right'),10);U._.contentSize={width:S,height:T};};})(),getSize:function(){var S=this._.element.getFirst();return{width:S.$.offsetWidth||0,height:S.$.offsetHeight||0};},move:(function(){var S;return function(T,U,V){var ac=this;var W=ac._.element.getFirst(),X=ac._.editor.lang.dir=='rtl';if(S===undefined)S=W.getComputedStyle('position')=='fixed';if(S&&ac._.position&&ac._.position.x==T&&ac._.position.y==U)return;ac._.position={x:T,y:U};if(!S){var Y=a.document.getWindow().getScrollPosition();T+=Y.x;U+=Y.y;}if(X){var Z=ac.getSize(),aa=a.document.getWindow().getViewPaneSize();T=aa.width-Z.width-T;}var ab={top:(U>0?U:0)+'px'};ab[X?'right':'left']=(T>0?T:0)+'px';W.setStyles(ab);V&&(ac._.moved=1);};})(),getPosition:function(){return e.extend({},this._.position);},show:function(){var S=this._.element,T=this.definition;if(!(S.getParent()&&S.getParent().equals(a.document.getBody())))S.appendTo(a.document.getBody());else S.setStyle('display','block');if(b.gecko&&b.version<10900){var U=this.parts.dialog;U.setStyle('position','absolute');setTimeout(function(){U.setStyle('position','fixed');},0);}this.resize(this._.contentSize&&this._.contentSize.width||T.width||T.minWidth,this._.contentSize&&this._.contentSize.height||T.height||T.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);
+if(a.dialog._.currentZIndex===null)a.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex;this._.element.getFirst().setStyle('z-index',a.dialog._.currentZIndex+=10);if(a.dialog._.currentTop===null){a.dialog._.currentTop=this;this._.parentDialog=null;G(this._.editor);}else{this._.parentDialog=a.dialog._.currentTop;var V=this._.parentDialog.getElement().getFirst();V.$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2);a.dialog._.currentTop=this;}S.on('keydown',K);S.on(b.opera?'keypress':'keyup',L);for(var W in {keyup:1,keydown:1,keypress:1})S.on(W,R);M(this,this,'\x1b',null,function(){var X=this.getButton('cancel');if(X)X.click();else if(this.fire('cancel',{hide:true}).hide!==false)this.hide();});this._.hasFocus=false;e.setTimeout(function(){this.layout();this.parts.dialog.setStyle('visibility','');this.fireOnce('load',{});k.fire('ready',this);this.fire('show',{});this._.editor.fire('dialogShow',this);this.foreach(function(X){X.setInitValue&&X.setInitValue();});},100,this);},layout:function(){var U=this;var S=a.document.getWindow().getViewPaneSize(),T=U.getSize();U.move(U._.moved?U._.position.x:(S.width-T.width)/2,U._.moved?U._.position.y:(S.height-T.height)/2);},foreach:function(S){var V=this;for(var T in V._.contents)for(var U in V._.contents[T])S.call(V,V._.contents[T][U]);return V;},reset:(function(){var S=function(T){if(T.reset)T.reset(1);};return function(){this.foreach(S);return this;};})(),setupContent:function(){var S=arguments;this.foreach(function(T){if(T.setup)T.setup.apply(T,S);});},commitContent:function(){var S=arguments;this.foreach(function(T){if(c&&this._.currentFocusIndex==T.focusIndex)T.getInputElement().$.blur();if(T.commit)T.commit.apply(T,S);});},hide:function(){if(!this.parts.dialog.isVisible())return;this.fire('hide',{});this._.editor.fire('dialogHide',this);var S=this._.element;S.setStyle('display','none');this.parts.dialog.setStyle('visibility','hidden');N(this);while(a.dialog._.currentTop!=this)a.dialog._.currentTop.hide();if(!this._.parentDialog)H();else{var T=this._.parentDialog.getElement().getFirst();T.setStyle('z-index',parseInt(T.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2));}a.dialog._.currentTop=this._.parentDialog;if(!this._.parentDialog){a.dialog._.currentZIndex=null;S.removeListener('keydown',K);S.removeListener(b.opera?'keypress':'keyup',L);for(var U in {keyup:1,keydown:1,keypress:1})S.removeListener(U,R);var V=this._.editor;V.focus();if(V.mode=='wysiwyg'&&c){var W=V.getSelection();
W&&W.unlock(true);}}else a.dialog._.currentZIndex-=10;delete this._.parentDialog;this.foreach(function(X){X.resetInitValue&&X.resetInitValue();});},addPage:function(S){var ae=this;var T=[],U=S.label?' title="'+e.htmlEncode(S.label)+'"':'',V=S.elements,W=a.dialog._.uiElementBuilders.vbox.build(ae,{type:'vbox',className:'cke_dialog_page_contents',children:S.elements,expand:!!S.expand,padding:S.padding,style:S.style||'width: 100%;height:100%'},T),X=h.createFromHtml(T.join(''));X.setAttribute('role','tabpanel');var Y=b,Z='cke_'+S.id+'_'+e.getNextNumber(),aa=h.createFromHtml(['<a class="cke_dialog_tab"',ae._.pageCount>0?' cke_last':'cke_first',U,!!S.hidden?' style="display:none"':'',' id="',Z,'"',Y.gecko&&Y.version>=10900&&!Y.hc?'':' href="javascript:void(0)"',' tabIndex="-1"',' hidefocus="true"',' role="tab">',S.label,'</a>'].join(''));X.setAttribute('aria-labelledby',Z);ae._.tabs[S.id]=[aa,X];ae._.tabIdList.push(S.id);!S.hidden&&ae._.pageCount++;ae._.lastTab=aa;ae.updateStyle();var ab=ae._.contents[S.id]={},ac,ad=W.getChild();while(ac=ad.shift()){ab[ac.id]=ac;if(typeof ac.getChild=='function')ad.push.apply(ad,ac.getChild());}X.setAttribute('name',S.id);X.appendTo(ae.parts.contents);aa.unselectable();ae.parts.tabs.append(aa);if(S.accessKey){M(ae,ae,'CTRL+'+S.accessKey,P,O);ae._.accessKeyMap['CTRL+'+S.accessKey]=S.id;}},selectPage:function(S){if(this._.currentTabId==S)return;if(this.fire('selectPage',{page:S,currentPage:this._.currentTabId})===true)return;for(var T in this._.tabs){var U=this._.tabs[T][0],V=this._.tabs[T][1];if(T!=S){U.removeClass('cke_dialog_tab_selected');V.hide();}V.setAttribute('aria-hidden',T!=S);}var W=this._.tabs[S];W[0].addClass('cke_dialog_tab_selected');if(b.ie6Compat||b.ie7Compat){q(W[1]);W[1].show();setTimeout(function(){q(W[1],1);},0);}else W[1].show();this._.currentTabId=S;this._.currentTabIndex=e.indexOf(this._.tabIdList,S);},updateStyle:function(){this.parts.dialog[(this._.pageCount===1?'add':'remove')+'Class']('cke_single_page');},hidePage:function(S){var U=this;var T=U._.tabs[S]&&U._.tabs[S][0];if(!T||U._.pageCount==1||!T.isVisible())return;else if(S==U._.currentTabId)U.selectPage(o.call(U));T.hide();U._.pageCount--;U.updateStyle();},showPage:function(S){var U=this;var T=U._.tabs[S]&&U._.tabs[S][0];if(!T)return;T.show();U._.pageCount++;U.updateStyle();},getElement:function(){return this._.element;},getName:function(){return this._.name;},getContentElement:function(S,T){var U=this._.contents[S];return U&&U[T];},getValueOf:function(S,T){return this.getContentElement(S,T).getValue();
},setValueOf:function(S,T,U){return this.getContentElement(S,T).setValue(U);},getButton:function(S){return this._.buttons[S];},click:function(S){return this._.buttons[S].click();},disableButton:function(S){return this._.buttons[S].disable();},enableButton:function(S){return this._.buttons[S].enable();},getPageCount:function(){return this._.pageCount;},getParentEditor:function(){return this._.editor;},getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement();},addFocusable:function(S,T){var V=this;if(typeof T=='undefined'){T=V._.focusList.length;V._.focusList.push(new t(V,S,T));}else{V._.focusList.splice(T,0,new t(V,S,T));for(var U=T+1;U<V._.focusList.length;U++)V._.focusList[U].focusIndex++;}}};e.extend(a.dialog,{add:function(S,T){if(!this._.dialogDefinitions[S]||typeof T=='function')this._.dialogDefinitions[S]=T;},exists:function(S){return!!this._.dialogDefinitions[S];},getCurrent:function(){return a.dialog._.currentTop;},okButton:(function(){var S=function(T,U){U=U||{};return e.extend({id:'ok',type:'button',label:T.lang.common.ok,'class':'cke_dialog_ui_button_ok',onClick:function(V){var W=V.data.dialog;if(W.fire('ok',{hide:true}).hide!==false)W.hide();}},U,true);};S.type='button';S.override=function(T){return e.extend(function(U){return S(U,T);},{type:'button'},true);};return S;})(),cancelButton:(function(){var S=function(T,U){U=U||{};return e.extend({id:'cancel',type:'button',label:T.lang.common.cancel,'class':'cke_dialog_ui_button_cancel',onClick:function(V){var W=V.data.dialog;if(W.fire('cancel',{hide:true}).hide!==false)W.hide();}},U,true);};S.type='button';S.override=function(T){return e.extend(function(U){return S(U,T);},{type:'button'},true);};return S;})(),addUIElement:function(S,T){this._.uiElementBuilders[S]=T;}});a.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};a.event.implementOn(a.dialog);a.event.implementOn(a.dialog.prototype,true);var u={resizable:3,minWidth:600,minHeight:400,buttons:[a.dialog.okButton,a.dialog.cancelButton]},v=function(S,T,U){for(var V=0,W;W=S[V];V++){if(W.id==T)return W;if(U&&W[U]){var X=v(W[U],T,U);if(X)return X;}}return null;},w=function(S,T,U,V,W){if(U){for(var X=0,Y;Y=S[X];X++){if(Y.id==U){S.splice(X,0,T);return T;}if(V&&Y[V]){var Z=w(Y[V],T,U,V,true);if(Z)return Z;}}if(W)return null;}S.push(T);return T;},x=function(S,T,U){for(var V=0,W;W=S[V];V++){if(W.id==T)return S.splice(V,1);if(U&&W[U]){var X=x(W[U],T,U);if(X)return X;}}return null;},y=function(S,T){this.dialog=S;
var U=T.contents;for(var V=0,W;W=U[V];V++)U[V]=W&&new z(S,W);e.extend(this,T);};y.prototype={getContents:function(S){return v(this.contents,S);},getButton:function(S){return v(this.buttons,S);},addContents:function(S,T){return w(this.contents,S,T);},addButton:function(S,T){return w(this.buttons,S,T);},removeContents:function(S){x(this.contents,S);},removeButton:function(S){x(this.buttons,S);}};function z(S,T){this._={dialog:S};e.extend(this,T);};z.prototype={get:function(S){return v(this.elements,S,'children');},add:function(S,T){return w(this.elements,S,T,'children');},remove:function(S){x(this.elements,S,'children');}};function A(S){var T=null,U=null,V=S.getElement().getFirst(),W=S.getParentEditor(),X=W.config.dialog_magnetDistance,Y=W.skin.margins||[0,0,0,0];if(typeof X=='undefined')X=20;function Z(ab){var ac=S.getSize(),ad=a.document.getWindow().getViewPaneSize(),ae=ab.data.$.screenX,af=ab.data.$.screenY,ag=ae-T.x,ah=af-T.y,ai,aj;T={x:ae,y:af};U.x+=ag;U.y+=ah;if(U.x+Y[3]<X)ai=-Y[3];else if(U.x-Y[1]>ad.width-ac.width-X)ai=ad.width-ac.width+(W.lang.dir=='rtl'?0:Y[1]);else ai=U.x;if(U.y+Y[0]<X)aj=-Y[0];else if(U.y-Y[2]>ad.height-ac.height-X)aj=ad.height-ac.height+Y[2];else aj=U.y;S.move(ai,aj,1);ab.data.preventDefault();};function aa(ab){a.document.removeListener('mousemove',Z);a.document.removeListener('mouseup',aa);if(b.ie6Compat){var ac=E.getChild(0).getFrameDocument();ac.removeListener('mousemove',Z);ac.removeListener('mouseup',aa);}};S.parts.title.on('mousedown',function(ab){T={x:ab.data.$.screenX,y:ab.data.$.screenY};a.document.on('mousemove',Z);a.document.on('mouseup',aa);U=S.getPosition();if(b.ie6Compat){var ac=E.getChild(0).getFrameDocument();ac.on('mousemove',Z);ac.on('mouseup',aa);}ab.data.preventDefault();},S);};function B(S){var T=S.definition,U=T.resizable;if(U==0)return;var V=S.getParentEditor(),W,X,Y,Z,aa,ab,ac=e.addFunction(function(af){aa=S.getSize();var ag=S.parts.contents,ah=ag.$.getElementsByTagName('iframe').length;if(ah){ab=h.createFromHtml('<div class="cke_dialog_resize_cover" style="height: 100%; position: absolute; width: 100%;"></div>');ag.append(ab);}X=aa.height-S.parts.contents.getSize('height',!(b.gecko||b.opera||c&&b.quirks));W=aa.width-S.parts.contents.getSize('width',1);Z={x:af.screenX,y:af.screenY};Y=a.document.getWindow().getViewPaneSize();a.document.on('mousemove',ad);a.document.on('mouseup',ae);if(b.ie6Compat){var ai=E.getChild(0).getFrameDocument();ai.on('mousemove',ad);ai.on('mouseup',ae);}af.preventDefault&&af.preventDefault();
});S.on('load',function(){var af='';if(U==1)af=' cke_resizer_horizontal';else if(U==2)af=' cke_resizer_vertical';var ag=h.createFromHtml('<div class="cke_resizer'+af+' cke_resizer_'+V.lang.dir+'"'+' title="'+e.htmlEncode(V.lang.resize)+'"'+' onmousedown="CKEDITOR.tools.callFunction('+ac+', event )"></div>');S.parts.footer.append(ag,1);});V.on('destroy',function(){e.removeFunction(ac);});function ad(af){var ag=V.lang.dir=='rtl',ah=(af.data.$.screenX-Z.x)*(ag?-1:1),ai=af.data.$.screenY-Z.y,aj=aa.width,ak=aa.height,al=aj+ah*(S._.moved?1:2),am=ak+ai*(S._.moved?1:2),an=S._.element.getFirst(),ao=ag&&an.getComputedStyle('right'),ap=S.getPosition();if(ap.y+am>Y.height)am=Y.height-ap.y;if((ag?ao:ap.x)+al>Y.width)al=Y.width-(ag?ao:ap.x);if(U==1||U==3)aj=Math.max(T.minWidth||0,al-W);if(U==2||U==3)ak=Math.max(T.minHeight||0,am-X);S.resize(aj,ak);if(!S._.moved)S.layout();af.data.preventDefault();};function ae(){a.document.removeListener('mouseup',ae);a.document.removeListener('mousemove',ad);if(ab){ab.remove();ab=null;}if(b.ie6Compat){var af=E.getChild(0).getFrameDocument();af.removeListener('mouseup',ae);af.removeListener('mousemove',ad);}};};var C,D={},E;function F(S){S.data.preventDefault(1);};function G(S){var T=a.document.getWindow(),U=S.config,V=U.dialog_backgroundCoverColor||'white',W=U.dialog_backgroundCoverOpacity,X=U.baseFloatZIndex,Y=e.genKey(V,W,X),Z=D[Y];if(!Z){var aa=['<div tabIndex="-1" style="position: ',b.ie6Compat?'absolute':'fixed','; z-index: ',X,'; top: 0px; left: 0px; ',!b.ie6Compat?'background-color: '+V:'','" class="cke_dialog_background_cover">'];if(b.ie6Compat){var ab=b.isCustomDomain(),ac="<html><body style=\\'background-color:"+V+";\\'></body></html>";aa.push('<iframe hidefocus="true" frameborder="0" id="cke_dialog_background_iframe" src="javascript:');aa.push('void((function(){document.open();'+(ab?"document.domain='"+document.domain+"';":'')+"document.write( '"+ac+"' );"+'document.close();'+'})())');aa.push('" style="position:absolute;left:0;top:0;width:100%;height: 100%;progid:DXImageTransform.Microsoft.Alpha(opacity=0)"></iframe>');}aa.push('</div>');Z=h.createFromHtml(aa.join(''));Z.setOpacity(W!=undefined?W:0.5);Z.on('keydown',F);Z.on('keypress',F);Z.on('keyup',F);Z.appendTo(a.document.getBody());D[Y]=Z;}else Z.show();E=Z;var ad=function(){var ag=T.getViewPaneSize();Z.setStyles({width:ag.width+'px',height:ag.height+'px'});},ae=function(){var ag=T.getScrollPosition(),ah=a.dialog._.currentTop;Z.setStyles({left:ag.x+'px',top:ag.y+'px'});if(ah)do{var ai=ah.getPosition();
ah.move(ai.x,ai.y);}while(ah=ah._.parentDialog)};C=ad;T.on('resize',ad);ad();if(!(b.mac&&b.webkit))Z.focus();if(b.ie6Compat){var af=function(){ae();arguments.callee.prevScrollHandler.apply(this,arguments);};T.$.setTimeout(function(){af.prevScrollHandler=window.onscroll||(function(){});window.onscroll=af;},0);ae();}};function H(){if(!E)return;var S=a.document.getWindow();E.hide();S.removeListener('resize',C);if(b.ie6Compat)S.$.setTimeout(function(){var T=window.onscroll&&window.onscroll.prevScrollHandler;window.onscroll=T||null;},0);C=null;};function I(){for(var S in D)D[S].remove();D={};};var J={},K=function(S){var T=S.data.$.ctrlKey||S.data.$.metaKey,U=S.data.$.altKey,V=S.data.$.shiftKey,W=String.fromCharCode(S.data.$.keyCode),X=J[(T?'CTRL+':'')+(U?'ALT+':'')+(V?'SHIFT+':'')+W];if(!X||!X.length)return;X=X[X.length-1];X.keydown&&X.keydown.call(X.uiElement,X.dialog,X.key);S.data.preventDefault();},L=function(S){var T=S.data.$.ctrlKey||S.data.$.metaKey,U=S.data.$.altKey,V=S.data.$.shiftKey,W=String.fromCharCode(S.data.$.keyCode),X=J[(T?'CTRL+':'')+(U?'ALT+':'')+(V?'SHIFT+':'')+W];if(!X||!X.length)return;X=X[X.length-1];if(X.keyup){X.keyup.call(X.uiElement,X.dialog,X.key);S.data.preventDefault();}},M=function(S,T,U,V,W){var X=J[U]||(J[U]=[]);X.push({uiElement:S,dialog:T,key:U,keyup:W||S.accessKeyUp,keydown:V||S.accessKeyDown});},N=function(S){for(var T in J){var U=J[T];for(var V=U.length-1;V>=0;V--){if(U[V].dialog==S||U[V].uiElement==S)U.splice(V,1);}if(U.length===0)delete J[T];}},O=function(S,T){if(S._.accessKeyMap[T])S.selectPage(S._.accessKeyMap[T]);},P=function(S,T){},Q={27:1,13:1},R=function(S){if(S.data.getKeystroke() in Q)S.data.stopPropagation();};(function(){k.dialog={uiElement:function(S,T,U,V,W,X,Y){if(arguments.length<4)return;var Z=(V.call?V(T):V)||'div',aa=['<',Z,' '],ab=(W&&W.call?W(T):W)||{},ac=(X&&X.call?X(T):X)||{},ad=(Y&&Y.call?Y.call(this,S,T):Y)||'',ae=this.domId=ac.id||e.getNextId()+'_uiElement',af=this.id=T.id,ag;ac.id=ae;var ah={};if(T.type)ah['cke_dialog_ui_'+T.type]=1;if(T.className)ah[T.className]=1;if(T.disabled)ah.cke_disabled=1;var ai=ac['class']&&ac['class'].split?ac['class'].split(' '):[];for(ag=0;ag<ai.length;ag++){if(ai[ag])ah[ai[ag]]=1;}var aj=[];for(ag in ah)aj.push(ag);ac['class']=aj.join(' ');if(T.title)ac.title=T.title;var ak=(T.style||'').split(';');if(T.align){var al=T.align;ab['margin-left']=al=='left'?0:'auto';ab['margin-right']=al=='right'?0:'auto';}for(ag in ab)ak.push(ag+':'+ab[ag]);if(T.hidden)ak.push('display:none');
-for(ag=ak.length-1;ag>=0;ag--){if(ak[ag]==='')ak.splice(ag,1);}if(ak.length>0)ac.style=(ac.style?ac.style+'; ':'')+ak.join('; ');for(ag in ac)aa.push(ag+'="'+e.htmlEncode(ac[ag])+'" ');aa.push('>',ad,'</',Z,'>');U.push(aa.join(''));(this._||(this._={})).dialog=S;if(typeof T.isChanged=='boolean')this.isChanged=function(){return T.isChanged;};if(typeof T.isChanged=='function')this.isChanged=T.isChanged;if(typeof T.setValue=='function')this.setValue=e.override(this.setValue,function(an){return function(ao){an.call(this,T.setValue.call(this,ao));};});if(typeof T.getValue=='function')this.getValue=e.override(this.getValue,function(an){return function(){return T.getValue.call(this,an.call(this));};});a.event.implementOn(this);this.registerEvents(T);if(this.accessKeyUp&&this.accessKeyDown&&T.accessKey)M(this,S,'CTRL+'+T.accessKey);var am=this;S.on('load',function(){if(am.getInputElement())am.getInputElement().on('focus',function(){S._.tabBarMode=false;S._.hasFocus=true;am.fire('focus');},am);});if(this.keyboardFocusable){this.tabIndex=T.tabIndex||0;this.focusIndex=S._.focusList.push(this)-1;this.on('focus',function(){S._.currentFocusIndex=am.focusIndex;});}e.extend(this,T);},hbox:function(S,T,U,V,W){if(arguments.length<4)return;this._||(this._={});var X=this._.children=T,Y=W&&W.widths||null,Z=W&&W.height||null,aa={},ab,ac=function(){var ae=['<tbody><tr class="cke_dialog_ui_hbox">'];for(ab=0;ab<U.length;ab++){var af='cke_dialog_ui_hbox_child',ag=[];if(ab===0)af='cke_dialog_ui_hbox_first';if(ab==U.length-1)af='cke_dialog_ui_hbox_last';ae.push('<td class="',af,'" role="presentation" ');if(Y){if(Y[ab])ag.push('width:'+m(Y[ab]));}else ag.push('width:'+Math.floor(100/U.length)+'%');if(Z)ag.push('height:'+m(Z));if(W&&W.padding!=undefined)ag.push('padding:'+m(W.padding));if(c&&b.quirks&&X[ab].align)ag.push('text-align:'+X[ab].align);if(ag.length>0)ae.push('style="'+ag.join('; ')+'" ');ae.push('>',U[ab],'</td>');}ae.push('</tr></tbody>');return ae.join('');},ad={role:'presentation'};W&&W.align&&(ad.align=W.align);k.dialog.uiElement.call(this,S,W||{type:'hbox'},V,'table',aa,ad,ac);},vbox:function(S,T,U,V,W){if(arguments.length<3)return;this._||(this._={});var X=this._.children=T,Y=W&&W.width||null,Z=W&&W.heights||null,aa=function(){var ab=['<table role="presentation" cellspacing="0" border="0" '];ab.push('style="');if(W&&W.expand)ab.push('height:100%;');ab.push('width:'+m(Y||'100%'),';');ab.push('"');ab.push('align="',e.htmlEncode(W&&W.align||(S.getParentEditor().lang.dir=='ltr'?'left':'right')),'" ');
-ab.push('><tbody>');for(var ac=0;ac<U.length;ac++){var ad=[];ab.push('<tr><td role="presentation" ');if(Y)ad.push('width:'+m(Y||'100%'));if(Z)ad.push('height:'+m(Z[ac]));else if(W&&W.expand)ad.push('height:'+Math.floor(100/U.length)+'%');if(W&&W.padding!=undefined)ad.push('padding:'+m(W.padding));if(c&&b.quirks&&X[ac].align)ad.push('text-align:'+X[ac].align);if(ad.length>0)ab.push('style="',ad.join('; '),'" ');ab.push(' class="cke_dialog_ui_vbox_child">',U[ac],'</td></tr>');}ab.push('</tbody></table>');return ab.join('');};k.dialog.uiElement.call(this,S,W||{type:'vbox'},V,'div',null,{role:'presentation'},aa);}};})();k.dialog.uiElement.prototype={getElement:function(){return a.document.getById(this.domId);},getInputElement:function(){return this.getElement();},getDialog:function(){return this._.dialog;},setValue:function(S,T){this.getInputElement().setValue(S);!T&&this.fire('change',{value:S});return this;},getValue:function(){return this.getInputElement().getValue();},isChanged:function(){return false;},selectParentTab:function(){var V=this;var S=V.getInputElement(),T=S,U;while((T=T.getParent())&&T.$.className.search('cke_dialog_page_contents')==-1){}if(!T)return V;U=T.getAttribute('name');if(V._.dialog._.currentTabId!=U)V._.dialog.selectPage(U);return V;},focus:function(){this.selectParentTab().getInputElement().focus();return this;},registerEvents:function(S){var T=/^on([A-Z]\w+)/,U,V=function(X,Y,Z,aa){Y.on('load',function(){X.getInputElement().on(Z,aa,X);});};for(var W in S){if(!(U=W.match(T)))continue;if(this.eventProcessors[W])this.eventProcessors[W].call(this,this._.dialog,S[W]);else V(this,this._.dialog,U[1].toLowerCase(),S[W]);}return this;},eventProcessors:{onLoad:function(S,T){S.on('load',T,this);},onShow:function(S,T){S.on('show',T,this);},onHide:function(S,T){S.on('hide',T,this);}},accessKeyDown:function(S,T){this.focus();},accessKeyUp:function(S,T){},disable:function(){var S=this.getElement(),T=this.getInputElement();T.setAttribute('disabled','true');S.addClass('cke_disabled');},enable:function(){var S=this.getElement(),T=this.getInputElement();T.removeAttribute('disabled');S.removeClass('cke_disabled');},isEnabled:function(){return!this.getElement().hasClass('cke_disabled');},isVisible:function(){return this.getInputElement().isVisible();},isFocusable:function(){if(!this.isEnabled()||!this.isVisible())return false;return true;}};k.dialog.hbox.prototype=e.extend(new k.dialog.uiElement(),{getChild:function(S){var T=this;if(arguments.length<1)return T._.children.concat();
-if(!S.splice)S=[S];if(S.length<2)return T._.children[S[0]];else return T._.children[S[0]]&&T._.children[S[0]].getChild?T._.children[S[0]].getChild(S.slice(1,S.length)):null;}},true);k.dialog.vbox.prototype=new k.dialog.hbox();(function(){var S={build:function(T,U,V){var W=U.children,X,Y=[],Z=[];for(var aa=0;aa<W.length&&(X=W[aa]);aa++){var ab=[];Y.push(ab);Z.push(a.dialog._.uiElementBuilders[X.type].build(T,X,ab));}return new k.dialog[U.type](T,Z,Y,V,U);}};a.dialog.addUIElement('hbox',S);a.dialog.addUIElement('vbox',S);})();a.dialogCommand=function(S){this.dialogName=S;};a.dialogCommand.prototype={exec:function(S){S.openDialog(this.dialogName);},canUndo:false,editorFocus:c||b.webkit};(function(){var S=/^([a]|[^a])+$/,T=/^\d*$/,U=/^\d*(?:\.\d+)?$/,V=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,W=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i;a.VALIDATE_OR=1;a.VALIDATE_AND=2;a.dialog.validate={functions:function(){var X=arguments;return function(){var Y=this&&this.getValue?this.getValue():X[0],Z=undefined,aa=2,ab=[],ac;for(ac=0;ac<X.length;ac++){if(typeof X[ac]=='function')ab.push(X[ac]);else break;}if(ac<X.length&&typeof X[ac]=='string'){Z=X[ac];ac++;}if(ac<X.length&&typeof X[ac]=='number')aa=X[ac];var ad=aa==2?true:false;for(ac=0;ac<ab.length;ac++){if(aa==2)ad=ad&&ab[ac](Y);else ad=ad||ab[ac](Y);}return!ad?Z:true;};},regex:function(X,Y){return function(){var Z=this&&this.getValue?this.getValue():arguments[0];return!X.test(Z)?Y:true;};},notEmpty:function(X){return this.regex(S,X);},integer:function(X){return this.regex(T,X);},number:function(X){return this.regex(U,X);},cssLength:function(X){return this.functions(function(Y){return W.test(e.trim(Y));},X);},htmlLength:function(X){return this.functions(function(Y){return V.test(e.trim(Y));},X);},equals:function(X,Y){return this.functions(function(Z){return Z==X;},Y);},notEqual:function(X,Y){return this.functions(function(Z){return Z!=X;},Y);}};a.on('instanceDestroyed',function(X){if(e.isEmpty(a.instances)){var Y;while(Y=a.dialog._.currentTop)Y.hide();I();}var Z=X.editor._.storedDialogs;for(var aa in Z)Z[aa].destroy();});})();e.extend(a.editor.prototype,{openDialog:function(S,T){if(this.mode=='wysiwyg'&&c){var U=this.getSelection();U&&U.lock();}var V=a.dialog._.dialogDefinitions[S],W=this.skin.dialog;if(a.dialog._.currentTop===null)G(this);if(typeof V=='function'&&W._isLoaded){var X=this._.storedDialogs||(this._.storedDialogs={}),Y=X[S]||(X[S]=new a.dialog(this,S));T&&T.call(Y,Y);Y.show();return Y;}else if(V=='failed'){H();
-throw new Error('[CKEDITOR.dialog.openDialog] Dialog "'+S+'" failed when loading definition.');}var Z=this;function aa(ac){var ad=a.dialog._.dialogDefinitions[S],ae=Z.skin.dialog;if(!ae._isLoaded||ab&&typeof ac=='undefined')return;if(typeof ad!='function')a.dialog._.dialogDefinitions[S]='failed';Z.openDialog(S,T);};if(typeof V=='string'){var ab=1;a.scriptLoader.load(a.getUrl(V),aa,null,0,1);}a.skins.load(this,'dialog',aa);return null;}});})();j.add('dialog',{requires:['dialogui']});j.add('styles',{requires:['selection'],init:function(m){m.on('contentDom',function(){m.document.setCustomData('cke_includeReadonly',!m.config.disableReadonlyStyling);});}});a.editor.prototype.attachStyleStateChange=function(m,n){var o=this._.styleStateChangeCallbacks;if(!o){o=this._.styleStateChangeCallbacks=[];this.on('selectionChange',function(p){for(var q=0;q<o.length;q++){var r=o[q],s=r.style.checkActive(p.data.path)?1:2;r.fn.call(this,s);}});}o.push({style:m,fn:n});};a.STYLE_BLOCK=1;a.STYLE_INLINE=2;a.STYLE_OBJECT=3;(function(){var m={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},n={a:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},o=/\s*(?:;\s*|$)/,p=/#\((.+?)\)/g,q=d.walker.bookmark(0,1),r=d.walker.whitespaces(1);a.style=function(T,U){var W=this;if(U){T=e.clone(T);L(T.attributes,U);L(T.styles,U);}var V=W.element=T.element?typeof T.element=='string'?T.element.toLowerCase():T.element:'*';W.type=m[V]?1:n[V]?3:2;if(typeof W.element=='object')W.type=3;W._={definition:T};};a.style.prototype={apply:function(T){S.call(this,T,false);},remove:function(T){S.call(this,T,true);},applyToRange:function(T){var U=this;return(U.applyToRange=U.type==2?t:U.type==1?x:U.type==3?v:null).call(U,T);},removeFromRange:function(T){var U=this;return(U.removeFromRange=U.type==2?u:U.type==1?y:U.type==3?w:null).call(U,T);},applyToObject:function(T){K(T,this);},checkActive:function(T){var Y=this;switch(Y.type){case 1:return Y.checkElementRemovable(T.block||T.blockLimit,true);case 3:case 2:var U=T.elements;for(var V=0,W;V<U.length;V++){W=U[V];if(Y.type==2&&(W==T.block||W==T.blockLimit))continue;if(Y.type==3){var X=W.getName();if(!(typeof Y.element=='string'?X==Y.element:X in Y.element))continue;}if(Y.checkElementRemovable(W,true))return true;}}return false;},checkApplicable:function(T){switch(this.type){case 2:case 1:break;
-case 3:return T.lastElement.getAscendant(this.element,true);}return true;},checkElementRemovable:function(T,U){var ae=this;if(!T||T.isReadOnly())return false;var V=ae._.definition,W,X=T.getName();if(typeof ae.element=='string'?X==ae.element:X in ae.element){if(!U&&!T.hasAttributes())return true;W=M(V);if(W._length){for(var Y in W){if(Y=='_length')continue;var Z=T.getAttribute(Y)||'';if(Y=='style'?R(W[Y],P(Z,false)):W[Y]==Z){if(!U)return true;}else if(U)return false;}if(U)return true;}else return true;}var aa=N(ae)[T.getName()];if(aa){if(!(W=aa.attributes))return true;for(var ab=0;ab<W.length;ab++){Y=W[ab][0];var ac=T.getAttribute(Y);if(ac){var ad=W[ab][1];if(ad===null||typeof ad=='string'&&ac==ad||ad.test(ac))return true;}}}return false;},buildPreview:function(T){var U=this._.definition,V=[],W=U.element;if(W=='bdo')W='span';V=['<',W];var X=U.attributes;if(X)for(var Y in X)V.push(' ',Y,'="',X[Y],'"');var Z=a.style.getStyleText(U);if(Z)V.push(' style="',Z,'"');V.push('>',T||U.name,'</',W,'>');return V.join('');}};a.style.getStyleText=function(T){var U=T._ST;if(U)return U;U=T.styles;var V=T.attributes&&T.attributes.style||'',W='';if(V.length)V=V.replace(o,';');for(var X in U){var Y=U[X],Z=(X+':'+Y).replace(o,';');if(Y=='inherit')W+=Z;else V+=Z;}if(V.length)V=P(V);V+=W;return T._ST=V;};function s(T){var U,V;while(T=T.getParent()){if(T.getName()=='body')break;if(T.getAttribute('data-nostyle'))U=T;else if(!V){var W=T.getAttribute('contentEditable');if(W=='false')U=T;else if(W=='true')V=1;}}return U;};function t(T){var ax=this;var U=T.document;if(T.collapsed){var V=J(ax,U);T.insertNode(V);T.moveToPosition(V,2);return;}var W=ax.element,X=ax._.definition,Y,Z=X.includeReadonly;if(Z==undefined)Z=U.getCustomData('cke_includeReadonly');var aa=f[W]||(Y=true,f.span);T.enlarge(1,1);T.trim();var ab=T.createBookmark(),ac=ab.startNode,ad=ab.endNode,ae=ac,af,ag=s(ac),ah=s(ad);if(ag)ae=ag.getNextSourceNode(true);if(ah)ad=ah;if(ae.getPosition(ad)==2)ae=0;while(ae){var ai=false;if(ae.equals(ad)){ae=null;ai=true;}else{var aj=ae.type,ak=aj==1?ae.getName():null,al=ak&&ae.getAttribute('contentEditable')=='false',am=ak&&ae.getAttribute('data-nostyle');if(ak&&ae.data('cke-bookmark')){ae=ae.getNextSourceNode(true);continue;}if(!ak||aa[ak]&&!am&&(!al||Z)&&(ae.getPosition(ad)|4|0|8)==4+0+8&&(!X.childRule||X.childRule(ae))){var an=ae.getParent();if(an&&((an.getDtd()||f.span)[W]||Y)&&(!X.parentRule||X.parentRule(an))){if(!af&&(!ak||!f.$removeEmpty[ak]||(ae.getPosition(ad)|4|0|8)==4+0+8)){af=new d.range(U);
-af.setStartBefore(ae);}if(aj==3||al||aj==1&&!ae.getChildCount()){var ao=ae,ap;while((ai=!ao.getNext(q))&&(ap=ao.getParent(),aa[ap.getName()])&&(ap.getPosition(ac)|2|0|8)==2+0+8&&(!X.childRule||X.childRule(ap)))ao=ap;af.setEndAfter(ao);}}else ai=true;}else ai=true;ae=ae.getNextSourceNode(am||al);}if(ai&&af&&!af.collapsed){var aq=J(ax,U),ar=aq.hasAttributes(),as=af.getCommonAncestor(),at={styles:{},attrs:{},blockedStyles:{},blockedAttrs:{}},au,av,aw;while(aq&&as){if(as.getName()==W){for(au in X.attributes){if(at.blockedAttrs[au]||!(aw=as.getAttribute(av)))continue;if(aq.getAttribute(au)==aw)at.attrs[au]=1;else at.blockedAttrs[au]=1;}for(av in X.styles){if(at.blockedStyles[av]||!(aw=as.getStyle(av)))continue;if(aq.getStyle(av)==aw)at.styles[av]=1;else at.blockedStyles[av]=1;}}as=as.getParent();}for(au in at.attrs)aq.removeAttribute(au);for(av in at.styles)aq.removeStyle(av);if(ar&&!aq.hasAttributes())aq=null;if(aq){af.extractContents().appendTo(aq);G(ax,aq);af.insertNode(aq);aq.mergeSiblings();if(!c)aq.$.normalize();}else{aq=new h('span');af.extractContents().appendTo(aq);af.insertNode(aq);G(ax,aq);aq.remove(true);}af=null;}}T.moveToBookmark(ab);T.shrink(2);};function u(T){T.enlarge(1,1);var U=T.createBookmark(),V=U.startNode;if(T.collapsed){var W=new d.elementPath(V.getParent()),X;for(var Y=0,Z;Y<W.elements.length&&(Z=W.elements[Y]);Y++){if(Z==W.block||Z==W.blockLimit)break;if(this.checkElementRemovable(Z)){var aa;if(T.collapsed&&(T.checkBoundaryOfElement(Z,2)||(aa=T.checkBoundaryOfElement(Z,1)))){X=Z;X.match=aa?'start':'end';}else{Z.mergeSiblings();if(Z.getName()==this.element)F(this,Z);else H(Z,N(this)[Z.getName()]);}}}if(X){var ab=V;for(Y=0;true;Y++){var ac=W.elements[Y];if(ac.equals(X))break;else if(ac.match)continue;else ac=ac.clone();ac.append(ab);ab=ac;}ab[X.match=='start'?'insertBefore':'insertAfter'](X);}}else{var ad=U.endNode,ae=this;function af(){var ai=new d.elementPath(V.getParent()),aj=new d.elementPath(ad.getParent()),ak=null,al=null;for(var am=0;am<ai.elements.length;am++){var an=ai.elements[am];if(an==ai.block||an==ai.blockLimit)break;if(ae.checkElementRemovable(an))ak=an;}for(am=0;am<aj.elements.length;am++){an=aj.elements[am];if(an==aj.block||an==aj.blockLimit)break;if(ae.checkElementRemovable(an))al=an;}if(al)ad.breakParent(al);if(ak)V.breakParent(ak);};af();var ag=V.getNext();while(!ag.equals(ad)){var ah=ag.getNextSourceNode();if(ag.type==1&&this.checkElementRemovable(ag)){if(ag.getName()==this.element)F(this,ag);else H(ag,N(this)[ag.getName()]);
-if(ah.type==1&&ah.contains(V)){af();ah=V.getNext();}}ag=ah;}}T.moveToBookmark(U);};function v(T){var U=T.getCommonAncestor(true,true),V=U.getAscendant(this.element,true);V&&!V.isReadOnly()&&K(V,this);};function w(T){var U=T.getCommonAncestor(true,true),V=U.getAscendant(this.element,true);if(!V)return;var W=this,X=W._.definition,Y=X.attributes,Z=a.style.getStyleText(X);if(Y)for(var aa in Y)V.removeAttribute(aa,Y[aa]);if(X.styles)for(var ab in X.styles){if(!X.styles.hasOwnProperty(ab))continue;V.removeStyle(ab);}};function x(T){var U=T.createBookmark(true),V=T.createIterator();V.enforceRealBlocks=true;if(this._.enterMode)V.enlargeBr=this._.enterMode!=2;var W,X=T.document,Y;while(W=V.getNextParagraph()){if(!W.isReadOnly()){var Z=J(this,X,W);z(W,Z);}}T.moveToBookmark(U);};function y(T){var Y=this;var U=T.createBookmark(1),V=T.createIterator();V.enforceRealBlocks=true;V.enlargeBr=Y._.enterMode!=2;var W;while(W=V.getNextParagraph()){if(Y.checkElementRemovable(W))if(W.is('pre')){var X=Y._.enterMode==2?null:T.document.createElement(Y._.enterMode==1?'p':'div');X&&W.copyAttributes(X);z(W,X);}else F(Y,W,1);}T.moveToBookmark(U);};function z(T,U){var V=!U;if(V){U=T.getDocument().createElement('div');T.copyAttributes(U);}var W=U&&U.is('pre'),X=T.is('pre'),Y=W&&!X,Z=!W&&X;if(Y)U=E(T,U);else if(Z)U=D(V?[T.getHtml()]:B(T),U);else T.moveChildren(U);U.replace(T);if(W)A(U);else if(V)I(U);};function A(T){var U;if(!((U=T.getPrevious(r))&&U.is&&U.is('pre')))return;var V=C(U.getHtml(),/\n$/,'')+'\n\n'+C(T.getHtml(),/^\n/,'');if(c)T.$.outerHTML='<pre>'+V+'</pre>';else T.setHtml(V);U.remove();};function B(T){var U=/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,V=T.getName(),W=C(T.getOuterHtml(),U,function(Y,Z,aa){return Z+'</pre>'+aa+'<pre>';}),X=[];W.replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(Y,Z){X.push(Z);});return X;};function C(T,U,V){var W='',X='';T=T.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(Y,Z,aa){Z&&(W=Z);aa&&(X=aa);return '';});return W+T.replace(U,V)+X;};function D(T,U){var V;if(T.length>1)V=new d.documentFragment(U.getDocument());for(var W=0;W<T.length;W++){var X=T[W];X=X.replace(/(\r\n|\r)/g,'\n');X=C(X,/^[ \t]*\n/,'');X=C(X,/\n$/,'');X=C(X,/^[ \t]+|[ \t]+$/g,function(Z,aa,ab){if(Z.length==1)return ' ';else if(!aa)return e.repeat(' ',Z.length-1)+' ';else return ' '+e.repeat(' ',Z.length-1);});X=X.replace(/\n/g,'<br>');X=X.replace(/[ \t]{2,}/g,function(Z){return e.repeat(' ',Z.length-1)+' ';
-});if(V){var Y=U.clone();Y.setHtml(X);V.append(Y);}else U.setHtml(X);}return V||U;};function E(T,U){var V=T.getBogus();V&&V.remove();var W=T.getHtml();W=C(W,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,'');W=W.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,'$1');W=W.replace(/([ \t\n\r]+| )/g,' ');W=W.replace(/<br\b[^>]*>/gi,'\n');if(c){var X=T.getDocument().createElement('div');X.append(U);U.$.outerHTML='<pre>'+W+'</pre>';U.copyAttributes(X.getFirst());U=X.getFirst().remove();}else U.setHtml(W);return U;};function F(T,U){var V=T._.definition,W=e.extend({},V.attributes,N(T)[U.getName()]),X=V.styles,Y=e.isEmpty(W)&&e.isEmpty(X);for(var Z in W){if((Z=='class'||T._.definition.fullMatch)&&U.getAttribute(Z)!=O(Z,W[Z]))continue;Y=U.hasAttribute(Z);U.removeAttribute(Z);}for(var aa in X){if(T._.definition.fullMatch&&U.getStyle(aa)!=O(aa,X[aa],true))continue;Y=Y||!!U.getStyle(aa);U.removeStyle(aa);}if(Y)!f.$block[U.getName()]||T._.enterMode==2&&!U.hasAttributes()?I(U):U.renameNode(T._.enterMode==1?'p':'div');};function G(T,U){var V=T._.definition,W=V.attributes,X=V.styles,Y=N(T),Z=U.getElementsByTag(T.element);for(var aa=Z.count();--aa>=0;)F(T,Z.getItem(aa));for(var ab in Y){if(ab!=T.element){Z=U.getElementsByTag(ab);for(aa=Z.count()-1;aa>=0;aa--){var ac=Z.getItem(aa);H(ac,Y[ab]);}}}};function H(T,U){var V=U&&U.attributes;if(V)for(var W=0;W<V.length;W++){var X=V[W][0],Y;if(Y=T.getAttribute(X)){var Z=V[W][1];if(Z===null||Z.test&&Z.test(Y)||typeof Z=='string'&&Y==Z)T.removeAttribute(X);}}I(T);};function I(T){if(!T.hasAttributes())if(f.$block[T.getName()]){var U=T.getPrevious(r),V=T.getNext(r);if(U&&(U.type==3||!U.isBlockBoundary({br:1})))T.append('br',1);if(V&&(V.type==3||!V.isBlockBoundary({br:1})))T.append('br');T.remove(true);}else{var W=T.getFirst(),X=T.getLast();T.remove(true);if(W){W.type==1&&W.mergeSiblings();if(X&&!W.equals(X)&&X.type==1)X.mergeSiblings();}}};function J(T,U,V){var W,X=T._.definition,Y=T.element;if(Y=='*')Y='span';W=new h(Y,U);if(V)V.copyAttributes(W);W=K(W,T);if(U.getCustomData('doc_processing_style')&&W.hasAttribute('id'))W.removeAttribute('id');else U.setCustomData('doc_processing_style',1);return W;};function K(T,U){var V=U._.definition,W=V.attributes,X=a.style.getStyleText(V);if(W)for(var Y in W)T.setAttribute(Y,W[Y]);if(X)T.setAttribute('style',X);return T;};function L(T,U){for(var V in T)T[V]=T[V].replace(p,function(W,X){return U[X];});};function M(T){var U=T._AC;if(U)return U;U={};var V=0,W=T.attributes;if(W)for(var X in W){V++;U[X]=W[X];}var Y=a.style.getStyleText(T);
-if(Y){if(!U.style)V++;U.style=Y;}U._length=V;return T._AC=U;};function N(T){if(T._.overrides)return T._.overrides;var U=T._.overrides={},V=T._.definition.overrides;if(V){if(!e.isArray(V))V=[V];for(var W=0;W<V.length;W++){var X=V[W],Y,Z,aa;if(typeof X=='string')Y=X.toLowerCase();else{Y=X.element?X.element.toLowerCase():T.element;aa=X.attributes;}Z=U[Y]||(U[Y]={});if(aa){var ab=Z.attributes=Z.attributes||[];for(var ac in aa)ab.push([ac.toLowerCase(),aa[ac]]);}}}return U;};function O(T,U,V){var W=new h('span');W[V?'setStyle':'setAttribute'](T,U);return W[V?'getStyle':'getAttribute'](T);};function P(T,U){var V;if(U!==false){var W=new h('span');W.setAttribute('style',T);V=W.getAttribute('style')||'';}else V=T;V=V.replace(/(font-family:)(.*?)(?=;|$)/,function(X,Y,Z){var aa=Z.split(',');for(var ab=0;ab<aa.length;ab++)aa[ab]=e.trim(aa[ab].replace(/["']/g,''));return Y+aa.join(',');});return V.replace(/\s*([;:])\s*/,'$1').replace(/([^\s;])$/,'$1;').replace(/,\s+/g,',').replace(/\"/g,'').toLowerCase();};function Q(T){var U={};T.replace(/"/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(V,W,X){U[W]=X;});return U;};function R(T,U){typeof T=='string'&&(T=Q(T));typeof U=='string'&&(U=Q(U));for(var V in T){if(!(V in U&&(U[V]==T[V]||T[V]=='inherit'||U[V]=='inherit')))return false;}return true;};function S(T,U){var V=T.getSelection(),W=V.createBookmarks(1),X=V.getRanges(),Y=U?this.removeFromRange:this.applyToRange,Z,aa=X.createIterator();while(Z=aa.getNextRange())Y.call(this,Z);if(W.length==1&&W[0].collapsed){V.selectRanges(X);T.getById(W[0].startNode).remove();}else V.selectBookmarks(W);T.removeCustomData('doc_processing_style');};})();a.styleCommand=function(m){this.style=m;};a.styleCommand.prototype.exec=function(m){var o=this;m.focus();var n=m.document;if(n)if(o.state==2)o.style.apply(n);else if(o.state==1)o.style.remove(n);return!!n;};a.stylesSet=new a.resourceManager('','stylesSet');a.addStylesSet=e.bind(a.stylesSet.add,a.stylesSet);a.loadStylesSet=function(m,n,o){a.stylesSet.addExternal(m,n,'');a.stylesSet.load(m,o);};a.editor.prototype.getStylesSet=function(m){if(!this._.stylesDefinitions){var n=this,o=n.config.stylesCombo_stylesSet||n.config.stylesSet||'default';if(o instanceof Array){n._.stylesDefinitions=o;m(o);return;}var p=o.split(':'),q=p[0],r=p[1],s=j.registered.styles.path;a.stylesSet.addExternal(q,r?p.slice(1).join(':'):s+'styles/'+q+'.js','');a.stylesSet.load(q,function(t){n._.stylesDefinitions=t[q];m(n._.stylesDefinitions);});}else m(this._.stylesDefinitions);
-};j.add('domiterator');(function(){function m(s){var t=this;if(arguments.length<1)return;t.range=s;t.forceBrBreak=0;t.enlargeBr=1;t.enforceRealBlocks=0;t._||(t._={});};var n=/^[\r\n\t ]+$/,o=d.walker.bookmark(false,true),p=d.walker.whitespaces(true),q=function(s){return o(s)&&p(s);};function r(s,t,u){var v=s.getNextSourceNode(t,null,u);while(!o(v))v=v.getNextSourceNode(t,null,u);return v;};m.prototype={getNextParagraph:function(s){var S=this;var t,u,v,w,x,y;if(!S._.lastNode){u=S.range.clone();u.shrink(1,true);w=u.endContainer.hasAscendant('pre',true)||u.startContainer.hasAscendant('pre',true);u.enlarge(S.forceBrBreak&&!w||!S.enlargeBr?3:2);var z=new d.walker(u),A=d.walker.bookmark(true,true);z.evaluator=A;S._.nextNode=z.next();z=new d.walker(u);z.evaluator=A;var B=z.previous();S._.lastNode=B.getNextSourceNode(true);if(S._.lastNode&&S._.lastNode.type==3&&!e.trim(S._.lastNode.getText())&&S._.lastNode.getParent().isBlockBoundary()){var C=new d.range(u.document);C.moveToPosition(S._.lastNode,4);if(C.checkEndOfBlock()){var D=new d.elementPath(C.endContainer),E=D.block||D.blockLimit;S._.lastNode=E.getNextSourceNode(true);}}if(!S._.lastNode){S._.lastNode=S._.docEndMarker=u.document.createText('');S._.lastNode.insertAfter(B);}u=null;}var F=S._.nextNode;B=S._.lastNode;S._.nextNode=null;while(F){var G=0,H=F.hasAscendant('pre'),I=F.type!=1,J=0;if(!I){var K=F.getName();if(F.isBlockBoundary(S.forceBrBreak&&!H&&{br:1})){if(K=='br')I=1;else if(!u&&!F.getChildCount()&&K!='hr'){t=F;v=F.equals(B);break;}if(u){u.setEndAt(F,3);if(K!='br')S._.nextNode=F;}G=1;}else{if(F.getFirst()){if(!u){u=new d.range(S.range.document);u.setStartAt(F,3);}F=F.getFirst();continue;}I=1;}}else if(F.type==3)if(n.test(F.getText()))I=0;if(I&&!u){u=new d.range(S.range.document);u.setStartAt(F,3);}v=(!G||I)&&F.equals(B);if(u&&!G)while(!F.getNext(q)&&!v){var L=F.getParent();if(L.isBlockBoundary(S.forceBrBreak&&!H&&{br:1})){G=1;I=0;v=v||L.equals(B);u.setEndAt(L,2);break;}F=L;I=1;v=F.equals(B);J=1;}if(I)u.setEndAt(F,4);F=r(F,J,B);v=!F;if(v||G&&u)break;}if(!t){if(!u){S._.docEndMarker&&S._.docEndMarker.remove();S._.nextNode=null;return null;}var M=new d.elementPath(u.startContainer),N=M.blockLimit,O={div:1,th:1,td:1};t=M.block;if(!t&&!S.enforceRealBlocks&&O[N.getName()]&&u.checkStartOfBlock()&&u.checkEndOfBlock())t=N;else if(!t||S.enforceRealBlocks&&t.getName()=='li'){t=S.range.document.createElement(s||'p');u.extractContents().appendTo(t);t.trim();u.insertNode(t);x=y=true;}else if(t.getName()!='li'){if(!u.checkStartOfBlock()||!u.checkEndOfBlock()){t=t.clone(false);
-u.extractContents().appendTo(t);t.trim();var P=u.splitBlock();x=!P.wasStartOfBlock;y=!P.wasEndOfBlock;u.insertNode(t);}}else if(!v)S._.nextNode=t.equals(B)?null:r(u.getBoundaryNodes().endNode,1,B);}if(x){var Q=t.getPrevious();if(Q&&Q.type==1)if(Q.getName()=='br')Q.remove();else if(Q.getLast()&&Q.getLast().$.nodeName.toLowerCase()=='br')Q.getLast().remove();}if(y){var R=t.getLast();if(R&&R.type==1&&R.getName()=='br')if(c||R.getPrevious(o)||R.getNext(o))R.remove();}if(!S._.nextNode)S._.nextNode=v||t.equals(B)?null:r(t,1,B);return t;}};d.range.prototype.createIterator=function(){return new m(this);};})();j.add('panelbutton',{requires:['button'],onLoad:function(){function m(n){var p=this;var o=p._;if(o.state==0)return;p.createPanel(n);if(o.on){o.panel.hide();return;}o.panel.showBlock(p._.id,p.document.getById(p._.id),4);};k.panelButton=e.createClass({base:k.button,$:function(n){var p=this;var o=n.panel;delete n.panel;p.base(n);p.document=o&&o.parent&&o.parent.getDocument()||a.document;o.block={attributes:o.attributes};p.hasArrow=true;p.click=m;p._={panelDefinition:o};},statics:{handler:{create:function(n){return new k.panelButton(n);}}},proto:{createPanel:function(n){var o=this._;if(o.panel)return;var p=this._.panelDefinition||{},q=this._.panelDefinition.block,r=p.parent||a.document.getBody(),s=this._.panel=new k.floatPanel(n,r,p),t=s.addBlock(o.id,q),u=this;s.onShow=function(){if(u.className)this.element.getFirst().addClass(u.className+'_panel');u.setState(1);o.on=1;if(u.onOpen)u.onOpen();};s.onHide=function(v){if(u.className)this.element.getFirst().removeClass(u.className+'_panel');u.setState(u.modes&&u.modes[n.mode]?2:0);o.on=0;if(!v&&u.onClose)u.onClose();};s.onEscape=function(){s.hide();u.document.getById(o.id).focus();};if(this.onBlock)this.onBlock(s,t);t.onHide=function(){o.on=0;u.setState(2);};}}});},beforeInit:function(m){m.ui.addHandler('panelbutton',k.panelButton.handler);}});a.UI_PANELBUTTON='panelbutton';j.add('floatpanel',{requires:['panel']});(function(){var m={},n=false;function o(p,q,r,s,t){var u=e.genKey(q.getUniqueId(),r.getUniqueId(),p.skinName,p.lang.dir,p.uiColor||'',s.css||'',t||''),v=m[u];if(!v){v=m[u]=new k.panel(q,s);v.element=r.append(h.createFromHtml(v.renderHtml(p),q));v.element.setStyles({display:'none',position:'absolute'});}return v;};k.floatPanel=e.createClass({$:function(p,q,r,s){r.forceIFrame=1;var t=q.getDocument(),u=o(p,t,q,r,s||0),v=u.element,w=v.getFirst().getFirst();this.element=v;this._={editor:p,panel:u,parentElement:q,definition:r,document:t,iframe:w,children:[],dir:p.lang.dir};
-p.on('mode',function(){this.hide();},this);},proto:{addBlock:function(p,q){return this._.panel.addBlock(p,q);},addListBlock:function(p,q){return this._.panel.addListBlock(p,q);},getBlock:function(p){return this._.panel.getBlock(p);},showBlock:function(p,q,r,s,t){var u=this._.panel,v=u.showBlock(p);this.allowBlur(false);n=1;this._.returnFocus=this._.editor.focusManager.hasFocus?this._.editor:new h(a.document.$.activeElement);var w=this.element,x=this._.iframe,y=this._.definition,z=q.getDocumentPosition(w.getDocument()),A=this._.dir=='rtl',B=z.x+(s||0),C=z.y+(t||0);if(A&&(r==1||r==4))B+=q.$.offsetWidth;else if(!A&&(r==2||r==3))B+=q.$.offsetWidth-1;if(r==3||r==4)C+=q.$.offsetHeight-1;this._.panel._.offsetParentId=q.getId();w.setStyles({top:C+'px',left:0,display:''});w.setOpacity(0);w.getFirst().removeStyle('width');if(!this._.blurSet){var D=c?x:new d.window(x.$.contentWindow);a.event.useCapture=true;D.on('blur',function(E){var G=this;if(!G.allowBlur())return;var F=E.data.getTarget();if(F.getName&&F.getName()!='iframe')return;if(G.visible&&!G._.activeChild&&!n){delete G._.returnFocus;G.hide();}},this);D.on('focus',function(){this._.focused=true;this.hideChild();this.allowBlur(true);},this);a.event.useCapture=false;this._.blurSet=1;}u.onEscape=e.bind(function(E){if(this.onEscape&&this.onEscape(E)===false)return false;},this);e.setTimeout(function(){if(A)B-=w.$.offsetWidth;var E=e.bind(function(){var F=w.getFirst();if(v.autoSize){var G=v.element.$;if(b.gecko||b.opera)G=G.parentNode;if(c)G=G.document.body;var H=G.scrollWidth;if(c&&b.quirks&&H>0)H+=(F.$.offsetWidth||0)-(F.$.clientWidth||0)+3;H+=4;F.setStyle('width',H+'px');v.element.addClass('cke_frameLoaded');var I=v.element.$.scrollHeight;if(c&&b.quirks&&I>0)I+=(F.$.offsetHeight||0)-(F.$.clientHeight||0)+3;F.setStyle('height',I+'px');u._.currentBlock.element.setStyle('display','none').removeStyle('display');}else F.removeStyle('height');var J=u.element,K=J.getWindow(),L=K.getScrollPosition(),M=K.getViewPaneSize(),N={height:J.$.offsetHeight,width:J.$.offsetWidth};if(A?B<0:B+N.width>M.width+L.x)B+=N.width*(A?1:-1);if(C+N.height>M.height+L.y)C-=N.height;if(c){var O=new h(w.$.offsetParent),P=O;if(P.getName()=='html')P=P.getDocument().getBody();if(P.getComputedStyle('direction')=='rtl')if(b.ie8Compat)B-=w.getDocument().getDocumentElement().$.scrollLeft*2;else B-=O.$.scrollWidth-O.$.clientWidth;}var Q=w.getFirst(),R;if(R=Q.getCustomData('activePanel'))R.onHide&&R.onHide.call(this,1);Q.setCustomData('activePanel',this);
-w.setStyles({top:C+'px',left:B+'px'});w.setOpacity(1);},this);u.isLoaded?E():u.onLoad=E;e.setTimeout(function(){x.$.contentWindow.focus();this.allowBlur(true);},0,this);},b.air?200:0,this);this.visible=1;if(this.onShow)this.onShow.call(this);n=0;},hide:function(p){var r=this;if(r.visible&&(!r.onHide||r.onHide.call(r)!==true)){r.hideChild();b.gecko&&r._.iframe.getFrameDocument().$.activeElement.blur();r.element.setStyle('display','none');r.visible=0;r.element.getFirst().removeCustomData('activePanel');var q=p!==false&&r._.returnFocus;if(q){if(b.webkit&&q.type)q.getWindow().$.focus();q.focus();}}},allowBlur:function(p){var q=this._.panel;if(p!=undefined)q.allowBlur=p;return q.allowBlur;},showAsChild:function(p,q,r,s,t,u){if(this._.activeChild==p&&p._.panel._.offsetParentId==r.getId())return;this.hideChild();p.onHide=e.bind(function(){e.setTimeout(function(){if(!this._.focused)this.hide();},0,this);},this);this._.activeChild=p;this._.focused=false;p.showBlock(q,r,s,t,u);if(b.ie7Compat||b.ie8&&b.ie6Compat)setTimeout(function(){p.element.getChild(0).$.style.cssText+='';},100);},hideChild:function(){var p=this._.activeChild;if(p){delete p.onHide;delete p._.returnFocus;delete this._.activeChild;p.hide();}}}});a.on('instanceDestroyed',function(){var p=e.isEmpty(a.instances);for(var q in m){var r=m[q];if(p)r.destroy();else r.element.hide();}p&&(m={});});})();j.add('menu',{beforeInit:function(m){var n=m.config.menu_groups.split(','),o=m._.menuGroups={},p=m._.menuItems={};for(var q=0;q<n.length;q++)o[n[q]]=q+1;m.addMenuGroup=function(r,s){o[r]=s||100;};m.addMenuItem=function(r,s){if(o[s.group])p[r]=new a.menuItem(this,r,s);};m.addMenuItems=function(r){for(var s in r)this.addMenuItem(s,r[s]);};m.getMenuItem=function(r){return p[r];};m.removeMenuItem=function(r){delete p[r];};},requires:['floatpanel']});(function(){a.menu=e.createClass({$:function(n,o){var r=this;o=r._.definition=o||{};r.id=e.getNextId();r.editor=n;r.items=[];r._.listeners=[];r._.level=o.level||1;var p=e.extend({},o.panel,{css:n.skin.editor.css,level:r._.level-1,block:{}}),q=p.block.attributes=p.attributes||{};!q.role&&(q.role='menu');r._.panelDefinition=p;},_:{onShow:function(){var v=this;var n=v.editor.getSelection();if(c)n&&n.lock();var o=n&&n.getStartElement(),p=v._.listeners,q=[];v.removeAll();for(var r=0;r<p.length;r++){var s=p[r](o,n);if(s)for(var t in s){var u=v.editor.getMenuItem(t);if(u&&(!u.command||v.editor.getCommand(u.command).state)){u.state=s[t];v.add(u);}}}},onClick:function(n){this.hide(false);
-if(n.onClick)n.onClick();else if(n.command)this.editor.execCommand(n.command);},onEscape:function(n){var o=this.parent;if(o){o._.panel.hideChild();var p=o._.panel._.panel._.currentBlock,q=p._.focusIndex;p._.markItem(q);}else if(n==27)this.hide();return false;},onHide:function(){if(c){var n=this.editor.getSelection();n&&n.unlock();}this.onHide&&this.onHide();},showSubMenu:function(n){var v=this;var o=v._.subMenu,p=v.items[n],q=p.getItems&&p.getItems();if(!q){v._.panel.hideChild();return;}var r=v._.panel.getBlock(v.id);r._.focusIndex=n;if(o)o.removeAll();else{o=v._.subMenu=new a.menu(v.editor,e.extend({},v._.definition,{level:v._.level+1},true));o.parent=v;o._.onClick=e.bind(v._.onClick,v);}for(var s in q){var t=v.editor.getMenuItem(s);if(t){t.state=q[s];o.add(t);}}var u=v._.panel.getBlock(v.id).element.getDocument().getById(v.id+String(n));o.show(u,2);}},proto:{add:function(n){if(!n.order)n.order=this.items.length;this.items.push(n);},removeAll:function(){this.items=[];},show:function(n,o,p,q){if(!this.parent){this._.onShow();if(!this.items.length)return;}o=o||(this.editor.lang.dir=='rtl'?2:1);var r=this.items,s=this.editor,t=this._.panel,u=this._.element;if(!t){t=this._.panel=new k.floatPanel(this.editor,a.document.getBody(),this._.panelDefinition,this._.level);t.onEscape=e.bind(function(F){if(this._.onEscape(F)===false)return false;},this);t.onHide=e.bind(function(){this._.onHide&&this._.onHide();},this);var v=t.addBlock(this.id,this._.panelDefinition.block);v.autoSize=true;var w=v.keys;w[40]='next';w[9]='next';w[38]='prev';w[2228224+9]='prev';w[s.lang.dir=='rtl'?37:39]=c?'mouseup':'click';w[32]=c?'mouseup':'click';c&&(w[13]='mouseup');u=this._.element=v.element;u.addClass(s.skinClass);var x=u.getDocument();x.getBody().setStyle('overflow','hidden');x.getElementsByTag('html').getItem(0).setStyle('overflow','hidden');this._.itemOverFn=e.addFunction(function(F){var G=this;clearTimeout(G._.showSubTimeout);G._.showSubTimeout=e.setTimeout(G._.showSubMenu,s.config.menu_subMenuDelay||400,G,[F]);},this);this._.itemOutFn=e.addFunction(function(F){clearTimeout(this._.showSubTimeout);},this);this._.itemClickFn=e.addFunction(function(F){var H=this;var G=H.items[F];if(G.state==0){H.hide();return;}if(G.getItems)H._.showSubMenu(F);else H._.onClick(G);},this);}m(r);var y=s.container.getChild(1),z=y.hasClass('cke_mixed_dir_content')?' cke_mixed_dir_content':'',A=['<div class="cke_menu'+z+'" role="presentation">'],B=r.length,C=B&&r[0].group;for(var D=0;D<B;D++){var E=r[D];if(C!=E.group){A.push('<div class="cke_menuseparator" role="separator"></div>');
-C=E.group;}E.render(this,D,A);}A.push('</div>');u.setHtml(A.join(''));k.fire('ready',this);if(this.parent)this.parent._.panel.showAsChild(t,this.id,n,o,p,q);else t.showBlock(this.id,n,o,p,q);s.fire('menuShow',[t]);},addListener:function(n){this._.listeners.push(n);},hide:function(n){var o=this;o._.onHide&&o._.onHide();o._.panel&&o._.panel.hide(n);}}});function m(n){n.sort(function(o,p){if(o.group<p.group)return-1;else if(o.group>p.group)return 1;return o.order<p.order?-1:o.order>p.order?1:0;});};a.menuItem=e.createClass({$:function(n,o,p){var q=this;e.extend(q,p,{order:0,className:'cke_button_'+o});q.group=n._.menuGroups[q.group];q.editor=n;q.name=o;},proto:{render:function(n,o,p){var w=this;var q=n.id+String(o),r=typeof w.state=='undefined'?2:w.state,s=' cke_'+(r==1?'on':r==0?'disabled':'off'),t=w.label;if(w.className)s+=' '+w.className;var u=w.getItems;p.push('<span class="cke_menuitem'+(w.icon&&w.icon.indexOf('.png')==-1?' cke_noalphafix':'')+'">'+'<a id="',q,'" class="',s,'" href="javascript:void(\'',(w.label||'').replace("'",''),'\')" title="',w.label,'" tabindex="-1"_cke_focus=1 hidefocus="true" role="menuitem"'+(u?'aria-haspopup="true"':'')+(r==0?'aria-disabled="true"':'')+(r==1?'aria-pressed="true"':''));if(b.opera||b.gecko&&b.mac)p.push(' onkeypress="return false;"');if(b.gecko)p.push(' onblur="this.style.cssText = this.style.cssText;"');var v=(w.iconOffset||0)*-16;p.push(' onmouseover="CKEDITOR.tools.callFunction(',n._.itemOverFn,',',o,');" onmouseout="CKEDITOR.tools.callFunction(',n._.itemOutFn,',',o,');" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',n._.itemClickFn,',',o,'); return false;"><span class="cke_icon_wrapper"><span class="cke_icon"'+(w.icon?' style="background-image:url('+a.getUrl(w.icon)+');background-position:0 '+v+'px;"':'')+'></span></span>'+'<span class="cke_label">');if(u)p.push('<span class="cke_menuarrow">','<span>&#',w.editor.lang.dir=='rtl'?'9668':'9658',';</span>','</span>');p.push(t,'</span></a></span>');}}});})();i.menu_groups='clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div';(function(){var m;j.add('editingblock',{init:function(n){if(!n.config.editingBlock)return;n.on('themeSpace',function(o){if(o.data.space=='contents')o.data.html+='<br>';});n.on('themeLoaded',function(){n.fireOnce('editingBlockReady');});n.on('uiReady',function(){n.setMode(n.config.startupMode);
-});n.on('afterSetData',function(){if(!m){function o(){m=true;n.getMode().loadData(n.getData());m=false;};if(n.mode)o();else n.on('mode',function(){if(n.mode){o();n.removeListener('mode',arguments.callee);}});}});n.on('beforeGetData',function(){if(!m&&n.mode){m=true;n.setData(n.getMode().getData(),null,1);m=false;}});n.on('getSnapshot',function(o){if(n.mode)o.data=n.getMode().getSnapshotData();});n.on('loadSnapshot',function(o){if(n.mode)n.getMode().loadSnapshotData(o.data);});n.on('mode',function(o){o.removeListener();b.webkit&&n.container.on('focus',function(){n.focus();});if(n.config.startupFocus)n.focus();setTimeout(function(){n.fireOnce('instanceReady');a.fire('instanceReady',null,n);},0);});n.on('destroy',function(){var o=this;if(o.mode)o._.modes[o.mode].unload(o.getThemeSpace('contents'));});}});a.editor.prototype.mode='';a.editor.prototype.addMode=function(n,o){o.name=n;(this._.modes||(this._.modes={}))[n]=o;};a.editor.prototype.setMode=function(n){this.fire('beforeSetMode',{newMode:n});var o,p=this.getThemeSpace('contents'),q=this.checkDirty();if(this.mode){if(n==this.mode)return;this.fire('beforeModeUnload');var r=this.getMode();o=r.getData();r.unload(p);this.mode='';}p.setHtml('');var s=this.getMode(n);if(!s)throw '[CKEDITOR.editor.setMode] Unknown mode "'+n+'".';if(!q)this.on('mode',function(){this.resetDirty();this.removeListener('mode',arguments.callee);});s.load(p,typeof o!='string'?this.getData():o);};a.editor.prototype.getMode=function(n){return this._.modes&&this._.modes[n||this.mode];};a.editor.prototype.focus=function(){this.forceNextSelectionCheck();var n=this.getMode();if(n)n.focus();};})();i.startupMode='wysiwyg';i.editingBlock=true;(function(){function m(){var B=this;try{var y=B.getSelection();if(!y||!y.document.getWindow().$)return;var z=y.getStartElement(),A=new d.elementPath(z);if(!A.compare(B._.selectionPreviousPath)){B._.selectionPreviousPath=A;B.fire('selectionChange',{selection:y,path:A,element:z});}}catch(C){}};var n,o;function p(){o=true;if(n)return;q.call(this);n=e.setTimeout(q,200,this);};function q(){n=null;if(o){e.setTimeout(m,0,this);o=false;}};function r(y){function z(D){return D&&D.type==1&&D.getName() in f.$removeEmpty;};function A(D){var E=y.document.getBody();return!D.is('body')&&E.getChildCount()==1;};var B=y.startContainer,C=y.startOffset;if(B.type==3)return false;return!e.trim(B.getHtml())?z(B)||A(B):z(B.getChild(C-1))||z(B.getChild(C));};var s={modes:{wysiwyg:1,source:1},readOnly:c||b.webkit,exec:function(y){switch(y.mode){case 'wysiwyg':y.document.$.execCommand('SelectAll',false,null);
-y.forceNextSelectionCheck();y.selectionChange();break;case 'source':var z=y.textarea.$;if(c)z.createTextRange().execCommand('SelectAll');else{z.selectionStart=0;z.selectionEnd=z.value.length;}z.focus();}},canUndo:false};function t(y){w(y);var z=y.createText('​');y.setCustomData('cke-fillingChar',z);return z;};function u(y){return y&&y.getCustomData('cke-fillingChar');};function v(y){var z=y&&u(y);if(z)if(z.getCustomData('ready'))w(y);else z.setCustomData('ready',1);};function w(y){var z=y&&y.removeCustomData('cke-fillingChar');if(z){z.setText(z.getText().replace(/\u200B/g,''));z=0;}};j.add('selection',{init:function(y){if(b.webkit){y.on('selectionChange',function(){v(y.document);});y.on('beforeSetMode',function(){w(y.document);});y.on('key',function(D){switch(D.data.keyCode){case 13:case 2228224+13:case 37:case 39:case 8:w(y.document);}},null,null,10);var z,A;function B(){var D=y.document,E=u(D);if(E){var F=D.$.defaultView.getSelection();if(F.type=='Caret'&&F.anchorNode==E.$)A=1;z=E.getText();E.setText(z.replace(/\u200B/g,''));}};function C(){var D=y.document,E=u(D);if(E){E.setText(z);if(A){D.$.defaultView.getSelection().setPosition(E.$,E.getLength());A=0;}}};y.on('beforeUndoImage',B);y.on('afterUndoImage',C);y.on('beforeGetData',B,null,null,0);y.on('getData',C);}y.on('contentDom',function(){var D=y.document,E=D.getBody(),F=D.getDocumentElement();if(c){var G,H,I=1;E.on('focusin',function(M){if(M.data.$.srcElement.nodeName!='BODY')return;if(G){if(I){try{G.select();}catch(O){}var N=D.getCustomData('cke_locked_selection');if(N){N.unlock();N.lock();}}G=null;}});E.on('focus',function(){H=1;L();});E.on('beforedeactivate',function(M){if(M.data.$.toElement)return;H=0;I=1;});if(c&&b.version<8)y.on('blur',function(M){try{y.document&&y.document.$.selection.empty();}catch(N){}});F.on('mousedown',function(){I=0;});F.on('mouseup',function(){I=1;});if(c&&(b.ie7Compat||b.version<8||b.quirks))F.on('click',function(M){if(M.data.getTarget().getName()=='html')y.getSelection().getRanges()[0].select();});var J;E.on('mousedown',function(M){if(M.data.$.button==2){var N=y.document.$.selection;if(N.type=='None')J=y.window.getScrollPosition();}K();});E.on('mouseup',function(M){if(M.data.$.button==2&&J){y.document.$.documentElement.scrollLeft=J.x;y.document.$.documentElement.scrollTop=J.y;}J=null;H=1;setTimeout(function(){L(true);},0);});E.on('keydown',K);E.on('keyup',function(){H=1;L();});D.on('selectionchange',L);function K(){H=0;};function L(M){if(H){var N=y.document,O=y.getSelection(),P=O&&O.getNative();
-if(M&&P&&P.type=='None')if(!N.$.queryCommandEnabled('InsertImage')){e.setTimeout(L,50,this,true);return;}var Q;if(P&&P.type&&P.type!='Control'&&(Q=P.createRange())&&(Q=Q.parentElement())&&(Q=Q.nodeName)&&Q.toLowerCase() in {input:1,textarea:1})return;G=P&&O.getRanges()[0];p.call(y);}};}else{D.on('mouseup',p,y);D.on('keyup',p,y);}});y.on('contentDomUnload',y.forceNextSelectionCheck,y);y.addCommand('selectAll',s);y.ui.addButton('SelectAll',{label:y.lang.selectAll,command:'selectAll'});y.selectionChange=p;b.ie9Compat&&y.on('destroy',function(){var D=y.getSelection();D&&D.getNative().clear();},null,null,9);}});a.editor.prototype.getSelection=function(){return this.document&&this.document.getSelection();};a.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath;};g.prototype.getSelection=function(){var y=new d.selection(this);return!y||y.isInvalid?null:y;};a.SELECTION_NONE=1;a.SELECTION_TEXT=2;a.SELECTION_ELEMENT=3;d.selection=function(y){var B=this;var z=y.getCustomData('cke_locked_selection');if(z)return z;B.document=y;B.isLocked=0;B._={cache:{}};if(c){var A=B.getNative().createRange();if(!A||A.item&&A.item(0).ownerDocument!=B.document.$||A.parentElement&&A.parentElement().ownerDocument!=B.document.$)B.isInvalid=true;}return B;};var x={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};d.selection.prototype={getNative:c?function(){return this._.cache.nativeSel||(this._.cache.nativeSel=this.document.$.selection);}:function(){return this._.cache.nativeSel||(this._.cache.nativeSel=this.document.getWindow().$.getSelection());},getType:c?function(){var y=this._.cache;if(y.type)return y.type;var z=1;try{var A=this.getNative(),B=A.type;if(B=='Text')z=2;if(B=='Control')z=3;if(A.createRange().parentElement)z=2;}catch(C){}return y.type=z;}:function(){var y=this._.cache;if(y.type)return y.type;var z=2,A=this.getNative();if(!A)z=1;else if(A.rangeCount==1){var B=A.getRangeAt(0),C=B.startContainer;if(C==B.endContainer&&C.nodeType==1&&B.endOffset-B.startOffset==1&&x[C.childNodes[B.startOffset].nodeName.toLowerCase()])z=3;}return y.type=z;},getRanges:(function(){var y=c?(function(){function z(B){return new d.node(B).getIndex();};var A=function(B,C){B=B.duplicate();B.collapse(C);var D=B.parentElement(),E=D.ownerDocument;if(!D.hasChildNodes())return{container:D,offset:0};var F=D.children,G,H,I=B.duplicate(),J=0,K=F.length-1,L=-1,M,N;while(J<=K){L=Math.floor((J+K)/2);
-G=F[L];I.moveToElementText(G);M=I.compareEndPoints('StartToStart',B);if(M>0)K=L-1;else if(M<0)J=L+1;else if(b.ie9Compat&&G.tagName=='BR'){var O='cke_range_marker';B.execCommand('CreateBookmark',false,O);G=E.getElementsByName(O)[0];var P=z(G);D.removeChild(G);return{container:D,offset:P};}else return{container:D,offset:z(G)};}if(L==-1||L==F.length-1&&M<0){I.moveToElementText(D);I.setEndPoint('StartToStart',B);N=I.text.replace(/(\r\n|\r)/g,'\n').length;F=D.childNodes;if(!N){G=F[F.length-1];if(G.nodeType==1)return{container:D,offset:F.length};else return{container:G,offset:G.nodeValue.length};}var Q=F.length;while(N>0)N-=F[--Q].nodeValue.length;return{container:F[Q],offset:-N};}else{I.collapse(M>0?true:false);I.setEndPoint(M>0?'StartToStart':'EndToStart',B);N=I.text.replace(/(\r\n|\r)/g,'\n').length;if(!N)return{container:D,offset:z(G)+(M>0?0:1)};while(N>0)try{H=G[M>0?'previousSibling':'nextSibling'];N-=H.nodeValue.length;G=H;}catch(R){return{container:D,offset:z(G)};}return{container:G,offset:M>0?-N:G.nodeValue.length+N};}};return function(){var L=this;var B=L.getNative(),C=B&&B.createRange(),D=L.getType(),E;if(!B)return[];if(D==2){E=new d.range(L.document);var F=A(C,true);E.setStart(new d.node(F.container),F.offset);F=A(C);E.setEnd(new d.node(F.container),F.offset);if(E.endContainer.getPosition(E.startContainer)&4&&E.endOffset<=E.startContainer.getIndex())E.collapse();return[E];}else if(D==3){var G=[];for(var H=0;H<C.length;H++){var I=C.item(H),J=I.parentNode,K=0;E=new d.range(L.document);for(;K<J.childNodes.length&&J.childNodes[K]!=I;K++){}E.setStart(new d.node(J),K);E.setEnd(new d.node(J),K+1);G.push(E);}return G;}return[];};})():function(){var z=[],A,B=this.document,C=this.getNative();if(!C)return z;if(!C.rangeCount){A=new d.range(B);A.moveToElementEditStart(B.getBody());z.push(A);}for(var D=0;D<C.rangeCount;D++){var E=C.getRangeAt(D);A=new d.range(B);A.setStart(new d.node(E.startContainer),E.startOffset);A.setEnd(new d.node(E.endContainer),E.endOffset);z.push(A);}return z;};return function(z){var A=this._.cache;if(A.ranges&&!z)return A.ranges;else if(!A.ranges)A.ranges=new d.rangeList(y.call(this));if(z){var B=A.ranges;for(var C=0;C<B.length;C++){var D=B[C],E=D.getCommonAncestor();if(E.isReadOnly())B.splice(C,1);if(D.collapsed)continue;var F=D.startContainer,G=D.endContainer,H=D.startOffset,I=D.endOffset,J=D.clone(),K;if(K=F.isReadOnly())D.setStartAfter(K);if(F&&F.type==3)if(H>=F.getLength())J.setStartAfter(F);else J.setStartBefore(F);if(G&&G.type==3)if(!I)J.setEndBefore(G);
-else J.setEndAfter(G);var L=new d.walker(J);L.evaluator=function(M){if(M.type==1&&M.isReadOnly()){var N=D.clone();D.setEndBefore(M);if(D.collapsed)B.splice(C--,1);if(!(M.getPosition(J.endContainer)&16)){N.setStartAfter(M);if(!N.collapsed)B.splice(C+1,0,N);}return true;}return false;};L.next();}}return A.ranges;};})(),getStartElement:function(){var F=this;var y=F._.cache;if(y.startElement!==undefined)return y.startElement;var z,A=F.getNative();switch(F.getType()){case 3:return F.getSelectedElement();case 2:var B=F.getRanges()[0];if(B){if(!B.collapsed){B.optimize();while(1){var C=B.startContainer,D=B.startOffset;if(D==(C.getChildCount?C.getChildCount():C.getLength())&&!C.isBlockBoundary())B.setStartAfter(C);else break;}z=B.startContainer;if(z.type!=1)return z.getParent();z=z.getChild(B.startOffset);if(!z||z.type!=1)z=B.startContainer;else{var E=z.getFirst();while(E&&E.type==1){z=E;E=E.getFirst();}}}else{z=B.startContainer;if(z.type!=1)z=z.getParent();}z=z.$;}}return y.startElement=z?new h(z):null;},getSelectedElement:function(){var y=this._.cache;if(y.selectedElement!==undefined)return y.selectedElement;var z=this,A=e.tryThese(function(){return z.getNative().createRange().item(0);},function(){var B=z.getRanges()[0],C,D;for(var E=2;E&&!((C=B.getEnclosedNode())&&C.type==1&&x[C.getName()]&&(D=C));E--)B.shrink(1);return D.$;});return y.selectedElement=A?new h(A):null;},getSelectedText:function(){var y=this._.cache;if(y.selectedText!==undefined)return y.selectedText;var z='',A=this.getNative();if(this.getType()==2)z=c?A.createRange().text:A.toString();return y.selectedText=z;},lock:function(){var y=this;y.getRanges();y.getStartElement();y.getSelectedElement();y.getSelectedText();y._.cache.nativeSel={};y.isLocked=1;y.document.setCustomData('cke_locked_selection',y);},unlock:function(y){var D=this;var z=D.document,A=z.getCustomData('cke_locked_selection');if(A){z.setCustomData('cke_locked_selection',null);if(y){var B=A.getSelectedElement(),C=!B&&A.getRanges();D.isLocked=0;D.reset();z.getBody().focus();if(B)D.selectElement(B);else D.selectRanges(C);}}if(!A||!y){D.isLocked=0;D.reset();}},reset:function(){this._.cache={};},selectElement:function(y){var A=this;if(A.isLocked){var z=new d.range(A.document);z.setStartBefore(y);z.setEndAfter(y);A._.cache.selectedElement=y;A._.cache.startElement=y;A._.cache.ranges=new d.rangeList(z);A._.cache.type=3;return;}z=new d.range(y.getDocument());z.setStartBefore(y);z.setEndAfter(y);z.select();A.document.fire('selectionchange');A.reset();
-},selectRanges:function(y){var M=this;if(M.isLocked){M._.cache.selectedElement=null;M._.cache.startElement=y[0]&&y[0].getTouchedStartNode();M._.cache.ranges=new d.rangeList(y);M._.cache.type=2;return;}if(c){if(y.length>1){var z=y[y.length-1];y[0].setEnd(z.endContainer,z.endOffset);y.length=1;}if(y[0])y[0].select();M.reset();}else{var A=M.getNative();if(!A)return;if(y.length){A.removeAllRanges();b.webkit&&w(M.document);}for(var B=0;B<y.length;B++){if(B<y.length-1){var C=y[B],D=y[B+1],E=C.clone();E.setStart(C.endContainer,C.endOffset);E.setEnd(D.startContainer,D.startOffset);if(!E.collapsed){E.shrink(1,true);var F=E.getCommonAncestor(),G=E.getEnclosedNode();if(F.isReadOnly()||G&&G.isReadOnly()){D.setStart(C.startContainer,C.startOffset);y.splice(B--,1);continue;}}}var H=y[B],I=M.document.$.createRange(),J=H.startContainer;if(H.collapsed&&(b.opera||b.gecko&&b.version<10900)&&J.type==1&&!J.getChildCount())J.appendText('');if(H.collapsed&&b.webkit&&r(H)){var K=t(M.document);H.insertNode(K);var L=K.getNext();if(L&&!K.getPrevious()&&L.type==1&&L.getName()=='br'){w(M.document);H.moveToPosition(L,3);}else H.moveToPosition(K,4);}I.setStart(H.startContainer.$,H.startOffset);try{I.setEnd(H.endContainer.$,H.endOffset);}catch(N){if(N.toString().indexOf('NS_ERROR_ILLEGAL_VALUE')>=0){H.collapse(1);I.setEnd(H.endContainer.$,H.endOffset);}else throw N;}A.addRange(I);}M.reset();}},createBookmarks:function(y){return this.getRanges().createBookmarks(y);},createBookmarks2:function(y){return this.getRanges().createBookmarks2(y);},selectBookmarks:function(y){var z=[];for(var A=0;A<y.length;A++){var B=new d.range(this.document);B.moveToBookmark(y[A]);z.push(B);}this.selectRanges(z);return this;},getCommonAncestor:function(){var y=this.getRanges(),z=y[0].startContainer,A=y[y.length-1].endContainer;return z.getCommonAncestor(A);},scrollIntoView:function(){var y=this.getStartElement();y.scrollIntoView();}};})();(function(){var m=d.walker.whitespaces(true),n=/\ufeff|\u00a0/,o={table:1,tbody:1,tr:1};d.range.prototype.select=c?function(p){var A=this;var q=A.collapsed,r,s,t,u=A.getEnclosedNode();if(u)try{t=A.document.$.body.createControlRange();t.addElement(u.$);t.select();return;}catch(B){}if(A.startContainer.type==1&&A.startContainer.getName() in o||A.endContainer.type==1&&A.endContainer.getName() in o)A.shrink(1,true);var v=A.createBookmark(),w=v.startNode,x;if(!q)x=v.endNode;t=A.document.$.body.createTextRange();t.moveToElementText(w.$);t.moveStart('character',1);if(x){var y=A.document.$.body.createTextRange();
-y.moveToElementText(x.$);t.setEndPoint('EndToEnd',y);t.moveEnd('character',-1);}else{var z=w.getNext(m);r=!(z&&z.getText&&z.getText().match(n))&&(p||!w.hasPrevious()||w.getPrevious().is&&w.getPrevious().is('br'));s=A.document.createElement('span');s.setHtml('');s.insertBefore(w);if(r)A.document.createText('\ufeff').insertBefore(w);}A.setStartBefore(w);w.remove();if(q){if(r){t.moveStart('character',-1);t.select();A.document.$.selection.clear();}else t.select();A.moveToPosition(s,3);s.remove();}else{A.setEndBefore(x);x.remove();t.select();}A.document.fire('selectionchange');}:function(){this.document.getSelection().selectRanges([this]);};})();(function(){var m=a.htmlParser.cssStyle,n=e.cssLength,o=/^((?:\d*(?:\.\d+))|(?:\d+))(.*)?$/i;function p(r,s){var t=o.exec(r),u=o.exec(s);if(t){if(!t[2]&&u[2]=='px')return u[1];if(t[2]=='px'&&!u[2])return u[1]+'px';}return s;};var q={elements:{$:function(r){var s=r.attributes,t=s&&s['data-cke-realelement'],u=t&&new a.htmlParser.fragment.fromHtml(decodeURIComponent(t)),v=u&&u.children[0];if(v&&r.attributes['data-cke-resizable']){var w=new m(r).rules,x=v.attributes,y=w.width,z=w.height;y&&(x.width=p(x.width,y));z&&(x.height=p(x.height,z));}return v;}}};j.add('fakeobjects',{requires:['htmlwriter'],afterInit:function(r){var s=r.dataProcessor,t=s&&s.htmlFilter;if(t)t.addRules(q);}});a.editor.prototype.createFakeElement=function(r,s,t,u){var v=this.lang.fakeobjects,w=v[t]||v.unknown,x={'class':s,src:a.getUrl('images/spacer.gif'),'data-cke-realelement':encodeURIComponent(r.getOuterHtml()),'data-cke-real-node-type':r.type,alt:w,title:w,align:r.getAttribute('align')||''};if(t)x['data-cke-real-element-type']=t;if(u){x['data-cke-resizable']=u;var y=new m(),z=r.getAttribute('width'),A=r.getAttribute('height');z&&(y.rules.width=n(z));A&&(y.rules.height=n(A));y.populate(x);}return this.document.createElement('img',{attributes:x});};a.editor.prototype.createFakeParserElement=function(r,s,t,u){var v=this.lang.fakeobjects,w=v[t]||v.unknown,x,y=new a.htmlParser.basicWriter();r.writeHtml(y);x=y.getHtml();var z={'class':s,src:a.getUrl('images/spacer.gif'),'data-cke-realelement':encodeURIComponent(x),'data-cke-real-node-type':r.type,alt:w,title:w,align:r.attributes.align||''};if(t)z['data-cke-real-element-type']=t;if(u){z['data-cke-resizable']=u;var A=r.attributes,B=new m(),C=A.width,D=A.height;C!=undefined&&(B.rules.width=n(C));D!=undefined&&(B.rules.height=n(D));B.populate(z);}return new a.htmlParser.element('img',z);};a.editor.prototype.restoreRealElement=function(r){if(r.data('cke-real-node-type')!=1)return null;
-var s=h.createFromHtml(decodeURIComponent(r.data('cke-realelement')),this.document);if(r.data('cke-resizable')){var t=r.getStyle('width'),u=r.getStyle('height');t&&s.setAttribute('width',p(s.getAttribute('width'),t));u&&s.setAttribute('height',p(s.getAttribute('height'),u));}return s;};})();j.add('richcombo',{requires:['floatpanel','listblock','button'],beforeInit:function(m){m.ui.addHandler('richcombo',k.richCombo.handler);}});a.UI_RICHCOMBO='richcombo';k.richCombo=e.createClass({$:function(m){var o=this;e.extend(o,m,{title:m.label,modes:{wysiwyg:1}});var n=o.panel||{};delete o.panel;o.id=e.getNextNumber();o.document=n&&n.parent&&n.parent.getDocument()||a.document;n.className=(n.className||'')+' cke_rcombopanel';n.block={multiSelect:n.multiSelect,attributes:n.attributes};o._={panelDefinition:n,items:{},state:2};},statics:{handler:{create:function(m){return new k.richCombo(m);}}},proto:{renderHtml:function(m){var n=[];this.render(m,n);return n.join('');},render:function(m,n){var o=b,p='cke_'+this.id,q=e.addFunction(function(v){var y=this;var w=y._;if(w.state==0)return;y.createPanel(m);if(w.on){w.panel.hide();return;}y.commit();var x=y.getValue();if(x)w.list.mark(x);else w.list.unmarkAll();w.panel.showBlock(y.id,new h(v),4);},this),r={id:p,combo:this,focus:function(){var v=a.document.getById(p).getChild(1);v.focus();},clickFn:q};function s(){var w=this;var v=w.modes[m.mode]?2:0;w.setState(m.readOnly&&!w.readOnly?0:v);w.setValue('');};m.on('mode',s,this);!this.readOnly&&m.on('readOnly',s,this);var t=e.addFunction(function(v,w){v=new d.event(v);var x=v.getKeystroke();switch(x){case 13:case 32:case 40:e.callFunction(q,w);break;default:r.onkey(r,x);}v.preventDefault();}),u=e.addFunction(function(){r.onfocus&&r.onfocus();});r.keyDownFn=t;n.push('<span class="cke_rcombo" role="presentation">','<span id=',p);if(this.className)n.push(' class="',this.className,' cke_off"');n.push(' role="presentation">','<span id="'+p+'_label" class=cke_label>',this.label,'</span>','<a hidefocus=true title="',this.title,'" tabindex="-1"',o.gecko&&o.version>=10900&&!o.hc?'':" href=\"javascript:void('"+this.label+"')\"",' role="button" aria-labelledby="',p,'_label" aria-describedby="',p,'_text" aria-haspopup="true"');if(b.opera||b.gecko&&b.mac)n.push(' onkeypress="return false;"');if(b.gecko)n.push(' onblur="this.style.cssText = this.style.cssText;"');n.push(' onkeydown="CKEDITOR.tools.callFunction( ',t,', event, this );" onfocus="return CKEDITOR.tools.callFunction(',u,', event);" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',q,', this); return false;"><span><span id="'+p+'_text" class="cke_text cke_inline_label">'+this.label+'</span>'+'</span>'+'<span class=cke_openbutton><span class=cke_icon>'+(b.hc?'▼':b.air?' ':'')+'</span></span>'+'</a>'+'</span>'+'</span>');
-if(this.onRender)this.onRender();return r;},createPanel:function(m){if(this._.panel)return;var n=this._.panelDefinition,o=this._.panelDefinition.block,p=n.parent||a.document.getBody(),q=new k.floatPanel(m,p,n),r=q.addListBlock(this.id,o),s=this;q.onShow=function(){if(s.className)this.element.getFirst().addClass(s.className+'_panel');s.setState(1);r.focus(!s.multiSelect&&s.getValue());s._.on=1;if(s.onOpen)s.onOpen();};q.onHide=function(t){if(s.className)this.element.getFirst().removeClass(s.className+'_panel');s.setState(s.modes&&s.modes[m.mode]?2:0);s._.on=0;if(!t&&s.onClose)s.onClose();};q.onEscape=function(){q.hide();};r.onClick=function(t,u){s.document.getWindow().focus();if(s.onClick)s.onClick.call(s,t,u);if(u)s.setValue(t,s._.items[t]);else s.setValue('');q.hide(false);};this._.panel=q;this._.list=r;q.getBlock(this.id).onHide=function(){s._.on=0;s.setState(2);};if(this.init)this.init();},setValue:function(m,n){var p=this;p._.value=m;var o=p.document.getById('cke_'+p.id+'_text');if(o){if(!(m||n)){n=p.label;o.addClass('cke_inline_label');}else o.removeClass('cke_inline_label');o.setHtml(typeof n!='undefined'?n:m);}},getValue:function(){return this._.value||'';},unmarkAll:function(){this._.list.unmarkAll();},mark:function(m){this._.list.mark(m);},hideItem:function(m){this._.list.hideItem(m);},hideGroup:function(m){this._.list.hideGroup(m);},showAll:function(){this._.list.showAll();},add:function(m,n,o){this._.items[m]=o||m;this._.list.add(m,n,o);},startGroup:function(m){this._.list.startGroup(m);},commit:function(){var m=this;if(!m._.committed){m._.list.commit();m._.committed=1;k.fire('ready',m);}m._.committed=1;},setState:function(m){var n=this;if(n._.state==m)return;n.document.getById('cke_'+n.id).setState(m);n._.state=m;}}});k.prototype.addRichCombo=function(m,n){this.add(m,'richcombo',n);};j.add('htmlwriter');a.htmlWriter=e.createClass({base:a.htmlParser.basicWriter,$:function(){var o=this;o.base();o.indentationChars='\t';o.selfClosingEnd=' />';o.lineBreakChars='\n';o.forceSimpleAmpersand=0;o.sortAttributes=1;o._.indent=0;o._.indentation='';o._.inPre=0;o._.rules={};var m=f;for(var n in e.extend({},m.$nonBodyContent,m.$block,m.$listItem,m.$tableContent))o.setRules(n,{indent:1,breakBeforeOpen:1,breakAfterOpen:1,breakBeforeClose:!m[n]['#'],breakAfterClose:1});o.setRules('br',{breakAfterOpen:1});o.setRules('title',{indent:0,breakAfterOpen:0});o.setRules('style',{indent:0,breakBeforeClose:1});o.setRules('pre',{indent:0});},proto:{openTag:function(m,n){var p=this;
-var o=p._.rules[m];if(p._.indent)p.indentation();else if(o&&o.breakBeforeOpen){p.lineBreak();p.indentation();}p._.output.push('<',m);},openTagClose:function(m,n){var p=this;var o=p._.rules[m];if(n)p._.output.push(p.selfClosingEnd);else{p._.output.push('>');if(o&&o.indent)p._.indentation+=p.indentationChars;}if(o&&o.breakAfterOpen)p.lineBreak();m=='pre'&&(p._.inPre=1);},attribute:function(m,n){if(typeof n=='string'){this.forceSimpleAmpersand&&(n=n.replace(/&/g,'&'));n=e.htmlEncodeAttr(n);}this._.output.push(' ',m,'="',n,'"');},closeTag:function(m){var o=this;var n=o._.rules[m];if(n&&n.indent)o._.indentation=o._.indentation.substr(o.indentationChars.length);if(o._.indent)o.indentation();else if(n&&n.breakBeforeClose){o.lineBreak();o.indentation();}o._.output.push('</',m,'>');m=='pre'&&(o._.inPre=0);if(n&&n.breakAfterClose)o.lineBreak();},text:function(m){var n=this;if(n._.indent){n.indentation();!n._.inPre&&(m=e.ltrim(m));}n._.output.push(m);},comment:function(m){if(this._.indent)this.indentation();this._.output.push('<!--',m,'-->');},lineBreak:function(){var m=this;if(!m._.inPre&&m._.output.length>0)m._.output.push(m.lineBreakChars);m._.indent=1;},indentation:function(){var m=this;if(!m._.inPre)m._.output.push(m._.indentation);m._.indent=0;},setRules:function(m,n){var o=this._.rules[m];if(o)e.extend(o,n,true);else this._.rules[m]=n;}}});j.add('menubutton',{requires:['button','menu'],beforeInit:function(m){m.ui.addHandler('menubutton',k.menuButton.handler);}});a.UI_MENUBUTTON='menubutton';(function(){var m=function(n){var o=this._;if(o.state===0)return;o.previousState=o.state;var p=o.menu;if(!p){p=o.menu=new a.menu(n,{panel:{className:n.skinClass+' cke_contextmenu',attributes:{'aria-label':n.lang.common.options}}});p.onHide=e.bind(function(){this.setState(this.modes&&this.modes[n.mode]?o.previousState:0);},this);if(this.onMenu)p.addListener(this.onMenu);}if(o.on){p.hide();return;}this.setState(1);p.show(a.document.getById(this._.id),4);};k.menuButton=e.createClass({base:k.button,$:function(n){var o=n.panel;delete n.panel;this.base(n);this.hasArrow=true;this.click=m;},statics:{handler:{create:function(n){return new k.menuButton(n);}}}});})();j.add('dialogui');(function(){var m=function(u){var x=this;x._||(x._={});x._['default']=x._.initValue=u['default']||'';x._.required=u.required||false;var v=[x._];for(var w=1;w<arguments.length;w++)v.push(arguments[w]);v.push(true);e.extend.apply(e,v);return x._;},n={build:function(u,v,w){return new k.dialog.textInput(u,v,w);
-}},o={build:function(u,v,w){return new k.dialog[v.type](u,v,w);}},p={build:function(u,v,w){var x=v.children,y,z=[],A=[];for(var B=0;B<x.length&&(y=x[B]);B++){var C=[];z.push(C);A.push(a.dialog._.uiElementBuilders[y.type].build(u,y,C));}return new k.dialog[v.type](u,A,z,w,v);}},q={isChanged:function(){return this.getValue()!=this.getInitValue();},reset:function(u){this.setValue(this.getInitValue(),u);},setInitValue:function(){this._.initValue=this.getValue();},resetInitValue:function(){this._.initValue=this._['default'];},getInitValue:function(){return this._.initValue;}},r=e.extend({},k.dialog.uiElement.prototype.eventProcessors,{onChange:function(u,v){if(!this._.domOnChangeRegistered){u.on('load',function(){this.getInputElement().on('change',function(){if(!u.parts.dialog.isVisible())return;this.fire('change',{value:this.getValue()});},this);},this);this._.domOnChangeRegistered=true;}this.on('change',v);}},true),s=/^on([A-Z]\w+)/,t=function(u){for(var v in u){if(s.test(v)||v=='title'||v=='type')delete u[v];}return u;};e.extend(k.dialog,{labeledElement:function(u,v,w,x){if(arguments.length<4)return;var y=m.call(this,v);y.labelId=e.getNextId()+'_label';var z=this._.children=[],A=function(){var B=[],C=v.required?' cke_required':'';if(v.labelLayout!='horizontal')B.push('<label class="cke_dialog_ui_labeled_label'+C+'" ',' id="'+y.labelId+'"',' for="'+y.inputId+'"',(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>',v.label,'</label>','<div class="cke_dialog_ui_labeled_content"'+(v.controlStyle?' style="'+v.controlStyle+'"':'')+' role="presentation">',x.call(this,u,v),'</div>');else{var D={type:'hbox',widths:v.widths,padding:0,children:[{type:'html',html:'<label class="cke_dialog_ui_labeled_label'+C+'"'+' id="'+y.labelId+'"'+' for="'+y.inputId+'"'+(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>'+e.htmlEncode(v.label)+'</span>'},{type:'html',html:'<span class="cke_dialog_ui_labeled_content"'+(v.controlStyle?' style="'+v.controlStyle+'"':'')+'>'+x.call(this,u,v)+'</span>'}]};a.dialog._.uiElementBuilders.hbox.build(u,D,B);}return B.join('');};k.dialog.uiElement.call(this,u,v,w,'div',null,{role:'presentation'},A);},textInput:function(u,v,w){if(arguments.length<3)return;m.call(this,v);var x=this._.inputId=e.getNextId()+'_textInput',y={'class':'cke_dialog_ui_input_'+v.type,id:x,type:'text'},z;if(v.validate)this.validate=v.validate;if(v.maxLength)y.maxlength=v.maxLength;if(v.size)y.size=v.size;if(v.inputStyle)y.style=v.inputStyle;var A=this,B=false;u.on('load',function(){A.getInputElement().on('keydown',function(D){if(D.data.getKeystroke()==13)B=true;
-});A.getInputElement().on('keyup',function(D){if(D.data.getKeystroke()==13&&B){u.getButton('ok')&&setTimeout(function(){u.getButton('ok').click();},0);B=false;}},null,null,1000);});var C=function(){var D=['<div class="cke_dialog_ui_input_',v.type,'" role="presentation"'];if(v.width)D.push('style="width:'+v.width+'" ');D.push('><input ');y['aria-labelledby']=this._.labelId;this._.required&&(y['aria-required']=this._.required);for(var E in y)D.push(E+'="'+y[E]+'" ');D.push(' /></div>');return D.join('');};k.dialog.labeledElement.call(this,u,v,w,C);},textarea:function(u,v,w){if(arguments.length<3)return;m.call(this,v);var x=this,y=this._.inputId=e.getNextId()+'_textarea',z={};if(v.validate)this.validate=v.validate;z.rows=v.rows||5;z.cols=v.cols||20;if(typeof v.inputStyle!='undefined')z.style=v.inputStyle;var A=function(){z['aria-labelledby']=this._.labelId;this._.required&&(z['aria-required']=this._.required);var B=['<div class="cke_dialog_ui_input_textarea" role="presentation"><textarea class="cke_dialog_ui_input_textarea" id="',y,'" '];for(var C in z)B.push(C+'="'+e.htmlEncode(z[C])+'" ');B.push('>',e.htmlEncode(x._['default']),'</textarea></div>');return B.join('');};k.dialog.labeledElement.call(this,u,v,w,A);},checkbox:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v,{'default':!!v['default']});if(v.validate)this.validate=v.validate;var y=function(){var z=e.extend({},v,{id:v.id?v.id+'_checkbox':e.getNextId()+'_checkbox'},true),A=[],B=e.getNextId()+'_label',C={'class':'cke_dialog_ui_checkbox_input',type:'checkbox','aria-labelledby':B};t(z);if(v['default'])C.checked='checked';if(typeof z.inputStyle!='undefined')z.style=z.inputStyle;x.checkbox=new k.dialog.uiElement(u,z,A,'input',null,C);A.push(' <label id="',B,'" for="',C.id,'"'+(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>',e.htmlEncode(v.label),'</label>');return A.join('');};k.dialog.uiElement.call(this,u,v,w,'span',null,null,y);},radio:function(u,v,w){if(arguments.length<3)return;m.call(this,v);if(!this._['default'])this._['default']=this._.initValue=v.items[0][1];if(v.validate)this.validate=v.valdiate;var x=[],y=this,z=function(){var A=[],B=[],C={'class':'cke_dialog_ui_radio_item','aria-labelledby':this._.labelId},D=v.id?v.id+'_radio':e.getNextId()+'_radio';for(var E=0;E<v.items.length;E++){var F=v.items[E],G=F[2]!==undefined?F[2]:F[0],H=F[1]!==undefined?F[1]:F[0],I=e.getNextId()+'_radio_input',J=I+'_label',K=e.extend({},v,{id:I,title:null,type:null},true),L=e.extend({},K,{title:G},true),M={type:'radio','class':'cke_dialog_ui_radio_input',name:D,value:H,'aria-labelledby':J},N=[];
-if(y._['default']==H)M.checked='checked';t(K);t(L);if(typeof K.inputStyle!='undefined')K.style=K.inputStyle;x.push(new k.dialog.uiElement(u,K,N,'input',null,M));N.push(' ');new k.dialog.uiElement(u,L,N,'label',null,{id:J,'for':M.id},F[0]);A.push(N.join(''));}new k.dialog.hbox(u,[],A,B);return B.join('');};k.dialog.labeledElement.call(this,u,v,w,z);this._.children=x;},button:function(u,v,w){if(!arguments.length)return;if(typeof v=='function')v=v(u.getParentEditor());m.call(this,v,{disabled:v.disabled||false});a.event.implementOn(this);var x=this;u.on('load',function(A){var B=this.getElement();(function(){B.on('click',function(C){x.fire('click',{dialog:x.getDialog()});C.data.preventDefault();});B.on('keydown',function(C){if(C.data.getKeystroke() in {32:1}){x.click();C.data.preventDefault();}});})();B.unselectable();},this);var y=e.extend({},v);delete y.style;var z=e.getNextId()+'_label';k.dialog.uiElement.call(this,u,y,w,'a',null,{style:v.style,href:'javascript:void(0)',title:v.label,hidefocus:'true','class':v['class'],role:'button','aria-labelledby':z},'<span id="'+z+'" class="cke_dialog_ui_button">'+e.htmlEncode(v.label)+'</span>');},select:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v);if(v.validate)this.validate=v.validate;x.inputId=e.getNextId()+'_select';var y=function(){var z=e.extend({},v,{id:v.id?v.id+'_select':e.getNextId()+'_select'},true),A=[],B=[],C={id:x.inputId,'class':'cke_dialog_ui_input_select','aria-labelledby':this._.labelId};if(v.size!=undefined)C.size=v.size;if(v.multiple!=undefined)C.multiple=v.multiple;t(z);for(var D=0,E;D<v.items.length&&(E=v.items[D]);D++)B.push('<option value="',e.htmlEncode(E[1]!==undefined?E[1]:E[0]).replace(/"/g,'"'),'" /> ',e.htmlEncode(E[0]));if(typeof z.inputStyle!='undefined')z.style=z.inputStyle;x.select=new k.dialog.uiElement(u,z,A,'select',null,C,B.join(''));return A.join('');};k.dialog.labeledElement.call(this,u,v,w,y);},file:function(u,v,w){if(arguments.length<3)return;if(v['default']===undefined)v['default']='';var x=e.extend(m.call(this,v),{definition:v,buttons:[]});if(v.validate)this.validate=v.validate;var y=function(){x.frameId=e.getNextId()+'_fileInput';var z=b.isCustomDomain(),A=['<iframe frameborder="0" allowtransparency="0" class="cke_dialog_ui_input_file" id="',x.frameId,'" title="',v.label,'" src="javascript:void('];A.push(z?"(function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})()':'0');A.push(')"></iframe>');return A.join('');};u.on('load',function(){var z=a.document.getById(x.frameId),A=z.getParent();
-A.addClass('cke_dialog_ui_input_file');});k.dialog.labeledElement.call(this,u,v,w,y);},fileButton:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v),y=this;if(v.validate)this.validate=v.validate;var z=e.extend({},v),A=z.onClick;z.className=(z.className?z.className+' ':'')+'cke_dialog_ui_button';z.onClick=function(B){var C=v['for'];if(!A||A.call(this,B)!==false){u.getContentElement(C[0],C[1]).submit();this.disable();}};u.on('load',function(){u.getContentElement(v['for'][0],v['for'][1])._.buttons.push(y);});k.dialog.button.call(this,u,z,w);},html:(function(){var u=/^\s*<[\w:]+\s+([^>]*)?>/,v=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,w=/\/$/;return function(x,y,z){if(arguments.length<3)return;var A=[],B,C=y.html,D,E;if(C.charAt(0)!='<')C='<span>'+C+'</span>';var F=y.focus;if(F){var G=this.focus;this.focus=function(){G.call(this);typeof F=='function'&&F.call(this);this.fire('focus');};if(y.isFocusable){var H=this.isFocusable;this.isFocusable=H;}this.keyboardFocusable=true;}k.dialog.uiElement.call(this,x,y,A,'span',null,null,'');B=A.join('');D=B.match(u);E=C.match(v)||['','',''];if(w.test(E[1])){E[1]=E[1].slice(0,-1);E[2]='/'+E[2];}z.push([E[1],' ',D[1]||'',E[2]].join(''));};})(),fieldset:function(u,v,w,x,y){var z=y.label,A=function(){var B=[];z&&B.push('<legend>'+z+'</legend>');for(var C=0;C<w.length;C++)B.push(w[C]);return B.join('');};this._={children:v};k.dialog.uiElement.call(this,u,y,x,'fieldset',null,null,A);}},true);k.dialog.html.prototype=new k.dialog.uiElement();k.dialog.labeledElement.prototype=e.extend(new k.dialog.uiElement(),{setLabel:function(u){var v=a.document.getById(this._.labelId);if(v.getChildCount()<1)new d.text(u,a.document).appendTo(v);else v.getChild(0).$.nodeValue=u;return this;},getLabel:function(){var u=a.document.getById(this._.labelId);if(!u||u.getChildCount()<1)return '';else return u.getChild(0).getText();},eventProcessors:r},true);k.dialog.button.prototype=e.extend(new k.dialog.uiElement(),{click:function(){var u=this;if(!u._.disabled)return u.fire('click',{dialog:u._.dialog});u.getElement().$.blur();return false;},enable:function(){this._.disabled=false;var u=this.getElement();u&&u.removeClass('cke_disabled');},disable:function(){this._.disabled=true;this.getElement().addClass('cke_disabled');},isVisible:function(){return this.getElement().getFirst().isVisible();},isEnabled:function(){return!this._.disabled;},eventProcessors:e.extend({},k.dialog.uiElement.prototype.eventProcessors,{onClick:function(u,v){this.on('click',v);
-}},true),accessKeyUp:function(){this.click();},accessKeyDown:function(){this.focus();},keyboardFocusable:true},true);k.dialog.textInput.prototype=e.extend(new k.dialog.labeledElement(),{getInputElement:function(){return a.document.getById(this._.inputId);},focus:function(){var u=this.selectParentTab();setTimeout(function(){var v=u.getInputElement();v&&v.$.focus();},0);},select:function(){var u=this.selectParentTab();setTimeout(function(){var v=u.getInputElement();if(v){v.$.focus();v.$.select();}},0);},accessKeyUp:function(){this.select();},setValue:function(u){!u&&(u='');return k.dialog.uiElement.prototype.setValue.apply(this,arguments);},keyboardFocusable:true},q,true);k.dialog.textarea.prototype=new k.dialog.textInput();k.dialog.select.prototype=e.extend(new k.dialog.labeledElement(),{getInputElement:function(){return this._.select.getElement();},add:function(u,v,w){var x=new h('option',this.getDialog().getParentEditor().document),y=this.getInputElement().$;x.$.text=u;x.$.value=v===undefined||v===null?u:v;if(w===undefined||w===null){if(c)y.add(x.$);else y.add(x.$,null);}else y.add(x.$,w);return this;},remove:function(u){var v=this.getInputElement().$;v.remove(u);return this;},clear:function(){var u=this.getInputElement().$;while(u.length>0)u.remove(0);return this;},keyboardFocusable:true},q,true);k.dialog.checkbox.prototype=e.extend(new k.dialog.uiElement(),{getInputElement:function(){return this._.checkbox.getElement();},setValue:function(u,v){this.getInputElement().$.checked=u;!v&&this.fire('change',{value:u});},getValue:function(){return this.getInputElement().$.checked;},accessKeyUp:function(){this.setValue(!this.getValue());},eventProcessors:{onChange:function(u,v){if(!c)return r.onChange.apply(this,arguments);else{u.on('load',function(){var w=this._.checkbox.getElement();w.on('propertychange',function(x){x=x.data.$;if(x.propertyName=='checked')this.fire('change',{value:w.$.checked});},this);},this);this.on('change',v);}return null;}},keyboardFocusable:true},q,true);k.dialog.radio.prototype=e.extend(new k.dialog.uiElement(),{setValue:function(u,v){var w=this._.children,x;for(var y=0;y<w.length&&(x=w[y]);y++)x.getElement().$.checked=x.getValue()==u;!v&&this.fire('change',{value:u});},getValue:function(){var u=this._.children;for(var v=0;v<u.length;v++){if(u[v].getElement().$.checked)return u[v].getValue();}return null;},accessKeyUp:function(){var u=this._.children,v;for(v=0;v<u.length;v++){if(u[v].getElement().$.checked){u[v].getElement().focus();return;
-}}u[0].getElement().focus();},eventProcessors:{onChange:function(u,v){if(!c)return r.onChange.apply(this,arguments);else{u.on('load',function(){var w=this._.children,x=this;for(var y=0;y<w.length;y++){var z=w[y].getElement();z.on('propertychange',function(A){A=A.data.$;if(A.propertyName=='checked'&&this.$.checked)x.fire('change',{value:this.getAttribute('value')});});}},this);this.on('change',v);}return null;}},keyboardFocusable:true},q,true);k.dialog.file.prototype=e.extend(new k.dialog.labeledElement(),q,{getInputElement:function(){var u=a.document.getById(this._.frameId).getFrameDocument();return u.$.forms.length>0?new h(u.$.forms[0].elements[0]):this.getElement();},submit:function(){this.getInputElement().getParent().$.submit();return this;},getAction:function(){return this.getInputElement().getParent().$.action;},registerEvents:function(u){var v=/^on([A-Z]\w+)/,w,x=function(z,A,B,C){z.on('formLoaded',function(){z.getInputElement().on(B,C,z);});};for(var y in u){if(!(w=y.match(v)))continue;if(this.eventProcessors[y])this.eventProcessors[y].call(this,this._.dialog,u[y]);else x(this,this._.dialog,w[1].toLowerCase(),u[y]);}return this;},reset:function(){var u=this._,v=a.document.getById(u.frameId),w=v.getFrameDocument(),x=u.definition,y=u.buttons,z=this.formLoadedNumber,A=this.formUnloadNumber,B=u.dialog._.editor.lang.dir,C=u.dialog._.editor.langCode;if(!z){z=this.formLoadedNumber=e.addFunction(function(){this.fire('formLoaded');},this);A=this.formUnloadNumber=e.addFunction(function(){this.getInputElement().clearCustomData();},this);this.getDialog()._.editor.on('destroy',function(){e.removeFunction(z);e.removeFunction(A);});}function D(){w.$.open();if(b.isCustomDomain())w.$.domain=document.domain;var E='';if(x.size)E=x.size-(c?7:0);w.$.write(['<html dir="'+B+'" lang="'+C+'"><head><title></title></head><body style="margin: 0; overflow: hidden; background: transparent;">','<form enctype="multipart/form-data" method="POST" dir="'+B+'" lang="'+C+'" action="',e.htmlEncode(x.action),'">','<input type="file" name="',e.htmlEncode(x.id||'cke_upload'),'" size="',e.htmlEncode(E>0?E:''),'" />','</form>','</body></html>','<script>window.parent.CKEDITOR.tools.callFunction('+z+');','window.onbeforeunload = function() {window.parent.CKEDITOR.tools.callFunction('+A+')}</script>'].join(''));w.$.close();for(var F=0;F<y.length;F++)y[F].enable();};if(b.gecko)setTimeout(D,500);else D();},getValue:function(){return this.getInputElement().$.value||'';},setInitValue:function(){this._.initValue='';
-},eventProcessors:{onChange:function(u,v){if(!this._.domOnChangeRegistered){this.on('formLoaded',function(){this.getInputElement().on('change',function(){this.fire('change',{value:this.getValue()});},this);},this);this._.domOnChangeRegistered=true;}this.on('change',v);}},keyboardFocusable:true},true);k.dialog.fileButton.prototype=new k.dialog.button();k.dialog.fieldset.prototype=e.clone(k.dialog.hbox.prototype);a.dialog.addUIElement('text',n);a.dialog.addUIElement('password',n);a.dialog.addUIElement('textarea',o);a.dialog.addUIElement('checkbox',o);a.dialog.addUIElement('radio',o);a.dialog.addUIElement('button',o);a.dialog.addUIElement('select',o);a.dialog.addUIElement('file',o);a.dialog.addUIElement('fileButton',o);a.dialog.addUIElement('html',o);a.dialog.addUIElement('fieldset',p);})();j.add('panel',{beforeInit:function(m){m.ui.addHandler('panel',k.panel.handler);}});a.UI_PANEL='panel';k.panel=function(m,n){var o=this;if(n)e.extend(o,n);e.extend(o,{className:'',css:[]});o.id=e.getNextId();o.document=m;o._={blocks:{}};};k.panel.handler={create:function(m){return new k.panel(m);}};k.panel.prototype={renderHtml:function(m){var n=[];this.render(m,n);return n.join('');},render:function(m,n){var p=this;var o=p.id;n.push('<div class="',m.skinClass,'" lang="',m.langCode,'" role="presentation" style="display:none;z-index:'+(m.config.baseFloatZIndex+1)+'">'+'<div'+' id=',o,' dir=',m.lang.dir,' role="presentation" class="cke_panel cke_',m.lang.dir);if(p.className)n.push(' ',p.className);n.push('">');if(p.forceIFrame||p.css.length){n.push('<iframe id="',o,'_frame" frameborder="0" role="application" src="javascript:void(');n.push(b.isCustomDomain()?"(function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})()':'0');n.push(')"></iframe>');}n.push('</div></div>');return o;},getHolderElement:function(){var m=this._.holder;if(!m){if(this.forceIFrame||this.css.length){var n=this.document.getById(this.id+'_frame'),o=n.getParent(),p=o.getAttribute('dir'),q=o.getParent().getAttribute('class'),r=o.getParent().getAttribute('lang'),s=n.getFrameDocument(),t=e.addFunction(e.bind(function(w){this.isLoaded=true;if(this.onLoad)this.onLoad();},this)),u='<!DOCTYPE html><html dir="'+p+'" class="'+q+'_container" lang="'+r+'">'+'<head>'+'<style>.'+q+'_container{visibility:hidden}</style>'+'</head>'+'<body class="cke_'+p+' cke_panel_frame '+b.cssClass+'" style="margin:0;padding:0"'+' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction('+t+');"></body>'+e.buildStyleHtml(this.css)+'</html>';
-s.write(u);var v=s.getWindow();v.$.CKEDITOR=a;s.on('key'+(b.opera?'press':'down'),function(w){var z=this;var x=w.data.getKeystroke(),y=z.document.getById(z.id).getAttribute('dir');if(z._.onKeyDown&&z._.onKeyDown(x)===false){w.data.preventDefault();return;}if(x==27||x==(y=='rtl'?39:37))if(z.onEscape&&z.onEscape(x)===false)w.data.preventDefault();},this);m=s.getBody();m.unselectable();b.air&&e.callFunction(t);}else m=this.document.getById(this.id);this._.holder=m;}return m;},addBlock:function(m,n){var o=this;n=o._.blocks[m]=n instanceof k.panel.block?n:new k.panel.block(o.getHolderElement(),n);if(!o._.currentBlock)o.showBlock(m);return n;},getBlock:function(m){return this._.blocks[m];},showBlock:function(m){var n=this._.blocks,o=n[m],p=this._.currentBlock,q=this.forceIFrame?this.document.getById(this.id+'_frame'):this._.holder;q.getParent().getParent().disableContextMenu();if(p){q.removeAttributes(p.attributes);p.hide();}this._.currentBlock=o;q.setAttributes(o.attributes);a.fire('ariaWidget',q);o._.focusIndex=-1;this._.onKeyDown=o.onKeyDown&&e.bind(o.onKeyDown,o);o.onMark=function(r){q.setAttribute('aria-activedescendant',r.getId()+'_option');};o.onUnmark=function(){q.removeAttribute('aria-activedescendant');};o.show();return o;},destroy:function(){this.element&&this.element.remove();}};k.panel.block=e.createClass({$:function(m,n){var o=this;o.element=m.append(m.getDocument().createElement('div',{attributes:{tabIndex:-1,'class':'cke_panel_block',role:'presentation'},styles:{display:'none'}}));if(n)e.extend(o,n);if(!o.attributes.title)o.attributes.title=o.attributes['aria-label'];o.keys={};o._.focusIndex=-1;o.element.disableContextMenu();},_:{markItem:function(m){var p=this;if(m==-1)return;var n=p.element.getElementsByTag('a'),o=n.getItem(p._.focusIndex=m);if(b.webkit||b.opera)o.getDocument().getWindow().focus();o.focus();p.onMark&&p.onMark(o);}},proto:{show:function(){this.element.setStyle('display','');},hide:function(){var m=this;if(!m.onHide||m.onHide.call(m)!==true)m.element.setStyle('display','none');},onKeyDown:function(m){var r=this;var n=r.keys[m];switch(n){case 'next':var o=r._.focusIndex,p=r.element.getElementsByTag('a'),q;while(q=p.getItem(++o)){if(q.getAttribute('_cke_focus')&&q.$.offsetWidth){r._.focusIndex=o;q.focus();break;}}return false;case 'prev':o=r._.focusIndex;p=r.element.getElementsByTag('a');while(o>0&&(q=p.getItem(--o))){if(q.getAttribute('_cke_focus')&&q.$.offsetWidth){r._.focusIndex=o;q.focus();break;}}return false;case 'click':case 'mouseup':o=r._.focusIndex;
-q=o>=0&&r.element.getElementsByTag('a').getItem(o);if(q)q.$[n]?q.$[n]():q.$['on'+n]();return false;}return true;}}});j.add('listblock',{requires:['panel'],onLoad:function(){k.panel.prototype.addListBlock=function(m,n){return this.addBlock(m,new k.listBlock(this.getHolderElement(),n));};k.listBlock=e.createClass({base:k.panel.block,$:function(m,n){var q=this;n=n||{};var o=n.attributes||(n.attributes={});(q.multiSelect=!!n.multiSelect)&&(o['aria-multiselectable']=true);!o.role&&(o.role='listbox');q.base.apply(q,arguments);var p=q.keys;p[40]='next';p[9]='next';p[38]='prev';p[2228224+9]='prev';p[32]=c?'mouseup':'click';c&&(p[13]='mouseup');q._.pendingHtml=[];q._.items={};q._.groups={};},_:{close:function(){if(this._.started){this._.pendingHtml.push('</ul>');delete this._.started;}},getClick:function(){if(!this._.click)this._.click=e.addFunction(function(m){var o=this;var n=true;if(o.multiSelect)n=o.toggle(m);else o.mark(m);if(o.onClick)o.onClick(m,n);},this);return this._.click;}},proto:{add:function(m,n,o){var r=this;var p=r._.pendingHtml,q=e.getNextId();if(!r._.started){p.push('<ul role="presentation" class=cke_panel_list>');r._.started=1;r._.size=r._.size||0;}r._.items[m]=q;p.push('<li id=',q,' class=cke_panel_listItem role=presentation><a id="',q,'_option" _cke_focus=1 hidefocus=true title="',o||m,'" href="javascript:void(\'',m,"')\" "+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',r._.getClick(),",'",m,"'); return false;\"",' role="option" aria-posinset="'+ ++r._.size+'">',n||m,'</a></li>');},startGroup:function(m){this._.close();var n=e.getNextId();this._.groups[m]=n;this._.pendingHtml.push('<h1 role="presentation" id=',n,' class=cke_panel_grouptitle>',m,'</h1>');},commit:function(){var p=this;p._.close();p.element.appendHtml(p._.pendingHtml.join(''));var m=p._.items,n=p.element.getDocument();for(var o in m)n.getById(m[o]+'_option').setAttribute('aria-setsize',p._.size);delete p._.size;p._.pendingHtml=[];},toggle:function(m){var n=this.isMarked(m);if(n)this.unmark(m);else this.mark(m);return!n;},hideGroup:function(m){var n=this.element.getDocument().getById(this._.groups[m]),o=n&&n.getNext();if(n){n.setStyle('display','none');if(o&&o.getName()=='ul')o.setStyle('display','none');}},hideItem:function(m){this.element.getDocument().getById(this._.items[m]).setStyle('display','none');},showAll:function(){var m=this._.items,n=this._.groups,o=this.element.getDocument();for(var p in m)o.getById(m[p]).setStyle('display','');for(var q in n){var r=o.getById(n[q]),s=r.getNext();
-r.setStyle('display','');if(s&&s.getName()=='ul')s.setStyle('display','');}},mark:function(m){var p=this;if(!p.multiSelect)p.unmarkAll();var n=p._.items[m],o=p.element.getDocument().getById(n);o.addClass('cke_selected');p.element.getDocument().getById(n+'_option').setAttribute('aria-selected',true);p.element.setAttribute('aria-activedescendant',n+'_option');p.onMark&&p.onMark(o);},unmark:function(m){var q=this;var n=q.element.getDocument(),o=q._.items[m],p=n.getById(o);p.removeClass('cke_selected');n.getById(o+'_option').removeAttribute('aria-selected');q.onUnmark&&q.onUnmark(p);},unmarkAll:function(){var q=this;var m=q._.items,n=q.element.getDocument();for(var o in m){var p=m[o];n.getById(p).removeClass('cke_selected');n.getById(p+'_option').removeAttribute('aria-selected');}q.onUnmark&&q.onUnmark();},isMarked:function(m){return this.element.getDocument().getById(this._.items[m]).hasClass('cke_selected');},focus:function(m){this._.focusIndex=-1;if(m){var n=this.element.getDocument().getById(this._.items[m]).getFirst(),o=this.element.getElementsByTag('a'),p,q=-1;while(p=o.getItem(++q)){if(p.equals(n)){this._.focusIndex=q;break;}}setTimeout(function(){n.focus();},0);}}}});}});a.themes.add('default',(function(){var m={};function n(o,p){var q,r;r=o.config.sharedSpaces;r=r&&r[p];r=r&&a.document.getById(r);if(r){var s='<span class="cke_shared " dir="'+o.lang.dir+'"'+'>'+'<span class="'+o.skinClass+' '+o.id+' cke_editor_'+o.name+'">'+'<span class="'+b.cssClass+'">'+'<span class="cke_wrapper cke_'+o.lang.dir+'">'+'<span class="cke_editor">'+'<div class="cke_'+p+'">'+'</div></span></span></span></span></span>',t=r.append(h.createFromHtml(s,r.getDocument()));if(r.getCustomData('cke_hasshared'))t.hide();else r.setCustomData('cke_hasshared',1);q=t.getChild([0,0,0,0]);!o.sharedSpaces&&(o.sharedSpaces={});o.sharedSpaces[p]=q;o.on('focus',function(){for(var u=0,v,w=r.getChildren();v=w.getItem(u);u++){if(v.type==1&&!v.equals(t)&&v.hasClass('cke_shared'))v.hide();}t.show();});o.on('destroy',function(){t.remove();});}return q;};return{build:function(o,p){var q=o.name,r=o.element,s=o.elementMode;if(!r||s==0)return;if(s==1)r.hide();var t=o.fire('themeSpace',{space:'top',html:''}).html,u=o.fire('themeSpace',{space:'contents',html:''}).html,v=o.fireOnce('themeSpace',{space:'bottom',html:''}).html,w=u&&o.config.height,x=o.config.tabIndex||o.element.getAttribute('tabindex')||0;if(!u)w='auto';else if(!isNaN(w))w+='px';var y='',z=o.config.width;if(z){if(!isNaN(z))z+='px';y+='width: '+z+';';
-}var A=t&&n(o,'top'),B=n(o,'bottom');A&&(A.setHtml(t),t='');B&&(B.setHtml(v),v='');var C='<style>.'+o.skinClass+'{visibility:hidden;}</style>';if(m[o.skinClass])C='';else m[o.skinClass]=1;var D=h.createFromHtml(['<span id="cke_',q,'" class="',o.skinClass,' ',o.id,' cke_editor_',q,'" dir="',o.lang.dir,'" title="',b.gecko?' ':'','" lang="',o.langCode,'"'+(b.webkit?' tabindex="'+x+'"':'')+' role="application"'+' aria-labelledby="cke_',q,'_arialbl"'+(y?' style="'+y+'"':'')+'>'+'<span id="cke_',q,'_arialbl" class="cke_voice_label">'+o.lang.editor+'</span>'+'<span class="',b.cssClass,'" role="presentation"><span class="cke_wrapper cke_',o.lang.dir,'" role="presentation"><table class="cke_editor" border="0" cellspacing="0" cellpadding="0" role="presentation"><tbody><tr',t?'':' style="display:none"',' role="presentation"><td id="cke_top_',q,'" class="cke_top" role="presentation">',t,'</td></tr><tr',u?'':' style="display:none"',' role="presentation"><td id="cke_contents_',q,'" class="cke_contents" style="height:',w,'" role="presentation">',u,'</td></tr><tr',v?'':' style="display:none"',' role="presentation"><td id="cke_bottom_',q,'" class="cke_bottom" role="presentation">',v,'</td></tr></tbody></table>'+C+'</span>'+'</span>'+'</span>'].join(''));D.getChild([1,0,0,0,0]).unselectable();D.getChild([1,0,0,0,2]).unselectable();if(s==1)D.insertAfter(r);else r.append(D);o.container=D;D.disableContextMenu();o.on('contentDirChanged',function(E){var F=(o.lang.dir!=E.data?'add':'remove')+'Class';D.getChild(1)[F]('cke_mixed_dir_content');var G=this.sharedSpaces&&this.sharedSpaces[this.config.toolbarLocation];G&&G.getParent().getParent()[F]('cke_mixed_dir_content');});o.fireOnce('themeLoaded');o.fireOnce('uiReady');},buildDialog:function(o){var p=e.getNextNumber(),q=h.createFromHtml(['<div class="',o.id,'_dialog cke_editor_',o.name.replace('.','\\.'),'_dialog cke_skin_',o.skinName,'" dir="',o.lang.dir,'" lang="',o.langCode,'" role="dialog" aria-labelledby="%title#"><table class="cke_dialog',' '+b.cssClass,' cke_',o.lang.dir,'" style="position:absolute" role="presentation"><tr><td role="presentation"><div class="%body" role="presentation"><div id="%title#" class="%title" role="presentation"></div><a id="%close_button#" class="%close_button" href="javascript:void(0)" title="'+o.lang.common.close+'" role="button"><span class="cke_label">X</span></a>'+'<div id="%tabs#" class="%tabs" role="tablist"></div>'+'<table class="%contents" role="presentation">'+'<tr>'+'<td id="%contents#" class="%contents" role="presentation"></td>'+'</tr>'+'<tr>'+'<td id="%footer#" class="%footer" role="presentation"></td>'+'</tr>'+'</table>'+'</div>'+'<div id="%tl#" class="%tl"></div>'+'<div id="%tc#" class="%tc"></div>'+'<div id="%tr#" class="%tr"></div>'+'<div id="%ml#" class="%ml"></div>'+'<div id="%mr#" class="%mr"></div>'+'<div id="%bl#" class="%bl"></div>'+'<div id="%bc#" class="%bc"></div>'+'<div id="%br#" class="%br"></div>'+'</td></tr>'+'</table>',c?'':'<style>.cke_dialog{visibility:hidden;}</style>','</div>'].join('').replace(/#/g,'_'+p).replace(/%/g,'cke_dialog_')),r=q.getChild([0,0,0,0,0]),s=r.getChild(0),t=r.getChild(1);
-s.unselectable();t.unselectable();return{element:q,parts:{dialog:q.getChild(0),title:s,close:t,tabs:r.getChild(2),contents:r.getChild([3,0,0,0]),footer:r.getChild([3,0,1,0])}};},destroy:function(o){var p=o.container,q=o.element;if(p){p.clearCustomData();p.remove();}if(q){q.clearCustomData();o.elementMode==1&&q.show();delete o.element;}}};})());a.editor.prototype.getThemeSpace=function(m){var n='cke_'+m,o=this._[n]||(this._[n]=a.document.getById(n+'_'+this.name));return o;};a.editor.prototype.resize=function(m,n,o,p){var q=this.container,r=a.document.getById('cke_contents_'+this.name),s=p?q.getChild(1):q;b.webkit&&s.setStyle('display','none');s.setSize('width',m,true);if(b.webkit){s.$.offsetWidth;s.setStyle('display','');}var t=o?0:(s.$.offsetHeight||0)-(r.$.clientHeight||0);r.setStyle('height',Math.max(n-t,0)+'px');this.fire('resize');};a.editor.prototype.getResizable=function(m){return m?a.document.getById('cke_contents_'+this.name):this.container;};})();
+for(ag=ak.length-1;ag>=0;ag--){if(ak[ag]==='')ak.splice(ag,1);}if(ak.length>0)ac.style=(ac.style?ac.style+'; ':'')+ak.join('; ');for(ag in ac)aa.push(ag+'="'+e.htmlEncode(ac[ag])+'" ');aa.push('>',ad,'</',Z,'>');U.push(aa.join(''));(this._||(this._={})).dialog=S;if(typeof T.isChanged=='boolean')this.isChanged=function(){return T.isChanged;};if(typeof T.isChanged=='function')this.isChanged=T.isChanged;if(typeof T.setValue=='function')this.setValue=e.override(this.setValue,function(an){return function(ao){an.call(this,T.setValue.call(this,ao));};});if(typeof T.getValue=='function')this.getValue=e.override(this.getValue,function(an){return function(){return T.getValue.call(this,an.call(this));};});a.event.implementOn(this);this.registerEvents(T);if(this.accessKeyUp&&this.accessKeyDown&&T.accessKey)M(this,S,'CTRL+'+T.accessKey);var am=this;S.on('load',function(){var an=am.getInputElement();if(an){var ao=am.type in {checkbox:1,ratio:1}&&c&&b.version<8?'cke_dialog_ui_focused':'';an.on('focus',function(){S._.tabBarMode=false;S._.hasFocus=true;am.fire('focus');ao&&this.addClass(ao);});an.on('blur',function(){am.fire('blur');ao&&this.removeClass(ao);});}});if(this.keyboardFocusable){this.tabIndex=T.tabIndex||0;this.focusIndex=S._.focusList.push(this)-1;this.on('focus',function(){S._.currentFocusIndex=am.focusIndex;});}e.extend(this,T);},hbox:function(S,T,U,V,W){if(arguments.length<4)return;this._||(this._={});var X=this._.children=T,Y=W&&W.widths||null,Z=W&&W.height||null,aa={},ab,ac=function(){var ae=['<tbody><tr class="cke_dialog_ui_hbox">'];for(ab=0;ab<U.length;ab++){var af='cke_dialog_ui_hbox_child',ag=[];if(ab===0)af='cke_dialog_ui_hbox_first';if(ab==U.length-1)af='cke_dialog_ui_hbox_last';ae.push('<td class="',af,'" role="presentation" ');if(Y){if(Y[ab])ag.push('width:'+m(Y[ab]));}else ag.push('width:'+Math.floor(100/U.length)+'%');if(Z)ag.push('height:'+m(Z));if(W&&W.padding!=undefined)ag.push('padding:'+m(W.padding));if(c&&b.quirks&&X[ab].align)ag.push('text-align:'+X[ab].align);if(ag.length>0)ae.push('style="'+ag.join('; ')+'" ');ae.push('>',U[ab],'</td>');}ae.push('</tr></tbody>');return ae.join('');},ad={role:'presentation'};W&&W.align&&(ad.align=W.align);k.dialog.uiElement.call(this,S,W||{type:'hbox'},V,'table',aa,ad,ac);},vbox:function(S,T,U,V,W){if(arguments.length<3)return;this._||(this._={});var X=this._.children=T,Y=W&&W.width||null,Z=W&&W.heights||null,aa=function(){var ab=['<table role="presentation" cellspacing="0" border="0" '];ab.push('style="');
+if(W&&W.expand)ab.push('height:100%;');ab.push('width:'+m(Y||'100%'),';');ab.push('"');ab.push('align="',e.htmlEncode(W&&W.align||(S.getParentEditor().lang.dir=='ltr'?'left':'right')),'" ');ab.push('><tbody>');for(var ac=0;ac<U.length;ac++){var ad=[];ab.push('<tr><td role="presentation" ');if(Y)ad.push('width:'+m(Y||'100%'));if(Z)ad.push('height:'+m(Z[ac]));else if(W&&W.expand)ad.push('height:'+Math.floor(100/U.length)+'%');if(W&&W.padding!=undefined)ad.push('padding:'+m(W.padding));if(c&&b.quirks&&X[ac].align)ad.push('text-align:'+X[ac].align);if(ad.length>0)ab.push('style="',ad.join('; '),'" ');ab.push(' class="cke_dialog_ui_vbox_child">',U[ac],'</td></tr>');}ab.push('</tbody></table>');return ab.join('');};k.dialog.uiElement.call(this,S,W||{type:'vbox'},V,'div',null,{role:'presentation'},aa);}};})();k.dialog.uiElement.prototype={getElement:function(){return a.document.getById(this.domId);},getInputElement:function(){return this.getElement();},getDialog:function(){return this._.dialog;},setValue:function(S,T){this.getInputElement().setValue(S);!T&&this.fire('change',{value:S});return this;},getValue:function(){return this.getInputElement().getValue();},isChanged:function(){return false;},selectParentTab:function(){var V=this;var S=V.getInputElement(),T=S,U;while((T=T.getParent())&&T.$.className.search('cke_dialog_page_contents')==-1){}if(!T)return V;U=T.getAttribute('name');if(V._.dialog._.currentTabId!=U)V._.dialog.selectPage(U);return V;},focus:function(){this.selectParentTab().getInputElement().focus();return this;},registerEvents:function(S){var T=/^on([A-Z]\w+)/,U,V=function(X,Y,Z,aa){Y.on('load',function(){X.getInputElement().on(Z,aa,X);});};for(var W in S){if(!(U=W.match(T)))continue;if(this.eventProcessors[W])this.eventProcessors[W].call(this,this._.dialog,S[W]);else V(this,this._.dialog,U[1].toLowerCase(),S[W]);}return this;},eventProcessors:{onLoad:function(S,T){S.on('load',T,this);},onShow:function(S,T){S.on('show',T,this);},onHide:function(S,T){S.on('hide',T,this);}},accessKeyDown:function(S,T){this.focus();},accessKeyUp:function(S,T){},disable:function(){var S=this.getElement(),T=this.getInputElement();T.setAttribute('disabled','true');S.addClass('cke_disabled');},enable:function(){var S=this.getElement(),T=this.getInputElement();T.removeAttribute('disabled');S.removeClass('cke_disabled');},isEnabled:function(){return!this.getElement().hasClass('cke_disabled');},isVisible:function(){return this.getInputElement().isVisible();},isFocusable:function(){if(!this.isEnabled()||!this.isVisible())return false;
+return true;}};k.dialog.hbox.prototype=e.extend(new k.dialog.uiElement(),{getChild:function(S){var T=this;if(arguments.length<1)return T._.children.concat();if(!S.splice)S=[S];if(S.length<2)return T._.children[S[0]];else return T._.children[S[0]]&&T._.children[S[0]].getChild?T._.children[S[0]].getChild(S.slice(1,S.length)):null;}},true);k.dialog.vbox.prototype=new k.dialog.hbox();(function(){var S={build:function(T,U,V){var W=U.children,X,Y=[],Z=[];for(var aa=0;aa<W.length&&(X=W[aa]);aa++){var ab=[];Y.push(ab);Z.push(a.dialog._.uiElementBuilders[X.type].build(T,X,ab));}return new k.dialog[U.type](T,Z,Y,V,U);}};a.dialog.addUIElement('hbox',S);a.dialog.addUIElement('vbox',S);})();a.dialogCommand=function(S){this.dialogName=S;};a.dialogCommand.prototype={exec:function(S){b.opera?e.setTimeout(function(){S.openDialog(this.dialogName);},0,this):S.openDialog(this.dialogName);},canUndo:false,editorFocus:c||b.webkit};(function(){var S=/^([a]|[^a])+$/,T=/^\d*$/,U=/^\d*(?:\.\d+)?$/,V=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,W=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,X=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;a.VALIDATE_OR=1;a.VALIDATE_AND=2;a.dialog.validate={functions:function(){var Y=arguments;return function(){var Z=this&&this.getValue?this.getValue():Y[0],aa=undefined,ab=2,ac=[],ad;for(ad=0;ad<Y.length;ad++){if(typeof Y[ad]=='function')ac.push(Y[ad]);else break;}if(ad<Y.length&&typeof Y[ad]=='string'){aa=Y[ad];ad++;}if(ad<Y.length&&typeof Y[ad]=='number')ab=Y[ad];var ae=ab==2?true:false;for(ad=0;ad<ac.length;ad++){if(ab==2)ae=ae&&ac[ad](Z);else ae=ae||ac[ad](Z);}return!ae?aa:true;};},regex:function(Y,Z){return function(){var aa=this&&this.getValue?this.getValue():arguments[0];return!Y.test(aa)?Z:true;};},notEmpty:function(Y){return this.regex(S,Y);},integer:function(Y){return this.regex(T,Y);},number:function(Y){return this.regex(U,Y);},cssLength:function(Y){return this.functions(function(Z){return W.test(e.trim(Z));},Y);},htmlLength:function(Y){return this.functions(function(Z){return V.test(e.trim(Z));},Y);},inlineStyle:function(Y){return this.functions(function(Z){return X.test(e.trim(Z));},Y);},equals:function(Y,Z){return this.functions(function(aa){return aa==Y;},Z);},notEqual:function(Y,Z){return this.functions(function(aa){return aa!=Y;},Z);}};a.on('instanceDestroyed',function(Y){if(e.isEmpty(a.instances)){var Z;while(Z=a.dialog._.currentTop)Z.hide();I();}var aa=Y.editor._.storedDialogs;for(var ab in aa)aa[ab].destroy();});})();e.extend(a.editor.prototype,{openDialog:function(S,T){if(this.mode=='wysiwyg'&&c){var U=this.getSelection();
+U&&U.lock();}var V=a.dialog._.dialogDefinitions[S],W=this.skin.dialog;if(a.dialog._.currentTop===null)G(this);if(typeof V=='function'&&W._isLoaded){var X=this._.storedDialogs||(this._.storedDialogs={}),Y=X[S]||(X[S]=new a.dialog(this,S));T&&T.call(Y,Y);Y.show();return Y;}else if(V=='failed'){H();throw new Error('[CKEDITOR.dialog.openDialog] Dialog "'+S+'" failed when loading definition.');}var Z=this;function aa(ac){var ad=a.dialog._.dialogDefinitions[S],ae=Z.skin.dialog;if(!ae._isLoaded||ab&&typeof ac=='undefined')return;if(typeof ad!='function')a.dialog._.dialogDefinitions[S]='failed';Z.openDialog(S,T);};if(typeof V=='string'){var ab=1;a.scriptLoader.load(a.getUrl(V),aa,null,0,1);}a.skins.load(this,'dialog',aa);return null;}});})();j.add('dialog',{requires:['dialogui']});j.add('styles',{requires:['selection'],init:function(m){m.on('contentDom',function(){m.document.setCustomData('cke_includeReadonly',!m.config.disableReadonlyStyling);});}});a.editor.prototype.attachStyleStateChange=function(m,n){var o=this._.styleStateChangeCallbacks;if(!o){o=this._.styleStateChangeCallbacks=[];this.on('selectionChange',function(p){for(var q=0;q<o.length;q++){var r=o[q],s=r.style.checkActive(p.data.path)?1:2;r.fn.call(this,s);}});}o.push({style:m,fn:n});};a.STYLE_BLOCK=1;a.STYLE_INLINE=2;a.STYLE_OBJECT=3;(function(){var m={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},n={a:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},o=/\s*(?:;\s*|$)/,p=/#\((.+?)\)/g,q=d.walker.bookmark(0,1),r=d.walker.whitespaces(1);a.style=function(T,U){var W=this;if(U){T=e.clone(T);L(T.attributes,U);L(T.styles,U);}var V=W.element=T.element?typeof T.element=='string'?T.element.toLowerCase():T.element:'*';W.type=m[V]?1:n[V]?3:2;if(typeof W.element=='object')W.type=3;W._={definition:T};};a.style.prototype={apply:function(T){S.call(this,T,false);},remove:function(T){S.call(this,T,true);},applyToRange:function(T){var U=this;return(U.applyToRange=U.type==2?t:U.type==1?x:U.type==3?v:null).call(U,T);},removeFromRange:function(T){var U=this;return(U.removeFromRange=U.type==2?u:U.type==1?y:U.type==3?w:null).call(U,T);},applyToObject:function(T){K(T,this);},checkActive:function(T){var Y=this;switch(Y.type){case 1:return Y.checkElementRemovable(T.block||T.blockLimit,true);case 3:case 2:var U=T.elements;
+for(var V=0,W;V<U.length;V++){W=U[V];if(Y.type==2&&(W==T.block||W==T.blockLimit))continue;if(Y.type==3){var X=W.getName();if(!(typeof Y.element=='string'?X==Y.element:X in Y.element))continue;}if(Y.checkElementRemovable(W,true))return true;}}return false;},checkApplicable:function(T){switch(this.type){case 2:case 1:break;case 3:return T.lastElement.getAscendant(this.element,true);}return true;},checkElementRemovable:function(T,U){var ae=this;var V=ae._.definition;if(!T||!V.ignoreReadonly&&T.isReadOnly())return false;var W,X=T.getName();if(typeof ae.element=='string'?X==ae.element:X in ae.element){if(!U&&!T.hasAttributes())return true;W=M(V);if(W._length){for(var Y in W){if(Y=='_length')continue;var Z=T.getAttribute(Y)||'';if(Y=='style'?R(W[Y],P(Z,false)):W[Y]==Z){if(!U)return true;}else if(U)return false;}if(U)return true;}else return true;}var aa=N(ae)[T.getName()];if(aa){if(!(W=aa.attributes))return true;for(var ab=0;ab<W.length;ab++){Y=W[ab][0];var ac=T.getAttribute(Y);if(ac){var ad=W[ab][1];if(ad===null||typeof ad=='string'&&ac==ad||ad.test(ac))return true;}}}return false;},buildPreview:function(T){var U=this._.definition,V=[],W=U.element;if(W=='bdo')W='span';V=['<',W];var X=U.attributes;if(X)for(var Y in X)V.push(' ',Y,'="',X[Y],'"');var Z=a.style.getStyleText(U);if(Z)V.push(' style="',Z,'"');V.push('>',T||U.name,'</',W,'>');return V.join('');}};a.style.getStyleText=function(T){var U=T._ST;if(U)return U;U=T.styles;var V=T.attributes&&T.attributes.style||'',W='';if(V.length)V=V.replace(o,';');for(var X in U){var Y=U[X],Z=(X+':'+Y).replace(o,';');if(Y=='inherit')W+=Z;else V+=Z;}if(V.length)V=P(V);V+=W;return T._ST=V;};function s(T){var U,V;while(T=T.getParent()){if(T.getName()=='body')break;if(T.getAttribute('data-nostyle'))U=T;else if(!V){var W=T.getAttribute('contentEditable');if(W=='false')U=T;else if(W=='true')V=1;}}return U;};function t(T){var ay=this;var U=T.document;if(T.collapsed){var V=J(ay,U);T.insertNode(V);T.moveToPosition(V,2);return;}var W=ay.element,X=ay._.definition,Y,Z=X.ignoreReadonly,aa=Z||X.includeReadonly;if(aa==undefined)aa=U.getCustomData('cke_includeReadonly');var ab=f[W]||(Y=true,f.span);T.enlarge(1,1);T.trim();var ac=T.createBookmark(),ad=ac.startNode,ae=ac.endNode,af=ad,ag;if(!Z){var ah=s(ad),ai=s(ae);if(ah)af=ah.getNextSourceNode(true);if(ai)ae=ai;}if(af.getPosition(ae)==2)af=0;while(af){var aj=false;if(af.equals(ae)){af=null;aj=true;}else{var ak=af.type,al=ak==1?af.getName():null,am=al&&af.getAttribute('contentEditable')=='false',an=al&&af.getAttribute('data-nostyle');
+if(al&&af.data('cke-bookmark')){af=af.getNextSourceNode(true);continue;}if(!al||ab[al]&&!an&&(!am||aa)&&(af.getPosition(ae)|4|0|8)==4+0+8&&(!X.childRule||X.childRule(af))){var ao=af.getParent();if(ao&&((ao.getDtd()||f.span)[W]||Y)&&(!X.parentRule||X.parentRule(ao))){if(!ag&&(!al||!f.$removeEmpty[al]||(af.getPosition(ae)|4|0|8)==4+0+8)){ag=new d.range(U);ag.setStartBefore(af);}if(ak==3||am||ak==1&&!af.getChildCount()){var ap=af,aq;while((aj=!ap.getNext(q))&&(aq=ap.getParent(),ab[aq.getName()])&&(aq.getPosition(ad)|2|0|8)==2+0+8&&(!X.childRule||X.childRule(aq)))ap=aq;ag.setEndAfter(ap);}}else aj=true;}else aj=true;af=af.getNextSourceNode(an||am);}if(aj&&ag&&!ag.collapsed){var ar=J(ay,U),as=ar.hasAttributes(),at=ag.getCommonAncestor(),au={styles:{},attrs:{},blockedStyles:{},blockedAttrs:{}},av,aw,ax;while(ar&&at){if(at.getName()==W){for(av in X.attributes){if(au.blockedAttrs[av]||!(ax=at.getAttribute(aw)))continue;if(ar.getAttribute(av)==ax)au.attrs[av]=1;else au.blockedAttrs[av]=1;}for(aw in X.styles){if(au.blockedStyles[aw]||!(ax=at.getStyle(aw)))continue;if(ar.getStyle(aw)==ax)au.styles[aw]=1;else au.blockedStyles[aw]=1;}}at=at.getParent();}for(av in au.attrs)ar.removeAttribute(av);for(aw in au.styles)ar.removeStyle(aw);if(as&&!ar.hasAttributes())ar=null;if(ar){ag.extractContents().appendTo(ar);G(ay,ar);ag.insertNode(ar);ar.mergeSiblings();if(!c)ar.$.normalize();}else{ar=new h('span');ag.extractContents().appendTo(ar);ag.insertNode(ar);G(ay,ar);ar.remove(true);}ag=null;}}T.moveToBookmark(ac);T.shrink(2);};function u(T){T.enlarge(1,1);var U=T.createBookmark(),V=U.startNode;if(T.collapsed){var W=new d.elementPath(V.getParent()),X;for(var Y=0,Z;Y<W.elements.length&&(Z=W.elements[Y]);Y++){if(Z==W.block||Z==W.blockLimit)break;if(this.checkElementRemovable(Z)){var aa;if(T.collapsed&&(T.checkBoundaryOfElement(Z,2)||(aa=T.checkBoundaryOfElement(Z,1)))){X=Z;X.match=aa?'start':'end';}else{Z.mergeSiblings();if(Z.getName()==this.element)F(this,Z);else H(Z,N(this)[Z.getName()]);}}}if(X){var ab=V;for(Y=0;true;Y++){var ac=W.elements[Y];if(ac.equals(X))break;else if(ac.match)continue;else ac=ac.clone();ac.append(ab);ab=ac;}ab[X.match=='start'?'insertBefore':'insertAfter'](X);}}else{var ad=U.endNode,ae=this;function af(){var ai=new d.elementPath(V.getParent()),aj=new d.elementPath(ad.getParent()),ak=null,al=null;for(var am=0;am<ai.elements.length;am++){var an=ai.elements[am];if(an==ai.block||an==ai.blockLimit)break;if(ae.checkElementRemovable(an))ak=an;}for(am=0;am<aj.elements.length;
+am++){an=aj.elements[am];if(an==aj.block||an==aj.blockLimit)break;if(ae.checkElementRemovable(an))al=an;}if(al)ad.breakParent(al);if(ak)V.breakParent(ak);};af();var ag=V;while(!ag.equals(ad)){var ah=ag.getNextSourceNode();if(ag.type==1&&this.checkElementRemovable(ag)){if(ag.getName()==this.element)F(this,ag);else H(ag,N(this)[ag.getName()]);if(ah.type==1&&ah.contains(V)){af();ah=V.getNext();}}ag=ah;}}T.moveToBookmark(U);};function v(T){var U=T.getCommonAncestor(true,true),V=U.getAscendant(this.element,true);V&&!V.isReadOnly()&&K(V,this);};function w(T){var U=T.getCommonAncestor(true,true),V=U.getAscendant(this.element,true);if(!V)return;var W=this,X=W._.definition,Y=X.attributes;if(Y)for(var Z in Y)V.removeAttribute(Z,Y[Z]);if(X.styles)for(var aa in X.styles){if(!X.styles.hasOwnProperty(aa))continue;V.removeStyle(aa);}};function x(T){var U=T.createBookmark(true),V=T.createIterator();V.enforceRealBlocks=true;if(this._.enterMode)V.enlargeBr=this._.enterMode!=2;var W,X=T.document,Y;while(W=V.getNextParagraph()){if(!W.isReadOnly()){var Z=J(this,X,W);z(W,Z);}}T.moveToBookmark(U);};function y(T){var Y=this;var U=T.createBookmark(1),V=T.createIterator();V.enforceRealBlocks=true;V.enlargeBr=Y._.enterMode!=2;var W;while(W=V.getNextParagraph()){if(Y.checkElementRemovable(W))if(W.is('pre')){var X=Y._.enterMode==2?null:T.document.createElement(Y._.enterMode==1?'p':'div');X&&W.copyAttributes(X);z(W,X);}else F(Y,W,1);}T.moveToBookmark(U);};function z(T,U){var V=!U;if(V){U=T.getDocument().createElement('div');T.copyAttributes(U);}var W=U&&U.is('pre'),X=T.is('pre'),Y=W&&!X,Z=!W&&X;if(Y)U=E(T,U);else if(Z)U=D(V?[T.getHtml()]:B(T),U);else T.moveChildren(U);U.replace(T);if(W)A(U);else if(V)I(U);};function A(T){var U;if(!((U=T.getPrevious(r))&&U.is&&U.is('pre')))return;var V=C(U.getHtml(),/\n$/,'')+'\n\n'+C(T.getHtml(),/^\n/,'');if(c)T.$.outerHTML='<pre>'+V+'</pre>';else T.setHtml(V);U.remove();};function B(T){var U=/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,V=T.getName(),W=C(T.getOuterHtml(),U,function(Y,Z,aa){return Z+'</pre>'+aa+'<pre>';}),X=[];W.replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(Y,Z){X.push(Z);});return X;};function C(T,U,V){var W='',X='';T=T.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(Y,Z,aa){Z&&(W=Z);aa&&(X=aa);return '';});return W+T.replace(U,V)+X;};function D(T,U){var V;if(T.length>1)V=new d.documentFragment(U.getDocument());for(var W=0;W<T.length;W++){var X=T[W];X=X.replace(/(\r\n|\r)/g,'\n');
+X=C(X,/^[ \t]*\n/,'');X=C(X,/\n$/,'');X=C(X,/^[ \t]+|[ \t]+$/g,function(Z,aa,ab){if(Z.length==1)return ' ';else if(!aa)return e.repeat(' ',Z.length-1)+' ';else return ' '+e.repeat(' ',Z.length-1);});X=X.replace(/\n/g,'<br>');X=X.replace(/[ \t]{2,}/g,function(Z){return e.repeat(' ',Z.length-1)+' ';});if(V){var Y=U.clone();Y.setHtml(X);V.append(Y);}else U.setHtml(X);}return V||U;};function E(T,U){var V=T.getBogus();V&&V.remove();var W=T.getHtml();W=C(W,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,'');W=W.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,'$1');W=W.replace(/([ \t\n\r]+| )/g,' ');W=W.replace(/<br\b[^>]*>/gi,'\n');if(c){var X=T.getDocument().createElement('div');X.append(U);U.$.outerHTML='<pre>'+W+'</pre>';U.copyAttributes(X.getFirst());U=X.getFirst().remove();}else U.setHtml(W);return U;};function F(T,U){var V=T._.definition,W=V.attributes,X=V.styles,Y=N(T)[U.getName()],Z=e.isEmpty(W)&&e.isEmpty(X);for(var aa in W){if((aa=='class'||T._.definition.fullMatch)&&U.getAttribute(aa)!=O(aa,W[aa]))continue;Z=U.hasAttribute(aa);U.removeAttribute(aa);}for(var ab in X){if(T._.definition.fullMatch&&U.getStyle(ab)!=O(ab,X[ab],true))continue;Z=Z||!!U.getStyle(ab);U.removeStyle(ab);}H(U,Y,m[U.getName()]);if(Z)!f.$block[U.getName()]||T._.enterMode==2&&!U.hasAttributes()?I(U):U.renameNode(T._.enterMode==1?'p':'div');};function G(T,U){var V=T._.definition,W=V.attributes,X=V.styles,Y=N(T),Z=U.getElementsByTag(T.element);for(var aa=Z.count();--aa>=0;)F(T,Z.getItem(aa));for(var ab in Y){if(ab!=T.element){Z=U.getElementsByTag(ab);for(aa=Z.count()-1;aa>=0;aa--){var ac=Z.getItem(aa);H(ac,Y[ab]);}}}};function H(T,U,V){var W=U&&U.attributes;if(W)for(var X=0;X<W.length;X++){var Y=W[X][0],Z;if(Z=T.getAttribute(Y)){var aa=W[X][1];if(aa===null||aa.test&&aa.test(Z)||typeof aa=='string'&&Z==aa)T.removeAttribute(Y);}}if(!V)I(T);};function I(T){if(!T.hasAttributes())if(f.$block[T.getName()]){var U=T.getPrevious(r),V=T.getNext(r);if(U&&(U.type==3||!U.isBlockBoundary({br:1})))T.append('br',1);if(V&&(V.type==3||!V.isBlockBoundary({br:1})))T.append('br');T.remove(true);}else{var W=T.getFirst(),X=T.getLast();T.remove(true);if(W){W.type==1&&W.mergeSiblings();if(X&&!W.equals(X)&&X.type==1)X.mergeSiblings();}}};function J(T,U,V){var W,X=T._.definition,Y=T.element;if(Y=='*')Y='span';W=new h(Y,U);if(V)V.copyAttributes(W);W=K(W,T);if(U.getCustomData('doc_processing_style')&&W.hasAttribute('id'))W.removeAttribute('id');else U.setCustomData('doc_processing_style',1);return W;};function K(T,U){var V=U._.definition,W=V.attributes,X=a.style.getStyleText(V);
+if(W)for(var Y in W)T.setAttribute(Y,W[Y]);if(X)T.setAttribute('style',X);return T;};function L(T,U){for(var V in T)T[V]=T[V].replace(p,function(W,X){return U[X];});};function M(T){var U=T._AC;if(U)return U;U={};var V=0,W=T.attributes;if(W)for(var X in W){V++;U[X]=W[X];}var Y=a.style.getStyleText(T);if(Y){if(!U.style)V++;U.style=Y;}U._length=V;return T._AC=U;};function N(T){if(T._.overrides)return T._.overrides;var U=T._.overrides={},V=T._.definition.overrides;if(V){if(!e.isArray(V))V=[V];for(var W=0;W<V.length;W++){var X=V[W],Y,Z,aa;if(typeof X=='string')Y=X.toLowerCase();else{Y=X.element?X.element.toLowerCase():T.element;aa=X.attributes;}Z=U[Y]||(U[Y]={});if(aa){var ab=Z.attributes=Z.attributes||[];for(var ac in aa)ab.push([ac.toLowerCase(),aa[ac]]);}}}return U;};function O(T,U,V){var W=new h('span');W[V?'setStyle':'setAttribute'](T,U);return W[V?'getStyle':'getAttribute'](T);};function P(T,U){var V;if(U!==false){var W=new h('span');W.setAttribute('style',T);V=W.getAttribute('style')||'';}else V=T;V=V.replace(/(font-family:)(.*?)(?=;|$)/,function(X,Y,Z){var aa=Z.split(',');for(var ab=0;ab<aa.length;ab++)aa[ab]=e.trim(aa[ab].replace(/["']/g,''));return Y+aa.join(',');});return V.replace(/\s*([;:])\s*/,'$1').replace(/([^\s;])$/,'$1;').replace(/,\s+/g,',').replace(/\"/g,'').toLowerCase();};function Q(T){var U={};T.replace(/"/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(V,W,X){U[W]=X;});return U;};function R(T,U){typeof T=='string'&&(T=Q(T));typeof U=='string'&&(U=Q(U));for(var V in T){if(!(V in U&&(U[V]==T[V]||T[V]=='inherit'||U[V]=='inherit')))return false;}return true;};function S(T,U){var V=T.getSelection(),W=V.createBookmarks(1),X=V.getRanges(),Y=U?this.removeFromRange:this.applyToRange,Z,aa=X.createIterator();while(Z=aa.getNextRange())Y.call(this,Z);if(W.length==1&&W[0].collapsed){V.selectRanges(X);T.getById(W[0].startNode).remove();}else V.selectBookmarks(W);T.removeCustomData('doc_processing_style');};})();a.styleCommand=function(m){this.style=m;};a.styleCommand.prototype.exec=function(m){var o=this;m.focus();var n=m.document;if(n)if(o.state==2)o.style.apply(n);else if(o.state==1)o.style.remove(n);return!!n;};a.stylesSet=new a.resourceManager('','stylesSet');a.addStylesSet=e.bind(a.stylesSet.add,a.stylesSet);a.loadStylesSet=function(m,n,o){a.stylesSet.addExternal(m,n,'');a.stylesSet.load(m,o);};a.editor.prototype.getStylesSet=function(m){if(!this._.stylesDefinitions){var n=this,o=n.config.stylesCombo_stylesSet||n.config.stylesSet||'default';
+if(o instanceof Array){n._.stylesDefinitions=o;m(o);return;}var p=o.split(':'),q=p[0],r=p[1],s=j.registered.styles.path;a.stylesSet.addExternal(q,r?p.slice(1).join(':'):s+'styles/'+q+'.js','');a.stylesSet.load(q,function(t){n._.stylesDefinitions=t[q];m(n._.stylesDefinitions);});}else m(this._.stylesDefinitions);};j.add('domiterator');(function(){function m(s){var t=this;if(arguments.length<1)return;t.range=s;t.forceBrBreak=0;t.enlargeBr=1;t.enforceRealBlocks=0;t._||(t._={});};var n=/^[\r\n\t ]+$/,o=d.walker.bookmark(false,true),p=d.walker.whitespaces(true),q=function(s){return o(s)&&p(s);};function r(s,t,u){var v=s.getNextSourceNode(t,null,u);while(!o(v))v=v.getNextSourceNode(t,null,u);return v;};m.prototype={getNextParagraph:function(s){var S=this;var t,u,v,w,x,y;if(!S._.started){u=S.range.clone();u.shrink(1,true);w=u.endContainer.hasAscendant('pre',true)||u.startContainer.hasAscendant('pre',true);u.enlarge(S.forceBrBreak&&!w||!S.enlargeBr?3:2);if(!u.collapsed){var z=new d.walker(u.clone()),A=d.walker.bookmark(true,true);z.evaluator=A;S._.nextNode=z.next();z=new d.walker(u.clone());z.evaluator=A;var B=z.previous();S._.lastNode=B.getNextSourceNode(true);if(S._.lastNode&&S._.lastNode.type==3&&!e.trim(S._.lastNode.getText())&&S._.lastNode.getParent().isBlockBoundary()){var C=new d.range(u.document);C.moveToPosition(S._.lastNode,4);if(C.checkEndOfBlock()){var D=new d.elementPath(C.endContainer),E=D.block||D.blockLimit;S._.lastNode=E.getNextSourceNode(true);}}if(!S._.lastNode){S._.lastNode=S._.docEndMarker=u.document.createText('');S._.lastNode.insertAfter(B);}u=null;}S._.started=1;}var F=S._.nextNode;B=S._.lastNode;S._.nextNode=null;while(F){var G=0,H=F.hasAscendant('pre'),I=F.type!=1,J=0;if(!I){var K=F.getName();if(F.isBlockBoundary(S.forceBrBreak&&!H&&{br:1})){if(K=='br')I=1;else if(!u&&!F.getChildCount()&&K!='hr'){t=F;v=F.equals(B);break;}if(u){u.setEndAt(F,3);if(K!='br')S._.nextNode=F;}G=1;}else{if(F.getFirst()){if(!u){u=new d.range(S.range.document);u.setStartAt(F,3);}F=F.getFirst();continue;}I=1;}}else if(F.type==3)if(n.test(F.getText()))I=0;if(I&&!u){u=new d.range(S.range.document);u.setStartAt(F,3);}v=(!G||I)&&F.equals(B);if(u&&!G)while(!F.getNext(q)&&!v){var L=F.getParent();if(L.isBlockBoundary(S.forceBrBreak&&!H&&{br:1})){G=1;I=0;v=v||L.equals(B);u.setEndAt(L,2);break;}F=L;I=1;v=F.equals(B);J=1;}if(I)u.setEndAt(F,4);F=r(F,J,B);v=!F;if(v||G&&u)break;}if(!t){if(!u){S._.docEndMarker&&S._.docEndMarker.remove();S._.nextNode=null;return null;}var M=new d.elementPath(u.startContainer),N=M.blockLimit,O={div:1,th:1,td:1};
+t=M.block;if(!t&&!S.enforceRealBlocks&&O[N.getName()]&&u.checkStartOfBlock()&&u.checkEndOfBlock())t=N;else if(!t||S.enforceRealBlocks&&t.getName()=='li'){t=S.range.document.createElement(s||'p');u.extractContents().appendTo(t);t.trim();u.insertNode(t);x=y=true;}else if(t.getName()!='li'){if(!u.checkStartOfBlock()||!u.checkEndOfBlock()){t=t.clone(false);u.extractContents().appendTo(t);t.trim();var P=u.splitBlock();x=!P.wasStartOfBlock;y=!P.wasEndOfBlock;u.insertNode(t);}}else if(!v)S._.nextNode=t.equals(B)?null:r(u.getBoundaryNodes().endNode,1,B);}if(x){var Q=t.getPrevious();if(Q&&Q.type==1)if(Q.getName()=='br')Q.remove();else if(Q.getLast()&&Q.getLast().$.nodeName.toLowerCase()=='br')Q.getLast().remove();}if(y){var R=t.getLast();if(R&&R.type==1&&R.getName()=='br')if(c||R.getPrevious(o)||R.getNext(o))R.remove();}if(!S._.nextNode)S._.nextNode=v||t.equals(B)||!B?null:r(t,1,B);return t;}};d.range.prototype.createIterator=function(){return new m(this);};})();j.add('panelbutton',{requires:['button'],onLoad:function(){function m(n){var p=this;var o=p._;if(o.state==0)return;p.createPanel(n);if(o.on){o.panel.hide();return;}o.panel.showBlock(p._.id,p.document.getById(p._.id),4);};k.panelButton=e.createClass({base:k.button,$:function(n){var p=this;var o=n.panel;delete n.panel;p.base(n);p.document=o&&o.parent&&o.parent.getDocument()||a.document;o.block={attributes:o.attributes};p.hasArrow=true;p.click=m;p._={panelDefinition:o};},statics:{handler:{create:function(n){return new k.panelButton(n);}}},proto:{createPanel:function(n){var o=this._;if(o.panel)return;var p=this._.panelDefinition||{},q=this._.panelDefinition.block,r=p.parent||a.document.getBody(),s=this._.panel=new k.floatPanel(n,r,p),t=s.addBlock(o.id,q),u=this;s.onShow=function(){if(u.className)this.element.getFirst().addClass(u.className+'_panel');u.setState(1);o.on=1;if(u.onOpen)u.onOpen();};s.onHide=function(v){if(u.className)this.element.getFirst().removeClass(u.className+'_panel');u.setState(u.modes&&u.modes[n.mode]?2:0);o.on=0;if(!v&&u.onClose)u.onClose();};s.onEscape=function(){s.hide();u.document.getById(o.id).focus();};if(this.onBlock)this.onBlock(s,t);t.onHide=function(){o.on=0;u.setState(2);};}}});},beforeInit:function(m){m.ui.addHandler('panelbutton',k.panelButton.handler);}});a.UI_PANELBUTTON='panelbutton';j.add('floatpanel',{requires:['panel']});(function(){var m={},n=false;function o(p,q,r,s,t){var u=e.genKey(q.getUniqueId(),r.getUniqueId(),p.skinName,p.lang.dir,p.uiColor||'',s.css||'',t||''),v=m[u];
+if(!v){v=m[u]=new k.panel(q,s);v.element=r.append(h.createFromHtml(v.renderHtml(p),q));v.element.setStyles({display:'none',position:'absolute'});}return v;};k.floatPanel=e.createClass({$:function(p,q,r,s){r.forceIFrame=1;var t=q.getDocument(),u=o(p,t,q,r,s||0),v=u.element,w=v.getFirst().getFirst();v.disableContextMenu();this.element=v;this._={editor:p,panel:u,parentElement:q,definition:r,document:t,iframe:w,children:[],dir:p.lang.dir};p.on('mode',function(){this.hide();},this);},proto:{addBlock:function(p,q){return this._.panel.addBlock(p,q);},addListBlock:function(p,q){return this._.panel.addListBlock(p,q);},getBlock:function(p){return this._.panel.getBlock(p);},showBlock:function(p,q,r,s,t){var u=this._.panel,v=u.showBlock(p);this.allowBlur(false);n=1;this._.returnFocus=this._.editor.focusManager.hasFocus?this._.editor:new h(a.document.$.activeElement);var w=this.element,x=this._.iframe,y=this._.definition,z=q.getDocumentPosition(w.getDocument()),A=this._.dir=='rtl',B=z.x+(s||0),C=z.y+(t||0);if(A&&(r==1||r==4))B+=q.$.offsetWidth;else if(!A&&(r==2||r==3))B+=q.$.offsetWidth-1;if(r==3||r==4)C+=q.$.offsetHeight-1;this._.panel._.offsetParentId=q.getId();w.setStyles({top:C+'px',left:0,display:''});w.setOpacity(0);w.getFirst().removeStyle('width');if(!this._.blurSet){var D=c?x:new d.window(x.$.contentWindow);a.event.useCapture=true;D.on('blur',function(E){var G=this;if(!G.allowBlur())return;var F=E.data.getTarget();if(F.getName&&F.getName()!='iframe')return;if(G.visible&&!G._.activeChild&&!n){delete G._.returnFocus;G.hide();}},this);D.on('focus',function(){this._.focused=true;this.hideChild();this.allowBlur(true);},this);a.event.useCapture=false;this._.blurSet=1;}u.onEscape=e.bind(function(E){if(this.onEscape&&this.onEscape(E)===false)return false;},this);e.setTimeout(function(){var E=e.bind(function(){var F=w.getFirst();if(v.autoSize){var G=v.element.$;if(b.gecko||b.opera)G=G.parentNode;if(c)G=G.document.body;var H=G.scrollWidth;if(c&&b.quirks&&H>0)H+=(F.$.offsetWidth||0)-(F.$.clientWidth||0)+3;H+=4;F.setStyle('width',H+'px');v.element.addClass('cke_frameLoaded');var I=v.element.$.scrollHeight;if(c&&b.quirks&&I>0)I+=(F.$.offsetHeight||0)-(F.$.clientHeight||0)+3;F.setStyle('height',I+'px');u._.currentBlock.element.setStyle('display','none').removeStyle('display');}else F.removeStyle('height');if(A)B-=w.$.offsetWidth;w.setStyle('left',B+'px');var J=u.element,K=J.getWindow(),L=w.$.getBoundingClientRect(),M=K.getViewPaneSize(),N=L.width||L.right-L.left,O=L.height||L.bottom-L.top,P=A?L.right:M.width-L.left,Q=A?M.width-L.right:L.left;
+if(A){if(P<N)if(Q>N)B+=N;else if(M.width>N)B-=L.left;else B=B-L.right+M.width;}else if(P<N)if(Q>N)B-=N;else if(M.width>N)B=B-L.right+M.width;else B-=L.left;var R=M.height-L.top,S=L.top;if(R<O)if(S>O)C-=O;else if(M.height>O)C=C-L.bottom+M.height;else C-=L.top;if(c){var T=new h(w.$.offsetParent),U=T;if(U.getName()=='html')U=U.getDocument().getBody();if(U.getComputedStyle('direction')=='rtl')if(b.ie8Compat)B-=w.getDocument().getDocumentElement().$.scrollLeft*2;else B-=T.$.scrollWidth-T.$.clientWidth;}var V=w.getFirst(),W;if(W=V.getCustomData('activePanel'))W.onHide&&W.onHide.call(this,1);V.setCustomData('activePanel',this);w.setStyles({top:C+'px',left:B+'px'});w.setOpacity(1);},this);u.isLoaded?E():u.onLoad=E;e.setTimeout(function(){x.$.contentWindow.focus();this.allowBlur(true);},0,this);},b.air?200:0,this);this.visible=1;if(this.onShow)this.onShow.call(this);n=0;},hide:function(p){var r=this;if(r.visible&&(!r.onHide||r.onHide.call(r)!==true)){r.hideChild();b.gecko&&r._.iframe.getFrameDocument().$.activeElement.blur();r.element.setStyle('display','none');r.visible=0;r.element.getFirst().removeCustomData('activePanel');var q=p!==false&&r._.returnFocus;if(q){if(b.webkit&&q.type)q.getWindow().$.focus();q.focus();}}},allowBlur:function(p){var q=this._.panel;if(p!=undefined)q.allowBlur=p;return q.allowBlur;},showAsChild:function(p,q,r,s,t,u){if(this._.activeChild==p&&p._.panel._.offsetParentId==r.getId())return;this.hideChild();p.onHide=e.bind(function(){e.setTimeout(function(){if(!this._.focused)this.hide();},0,this);},this);this._.activeChild=p;this._.focused=false;p.showBlock(q,r,s,t,u);if(b.ie7Compat||b.ie8&&b.ie6Compat)setTimeout(function(){p.element.getChild(0).$.style.cssText+='';},100);},hideChild:function(){var p=this._.activeChild;if(p){delete p.onHide;delete p._.returnFocus;delete this._.activeChild;p.hide();}}}});a.on('instanceDestroyed',function(){var p=e.isEmpty(a.instances);for(var q in m){var r=m[q];if(p)r.destroy();else r.element.hide();}p&&(m={});});})();j.add('menu',{beforeInit:function(m){var n=m.config.menu_groups.split(','),o=m._.menuGroups={},p=m._.menuItems={};for(var q=0;q<n.length;q++)o[n[q]]=q+1;m.addMenuGroup=function(r,s){o[r]=s||100;};m.addMenuItem=function(r,s){if(o[s.group])p[r]=new a.menuItem(this,r,s);};m.addMenuItems=function(r){for(var s in r)this.addMenuItem(s,r[s]);};m.getMenuItem=function(r){return p[r];};m.removeMenuItem=function(r){delete p[r];};},requires:['floatpanel']});(function(){a.menu=e.createClass({$:function(n,o){var r=this;
+o=r._.definition=o||{};r.id=e.getNextId();r.editor=n;r.items=[];r._.listeners=[];r._.level=o.level||1;var p=e.extend({},o.panel,{css:n.skin.editor.css,level:r._.level-1,block:{}}),q=p.block.attributes=p.attributes||{};!q.role&&(q.role='menu');r._.panelDefinition=p;},_:{onShow:function(){var v=this;var n=v.editor.getSelection();if(c)n&&n.lock();var o=n&&n.getStartElement(),p=v._.listeners,q=[];v.removeAll();for(var r=0;r<p.length;r++){var s=p[r](o,n);if(s)for(var t in s){var u=v.editor.getMenuItem(t);if(u&&(!u.command||v.editor.getCommand(u.command).state)){u.state=s[t];v.add(u);}}}},onClick:function(n){this.hide(false);if(n.onClick)n.onClick();else if(n.command)this.editor.execCommand(n.command);},onEscape:function(n){var o=this.parent;if(o){o._.panel.hideChild();var p=o._.panel._.panel._.currentBlock,q=p._.focusIndex;p._.markItem(q);}else if(n==27)this.hide();return false;},onHide:function(){var o=this;if(c&&!o.parent){var n=o.editor.getSelection();n&&n.unlock(true);}o.onHide&&o.onHide();},showSubMenu:function(n){var v=this;var o=v._.subMenu,p=v.items[n],q=p.getItems&&p.getItems();if(!q){v._.panel.hideChild();return;}var r=v._.panel.getBlock(v.id);r._.focusIndex=n;if(o)o.removeAll();else{o=v._.subMenu=new a.menu(v.editor,e.extend({},v._.definition,{level:v._.level+1},true));o.parent=v;o._.onClick=e.bind(v._.onClick,v);}for(var s in q){var t=v.editor.getMenuItem(s);if(t){t.state=q[s];o.add(t);}}var u=v._.panel.getBlock(v.id).element.getDocument().getById(v.id+String(n));o.show(u,2);}},proto:{add:function(n){if(!n.order)n.order=this.items.length;this.items.push(n);},removeAll:function(){this.items=[];},show:function(n,o,p,q){if(!this.parent){this._.onShow();if(!this.items.length)return;}o=o||(this.editor.lang.dir=='rtl'?2:1);var r=this.items,s=this.editor,t=this._.panel,u=this._.element;if(!t){t=this._.panel=new k.floatPanel(this.editor,a.document.getBody(),this._.panelDefinition,this._.level);t.onEscape=e.bind(function(F){if(this._.onEscape(F)===false)return false;},this);t.onHide=e.bind(function(){this._.onHide&&this._.onHide();},this);var v=t.addBlock(this.id,this._.panelDefinition.block);v.autoSize=true;var w=v.keys;w[40]='next';w[9]='next';w[38]='prev';w[2228224+9]='prev';w[s.lang.dir=='rtl'?37:39]=c?'mouseup':'click';w[32]=c?'mouseup':'click';c&&(w[13]='mouseup');u=this._.element=v.element;u.addClass(s.skinClass);var x=u.getDocument();x.getBody().setStyle('overflow','hidden');x.getElementsByTag('html').getItem(0).setStyle('overflow','hidden');this._.itemOverFn=e.addFunction(function(F){var G=this;
+clearTimeout(G._.showSubTimeout);G._.showSubTimeout=e.setTimeout(G._.showSubMenu,s.config.menu_subMenuDelay||400,G,[F]);},this);this._.itemOutFn=e.addFunction(function(F){clearTimeout(this._.showSubTimeout);},this);this._.itemClickFn=e.addFunction(function(F){var H=this;var G=H.items[F];if(G.state==0){H.hide();return;}if(G.getItems)H._.showSubMenu(F);else H._.onClick(G);},this);}m(r);var y=s.container.getChild(1),z=y.hasClass('cke_mixed_dir_content')?' cke_mixed_dir_content':'',A=['<div class="cke_menu'+z+'" role="presentation">'],B=r.length,C=B&&r[0].group;for(var D=0;D<B;D++){var E=r[D];if(C!=E.group){A.push('<div class="cke_menuseparator" role="separator"></div>');C=E.group;}E.render(this,D,A);}A.push('</div>');u.setHtml(A.join(''));k.fire('ready',this);if(this.parent)this.parent._.panel.showAsChild(t,this.id,n,o,p,q);else t.showBlock(this.id,n,o,p,q);s.fire('menuShow',[t]);},addListener:function(n){this._.listeners.push(n);},hide:function(n){var o=this;o._.onHide&&o._.onHide();o._.panel&&o._.panel.hide(n);}}});function m(n){n.sort(function(o,p){if(o.group<p.group)return-1;else if(o.group>p.group)return 1;return o.order<p.order?-1:o.order>p.order?1:0;});};a.menuItem=e.createClass({$:function(n,o,p){var q=this;e.extend(q,p,{order:0,className:'cke_button_'+o});q.group=n._.menuGroups[q.group];q.editor=n;q.name=o;},proto:{render:function(n,o,p){var w=this;var q=n.id+String(o),r=typeof w.state=='undefined'?2:w.state,s=' cke_'+(r==1?'on':r==0?'disabled':'off'),t=w.label;if(w.className)s+=' '+w.className;var u=w.getItems;p.push('<span class="cke_menuitem'+(w.icon&&w.icon.indexOf('.png')==-1?' cke_noalphafix':'')+'">'+'<a id="',q,'" class="',s,'" href="javascript:void(\'',(w.label||'').replace("'",''),'\')" title="',w.label,'" tabindex="-1"_cke_focus=1 hidefocus="true" role="menuitem"'+(u?'aria-haspopup="true"':'')+(r==0?'aria-disabled="true"':'')+(r==1?'aria-pressed="true"':''));if(b.opera||b.gecko&&b.mac)p.push(' onkeypress="return false;"');if(b.gecko)p.push(' onblur="this.style.cssText = this.style.cssText;"');var v=(w.iconOffset||0)*-16;p.push(' onmouseover="CKEDITOR.tools.callFunction(',n._.itemOverFn,',',o,');" onmouseout="CKEDITOR.tools.callFunction(',n._.itemOutFn,',',o,');" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',n._.itemClickFn,',',o,'); return false;"><span class="cke_icon_wrapper"><span class="cke_icon"'+(w.icon?' style="background-image:url('+a.getUrl(w.icon)+');background-position:0 '+v+'px;"':'')+'></span></span>'+'<span class="cke_label">');
+if(u)p.push('<span class="cke_menuarrow">','<span>&#',w.editor.lang.dir=='rtl'?'9668':'9658',';</span>','</span>');p.push(t,'</span></a></span>');}}});})();i.menu_groups='clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div';(function(){var m;j.add('editingblock',{init:function(n){if(!n.config.editingBlock)return;n.on('themeSpace',function(o){if(o.data.space=='contents')o.data.html+='<br>';});n.on('themeLoaded',function(){n.fireOnce('editingBlockReady');});n.on('uiReady',function(){n.setMode(n.config.startupMode);});n.on('afterSetData',function(){if(!m){function o(){m=true;n.getMode().loadData(n.getData());m=false;};if(n.mode)o();else n.on('mode',function(){if(n.mode){o();n.removeListener('mode',arguments.callee);}});}});n.on('beforeGetData',function(){if(!m&&n.mode){m=true;n.setData(n.getMode().getData(),null,1);m=false;}});n.on('getSnapshot',function(o){if(n.mode)o.data=n.getMode().getSnapshotData();});n.on('loadSnapshot',function(o){if(n.mode)n.getMode().loadSnapshotData(o.data);});n.on('mode',function(o){o.removeListener();b.webkit&&n.container.on('focus',function(){n.focus();});if(n.config.startupFocus)n.focus();setTimeout(function(){n.fireOnce('instanceReady');a.fire('instanceReady',null,n);},0);});n.on('destroy',function(){var o=this;if(o.mode)o._.modes[o.mode].unload(o.getThemeSpace('contents'));});}});a.editor.prototype.mode='';a.editor.prototype.addMode=function(n,o){o.name=n;(this._.modes||(this._.modes={}))[n]=o;};a.editor.prototype.setMode=function(n){this.fire('beforeSetMode',{newMode:n});var o,p=this.getThemeSpace('contents'),q=this.checkDirty();if(this.mode){if(n==this.mode)return;this._.previousMode=this.mode;this.fire('beforeModeUnload');var r=this.getMode();o=r.getData();r.unload(p);this.mode='';}p.setHtml('');var s=this.getMode(n);if(!s)throw '[CKEDITOR.editor.setMode] Unknown mode "'+n+'".';if(!q)this.on('mode',function(){this.resetDirty();this.removeListener('mode',arguments.callee);});s.load(p,typeof o!='string'?this.getData():o);};a.editor.prototype.getMode=function(n){return this._.modes&&this._.modes[n||this.mode];};a.editor.prototype.focus=function(){this.forceNextSelectionCheck();var n=this.getMode();if(n)n.focus();};})();i.startupMode='wysiwyg';i.editingBlock=true;(function(){function m(){var C=this;try{var z=C.getSelection();if(!z||!z.document.getWindow().$)return;var A=z.getStartElement(),B=new d.elementPath(A);
+if(!B.compare(C._.selectionPreviousPath)){C._.selectionPreviousPath=B;C.fire('selectionChange',{selection:z,path:B,element:A});}}catch(D){}};var n,o;function p(){o=true;if(n)return;q.call(this);n=e.setTimeout(q,200,this);};function q(){n=null;if(o){e.setTimeout(m,0,this);o=false;}};function r(z){function A(E){return E&&E.type==1&&E.getName() in f.$removeEmpty;};function B(E){var F=z.document.getBody();return!E.is('body')&&F.getChildCount()==1;};var C=z.startContainer,D=z.startOffset;if(C.type==3)return false;return!e.trim(C.getHtml())?A(C)||B(C):A(C.getChild(D-1))||A(C.getChild(D));};var s={modes:{wysiwyg:1,source:1},readOnly:c||b.webkit,exec:function(z){switch(z.mode){case 'wysiwyg':z.document.$.execCommand('SelectAll',false,null);z.forceNextSelectionCheck();z.selectionChange();break;case 'source':var A=z.textarea.$;if(c)A.createTextRange().execCommand('SelectAll');else{A.selectionStart=0;A.selectionEnd=A.value.length;}A.focus();}},canUndo:false};function t(z){w(z);var A=z.createText('​');z.setCustomData('cke-fillingChar',A);return A;};function u(z){return z&&z.getCustomData('cke-fillingChar');};function v(z){var A=z&&u(z);if(A)if(A.getCustomData('ready'))w(z);else A.setCustomData('ready',1);};function w(z){var A=z&&z.removeCustomData('cke-fillingChar');if(A){var B,C=z.getSelection().getNative(),D=C&&C.type!='None'&&C.getRangeAt(0);if(A.getLength()>1&&D&&D.intersectsNode(A.$)){B=[C.anchorOffset,C.focusOffset];var E=C.anchorNode==A.$&&C.anchorOffset>0,F=C.focusNode==A.$&&C.focusOffset>0;E&&B[0]--;F&&B[1]--;x(C)&&B.unshift(B.pop());}A.setText(A.getText().replace(/\u200B/g,''));if(B){var G=C.getRangeAt(0);G.setStart(G.startContainer,B[0]);G.setEnd(G.startContainer,B[1]);C.removeAllRanges();C.addRange(G);}}};function x(z){if(!z.isCollapsed){var A=z.getRangeAt(0);A.setStart(z.anchorNode,z.anchorOffset);A.setEnd(z.focusNode,z.focusOffset);return A.collapsed;}};j.add('selection',{init:function(z){if(b.webkit){z.on('selectionChange',function(){v(z.document);});z.on('beforeSetMode',function(){w(z.document);});var A,B;function C(){var E=z.document,F=u(E);if(F){var G=E.$.defaultView.getSelection();if(G.type=='Caret'&&G.anchorNode==F.$)B=1;A=F.getText();F.setText(A.replace(/\u200B/g,''));}};function D(){var E=z.document,F=u(E);if(F){F.setText(A);if(B){E.$.defaultView.getSelection().setPosition(F.$,F.getLength());B=0;}}};z.on('beforeUndoImage',C);z.on('afterUndoImage',D);z.on('beforeGetData',C,null,null,0);z.on('getData',D);}z.on('contentDom',function(){var E=z.document,F=E.getBody(),G=E.getDocumentElement();
+if(c){var H,I,J=1;F.on('focusin',function(N){if(N.data.$.srcElement.nodeName!='BODY')return;var O=E.getCustomData('cke_locked_selection');if(O){O.unlock(1);O.lock();}else if(H&&J){try{H.select();}catch(P){}H=null;}});F.on('focus',function(){I=1;M();});F.on('beforedeactivate',function(N){if(N.data.$.toElement)return;I=0;J=1;});c&&z.on('blur',function(){try{E.$.selection.empty();}catch(N){}});G.on('mousedown',function(){J=0;});G.on('mouseup',function(){J=1;});var K;F.on('mousedown',function(N){if(N.data.$.button==2){var O=z.document.$.selection;if(O.type=='None')K=z.window.getScrollPosition();}L();});F.on('mouseup',function(N){if(N.data.$.button==2&&K){z.document.$.documentElement.scrollLeft=K.x;z.document.$.documentElement.scrollTop=K.y;}K=null;I=1;setTimeout(function(){M(true);},0);});F.on('keydown',L);F.on('keyup',function(){I=1;M();});if((b.ie7Compat||b.ie6Compat)&&E.$.compatMode!='BackCompat')G.on('mousedown',function(N){N=N.data.$;function O(Q){Q=Q.data.$;if(P){var R=F.$.createTextRange();R.moveToPoint(Q.x,Q.y);P.setEndPoint(P.compareEndPoints('StartToStart',R)<0?'EndToEnd':'StartToStart',R);P.select();}};if(N.y<G.$.clientHeight&&N.y>F.$.offsetTop+F.$.clientHeight&&N.x<G.$.clientWidth){var P=F.$.createTextRange();P.moveToPoint(N.x,N.y);P.select();G.on('mousemove',O);G.on('mouseup',function(Q){G.removeListener('mousemove',O);Q.removeListener();P.select();P=null;});}});if(b.ie8)G.on('mouseup',function(N){if(N.data.getTarget().getName()=='html'){var O=a.document.$.selection,P=O.createRange();if(O.type!='None'&&P.parentElement().ownerDocument==E.$)P.select();}});E.on('selectionchange',M);function L(){I=0;};function M(N){if(I){var O=z.document,P=z.getSelection(),Q=P&&P.getNative();if(N&&Q&&Q.type=='None')if(!O.$.queryCommandEnabled('InsertImage')){e.setTimeout(M,50,this,true);return;}var R;if(Q&&Q.type&&Q.type!='Control'&&(R=Q.createRange())&&(R=R.parentElement())&&(R=R.nodeName)&&R.toLowerCase() in {input:1,textarea:1})return;H=Q&&P.getRanges()[0];p.call(z);}};}else{E.on('mouseup',p,z);E.on('keyup',p,z);E.on('selectionchange',p,z);}if(b.webkit)E.on('keydown',function(N){var O=N.data.getKey();switch(O){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:w(z.document);}},null,null,10);});z.on('contentDomUnload',z.forceNextSelectionCheck,z);z.addCommand('selectAll',s);z.ui.addButton('SelectAll',{label:z.lang.selectAll,command:'selectAll'});z.selectionChange=p;b.ie9Compat&&z.on('destroy',function(){var E=z.getSelection();E&&E.getNative().clear();
+},null,null,9);}});a.editor.prototype.getSelection=function(){return this.document&&this.document.getSelection();};a.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath;};g.prototype.getSelection=function(){var z=new d.selection(this);return!z||z.isInvalid?null:z;};a.SELECTION_NONE=1;a.SELECTION_TEXT=2;a.SELECTION_ELEMENT=3;d.selection=function(z){var C=this;var A=z.getCustomData('cke_locked_selection');if(A)return A;C.document=z;C.isLocked=0;C._={cache:{}};if(c)try{var B=C.getNative().createRange();if(!B||B.item&&B.item(0).ownerDocument!=C.document.$||B.parentElement&&B.parentElement().ownerDocument!=C.document.$)throw 0;}catch(D){C.isInvalid=true;}return C;};var y={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};d.selection.prototype={getNative:c?function(){return this._.cache.nativeSel||(this._.cache.nativeSel=this.document.$.selection);}:function(){return this._.cache.nativeSel||(this._.cache.nativeSel=this.document.getWindow().$.getSelection());},getType:c?function(){var z=this._.cache;if(z.type)return z.type;var A=1;try{var B=this.getNative(),C=B.type;if(C=='Text')A=2;if(C=='Control')A=3;if(B.createRange().parentElement)A=2;}catch(D){}return z.type=A;}:function(){var z=this._.cache;if(z.type)return z.type;var A=2,B=this.getNative();if(!B)A=1;else if(B.rangeCount==1){var C=B.getRangeAt(0),D=C.startContainer;if(D==C.endContainer&&D.nodeType==1&&C.endOffset-C.startOffset==1&&y[D.childNodes[C.startOffset].nodeName.toLowerCase()])A=3;}return z.type=A;},getRanges:(function(){var z=c?(function(){function A(C){return new d.node(C).getIndex();};var B=function(C,D){C=C.duplicate();C.collapse(D);var E=C.parentElement(),F=E.ownerDocument;if(!E.hasChildNodes())return{container:E,offset:0};var G=E.children,H,I,J=C.duplicate(),K=0,L=G.length-1,M=-1,N,O,P;while(K<=L){M=Math.floor((K+L)/2);H=G[M];J.moveToElementText(H);N=J.compareEndPoints('StartToStart',C);if(N>0)L=M-1;else if(N<0)K=M+1;else if(b.ie9Compat&&H.tagName=='BR'){var Q=F.defaultView.getSelection();return{container:Q[D?'anchorNode':'focusNode'],offset:Q[D?'anchorOffset':'focusOffset']};}else return{container:E,offset:A(H)};}if(M==-1||M==G.length-1&&N<0){J.moveToElementText(E);J.setEndPoint('StartToStart',C);O=J.text.replace(/(\r\n|\r)/g,'\n').length;G=E.childNodes;if(!O){H=G[G.length-1];if(H.nodeType!=3)return{container:E,offset:G.length};else return{container:H,offset:H.nodeValue.length};
+}var R=G.length;while(O>0&&R>0){I=G[--R];if(I.nodeType==3){P=I;O-=I.nodeValue.length;}}return{container:P,offset:-O};}else{J.collapse(N>0?true:false);J.setEndPoint(N>0?'StartToStart':'EndToStart',C);O=J.text.replace(/(\r\n|\r)/g,'\n').length;if(!O)return{container:E,offset:A(H)+(N>0?0:1)};while(O>0)try{I=H[N>0?'previousSibling':'nextSibling'];if(I.nodeType==3){O-=I.nodeValue.length;P=I;}H=I;}catch(S){return{container:E,offset:A(H)};}return{container:P,offset:N>0?-O:P.nodeValue.length+O};}};return function(){var M=this;var C=M.getNative(),D=C&&C.createRange(),E=M.getType(),F;if(!C)return[];if(E==2){F=new d.range(M.document);var G=B(D,true);F.setStart(new d.node(G.container),G.offset);G=B(D);F.setEnd(new d.node(G.container),G.offset);if(F.endContainer.getPosition(F.startContainer)&4&&F.endOffset<=F.startContainer.getIndex())F.collapse();return[F];}else if(E==3){var H=[];for(var I=0;I<D.length;I++){var J=D.item(I),K=J.parentNode,L=0;F=new d.range(M.document);for(;L<K.childNodes.length&&K.childNodes[L]!=J;L++){}F.setStart(new d.node(K),L);F.setEnd(new d.node(K),L+1);H.push(F);}return H;}return[];};})():function(){var A=[],B,C=this.document,D=this.getNative();if(!D)return A;if(!D.rangeCount){B=new d.range(C);B.moveToElementEditStart(C.getBody());A.push(B);}for(var E=0;E<D.rangeCount;E++){var F=D.getRangeAt(E);B=new d.range(C);B.setStart(new d.node(F.startContainer),F.startOffset);B.setEnd(new d.node(F.endContainer),F.endOffset);A.push(B);}return A;};return function(A){var B=this._.cache;if(B.ranges&&!A)return B.ranges;else if(!B.ranges)B.ranges=new d.rangeList(z.call(this));if(A){var C=B.ranges;for(var D=0;D<C.length;D++){var E=C[D],F=E.getCommonAncestor();if(F.isReadOnly())C.splice(D,1);if(E.collapsed)continue;if(E.startContainer.isReadOnly()){var G=E.startContainer;while(G){if(G.is('body')||!G.isReadOnly())break;if(G.type==1&&G.getAttribute('contentEditable')=='false')E.setStartAfter(G);G=G.getParent();}}var H=E.startContainer,I=E.endContainer,J=E.startOffset,K=E.endOffset,L=E.clone();if(H&&H.type==3)if(J>=H.getLength())L.setStartAfter(H);else L.setStartBefore(H);if(I&&I.type==3)if(!K)L.setEndBefore(I);else L.setEndAfter(I);var M=new d.walker(L);M.evaluator=function(N){if(N.type==1&&N.isReadOnly()){var O=E.clone();E.setEndBefore(N);if(E.collapsed)C.splice(D--,1);if(!(N.getPosition(L.endContainer)&16)){O.setStartAfter(N);if(!O.collapsed)C.splice(D+1,0,O);}return true;}return false;};M.next();}}return B.ranges;};})(),getStartElement:function(){var G=this;var z=G._.cache;
+if(z.startElement!==undefined)return z.startElement;var A,B=G.getNative();switch(G.getType()){case 3:return G.getSelectedElement();case 2:var C=G.getRanges()[0];if(C){if(!C.collapsed){C.optimize();while(1){var D=C.startContainer,E=C.startOffset;if(E==(D.getChildCount?D.getChildCount():D.getLength())&&!D.isBlockBoundary())C.setStartAfter(D);else break;}A=C.startContainer;if(A.type!=1)return A.getParent();A=A.getChild(C.startOffset);if(!A||A.type!=1)A=C.startContainer;else{var F=A.getFirst();while(F&&F.type==1){A=F;F=F.getFirst();}}}else{A=C.startContainer;if(A.type!=1)A=A.getParent();}A=A.$;}}return z.startElement=A?new h(A):null;},getSelectedElement:function(){var z=this._.cache;if(z.selectedElement!==undefined)return z.selectedElement;var A=this,B=e.tryThese(function(){return A.getNative().createRange().item(0);},function(){var C,D,E=A.getRanges()[0],F=E.getCommonAncestor(1,1),G={table:1,ul:1,ol:1,dl:1};for(var H in G){if(C=F.getAscendant(H,1))break;}if(C){var I=new d.range(this.document);I.setStartAt(C,1);I.setEnd(E.startContainer,E.startOffset);var J=e.extend(G,f.$listItem,f.$tableContent),K=new d.walker(I),L=function(M,N){return function(O,P){if(O.type==3&&(!e.trim(O.getText())||O.getParent().data('cke-bookmark')))return true;var Q;if(O.type==1){Q=O.getName();if(Q=='br'&&N&&O.equals(O.getParent().getBogus()))return true;if(P&&Q in J||Q in f.$removeEmpty)return true;}M.halted=1;return false;};};K.guard=L(K);if(K.checkBackward()&&!K.halted){K=new d.walker(I);I.setStart(E.endContainer,E.endOffset);I.setEndAt(C,2);K.guard=L(K,1);if(K.checkForward()&&!K.halted)D=C.$;}}if(!D)throw 0;return D;},function(){var C=A.getRanges()[0],D,E;for(var F=2;F&&!((D=C.getEnclosedNode())&&D.type==1&&y[D.getName()]&&(E=D));F--)C.shrink(1);return E.$;});return z.selectedElement=B?new h(B):null;},getSelectedText:function(){var z=this._.cache;if(z.selectedText!==undefined)return z.selectedText;var A='',B=this.getNative();if(this.getType()==2)A=c?B.createRange().text:B.toString();return z.selectedText=A;},lock:function(){var z=this;z.getRanges();z.getStartElement();z.getSelectedElement();z.getSelectedText();z._.cache.nativeSel={};z.isLocked=1;z.document.setCustomData('cke_locked_selection',z);},unlock:function(z){var E=this;var A=E.document,B=A.getCustomData('cke_locked_selection');if(B){A.setCustomData('cke_locked_selection',null);if(z){var C=B.getSelectedElement(),D=!C&&B.getRanges();E.isLocked=0;E.reset();A.getBody().focus();if(C)E.selectElement(C);else E.selectRanges(D);}}if(!B||!z){E.isLocked=0;
+E.reset();}},reset:function(){this._.cache={};},selectElement:function(z){var B=this;if(B.isLocked){var A=new d.range(B.document);A.setStartBefore(z);A.setEndAfter(z);B._.cache.selectedElement=z;B._.cache.startElement=z;B._.cache.ranges=new d.rangeList(A);B._.cache.type=3;return;}A=new d.range(z.getDocument());A.setStartBefore(z);A.setEndAfter(z);A.select();B.document.fire('selectionchange');B.reset();},selectRanges:function(z){var N=this;if(N.isLocked){N._.cache.selectedElement=null;N._.cache.startElement=z[0]&&z[0].getTouchedStartNode();N._.cache.ranges=new d.rangeList(z);N._.cache.type=2;return;}if(c){if(z.length>1){var A=z[z.length-1];z[0].setEnd(A.endContainer,A.endOffset);z.length=1;}if(z[0])z[0].select();N.reset();}else{var B=N.getNative();if(!B)return;if(z.length){B.removeAllRanges();b.webkit&&w(N.document);}for(var C=0;C<z.length;C++){if(C<z.length-1){var D=z[C],E=z[C+1],F=D.clone();F.setStart(D.endContainer,D.endOffset);F.setEnd(E.startContainer,E.startOffset);if(!F.collapsed){F.shrink(1,true);var G=F.getCommonAncestor(),H=F.getEnclosedNode();if(G.isReadOnly()||H&&H.isReadOnly()){E.setStart(D.startContainer,D.startOffset);z.splice(C--,1);continue;}}}var I=z[C],J=N.document.$.createRange(),K=I.startContainer;if(I.collapsed&&(b.opera||b.gecko&&b.version<10900)&&K.type==1&&!K.getChildCount())K.appendText('');if(I.collapsed&&b.webkit&&r(I)){var L=t(N.document);I.insertNode(L);var M=L.getNext();if(M&&!L.getPrevious()&&M.type==1&&M.getName()=='br'){w(N.document);I.moveToPosition(M,3);}else I.moveToPosition(L,4);}J.setStart(I.startContainer.$,I.startOffset);try{J.setEnd(I.endContainer.$,I.endOffset);}catch(O){if(O.toString().indexOf('NS_ERROR_ILLEGAL_VALUE')>=0){I.collapse(1);J.setEnd(I.endContainer.$,I.endOffset);}else throw O;}B.addRange(J);}N.document.fire('selectionchange');N.reset();}},createBookmarks:function(z){return this.getRanges().createBookmarks(z);},createBookmarks2:function(z){return this.getRanges().createBookmarks2(z);},selectBookmarks:function(z){var A=[];for(var B=0;B<z.length;B++){var C=new d.range(this.document);C.moveToBookmark(z[B]);A.push(C);}this.selectRanges(A);return this;},getCommonAncestor:function(){var z=this.getRanges(),A=z[0].startContainer,B=z[z.length-1].endContainer;return A.getCommonAncestor(B);},scrollIntoView:function(){var z=this.getStartElement();z.scrollIntoView();}};})();(function(){var m=d.walker.whitespaces(true),n=/\ufeff|\u00a0/,o={table:1,tbody:1,tr:1};d.range.prototype.select=c?function(p){var A=this;var q=A.collapsed,r,s,t,u=A.getEnclosedNode();
+if(u)try{t=A.document.$.body.createControlRange();t.addElement(u.$);t.select();return;}catch(B){}if(A.startContainer.type==1&&A.startContainer.getName() in o||A.endContainer.type==1&&A.endContainer.getName() in o)A.shrink(1,true);var v=A.createBookmark(),w=v.startNode,x;if(!q)x=v.endNode;t=A.document.$.body.createTextRange();t.moveToElementText(w.$);t.moveStart('character',1);if(x){var y=A.document.$.body.createTextRange();y.moveToElementText(x.$);t.setEndPoint('EndToEnd',y);t.moveEnd('character',-1);}else{var z=w.getNext(m);r=!(z&&z.getText&&z.getText().match(n))&&(p||!w.hasPrevious()||w.getPrevious().is&&w.getPrevious().is('br'));s=A.document.createElement('span');s.setHtml('');s.insertBefore(w);if(r)A.document.createText('\ufeff').insertBefore(w);}A.setStartBefore(w);w.remove();if(q){if(r){t.moveStart('character',-1);t.select();A.document.$.selection.clear();}else t.select();A.moveToPosition(s,3);s.remove();}else{A.setEndBefore(x);x.remove();t.select();}A.document.fire('selectionchange');}:function(){this.document.getSelection().selectRanges([this]);};})();(function(){var m=a.htmlParser.cssStyle,n=e.cssLength,o=/^((?:\d*(?:\.\d+))|(?:\d+))(.*)?$/i;function p(r,s){var t=o.exec(r),u=o.exec(s);if(t){if(!t[2]&&u[2]=='px')return u[1];if(t[2]=='px'&&!u[2])return u[1]+'px';}return s;};var q={elements:{$:function(r){var s=r.attributes,t=s&&s['data-cke-realelement'],u=t&&new a.htmlParser.fragment.fromHtml(decodeURIComponent(t)),v=u&&u.children[0];if(v&&r.attributes['data-cke-resizable']){var w=new m(r).rules,x=v.attributes,y=w.width,z=w.height;y&&(x.width=p(x.width,y));z&&(x.height=p(x.height,z));}return v;}}};j.add('fakeobjects',{requires:['htmlwriter'],afterInit:function(r){var s=r.dataProcessor,t=s&&s.htmlFilter;if(t)t.addRules(q);}});a.editor.prototype.createFakeElement=function(r,s,t,u){var v=this.lang.fakeobjects,w=v[t]||v.unknown,x={'class':s,src:a.getUrl('images/spacer.gif'),'data-cke-realelement':encodeURIComponent(r.getOuterHtml()),'data-cke-real-node-type':r.type,alt:w,title:w,align:r.getAttribute('align')||''};if(t)x['data-cke-real-element-type']=t;if(u){x['data-cke-resizable']=u;var y=new m(),z=r.getAttribute('width'),A=r.getAttribute('height');z&&(y.rules.width=n(z));A&&(y.rules.height=n(A));y.populate(x);}return this.document.createElement('img',{attributes:x});};a.editor.prototype.createFakeParserElement=function(r,s,t,u){var v=this.lang.fakeobjects,w=v[t]||v.unknown,x,y=new a.htmlParser.basicWriter();r.writeHtml(y);x=y.getHtml();var z={'class':s,src:a.getUrl('images/spacer.gif'),'data-cke-realelement':encodeURIComponent(x),'data-cke-real-node-type':r.type,alt:w,title:w,align:r.attributes.align||''};
+if(t)z['data-cke-real-element-type']=t;if(u){z['data-cke-resizable']=u;var A=r.attributes,B=new m(),C=A.width,D=A.height;C!=undefined&&(B.rules.width=n(C));D!=undefined&&(B.rules.height=n(D));B.populate(z);}return new a.htmlParser.element('img',z);};a.editor.prototype.restoreRealElement=function(r){if(r.data('cke-real-node-type')!=1)return null;var s=h.createFromHtml(decodeURIComponent(r.data('cke-realelement')),this.document);if(r.data('cke-resizable')){var t=r.getStyle('width'),u=r.getStyle('height');t&&s.setAttribute('width',p(s.getAttribute('width'),t));u&&s.setAttribute('height',p(s.getAttribute('height'),u));}return s;};})();j.add('richcombo',{requires:['floatpanel','listblock','button'],beforeInit:function(m){m.ui.addHandler('richcombo',k.richCombo.handler);}});a.UI_RICHCOMBO='richcombo';k.richCombo=e.createClass({$:function(m){var o=this;e.extend(o,m,{title:m.label,modes:{wysiwyg:1}});var n=o.panel||{};delete o.panel;o.id=e.getNextNumber();o.document=n&&n.parent&&n.parent.getDocument()||a.document;n.className=(n.className||'')+' cke_rcombopanel';n.block={multiSelect:n.multiSelect,attributes:n.attributes};o._={panelDefinition:n,items:{},state:2};},statics:{handler:{create:function(m){return new k.richCombo(m);}}},proto:{renderHtml:function(m){var n=[];this.render(m,n);return n.join('');},render:function(m,n){var o=b,p='cke_'+this.id,q=e.addFunction(function(v){var y=this;var w=y._;if(w.state==0)return;y.createPanel(m);if(w.on){w.panel.hide();return;}y.commit();var x=y.getValue();if(x)w.list.mark(x);else w.list.unmarkAll();w.panel.showBlock(y.id,new h(v),4);},this),r={id:p,combo:this,focus:function(){var v=a.document.getById(p).getChild(1);v.focus();},clickFn:q};function s(){var w=this;var v=w.modes[m.mode]?2:0;w.setState(m.readOnly&&!w.readOnly?0:v);w.setValue('');};m.on('mode',s,this);!this.readOnly&&m.on('readOnly',s,this);var t=e.addFunction(function(v,w){v=new d.event(v);var x=v.getKeystroke();switch(x){case 13:case 32:case 40:e.callFunction(q,w);break;default:r.onkey(r,x);}v.preventDefault();}),u=e.addFunction(function(){r.onfocus&&r.onfocus();});r.keyDownFn=t;n.push('<span class="cke_rcombo" role="presentation">','<span id=',p);if(this.className)n.push(' class="',this.className,' cke_off"');n.push(' role="presentation">','<span id="'+p+'_label" class=cke_label>',this.label,'</span>','<a hidefocus=true title="',this.title,'" tabindex="-1"',o.gecko&&o.version>=10900&&!o.hc?'':" href=\"javascript:void('"+this.label+"')\"",' role="button" aria-labelledby="',p,'_label" aria-describedby="',p,'_text" aria-haspopup="true"');
+if(b.opera||b.gecko&&b.mac)n.push(' onkeypress="return false;"');if(b.gecko)n.push(' onblur="this.style.cssText = this.style.cssText;"');n.push(' onkeydown="CKEDITOR.tools.callFunction( ',t,', event, this );" onfocus="return CKEDITOR.tools.callFunction(',u,', event);" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',q,', this); return false;"><span><span id="'+p+'_text" class="cke_text cke_inline_label">'+this.label+'</span>'+'</span>'+'<span class=cke_openbutton><span class=cke_icon>'+(b.hc?'▼':b.air?' ':'')+'</span></span>'+'</a>'+'</span>'+'</span>');if(this.onRender)this.onRender();return r;},createPanel:function(m){if(this._.panel)return;var n=this._.panelDefinition,o=this._.panelDefinition.block,p=n.parent||a.document.getBody(),q=new k.floatPanel(m,p,n),r=q.addListBlock(this.id,o),s=this;q.onShow=function(){if(s.className)this.element.getFirst().addClass(s.className+'_panel');s.setState(1);r.focus(!s.multiSelect&&s.getValue());s._.on=1;if(s.onOpen)s.onOpen();};q.onHide=function(t){if(s.className)this.element.getFirst().removeClass(s.className+'_panel');s.setState(s.modes&&s.modes[m.mode]?2:0);s._.on=0;if(!t&&s.onClose)s.onClose();};q.onEscape=function(){q.hide();};r.onClick=function(t,u){s.document.getWindow().focus();if(s.onClick)s.onClick.call(s,t,u);if(u)s.setValue(t,s._.items[t]);else s.setValue('');q.hide(false);};this._.panel=q;this._.list=r;q.getBlock(this.id).onHide=function(){s._.on=0;s.setState(2);};if(this.init)this.init();},setValue:function(m,n){var p=this;p._.value=m;var o=p.document.getById('cke_'+p.id+'_text');if(o){if(!(m||n)){n=p.label;o.addClass('cke_inline_label');}else o.removeClass('cke_inline_label');o.setHtml(typeof n!='undefined'?n:m);}},getValue:function(){return this._.value||'';},unmarkAll:function(){this._.list.unmarkAll();},mark:function(m){this._.list.mark(m);},hideItem:function(m){this._.list.hideItem(m);},hideGroup:function(m){this._.list.hideGroup(m);},showAll:function(){this._.list.showAll();},add:function(m,n,o){this._.items[m]=o||m;this._.list.add(m,n,o);},startGroup:function(m){this._.list.startGroup(m);},commit:function(){var m=this;if(!m._.committed){m._.list.commit();m._.committed=1;k.fire('ready',m);}m._.committed=1;},setState:function(m){var n=this;if(n._.state==m)return;n.document.getById('cke_'+n.id).setState(m);n._.state=m;}}});k.prototype.addRichCombo=function(m,n){this.add(m,'richcombo',n);};j.add('htmlwriter');a.htmlWriter=e.createClass({base:a.htmlParser.basicWriter,$:function(){var o=this;
+o.base();o.indentationChars='\t';o.selfClosingEnd=' />';o.lineBreakChars='\n';o.forceSimpleAmpersand=0;o.sortAttributes=1;o._.indent=0;o._.indentation='';o._.inPre=0;o._.rules={};var m=f;for(var n in e.extend({},m.$nonBodyContent,m.$block,m.$listItem,m.$tableContent))o.setRules(n,{indent:1,breakBeforeOpen:1,breakAfterOpen:1,breakBeforeClose:!m[n]['#'],breakAfterClose:1});o.setRules('br',{breakAfterOpen:1});o.setRules('title',{indent:0,breakAfterOpen:0});o.setRules('style',{indent:0,breakBeforeClose:1});o.setRules('pre',{indent:0});},proto:{openTag:function(m,n){var p=this;var o=p._.rules[m];if(p._.indent)p.indentation();else if(o&&o.breakBeforeOpen){p.lineBreak();p.indentation();}p._.output.push('<',m);},openTagClose:function(m,n){var p=this;var o=p._.rules[m];if(n)p._.output.push(p.selfClosingEnd);else{p._.output.push('>');if(o&&o.indent)p._.indentation+=p.indentationChars;}if(o&&o.breakAfterOpen)p.lineBreak();m=='pre'&&(p._.inPre=1);},attribute:function(m,n){if(typeof n=='string'){this.forceSimpleAmpersand&&(n=n.replace(/&/g,'&'));n=e.htmlEncodeAttr(n);}this._.output.push(' ',m,'="',n,'"');},closeTag:function(m){var o=this;var n=o._.rules[m];if(n&&n.indent)o._.indentation=o._.indentation.substr(o.indentationChars.length);if(o._.indent)o.indentation();else if(n&&n.breakBeforeClose){o.lineBreak();o.indentation();}o._.output.push('</',m,'>');m=='pre'&&(o._.inPre=0);if(n&&n.breakAfterClose)o.lineBreak();},text:function(m){var n=this;if(n._.indent){n.indentation();!n._.inPre&&(m=e.ltrim(m));}n._.output.push(m);},comment:function(m){if(this._.indent)this.indentation();this._.output.push('<!--',m,'-->');},lineBreak:function(){var m=this;if(!m._.inPre&&m._.output.length>0)m._.output.push(m.lineBreakChars);m._.indent=1;},indentation:function(){var m=this;if(!m._.inPre)m._.output.push(m._.indentation);m._.indent=0;},setRules:function(m,n){var o=this._.rules[m];if(o)e.extend(o,n,true);else this._.rules[m]=n;}}});j.add('menubutton',{requires:['button','menu'],beforeInit:function(m){m.ui.addHandler('menubutton',k.menuButton.handler);}});a.UI_MENUBUTTON='menubutton';(function(){var m=function(n){var o=this._;if(o.state===0)return;o.previousState=o.state;var p=o.menu;if(!p){p=o.menu=new a.menu(n,{panel:{className:n.skinClass+' cke_contextmenu',attributes:{'aria-label':n.lang.common.options}}});p.onHide=e.bind(function(){this.setState(this.modes&&this.modes[n.mode]?o.previousState:0);},this);if(this.onMenu)p.addListener(this.onMenu);}if(o.on){p.hide();return;}this.setState(1);
+p.show(a.document.getById(this._.id),4);};k.menuButton=e.createClass({base:k.button,$:function(n){var o=n.panel;delete n.panel;this.base(n);this.hasArrow=true;this.click=m;},statics:{handler:{create:function(n){return new k.menuButton(n);}}}});})();j.add('dialogui');(function(){var m=function(u){var x=this;x._||(x._={});x._['default']=x._.initValue=u['default']||'';x._.required=u.required||false;var v=[x._];for(var w=1;w<arguments.length;w++)v.push(arguments[w]);v.push(true);e.extend.apply(e,v);return x._;},n={build:function(u,v,w){return new k.dialog.textInput(u,v,w);}},o={build:function(u,v,w){return new k.dialog[v.type](u,v,w);}},p={build:function(u,v,w){var x=v.children,y,z=[],A=[];for(var B=0;B<x.length&&(y=x[B]);B++){var C=[];z.push(C);A.push(a.dialog._.uiElementBuilders[y.type].build(u,y,C));}return new k.dialog[v.type](u,A,z,w,v);}},q={isChanged:function(){return this.getValue()!=this.getInitValue();},reset:function(u){this.setValue(this.getInitValue(),u);},setInitValue:function(){this._.initValue=this.getValue();},resetInitValue:function(){this._.initValue=this._['default'];},getInitValue:function(){return this._.initValue;}},r=e.extend({},k.dialog.uiElement.prototype.eventProcessors,{onChange:function(u,v){if(!this._.domOnChangeRegistered){u.on('load',function(){this.getInputElement().on('change',function(){if(!u.parts.dialog.isVisible())return;this.fire('change',{value:this.getValue()});},this);},this);this._.domOnChangeRegistered=true;}this.on('change',v);}},true),s=/^on([A-Z]\w+)/,t=function(u){for(var v in u){if(s.test(v)||v=='title'||v=='type')delete u[v];}return u;};e.extend(k.dialog,{labeledElement:function(u,v,w,x){if(arguments.length<4)return;var y=m.call(this,v);y.labelId=e.getNextId()+'_label';var z=this._.children=[],A=function(){var B=[],C=v.required?' cke_required':'';if(v.labelLayout!='horizontal')B.push('<label class="cke_dialog_ui_labeled_label'+C+'" ',' id="'+y.labelId+'"',' for="'+y.inputId+'"',(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>',v.label,'</label>','<div class="cke_dialog_ui_labeled_content"'+(v.controlStyle?' style="'+v.controlStyle+'"':'')+' role="presentation">',x.call(this,u,v),'</div>');else{var D={type:'hbox',widths:v.widths,padding:0,children:[{type:'html',html:'<label class="cke_dialog_ui_labeled_label'+C+'"'+' id="'+y.labelId+'"'+' for="'+y.inputId+'"'+(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>'+e.htmlEncode(v.label)+'</span>'},{type:'html',html:'<span class="cke_dialog_ui_labeled_content"'+(v.controlStyle?' style="'+v.controlStyle+'"':'')+'>'+x.call(this,u,v)+'</span>'}]};
+a.dialog._.uiElementBuilders.hbox.build(u,D,B);}return B.join('');};k.dialog.uiElement.call(this,u,v,w,'div',null,{role:'presentation'},A);},textInput:function(u,v,w){if(arguments.length<3)return;m.call(this,v);var x=this._.inputId=e.getNextId()+'_textInput',y={'class':'cke_dialog_ui_input_'+v.type,id:x,type:v.type},z;if(v.validate)this.validate=v.validate;if(v.maxLength)y.maxlength=v.maxLength;if(v.size)y.size=v.size;if(v.inputStyle)y.style=v.inputStyle;var A=this,B=false;u.on('load',function(){A.getInputElement().on('keydown',function(D){if(D.data.getKeystroke()==13)B=true;});A.getInputElement().on('keyup',function(D){if(D.data.getKeystroke()==13&&B){u.getButton('ok')&&setTimeout(function(){u.getButton('ok').click();},0);B=false;}},null,null,1000);});var C=function(){var D=['<div class="cke_dialog_ui_input_',v.type,'" role="presentation"'];if(v.width)D.push('style="width:'+v.width+'" ');D.push('><input ');y['aria-labelledby']=this._.labelId;this._.required&&(y['aria-required']=this._.required);for(var E in y)D.push(E+'="'+y[E]+'" ');D.push(' /></div>');return D.join('');};k.dialog.labeledElement.call(this,u,v,w,C);},textarea:function(u,v,w){if(arguments.length<3)return;m.call(this,v);var x=this,y=this._.inputId=e.getNextId()+'_textarea',z={};if(v.validate)this.validate=v.validate;z.rows=v.rows||5;z.cols=v.cols||20;if(typeof v.inputStyle!='undefined')z.style=v.inputStyle;var A=function(){z['aria-labelledby']=this._.labelId;this._.required&&(z['aria-required']=this._.required);var B=['<div class="cke_dialog_ui_input_textarea" role="presentation"><textarea class="cke_dialog_ui_input_textarea" id="',y,'" '];for(var C in z)B.push(C+'="'+e.htmlEncode(z[C])+'" ');B.push('>',e.htmlEncode(x._['default']),'</textarea></div>');return B.join('');};k.dialog.labeledElement.call(this,u,v,w,A);},checkbox:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v,{'default':!!v['default']});if(v.validate)this.validate=v.validate;var y=function(){var z=e.extend({},v,{id:v.id?v.id+'_checkbox':e.getNextId()+'_checkbox'},true),A=[],B=e.getNextId()+'_label',C={'class':'cke_dialog_ui_checkbox_input',type:'checkbox','aria-labelledby':B};t(z);if(v['default'])C.checked='checked';if(typeof z.inputStyle!='undefined')z.style=z.inputStyle;x.checkbox=new k.dialog.uiElement(u,z,A,'input',null,C);A.push(' <label id="',B,'" for="',C.id,'"'+(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>',e.htmlEncode(v.label),'</label>');return A.join('');};k.dialog.uiElement.call(this,u,v,w,'span',null,null,y);
+},radio:function(u,v,w){if(arguments.length<3)return;m.call(this,v);if(!this._['default'])this._['default']=this._.initValue=v.items[0][1];if(v.validate)this.validate=v.valdiate;var x=[],y=this,z=function(){var A=[],B=[],C={'class':'cke_dialog_ui_radio_item','aria-labelledby':this._.labelId},D=v.id?v.id+'_radio':e.getNextId()+'_radio';for(var E=0;E<v.items.length;E++){var F=v.items[E],G=F[2]!==undefined?F[2]:F[0],H=F[1]!==undefined?F[1]:F[0],I=e.getNextId()+'_radio_input',J=I+'_label',K=e.extend({},v,{id:I,title:null,type:null},true),L=e.extend({},K,{title:G},true),M={type:'radio','class':'cke_dialog_ui_radio_input',name:D,value:H,'aria-labelledby':J},N=[];if(y._['default']==H)M.checked='checked';t(K);t(L);if(typeof K.inputStyle!='undefined')K.style=K.inputStyle;x.push(new k.dialog.uiElement(u,K,N,'input',null,M));N.push(' ');new k.dialog.uiElement(u,L,N,'label',null,{id:J,'for':M.id},F[0]);A.push(N.join(''));}new k.dialog.hbox(u,x,A,B);return B.join('');};k.dialog.labeledElement.call(this,u,v,w,z);this._.children=x;},button:function(u,v,w){if(!arguments.length)return;if(typeof v=='function')v=v(u.getParentEditor());m.call(this,v,{disabled:v.disabled||false});a.event.implementOn(this);var x=this;u.on('load',function(A){var B=this.getElement();(function(){B.on('click',function(C){x.fire('click',{dialog:x.getDialog()});C.data.preventDefault();});B.on('keydown',function(C){if(C.data.getKeystroke() in {32:1}){x.click();C.data.preventDefault();}});})();B.unselectable();},this);var y=e.extend({},v);delete y.style;var z=e.getNextId()+'_label';k.dialog.uiElement.call(this,u,y,w,'a',null,{style:v.style,href:'javascript:void(0)',title:v.label,hidefocus:'true','class':v['class'],role:'button','aria-labelledby':z},'<span id="'+z+'" class="cke_dialog_ui_button">'+e.htmlEncode(v.label)+'</span>');},select:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v);if(v.validate)this.validate=v.validate;x.inputId=e.getNextId()+'_select';var y=function(){var z=e.extend({},v,{id:v.id?v.id+'_select':e.getNextId()+'_select'},true),A=[],B=[],C={id:x.inputId,'class':'cke_dialog_ui_input_select','aria-labelledby':this._.labelId};if(v.size!=undefined)C.size=v.size;if(v.multiple!=undefined)C.multiple=v.multiple;t(z);for(var D=0,E;D<v.items.length&&(E=v.items[D]);D++)B.push('<option value="',e.htmlEncode(E[1]!==undefined?E[1]:E[0]).replace(/"/g,'"'),'" /> ',e.htmlEncode(E[0]));if(typeof z.inputStyle!='undefined')z.style=z.inputStyle;x.select=new k.dialog.uiElement(u,z,A,'select',null,C,B.join(''));
+return A.join('');};k.dialog.labeledElement.call(this,u,v,w,y);},file:function(u,v,w){if(arguments.length<3)return;if(v['default']===undefined)v['default']='';var x=e.extend(m.call(this,v),{definition:v,buttons:[]});if(v.validate)this.validate=v.validate;var y=function(){x.frameId=e.getNextId()+'_fileInput';var z=b.isCustomDomain(),A=['<iframe frameborder="0" allowtransparency="0" class="cke_dialog_ui_input_file" id="',x.frameId,'" title="',v.label,'" src="javascript:void('];A.push(z?"(function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})()':'0');A.push(')"></iframe>');return A.join('');};u.on('load',function(){var z=a.document.getById(x.frameId),A=z.getParent();A.addClass('cke_dialog_ui_input_file');});k.dialog.labeledElement.call(this,u,v,w,y);},fileButton:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v),y=this;if(v.validate)this.validate=v.validate;var z=e.extend({},v),A=z.onClick;z.className=(z.className?z.className+' ':'')+'cke_dialog_ui_button';z.onClick=function(B){var C=v['for'];if(!A||A.call(this,B)!==false){u.getContentElement(C[0],C[1]).submit();this.disable();}};u.on('load',function(){u.getContentElement(v['for'][0],v['for'][1])._.buttons.push(y);});k.dialog.button.call(this,u,z,w);},html:(function(){var u=/^\s*<[\w:]+\s+([^>]*)?>/,v=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,w=/\/$/;return function(x,y,z){if(arguments.length<3)return;var A=[],B,C=y.html,D,E;if(C.charAt(0)!='<')C='<span>'+C+'</span>';var F=y.focus;if(F){var G=this.focus;this.focus=function(){G.call(this);typeof F=='function'&&F.call(this);this.fire('focus');};if(y.isFocusable){var H=this.isFocusable;this.isFocusable=H;}this.keyboardFocusable=true;}k.dialog.uiElement.call(this,x,y,A,'span',null,null,'');B=A.join('');D=B.match(u);E=C.match(v)||['','',''];if(w.test(E[1])){E[1]=E[1].slice(0,-1);E[2]='/'+E[2];}z.push([E[1],' ',D[1]||'',E[2]].join(''));};})(),fieldset:function(u,v,w,x,y){var z=y.label,A=function(){var B=[];z&&B.push('<legend'+(y.labelStyle?' style="'+y.labelStyle+'"':'')+'>'+z+'</legend>');for(var C=0;C<w.length;C++)B.push(w[C]);return B.join('');};this._={children:v};k.dialog.uiElement.call(this,u,y,x,'fieldset',null,null,A);}},true);k.dialog.html.prototype=new k.dialog.uiElement();k.dialog.labeledElement.prototype=e.extend(new k.dialog.uiElement(),{setLabel:function(u){var v=a.document.getById(this._.labelId);if(v.getChildCount()<1)new d.text(u,a.document).appendTo(v);else v.getChild(0).$.nodeValue=u;return this;
+},getLabel:function(){var u=a.document.getById(this._.labelId);if(!u||u.getChildCount()<1)return '';else return u.getChild(0).getText();},eventProcessors:r},true);k.dialog.button.prototype=e.extend(new k.dialog.uiElement(),{click:function(){var u=this;if(!u._.disabled)return u.fire('click',{dialog:u._.dialog});u.getElement().$.blur();return false;},enable:function(){this._.disabled=false;var u=this.getElement();u&&u.removeClass('cke_disabled');},disable:function(){this._.disabled=true;this.getElement().addClass('cke_disabled');},isVisible:function(){return this.getElement().getFirst().isVisible();},isEnabled:function(){return!this._.disabled;},eventProcessors:e.extend({},k.dialog.uiElement.prototype.eventProcessors,{onClick:function(u,v){this.on('click',function(){this.getElement().focus();v.apply(this,arguments);});}},true),accessKeyUp:function(){this.click();},accessKeyDown:function(){this.focus();},keyboardFocusable:true},true);k.dialog.textInput.prototype=e.extend(new k.dialog.labeledElement(),{getInputElement:function(){return a.document.getById(this._.inputId);},focus:function(){var u=this.selectParentTab();setTimeout(function(){var v=u.getInputElement();v&&v.$.focus();},0);},select:function(){var u=this.selectParentTab();setTimeout(function(){var v=u.getInputElement();if(v){v.$.focus();v.$.select();}},0);},accessKeyUp:function(){this.select();},setValue:function(u){!u&&(u='');return k.dialog.uiElement.prototype.setValue.apply(this,arguments);},keyboardFocusable:true},q,true);k.dialog.textarea.prototype=new k.dialog.textInput();k.dialog.select.prototype=e.extend(new k.dialog.labeledElement(),{getInputElement:function(){return this._.select.getElement();},add:function(u,v,w){var x=new h('option',this.getDialog().getParentEditor().document),y=this.getInputElement().$;x.$.text=u;x.$.value=v===undefined||v===null?u:v;if(w===undefined||w===null){if(c)y.add(x.$);else y.add(x.$,null);}else y.add(x.$,w);return this;},remove:function(u){var v=this.getInputElement().$;v.remove(u);return this;},clear:function(){var u=this.getInputElement().$;while(u.length>0)u.remove(0);return this;},keyboardFocusable:true},q,true);k.dialog.checkbox.prototype=e.extend(new k.dialog.uiElement(),{getInputElement:function(){return this._.checkbox.getElement();},setValue:function(u,v){this.getInputElement().$.checked=u;!v&&this.fire('change',{value:u});},getValue:function(){return this.getInputElement().$.checked;},accessKeyUp:function(){this.setValue(!this.getValue());},eventProcessors:{onChange:function(u,v){if(!c)return r.onChange.apply(this,arguments);
+else{u.on('load',function(){var w=this._.checkbox.getElement();w.on('propertychange',function(x){x=x.data.$;if(x.propertyName=='checked')this.fire('change',{value:w.$.checked});},this);},this);this.on('change',v);}return null;}},keyboardFocusable:true},q,true);k.dialog.radio.prototype=e.extend(new k.dialog.uiElement(),{setValue:function(u,v){var w=this._.children,x;for(var y=0;y<w.length&&(x=w[y]);y++)x.getElement().$.checked=x.getValue()==u;!v&&this.fire('change',{value:u});},getValue:function(){var u=this._.children;for(var v=0;v<u.length;v++){if(u[v].getElement().$.checked)return u[v].getValue();}return null;},accessKeyUp:function(){var u=this._.children,v;for(v=0;v<u.length;v++){if(u[v].getElement().$.checked){u[v].getElement().focus();return;}}u[0].getElement().focus();},eventProcessors:{onChange:function(u,v){if(!c)return r.onChange.apply(this,arguments);else{u.on('load',function(){var w=this._.children,x=this;for(var y=0;y<w.length;y++){var z=w[y].getElement();z.on('propertychange',function(A){A=A.data.$;if(A.propertyName=='checked'&&this.$.checked)x.fire('change',{value:this.getAttribute('value')});});}},this);this.on('change',v);}return null;}},keyboardFocusable:true},q,true);k.dialog.file.prototype=e.extend(new k.dialog.labeledElement(),q,{getInputElement:function(){var u=a.document.getById(this._.frameId).getFrameDocument();return u.$.forms.length>0?new h(u.$.forms[0].elements[0]):this.getElement();},submit:function(){this.getInputElement().getParent().$.submit();return this;},getAction:function(){return this.getInputElement().getParent().$.action;},registerEvents:function(u){var v=/^on([A-Z]\w+)/,w,x=function(z,A,B,C){z.on('formLoaded',function(){z.getInputElement().on(B,C,z);});};for(var y in u){if(!(w=y.match(v)))continue;if(this.eventProcessors[y])this.eventProcessors[y].call(this,this._.dialog,u[y]);else x(this,this._.dialog,w[1].toLowerCase(),u[y]);}return this;},reset:function(){var u=this._,v=a.document.getById(u.frameId),w=v.getFrameDocument(),x=u.definition,y=u.buttons,z=this.formLoadedNumber,A=this.formUnloadNumber,B=u.dialog._.editor.lang.dir,C=u.dialog._.editor.langCode;if(!z){z=this.formLoadedNumber=e.addFunction(function(){this.fire('formLoaded');},this);A=this.formUnloadNumber=e.addFunction(function(){this.getInputElement().clearCustomData();},this);this.getDialog()._.editor.on('destroy',function(){e.removeFunction(z);e.removeFunction(A);});}function D(){w.$.open();if(b.isCustomDomain())w.$.domain=document.domain;var E='';if(x.size)E=x.size-(c?7:0);
+w.$.write(['<html dir="'+B+'" lang="'+C+'"><head><title></title></head><body style="margin: 0; overflow: hidden; background: transparent;">','<form enctype="multipart/form-data" method="POST" dir="'+B+'" lang="'+C+'" action="',e.htmlEncode(x.action),'">','<input type="file" name="',e.htmlEncode(x.id||'cke_upload'),'" size="',e.htmlEncode(E>0?E:''),'" />','</form>','</body></html>','<script>window.parent.CKEDITOR.tools.callFunction('+z+');','window.onbeforeunload = function() {window.parent.CKEDITOR.tools.callFunction('+A+')}</script>'].join(''));w.$.close();for(var F=0;F<y.length;F++)y[F].enable();};if(b.gecko)setTimeout(D,500);else D();},getValue:function(){return this.getInputElement().$.value||'';},setInitValue:function(){this._.initValue='';},eventProcessors:{onChange:function(u,v){if(!this._.domOnChangeRegistered){this.on('formLoaded',function(){this.getInputElement().on('change',function(){this.fire('change',{value:this.getValue()});},this);},this);this._.domOnChangeRegistered=true;}this.on('change',v);}},keyboardFocusable:true},true);k.dialog.fileButton.prototype=new k.dialog.button();k.dialog.fieldset.prototype=e.clone(k.dialog.hbox.prototype);a.dialog.addUIElement('text',n);a.dialog.addUIElement('password',n);a.dialog.addUIElement('textarea',o);a.dialog.addUIElement('checkbox',o);a.dialog.addUIElement('radio',o);a.dialog.addUIElement('button',o);a.dialog.addUIElement('select',o);a.dialog.addUIElement('file',o);a.dialog.addUIElement('fileButton',o);a.dialog.addUIElement('html',o);a.dialog.addUIElement('fieldset',p);})();j.add('panel',{beforeInit:function(m){m.ui.addHandler('panel',k.panel.handler);}});a.UI_PANEL='panel';k.panel=function(m,n){var o=this;if(n)e.extend(o,n);e.extend(o,{className:'',css:[]});o.id=e.getNextId();o.document=m;o._={blocks:{}};};k.panel.handler={create:function(m){return new k.panel(m);}};k.panel.prototype={renderHtml:function(m){var n=[];this.render(m,n);return n.join('');},render:function(m,n){var p=this;var o=p.id;n.push('<div class="',m.skinClass,'" lang="',m.langCode,'" role="presentation" style="display:none;z-index:'+(m.config.baseFloatZIndex+1)+'">'+'<div'+' id=',o,' dir=',m.lang.dir,' role="presentation" class="cke_panel cke_',m.lang.dir);if(p.className)n.push(' ',p.className);n.push('">');if(p.forceIFrame||p.css.length){n.push('<iframe id="',o,'_frame" frameborder="0" role="application" src="javascript:void(');n.push(b.isCustomDomain()?"(function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})()':'0');
+n.push(')"></iframe>');}n.push('</div></div>');return o;},getHolderElement:function(){var m=this._.holder;if(!m){if(this.forceIFrame||this.css.length){var n=this.document.getById(this.id+'_frame'),o=n.getParent(),p=o.getAttribute('dir'),q=o.getParent().getAttribute('class'),r=o.getParent().getAttribute('lang'),s=n.getFrameDocument();b.iOS&&o.setStyles({overflow:'scroll','-webkit-overflow-scrolling':'touch'});var t=e.addFunction(e.bind(function(w){this.isLoaded=true;if(this.onLoad)this.onLoad();},this)),u='<!DOCTYPE html><html dir="'+p+'" class="'+q+'_container" lang="'+r+'">'+'<head>'+'<style>.'+q+'_container{visibility:hidden}</style>'+e.buildStyleHtml(this.css)+'</head>'+'<body class="cke_'+p+' cke_panel_frame '+b.cssClass+'" style="margin:0;padding:0"'+' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction('+t+');"></body>'+'</html>';s.write(u);var v=s.getWindow();v.$.CKEDITOR=a;s.on('key'+(b.opera?'press':'down'),function(w){var z=this;var x=w.data.getKeystroke(),y=z.document.getById(z.id).getAttribute('dir');if(z._.onKeyDown&&z._.onKeyDown(x)===false){w.data.preventDefault();return;}if(x==27||x==(y=='rtl'?39:37))if(z.onEscape&&z.onEscape(x)===false)w.data.preventDefault();},this);m=s.getBody();m.unselectable();b.air&&e.callFunction(t);}else m=this.document.getById(this.id);this._.holder=m;}return m;},addBlock:function(m,n){var o=this;n=o._.blocks[m]=n instanceof k.panel.block?n:new k.panel.block(o.getHolderElement(),n);if(!o._.currentBlock)o.showBlock(m);return n;},getBlock:function(m){return this._.blocks[m];},showBlock:function(m){var r=this;var n=r._.blocks,o=n[m],p=r._.currentBlock,q=!r.forceIFrame||c?r._.holder:r.document.getById(r.id+'_frame');if(p){q.removeAttributes(p.attributes);p.hide();}r._.currentBlock=o;q.setAttributes(o.attributes);a.fire('ariaWidget',q);o._.focusIndex=-1;r._.onKeyDown=o.onKeyDown&&e.bind(o.onKeyDown,o);o.show();return o;},destroy:function(){this.element&&this.element.remove();}};k.panel.block=e.createClass({$:function(m,n){var o=this;o.element=m.append(m.getDocument().createElement('div',{attributes:{tabIndex:-1,'class':'cke_panel_block',role:'presentation'},styles:{display:'none'}}));if(n)e.extend(o,n);if(!o.attributes.title)o.attributes.title=o.attributes['aria-label'];o.keys={};o._.focusIndex=-1;o.element.disableContextMenu();},_:{markItem:function(m){var p=this;if(m==-1)return;var n=p.element.getElementsByTag('a'),o=n.getItem(p._.focusIndex=m);if(b.webkit||b.opera)o.getDocument().getWindow().focus();
+o.focus();p.onMark&&p.onMark(o);}},proto:{show:function(){this.element.setStyle('display','');},hide:function(){var m=this;if(!m.onHide||m.onHide.call(m)!==true)m.element.setStyle('display','none');},onKeyDown:function(m){var r=this;var n=r.keys[m];switch(n){case 'next':var o=r._.focusIndex,p=r.element.getElementsByTag('a'),q;while(q=p.getItem(++o)){if(q.getAttribute('_cke_focus')&&q.$.offsetWidth){r._.focusIndex=o;q.focus();break;}}return false;case 'prev':o=r._.focusIndex;p=r.element.getElementsByTag('a');while(o>0&&(q=p.getItem(--o))){if(q.getAttribute('_cke_focus')&&q.$.offsetWidth){r._.focusIndex=o;q.focus();break;}}return false;case 'click':case 'mouseup':o=r._.focusIndex;q=o>=0&&r.element.getElementsByTag('a').getItem(o);if(q)q.$[n]?q.$[n]():q.$['on'+n]();return false;}return true;}}});j.add('listblock',{requires:['panel'],onLoad:function(){k.panel.prototype.addListBlock=function(m,n){return this.addBlock(m,new k.listBlock(this.getHolderElement(),n));};k.listBlock=e.createClass({base:k.panel.block,$:function(m,n){var q=this;n=n||{};var o=n.attributes||(n.attributes={});(q.multiSelect=!!n.multiSelect)&&(o['aria-multiselectable']=true);!o.role&&(o.role='listbox');q.base.apply(q,arguments);var p=q.keys;p[40]='next';p[9]='next';p[38]='prev';p[2228224+9]='prev';p[32]=c?'mouseup':'click';c&&(p[13]='mouseup');q._.pendingHtml=[];q._.items={};q._.groups={};},_:{close:function(){if(this._.started){this._.pendingHtml.push('</ul>');delete this._.started;}},getClick:function(){if(!this._.click)this._.click=e.addFunction(function(m){var o=this;var n=true;if(o.multiSelect)n=o.toggle(m);else o.mark(m);if(o.onClick)o.onClick(m,n);},this);return this._.click;}},proto:{add:function(m,n,o){var r=this;var p=r._.pendingHtml,q=e.getNextId();if(!r._.started){p.push('<ul role="presentation" class=cke_panel_list>');r._.started=1;r._.size=r._.size||0;}r._.items[m]=q;p.push('<li id=',q,' class=cke_panel_listItem role=presentation><a id="',q,'_option" _cke_focus=1 hidefocus=true title="',o||m,'" href="javascript:void(\'',m,"')\" "+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',r._.getClick(),",'",m,"'); return false;\"",' role="option">',n||m,'</a></li>');},startGroup:function(m){this._.close();var n=e.getNextId();this._.groups[m]=n;this._.pendingHtml.push('<h1 role="presentation" id=',n,' class=cke_panel_grouptitle>',m,'</h1>');},commit:function(){var m=this;m._.close();m.element.appendHtml(m._.pendingHtml.join(''));delete m._.size;m._.pendingHtml=[];
+},toggle:function(m){var n=this.isMarked(m);if(n)this.unmark(m);else this.mark(m);return!n;},hideGroup:function(m){var n=this.element.getDocument().getById(this._.groups[m]),o=n&&n.getNext();if(n){n.setStyle('display','none');if(o&&o.getName()=='ul')o.setStyle('display','none');}},hideItem:function(m){this.element.getDocument().getById(this._.items[m]).setStyle('display','none');},showAll:function(){var m=this._.items,n=this._.groups,o=this.element.getDocument();for(var p in m)o.getById(m[p]).setStyle('display','');for(var q in n){var r=o.getById(n[q]),s=r.getNext();r.setStyle('display','');if(s&&s.getName()=='ul')s.setStyle('display','');}},mark:function(m){var p=this;if(!p.multiSelect)p.unmarkAll();var n=p._.items[m],o=p.element.getDocument().getById(n);o.addClass('cke_selected');p.element.getDocument().getById(n+'_option').setAttribute('aria-selected',true);p.onMark&&p.onMark(o);},unmark:function(m){var q=this;var n=q.element.getDocument(),o=q._.items[m],p=n.getById(o);p.removeClass('cke_selected');n.getById(o+'_option').removeAttribute('aria-selected');q.onUnmark&&q.onUnmark(p);},unmarkAll:function(){var q=this;var m=q._.items,n=q.element.getDocument();for(var o in m){var p=m[o];n.getById(p).removeClass('cke_selected');n.getById(p+'_option').removeAttribute('aria-selected');}q.onUnmark&&q.onUnmark();},isMarked:function(m){return this.element.getDocument().getById(this._.items[m]).hasClass('cke_selected');},focus:function(m){this._.focusIndex=-1;if(m){var n=this.element.getDocument().getById(this._.items[m]).getFirst(),o=this.element.getElementsByTag('a'),p,q=-1;while(p=o.getItem(++q)){if(p.equals(n)){this._.focusIndex=q;break;}}setTimeout(function(){n.focus();},0);}}}});}});a.themes.add('default',(function(){var m={};function n(o,p){var q,r;r=o.config.sharedSpaces;r=r&&r[p];r=r&&a.document.getById(r);if(r){var s='<span class="cke_shared " dir="'+o.lang.dir+'"'+'>'+'<span class="'+o.skinClass+' '+o.id+' cke_editor_'+o.name+'">'+'<span class="'+b.cssClass+'">'+'<span class="cke_wrapper cke_'+o.lang.dir+'">'+'<span class="cke_editor">'+'<div class="cke_'+p+'">'+'</div></span></span></span></span></span>',t=r.append(h.createFromHtml(s,r.getDocument()));if(r.getCustomData('cke_hasshared'))t.hide();else r.setCustomData('cke_hasshared',1);q=t.getChild([0,0,0,0]);!o.sharedSpaces&&(o.sharedSpaces={});o.sharedSpaces[p]=q;o.on('focus',function(){for(var u=0,v,w=r.getChildren();v=w.getItem(u);u++){if(v.type==1&&!v.equals(t)&&v.hasClass('cke_shared'))v.hide();}t.show();
+});o.on('destroy',function(){t.remove();});}return q;};return{build:function(o,p){var q=o.name,r=o.element,s=o.elementMode;if(!r||s==0)return;if(s==1)r.hide();var t=o.fire('themeSpace',{space:'top',html:''}).html,u=o.fire('themeSpace',{space:'contents',html:''}).html,v=o.fireOnce('themeSpace',{space:'bottom',html:''}).html,w=u&&o.config.height,x=o.config.tabIndex||o.element.getAttribute('tabindex')||0;if(!u)w='auto';else if(!isNaN(w))w+='px';var y='',z=o.config.width;if(z){if(!isNaN(z))z+='px';y+='width: '+z+';';}var A=t&&n(o,'top'),B=n(o,'bottom');A&&(A.setHtml(t),t='');B&&(B.setHtml(v),v='');var C='<style>.'+o.skinClass+'{visibility:hidden;}</style>';if(m[o.skinClass])C='';else m[o.skinClass]=1;var D=h.createFromHtml(['<span id="cke_',q,'" class="',o.skinClass,' ',o.id,' cke_editor_',q,'" dir="',o.lang.dir,'" title="',b.gecko?' ':'','" lang="',o.langCode,'"'+(b.webkit?' tabindex="'+x+'"':'')+' role="application"'+' aria-labelledby="cke_',q,'_arialbl"'+(y?' style="'+y+'"':'')+'>'+'<span id="cke_',q,'_arialbl" class="cke_voice_label">'+o.lang.editor+'</span>'+'<span class="',b.cssClass,'" role="presentation"><span class="cke_wrapper cke_',o.lang.dir,'" role="presentation"><table class="cke_editor" border="0" cellspacing="0" cellpadding="0" role="presentation"><tbody><tr',t?'':' style="display:none"',' role="presentation"><td id="cke_top_',q,'" class="cke_top" role="presentation">',t,'</td></tr><tr',u?'':' style="display:none"',' role="presentation"><td id="cke_contents_',q,'" class="cke_contents" style="height:',w,'" role="presentation">',u,'</td></tr><tr',v?'':' style="display:none"',' role="presentation"><td id="cke_bottom_',q,'" class="cke_bottom" role="presentation">',v,'</td></tr></tbody></table>'+C+'</span>'+'</span>'+'</span>'].join(''));D.getChild([1,0,0,0,0]).unselectable();D.getChild([1,0,0,0,2]).unselectable();if(s==1)D.insertAfter(r);else r.append(D);o.container=D;D.disableContextMenu();o.on('contentDirChanged',function(E){var F=(o.lang.dir!=E.data?'add':'remove')+'Class';D.getChild(1)[F]('cke_mixed_dir_content');var G=this.sharedSpaces&&this.sharedSpaces[this.config.toolbarLocation];G&&G.getParent().getParent()[F]('cke_mixed_dir_content');});o.fireOnce('themeLoaded');o.fireOnce('uiReady');},buildDialog:function(o){var p=e.getNextNumber(),q=h.createFromHtml(['<div class="',o.id,'_dialog cke_editor_',o.name.replace('.','\\.'),'_dialog cke_skin_',o.skinName,'" dir="',o.lang.dir,'" lang="',o.langCode,'" role="dialog" aria-labelledby="%title#"><table class="cke_dialog',' '+b.cssClass,' cke_',o.lang.dir,'" style="position:absolute" role="presentation"><tr><td role="presentation"><div class="%body" role="presentation"><div id="%title#" class="%title" role="presentation"></div><a id="%close_button#" class="%close_button" href="javascript:void(0)" title="'+o.lang.common.close+'" role="button"><span class="cke_label">X</span></a>'+'<div id="%tabs#" class="%tabs" role="tablist"></div>'+'<table class="%contents" role="presentation">'+'<tr>'+'<td id="%contents#" class="%contents" role="presentation"></td>'+'</tr>'+'<tr>'+'<td id="%footer#" class="%footer" role="presentation"></td>'+'</tr>'+'</table>'+'</div>'+'<div id="%tl#" class="%tl"></div>'+'<div id="%tc#" class="%tc"></div>'+'<div id="%tr#" class="%tr"></div>'+'<div id="%ml#" class="%ml"></div>'+'<div id="%mr#" class="%mr"></div>'+'<div id="%bl#" class="%bl"></div>'+'<div id="%bc#" class="%bc"></div>'+'<div id="%br#" class="%br"></div>'+'</td></tr>'+'</table>',c?'':'<style>.cke_dialog{visibility:hidden;}</style>','</div>'].join('').replace(/#/g,'_'+p).replace(/%/g,'cke_dialog_')),r=q.getChild([0,0,0,0,0]),s=r.getChild(0),t=r.getChild(1);
+if(c&&!b.ie6Compat){var u=b.isCustomDomain(),v='javascript:void(function(){'+encodeURIComponent('document.open();'+(u?'document.domain="'+document.domain+'";':'')+'document.close();')+'}())',w=h.createFromHtml('<iframe frameBorder="0" class="cke_iframe_shim" src="'+v+'"'+' tabIndex="-1"'+'></iframe>');w.appendTo(r.getParent());}s.unselectable();t.unselectable();return{element:q,parts:{dialog:q.getChild(0),title:s,close:t,tabs:r.getChild(2),contents:r.getChild([3,0,0,0]),footer:r.getChild([3,0,1,0])}};},destroy:function(o){var p=o.container,q=o.element;if(p){p.clearCustomData();p.remove();}if(q){q.clearCustomData();o.elementMode==1&&q.show();delete o.element;}}};})());a.editor.prototype.getThemeSpace=function(m){var n='cke_'+m,o=this._[n]||(this._[n]=a.document.getById(n+'_'+this.name));return o;};a.editor.prototype.resize=function(m,n,o,p){var v=this;var q=v.container,r=a.document.getById('cke_contents_'+v.name),s=b.webkit&&v.document&&v.document.getWindow().$.frameElement,t=p?q.getChild(1):q;t.setSize('width',m,true);s&&(s.style.width='1%');var u=o?0:(t.$.offsetHeight||0)-(r.$.clientHeight||0);r.setStyle('height',Math.max(n-u,0)+'px');s&&(s.style.width='100%');v.fire('resize');};a.editor.prototype.getResizable=function(m){return m?a.document.getById('cke_contents_'+this.name):this.container;};})();
diff --git a/appsrc/ODS-Framework/ckeditor/contents.css b/appsrc/ODS-Framework/ckeditor/contents.css
new file mode 100644
index 0000000..0bdd9fd
--- /dev/null
+++ b/appsrc/ODS-Framework/ckeditor/contents.css
@@ -0,0 +1,25 @@
+/*
+Copyright (c) 2003-2012, 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 list items with text direction other than the list. (#6249,#8049)*/
+ padding:0 40px;
+}
diff --git a/appsrc/ODS-Framework/ckeditor/lang/en.js b/appsrc/ODS-Framework/ckeditor/lang/en.js
index 9964394..0836102 100644
--- a/appsrc/ODS-Framework/ckeditor/lang/en.js
+++ b/appsrc/ODS-Framework/ckeditor/lang/en.js
@@ -1,6 +1,6 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-CKEDITOR.lang.en={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Alignment',alignLeft:'Left',alignRight:'Right',alignCenter:'Center',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background color',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Center',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Color',bgColorTitle:'Background Color',panelTitle:'Colors',auto:'Automatic',more:'More Colors...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright © $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
+CKEDITOR.lang.en={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Alignment',alignLeft:'Left',alignRight:'Right',alignCenter:'Center',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background color',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Center',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Color',bgColorTitle:'Background Color',panelTitle:'Colors',auto:'Automatic',more:'More Colors...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright © $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/clipboard/dialogs/paste.js b/appsrc/ODS-Framework/ckeditor/plugins/clipboard/dialogs/paste.js
index 35c274d..4a850e0 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/clipboard/dialogs/paste.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/clipboard/dialogs/paste.js
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-CKEDITOR.dialog.add('paste',function(a){var b=a.lang.clipboard,c=CKEDITOR.env.isCustomDomain();function d(e){var f=new CKEDITOR.dom.document(e.document),g=f.$,h=f.getById('cke_actscrpt');h&&h.remove();CKEDITOR.env.ie?g.body.contentEditable='true':g.designMode='on';if(CKEDITOR.env.ie&&CKEDITOR.env.version<8)f.getWindow().on('blur',function(){g.selection.empty();});f.on('keydown',function(i){var j=i.data,k=j.getKeystroke(),l;switch(k){case 27:this.hide();l=1;break;case 9:case CKEDITOR.SHIFT+9:this.changeFocus(true);l=1;}l&&j.preventDefault();},this);a.fire('ariaWidget',new CKEDITOR.dom.element(e.frameElement));};return{title:b.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?370:350,minHeight:CKEDITOR.env.quirks?250:245,onShow:function(){this.parts.dialog.$.offsetHeight;this.setupContent();},onHide:function(){if(CKEDITOR.env.ie)this.getParentEditor().document.getBody().$.contentEditable='true';},onLoad:function(){if((CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&a.lang.dir=='rtl')this.parts.contents.setStyle('overflow','hidden');},onOk:function(){this.commitContent();},contents:[{id:'general',label:a.lang.common.generalTab,elements:[{type:'html',id:'securityMsg',html:'<div style="white-space:normal;width:340px;">'+b.securityMsg+'</div>'},{type:'html',id:'pasteMsg',html:'<div style="white-space:normal;width:340px;">'+b.pasteMsg+'</div>'},{type:'html',id:'editing_area',style:'width: 100%; height: 100%;',html:'',focus:function(){var e=this.getInputElement().$.contentWindow;setTimeout(function(){e.focus();},500);},setup:function(){var e=this.getDialog(),f='<html dir="'+a.config.contentsLangDirection+'"'+' lang="'+(a.config.contentsLanguage||a.langCode)+'">'+'<head><style>body { margin: 3px; height: 95%; } </style></head><body>'+'<script id="cke_actscrpt" type="text/javascript">'+'window.parent.CKEDITOR.tools.callFunction( '+CKEDITOR.tools.addFunction(d,e)+', this );'+'</script></body>'+'</html>',g=CKEDITOR.env.air?'javascript:void(0)':c?"javascript:void((function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})())"':'',h=CKEDITOR.dom.element.createFromHtml('<iframe class="cke_pasteframe" frameborder="0" allowTransparency="true" src="'+g+'"'+' role="region"'+' aria-label="'+b.pasteArea+'"'+' aria-describedby="'+e.getContentElement('general','pasteMsg').domId+'"'+' aria-multiple="true"'+'></iframe>');h.on('load',function(k){k.removeListener();var l=h.getFrameDocument();l.write(f);if(CKEDITOR.env.air)d.call(this,l.getWindow().$);
+CKEDITOR.dialog.add('paste',function(a){var b=a.lang.clipboard,c=CKEDITOR.env.isCustomDomain();function d(e){var f=new CKEDITOR.dom.document(e.document),g=f.$,h=f.getById('cke_actscrpt');h&&h.remove();CKEDITOR.env.ie?g.body.contentEditable='true':g.designMode='on';if(CKEDITOR.env.ie&&CKEDITOR.env.version<8)f.getWindow().on('blur',function(){g.selection.empty();});f.on('keydown',function(i){var j=i.data,k=j.getKeystroke(),l;switch(k){case 27:this.hide();l=1;break;case 9:case CKEDITOR.SHIFT+9:this.changeFocus(1);l=1;}l&&j.preventDefault();},this);a.fire('ariaWidget',new CKEDITOR.dom.element(e.frameElement));};return{title:b.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?370:350,minHeight:CKEDITOR.env.quirks?250:245,onShow:function(){this.parts.dialog.$.offsetHeight;this.setupContent();},onHide:function(){if(CKEDITOR.env.ie)this.getParentEditor().document.getBody().$.contentEditable='true';},onLoad:function(){if((CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&a.lang.dir=='rtl')this.parts.contents.setStyle('overflow','hidden');},onOk:function(){this.commitContent();},contents:[{id:'general',label:a.lang.common.generalTab,elements:[{type:'html',id:'securityMsg',html:'<div style="white-space:normal;width:340px;">'+b.securityMsg+'</div>'},{type:'html',id:'pasteMsg',html:'<div style="white-space:normal;width:340px;">'+b.pasteMsg+'</div>'},{type:'html',id:'editing_area',style:'width: 100%; height: 100%;',html:'',focus:function(){var e=this.getInputElement().$.contentWindow;setTimeout(function(){e.focus();},500);},setup:function(){var e=this.getDialog(),f='<html dir="'+a.config.contentsLangDirection+'"'+' lang="'+(a.config.contentsLanguage||a.langCode)+'">'+'<head><style>body { margin: 3px; height: 95%; } </style></head><body>'+'<script id="cke_actscrpt" type="text/javascript">'+'window.parent.CKEDITOR.tools.callFunction( '+CKEDITOR.tools.addFunction(d,e)+', this );'+'</script></body>'+'</html>',g=CKEDITOR.env.air?'javascript:void(0)':c?"javascript:void((function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})())"':'',h=CKEDITOR.dom.element.createFromHtml('<iframe class="cke_pasteframe" frameborder="0" allowTransparency="true" src="'+g+'"'+' role="region"'+' aria-label="'+b.pasteArea+'"'+' aria-describedby="'+e.getContentElement('general','pasteMsg').domId+'"'+' aria-multiple="true"'+'></iframe>');h.on('load',function(k){k.removeListener();var l=h.getFrameDocument();l.write(f);if(CKEDITOR.env.air)d.call(this,l.getWindow().$);
},e);h.setCustomData('dialog',e);var i=this.getElement();i.setHtml('');i.append(h);if(CKEDITOR.env.ie){var j=CKEDITOR.dom.element.createFromHtml('<span tabindex="-1" style="position:absolute;" role="presentation"></span>');j.on('focus',function(){h.$.contentWindow.focus();});i.append(j);this.focus=function(){j.focus();this.fire('focus');};}this.getInputElement=function(){return h;};if(CKEDITOR.env.ie){i.setStyle('display','block');i.setStyle('height',h.$.offsetHeight+2+'px');}},commit:function(e){var f=this.getElement(),g=this.getDialog().getParentEditor(),h=this.getInputElement().getFrameDocument().getBody(),i=h.getBogus(),j;i&&i.remove();j=h.getHtml();setTimeout(function(){g.fire('paste',{html:j});},0);}}]}]};});
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/colordialog/dialogs/colordialog.js b/appsrc/ODS-Framework/ckeditor/plugins/colordialog/dialogs/colordialog.js
index 1f4138f..5663387 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/colordialog/dialogs/colordialog.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/colordialog/dialogs/colordialog.js
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-CKEDITOR.dialog.add('colordialog',function(a){var b=CKEDITOR.dom.element,c=CKEDITOR.document,d=CKEDITOR.tools,e=a.lang.colordialog,f,g={type:'html',html:' '};function h(){c.getById(x).removeStyle('background-color');f.getContentElement('picker','selectedColor').setValue('');};function i(z){if(!(z instanceof CKEDITOR.dom.event))z=new CKEDITOR.dom.event(z);var A=z.getTarget(),B;if(A.getName()=='a'&&(B=A.getChild(0).getHtml()))f.getContentElement('picker','selectedColor').setValue(B);};function j(z){if(!(z instanceof CKEDITOR.dom.event))z=z.data;var A=z.getTarget(),B;if(A.getName()=='a'&&(B=A.getChild(0).getHtml())){c.getById(v).setStyle('background-color',B);c.getById(w).setHtml(B);}};function k(){c.getById(v).removeStyle('background-color');c.getById(w).setHtml(' ');};var l=d.addFunction(k),m=i,n=CKEDITOR.tools.addFunction(m),o=j,p=k,q=CKEDITOR.tools.addFunction(function(z){z=new CKEDITOR.dom.event(z);var A=z.getTarget(),B,C,D=z.getKeystroke(),E=a.lang.dir=='rtl';switch(D){case 38:if(B=A.getParent().getParent().getPrevious()){C=B.getChild([A.getParent().getIndex(),0]);C.focus();p(z,A);o(z,C);}z.preventDefault();break;case 40:if(B=A.getParent().getParent().getNext()){C=B.getChild([A.getParent().getIndex(),0]);if(C&&C.type==1){C.focus();p(z,A);o(z,C);}}z.preventDefault();break;case 32:m(z);z.preventDefault();break;case E?37:39:if(B=A.getParent().getNext()){C=B.getChild(0);if(C.type==1){C.focus();p(z,A);o(z,C);z.preventDefault(true);}else p(null,A);}else if(B=A.getParent().getParent().getNext()){C=B.getChild([0,0]);if(C&&C.type==1){C.focus();p(z,A);o(z,C);z.preventDefault(true);}else p(null,A);}break;case E?39:37:if(B=A.getParent().getPrevious()){C=B.getChild(0);C.focus();p(z,A);o(z,C);z.preventDefault(true);}else if(B=A.getParent().getParent().getPrevious()){C=B.getLast().getChild(0);C.focus();p(z,A);o(z,C);z.preventDefault(true);}else p(null,A);break;default:return;}});function r(){var z=['00','33','66','99','cc','ff'];function A(F,G){for(var H=F;H<F+3;H++){var I=s.$.insertRow(-1);for(var J=G;J<G+3;J++)for(var K=0;K<6;K++)B(I,'#'+z[J]+z[K]+z[H]);}};function B(F,G){var H=new b(F.insertCell(-1));H.setAttribute('class','ColorCell');H.setStyle('background-color',G);H.setStyle('width','15px');H.setStyle('height','15px');var I=H.$.cellIndex+1+18*F.rowIndex;H.append(CKEDITOR.dom.element.createFromHtml('<a href="javascript: void(0);" role="option" aria-posinset="'+I+'"'+' aria-setsize="'+234+'"'+' style="cursor: pointer;display:block;width:100%;height:100% " title="'+CKEDITOR.tools.htmlEncode(G)+'"'+' onkeydown="CKEDITOR.tools.callFunction( '+q+', event, this )"'+' onclick="CKEDITOR.tools.callFunction('+n+', event, this ); return false;"'+' tabindex="-1"><span class="cke_voice_label">'+G+'</span> </a>',CKEDITOR.document));
-};A(0,0);A(3,0);A(0,3);A(3,3);var C=s.$.insertRow(-1);for(var D=0;D<6;D++)B(C,'#'+z[D]+z[D]+z[D]);for(var E=0;E<12;E++)B(C,'#000000');};var s=new b('table');r();var t=s.getHtml(),u=function(z){return CKEDITOR.tools.getNextId()+'_'+z;},v=u('hicolor'),w=u('hicolortext'),x=u('selhicolor'),y=u('color_table_label');return{title:e.title,minWidth:360,minHeight:220,onLoad:function(){f=this;},contents:[{id:'picker',label:e.title,accessKey:'I',elements:[{type:'hbox',padding:0,widths:['70%','10%','30%'],children:[{type:'html',html:'<table role="listbox" aria-labelledby="'+y+'" onmouseout="CKEDITOR.tools.callFunction( '+l+' );">'+(!CKEDITOR.env.webkit?t:'')+'</table><span id="'+y+'" class="cke_voice_label">'+e.options+'</span>',onLoad:function(){var z=CKEDITOR.document.getById(this.domId);z.on('mouseover',j);CKEDITOR.env.webkit&&z.setHtml(t);},focus:function(){var z=this.getElement().getElementsByTag('a').getItem(0);z.focus();}},g,{type:'vbox',padding:0,widths:['70%','5%','25%'],children:[{type:'html',html:'<span>'+e.highlight+'</span>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+v+'" style="border: 1px solid; height: 74px; width: 74px;"></div>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+w+'"> </div><span>'+e.selected+'</span>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+x+'" style="border: 1px solid; height: 20px; width: 74px;"></div>'},{type:'text',label:e.selected,labelStyle:'display:none',id:'selectedColor',style:'width: 74px',onChange:function(){try{c.getById(x).setStyle('background-color',this.getValue());}catch(z){h();}}},g,{type:'button',id:'clear',style:'margin-top: 5px',label:e.clear,onClick:h}]}]}]}]};});
+CKEDITOR.dialog.add('colordialog',function(a){var b=CKEDITOR.dom.element,c=CKEDITOR.document,d=a.lang.colordialog,e,f={type:'html',html:' '},g;function h(){c.getById(u).removeStyle('background-color');e.getContentElement('picker','selectedColor').setValue('');g&&g.removeAttribute('aria-selected');g=null;};function i(w){var x=w.data.getTarget(),y;if(x.getName()=='td'&&(y=x.getChild(0).getHtml())){g=x;g.setAttribute('aria-selected',true);e.getContentElement('picker','selectedColor').setValue(y);}};function j(w){w=w.replace(/^#/,'');for(var x=0,y=[];x<=2;x++)y[x]=parseInt(w.substr(x*2,2),16);var z=0.2126*y[0]+0.7152*y[1]+0.0722*y[2];return '#'+(z>=165?'000':'fff');};var k,l;function m(w){!w.name&&(w=new CKEDITOR.event(w));var x=!/mouse/.test(w.name),y=w.data.getTarget(),z;if(y.getName()=='td'&&(z=y.getChild(0).getHtml())){o(w);x?k=y:l=y;if(x){y.setStyle('border-color',j(z));y.setStyle('border-style','dotted');}c.getById(s).setStyle('background-color',z);c.getById(t).setHtml(z);}};function n(){var w=k.getChild(0).getHtml();k.setStyle('border-color',w);k.setStyle('border-style','solid');c.getById(s).removeStyle('background-color');c.getById(t).setHtml(' ');k=null;};function o(w){var x=!/mouse/.test(w.name),y=x&&k;if(y){var z=y.getChild(0).getHtml();y.setStyle('border-color',z);y.setStyle('border-style','solid');}if(!(k||l)){c.getById(s).removeStyle('background-color');c.getById(t).setHtml(' ');}};function p(w){var x=w.data,y=x.getTarget(),z,A,B=x.getKeystroke(),C=a.lang.dir=='rtl';switch(B){case 38:if(z=y.getParent().getPrevious()){A=z.getChild([y.getIndex()]);A.focus();}x.preventDefault();break;case 40:if(z=y.getParent().getNext()){A=z.getChild([y.getIndex()]);if(A&&A.type==1)A.focus();}x.preventDefault();break;case 32:case 13:i(w);x.preventDefault();break;case C?37:39:if(A=y.getNext()){if(A.type==1){A.focus();x.preventDefault(true);}}else if(z=y.getParent().getNext()){A=z.getChild([0]);if(A&&A.type==1){A.focus();x.preventDefault(true);}}break;case C?39:37:if(A=y.getPrevious()){A.focus();x.preventDefault(true);}else if(z=y.getParent().getPrevious()){A=z.getLast();A.focus();x.preventDefault(true);}break;default:return;}};function q(){v=CKEDITOR.dom.element.createFromHtml('<table tabIndex="-1" aria-label="'+d.options+'"'+' role="grid" style="border-collapse:separate;" cellspacing="0">'+'<caption class="cke_voice_label">'+d.options+'</caption>'+'<tbody role="presentation"></tbody></table>');v.on('mouseover',m);v.on('mouseout',o);var w=['00','33','66','99','cc','ff'];
+function x(C,D){for(var E=C;E<C+3;E++){var F=new b(v.$.insertRow(-1));F.setAttribute('role','row');for(var G=D;G<D+3;G++)for(var H=0;H<6;H++)y(F.$,'#'+w[G]+w[H]+w[E]);}};function y(C,D){var E=new b(C.insertCell(-1));E.setAttribute('class','ColorCell');E.setAttribute('tabIndex',-1);E.setAttribute('role','gridcell');E.on('keydown',p);E.on('click',i);E.on('focus',m);E.on('blur',o);E.setStyle('background-color',D);E.setStyle('border','1px solid '+D);E.setStyle('width','14px');E.setStyle('height','14px');var F=r('color_table_cell');E.setAttribute('aria-labelledby',F);E.append(CKEDITOR.dom.element.createFromHtml('<span id="'+F+'" class="cke_voice_label">'+D+'</span>',CKEDITOR.document));};x(0,0);x(3,0);x(0,3);x(3,3);var z=new b(v.$.insertRow(-1));z.setAttribute('role','row');for(var A=0;A<6;A++)y(z.$,'#'+w[A]+w[A]+w[A]);for(var B=0;B<12;B++)y(z.$,'#000000');};var r=function(w){return CKEDITOR.tools.getNextId()+'_'+w;},s=r('hicolor'),t=r('hicolortext'),u=r('selhicolor'),v;q();return{title:d.title,minWidth:360,minHeight:220,onLoad:function(){e=this;},onHide:function(){h();n();},contents:[{id:'picker',label:d.title,accessKey:'I',elements:[{type:'hbox',padding:0,widths:['70%','10%','30%'],children:[{type:'html',html:'<div></div>',onLoad:function(){CKEDITOR.document.getById(this.domId).append(v);},focus:function(){(k||this.getElement().getElementsByTag('td').getItem(0)).focus();}},f,{type:'vbox',padding:0,widths:['70%','5%','25%'],children:[{type:'html',html:'<span>'+d.highlight+'</span>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+s+'" style="border: 1px solid; height: 74px; width: 74px;"></div>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+t+'"> </div><span>'+d.selected+'</span>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+u+'" style="border: 1px solid; height: 20px; width: 74px;"></div>'},{type:'text',label:d.selected,labelStyle:'display:none',id:'selectedColor',style:'width: 74px',onChange:function(){try{c.getById(u).setStyle('background-color',this.getValue());}catch(w){h();}}},f,{type:'button',id:'clear',style:'margin-top: 5px',label:d.clear,onClick:h}]}]}]}]};});
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/find/dialogs/find.js b/appsrc/ODS-Framework/ckeditor/plugins/find/dialogs/find.js
index 99277bb..66ed2e7 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/find/dialogs/find.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/find/dialogs/find.js
@@ -1,10 +1,10 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-(function(){var a;function b(i){return i.type==CKEDITOR.NODE_TEXT&&i.getLength()>0&&(!a||!i.isReadOnly());};function c(i){return!(i.type==CKEDITOR.NODE_ELEMENT&&i.isBlockBoundary(CKEDITOR.tools.extend({},CKEDITOR.dtd.$empty,CKEDITOR.dtd.$nonEditable)));};var d=function(){var i=this;return{textNode:i.textNode,offset:i.offset,character:i.textNode?i.textNode.getText().charAt(i.offset):null,hitMatchBoundary:i._.matchBoundary};},e=['find','replace'],f=[['txtFindFind','txtFindReplace'],['txtFindCaseChk','txtReplaceCaseChk'],['txtFindWordChk','txtReplaceWordChk'],['txtFindCyclic','txtReplaceCyclic']];function g(i){var j,k,l,m;j=i==='find'?1:0;k=1-j;var n,o=f.length;for(n=0;n<o;n++){l=this.getContentElement(e[j],f[n][j]);m=this.getContentElement(e[k],f[n][k]);m.setValue(l.getValue());}};var h=function(i,j){var k=new CKEDITOR.style(CKEDITOR.tools.extend({fullMatch:true,childRule:function(){return 0;}},i.config.find_highlight)),l=function(y,z){var A=this,B=new CKEDITOR.dom.walker(y);B.guard=z?c:function(C){!c(C)&&(A._.matchBoundary=true);};B.evaluator=b;B.breakOnFalse=1;if(y.startContainer.type==CKEDITOR.NODE_TEXT){this.textNode=y.startContainer;this.offset=y.startOffset-1;}this._={matchWord:z,walker:B,matchBoundary:false};};l.prototype={next:function(){return this.move();},back:function(){return this.move(true);},move:function(y){var A=this;var z=A.textNode;if(z===null)return d.call(A);A._.matchBoundary=false;if(z&&y&&A.offset>0){A.offset--;return d.call(A);}else if(z&&A.offset<z.getLength()-1){A.offset++;return d.call(A);}else{z=null;while(!z){z=A._.walker[y?'previous':'next'].call(A._.walker);if(A._.matchWord&&!z||A._.walker._.end)break;}A.textNode=z;if(z)A.offset=y?z.getLength()-1:0;else A.offset=0;}return d.call(A);}};var m=function(y,z){this._={walker:y,cursors:[],rangeLength:z,highlightRange:null,isMatched:0};};m.prototype={toDomRange:function(){var y=new CKEDITOR.dom.range(i.document),z=this._.cursors;if(z.length<1){var A=this._.walker.textNode;if(A)y.setStartAfter(A);else return null;}else{var B=z[0],C=z[z.length-1];y.setStart(B.textNode,B.offset);y.setEnd(C.textNode,C.offset+1);}return y;},updateFromDomRange:function(y){var B=this;var z,A=new l(y);B._.cursors=[];do{z=A.next();if(z.character)B._.cursors.push(z);}while(z.character);B._.rangeLength=B._.cursors.length;},setMatched:function(){this._.isMatched=true;},clearMatched:function(){this._.isMatched=false;},isMatched:function(){return this._.isMatched;},highlight:function(){var B=this;if(B._.cursors.length<1)return;
-if(B._.highlightRange)B.removeHighlight();var y=B.toDomRange(),z=y.createBookmark();k.applyToRange(y);y.moveToBookmark(z);B._.highlightRange=y;var A=y.startContainer;if(A.type!=CKEDITOR.NODE_ELEMENT)A=A.getParent();A.scrollIntoView();B.updateFromDomRange(y);},removeHighlight:function(){var z=this;if(!z._.highlightRange)return;var y=z._.highlightRange.createBookmark();k.removeFromRange(z._.highlightRange);z._.highlightRange.moveToBookmark(y);z.updateFromDomRange(z._.highlightRange);z._.highlightRange=null;},isReadOnly:function(){if(!this._.highlightRange)return 0;return this._.highlightRange.startContainer.isReadOnly();},moveBack:function(){var A=this;var y=A._.walker.back(),z=A._.cursors;if(y.hitMatchBoundary)A._.cursors=z=[];z.unshift(y);if(z.length>A._.rangeLength)z.pop();return y;},moveNext:function(){var A=this;var y=A._.walker.next(),z=A._.cursors;if(y.hitMatchBoundary)A._.cursors=z=[];z.push(y);if(z.length>A._.rangeLength)z.shift();return y;},getEndCharacter:function(){var y=this._.cursors;if(y.length<1)return null;return y[y.length-1].character;},getNextCharacterRange:function(y){var z,A,B=this._.cursors;if((z=B[B.length-1])&&z.textNode)A=new l(n(z));else A=this._.walker;return new m(A,y);},getCursors:function(){return this._.cursors;}};function n(y,z){var A=new CKEDITOR.dom.range();A.setStart(y.textNode,z?y.offset:y.offset+1);A.setEndAt(i.document.getBody(),CKEDITOR.POSITION_BEFORE_END);return A;};function o(y){var z=new CKEDITOR.dom.range();z.setStartAt(i.document.getBody(),CKEDITOR.POSITION_AFTER_START);z.setEnd(y.textNode,y.offset);return z;};var p=0,q=1,r=2,s=function(y,z){var A=[-1];if(z)y=y.toLowerCase();for(var B=0;B<y.length;B++){A.push(A[B]+1);while(A[B+1]>0&&y.charAt(B)!=y.charAt(A[B+1]-1))A[B+1]=A[A[B+1]-1]+1;}this._={overlap:A,state:0,ignoreCase:!!z,pattern:y};};s.prototype={feedCharacter:function(y){var z=this;if(z._.ignoreCase)y=y.toLowerCase();for(;;){if(y==z._.pattern.charAt(z._.state)){z._.state++;if(z._.state==z._.pattern.length){z._.state=0;return r;}return q;}else if(!z._.state)return p;else z._.state=z._.overlap[z._.state];}return null;},reset:function(){this._.state=0;}};var t=/[.,"'?!;: \u0085\u00a0\u1680\u280e\u2028\u2029\u202f\u205f\u3000]/,u=function(y){if(!y)return true;var z=y.charCodeAt(0);return z>=9&&z<=13||z>=8192&&z<=8202||t.test(y);},v={searchRange:null,matchRange:null,find:function(y,z,A,B,C,D){var M=this;if(!M.matchRange)M.matchRange=new m(new l(M.searchRange),y.length);else{M.matchRange.removeHighlight();M.matchRange=M.matchRange.getNextCharacterRange(y.length);
-}var E=new s(y,!z),F=p,G='%';while(G!==null){M.matchRange.moveNext();while(G=M.matchRange.getEndCharacter()){F=E.feedCharacter(G);if(F==r)break;if(M.matchRange.moveNext().hitMatchBoundary)E.reset();}if(F==r){if(A){var H=M.matchRange.getCursors(),I=H[H.length-1],J=H[0],K=new l(o(J),true),L=new l(n(I),true);if(!(u(K.back().character)&&u(L.next().character)))continue;}M.matchRange.setMatched();if(C!==false)M.matchRange.highlight();return true;}}M.matchRange.clearMatched();M.matchRange.removeHighlight();if(B&&!D){M.searchRange=w(1);M.matchRange=null;return arguments.callee.apply(M,Array.prototype.slice.call(arguments).concat([true]));}return false;},replaceCounter:0,replace:function(y,z,A,B,C,D,E){var J=this;a=1;var F=0;if(J.matchRange&&J.matchRange.isMatched()&&!J.matchRange._.isReplaced&&!J.matchRange.isReadOnly()){J.matchRange.removeHighlight();var G=J.matchRange.toDomRange(),H=i.document.createText(A);if(!E){var I=i.getSelection();I.selectRanges([G]);i.fire('saveSnapshot');}G.deleteContents();G.insertNode(H);if(!E){I.selectRanges([G]);i.fire('saveSnapshot');}J.matchRange.updateFromDomRange(G);if(!E)J.matchRange.highlight();J.matchRange._.isReplaced=true;J.replaceCounter++;F=1;}else F=J.find(z,B,C,D,!E);a=0;return F;}};function w(y){var z,A=i.getSelection(),B=i.document.getBody();if(A&&!y){z=A.getRanges()[0].clone();z.collapse(true);}else{z=new CKEDITOR.dom.range();z.setStartAt(B,CKEDITOR.POSITION_AFTER_START);}z.setEndAt(B,CKEDITOR.POSITION_BEFORE_END);return z;};var x=i.lang.findAndReplace;return{title:x.title,resizable:CKEDITOR.DIALOG_RESIZE_NONE,minWidth:350,minHeight:170,buttons:[CKEDITOR.dialog.cancelButton],contents:[{id:'find',label:x.find,title:x.find,accessKey:'',elements:[{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtFindFind',label:x.findWhat,isChanged:false,labelLayout:'horizontal',accessKey:'F'},{type:'button',id:'btnFind',align:'left',style:'width:100%',label:x.find,onClick:function(){var y=this.getDialog();if(!v.find(y.getValueOf('find','txtFindFind'),y.getValueOf('find','txtFindCaseChk'),y.getValueOf('find','txtFindWordChk'),y.getValueOf('find','txtFindCyclic')))alert(x.notFoundMsg);}}]},{type:'vbox',padding:0,children:[{type:'checkbox',id:'txtFindCaseChk',isChanged:false,style:'margin-top:28px',label:x.matchCase},{type:'checkbox',id:'txtFindWordChk',isChanged:false,label:x.matchWord},{type:'checkbox',id:'txtFindCyclic',isChanged:false,'default':true,label:x.matchCyclic}]}]},{id:'replace',label:x.replace,accessKey:'M',elements:[{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtFindReplace',label:x.findWhat,isChanged:false,labelLayout:'horizontal',accessKey:'F'},{type:'button',id:'btnFindReplace',align:'left',style:'width:100%',label:x.replace,onClick:function(){var y=this.getDialog();
-if(!v.replace(y,y.getValueOf('replace','txtFindReplace'),y.getValueOf('replace','txtReplace'),y.getValueOf('replace','txtReplaceCaseChk'),y.getValueOf('replace','txtReplaceWordChk'),y.getValueOf('replace','txtReplaceCyclic')))alert(x.notFoundMsg);}}]},{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtReplace',label:x.replaceWith,isChanged:false,labelLayout:'horizontal',accessKey:'R'},{type:'button',id:'btnReplaceAll',align:'left',style:'width:100%',label:x.replaceAll,isChanged:false,onClick:function(){var y=this.getDialog(),z;v.replaceCounter=0;v.searchRange=w(1);if(v.matchRange){v.matchRange.removeHighlight();v.matchRange=null;}i.fire('saveSnapshot');while(v.replace(y,y.getValueOf('replace','txtFindReplace'),y.getValueOf('replace','txtReplace'),y.getValueOf('replace','txtReplaceCaseChk'),y.getValueOf('replace','txtReplaceWordChk'),false,true)){}if(v.replaceCounter){alert(x.replaceSuccessMsg.replace(/%1/,v.replaceCounter));i.fire('saveSnapshot');}else alert(x.notFoundMsg);}}]},{type:'vbox',padding:0,children:[{type:'checkbox',id:'txtReplaceCaseChk',isChanged:false,label:x.matchCase},{type:'checkbox',id:'txtReplaceWordChk',isChanged:false,label:x.matchWord},{type:'checkbox',id:'txtReplaceCyclic',isChanged:false,'default':true,label:x.matchCyclic}]}]}],onLoad:function(){var y=this,z,A,B=0;this.on('hide',function(){B=0;});this.on('show',function(){B=1;});this.selectPage=CKEDITOR.tools.override(this.selectPage,function(C){return function(D){C.call(y,D);var E=y._.tabs[D],F,G,H;G=D==='find'?'txtFindFind':'txtFindReplace';H=D==='find'?'txtFindWordChk':'txtReplaceWordChk';z=y.getContentElement(D,G);A=y.getContentElement(D,H);if(!E.initialized){F=CKEDITOR.document.getById(z._.inputId);E.initialized=true;}if(B)g.call(this,D);};});},onShow:function(){var B=this;v.searchRange=w();var y=B.getParentEditor().getSelection().getSelectedText(),z=j=='find'?'txtFindFind':'txtFindReplace',A=B.getContentElement(j,z);A.setValue(y);A.select();B.selectPage(j);B[(j=='find'&&B._.editor.readOnly?'hide':'show')+'Page']('replace');},onHide:function(){var y;if(v.matchRange&&v.matchRange.isMatched()){v.matchRange.removeHighlight();i.focus();y=v.matchRange.toDomRange();if(y)i.getSelection().selectRanges([y]);}delete v.matchRange;},onFocus:function(){if(j=='replace')return this.getContentElement('replace','txtFindReplace');else return this.getContentElement('find','txtFindFind');}};};CKEDITOR.dialog.add('find',function(i){return h(i,'find');});CKEDITOR.dialog.add('replace',function(i){return h(i,'replace');
-});})();
+(function(){var a;function b(i){return i.type==CKEDITOR.NODE_TEXT&&i.getLength()>0&&(!a||!i.isReadOnly());};function c(i){return!(i.type==CKEDITOR.NODE_ELEMENT&&i.isBlockBoundary(CKEDITOR.tools.extend({},CKEDITOR.dtd.$empty,CKEDITOR.dtd.$nonEditable)));};var d=function(){var i=this;return{textNode:i.textNode,offset:i.offset,character:i.textNode?i.textNode.getText().charAt(i.offset):null,hitMatchBoundary:i._.matchBoundary};},e=['find','replace'],f=[['txtFindFind','txtFindReplace'],['txtFindCaseChk','txtReplaceCaseChk'],['txtFindWordChk','txtReplaceWordChk'],['txtFindCyclic','txtReplaceCyclic']];function g(i){var j,k,l,m;j=i==='find'?1:0;k=1-j;var n,o=f.length;for(n=0;n<o;n++){l=this.getContentElement(e[j],f[n][j]);m=this.getContentElement(e[k],f[n][k]);m.setValue(l.getValue());}};var h=function(i,j){var k=new CKEDITOR.style(CKEDITOR.tools.extend({attributes:{'data-cke-highlight':1},fullMatch:1,ignoreReadonly:1,childRule:function(){return 0;}},i.config.find_highlight,true)),l=function(y,z){var A=this,B=new CKEDITOR.dom.walker(y);B.guard=z?c:function(C){!c(C)&&(A._.matchBoundary=true);};B.evaluator=b;B.breakOnFalse=1;if(y.startContainer.type==CKEDITOR.NODE_TEXT){this.textNode=y.startContainer;this.offset=y.startOffset-1;}this._={matchWord:z,walker:B,matchBoundary:false};};l.prototype={next:function(){return this.move();},back:function(){return this.move(true);},move:function(y){var A=this;var z=A.textNode;if(z===null)return d.call(A);A._.matchBoundary=false;if(z&&y&&A.offset>0){A.offset--;return d.call(A);}else if(z&&A.offset<z.getLength()-1){A.offset++;return d.call(A);}else{z=null;while(!z){z=A._.walker[y?'previous':'next'].call(A._.walker);if(A._.matchWord&&!z||A._.walker._.end)break;}A.textNode=z;if(z)A.offset=y?z.getLength()-1:0;else A.offset=0;}return d.call(A);}};var m=function(y,z){this._={walker:y,cursors:[],rangeLength:z,highlightRange:null,isMatched:0};};m.prototype={toDomRange:function(){var y=new CKEDITOR.dom.range(i.document),z=this._.cursors;if(z.length<1){var A=this._.walker.textNode;if(A)y.setStartAfter(A);else return null;}else{var B=z[0],C=z[z.length-1];y.setStart(B.textNode,B.offset);y.setEnd(C.textNode,C.offset+1);}return y;},updateFromDomRange:function(y){var B=this;var z,A=new l(y);B._.cursors=[];do{z=A.next();if(z.character)B._.cursors.push(z);}while(z.character);B._.rangeLength=B._.cursors.length;},setMatched:function(){this._.isMatched=true;},clearMatched:function(){this._.isMatched=false;},isMatched:function(){return this._.isMatched;
+},highlight:function(){var B=this;if(B._.cursors.length<1)return;if(B._.highlightRange)B.removeHighlight();var y=B.toDomRange(),z=y.createBookmark();k.applyToRange(y);y.moveToBookmark(z);B._.highlightRange=y;var A=y.startContainer;if(A.type!=CKEDITOR.NODE_ELEMENT)A=A.getParent();A.scrollIntoView();B.updateFromDomRange(y);},removeHighlight:function(){var z=this;if(!z._.highlightRange)return;var y=z._.highlightRange.createBookmark();k.removeFromRange(z._.highlightRange);z._.highlightRange.moveToBookmark(y);z.updateFromDomRange(z._.highlightRange);z._.highlightRange=null;},isReadOnly:function(){if(!this._.highlightRange)return 0;return this._.highlightRange.startContainer.isReadOnly();},moveBack:function(){var A=this;var y=A._.walker.back(),z=A._.cursors;if(y.hitMatchBoundary)A._.cursors=z=[];z.unshift(y);if(z.length>A._.rangeLength)z.pop();return y;},moveNext:function(){var A=this;var y=A._.walker.next(),z=A._.cursors;if(y.hitMatchBoundary)A._.cursors=z=[];z.push(y);if(z.length>A._.rangeLength)z.shift();return y;},getEndCharacter:function(){var y=this._.cursors;if(y.length<1)return null;return y[y.length-1].character;},getNextCharacterRange:function(y){var z,A,B=this._.cursors;if((z=B[B.length-1])&&z.textNode)A=new l(n(z));else A=this._.walker;return new m(A,y);},getCursors:function(){return this._.cursors;}};function n(y,z){var A=new CKEDITOR.dom.range();A.setStart(y.textNode,z?y.offset:y.offset+1);A.setEndAt(i.document.getBody(),CKEDITOR.POSITION_BEFORE_END);return A;};function o(y){var z=new CKEDITOR.dom.range();z.setStartAt(i.document.getBody(),CKEDITOR.POSITION_AFTER_START);z.setEnd(y.textNode,y.offset);return z;};var p=0,q=1,r=2,s=function(y,z){var A=[-1];if(z)y=y.toLowerCase();for(var B=0;B<y.length;B++){A.push(A[B]+1);while(A[B+1]>0&&y.charAt(B)!=y.charAt(A[B+1]-1))A[B+1]=A[A[B+1]-1]+1;}this._={overlap:A,state:0,ignoreCase:!!z,pattern:y};};s.prototype={feedCharacter:function(y){var z=this;if(z._.ignoreCase)y=y.toLowerCase();for(;;){if(y==z._.pattern.charAt(z._.state)){z._.state++;if(z._.state==z._.pattern.length){z._.state=0;return r;}return q;}else if(!z._.state)return p;else z._.state=z._.overlap[z._.state];}return null;},reset:function(){this._.state=0;}};var t=/[.,"'?!;: \u0085\u00a0\u1680\u280e\u2028\u2029\u202f\u205f\u3000]/,u=function(y){if(!y)return true;var z=y.charCodeAt(0);return z>=9&&z<=13||z>=8192&&z<=8202||t.test(y);},v={searchRange:null,matchRange:null,find:function(y,z,A,B,C,D){var M=this;if(!M.matchRange)M.matchRange=new m(new l(M.searchRange),y.length);
+else{M.matchRange.removeHighlight();M.matchRange=M.matchRange.getNextCharacterRange(y.length);}var E=new s(y,!z),F=p,G='%';while(G!==null){M.matchRange.moveNext();while(G=M.matchRange.getEndCharacter()){F=E.feedCharacter(G);if(F==r)break;if(M.matchRange.moveNext().hitMatchBoundary)E.reset();}if(F==r){if(A){var H=M.matchRange.getCursors(),I=H[H.length-1],J=H[0],K=new l(o(J),true),L=new l(n(I),true);if(!(u(K.back().character)&&u(L.next().character)))continue;}M.matchRange.setMatched();if(C!==false)M.matchRange.highlight();return true;}}M.matchRange.clearMatched();M.matchRange.removeHighlight();if(B&&!D){M.searchRange=w(1);M.matchRange=null;return arguments.callee.apply(M,Array.prototype.slice.call(arguments).concat([true]));}return false;},replaceCounter:0,replace:function(y,z,A,B,C,D,E){var J=this;a=1;var F=0;if(J.matchRange&&J.matchRange.isMatched()&&!J.matchRange._.isReplaced&&!J.matchRange.isReadOnly()){J.matchRange.removeHighlight();var G=J.matchRange.toDomRange(),H=i.document.createText(A);if(!E){var I=i.getSelection();I.selectRanges([G]);i.fire('saveSnapshot');}G.deleteContents();G.insertNode(H);if(!E){I.selectRanges([G]);i.fire('saveSnapshot');}J.matchRange.updateFromDomRange(G);if(!E)J.matchRange.highlight();J.matchRange._.isReplaced=true;J.replaceCounter++;F=1;}else F=J.find(z,B,C,D,!E);a=0;return F;}};function w(y){var z,A=i.getSelection(),B=i.document.getBody();if(A&&!y){z=A.getRanges()[0].clone();z.collapse(true);}else{z=new CKEDITOR.dom.range();z.setStartAt(B,CKEDITOR.POSITION_AFTER_START);}z.setEndAt(B,CKEDITOR.POSITION_BEFORE_END);return z;};var x=i.lang.findAndReplace;return{title:x.title,resizable:CKEDITOR.DIALOG_RESIZE_NONE,minWidth:350,minHeight:170,buttons:[CKEDITOR.dialog.cancelButton],contents:[{id:'find',label:x.find,title:x.find,accessKey:'',elements:[{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtFindFind',label:x.findWhat,isChanged:false,labelLayout:'horizontal',accessKey:'F'},{type:'button',id:'btnFind',align:'left',style:'width:100%',label:x.find,onClick:function(){var y=this.getDialog();if(!v.find(y.getValueOf('find','txtFindFind'),y.getValueOf('find','txtFindCaseChk'),y.getValueOf('find','txtFindWordChk'),y.getValueOf('find','txtFindCyclic')))alert(x.notFoundMsg);}}]},{type:'fieldset',label:CKEDITOR.tools.htmlEncode(x.findOptions),style:'margin-top:29px',children:[{type:'vbox',padding:0,children:[{type:'checkbox',id:'txtFindCaseChk',isChanged:false,label:x.matchCase},{type:'checkbox',id:'txtFindWordChk',isChanged:false,label:x.matchWord},{type:'checkbox',id:'txtFindCyclic',isChanged:false,'default':true,label:x.matchCyclic}]}]}]},{id:'replace',label:x.replace,accessKey:'M',elements:[{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtFindReplace',label:x.findWhat,isChanged:false,labelLayout:'horizontal',accessKey:'F'},{type:'button',id:'btnFindReplace',align:'left',style:'width:100%',label:x.replace,onClick:function(){var y=this.getDialog();
+if(!v.replace(y,y.getValueOf('replace','txtFindReplace'),y.getValueOf('replace','txtReplace'),y.getValueOf('replace','txtReplaceCaseChk'),y.getValueOf('replace','txtReplaceWordChk'),y.getValueOf('replace','txtReplaceCyclic')))alert(x.notFoundMsg);}}]},{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtReplace',label:x.replaceWith,isChanged:false,labelLayout:'horizontal',accessKey:'R'},{type:'button',id:'btnReplaceAll',align:'left',style:'width:100%',label:x.replaceAll,isChanged:false,onClick:function(){var y=this.getDialog(),z;v.replaceCounter=0;v.searchRange=w(1);if(v.matchRange){v.matchRange.removeHighlight();v.matchRange=null;}i.fire('saveSnapshot');while(v.replace(y,y.getValueOf('replace','txtFindReplace'),y.getValueOf('replace','txtReplace'),y.getValueOf('replace','txtReplaceCaseChk'),y.getValueOf('replace','txtReplaceWordChk'),false,true)){}if(v.replaceCounter){alert(x.replaceSuccessMsg.replace(/%1/,v.replaceCounter));i.fire('saveSnapshot');}else alert(x.notFoundMsg);}}]},{type:'fieldset',label:CKEDITOR.tools.htmlEncode(x.findOptions),children:[{type:'vbox',padding:0,children:[{type:'checkbox',id:'txtReplaceCaseChk',isChanged:false,label:x.matchCase},{type:'checkbox',id:'txtReplaceWordChk',isChanged:false,label:x.matchWord},{type:'checkbox',id:'txtReplaceCyclic',isChanged:false,'default':true,label:x.matchCyclic}]}]}]}],onLoad:function(){var y=this,z,A,B=0;this.on('hide',function(){B=0;});this.on('show',function(){B=1;});this.selectPage=CKEDITOR.tools.override(this.selectPage,function(C){return function(D){C.call(y,D);var E=y._.tabs[D],F,G,H;G=D==='find'?'txtFindFind':'txtFindReplace';H=D==='find'?'txtFindWordChk':'txtReplaceWordChk';z=y.getContentElement(D,G);A=y.getContentElement(D,H);if(!E.initialized){F=CKEDITOR.document.getById(z._.inputId);E.initialized=true;}if(B)g.call(this,D);};});},onShow:function(){var B=this;v.searchRange=w();var y=B.getParentEditor().getSelection().getSelectedText(),z=j=='find'?'txtFindFind':'txtFindReplace',A=B.getContentElement(j,z);A.setValue(y);A.select();B.selectPage(j);B[(j=='find'&&B._.editor.readOnly?'hide':'show')+'Page']('replace');},onHide:function(){var y;if(v.matchRange&&v.matchRange.isMatched()){v.matchRange.removeHighlight();i.focus();y=v.matchRange.toDomRange();if(y)i.getSelection().selectRanges([y]);}delete v.matchRange;},onFocus:function(){if(j=='replace')return this.getContentElement('replace','txtFindReplace');else return this.getContentElement('find','txtFindFind');}};};CKEDITOR.dialog.add('find',function(i){return h(i,'find');
+});CKEDITOR.dialog.add('replace',function(i){return h(i,'replace');});})();
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/flash/dialogs/flash.js b/appsrc/ODS-Framework/ckeditor/plugins/flash/dialogs/flash.js
index a0f522b..40f9452 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/flash/dialogs/flash.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/flash/dialogs/flash.js
@@ -1,9 +1,9 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
(function(){var a=1,b=2,c=4,d={id:[{type:a,name:'id'}],classid:[{type:a,name:'classid'}],codebase:[{type:a,name:'codebase'}],pluginspage:[{type:c,name:'pluginspage'}],src:[{type:b,name:'movie'},{type:c,name:'src'},{type:a,name:'data'}],name:[{type:c,name:'name'}],align:[{type:a,name:'align'}],title:[{type:a,name:'title'},{type:c,name:'title'}],'class':[{type:a,name:'class'},{type:c,name:'class'}],width:[{type:a,name:'width'},{type:c,name:'width'}],height:[{type:a,name:'height'},{type:c,name:'height'}],hSpace:[{type:a,name:'hSpace'},{type:c,name:'hSpace'}],vSpace:[{type:a,name:'vSpace'},{type:c,name:'vSpace'}],style:[{type:a,name:'style'},{type:c,name:'style'}],type:[{type:c,name:'type'}]},e=['play','loop','menu','quality','scale','salign','wmode','bgcolor','base','flashvars','allowScriptAccess','allowFullScreen'];for(var f=0;f<e.length;f++)d[e[f]]=[{type:c,name:e[f]},{type:b,name:e[f]}];e=['allowFullScreen','play','loop','menu'];for(f=0;f<e.length;f++)d[e[f]][0]['default']=d[e[f]][1]['default']=true;var g=CKEDITOR.tools.cssLength;function h(j,k,l){var r=this;var m=d[r.id];if(!m)return;var n=r instanceof CKEDITOR.ui.dialog.checkbox;for(var o=0;o<m.length;o++){var p=m[o];switch(p.type){case a:if(!j)continue;if(j.getAttribute(p.name)!==null){var q=j.getAttribute(p.name);if(n)r.setValue(q.toLowerCase()=='true');else r.setValue(q);return;}else if(n)r.setValue(!!p['default']);break;case b:if(!j)continue;if(p.name in l){q=l[p.name];if(n)r.setValue(q.toLowerCase()=='true');else r.setValue(q);return;}else if(n)r.setValue(!!p['default']);break;case c:if(!k)continue;if(k.getAttribute(p.name)){q=k.getAttribute(p.name);if(n)r.setValue(q.toLowerCase()=='true');else r.setValue(q);return;}else if(n)r.setValue(!!p['default']);}}};function i(j,k,l){var t=this;var m=d[t.id];if(!m)return;var n=t.getValue()==='',o=t instanceof CKEDITOR.ui.dialog.checkbox;for(var p=0;p<m.length;p++){var q=m[p];switch(q.type){case a:if(!j||q.name=='data'&&k&&!j.hasAttribute('data'))continue;var r=t.getValue();if(n||o&&r===q['default'])j.removeAttribute(q.name);else j.setAttribute(q.name,r);break;case b:if(!j)continue;r=t.getValue();if(n||o&&r===q['default']){if(q.name in l)l[q.name].remove();}else if(q.name in l)l[q.name].setAttribute('value',r);else{var s=CKEDITOR.dom.element.createFromHtml('<cke:param></cke:param>',j.getDocument());s.setAttributes({name:q.name,value:r});if(j.getChildCount()<1)s.appendTo(j);else s.insertBefore(j.getFirst());}break;case c:if(!k)continue;r=t.getValue();if(n||o&&r===q['default'])k.removeAttribute(q.name);
else k.setAttribute(q.name,r);}}};CKEDITOR.dialog.add('flash',function(j){var k=!j.config.flashEmbedTagOnly,l=j.config.flashAddEmbedTag||j.config.flashEmbedTagOnly,m,n='<div>'+CKEDITOR.tools.htmlEncode(j.lang.common.preview)+'<br>'+'<div id="cke_FlashPreviewLoader'+CKEDITOR.tools.getNextNumber()+'" style="display:none"><div class="loading"> </div></div>'+'<div id="cke_FlashPreviewBox'+CKEDITOR.tools.getNextNumber()+'" class="FlashPreviewBox"></div></div>';return{title:j.lang.flash.title,minWidth:420,minHeight:310,onShow:function(){var A=this;A.fakeImage=A.objectNode=A.embedNode=null;m=new CKEDITOR.dom.element('embed',j.document);var o=A.getSelectedElement();if(o&&o.data('cke-real-element-type')&&o.data('cke-real-element-type')=='flash'){A.fakeImage=o;var p=j.restoreRealElement(o),q=null,r=null,s={};if(p.getName()=='cke:object'){q=p;var t=q.getElementsByTag('embed','cke');if(t.count()>0)r=t.getItem(0);var u=q.getElementsByTag('param','cke');for(var v=0,w=u.count();v<w;v++){var x=u.getItem(v),y=x.getAttribute('name'),z=x.getAttribute('value');s[y]=z;}}else if(p.getName()=='cke:embed')r=p;A.objectNode=q;A.embedNode=r;A.setupContent(q,r,s,o);}},onOk:function(){var y=this;var o=null,p=null,q=null;if(!y.fakeImage){if(k){o=CKEDITOR.dom.element.createFromHtml('<cke:object></cke:object>',j.document);var r={classid:'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000',codebase:'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0'};o.setAttributes(r);}if(l){p=CKEDITOR.dom.element.createFromHtml('<cke:embed></cke:embed>',j.document);p.setAttributes({type:'application/x-shockwave-flash',pluginspage:'http://www.macromedia.com/go/getflashplayer'});if(o)p.appendTo(o);}}else{o=y.objectNode;p=y.embedNode;}if(o){q={};var s=o.getElementsByTag('param','cke');for(var t=0,u=s.count();t<u;t++)q[s.getItem(t).getAttribute('name')]=s.getItem(t);}var v={},w={};y.commitContent(o,p,q,v,w);var x=j.createFakeElement(o||p,'cke_flash','flash',true);x.setAttributes(w);x.setStyles(v);if(y.fakeImage){x.replace(y.fakeImage);j.getSelection().selectElement(x);}else j.insertElement(x);},onHide:function(){if(this.preview)this.preview.setHtml('');},contents:[{id:'info',label:j.lang.common.generalTab,accessKey:'I',elements:[{type:'vbox',padding:0,children:[{type:'hbox',widths:['280px','110px'],align:'right',children:[{id:'src',type:'text',label:j.lang.common.url,required:true,validate:CKEDITOR.dialog.validate.notEmpty(j.lang.flash.validateSrc),setup:h,commit:i,onLoad:function(){var o=this.getDialog(),p=function(q){m.setAttribute('src',q);
o.preview.setHtml('<embed height="100%" width="100%" src="'+CKEDITOR.tools.htmlEncode(m.getAttribute('src'))+'" type="application/x-shockwave-flash"></embed>');};o.preview=o.getContentElement('info','preview').getElement().getChild(3);this.on('change',function(q){if(q.data&&q.data.value)p(q.data.value);});this.getInputElement().on('change',function(q){p(this.getValue());},this);}},{type:'button',id:'browse',filebrowser:'info:src',hidden:true,style:'display:inline-block;margin-top:10px;',label:j.lang.common.browseServer}]}]},{type:'hbox',widths:['25%','25%','25%','25%','25%'],children:[{type:'text',id:'width',style:'width:95px',label:j.lang.common.width,validate:CKEDITOR.dialog.validate.htmlLength(j.lang.common.invalidHtmlLength.replace('%1',j.lang.common.width)),setup:h,commit:i},{type:'text',id:'height',style:'width:95px',label:j.lang.common.height,validate:CKEDITOR.dialog.validate.htmlLength(j.lang.common.invalidHtmlLength.replace('%1',j.lang.common.height)),setup:h,commit:i},{type:'text',id:'hSpace',style:'width:95px',label:j.lang.flash.hSpace,validate:CKEDITOR.dialog.validate.integer(j.lang.flash.validateHSpace),setup:h,commit:i},{type:'text',id:'vSpace',style:'width:95px',label:j.lang.flash.vSpace,validate:CKEDITOR.dialog.validate.integer(j.lang.flash.validateVSpace),setup:h,commit:i}]},{type:'vbox',children:[{type:'html',id:'preview',style:'width:95%;',html:n}]}]},{id:'Upload',hidden:true,filebrowser:'uploadButton',label:j.lang.common.upload,elements:[{type:'file',id:'upload',label:j.lang.common.upload,size:38},{type:'fileButton',id:'uploadButton',label:j.lang.common.uploadSubmit,filebrowser:'info:src','for':['Upload','upload']}]},{id:'properties',label:j.lang.flash.propertiesTab,elements:[{type:'hbox',widths:['50%','50%'],children:[{id:'scale',type:'select',label:j.lang.flash.scale,'default':'',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.flash.scaleAll,'showall'],[j.lang.flash.scaleNoBorder,'noborder'],[j.lang.flash.scaleFit,'exactfit']],setup:h,commit:i},{id:'allowScriptAccess',type:'select',label:j.lang.flash.access,'default':'',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.flash.accessAlways,'always'],[j.lang.flash.accessSameDomain,'samedomain'],[j.lang.flash.accessNever,'never']],setup:h,commit:i}]},{type:'hbox',widths:['50%','50%'],children:[{id:'wmode',type:'select',label:j.lang.flash.windowMode,'default':'',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.flash.windowModeWindow,'window'],[j.lang.flash.windowModeOpaque,'opaque'],[j.lang.flash.windowModeTransparent,'transparent']],setup:h,commit:i},{id:'quality',type:'select',label:j.lang.flash.quality,'default':'high',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.flash.qualityBest,'best'],[j.lang.flash.qualityHigh,'high'],[j.lang.flash.qualityAutoHigh,'autohigh'],[j.lang.flash.qualityMedium,'medium'],[j.lang.flash.qualityAutoLow,'autolow'],[j.lang.flash.qualityLow,'low']],setup:h,commit:i}]},{type:'hbox',widths:['50%','50%'],children:[{id:'align',type:'select',label:j.lang.common.align,'default':'',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.common.alignLeft,'left'],[j.lang.flash.alignAbsBottom,'absBottom'],[j.lang.flash.alignAbsMiddle,'absMiddle'],[j.lang.flash.alignBaseline,'baseline'],[j.lang.common.alignBottom,'bottom'],[j.lang.common.alignMiddle,'middle'],[j.lang.common.alignRight,'right'],[j.lang.flash.alignTextTop,'textTop'],[j.lang.common.alignTop,'top']],setup:h,commit:function(o,p,q,r,s){var t=this.getValue();
-i.apply(this,arguments);t&&(s.align=t);}},{type:'html',html:'<div></div>'}]},{type:'fieldset',label:CKEDITOR.tools.htmlEncode(j.lang.flash.flashvars),children:[{type:'vbox',padding:0,children:[{type:'checkbox',id:'menu',label:j.lang.flash.chkMenu,'default':true,setup:h,commit:i},{type:'checkbox',id:'play',label:j.lang.flash.chkPlay,'default':true,setup:h,commit:i},{type:'checkbox',id:'loop',label:j.lang.flash.chkLoop,'default':true,setup:h,commit:i},{type:'checkbox',id:'allowFullScreen',label:j.lang.flash.chkFull,'default':true,setup:h,commit:i}]}]}]},{id:'advanced',label:j.lang.common.advancedTab,elements:[{type:'hbox',widths:['45%','55%'],children:[{type:'text',id:'id',label:j.lang.common.id,setup:h,commit:i},{type:'text',id:'title',label:j.lang.common.advisoryTitle,setup:h,commit:i}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',id:'bgcolor',label:j.lang.flash.bgcolor,setup:h,commit:i},{type:'text',id:'class',label:j.lang.common.cssClass,setup:h,commit:i}]},{type:'text',id:'style',label:j.lang.common.cssStyle,setup:h,commit:i}]}]};});})();
+i.apply(this,arguments);t&&(s.align=t);}},{type:'html',html:'<div></div>'}]},{type:'fieldset',label:CKEDITOR.tools.htmlEncode(j.lang.flash.flashvars),children:[{type:'vbox',padding:0,children:[{type:'checkbox',id:'menu',label:j.lang.flash.chkMenu,'default':true,setup:h,commit:i},{type:'checkbox',id:'play',label:j.lang.flash.chkPlay,'default':true,setup:h,commit:i},{type:'checkbox',id:'loop',label:j.lang.flash.chkLoop,'default':true,setup:h,commit:i},{type:'checkbox',id:'allowFullScreen',label:j.lang.flash.chkFull,'default':true,setup:h,commit:i}]}]}]},{id:'advanced',label:j.lang.common.advancedTab,elements:[{type:'hbox',widths:['45%','55%'],children:[{type:'text',id:'id',label:j.lang.common.id,setup:h,commit:i},{type:'text',id:'title',label:j.lang.common.advisoryTitle,setup:h,commit:i}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',id:'bgcolor',label:j.lang.flash.bgcolor,setup:h,commit:i},{type:'text',id:'class',label:j.lang.common.cssClass,setup:h,commit:i}]},{type:'text',id:'style',validate:CKEDITOR.dialog.validate.inlineStyle(j.lang.common.invalidInlineStyle),label:j.lang.common.cssStyle,setup:h,commit:i}]}]};});})();
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/image/dialogs/image.js b/appsrc/ODS-Framework/ckeditor/plugins/image/dialogs/image.js
index 18b361b..54393c0 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/image/dialogs/image.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/image/dialogs/image.js
@@ -1,13 +1,13 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-(function(){var a=function(b,c){var d=1,e=2,f=4,g=8,h=/^\s*(\d+)((px)|\%)?\s*$/i,i=/(^\s*(\d+)((px)|\%)?\s*$)|^$/i,j=/^\d+px$/,k=function(){var C=this.getValue(),D=this.getDialog(),E=C.match(h);if(E){if(E[2]=='%')p(D,false);C=E[1];}if(D.lockRatio){var F=D.originalElement;if(F.getCustomData('isReady')=='true')if(this.id=='txtHeight'){if(C&&C!='0')C=Math.round(F.$.width*(C/F.$.height));if(!isNaN(C))D.setValueOf('info','txtWidth',C);}else{if(C&&C!='0')C=Math.round(F.$.height*(C/F.$.width));if(!isNaN(C))D.setValueOf('info','txtHeight',C);}}l(D);},l=function(C){if(!C.originalElement||!C.preview)return 1;C.commitContent(f,C.preview);return 0;};function m(){var C=arguments,D=this.getContentElement('advanced','txtdlgGenStyle');D&&D.commit.apply(D,C);this.foreach(function(E){if(E.commit&&E.id!='txtdlgGenStyle')E.commit.apply(E,C);});};var n;function o(C){if(n)return;n=1;var D=this.getDialog(),E=D.imageElement;if(E){this.commit(d,E);C=[].concat(C);var F=C.length,G;for(var H=0;H<F;H++){G=D.getContentElement.apply(D,C[H].split(':'));G&&G.setup(d,E);}}n=0;};var p=function(C,D){if(!C.getContentElement('info','ratioLock'))return null;var E=C.originalElement;if(!E)return null;if(D=='check'){if(!C.userlockRatio&&E.getCustomData('isReady')=='true'){var F=C.getValueOf('info','txtWidth'),G=C.getValueOf('info','txtHeight'),H=E.$.width*1000/E.$.height,I=F*1000/G;C.lockRatio=false;if(!F&&!G)C.lockRatio=true;else if(!isNaN(H)&&!isNaN(I))if(Math.round(H)==Math.round(I))C.lockRatio=true;}}else if(D!=undefined)C.lockRatio=D;else{C.userlockRatio=1;C.lockRatio=!C.lockRatio;}var J=CKEDITOR.document.getById(w);if(C.lockRatio)J.removeClass('cke_btn_unlocked');else J.addClass('cke_btn_unlocked');J.setAttribute('aria-checked',C.lockRatio);if(CKEDITOR.env.hc){var K=J.getChild(0);K.setHtml(C.lockRatio?CKEDITOR.env.ie?'â– ':'â–£':CKEDITOR.env.ie?'â–¡':'â–¢');}return C.lockRatio;},q=function(C){var D=C.originalElement;if(D.getCustomData('isReady')=='true'){var E=C.getContentElement('info','txtWidth'),F=C.getContentElement('info','txtHeight');E&&E.setValue(D.$.width);F&&F.setValue(D.$.height);}l(C);},r=function(C,D){if(C!=d)return;function E(J,K){var L=J.match(h);if(L){if(L[2]=='%'){L[1]+='%';p(F,false);}return L[1];}return K;};var F=this.getDialog(),G='',H=this.id=='txtWidth'?'width':'height',I=D.getAttribute(H);if(I)G=E(I,G);G=E(D.getStyle(H),G);this.setValue(G);},s,t=function(){var C=this.originalElement;C.setCustomData('isReady','true');C.removeListener('load',t);C.removeListener('error',u);C.removeListener('abort',u);
-CKEDITOR.document.getById(y).setStyle('display','none');if(!this.dontResetSize)q(this);if(this.firstLoad)CKEDITOR.tools.setTimeout(function(){p(this,'check');},0,this);this.firstLoad=false;this.dontResetSize=false;},u=function(){var E=this;var C=E.originalElement;C.removeListener('load',t);C.removeListener('error',u);C.removeListener('abort',u);var D=CKEDITOR.getUrl(b.skinPath+'images/noimage.png');if(E.preview)E.preview.setAttribute('src',D);CKEDITOR.document.getById(y).setStyle('display','none');p(E,false);},v=function(C){return CKEDITOR.tools.getNextId()+'_'+C;},w=v('btnLockSizes'),x=v('btnResetSize'),y=v('ImagePreviewLoader'),z=v('ImagePreviewBox'),A=v('previewLink'),B=v('previewImage');return{title:b.lang.image[c=='image'?'title':'titleButton'],minWidth:420,minHeight:360,onShow:function(){var I=this;I.imageElement=false;I.linkElement=false;I.imageEditMode=false;I.linkEditMode=false;I.lockRatio=true;I.userlockRatio=0;I.dontResetSize=false;I.firstLoad=true;I.addLink=false;var C=I.getParentEditor(),D=I.getParentEditor().getSelection(),E=D.getSelectedElement(),F=E&&E.getAscendant('a');CKEDITOR.document.getById(y).setStyle('display','none');s=new CKEDITOR.dom.element('img',C.document);I.preview=CKEDITOR.document.getById(B);I.originalElement=C.document.createElement('img');I.originalElement.setAttribute('alt','');I.originalElement.setCustomData('isReady','false');if(F){I.linkElement=F;I.linkEditMode=true;var G=F.getChildren();if(G.count()==1){var H=G.getItem(0).getName();if(H=='img'||H=='input'){I.imageElement=G.getItem(0);if(I.imageElement.getName()=='img')I.imageEditMode='img';else if(I.imageElement.getName()=='input')I.imageEditMode='input';}}if(c=='image')I.setupContent(e,F);}if(E&&E.getName()=='img'&&!E.data('cke-realelement')||E&&E.getName()=='input'&&E.getAttribute('type')=='image'){I.imageEditMode=E.getName();I.imageElement=E;}if(I.imageEditMode){I.cleanImageElement=I.imageElement;I.imageElement=I.cleanImageElement.clone(true,true);I.setupContent(d,I.imageElement);}else I.imageElement=C.document.createElement('img');p(I,true);if(!CKEDITOR.tools.trim(I.getValueOf('info','txtUrl'))){I.preview.removeAttribute('src');I.preview.setStyle('display','none');}},onOk:function(){var D=this;if(D.imageEditMode){var C=D.imageEditMode;if(c=='image'&&C=='input'&&confirm(b.lang.image.button2Img)){C='img';D.imageElement=b.document.createElement('img');D.imageElement.setAttribute('alt','');b.insertElement(D.imageElement);}else if(c!='image'&&C=='img'&&confirm(b.lang.image.img2Button)){C='input';
-D.imageElement=b.document.createElement('input');D.imageElement.setAttributes({type:'image',alt:''});b.insertElement(D.imageElement);}else{D.imageElement=D.cleanImageElement;delete D.cleanImageElement;}}else{if(c=='image')D.imageElement=b.document.createElement('img');else{D.imageElement=b.document.createElement('input');D.imageElement.setAttribute('type','image');}D.imageElement.setAttribute('alt','');}if(!D.linkEditMode)D.linkElement=b.document.createElement('a');D.commitContent(d,D.imageElement);D.commitContent(e,D.linkElement);if(!D.imageElement.getAttribute('style'))D.imageElement.removeAttribute('style');if(!D.imageEditMode){if(D.addLink){if(!D.linkEditMode){b.insertElement(D.linkElement);D.linkElement.append(D.imageElement,false);}else b.insertElement(D.imageElement);}else b.insertElement(D.imageElement);}else if(!D.linkEditMode&&D.addLink){b.insertElement(D.linkElement);D.imageElement.appendTo(D.linkElement);}else if(D.linkEditMode&&!D.addLink){b.getSelection().selectElement(D.linkElement);b.insertElement(D.imageElement);}},onLoad:function(){var D=this;if(c!='image')D.hidePage('Link');var C=D._.element.getDocument();if(D.getContentElement('info','ratioLock')){D.addFocusable(C.getById(x),5);D.addFocusable(C.getById(w),5);}D.commitContent=m;},onHide:function(){var C=this;if(C.preview)C.commitContent(g,C.preview);if(C.originalElement){C.originalElement.removeListener('load',t);C.originalElement.removeListener('error',u);C.originalElement.removeListener('abort',u);C.originalElement.remove();C.originalElement=false;}delete C.imageElement;},contents:[{id:'info',label:b.lang.image.infoTab,accessKey:'I',elements:[{type:'vbox',padding:0,children:[{type:'hbox',widths:['280px','110px'],align:'right',children:[{id:'txtUrl',type:'text',label:b.lang.common.url,required:true,onChange:function(){var C=this.getDialog(),D=this.getValue();if(D.length>0){C=this.getDialog();var E=C.originalElement;C.preview.removeStyle('display');E.setCustomData('isReady','false');var F=CKEDITOR.document.getById(y);if(F)F.setStyle('display','');E.on('load',t,C);E.on('error',u,C);E.on('abort',u,C);E.setAttribute('src',D);s.setAttribute('src',D);C.preview.setAttribute('src',s.$.src);l(C);}else if(C.preview){C.preview.removeAttribute('src');C.preview.setStyle('display','none');}},setup:function(C,D){if(C==d){var E=D.data('cke-saved-src')||D.getAttribute('src'),F=this;this.getDialog().dontResetSize=true;F.setValue(E);F.setInitValue();}},commit:function(C,D){var E=this;if(C==d&&(E.getValue()||E.isChanged())){D.data('cke-saved-src',E.getValue());
-D.setAttribute('src',E.getValue());}else if(C==g){D.setAttribute('src','');D.removeAttribute('src');}},validate:CKEDITOR.dialog.validate.notEmpty(b.lang.image.urlMissing)},{type:'button',id:'browse',style:'display:inline-block;margin-top:10px;',align:'center',label:b.lang.common.browseServer,hidden:true,filebrowser:'info:txtUrl'}]}]},{id:'txtAlt',type:'text',label:b.lang.image.alt,accessKey:'T','default':'',onChange:function(){l(this.getDialog());},setup:function(C,D){if(C==d)this.setValue(D.getAttribute('alt'));},commit:function(C,D){var E=this;if(C==d){if(E.getValue()||E.isChanged())D.setAttribute('alt',E.getValue());}else if(C==f)D.setAttribute('alt',E.getValue());else if(C==g)D.removeAttribute('alt');}},{type:'hbox',children:[{id:'basic',type:'vbox',children:[{type:'hbox',widths:['50%','50%'],children:[{type:'vbox',padding:1,children:[{type:'text',width:'40px',id:'txtWidth',label:b.lang.common.width,onKeyUp:k,onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:function(){var C=this.getValue().match(i),D=!!(C&&parseInt(C[1],10)!==0);if(!D)alert(b.lang.common.invalidWidth);return D;},setup:r,commit:function(C,D,E){var F=this.getValue();if(C==d){if(F)D.setStyle('width',CKEDITOR.tools.cssLength(F));else D.removeStyle('width');!E&&D.removeAttribute('width');}else if(C==f){var G=F.match(h);if(!G){var H=this.getDialog().originalElement;if(H.getCustomData('isReady')=='true')D.setStyle('width',H.$.width+'px');}else D.setStyle('width',CKEDITOR.tools.cssLength(F));}else if(C==g){D.removeAttribute('width');D.removeStyle('width');}}},{type:'text',id:'txtHeight',width:'40px',label:b.lang.common.height,onKeyUp:k,onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:function(){var C=this.getValue().match(i),D=!!(C&&parseInt(C[1],10)!==0);if(!D)alert(b.lang.common.invalidHeight);return D;},setup:r,commit:function(C,D,E){var F=this.getValue();if(C==d){if(F)D.setStyle('height',CKEDITOR.tools.cssLength(F));else D.removeStyle('height');!E&&D.removeAttribute('height');}else if(C==f){var G=F.match(h);if(!G){var H=this.getDialog().originalElement;if(H.getCustomData('isReady')=='true')D.setStyle('height',H.$.height+'px');}else D.setStyle('height',CKEDITOR.tools.cssLength(F));}else if(C==g){D.removeAttribute('height');D.removeStyle('height');}}}]},{id:'ratioLock',type:'html',style:'margin-top:30px;width:40px;height:40px;',onLoad:function(){var C=CKEDITOR.document.getById(x),D=CKEDITOR.document.getById(w);if(C){C.on('click',function(E){q(this);E.data&&E.data.preventDefault();
-},this.getDialog());C.on('mouseover',function(){this.addClass('cke_btn_over');},C);C.on('mouseout',function(){this.removeClass('cke_btn_over');},C);}if(D){D.on('click',function(E){var J=this;var F=p(J),G=J.originalElement,H=J.getValueOf('info','txtWidth');if(G.getCustomData('isReady')=='true'&&H){var I=G.$.height/G.$.width*H;if(!isNaN(I)){J.setValueOf('info','txtHeight',Math.round(I));l(J);}}E.data&&E.data.preventDefault();},this.getDialog());D.on('mouseover',function(){this.addClass('cke_btn_over');},D);D.on('mouseout',function(){this.removeClass('cke_btn_over');},D);}},html:'<div><a href="javascript:void(0)" tabindex="-1" title="'+b.lang.image.lockRatio+'" class="cke_btn_locked" id="'+w+'" role="checkbox"><span class="cke_icon"></span><span class="cke_label">'+b.lang.image.lockRatio+'</span></a>'+'<a href="javascript:void(0)" tabindex="-1" title="'+b.lang.image.resetSize+'" class="cke_btn_reset" id="'+x+'" role="button"><span class="cke_label">'+b.lang.image.resetSize+'</span></a>'+'</div>'}]},{type:'vbox',padding:1,children:[{type:'text',id:'txtBorder',width:'60px',label:b.lang.image.border,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateBorder),setup:function(C,D){if(C==d){var E,F=D.getStyle('border-width');F=F&&F.match(/^(\d+px)(?: \1 \1 \1)?$/);E=F&&parseInt(F[1],10);isNaN(parseInt(E,10))&&(E=D.getAttribute('border'));this.setValue(E);}},commit:function(C,D,E){var F=parseInt(this.getValue(),10);if(C==d||C==f){if(!isNaN(F)){D.setStyle('border-width',CKEDITOR.tools.cssLength(F));D.setStyle('border-style','solid');}else if(!F&&this.isChanged()){D.removeStyle('border-width');D.removeStyle('border-style');D.removeStyle('border-color');}if(!E&&C==d)D.removeAttribute('border');}else if(C==g){D.removeAttribute('border');D.removeStyle('border-width');D.removeStyle('border-style');D.removeStyle('border-color');}}},{type:'text',id:'txtHSpace',width:'60px',label:b.lang.image.hSpace,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateHSpace),setup:function(C,D){if(C==d){var E,F,G,H=D.getStyle('margin-left'),I=D.getStyle('margin-right');H=H&&H.match(j);I=I&&I.match(j);F=parseInt(H,10);G=parseInt(I,10);E=F==G&&F;isNaN(parseInt(E,10))&&(E=D.getAttribute('hspace'));this.setValue(E);}},commit:function(C,D,E){var F=parseInt(this.getValue(),10);
-if(C==d||C==f){if(!isNaN(F)){D.setStyle('margin-left',CKEDITOR.tools.cssLength(F));D.setStyle('margin-right',CKEDITOR.tools.cssLength(F));}else if(!F&&this.isChanged()){D.removeStyle('margin-left');D.removeStyle('margin-right');}if(!E&&C==d)D.removeAttribute('hspace');}else if(C==g){D.removeAttribute('hspace');D.removeStyle('margin-left');D.removeStyle('margin-right');}}},{type:'text',id:'txtVSpace',width:'60px',label:b.lang.image.vSpace,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateVSpace),setup:function(C,D){if(C==d){var E,F,G,H=D.getStyle('margin-top'),I=D.getStyle('margin-bottom');H=H&&H.match(j);I=I&&I.match(j);F=parseInt(H,10);G=parseInt(I,10);E=F==G&&F;isNaN(parseInt(E,10))&&(E=D.getAttribute('vspace'));this.setValue(E);}},commit:function(C,D,E){var F=parseInt(this.getValue(),10);if(C==d||C==f){if(!isNaN(F)){D.setStyle('margin-top',CKEDITOR.tools.cssLength(F));D.setStyle('margin-bottom',CKEDITOR.tools.cssLength(F));}else if(!F&&this.isChanged()){D.removeStyle('margin-top');D.removeStyle('margin-bottom');}if(!E&&C==d)D.removeAttribute('vspace');}else if(C==g){D.removeAttribute('vspace');D.removeStyle('margin-top');D.removeStyle('margin-bottom');}}},{id:'cmbAlign',type:'select',widths:['35%','65%'],style:'width:90px',label:b.lang.common.align,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.alignLeft,'left'],[b.lang.common.alignRight,'right']],onChange:function(){l(this.getDialog());o.call(this,'advanced:txtdlgGenStyle');},setup:function(C,D){if(C==d){var E=D.getStyle('float');switch(E){case 'inherit':case 'none':E='';}!E&&(E=(D.getAttribute('align')||'').toLowerCase());this.setValue(E);}},commit:function(C,D,E){var F=this.getValue();if(C==d||C==f){if(F)D.setStyle('float',F);else D.removeStyle('float');if(!E&&C==d){F=(D.getAttribute('align')||'').toLowerCase();switch(F){case 'left':case 'right':D.removeAttribute('align');}}}else if(C==g)D.removeStyle('float');}}]}]},{type:'vbox',height:'250px',children:[{type:'html',id:'htmlPreview',style:'width:95%;',html:'<div>'+CKEDITOR.tools.htmlEncode(b.lang.common.preview)+'<br>'+'<div id="'+y+'" class="ImagePreviewLoader" style="display:none"><div class="loading"> </div></div>'+'<div id="'+z+'" class="ImagePreviewBox"><table><tr><td>'+'<a href="javascript:void(0)" target="_blank" onclick="return false;" id="'+A+'">'+'<img id="'+B+'" alt="" /></a>'+(b.config.image_previewText||'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.')+'</td></tr></table></div></div>'}]}]}]},{id:'Link',label:b.lang.link.title,padding:0,elements:[{id:'txtUrl',type:'text',label:b.lang.common.url,style:'width: 100%','default':'',setup:function(C,D){if(C==e){var E=D.data('cke-saved-href');
-if(!E)E=D.getAttribute('href');this.setValue(E);}},commit:function(C,D){var F=this;if(C==e)if(F.getValue()||F.isChanged()){var E=decodeURI(F.getValue());D.data('cke-saved-href',E);D.setAttribute('href',E);if(F.getValue()||!b.config.image_removeLinkByEmptyURL)F.getDialog().addLink=true;}}},{type:'button',id:'browse',filebrowser:{action:'Browse',target:'Link:txtUrl',url:b.config.filebrowserImageBrowseLinkUrl},style:'float:right',hidden:true,label:b.lang.common.browseServer},{id:'cmbTarget',type:'select',label:b.lang.common.target,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.targetNew,'_blank'],[b.lang.common.targetTop,'_top'],[b.lang.common.targetSelf,'_self'],[b.lang.common.targetParent,'_parent']],setup:function(C,D){if(C==e)this.setValue(D.getAttribute('target')||'');},commit:function(C,D){if(C==e)if(this.getValue()||this.isChanged())D.setAttribute('target',this.getValue());}}]},{id:'Upload',hidden:true,filebrowser:'uploadButton',label:b.lang.image.upload,elements:[{type:'file',id:'upload',label:b.lang.image.btnUpload,style:'height:40px',size:38},{type:'fileButton',id:'uploadButton',filebrowser:'info:txtUrl',label:b.lang.image.btnUpload,'for':['Upload','upload']}]},{id:'advanced',label:b.lang.common.advancedTab,elements:[{type:'hbox',widths:['50%','25%','25%'],children:[{type:'text',id:'linkId',label:b.lang.common.id,setup:function(C,D){if(C==d)this.setValue(D.getAttribute('id'));},commit:function(C,D){if(C==d)if(this.getValue()||this.isChanged())D.setAttribute('id',this.getValue());}},{id:'cmbLangDir',type:'select',style:'width : 100px;',label:b.lang.common.langDir,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.langDirLtr,'ltr'],[b.lang.common.langDirRtl,'rtl']],setup:function(C,D){if(C==d)this.setValue(D.getAttribute('dir'));},commit:function(C,D){if(C==d)if(this.getValue()||this.isChanged())D.setAttribute('dir',this.getValue());}},{type:'text',id:'txtLangCode',label:b.lang.common.langCode,'default':'',setup:function(C,D){if(C==d)this.setValue(D.getAttribute('lang'));},commit:function(C,D){if(C==d)if(this.getValue()||this.isChanged())D.setAttribute('lang',this.getValue());}}]},{type:'text',id:'txtGenLongDescr',label:b.lang.common.longDescr,setup:function(C,D){if(C==d)this.setValue(D.getAttribute('longDesc'));},commit:function(C,D){if(C==d)if(this.getValue()||this.isChanged())D.setAttribute('longDesc',this.getValue());}},{type:'hbox',widths:['50%','50%'],children:[{type:'text',id:'txtGenClass',label:b.lang.common.cssClass,'default':'',setup:function(C,D){if(C==d)this.setValue(D.getAttribute('class'));
-},commit:function(C,D){if(C==d)if(this.getValue()||this.isChanged())D.setAttribute('class',this.getValue());}},{type:'text',id:'txtGenTitle',label:b.lang.common.advisoryTitle,'default':'',onChange:function(){l(this.getDialog());},setup:function(C,D){if(C==d)this.setValue(D.getAttribute('title'));},commit:function(C,D){var E=this;if(C==d){if(E.getValue()||E.isChanged())D.setAttribute('title',E.getValue());}else if(C==f)D.setAttribute('title',E.getValue());else if(C==g)D.removeAttribute('title');}}]},{type:'text',id:'txtdlgGenStyle',label:b.lang.common.cssStyle,'default':'',setup:function(C,D){if(C==d){var E=D.getAttribute('style');if(!E&&D.$.style.cssText)E=D.$.style.cssText;this.setValue(E);var F=D.$.style.height,G=D.$.style.width,H=(F?F:'').match(h),I=(G?G:'').match(h);this.attributesInStyle={height:!!H,width:!!I};}},onChange:function(){o.call(this,['info:cmbFloat','info:cmbAlign','info:txtVSpace','info:txtHSpace','info:txtBorder','info:txtWidth','info:txtHeight']);l(this);},commit:function(C,D){if(C==d&&(this.getValue()||this.isChanged()))D.setAttribute('style',this.getValue());}}]}]};};CKEDITOR.dialog.add('image',function(b){return a(b,'image');});CKEDITOR.dialog.add('imagebutton',function(b){return a(b,'imagebutton');});})();
+(function(){var a=function(b,c){var d=1,e=2,f=4,g=8,h=/^\s*(\d+)((px)|\%)?\s*$/i,i=/(^\s*(\d+)((px)|\%)?\s*$)|^$/i,j=/^\d+px$/,k=function(){var B=this.getValue(),C=this.getDialog(),D=B.match(h);if(D){if(D[2]=='%')p(C,false);B=D[1];}if(C.lockRatio){var E=C.originalElement;if(E.getCustomData('isReady')=='true')if(this.id=='txtHeight'){if(B&&B!='0')B=Math.round(E.$.width*(B/E.$.height));if(!isNaN(B))C.setValueOf('info','txtWidth',B);}else{if(B&&B!='0')B=Math.round(E.$.height*(B/E.$.width));if(!isNaN(B))C.setValueOf('info','txtHeight',B);}}l(C);},l=function(B){if(!B.originalElement||!B.preview)return 1;B.commitContent(f,B.preview);return 0;};function m(){var B=arguments,C=this.getContentElement('advanced','txtdlgGenStyle');C&&C.commit.apply(C,B);this.foreach(function(D){if(D.commit&&D.id!='txtdlgGenStyle')D.commit.apply(D,B);});};var n;function o(B){if(n)return;n=1;var C=this.getDialog(),D=C.imageElement;if(D){this.commit(d,D);B=[].concat(B);var E=B.length,F;for(var G=0;G<E;G++){F=C.getContentElement.apply(C,B[G].split(':'));F&&F.setup(d,D);}}n=0;};var p=function(B,C){if(!B.getContentElement('info','ratioLock'))return null;var D=B.originalElement;if(!D)return null;if(C=='check'){if(!B.userlockRatio&&D.getCustomData('isReady')=='true'){var E=B.getValueOf('info','txtWidth'),F=B.getValueOf('info','txtHeight'),G=D.$.width*1000/D.$.height,H=E*1000/F;B.lockRatio=false;if(!E&&!F)B.lockRatio=true;else if(!isNaN(G)&&!isNaN(H))if(Math.round(G)==Math.round(H))B.lockRatio=true;}}else if(C!=undefined)B.lockRatio=C;else{B.userlockRatio=1;B.lockRatio=!B.lockRatio;}var I=CKEDITOR.document.getById(w);if(B.lockRatio)I.removeClass('cke_btn_unlocked');else I.addClass('cke_btn_unlocked');I.setAttribute('aria-checked',B.lockRatio);if(CKEDITOR.env.hc){var J=I.getChild(0);J.setHtml(B.lockRatio?CKEDITOR.env.ie?'â– ':'â–£':CKEDITOR.env.ie?'â–¡':'â–¢');}return B.lockRatio;},q=function(B){var C=B.originalElement;if(C.getCustomData('isReady')=='true'){var D=B.getContentElement('info','txtWidth'),E=B.getContentElement('info','txtHeight');D&&D.setValue(C.$.width);E&&E.setValue(C.$.height);}l(B);},r=function(B,C){if(B!=d)return;function D(I,J){var K=I.match(h);if(K){if(K[2]=='%'){K[1]+='%';p(E,false);}return K[1];}return J;};var E=this.getDialog(),F='',G=this.id=='txtWidth'?'width':'height',H=C.getAttribute(G);if(H)F=D(H,F);F=D(C.getStyle(G),F);this.setValue(F);},s,t=function(){var B=this.originalElement;B.setCustomData('isReady','true');B.removeListener('load',t);B.removeListener('error',u);B.removeListener('abort',u);
+CKEDITOR.document.getById(y).setStyle('display','none');if(!this.dontResetSize)q(this);if(this.firstLoad)CKEDITOR.tools.setTimeout(function(){p(this,'check');},0,this);this.firstLoad=false;this.dontResetSize=false;},u=function(){var D=this;var B=D.originalElement;B.removeListener('load',t);B.removeListener('error',u);B.removeListener('abort',u);var C=CKEDITOR.getUrl(b.skinPath+'images/noimage.png');if(D.preview)D.preview.setAttribute('src',C);CKEDITOR.document.getById(y).setStyle('display','none');p(D,false);},v=function(B){return CKEDITOR.tools.getNextId()+'_'+B;},w=v('btnLockSizes'),x=v('btnResetSize'),y=v('ImagePreviewLoader'),z=v('previewLink'),A=v('previewImage');return{title:b.lang.image[c=='image'?'title':'titleButton'],minWidth:420,minHeight:360,onShow:function(){var H=this;H.imageElement=false;H.linkElement=false;H.imageEditMode=false;H.linkEditMode=false;H.lockRatio=true;H.userlockRatio=0;H.dontResetSize=false;H.firstLoad=true;H.addLink=false;var B=H.getParentEditor(),C=B.getSelection(),D=C&&C.getSelectedElement(),E=D&&D.getAscendant('a');CKEDITOR.document.getById(y).setStyle('display','none');s=new CKEDITOR.dom.element('img',B.document);H.preview=CKEDITOR.document.getById(A);H.originalElement=B.document.createElement('img');H.originalElement.setAttribute('alt','');H.originalElement.setCustomData('isReady','false');if(E){H.linkElement=E;H.linkEditMode=true;var F=E.getChildren();if(F.count()==1){var G=F.getItem(0).getName();if(G=='img'||G=='input'){H.imageElement=F.getItem(0);if(H.imageElement.getName()=='img')H.imageEditMode='img';else if(H.imageElement.getName()=='input')H.imageEditMode='input';}}if(c=='image')H.setupContent(e,E);}if(D&&D.getName()=='img'&&!D.data('cke-realelement')||D&&D.getName()=='input'&&D.getAttribute('type')=='image'){H.imageEditMode=D.getName();H.imageElement=D;}if(H.imageEditMode){H.cleanImageElement=H.imageElement;H.imageElement=H.cleanImageElement.clone(true,true);H.setupContent(d,H.imageElement);}else H.imageElement=B.document.createElement('img');p(H,true);if(!CKEDITOR.tools.trim(H.getValueOf('info','txtUrl'))){H.preview.removeAttribute('src');H.preview.setStyle('display','none');}},onOk:function(){var C=this;if(C.imageEditMode){var B=C.imageEditMode;if(c=='image'&&B=='input'&&confirm(b.lang.image.button2Img)){B='img';C.imageElement=b.document.createElement('img');C.imageElement.setAttribute('alt','');b.insertElement(C.imageElement);}else if(c!='image'&&B=='img'&&confirm(b.lang.image.img2Button)){B='input';C.imageElement=b.document.createElement('input');
+C.imageElement.setAttributes({type:'image',alt:''});b.insertElement(C.imageElement);}else{C.imageElement=C.cleanImageElement;delete C.cleanImageElement;}}else{if(c=='image')C.imageElement=b.document.createElement('img');else{C.imageElement=b.document.createElement('input');C.imageElement.setAttribute('type','image');}C.imageElement.setAttribute('alt','');}if(!C.linkEditMode)C.linkElement=b.document.createElement('a');C.commitContent(d,C.imageElement);C.commitContent(e,C.linkElement);if(!C.imageElement.getAttribute('style'))C.imageElement.removeAttribute('style');if(!C.imageEditMode){if(C.addLink){if(!C.linkEditMode){b.insertElement(C.linkElement);C.linkElement.append(C.imageElement,false);}else b.insertElement(C.imageElement);}else b.insertElement(C.imageElement);}else if(!C.linkEditMode&&C.addLink){b.insertElement(C.linkElement);C.imageElement.appendTo(C.linkElement);}else if(C.linkEditMode&&!C.addLink){b.getSelection().selectElement(C.linkElement);b.insertElement(C.imageElement);}},onLoad:function(){var C=this;if(c!='image')C.hidePage('Link');var B=C._.element.getDocument();if(C.getContentElement('info','ratioLock')){C.addFocusable(B.getById(x),5);C.addFocusable(B.getById(w),5);}C.commitContent=m;},onHide:function(){var B=this;if(B.preview)B.commitContent(g,B.preview);if(B.originalElement){B.originalElement.removeListener('load',t);B.originalElement.removeListener('error',u);B.originalElement.removeListener('abort',u);B.originalElement.remove();B.originalElement=false;}delete B.imageElement;},contents:[{id:'info',label:b.lang.image.infoTab,accessKey:'I',elements:[{type:'vbox',padding:0,children:[{type:'hbox',widths:['280px','110px'],align:'right',children:[{id:'txtUrl',type:'text',label:b.lang.common.url,required:true,onChange:function(){var B=this.getDialog(),C=this.getValue();if(C.length>0){B=this.getDialog();var D=B.originalElement;B.preview.removeStyle('display');D.setCustomData('isReady','false');var E=CKEDITOR.document.getById(y);if(E)E.setStyle('display','');D.on('load',t,B);D.on('error',u,B);D.on('abort',u,B);D.setAttribute('src',C);s.setAttribute('src',C);B.preview.setAttribute('src',s.$.src);l(B);}else if(B.preview){B.preview.removeAttribute('src');B.preview.setStyle('display','none');}},setup:function(B,C){if(B==d){var D=C.data('cke-saved-src')||C.getAttribute('src'),E=this;this.getDialog().dontResetSize=true;E.setValue(D);E.setInitValue();}},commit:function(B,C){var D=this;if(B==d&&(D.getValue()||D.isChanged())){C.data('cke-saved-src',D.getValue());
+C.setAttribute('src',D.getValue());}else if(B==g){C.setAttribute('src','');C.removeAttribute('src');}},validate:CKEDITOR.dialog.validate.notEmpty(b.lang.image.urlMissing)},{type:'button',id:'browse',style:'display:inline-block;margin-top:10px;',align:'center',label:b.lang.common.browseServer,hidden:true,filebrowser:'info:txtUrl'}]}]},{id:'txtAlt',type:'text',label:b.lang.image.alt,accessKey:'T','default':'',onChange:function(){l(this.getDialog());},setup:function(B,C){if(B==d)this.setValue(C.getAttribute('alt'));},commit:function(B,C){var D=this;if(B==d){if(D.getValue()||D.isChanged())C.setAttribute('alt',D.getValue());}else if(B==f)C.setAttribute('alt',D.getValue());else if(B==g)C.removeAttribute('alt');}},{type:'hbox',children:[{id:'basic',type:'vbox',children:[{type:'hbox',widths:['50%','50%'],children:[{type:'vbox',padding:1,children:[{type:'text',width:'40px',id:'txtWidth',label:b.lang.common.width,onKeyUp:k,onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:function(){var B=this.getValue().match(i),C=!!(B&&parseInt(B[1],10)!==0);if(!C)alert(b.lang.common.invalidWidth);return C;},setup:r,commit:function(B,C,D){var E=this.getValue();if(B==d){if(E)C.setStyle('width',CKEDITOR.tools.cssLength(E));else C.removeStyle('width');!D&&C.removeAttribute('width');}else if(B==f){var F=E.match(h);if(!F){var G=this.getDialog().originalElement;if(G.getCustomData('isReady')=='true')C.setStyle('width',G.$.width+'px');}else C.setStyle('width',CKEDITOR.tools.cssLength(E));}else if(B==g){C.removeAttribute('width');C.removeStyle('width');}}},{type:'text',id:'txtHeight',width:'40px',label:b.lang.common.height,onKeyUp:k,onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:function(){var B=this.getValue().match(i),C=!!(B&&parseInt(B[1],10)!==0);if(!C)alert(b.lang.common.invalidHeight);return C;},setup:r,commit:function(B,C,D){var E=this.getValue();if(B==d){if(E)C.setStyle('height',CKEDITOR.tools.cssLength(E));else C.removeStyle('height');!D&&C.removeAttribute('height');}else if(B==f){var F=E.match(h);if(!F){var G=this.getDialog().originalElement;if(G.getCustomData('isReady')=='true')C.setStyle('height',G.$.height+'px');}else C.setStyle('height',CKEDITOR.tools.cssLength(E));}else if(B==g){C.removeAttribute('height');C.removeStyle('height');}}}]},{id:'ratioLock',type:'html',style:'margin-top:30px;width:40px;height:40px;',onLoad:function(){var B=CKEDITOR.document.getById(x),C=CKEDITOR.document.getById(w);if(B){B.on('click',function(D){q(this);D.data&&D.data.preventDefault();
+},this.getDialog());B.on('mouseover',function(){this.addClass('cke_btn_over');},B);B.on('mouseout',function(){this.removeClass('cke_btn_over');},B);}if(C){C.on('click',function(D){var I=this;var E=p(I),F=I.originalElement,G=I.getValueOf('info','txtWidth');if(F.getCustomData('isReady')=='true'&&G){var H=F.$.height/F.$.width*G;if(!isNaN(H)){I.setValueOf('info','txtHeight',Math.round(H));l(I);}}D.data&&D.data.preventDefault();},this.getDialog());C.on('mouseover',function(){this.addClass('cke_btn_over');},C);C.on('mouseout',function(){this.removeClass('cke_btn_over');},C);}},html:'<div><a href="javascript:void(0)" tabindex="-1" title="'+b.lang.image.lockRatio+'" class="cke_btn_locked" id="'+w+'" role="checkbox"><span class="cke_icon"></span><span class="cke_label">'+b.lang.image.lockRatio+'</span></a>'+'<a href="javascript:void(0)" tabindex="-1" title="'+b.lang.image.resetSize+'" class="cke_btn_reset" id="'+x+'" role="button"><span class="cke_label">'+b.lang.image.resetSize+'</span></a>'+'</div>'}]},{type:'vbox',padding:1,children:[{type:'text',id:'txtBorder',width:'60px',label:b.lang.image.border,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateBorder),setup:function(B,C){if(B==d){var D,E=C.getStyle('border-width');E=E&&E.match(/^(\d+px)(?: \1 \1 \1)?$/);D=E&&parseInt(E[1],10);isNaN(parseInt(D,10))&&(D=C.getAttribute('border'));this.setValue(D);}},commit:function(B,C,D){var E=parseInt(this.getValue(),10);if(B==d||B==f){if(!isNaN(E)){C.setStyle('border-width',CKEDITOR.tools.cssLength(E));C.setStyle('border-style','solid');}else if(!E&&this.isChanged()){C.removeStyle('border-width');C.removeStyle('border-style');C.removeStyle('border-color');}if(!D&&B==d)C.removeAttribute('border');}else if(B==g){C.removeAttribute('border');C.removeStyle('border-width');C.removeStyle('border-style');C.removeStyle('border-color');}}},{type:'text',id:'txtHSpace',width:'60px',label:b.lang.image.hSpace,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateHSpace),setup:function(B,C){if(B==d){var D,E,F,G=C.getStyle('margin-left'),H=C.getStyle('margin-right');G=G&&G.match(j);H=H&&H.match(j);E=parseInt(G,10);F=parseInt(H,10);D=E==F&&E;isNaN(parseInt(D,10))&&(D=C.getAttribute('hspace'));this.setValue(D);}},commit:function(B,C,D){var E=parseInt(this.getValue(),10);
+if(B==d||B==f){if(!isNaN(E)){C.setStyle('margin-left',CKEDITOR.tools.cssLength(E));C.setStyle('margin-right',CKEDITOR.tools.cssLength(E));}else if(!E&&this.isChanged()){C.removeStyle('margin-left');C.removeStyle('margin-right');}if(!D&&B==d)C.removeAttribute('hspace');}else if(B==g){C.removeAttribute('hspace');C.removeStyle('margin-left');C.removeStyle('margin-right');}}},{type:'text',id:'txtVSpace',width:'60px',label:b.lang.image.vSpace,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateVSpace),setup:function(B,C){if(B==d){var D,E,F,G=C.getStyle('margin-top'),H=C.getStyle('margin-bottom');G=G&&G.match(j);H=H&&H.match(j);E=parseInt(G,10);F=parseInt(H,10);D=E==F&&E;isNaN(parseInt(D,10))&&(D=C.getAttribute('vspace'));this.setValue(D);}},commit:function(B,C,D){var E=parseInt(this.getValue(),10);if(B==d||B==f){if(!isNaN(E)){C.setStyle('margin-top',CKEDITOR.tools.cssLength(E));C.setStyle('margin-bottom',CKEDITOR.tools.cssLength(E));}else if(!E&&this.isChanged()){C.removeStyle('margin-top');C.removeStyle('margin-bottom');}if(!D&&B==d)C.removeAttribute('vspace');}else if(B==g){C.removeAttribute('vspace');C.removeStyle('margin-top');C.removeStyle('margin-bottom');}}},{id:'cmbAlign',type:'select',widths:['35%','65%'],style:'width:90px',label:b.lang.common.align,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.alignLeft,'left'],[b.lang.common.alignRight,'right']],onChange:function(){l(this.getDialog());o.call(this,'advanced:txtdlgGenStyle');},setup:function(B,C){if(B==d){var D=C.getStyle('float');switch(D){case 'inherit':case 'none':D='';}!D&&(D=(C.getAttribute('align')||'').toLowerCase());this.setValue(D);}},commit:function(B,C,D){var E=this.getValue();if(B==d||B==f){if(E)C.setStyle('float',E);else C.removeStyle('float');if(!D&&B==d){E=(C.getAttribute('align')||'').toLowerCase();switch(E){case 'left':case 'right':C.removeAttribute('align');}}}else if(B==g)C.removeStyle('float');}}]}]},{type:'vbox',height:'250px',children:[{type:'html',id:'htmlPreview',style:'width:95%;',html:'<div>'+CKEDITOR.tools.htmlEncode(b.lang.common.preview)+'<br>'+'<div id="'+y+'" class="ImagePreviewLoader" style="display:none"><div class="loading"> </div></div>'+'<div class="ImagePreviewBox"><table><tr><td>'+'<a href="javascript:void(0)" target="_blank" onclick="return false;" id="'+z+'">'+'<img id="'+A+'" alt="" /></a>'+(b.config.image_previewText||'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.')+'</td></tr></table></div></div>'}]}]}]},{id:'Link',label:b.lang.link.title,padding:0,elements:[{id:'txtUrl',type:'text',label:b.lang.common.url,style:'width: 100%','default':'',setup:function(B,C){if(B==e){var D=C.data('cke-saved-href');
+if(!D)D=C.getAttribute('href');this.setValue(D);}},commit:function(B,C){var E=this;if(B==e)if(E.getValue()||E.isChanged()){var D=decodeURI(E.getValue());C.data('cke-saved-href',D);C.setAttribute('href',D);if(E.getValue()||!b.config.image_removeLinkByEmptyURL)E.getDialog().addLink=true;}}},{type:'button',id:'browse',filebrowser:{action:'Browse',target:'Link:txtUrl',url:b.config.filebrowserImageBrowseLinkUrl},style:'float:right',hidden:true,label:b.lang.common.browseServer},{id:'cmbTarget',type:'select',label:b.lang.common.target,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.targetNew,'_blank'],[b.lang.common.targetTop,'_top'],[b.lang.common.targetSelf,'_self'],[b.lang.common.targetParent,'_parent']],setup:function(B,C){if(B==e)this.setValue(C.getAttribute('target')||'');},commit:function(B,C){if(B==e)if(this.getValue()||this.isChanged())C.setAttribute('target',this.getValue());}}]},{id:'Upload',hidden:true,filebrowser:'uploadButton',label:b.lang.image.upload,elements:[{type:'file',id:'upload',label:b.lang.image.btnUpload,style:'height:40px',size:38},{type:'fileButton',id:'uploadButton',filebrowser:'info:txtUrl',label:b.lang.image.btnUpload,'for':['Upload','upload']}]},{id:'advanced',label:b.lang.common.advancedTab,elements:[{type:'hbox',widths:['50%','25%','25%'],children:[{type:'text',id:'linkId',label:b.lang.common.id,setup:function(B,C){if(B==d)this.setValue(C.getAttribute('id'));},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('id',this.getValue());}},{id:'cmbLangDir',type:'select',style:'width : 100px;',label:b.lang.common.langDir,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.langDirLtr,'ltr'],[b.lang.common.langDirRtl,'rtl']],setup:function(B,C){if(B==d)this.setValue(C.getAttribute('dir'));},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('dir',this.getValue());}},{type:'text',id:'txtLangCode',label:b.lang.common.langCode,'default':'',setup:function(B,C){if(B==d)this.setValue(C.getAttribute('lang'));},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('lang',this.getValue());}}]},{type:'text',id:'txtGenLongDescr',label:b.lang.common.longDescr,setup:function(B,C){if(B==d)this.setValue(C.getAttribute('longDesc'));},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('longDesc',this.getValue());}},{type:'hbox',widths:['50%','50%'],children:[{type:'text',id:'txtGenClass',label:b.lang.common.cssClass,'default':'',setup:function(B,C){if(B==d)this.setValue(C.getAttribute('class'));
+},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('class',this.getValue());}},{type:'text',id:'txtGenTitle',label:b.lang.common.advisoryTitle,'default':'',onChange:function(){l(this.getDialog());},setup:function(B,C){if(B==d)this.setValue(C.getAttribute('title'));},commit:function(B,C){var D=this;if(B==d){if(D.getValue()||D.isChanged())C.setAttribute('title',D.getValue());}else if(B==f)C.setAttribute('title',D.getValue());else if(B==g)C.removeAttribute('title');}}]},{type:'text',id:'txtdlgGenStyle',label:b.lang.common.cssStyle,validate:CKEDITOR.dialog.validate.inlineStyle(b.lang.common.invalidInlineStyle),'default':'',setup:function(B,C){if(B==d){var D=C.getAttribute('style');if(!D&&C.$.style.cssText)D=C.$.style.cssText;this.setValue(D);var E=C.$.style.height,F=C.$.style.width,G=(E?E:'').match(h),H=(F?F:'').match(h);this.attributesInStyle={height:!!G,width:!!H};}},onChange:function(){o.call(this,['info:cmbFloat','info:cmbAlign','info:txtVSpace','info:txtHSpace','info:txtBorder','info:txtWidth','info:txtHeight']);l(this);},commit:function(B,C){if(B==d&&(this.getValue()||this.isChanged()))C.setAttribute('style',this.getValue());}}]}]};};CKEDITOR.dialog.add('image',function(b){return a(b,'image');});CKEDITOR.dialog.add('imagebutton',function(b){return a(b,'imagebutton');});})();
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/link/dialogs/anchor.js b/appsrc/ODS-Framework/ckeditor/plugins/link/dialogs/anchor.js
index 7380c48..b1c1c52 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/link/dialogs/anchor.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/link/dialogs/anchor.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/link/dialogs/link.js b/appsrc/ODS-Framework/ckeditor/plugins/link/dialogs/link.js
index cac5e89..e8c8953 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/link/dialogs/link.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/link/dialogs/link.js
@@ -1,12 +1,12 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
CKEDITOR.dialog.add('link',function(a){var b=CKEDITOR.plugins.link,c=function(){var F=this.getDialog(),G=F.getContentElement('target','popupFeatures'),H=F.getContentElement('target','linkTargetName'),I=this.getValue();if(!G||!H)return;G=G.getElement();G.hide();H.setValue('');switch(I){case 'frame':H.setLabel(a.lang.link.targetFrameName);H.getElement().show();break;case 'popup':G.show();H.setLabel(a.lang.link.targetPopupName);H.getElement().show();break;default:H.setValue(I);H.getElement().hide();break;}},d=function(){var F=this.getDialog(),G=['urlOptions','anchorOptions','emailOptions'],H=this.getValue(),I=F.definition.getContents('upload'),J=I&&I.hidden;if(H=='url'){if(a.config.linkShowTargetTab)F.showPage('target');if(!J)F.showPage('upload');}else{F.hidePage('target');if(!J)F.hidePage('upload');}for(var K=0;K<G.length;K++){var L=F.getContentElement('info',G[K]);if(!L)continue;L=L.getElement().getParent().getParent();if(G[K]==H+'Options')L.show();else L.hide();}F.layout();},e=/^javascript:/,f=/^mailto:([^?]+)(?:\?(.+))?$/,g=/subject=([^;?:@&=$,\/]*)/,h=/body=([^;?:@&=$,\/]*)/,i=/^#(.*)$/,j=/^((?:http|https|ftp|news):\/\/)?(.*)$/,k=/^(_(?:self|top|parent|blank))$/,l=/^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,m=/^javascript:([^(]+)\(([^)]+)\)$/,n=/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/,o=/(?:^|,)([^=]+)=(\d+|yes|no)/gi,p=function(F,G){var H=G&&(G.data('cke-saved-href')||G.getAttribute('href'))||'',I,J,K,L,M={};if(I=H.match(e))if(y=='encode')H=H.replace(l,function(ae,af,ag){return 'mailto:'+String.fromCharCode.apply(String,af.split(','))+(ag&&w(ag));});else if(y)H.replace(m,function(ae,af,ag){if(af==z.name){M.type='email';var ah=M.email={},ai=/[^,\s]+/g,aj=/(^')|('$)/g,ak=ag.match(ai),al=ak.length,am,an;for(var ao=0;ao<al;ao++){an=decodeURIComponent(w(ak[ao].replace(aj,'')));am=z.params[ao].toLowerCase();ah[am]=an;}ah.address=[ah.name,ah.domain].join('@');}});if(!M.type)if(K=H.match(i)){M.type='anchor';M.anchor={};M.anchor.name=M.anchor.id=K[1];}else if(J=H.match(f)){var N=H.match(g),O=H.match(h);M.type='email';var P=M.email={};P.address=J[1];N&&(P.subject=decodeURIComponent(N[1]));O&&(P.body=decodeURIComponent(O[1]));}else if(H&&(L=H.match(j))){M.type='url';M.url={};M.url.protocol=L[1];M.url.url=L[2];}else M.type='url';if(G){var Q=G.getAttribute('target');M.target={};M.adv={};if(!Q){var R=G.data('cke-pa-onclick')||G.getAttribute('onclick'),S=R&&R.match(n);
-if(S){M.target.type='popup';M.target.name=S[1];var T;while(T=o.exec(S[2])){if((T[2]=='yes'||T[2]=='1')&&!(T[1] in {height:1,width:1,top:1,left:1}))M.target[T[1]]=true;else if(isFinite(T[2]))M.target[T[1]]=T[2];}}}else{var U=Q.match(k);if(U)M.target.type=M.target.name=Q;else{M.target.type='frame';M.target.name=Q;}}var V=this,W=function(ae,af){var ag=G.getAttribute(af);if(ag!==null)M.adv[ae]=ag||'';};W('advId','id');W('advLangDir','dir');W('advAccessKey','accessKey');M.adv.advName=G.data('cke-saved-name')||G.getAttribute('name')||'';W('advLangCode','lang');W('advTabIndex','tabindex');W('advTitle','title');W('advContentType','type');CKEDITOR.plugins.link.synAnchorSelector?M.adv.advCSSClasses=C(G):W('advCSSClasses','class');W('advCharset','charset');W('advStyles','style');W('advRel','rel');}var X=M.anchors=[],Y;if(CKEDITOR.plugins.link.emptyAnchorFix){var Z=F.document.getElementsByTag('a');for(i=0,count=Z.count();i<count;i++){Y=Z.getItem(i);if(Y.data('cke-saved-name')||Y.hasAttribute('name'))X.push({name:Y.data('cke-saved-name')||Y.getAttribute('name'),id:Y.getAttribute('id')});}}else{var aa=new CKEDITOR.dom.nodeList(F.document.$.anchors);for(var ab=0,ac=aa.count();ab<ac;ab++){Y=aa.getItem(ab);X[ab]={name:Y.getAttribute('name'),id:Y.getAttribute('id')};}}if(CKEDITOR.plugins.link.fakeAnchor){var ad=F.document.getElementsByTag('img');for(ab=0,ac=ad.count();ab<ac;ab++){if(Y=CKEDITOR.plugins.link.tryRestoreFakeAnchor(F,ad.getItem(ab)))X.push({name:Y.getAttribute('name'),id:Y.getAttribute('id')});}}this._.selectedElement=G;return M;},q=function(F,G){if(G[F])this.setValue(G[F][this.id]||'');},r=function(F){return q.call(this,'target',F);},s=function(F){return q.call(this,'adv',F);},t=function(F,G){if(!G[F])G[F]={};G[F][this.id]=this.getValue()||'';},u=function(F){return t.call(this,'target',F);},v=function(F){return t.call(this,'adv',F);};function w(F){return F.replace(/\\'/g,"'");};function x(F){return F.replace(/'/g,'\\$&');};var y=a.config.emailProtection||'';if(y&&y!='encode'){var z={};y.replace(/^([^(]+)\(([^)]+)\)$/,function(F,G,H){z.name=G;z.params=[];H.replace(/[^,\s]+/g,function(I){z.params.push(I);});});}function A(F){var G,H=z.name,I=z.params,J,K;G=[H,'('];for(var L=0;L<I.length;L++){J=I[L].toLowerCase();K=F[J];L>0&&G.push(',');G.push("'",K?x(encodeURIComponent(F[J])):'',"'");}G.push(')');return G.join('');};function B(F){var G,H=F.length,I=[];for(var J=0;J<H;J++){G=F.charCodeAt(J);I.push(G);}return 'String.fromCharCode('+I.join(',')+')';};function C(F){var G=F.getAttribute('class');
+if(S){M.target.type='popup';M.target.name=S[1];var T;while(T=o.exec(S[2])){if((T[2]=='yes'||T[2]=='1')&&!(T[1] in {height:1,width:1,top:1,left:1}))M.target[T[1]]=true;else if(isFinite(T[2]))M.target[T[1]]=T[2];}}}else{var U=Q.match(k);if(U)M.target.type=M.target.name=Q;else{M.target.type='frame';M.target.name=Q;}}var V=this,W=function(ae,af){var ag=G.getAttribute(af);if(ag!==null)M.adv[ae]=ag||'';};W('advId','id');W('advLangDir','dir');W('advAccessKey','accessKey');M.adv.advName=G.data('cke-saved-name')||G.getAttribute('name')||'';W('advLangCode','lang');W('advTabIndex','tabindex');W('advTitle','title');W('advContentType','type');CKEDITOR.plugins.link.synAnchorSelector?M.adv.advCSSClasses=C(G):W('advCSSClasses','class');W('advCharset','charset');W('advStyles','style');W('advRel','rel');}var X=M.anchors=[],Y,Z,aa;if(CKEDITOR.plugins.link.emptyAnchorFix){var ab=F.document.getElementsByTag('a');for(Y=0,Z=ab.count();Y<Z;Y++){aa=ab.getItem(Y);if(aa.data('cke-saved-name')||aa.hasAttribute('name'))X.push({name:aa.data('cke-saved-name')||aa.getAttribute('name'),id:aa.getAttribute('id')});}}else{var ac=new CKEDITOR.dom.nodeList(F.document.$.anchors);for(Y=0,Z=ac.count();Y<Z;Y++){aa=ac.getItem(Y);X[Y]={name:aa.getAttribute('name'),id:aa.getAttribute('id')};}}if(CKEDITOR.plugins.link.fakeAnchor){var ad=F.document.getElementsByTag('img');for(Y=0,Z=ad.count();Y<Z;Y++){if(aa=CKEDITOR.plugins.link.tryRestoreFakeAnchor(F,ad.getItem(Y)))X.push({name:aa.getAttribute('name'),id:aa.getAttribute('id')});}}this._.selectedElement=G;return M;},q=function(F,G){if(G[F])this.setValue(G[F][this.id]||'');},r=function(F){return q.call(this,'target',F);},s=function(F){return q.call(this,'adv',F);},t=function(F,G){if(!G[F])G[F]={};G[F][this.id]=this.getValue()||'';},u=function(F){return t.call(this,'target',F);},v=function(F){return t.call(this,'adv',F);};function w(F){return F.replace(/\\'/g,"'");};function x(F){return F.replace(/'/g,'\\$&');};var y=a.config.emailProtection||'';if(y&&y!='encode'){var z={};y.replace(/^([^(]+)\(([^)]+)\)$/,function(F,G,H){z.name=G;z.params=[];H.replace(/[^,\s]+/g,function(I){z.params.push(I);});});}function A(F){var G,H=z.name,I=z.params,J,K;G=[H,'('];for(var L=0;L<I.length;L++){J=I[L].toLowerCase();K=F[J];L>0&&G.push(',');G.push("'",K?x(encodeURIComponent(F[J])):'',"'");}G.push(')');return G.join('');};function B(F){var G,H=F.length,I=[];for(var J=0;J<H;J++){G=F.charCodeAt(J);I.push(G);}return 'String.fromCharCode('+I.join(',')+')';};function C(F){var G=F.getAttribute('class');
return G?G.replace(/\s*(?:cke_anchor_empty|cke_anchor)(?:\s*$)?/g,''):'';};var D=a.lang.common,E=a.lang.link;return{title:E.title,minWidth:350,minHeight:230,contents:[{id:'info',label:E.info,title:E.info,elements:[{id:'linkType',type:'select',label:E.type,'default':'url',items:[[E.toUrl,'url'],[E.toAnchor,'anchor'],[E.toEmail,'email']],onChange:d,setup:function(F){if(F.type)this.setValue(F.type);},commit:function(F){F.type=this.getValue();}},{type:'vbox',id:'urlOptions',children:[{type:'hbox',widths:['25%','75%'],children:[{id:'protocol',type:'select',label:D.protocol,'default':'http://',items:[['http://‎','http://'],['https://‎','https://'],['ftp://‎','ftp://'],['news://‎','news://'],[E.other,'']],setup:function(F){if(F.url)this.setValue(F.url.protocol||'');},commit:function(F){if(!F.url)F.url={};F.url.protocol=this.getValue();}},{type:'text',id:'url',label:D.url,required:true,onLoad:function(){this.allowOnChange=true;},onKeyUp:function(){var K=this;K.allowOnChange=false;var F=K.getDialog().getContentElement('info','protocol'),G=K.getValue(),H=/^(http|https|ftp|news):\/\/(?=.)/i,I=/^((javascript:)|[#\/\.\?])/i,J=H.exec(G);if(J){K.setValue(G.substr(J[0].length));F.setValue(J[0].toLowerCase());}else if(I.test(G))F.setValue('');K.allowOnChange=true;},onChange:function(){if(this.allowOnChange)this.onKeyUp();},validate:function(){var F=this.getDialog();if(F.getContentElement('info','linkType')&&F.getValueOf('info','linkType')!='url')return true;if(this.getDialog().fakeObj)return true;var G=CKEDITOR.dialog.validate.notEmpty(E.noUrl);return G.apply(this);},setup:function(F){this.allowOnChange=false;if(F.url)this.setValue(F.url.url);this.allowOnChange=true;},commit:function(F){this.onChange();if(!F.url)F.url={};F.url.url=this.getValue();this.allowOnChange=false;}}],setup:function(F){if(!this.getDialog().getContentElement('info','linkType'))this.getElement().show();}},{type:'button',id:'browse',hidden:'true',filebrowser:'info:url',label:D.browseServer}]},{type:'vbox',id:'anchorOptions',width:260,align:'center',padding:0,children:[{type:'fieldset',id:'selectAnchorText',label:E.selectAnchor,setup:function(F){if(F.anchors.length>0)this.getElement().show();else this.getElement().hide();},children:[{type:'hbox',id:'selectAnchor',children:[{type:'select',id:'anchorName','default':'',label:E.anchorName,style:'width: 100%;',items:[['']],setup:function(F){var I=this;I.clear();I.add('');for(var G=0;G<F.anchors.length;G++){if(F.anchors[G].name)I.add(F.anchors[G].name);}if(F.anchor)I.setValue(F.anchor.name);
-var H=I.getDialog().getContentElement('info','linkType');if(H&&H.getValue()=='email')I.focus();},commit:function(F){if(!F.anchor)F.anchor={};F.anchor.name=this.getValue();}},{type:'select',id:'anchorId','default':'',label:E.anchorId,style:'width: 100%;',items:[['']],setup:function(F){var H=this;H.clear();H.add('');for(var G=0;G<F.anchors.length;G++){if(F.anchors[G].id)H.add(F.anchors[G].id);}if(F.anchor)H.setValue(F.anchor.id);},commit:function(F){if(!F.anchor)F.anchor={};F.anchor.id=this.getValue();}}],setup:function(F){if(F.anchors.length>0)this.getElement().show();else this.getElement().hide();}}]},{type:'html',id:'noAnchors',style:'text-align: center;',html:'<div role="label" tabIndex="-1">'+CKEDITOR.tools.htmlEncode(E.noAnchors)+'</div>',focus:true,setup:function(F){if(F.anchors.length<1)this.getElement().show();else this.getElement().hide();}}],setup:function(F){if(!this.getDialog().getContentElement('info','linkType'))this.getElement().hide();}},{type:'vbox',id:'emailOptions',padding:1,children:[{type:'text',id:'emailAddress',label:E.emailAddress,required:true,validate:function(){var F=this.getDialog();if(!F.getContentElement('info','linkType')||F.getValueOf('info','linkType')!='email')return true;var G=CKEDITOR.dialog.validate.notEmpty(E.noEmail);return G.apply(this);},setup:function(F){if(F.email)this.setValue(F.email.address);var G=this.getDialog().getContentElement('info','linkType');if(G&&G.getValue()=='email')this.select();},commit:function(F){if(!F.email)F.email={};F.email.address=this.getValue();}},{type:'text',id:'emailSubject',label:E.emailSubject,setup:function(F){if(F.email)this.setValue(F.email.subject);},commit:function(F){if(!F.email)F.email={};F.email.subject=this.getValue();}},{type:'textarea',id:'emailBody',label:E.emailBody,rows:3,'default':'',setup:function(F){if(F.email)this.setValue(F.email.body);},commit:function(F){if(!F.email)F.email={};F.email.body=this.getValue();}}],setup:function(F){if(!this.getDialog().getContentElement('info','linkType'))this.getElement().hide();}}]},{id:'target',label:E.target,title:E.target,elements:[{type:'hbox',widths:['50%','50%'],children:[{type:'select',id:'linkTargetType',label:D.target,'default':'notSet',style:'width : 100%;',items:[[D.notSet,'notSet'],[E.targetFrame,'frame'],[E.targetPopup,'popup'],[D.targetNew,'_blank'],[D.targetTop,'_top'],[D.targetSelf,'_self'],[D.targetParent,'_parent']],onChange:c,setup:function(F){if(F.target)this.setValue(F.target.type||'notSet');c.call(this);},commit:function(F){if(!F.target)F.target={};
-F.target.type=this.getValue();}},{type:'text',id:'linkTargetName',label:E.targetFrameName,'default':'',setup:function(F){if(F.target)this.setValue(F.target.name);},commit:function(F){if(!F.target)F.target={};F.target.name=this.getValue().replace(/\W/gi,'');}}]},{type:'vbox',width:'100%',align:'center',padding:2,id:'popupFeatures',children:[{type:'fieldset',label:E.popupFeatures,children:[{type:'hbox',children:[{type:'checkbox',id:'resizable',label:E.popupResizable,setup:r,commit:u},{type:'checkbox',id:'status',label:E.popupStatusBar,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'location',label:E.popupLocationBar,setup:r,commit:u},{type:'checkbox',id:'toolbar',label:E.popupToolbar,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'menubar',label:E.popupMenuBar,setup:r,commit:u},{type:'checkbox',id:'fullscreen',label:E.popupFullScreen,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'scrollbars',label:E.popupScrollBars,setup:r,commit:u},{type:'checkbox',id:'dependent',label:E.popupDependent,setup:r,commit:u}]},{type:'hbox',children:[{type:'text',widths:['50%','50%'],labelLayout:'horizontal',label:D.width,id:'width',setup:r,commit:u},{type:'text',labelLayout:'horizontal',widths:['50%','50%'],label:E.popupLeft,id:'left',setup:r,commit:u}]},{type:'hbox',children:[{type:'text',labelLayout:'horizontal',widths:['50%','50%'],label:D.height,id:'height',setup:r,commit:u},{type:'text',labelLayout:'horizontal',label:E.popupTop,widths:['50%','50%'],id:'top',setup:r,commit:u}]}]}]}]},{id:'upload',label:E.upload,title:E.upload,hidden:true,filebrowser:'uploadButton',elements:[{type:'file',id:'upload',label:D.upload,style:'height:40px',size:29},{type:'fileButton',id:'uploadButton',label:D.uploadSubmit,filebrowser:'info:url','for':['upload','upload']}]},{id:'advanced',label:E.advanced,title:E.advanced,elements:[{type:'vbox',padding:1,children:[{type:'hbox',widths:['45%','35%','20%'],children:[{type:'text',id:'advId',label:E.id,setup:s,commit:v},{type:'select',id:'advLangDir',label:E.langDir,'default':'',style:'width:110px',items:[[D.notSet,''],[E.langDirLTR,'ltr'],[E.langDirRTL,'rtl']],setup:s,commit:v},{type:'text',id:'advAccessKey',width:'80px',label:E.acccessKey,maxLength:1,setup:s,commit:v}]},{type:'hbox',widths:['45%','35%','20%'],children:[{type:'text',label:E.name,id:'advName',setup:s,commit:v},{type:'text',label:E.langCode,id:'advLangCode',width:'110px','default':'',setup:s,commit:v},{type:'text',label:E.tabIndex,id:'advTabIndex',width:'80px',maxLength:5,setup:s,commit:v}]}]},{type:'vbox',padding:1,children:[{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.advisoryTitle,'default':'',id:'advTitle',setup:s,commit:v},{type:'text',label:E.advisoryContentType,'default':'',id:'advContentType',setup:s,commit:v}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.cssClasses,'default':'',id:'advCSSClasses',setup:s,commit:v},{type:'text',label:E.charset,'default':'',id:'advCharset',setup:s,commit:v}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.rel,'default':'',id:'advRel',setup:s,commit:v},{type:'text',label:E.styles,'default':'',id:'advStyles',setup:s,commit:v}]}]}]}],onShow:function(){var F=this.getParentEditor(),G=F.getSelection(),H=null;
-if((H=b.getSelectedLink(F))&&H.hasAttribute('href'))G.selectElement(H);else H=null;this.setupContent(p.apply(this,[F,H]));},onOk:function(){var F={},G=[],H={},I=this,J=this.getParentEditor();this.commitContent(H);switch(H.type||'url'){case 'url':var K=H.url&&H.url.protocol!=undefined?H.url.protocol:'http://',L=H.url&&CKEDITOR.tools.trim(H.url.url)||'';F['data-cke-saved-href']=L.indexOf('/')===0?L:K+L;break;case 'anchor':var M=H.anchor&&H.anchor.name,N=H.anchor&&H.anchor.id;F['data-cke-saved-href']='#'+(M||N||'');break;case 'email':var O,P=H.email,Q=P.address;switch(y){case '':case 'encode':var R=encodeURIComponent(P.subject||''),S=encodeURIComponent(P.body||''),T=[];R&&T.push('subject='+R);S&&T.push('body='+S);T=T.length?'?'+T.join('&'):'';if(y=='encode'){O=["javascript:void(location.href='mailto:'+",B(Q)];T&&O.push("+'",x(T),"'");O.push(')');}else O=['mailto:',Q,T];break;default:var U=Q.split('@',2);P.name=U[0];P.domain=U[1];O=['javascript:',A(P)];}F['data-cke-saved-href']=O.join('');break;}if(H.target)if(H.target.type=='popup'){var V=["window.open(this.href, '",H.target.name||'',"', '"],W=['resizable','status','location','toolbar','menubar','fullscreen','scrollbars','dependent'],X=W.length,Y=function(ai){if(H.target[ai])W.push(ai+'='+H.target[ai]);};for(var Z=0;Z<X;Z++)W[Z]=W[Z]+(H.target[W[Z]]?'=yes':'=no');Y('width');Y('left');Y('height');Y('top');V.push(W.join(','),"'); return false;");F['data-cke-pa-onclick']=V.join('');G.push('target');}else{if(H.target.type!='notSet'&&H.target.name)F.target=H.target.name;else G.push('target');G.push('data-cke-pa-onclick','onclick');}if(H.adv){var aa=function(ai,aj){var ak=H.adv[ai];if(ak)F[aj]=ak;else G.push(aj);};aa('advId','id');aa('advLangDir','dir');aa('advAccessKey','accessKey');if(H.adv.advName)F.name=F['data-cke-saved-name']=H.adv.advName;else G=G.concat(['data-cke-saved-name','name']);aa('advLangCode','lang');aa('advTabIndex','tabindex');aa('advTitle','title');aa('advContentType','type');aa('advCSSClasses','class');aa('advCharset','charset');aa('advStyles','style');aa('advRel','rel');}F.href=F['data-cke-saved-href'];if(!this._.selectedElement){var ab=J.getSelection(),ac=ab.getRanges(true);if(ac.length==1&&ac[0].collapsed){var ad=new CKEDITOR.dom.text(H.type=='email'?H.email.address:F['data-cke-saved-href'],J.document);ac[0].insertNode(ad);ac[0].selectNodeContents(ad);ab.selectRanges(ac);}var ae=new CKEDITOR.style({element:'a',attributes:F});ae.type=CKEDITOR.STYLE_INLINE;ae.apply(J.document);}else{var af=this._.selectedElement,ag=af.data('cke-saved-href'),ah=af.getHtml();
-af.setAttributes(F);af.removeAttributes(G);if(H.adv&&H.adv.advName&&CKEDITOR.plugins.link.synAnchorSelector)af.addClass(af.getChildCount()?'cke_anchor':'cke_anchor_empty');if(ag==ah||H.type=='email'&&ah.indexOf('@')!=-1)af.setHtml(H.type=='email'?H.email.address:F['data-cke-saved-href']);delete this._.selectedElement;}},onLoad:function(){if(!a.config.linkShowAdvancedTab)this.hidePage('advanced');if(!a.config.linkShowTargetTab)this.hidePage('target');},onFocus:function(){var F=this.getContentElement('info','linkType'),G;if(F&&F.getValue()=='url'){G=this.getContentElement('info','url');G.select();}}};});
+var H=I.getDialog().getContentElement('info','linkType');if(H&&H.getValue()=='email')I.focus();},commit:function(F){if(!F.anchor)F.anchor={};F.anchor.name=this.getValue();}},{type:'select',id:'anchorId','default':'',label:E.anchorId,style:'width: 100%;',items:[['']],setup:function(F){var H=this;H.clear();H.add('');for(var G=0;G<F.anchors.length;G++){if(F.anchors[G].id)H.add(F.anchors[G].id);}if(F.anchor)H.setValue(F.anchor.id);},commit:function(F){if(!F.anchor)F.anchor={};F.anchor.id=this.getValue();}}],setup:function(F){if(F.anchors.length>0)this.getElement().show();else this.getElement().hide();}}]},{type:'html',id:'noAnchors',style:'text-align: center;',html:'<div role="note" tabIndex="-1">'+CKEDITOR.tools.htmlEncode(E.noAnchors)+'</div>',focus:true,setup:function(F){if(F.anchors.length<1)this.getElement().show();else this.getElement().hide();}}],setup:function(F){if(!this.getDialog().getContentElement('info','linkType'))this.getElement().hide();}},{type:'vbox',id:'emailOptions',padding:1,children:[{type:'text',id:'emailAddress',label:E.emailAddress,required:true,validate:function(){var F=this.getDialog();if(!F.getContentElement('info','linkType')||F.getValueOf('info','linkType')!='email')return true;var G=CKEDITOR.dialog.validate.notEmpty(E.noEmail);return G.apply(this);},setup:function(F){if(F.email)this.setValue(F.email.address);var G=this.getDialog().getContentElement('info','linkType');if(G&&G.getValue()=='email')this.select();},commit:function(F){if(!F.email)F.email={};F.email.address=this.getValue();}},{type:'text',id:'emailSubject',label:E.emailSubject,setup:function(F){if(F.email)this.setValue(F.email.subject);},commit:function(F){if(!F.email)F.email={};F.email.subject=this.getValue();}},{type:'textarea',id:'emailBody',label:E.emailBody,rows:3,'default':'',setup:function(F){if(F.email)this.setValue(F.email.body);},commit:function(F){if(!F.email)F.email={};F.email.body=this.getValue();}}],setup:function(F){if(!this.getDialog().getContentElement('info','linkType'))this.getElement().hide();}}]},{id:'target',label:E.target,title:E.target,elements:[{type:'hbox',widths:['50%','50%'],children:[{type:'select',id:'linkTargetType',label:D.target,'default':'notSet',style:'width : 100%;',items:[[D.notSet,'notSet'],[E.targetFrame,'frame'],[E.targetPopup,'popup'],[D.targetNew,'_blank'],[D.targetTop,'_top'],[D.targetSelf,'_self'],[D.targetParent,'_parent']],onChange:c,setup:function(F){if(F.target)this.setValue(F.target.type||'notSet');c.call(this);},commit:function(F){if(!F.target)F.target={};
+F.target.type=this.getValue();}},{type:'text',id:'linkTargetName',label:E.targetFrameName,'default':'',setup:function(F){if(F.target)this.setValue(F.target.name);},commit:function(F){if(!F.target)F.target={};F.target.name=this.getValue().replace(/\W/gi,'');}}]},{type:'vbox',width:'100%',align:'center',padding:2,id:'popupFeatures',children:[{type:'fieldset',label:E.popupFeatures,children:[{type:'hbox',children:[{type:'checkbox',id:'resizable',label:E.popupResizable,setup:r,commit:u},{type:'checkbox',id:'status',label:E.popupStatusBar,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'location',label:E.popupLocationBar,setup:r,commit:u},{type:'checkbox',id:'toolbar',label:E.popupToolbar,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'menubar',label:E.popupMenuBar,setup:r,commit:u},{type:'checkbox',id:'fullscreen',label:E.popupFullScreen,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'scrollbars',label:E.popupScrollBars,setup:r,commit:u},{type:'checkbox',id:'dependent',label:E.popupDependent,setup:r,commit:u}]},{type:'hbox',children:[{type:'text',widths:['50%','50%'],labelLayout:'horizontal',label:D.width,id:'width',setup:r,commit:u},{type:'text',labelLayout:'horizontal',widths:['50%','50%'],label:E.popupLeft,id:'left',setup:r,commit:u}]},{type:'hbox',children:[{type:'text',labelLayout:'horizontal',widths:['50%','50%'],label:D.height,id:'height',setup:r,commit:u},{type:'text',labelLayout:'horizontal',label:E.popupTop,widths:['50%','50%'],id:'top',setup:r,commit:u}]}]}]}]},{id:'upload',label:E.upload,title:E.upload,hidden:true,filebrowser:'uploadButton',elements:[{type:'file',id:'upload',label:D.upload,style:'height:40px',size:29},{type:'fileButton',id:'uploadButton',label:D.uploadSubmit,filebrowser:'info:url','for':['upload','upload']}]},{id:'advanced',label:E.advanced,title:E.advanced,elements:[{type:'vbox',padding:1,children:[{type:'hbox',widths:['45%','35%','20%'],children:[{type:'text',id:'advId',label:E.id,setup:s,commit:v},{type:'select',id:'advLangDir',label:E.langDir,'default':'',style:'width:110px',items:[[D.notSet,''],[E.langDirLTR,'ltr'],[E.langDirRTL,'rtl']],setup:s,commit:v},{type:'text',id:'advAccessKey',width:'80px',label:E.acccessKey,maxLength:1,setup:s,commit:v}]},{type:'hbox',widths:['45%','35%','20%'],children:[{type:'text',label:E.name,id:'advName',setup:s,commit:v},{type:'text',label:E.langCode,id:'advLangCode',width:'110px','default':'',setup:s,commit:v},{type:'text',label:E.tabIndex,id:'advTabIndex',width:'80px',maxLength:5,setup:s,commit:v}]}]},{type:'vbox',padding:1,children:[{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.advisoryTitle,'default':'',id:'advTitle',setup:s,commit:v},{type:'text',label:E.advisoryContentType,'default':'',id:'advContentType',setup:s,commit:v}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.cssClasses,'default':'',id:'advCSSClasses',setup:s,commit:v},{type:'text',label:E.charset,'default':'',id:'advCharset',setup:s,commit:v}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.rel,'default':'',id:'advRel',setup:s,commit:v},{type:'text',label:E.styles,'default':'',id:'advStyles',validate:CKEDITOR.dialog.validate.inlineStyle(a.lang.common.invalidInlineStyle),setup:s,commit:v}]}]}]}],onShow:function(){var F=this.getParentEditor(),G=F.getSelection(),H=null;
+if((H=b.getSelectedLink(F))&&H.hasAttribute('href'))G.selectElement(H);else H=null;this.setupContent(p.apply(this,[F,H]));},onOk:function(){var F={},G=[],H={},I=this,J=this.getParentEditor();this.commitContent(H);switch(H.type||'url'){case 'url':var K=H.url&&H.url.protocol!=undefined?H.url.protocol:'http://',L=H.url&&CKEDITOR.tools.trim(H.url.url)||'';F['data-cke-saved-href']=L.indexOf('/')===0?L:K+L;break;case 'anchor':var M=H.anchor&&H.anchor.name,N=H.anchor&&H.anchor.id;F['data-cke-saved-href']='#'+(M||N||'');break;case 'email':var O,P=H.email,Q=P.address;switch(y){case '':case 'encode':var R=encodeURIComponent(P.subject||''),S=encodeURIComponent(P.body||''),T=[];R&&T.push('subject='+R);S&&T.push('body='+S);T=T.length?'?'+T.join('&'):'';if(y=='encode'){O=["javascript:void(location.href='mailto:'+",B(Q)];T&&O.push("+'",x(T),"'");O.push(')');}else O=['mailto:',Q,T];break;default:var U=Q.split('@',2);P.name=U[0];P.domain=U[1];O=['javascript:',A(P)];}F['data-cke-saved-href']=O.join('');break;}if(H.target)if(H.target.type=='popup'){var V=["window.open(this.href, '",H.target.name||'',"', '"],W=['resizable','status','location','toolbar','menubar','fullscreen','scrollbars','dependent'],X=W.length,Y=function(ai){if(H.target[ai])W.push(ai+'='+H.target[ai]);};for(var Z=0;Z<X;Z++)W[Z]=W[Z]+(H.target[W[Z]]?'=yes':'=no');Y('width');Y('left');Y('height');Y('top');V.push(W.join(','),"'); return false;");F['data-cke-pa-onclick']=V.join('');G.push('target');}else{if(H.target.type!='notSet'&&H.target.name)F.target=H.target.name;else G.push('target');G.push('data-cke-pa-onclick','onclick');}if(H.adv){var aa=function(ai,aj){var ak=H.adv[ai];if(ak)F[aj]=ak;else G.push(aj);};aa('advId','id');aa('advLangDir','dir');aa('advAccessKey','accessKey');if(H.adv.advName)F.name=F['data-cke-saved-name']=H.adv.advName;else G=G.concat(['data-cke-saved-name','name']);aa('advLangCode','lang');aa('advTabIndex','tabindex');aa('advTitle','title');aa('advContentType','type');aa('advCSSClasses','class');aa('advCharset','charset');aa('advStyles','style');aa('advRel','rel');}var ab=J.getSelection();F.href=F['data-cke-saved-href'];if(!this._.selectedElement){var ac=ab.getRanges(true);if(ac.length==1&&ac[0].collapsed){var ad=new CKEDITOR.dom.text(H.type=='email'?H.email.address:F['data-cke-saved-href'],J.document);ac[0].insertNode(ad);ac[0].selectNodeContents(ad);ab.selectRanges(ac);}var ae=new CKEDITOR.style({element:'a',attributes:F});ae.type=CKEDITOR.STYLE_INLINE;ae.apply(J.document);}else{var af=this._.selectedElement,ag=af.data('cke-saved-href'),ah=af.getHtml();
+af.setAttributes(F);af.removeAttributes(G);if(H.adv&&H.adv.advName&&CKEDITOR.plugins.link.synAnchorSelector)af.addClass(af.getChildCount()?'cke_anchor':'cke_anchor_empty');if(ag==ah||H.type=='email'&&ah.indexOf('@')!=-1)af.setHtml(H.type=='email'?H.email.address:F['data-cke-saved-href']);ab.selectElement(af);delete this._.selectedElement;}},onLoad:function(){if(!a.config.linkShowAdvancedTab)this.hidePage('advanced');if(!a.config.linkShowTargetTab)this.hidePage('target');},onFocus:function(){var F=this.getContentElement('info','linkType'),G;if(F&&F.getValue()=='url'){G=this.getContentElement('info','url');G.select();}}};});
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/pastetext/dialogs/pastetext.js b/appsrc/ODS-Framework/ckeditor/plugins/pastetext/dialogs/pastetext.js
index c13fb56..419d24a 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/pastetext/dialogs/pastetext.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/pastetext/dialogs/pastetext.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/scayt/dialogs/options.js b/appsrc/ODS-Framework/ckeditor/plugins/scayt/dialogs/options.js
index 6d7c797..9eb1475 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/scayt/dialogs/options.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/scayt/dialogs/options.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/scayt/dialogs/toolbar.css b/appsrc/ODS-Framework/ckeditor/plugins/scayt/dialogs/toolbar.css
index ae37086..e2c305b 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/scayt/dialogs/toolbar.css
+++ b/appsrc/ODS-Framework/ckeditor/plugins/scayt/dialogs/toolbar.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/smiley/dialogs/smiley.js b/appsrc/ODS-Framework/ckeditor/plugins/smiley/dialogs/smiley.js
index 6572498..aa7d28b 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/smiley/dialogs/smiley.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/smiley/dialogs/smiley.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/specialchar/dialogs/specialchar.js b/appsrc/ODS-Framework/ckeditor/plugins/specialchar/dialogs/specialchar.js
index 80df472..94c4505 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/specialchar/dialogs/specialchar.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/specialchar/dialogs/specialchar.js
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
CKEDITOR.dialog.add('specialchar',function(a){var b,c=a.lang.specialChar,d=function(j){var k,l;if(j.data)k=j.data.getTarget();else k=new CKEDITOR.dom.element(j);if(k.getName()=='a'&&(l=k.getChild(0).getHtml())){k.removeClass('cke_light_background');b.hide();var m=a.document.createElement('span');m.setHtml(l);a.insertText(m.getText());}},e=CKEDITOR.tools.addFunction(d),f,g=function(j,k){var l;k=k||j.data.getTarget();if(k.getName()=='span')k=k.getParent();if(k.getName()=='a'&&(l=k.getChild(0).getHtml())){if(f)h(null,f);var m=b.getContentElement('info','htmlPreview').getElement();b.getContentElement('info','charPreview').getElement().setHtml(l);m.setHtml(CKEDITOR.tools.htmlEncode(l));k.getParent().addClass('cke_light_background');f=k;}},h=function(j,k){k=k||j.data.getTarget();if(k.getName()=='span')k=k.getParent();if(k.getName()=='a'){b.getContentElement('info','charPreview').getElement().setHtml(' ');b.getContentElement('info','htmlPreview').getElement().setHtml(' ');k.getParent().removeClass('cke_light_background');f=undefined;}},i=CKEDITOR.tools.addFunction(function(j){j=new CKEDITOR.dom.event(j);var k=j.getTarget(),l,m,n=j.getKeystroke(),o=a.lang.dir=='rtl';switch(n){case 38:if(l=k.getParent().getParent().getPrevious()){m=l.getChild([k.getParent().getIndex(),0]);m.focus();h(null,k);g(null,m);}j.preventDefault();break;case 40:if(l=k.getParent().getParent().getNext()){m=l.getChild([k.getParent().getIndex(),0]);if(m&&m.type==1){m.focus();h(null,k);g(null,m);}}j.preventDefault();break;case 32:d({data:j});j.preventDefault();break;case o?37:39:case 9:if(l=k.getParent().getNext()){m=l.getChild(0);if(m.type==1){m.focus();h(null,k);g(null,m);j.preventDefault(true);}else h(null,k);}else if(l=k.getParent().getParent().getNext()){m=l.getChild([0,0]);if(m&&m.type==1){m.focus();h(null,k);g(null,m);j.preventDefault(true);}else h(null,k);}break;case o?39:37:case CKEDITOR.SHIFT+9:if(l=k.getParent().getPrevious()){m=l.getChild(0);m.focus();h(null,k);g(null,m);j.preventDefault(true);}else if(l=k.getParent().getParent().getPrevious()){m=l.getLast().getChild(0);m.focus();h(null,k);g(null,m);j.preventDefault(true);}else h(null,k);break;default:return;}});return{title:c.title,minWidth:430,minHeight:280,buttons:[CKEDITOR.dialog.cancelButton],charColumns:17,onLoad:function(){var j=this.definition.charColumns,k=a.config.extraSpecialChars,l=a.config.specialChars,m=CKEDITOR.tools.getNextId()+'_specialchar_table_label',n=['<table role="listbox" aria-labelledby="'+m+'"'+' style="width: 320px; height: 100%; border-collapse: separate;"'+' align="center" cellspacing="2" cellpadding="2" border="0">'],o=0,p=l.length,q,r;
-while(o<p){n.push('<tr>');for(var s=0;s<j;s++,o++){if(q=l[o]){r='';if(q instanceof Array){r=q[1];q=q[0];}else{var t=q.toLowerCase().replace('&','').replace(';','').replace('#','');r=c[t]||q;}var u='cke_specialchar_label_'+o+'_'+CKEDITOR.tools.getNextNumber();n.push('<td class="cke_dark_background" style="cursor: default" role="presentation"><a href="javascript: void(0);" role="option" aria-posinset="'+(o+1)+'"',' aria-setsize="'+p+'"',' aria-labelledby="'+u+'"',' style="cursor: inherit; display: block; height: 1.25em; margin-top: 0.25em; text-align: center;" title="',CKEDITOR.tools.htmlEncode(r),'" onkeydown="CKEDITOR.tools.callFunction( '+i+', event, this )"'+' onclick="CKEDITOR.tools.callFunction('+e+', this); return false;"'+' tabindex="-1">'+'<span style="margin: 0 auto;cursor: inherit">'+q+'</span>'+'<span class="cke_voice_label" id="'+u+'">'+r+'</span></a>');}else n.push('<td class="cke_dark_background"> ');n.push('</td>');}n.push('</tr>');}n.push('</tbody></table>','<span id="'+m+'" class="cke_voice_label">'+c.options+'</span>');this.getContentElement('info','charContainer').getElement().setHtml(n.join(''));},contents:[{id:'info',label:a.lang.common.generalTab,title:a.lang.common.generalTab,padding:0,align:'top',elements:[{type:'hbox',align:'top',widths:['320px','90px'],children:[{type:'html',id:'charContainer',html:'',onMouseover:g,onMouseout:h,focus:function(){var j=this.getElement().getElementsByTag('a').getItem(0);setTimeout(function(){j.focus();g(null,j);},0);},onShow:function(){var j=this.getElement().getChild([0,0,0,0,0]);setTimeout(function(){j.focus();g(null,j);},0);},onLoad:function(j){b=j.sender;}},{type:'hbox',align:'top',widths:['100%'],children:[{type:'vbox',align:'top',children:[{type:'html',html:'<div></div>'},{type:'html',id:'charPreview',className:'cke_dark_background',style:"border:1px solid #eeeeee;font-size:28px;height:40px;width:70px;padding-top:9px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:'<div> </div>'},{type:'html',id:'htmlPreview',className:'cke_dark_background',style:"border:1px solid #eeeeee;font-size:14px;height:20px;width:70px;padding-top:2px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:'<div> </div>'}]}]}]}]}]};});
+while(o<p){n.push('<tr>');for(var s=0;s<j;s++,o++){if(q=l[o]){r='';if(q instanceof Array){r=q[1];q=q[0];}else{var t=q.replace('&','').replace(';','').replace('#','');r=c[t]||q;}var u='cke_specialchar_label_'+o+'_'+CKEDITOR.tools.getNextNumber();n.push('<td class="cke_dark_background" style="cursor: default" role="presentation"><a href="javascript: void(0);" role="option" aria-posinset="'+(o+1)+'"',' aria-setsize="'+p+'"',' aria-labelledby="'+u+'"',' style="cursor: inherit; display: block; height: 1.25em; margin-top: 0.25em; text-align: center;" title="',CKEDITOR.tools.htmlEncode(r),'" onkeydown="CKEDITOR.tools.callFunction( '+i+', event, this )"'+' onclick="CKEDITOR.tools.callFunction('+e+', this); return false;"'+' tabindex="-1">'+'<span style="margin: 0 auto;cursor: inherit">'+q+'</span>'+'<span class="cke_voice_label" id="'+u+'">'+r+'</span></a>');}else n.push('<td class="cke_dark_background"> ');n.push('</td>');}n.push('</tr>');}n.push('</tbody></table>','<span id="'+m+'" class="cke_voice_label">'+c.options+'</span>');this.getContentElement('info','charContainer').getElement().setHtml(n.join(''));},contents:[{id:'info',label:a.lang.common.generalTab,title:a.lang.common.generalTab,padding:0,align:'top',elements:[{type:'hbox',align:'top',widths:['320px','90px'],children:[{type:'html',id:'charContainer',html:'',onMouseover:g,onMouseout:h,focus:function(){var j=this.getElement().getElementsByTag('a').getItem(0);setTimeout(function(){j.focus();g(null,j);},0);},onShow:function(){var j=this.getElement().getChild([0,0,0,0,0]);setTimeout(function(){j.focus();g(null,j);},0);},onLoad:function(j){b=j.sender;}},{type:'hbox',align:'top',widths:['100%'],children:[{type:'vbox',align:'top',children:[{type:'html',html:'<div></div>'},{type:'html',id:'charPreview',className:'cke_dark_background',style:"border:1px solid #eeeeee;font-size:28px;height:40px;width:70px;padding-top:9px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:'<div> </div>'},{type:'html',id:'htmlPreview',className:'cke_dark_background',style:"border:1px solid #eeeeee;font-size:14px;height:20px;width:70px;padding-top:2px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:'<div> </div>'}]}]}]}]}]};});
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/specialchar/lang/en.js b/appsrc/ODS-Framework/ckeditor/plugins/specialchar/lang/en.js
index 9893b84..1161d26 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/specialchar/lang/en.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/specialchar/lang/en.js
@@ -1,6 +1,6 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-CKEDITOR.plugins.setLang('specialchar','en',{euro:'Euro sign',lsquo:'Left single quotation mark',rsquo:'Right single quotation mark',ldquo:'Left double quotation mark',rdquo:'Right double quotation mark',ndash:'En dash',mdash:'Em dash',iexcl:'Inverted exclamation mark',cent:'Cent sign',pound:'Pound sign',curren:'Currency sign',yen:'Yen sign',brvbar:'Broken bar',sect:'Section sign',uml:'Diaeresis',copy:'Copyright sign',ordf:'Feminine ordinal indicator',laquo:'Left-pointing double angle quotation mark',not:'Not sign',reg:'Registered sign',macr:'Macron',deg:'Degree sign',sup2:'Superscript two',sup3:'Superscript three',acute:'Acute accent',micro:'Micro sign',para:'Pilcrow sign',middot:'Middle dot',cedil:'Cedilla',sup1:'Superscript one',ordm:'Masculine ordinal indicator',frac14:'Vulgar fraction one quarter',frac12:'Vulgar fraction one half',frac34:'Vulgar fraction three quarters',iquest:'Inverted question mark',agrave:'Latin small letter a with grave',aacute:'Latin small letter a with acute',acirc:'Latin small letter a with circumflex',atilde:'Latin small letter a with tilde',auml:'Latin small letter a with diaeresis',aring:'Latin small letter a with ring above',aelig:'Latin small letter ae',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave',eacute:'Latin small letter e with acute',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave',iacute:'Latin small letter i with acute',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'Latin small letter n with tilde',ograve:'Latin small letter o with grave',oacute:'Latin small letter o with acute',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',times:'Multiplication sign',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave',uacute:'Latin small letter u with acute',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute',thorn:'Latin small letter thorn',szlig:'Latin small letter sharp s',divide:'Division sign',yuml:'Latin small letter y with diaeresis',oelig:'Latin small ligature oe',372:'Latin capital letter w with circumflex',374:'Latin capital letter y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Trade mark sign',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'Rightwards double arrow',harr:'Left right double arrow',diams:'Black diamond suit',asymp:'Almost equal to',sbquo:'Single low-9 quotation mark'});
+CKEDITOR.plugins.setLang('specialchar','en',{euro:'Euro sign',lsquo:'Left single quotation mark',rsquo:'Right single quotation mark',ldquo:'Left double quotation mark',rdquo:'Right double quotation mark',ndash:'En dash',mdash:'Em dash',iexcl:'Inverted exclamation mark',cent:'Cent sign',pound:'Pound sign',curren:'Currency sign',yen:'Yen sign',brvbar:'Broken bar',sect:'Section sign',uml:'Diaeresis',copy:'Copyright sign',ordf:'Feminine ordinal indicator',laquo:'Left-pointing double angle quotation mark',not:'Not sign',reg:'Registered sign',macr:'Macron',deg:'Degree sign',sup2:'Superscript two',sup3:'Superscript three',acute:'Acute accent',micro:'Micro sign',para:'Pilcrow sign',middot:'Middle dot',cedil:'Cedilla',sup1:'Superscript one',ordm:'Masculine ordinal indicator',raquo:'Right-pointing double angle quotation mark',frac14:'Vulgar fraction one quarter',frac12:'Vulgar fraction one half',frac34:'Vulgar fraction three quarters',iquest:'Inverted question mark',Agrave:'Latin capital letter A with grave accent',Aacute:'Latin capital letter A with acute accent',Acirc:'Latin capital letter A with circumflex',Atilde:'Latin capital letter A with tilde',Auml:'Latin capital letter A with diaeresis',Aring:'Latin capital letter A with ring above',AElig:'Latin Capital letter Æ',Ccedil:'Latin capital letter C with cedilla',Egrave:'Latin capital letter E with grave accent',Eacute:'Latin capital letter E with acute accent',Ecirc:'Latin capital letter E with circumflex',Euml:'Latin capital letter E with diaeresis',Igrave:'Latin capital letter I with grave accent',Iacute:'Latin capital letter I with acute accent',Icirc:'Latin capital letter I with circumflex',Iuml:'Latin capital letter I with diaeresis',ETH:'Latin capital letter Eth',Ntilde:'Latin capital letter N with tilde',Ograve:'Latin capital letter O with grave accent',Oacute:'Latin capital letter O with acute accent',Ocirc:'Latin capital letter O with circumflex',Otilde:'Latin capital letter O with tilde',Ouml:'Latin capital letter O with diaeresis',times:'Multiplication sign',Oslash:'Latin capital letter O with stroke',Ugrave:'Latin capital letter U with grave accent',Uacute:'Latin capital letter U with acute accent',Ucirc:'Latin capital letter U with circumflex',Uuml:'Latin capital letter U with diaeresis',Yacute:'Latin capital letter Y with acute accent',THORN:'Latin capital letter Thorn',szlig:'Latin small letter sharp s',agrave:'Latin small letter a with grave accent',aacute:'Latin small letter a with acute accent',acirc:'Latin small letter a with circumflex',atilde:'Latin small letter a with tilde',auml:'Latin small letter a with diaeresis',aring:'Latin small letter a with ring above',aelig:'Latin small letter æ',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave accent',eacute:'Latin small letter e with acute accent',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave accent',iacute:'Latin small letter i with acute accent',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'Latin small letter n with tilde',ograve:'Latin small letter o with grave accent',oacute:'Latin small letter o with acute accent',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',divide:'Division sign',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave accent',uacute:'Latin small letter u with acute accent',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute accent',thorn:'Latin small letter thorn',yuml:'Latin small letter y with diaeresis',OElig:'Latin capital ligature OE',oelig:'Latin small ligature oe',372:'Latin capital letter W with circumflex',374:'Latin capital letter Y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',sbquo:'Single low-9 quotation mark',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Trade mark sign',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'Rightwards arrow',rArr:'Rightwards double arrow',hArr:'Left right double arrow',diams:'Black diamond suit',asymp:'Almost equal to'});
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/styles/styles/default.js b/appsrc/ODS-Framework/ckeditor/plugins/styles/styles/default.js
index dc34cca..bcbb3a6 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/styles/styles/default.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/styles/styles/default.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/table/dialogs/table.js b/appsrc/ODS-Framework/ckeditor/plugins/table/dialogs/table.js
index 640aeb5..cf72afa 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/table/dialogs/table.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/table/dialogs/table.js
@@ -1,9 +1,9 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-(function(){var a=CKEDITOR.tools.cssLength,b=function(d){var e=this.id;if(!d.info)d.info={};d.info[e]=this.getValue();};function c(d,e){var f=function(h){return new CKEDITOR.dom.element(h,d.document);},g=d.plugins.dialogadvtab;return{title:d.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?310:280,onLoad:function(){var h=this,i=h.getContentElement('advanced','advStyles');if(i)i.on('change',function(j){var k=this.getStyle('width',''),l=h.getContentElement('info','txtWidth');l&&l.setValue(k,true);var m=this.getStyle('height',''),n=h.getContentElement('info','txtHeight');n&&n.setValue(m,true);});},onShow:function(){var p=this;var h=d.getSelection(),i=h.getRanges(),j=null,k=p.getContentElement('info','txtRows'),l=p.getContentElement('info','txtCols'),m=p.getContentElement('info','txtWidth'),n=p.getContentElement('info','txtHeight');if(e=='tableProperties'){if(j=h.getSelectedElement())j=j.getAscendant('table',true);else if(i.length>0){if(CKEDITOR.env.webkit)i[0].shrink(CKEDITOR.NODE_ELEMENT);var o=i[0].getCommonAncestor(true);j=o.getAscendant('table',true);}p._.selectedElement=j;}if(j){p.setupContent(j);k&&k.disable();l&&l.disable();}else{k&&k.enable();l&&l.enable();}m&&m.onChange();n&&n.onChange();},onOk:function(){var h=d.getSelection(),i=this._.selectedElement&&h.createBookmarks(),j=this._.selectedElement||f('table'),k=this,l={};this.commitContent(l,j);if(l.info){var m=l.info;if(!this._.selectedElement){var n=j.append(f('tbody')),o=parseInt(m.txtRows,10)||0,p=parseInt(m.txtCols,10)||0;for(var q=0;q<o;q++){var r=n.append(f('tr'));for(var s=0;s<p;s++){var t=r.append(f('td'));if(!CKEDITOR.env.ie)t.append(f('br'));}}}var u=m.selHeaders;if(!j.$.tHead&&(u=='row'||u=='both')){var v=new CKEDITOR.dom.element(j.$.createTHead());n=j.getElementsByTag('tbody').getItem(0);var w=n.getElementsByTag('tr').getItem(0);for(q=0;q<w.getChildCount();q++){var x=w.getChild(q);if(x.type==CKEDITOR.NODE_ELEMENT&&!x.data('cke-bookmark')){x.renameNode('th');x.setAttribute('scope','col');}}v.append(w.remove());}if(j.$.tHead!==null&&!(u=='row'||u=='both')){v=new CKEDITOR.dom.element(j.$.tHead);n=j.getElementsByTag('tbody').getItem(0);var y=n.getFirst();while(v.getChildCount()>0){w=v.getFirst();for(q=0;q<w.getChildCount();q++){var z=w.getChild(q);if(z.type==CKEDITOR.NODE_ELEMENT){z.renameNode('td');z.removeAttribute('scope');}}w.insertBefore(y);}v.remove();}if(!this.hasColumnHeaders&&(u=='col'||u=='both'))for(r=0;r<j.$.rows.length;r++){z=new CKEDITOR.dom.element(j.$.rows[r].cells[0]);
-z.renameNode('th');z.setAttribute('scope','row');}if(this.hasColumnHeaders&&!(u=='col'||u=='both'))for(q=0;q<j.$.rows.length;q++){r=new CKEDITOR.dom.element(j.$.rows[q]);if(r.getParent().getName()=='tbody'){z=new CKEDITOR.dom.element(r.$.cells[0]);z.renameNode('td');z.removeAttribute('scope');}}m.txtHeight?j.setStyle('height',m.txtHeight):j.removeStyle('height');m.txtWidth?j.setStyle('width',m.txtWidth):j.removeStyle('width');if(!j.getAttribute('style'))j.removeAttribute('style');}if(!this._.selectedElement){d.insertElement(j);setTimeout(function(){var A=new CKEDITOR.dom.element(j.$.rows[0].cells[0]),B=new CKEDITOR.dom.range(d.document);B.moveToPosition(A,CKEDITOR.POSITION_AFTER_START);B.select(1);},0);}else try{h.selectBookmarks(i);}catch(A){}},contents:[{id:'info',label:d.lang.table.title,elements:[{type:'hbox',widths:[null,null],styles:['vertical-align:top'],children:[{type:'vbox',padding:0,children:[{type:'text',id:'txtRows','default':3,label:d.lang.table.rows,required:true,controlStyle:'width:5em',validate:function(){var h=true,i=this.getValue();h=h&&CKEDITOR.dialog.validate.integer()(i)&&i>0;if(!h){alert(d.lang.table.invalidRows);this.select();}return h;},setup:function(h){this.setValue(h.$.rows.length);},commit:b},{type:'text',id:'txtCols','default':2,label:d.lang.table.columns,required:true,controlStyle:'width:5em',validate:function(){var h=true,i=this.getValue();h=h&&CKEDITOR.dialog.validate.integer()(i)&&i>0;if(!h){alert(d.lang.table.invalidCols);this.select();}return h;},setup:function(h){this.setValue(h.$.rows[0].cells.length);},commit:b},{type:'html',html:' '},{type:'select',id:'selHeaders','default':'',label:d.lang.table.headers,items:[[d.lang.table.headersNone,''],[d.lang.table.headersRow,'row'],[d.lang.table.headersColumn,'col'],[d.lang.table.headersBoth,'both']],setup:function(h){var i=this.getDialog();i.hasColumnHeaders=true;for(var j=0;j<h.$.rows.length;j++){if(h.$.rows[j].cells[0].nodeName.toLowerCase()!='th'){i.hasColumnHeaders=false;break;}}if(h.$.tHead!==null)this.setValue(i.hasColumnHeaders?'both':'row');else this.setValue(i.hasColumnHeaders?'col':'');},commit:b},{type:'text',id:'txtBorder','default':1,label:d.lang.table.border,controlStyle:'width:3em',validate:CKEDITOR.dialog.validate.number(d.lang.table.invalidBorder),setup:function(h){this.setValue(h.getAttribute('border')||'');},commit:function(h,i){if(this.getValue())i.setAttribute('border',this.getValue());else i.removeAttribute('border');}},{id:'cmbAlign',type:'select','default':'',label:d.lang.common.align,items:[[d.lang.common.notSet,''],[d.lang.common.alignLeft,'left'],[d.lang.common.alignCenter,'center'],[d.lang.common.alignRight,'right']],setup:function(h){this.setValue(h.getAttribute('align')||'');
-},commit:function(h,i){if(this.getValue())i.setAttribute('align',this.getValue());else i.removeAttribute('align');}}]},{type:'vbox',padding:0,children:[{type:'hbox',widths:['5em'],children:[{type:'text',id:'txtWidth',controlStyle:'width:5em',label:d.lang.common.width,'default':500,getValue:a,validate:CKEDITOR.dialog.validate.cssLength(d.lang.common.invalidCssLength.replace('%1',d.lang.common.width)),onChange:function(){var h=this.getDialog().getContentElement('advanced','advStyles');h&&h.updateStyle('width',this.getValue());},setup:function(h){var i=h.getStyle('width');i&&this.setValue(i);},commit:b}]},{type:'hbox',widths:['5em'],children:[{type:'text',id:'txtHeight',controlStyle:'width:5em',label:d.lang.common.height,'default':'',getValue:a,validate:CKEDITOR.dialog.validate.cssLength(d.lang.common.invalidCssLength.replace('%1',d.lang.common.height)),onChange:function(){var h=this.getDialog().getContentElement('advanced','advStyles');h&&h.updateStyle('height',this.getValue());},setup:function(h){var i=h.getStyle('width');i&&this.setValue(i);},commit:b}]},{type:'html',html:' '},{type:'text',id:'txtCellSpace',controlStyle:'width:3em',label:d.lang.table.cellSpace,'default':1,validate:CKEDITOR.dialog.validate.number(d.lang.table.invalidCellSpacing),setup:function(h){this.setValue(h.getAttribute('cellSpacing')||'');},commit:function(h,i){if(this.getValue())i.setAttribute('cellSpacing',this.getValue());else i.removeAttribute('cellSpacing');}},{type:'text',id:'txtCellPad',controlStyle:'width:3em',label:d.lang.table.cellPad,'default':1,validate:CKEDITOR.dialog.validate.number(d.lang.table.invalidCellPadding),setup:function(h){this.setValue(h.getAttribute('cellPadding')||'');},commit:function(h,i){if(this.getValue())i.setAttribute('cellPadding',this.getValue());else i.removeAttribute('cellPadding');}}]}]},{type:'html',align:'right',html:''},{type:'vbox',padding:0,children:[{type:'text',id:'txtCaption',label:d.lang.table.caption,setup:function(h){var l=this;l.enable();var i=h.getElementsByTag('caption');if(i.count()>0){var j=i.getItem(0),k=j.getFirst(CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT));if(k&&!k.equals(j.getBogus())){l.disable();l.setValue(j.getText());return;}j=CKEDITOR.tools.trim(j.getText());l.setValue(j);}},commit:function(h,i){if(!this.isEnabled())return;var j=this.getValue(),k=i.getElementsByTag('caption');if(j){if(k.count()>0){k=k.getItem(0);k.setHtml('');}else{k=new CKEDITOR.dom.element('caption',d.document);if(i.getChildCount())k.insertBefore(i.getFirst());
-else k.appendTo(i);}k.append(new CKEDITOR.dom.text(j,d.document));}else if(k.count()>0)for(var l=k.count()-1;l>=0;l--)k.getItem(l).remove();}},{type:'text',id:'txtSummary',label:d.lang.table.summary,setup:function(h){this.setValue(h.getAttribute('summary')||'');},commit:function(h,i){if(this.getValue())i.setAttribute('summary',this.getValue());else i.removeAttribute('summary');}}]}]},g&&g.createAdvancedTab(d)]};};CKEDITOR.dialog.add('table',function(d){return c(d,'table');});CKEDITOR.dialog.add('tableProperties',function(d){return c(d,'tableProperties');});})();
+(function(){var a=CKEDITOR.tools.cssLength,b=function(f){var g=this.id;if(!f.info)f.info={};f.info[g]=this.getValue();};function c(f){var g=0,h=0;for(var i=0,j,k=f.$.rows.length;i<k;i++){j=f.$.rows[i],g=0;for(var l=0,m,n=j.cells.length;l<n;l++){m=j.cells[l];g+=m.colSpan;}g>h&&(h=g);}return h;};function d(f){return function(){var g=this.getValue(),h=!!(CKEDITOR.dialog.validate.integer()(g)&&g>0);if(!h){alert(f);this.select();}return h;};};function e(f,g){var h=function(j){return new CKEDITOR.dom.element(j,f.document);},i=f.plugins.dialogadvtab;return{title:f.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?310:280,onLoad:function(){var j=this,k=j.getContentElement('advanced','advStyles');if(k)k.on('change',function(l){var m=this.getStyle('width',''),n=j.getContentElement('info','txtWidth');n&&n.setValue(m,true);var o=this.getStyle('height',''),p=j.getContentElement('info','txtHeight');p&&p.setValue(o,true);});},onShow:function(){var r=this;var j=f.getSelection(),k=j.getRanges(),l=null,m=r.getContentElement('info','txtRows'),n=r.getContentElement('info','txtCols'),o=r.getContentElement('info','txtWidth'),p=r.getContentElement('info','txtHeight');if(g=='tableProperties'){if(l=j.getSelectedElement())l=l.getAscendant('table',true);else if(k.length>0){if(CKEDITOR.env.webkit)k[0].shrink(CKEDITOR.NODE_ELEMENT);var q=k[0].getCommonAncestor(true);l=q.getAscendant('table',true);}r._.selectedElement=l;}if(l){r.setupContent(l);m&&m.disable();n&&n.disable();}else{m&&m.enable();n&&n.enable();}o&&o.onChange();p&&p.onChange();},onOk:function(){var j=f.getSelection(),k=this._.selectedElement&&j.createBookmarks(),l=this._.selectedElement||h('table'),m=this,n={};this.commitContent(n,l);if(n.info){var o=n.info;if(!this._.selectedElement){var p=l.append(h('tbody')),q=parseInt(o.txtRows,10)||0,r=parseInt(o.txtCols,10)||0;for(var s=0;s<q;s++){var t=p.append(h('tr'));for(var u=0;u<r;u++){var v=t.append(h('td'));if(!CKEDITOR.env.ie)v.append(h('br'));}}}var w=o.selHeaders;if(!l.$.tHead&&(w=='row'||w=='both')){var x=new CKEDITOR.dom.element(l.$.createTHead());p=l.getElementsByTag('tbody').getItem(0);var y=p.getElementsByTag('tr').getItem(0);for(s=0;s<y.getChildCount();s++){var z=y.getChild(s);if(z.type==CKEDITOR.NODE_ELEMENT&&!z.data('cke-bookmark')){z.renameNode('th');z.setAttribute('scope','col');}}x.append(y.remove());}if(l.$.tHead!==null&&!(w=='row'||w=='both')){x=new CKEDITOR.dom.element(l.$.tHead);p=l.getElementsByTag('tbody').getItem(0);var A=p.getFirst();while(x.getChildCount()>0){y=x.getFirst();
+for(s=0;s<y.getChildCount();s++){var B=y.getChild(s);if(B.type==CKEDITOR.NODE_ELEMENT){B.renameNode('td');B.removeAttribute('scope');}}y.insertBefore(A);}x.remove();}if(!this.hasColumnHeaders&&(w=='col'||w=='both'))for(t=0;t<l.$.rows.length;t++){B=new CKEDITOR.dom.element(l.$.rows[t].cells[0]);B.renameNode('th');B.setAttribute('scope','row');}if(this.hasColumnHeaders&&!(w=='col'||w=='both'))for(s=0;s<l.$.rows.length;s++){t=new CKEDITOR.dom.element(l.$.rows[s]);if(t.getParent().getName()=='tbody'){B=new CKEDITOR.dom.element(t.$.cells[0]);B.renameNode('td');B.removeAttribute('scope');}}o.txtHeight?l.setStyle('height',o.txtHeight):l.removeStyle('height');o.txtWidth?l.setStyle('width',o.txtWidth):l.removeStyle('width');if(!l.getAttribute('style'))l.removeAttribute('style');}if(!this._.selectedElement){f.insertElement(l);setTimeout(function(){var C=new CKEDITOR.dom.element(l.$.rows[0].cells[0]),D=new CKEDITOR.dom.range(f.document);D.moveToPosition(C,CKEDITOR.POSITION_AFTER_START);D.select(1);},0);}else try{j.selectBookmarks(k);}catch(C){}},contents:[{id:'info',label:f.lang.table.title,elements:[{type:'hbox',widths:[null,null],styles:['vertical-align:top'],children:[{type:'vbox',padding:0,children:[{type:'text',id:'txtRows','default':3,label:f.lang.table.rows,required:true,controlStyle:'width:5em',validate:d(f.lang.table.invalidRows),setup:function(j){this.setValue(j.$.rows.length);},commit:b},{type:'text',id:'txtCols','default':2,label:f.lang.table.columns,required:true,controlStyle:'width:5em',validate:d(f.lang.table.invalidCols),setup:function(j){this.setValue(c(j));},commit:b},{type:'html',html:' '},{type:'select',id:'selHeaders','default':'',label:f.lang.table.headers,items:[[f.lang.table.headersNone,''],[f.lang.table.headersRow,'row'],[f.lang.table.headersColumn,'col'],[f.lang.table.headersBoth,'both']],setup:function(j){var k=this.getDialog();k.hasColumnHeaders=true;for(var l=0;l<j.$.rows.length;l++){var m=j.$.rows[l].cells[0];if(m&&m.nodeName.toLowerCase()!='th'){k.hasColumnHeaders=false;break;}}if(j.$.tHead!==null)this.setValue(k.hasColumnHeaders?'both':'row');else this.setValue(k.hasColumnHeaders?'col':'');},commit:b},{type:'text',id:'txtBorder','default':1,label:f.lang.table.border,controlStyle:'width:3em',validate:CKEDITOR.dialog.validate.number(f.lang.table.invalidBorder),setup:function(j){this.setValue(j.getAttribute('border')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('border',this.getValue());else k.removeAttribute('border');
+}},{id:'cmbAlign',type:'select','default':'',label:f.lang.common.align,items:[[f.lang.common.notSet,''],[f.lang.common.alignLeft,'left'],[f.lang.common.alignCenter,'center'],[f.lang.common.alignRight,'right']],setup:function(j){this.setValue(j.getAttribute('align')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('align',this.getValue());else k.removeAttribute('align');}}]},{type:'vbox',padding:0,children:[{type:'hbox',widths:['5em'],children:[{type:'text',id:'txtWidth',controlStyle:'width:5em',label:f.lang.common.width,title:f.lang.common.cssLengthTooltip,'default':500,getValue:a,validate:CKEDITOR.dialog.validate.cssLength(f.lang.common.invalidCssLength.replace('%1',f.lang.common.width)),onChange:function(){var j=this.getDialog().getContentElement('advanced','advStyles');j&&j.updateStyle('width',this.getValue());},setup:function(j){var k=j.getStyle('width');k&&this.setValue(k);},commit:b}]},{type:'hbox',widths:['5em'],children:[{type:'text',id:'txtHeight',controlStyle:'width:5em',label:f.lang.common.height,title:f.lang.common.cssLengthTooltip,'default':'',getValue:a,validate:CKEDITOR.dialog.validate.cssLength(f.lang.common.invalidCssLength.replace('%1',f.lang.common.height)),onChange:function(){var j=this.getDialog().getContentElement('advanced','advStyles');j&&j.updateStyle('height',this.getValue());},setup:function(j){var k=j.getStyle('height');k&&this.setValue(k);},commit:b}]},{type:'html',html:' '},{type:'text',id:'txtCellSpace',controlStyle:'width:3em',label:f.lang.table.cellSpace,'default':1,validate:CKEDITOR.dialog.validate.number(f.lang.table.invalidCellSpacing),setup:function(j){this.setValue(j.getAttribute('cellSpacing')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('cellSpacing',this.getValue());else k.removeAttribute('cellSpacing');}},{type:'text',id:'txtCellPad',controlStyle:'width:3em',label:f.lang.table.cellPad,'default':1,validate:CKEDITOR.dialog.validate.number(f.lang.table.invalidCellPadding),setup:function(j){this.setValue(j.getAttribute('cellPadding')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('cellPadding',this.getValue());else k.removeAttribute('cellPadding');}}]}]},{type:'html',align:'right',html:''},{type:'vbox',padding:0,children:[{type:'text',id:'txtCaption',label:f.lang.table.caption,setup:function(j){var n=this;n.enable();var k=j.getElementsByTag('caption');if(k.count()>0){var l=k.getItem(0),m=l.getFirst(CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT));if(m&&!m.equals(l.getBogus())){n.disable();
+n.setValue(l.getText());return;}l=CKEDITOR.tools.trim(l.getText());n.setValue(l);}},commit:function(j,k){if(!this.isEnabled())return;var l=this.getValue(),m=k.getElementsByTag('caption');if(l){if(m.count()>0){m=m.getItem(0);m.setHtml('');}else{m=new CKEDITOR.dom.element('caption',f.document);if(k.getChildCount())m.insertBefore(k.getFirst());else m.appendTo(k);}m.append(new CKEDITOR.dom.text(l,f.document));}else if(m.count()>0)for(var n=m.count()-1;n>=0;n--)m.getItem(n).remove();}},{type:'text',id:'txtSummary',label:f.lang.table.summary,setup:function(j){this.setValue(j.getAttribute('summary')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('summary',this.getValue());else k.removeAttribute('summary');}}]}]},i&&i.createAdvancedTab(f)]};};CKEDITOR.dialog.add('table',function(f){return e(f,'table');});CKEDITOR.dialog.add('tableProperties',function(f){return e(f,'tableProperties');});})();
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/tabletools/dialogs/tableCell.js b/appsrc/ODS-Framework/ckeditor/plugins/tabletools/dialogs/tableCell.js
index 96bfa5f..b1a8eb1 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/tabletools/dialogs/tableCell.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -1,8 +1,8 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-CKEDITOR.dialog.add('cellProperties',function(a){var b=a.lang.table,c=b.cell,d=a.lang.common,e=CKEDITOR.dialog.validate,f=/^(\d+(?:\.\d+)?)(px|%)$/,g=/^(\d+(?:\.\d+)?)px$/,h=CKEDITOR.tools.bind,i={type:'html',html:' '},j=a.lang.dir=='rtl';function k(l,m){var n=function(){var r=this;p(r);m(r,r._.parentDialog);r._.parentDialog.changeFocus(true);},o=function(){p(this);this._.parentDialog.changeFocus();},p=function(r){r.removeListener('ok',n);r.removeListener('cancel',o);},q=function(r){r.on('ok',n);r.on('cancel',o);};a.execCommand(l);if(a._.storedDialogs.colordialog)q(a._.storedDialogs.colordialog);else CKEDITOR.on('dialogDefinition',function(r){if(r.data.name!=l)return;var s=r.data.definition;r.removeListener();s.onLoad=CKEDITOR.tools.override(s.onLoad,function(t){return function(){q(this);s.onLoad=t;if(typeof t=='function')t.call(this);};});});};return{title:c.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?450:410,minHeight:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?230:200,contents:[{id:'info',label:c.title,accessKey:'I',elements:[{type:'hbox',widths:['40%','5%','40%'],children:[{type:'vbox',padding:0,children:[{type:'hbox',widths:['70%','30%'],children:[{type:'text',id:'width',width:'100px',label:d.width,validate:e.number(c.invalidWidth),onLoad:function(){var l=this.getDialog().getContentElement('info','widthType'),m=l.getElement(),n=this.getInputElement(),o=n.getAttribute('aria-labelledby');n.setAttribute('aria-labelledby',[o,m.$.id].join(' '));},setup:function(l){var m=parseInt(l.getAttribute('width'),10),n=parseInt(l.getStyle('width'),10);!isNaN(m)&&this.setValue(m);!isNaN(n)&&this.setValue(n);},commit:function(l){var m=parseInt(this.getValue(),10),n=this.getDialog().getValueOf('info','widthType');if(!isNaN(m))l.setStyle('width',m+n);else l.removeStyle('width');l.removeAttribute('width');},'default':''},{type:'select',id:'widthType',label:a.lang.table.widthUnit,labelStyle:'visibility:hidden','default':'px',items:[[b.widthPx,'px'],[b.widthPc,'%']],setup:function(l){var m=f.exec(l.getStyle('width')||l.getAttribute('width'));if(m)this.setValue(m[2]);}}]},{type:'hbox',widths:['70%','30%'],children:[{type:'text',id:'height',label:d.height,width:'100px','default':'',validate:e.number(c.invalidHeight),onLoad:function(){var l=this.getDialog().getContentElement('info','htmlHeightType'),m=l.getElement(),n=this.getInputElement(),o=n.getAttribute('aria-labelledby');n.setAttribute('aria-labelledby',[o,m.$.id].join(' '));},setup:function(l){var m=parseInt(l.getAttribute('height'),10),n=parseInt(l.getStyle('height'),10);
+CKEDITOR.dialog.add('cellProperties',function(a){var b=a.lang.table,c=b.cell,d=a.lang.common,e=CKEDITOR.dialog.validate,f=/^(\d+(?:\.\d+)?)(px|%)$/,g=/^(\d+(?:\.\d+)?)px$/,h=CKEDITOR.tools.bind,i={type:'html',html:' '},j=a.lang.dir=='rtl';function k(l,m){var n=function(){var r=this;p(r);m(r,r._.parentDialog);r._.parentDialog.changeFocus();},o=function(){p(this);this._.parentDialog.changeFocus();},p=function(r){r.removeListener('ok',n);r.removeListener('cancel',o);},q=function(r){r.on('ok',n);r.on('cancel',o);};a.execCommand(l);if(a._.storedDialogs.colordialog)q(a._.storedDialogs.colordialog);else CKEDITOR.on('dialogDefinition',function(r){if(r.data.name!=l)return;var s=r.data.definition;r.removeListener();s.onLoad=CKEDITOR.tools.override(s.onLoad,function(t){return function(){q(this);s.onLoad=t;if(typeof t=='function')t.call(this);};});});};return{title:c.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?450:410,minHeight:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?230:200,contents:[{id:'info',label:c.title,accessKey:'I',elements:[{type:'hbox',widths:['40%','5%','40%'],children:[{type:'vbox',padding:0,children:[{type:'hbox',widths:['70%','30%'],children:[{type:'text',id:'width',width:'100px',label:d.width,validate:e.number(c.invalidWidth),onLoad:function(){var l=this.getDialog().getContentElement('info','widthType'),m=l.getElement(),n=this.getInputElement(),o=n.getAttribute('aria-labelledby');n.setAttribute('aria-labelledby',[o,m.$.id].join(' '));},setup:function(l){var m=parseInt(l.getAttribute('width'),10),n=parseInt(l.getStyle('width'),10);!isNaN(m)&&this.setValue(m);!isNaN(n)&&this.setValue(n);},commit:function(l){var m=parseInt(this.getValue(),10),n=this.getDialog().getValueOf('info','widthType');if(!isNaN(m))l.setStyle('width',m+n);else l.removeStyle('width');l.removeAttribute('width');},'default':''},{type:'select',id:'widthType',label:a.lang.table.widthUnit,labelStyle:'visibility:hidden','default':'px',items:[[b.widthPx,'px'],[b.widthPc,'%']],setup:function(l){var m=f.exec(l.getStyle('width')||l.getAttribute('width'));if(m)this.setValue(m[2]);}}]},{type:'hbox',widths:['70%','30%'],children:[{type:'text',id:'height',label:d.height,width:'100px','default':'',validate:e.number(c.invalidHeight),onLoad:function(){var l=this.getDialog().getContentElement('info','htmlHeightType'),m=l.getElement(),n=this.getInputElement(),o=n.getAttribute('aria-labelledby');n.setAttribute('aria-labelledby',[o,m.$.id].join(' '));},setup:function(l){var m=parseInt(l.getAttribute('height'),10),n=parseInt(l.getStyle('height'),10);
!isNaN(m)&&this.setValue(m);!isNaN(n)&&this.setValue(n);},commit:function(l){var m=parseInt(this.getValue(),10);if(!isNaN(m))l.setStyle('height',CKEDITOR.tools.cssLength(m));else l.removeStyle('height');l.removeAttribute('height');}},{id:'htmlHeightType',type:'html',html:'<br />'+b.widthPx}]},i,{type:'select',id:'wordWrap',label:c.wordWrap,'default':'yes',items:[[c.yes,'yes'],[c.no,'no']],setup:function(l){var m=l.getAttribute('noWrap'),n=l.getStyle('white-space');if(n=='nowrap'||m)this.setValue('no');},commit:function(l){if(this.getValue()=='no')l.setStyle('white-space','nowrap');else l.removeStyle('white-space');l.removeAttribute('noWrap');}},i,{type:'select',id:'hAlign',label:c.hAlign,'default':'',items:[[d.notSet,''],[d.alignLeft,'left'],[d.alignCenter,'center'],[d.alignRight,'right']],setup:function(l){var m=l.getAttribute('align'),n=l.getStyle('text-align');this.setValue(n||m||'');},commit:function(l){var m=this.getValue();if(m)l.setStyle('text-align',m);else l.removeStyle('text-align');l.removeAttribute('align');}},{type:'select',id:'vAlign',label:c.vAlign,'default':'',items:[[d.notSet,''],[d.alignTop,'top'],[d.alignMiddle,'middle'],[d.alignBottom,'bottom'],[c.alignBaseline,'baseline']],setup:function(l){var m=l.getAttribute('vAlign'),n=l.getStyle('vertical-align');switch(n){case 'top':case 'middle':case 'bottom':case 'baseline':break;default:n='';}this.setValue(n||m||'');},commit:function(l){var m=this.getValue();if(m)l.setStyle('vertical-align',m);else l.removeStyle('vertical-align');l.removeAttribute('vAlign');}}]},i,{type:'vbox',padding:0,children:[{type:'select',id:'cellType',label:c.cellType,'default':'td',items:[[c.data,'td'],[c.header,'th']],setup:function(l){this.setValue(l.getName());},commit:function(l){l.renameNode(this.getValue());}},i,{type:'text',id:'rowSpan',label:c.rowSpan,'default':'',validate:e.integer(c.invalidRowSpan),setup:function(l){var m=parseInt(l.getAttribute('rowSpan'),10);if(m&&m!=1)this.setValue(m);},commit:function(l){var m=parseInt(this.getValue(),10);if(m&&m!=1)l.setAttribute('rowSpan',this.getValue());else l.removeAttribute('rowSpan');}},{type:'text',id:'colSpan',label:c.colSpan,'default':'',validate:e.integer(c.invalidColSpan),setup:function(l){var m=parseInt(l.getAttribute('colSpan'),10);if(m&&m!=1)this.setValue(m);},commit:function(l){var m=parseInt(this.getValue(),10);if(m&&m!=1)l.setAttribute('colSpan',this.getValue());else l.removeAttribute('colSpan');}},i,{type:'hbox',padding:0,widths:['60%','40%'],children:[{type:'text',id:'bgColor',label:c.bgColor,'default':'',setup:function(l){var m=l.getAttribute('bgColor'),n=l.getStyle('background-color');
-this.setValue(n||m);},commit:function(l){var m=this.getValue();if(m)l.setStyle('background-color',this.getValue());else l.removeStyle('background-color');l.removeAttribute('bgColor');}},{type:'button',id:'bgColorChoose','class':'colorChooser',label:c.chooseColor,onLoad:function(){this.getElement().getParent().setStyle('vertical-align','bottom');},onClick:function(){var l=this;k('colordialog',function(m){l.getDialog().getContentElement('info','bgColor').setValue(m.getContentElement('picker','selectedColor').getValue());});}}]},i,{type:'hbox',padding:0,widths:['60%','40%'],children:[{type:'text',id:'borderColor',label:c.borderColor,'default':'',setup:function(l){var m=l.getAttribute('borderColor'),n=l.getStyle('border-color');this.setValue(n||m);},commit:function(l){var m=this.getValue();if(m)l.setStyle('border-color',this.getValue());else l.removeStyle('border-color');l.removeAttribute('borderColor');}},{type:'button',id:'borderColorChoose','class':'colorChooser',label:c.chooseColor,style:(j?'margin-right':'margin-left')+': 10px',onLoad:function(){this.getElement().getParent().setStyle('vertical-align','bottom');},onClick:function(){var l=this;k('colordialog',function(m){l.getDialog().getContentElement('info','borderColor').setValue(m.getContentElement('picker','selectedColor').getValue());});}}]}]}]}]}],onShow:function(){var l=this;l.cells=CKEDITOR.plugins.tabletools.getSelectedCells(l._.editor.getSelection());l.setupContent(l.cells[0]);},onOk:function(){var r=this;var l=r._.editor.getSelection(),m=l.createBookmarks(),n=r.cells;for(var o=0;o<n.length;o++)r.commitContent(n[o]);l.selectBookmarks(m);var p=l.getStartElement(),q=new CKEDITOR.dom.elementPath(p);r._.editor._.selectionPreviousPath=q;r._.editor.fire('selectionChange',{selection:l,path:q,element:p});}};});
+this.setValue(n||m);},commit:function(l){var m=this.getValue();if(m)l.setStyle('background-color',this.getValue());else l.removeStyle('background-color');l.removeAttribute('bgColor');}},{type:'button',id:'bgColorChoose','class':'colorChooser',label:c.chooseColor,onLoad:function(){this.getElement().getParent().setStyle('vertical-align','bottom');},onClick:function(){var l=this;k('colordialog',function(m){l.getDialog().getContentElement('info','bgColor').setValue(m.getContentElement('picker','selectedColor').getValue());});}}]},i,{type:'hbox',padding:0,widths:['60%','40%'],children:[{type:'text',id:'borderColor',label:c.borderColor,'default':'',setup:function(l){var m=l.getAttribute('borderColor'),n=l.getStyle('border-color');this.setValue(n||m);},commit:function(l){var m=this.getValue();if(m)l.setStyle('border-color',this.getValue());else l.removeStyle('border-color');l.removeAttribute('borderColor');}},{type:'button',id:'borderColorChoose','class':'colorChooser',label:c.chooseColor,style:(j?'margin-right':'margin-left')+': 10px',onLoad:function(){this.getElement().getParent().setStyle('vertical-align','bottom');},onClick:function(){var l=this;k('colordialog',function(m){l.getDialog().getContentElement('info','borderColor').setValue(m.getContentElement('picker','selectedColor').getValue());});}}]}]}]}]}],onShow:function(){var l=this;l.cells=CKEDITOR.plugins.tabletools.getSelectedCells(l._.editor.getSelection());l.setupContent(l.cells[0]);},onOk:function(){var p=this;var l=p._.editor.getSelection(),m=l.createBookmarks(),n=p.cells;for(var o=0;o<n.length;o++)p.commitContent(n[o]);p._.editor.forceNextSelectionCheck();l.selectBookmarks(m);p._.editor.selectionChange();}};});
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/templates/dialogs/templates.js b/appsrc/ODS-Framework/ckeditor/plugins/templates/dialogs/templates.js
index cd3e184..c0d6f38 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/templates/dialogs/templates.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/templates/dialogs/templates.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/templates/templates/default.js b/appsrc/ODS-Framework/ckeditor/plugins/templates/templates/default.js
index a45be8a..f9c939b 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/templates/templates/default.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/templates/templates/default.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/ciframe.html b/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/ciframe.html
index f880177..5cc9254 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/ciframe.html
+++ b/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/ciframe.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<!--
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
-->
<html>
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
index bec11ae..0d675f4 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+++ b/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
<!--
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
-->
<html>
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/wsc.css b/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/wsc.css
index 83a2785..dfc326e 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/wsc.css
+++ b/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/wsc.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/wsc.js b/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/wsc.js
index 2752d0a..e9d7850 100644
--- a/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/wsc.js
+++ b/appsrc/ODS-Framework/ckeditor/plugins/wsc/dialogs/wsc.js
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-CKEDITOR.dialog.add('checkspell',function(a){var b=CKEDITOR.tools.getNextNumber(),c='cke_frame_'+b,d='cke_data_'+b,e='cke_error_'+b,f,g=document.location.protocol||'http:',h=a.lang.spellCheck.notAvailable,i='<textarea style="display: none" id="'+d+'"'+' rows="10"'+' cols="40">'+' </textarea><div'+' id="'+e+'"'+' style="display:none;color:red;font-size:16px;font-weight:bold;padding-top:160px;text-align:center;z-index:11;">'+'</div><iframe'+' src=""'+' style="width:100%;background-color:#f1f1e3;"'+' frameborder="0"'+' name="'+c+'"'+' id="'+c+'"'+' allowtransparency="1">'+'</iframe>',j=a.config.wsc_customLoaderScript||g+'//loader.spellchecker.net/sproxy_fck/sproxy.php'+'?plugin=fck2'+'&customerid='+a.config.wsc_customerId+'&cmd=script&doc=wsc&schema=22';if(a.config.wsc_customLoaderScript)h+='<p style="color:#000;font-size:11px;font-weight: normal;text-align:center;padding-top:10px">'+a.lang.spellCheck.errorLoading.replace(/%s/g,a.config.wsc_customLoaderScript)+'</p>';function k(m,n){var o=0;return function(){if(typeof window.doSpell=='function'){if(typeof f!='undefined')window.clearInterval(f);l(m);}else if(o++==180)window._cancelOnError(n);};};window._cancelOnError=function(m){if(typeof window.WSC_Error=='undefined'){CKEDITOR.document.getById(c).setStyle('display','none');var n=CKEDITOR.document.getById(e);n.setStyle('display','block');n.setHtml(m||a.lang.spellCheck.notAvailable);}};function l(m){var n=new window._SP_FCK_LangCompare(),o=CKEDITOR.getUrl(a.plugins.wsc.path+'dialogs/'),p=o+'tmpFrameset.html';window.gFCKPluginName='wsc';n.setDefaulLangCode(a.config.defaultLanguage);window.doSpell({ctrl:d,lang:a.config.wsc_lang||n.getSPLangCode(a.langCode),intLang:a.config.wsc_uiLang||n.getSPLangCode(a.langCode),winType:c,onCancel:function(){m.hide();},onFinish:function(q){a.focus();m.getParentEditor().setData(q.value);m.hide();},staticFrame:p,framesetPath:p,iframePath:o+'ciframe.html',schemaURI:o+'wsc.css',userDictionaryName:a.config.wsc_userDictionaryName,customDictionaryName:a.config.wsc_customDictionaryIds&&a.config.wsc_customDictionaryIds.split(','),domainName:a.config.wsc_domainName});CKEDITOR.document.getById(e).setStyle('display','none');CKEDITOR.document.getById(c).setStyle('display','block');};return{title:a.config.wsc_dialogTitle||a.lang.spellCheck.title,minWidth:485,minHeight:380,buttons:[CKEDITOR.dialog.cancelButton],onShow:function(){var m=this.getContentElement('general','content').getElement();m.setHtml(i);m.getChild(2).setStyle('height',this._.contentSize.height+'px');
+CKEDITOR.dialog.add('checkspell',function(a){var b=CKEDITOR.tools.getNextNumber(),c='cke_frame_'+b,d='cke_data_'+b,e='cke_error_'+b,f,g=document.location.protocol||'http:',h=a.lang.spellCheck.notAvailable,i='<textarea style="display: none" id="'+d+'"'+' rows="10"'+' cols="40">'+' </textarea><div'+' id="'+e+'"'+' style="display:none;color:red;font-size:16px;font-weight:bold;padding-top:160px;text-align:center;z-index:11;">'+'</div><iframe'+' src=""'+' style="width:100%;background-color:#f1f1e3;"'+' frameborder="0"'+' name="'+c+'"'+' id="'+c+'"'+' allowtransparency="1">'+'</iframe>',j=a.config.wsc_customLoaderScript||g+'//loader.webspellchecker.net/sproxy_fck/sproxy.php'+'?plugin=fck2'+'&customerid='+a.config.wsc_customerId+'&cmd=script&doc=wsc&schema=22';if(a.config.wsc_customLoaderScript)h+='<p style="color:#000;font-size:11px;font-weight: normal;text-align:center;padding-top:10px">'+a.lang.spellCheck.errorLoading.replace(/%s/g,a.config.wsc_customLoaderScript)+'</p>';function k(m,n){var o=0;return function(){if(typeof window.doSpell=='function'){if(typeof f!='undefined')window.clearInterval(f);l(m);}else if(o++==180)window._cancelOnError(n);};};window._cancelOnError=function(m){if(typeof window.WSC_Error=='undefined'){CKEDITOR.document.getById(c).setStyle('display','none');var n=CKEDITOR.document.getById(e);n.setStyle('display','block');n.setHtml(m||a.lang.spellCheck.notAvailable);}};function l(m){var n=new window._SP_FCK_LangCompare(),o=CKEDITOR.getUrl(a.plugins.wsc.path+'dialogs/'),p=o+'tmpFrameset.html';window.gFCKPluginName='wsc';n.setDefaulLangCode(a.config.defaultLanguage);window.doSpell({ctrl:d,lang:a.config.wsc_lang||n.getSPLangCode(a.langCode),intLang:a.config.wsc_uiLang||n.getSPLangCode(a.langCode),winType:c,onCancel:function(){m.hide();},onFinish:function(q){a.focus();m.getParentEditor().setData(q.value);m.hide();},staticFrame:p,framesetPath:p,iframePath:o+'ciframe.html',schemaURI:o+'wsc.css',userDictionaryName:a.config.wsc_userDictionaryName,customDictionaryName:a.config.wsc_customDictionaryIds&&a.config.wsc_customDictionaryIds.split(','),domainName:a.config.wsc_domainName});CKEDITOR.document.getById(e).setStyle('display','none');CKEDITOR.document.getById(c).setStyle('display','block');};return{title:a.config.wsc_dialogTitle||a.lang.spellCheck.title,minWidth:485,minHeight:380,buttons:[CKEDITOR.dialog.cancelButton],onShow:function(){var m=this.getContentElement('general','content').getElement();m.setHtml(i);m.getChild(2).setStyle('height',this._.contentSize.height+'px');
if(typeof window.doSpell!='function')CKEDITOR.document.getHead().append(CKEDITOR.document.createElement('script',{attributes:{type:'text/javascript',src:j}}));var n=a.getData();CKEDITOR.document.getById(d).setValue(n);f=window.setInterval(k(this,h),250);},onHide:function(){window.ooo=undefined;window.int_framsetLoaded=undefined;window.framesetLoaded=undefined;window.is_window_opened=false;},contents:[{id:'general',label:a.config.wsc_dialogTitle||a.lang.spellCheck.title,padding:0,elements:[{type:'html',id:'content',html:''}]}]};});CKEDITOR.dialog.on('resize',function(a){var b=a.data,c=b.dialog;if(c._.name=='checkspell'){var d=c.getContentElement('general','content').getElement(),e=d&&d.getChild(2);e&&e.setSize('height',b.height);e&&e.setSize('width',b.width);}});
diff --git a/appsrc/ODS-Framework/ckeditor/skins/kama/dialog.css b/appsrc/ODS-Framework/ckeditor/skins/kama/dialog.css
index 29ecfde..a0f8e21 100644
--- a/appsrc/ODS-Framework/ckeditor/skins/kama/dialog.css
+++ b/appsrc/ODS-Framework/ckeditor/skins/kama/dialog.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -7,4 +7,4 @@ body .cke_dialog{visibility:visible;}.cke_skin_kama table.cke_dialog.cke_browser
.cke_skin_kama .cke_dialog_ui_vbox table,.cke_skin_kama .cke_dialog_ui_hbox table{margin:auto;}.cke_skin_kama .cke_dialog_ui_vbox_child{padding:5px 0;}.cke_skin_kama input.cke_dialog_ui_input_text,.cke_skin_kama input.cke_dialog_ui_input_password{background-color:white;border:none;padding:0;width:100%;height:14px;}.cke_skin_kama div.cke_dialog_ui_input_text,.cke_skin_kama div.cke_dialog_ui_input_password{background-color:white;border:1px solid #a0a0a0;padding:1px 0;_width:99.9%;}.cke_skin_kama .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_password,.cke_skin_kama .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px;}.cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_password,.cke_skin_kama .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px;}.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_vbox_child,.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_child,.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important;}.cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px;}.cke_skin_kama .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_password{border-width:0;}.cke_skin_kama .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_password{border-width:1px;}.cke_skin_kama textarea.cke_dialog_ui_input_textarea{background-color:white;border:none;padding:0;width:100%;_width:99%;overflow:auto;resize:none;}.cke_skin_kama div.cke_dialog_ui_input_textarea{background-color:white;border:1px solid #a0a0a0;padding:1px 0;}.cke_skin_kama div.cke_disabled .cke_dialog_ui_labeled_content *{background-color:#a0a0a0;cursor:default;}.cke_skin_kama .cke_rtl .cke_dialog_ui_labeled_content{_width:95%;}.cke_skin_kama .cke_dialog_ui_hbox{width:100%;}.cke_skin_kama .cke_dialog_ui_hbox_first,.cke_skin_kama .cke_dialog_ui_hbox_child,.cke_skin_kama .cke_dialog_ui_hbox_last{vertical-align:top;}.cke_skin_kama .cke_ltr .cke_dialog_ui_hbox_first,.cke_skin_kama .cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px;}.cke_skin_kama .cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_kama .cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px;}.cke_skin_kama a.cke_dialog_ui_button{border-collapse:separate;cursor:default;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background:transparent url(images/sprites.png) repeat-x scroll 0 -1069px;_background:none;padding:5px 0;text-align:center;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button{padding:0;}.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button span{width:70px;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span{width:100px;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button span{padding:5px 15px;text-align:center;color:#3b3b1f;background:#53D9F0 none;display:inline-block;cursor:default;}.cke_skin_kama .cke_browser_webkit a.cke_dialog_ui_button span.cke_dialog_ui_button{margin:0;}.cke_skin_kama .cke_browser_webkit a.cke_dialog_ui_button{display:inline-block;padding-top:3px;padding-bottom:2px;margin:2px 0;}.cke_skin_kama a.cke_dialog_ui_button_ok span,.cke_skin_kama a.cke_dialog_ui_button_cancel span{width:60px;padding-right:20px;padding-left:20px;}.cke_skin_kama a.cke_dialog_ui_button_ok{background-position:0 -1143px;}.cke_skin_kama a.cke_dialog_ui_button_ok span{background:transparent url(images/sprites.png) no-repeat scroll right -1219px;}.cke_skin_kama .cke_rtl a.cke_dialog_ui_button_ok span{background-position:left -1219px;}
.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_ok span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_ok span{background-color:#B8E834;margin-right:0;}.cke_skin_kama a.cke_dialog_ui_button_cancel{background-position:0 -1104px;}.cke_skin_kama a.cke_dialog_ui_button_cancel span{background:transparent url(images/sprites.png) no-repeat scroll right -1245px;}.cke_skin_kama .cke_rtl a.cke_dialog_ui_button_cancel span{background-position:left -1245px;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_cancel span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_cancel span{background-color:#F65D20;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_cancel span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_cancel span,.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_ok span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_ok span{background-image:none;}.cke_skin_kama span.cke_dialog_ui_button{padding:2px 10px;text-align:center;color:#222;display:inline-block;cursor:default;min-width:60px;+margin:2px 0;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button{display:block;}.cke_skin_kama a.cke_dialog_ui_button span.cke_disabled{border:#898980 1px solid;color:#5e5e55;background-color:#c5c5b3;}.cke_skin_kama a:hover.cke_dialog_ui_button,.cke_skin_kama a:focus.cke_dialog_ui_button,.cke_skin_kama a:active.cke_dialog_ui_button{background-position:0 -1179px;}.cke_skin_kama .cke_hc a:hover.cke_dialog_ui_button,.cke_skin_kama .cke_hc a:focus.cke_dialog_ui_button,.cke_skin_kama .cke_hc a:active.cke_dialog_ui_button{border-width:2px;}.cke_skin_kama .cke_browser_iequirks a:hover.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_iequirks a:focus.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_iequirks a:active.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_ie6 a:hover.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_ie6 a:focus.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_ie6 a:active.cke_dialog_ui_button span{background-image:none;background:#F7A922;}.cke_skin_kama .cke_dialog_footer_buttons{display:inline-table;margin-right:12px;margin-left:12px;width:auto;position:relative;}.cke_skin_kama .cke_browser_ie7 .cke_dialog_footer_buttons{position:static;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons{display:inline;}.cke_skin_kama .cke_dialog_footer_buttons span.cke_dialog_ui_button{margin:7px 0;text-align:center;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons a.cke_dialog_ui_button{display:block;padding:0;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button{padding-bottom:5px;padding-top:6px;margin-bottom:0;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons .cke_dialog_ui_button_ok .cke_dialog_ui_button{background-position:right -1214px;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons .cke_dialog_ui_button_cancel .cke_dialog_ui_button{background-position:right -1242px;}.cke_skin_kama .cke_browser_ie9.cke_rtl .cke_dialog_footer_buttons td{padding-left:2px;}.cke_skin_kama strong{font-weight:bold;}.cke_skin_kama .cke_dialog .cke_dialog_body .cke_dialog_close_button{background-image:url(images/sprites.png);background-repeat:no-repeat;background-position:0 -1022px;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;_background-image:url(images/sprites_ie6.png);}.cke_skin_kama .cke_dialog_close_button span{display:none;}.cke_skin_kama .cke_dialog_close_button:hover{background-position:0 -1045px;}.cke_skin_kama .cke_ltr .cke_dialog_close_button{right:10px;}.cke_skin_kama .cke_browser_ie8.cke_rtl .cke_dialog_close_button{left:8px;}.cke_skin_kama .cke_rtl .cke_dialog_close_button{left:10px;}.cke_skin_kama .cke_browser_ie7.cke_rtl .cke_dialog_close_button{left:16px;top:0;}.cke_skin_kama .cke_browser_ie7.cke_rtl .cke_dialog_close_button{position:absolute;left:10px;top:5px;}.cke_skin_kama .cke_browser_ie7.cke_single_page .cke_dialog_footer{margin-top:22px;}.cke_skin_kama .cke_browser_ie6 .cke_dialog_close_button,.cke_skin_kama .cke_browser_iequirks .cke_dialog_close_button{top:7px;}
.cke_skin_kama .cke_browser_ie7.cke_ltr .cke_dialog_close_button{margin-top:0;}.cke_skin_kama .cke_dialog_ui_input_select{border:1px solid #a0a0a0;background-color:white;}.cke_skin_kama .cke_dialog_ui_input_file{width:100%;height:25px;}.cke_skin_kama .cke_dialog .cke_dark_background{background-color:#eaead1;}.cke_skin_kama .cke_dialog .cke_hand{cursor:pointer;}.cke_skin_kama .cke_dialog .cke_centered{text-align:center;}.cke_skin_kama .cke_dialog a.cke_btn_reset{float:right;background-position:0 -32px;background-image:url(images/mini.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px;}.cke_skin_kama .cke_rtl .cke_dialog a.cke_btn_reset{float:left;}.cke_skin_kama .cke_dialog a.cke_btn_locked,.cke_skin_kama .cke_dialog a.cke_btn_unlocked{float:left;background-position:0 0;background-image:url(images/mini.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px;}.cke_skin_kama .cke_dialog a.cke_btn_locked .cke_icon{display:none;}.cke_skin_kama .cke_rtl .cke_dialog a.cke_btn_locked,.cke_skin_kama .cke_rtl .cke_dialog a.cke_btn_unlocked{float:right;}.cke_skin_kama .cke_dialog a.cke_btn_unlocked{background-position:0 -16px;background-image:url(images/mini.gif);}.cke_skin_kama .cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer;}.cke_skin_kama .cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white;}.cke_skin_kama .cke_dialog .ImagePreviewBox table td{white-space:normal;}.cke_skin_kama .cke_browser_iequirks .cke_dialog_page_contents{_position:absolute;}.cke_skin_kama .cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity=90);background-color:#e4e4e4;}.cke_skin_kama .cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white;}.cke_skin_kama .cke_dialog .cke_pastetext{width:346px;height:170px;}.cke_skin_kama .cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none;}.cke_skin_kama .cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid black;}.cke_skin_kama .cke_dialog .cke_dark_background{text-align:center;background-color:#eaead1;font-size:14px;}.cke_skin_kama .cke_dialog .cke_light_background{text-align:center;background-color:#ffffbe;}.cke_skin_kama .cke_dialog .cke_hand{cursor:pointer;}.cke_skin_kama .cke_disabled{color:#a0a0a0;}.cke_skin_kama .cke_hc .cke_dialog_title,.cke_skin_kama .cke_hc .cke_dialog_tabs,.cke_skin_kama .cke_hc .cke_dialog_contents,.cke_skin_kama .cke_hc .cke_dialog_footer{border-left:1px solid;border-right:1px solid;}.cke_skin_kama .cke_hc .cke_dialog_title{border-top:1px solid;}.cke_skin_kama .cke_hc .cke_dialog_footer{border-bottom:1px solid;}.cke_skin_kama .cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px;}.cke_skin_kama .cke_dialog_body .cke_label{display:none;}.cke_skin_kama .cke_dialog_body label.cke_required{font-weight:bold;}.cke_skin_kama .cke_hc .cke_dialog_body .cke_label{display:inline;cursor:inherit;}.cke_skin_kama .cke_hc a.cke_btn_locked,.cke_skin_kama .cke_hc a.cke_btn_unlocked,.cke_skin_kama .cke_hc a.cke_btn_reset{border-style:solid;float:left;width:auto;height:auto;padding:0 2px;}.cke_skin_kama .cke_rtl.cke_hc a.cke_btn_locked,.cke_skin_kama .cke_rtl.cke_hc a.cke_btn_unlocked,.cke_skin_kama .cke_rtl.cke_hc a.cke_btn_reset{float:right;}.cke_skin_kama .cke_hc a.cke_btn_locked .cke_icon{display:inline;}.cke_skin_kama a.cke_smile img{border:2px solid #eaead1;}.cke_skin_kama a.cke_smile:focus img,.cke_skin_kama a.cke_smile:active img,.cke_skin_kama a.cke_smile:hover img{border-color:#C7C78F;}.cke_skin_kama .cke_hc .cke_dialog_tabs a,.cke_skin_kama .cke_hc .cke_dialog_footer a{opacity:1.0;filter:alpha(opacity=100);border:1px solid white;}.cke_skin_kama .cke_hc .ImagePreviewBox{width:260px;}.cke_skin_kama .cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px;}
-.cke_skin_kama .cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px;}
+.cke_skin_kama .cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px;}.cke_skin_kama .cke_browser_gecko .cke_dialog_ui_checkbox_input:focus,.cke_skin_kama .cke_browser_gecko .cke_dialog_ui_radio_input:focus,.cke_skin_kama .cke_browser_opera .cke_dialog_ui_checkbox_input:focus,.cke_skin_kama .cke_browser_opera .cke_dialog_ui_radio_input:focus,.cke_skin_kama .cke_browser_gecko .cke_dialog_ui_input_select:focus,.cke_skin_kama .cke_browser_gecko .cke_btn_over,.cke_skin_kama .cke_browser_opera .cke_btn_over,.cke_skin_kama .cke_browser_ie .cke_btn_over{outline:1px dotted #696969;}.cke_skin_kama .cke_browser_ie .cke_dialog_ui_checkbox_input,.cke_skin_kama .cke_browser_ie .cke_dialog_ui_ratio_input,.cke_skin_kama .cke_browser_ie .cke_btn_reset,.cke_skin_kama .cke_browser_ie .cke_btn_locked,.cke_skin_kama .cke_browser_ie .cke_btn_unlocked{*border:1px solid transparent!important;-border:1px solid red!important;-filter:chroma(color=red);}.cke_skin_kama .cke_browser_ie .cke_dialog_ui_focused,.cke_skin_kama .cke_browser_ie .cke_btn_over{*border:1px dotted #696969!important;}.cke_skin_kama .cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity=0);width:100%;height:100%;}
diff --git a/appsrc/ODS-Framework/ckeditor/skins/kama/editor.css b/appsrc/ODS-Framework/ckeditor/skins/kama/editor.css
index 8cc4903..9580e92 100644
--- a/appsrc/ODS-Framework/ckeditor/skins/kama/editor.css
+++ b/appsrc/ODS-Framework/ckeditor/skins/kama/editor.css
@@ -1,11 +1,11 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-.cke_skin_kama *,.cke_skin_kama a:hover,.cke_skin_kama a:link,.cke_skin_kama a:visited,.cke_skin_kama a:active{margin:0;padding:0;border:0;background:transparent;text-decoration:none;font:normal normal normal 100% Sans-Serif;width:auto;height:auto;border-collapse:collapse;text-align:left;vertical-align:baseline;white-space:nowrap;cursor:auto;color:#000;font-size:12px;font-family:Arial,Helvetica,Tahoma,Verdana,Sans-Serif;}.cke_skin_kama .cke_rtl *,.cke_skin_kama .cke_rtl a:hover,.cke_skin_kama .cke_rtl a:link,.cke_skin_kama .cke_rtl a:visited,.cke_skin_kama .cke_rtl a:active,.cke_rtl .cke_skin_kama *,.cke_rtl .cke_skin_kama a:hover,.cke_rtl .cke_skin_kama a:link,.cke_rtl .cke_skin_kama a:visited,.cke_rtl .cke_skin_kama a:active{text-align:right;}.cke_skin_kama iframe{vertical-align:inherit;}.cke_skin_kama textarea{white-space:pre;}.cke_skin_kama .cke_browser_gecko textarea{cursor:text;}.cke_skin_kama .cke_browser_gecko textarea[disabled]{cursor:default;}.cke_skin_kama input[type="text"],.cke_skin_kama input[type="password"]{cursor:text;}.cke_skin_kama input[type="text"][disabled],.cke_skin_kama input[type="password"][disabled]{cursor:default;}.cke_skin_kama fieldset{padding:10px;border:2px groove #E0DFE3;}.cke_skin_kama{display:block;}span.cke_skin_kama{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;border:1px solid #D3D3D3;padding:5px;}.cke_skin_kama span.cke_browser_webkit,.cke_skin_kama span.cke_browser_gecko18{display:block;}.cke_skin_kama .cke_wrapper{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-color:#d3d3d3;background-image:url(images/sprites.png);background-repeat:repeat-x;background-position:0 -1950px;display:block;_display:inline-block;padding:5px;}.cke_shared .cke_skin_kama .cke_wrapper{padding-bottom:0;}.cke_skin_kama .cke_browser_ie6 .cke_wrapper,.cke_skin_kama .cke_browser_iequirks .cke_wrapper{background-image:none;}.cke_skin_kama .cke_editor{display:inline-table;width:100%;}.cke_skin_kama .cke_browser_webkit .cke_editor{display:table;}.cke_skin_kama .ltr .cke_browser_ie iframe{margin-right:-10px;}.cke_skin_kama .rtl .cke_browser_ie iframe{margin-left:-10px;}.cke_skin_kama .cke_browser_opera .cke_editor.cke_skin_kama .cke_resizer{display:table;}.cke_skin_kama .cke_contents{margin:5px;}.cke_skin_kama .cke_hc .cke_contents{border:1px solid black;}.cke_skin_kama .cke_contents iframe{background-color:#fff;}.cke_skin_kama .cke_focus{outline:auto 5px -webkit-focus-ring-color;}.cke_skin_kama textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre;}.cke_skin_kama .cke_browser_iequirks textarea.cke_source{_white-space:normal;}.cke_skin_kama .cke_resizer{width:12px;height:12px;margin-top:9px;display:block;float:right;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1428px;background-repeat:no-repeat;cursor:se-resize;}.cke_skin_kama .cke_browser_air .cke_resizer,.cke_skin_kama .cke_browser_air .cke_rtl .cke_resizer{cursor:move;}.cke_skin_kama .cke_resizer_rtl{cursor:sw-resize;background-position:0 -1455px;float:left;}.cke_skin_kama .cke_resizer_horizontal,.cke_skin_kama .cke_rtl .cke_resizer_horizontal{cursor:e-resize;}.cke_skin_kama .cke_resizer_vertical,.cke_skin_kama .cke_rtl .cke_resizer_vertical{cursor:n-resize;}.cke_skin_kama .cke_maximized .cke_resizer{display:none;}.cke_skin_kama .cke_browser_ie6 .cke_contents textarea,.cke_skin_kama .cke_browser_ie7 .cke_contents textarea{position:absolute;}.cke_skin_kama .cke_browser_ie.cke_browser_quirks .cke_contents iframe{position:absolute;top:0;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_skin_kama .cke_browser_ie7 .cke_editor{display:inline-block;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_shared .cke_skin_kama .cke_browser_ie7 .cke_wrapper{padding-bottom:5px;}.cke_skin_kama .cke_voice_label{display:none;}.cke_skin_kama legend.cke_voice_label{display:none;}.cke_skin_kama .cke_browser_ie legend.cke_voice_label{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_kama .cke_panel{border:1px solid #8f8f73;background-color:#fff;width:120px;height:100px;overflow:hidden;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}
-.cke_skin_kama .cke_contextmenu{margin:0;}.cke_skin_kama .cke_panel iframe{width:100%;height:100%;}html.cke_skin_kama_container{overflow:auto;overflow-x:hidden;}body.cke_panel_frame{overflow:auto;}.cke_panel_frame .cke_label{display:none;}ul.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap;}li.cke_panel_listItem{margin:0;}.cke_panel_listItem a{padding:2px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;}* html .cke_panel_listItem a{width:100%;color:#000;}*:first-child+html .cke_panel_listItem a{color:#000;}.cke_panel_listItem.cke_selected a{border:1px solid #ccc;background-color:#e9f5ff;}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#316ac5;background-color:#dff1ff;}.cke_hc .cke_panel_listItem.cke_selected a,.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border-width:3px;padding:0;}.cke_panel_grouptitle{font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;font-weight:bold;white-space:nowrap;background-color:#dcdcdc;color:#000;margin:0;padding:3px;}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:3px;margin-bottom:3px;}.cke_skin_kama .cke_button_textcolor_panel,.cke_skin_kama .cke_button_bgcolor_panel{width:150px;height:135px;}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000;}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left;}.cke_rtl span.cke_colorbox{float:right;}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;}.cke_rtl a.cke_colorbox{float:right;}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#316ac5 1px solid;background-color:#dff1ff;}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer;}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#316ac5 1px solid;background-color:#dff1ff;}@media print{.cke_skin_kama .cke_toolbox{display:none;}}.cke_skin_kama .cke_browser_webkit .cke_toolbox,.cke_skin_kama .cke_browser_webkit .cke_toolbox>span{white-space:normal;}.cke_skin_kama .cke_toolbox{clear:both;padding-bottom:1px;}.cke_skin_kama a.cke_toolbox_collapser,.cke_skin_kama a:hover.cke_toolbox_collapser{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:3px -1366px;background-repeat:no-repeat;width:11px;height:11px;float:right;border:1px outset #D3D3D3;margin:11px 0 2px;cursor:pointer;}.cke_skin_kama .cke_rtl a.cke_toolbox_collapser,.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser{float:left;}.cke_skin_kama a.cke_toolbox_collapser span{display:none;}.cke_skin_kama .cke_hc a.cke_toolbox_collapser span{font-size:10px;font-weight:bold;font-family:Arial;display:inline;}.cke_skin_kama a.cke_toolbox_collapser_min,.cke_skin_kama a:hover.cke_toolbox_collapser_min{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:4px -1387px;background-repeat:no-repeat;margin:2px 4px;}.cke_skin_kama .cke_rtl a.cke_toolbox_collapser_min,.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser_min{background-position:4px -1408px;}.cke_skin_kama .cke_separator{display:inline-block;border-left:solid 1px #D3D3D3;margin:3px 2px 0;height:16px;vertical-align:top;}.cke_skin_kama .cke_break{font-size:0;clear:left;}.cke_skin_kama .cke_rtl .cke_break{clear:right;}.cke_skin_kama .cke_toolbar_start{display:none;}.cke_skin_kama .cke_toolgroup{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:repeat-x;background-position:0 -500px;float:left;margin-right:6px;margin-bottom:5px;padding:2px;display:inline;}
-.cke_skin_kama .cke_rtl .cke_toolgroup{float:right;margin-right:0;margin-left:6px;}.cke_skin_kama .cke_button a,.cke_skin_kama .cke_button a:hover,.cke_skin_kama .cke_button a:focus,.cke_skin_kama .cke_button a:active,.cke_skin_kama .cke_button a.cke_off{border-radius:3px;outline:none;padding:2px 4px;height:18px;display:inline-block;cursor:default;}.cke_skin_kama .cke_button a,.cke_skin_kama .cke_button a.cke_off{filter:alpha(opacity=70);opacity:.70;-moz-border-radius:3px;-webkit-border-radius:3px;}.cke_skin_kama .cke_hc .cke_button a,.cke_skin_kama .cke_hc .cke_button a.cke_off{opacity:1.0;filter:alpha(opacity=100);border:1px solid white;}.cke_skin_kama .cke_button a.cke_on{background-color:#a3d7ff;filter:alpha(opacity=100);opacity:1;padding:2px 4px;}.cke_skin_kama .cke_hc .cke_button a.cke_on{padding:0 2px!important;border-width:3px;}.cke_skin_kama .cke_button a.cke_disabled *{filter:alpha(opacity=30);opacity:.3;}.cke_skin_kama .cke_browser_ie .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_kama .cke_browser_ie6 .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *,.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix a.cke_disabled *{filter:alpha(opacity=30);}.cke_skin_kama .cke_hc .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *{filter:alpha(opacity=60);opacity:.6;}.cke_skin_kama .cke_button a:hover.cke_on,.cke_skin_kama .cke_button a:focus.cke_on,.cke_skin_kama .cke_button a:active.cke_on,.cke_skin_kama .cke_button a:hover.cke_off,.cke_skin_kama .cke_button a:focus.cke_off,.cke_skin_kama .cke_button a:active.cke_off{filter:alpha(opacity=100);opacity:1;padding:2px 4px;}.cke_skin_kama .cke_button a:hover,.cke_skin_kama .cke_button a:focus,.cke_skin_kama .cke_button a:active{background-color:#dff1ff;}.cke_skin_kama .cke_button a:hover.cke_on,.cke_skin_kama .cke_button a:focus.cke_on,.cke_skin_kama .cke_button a:active.cke_on{background-color:#86caff;}.cke_skin_kama .cke_hc .cke_button a:hover,.cke_skin_kama .cke_hc .cke_button a:focus,.cke_skin_kama .cke_hc .cke_button a:active{padding:0 2px!important;border-width:3px;}.cke_skin_kama .cke_button .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;display:inline-block;cursor:default;}.cke_skin_kama .cke_rtl .cke_button .cke_icon{background-image:url(icons_rtl.png);}.cke_skin_kama .cke_browser_ie .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_kama .cke_browser_ie6 .cke_button .cke_icon,.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix .cke_icon,.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button.cke_noalphafix .cke_icon{filter:;}.cke_skin_kama .cke_button .cke_label{cursor:default;display:none;padding-left:3px;line-height:18px;}.cke_skin_kama .cke_hc .cke_button .cke_label{padding:0;display:inline-block;}.cke_skin_kama .cke_hc .cke_button .cke_icon{display:none;}.cke_skin_kama .cke_accessibility{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_kama .cke_button .cke_buttonarrow{display:inline-block;height:17px;width:8px;background-position:2px -1469px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;cursor:default;}.cke_skin_kama .cke_browser_ie .cke_button .cke_buttonarrow{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}
+.cke_skin_kama *,.cke_skin_kama a:hover,.cke_skin_kama a:link,.cke_skin_kama a:visited,.cke_skin_kama a:active{margin:0;padding:0;border:0;background:transparent;text-decoration:none;font:normal normal normal 100% Sans-Serif;width:auto;height:auto;border-collapse:collapse;text-align:left;vertical-align:baseline;white-space:nowrap;cursor:auto;color:#000;float:none;font-size:12px;font-family:Arial,Helvetica,Tahoma,Verdana,Sans-Serif;}.cke_skin_kama .cke_rtl *,.cke_skin_kama .cke_rtl a:hover,.cke_skin_kama .cke_rtl a:link,.cke_skin_kama .cke_rtl a:visited,.cke_skin_kama .cke_rtl a:active,.cke_rtl .cke_skin_kama *,.cke_rtl .cke_skin_kama a:hover,.cke_rtl .cke_skin_kama a:link,.cke_rtl .cke_skin_kama a:visited,.cke_rtl .cke_skin_kama a:active{text-align:right;}.cke_skin_kama iframe{vertical-align:inherit;}.cke_skin_kama textarea{white-space:pre;}.cke_skin_kama .cke_browser_gecko textarea{cursor:text;}.cke_skin_kama .cke_browser_gecko textarea[disabled]{cursor:default;}.cke_skin_kama input[type="text"],.cke_skin_kama input[type="password"]{cursor:text;}.cke_skin_kama input[type="text"][disabled],.cke_skin_kama input[type="password"][disabled]{cursor:default;}.cke_skin_kama fieldset{padding:10px;border:2px groove #E0DFE3;}.cke_skin_kama{display:block;}span.cke_skin_kama{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;border:1px solid #D3D3D3;padding:5px;}.cke_skin_kama span.cke_browser_webkit,.cke_skin_kama span.cke_browser_gecko18{display:block;}.cke_skin_kama .cke_wrapper{-moz-border-radius:5px;-webkit-border-radius:5px;-webkit-touch-callout:none;border-radius:5px;background-color:#d3d3d3;background-image:url(images/sprites.png);background-repeat:repeat-x;background-position:0 -1950px;display:block;_display:inline-block;padding:5px;}.cke_shared .cke_skin_kama .cke_wrapper{padding-bottom:0;}.cke_skin_kama .cke_browser_ie6 .cke_wrapper,.cke_skin_kama .cke_browser_iequirks .cke_wrapper{background-image:none;}.cke_skin_kama .cke_editor{display:inline-table;width:100%;}.cke_skin_kama .cke_browser_ie .cke_editor,.cke_skin_kama .cke_browser_webkit .cke_editor{display:table;}.cke_skin_kama .ltr .cke_browser_ie iframe{margin-right:-10px;}.cke_skin_kama .rtl .cke_browser_ie iframe{margin-left:-10px;}.cke_skin_kama .cke_browser_opera .cke_editor.cke_skin_kama .cke_resizer{display:table;}.cke_skin_kama .cke_contents{margin:5px;}.cke_skin_kama .cke_hc .cke_contents{border:1px solid black;}.cke_skin_kama .cke_contents iframe{background-color:#fff;}.cke_skin_kama .cke_focus{outline:auto 5px -webkit-focus-ring-color;}.cke_skin_kama textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre;}.cke_skin_kama .cke_browser_iequirks textarea.cke_source{_white-space:normal;}.cke_skin_kama .cke_resizer{width:12px;height:12px;margin-top:9px;display:block;float:right;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1428px;background-repeat:no-repeat;cursor:se-resize;}.cke_skin_kama .cke_browser_air .cke_resizer,.cke_skin_kama .cke_browser_air .cke_rtl .cke_resizer{cursor:move;}.cke_skin_kama .cke_resizer_rtl{cursor:sw-resize;background-position:0 -1455px;float:left;}.cke_skin_kama .cke_resizer_horizontal,.cke_skin_kama .cke_rtl .cke_resizer_horizontal{cursor:e-resize;}.cke_skin_kama .cke_resizer_vertical,.cke_skin_kama .cke_rtl .cke_resizer_vertical{cursor:n-resize;}.cke_skin_kama .cke_maximized .cke_resizer{display:none;}.cke_skin_kama .cke_browser_ie6 .cke_contents textarea,.cke_skin_kama .cke_browser_ie7 .cke_contents textarea{position:absolute;}.cke_skin_kama .cke_browser_ie.cke_browser_quirks .cke_contents iframe{position:absolute;top:0;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_skin_kama .cke_browser_ie7 .cke_editor{display:inline-block;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_shared .cke_skin_kama .cke_browser_ie7 .cke_wrapper{padding-bottom:5px;}.cke_skin_kama .cke_voice_label{display:none;}.cke_skin_kama legend.cke_voice_label{display:none;}.cke_skin_kama .cke_browser_ie legend.cke_voice_label{position:absolute;display:block;width:0;height:0;overflow:hidden;}
+.cke_skin_kama .cke_panel{border:1px solid #8f8f73;background-color:#fff;width:120px;height:100px;overflow:hidden;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.cke_skin_kama .cke_contextmenu{margin:0;}.cke_skin_kama .cke_panel iframe{width:100%;height:100%;}html.cke_skin_kama_container{overflow:auto;overflow-x:hidden;}body.cke_panel_frame{overflow:auto;}.cke_panel_frame .cke_label{display:none;}ul.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap;}li.cke_panel_listItem{margin:0;}.cke_panel_listItem a{padding:2px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;}* html .cke_panel_listItem a{width:100%;color:#000;}*:first-child+html .cke_panel_listItem a{color:#000;}.cke_panel_listItem.cke_selected a{border:1px solid #ccc;background-color:#e9f5ff;}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#316ac5;background-color:#dff1ff;}.cke_hc .cke_panel_listItem.cke_selected a,.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border-width:3px;padding:0;}.cke_panel_grouptitle{font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;font-weight:bold;white-space:nowrap;background-color:#dcdcdc;color:#000;margin:0;padding:3px;}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:3px;margin-bottom:3px;}.cke_skin_kama .cke_button_textcolor_panel,.cke_skin_kama .cke_button_bgcolor_panel{width:150px;height:135px;}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000;}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left;}.cke_rtl span.cke_colorbox{float:right;}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;}.cke_rtl a.cke_colorbox{float:right;}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#316ac5 1px solid;background-color:#dff1ff;}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer;}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#316ac5 1px solid;background-color:#dff1ff;}@media print{.cke_skin_kama .cke_toolbox{display:none;}}.cke_skin_kama .cke_browser_webkit .cke_toolbox,.cke_skin_kama .cke_browser_webkit .cke_toolbox>span{white-space:normal;}.cke_skin_kama .cke_toolbox{clear:both;padding-bottom:1px;}.cke_skin_kama a.cke_toolbox_collapser,.cke_skin_kama a:hover.cke_toolbox_collapser{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:3px -1366px;background-repeat:no-repeat;width:11px;height:11px;float:right;border:1px outset #D3D3D3;margin:11px 0 2px;cursor:pointer;}.cke_skin_kama .cke_rtl a.cke_toolbox_collapser,.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser{float:left;}.cke_skin_kama a.cke_toolbox_collapser span{display:none;}.cke_skin_kama .cke_hc a.cke_toolbox_collapser span{font-size:10px;font-weight:bold;font-family:Arial;display:inline;}.cke_skin_kama a.cke_toolbox_collapser_min,.cke_skin_kama a:hover.cke_toolbox_collapser_min{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:4px -1387px;background-repeat:no-repeat;margin:2px 4px;}.cke_skin_kama .cke_rtl a.cke_toolbox_collapser_min,.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser_min{background-position:4px -1408px;}.cke_skin_kama .cke_separator{display:inline-block;border-left:solid 1px #D3D3D3;margin:3px 2px 0;height:16px;vertical-align:top;}.cke_skin_kama .cke_break{font-size:0;clear:left;}.cke_skin_kama .cke_rtl .cke_break{clear:right;}.cke_skin_kama .cke_toolbar_start{display:none;}.cke_skin_kama .cke_toolgroup{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:repeat-x;background-position:0 -500px;float:left;margin-right:6px;margin-bottom:5px;padding:2px;display:inline;}
+.cke_skin_kama .cke_rtl .cke_toolgroup{float:right;margin-right:0;margin-left:6px;}.cke_skin_kama .cke_button a,.cke_skin_kama .cke_button a:hover,.cke_skin_kama .cke_button a:focus,.cke_skin_kama .cke_button a:active,.cke_skin_kama .cke_button a.cke_off{border-radius:3px;outline:none;padding:2px 4px;height:18px;display:inline-block;cursor:default;}.cke_skin_kama .cke_button a,.cke_skin_kama .cke_button a.cke_off{filter:alpha(opacity=70);opacity:.70;-moz-border-radius:3px;-webkit-border-radius:3px;}.cke_skin_kama .cke_hc .cke_button a,.cke_skin_kama .cke_hc .cke_button a.cke_off{opacity:1.0;filter:alpha(opacity=100);border:1px solid white;}.cke_skin_kama .cke_button a.cke_on{background-color:#a3d7ff;filter:alpha(opacity=100);opacity:1;padding:2px 4px;}.cke_skin_kama .cke_hc .cke_button a.cke_on{padding:0 2px!important;border-width:3px;}.cke_skin_kama .cke_button a.cke_disabled *{filter:alpha(opacity=30);opacity:.3;}.cke_skin_kama .cke_browser_ie .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_kama .cke_browser_ie6 .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *,.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix a.cke_disabled *{filter:alpha(opacity=30);}.cke_skin_kama .cke_hc .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *{filter:alpha(opacity=60);opacity:.6;}.cke_skin_kama .cke_button a:hover.cke_on,.cke_skin_kama .cke_button a:focus.cke_on,.cke_skin_kama .cke_button a:active.cke_on,.cke_skin_kama .cke_button a:hover.cke_off,.cke_skin_kama .cke_button a:focus.cke_off,.cke_skin_kama .cke_button a:active.cke_off{filter:alpha(opacity=100);opacity:1;padding:2px 4px;}.cke_skin_kama .cke_button a:hover,.cke_skin_kama .cke_button a:focus,.cke_skin_kama .cke_button a:active{background-color:#dff1ff;}.cke_skin_kama .cke_button a:hover.cke_on,.cke_skin_kama .cke_button a:focus.cke_on,.cke_skin_kama .cke_button a:active.cke_on{background-color:#86caff;}.cke_skin_kama .cke_hc .cke_button a:hover,.cke_skin_kama .cke_hc .cke_button a:focus,.cke_skin_kama .cke_hc .cke_button a:active{padding:0 2px!important;border-width:3px;}.cke_skin_kama .cke_button .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;display:inline-block;cursor:default;}.cke_skin_kama .cke_rtl .cke_button .cke_icon{background-image:url(icons_rtl.png);}.cke_skin_kama .cke_browser_ie .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_kama .cke_browser_ie6 .cke_button .cke_icon,.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix .cke_icon,.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button.cke_noalphafix .cke_icon{filter:;}.cke_skin_kama .cke_button .cke_label{cursor:default;display:none;padding-left:3px;line-height:18px;vertical-align:middle;}.cke_skin_kama .cke_hc .cke_button .cke_label{padding:0;display:inline-block;}.cke_skin_kama .cke_hc .cke_button .cke_icon{display:none;}.cke_skin_kama .cke_accessibility{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_kama .cke_button .cke_buttonarrow{display:inline-block;height:17px;width:8px;background-position:2px -1469px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;cursor:default;}.cke_skin_kama .cke_browser_ie .cke_button .cke_buttonarrow{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}
.cke_skin_kama .cke_browser_ie6 .cke_button .cke_buttonarrow{filter:;}.cke_skin_kama .cke_browser_gecko .cke_toolbar,.cke_skin_kama .cke_browser_gecko .cke_button a,.cke_skin_kama .cke_browser_gecko .cke_button a.cke_off,.cke_skin_kama .cke_browser_gecko .cke_button .cke_icon,.cke_skin_kama .cke_browser_gecko .cke_button .cke_buttonarrow,.cke_skin_kama .cke_browser_gecko .cke_separator,.cke_skin_kama .cke_browser_gecko .cke_toolbar_start{display:block;float:left;}.cke_skin_kama .cke_browser_gecko.cke_hc .cke_button .cke_icon{display:none;}.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_toolbar,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button a,.cke_skin_kama .cke_browser_gecko .cke_rtl.cke_button a.cke_off,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_icon,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_separator,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_toolbar_start{float:right;}.cke_skin_kama .cke_browser_gecko .cke_button .cke_label,.cke_skin_kama .cke_browser_gecko .cke_break{float:left;}.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_label,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_break{float:right;}.cke_skin_kama .cke_browser_webkit .cke_toolbar{float:left;}.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_toolbar{float:right;}.cke_skin_kama .cke_browser_ie .cke_button .cke_label{line-height:16px;}.cke_skin_kama .cke_browser_ie .cke_rcombo,.cke_skin_kama .cke_browser_ie .cke_rcombo *{cursor:default;}.cke_skin_kama .cke_browser_ie .cke_toolbox{padding-bottom:5px;_padding-bottom:6px;}.cke_shared .cke_skin_kama .cke_browser_ie .cke_toolbox{padding-bottom:0;}.cke_skin_kama .cke_contextmenu{padding:2px;}.cke_skin_kama .cke_menuitem a{display:block;}.cke_skin_kama .cke_menuitem span{cursor:default;}.cke_skin_kama .cke_menuitem a:hover,.cke_skin_kama .cke_menuitem a:focus,.cke_skin_kama .cke_menuitem a:active{background-color:#D3D3D3;display:block;}.cke_hc .cke_menuitem a:hover,.cke_hc .cke_menuitem a:focus,.cke_hc .cke_menuitem a:active{border:2px solid;}.cke_skin_kama .cke_menuitem .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;background-color:transparent;width:16px;height:16px;float:left;}.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon{background-image:url(icons_rtl.png);}.cke_browser_ie .cke_skin_kama .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_icon,.cke_browser_ie .cke_skin_kama .cke_menuitem.cke_noalphafix .cke_icon{filter:;}.cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:alpha(opacity=70);opacity:.70;}.cke_browser_ie .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon,.cke_browser_ie .cke_skin_kama .cke_menuitem.cke_noalphafix .cke_disabled .cke_icon{filter:;}.cke_skin_kama .cke_menuitem .cke_icon_wrapper{background-color:#D3D3D3;border:solid 4px #D3D3D3;width:16px;height:16px;float:left;filter:alpha(opacity=70);opacity:.70;clear:both;}.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon_wrapper{float:right;}.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper{background-color:#9d9d9d;border:solid 4px #9d9d9d;filter:alpha(opacity=70);opacity:.70;}.cke_skin_kama .cke_menuitem a:hover.cke_disabled .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus.cke_disabled .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active.cke_disabled .cke_icon_wrapper{background-color:#D3D3D3;border:solid 4px #D3D3D3;}
.cke_skin_kama .cke_menuitem .cke_label{display:block;padding-right:3px;padding-top:5px;padding-left:4px;height:19px;margin-left:24px;background-color:#fff;}.cke_skin_kama .cke_frameLoaded .cke_menuitem .cke_label{filter:alpha(opacity=70);opacity:.70;}.cke_rtl .cke_skin_kama .cke_menuitem .cke_label{padding-right:0;margin-left:0;padding-left:3px;margin-right:28px;}.cke_skin_kama .cke_menuitem a.cke_disabled .cke_label{filter:alpha(opacity=30);opacity:.30;}.cke_skin_kama .cke_menuitem a:hover .cke_label,.cke_skin_kama .cke_menuitem a:focus .cke_label,.cke_skin_kama .cke_menuitem a:active .cke_label{background-color:#D3D3D3;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label{background-color:transparent;}.cke_skin_kama .cke_menuseparator{background-color:#D3D3D3;height:2px;filter:alpha(opacity=70);opacity:.70;_font-size:0;}.cke_skin_kama .cke_menuarrow{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1411px;background-repeat:no-repeat;height:5px;width:3px;float:right;margin-right:2px;margin-top:3px;}.cke_rtl .cke_skin_kama .cke_menuarrow{float:left;margin-right:0;margin-left:2px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1390px;background-repeat:no-repeat;}.cke_skin_kama .cke_menuarrow span{display:none;}.cke_hc .cke_skin_kama .cke_menuarrow{width:auto;margin-top:0;}.cke_hc .cke_skin_kama .cke_menuarrow span{display:inline;}.cke_browser_ie.cke_ltr .cke_skin_kama .cke_menuarrow{position:absolute;right:2px;}.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuarrow{position:absolute;left:2px;}.cke_skin_kama .cke_rcombo{display:inline;}.cke_skin_kama .cke_rcombopanel{border:1px solid #8F8F73;-moz-border-radius-topleft:0;-webkit-border-top-left-radius:0;border-top-left-radius:0;height:auto;_height:100px;}.cke_skin_kama .cke_rcombo a,.cke_skin_kama .cke_rcombo a:active,.cke_skin_kama .cke_rcombo a:hover{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:repeat-x;background-position:0 -100px;border-bottom:1px solid #DAD9D9;border-right:1px solid #DAD9D9;float:left;padding:2px;height:21px;margin-right:6px;margin-bottom:5px;}.cke_skin_kama .cke_rtl .cke_rcombo a,.cke_skin_kama .cke_rtl .cke_rcombo a:active,.cke_skin_kama .cke_rtl .cke_rcombo a:hover{float:right;margin-right:0;margin-left:6px;}.cke_skin_kama .cke_hc .cke_rcombo a{filter:alpha(opacity=100);opacity:1.0;}.cke_skin_kama .cke_rcombo .cke_label{display:none;line-height:26px;vertical-align:top;margin-right:5px;filter:alpha(opacity=70);opacity:.70;}.cke_skin_kama .cke_rtl .cke_rcombo .cke_label{margin-right:0;margin-left:5px;}.cke_skin_kama .cke_rcombo .cke_inline_label{line-height:21px;font-style:italic;color:#666;}.cke_skin_kama .cke_hc .cke_rcombo .cke_openbutton{vertical-align:top;}.cke_skin_kama .cke_hc .cke_rcombo .cke_label{filter:alpha(opacity=100);opacity:1.0;}.cke_skin_kama .cke_rcombo .cke_text{filter:alpha(opacity=70);opacity:.70;height:21px;line-height:21px;width:60px;text-overflow:ellipsis;overflow:hidden;display:inline-block;margin:0 2px 0 4px;cursor:default;}.cke_skin_kama .cke_rtl .cke_rcombo .cke_text{margin:0 4px 0 2px;}.cke_skin_kama .cke_rcombo .cke_openbutton{display:inline-block;}.cke_skin_kama .cke_rcombo .cke_openbutton .cke_icon{display:inline-block;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -68px;background-repeat:no-repeat;width:17px;height:19px;margin:1px 2px;}.cke_skin_kama .cke_hc .cke_rcombo .cke_openbutton .cke_icon{background:none;}.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_openbutton{margin-bottom:0;}.cke_skin_kama .cke_rcombo .cke_off a:hover .cke_text,.cke_skin_kama .cke_rcombo .cke_off a:focus .cke_text,.cke_skin_kama .cke_rcombo .cke_off a:active .cke_text,.cke_skin_kama .cke_rcombo .cke_on .cke_text{border-color:#316ac5;filter:alpha(opacity=100);opacity:1;}
.cke_skin_kama .cke_rcombo .cke_off a:hover .cke_openbutton,.cke_skin_kama .cke_rcombo .cke_off a:focus .cke_openbutton,.cke_skin_kama .cke_rcombo .cke_off a:active .cke_openbutton,.cke_skin_kama .cke_rcombo .cke_on .cke_openbutton{border-color:#316ac5;background-color:#dff1ff;}.cke_skin_kama .cke_rcombo .cke_on .cke_text{-moz-border-radius-bottomleft:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;}.cke_skin_kama .cke_rcombo .cke_on .cke_openbutton{-moz-border-radius-bottomright:0;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.cke_skin_kama .cke_rcombo .cke_disabled .cke_label{filter:alpha(opacity=30);opacity:.3;}.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_label{filter:alpha(opacity=70);opacity:.7;}.cke_skin_kama .cke_rcombo .cke_disabled .cke_text,.cke_skin_kama .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=50);opacity:.5;}.cke_skin_kama .cke_browser_ie .cke_rcombo .cke_disabled .cke_openbutton{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=50);}.cke_skin_kama .cke_browser_ie6 .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=50);}.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_text,.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=80);opacity:.8;}.cke_skin_kama .cke_rcombo .cke_disabled .cke_text{color:#fff;}.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_openbutton,.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_openbutton{display:block;float:left;}.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_label,.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_label{float:left;}.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_rcombo .cke_label,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_rcombo .cke_openbutton,.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_rcombo .cke_label,.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_rcombo .cke_openbutton{float:right;}.cke_skin_kama .cke_browser_ie7 .cke_rcombo .cke_text{line-height:18px;}.cke_skin_kama .cke_browser_ie6 .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_text{height:auto;line-height:17px;}.cke_skin_kama .cke_rtl .cke_rcombo .cke_font .cke_text,.cke_skin_kama .cke_rtl .cke_rcombo .cke_fontSize .cke_text{direction:ltr;}@media print{.cke_path{display:none;}}.cke_skin_kama .cke_path{display:inline-block;float:left;margin-top:5px;}.cke_skin_kama .cke_rtl .cke_path{float:right;}.cke_shared .cke_skin_kama .cke_path{_width:100%;margin:0 0 5px;}.cke_skin_kama .cke_path a,.cke_skin_kama .cke_path .cke_empty{display:inline-block;float:left;padding:1px 4px 0;color:#60676a;cursor:default;}.cke_skin_kama .cke_path .cke_empty{visibility:hidden;}.cke_skin_kama .cke_rtl .cke_path a,.cke_skin_kama .cke_rtl .cke_path cke_empty{float:right;}.cke_skin_kama .cke_path a:hover,.cke_skin_kama .cke_path a:focus,.cke_skin_kama .cke_path a:active{background-color:#dff1ff;padding:1px 4px 0;outline:none;color:#000;}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path a,.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path .cke_empty{float:none;}.cke_skin_kama .cke_path .cke_label{display:none;}.cke_skin_kama .cke_button_source .cke_icon{background-position:0 0;}.cke_skin_kama .cke_button_docProps .cke_icon{background-position:0 -16px;}.cke_skin_kama .cke_button_newpage .cke_icon{background-position:0 -48px;}.cke_skin_kama .cke_button_preview .cke_icon{background-position:0 -64px;}.cke_skin_kama .cke_button_cut .cke_icon{background-position:0 -96px;}.cke_skin_kama .cke_button_copy .cke_icon{background-position:0 -112px;}.cke_skin_kama .cke_button_paste .cke_icon{background-position:0 -128px;}.cke_skin_kama .cke_button_pastetext .cke_icon{background-position:0 -144px;}.cke_skin_kama .cke_button_find .cke_icon{background-position:0 -240px;}.cke_skin_kama .cke_button_replace .cke_icon{background-position:0 -256px;}
diff --git a/appsrc/ODS-Framework/ckeditor/skins/kama/skin.js b/appsrc/ODS-Framework/ckeditor/skins/kama/skin.js
index 2cf60f2..d4d43cc 100644
--- a/appsrc/ODS-Framework/ckeditor/skins/kama/skin.js
+++ b/appsrc/ODS-Framework/ckeditor/skins/kama/skin.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/skins/kama/templates.css b/appsrc/ODS-Framework/ckeditor/skins/kama/templates.css
index 9441486..9e6820a 100644
--- a/appsrc/ODS-Framework/ckeditor/skins/kama/templates.css
+++ b/appsrc/ODS-Framework/ckeditor/skins/kama/templates.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/appsrc/ODS-Framework/ckeditor/themes/default/theme.js b/appsrc/ODS-Framework/ckeditor/themes/default/theme.js
index 9feddfe..7acc36b 100644
--- a/appsrc/ODS-Framework/ckeditor/themes/default/theme.js
+++ b/appsrc/ODS-Framework/ckeditor/themes/default/theme.js
@@ -1,8 +1,8 @@
/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
CKEDITOR.themes.add('default',(function(){var a={};function b(c,d){var e,f;f=c.config.sharedSpaces;f=f&&f[d];f=f&&CKEDITOR.document.getById(f);if(f){var g='<span class="cke_shared " dir="'+c.lang.dir+'"'+'>'+'<span class="'+c.skinClass+' '+c.id+' cke_editor_'+c.name+'">'+'<span class="'+CKEDITOR.env.cssClass+'">'+'<span class="cke_wrapper cke_'+c.lang.dir+'">'+'<span class="cke_editor">'+'<div class="cke_'+d+'">'+'</div></span></span></span></span></span>',h=f.append(CKEDITOR.dom.element.createFromHtml(g,f.getDocument()));if(f.getCustomData('cke_hasshared'))h.hide();else f.setCustomData('cke_hasshared',1);e=h.getChild([0,0,0,0]);!c.sharedSpaces&&(c.sharedSpaces={});c.sharedSpaces[d]=e;c.on('focus',function(){for(var i=0,j,k=f.getChildren();j=k.getItem(i);i++){if(j.type==CKEDITOR.NODE_ELEMENT&&!j.equals(h)&&j.hasClass('cke_shared'))j.hide();}h.show();});c.on('destroy',function(){h.remove();});}return e;};return{build:function(c,d){var e=c.name,f=c.element,g=c.elementMode;if(!f||g==CKEDITOR.ELEMENT_MODE_NONE)return;if(g==CKEDITOR.ELEMENT_MODE_REPLACE)f.hide();var h=c.fire('themeSpace',{space:'top',html:''}).html,i=c.fire('themeSpace',{space:'contents',html:''}).html,j=c.fireOnce('themeSpace',{space:'bottom',html:''}).html,k=i&&c.config.height,l=c.config.tabIndex||c.element.getAttribute('tabindex')||0;if(!i)k='auto';else if(!isNaN(k))k+='px';var m='',n=c.config.width;if(n){if(!isNaN(n))n+='px';m+='width: '+n+';';}var o=h&&b(c,'top'),p=b(c,'bottom');o&&(o.setHtml(h),h='');p&&(p.setHtml(j),j='');var q='<style>.'+c.skinClass+'{visibility:hidden;}</style>';if(a[c.skinClass])q='';else a[c.skinClass]=1;var r=CKEDITOR.dom.element.createFromHtml(['<span id="cke_',e,'" class="',c.skinClass,' ',c.id,' cke_editor_',e,'" dir="',c.lang.dir,'" title="',CKEDITOR.env.gecko?' ':'','" lang="',c.langCode,'"'+(CKEDITOR.env.webkit?' tabindex="'+l+'"':'')+' role="application"'+' aria-labelledby="cke_',e,'_arialbl"'+(m?' style="'+m+'"':'')+'>'+'<span id="cke_',e,'_arialbl" class="cke_voice_label">'+c.lang.editor+'</span>'+'<span class="',CKEDITOR.env.cssClass,'" role="presentation"><span class="cke_wrapper cke_',c.lang.dir,'" role="presentation"><table class="cke_editor" border="0" cellspacing="0" cellpadding="0" role="presentation"><tbody><tr',h?'':' style="display:none"',' role="presentation"><td id="cke_top_',e,'" class="cke_top" role="presentation">',h,'</td></tr><tr',i?'':' style="display:none"',' role="presentation"><td id="cke_contents_',e,'" class="cke_contents" style="height:',k,'" role="presentation">',i,'</td></tr><tr',j?'':' style="display:none"',' role="presentation"><td id="cke_bottom_',e,'" class="cke_bottom" role="presentation">',j,'</td></tr></tbody></table>'+q+'</span>'+'</span>'+'</span>'].join(''));
-r.getChild([1,0,0,0,0]).unselectable();r.getChild([1,0,0,0,2]).unselectable();if(g==CKEDITOR.ELEMENT_MODE_REPLACE)r.insertAfter(f);else f.append(r);c.container=r;r.disableContextMenu();c.on('contentDirChanged',function(s){var t=(c.lang.dir!=s.data?'add':'remove')+'Class';r.getChild(1)[t]('cke_mixed_dir_content');var u=this.sharedSpaces&&this.sharedSpaces[this.config.toolbarLocation];u&&u.getParent().getParent()[t]('cke_mixed_dir_content');});c.fireOnce('themeLoaded');c.fireOnce('uiReady');},buildDialog:function(c){var d=CKEDITOR.tools.getNextNumber(),e=CKEDITOR.dom.element.createFromHtml(['<div class="',c.id,'_dialog cke_editor_',c.name.replace('.','\\.'),'_dialog cke_skin_',c.skinName,'" dir="',c.lang.dir,'" lang="',c.langCode,'" role="dialog" aria-labelledby="%title#"><table class="cke_dialog',' '+CKEDITOR.env.cssClass,' cke_',c.lang.dir,'" style="position:absolute" role="presentation"><tr><td role="presentation"><div class="%body" role="presentation"><div id="%title#" class="%title" role="presentation"></div><a id="%close_button#" class="%close_button" href="javascript:void(0)" title="'+c.lang.common.close+'" role="button"><span class="cke_label">X</span></a>'+'<div id="%tabs#" class="%tabs" role="tablist"></div>'+'<table class="%contents" role="presentation">'+'<tr>'+'<td id="%contents#" class="%contents" role="presentation"></td>'+'</tr>'+'<tr>'+'<td id="%footer#" class="%footer" role="presentation"></td>'+'</tr>'+'</table>'+'</div>'+'<div id="%tl#" class="%tl"></div>'+'<div id="%tc#" class="%tc"></div>'+'<div id="%tr#" class="%tr"></div>'+'<div id="%ml#" class="%ml"></div>'+'<div id="%mr#" class="%mr"></div>'+'<div id="%bl#" class="%bl"></div>'+'<div id="%bc#" class="%bc"></div>'+'<div id="%br#" class="%br"></div>'+'</td></tr>'+'</table>',CKEDITOR.env.ie?'':'<style>.cke_dialog{visibility:hidden;}</style>','</div>'].join('').replace(/#/g,'_'+d).replace(/%/g,'cke_dialog_')),f=e.getChild([0,0,0,0,0]),g=f.getChild(0),h=f.getChild(1);g.unselectable();h.unselectable();return{element:e,parts:{dialog:e.getChild(0),title:g,close:h,tabs:f.getChild(2),contents:f.getChild([3,0,0,0]),footer:f.getChild([3,0,1,0])}};},destroy:function(c){var d=c.container,e=c.element;if(d){d.clearCustomData();d.remove();}if(e){e.clearCustomData();c.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&e.show();delete c.element;}}};})());CKEDITOR.editor.prototype.getThemeSpace=function(a){var b='cke_'+a,c=this._[b]||(this._[b]=CKEDITOR.document.getById(b+'_'+this.name));return c;};CKEDITOR.editor.prototype.resize=function(a,b,c,d){var e=this.container,f=CKEDITOR.document.getById('cke_contents_'+this.name),g=d?e.getChild(1):e;
-CKEDITOR.env.webkit&&g.setStyle('display','none');g.setSize('width',a,true);if(CKEDITOR.env.webkit){g.$.offsetWidth;g.setStyle('display','');}var h=c?0:(g.$.offsetHeight||0)-(f.$.clientHeight||0);f.setStyle('height',Math.max(b-h,0)+'px');this.fire('resize');};CKEDITOR.editor.prototype.getResizable=function(a){return a?CKEDITOR.document.getById('cke_contents_'+this.name):this.container;};
+r.getChild([1,0,0,0,0]).unselectable();r.getChild([1,0,0,0,2]).unselectable();if(g==CKEDITOR.ELEMENT_MODE_REPLACE)r.insertAfter(f);else f.append(r);c.container=r;r.disableContextMenu();c.on('contentDirChanged',function(s){var t=(c.lang.dir!=s.data?'add':'remove')+'Class';r.getChild(1)[t]('cke_mixed_dir_content');var u=this.sharedSpaces&&this.sharedSpaces[this.config.toolbarLocation];u&&u.getParent().getParent()[t]('cke_mixed_dir_content');});c.fireOnce('themeLoaded');c.fireOnce('uiReady');},buildDialog:function(c){var d=CKEDITOR.tools.getNextNumber(),e=CKEDITOR.dom.element.createFromHtml(['<div class="',c.id,'_dialog cke_editor_',c.name.replace('.','\\.'),'_dialog cke_skin_',c.skinName,'" dir="',c.lang.dir,'" lang="',c.langCode,'" role="dialog" aria-labelledby="%title#"><table class="cke_dialog',' '+CKEDITOR.env.cssClass,' cke_',c.lang.dir,'" style="position:absolute" role="presentation"><tr><td role="presentation"><div class="%body" role="presentation"><div id="%title#" class="%title" role="presentation"></div><a id="%close_button#" class="%close_button" href="javascript:void(0)" title="'+c.lang.common.close+'" role="button"><span class="cke_label">X</span></a>'+'<div id="%tabs#" class="%tabs" role="tablist"></div>'+'<table class="%contents" role="presentation">'+'<tr>'+'<td id="%contents#" class="%contents" role="presentation"></td>'+'</tr>'+'<tr>'+'<td id="%footer#" class="%footer" role="presentation"></td>'+'</tr>'+'</table>'+'</div>'+'<div id="%tl#" class="%tl"></div>'+'<div id="%tc#" class="%tc"></div>'+'<div id="%tr#" class="%tr"></div>'+'<div id="%ml#" class="%ml"></div>'+'<div id="%mr#" class="%mr"></div>'+'<div id="%bl#" class="%bl"></div>'+'<div id="%bc#" class="%bc"></div>'+'<div id="%br#" class="%br"></div>'+'</td></tr>'+'</table>',CKEDITOR.env.ie?'':'<style>.cke_dialog{visibility:hidden;}</style>','</div>'].join('').replace(/#/g,'_'+d).replace(/%/g,'cke_dialog_')),f=e.getChild([0,0,0,0,0]),g=f.getChild(0),h=f.getChild(1);if(CKEDITOR.env.ie&&!CKEDITOR.env.ie6Compat){var i=CKEDITOR.env.isCustomDomain(),j='javascript:void(function(){'+encodeURIComponent('document.open();'+(i?'document.domain="'+document.domain+'";':'')+'document.close();')+'}())',k=CKEDITOR.dom.element.createFromHtml('<iframe frameBorder="0" class="cke_iframe_shim" src="'+j+'"'+' tabIndex="-1"'+'></iframe>');k.appendTo(f.getParent());}g.unselectable();h.unselectable();return{element:e,parts:{dialog:e.getChild(0),title:g,close:h,tabs:f.getChild(2),contents:f.getChild([3,0,0,0]),footer:f.getChild([3,0,1,0])}};
+},destroy:function(c){var d=c.container,e=c.element;if(d){d.clearCustomData();d.remove();}if(e){e.clearCustomData();c.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&e.show();delete c.element;}}};})());CKEDITOR.editor.prototype.getThemeSpace=function(a){var b='cke_'+a,c=this._[b]||(this._[b]=CKEDITOR.document.getById(b+'_'+this.name));return c;};CKEDITOR.editor.prototype.resize=function(a,b,c,d){var j=this;var e=j.container,f=CKEDITOR.document.getById('cke_contents_'+j.name),g=CKEDITOR.env.webkit&&j.document&&j.document.getWindow().$.frameElement,h=d?e.getChild(1):e;h.setSize('width',a,true);g&&(g.style.width='1%');var i=c?0:(h.$.offsetHeight||0)-(f.$.clientHeight||0);f.setStyle('height',Math.max(b-i,0)+'px');g&&(g.style.width='100%');j.fire('resize');};CKEDITOR.editor.prototype.getResizable=function(a){return a?CKEDITOR.document.getById('cke_contents_'+this.name):this.container;};
diff --git a/appsrc/ODS-Framework/common.css b/appsrc/ODS-Framework/common.css
index 673fd2e..4bbc1f5 100644
--- a/appsrc/ODS-Framework/common.css
+++ b/appsrc/ODS-Framework/common.css
@@ -1,10 +1,10 @@
/*
- * $Id: common.css,v 1.1.4.3 2011/05/16 08:53:55 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -21,6 +21,43 @@
*
*/
+/* 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%;
@@ -43,7 +80,7 @@ table.ODS_grid tbody tr:nth-child(even) {
}
table.ODS_grid thead tr th {
- height: 18px;
+ height: 20px;
text-align: left !important;
white-space: nowrap;
padding: 0px 2px 1px 2px !important;
@@ -61,6 +98,11 @@ 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;
@@ -112,6 +154,7 @@ table.ANN_grid tr td {
border-color: #7f94a5;
background: #99b3c5;
cursor: pointer;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
@@ -173,6 +216,7 @@ td.calendar_selected {
}
.oat_winrect_container {
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
@@ -186,3 +230,138 @@ 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;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ -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;
+}
+
+table.ODS_formList tbody tr:nth-child(odd) {
+ background-color:#fff;
+}
+
+table.ODS_formList tbody tr:nth-child(even) {
+ background-color:#f0f0f0;
+}
+
+/* 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 def7fb8..5dd11b2 100644
--- a/appsrc/ODS-Framework/common.js
+++ b/appsrc/ODS-Framework/common.js
@@ -1,10 +1,10 @@
/*
- * $Id: common.js,v 1.13.2.43 2011/08/01 14:14:20 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -570,6 +570,25 @@ 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 61d7ce3..56df8a3 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.1 2010/09/20 10:15:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/app_inst_menu.xsl b/appsrc/ODS-Framework/comp/app_inst_menu.xsl
index cbc3ce0..13fbaca 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.1 2010/09/20 10:15:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/app_search.xsl b/appsrc/ODS-Framework/comp/app_search.xsl
index 4c1a3f1..b5207f8 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.1 2010/09/20 10:15:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/apps.xsl b/appsrc/ODS-Framework/comp/apps.xsl
index 76c1754..6a8aabb 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.1 2010/09/20 10:15:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/check.xsl b/appsrc/ODS-Framework/comp/check.xsl
index 3004b50..9daed80 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.1 2010/09/20 10:15:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/check_register.xsl b/appsrc/ODS-Framework/comp/check_register.xsl
index b9dc2c7..c3ac154 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.1 2010/09/20 10:15:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/dashboard.xsl b/appsrc/ODS-Framework/comp/dashboard.xsl
index 94c9ca7..e353617 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.9 2011/07/04 10:04:38 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1399,7 +1399,7 @@
function generateDSLinks()
{
- OAT.Preferences.stylePath = '/ods/';
+ OAT.Preferences.stylePath = '/ods/oat/styles/';
OAT.Anchor.imagePath = '/ods/images/oat/';
OAT.Anchor.zIndex = 1001;
@@ -2405,16 +2405,10 @@
</div>
<div class="w_pane content_pane">
<?vsp
-
declare q_str, rc, dta, h any;
- 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);
+ 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);
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 5d72982..cd2e8f9 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.2 2010/09/20 10:15:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/dav_browser.xsl b/appsrc/ODS-Framework/comp/dav_browser.xsl
index 912f84f..e41685d 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.1 2010/09/20 10:15:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/help.xml b/appsrc/ODS-Framework/comp/help.xml
index 3189422..40295aa 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.1 2010/09/20 10:15:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/help.xsl b/appsrc/ODS-Framework/comp/help.xsl
index 668931b..1c58713 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.1 2010/09/20 10:15:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/home.xsl b/appsrc/ODS-Framework/comp/home.xsl
index 581e7fe..ec15aee 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.6 2010/12/20 12:27:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/inst.xsl b/appsrc/ODS-Framework/comp/inst.xsl
index 0b6718e..0c7813b 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.3 2010/11/11 12:38:19 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/login.xsl b/appsrc/ODS-Framework/comp/login.xsl
index 43e4d34..05c2c98 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.10 2011/08/01 14:14:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -62,7 +62,7 @@
<td valign="top">
<div id="lf" class="form">
<div class="header">
- Identify Yourself <img id="lf_throbber" src="/ods/images/oat/Ajax_throbber.gif" style="float: right; margin-right: 10px; display: none" />
+ Please 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 8578e12..870939f 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.1 2010/09/20 10:15:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/map_control.js b/appsrc/ODS-Framework/comp/map_control.js
index e64ccbb..bf23a01 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.1 2010/09/20 10:15:33 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/comp/map_control.xsl b/appsrc/ODS-Framework/comp/map_control.xsl
index 520a47e..4147bb7 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.3 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/members.xsl b/appsrc/ODS-Framework/comp/members.xsl
index 61c0c19..781fc0b 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.1 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/membership.xsl b/appsrc/ODS-Framework/comp/membership.xsl
index 0cc7a03..05c3103 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.1 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/ods_bar.xsl b/appsrc/ODS-Framework/comp/ods_bar.xsl
index 616f378..f794873 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.12 2011/03/08 13:28:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -236,11 +236,9 @@ 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.Preferences.stylePath="<?V self.odsbar_ods_gpath ?>oat/styles/";
OAT.Style.include('winrect.css');
-
if (typeof ODSInitArray != 'undefined')
{
for (var i = 0; i < ODSInitArray.length; i++)
@@ -442,7 +440,7 @@ function showSSLLink()
url="--self.odsbar_ods_gpath||'help.vspx'"
xhtml_target="_blank"
is-local="1"/>
- <span id="span_ssl_link"> </span>
+ <span id="span_ssl_link"> </span>
<script type="text/javascript">
<![CDATA[
ODSInitArray.push(function(){OAT.Loader.load(["ajax", "json"], function(){showSSLLink();});});
@@ -590,7 +588,7 @@ function showSSLLink()
</div><!-- HD-ODS-BAR -->
</div>
- <p style="font-size: 1pt;margin: 0;padding: 0;" id="ods_bar_sep"> </p>
+ <p style="font-size: 1pt;margin: 0;padding: 0;" id="ods_bar_sep"> </p>
<script type="text/javascript">
<![CDATA[
@@ -1020,7 +1018,7 @@ if(coalesce(self.odsbar_app_type,get_keyword ('app_type', self.odsbar_inout_arr)
<xsl:template match="vm:odsbar_navigation_level2">
<ul id="ods_bar_second_lvl">
<vm:odsbar_instances_menu/>
- <li> </li>
+ <li> </li>
</ul>
</xsl:template>
diff --git a/appsrc/ODS-Framework/comp/page.xsl b/appsrc/ODS-Framework/comp/page.xsl
index f2d89cd..62a9d3b 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.18 2011/05/02 14:16:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/register.xsl b/appsrc/ODS-Framework/comp/register.xsl
index 88ebd9a..effb9b8 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.19 2011/08/01 14:14:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/render.xsl b/appsrc/ODS-Framework/comp/render.xsl
index 5cb52b7..66b2fdd 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.1 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/rss2atom.xsl b/appsrc/ODS-Framework/comp/rss2atom.xsl
index 3a1b0e5..335ab15 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.1 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/rss2rdf.xsl b/appsrc/ODS-Framework/comp/rss2rdf.xsl
index 83fedad..8b7da5f 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.1 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/rss2xbel.xsl b/appsrc/ODS-Framework/comp/rss2xbel.xsl
index d36cf89..4fc1d71 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.1 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/services.xsl b/appsrc/ODS-Framework/comp/services.xsl
index db9479e..770e2f5 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.2 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/settings.xsl b/appsrc/ODS-Framework/comp/settings.xsl
index 7f56644..bce5315 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.1 2010/09/20 10:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -599,7 +599,7 @@
self.reglastname.ufl_failed := 1;
}
if(length(self.reguid.ufl_value) < 1 or length(self.reguid.ufl_value) > 20) {
- self.reguid.ufl_error := 'Login name cannot be empty or longer then 20 chars';
+ self.reguid.ufl_error := 'Login name cannot be empty or longer than 20 chars';
self.vc_is_valid := 0;
self.reguid.ufl_failed := 1;
}
diff --git a/appsrc/ODS-Framework/comp/site_home.xsl b/appsrc/ODS-Framework/comp/site_home.xsl
index 03bfb0f..009a610 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.1 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/store.xsl b/appsrc/ODS-Framework/comp/store.xsl
index 760d25d..7be192f 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.1 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/comp/tagging.xsl b/appsrc/ODS-Framework/comp/tagging.xsl
index e60f8e7..9d4af03 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.2 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/conf.vspx b/appsrc/ODS-Framework/conf.vspx
index 5d551db..d5f331c 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.1 2010/09/20 10:15:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/conf_app.vspx b/appsrc/ODS-Framework/conf_app.vspx
index 29d9e27..f78439a 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.1 2010/09/20 10:15:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/contact.html b/appsrc/ODS-Framework/contact.html
index 9e386b3..223fc89 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.1 2010/09/20 10:15:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/dashboard.sql b/appsrc/ODS-Framework/dashboard.sql
index cf59f92..206f3be 100644
--- a/appsrc/ODS-Framework/dashboard.sql
+++ b/appsrc/ODS-Framework/dashboard.sql
@@ -1,12 +1,12 @@
--
--- $Id: dashboard.sql,v 1.13.2.3 2010/11/09 20:18:21 source Exp $
+-- $Id$
--
-- WA Dashboard support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/dav.css b/appsrc/ODS-Framework/dav.css
index 6af0a52..5718a53 100644
--- a/appsrc/ODS-Framework/dav.css
+++ b/appsrc/ODS-Framework/dav.css
@@ -1,10 +1,10 @@
/*
- * $Id: dav.css,v 1.3.2.1 2010/09/20 10:15:19 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/default.css b/appsrc/ODS-Framework/default.css
index b2907f3..5c4e29d 100644
--- a/appsrc/ODS-Framework/default.css
+++ b/appsrc/ODS-Framework/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.26.2.20 2011/08/03 11:42:29 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -863,7 +863,6 @@ div.contents {
background-color: #EFEFEF;
border: 1px solid #7F94A5;
padding: 0.5em;
- margin-top: -1px;
}
/* ComboList */
@@ -925,6 +924,7 @@ td.calendar_selected {
a.img_button {
background: none repeat scroll 0 0 #99B3C5;
border: 1px solid #7F94A5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #FFFFFF;
@@ -945,6 +945,7 @@ a.img_button img {
span.button {
background: none repeat scroll 0 0 #99B3C5;
border: 1px solid #7F94A5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #FFFFFF;
@@ -971,6 +972,7 @@ img.button {
border-color: #7f94a5;
background: #99b3c5;
cursor: pointer;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
@@ -1023,7 +1025,7 @@ table.form td {
.tabs {
margin-top: 1.5em;
list-style-type: none;
- padding-bottom: 1px;
+ padding-bottom: 0px;
padding-left: 0.5em;
}
@@ -1035,6 +1037,8 @@ table.form td {
border-top: 1px solid #aaa;
border-left: 1px solid #aaa;
border-right: 1px solid #aaa;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
diff --git a/appsrc/ODS-Framework/delete_inst.vspx b/appsrc/ODS-Framework/delete_inst.vspx
index ca9416d..47ae5df 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.1 2010/09/20 10:15:19 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -34,32 +34,35 @@
<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
{
- 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[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))
{
@@ -98,80 +101,107 @@
<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 } ?>
- <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
+ }
+ ?>
+ <?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;
- 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;
- 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;
+ connection_set ('deleteAll', self.iDeleteAll.ufl_selected);
+ 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 60b5a04..6558385 100644
--- a/appsrc/ODS-Framework/drop.sql
+++ b/appsrc/ODS-Framework/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.4.2.6 2010/09/20 10:15:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -28,6 +28,7 @@ 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 9b34c1d..5dc2564 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.1 2010/09/20 10:15:19 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/drop_sioc_trig.sql b/appsrc/ODS-Framework/drop_sioc_trig.sql
index bba8e00..6594191 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.1 2010/09/20 10:15:19 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/dropbox_access.vsp b/appsrc/ODS-Framework/dropbox_access.vsp
new file mode 100644
index 0000000..4a80595
--- /dev/null
+++ b/appsrc/ODS-Framework/dropbox_access.vsp
@@ -0,0 +1,59 @@
+<?vsp
+ declare url, sid, token, oauth_token, return_url, display_name, email varchar;
+ declare result, resultHeader, json any;
+
+ token := ODS.ODS_API.get_oauth_tok ('Dropbox API');
+ if ({?'oauth_token'} is not null)
+ {
+ declare header, auth any;
+
+ sid := {?'sid'};
+ url := OAUTH..sign_request ('GET', 'https://api.dropbox.com/1/oauth/access_token', '', token, sid, 1);
+ -- result := http_get (url);
+ result := http_client_ext (url=>url, http_method=>'GET', headers=>resultHeader, n_redirects=>15);
+ sid := OAUTH..parse_response (sid, token, result);
+
+ url := OAUTH..sign_request ('GET', 'https://api.dropbox.com/1/account/info', '', token, sid, 1);
+ result := http_client_ext (url=>url, http_method=>'GET', headers=>resultHeader, n_redirects=>15);
+ result := subseq (ODS..json2obj(result), 2);
+ display_name := get_keyword ('display_name', result);
+ email := get_keyword ('email', result);
+ -- person := http_get (url);
+ }
+ else
+ {
+ sid := md5 (datestring (now ()));
+ return_url := sprintf ('http://%{WSHost}s%s?sid=%U', http_path(), sid);
+ url := OAUTH..sign_request ('GET', 'https://api.dropbox.com/1/oauth/request_token', '', token, null, 1);
+ result := http_client_ext (url=>url, http_method=>'GET', headers=>resultHeader, n_redirects=>15);
+ sid := OAUTH..parse_response (sid, token, result);
+
+ OAUTH..set_session_data (sid, params);
+ oauth_token := OAUTH..get_auth_token (sid);
+ url := sprintf ('https://www.dropbox.com/1/oauth/authorize?oauth_token=%U&oauth_callback=%U', oauth_token, return_url);
+ http_status_set (302);
+ http_header (sprintf ('Location: %s\r\n', url));
+ return;
+ }
+?>
+<html>
+ <head>
+ </head>
+ <body>
+ <?vsp
+ if ({?'sid'} is not null)
+ {
+ ?>
+ <script type="text/javascript">
+ if (window.opener && window.opener.open && !window.opener.closed) {
+ window.opener.ODRIVE.dropboxParams('<?V sid ?>', '<?V display_name ?>', '<?V email ?>');
+ } else {
+ alert ('Opener not found');
+ }
+ window.close();
+ </script>
+ <?vsp
+ }
+ ?>
+ </body>
+</html>
diff --git a/appsrc/ODS-Framework/edit_inst.vspx b/appsrc/ODS-Framework/edit_inst.vspx
index 3ed11d8..5d9933e 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.2 2010/09/20 10:15:19 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -231,7 +231,7 @@
};
update WA_INSTANCE
- set WAI_MEMBER_MODEL = self.imodel1.ufl_value,
+ set WAI_MEMBER_MODEL = atoi (self.imodel1.ufl_value),
WAI_IS_PUBLIC = self.is_public,
WAI_MEMBERS_VISIBLE = self.is_visible,
WAI_INST = inst,
diff --git a/appsrc/ODS-Framework/edit_interests_popup.vspx b/appsrc/ODS-Framework/edit_interests_popup.vspx
index e8b7c48..2c77e71 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.1 2010/09/20 10:15:19 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/edit_rule.vspx b/appsrc/ODS-Framework/edit_rule.vspx
index 1da184a..240de40 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.1 2010/09/20 10:15:19 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/error.vspx b/appsrc/ODS-Framework/error.vspx
index 7e72df3..a7820f1 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.1 2010/09/20 10:15:19 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/facebook.sql b/appsrc/ODS-Framework/facebook.sql
index b5954b8..c90c934 100644
--- a/appsrc/ODS-Framework/facebook.sql
+++ b/appsrc/ODS-Framework/facebook.sql
@@ -1,10 +1,10 @@
--
--- $Id: facebook.sql,v 1.14.2.8 2011/05/02 14:16:01 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -186,8 +186,9 @@ create method post_request(
post_string:=string_output_string(aResult);
declare ret_header, rq_header any;
- rq_header := 'Content-type: application/x-www-form-urlencoded \r\nUser-Agent: Facebook API VSP Client 1.1';
+ 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 ec0487a..04d16f4 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.1 2010/09/20 10:15:20 source Exp $
+-- $Id$
--
-- AJAX Handler for the google map control
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/faq.html b/appsrc/ODS-Framework/faq.html
index 5dda372..f5b020d 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/fb_front.vspx b/appsrc/ODS-Framework/fb_front.vspx
index c102b5b..6e0db24 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.8 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/fb_popup.vspx b/appsrc/ODS-Framework/fb_popup.vspx
index a6e82c1..a78de6e 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/foaf.xml b/appsrc/ODS-Framework/foaf.xml
index a75c1ed..c38eb77 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/foaf.xsl b/appsrc/ODS-Framework/foaf.xsl
index cea3066..35876c9 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/freeze.vspx b/appsrc/ODS-Framework/freeze.vspx
index cf08978..dafe21e 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/gdata.sql b/appsrc/ODS-Framework/gdata.sql
index 57e2a76..0c3c8ee 100644
--- a/appsrc/ODS-Framework/gdata.sql
+++ b/appsrc/ODS-Framework/gdata.sql
@@ -1,13 +1,13 @@
--
--
--- $Id: gdata.sql,v 1.36.2.1 2010/09/20 10:15:20 source Exp $
+-- $Id$
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/generic.vspx b/appsrc/ODS-Framework/generic.vspx
index 5b2428b..c351016 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/get_tags_popup.vspx b/appsrc/ODS-Framework/get_tags_popup.vspx
index 133448c..f54af0b 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/google_access.vsp b/appsrc/ODS-Framework/google_access.vsp
new file mode 100644
index 0000000..bd7daeb
--- /dev/null
+++ b/appsrc/ODS-Framework/google_access.vsp
@@ -0,0 +1,45 @@
+<?vsp
+ declare _params, _client_id, _client_secret, _return_url, _code, _url, _reqHeader, _retHeader, _body, _retValue, _json, _xml any;
+ declare _display_name, _email varchar;
+
+ _code := get_keyword ('code', params, '');
+ _json := '{\"error\" : \"invalid_request\"}';
+ if (_code <> '')
+ {
+ _client_id := (select a_key from OAUTH..APP_REG where a_name = 'Google API' and a_owner = 0);
+ _client_secret := (select a_secret from OAUTH..APP_REG where a_name = 'Google API' and a_owner = 0);
+ _return_url := sprintf ('http://%{WSHost}s/ods/google_access.vsp', http_path());
+ _url := 'https://accounts.google.com/o/oauth2/token';
+ _reqHeader := 'Content-Type: application/x-www-form-urlencoded\r\n';
+ _body := sprintf ('code=%U&client_id=%U&client_secret=%U&redirect_uri=%U&grant_type=%U', _code, _client_id, _client_secret, _return_url, 'authorization_code');
+ _retValue := http_client (url=>_url, http_method=>'POST', http_headers=>_reqHeader, body=>_body, n_redirects=>15);
+ _json := replace (_retValue, '\n', '\\n');
+
+ -- get owner info
+ _params := subseq (ODS..json2obj (_retValue), 2);
+ _url := sprintf ('https://docs.google.com/feeds/default/private/full/%U/contents/-/folder', 'folder:root');
+ _reqHeader := sprintf ('GData-Version: 3.0\r\nAuthorization: %s %s\r\n', get_keyword ('token_type', _params), get_keyword ('access_token', _params));
+ _retHeader := null;
+ _retValue := http_client_ext (url=>_url, http_method=>'GET', http_headers=>_reqHeader, headers =>_retHeader, n_redirects=>15);
+ if (not ((_retHeader[0] like 'HTTP/1._ 4__ %') or (_retHeader[0] like 'HTTP/1._ 5__ %')))
+ {
+ _xml := xtree_doc (_retValue);
+ _display_name := cast (xpath_eval ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] /feed/author/name', _xml) as varchar);
+ _email := cast (xpath_eval ('[ xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" ] /feed/author/email', _xml) as varchar);
+ }
+ }
+?>
+<html>
+ <head>
+ </head>
+ <body>
+ <script type="text/javascript">
+ if (window.opener && window.opener.open && !window.opener.closed) {
+ window.opener.ODRIVE.oauthParams('<?vsp http (_json); ?>', '<?V _display_name ?>', '<?V _email ?>');
+ } else {
+ alert ('Opener not found');
+ }
+ window.close();
+ </script>
+ </body>
+</html>
diff --git a/appsrc/ODS-Framework/gtags.vspx b/appsrc/ODS-Framework/gtags.vspx
index 27871e5..870c298 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/help.vspx b/appsrc/ODS-Framework/help.vspx
index 5e97707..13131c5 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.1 2010/09/20 10:15:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/home.vspx b/appsrc/ODS-Framework/home.vspx
index d84c5d9..e1dd2ab 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.2 2010/09/20 10:15:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/home.xsl b/appsrc/ODS-Framework/home.xsl
index 67913da..2babea7 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.1 2010/09/20 10:15:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/hosted_services.sql b/appsrc/ODS-Framework/hosted_services.sql
index e0eac68..bea0edf 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.44 2011/08/01 14:14:20 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -485,6 +485,21 @@ wa_member_upgrade()
drop procedure wa_member_upgrade
;
+create procedure wa_instance_upgrade() {
+
+ if (registry_get ('__wa_instance_upgrade') = 'done2')
+ 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', 'done2');
+}
+;
+
+wa_instance_upgrade()
+;
+drop procedure wa_instance_upgrade
+;
+
wa_exec_no_error(
'CREATE TABLE WA_MEMBER_INSTCOUNT
@@ -577,11 +592,11 @@ create procedure wa_groups_acl_update () {
wa_groups_acl_update()
;
-create procedure wa_acl_params (
+create procedure wa_aci_params (
in params any)
{
- declare N, M integer;
- declare aclNo, retValue, V any;
+ declare N, M, N2, M2 integer;
+ declare aclNo, aclNo2, retValue, V, V2, T any;
M := 1;
retValue := vector ();
@@ -590,22 +605,112 @@ create procedure wa_acl_params (
if (params[N] like 's_fld_2_%')
{
aclNo := replace (params[N], 's_fld_2_', '');
+ if (aclNo = cast (atoi (replace (params[N], 's_fld_2_', '')) as varchar))
+ {
+ if (get_keyword ('s_fld_1_' || aclNo, params) = 'advanced')
+ {
+ M2 := 1;
+ T := vector ();
+ for (N2 := 0; N2 < length (params); N2 := N2 + 2)
+ {
+ if (params[N2] like (params[N] || '_fld_1_%'))
+ {
+ aclNo2 := replace (params[N2], params[N] || '_fld_1_', '');
+ V2 := vector (M2,
+ trim (get_keyword (params[N] || '_fld_1_' || aclNo2, params)),
+ trim (get_keyword (params[N] || '_fld_2_' || aclNo2, params)),
+ trim (get_keyword (params[N] || '_fld_3_' || aclNo2, params)),
+ trim (get_keyword (params[N] || '_fld_0_' || aclNo2, params, ''))
+ );
+ T := vector_concat (T, vector (V2));
+ M2 := M2 + 1;
+ }
+ }
+ if (length (T) = 0)
+ goto _skip;
+ }
+ else
+ {
+ T := trim (params[N+1]);
+ if (is_empty_or_null (T))
+ goto _skip;
+ }
V := vector (M,
- trim (params[N+1]),
- get_keyword ('s_fld_1_' || aclNo, params, 'person'),
+ T,
+ get_keyword ('s_fld_1_' || aclNo, params),
atoi (get_keyword ('s_fld_3_' || aclNo || '_r', params, '0')),
atoi (get_keyword ('s_fld_3_' || aclNo || '_w', params, '0')),
atoi (get_keyword ('s_fld_3_' || aclNo || '_x', params, '0'))
);
retValue := vector_concat (retValue, vector (V));
M := M + 1;
+ _skip:;
+ }
}
}
return retValue;
}
;
+create procedure wa_aci_lines (
+ in _acl any,
+ in _mode varchar := 'view',
+ in _execute varchar := 'false')
+{
+ declare N integer;
+
+ for (N := 0; N < length (_acl); N := N + 1)
+ {
+ if (_mode <> 'view')
+ {
+ http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", value: %s, readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], execute: \'%s\', tdCssText: "width: 1%%; text-align: center;"}});});', _acl[N][2], ODS..obj2json (_acl[N][1]), case when _acl[N][2] = 'public' then 'true' else 'false' end, case when _acl[N][2] = 'public' then 'display: none;' else '' end, _acl[N][3], _acl[N][4], _acl[N][5], _execute));
+ } else {
+ http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {mode: 51, value: %s}, fld_3: {mode: 52, value: [%d, %d, %d], execute: \'%s\', tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', _acl[N][2], ODS..obj2json (_acl[N][1]), _acl[N][3], _acl[N][4], _acl[N][5], _execute));
+ }
+ }
+}
+;
+
wa_exec_no_error_log(
+'create table WA_PRIVATE_GRAPHS
+ (
+ WAPG_GRAPH varchar,
+ WAPG_TYPE varchar,
+ WAPG_ID any,
+ WAPG_ID2 any,
+
+ primary key (WAPG_GRAPH, WAPG_TYPE, WAPG_ID, WAPG_ID2)
+ )'
+)
+;
+
+create procedure wa_private_graph_add (
+ in _graph varchar,
+ in _type varchar,
+ in _id any,
+ in _id2 any := 0)
+{
+ insert soft WA_PRIVATE_GRAPHS (WAPG_GRAPH, WAPG_TYPE, WAPG_ID, WAPG_ID2)
+ values (_graph, _type, _id, _id2);
+}
+;
+
+create procedure wa_private_graph_remove (
+ in _graph varchar,
+ in _type varchar,
+ in _id any,
+ in _id2 any := 0)
+{
+ delete
+ from WA_PRIVATE_GRAPHS
+ where WAPG_GRAPH = _graph
+ and WAPG_TYPE = _type
+ and WAPG_ID = _id
+ and WAPG_ID2 = _id2;
+}
+;
+
+wa_exec_no_error_log (
'create table WA_INVITATIONS
(
WI_U_ID int, -- U_ID
@@ -1732,12 +1837,24 @@ 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;
-create trigger SYS_USERS_ON_DELETE_WA_FK before delete
- on "DB"."DBA"."SYS_USERS" order 66 referencing old as O
+ 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
{
- 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')
;
@@ -2069,13 +2186,13 @@ create procedure INIT_SERVER_SETTINGS ()
'Enter your User ID and Password',
'',
'',
- 'Copyright © 1998-2011 OpenLink Software',
+ 'Copyright © 1998-2012 OpenLink Software',
'',
sys_stat ('st_host_name'),
1
);
}
- update WA_SETTINGS set WS_COPYRIGHT = 'Copyright © 1998-2011 OpenLink Software';
+ update WA_SETTINGS set WS_COPYRIGHT = 'Copyright © 1998-2012 OpenLink Software';
update WA_SETTINGS
set WS_WELCOME_MESSAGE =
@@ -3357,6 +3474,7 @@ 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)
)'
@@ -3410,6 +3528,8 @@ 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 ()
@@ -3469,6 +3589,7 @@ create unique index WA_USER_CERTS_FINGERPRINT on WA_USER_CERTS (UC_FINGERPRINT)
0);
wa_add_col ('DB.DBA.WA_USER_CERTS', 'UC_TS', 'datetime');
+wa_exec_no_error_log ('ALTER TABLE DB.DBA.WA_USER_CERTS ADD FOREIGN KEY (UC_U_ID) REFERENCES DB.DBA.SYS_USERS (U_ID) ON DELETE CASCADE');
create procedure WA_CERTS_UPGRADE ()
{
@@ -3521,6 +3642,21 @@ create procedure WA_CERTS_UPGRADE ()
WA_CERTS_UPGRADE ();
+create procedure WA_CERTS_UPGRADE ()
+{
+ if (registry_get ('WA_CERTS_UPGRADE3') = '1')
+ return;
+
+ delete
+ from WA_USER_CERTS
+ where UC_U_ID not in (select U_ID from SYS_USERS);
+
+ registry_set ('WA_CERTS_UPGRADE3', '1');
+}
+;
+
+WA_CERTS_UPGRADE ();
+
create procedure WA_MAKE_NICK (in nick varchar)
{
declare i int;
@@ -3750,17 +3886,34 @@ 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 = ODS.ODS_API."user.onlineAccounts.uri"(WUO_URL) where WUO_URI is null;
-};
+ update WA_USER_OL_ACCOUNTS set WUO_URI = WA_USER_OL_ACCOUNTS_URI (WUO_URL) where WUO_URI is null;
+}
+;
WA_USER_OL_ACCOUNTS_SET_UP ();
create procedure WA_USER_OL_ACCOUNTS_SET_UP ()
@@ -3810,6 +3963,7 @@ wa_exec_no_error_log(
)
;
wa_add_col ('DB.DBA.WA_USER_RELATED_RES', 'WUR_P_IRI', 'varchar default \'http://www.w3.org/2000/01/rdf-schema#seeAlso\'');
+wa_exec_no_error ('alter table DB.DBA.WA_USER_RELATED_RES modify primary key (WUR_U_ID, WUR_SEEALSO_IRI, WUR_P_IRI)');
wa_exec_no_error_log('create unique index WA_USER_RELATED_RES_IX1 on DB.DBA.WA_USER_RELATED_RES (WUR_ID)');
@@ -4156,7 +4310,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;
@@ -4328,6 +4482,9 @@ 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:
@@ -4393,6 +4550,35 @@ 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;
@@ -5783,15 +5969,18 @@ 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);
- 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);
+ 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);
+ }
}
registry_set ('WA_FOAF_UPGRADE', 'done');
@@ -7468,6 +7657,18 @@ 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)
{
@@ -7632,6 +7833,11 @@ 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',
@@ -7682,11 +7888,16 @@ create procedure ods_define_common_vd (in _host varchar, in _lhost varchar, in i
DB.DBA.VHOST_DEFINE (lhost=>_lhost, vhost=>_host, lpath=>'/mv', ppath=>'/DAV/VAD/wa/', is_dav=>isdav, def_page=>'mv.vsp', vsp_user=>'dba', sec=>_sec, auth_opts=>_opts);
DB.DBA.VHOST_REMOVE (vhost=>_host, lhost=>_lhost, lpath=>'/mv/data');
DB.DBA.VHOST_DEFINE (lhost=>_lhost, vhost=>_host, lpath=>'/mv/data', ppath=>'/DAV/VAD/wa/', is_dav=>isdav, def_page=>'', vsp_user=>'SPARQL', opts=>vector ('url_rewrite', 'ods_mv_rule_list_1'), sec=>_sec, auth_opts=>_opts);
- DB.DBA.URLREWRITE_CREATE_RULELIST ( 'ods_mv_rule_list_1', 1, vector ('ods_mv_rule_1'));
+
+DB.DBA.URLREWRITE_CREATE_RULELIST ( 'ods_mv_rule_list_1', 1, vector ('ods_mv_rule_1', 'ods_mv_rule_2'));
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'ods_mv_rule_1', 1, '/mv/data/(.*)\x24', vector ('par_1'), 1,
- '/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, '');
+ '/sparql?query='||ods_mv_desc()||'&format=%U',
+vector ('par_1', '*accept*'), NULL, '(.*)', 2, 303);
+
+DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'ods_mv_rule_2', 1, '/mv/data/(.*)\x24', vector ('par_1'), 1,
+'/describe/?url=http://^{URIQADefaultHost}^/mv/data/%s',
+vector ('par_1'), NULL, 'text/html', 2, 303);
if (exists (select 1 from DB.DBA.HTTP_PATH where HP_HOST = _host and HP_LISTEN_HOST = _lhost and HP_LPATH = '/DAV'))
diff --git a/appsrc/ODS-Framework/href_export.xml b/appsrc/ODS-Framework/href_export.xml
index 5f34e26..446ecfe 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.1 2010/09/20 10:15:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/image.vsp b/appsrc/ODS-Framework/image.vsp
index ed3a022..0c2221d 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.1 2010/09/20 10:15:21 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/images/yacutia_style_alt.htm b/appsrc/ODS-Framework/images/yacutia_style_alt.htm
index 5d42c52..b8c44e6 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.1 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/index.html b/appsrc/ODS-Framework/index.html
index 2e60c7b..d5bd3b7 100644
--- a/appsrc/ODS-Framework/index.html
+++ b/appsrc/ODS-Framework/index.html
@@ -26,6 +26,7 @@
<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">
@@ -423,12 +424,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">
@@ -447,17 +448,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="{connImgSRC}" style="width:40px;cursor:pointer"/>
+ <td class="image" style="width: 150px;">
+ <img src="images/profile.png" 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>
@@ -886,7 +887,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-2011 OpenLink Software<br/>
+ Copyright © 1998-2012 OpenLink Software<br/>
<a href="#">About</a> <a href="#">Privacy</a> <a href="#">FAQ</a> <a href="#">Developers</a>
</div><!-- #FT_RC -->
</div> <!-- #FT -->
@@ -1025,7 +1026,7 @@ if ((document.location.href.indexOf ('/dataspace/person/') >- 1 ||
<td valign="top">
<div id="lf" class="form">
<div class="header">
- Identify Yourself <img id="lf_throbber" src="/ods/images/oat/Ajax_throbber.gif" style="float: right; margin-right: 10px; display: none" />
+ Please 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 5c99c4d..e94dbb2 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.7 2010/09/20 10:15:21 source Exp $
+-- $Id$
--
-- AJAX Handler for the google map control
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -90,7 +90,7 @@
else
_country_code:=null;
- https := ODS..getDefaultHttps ();
+ https := ODS.ODS_API.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 b2959a2..d5d1678 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.1 2010/09/20 10:15:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/index.xsl b/appsrc/ODS-Framework/index.xsl
index 825d177..8d0f277 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.2 2010/09/20 10:15:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/index_inst.vspx b/appsrc/ODS-Framework/index_inst.vspx
index 5440bde..3e885d1 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.2 2010/09/20 10:15:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/init.sql b/appsrc/ODS-Framework/init.sql
index 0efe103..c5b2115 100644
--- a/appsrc/ODS-Framework/init.sql
+++ b/appsrc/ODS-Framework/init.sql
@@ -1,10 +1,10 @@
--
--- $Id: init.sql,v 1.5.2.1 2010/09/20 10:15:22 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/inst.vspx b/appsrc/ODS-Framework/inst.vspx
index 86e4c8d..434256a 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.1 2010/09/20 10:15:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/inst_ping.vspx b/appsrc/ODS-Framework/inst_ping.vspx
index 1763e79..e7da290 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.2 2011/03/08 13:28:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/join.vspx b/appsrc/ODS-Framework/join.vspx
index 9f886fc..9fae17b 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.1 2010/09/20 10:15:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/ldap.sql b/appsrc/ODS-Framework/ldap.sql
index 6efa54c..45a3816 100644
--- a/appsrc/ODS-Framework/ldap.sql
+++ b/appsrc/ODS-Framework/ldap.sql
@@ -1,12 +1,12 @@
--
--- $Id: ldap.sql,v 1.5.2.2 2011/03/23 12:18:30 source Exp $
+-- $Id$
--
-- OpenID protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/ldap_search.vspx b/appsrc/ODS-Framework/ldap_search.vspx
index ec533b8..6158728 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.1 2010/09/20 10:15:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/login.js b/appsrc/ODS-Framework/login.js
index 13a1951..4308aff 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-2010 OpenLink Software
+ * 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
@@ -21,6 +21,8 @@
*/
var lfTab;
+var lfHeigh = 280;
+var lsRegData;
var lfSslData;
var lfFacebookData;
var lfOptions;
@@ -29,7 +31,15 @@ var lfNotReturn = true;
var lfAttempts = 0;
var lfSslLinks = {"in": [], "up": []};
-function lfRowText(tbl, txt, txtCSSText) {
+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) {
var tr = OAT.Dom.create('tr');
var td = OAT.Dom.create('td');
td.colSpan = 2;
@@ -37,6 +47,7 @@ function lfRowText(tbl, txt, txtCSSText) {
td.innerHTML = txt;
tr.appendChild(td);
tbl.appendChild(tr);
+ if (h) {lfPaneGrow (h);}
return td;
}
@@ -97,7 +108,7 @@ function lfRowValue(tbl, label, value, leftTag) {
tbl.appendChild(tr);
}
-function lfRowImage(tbl, label, value, leftTag) {
+function lfRowImage(tbl, label, value, leftTag, h) {
if (!leftTag)
leftTag = 'th';
@@ -114,33 +125,35 @@ function lfRowImage(tbl, label, value, leftTag) {
tr.appendChild(td);
}
tbl.appendChild(tr);
+ if (h) {lfPaneGrow (h);}
}
function lfInit() {
if (!$("lf")) {return;}
lfOptrions = {onstart: lfStart, onend: lfEnd};
- var regData;
- var x = function (data) {
- try {
- regData = OAT.JSON.parse(data);
- } catch (e) { regData = {}; }
+ 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});
}
- 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 (regData.openidEnable)
+ if (lsRegData.openidEnable)
OAT.Dom.show('lf_tab_1');
lfTab.add("lf_tab_1", "lf_page_1");
lfTab.add("lf_tab_2", "lf_page_2");
- if (regData.sslEnable)
+ if (lsRegData.sslEnable)
OAT.Dom.show('lf_tab_3');
lfTab.add("lf_tab_3", "lf_page_3");
- if (regData.twitterEnable)
+ if (lsRegData.twitterEnable)
OAT.Dom.show('lf_tab_4');
lfTab.add("lf_tab_4", "lf_page_4");
- if (regData.linkedinEnable)
+ if (lsRegData.linkedinEnable)
OAT.Dom.show('lf_tab_5');
lfTab.add("lf_tab_5", "lf_page_5");
lfTab.go(0);
@@ -164,7 +177,7 @@ function lfInit() {
}
}
- if (regData.facebookEnable) {
+ if (lsRegData.facebookEnable) {
lfLoadFacebookData(function() {
if (lfFacebookData)
FB.init(lfFacebookData.api_key, "/ods/fb_dummy.vsp", {
@@ -178,22 +191,23 @@ function lfInit() {
});
}
- 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');
+ 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");
lfRowValue(tbl, 'WebID', lfSslData.iri);
if (lfSslData.depiction)
- lfRowImage(tbl, 'Photo', lfSslData.depiction);
+ lfRowImage(tbl, 'Photo', lfSslData.depiction, null, 150);
if (lfSslData.loginName)
lfRowValue(tbl, 'Login Name', lfSslData.loginName);
@@ -208,30 +222,36 @@ 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;');
+ var td = lfRowText(tbl, 'Sign up for an ODS account using your existing WebID - ', 'font-weight: bold;', 17);
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:') {
- OAT.AJAX.GET('/ods/api/user.getFOAFSSLData?sslFOAFCheck=1', '', x);
+ if (!lfSslData) {
+ OAT.AJAX.GET('/ods/api/user.getFOAFSSLData?sslFOAFCheck=1', '', x1);
+ } else {
+ x1();
+ }
} 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;');
+ var td = lfRowText(tbl, 'Have you registered WebID? Sign in with it - ', 'font-weight: bold;', 17);
lfRowButton(td, 'sign_in_2');
- var td2 = lfRowText(tbl, 'Sign up for an ODS account using your existing WebID - ', 'font-weight: bold;');
+ var td2 = lfRowText(tbl, 'Sign up for an ODS account using your existing WebID - ', 'font-weight: bold;', 17);
lfRowButton2(td2, 'sign_up_2');
}
}
}
if (document.location.protocol != 'https:')
{
- var x = function (data) {
+ var x2 = function (data) {
var o = null;
try {
o = OAT.JSON.parse(data);
@@ -249,7 +269,7 @@ function lfInit() {
links[i].href = ref + '/ods/register.vspx';
}
}
- OAT.AJAX.GET ('/ods/api/server.getInfo?info=sslPort', false, x);
+ OAT.AJAX.GET ('/ods/api/server.getInfo?info=sslPort', false, x2);
}
}
@@ -407,7 +427,7 @@ function lfOpenIdAuthenticate(prefix) {
var xml = OAT.Xml.createXmlDoc(data);
var error = OAT.Xml.xpath (xml, '//error_response', {});
if (error.length)
- showError('Invalied OpenID Server');
+ showError('Invalid 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 82275a1..6deda90 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.3 2010/09/22 13:55:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/login_keys.vspx b/appsrc/ODS-Framework/login_keys.vspx
index b96f0d6..43f03a8 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.4 2011/05/02 14:16:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -110,9 +110,14 @@
</th>
<td>
<v:select-list name="a_name" value="" xhtml_id="a_name" error-glyph="*">
+ <v:item name="Box Net API" value="Box Net API"/>
+ <v:item name="Dropbox API" value="Dropbox API"/>
<v:item name="Facebook API" value="Facebook API"/>
+ <v:item name="Google API" value="Google API"/>
<v:item name="LinkedIn API" value="LinkedIn API"/>
+ <v:item name="SkyDrive API" value="SkyDrive API"/>
<v:item name="Twitter API" value="Twitter API"/>
+ <v:item name="Windows Live API" value="Windows Live API"/>
</v:select-list>
</td>
</tr>
diff --git a/appsrc/ODS-Framework/mail.vspx b/appsrc/ODS-Framework/mail.vspx
index c4426b2..ab3a322 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.1 2010/09/20 10:15:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/mail_preview.vspx b/appsrc/ODS-Framework/mail_preview.vspx
index 0452207..3810b8c 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.1 2010/09/20 10:15:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/make_ods_vad.xml b/appsrc/ODS-Framework/make_ods_vad.xml
index c4424a5..2975471 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-2011 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2012 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.83.49">
- <prop name="Release Date" value="2011-10-28 19:37"/>
+ <version package="1.87.26">
+ <prop name="Release Date" value="2012-08-02 00:24"/>
<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.83.49');
- registry_set('_wa_build_', '2011-10-28 19:37');
+ registry_set('_wa_version_', '1.87.26');
+ registry_set('_wa_build_', '2012-08-02 00:24');
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,7 +86,6 @@
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');
@@ -99,7 +98,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 (server_https_port () is not null)
+ if (ODS.ODS_API.getDefaultHttps () is not null)
DB.DBA.wa_redefine_vhosts ();
DB.DBA.WA_USER_OL_ACCOUNTS_SET_UP ();
]]>
@@ -111,9 +110,12 @@
</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/access_box.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/access_dropbox.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/access_google.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/access_skydrive.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" 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"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/add_rule.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/admin.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
@@ -134,6 +136,7 @@
<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"/>
@@ -255,6 +258,7 @@
<file overwrite="yes" type="dav" source="data" target_uri="wa/drop.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/drop_sioc_proc.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/drop_sioc_trig.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/dropbox_access.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/edit_inst.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/edit_interests_popup.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/edit_rule.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
@@ -272,6 +276,7 @@
<file overwrite="yes" type="dav" source="data" target_uri="wa/gdata.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/generic.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/get_tags_popup.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/google_access.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/gtags.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/help.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/home.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
@@ -949,6 +954,7 @@
<file overwrite="yes" type="dav" source="data" target_uri="wa/oauth/sparql_acl.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/oauth/vad_version" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/oauth_apps.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/oauth_authorize.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/oauth_sid.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/oauth_test.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/ods-bar.css" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
@@ -1084,15 +1090,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="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="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_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"/>
@@ -1108,7 +1114,14 @@
<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 2604ef1..6abbd54 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.16 2011/06/02 12:34:01 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -60,11 +60,6 @@ else
LN="ln -fs"
RM="rm -f"
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
if [ "z$SERVER" = "z" ]
then
@@ -85,7 +80,14 @@ else
myrm=$RM
fi
-VERSION_INIT()
+
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
+
+version_init()
{
if [ $VOS -eq 1 ]
then
@@ -256,6 +258,7 @@ 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
@@ -274,7 +277,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
@@ -318,6 +321,10 @@ 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
}
@@ -337,7 +344,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-2011 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
@@ -421,7 +428,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
@@ -434,7 +441,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 (server_https_port () is not null) " >> $STICKER
+ echo " if (ODS.ODS_API.getDefaultHttps () is not null) " >> $STICKER
echo " DB.DBA.wa_redefine_vhosts (); " >> $STICKER
echo " DB.DBA.WA_USER_OL_ACCOUNTS_SET_UP (); " >> $STICKER
echo " ]]>" >> $STICKER
@@ -462,8 +469,19 @@ 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=\"dav\" source=\"data\" target_uri=\"$name\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"$perms\" makepath=\"yes\"/>" >> $STICKER
+ echo " <file overwrite=\"yes\" type=\"$TYPE\" source=\"data\" target_uri=\"$name\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"$perms\" makepath=\"yes\"/>" >> $STICKER
done
echo "</resources>" >> $STICKER
@@ -547,7 +565,7 @@ vad_create() {
STOP_SERVER
$myrm $LOGFILE 2>/dev/null
directory_clean
-VERSION_INIT
+version_init
directory_init
virtuoso_init
sticker_init
@@ -555,7 +573,6 @@ vad_create
virtuoso_shutdown
chmod 644 ods_framework_dav.vad
#chmod 644 virtuoso.trx
-directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -565,5 +582,7 @@ 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 6e16078..e0a76af 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.2 2011/03/08 13:28:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/mc.vsp b/appsrc/ODS-Framework/mc.vsp
index 3cb1ed2..158ca7a 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.2 2011/08/03 11:42:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2011 OpenLink Software
+-- 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
@@ -21,7 +21,8 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
- declare sid, mbox, digest, id, mu, rc, webid, accept, fmt any;
+ declare sid, mbox, digest, id, mu, rc, webid, accept, fmt, cb, ep any;
+
rc := 0;
accept := http_request_header_full (lines, 'Accept', '*/*');
fmt := DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (accept);
@@ -33,12 +34,32 @@
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;
- sparql insert into graph iri ('http://localhost/mv') { `iri (?:id)` foaf:primaryTopic `iri(?:webid)` . `iri(?:webid)` foaf:mbox_sha1sum ?:digest . };
+ ep := sprintf ('http://%{URIQADefaultHost}s/sparql-auth/');
+ 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;
+ }
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 2ca2972..4c85bbe 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.1 2010/09/20 10:15:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/member_edit.vspx b/appsrc/ODS-Framework/member_edit.vspx
index 9ba1494..9e125b9 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.1 2010/09/20 10:15:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/members.vspx b/appsrc/ODS-Framework/members.vspx
index 8f9fecf..8c7fc17 100644
--- a/appsrc/ODS-Framework/members.vspx
+++ b/appsrc/ODS-Framework/members.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: members.vspx,v 1.12.2.6 2010/11/11 12:38:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -32,6 +32,9 @@
<vm:page>
<vm:header>
<script type="text/javascript" src="tbl.js">;</script>
+ <script type="text/javascript" src="typeahead.js">;</script>
+ <link rel="stylesheet" type="text/css" href="typeahead.css" />
+ <link rel="stylesheet" type="text/css" href="common.css" />
<vm:title>Application Members</vm:title>
</vm:header>
<v:on-init>
@@ -46,14 +49,6 @@
{
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>
@@ -100,6 +95,7 @@
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>
@@ -730,18 +726,20 @@
<table>
<tr>
<td width="100%">
- <table id="s_tbl" class="listing" style="width: 100%;" cellspacing="0">
+ <table id="s_tbl" class="ODS_grid">
<thead>
- <tr class="listing_header_row">
- <th width="1%" nowrap="nowrap">Access Type</th>
- <th nowrap="nowrap">WebID</th>
- <th width="1%" align="center" nowrap="nowrap">ACL: (R)ead, (W)rite</th>
- <th width="1%">Action</th>
+ <tr>
+ <th width="15%">Type</th>
+ <th>Value</th>
+ <th width="1%" nowrap="nowrap">ACL: (R)ead, (W)rite</th>
+ <th class="action">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
<tr id="s_tr_no"><td colspan="4"><b>No WebID Security</b></td></tr>
<![CDATA[
<script type="text/javascript">
+ OAT.Loader.load(["ajax", "json", "calendar"]);
<?vsp
declare N integer;
@@ -750,11 +748,12 @@
for (N := 0; N < length (self.iacl); N := N + 1)
{
- http (sprintf ('ODSInitArray.push(function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, className: "_validate_ _webid_", value: "%s", readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', self.iacl[N][2], self.iacl[N][1], case when self.iacl[N][2] = 'public' then 'true' else 'false' end, case when self.iacl[N][2] = 'public' then 'display: none;' else '' end, self.iacl[N][3], self.iacl[N][4], self.iacl[N][5]));
+ http (sprintf ('ODSInitArray.push(function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, className: "_validate_ _webid_", value: %s, readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', self.iacl[N][2], ODS..obj2json (self.iacl[N][1]), case when self.iacl[N][2] = 'public' then 'true' else 'false' end, case when self.iacl[N][2] = 'public' then 'display: none;' else '' end, self.iacl[N][3], self.iacl[N][4], self.iacl[N][5]));
}
?>
</script>
]]>
+ </tbody>
</table>
</td>
<td valign="top" nowrap="nowrap">
@@ -765,7 +764,7 @@
<v:button name="btn_acl_update" action="simple" value="Update" xhtml_class="form-button">
<v:on-post>
<![CDATA[
- self.iacl := DB.DBA.wa_acl_params (e.ve_params);
+ self.iacl := DB.DBA.wa_aci_params (e.ve_params);
update DB.DBA.WA_INSTANCE
set WAI_ACL = serialize (self.iacl)
where WAI_ID = self.iid;
diff --git a/appsrc/ODS-Framework/members_inv.vspx b/appsrc/ODS-Framework/members_inv.vspx
index a25aa9f..2b302dc 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.1 2010/09/20 10:15:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/moat_ruleset_tags.vspx b/appsrc/ODS-Framework/moat_ruleset_tags.vspx
index 0a8f2ca..2bf6f69 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.1 2010/09/20 10:15:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/moat_tags.vspx b/appsrc/ODS-Framework/moat_tags.vspx
index 89fb0f5..dc2ae1f 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.1 2010/09/20 10:15:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/mv.vsp b/appsrc/ODS-Framework/mv.vsp
index 343b5fb..4cbabae 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.2 2011/08/03 11:42:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2011 OpenLink Software
+-- 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
@@ -23,19 +23,24 @@
declare ms int;
ms := 0;
- http_rewrite ();
+ http_rewrite ();
if (length ({?'mbox'}))
{
- declare mbox, digest, id, mu, https, sender, sid, accept, fmt any;
+ declare mbox, digest, id, mu, https, sender, sid, accept, fmt, cb any;
accept := http_request_header_full (lines, 'Accept', '*/*');
- fmt := DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (accept);
+ fmt := {?'format'};
+ if (length (fmt) = 0)
+ {
+ fmt := DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (accept);
+ }
if (fmt = 'application/json')
http_header ('Content-Type: application/json\r\n');
- mbox := {?'mbox'};
- https := ODS..getDefaultHttps ();
- sender := (select U_E_MAIL from SYS_USERS where U_NAME = 'dav');
+ mbox := {?'mbox'};
+ cb := {?'cb'};
+ https := ODS.ODS_API.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) values (sid, 'mv', mbox, now ());
+ insert into VSPX_SESSION (VS_SID, VS_REALM, VS_UID, VS_EXPIRY, VS_STATE) values (sid, 'mv', mbox, now (), serialize (vector ('callback', cb)));
declare exit handler for sqlstate '*'
{
if (fmt = 'application/json')
@@ -47,7 +52,7 @@
goto error;
};
smtp_send (null, sender, mbox,
- 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));
+ 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));
ms := 1;
if (fmt = 'application/json')
{
@@ -64,19 +69,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 dca5edd..238b476 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.3 2010/09/20 10:15:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/nav_framework.css b/appsrc/ODS-Framework/nav_framework.css
index a911aeb..f3ab88a 100644
--- a/appsrc/ODS-Framework/nav_framework.css
+++ b/appsrc/ODS-Framework/nav_framework.css
@@ -1095,37 +1095,6 @@ 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 4b629b1..bb58da0 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-2010 OpenLink Software
+ * 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
@@ -55,12 +55,9 @@ 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) {
@@ -211,7 +208,7 @@ function inverseSelected(parentDiv) {
}
OAT.Preferences.imagePath = "/ods/images/oat/";
-OAT.Preferences.stylePath = "/ods/";
+OAT.Preferences.stylePath = "/ods/oat/styles/";
window.ODS = {};
@@ -1099,7 +1096,7 @@ ODS.Nav = function(navOptions) {
}, 'menu_link profile_edit shortcut');
profileMenuAProfileEdit.innerHTML = 'edit';
OAT.Event.attach (profileMenuAProfileEdit, "click", function () {
- self.loadVspx (self.expandURL (self.ods + 'uiedit.vspx'));
+ self.loadCheckedVspx(self.expandURL(self.ods + 'uiedit.vspx'));
});
if (self.session.userName)
@@ -1235,11 +1232,9 @@ ODS.Nav = function(navOptions) {
var messagesMenu = new OAT.Menu ();
messagesMenu.noCloseFilter = 'menu_separator';
-
messagesMenu.createFromUL ("messages_menu");
- OAT.Style.include ('dock.css');
-
+ OAT.Style.include(location.protocol + '//' + location.host + '/ods/dock.css');
OAT.Dom.show ($('messages_menu').parentNode);
OAT.Loader.load( [ "dock" ], function() {
@@ -1873,7 +1868,7 @@ ODS.Nav = function(navOptions) {
var aSettings = OAT.Dom.create("a", {cursor: 'pointer'});
OAT.Event.attach(aSettings, "click", function() {
- self.loadVspx (self.expandURL (self.ods + 'app_settings.vspx'));
+ self.loadCheckedVspx(self.expandURL(self.ods + 'app_settings.vspx'));
});
aSettings.innerHTML = 'Application Settings';
@@ -1881,7 +1876,7 @@ ODS.Nav = function(navOptions) {
var aSiteSettings = OAT.Dom.create("a", {cursor: 'pointer'});
OAT.Event.attach(aSiteSettings, "click", function() {
- self.loadVspx (self.expandURL (self.ods + 'site_settings.vspx'));
+ self.loadCheckedVspx(self.expandURL(self.ods + 'site_settings.vspx'));
});
aSiteSettings.innerHTML = 'Site Settings';
@@ -1947,6 +1942,8 @@ 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});
@@ -1985,6 +1982,9 @@ 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&sslLoginCheck=1', false, x);
+ OAT.AJAX.GET('/ods/api/user.getFOAFSSLData?sslFOAFCheck=1', false, x, {async: false});
}
}
@@ -2744,7 +2744,7 @@ ODS.Nav = function(navOptions) {
var connHTML = templateHtml;
- connHTML = connHTML.replace('{connImgSRC}', conn.photo.length > 0 ? conn.photo : 'images/missing_profile_picture.png'); // images/profile.png
+ connHTML = connHTML.replace('images/profile.png', conn.photo.length > 0 ? conn.photo : 'images/profile.png');
connHTML = connHTML.replace ('{connProfileFullName}', conn.fullName);
connHTML = connHTML.replace ('{sendMsg}', 'sendMsg_' + conn.uid);
connHTML = connHTML.replace ('{viewConnections}', 'viewConnections_' + conn.uid);
@@ -3020,6 +3020,7 @@ 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 />';
@@ -4005,6 +4006,18 @@ 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;
@@ -4144,7 +4157,7 @@ ODS.Nav = function(navOptions) {
if (applicationType == 'FeedManager')
applicationType = 'Feed Manager';
- if (applicationType == 'InstantMessenger')
+ else if (applicationType == 'InstantMessenger')
applicationType = 'Instant Messenger';
var data = 'sid=' + self.session.sid + '&application=' + encodeURIComponent(applicationType);
@@ -4154,7 +4167,8 @@ ODS.Nav = function(navOptions) {
if (typeof (callbackFunction) == "function")
callbackFunction (xmlDoc);
} else {
- self.wait();
+ self.session.end();
+ // 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 da6cffb..d3b5ca0 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.20 2011/05/16 08:53:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/new_inst.vspx b/appsrc/ODS-Framework/new_inst.vspx
index 481d086..5d75fc4 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.4 2010/09/20 10:15:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -335,12 +335,12 @@
}
self.ilic := self.ilic1.ufl_value;
update WA_INSTANCE
- set WAI_MEMBER_MODEL = self.imodel1.ufl_value,
+ set WAI_MEMBER_MODEL = atoi(self.imodel1.ufl_value),
WAI_IS_PUBLIC = self.is_public,
WAI_MEMBERS_VISIBLE = self.is_visible,
- WAI_NAME = self.inst.wa_name,
- WAI_DESCRIPTION = self.idesc1.ufl_value,
- WAI_LICENSE = self.ilic1.ufl_value
+ WAI_NAME = cast (self.inst.wa_name as varchar),
+ WAI_DESCRIPTION = cast (self.idesc1.ufl_value as varchar),
+ WAI_LICENSE = cast (self.ilic1.ufl_value as varchar)
where WAI_ID = id;
-- VD creation
{
diff --git a/appsrc/ODS-Framework/oauth/default.css b/appsrc/ODS-Framework/oauth/default.css
index 4dbec62..824b14e 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.1 2010/09/20 10:15:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/oauth/error.vspx b/appsrc/ODS-Framework/oauth/error.vspx
index 59ad67f..2177851 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.1 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/oauth/foaf_ssl.sql b/appsrc/ODS-Framework/oauth/foaf_ssl.sql
index 54092cc..cc1049d 100644
--- a/appsrc/ODS-Framework/oauth/foaf_ssl.sql
+++ b/appsrc/ODS-Framework/oauth/foaf_ssl.sql
@@ -1,24 +1,210 @@
-DB.DBA.EXEC_STMT ('create table FOAF_SSL_ACL (FS_URI varchar primary key, FS_UID varchar not null)', 0)
+DB.DBA.EXEC_STMT ('create table FOAF_SSL_ACL (FS_URI varchar primary key, FS_UID varchar not null, FS_TYPE int default 0)', 0)
;
-create procedure FOAF_SSL_QR (in gr varchar, in agent varchar)
+create procedure webid_add_col (in tbl varchar, in col varchar, in coltype varchar)
{
- 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;
+ 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));
+}
+;
+
+webid_add_col ('DB.DBA.FOAF_SSL_ACL', 'FS_TYPE', 'int default 0');
+
+exec_quiet ('create table SPARQL_WEBID_ACL (SWA_RULE varchar references FOAF_SSL_ACL (FS_URI) on delete cascade,
+ SWA_ID int, SWA_PROP varchar, SWA_OP varchar, SWA_VAL varchar, SWA_QUERY varchar,
+ primary key (SWA_RULE, SWA_ID))');
+
+--!
+-- \ingroup ods_devel_api
+--
+-- \brief Get the SQL user accociated with a WebID.
+--
+-- In ODS each WebID needs to be accociated with an SQL user. This method handles the
+-- mapping.
+--
+-- \param webID The WebID URI to translate to an SQL user.
+-- \param createMode If 1 a new SQL user will be created and accociated with the given
+-- WebID if it does not exist yet.
+--
+-- \return The SQL user account name accociated with the given WebID or an empty string
+-- if it does not exist and was not requested to be created.
+--
+-- FIXME: what about owl_sameAs WebIDs? What if I set a WebID as my owl:sameAs that already
+-- has an accociated SQL user?
+--/
+create procedure FOAF_WEBID_USER (
+ inout webID varchar,
+ inout createMode integer := 0)
+{
+ 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 WEBID_CERT_PROPS (in cert any)
+{
+ declare x, valid_from, valid_to, exp any;
+
+ valid_from := X509_STRING_DATE (get_certificate_info (4, cert));
+ valid_to := X509_STRING_DATE (get_certificate_info (5, cert));
+ exp := 0;
+ if (valid_to < now () or valid_from > now ())
+ exp := 1;
+ x := vector (
+ 'webIDVerified', 1,
+ 'certExpiration', exp,
+ 'certSerial', get_certificate_info (1, cert),
+ 'webID', FOAF_SSL_WEBID_GET_ALL (cert),
+ 'certMail', get_certificate_info (10, cert, 0, null, 'emailAddress'),
+ 'certSubject', get_certificate_info (2, cert),
+ 'certIssuer' , get_certificate_info (3, cert),
+ 'certStartDate', valid_from,
+ 'certEndDate', valid_to,
+ 'certDigest', get_certificate_info (6, cert),
+ 'certSparqlASK', 'query'
+ );
+ return x;
+};
+
+create procedure WEBID_GEN_ACL_PROC (in rule varchar)
+{
+ declare s, ops, op, exp any;
+ ops := vector (
+ 'eq' , '(^{value}^ = ^{pattern}^)',
+ 'neq' , '(^{value}^ <> ^{pattern}^)',
+ 'lt' , '(^{value}^ < ^{pattern}^)',
+ 'lte' , '(^{value}^ <= ^{pattern}^)',
+ 'gt' , '(^{value}^ > ^{pattern}^)',
+ 'gte' , '(^{value}^ >= ^{pattern}^)',
+ 'contains' , '(strstr (ucase (^{value}^), ucase (^{pattern}^)) is not null)',
+ 'notContains' , '(strstr (ucase (^{value}^), ucase (^{pattern}^)) is null)',
+ 'startsWith' , '(starts_with (ucase (^{value}^), ucase (^{pattern}^)))',
+ 'notStartsWith', '(not (starts_with (ucase (^{value}^), ucase (^{pattern}^))))',
+ 'endsWith' , '(ends_with (ucase (^{value}^), ucase (^{pattern}^)))',
+ 'notEndsWith' , '(not (ends_with (ucase (^{value}^), ucase (^{pattern}^))))',
+ 'isNull' , '(DB.DBA.is_empty_or_null (^{value}^) = 1)',
+ 'isNotNull' , '(DB.DBA.is_empty_or_null (^{value}^) = 0)'
+ );
+ s := string_output ();
+ http (sprintf ('create procedure "WEBID_ACL_CHECK__%s" (in cert any, in graph any) { ', rule), s);
+ http ('\n', s);
+ http (sprintf (' declare val, vals, webid, rc any;'), s);
+ http ('\n', s);
+ http (sprintf (' vals := WEBID_CERT_PROPS (cert);'), s);
+ http ('\n', s);
+ for select * from SPARQL_WEBID_ACL where SWA_RULE = rule do
+ {
+ if (SWA_PROP = 'certSparqlASK')
+ {
+ op := SWA_QUERY;
+ http (sprintf ('\n-- rule %d\n', SWA_ID), s);
+ http (sprintf (' val := get_keyword (%s, vals);', SYS_SQL_VAL_PRINT ('webID')), s);
+ http ('\n', s);
+ exp := replace (op, '^{webid}^', '?:webid');
+ exp := replace (exp, '^{graph}^', '?:graph');
+ exp := replace (exp, '^{value}^', '?:val');
+ if (strstr (op, '^{webid}^') is not null)
+ {
+ http (sprintf (' rc := 0;\n'), s);
+ http (sprintf (' foreach (any w in val) do { \n'), s);
+ http (sprintf (' webid := w;'), s);
+ http (sprintf (' if (exists (sparql %s)) rc := 1;\n', exp), s);
+ http (sprintf (' } \n'), s);
+ http (sprintf (' if (rc = 0) return 0;\n'), s);
+ }
+ else
+ {
+ http (sprintf (' if (not exists (sparql %s)) return 0;', exp), s);
+ }
+ http ('\n', s);
+ }
+ else if (SWA_PROP = 'webID')
+ {
+ http (sprintf ('\n-- rule %d\n', SWA_ID), s);
+ http (sprintf (' val := get_keyword (%s, vals);', SYS_SQL_VAL_PRINT (SWA_PROP)), s);
+ http ('\n', s);
+ op := get_keyword (SWA_OP, ops);
+ exp := replace (op, '^{value}^', 'w');
+ exp := replace (exp, '^{pattern}^', SYS_SQL_VAL_PRINT (SWA_VAL));
+ http (sprintf (' rc := 0;\n'), s);
+ http (sprintf (' foreach (any w in val) do { \n'), s);
+ http (sprintf (' if (%s) rc := 1;', exp), s);
+ http ('\n', s);
+ http (sprintf (' } \n'), s);
+ http (sprintf (' if (rc = 0) return 0;\n'), s);
+ }
+ else
+ {
+ http (sprintf ('\n-- rule %d\n', SWA_ID), s);
+ http (sprintf (' val := get_keyword (%s, vals);', SYS_SQL_VAL_PRINT (SWA_PROP)), s);
+ http ('\n', s);
+ op := get_keyword (SWA_OP, ops);
+ exp := replace (op, '^{value}^', 'val');
+ if (SWA_PROP like '%Date')
+ exp := replace (exp, '^{pattern}^', 'stringdate (' || SYS_SQL_VAL_PRINT (SWA_VAL) || ')');
+ else
+ exp := replace (exp, '^{pattern}^', SYS_SQL_VAL_PRINT (SWA_VAL));
+ http (sprintf (' if (not %s) return 0;', exp), s);
+ http ('\n', s);
+ }
+ }
+ http (sprintf (' return 1;'), s);
+ http ('\n', s);
+ http (sprintf (''), s);
+ http (sprintf ('}'), s);
+ http ('\n', s);
+ return string_output_string (s);
+}
+;
+
+
+--!
+-- \brief Create query string to fetch a certificate.
+--
+-- This method builds a query that fetches the certificates identified with a given URI.
+--
+-- \param gr The graph to query.
+-- \param uri The URI the certificates should be related to.
+--
+-- \return A query string.
+--/
+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);
+}
+;
+
+--!
+-- \brief Query string to fetch the certificate by foaf:holdsAccount instead of the WebID directly.
+--
+-- FIXME: Is this backwards-compatibility legacy stuff?
+--/
create procedure FOAF_SSL_QR_BY_ACCOUNT (in gr varchar, in agent varchar)
{
declare qr any;
@@ -30,10 +216,25 @@ 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;
}
;
+--!
+-- \ingroup ods_devel_api
+--
+-- \brief Extract the first WebID URI from a X.509 certificate.
+--
+-- \param cert An optional certificate to extract the WebID from. By default the current client-provided
+-- certificate is uses.
+-- \param cert_type The optional format of the provided certificate.
+-- - 0 (default) - PEM
+-- - 1 - DER (raw)
+-- - 2 - PKCS#12
+--
+-- \return The WebID embedded in the corresponding extension or \p null in case there is no WebID
+-- extension found in the certificate or an error occurred.
+--/
create procedure FOAF_SSL_WEBID_GET (in cert any := null, in cert_type int := 0)
{
declare agent, alts any;
@@ -50,6 +251,59 @@ create procedure FOAF_SSL_WEBID_GET (in cert any := null, in cert_type int := 0)
}
;
+--!
+-- \ingroup ods_devel_api
+--
+-- \brief Extract all WebID URIs from a X.509 certificate.
+--
+-- \param cert An optional certificate to extract the WebID from. By default the current client-provided
+-- certificate is uses.
+-- \param cert_type The optional format of the provided certificate.
+-- - 0 (default) - PEM
+-- - 1 - DER (raw)
+-- - 2 - PKCS#12
+--
+-- \return The WebIDs embedded in the corresponding extension or \p null in case there is no WebID
+-- extension found in the certificate or an error occurred.
+--/
+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;
+}
+;
+
+--!
+-- \ingroup ods_devel_api
+--
+-- \brief Extract the first EMail address from a X.509 certificate.
+--
+-- The function looks both in the ceritifacte and in the altName extension.
+--
+-- \param cert An optional certificate to extract the WebID from. By default the current client-provided
+-- certificate is uses.
+-- \param cert_type The optional format of the provided certificate.
+-- - 0 (default) - PEM
+-- - 1 - DER (raw)
+-- - 2 - PKCS#12
+--
+-- \return The EMail address embedded in the corresponding extension or \p null in case none is
+-- found in the certificate or an error occurred.
+--/
create procedure FOAF_SSL_MAIL_GET (in cert any := null, in cert_type int := 0)
{
declare alts, mail any;
@@ -68,18 +322,73 @@ create procedure FOAF_SSL_MAIL_GET (in cert any := null, in cert_type int := 0)
}
;
+--!
+-- \ingroup ods_devel_api
+--
+-- \brief Extract all EMail addresses from a X.509 certificate.
+--
+-- The function looks both in the ceritifacte and in the altName extension.
+--
+-- \param cert An optional certificate to extract the WebID from. By default the current client-provided
+-- certificate is uses.
+-- \param cert_type The optional format of the provided certificate.
+-- - 0 (default) - PEM
+-- - 1 - DER (raw)
+-- - 2 - PKCS#12
+--
+-- \return The EMail addresss embedded in the corresponding extension or \p null in case none is
+-- found in the certificate or an error occurred.
+--/
+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
---
+--
+--!
+-- \ingroup ods_devel_api
+--
+-- \brief Fetches the WebID or WebFinder address for a given certificate.
+--
+-- \param An optional certificate to extract the WebID from. By default the current client-provided
+-- certificate is uses.
+-- \param try_loading_webid If \p 1 the function looks for a WebID in the retrieved WebFinger profile
+-- and returns it instead of the WebFinger address.
+-- \param cert_type The optional format of the provided certificate.
+-- - 0 (default) - PEM
+-- - 1 - DER (raw)
+-- - 2 - PKCS#12
+--
+-- \return The WebID or the WebFinger address based on the value of try_loading_webid and the contents
+-- of the WebFinger profile which matches the given certificate. If no matching profile is found \p null
+-- is returned.
+--
+-- FIXME: Why does this function not clear the WebID graph itself?
+--/
create procedure FOAF_SSL_WEBFINGER (in cert any := null, in try_loading_webid int := 0, in cert_type int := 0)
{
- declare mail, webid, domain, host_info, xrd, template, url any;
+ declare mails, webid, domain, host_info, xrd, template, url, h any;
declare xt, xd, tmpcert any;
- mail := FOAF_SSL_MAIL_GET (cert, cert_type);
- if (mail is null)
- return null;
+ mails := FOAF_SSL_MAIL_GET_ALL (cert, cert_type);
declare exit handler for sqlstate '*'
{
@@ -87,40 +396,47 @@ create procedure FOAF_SSL_WEBFINGER (in cert any := null, in try_loading_webid i
return null;
};
- 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, ''))
+ 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
{
- webid := null;
- if (try_loading_webid)
+ x := cast (x as varchar);
+ tmpcert := http_get (x);
+ if (get_certificate_info (6, cert, cert_type, '') = get_certificate_info (6, tmpcert, 0, ''))
{
- 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;
+ 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);
}
- return coalesce (webid, 'acct:' || mail);
}
+ next_mail:;
}
return null;
}
@@ -129,24 +445,39 @@ 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);
}
;
+create procedure WEBID_AUTH (in realm varchar)
+{
+ return FOAF_SSL_AUTH_GEN (realm, 0);
+}
+;
+
+
+-- XXX: must delete, old code
create procedure WEBID_AUTH_GEN (in cert any, in ctype int, in realm varchar, in allow_nobody int := 0, in use_session int := 1)
{
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;
@@ -154,6 +485,7 @@ create procedure WEBID_AUTH_GEN (in cert any, in ctype int, in realm varchar, in
}
;
+ -- gr: temporary graph URI for the profile
gr := uuid ();
info := get_certificate_info (9, cert, ctype);
fing := get_certificate_info (6, cert, ctype);
@@ -176,23 +508,30 @@ create procedure WEBID_AUTH_GEN (in cert any, in ctype int, in realm varchar, in
if (agent is null)
return 0;
+ -- If we already have a session for the given certificate (fingerprint) use it
+ -- FIXME: security risk: in theory a WebID certificate could have been compromised in between
+ -- calls. At that point a third party could login with the old certificate key/fingerprint even
+ -- if the actual owner of the WebID had changed their certificate key in the meantime.
for select VS_UID from VSPX_SESSION where VS_SID = fing and VS_REALM = 'FOAF+SSL' do
{
connection_set ('SPARQLUserId', VS_UID);
return 1;
}
+ -- additional LDAP URI check: no need to query certificate key if succesful
if (agent like 'ldap://%' and DB.DBA.FOAF_SSL_LDAP_CHECK_CERT_INT (agent, cert, ctype, dummy))
goto authenticated;
+ -- Resolve the agent URL and remove the SSL 's' from the protocol
hf := rfc1808_parse_uri (agent);
hf[5] := '';
+
graph := DB.DBA.vspx_uri_compose (hf);
qr := sprintf ('sparql load <%S> into graph <%S>', graph, gr);
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);
@@ -205,6 +544,7 @@ create procedure WEBID_AUTH_GEN (in cert any, in ctype int, in realm varchar, in
{
declare arr, uid any;
authenticated:
+ -- FIXME: Here we could allow any WebID that is set as owl:sameAs of a known ODS WebID
uid := coalesce ((select FS_UID from FOAF_SSL_ACL where agent like FS_URI), 'nobody');
if ('nobody' = uid and allow_nobody = 0)
goto err_ret;
@@ -226,22 +566,542 @@ create procedure WEBID_AUTH_GEN (in cert any, in ctype int, in realm varchar, in
acc := 1;
goto again_check;
}
+
+ -- WebID and WebFinger authentication failed
err_ret:
+-- dbg_obj_print (stat, data);
exec (sprintf ('sparql clear graph <%S>', gr), stat, msg);
commit work;
--- dbg_obj_print (stat, data);
- return 0;
+
+-- FIXME: why is the code below not in a different method? It has nothing to do with WebID!
+ {
+ 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 (cast (h[3] as varchar), '-', '+'), '_', '/')) as varbinary));
+ ret := vector_concat (ret, vector (vector (cast (h[2] as varchar), 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_CHECK_ACL (in ag any, in gr any, in cert any)
+{
+ declare uid varchar;
+ uid := coalesce (
+ (select FS_UID from FOAF_SSL_ACL where ag like FS_URI and FS_TYPE < 2),
+ (select FS_UID from FOAF_SSL_ACL, RDF_WEBID_ACL_GROUPS where AG_GROUP = FS_URI and FS_TYPE < 2 and AG_WEBID = ag),
+ 'nobody');
+ if (uid = 'nobody')
+ {
+ for select FS_URI, FS_UID from FOAF_SSL_ACL where FS_TYPE = 2 do
+ {
+ declare pname varchar;
+ pname := sprintf ('DB.DBA.WEBID_ACL_CHECK__%s', FS_URI);
+ if (__proc_exists (pname) is null)
+ log_text (sprintf ('Broken advanced WebID rule: %s', FS_URI));
+ else if (call (pname) (cert, gr) > 0)
+ return FS_UID;
+ }
+ }
+ return uid;
+}
+;
+
+--!
+-- \brief Authenticate via WebID, WebFinger, etc.
+--
+-- \param An optional certificate to extract the WebID from. By default the current client-provided
+-- certificate is uses.
+-- \param ctype The optional format of the provided certificate.
+-- - 0 (default) - PEM
+-- - 1 - DER (raw)
+-- - 2 - PKCS#12
+-- \param realm \p unused
+-- \param allow_nobody If \p 1 authentication is also allowed for WebIDs, WebFingers, and other identifiers without an ODS account.
+-- \param use_session If \p 1 a new authentication session is created for the WebID/WebFinger. FIXME: use_session is ignored for Twitter and friends!
+-- \param ag[out] The detected WebID if any.
+-- \param _gr The graph to load the profile into. If empty a random graph URI will be used.
+-- \param check_expiration If \p 1 the expiration date of the certificate will be checked. And if not valid \0 is returned.
+-- \param validation_type[out] The type of authentication validation that was used:
+-- - 0 - WebID
+-- - 1 - WebFinger
+-- - 2 - DI digest
+-- - 3 - Twitter
+-- - 4 - FIXME: something with the OpenLink cert schema
+-- - 5 - LDAP
+--
+-- FIXME: there is no validation_type for Facebook or LinkedIn. Actually the name of the method suggests that only WebID authentication is supported. This is not the case.
+-- FIXME: Apparently SPARQLUserId is not set for DI, Twitter, Facebook, LinkedIn authentication. So either there is no need to set it in general or there is a bug or bad design.
+--
+-- \return \p 1 on successful authentication, \p 0 otherwise. On success the connection's SPARQLUserId is set to the corresponding
+-- ODS user and an optional authentication session is created.
+--
+-- FIXME: apparently WEBID_AUTH_GEN is not used and can be removed in favor of WEBID_AUTH_GEN_2.
+--/
+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, deadl int;
+ declare agents, di_arr, dgst, dhash, fing_b64u any;
+ declare valid_from, valid_to datetime;
+
+again:
+ ret_code := 0;
+ acc := 0;
+ done := 0;
+ is_di := 0;
+ ag := null;
+ deadl := 0;
+ validation_type := null;
+ declare exit handler for sqlstate '*'
+ {
+ rollback work;
+ deadl := deadl + 1;
+ if (__SQL_STATE = '40001' and deadl < 10)
+ goto again;
+ --log_message (sprintf ('webid main %s %s', cast (__SQL_STATE as varchar), cast (__SQL_MESSAGE as varchar)));
+ goto ret;
+ }
+ ;
+
+ if (cert is null and client_attr ('client_certificate') = 0)
+ return 0;
+
+ fing := get_certificate_info (6, cert, ctype);
+ if (_gr is null)
+ gr := 'http:' || replace (fing, ':', '');
+ else
+ gr := _gr;
+ info := get_certificate_info (9, 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)
+ {
+ -- If we already have a session for the given certificate (fingerprint) use it
+ -- FIXME: security risk: in theory a WebID certificate could have been compromised in between
+ -- calls. At that point a third party could login with the old certificate key/fingerprint even
+ -- if the actual owner of the WebID had changed their certificate key in the meantime.
+ for select VS_UID, VS_STATE from VSPX_SESSION where VS_SID = fing and VS_REALM = 'FOAF+SSL' do
+ {
+ declare st, uid any;
+ st := deserialize (VS_STATE);
+ ag := get_keyword ('agent', st);
+ uid := WEBID_CHECK_ACL (ag, gr, cert);
+ if (exists (select 1 from SYS_USERS where U_NAME = VS_UID) and VS_UID = uid)
+ {
+ validation_type := get_keyword ('vtype', st);
+ connection_set ('SPARQLUserId', VS_UID);
+ return 1;
+ }
+ else
+ {
+ uid := VS_UID;
+ delete from VSPX_SESSION where VS_REALM = 'FOAF+SSL' and VS_UID = uid;
+ }
+ }
+ }
+
+ 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, vector (), 0, meta, data);
+ if (stat = '40001')
+ {
+ deadl := deadl + 1;
+ goto again;
+ }
+ --if (stat <> '00000')
+ --log_message (sprintf ('webid load %s %s %s', cast (stat as varchar), cast (msg as varchar), sys_sql_val_print (data)));
+ commit work;
+ qr := FOAF_SSL_QR (gr, agent);
+ stat := '00000';
+ -- dbg_printf ('%s', qr);
+ exec (qr, stat, msg, vector (), 0, meta, data);
+ if (stat = '40001')
+ {
+ deadl := deadl + 1;
+ goto again;
+ }
+ --if (stat <> '00000')
+ --log_message (sprintf ('webid exec %s %s', cast (stat as varchar), cast (msg as varchar)));
+ 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 := WEBID_CHECK_ACL (ag, gr, cert);
+ 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);
+ if (0 = ret_code)
+ ag := null;
+ commit work;
+ return ret_code;
+}
+;
+
+--!
+-- FIXME: FOAF_SSL_AUTH_GEN seems completely redundant in favor of WEBID_AUTH_GEN_2
+--/
create procedure FOAF_SSL_AUTH_GEN (in realm varchar, in allow_nobody int := 0, in use_session int := 1)
{
- declare cert any;
+ declare cert, gr, w, vtype any;
cert := client_attr ('client_certificate');
- return WEBID_AUTH_GEN (cert, 0, realm, allow_nobody, use_session);
+ gr := null;
+ return WEBID_AUTH_GEN_2 (cert, 0, realm, allow_nobody, use_session, w, gr, 0, vtype);
}
;
+--!
+-- \ingroup ods_devel_api
+--
+-- \brief Check if a URI is a valid WebID with a certificate.
+--
+-- \param agent The URI to check.
+--
+-- \return \p 1 if the profile accessible at \p agent does contain a certificate public key.
+--/
create procedure FOAF_CHECK_WEBID (in agent varchar)
{
declare stat, msg, meta, data, info, qr, hf, graph, fing, gr any;
@@ -268,7 +1128,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);
@@ -300,6 +1160,10 @@ 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;
@@ -341,7 +1205,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);
@@ -351,11 +1215,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
{
@@ -410,7 +1274,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)
@@ -429,7 +1293,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 9fe1086..65aabea 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.2 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/oauth/make_vad.sh b/appsrc/ODS-Framework/oauth/make_vad.sh
index 0b4ab7f..ae1d085 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.4 2011/02/03 10:26:15 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -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-2011 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
@@ -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 1c22175..254c0d0 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.5 2011/05/02 14:16:04 source Exp $
+-- $Id$
--
-- OAuth protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -43,6 +43,16 @@ DB.DBA.EXEC_STMT(
'create unique index APP_REG_K1 on OAUTH..APP_REG (a_key)'
, 0);
+create procedure APP_REG_UPDATE ()
+{
+ update OAUTH..APP_REG
+ set A_NAME = 'Box Net API'
+ where A_NAME = 'Box API';
+}
+;
+
+APP_REG_UPDATE ();
+
-- OAuth sessions
DB.DBA.EXEC_STMT(
'create table OAUTH..SESSIONS (
@@ -97,6 +107,9 @@ 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 (
@@ -725,31 +738,3 @@ web_user_password_check (in name varchar, in pass varchar)
use DB;
-create procedure WA_USER_OAUTH_UPGRADE ()
-{
- declare params any;
-
- if (registry_get ('__WA_USER_OAUTH_UPGRADE') = 'done')
- return;
-
- declare exit handler for sqlstate '*' {return; };
-
- params := (select US_KEY from WA_USER_SVC where US_U_ID = 2 and US_SVC = 'FBKey');
- if (length (params))
- {
- params := replace (params, '\r\n', '&');
- params := replace (params, '\n', '&');
- params := split_and_decode (params);
- if (params is not null and length (trim (get_keyword ('key', params))) > 4 and length (trim (get_keyword ('secret', params))) > 4)
- {
- insert into OAUTH..APP_REG (A_OWNER, A_NAME, A_KEY, A_SECRET)
- values (0, 'Facebook API', trim(get_keyword('key', params)), trim (get_keyword ('secret', params)));
-
- delete from WA_USER_SVC where US_SVC = 'FBKey';
- }
- }
- registry_set ('__WA_USER_OAUTH_UPGRADE', 'done');
-}
-;
-WA_USER_OAUTH_UPGRADE ();
-
diff --git a/appsrc/ODS-Framework/oauth/oauth_apps.vspx b/appsrc/ODS-Framework/oauth/oauth_apps.vspx
index c4c49f1..71cc523 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.2 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/oauth/oauth_authorize.vspx b/appsrc/ODS-Framework/oauth/oauth_authorize.vspx
index ccc1c71..727cbbd 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.3 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/oauth/oauth_error.vspx b/appsrc/ODS-Framework/oauth/oauth_error.vspx
index 66b54b6..30a3625 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.1 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/oauth/sel_user.vspx b/appsrc/ODS-Framework/oauth/sel_user.vspx
index 8db41de..6ae32ea 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.1 2010/09/20 10:15:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/oauth/sparql_acl.vspx b/appsrc/ODS-Framework/oauth/sparql_acl.vspx
index e0b79d7..9962648 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.4 2010/09/20 10:15:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/oauth/vad_version b/appsrc/ODS-Framework/oauth/vad_version
index 9d8637c..32ffe12 100644
--- a/appsrc/ODS-Framework/oauth/vad_version
+++ b/appsrc/ODS-Framework/oauth/vad_version
@@ -1 +1 @@
-1.0.70
+1.1.23
diff --git a/appsrc/ODS-Framework/oauth_apps.vspx b/appsrc/ODS-Framework/oauth_apps.vspx
index e684796..a34835e 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.2 2011/03/08 13:28:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/oauth_authorize.vspx b/appsrc/ODS-Framework/oauth_authorize.vspx
new file mode 100644
index 0000000..dc11550
--- /dev/null
+++ b/appsrc/ODS-Framework/oauth_authorize.vspx
@@ -0,0 +1,295 @@
+<!--
+ -
+ - $Id: oauth_authorize.vspx,v 1.4 2009/01/20 18:09:38 ddimitrov Exp $
+ -
+ - 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
+ -
+-->
+<v:page name="blog-home-page"
+ xmlns:vm="http://www.openlinksw.com/vspx/ods/"
+ xmlns:v="http://www.openlinksw.com/vspx/"
+ style="index.xsl"
+ doctype="-//W3C//DTD XHTML 1.0 Transitional//EN"
+ doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <v:variable name="login_blocked" type="varchar" default="null" persist="0"/>
+ <v:variable name="login_attempts" type="integer" default="0" persist="0" />
+ <v:variable name="wa_name" type="varchar" default="null" persist="0" param-name="wa_name"/>
+ <v:variable name="is_cookie_session" type="int" default="0" persist="0" param-name="noparams"/>
+ <v:variable name="login_ip" type="varchar" default="null" persist="1"/>
+ <!-- OAuth signin -->
+ <v:variable name="token" type="varchar" default="null" param-name="token"/>
+ <v:variable name="cb" type="varchar" default="null" param-name="cb"/>
+ <v:variable name="a_name" type="varchar" default="null" persist="0" />
+ <v:variable name="a_descr" type="varchar" default="null" persist="0" />
+ <v:variable name="_ver" type="varchar" default="1" persist="0" param-name="ver" />
+ <v:variable name="_uname" type="varchar" default="null" persist="temp" />
+ <v:on-init>
+ <![CDATA[
+ declare cookie_vec, sid any;
+
+ set http_charset='UTF-8';
+
+ if (self.token is null)
+ {
+ self.vc_redirect ('login.vspx');
+ }
+
+ declare exit handler for not found
+ {
+ self.vc_redirect ('login.vspx');
+ return;
+ };
+ select U_NAME, a_name into self._uname, self.a_name
+ from OAUTH.DBA.SESSIONS, OAUTH.DBA.APP_REG, DB.DBA.SYS_USERS
+ where U_ID = a_owner and a_id = s_a_id and s_req_key = self.token;
+
+ cookie_vec := vsp_ua_get_cookie_vec(self.vc_event.ve_lines);
+
+ if (get_keyword('sid', self.vc_event.ve_params) is null and get_keyword('sid', cookie_vec) is not null and self.token is not null)
+ {
+ declare pars, pos any;
+ pars := self.vc_event.ve_params;
+ sid := get_keyword('sid', cookie_vec);
+ pos := position ('sid', pars);
+ if (pos > 0)
+ {
+ pars [pos] := sid;
+ pos := position ('realm', pars);
+ if (pos > 0)
+ pars[pos] := 'wa';
+ }
+ else
+ {
+ pars := vector_concat (pars, vector ('sid', sid, 'realm', 'wa')) ;
+ }
+ self.vc_event.ve_params := pars;
+ }
+ ]]>
+ </v:on-init>
+ <html>
+ <head>
+ <link rel="stylesheet" type="text/css" href="openid_login.css" />
+ <title>OAuth Authentication</title>
+ </head>
+ <body>
+ <div id="PG">
+ <div id="MD">
+ <div id="login_page">
+ <v:login name="login1" realm="wa" mode="url" user-password-check="web_user_password_check">
+ <div id="id_col">
+ <div id="site_id">
+ <p><img class="id_logo" src="images/odslogo_200.png" alt="ods logo icon" /></p>
+ </div>
+ </div>
+ <div id="form_col">
+ <h1 class="page_title">
+ <img class="openid_logo" alt="OpenID Logo" src="images/oauth_trans_32.png"/> OAuth Authorization Service
+ </h1>
+ <div id="login_form_ctr">
+ <v:template type="if-no-login" name="login_if_no_login">
+ <h2>Please log in to
+ <?vsp
+ declare copy varchar;
+ copy := (select top 1 WS_WEB_TITLE from WA_SETTINGS);
+
+ if (copy = '' or copy is null)
+ http(sys_stat ('st_host_name'));
+ else
+ http(copy);
+ ?>
+ </h2>
+ <div id="login_form">
+ <form> <!-- just to keep validator happy on this mockup -->
+ <label for="login_frm_username">Member ID</label>
+ <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">
+ <v:button action="simple" name="login" value="Login" xhtml_id="login_frm_b_login">
+ <v:on-post>
+ <![CDATA[
+ declare _blocked_until any;
+
+ _blocked_until := (select WAB_DISABLE_UNTIL from WA_BLOCKED_IP where WAB_IP = http_client_ip ());
+ if (_blocked_until is not null and _blocked_until > now ())
+ {
+ self.login_blocked := 'Too many failed attempts. Try again in an hour.';
+ return;
+ }
+ self.login_attempts := coalesce(self.login_attempts, 0) + 1;
+ if (self.login_attempts > 6)
+ {
+ insert replacing WA_BLOCKED_IP (WAB_IP, WAB_DISABLE_UNTIL) values (http_client_ip(), dateadd('hour', 1, now()));
+ }
+ commit work;
+ ]]>
+ </v:on-post>
+ <v:before-render>
+ <![CDATA[
+ if (self.login_blocked is not null)
+ control.vc_enabled := 0;
+ ]]>
+ </v:before-render>
+ </v:button>
+ <v:button action="simple" name="cancel" value="Cancel" xhtml_id="login_frm_b_login">
+ <v:on-post>
+ <![CDATA[
+ self.vc_redirect (self.cb);
+ ]]>
+ </v:on-post>
+ </v:button>
+ </div>
+ </form>
+ </div> <!-- login_form -->
+ <p class="login_frm_guide">
+ A <?V http_client_ip () ?> trying to access <i><?V self.a_name ?></i>, please login to authorize or decline the request.
+ </p>
+ </v:template>
+ <?vsp
+ if (self.login_blocked is not null)
+ }
+ http(self.login_blocked);
+ } else {
+ if (self.login_attempts > 0 and self.sid is null)
+ {
+ ?>
+ <div class="login_error_ctr">
+ <p class="login_error">
+ <img class="warn_img" src="images/warn_16.png"/>
+ <span class="err_msg">Invalid member ID or password</span>
+ </p>
+ </div>
+ <?vsp
+ }
+ }
+ ?>
+ </div> <!-- login_form_ctr -->
+ <v:template type="if-login" name="login_if_login">
+ <div>
+ <div class="login_frm_guide">
+ A <?V http_client_ip () ?> trying to access <?V self.a_name ?>
+ <br />
+ <?V self.a_descr ?>
+ </div>
+ <div>
+ <v:button action="simple" name="decl" value="Decline">
+ <v:on-post>
+ <![CDATA[
+ self.vc_redirect (self.cb);
+ ]]>
+ </v:on-post>
+ </v:button>
+ <v:button action="simple" name="accept" value="Authorize">
+ <v:on-post>
+ <![CDATA[
+ update OAUTH..SESSIONS
+ set s_state = 2,
+ s_sid = self.sid,
+ s_url_cb = self.cb
+ where s_req_key = self.token
+ and s_ip = http_client_ip ()
+ and s_state = 1;
+ commit work;
+ self.vc_redirect (self.cb);
+ ]]>
+ </v:on-post>
+ </v:button>
+ </div>
+ </div>
+ </v:template>
+ </div> <!-- form_col -->
+ <v:on-post>
+ <![CDATA[
+ declare cook_str, expire varchar;
+ if (self.vc_authenticated and length (self.sid))
+ {
+ declare expire varchar;
+ expire := sprintf (' expires=%s;', date_rfc1123 (dateadd ('hour', 1, now())));
+ cook_str := sprintf ('Set-Cookie: sid=%s;%s path=/\r\n', self.sid, expire);
+
+ if (strstr (http_header_get (), 'Set-Cookie: sid=') is null)
+ {
+ cook_str := concat (http_header_get (), cook_str);
+ http_header (cook_str);
+ }
+ expire := date_rfc1123 (dateadd ('hour', 1, now()));
+ cook_str := sprintf ('Set-Cookie: openid.sid=%s; expires=%s; path=/;\r\n', self.sid, expire);
+ if (strstr (http_header_get (), 'Set-Cookie: openid.sid=') is null)
+ {
+ cook_str := concat (http_header_get (), cook_str);
+ http_header (cook_str);
+ }
+ }
+ ]]>
+ </v:on-post>
+ <v:after-data-bind>
+ <![CDATA[
+ if (length (self.sid))
+ {
+ declare exit handler for not found
+ {
+ self.sid := null;
+ self.vc_authenticated := 0;
+ control.vl_authenticated := 0;
+ connection_vars_set (null);
+ return;
+ }
+ select a_name, a_descr into self.a_name, self.a_descr
+ from OAUTH.DBA.SESSIONS, OAUTH.DBA.APP_REG, DB.DBA.SYS_USERS, DB.DBA.VSPX_SESSION
+ where VS_SID = self.sid and VS_REALM = self.realm and U_NAME = VS_UID and U_ID = a_owner and a_id = s_a_id and s_req_key = self.token;
+ }
+ if (length (self.sid) and length (self.login_ip) and self.login_ip <> http_client_ip ())
+ {
+ delete from VSPX_SESSION where VS_SID = self.sid and VS_REALM = self.realm;
+ commit work;
+
+ self.sid := null;
+ self.vc_authenticated := 0;
+ control.vl_authenticated := 0;
+ connection_vars_set (null);
+ self.vc_redirect ('login.vspx');
+ return;
+ }
+ else if (length (self.sid) and self.login_ip is null)
+ {
+ self.login_ip := http_client_ip ();
+ }
+ commit work;
+ ]]>
+ </v:after-data-bind>
+ </v:login>
+ </div> <!-- login_page -->
+ </div> <!-- MD -->
+ <div id="FT">
+ <div id="FT_LC">
+ <a href="http://www.openlinksw.com/virtuoso"><img alt="Powered by OpenLink Virtuoso Universal Server" src="images/virt_power_no_border.png" border="0"/>
+ </a>
+ </div>
+ <div id="FT_RC"><a href="/ods/faq.html">FAQ</a> |
+ <a href="/ods/privacy.html">Privacy</a> |
+ <a href="/ods/rabuse.vspx">Report Abuse</a>
+ <div class="copyright">
+ Copyright © 1999-2008 OpenLink Software
+ </div>
+ </div> <!-- FT_R -->
+ </div>
+ </div> <!-- PG -->
+ </body>
+ </html>
+</v:page>
diff --git a/appsrc/ODS-Framework/oauth_sid.vsp b/appsrc/ODS-Framework/oauth_sid.vsp
index fdebdd1..644d5d9 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-2011 OpenLink Software
+ Copyright © 1998-2012 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/ods_api.sql b/appsrc/ODS-Framework/ods_api.sql
index a12c15c..01040df 100644
--- a/appsrc/ODS-Framework/ods_api.sql
+++ b/appsrc/ODS-Framework/ods_api.sql
@@ -312,8 +312,7 @@ 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;
- DAV_MAKE_DIR ('/DAV/home/', http_dav_uid (), http_admin_gid (), '110100100R');
- DAV_MAKE_DIR ('/DAV/home/' || _username || '/', uid, http_nogroup_gid (), '110100000R');
+ DB.DBA.DAV_HOME_DIR_CREATE (_username);
declare _det_col_id integer;
_det_col_id := DB.DBA.DAV_MAKE_DIR ('/DAV/home/'||_username||'/RDFData/', uid, http_nogroup_gid (), '110100100N');
@@ -325,7 +324,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 d9dab29..85b848d 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.1 2010/09/20 10:15:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/ods_controllers.sql b/appsrc/ODS-Framework/ods_controllers.sql
index ae353a0..061b2c5 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.69 2011/08/03 11:42:30 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -175,6 +175,9 @@ create procedure normalize_url_like_browser (in x varchar)
}
;
+--!
+-- FIXME: get_ses is only used in Gallery!
+--/
create procedure get_ses (in uname varchar)
{
declare params, lines any;
@@ -195,6 +198,9 @@ create procedure get_ses (in uname varchar)
}
;
+--!
+-- FIXME: close_ses is only used in Gallery!
+--/
create procedure close_ses (in sid1 varchar)
{
declare params, lines any;
@@ -270,8 +276,10 @@ create procedure ods_xml_item (
in pTag varchar,
in pValue any)
{
+ -- sprintf %V cannot handle UTF-8. We need to convert to wide chars first. Otherwise we end up with double-endoded characters.
+ -- if the input string is already wide nothing is done.
if (not DB.DBA.is_empty_or_null (pValue))
- http (sprintf ('<%s>%V</%s>', pTag, cast (pValue as varchar), pTag));
+ http (sprintf ('<%s>%V</%s>', pTag, charset_recode (cast (pValue as varchar), 'UTF-8', '_WIDE_'), pTag));
}
;
@@ -400,6 +408,10 @@ create procedure obj2xml (
{
retValue := sprintf ('%V', o);
}
+ else if (__tag (o) = 211)
+ {
+ retValue := datestring (o);
+ }
else if (isJsonObject (o))
{
for (N := 2; N < length(o); N := N + 2)
@@ -457,6 +469,13 @@ 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')
@@ -511,7 +530,7 @@ create procedure ODS.ODS_API."qrcode" (
in data any,
in width int := 120,
in height int := 120,
- in scale int := 4) __soap_http 'text/plain'
+ in scale int := 3) __soap_http 'text/plain'
{
declare qrcode_bytes, mixed_content, content varchar;
declare qrcode any;
@@ -532,6 +551,13 @@ 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,
@@ -748,7 +774,6 @@ 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')
@@ -1199,36 +1224,45 @@ create procedure ODS.ODS_API."lookup.list" (
}
;
-create procedure ODS..getDefaultHttps ()
+create procedure ODS.ODS_API.getDefaultHttps () __SOAP_HTTP 'text/plain'
{
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 := host || ':' || 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 := tmp || ':' || port;
+ }
return host;
}
;
@@ -1326,8 +1360,38 @@ create procedure ODS.ODS_API."address.geoData" (
;
-- User account activity
-
-create procedure ODS.ODS_API."user.checkAvalability" (
+--!
+-- \brief Check if a certain user account name is available.
+--
+-- Before creating an account via user.register() this method can be used
+-- to check the availability of the user name and the email address.
+--
+-- Although both parameters are marked as optional reliable results are only
+-- obtained if both parameters are given.
+--
+-- \param name The user account name to check.
+-- \param email The corresponding email address.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+-- If the account name and email address are available \p 1 is returned. Otherwise an error code and a human readable message
+-- indicating the problem are returned.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i http://demo.openlinksw.com/ods/api/user.checkAvalability?name=demo2&email=demo2@hello.com
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.01.3127 (Linux) x86_64-unknown-linux-gnu
+-- Connection: Keep-Alive
+-- Date: Tue, 17 Apr 2012 15:44:46 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result><code>1</code><message>Success</message></result>
+-- \endverbatim
+--/
+create procedure ODS.ODS_API."user.checkAvailability" (
in name varchar := null,
in email varchar := null) __soap_http 'text/xml'
{
@@ -1337,7 +1401,7 @@ create procedure ODS.ODS_API."user.checkAvalability" (
return ods_serialize_sql_error (__SQL_STATE, __SQL_MESSAGE);
};
if (name is null or length (name) < 1 or length (name) > 20)
- signal ('23023', 'Login name cannot be empty or longer then 20 chars');
+ signal ('23023', 'Login name cannot be empty or longer than 20 chars');
if (regexp_match ('^[A-Za-z0-9_. at -]+\$', name) is null)
signal ('23023', 'The login name contains invalid characters');
@@ -1358,10 +1422,59 @@ create procedure ODS.ODS_API."user.checkAvalability" (
}
;
---! User registration
---! name: desired user account name
---! password: desired password
---! email: user's e-mail address
+--!
+-- \deprecated Use user.checkAvailability() instead.
+--/
+create procedure ODS.ODS_API."user.checkAvalability" (
+ in name varchar := null,
+ in email varchar := null) __soap_http 'text/xml'
+{
+ return ODS.ODS_API."user.checkAvalability"(name, email);
+}
+;
+
+--!
+-- \brief Register a new user account.
+--
+-- \param name The user name for the new account. Except for \p mode \p 4 and \p 5 (Twitter and LinkedIn) this is mandatory.
+-- \param password The password for the new account. Only used if \p mode is \p 0. Otherwise authentication is done through the specified service without the need
+-- for a specific ODS password.
+-- \param email The email address for the new account. Except for \p mode \p 2 (Facebook) this is mandatory.
+-- \param mode ODS supports different methods of authentication as detailed in \ref ods_authentication. For user registration ODS also supports several methods:
+-- - \p 0 - Default registration via username and password. This is the default.
+-- - \p 1 - Registration via OpenID.
+-- - \p 2 - Registration via Facebook.
+-- - \p 3 - Registration via FOAF+SSL/WebID.
+-- - \p 4 - Registration via Twitter.
+-- - \p 5 - Registration via LinkedIn.
+-- \param data Additional registration details. The format depends on the registration \p mode.
+-- - \p mode = \p 0 (username/password) - \p data is unused.
+-- - \p mode = \p 1 (OpenID) - A JSON stream of profile details. At least \p openid_url and \p openid_server need to be provided. FIXME: why not simply use the OpenID and do the rest internally somehow?
+-- - \p mode = \p 2 (Facebook) - A JSON stream of profile data. At least \p uid - the Facebook UID, needs to be specified.
+-- - \p mode = \p 3 (FOAF+SSL/WebID) - A JSON stream of details. FIXME: why not simply fetch the FOAF via the WebID instead of delegating that work to the client?
+-- - \p mode = \p 4 (Twitter) - An XML stream of user information as for example returned by Twitter's users/lookup API call. FIXME: why not simply use the Twitter ID and do the rest internally?
+-- - \p mode = \p 5 (LinkedIn) - An XML stream of user information from LinkedIn. At least \p /person/public-profile-url needs to be provided. FIXME: why not simply use the linkedin profile URL?
+--
+-- \return On success a new session id is returned which can be used as described in \ref ods_authentication_session_id.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/user.register?name=test123&password=1&email=test@yahoo.com"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/05.12.3041 (Solaris) x86_64-sun-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Mon, 28 Dec 2009 22:18:59 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="ISO-8859-1"
+-- Content-Length: 59
+--
+-- <result>
+-- <code>191</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."user.register" (
in name varchar := null,
in "password" varchar := null,
@@ -1418,7 +1531,7 @@ create procedure ODS.ODS_API."user.register" (
"password" := uuid ();
}
if (name is null or length (name) < 1 or length (name) > 20)
- signal ('23023', 'Login name cannot be empty or longer then 20 chars');
+ signal ('23023', 'Login name cannot be empty or longer than 20 chars');
if (regexp_match ('^[A-Za-z0-9_. at -]+\$', name) is null)
signal ('23023', 'The login name contains invalid characters');
@@ -1496,6 +1609,7 @@ 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');
@@ -1620,8 +1734,51 @@ create procedure ODS.ODS_API.linkedinVerify (
}
;
---! Authenticate ODS account using name & password hash
---! Will estabilish a session in VSPX_SESSION table
+--!
+-- \brief Start a new user session.
+--
+-- This method allows to authenticate with one of the supported authentication
+-- methods to create a new user session. The returned session id can be used for
+-- further method calls instead of password hash or OAuth authentication.
+--
+-- ODS supports several methods to authenticate:
+-- - Standard user name and password hash authentication as detailed in \ref ods_authentication_password_hash.
+-- - Authentication via a Facebook UID. The ID needs to be added to the profile of the user for this method to work. FIXME: Does this require the user to be logged into Facebook?
+-- - Authentication via OpenID. FIXME
+-- - Authentication via OAuth: ODS allows to authenticate with Twitter or LinkedIn IDs through OAuth.
+--
+-- A session will timeout after being unused for half an hour.
+--
+-- \param user_name The user name of the account created via user.register(). If specified \p password_hash also needs to be provided.
+-- \param password_hash The password hash as explained in \ref ods_authentication_password_hash. Mandatory if \p user_name is specified.
+-- \param facebookUID The Facebook UID. This is the numerical id contained in the profile URL. The facebook UID needs to be registered
+-- with an account. Every other parameter should be \p null.
+-- \param openIdUrl
+-- \param openIdIdentity
+-- \param oauthMode Can be one of \p twitter or \p linkedin to either login through Twitter or LinkedIn. If specified \p oauthSid, \p oauthVerifier, and \p oauthToken also need
+-- to be specified.
+-- \param oauthSid The OAuth session ID. See \ref ods_authentication_oauth for details.
+-- \param oauthVerifier The OAuth Verifier. See \ref ods_authentication_oauth for details.
+-- \param oauthToken The OAuth token. See \ref ods_authentication_oauth for details.
+--
+-- \return The session id of the newly created session. This session id can then be
+-- used to authenticate other method calls as explained in \ref ods_authentication_session_id.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/user.authenticate?user_name=demo&password_hash=49e473da03fbc286f06b5f0bf1f3301b5e4a67fd"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.01.3127 (Linux) x86_64-unknown-linux-gnu
+-- Connection: Keep-Alive
+-- Date: Tue, 17 Apr 2012 09:31:34 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 114
+--
+-- <root><sid>1de236f5da2f32d92e8c0cce5053a96e</sid><userName>demo</userName><userId>127</userId><dba>0</dba></root>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."user.authenticate" (
in user_name varchar := null,
in password_hash varchar := null,
@@ -1735,6 +1892,10 @@ 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 ());
@@ -1748,6 +1909,20 @@ create procedure ODS.ODS_API."user.authenticate" (
}
;
+--!
+-- \deprecated Use user.authenticate() instead.
+--
+-- \brief Start a new user session.
+--
+-- Calling this method is similar to calling user.authenticate() with the password hash
+-- method.
+--
+-- \param user_name The user name of the account created via user.register().
+-- \param password_hash The password hash as explained in \ref ods_authentication_password_hash.
+--
+-- \return The session id of the newly created session. This session id can then be
+-- used to authenticate other method calls as explained in \ref ods_authentication_session_id.
+--/
create procedure ODS.ODS_API."user.login" (
in user_name varchar,
in password_hash varchar) __soap_http 'text/plain'
@@ -1756,6 +1931,15 @@ create procedure ODS.ODS_API."user.login" (
}
;
+--!
+-- \brief Validate user authentication credentials.
+--
+-- This method can be used to check user authentication credentials as detailed in
+-- \ref ods_authentication.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+-- If the authentication credentials are valid \p 1 is returned.
+--/
create procedure ODS.ODS_API."user.validate" () __soap_http 'text/xml'
{
declare uname varchar;
@@ -1772,6 +1956,14 @@ create procedure ODS.ODS_API."user.validate" () __soap_http 'text/xml'
}
;
+--!
+-- \brief End a user session.
+--
+-- This method ends a user session created via user.login() or user.authenticate().
+-- The user session needs to be specified via \ref ods_authentication_session_id.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--/
create procedure ODS.ODS_API."user.logout" () __soap_http 'text/plain'
{
declare uname varchar;
@@ -1797,6 +1989,108 @@ create procedure ODS.ODS_API."user.logout" () __soap_http 'text/plain'
}
;
+--!
+-- \brief Change user profile information.
+--
+-- This method allows to update any key/value pair in the user profile.
+--
+-- \param user_info A comma-separated list of \p key=value pairs identifying
+-- details in the user profile of the authenticated user. The following keys are supported:
+-- - \p WAUI_TITLE
+-- - \p WAUI_FIRST_NAME
+-- - \p WAUI_LAST_NAME
+-- - \p WAUI_FULL_NAME
+-- - \p WAUI_GENDER
+-- - \p WAUI_BIRTHDAY
+-- - \p WAUI_WEBPAGE
+-- - \p WAUI_MSIGNATURE
+-- - \p WAUI_ICQ
+-- - \p WAUI_SKYPE
+-- - \p WAUI_AIM
+-- - \p WAUI_YAHOO
+-- - \p WAUI_MSN
+-- - \p WAUI_HADDRESS1
+-- - \p WAUI_HADDRESS2
+-- - \p WAUI_HCODE
+-- - \p WAUI_HCITY
+-- - \p WAUI_HSTATE
+-- - \p WAUI_HCOUNTRY
+-- - \p WAUI_HTZONE
+-- - \p WAUI_HPHONE
+-- - \p WAUI_HPHONE_EXT
+-- - \p WAUI_HMOBILE
+-- - \p WAUI_BINDUSTRY
+-- - \p WAUI_BORG
+-- - \p WAUI_BJOB
+-- - \p WAUI_BADDRESS1
+-- - \p WAUI_BADDRESS2
+-- - \p WAUI_BCODE
+-- - \p WAUI_BCITY
+-- - \p WAUI_BSTATE
+-- - \p WAUI_BCOUNTRY
+-- - \p WAUI_BTZONE
+-- - \p WAUI_BLAT
+-- - \p WAUI_BLNG
+-- - \p WAUI_BPHONE
+-- - \p WAUI_BPHONE_EXT
+-- - \p WAUI_BMOBILE
+-- - \p WAUI_BREGNO
+-- - \p WAUI_BCAREER
+-- - \p WAUI_BEMPTOTAL
+-- - \p WAUI_BVENDOR
+-- - \p WAUI_BSERVICE
+-- - \p WAUI_BOTHER
+-- - \p WAUI_BNETWORK
+-- - \p WAUI_SUMMARY
+-- - \p WAUI_RESUME
+-- - \p WAUI_SEC_QUESTION
+-- - \p WAUI_SEC_ANSWER
+-- - \p WAUI_PHOTO_URL
+-- - \p WAUI_TEMPLATE
+-- - \p WAUI_LAT
+-- - \p WAUI_LNG
+-- - \p WAUI_LATLNG_VISIBLE
+-- - \p WAUI_USER_SEARCHABLE
+-- - \p WAUI_AUDIO_CLIP
+-- - \p WAUI_FAVORITE_BOOKS
+-- - \p WAUI_FAVORITE_MUSIC
+-- - \p WAUI_FAVORITE_MOVIES
+-- - \p WAUI_SEARCHABLE
+-- - \p WAUI_SHOWACTIVE
+-- - \p WAUI_LATLNG_HBDEF
+-- - \p WAUI_SITE_NAME
+-- - \p WAUI_INTERESTS
+-- - \p WAUI_INTEREST_TOPICS
+-- - \p WAUI_BORG_HOMEPAGE
+-- - \p WAUI_OPENID_URL
+-- - \p WAUI_OPENID_SERVER
+-- - \p WAUI_FACEBOOK_ID
+-- - \p WAUI_IS_ORG
+-- - \p WAUI_APP_ENABLE
+-- - \p WAUI_SPB_ENABLE
+-- - \p WAUI_NICK
+-- - \p WAUI_BICQ
+-- - \p WAUI_BSKYPE
+-- - \p WAUI_BAIM
+-- - \p WAUI_BYAHOO
+-- - \p WAUI_BMSN
+-- - \p WAUI_MESSAGING
+-- - \p WAUI_BMESSAGING
+-- - \p WAUI_CERT_LOGIN
+-- - \p WAUI_CERT_FINGERPRINT
+-- - \p WAUI_CERT
+-- - \p WAUI_ACL - A serialized array of ACLs which is nearly impossible to create as a client since the serialization requires an internal Virtuoso function called serialize().
+-- - \p WAUI_SALMON_KEY
+-- - \p WAUI_SETTINGS
+-- - \p WAUI_JOIN_DATE
+-- - \p WAUI_FOAF
+--
+-- \reqb{The request body should contain a \ref ods_user_profile_resource.}
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa user.update.fields()
+--/
create procedure ODS.ODS_API."user.update" (
in user_info any) __soap_http 'text/xml'
{
@@ -1839,6 +2133,95 @@ create procedure ODS.ODS_API."user.update.field" (
}
;
+--!
+-- \brief Change user profile information.
+--
+-- This method allows to update details in the user profile. Any parameter can be omitted which will
+-- result in its value not being touched.
+--
+-- \param nickName The user's nick name. Typically a short name used in chats and such.
+-- \param mail The user's email address.
+-- \param title The user's title. Can be something like "Mr." or "Ms."
+-- \param firstName The user's first name.
+-- \param lastName The user's last name.
+-- \param fullName The user's full name including any middle names.
+-- \param gender The user's gender. Can be either \p "male" or \p "female".
+-- \param birthday The user's birthday. The date format is \p YYYY.MM.DD.
+-- \param homepage The user's homepage.
+-- \param mailSignature The user's mail signature to be attached to each mail written.
+-- \param sumary A piece of text giving a summary of the user. This can be anything. The summary is subject to privacy settings as detailed in \ref ods_user_privacy.
+-- \param appSetting
+-- \param spbEnable
+-- \param Search
+-- \param showActive
+-- \param webIDs
+-- \param interests
+-- \param topicInterests
+-- \param icq
+-- \param skype
+-- \param yahoo
+-- \param aim
+-- \param msn
+-- \param messaging
+-- \param defaultMapLocation
+-- \param homeCountry
+-- \param homeState
+-- \param homeCity
+-- \param homeCode
+-- \param homeAddress1
+-- \param homeAddress2
+-- \param homeTimezone
+-- \param homeLatitude
+-- \param homeLongitude
+-- \param homePhone
+-- \param homePhoneExt
+-- \param homeMobile
+-- \param businessIndustry
+-- \param businessOrganization
+-- \param businessHomePage
+-- \param businessJob
+-- \param businessRegNo
+-- \param businessCareer
+-- \param businessEmployees
+-- \param businessVendor
+-- \param businessService
+-- \param businessOther
+-- \param businessNetwork
+-- \param businessResume
+-- \param businessCountry
+-- \param businessState
+-- \param businessCity
+-- \param businessCode
+-- \param businessAddress1
+-- \param businessAddress2
+-- \param businessTimezone
+-- \param businessLatitude
+-- \param businessLongitude
+-- \param businessPhone
+-- \param businessPhoneExt
+-- \param businessMobile
+-- \param businessIcq
+-- \param businessSkype
+-- \param businessYahoo
+-- \param businessAim
+-- \param businessMsn
+-- \param businessMessaging
+-- \param securityOpenID
+-- \param securityFacebookID
+-- \param securitySecretQuestion
+-- \param securitySecretAnswer
+-- \param securitySiocLimit
+-- \param photo
+-- \param photoContent
+-- \param audio
+-- \param audioContent
+-- \param mode
+-- \param onlineAccounts
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa user.update()
+--/
create procedure ODS.ODS_API."user.update.fields" (
in nickName varchar := null,
in mail varchar := null,
@@ -2054,6 +2437,7 @@ create procedure ODS.ODS_API."user.update.fields" (
}
;
+-- FIXME: this does not seem to be complete
create procedure ODS.ODS_API."user.acl.array" ()
{
return vector (
@@ -2113,6 +2497,35 @@ create procedure ODS.ODS_API."user.acl.array" ()
}
;
+--!
+-- \brief Get privacy information about user profile details.
+--
+-- Almost each detail in a user's profile can have its individual privacy setting as detailed in
+-- \ref ods_user_privacy. This method returns the currently configured privacy settings for the
+-- authenticated user.
+--
+-- \return An XML stream containing one tag for each user profile detail with the following content:
+-- - \p 1 - The detail is public
+-- - \p 2 - The detail is controlled by ACLs. FIXME: see also somewhere
+-- - \p 3 - The detail is private
+--
+-- \sa user.acl.update()
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/user.acl.info?user_name=demo&password_hash=49e473da03fbf295f06b5f0bf1f3301b5e4a67fc"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.01.3127 (Linux) x86_64-unknown-linux-gnu
+-- Connection: Keep-Alive
+-- Date: Wed, 18 Apr 2012 06:30:48 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 1421
+--
+-- <acl><title>1</title><firstName>1</firstName><lastName>1</lastName><fullName>1</fullName><mail>1</mail><gender>1</gender><birthday>2</birthday><homepage>1</homepage><webIDs>1</webIDs><mailSignature>3</mailSignature><icq>1</icq><skype>1</skype><yahoo>1</yahoo><aim>1</aim><msn>1</msn><homeAddress1>1</homeAddress1><homeCountry>1</homeCountry><homeTimezone>1</homeTimezone><homePhone>1</homePhone><businessIndustry>1</businessIndustry><businessOrganization>1</businessOrganization><businessJob>1</businessJob><businessAddress1>1</businessAddress1><businessCountry>1</businessCountry><businessTimezone>1</businessTimezone><businessPhone>1</businessPhone><businessRegNo>1</businessRegNo><businessCareer>1</businessCareer><businessEmployees>1</businessEmployees><businessVendor>1</businessVendor><businessService>1</businessService><businessOther>1</businessOther><businessNetwork>1</businessNetwork><summary>1</summary><businessResume>1</businessResume><photo>1</photo><homeLatitude>1</homeLatitude><audio>1</audio><businessLatitude>1</businessLatitude><interests>1</interests><topicInterests>1</topicInterests><businessIcq>1</businessIcq><businessSkype>1</businessSkype><businessYahoo>1</businessYahoo><businessAim>1</businessAim><businessMsn>1</businessMsn><homeCode>3</homeCode><homeCity>3</homeCity><homeState>3</homeState><businessCode>3</businessCode><businessCity>3</businessCity><businessState>3</businessState></acl>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."user.acl.info" () __soap_http 'text/xml'
{
declare uname varchar;
@@ -2140,6 +2553,93 @@ create procedure ODS.ODS_API."user.acl.info" () __soap_http 'text/xml'
}
;
+--!
+-- \brief Change the user profile detail privacy settings.
+--
+-- Almost each detail in a user's profile can have its individual privacy setting as detailed in
+-- \ref ods_user_privacy. This method allows to change these privacy settings.
+--
+-- The following user detail identifier are supported:
+-- - \p title
+-- - \p firstName
+-- - \p lastName
+-- - \p fullName
+-- - \p mail
+-- - \p gender
+-- - \p birthday
+-- - \p homepage
+-- - \p webIDs
+-- - \p mailSignature
+-- - \p icq
+-- - \p skype
+-- - \p yahoo
+-- - \p aim
+-- - \p msn
+-- - \p homeAddress1
+-- - \p homeCountry
+-- - \p homeTimezone
+-- - \p homePhone
+-- - \p businessIndustry
+-- - \p businessOrganization
+-- - \p businessJob
+-- - \p businessAddress1
+-- - \p businessCountry
+-- - \p businessTimezone
+-- - \p businessPhone
+-- - \p businessRegNo
+-- - \p businessCareer
+-- - \p businessEmployees
+-- - \p businessVendor
+-- - \p businessService
+-- - \p businessOther
+-- - \p businessNetwork
+-- - \p summary
+-- - \p businessResume
+-- - \p photo
+-- - \p homeLatitude
+-- - \p audio
+-- - \p businessLatitude
+-- - \p interests
+-- - \p topicInterests
+-- - \p businessIcq
+-- - \p businessSkype
+-- - \p businessYahoo
+-- - \p businessAim
+-- - \p businessMsn
+-- - \p homeCode
+-- - \p homeCity
+-- - \p homeState
+-- - \p businessCode
+-- - \p businessCity
+-- - \p businessState
+--
+-- \param acls A list of URL-parameter style key/value pairs where each key corresponds to one user profile
+-- detail and each value refers to its visibility. A simple example would be \p "gender=1&birthday=3&photo=1"
+-- which would set the gender to be public, the birthday to be controlled by fine grained ACLs, and
+-- the photo to be public, too. The visibility value can be one of the following:
+-- - \p 1 - The detail is public
+-- - \p 2 - The detail is controlled by ACLs. FIXME: see also somewhere
+-- - \p 3 - The detail is private
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa user.acl.info()
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/user.acl.update?user_name=demo&password_hash=49e473da03fbd296f05b5f0bf1f3301b5e4a67fc&acls=gender%3D1%26birthday%3D3%26photo%3D1"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.01.3127 (Linux) x86_64-unknown-linux-gnu
+-- Connection: Keep-Alive
+-- Date: Wed, 18 Apr 2012 09:07:25 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 57
+--
+-- <result><code>1</code><message>Success</message></result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."user.acl.update" (
in acls varchar) __soap_http 'text/xml'
{
@@ -2171,6 +2671,35 @@ create procedure ODS.ODS_API."user.acl.update" (
}
;
+--!
+-- \brief Change the password of a user account.
+--
+-- This method allows to change the password on a user account. Since passwords
+-- are transmitted in plain text it is recommended to use an encrypted connection.
+--
+-- \param old_password The old password in plain text.
+-- \param new_password The new password in plain text.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/user.password_change?user_name=test123&password_hash=4674a4b44e89011cfa581ff90967ebc52fd1080d&old_password=1&new_password=2"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/05.12.3041 (Solaris) x86_64-sun-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Mon, 28 Dec 2009 22:46:56 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="ISO-8859-1"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>1</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."user.password_change" (
in old_password varchar,
in new_password varchar) __soap_http 'text/xml'
@@ -2208,6 +2737,24 @@ ret:
}
;
+--!
+-- \deprecated Use user.update() instead.
+--
+-- \brief Upload binary user data.
+--
+-- The ODS user profile contains an optional user photo and user audio file. These can be
+-- uploaded through this method.
+--
+-- For this purpose an HTTP POST needs to be performed with the following paramters:
+-- - \c pf_photo - The file name of the photo.
+-- - \c pf_photoContent - The content of the photo file (jpg, gif, or png)
+-- - \c pf_audio - The file name of the audio.
+-- - \c pf_audioContent - The content of the audio file.
+--
+-- \return \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa user.update(), user.update.fields()
+--/
create procedure ODS.ODS_API."user.upload" () __soap_http 'text/xml'
{
declare params any;
@@ -2362,22 +2909,34 @@ 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 {
@@ -2390,23 +2949,28 @@ create procedure ODS.ODS_API."user.enable" (
create procedure ODS.ODS_API."user.disable" (
in name varchar) __soap_http 'text/xml'
{
- declare uname varchar;
declare rc integer;
+ declare uname varchar;
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'))
+
+ if ((uname in ('dav', 'dba')) or (uname = name))
{
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 {
@@ -2425,12 +2989,40 @@ 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 '';
}
;
+--!
+-- \brief Fetch basic information about a user.
+--
+-- This method allows to fetch details about an ODS user. If no user name is given the authenticated
+-- user is returned. This means that user.info() can be used to get user information for an authentication
+-- session (see also \ref ods_authentication_session_id).
+--
+-- \param name The optional ODS user name. Defaults to the authenticated user.
+-- \param short An optional boolean setting. If \p 1 only the most basic information is returned.
+--
+-- \return An XML stream encoding the user details such as uid, name, or the personal URL.
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/user.info?sid=07e6e4b8da77691c729e6c95e3016ac8&short=1"
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/06.01.3127 (Linux) x86_64-unknown-linux-gnu
+-- Connection: Keep-Alive
+-- Date: Sat, 21 Apr 2012 09:52:46 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="UTF-8"
+-- Content-Length: 157
+--
+-- <user><uid>127</uid><iri>http://demo.openlinksw.com/dataspace/person/demo#this</iri><name>demo</name><nickName>demo</nickName><fullName>Demo User
+-- </fullName></user>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."user.info" (
in name varchar := null,
in "short" varchar := '0') __soap_http 'text/xml'
@@ -2453,7 +3045,7 @@ create procedure ODS.ODS_API."user.info" (
name := uname;
if (not isnull (uname) and (uname <> name))
- return ods_serialize_sql_error ('37000', 'Bad user''s name paramater');
+ return ods_serialize_sql_error ('37000', 'Bad user''s name parameter');
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');
@@ -2585,6 +3177,17 @@ create procedure ODS.ODS_API."user.info" (
}
;
+--!
+-- \brief Fetch details about an ODS user based on their WebID.
+--
+-- This method returns public information about an ODS user based on their specific
+-- ODS WebID.
+--
+-- \param webID The WebID of the user to lookup.
+-- \param output The output type. Can be either \p xml or \p json. Defaults to \p xml.
+--
+-- \return The details of the requested user serialized as an xml stream.s
+--/
create procedure ODS.ODS_API."user.info.webID" (
in webID varchar,
in output varchar := 'xml') __soap_http 'text/xml'
@@ -2816,7 +3419,46 @@ create procedure ODS.ODS_API."user.search" (
-- Social Network activity
-create procedure ODS.ODS_API."user.invite" (
+--!
+-- \brief Invite someone to join the user's social network.
+--
+-- ODS allows users to be connected in a social network. This requires users to send invitations
+-- to other users. The other users then need to either approve or reject that invitation.
+--
+-- \param friends_email The email address the invitation should be sent to. This can either be
+-- an already registered user or someone that is also invited to create an account with the instance of ODS.
+-- \param custom_message An optional custom message to be sent as part of the autogenerated one. The auto-generated
+-- message is based on a template stored in the DAV file system at \p "/DAV/VAD/wa/tmpl/SN_INV_TEMPLATE" or in the
+-- web server's file structure at \p "wa/tmpl/SN_INV_TEMPLATE". The default template can be seen below.
+-- \verbatim
+-- %invitation%
+--
+-- I've created my own place on %app% and I'd like you to connect to me so we can stay in touch.
+-- You can view my blog, my photos, my news and wiki.
+--
+-- With %app%, you can create your own personal page and blog of your own,
+-- which will can be linked to mine.
+--
+-- To join my network please visit %url%
+--
+-- - %user%
+--
+-- --------------------------------------------------------------------------
+--
+-- Thank you for using Virtuoso Web Applications. Virtuoso Team
+--
+-- -- Powered by Virtuoso http://virtuoso.openlinksw.com/
+-- \endverbatim
+-- It can easily be replaced by the system administrator. The following placeholders are supported:
+-- - \p %app% - The title of the web service or the server's hostname as a fallback.
+-- - \p %user% - The full name of the user sending the invitation.
+-- - \p %url% - The URL to the login page of this ODS instance. FIXME: This depends on the used UI. It should be provided by the client or be configurable.
+-- - \p %invitation% - The \p custom_message provided as a parameter.
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa user.invitation.approve(), user.invitation.list()
+--/
+create procedure ODS.ODS_API."user.invitation.new" (
in friends_email varchar,
in custom_message varchar := '') __soap_http 'text/xml'
{
@@ -2835,6 +3477,7 @@ create procedure ODS.ODS_API."user.invite" (
if (not ods_check_auth (uname))
return ods_auth_failed ();
+-- FIXME: this URL is UI specific and should be provided by the client rather than being hard-coded here.
url := WS.WS.EXPAND_URL (HTTP_URL_HANDLER (), 'login.vspx?URL=sn_rec_inv.vspx');
copy := (select top 1 WS_WEB_TITLE from DB.DBA.WA_SETTINGS);
if (copy = '' or copy is null)
@@ -2846,10 +3489,14 @@ create procedure ODS.ODS_API."user.invite" (
sn_id := (select sne_id from DB.DBA.sn_person where sne_name = uname);
msg := DB.DBA.WA_GET_EMAIL_TEMPLATE ('SN_INV_TEMPLATE', 1);
msg := replace (msg, '%app%', copy);
+-- FIXME: the template does not contain the '%invitation%' placeholder
msg := replace (msg, '%invitation%', custom_message);
+-- FIXME: why would the user send a message to themselves. Here the receipiant's name should go. This we only have if the user is already registered or if we invite a WebID which should be possible, too.
msg := replace (msg, '%user%', DB.DBA.WA_WIDE_TO_UTF8 (_u_full_name));
msg := replace (msg, '%url%', url);
+-- FIXME: %app_action_url%, %service_url%, %app_owner%, %timeout_join% and %service% are never replaced in the msg.
+
uids := split_and_decode (friends_email, 0, '\0\0,');
if (not length (uids))
@@ -2897,7 +3544,33 @@ ret:
}
;
-create procedure ODS.ODS_API."user.invitation" (
+--!
+-- \deprecated Use user.invitation.new() instead.
+--/
+create procedure ODS.ODS_API."user.invite" (
+ in friends_email varchar,
+ in custom_message varchar := '') __soap_http 'text/xml'
+{
+ return ODS.ODS_API."user.invitation.new"(friends_email, custom_message);
+}
+;
+
+--!
+-- \brief Approve an invitation from another user.
+--
+-- ODS allows users to be connected in a social network. This requires users to send invitations
+-- to other users. The other users then need to either approve or reject that invitation.
+--
+-- This method allow to approve or reject invitations from other users.
+--
+-- \param invitation_id The id of the invitation as reported by user.invitation.list().
+-- \param approve Either \p 1 or \p 0 to \em approve or \em reject the invitation.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa user.invitation.new(), user.invitation.list()
+--/
+create procedure ODS.ODS_API."user.invitation.approve" (
in invitation_id int,
in approve smallint) __soap_http 'text/xml'
{
@@ -2938,7 +3611,30 @@ ret:
}
;
-create procedure ODS.ODS_API."user.invitations.get" () __soap_http 'text/xml'
+--!
+-- \deprecated Use user.invitation.approve() instead.
+--/
+create procedure ODS.ODS_API."user.invitation" (
+ in invitation_id int,
+ in approve smallint) __soap_http 'text/xml'
+{
+ return ODS.ODS_API."user.invitation.approve"(invitation_id, approve);
+}
+;
+
+--!
+-- \brief Get a list of pending invitations.
+--
+-- ODS allows users to be connected in a social network. This requires users to send invitations
+-- to other users. The other users then need to either approve or reject that invitation.
+--
+-- This method lists the invitations other users sent to the authenticated user.
+--
+-- \return FIXME
+--
+-- \sa user.invitation.new(), user.invitation.approve()
+--/
+create procedure ODS.ODS_API."user.invitation.list" () __soap_http 'text/xml'
{
declare uname varchar;
declare rc integer;
@@ -2953,12 +3649,34 @@ create procedure ODS.ODS_API."user.invitations.get" () __soap_http 'text/xml'
return ods_auth_failed ();
-- XXX: add sparql_exec after RDF data update triggers is done
+-- FIXME: simply return the values from sn_invitation
ret:
return ods_serialize_int_res (rc);
}
;
-create procedure ODS.ODS_API."user.relation_terminate" (
+--!
+-- \deprecated Use user.invitation.list() instead.
+--/
+create procedure ODS.ODS_API."user.invitations.get" () __soap_http 'text/xml'
+{
+ return ODS.ODS_API."user.invitation.list"();
+}
+;
+
+--!
+-- \brief Delete a connection to another user.
+--
+-- ODS allows users to be connected in a social network. This requires users to send invitations
+-- to other users. The other users then need to either approve or reject that invitation.
+--
+-- This method allows to remove a connection that has been created through an approved invitation.
+--
+-- \return An error code stating the success of the command execution as detailed in \ref ods_response_format_result_code.
+--
+-- \sa user.invitation.new(), user.invitation.list()
+--/
+create procedure ODS.ODS_API."user.relation.delete" (
in friend varchar) __soap_http 'text/xml'
{
declare uname varchar;
@@ -2978,6 +3696,19 @@ create procedure ODS.ODS_API."user.relation_terminate" (
}
;
+--!
+-- \deprecated Use user.relation.delete() instead.
+--/
+create procedure ODS.ODS_API."user.relation_terminate" (
+ in friend varchar) __soap_http 'text/xml'
+{
+ return ODS.ODS_API."user.relation.delete"(friend);
+}
+;
+
+--!
+-- \brief Change connection details. FIXME: this does nothing!
+--/
create procedure ODS.ODS_API."user.relation_update" (
in friend varchar,
in relation_details any) __soap_http 'text/xml'
@@ -3839,7 +4570,7 @@ create procedure ODS.ODS_API."user.mades.update" (
{
declare exit handler for sqlstate '*'
{
- exec (sprintf ('sparql clear graph <%s>', tmp), stat, msg);
+ SPARQL clear graph ?:tmp;
goto _next;
};
qrs := vector (0,0,0);
@@ -3886,7 +4617,7 @@ create procedure ODS.ODS_API."user.mades.update" (
}
}
_found:
- exec (sprintf ('sparql clear graph <%s>', tmp), stat, msg);
+ SPARQL clear graph ?:tmp;
}
_next:;
@@ -4522,6 +5253,33 @@ create procedure ODS.ODS_API."user.certificates.list" () __soap_http 'applicatio
}
;
+create procedure ODS.ODS_API."user.instances.list" () __soap_http 'text/xml'
+{
+ declare uname varchar;
+ declare _u_id integer;
+ declare retValue any;
+
+ 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 ();
+ _u_id := (select U_ID from DB.DBA.SYS_USERS where U_NAME = uname);
+
+ retValue := (select
+ xmlelement ('result',
+ xmlagg (
+ xmlelement ('instance',
+ xmlelement ('id', WAI_ID),
+ xmlelement ('name', WAI_NAME),
+ xmlelement ('type', DB.DBA.wa_type_to_app (WAI_TYPE_NAME)),
+ xmlelement ('member_type', WAM_MEMBER_TYPE))))
+ from DB.DBA.WA_MEMBER, DB.DBA.WA_INSTANCE where WAM_INST = WAI_NAME and WAM_USER = _u_id);
+ return serialize_to_UTF8_xml (retValue);
+}
+;
+
create procedure ODS.ODS_API."user.certificates.get" (
in id integer) __soap_http 'application/json'
{
@@ -4544,7 +5302,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 := ODS.ODS_API.SSL_WEBID_GET (UC_CERT);
+ agentID := DB.DBA.FOAF_SSL_WEBID_GET (UC_CERT);
fingerPrint := get_certificate_info (6, UC_CERT, 0, '');
certificate := UC_CERT;
enableLogin := UC_LOGIN;
@@ -4579,7 +5337,7 @@ create procedure ODS.ODS_API."user.certificates.update" (
_u_id := (select U_ID from DB.DBA.SYS_USERS where U_NAME = uname);
- agent := ODS.ODS_API.SSL_WEBID_GET (certificate);
+ agent := DB.DBA.FOAF_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.');
@@ -4820,7 +5578,7 @@ create procedure ODS.ODS_API.graph_clear (
in graph varchar)
{
commit work;
- exec (sprintf ('SPARQL clear graph <%s>', graph));
+ SPARQL clear graph ?:graph;
}
;
@@ -4875,7 +5633,8 @@ create procedure ODS.ODS_API.getFOAFDataArray (
select ?iri
from <%s>
where {
- ?iri a foaf:Person.
+ [] foaf:primaryTopic ?iri .
+ ?iri a foaf:Person .
} ', foafGraph)
);
@@ -4929,9 +5688,12 @@ _loginIn:
{
for (select UC_U_ID, UC_LOGIN from DB.DBA.WA_USER_CERTS where UC_FINGERPRINT = get_certificate_info (6)) do
{
+ loginName := (select U_NAME from DB.DBA.SYS_USERS where U_ID = UC_U_ID);
+ if (not isnull (loginName))
+ {
certLogin := 1;
certLoginEnable := coalesce (UC_LOGIN, 0);
- loginName := (select U_NAME from DB.DBA.SYS_USERS where U_ID = UC_U_ID);
+ }
}
}
V := ODS.ODS_API.extractFOAFDataArray (personUri, foafGraph);
@@ -4960,7 +5722,6 @@ _loginIn:
_exit:;
ODS.ODS_API.graph_clear (foafGraph);
- -- dbg_obj_print ('V', V);
return V;
}
;
@@ -5000,9 +5761,23 @@ 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 varchar;
- declare V, S, st, msg, rows, meta any;
+ declare S, st, msg, rows, meta any;
S := sprintf ('sparql
define input:storage ""
@@ -5046,6 +5821,7 @@ create procedure ODS.ODS_API.extractFOAFDataArray (
?onlineAccount_url
?sameAs_array
?knows_array
+ ?knows_name
?knows_nick
from <%s>
where {
@@ -5096,13 +5872,12 @@ create procedure ODS.ODS_API.extractFOAFDataArray (
} .
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;
@@ -5118,10 +5893,22 @@ create procedure ODS.ODS_API.extractFOAFDataArray (
}
}
}
- return V;
}
;
+--!
+-- \brief Fetch the contents of a FOAF user profile.
+--
+-- \param foafIRI The URL of the FOAF profile to lookup.
+-- \param spongerMode \em unused
+-- \param sslFOAFCheck If set to anything but \p 0 no action will be taken unless the connection is secure.
+-- \param outputMode \em unused
+-- \param sslLoginCheck \em unused
+--
+-- \return The details of the FOAF profile serialized as a JSON stream.
+--
+-- \b FIXME: support CN and fix outputMode.
+--/
create procedure ODS.ODS_API."user.getFOAFData" (
in foafIRI varchar,
in spongerMode integer := 0,
@@ -5139,81 +5926,131 @@ 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)
{
- return DB.DBA.FOAF_SSL_WEBID_GET (cert);
+ 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;
}
;
+--!
+-- \brief Fetch the FOAF profile for a WebID certificate.
+--
+-- The client needs to provide the WebID X.509 certificate as an additional context attribute.
+--
+-- \param sslFOAFCheck \em unused
+-- \param outputMode \em unused
+-- \param sslLoginCheck \em unused
+--
+-- \return The details of the FOAF profile serialized as a JSON stream.
+--/
create procedure ODS.ODS_API."user.getFOAFSSLData" (
in sslFOAFCheck integer := 0,
in outputMode integer := 1,
in sslLoginCheck integer := 0) __soap_http 'application/json'
{
- declare foafIRI, alts any;
+ declare rc, webid, webidType, graph, alts any;
declare V any;
- declare certLogin, certLoginEnable any;
+ declare cert, loginName, certLogin, certLoginEnable any;
- certLogin := 0;
+ 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;
certLoginEnable := 0;
- foafIRI := ODS.ODS_API.SSL_WEBID_GET ();
- if (not isnull (foafIRI))
+ for (select UC_U_ID, UC_LOGIN from DB.DBA.WA_USER_CERTS where UC_FINGERPRINT = get_certificate_info (6, cert, 0, '')) do
+ {
+ loginName := (select U_NAME from DB.DBA.SYS_USERS where U_ID = UC_U_ID);
+ if (not isnull (loginName))
+ {
+ certLogin := 1;
+ certLoginEnable := coalesce (UC_LOGIN, 0);
+ appendProperty (V, 'certLogin', cast (certLogin as varchar));
+ appendProperty (V, 'certLoginEnable', cast (certLoginEnable as varchar));
+ }
+ }
+ if (webidType = 0)
{
- 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;
+ -- 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 (is_https_ctx ()) -- try webfinger
+ else if (webidType = 2)
{
- declare agent any;
- agent := DB.DBA.FOAF_SSL_WEBFINGER ();
- if (agent is not null)
+ -- DI
+ ;
+ }
+ else if (webidType = 3)
+ {
+ -- SEARCH
+ ;
+ }
+ else if (webidType = 4)
+ {
+ -- SPONGE
+ ODS.ODS_API.extractPersonData (V, webid, graph);
+ }
+ else if (webidType = 5)
+ {
+ -- 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)
{
- 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;
- }
+ 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));
}
- else
- {
- foafIRI := ODS..FINGERPOINT_WEBID_GET ();
- if (foafIRI is not null)
- goto try_auth;
}
}
- return case when outputMode then obj2json (null) else null end;
+ 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);
}
;
@@ -5228,9 +6065,8 @@ create procedure ODS.ODS_API."user.getFacebookData" (
retValue := null;
if (isnull (fb) and DB.DBA._get_ods_fb_settings (fbOptions))
- {
fb := new DB.DBA.Facebook(fbOptions[0], fbOptions[1], http_param (), http_request_header ());
- }
+
if (not isnull (fb))
{
fbPaths := vector ();
@@ -5239,9 +6075,7 @@ create procedure ODS.ODS_API."user.getFacebookData" (
'last_name', 'family_name',
'sex', 'gender'
);
- retValue := jsonObject ();
- retValue := vector_concat (retValue, vector ('api_key', fb.api_key));
- retValue := vector_concat (retValue, vector ('secret', fb.secret));
+ retValue := vector_concat (jsonObject (), vector ('api_key', fb.api_key, 'secret', fb.secret));
if (length (fb._user))
{
resValue := fb.api_client.users_getInfo(fb._user, fields);
@@ -5255,13 +6089,11 @@ create procedure ODS.ODS_API."user.getFacebookData" (
tmpPath := '/users_getInfo_response/user/' || get_keyword (V[N], fbPaths, V[N]);
tmpValue := serialize_to_UTF8_xml (xpath_eval (sprintf ('string(%s)', tmpPath), resValue));
if (length (tmpValue))
- {
retValue := vector_concat (retValue, vector (get_keyword (V[N], fbMaps, V[N]), tmpValue));
}
}
}
}
- }
return case when outputMode then obj2json (retValue) else retValue end;
}
;
@@ -5358,7 +6190,7 @@ create procedure ODS.ODS_API."user.getKnowsData" (
}
_exit:;
- exec (sprintf ('SPARQL clear graph <%s>', foafGraph), st, msg, vector (), 0);
+ SPARQL clear graph ?:foafGraph;
return obj2json (V);
}
;
@@ -5668,6 +6500,39 @@ create procedure ODS.ODS_API."instance.get" (
}
;
+--!
+-- \brief Get the id of an ODS app instance.
+--
+-- Each ODS app has a unique numeric id which is required for almost
+-- all operations. This method allows to determine that id from the
+-- app instance's name (App instance names are oftern something like
+-- "foobar's Calendar").
+--
+-- \param instanceName The name of the app instance.
+--
+-- \return An error code as defined in \ref ods_response_format_result_code which in this case
+-- matches the instance id.
+--
+-- \sa \ref ods_instance_id
+--
+-- \b Example:
+-- \verbatim
+-- $ curl -i "http://demo.openlinksw.com/ods/api/instance.get.id?instanceName=Demo%20account%27s%20Briefcase&sid=c198c56e675abd9967b2b264d1119ae2&realm=wa"
+--
+-- HTTP/1.1 200 OK
+-- Server: Virtuoso/05.12.3041 (Solaris) x86_64-sun-solaris2.10-64 VDB
+-- Connection: Keep-Alive
+-- Date: Tue, 01 Dec 2009 12:39:19 GMT
+-- Accept-Ranges: bytes
+-- Content-Type: text/xml; charset="ISO-8859-1"
+-- Content-Length: 57
+--
+-- <result>
+-- <code>6</code>
+-- <message>Success</message>
+-- </result>
+-- \endverbatim
+--/
create procedure ODS.ODS_API."instance.get.id" (
in instanceName varchar) __soap_http 'text/xml'
{
@@ -5746,6 +6611,89 @@ ret:
}
;
+create procedure ODS.ODS_API.predicates ()
+{
+ return vector (
+ 'webIDVerified' , vector ('Certificate - Verified', 'boolean', 'boolean', vector ()),
+ 'certExpiration' , vector ('Certificate - Expiration Status', 'boolean', 'boolean', vector ()),
+ 'certSerial' , vector ('Certificate - Serial Number', 'varchar', 'varchar', vector ()),
+ 'webID' , vector ('Certificate - WebID', 'varchar', 'varchar', vector ('class', '_validate_ _webid_')),
+ 'certMail' , vector ('Certificate - Mail', 'varchar', 'varchar', vector ()),
+ 'certSubject' , vector ('Certificate - Subject', 'varchar', 'varchar', vector ()),
+ 'certIssuer' , vector ('Certificate - Issuer', 'varchar', 'varchar', vector ()),
+ 'certStartDate' , vector ('Certificate - Issue Date', 'date', 'date', vector ('size', '10', 'class', '_validate_ _date_', 'onclick', 'datePopup(\'-FIELD-\')', 'button', '<img id="-FIELD-_select" border="0" src="/oMail/i/pick_calendar.gif" onclick="javascript: datePopup(\'-FIELD-\');" />')),
+ 'certEndDate' , vector ('Certificate - Expiry Date', 'date', 'date', vector ('size', '10', 'class', '_validate_ _date_', 'onclick', 'datePopup(\'-FIELD-\')', 'button', '<img id="-FIELD-_select" border="0" src="/oMail/i/pick_calendar.gif" onclick="javascript: datePopup(\'-FIELD-\');" />')),
+ 'certDigest' , vector ('Certificate - Fingerprint Digest', 'digest', 'varchar', vector ('class', '_validate_ _digest_')),
+ 'certSparqlASK' , vector ('Certificate - SPARQL ASK', 'sparql', 'boolean', vector ())
+ );
+}
+;
+
+create procedure ODS.ODS_API.compares ()
+{
+ return vector (
+ 'eq' , vector ('equal to' , vector ('integer', 'date', 'varchar', 'address', 'priority', 'folder', 'boolean', 'sparql', 'digest'), 1),
+ 'neq' , vector ('not equal to' , vector ('integer', 'date', 'varchar', 'address', 'priority', 'folder', 'boolean', 'sparql', 'digest'), 1),
+ 'lt' , vector ('less than' , vector ('integer', 'date', 'priority'), 1),
+ 'lte' , vector ('less thanor equal to' , vector ('integer', 'date', 'priority'), 1),
+ 'gt' , vector ('greater than' , vector ('integer', 'date', 'priority'), 1),
+ 'gte' , vector ('greater than or equal to' , vector ('integer', 'date', 'priority'), 1),
+ 'contains' , vector ('contains substring' , vector ('varchar', 'address'), 1),
+ 'notContains' , vector ('does not contain substring', vector ('varchar', 'address'), 1),
+ 'startsWith' , vector ('starts with' , vector ('varchar', 'address'), 1),
+ 'notStartsWith', vector ('does not start with' , vector ('varchar', 'address'), 1),
+ 'endsWith' , vector ('ends with' , vector ('varchar', 'address'), 1),
+ 'notEndsWith' , vector ('does not end with' , vector ('varchar', 'address'), 1),
+ 'isNull' , vector ('is null' , vector ('address'), 0),
+ 'isNotNull' , vector ('is not null' , vector ('address'), 0)
+ );
+}
+;
+
+--!
+-- \brief Mapping of ODS supported comparison commands to SQL expressions.
+--
+-- The returned vector contains a mapping from comparison name (\p eq, \p gt, etc)
+-- to an SQL command which does the actual comparison. The command uses two variables:
+-- - value
+-- - pattern
+--
+-- One example is the \greater \p than command which is encoded as follows:
+-- \verbatim
+-- 'gt', '(^{value}^ > ^{pattern}^)'
+-- \endverbatim
+--
+-- This is used by sioc.sql for ACL rule checking only.
+--/
+create procedure ODS.ODS_API.commands ()
+{
+ return vector (
+ 'eq' , '(^{value}^ = ^{pattern}^)',
+ 'neq' , '(^{value}^ <> ^{pattern}^)',
+ 'lt' , '(^{value}^ < ^{pattern}^)',
+ 'lte' , '(^{value}^ <= ^{pattern}^)',
+ 'gt' , '(^{value}^ > ^{pattern}^)',
+ 'gte' , '(^{value}^ >= ^{pattern}^)',
+ 'contains' , '(strstr (ucase (^{value}^), ucase (^{pattern}^)) is not null)',
+ 'notContains' , '(strstr (ucase (^{value}^), ucase (^{pattern}^)) is null)',
+ 'startsWith' , '(starts_with (ucase (^{value}^), ucase (^{pattern}^)))',
+ 'notStartsWith', '(not (starts_with (ucase (^{value}^), ucase (^{pattern}^))))',
+ 'endsWith' , '(ends_with (ucase (^{value}^), ucase (^{pattern}^)))',
+ 'notEndsWith' , '(not (ends_with (ucase (^{value}^), ucase (^{pattern}^))))',
+ 'isNull' , '(DB.DBA.is_empty_or_null (^{value}^) = 1)',
+ 'isNotNull' , '(DB.DBA.is_empty_or_null (^{value}^) = 0)'
+ );
+}
+;
+
+-----------------------------------------------------------------------------
+--
+create procedure ODS.ODS_API."filtersData" () __soap_http 'application/json'
+{
+ return obj2json (vector (ODS.ODS_API."predicates" (), ODS.ODS_API."compares" ()));
+}
+;
+
-- global actions
create procedure ODS.ODS_API."site.search" (in pattern varchar, in options any) __soap_http 'text/xml'
@@ -5771,12 +6719,16 @@ 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;
@@ -5795,6 +6747,7 @@ grant execute on ODS.ODS_API."linkedinServer" to ODS_API;
grant execute on ODS.ODS_API."linkedinVerify" to ODS_API;
grant execute on ODS.ODS_API."user.checkAvalability" to ODS_API;
+grant execute on ODS.ODS_API."user.checkAvailability" to ODS_API;
grant execute on ODS.ODS_API."user.register" to ODS_API;
grant execute on ODS.ODS_API."user.authenticate" to ODS_API;
grant execute on ODS.ODS_API."user.login" to ODS_API;
@@ -5814,6 +6767,10 @@ grant execute on ODS.ODS_API."user.info" to ODS_API;
grant execute on ODS.ODS_API."user.info.webID" to ODS_API;
grant execute on ODS.ODS_API."user.certificateUrl" to ODS_API;
grant execute on ODS.ODS_API."user.search" to ODS_API;
+grant execute on ODS.ODS_API."user.invitation.new" to ODS_API;
+grant execute on ODS.ODS_API."user.invitation.approve" to ODS_API;
+grant execute on ODS.ODS_API."user.invitation.list" to ODS_API;
+grant execute on ODS.ODS_API."user.relation.delete" to ODS_API;
grant execute on ODS.ODS_API."user.invite" to ODS_API;
grant execute on ODS.ODS_API."user.invitation" to ODS_API;
grant execute on ODS.ODS_API."user.invitations.get" to ODS_API;
@@ -5873,6 +6830,7 @@ grant execute on ODS.ODS_API."user.knows.get" to ODS_API;
grant execute on ODS.ODS_API."user.knows.new" to ODS_API;
grant execute on ODS.ODS_API."user.knows.edit" to ODS_API;
grant execute on ODS.ODS_API."user.knows.delete" to ODS_API;
+grant execute on ODS.ODS_API."user.instances.list" to ODS_API;
grant execute on ODS.ODS_API."user.certificates.list" to ODS_API;
grant execute on ODS.ODS_API."user.certificates.get" to ODS_API;
grant execute on ODS.ODS_API."user.certificates.new" to ODS_API;
@@ -5902,6 +6860,7 @@ grant execute on ODS.ODS_API."instance.unfreeze" to ODS_API;
grant execute on ODS.ODS_API."site.search" to ODS_API;
+grant execute on ODS.ODS_API."filtersData" to ODS_API;
create procedure __user_password (in uname varchar)
{
diff --git a/appsrc/ODS-Framework/ods_ubiquity.html b/appsrc/ODS-Framework/ods_ubiquity.html
index 3bab0c3..e51d8f1 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-2011 OpenLink Software</div>
+ <div id="ft_t">Copyright © 1998-2012 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 e5e30bd..6ed0860 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.7 2010/09/20 10:15:23 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2008 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/openid.js b/appsrc/ODS-Framework/openid.js
index d2ff19c..77469dd 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-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/openid.sql b/appsrc/ODS-Framework/openid.sql
index 5d73996..ed8f546 100644
--- a/appsrc/ODS-Framework/openid.sql
+++ b/appsrc/ODS-Framework/openid.sql
@@ -1,12 +1,12 @@
--
--- $Id: openid.sql,v 1.17.2.6 2010/09/20 10:15:24 source Exp $
+-- $Id$
--
-- OpenID protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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..getDefaultHttps ();
+ ssl := ODS.ODS_API.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 602ec02..c05bbee 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.1 2010/09/20 10:15:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/openid_login.vspx b/appsrc/ODS-Framework/openid_login.vspx
index 8c9b43b..c6a3456 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.8 2011/02/03 10:26:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -53,6 +53,7 @@
<v:on-init><![CDATA[
declare cookie_vec, sid any;
declare pos, tmp any;
+ declare real_uid varchar;
set http_charset='UTF-8';
@@ -60,6 +61,14 @@
{
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;
@@ -68,11 +77,12 @@
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)
{
@@ -102,14 +112,12 @@
}
if (get_keyword ('sid', self.vc_event.ve_params) is null and is_https_ctx ())
{
- declare gr, stat, msg varchar;
+ declare gr, stat, msg, webid, vtype varchar;
declare rc int;
declare vec any;
- 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)
+ gr := 'http:' || uuid ();
+ rc := WEBID_AUTH_GEN_2 (null, 0, null, 1, 0, webid, gr, 0, vtype);
+ if (rc)
{
vec := OPENID.DBA.get_user_details (gr, self._identity);
if (vec is not null)
@@ -157,7 +165,12 @@
<div id="login_form">
<form> <!-- just to keep validator happy on this mockup -->
<label for="login_frm_username">User ID</label>
- <v:text name="username" type="hidden" value="--self._uname" xhtml_id="login_frm_username" /><?V self._uname ?><br />
+ <?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 />
<label for="password">Password</label>
<v:text name="password" value="" xhtml_id="login_frm_password" type="password" />
<div class="login_frm_button_row">
@@ -280,7 +293,7 @@
<a href="/ods/privacy.html">Privacy</a> |
<a href="/ods/rabuse.vspx">Report Abuse</a>
<div class="copyright">
- Copyright © 1998-2011 OpenLink Software
+ Copyright © 1998-2012 OpenLink Software
</div>
</div> <!-- FT_R -->
</div>
diff --git a/appsrc/ODS-Framework/pass_recovery.vspx b/appsrc/ODS-Framework/pass_recovery.vspx
index 165d86a..9138953 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.1 2010/09/20 10:15:24 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/ping_log.vspx b/appsrc/ODS-Framework/ping_log.vspx
index b32bf60..1b96c0c 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.1 2010/09/20 10:15:24 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/ping_svc.vspx b/appsrc/ODS-Framework/ping_svc.vspx
index dff8f92..7d492c8 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.4 2011/03/08 13:28:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/popup_browser.vspx b/appsrc/ODS-Framework/popup_browser.vspx
index 3eb42f0..2c57f92 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.1 2010/09/20 10:15:24 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/privacy.html b/appsrc/ODS-Framework/privacy.html
index c555b0b..51c3877 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.1 2010/09/20 10:15:24 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/provinces.sql b/appsrc/ODS-Framework/provinces.sql
index 51128ab..87e813a 100644
--- a/appsrc/ODS-Framework/provinces.sql
+++ b/appsrc/ODS-Framework/provinces.sql
@@ -1,5 +1,5 @@
--
--- $Id: provinces.sql,v 1.4.2.2 2010/12/10 16:04:14 source Exp $
+-- $Id$
--
-- Provinces list
@@ -7,7 +7,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/rabuse.vspx b/appsrc/ODS-Framework/rabuse.vspx
index b136f10..950c52e 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.1 2010/09/20 10:15:25 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/rdf_storage.vspx b/appsrc/ODS-Framework/rdf_storage.vspx
index 35bd121..989cb18 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.1 2010/09/20 10:15:25 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/rdfb.css b/appsrc/ODS-Framework/rdfb.css
index 3478cd9..c980ad5 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-2007 OpenLink Software
+* Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/appsrc/ODS-Framework/rdfb.js b/appsrc/ODS-Framework/rdfb.js
index d88e949..9934fb4 100644
--- a/appsrc/ODS-Framework/rdfb.js
+++ b/appsrc/ODS-Framework/rdfb.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdfb.js,v 1.13.2.5 2010/10/13 12:16:48 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2007 OpenLink Software
+ * Copyright (C) 2005-2012 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.5 2010/10/13 12:16:48 source Exp $";
+ var ver = "$Id$";
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 2b5ef5c..84fa7c0 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-2010 OpenLink Software
+ * 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
@@ -130,6 +130,8 @@ 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);
@@ -216,7 +218,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)
+ if (params[param] && params[param].length != 0 && params[param] != 'undefined')
data[property] = params[param];
}
var data = {};
@@ -232,6 +234,7 @@ 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');
@@ -255,8 +258,10 @@ function rfInit() {
if (!data['nick'] || !data['mbox']) {
hiddenCreate('oid-data', null, OAT.JSON.stringify(data));
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'});
+ 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']);
rfCheckUpdate(1);
} else {
var q = 'mode=1&data=' + encodeURIComponent(OAT.JSON.stringify(data));
@@ -310,7 +315,7 @@ function rfInit() {
rfRowInput(tbl, 'Login Name', 'rf_uid_3', {value: rfSslData.loginName, width: '150px'});
if (rfSslData.mbox && rfSslData.certLogin)
- rfRowValue(tbl, 'E-Mail', sslData.mbox);
+ rfRowValue(tbl, 'E-Mail', rfSslData.mbox);
if (!rfSslData.certLogin)
rfRowInput(tbl, 'E-Mail', 'rf_email_3', {value: rfSslData.mbox, width: '300px'});
@@ -399,6 +404,7 @@ 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');
@@ -409,6 +415,7 @@ function rfEnd() {
if (rfAjaxs == 0) {
OAT.Dom.hide('rf_throbber');
OAT.Dom.show('rf_close');
+ $('rf_check').disabled = false;
$('rf_signup').disabled = false;
}
}
@@ -520,7 +527,7 @@ function rfOpenIdAuthenticate(prefix) {
var xml = OAT.Xml.createXmlDoc(data);
var error = OAT.Xml.xpath (xml, '//error_response', {});
if (error.length)
- showError('Invalied OpenID Server');
+ showError('Invalid 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 4bac869..5991413 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.3 2010/09/22 13:55:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/registration_xml.sql b/appsrc/ODS-Framework/registration_xml.sql
index bcd40e5..ef9c3e6 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.1 2010/09/20 10:15:25 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -27,7 +27,7 @@ UPDATE WA_SETTINGS SET WS_REGISTRATION_XML = xtree_doc('
<field stored="none">
<label for="reguid">Login Name<div style="font-weight: normal; display:inline; color:red;"> *</div></label>
<v:text xhtml_readonly="readonly" error-glyph="?" xhtml_id="reguid" value="--self.u_name">
- <v:validator test="length" min="1" max="20" message="Login name cannot be empty or longer then 20 chars"/>
+ <v:validator test="length" min="1" max="20" message="Login name cannot be empty or longer than 20 chars"/>
</v:text>
</field>
<field id="TITLE" stored="user_options">
diff --git a/appsrc/ODS-Framework/related_apps.vspx b/appsrc/ODS-Framework/related_apps.vspx
index 52a42fd..07bef71 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.2 2010/11/11 12:38:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/scot.sql b/appsrc/ODS-Framework/scot.sql
index 8354b3d..4acbd6b 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.2 2010/09/20 10:15:25 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/search.vspx b/appsrc/ODS-Framework/search.vspx
index 58146a7..19bd952 100644
--- a/appsrc/ODS-Framework/search.vspx
+++ b/appsrc/ODS-Framework/search.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: search.vspx,v 1.28.2.7 2010/10/13 12:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 OpenLink Software</Attribution>
+ <Attribution>Copyright (C) 1998-2012 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 25c5875..a230386 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.1 2010/09/20 10:15:25 source Exp $
+-- $Id$
--
-- AJAX Handler for the google map control
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/security.vspx b/appsrc/ODS-Framework/security.vspx
index b5cbc48..25b0b7c 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.1 2010/09/20 10:15:25 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/semping.sql b/appsrc/ODS-Framework/semping.sql
index ccb9c5d..91c08b5 100644
--- a/appsrc/ODS-Framework/semping.sql
+++ b/appsrc/ODS-Framework/semping.sql
@@ -49,7 +49,7 @@ create trigger PING_RULES_I after insert on PING_RULES referencing new as N
declare ep varchar;
if (0 = length (N.PR_GRAPH))
return;
- ep := sprintf ('http://%s/semping', sioc..get_cname ());
+ ep := sprintf ('http://%s/semping/rest', sioc..get_cname ());
sparql insert into graph iri(?:N.PR_GRAPH) { `iri(?:N.PR_IRI)` <http://purl.org/net/pingback/to> `iri(?:ep)` . };
}
;
@@ -59,7 +59,7 @@ create trigger PING_RULES_U after update on PING_RULES referencing old as O, new
declare ep varchar;
if (0 = length (N.PR_GRAPH))
return;
- ep := sprintf ('http://%s/semping', sioc..get_cname ());
+ ep := sprintf ('http://%s/semping/rest', sioc..get_cname ());
sparql delete from graph iri(?:O.PR_GRAPH) { `iri(?:O.PR_IRI)` <http://purl.org/net/pingback/to> `iri(?:ep)` . };
sparql insert into graph iri(?:N.PR_GRAPH) { `iri(?:N.PR_IRI)` <http://purl.org/net/pingback/to> `iri(?:ep)` . };
}
@@ -70,7 +70,7 @@ create trigger PING_RULES_D after delete on PING_RULES referencing old as O
declare ep varchar;
if (0 = length (O.PR_GRAPH))
return;
- ep := sprintf ('http://%s/semping', sioc..get_cname ());
+ ep := sprintf ('http://%s/semping/rest', sioc..get_cname ());
sparql delete from graph iri(?:O.PR_GRAPH) { `iri(?:O.PR_IRI)` <http://purl.org/net/pingback/to> `iri(?:ep)` . };
}
;
@@ -105,13 +105,13 @@ create procedure CLI_PING_SRV (in src varchar, in tgt varchar)
url := WS.WS.VFS_URI_COMPOSE (hf);
sparql load ?:url into graph ?:gr;
pserv := (sparql prefix pingback: <http://purl.org/net/pingback/> select ?ps where { graph ?:gr { ?:tgt pingback:service ?ps }});
- proto := 'REST';
+ proto := 'RPC';
if (pserv is null)
{
pserv := (sparql prefix pingback: <http://purl.org/net/pingback/> select ?ps where { graph ?:gr { ?:tgt pingback:to ?ps }});
- proto := 'RPC';
+ proto := 'REST';
}
- sparql clear ?:gr;
+ sparql clear graph ?: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)
@@ -169,8 +169,27 @@ DB.DBA.VHOST_DEFINE ( lhost=>'*ini*', vhost=>'*ini*', lpath=>'/semping/rest', pp
);
-create procedure "semping-rest" (in source varchar, in target varchar) returns varchar __SOAP_HTTP 'text/plain'
+create procedure "semping-rest" (in source varchar := null, in target varchar := null) returns varchar __SOAP_HTTP 'text/plain'
{
+ if (source is null or target is null)
+ {
+ http_header ('Content-Type: text/html\r\n');
+ http (
+ '<!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" xmlns:pingback="http://purl.org/net/pingback/">
+ <head> <title>Pingback Service</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> </head>
+ <body typeof="pingback:Container">
+ <form method="post" action="">
+ <p>source: <input type="text" property="pingback:source" name="source" /></p>
+ <p>target: <input type="text" property="pingback:target" name="target" /></p>
+ <p>comment: <input maxlength="256" type="text" name="comment" /></p>
+ <p><input type="submit" name="submit" value="Send" /></p>
+ </form>
+ </body>
+ </html>'
+ );
+ return '';
+ }
return "pingback.ping" (source, target);
}
;
@@ -187,8 +206,8 @@ create procedure "pingback.ping" (in source varchar, in target varchar)
signal ('42000', 'Access denied');
}
- -- dbg_obj_print ('------------------------------------');
- -- dbg_obj_print_vars (source, target);
+ dbg_obj_print ('------------------------------------');
+ dbg_obj_print_vars (source, target);
set_user_id ('dba');
srcgr := 'urn:temp.semping.src:' || uuid ();
@@ -219,7 +238,7 @@ create procedure "pingback.ping" (in source varchar, in target varchar)
}
mail := (sparql prefix foaf: <http://xmlns.com/foaf/0.1/> select ?mbox where { graph `iri(?:tgtgr)` { `iri(?:target)` foaf:mbox ?mbox . }});
- -- dbg_obj_print_vars (pred, mail);
+ dbg_obj_print_vars (pred, mail);
sparql clear graph iri(?:srcgr);
sparql clear graph iri(?:tgtgr);
@@ -240,6 +259,7 @@ create procedure "pingback.ping" (in source varchar, in target varchar)
aq := async_queue (1);
aq_request (aq, 'SEMPING.DBA.CLI_NOTIFY', vector ());
+ http_status_set (201);
return 'Success';
}
;
@@ -284,7 +304,7 @@ again:
if (PR_FLAG = 1)
{
sparql insert into graph iri(?:PR_GRAPH) { `iri(?:tgt)` `iri(?:prop)` `iri(?:src)` };
- insert into DB.DBA.WA_USER_RELATED_RES (WUR_U_ID, WUR_P_IRI, WUR_SEEALSO_IRI) values (PR_U_ID, prop, src);
+ insert soft DB.DBA.WA_USER_RELATED_RES (WUR_U_ID, WUR_P_IRI, WUR_SEEALSO_IRI) values (PR_U_ID, prop, src);
commit work;
}
}
diff --git a/appsrc/ODS-Framework/semping_app.vspx b/appsrc/ODS-Framework/semping_app.vspx
index b7dc4f9..0429c30 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.6 2011/03/08 13:28:16 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/semping_log.vspx b/appsrc/ODS-Framework/semping_log.vspx
index f36002f..783e5ee 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.3 2010/09/20 10:15:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/server.vspx b/appsrc/ODS-Framework/server.vspx
index ff8a823..a2e1f8f 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.1 2010/09/20 10:15:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/services.vspx b/appsrc/ODS-Framework/services.vspx
index 23fd767..ef1c908 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.4 2010/11/11 12:38:18 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -454,8 +454,7 @@
<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 or
- (control.vc_parent as vspx_row_template).te_rowset[6] in ('oMail', 'IM'))
+ if ((control.vc_parent as vspx_row_template).te_rowset[7] = 1)
control.vc_enabled := 0;
]]>
</v:after-data-bind>
diff --git a/appsrc/ODS-Framework/settings.vspx b/appsrc/ODS-Framework/settings.vspx
index 8aed575..0d063a8 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.1 2010/09/20 10:15:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sfoaf.xml b/appsrc/ODS-Framework/sfoaf.xml
index fc50daa..63c1bab 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.1 2010/09/20 10:15:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sfront.vspx b/appsrc/ODS-Framework/sfront.vspx
index 53ba84a..b10a17a 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.1 2010/09/20 10:15:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sioc.sql b/appsrc/ODS-Framework/sioc.sql
index 525622a..b867575 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.53 2011/08/01 14:14:21 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
@@ -41,7 +41,8 @@ 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;
@@ -53,32 +54,18 @@ create procedure get_graph_ext (in access_mode integer)
};
create procedure get_graph_new (
- in instance_id integer := null,
in access_mode integer := null,
in object_iri varchar := null)
{
- 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;
+ declare V any;
if (access_mode = 1)
return get_graph ();
- 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;
+ 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]);
};
create procedure get_ods_link ()
@@ -224,11 +211,26 @@ 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 oplflt_iri (in s varchar)
+{
+ return concat ('http://www.openlinksw.com/schemas/acl/filter#', 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);
@@ -737,7 +739,7 @@ create procedure sioc_user (in graph_iri varchar, in iri varchar, in u_name varc
--!!! ACL }
DB.DBA.ODS_QUAD_URI (graph_iri, iri, sioc_iri ('account_of'), person_iri);
- DB.DBA.ODS_QUAD_URI (graph_iri, person_iri, foaf_iri ('holdsAccount'), iri);
+ DB.DBA.ODS_QUAD_URI (graph_iri, person_iri, foaf_iri ('account'), iri);
-- OpenID (new)
DB.DBA.ODS_QUAD_URI (graph_iri, person_iri, foaf_iri ('openid'), link);
@@ -820,11 +822,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, 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 (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_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);
+ 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);
}
return;
}
@@ -1108,26 +1110,6 @@ 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');
};
@@ -1266,7 +1248,7 @@ create procedure sioc_user_offerlist (in user_id integer, in ol_id integer, in o
sioc_log_message (__SQL_MESSAGE);
return;
};
- user_iri := user_iri (user_id);
+ user_iri := person_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))
@@ -1347,7 +1329,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 := user_iri (user_id);
+ user_iri := person_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))
@@ -1409,7 +1391,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 := user_iri (user_id);
+ user_iri := person_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))
@@ -1428,7 +1410,7 @@ create procedure sioc_user_knows_delete (in user_id integer, in k_id integer, in
sioc_log_message (__SQL_MESSAGE);
return;
};
- user_iri := user_iri (user_id);
+ user_iri := person_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))
@@ -1448,7 +1430,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 := user_iri (user_id);
+ user_iri := person_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');
@@ -1601,7 +1583,7 @@ create procedure sioc_user_account (in graph_iri varchar, in iri varchar, in nam
DB.DBA.ODS_QUAD_URI (graph_iri, uri, rdf_iri ('type'), foaf_iri ('OnlineAccount'));
DB.DBA.ODS_QUAD_URI (graph_iri, uri, foaf_iri ('accountServiceHomepage'), url);
DB.DBA.ODS_QUAD_URI_L (graph_iri, uri, foaf_iri ('accountName'), name);
- DB.DBA.ODS_QUAD_URI (graph_iri, pers_iri, foaf_iri ('holdsAccount'), uri);
+ DB.DBA.ODS_QUAD_URI (graph_iri, pers_iri, foaf_iri ('account'), uri);
};
create procedure sioc_user_account_delete (in graph_iri varchar, in iri varchar, in name varchar, in uri varchar := null)
@@ -1971,11 +1953,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'), ses);
+ --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);
}
if (do_ann)
{
@@ -2271,7 +2253,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, sioc_version varchar;
+ declare iri, site_iri, graph_iri, tmp_graph_iri, forum_iri, sioc_version varchar;
declare fCreate, cpt, deadl, cnt int;
declare exit handler for sqlstate '*', not found
@@ -2303,6 +2285,30 @@ 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 ();
@@ -2340,7 +2346,7 @@ create procedure fill_ods_sioc (in doall int := 0)
else -- sioc:User
{
declare u_site_iri, person_iri any;
- declare forum_name, forum_iri any;
+ declare forum_name any;
iri := user_iri (u_id);
if (iri is not null)
@@ -2499,7 +2505,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 ((WAI_IS_PUBLIC = 1) or (WAI_TYPE_NAME = 'oDrive')) do
+ and SIOC..instance_sioc_check (WAI_IS_PUBLIC, WAI_TYPE_NAME) = 1 do
{
instance_sioc_data (
WAM_INST,
@@ -2543,7 +2549,8 @@ create procedure fill_ods_sioc (in doall int := 0)
for select * from SEMPING.DBA.PING_RULES where PR_GRAPH = graph_iri do
{
sparql insert into graph iri(?:PR_GRAPH) { `iri(?:PR_IRI)` <http://purl.org/net/pingback/to> `iri(?:ep2)` . };
- sparql insert into graph iri(?:PR_GRAPH) { `iri(?:PR_IRI)` <http://purl.org/net/pingback/service> `iri(?:ep)` . };
+ -- XXX: obsolete
+ --sparql insert into graph iri(?:PR_GRAPH) { `iri(?:PR_IRI)` <http://purl.org/net/pingback/service> `iri(?:ep)` . };
}
{
@@ -3627,14 +3634,24 @@ 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 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)
+ 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)
{
declare graph_iri, user_iri, role_iri, forum_iri, site_iri, svc_proc_name varchar;
declare exit handler for sqlstate '*'
@@ -3643,28 +3660,43 @@ create procedure instance_sioc_data (
return;
};
- if ((N_WAM_MEMBER_TYPE = 1) and ((N_WAM_IS_PUBLIC > 0) or (N_WAM_APP_TYPE = 'oDrive')))
+ 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)
+ {
+ SIOC..private_init ();
+ SIOC..private_graph_add (graph_iri);
+ if (not SIOC..private_graph_check (graph_iri))
+ return;
+ }
+
site_iri := get_graph ();
- 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);
+ 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);
-- add services here
- svc_proc_name := sprintf ('SIOC.DBA.ods_%s_services', DB.DBA.wa_type_to_app (N_WAM_APP_TYPE));
+ svc_proc_name := sprintf ('SIOC.DBA.ods_%s_services', DB.DBA.wa_type_to_app (_WAM_APP_TYPE));
if (__proc_exists (svc_proc_name))
- call (svc_proc_name) (graph_iri, forum_iri, N_WAM_USER, N_WAM_INST);
+ call (svc_proc_name) (graph_iri, forum_iri, _WAM_USER, _WAM_INST);
}
+ if (not _WAM_IS_PUBLIC)
+ {
+ SIOC..private_user_add (graph_iri, _WAM_USER);
+ if (not SIOC..private_graph_check (graph_iri))
+ return;
+ }
- user_iri := user_iri (N_WAM_USER);
- role_iri := role_iri_by_name (N_WAM_INST, N_WAM_USER);
+ user_iri := user_iri (_WAM_USER);
+ role_iri := role_iri_by_name (_WAM_INST, _WAM_USER);
- 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')))
+_social:
+ if ((user_iri is not null) and (role_iri is not null) and (forum_iri is not null))
{
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);
@@ -3675,33 +3707,26 @@ create procedure instance_sioc_data (
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 (N_WAM_APP_TYPE = 'Community')
- {
- declare person_iri any;
+ if (_WAM_APP_TYPE = 'Community')
+ DB.DBA.ODS_QUAD_URI (graph_iri, group_iri (forum_iri), foaf_iri ('member'), person_iri (user_iri));
- 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')
+ if (_WAM_APP_TYPE = 'AddressBook')
{
- N_WAM_APP_TYPE := 'SocialNetwork';
- goto do_social;
+ _WAM_APP_TYPE := 'SocialNetwork';
+ forum_iri := forum_iri ('SocialNetwork', _WAM_INST);
+ graph_iri := get_graph_new (_WAM_IS_PUBLIC, forum_iri);
+ goto _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 trigger WA_MEMBER_SIOC_D before delete on DB.DBA.WA_MEMBER referencing old as O
+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)
{
declare p_name varchar;
declare user_iri, graph_iri, role_iri, forum_iri varchar;
@@ -3711,132 +3736,351 @@ create trigger WA_MEMBER_SIOC_D before delete on DB.DBA.WA_MEMBER referencing ol
return;
};
- 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 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)
{
+ 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_sioc2', DB.DBA.wa_type_to_app (O.WAM_APP_TYPE));
+ p_name := sprintf ('SIOC.DBA.clean_ods_%s_sioc', DB.DBA.wa_type_to_app (_WAM_APP_TYPE));
if (__proc_exists (p_name))
- call (p_name) (O.WAM_INST, O.WAM_IS_PUBLIC);
+ call (p_name) (_WAM_INST, _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 (O.WAM_APP_TYPE));
+ SIOC..ods_object_services_dettach (graph_iri, forum_iri, DB.DBA.wa_type_to_app (_WAM_APP_TYPE));
}
- user_iri := user_iri (O.WAM_USER);
- role_iri := role_iri_by_name (O.WAM_INST, O.WAM_USER);
+ 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);
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;
- person_iri := person_iri (user_iri);
- delete_quad_po (graph_iri, foaf_iri ('member'), person_iri);
- }
-};
+ 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);
+}
+;
-- 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 varchar;
- declare o_graph_iri, n_graph_iri, site_iri, o_forum_iri, n_forum_iri, role_iri, o_role_iri varchar;
+ 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 exit handler for sqlstate '*'
{
sioc_log_message (__SQL_MESSAGE);
return;
};
- if ((N.WAI_IS_PUBLIC = 0) and (O.WAI_IS_PUBLIC = 0))
- 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 (null, N.WAI_IS_PUBLIC, n_forum_iri);
+ 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 (null, O.WAI_IS_PUBLIC, o_forum_iri);
- if (N.WAI_TYPE_NAME = 'Community')
- {
- declare group_iri any;
+ o_graph_iri := SIOC..get_graph_new (O.WAI_IS_PUBLIC, o_forum_iri);
- group_iri := group_iri (o_forum_iri);
- delete_quad_sp (o_graph_iri, group_iri, foaf_iri ('name'));
- }
+ -- no SIOC related changes
+ if ((n_graph_iri = o_graph_iri) and (n_forum_iri = o_forum_iri))
+ return;
- -- 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);
+ -- 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);
- 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));
+ if (not SIOC..instance_sioc_check (N.WAI_IS_PUBLIC, N.WAI_TYPE_NAME))
return;
- }
- -- old: private data - must be created forum
- if (O.WAI_IS_PUBLIC = 0)
+ -- 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)
{
- 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);
- }
- else if (N.WAI_IS_PUBLIC <> O.WAI_IS_PUBLIC)
+ 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
{
- 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);
+ declare _role varchar;
- 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;
+ _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 := (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';
+ 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);
+ }
+ }
- 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);
- }
+ -- 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);
+}
+;
- -- refresh be created forum
- if (N.WAI_IS_PUBLIC <> O.WAI_IS_PUBLIC)
+--
+-- Private graphs
+--
+create procedure SIOC..private_graph ()
+{
+ return 'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs';
+}
+;
+
+create procedure SIOC..private_init ()
+{
+ declare exit handler for sqlstate '*' {return 0;};
+
+ -- 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);
+ return 1;
+}
+;
+
+--!
+-- \brief Make an RDF graph private.
+--
+-- \param graph_iri The IRI of the graph to make private. The graph will be private afterwards.
+-- Without subsequent calls to SIOC..private_user_add nobody can read or write the graph.
+--
+-- \return \p 1 on success, \p 0 otherwise.
+--
+-- \sa SIOC..private_graph_remove, SIOC..private_user_add
+--/
+create procedure SIOC..private_graph_add (
+ in graph_iri varchar)
+{
+ declare exit handler for sqlstate '*' {return 0;};
+
+ DB.DBA.RDF_GRAPH_GROUP_INS (SIOC..private_graph (), graph_iri);
+ return 1;
+}
+;
+
+--!
+-- \brief Make an RDF graph public.
+--
+-- \param The IRI of the graph to make public.
+--
+-- \sa SIOC..private_graph_remove, SIOC..private_user_add
+--/
+create procedure SIOC..private_graph_remove (
+ in graph_iri varchar)
+{
+ DB.DBA.RDF_GRAPH_GROUP_DEL (SIOC..private_graph (), graph_iri);
+}
+;
+
+--!
+-- \brief Check if an RDF graph is private or not.
+--
+-- Private graphs can still be readable or even writable by certain users,
+-- depending on the configured rights.
+--
+-- \param graph_iri The IRI of the graph to check.
+--
+-- \return \p 1 if the given graph is private, \p 0 otherwise.
+--
+-- \sa SIOC..private_graph_add, SIOC..private_user_add
+--/
+create procedure SIOC..private_graph_check (
+ in graph_iri varchar)
+{
+ declare private_graph varchar;
+
+ private_graph := SIOC..private_graph ();
+ if (not exists (select top 1 1 from DB.DBA.RDF_GRAPH_GROUP where RGG_IRI = private_graph))
+ return 0;
+
+ if (not exists (select top 1 1 from DB.DBA.RDF_GRAPH_GROUP_MEMBER where RGGM_GROUP_IID = iri_to_id (private_graph) and RGGM_MEMBER_IID = iri_to_id (graph_iri)))
+ return 0;
+
+ return 1;
+}
+;
+
+--!
+-- \brief Grant access to a private RDF graph.
+--
+-- Grants access to a certain RDF graph. There is no need to call SIOC..private_graph_add before.
+-- The given graph is made private automatically.
+--
+-- \param graph_iri The IRI of the graph to grant access to.
+-- \param uid The numerical or string ID of the SQL user to grant access to \p graph_iri.
+-- \param rights The rights to grant to \p uid:
+-- - \p 1 - Read
+-- - \p 2 - Write
+-- - \p 3 - Read/Write
+--
+-- \return \p 1 on success, \p 0 otherwise.
+--
+-- \sa SIOC..private_graph_add, SIOC..private_user_add
+--/
+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_GROUP_INS (SIOC..private_graph (), graph_iri);
+ DB.DBA.RDF_GRAPH_USER_PERMS_SET (graph_iri, uid, rights);
+ return 1;
+}
+;
+
+--!
+-- \brief Revoke access to a private RDF graph.
+--
+-- \param graph_iri The IRI of the private graph to revoke access to,
+-- \param uid The numerical or string ID of the SQL user to revoke access from.
+--
+-- \sa SIOC..private_user_add
+--/
+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);
+ return 0;
+}
+;
+
+--
+-- Private WebID rights
+--
+create procedure SIOC..private_acl_insert (
+ inout graph_iri varchar,
+ inout acl any)
+{
+ declare uid, rights any;
+ declare N, aclArray any;
+
+ aclArray := deserialize (acl);
+ for (N := 0; N < length (aclArray); N := N + 1)
{
- 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);
+ 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';
+ }
+ if (not isnull (uid))
+ {
+ 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);
+ }
+ }
+}
+;
+
+create procedure SIOC..private_acl_delete (
+ inout graph_iri varchar,
+ inout acl any)
+{
+ declare uid any;
+ declare N, aclArray any;
+
+ aclArray := deserialize (acl);
+ for (N := 0; N < length (aclArray); N := N + 1)
+ {
+ 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';
+ }
+ if (not isnull (uid))
+ SIOC..private_user_remove (graph_iri, uid);
+ }
+}
+;
--
-- ACL
@@ -3884,8 +4128,8 @@ create procedure SIOC..acl_insert (
inout iri varchar,
inout acl any)
{
- declare acl_iri, clean_iri varchar;
- declare N, aclArray any;
+ declare acl_iri, clean_iri, filter_iri, criteria_iri varchar;
+ declare N, M, aclArray any;
declare exit handler for sqlstate '*'
{
sioc_log_message (__SQL_MESSAGE);
@@ -3896,7 +4140,7 @@ create procedure SIOC..acl_insert (
aclArray := deserialize (acl);
for (N := 0; N < length (aclArray); N := N + 1)
{
- acl_iri := clean_iri || sprintf('#acl%d', N);
+ acl_iri := clean_iri || sprintf('#acl_%d', N);
DB.DBA.ODS_QUAD_URI (graph_iri, acl_iri, rdf_iri ('type'), acl_iri ('Authorization'));
DB.DBA.ODS_QUAD_URI (graph_iri, acl_iri, acl_iri ('accessTo'), iri);
@@ -3912,6 +4156,21 @@ create procedure SIOC..acl_insert (
{
DB.DBA.ODS_QUAD_URI (graph_iri, acl_iri, acl_iri ('agentClass'), foaf_iri('Agent'));
}
+ else if (aclArray[N][2] = 'advanced')
+ {
+ filter_iri := clean_iri || sprintf('#filter_%d', N);
+ DB.DBA.ODS_QUAD_URI (graph_iri, acl_iri, oplflt_iri ('hasFilter'), filter_iri);
+ for (M := 0; M < length (aclArray[N][1]); M := M + 1)
+ {
+ criteria_iri := clean_iri || sprintf('#criteria_%d_%d', N, M);
+ DB.DBA.ODS_QUAD_URI (graph_iri, filter_iri, oplflt_iri ('hasCriteria'), criteria_iri);
+ DB.DBA.ODS_QUAD_URI (graph_iri, criteria_iri, oplflt_iri ('operand'), oplflt_iri (aclArray[N][1][M][1]));
+ DB.DBA.ODS_QUAD_URI (graph_iri, criteria_iri, oplflt_iri ('condition'), oplflt_iri (aclArray[N][1][M][2]));
+ DB.DBA.ODS_QUAD_URI_L (graph_iri, criteria_iri, oplflt_iri ('value'), aclArray[N][1][M][3]);
+ if ((length (aclArray[N][1][M]) > 3) and not DB.DBA.is_empty_or_null (aclArray[N][1][M][4]))
+ DB.DBA.ODS_QUAD_URI_L (graph_iri, criteria_iri, oplflt_iri ('statement'), aclArray[N][1][M][4]);
+ }
+ }
if (aclArray[N][3])
DB.DBA.ODS_QUAD_URI (graph_iri, acl_iri, acl_iri ('mode'), acl_iri('Read'));
if (aclArray[N][4])
@@ -3927,8 +4186,8 @@ create procedure SIOC..acl_delete (
inout iri varchar,
inout acl any)
{
- declare acl_iri, clean_iri varchar;
- declare N, aclArray any;
+ declare acl_iri, clean_iri, filter_iri, criteria_iri varchar;
+ declare N, M, aclArray any;
declare exit handler for sqlstate '*'
{
sioc_log_message (__SQL_MESSAGE);
@@ -3941,122 +4200,95 @@ create procedure SIOC..acl_delete (
{
acl_iri := clean_iri || sprintf('#acl%d', N);
delete_quad_s_or_o (graph_iri, acl_iri, acl_iri);
+ acl_iri := clean_iri || sprintf('#acl_%d', N);
+ delete_quad_s_or_o (graph_iri, acl_iri, acl_iri);
+ if (aclArray[N][2] = 'advanced')
+ {
+ filter_iri := clean_iri || sprintf('#filter_%d', N);
+ delete_quad_s_or_o (graph_iri, filter_iri, filter_iri);
+ for (M := 0; M < length (aclArray[N][1]); M := M + 1)
+ {
+ criteria_iri := clean_iri || sprintf('#criteria_%d_%d', N, M);
+ delete_quad_s_or_o (graph_iri, criteria_iri, criteria_iri);
+ }
+ }
}
}
;
-create procedure SIOC..acl_webID ()
+create procedure SIOC..acl_webid (
+ inout webid varchar,
+ inout graph varchar := null)
{
- declare retIRI varchar;
- declare foafIRI, foafGraph, loadIRI, localIRI any;
- declare S, V, info, st, msg, data, meta any;
+ declare cert, vtype any;
if (not is_https_ctx ())
- {
- retIRI := null;
- goto _exit;
- }
+ return null;
- retIRI := connection_get ('vspx_vebid');
- if (not isnull (retIRI))
+ webid := connection_get ('vspx_vebid');
+ if (not isnull (webid))
{
- if (retIRI = '')
- retIRI := null;
+ if (webid = '')
+ webid := null;
goto _exit;
}
- 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;
- }
+ set_user_id ('dba');
+ cert := client_attr ('client_certificate');
+ if (not DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 0, webid, graph, 0, vtype))
+ webid := null;
+ connection_set ('vspx_vebid', coalesce (webid, ''));
- 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);
+_exit:;
+ return webid;
+}
+;
+
+create procedure SIOC..acl_prepare_sql (
+ inout _sql varchar,
+ inout _sqlParams any,
+ in _params any)
+{
+ declare _name, _value, _pattern, _char varchar;
+ declare V any;
-_set:;
- connection_set ('vspx_vebid', coalesce (retIRI, ''));
+ _char := '?';
+ if (_sql like 'sparql%')
+ _char := '??';
+ _pattern := '\\^\\{([a-zA-Z0-9])+\\}\\^';
+ while (1)
+ {
+ V := regexp_parse (_pattern, _sql, 0);
+ if (isnull (V))
+ goto _exit;
+
+ _name := subseq (_sql, V[0]+2, V[1]-2);
+ _value := get_keyword (_name, _params);
+ _sqlParams := vector_concat (_sqlParams, vector (_value));
+ _sql := regexp_replace (_sql, _pattern, _char);
+ }
_exit:;
- return retIRI;
+ return;
}
;
-create procedure SIOC..acl_check (
+create procedure SIOC..acl_check_internal (
+ in webid varchar,
+ in webidGraph varchar,
in acl_graph_iri varchar,
in acl_groups_iri varchar,
in acl_iris any)
{
- declare N, M, I integer;
- declare tmp, rc, foafIRI, acl_iri varchar;
- declare IRIs any;
+ declare M, I integer;
+ declare rc, acl_iri varchar;
+ declare _cert, _commands, _command any;
+ declare _filterMode, _filterValue, _mode, _filter, _criteria, _operand, _condition, _pattern, _statement, _params any;
+ declare _sql, _state, _msg, _sqlParams, _meta, _rows any;
rc := '';
- foafIRI := SIOC..acl_webID ();
- if (isnull (foafIRI))
- goto _exit;
-
- IRIs := vector (vector(), vector(), vector());
- for (N := 0; N < length (acl_iris); N := N + 1)
+ foreach (any acl_iri in acl_iris) do
{
- tmp := '';
- acl_iri := acl_iris[N];
for ( sparql
define input:storage ""
prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -4069,7 +4301,7 @@ create procedure SIOC..acl_check (
{
?rule rdf:type acl:Authorization ;
acl:accessTo `iri(?:acl_iri)` ;
- acl:agent `iri(?:foafIRI)` ;
+ acl:agent `iri(?:webid)` ;
acl:agent ?p1 .
OPTIONAL {?rule acl:mode ?mode .} .
}
@@ -4097,7 +4329,7 @@ create procedure SIOC..acl_check (
graph `iri(?:acl_groups_iri)`
{
?p3 rdf:type foaf:Group ;
- foaf:member `iri(?:foafIRI)` .
+ foaf:member `iri(?:webid)` .
}
}
}
@@ -4112,12 +4344,6 @@ create procedure SIOC..acl_check (
else
goto _skip;
- tmp := coalesce ("p1", coalesce ("p2", "p3"));
- for (M := 0; M < length (IRIs[I]); M := M + 1)
- {
- if (tmp = IRIs[I][M])
- goto _skip;
- }
if ("mode" like '%#Write')
{
rc := 'W';
@@ -4126,10 +4352,148 @@ create procedure SIOC..acl_check (
if ("mode" like '%#Read')
rc := 'R';
- IRIs[I] := vector_concat (IRIs[I], vector (tmp));
-
_skip:;
}
+
+ _cert := client_attr ('client_certificate');
+ _commands := ODS.ODS_API.commands ();
+ _filterMode := '';
+ _filterValue := 1;
+ _filter := '';
+ _criteria := '';
+ for (
+ sparql
+ define input:storage ""
+ prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ prefix foaf: <http://xmlns.com/foaf/0.1/>
+ prefix acl: <http://www.w3.org/ns/auth/acl#>
+ prefix flt: <http://www.openlinksw.com/schemas/acl/filter#>
+ select ?filter ?criteria ?mode ?operand ?condition ?pattern ?statement
+ where {
+ {
+ graph `iri(?:acl_graph_iri)`
+ {
+ ?rule rdf:type acl:Authorization ;
+ acl:accessTo `iri(?:acl_iri)` ;
+ acl:mode ?mode ;
+ flt:hasFilter ?filter .
+ ?filter flt:hasCriteria ?criteria .
+ ?criteria flt:operand ?operand ;
+ flt:condition ?condition ;
+ flt:value ?pattern .
+ OPTIONAL { ?criteria flt:statement ?statement . }
+ }
+ }
+ }
+ order by ?filter ?criteria) do
+ {
+ _mode := "mode";
+ _operand := replace ("operand", 'http://www.openlinksw.com/schemas/acl/filter#', '');
+ _condition := replace ("condition", 'http://www.openlinksw.com/schemas/acl/filter#', '');;
+ _pattern := cast ("pattern" as varchar);
+ _statement := cast ("statement" as varchar);
+ if (_filter <> "filter")
+ {
+ if (_filterValue and (_filter <> ''))
+ {
+ if (_filterMode <> '')
+ rc := _filterMode;
+ if (rc = 'W')
+ goto _exit;
+ }
+ _filterMode := '';
+ _filterValue := 1;
+ _filter := "filter";
+ _criteria := '';
+ }
+ if (_filterValue and (_criteria <> "criteria"))
+ {
+ _command := get_keyword (_condition, _commands);
+ if (isnull (_command))
+ goto _skip2;
+
+ _sql := 'select case when ' || _command || ' then 1 else 0 end';
+ _sqlParams := vector ();
+ _params := vector ('pattern', _pattern);
+ if (_operand = 'webIDVerified')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, '1');
+ }
+ else if (_operand = 'webID')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, webid);
+ }
+ else if (_operand = 'certExpiration')
+ {
+ declare _from, _to any;
+
+ _from := DB.DBA.X509_STRING_DATE (get_certificate_info (4, _cert));
+ _to := DB.DBA.X509_STRING_DATE (get_certificate_info (5, _cert));
+ ODS.ODS_API.set_keyword ('value', _params, case when (_to < now () or _from > now ()) then '1' else '0' end);
+ }
+ else if (_operand = 'certSerial')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, get_certificate_info (1, _cert));
+ }
+ else if (_operand = 'certMail')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, get_certificate_info (10, _cert, 0, '', 'emailAddress'));
+ }
+ else if (_operand = 'certSubject')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, get_certificate_info (2, _cert));
+ }
+ else if (_operand = 'certIssuer')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, get_certificate_info (3, _cert));
+ }
+ else if (_operand = 'certStartDate')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, DB.DBA.X509_STRING_DATE (get_certificate_info (4, _cert)));
+ ODS.ODS_API.set_keyword ('pattern', _params, DB.DBA.DAV_AUTHENTICATE_SSL_DATE (_pattern));
+ }
+ else if (_operand = 'certEndDate')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, DB.DBA.X509_STRING_DATE (get_certificate_info (5, _cert)));
+ ODS.ODS_API.set_keyword ('pattern', _params, DB.DBA.DAV_AUTHENTICATE_SSL_DATE (_pattern));
+ }
+ else if (_operand = 'certDigest')
+ {
+ ODS.ODS_API.set_keyword ('value', _params, _cert);
+ _sql := 'select case when ' || sprintf ('(DB.DBA.DAV_AUTHENTICATE_SSL_DIGEST_CHECK (^{value}^, ''%s'', ^{pattern}^) = 1)', _condition) || ' then 1 else 0 end';
+ }
+ else if (_operand = 'certSparqlASK')
+ {
+ ODS.ODS_API.set_keyword ('webid', _params, webid);
+ ODS.ODS_API.set_keyword ('value', _params, webid);
+ ODS.ODS_API.set_keyword ('graph', _params, webidGraph);
+ _sql := 'sparql ' || _statement;
+ }
+
+ _state := '00000';
+ SIOC..acl_prepare_sql (_sql, _sqlParams, _params);
+ exec (_sql, _state, _msg, _sqlParams, 0, _meta, _rows);
+ if (_state <> '00000')
+ _filterValue := 0;
+
+ else if (_rows[0][0] = 0)
+ _filterValue := 0;
+ }
+ if (_filterMode <> 'W')
+ {
+ if (_mode like '%#Write')
+ _filterMode := 'W';
+ else if (_mode like '%#Read')
+ _filterMode := 'R';
+ }
+
+ _skip2:;
+ _criteria := "criteria";
+ }
+ if (_filterValue and (_filter <> '') and (_filterMode <> ''))
+ rc := _filterMode;
+
+ _continue:;
}
_exit:;
@@ -4137,19 +4501,43 @@ _exit:;
}
;
+create procedure SIOC..acl_check (
+ in acl_graph_iri varchar,
+ in acl_groups_iri varchar,
+ in acl_iris any)
+{
+ declare rc, webid, webidGraph varchar;
+
+ rc := '';
+ webidGraph := ODS.ODS_API.graph_create ();
+ SIOC..acl_webid (webid, webidGraph);
+ if (isnull (webid))
+ goto _exit;
+
+ rc := SIOC..acl_check_internal (webid, webidGraph, acl_graph_iri, acl_groups_iri, acl_iris);
+
+_exit:;
+ ODS.ODS_API.graph_clear (webidGraph);
+ return rc;
+}
+;
+
create procedure SIOC..acl_list (
in acl_graph_iri varchar,
in acl_groups_iri varchar,
in acl_iri varchar)
{
- declare rc, foafIRI varchar;
+ declare rc, webid, webidGraph varchar;
+ declare cert, diArray, finger, digest, digestHash any;
result_names (rc);
- foafIRI := SIOC..acl_webID ();
- if (isnull (foafIRI))
+ webidGraph := null;
+ SIOC..acl_webid (webid, webidGraph);
+ if (isnull (webid))
return;
+ cert := client_attr ('client_certificate');
for ( sparql
define input:storage ""
prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -4162,7 +4550,7 @@ create procedure SIOC..acl_list (
{
?rule rdf:type acl:Authorization ;
acl:accessTo ?iri ;
- acl:agent `iri(?:foafIRI)` .
+ acl:agent `iri(?:webid)` .
filter (?iri != ?:acl_iri).
}
}
@@ -4188,7 +4576,7 @@ create procedure SIOC..acl_list (
graph `iri(?:acl_groups_iri)`
{
?group rdf:type foaf:Group ;
- foaf:member `iri(?:foafIRI)` .
+ foaf:member `iri(?:webid)` .
}
}
}
@@ -4258,6 +4646,7 @@ 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)
@@ -4272,10 +4661,14 @@ 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)
@@ -4291,29 +4684,32 @@ 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_TYPE_NAME, N.WAI_NAME, N.WAI_ACL);
+ SIOC..wa_instance_acl_insert (N.WAI_IS_PUBLIC, 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_TYPE_NAME, O.WAI_NAME, O.WAI_ACL);
+ SIOC..wa_instance_acl_delete (O.WAI_IS_PUBLIC, 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_TYPE_NAME, N.WAI_NAME, N.WAI_ACL);
+ SIOC..wa_instance_acl_insert (N.WAI_IS_PUBLIC, 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_TYPE_NAME, O.WAI_NAME, O.WAI_ACL);
+ SIOC..wa_instance_acl_delete (O.WAI_IS_PUBLIC, O.WAI_TYPE_NAME, O.WAI_NAME, O.WAI_ACL);
}
;
@@ -4968,50 +5364,12 @@ create procedure foaf_check_friend (in iri varchar, in agent 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 '*'
+create procedure foaf_check_ssl (
+ in iri varchar)
{
- rollback work;
- return 0;
- };
+ declare arr, groups_iri, msg, webid, webidGraph varchar;
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
@@ -5023,45 +5381,15 @@ create procedure foaf_check_ssl_int (in iri varchar, out graph varchar)
if (SIOC..acl_check (SIOC..acl_clean_iri (iri) || '/webaccess', groups_iri, vector (iri)) = '')
return 0;
}
-
- -- 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);
+ webidGraph := null;
+ SIOC..acl_webid (webid, webidGraph);
commit work;
- 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;
+ if (isnull (webid))
+ return 0;
+ return 1;
}
;
-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)
{
@@ -5142,7 +5470,7 @@ create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p i
?person foaf:mbox ?mbox .
?person foaf:mbox_sha1sum ?sha1 .
?person foaf:name ?full_name .
- ?person foaf:holdsAccount ?sioc_user .
+ ?person foaf:account ?sioc_user .
?person rdfs:seeAlso ?pers_see_also .
?sioc_user rdfs:seeAlso ?see_also .
?sioc_user a sioc:User .
@@ -5181,10 +5509,10 @@ create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p i
graph <%s>
{
{
- ?person foaf:holdsAccount <%s/%s#this> ;
+ ?person foaf:account <%s/%s#this> ;
rdf:type ?type ;
foaf:nick ?nick ;
- foaf:holdsAccount ?sioc_user .
+ foaf:account ?sioc_user .
optional { ?person rdfs:seeAlso ?pers_see_also . } .
optional { ?sioc_user rdfs:seeAlso ?see_also . } .
optional { ?person foaf:mbox ?mbox ; foaf:mbox_sha1sum ?sha1 . } .
@@ -5252,7 +5580,7 @@ create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p i
?event dc:date ?bdate .
?person bio:keywords ?keywords .
?person owl:sameAs ?same_as .
- ?person foaf:holdsAccount ?oa .
+ ?person foaf:account ?oa .
?oa a foaf:OnlineAccount .
?oa foaf:accountServiceHomepage ?ashp .
?oa foaf:accountName ?an .
@@ -5268,7 +5596,7 @@ create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p i
graph <%s>
{
{
- ?person foaf:holdsAccount <%s/%s#this> ;
+ ?person foaf:account <%s/%s#this> ;
foaf:openid ?oid .
optional { ?person bio:olb ?bio } .
optional { ?person bio:event ?event . ?event a bio:Birth ; dc:date ?bdate } .
@@ -5282,7 +5610,7 @@ create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p i
} .
optional { ?person bio:keywords ?keywords } .
optional { ?person owl:sameAs ?same_as } .
- ?person foaf:holdsAccount ?oa .
+ ?person foaf:account ?oa .
optional {
?oa foaf:accountServiceHomepage ?ashp ; foaf:accountName ?an
} .
@@ -5308,30 +5636,32 @@ 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 .
- ?idn cert:identity ?person .
- ?idn rdf:type rsa:RSAPublicKey .
- ?idn rsa:public_exponent ?exp .
- ?idn rsa:modulus ?mod .
+ ?person cert:key ?key .
+ ?key rdf:type cert:RSAPublicKey .
+ ?key cert:exponent ?exp .
+ ?key cert:modulus ?mod .
?event_iri rdf:type ?bioEvent .
?event_iri bio:date ?bioDate .
?event_iri bio:place ?bioPlace .
?person pingback:to ?pb .
?person pingback:service ?psvc .
?person foaf:made `iri (bif:sprintf (''http://%%{WSHost}s/ods/describe?uri=%%U'', ?mbox))` .
+ ?person <http://vocab.deri.ie/void#inDataset> <http://%{URIQADefaultHost}s/dataspace> .
+ <http://%{URIQADefaultHost}s/dataspace> <http://rdfs.org/ns/void#sparqlEndpoint> <http://%{URIQADefaultHost}s/sparql-auth/> .
}
WHERE
{
graph <%s>
{
{
- ?person foaf:holdsAccount <%s/%s#this> .
+ ?person foaf:account <%s/%s#this> .
optional { ?person foaf:mbox ?mbox . } .
optional { ?person foaf:made ?made . ?made dc:identifier ?ident . ?made dc:title ?made_title . optional { ?made a ?made_type . } } .
optional { ?person foaf:interest ?interest } .
optional { ?interest rdfs:label ?interest_label } .
optional { ?person foaf:topic_interest ?topic_interest } .
optional { ?topic_interest rdfs:label ?topic_interest_label } .
- optional { ?idn cert:identity ?person ; rsa:public_exponent ?exp ; rsa:modulus ?mod . } .
+ optional { ?person cert:key ?key . ?key cert:exponent ?exp ; cert: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 } .
@@ -5356,7 +5686,7 @@ create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p i
{
graph <%s>
{
- ?person foaf:holdsAccount <%s/%s#this> .
+ ?person foaf:account <%s/%s#this> .
{
{
?container foaf:maker ?person;
@@ -5981,14 +6311,14 @@ create procedure sioc_compose_xml (in u_name varchar, in wai_name varchar, in in
if (kind = 0)
{
part := sprintf (
- ' CONSTRUCT { ?s ?p ?o . ?f foaf:holdsAccount ?ha . ?f rdfs:seeAlso ?sa . '||
+ ' CONSTRUCT { ?s ?p ?o . ?f foaf:account ?ha . ?f rdfs:seeAlso ?sa . '||
' ?frm sioc:scope_of ?role. ?role sioc:function_of ?member. ?frm sioc:type ?ft. ?frm sioc:id ?fid . '||
' ?frm rdfs:seeAlso ?fsa . ?frm sioc:has_space ?fh . ?role sioc:has_scope ?frm . ' ||
' ?frm sioc:has_owner ?member . ?member sioc:owner_of ?frm . } \n' ||
' FROM <%s> WHERE { \n' ||
' { ?s ?p ?o . ?s sioc:id "%s" FILTER (?p != "http://www.w3.org/2000/01/rdf-schema#seeAlso" && ' ||
' ?p != "http://rdfs.org/sioc/ns#creator_of") } union \n' ||
- ' { ?f foaf:nick "%s" ; foaf:holdsAccount ?ha ; rdfs:seeAlso ?sa } union \n' ||
+ ' { ?f foaf:nick "%s" ; foaf:account ?ha ; rdfs:seeAlso ?sa } union \n' ||
' { ?frm sioc:scope_of ?role . ?role sioc:function_of ?member . '||
' ?member sioc:id "%s". ?frm sioc:type ?ft; sioc:id ?fid; rdfs:seeAlso ?fsa; sioc:has_space ?fh. '||
' OPTIONAL { ?frm sioc:has_owner ?member . } '||
@@ -6004,7 +6334,7 @@ create procedure sioc_compose_xml (in u_name varchar, in wai_name varchar, in in
?person foaf:mbox ?mbox .
?person foaf:mbox_sha1sum ?sha1 .
?person foaf:name ?full_name .
- ?person foaf:holdsAccount ?sioc_user .
+ ?person foaf:account ?sioc_user .
?sioc_user rdfs:seeAlso ?see_also .
?sioc_user a sioc:User .
?person foaf:firstName ?fn .
@@ -6053,7 +6383,7 @@ create procedure sioc_compose_xml (in u_name varchar, in wai_name varchar, in in
{
{
?person foaf:nick "%s" ;
- foaf:holdsAccount ?sioc_user .
+ foaf:account ?sioc_user .
?sioc_user rdfs:seeAlso ?see_also .
optional { ?person foaf:mbox ?mbox ; foaf:mbox_sha1sum ?sha1 . } .
optional {
@@ -6508,10 +6838,24 @@ 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));
}
;
+create procedure ods_account_update ()
+{
+ if (registry_get ('ods_account_update') = '1') return;
+ update_quad_p (get_graph (), foaf_iri ('holdsAccount'), foaf_iri ('account'));
+ registry_set ('ods_account_update', '1');
+}
+;
+
+ods_account_update ()
+;
+
use DB;
create procedure WA_INTEREST_UPGRADE ()
@@ -6524,8 +6868,11 @@ 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);
- WA_USER_EDIT (uname, 'WAUI_INTERESTS', F2);
- WA_USER_EDIT (uname, 'WAUI_INTEREST_TOPICS', F1);
+ if (not isnull (uname))
+ {
+ WA_USER_EDIT (uname, 'WAUI_INTERESTS', F2);
+ WA_USER_EDIT (uname, 'WAUI_INTEREST_TOPICS', F1);
+ }
}
registry_set ('WA_INTEREST_UPGRADE', 'done');
@@ -6536,9 +6883,7 @@ WA_INTEREST_UPGRADE ()
create procedure ods_object_services_update ()
{
- if (registry_get ('ods_services_update') = '1')
- return;
-
+ if (registry_get ('ods_services_update') = '1') return;
SIOC..fill_ods_services ();
registry_set ('ods_services_update', '1');
}
diff --git a/appsrc/ODS-Framework/site_settings.vspx b/appsrc/ODS-Framework/site_settings.vspx
index fa8c12c..e06b570 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.3 2011/01/31 11:17:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn.sql b/appsrc/ODS-Framework/sn.sql
index aa68acd..3ef0a5b 100644
--- a/appsrc/ODS-Framework/sn.sql
+++ b/appsrc/ODS-Framework/sn.sql
@@ -1,10 +1,10 @@
--
--- $Id: sn.sql,v 1.6.2.3 2010/09/20 10:15:26 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/sn_connections.vspx b/appsrc/ODS-Framework/sn_connections.vspx
index 0a3375b..0df3471 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.1 2010/09/20 10:15:26 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn_delete.vspx b/appsrc/ODS-Framework/sn_delete.vspx
index e932da4..9706b17 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn_export.vspx b/appsrc/ODS-Framework/sn_export.vspx
index f36b6da..a9bb33a 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn_make_inv.vspx b/appsrc/ODS-Framework/sn_make_inv.vspx
index 5b68bf3..1cef5a3 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn_profile.vspx b/appsrc/ODS-Framework/sn_profile.vspx
index facabcb..bac5223 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn_rec_inv.vspx b/appsrc/ODS-Framework/sn_rec_inv.vspx
index ed11abe..f608e7e 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn_sent_inv.vspx b/appsrc/ODS-Framework/sn_sent_inv.vspx
index 6109dc0..9cb1d22 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn_settings.vspx b/appsrc/ODS-Framework/sn_settings.vspx
index 9fe98e2..dd35d3a 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sn_user_export.vspx b/appsrc/ODS-Framework/sn_user_export.vspx
index 727043a..b0de81c 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sparql_load.vspx b/appsrc/ODS-Framework/sparql_load.vspx
index 6ae2e45..6434c54 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sparql_save.vspx b/appsrc/ODS-Framework/sparql_save.vspx
index 13279f3..853cebe 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/sql_rdf.sql b/appsrc/ODS-Framework/sql_rdf.sql
index 8c53b34..31706ec 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.1 2010/09/20 10:15:27 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/stat.vspx b/appsrc/ODS-Framework/stat.vspx
index 2933917..85f52ea 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.1 2010/09/20 10:15:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/tags.sql b/appsrc/ODS-Framework/tags.sql
index ddbbebd..1315ce9 100644
--- a/appsrc/ODS-Framework/tags.sql
+++ b/appsrc/ODS-Framework/tags.sql
@@ -1,10 +1,10 @@
--
--- $Id: tags.sql,v 1.7.2.1 2010/09/20 10:15:27 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/tags.vspx b/appsrc/ODS-Framework/tags.vspx
index 87ea615..e3cdbb7 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.1 2010/09/20 10:15:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/tbl.js b/appsrc/ODS-Framework/tbl.js
index 6404c47..7b59b01 100644
--- a/appsrc/ODS-Framework/tbl.js
+++ b/appsrc/ODS-Framework/tbl.js
@@ -1,10 +1,10 @@
/*
- * $Id: tbl.js,v 1.2.2.30 2011/08/01 14:14:21 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -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.whiteSpace = 'nowrap';
+ td.style.cssText = 'white-space: nowrap; vertical-align: top;';
tr.appendChild(td);
if (options.id) {
var fld = OAT.Dom.create("input");
@@ -215,7 +215,9 @@ TBL.createRow = function (prefix, No, optionObject, viewMode) {
TBL.createViewRow = function (prefix, options)
{
- var tbl = $(prefix+'_tbl');
+ var tbl = $(prefix+'_tbody');
+ if (!tbl)
+ tbl = $(prefix+'_tbl');
if (tbl)
{
var No = TBL.No(tbl, prefix, options);
@@ -237,7 +239,7 @@ TBL.createViewRow = function (prefix, options)
tr.appendChild(td);
if (fldOptions.mode) {
- fldName = prefix + '_' + fld + '_0';
+ fldName = prefix + '_' + fld + '_' + No;
var fn = TBL["viewCell"+fldOptions.mode];
if (fn)
fn(td, prefix, fldName, 0, fldOptions);
@@ -275,10 +277,25 @@ TBL.clean = function (prefix) {
return true;
}
-TBL.createCellSelect = function (fldName) {
+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) {
var fld = OAT.Dom.create("select");
fld.name = fldName;
fld.id = fldName;
+ TBL.createCellOptions(fld, fldOptions);
+
return fld;
}
@@ -294,7 +311,7 @@ TBL.createCellCombolist = function (td, fldValue, fldOptions) {
return fld;
}
-TBL.createCell0 = function (td, prefix, fldName, No, fldOptions) {
+TBL.createCell0 = function (td, prefix, fldName, No, fldOptions, disabled) {
var fld = OAT.Dom.create('input');
fld.type = (fldOptions.type)? (fldOptions.type): 'text';
fld.id = fldName;
@@ -303,20 +320,20 @@ TBL.createCell0 = function (td, prefix, fldName, No, fldOptions) {
fld.value = fldOptions.value;
fld.defaultValue = fld.value;
}
- if (fldOptions.className)
- fld.className = fldOptions.className;
- if (fldOptions.onblur)
- fld.onblur = fldOptions.onblur;
+ TBL.createCellOptions(fld, fldOptions);
fld.style.width = '95%';
- if (fldOptions.cssText)
- fld.style.cssText = fldOptions.cssText;
- if (fldOptions.readOnly)
- fld.readOnly = fldOptions.readOnly;
+
+ if (disabled)
+ fld.disabled = disabled;
td.appendChild(fld);
return fld;
}
+TBL.viewCell0 = function (td, prefix, fldName, No, fldOptions) {
+ td.innerHTML = fldOptions.value;
+}
+
TBL.createCell1 = function (td, prefix, fldName, No, fldOptions) {
var fld = TBL.createCell0 (td, prefix, fldName, No, fldOptions)
if (document.forms[0].elements['sid']) {
@@ -798,6 +815,15 @@ TBL.changeCell50 = function (srcFld) {
var dstName = srcFld.name.replace('fld_1', 'fld_2');
var dstFld = $(dstName);
var dstImg = $(dstName+'_img');
+ if (srcValue == 'advanced') {
+ OAT.Dom.hide(dstFld);
+ OAT.Dom.hide(dstImg);
+ OAT.Dom.removeClass(dstFld, '_validate_');
+ var td = TBL.parent(dstFld, 'td');
+ TBL.showCell51Tbl(td, dstName);
+ } else {
+ OAT.Dom.show(dstFld);
+ OAT.Dom.addClass(dstFld, '_validate_');
if (srcValue == 'public') {
dstFld.value = 'foaf:Agent';
dstFld.readOnly = true;
@@ -811,35 +837,38 @@ TBL.changeCell50 = function (srcFld) {
} else {
OAT.Dom.show(dstImg);
}
+ var dstTbl = $(dstName.replace('_fld', '_tbl'));
+ OAT.Dom.hide(dstTbl);
+ }
}
TBL.viewCell50 = function (td, prefix, fldName, No, fldOptions) {
- if (fldOptions.value == "public") {
- td.innerHTML = "Public";
- } else if (fldOptions.value == "group") {
- td.innerHTML = "Group";
- } else {
- td.innerHTML = "Personal";
- }
+ TBL.createCell50(td, prefix, fldName, No, fldOptions, true);
}
-TBL.createCell50 = function (td, prefix, fldName, No, fldOptions) {
+TBL.createCell50 = function (td, prefix, fldName, No, fldOptions, disabled) {
var fld = OAT.Dom.create("select");
fld.name = fldName;
fld.id = fldName;
TBL.selectOption(fld, fldOptions.value, "Personal", "person");
TBL.selectOption(fld, fldOptions.value, "Group", "group");
TBL.selectOption(fld, fldOptions.value, "Public", "public");
+ if (!fldOptions.noAdvanced)
+ TBL.selectOption(fld, fldOptions.value, "Advanced", "advanced");
if (fldOptions.onchange)
fld.onclick = fldOptions.onchange;
+ if (disabled)
+ fld.disabled = disabled;
+
td.appendChild(fld);
+ td.style.verticalAlign = 'top';
return fld;
}
-TBL.createCell51 = function (td, prefix, fldName, No, fldOptions)
-{
+TBL.createCell51 = function (td, prefix, fldName, No, fldOptions) {
var fld = TBL.createCell0 (td, prefix, fldName, No, fldOptions)
+ var srcFld = $(fld.name.replace('fld_2', 'fld_1'));
td.appendChild(OAT.Dom.text(' '));
var img = OAT.Dom.image('/ods/images/select.gif');
@@ -850,15 +879,84 @@ TBL.createCell51 = function (td, prefix, fldName, No, fldOptions)
img.style.cssText = fldOptions.imgCssText;
td.appendChild(img);
+ td.style.verticalAlign = 'top';
var ta = new TypeAhead(fld.id, 'webIDs', {checkMode: 1, userParams: TBL.typeheadProperty});
fld.setAttribute('autocomplete', 'off');
fld.form.onsubmit = CheckSubmit;
taVars[taVars.length] = ta;
+ if (srcFld.value == 'advanced') {
+ OAT.Dom.hide(fld);
+ OAT.Dom.hide(img);
+ OAT.Dom.removeClass(fld, '_validate_');
+ TBL.showCell51Tbl(td, fldName, fldOptions);
+ }
+ if (srcFld.value == 'public')
+ OAT.Dom.hide(img);
+
return fld;
}
+TBL.showCell51Tbl = function (td, fldName, fldOptions, disabled) {
+ OAT.Loader.load(["ajax", "json"], function(){TBL.showCell51TblInternal (td, fldName, fldOptions, disabled);});
+}
+
+TBL.showCell51TblInternal = function (td, fldName, fldOptions, disabled) {
+ var tblName = fldName.replace ('_fld', '_tbl');
+ var tbl = $(tblName);
+ if ($(tbl)) {
+ OAT.Dom.show(tbl);
+ } else {
+ if (!disabled) {
+ tbl = OAT.Dom.create('table', {width: '100%', id: tblName});
+ } else {
+ tbl = OAT.Dom.create('table', {width: '95%', id: tblName});
+ }
+ td.appendChild(tbl);
+ var tr = OAT.Dom.create('tr');
+ tbl.appendChild(tr);
+ var td = OAT.Dom.create('td', {width: '95%', style: 'padding: 0'});
+ tr.appendChild(td);
+ var tbl2 = OAT.Dom.create('table', {width: '100%', class: 'ODS_formList'});
+ td.appendChild(tbl2);
+ var tbody2 = OAT.Dom.create('tbody', {id: fldName+'_tbody'});
+ tbl2.appendChild(tbody2);
+ var tr2 = OAT.Dom.create('tr', {id: fldName+'_tr_no'});
+ tbody2.appendChild(tr2);
+ var td2 = OAT.Dom.create('td', {colspan: '3'});
+ tr2.appendChild(td2);
+ var S = '<b>No Criteria</b>';
+ td2.innerHTML = S.replace(/-TBL-/g, fldName);
+ if (!disabled) {
+ var td2 = OAT.Dom.create('td');
+ td2.style.cssText = 'white-space: nowrap; vertical-align: top;';
+ tr.appendChild(td2);
+ S = '<img src="/ods/images/icons/add_16.png" border="0" class="button pointer" onclick="javascript: TBL.createRow(\'-TBL-\', null, {fld_1: {mode: 55, tdCssText: \'width: 33%; vertical-align: top;\', className: \'_validate_\'}, fld_2: {mode: 56, tdCssText: \'width: 33%; vertical-align: top;\', cssText: \'display: none;\', className: \'_validate_\'}, fld_3: {mode: 57, tdCssText: \'width: 33%; vertical-align: top;\', cssText: \'display: none;\', className: \'_validate_\'}, btn_1: {mode: 55}});" alt="Add Condition" title="Add Condition" />';
+ td2.innerHTML = S.replace(/-TBL-/g, fldName);
+ }
+ if (fldOptions && fldOptions.value) {
+ for (var i = 0; i < fldOptions.value.length; i = i + 1) {
+ if (disabled) {
+ TBL.createViewRow(fldName, {fld_1: {mode: 55, value: fldOptions.value[i][1], valueExt: fldOptions.value[i][4], tdCssText: 'width: 33%;'}, fld_2: {mode: 56, value: fldOptions.value[i][2], tdCssText: 'width: 33%; vertical-align: top;'}, fld_3: {mode: 57, value: fldOptions.value[i][3], tdCssText: 'width: 33%; vertical-align: top;'}});
+ } else {
+ TBL.createRow(fldName, null, {fld_1: {mode: 55, value: fldOptions.value[i][1], valueExt: fldOptions.value[i][4], tdCssText: 'width: 33%;', className: '_validate_'}, fld_2: {mode: 56, value: fldOptions.value[i][2], tdCssText: 'width: 33%; vertical-align: top;', className: '_validate_'}, fld_3: {mode: 57, value: fldOptions.value[i][3], tdCssText: 'width: 33%; vertical-align: top;', className: '_validate_'}, btn_1: {mode: 55}});
+ }
+ }
+ }
+ }
+ return tbl;
+}
+
+TBL.viewCell51 = function (td, prefix, fldName, No, fldOptions) {
+ var srcFld = $(fldName.replace('fld_2', 'fld_1'));
+ if (srcFld && (srcFld.value == 'advanced')) {
+ TBL.showCell51Tbl(td, fldName, fldOptions, true);
+ } else {
+ TBL.viewCell0(td, prefix, fldName, No, fldOptions);
+ }
+}
+
TBL.createCell52 = function (td, prefix, fldName, No, fldOptions, disabled) {
function cb(td, prefix, fldName, No, fldOptions, disabled, ndx) {
var fld = OAT.Dom.create("input");
@@ -881,6 +979,8 @@ TBL.createCell52 = function (td, prefix, fldName, No, fldOptions, disabled) {
cb(td, prefix, fldName+'_w'+suffix, No, fldOptions, disabled, 1);
if (fldOptions.execute)
cb(td, prefix, fldName+'_x'+suffix, No, fldOptions, disabled, 2);
+
+ td.style.verticalAlign = 'top';
}
TBL.viewCell52 = function (td, prefix, fldName, No, fldOptions) {
@@ -901,6 +1001,197 @@ TBL.clickCell52 = function (fld)
$(fldName).checked = false;
}
+TBL.changeCell55 = function (obj)
+{
+ var prefix = obj._prefix;
+ var No = obj._No;
+
+ TBL.createCell55Ext(obj);
+
+ var td = $(prefix+'_td_'+No+'_2');
+ td.innerHTML = '';
+ TBL.createCell56(td, prefix, prefix+'_fld_2_'+No, No, {className: '_validate_'});
+
+ var td = $(prefix+'_td_'+No+'_3');
+ td.innerHTML = '';
+ TBL.createCell57(td, prefix, prefix+'_fld_3_'+No, No, {className: '_validate_'});
+}
+
+TBL.createCell55 = function (td, prefix, fldName, No, fldOptions, disabled) {
+ var fld = TBL.createCellSelect(fldName, fldOptions);
+ fld._prefix = prefix;
+ fld._No = No;
+ fld.style.width = '95%';
+ OAT.Dom.option('', '', fld);
+ if (!TBL.predicates)
+ TBL.initValues();
+ if (TBL.predicates)
+ for (var i = 0; i < TBL.predicates.length; i = i + 2) {
+ OAT.Dom.option(TBL.predicates[i+1][0], TBL.predicates[i], fld);
+ }
+
+ if (fldOptions.value)
+ fld.value = fldOptions.value;
+
+ if (disabled)
+ fld.disabled = disabled;
+
+ if (!disabled)
+ fld.onchange = function(){TBL.changeCell55(this)};
+
+ td.appendChild(fld);
+ TBL.createCell55Ext(fld, fldOptions, disabled)
+
+ return fld;
+}
+
+TBL.createCell55Ext = function (obj, fldOptions, disabled) {
+ var prefix = obj._prefix;
+ var No = obj._No;
+
+ var predicate = TBL.predicateGet(prefix+'_fld_1_'+No);
+ if (!predicate)
+ return;
+
+ var fldName = prefix+'_fld_0_'+No;
+ if (predicate[1] != 'sparql') {
+ OAT.Dom.unlink(fldName);
+ return;
+ }
+
+ if ($(fldName))
+ return;
+
+ if (!fldOptions)
+ fldOptions = {valueExt: 'prefix sioc: <http://rdfs.org/sioc/ns#>\nprefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>\nprefix foaf: <http://xmlns.com/foaf/0.1/>\nASK where {^{webid}^ rdf:type foaf:Person}'};
+
+ var td = TBL.parent(obj, 'td');
+ var fld = OAT.Dom.create('textarea');
+ fld.id = fldName;
+ fld.name = fld.id;
+ fld.style.cssFloat = 'left';
+ fld.style.width = '94%';
+ fld.style.height = '8em';
+ if (fldOptions.valueExt)
+ fld.value = fldOptions.valueExt;
+ if (disabled)
+ fld.disabled = disabled;
+
+ td.appendChild(fld);
+}
+
+TBL.changeCell56 = function (obj) {
+ var prefix = obj._prefix;
+ var No = obj._No;
+
+ var td = $(prefix+'_td_'+No+'_3');
+ td.innerHTML = '';
+ TBL.createCell57(td, prefix, prefix+'_fld_3_'+No, No, {className: '_validate_'});
+}
+
+TBL.viewCell55 = function (td, prefix, fldName, No, fldOptions) {
+ TBL.createCell55(td, prefix, fldName, No, fldOptions, true);
+}
+
+TBL.createCell56 = function (td, prefix, fldName, No, fldOptions, disabled)
+{
+ var predicate = TBL.predicateGet(prefix+'_fld_1_'+No);
+ if (!predicate)
+ return;
+
+ var fld = TBL.createCellSelect(fldName, fldOptions);
+ fld._prefix = prefix;
+ fld._No = No;
+ fld.style.width = '95%';
+ OAT.Dom.option('', '', fld);
+ var predicateType = predicate[1];
+ if (TBL.compares)
+ for (var i = 0; i < TBL.compares.length; i = i + 2) {
+ var compareTypes = TBL.compares[i+1][1];
+ for (var j = 0; j < compareTypes.length; j++) {
+ if (compareTypes[j] == predicateType)
+ OAT.Dom.option(TBL.compares[i+1][0], TBL.compares[i], fld);
+ }
+ }
+ if (fldOptions.value)
+ fld.value = fldOptions.value;
+
+ if (disabled)
+ fld.disabled = disabled;
+
+ if (!disabled)
+ fld.onchange = function(){TBL.changeCell56(this)};
+
+ td.appendChild(fld);
+ return fld;
+}
+
+TBL.viewCell56 = function (td, prefix, fldName, No, fldOptions) {
+ TBL.createCell56(td, prefix, fldName, No, fldOptions, true);
+}
+
+TBL.createCell57 = function (td, prefix, fldName, No, fldOptions)
+{
+ var predicate = TBL.predicateGet(prefix+'_fld_1_'+No);
+ if (!predicate)
+ return;
+
+ var fld_2 = $(fldName.replace('fld_3', 'fld_2'));
+ if (!fld_2)
+ return;
+
+ var compare;
+ for (var i = 0; i < TBL.compares.length; i = i + 2) {
+ if (TBL.compares[i] == fld_2.value)
+ compare = TBL.compares[i+1];
+ }
+ if (!compare || (compare[2] == 0))
+ return;
+
+ if ((predicate[1] == 'boolean') || (predicate[1] == 'sparql')) {
+ var fld = OAT.Dom.create("select");
+ OAT.Dom.option('Yes', '1', fld);
+ OAT.Dom.option('No', '0', fld);
+ }
+ else
+ {
+ var fld = OAT.Dom.create("input");
+ fld.type = 'text';
+ }
+ fld.id = fldName;
+ fld.name = fld.id;
+ fld.style.width = '93%';
+ if (fldOptions.value)
+ fld.value = fldOptions.value;
+ if (fldOptions.className)
+ fld.className = fldOptions.className;
+ td.appendChild(fld);
+
+ for (var i = 0; i < predicate[3].length; i += 2) {
+ if (predicate[3][i] == 'size') {
+ fld['size'] = predicate[3][i+1];
+ fld.style.width = null;
+ }
+
+ if (predicate[3][i] == 'class')
+ fld.className = predicate[3][i+1];
+
+ if (predicate[3][i] == 'onclick')
+ OAT.Event.attach(fld, "click", new Function((predicate[3][i+1]).replace(/-FIELD-/g, fld.id)));
+
+ if (predicate[3][i] == 'button') {
+ var span = OAT.Dom.create("span");
+ span.innerHTML = ' ' + (predicate[3][i+1]).replace(/-FIELD-/g, fld.id);
+ td.appendChild(span);
+ }
+ }
+ return fld;
+}
+
+TBL.viewCell57 = function (td, prefix, fldName, No, fldOptions) {
+ TBL.createCell0(td, prefix, fldName, No, fldOptions, true);
+}
+
TBL.createButton0 = function (td, prefix, fldName, No, fldOptions)
{
var fld = OAT.Dom.create('span');
@@ -1071,6 +1362,19 @@ TBL.createButton44 = function (td, prefix, fldName, No, fldOptions)
}
}
+TBL.createButton55 = function (td, prefix, fldName, No, fldOptions)
+{
+ var img = OAT.Dom.create('img');
+ img.src = '/ods/images/icons/trash_16.png';
+ img.alt = 'Delete row';
+ img.title = img.alt;
+ img.onclick = function(){TBL.deleteRow(prefix, No);};
+ OAT.Dom.addClass(img, 'button');
+
+ td.appendChild(img);
+ return img;
+}
+
TBL.webidProperty = function(obj)
{
var S = 'p';
@@ -1109,3 +1413,26 @@ TBL.windowShow = function(sPage, sPageName, width, height)
win = window.open(sPage, sPageName, "width="+width+",height="+height+",top=100,left=100,status=yes,toolbar=no,menubar=no,scrollbars=yes,resizable=yes");
win.window.focus();
}
+
+TBL.initValues = function () {
+ // load filters data
+ var x = function(data) {
+ var o = OAT.JSON.parse(data);
+ TBL.predicates = o[0];
+ TBL.compares = o[1];
+ }
+ OAT.AJAX.GET('/ods/api/filtersData', false, x, {async: false});
+}
+
+TBL.predicateGet = function (fldName) {
+ var fld = $(fldName)
+ if (fld) {
+ if (!TBL.predicates)
+ TBL.initValues();
+ for (var i = 0; i < TBL.predicates.length; i += 2) {
+ if (TBL.predicates[i] == fld.value)
+ return TBL.predicates[i+1];
+ }
+ }
+ return null;
+}
diff --git a/appsrc/ODS-Framework/terms.html b/appsrc/ODS-Framework/terms.html
index ea83148..145e3d6 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.1 2010/09/20 10:15:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/tools.vspx b/appsrc/ODS-Framework/tools.vspx
index ed7a7ba..1834195 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.1 2010/09/20 10:15:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/trs_export.xml b/appsrc/ODS-Framework/trs_export.xml
index 4f026a1..c4f1ef8 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.1 2010/09/20 10:15:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/trs_export_all.xml b/appsrc/ODS-Framework/trs_export_all.xml
index 5dc11cb..937527c 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.1 2010/09/20 10:15:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/typeahead.css b/appsrc/ODS-Framework/typeahead.css
index 6f51a60..ecce130 100644
--- a/appsrc/ODS-Framework/typeahead.css
+++ b/appsrc/ODS-Framework/typeahead.css
@@ -1,4 +1,4 @@
-/* $Id: typeahead.css,v 1.1.2.3 2010/09/20 10:15:28 source Exp $ */
+/* $Id$ */
.THHideDropDown {
display: none;
}
diff --git a/appsrc/ODS-Framework/ufoaf.xml b/appsrc/ODS-Framework/ufoaf.xml
index 2cdfcf1..dab9602 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.1 2010/09/20 10:15:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uhome.vspx b/appsrc/ODS-Framework/uhome.vspx
index a3a896c..8eaf507 100644
--- a/appsrc/ODS-Framework/uhome.vspx
+++ b/appsrc/ODS-Framework/uhome.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: uhome.vspx,v 1.7.2.3 2010/09/20 10:15:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit.vspx b/appsrc/ODS-Framework/uiedit.vspx
index 9ad391e..86d2eaa 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.22 2011/05/02 14:16:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_acl.vspx b/appsrc/ODS-Framework/uiedit_acl.vspx
index 2ab2d31..bdc82e2 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.2 2010/11/09 20:18:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_acls.vspx b/appsrc/ODS-Framework/uiedit_acls.vspx
index 354b36f..a495846 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.2 2010/11/09 20:18:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
@@ -52,6 +52,7 @@
<th width="1%">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
<tr id="s_tr_no"><td colspan="4"><b>No WebID Security</b></td></tr>
<![CDATA[
<script type="text/javascript">
@@ -65,6 +66,7 @@
?>
</script>
]]>
+ </tbody>
</table>
</td>
<td valign="top" nowrap="nowrap">
@@ -75,7 +77,7 @@
<v:button name="btn_acl_update" action="simple" value="Update" xhtml_class="form-button">
<v:on-post>
<![CDATA[
- self.iAcl := DB.DBA.wa_acl_params (e.ve_params);
+ self.iAcl := DB.DBA.wa_aci_params (e.ve_params);
WA_USER_EDIT (self.u_name, 'WAUI_ACL', serialize (self.iAcl));
self.vc_data_bind(e);
diff --git a/appsrc/ODS-Framework/uiedit_ann.vspx b/appsrc/ODS-Framework/uiedit_ann.vspx
index ae1ee54..e24fbb5 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.2 2010/09/27 14:45:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -60,6 +60,7 @@
<vm:page>
<vm:header>
+ <script type="text/javascript" src="validate.js">;</script>
<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" />
diff --git a/appsrc/ODS-Framework/uiedit_buss.vspx b/appsrc/ODS-Framework/uiedit_buss.vspx
index a2e9fb0..83b813e 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.7 2010/09/27 14:45:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_buss_0.vspx b/appsrc/ODS-Framework/uiedit_buss_0.vspx
index 0d1a289..72d4272 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.4 2010/11/09 20:18:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_buss_1.vspx b/appsrc/ODS-Framework/uiedit_buss_1.vspx
index 5d13957..fd8e37b 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.8 2011/01/25 14:11:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_buss_2.vspx b/appsrc/ODS-Framework/uiedit_buss_2.vspx
index 6fc5046..868581e 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.11 2010/09/21 11:46:16 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_buss_3.vspx b/appsrc/ODS-Framework/uiedit_buss_3.vspx
index dfd12ac..0ef28b8 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.7 2010/11/09 20:18:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_bz.vspx b/appsrc/ODS-Framework/uiedit_bz.vspx
index ae8c87a..78011ba 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.2 2010/09/27 14:45:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_groups.vspx b/appsrc/ODS-Framework/uiedit_groups.vspx
index e8d3a28..be7358f 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.8 2011/05/20 12:02:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
@@ -499,6 +499,7 @@
<tr>
<td width="800px">
<table id="x_tbl" class="listing" cellspacing="0">
+ <thead>
<tr class="listing_header_row">
<th>
Personal WebID
@@ -507,6 +508,9 @@
Action
</th>
</tr>
+ </thead>
+ <tbody id="x_tbody">
+ <tr id="x_tr_no"><td colspan="2"><b>No Personal WebIDs</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
@@ -519,12 +523,12 @@
for (N := 0; N < length (self.fg_members); N := N + 1)
{
if (length (self.fg_members[N]))
- http (sprintf ('ODSInitArray.push(function(){OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("x", null, {fld_1: {mode: 51, className: "_validate_ _uri_", value: "%s"}});});});', self.fg_members[N]));
+ http (sprintf ('ODSInitArray.push(function(){OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("x", null, {fld_1: {mode: 51, className: "_validate_ _uri_", value: "%s", noAdvanced: true}});});});', self.fg_members[N]));
}
?>
</script>
]]>
- <tr id="x_tr_no"><td colspan="2"><b>No Personal WebIDs</b></td></tr>
+ </tbody>
</table>
</td>
<td valign="top" nowrap="nowrap">
diff --git a/appsrc/ODS-Framework/uiedit_grp.vspx b/appsrc/ODS-Framework/uiedit_grp.vspx
index a28484b..7552a7e 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.2 2010/09/27 14:45:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_knows.vspx b/appsrc/ODS-Framework/uiedit_knows.vspx
index 90fd70e..54b24d9 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.2 2010/12/07 11:11:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
@@ -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="10">
+ nrows="0">
<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="Download" onclick="javascript: knowsData(); return false;" class="button" />
+ <input type="button" value="Retrieve" 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 downloaded items</b></td></tr>
+ <tr id="k_tr_no"><td colspan="3"><b>No retrieved items</b></td></tr>
</table>
</td>
</tr>
diff --git a/appsrc/ODS-Framework/uiedit_ldap.vspx b/appsrc/ODS-Framework/uiedit_ldap.vspx
index cb1b972..2b50658 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.7 2010/09/27 14:45:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_ldap_include.vspx b/appsrc/ODS-Framework/uiedit_ldap_include.vspx
index 2b6e5b0..c00dec0 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.3 2010/12/07 11:11:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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="10" initial-offset="0">
+ <v:data-source name="dsrc" expression-type="sql" nrows="0" 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 9fe7265..bfd28cd 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.4 2011/05/02 14:16:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_offerlist.vspx b/appsrc/ODS-Framework/uiedit_offerlist.vspx
index fa5a241..5048a26 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.15 2011/06/09 17:43:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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="10">
+ nrows="0">
<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 2e2aef5..87a7453 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.2 2010/12/07 11:11:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_owns.vspx b/appsrc/ODS-Framework/uiedit_owns.vspx
index ff10bc1..366d8a2 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.3 2011/02/16 20:58:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
@@ -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="10">
+ nrows="0">
<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 a017245..d70a358 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.25 2011/05/02 14:16:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_0.vspx b/appsrc/ODS-Framework/uiedit_personal_0.vspx
index 9e98333..2c2d4b1 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.9 2011/08/03 11:42:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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')); ?></td>
+ <td><?vsp self.show_data (self.iKnows, vector ('value', 'name')); ?></td>
</tr>
</v:template>
</table>
diff --git a/appsrc/ODS-Framework/uiedit_personal_1.vspx b/appsrc/ODS-Framework/uiedit_personal_1.vspx
index 01ec4ad..16f4e14 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.18 2011/05/16 08:53:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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,10 +195,13 @@
p_path := subseq (p_path, 4);
WA_USER_EDIT (self.u_name, 'WAUI_PHOTO_URL', p_path);
}
- else
+ else if ((get_keyword ('s_photo', params) like 'http://%') or (get_keyword ('s_photo', params) like 'https://%'))
{
- if (get_keyword ('s_photo', params, '') = '')
- WA_USER_EDIT (self.u_name, 'WAUI_PHOTO_URL', '');
+ 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 ('up_audio', params, '') <> '')
{
@@ -263,28 +266,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'" />
@@ -406,16 +409,23 @@
<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:label value="--self.u_name" format="%s" />
+ <v:text name="x_name" xhtml_id="x_name" type="hidden" value="--self.u_name" />
</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>
@@ -437,12 +447,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[
@@ -458,8 +468,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" />
@@ -469,8 +479,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" />
@@ -481,7 +491,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" />
@@ -500,9 +510,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;
@@ -516,14 +526,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>
@@ -573,15 +583,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>
@@ -592,7 +602,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>
@@ -789,9 +799,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 3d12873..8d1ef31 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.7 2011/01/25 14:11:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_3.vspx b/appsrc/ODS-Framework/uiedit_personal_3.vspx
index 793214a..62557eb 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.11 2010/10/07 13:22:38 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_4.vspx b/appsrc/ODS-Framework/uiedit_personal_4.vspx
index 973e2dc..d0fe99e 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.10 2010/11/09 20:18:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_5.vspx b/appsrc/ODS-Framework/uiedit_personal_5.vspx
index 3ce2fa0..ae7a2b3 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.9 2010/09/20 10:15:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_6.vspx b/appsrc/ODS-Framework/uiedit_personal_6.vspx
index d7b028d..95880ef 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.10 2010/12/07 11:11:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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="10">
+ nrows="0">
<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 c816f43..06dbdf4 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.7 2011/05/16 08:53:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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="10">
+ nrows="0">
<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 678ec90..a7f8085 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.19 2011/08/01 14:14:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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="Private Keys" 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="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"/>
</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 85b94a1..f2482fd 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.6 2010/09/27 14:45:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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="1000">
+ nrows="0">
<v:before-data-bind>
if (not e.ve_is_post and self.del_related is not null)
{
@@ -127,25 +127,22 @@ if (not e.ve_is_post and control.te_rowset[0] = self.edit_related)
</div>
<label for="related_url">URI</label>
<br/>
- <v:text name="related_url" value="" xhtml_id="related_url" xhtml_size="50" xhtml_class="_validate_ _url_ _canEmpty_" xhtml_onblur="javascript: validateField(this);" />
+ <v:text name="related_url" value="" xhtml_id="related_url" xhtml_size="50" xhtml_class="_validate_ _url_" />
<br />
<label for="related_name">Label</label>
<br/>
- <v:text name="related_name" value="" xhtml_id="related_name" xhtml_size="50" error-glyph="*">
- <v:validator test="sql" expression="length(trim(control.ufl_value)) < 2" message="Label can not be empty"/>
- </v:text>
+ <v:text name="related_name" value="" xhtml_id="related_name" xhtml_size="50" xhtml_class="_validate_" />
<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">
- <v:button name="related_cancel1" value="Cancel" action="simple" enabled="--equ(isnull(self.edit_related),0)">
+ <v:button name="related_cancel1" value="Cancel" action="simple">
<v:on-post>
self.related_name.ufl_value := null;
self.related_url.ufl_value := null;
self.edit_related := null;
self.vc_data_bind (e);
-control.vc_enabled := 0;
</v:on-post>
</v:button>
<v:button name="related_save1" value="--case when self.edit_related is null then 'Add' else 'Update' end" action="simple" xhtml_onclick="return validateInputs(this);">
@@ -156,9 +153,9 @@ declare stat, msg, dta, mdta, qrs any;
if (not self.vc_is_valid)
return;
-url := self.related_url.ufl_value;
-name := self.related_name.ufl_value;
-pred := get_keyword ('pred', e.ve_params);
+ url := trim (self.related_url.ufl_value);
+ name := trim (self.related_name.ufl_value);
+ pred := trim (get_keyword ('pred', e.ve_params));
if (not length (url))
{
self.vc_is_valid := 0;
@@ -173,13 +170,25 @@ if (not length (pred))
}
self.rel_iri := pred;
pred := ods_iri_expand (pred);
+ if (self.edit_related is null and exists (select 1 from WA_USER_RELATED_RES where WUR_U_ID = self.u_id and WUR_SEEALSO_IRI = url and WUR_P_IRI = pred))
+ {
+ self.vc_is_valid := 0;
+ self.vc_error_message := 'The relation already exists';
+ return;
+ }
+
if (self.edit_related is null)
{
- insert into WA_USER_RELATED_RES (WUR_U_ID,WUR_LABEL,WUR_SEEALSO_IRI, WUR_P_IRI) values (self.u_id, name, url, pred);
+ insert into WA_USER_RELATED_RES (WUR_U_ID, WUR_LABEL, WUR_SEEALSO_IRI, WUR_P_IRI)
+ values (self.u_id, name, url, pred);
}
else
{
- update WA_USER_RELATED_RES set WUR_LABEL = name, WUR_SEEALSO_IRI = url, WUR_P_IRI = pred where WUR_ID = self.edit_related;
+ update WA_USER_RELATED_RES
+ set WUR_LABEL = name,
+ WUR_SEEALSO_IRI = url,
+ WUR_P_IRI = pred
+ where WUR_ID = self.edit_related;
}
if (self.spb.ufl_selected)
{
diff --git a/appsrc/ODS-Framework/uiedit_sec.vspx b/appsrc/ODS-Framework/uiedit_sec.vspx
index afee9ad..5ce3b53 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.2 2010/09/27 14:45:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_svc.vspx b/appsrc/ODS-Framework/uiedit_svc.vspx
index 5665358..290a6b7 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.7 2011/05/02 14:16:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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="1000">
+ <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: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 719dacc..7e4267c 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.2 2010/09/27 14:45:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_validation.vspx b/appsrc/ODS-Framework/uiedit_validation.vspx
index b99c6ce..e30f0e3 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.5 2011/03/23 12:18:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_visb.vspx b/appsrc/ODS-Framework/uiedit_visb.vspx
index 19b45eb..87fe0b4 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.2 2010/11/09 20:18:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/uiedit_wishlist.vspx b/appsrc/ODS-Framework/uiedit_wishlist.vspx
index 88c0079..3ca9729 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.16 2011/06/09 17:43:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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="10">
+ nrows="0">
<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 caf1cf2..dda8763 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.2 2010/09/27 14:45:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/url_rew.sql b/appsrc/ODS-Framework/url_rew.sql
index 5ab5c43..d65d567 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.11 2011/08/01 14:14:21 source Exp $
+-- $Id$
--
-- URL rewrite rules for ODS
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -255,6 +255,17 @@ create procedure DB.DBA.ODS_URLREW_XRDS (in path varchar)
}
;
+create procedure DB.DBA.ODS_SERVICES_PAGE (in par varchar, in fmt varchar, in val varchar)
+{
+ declare ret any;
+
+ if (par = 'part')
+ {
+ ret := sprintf ('http://%s%s/services/%s', SIOC..get_cname (), SIOC..get_base_path (), val);
+ }
+ return sprintf (fmt, ret);
+}
+;
-- Person IRI as HTML
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ods_person_html', 1,
@@ -402,6 +413,14 @@ 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/([^/]*)/([^\\?]*)',
@@ -610,7 +629,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/x-json+ld', 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);
create procedure DB.DBA.ODS_URLREW_HDR (in in_path varchar)
{
@@ -633,7 +652,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/x-json+ld')
+ vector ('jld', 'JSON-LD', 'application/ld+json')
);
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)
@@ -651,7 +670,7 @@ create procedure DB.DBA.ODS_URLREW_HDR (in in_path varchar)
{
tmp := path;
}
- links := 'Link: ';
+ links := sprintf ('X-RDF-Graph: http://%{WSHost}s/dataspace\r\nX-SPARQL-Endpoint: http://%{WSHost}s/sparql-auth/\r\nLink: ');
links := links || sprintf ('<http://%s%s>; rel="http://xmlns.com/foaf/0.1/primaryTopic",', host, tmp);
links := links || sprintf ('\r\n <http://%s%s>; rev="describedby",', host, tmp);
if (uname is not null)
@@ -694,7 +713,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/x-json+ld)',
+ '(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)',
2,
303,
null --'^{sql:DB.DBA.ODS_URLREW_HDR}^'
@@ -705,7 +724,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/x-json+ld)',
+ '(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)',
2,
303,
null --'^{sql:DB.DBA.ODS_URLREW_HDR}^'
@@ -746,10 +765,20 @@ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ods_error', 1,
null,
2);
+DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ods_services', 1,
+ '/dataspace/doc/services/([^\\?]*)\x24',
+ vector('part'), 1,
+ '/describe/?url=%U', vector('part'),
+ 'DB.DBA.ODS_SERVICES_PAGE',
+ null,
+ 2,
+ 302);
+
-- All rules are processed in the order below.
-- Every rule will be tried and last matching rule will win
DB.DBA.URLREWRITE_CREATE_RULELIST ('ods_rule_list1', 1,
vector(
+ 'ods_services',
'ods_person_html',
'ods_person_yadis',
'ods_apps_html',
@@ -766,6 +795,7 @@ 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 2994bd3..3e0f5de 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.2 2011/01/25 14:11:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/user_rdf.sql b/appsrc/ODS-Framework/user_rdf.sql
index 8829dfe..8bf0d1c 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.1 2010/09/20 10:15:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/user_template.vspx b/appsrc/ODS-Framework/user_template.vspx
index 8f41751..3c26d42 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.1 2010/09/20 10:15:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/users/css/users.css b/appsrc/ODS-Framework/users/css/users.css
index e73d441..4c9a9d2 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.9 2010/12/20 12:27:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/users/js/users.js b/appsrc/ODS-Framework/users/js/users.js
index 937e23e..75674af 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-2007 OpenLink Software
+ * 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
@@ -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)
+ if (params[param] && params[param].length != 0 && params[param] != 'undefined')
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.ax.', '');
+ ns = prop.replace('openid.ns.', '');
break;
}
}
@@ -663,6 +663,7 @@ 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');
@@ -688,6 +689,8 @@ 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')
@@ -872,8 +875,8 @@ function init()
pfTabInit('pf_tab_2_', $v('formTab2'));
}
- if (!startForm) {
var userName;
+ if (!startForm) {
if (typeof (uriParams['userName']) != 'undefined' && uriParams['userName'] != '')
userName = uriParams['userName'];
@@ -889,10 +892,75 @@ function init()
if (validateSession || userName)
selectProfile(userName);
}
+ if ($v('mode') == 'html') {
+ var host = document.location.protocol + '//' + document.location.host;
+ $('hostTag_1').href = host + $('hostTag_1').getAttribute("href");
+ $('hostTag_2').href = host + $('hostTag_2').getAttribute("href");
+
+ if (userName) {
+ // add link & meta tags
+ var S =
+ '<link id="userTag_1" rel="meta" type="application/rdf+xml" title="SIOC" href="[HOST]/dataspace/[USER]/sioc.rdf" />\n' +
+ '<link id="userTag_2" rel="meta" type="application/rdf+xml" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.rdf" />\n' +
+ '<link id="userTag_3" rel="meta" type="text/rdf+n3" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.n3" />\n' +
+ '<link id="userTag_4" rel="meta" type="application/json" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.json" />\n' +
+ '<link id="userTag_5" rel="http://xmlns.com/foaf/0.1/primaryTopic" title="About" href="[HOST]/dataspace/person/[USER]#this" />\n' +
+ '<link id="userTag_6" rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />\n' +
+ '<meta id="userTag_7" name="dc.language" content="en" scheme="rfc1766" />\n' +
+ '<meta id="userTag_8" name="dc.creator" content="[USER]" />\n' +
+ '<meta id="userTag_9" name="dc.description" content="ODS HTML [USER]s page" />\n' +
+ '<meta id="userTag_10" name="dc.title" content="ODS HTML [USER]s page" />\n' +
+ '<link id="userTag_11" rev="describedby" title="About" href="[HOST]/dataspace/person/[USER]#this" />\n' +
+ '<link id="userTag_12" rel="schema.geo" href="http://www.w3.org/2003/01/geo/wgs84_pos#" />\n' +
+ '<meta id="userTag_13" http-equiv="X-XRDS-Location" content="[HOST]/dataspace/[USER]/yadis.xrds" />\n' +
+ '<meta id="userTag_14" http-equiv="X-YADIS-Location" content="[HOST]/dataspace/[USER]/yadis.xrds" />\n' +
+ '<link id="userTag_15" rel="meta" type="application/xml+apml" title="APML 0.6" href="[HOST]/dataspace/[USER]/apml.xml" />\n' +
+ '<link id="userTag_16" rel="alternate" type="application/atom+xml" title="OpenSocial Friends" href="[HOST]/feeds/people/[USER]/friends" />';
+ S = S.replace ('[HOST]', host);
+ S = S.replace ('[USER]', userName);
+ var tag_1 = OAT.Dom.create('link', {id: 'userTag_1', rel: 'meta', type: 'application/rdf+xml', title: 'SIOC', href: userHref('[HOST]/dataspace/[USER]/sioc.rdf', host, userName)});
+ var tag_2 = OAT.Dom.create('link', {id: 'userTag_2', rel: 'meta', type: 'application/rdf+xml', title: 'FOAF', href: userHref('[HOST]/dataspace/person/[USER]/foaf.rdf', host, userName)});
+ var tag_3 = OAT.Dom.create('link', {id: 'userTag_3', rel: 'meta', type: 'text/rdf+n3', title: 'FOAF', href: userHref('[HOST]/dataspace/person/[USER]/foaf.n3', host, userName)});
+ var tag_4 = OAT.Dom.create('link', {id: 'userTag_4', rel: 'meta', type: 'application/json', title: 'FOAF', href: userHref('[HOST]/dataspace/person/[USER]/foaf.json', host, userName)});
+ var tag_5 = OAT.Dom.create('link', {id: 'userTag_5', rel: 'http://xmlns.com/foaf/0.1/primaryTopic', title: 'About', href: userHref('[HOST]/dataspace/person/[USER]#this', host, userName)});
+ var tag_6 = OAT.Dom.create('link', {id: 'userTag_6', rel: 'schema.dc', href: userHref('http://purl.org/dc/elements/1.1/', host, userName)});
+ var tag_7 = OAT.Dom.create('meta', {id: 'userTag_7', name: 'dc.language', content: 'en', scheme: 'rfc1766'});
+ var tag_8 = OAT.Dom.create('meta', {id: 'userTag_8', name: 'dc.creator', content: userHref('[USER]', host, userName)});
+ var tag_9 = OAT.Dom.create('meta', {id: 'userTag_9', name: 'dc.description', content: userHref('ODS HTML [USER]\'s page', host, userName)});
+ var tag_10 = OAT.Dom.create('meta', {id: 'userTag_10', name: 'dc.title', content: userHref('ODS HTML [USER]\'s page', host, userName)});
+ var tag_11 = OAT.Dom.create('link', {id: 'userTag_11', rev: 'describedby', title: 'About', href: userHref('[HOST]/dataspace/person/[USER]#this', host, userName)});
+ var tag_12 = OAT.Dom.create('link', {id: 'userTag_12', rel: 'schema.geo', href: userHref('http://www.w3.org/2003/01/geo/wgs84_pos#', host, userName)});
+ var tag_13 = OAT.Dom.create('meta', {id: 'userTag_13', "http-equiv": 'X-XRDS-Location', content: userHref('[HOST]/dataspace/[USER]/yadis.xrds', host, userName)});
+ var tag_14 = OAT.Dom.create('meta', {id: 'userTag_14', "http-equiv": 'X-YADIS-Location', content: userHref('[HOST]/dataspace/[USER]/yadis.xrds', host, userName)});
+ var tag_15 = OAT.Dom.create('link', {id: 'userTag_15', rel: 'meta', type: 'application/xml+apml', title: 'APML 0.6', href: userHref('[HOST]/dataspace/[USER]/apml.xml', host, userName)});
+ var tag_16 = OAT.Dom.create('link', {id: 'userTag_16', rel: 'alternate', type: 'application/atom+xml', title: 'OpenSocial Friends', href: userHref('[HOST]/feeds/people/[USER]/friends', host, userName)});
+ $('hostTag_2').parentNode.insertBefore(tag_1, $('hostTag_2').nextSibling);
+ tag_1.parentNode.insertBefore (tag_2 , tag_1.nextSibling);
+ tag_2.parentNode.insertBefore (tag_3 , tag_1.nextSibling);
+ tag_3.parentNode.insertBefore (tag_4 , tag_1.nextSibling);
+ tag_4.parentNode.insertBefore (tag_5 , tag_1.nextSibling);
+ tag_5.parentNode.insertBefore (tag_6 , tag_1.nextSibling);
+ tag_6.parentNode.insertBefore (tag_7 , tag_1.nextSibling);
+ tag_7.parentNode.insertBefore (tag_8 , tag_1.nextSibling);
+ tag_8.parentNode.insertBefore (tag_9 , tag_1.nextSibling);
+ tag_9.parentNode.insertBefore (tag_10, tag_1.nextSibling);
+ tag_10.parentNode.insertBefore(tag_11, tag_1.nextSibling);
+ tag_11.parentNode.insertBefore(tag_12, tag_1.nextSibling);
+ tag_12.parentNode.insertBefore(tag_13, tag_1.nextSibling);
+ tag_13.parentNode.insertBefore(tag_14, tag_1.nextSibling);
+ tag_14.parentNode.insertBefore(tag_15, tag_1.nextSibling);
+ tag_15.parentNode.insertBefore(tag_16, tag_1.nextSibling);
+ }
+ }
OAT.MSG.send(OAT, 'PAGE_LOADED');
}
+function userHref(S, host, userName)
+{
+ return (S.replace ('[HOST]', host)).replace ('[USER]', userName);
+}
+
function lfCallback(oldIndex, newIndex)
{
$('lf_login').disabled = false;
@@ -2124,6 +2192,8 @@ 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);
@@ -2418,7 +2488,6 @@ 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);
@@ -3527,3 +3596,17 @@ 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 bdfef47..723c6d9 100644
--- a/appsrc/ODS-Framework/users/users.html
+++ b/appsrc/ODS-Framework/users/users.html
@@ -1,7 +1,33 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ -
+ - $Id$
+ -
+ - 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>
<head>
- <title>Virtuoso Web Applications</title>
+ <title>ODS users's pages</title>
+ <link id="hostTag_1" rel="openid.server" title="OpenID Server" href="/openid" />
+ <link id="hostTag_2" rel="openid2.provider" title="OpenID v2 Server" href="/openid" />
<link rel="stylesheet" type="text/css" href="/ods/users/css/users.css" />
<link rel="stylesheet" type="text/css" href="/ods/default.css" />
<link rel="stylesheet" type="text/css" href="/ods/nav_framework.css" />
@@ -79,7 +105,7 @@
<div id="lf_page_0" class="tabContent" >
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="lf_uid">User ID</label>
</th>
<td nowrap="nowrap">
@@ -99,7 +125,7 @@
<div id="lf_page_1" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="lf_openId">OpenID URL</label>
</th>
<td nowrap="nowrap">
@@ -111,7 +137,7 @@
<div id="lf_page_2" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td nowrap="nowrap">
<span id="lf_facebookData" style="min-height: 20px;"></span>
@@ -136,7 +162,7 @@
<div id="lf_page_4" class="tabContent" style="display: none">
<table id="lf_table_4" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="lf_twitter" style="min-height: 20px;"></span>
@@ -219,7 +245,7 @@
<div id="rf_page_1" class="tabContent" >
<table id="rf_table_1" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="rf_openId">OpenID</label>
</th>
<td nowrap="nowrap">
@@ -231,7 +257,7 @@
<div id="rf_page_2" class="tabContent" >
<table id="rf_table_2" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td nowrap="nowrap">
<span id="rf_facebookData" style="min-height: 20px;"></span>
@@ -256,7 +282,7 @@
<div id="rf_page_4" class="tabContent" style="display: none">
<table id="rf_table_4" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="rf_twitter" style="min-height: 20px;"></span>
@@ -283,7 +309,7 @@
<div>
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</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,6 +380,12 @@
<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>
@@ -1501,7 +1533,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="Download">
+ <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Retrieve">
<img style="display: none;" src="/ods/images/oat/Ajax_throbber.gif" alt="Import knows URIs" id="k_import_image">
</td>
</tr>
@@ -1528,7 +1560,7 @@
<tbody>
<tr id="k_tr_no">
<td colspan="3">
- <b>No downloaded items</b>
+ <b>No retrieved items</b>
</td>
</tr>
</tbody>
@@ -2244,7 +2276,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-2011 OpenLink Software
+ Copyright © 1999-2012 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.jsp b/appsrc/ODS-Framework/users/users.jsp
index 61db09a..690273b 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.43 2011/08/03 11:42:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
@@ -48,27 +48,6 @@
<%@ page import="org.apache.commons.fileupload.*" %>
<%@ page import="org.apache.commons.fileupload.disk.*" %>
<%@ page import="org.apache.commons.fileupload.servlet.*" %>
-<html>
- <head>
- <title>Virtuoso Web Applications</title>
- <link rel="stylesheet" type="text/css" href="/ods/users/css/users.css" />
- <link rel="stylesheet" type="text/css" href="/ods/default.css" />
- <link rel="stylesheet" type="text/css" href="/ods/nav_framework.css" />
- <link rel="stylesheet" type="text/css" href="/ods/typeahead.css" />
- <link rel="stylesheet" type="text/css" href="/ods/ods-bar.css" />
- <link rel="stylesheet" type="text/css" href="/ods/rdfm.css" />
- <script type="text/javascript" src="/ods/users/js/users.js"></script>
- <script type="text/javascript" src="/ods/common.js"></script>
- <script type="text/javascript" src="/ods/typeahead.js"></script>
- <script type="text/javascript" src="/ods/tbl.js"></script>
- <script type="text/javascript" src="/ods/validate.js"></script>
- <script type="text/javascript">
- // OAT
- var toolkitPath="/ods/oat";
- var featureList = ["ajax", "json", "tab", "combolist", "calendar", "rdfmini", "grid", "graphsvg", "tagcloud", "map", "timeline", "anchor"];
- </script>
- <script type="text/javascript" src="/ods/oat/loader.js"></script>
- </head>
<%!
XPathFactory factory = XPathFactory.newInstance();
XPath xpath = factory.newXPath();
@@ -353,6 +332,9 @@
String $_formMode = "";
if (getParameter(items, request, "formMode") != null)
$_formMode = getParameter(items, request, "formMode");
+ String $_host;
+ String $_hostLinks = "";
+ String $_userLinks = "";
try
{
@@ -1009,12 +991,63 @@
{
$_sid = "";
}
+
+ $_host = (new URL(request.getScheme(), request.getServerName(), request.getServerPort(), "")).toString();
+ $_hostLinks =
+ " <link rel=\"openid.server\" title=\"OpenID Server\" href=\"[HOST]/openid\" />\n" +
+ " <link rel=\"openid2.provider\" title=\"OpenID v2 Server\" href=\"[HOST]/openid\" />";
+ $_hostLinks = $_hostLinks.replace ("[HOST]", $_host);
+
+ if ($_userName != null) {
+ $_userLinks =
+ " <link rel=\"meta\" type=\"application/rdf+xml\" title=\"SIOC\" href=\"[HOST]/dataspace/[USER]/sioc.rdf\" />\n" +
+ " <link rel=\"meta\" type=\"application/rdf+xml\" title=\"FOAF\" href=\"[HOST]/dataspace/person/[USER]/foaf.rdf\" />\n" +
+ " <link rel=\"meta\" type=\"text/rdf+n3\" title=\"FOAF\" href=\"[HOST]/dataspace/person/[USER]/foaf.n3\" />\n" +
+ " <link rel=\"meta\" type=\"application/json\" title=\"FOAF\" href=\"[HOST]/dataspace/person/[USER]/foaf.json\" />\n" +
+ " <link rel=\"http://xmlns.com/foaf/0.1/primaryTopic\" title=\"About\" href=\"[HOST]/dataspace/person/[USER]#this\" />\n" +
+ " <link rel=\"schema.dc\" href=\"http://purl.org/dc/elements/1.1/\" />\n" +
+ " <meta name=\"dc.language\" content=\"en\" scheme=\"rfc1766\" />\n" +
+ " <meta name=\"dc.creator\" content=\"[USER]\" />\n" +
+ " <meta name=\"dc.description\" content=\"ODS HTML [USER]'s page\" />\n" +
+ " <meta name=\"dc.title\" content=\"ODS HTML [USER]'s page\" />\n" +
+ " <link rev=\"describedby\" title=\"About\" href=\"[HOST]/dataspace/person/[USER]#this\" />\n" +
+ " <link rel=\"schema.geo\" href=\"http://www.w3.org/2003/01/geo/wgs84_pos#\" />\n" +
+ " <meta http-equiv=\"X-XRDS-Location\" content=\"[HOST]/dataspace/[USER]/yadis.xrds\" />\n" +
+ " <meta http-equiv=\"X-YADIS-Location\" content=\"[HOST]/dataspace/[USER]/yadis.xrds\" />\n" +
+ " <link rel=\"meta\" type=\"application/xml+apml\" title=\"APML 0.6\" href=\"[HOST]/dataspace/[USER]/apml.xml\" />\n" +
+ " <link rel=\"alternate\" type=\"application/atom+xml\" title=\"OpenSocial Friends\" href=\"[HOST]/feeds/people/[USER]/friends\" />";
+ $_userLinks = $_userLinks.replace ("[HOST]", $_host);
+ $_userLinks = $_userLinks.replace ("[USER]", $_userName);
+ }
}
catch (Exception e)
{
$_error = "Failure: " + e.getMessage();
}
%>
+<html>
+ <head>
+ <title>ODS user's pages</title>
+<% out.print($_hostLinks); %>
+<% out.print($_userLinks); %>
+ <link rel="stylesheet" type="text/css" href="/ods/users/css/users.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/default.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/nav_framework.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/typeahead.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/ods-bar.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/rdfm.css" />
+ <script type="text/javascript" src="/ods/users/js/users.js"></script>
+ <script type="text/javascript" src="/ods/common.js"></script>
+ <script type="text/javascript" src="/ods/typeahead.js"></script>
+ <script type="text/javascript" src="/ods/tbl.js"></script>
+ <script type="text/javascript" src="/ods/validate.js"></script>
+ <script type="text/javascript">
+ // OAT
+ var toolkitPath="/ods/oat";
+ var featureList = ["ajax", "json", "tab", "combolist", "calendar", "rdfmini", "grid", "graphsvg", "tagcloud", "map", "timeline", "anchor"];
+ </script>
+ <script type="text/javascript" src="/ods/oat/loader.js"></script>
+ </head>
<body>
<form name="page_form" id="page_form" method="post" enctype="<% out.print(($_form.equals("profile") && ($_formTab == 0) && ($_formTab2 == 1))? "multipart/form-data": "application/x-www-form-urlencoded"); %>">
<input type="hidden" name="mode" id="mode" value="jsp" />
@@ -1090,7 +1123,7 @@
<div id="lf_page_0" class="tabContent" >
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="lf_uid">User ID</label>
</th>
<td>
@@ -1110,7 +1143,7 @@
<div id="lf_page_1" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="lf_openId">OpenID URL</label>
</th>
<td>
@@ -1122,7 +1155,7 @@
<div id="lf_page_2" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="lf_facebookData" style="min-height: 20px;"></span>
@@ -1147,7 +1180,7 @@
<div id="lf_page_4" class="tabContent" style="display: none">
<table id="lf_table_4" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="lf_twitter" style="min-height: 20px;"></span>
@@ -1198,7 +1231,7 @@
<div id="rf_page_0" class="tabContent" >
<table id="rf_table_0" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="rf_uid_0">Login Name<div style="font-weight: normal; display:inline; color:red;"> *</div></label>
</th>
<td>
@@ -1234,7 +1267,7 @@
<div id="rf_page_1" class="tabContent" style="display: none">
<table id="rf_table_1" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="rf_openId">OpenID</label>
</th>
<td>
@@ -1246,7 +1279,7 @@
<div id="rf_page_2" class="tabContent" style="display: none">
<table id="rf_table_2" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="rf_facebookData" style="min-height: 20px;"></span>
@@ -1271,7 +1304,7 @@
<div id="rf_page_4" class="tabContent" style="display: none">
<table id="rf_table_4" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="rf_twitter" style="min-height: 20px;"></span>
@@ -1298,7 +1331,7 @@
<div>
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</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,6 +1433,12 @@
<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>
@@ -2844,7 +2883,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="Download">
+ <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Retrieve">
<img style="display: none;" src="/ods/images/oat/Ajax_throbber.gif" alt="Import knows URIs" id="k_import_image">
</td>
</tr>
@@ -2871,7 +2910,7 @@
<tbody>
<tr id="k_tr_no">
<td colspan="3">
- <b>No downloaded items</b>
+ <b>No retrieved items</b>
</td>
</tr>
</tbody>
@@ -3797,7 +3836,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-2011 OpenLink Software
+ Copyright © 1999-2012 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.php b/appsrc/ODS-Framework/users/users.php
index dfe4930..2a37bed 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.45 2011/08/03 11:42:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2008 OpenLink Software
+ - 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
@@ -23,27 +23,6 @@
-
-
-->
-<html>
- <head>
- <title>Virtuoso Web Applications</title>
- <link rel="stylesheet" type="text/css" href="/ods/users/css/users.css" />
- <link rel="stylesheet" type="text/css" href="/ods/default.css" />
- <link rel="stylesheet" type="text/css" href="/ods/nav_framework.css" />
- <link rel="stylesheet" type="text/css" href="/ods/typeahead.css" />
- <link rel="stylesheet" type="text/css" href="/ods/ods-bar.css" />
- <link rel="stylesheet" type="text/css" href="/ods/rdfm.css" />
- <script type="text/javascript" src="/ods/users/js/users.js"></script>
- <script type="text/javascript" src="/ods/common.js"></script>
- <script type="text/javascript" src="/ods/typeahead.js"></script>
- <script type="text/javascript" src="/ods/tbl.js"></script>
- <script type="text/javascript" src="/ods/validate.js"></script>
- <script type="text/javascript">
- // OAT
- var toolkitPath="/ods/oat";
- var featureList = ["ajax", "json", "tab", "combolist", "calendar", "rdfmini", "grid", "graphsvg", "tagcloud", "map", "timeline", "anchor"];
- </script>
- <script type="text/javascript" src="/ods/oat/loader.js"></script>
- </head>
<?php
function parseUrl($url) {
// parse the given URL
@@ -151,6 +130,13 @@
return $pageURL.'/ods/api';
}
+ function hostURL()
+ {
+ $pageURL = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
+ $pageURL .= $_SERVER['SERVER_PORT'] <> '80' ? $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"] : $_SERVER['SERVER_NAME'];
+ return $pageURL;
+ }
+
function myUrlencode ($S)
{
$S = urlencode($S);
@@ -840,7 +826,60 @@
$_sid = "";
$_realm = "";
}
+ $_hostLinks = str_replace (
+ '[HOST]',
+ hostURL(),
+ ' <link rel="openid.server" title="OpenID Server" href="[HOST]/openid" />' .
+ ' <link rel="openid2.provider" title="OpenID v2 Server" href="[HOST]/openid" />'
+ );
+
+ $_userLinks = '';
+ if ($_userName != "")
+ {
+ $_userLinks =
+ ' <link rel="meta" type="application/rdf+xml" title="SIOC" href="[HOST]/dataspace/[USER]/sioc.rdf" />' .
+ ' <link rel="meta" type="application/rdf+xml" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.rdf" />' .
+ ' <link rel="meta" type="text/rdf+n3" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.n3" />' .
+ ' <link rel="meta" type="application/json" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.json" />' .
+ ' <link rel="http://xmlns.com/foaf/0.1/primaryTopic" title="About" href="[HOST]/dataspace/person/[USER]#this" />' .
+ ' <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />' .
+ ' <meta name="dc.language" content="en" scheme="rfc1766" />' .
+ ' <meta name="dc.creator" content="[USER]" />' .
+ ' <meta name="dc.description" content="ODS HTML [USER]\'s page" />' .
+ ' <meta name="dc.title" content="ODS HTML [USER]\'s page" />' .
+ ' <link rev="describedby" title="About" href="[HOST]/dataspace/person/[USER]#this" />' .
+ ' <link rel="schema.geo" href="http://www.w3.org/2003/01/geo/wgs84_pos#" />' .
+ ' <meta http-equiv="X-XRDS-Location" content="[HOST]/dataspace/[USER]/yadis.xrds" />' .
+ ' <meta http-equiv="X-YADIS-Location" content="[HOST]/dataspace/[USER]/yadis.xrds" />' .
+ ' <link rel="meta" type="application/xml+apml" title="APML 0.6" href="[HOST]/dataspace/[USER]/apml.xml" />' .
+ ' <link rel="alternate" type="application/atom+xml" title="OpenSocial Friends" href="[HOST]/feeds/people/[USER]/friends" />';
+ $_userLinks = str_replace ('[HOST]', hostURL(), $_userLinks);
+ $_userLinks = str_replace ('[USER]', $_userName, $_userLinks);
+ }
?>
+<html>
+ <head>
+ <title>ODS user's pages</title>
+<?php echo $_hostLinks; ?>
+<?php echo $_userLinks; ?>
+ <link rel="stylesheet" type="text/css" href="/ods/users/css/users.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/default.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/nav_framework.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/typeahead.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/ods-bar.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/rdfm.css" />
+ <script type="text/javascript" src="/ods/users/js/users.js"></script>
+ <script type="text/javascript" src="/ods/common.js"></script>
+ <script type="text/javascript" src="/ods/typeahead.js"></script>
+ <script type="text/javascript" src="/ods/tbl.js"></script>
+ <script type="text/javascript" src="/ods/validate.js"></script>
+ <script type="text/javascript">
+ // OAT
+ var toolkitPath="/ods/oat";
+ var featureList = ["ajax", "json", "tab", "combolist", "calendar", "rdfmini", "grid", "graphsvg", "tagcloud", "map", "timeline", "anchor"];
+ </script>
+ <script type="text/javascript" src="/ods/oat/loader.js"></script>
+ </head>
<body onunload="myCheckLeave (document.forms['page_form'])">
<form name="page_form" id="page_form" method="post" enctype="multipart/form-data">
<input type="hidden" name="mode" id="mode" value="php" />
@@ -915,7 +954,7 @@
<div id="lf_page_0" class="tabContent" >
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="lf_uid">User ID</label>
</th>
<td>
@@ -935,7 +974,7 @@
<div id="lf_page_1" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="lf_openId">OpenID URL</label>
</th>
<td>
@@ -947,7 +986,7 @@
<div id="lf_page_2" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="lf_facebookData" style="min-height: 20px;"></span>
@@ -972,7 +1011,7 @@
<div id="lf_page_4" class="tabContent" style="display: none">
<table id="lf_table_4" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="lf_twitter" style="min-height: 20px;"></span>
@@ -1023,7 +1062,7 @@
<div id="rf_page_0" class="tabContent" style="display: none">
<table id="rf_table_0" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="rf_uid_0">Login Name<div style="font-weight: normal; display:inline; color:red;"> *</div></label>
</th>
<td>
@@ -1059,7 +1098,7 @@
<div id="rf_page_1" class="tabContent" style="display: none">
<table id="rf_table_1" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
<label for="rf_openId">OpenID</label>
</th>
<td>
@@ -1071,7 +1110,7 @@
<div id="rf_page_2" class="tabContent" style="display: none">
<table id="rf_table_2" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="rf_facebookData" style="min-height: 20px;"></span>
@@ -1096,7 +1135,7 @@
<div id="rf_page_4" class="tabContent" style="display: none">
<table id="rf_table_4" class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</th>
<td>
<span id="rf_twitter" style="min-height: 20px;"></span>
@@ -1123,7 +1162,7 @@
<div>
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</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,11 +1265,18 @@
<div id="pf_page_0_1" class="tabContent" style="display:none;">
<table class="form" cellspacing="5">
<tr>
- <th>
+ <th>Account deactivation</th>
+ <td>
+ <input type="button" value="Deactivate" onclick="return userDisable('pf_loginName');" />
+ </td>
+ </tr>
+ <tr>
+ <th width="30%">
<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>
@@ -1242,7 +1288,7 @@
</td>
</tr>
<tr>
- <th width="30%">
+ <th>
<label for="pf_title">Title</label>
</th>
<td>
@@ -2673,7 +2719,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="Download">
+ <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Retrieve">
<img style="display: none;" src="/ods/images/oat/Ajax_throbber.gif" alt="Import knows URIs" id="k_import_image">
</td>
</tr>
@@ -2700,7 +2746,7 @@
<tbody>
<tr id="k_tr_no">
<td colspan="3">
- <b>No downloaded items</b>
+ <b>No retrieved items</b>
</td>
</tr>
</tbody>
@@ -3645,7 +3691,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-2011 OpenLink Software
+ Copyright © 1999-2012 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.rb b/appsrc/ODS-Framework/users/users.rb
index 93441bf..019beb3 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-2007 OpenLink Software
+# 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
@@ -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-2011 OpenLink Software
+ Copyright © 1999-2012 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.vsp b/appsrc/ODS-Framework/users/users.vsp
index 723ac04..c5e4bb8 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.44 2011/08/03 11:42:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2008 OpenLink Software
+ - 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
@@ -23,34 +23,15 @@
-
-
-->
-<html>
- <head>
- <title>Virtuoso Web Applications</title>
- <link rel="stylesheet" type="text/css" href="/ods/users/css/users.css" />
- <link rel="stylesheet" type="text/css" href="/ods/default.css" />
- <link rel="stylesheet" type="text/css" href="/ods/nav_framework.css" />
- <link rel="stylesheet" type="text/css" href="/ods/typeahead.css" />
- <link rel="stylesheet" type="text/css" href="/ods/ods-bar.css" />
- <link rel="stylesheet" type="text/css" href="/ods/rdfm.css" />
- <script type="text/javascript" src="/ods/users/js/users.js"></script>
- <script type="text/javascript" src="/ods/common.js"></script>
- <script type="text/javascript" src="/ods/typeahead.js"></script>
- <script type="text/javascript" src="/ods/tbl.js"></script>
- <script type="text/javascript" src="/ods/validate.js"></script>
- <script type="text/javascript">
- // OAT
- var toolkitPath="/ods/oat";
- var featureList = ["ajax", "json", "tab", "combolist", "calendar", "rdfmini", "grid", "graphsvg", "tagcloud", "map", "timeline", "anchor"];
- </script>
- <script type="text/javascript" src="/ods/oat/loader.js"></script>
- </head>
<?vsp
declare N integer;
- declare vHostUrl, vUrl, vParams, vResult, vRequest, vRespond any;
+ declare vHost, vHostUrl, vUrl, vParams, vResult, vRequest, vRespond any;
declare tmp, suffix, vValidate, vSid, vRealm, vUserName, vError, vForm, vFormTab, vFormTab2, vFormTab3, vFormMode, vXml, vAcl, xAcl, vLists, vList, items any;
+ declare vHostLinks, vUserLinks any;
- vHostUrl := http_request_header (http_request_header () , 'Host' , null , sys_connected_server_address ());
- if (isstring (vHostUrl) and strchr (vHostUrl , ':') is null)
+ vUserLinks := '';
+ vHost := http_request_header (http_request_header () , 'Host' , null , sys_connected_server_address ());
+ if (isstring (vHost) and strchr (vHost , ':') is null)
{
declare hp varchar;
declare hpa any;
@@ -58,17 +39,17 @@
hp := sys_connected_server_address ();
hpa := split_and_decode ( hp , 0 , '\0\0:');
if (hpa [1] <> '80')
- vHostUrl := vHostUrl || ':' || hpa [1];
+ vHost := vHost || ':' || hpa [1];
}
if (is_https_ctx ())
{
- if (vHostUrl not like 'https://%')
- vHostUrl := 'https://' || vHostUrl;
+ if (vHost not like 'https://%')
+ vHost := 'https://' || vHost;
} else {
- if (vHostUrl not like 'http://%')
- vHostUrl := 'http://' || vHostUrl;
+ if (vHost not like 'http://%')
+ vHost := 'http://' || vHost;
}
- vHostUrl := vHostUrl || '/ods/api';
+ vHostUrl := vHost || '/ods/api';
vRequest := null;
vRespond := null;
@@ -974,7 +955,59 @@
vSid := '';
vRealm := '';
}
+ vHostLinks := replace (
+ ' <link rel="openid.server" title="OpenID Server" href="[HOST]/openid" />\n' ||
+ ' <link rel="openid2.provider" title="OpenID v2 Server" href="[HOST]/openid" />',
+ '[HOST]',
+ vHost);
+
+ vUserLinks := '';
+ if (not isnull (vUserName))
+ {
+ vUserLinks :=
+ '\n' ||
+ ' <link rel="meta" type="application/rdf+xml" title="SIOC" href="[HOST]/dataspace/[USER]/sioc.rdf" />\n' ||
+ ' <link rel="meta" type="application/rdf+xml" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.rdf" />\n' ||
+ ' <link rel="meta" type="text/rdf+n3" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.n3" />\n' ||
+ ' <link rel="meta" type="application/json" title="FOAF" href="[HOST]/dataspace/person/[USER]/foaf.json" />\n' ||
+ ' <link rel="http://xmlns.com/foaf/0.1/primaryTopic" title="About" href="[HOST]/dataspace/person/[USER]#this" />\n' ||
+ ' <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />\n' ||
+ ' <meta name="dc.language" content="en" scheme="rfc1766" />\n' ||
+ ' <meta name="dc.creator" content="[USER]" />\n' ||
+ ' <meta name="dc.description" content="ODS HTML [USER]''s page" />\n' ||
+ ' <meta name="dc.title" content="ODS HTML [USER]''s page" />\n' ||
+ ' <link rev="describedby" title="About" href="[HOST]/dataspace/person/[USER]#this" />\n' ||
+ ' <link rel="schema.geo" href="http://www.w3.org/2003/01/geo/wgs84_pos#" />\n' ||
+ ' <meta http-equiv="X-XRDS-Location" content="[HOST]/dataspace/[USER]/yadis.xrds" />\n' ||
+ ' <meta http-equiv="X-YADIS-Location" content="[HOST]/dataspace/[USER]/yadis.xrds" />\n' ||
+ ' <link rel="meta" type="application/xml+apml" title="APML 0.6" href="[HOST]/dataspace/[USER]/apml.xml" />\n' ||
+ ' <link rel="alternate" type="application/atom+xml" title="OpenSocial Friends" href="[HOST]/feeds/people/[USER]/friends" />';
+ vUserLinks := replace (vUserLinks, '[HOST]', vHost);
+ vUserLinks := replace (vUserLinks, '[USER]', vUserName);
+ }
?>
+<html>
+ <head>
+ <title>ODS user's pages</title>
+<?vsp http (vHostLinks); ?><?vsp http (vUserLinks); ?>
+ <link rel="stylesheet" type="text/css" href="/ods/users/css/users.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/default.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/nav_framework.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/typeahead.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/ods-bar.css" />
+ <link rel="stylesheet" type="text/css" href="/ods/rdfm.css" />
+ <script type="text/javascript" src="/ods/users/js/users.js"></script>
+ <script type="text/javascript" src="/ods/common.js"></script>
+ <script type="text/javascript" src="/ods/typeahead.js"></script>
+ <script type="text/javascript" src="/ods/tbl.js"></script>
+ <script type="text/javascript" src="/ods/validate.js"></script>
+ <script type="text/javascript">
+ // OAT
+ var toolkitPath="/ods/oat";
+ var featureList = ["ajax", "json", "tab", "combolist", "calendar", "rdfmini", "grid", "graphsvg", "tagcloud", "map", "timeline", "anchor"];
+ </script>
+ <script type="text/javascript" src="/ods/oat/loader.js"></script>
+ </head>
<body onunload="myCheckLeave (document.forms['page_form'])">
<form name="page_form" id="page_form" method="post" enctype="multipart/form-data">
<input type="hidden" name="mode" id="mode" value="vsp" />
@@ -1256,7 +1289,7 @@
<div>
<table class="form" cellspacing="5">
<tr>
- <th width="30%">
+ <th width="20%">
</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,11 +1406,18 @@
<div id="pf_page_0_1" class="tabContent" style="display:none;">
<table class="form" cellspacing="5">
<tr>
- <th>
+ <th>Account deactivation</th>
+ <td>
+ <input type="button" value="Deactivate" onclick="return userDisable('pf_loginName');" />
+ </td>
+ </tr>
+ <tr>
+ <th width="30%">
<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>
@@ -1389,7 +1429,7 @@
</td>
</tr>
<tr>
- <th width="30%">
+ <th>
<label for="pf_title">Title</label>
</th>
<td>
@@ -2824,7 +2864,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="Download">
+ <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Retrieve">
<img style="display: none;" src="/ods/images/oat/Ajax_throbber.gif" alt="Import knows URIs" id="k_import_image">
</td>
</tr>
@@ -2851,7 +2891,7 @@
<tbody>
<tr id="k_tr_no">
<td colspan="3">
- <b>No downloaded items</b>
+ <b>No retrieved items</b>
</td>
</tr>
</tbody>
@@ -3788,7 +3828,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-2011 OpenLink Software
+ Copyright © 1999-2012 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.xsl b/appsrc/ODS-Framework/users/users.xsl
index 40f7364..b66b2a9 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.6 2010/12/20 12:27:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -200,11 +200,11 @@
<tr>
<th><xsl:value-of select="$label"/></th>
<td>
- <image>
+ <img border="0" width="64" class="resize">
<xsl:attribute name="src">
<xsl:value-of select="$value"/>
</xsl:attribute>
- </image>
+ </img>
</td>
</tr>
</xsl:template>
diff --git a/appsrc/ODS-Framework/users_select.js b/appsrc/ODS-Framework/users_select.js
index f7e1f7b..d466e87 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.4 2010/10/13 12:16:49 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Framework/users_select.vspx b/appsrc/ODS-Framework/users_select.vspx
index 8004e63..5098c28 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.8 2011/05/02 14:16:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/vad_version b/appsrc/ODS-Framework/vad_version
index af01f23..9380e91 100644
--- a/appsrc/ODS-Framework/vad_version
+++ b/appsrc/ODS-Framework/vad_version
@@ -1 +1 @@
-1.83.49
+1.87.26
diff --git a/appsrc/ODS-Framework/validate.js b/appsrc/ODS-Framework/validate.js
index a886d6a..0432ca0 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-2010 OpenLink Software
+ * 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
@@ -29,89 +29,107 @@ function validateError(fld, msg)
function validateInt(fld)
{
- var regex = /^[0-9]+$/
- if (!regex.test(fld.value))
- return validateError(fld, 'Invalid integer value: ' + fld.value);
+ var v = fld.value.trim();
+ var regex = /^[0-9]+$/;
+ if (!regex.test(v))
+ return validateError(fld, 'Invalid integer value: ' + v);
return true;
}
function validateFloat(fld)
{
- var regex = /^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/
- if (!regex.test(fld.value))
- return validateError(fld, 'Invalid float value: ' + fld.value);
+ var v = fld.value.trim();
+ var regex = /^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/;
+ if (!regex.test(v))
+ return validateError(fld, 'Invalid float value: ' + v);
return true;
}
function validateDate(fld)
{
- var regex = /^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$/
- if (!regex.test(fld.value))
- return validateError(fld, 'Invalid date value: ' + fld.value);
+ var v = fld.value.trim();
+ var regex = /^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$/;
+ if (!regex.test(v))
+ return validateError(fld, 'Invalid date value: ' + v);
return true;
}
function validateDateTime(fld)
{
- var regex = /^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])( ([01]?[0-9]|[2][0-3])(:[0-5][0-9])?)?$/
- if (!regex.test(fld.value))
- return validateError(fld, 'Invalid date value: ' + fld.value);
+ var v = fld.value.trim();
+ var regex = /^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])( ([01]?[0-9]|[2][0-3])(:[0-5][0-9])?)?$/;
+ if (!regex.test(v))
+ return validateError(fld, 'Invalid date value: ' + v);
return true;
}
function validateMail(fld)
{
- if ((fld.value.length == 0) || (fld.value.length > 40))
+ var v = fld.value.trim();
+ if ((v.length == 0) || (v.length > 40))
return validateError(fld, 'E-mail address cannot be empty or longer then 40 chars');
var regex = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
- if (!regex.test(fld.value))
- return validateError(fld, 'Invalid E-mail address');
+ if (!regex.test(v))
+ return validateError(fld, 'Invalid E-mail address: ' + v);
return true;
}
function validateURL(fld)
{
- var regex = /^(ftp|http|https):(\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
- if (!regex.test(fld.value))
- return validateError(fld, 'Invalid URL address : ' + fld.value);
+ var v = fld.value.trim();
+ var regex = /^(ftp|http|https):(\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
+ if (!regex.test(v))
+ return validateError(fld, 'Invalid URL address: ' + v);
return true;
}
function validateURI(fld)
{
- var regex = /^([a-z0-9+.-]+):(\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
+ var v = fld.value.trim();
+ var regex = /^([a-z0-9+.-]+):(\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
var mail = /^acct:([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
- if (!regex.test(fld.value) && !mail.test(fld.value))
- return validateError(fld, 'Invalid URI address : ' + fld.value);
+ if (!regex.test(v) && !mail.test(v))
+ return validateError(fld, 'Invalid URI address: ' + v);
return true;
}
function validateWebID(fld)
{
- if (fld.value == 'foaf:Agent')
+ var v = fld.value.trim();
+ if (v == 'foaf:Agent')
return true;
var regex = /(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
- if (regex.test(fld.value))
+ if (regex.test(v))
return true;
var regex = /^acct:([a-zA-Z0-9_\.\-\+])+\@(([a-zA-Z0-9\-:])+)+\.?([a-zA-Z0-9]{0,4})+$/;
- if (regex.test(fld.value))
+ if (regex.test(v))
return true;
var regex = /^acct:([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
- if (regex.test(fld.value))
+ if (regex.test(v))
return true;
- return validateError(fld, 'Invalid URI address');
+ return validateError(fld, 'Invalid URI address: ' + v);
+}
+
+function validateDigest(fld)
+{
+ var v = fld.value.trim();
+ var regex = /^di:[^ <>]+$/;
+ if (regex.test(v))
+ return true;
+
+ return validateError(fld, 'Invalid di: scheme value: ' + v);
}
function validateField(fld)
@@ -134,6 +152,8 @@ function validateField(fld)
return validateURI(fld);
if (OAT.Dom.isClass(fld, '_webid_'))
return validateWebID(fld);
+ if (OAT.Dom.isClass(fld, '_digest_'))
+ return validateDigest(fld);
if (fld.value.length == 0)
return validateError(fld, 'Field cannot be empty');
return true;
diff --git a/appsrc/ODS-Framework/version.base b/appsrc/ODS-Framework/version.base
deleted file mode 100644
index 7facc89..0000000
--- a/appsrc/ODS-Framework/version.base
+++ /dev/null
@@ -1 +0,0 @@
-36
diff --git a/appsrc/ODS-Framework/version.curr b/appsrc/ODS-Framework/version.curr
deleted file mode 100644
index c24db41..0000000
--- a/appsrc/ODS-Framework/version.curr
+++ /dev/null
@@ -1 +0,0 @@
-8349
diff --git a/appsrc/ODS-Framework/vhost.vspx b/appsrc/ODS-Framework/vhost.vspx
index 0b91419..fdd1b68 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.1 2010/09/20 10:15:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/vhost_simple.vspx b/appsrc/ODS-Framework/vhost_simple.vspx
index 3ff94dc..7dd4004 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.1 2010/09/20 10:15:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/view.vspx b/appsrc/ODS-Framework/view.vspx
index 994683d..62b6d8a 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.1 2010/09/20 10:15:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/view_file.vspx b/appsrc/ODS-Framework/view_file.vspx
index fcf4f6b..5a29c55 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.1 2010/09/20 10:15:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/wa_login.vspx b/appsrc/ODS-Framework/wa_login.vspx
index e328fb2..d1d750f 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.2 2011/03/23 12:18:30 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/wa_maps.sql b/appsrc/ODS-Framework/wa_maps.sql
index d4295da..427d77f 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.3 2010/12/10 16:04:14 source Exp $
+-- $Id$
--
-- Procedures to support the WA maps handling.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/wa_maps.vspx b/appsrc/ODS-Framework/wa_maps.vspx
index 5df9ce8..660c3da 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.1 2010/09/20 10:15:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/wa_search_procs.sql b/appsrc/ODS-Framework/wa_search_procs.sql
index 3fbf2f3..b89dbda 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.1 2010/09/20 10:15:32 source Exp $
+-- $Id$
--
-- Procedures to support the WA search.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -1110,30 +1110,26 @@ create function WA_SEARCH_APP (in max_rows integer, in current_user_id integer,
--exec('
wa_exec_no_error('
create function WA_SEARCH_OMAIL_GET_EXCERPT_HTML (
- in current_user_id integer,
+ in uname varchar,
in words any,
in _MSG_ID integer,
- in _DOMAIN_ID integer,
in _TDATA any,
in _SUBJECT varchar,
in _FOLDER_ID integer) returns varchar
{
declare res varchar;
- declare _U_NAME varchar;
declare _NAME varchar;
- select U_NAME into _U_NAME from DB.DBA.SYS_USERS where U_ID = current_user_id;
- select NAME into _NAME from OMAIL.WA.FOLDERS where FOLDER_ID = _FOLDER_ID;
+ select MF_NAME into _NAME from DB.DBA.MAIL_FOLDER where MF_OWN = uname and MF_ID = _FOLDER_ID;
res := sprintf (
''<span><img src="%s"/> %s / %s : %s<br />%s</span>'',
DB.DBA.WA_SEARCH_ADD_APATH (''images/icons/mail_16.png''),
- _U_NAME,
+ uname,
_NAME,
_SUBJECT,
_TDATA);
- --search_excerpt (words, subseq (coalesce (_TDATA, ''''), 0, 200000)));
return res;
}
')
@@ -1168,57 +1164,55 @@ create aggregate WA_SEARCH_OMAIL_AGG (in _val varchar, in words any) returns var
from WA_SEARCH_OMAIL_AGG_init, WA_SEARCH_OMAIL_AGG_acc, WA_SEARCH_OMAIL_AGG_final;
-create function WA_SEARCH_OMAIL (in max_rows integer, in current_user_id integer,
- in str varchar, in _words_vector varchar) returns varchar
+create function WA_SEARCH_OMAIL (
+ in _max integer,
+ in _user_id integer,
+ in _str varchar,
+ in _words_vector varchar) returns varchar
{
- declare ret varchar;
+ declare ret, _uname varchar;
- if (str is null)
+ _uname := (select U_NAME from DB.DBA.SYS_USERS where U_ID = _user_id);
+ if (_str is null)
{
ret := sprintf (
'select top %d \n' ||
- ' DB.DBA.WA_SEARCH_OMAIL_GET_EXCERPT_HTML (q.USER_ID, %s, \n' ||
- ' q.MSG_ID, q.DOMAIN_ID, _TDATA, M.SUBJECT, M.FOLDER_ID) AS EXCERPT, \n' ||
+ ' DB.DBA.WA_SEARCH_OMAIL_GET_EXCERPT_HTML (M.MM_OWN, %s, M.MM_ID, MA._CONTENT, M.MM_SUBJ, M.MM_FLD_ID) AS EXCERPT, \n' ||
' encode_base64 (serialize (vector (''OMAIL''))) as TAG_TABLE_FK, \n' ||
' _SCORE, \n' ||
' M.RCV_DATE as _DATE \n' ||
- ' from OMAIL.WA.MESSAGES M, (\n' ||
- ' select \n' ||
- ' MP.DOMAIN_ID, \n' ||
- ' MP.USER_ID, \n' ||
- ' MP.MSG_ID, \n' ||
- ' DB.DBA.WA_SEARCH_OMAIL_AGG (TDATA, %s) as _TDATA long varchar, \n' ||
+ ' from DB.DBA.MAIL_MESSAGE M, \n' ||
+ ' (select MA_M_OWN, \n' ||
+ ' MA_M_ID, \n' ||
+ ' DB.DBA.WA_SEARCH_OMAIL_AGG (MA_CONTENT, %s) as _CONTENT long varchar, \n' ||
' 0 as _SCORE \n' ||
- ' from OMAIL.WA.MSG_PARTS MP\n' ||
- ' where \n' ||
- ' MP.USER_ID = %d\n' ||
- ' group by MP.DOMAIN_ID, MP.USER_ID, MP.MSG_ID) q \n' ||
- ' where M.MSG_ID = q.MSG_ID and M.USER_ID = q.USER_ID and M.DOMAIN_ID = q.DOMAIN_ID',
- max_rows, _words_vector, _words_vector, current_user_id);
+ ' from DB.DBA.MAIL_ATTACHMENT \n' ||
+ ' where MA_M_OWN = ''%s''\n' ||
+ ' group by MA_M_OWN, MA_M_ID) MA \n' ||
+ ' where M.MM_OWN = MA.MA_M_OWN \n' ||
+ ' and M.MM_ID = MA.MA_M_ID ',
+ _max, _words_vector, _words_vector, _uname);
}
else
{
ret := sprintf (
'select top %d \n' ||
- ' DB.DBA.WA_SEARCH_OMAIL_GET_EXCERPT_HTML (q.USER_ID, %s, \n' ||
- ' q.MSG_ID, q.DOMAIN_ID, _TDATA, M.SUBJECT, M.FOLDER_ID) AS EXCERPT, \n' ||
+ ' DB.DBA.WA_SEARCH_OMAIL_GET_EXCERPT_HTML (M.MM_OWN, %s, M.MM_ID, MA._CONTENT, M.MM_SUBJ, M.MM_FLD_ID) AS EXCERPT, \n' ||
' encode_base64 (serialize (vector (''OMAIL''))) as TAG_TABLE_FK, \n' ||
' _SCORE, \n' ||
' M.RCV_DATE as _DATE \n' ||
- ' from OMAIL.WA.MESSAGES M, (\n' ||
- ' select \n' ||
- ' MP.DOMAIN_ID, \n' ||
- ' MP.USER_ID, \n' ||
- ' MP.MSG_ID, \n' ||
- ' DB.DBA.WA_SEARCH_OMAIL_AGG (TDATA, %s) as _TDATA long varchar, \n' ||
+ ' from DB.DBA.MAIL_MESSAGE M, \n' ||
+ ' (select MA_M_OWN, \n' ||
+ ' MA_M_ID, \n' ||
+ ' DB.DBA.WA_SEARCH_OMAIL_AGG (MA_CONTENT, %s) as _CONTENT long varchar, \n' ||
' MAX(SCORE) as _SCORE \n' ||
- ' from OMAIL.WA.MSG_PARTS MP\n' ||
- ' where \n' ||
- ' contains (MP.TDATA, ''[__lang "x-ViDoc" __enc "UTF-8"] %S'') \n' ||
- ' and MP.USER_ID = %d\n' ||
- ' group by MP.DOMAIN_ID, MP.USER_ID, MP.MSG_ID) q \n' ||
- ' where M.MSG_ID = q.MSG_ID and M.USER_ID = q.USER_ID and M.DOMAIN_ID = q.DOMAIN_ID',
- max_rows, _words_vector, _words_vector, str, current_user_id);
+ ' from DB.DBA.MAIL_ATTACHMENT \n' ||
+ ' where MA_M_OWN = ''%s''\n' ||
+ ' and contains (MA_CONTENT, ''[__lang "x-ViDoc" __enc "UTF-8"] %s'') \n' ||
+ ' group by MA_M_OWN, MA_M_ID) MA \n' ||
+ ' where M.MM_OWN = MA.MA_M_OWN \n' ||
+ ' and M.MM_ID = MA.MA_M_ID ',
+ _max, _words_vector, _words_vector, _uname, _str);
}
return ret;
@@ -2160,7 +2154,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 '/%'
+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://%'
;
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 f3764f9..baa1179 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.1 2010/09/20 10:15:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/web_header.vspx b/appsrc/ODS-Framework/web_header.vspx
index 8301205..504189c 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.2 2010/09/20 10:15:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/web_svc.sql b/appsrc/ODS-Framework/web_svc.sql
index aa8e7ab..ec09966 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.6 2010/11/19 16:50:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -453,3 +453,32 @@ insert soft "DB"."DBA"."SYS_SCHEDULED_EVENT" (SE_INTERVAL, SE_LAST_COMPLETED, SE
values (10, NULL, 'ODS NOTIFICATIONS', 'ODS.DBA.SVC_PROCESS_PINGS()', now());
use DB;
+
+create procedure WA_USER_OAUTH_UPGRADE ()
+{
+ declare params any;
+
+ if (registry_get ('__WA_USER_OAUTH_UPGRADE') = 'done')
+ return;
+
+ declare exit handler for sqlstate '*' {return; };
+
+ params := (select US_KEY from WA_USER_SVC where US_U_ID = 2 and US_SVC = 'FBKey');
+ if (length (params))
+ {
+ params := replace (params, '\r\n', '&');
+ params := replace (params, '\n', '&');
+ params := split_and_decode (params);
+ if (params is not null and length (trim (get_keyword ('key', params))) > 4 and length (trim (get_keyword ('secret', params))) > 4)
+ {
+ insert into OAUTH..APP_REG (A_OWNER, A_NAME, A_KEY, A_SECRET)
+ values (0, 'Facebook API', trim(get_keyword('key', params)), trim (get_keyword ('secret', params)));
+
+ delete from WA_USER_SVC where US_SVC = 'FBKey';
+ }
+ }
+ registry_set ('__WA_USER_OAUTH_UPGRADE', 'done');
+}
+;
+
+DB.DBA.WA_USER_OAUTH_UPGRADE ();
diff --git a/appsrc/ODS-Framework/webfinger.sql b/appsrc/ODS-Framework/webfinger.sql
index 3c09162..e8dc1fe 100644
--- a/appsrc/ODS-Framework/webfinger.sql
+++ b/appsrc/ODS-Framework/webfinger.sql
@@ -1,12 +1,12 @@
--
--- $Id: webfinger.sql,v 1.1.4.14 2011/06/02 12:34:01 source Exp $
+-- $Id$
--
-- Webfinger & fingerpoint protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2010 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Framework/webid_check.vsp b/appsrc/ODS-Framework/webid_check.vsp
index 36133b6..cc8ca3d 100644
--- a/appsrc/ODS-Framework/webid_check.vsp
+++ b/appsrc/ODS-Framework/webid_check.vsp
@@ -48,9 +48,24 @@ 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>
@@ -68,5 +83,8 @@ html:
<li>signature: SHA1 digest over returning URL</li>
</ul>
</div>
+ <div>
+ <a href="http://ods.openlinksw.com/wiki/ODS/ODSWebIDIdpProxy">Help</a>
+ </div>
</body>
</html>
diff --git a/appsrc/ODS-Framework/webid_demo.html b/appsrc/ODS-Framework/webid_demo.html
new file mode 100644
index 0000000..3ea0eb9
--- /dev/null
+++ b/appsrc/ODS-Framework/webid_demo.html
@@ -0,0 +1,142 @@
+<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>
+ <div>
+ <a href="http://ods.openlinksw.com/wiki/ODS/ODSWebIDIdP">Help</a>
+ </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
new file mode 100644
index 0000000..47efdfe
--- /dev/null
+++ b/appsrc/ODS-Framework/webid_demo.php
@@ -0,0 +1,168 @@
+<?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()));
+ $_expiration = isset ($_REQUEST['expiration']) ? $_REQUEST['expiration'] : '';
+ if ($_expiration == 'true')
+ $_url .= '&expiration=true';
+
+ 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>
+ <div>
+ <a href="http://ods.openlinksw.com/wiki/ODS/ODSWebIDIdP">Help</a>
+ </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="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
new file mode 100644
index 0000000..eda8913
--- /dev/null
+++ b/appsrc/ODS-Framework/webid_demo.vsp
@@ -0,0 +1,128 @@
+<?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.ODS_API.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);
+ if (get_keyword ('expiration', params, '') = 'true')
+ url := url || '&expiration=true';
+
+ 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>
+ <div>
+ <a href="http://ods.openlinksw.com/wiki/ODS/ODSWebIDIdP">Help</a>
+ </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="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 fd7e700..2f1cb96 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.8 2011/05/20 12:02:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Framework/webid_verify.vsp b/appsrc/ODS-Framework/webid_verify.vsp
index 45064f0..f9b79d9 100644
--- a/appsrc/ODS-Framework/webid_verify.vsp
+++ b/appsrc/ODS-Framework/webid_verify.vsp
@@ -1,51 +1,81 @@
<?vsp
- declare info, res, cb, mod, exp, webid, ret_url, cert, ctype any;
+ declare info, res, cb, mod, exp, webid, ret_url, cert, ctype, err, dummy, expiry_verify, vtype, md5, sha1, subj, json_out any;
cb := {?'callback'};
cert := {?'certificate'};
- if ((length (cb) = 0) or ((length (cert) = 0) and not is_http_ctx ()))
+ err := '';
+
+ json_out := {?'json'};
+
+ declare acc any;
+ acc := http_request_header (lines, 'Accept', null, '');
+
+ if (json_out = 'yes' or 'application/json' = acc)
+ json_out := 1;
+ else
+ json_out := 0;
+
+ dummy := null;
+ if (not xenc_key_exists ('id_rsa'))
{
+ err := 'Must configure CA on this host.';
goto html;
}
+
+ if (not length(cb))
+ {
+ if (json_out)
+ {
+ http_status_set (400);
+ return;
+ }
+ else goto html;
+ }
+
+ if ((length (cert) = 0) and not is_http_ctx ())
+ goto html;
+
ctype := 1;
if (not length (cert))
{
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 := '';
- if (not is_http_ctx ())
+ md5 := ''; sha1 := ''; subj := '';
+ if (not is_http_ctx () or cert = 0)
res := 'noCert';
else
{
info := get_certificate_info (9, cert, ctype);
if (info is null)
res := 'noCert';
- 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 if (WEBID_AUTH_GEN_2 (cert, ctype, null, 1, 0, webid, dummy, expiry_verify, vtype))
+ 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')
@@ -56,21 +86,74 @@
{
ret_url := sprintf ('%serror=%U', cb, res);
}
- ret_url := ret_url || sprintf ('&ts=%U', date_iso8601 (now ()));
+
+ ret_url := ret_url || sprintf ('&ts=%U&md5=%U&sha1=%U&subj=%U', date_iso8601 (now ()), md5, sha1, subj);
ret_url := ret_url || sprintf ('&signature=%U', xenc_dsig_sign (ret_url, 'id_rsa', xenc_get_key_algo ('id_rsa')));
+
+ if (not json_out)
+ {
http_status_set (302);
http_header (sprintf ('Location: %s\r\n', ret_url));
return;
+ }
+ else
+ {
+ http_header ('Content-Type: application/json\r\n');
+ http (sprintf ('{"result": "%U","webid":"%U","ts":"%U","md5":"%U","sha1":"%U","subj":"%U","url":"%s", "signature":"%U"}',
+ res, coalesce(webid,''), date_iso8601 (now ()),
+ md5, sha1, subj, ret_url, xenc_dsig_sign (ret_url, 'id_rsa', xenc_get_key_algo ('id_rsa'))));
+ return;
+ }
+
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>
+ </div>
<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/>Also note this service supports ldap, http, mailto, acct scheme based WebIDs.
+ <a href="http://ods.openlinksw.com/wiki/ODS/ODSWebIDIdP">Help</a>
</div>
<br/>
<br/>
@@ -84,6 +167,13 @@ This will send a redirection to the URL you have specified in the input, includi
</form>
</div>
<div>
+ Input parameters:
+ <ul>
+ <li>callback: return callback URL (mandatory)</li>
+ <li>certificate: X.509 certificate (optional)</li>
+ </ul>
+ </div>
+ <div>
The return values are:
<ul>
<li>webid: the webid have been verified</li>
diff --git a/appsrc/ODS-Gallery/Makefile.am b/appsrc/ODS-Gallery/Makefile.am
index 36d2ecb..64311b0 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-2006 OpenLink Software
+# 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
@@ -47,6 +47,7 @@ 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 10a3d10..7d0202e 100644
--- a/appsrc/ODS-Gallery/Makefile.in
+++ b/appsrc/ODS-Gallery/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -310,6 +290,7 @@ EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
sql/procedures/*.sql \
+ vad_version \
www-root/*.vsp \
www-root/*.vspx \
www-root/css/*.css \
@@ -327,14 +308,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Gallery/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Gallery/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Gallery/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Gallery/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -352,7 +333,6 @@ $(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
@@ -362,23 +342,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -402,17 +379,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -444,7 +417,6 @@ clean-generic:
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"
@@ -463,8 +435,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -473,28 +443,18 @@ 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
@@ -535,7 +495,6 @@ ods_gallery_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Gallery/make_vad.sh b/appsrc/ODS-Gallery/make_vad.sh
index e7a86a4..81989fb 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.10 2011/05/17 22:58:51 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -29,7 +29,7 @@ LC_ALL=POSIX
export LANG LC_ALL
LOGDIR=`pwd`
-VERSION="0.3.59"
+VERSION="1.0.0"
LOGFILE="${LOGDIR}/make_vad.log"
STICKER="make_vad.xml"
PACKDATE=`date +"%Y-%m-%d %H:%M"`
@@ -58,21 +58,6 @@ 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
@@ -85,14 +70,55 @@ else
myrm=$RM
fi
-VERSION_INIT()
+
+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/"`; do
- cat $i | grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> 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
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=78 } { cnt = cnt + $1} END { printf "1.%02.02f", cnt/100 + 1}'`
+ 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() {
@@ -225,7 +251,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-2011 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
@@ -400,7 +426,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
-VERSION_INIT
+version_init
directory_init
virtuoso_init
sticker_init
@@ -408,7 +434,6 @@ vad_create
virtuoso_shutdown
STOP_SERVER
chmod 644 ods_gallery_dav.vad
-directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -418,5 +443,7 @@ 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 653e9dc..851dbb7 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.1 2010/09/20 10:15:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/create_triggers.sql b/appsrc/ODS-Gallery/sql/create_triggers.sql
index a8baa67..e9abb29 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.2 2010/09/20 10:15:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/photo-wa-install.sql b/appsrc/ODS-Gallery/sql/photo-wa-install.sql
index 54abba6..85b0781 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.3 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql b/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql
index 0cb4ecc..905d2fe 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.2 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/comments.sql b/appsrc/ODS-Gallery/sql/procedures/comments.sql
index 3953fe6..f5fa503 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.1 2010/09/20 10:15:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/common.sql b/appsrc/ODS-Gallery/sql/procedures/common.sql
index 3753377..3f19d8f 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.1 2010/09/20 10:15:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/dav_api.sql b/appsrc/ODS-Gallery/sql/procedures/dav_api.sql
index c9c1353..3269c49 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.3 2011/05/20 12:02:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql b/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql
index b425a86..1c8479e 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.1 2010/09/20 10:15:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/images.sql b/appsrc/ODS-Gallery/sql/procedures/images.sql
index d817496..a57de4c 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.1 2010/09/20 10:15:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/nntp.sql b/appsrc/ODS-Gallery/sql/procedures/nntp.sql
index cf341b3..926e7da 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.1 2010/09/20 10:15:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/photo_api.sql b/appsrc/ODS-Gallery/sql/procedures/photo_api.sql
index 73f992f..a1950f7 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.4 2011/05/17 22:58:51 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/procedures.sql b/appsrc/ODS-Gallery/sql/procedures/procedures.sql
index c92acc7..f11955e 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.1 2010/09/20 10:15:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/rss.sql b/appsrc/ODS-Gallery/sql/procedures/rss.sql
index df9dd69..9aa40c9 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.4 2011/05/20 12:02:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/sioc.sql b/appsrc/ODS-Gallery/sql/procedures/sioc.sql
index 2a1eef6..e4fbe7a 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.6 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/types.sql b/appsrc/ODS-Gallery/sql/procedures/types.sql
index 98ba241..f1ae652 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.2 2010/09/20 10:15:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/vad_version b/appsrc/ODS-Gallery/vad_version
new file mode 100644
index 0000000..0604715
--- /dev/null
+++ b/appsrc/ODS-Gallery/vad_version
@@ -0,0 +1 @@
+1.10.65
diff --git a/appsrc/ODS-Gallery/www-root/css/gallery.css b/appsrc/ODS-Gallery/www-root/css/gallery.css
index 93ba432..93861c5 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.1 2010/09/20 10:15:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Gallery/www-root/css/timeline.css b/appsrc/ODS-Gallery/www-root/css/timeline.css
index c105a20..b5cd4c1 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.1 2010/09/20 10:15:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2007 OpenLink Software
+ * Copyright (C) 2005-2012 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 f9c099e..bc16d21 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.1 2010/09/20 10:15:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Gallery/www-root/image.vsp b/appsrc/ODS-Gallery/www-root/image.vsp
index bae7120..e30ff63 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.1 2010/09/20 10:15:38 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/www-root/index.vspx b/appsrc/ODS-Gallery/www-root/index.vspx
index 21ac1d3..5c64c1c 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.1 2010/09/20 10:15:38 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/www-root/js/calendar.js b/appsrc/ODS-Gallery/www-root/js/calendar.js
index 7d991fa..8799f3f 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.3 2010/09/20 10:15:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Gallery/www-root/js/dataset.js b/appsrc/ODS-Gallery/www-root/js/dataset.js
index a41e1e3..56ec95e 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.1 2010/09/20 10:15:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Gallery/www-root/js/gallery.js b/appsrc/ODS-Gallery/www-root/js/gallery.js
index e053c4f..7c6e627 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.3 2010/09/20 10:15:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Gallery/www-root/js/map.js b/appsrc/ODS-Gallery/www-root/js/map.js
index 133cc23..668a881 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.2 2010/09/20 10:15:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Gallery/www-root/js/slideshow.js b/appsrc/ODS-Gallery/www-root/js/slideshow.js
new file mode 100644
index 0000000..dac9037
--- /dev/null
+++ b/appsrc/ODS-Gallery/www-root/js/slideshow.js
@@ -0,0 +1,124 @@
+/***********************************************
+* Fade-in image slideshow script- © Dynamic Drive DHTML code library (www.dynamicdrive.com)
+* This notice MUST stay intact for legal use
+* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code
+***********************************************/
+
+var slideshow_width='720' //SET IMAGE WIDTH
+var slideshow_height='540px' //SET IMAGE HEIGHT
+var pause=3000 //SET PAUSE BETWEEN SLIDE (3000=3 seconds)
+
+var fadeimages=new Array()
+//SET 1) IMAGE PATHS, 2) optional link, 3), optional link target:
+//fadeimages[0]=["photo1.jpg", "", ""] //plain image syntax
+//fadeimages[1]=["photo2.jpg", "http://www.google.com", ""] //image with link syntax
+//fadeimages[2]=["photo3.jpg", "http://www.javascriptkit.com", "_new"] //image with link and target syntax
+
+////NO need to edit beyond here/////////////
+
+var preloadedimages=new Array()
+
+
+var ie4=document.all
+var dom=document.getElementById
+
+//if (ie4||dom)
+//document.write('
+// <div style="position:relative;width:'+slideshow_width+';height:'+slideshow_height+';overflow:hidden">
+// <div id="canvas0" style="position:absolute;width:'+slideshow_width+';height:'+slideshow_height+';top:0;left:0;filter:alpha(opacity=10);-moz-opacity:10"></div>
+// <div id="canvas1" style="position:absolute;width:'+slideshow_width+';height:'+slideshow_height+';top:0;left:0;filter:alpha(opacity=10);-moz-opacity:10;visibility: hidden"></div>
+// </div>')
+//else
+//document.write('<img name="defaultslide" src="'+fadeimages[0][0]+'">')
+
+var curpos=10
+var degree=10
+var curcanvas="canvas0"
+var curimageindex=0
+var nextimageindex=1
+
+
+//------------------------------------------------------------------------------
+function fadepic(){
+ if (curpos<100){
+ curpos+=10
+ if (tempobj.filters){
+ tempobj.filters.alpha.opacity=curpos
+ }else if (tempobj.style.MozOpacity){
+ tempobj.style.MozOpacity=curpos/101
+ }
+ }
+ else{
+ clearInterval(dropslide)
+ nextcanvas=(curcanvas=="canvas0")? "canvas0" : "canvas1"
+ tempobj=ie4? eval("document.all."+nextcanvas) : document.getElementById(nextcanvas)
+
+ tempobj.innerHTML=insertimage(nextimageindex)
+ nextimageindex=(nextimageindex<fadeimages.length-1)? nextimageindex+1 : 0
+
+ var tempobj2=ie4? eval("document.all."+nextcanvas) : document.getElementById(nextcanvas)
+ tempobj2.style.visibility="hidden"
+ timeOutId = setTimeout("rotateimage()",pause)
+ }
+}
+
+
+//------------------------------------------------------------------------------
+function insertimage(i){
+
+ var tempcontainer=fadeimages[i][1]!=""? '<a href="'+fadeimages[i][1]+'" target="'+fadeimages[i][2]+'">' : ""
+ tempcontainer+='<img src="'+fadeimages[i][0]+'" border="0">'
+ tempcontainer+='<br>'+fadeimages[i][3] + ':' + nextimageindex + ':' + i;
+ tempcontainer=fadeimages[i][1]!=""? tempcontainer+'</a>' : tempcontainer
+ return tempcontainer
+}
+
+//------------------------------------------------------------------------------
+function rotateimage(){
+
+ if (ie4||dom){
+ resetit(curcanvas)
+ var crossobj=tempobj=ie4? eval("document.all."+curcanvas) : document.getElementById(curcanvas)
+ crossobj.style.zIndex++
+ tempobj.style.visibility="visible"
+ var temp='setInterval("fadepic()",50)'
+ dropslide=eval(temp)
+ curcanvas=(curcanvas=="canvas0")? "canvas1" : "canvas0"
+ }
+ else{
+ document.images.defaultslide.src=fadeimages[curimageindex][0]
+ }
+ urimageindex=(curimageindex<fadeimages.length-1)? curimageindex+1 : 0
+}
+
+//------------------------------------------------------------------------------
+function resetit(what){
+ curpos=10
+ var crossobj=ie4? eval("document.all."+what) : document.getElementById(what)
+ if (crossobj.filters)
+ crossobj.filters.alpha.opacity=curpos
+ else if (crossobj.style.MozOpacity)
+ crossobj.style.MozOpacity=curpos/101
+}
+
+//------------------------------------------------------------------------------
+function startit(){
+ var crossobj=ie4? eval("document.all."+curcanvas) : document.getElementById(curcanvas)
+ crossobj.innerHTML= insertimage(curimageindex)
+ rotateimage()
+}
+
+//------------------------------------------------------------------------------
+function slideshow(){
+ curpos=10;
+ degree=10;
+ curcanvas="canvas0";
+ curimageindex=0;
+ nextimageindex=1;
+//alert(fadeimages);
+ if (ie4||dom){
+ startit();
+ }else{
+ setInterval("rotateimage()",pause)
+ }
+}
diff --git a/appsrc/ODS-Gallery/www-root/js/ui.js b/appsrc/ODS-Gallery/www-root/js/ui.js
index 62d3897..0409510 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.1 2010/09/20 10:15:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Gallery/www-root/portal/index.vsp b/appsrc/ODS-Gallery/www-root/portal/index.vsp
index fea776d..4dbfad0 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.3 2011/05/20 12:02:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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>%s</wa_home_title>',wa_home_title),_xml);
+ http (sprintf ('<wa_home_title>%V</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 e9d5c4d..9b4103d 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.1 2010/09/20 10:15:38 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Gallery/www-root/upload.vspx b/appsrc/ODS-Gallery/www-root/upload.vspx
index bc28029..d0a0318 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.2 2010/09/20 10:15:38 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/index.xsl b/appsrc/ODS-Gallery/xslt/index.xsl
index 5372471..0131608 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.3 2010/09/20 10:15:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/rss11.xsl b/appsrc/ODS-Gallery/xslt/rss11.xsl
index 001b1cb..f0b732c 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-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2atom.xsl b/appsrc/ODS-Gallery/xslt/rss2atom.xsl
index bb2537d..5b80353 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.2 2010/09/20 10:15:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2atom03.xsl b/appsrc/ODS-Gallery/xslt/rss2atom03.xsl
index 831f2e6..bd79434 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.2 2010/09/20 10:15:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2mrss.xsl b/appsrc/ODS-Gallery/xslt/rss2mrss.xsl
index b47f42b..191db5e 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.1 2010/09/20 10:15:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2rdf.xsl b/appsrc/ODS-Gallery/xslt/rss2rdf.xsl
index 217b089..f6b2bb7 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.1 2010/09/20 10:15:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2wml.xsl b/appsrc/ODS-Gallery/xslt/rss2wml.xsl
index 865d718..28ae8fb 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-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2xbel.xsl b/appsrc/ODS-Gallery/xslt/rss2xbel.xsl
index 854bfd2..4fc1d71 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.1 2010/09/20 10:15:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/upload.xsl b/appsrc/ODS-Gallery/xslt/upload.xsl
index 6c7b72a..099a170 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.1 2010/09/20 10:15:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Gallery/xslt/wsdl2js.xsl b/appsrc/ODS-Gallery/xslt/wsdl2js.xsl
index 6cada8a..db7f882 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.1 2010/09/20 10:15:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/Makefile.am b/appsrc/ODS-Polls/Makefile.am
index 7c68d2e..6266ee0 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-2007 OpenLink Software
+# 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
@@ -46,6 +46,7 @@ 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 76ce073..af8180a 100644
--- a/appsrc/ODS-Polls/Makefile.in
+++ b/appsrc/ODS-Polls/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2007 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -309,6 +289,7 @@ CLEANFILES = \
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
+ vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
@@ -327,14 +308,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Polls/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Polls/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Polls/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Polls/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -352,7 +333,6 @@ $(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
@@ -362,23 +342,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -402,17 +379,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -444,7 +417,6 @@ clean-generic:
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"
@@ -463,8 +435,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -473,28 +443,18 @@ 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
@@ -535,7 +495,6 @@ ods_polls_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Polls/make_vad.sh b/appsrc/ODS-Polls/make_vad.sh
index a860ea7..364062e 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-2007 OpenLink Software
+# 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
@@ -28,7 +28,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.1.37"
+VERSION="1.0.0"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -62,22 +62,6 @@ 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
@@ -89,6 +73,57 @@ 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
@@ -224,7 +259,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-2011 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
@@ -236,8 +271,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.82.42\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.86.16\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2012-04-18 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -365,6 +400,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
+version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -381,7 +417,6 @@ 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"
@@ -391,5 +426,7 @@ 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 47efcd3..8fd24b1 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.5 2011/06/09 17:43:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Polls/sql/polls-a-code.sql b/appsrc/ODS-Polls/sql/polls-a-code.sql
index df768f3..e02b91c 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.16 2011/05/17 23:00:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -2158,9 +2158,10 @@ create procedure POLLS.WA.dt_iso8601 (
create procedure POLLS.WA.test_clear (
in S any)
{
- declare N integer;
+ S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
+ S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
- return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
+ return S;
}
;
@@ -2305,7 +2306,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 41fb4a8..20e527b 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.2 2010/09/22 13:57:04 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Polls/sql/polls-a-wa.sql b/appsrc/ODS-Polls/sql/polls-a-wa.sql
index da1713e..771f103 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.4 2010/09/22 13:57:04 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Polls/sql/polls-d.sql b/appsrc/ODS-Polls/sql/polls-d.sql
index 216c2dc..0b913a7 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.4 2011/05/18 21:18:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Polls/sql/sioc_polls.sql b/appsrc/ODS-Polls/sql/sioc_polls.sql
index d3584d8..47bfeaf 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.10 2011/05/20 16:24:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -58,16 +58,20 @@ 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 c_iri, creator_iri varchar;
+ declare acl_graph_iri, 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
@@ -75,9 +79,9 @@ create procedure fill_ods_polls_sioc (in graph_iri varchar, in site_iri varchar,
where ((_wai_name is null) or (WAI_NAME = _wai_name))
and WAI_TYPE_NAME = 'Polls') do
{
- 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);
+ 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);
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
new file mode 100644
index 0000000..81fb4f9
--- /dev/null
+++ b/appsrc/ODS-Polls/vad_version
@@ -0,0 +1 @@
+1.5.24
diff --git a/appsrc/ODS-Polls/www/ajax.vsp b/appsrc/ODS-Polls/www/ajax.vsp
index 5a53ec9..ee807ff 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.1 2010/09/20 10:15:40 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Polls/www/conversation.vspx b/appsrc/ODS-Polls/www/conversation.vspx
index 5352898..fe3e01d 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.3 2011/05/02 14:16:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/www/css/style.css b/appsrc/ODS-Polls/www/css/style.css
index d75a0f8..4d17bab 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.9 2011/05/17 23:00:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -27,11 +27,23 @@ 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;
}
@@ -70,43 +82,6 @@ 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%;
@@ -116,6 +91,7 @@ a:hover {
.left_container {
background-color: #EFEFEF;
border: 1px solid #7f94a5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
padding: 5px;
@@ -323,6 +299,7 @@ input.button {
border-color: #7f94a5;
background: #99b3c5;
cursor: pointer;
+ border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
@@ -588,6 +565,8 @@ div.tab {
border: 1px solid #000;
border-bottom-width: 0px;
border-color: #7f94a5;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-left-radius: 3px;
@@ -795,6 +774,7 @@ td.calendar_selected {
span.button {
background: none repeat scroll 0 0 #99B3C5;
border: 1px solid #7F94A5;
+ border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #FFFFFF;
diff --git a/appsrc/ODS-Polls/www/error.vspx b/appsrc/ODS-Polls/www/error.vspx
index bac2697..9e31c02 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.1 2010/09/20 10:15:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/www/export.vspx b/appsrc/ODS-Polls/www/export.vspx
index 9e6ff99..b5a14f9 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.4 2010/10/07 13:22:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/www/gems.vsp b/appsrc/ODS-Polls/www/gems.vsp
index 40f55f2..182028f 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.3 2010/10/07 13:22:06 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Addressbook/www/image/c.gif b/appsrc/ODS-Polls/www/image/c.gif
similarity index 100%
copy from appsrc/ODS-Addressbook/www/image/c.gif
copy to appsrc/ODS-Polls/www/image/c.gif
diff --git a/appsrc/ODS-Polls/www/image/close_16.png b/appsrc/ODS-Polls/www/image/close_16.png
deleted file mode 100644
index 2610797..0000000
Binary files a/appsrc/ODS-Polls/www/image/close_16.png and /dev/null differ
diff --git a/appsrc/ODS-Polls/www/image/first_16.gif b/appsrc/ODS-Polls/www/image/first_16.gif
deleted file mode 100644
index d870e80..0000000
Binary files a/appsrc/ODS-Polls/www/image/first_16.gif and /dev/null differ
diff --git a/appsrc/ODS-Polls/www/image/last_16.gif b/appsrc/ODS-Polls/www/image/last_16.gif
deleted file mode 100644
index afcc7e8..0000000
Binary files a/appsrc/ODS-Polls/www/image/last_16.gif and /dev/null differ
diff --git a/appsrc/ODS-Polls/www/image/next_16.gif b/appsrc/ODS-Polls/www/image/next_16.gif
deleted file mode 100644
index f7e1621..0000000
Binary files a/appsrc/ODS-Polls/www/image/next_16.gif and /dev/null differ
diff --git a/appsrc/ODS-Polls/www/image/previous_16.gif b/appsrc/ODS-Polls/www/image/previous_16.gif
deleted file mode 100644
index b907b15..0000000
Binary files a/appsrc/ODS-Polls/www/image/previous_16.gif and /dev/null differ
diff --git a/appsrc/ODS-Polls/www/image/virt_power_no_border.png b/appsrc/ODS-Polls/www/image/virt_power_no_border.png
deleted file mode 100644
index 93fcb80..0000000
Binary files a/appsrc/ODS-Polls/www/image/virt_power_no_border.png and /dev/null differ
diff --git a/appsrc/ODS-Polls/www/js/polls.js b/appsrc/ODS-Polls/www/js/polls.js
index 787dcec..3bbee00 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-2006 OpenLink Software
+ * 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
@@ -754,14 +754,10 @@ POLLS.trim = function(sString, sChar) {
POLLS.aboutDialog = function() {
var aboutDiv = $('aboutDiv');
- if (aboutDiv) {
+ if (aboutDiv)
OAT.Dom.unlink(aboutDiv);
- }
- aboutDiv = OAT.Dom.create('div', {
- width:'430px',
- height: '170px',
- overflow: 'hidden'
- });
+
+ aboutDiv = OAT.Dom.create('div', {height: '160px', 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 a33dd04..4d19e01 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.8 2011/07/04 10:04:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1057,44 +1057,33 @@
<table class="form-body" cellspacing="0">
<tr>
<td style="width: 90%; background-color: white;">
- <table id="s_tbl" width="100%" cellspacing="0">
- <thead class="sortHeader">
+ <table id="s_tbl" class="ODS_grid">
+ <thead>
<tr>
<th width="15%">Type</th>
<th>Value</th>
<th width="1%" nowrap="nowrap">ACL: (R)ead, (W)rite</th>
- <th width="50px">Action</th>
+ <th class="action">Action</th>
</tr>
</thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no"><td colspan="4"><b>No Shares</b></td></tr>
<![CDATA[
<script type="text/javascript">
<?vsp
- declare N, L integer;
- declare acl, aType, aAccess any;
+ declare acl any;
- L := 0;
+ -- inherited
acl := (select WAI_ACL from DB.DBA.WA_INSTANCE where WAI_ID = self.domain_id);
acl := case when isnull (acl) then vector () else deserialize (acl) end;
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
+ DB.DBA.wa_aci_lines (acl);
+
acl := deserialize (self.v_acl);
- for (N := 0; N < length (acl); N := N + 1)
- {
- L := L + 1;
- if (self.v_mode <> 'view')
- {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", value: "%s", readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', acl[N][2], acl[N][1], case when acl[N][2] = 'public' then 'true' else 'false' end, case when acl[N][2] = 'public' then 'display: none;' else '' end, acl[N][3], acl[N][4], acl[N][5]));
- } else {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {mode: 50, value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}});});', acl[N][2], acl[N][1], acl[N][3], acl[N][4], acl[N][5]));
- }
- }
+ DB.DBA.wa_aci_lines (acl, self.v_mode);
?>
</script>
]]>
- <tr id="s_tr_no" style="display: <?V case when L=0 then '' else 'none' end ?>;"><td colspan="<?V case when self.v_mode='view' then 3 else 4 end ?>"><b>No Shares</b></td></tr>
+ </tbody>
</table>
</td>
<vm:if test="self.v_mode <> 'view'">
@@ -1162,7 +1151,7 @@
POLLS.WA.set_keyword ('$text', qParams, self.v_name);
self.qSet (qParams);
}
- self.v_acl := serialize (DB.DBA.wa_acl_params (params));
+ self.v_acl := serialize (DB.DBA.wa_aci_params (params));
self.v_step := '2';
self.vc_data_bind(e);
]]>
diff --git a/appsrc/ODS-Polls/www/polls_login.vspx b/appsrc/ODS-Polls/www/polls_login.vspx
index 12d6215..4889c41 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.3 2010/10/07 13:22:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/www/search.vspx b/appsrc/ODS-Polls/www/search.vspx
index 0b0a397..42af3d0 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.8 2011/05/02 14:16:31 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/www/settings.vspx b/appsrc/ODS-Polls/www/settings.vspx
index b93450f..b32a901 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.5 2010/10/13 12:15:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -215,7 +215,7 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Clear" xhtml_class="form-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: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 c5d2a6b..3e86f48 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.2 2010/09/20 10:15:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/www/template/popup.vspx b/appsrc/ODS-Polls/www/template/popup.vspx
index 05ff91d..4fb412c 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.8 2011/07/04 10:04:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/www/template/template.vspx b/appsrc/ODS-Polls/www/template/template.vspx
index de710e7..9e15759 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.12 2011/07/04 10:04:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -68,7 +68,6 @@
/* 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 1056d90..150ac12 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.7 2011/05/02 14:16:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -227,7 +227,7 @@
<div id="FT" style="display: <?V case when get_keyword ('interface', C, '') = 'js' then 'none' else '' end ?>">
<div id="FT_L">
<a href="http://www.openlinksw.com/virtuoso">
- <img alt="Powered by OpenLink Virtuoso Universal Server" src="image/virt_power_no_border.png" border="0" />
+ <img alt="Powered by OpenLink Virtuoso Universal Server" src="/ods/images/virt_power_no_border.png" border="0" />
</a>
</div>
<div id="FT_R">
diff --git a/appsrc/ODS-Polls/xslt/rss2atom.xsl b/appsrc/ODS-Polls/xslt/rss2atom.xsl
index d23445d..2390919 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.2 2010/09/20 10:15:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/xslt/rss2atom03.xsl b/appsrc/ODS-Polls/xslt/rss2atom03.xsl
index 8dfd327..bd79434 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.1 2010/09/20 10:15:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/xslt/rss2rdf.xsl b/appsrc/ODS-Polls/xslt/rss2rdf.xsl
index 1620653..a171837 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.1 2010/09/20 10:15:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Polls/xslt/rss2xbel.xsl b/appsrc/ODS-Polls/xslt/rss2xbel.xsl
index 408ccf1..b78984a 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.1 2010/09/20 10:15:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/Makefile.am b/appsrc/ODS-WebMail/Makefile.am
index 607b6d4..40a5649 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-2006 OpenLink Software
+# 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
@@ -49,6 +49,7 @@ 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 771ffc8..0b8088f 100644
--- a/appsrc/ODS-WebMail/Makefile.in
+++ b/appsrc/ODS-WebMail/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -312,6 +292,7 @@ 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 \
@@ -334,14 +315,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-WebMail/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-WebMail/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-WebMail/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-WebMail/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -359,7 +340,6 @@ $(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
@@ -369,23 +349,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -409,17 +386,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -451,7 +424,6 @@ clean-generic:
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"
@@ -470,8 +442,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -480,28 +450,18 @@ 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
@@ -542,7 +502,6 @@ ods_webmail_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-WebMail/install/odbc_mail.ini b/appsrc/ODS-WebMail/install/odbc_mail.ini
index 1231fbd..9ff46e2 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
;
-; (C)Copyright 2002 OpenLink Software.
+; Copyright (C) 1998-2012 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 7f30865..391032e 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.29 2011/08/01 14:13:35 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -63,11 +63,6 @@ else
LN="ln -fs"
RM="rm -f"
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
if [ "z$SERVER" = "z" ]
then
@@ -90,6 +85,56 @@ 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
@@ -225,7 +270,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-2011 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
@@ -385,6 +430,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
+version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -401,7 +447,6 @@ 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"
@@ -411,5 +456,7 @@ 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 b0c5d1c..26f08f7 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.2 2010/09/20 10:15:41 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql b/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql
index a86217d..4afc071 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.27 2011/08/01 14:13:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql b/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql
index e9ea418..b4d4ef8 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.6 2011/01/25 14:12:06 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql b/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql
index 8bcd3a2..ca73156 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.1 2010/09/20 10:15:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/omail-api.sql b/appsrc/ODS-WebMail/sql/omail-api.sql
index 12885b7..105e448 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.2 2010/09/20 10:15:41 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2008 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/omail-wa-install.sql b/appsrc/ODS-WebMail/sql/omail-wa-install.sql
index a838be2..3183a34 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.4 2011/01/25 14:12:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql b/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql
index c1ea912..829cca1 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.5 2011/05/18 21:18:30 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e5db713..1eb9ef8 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.3 2011/03/08 13:25:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/res/res-create-code.sql b/appsrc/ODS-WebMail/sql/res/res-create-code.sql
index 77eb772..7feea37 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.1 2010/09/20 10:15:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/res/res-create-tables.sql b/appsrc/ODS-WebMail/sql/res/res-create-tables.sql
index d11393e..1087252 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.1 2010/09/20 10:15:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/sioc_mail.sql b/appsrc/ODS-WebMail/sql/sioc_mail.sql
index aff79cf..56843f6 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.4 2011/05/18 21:18:30 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql b/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql
index 0ae703c..b29d76f 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.4 2010/09/20 10:15:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/sql/wa_search_mail.sql b/appsrc/ODS-WebMail/sql/wa_search_mail.sql
index 982217e..bc985a3 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.1 2010/09/20 10:15:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/vad_version b/appsrc/ODS-WebMail/vad_version
new file mode 100644
index 0000000..295fd07
--- /dev/null
+++ b/appsrc/ODS-WebMail/vad_version
@@ -0,0 +1 @@
+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 44e59a9..f6ce414 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.1 2010/09/20 10:15:43 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
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 e582e43..c70b96c 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.5 2010/09/20 10:15:43 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
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 bad649b..68aefa8 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.14 2011/08/01 14:13:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
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 fab74bf..db321c4 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.3 2010/09/20 10:15:43 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/p/p.vsp b/appsrc/ODS-WebMail/www-root/mail/p/p.vsp
index 93889ab..bf1f5fb 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.1 2010/09/20 10:15:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/p/tags.xml b/appsrc/ODS-WebMail/www-root/mail/p/tags.xml
index e6c1ad0..72e2c1e 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.1 2010/09/20 10:15:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl b/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl
index ef13f96..aa466cc 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.1 2010/09/20 10:15:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/www-root/portal.vsp b/appsrc/ODS-WebMail/www-root/portal.vsp
index 9a538af..5cd6bbe 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.3 2011/07/04 10:03:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/www-root/res/export.vsp b/appsrc/ODS-WebMail/www-root/res/export.vsp
index f28bfd2..1c14b03 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.1 2010/09/20 10:15:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/www-root/res/flush.vsp b/appsrc/ODS-WebMail/www-root/res/flush.vsp
index 5073770..ca6ce45 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.1 2010/09/20 10:15:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/www-root/res/image.vsp b/appsrc/ODS-WebMail/www-root/res/image.vsp
index f68e30a..31d8dc7 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.1 2010/09/20 10:15:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-WebMail/xslt/addr.xsl b/appsrc/ODS-WebMail/xslt/addr.xsl
index b412fb9..bb5ca1b 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.2 2010/09/20 10:15:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/attach.xsl b/appsrc/ODS-WebMail/xslt/attach.xsl
index eae0295..80dbef6 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.4 2011/05/17 23:01:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/base.xsl b/appsrc/ODS-WebMail/xslt/base.xsl
index 3513e92..151a59d 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.5 2011/05/02 14:15:25 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/box.xsl b/appsrc/ODS-WebMail/xslt/box.xsl
index bb544d5..d7e7b6c 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.8 2011/02/14 13:03:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/ch_pop3.xsl b/appsrc/ODS-WebMail/xslt/ch_pop3.xsl
index 433a732..28f2052 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.6 2011/01/25 14:12:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/common.xsl b/appsrc/ODS-WebMail/xslt/common.xsl
index 18594f3..4d0ceb6 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.14 2011/08/01 14:13:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/common_folders.xsl b/appsrc/ODS-WebMail/xslt/common_folders.xsl
index c173996..9453caf 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.6 2011/01/25 14:12:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/construct_body.xsl b/appsrc/ODS-WebMail/xslt/construct_body.xsl
index 581694b..edbdeef 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.2 2010/11/09 20:12:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/construct_mail.xsl b/appsrc/ODS-WebMail/xslt/construct_mail.xsl
index 2cd0957..20f9770 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.2 2010/11/09 20:12:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl b/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl
index 06ce1f1..26845a5 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.1 2010/09/20 10:15:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/construct_recip.xsl b/appsrc/ODS-WebMail/xslt/construct_recip.xsl
index 1ca1e61..727c12b 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.1 2010/09/20 10:15:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/date_time.xsl b/appsrc/ODS-WebMail/xslt/date_time.xsl
index 60f5448..33e8cba 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.1 2010/09/20 10:15:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/err.xsl b/appsrc/ODS-WebMail/xslt/err.xsl
index 6fb8b16..f714052 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.1 2010/09/20 10:15:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/errors.xml b/appsrc/ODS-WebMail/xslt/errors.xml
index e7b419b..4092228 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.3 2011/07/04 10:03:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl b/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl
index f70655f..2390919 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.2 2010/09/20 10:15:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl b/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl
index 9c19759..bd79434 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.1 2010/09/20 10:15:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl b/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl
index 1120bf7..5276e3b 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.1 2010/09/20 10:15:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl b/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl
index b3ae4c6..4fc1d71 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.1 2010/09/20 10:15:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/filters.xsl b/appsrc/ODS-WebMail/xslt/filters.xsl
index e4e1c0b..9626623 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.5 2010/09/20 10:15:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/folders.xsl b/appsrc/ODS-WebMail/xslt/folders.xsl
index 01dd3b4..ba13698 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.5 2010/09/20 10:15:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/handlers.xsl b/appsrc/ODS-WebMail/xslt/handlers.xsl
index 0c8bf0e..b3482f1 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.2 2011/05/02 14:15:25 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/html_parse.xsl b/appsrc/ODS-WebMail/xslt/html_parse.xsl
index 55811a7..75d846a 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.2 2011/03/08 13:25:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/html_parse2.xsl b/appsrc/ODS-WebMail/xslt/html_parse2.xsl
index 11a03f6..2666252 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.2 2011/03/08 13:25:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/mails.xsl b/appsrc/ODS-WebMail/xslt/mails.xsl
index d658edf..0441d20 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.2 2011/08/01 14:13:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/open.xsl b/appsrc/ODS-WebMail/xslt/open.xsl
index edab24d..bd34dc4 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.6 2011/01/25 14:12:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/search.xsl b/appsrc/ODS-WebMail/xslt/search.xsl
index 6cc2018..9fbf511 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.7 2010/09/20 10:15:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/sendok.xsl b/appsrc/ODS-WebMail/xslt/sendok.xsl
index fcd36dd..5cd62a5 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.1 2010/09/20 10:15:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/set_mail.xsl b/appsrc/ODS-WebMail/xslt/set_mail.xsl
index 90a8830..d83ba53 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.6 2011/08/01 14:13:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/tools.xsl b/appsrc/ODS-WebMail/xslt/tools.xsl
index 8b888ba..58fe61b 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.3 2010/09/20 10:15:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-WebMail/xslt/write.xsl b/appsrc/ODS-WebMail/xslt/write.xsl
index c065fac..f0cf512 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.7 2011/08/01 14:13:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/Makefile.am b/appsrc/ODS-Wiki/Makefile.am
index a491046..b962fd6 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-2006 OpenLink Software
+# 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
@@ -55,6 +55,7 @@ clean-local:
#
# ----------------------------------------------------------------------
EXTRA_DIST = \
+ *.dox \
*.sql \
generate_drop_proc.sh \
http/*.css \
@@ -77,6 +78,4 @@ 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 1407247..57fe636 100644
--- a/appsrc/ODS-Wiki/Makefile.in
+++ b/appsrc/ODS-Wiki/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -85,58 +82,16 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -224,7 +179,6 @@ 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@
@@ -308,7 +262,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -329,7 +282,6 @@ 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@
@@ -357,6 +309,7 @@ CLEANFILES = \
#
# ----------------------------------------------------------------------
EXTRA_DIST = \
+ *.dox \
*.sql \
generate_drop_proc.sh \
http/*.css \
@@ -379,8 +332,6 @@ EXTRA_DIST = \
Skins/default/*.png \
Skins/default/*.xslt \
Template/*.txt \
- version.base \
- version.curr \
vad_version
all: all-recursive
@@ -390,14 +341,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Wiki/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Wiki/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Wiki/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Wiki/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -415,7 +366,6 @@ $(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
@@ -425,23 +375,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -450,7 +397,7 @@ uninstall-nodist_vadDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -467,7 +414,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -475,7 +422,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -501,16 +448,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -518,14 +465,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -537,43 +484,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -594,44 +537,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -665,7 +593,6 @@ clean-generic:
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"
@@ -684,8 +611,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -694,28 +619,18 @@ install-data-am: install-nodist_vadDATA
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -736,8 +651,8 @@ ps-am:
uninstall-am: uninstall-nodist_vadDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -760,7 +675,6 @@ ods_wiki_dav.vad: $(EXTRA_DIST)
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/appsrc/ODS-Wiki/ODS-Wiki.dox b/appsrc/ODS-Wiki/ODS-Wiki.dox
new file mode 100644
index 0000000..ebdd151
--- /dev/null
+++ b/appsrc/ODS-Wiki/ODS-Wiki.dox
@@ -0,0 +1,3 @@
+/**
+\defgroup ods_module_wiki ODS Wiki
+*/
diff --git a/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt b/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt
index 5dcc925..44ec66f 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-2006 OpenLink Software
+ - 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
@@ -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.2 2011/08/01 14:12:53 source Exp $ -->
+<!-- $Id$ -->
<xsl:output
method="html"
diff --git a/appsrc/ODS-Wiki/Skins/default/default.css b/appsrc/ODS-Wiki/Skins/default/default.css
index fb5ce7d..0852258 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.7 2011/03/26 14:21:52 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -943,6 +943,7 @@ 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 a5d5be6..cb82c28 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.7 2011/03/26 14:21:51 source Exp $
+-- $Id$
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/conv.sql b/appsrc/ODS-Wiki/conv.sql
index 068f4c1..985b7f3 100644
--- a/appsrc/ODS-Wiki/conv.sql
+++ b/appsrc/ODS-Wiki/conv.sql
@@ -1,10 +1,10 @@
--
--- $Id: conv.sql,v 1.10.2.1 2010/09/20 10:15:46 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/drop.sql b/appsrc/ODS-Wiki/drop.sql
index 8f7c0dd..a6b9199 100644
--- a/appsrc/ODS-Wiki/drop.sql
+++ b/appsrc/ODS-Wiki/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.16.2.4 2011/08/01 14:12:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/export.sql b/appsrc/ODS-Wiki/export.sql
index febd8c6..65ae135 100644
--- a/appsrc/ODS-Wiki/export.sql
+++ b/appsrc/ODS-Wiki/export.sql
@@ -1,10 +1,10 @@
--
--- $Id: export.sql,v 1.8.2.1 2010/09/20 10:15:46 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/generate_drop_proc.sh b/appsrc/ODS-Wiki/generate_drop_proc.sh
index 8110367..d2016b8 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.2 2010/09/20 10:15:46 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt b/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt
index 2912633..9e61570 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.1 2010/09/20 10:15:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt b/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt
index 804cf8e..312b361 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.1 2010/09/20 10:15:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspChangeLog.xslt b/appsrc/ODS-Wiki/http/VspChangeLog.xslt
index f31f80f..ff054a0 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.1 2010/09/20 10:15:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspMail.xslt b/appsrc/ODS-Wiki/http/VspMail.xslt
index b2a0cc2..4ffacea 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.1 2010/09/20 10:15:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspNoteCompile.xslt b/appsrc/ODS-Wiki/http/VspNoteCompile.xslt
index a3e0aaa..4106b79 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.1 2010/09/20 10:15:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspReportError.xslt b/appsrc/ODS-Wiki/http/VspReportError.xslt
index faf37ed..a4b27bf 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.1 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspSearch.xslt b/appsrc/ODS-Wiki/http/VspSearch.xslt
index f1e050a..cd54fe0 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.1 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicAttach.xslt b/appsrc/ODS-Wiki/http/VspTopicAttach.xslt
index 986ecbf..8b6eed6 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.1 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt b/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt
index 9fb4b00..d2baee5 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.1 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicCreate.xslt b/appsrc/ODS-Wiki/http/VspTopicCreate.xslt
index 272023e..8dbec29 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.2 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicDelete.xslt b/appsrc/ODS-Wiki/http/VspTopicDelete.xslt
index 7866055..f95b136 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.1 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicEdit.xslt b/appsrc/ODS-Wiki/http/VspTopicEdit.xslt
index 2c10952..91c800c 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.2 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicHistory.xslt b/appsrc/ODS-Wiki/http/VspTopicHistory.xslt
index 79ed5a8..86b462f 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.1 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt b/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt
index f75e558..abd6d37 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.1 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicRename.xslt b/appsrc/ODS-Wiki/http/VspTopicRename.xslt
index 3ed769f..58d15b1 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.1 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicReports.xslt b/appsrc/ODS-Wiki/http/VspTopicReports.xslt
index 752229e..97f33fa 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.4 2011/01/05 14:01:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicView.xslt b/appsrc/ODS-Wiki/http/VspTopicView.xslt
index 4c7d184..af055cb 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.2 2010/09/20 10:15:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt b/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt
index b6eeee7..dc06804 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.3 2011/02/03 10:26:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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-2011, OpenLink Software</copyright>
+ <copyright >Copyright (c) 1998-2012, 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 bff9695..b4c7999 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.1 2010/09/20 10:15:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/XmlRssFeed.xslt b/appsrc/ODS-Wiki/http/XmlRssFeed.xslt
index 7544d48..5eee941 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.1 2010/09/20 10:15:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/advanced_search.vspx b/appsrc/ODS-Wiki/http/advanced_search.vspx
index d93a170..9ac19b6 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-2006 OpenLink Software
+ - 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
@@ -23,7 +23,7 @@
<?vsp WV.WIKI.VSPHEADER (path,params,lines, 'Advanced Search');
?>
-<!-- $Id: advanced_search.vspx,v 1.15.2.2 2010/09/20 10:15:50 source Exp $ -->
+<!-- $Id$ -->
<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 3ffe8e8..c0452e3 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.1 2010/09/20 10:15:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/http/common.css b/appsrc/ODS-Wiki/http/common.css
index a6a3bd5..874b3d8 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.1 2010/09/20 10:15:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/http/common.xsl b/appsrc/ODS-Wiki/http/common.xsl
index d6869e9..b944bfd 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.3 2011/01/25 14:13:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/comp.xsl b/appsrc/ODS-Wiki/http/comp.xsl
index ac7792a..0ca3881 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.1 2010/09/20 10:15:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/conversation.vspx b/appsrc/ODS-Wiki/http/conversation.vspx
index 7b0c977..c406ccb 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.1 2010/09/20 10:15:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/default.css b/appsrc/ODS-Wiki/http/default.css
index e385e95..6625312 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.1 2010/09/20 10:15:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/http/export.vspx b/appsrc/ODS-Wiki/http/export.vspx
index c7e5b7b..4b11620 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.1 2010/09/20 10:15:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/export.xsl b/appsrc/ODS-Wiki/http/export.xsl
index ae6efc8..b1e2731 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.1 2010/09/20 10:15:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/fault.vspx b/appsrc/ODS-Wiki/http/fault.vspx
index a66a7dd..fc2b57d 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.1 2010/09/20 10:15:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/gems.vsp b/appsrc/ODS-Wiki/http/gems.vsp
index 40714c4..c640b79 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.1 2010/09/20 10:15:51 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/http/history.vspx b/appsrc/ODS-Wiki/http/history.vspx
index 32b9189..e60a196 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.2 2010/09/20 10:15:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/html2docbook.xsl b/appsrc/ODS-Wiki/http/html2docbook.xsl
index a16b641..2b6507f 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.1 2010/09/20 10:15:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/login.vsp b/appsrc/ODS-Wiki/http/login.vsp
index 53de825..6e0a2ff 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.1 2010/09/20 10:15:51 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/http/login.vspx b/appsrc/ODS-Wiki/http/login.vspx
index 0a7977c..da8014a 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.1 2010/09/20 10:15:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/macros.xml b/appsrc/ODS-Wiki/http/macros.xml
index 3b032c1..272d1c8 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.1 2010/09/20 10:15:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/main.vsp b/appsrc/ODS-Wiki/http/main.vsp
index 0bcf149..95f7659 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.8 2011/08/01 14:12:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -27,6 +27,7 @@
declare _sid, _realm, _user varchar;
declare cookie_vec any;
declare _parent varchar;
+ declare _filename varchar;
_parent := get_keyword ('parent', params, '');
if (_parent <> '')
@@ -315,11 +316,12 @@ cont:
return;
};
- declare _filename, _retval any;
+ declare _retval any;
+
_text := coalesce(_text, '');
- if (length (_text) > 0)
- if (_text[length (_text)-1] = ascii('\n'))
+ if ((length (_text) > 0) and (_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'));
@@ -408,7 +410,9 @@ 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')
@@ -459,17 +463,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 = (_lock_uid := WV.WIKI.GETLOCK (WS.WS.COL_PATH(_topic.ti_col_id) || _filename, _user)))
+ if (0 = 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));
@@ -488,25 +492,27 @@ 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 = (_lock_uid := WV.WIKI.GETLOCK (WS.WS.COL_PATH(_topic.ti_col_id) || _filename, _user)))
+ if (0 = 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 2e279ad..dd974f0 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.3 2011/01/25 14:13:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/owiki.css b/appsrc/ODS-Wiki/http/owiki.css
index ba7647d..773332b 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.1 2010/09/20 10:15:52 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/http/permissions.vspx b/appsrc/ODS-Wiki/http/permissions.vspx
index bbf0ad9..d91b46d 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.1 2010/09/20 10:15:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/redirect.vsp b/appsrc/ODS-Wiki/http/redirect.vsp
index ac8516a..93febeb 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.1 2010/09/20 10:15:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/http/remove_tag.vspx b/appsrc/ODS-Wiki/http/remove_tag.vspx
index f2c8eae..e17d1da 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.1 2010/09/20 10:15:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/revision_delete.vspx b/appsrc/ODS-Wiki/http/revision_delete.vspx
index 6dc649a..b6ffe7e 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.1 2010/09/20 10:15:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/revision_rollback.vspx b/appsrc/ODS-Wiki/http/revision_rollback.vspx
index 6f51a7f..4404253 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.1 2010/09/20 10:15:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/search.vsp b/appsrc/ODS-Wiki/http/search.vsp
index 36b67ed..5d5260f 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.1 2010/09/20 10:15:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/http/search.vspx b/appsrc/ODS-Wiki/http/search.vspx
index dadbc63..2f7271c 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.1 2010/09/20 10:15:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/settings.vspx b/appsrc/ODS-Wiki/http/settings.vspx
index 611d79a..2edf69d 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.3 2011/03/26 14:21:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/tag.vspx b/appsrc/ODS-Wiki/http/tag.vspx
index aef31cc..1db73a1 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.1 2010/09/20 10:15:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/tags.vspx b/appsrc/ODS-Wiki/http/tags.vspx
index a53b5d4..de32b8a 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.1 2010/09/20 10:15:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -22,7 +22,7 @@
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-->
-<!-- $Id: tags.vspx,v 1.7.2.1 2010/09/20 10:15:53 source Exp $ -->
+<!-- $Id$ -->
<v:page
name="main"
style="comp.xsl"
diff --git a/appsrc/ODS-Wiki/http/template.xsl b/appsrc/ODS-Wiki/http/template.xsl
index 42fcbc8..107859b 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.1 2010/09/20 10:15:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/toolbar.vspx b/appsrc/ODS-Wiki/http/toolbar.vspx
index 79bc1d5..b38e477 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.1 2010/09/20 10:15:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/wiki_decor.vspx b/appsrc/ODS-Wiki/http/wiki_decor.vspx
index fcf5e1f..e8e7725 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.1 2010/09/20 10:15:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/appsrc/ODS-Wiki/http/wiki_style.xsl b/appsrc/ODS-Wiki/http/wiki_style.xsl
index 64b8ef5..651b4d7 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.4 2011/02/03 10:26:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -107,7 +107,7 @@
</tr>
</table>
</table>
- <div class="copyright">Copyright © 1998-2011 OpenLink Software</div>-->
+ <div class="copyright">Copyright © 1998-2012 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 2f593a5..99112cf 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.1 2010/09/20 10:15:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/make_vad.sh b/appsrc/ODS-Wiki/make_vad.sh
index 5d37a7c..9529747 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.8 2011/08/01 14:12:53 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -68,13 +68,6 @@ 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 ]
@@ -85,8 +78,14 @@ 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 ]
@@ -98,32 +97,34 @@ version_init() {
fi
else
rm -f 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
+ 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=0 } { cnt = cnt + $1 } END { print cnt }'`
- CALC_VERSION=$VERSION
+
+ 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 - $CALC_VERSION + 1`
- echo "new base: " $BASE
+ BASE=`expr $CURR_VERSION - $VERSION + 1`
echo $BASE > version.base
VERSION=$CURR_VERSION
fi
echo $VERSION > version.curr
- VERSION="1.05.$VERSION"
- echo $VERSION > vad_version
- # rm -f version.tmp
+ VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
+ rm -f version.tmp
+ echo "$VERSION" > vad_version
fi
}
@@ -255,7 +256,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-2011 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 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
@@ -504,15 +505,14 @@ 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,5 +522,7 @@ 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 9b79c90..6b03504 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-2006 OpenLink Software
+# 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
diff --git a/appsrc/ODS-Wiki/plugin/Makefile.in b/appsrc/ODS-Wiki/plugin/Makefile.in
index a8bb96a..add24b1 100644
--- a/appsrc/ODS-Wiki/plugin/Makefile.in
+++ b/appsrc/ODS-Wiki/plugin/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,29 +68,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(hostingdir)"
+hostingLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(hosting_LTLIBRARIES)
creolewiki_la_LIBADD =
am_creolewiki_la_OBJECTS = creolewiki_la-creolewiki.lo \
@@ -120,10 +103,9 @@ wikiv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(wikiv_la_CFLAGS) $(CFLAGS) \
$(wikiv_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_ODS_VAD_TRUE at am_wikiv_la_rpath = -rpath $(hostingdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -227,7 +209,6 @@ 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@
@@ -311,7 +292,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -332,7 +312,6 @@ 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@
@@ -408,14 +387,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Wiki/plugin/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu appsrc/ODS-Wiki/plugin/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu appsrc/ODS-Wiki/plugin/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu appsrc/ODS-Wiki/plugin/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -433,28 +412,23 @@ $(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):
install-hostingLTLIBRARIES: $(hosting_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(hostingdir)" || $(MKDIR_P) "$(DESTDIR)$(hostingdir)"
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hostingdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hostingdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(hostingdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(hostingdir)"; \
- }
+ done
uninstall-hostingLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$f"; \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$p"; \
done
clean-hostingLTLIBRARIES:
@@ -493,108 +467,108 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
creolewiki_la-creolewiki.lo: creolewiki.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -MT creolewiki_la-creolewiki.lo -MD -MP -MF $(DEPDIR)/creolewiki_la-creolewiki.Tpo -c -o creolewiki_la-creolewiki.lo `test -f 'creolewiki.c' || echo '$(srcdir)/'`creolewiki.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/creolewiki_la-creolewiki.Tpo $(DEPDIR)/creolewiki_la-creolewiki.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -MT creolewiki_la-creolewiki.lo -MD -MP -MF $(DEPDIR)/creolewiki_la-creolewiki.Tpo -c -o creolewiki_la-creolewiki.lo `test -f 'creolewiki.c' || echo '$(srcdir)/'`creolewiki.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/creolewiki_la-creolewiki.Tpo $(DEPDIR)/creolewiki_la-creolewiki.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='creolewiki.c' object='creolewiki_la-creolewiki.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(creolewiki_la_CFLAGS) $(CFLAGS) -c -o creolewiki_la-creolewiki.lo `test -f 'creolewiki.c' || echo '$(srcdir)/'`creolewiki.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -c -o creolewiki_la-creolewiki.lo `test -f 'creolewiki.c' || echo '$(srcdir)/'`creolewiki.c
creolewiki_la-creole_maclex.lo: creole_maclex.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -MT creolewiki_la-creole_maclex.lo -MD -MP -MF $(DEPDIR)/creolewiki_la-creole_maclex.Tpo -c -o creolewiki_la-creole_maclex.lo `test -f 'creole_maclex.c' || echo '$(srcdir)/'`creole_maclex.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/creolewiki_la-creole_maclex.Tpo $(DEPDIR)/creolewiki_la-creole_maclex.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -MT creolewiki_la-creole_maclex.lo -MD -MP -MF $(DEPDIR)/creolewiki_la-creole_maclex.Tpo -c -o creolewiki_la-creole_maclex.lo `test -f 'creole_maclex.c' || echo '$(srcdir)/'`creole_maclex.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/creolewiki_la-creole_maclex.Tpo $(DEPDIR)/creolewiki_la-creole_maclex.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='creole_maclex.c' object='creolewiki_la-creole_maclex.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(creolewiki_la_CFLAGS) $(CFLAGS) -c -o creolewiki_la-creole_maclex.lo `test -f 'creole_maclex.c' || echo '$(srcdir)/'`creole_maclex.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -c -o creolewiki_la-creole_maclex.lo `test -f 'creole_maclex.c' || echo '$(srcdir)/'`creole_maclex.c
creolewiki_la-creole_wikilex.lo: creole_wikilex.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -MT creolewiki_la-creole_wikilex.lo -MD -MP -MF $(DEPDIR)/creolewiki_la-creole_wikilex.Tpo -c -o creolewiki_la-creole_wikilex.lo `test -f 'creole_wikilex.c' || echo '$(srcdir)/'`creole_wikilex.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/creolewiki_la-creole_wikilex.Tpo $(DEPDIR)/creolewiki_la-creole_wikilex.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -MT creolewiki_la-creole_wikilex.lo -MD -MP -MF $(DEPDIR)/creolewiki_la-creole_wikilex.Tpo -c -o creolewiki_la-creole_wikilex.lo `test -f 'creole_wikilex.c' || echo '$(srcdir)/'`creole_wikilex.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/creolewiki_la-creole_wikilex.Tpo $(DEPDIR)/creolewiki_la-creole_wikilex.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='creole_wikilex.c' object='creolewiki_la-creole_wikilex.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(creolewiki_la_CFLAGS) $(CFLAGS) -c -o creolewiki_la-creole_wikilex.lo `test -f 'creole_wikilex.c' || echo '$(srcdir)/'`creole_wikilex.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -c -o creolewiki_la-creole_wikilex.lo `test -f 'creole_wikilex.c' || echo '$(srcdir)/'`creole_wikilex.c
creolewiki_la-import_gate_virtuoso.lo: $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -MT creolewiki_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/creolewiki_la-import_gate_virtuoso.Tpo -c -o creolewiki_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/creolewiki_la-import_gate_virtuoso.Tpo $(DEPDIR)/creolewiki_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -MT creolewiki_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/creolewiki_la-import_gate_virtuoso.Tpo -c -o creolewiki_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/creolewiki_la-import_gate_virtuoso.Tpo $(DEPDIR)/creolewiki_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' object='creolewiki_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(creolewiki_la_CFLAGS) $(CFLAGS) -c -o creolewiki_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(creolewiki_la_CFLAGS) $(CFLAGS) -c -o creolewiki_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
mediawiki_la-mediawiki.lo: mediawiki.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -MT mediawiki_la-mediawiki.lo -MD -MP -MF $(DEPDIR)/mediawiki_la-mediawiki.Tpo -c -o mediawiki_la-mediawiki.lo `test -f 'mediawiki.c' || echo '$(srcdir)/'`mediawiki.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mediawiki_la-mediawiki.Tpo $(DEPDIR)/mediawiki_la-mediawiki.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -MT mediawiki_la-mediawiki.lo -MD -MP -MF $(DEPDIR)/mediawiki_la-mediawiki.Tpo -c -o mediawiki_la-mediawiki.lo `test -f 'mediawiki.c' || echo '$(srcdir)/'`mediawiki.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mediawiki_la-mediawiki.Tpo $(DEPDIR)/mediawiki_la-mediawiki.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mediawiki.c' object='mediawiki_la-mediawiki.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(mediawiki_la_CFLAGS) $(CFLAGS) -c -o mediawiki_la-mediawiki.lo `test -f 'mediawiki.c' || echo '$(srcdir)/'`mediawiki.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -c -o mediawiki_la-mediawiki.lo `test -f 'mediawiki.c' || echo '$(srcdir)/'`mediawiki.c
mediawiki_la-media_maclex.lo: media_maclex.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -MT mediawiki_la-media_maclex.lo -MD -MP -MF $(DEPDIR)/mediawiki_la-media_maclex.Tpo -c -o mediawiki_la-media_maclex.lo `test -f 'media_maclex.c' || echo '$(srcdir)/'`media_maclex.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mediawiki_la-media_maclex.Tpo $(DEPDIR)/mediawiki_la-media_maclex.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -MT mediawiki_la-media_maclex.lo -MD -MP -MF $(DEPDIR)/mediawiki_la-media_maclex.Tpo -c -o mediawiki_la-media_maclex.lo `test -f 'media_maclex.c' || echo '$(srcdir)/'`media_maclex.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mediawiki_la-media_maclex.Tpo $(DEPDIR)/mediawiki_la-media_maclex.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='media_maclex.c' object='mediawiki_la-media_maclex.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(mediawiki_la_CFLAGS) $(CFLAGS) -c -o mediawiki_la-media_maclex.lo `test -f 'media_maclex.c' || echo '$(srcdir)/'`media_maclex.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -c -o mediawiki_la-media_maclex.lo `test -f 'media_maclex.c' || echo '$(srcdir)/'`media_maclex.c
mediawiki_la-media_wikilex.lo: media_wikilex.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -MT mediawiki_la-media_wikilex.lo -MD -MP -MF $(DEPDIR)/mediawiki_la-media_wikilex.Tpo -c -o mediawiki_la-media_wikilex.lo `test -f 'media_wikilex.c' || echo '$(srcdir)/'`media_wikilex.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mediawiki_la-media_wikilex.Tpo $(DEPDIR)/mediawiki_la-media_wikilex.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -MT mediawiki_la-media_wikilex.lo -MD -MP -MF $(DEPDIR)/mediawiki_la-media_wikilex.Tpo -c -o mediawiki_la-media_wikilex.lo `test -f 'media_wikilex.c' || echo '$(srcdir)/'`media_wikilex.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mediawiki_la-media_wikilex.Tpo $(DEPDIR)/mediawiki_la-media_wikilex.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='media_wikilex.c' object='mediawiki_la-media_wikilex.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(mediawiki_la_CFLAGS) $(CFLAGS) -c -o mediawiki_la-media_wikilex.lo `test -f 'media_wikilex.c' || echo '$(srcdir)/'`media_wikilex.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -c -o mediawiki_la-media_wikilex.lo `test -f 'media_wikilex.c' || echo '$(srcdir)/'`media_wikilex.c
mediawiki_la-import_gate_virtuoso.lo: $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -MT mediawiki_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/mediawiki_la-import_gate_virtuoso.Tpo -c -o mediawiki_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mediawiki_la-import_gate_virtuoso.Tpo $(DEPDIR)/mediawiki_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -MT mediawiki_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/mediawiki_la-import_gate_virtuoso.Tpo -c -o mediawiki_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mediawiki_la-import_gate_virtuoso.Tpo $(DEPDIR)/mediawiki_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' object='mediawiki_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(mediawiki_la_CFLAGS) $(CFLAGS) -c -o mediawiki_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediawiki_la_CFLAGS) $(CFLAGS) -c -o mediawiki_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
wikiv_la-wikiv.lo: wikiv.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -MT wikiv_la-wikiv.lo -MD -MP -MF $(DEPDIR)/wikiv_la-wikiv.Tpo -c -o wikiv_la-wikiv.lo `test -f 'wikiv.c' || echo '$(srcdir)/'`wikiv.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wikiv_la-wikiv.Tpo $(DEPDIR)/wikiv_la-wikiv.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -MT wikiv_la-wikiv.lo -MD -MP -MF $(DEPDIR)/wikiv_la-wikiv.Tpo -c -o wikiv_la-wikiv.lo `test -f 'wikiv.c' || echo '$(srcdir)/'`wikiv.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wikiv_la-wikiv.Tpo $(DEPDIR)/wikiv_la-wikiv.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wikiv.c' object='wikiv_la-wikiv.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(wikiv_la_CFLAGS) $(CFLAGS) -c -o wikiv_la-wikiv.lo `test -f 'wikiv.c' || echo '$(srcdir)/'`wikiv.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -c -o wikiv_la-wikiv.lo `test -f 'wikiv.c' || echo '$(srcdir)/'`wikiv.c
wikiv_la-maclex.lo: maclex.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -MT wikiv_la-maclex.lo -MD -MP -MF $(DEPDIR)/wikiv_la-maclex.Tpo -c -o wikiv_la-maclex.lo `test -f 'maclex.c' || echo '$(srcdir)/'`maclex.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wikiv_la-maclex.Tpo $(DEPDIR)/wikiv_la-maclex.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -MT wikiv_la-maclex.lo -MD -MP -MF $(DEPDIR)/wikiv_la-maclex.Tpo -c -o wikiv_la-maclex.lo `test -f 'maclex.c' || echo '$(srcdir)/'`maclex.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wikiv_la-maclex.Tpo $(DEPDIR)/wikiv_la-maclex.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='maclex.c' object='wikiv_la-maclex.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(wikiv_la_CFLAGS) $(CFLAGS) -c -o wikiv_la-maclex.lo `test -f 'maclex.c' || echo '$(srcdir)/'`maclex.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -c -o wikiv_la-maclex.lo `test -f 'maclex.c' || echo '$(srcdir)/'`maclex.c
wikiv_la-wikilex.lo: wikilex.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -MT wikiv_la-wikilex.lo -MD -MP -MF $(DEPDIR)/wikiv_la-wikilex.Tpo -c -o wikiv_la-wikilex.lo `test -f 'wikilex.c' || echo '$(srcdir)/'`wikilex.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wikiv_la-wikilex.Tpo $(DEPDIR)/wikiv_la-wikilex.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -MT wikiv_la-wikilex.lo -MD -MP -MF $(DEPDIR)/wikiv_la-wikilex.Tpo -c -o wikiv_la-wikilex.lo `test -f 'wikilex.c' || echo '$(srcdir)/'`wikilex.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wikiv_la-wikilex.Tpo $(DEPDIR)/wikiv_la-wikilex.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wikilex.c' object='wikiv_la-wikilex.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(wikiv_la_CFLAGS) $(CFLAGS) -c -o wikiv_la-wikilex.lo `test -f 'wikilex.c' || echo '$(srcdir)/'`wikilex.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -c -o wikiv_la-wikilex.lo `test -f 'wikilex.c' || echo '$(srcdir)/'`wikilex.c
wikiv_la-import_gate_virtuoso.lo: $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -MT wikiv_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/wikiv_la-import_gate_virtuoso.Tpo -c -o wikiv_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wikiv_la-import_gate_virtuoso.Tpo $(DEPDIR)/wikiv_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -MT wikiv_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/wikiv_la-import_gate_virtuoso.Tpo -c -o wikiv_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wikiv_la-import_gate_virtuoso.Tpo $(DEPDIR)/wikiv_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' object='wikiv_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(wikiv_la_CFLAGS) $(CFLAGS) -c -o wikiv_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wikiv_la_CFLAGS) $(CFLAGS) -c -o wikiv_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
mostlyclean-libtool:
-rm -f *.lo
@@ -607,49 +581,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -670,17 +640,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -713,7 +679,6 @@ clean-generic:
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"
@@ -736,8 +701,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -746,28 +709,18 @@ install-data-am: install-hostingLTLIBRARIES
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
@@ -790,7 +743,7 @@ ps-am:
uninstall-am: uninstall-hostingLTLIBRARIES
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-hostingLTLIBRARIES clean-libtool ctags distclean \
@@ -824,7 +777,6 @@ creole_maclex.c: creole_maclex.l
creole_wikilex.c: creole_wikilex.l
@$(GEN) $(FLEX) -o creole_wikilex.c -8 -Pcreolewikiyy $(srcdir)/creole_wikilex.l
-
# 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/appsrc/ODS-Wiki/plugin/creole_maclex.c b/appsrc/ODS-Wiki/plugin/creole_maclex.c
index 0834c38..15b059a 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.1 2010/09/20 10:15:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -698,7 +698,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t 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 b03d622..21fe857 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.1 2010/09/20 10:15:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/plugin/creole_wikilex.c b/appsrc/ODS-Wiki/plugin/creole_wikilex.c
index 25772b8..0c16778 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.2 2010/09/20 10:15:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -12269,7 +12269,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( creolewikiyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -12428,6 +12428,7 @@ yy_match:
yy_find_action:
yy_current_state = *--(yy_state_ptr);
(yy_lp) = yy_accept[yy_current_state];
+goto find_rule; /* Shut up GCC warning -Wall */
find_rule: /* we branch to this label when backing up */
for ( ; ; ) /* until we find what rule we matched */
{
@@ -13107,7 +13108,7 @@ YY_RULE_SETUP
#line 953 "./creole_wikilex.l"
ECHO;
YY_BREAK
-#line 13111 "creole_wikilex.c"
+#line 13112 "creole_wikilex.c"
case YY_END_OF_BUFFER:
{
diff --git a/appsrc/ODS-Wiki/plugin/creole_wikilex.l b/appsrc/ODS-Wiki/plugin/creole_wikilex.l
index ff7fad9..de9b6c4 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.2 2010/09/20 10:15:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/plugin/creolewiki.c b/appsrc/ODS-Wiki/plugin/creolewiki.c
index d5dff6e..29cb55a 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-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/plugin/maclex.c b/appsrc/ODS-Wiki/plugin/maclex.c
index ba5abcb..9161c2d 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.1 2010/09/20 10:15:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -698,7 +698,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t 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 8128586..2553e6a 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.1 2010/09/20 10:15:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/plugin/media_maclex.c b/appsrc/ODS-Wiki/plugin/media_maclex.c
index ce79773..ae73d69 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.1 2010/09/20 10:15:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -698,7 +698,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t 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 0d1591a2..7a7701e 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.1 2010/09/20 10:15:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/plugin/media_wikilex.c b/appsrc/ODS-Wiki/plugin/media_wikilex.c
index 22d4ada..305e40e 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.2 2010/09/20 10:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -15189,7 +15189,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( mediawikiyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -15348,6 +15348,7 @@ yy_match:
yy_find_action:
yy_current_state = *--(yy_state_ptr);
(yy_lp) = yy_accept[yy_current_state];
+goto find_rule; /* Shut up GCC warning -Wall */
find_rule: /* we branch to this label when backing up */
for ( ; ; ) /* until we find what rule we matched */
{
@@ -16085,7 +16086,7 @@ YY_RULE_SETUP
#line 908 "./media_wikilex.l"
ECHO;
YY_BREAK
-#line 16089 "media_wikilex.c"
+#line 16090 "media_wikilex.c"
case YY_END_OF_BUFFER:
{
diff --git a/appsrc/ODS-Wiki/plugin/media_wikilex.l b/appsrc/ODS-Wiki/plugin/media_wikilex.l
index 6139eee..639cd79 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.2 2010/09/20 10:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/plugin/mediawiki.c b/appsrc/ODS-Wiki/plugin/mediawiki.c
index 640271d..82a91cf 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.1 2010/09/20 10:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/plugin/wikilex.c b/appsrc/ODS-Wiki/plugin/wikilex.c
index e863e1c..faf0bb4 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.2 2010/09/20 10:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -11367,7 +11367,6 @@ 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>
@@ -11931,7 +11930,7 @@ int wlex_count_header_level (char * line)
/* Wiktology */
-#line 11935 "wikilex.c"
+#line 11934 "wikilex.c"
#define INITIAL 0
#define VERBATIM 1
@@ -12036,7 +12035,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( wikiyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -12121,11 +12120,11 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 650 "./wikilex.l"
+#line 649 "./wikilex.l"
/* Verbatim */
-#line 12129 "wikilex.c"
+#line 12128 "wikilex.c"
if ( !(yy_init) )
{
@@ -12196,6 +12195,7 @@ yy_match:
yy_find_action:
yy_current_state = *--(yy_state_ptr);
(yy_lp) = yy_accept[yy_current_state];
+goto find_rule; /* Shut up GCC warning -Wall */
find_rule: /* we branch to this label when backing up */
for ( ; ; ) /* until we find what rule we matched */
{
@@ -12241,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 653 "./wikilex.l"
+#line 652 "./wikilex.l"
{ BEGIN(VERBATIM); wlex_verbatim(1); }
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 654 "./wikilex.l"
+#line 653 "./wikilex.l"
{ BEGIN(INITIAL); wlex_verbatim(0); }
YY_BREAK
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
-#line 655 "./wikilex.l"
+#line 654 "./wikilex.l"
{ BEGIN(INITIAL); wlex_verbatim(0); }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 656 "./wikilex.l"
+#line 655 "./wikilex.l"
{ PRINT ("<"); }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 657 "./wikilex.l"
+#line 656 "./wikilex.l"
{ PRINT (">"); }
YY_BREAK
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 658 "./wikilex.l"
+#line 657 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 659 "./wikilex.l"
+#line 658 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 660 "./wikilex.l"
+#line 659 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 661 "./wikilex.l"
+#line 660 "./wikilex.l"
{ PRINT ("<?"); }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 662 "./wikilex.l"
+#line 661 "./wikilex.l"
{ PRINT(wikiyytext); }
YY_BREAK
/* Wiktology */
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 665 "./wikilex.l"
+#line 664 "./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 666 "./wikilex.l"
+#line 665 "./wikilex.l"
{ PRINT ("<"); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 667 "./wikilex.l"
+#line 666 "./wikilex.l"
{ PRINT (">"); }
YY_BREAK
case 14:
/* rule 14 can match eol */
YY_RULE_SETUP
-#line 668 "./wikilex.l"
+#line 667 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 669 "./wikilex.l"
+#line 668 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 670 "./wikilex.l"
+#line 669 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 671 "./wikilex.l"
+#line 670 "./wikilex.l"
{ PRINT ("<?"); }
YY_BREAK
case 18:
/* rule 18 can match eol */
YY_RULE_SETUP
-#line 672 "./wikilex.l"
+#line 671 "./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 676 "./wikilex.l"
+#line 675 "./wikilex.l"
{ if (STATE(wlex_noautolink)) COPYTEXT; else wlex_ahref (wlex_wikiwordnorm (STATEPTR, wikiyytext), "wikiword", wikiyytext); }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 677 "./wikilex.l"
+#line 676 "./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 678 "./wikilex.l"
+#line 677 "./wikilex.l"
{ if (STATE(wlex_noautolink)) COPYTEXT; else wlex_ahref (wlex_wikiwordnorm (STATEPTR, wikiyytext), "interwiki", wikiyytext); }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 679 "./wikilex.l"
+#line 678 "./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 682 "./wikilex.l"
+#line 681 "./wikilex.l"
{ PRINT ("<html>"); BEGIN(PLAINHTML); }
YY_BREAK
case 24:
/* rule 24 can match eol */
YY_RULE_SETUP
-#line 683 "./wikilex.l"
+#line 682 "./wikilex.l"
{ ; }
YY_BREAK
/* PlainHtml */
case 25:
/* rule 25 can match eol */
YY_RULE_SETUP
-#line 688 "./wikilex.l"
+#line 687 "./wikilex.l"
{ BEGIN(PLAINHTML); }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 689 "./wikilex.l"
+#line 688 "./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 690 "./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) = TABLELINE; }
YY_BREAK
case 28:
/* rule 28 can match eol */
YY_RULE_SETUP
-#line 691 "./wikilex.l"
+#line 690 "./wikilex.l"
{ BEGIN(INITIAL); }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 692 "./wikilex.l"
+#line 691 "./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 693 "./wikilex.l"
+#line 692 "./wikilex.l"
{ BEGIN(INITIAL); }
YY_BREAK
case 31:
/* rule 31 can match eol */
YY_RULE_SETUP
-#line 694 "./wikilex.l"
+#line 693 "./wikilex.l"
{ if (STATE(wlex_nowiki)) PRINT ("<BR/>"); }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 695 "./wikilex.l"
+#line 694 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
-#line 697 "./wikilex.l"
+#line 696 "./wikilex.l"
{ STATE(wlex_noautolink) = 1; }
YY_BREAK
case 34:
/* rule 34 can match eol */
YY_RULE_SETUP
-#line 698 "./wikilex.l"
+#line 697 "./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 701 "./wikilex.l"
+#line 700 "./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 702 "./wikilex.l"
+#line 701 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) wlex_ahref (wikiyytext, "mailto", wikiyytext); else COPYTEXT; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 703 "./wikilex.l"
+#line 702 "./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 704 "./wikilex.l"
+#line 703 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, NULL, 1, "forcedwikiword"); }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 705 "./wikilex.l"
+#line 704 "./wikilex.l"
{ wlex_forced_link_with_pred (STATEPTR, wikiyytext, "::", NULL, "forcedwikiword"); }
YY_BREAK
case 40:
/* rule 40 can match eol */
YY_RULE_SETUP
-#line 706 "./wikilex.l"
+#line 705 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "mailto"); }
YY_BREAK
case 41:
/* rule 41 can match eol */
YY_RULE_SETUP
-#line 707 "./wikilex.l"
+#line 706 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "mailto"); }
YY_BREAK
case 42:
/* rule 42 can match eol */
YY_RULE_SETUP
-#line 708 "./wikilex.l"
+#line 707 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "wikiword"); }
YY_BREAK
case 43:
/* rule 43 can match eol */
YY_RULE_SETUP
-#line 709 "./wikilex.l"
+#line 708 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "wikiword"); }
YY_BREAK
case 44:
/* rule 44 can match eol */
YY_RULE_SETUP
-#line 710 "./wikilex.l"
+#line 709 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "qwikiword"); }
YY_BREAK
case 45:
/* rule 45 can match eol */
YY_RULE_SETUP
-#line 711 "./wikilex.l"
+#line 710 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "qwikiword"); }
YY_BREAK
case 46:
/* rule 46 can match eol */
YY_RULE_SETUP
-#line 712 "./wikilex.l"
+#line 711 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "interwiki"); }
YY_BREAK
case 47:
/* rule 47 can match eol */
YY_RULE_SETUP
-#line 713 "./wikilex.l"
+#line 712 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "interwiki"); }
YY_BREAK
case 48:
/* rule 48 can match eol */
YY_RULE_SETUP
-#line 714 "./wikilex.l"
+#line 713 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "absuri"); }
YY_BREAK
case 49:
/* rule 49 can match eol */
YY_RULE_SETUP
-#line 715 "./wikilex.l"
+#line 714 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "absuri"); }
YY_BREAK
case 50:
/* rule 50 can match eol */
YY_RULE_SETUP
-#line 716 "./wikilex.l"
+#line 715 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "anchorhere"); }
YY_BREAK
case 51:
/* rule 51 can match eol */
YY_RULE_SETUP
-#line 717 "./wikilex.l"
+#line 716 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "anchorhere"); }
YY_BREAK
case 52:
/* rule 52 can match eol */
YY_RULE_SETUP
-#line 718 "./wikilex.l"
+#line 717 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, NULL, 1, "forcedwikiword"); }
YY_BREAK
case 53:
/* rule 53 can match eol */
YY_RULE_SETUP
-#line 719 "./wikilex.l"
+#line 718 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 1, "forcedwikiword"); }
YY_BREAK
case 54:
/* rule 54 can match eol */
YY_RULE_SETUP
-#line 720 "./wikilex.l"
+#line 719 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "reluri"); }
YY_BREAK
case 55:
/* rule 55 can match eol */
YY_RULE_SETUP
-#line 721 "./wikilex.l"
+#line 720 "./wikilex.l"
{ wlex_forced_link_with_pred (STATEPTR, wikiyytext, "::", "|", "forcedwikiword"); }
YY_BREAK
case 56:
/* rule 56 can match eol */
YY_RULE_SETUP
-#line 722 "./wikilex.l"
+#line 721 "./wikilex.l"
{ wlex_div_with_pred (STATEPTR, wikiyytext, ":=", "|", "semanticvalue"); }
YY_BREAK
/* HTML tags */
case 57:
YY_RULE_SETUP
-#line 725 "./wikilex.l"
+#line 724 "./wikilex.l"
{ if (!STATE(wlex_xmp_depth)) STATE(wlex_format_lock) += 1; PRINT(wikiyytext); }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 726 "./wikilex.l"
+#line 725 "./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 727 "./wikilex.l"
+#line 726 "./wikilex.l"
{ STATE(wlex_xmp_depth) += 1; STATE(wlex_format_lock) += 1; PRINT(wikiyytext); }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 728 "./wikilex.l"
+#line 727 "./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 729 "./wikilex.l"
+#line 728 "./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;
@@ -12589,25 +12589,25 @@ YY_RULE_SETUP
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 734 "./wikilex.l"
+#line 733 "./wikilex.l"
{ PRINT(wikiyytext); }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 735 "./wikilex.l"
+#line 734 "./wikilex.l"
{ PRINT("<!-- nop -->"); }
YY_BREAK
/* Ends of lines and ends of paragraphs */
case 64:
/* rule 64 can match eol */
YY_RULE_SETUP
-#line 738 "./wikilex.l"
+#line 737 "./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 739 "./wikilex.l"
+#line 738 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else PRINTTEXT(".\n"); }
YY_BREAK
case 66:
@@ -12616,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 740 "./wikilex.l"
+#line 739 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else PRINTTEXT(".\n"); }
YY_BREAK
case 67:
@@ -12625,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 741 "./wikilex.l"
+#line 740 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else PRINTTEXT(".\n"); }
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 742 "./wikilex.l"
+#line 741 "./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 743 "./wikilex.l"
+#line 742 "./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 744 "./wikilex.l"
+#line 743 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock))
PRINT(wikiyytext);
else
@@ -12656,157 +12656,157 @@ YY_RULE_SETUP
/* Titles */
case 71:
YY_RULE_SETUP
-#line 755 "./wikilex.l"
+#line 754 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (wlex_count_header_level(wikiyytext)); }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 756 "./wikilex.l"
+#line 755 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (1); }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 757 "./wikilex.l"
+#line 756 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (wlex_count_header_level(wikiyytext)); }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 758 "./wikilex.l"
+#line 757 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (1); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 759 "./wikilex.l"
+#line 758 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (wlex_count_header_level(wikiyytext)); }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 760 "./wikilex.l"
+#line 759 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (1); }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 761 "./wikilex.l"
+#line 760 "./wikilex.l"
{ if (STATE(wlex_headerlevel)) PRINT("<NOTOC />"); else PRINT(wikiyytext); }
YY_BREAK
/* Lists */
case 78:
YY_RULE_SETUP
-#line 764 "./wikilex.l"
+#line 763 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list ((strchr(wikiyytext, '*') - wikiyytext) / 3, WLEX_LIST_UL, NULL); }
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 765 "./wikilex.l"
+#line 764 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list ((strdigit(wikiyytext) - wikiyytext) / 3, WLEX_LIST_OL, NULL); }
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 766 "./wikilex.l"
+#line 765 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list ((strnonws(wikiyytext) - wikiyytext) / 3, WLEX_LIST_DL, wikiyytext); }
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 767 "./wikilex.l"
+#line 766 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list (strchr(wikiyytext, '*') - wikiyytext, WLEX_LIST_UL, NULL); }
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 768 "./wikilex.l"
+#line 767 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list (strdigit(wikiyytext) - wikiyytext, WLEX_LIST_OL, NULL); }
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 769 "./wikilex.l"
+#line 768 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list (strnonws(wikiyytext) - wikiyytext, WLEX_LIST_DL, wikiyytext); }
YY_BREAK
/* Font processing */
case 84:
YY_RULE_SETUP
-#line 772 "./wikilex.l"
+#line 771 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
case 85:
/* rule 85 can match eol */
YY_RULE_SETUP
-#line 774 "./wikilex.l"
+#line 773 "./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 775 "./wikilex.l"
+#line 774 "./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 776 "./wikilex.l"
+#line 775 "./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 777 "./wikilex.l"
+#line 776 "./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 778 "./wikilex.l"
+#line 777 "./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 779 "./wikilex.l"
+#line 778 "./wikilex.l"
{ if (WLEX_FONT_I == STATE(wlex_font)) wlex_font (WLEX_FONT_DEFAULT); else COPYTEXT;}
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 781 "./wikilex.l"
+#line 780 "./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 782 "./wikilex.l"
+#line 781 "./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 783 "./wikilex.l"
+#line 782 "./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 784 "./wikilex.l"
+#line 783 "./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 785 "./wikilex.l"
+#line 784 "./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 786 "./wikilex.l"
+#line 785 "./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 788 "./wikilex.l"
+#line 787 "./wikilex.l"
{ STATE(wlex_in_any_text) = 1; }
YY_BREAK
/* Other formatting */
case 98:
YY_RULE_SETUP
-#line 791 "./wikilex.l"
+#line 790 "./wikilex.l"
{ PRINT("<HR />"); }
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 792 "./wikilex.l"
+#line 791 "./wikilex.l"
{
PRINT("<A NAME=\"");
PRINT(strchr (wikiyytext, '#')+1);
@@ -12816,13 +12816,13 @@ YY_RULE_SETUP
/* Variables and macro calls */
case 100:
YY_RULE_SETUP
-#line 799 "./wikilex.l"
+#line 798 "./wikilex.l"
{ PRINT("<?"); NPRINT(wikiyytext+1,strlen(wikiyytext)-2); PRINT("?>"); }
YY_BREAK
case 101:
/* rule 101 can match eol */
YY_RULE_SETUP
-#line 800 "./wikilex.l"
+#line 799 "./wikilex.l"
{
char *lbrace = strchr (wikiyytext, '{');
char *rbrace = strchr (wikiyytext, '}');
@@ -12833,7 +12833,7 @@ YY_RULE_SETUP
case 102:
/* rule 102 can match eol */
YY_RULE_SETUP
-#line 806 "./wikilex.l"
+#line 805 "./wikilex.l"
{
char *lbrace = strchr (wikiyytext, '{');
char *rbrace = strchr (wikiyytext, '}');
@@ -12844,31 +12844,31 @@ YY_RULE_SETUP
case 103:
/* rule 103 can match eol */
YY_RULE_SETUP
-#line 812 "./wikilex.l"
+#line 811 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
/* Tables */
case 104:
/* rule 104 can match eol */
YY_RULE_SETUP
-#line 816 "./wikilex.l"
+#line 815 "./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 817 "./wikilex.l"
+#line 816 "./wikilex.l"
{ PRINT("\n<TR><TH"); wlex_id_print (STATEPTR); PRINT (">"); }
YY_BREAK
case 106:
/* rule 106 can match eol */
YY_RULE_SETUP
-#line 818 "./wikilex.l"
+#line 817 "./wikilex.l"
{ PRINT("</TH></TR>"); BEGIN(TABLELINE); }
YY_BREAK
case 107:
/* rule 107 can match eol */
YY_RULE_SETUP
-#line 819 "./wikilex.l"
+#line 818 "./wikilex.l"
{ PRINT("</TH></TR>"); }
YY_BREAK
case 108:
@@ -12877,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 820 "./wikilex.l"
+#line 819 "./wikilex.l"
{ PRINT("</TH></TR>\n</TABLE>\n"); BEGIN(INITIAL); wlex_reset(~WLEX_RESET_LIST); }
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 821 "./wikilex.l"
+#line 820 "./wikilex.l"
{ PRINT("</TH><TH"); wlex_id_print (STATEPTR); PRINT (">"); }
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 822 "./wikilex.l"
+#line 821 "./wikilex.l"
{ PRINT("<"); }
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 823 "./wikilex.l"
+#line 822 "./wikilex.l"
{ ; }
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 824 "./wikilex.l"
+#line 823 "./wikilex.l"
{ PRINT(wikiyytext); }
YY_BREAK
case 113:
/* rule 113 can match eol */
YY_RULE_SETUP
-#line 827 "./wikilex.l"
+#line 826 "./wikilex.l"
{ wlex_reset(~WLEX_RESET_LIST); BEGIN(TABLELINE); STATE(wlex_in_any_text) = 1; PRINT("\n<TABLE class=\"wikitable\">"); }
YY_BREAK
case 114:
@@ -12911,18 +12911,18 @@ case 114:
(yy_c_buf_p) = yy_cp -= 2;
YY_DO_BEFORE_ACTION; /* set up wikiyytext again */
YY_RULE_SETUP
-#line 828 "./wikilex.l"
+#line 827 "./wikilex.l"
{ PRINT("\n<TR><TD ALIGN=\"center\">"); }
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 829 "./wikilex.l"
+#line 828 "./wikilex.l"
{ PRINT("\n<TR><TD>"); }
YY_BREAK
case 116:
/* rule 116 can match eol */
YY_RULE_SETUP
-#line 830 "./wikilex.l"
+#line 829 "./wikilex.l"
{ PRINT("</TD></TR>"); }
YY_BREAK
case 117:
@@ -12931,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 831 "./wikilex.l"
+#line 830 "./wikilex.l"
{ PRINT("</TD></TR>\n</TABLE>\n"); BEGIN(INITIAL); wlex_reset(~WLEX_RESET_LIST); }
YY_BREAK
case 118:
@@ -12939,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 832 "./wikilex.l"
+#line 831 "./wikilex.l"
{ PRINT("</TD><TD ALIGN=\"center\">"); }
YY_BREAK
case 119:
@@ -12947,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 833 "./wikilex.l"
+#line 832 "./wikilex.l"
{ PRINT("</TD><TD STYLE=\"colspanstub\">"); }
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 834 "./wikilex.l"
+#line 833 "./wikilex.l"
{ PRINT("</TD><TD>"); }
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 835 "./wikilex.l"
+#line 834 "./wikilex.l"
{ PRINT("</TD><TD>"); }
YY_BREAK
case 122:
/* rule 122 can match eol */
YY_RULE_SETUP
-#line 836 "./wikilex.l"
+#line 835 "./wikilex.l"
{ ; }
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 837 "./wikilex.l"
+#line 836 "./wikilex.l"
{ PRINT("<"); }
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 838 "./wikilex.l"
+#line 837 "./wikilex.l"
{ PRINT(wikiyytext); }
YY_BREAK
/* Inlined verbatims
@@ -12984,22 +12984,22 @@ YY_RULE_SETUP
/* Others */
case 125:
YY_RULE_SETUP
-#line 848 "./wikilex.l"
+#line 847 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 849 "./wikilex.l"
+#line 848 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 850 "./wikilex.l"
+#line 849 "./wikilex.l"
{ PRINTTEXT("<"); }
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 851 "./wikilex.l"
+#line 850 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
case YY_STATE_EOF(INITIAL):
@@ -13008,12 +13008,12 @@ case YY_STATE_EOF(PLAINHTML):
case YY_STATE_EOF(TABLELINE):
case YY_STATE_EOF(TABLEHEADER):
case YY_STATE_EOF(WIKTOLOGY):
-#line 852 "./wikilex.l"
+#line 851 "./wikilex.l"
{ wlex_reset (~0); return 0; }
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 854 "./wikilex.l"
+#line 853 "./wikilex.l"
ECHO;
YY_BREAK
#line 13020 "wikilex.c"
@@ -13989,7 +13989,7 @@ void wikiyyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 854 "./wikilex.l"
+#line 853 "./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 2a34ab9..f3ca917 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.2 2010/09/20 10:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -19,7 +19,6 @@
* 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 3a64f6e..2b89adf 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.1 2010/09/20 10:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/appsrc/ODS-Wiki/plugins.sql b/appsrc/ODS-Wiki/plugins.sql
index bf8b6e0..73cb651 100644
--- a/appsrc/ODS-Wiki/plugins.sql
+++ b/appsrc/ODS-Wiki/plugins.sql
@@ -1,12 +1,12 @@
--
--- $Id: plugins.sql,v 1.4.2.1 2010/09/20 10:15:46 source Exp $
+-- $Id$
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/postinstall.sql b/appsrc/ODS-Wiki/postinstall.sql
index f8fd51b..6494619 100644
--- a/appsrc/ODS-Wiki/postinstall.sql
+++ b/appsrc/ODS-Wiki/postinstall.sql
@@ -1,10 +1,10 @@
--
--- $Id: postinstall.sql,v 1.15.2.2 2011/05/18 21:17:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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,7 +57,8 @@ 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, '');
}
@@ -75,8 +76,24 @@ 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 d15eef1..e56d100 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.15 2011/05/20 12:02:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -1065,7 +1065,8 @@ 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 1 referencing new as N
+
+create trigger "WIKI_SYS_DAV_RES_AI" after insert on WS.WS.SYS_DAV_RES order 10 referencing new as N
{
declare _id any;
declare _cluster_name varchar;
@@ -1108,9 +1109,9 @@ create trigger "WIKI_SYS_DAV_RES_AI" after insert on WS.WS.SYS_DAV_RES order 1 r
}
-- 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')
@@ -1136,12 +1137,29 @@ create trigger "WIKI_SYS_DAV_RES_AI" after insert on WS.WS.SYS_DAV_RES order 1 r
}
;
+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 1 referencing old as O, new as N
+
+create trigger "WIKI_SYS_DAV_RES_AU" after update on WS.WS.SYS_DAV_RES order 10 referencing old as O, new as N
{
declare _id integer;
- declare _cluster_name, _local_name varchar;
+ declare _o_res_content_md5, _cluster_name, _local_name varchar;
declare _topic WV.WIKI.TOPICINFO;
declare exit handler for sqlstate '*'
{
@@ -1157,7 +1175,8 @@ create trigger "WIKI_SYS_DAV_RES_AU" after update on WS.WS.SYS_DAV_RES order 1 r
_cluster_name := (select ClusterName from WV.WIKI.CLUSTERS where ColId = N.RES_COL);
if (not isnull (_cluster_name))
{
- if (O.RES_CONTENT <> N.RES_CONTENT)
+ _o_res_content_md5 := connection_get ('DAV_RES_CONTENT_MD5');
+ if (_o_res_content_md5 <> md5 (cast (N.RES_CONTENT as varchar)))
{
_topic := WV.WIKI.TOPICINFO();
_topic.ti_cluster_name := _cluster_name;
@@ -1184,9 +1203,9 @@ create trigger "WIKI_SYS_DAV_RES_AU" after update on WS.WS.SYS_DAV_RES order 1 r
}
-- 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')
@@ -1770,97 +1789,102 @@ create procedure WV.WIKI.CREATEROLES (in _cname varchar)
}
;
-create procedure WV.WIKI.UPDATEACL (in _article varchar, in _gid integer, in _bitmask integer, in _auth_name varchar, in _auth_pwd 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)
{
- --dbg_obj_princ ('UPDATEACL: ', _article, ' ', _gid, ' ', '_bitmask', ' ');
declare _acl any;
- _acl := DB.DBA.DAV_PROP_GET(_article, ':virtacl', _auth_name, _auth_pwd);
+ declare _res integer;
+ declare _new_acl any;
+
+ _acl := DB.DBA.DAV_PROP_GET_INT (DB.DBA.DAV_SEARCH_ID (_path, _type), _type, ':virtacl', 0);
if (not isinteger (_acl))
{
- declare _res integer;
- declare _new_acl, _old_acl any;
_acl := cast (_acl as varbinary);
- _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));
+ _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);
if (1 or _acl <> _new_acl)
{
- _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 ());
+ _res := DB.DBA.DAV_PROP_SET_INT (_path, ':virtacl', _new_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 = _article)), 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)));
}
}
- else
- signal ('WIKI01', ':virtacl property retrieval failed: ' || DAV_PERROR (_acl));
}
;
-create procedure WV.WIKI.UPDATEGRANTS (in _cname varchar, in signalerror int:=0)
+create procedure WV.WIKI.UPDATEGRANTS (
+ in _cname varchar,
+ in _signal integer := 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 (signalerror)
+ if (_signal)
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, _writers, 6, _owner, _pwd);
- WV.WIKI.UPDATEACL (_path, _readers, 4, _owner, _pwd);
+ WV.WIKI.UPDATEACL (_path, 'R', _writers, 6, _owner, _pwd);
+ WV.WIKI.UPDATEACL (_path, 'R', _readers, 4, _owner, _pwd);
}
}
}
;
-create procedure WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (in _cname varchar, in _res_id integer, in _type varchar(1):='R')
+create procedure WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (
+ in _cname varchar,
+ in _id integer,
+ in _type varchar(1) := 'R',
+ in _signal integer := 1)
{
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);
- _path := DB.DBA.DAV_SEARCH_PATH (_res_id, _type);
- --dbg_obj_princ (':::' , _path);
- if (not isinteger (_path))
+ return;
+ }
+
+ _path := DB.DBA.DAV_SEARCH_PATH (_id, _type);
+ if (isinteger (_path))
{
- _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');
+ 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);
}
;
@@ -1868,14 +1892,14 @@ create procedure WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (in _cname varchar, in _res
-- 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)
@@ -1886,8 +1910,6 @@ 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;
@@ -1936,9 +1958,7 @@ 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;
@@ -1950,33 +1970,27 @@ 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) );
- --dbg_obj_print ('2');
+ WV.WIKI.APPSIGNAL (11001, 'User ID "&UId;" is invalid; can not create cluster "&ClusterName;"', vector ('UId', _owner, 'ClusterName', _cname) );
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) );
- --dbg_obj_print ('4');
+ WV.WIKI.APPSIGNAL (11001, 'Account "&UName;" is disabled; can not create cluster "&ClusterName;"', vector ('UName', _uname, 'ClusterName', _cname) );
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) );
- --dbg_obj_print ('5');
+ WV.WIKI.APPSIGNAL (11001, 'Group ID "&GId;" is invalid; can not create cluster "&ClusterName;"', vector ('GId', _group, 'ClusterName', _cname) );
_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)
@@ -1992,11 +2006,8 @@ 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;
}
@@ -2004,27 +2015,23 @@ 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:
- --dbg_obj_print ('9');
- -- _xmlcol := WV.WIKI.CREATEDAVCOLLECTION (_main, 'xml', _owner, _group);
- -- _attachcol := WV.WIKI.CREATEDAVCOLLECTION (_main, 'attach', _owner, _group);
+next:
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);
@@ -2044,21 +2051,15 @@ next:
NULL,
NULL);
WV.WIKI.GETLOCK (_full_path, '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);
+ _res := WV.WIKI.UPLOADPAGE (_col_id, _name, blob_to_string (_content) || ' ', _uname, _cluster_id, 'dav');
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
{
@@ -2070,8 +2071,6 @@ next:
}
WV.WIKI.SETCLUSTERPARAM (_cname, 'creator', _uname);
- --dbg_obj_print ('12');
-
}
;
@@ -2109,15 +2108,16 @@ 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,19 +2138,15 @@ 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 96b4afc..dbb9fd1 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.6 2011/03/26 14:21:51 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/proc_on_macro.sql b/appsrc/ODS-Wiki/proc_on_macro.sql
index 9344a03..bfcbb8c 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.5 2011/01/31 11:17:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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-2010 [[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-2012 [[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 daa7a6d..f00f768 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.12 2011/08/01 14:12:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/proc_tmp.sql b/appsrc/ODS-Wiki/proc_tmp.sql
index 6fc975c..d1f16cf 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.1 2010/09/20 10:15:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/retry.sh b/appsrc/ODS-Wiki/retry.sh
index 26c89f1..749272b 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.1 2010/09/20 10:15:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/appsrc/ODS-Wiki/schema_on.sql b/appsrc/ODS-Wiki/schema_on.sql
index 3303402..1204df6 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.2 2011/01/31 11:17:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/semantics.sql b/appsrc/ODS-Wiki/semantics.sql
index 02a33ff..4f671b0 100644
--- a/appsrc/ODS-Wiki/semantics.sql
+++ b/appsrc/ODS-Wiki/semantics.sql
@@ -1,10 +1,10 @@
--
--- $Id: semantics.sql,v 1.3.2.1 2010/09/20 10:15:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/setup.isql b/appsrc/ODS-Wiki/setup.isql
index c76a689..9e5071e 100644
--- a/appsrc/ODS-Wiki/setup.isql
+++ b/appsrc/ODS-Wiki/setup.isql
@@ -1,10 +1,10 @@
--
--- $Id: setup.isql,v 1.2.2.1 2010/09/20 10:15:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/setup_vad.sql b/appsrc/ODS-Wiki/setup_vad.sql
index a01e19d..3f5291d 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.3 2011/05/20 12:02:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/sioc.sql b/appsrc/ODS-Wiki/sioc.sql
index f53348f..75d318e 100644
--- a/appsrc/ODS-Wiki/sioc.sql
+++ b/appsrc/ODS-Wiki/sioc.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc.sql,v 1.14.2.4 2011/05/18 21:17:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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/%s/wiki/%s/atom-pub/', get_cname(), U_NAME, WAI_NAME);
+ iri := sprintf ('http://%s/dataspace/doc/%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 618f98a..d8126f3 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.8 2011/01/31 11:17:53 source Exp $
+-- $Id$
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/vad_version b/appsrc/ODS-Wiki/vad_version
index dcdf900..d03b9b9 100644
--- a/appsrc/ODS-Wiki/vad_version
+++ b/appsrc/ODS-Wiki/vad_version
@@ -1 +1 @@
-1.05.4531
+1.05.4550
diff --git a/appsrc/ODS-Wiki/version.base b/appsrc/ODS-Wiki/version.base
deleted file mode 100644
index b9e5dd7..0000000
--- a/appsrc/ODS-Wiki/version.base
+++ /dev/null
@@ -1 +0,0 @@
-540
diff --git a/appsrc/ODS-Wiki/version.curr b/appsrc/ODS-Wiki/version.curr
deleted file mode 100644
index 2850d73..0000000
--- a/appsrc/ODS-Wiki/version.curr
+++ /dev/null
@@ -1 +0,0 @@
-4531
diff --git a/appsrc/ODS-Wiki/wa_integration.sql b/appsrc/ODS-Wiki/wa_integration.sql
index 97a69b6..cdebd33 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.2 2010/09/20 10:15:48 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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/%s/wiki/%s/atom-pub/', SIOC..get_cname(), login, inst_name);
+ iri := sprintf ('http://%s/dataspace/doc/%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 7456cef..29db399 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.1 2010/09/20 10:15:48 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/appsrc/ODS-Wiki/webmail.sql b/appsrc/ODS-Wiki/webmail.sql
index 0b7fd24..32d29fb 100644
--- a/appsrc/ODS-Wiki/webmail.sql
+++ b/appsrc/ODS-Wiki/webmail.sql
@@ -1,10 +1,10 @@
--
--- $Id: webmail.sql,v 1.5.2.1 2010/09/20 10:15:48 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/autogen.sh b/autogen.sh
index 4512168..46f83df 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-2008 OpenLink Software
+# 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
diff --git a/bin/generate b/bin/generate
index 805b493..b3a74d8 100755
--- a/bin/generate
+++ b/bin/generate
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: generate,v 1.3 2008/09/17 08:35:51 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/bin/makever b/bin/makever
index 920d799..ece4326 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-2006 OpenLink Software
+# 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
@@ -93,7 +93,7 @@ then
OpenLink Version Information
Version $PRODUCT_VERSION as of $DATE.
Compiled for $UNAME_SYSTEM $UNAME_RELEASE
- Copyright (C) OpenLink Software.
+ Copyright (C) 1998-2012 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) OpenLink Software.\\n";
+ Copyright (C) 1998-2012 OpenLink Software.\\n";
EOF_VERSION
exit 0
diff --git a/binsrc/Makefile.am b/binsrc/Makefile.am
index 275c481..aa0a2eb 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-2006 OpenLink Software
+# 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
@@ -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
+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 rdb2rdf
# ----------------------------------------------------------------------
diff --git a/binsrc/Makefile.in b/binsrc/Makefile.in
index 98c4828..cac9a6f 100644
--- a/binsrc/Makefile.in
+++ b/binsrc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -81,38 +78,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -200,7 +169,6 @@ 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@
@@ -284,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -305,11 +272,10 @@ 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@
-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
+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 rdb2rdf
# ----------------------------------------------------------------------
#
@@ -324,14 +290,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -349,7 +315,6 @@ $(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
@@ -364,7 +329,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -381,7 +346,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -389,7 +354,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -415,16 +380,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -432,14 +397,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -451,43 +416,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -508,44 +469,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -575,7 +521,6 @@ clean-generic:
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"
@@ -594,8 +539,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -604,28 +547,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -646,8 +579,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -663,7 +596,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
-
# 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/VirtuosoClient.Net/ArrayOfLongPacked.cs b/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs
index d1335cb..2097b68 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ArrayOfLongPacked.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/AssemblyInfo.cs b/binsrc/VirtuosoClient.Net/AssemblyInfo.cs
index 57489bc..44a16f0 100644
--- a/binsrc/VirtuosoClient.Net/AssemblyInfo.cs
+++ b/binsrc/VirtuosoClient.Net/AssemblyInfo.cs
@@ -1,5 +1,5 @@
//
-// $Id: AssemblyInfo.cs,v 1.3 2007/05/29 12:13:12 source Exp $
+// $Id$
//
using System.Reflection;
@@ -25,7 +25,7 @@ using System.Runtime.CompilerServices;
#endif
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("OpenLink Software")]
-[assembly: AssemblyCopyright("Copyright (C) OpenLink Software 2007. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright (C) 1998-2012 OpenLink Software. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/binsrc/VirtuosoClient.Net/BlobHandle.cs b/binsrc/VirtuosoClient.Net/BlobHandle.cs
index 2328d0d..263d0ca 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: BlobHandle.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/BufferType.cs b/binsrc/VirtuosoClient.Net/BufferType.cs
index 9e49898..3b03d18 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: BufferType.cs,v 1.3.2.3 2011/10/17 09:48:25 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/CLI.cs b/binsrc/VirtuosoClient.Net/CLI.cs
index 65872e6..4fafae7 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: CLI.cs,v 1.3.2.1 2009/06/15 13:24:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ConnectionOptions.cs b/binsrc/VirtuosoClient.Net/ConnectionOptions.cs
index d2b5700..f91a659 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ConnectionOptions.cs,v 1.3.2.4 2010/12/21 12:29:58 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ConnectionPool.cs b/binsrc/VirtuosoClient.Net/ConnectionPool.cs
index 8762237..7f51427 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ConnectionPool.cs,v 1.2 2007/02/01 12:11:57 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs b/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs
index 400f4eb..5b2a2b0 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ConnectionStringParser.cs,v 1.2 2008/12/15 10:10:45 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/DTC.cs b/binsrc/VirtuosoClient.Net/DTC.cs
index 00ee69d..8bed76e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: DTC.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/DataType.cs b/binsrc/VirtuosoClient.Net/DataType.cs
index 98dc078..958cdf8 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: DataType.cs,v 1.3.2.1 2009/06/15 13:24:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs b/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs
index 8c03f5a..968e38e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: DateTimeMarshaler.cs,v 1.3.2.3 2011/10/28 21:41:48 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Diagnostics.cs b/binsrc/VirtuosoClient.Net/Diagnostics.cs
index c16c0fe..89eb732 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Diagnostics.cs,v 1.3 2007/05/21 15:45:43 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ExplicitString.cs b/binsrc/VirtuosoClient.Net/ExplicitString.cs
index 468ab10..04c8abe 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ExplicitString.cs,v 1.1.1.1.2.2 2010/02/11 16:25:01 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Future.cs b/binsrc/VirtuosoClient.Net/Future.cs
index 70222ff..a0a403e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Future.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/FutureList.cs b/binsrc/VirtuosoClient.Net/FutureList.cs
index 6fbf2ce..4eef9fa 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: FutureList.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IConvertData.cs b/binsrc/VirtuosoClient.Net/IConvertData.cs
index d92dbde..ed84f12 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IConvertData.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ICreateErrors.cs b/binsrc/VirtuosoClient.Net/ICreateErrors.cs
index edf1b46..7b3edf6 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ICreateErrors.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IInnerCommand.cs b/binsrc/VirtuosoClient.Net/IInnerCommand.cs
index 5f4a95e..b9cbb0f 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IInnerCommand.cs,v 1.2 2007/02/01 12:11:57 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IInnerConnection.cs b/binsrc/VirtuosoClient.Net/IInnerConnection.cs
index 01a02ad..c1f57fc 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IInnerConnection.cs,v 1.3.2.2 2010/12/17 17:40:44 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IMarshal.cs b/binsrc/VirtuosoClient.Net/IMarshal.cs
index f2e92cd..71f18a1 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IMarshal.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ISession.cs b/binsrc/VirtuosoClient.Net/ISession.cs
index 7ffd605..aca6135 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ISession.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IVirtuosoError.cs b/binsrc/VirtuosoClient.Net/IVirtuosoError.cs
index 881c3d5..a4261c7 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IVirtuosoError.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs b/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs
index 80f2314..7f506f0 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: InnerConnectionBase.cs,v 1.3.2.2 2010/12/17 17:40:44 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/MD5.cs b/binsrc/VirtuosoClient.Net/MD5.cs
index ae1fe8e..e5c84be 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: MD5.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Makefile.am b/binsrc/VirtuosoClient.Net/Makefile.am
index 3bbcd36..ad2c69a 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/VirtuosoClient.Net/Makefile.in b/binsrc/VirtuosoClient.Net/Makefile.in
index abe6297..1eb629d 100644
--- a/binsrc/VirtuosoClient.Net/Makefile.in
+++ b/binsrc/VirtuosoClient.Net/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -292,14 +286,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/VirtuosoClient.Net/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/VirtuosoClient.Net/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/VirtuosoClient.Net/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/VirtuosoClient.Net/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -317,7 +311,6 @@ $(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
@@ -347,17 +340,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -385,7 +374,6 @@ clean-generic:
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"
@@ -404,8 +392,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -414,28 +400,18 @@ install-data-am:
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
@@ -469,7 +445,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/VirtuosoClient.Net/Makefile.mono b/binsrc/VirtuosoClient.Net/Makefile.mono
index 89ec514..4569f2e 100644
--- a/binsrc/VirtuosoClient.Net/Makefile.mono
+++ b/binsrc/VirtuosoClient.Net/Makefile.mono
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.mono,v 1.5.2.1 2011/10/13 18:26:27 source Exp $
+# $Id$
#
ADONETVERSION=ADONET2
diff --git a/binsrc/VirtuosoClient.Net/ManagedCommand.cs b/binsrc/VirtuosoClient.Net/ManagedCommand.cs
index 545ac65..7e0e74b 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ManagedCommand.cs,v 1.3.2.5 2011/10/13 18:26:27 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ManagedConnection.cs b/binsrc/VirtuosoClient.Net/ManagedConnection.cs
index 7e7b36a..6d8c1ca 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ManagedConnection.cs,v 1.5.2.3 2010/12/17 17:40:44 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ManagedErrors.cs b/binsrc/VirtuosoClient.Net/ManagedErrors.cs
index 3238dff..378b8e4 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ManagedErrors.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Marshaler.cs b/binsrc/VirtuosoClient.Net/Marshaler.cs
index dff9bd2..eef24cd 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Marshaler.cs,v 1.5.2.6 2011/10/17 15:51:19 source Exp $
+// $Id$
//
//#define IGNORE_ENCODING
diff --git a/binsrc/VirtuosoClient.Net/MemoryHandle.cs b/binsrc/VirtuosoClient.Net/MemoryHandle.cs
index 9f71f6b..ee3fd1c 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: MemoryHandle.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/OdbcCommand.cs b/binsrc/VirtuosoClient.Net/OdbcCommand.cs
index ed620d6..6357a3e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: OdbcCommand.cs,v 1.2 2007/02/01 12:11:57 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/OdbcConnection.cs b/binsrc/VirtuosoClient.Net/OdbcConnection.cs
index a68550c..8886a16 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: OdbcConnection.cs,v 1.3.2.1 2011/10/13 18:26:27 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/OdbcErrors.cs b/binsrc/VirtuosoClient.Net/OdbcErrors.cs
index 170c5e3..78beba4 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: OdbcErrors.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ParameterData.cs b/binsrc/VirtuosoClient.Net/ParameterData.cs
index 120745c..7d3c211 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ParameterData.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Platform.cs b/binsrc/VirtuosoClient.Net/Platform.cs
index 01382f3..d1ae098 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Platform.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/RPC.cs b/binsrc/VirtuosoClient.Net/RPC.cs
index efb8a4a..70f5879 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: RPC.cs,v 1.5.2.1 2011/02/16 20:44:36 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Service.cs b/binsrc/VirtuosoClient.Net/Service.cs
index 5dd9106..b8a4051 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Service.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/SqlExtendedString.cs b/binsrc/VirtuosoClient.Net/SqlExtendedString.cs
index 0521389..16006ce 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: SqlExtendedString.cs,v 1.1 2009/02/06 15:37:37 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/SqlRdfBox.cs b/binsrc/VirtuosoClient.Net/SqlRdfBox.cs
index 3d436dc..a5feaeb 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: SqlRdfBox.cs,v 1.1 2009/02/06 15:37:37 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/SqlXml.cs b/binsrc/VirtuosoClient.Net/SqlXml.cs
index 23f1228..2e9d6fe 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: SqlXml.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/StatementList.cs b/binsrc/VirtuosoClient.Net/StatementList.cs
index b184e3f..3702ae6 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: StatementList.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
#if false
diff --git a/binsrc/VirtuosoClient.Net/TcpConnection.cs b/binsrc/VirtuosoClient.Net/TcpConnection.cs
index 727fc58..7d68a7f 100644
--- a/binsrc/VirtuosoClient.Net/TcpConnection.cs
+++ b/binsrc/VirtuosoClient.Net/TcpConnection.cs
@@ -1,10 +1,10 @@
//
-// $Id: TcpConnection.cs,v 1.2.2.4 2011/10/13 18:26:27 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2006 OpenLink Software
+// 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
@@ -21,7 +21,7 @@
//
//
//
-// $Id: TcpConnection.cs,v 1.2.2.4 2011/10/13 18:26:27 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/TcpSession.cs b/binsrc/VirtuosoClient.Net/TcpSession.cs
index c061fce..4849420 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: TcpSession.cs,v 1.2.2.1 2011/10/13 18:26:27 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Unix.cs b/binsrc/VirtuosoClient.Net/Unix.cs
index f262d77..1434c65 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Unix.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtDbType.cs b/binsrc/VirtuosoClient.Net/VirtDbType.cs
index 6c6cf04..18aae3c 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtDbType.cs,v 1.1.1.1.2.1 2009/06/15 13:24:12 source Exp $
+// $Id$
//
#if ODBC_CLIENT
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj b/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj
index b934564..e4f9a2b 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj
+++ b/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj
@@ -1,7 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{50E2DD3F-5B5E-4E62-9206-A41824905CD7}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -25,7 +26,8 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\</OutputPath>
@@ -51,13 +53,13 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>.\</OutputPath>
+ <OutputPath>..\..\win64\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>FROMIDE</DefineConstants>
+ <DefineConstants>FROMIDE;ADONET2;ADONET3</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
@@ -84,7 +86,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>bin\x64\Release\</OutputPath>
+ <OutputPath>..\..\win64\Release\</OutputPath>
<DefineConstants>FROMIDE</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -106,7 +108,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
+ <OutputPath>..\..\win64\Release\</OutputPath>
<DefineConstants>FROMIDE</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -122,6 +124,9 @@
<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>
@@ -264,6 +269,8 @@
<Compile Include="VirtuosoDataReader.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="VirtuosoDateTime.cs" />
+ <Compile Include="VirtuosoDateTimeOffset.cs" />
<Compile Include="VirtuosoError.cs">
<SubType>Code</SubType>
</Compile>
@@ -288,6 +295,7 @@
<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 d39cbab..8cfa33c 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoClientFactory.cs,v 1.2.2.1 2011/10/28 21:41:48 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs b/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs
index 497112f..69aa17c 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoCodeAccessPermission.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs b/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs
index 1e9772d..33a164e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoCommand.cs,v 1.7.2.4 2011/10/17 09:48:25 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs b/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs
index f01304d..d0ccf1e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoCommandBuilder.cs,v 1.2 2007/02/01 12:11:57 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs b/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs
index 51d083b..769ec21 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoConnection.cs,v 1.10.2.6 2011/10/14 12:54:20 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs b/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs
index 20de9b9..0a4ac95 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoConnectionStringBuilder.cs,v 1.3.2.2 2010/12/17 17:40:44 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs b/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs
index e20de4f..f9d9d0e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDataAdapter.cs,v 1.4.2.1 2010/12/07 11:31:19 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs b/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs
index f8b8df4..a318dba 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDataReader.cs,v 1.7.2.5 2011/10/13 18:26:27 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs b/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs
index d8968b8..bdbd8bb 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-2011 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDateTime.cs,v 1.1.4.3 2011/10/17 09:48:25 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs b/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs
index 593e55d..f591880 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-2011 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDateTimeOffset.cs,v 1.1.4.3 2011/10/17 09:48:25 source Exp $
+// $Id$
//
#if ADONET3
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoError.cs b/binsrc/VirtuosoClient.Net/VirtuosoError.cs
index 316b6fe..fecb7fc 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoError.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs b/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs
index 419fe07..48f42c9 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoErrorCollection.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoException.cs b/binsrc/VirtuosoClient.Net/VirtuosoException.cs
index e8dccf4..190da6e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoException.cs,v 1.2 2007/02/01 12:11:57 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs b/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs
index 677db91..f85f7a2 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoInfoMessage.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs b/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs
index 8874dd2..3dada8d 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoParameter.cs,v 1.3 2008/09/30 16:30:56 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs b/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs
index 236eb22..a7f534e 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoParameterCollection.cs,v 1.3 2008/09/30 16:30:56 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs b/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs
index 460f66a..ba592dd 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoPermission.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs b/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs
index e624ef3..6804233 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoPermissionAttribute.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs b/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs
index f906a64..343f106 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-2011 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoTimeSpan.cs,v 1.1.4.3 2011/10/17 09:48:25 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs b/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs
index f75a694..6e7a51b 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoTransaction.cs,v 1.3.2.4 2011/10/14 00:32:32 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs b/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs
index 0ba8b8d..ce2856c 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoWarning.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Win32.cs b/binsrc/VirtuosoClient.Net/Win32.cs
index c596cf3..c531ee0 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Win32.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs b/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs
index 9fbac19..d56a145 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 2007/05/29 12:13:12 source Exp $
+// $Id$
//
using System.Reflection;
@@ -25,7 +25,7 @@ using System.Runtime.CompilerServices;
#endif
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("OpenLink Software")]
-[assembly: AssemblyCopyright("Copyright (C) OpenLink Software 2007. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright (C) 1998-2012 OpenLink Software. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs
index 5b62014..fc1ce87 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoConnectionStringEditor.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
#if (!MONO)
diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs
index 01601a2..ae4fb0c 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDataAdapterDesigner.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
#if (!MONO)
diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs
index 8785d44..dc50f1e 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs
index a9d4fff..866fff3 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-2006 OpenLink Software
+// 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoGenerateDataSet.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
+// $Id$
//
using System;
diff --git a/binsrc/b3s/Makefile.am b/binsrc/b3s/Makefile.am
index eadad28..b6f03e3 100644
--- a/binsrc/b3s/Makefile.am
+++ b/binsrc/b3s/Makefile.am
@@ -1,10 +1,10 @@
#
-# $Id: Makefile.am,v 1.1.2.4 2009/07/09 13:24:35 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/b3s/Makefile.in b/binsrc/b3s/Makefile.in
index 72dbf57..4b8829e 100644
--- a/binsrc/b3s/Makefile.in
+++ b/binsrc/b3s/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -16,12 +15,12 @@
@SET_MAKE@
#
-# $Id: Makefile.am,v 1.1.2.4 2009/07/09 13:24:35 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -40,9 +39,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -80,23 +77,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -186,7 +169,6 @@ 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@
@@ -270,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -291,7 +272,6 @@ 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@
@@ -347,14 +327,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/b3s/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/b3s/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/b3s/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/b3s/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -372,7 +352,6 @@ $(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
@@ -382,23 +361,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -422,17 +398,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -464,7 +436,6 @@ clean-generic:
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"
@@ -483,8 +454,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -493,28 +462,18 @@ 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
@@ -555,7 +514,6 @@ fct_dav.vad: $(EXTRA_DIST)
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/b3s/VirtTripleLoader/.classpath b/binsrc/b3s/VirtTripleLoader/.classpath
index c35fe25..2afad2e 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.1 2009/04/17 11:07:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/VirtTripleLoader/.project b/binsrc/b3s/VirtTripleLoader/.project
index 3cdd176..58a7b81 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.1 2009/04/17 11:07:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java b/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java
index adab9cf..422452e 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.1 2009/04/17 11:07:29 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java b/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java
index c0b2426..996d024 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.3 2011/03/08 15:43:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -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-2011 OpenLink Software";
+ private static final String myCopyright = "Copyright (c) 2008-2012 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 75cb776..84758e0 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.1 2009/04/17 11:07:29 source Exp $
+-- $Id$
--
-- 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-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/b3sq.sql b/binsrc/b3s/b3sq.sql
index 562dd25..a82159d 100644
--- a/binsrc/b3s/b3sq.sql
+++ b/binsrc/b3s/b3sq.sql
@@ -1,10 +1,10 @@
--
--- $Id: b3sq.sql,v 1.1.2.3 2009/08/27 22:15:49 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 60eff72..0517ac4 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-2011 OpenLink Software</span>
+ <span class="copyright">Copyright © 2009-2012 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 862675b..6ef4136 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.5 2010/09/20 09:51:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 639b37d..3a94d99 100644
--- a/binsrc/b3s/complete.sql
+++ b/binsrc/b3s/complete.sql
@@ -1,10 +1,10 @@
--
--- $Id: complete.sql,v 1.1.2.9 2011/09/23 19:22:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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,15 +138,14 @@ 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;
@@ -154,7 +153,7 @@ cmp_find_ns (in str varchar)
;
-create procedure
+create procedure
cmp_with_ns (in str varchar)
{
declare pref_str varchar;
@@ -165,8 +164,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;
@@ -177,7 +176,7 @@ cmp_with_ns (in str varchar)
;
-create procedure
+create procedure
cmp_uri (in str varchar)
{
declare with_ns varchar;
@@ -218,7 +217,7 @@ cmp_uri (in str varchar)
}
;
-create procedure
+create procedure
urilbl_ac_ruin_label (in lbl varchar)
{
declare tmp any;
@@ -230,7 +229,7 @@ urilbl_ac_ruin_label (in lbl varchar)
}
;
-create procedure
+create procedure
urilbl_ac_init_log (in msg varchar)
{
-- dbg_printf(msg);
@@ -242,7 +241,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 e678ce2..b54f76e 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 ab15032..0c08d0d 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.5 2009/10/07 10:27:20 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 34c9649..7d7f623 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 bf318e7..b36e378 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.5 2010/05/16 18:56:48 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 416548e..2d4cf33 100644
--- a/binsrc/b3s/demo_queries.vsp
+++ b/binsrc/b3s/demo_queries.vsp
@@ -1,12 +1,11 @@
<?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>
<!--
@@ -15,13 +14,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.
-->
@@ -77,32 +76,40 @@ 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">
- <ul class="demo_qry_list">
+ <table 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>');
}
?>
- </ul>
+ </table>
</div> <!-- #demo_queries_ctr -->
</div> <!-- #MD -->
<div id="FT">
@@ -113,7 +120,7 @@ function get_and_encode_query (q_elm)
<img alt="Linked Data" src="/fct/images/LoDLogo.gif"/>
</a>
<br/>
- <span class="copyright">Copyright © 2009-2011 OpenLink Software</span>
+ <span class="copyright">Copyright © 2009-2012 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 74e5a01..20d40fa 100644
--- a/binsrc/b3s/facet.js
+++ b/binsrc/b3s/facet.js
@@ -1,10 +1,10 @@
/*
- * $Id: facet.js,v 1.1.2.13 2011/10/26 15:38:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -33,6 +33,26 @@ 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)
@@ -44,8 +64,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,{});
}
@@ -58,8 +78,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,{});
}
@@ -80,7 +100,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 ();
@@ -102,18 +122,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');
}
@@ -129,7 +149,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;
@@ -223,7 +243,7 @@ function prop_val_dt_sel_init () {
if (v in dt_s)
dt_s[v]++;
- else
+ else
dt_s[v]=1;
}
@@ -241,8 +261,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);
@@ -260,7 +280,6 @@ 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');
@@ -268,18 +287,35 @@ 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') {
- v_h = '"' + v_h + '"^^<' + $v('cond_dt') + '>';
- v_l = '"' + v_l + '"^^<' + $v('cond_dt') + '>';
+ 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');
+ }
}
- 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 = '';
}
@@ -287,24 +323,45 @@ 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.refresh = function () {
return;
@@ -312,6 +369,7 @@ 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);
@@ -321,24 +379,23 @@ 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.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"]}});
+
+ if (self.update !== false) {
+ self.cmd_i.value = 'set_loc';
+ self.cno_i.value = self.update;
+ self.update = false;
+ self.form.submit();
+ }
}
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');
+ 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.');
}
this.acq_b_h = function (e) {
@@ -349,25 +406,51 @@ Geo_ui = function (form) {
this.loc_use_h = function (e) {
OAT.Event.prevent(e);
- if (self.lat_i.value == '' ||
- self.lon_i.value == '' ||
- $(cond_dist).value == '') return;
+ 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='';
+ }
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');
+
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);
@@ -429,13 +512,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');
@@ -446,19 +529,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);
@@ -489,10 +572,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>'));
}
@@ -500,11 +583,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();
}
@@ -527,7 +610,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);
@@ -550,12 +633,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();
@@ -588,7 +671,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":
@@ -596,15 +679,27 @@ 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":
+ case "not_in":
OAT.Event.prevent(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;
}
@@ -623,43 +718,47 @@ function prop_cond_sel_init () {
var in_ui = false;
var geo_ui = false;
-function init()
+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 ()
{
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});
- tabs.add ('TAB_TXT', 'TAB_PAGE_TXT');
- tabs.add ('TAB_URI', 'TAB_PAGE_URI');
- tabs.add ('TAB_URILBL', 'TAB_PAGE_URILBL');
+ var tabs = new OAT.Tab ('TAB_CTR', {dockMode: false});
- tabs.go (0);
+ tabs.add ('TAB_TXT', 'TAB_PAGE_TXT');
+ tabs.add ('TAB_URI', 'TAB_PAGE_URI');
+ tabs.add ('TAB_URILBL', 'TAB_PAGE_URILBL');
+
+ 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'); });
}
}
@@ -677,9 +776,11 @@ function init()
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) {
@@ -694,22 +795,30 @@ function init()
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":
+ case "not_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');
@@ -720,6 +829,7 @@ function init()
}
}
+
// opts = { loader: function - function gets called when user hits tab or stops entering text
// timer_interval: timer interval in msec };
//
@@ -728,7 +838,7 @@ function init()
OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
var self = this;
-
+
this.timer = 0;
this.value = 0;
@@ -737,17 +847,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;
@@ -777,7 +887,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)
@@ -789,7 +899,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);
@@ -797,18 +907,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;
@@ -820,7 +930,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;
@@ -831,7 +941,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;
@@ -846,7 +956,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]);
@@ -856,9 +966,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]);
@@ -868,7 +978,7 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
else
self.btn.disabled = true;
}
-
+
this.show_popup = function ()
{
self.instant.show();
@@ -878,8 +988,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);
@@ -961,3 +1071,4 @@ 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 1646206..c5dbbba 100644
--- a/binsrc/b3s/facet.sql
+++ b/binsrc/b3s/facet.sql
@@ -1,10 +1,10 @@
--
--- $Id: facet.sql,v 1.1.2.27 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -23,15 +23,58 @@
-- Facet web service
-create procedure
-fct_dbg_msg (in str varchar)
+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');
- d_lvl := registry_get ('fct_dbg_lvl');
- if (isstring (d_lvl)) d_lvl := atoi (d_lvl);
+ if (lvl < d_lvl) return;
- if (d_lvl > 0) dbg_printf ('%s', str);
+ 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 ()
+{
+ 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; }
+
+ 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!');
}
;
@@ -167,8 +210,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))
@@ -179,8 +222,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;
}
}
}
@@ -220,7 +263,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))
@@ -240,8 +283,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;
}
}
}
@@ -267,15 +310,16 @@ 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 __ro2sq (o) as o
+ for select o
from rdf_quad table option (index rdf_quad)
- where s = x and p in (rdf_super_sub_list (ctx, label_iri, 3)) do
+ where s = x and p in (rdf_super_sub_list (ctx, label_iri, 3)) order by cast (b3s_lbl_order (P) as int) 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))
{
@@ -316,7 +360,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))
@@ -415,6 +459,8 @@ 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');
@@ -426,11 +472,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;
}
;
@@ -443,7 +489,7 @@ fct_inf_clause (in tree any)
if (i is not null)
return sprintf (' define input:inference "%s" ', i);
- return '';
+ return '';
}
;
@@ -452,7 +498,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;
@@ -469,7 +515,7 @@ fct_sas_clause (in tree any)
if (i is not null)
return sprintf (' define input:same-as "%s" ', i);
- return '';
+ return '';
}
;
@@ -503,11 +549,10 @@ 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.
--
@@ -521,7 +566,7 @@ fct_sparql_ser (in x any)
return '';
}
;
-
+
create procedure
fct_lang (in x any)
{
@@ -533,14 +578,16 @@ 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;
}
;
@@ -550,7 +597,7 @@ fct_xml_wrap (in tree any, in txt any)
declare view_type varchar;
view_type := fct_get_mode (tree, '//view/@type');
- declare ntxt, texp any;
+ declare ntxt any; -- , texp any;
ntxt := string_output ();
declare n_cols int;
@@ -559,8 +606,6 @@ fct_xml_wrap (in tree any, in txt any)
fct_dbg_msg (sprintf ('fct_xml_wrap: view_type: %s', view_type));
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')
@@ -568,14 +613,14 @@ fct_xml_wrap (in tree any, in txt any)
http (sprintf ('select xmlelement ("result", xmlattributes (''%s'' as "type"),
xmlagg (xmlelement ("row",
xmlelement ("column",
- xmlattributes (''trank'' as "datatype"),
+ xmlattributes (''trank'' as "trank"),
"sc"),
xmlelement ("column",
- xmlattributes (''erank'' as "datatype"),
+ xmlattributes (''erank'' as "erank"),
"rank"),
--- xmlelement ("column",
--- xmlattributes (''g'' as "datatype"),
--- __ro2sq ("g")),
+ xmlelement ("column",
+ xmlattributes (''g'' as "graph"),
+ __ro2sq ("g")),
xmlelement ("column",
xmlattributes (fct_lang ("c1") as "xml:lang",
fct_dtp ("c1") as "datatype",
@@ -589,10 +634,10 @@ 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")
+-- texp := cast (xpath_eval ('string (//query/text)', tree, 1) as varchar);
+ 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')
@@ -635,9 +680,9 @@ fct_xml_wrap (in tree any, in txt any)
fct_sparql_ser ("c1") as "sparql_ser"),
__ro2sq ("c1")),
xmlelement ("column", fct_label_np ("c1", 0, ''facets'' )))))
- from (sparql define output:valmode "LONG"', view_type), ntxt);
+ from (sparql define output:valmode "LONG" ', view_type), ntxt);
if (n_cols = 3)
- http ('select xmlelement ("result", xmlattributes ('''' as "type"),
+ http (sprintf ('select xmlelement ("result", xmlattributes (''%s'' as "type"),
xmlagg (xmlelement ("row",
xmlelement ("column",
xmlattributes (fct_lang ("c1") as "xml:lang",
@@ -649,7 +694,7 @@ fct_xml_wrap (in tree any, in txt any)
xmlelement ("column", __ro2sq ("c2")),
xmlelement ("column", __ro2sq ("c3"))
)))
- from (sparql define output:valmode "LONG" ', ntxt);
+ from (sparql define output:valmode "LONG" ', view_type), ntxt);
http (txt, ntxt);
@@ -681,7 +726,6 @@ element_split (in val any)
declare k integer;
declare sall any;
-
--srch_split := '';
--k := 0;
--sall := split_and_decode(val, 0, '\0\0 ');
@@ -731,14 +775,14 @@ 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));
if ('list' = mode or 'propval-list' = mode)
{
- http (sprintf ('select distinct ?s%d as ?c1 ', this_s), pre);
+ http (sprintf ('select distinct ?s%d as ?c1 ?g', this_s), pre);
http (sprintf (' order by desc (<LONG::IRI_RANK> (?s%d)) ', this_s), post);
}
@@ -747,17 +791,20 @@ 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);
}
@@ -784,13 +831,14 @@ 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;
exp := cast (xpath_eval ('//text', tree) as varchar);
- http (sprintf ('select ?s%d as ?c1, (bif:search_excerpt (bif:vector (%s), ?o%d)) as ?c2, ?sc, ?rank where {{{ select ?s%d, (?sc * 3e-1) as ?sc, ?o%d, (sql:rnk_scale (<LONG::IRI_RANK> (?s%d))) as ?rank ',
+ http (sprintf ('select ?s%d as ?c1, (bif:search_excerpt (bif:vector (%s), ?o%d)) as ?c2, ?sc, ?rank, ?g where {{{ select ?s%d, (?sc * 3e-1) as ?sc, ?o%d, (sql:rnk_scale (<LONG::IRI_RANK> (?s%d))) as ?rank, ?g',
this_s,
element_split (exp),
this_s, this_s, this_s, this_s), pre);
@@ -803,18 +851,21 @@ 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 { {
- 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);
+-- dbg_obj_print (exp);
+-- dbg_obj_print (element_split(exp));
+
+ http (sprintf ('select
+ (<sql:s_sum_page> (<sql:vector_agg> (<bif:vector> (?c1, ?sm, ?g1)), <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, <SHORT_OR_LONG::>(?g) as ?g1', 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);
fct_post (tree, post, lim, offs);
http ('}}', post);
return;
}
-
-
if ('graphs' = mode)
{
http ('select ?g as ?c1, count(*) as ?c2 ', pre);
@@ -824,22 +875,26 @@ 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';
- http (sprintf ('select distinct ?location as ?c1 ?lat%d as ?c2 ?lng%d as ?c3 ', this_s, this_s, this_s), pre);
+ http (sprintf ('select distinct ?location as ?c1 ?lat%d as ?c2 ?lng%d as ?c3 ',
+ this_s, this_s, this_s), pre);
}
else
- http (sprintf ('select distinct ?s%d as ?c1 ?lat%d as ?c2 ?lng%d as ?c3 ', this_s, this_s, this_s), pre);
+ 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);
+ 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);
-
+ 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);
-
}
;
@@ -849,7 +904,7 @@ fct_literal (in tree any)
declare val, dtp, lang varchar;
dtp := cast (xpath_eval ('./@datatype', tree) as varchar);
- lang := cast (xpath_eval ('./@xml:lang', tree) as varchar);
+ lang := cast (xpath_eval ('./@lang', tree) as varchar);
val := cast (xpath_eval ('./@val', tree) as varchar);
if (0 = val or val is null) val := cast (tree as varchar);
@@ -867,7 +922,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);
}
@@ -887,7 +942,7 @@ fct_cond (in tree any, in this_s int, in txt any)
return fct_cond_range (tree, this_s, txt); -- ranges are handled elsewhere
}
- if ('in' = cond_t) {
+ if ('in' = cond_t or 'not_in' = cond_t) {
return fct_cond_in (tree, this_s, txt); -- so is IN
}
@@ -907,9 +962,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;
@@ -917,7 +972,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;
@@ -930,7 +985,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;
}
@@ -958,14 +1013,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);
}
@@ -977,27 +1032,43 @@ 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 varchar;
+ declare val, neg, cond_t, txs_qr varchar;
+ declare wlimit int;
+ declare txs_arr any;
- neg := xpath_eval ('./@neg', tree);
+ neg := xpath_eval ('./@neg', tree);
val := cast (xpath_eval ('.', tree) as varchar);
- 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);
+ 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);
+ }
}
- }
}
;
@@ -1007,24 +1078,30 @@ fct_cond_in (in tree any, in this_s int, in txt any) {
declare v any;
declare v_str varchar;
declare i int;
+ declare neg any;
+
+ neg := xpath_eval ('./@neg', tree);
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]);
};
fct_dbg_msg (sprintf ('fct_cond_in: v_str: %s', v_str));
- http (sprintf (' filter (?s%d in (%s)).', this_s, v_str), txt);
+ http (sprintf (' filter (%s?s%d in (%s)).',
+ case when neg = '1' then '! ' else '' end,
+ this_s,
+ v_str), txt);
}
;
@@ -1045,15 +1122,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)
@@ -1061,12 +1138,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;
@@ -1077,14 +1154,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 '\\[%:%\\]')
@@ -1095,7 +1172,7 @@ fct_curie (in curie varchar)
if (tmp is not null)
curie := tmp;
}
- return curie;
+ return curie;
}
;
@@ -1143,13 +1220,16 @@ 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);
+ http (sprintf (' filter not exists { ?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
{
@@ -1180,6 +1260,7 @@ fct_text (in tree any,
sc_opt := ' option (score ?sc) ';
else
sc_opt := '';
+
if (prop is not null)
prop := '<' || prop || '>';
else
@@ -1189,8 +1270,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);
@@ -1211,7 +1292,7 @@ fct_text (in tree any,
if (cast (xpath_eval ('./@exclude', tree) as varchar) = 'yes')
{
- http (sprintf (' filter (!bif:exists ((select (1) where { ?s%d <%s> ?v%d } ))) .', this_s, piri, new_s), txt);
+ http (sprintf (' filter not exists { ?s%d <%s> ?v%d } .', this_s, piri, new_s), txt);
max_s := max_s - 1;
new_s := max_s;
fct_text_1 (tree, new_s, max_s, txt, pre, post, full_tree, plain);
@@ -1240,11 +1321,13 @@ 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);
}
@@ -1256,10 +1339,28 @@ 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 ();
@@ -1268,16 +1369,18 @@ fct_query (in tree any, in plain integer := 0)
s := 0;
add_graph := 0;
- if (xpath_eval ('//view[@type="graphs"]', tree) is not null)
+ if (xpath_eval ('//view[@type="graphs"]', tree) is not null or
+ xpath_eval ('//view[@type="text"]', tree) is not null or
+ xpath_eval ('//view[@type="text-d"]', tree) is not null)
add_graph := 1;
fct_text (xpath_eval ('//query', tree), 0, s, txt, pre, post, tree, plain);
http (' where {', pre);
- if (add_graph) http (' graph ?g { ', pre);
+ if (add_graph) http (' quad map virtrdf:DefaultQuadMap { graph ?g { ', pre);
http (txt, pre);
http (' }', pre);
- if (add_graph) http (' }', pre);
+ if (add_graph) http (' } } ', pre);
http (post, pre);
return string_output_string (pre);
@@ -1294,6 +1397,7 @@ fct_test (in str varchar, in timeout int := 0)
tree := xtree_doc (str);
qr := fct_query (xpath_eval ('//query', tree, 1));
+
qr2 := fct_xml_wrap (tree, qr);
set result_timeout = timeout;
@@ -1322,7 +1426,24 @@ fct_test (in str varchar, in timeout int := 0)
;
create procedure
-fct_exec (in tree any,
+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,
in timeout int)
{
declare start_time, view3, inx, n_rows int;
@@ -1345,7 +1466,9 @@ fct_exec (in tree any,
}
sqls := '00000';
+
qr := fct_query (xpath_eval ('//query', tree, 1));
+
query := qr;
qr2 := fct_xml_wrap (tree, qr);
@@ -1356,13 +1479,16 @@ fct_exec (in tree any,
-- dbg_obj_print (qr2);
+ set isolation = 'uncommitted';
exec (qr2, sqls, msg, vector (), 0, md, res);
n_rows := row_count ();
act := db_activity ();
set result_timeout = 0;
+
if (sqls <> '00000' and sqls <> 'S1TAT')
signal (sqls, msg);
+
if (not isarray (res) or 0 = length (res) or not isarray (res[0]) or 0 = length (res[0]))
results[0] := xtree_doc ('<result/>');
else
@@ -1370,6 +1496,7 @@ fct_exec (in tree any,
inx := 1;
+
foreach (varchar tp in more) do
{
tree := XMLUpdate (tree, '/query/view/@type', tp, '/query/view/@limit', '40', '/query/view/@offset', '0');
@@ -1377,6 +1504,7 @@ fct_exec (in tree any,
qr2 := fct_xml_wrap (tree, qr);
sqls := '00000';
set result_timeout = __min (timeout, atoi (registry_get ('fct_timeout_max')));
+-- dbg_printf ('qr2: %s', qr2);
exec (qr2, sqls, msg, vector (), 0, md, res);
n_rows := row_count ();
act := db_activity ();
@@ -1392,19 +1520,22 @@ 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")),
+ xmlelement ("processed", n_rows),
+ xmlelement ("view", xmlattributes (offs as "offset", lim as "limit", v_pos as "position")),
results[0], results[1], results[2]);
--String_to_file ('ret.xml', serialize_to_UTF8_xml (res), -2);
+-- dbg_obj_print (results[0]);
+
return res;
}
;
diff --git a/binsrc/b3s/facet.vsp b/binsrc/b3s/facet.vsp
index 7381402..a1d0a9f 100644
--- a/binsrc/b3s/facet.vsp
+++ b/binsrc/b3s/facet.vsp
@@ -1,12 +1,17 @@
<?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>
-<link id="ss" rel="stylesheet" media="screen" type="text/css" href="styles/default.css"/>
+<?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" />
<?vsp
fct_gen_opensearch_link();
@@ -18,52 +23,65 @@
<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 (); ?>
- <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>
+ <?vsp fct_page_head (); ?>
</div><!-- #HD -->
<div id="MD">
-<?vsp
+<?vsp
+--
--
---
--- $Id: facet.vsp,v 1.1.2.14 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -99,11 +117,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));
@@ -118,62 +136,86 @@ 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">An unexpected error was encountered while processing your request.</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="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(sprintf ('<pre class="sparqlqry">SPARQL:\n%s</pre><br/>\n', connection_get ('sparql_query')));
+ {
+ 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));
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('<![CDATA[\n');
- http_value(_state);
- http('\n]]>');
-
- http(' </pre><br/>');
+ http_value(_xmlser);
+ 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:;
?>
-<div class="dbg" style="display: none"><pre><![CDATA[<?vsp if (sq is not null) http(sq); ?>]]></div>
+<?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><!-- #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">Copyright © 2009-2011 OpenLink Software</span>
+ <?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>
<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 1497033..bd6ef9b 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.8 2011/03/08 15:43:44 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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-2011 OpenLink Software</span>
+ <span class="copyright">Copyright © 2009-2012 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 f96a806..75bc311 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.10 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 2b8a04e..c634ba0 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.3 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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,19 +35,17 @@ 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);
@@ -56,14 +54,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 ae4ae46..a285ef0 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.1 2009/04/17 11:07:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 c0c7ccf..8e2b542 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.34 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -23,25 +23,9 @@
--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)
@@ -51,7 +35,9 @@ 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));
@@ -72,7 +58,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');
}
@@ -84,7 +70,6 @@ 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"',
@@ -101,13 +86,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);
}
@@ -152,16 +137,21 @@ create procedure fct_t_term ()
create procedure
fct_var_tag (in this_s int, in ctx int)
{
- if (ctx)
- return sprintf ('<a href="/fct/facet.vsp?cmd=set_focus&sid=%d&n=%d" title="Focus on %s%d">%s%d</a>',
+ 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,
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);
}
;
@@ -181,8 +171,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 '!=';
@@ -194,7 +184,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);
@@ -202,7 +192,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));
@@ -213,7 +203,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);
}
@@ -258,7 +248,7 @@ fct_query_info (in tree any,
n := cast (xpath_eval ('name ()', tree, 1) as varchar);
- fct_dbg_msg (sprintf ('fct_query_info: level: %d, n: %s', level, n));
+ fct_dbg_msg (sprintf ('fct_query_info: cno: %d, level: %d, n: %s, ctx: %d', cno, level, n, ctx));
http (fct_space (2 * level), txt);
@@ -267,20 +257,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;
}
@@ -296,22 +286,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)
@@ -323,25 +313,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);
@@ -362,9 +352,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);
@@ -373,12 +363,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)
@@ -387,15 +377,21 @@ 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),
@@ -407,37 +403,41 @@ 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 %V',
- fct_var_tag (this_s, ctx),
+ --val_fmt_enc (val, lang, dtp)),
+ http (sprintf ('%s %s%s %V',
+ fct_var_tag (this_s, ctx),
+ prop_qual,
fct_cond_name (cond_t),
fct_literal (xpath_eval ('.', tree))),
txt);
- }
- else if ('contains' = cond_t)
+ }
+ else if ('contains' = cond_t)
{
- http (sprintf (' %s contains "%s" .',
+ http (sprintf (' %s %scontains "%s" .',
fct_var_tag (this_s, ctx),
- val),
+ prop_qual,
+ val),
txt);
- }
- else if ('in' = cond_t)
+ }
+ else if ('in' = cond_t)
{
declare this_cno int;
+ declare neg varchar;
+ neg := case when (xpath_eval ('./@neg', tree) = '1') then 'NOT ' else '' end;
this_cno := cno;
- http (sprintf ('%s is IN: ', fct_var_tag (this_s, ctx)), txt);
+ http (sprintf ('%s %sis %sIN: ', fct_var_tag (this_s, ctx), prop_qual, neg), 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;
@@ -449,76 +449,88 @@ 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);
- prop := xpath_eval ('./@location-prop', tree);
+ 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);
prop_info := '.';
if (prop <> '') {
prop_info := sprintf (' by %s property.', prop);
- }
-
- 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);
+ }
+
+ 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 (' <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');
@@ -532,8 +544,11 @@ fct_top (in tree any, in txt any)
declare cno int;
cno := 0;
- fct_query_info (xpath_eval ('/query', tree), 1, max_s, 1, 1, txt, cno);
+ 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, ctx, txt, cno);
}
;
@@ -542,6 +557,7 @@ 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);
}
@@ -550,8 +566,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);
}
;
@@ -596,41 +612,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');
}
@@ -640,8 +656,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="">Shown items</option>'||
'<option value="any">Any location</option>'||
+ '<option value="">Shown items</option>'||
'<option value="dbpprop:location">dbpedia:location</option>'||
'<option value="dbpprop:place">dbpedia:place</option>'||
'<option value="foaf:based_near">foaf:based_near</option>'||
@@ -657,14 +673,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);
}
@@ -673,11 +689,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',
@@ -709,8 +725,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';
}
;
@@ -729,7 +745,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)
@@ -737,7 +753,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;
@@ -813,7 +829,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;
@@ -842,10 +858,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);
--
@@ -853,12 +869,13 @@ 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);
@@ -882,9 +899,13 @@ 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 (tree, null, p_ses);
+ http_value (p_xml_tree, null, p_ses);
+
p_xml := cast (p_ses as varchar);
r_ses := string_output ();
@@ -892,6 +913,13 @@ 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',
@@ -904,18 +932,20 @@ 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
)),
@@ -956,9 +986,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;
@@ -976,18 +1006,19 @@ 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;
@@ -1015,7 +1046,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;
@@ -1030,7 +1061,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;
@@ -1041,11 +1072,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)
{
@@ -1079,52 +1110,92 @@ fct_set_view (in tree any,
;
create procedure
-fct_next (in tree any, in sid int)
+fct_next (in tree any, in sid int, in offset varchar, in limit varchar)
{
declare tp varchar;
declare lim, offs int;
- 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);
+
+ 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 + 20);
+ fct_set_view (tree, sid, tp, lim, offs + lim);
}
;
create procedure
-fct_prev (in tree any, in sid int)
+fct_prev (in tree any, in sid int, in offset varchar, in limit varchar)
{
declare tp varchar;
declare lim, offs int;
- 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);
+
+ 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;
- offs := offs - 20;
- if (offs < 0) offs := 0;
+ fct_dbg_msg (sprintf ('fct_go_to offs: %d, lim: %d', offs, lim));
+
+ tp := cast (xpath_eval ('//view/@type', tree) as varchar);
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));
@@ -1132,12 +1203,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
@@ -1157,18 +1228,16 @@ fct_set_class (in tree any,
{
declare pos int;
- pos := fct_view_pos (tree);
-
- fct_dbg_msg(sprintf('fct_set_class: sid: %d, iri: %s', sid, iri));
+ fct_dbg_msg (sprintf ('fct_set_class: sid: %d, iri: %s, pos: %d', sid, iri, pos));
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',
@@ -1198,11 +1267,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;
@@ -1213,7 +1282,7 @@ http ('
</tr>
');
}
- if (0 = cnt)
+ if (0 = cnt)
{
http ('
<tr><td>There are currently no featured views.</td></td>
@@ -1282,8 +1351,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;
@@ -1296,14 +1365,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 -->
');
}
@@ -1339,15 +1408,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);
@@ -1366,17 +1435,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;
@@ -1392,8 +1461,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;
@@ -1406,11 +1475,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;
@@ -1426,7 +1495,7 @@ fct_create_ses ()
}
;
-create procedure
+create procedure
fct_new ()
{
declare sid int;
@@ -1436,8 +1505,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
@@ -1479,8 +1548,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 -->
@@ -1489,17 +1558,29 @@ 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"/>
- <input type=submit value="Search"><br/>
+ <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/>
</div>
</form>
</div> <!-- #TAB_PAGE_TXT -->
@@ -1514,9 +1595,9 @@ fct_new ()
<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/>
@@ -1539,9 +1620,9 @@ fct_new ()
<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>
@@ -1566,7 +1647,6 @@ 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;
@@ -1589,17 +1669,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">
@@ -1609,11 +1689,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">
@@ -1644,11 +1724,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);
@@ -1727,10 +1807,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);
@@ -1739,11 +1819,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;
@@ -1753,13 +1833,14 @@ 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;
}
@@ -1769,19 +1850,20 @@ 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;
}
@@ -1791,14 +1873,15 @@ 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;
@@ -1807,7 +1890,7 @@ fct_validate_xsd_datetime (in str varchar)
}
;
-create procedure
+create procedure
fct_validate_xsd_str (in str varchar) {
declare retval varchar;
@@ -1820,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),
@@ -1836,13 +1919,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;
}
@@ -1852,19 +1935,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;
}
@@ -1874,14 +1957,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;
@@ -1890,7 +1973,7 @@ fct_validate_xsd_datetime (in str varchar)
}
;
-create procedure
+create procedure
fct_validate_xsd_str (in str varchar) {
declare retval varchar;
@@ -1903,12 +1986,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),
@@ -1919,12 +2002,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)
{
@@ -1937,7 +2020,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;
@@ -1946,12 +2029,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',
@@ -1961,17 +2044,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)
@@ -1982,12 +2065,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',
@@ -2002,7 +2085,7 @@ fct_set_cond (in tree any,
}
;
-create procedure
+create procedure
fct_set_cond_in (in tree any,
in sid int,
in neg varchar,
@@ -2023,10 +2106,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',
@@ -2038,37 +2121,45 @@ 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 prop varchar)
+ in acquire varchar,
+ in prop varchar)
{
- fct_dbg_msg (sprintf ('fct_set_cond_near: lat:%s, lon:%s, d:%s', lat, lon, dist));
+ 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)));
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));
@@ -2080,26 +2171,48 @@ fct_set_cond_near (in tree any,
}
;
-create procedure
+create procedure
fct_set_loc (in tree any,
- in sid int)
+ in sid int,
+ in cno int)
{
declare lon, lat float;
declare acc int;
-
+
lon := http_param ('lon');
lat := http_param ('lat');
- acc := http_param ('acc');
- if (0 = lon or 0 = lat or 0 = acc) {
+ fct_dbg_msg (sprintf ('fct_set_loc: cno:%d, lon:%s, lat:%s', cno, lon, lat));
+
+ if (0 = lon or 0 = lat) {
http_request_status ('HTTP/1.1 400 Bad request');
- http('FCT002: Invalid location data\n');
+ http('FCT002: Missing 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;
@@ -2142,8 +2255,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');
@@ -2166,23 +2279,29 @@ fct_vsp ()
connection_set ('timeout', _to);
+ if ('new_with_class' = cmd) goto no_ses;
+
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:
+ no_ses:
+ fct_dbg_msg ('fct_vsp: no ses found');
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];
@@ -2192,7 +2311,7 @@ fct_vsp ()
else
goto do_new_ses;
-exec:;
+exec:;
declare s_term varchar;
connection_set ('sid', sid);
@@ -2207,13 +2326,14 @@ 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', cmd));
+ fct_dbg_msg (sprintf ('fct_vsp: cmd: %s, sid: %d', cmd, sid));
if ('text' = cmd)
{
@@ -2235,9 +2355,11 @@ exec:;
atoi (http_param ('offset')),
http_param ('location-prop'));
else if ('next' = cmd)
- fct_next (tree, sid);
+ fct_next (tree, sid, http_param ('offset'), http_param ('limit'));
else if ('prev' = cmd)
- fct_prev (tree, sid);
+ 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'));
else if ('set_text_property' = cmd)
fct_set_text_property (tree, sid, http_param ('iri'));
else if ('open_property' = cmd)
@@ -2248,7 +2370,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);
@@ -2274,29 +2396,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')));
@@ -2305,28 +2427,44 @@ exec:;
sid,
http_param('neg'),
http_param('cond_parms'));
+ } else if ('not_in' = cond_t) {
+ fct_set_cond_in (tree,
+ sid,
+ 1,
+ http_param('cond_parms'));
} else if ('near' = cond_t) {
- fct_set_cond_near (tree,
- sid,
- http_param ('lat'),
- http_param ('lon'),
+ 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,
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'));
@@ -2335,7 +2473,7 @@ exec:;
else if ('featured' = cmd)
fct_featured (tree, sid);
else if ('set_loc' = cmd)
- fct_set_loc (tree, sid);
+ fct_set_loc (tree, sid, cast (http_param('cno') as int));
else
{
http_request_status ('HTTP/1.1 400 Bad request');
@@ -2347,14 +2485,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 ();
}
@@ -2362,12 +2500,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);
}
;
@@ -2384,10 +2522,28 @@ create procedure fct_page_head ()
<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"
- title="OpenLink Virtuoso">
- <img class="powered_by" src="/fct/images/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/>
- </a>
+ <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>
</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 fd9101c..b96c147 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.3 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -22,28 +22,29 @@
-- 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 5603c97..b0b78f7 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.1 2010/12/12 18:09:27 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 c0cdd90..038f07f 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.1 2009/05/08 11:18:40 source Exp $
+-- $Id$
--
-- Alternate RDF index scheme for cases where G unspecified
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/fct_req.xsl b/binsrc/b3s/fct_req.xsl
index 44fcfc8..fa665e1 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.1 2009/04/17 11:07:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/fct_resp.xsl b/binsrc/b3s/fct_resp.xsl
index bae6962..2b3ae85 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.2 2009/05/01 19:39:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/fct_set_default.xsl b/binsrc/b3s/fct_set_default.xsl
index d5aa92a..30a33fe 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-2009 OpenLink Software
- -
+ -
+ - 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">
diff --git a/binsrc/b3s/fct_set_loc.xsl b/binsrc/b3s/fct_set_loc.xsl
new file mode 100644
index 0000000..b3be687
--- /dev/null
+++ b/binsrc/b3s/fct_set_loc.xsl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+--
+-- $Id$
+--
+-- 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 e246249..a1d78f9 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.1 2009/04/17 11:07:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 fac6c75..facf949 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.8 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -44,109 +44,111 @@
<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 (./ancestor-or-self::*/preceding-sibling::*/descendant-or-self::*[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 (./ancestor-or-self::*/preceding-sibling::*/descendant-or-self::*[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 (./ancestor-or-self::*/preceding-sibling::*/descendant-or-self::*[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 (./ancestor-or-self::*/preceding-sibling::*/descendant-or-self::*[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
name () = 'property' or
name () = 'property-of']) +
- count (./preceding::*[name () = 'query' or
+ count (./ancestor-or-self::*/preceding-sibling::*/descendant-or-self::*[name () = 'query' or
name () = 'property' or
name () = 'property-of'])">
<cond-range xml:lang="{$lang}"
@@ -171,37 +173,42 @@
</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}"/>
+ <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>
</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
new file mode 100644
index 0000000..1678803
--- /dev/null
+++ b/binsrc/b3s/fct_strip_loc.xsl
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+--
+-- $Id$
+--
+-- 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 7fdd94b..3de8f16 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.22 2011/10/28 16:09:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -22,13 +22,18 @@
-- 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:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:addthis="http://www.addthis.com/help/api-spec">
<xsl:output method="html" encoding="ISO-8859-1" indent="yes"/>
+<!-- Pager-related vars calculation -->
-<xsl:variable name="page_len" select="20"/>
-<xsl:variable name="offs"
+<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"/>
@@ -36,188 +41,173 @@
<xsl:param name="p_qry"/>
<xsl:param name="p_xml"/>
<xsl:param name="tree"/>
+<xsl:param name="addthis_key"/>
+<xsl:param name="type"/>
-<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[
-
-OAT.Preferences.imagePath = "oat/images/";
-
-function markerClickHandler (caller, msg, m) {
- var c = m.__fct_bubble_content;
+<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>
- 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: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>
-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: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 -->
<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: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:otherwise>
- <h4 class="facet_hd">Types</h4>
+ <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>
</xsl:otherwise>
- </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>
+ </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>
- </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">
+ <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">
var sparql_a = OAT.Dom.create('a',{}, 'sparql_a');
- sparql_a.href='/sparql?qtxt=<xsl:value-of select="urlify ($p_qry)"/>&debug='
+ sparql_a.href='/sparql?default-graph-uri=&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:if test="$type = 'default'">
-<script type="text/javascript">
+ </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">
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';
@@ -228,7 +218,7 @@ function init(){
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>\
@@ -254,70 +244,120 @@ function init(){
OAT.Dom.append (['pivot_a_ctr',pivot_a,pivot_pg,pivot_qrcode_opts,pivot_link_opts]);
}
-</script>
-</xsl:if>
+ </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>
</xsl:template>
<xsl:template name="render-pager">
+ <xsl:param name="pfx"/>
<xsl:if test="/facets/processed > 0">
- <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>
+ <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>
</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_nav_to('/fct/facet.vsp?cmd=prev&sid=<xsl:value-of select="$sid"/>')
- </xsl:attribute>◂ Prev
+ <xsl:attribute name="onclick">javascript:fct_pager_prev('<xsl:value-of select="$pfx"/>');</xsl:attribute>
+ ◀
</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_nav_to('/fct/facet.vsp?cmd=next&sid=<xsl:value-of select="$sid"/>')
- </xsl:attribute>▸ Next
+ <xsl:attribute name="onclick">javascript:fct_pager_next('<xsl:value-of select="$pfx"/>');</xsl:attribute>
+ ▶
</button>
- </xsl:if>
- </div>
+ </form>
</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'">
- <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>
+ <tr><th></th><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th></th><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'list-count'">
- <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>
+ <tr><th></th><th><xsl:value-of select="$s_term"/></th><!--th>Title</th--><th></th><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'text-properties'">
- <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>
+ <tr><th></th><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th></th><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'properties-in'">
- <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>
+ <tr><th></th><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th></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'">
- <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>
+ <tr><th></th><th><xsl:value-of select="$t_term"/></th><!--th>Label</th--><th></th><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'text' or $view-type = 'text-d'">
- <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>
+ <tr><th></th><th></th><th></th><th><xsl:value-of select="$s_term"/></th><th>Title</th><th>Named Graph</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>
@@ -326,109 +366,123 @@ function init(){
<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">
+ <xsl:if test="./@rank">
+ <td>
+ <xsl:value-of select="./@rank"/>
+ </td>
+ </xsl:if>
<td>
- <xsl:value-of select="./@rank"/>
+ <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>
</td>
- </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>
+ <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: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>&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: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: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>
- </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>
+ <xsl:apply-templates select="column[3]"/>
</td>
- </xsl:when-->
- <xsl:otherwise> <!-- text matches view -->
+ </xsl:when>
+ <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: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: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>
@@ -436,34 +490,31 @@ function init(){
</td>
<xsl:for-each select="column">
<td>
- <xsl:choose>
+ <xsl:choose>
<xsl:when test="'uri' = ./@datatype or 'url' = ./@datatype">
- <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:call-template name="render-describe-link">
+ <xsl:with-param name="uri" select="."/>
+ <xsl:with-param name="shortform" select="./@shortform"/>
+ </xsl:call-template>
</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 /facets/result/@type='list'">
- <form id="cond_form">
+<xsl:if test="/facets/result/@type='propval-list' or $view-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"/>
@@ -472,49 +523,103 @@ function init(){
<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>
<option value="neg_range">Not Between</option>
<option value="contains">Contains</option>
<option value="in">In</option>
+ <option value="not_in">Not 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-geo-conds-ui"/>
+<xsl:call-template name="render-init-func">
+ <xsl:with-param name="result" select="/facets/result"/>
+</xsl:call-template>
-</xsl:template>
+</xsl:template> <!-- render-result -->
+
+<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 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'">
- <form id="cond_form">
+ <div id="user_map"></div>
+ <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
+ <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>
<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>
@@ -524,7 +629,91 @@ function init(){
</span>
<button id="cond_loc_acq_b">Acquire</button>
<button id="cond_loc_use_b">Set condition</button>
- </form>
+ </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>
</xsl:if>
</xsl:template>
@@ -534,5 +723,4 @@ function init(){
</xsl:copy>
</xsl:template>
-
</xsl:stylesheet>
diff --git a/binsrc/b3s/images/link_16.png b/binsrc/b3s/images/link_16.png
new file mode 100644
index 0000000..9be575d
Binary files /dev/null and b/binsrc/b3s/images/link_16.png differ
diff --git a/binsrc/b3s/install.html b/binsrc/b3s/install.html
index e3940f9..3d7c952 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 23226d3..d599a1a 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.1 2011/09/23 19:22:35 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2009 OpenLink Software
+ 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
@@ -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 Query
+ Run with iSPARQL
</a>
<a>
<xsl:attribute name="href">
diff --git a/binsrc/b3s/make_vad.sh b/binsrc/b3s/make_vad.sh
index df81cc9..9504d80 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.8 2011/10/26 15:38:11 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -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-2011 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
@@ -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 5097036..27871ef 100644
--- a/binsrc/b3s/ns.sql
+++ b/binsrc/b3s/ns.sql
@@ -1,10 +1,10 @@
--
--- $Id: ns.sql,v 1.1.2.7 2011/09/23 19:22:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -79,3 +79,15 @@ 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 72712e8..375e1c6 100644
--- a/binsrc/b3s/nsdecl.sql
+++ b/binsrc/b3s/nsdecl.sql
@@ -1,10 +1,10 @@
--
--- $Id: nsdecl.sql,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/open.xsl b/binsrc/b3s/open.xsl
index 9d9bd1b..4fa3b96 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.1 2009/04/17 11:07:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/opensearchdescription.vsp b/binsrc/b3s/opensearchdescription.vsp
index ca19a5b..49137b2 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-2009 OpenLink Software
+-- 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
@@ -34,16 +34,17 @@
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)
@@ -61,17 +62,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 e73b143..48c4836 100644
--- a/binsrc/b3s/rdfdesc/description.sql
+++ b/binsrc/b3s/rdfdesc/description.sql
@@ -1,10 +1,10 @@
--
--- $Id: description.sql,v 1.1.2.30 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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,32 +150,86 @@ 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))
{
- 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];
+ 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];
+ }
}
}
return ll;
}
;
+-- This is where we should have something smart... instead we return the last one...
+
+create procedure b3s_choose_e_type (inout type_a any)
+{
+ if (not length(type_a))
+ return vector ('http://www.w3.org/2002/07/owl#Thing', 'owl:Thing', 'A Thing');
+
+-- dbg_printf ('type_a length: %d', length(type_a));
+ return (type_a[length(type_a)-1]);
+}
+;
+
+--
+-- Detect if viewing an explicit or implicit class
+--
+
+create procedure b3s_find_class_type (in _s varchar, in _f varchar, inout types_a any)
+{
+ declare i int;
+
+ for (i := 0; i < length (types_a); i := i + 1)
+ {
+ if (types_a[i][0] in ('http://www.w3.org/2002/07/owl#Class',
+ 'http://www.w3.org/2000/01/rdf-schema#Class'))
+ return 1;
+ }
+
+ declare stmt, st, msg varchar;
+ declare meta,data any;
+ data := null;
+ st := '00000';
+ msg:= '';
+
+ stmt := sprintf ('sparql select ?to %s where {?to a <%S>}', _f, _s);
+
+ exec (stmt, st, msg, vector(), 1, meta, data);
+
+ if (length (data)) return 1;
+
+ return 0;
+}
+;
+
create procedure b3s_uri_local_part (in uri varchar)
{
declare delim integer;
@@ -191,6 +245,72 @@ create procedure b3s_uri_local_part (in uri varchar)
}
;
+
+--
+-- vector (vector (<type_iri>, <short_form>, <label or null>), vector (...), ...)
+--
+
+create procedure
+b3s_get_types (in _s varchar,
+ in _from varchar,
+ in langs any) {
+ declare stat, msg, meta, data any;
+ declare t_a any;
+ declare i int;
+ declare stmt varchar;
+
+ stmt := sprintf ('sparql select distinct ?tp %s where { <%S> a ?tp }', _from, _s);
+ data := null;
+ t_a := vector();
+
+ if (length (_s))
+ {
+ data := null;
+ exec (stmt, stat, msg, vector (), 100, meta, data);
+
+ if (length(data))
+ {
+ for (i := 0;i < length(data); i := i + 1)
+ {
+-- dbg_printf ('data[%d][0]: %s', i,data[i][0]);
+ t_a := vector_concat (t_a,
+ vector (vector (data[i][0],
+ b3s_uri_curie (data[i][0]),
+ b3s_label (data[i][0], langs))));
+ }
+ }
+ }
+ return (t_a);
+}
+;
+
+create procedure
+b3s_render_iri_select (inout types_a any,
+ in ins_str varchar := '',
+ in sel int := -1)
+{
+ declare i int;
+
+ if (length (types_a) and isvector (types_a))
+ {
+ if (sel = -1) sel := length(types_a)-1;
+
+ http (sprintf ('<select %s>', ins_str));
+
+ for (i := 0; i < length(types_a); i := i + 1)
+ {
+ http (sprintf ('<option value="%s" title="%s" %s>%s</option>',
+ types_a[i][0],
+ types_a[i][0],
+ case when i = sel then 'selected="true"' else '' end,
+ case when types_a[i][2] <> '' then types_a[i][2] else types_a[i][1] end));
+ }
+ http ('</select>');
+ }
+ return i;
+}
+;
+
create procedure
b3s_render_fct_link ()
{
@@ -198,34 +318,34 @@ b3s_render_fct_link ()
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>');
}
;
@@ -233,22 +353,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;
@@ -277,7 +397,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);
}
}
@@ -291,22 +411,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;
@@ -323,7 +443,7 @@ b3s_render_ses_params ()
}
;
-create procedure
+create procedure
b3s_dbg_out (inout ses any, in str any)
{
if (connection_get ('b3s_dbg'))
@@ -331,10 +451,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);
@@ -349,6 +469,8 @@ 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);
@@ -403,17 +525,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);
@@ -421,7 +543,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;
@@ -459,7 +581,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;
@@ -502,7 +624,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;
}
;
@@ -511,7 +633,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);
@@ -523,7 +645,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;
@@ -538,16 +660,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);
@@ -556,13 +678,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');
@@ -571,7 +693,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)
+create procedure b3s_label (in _S any, in langs any, in lbl_order_pref_id int := 0)
{
declare best_str, meta, data any;
declare best_q, q float;
@@ -580,8 +702,8 @@ create procedure b3s_label (in _S any, in langs any)
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 ('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',
+ 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),
stat, msg, vector (_S), 0, meta, data);
if (stat <> '00000')
return '';
@@ -604,16 +726,20 @@ create procedure b3s_label (in _S any, in langs any)
{
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)
@@ -656,29 +782,39 @@ again:
_url := _object;
if (not length (_url))
- return;
+ return;
http (sprintf ('<!-- %d -->', length (_url)));
rdfa := b3s_rel_print (prop, rel, 0);
- if (http_mime_type (_url) like 'image/%')
+ 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/%' or http_mime_type (_url) = 'application/x-openlink-photo')
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
{
- declare lbl any;
+ usual_iri:;
+ declare lbl, vlbl 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);
+ lbl := b3s_label (_url, langs, 1);
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)));
- http_value (charset_recode (lbl, 'UTF-8', '_WIDE_'));
+ vlbl := charset_recode (lbl, 'UTF-8', '_WIDE_');
+ http_value (case when vlbl <> 0 then vlbl else lbl end);
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)));
}
@@ -704,9 +840,16 @@ 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 := '';
}
@@ -728,7 +871,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)
@@ -810,7 +953,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);
@@ -829,7 +972,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);
@@ -839,10 +982,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)
@@ -948,8 +1091,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)
-{
+create procedure b3s_lbl_order (in p any, in lbl_order_pref_id int := 0)
+{
declare r int;
r := vector (
'http://www.w3.org/2000/01/rdf-schema#label',
@@ -977,8 +1120,16 @@ create procedure b3s_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://poolparty.punkt.at/demozone/ont#title',
+ 'http://linkedopencommerce.com/schemas/icecat/v1/hasShortSummaryDescription',
+ 'http://www.openlinksw.com/schemas/googleplus#displayName'
);
+
+ 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 91788bb..f3cf651 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.40 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -31,60 +31,83 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
--
- 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;
+
+--
+-- 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 ses_parms varchar;
declare all_langs, lang_parm any;
- declare c_iri, iri_type, iri_uri, _F, _from, topof varchar;
- declare page, n_per_page, lim, ofs, dis_next int;
+ declare c_iri, iri_type, iri_type_label, _F, _from, topof varchar;
+ declare page, n_per_page, lim, ofs, dis_next, deadl int;
declare vis, printed, _skip, _last int;
declare all_lang any;
declare curr_pred any;
- declare dt1, dt2, count_str, tbinf, tbsas, ua, doc varchar;
+ declare dt1, dt2, count_str, tbinf, tbsas, ua, doc, sp_mode, sp_accept varchar;
+ declare c_iri_a any;
+
+ deadl := 0;
+ declare exit handler for sqlstate '40001' {
+ rollback work;
+ if (deadl < 5)
+ goto again;
+ resignal;
+ };
+ declare continue handler for sqlstate 'S1TAT';
+ set result_timeout = atoi (registry_get ('fct_timeout_max'));
+again:
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
--
@@ -99,10 +122,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, '');
@@ -111,55 +134,62 @@
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');
-
- _S := page_resource_uri;
- proxy_iri := page_resource_uri;
+ page_resource_uri := replace (page_resource_uri, '"', '%22');
- b3s_dbg_out (dbg_out, 'page_resource_uri: ' || 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 "soft" SELECT * from <%S> where { ?x ?y ?z . }', doc), 'SPARQL');
+ DB.DBA.EXEC_AS (sprintf ('sparql define input:storage "" define get:soft "add" 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 and 0 = length (_F))
+ 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))
{
declare refr varchar;
if (get_keyword ('sr', params, '') = 'clean')
@@ -170,41 +200,62 @@
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 "soft" SELECT * from <%S> where { ?x ?y ?z . }', refr, 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 "%s" %s SELECT * from <%S> where { ?x ?y ?z . }', refr, sp_mode, sp_accept, 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 := '';
- --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);
- --exec (qry_str, null, null, vector (), 0, meta, data);
+ 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 := '';
+
+ label := b3s_label (_S, langs);
- 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);
+ 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 || '"');
+
+ declare types_a any;
+ declare e_type any;
+ declare e_type_label varchar;
+ declare e_type_a any;
+
+-- dbg_printf ('_S:%s', _s);
+
+ types_a := b3s_get_types (_S, _F, langs);
- label := b3s_label_get (data, langs);
- true_label := label;
- iri_type := b3s_type (_S, _F, iri_uri, c_iri);
+-- dbg_obj_print (types_a);
+ e_type_a := b3s_choose_e_type (types_a);
+
+-- dbg_obj_print (e_type_a);
+
+ e_type := e_type_a[0];
+ e_type_label := e_type_a[1];
+
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;
@@ -228,7 +279,7 @@
{
best_q := curr;
best_variant := q;
- }
+ }
inx := inx + 1;
}
if (best_variant is null)
@@ -245,31 +296,57 @@
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 http (label); ?></title>
+ <title>About: <?vsp if (length (label)) http_value (label); else http_value (b3s_uri_curie (page_resource_uri));?></title>
<!--link rel="alternate" type="application/rdf+xml" href="<?=rdf_link?>" title="RDF" /-->
- <link rel="stylesheet" type="text/css" href="styles/default.css" charset="utf-8" />
+ <?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/highlighter.css" charset="utf-8" />
<script type="text/javascript" >
var featureList=["tab"];
@@ -278,10 +355,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_page_head (); ?>
+<body about="<?V page_resource_uri ?>">
+ <div id="PG">
+ <div id="HD">
+ <?vsp fct_desc_page_head (); ?>
<ul id="main_menu">
<?vsp if (sid is not null) { ?>
<li><a href="<?= b3s_render_fct_link() ?>">Facets</a></li>
@@ -294,7 +371,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>
@@ -305,61 +382,93 @@
</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 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
- declare _ciri varchar;
-
- 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;
- }
- else {
- _ciri := c_iri;
- }
+ </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 e_type ?>"><?V e_type_label ?></a>,
+ within Data Space : <a href="http://<?V host ?>"><?V host ?></a> associated with source <a href="usage.vsp?g=<?U _S ?><?V ses_parms ?>">dataset(s)</a><br/>
+<?vsp
+
+ declare is_class int;
+ is_class := b3s_find_class_type (_S, _F, types_a);
- if (sid) {
+ if ('http://www.w3.org/2002/07/owl#Thing' <> e_type or is_class)
+ {
?>
+ <form id="fct_form" action="/fct/facet.vsp" method="get">
- <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
+ if (is_class)
+ {
+?>
+ <input type="hidden" name="iri" value="<?V _S ?>">
+<?vsp
+ }
+ else
+ {
+?>
+ <label for="c_iri_sel">Type:</label>
+<?vsp
+ types_a := b3s_render_iri_select (types_a, 'name="iri" id="c_iri_sel"');
+ }
-<?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>
+ if (sid)
+ {
+?>
+ <input type="hidden" name="sid" value="<?V sid ?>"/>
+ <label for="cmd_sel">Command:</label>
+ <select name="cmd" id="cmd_sel">
+ <option value="new_with_class">Start New Facet</option>
+ <option value="set_class">Add To Current Facet</option>
+ </select>
+ <button class="fct_sel_as_type" title="">Go</a>
<?vsp
- }
+ }
+ else
+ {
+?>
+ <input type="hidden" name="cmd" value="new_with_class"/>
+ <button class="fct_sel_as_type" title="">New Facets Session with This Class</button>
+<?vsp
+ }
+?>
+ </form>
+<?vsp
+ }
declare qrimg any;
- qrimg := fct_make_qr_code (fct_make_curie ('http://' || host || b3s_http_url (page_resource_uri), lines));
+ qrimg := fct_make_qr_code (fct_make_curie ('http://' || host || b3s_http_url (page_resource_uri, null, get_keyword ('graph', params)), 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>
- </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
@@ -372,7 +481,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
@@ -385,7 +494,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);
@@ -398,19 +507,25 @@ 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);
- _last := data[0][0]; -- sum is supposed to have always number
+ if (length (data) and length (data[0]))
+ _last := data[0][0]; -- sum is supposed to have always number
+ else
+ _last := n_per_page;
_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;
- while (0 = exec_next (h1, null, null, data))
+ data := null;
+ while (0 = exec_next (h1, null, null, data))
{
declare PRED, OBJECT, FLAG any;
--if (inx <= _skip)
-- goto nxt1;
- pred := data[0];
+ if (length (data) < 3)
+ goto skip;
+ pred := data[0];
object := data[1];
FLAG := data[2];
if (not length (PRED))
@@ -425,6 +540,7 @@ 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>');
@@ -432,7 +548,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>');
@@ -454,19 +570,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>
@@ -487,11 +603,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');
@@ -503,41 +619,39 @@ 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/">
@@ -546,10 +660,18 @@ if (_subject <> '') {
alt="Valid XHTML + RDFa" height="27" /></a>
</span>
<br />
- 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
+ <?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
</div> <!-- #ft_b -->
</div> <!-- #FT -->
</div> <!-- #PG -->
@@ -559,5 +681,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 618c5f6..0773fd8 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;
- host := http_request_header (http_request_header (), 'Host');
+ _S := page_resource_uri;
+
+ 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_page_head (); ?>
+ <?vsp fct_desc_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-2011 OpenLink Software | <a href="/fct/facet_doc.html">About</a>
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2012 OpenLink Software | <a href="/fct/facet_doc.html">About</a>
</div> <!-- #ft_b -->
</div> <!-- #FT -->
</div> <!-- #PG -->
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/binsrc/b3s/rdfdesc/usage.vsp b/binsrc/b3s/rdfdesc/usage.vsp
index ebf94b9..b344723 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.21 2011/10/26 15:38:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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,63 +60,66 @@
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);
- if (arr[0] = '' and arr[1] = '' and arr[2] <> '')
- gr := 'http://' || 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);
- page_resource_uri := gr;
- page_resource_uri := replace (page_resource_uri, '%23', '#');
+ if (arr[0] = '' and arr[1] = '' and arr[2] <> '')
+ gr := 'http://' || gr;
- _S := page_resource_uri;
+ page_resource_uri := gr;
+ page_resource_uri := replace (page_resource_uri, '%23', '#');
- proxy_iri := page_resource_uri;
+ _S := 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 := '';
+ proxy_iri := page_resource_uri;
- exec (sprintf ('sparql define input:inference "facets" select ?o (lang(?o)) where { <%S> virtrdf:label ?o }', _S),
+ 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),
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'));
- dbg_enable := get_keyword ('dbg', params);
+ tp := atoi (get_keyword ('tp', params, '1'));
- 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);
+ 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);
declare desc_resource_uri varchar;
declare desc_qr varchar;
@@ -139,11 +142,11 @@
</head>
<body class="usage_page">
<div id="HD">
- <?vsp fct_page_head (); ?>
+ <?vsp fct_desc_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>
@@ -155,34 +158,43 @@
<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>
+ <?vsp http (sprintf ('%s', label)); ?></a></h2> <a class="desc_permalink" href="usage.vsp?g=<?U page_resource_uri ?>">Permalink</a>
<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
@@ -200,7 +212,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 ()
));
@@ -213,28 +225,33 @@
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)
- {
+ {
+ declare dset_link, grvar any;
+ grvar := data[0];
+ dset_link := (sparql select ?dset where { ?dset a <http://rdfs.org/ns/void#Dataset> ; ?p `iri (?:grvar)` . });
--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><a href="http://lod.openlinksw.com/void/%s/Dataset">%V</a></td>', rtrim (data[0], '/#'), data[0]));
+ else if (dset_link is not null)
+ http (sprintf ('<td><a href="/describe/?url=%U%s">%V</a></td>', dset_link, b3s_render_ses_params(), 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])));
@@ -247,26 +264,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 -->
@@ -282,7 +299,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');
@@ -294,40 +311,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"
@@ -337,11 +354,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-2011 OpenLink Software
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2012 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 1e9a8e5..24457b5 100644
--- a/binsrc/b3s/s/description.js
+++ b/binsrc/b3s/s/description.js
@@ -1,10 +1,10 @@
/*
- * $Id: description.js,v 1.1.2.3 2010/10/22 21:12:25 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -29,6 +29,7 @@ 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++) {
@@ -55,10 +56,11 @@ 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;
@@ -106,7 +108,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;
@@ -116,7 +118,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 c384620..ce7b155 100644
--- a/binsrc/b3s/sparql.vsp
+++ b/binsrc/b3s/sparql.vsp
@@ -1,11 +1,11 @@
<?vsp
---
--- $Id: sparql.vsp,v 1.1.2.3 2009/05/08 10:51:29 source Exp $
+--
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 693acc6..33143c2 100644
--- a/binsrc/b3s/srank.sql
+++ b/binsrc/b3s/srank.sql
@@ -1,10 +1,10 @@
--
--- $Id: srank.sql,v 1.1.2.5 2009/06/25 14:00:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 1e25354..83bf89a 100644
--- a/binsrc/b3s/srank23.sql
+++ b/binsrc/b3s/srank23.sql
@@ -1,10 +1,10 @@
--
--- $Id: srank23.sql,v 1.1.2.1 2010/02/01 12:44:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 67f6865..a6e886b 100644
--- a/binsrc/b3s/styles/default.css
+++ b/binsrc/b3s/styles/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.1.2.20 2011/10/26 15:38:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -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,40 +34,51 @@ a.describe {margin-right: 6px}
tr:hover {
background-color: #ddd;}
-#PG { width: 100%;
+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%;
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: 0; padding: 0;
+ margin: 40px 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 }
@@ -92,7 +103,7 @@ tr:hover {
-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 {
@@ -116,23 +127,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;
}
@@ -143,7 +154,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; }
@@ -155,7 +166,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;}
@@ -181,8 +192,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;}
@@ -199,10 +210,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;}
@@ -210,17 +221,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;}
@@ -229,28 +240,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;
}
@@ -258,15 +269,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;}
@@ -286,7 +297,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;
@@ -302,7 +313,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;
@@ -310,13 +321,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 }
@@ -336,15 +347,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;}
+#fct_nav h3 { margin: 0; padding: 0; color: #445; }
#fct_nav ul { list-style-type: none; padding: 0; margin: 0;}
#fct_nav ul li { list-style-type: none;}
@@ -363,16 +374,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; }
@@ -383,11 +394,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 {
@@ -421,25 +432,52 @@ 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 {
@@ -448,7 +486,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;
@@ -459,6 +497,11 @@ 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;}
@@ -473,8 +516,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;
@@ -482,12 +525,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;
}
@@ -495,13 +538,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; }
@@ -510,10 +553,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; }
+#demo_queries_ctr { margin: 10px; min-height: 200px}
ul.demo_qry_list {
list-style-type: none;
@@ -525,12 +568,14 @@ 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.pivot_pg a,
+span.advisory { font-weight: bold; }
+
+span.pivot_pg a,
span.pivot_qrcode_opts a,
span.pivot_link_opts a { text-decoration: none; }
@@ -545,10 +590,16 @@ div#nav {
margin-left: 50px;
}
-a#sp_link { font-size: 11pt; font-weight:normal; }
+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 }
-#qrcode { position:fixed; top:100px; right: 30px; z-index: 0; }
+.addthis_toolbox { margin: 20px 10px auto; }
-#FT_share { float: center; clear: both; text-align: center; }
+#FT_share .addthis_toolbox { margin: 0 }
-.addthis_toolbox { width: 400px; margin: 0 auto; }
diff --git a/binsrc/b3s/sum.sql b/binsrc/b3s/sum.sql
index e87d362..93e8970 100644
--- a/binsrc/b3s/sum.sql
+++ b/binsrc/b3s/sum.sql
@@ -1,10 +1,10 @@
--
--- $Id: sum.sql,v 1.1.2.6 2010/02/01 12:44:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -20,9 +20,10 @@
-- 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');
@@ -53,13 +54,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)
{
@@ -67,7 +68,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)
{
@@ -89,8 +90,15 @@ create procedure sum_o_p_score (inout o any, inout p any)
}
;
-
-create procedure sum_result (inout final any, inout res any, inout text_exp any, inout s varchar, inout start_inx int, inout end_inx int, inout s_rank real, inout lbl any)
+create procedure sum_result (inout final any,
+ inout res any,
+ inout text_exp any,
+ inout s varchar,
+ inout start_inx int,
+ inout end_inx int,
+ inout s_rank real,
+ inout lbl any,
+ inout g any)
{
declare sorted, inx, tot, exc, elt, tsum any;
tsum := 0;
@@ -107,11 +115,12 @@ 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', xmlattributes ('url' as "datatype", fct_short_form (g) as "shortform"), g),
xmlelement ('column', exc)
);
xte_nodebld_xmlagg_acc (final, elt);
@@ -127,8 +136,9 @@ create procedure sum_final (inout x any)
create procedure s_sum_page_s (in rows any, in text_exp varchar)
{
+-- dbg_obj_print (rows);
/* fill the os and translate the iris and make sums */
- declare inx, s, prev_s, prev_fill, fill, inx2, n, s_rank, lbl any;
+ declare inx, s, g, prev_s, prev_fill, fill, inx2, n, s_rank, lbl any;
declare dp, os, res, final any;
declare lng_pref any;
lng_pref := connection_get ('langs');
@@ -142,14 +152,15 @@ 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);
+ g := ID_TO_IRI (rows[inx][2]);
prev_fill := fill;
for (inx2 := 3; inx2 < os[1] + 3; inx2 := inx2 + 3)
{
@@ -158,7 +169,7 @@ create procedure s_sum_page_s (in rows any, in text_exp varchar)
res[fill + 2] := os[inx2 + 2];
fill := fill + 3;
}
- sum_result (final, res, text_exp, s, prev_fill, fill, s_rank, lbl);
+ sum_result (final, res, text_exp, s, prev_fill, fill, s_rank, lbl, g);
}
return sum_final (final);
}
@@ -167,39 +178,40 @@ create procedure s_sum_page_s (in rows any, in text_exp varchar)
create procedure s_sum_page_c (in rows any, in text_exp varchar)
{
/* fill the os and translate the iris and make sums */
- declare inx, s, prev_s, prev_fill, fill, inx2, n, s_rank, lbl any;
+ declare inx, s, g, prev_s, prev_fill, fill, inx2, n, s_rank, lbl any;
declare dp, os, so, res, final any;
declare lng_pref any;
lng_pref := connection_get ('langs');
- dp := dpipe (1, 'ID_TO_IRI', '__RO2SQ', 'FCT_LABEL_L');
+ dp := dpipe (1, 'ID_TO_IRI', '__RO2SQ', 'FCT_LABEL_L', 'ID_TO_IRI');
xte_nodebld_init (final);
for (inx := 0; inx < length (rows); inx := inx + 1)
{
os := aref (rows, inx, 1);
for (inx2 := 3; inx2 < os[1] + 3; inx2 := inx2 + 3)
- dpipe_input (dp, aref (rows, inx, 0), os[inx2], vector (aref (rows, inx, 0), 0, 'facets', lng_pref));
+ dpipe_input (dp, aref (rows, inx, 0),os[inx2], vector (aref (rows, inx, 0), 0, 'facets', lng_pref), aref (rows, inx, 2));
}
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];
+ g := so[3];
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);
+ sum_result (final, res, text_exp, s, prev_fill, fill, s_rank, lbl, g);
}
dpipe_next (dp, 1);
--sum_result (final, res, text_exp, s, prev_fill, fill, s_rank);
@@ -289,8 +301,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);
@@ -301,7 +313,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 b207b75..0b08e2f 100644
--- a/binsrc/b3s/vad_version
+++ b/binsrc/b3s/vad_version
@@ -1 +1 @@
-1.10.55
+1.11.98
diff --git a/binsrc/b3s/www/about.html b/binsrc/b3s/www/about.html
index 4494433..961fcd1 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.1 2009/04/17 11:07:30 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/b3s/www/dlistall.vsp b/binsrc/b3s/www/dlistall.vsp
index ba4c408..31c704f 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.5 2010/02/01 12:44:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 a35793c..eaac863 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.7 2011/09/23 19:22:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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-2011 OpenLink Software
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2012 OpenLink Software
</div> <!-- #ft_b -->
</div> <!-- #footer -->
</body>
diff --git a/binsrc/b3s/www/nspref.vsp b/binsrc/b3s/www/nspref.vsp
index faeea0c..f76bd09 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.2 2009/05/01 19:39:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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 d2b6275..df9e5e8 100644
--- a/binsrc/b3s/www/search.sql
+++ b/binsrc/b3s/www/search.sql
@@ -1,10 +1,10 @@
--
--- $Id: search.sql,v 1.1.2.11 2011/09/23 19:22:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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,13 +577,14 @@ 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
@@ -943,7 +944,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 b0db7f3..c6b3265 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.9 2011/09/23 19:22:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -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-2011 OpenLink Software
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2012 OpenLink Software
</div> <!-- #ft_b -->
</div> <!-- #footer -->
</body>
diff --git a/binsrc/b3s/www/style.css b/binsrc/b3s/www/style.css
index b1ccd8b..1c7910d 100644
--- a/binsrc/b3s/www/style.css
+++ b/binsrc/b3s/www/style.css
@@ -1,10 +1,10 @@
/*
- * $Id: style.css,v 1.1.2.2 2011/09/23 19:22:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -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 37bb068..ed29906 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl b/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl
index ff15ba0..6572ac0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/101.HelloWorld/HelloWorld.xml b/binsrc/bpel/101.HelloWorld/HelloWorld.xml
index de454d1..d1cf987 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/101.HelloWorld/build.xml b/binsrc/bpel/101.HelloWorld/build.xml
index 1d35028..bff4ada 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/106.ParallelFlows/FlowSample.bpel b/binsrc/bpel/106.ParallelFlows/FlowSample.bpel
index 4a78f25..701982a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl b/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl
index 0ceab05..915dc34 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/106.ParallelFlows/bpel.xml b/binsrc/bpel/106.ParallelFlows/bpel.xml
index 79b46c0..aef1322 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/106.ParallelFlows/build.xml b/binsrc/bpel/106.ParallelFlows/build.xml
index f6cc83d..d6f7667 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel
index fbfa43f..bfe8c97 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl
index d69d213..4963d75 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml b/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml
index c0e6f41..e641c60 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/build.xml b/binsrc/bpel/109.CorrelationSets/Buyer/build.xml
index 4cc1ad8..3299f75 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl
index a8e96ee..4117bf6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl
index f452b55..1f59b7a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel b/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel
index b5fe71e..8bc0b1b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl
index 9f71b02..d363245 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml b/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml
index 306ce10..3f4855b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/build.xml b/binsrc/bpel/109.CorrelationSets/Seller/build.xml
index bb38348..133ff6f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl
index a8e96ee..4117bf6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl
index f452b55..1f59b7a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/build.xml b/binsrc/bpel/109.CorrelationSets/build.xml
index b8ab8b5..e0ae3d2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl
index a8e96ee..4117bf6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl
index f452b55..1f59b7a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/Makefile.am b/binsrc/bpel/Makefile.am
index 29121b3..33445dc 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/bpel/Makefile.in b/binsrc/bpel/Makefile.in
index a5e36d5..0982fd5 100644
--- a/binsrc/bpel/Makefile.in
+++ b/binsrc/bpel/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -541,14 +521,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/bpel/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/bpel/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/bpel/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/bpel/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -566,7 +546,6 @@ $(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
@@ -576,23 +555,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -616,17 +592,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -658,7 +630,6 @@ clean-generic:
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"
@@ -677,8 +648,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -687,28 +656,18 @@ 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
@@ -749,7 +708,6 @@ bpel_dav.vad bpel_filesystem.vad: $(EXTRA_DIST)
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/bpel/activity.vspx b/binsrc/bpel/activity.vspx
index 9c04afe..6d1c260 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/activity.xsl b/binsrc/bpel/activity.xsl
index 7204694..5462343 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/asyncall.vsp b/binsrc/bpel/asyncall.vsp
index 819fd1a..0f7632f 100644
--- a/binsrc/bpel/asyncall.vsp
+++ b/binsrc/bpel/asyncall.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: asyncall.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/bpel.vsp b/binsrc/bpel/bpel.vsp
index 3968d72..e76b3b0 100644
--- a/binsrc/bpel/bpel.vsp
+++ b/binsrc/bpel/bpel.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: bpel.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/bpel.xsd b/binsrc/bpel/bpel.xsd
index 81fee5d..df81139 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_adaptor.cs b/binsrc/bpel/bpel_adaptor.cs
index 1204148..d4bb83c 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/bpel/bpel_confirm.vspx b/binsrc/bpel/bpel_confirm.vspx
index 7ebde61..fe4d8ab 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 2006/08/16 00:04:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_ddl.sql b/binsrc/bpel/bpel_ddl.sql
index 553416c..7b292c8 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 2006/04/11 17:56:09 source Exp $
+-- $Id$
--
-- BPEL DB Schema
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/bpel_decor.vspx b/binsrc/bpel/bpel_decor.vspx
index e6d9ce0..a38d3d1 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 2006/08/16 00:04:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_eng.sql b/binsrc/bpel/bpel_eng.sql
index 31d08d2..9f462de 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 2008/07/14 19:23:11 source Exp $
+-- $Id$
--
-- BPEL Script compilation & utilities
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/bpel_intrp.sql b/binsrc/bpel/bpel_intrp.sql
index 921fa7e..068d57e 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 2007/03/14 14:23:25 source Exp $
+-- $Id$
--
-- BPEL Intrepreter
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/bpel_login.vspx b/binsrc/bpel/bpel_login.vspx
index efb0ae7..13ea4c1 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 2006/08/16 00:04:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_login_new.vspx b/binsrc/bpel/bpel_login_new.vspx
index 4e4c4db..f24b299 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_navigation_bar.vspx b/binsrc/bpel/bpel_navigation_bar.vspx
index 33f9ea5..49cdf2d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_plinks.xsl b/binsrc/bpel/bpel_plinks.xsl
index a15cf0c..15d5837 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_style.xsl b/binsrc/bpel/bpel_style.xsl
index ce97469..3352ea1 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.1 2010/01/07 16:58:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_style_new.xsl b/binsrc/bpel/bpel_style_new.xsl
index 7596521..ff8cd86 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.1 2010/01/07 16:58:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx b/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx
index f5822e0..256f9da 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx b/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx
index 15da4c7..8aa2fab 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_ui_import.vspx b/binsrc/bpel/bpel_ui_import.vspx
index e93ece9..aad6b2d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpel_ui_import2.vspx b/binsrc/bpel/bpel_ui_import2.vspx
index 41d1f6b..a614a5d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelcomp.xsl b/binsrc/bpel/bpelcomp.xsl
index 78cd0f1..8d9b02f 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelexpn.xsl b/binsrc/bpel/bpelexpn.xsl
index 3446fc7..f2ac65c 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelimport.xsl b/binsrc/bpel/bpelimport.xsl
index 5e16002..bd723f8 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelmsg.xsl b/binsrc/bpel/bpelmsg.xsl
index 042b266..6366ce1 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelmsgen.xsl b/binsrc/bpel/bpelmsgen.xsl
index 6a286d7..84be891 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpeloper.xsl b/binsrc/bpel/bpeloper.xsl
index b2a000e..04b161d 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelstatus.xsl b/binsrc/bpel/bpelstatus.xsl
index c1ca02c..db881f3 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelv.xsd b/binsrc/bpel/bpelv.xsd
index 1705d7a..bc5892e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelwsdl.xsl b/binsrc/bpel/bpelwsdl.xsl
index 620c3fb..7a4212a 100644
--- a/binsrc/bpel/bpelwsdl.xsl
+++ b/binsrc/bpel/bpelwsdl.xsl
@@ -5,12 +5,12 @@
]>
<!--
-
- - $Id: bpelwsdl.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/bpelx.xsd b/binsrc/bpel/bpelx.xsd
index 39be785..0ac3b25 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/browser.vspx b/binsrc/bpel/browser.vspx
index 8f89c35..b9ac468 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/common.xsl b/binsrc/bpel/common.xsl
index 542981a..e68aae6 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/configure.vspx b/binsrc/bpel/configure.vspx
index 3b9f68d..40b0f09 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/debug.vsp b/binsrc/bpel/debug.vsp
index 9d288d2..70a6411 100644
--- a/binsrc/bpel/debug.vsp
+++ b/binsrc/bpel/debug.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: debug.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/default.css b/binsrc/bpel/default.css
index c37b771..5df96d8 100644
--- a/binsrc/bpel/default.css
+++ b/binsrc/bpel/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/bpel/drop.sql b/binsrc/bpel/drop.sql
index da9b7a7..c79e379 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 2006/04/11 17:56:09 source Exp $
+-- $Id$
--
-- BPEL uninstall operations
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/drop_prc.sql b/binsrc/bpel/drop_prc.sql
index b0fde83..befacde 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 2006/04/11 17:56:09 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/error.vspx b/binsrc/bpel/error.vspx
index 6220cc9..66584bb 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/filesystem.sql b/binsrc/bpel/filesystem.sql
index 4f755e4..87b24c9 100644
--- a/binsrc/bpel/filesystem.sql
+++ b/binsrc/bpel/filesystem.sql
@@ -1,10 +1,10 @@
--
--- $Id: filesystem.sql,v 1.2 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/genwsdl.xsl b/binsrc/bpel/genwsdl.xsl
index 4a952e5..e44ee4c 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help.vspx b/binsrc/bpel/help.vspx
index 3df5016..1d10380 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help.xsl b/binsrc/bpel/help.xsl
index 4054e9d..f6191fd 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/browser.xml b/binsrc/bpel/help/browser.xml
index 0147017..77159e4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/configure.xml b/binsrc/bpel/help/configure.xml
index e0fd598..9eb93e1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/confirm.xml b/binsrc/bpel/help/confirm.xml
index 962827c..52af26c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/imsgpr.xml b/binsrc/bpel/help/imsgpr.xml
index f5fdeeb..7b71a9e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/incoming.xml b/binsrc/bpel/help/incoming.xml
index a6d1eaa..d62b440 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/instances.xml b/binsrc/bpel/help/instances.xml
index 0eb27b3..45e4e54 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/message.xml b/binsrc/bpel/help/message.xml
index f0ae746..2abdb61 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/omsgpr.xml b/binsrc/bpel/help/omsgpr.xml
index bfef33d..933048c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/plinks.xml b/binsrc/bpel/help/plinks.xml
index eac85e2..07a91f7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/plinks_props.xml b/binsrc/bpel/help/plinks_props.xml
index e5343fc..59fc970 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/process_activity.xml b/binsrc/bpel/help/process_activity.xml
index aeae5c1..160a51d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/process_audit.xml b/binsrc/bpel/help/process_audit.xml
index dbfbb06..7253ed3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/process_graph.xml b/binsrc/bpel/help/process_graph.xml
index 1d4b97e..4b3c572 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/process_list.xml b/binsrc/bpel/help/process_list.xml
index 9bfb1ff..125c7c8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/process_redef.xml b/binsrc/bpel/help/process_redef.xml
index da2ec3e..dada4dd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/process_redefine.xml b/binsrc/bpel/help/process_redefine.xml
index 363f0b6..f35a85d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/process_status.xml b/binsrc/bpel/help/process_status.xml
index 6c5339a..ffc69bb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/process_upload.xml b/binsrc/bpel/help/process_upload.xml
index c91d896..12922e4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/processes_list.xml b/binsrc/bpel/help/processes_list.xml
index 9523afd..f2dc5bf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/reports.xml b/binsrc/bpel/help/reports.xml
index 6791766..0176961 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/rmsgpr.xml b/binsrc/bpel/help/rmsgpr.xml
index 9de6dd1..ca8d078 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/statendp.xml b/binsrc/bpel/help/statendp.xml
index 3f2442e..e8055fa 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/statproc.xml b/binsrc/bpel/help/statproc.xml
index 147dc5d..bd63e10 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/help/wss_keys.xml b/binsrc/bpel/help/wss_keys.xml
index ff26b93..b072149 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/home.vspx b/binsrc/bpel/home.vspx
index 3081b93..411817c 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 2008/04/18 14:05:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/imsgpr.vspx b/binsrc/bpel/imsgpr.vspx
index ab9d999..0806e9d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/incoming.vspx b/binsrc/bpel/incoming.vspx
index bef19ae..4f22708 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/install.sql b/binsrc/bpel/install.sql
index 9321253..3212368 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 2006/04/11 17:56:09 source Exp $
+-- $Id$
--
-- BPEL support procedures
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/instances.vspx b/binsrc/bpel/instances.vspx
index 4dd1666..a6199ec 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/main_tabs.vspx b/binsrc/bpel/main_tabs.vspx
index 8aff065..280e595 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/make_vad.sh b/binsrc/bpel/make_vad.sh
index 74ae80b..58d245b 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.2 2011/02/03 10:36:50 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -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-2011 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
diff --git a/binsrc/bpel/message.vspx b/binsrc/bpel/message.vspx
index d66f56d..dd28e95 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/omsgpr.vspx b/binsrc/bpel/omsgpr.vspx
index bfc2fd9..0eb21cd 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/plinks.vspx b/binsrc/bpel/plinks.vspx
index 1c3d209..e2afeb8 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/plinks_props.vspx b/binsrc/bpel/plinks_props.vspx
index a39c6f1..d57d3f5 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/process.sql b/binsrc/bpel/process.sql
index e4adb99..279269f 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 2006/04/11 17:56:09 source Exp $
+-- $Id$
--
-- BPEL support view/procedures
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/process.vspx b/binsrc/bpel/process.vspx
index a43e289..dfae691 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/process.xsl b/binsrc/bpel/process.xsl
index 5adc71e..b000df4 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/raw.xsl b/binsrc/bpel/raw.xsl
index e862a9b..c68e267 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/reports.vspx b/binsrc/bpel/reports.vspx
index 8c85ff0..9f5dd72 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/rmsgpr.vspx b/binsrc/bpel/rmsgpr.vspx
index 6e11572..da74e16 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/script.vspx b/binsrc/bpel/script.vspx
index da34646..0890195 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/script.xsl b/binsrc/bpel/script.xsl
index 0f5f1c4..35f318e 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/start.vsp b/binsrc/bpel/start.vsp
index e874e0d..20a03c2 100644
--- a/binsrc/bpel/start.vsp
+++ b/binsrc/bpel/start.vsp
@@ -1,12 +1,12 @@
<html>
<?vsp
--
--- $Id: start.vsp,v 1.2.2.1 2010/01/07 16:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/statendp.vspx b/binsrc/bpel/statendp.vspx
index fdb1199..cf0c1c3 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/statproc.vspx b/binsrc/bpel/statproc.vspx
index b146619..3b5521f 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/status.vspx b/binsrc/bpel/status.vspx
index bd78cbf..82eaa35 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/system/bpel/bpel.xsd b/binsrc/bpel/system/bpel/bpel.xsd
index ff6ddfb..b95465a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/Flow/Flow.bpel b/binsrc/bpel/tests/Flow/Flow.bpel
index 9eeb3c3..9332f51 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/Flow/Flow.wsdl b/binsrc/bpel/tests/Flow/Flow.wsdl
index 05b7066..c449d14 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/Flow/bpel.xml b/binsrc/bpel/tests/Flow/bpel.xml
index 4edfc6b..6eca9ec 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/Flow/build.xml b/binsrc/bpel/tests/Flow/build.xml
index 17f7bf4..1005814 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/Flow/ini.sql b/binsrc/bpel/tests/Flow/ini.sql
index a6e8276..0936e5d 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/Flow/test_tutorial.sql b/binsrc/bpel/tests/Flow/test_tutorial.sql
index d900ff3..f1b420e 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/LoanFlow/CreditRating.vsp b/binsrc/bpel/tests/LoanFlow/CreditRating.vsp
index e1d9d09..02d09e5 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel b/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel
index 4079cba..c56472f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.sql b/binsrc/bpel/tests/LoanFlow/LoanFlow.sql
index 5ebc7bb..edb556b 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp b/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp
index ebcfd19..236dcf1 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl b/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl
index c48a83e..df63a21 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.xml b/binsrc/bpel/tests/LoanFlow/LoanFlow.xml
index f93fb11..b4654aa 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp b/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp
index ff457f1..904ef7c 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/LoanFlow/StarLoan.vsp b/binsrc/bpel/tests/LoanFlow/StarLoan.vsp
index 438382e..a377990 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp b/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp
index fa6431d..571644d 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/LoanFlow/bpel.xml b/binsrc/bpel/tests/LoanFlow/bpel.xml
index 0e43146..e15c3e2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/LoanFlow/options.xml b/binsrc/bpel/tests/LoanFlow/options.xml
index 4662044..cdd972c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml b/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml
index 0d03404..95a3c78 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/bpel_engines/Twister/new.xml b/binsrc/bpel/tests/bpel_engines/Twister/new.xml
index ac842ae..3a727e1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/bpel.xml b/binsrc/bpel/tests/echo/bpel.xml
index cb7cd41..aaa4b6a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/build.xml b/binsrc/bpel/tests/echo/build.xml
index bde727d..6b349da 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/doc.bpel b/binsrc/bpel/tests/echo/doc.bpel
index 25fe08d..25eec36 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/doc.wsdl b/binsrc/bpel/tests/echo/doc.wsdl
index c354725..a5b4c3e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/echo.bpel b/binsrc/bpel/tests/echo/echo.bpel
index a7fcfeb..6d7dac7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/echo.vsp b/binsrc/bpel/tests/echo/echo.vsp
index 9c841b2..91d5a62 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/echo/echo.wsdl b/binsrc/bpel/tests/echo/echo.wsdl
index f1aeb28..691b36d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/echo.xml b/binsrc/bpel/tests/echo/echo.xml
index f0c3f5a..1920880 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/ini.sh b/binsrc/bpel/tests/echo/ini.sh
index 370798b..ae3b720 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/bpel/tests/echo/ini.sql b/binsrc/bpel/tests/echo/ini.sql
index 3044fbd..e2628ca 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/echo/options.xml b/binsrc/bpel/tests/echo/options.xml
index 0079d45..ce971ec 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/sdoc.wsdl b/binsrc/bpel/tests/echo/sdoc.wsdl
index 3c46dc4..ee73ce1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echo/svc.sql b/binsrc/bpel/tests/echo/svc.sql
index 84529fb..40d5439 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/echo/synsvc.wsdl b/binsrc/bpel/tests/echo/synsvc.wsdl
index 8cc2985..d0c040f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echovirt/bpel.xml b/binsrc/bpel/tests/echovirt/bpel.xml
index b777206..eb96ab4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echovirt/build.xml b/binsrc/bpel/tests/echovirt/build.xml
index d1fa920..3782c20 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echovirt/echovirt.bpel b/binsrc/bpel/tests/echovirt/echovirt.bpel
index d00de0b..ee20184 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echovirt/echovirt.wsdl b/binsrc/bpel/tests/echovirt/echovirt.wsdl
index 9f6dee0..45f02d7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echovirt/echovirtNew.bpel b/binsrc/bpel/tests/echovirt/echovirtNew.bpel
index 96b47e4..d002932 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/echovirt/ini.sql b/binsrc/bpel/tests/echovirt/ini.sql
index df28b6e..313f70a 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/Restart.bpel b/binsrc/bpel/tests/fault1/Restart.bpel
index 4b72ad8..5dd2b27 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/Restart.wsdl b/binsrc/bpel/tests/fault1/Restart.wsdl
index aac4670..535211e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel b/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel
index 744c461..f31c25c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl b/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl
index 8521658..ae6ede9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/While.bpel b/binsrc/bpel/tests/fault1/While.bpel
index 76ce2da..b5481fd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/While.wsdl b/binsrc/bpel/tests/fault1/While.wsdl
index 9ca48b8..f851487 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/check.sql b/binsrc/bpel/tests/fault1/check.sql
index d3afd46..a386cef 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/check2.sql b/binsrc/bpel/tests/fault1/check2.sql
index aace7c3..ae67778 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/clr.sql b/binsrc/bpel/tests/fault1/clr.sql
index aad9049..85eccae 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec.bpel b/binsrc/bpel/tests/fault1/clr_exec.bpel
index d89e401..6cf8da9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec.vsp b/binsrc/bpel/tests/fault1/clr_exec.vsp
index 3898381..91d5a62 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec.wsdl b/binsrc/bpel/tests/fault1/clr_exec.wsdl
index db21462..6828971 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec.xml b/binsrc/bpel/tests/fault1/clr_exec.xml
index 40368af..81865fd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec_bpel.xml b/binsrc/bpel/tests/fault1/clr_exec_bpel.xml
index 06674eb..b8de196 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec_desc.xml b/binsrc/bpel/tests/fault1/clr_exec_desc.xml
index 507fe5a..2ec04bf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/comp1.bpel b/binsrc/bpel/tests/fault1/comp1.bpel
index d59cbc7..bdcd68b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/fault.bpel b/binsrc/bpel/tests/fault1/fault.bpel
index 850fd14..d660b0b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/fault.wsdl b/binsrc/bpel/tests/fault1/fault.wsdl
index 47bca3a..e5f8ad6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/fault2.bpel b/binsrc/bpel/tests/fault1/fault2.bpel
index 6b3d5dd..edd8e5a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/fault3.bpel b/binsrc/bpel/tests/fault1/fault3.bpel
index 0b2e019..358f04e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/faultHTCLI.bpel b/binsrc/bpel/tests/fault1/faultHTCLI.bpel
index 26c69c9..9e294a3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/incsvcwsdl.vsp b/binsrc/bpel/tests/fault1/incsvcwsdl.vsp
index 3822abf..0a5d620 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/ini.sql b/binsrc/bpel/tests/fault1/ini.sql
index 56486fb..cfc5572 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 2008/01/18 13:57:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/ini2.sql b/binsrc/bpel/tests/fault1/ini2.sql
index 1dd7058..b869da7 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/inv.sql b/binsrc/bpel/tests/fault1/inv.sql
index b2fcaa4..9cebcf7 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/java.sql b/binsrc/bpel/tests/fault1/java.sql
index 146d552..5c45b93 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/java_exec.bpel b/binsrc/bpel/tests/fault1/java_exec.bpel
index b6a1c99..31b95cc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/java_exec.vsp b/binsrc/bpel/tests/fault1/java_exec.vsp
index 69c133b..91d5a62 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/java_exec.wsdl b/binsrc/bpel/tests/fault1/java_exec.wsdl
index 853efd9..90349ee 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/java_exec.xml b/binsrc/bpel/tests/fault1/java_exec.xml
index 040cd40..e39322d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/java_exec_bpel.xml b/binsrc/bpel/tests/fault1/java_exec_bpel.xml
index 7075fe5..193bba0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/java_exec_desc.xml b/binsrc/bpel/tests/fault1/java_exec_desc.xml
index f76fdf5..a154c3e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/servicewsdl.vsp b/binsrc/bpel/tests/fault1/servicewsdl.vsp
index 81db99d..a596ac2 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fault1/sql_exec.bpel b/binsrc/bpel/tests/fault1/sql_exec.bpel
index c4c34d0..c767af2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fault1/sql_exec.wsdl b/binsrc/bpel/tests/fault1/sql_exec.wsdl
index 7faed29..a4c7e29 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/bpel.xml b/binsrc/bpel/tests/fi/bpel.xml
index 8ddeae9..3a84f6d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/fi.bpel b/binsrc/bpel/tests/fi/fi.bpel
index 97afc9e..f0bc700 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/fi.vsp b/binsrc/bpel/tests/fi/fi.vsp
index a7efa52..236dcf1 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fi/fi.wsdl b/binsrc/bpel/tests/fi/fi.wsdl
index 0c59a3e..90b0479 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/fi.xml b/binsrc/bpel/tests/fi/fi.xml
index d6e3efa..8a40bc8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/fi_wsdl.vsp b/binsrc/bpel/tests/fi/fi_wsdl.vsp
index c08051f..aca2df3 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fi/fia.bpel b/binsrc/bpel/tests/fi/fia.bpel
index fea6402..4515709 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/fia.wsdl b/binsrc/bpel/tests/fi/fia.wsdl
index 31fa413..644ff68 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/fib.bpel b/binsrc/bpel/tests/fi/fib.bpel
index 9336496..3583609 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/fib.wsdl b/binsrc/bpel/tests/fi/fib.wsdl
index 0bc0521..67c2356 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/ini.sql b/binsrc/bpel/tests/fi/ini.sql
index b0dba41..7a17108 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fi/inv.sql b/binsrc/bpel/tests/fi/inv.sql
index 9f4ad51..cdf053f 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/fi/options.xml b/binsrc/bpel/tests/fi/options.xml
index f95179b..e03f0e6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/fi/service.vsp b/binsrc/bpel/tests/fi/service.vsp
index 60a680a..aca2df3 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/index.vsp b/binsrc/bpel/tests/index.vsp
index 0f454ee..6cef0d5 100644
--- a/binsrc/bpel/tests/index.vsp
+++ b/binsrc/bpel/tests/index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/index.xml b/binsrc/bpel/tests/index.xml
index a09b76f..fb37727 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel
index a670f90..05e32b9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel
index 90cff9d..2a2bc2e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel
index 37ff055..48e8089 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel
index 1eeca1a..1a75423 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel
index ba1ce50..7121ccf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel
index adb16b4..c92354f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01.sql b/binsrc/bpel/tests/interop/UseCases/MS01.sql
index 17a96b4..ea5f8af 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01.wsdl b/binsrc/bpel/tests/interop/UseCases/MS01.wsdl
index 785db0a..9482fd7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/UseCases/UseCases.vsp b/binsrc/bpel/tests/interop/UseCases/UseCases.vsp
index 3399e5f..91d5a62 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/UseCases/UseCases.xml b/binsrc/bpel/tests/interop/UseCases/UseCases.xml
index dbd9840..ee76e28 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel b/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel
index ebccc7b..09d84f0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.sql b/binsrc/bpel/tests/interop/WSE2.0/Sec.sql
index 6a4faf8..6bfe182 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl b/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl
index c354725..a5b4c3e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs b/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs
index cbea66b..72c9cf2 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl b/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl
index e722eea..bcc7fec 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-2006 OpenLink Software
+ - 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
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 840e5cf..c3bffec 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/bpel.xml b/binsrc/bpel/tests/interop/site/Aecho/bpel.xml
index c06f6a9..0a1f24a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/desc.xml b/binsrc/bpel/tests/interop/site/Aecho/desc.xml
index 61defb8..0661425 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.bpel b/binsrc/bpel/tests/interop/site/Aecho/echo.bpel
index 97cd5ae..5bee9db 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.sql b/binsrc/bpel/tests/interop/site/Aecho/echo.sql
index 0d2114c..1bac542 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl b/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl
index 217019e..dff997c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp
index add2bc1..95e605c 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel
index 3d38e1d..5dd513b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql
index ce65d66..8a15d5f 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl
index c48a83e..df63a21 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql
index 95f0e67..c1017bb 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp
index 8b376c3..91d5a62 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml
index 4c34afb..2ecd257 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp
index 79e4ac6..4be3021 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp
index 6c0090e..17d8c62 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml b/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml
index 0e43146..e15c3e2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/desc.xml b/binsrc/bpel/tests/interop/site/RMLoan/desc.xml
index d5c3ef2..3ca365c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/options.xml b/binsrc/bpel/tests/interop/site/RMLoan/options.xml
index f757ba4..3b0bc6f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/bpel.xml b/binsrc/bpel/tests/interop/site/RMecho/bpel.xml
index 06817ae..b93f47b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/desc.xml b/binsrc/bpel/tests/interop/site/RMecho/desc.xml
index bd8ecae..10ddab3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.bpel b/binsrc/bpel/tests/interop/site/RMecho/echo.bpel
index b051db5..59819b3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.sql b/binsrc/bpel/tests/interop/site/RMecho/echo.sql
index 2d37a51..7a61f4d 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl b/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl
index 6366360..66f9f7c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml b/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml
index 656c0f2..8df179a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/desc.xml b/binsrc/bpel/tests/interop/site/SecAecho/desc.xml
index 885adf0..160f053 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel b/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel
index 8c58cf0..407ab9b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.sql b/binsrc/bpel/tests/interop/site/SecAecho/echo.sql
index d5d97c9..721e6bf 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl b/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl
index 217019e..dff997c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp
index 847dbb8..2bd78b1 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel
index 3d38e1d..5dd513b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql
index 24e64c2..98a593d 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl
index c48a83e..df63a21 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql
index c654fbb..b00bd4e 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp
index 3ad4cb1..236dcf1 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml
index aeb9c5c..a746e58 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp
index e47dd3d..7915adc 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp
index 0843808..79b23ea 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml b/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml
index 0e43146..e15c3e2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/desc.xml b/binsrc/bpel/tests/interop/site/SecLoan/desc.xml
index 4a45c40..e9fac6a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/options.xml b/binsrc/bpel/tests/interop/site/SecLoan/options.xml
index f757ba4..3b0bc6f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp
index 847dbb8..2bd78b1 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel
index 3d38e1d..5dd513b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql
index d826372..6e70ece 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl
index c48a83e..df63a21 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql
index 51780c4..21ab567 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp
index fcbd68b..91d5a62 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml
index a1a369c..ba9ab5b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp
index c134556..5f7bfee 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp
index 1f8ab57..1442c83 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml
index 0e43146..e15c3e2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml
index a186901..f477f6e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml
index f757ba4..3b0bc6f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp
index 059ba12..62bf76b 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx
index dec94e4..572fb78 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl
index ab06bef..19d0a6b 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp
index 20b75e3..625d9fb 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx
index 70ac1a4..ea0587e 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl
index 7e5fa22..7b2f0e1 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx
index 8a9aa54..8a42710 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx
index bcb293f..39a8587 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx
index 5fa33b1..dc33cce 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx
index 06590b5..061e9b4 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx
index 212c5c3..10a522b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx
index e2aa7a9..6c8db25 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx
index ec4e7d1..89de7bc 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx
index c5003d4..d12da1a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx
index 8519f6a..24b4937 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl
index 6fac2cc..5f8049b 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/default.css b/binsrc/bpel/tests/interop/site/bpel4ws/default.css
index 26224ba..853e00c 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 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx
index b616afe..354272d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx
index 7ba2e0b..25c96cc 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 2006/08/17 18:27:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp
index 28ff040..0dbb99e 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl
index 3b82487..20c4b29 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-2011 OpenLink Software</xsl:text>
+ <xsl:text disable-output-escaping="yes">Copyright © 1998-2012 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 8fa4fba..e34b30c 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql b/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql
index ef86905..57c631a 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx
index 10bb3f4..be70089 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 5769aba..beb429b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl
index c1efbb4..661aef2 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.1 2010/01/07 16:58:12 source Exp $
+ - $Id$
-
- 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql b/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql
index 476e9d4..901ff94 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx
index eda0591..63094e6 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp
index 1554c6f..ab34d4c 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx
index d5720e1..81f909c 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl
index 40320e0..c310c5f 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp
index dc1777c..d7920d7 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx
index 6c59e8f..638efb7 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl
index 7557605..526a837 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp
index d48a066..a5e97e2 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx
index b5a2382..63b0566 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml
index 2b5b5e6..eae9dec 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl
index d383c71..ee42d73 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp
index 97e094a..d07da88 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/results.xml b/binsrc/bpel/tests/interop/site/bpel4ws/results.xml
index d115ade..b77a604 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql b/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql
index 846e096..3fa4153 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 2007/01/22 13:11:22 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp
index 283860d..b9a8d59 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx
index e5a8048..d636a01 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl
index 35eb82f..07f0032 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp
index ebf3019..4e77d34 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx
index 7949157..c02fd8c 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl
index 28abe9f..026eb47 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp
index 6cdd9a4..2aa47dd 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx
index 1a679dc..4dadad7 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 2007/01/22 13:11:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl
index 0ce79cc..3ae7361 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 2007/01/22 13:11:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/echo/bpel.xml b/binsrc/bpel/tests/interop/site/echo/bpel.xml
index cb7cd41..aaa4b6a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/echo/desc.xml b/binsrc/bpel/tests/interop/site/echo/desc.xml
index 02ce411..b2fd34f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/echo/echo.bpel b/binsrc/bpel/tests/interop/site/echo/echo.bpel
index a7fcfeb..6d7dac7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/echo/echo.sql b/binsrc/bpel/tests/interop/site/echo/echo.sql
index 1596c5d..75c6885 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/interop/site/echo/echo.wsdl b/binsrc/bpel/tests/interop/site/echo/echo.wsdl
index f1aeb28..691b36d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/index.html b/binsrc/bpel/tests/interop/site/index.html
index dc55c9d..ca23b28 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/interop/site/setup.sql b/binsrc/bpel/tests/interop/site/setup.sql
index 7240a67..b6d2589 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/mix/cmpflow.bpel b/binsrc/bpel/tests/mix/cmpflow.bpel
index a28a015..7a1a932 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/cmpflow.wsdl b/binsrc/bpel/tests/mix/cmpflow.wsdl
index da5ff24..ac431a8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/comp.sql b/binsrc/bpel/tests/mix/comp.sql
index 0401d44..3892d1a 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/mix/comp2.bpel b/binsrc/bpel/tests/mix/comp2.bpel
index 6ee27ec..14ca9e9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/comp2.sql b/binsrc/bpel/tests/mix/comp2.sql
index a9575f4..1a76368 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/mix/comp3.bpel b/binsrc/bpel/tests/mix/comp3.bpel
index 71cc399..5d63cdd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/comp4.bpel b/binsrc/bpel/tests/mix/comp4.bpel
index 15288c4..73cb436 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/comp5.bpel b/binsrc/bpel/tests/mix/comp5.bpel
index 28df1cf..a36f90e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/comp6.bpel b/binsrc/bpel/tests/mix/comp6.bpel
index 13fde8c..ad1c66b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/evcomp.bpel b/binsrc/bpel/tests/mix/evcomp.bpel
index 42bd85f..bfbf69c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/evcomp.wsdl b/binsrc/bpel/tests/mix/evcomp.wsdl
index fd3a22f..8f99f52 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/fault.wsdl b/binsrc/bpel/tests/mix/fault.wsdl
index 7dd9dd8..431638d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/fault4.bpel b/binsrc/bpel/tests/mix/fault4.bpel
index c962760..f16c5f7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/ini.sql b/binsrc/bpel/tests/mix/ini.sql
index 8a11ecc..3cc1c2b 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/mix/ol.bpel b/binsrc/bpel/tests/mix/ol.bpel
index 60b2e93..0619a22 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/ol.wsdl b/binsrc/bpel/tests/mix/ol.wsdl
index 39573f9..12b1d5e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/olservice.wsdl b/binsrc/bpel/tests/mix/olservice.wsdl
index 75e684f..bb8a1c2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/recovery_test.sql b/binsrc/bpel/tests/mix/recovery_test.sql
index a135faa..fa6f6cb 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/mix/sw.bpel b/binsrc/bpel/tests/mix/sw.bpel
index a85c1be..0e39364 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/sw.wsdl b/binsrc/bpel/tests/mix/sw.wsdl
index f6708b6..ed2002d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/testsvc.sql b/binsrc/bpel/tests/mix/testsvc.sql
index 7ea8de4..cbe3cec 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/mix/timesvc.wsdl b/binsrc/bpel/tests/mix/timesvc.wsdl
index ae08460..a2ac835 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/tsvc.wsdl b/binsrc/bpel/tests/mix/tsvc.wsdl
index 0ee62a7..a394849 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/while1.bpel b/binsrc/bpel/tests/mix/while1.bpel
index ec250d6..6d4fab7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/mix/while1.wsdl b/binsrc/bpel/tests/mix/while1.wsdl
index 1de9199..c6454d4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/order/input.xml b/binsrc/bpel/tests/order/input.xml
index aea7857..0b1713a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/order/invoke.sql b/binsrc/bpel/tests/order/invoke.sql
index 2e8f391..3f1e463 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/order/load_all.sql b/binsrc/bpel/tests/order/load_all.sql
index 981892b..064ac5c 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/order/order.bpel b/binsrc/bpel/tests/order/order.bpel
index 32b1a84..2f6a88e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/order/order.sql b/binsrc/bpel/tests/order/order.sql
index a85a065..70f3bd5 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/order/order.wsdl b/binsrc/bpel/tests/order/order.wsdl
index eae0b0f..534feae 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/order/order_svc.sql b/binsrc/bpel/tests/order/order_svc.sql
index 4cf8fe0..ae34edc 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/order/servicewsdl.vsp b/binsrc/bpel/tests/order/servicewsdl.vsp
index a7c7881..a6a37c0 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 2006/08/15 19:30:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/pick/async_svc.sql b/binsrc/bpel/tests/pick/async_svc.sql
index 315bd0d..8f628b1 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/pick/ini.sql b/binsrc/bpel/tests/pick/ini.sql
index 49bddfd..dd9333f 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/pick/inv.sql b/binsrc/bpel/tests/pick/inv.sql
index 59b6e3e..2e3cec2 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/pick/pick.bpel b/binsrc/bpel/tests/pick/pick.bpel
index bfa8015..92aab38 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/pick/pick.wsdl b/binsrc/bpel/tests/pick/pick.wsdl
index e9daccb..5dd721e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/pick/service.wsdl b/binsrc/bpel/tests/pick/service.wsdl
index 9b956fc..43f1241 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/pick1/bpel.xml b/binsrc/bpel/tests/pick1/bpel.xml
index a25c636..a5d2e09 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/pick1/build.xml b/binsrc/bpel/tests/pick1/build.xml
index dcbb88d..baed3a4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/pick1/ini.sql b/binsrc/bpel/tests/pick1/ini.sql
index 12137c2..f97058d 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/pick1/pick1.bpel b/binsrc/bpel/tests/pick1/pick1.bpel
index beb098a..f2ba9be 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/pick1/pick1.wsdl b/binsrc/bpel/tests/pick1/pick1.wsdl
index 3349b9e..451088b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/post/bpel.xml b/binsrc/bpel/tests/post/bpel.xml
index 6e9ddb0..b3cd307 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/post/build.xml b/binsrc/bpel/tests/post/build.xml
index a669be8..c5f0517 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/post/ini.sql b/binsrc/bpel/tests/post/ini.sql
index 3b11af2..0998f98 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/post/post.bpel b/binsrc/bpel/tests/post/post.bpel
index aa310bb..994a5ec 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/post/post.wsdl b/binsrc/bpel/tests/post/post.wsdl
index 05010cd..5ab3d36 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXQuery/XQuerySample.bpel b/binsrc/bpel/tests/processXQuery/XQuerySample.bpel
index 999710d..3ea865f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl b/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl
index 89bdaed..20854d8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXQuery/books.xq b/binsrc/bpel/tests/processXQuery/books.xq
index b6beac7..8dde0a8 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-2006 OpenLink Software
+ : 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
diff --git a/binsrc/bpel/tests/processXQuery/bpel.xml b/binsrc/bpel/tests/processXQuery/bpel.xml
index 01f00aa..f637dd7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXQuery/ini.sql b/binsrc/bpel/tests/processXQuery/ini.sql
index 1c7b9a2..397ac6f 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXQuery/invoice.xq b/binsrc/bpel/tests/processXQuery/invoice.xq
index 3772e7c..177fc35 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-2006 OpenLink Software
+ : 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
diff --git a/binsrc/bpel/tests/processXQuery/options.xml b/binsrc/bpel/tests/processXQuery/options.xml
index 611b229..4f12bb5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXQuery/processXQuery.vsp b/binsrc/bpel/tests/processXQuery/processXQuery.vsp
index cf7a55d..91d5a62 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXQuery/processXQuery.xml b/binsrc/bpel/tests/processXQuery/processXQuery.xml
index 1ace8e3..cb403ca 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSLT/CreditRating.vsp b/binsrc/bpel/tests/processXSLT/CreditRating.vsp
index 5d82db2..c790c01 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXSLT/InvToPo.xslt b/binsrc/bpel/tests/processXSLT/InvToPo.xslt
index 809fe50..852a8b7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.bpel b/binsrc/bpel/tests/processXSLT/XSLTSample.bpel
index bee3828..2addf67 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl b/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl
index c07a131..8d8296d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.xslt b/binsrc/bpel/tests/processXSLT/XSLTSample.xslt
index 2088e8f..2d85bc5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSLT/bpel.xml b/binsrc/bpel/tests/processXSLT/bpel.xml
index d628754..681822f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSLT/ini.sql b/binsrc/bpel/tests/processXSLT/ini.sql
index ba14b92..e12ca07 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXSLT/options.xml b/binsrc/bpel/tests/processXSLT/options.xml
index d4f48e7..be62e8e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.sql b/binsrc/bpel/tests/processXSLT/processXSLT.sql
index c647555..4aab281 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.vsp b/binsrc/bpel/tests/processXSLT/processXSLT.vsp
index 42f6198..91d5a62 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.xml b/binsrc/bpel/tests/processXSLT/processXSLT.xml
index 6f1c716..64bb252 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSQL/XSQLSample.bpel b/binsrc/bpel/tests/processXSQL/XSQLSample.bpel
index c6f39a2..09f6628 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl b/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl
index 04b3ff3..c9875de 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSQL/bpel.xml b/binsrc/bpel/tests/processXSQL/bpel.xml
index 9888f95..f0494dc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSQL/ini.sql b/binsrc/bpel/tests/processXSQL/ini.sql
index 0aba471..582a178 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXSQL/options.xml b/binsrc/bpel/tests/processXSQL/options.xml
index 658bcb9..94ae4cf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSQL/processXSQL.vsp b/binsrc/bpel/tests/processXSQL/processXSQL.vsp
index 2d4b3b5..91d5a62 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXSQL/processXSQL.xml b/binsrc/bpel/tests/processXSQL/processXSQL.xml
index 800b434..f300382 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql b/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql
index c9389a5..f8d3f88 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/processXSQL/selectCustomer.xsql b/binsrc/bpel/tests/processXSQL/selectCustomer.xsql
index cd8aa23..dbfe3cf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/processXSQL/selectProduct.xsql b/binsrc/bpel/tests/processXSQL/selectProduct.xsql
index af3a6ba..d42ae18 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/sqlexec/bpel.xml b/binsrc/bpel/tests/sqlexec/bpel.xml
index 5266c11..be8b88b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/sqlexec/inventory.bpel b/binsrc/bpel/tests/sqlexec/inventory.bpel
index 3a0d509..121b323 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/sqlexec/inventory.wsdl b/binsrc/bpel/tests/sqlexec/inventory.wsdl
index 4572f9a..c853957 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/sqlexec/options.xml b/binsrc/bpel/tests/sqlexec/options.xml
index 46d9823..199c9b4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/sqlexec/sqlexec.vsp b/binsrc/bpel/tests/sqlexec/sqlexec.vsp
index 0c49254..91d5a62 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/sqlexec/sqlexec.xml b/binsrc/bpel/tests/sqlexec/sqlexec.xml
index cf0ff8a..0bf09b3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/sqlexec/store.sql b/binsrc/bpel/tests/sqlexec/store.sql
index 4fd0a58..882a801 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/sqlexec/store.vsp b/binsrc/bpel/tests/sqlexec/store.vsp
index 86834a0..881e717 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/t1/buyer/Buyer.bpel b/binsrc/bpel/tests/t1/buyer/Buyer.bpel
index fbfa43f..bfe8c97 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t1/buyer/Buyer.wsdl b/binsrc/bpel/tests/t1/buyer/Buyer.wsdl
index bf04240..ce55a74 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t1/buyer/ini.sql b/binsrc/bpel/tests/t1/buyer/ini.sql
index f1b1a9f..b1a6cf1 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl b/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl
index a8e96ee..4117bf6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl b/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl
index f452b55..1f59b7a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t1/seller/Seller.bpel b/binsrc/bpel/tests/t1/seller/Seller.bpel
index 9fc38bf..5475fd8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t1/seller/Seller.wsdl b/binsrc/bpel/tests/t1/seller/Seller.wsdl
index cc8f9c9..6010b0b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t1/seller/ini.sql b/binsrc/bpel/tests/t1/seller/ini.sql
index 4214b7b..bf0cb62 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl b/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl
index a8e96ee..4117bf6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl b/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl
index f452b55..1f59b7a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t2/FlowSample.bpel b/binsrc/bpel/tests/t2/FlowSample.bpel
index e743c38..9d1a2a8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t2/FlowSample.wsdl b/binsrc/bpel/tests/t2/FlowSample.wsdl
index 0ceab05..915dc34 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t2/bpel.xml b/binsrc/bpel/tests/t2/bpel.xml
index 79b46c0..aef1322 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t2/build.xml b/binsrc/bpel/tests/t2/build.xml
index f6cc83d..d6f7667 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/t2/ini.sql b/binsrc/bpel/tests/t2/ini.sql
index af6e618..ea62be1 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl b/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl
index 005756a..f03d5f2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel
index 77c5fb8..0257804 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl
index da54899..20354c4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml b/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml
index 613b066..9905d36 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tevent/Event.bpel b/binsrc/bpel/tests/tevent/Event.bpel
index 8ef6bcc..5d72bf7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tevent/Event.wsdl b/binsrc/bpel/tests/tevent/Event.wsdl
index 78d1530..692c465 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tevent/bpel.xml b/binsrc/bpel/tests/tevent/bpel.xml
index e0aed3f..d3cacb2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tevent/tevent.sql b/binsrc/bpel/tests/tevent/tevent.sql
index a082373..c463967 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/Sut.bpel b/binsrc/bpel/tests/tpcc/Sut.bpel
index 4ac2e95..c1d4e4e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tpcc/Sut.wsdl b/binsrc/bpel/tests/tpcc/Sut.wsdl
index dee9f85..cc35a97 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tpcc/chk.sql b/binsrc/bpel/tests/tpcc/chk.sql
index f25c27e..c4190af 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/dbservices.wsdl b/binsrc/bpel/tests/tpcc/dbservices.wsdl
index 288056b..f1c9545 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tpcc/delqr.sql b/binsrc/bpel/tests/tpcc/delqr.sql
index 3c5ef47..4959581 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/endp.sql b/binsrc/bpel/tests/tpcc/endp.sql
index 99c3307..6affb9e 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/load.sql b/binsrc/bpel/tests/tpcc/load.sql
index 562bd94..dabc087 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/procedures-list-DB.sql b/binsrc/bpel/tests/tpcc/procedures-list-DB.sql
index 9a9b1b0..f3a2c68 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/procedures-list-TD.sql b/binsrc/bpel/tests/tpcc/procedures-list-TD.sql
index e5b05c1..d75f6f6 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/qr.sql b/binsrc/bpel/tests/tpcc/qr.sql
index df54ef4..8125080 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/run.sh b/binsrc/bpel/tests/tpcc/run.sh
index e90f8a1..217e49c 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/bpel/tests/tpcc/tdservices.wsdl b/binsrc/bpel/tests/tpcc/tdservices.wsdl
index 4d64a9a..f764cb6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tpcc/test.sql b/binsrc/bpel/tests/tpcc/test.sql
index a51de33..a184fdd 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tpcc/test1.sql b/binsrc/bpel/tests/tpcc/test1.sql
index 9faa248..b8e20cd 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tver/service.wsdl b/binsrc/bpel/tests/tver/service.wsdl
index a221b82..d23cb7b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tver/tver.bpel b/binsrc/bpel/tests/tver/tver.bpel
index 82357e8..3067a82 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tver/tver.sql b/binsrc/bpel/tests/tver/tver.sql
index eaf5cd2..a0288c1 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/tver/tver.wsdl b/binsrc/bpel/tests/tver/tver.wsdl
index 5b5d013..c062b3b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tver/tvernew1.bpel b/binsrc/bpel/tests/tver/tvernew1.bpel
index 1406a90..ad7efca 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/tver/tvernew2.bpel b/binsrc/bpel/tests/tver/tvernew2.bpel
index b22d982..a26f0e7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/wsrm/doc.bpel b/binsrc/bpel/tests/wsrm/doc.bpel
index 3b47abe..f96e929 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/wsrm/doc.wsdl b/binsrc/bpel/tests/wsrm/doc.wsdl
index c354725..a5b4c3e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/wsrm/wsrmdoc.sql b/binsrc/bpel/tests/wsrm/wsrmdoc.sql
index 43da1f4..609ce55 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl b/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl
index 86075d5..8ff2f8d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/wss/doc.bpel b/binsrc/bpel/tests/wss/doc.bpel
index 33fa06f..a19d896 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/wss/doc.wsdl b/binsrc/bpel/tests/wss/doc.wsdl
index c354725..a5b4c3e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/tests/wss/secdoc.sql b/binsrc/bpel/tests/wss/secdoc.sql
index 1c1a880..5627c40 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/tests/wss/secsvc.wsdl b/binsrc/bpel/tests/wss/secsvc.wsdl
index 32dac15..66e77ba 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/time.vsp b/binsrc/bpel/time.vsp
index 9313c0f..e2b5d3d 100644
--- a/binsrc/bpel/time.vsp
+++ b/binsrc/bpel/time.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: time.vsp,v 1.4 2007/03/14 14:23:25 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/bpel/upload_new.vspx b/binsrc/bpel/upload_new.vspx
index a925dd7..ec04bef 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/view.vspx b/binsrc/bpel/view.vspx
index c05ee9a..e7a31ba 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/virtuoso_splash.vspx b/binsrc/bpel/virtuoso_splash.vspx
index b15b958..0f9cf92 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/wsdl.xsd b/binsrc/bpel/wsdl.xsd
index 7c8207b..c41d20e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/wss_keys.vspx b/binsrc/bpel/wss_keys.vspx
index 95abf89..1dcc4ca 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/xsql.sql b/binsrc/bpel/xsql.sql
index ee27075..83ca3d9 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-2006 OpenLink Software
+-- 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
@@ -21,7 +21,7 @@
create function SYS_XSQL_LIB_VERSION ()
{
return subseq ('
---#$$Id: xsql.sql,v 1.1.1.1 2006/04/11 17:56:09 source Exp $$',
+--#$$Id$$',
4);
}
;
diff --git a/binsrc/bpel/xsql.xsd b/binsrc/bpel/xsql.xsd
index 197bfde..ada0df2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/bpel/xsql2virtPL.xsl b/binsrc/bpel/xsql2virtPL.xsl
index 8998b93..39c8b1c 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/15 22:09:20 source Exp $</xsl:variable>
+ <xsl:variable name="myversion">$Id$</xsl:variable>
<xsl:template match="/">
diff --git a/binsrc/cached_resources/Makefile.am b/binsrc/cached_resources/Makefile.am
index 82bc815..f52d13e 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/cached_resources/Makefile.in b/binsrc/cached_resources/Makefile.in
index ba05917..452e1d7 100644
--- a/binsrc/cached_resources/Makefile.in
+++ b/binsrc/cached_resources/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
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 =
@@ -162,7 +159,6 @@ 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@
@@ -246,7 +242,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -267,7 +262,6 @@ 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@
@@ -303,14 +297,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/cached_resources/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/cached_resources/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/cached_resources/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/cached_resources/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -328,7 +322,6 @@ $(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
@@ -358,17 +351,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -398,7 +387,6 @@ clean-generic:
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"
@@ -416,8 +404,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -426,28 +412,18 @@ install-data-am:
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
@@ -468,7 +444,7 @@ ps-am:
uninstall-am:
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
@@ -498,7 +474,6 @@ cached_resources.c: \
.PHONY: clean
clean:
-rm -f *.tmp
-
# 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/cached_resources/cache_gen.sh b/binsrc/cached_resources/cache_gen.sh
index 3cd5c4f..69ec1b5 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.3 2011/04/11 15:05:06 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/cached_resources/cached_resources.c b/binsrc/cached_resources/cached_resources.c
index b45b33f..d6875b4 100644
--- a/binsrc/cached_resources/cached_resources.c
+++ b/binsrc/cached_resources/cached_resources.c
@@ -549,8 +549,8 @@ static const char * cres_xhtml1_frameset_dtd[] =
" PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\"\n",
" SYSTEM \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\"\n",
"\n",
-" \044Revision: 1.1.1.1.2.1 \044\n",
-" \044Date: 2009/04/15 14:32:21 \044\n",
+" \044Revision\044\n",
+" \044Date\044\n",
"\n",
"-->\n",
"\n",
@@ -1789,8 +1789,8 @@ static const char * cres_xhtml1_strict_dtd[] =
" PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n",
" SYSTEM \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\"\n",
"\n",
-" \044Revision: 1.1.1.1.2.1 \044\n",
-" \044Date: 2009/04/15 14:32:21 \044\n",
+" \044Revision\044\n",
+" \044Date\044\n",
"\n",
"-->\n",
"\n",
@@ -2772,8 +2772,8 @@ static const char * cres_xhtml1_transitional_dtd[] =
" PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n",
" SYSTEM \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"\n",
"\n",
-" \044Revision: 1.1.1.1.2.1 \044\n",
-" \044Date: 2009/04/15 14:32:21 \044\n",
+" \044Revision\044\n",
+" \044Date\044\n",
"\n",
"-->\n",
"\n",
@@ -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-2009 OpenLink Software\n",
+"# Copyright (C) 1998-2012 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",
@@ -4703,6 +4703,8 @@ static const char * cres_virtrdf_data_formats_ttl[] =
"virtrdf:version virtrdf:loadAs virtrdf:jsoTriple .\n",
"virtrdf:isSpecialPredicate virtrdf:loadAs virtrdf:jsoTriple .\n",
"virtrdf:isGcResistantType virtrdf:loadAs virtrdf:jsoTriple .\n",
+"virtrdf:isEndpointOfService virtrdf:loadAs virtrdf:jsoTriple .\n",
+"virtrdf:dialect virtrdf:loadAs virtrdf:jsoTriple .\n",
"\n",
"bif:contains virtrdf:isSpecialPredicate bif:contains .\n",
"bif:xcontains virtrdf:isSpecialPredicate bif:xcontains .\n",
@@ -4715,7 +4717,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 '2011-09-01 0001v6g' ;\n",
+" virtrdf:version '2012-05-17 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 +4782,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 \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
+" virtrdf:qmfIsrefOfShortTmpl \" isnotnull (^{tree}^)\"; # 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,7 +4962,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -5026,7 +5029,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 \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # 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",
@@ -5090,7 +5093,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -5254,7 +5258,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -5320,7 +5325,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 \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # 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",
@@ -5384,7 +5389,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 \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # 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",
@@ -5543,23 +5548,24 @@ 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 \" 1\"; # STRING REQUIRED Boolean value template, can be NULL\n",
+" virtrdf:qmfBoolTmpl \" isnotnull (^{tree}^)\"; # 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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 \" 1\"; # STRING REQUIRED ... boolean value from short\n",
+" virtrdf:qmfBoolOfShortTmpl \" isnotnull (^{tree}^)\"; # 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",
@@ -5608,10 +5614,11 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\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: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",
@@ -5682,7 +5689,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -5799,7 +5807,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 \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # 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",
@@ -5810,7 +5818,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",
@@ -5953,7 +5961,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -5964,7 +5973,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",
@@ -6020,7 +6029,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -6031,7 +6041,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",
@@ -6174,7 +6184,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -6185,7 +6196,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",
@@ -6245,7 +6256,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -6256,7 +6268,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",
@@ -6313,7 +6325,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -6324,7 +6337,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",
@@ -6377,10 +6390,11 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\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: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",
@@ -6452,7 +6466,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -6521,10 +6536,11 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\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: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",
@@ -6572,7 +6588,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 \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # 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",
@@ -6617,10 +6633,11 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\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: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",
@@ -6690,7 +6707,8 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is literal\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",
"# 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",
@@ -6757,10 +6775,11 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\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: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",
@@ -6808,7 +6827,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 \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # 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",
@@ -6853,10 +6872,11 @@ 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 \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\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: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",
@@ -7015,7 +7035,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 \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # 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 7213cad..42009d2 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-2009 OpenLink Software
+# 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
@@ -33,6 +33,8 @@ virtrdf:isSubclassOf virtrdf:loadAs virtrdf:jsoTriple .
virtrdf:version virtrdf:loadAs virtrdf:jsoTriple .
virtrdf:isSpecialPredicate virtrdf:loadAs virtrdf:jsoTriple .
virtrdf:isGcResistantType virtrdf:loadAs virtrdf:jsoTriple .
+virtrdf:isEndpointOfService virtrdf:loadAs virtrdf:jsoTriple .
+virtrdf:dialect virtrdf:loadAs virtrdf:jsoTriple .
bif:contains virtrdf:isSpecialPredicate bif:contains .
bif:xcontains virtrdf:isSpecialPredicate bif:xcontains .
@@ -45,7 +47,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 '2011-09-01 0001v6g' ;
+ virtrdf:version '2012-05-17 0001v6g' ;
virtrdf:item
rdfdf:default-iid , rdfdf:default-iid-nullable ,
rdfdf:default-iid-nonblank , rdfdf:default-iid-nonblank-nullable ,
@@ -110,7 +112,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 " 1"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # 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,7 +292,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -356,7 +359,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 " 1"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -420,7 +423,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -584,7 +588,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -650,7 +655,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 " 1"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -714,7 +719,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 " 1"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -873,23 +878,24 @@ 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 " 1"; # STRING REQUIRED Boolean value template, can be NULL
+ virtrdf:qmfBoolTmpl " isnotnull (^{tree}^)"; # 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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 " 1"; # STRING REQUIRED ... boolean value from short
+ virtrdf:qmfBoolOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -938,10 +944,11 @@ 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 " 1"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -1012,7 +1019,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -1129,7 +1137,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 " 1"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -1140,7 +1148,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
@@ -1283,7 +1291,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -1294,7 +1303,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
@@ -1350,7 +1359,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -1361,7 +1371,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
@@ -1504,7 +1514,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -1515,7 +1526,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
@@ -1575,7 +1586,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -1586,7 +1598,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
@@ -1643,7 +1655,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -1654,7 +1667,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
@@ -1707,10 +1720,11 @@ 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 " 1"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -1782,7 +1796,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -1851,10 +1866,11 @@ 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 " 1"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -1902,7 +1918,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 " 1"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -1947,10 +1963,11 @@ 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 " 1"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -2020,7 +2037,8 @@ 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 " 1"; # STRING REQUIRED ... whether the short is literal
+ 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)
# 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
@@ -2087,10 +2105,11 @@ 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 " 1"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -2138,7 +2157,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 " 1"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -2183,10 +2202,11 @@ 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 " 1"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # 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
@@ -2345,7 +2365,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 " 1"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # 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 31b4c5c..f7f4989 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.1 2011/09/08 15:28:27 source Exp $
+# $Id$
#
# Embeds text into a C file
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -30,13 +30,7 @@ BEGIN {
}
{
fun = $0
- # was: gsub ( /\\/, "\\\\", fun)
- q = "\\\\"
- if (PROCINFO["version"] ~ /^4/)
- gsub ( q, q q, fun)
- else
- gsub ( q, q, fun)
-
+ gsub ( "\\\\", "&&", fun)
gsub ( /"/, "\\\"", fun)
gsub ( /\$/, "\\044", fun)
gsub ( /.*/, "\"&\\n\",", fun)
diff --git a/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-frameset.dtd b/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-frameset.dtd
index a35bbda..37194aa 100644
--- a/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-frameset.dtd
+++ b/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-frameset.dtd
@@ -16,8 +16,8 @@
PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
- $Revision: 1.1.1.1.2.1 $
- $Date: 2009/04/15 14:32:21 $
+ $Revision$
+ $Date$
-->
diff --git a/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-strict.dtd b/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-strict.dtd
index 291b7f8..63f4c44 100644
--- a/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-strict.dtd
+++ b/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-strict.dtd
@@ -16,8 +16,8 @@
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
- $Revision: 1.1.1.1.2.1 $
- $Date: 2009/04/15 14:32:21 $
+ $Revision$
+ $Date$
-->
diff --git a/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-transitional.dtd b/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-transitional.dtd
index ec5e945..ba9be61 100644
--- a/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-transitional.dtd
+++ b/binsrc/cached_resources/w3-TR-xhtml1-DTD/xhtml1-transitional.dtd
@@ -16,8 +16,8 @@
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
- $Revision: 1.1.1.1.2.1 $
- $Date: 2009/04/15 14:32:21 $
+ $Revision$
+ $Date$
-->
diff --git a/binsrc/config/ccdefs.c b/binsrc/config/ccdefs.c
index 2e3874c..78fad28 100644
--- a/binsrc/config/ccdefs.c
+++ b/binsrc/config/ccdefs.c
@@ -1,14 +1,14 @@
/*
* ccdefs.c
*
- * $Id: ccdefs.c,v 1.2 2008/07/03 13:44:22 source Exp $
+ * $Id$
*
* Determine & report the Makeconfig variables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/config/config.guess b/binsrc/config/config.guess
index e6b5d5b..396482d 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
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-08'
+timestamp='2006-07-02'
# 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
@@ -56,8 +56,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+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."
@@ -139,16 +139,6 @@ 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
@@ -171,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -340,7 +329,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -542,7 +531,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -791,7 +780,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- *:MINGW*:*)
+ i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -801,18 +790,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T | authenticamd)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -846,17 +829,10 @@ EOF
echo ${UNAME_MACHINE}-pc-minix
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}-${VENDOR}-linux-gnu
- else
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
- fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
@@ -865,16 +841,16 @@ EOF
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-${VENDOR}-linux-gnu
+ echo frv-unknown-linux-gnu
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
@@ -897,7 +873,7 @@ EOF
s: ::g
p
}'`"
- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -920,16 +896,16 @@ EOF
s: ::g
p
}'`"
- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-${VENDOR}-linux-gnu
+ echo or32-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
- echo powerpc-${VENDOR}-linux-gnu
+ echo powerpc-unknown-linux-gnu
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-${VENDOR}-linux-gnu
+ echo powerpc64-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -943,39 +919,36 @@ EOF
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}
+ echo ${UNAME_MACHINE}-unknown-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-${VENDOR}-linux-gnu ;;
- PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
- *) echo hppa-${VENDOR}-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-${VENDOR}-linux-gnu
+ echo hppa64-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-${VENDOR}-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo x86_64-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -990,18 +963,18 @@ EOF
p'`
case "$ld_supported_targets" in
elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
a.out-i386-linux)
- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit ;;
coff-i386)
- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
+ echo "${UNAME_MACHINE}-pc-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"
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
exit ;;
esac
# Determine whether the default compiler is a.out or elf
@@ -1035,7 +1008,7 @@ EOF
p
}'`"
test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
}
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
@@ -1235,15 +1208,6 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/binsrc/config/config.sub b/binsrc/config/config.sub
index 6759825..fab0aa3 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
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-16'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+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."
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fido | fr30 | frv \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,14 +369,10 @@ case $basic_machine in
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -447,14 +443,6 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -487,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
- basic_machine=cr16-unknown
+ cr16c)
+ basic_machine=cr16c-unknown
os=-elf
;;
crds | unos)
@@ -680,14 +668,6 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -703,10 +683,6 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -833,14 +809,6 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
pbd)
basic_machine=sparc-tti
;;
@@ -957,9 +925,6 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1049,10 +1014,6 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
- tile*)
- basic_machine=tile-unknown
- os=-linux-gnu
- ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1258,7 +1219,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*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1453,9 +1414,6 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
- os=-elf
- ;;
mips*-cisco)
os=-elf
;;
diff --git a/binsrc/config/depcomp b/binsrc/config/depcomp
index e5f9736..ca5ea4e 100755
--- a/binsrc/config/depcomp
+++ b/binsrc/config/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2007-03-29.01
+scriptversion=2006-10-15.18
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -215,39 +215,34 @@ aix)
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+ tmpdepfile="$stripped.u"
if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$base.u
- tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$dir$base.u
- tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
+ if test -f "$tmpdepfile"; then :
+ else
+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
+ tmpdepfile="$stripped.u"
+ fi
+
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ rm -f "$tmpdepfile"
exit $stat
fi
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- do
- test -f "$tmpdepfile" && break
- done
if test -f "$tmpdepfile"; then
+ outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+ sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
diff --git a/binsrc/config/install-sh b/binsrc/config/install-sh
index a5897de..4fbbae7 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=2006-12-25.00
+scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@ IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
+doit="${DOITPROG-}"
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,49 +58,34 @@ fi
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
- test "$posix_glob" != "?" || {
- if (set -f) 2>/dev/null; then
- posix_glob=
- else
- posix_glob=:
- fi
- }
-'
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
-chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
+chgrpcmd=
stripcmd=
-
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
src=
dst=
dir_arg=
-dst_arg=
-
-copy_on_change=false
+dstarg=
no_target_directory=
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -110,55 +95,65 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
- --help display this help and exit.
- --version display version info and exit.
-
- -c (ignored)
- -C install only if different (preserve the last data modification time)
- -d create directories instead of installing files.
- -g GROUP $chgrpprog installed files to GROUP.
- -m MODE $chmodprog installed files to MODE.
- -o USER $chownprog installed files to USER.
- -s $stripprog installed files.
- -t DIRECTORY install into DIRECTORY.
- -T report an error if DSTFILE is a directory.
+-c (ignored)
+-d create directories instead of installing files.
+-g GROUP $chgrpprog installed files to GROUP.
+-m MODE $chmodprog installed files to MODE.
+-o USER $chownprog installed files to USER.
+-s $stripprog installed files.
+-t DIRECTORY install into DIRECTORY.
+-T report an error if DSTFILE is a directory.
+--help display this help and exit.
+--version display version info and exit.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
- RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) ;;
-
- -C) copy_on_change=true;;
+ -c) shift
+ continue;;
- -d) dir_arg=true;;
+ -d) dir_arg=true
+ shift
+ continue;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift
+ shift
+ continue;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
+ shift
+ shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- shift;;
+ continue;;
-o) chowncmd="$chownprog $2"
- shift;;
+ shift
+ shift
+ continue;;
- -s) stripcmd=$stripprog;;
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
- -t) dst_arg=$2
- shift;;
+ -t) dstarg=$2
+ shift
+ shift
+ continue;;
- -T) no_target_directory=true;;
+ -T) no_target_directory=true
+ shift
+ continue;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -170,22 +165,21 @@ while test $# -ne 0; do
*) break;;
esac
- shift
done
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dst_arg"; then
+ if test -n "$dstarg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dst_arg"
+ set fnord "$@" "$dstarg"
shift # fnord
fi
shift # arg
- dst_arg=$arg
+ dstarg=$arg
done
fi
@@ -230,7 +224,7 @@ for src
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src;;
+ -*) src=./$src ;;
esac
if test -n "$dir_arg"; then
@@ -248,22 +242,22 @@ do
exit 1
fi
- if test -z "$dst_arg"; then
+ if test -z "$dstarg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dst_arg
+ dst=$dstarg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst;;
+ -*) dst=./$dst ;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dst_arg: Is a directory" >&2
+ echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -384,19 +378,26 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- -*) prefix='./';;
- *) prefix='';;
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
esac
- eval "$initialize_posix_glob"
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
oIFS=$IFS
IFS=/
- $posix_glob set -f
+ $posix_glob && set -f
set fnord $dstdir
shift
- $posix_glob set +f
+ $posix_glob && set +f
IFS=$oIFS
prefixes=
@@ -458,54 +459,41 @@ do
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # If -C, don't bother to copy if it wouldn't change the file.
- if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
- eval "$initialize_posix_glob" &&
- $posix_glob set -f &&
- set X $old && old=:$2:$4:$5:$6 &&
- set X $new && new=:$2:$4:$5:$6 &&
- $posix_glob set +f &&
-
- test "$old" = "$new" &&
- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
- then
- rm -f "$dsttmp"
- else
- # Rename the file to the real destination.
- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
- {
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- fi || exit 1
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # Now rename the file to the real destination.
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ || {
+ echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ else
+ :
+ fi
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ } || exit 1
trap '' 0
fi
diff --git a/binsrc/config/libtool.m4 b/binsrc/config/libtool.m4
index 4ff44c8..dfd4817 100644
--- a/binsrc/config/libtool.m4
+++ b/binsrc/config/libtool.m4
@@ -1,7 +1,8 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,7 +11,8 @@
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
-# serial 56 LT_INIT
+# serial 57 LT_INIT
# LT_PREREQ(VERSION)
@@ -66,6 +68,7 @@ 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
@@ -82,6 +85,8 @@ 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])
@@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
])
@@ -138,6 +143,9 @@ 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
@@ -179,7 +187,6 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
case $host_os in
aix3*)
@@ -193,23 +200,6 @@ 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
@@ -250,6 +240,28 @@ _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'
@@ -408,7 +420,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 "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
# _LT_CONFIG_STATUS_DECLARATIONS
@@ -418,7 +430,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 "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+# <var>='`$ECHO "$<var>" | $SED "$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)])])])
@@ -517,12 +529,20 @@ 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 "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -533,9 +553,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -543,16 +563,38 @@ 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
# ---------
@@ -562,20 +604,11 @@ _LT_OUTPUT_LIBTOOL_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
@@ -601,7 +634,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) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -646,15 +679,13 @@ 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.
-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_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)
])# LT_OUTPUT
@@ -676,14 +707,15 @@ _LT_CONFIG_SAVE_COMMANDS([
fi
cfgfile="${ofile}T"
- trap "$RM \"$cfgfile\"; exit 1" 1 2 15
- $RM "$cfgfile"
+ trap "$RM -f \"$cfgfile\"; exit 1" 1 2 15
+ $RM -f "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# `$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
@@ -830,11 +862,13 @@ 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
@@ -868,7 +902,7 @@ ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
+$RM -r conftest*
])# _LT_COMPILER_BOILERPLATE
@@ -939,6 +973,31 @@ 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' ;;
@@ -966,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -986,7 +1045,11 @@ 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
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ 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(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -994,7 +1057,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=echo
+ output_verbose_link_cmd=func_echo_all
_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}"
@@ -1020,7 +1083,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# to the aix ld manual.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
/^0/ {
@@ -1040,170 +1103,65 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
# _LT_PROG_ECHO_BACKSLASH
# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# 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).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_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!
- :
+[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'
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
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
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
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
- 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
+case "$ECHO" in
+ printf*) AC_MSG_RESULT([printf]) ;;
+ print*) AC_MSG_RESULT([print -r]) ;;
+ *) AC_MSG_RESULT([cat]) ;;
+esac
-# 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
+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" )])])
-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_DECL([], [ECHO], [1], [An echo program that protects backslashes])
])# _LT_PROG_ECHO_BACKSLASH
@@ -1235,7 +1193,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ echo '[#]line '$LINENO' "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
@@ -1387,10 +1345,19 @@ 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
@@ -1415,21 +1382,21 @@ 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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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
fi
fi
- $RM conftest*
+ $RM -r conftest*
])
if test x"[$]$2" = xyes; then
@@ -1463,7 +1430,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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -1526,6 +1493,11 @@ 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.
@@ -1590,8 +1562,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"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -1642,7 +1614,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -1683,7 +1655,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* 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))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1692,7 +1670,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -1868,30 +1850,30 @@ 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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $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:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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
fi
fi
chmod u+w . 2>&AS_MESSAGE_LOG_FD
- $RM conftest*
+ $RM -r conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
$RM out/* && rmdir out
cd ..
$RM -r conftest
- $RM conftest*
+ $RM -r conftest*
])
_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
[Does compiler simultaneously support -c and -o options?])
@@ -1911,7 +1893,7 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" !=
# do not overwrite the value of need_locks provided by the user
AC_MSG_CHECKING([if we can lock with hard links])
hard_links=yes
- $RM conftest*
+ $RM -r conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
@@ -2036,6 +2018,7 @@ 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],
[], [
@@ -2044,16 +2027,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- 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
+ 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
+ *\;*)
# 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 -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ 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
# 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=
@@ -2066,7 +2056,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;
@@ -2086,7 +2076,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # 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`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
@@ -2174,7 +2170,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=`$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'
+ 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'
;;
esac
;;
@@ -2227,23 +2223,12 @@ 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="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- 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 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"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -2266,7 +2251,7 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -2343,6 +2328,19 @@ 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.
@@ -2385,8 +2383,10 @@ 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]]*)
@@ -2444,7 +2444,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2453,16 +2453,21 @@ linux* | k*bsd*-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
- 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
+ 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
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -2471,7 +2476,7 @@ linux* | k*bsd*-gnu)
# 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;/^$/d' | tr '\n' ' '`
+ 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="/lib /usr/lib $lt_ld_extra"
fi
@@ -2704,6 +2709,8 @@ _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],
@@ -2816,6 +2823,7 @@ 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],
@@ -2945,8 +2953,8 @@ case $host_os in
fi
;;
esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
@@ -2998,16 +3006,18 @@ 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.
- if ( file / ) >/dev/null 2>&1; then
+ # 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
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # 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_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'
@@ -3037,6 +3047,10 @@ 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
@@ -3045,11 +3059,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]) 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])(-bit)?( [LM]SB)? 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
@@ -3071,7 +3085,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3213,7 +3227,19 @@ 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.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+ 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_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -3226,18 +3252,18 @@ _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:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $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:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: 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"
fi
- rm -f conftest*])
+ rm -r -f conftest*])
])# LT_PATH_NM
# Old names:
@@ -3255,7 +3281,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3283,7 +3309,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ 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_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
@@ -3300,6 +3331,7 @@ _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
@@ -3408,7 +3440,7 @@ for ac_symprfx in "" "_"; do
# Check to see that the pipe works correctly.
pipe_works=no
- rm -f conftest*
+ rm -r -f conftest*
cat > conftest.$ac_ext <<_LT_EOF
#ifdef __cplusplus
extern "C" {
@@ -3425,7 +3457,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"
@@ -3587,6 +3619,11 @@ 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.
@@ -3692,7 +3729,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -3725,8 +3762,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xlc* | xlC*)
- # IBM XL 8.0 on PPC
+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3788,7 +3825,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# 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'
@@ -3892,6 +3929,12 @@ 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
@@ -3934,6 +3977,13 @@ 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
@@ -3976,7 +4026,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -3997,7 +4047,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4009,25 +4059,25 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
_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\ C*)
- # Sun C 5.9
+ *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)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *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)=''
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
esac
;;
@@ -4059,7 +4109,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*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4169,8 +4219,10 @@ m4_if([$1], [CXX], [
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")) && ([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") || (\$ 2 == "W")) && ([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
@@ -4248,7 +4300,33 @@ 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}'
@@ -4266,6 +4344,7 @@ 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 ...
@@ -4281,11 +4360,12 @@ 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.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, 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 modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** 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.
_LT_EOF
fi
@@ -4321,6 +4401,7 @@ _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
@@ -4342,6 +4423,11 @@ _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
@@ -4357,7 +4443,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)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -4371,11 +4457,12 @@ _LT_EOF
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; $ECHO \"$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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- 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'
+ 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'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4386,13 +4473,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[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; $ECHO \"$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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -4408,17 +4499,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# 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 $compiler_flags -soname $soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4539,8 +4630,10 @@ _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")) && ([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") || (\$ 2 == "W")) && ([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
@@ -4629,7 +4722,7 @@ _LT_EOF
# empty executable.
_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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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 func_echo_all "${wl}${allow_undefined_flag}"; 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'
@@ -4644,8 +4737,13 @@ _LT_EOF
# -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'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 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
_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'
@@ -4684,7 +4782,7 @@ _LT_EOF
# 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='
+ _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.
@@ -4751,7 +4849,7 @@ _LT_EOF
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$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'
@@ -4770,7 +4868,7 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$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'
@@ -4791,7 +4889,14 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -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'
+ 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'])
;;
esac
fi
@@ -4819,28 +4924,19 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $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'
# 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.
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'
- ])
+ AC_LINK_IFELSE(int foo(void) {},
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $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'
+ )
LDFLAGS="$save_LDFLAGS"
else
- _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'
+ _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'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4902,17 +4998,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" && $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${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'
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" && $ECHO "X-set_version $verstring" | $Xsed` -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" && func_echo_all "-set_version $verstring"` -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'
@@ -4922,13 +5018,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} $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(archive_cmds, $1)='$CC -shared${allow_undefined_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(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" && $ECHO "X-set_version $verstring" | $Xsed` -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" && func_echo_all "-set_version $verstring"` -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 "X-set_version $verstring" | $Xsed` -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 "-set_version $verstring"` -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'
@@ -5119,36 +5215,38 @@ 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_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)])
+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+ [$RM -r 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 -r conftest*
+ ])
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
;;
esac
fi
@@ -5318,37 +5416,21 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
-# _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
- AC_PROG_CXXCPP
-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_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+else
+ _lt_caught_CXX_error=yes
+fi
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5370,6 +5452,8 @@ _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
@@ -5472,7 +5556,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 "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
GXX=no
@@ -5584,7 +5668,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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 func_echo_all "${wl}${allow_undefined_flag}"; 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'
@@ -5599,8 +5683,13 @@ if test "$_lt_caught_CXX_error" != yes; then
# -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'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 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
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
@@ -5633,6 +5722,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# _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
@@ -5693,6 +5783,11 @@ 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)=:
@@ -5717,7 +5812,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) | $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'
+ 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"'
;;
*)
if test "$GXX" = yes; then
@@ -5782,7 +5877,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; $ECHO "X$list" | $Xsed'
+ 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"'
;;
*)
if test "$GXX" = yes; then
@@ -5825,7 +5920,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" && $ECHO "X-set_version $verstring" | $Xsed` -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" && func_echo_all "-set_version $verstring"` -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
@@ -5836,9 +5931,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 -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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -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'
else
- _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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -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'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -5849,7 +5944,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -5867,7 +5962,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; $ECHO "X$list" | $Xsed'
+ 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"'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5904,26 +5999,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 | $NL2SP`"'
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $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 | $NL2SP`~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $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 | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $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 | $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 | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- *) # Version 6 will use weak symbols
+ *) # Version 6 and above 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'
;;
@@ -5931,7 +6026,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; $ECHO \"$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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -5950,9 +6045,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=`$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'
+ 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'
;;
- xl*)
+ xl* | mpixl* | bgxl*)
# 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'
@@ -5972,13 +6067,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; $ECHO \"$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; func_echo_all \"$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='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6047,7 +6142,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=echo
+ output_verbose_link_cmd=func_echo_all
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6082,15 +6177,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" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -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" && func_echo_all "${wl}-set_version $verstring"` -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" && $ECHO "X-set_version $verstring" | $Xsed` -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" && func_echo_all "-set_version $verstring"` -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 "X-set_version $verstring" | $Xsed` -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 "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
@@ -6106,17 +6201,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=`$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'
+ 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"'
;;
*)
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" && $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 -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}-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'
+ _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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
@@ -6126,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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -6162,7 +6257,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6183,7 +6278,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6210,7 +6305,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 "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6221,7 +6316,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 "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6275,6 +6370,10 @@ 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'
@@ -6521,7 +6620,7 @@ linux*)
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
@@ -6565,32 +6664,16 @@ _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_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6609,6 +6692,8 @@ _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
@@ -6708,32 +6793,17 @@ 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_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6752,6 +6822,8 @@ _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
@@ -6897,6 +6969,8 @@ _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
@@ -7264,7 +7338,7 @@ _LT_EOF
func_dirname ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
@@ -7275,7 +7349,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
}
dnl func_dirname_and_basename
@@ -7291,10 +7365,8 @@ dnl so there is no need for it here.
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}\$%%"`;;
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
esac
}
@@ -7305,20 +7377,20 @@ 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_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
}
# func_lo2o object
func_lo2o ()
{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
}
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
}
# func_arith arithmetic-term...
diff --git a/binsrc/config/ltmain.sh b/binsrc/config/ltmain.sh
index 950feee..c856b8d 100755
--- a/binsrc/config/ltmain.sh
+++ b/binsrc/config/ltmain.sh
@@ -1,9 +1,10 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.2.10
# 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 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 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,50 +33,54 @@
#
# 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
-# --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
+# --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
#
# 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.
+# 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.
# 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.2.6b
-# 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.10
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
-PROGRAM=ltmain.sh
+PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.2.6b
+VERSION=2.2.10
TIMESTAMP=""
-package_revision=1.3018
+package_revision=1.3175
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +96,15 @@ 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
@@ -107,15 +117,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"}
-: ${ECHO="echo"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
: ${EGREP="/usr/bin/grep -E"}
: ${FGREP="/usr/bin/grep -F"}
: ${GREP="/usr/bin/grep"}
@@ -159,32 +178,168 @@ basename="s,^.*/,,"
func_dirname_and_basename ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ 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 "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
}
# Generated shell functions inserted here.
-# 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"
+# 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
+}
+
+# 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
+
+ # 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
+}
# 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
@@ -258,6 +413,13 @@ 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 ()
@@ -326,9 +488,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -378,7 +540,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "X$my_tmpdir" | $Xsed
+ $ECHO "$my_tmpdir"
}
@@ -392,7 +554,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -419,7 +581,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "X$1" | $Xsed \
+ my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -489,14 +651,19 @@ func_show_eval_locale ()
}
-
-
-
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ $SED -n '/(C)/!b go
+ :more
+ /\./!{
+ N
+ s/\n# / /
+ b more
+ }
+ :go
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,19 +676,20 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
- $SED -n '/^# Usage:/,/# -h/ {
+ $SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- $ECHO
+ echo
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
func_help ()
{
$SED -n '/^# Usage:/,/# Report bugs to/ {
@@ -538,7 +706,10 @@ func_help ()
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
}' < "$progpath"
- exit $?
+ ret=$?
+ if test -z "$1"; then
+ exit $ret
+ fi
}
# func_missing_arg argname
@@ -546,7 +717,7 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
- func_error "missing argument for $1"
+ func_error "missing argument for $1."
exit_cmd=exit
}
@@ -556,29 +727,6 @@ 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%%%"
@@ -636,16 +784,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 $?
@@ -772,10 +920,21 @@ func_enable_tag ()
--quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
+ opt_verbose=false
+ ;;
+
+ --no-quiet|--no-silent)
+ preserve_args="$preserve_args $opt"
+ opt_silent=false
;;
--verbose| -v) preserve_args="$preserve_args $opt"
opt_silent=false
+ opt_verbose=:
+ ;;
+
+ --no-verbose) preserve_args="$preserve_args $opt"
+ opt_verbose=false
;;
--tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
@@ -793,6 +952,7 @@ func_enable_tag ()
-\?|-h) func_usage ;;
--help) opt_help=: ;;
+ --help-all) opt_help=': help-all' ;;
--version) func_version ;;
-*) func_fatal_help "unrecognized option \`$opt'" ;;
@@ -1016,10 +1176,13 @@ func_infer_tag ()
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 "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1033,8 +1196,11 @@ func_infer_tag ()
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 "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1213,7 +1379,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -1288,7 +1454,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 "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -1445,7 +1611,7 @@ compiler."
}
$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+ test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -1482,10 +1648,11 @@ 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 building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
+ -prefer-pic try to build PIC objects only
+ -prefer-non-pic try to build 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.
@@ -1538,7 +1705,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix-dir 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)."
@@ -1558,6 +1725,8 @@ 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)
@@ -1586,6 +1755,11 @@ 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.
@@ -1623,14 +1797,40 @@ Otherwise, only FILE itself is deleted using RM."
;;
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
- $opt_help && func_mode_help
+# 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 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 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
# func_mode_execute arg...
@@ -1712,7 +1912,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
@@ -1754,7 +1954,7 @@ func_mode_execute ()
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- $ECHO "export $shlibpath_var"
+ echo "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
@@ -1795,23 +1995,23 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- $ECHO "X----------------------------------------------------------------------" | $Xsed
- $ECHO "Libraries have been installed in:"
+ 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:"
+ 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"
+ 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"
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
@@ -1823,21 +2023,21 @@ func_mode_finish ()
$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'"
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
fi
- $ECHO
+ echo
- $ECHO "See any operating system documentation about shared libraries for"
+ 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), crle(1) and ld.so(8) manual"
+ echo "pages."
;;
*)
- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
;;
esac
- $ECHO "X----------------------------------------------------------------------" | $Xsed
+ echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
}
@@ -1852,7 +2052,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.
- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ case $nonopt in *shtool*) :;; *) false;; esac; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -1867,6 +2067,11 @@ func_mode_install ()
# Aesthetically quote it.
func_quote_for_eval "$arg"
install_prog="$install_prog$func_quote_for_eval_result"
+ install_shared_prog=$install_prog
+ case " $install_prog " in
+ *[\\\ /]cp\ *) install_cp=: ;;
+ *) install_cp=false ;;
+ esac
# We need to accept at least all the BSD install flags.
dest=
@@ -1876,8 +2081,10 @@ func_mode_install ()
install_type=
isdir=no
stripme=
+ no_mode=:
for arg
do
+ arg2=
if test -n "$dest"; then
files="$files $dest"
dest=$arg
@@ -1887,10 +2094,9 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
- case " $install_prog " in
- *[\\\ /]cp\ *) ;;
- *) prev=$arg ;;
- esac
+ if $install_cp; then :; else
+ prev=$arg
+ fi
;;
-g | -m | -o)
prev=$arg
@@ -1904,6 +2110,10 @@ 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
@@ -1915,6 +2125,10 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
install_prog="$install_prog $func_quote_for_eval_result"
+ if test -n "$arg2"; then
+ func_quote_for_eval "$arg2"
+ fi
+ install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -1923,6 +2137,13 @@ 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"
+ install_shared_prog="$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"
@@ -2010,7 +2231,7 @@ func_mode_install ()
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@ -2023,9 +2244,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@ -2043,7 +2264,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@ -2183,7 +2404,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "$lib" | $SED '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
@@ -2202,7 +2423,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@ -2221,7 +2442,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -2323,6 +2544,10 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
/* External symbol declarations for the compiler. */\
"
@@ -2332,7 +2557,7 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_verbose "extracting global C symbols from \`$progfile'"
$opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
@@ -2371,7 +2596,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"'
;;
@@ -2415,10 +2640,10 @@ 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 {
@@ -2428,7 +2653,7 @@ typedef struct {
"
case $host in
*cygwin* | *mingw* | *cegcc* )
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ 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. */"
@@ -2441,7 +2666,7 @@ typedef struct {
lt_dlsym_const=const ;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
$lt_dlsym_const lt_dlsymlist
@@ -2457,7 +2682,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}
};
@@ -2515,16 +2740,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 "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%"`
+ 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%"`
else
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@ -2538,8 +2763,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
fi
}
@@ -2549,6 +2774,7 @@ 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
@@ -2559,8 +2785,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 pe-i386(.*architecture: i386)?' >/dev/null ; then
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
@@ -2598,7 +2825,18 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ 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
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -2669,7 +2907,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@ -2684,25 +2922,30 @@ 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 | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-
-# func_emit_wrapper_part1 [arg=no]
+# 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.
#
-# 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 ()
+# 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_part1_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part1_arg1=$1
- fi
+ func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
@@ -2718,7 +2961,6 @@ func_emit_wrapper_part1 ()
# 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
@@ -2749,31 +2991,132 @@ 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
- 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\
+ 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 ()
+{
"
- $ECHO "\
+ 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+\"\$@\"}
+"
+ ;;
+ 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+\"\$@\"}
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"\$file\" | $SED '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 \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +3126,13 @@ else
esac
fi
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`\$ECHO \"\$file\" | $SED '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_part2_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +3140,7 @@ func_emit_wrapper_part2 ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@ -2877,7 +3203,7 @@ func_emit_wrapper_part2 ()
# 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 \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
export $shlibpath_var
"
@@ -2894,64 +3220,18 @@ func_emit_wrapper_part2 ()
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
-"
- 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
+ func_exec_program \${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
@@ -2978,23 +3258,19 @@ func_emit_wrapper ()
func_to_host_path ()
{
func_to_host_path_result="$1"
- if test -n "$1" ; then
+ 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"`
+ func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -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"`
+ func_to_host_path_result=`cygpath -w "$1" |
+ $SED -e "$lt_sed_naive_backslashify"`
;;
* )
# Unfortunately, winepath does not exit with a non-zero
@@ -3006,17 +3282,17 @@ func_to_host_path ()
# 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" |\
+ 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=""
+ 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 " \`$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
func_to_host_path_result="$1"
@@ -3049,30 +3325,24 @@ func_to_host_path ()
func_to_host_pathlist ()
{
func_to_host_pathlist_result="$1"
- if test -n "$1" ; then
+ 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|:*$||'`
+ func_stripname : : "$1"
+ func_to_host_pathlist_tmp1=$func_stripname_result
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"`
+ func_to_host_pathlist_result=`
+ ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -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" |\
+ func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
$SED -e "$lt_sed_naive_backslashify"`
;;
* )
@@ -3088,18 +3358,17 @@ func_to_host_pathlist ()
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"
+ func_append 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
+ 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 " \`$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
@@ -3116,7 +3385,7 @@ func_to_host_pathlist ()
;;
esac
case "$1" in
- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ *: ) func_append func_to_host_pathlist_result ";"
;;
esac
;;
@@ -3141,31 +3410,23 @@ 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>
@@ -3177,6 +3438,44 @@ int setenv (const char *, const char *, int);
#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)
@@ -3192,14 +3491,7 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@ -3230,10 +3522,6 @@ 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
@@ -3246,22 +3534,13 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
-#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);
-}
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
#else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
#endif
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@ -3271,31 +3550,17 @@ 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_fatal (const char *message, ...);
+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_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);
-
-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 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
EOF
- func_emit_wrapper_part2 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
cat <<EOF
const char * MAGIC_EXE = "$magic_exe";
@@ -3340,24 +3605,10 @@ 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 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 */
+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
int
main (int argc, char *argv[])
@@ -3374,10 +3625,13 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+ newargz = XMALLOC (char *, argc + 1);
- /* very simple arg parsing; don't want to rely on getopt */
+ /* 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;
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3391,25 +3645,57 @@ EOF
esac
cat <<"EOF"
- printf ("%s", script_text_part1);
- printf ("%s", script_text_part2);
+ lt_dump_script (stdout);
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 ("Couldn't find %s", argv[0]);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
- tmp_pathspec));
+ 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);
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
- actual_cwrapper_path));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(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 */
@@ -3427,8 +3713,9 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
- target_name));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) libtool target name: %s\n",
+ target_name);
EOF
cat <<EOF
@@ -3481,77 +3768,12 @@ EOF
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;
-
- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+ nonnull (lt_argv_zero));
for (i = 0; i < newargc; i++)
{
- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+ i, nonnull (newargz[i]));
}
EOF
@@ -3560,11 +3782,14 @@ 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 */
- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) failed to launch target \"%s\": %s\n",
+ lt_argv_zero, nonnull (strerror (errno)));
return 127;
}
return rval;
@@ -3586,7 +3811,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal ("Memory exhausted");
+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
return p;
}
@@ -3620,8 +3845,8 @@ check_executable (const char *path)
{
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3638,8 +3863,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3665,8 +3890,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+ nonempty (wrapper));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@ -3719,7 +3944,8 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +3970,8 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +3997,9 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
- tmp_pathspec));
+ lt_debugprintf (__FILE__, __LINE__,
+ "checking path component for symlinks: %s\n",
+ tmp_pathspec);
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +4021,9 @@ chase_symlinks (const char *pathspec)
}
else
{
- char *errstr = strerror (errno);
- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ lt_fatal (__FILE__, __LINE__,
+ "error accessing file \"%s\": %s",
+ tmp_pathspec, nonnull (strerror (errno)));
}
}
XFREE (tmp_pathspec);
@@ -3807,7 +4036,8 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal ("Could not follow symlinks for %s", pathspec);
+ lt_fatal (__FILE__, __LINE__,
+ "could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@ -3833,11 +4063,25 @@ 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 *mode,
+lt_error_core (int exit_status, const char *file,
+ int line, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s: %s: ", program_name, mode);
+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@ -3846,20 +4090,32 @@ lt_error_core (int exit_status, const char *mode,
}
void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, file, line, "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)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_setenv) setting '%s' to '%s'\n",
+ nonnull (name), nonnull (value));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@ -3904,95 +4160,12 @@ 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)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4011,9 +4184,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4023,11 +4196,152 @@ 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 ()
{
@@ -4072,6 +4386,7 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
+ bindir=
dlfiles=
dlprefiles=
dlself=no
@@ -4164,6 +4479,11 @@ 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.
@@ -4425,6 +4745,11 @@ func_mode_link ()
continue
;;
+ -bindir)
+ prev=bindir
+ continue
+ ;;
+
-dlopen)
prev=dlfiles
continue
@@ -4503,7 +4828,7 @@ func_mode_link ()
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
@@ -4522,7 +4847,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*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -4708,7 +5033,7 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
+ arg="$arg $func_quote_for_eval_result"
compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
@@ -4754,18 +5079,19 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
- # -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
+ # 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
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
@@ -4925,7 +5251,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@ -5048,7 +5374,8 @@ func_mode_link ()
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ func_basename "$deplib"
+ deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
*) deplibs="$deplibs $deplib" ;;
@@ -5227,7 +5554,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -5237,15 +5564,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"
@@ -5318,7 +5645,7 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED '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 "*) ;;
@@ -5326,7 +5653,7 @@ func_mode_link ()
esac
done
fi
- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -5580,7 +5907,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
@@ -5683,9 +6010,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
@@ -5825,21 +6152,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
@@ -5893,6 +6220,7 @@ func_mode_link ()
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)
@@ -5958,7 +6286,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 "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@ -6126,7 +6454,7 @@ 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!"
libobjs="$libobjs $objs"
@@ -6194,7 +6522,7 @@ func_mode_link ()
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|sunos)
+ freebsd-aout|freebsd-elf|qnx|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@ -6428,14 +6756,14 @@ func_mode_link ()
oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # 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"`
+ # 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"`
#done
if test -n "$xrpath"; then
@@ -6476,7 +6804,7 @@ func_mode_link ()
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -6561,13 +6889,13 @@ EOF
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
;;
@@ -6604,22 +6932,22 @@ EOF
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
;;
*)
@@ -6665,7 +6993,7 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
@@ -6680,12 +7008,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
@@ -6723,7 +7051,7 @@ 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 \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
@@ -6734,12 +7062,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
@@ -6757,25 +7085,25 @@ EOF
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; 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 "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
done
fi
- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
- $GREP . >/dev/null; then
- $ECHO
+ case $tmp_deplibs in
+ *[!\ \ ]*)
+ 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
- fi
+ ;;
+ esac
;;
esac
versuffix=$versuffix_save
@@ -6787,23 +7115,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED '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"
@@ -6813,16 +7141,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
@@ -6839,9 +7167,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- 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'`
+ 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'`
;;
esac
@@ -6963,7 +7291,7 @@ EOF
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
@@ -7029,7 +7357,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 "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7130,7 +7458,8 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+ func_basename "$output"
+ output_la=$func_basename_result
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -7143,12 +7472,12 @@ 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
$ECHO "$obj" >> $output
done
- $ECHO ')' >> $output
+ 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
@@ -7190,17 +7519,19 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ reload_objs=$objlist
+ eval concat_cmds=\"$reload_cmds\"
else
# All subsequent reloadable object files will link in
# the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$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
@@ -7210,7 +7541,8 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
@@ -7269,7 +7601,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 "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@ -7434,7 +7766,7 @@ 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 "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -7445,7 +7777,7 @@ EOF
fi
# Create the old-style object.
- 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
+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7505,8 +7837,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
@@ -7523,8 +7855,8 @@ EOF
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- 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'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -7661,8 +7993,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -7674,15 +8006,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
@@ -7691,7 +8023,7 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -7738,7 +8070,7 @@ 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 "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
@@ -7757,7 +8089,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 "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -7769,7 +8101,7 @@ EOF
fi
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
@@ -7793,18 +8125,7 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
- 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"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -7925,7 +8246,7 @@ 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"
generated="$generated $gentop"
func_mkdir_p "$gentop"
@@ -8036,7 +8357,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 "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -8121,9 +8442,27 @@ EOF
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) tdlname=../bin/$dlname ;;
+ *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
+ ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
diff --git a/binsrc/config/ltoptions.m4 b/binsrc/config/ltoptions.m4
index 34151a3..17cfd51 100644
--- a/binsrc/config/ltoptions.m4
+++ b/binsrc/config/ltoptions.m4
@@ -1,13 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2008, 2009 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 6 ltoptions.m4
+# serial 7 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -125,7 +126,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)
@@ -133,13 +134,13 @@ case $host in
esac
test -z "$AS" && AS=as
-_LT_DECL([], [AS], [0], [Assembler program])dnl
+_LT_DECL([], [AS], [1], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [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 1da0e8c..93fc771 100644
--- a/binsrc/config/ltversion.m4
+++ b/binsrc/config/ltversion.m4
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
-# serial 3018 ltversion.m4
+# serial 3175 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3018])
+m4_define([LT_PACKAGE_VERSION], [2.2.10])
+m4_define([LT_PACKAGE_REVISION], [1.3175])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3018'
+[macro_version='2.2.10'
+macro_revision='1.3175'
_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 637bb20..c573da9 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 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2009 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 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
@@ -77,7 +77,6 @@ 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])])
@@ -90,3 +89,10 @@ 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/dav/.dav_load.sh b/binsrc/dav/.dav_load.sh
index 07b72b4..06fced3 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/dav/DET_Archive.sql b/binsrc/dav/DET_Archive.sql
index 8441973..0b3d683 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_Blog.sql b/binsrc/dav/DET_Blog.sql
index 54813cb..b8b5b53 100644
--- a/binsrc/dav/DET_Blog.sql
+++ b/binsrc/dav/DET_Blog.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Blog.sql,v 1.4 2009/02/13 10:09:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_Bookmark.sql b/binsrc/dav/DET_Bookmark.sql
index 9dff9dc..7ce2c46 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_CatFilter.sql b/binsrc/dav/DET_CatFilter.sql
index 25c8208..c66aaed 100644
--- a/binsrc/dav/DET_CatFilter.sql
+++ b/binsrc/dav/DET_CatFilter.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_CatFilter.sql,v 1.2 2007/03/28 11:41:04 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_DynaRes.sql b/binsrc/dav/DET_DynaRes.sql
index 3cc4084..1a83b47 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.3 2011/05/11 09:39:25 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2010 OpenLink Software
+-- 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
@@ -122,7 +122,7 @@ create function "DynaRes_DAV_AUTHENTICATE_HTTP" (in id any, in what char(1), in
return a_uid;
return rc;
- }
+ }
}
if (isinteger (a_uid))
{
@@ -494,13 +494,13 @@ create function "DynaRes_DAV_SEARCH_ID" (in detcol_id any, in path_parts any, in
create function "DynaRes_DAV_SEARCH_PATH" (in id any, in what char(1)) returns any
{
-- dbg_obj_princ ('DynaRes_DAV_SEARCH_PATH (', id, what, ')');
- if (what <> 'R')
- return NULL;
+ if (what <> 'R')
+ return NULL;
for select DR_NAME from WS.WS.DYNA_RES where DR_RES_ID = id[3] and DR_DETCOL_ID = id[1] do
{
return concat (DAV_SEARCH_PATH (id[1], 'C'), DR_NAME);
- }
- return null;
+ }
+ return null;
}
;
diff --git a/binsrc/dav/DET_Gallery.sql b/binsrc/dav/DET_Gallery.sql
index 5f013a0..e796e1f 100644
--- a/binsrc/dav/DET_Gallery.sql
+++ b/binsrc/dav/DET_Gallery.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Gallery.sql,v 1.3 2008/04/21 08:10:38 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_HostFs.sql b/binsrc/dav/DET_HostFs.sql
index ed9968b..c821de3 100644
--- a/binsrc/dav/DET_HostFs.sql
+++ b/binsrc/dav/DET_HostFs.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_HostFs.sql,v 1.3 2008/04/21 08:10:38 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_PropFilter.sql b/binsrc/dav/DET_PropFilter.sql
index e948f91..9b516f9 100644
--- a/binsrc/dav/DET_PropFilter.sql
+++ b/binsrc/dav/DET_PropFilter.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_PropFilter.sql,v 1.2 2007/03/28 11:41:04 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_RDFData.sql b/binsrc/dav/DET_RDFData.sql
index e7071a3..c28b54f 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.2 2011/07/19 19:36:41 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_ResFilter.sql b/binsrc/dav/DET_ResFilter.sql
index 8bb8d94..19212db 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.1 2010/12/10 15:19:38 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_S3.sql b/binsrc/dav/DET_S3.sql
index 3c20392..009db30 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.2 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -20,6 +20,801 @@
-- 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 "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)
+{
+ -- dbg_obj_princ ('S3_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE (id[2], what, req, auth_uname, auth_pwd, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "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
+{
+ -- dbg_obj_princ ('S3_DAV_AUTHENTICATE_HTTP (', id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
+ declare retValue any;
+
+ retValue := DAV_AUTHENTICATE_HTTP (id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);
+
+ return retValue;
+}
+;
+
+--| This should return ID of the collection that contains resource or collection with given ID,
+--| Possible ambiguity (such as symlinks etc.) should be resolved by using path.
+--| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
+create function "S3_DAV_GET_PARENT" (
+ in id any,
+ in what char(1),
+ in path varchar) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_GET_PARENT (', id, what, path, ')');
+ declare retValue any;
+
+ retValue := DAV_GET_PARENT (id[2], what, path);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ retValue := vector (DB.DBA.S3__detName (), id[1], retValue, 'C');
+
+ return retValue;
+}
+;
+
+--| 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 "S3_DAV_COL_CREATE" (
+ in detcol_id any,
+ in path_parts any,
+ in permissions varchar,
+ in uid integer,
+ in gid integer,
+ in auth_uid integer,
+ in extern integer := 0) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_COL_CREATE (', detcol_id, path_parts, permissions, uid, gid, auth_uid, extern, ')');
+ declare ouid, ogid integer;
+ declare title, parentListID, listID, listItem varchar;
+ declare url, body, header any;
+ declare retValue, retHeader, result, save, parentID any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ if (save is null)
+ {
+ result := DB.DBA.S3__putObject (detcol_id, path_parts, 'C');
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := result;
+ listID := get_keyword ('path', listItem);
+ }
+ connection_set ('dav_store', 1);
+ DB.DBA.S3__owner (detcol_id, path_parts, DB.DBA.S3__user (uid, auth_uid), DB.DBA.S3__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_COL_CREATE_INT (DB.DBA.S3__path (detcol_id, path_parts), permissions, DB.DBA.S3__user (uid, auth_uid), DB.DBA.S3__user (gid, auth_uid), DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()), 1, 0, 1, ouid, ogid);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ if (save is null)
+ {
+ DB.DBA.S3__paramSet (retValue, 'C', 'Entry', DB.DBA.S3__obj2xml (listItem), 0);
+ DB.DBA.S3__paramSet (retValue, 'C', 'path', listID, 0);
+ }
+ DB.DBA.S3__paramSet (retValue, 'C', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.S3__detName (), detcol_id, retValue, 'C');
+ }
+
+ return retValue;
+}
+;
+
+--| It looks like that this is redundant and should be removed at all.
+create function "S3_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 ('S3_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 "S3_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 ('S3_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 "S3_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 ('S3_DAV_DELETE (', detcol_id, path_parts, what, silent, auth_uid, ')');
+ declare path varchar;
+ declare retValue, id, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.S3__path (detcol_id, path_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (save is null)
+ {
+ retValue := DB.DBA.S3__deleteObject (detcol_id, path, id, what);
+ if (DAV_HIDE_ERROR (retValue) is null)
+ goto _exit;
+ }
+ connection_set ('dav_store', 1);
+ if (what = 'R')
+ DB.DBA.S3__rdf_delete (detcol_id, id, what);
+ retValue := DAV_DELETE_INT (path, 1, null, null, 0, 0);
+
+_exit:;
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "S3_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 ('S3_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', type, permissions, uid, gid, auth_uid, ')');
+ declare ouid, ogid integer;
+ declare name, path, parentListID, listID, listItem, rdf_graph varchar;
+ declare url, header, body, params any;
+ declare retValue, retHeader, result, save, parentID any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ path := DB.DBA.S3__path (detcol_id, path_parts);
+ if (save is null)
+ {
+ 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
+ }
+ result := DB.DBA.S3__putObject (detcol_id, path_parts, 'R', content, type);
+ if (DAV_HIDE_ERROR (result) is null)
+ {
+ retValue := result;
+ goto _exit;
+ }
+ listItem := result;
+ listID := get_keyword ('path', listItem);
+ }
+_skip_create:;
+ connection_set ('dav_store', 1);
+ DB.DBA.S3__owner (detcol_id, path_parts, DB.DBA.S3__user (uid, auth_uid), DB.DBA.S3__user (gid, auth_uid), ouid, ogid);
+ retValue := DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, DB.DBA.S3__user (uid, auth_uid), DB.DBA.S3__user (gid, auth_uid), DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()), 0, ouid=>ouid, ogid=>ogid, check_locks=>0);
+
+_exit:;
+ connection_set ('dav_store', save);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ rdf_graph := DB.DBA.S3__paramGet (detcol_id, 'C', 'graph', 0);
+ if (not DB.DBA.is_empty_or_null (rdf_graph))
+ DB.DBA.S3__rdf (detcol_id, retValue, 'R');
+
+ if (save is null)
+ {
+ DB.DBA.S3__paramSet (retValue, 'R', 'Entry', DB.DBA.S3__obj2xml (listItem), 0);
+ DB.DBA.S3__paramSet (retValue, 'R', 'path', listID, 0);
+ }
+ DB.DBA.S3__paramSet (retValue, 'R', 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ retValue := vector (DB.DBA.S3__detName (), detcol_id, retValue, 'R');
+ }
+ return retValue;
+}
+;
+
+--| 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.
+--| It should delete any dead property even if the name looks like system name.
+create function "S3_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 ('S3_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_REMOVE_RAW (id[2], what, propname, silent, auth_uid);
+
+ return retValue;
+}
+;
+
+--| 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 "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
+{
+ -- dbg_obj_princ ('S3_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
+ declare retValue any;
+
+ id := id[2];
+ retValue := DB.DBA.DAV_PROP_SET_RAW (id, what, propname, propvalue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
+create function "S3_DAV_PROP_GET" (
+ in id any,
+ in what char(0),
+ in propname varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('S3_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_GET_INT (id[2], what, propname, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
+--| The returned list should contain only user properties.
+create function "S3_DAV_PROP_LIST" (
+ in id any,
+ in what char(0),
+ in propmask varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('S3_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
+ declare retValue any;
+
+ retValue := DAV_PROP_LIST_INT (id[2], what, propmask, 0);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "S3_DAV_DIR_SINGLE" (
+ in id any,
+ in what char(0),
+ in path any,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_DIR_SINGLE (', id, what, path, auth_uid, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_DIR_SINGLE_INT (id[2], what, null, DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()), http_dav_uid ());
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null) and (save is null))
+ retValue[4] := vector (DB.DBA.S3__detName (), id[1], retValue[4], what);
+
+ return retValue;
+}
+;
+
+--| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
+create function "S3_DAV_DIR_LIST" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ in name_mask varchar,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_DIR_LIST (', detcol_id, subPath_parts, detcol_parts, name_mask, recursive, auth_uid, ')');
+ declare colId integer;
+ declare what, colPath, movePath varchar;
+ declare boxItem any;
+ declare retValue, save, downloads, listItems, davItems, colEntry, xmlItems, davEntry, listIds, listId any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', null);
+ what := case when ((length (subPath_parts) = 0) or (subPath_parts[length (subPath_parts) - 1] = '')) then 'C' else 'R' end;
+ if ((what = 'R') or (recursive = -1))
+ return DB.DBA.S3_DAV_DIR_SINGLE (detcol_id, what, null, auth_uid);
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.DAV_SEARCH_ID (colPath, 'C');
+
+ downloads := vector ();
+ listItems := DB.DBA.S3__list (detcol_id, detcol_parts, subPath_parts);
+ if (DAV_HIDE_ERROR (listItems) is null)
+ goto _exit;
+
+ if (isinteger (listItems))
+ goto _exit;
+
+ DB.DBA.S3__activity (detcol_id, 'Sync started');
+ {
+ declare _id, _what, _type, _content any;
+ declare title varchar;
+ {
+ declare exit handler for sqlstate '*'
+ {
+ DB.DBA.S3__activity (detcol_id, 'Exec error: ' || __SQL_MESSAGE);
+ goto _exitSync;
+ };
+
+ connection_set ('dav_store', 1);
+ colEntry := DB.DBA.DAV_DIR_SINGLE_INT (colId, 'C', '', null, null, http_dav_uid ());
+
+ listIds := vector ();
+ davItems := DB.DBA.S3__davList (detcol_id, colId);
+ foreach (any davItem in davItems) do
+ {
+ connection_set ('dav_store', 1);
+ listID := DB.DBA.S3__paramGet (davItem[4], davItem[1], 'path', 0);
+ foreach (any listItem in listItems) do
+ {
+ title := get_keyword ('name', listItem);
+ if ((listID = get_keyword ('path', listItem)) and (title = davItem[10]))
+ {
+ davEntry := DB.DBA.S3__paramGet (davItem[4], davItem[1], 'Entry', 0);
+ if (davEntry is not null)
+ {
+ listIds := vector_concat (listIds, vector (listID));
+ davEntry := xtree_doc (davEntry);
+ if (DB.DBA.S3__entryXPath (davEntry, '/updated', 1) <> datestring (get_keyword ('updated', listItem)))
+ {
+ set triggers off;
+ DB.DBA.S3__paramSet (davItem[4], davItem[1], ':getlastmodified', get_keyword ('updated', listItem), 0, 0);
+ set triggers on;
+ DB.DBA.S3__paramSet (davItem[4], davItem[1], 'Entry', DB.DBA.S3__obj2xml (listItem), 0);
+ }
+ if (DB.DBA.S3__entryXPath (davEntry, '/etag', 1) <> get_keyword ('etag', listItem))
+ {
+ if (davItem[1] = 'R')
+ {
+ DB.DBA.S3__paramSet (davItem[4], davItem[1], 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ else
+ {
+ declare downloaded integer;
+
+ downloaded := DB.DBA.S3__paramGet (davItem[4], davItem[1], 'download', 0);
+ if (downloaded is not null)
+ {
+ downloaded := cast (downloaded as integer);
+ if (downloaded <= 5)
+ downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));
+ }
+ }
+ goto _continue;
+ }
+ }
+ }
+ if (davItem[1] = 'R')
+ DB.DBA.S3__rdf_delete (detcol_id, davItem[4], davItem[1]);
+ DAV_DELETE_INT (davItem[0], 1, null, null, 0, 0);
+
+ _continue:;
+ commit work;
+ }
+ foreach (any listItem in listItems) do
+ {
+ connection_set ('dav_store', 1);
+ listID := get_keyword ('path', listItem);
+ if (not position (listID, listIDs))
+ {
+ title := get_keyword ('name', listItem);
+ connection_set ('dav_store', 1);
+ if (get_keyword ('type', listItem) = 'C')
+ {
+ _id := DB.DBA.DAV_COL_CREATE (colPath || title || '/', colEntry[5], colEntry[7], colEntry[6], DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()));
+ _what := 'C';
+ }
+ else
+ {
+ _content := '';
+ _type := http_mime_type (title);
+ _id := DB.DBA.DAV_RES_UPLOAD (colPath || title, _content, _type, colEntry[5], colEntry[7], colEntry[6], DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()));
+ _what := 'R';
+ }
+ if (DAV_HIDE_ERROR (_id) is not null)
+ {
+ set triggers off;
+ DB.DBA.S3__paramSet (_id, _what, ':creationdate', get_keyword ('updated', listItem), 0, 0);
+ DB.DBA.S3__paramSet (_id, _what, ':getlastmodified', get_keyword ('updated', listItem), 0, 0);
+ set triggers on;
+ DB.DBA.S3__paramSet (_id, _what, 'path', listID, 0);
+ DB.DBA.S3__paramSet (_id, _what, 'virt:DETCOL_ID', cast (detcol_id as varchar), 0, 0);
+ DB.DBA.S3__paramSet (_id, _what, 'Entry', DB.DBA.S3__obj2xml (listItem), 0);
+ if (_what = 'R')
+ {
+ DB.DBA.S3__paramSet (_id, _what, 'download', '0', 0);
+ downloads := vector_concat (downloads, vector (vector (_id, _what)));
+ }
+ }
+ commit work;
+ }
+ }
+ }
+ _exitSync:
+ connection_set ('dav_store', save);
+ }
+ DB.DBA.S3__activity (detcol_id, 'Sync ended');
+
+_exit:;
+ retValue := DB.DBA.S3__davList (detcol_id, colId);
+ DB.DBA.S3__downloads (detcol_id, downloads);
+
+ return retValue;
+}
+;
+
+--| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
+create function "S3_DAV_DIR_FILTER" (
+ in detcol_id any,
+ in subPath_parts any,
+ in detcol_parts varchar,
+ inout compilation any,
+ in recursive integer,
+ in auth_uid integer) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_DIR_FILTER (', detcol_id, subPath_parts, detcol_parts, compilation, recursive, 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 "S3_DAV_SEARCH_ID" (
+ in detcol_id any,
+ in path_parts any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ retValue := DAV_SEARCH_ID (DB.DBA.S3__path (detcol_id, path_parts), what);
+ -- dbg_obj_print ('retValue', retValue);
+ connection_set ('dav_store', save);
+ if ((DAV_HIDE_ERROR (retValue) is not null))
+ {
+ if (isinteger (retValue) and (save is null))
+ retValue := vector (DB.DBA.S3__detName (), detcol_id, retValue, what);
+
+ else if (isarray (retValue) and (save = 1))
+ retValue := retValue[2];
+ }
+ return retValue;
+}
+;
+
+create function "S3_DAV_MAKE_ID" (
+ in detcol_id any,
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_MAKE_ID (', id, what, ')');
+ declare retValue any;
+
+ retValue := vector (DB.DBA.S3__detName (), detcol_id, id, what);
+
+ return retValue;
+}
+;
+
+--| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
+create function "S3_DAV_SEARCH_PATH" (
+ in id any,
+ in what char(1)) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_SEARCH_PATH (', id, what, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DB.DBA.DAV_SEARCH_PATH (davId, what);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "S3_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 ('S3_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 "S3_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 ('S3_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 "S3_DAV_RES_CONTENT" (
+ in id any,
+ inout content any,
+ out type varchar,
+ in content_mode integer) returns integer
+{
+ -- dbg_obj_princ ('S3_DAV_RES_CONTENT (', id, ', [content], [type], ', content_mode, ')');
+ declare retValue any;
+
+ retValue := DAV_RES_CONTENT_INT (id[2], content, type, content_mode, 0);
+
+ return retValue;
+}
+;
+
+--| This adds an extra access path to the existing resource or collection.
+create function "S3_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 ('S3_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 "S3_DAV_DEREFERENCE_LIST" (
+ in detcol_id any,
+ inout report_array any) returns any
+{
+ -- dbg_obj_princ ('S3_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 "S3_DAV_RESOLVE_PATH" (
+ in detcol_id any,
+ inout reference_item any,
+ inout old_base varchar,
+ inout new_base varchar) returns any
+{
+ -- dbg_obj_princ ('S3_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 "S3_DAV_LOCK" (
+ in path any,
+ in id any,
+ in what 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 ('S3_DAV_LOCK (', path, id, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LOCK_INT (path, davId, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, DB.DBA.S3__user (auth_uid), DB.DBA.S3__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "S3_DAV_UNLOCK" (
+ in id any,
+ in what char(1),
+ in token varchar,
+ in auth_uid integer)
+{
+ -- dbg_obj_princ ('S3_DAV_UNLOCK (', id, what, token, auth_uid, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_UNLOCK_INT (davId, what, token, DB.DBA.S3__user (auth_uid), DB.DBA.S3__password (auth_uid), auth_uid);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "S3_DAV_IS_LOCKED" (
+ inout id any,
+ inout what char(1),
+ in owned_tokens varchar) returns integer
+{
+ -- dbg_obj_princ ('S3_DAV_IS_LOCKED (', id, what, owned_tokens, ')');
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_IS_LOCKED_INT (davId, what, owned_tokens);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
+--| 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 "S3_DAV_LIST_LOCKS" (
+ in id any,
+ in what char(1),
+ in recursive integer) returns any
+{
+ -- dbg_obj_princ ('S3_DAV_LIST_LOCKS" (', id, what, recursive);
+ declare davId integer;
+ declare retValue, save any;
+ declare exit handler for sqlstate '*'
+ {
+ connection_set ('dav_store', save);
+ resignal;
+ };
+
+ save := connection_get ('dav_store');
+ connection_set ('dav_store', 1);
+ davId := id[2];
+ retValue := DAV_LIST_LOCKS_INT (davId, what, recursive);
+ connection_set ('dav_store', save);
+
+ return retValue;
+}
+;
+
-------------------------------------------------------------------------------
--
create function DB.DBA.S3__encode (
@@ -28,21 +823,120 @@ create function DB.DBA.S3__encode (
S := sprintf ('%U', S);
S := replace(S, '''', '%27');
S := replace(S, '%2F', '/');
+ S := replace(S, '%2C', ',');
return S;
}
;
-------------------------------------------------------------------------------
--
-create function DB.DBA.S3__params (
- in colID integer,
- out bucket varchar,
- out accessCode varchar,
- out secretKey varchar)
+create function DB.DBA.S3__md5 (
+ in S varchar)
+{
+ declare md5_ctx, my_digest any;
+
+ md5_ctx := md5_init ();
+ md5_ctx := md5_update (md5_ctx, S);
+ my_digest := md5_final (md5_ctx, 0);
+
+ return encode_base64 (my_digest);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__detcolId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[1];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__davId (
+ in id any)
+{
+ if (isinteger (id))
+ return id;
+
+ return id[2];
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__user (
+ in user_id integer,
+ in default_id integer := null)
+{
+ return coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = coalesce (user_id, default_id)), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__password (
+ in user_id integer)
+{
+ return coalesce ((select pwd_magic_calc(U_NAME, U_PWD, 1) from WS.WS.SYS_DAV_USER where U_ID = user_id), '');
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__owner (
+ in detcol_id any,
+ in subPath_parts any,
+ in uid any,
+ in gid any,
+ inout ouid integer,
+ inout ogid integer)
+{
+ declare id any;
+ declare path varchar;
+
+ DB.DBA.DAV_OWNER_ID (uid, gid, ouid, ogid);
+ if ((ouid = -12) or (ouid = 5))
+ {
+ path := DB.DBA.S3__path (detcol_id, subPath_parts);
+ id := DB.DBA.DAV_SEARCH_ID (path, 'P');
+ if (DAV_HIDE_ERROR (id))
+ {
+ select COL_OWNER, COL_GROUP
+ into ouid, ogid
+ from WS.WS.SYS_DAV_COL
+ where COL_ID = id;
+ }
+ }
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__detName ()
+{
+ return UNAME'S3';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__path (
+ in detcol_id any,
+ in subPath_parts any)
{
- bucket := DB.DBA.DAV_PROP_GET_INT (colID, 'C', 'virt:S3-BucketName', 0);
- accessCode := DB.DBA.DAV_PROP_GET_INT (colID, 'C', 'virt:S3-AccessKeyID', 0);
- secretKey := DB.DBA.DAV_PROP_GET_INT (colID, 'C', 'virt:S3-SecretKey', 0);
+ declare N integer;
+ declare path varchar;
+
+ path := rtrim (DB.DBA.DAV_SEARCH_PATH (detcol_id, 'C'), '/');
+ for (N := 0; N < length (subPath_parts); N := N + 1)
+ path := path || '/' || subPath_parts[N];
+
+ return path;
}
;
@@ -53,94 +947,217 @@ create function DB.DBA.S3__parts2path (
in pathParts any,
in what any)
{
- -- dbg_obj_princ ('S3__parts2path (', bucket, pathParts, ')');
declare path varchar;
path := DB.DBA.DAV_CONCAT_PATH (pathParts, null);
if ((path <> '') and (chr (path[0]) <> '/'))
path := '/' || path;
+
if (bucket <> '')
path := '/' || bucket || path;
- -- dbg_obj_princ ('path', path);
+
path := rtrim (path, '/') || case when (what = 'C') then '/' end;
+
return path;
}
;
-------------------------------------------------------------------------------
--
-create function DB.DBA.S3__item2entry (
- in detcolID integer,
- in detcolPath varchar,
- in bucket varchar,
+create function DB.DBA.S3__workPath (
+ in id any,
+ in what any)
+{
+ declare path varchar;
+
+ path := DB.DBA.S3__paramGet (id, what, 'path', 0);
+ path := DB.DBA.S3__encode (path);
+ if (trim (path, '/') <> DB.DBA.S3__bucketFromUrl (path))
+ path := rtrim (path, '/') || case when (what = 'C') then '_\$folder\$' end;
+
+ path := DB.DBA.S3__pathFromUrl (path);
+ return path;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__params (
+ in colId integer)
+{
+ declare params any;
+
+ colId := DB.DBA.S3__detcolId (colId);
+ params := vector (
+ 'authentication', 'Yes',
+ 'bucket', DB.DBA.S3__paramGet (colId, 'C', 'BucketName', 0),
+ 'accessCode', DB.DBA.S3__paramGet (colId, 'C', 'AccessKeyID', 0, 1, 0),
+ 'secretKey', DB.DBA.S3__paramGet (colId, 'C', 'SecretKey', 0, 1, 0),
+ 'graph', DB.DBA.S3__paramGet (colId, 'C', 'graph', 0)
+ );
+ return params;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__paramSet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _propValue any,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _encrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.S3__paramSet', _propName, _propValue, ')');
+ declare retValue any;
+
+ if (_serialized)
+ _propValue := serialize (_propValue);
+
+ if (_encrypt)
+ _propValue := pwd_magic_calc ('s3', _propValue);
+
+ if (_prefixed)
+ _propName := 'virt:S3-' || _propName;
+
+ _id := DB.DBA.S3__davId (_id);
+ retValue := DB.DBA.DAV_PROP_SET_RAW (_id, _what, _propName, _propValue, 1, http_dav_uid ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__paramGet (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _serialized integer := 1,
+ in _prefixed integer := 1,
+ in _decrypt integer := 0)
+{
+ -- dbg_obj_princ ('DB.DBA.S3__paramGet (', _id, _what, _propName, ')');
+ declare propValue any;
+
+ if (_prefixed)
+ _propName := 'virt:S3-' || _propName;
+
+ propValue := DB.DBA.DAV_PROP_GET_INT (DB.DBA.S3__davId (_id), _what, _propName, 0, DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()), http_dav_uid ());
+ if (isinteger (propValue))
+ propValue := null;
+
+ if (_serialized and not isnull (propValue))
+ propValue := deserialize (propValue);
+
+ if (_decrypt and not isnull (propValue))
+ propValue := pwd_magic_calc ('s3', propValue, 1);
+
+ return propValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__paramRemove (
+ in _id any,
+ in _what varchar,
+ in _propName varchar,
+ in _prefixed integer := 1)
+{
+ -- dbg_obj_princ ('DB.DBA.S3__paramRemove (', _id, _what, _propName, ')');
+ if (_prefixed)
+ _propName := 'virt:S3-' || _propName;
+
+ DB.DBA.DAV_PROP_REMOVE_RAW (DB.DBA.S3__davId (_id), _what, _propName, 1, http_dav_uid());
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__obj2xml (
in item any)
{
- -- dbg_obj_princ ('DB.DBA.S3__item2entry (', detcolID, detcolPath, bucket, item, ')');
- declare entryPath, entryType varchar;
- declare detcolEntry any;
-
- if (item is null)
- return null;
-
- detcolEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcolID, 'C', '', null, null, http_dav_uid ());
- entryPath := get_keyword ('path', item);
- if (not is_empty_or_null (bucket))
- entryPath := subseq (entryPath, length (bucket)+1);
-
- entryType := get_keyword ('type', item);
- if ('C' = entryType)
- return vector (detcolPath || ltrim (entryPath, '/'), -- 0 full path
- entryType, -- 1 type
- get_keyword ('size', item), -- 2 size
- get_keyword ('updated', item), -- 3 modification time
- vector (UNAME'S3', detcolID, entryPath), -- 4 id
- detcolEntry[5], -- 5 permissions
- detcolEntry[6], -- 6 group
- detcolEntry[7], -- 7 owner
- get_keyword ('updated', item), -- 8 creation time
- 'dav/unix-directory', -- 9 mime type
- get_keyword ('name', item) -- 10 name
- );
- if ('R' = entryType)
- return vector (detcolPath || ltrim (entryPath, '/'), -- 0 full path
- entryType, -- 1 type
- get_keyword ('size', item), -- 2 size
- get_keyword ('updated', item), -- 3 modification time
- vector (UNAME'S3', detcolID, entryPath), -- 4 id
- detcolEntry[5], -- 5 permissions
- detcolEntry[6], -- 6 group
- detcolEntry[7], -- 7 owner
- get_keyword ('updated', item), -- 8 creation time
- http_mime_type (detcolPath || entryPath), -- 9 mime type
- get_keyword ('name', item) -- 10 name
- );
-}
-;
-
-
-create function DB.DBA.S3__headers2item (
- in headers varchat,
- in s3Path varchar,
- in what varchar)
+ return '<entry>' || ODS..obj2xml (item, 10) || '</entry>';
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__xml2string (
+ in _xml any)
{
- declare item any;
+ declare stream any;
- item := vector ('path', s3Path,
- 'name', DB.DBA.S3__getNameFromUrl (s3Path),
- 'type', what,
- 'etag', http_request_header (headers, 'ETag'),
- 'size', cast (http_request_header (headers, 'Content-Length') as integer),
- 'mimeType', http_request_header (headers, 'Content-Type'),
- 'updated', http_string_date (http_request_header (headers, 'Last-Modified'))
- );
- return item;
+ stream := string_output ();
+ http_value (_xml, null, stream);
+ return string_output_string (stream);
}
;
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__entryXPath (
+ in _xml any,
+ in _xpath varchar,
+ in _cast integer := 0)
+{
+ declare retValue any;
+
+ if (_cast)
+ {
+ retValue := serialize_to_UTF8_xml (xpath_eval (sprintf ('string (//entry%s)', _xpath), _xml, 1));
+ } else {
+ retValue := xpath_eval ('//entry' || _xpath, _xml, 1);
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__entryXMLUpdate (
+ in _xml any,
+ in _tag varchar,
+ in _value any)
+{
+ declare _entity any;
+
+ _entity := xpath_eval (sprintf ('//entry/%s', _tag), _xml);
+ if (not isnull (_entity))
+ _xml := XMLUpdate (_xml, ('//entry/%s', _tag), null);
+
+ if (isnull (_value))
+ return;
+
+ _entity := xpath_eval ('//entry', _xml);
+ XMLAppendChildren (_entity, xtree_doc (sprintf ('<%s>%V</%s>', _tag, cast (_value as varchar), _tag)));
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__removeKeyword (
+ in name varchar,
+ inout params any)
+{
+ declare N integer;
+ declare retValue any;
+
+ retValue := vector ();
+ for (N := 0; N < length (params); N := N + 2)
+ if (params[N] <> name)
+ retValue := vector_concat (retValue, vector (params[N], params[N+1]));
+
+ return retValue;
+}
+;
-------------------------------------------------------------------------------
--
-create function DB.DBA.S3__makeHostUrl (
+create function DB.DBA.S3__makeUrl (
in path varchar,
in isSecure integer := 1)
{
@@ -156,14 +1173,16 @@ create function DB.DBA.S3__makeHostUrl (
s3URL := 'http://s3.amazonaws.com';
}
path := ltrim (path, '/');
- bucket := DB.DBA.S3__getBucketFromUrl (path);
+ bucket := DB.DBA.S3__bucketFromUrl (path);
dir := '';
if (length (bucket) < length (path))
dir := subseq (path, length (bucket)+1);
if ((lcase (bucket) = bucket) and (bucket <> ''))
{
hostUrl := s3Protocol || bucket || '.s3.amazonaws.com/' || dir;
- } else {
+ }
+ else
+ {
if (bucket <> '')
bucket := bucket || '/';
hostUrl := s3Protocol || 's3.amazonaws.com/' || bucket || dir;
@@ -174,7 +1193,7 @@ create function DB.DBA.S3__makeHostUrl (
-------------------------------------------------------------------------------
--
-create function DB.DBA.S3__getBucketFromUrl (
+create function DB.DBA.S3__bucketFromUrl (
in url varchar)
{
declare parts any;
@@ -182,13 +1201,14 @@ create function DB.DBA.S3__getBucketFromUrl (
parts := split_and_decode (trim (url, '/'), 0, '\0\0/');
if (length (parts) <> 0)
return parts[0];
+
return '';
}
;
-------------------------------------------------------------------------------
--
-create function DB.DBA.S3__getNameFromUrl (
+create function DB.DBA.S3__nameFromUrl (
in url varchar)
{
declare parts any;
@@ -196,20 +1216,22 @@ create function DB.DBA.S3__getNameFromUrl (
parts := split_and_decode (trim (url, '/'), 0, '\0\0/');
if (length (parts) <> 0)
return parts[length (parts) - 1];
+
return '';
}
;
-------------------------------------------------------------------------------
--
-create function DB.DBA.S3__getPathFromUrl (
+create function DB.DBA.S3__pathFromUrl (
in url varchar)
{
declare bucket any;
- bucket := DB.DBA.S3__getBucketFromUrl (url);
+ bucket := DB.DBA.S3__bucketFromUrl (url);
if (isnull (bucket))
return '';
+
return ltrim (subseq (url, length (bucket)+1), '/');
}
;
@@ -217,13 +1239,14 @@ create function DB.DBA.S3__getPathFromUrl (
-------------------------------------------------------------------------------
--
create function DB.DBA.S3__makeAWSHeader (
- in accessCode varchar,
- in secretKey varchar,
+ in params any,
in authHeader varchar,
in authMode integer := 0)
{
- declare S, T, hmacKey varchar;
+ declare S, T, hmacKey, secretKey, accessCode varchar;
+ accessCode := get_keyword ('accessCode', params);
+ secretKey := get_keyword ('secretKey', params);
hmacKey := xenc_key_RAW_read (null, encode_base64 (secretKey));
S := xenc_hmac_sha1_digest (authHeader, hmacKey);
xenc_key_remove (hmacKey);
@@ -237,31 +1260,146 @@ create function DB.DBA.S3__makeAWSHeader (
-------------------------------------------------------------------------------
--
-create function DB.DBA.S3__getBuckets (
- in accessCode varchar,
- in secretKey varchar,
+create function DB.DBA.S3__exec_error (
+ in _header any,
+ in _silent integer := 0)
+{
+ if ((_header[0] like 'HTTP/1._ 4__ %') or (_header[0] like 'HTTP/1._ 5__ %'))
+ {
+ if (not _silent)
+ signal ('22023', trim (_header[0], '\r\n'));
+
+ return 0;
+ }
+ return 1;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__exec_code (
+ in _header any)
+{
+ return subseq (_header[0], 9, 12);
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__davList (
+ inout detcol_id integer,
+ inout colId integer)
+{
+ declare retValue any;
+
+ vectorbld_init (retValue);
+ for (select vector (RES_FULL_PATH,
+ 'R',
+ length (RES_CONTENT),
+ RES_MOD_TIME,
+ vector (DB.DBA.S3__detName (), detcol_id, RES_ID, 'R'),
+ RES_PERMS,
+ RES_GROUP,
+ RES_OWNER,
+ RES_CR_TIME,
+ RES_TYPE,
+ RES_NAME ) as I
+ from WS.WS.SYS_DAV_RES
+ where RES_COL = DB.DBA.S3__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ for (select vector (WS.WS.COL_PATH (COL_ID),
+ 'C',
+ 0,
+ COL_MOD_TIME,
+ vector (DB.DBA.S3__detName (), detcol_id, COL_ID, 'C'),
+ COL_PERMS,
+ COL_GROUP,
+ COL_OWNER,
+ COL_CR_TIME,
+ 'dav/unix-directory',
+ COL_NAME) as I
+ from WS.WS.SYS_DAV_COL
+ where COL_PARENT = DB.DBA.S3__davId (colId)) do
+ {
+ vectorbld_acc (retValue, i);
+ }
+
+ vectorbld_final (retValue);
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__list (
+ inout detcol_id any,
+ inout detcol_parts varchar,
+ inout subPath_parts varchar)
+{
+ -- dbg_obj_princ ('DB.DBA.S3__list (', detcol_id, detcol_parts, subPath_parts, ')');
+ declare colId integer;
+ declare colPath, bucket varchar;
+ declare syncTime datetime;
+ declare retValue, retHeader, params any;
+
+ colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);
+ colId := DB.DBA.S3__davId (DB.DBA.DAV_SEARCH_ID (colPath, 'C'));
+ if (DAV_HIDE_ERROR (colId) is null)
+ return -28;
+
+ syncTime := DB.DBA.S3__paramGet (colId, 'C', 'syncTime');
+ if (not isnull (syncTime) and (datediff ('second', syncTime, now ()) < 300))
+ return 0;
+
+ params := DB.DBA.S3__params (detcol_id);
+ bucket := get_keyword ('bucket', params);
+ if (is_empty_or_null (bucket) and (length (subPath_parts) = 1) and subPath_parts[0] = '')
+ {
+ retValue := DB.DBA.S3__listBuckets (detcol_id, params);
+ }
+ else
+ {
+ retValue := DB.DBA.S3__listBucket (detcol_id, params, DB.DBA.S3__parts2path (bucket, subPath_parts, 'C'));
+ }
+ if (not isinteger (retValue))
+ DB.DBA.S3__paramSet (colId, 'C', 'syncTime', now ());
+
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__listBuckets (
+ inout detcol_id any,
+ in params any,
in bucket varchar := null)
{
- -- dbg_obj_princ ('DB.DBA.S3__getBuckets (', accessCode, secretKey, ')');
+ -- dbg_obj_princ ('DB.DBA.S3__listBuckets (', detcol_id, params, ')');
declare dateUTC, authHeader, path, S varchar;
- declare reqHdr, resHdr varchar;
+ declare reqHeader, retHeader varchar;
declare xt, xtItems, buckets any;
path := '/';
dateUTC := date_rfc1123 (now());
S := sprintf ('GET\n\n\n%s\n%s', dateUTC, path);
- authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);
- reqHdr := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+
commit work;
- xt := http_client_ext (DB.DBA.S3__makeHostUrl (path),
- http_method=>'GET',
- http_headers=>reqHdr,
- headers=>resHdr);
- -- dbg_obj_princ ('xt', xt);
- if (resHdr[0] like 'HTTP/1._ 4__ %' or resHdr[0] like 'HTTP/1._ 5__ %')
+ xt := http_client_ext (
+ DB.DBA.S3__makeUrl (path),
+ http_method=>'GET',
+ http_headers=>reqHeader,
+ headers=>retHeader
+ );
+ if (not DB.DBA.S3__exec_error (retHeader, 1))
{
- -- dbg_obj_princ ('xt', xt);
- return null;
+ DB.DBA.S3__activity (detcol_id, 'HTTP error: ' || xt);
+ return -28;
}
buckets := vector ();
xt := xml_tree_doc (xt);
@@ -274,15 +1412,20 @@ create function DB.DBA.S3__getBuckets (
if ((name = bucket) or isnull (bucket))
{
creationDate := stringdate (cast (xpath_eval ('./CreationDate', xtItem) as varchar));
- buckets := vector_concat (buckets, vector (
- vector ('path', '/' || name || '/',
- 'name', name,
- 'type', 'C',
- 'updated', creationDate,
- 'size', 0
- )
- )
- );
+ buckets := vector_concat (
+ buckets,
+ vector (
+ vector_concat (
+ subseq (soap_box_structure ('x', 1), 0, 2),
+ vector ('path', '/' || name || '/',
+ 'name', name,
+ 'type', 'C',
+ 'updated', creationDate,
+ 'size', 0
+ )
+ )
+ )
+ );
}
}
return buckets;
@@ -291,49 +1434,45 @@ create function DB.DBA.S3__getBuckets (
-------------------------------------------------------------------------------
--
--- select DB.DBA.S3__getBucket ('19T7EE0DC8XBDGF6SPG2', '7uCNPezCuQaaJzGasAxqnvb8DPhUZ3u0gVZy5GKG', '/openlink-test/probica/');
---
-create function DB.DBA.S3__getBucket (
- in accessCode varchar,
- in secretKey varchar,
+create function DB.DBA.S3__listBucket (
+ inout detcol_id any,
+ in params any,
in url varchar,
in delimiter varchar := '/')
{
- -- dbg_obj_princ ('DB.DBA.S3__getBucket (', accessCode, secretKey, url, ')');
+ -- dbg_obj_princ ('DB.DBA.S3__listBucket (', detcol_id, params, url, ')');
declare N integer;
declare dateUTC, authHeader, S, bucket, bucketPath varchar;
- declare reqHdr, resHdr, params varchar;
+ declare reqHeader, retHeader varchar;
declare xt, xtItems, buckets any;
- -- ?prefix=prefix;marker=marker;max-keys=max-keys;delimiter=delimiter
-
- bucket := '/' || DB.DBA.S3__getBucketFromUrl (url) || '/';
- bucketPath := DB.DBA.S3__getPathFromUrl (url);
+ bucket := '/' || DB.DBA.S3__bucketFromUrl (url) || '/';
+ bucketPath := DB.DBA.S3__pathFromUrl (url);
dateUTC := date_rfc1123 (now());
S := sprintf ('GET\n\n\n%s\n%s', dateUTC, bucket);
- authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);
- reqHdr := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
- params := sprintf ('?prefix=%U&marker=%s&delimiter=%s', bucketPath, '', delimiter);
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+
commit work;
- xt := http_client_ext (url=>DB.DBA.S3__makeHostUrl (bucket) || params,
- http_method=>'GET',
- http_headers=>reqHdr,
- headers=>resHdr);
- -- dbg_obj_princ ('xt', xt);
- if (resHdr[0] like 'HTTP/1._ 4__ %' or resHdr[0] like 'HTTP/1._ 5__ %')
+ xt := http_client_ext (
+ url=>DB.DBA.S3__makeUrl (bucket) || sprintf ('?prefix=%U&marker=%s&delimiter=%s', bucketPath, '', delimiter),
+ http_method=>'GET',
+ http_headers=>reqHeader,
+ headers=>retHeader
+ );
+ if (not DB.DBA.S3__exec_error (retHeader, 1))
{
- -- dbg_obj_princ ('DB.DBA.S3__getBucket - resHdr[0]', resHdr[0]);
- return null;
+ DB.DBA.S3__activity (detcol_id, 'HTTP error: ' || xt);
+ return -28;
}
- -- dbg_obj_princ ('xt', xt);
buckets := vector ();
xt := xml_tree_doc (xt);
xtItems := xpath_eval ('//Contents', xt, 0);
foreach (any xtItem in xtItems) do
{
- declare keyName, itemPath, itemName, itemType, lastModified, itemSize, itemETag any;
+ declare keyName, itemPath, itemName, itemType, lastModified, itemSize, itemETag, itemStorage any;
- keyName := cast (xpath_eval ('./Key', xtItem) as varchar);
+ keyName := serialize_to_UTF8_xml (xpath_eval ('string (./Key)', xtItem));
keyName := replace (keyName, bucketPath, '');
itemName := replace (keyName, '_\$folder\$', '');
itemType := case when (itemName <> keyName) then 'C' else 'R' end;
@@ -341,16 +1480,23 @@ create function DB.DBA.S3__getBucket (
lastModified := stringdate (cast (xpath_eval ('./LastModified', xtItem) as varchar));
itemSize := cast (xpath_eval ('./Size', xtItem) as integer);
itemETag := cast (xpath_eval ('./ETag', xtItem) as varchar);
- buckets := vector_concat (buckets, vector (
- vector ('path', itemPath,
- 'name', itemName,
- 'type', itemType,
- 'updated', lastModified,
- 'size', itemSize,
- 'etag', itemETag
- )
- )
- );
+ itemStorage := cast (xpath_eval ('./StorageClass', xtItem) as varchar);
+ buckets := vector_concat (
+ buckets,
+ vector (
+ vector_concat (
+ subseq (soap_box_structure ('x', 1), 0, 2),
+ vector ('path', itemPath,
+ 'name', itemName,
+ 'type', itemType,
+ 'updated', lastModified,
+ 'size', itemSize,
+ 'etag', itemETag,
+ 'storage', itemStorage
+ )
+ )
+ )
+ );
}
return buckets;
}
@@ -359,127 +1505,137 @@ create function DB.DBA.S3__getBucket (
-------------------------------------------------------------------------------
--
create function DB.DBA.S3__putObject (
- in accessCode varchar,
- in secretKey varchar,
- in s3Path varchar,
- inout s3Content any,
- inout s3Type any)
+ in detcol_id any,
+ in path_parts any,
+ in what varchar,
+ in content any := null,
+ in type any := null)
{
- -- dbg_obj_princ ('DB.DBA.S3__putObject (', accessCode, secretKey, s3Path, s3Content, s3Type, ')');
- declare dateUTC, authHeader, S, what, workPath varchar;
- declare reqHdr, resHdr, xt varchar;
-
- what := case when (chr (s3Path [length (s3Path) - 1]) = '/') then 'C' else 'R' end;
- workPath := DB.DBA.S3__encode (s3Path);
- if (trim (s3Path, '/') <> DB.DBA.S3__getBucketFromUrl (s3Path))
- workPath := rtrim (workPath, '/') || case when (what = 'C') then '_\$folder\$' end;
+ -- dbg_obj_princ ('DB.DBA.S3__putObject (', detcol_id, path_parts, what, ')');
+ declare dateUTC, authHeader, S, path, s3Path, workPath varchar;
+ declare reqHeader, retHeader, retValue, acl varchar;
+ declare params, item any;
+ declare path, what, encryption varchar;
+ declare id, davEntry any;
+
+ params := DB.DBA.S3__params (detcol_id);
dateUTC := date_rfc1123 (now());
- S := sprintf ('PUT\n\n%s\n%s\n%s', coalesce (s3Type, ''), dateUTC, workPath);
- authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);
- reqHdr := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
- if (not isnull (s3Type))
- reqHdr := sprintf ('%s\r\nContent-Type: %s', reqHdr, s3Type);
- if (not isnull (s3Content))
- reqHdr := sprintf ('%s\r\nContent-Length: %d', reqHdr, length(s3Content));
- commit work;
-
- xt := http_client_ext (url=>DB.DBA.S3__makeHostUrl (workPath),
- http_method=>'PUT',
- http_headers=>reqHdr,
- headers=>resHdr,
- body=>s3Content);
- if (resHdr[0] like 'HTTP/1._ 4__ %' or resHdr[0] like 'HTTP/1._ 5__ %')
- {
- -- dbg_obj_princ ('xt', xt);
- return -1;
- }
- return 1;
-}
-;
+ s3Path := DB.DBA.S3__parts2path (get_keyword ('bucket', params), path_parts, what);
--------------------------------------------------------------------------------
---
-create function DB.DBA.S3__headObject (
- in accessCode varchar,
- in secretKey varchar,
- in s3Path varchar,
- in what varchar,
- in s3Mode integer := 1)
-{
- -- dbg_obj_princ ('DB.DBA.S3__headObject (', accessCode, secretKey, s3Path, ')');
- declare dateUTC, authHeader, S, workPath varchar;
- declare reqHdr, resHdr varchar;
- declare item, xt any;
+ workPath := DB.DBA.S3__encode (s3Path);
+ if (trim (s3Path, '/') <> DB.DBA.S3__bucketFromUrl (s3Path))
+ workPath := rtrim (workPath, '/') || case when (what = 'C') then '_\$folder\$' end;
+
+ -- get ACL
+ S := sprintf ('GET\n\n\n%s\n%s', dateUTC, workPath || '?acl');
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+ commit work;
+ acl := http_client_ext (
+ url=>DB.DBA.S3__makeUrl (workPath) || '?acl',
+ http_method=>'GET',
+ http_headers=>reqHeader,
+ headers=>retHeader
+ );
+ if (not DB.DBA.S3__exec_error (retHeader, 1))
+ acl := null;
- item := connection_get ('S3__' || s3Path);
- if (isnull (item))
+ -- put object
+ encryption := connection_get ('amz-server-side-encryption');
+ if (isnull (encryption))
{
- if (trim (s3Path, '/') = DB.DBA.S3__getBucketFromUrl (s3Path))
+ path := DB.DBA.S3__path (detcol_id, path_parts);
+ what := case when ((length (path_parts) = 0) or (path_parts[length (path_parts) - 1] = '')) then 'C' else 'R' end;
+ id := DB.DBA.DAV_SEARCH_ID (path, what);
+ if (DB.DBA.DAV_HIDE_ERROR (id) is not null)
{
- -- bucket
- item := DB.DBA.S3__getBuckets (accessCode, secretKey, trim (s3Path, '/'));
- if (length (item) < 1)
- return null;
- item := item[0];
- } else {
- -- bucket object
- workPath := DB.DBA.S3__encode (s3Path);
- workPath := rtrim (workPath, '/') || case when (what = 'C') then '_\$folder\$' end;
- dateUTC := date_rfc1123 (now());
- S := sprintf ('HEAD\n\n\n%s\n%s', dateUTC, workPath);
- authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);
- reqHdr := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
- commit work;
- xt := http_client_ext (url=>DB.DBA.S3__makeHostUrl (workPath),
- http_method=>'HEAD',
- http_headers=>reqHdr,
- headers=>resHdr);
- if (resHdr[0] like 'HTTP/1._ 4__ %' or resHdr[0] like 'HTTP/1._ 5__ %')
+ davEntry := DB.DBA.S3__paramGet (id, what, 'Entry', 0);
+ if (davEntry is not null)
{
- -- dbg_obj_princ ('resHdr[0]', DB.DBA.S3__makeHostUrl (workPath), s3Path, resHdr[0]);
- return null;
+ davEntry := xtree_doc (davEntry);
+ encryption := DB.DBA.S3__entryXPath (davEntry, '/amz-server-side-encryption', 1);
}
- item := DB.DBA.S3__headers2item (resHdr, s3Path, what);
}
- connection_set ('S3__' || s3Path, item);
}
- if (s3Mode)
- return 1;
- return item;
-}
-;
+ if (coalesce (encryption, '') = 'AES256')
+ {
+ encryption := sprintf ('x-amz-server-side-encryption:%s', encryption);
+ S := sprintf ('PUT\n\n%s\n%s\n%s\n%s', coalesce (type, ''), dateUTC, encryption, workPath);
+ } else {
+ encryption := '';
+ S := sprintf ('PUT\n\n%s\n%s\n%s', coalesce (type, ''), dateUTC, workPath);
+ }
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+ if (not isnull (type))
+ reqHeader := sprintf ('%s\r\nContent-Type: %s', reqHeader, type);
+ if (not isnull (content))
+ reqHeader := sprintf ('%s\r\nContent-Length: %d', reqHeader, length (content));
--------------------------------------------------------------------------------
---
-create function DB.DBA.S3__getObject (
- in accessCode varchar,
- in secretKey varchar,
- in s3Path varchar)
-{
- -- dbg_obj_princ ('DB.DBA.S3__getObject (', accessCode, secretKey, s3Path, ')');
- declare dateUTC, authHeader, S, what, workPath varchar;
- declare reqHdr, resHdr varchar;
- declare xt, item any;
+ if (coalesce (encryption, '') <> '')
+ reqHeader := sprintf ('%s\r\n%s', reqHeader, encryption);
- workPath := DB.DBA.S3__encode (s3Path);
- what := case when (chr (s3Path [length (s3Path) - 1]) = '/') then 'C' else 'R' end;
- workPath := rtrim (workPath, '/') || case when (what = 'C') then '_\$folder\$' end;
- dateUTC := date_rfc1123 (now());
- S := sprintf ('GET\n\n\n%s\n%s', dateUTC, workPath);
- authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);
- reqHdr := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
commit work;
- xt := http_client_ext (url=>DB.DBA.S3__makeHostUrl (workPath),
- http_method=>'GET',
- http_headers=>reqHdr,
- headers=>resHdr);
- if (resHdr[0] like 'HTTP/1._ 4__ %' or resHdr[0] like 'HTTP/1._ 5__ %')
+ retValue := http_client_ext (
+ url=>DB.DBA.S3__makeUrl (workPath),
+ http_method=>'PUT',
+ http_headers=>reqHeader,
+ headers=>retHeader,
+ body=>content
+ );
+ if (not DB.DBA.S3__exec_error (retHeader, 1))
{
- -- dbg_obj_princ ('xt', xt);
- return null;
+ DB.DBA.S3__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
}
- item := vector_concat (vector ('content', xt), DB.DBA.S3__headers2item (resHdr, s3Path, what));
+ -- put ACL
+ if (not isnull (acl))
+ {
+ S := sprintf ('PUT\n\n\n%s\n%s', dateUTC, workPath || '?acl');
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+ commit work;
+ acl := http_client_ext (
+ url=>DB.DBA.S3__makeUrl (workPath) || '?acl',
+ http_method=>'PUT',
+ http_headers=>reqHeader,
+ headers=>retHeader,
+ body=>acl
+ );
+ }
+
+ -- get object info
+ S := sprintf ('HEAD\n\n\n%s\n%s', dateUTC, workPath);
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+ commit work;
+ retValue := http_client_ext (
+ url=>DB.DBA.S3__makeUrl (workPath),
+ http_method=>'HEAD',
+ http_headers=>reqHeader,
+ headers=>retHeader
+ );
+ if (not DB.DBA.S3__exec_error (retHeader, 1))
+ {
+ DB.DBA.S3__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
+ }
+ item := vector_concat (
+ subseq (soap_box_structure ('x', 1), 0, 2),
+ vector ('path', s3Path,
+ 'name', DB.DBA.S3__nameFromUrl (s3Path),
+ 'type', what,
+ 'etag', http_request_header (retHeader, 'ETag'),
+ 'size', cast (http_request_header (retHeader, 'Content-Length') as integer),
+ 'mimeType', http_request_header (retHeader, 'Content-Type'),
+ 'updated', http_string_date (coalesce (http_request_header (retHeader, 'Last-Modified', null, null), http_request_header (retHeader, 'Date', null, null))),
+ 'storage', 'STANDARD',
+ 'amz-server-side-encryption', http_request_header (retHeader, 'x-amz-server-side-encryption', null, null),
+ 'amz-request-id', http_request_header (retHeader, 'x-amz-request-id', null, null),
+ 'amz-id-2', http_request_header (retHeader, 'x-amz-id-2', null, null)
+ )
+ );
return item;
}
;
@@ -487,504 +1643,364 @@ create function DB.DBA.S3__getObject (
-------------------------------------------------------------------------------
--
create function DB.DBA.S3__deleteObject (
- in accessCode varchar,
- in secretKey varchar,
- in s3Path varchar)
+ in detcol_id any,
+ in path varchar,
+ in id any,
+ in what varchar)
{
-- dbg_obj_princ ('DB.DBA.S3__deleteObject (', accessCode, secretKey, s3Path, ')');
- declare dateUTC, authHeader, S, what, workPath varchar;
- declare reqHdr, resHdr varchar;
- declare items, xt any;
+ declare N integer;
+ declare dateUTC, authHeader, S, s3Path, workPath varchar;
+ declare reqHeader, retHeader, retValue, content varchar;
+ declare params any;
+ params := DB.DBA.S3__params (detcol_id);
dateUTC := date_rfc1123 (now());
- what := case when (chr (s3Path [length (s3Path) - 1]) = '/') then 'C' else 'R' end;
- items := vector (vector ('path', s3Path));
- if (what = 'c')
- items := vector_concat (items, DB.DBA.S3__getBucket (accessCode, secretKey, s3Path, ''));
+ s3Path := DB.DBA.S3__paramGet (id, what, 'path', 0);
- foreach (any item in items) do
+ N := 0;
+ content := '<?xml version="1.0" encoding="UTF-8"?><Delete><Quiet>false</Quiet>';
+ if ((what = 'R') or (trim (s3Path, '/') <> DB.DBA.S3__bucketFromUrl (s3Path)))
+ {
+ N := N + 1;
+ content := content || sprintf ('<Object><Key>%V</Key></Object>', DB.DBA.S3__workPath (id, what));
+ }
+ if (what = 'C')
{
- s3Path := get_keyword ('path', item);
- what := case when (chr (s3Path [length (s3Path) - 1]) = '/') then 'C' else 'R' end;
+ for (select COL_ID from WS.WS.SYS_DAV_COL where WS.WS.COL_PATH (COL_ID) like path || '%' and WS.WS.COL_PATH (COL_ID) <> path) do
+ {
+ N := N + 1;
+ content := content || sprintf ('<Object><Key>%V</Key></Object>', DB.DBA.S3__workPath (COL_ID, 'C'));
+ }
+ for (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH like path || '%') do
+ {
+ N := N + 1;
+ content := content || sprintf ('<Object><Key>%V</Key></Object>', DB.DBA.S3__workPath (RES_ID, 'R'));
+ }
+ }
+ content := content || '</Delete>';
+ if (N = 0)
+ goto _skip;
+
+ workPath := DB.DBA.S3__encode ('/' || DB.DBA.S3__bucketFromUrl (s3Path) || '/');
+ S := sprintf ('POST\n%s\n%s\n%s\n%s', DB.DBA.S3__md5 (content), 'text/xml', dateUTC, workPath || '?delete');
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf (
+ 'Authorization: %s\r\n' ||
+ 'Date: %s\r\n' ||
+ 'Content-MD5: %s\r\n' ||
+ 'Content-Type: %s\r\n' ||
+ 'Content-Length: %d\r\n',
+ authHeader,
+ dateUTC,
+ DB.DBA.S3__md5 (content),
+ 'text/xml',
+ length (content)
+ );
+ commit work;
+ retValue := http_client_ext (
+ url=>DB.DBA.S3__makeUrl (workPath) || '?delete',
+ http_method=>'POST',
+ http_headers=>reqHeader,
+ headers=>retHeader,
+ body=>content
+ );
+ if (not DB.DBA.S3__exec_error (retHeader, 1))
+ {
+ DB.DBA.S3__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
+ }
+
+_skip:;
+ if ((what = 'C') and (trim (s3Path, '/') = DB.DBA.S3__bucketFromUrl (s3Path)))
+ {
+ -- delete bucket
workPath := DB.DBA.S3__encode (s3Path);
- if (trim (s3Path, '/') <> DB.DBA.S3__getBucketFromUrl (s3Path))
- workPath := rtrim (workPath, '/') || case when (what = 'C') then '_\$folder\$' end;
S := sprintf ('DELETE\n\n\n%s\n%s', dateUTC, workPath);
- authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);
- reqHdr := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
commit work;
- http_client_ext (url=>DB.DBA.S3__makeHostUrl (workPath),
- http_method=>'DELETE',
- http_headers=>reqHdr,
- headers=>resHdr);
- if (resHdr[0] like 'HTTP/1._ 4__ %' or resHdr[0] like 'HTTP/1._ 5__ %')
+ retValue := http_client_ext (
+ url=>DB.DBA.S3__makeUrl (workPath),
+ http_method=>'DELETE',
+ http_headers=>reqHeader,
+ headers=>retHeader
+ );
+ if (not DB.DBA.S3__exec_error (retHeader, 1))
{
- -- dbg_obj_princ ('xt', xt);
- return -1;
+ DB.DBA.S3__activity (detcol_id, 'HTTP error: ' || retValue);
+ return -28;
}
- connection_set ('S3__' || s3Path, null);
}
return 1;
}
;
---| 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 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)
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__activity (
+ in detcol_id integer,
+ in text varchar)
{
- -- dbg_obj_princ ('S3_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, ')');
- if (auth_uid >= 0)
- return auth_uid;
- return -12;
-}
-;
-
---| 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 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
-{
- -- dbg_obj_princ ('S3_DAV_AUTHENTICATE_HTTP (', id, what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
- declare rc integer;
- declare puid, pgid integer;
- declare u_password, pperms varchar;
- declare allow_anon integer;
-
- if (length (req) <> 3)
- return -15;
-
- whenever not found goto nf_col_or_res;
- puid := http_dav_uid();
- pgid := coalesce
- (
- ( select G_ID
- from WS.WS.SYS_DAV_GROUP
- where G_NAME = 'S3_' || coalesce ((select COL_NAME
- from WS.WS.SYS_DAV_COL
- where COL_ID = id[1] and COL_DET = 'S3'), '')
- ),
- puid+1
- );
- pperms := '110100100NN';
- if ((what <> 'R') and (what <> 'C'))
- return -14;
- allow_anon := WS.WS.PERM_COMP (substring (cast (pperms as varchar), 7, 3), req);
- if (a_uid is null)
- {
- if ((not allow_anon) or ('' <> WS.WS.FINDPARAM (a_lines, 'Authorization:')))
- rc := WS.WS.GET_DAV_AUTH (a_lines, allow_anon, can_write_http, a_uname, u_password, a_uid, a_gid, _perms);
- if (rc < 0)
- return rc;
- }
- if (isinteger (a_uid))
- {
- if (a_uid < 0)
- return a_uid;
- if (a_uid = 1) -- Anonymous FTP
+ -- dbg_obj_princ ('DB.DBA.S3__activity (', detcol_id, text, ')');
+ declare parentId integer;
+ declare parentPath varchar;
+ declare activity_id integer;
+ declare activity, activityName, activityPath, activityContent, activityType varchar;
+ declare davEntry any;
+ declare _errorCount integer;
+ declare exit handler for sqlstate '*'
+ {
+ if (__SQL_STATE = '40001')
{
- a_uid := http_nobody_uid ();
- a_gid := http_nogroup_gid ();
- }
- }
- if (DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))
- return a_uid;
- return -13;
-
-nf_col_or_res:
- return -1;
-}
-;
-
---| This should return ID of the collection that contains resource or collection with given ID,
---| Possible ambiguity (such as symlinks etc.) should be resolved by using path.
---| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
-create function DB.DBA."S3_DAV_GET_PARENT" (in id any, in st char(1), in path varchar) returns any
-{
- -- dbg_obj_princ ('S3_DAV_GET_PARENT (', id, st, path, ')');
- return -20;
-}
-;
+ rollback work;
+ if (_errorCount > 5)
+ resignal;
---| 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 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
-{
- -- dbg_obj_princ ('S3_DAV_COL_CREATE (', detcolID, pathParts, permissions, uid, gid, auth_uid, ')');
- declare bucket, accessCode, secretKey, s3Path, s3Content, s3Type varchar;
+ delay (1);
+ _errorCount := _errorCount + 1;
+ goto _start;
+ }
+ return;
+ };
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- s3Path := DB.DBA.S3__parts2path (bucket, pathParts, 'C');
- s3Content := null;
- s3Type := null;
- if (DB.DBA.S3__putObject (accessCode, secretKey, s3Path, s3Content, s3Type) < 1)
- return -1;
- return vector (UNAME'S3', detcolID, s3Path);
-}
-;
+ _errorCount := 0;
---| When DAV_DELETE_INT calls DET function, authentication and check for lock are passed.
-create function DB.DBA."S3_DAV_DELETE" (
- in detcolID any,
- in pathParts any,
- in what char(1),
- in silent integer,
- in auth_uid integer) returns integer
-{
- -- dbg_obj_princ ('S3_DAV_DELETE (', detcolID, pathParts, what, silent, auth_uid, ')');
- declare bucket, accessCode, secretKey, s3Path varchar;
+_start:;
+ activity := DB.DBA.S3__paramGet (detcol_id, 'C', 'activity', 0);
+ if (activity is null)
+ return;
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- s3Path := DB.DBA.S3__parts2path (bucket, pathParts, what);
- return DB.DBA.S3__deleteObject (accessCode, secretKey, s3Path);
-}
-;
+ if (activity <> 'on')
+ return;
---| 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 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;
-}
-;
+ davEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcol_id, 'C', '', null, null, http_dav_uid ());
+ if (DB.DBA.DAV_HIDE_ERROR (davEntry) is null)
+ return;
---| 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.
---| It should delete any dead property even if the name looks like system name.
-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
-{
- -- dbg_obj_princ ('S3_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
- return -20;
-}
-;
+ parentId := DB.DBA.DAV_SEARCH_ID (davEntry[0], 'P');
+ if (DB.DBA.DAV_HIDE_ERROR (parentId) is null)
+ return;
---| 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 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
-{
- -- dbg_obj_princ ('S3_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
- if (propname[0] = 58)
- return -16;
+ parentPath := DB.DBA.DAV_SEARCH_PATH (parentId, 'C');
+ if (DB.DBA.DAV_HIDE_ERROR (parentPath) is null)
+ return;
- return -20;
-}
-;
+ activityContent := '';
+ activityName := davEntry[10] || '_activity.log';
+ activityPath := parentPath || activityName;
+ activity_id := DB.DBA.DAV_SEARCH_ID (activityPath, 'R');
+ if (DB.DBA.DAV_HIDE_ERROR (activity_id) is not null)
+ {
+ DB.DBA.DAV_RES_CONTENT_INT (activity_id, activityContent, activityType, 0, 0);
+ if (activityType <> 'text/plain')
+ return;
---| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
-create function DB.DBA."S3_DAV_PROP_GET" (in id any, in what char(0), in propname varchar, in auth_uid integer)
-{
- -- dbg_obj_princ ('S3_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
- return -11;
+ activityContent := cast (activityContent as varchar);
+ }
+ activityContent := activityContent || sprintf ('%s %s\r\n', subseq (datestring (now ()), 0, 19), text);
+ activityType := 'text/plain';
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (activityPath, activityContent, activityType, '110100000RR', DB.DBA.S3__user (davEntry[6]), DB.DBA.S3__user (davEntry[7]), extern=>0, check_locks=>0);
+ commit work;
}
;
---| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
---| The returned list should contain only user properties.
-create function DB.DBA."S3_DAV_PROP_LIST" (in id any, in what char(0), in propmask varchar, in auth_uid integer)
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__downloads (
+ in detcol_id integer,
+ in downloads any)
{
- -- dbg_obj_princ ('S3_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
- return vector ();
-}
-;
+ declare aq any;
---| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
-create function DB.DBA."S3_DAV_DIR_SINGLE" (
- in id any,
- in what char(0),
- in path any,
- in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('S3_DAV_DIR_SINGLE (', id, what, path, auth_uid, ')');
- declare detcolID integer;
- declare bucket, accessCode, secretKey, detcolPath, s3Path varchar;
- declare s3Object any;
+ if (length (downloads) = 0)
+ return;
- detcolID := id[1];
- s3Path := id[2];
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- s3Object := DB.DBA.S3__headObject (accessCode, secretKey, s3Path, what, 0);
- if (isnull (s3Object))
- return -1;
- detcolPath := DB.DBA.DAV_SEARCH_PATH (detcolID, 'C');
- return DB.DBA.S3__item2entry (detcolID, detcolPath, bucket, s3Object);
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.S3__downloads_aq', vector (detcol_id, downloads));
}
;
---| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
-create function DB.DBA."S3_DAV_DIR_LIST" (
- in detcolID any,
- in pathParts any,
- in detcol_pathParts any,
- in name_mask varchar,
- in recursive integer,
- in auth_uid integer) returns any
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__downloads_aq (
+ in detcol_id integer,
+ in downloads any)
{
- -- dbg_obj_princ ('S3_DAV_DIR_LIST (', detcolID, pathParts, detcol_pathParts, name_mask, recursive, auth_uid, ')');
- declare N integer;
- declare bucket, accessCode, secretKey, s3Path varchar;
- declare detcolPath varchar;
- declare res, items any;
-
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- if (is_empty_or_null (bucket) and (length (pathParts) = 1) and pathParts[0] = '')
- {
- s3Path := '/';
- items := DB.DBA.S3__getBuckets (accessCode, secretKey);
- }
- else
+ -- dbg_obj_princ ('DB.DBA.S3__downloads_aq (', detcol_id, downloads, ')');
+ declare N, downloaded integer;
+ declare url, listID varchar;
+ declare params, items, boxItem, listEntry, davEntry any;
+ declare retValue, authHeader, reqHeader, retHeader any;
+ declare S, dateUTC, path varchar;
+
+ set_user_id ('dba');
+ N := 0;
+ items := vector ();
+ DB.DBA.S3__activity (detcol_id, sprintf ('Downloading %d file(s)', length (downloads)));
+ params := DB.DBA.S3__params (detcol_id);
+ foreach (any download in downloads) do
{
- s3Path := DB.DBA.S3__parts2path (bucket, pathParts, 'C');
- items := DB.DBA.S3__getBucket (accessCode, secretKey, s3Path);
+ downloaded := DB.DBA.S3__paramGet (download[0], download[1], 'download', 0);
+ if (downloaded is null)
+ goto _continue;
+
+ downloaded := cast (downloaded as integer);
+ if (downloaded > 5)
+ goto _continue;
+
+ listID := DB.DBA.S3__paramGet (download[0], download[1], 'path', 0);
+ if (listID is null)
+ goto _continue;
+
+ path := DB.DBA.S3__encode (listID);
+ dateUTC := date_rfc1123 (now());
+ S := sprintf ('GET\n\n\n%s\n%s', dateUTC, path);
+ authHeader := DB.DBA.S3__makeAWSHeader (params, S);
+ reqHeader := sprintf ('Authorization: %s\r\nDate: %s', authHeader, dateUTC);
+ retValue := http_client_ext (url=>DB.DBA.S3__makeUrl (path),
+ http_method=>'GET',
+ http_headers=>reqHeader,
+ headers=>retHeader);
+ if (DAV_HIDE_ERROR (retValue) is not null)
+ {
+ update WS.WS.SYS_DAV_RES set RES_CONTENT = retValue where RES_ID = DB.DBA.S3__davId (download[0]);
+ DB.DBA.S3__paramRemove (download[0], download[1], 'download');
+ davEntry := DB.DBA.S3__paramGet (download[0], download[1], 'Entry', 0);
+ if (davEntry is not null)
+ {
+ davEntry := xtree_doc (davEntry);
+ DB.DBA.S3__entryXMLUpdate (davEntry, 'amz-server-side-encryption', http_request_header (retHeader, 'x-amz-server-side-encryption', null, null));
+ DB.DBA.S3__entryXMLUpdate (davEntry, 'amz-request-id', http_request_header (retHeader, 'x-amz-request-id', null, null));
+ DB.DBA.S3__entryXMLUpdate (davEntry, 'amz-id-2', http_request_header (retHeader, 'x-amz-id-2', null, null));
+ DB.DBA.S3__paramSet (download[0], download[1], 'Entry', DB.DBA.S3__xml2string (davEntry), 0);
+ }
+ items := vector_concat (items, vector (download));
+ N := N + 1;
+ }
+ commit work;
+
+ _continue:;
}
- detcolPath := DB.DBA.DAV_CONCAT_PATH (detcol_pathParts, '/');
- res := vector ();
- for (N := 0; N < length (items); N := N + 1)
+ DB.DBA.S3__activity (detcol_id, sprintf ('Downloaded %d file(s)', N));
+ foreach (any item in items) do
{
- res := vector_concat (res, vector (DB.DBA.S3__item2entry (detcolID, detcolPath, bucket, items[N])));
+ DB.DBA.S3__rdf_delete (detcol_id, item[0], item[1]);
+ DB.DBA.S3__rdf_insert (detcol_id, item[0], item[1]);
}
- return res;
-}
-;
-
---| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
-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
-{
- -- dbg_obj_princ ('S3_DAV_DIR_FILTER (', detcolID, pathParts, detcol_path, compilation, recursive, 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 DB.DBA."S3_DAV_SEARCH_ID" (
- in detcolID any,
- in pathParts any,
- in what char(1)) returns any
-{
- -- dbg_obj_princ ('S3_DAV_SEARCH_ID (', detcolID, pathParts, what, ')');
- declare bucket, accessCode, secretKey, s3Path varchar;
- declare s3Object any;
-
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- s3Path := DB.DBA.S3__parts2path (bucket, pathParts, what);
- s3Object := DB.DBA.S3__headObject (accessCode, secretKey, s3Path, what, 1);
- if (isnull (s3Object))
- return -1;
- return vector (UNAME'S3', detcolID, s3Path);
}
;
---| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
-create function DB.DBA."S3_DAV_SEARCH_PATH" (
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__rdf (
+ in detcol_id integer,
in id any,
- in what char(1)) returns any
+ in what varchar)
{
- -- dbg_obj_princ ('S3_DAV_SEARCH_PATH (', id, what, ')');
- declare detcolID integer;
- declare bucket, accessCode, secretKey, detcolPath, s3Path varchar;
- declare s3Object any;
+ declare aq any;
- detcolID := id[1];
- detcolPath := coalesce ((select WS.WS.COL_PATH (COL_ID) from WS.WS.SYS_DAV_COL where COL_ID = detcolID and COL_DET = 'S3'));
- if (detcolPath is null)
- return -23;
- s3Path := id[2];
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- s3Object := DB.DBA.S3__headObject (accessCode, secretKey, s3Path, what, 0);
- if (isnull (s3Object))
- return -23;
- return rtrim (detcolPath, '/') || get_keyword ('path', s3Object);
+ set_user_id ('dba');
+ aq := async_queue (1);
+ aq_request (aq, 'DB.DBA.S3__rdf_aq', vector (detcol_id, id, what));
}
;
-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__rdf_aq (
+ in detcol_id integer,
+ in id any,
+ in what varchar)
{
- -- dbg_obj_princ ('S3_DAV_RES_UPLOAD (', detcolID, pathParts, ', [content], ', type, permissions, uid, gid, auth_uid, ')');
- declare bucket, accessCode, secretKey, s3Path varchar;
-
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- s3Path := DB.DBA.S3__parts2path (bucket, pathParts, 'R');
- if (DB.DBA.S3__putObject (accessCode, secretKey, s3Path, content, type) < 1)
- return -1;
- return vector (UNAME'S3', detcolID, s3Path);
+ set_user_id ('dba');
+ DB.DBA.S3__rdf_delete (detcol_id, id, what);
+ DB.DBA.S3__rdf_insert (detcol_id, id, what);
}
;
---| 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 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
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__rdf_insert (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
{
- -- dbg_obj_princ ('S3_DAV_RES_UPLOAD_COPY (', detcolID, pathParts, sourceID, what, overwrite_flags, permissions, uid, gid, auth_uid, ')');
- if (what = 'R')
+ -- dbg_obj_princ ('DB.DBA.S3__rdf_insert (', detcol_id, id, what, rdf_graph, ')');
+ declare permissions, rdf_graph2 varchar;
+ declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;
+ declare path, content, type any;
+ declare exit handler for sqlstate '*'
{
- declare bucket, accessCode, secretKey, s3Path varchar;
-
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- s3Path := DB.DBA.S3__parts2path (bucket, pathParts, 'R');
+ return;
+ };
- declare rc integer;
- declare sourceContent, sourceMimeType any;
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.S3__paramGet (detcol_id, 'C', 'graph', 0);
- rc := DB.DBA.DAV_RES_CONTENT_INT (sourceID, sourceContent, sourceMimeType, 0, 0);
- if (rc < 0)
- return rc;
-
- sourceContent := case when (__tag (sourceContent) = 126) then blob_to_string (sourceContent) else sourceContent end;
- if (DB.DBA.S3__putObject (accessCode, secretKey, s3Path, sourceContent, sourceMimeType) < 1)
- return -28;
-
- return vector (UNAME'S3', detcolID, s3Path);
- }
- return -20;
-}
-;
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
---| 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 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
-{
- -- dbg_obj_princ ('S3_DAV_RES_UPLOAD_MOVE (', detcolID, pathParts, sourceID, what, overwrite_flags, auth_uid, ')');
- if (what = 'R')
+ permissions := DB.DBA.S3__paramGet (detcol_id, 'C', ':virtpermissions', 0, 0);
+ if (permissions[6] = ascii('0'))
{
- declare rc integer;
- declare sourcePath, sourceContent, sourceMimeType any;
- declare bucket, accessCode, secretKey, s3Path varchar;
-
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
- s3Path := DB.DBA.S3__parts2path (bucket, pathParts, 'R');
-
- rc := DB.DBA.DAV_RES_CONTENT_INT (sourceID, sourceContent, sourceMimeType, 0, 0);
- if (rc < 0)
- return rc;
-
- sourceContent := case when (__tag (sourceContent) = 126) then blob_to_string (sourceContent) else sourceContent end;
- if (DB.DBA.S3__putObject (accessCode, secretKey, s3Path, sourceContent, sourceMimeType) < 1)
- return -28;
-
- sourcePath := DB.DBA.DAV_SEARCH_PATH (sourceID, 'R');
- if (not isnull (sourcePath))
- DB.DBA.DAV_DELETE_INT (sourcePath, 1, null, null, 0);
-
- return vector (UNAME'S3', detcolID, s3Path);
+ -- add to private graphs
+ if (not SIOC..private_graph_check (rdf_graph))
+ return;
}
- 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 DB.DBA."S3_DAV_RES_CONTENT" (
- in id any,
- inout content any,
- out type varchar,
- in content_mode integer) returns integer
-{
- -- dbg_obj_princ ('S3_DAV_RES_CONTENT (', id, ', [content], [type], ', content_mode, ')');
- declare detcolID integer;
- declare bucket, accessCode, secretKey, s3Path varchar;
- declare s3Object, s3Content any;
- detcolID := id[1];
- s3Path := id[2];
- DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);
+ id := DB.DBA.S3__davId (id);
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = id);
+ type := (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = id);
+ rdf_sponger := coalesce (DB.DBA.S3__paramGet (detcol_id, 'C', 'sponger', 0), 'on');
+ rdf_cartridges := coalesce (DB.DBA.S3__paramGet (detcol_id, 'C', 'cartridges', 0), '');
+ rdf_metaCartridges := coalesce (DB.DBA.S3__paramGet (detcol_id, 'C', 'metaCartridges', 0), '');
- s3Object := DB.DBA.S3__getObject (accessCode, secretKey, s3Path);
- if (isnull (s3Object))
- return -1;
-
- s3Content := get_keyword ('content', s3Object);
- type := get_keyword ('mimeType', s3Object);
- if ((content_mode = 0) or (content_mode = 2))
- content := s3Content;
- else if (content_mode = 1)
- http (s3Content, content);
- else if (content_mode = 3)
- http (s3Content);
-
- return 0;
+ RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);
}
;
---| This adds an extra access path to the existing resource or collection.
-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
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__rdf_delete (
+ in detcol_id integer,
+ in id any,
+ in what varchar,
+ in rdf_graph varchar := null)
{
- -- dbg_obj_princ ('S3_DAV_SYMLINK (', detcolID, pathParts, sourceID, overwrite, uid, gid, auth_uid, ')');
- return -20;
-}
-;
+ -- dbg_obj_princ ('DB.DBA.S3__rdf_delete (', detcol_id, id, what, rdf_graph, ')');
+ declare rdf_graph2 varchar;
+ declare path varchar;
---| 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 DB.DBA."S3_DAV_DEREFERENCE_LIST" (in detcolID any, inout report_array any) returns any
-{
- -- dbg_obj_princ ('S3_DAV_DEREFERENCE_LIST (', detcolID, report_array, ')');
- return -20;
-}
-;
+ if (isnull (rdf_graph))
+ rdf_graph := DB.DBA.S3__paramGet (detcol_id, 'C', 'graph', 0);
---| 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 DB.DBA."S3_DAV_RESOLVE_PATH" (in detcolID any, inout reference_item any, inout old_base varchar, inout new_base varchar) returns any
-{
- -- dbg_obj_princ ('S3_DAV_RESOLVE_PATH (', detcolID, reference_item, old_base, new_base, ')');
- return -20;
-}
-;
+ if (DB.DBA.is_empty_or_null (rdf_graph))
+ return;
---| 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 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
-{
- -- dbg_obj_princ ('S3_DAV_LOCK (', path, id, type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, ')');
- return -20;
-}
-;
+ path := DB.DBA.DAV_SEARCH_PATH (id, what);
+ if (path like '%.gz')
+ path := regexp_replace (path, '\.gz\x24', '');
---| 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 DB.DBA."S3_DAV_UNLOCK" (in id any, in type char(1), in token varchar, in auth_uid integer)
-{
- -- dbg_obj_princ ('S3_DAV_UNLOCK (', id, type, token, auth_uid, ')');
- return -27;
+ rdf_graph2 := 'http://local.virt' || path;
+ SPARQL delete from graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };
+ SPARQL clear graph ?:rdf_graph2;
}
;
---| 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 DB.DBA."S3_DAV_IS_LOCKED" (inout id any, inout Type char(1), in owned_tokens varchar) returns integer
+-------------------------------------------------------------------------------
+--
+create function DB.DBA.S3__refresh (
+ in path varchar)
{
- -- dbg_obj_princ ('S3_DAV_IS_LOCKED (', id, type, owned_tokens, ')');
- declare rc integer;
- declare orig_id any;
- declare orig_type char(1);
+ -- dbg_obj_princ ('DB.DBA.S3__refresh (', path, ')');
+ declare colId any;
- -- save
- orig_id := id;
- orig_type := type;
-
- ID := orig_id[1];
- Type := 'C';
- rc := DB.DBA.DAV_IS_LOCKED_INT (id, type, owned_tokens);
-
- -- restore
- id := orig_id;
- Type := orig_type;
- if (rc <> 0)
- return rc;
- 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 DB.DBA."S3_DAV_LIST_LOCKS" (in id any, in type char(1), in recursive integer) returns any
-{
- -- dbg_obj_princ ('S3_DAV_LIST_LOCKS (', id, type, recursive);
- return vector ();
+ colId := DB.DBA.DAV_SEARCH_ID (path, 'C');
+ if (DAV_HIDE_ERROR (colId) is not null)
+ DB.DBA.S3__paramRemove (colId, 'C', 'syncTime');
}
;
diff --git a/binsrc/dav/DET_Stub.sql b/binsrc/dav/DET_Stub.sql
index 4cfab12..b4bf9fe 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.1 2011/10/13 18:28:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_nntp.sql b/binsrc/dav/DET_nntp.sql
index 5a7c6d9..e57e0c5 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DET_oMail.sql b/binsrc/dav/DET_oMail.sql
index 8b8a9c9..4966bbb 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DETtest.sql b/binsrc/dav/DETtest.sql
index e459a03..4d9a781 100644
--- a/binsrc/dav/DETtest.sql
+++ b/binsrc/dav/DETtest.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETtest.sql,v 1.1 2007/03/26 14:47:01 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/DETtest_CatFilter.sql b/binsrc/dav/DETtest_CatFilter.sql
index 6fc62f2..efa9897 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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.1 2009/11/20 17:11:24 source Exp $$</virtrdf:version>
+ <virtrdf:version>$$Id$$</virtrdf:version>
</owl:Ontology>
', ses);
diff --git a/binsrc/dav/DETtest_sec.sql b/binsrc/dav/DETtest_sec.sql
index 6136eed..eec3d3a 100644
--- a/binsrc/dav/DETtest_sec.sql
+++ b/binsrc/dav/DETtest_sec.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETtest_sec.sql,v 1.1 2007/03/26 14:47:01 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/Makefile.am b/binsrc/dav/Makefile.am
index ca0c8eb..862d90c 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/dav/Makefile.in b/binsrc/dav/Makefile.in
index 4af3631..a06f550 100644
--- a/binsrc/dav/Makefile.in
+++ b/binsrc/dav/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -297,14 +291,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/dav/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/dav/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/dav/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/dav/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -322,7 +316,6 @@ $(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
@@ -352,17 +345,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -390,7 +379,6 @@ clean-generic:
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"
@@ -409,8 +397,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -419,28 +405,18 @@ install-data-am:
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
@@ -474,7 +450,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/dav/Versioning/DETVerTest.m4 b/binsrc/dav/Versioning/DETVerTest.m4
index 64551c2..eaeb905 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/Versioning/DETVerTest.sql b/binsrc/dav/Versioning/DETVerTest.sql
index 3102f54..10d97cb 100644
--- a/binsrc/dav/Versioning/DETVerTest.sql
+++ b/binsrc/dav/Versioning/DETVerTest.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETVerTest.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -24,7 +24,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/Versioning/DETVerTest2.sql b/binsrc/dav/Versioning/DETVerTest2.sql
index 4125394..8f58b23 100644
--- a/binsrc/dav/Versioning/DETVerTest2.sql
+++ b/binsrc/dav/Versioning/DETVerTest2.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETVerTest2.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/Versioning/DET_Versioning.sql b/binsrc/dav/Versioning/DET_Versioning.sql
index 23603f2..1d92077 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.2 2011/07/20 09:48:38 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/Versioning/GNUmakefile b/binsrc/dav/Versioning/GNUmakefile
index 7b6d71f..ed3d9ac 100644
--- a/binsrc/dav/Versioning/GNUmakefile
+++ b/binsrc/dav/Versioning/GNUmakefile
@@ -5,6 +5,7 @@ endif
.SUFFIXES: .sql .m4
+.PHONY: all
all: test
.m4.sql:
diff --git a/binsrc/dav/Versioning/dav_ver_new.sql b/binsrc/dav/Versioning/dav_ver_new.sql
index dc52b25..f013cf6 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/Versioning/test.m4 b/binsrc/dav/Versioning/test.m4
index 741a5e0..c5d9d6b 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/dav-rdf-schema-example.rdf b/binsrc/dav/dav-rdf-schema-example.rdf
index 5983790..18657ae 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/dav/dav.sql b/binsrc/dav/dav.sql
index 2900669..e6d6a3b 100644
--- a/binsrc/dav/dav.sql
+++ b/binsrc/dav/dav.sql
@@ -1,12 +1,12 @@
--
--- $Id: dav.sql,v 1.20.2.15 2011/10/13 18:28:52 source Exp $
+-- $Id$
--
-- WebDAV support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -25,6 +25,59 @@
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);
@@ -34,116 +87,123 @@ create procedure WS.WS."OPTIONS" (in path varchar, inout params varchar, in line
http_status_set (200);
http_rewrite ();
http_header (concat (sprintf ('Content-Type: %s\r\n', ctype),
- 'DAV: 1,2,<http://www.openlinksw.com/virtuoso/webdav/1.0>\r\n',
- sprintf ('MS-Author-Via: %s\r\n', msauthor)));
+ 'DAV: 1,2,<http://www.openlinksw.com/virtuoso/webdav/1.0>\r\n',
+ sprintf ('MS-Author-Via: %s\r\n', msauthor)));
}
;
create procedure WS.WS.PROPFIND (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 integer;
-
- _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';
- 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);
- }
- -- dbg_obj_princ ('Authentication in PROPFIND gives ', rc, 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;
+ 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 integer;
+ --dbg_obj_princ ('WS.WS.PROPFIND (', path, params, lines, ')');
+
+ _ses := aref_set_0 (params, 1);
+ _body := string_output_string (_ses);
+ _lpath := http_path ();
+ _ppath := http_physical_path ();
+ if (_lpath = '')
+ _lpath := '/';
+ id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(''), path, vector('')), 'C'));
+ if (id is not null)
+ 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;
+ }
}
- return;
- }
- if (strstr (WS.WS.FINDPARAM (lines, 'User-Agent:'), 'Microsoft') is not null)
- _ms_date := 1;
- else
- _ms_date := 0;
+ _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;
+ _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);
- }
+ 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, '/');
+ if (st = 'C' and aref (_lpath, length (_lpath) - 1) <> ascii ('/'))
+ _lpath := concat (_lpath, '/');
- -- Any properties
- _props := WS.WS.PROPNAMES (_body);
+ -- Any properties
+ _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;
- }
+ {
+ WS.WS.CUSTOM_PROP (_lpath, _props, _depth, st);
+ return;
+ }
- http_request_status ('HTTP/1.1 207 Multi-Status');
- 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');
+ 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');
+ 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');
}
;
@@ -151,125 +211,124 @@ create procedure WS.WS.PROPFIND (in path varchar, inout params varchar, in lines
--!AFTER
--#ENDIF
create function WS.WS.PROPFIND_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
+ 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;
- -- dbg_obj_princ ('WS.WS.PROPFIND_RESPONSE (', lpath, ppath, depth, st, ms_date, propnames, u_id, ')');
+ declare all_prop, ppath_len integer;
+ declare dirlist any;
+ declare add_not_found, _this_col integer;
+ --dbg_obj_princ ('WS.WS.PROPFIND_RESPONSE (', lpath, ppath, depth, st, ms_date, propnames, u_id, ')');
+ all_prop := 0;
+ add_not_found := 1;
- all_prop := 0;
- add_not_found := 1;
+ if (not isstring (lpath) or not isstring (ppath))
+ return -28;
- 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 (st = 'C' and aref (ppath, length (ppath) - 1) <> ascii ('/'))
- ppath := concat (ppath, '/');
- ppath_len := length (ppath);
-
- if (not isarray (propnames))
- {
- if (ms_date)
+ if (not isarray (propnames))
{
- propnames := vector (':getlastmodified', ':creationdate',
- ':lastaccessed', ':getcontentlength', ':resourcetype', ':supportedlock');
- add_not_found := 0;
+ 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;
}
- 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)
- {
- -- dbg_obj_princ ('SQL_NOT_FOUND in WS.WS.PROPFIND_RESPONSE (', lpath, ppath, depth, st, ms_date, propnames, u_id, ')');
- return -1;
- }
- WS.WS.PROPFIND_RESPONSE_FORMAT (lpath, dirlist, 0, ms_date, propnames, all_prop, add_not_found, 0, u_id);
+ 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)
+ {
+ -- dbg_obj_princ ('SQL_NOT_FOUND in WS.WS.PROPFIND_RESPONSE (', lpath, ppath, depth, st, ms_date, propnames, u_id, ')');
+ return -1;
+ }
+ WS.WS.PROPFIND_RESPONSE_FORMAT (lpath, dirlist, 0, ms_date, propnames, all_prop, add_not_found, 0, u_id);
--- Now go deep
- if (depth = 1 and st = 'C')
- {
- dirlist := DAV_DIR_LIST_INT (ppath, 0, '%', null, null, u_id);
+ -- Now go deep
+ if (depth = 1 and st = 'C')
+ {
+ dirlist := DAV_DIR_LIST_INT (ppath, 0, '%', 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 (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.
+ }
- WS.WS.PROPFIND_RESPONSE_FORMAT (lpath, dirlist, 1, ms_date, propnames, all_prop, add_not_found, 0, u_id);
- }
- else if (((depth = -1) or (depth > 1)) and (st = 'C'))
- {
- dirlist := DAV_DIR_LIST_INT (ppath, 0, '%', null, null, u_id);
- if (isinteger (dirlist))
+ WS.WS.PROPFIND_RESPONSE_FORMAT (lpath, dirlist, 1, ms_date, propnames, all_prop, add_not_found, 0, u_id);
+ }
+ else if (((depth = -1) or (depth > 1)) and (st = 'C'))
{
- 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.
+ dirlist := DAV_DIR_LIST_INT (ppath, 0, '%', 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.
+ }
+ WS.WS.PROPFIND_RESPONSE_FORMAT (lpath, dirlist, case (depth) when -1 then -1 else depth-1 end, ms_date, propnames, all_prop, add_not_found, 1, u_id);
+ foreach (any itm in dirlist) do
+ {
+ if ('C' = itm[1])
+ {
+ if (-13 = WS.WS.PROPFIND_RESPONSE (lpath || itm[10] || '/', ppath || itm[10] || '/', -1, 'C', ms_date, propnames, u_id))
+ return -13;
+ }
+ }
}
- WS.WS.PROPFIND_RESPONSE_FORMAT (lpath, dirlist, case (depth) when -1 then -1 else depth-1 end, ms_date, propnames, all_prop, add_not_found, 1, u_id);
- foreach (any itm in dirlist) do
- {
- if ('C' = itm[1])
- {
- if (-13 = WS.WS.PROPFIND_RESPONSE (lpath || itm[10] || '/', ppath || itm[10] || '/', -1, 'C', ms_date, propnames, u_id))
- return -13;
- }
- }
- }
- return 0;
+ return 0;
}
;
create procedure WS.WS.PROPFIND_RESPONSE_FORMAT (in lpath varchar,
- in dirlist any,
- in append_name_to_href integer,
- in ms_date integer,
- in propnames any,
- in all_prop integer,
- in add_not_found integer,
- in resources_only integer,
- in _u_id integer)
+ in dirlist any,
+ in append_name_to_href integer,
+ in ms_date integer,
+ in propnames any,
+ in all_prop integer,
+ in add_not_found integer,
+ in resources_only integer,
+ in _u_id integer)
{
declare dir_len, dir_ctr, ix, len, dt_flag, iso_dt_flag, res_len, parent_col, id, found_cprop, found_sprop, mix integer;
declare crt, modt datetime;
@@ -277,7 +336,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)
{
@@ -324,17 +383,18 @@ 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 '%/')
+ if (st = 'C' and href not like '%/' and href not like '%.ics' and href not like '%.vcf')
href := href || '/';
- 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 (
- href,
- null, 'UTF-8' ) );
- http ('</D:href>\n');
+ parent_col := DAV_SEARCH_ID (href, 'P');
+ http ('<D:response xmlns:D="DAV:" xmlns:lp0="DAV:" xmlns:i0="DAV:" xmlns:V="http://www.openlinksw.com/virtuoso/webdav/1.0/">\n');
+ http (sprintf ('<D:href>%V</D:href>\n', charset_recode (href, 'UTF-8', '_WIDE_')));
+ -- http ('<D:href>');
+ -- http_dav_url (
+ -- charset_recode (
+ -- href,
+ -- null, 'UTF-8' ) );
+ -- http ('</D:href>\n');
http ('<D:propstat>\n');
http ('<D:prop>\n');
ix := 0;
@@ -342,7 +402,7 @@ next_response:
while (ix < len)
{
prop := aref (propnames, ix);
- -- dbg_obj_princ ('>PROPERTY: ', prop);
+ --dbg_obj_princ ('>PROPERTY: ', prop);
if (prop = ':getlastmodified')
{
http (concat(sprintf ('<lp0:getlastmodified%s>', dt_ms), soap_print_box (modt, '', dt_flag) , '</lp0:getlastmodified>\n'));
@@ -365,7 +425,7 @@ next_response:
}
else if (prop = ':getcontenttype')
{
- http (concat('<D:getcontenttype>', mime_type, '</D:getcontenttype>\n'));
+ http (concat('<lp0:getcontenttype>', mime_type, '</lp0:getcontenttype>\n'));
found_sprop := 1;
}
else if (prop = ':getcontentlength' and st = 'R')
@@ -373,10 +433,131 @@ 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 (sprintf ('<C:calendar-home-set xmlns:C="urn:ietf:params:xml:ns:caldav"><D:href>%V</D:href></C:calendar-home-set>\n', charset_recode (lpath, 'UTF-8', '_WIDE_')));
+ found_sprop := 1;
+ }
+ else if (prop = 'urn:ietf:params:xml:ns:carddav:addressbook-home-set')
+ {
+ http (sprintf ('<C:addressbook-home-set xmlns:C="urn:ietf:params:xml:ns:carddav"><D:href>%V</D:href></C:addressbook-home-set>\n', charset_recode (lpath, 'UTF-8', '_WIDE_')));
+ found_sprop := 1;
+ }
+ else if (prop = ':principal-URL')
+ {
+ http (sprintf ('<D:principal-URL><D:href>%V</D:href></D:principal-URL>\n', charset_recode (lpath, 'UTF-8', '_WIDE_')));
+ 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')
- http ('<D:resourcetype><D:collection/></D:resourcetype>\n');
+ 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;
@@ -468,7 +649,7 @@ next_response:
found_cprop := 0;
prop_raw_val := DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, st, prop1, 0), null);
if (strchr (prop1, ':') is not null)
- goto skip1;
+ goto skip1;
if (prop_raw_val is not null)
{
prop_val := deserialize (prop_raw_val);
@@ -524,7 +705,7 @@ next_response:
prop_raw_val := prp[1];
prop_val := deserialize (prop_raw_val);
if (strchr (prop1, ':') is not null)
- goto skip2;
+ goto skip2;
if (isarray (prop_val))
{
prop_val := xml_tree_doc (prop_val);
@@ -540,7 +721,7 @@ next_response:
http (concat ('<V:',prop1,'><![CDATA[', prop_raw_val ,']]></V:', prop1,'>\n'));
else
http (concat ('<V:',prop1,'/>\n'));
- skip2:
+ skip2:
prop_idx := prop_idx + 1;
}
}
@@ -610,11 +791,313 @@ create procedure WS.WS.PROPNAMES (in _body varchar)
ret := vector_concat (ret, vector (name));
}
}
- -- dbg_obj_princ ('prop: ', prop, ' tree : ', xml_tree (prop) , ' propname: ', propname, ' allprop: ', allprop);
+ --dbg_obj_princ ('prop: ', prop, ' tree : ', xml_tree (prop) , ' propname: ', propname, ' allprop: ', allprop);
return ret;
}
;
+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;
@@ -658,7 +1141,8 @@ nf:
http ('<?xml version="1.0"?>\n');
http ('<D:multistatus xmlns:D="DAV:" xmlns:V="http://www.openlinksw.com/virtuoso/webdav/1.0/">\n');
http ('<D:response xmlns:lp0="DAV:" xmlns:i0="DAV:">\n');
- http ('<D:href>'); http_dav_url (lpath); http ('</D:href>\n');
+ -- http ('<D:href>'); http_dav_url (lpath); http ('</D:href>\n');
+ http (sprintf ('<D:href>%V</D:href>\n', charset_recode (lpath, 'UTF-8', '_WIDE_')));
http ('<D:propstat>\n');
http ('<D:prop>\n');
if (_prop = 'propname')
@@ -690,15 +1174,25 @@ 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 integer;
+ declare _u_id, _g_id, _slen, _len, _ix, id, _pid, _ix1, is_calendar, is_addressbook 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, ')');
+ --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)
- st := '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'));
@@ -719,7 +1213,7 @@ create procedure WS.WS.PROPPATCH (in path varchar, inout params varchar, in line
rc := string_output ();
_ses := aref_set_0 (params, 1);
_body := string_output_string (_ses);
- -- dbg_obj_princ ('PROPPATCH body is ', _body);
+ --dbg_obj_princ ('PROPPATCH body is ', _body);
xtree := xml_tree (_body, 0);
if (not isarray (xtree))
{
@@ -747,9 +1241,6 @@ create procedure WS.WS.PROPPATCH (in path varchar, inout params varchar, in line
prop_set := xpath_eval('//set/prop/*',xtd,0);
-
-
-
l := length (prop_set);
if (l > 0)
{
@@ -771,8 +1262,12 @@ 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 (pns = 'http://www.openlinksw.com/virtuoso/webdav/1.0/'
+ if (is_calendar or is_addressbook)
+ {
+ --- do nothing for now;
+ ;
+ }
+ else if (pns = 'http://www.openlinksw.com/virtuoso/webdav/1.0/'
and _prop_name in ('virtpermissions', 'virtowneruid', 'virtownergid'))
{
declare tmp, tmp_id any;
@@ -811,8 +1306,7 @@ 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)
@@ -1246,7 +1740,6 @@ create procedure WS.WS.PUT (in path varchar, inout params varchar, in lines varc
declare p_name, p_text, p_comm, stat, msg, p_inc, p_root, inc_name, inc_cont, str, location, inh varchar;
declare ses any;
--set isolation = 'serializable';
-
ses := aref_set_0 (params, 1);
whenever sqlstate '*' goto error_ret;
@@ -1264,9 +1757,9 @@ create procedure WS.WS.PUT (in path varchar, inout params varchar, in lines varc
_col_parent_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(''), path, vector('')), 'P'));
if (_col_parent_id is not null)
{
- -- dbg_obj_princ ('WS.WS.PUT has _col_parent_id=', _col_parent_id);
+ --dbg_obj_princ ('WS.WS.PUT has _col_parent_id=', _col_parent_id);
rc := DAV_AUTHENTICATE_HTTP (_col_parent_id, 'C', '11_', 1, lines, uname, upwd, _u_id, _g_id, _perms);
- -- dbg_obj_princ ('Authentication in WS.WS.PUT gives ', rc, uname, upwd, _u_id, _g_id, _perms);
+ --dbg_obj_princ ('Authentication in WS.WS.PUT gives ', rc, uname, upwd, _u_id, _g_id, _perms);
if (rc < 0)
goto error_ret;
}
@@ -1289,7 +1782,7 @@ create procedure WS.WS.PUT (in path varchar, inout params varchar, in lines varc
{
content_type := 'text/html';
}
- -- dbg_obj_princ ('content_type=', content_type, ', _cont_len=', _cont_len);
+ --dbg_obj_princ ('content_type=', content_type, ', _cont_len=', _cont_len);
if (content_type = 'application/sparql-query')
{
@@ -1303,7 +1796,7 @@ create procedure WS.WS.PUT (in path varchar, inout params varchar, in lines varc
uname, null, uname, upwd, 0,
now(), now(), null,
_u_id, _g_id, 0 );
- -- dbg_obj_princ ('DAV_RES_UPLOAD_STRSES_INT returned ', rc, ' of type ', __tag (rc));
+ --dbg_obj_princ ('DAV_RES_UPLOAD_STRSES_INT returned ', rc, ' of type ', __tag (rc));
if ((not isinteger (rc)) or (rc > 0))
{
commit work;
@@ -1319,7 +1812,7 @@ create procedure WS.WS.PUT (in path varchar, inout params varchar, in lines varc
return;
}
error_ret:
- -- dbg_obj_princ ('PUT get error: ', __SQL_STATE, __SQL_MESSAGE);
+ --dbg_obj_princ ('PUT get error: ', __SQL_STATE, __SQL_MESSAGE);
if (__SQL_STATE = '40001')
{
@@ -1545,7 +2038,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 varchar;
+ declare server_etag, client_etag, rdf_graph varchar;
declare uid, maxres integer;
declare p_comm, stat, msg, xpr, sxtag, rxtag, resource_content, str varchar;
declare resource_owner, exec_safety_level integer;
@@ -1659,7 +2152,7 @@ again:
}
if (_col_id is null and (rc >= 0))
{
- if (uid = http_nobody_uid () and gid = http_nogroup_gid ())
+ if (uid = http_nobody_uid () and gid = http_nogroup_gid ())
uid := null;
rc := DAV_AUTHENTICATE_HTTP (tgt_id, tgt_type, '1_1', 0, lines, uname, upwd, uid, gid, perms);
if (rc >= 0)
@@ -1669,31 +2162,31 @@ again:
http_rewrite (0);
- -- execute + webid
+ -- execute + webid
auth_opts := http_map_get ('auth_opts');
if (isvector (auth_opts) and mod (length (auth_opts), 2) = 0)
webid_check := atoi (get_keyword ('webid_check', auth_opts, '0'));
else
webid_check := 0;
- webid_check_rc := 1;
+ webid_check_rc := 1;
if (is_https_ctx () and webid_check and http_map_get ('executable'))
{
declare gid, perms, _check_id, _check_type any;
uid := null;
- if (isinteger (_res_id))
- {
- _check_id := _res_id;
+ if (isinteger (_res_id))
+ {
+ _check_id := _res_id;
_check_type := 'R';
- }
- else
- {
- _check_id := _col_id;
+ }
+ else
+ {
+ _check_id := _col_id;
_check_type := 'C';
- }
+ }
webid_check_rc := DAV_AUTHENTICATE_HTTP (_check_id, _check_type, '1__', 1, lines, uname, upwd, uid, gid, perms);
if ((webid_check_rc < 0) and (webid_check_rc <> -1))
return 0;
- }
+ }
http_rewrite (0);
@@ -1853,6 +2346,7 @@ 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, ' '));
@@ -1966,14 +2460,22 @@ again:
hdr_str := hdr_str || 'ETag: "' || server_etag || '"\r\n';
if (strcasestr (hdr_str, 'Content-Type:') is null)
hdr_str := hdr_str || 'Content-Type: ' || cont_type || '\r\n';
- if (isinteger (_res_id) and
+ if (isinteger (_res_id) and
exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = 'virt:aci_meta_n3' and PROP_TYPE = 'R' and PROP_PARENT_ID = _res_id))
{
- hdr_str := hdr_str || sprintf ('Link: <%s://%s%s,acl>; rel="http://www.w3.org/ns/auth/acl#"; title="Access Control File"\r\n',
+ hdr_str := hdr_str || sprintf ('Link: <%s://%s%s,acl>; rel="http://www.w3.org/ns/auth/acl#"; title="Access Control File"\r\n',
case when is_https_ctx () then 'https' else 'http' end,
- http_request_header (lines, 'Host', NULL, NULL), http_path ());
+ http_request_header (lines, 'Host', NULL, NULL), http_path ());
}
- http_header (hdr_str);
+ 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
http_header (concat ('Content-Type: text/xml\r\nETag: "',server_etag,'"\r\n'));
@@ -3427,7 +3929,7 @@ create procedure WS.WS.UPDCHILD (in col integer, in root_path varchar, in _pflag
update WS.WS.VFS_URL set VU_ETAG = '' where VU_RES_ID = RES_ID;
-- drop VSPs
if (RES_NAME like '%.vsp')
- WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH);
+ WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH);
}
-- dbg_obj_princ ('WS.WS.UPDCHILD (', col, root_path, _pflags, repl, ') updates RES_FULL_PATH');
update WS.WS.SYS_DAV_RES set RES_FULL_PATH = concat (root_path, RES_NAME) where RES_COL = col and ((RES_FULL_PATH <> concat (root_path, RES_NAME)) or RES_FULL_PATH is null);
@@ -3621,8 +4123,8 @@ create procedure WS.WS.EXPAND_INCLUDES (in path varchar, inout stream varchar, i
where RES_NAME = name and RES_COL = col;
if (not http_map_get ('executable'))
{
- if (_u_id <> http_dav_uid () or _perms like '____1%' or _perms like '_______1%')
- signal ('37000', 'Includes can be owned only by admin & cannot be writable for others', 'DA001');
+ if (_u_id <> http_dav_uid () or _perms like '____1%' or _perms like '_______1%')
+ signal ('37000', 'Includes can be owned only by admin & cannot be writable for others', 'DA001');
}
if (st is not null and isarray (st))
st := vector_concat (st, vector (path, datestring(modt)));
@@ -4501,7 +5003,7 @@ create procedure WS.WS.XMLSQL_TO_STRSES (
create procedure WS.WS."TRACE" (in path varchar, inout params varchar, in lines varchar)
{
http_header ('Content-Type: message/http\r\n');
- http_flush (1);
+ http_flush (1);
foreach (varchar l in lines) do
{
http (l);
diff --git a/binsrc/dav/dav_acct.sql b/binsrc/dav/dav_acct.sql
index 2ea1af2..b4a4040 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -212,7 +212,7 @@ create procedure DAV_SPACE_QUOTA_SIGNAL (in res_path varchar, in home_path varch
signal ('HT500', sprintf ('DAV integrity violation: ancestor collection %s not found for resource %s', home_path, res_path));
if (not isinteger (home_col_id))
signal ('HT500', sprintf ('DAV integrity violation: collection %s is a DET subcollection, can not use DAV quotas for %s', home_path, res_path));
- owner_u_id := coalesce ((select COL_OWNER from WS.WS.SYS_DAV_COL where COL_ID = home_col_id), http_hobody_uid());
+ owner_u_id := coalesce ((select COL_OWNER from WS.WS.SYS_DAV_COL where COL_ID = home_col_id), http_nobody_uid());
u_descr := coalesce ((select 'owner "' || U_NAME || '"' from SYS_USERS where U_ID = owner_u_id), sprintf ('owner #%d', owner_u_id));
}
rollback work;
diff --git a/binsrc/dav/dav_api.sql b/binsrc/dav/dav_api.sql
index de579a2..df1c3eb 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.30 2011/10/28 21:43:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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', 'http://' || host || path, null, null, 0, 0);
+ rc := DAV_PROP_SET_INT (path, 'virt:rdf_graph', rtrim ('http://' || host || path, '/') || '#this', 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);
@@ -849,6 +849,18 @@ DAV_SEARCH_ID (in path any, in what char (1)) returns any
if (not isstring (path))
path := DAV_CONCAT_PATH (par, null);
id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1);
+ if ((id <> -1) and (connection_get ('dav_store') is null))
+ {
+ declare det, detcol_id any;
+
+ detcol_id := DAV_PROP_GET_INT (id, what, 'virt:DETCOL_ID', 0);
+ if (DAV_HIDE_ERROR (detcol_id) is not null)
+ {
+ det := cast (coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = detcol_id), '') as varchar);
+ if ((det <> '') and __proc_exists ('DB.DBA.' || det || '_DAV_MAKE_ID'))
+ return call (cast (det as varchar) || '_DAV_MAKE_ID') (detcol_id, id, 'R');
+ }
+ }
}
else if (what = 'C')
{
@@ -1086,8 +1098,28 @@ DAV_SEARCH_ID_OR_DET (in path any, in what char (1), out det_ret varchar, out de
if (not isstring (path))
path := DAV_CONCAT_PATH (par, null);
id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1);
- if (id > 0)
- goto found_plain_id;
+ if ((id <> -1) and (connection_get ('dav_store') is null))
+ {
+ detcol_id := cast (DAV_PROP_GET_INT (id, what, 'virt:DETCOL_ID', 0) as integer);
+ if (DAV_HIDE_ERROR (detcol_id) is not null)
+ {
+ det_ret := cast (coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = detcol_id), '') as varchar);
+ if ((det_ret <> '') and __proc_exists ('DB.DBA.' || det_ret || '_DAV_MAKE_ID'))
+ {
+ declare detcol_par any;
+
+ detcol_par := split_and_decode (DAV_SEARCH_PATH (detcol_id, 'C'), 0, '\0\0/');
+ inx := length (detcol_par)-2;
+ detcol_path_parts := subseq (par, 0, inx + 1);
+ par := subseq (par, inx + 1);
+ unreached_path_parts := par;
+ return call (cast (det_ret as varchar) || '_DAV_MAKE_ID') (detcol_id, id, 'R');
+ }
+ }
+ }
+ if (id > 0)
+ goto found_plain_id;
+
}
else if (what = 'C')
{
@@ -1110,7 +1142,7 @@ descending_col_search:
cname := aref (par, inx);
-- dbg_obj_princ ('select, cname =', cname, inx);
select COL_ID, COL_DET into cur_id, det from WS.WS.SYS_DAV_COL where COL_NAME = cname and COL_PARENT = parent_id;
- if (det is not NULL)
+ if ((det is not NULL) and (connection_get ('dav_store') is null))
{
det_ret := det;
detcol_id := cur_id;
@@ -1520,14 +1552,14 @@ DAV_REQ_CHARS_TO_BITMASK (in req varchar) returns integer
}
;
-
--!AWK PUBLIC
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 oid, ogid, puid, pgid integer;
+ declare rc, oid, ogid, puid, pgid integer;
declare opwd, pperms varchar;
declare pacl varbinary;
+
what := upper (what);
-- dbg_obj_princ ('DAV_AUTHENTICATE (', id, what, req, a_uname, a_pwd, a_uid, ')');
if (length (req) <> 3)
@@ -1566,18 +1598,11 @@ DAV_AUTHENTICATE (in id any, in what char(1), in req varchar, in a_uname varchar
}
if (isarray (id))
{
- declare detcol_id integer;
+ 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);
- 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);
+ return rc;
}
whenever not found goto nf_col_or_res;
if (what = 'R')
@@ -1647,8 +1672,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 >= 0)
- rc := DAV_AUTHENTICATE_HTTP (id[1], 'C', '1__', can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, d__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);
return rc;
}
@@ -1685,9 +1710,12 @@ DAV_AUTHENTICATE_HTTP (in id any, in what char(1), in req varchar, in can_write_
if (rc < 0)
{
if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms))
+ {
+ http_rewrite ();
return a_uid;
+ }
- return rc;
+ return rc;
}
}
}
@@ -1772,91 +1800,46 @@ 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 retIRI varchar;
- declare graph, baseGraph, foafIRI, foafGraph, loadIRI, localIRI any;
- declare S, V, info, st, msg, data, meta any;
-
- retIRI := null;
+ declare webid varchar;
+ declare cert, dummy, vtype any;
- 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]))
+ webid := null;
+ if (__proc_exists ('DB.DBA.WEBID_AUTH_GEN_2') is not null)
{
- retIRI := foafIRI;
- goto _break;
+ cert := client_attr ('client_certificate');
+ dummy := null;
+ -- !!!
+ -- if (not DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 0, webid, dummy, 0, vtype))
+ -- webid := null;
+ DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 0, webid, dummy, 0, vtype);
}
- }
- }
- }
- _break:;
- SPARQL clear graph ?:foafGraph;
- }
-_exit:
- return retIRI;
+ return webid;
}
;
@@ -1906,9 +1889,11 @@ DAV_AUTHENTICATE_SSL (
{
tmp := null;
if (isnull (foafIRI))
- foafIRI := DAV_AUTHENTICATE_SSL_WEBID ();
+ {
+ foafIRI := DB.DBA.DAV_AUTHENTICATE_SSL_WEBID ();
if (isnull (foafIRI))
goto _exit;
+ }
graph := WS.WS.DAV_IRI (V[N]);
for (
sparql
@@ -1951,7 +1936,7 @@ DAV_AUTHENTICATE_SSL (
graph ?g
{
?p3 rdf:type foaf:Group ;
- foaf:member `iri(?:foafIRI)` .
+ foaf:member `iri(?:foafIRI)` .
filter (?g like (?:grpGraph)) .
}
}
@@ -2021,7 +2006,6 @@ DAV_COL_CREATE (
}
;
-
create procedure
DAV_COL_CREATE_INT (
in path varchar,
@@ -2072,7 +2056,7 @@ DAV_COL_CREATE_INT (
if (isarray (pid))
det := pid[0];
- else if (pid > 0)
+ else if ((pid > 0) and (connection_get ('dav_store') is null))
det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=pid), NULL);
else
det := null;
@@ -2165,7 +2149,6 @@ DAV_RES_UPLOAD_STRSES (
}
;
-
create procedure
DAV_RES_UPLOAD_STRSES_INT (
in path varchar,
@@ -2198,7 +2181,7 @@ DAV_RES_UPLOAD_STRSES_INT (
-- the sink queue, see below
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))
-create index RDF_SINK_QUEUE_STAT on RDF_SINK_QUEUE (RSQ_STATE, RSQ_TS)
+create index RDF_SINK_QUEUE_STAT on RDF_SINK_QUEUE (RSQ_STATE, RSQ_TS)
;
create procedure
@@ -2285,7 +2268,7 @@ DAV_RES_UPLOAD_STRSES_INT_INNER (
if (isarray (pid))
det := pid[0];
else if (pid > 0)
- det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=pid), NULL);
+ det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=pid and connection_get ('dav_store') is null), NULL);
else
{
-- dbg_obj_princ ('no parent, DAV_RES_UPLOAD_STRSES_INT returns ', pid);
@@ -2484,13 +2467,13 @@ DAV_RES_UPLOAD_STRSES_INT_INNER (
-- get parent collection id
c_id := (select RES_COL from WS.WS.SYS_DAV_RES where RES_ID = rc);
-- is rdf_sink folder?
- rdf_graph := null;
- depth := 0;
+ rdf_graph := null;
+ depth := 0;
{
whenever not found goto rdfg_found;
-look_again:
+look_again:
select COL_PARENT, COL_INHERIT into _col_p_id, _inherit from WS.WS.SYS_DAV_COL where COL_ID = c_id;
- rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_graph');
+ rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_graph');
if ((_inherit = 'R' or (depth = 1 and _inherit = 'M') or depth = 0) and length (rdf_graph))
goto rdfg_found;
c_id := _col_p_id;
@@ -2498,7 +2481,7 @@ look_again:
rdf_graph := null;
goto look_again;
}
- rdfg_found:;
+ rdfg_found:;
if (not DB.DBA.is_empty_or_null (rdf_graph))
{
declare aq any;
@@ -2524,7 +2507,7 @@ create procedure RDF_SINK_AQ_GET ()
{
declare arr any;
set isolation = 'serializable';
- arr := (select vector_agg (vector (RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_TYPE, RSQ_UID, RSQ_GID)) from (select top 10 RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_TYPE, RSQ_UID, RSQ_GID
+ arr := (select vector_agg (vector (RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_TYPE, RSQ_UID, RSQ_GID)) from (select top 10 RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_TYPE, RSQ_UID, RSQ_GID
from RDF_SINK_QUEUE where RSQ_STATE = 0 order by RSQ_TS for update) x);
foreach (any x in arr) do
{
@@ -2557,42 +2540,48 @@ 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;
declare rdf_graph_resource_id, rdf_graph_resource_name, rdf_graph_resource_path, host, content any;
- declare exit handler for sqlstate '*'
+ declare exit handler for sqlstate '*'
{
goto _bad_content;
};
- -- get sponger parameter?
- content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = rc);
- rdf_sponger := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_sponger'), 'on');
- rdf_cartridges := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_cartridges'), '');
- rdf_metaCartridges := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_metaCartridges'), '');
- -- upload into first (rdf_sink) graph
- if (RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges))
+ -- get sponger parameter?
+ content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = rc);
+ rdf_sponger := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_sponger'), 'on');
+ rdf_cartridges := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_cartridges'), '');
+ rdf_metaCartridges := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_metaCartridges'), '');
+ -- 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 := replace ( replace ( replace ( replace ( replace ( replace ( replace (rdf_graph, '/', '_'), '\\', '_'), ':', '_'), '+', '_'), '\"', '_'), '[', '_'), ']', '_') || '.RDF';
+ rdf_graph_resource_name := DAV_RDF_RES_NAME (rdf_graph);
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'))))
- {
- -- RDF content
- host := virtuoso_ini_item_value ('URIQA', 'DefaultHost');
- if (host is null)
- {
- host := sys_stat ('st_host_name');
- if (server_http_port () <> '80')
- host := host ||':'|| server_http_port ();
- }
- rdf_graph_resource_id := WS.WS.GETID ('R');
- insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_OWNER, RES_GROUP, RES_PERMS, RES_CR_TIME, RES_MOD_TIME, RES_TYPE, RES_CONTENT)
- values (rdf_graph_resource_id, rdf_graph_resource_name, c_id, ouid, ogid, '111101101NN', now (), now (), 'text/xml', '');
- DB.DBA.DAV_PROP_SET_INT (rdf_graph_resource_path, 'redirectref', sprintf ('http://%s/sparql?default-graph-uri=%U&query=%U&format=%U', host, rdf_graph,
+ {
+ -- RDF content
+ host := virtuoso_ini_item_value ('URIQA', 'DefaultHost');
+ if (host is null)
+ {
+ host := sys_stat ('st_host_name');
+ if (server_http_port () <> '80')
+ host := host ||':'|| server_http_port ();
+ }
+ rdf_graph_resource_id := WS.WS.GETID ('R');
+ insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_OWNER, RES_GROUP, RES_PERMS, RES_CR_TIME, RES_MOD_TIME, RES_TYPE, RES_CONTENT)
+ values (rdf_graph_resource_id, rdf_graph_resource_name, c_id, ouid, ogid, '111101101NN', now (), now (), 'text/xml', '');
+ DB.DBA.DAV_PROP_SET_INT (rdf_graph_resource_path, 'redirectref', sprintf ('http://%s/sparql?default-graph-uri=%U&query=%U&format=%U', host, rdf_graph,
'CONSTRUCT { ?s ?p ?o} WHERE {?s ?p ?o}', 'text/xml'), null, null, 0, 0, 1);
- }
+ }
}
_bad_content:;
update RDF_SINK_QUEUE set RSQ_STATE = 2 where RSQ_ID = rc;
@@ -2601,19 +2590,19 @@ create procedure RDF_SINK_FUNC (in path varchar, in rc int, in c_id int, in rdf_
;
create procedure RDF_SINK_UPLOAD (
- in path varchar,
+ in path varchar,
inout _content any,
in type varchar,
- in rdf_graph varchar,
- in rdf_sponger varchar,
- in rdf_cartridges varchar,
- in rdf_metaCartridges varchar)
+ in rdf_graph varchar,
+ in rdf_sponger varchar,
+ in rdf_cartridges varchar,
+ in rdf_metaCartridges varchar)
{
declare rdf_iri, rdf_graph2 varchar;
declare content any;
if (length (_content) = 0)
- return 0;
+ return 0;
-- general case, should return false
declare exit handler for sqlstate '*' {
@@ -2643,22 +2632,22 @@ create procedure RDF_SINK_UPLOAD (
RDF_SINK_UPLOAD (concat (path, '/', fname), content, DAV_GUESS_MIME_TYPE_BY_NAME (fname), rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);
SPARQL insert in graph ?:zip_graph { ?s ?p ?o } where { graph `iri(?:item_graph)` { ?s ?p ?o } };
SPARQL clear graph ?:item_graph;
- }
+ }
file_delete (tmp_file, 1);
return 1;
}
- content := _content;
+ content := _content;
if (path like '%.gz' and length (_content) > 2)
{
declare magic, html_start varchar;
magic := subseq (_content, 0, 2);
html_start := null;
- if (magic[0] = 0hex1f and magic[1] = 0hex8b)
+ if (magic[0] = 0hex1f and magic[1] = 0hex8b)
{
content := gzip_uncompress (cast (_content as varchar));
path := regexp_replace (path, '\.gz\x24', '');
- type := DAV_GUESS_MIME_TYPE (path, content, html_start);
+ type := DAV_GUESS_MIME_TYPE (path, content, html_start);
}
}
-- dbg_obj_print ('RDF_SINK_UPLOAD (', length (content), type, rdf_graph, rdf_graph2, rdf_sponger, rdf_cartridges, rdf_metaCartridges, ')');
@@ -2687,6 +2676,7 @@ 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
@@ -2710,10 +2700,10 @@ _grddl:;
{
declare rc, rcMeta integer;
declare ret_body varchar;
- declare exit handler for sqlstate '*'
- {
+ declare exit handler for sqlstate '*'
+ {
goto _exit;
- };
+ };
ret_body := cast (content as varchar);
-- dbg_obj_print ('extractor');
@@ -2721,8 +2711,8 @@ _grddl:;
-- dbg_obj_print ('meta');
rcMeta := RDF_SINK_UPLOAD_CARTRIDGES (ret_body, type, 'select MC_ID, MC_PATTERN, MC_TYPE, MC_HOOK, MC_KEY, MC_OPTIONS from DB.DBA.RDF_META_CARTRIDGES where MC_ENABLED = 1 order by MC_SEQ, MC_ID', rdf_iri, rdf_graph2, rdf_metaCartridges);
if (rc or rcMeta)
- goto _exit;
- }
+ goto _exit;
+ }
return 0;
_exit:
@@ -2731,6 +2721,7 @@ _exit:
}
;
+
create procedure RDF_SINK_UPLOAD_CARTRIDGES (
inout content any,
inout type varchar,
@@ -2751,43 +2742,39 @@ 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;
if (isstring (val_match) and regexp_match (row[1], val_match) is not null)
- {
- pname := row[3];
- if (__proc_exists (pname) is null)
+ {
+ pname := row[3];
+ if (__proc_exists (pname) is null)
goto _try_next;
declare exit handler for sqlstate '*'
- {
+ {
goto _try_next;
};
opts := vector_concat (vector (), row[5]);
xrc := call (pname) (rdf_graph, rdf_iri, null, content, aq, ps, row[4], opts);
- -- dbg_obj_print (pname, xrc, (select count(*) from rdf_quad where g = iri_to_id (rdf_graph)));
- -- when no selection we stop processing when a given cartridge indicate to stop
- if (not hasSelection and (__tag (xrc) = 193 or xrc < 0 or xrc > 0))
- return 1;
- }
+ -- dbg_obj_print (pname, xrc, (select count(*) from rdf_quad where g = iri_to_id (rdf_graph)));
+ -- when no selection we stop processing when a given cartridge indicate to stop
+ if (not hasSelection and (__tag (xrc) = 193 or xrc < 0 or xrc > 0))
+ return 1;
+ }
_try_next:;
}
return 1;
- }
+}
;
create procedure RDF_SINK_DELETE (
@@ -2800,13 +2787,13 @@ create procedure RDF_SINK_DELETE (
if (not isinteger (c_id) or (c_id < 0))
return;
- rdf_graph := null;
- depth := 0;
+ rdf_graph := null;
+ depth := 0;
{
whenever not found goto rdfg_found;
-look_again:
+look_again:
select COL_PARENT, COL_INHERIT into _col_p_id, _inherit from WS.WS.SYS_DAV_COL where COL_ID = c_id;
- rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_graph');
+ rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_graph');
if ((_inherit = 'R' or (depth = 1 and _inherit = 'M') or depth = 0) and length (rdf_graph))
goto rdfg_found;
c_id := _col_p_id;
@@ -2814,7 +2801,7 @@ look_again:
rdf_graph := null;
goto look_again;
}
- rdfg_found:;
+ rdfg_found:;
if (DB.DBA.is_empty_or_null (rdf_graph))
return;
@@ -2894,6 +2881,12 @@ DAV_DELETE_INT (
else if (ty = 'C')
{
declare rrc integer;
+ declare det varchar;
+
+ det := cast ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=id) as varchar);
+ if (det in ('S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV'))
+ connection_set ('dav_store', 1);
+
for select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = id do
{
rrc := DAV_DELETE_INT (RES_FULL_PATH, silent, auth_uname, auth_pwd, extern);
@@ -3714,7 +3707,6 @@ DAV_PROP_SET_INT (
}
;
-
create function
DAV_PROP_SET_RAW (
inout id integer,
@@ -4191,7 +4183,11 @@ DAV_PROP_GET_INT (
{
if (isarray (id))
{
+ ret := call (cast (id[0] as varchar) || '_DAV_PROP_GET') (id, what, propname, auth_uid);
+ if (isinteger (ret) and (ret = -20))
return coalesce ((select COL_ACL from WS.WS.SYS_DAV_COL where COL_ID = id[1]));
+
+ return ret;
}
else
{
@@ -4592,31 +4588,34 @@ create trigger SYS_DAV_RES_WAC_U after update on WS.WS.SYS_DAV_RES order 100 ref
if (connection_get ('dav_acl_sync') = 1)
return;
+
if (N.RES_NAME like '%,acl')
- {
- declare rid int;
- oldPath := WS.WS.COL_PATH (O.RES_COL) || O.RES_NAME;
- newPath := WS.WS.COL_PATH (N.RES_COL) || N.RES_NAME;
- oldPath := regexp_replace (oldPath, ',acl\x24', '');
- newPath := regexp_replace (newPath, ',acl\x24', '');
- aciContent := N.RES_CONTENT;
- rid := (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = oldPath);
- set triggers off;
- update WS.WS.SYS_DAV_PROP set PROP_VALUE = N.RES_CONTENT where PROP_TYPE = 'R' and PROP_NAME = 'virt:aci_meta_n3' and PROP_PARENT_ID = rid;
- set triggers on;
- update_acl := 0;
- }
+ {
+ declare rid int;
+ oldPath := WS.WS.COL_PATH (O.RES_COL) || O.RES_NAME;
+ newPath := WS.WS.COL_PATH (N.RES_COL) || N.RES_NAME;
+ oldPath := regexp_replace (oldPath, ',acl\x24', '');
+ newPath := regexp_replace (newPath, ',acl\x24', '');
+ aciContent := N.RES_CONTENT;
+ rid := (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = oldPath);
+ set triggers off;
+ update WS.WS.SYS_DAV_PROP set PROP_VALUE = N.RES_CONTENT where PROP_TYPE = 'R' and PROP_NAME = 'virt:aci_meta_n3' and PROP_PARENT_ID = rid;
+ set triggers on;
+ update_acl := 0;
+ }
else
- {
- if ((O.RES_NAME = N.RES_NAME) and (O.RES_COL = N.RES_COL))
- return;
- aciContent := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = N.RES_ID and PROP_TYPE = 'R' and PROP_NAME = 'virt:aci_meta_n3');
- if (aciContent is null)
- return;
- oldPath := WS.WS.COL_PATH (O.RES_COL) || O.RES_NAME;
- newPath := WS.WS.COL_PATH (N.RES_COL) || N.RES_NAME;
- update_acl := 1;
- }
+ {
+ if ((O.RES_NAME = N.RES_NAME) and (O.RES_COL = N.RES_COL))
+ return;
+
+ aciContent := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = N.RES_ID and PROP_TYPE = 'R' and PROP_NAME = 'virt:aci_meta_n3');
+ if (aciContent is null)
+ return;
+
+ oldPath := WS.WS.COL_PATH (O.RES_COL) || O.RES_NAME;
+ newPath := WS.WS.COL_PATH (N.RES_COL) || N.RES_NAME;
+ update_acl := 1;
+ }
WS.WS.WAC_DELETE (oldPath, update_acl);
WS.WS.WAC_INSERT (newPath, aciContent, N.RES_OWNER, N.RES_GROUP, update_acl);
}
@@ -4626,18 +4625,20 @@ create trigger SYS_DAV_RES_WAC_D after delete on WS.WS.SYS_DAV_RES order 100 ref
{
declare update_acl int;
declare path varchar;
+
if (connection_get ('dav_acl_sync') = 1)
return;
+
if (O.RES_NAME like '%,acl')
- {
- update_acl := 0;
- path := regexp_replace (O.RES_FULL_PATH, ',acl\x24', '');
- }
+ {
+ update_acl := 0;
+ path := regexp_replace (O.RES_FULL_PATH, ',acl\x24', '');
+ }
else
- {
- path := O.RES_FULL_PATH;
- update_acl := 1;
- }
+ {
+ path := O.RES_FULL_PATH;
+ update_acl := 1;
+ }
WS.WS.WAC_DELETE (path, update_acl);
}
;
@@ -4675,7 +4676,7 @@ create trigger SYS_DAV_PROP_WAC_U after update (PROP_NAME, PROP_VALUE) on WS.WS.
declare exit handler for not found { return; };
if (N.PROP_TYPE = 'R')
- {
+ {
select RES_FULL_PATH, RES_OWNER, RES_GROUP
into _path, _owner, _group
from WS.WS.SYS_DAV_RES
@@ -4685,7 +4686,7 @@ create trigger SYS_DAV_PROP_WAC_U after update (PROP_NAME, PROP_VALUE) on WS.WS.
into _path, _owner, _group
from WS.WS.SYS_DAV_COL
where COL_ID = N.PROP_PARENT_ID;
- }
+ }
WS.WS.WAC_DELETE (_path, 1);
WS.WS.WAC_INSERT (_path, N.PROP_VALUE, _owner, _group, 1);
}
@@ -4722,18 +4723,20 @@ create procedure WS.WS.WAC_INSERT (
in gid integer,
in update_acl integer)
{
- --dbg_obj_print ('WAC_INSERT', path);
- declare graph varchar;
+ -- dbg_obj_print ('WAC_INSERT', path);
+ declare what, graph, permissions varchar;
- graph := WS.WS.DAV_IRI (path);
- aciContent := cast (blob_to_string (aciContent) as varchar);
- if (update_acl)
- {
- connection_set ('dav_acl_sync', 1);
- DAV_RES_UPLOAD_STRSES_INT (rtrim (path, '/') || ',acl', aciContent, 'text/n3', '110100000RR', uid, gid, null, null, 0);
- connection_set ('dav_acl_sync', null);
- }
- DB.DBA.TTLP (aciContent, graph, graph);
+ graph := WS.WS.WAC_GRAPH (path);
+ aciContent := cast (blob_to_string (aciContent) as varchar);
+ if (update_acl)
+ {
+ connection_set ('dav_acl_sync', 1);
+ what := case when (path[length (path)-1] <> ascii('/')) then 'R' else 'C' end;
+ permissions := DB.DBA.DAV_PROP_GET_INT (DB.DBA.DAV_SEARCH_ID (path, what), what, ':virtpermissions', 0, null, null, http_dav_uid ());
+ DAV_RES_UPLOAD_STRSES_INT (rtrim (path, '/') || ',acl', aciContent, 'text/n3', permissions, uid, gid, null, null, 0);
+ connection_set ('dav_acl_sync', null);
+ }
+ DB.DBA.TTLP (aciContent, graph, graph);
}
;
@@ -4741,18 +4744,26 @@ create procedure WS.WS.WAC_DELETE (
in path varchar,
in update_acl integer)
{
- --dbg_obj_print ('WAC_DELETE', path);
+ -- dbg_obj_print ('WAC_DELETE', path);
declare graph, st, msg varchar;
- graph := WS.WS.DAV_IRI (path);
- if (update_acl)
- {
- connection_set ('dav_acl_sync', 1);
+ graph := WS.WS.WAC_GRAPH (path);
+ if (update_acl)
+ {
+ connection_set ('dav_acl_sync', 1);
DAV_DELETE_INT (rtrim (path, '/') || ',acl', 1, null, null, 0, 0);
- connection_set ('dav_acl_sync', null);
- }
- SPARQL clear graph ?:graph;
+ connection_set ('dav_acl_sync', null);
}
+ set_user_id ('dba');
+ delete from DB.DBA.RDF_QUAD where G = iri_to_id (graph);
+}
+;
+
+create procedure WS.WS.WAC_GRAPH (
+ in path varchar)
+{
+ return rtrim (WS.WS.DAV_IRI (path), '/') || '/';
+}
;
create procedure WS.WS.DAV_IRI (
@@ -4771,7 +4782,6 @@ create procedure WS.WS.DAV_IRI (
if (server_http_port () <> '80')
host := host ||':'|| server_http_port ();
}
-
return sprintf ('http://%s%s', host, S);
}
;
@@ -4783,7 +4793,7 @@ create trigger SYS_DAV_COL_ACL_I after insert on WS.WS.SYS_DAV_COL order 9 refer
declare aAcl, aParentAcl any;
-- dbg_obj_princ ('trigger SYS_DAV_COL_ACL_I (', NC.COL_ID, ')');
- aAcl := WS.WS.ACL_PARSE(NC.COL_ACL, '01', 0);
+ aAcl := WS.WS.ACL_PARSE (NC.COL_ACL, '01', 0);
foreach (any acl in aAcl) do
{
insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)
@@ -4794,8 +4804,8 @@ create trigger SYS_DAV_COL_ACL_I after insert on WS.WS.SYS_DAV_COL order 9 refer
if (isnull(aParentAcl))
return;
- aAcl := WS.WS.ACL_PARSE(NC.COL_ACL, '012', 0);
- set triggers off;
+ aAcl := WS.WS.ACL_PARSE (NC.COL_ACL, '012', 0);
+ set triggers off;
update WS.WS.SYS_DAV_COL
set COL_ACL = WS.WS.ACL_COMPOSE (vector_concat (aAcl, WS.WS.ACL_MAKE_INHERITED(aParentAcl)))
where COL_ID = NC.COL_ID;
@@ -4806,10 +4816,10 @@ create trigger SYS_DAV_COL_ACL_I after insert on WS.WS.SYS_DAV_COL order 9 refer
create function WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (inout aAcl any, in grantee integer, in flag char(1)) returns integer
{
foreach (any acl in aAcl) do
- {
+ {
if ((grantee = acl[0]) and (flag = either(equ(acl[1],0), 'R', 'G')))
- return 1;
- }
+ return 1;
+ }
return 0;
}
;
@@ -4823,8 +4833,8 @@ create trigger SYS_DAV_COL_ACL_U after update (COL_ACL) on WS.WS.SYS_DAV_COL ord
delete
from WS.WS.SYS_DAV_ACL_INVERSE
where AI_PARENT_ID = O.COL_ID
- and AI_PARENT_TYPE = 'C'
- and not WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (aAcl, AI_GRANTEE_ID, AI_FLAG);
+ and AI_PARENT_TYPE = 'C'
+ and not WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (aAcl, AI_GRANTEE_ID, AI_FLAG);
aAcl := WS.WS.ACL_PARSE (N.COL_ACL, '01', 0);
foreach (any acl in aAcl) do
@@ -4895,8 +4905,8 @@ create trigger SYS_DAV_RES_ACL_U after update (RES_ACL) on WS.WS.SYS_DAV_RES ord
delete
from WS.WS.SYS_DAV_ACL_INVERSE
where AI_PARENT_ID = O.RES_ID
- and AI_PARENT_TYPE = 'R'
- and not WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (aAcl, AI_GRANTEE_ID, AI_FLAG);
+ and AI_PARENT_TYPE = 'R'
+ and not WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (aAcl, AI_GRANTEE_ID, AI_FLAG);
aAcl := WS.WS.ACL_PARSE (N.RES_ACL, '0', 0);
foreach (any acl in aAcl) do
@@ -4933,7 +4943,7 @@ create procedure WS.WS.ACL_UPDATE (in id integer, in parentAcl any)
update WS.WS.SYS_DAV_RES
set RES_ACL = nAcl
where RES_ID = resID;
- }
+ }
}
for select COL_ID as colID, COL_ACL as aAcl from WS.WS.SYS_DAV_COL where COL_PARENT = id do
{
@@ -4989,25 +4999,25 @@ create procedure WS.WS.ACL_SERIALIZE_INT(in I integer) returns varbinary
declare N integer;
declare aResult varchar;
- aResult:=repeat('\0',4);
+ aResult := repeat('\0', 4);
- N := bit_shift(I,-24);
- if(N)
- aset(aResult, 0, N);
+ N := bit_shift (I,-24);
+ if (N)
+ aset (aResult, 0, N);
- N := bit_shift(bit_shift(I, 8),-24);
- if(N)
- aset(aResult,1,N);
+ N := bit_shift (bit_shift (I, 8),-24);
+ if (N)
+ aset (aResult, 1, N);
- N := bit_shift(bit_shift(I,16),-24);
- if(N)
- aset(aResult,2,N);
+ N := bit_shift(bit_shift (I,16),-24);
+ if (N)
+ aset (aResult, 2, N);
- N := bit_shift(bit_shift(I, 24),-24);
- if(N)
- aset(aResult,3,N);
+ N := bit_shift(bit_shift (I, 24),-24);
+ if (N)
+ aset (aResult, 3, N);
- return cast(aResult as varbinary);
+ return cast (aResult as varbinary);
}
;
@@ -5017,8 +5027,8 @@ create procedure WS.WS.ACL_DESERIALIZE_INT(in vb varbinary) returns integer
{
declare vc varchar;
- vc := cast(vb as varchar);
- 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));
+ vc := cast (vb as varchar);
+ 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));
}
;
@@ -5026,7 +5036,7 @@ create procedure WS.WS.ACL_DESERIALIZE_INT(in vb varbinary) returns integer
--
create procedure WS.WS.ACL_GET_ACLLENGTH(in acl varbinary) returns integer
{
- return WS.WS.ACL_DESERIALIZE_INT(cast(substring(cast(acl as varchar), 1, 4) as varbinary));
+ return WS.WS.ACL_DESERIALIZE_INT (cast (substring( cast (acl as varchar), 1, 4) as varbinary));
}
;
@@ -5034,7 +5044,7 @@ create procedure WS.WS.ACL_GET_ACLLENGTH(in acl varbinary) returns integer
--
create procedure WS.WS.ACL_GET_ACESIZE(in acl varbinary) returns integer
{
- return WS.WS.ACL_DESERIALIZE_INT(cast(substring(cast(acl as varchar), 5, 4) as varbinary));
+ return WS.WS.ACL_DESERIALIZE_INT (cast (substring (cast (acl as varchar), 5, 4) as varbinary));
}
;
@@ -5045,8 +5055,8 @@ create procedure WS.WS.ACL_GET_ACESIZE(in acl varbinary) returns integer
-------------------------------------------------------------------------------
create procedure WS.WS.ACL_CREATE() returns varbinary
{
- return cast(concat(cast(WS.WS.ACL_SERIALIZE_INT(8) as varchar),
- cast(WS.WS.ACL_SERIALIZE_INT(0) as varchar)) as varbinary);
+ return cast(concat(cast (WS.WS.ACL_SERIALIZE_INT (8) as varchar),
+ cast (WS.WS.ACL_SERIALIZE_INT (0) as varchar)) as varbinary);
}
;
@@ -5095,7 +5105,7 @@ create procedure WS.WS.ACL_ADD_ENTRY(inout acl varbinary, in uid integer, in bit
declare N, bFound integer;
declare aAcl any;
- aAcl := WS.WS.ACL_PARSE(acl);
+ aAcl := WS.WS.ACL_PARSE (acl);
bFound := 0;
for (N := 0; N < length (aAcl); N := N + 1)
@@ -5104,12 +5114,12 @@ create procedure WS.WS.ACL_ADD_ENTRY(inout acl varbinary, in uid integer, in bit
{
if (aAcl[N][1] = is_grant)
{
- aset(aAcl, N, vector(aAcl[N][0], aAcl[N][1], aAcl[N][2], bitmask));
+ aset (aAcl, N, vector (aAcl[N][0], aAcl[N][1], aAcl[N][2], bitmask));
bFound := 1;
}
else
{
- aset(aAcl, N, vector(aAcl[N][0], aAcl[N][1], aAcl[N][2], bit_and(aAcl[N][3], bit_not(bitmask))));
+ aset (aAcl, N, vector (aAcl[N][0], aAcl[N][1], aAcl[N][2], bit_and(aAcl[N][3], bit_not(bitmask))));
}
}
}
@@ -5135,7 +5145,7 @@ create procedure WS.WS.ACL_REMOVE_ENTRY(inout acl varbinary, in uid integer, in
declare N integer;
declare aAcl any;
- aAcl := WS.WS.ACL_PARSE(acl);
+ aAcl := WS.WS.ACL_PARSE (acl);
for (N := 0; N < length(aAcl); N := N + 1)
{
if ((aAcl[N][0] = uid) and (aAcl[N][2] = inheritance))
@@ -5161,7 +5171,7 @@ create procedure WS.WS.ACL_REMOVE_ENTRY(inout acl varbinary, in uid integer, in
-- True if all the operations in bitmask are granted to the uid in the ACL.
--
-------------------------------------------------------------------------------
-create procedure WS.WS.ACL_IS_GRANTED(in acl varbinary, in uid integer, in bitmask integer) returns integer
+create procedure WS.WS.ACL_IS_GRANTED (in acl varbinary, in uid integer, in bitmask integer) returns integer
{
declare N, lenAcl integer;
declare aAcl any;
@@ -5171,7 +5181,7 @@ create procedure WS.WS.ACL_IS_GRANTED(in acl varbinary, in uid integer, in bitma
if (isnull(acl))
return 0;
- aAcl := WS.WS.ACL_PARSE(acl);
+ aAcl := WS.WS.ACL_PARSE (acl);
if (length(aAcl) = 0)
return 0;
ids := (select vector_concat (vector (uid), VECTOR_AGG (GI_SUB)) from DB.DBA.SYS_ROLE_GRANTS where GI_SUPER = uid);
@@ -5180,22 +5190,22 @@ create procedure WS.WS.ACL_IS_GRANTED(in acl varbinary, in uid integer, in bitma
N := 0;
lenAcl := length(aAcl);
for (N := 0; N < lenAcl; N := N + 1)
+ {
+ if (position (aAcl[N][0], ids))
{
- if (position (aAcl[N][0], ids))
+ declare anded integer;
+ anded := bit_and (aAcl[N][3], bitmask);
+ if (anded <> 0)
+ {
+ if (aAcl[N][1])
{
- declare anded integer;
- anded := bit_and (aAcl[N][3], bitmask);
- if (anded <> 0)
- {
- if (aAcl[N][1])
- {
- or_acc := bit_or (or_acc, anded);
- }
- else
- return 0; -- revoke of any single bit invalidates the permission.
- }
+ or_acc := bit_or (or_acc, anded);
}
+ else
+ return 0; -- revoke of any single bit invalidates the permission.
+ }
}
+ }
if (or_acc = bitmask)
return or_acc;
return 0;
@@ -5240,8 +5250,9 @@ create procedure WS.WS.ACL_PARSE (
if (acl is null)
return vector ();
+
if (internal_type_name(internal_type(acl)) = 'BLOB_HANDLE')
- acl := cast(blob_to_string(acl) as varbinary);
+ acl := cast (blob_to_string (acl) as varbinary);
else if (internal_type_name(internal_type(acl)) = 'VARCHAR')
acl := cast (acl as varbinary);
@@ -5253,17 +5264,17 @@ create procedure WS.WS.ACL_PARSE (
}
aclSize := WS.WS.ACL_GET_ACESIZE (acl);
- sAcl := cast(acl as varchar);
+ sAcl := cast (acl as varchar);
vectorbld_init (aAcl);
for (N := 1; N <= aclSize; N := N + 1)
{
- T := WS.WS.ACL_DESERIALIZE_INT(cast (substring(sAcl, 8*N+5, 4) as varbinary));
- I := abs(bit_and(bit_shift(T, -29), 3));
- if (not isnull(strchr(inheritance, cast(I as varchar))))
+ T := WS.WS.ACL_DESERIALIZE_INT (cast (substring (sAcl, 8*N+5, 4) as varbinary));
+ I := abs (bit_and (bit_shift (T, -29), 3));
+ if (not isnull (strchr (inheritance, cast (I as varchar))))
vectorbld_acc (aAcl, vector (WS.WS.ACL_DESERIALIZE_INT (cast (substring (sAcl, 8*N+1, 4) as varbinary)),
- abs(bit_shift(T, -31)),
- I,
+ abs(bit_shift (T, -31)),
+ I,
abs (bit_and (T, 536870911))));
}
vectorbld_final (aAcl);
@@ -6698,8 +6709,8 @@ create procedure DAV_EXTRACT_AND_SAVE_RDF_INT (inout resid integer, inout resnam
if ((length (_rescontent) < 262144) or (registry_get ('DAV_EXTRACT_RDF_ASYNC') <> '1'))
{
DAV_EXTRACT_AND_SAVE_RDF_INT2 (resid, resname, restype, rescontent);
- }
- else
+ }
+ else
{
declare aq any;
aq := async_queue (1);
@@ -6723,7 +6734,7 @@ create procedure DAV_EXTRACT_AND_SAVE_RDF_INT2 (in resid integer, in resname var
spotlight_addon_n3 := null;
addon_n3 := null;
--if (restype is null)
- restype := DAV_GUESS_MIME_TYPE (resname, rescontent, html_start);
+ restype := DAV_GUESS_MIME_TYPE (resname, rescontent, html_start);
-- dbg_obj_princ ('restype is ', restype);
if (restype is not null)
{
@@ -6796,7 +6807,7 @@ DAV_HOME_DIR_UPDATE ()
{
if (isstring (registry_get ('DAV_HOME_DIR_UPDATE')))
return;
- for (select U_NAME from SYS_USERS where U_DAV_ENABLE = 1 and U_IS_ROLE = 0 and U_NAME <> 'nobody') do
+ for (select U_NAME from SYS_USERS where U_DAV_ENABLE = 1 and U_IS_ROLE = 0 and U_NAME <> 'nobody' and U_NAME <> '__rdf_repl') do
DAV_HOME_DIR_CREATE (U_NAME);
registry_set ('DAV_HOME_DIR_UPDATE', 'done');
}
diff --git a/binsrc/dav/dav_debug.sql b/binsrc/dav/dav_debug.sql
index e28c679..74c9dc8 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/dav_meta.sql b/binsrc/dav/dav_meta.sql
index 299745b..e62140c 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.2 2011/06/02 12:28:41 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/dav_metr.sh b/binsrc/dav/dav_metr.sh
index 8d7247e..95cb5ba 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.1 2009/11/20 17:11:24 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/dav/dav_rdf_quad.sql b/binsrc/dav/dav_rdf_quad.sql
index 30d3bfa..9dd8268 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.3 2011/10/13 18:28:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -56,9 +56,9 @@ create procedure DB.DBA.DAV_REPLICATE_ALL_TO_RDF_QUAD (in enable integer)
if (uriqa_default_host is null or uriqa_default_host = '')
signal ('OBLOM', 'No uriqa_default_host!');
if (virtuoso_ini_item_value ('URIQA', 'DynamicLocal') = '1')
- new_dav_graph := 'local:/DAV';
+ new_dav_graph := 'local:/DAV/';
else
- new_dav_graph := sprintf ('http://%s/DAV', uriqa_default_host);
+ new_dav_graph := sprintf ('http://%s/DAV/', uriqa_default_host);
exec ('checkpoint');
__atomic (1);
DB.DBA.RDF_DELETE_ENTIRE_GRAPH (new_dav_graph, 1);
diff --git a/binsrc/dav/davddk.sql b/binsrc/dav/davddk.sql
index f0ef84e..09a1678 100644
--- a/binsrc/dav/davddk.sql
+++ b/binsrc/dav/davddk.sql
@@ -1,10 +1,10 @@
--
--- $Id: davddk.sql,v 1.13.2.5 2011/01/05 12:52:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -36,7 +36,7 @@ create table WS.WS.SYS_DAV_COL (
COL_PERMS char (11),
COL_DET varchar,
COL_ACL long varbinary,
- COL_IID IRI_ID,
+ COL_IID IRI_ID_8,
COL_AUTO_VERSIONING char(1),
COL_FORK integer not null default 0,
COL_INHERIT char(1) default 'N', -- NMR flag denotes, none, members, recursive
@@ -58,7 +58,7 @@ alter table WS.WS.SYS_DAV_COL add COL_ACL long varbinary
alter table WS.WS.SYS_DAV_COL modify COL_PERMS char (11)
;
-alter table WS.WS.SYS_DAV_COL add COL_IID IRI_ID
+alter table WS.WS.SYS_DAV_COL add COL_IID IRI_ID_8
;
alter table WS.WS.SYS_DAV_COL add COL_INHERIT char(1) default 'N'
@@ -80,7 +80,7 @@ create table WS.WS.SYS_DAV_RES (
RES_FULL_PATH varchar,
ROWGUID varchar,
RES_ACL long varbinary,
- RES_IID IRI_ID,
+ RES_IID IRI_ID_8,
RES_STATUS varchar,
RES_VCR_ID integer,
RES_VCR_CO_VERSION integer,
@@ -103,7 +103,7 @@ alter table WS.WS.SYS_DAV_RES add RES_ACL long varbinary
alter table WS.WS.SYS_DAV_RES modify RES_PERMS char (11)
;
-alter table WS.WS.SYS_DAV_RES add RES_IID IRI_ID
+alter table WS.WS.SYS_DAV_RES add RES_IID IRI_ID_8
;
--#ENDIF
@@ -549,6 +549,12 @@ create procedure WS.WS.COL_PATH (in _id any)
while (_id > 0)
{
select COL_NAME, COL_PARENT into _name, _p_id from WS.WS.SYS_DAV_COL where COL_ID = _id;
+ if (_id = _p_id)
+ {
+ log_message (sprintf ('DAV collection %d is its own parent', _id));
+ _path := '**circular**/' || _path;
+ return _path;
+ }
_id := _p_id;
_path := concat ('/', _name, _path);
}
@@ -1129,6 +1135,17 @@ props_done:
values (http_nobody_uid (), 'nobody','Special account', 'nobody at example.domain', pwd_magic_calc ('nobody', uuid()), http_admin_gid (), '110100000', 1, 0, 1);
insert soft DB.DBA.SYS_USERS (U_ID, U_NAME, U_FULL_NAME, U_E_MAIL, U_PASSWORD, U_GROUP, U_DEF_PERMS, U_ACCOUNT_DISABLED, U_SQL_ENABLE, U_DAV_ENABLE, U_IS_ROLE)
values (http_nogroup_gid (), 'nogroup','Special group', 'nobody at example.domain', '', NULL, '110100000', 0, 0, 1, 1);
+ if (not exists (select top 1 1 from DB.DBA.SYS_USERS where U_ID = __rdf_repl_uid()))
+ {
+ declare passwd varchar;
+ passwd := uuid();
+ insert replacing DB.DBA.SYS_USERS (U_ID, U_NAME, U_FULL_NAME, U_E_MAIL, U_PASSWORD, U_GROUP, U_DEF_PERMS, U_ACCOUNT_DISABLED, U_SQL_ENABLE, U_DAV_ENABLE)
+ values (__rdf_repl_uid(), '__rdf_repl','Special account', 'nobody at example.domain', pwd_magic_calc ('__rdf_repl', passwd), http_admin_gid (), '110100000', 0, 1, 1);
+ DB.DBA.SECURITY_CL_EXEC_AND_LOG ('sec_set_user_struct (?,?,?,?,?,?,?)', vector (
+ '__rdf_repl', passwd, __rdf_repl_uid(), http_admin_gid (), concat ('Q ', 'DB'), 0, NULL, NULL));
+ DB.DBA.SECURITY_CL_EXEC_AND_LOG ('sec_user_enable (?, ?)', vector ('__rdf_repl', 0));
+ }
+ commit work;
__atomic (0);
return;
}
diff --git a/binsrc/dav/davxml2n3xml.xsl b/binsrc/dav/davxml2n3xml.xsl
index 5500907..7cf2f8c 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 2007/03/26 14:47:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/dav/davxml2rdfxml.xsl b/binsrc/dav/davxml2rdfxml.xsl
index 1235738..1c89d52 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 2007/03/26 14:47:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/dav/init_dav_metr.sql b/binsrc/dav/init_dav_metr.sql
index db8c4e5..bea6028 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/n3xml2uriqahtml.xsl b/binsrc/dav/n3xml2uriqahtml.xsl
index 602b9ae..70a8dc3 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 2007/03/26 14:47:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/dav/rdav.sh b/binsrc/dav/rdav.sh
index 3f42b54..1ef94c3 100755
--- a/binsrc/dav/rdav.sh
+++ b/binsrc/dav/rdav.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: rdav.sh,v 1.4.2.1 2009/11/20 17:11:24 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/dav/rdfxml2n3xml.xsl b/binsrc/dav/rdfxml2n3xml.xsl
index 6b5f14d..66b206f 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 2007/03/26 14:47:01 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/dav/snapshot_repl.sql b/binsrc/dav/snapshot_repl.sql
index a746055..4d173bb 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.1 2009/11/20 17:11:24 source Exp $
+-- $Id$
--
-- SNP replication support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dav/uriqa.sql b/binsrc/dav/uriqa.sql
index 5d59d48..5abfc1b 100644
--- a/binsrc/dav/uriqa.sql
+++ b/binsrc/dav/uriqa.sql
@@ -1,10 +1,10 @@
--
--- $Id: uriqa.sql,v 1.7.2.1 2011/09/28 17:01:16 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/dbpedia/Makefile.am b/binsrc/dbpedia/Makefile.am
new file mode 100644
index 0000000..40c1e0b
--- /dev/null
+++ b/binsrc/dbpedia/Makefile.am
@@ -0,0 +1,63 @@
+#
+# 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
new file mode 100644
index 0000000..c48fca1
--- /dev/null
+++ b/binsrc/dbpedia/Makefile.in
@@ -0,0 +1,506 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@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 =
+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 = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
+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@
+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@
+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_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_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_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 \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/dbpedia/Makefile'; \
+ 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
+
+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)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
+ done
+
+uninstall-nodist_vadDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
+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 $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$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)
+
+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
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nodist_vadDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: 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
new file mode 100644
index 0000000..e7cc06d
--- /dev/null
+++ b/binsrc/dbpedia/dbpedia_init.sql
@@ -0,0 +1,726 @@
+--
+-- $Id$
+--
+-- 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
new file mode 100644
index 0000000..7a3ea70
--- /dev/null
+++ b/binsrc/dbpedia/dbpedia_local.sql
@@ -0,0 +1,487 @@
+--
+-- $Id$
+--
+-- 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);
+}
+;
+
+create procedure DB.DBA.DBP_CHECK_304 (in lines any, in opts any)
+{
+ declare graph any;
+ graph := get_keyword ('graph', opts);
+ return dbp_check_if_modified (lines, graph);
+}
+;
+
+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', 'expiration_function', 'DB.DBA.DBP_CHECK_304', 'graph', registry_get ('dbp_graph')));
+
+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', 'expiration_function', 'DB.DBA.DBP_CHECK_304', 'graph', registry_get ('dbp_graph')));
+
+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', 'expiration_function', 'DB.DBA.DBP_CHECK_304', 'graph', registry_get ('dbp_graph')));
+
+DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_data3_rule_list', 1, vector ('dbpl_data3_rule_1', 'dbpl_data3_rule_2', 'dbpl_data3_rule_3', 'dbpl_data3_rule_4', 'dbpl_data3_rule_5'));
+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://','')||'%%2Fresource%%2Fclasses%%23&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://','')||'%%2Fresource%%2Fclasses%%23&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://','')||'%%2Fresource%%2Fclasses%%23&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, '');
+
+DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data3_rule_4', 1, '/data3/(.*)\\.json', vector ('par_1'), 1,
+'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'%%2Fresource%%2Fclasses%%23&query='||dbp_gen_describe ('ontology')||'&format=application%%2Fjson',
+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_5', 1, '/data3/(.*)\\.jsod', vector ('par_1'), 1,
+'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'%%2Fresource%%2Fclasses%%23&query='||dbp_gen_describe ('ontology')||'&format=application%%2Fodata%%2Bjson',
+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/\x242.xml', 'application/rdf+xml', 0.95, location_hook=>null);
+DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '/(.*)@__@(.*)', '/data/\x242.n3', 'text/n3', 0.80, location_hook=>null);
+DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '/(.*)@__@(.*)', '/data/\x242.nt', 'text/rdf+n3', 0.80, location_hook=>null);
+DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '/(.*)@__@(.*)', '/data/\x242.ttl', 'application/x-turtle', 0.70, location_hook=>null);
+DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '/(.*)@__@(.*)', '/data/\x242.json', 'application/json', 0.60, location_hook=>null);
+DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '/(.*)@__@(.*)', '/data/\x242.jrdf', 'application/rdf+json', 0.60, location_hook=>null);
+DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '/(.*)@__@(.*)', '/data/\x242.atom', 'application/atom+xml', 0.50, location_hook=>null);
+DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '/(.*)@__@(.*)', '/data/\x242.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', 'expiration_function', 'DB.DBA.DBP_CHECK_304', 'graph', registry_get ('dbp_graph'))
+);
+
+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
new file mode 100755
index 0000000..2bb8903
--- /dev/null
+++ b/binsrc/dbpedia/make_vad.sh
@@ -0,0 +1,457 @@
+#!/bin/sh
+#
+# $Id$
+#
+# 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
new file mode 100644
index 0000000..a295bf2
--- /dev/null
+++ b/binsrc/dbpedia/vad_version
@@ -0,0 +1 @@
+1.3.83
diff --git a/binsrc/dbpedia/vsp/description.sql b/binsrc/dbpedia/vsp/description.sql
new file mode 100644
index 0000000..651616b
--- /dev/null
+++ b/binsrc/dbpedia/vsp/description.sql
@@ -0,0 +1,691 @@
+--
+-- $Id$
+--
+-- 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 (__tag of rdf_box = __tag (best_str))
+ {
+ __rdf_box_make_complete (best_str);
+ best_str := rdf_box_data (best_str);
+ }
+ 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;
+ }
+ }
+ }
+ if (__tag of rdf_box = __tag (best_str))
+ {
+ __rdf_box_make_complete (best_str);
+ best_str := rdf_box_data (best_str);
+ }
+ 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]);
+ }
+ }
+ if (__tag of rdf_box = __tag (ll))
+ {
+ __rdf_box_make_complete (ll);
+ ll := rdf_box_data (ll);
+ }
+ 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>%V:</small>%V</a>\n',
+ href,
+ charset_recode (title, 'UTF-8', '_WIDE_'),
+ charset_recode (p_prefix, 'UTF-8', '_WIDE_'),
+ charset_recode (short_p, 'UTF-8', '_WIDE_')));
+ else
+ http (sprintf ('<a class="uri" href="%V"%s>%V</a>\n',
+ href,
+ charset_recode (title, 'UTF-8', '_WIDE_'),
+ charset_recode (p_prefix, 'UTF-8', '_WIDE_')));
+ 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, in nofollow int := 0)
+{
+ 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%s"', nspref, loc, case when nofollow = 1 and loc <> 'sameAs' then ' nofollow' else '' end);
+ 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, 0);
+
+ 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>', rdfa));
+ http_value (charset_recode (_object, 'UTF-8', '_WIDE_'));
+ http ('</span>');
+ 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);
+
+ declare nofollow int;
+ nofollow := 0;
+ if (s_t is null and _url not like registry_get('dbp_domain') || '/%')
+ nofollow := 1;
+
+ rdfa := dbp_ldd_rel_print (id_to_iri (pred), rel, _url, 0, lang, nofollow);
+
+ if (s_t is null)
+ {
+ http (sprintf ('<a class="uri" %s href="%V">%V</a>',
+ rdfa,
+ charset_recode (case when org then _url else dbp_ldd_get_proxy(_url) end, 'UTF-8', '_WIDE_'),
+ charset_recode (_url, 'UTF-8', '_WIDE_')));
+ }
+ else
+ {
+ http (sprintf ('<a class="uri" %s href="%V"><small>%V</small>:%V</a>',
+ rdfa,
+ charset_recode (case when org then _url else dbp_ldd_get_proxy(_url) end, 'UTF-8', '_WIDE_'),
+ charset_recode (p_t, 'UTF-8', '_WIDE_'),
+ charset_recode (s_t, 'UTF-8', '_WIDE_')));
+ }
+ }
+ 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:isPrimaryTopicOf ?o } } LIMIT 1', _G, _S), null, null, vector (), 0, meta, data);
+
+ if (length (data))
+ wiki_link := charset_recode (data[0][0], 'UTF-8', '_WIDE_');
+ 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');
+}
+;
+
+create procedure
+dbp_check_if_modified (in lines any, in graph any)
+{
+ declare since, modified, pname any;
+ declare exit handler for sqlstate '*'
+ {
+ return 0;
+ };
+ since := http_request_header (lines, 'If-Modified-Since', null, null);
+ if (since is null) return 0;
+ since := http_string_date (since);
+ pname := registry_get ('dbp_last_modification');
+ if (isstring (pname) and __proc_exists (pname) is not null)
+ modified := call (pname) (lines, graph);
+ else
+ modified := (select max (LL_DONE) from LOAD_LIST where LL_GRAPH = graph);
+ modified := dt_set_tz (modified, 0);
+ --dbg_obj_print_vars (since, modified, gt (since, modified), graph);
+ if (modified is null) return 0;
+ if (modified > since) return 0;
+ http_rewrite ();
+ http_status_set (304);
+ return 1;
+}
+;
diff --git a/binsrc/dbpedia/vsp/description.vsp b/binsrc/dbpedia/vsp/description.vsp
new file mode 100644
index 0000000..3de8df5
--- /dev/null
+++ b/binsrc/dbpedia/vsp/description.vsp
@@ -0,0 +1,391 @@
+<?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$
+--
+-- 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/%')
+ {
+ project_home_page := registry_get('dbp_graph') || '/resource/classes#';
+ rdf_link2 := dbp_ldd_get_proxy (replace (page_resource_uri, '/ontology/', '/data3/'));
+ rdf_link := 'http://'|| http_request_header (http_request_header (), 'Host')
+ ||'/sparql?default-graph-uri=http%3A%2F%2F'||replace(registry_get('dbp_graph'),'http://','')||'%2Fresource%2Fclasses%23&query=DESCRIBE+<' ||
+ replace (page_resource_uri, '%', '%25') || '>';
+ gen_rdf_link := rdf_link;
+ }
+ 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];
+ }
+ if (dbp_check_if_modified (lines, project_home_page))
+ return;
+ -- 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 ('%V', charset_recode (label, 'UTF-8', '_WIDE_'))); ?></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 charset_recode(page_resource_uri, 'UTF-8', '_WIDE_') ?>">
+ <div id="header">
+ <div id="hd_l">
+ <h1 id="title">About: <a href="<?V dbp_ldd_get_proxy (page_resource_uri) ?>"><?V charset_recode(label, 'UTF-8', '_WIDE_') ?></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
new file mode 100644
index 0000000..363bda2
--- /dev/null
+++ b/binsrc/dbpedia/vsp/description_white.vsp
@@ -0,0 +1,175 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<?vsp
+--
+-- $Id$
+--
+-- 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/b3s/images/od_80x15_red_green.png b/binsrc/dbpedia/vsp/images/od_80x15_red_green.png
similarity index 100%
copy from binsrc/b3s/images/od_80x15_red_green.png
copy to binsrc/dbpedia/vsp/images/od_80x15_red_green.png
diff --git a/binsrc/b3s/images/rdf-icon.gif b/binsrc/dbpedia/vsp/images/rdf-icon.gif
similarity index 100%
copy from binsrc/b3s/images/rdf-icon.gif
copy to binsrc/dbpedia/vsp/images/rdf-icon.gif
diff --git a/binsrc/b3s/images/sw-cube.png b/binsrc/dbpedia/vsp/images/sw-cube.png
similarity index 100%
copy from binsrc/b3s/images/sw-cube.png
copy to binsrc/dbpedia/vsp/images/sw-cube.png
diff --git a/binsrc/b3s/images/sw-sparql-blue.png b/binsrc/dbpedia/vsp/images/sw-sparql-blue.png
similarity index 100%
copy from binsrc/b3s/images/sw-sparql-blue.png
copy to binsrc/dbpedia/vsp/images/sw-sparql-blue.png
diff --git a/appsrc/ODS-Addressbook/www/image/virt_power_no_border.png b/binsrc/dbpedia/vsp/images/virt_power_no_border.png
similarity index 100%
rename from appsrc/ODS-Addressbook/www/image/virt_power_no_border.png
rename to binsrc/dbpedia/vsp/images/virt_power_no_border.png
diff --git a/binsrc/b3s/images/LoDLogo.gif b/binsrc/dbpedia/vsp/statics/LoDLogo.gif
old mode 100644
new mode 100755
similarity index 100%
copy from binsrc/b3s/images/LoDLogo.gif
copy to binsrc/dbpedia/vsp/statics/LoDLogo.gif
diff --git a/binsrc/dbpedia/vsp/statics/dbpedia_logo.png b/binsrc/dbpedia/vsp/statics/dbpedia_logo.png
new file mode 100644
index 0000000..1958fb6
Binary files /dev/null and b/binsrc/dbpedia/vsp/statics/dbpedia_logo.png differ
diff --git a/binsrc/b3s/styles/highlighter.css b/binsrc/dbpedia/vsp/statics/highlighter.css
similarity index 100%
copy from binsrc/b3s/styles/highlighter.css
copy to binsrc/dbpedia/vsp/statics/highlighter.css
diff --git a/binsrc/b3s/images/od_80x15_red_green.png b/binsrc/dbpedia/vsp/statics/od_80x15_red_green.png
similarity index 100%
copy from binsrc/b3s/images/od_80x15_red_green.png
copy to binsrc/dbpedia/vsp/statics/od_80x15_red_green.png
diff --git a/binsrc/b3s/images/rdf-icon.gif b/binsrc/dbpedia/vsp/statics/rdf-icon.gif
similarity index 100%
copy from binsrc/b3s/images/rdf-icon.gif
copy to binsrc/dbpedia/vsp/statics/rdf-icon.gif
diff --git a/binsrc/b3s/images/rdf_w3c.png b/binsrc/dbpedia/vsp/statics/rdf_w3c.png
similarity index 100%
copy from binsrc/b3s/images/rdf_w3c.png
copy to binsrc/dbpedia/vsp/statics/rdf_w3c.png
diff --git a/binsrc/rdf_mappers/rdfdesc/statics/rdf_w3c.svg b/binsrc/dbpedia/vsp/statics/rdf_w3c.svg
similarity index 100%
copy from binsrc/rdf_mappers/rdfdesc/statics/rdf_w3c.svg
copy to binsrc/dbpedia/vsp/statics/rdf_w3c.svg
diff --git a/binsrc/b3s/images/rdf_w3c_300.png b/binsrc/dbpedia/vsp/statics/rdf_w3c_300.png
similarity index 100%
copy from binsrc/b3s/images/rdf_w3c_300.png
copy to binsrc/dbpedia/vsp/statics/rdf_w3c_300.png
diff --git a/binsrc/b3s/images/rdf_w3c_500.png b/binsrc/dbpedia/vsp/statics/rdf_w3c_500.png
similarity index 100%
copy from binsrc/b3s/images/rdf_w3c_500.png
copy to binsrc/dbpedia/vsp/statics/rdf_w3c_500.png
diff --git a/binsrc/b3s/images/rdf_w3c_742.png b/binsrc/dbpedia/vsp/statics/rdf_w3c_742.png
similarity index 100%
copy from binsrc/b3s/images/rdf_w3c_742.png
copy to binsrc/dbpedia/vsp/statics/rdf_w3c_742.png
diff --git a/binsrc/b3s/images/rdf_w3c_742_trans.png b/binsrc/dbpedia/vsp/statics/rdf_w3c_742_trans.png
similarity index 100%
copy from binsrc/b3s/images/rdf_w3c_742_trans.png
copy to binsrc/dbpedia/vsp/statics/rdf_w3c_742_trans.png
diff --git a/binsrc/dbpedia/vsp/statics/script.js b/binsrc/dbpedia/vsp/statics/script.js
new file mode 100644
index 0000000..43346fd
--- /dev/null
+++ b/binsrc/dbpedia/vsp/statics/script.js
@@ -0,0 +1,59 @@
+/*
+ * $Id$
+ *
+ * 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
new file mode 100644
index 0000000..2c3366e
--- /dev/null
+++ b/binsrc/dbpedia/vsp/statics/style.css
@@ -0,0 +1,75 @@
+/*
+ * $Id$
+ *
+ * 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
new file mode 100644
index 0000000..3c46322
--- /dev/null
+++ b/binsrc/dbpedia/vsp/statics/style_w.css
@@ -0,0 +1,69 @@
+/*
+ * $Id$
+ *
+ * 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/b3s/images/sw-cube.png b/binsrc/dbpedia/vsp/statics/sw-cube.png
similarity index 100%
copy from binsrc/b3s/images/sw-cube.png
copy to binsrc/dbpedia/vsp/statics/sw-cube.png
diff --git a/binsrc/b3s/images/sw-rdf-gray.png b/binsrc/dbpedia/vsp/statics/sw-rdf-gray.png
similarity index 100%
copy from binsrc/b3s/images/sw-rdf-gray.png
copy to binsrc/dbpedia/vsp/statics/sw-rdf-gray.png
diff --git a/binsrc/b3s/images/sw-sparql-blue.png b/binsrc/dbpedia/vsp/statics/sw-sparql-blue.png
similarity index 100%
copy from binsrc/b3s/images/sw-sparql-blue.png
copy to binsrc/dbpedia/vsp/statics/sw-sparql-blue.png
diff --git a/binsrc/b3s/images/sw-vert-v.png b/binsrc/dbpedia/vsp/statics/sw-vert-v.png
similarity index 100%
copy from binsrc/b3s/images/sw-vert-v.png
copy to binsrc/dbpedia/vsp/statics/sw-vert-v.png
diff --git a/binsrc/rdf_mappers/rdfdesc/statics/sw-vert-v.svg b/binsrc/dbpedia/vsp/statics/sw-vert-v.svg
similarity index 100%
copy from binsrc/rdf_mappers/rdfdesc/statics/sw-vert-v.svg
copy to binsrc/dbpedia/vsp/statics/sw-vert-v.svg
diff --git a/binsrc/b3s/images/sw-vert-v_780_trans.png b/binsrc/dbpedia/vsp/statics/sw-vert-v_780_trans.png
similarity index 100%
copy from binsrc/b3s/images/sw-vert-v_780_trans.png
copy to binsrc/dbpedia/vsp/statics/sw-vert-v_780_trans.png
diff --git a/appsrc/ODS-Bookmark/www/image/virt_power_no_border.png b/binsrc/dbpedia/vsp/statics/virt_power_no_border.png
old mode 100644
new mode 100755
similarity index 100%
rename from appsrc/ODS-Bookmark/www/image/virt_power_no_border.png
rename to binsrc/dbpedia/vsp/statics/virt_power_no_border.png
diff --git a/binsrc/dbpedia/vsp/style/style.css b/binsrc/dbpedia/vsp/style/style.css
new file mode 100644
index 0000000..a60530a
--- /dev/null
+++ b/binsrc/dbpedia/vsp/style/style.css
@@ -0,0 +1,75 @@
+/*
+ * $Id$
+ *
+ * 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 8923084..07a7a43 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/driver/Makefile.in b/binsrc/driver/Makefile.in
index 21720fa..5ce1909 100644
--- a/binsrc/driver/Makefile.in
+++ b/binsrc/driver/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,29 +68,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
libvirtodbc_la_LIBADD =
am_libvirtodbc_la_OBJECTS = libvirtodbc_la-unixodbc.lo \
@@ -146,10 +129,9 @@ virtodbcu_r_la_OBJECTS = $(am_virtodbcu_r_la_OBJECTS)
virtodbcu_r_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(virtodbcu_r_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -255,7 +237,6 @@ 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@
@@ -339,7 +320,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -360,7 +340,6 @@ 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@
@@ -484,14 +463,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/driver/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/driver/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/driver/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/driver/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -509,28 +488,23 @@ $(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):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
+ done
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -591,129 +565,129 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libvirtodbc_la-unixodbc.lo: $(srcdir)/unixodbc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-unixodbc.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-unixodbc.Tpo -c -o libvirtodbc_la-unixodbc.lo `test -f '$(srcdir)/unixodbc.c' || echo '$(srcdir)/'`$(srcdir)/unixodbc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-unixodbc.Tpo $(DEPDIR)/libvirtodbc_la-unixodbc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-unixodbc.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-unixodbc.Tpo -c -o libvirtodbc_la-unixodbc.lo `test -f '$(srcdir)/unixodbc.c' || echo '$(srcdir)/'`$(srcdir)/unixodbc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-unixodbc.Tpo $(DEPDIR)/libvirtodbc_la-unixodbc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/unixodbc.c' object='libvirtodbc_la-unixodbc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-unixodbc.lo `test -f '$(srcdir)/unixodbc.c' || echo '$(srcdir)/'`$(srcdir)/unixodbc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-unixodbc.lo `test -f '$(srcdir)/unixodbc.c' || echo '$(srcdir)/'`$(srcdir)/unixodbc.c
libvirtodbc_la-CLIuti.lo: $(top_srcdir)/libsrc/Wi/CLIuti.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIuti.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIuti.Tpo -c -o libvirtodbc_la-CLIuti.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIuti.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIuti.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-CLIuti.Tpo $(DEPDIR)/libvirtodbc_la-CLIuti.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIuti.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIuti.Tpo -c -o libvirtodbc_la-CLIuti.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIuti.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIuti.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-CLIuti.Tpo $(DEPDIR)/libvirtodbc_la-CLIuti.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/CLIuti.c' object='libvirtodbc_la-CLIuti.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIuti.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIuti.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIuti.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIuti.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIuti.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIuti.c
libvirtodbc_la-CLIsql1.lo: $(top_srcdir)/libsrc/Wi/CLIsql1.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIsql1.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIsql1.Tpo -c -o libvirtodbc_la-CLIsql1.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql1.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql1.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-CLIsql1.Tpo $(DEPDIR)/libvirtodbc_la-CLIsql1.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIsql1.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIsql1.Tpo -c -o libvirtodbc_la-CLIsql1.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql1.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql1.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-CLIsql1.Tpo $(DEPDIR)/libvirtodbc_la-CLIsql1.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/CLIsql1.c' object='libvirtodbc_la-CLIsql1.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIsql1.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql1.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql1.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIsql1.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql1.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql1.c
libvirtodbc_la-CLIsql2.lo: $(top_srcdir)/libsrc/Wi/CLIsql2.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIsql2.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIsql2.Tpo -c -o libvirtodbc_la-CLIsql2.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql2.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-CLIsql2.Tpo $(DEPDIR)/libvirtodbc_la-CLIsql2.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIsql2.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIsql2.Tpo -c -o libvirtodbc_la-CLIsql2.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql2.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-CLIsql2.Tpo $(DEPDIR)/libvirtodbc_la-CLIsql2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/CLIsql2.c' object='libvirtodbc_la-CLIsql2.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIsql2.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql2.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql2.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIsql2.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql2.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql2.c
libvirtodbc_la-CLIodbc3.lo: $(top_srcdir)/libsrc/Wi/CLIodbc3.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIodbc3.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIodbc3.Tpo -c -o libvirtodbc_la-CLIodbc3.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIodbc3.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIodbc3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-CLIodbc3.Tpo $(DEPDIR)/libvirtodbc_la-CLIodbc3.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIodbc3.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIodbc3.Tpo -c -o libvirtodbc_la-CLIodbc3.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIodbc3.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIodbc3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-CLIodbc3.Tpo $(DEPDIR)/libvirtodbc_la-CLIodbc3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/CLIodbc3.c' object='libvirtodbc_la-CLIodbc3.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIodbc3.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIodbc3.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIodbc3.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIodbc3.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIodbc3.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIodbc3.c
libvirtodbc_la-CLIcr.lo: $(top_srcdir)/libsrc/Wi/CLIcr.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIcr.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIcr.Tpo -c -o libvirtodbc_la-CLIcr.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIcr.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIcr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-CLIcr.Tpo $(DEPDIR)/libvirtodbc_la-CLIcr.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIcr.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIcr.Tpo -c -o libvirtodbc_la-CLIcr.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIcr.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIcr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-CLIcr.Tpo $(DEPDIR)/libvirtodbc_la-CLIcr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/CLIcr.c' object='libvirtodbc_la-CLIcr.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIcr.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIcr.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIcr.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIcr.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIcr.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIcr.c
libvirtodbc_la-blobio.lo: $(top_srcdir)/libsrc/Wi/blobio.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-blobio.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-blobio.Tpo -c -o libvirtodbc_la-blobio.lo `test -f '$(top_srcdir)/libsrc/Wi/blobio.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/blobio.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-blobio.Tpo $(DEPDIR)/libvirtodbc_la-blobio.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-blobio.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-blobio.Tpo -c -o libvirtodbc_la-blobio.lo `test -f '$(top_srcdir)/libsrc/Wi/blobio.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/blobio.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-blobio.Tpo $(DEPDIR)/libvirtodbc_la-blobio.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/blobio.c' object='libvirtodbc_la-blobio.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-blobio.lo `test -f '$(top_srcdir)/libsrc/Wi/blobio.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/blobio.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-blobio.lo `test -f '$(top_srcdir)/libsrc/Wi/blobio.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/blobio.c
libvirtodbc_la-datesupp.lo: $(top_srcdir)/libsrc/Wi/datesupp.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-datesupp.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-datesupp.Tpo -c -o libvirtodbc_la-datesupp.lo `test -f '$(top_srcdir)/libsrc/Wi/datesupp.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/datesupp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-datesupp.Tpo $(DEPDIR)/libvirtodbc_la-datesupp.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-datesupp.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-datesupp.Tpo -c -o libvirtodbc_la-datesupp.lo `test -f '$(top_srcdir)/libsrc/Wi/datesupp.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/datesupp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-datesupp.Tpo $(DEPDIR)/libvirtodbc_la-datesupp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/datesupp.c' object='libvirtodbc_la-datesupp.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-datesupp.lo `test -f '$(top_srcdir)/libsrc/Wi/datesupp.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/datesupp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-datesupp.lo `test -f '$(top_srcdir)/libsrc/Wi/datesupp.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/datesupp.c
libvirtodbc_la-numeric.lo: $(top_srcdir)/libsrc/Wi/numeric.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-numeric.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-numeric.Tpo -c -o libvirtodbc_la-numeric.lo `test -f '$(top_srcdir)/libsrc/Wi/numeric.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/numeric.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-numeric.Tpo $(DEPDIR)/libvirtodbc_la-numeric.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-numeric.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-numeric.Tpo -c -o libvirtodbc_la-numeric.lo `test -f '$(top_srcdir)/libsrc/Wi/numeric.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/numeric.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-numeric.Tpo $(DEPDIR)/libvirtodbc_la-numeric.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/numeric.c' object='libvirtodbc_la-numeric.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-numeric.lo `test -f '$(top_srcdir)/libsrc/Wi/numeric.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/numeric.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-numeric.lo `test -f '$(top_srcdir)/libsrc/Wi/numeric.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/numeric.c
libvirtodbc_la-wirpc.lo: $(top_srcdir)/libsrc/Wi/wirpc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-wirpc.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-wirpc.Tpo -c -o libvirtodbc_la-wirpc.lo `test -f '$(top_srcdir)/libsrc/Wi/wirpc.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/wirpc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-wirpc.Tpo $(DEPDIR)/libvirtodbc_la-wirpc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-wirpc.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-wirpc.Tpo -c -o libvirtodbc_la-wirpc.lo `test -f '$(top_srcdir)/libsrc/Wi/wirpc.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/wirpc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-wirpc.Tpo $(DEPDIR)/libvirtodbc_la-wirpc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/wirpc.c' object='libvirtodbc_la-wirpc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-wirpc.lo `test -f '$(top_srcdir)/libsrc/Wi/wirpc.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/wirpc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-wirpc.lo `test -f '$(top_srcdir)/libsrc/Wi/wirpc.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/wirpc.c
libvirtodbc_la-multibyte.lo: $(top_srcdir)/libsrc/Wi/multibyte.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-multibyte.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-multibyte.Tpo -c -o libvirtodbc_la-multibyte.lo `test -f '$(top_srcdir)/libsrc/Wi/multibyte.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/multibyte.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-multibyte.Tpo $(DEPDIR)/libvirtodbc_la-multibyte.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-multibyte.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-multibyte.Tpo -c -o libvirtodbc_la-multibyte.lo `test -f '$(top_srcdir)/libsrc/Wi/multibyte.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/multibyte.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-multibyte.Tpo $(DEPDIR)/libvirtodbc_la-multibyte.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/multibyte.c' object='libvirtodbc_la-multibyte.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-multibyte.lo `test -f '$(top_srcdir)/libsrc/Wi/multibyte.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/multibyte.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-multibyte.lo `test -f '$(top_srcdir)/libsrc/Wi/multibyte.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/multibyte.c
libvirtodbc_la-CLIsql3.lo: $(top_srcdir)/libsrc/Wi/CLIsql3.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIsql3.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIsql3.Tpo -c -o libvirtodbc_la-CLIsql3.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql3.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-CLIsql3.Tpo $(DEPDIR)/libvirtodbc_la-CLIsql3.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-CLIsql3.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-CLIsql3.Tpo -c -o libvirtodbc_la-CLIsql3.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql3.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-CLIsql3.Tpo $(DEPDIR)/libvirtodbc_la-CLIsql3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/CLIsql3.c' object='libvirtodbc_la-CLIsql3.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIsql3.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql3.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql3.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-CLIsql3.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql3.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql3.c
libvirtodbc_la-wi_xid.lo: $(top_srcdir)/libsrc/Wi/wi_xid.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-wi_xid.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-wi_xid.Tpo -c -o libvirtodbc_la-wi_xid.lo `test -f '$(top_srcdir)/libsrc/Wi/wi_xid.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/wi_xid.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_la-wi_xid.Tpo $(DEPDIR)/libvirtodbc_la-wi_xid.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_la-wi_xid.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_la-wi_xid.Tpo -c -o libvirtodbc_la-wi_xid.lo `test -f '$(top_srcdir)/libsrc/Wi/wi_xid.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/wi_xid.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_la-wi_xid.Tpo $(DEPDIR)/libvirtodbc_la-wi_xid.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/wi_xid.c' object='libvirtodbc_la-wi_xid.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-wi_xid.lo `test -f '$(top_srcdir)/libsrc/Wi/wi_xid.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/wi_xid.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_la-wi_xid.lo `test -f '$(top_srcdir)/libsrc/Wi/wi_xid.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/wi_xid.c
libvirtodbc_u_la-CLIw.lo: $(top_srcdir)/libsrc/Wi/CLIw.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_u_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_u_la-CLIw.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_u_la-CLIw.Tpo -c -o libvirtodbc_u_la-CLIw.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIw.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIw.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_u_la-CLIw.Tpo $(DEPDIR)/libvirtodbc_u_la-CLIw.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_u_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_u_la-CLIw.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_u_la-CLIw.Tpo -c -o libvirtodbc_u_la-CLIw.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIw.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIw.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_u_la-CLIw.Tpo $(DEPDIR)/libvirtodbc_u_la-CLIw.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/CLIw.c' object='libvirtodbc_u_la-CLIw.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_u_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_u_la-CLIw.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIw.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIw.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_u_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_u_la-CLIw.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIw.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIw.c
libvirtodbc_u_la-CLIsql3W.lo: $(top_srcdir)/libsrc/Wi/CLIsql3W.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_u_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_u_la-CLIsql3W.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_u_la-CLIsql3W.Tpo -c -o libvirtodbc_u_la-CLIsql3W.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql3W.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql3W.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtodbc_u_la-CLIsql3W.Tpo $(DEPDIR)/libvirtodbc_u_la-CLIsql3W.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_u_la_CFLAGS) $(CFLAGS) -MT libvirtodbc_u_la-CLIsql3W.lo -MD -MP -MF $(DEPDIR)/libvirtodbc_u_la-CLIsql3W.Tpo -c -o libvirtodbc_u_la-CLIsql3W.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql3W.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql3W.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtodbc_u_la-CLIsql3W.Tpo $(DEPDIR)/libvirtodbc_u_la-CLIsql3W.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/Wi/CLIsql3W.c' object='libvirtodbc_u_la-CLIsql3W.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtodbc_u_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_u_la-CLIsql3W.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql3W.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql3W.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtodbc_u_la_CFLAGS) $(CFLAGS) -c -o libvirtodbc_u_la-CLIsql3W.lo `test -f '$(top_srcdir)/libsrc/Wi/CLIsql3W.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/Wi/CLIsql3W.c
mostlyclean-libtool:
-rm -f *.lo
@@ -726,49 +700,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -789,17 +759,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -831,7 +797,6 @@ clean-generic:
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"
@@ -853,8 +818,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -863,28 +826,18 @@ install-data-am:
install-dvi: install-dvi-am
-install-dvi-am:
-
install-exec-am: install-libLTLIBRARIES
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
@@ -935,7 +888,6 @@ virt_vers_r.c: Makefile
virt_vers_ru.c: Makefile
$(MAKEVER) -p "$(DRIVER_DESC) (Unicode)(multi threaded)" -v $(DRIVER_VERS) -o virt_vers_ru.c
-
# 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/driver/unixodbc.c b/binsrc/driver/unixodbc.c
index 6de05c9..65b5046 100644
--- a/binsrc/driver/unixodbc.c
+++ b/binsrc/driver/unixodbc.c
@@ -1,14 +1,14 @@
/*
* unixodbc.c
*
- * $Id: unixodbc.c,v 1.2 2007/08/24 12:31:23 source Exp $
+ * $Id$
*
* Unix ODBC driver
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/driver/virt_vers.c b/binsrc/driver/virt_vers.c
index e2df084..e56dbf6 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 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";
+Version 06.01.3127 as of Thu Aug 2 00:16:23 CEST 2012.\n\
+Compiled for Darwin 11.4.0\n\
+Copyright (C) 1998-2012 OpenLink Software.\n";
diff --git a/binsrc/driver/virt_vers_r.c b/binsrc/driver/virt_vers_r.c
index da880ee..adfe608 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 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";
+Version 06.01.3127 as of Thu Aug 2 00:16:35 CEST 2012.\n\
+Compiled for Darwin 11.4.0\n\
+Copyright (C) 1998-2012 OpenLink Software.\n";
diff --git a/binsrc/driver/virt_vers_ru.c b/binsrc/driver/virt_vers_ru.c
index d50bb2b..09a172e 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 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";
+Version 06.01.3127 as of Thu Aug 2 00:16:40 CEST 2012.\n\
+Compiled for Darwin 11.4.0\n\
+Copyright (C) 1998-2012 OpenLink Software.\n";
diff --git a/binsrc/driver/virt_vers_u.c b/binsrc/driver/virt_vers_u.c
index 34b62ab..37650ef 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 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";
+Version 06.01.3127 as of Thu Aug 2 00:16:37 CEST 2012.\n\
+Compiled for Darwin 11.4.0\n\
+Copyright (C) 1998-2012 OpenLink Software.\n";
diff --git a/binsrc/hibernate/Makefile.am b/binsrc/hibernate/Makefile.am
index 1c9da6b..f3e1c1c 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-2010 OpenLink Software
+# 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
diff --git a/binsrc/hibernate/Makefile.in b/binsrc/hibernate/Makefile.in
index a965566..0bfa66f 100644
--- a/binsrc/hibernate/Makefile.in
+++ b/binsrc/hibernate/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -298,14 +292,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hibernate/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/hibernate/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hibernate/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/hibernate/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -323,7 +317,6 @@ $(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
@@ -353,17 +346,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -391,7 +380,6 @@ clean-generic:
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"
@@ -410,8 +398,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -420,28 +406,18 @@ install-data-am: install-data-local
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
@@ -504,7 +480,6 @@ doc:
clean-local:
-rm -rf out.driver out.examples doc
-
# 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/hibernate/virtuoso_dialect/VirtuosoDialect.java b/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java
index 6ba904a..9949c49 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.3 2011/08/17 17:44:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/Makefile.am b/binsrc/hosting/Makefile.am
index 696a5de..1b12a28 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/Makefile.in b/binsrc/hosting/Makefile.in
index d9e6adc..35238b8 100644
--- a/binsrc/hosting/Makefile.in
+++ b/binsrc/hosting/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -16,9 +15,8 @@
@SET_MAKE@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -48,7 +46,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -60,38 +57,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -179,7 +148,6 @@ 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@
@@ -263,7 +231,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -284,7 +251,6 @@ 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@
@@ -293,7 +259,7 @@ vaddir = @vaddir@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -330,14 +296,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/hosting/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/hosting/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -355,7 +321,6 @@ $(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
@@ -370,7 +335,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -387,7 +352,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -395,7 +360,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -421,16 +386,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -438,14 +403,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -457,43 +422,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -514,44 +475,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -581,7 +527,6 @@ clean-generic:
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"
@@ -600,8 +545,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -610,28 +553,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -652,8 +585,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -669,7 +602,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
-
# 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/hosting/fcgi/GNUmakefile b/binsrc/hosting/fcgi/GNUmakefile
index bc0fcc3..990d0be 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/fcgi/cgi_fcgi.c b/binsrc/hosting/fcgi/cgi_fcgi.c
index 6fddad0..0695097 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 2006/04/11 17:56:13 source Exp $
+ * $Id$
*
* Virtuoso FastCGI hosting plugin fcgi iface
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/fcgi/hosting_fcgi.c b/binsrc/hosting/fcgi/hosting_fcgi.c
index ea6a5bb..6c965e0 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 2006/04/11 17:56:13 source Exp $
+ * $Id$
*
* Virtuoso FastCGI hosting plugin virtuoso iface
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/fcgi/hosting_fcgi.h b/binsrc/hosting/fcgi/hosting_fcgi.h
index 996a729..399e33c 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 2006/04/11 17:56:13 source Exp $
+ * $Id$
*
* Virtuoso FastCGI hosting plugin header
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/mono/Makefile.am b/binsrc/hosting/mono/Makefile.am
index 0495f61..cac6c34 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-2010 OpenLink Software
+# 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
@@ -109,14 +109,14 @@ sql_code_xslt.c: mono_type.xsl $(top_srcdir)/libsrc/Wi/sql_to_c.awk
virtclr.dll: virtclr.cs
export PATH="$(TOP)/mono/lib/1.0:$(TOP)/mono/bin:$(PATH)"
../../../mono/bin/mcs $(CS_FLAGS) -target:library /define:MONO /r:System.Runtime.Serialization.Formatters.Soap /r:System.Management /r:System.Web -out:$@ $<
- $(RM) tests/virtclr.dll
+ rm -f tests/virtclr.dll
cp virtclr.dll tests
virt_http.dll: virt_http.cs
export PATH="$(TOP)/mono/lib/1.0:$(TOP)/mono/bin:$(PATH)"
../../../mono/bin/mcs $(CS_FLAGS) -target:library /define:MONO /r:System.Web /r:System.Windows.Forms -out:$@ $<
- $(RM) tests/virt_http.dll
+ rm -f tests/virt_http.dll
cp virt_http.dll tests
.PHONY: test
diff --git a/binsrc/hosting/mono/Makefile.in b/binsrc/hosting/mono/Makefile.in
index 485be25..0f4581c 100644
--- a/binsrc/hosting/mono/Makefile.in
+++ b/binsrc/hosting/mono/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
@@ -40,9 +39,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -74,10 +72,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
am__EXEEXT_1 = virtuoso-mono-cli-t$(EXEEXT)
@WITH_IODBC_TRUE at am__EXEEXT_2 = virtuoso-iodbc-mono-cli-t$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_virtuoso_iodbc_mono_cli_t_OBJECTS = \
virtuoso_iodbc_mono_cli_t-mono.$(OBJEXT) \
@@ -106,32 +104,11 @@ virtuoso_mono_cli_t_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) \
$(virtuoso_mono_cli_t_LDFLAGS) $(LDFLAGS) -o $@
-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'
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -159,38 +136,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
HEADERS = $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -278,7 +227,6 @@ 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@
@@ -362,7 +310,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -383,7 +330,6 @@ 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@
@@ -466,14 +412,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/mono/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/hosting/mono/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/mono/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/hosting/mono/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -491,50 +437,34 @@ $(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):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
virtuoso-iodbc-mono-cli-t$(EXEEXT): $(virtuoso_iodbc_mono_cli_t_OBJECTS) $(virtuoso_iodbc_mono_cli_t_DEPENDENCIES)
@rm -f virtuoso-iodbc-mono-cli-t$(EXEEXT)
$(virtuoso_iodbc_mono_cli_t_LINK) $(virtuoso_iodbc_mono_cli_t_OBJECTS) $(virtuoso_iodbc_mono_cli_t_LDADD) $(LIBS)
@@ -544,37 +474,22 @@ virtuoso-mono-cli-t$(EXEEXT): $(virtuoso_mono_cli_t_OBJECTS) $(virtuoso_mono_cli
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
- for p in $$list; do \
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n' \
- -e 'h;s|.*|.|' \
- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
- if (++n[d] == $(am__install_max)) { \
- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
- else { print "f", d "/" $$4, $$1 } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+ else :; fi; \
+ done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 's,.*/,,;$(transform)'`; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -593,133 +508,133 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
virtuoso_iodbc_mono_cli_t-mono.o: mono.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_mono_cli_t-mono.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Tpo -c -o virtuoso_iodbc_mono_cli_t-mono.o `test -f 'mono.c' || echo '$(srcdir)/'`mono.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mono.c' object='virtuoso_iodbc_mono_cli_t-mono.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_mono_cli_t-mono.o `test -f 'mono.c' || echo '$(srcdir)/'`mono.c
virtuoso_iodbc_mono_cli_t-mono.obj: mono.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_mono_cli_t-mono.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Tpo -c -o virtuoso_iodbc_mono_cli_t-mono.obj `if test -f 'mono.c'; then $(CYGPATH_W) 'mono.c'; else $(CYGPATH_W) '$(srcdir)/mono.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-mono.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mono.c' object='virtuoso_iodbc_mono_cli_t-mono.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_mono_cli_t-mono.obj `if test -f 'mono.c'; then $(CYGPATH_W) 'mono.c'; else $(CYGPATH_W) '$(srcdir)/mono.c'; fi`
virtuoso_iodbc_mono_cli_t-basec.o: basec.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_mono_cli_t-basec.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Tpo -c -o virtuoso_iodbc_mono_cli_t-basec.o `test -f 'basec.c' || echo '$(srcdir)/'`basec.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basec.c' object='virtuoso_iodbc_mono_cli_t-basec.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_mono_cli_t-basec.o `test -f 'basec.c' || echo '$(srcdir)/'`basec.c
virtuoso_iodbc_mono_cli_t-basec.obj: basec.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_mono_cli_t-basec.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Tpo -c -o virtuoso_iodbc_mono_cli_t-basec.obj `if test -f 'basec.c'; then $(CYGPATH_W) 'basec.c'; else $(CYGPATH_W) '$(srcdir)/basec.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-basec.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basec.c' object='virtuoso_iodbc_mono_cli_t-basec.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_mono_cli_t-basec.obj `if test -f 'basec.c'; then $(CYGPATH_W) 'basec.c'; else $(CYGPATH_W) '$(srcdir)/basec.c'; fi`
virtuoso_iodbc_mono_cli_t-sql_code_clr.o: sql_code_clr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_mono_cli_t-sql_code_clr.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Tpo -c -o virtuoso_iodbc_mono_cli_t-sql_code_clr.o `test -f 'sql_code_clr.c' || echo '$(srcdir)/'`sql_code_clr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_clr.c' object='virtuoso_iodbc_mono_cli_t-sql_code_clr.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_mono_cli_t-sql_code_clr.o `test -f 'sql_code_clr.c' || echo '$(srcdir)/'`sql_code_clr.c
virtuoso_iodbc_mono_cli_t-sql_code_clr.obj: sql_code_clr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_mono_cli_t-sql_code_clr.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Tpo -c -o virtuoso_iodbc_mono_cli_t-sql_code_clr.obj `if test -f 'sql_code_clr.c'; then $(CYGPATH_W) 'sql_code_clr.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_clr.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_clr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_clr.c' object='virtuoso_iodbc_mono_cli_t-sql_code_clr.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_mono_cli_t-sql_code_clr.obj `if test -f 'sql_code_clr.c'; then $(CYGPATH_W) 'sql_code_clr.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_clr.c'; fi`
virtuoso_iodbc_mono_cli_t-sql_code_xslt.o: sql_code_xslt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_mono_cli_t-sql_code_xslt.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Tpo -c -o virtuoso_iodbc_mono_cli_t-sql_code_xslt.o `test -f 'sql_code_xslt.c' || echo '$(srcdir)/'`sql_code_xslt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_xslt.c' object='virtuoso_iodbc_mono_cli_t-sql_code_xslt.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_mono_cli_t-sql_code_xslt.o `test -f 'sql_code_xslt.c' || echo '$(srcdir)/'`sql_code_xslt.c
virtuoso_iodbc_mono_cli_t-sql_code_xslt.obj: sql_code_xslt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_mono_cli_t-sql_code_xslt.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Tpo -c -o virtuoso_iodbc_mono_cli_t-sql_code_xslt.obj `if test -f 'sql_code_xslt.c'; then $(CYGPATH_W) 'sql_code_xslt.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_xslt.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_iodbc_mono_cli_t-sql_code_xslt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_xslt.c' object='virtuoso_iodbc_mono_cli_t-sql_code_xslt.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_mono_cli_t-sql_code_xslt.obj `if test -f 'sql_code_xslt.c'; then $(CYGPATH_W) 'sql_code_xslt.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_xslt.c'; fi`
virtuoso_mono_cli_t-mono.o: mono.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_mono_cli_t-mono.o -MD -MP -MF $(DEPDIR)/virtuoso_mono_cli_t-mono.Tpo -c -o virtuoso_mono_cli_t-mono.o `test -f 'mono.c' || echo '$(srcdir)/'`mono.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_mono_cli_t-mono.Tpo $(DEPDIR)/virtuoso_mono_cli_t-mono.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_mono_cli_t-mono.Tpo $(DEPDIR)/virtuoso_mono_cli_t-mono.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mono.c' object='virtuoso_mono_cli_t-mono.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_mono_cli_t-mono.o `test -f 'mono.c' || echo '$(srcdir)/'`mono.c
virtuoso_mono_cli_t-mono.obj: mono.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_mono_cli_t-mono.obj -MD -MP -MF $(DEPDIR)/virtuoso_mono_cli_t-mono.Tpo -c -o virtuoso_mono_cli_t-mono.obj `if test -f 'mono.c'; then $(CYGPATH_W) 'mono.c'; else $(CYGPATH_W) '$(srcdir)/mono.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_mono_cli_t-mono.Tpo $(DEPDIR)/virtuoso_mono_cli_t-mono.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_mono_cli_t-mono.Tpo $(DEPDIR)/virtuoso_mono_cli_t-mono.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mono.c' object='virtuoso_mono_cli_t-mono.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_mono_cli_t-mono.obj `if test -f 'mono.c'; then $(CYGPATH_W) 'mono.c'; else $(CYGPATH_W) '$(srcdir)/mono.c'; fi`
virtuoso_mono_cli_t-basec.o: basec.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_mono_cli_t-basec.o -MD -MP -MF $(DEPDIR)/virtuoso_mono_cli_t-basec.Tpo -c -o virtuoso_mono_cli_t-basec.o `test -f 'basec.c' || echo '$(srcdir)/'`basec.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_mono_cli_t-basec.Tpo $(DEPDIR)/virtuoso_mono_cli_t-basec.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_mono_cli_t-basec.Tpo $(DEPDIR)/virtuoso_mono_cli_t-basec.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basec.c' object='virtuoso_mono_cli_t-basec.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_mono_cli_t-basec.o `test -f 'basec.c' || echo '$(srcdir)/'`basec.c
virtuoso_mono_cli_t-basec.obj: basec.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_mono_cli_t-basec.obj -MD -MP -MF $(DEPDIR)/virtuoso_mono_cli_t-basec.Tpo -c -o virtuoso_mono_cli_t-basec.obj `if test -f 'basec.c'; then $(CYGPATH_W) 'basec.c'; else $(CYGPATH_W) '$(srcdir)/basec.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_mono_cli_t-basec.Tpo $(DEPDIR)/virtuoso_mono_cli_t-basec.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_mono_cli_t-basec.Tpo $(DEPDIR)/virtuoso_mono_cli_t-basec.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basec.c' object='virtuoso_mono_cli_t-basec.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_mono_cli_t-basec.obj `if test -f 'basec.c'; then $(CYGPATH_W) 'basec.c'; else $(CYGPATH_W) '$(srcdir)/basec.c'; fi`
virtuoso_mono_cli_t-sql_code_clr.o: sql_code_clr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_mono_cli_t-sql_code_clr.o -MD -MP -MF $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Tpo -c -o virtuoso_mono_cli_t-sql_code_clr.o `test -f 'sql_code_clr.c' || echo '$(srcdir)/'`sql_code_clr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_clr.c' object='virtuoso_mono_cli_t-sql_code_clr.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_mono_cli_t-sql_code_clr.o `test -f 'sql_code_clr.c' || echo '$(srcdir)/'`sql_code_clr.c
virtuoso_mono_cli_t-sql_code_clr.obj: sql_code_clr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_mono_cli_t-sql_code_clr.obj -MD -MP -MF $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Tpo -c -o virtuoso_mono_cli_t-sql_code_clr.obj `if test -f 'sql_code_clr.c'; then $(CYGPATH_W) 'sql_code_clr.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_clr.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_mono_cli_t-sql_code_clr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_clr.c' object='virtuoso_mono_cli_t-sql_code_clr.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_mono_cli_t-sql_code_clr.obj `if test -f 'sql_code_clr.c'; then $(CYGPATH_W) 'sql_code_clr.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_clr.c'; fi`
virtuoso_mono_cli_t-sql_code_xslt.o: sql_code_xslt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_mono_cli_t-sql_code_xslt.o -MD -MP -MF $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Tpo -c -o virtuoso_mono_cli_t-sql_code_xslt.o `test -f 'sql_code_xslt.c' || echo '$(srcdir)/'`sql_code_xslt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_xslt.c' object='virtuoso_mono_cli_t-sql_code_xslt.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_mono_cli_t-sql_code_xslt.o `test -f 'sql_code_xslt.c' || echo '$(srcdir)/'`sql_code_xslt.c
virtuoso_mono_cli_t-sql_code_xslt.obj: sql_code_xslt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -MT virtuoso_mono_cli_t-sql_code_xslt.obj -MD -MP -MF $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Tpo -c -o virtuoso_mono_cli_t-sql_code_xslt.obj `if test -f 'sql_code_xslt.c'; then $(CYGPATH_W) 'sql_code_xslt.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_xslt.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_mono_cli_t-sql_code_xslt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_xslt.c' object='virtuoso_mono_cli_t-sql_code_xslt.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_mono_cli_t_CFLAGS) $(CFLAGS) -c -o virtuoso_mono_cli_t-sql_code_xslt.obj `if test -f 'sql_code_xslt.c'; then $(CYGPATH_W) 'sql_code_xslt.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_xslt.c'; fi`
@@ -737,7 +652,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -754,7 +669,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -762,7 +677,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -788,16 +703,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -805,14 +720,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -824,43 +739,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -881,44 +792,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -954,7 +850,6 @@ clean-generic:
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"
@@ -977,8 +872,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -987,28 +880,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am: install-binPROGRAMS install-binSCRIPTS
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -1031,9 +914,8 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
- ctags-recursive install install-am install-strip \
- tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-binPROGRAMS \
@@ -1068,13 +950,13 @@ sql_code_xslt.c: mono_type.xsl $(top_srcdir)/libsrc/Wi/sql_to_c.awk
virtclr.dll: virtclr.cs
export PATH="$(TOP)/mono/lib/1.0:$(TOP)/mono/bin:$(PATH)"
../../../mono/bin/mcs $(CS_FLAGS) -target:library /define:MONO /r:System.Runtime.Serialization.Formatters.Soap /r:System.Management /r:System.Web -out:$@ $<
- $(RM) tests/virtclr.dll
+ rm -f tests/virtclr.dll
cp virtclr.dll tests
virt_http.dll: virt_http.cs
export PATH="$(TOP)/mono/lib/1.0:$(TOP)/mono/bin:$(PATH)"
../../../mono/bin/mcs $(CS_FLAGS) -target:library /define:MONO /r:System.Web /r:System.Windows.Forms -out:$@ $<
- $(RM) tests/virt_http.dll
+ rm -f tests/virt_http.dll
cp virt_http.dll tests
.PHONY: test
@@ -1085,7 +967,6 @@ clean-local:
rm -rf sql_code_clr.c
rm -rf sql_code_xslt.c
rm -rf *.dll
-
# 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/hosting/mono/basec.c b/binsrc/hosting/mono/basec.c
index 03333cd..8227124 100644
--- a/binsrc/hosting/mono/basec.c
+++ b/binsrc/hosting/mono/basec.c
@@ -1,10 +1,10 @@
/*
- * $Id: basec.c,v 1.3.2.2 2010/01/29 16:16:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/mono/clr.def b/binsrc/hosting/mono/clr.def
index be5df2c..a9c3194 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.1 2010/01/25 23:34:12 source Exp $
+; $Id$
;
; 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-2010 OpenLink Software
+; 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
diff --git a/binsrc/hosting/mono/clr_ll_api.h b/binsrc/hosting/mono/clr_ll_api.h
index 2aabc69..c07f6d5 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.1 2010/01/25 23:34:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/mono/dotnet.cpp b/binsrc/hosting/mono/dotnet.cpp
index d7cea79..94a50ba 100644
--- a/binsrc/hosting/mono/dotnet.cpp
+++ b/binsrc/hosting/mono/dotnet.cpp
@@ -1,10 +1,10 @@
/*
- * $Id: dotnet.cpp,v 1.2.2.1 2010/01/25 23:34:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/mono/import_clr.sql b/binsrc/hosting/mono/import_clr.sql
index 7b05a01..73b500b 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.1 2010/01/25 23:34:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/hosting/mono/mono.c b/binsrc/hosting/mono/mono.c
index 095d428..f6f07a3 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.1 2010/01/25 23:34:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/mono/mono.h b/binsrc/hosting/mono/mono.h
index 3d763d0..7f8d507 100644
--- a/binsrc/hosting/mono/mono.h
+++ b/binsrc/hosting/mono/mono.h
@@ -1,10 +1,10 @@
/*
- * $Id: mono.h,v 1.2.2.2 2010/01/29 16:16:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/mono/mono_type.xsl b/binsrc/hosting/mono/mono_type.xsl
index 8744380..81d65c3 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.1 2010/01/25 23:34:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/hosting/mono/sql_code_clr.c b/binsrc/hosting/mono/sql_code_clr.c
index edd9ebb..f4b416c 100644
--- a/binsrc/hosting/mono/sql_code_clr.c
+++ b/binsrc/hosting/mono/sql_code_clr.c
@@ -12,9 +12,9 @@ static const char *proc0 =
"{\n"
"declare _code varchar;\n"
"\n"
-"SELECT blob_to_string (VAC_DATA) into _code from DB.DBA.CLR_VAC where VAC_REAL_NAME = _asm_name;\n"
+" SELECT blob_to_string (VAC_DATA) into _code from DB.DBA.CLR_VAC where VAC_REAL_NAME = _asm_name;\n"
"\n"
-"string_to_file (server_exe || _asm_name || \'.dll\', _code, -2);\n"
+" string_to_file (server_exe || _asm_name || \'.dll\', _code, -2);\n"
"}\n"
"--src import_clr.sql:35\n";
@@ -57,9 +57,9 @@ static const char *proc2 =
"VAC_DATA, VAC_FULL_FILE_NAME, VAC_PERM_SET)\n"
"values (short_name, short_name, full_name, file_to_string(asm_name), asm_name, perm_mode);\n"
"\n"
-"commit work;\n"
+" commit work;\n"
"\n"
-"DB..import_clr (short_name, mtd_name, unrestricted => perm_mode);\n"
+" DB..import_clr (short_name, mtd_name, unrestricted => perm_mode);\n"
"}\n"
"--src import_clr.sql:69\n";
@@ -519,7 +519,7 @@ static const char *proc7 =
"idx := idx + 1;\n"
"}\n"
"\n"
-"ses_print (\'\\n</parameters>\', ses);\n"
+" ses_print (\'\\n</parameters>\', ses);\n"
"}\n"
"--src import_clr.sql:488\n";
@@ -558,9 +558,9 @@ static const char *proc9 =
"\n"
"\n"
"\n"
-"if (clr_type = \'System.Data.SqlTypes.SqlDouble\') return 1;\n"
+" if (clr_type = \'System.Data.SqlTypes.SqlDouble\') return 1;\n"
"\n"
-"return 0;\n"
+" return 0;\n"
"}\n"
"--src import_clr.sql:559\n";
@@ -605,7 +605,7 @@ static const char *proc11 =
"if (clr_type = \'System.Int32\') return \'http://www.w3.org/2001/XMLSchema:long\';\n"
"if (clr_type = \'System.Boolean\') return \'http://www.w3.org/2001/XMLSchema:boolelan\';\n"
"\n"
-"return clr_type;\n"
+" return clr_type;\n"
"}\n"
"--src import_clr.sql:601\n";
@@ -724,7 +724,7 @@ static const char *proc15 =
"_res := replace (_res, \',\\n\" \', \', \"\');\n"
"_res := replace (_res, \',\\n\"\\t\', \', \"\');\n"
"\n"
-"return _res;\n"
+" return _res;\n"
"}\n"
"--src import_clr.sql:672\n";
@@ -899,7 +899,7 @@ static const char *proc18 =
"http_header (headers_out);\n"
"http_request_status (concat (\'HTTP/1.1 \', cast (ret [2] as varchar)));\n"
"\n"
-"return cast (ret [0] as varchar);\n"
+" return cast (ret [0] as varchar);\n"
"}\n"
"--src import_clr.sql:776\n";
@@ -1087,7 +1087,7 @@ static const char *proc22 =
"return ret;\n"
"}\n"
"\n"
-"return vector ();\n"
+" return vector ();\n"
"}\n"
"--src import_clr.sql:1018\n";
diff --git a/binsrc/hosting/mono/sql_code_xslt.c b/binsrc/hosting/mono/sql_code_xslt.c
index 63232cc..950ea94 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.1 2010/01/25 23:34:13 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 79d3fa9..3888a83 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/mono/tests/Makefile.in b/binsrc/hosting/mono/tests/Makefile.in
index 7e5bf00..128569e 100644
--- a/binsrc/hosting/mono/tests/Makefile.in
+++ b/binsrc/hosting/mono/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
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 =
@@ -162,7 +159,6 @@ 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@
@@ -246,7 +242,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -267,7 +262,6 @@ 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@
@@ -296,14 +290,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/mono/tests/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/hosting/mono/tests/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/mono/tests/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/hosting/mono/tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -321,7 +315,6 @@ $(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
@@ -351,17 +344,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -389,7 +378,6 @@ clean-generic:
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"
@@ -408,8 +396,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -418,28 +404,18 @@ install-data-am:
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
@@ -483,7 +459,6 @@ clean-local:
rm -rf tclrsrv.output
rm -rf tclr.*
rm -rf clrsrv.*
-
# 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/hosting/mono/tests/Point.cs b/binsrc/hosting/mono/tests/Point.cs
index 66fd369..af9b7c4 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/hosting/mono/tests/Point_ho_s_10.cs b/binsrc/hosting/mono/tests/Point_ho_s_10.cs
index 9048f30..67592b8 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/hosting/mono/tests/clr_suite_types.sql b/binsrc/hosting/mono/tests/clr_suite_types.sql
index 2dc36bf..fbb58f7 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/hosting/mono/tests/clr_test2.sql b/binsrc/hosting/mono/tests/clr_test2.sql
index 40f906c..cd547c1 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/hosting/mono/tests/sample.cs b/binsrc/hosting/mono/tests/sample.cs
index 9046bfa..8702a61 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/hosting/mono/tests/tax.cs b/binsrc/hosting/mono/tests/tax.cs
index 447d78b..9670af0 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/hosting/mono/tests/tclrsrv.sh b/binsrc/hosting/mono/tests/tclrsrv.sh
index e191afd..f3685af 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/hosting/mono/tests/test_point_clr.sql b/binsrc/hosting/mono/tests/test_point_clr.sql
index d8be8a9..dfbef26 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/hosting/mono/tests/test_tax_clr.sql b/binsrc/hosting/mono/tests/test_tax_clr.sql
index dc25c5f..5906db5 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/hosting/mono/virt_http.cs b/binsrc/hosting/mono/virt_http.cs
index 200fdfd..d953ce3 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-2010 OpenLink Software
+// 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
diff --git a/binsrc/hosting/mono/virtclr.cs b/binsrc/hosting/mono/virtclr.cs
index 775f8e9..bac490d 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-2010 OpenLink Software
+// 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
diff --git a/binsrc/hosting/perl/Makefile.am b/binsrc/hosting/perl/Makefile.am
index a87bc87..fb55de4 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/perl/Makefile.in b/binsrc/hosting/perl/Makefile.in
index b541e4c..fb26f95 100644
--- a/binsrc/hosting/perl/Makefile.in
+++ b/binsrc/hosting/perl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,29 +68,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(hostingdir)"
+hostingLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(hosting_LTLIBRARIES)
hosting_perl_la_LIBADD =
am_hosting_perl_la_OBJECTS = hosting_perl_la-hosting_perl.lo
@@ -103,10 +86,9 @@ hosting_perl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(hosting_perl_la_CFLAGS) \
$(CFLAGS) $(hosting_perl_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_PERL_TRUE at am_hosting_perl_la_rpath = -rpath $(hostingdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -209,7 +191,6 @@ 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@
@@ -293,7 +274,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -314,7 +294,6 @@ 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@
@@ -348,14 +327,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/perl/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/hosting/perl/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/perl/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/hosting/perl/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -373,28 +352,23 @@ $(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):
install-hostingLTLIBRARIES: $(hosting_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(hostingdir)" || $(MKDIR_P) "$(DESTDIR)$(hostingdir)"
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hostingdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hostingdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(hostingdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(hostingdir)"; \
- }
+ done
uninstall-hostingLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$f"; \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$p"; \
done
clean-hostingLTLIBRARIES:
@@ -419,38 +393,38 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
hosting_perl_la-hosting_perl.lo: hosting_perl.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_perl_la_CFLAGS) $(CFLAGS) -MT hosting_perl_la-hosting_perl.lo -MD -MP -MF $(DEPDIR)/hosting_perl_la-hosting_perl.Tpo -c -o hosting_perl_la-hosting_perl.lo `test -f 'hosting_perl.c' || echo '$(srcdir)/'`hosting_perl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_perl_la-hosting_perl.Tpo $(DEPDIR)/hosting_perl_la-hosting_perl.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_perl_la_CFLAGS) $(CFLAGS) -MT hosting_perl_la-hosting_perl.lo -MD -MP -MF $(DEPDIR)/hosting_perl_la-hosting_perl.Tpo -c -o hosting_perl_la-hosting_perl.lo `test -f 'hosting_perl.c' || echo '$(srcdir)/'`hosting_perl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_perl_la-hosting_perl.Tpo $(DEPDIR)/hosting_perl_la-hosting_perl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosting_perl.c' object='hosting_perl_la-hosting_perl.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_perl_la_CFLAGS) $(CFLAGS) -c -o hosting_perl_la-hosting_perl.lo `test -f 'hosting_perl.c' || echo '$(srcdir)/'`hosting_perl.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_perl_la_CFLAGS) $(CFLAGS) -c -o hosting_perl_la-hosting_perl.lo `test -f 'hosting_perl.c' || echo '$(srcdir)/'`hosting_perl.c
hosting_perl_la-virt_handler.lo: virt_handler.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_perl_la_CFLAGS) $(CFLAGS) -MT hosting_perl_la-virt_handler.lo -MD -MP -MF $(DEPDIR)/hosting_perl_la-virt_handler.Tpo -c -o hosting_perl_la-virt_handler.lo `test -f 'virt_handler.c' || echo '$(srcdir)/'`virt_handler.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_perl_la-virt_handler.Tpo $(DEPDIR)/hosting_perl_la-virt_handler.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_perl_la_CFLAGS) $(CFLAGS) -MT hosting_perl_la-virt_handler.lo -MD -MP -MF $(DEPDIR)/hosting_perl_la-virt_handler.Tpo -c -o hosting_perl_la-virt_handler.lo `test -f 'virt_handler.c' || echo '$(srcdir)/'`virt_handler.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_perl_la-virt_handler.Tpo $(DEPDIR)/hosting_perl_la-virt_handler.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_handler.c' object='hosting_perl_la-virt_handler.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_perl_la_CFLAGS) $(CFLAGS) -c -o hosting_perl_la-virt_handler.lo `test -f 'virt_handler.c' || echo '$(srcdir)/'`virt_handler.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_perl_la_CFLAGS) $(CFLAGS) -c -o hosting_perl_la-virt_handler.lo `test -f 'virt_handler.c' || echo '$(srcdir)/'`virt_handler.c
mostlyclean-libtool:
-rm -f *.lo
@@ -463,49 +437,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -526,17 +496,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -570,7 +536,6 @@ clean-generic:
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"
@@ -593,8 +558,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -603,28 +566,18 @@ install-data-am: install-hostingLTLIBRARIES
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
@@ -647,7 +600,7 @@ ps-am:
uninstall-am: uninstall-hostingLTLIBRARIES
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-hostingLTLIBRARIES clean-libtool ctags distclean \
@@ -666,7 +619,6 @@ uninstall-am: uninstall-hostingLTLIBRARIES
virt_handler.c: virt_handler.pm pl_to_c.awk
$(AWK) -f pl_to_c.awk virt_handler.pm > virt_handler.c
-
# 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/hosting/perl/hosting_perl.c b/binsrc/hosting/perl/hosting_perl.c
index 137dcac..2c67be4 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk
index 369610f..eb4a07d 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-2006 OpenLink Software
+# 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
@@ -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 21d4632..e6b83cc 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-2006 OpenLink Software\n"
+"# Copyright (C) 1998-2012 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 be1fccf..2128c31 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/php/Makefile.am b/binsrc/hosting/php/Makefile.am
index 9b52d03..911d737 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/php/Makefile.in b/binsrc/hosting/php/Makefile.in
index 14f1cce..bea05bb 100644
--- a/binsrc/hosting/php/Makefile.in
+++ b/binsrc/hosting/php/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,29 +68,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(hostingdir)"
+hostingLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(hosting_LTLIBRARIES)
hosting_php_la_LIBADD =
am_hosting_php_la_OBJECTS = hosting_php_la-hosting_php.lo \
@@ -102,10 +85,9 @@ hosting_php_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(hosting_php_la_CFLAGS) \
$(CFLAGS) $(hosting_php_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_PHP5_TRUE at am_hosting_php_la_rpath = -rpath $(hostingdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -207,7 +189,6 @@ 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@
@@ -291,7 +272,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -312,7 +292,6 @@ 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@
@@ -345,14 +324,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/php/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/hosting/php/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/php/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/hosting/php/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -370,28 +349,23 @@ $(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):
install-hostingLTLIBRARIES: $(hosting_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(hostingdir)" || $(MKDIR_P) "$(DESTDIR)$(hostingdir)"
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hostingdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hostingdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(hostingdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(hostingdir)"; \
- }
+ done
uninstall-hostingLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$f"; \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$p"; \
done
clean-hostingLTLIBRARIES:
@@ -416,38 +390,38 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
hosting_php_la-hosting_php.lo: hosting_php.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_php_la_CFLAGS) $(CFLAGS) -MT hosting_php_la-hosting_php.lo -MD -MP -MF $(DEPDIR)/hosting_php_la-hosting_php.Tpo -c -o hosting_php_la-hosting_php.lo `test -f 'hosting_php.c' || echo '$(srcdir)/'`hosting_php.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_php_la-hosting_php.Tpo $(DEPDIR)/hosting_php_la-hosting_php.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_php_la_CFLAGS) $(CFLAGS) -MT hosting_php_la-hosting_php.lo -MD -MP -MF $(DEPDIR)/hosting_php_la-hosting_php.Tpo -c -o hosting_php_la-hosting_php.lo `test -f 'hosting_php.c' || echo '$(srcdir)/'`hosting_php.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_php_la-hosting_php.Tpo $(DEPDIR)/hosting_php_la-hosting_php.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosting_php.c' object='hosting_php_la-hosting_php.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_php_la_CFLAGS) $(CFLAGS) -c -o hosting_php_la-hosting_php.lo `test -f 'hosting_php.c' || echo '$(srcdir)/'`hosting_php.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_php_la_CFLAGS) $(CFLAGS) -c -o hosting_php_la-hosting_php.lo `test -f 'hosting_php.c' || echo '$(srcdir)/'`hosting_php.c
hosting_php_la-import_gate_virtuoso.lo: $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_php_la_CFLAGS) $(CFLAGS) -MT hosting_php_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/hosting_php_la-import_gate_virtuoso.Tpo -c -o hosting_php_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_php_la-import_gate_virtuoso.Tpo $(DEPDIR)/hosting_php_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_php_la_CFLAGS) $(CFLAGS) -MT hosting_php_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/hosting_php_la-import_gate_virtuoso.Tpo -c -o hosting_php_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_php_la-import_gate_virtuoso.Tpo $(DEPDIR)/hosting_php_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' object='hosting_php_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_php_la_CFLAGS) $(CFLAGS) -c -o hosting_php_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_php_la_CFLAGS) $(CFLAGS) -c -o hosting_php_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
mostlyclean-libtool:
-rm -f *.lo
@@ -460,49 +434,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -523,17 +493,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -564,7 +530,6 @@ clean-generic:
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"
@@ -586,8 +551,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -596,28 +559,18 @@ install-data-am: install-hostingLTLIBRARIES
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
@@ -656,7 +609,6 @@ uninstall-am: uninstall-hostingLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-hostingLTLIBRARIES
-
# 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/hosting/php/hosting_php.c b/binsrc/hosting/php/hosting_php.c
index 6938d24..119b3b2 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.2 2011/09/12 10:54:39 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2011 OpenLink Software
+ * 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
@@ -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.2 $");
+ php_info_print_table_row (2, "Revision", "$Revision$");
php_info_print_table_end ();
DISPLAY_INI_ENTRIES ();
diff --git a/binsrc/hosting/python/Makefile.am b/binsrc/hosting/python/Makefile.am
index ab8d7c1..11feafd 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/python/Makefile.in b/binsrc/hosting/python/Makefile.in
index 11fe8bc..fd002e7 100644
--- a/binsrc/hosting/python/Makefile.in
+++ b/binsrc/hosting/python/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,29 +68,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(hostingdir)"
+hostingLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(hosting_LTLIBRARIES)
hosting_python_la_LIBADD =
am_hosting_python_la_OBJECTS = hosting_python_la-hosting_python.lo \
@@ -105,10 +88,9 @@ hosting_python_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(hosting_python_la_CFLAGS) $(CFLAGS) \
$(hosting_python_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_PYTHON_TRUE at am_hosting_python_la_rpath = -rpath $(hostingdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -212,7 +194,6 @@ 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@
@@ -296,7 +277,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -317,7 +297,6 @@ 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@
@@ -356,14 +335,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/python/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/hosting/python/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/python/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/hosting/python/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -381,28 +360,23 @@ $(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):
install-hostingLTLIBRARIES: $(hosting_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(hostingdir)" || $(MKDIR_P) "$(DESTDIR)$(hostingdir)"
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hostingdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hostingdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(hostingdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(hostingdir)"; \
- }
+ done
uninstall-hostingLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$f"; \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$p"; \
done
clean-hostingLTLIBRARIES:
@@ -428,45 +402,45 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
hosting_python_la-hosting_python.lo: hosting_python.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -MT hosting_python_la-hosting_python.lo -MD -MP -MF $(DEPDIR)/hosting_python_la-hosting_python.Tpo -c -o hosting_python_la-hosting_python.lo `test -f 'hosting_python.c' || echo '$(srcdir)/'`hosting_python.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_python_la-hosting_python.Tpo $(DEPDIR)/hosting_python_la-hosting_python.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -MT hosting_python_la-hosting_python.lo -MD -MP -MF $(DEPDIR)/hosting_python_la-hosting_python.Tpo -c -o hosting_python_la-hosting_python.lo `test -f 'hosting_python.c' || echo '$(srcdir)/'`hosting_python.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_python_la-hosting_python.Tpo $(DEPDIR)/hosting_python_la-hosting_python.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosting_python.c' object='hosting_python_la-hosting_python.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_python_la_CFLAGS) $(CFLAGS) -c -o hosting_python_la-hosting_python.lo `test -f 'hosting_python.c' || echo '$(srcdir)/'`hosting_python.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -c -o hosting_python_la-hosting_python.lo `test -f 'hosting_python.c' || echo '$(srcdir)/'`hosting_python.c
hosting_python_la-import_gate_virtuoso.lo: $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -MT hosting_python_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/hosting_python_la-import_gate_virtuoso.Tpo -c -o hosting_python_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_python_la-import_gate_virtuoso.Tpo $(DEPDIR)/hosting_python_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -MT hosting_python_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/hosting_python_la-import_gate_virtuoso.Tpo -c -o hosting_python_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_python_la-import_gate_virtuoso.Tpo $(DEPDIR)/hosting_python_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' object='hosting_python_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_python_la_CFLAGS) $(CFLAGS) -c -o hosting_python_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -c -o hosting_python_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
hosting_python_la-virt_handler.lo: virt_handler.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -MT hosting_python_la-virt_handler.lo -MD -MP -MF $(DEPDIR)/hosting_python_la-virt_handler.Tpo -c -o hosting_python_la-virt_handler.lo `test -f 'virt_handler.c' || echo '$(srcdir)/'`virt_handler.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_python_la-virt_handler.Tpo $(DEPDIR)/hosting_python_la-virt_handler.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -MT hosting_python_la-virt_handler.lo -MD -MP -MF $(DEPDIR)/hosting_python_la-virt_handler.Tpo -c -o hosting_python_la-virt_handler.lo `test -f 'virt_handler.c' || echo '$(srcdir)/'`virt_handler.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_python_la-virt_handler.Tpo $(DEPDIR)/hosting_python_la-virt_handler.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_handler.c' object='hosting_python_la-virt_handler.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_python_la_CFLAGS) $(CFLAGS) -c -o hosting_python_la-virt_handler.lo `test -f 'virt_handler.c' || echo '$(srcdir)/'`virt_handler.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_python_la_CFLAGS) $(CFLAGS) -c -o hosting_python_la-virt_handler.lo `test -f 'virt_handler.c' || echo '$(srcdir)/'`virt_handler.c
mostlyclean-libtool:
-rm -f *.lo
@@ -479,49 +453,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -542,17 +512,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -586,7 +552,6 @@ clean-generic:
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"
@@ -609,8 +574,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -619,28 +582,18 @@ install-data-am: install-hostingLTLIBRARIES
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
@@ -663,7 +616,7 @@ ps-am:
uninstall-am: uninstall-hostingLTLIBRARIES
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-hostingLTLIBRARIES clean-libtool ctags distclean \
@@ -685,7 +638,6 @@ virt_handler.c: virt_handler.py py_to_c.awk
-o virt_handler.c \
-f py_to_c.awk \
virt_handler.py
-
# 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/hosting/python/build.py b/binsrc/hosting/python/build.py
index 1b2df40..e8141c2 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 2006/04/11 17:56:13 source Exp $
+# $Id$
#
# Python Makefile for the OpenLink python plugin
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/python/hosting_python.c b/binsrc/hosting/python/hosting_python.c
index b1be0a0..de2e027 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.2 2011/01/25 14:29:06 source Exp $
+ * $Id$
*
* Virtuoso Python hosting plugin
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk
index f7d6935..6ce5ff4 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 2006/04/11 17:56:13 source Exp $
+# $Id$
#
# GAWK python embeding script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -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 df8714d..50d2d2a 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.1 2010/04/14 13:55:08 source Exp $\n"
+"# $Id$\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-2006 OpenLink Software\n"
+"# Copyright (C) 1998-2012 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 0bd564c..9986f42 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.1 2010/04/14 13:55:08 source Exp $
+# $Id$
#
# python proxy for OpenLink python plugin
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/ruby/Makefile.am b/binsrc/hosting/ruby/Makefile.am
index a08666e..ca7a307 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/hosting/ruby/Makefile.in b/binsrc/hosting/ruby/Makefile.in
index 55fc106..c29cda7 100644
--- a/binsrc/hosting/ruby/Makefile.in
+++ b/binsrc/hosting/ruby/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,29 +70,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(hostingdir)"
+hostingLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(hosting_LTLIBRARIES)
hosting_ruby_la_LIBADD =
am_hosting_ruby_la_OBJECTS = hosting_ruby_la-hosting_ruby.lo \
@@ -104,10 +87,9 @@ hosting_ruby_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(hosting_ruby_la_CFLAGS) \
$(CFLAGS) $(hosting_ruby_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_RUBY_TRUE at am_hosting_ruby_la_rpath = -rpath $(hostingdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -210,7 +192,6 @@ 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@
@@ -294,7 +275,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -315,7 +295,6 @@ 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@
@@ -346,14 +325,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/ruby/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/hosting/ruby/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/hosting/ruby/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/hosting/ruby/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -371,28 +350,23 @@ $(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):
install-hostingLTLIBRARIES: $(hosting_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(hostingdir)" || $(MKDIR_P) "$(DESTDIR)$(hostingdir)"
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hostingdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hostingdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(hostingdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(hostingdir)"; \
- }
+ done
uninstall-hostingLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$f"; \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$p"; \
done
clean-hostingLTLIBRARIES:
@@ -417,38 +391,38 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
hosting_ruby_la-hosting_ruby.lo: hosting_ruby.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_ruby_la_CFLAGS) $(CFLAGS) -MT hosting_ruby_la-hosting_ruby.lo -MD -MP -MF $(DEPDIR)/hosting_ruby_la-hosting_ruby.Tpo -c -o hosting_ruby_la-hosting_ruby.lo `test -f 'hosting_ruby.c' || echo '$(srcdir)/'`hosting_ruby.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_ruby_la-hosting_ruby.Tpo $(DEPDIR)/hosting_ruby_la-hosting_ruby.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_ruby_la_CFLAGS) $(CFLAGS) -MT hosting_ruby_la-hosting_ruby.lo -MD -MP -MF $(DEPDIR)/hosting_ruby_la-hosting_ruby.Tpo -c -o hosting_ruby_la-hosting_ruby.lo `test -f 'hosting_ruby.c' || echo '$(srcdir)/'`hosting_ruby.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_ruby_la-hosting_ruby.Tpo $(DEPDIR)/hosting_ruby_la-hosting_ruby.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosting_ruby.c' object='hosting_ruby_la-hosting_ruby.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_ruby_la_CFLAGS) $(CFLAGS) -c -o hosting_ruby_la-hosting_ruby.lo `test -f 'hosting_ruby.c' || echo '$(srcdir)/'`hosting_ruby.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_ruby_la_CFLAGS) $(CFLAGS) -c -o hosting_ruby_la-hosting_ruby.lo `test -f 'hosting_ruby.c' || echo '$(srcdir)/'`hosting_ruby.c
hosting_ruby_la-ruby_io.lo: ruby_io.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_ruby_la_CFLAGS) $(CFLAGS) -MT hosting_ruby_la-ruby_io.lo -MD -MP -MF $(DEPDIR)/hosting_ruby_la-ruby_io.Tpo -c -o hosting_ruby_la-ruby_io.lo `test -f 'ruby_io.c' || echo '$(srcdir)/'`ruby_io.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_ruby_la-ruby_io.Tpo $(DEPDIR)/hosting_ruby_la-ruby_io.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_ruby_la_CFLAGS) $(CFLAGS) -MT hosting_ruby_la-ruby_io.lo -MD -MP -MF $(DEPDIR)/hosting_ruby_la-ruby_io.Tpo -c -o hosting_ruby_la-ruby_io.lo `test -f 'ruby_io.c' || echo '$(srcdir)/'`ruby_io.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_ruby_la-ruby_io.Tpo $(DEPDIR)/hosting_ruby_la-ruby_io.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ruby_io.c' object='hosting_ruby_la-ruby_io.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_ruby_la_CFLAGS) $(CFLAGS) -c -o hosting_ruby_la-ruby_io.lo `test -f 'ruby_io.c' || echo '$(srcdir)/'`ruby_io.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_ruby_la_CFLAGS) $(CFLAGS) -c -o hosting_ruby_la-ruby_io.lo `test -f 'ruby_io.c' || echo '$(srcdir)/'`ruby_io.c
mostlyclean-libtool:
-rm -f *.lo
@@ -461,49 +435,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -524,17 +494,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -565,7 +531,6 @@ clean-generic:
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"
@@ -587,8 +552,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -597,28 +560,18 @@ install-data-am: install-hostingLTLIBRARIES
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
@@ -657,7 +610,6 @@ uninstall-am: uninstall-hostingLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-hostingLTLIBRARIES
-
# 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/hosting/ruby/hosting_ruby.c b/binsrc/hosting/ruby/hosting_ruby.c
index 3716798..2f4bf1c 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 2006/04/11 17:56:13 source Exp $
+ * $Id$
*
* Virtuoso Ruby hosting plugin
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/ruby/hosting_ruby.h b/binsrc/hosting/ruby/hosting_ruby.h
index eed4930..484fb89 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 2006/04/11 17:56:13 source Exp $
+ * $Id$
*
* Virtuoso Ruby hosting plugin header
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/hosting/ruby/ruby_io.c b/binsrc/hosting/ruby/ruby_io.c
index 5558b4c..8665692 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 2006/04/11 17:56:13 source Exp $
+ * $Id$
*
* Virtuoso Ruby hosting plugin IO handlers
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/isparql/._error.js b/binsrc/isparql/._error.js
new file mode 100644
index 0000000..7111258
Binary files /dev/null and b/binsrc/isparql/._error.js differ
diff --git a/binsrc/isparql/Makefile.am b/binsrc/isparql/Makefile.am
index e9390a4..3ee56c1 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-2009 OpenLink Software
+# 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
diff --git a/binsrc/isparql/Makefile.in b/binsrc/isparql/Makefile.in
index b608c28..e352910 100644
--- a/binsrc/isparql/Makefile.in
+++ b/binsrc/isparql/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -71,7 +69,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
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 =
@@ -80,23 +77,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -186,7 +169,6 @@ 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@
@@ -270,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -291,7 +272,6 @@ 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@
@@ -329,14 +309,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/isparql/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/isparql/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/isparql/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/isparql/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -354,7 +334,6 @@ $(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
@@ -364,23 +343,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -404,17 +380,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -446,7 +418,6 @@ clean-generic:
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"
@@ -465,8 +436,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -475,28 +444,18 @@ 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
@@ -537,7 +496,6 @@ isparql_dav.vad: $(EXTRA_DIST)
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/isparql/auth.vsp b/binsrc/isparql/auth.vsp
index 385f255..49883e8 100644
--- a/binsrc/isparql/auth.vsp
+++ b/binsrc/isparql/auth.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: auth.vsp,v 1.4.2.3 2011/01/25 14:08:45 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/isparql/auth_ods.vsp b/binsrc/isparql/auth_ods.vsp
index 138d985..afc2bf7 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.1 2009/06/10 19:49:06 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/isparql/cmds.vsp b/binsrc/isparql/cmds.vsp
index a5bebe0..a7858ce 100644
--- a/binsrc/isparql/cmds.vsp
+++ b/binsrc/isparql/cmds.vsp
@@ -1,10 +1,10 @@
/*
- * $Id: cmds.vsp,v 1.1.2.2 2009/06/10 19:49:06 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/binsrc/isparql/defaults.js b/binsrc/isparql/defaults.js
index ee975eb..92e1f7c 100644
--- a/binsrc/isparql/defaults.js
+++ b/binsrc/isparql/defaults.js
@@ -50,6 +50,7 @@ iSPARQL.Defaults = {
endpoint: '/sparql',
pivotInstalled: false,
addthis_key: false,
+ raw_iris: true,
locOpts: { /* XXX all except minAcc not implemented yet */
cacheLocTO: 2000, /* Milliseconds timeout to improve non-expired cached location accuracy */
coarseLocTO: 2000, /* Milliseconds to wait for coarse loc in last cached location validation attempt */
@@ -103,6 +104,7 @@ iSPARQL.Defaults = {
if (p['maxrows']) iSPARQL.Settings.maxrows = parseInt(p['maxrows']);
if (p['timeout']) iSPARQL.Settings.timeout = parseInt(p['timeout']);
if (p['amode']) iSPARQL.Settings.anchorMode = parseInt(p['amode']);
+ if (p['raw_iris']) iSPARQL.Settings.raw_iris = ((p['raw_iris'] == 'true')?true:false);
},
//
diff --git a/binsrc/isparql/defaults.vsp b/binsrc/isparql/defaults.vsp
index 6f4bff1..71587e1 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.13 2011/09/05 15:27:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/isparql/error.js b/binsrc/isparql/error.js
index b7e39aa..cf6eecb 100644
--- a/binsrc/isparql/error.js
+++ b/binsrc/isparql/error.js
@@ -1,9 +1,9 @@
/*
- * $Id: error.js,v 1.1.2.2 2010/03/12 09:01:02 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/execute.html b/binsrc/isparql/execute.html
index fd205f1..e90adcd 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.20 2011/09/09 13:10:24 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2009 OpenLink Software
+ Copyright (C) 2009-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
@@ -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-2011 OpenLink Software</div>
+ <div id="splash_copyr">Copyright © 2006-2012 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-2011 OpenLink Software<br/><span id="ft_loc"></span><br/>
+ Copyright © 2006-2012 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 4429d0a..8c9c165 100644
--- a/binsrc/isparql/execute.js
+++ b/binsrc/isparql/execute.js
@@ -1,9 +1,9 @@
/*
- * $Id: execute.js,v 1.32.2.42 2011/09/20 12:03:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
@@ -16,40 +16,40 @@
// XXX move defaultPrefixes to be handled by defaults.js
window.defaultPrefixes = [
- {"label":'foaf', "uri":'http://xmlns.com/foaf/0.1/'},
- {"label":'owl', "uri":'http://www.w3.org/2002/07/owl#'},
- {"label":'sioct', "uri":'http://rdfs.org/sioc/types#'},
- {"label":'sioc', "uri":'http://rdfs.org/sioc/ns#'},
- {"label":'ibis', "uri":'http://purl.org/ibis#',"hidden":1},
- {"label":'conf', "uri":'http://www.mindswap.org/~golbeck/web/www04photo.owl#'},
- {"label":'scot', "uri":'http://scot-project.org/scot/ns'},
- {"label":'ical', "uri":'http://www.w3.org/2002/12/cal/icaltzd#'},
- {"label":'mo', "uri":'http://purl.org/ontology/mo/'},
- {"label":'annotation', "uri":'http://www.w3.org/2000/10/annotation-ns#'},
- {"label":'rdfs', "uri":'http://www.w3.org/2000/01/rdf-schema#'},
- {"label":'rdf', "uri":'http://www.w3.org/1999/02/22-rdf-syntax-ns#'},
- {"label":'dcterms', "uri":'http://purl.org/dc/terms/'},
- {"label":'dc', "uri":'http://purl.org/dc/elements/1.1/'},
- {"label":'cc', "uri":'http://web.resource.org/cc/'},
- {"label":'geo', "uri":'http://www.w3.org/2003/01/geo/wgs84_pos#'},
+ {"label":'foaf', "uri":'http://xmlns.com/foaf/0.1/'},
+ {"label":'owl', "uri":'http://www.w3.org/2002/07/owl#'},
+ {"label":'sioct', "uri":'http://rdfs.org/sioc/types#'},
+ {"label":'sioc', "uri":'http://rdfs.org/sioc/ns#'},
+ {"label":'ibis', "uri":'http://purl.org/ibis#',"hidden":1},
+ {"label":'conf', "uri":'http://www.mindswap.org/~golbeck/web/www04photo.owl#'},
+ {"label":'scot', "uri":'http://scot-project.org/scot/ns'},
+ {"label":'ical', "uri":'http://www.w3.org/2002/12/cal/icaltzd#'},
+ {"label":'mo', "uri":'http://purl.org/ontology/mo/'},
+ {"label":'annotation', "uri":'http://www.w3.org/2000/10/annotation-ns#'},
+ {"label":'rdfs', "uri":'http://www.w3.org/2000/01/rdf-schema#'},
+ {"label":'rdf', "uri":'http://www.w3.org/1999/02/22-rdf-syntax-ns#'},
+ {"label":'dcterms', "uri":'http://purl.org/dc/terms/'},
+ {"label":'dc', "uri":'http://purl.org/dc/elements/1.1/'},
+ {"label":'cc', "uri":'http://web.resource.org/cc/'},
+ {"label":'geo', "uri":'http://www.w3.org/2003/01/geo/wgs84_pos#'},
{"label":'georss', "uri":'http://www.georss.org/georss/'},
- {"label":'rss', "uri":'http://purl.org/rss/1.0/'},
- {"label":'skos', "uri":'http://www.w3.org/2008/05/skos#'},
- {"label":'vs', "uri":'http://www.w3.org/2003/06/sw-vocab-status/ns#'},
- {"label":'opo',"uri":'http://ggg.milanstankovic.org/opo/ns/'},
- {"label":'nco',"uri":'http://www.semanticdesktop.org/ontologies/nco/'},
- {"label":'lsdis',"uri":'http://lsdis.cs.uga.edu/projects/meteor-s/wsdl-s/ontologies/LSDIS_FInance.owl'},
- {"label":'nao',"uri":'http://www.semanticdesktop.org/ontologies/nao/'},
- {"label":'cohere',"uri":'http://cohere.open.ac.uk/ontology/cohere.owl#'},
- {"label":'nfo',"uri":'http://www.semanticdesktop.org/ontologies/nfo/'},
- {"label":'nmo',"uri":'http://www.semanticdesktop.org/ontologies/nmo/'},
- {"label":'nie',"uri":'http://www.semanticdesktop.org/ontologies/nie/'},
- {"label":'nid3',"uri":'http://www.semanticdesktop.org/ontologies/nid3/'},
+ {"label":'rss', "uri":'http://purl.org/rss/1.0/'},
+ {"label":'skos', "uri":'http://www.w3.org/2008/05/skos#'},
+ {"label":'vs', "uri":'http://www.w3.org/2003/06/sw-vocab-status/ns#'},
+ {"label":'opo',"uri":'http://ggg.milanstankovic.org/opo/ns/'},
+ {"label":'nco',"uri":'http://www.semanticdesktop.org/ontologies/nco/'},
+ {"label":'lsdis',"uri":'http://lsdis.cs.uga.edu/projects/meteor-s/wsdl-s/ontologies/LSDIS_FInance.owl'},
+ {"label":'nao',"uri":'http://www.semanticdesktop.org/ontologies/nao/'},
+ {"label":'cohere',"uri":'http://cohere.open.ac.uk/ontology/cohere.owl#'},
+ {"label":'nfo',"uri":'http://www.semanticdesktop.org/ontologies/nfo/'},
+ {"label":'nmo',"uri":'http://www.semanticdesktop.org/ontologies/nmo/'},
+ {"label":'nie',"uri":'http://www.semanticdesktop.org/ontologies/nie/'},
+ {"label":'nid3',"uri":'http://www.semanticdesktop.org/ontologies/nid3/'},
{"label":'kuaba', "uri":'http://www.tecweb.inf.puc-rio.br/ontologies/kuaba/'},
- {"label":'wot', "uri":'http://xmlns.com/wot/0.1/',"hidden":1},
- {"label":'xhtml', "uri":'http://www.w3.org/1999/xhtml',"hidden":1},
- {"label":'atom', "uri":'http://atomowl.org/ontologies/atomrdf#',"hidden":1},
- {"label":'dataview', "uri":'http://www.w3.org/2003/g/data-view#',"hidden":1},
+ {"label":'wot', "uri":'http://xmlns.com/wot/0.1/',"hidden":1},
+ {"label":'xhtml', "uri":'http://www.w3.org/1999/xhtml',"hidden":1},
+ {"label":'atom', "uri":'http://atomowl.org/ontologies/atomrdf#',"hidden":1},
+ {"label":'dataview', "uri":'http://www.w3.org/2003/g/data-view#',"hidden":1},
{"label":'xsd', "uri":'http://www.w3.org/2001/XMLSchema#',"hidden":1},
{"label":'gr', "uri":'http://purl.org/goodrelations/v1#'},
{"label":'dbo', "uri":'http://dbpedia.org/ontology/'},
@@ -200,9 +200,9 @@ var QueryExec = function(optObj) {
defaultGraph:false,
namedGraphs:[],
sponge:false,
- maxrows:false,
+ maxrows:false,
timeout:false,
- sourceQuery:false /* before macro expansion */
+ sourceQuery:false /* before macro expansion */
};
this.cache = [];
@@ -213,6 +213,16 @@ var QueryExec = function(optObj) {
this.miniplnk = false;
this.mRDFCtr = false;
this.anchor_pref_c = false;
+
+//
+// return closure to handle uri format change
+
+ this.makeUriFmtChangeHandler = function(self, ctl) {
+ return function (e) {
+ iSPARQL.Settings.raw_iris = ctl.checked;
+ self.draw(true);
+ }
+ }
this.makeAnchorPrefs = function () {
var anchor_pref_c = OAT.Dom.create("div", {className: "anchor_pref_c"});
@@ -229,7 +239,17 @@ var QueryExec = function(optObj) {
iSPARQL.Settings.anchorMode = ($('anchor_pref_sel').selectedIndex);
});
- OAT.Dom.append ([anchor_pref_c, anchor_label, anchor_pref_sel]);
+ var uri_fmt_c = OAT.Dom.create ("span", {id: "uri_fmt_ctr"});
+ var uri_fmt_label = OAT.Dom.create("label", {htmlFor: "uri_fmt_ckb"});
+ uri_fmt_label.innerHTML = "Show Raw URIs";
+ uri_fmt_ckb = OAT.Dom.create ("input", {id: "uri_fmt_ckb"});
+ uri_fmt_ckb.type = "checkbox";
+ uri_fmt_ckb.checked = iSPARQL.Settings.raw_iris;
+
+ OAT.Event.attach(uri_fmt_ckb, 'change', self.makeUriFmtChangeHandler (self, uri_fmt_ckb));
+
+ OAT.Dom.append ([anchor_pref_c, anchor_label, anchor_pref_sel, uri_fmt_c]);
+ OAT.Dom.append ([uri_fmt_c, uri_fmt_ckb, uri_fmt_label]);
return anchor_pref_c;
}
@@ -240,6 +260,8 @@ var QueryExec = function(optObj) {
this.dom.response = OAT.Dom.create("pre",{className:'ep_response'});
this.dom.query = OAT.Dom.create("pre", {className:'ep_query'});
+ this.currentRdfMiniTabIdx = 0;
+
// this.dom.select = OAT.Dom.create("select");
// OAT.Dom.option("Machine-readable","1",this.dom.select);
// OAT.Dom.option("Human-readable","0",this.dom.select);
@@ -260,7 +282,7 @@ var QueryExec = function(optObj) {
if (self.options.div) {
OAT.Dom.clear(self.options.div);
- OAT.Dom.append([self.options.div,/*self.dom.select,*/OAT.Dom.create("br")]);
+ OAT.Dom.append([self.options.div,/*self.dom.select,*/OAT.Dom.create("br")]);
OAT.Dom.append([self.options.div,self.dom.ul,self.dom.tab]);
}
self.initNav();
@@ -422,12 +444,12 @@ var QueryExec = function(optObj) {
var paramsObj = {};
if (opts.defaultGraph && !opts.query.match(/from *</i)) {
- paramsObj["default-graph-uri"] = opts.defaultGraph;
- }
+ paramsObj["default-graph-uri"] = opts.defaultGraph;
+ }
if (opts.maxrows && opts.query && !opts.query.match(/limit *[0-9].*/i)) {
- paramsObj["maxrows"] = opts.maxrows;
- }
+ paramsObj["maxrows"] = opts.maxrows;
+ }
if (opts.timeout) { paramsObj["timeout"] = opts.timeout; }
if (opts.sponge && self.options.virtuoso) { paramsObj["should-sponge"] = opts.sponge; }
@@ -453,7 +475,7 @@ var QueryExec = function(optObj) {
}
arr.push (encodeURIComponent("format=application/rdf+xml"));
- return arr.join("&");
+ return arr.join("&");
};
this.resultType = function(data) {
@@ -510,24 +532,10 @@ var QueryExec = function(optObj) {
request:request,
data:data,
txt:OAT.Xml.serializeXmlDoc (data),
- store: new OAT.RDFStore(),
+ store: new OAT.RDFStore(false,{raw_iris: true}),
dom: {}
}
- cacheItem.dom.query_c = OAT.Dom.create ("div",{className: "query_c"});
- cacheItem.dom.result_c = OAT.Dom.create ("div",{className: "result_c"});
- cacheItem.dom.request_c = OAT.Dom.create ("div",{className: "request_c"});
- cacheItem.dom.response_c = OAT.Dom.create ("div",{className: "response_c"});
-
- cacheItem.dom.result_opts_c = OAT.Dom.create ("div",{className:"result_opts_c"});
- cacheItem.dom.plnk_c = OAT.Dom.create("div", {className: "result_plnk_c"});
-
- cacheItem.dom.deref_prefs = self.makeAnchorPrefs();
- var clrfix = OAT.Dom.create ("div", {className: "clearfix"})
- OAT.Dom.append([cacheItem.dom.result_opts_c, cacheItem.dom.plnk_c, cacheItem.dom.deref_prefs],
- [cacheItem.dom.result_c, cacheItem.dom.result_opts_c, clrfix]);
-
-
var req_href;
// FIXME (ghard) this is wrong
@@ -576,16 +584,51 @@ var QueryExec = function(optObj) {
resUriBase += "&default-graph-uri=" + (opts.defaultGraph ? opts.defaultGraph : "");
resUriBase += "&format=";
- $('cxml_raw_lnk').href = resUriBase + encodeURIComponent("text/cxml");
- $('csv_raw_lnk').href = resUriBase + encodeURIComponent("text/csv");
-
- $('nt_raw_lnk').href = resUriBase + encodeURIComponent("text/plain");
- $('n3_raw_lnk').href = resUriBase + encodeURIComponent("text/rdf+n3");
- $('json_raw_lnk').href = resUriBase + encodeURIComponent("application/rdf+json");
- $('rdfxml_raw_lnk').href = resUriBase + encodeURIComponent("application/rdf+xml");
+ var cxml_l_elm = OAT.Dom.create('link');
+ cxml_l_elm.setAttribute('rel','alternate');
+ cxml_l_elm.setAttribute('type','text/cxml');
+ cxml_l_elm.href = $('cxml_raw_lnk').href = resUriBase + encodeURIComponent("text/cxml");
+
+ var csv_l_elm = OAT.Dom.create('link');
+ csv_l_elm.setAttribute('rel','alternate');
+ csv_l_elm.setAttribute('type','text/csv');
+ csv_l_elm.href = $('csv_raw_lnk').href = resUriBase + encodeURIComponent("text/csv");
+
+ var nt_l_elm = OAT.Dom.create('link');
+ nt_l_elm.setAttribute('rel','alternate');
+ nt_l_elm.setAttribute('type','text/plain');
+ nt_l_elm.href = $('nt_raw_lnk').href = resUriBase + encodeURIComponent("text/plain");
+
+ var n3_l_elm = OAT.Dom.create('link');
+ n3_l_elm.setAttribute('rel','alternate');
+ n3_l_elm.setAttribute('type','text/rdf+n3');
+ n3_l_elm.href = $('n3_raw_lnk').href = resUriBase + encodeURIComponent("text/rdf+n3");
+
+ var json_l_elm = OAT.Dom.create('link');
+ json_l_elm.setAttribute('rel','alternate');
+ json_l_elm.setAttribute('type','text/rdf+json');
+ json_l_elm.href = $('json_raw_lnk').href = resUriBase + encodeURIComponent("application/rdf+json");
+
+ var rdfxml_l_elm = OAT.Dom.create('link');
+ rdfxml_l_elm.setAttribute('rel','alternate');
+ rdfxml_l_elm.setAttribute('type','text/rdf+xml');
+ rdfxml_l_elm.href = $('rdfxml_raw_lnk').href = resUriBase + encodeURIComponent("application/rdf+xml");
- $('odata_atom_lnk').href = resUriBase + encodeURIComponent("application/atom+xml");
- $('odata_json_lnk').href = resUriBase + encodeURIComponent("application/odata+json");
+ var atom_l_elm = OAT.Dom.create('link');
+ atom_l_elm.setAttribute('rel','alternate');
+ atom_l_elm.setAttribute('type','application/atom+xml');
+ atom_l_elm.href = $('odata_atom_lnk').href = resUriBase + encodeURIComponent("application/atom+xml");
+
+ var ojson_l_elm = OAT.Dom.create('link');
+ ojson_l_elm.setAttribute('rel','alternate');
+ ojson_l_elm.setAttribute('type','application/odata+json');
+ ojson_l_elm.href = $('odata_json_lnk').href = resUriBase + encodeURIComponent("application/odata+json");
+
+ var head_elm = document.getElementsByTagName('head')[0];
+
+ OAT.Dom.append([head_elm, cxml_l_elm, csv_l_elm, nt_l_elm,
+ n3_l_elm, json_l_elm, rdfxml_l_elm, atom_l_elm,
+ ojson_l_elm]);
OAT.Dom.show('data_links');
}
@@ -611,7 +654,7 @@ var QueryExec = function(optObj) {
var item = self.cache[self.cacheIndex];
var opts = item.opts;
var request = item.request;
- var ctr = self.miniplnk;
+ var ctr = self.miniplnk;
OAT.Dom.clear(ctr);
@@ -636,6 +679,8 @@ var QueryExec = function(optObj) {
xparm += "&timeout=" + (opts.timeout ? opts.timeout : "");
xparm += "&view=" + opts.view;
xparm += "&amode=" + iSPARQL.Settings.anchorMode;
+ xparm += "&raw_iris=" + iSPARQL.Settings.raw_iris;
+
var plnk_a = OAT.Dom.create("a");
plnk_a.target = "_blank";
@@ -732,9 +777,15 @@ var QueryExec = function(optObj) {
for (var i=0;i < tabs.length;i++) {
if (rvVal == tabs[i][0]) return i;
}
- return 0;
+ return false;
};
+ this.rdfMiniViewChangeH = function (caller, msg, o) {
+ if (o.tabType != 'map')
+ self.currentRdfMiniTabIdx = o.tabIndex;
+ self.makeMiniRDFPlinkURI (caller, msg, o);
+ }
+
this.RESULT_TYPE = {
URI:0,
LITERAL:1
@@ -743,7 +794,11 @@ var QueryExec = function(optObj) {
this.renderResultValue = function (val, opts) {
if (val.restype == self.RESULT_TYPE.URI) {
var a = OAT.Dom.create("a");
- a.innerHTML = self.cache[self.cacheIndex].store.simplify (val.value);
+ if (iSPARQL.Settings.raw_iris) {
+ a.innerHTML = val.value
+ } else {
+ a.innerHTML = self.cache[self.cacheIndex].store.simplify (val.value);
+ }
a.href = val.value;
self.processLink(a, val.value);
return a;
@@ -840,7 +895,7 @@ var QueryExec = function(optObj) {
// XXX produces URLs which are invalid
//
- this.makePivotPermalink = function (ctr) {
+ this.makePivotPermalink = function () {
var item = self.cache[self.cacheIndex];
var opts = item.opts;
@@ -866,17 +921,14 @@ var QueryExec = function(optObj) {
a.href = document.location.protocol + '//' + document.location.host +
'/PivotViewer/' + "?url=" + encodeURIComponent(xparm);
a.target = "_blank";
- var spc = OAT.Dom.create("span");
- spc.innerHTML = " | ";
if (iSPARQL.Settings.shorten_uris)
iSPARQL.Common.shortenURI (a);
- OAT.Dom.append([ctr,a, spc]);
-
+ return a;
};
- this.makeExecPermalink = function (ctr) {
+ this.makeExecPermalink = function () {
var item = self.cache[self.cacheIndex];
var opts = item.opts;
var request = item.request;
@@ -901,6 +953,7 @@ var QueryExec = function(optObj) {
xparm += "&default-graph-uri=" + (opts.defaultGraph ? encodeURIComponent(opts.defaultGraph) : "");
xparm += "&view=" + opts.view;
xparm += "&amode=" + iSPARQL.Settings.anchorMode;
+ xparm += "&raw_iris=" + iSPARQL.Settings.raw_iris;
execURIa.href = nloca.protocol + "//" + nloca.host + "/isparql/view/" + xparm;
@@ -909,18 +962,15 @@ var QueryExec = function(optObj) {
execURIa.target = "_blank";
- OAT.Dom.append([ctr,execURIa]);
- OAT.Dom.hide ('data_links')
+ OAT.Dom.hide ('data_links') // XXX: WTF is this?
+
+ return execURIa;
};
this.drawSparqlResultSet = function (resSet) {
var item = self.cache[self.cacheIndex];
- if (iSPARQL.Settings.pivotInstalled)
- self.makePivotPermalink(item.dom.plnk_c);
-
- self.makeExecPermalink (item.dom.plnk_c);
-
+// OAT.Dom.clear (item.dom.result_c);
var grid = new OAT.Grid (item.dom.result_c);
grid.createHeader(resSet.variables);
@@ -961,7 +1011,7 @@ var QueryExec = function(optObj) {
}
}
- self.makeExecPermalink ();
+// self.makeExecPermalink ();
var data_root = self.cache[cacheIndex].store.data.all[0];
var ns_var = "http://www.w3.org/2005/sparql-results#resultVariable";
@@ -1128,7 +1178,7 @@ var QueryExec = function(optObj) {
self.refreshNav();
};
- // called only when new result is received
+ // called when new result is received, or redraw is needed
this.draw = function(refresh) {
var item = self.cache[self.cacheIndex];
@@ -1137,40 +1187,62 @@ var QueryExec = function(optObj) {
var wasError = item.wasError;
var data = item.data;
- if (self.options.executeCallback) { self.options.executeCallback(item); }
+ item.dom.result_opts_c = OAT.Dom.create ("div",{className:"result_opts_c"});
+ item.dom.plnk_c = OAT.Dom.create("div", {className: "result_plnk_c"});
+
+ item.dom.deref_prefs = self.makeAnchorPrefs();
- // Generate request page
+ var clrfix = OAT.Dom.create ("div", {className: "clearfix"})
- var r = decodeURIComponent(request);
- var parts = r.split("&");
- var req = OAT.Dom.create("pre");
+ if (!refresh) {
+ item.dom.query_c = OAT.Dom.create ("div",{className: "query_c"});
+ item.dom.result_c = OAT.Dom.create ("div",{className: "result_c"});
+ item.dom.request_c = OAT.Dom.create ("div",{className: "request_c"});
+ item.dom.response_c = OAT.Dom.create ("div",{className: "response_c"});
- OAT.Dom.append([item.dom.request_c, req]);
+ OAT.Dom.append([item.dom.result_opts_c, item.dom.plnk_c, item.dom.deref_prefs],
+ [item.dom.result_c, item.dom.result_opts_c, clrfix]);
- for (var i=0;i<parts.length;i++) { req.innerHTML += OAT.Xml.escape(parts[i])+"\n"; }
+ if (self.options.executeCallback) { self.options.executeCallback(item); }
- // Generate query page
+ // Generate request page
- var a = OAT.Dom.create("a");
- a.innerHTML = "Query Permalink";
- var xparm = "?query=" + encodeURIComponent(opts.query) + "&endpoint=" + opts.endpoint;
- xparm += "&maxrows=" + (opts.maxrows ? opts.maxrows : "");
- xparm += "&timeout=" + (opts.timeout ? opts.timeout : "");
- xparm += "&default-graph-uri=" + (opts.defaultGraph ? opts.defaultGraph : "");
- xparm += "&view=" + opts.view;
- a.href = document.location.protocol + '//' + document.location.host + '/isparql/' + xparm;
- a.target = "_blank";
+ var r = decodeURIComponent(request);
+ var parts = r.split("&");
+ var req = OAT.Dom.create("pre");
- if (iSPARQL.Settings.shorten_uris)
- iSPARQL.Common.shortenURI(a);
+ OAT.Dom.append([item.dom.request_c, req]);
+
+ for (var i=0;i<parts.length;i++) { req.innerHTML += OAT.Xml.escape(parts[i])+"\n"; }
+
+ // Generate query page
+
+ var a = OAT.Dom.create("a");
+ a.innerHTML = "Query Permalink";
+ var xparm = "?query=" + encodeURIComponent(opts.query) + "&endpoint=" + opts.endpoint;
+ xparm += "&maxrows=" + (opts.maxrows ? opts.maxrows : "");
+ xparm += "&timeout=" + (opts.timeout ? opts.timeout : "");
+ xparm += "&default-graph-uri=" + (opts.defaultGraph ? opts.defaultGraph : "");
+ xparm += "&view=" + opts.view;
+ xparm += "&raw_iris=" + iSPARQL.Settings.raw_iris;
+ a.href = document.location.protocol + '//' + document.location.host + '/isparql/' + xparm;
+ a.target = "_blank";
- var q = OAT.Dom.create("pre");
- q.innerHTML = OAT.Xml.escape(opts.query);
+ if (iSPARQL.Settings.shorten_uris)
+ iSPARQL.Common.shortenURI(a);
+
+ var q = OAT.Dom.create("pre");
+ q.innerHTML = OAT.Xml.escape(opts.query);
- OAT.Dom.append([item.dom.query_c,a,q]);
+ OAT.Dom.append([item.dom.query_c,a,q]);
// Parsererror here applies only to FireFox. WebKit tries its best trying to parse the document
// as far as it can, so in most cases we'll have a piece of graph to process and never get to the error.
+ } else {
+ OAT.Dom.clear (item.dom.result_c);
+ OAT.Dom.append([item.dom.result_opts_c, item.dom.plnk_c, item.dom.deref_prefs],
+ [item.dom.result_c, item.dom.result_opts_c, clrfix]);
+ }
if (wasError) {
if (typeof data != "string" && item.resType == iSPARQL.ResultType.ERROR) {
@@ -1185,8 +1257,10 @@ var QueryExec = function(optObj) {
item.dom.response_c.innerHTML = self.makeErrorResp (data);
}
} else {
+
// Generate Response page
+ if (!refresh) {
var xmlTxt = item.txt; // Used if we have to draw a result set - need to remove namespace, etc.
var txt = OAT.Xml.escape(xmlTxt);
var resp_p = OAT.Dom.create ("pre");
@@ -1196,36 +1270,37 @@ var QueryExec = function(optObj) {
var ua = navigator.userAgent.toLowerCase();
-/* if (ua.search ("iphone") ||
- ua.search ("ipod") ||
- ua.search ("android") ||
- ua.search ("symbian") ||
- ua.search ("S60"))
-*/
map_h = OAT.Dom.getViewport()[1].toString()+'px';
-/* else
- map_h = "600px";
-*/
+ }
// generate Result
if (item.resType == iSPARQL.ResultType.GRAPH) { // Use RDFMini to show Graphs
var lastIndex = 0;
var tabs = [
- ["navigator","Navigator"],
- ["browser","Raw Triples",{removeNS:true}],
- ["triples","Grid View",{}],
- ["svg","SVG Graph",{}],
- ["images","Images",{}],
+ ["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}],
["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}]
+ height: map_h,
+ raw_iris: true}]
];
- lastIndex = self.parseTabIndex (opts.resultView, tabs);
+ lastIndex = self.parseTabIndex (opts.resultView, tabs); // check if URI contains view def
+
+ if (lastIndex === false) {
+ if (tabs[self.currentRdfMiniTabIdx][0] != 'map') // sticky last manual choice for view if it's not a map
+ lastIndex = self.currentRdfMiniTabIdx;
+ else
+ lastIndex = 0;
+ }
+
var c_i = self.cacheIndex;
self.miniplnk = OAT.Dom.create ("div",{id:"rdf_plink_c"});
@@ -1250,20 +1325,22 @@ var QueryExec = function(optObj) {
if (item.store.getTripleCount() > 0) {
item.mini = new OAT.RDFMini(mini_c,{tabs:tabs,
showSearch:false,
- store: item.store});
-
+ store: item.store,
+ defaultTab: 0,
+ raw_iris: true});
+
item.mini.processLink = self.processLink;
-
- // self.tab.go(0); // got to do here or maps won't resize properly.
- // self.cache[self.cacheIndex].mini.store.addXmlDoc(data);
-
- item.mini.select.selectedIndex = lastIndex;
- item.mini.redraw();
-
+
+ // self.tab.go(0); // got to do here or maps won't resize properly.
+ // self.cache[self.cacheIndex].mini.store.addXmlDoc(data);
+
+ item.mini.setTab(lastIndex);
+
self.makeMiniRDFPlinkURI (false,false,{tabIndex:lastIndex});
- OAT.MSG.attach (item.mini, 'RDFMINI_VIEW_CHANGED', self.makeMiniRDFPlinkURI);
+ OAT.MSG.attach (item.mini, 'RDFMINI_VIEW_CHANGED', self.rdfMiniViewChangeH)
+
self.makeDataLinks();
-
+
} else {
mini_c.innerHTML =
'<h2>No Data</h2>' +
@@ -1272,7 +1349,7 @@ var QueryExec = function(optObj) {
OAT.Dom.append ([item.dom.plnk_c, self.miniplnk]);
OAT.Dom.append ([item.dom.result_c, mini_c]);
-
+
// if (iSPARQL.Settings.addthis_key && !OAT.Browser.isScreenOnly) {
// self.addthis_ctr = OAT.Dom.create ("a",{id: "addthis_ctr",
// className: "addthis_button"});
@@ -1285,8 +1362,16 @@ var QueryExec = function(optObj) {
} else {
if (data.firstChild.tagName == 'sparql' &&
data.firstChild.namespaceURI == 'http://www.w3.org/2005/sparql-results#') {
- var rs = self.parseSparqlResultSet (data);
- self.drawSparqlResultSet (rs);
+
+ if (iSPARQL.Settings.pivotInstalled)
+ OAT.Dom.append ([item.dom.plink_c, self.makePivotPermalink()]);
+
+ OAT.Dom.append ([item.dom.plnk_c, self.makeExecPermalink ()]);
+
+ if (!refresh)
+ item.result_set = self.parseSparqlResultSet (data);
+
+ self.drawSparqlResultSet (item.result_set);
}
}
}
@@ -1295,11 +1380,18 @@ var QueryExec = function(optObj) {
[self.dom.request, item.dom.request_c],
[self.dom.query, item.dom.query_c],
[self.dom.response, item.dom.response_c]);
+
+ if (item.resType != iSPARQL.ResultType.GRAPH)
+ OAT.Dom.show ($('uri_fmt_ctr'))
+ else
+ OAT.Dom.hide ($('uri_fmt_ctr'))
+
self.tab.go(0);
self.refreshNav();
};
this.simplifyPrefix = function(str) {
+ if (iSPARQL.Settings.raw_iris) return str;
var plist = window.defaultPrefixes;
var s = str;
if (!s) { return; }
@@ -1322,9 +1414,9 @@ var QueryExec = function(optObj) {
'define input:same-as "yes" \n'+
'define input:grab-seealso <http://www.w3.org/2002/07/owl#sameAs> \n'+
'DESCRIBE <'+ encodeURI(href) +'> FROM <' + encodeURI(href) + '>';
-// var q = 'DESCRIBE <'+href+'>';
var bq = 'DESCRIBE <'+ encodeURI(href) +'>';
var o = {};
+
for (var p in cache.opts) { o[p] = cache.opts[p]; }
o.defaultGraph = false;
@@ -1415,6 +1507,7 @@ var QueryExec = function(optObj) {
window.open(href);
break;
default:
+ dereferenceRef(event);
describeRef(event);
break;
}
diff --git a/binsrc/isparql/index.html b/binsrc/isparql/index.html
index 969dfd2..d5d4163 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.30 2011/09/09 13:10:24 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2009 OpenLink Software
+ Copyright (C) 2009-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
@@ -103,9 +103,11 @@ 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-2011 OpenLink Software</div>
+ <div id="splash_copyr">Copyright © 2006-2012 OpenLink Software</div>
+
<div id="splash_foot" class="opl_motto">Making Technology Work For You ™</div>
</div> <!-- #splash_inner -->
</div> <!-- #splash -->
@@ -546,7 +548,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-2011 OpenLink Software<br/><span id="ft_loc"></span><br/>
+ iSPARQL Copyright © 2006-2012 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 a2d27f7..43111b7 100644
--- a/binsrc/isparql/io.js
+++ b/binsrc/isparql/io.js
@@ -1,9 +1,9 @@
/*
- * $Id: io.js,v 1.8.2.10 2011/06/24 11:29:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/location.js b/binsrc/isparql/location.js
index daaed32..575db45 100644
--- a/binsrc/isparql/location.js
+++ b/binsrc/isparql/location.js
@@ -1,9 +1,9 @@
/*
- * $Id: location.js,v 1.1.2.7 2011/03/23 11:56:21 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/main.js b/binsrc/isparql/main.js
index 85bf950..85fb6e2 100644
--- a/binsrc/isparql/main.js
+++ b/binsrc/isparql/main.js
@@ -1,9 +1,9 @@
/*
- * $Id: main.js,v 1.45.2.39 2011/09/08 15:14:18 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
@@ -1307,6 +1307,21 @@ 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;
@@ -1315,10 +1330,8 @@ iSPARQL.ServerConnection = function (uri, authObj) {
if ((!!self.authObj.user) && self.authObj.user != '')
{
OAT.AJAX.PROPFIND ('/DAV/home/' + _user,'',
- function (data, headers) {
- self.connected = true;
- },
- {async:false,
+ self.connectTestCb,
+ {async:true,
user: self.authObj.user,
password: self.authObj.password,
onstart:function() {return},
@@ -1329,19 +1342,6 @@ 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);
- }
}
}
@@ -2124,6 +2124,7 @@ iSPARQL.Common = {
if (p['maxrows']) iSPARQL.Settings.maxrows = parseInt(p['maxrows']);
if (p['timeout']) iSPARQL.Settings.timeout = parseInt(p['timeout']);
if (p['amode']) iSPARQL.Settings.anchorMode = parseInt(p['amode']);
+ if (p['raw_iris']) iSPARQL.Settings.raw_iris = ((p['raw_iris'] == 'true')?true:false);
},
diff --git a/binsrc/isparql/make_vad.sh b/binsrc/isparql/make_vad.sh
index 46e7188..310cf06 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.5 2011/02/03 10:28:23 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -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-2011 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
diff --git a/binsrc/isparql/qbe.js b/binsrc/isparql/qbe.js
index 68ebbbc..b76de5c 100644
--- a/binsrc/isparql/qbe.js
+++ b/binsrc/isparql/qbe.js
@@ -1,9 +1,9 @@
/*
- * $Id: qbe.js,v 1.36.2.14 2011/09/05 15:27:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/remote.vsp b/binsrc/isparql/remote.vsp
index d7479a1..055b0f9 100644
--- a/binsrc/isparql/remote.vsp
+++ b/binsrc/isparql/remote.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: remote.vsp,v 1.3.2.1 2009/06/10 19:49:06 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/isparql/set_dav_props.vsp b/binsrc/isparql/set_dav_props.vsp
index 745e84d..7f5e3cd 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.1 2009/06/10 19:49:06 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/isparql/sql/drop.sql b/binsrc/isparql/sql/drop.sql
index 99f48d8..84d5d54 100644
--- a/binsrc/isparql/sql/drop.sql
+++ b/binsrc/isparql/sql/drop.sql
@@ -1,9 +1,9 @@
--
--- $Id: drop.sql,v 1.5 2009/01/06 22:15:02 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
--
--- Copyright (C) 2009 OpenLink Software
+-- Copyright (C) 2009-2012 OpenLink Software
--
-- See LICENSE file for details.
--
diff --git a/binsrc/isparql/sql/setup.sql b/binsrc/isparql/sql/setup.sql
index ff90ca7..4923e66 100644
--- a/binsrc/isparql/sql/setup.sql
+++ b/binsrc/isparql/sql/setup.sql
@@ -1,9 +1,9 @@
--
--- $Id: setup.sql,v 1.10 2009/01/06 22:15:02 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
--
--- Copyright (C) 2009 OpenLink Software
+-- Copyright (C) 2009-2012 OpenLink Software
--
-- See LICENSE file for details.
--
diff --git a/binsrc/isparql/statusui.js b/binsrc/isparql/statusui.js
index d703b8c..6c41c6b 100644
--- a/binsrc/isparql/statusui.js
+++ b/binsrc/isparql/statusui.js
@@ -1,9 +1,9 @@
/*
- * $Id: statusui.js,v 1.1.2.5 2011/02/03 10:28:23 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/dialog.css b/binsrc/isparql/styles/dialog.css
index 49cc246..3ea8c5b 100644
--- a/binsrc/isparql/styles/dialog.css
+++ b/binsrc/isparql/styles/dialog.css
@@ -1,9 +1,9 @@
/*
- * $Id: dialog.css,v 1.1.2.5 2011/01/25 14:08:45 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/execute.css b/binsrc/isparql/styles/execute.css
index b76bdd4..884e044 100644
--- a/binsrc/isparql/styles/execute.css
+++ b/binsrc/isparql/styles/execute.css
@@ -1,9 +1,9 @@
/*
- * $Id: execute.css,v 1.4.2.13 2011/09/05 15:27:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
@@ -164,7 +164,7 @@ body {
.result_opts_c { background-color: white}
.result_plnk_c { padding-top: 3px;width: 20em; float: left; }
-.anchor_pref_c { width: 30em; float: right;}
+.anchor_pref_c { width: 35em; float: right;}
p.copyright {
font-size: 8pt;
diff --git a/binsrc/isparql/styles/menu.css b/binsrc/isparql/styles/menu.css
index 2c72aad..fe7fa77 100644
--- a/binsrc/isparql/styles/menu.css
+++ b/binsrc/isparql/styles/menu.css
@@ -1,9 +1,9 @@
/*
- * $Id: menu.css,v 1.2.2.4 2011/08/29 10:27:33 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/mobile.css b/binsrc/isparql/styles/mobile.css
index e7d56fa..d19e713 100644
--- a/binsrc/isparql/styles/mobile.css
+++ b/binsrc/isparql/styles/mobile.css
@@ -1,9 +1,9 @@
/*
- * $Id: mobile.css,v 1.1.2.4 2011/02/18 15:40:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/qbe.css b/binsrc/isparql/styles/qbe.css
index c0dfa91..9334b37 100644
--- a/binsrc/isparql/styles/qbe.css
+++ b/binsrc/isparql/styles/qbe.css
@@ -1,9 +1,9 @@
/*
- * $Id: qbe.css,v 1.5.2.3 2009/09/13 21:52:19 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/style.css b/binsrc/isparql/styles/style.css
index 94eaabe..0c9f642 100644
--- a/binsrc/isparql/styles/style.css
+++ b/binsrc/isparql/styles/style.css
@@ -1,9 +1,9 @@
/*
- * $Id: style.css,v 1.7.2.17 2011/08/29 10:27:33 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009 OpenLink Software
+ * Copyright (C) 2009-2012 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/vad_version b/binsrc/isparql/vad_version
index 466388f..18ac30d 100644
--- a/binsrc/isparql/vad_version
+++ b/binsrc/isparql/vad_version
@@ -1 +1 @@
-1.27.69
+1.27.93
diff --git a/binsrc/isparql/xslt/dynamic-page.xsl b/binsrc/isparql/xslt/dynamic-page.xsl
index a3b2309..bb572ea 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.3 2009/10/06 19:25:31 source Exp $
+ $Id$
This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
- Copyright (C) 2009 OpenLink Software
+ Copyright (C) 2009-2012 OpenLink Software
See LICENSE file for details.
diff --git a/binsrc/jena/Makefile.am b/binsrc/jena/Makefile.am
index 82190c8..f298590 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-2010 OpenLink Software
+# 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
@@ -83,7 +83,7 @@ doc:
#
# Run testsuite if WITH_JDK was found
#
-if WITH_JDK3
+if WITH_JDK4
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 92135ec..9289b5d 100644
--- a/binsrc/jena/Makefile.in
+++ b/binsrc/jena/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -325,14 +319,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/jena/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/jena/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/jena/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/jena/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -350,7 +344,6 @@ $(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
@@ -380,17 +373,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -418,7 +407,6 @@ clean-generic:
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"
@@ -437,8 +425,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -447,28 +433,18 @@ install-data-am: install-data-local
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
@@ -532,13 +508,13 @@ doc:
#
# Run testsuite if WITH_JDK was found
#
- 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"
+ 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"
.PHONY: version
version:
@@ -547,7 +523,6 @@ version:
clean-local:
-rm -rf out.driver doc
-rmdir lib
-
# 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/jena/testsuite/start.sh b/binsrc/jena/testsuite/start.sh
index 291bb14..6873c37 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.3 2010/04/01 10:54:36 source Exp $
+# $Id$
#
# Jena tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
diff --git a/binsrc/jena/testsuite/testing/regression/testWriterAndReader/t2000.rdf b/binsrc/jena/testsuite/testing/regression/testWriterAndReader/t2000.rdf
index 43d6f07..afb6bf2 100644
--- a/binsrc/jena/testsuite/testing/regression/testWriterAndReader/t2000.rdf
+++ b/binsrc/jena/testsuite/testing/regression/testWriterAndReader/t2000.rdf
@@ -5,7 +5,7 @@
>
<daml:Ontology rdf:about="">
- <daml:versionInfo>$Revision: 1.1 $</daml:versionInfo>
+ <daml:versionInfo>$Revision$</daml:versionInfo>
<daml:imports rdf:resource="http://www.daml.org/2000/10/daml-ont"/>
</daml:Ontology>
diff --git a/binsrc/jena/testsuite/testing/regression/testWriterAndReader/t3000.rdf b/binsrc/jena/testsuite/testing/regression/testWriterAndReader/t3000.rdf
index dc4e656..9af8144 100644
--- a/binsrc/jena/testsuite/testing/regression/testWriterAndReader/t3000.rdf
+++ b/binsrc/jena/testsuite/testing/regression/testWriterAndReader/t3000.rdf
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.1 $ of $Date: 2008/06/27 14:06:53 $ -->
+<!-- $Revision$ of $Date$ -->
<rdf:RDF
xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -11,7 +11,7 @@
>
<daml:Ontology rdf:about="">
- <daml:versionInfo>$Id: t3000.rdf,v 1.1 2008/06/27 14:06:53 source Exp $</daml:versionInfo>
+ <daml:versionInfo>$Id$</daml:versionInfo>
<rdfs:comment>
An example ontology, with data types taken from XML Schema
</rdfs:comment>
diff --git a/binsrc/jena/virtuoso_driver/Version.java b/binsrc/jena/virtuoso_driver/Version.java
index c46acd0..5aff88d 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.6 2011/05/17 13:56:30 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -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.5";
+ protected static final String build_id = "1.6";
public static void main(String args[])
{
diff --git a/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java b/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java
index 4a2bfae..76246d9 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.3 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtDataSource.java b/binsrc/jena/virtuoso_driver/VirtDataSource.java
index 618c5f8..8694cc4 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.7 2011/05/17 13:56:30 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtGraph.java b/binsrc/jena/virtuoso_driver/VirtGraph.java
index 72e25dd..ce825e2 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.16 2011/05/17 13:56:30 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -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 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 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 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 8559b8c..5d99841 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.3 2010/04/06 14:35:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtModel.java b/binsrc/jena/virtuoso_driver/VirtModel.java
index c71b851..df42587 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.5 2010/06/28 10:30:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java b/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java
index 3834f22..ec251d8 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.2 2011/05/17 13:56:30 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtResSetIter.java b/binsrc/jena/virtuoso_driver/VirtResSetIter.java
index 640219e..4a8bb0f 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.2 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java b/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java
index c54390d..6bec482 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.2 2011/03/23 11:58:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java b/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java
index eebcdbd..0a0baca 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.7 2011/05/17 13:56:30 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -144,19 +144,8 @@ 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 818ea34..38c373d 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.9 2011/05/17 13:56:31 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -276,19 +276,8 @@ 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 9b8dd50..4f2b22f 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.3 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java
index ef1e4ce..1a59d07 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.2 2010/06/01 14:12:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java
index e951d80..b9de4b3 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.4 2010/06/01 14:12:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java
index ebe7d21..2732139 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.3 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java
index b0af097..399294e 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.3 2010/04/06 14:35:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java
index efa9416..83733cb 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.2 2010/04/06 14:35:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2008 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java
index 920440c..9845471 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.1 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java
index abab9c0..37f0cde 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.2 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java
index 615d080..c858e90 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.1 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java
index c475ea4..761b854 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.1 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java
index 7366d95..bef5fdf 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.1 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java
index 7eaec01..7c9b264 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.1 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java
index b7d114e..89507f3 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.2 2010/06/01 14:12:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java
index 795af9e..56ef035 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.2 2010/06/01 14:12:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java b/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java
index 4c3654e..145f597 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.1 2010/04/01 10:54:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java b/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java
index d8bef05..437f10c 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.4 2011/05/17 13:56:31 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -65,7 +65,7 @@ public class VirtuosoUpdateRequest
for ( Iterator iter = requests.iterator() ; iter.hasNext(); )
{
- String query = "sparql\n define output:format '_JAVA_'\n "+ (String)iter.next();
+ String query = "sparql\n "+ (String)iter.next();
stmt.execute(query);
}
diff --git a/binsrc/maildrop/Makefile.am b/binsrc/maildrop/Makefile.am
index 1008e3f..3c6173b 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-2010 OpenLink Software
+# 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
diff --git a/binsrc/maildrop/Makefile.in b/binsrc/maildrop/Makefile.in
index c1e3d2b..a62659d 100644
--- a/binsrc/maildrop/Makefile.in
+++ b/binsrc/maildrop/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -73,9 +71,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
@WITH_IODBC_TRUE at am__EXEEXT_1 = odbc_mail$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_odbc_mail_OBJECTS = odbc_mail-odbc_mail.$(OBJEXT) \
odbc_mail-odbc_mail_vers.$(OBJEXT)
@@ -98,10 +96,9 @@ virt_mail_DEPENDENCIES = $(top_srcdir)/libsrc/util/libutil.la \
virt_mail_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(virt_mail_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -204,7 +201,6 @@ 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@
@@ -288,7 +284,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -309,7 +304,6 @@ 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@
@@ -387,14 +381,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/maildrop/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/maildrop/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/maildrop/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/maildrop/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -412,50 +406,34 @@ $(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):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
odbc_mail$(EXEEXT): $(odbc_mail_OBJECTS) $(odbc_mail_DEPENDENCIES)
@rm -f odbc_mail$(EXEEXT)
$(odbc_mail_LINK) $(odbc_mail_OBJECTS) $(odbc_mail_LDADD) $(LIBS)
@@ -476,77 +454,77 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
odbc_mail-odbc_mail.o: odbc_mail.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(odbc_mail_CFLAGS) $(CFLAGS) -MT odbc_mail-odbc_mail.o -MD -MP -MF $(DEPDIR)/odbc_mail-odbc_mail.Tpo -c -o odbc_mail-odbc_mail.o `test -f 'odbc_mail.c' || echo '$(srcdir)/'`odbc_mail.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/odbc_mail-odbc_mail.Tpo $(DEPDIR)/odbc_mail-odbc_mail.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/odbc_mail-odbc_mail.Tpo $(DEPDIR)/odbc_mail-odbc_mail.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='odbc_mail.c' object='odbc_mail-odbc_mail.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(odbc_mail_CFLAGS) $(CFLAGS) -c -o odbc_mail-odbc_mail.o `test -f 'odbc_mail.c' || echo '$(srcdir)/'`odbc_mail.c
odbc_mail-odbc_mail.obj: odbc_mail.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(odbc_mail_CFLAGS) $(CFLAGS) -MT odbc_mail-odbc_mail.obj -MD -MP -MF $(DEPDIR)/odbc_mail-odbc_mail.Tpo -c -o odbc_mail-odbc_mail.obj `if test -f 'odbc_mail.c'; then $(CYGPATH_W) 'odbc_mail.c'; else $(CYGPATH_W) '$(srcdir)/odbc_mail.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/odbc_mail-odbc_mail.Tpo $(DEPDIR)/odbc_mail-odbc_mail.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/odbc_mail-odbc_mail.Tpo $(DEPDIR)/odbc_mail-odbc_mail.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='odbc_mail.c' object='odbc_mail-odbc_mail.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(odbc_mail_CFLAGS) $(CFLAGS) -c -o odbc_mail-odbc_mail.obj `if test -f 'odbc_mail.c'; then $(CYGPATH_W) 'odbc_mail.c'; else $(CYGPATH_W) '$(srcdir)/odbc_mail.c'; fi`
odbc_mail-odbc_mail_vers.o: odbc_mail_vers.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(odbc_mail_CFLAGS) $(CFLAGS) -MT odbc_mail-odbc_mail_vers.o -MD -MP -MF $(DEPDIR)/odbc_mail-odbc_mail_vers.Tpo -c -o odbc_mail-odbc_mail_vers.o `test -f 'odbc_mail_vers.c' || echo '$(srcdir)/'`odbc_mail_vers.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/odbc_mail-odbc_mail_vers.Tpo $(DEPDIR)/odbc_mail-odbc_mail_vers.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/odbc_mail-odbc_mail_vers.Tpo $(DEPDIR)/odbc_mail-odbc_mail_vers.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='odbc_mail_vers.c' object='odbc_mail-odbc_mail_vers.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(odbc_mail_CFLAGS) $(CFLAGS) -c -o odbc_mail-odbc_mail_vers.o `test -f 'odbc_mail_vers.c' || echo '$(srcdir)/'`odbc_mail_vers.c
odbc_mail-odbc_mail_vers.obj: odbc_mail_vers.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(odbc_mail_CFLAGS) $(CFLAGS) -MT odbc_mail-odbc_mail_vers.obj -MD -MP -MF $(DEPDIR)/odbc_mail-odbc_mail_vers.Tpo -c -o odbc_mail-odbc_mail_vers.obj `if test -f 'odbc_mail_vers.c'; then $(CYGPATH_W) 'odbc_mail_vers.c'; else $(CYGPATH_W) '$(srcdir)/odbc_mail_vers.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/odbc_mail-odbc_mail_vers.Tpo $(DEPDIR)/odbc_mail-odbc_mail_vers.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/odbc_mail-odbc_mail_vers.Tpo $(DEPDIR)/odbc_mail-odbc_mail_vers.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='odbc_mail_vers.c' object='odbc_mail-odbc_mail_vers.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(odbc_mail_CFLAGS) $(CFLAGS) -c -o odbc_mail-odbc_mail_vers.obj `if test -f 'odbc_mail_vers.c'; then $(CYGPATH_W) 'odbc_mail_vers.c'; else $(CYGPATH_W) '$(srcdir)/odbc_mail_vers.c'; fi`
virt_mail-odbc_mail.o: odbc_mail.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_mail_CFLAGS) $(CFLAGS) -MT virt_mail-odbc_mail.o -MD -MP -MF $(DEPDIR)/virt_mail-odbc_mail.Tpo -c -o virt_mail-odbc_mail.o `test -f 'odbc_mail.c' || echo '$(srcdir)/'`odbc_mail.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virt_mail-odbc_mail.Tpo $(DEPDIR)/virt_mail-odbc_mail.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virt_mail-odbc_mail.Tpo $(DEPDIR)/virt_mail-odbc_mail.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='odbc_mail.c' object='virt_mail-odbc_mail.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_mail_CFLAGS) $(CFLAGS) -c -o virt_mail-odbc_mail.o `test -f 'odbc_mail.c' || echo '$(srcdir)/'`odbc_mail.c
virt_mail-odbc_mail.obj: odbc_mail.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_mail_CFLAGS) $(CFLAGS) -MT virt_mail-odbc_mail.obj -MD -MP -MF $(DEPDIR)/virt_mail-odbc_mail.Tpo -c -o virt_mail-odbc_mail.obj `if test -f 'odbc_mail.c'; then $(CYGPATH_W) 'odbc_mail.c'; else $(CYGPATH_W) '$(srcdir)/odbc_mail.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virt_mail-odbc_mail.Tpo $(DEPDIR)/virt_mail-odbc_mail.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virt_mail-odbc_mail.Tpo $(DEPDIR)/virt_mail-odbc_mail.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='odbc_mail.c' object='virt_mail-odbc_mail.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_mail_CFLAGS) $(CFLAGS) -c -o virt_mail-odbc_mail.obj `if test -f 'odbc_mail.c'; then $(CYGPATH_W) 'odbc_mail.c'; else $(CYGPATH_W) '$(srcdir)/odbc_mail.c'; fi`
virt_mail-virt_mail_vers.o: virt_mail_vers.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_mail_CFLAGS) $(CFLAGS) -MT virt_mail-virt_mail_vers.o -MD -MP -MF $(DEPDIR)/virt_mail-virt_mail_vers.Tpo -c -o virt_mail-virt_mail_vers.o `test -f 'virt_mail_vers.c' || echo '$(srcdir)/'`virt_mail_vers.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virt_mail-virt_mail_vers.Tpo $(DEPDIR)/virt_mail-virt_mail_vers.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virt_mail-virt_mail_vers.Tpo $(DEPDIR)/virt_mail-virt_mail_vers.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_mail_vers.c' object='virt_mail-virt_mail_vers.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_mail_CFLAGS) $(CFLAGS) -c -o virt_mail-virt_mail_vers.o `test -f 'virt_mail_vers.c' || echo '$(srcdir)/'`virt_mail_vers.c
virt_mail-virt_mail_vers.obj: virt_mail_vers.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_mail_CFLAGS) $(CFLAGS) -MT virt_mail-virt_mail_vers.obj -MD -MP -MF $(DEPDIR)/virt_mail-virt_mail_vers.Tpo -c -o virt_mail-virt_mail_vers.obj `if test -f 'virt_mail_vers.c'; then $(CYGPATH_W) 'virt_mail_vers.c'; else $(CYGPATH_W) '$(srcdir)/virt_mail_vers.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virt_mail-virt_mail_vers.Tpo $(DEPDIR)/virt_mail-virt_mail_vers.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virt_mail-virt_mail_vers.Tpo $(DEPDIR)/virt_mail-virt_mail_vers.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_mail_vers.c' object='virt_mail-virt_mail_vers.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_mail_CFLAGS) $(CFLAGS) -c -o virt_mail-virt_mail_vers.obj `if test -f 'virt_mail_vers.c'; then $(CYGPATH_W) 'virt_mail_vers.c'; else $(CYGPATH_W) '$(srcdir)/virt_mail_vers.c'; fi`
@@ -562,49 +540,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -625,17 +599,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -669,7 +639,6 @@ clean-generic:
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"
@@ -691,8 +660,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -701,28 +668,18 @@ install-data-am:
install-dvi: install-dvi-am
-install-dvi-am:
-
install-exec-am: install-binPROGRAMS
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
@@ -745,7 +702,7 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool ctags distclean distclean-compile \
@@ -769,7 +726,6 @@ virt_mail_vers.c: $(LIBDEPS) $(MAKEVER)
odbc_mail_vers.c: $(LIBDEPS) $(MAKEVER)
$(MAKEVER) -o odbc_mail_vers.c \
-p "OpenLink ODBC Mail Interface" -v 2.01 -P"Release $(VERMAJ)" -B$(VERBMAJ)$(VERBMIN)
-
# 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/maildrop/dkstub.c b/binsrc/maildrop/dkstub.c
index 2f5786c..01d4267 100644
--- a/binsrc/maildrop/dkstub.c
+++ b/binsrc/maildrop/dkstub.c
@@ -1,10 +1,10 @@
/*
- * $Id: dkstub.c,v 1.1.1.1.2.1 2010/01/25 23:41:20 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/maildrop/odbc_mail.c b/binsrc/maildrop/odbc_mail.c
index ac46f0f..0af3d38 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.1 2010/01/25 23:41:20 source Exp $
+ * $Id$
*
* ODBC Mail Dropper
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/maildrop/odbc_mail.default.ini b/binsrc/maildrop/odbc_mail.default.ini
index 7b64086..93fab27 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-2010 OpenLink Software
+; 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
diff --git a/binsrc/maildrop/odbc_mail_vers.c b/binsrc/maildrop/odbc_mail_vers.c
index eff2eb6..f0fcef7 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 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";
+Version 2.01 as of Wed Aug 1 18:07:31 CEST 2012.\n\
+Compiled for Darwin 11.4.0\n\
+Copyright (C) 1998-2012 OpenLink Software.\n";
diff --git a/binsrc/maildrop/virt_mail_vers.c b/binsrc/maildrop/virt_mail_vers.c
index 33143ec..11c6ec2 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 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";
+Version 2.01 as of Wed Aug 1 18:07:31 CEST 2012.\n\
+Compiled for Darwin 11.4.0\n\
+Copyright (C) 1998-2012 OpenLink Software.\n";
diff --git a/binsrc/maildrop/win32/OpenX/Dialogs.ifs b/binsrc/maildrop/win32/OpenX/Dialogs.ifs
index 342505a..9eee7d2 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.1 2010/01/25 23:41:20 source Exp $
+ * $Id$
*
* Setup functions for extended Inno Setup
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/maildrop/win32/OpenX/maildrop.iss b/binsrc/maildrop/win32/OpenX/maildrop.iss
index 691b3e3..a38251f 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=© 2002 OpenLink Software
+AppCopyright=© 1998-2012 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 60eb6b6..78bc2d9 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-2010 OpenLink Software
+; 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
diff --git a/binsrc/maildrop/win32/generate.bat b/binsrc/maildrop/win32/generate.bat
index 8457e17..6e45226 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-2010 OpenLink Software
+rem Copyright (C) 1998-2012 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 4318d4c..8d6dea0 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.1 2010/01/25 23:41:20 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/maildrop/win32/maildrop.idl b/binsrc/maildrop/win32/maildrop.idl
index f145ba2..ca3ed1e 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-2010 OpenLink Software
+// 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
diff --git a/binsrc/maildrop/win32/mpl.c b/binsrc/maildrop/win32/mpl.c
index f9abe74..c8afa45 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-2010 OpenLink Software
+ * 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
diff --git a/binsrc/maildrop/win32/register.bat b/binsrc/maildrop/win32/register.bat
index 66c8463..c590adf 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-2010 OpenLink Software
+rem Copyright (C) 1998-2012 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 837cc4c..cb4f6af 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/mono/Makefile.in b/binsrc/mono/Makefile.in
index 8ae7d52..ad0cd1e 100644
--- a/binsrc/mono/Makefile.in
+++ b/binsrc/mono/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -286,14 +280,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/mono/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/mono/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/mono/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/mono/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -311,7 +305,6 @@ $(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
@@ -341,17 +334,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -379,7 +368,6 @@ clean-generic:
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"
@@ -398,8 +386,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -408,28 +394,18 @@ install-data-am:
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
@@ -468,7 +444,6 @@ uninstall-am:
@HAVE_MONO_TRUE at all:
@HAVE_MONO_TRUE@ @echo "./mono-build.sh $(top_srcdir)/mono"
@HAVE_MONO_TRUE@ @TOP="$(TOP)" ./mono-build.sh $(top_srcdir)/mono
-
# 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/mono/mono-build.sh b/binsrc/mono/mono-build.sh
index 5797dd9..3c10c24 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/oat/LICENSE b/binsrc/oat/LICENSE
index 057f441..5529698 100644
--- a/binsrc/oat/LICENSE
+++ b/binsrc/oat/LICENSE
@@ -1,5 +1,5 @@
OpenLink Software's Ajax Toolkit (OAT)
-Copyright (C) 2005-2009 OpenLink Software
+Copyright (C) 2005-2012 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 44611d5..aff0b29 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 by OpenLink Software
+# Copyright (C) 2006-2012 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 a8ece80..4cad7d0 100644
--- a/binsrc/oat/Makefile.in
+++ b/binsrc/oat/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Ajax Toolkit (OAT) project
#
# Copyright (C) 2006 by Ondrej Zara
-# Copyright (C) 2006 by OpenLink Software
+# Copyright (C) 2006-2012 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
@@ -36,9 +35,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -68,7 +66,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -159,7 +156,6 @@ 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@
@@ -243,7 +239,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -264,7 +259,6 @@ 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@
@@ -286,14 +280,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/oat/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/oat/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/oat/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/oat/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -311,7 +305,6 @@ $(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
@@ -341,17 +334,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -379,7 +368,6 @@ clean-generic:
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"
@@ -398,8 +386,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -408,28 +394,18 @@ install-data-am:
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
@@ -463,7 +439,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/oat/styles/grid.css b/binsrc/oat/styles/grid.css
index 1af4dc6..605c9b8 100644
--- a/binsrc/oat/styles/grid.css
+++ b/binsrc/oat/styles/grid.css
@@ -1,9 +1,9 @@
/*
- * $Id: grid.css,v 1.4.2.2 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/styles/pivot.css b/binsrc/oat/styles/pivot.css
index fae3340..10a4395 100644
--- a/binsrc/oat/styles/pivot.css
+++ b/binsrc/oat/styles/pivot.css
@@ -1,9 +1,9 @@
/*
- * $Id: pivot.css,v 1.3.2.1 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/styles/rdftabs.css b/binsrc/oat/styles/rdftabs.css
index 2e82bf1..b184264 100644
--- a/binsrc/oat/styles/rdftabs.css
+++ b/binsrc/oat/styles/rdftabs.css
@@ -1,9 +1,9 @@
/*
- * $Id: rdftabs.css,v 1.6.2.6 2011/08/21 12:50:21 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/styles/timeline.css b/binsrc/oat/styles/timeline.css
index e273865..368fc2a 100644
--- a/binsrc/oat/styles/timeline.css
+++ b/binsrc/oat/styles/timeline.css
@@ -1,9 +1,9 @@
/*
- * $Id: timeline.css,v 1.4.2.1 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/styles/webdav.css b/binsrc/oat/styles/webdav.css
index 787c5c8..3e8b0df 100644
--- a/binsrc/oat/styles/webdav.css
+++ b/binsrc/oat/styles/webdav.css
@@ -1,9 +1,9 @@
/*
- * $Id: webdav.css,v 1.3.2.1 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/OpenLayers.js b/binsrc/oat/toolkit/OpenLayers.js
index 063dab8..951afde 100644
--- a/binsrc/oat/toolkit/OpenLayers.js
+++ b/binsrc/oat/toolkit/OpenLayers.js
@@ -2,83 +2,136 @@
OpenLayers.js -- OpenLayers Map Viewer Library
- Copyright 2005-2008 MetaCarta, Inc., released under the Clear BSD license.
- Please see http://svn.openlayers.org/trunk/openlayers/license.txt
- for the full text of the license.
+ Copyright (c) 2006-2012 by OpenLayers Contributors
+ Published under the 2-clause BSD license.
+ See http://openlayers.org/dev/license.txt for the full text of the license, and http://openlayers.org/dev/authors.txt for full list of contributors.
Includes compressed code under the following licenses:
- (For uncompressed versions of the code used please see the
- OpenLayers SVN repository: <http://openlayers.org/>)
+ (For uncompressed versions of the code used, please see the
+ OpenLayers Github repository: <https://github.com/openlayers/openlayers>)
*/
-/* Contains portions of Prototype.js:
- *
- * Prototype JavaScript framework, version 1.4.0
- * (c) 2005 Sam Stephenson <sam at conio.net>
- *
- * Prototype is freely distributable under the terms of an MIT-style license.
- * For details, see the Prototype web site: http://prototype.conio.net/
+/**
+ * Contains XMLHttpRequest.js <http://code.google.com/p/xmlhttprequest/>
+ * Copyright 2007 Sergey Ilinsky (http://www.ilinsky.com)
*
- *--------------------------------------------------------------------------*/
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
/**
+ * OpenLayers.Util.pagePosition is based on Yahoo's getXY method, which is
+ * Copyright (c) 2006, Yahoo! Inc.
+ * All rights reserved.
*
-* Contains portions of Rico <http://openrico.org/>
-*
-* Copyright 2005 Sabre Airline Solutions
+ * Redistribution and use of this software in source and binary forms, with or
+ * without modification, are permitted provided that the following conditions
+ * are met:
*
-* Licensed under the Apache License, Version 2.0 (the "License"); you
-* may not use this file except in compliance with the License. You
-* may obtain a copy of the License at
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
*
-* http://www.apache.org/licenses/LICENSE-2.0
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* permissions and limitations under the License.
+ * * Neither the name of Yahoo! Inc. nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without
+ * specific prior written permission of Yahoo! Inc.
*
-**/
-
-var OpenLayers={singleFile:true};(function(){var singleFile=(typeof OpenLayers=="object"&&OpenLayers.singleFile);window.OpenLayers={_scriptName:(!singleFile)?"lib/OpenLayers.js":"OpenLayers.js",_getScriptLocation:function(){var scriptLocation="";var scriptName=OpenLayers._scriptName;var scripts=document.getElementsByTagName('script');for(var i=0;i<scripts.length;i++){var src=scripts[i].getAttribute('src');if(src){var index=src.lastIndexOf(scriptName);var pathLength=src.lastIndexOf('?');if(pathLength<0){pathLength=src.length;}
-if((index>-1)&&(index+scriptName.length==pathLength)){scriptLocation=src.slice(0,pathLength-scriptName.length);break;}}}
-return scriptLocation;}};if(!singleFile){var jsfiles=new Array("OpenLayers/Util.js","OpenLayers/BaseTypes.js","OpenLayers/BaseTypes/Class.js","OpenLayers/BaseTypes/Bounds.js","OpenLayers/BaseTypes/Element.js","OpenLayers/BaseTypes/LonLat.js","OpenLayers/BaseTypes/Pixel.js","OpenLayers/BaseTypes/Size.js","OpenLayers/Console.js","OpenLayers/Tween.js","Rico/Corner.js","Rico/Color.js","OpenLayers/Ajax.js","OpenLayers/Events.js","OpenLayers/Projection.js","OpenLayers/Map.js","OpenLayers/Layer.js","OpenLayers/Icon.js","OpenLayers/Marker.js","OpenLayers/Marker/Box.js","OpenLayers/Popup.js","OpenLayers/Tile.js","OpenLayers/Tile/Image.js","OpenLayers/Tile/WFS.js","OpenLayers/Layer/Image.js","OpenLayers/Layer/SphericalMercator.js","OpenLayers/Layer/EventPane.js","OpenLayers/Layer/FixedZoomLevels.js","OpenLayers/Layer/Google.js","OpenLayers/Layer/VirtualEarth.js","OpenLayers/Layer/Yahoo.js","OpenLayers/Layer/HTTPRequest.js","OpenLayers/Layer/Grid.js","OpenLayers/Layer/MapGuide.js","OpenLayers/Layer/MapServer.js","OpenLayers/Layer/MapServer/Untiled.js","OpenLayers/Layer/KaMap.js","OpenLayers/Layer/MultiMap.js","OpenLayers/Layer/Markers.js","OpenLayers/Layer/Text.js","OpenLayers/Layer/WorldWind.js","OpenLayers/Layer/WMS.js","OpenLayers/Layer/WMS/Untiled.js","OpenLayers/Layer/GeoRSS.js","OpenLayers/Layer/Boxes.js","OpenLayers/Layer/TMS.js","OpenLayers/Layer/TileCache.js","OpenLayers/Popup/Anchored.js","OpenLayers/Popup/AnchoredBubble.js","OpenLayers/Popup/Framed.js","OpenLayers/Popup/FramedCloud.js","OpenLayers/Feature.js","OpenLayers/Feature/Vector.js","OpenLayers/Feature/WFS.js","OpenLayers/Handler.js","OpenLayers/Handler/Click.js","OpenLayers/Handler/Hover.js","OpenLayers/Handler/Point.js","OpenLayers/Handler/Path.js","OpenLayers/Handler/Polygon.js","OpenLayers/Handler/Feature.js","OpenLayers/Handler/Drag.js","OpenLayers/Handler/RegularPolygon.js","OpenLayers/Handler/Box.js","OpenLayers/Handler/MouseWheel.js","OpenLayers/Handler/Keyboard.js","OpenLayers/Control.js","OpenLayers/Control/Attribution.js","OpenLayers/Control/Button.js","OpenLayers/Control/ZoomBox.js","OpenLayers/Control/ZoomToMaxExtent.js","OpenLayers/Control/DragPan.js","OpenLayers/Control/Navigation.js","OpenLayers/Control/MouseDefaults.js","OpenLayers/Control/MousePosition.js","OpenLayers/Control/OverviewMap.js","OpenLayers/Control/KeyboardDefaults.js","OpenLayers/Control/PanZoom.js","OpenLayers/Control/PanZoomBar.js","OpenLayers/Control/ArgParser.js","OpenLayers/Control/Permalink.js","OpenLayers/Control/Scale.js","OpenLayers/Control/ScaleLine.js","OpenLayers/Control/LayerSwitcher.js","OpenLayers/Control/DrawFeature.js","OpenLayers/Control/DragFeature.js","OpenLayers/Control/ModifyFeature.js","OpenLayers/Control/Panel.js","OpenLayers/Control/SelectFeature.js","OpenLayers/Control/NavigationHistory.js","OpenLayers/Geometry.js","OpenLayers/Geometry/Rectangle.js","OpenLayers/Geometry/Collection.js","OpenLayers/Geometry/Point.js","OpenLayers/Geometry/MultiPoint.js","OpenLayers/Geometry/Curve.js","OpenLayers/Geometry/LineString.js","OpenLayers/Geometry/LinearRing.js","OpenLayers/Geometry/Polygon.js","OpenLayers/Geometry/MultiLineString.js","OpenLayers/Geometry/MultiPolygon.js","OpenLayers/Geometry/Surface.js","OpenLayers/Renderer.js","OpenLayers/Renderer/Elements.js","OpenLayers/Renderer/SVG.js","OpenLayers/Renderer/VML.js","OpenLayers/Layer/Vector.js","OpenLayers/Layer/PointTrack.js","OpenLayers/Layer/GML.js","OpenLayers/Style.js","OpenLayers/StyleMap.js","OpenLayers/Rule.js","OpenLayers/Filter.js","OpenLayers/Filter/FeatureId.js","OpenLayers/Filter/Logical.js","OpenLayers/Filter/Comparison.js","OpenLayers/Format.js","OpenLayers/Format/XML.js","OpenLayers/Format/GML.js","OpenLayers/Format/KML.js","OpenLayers/Format/GeoRSS.js","OpenLayers/Format/WFS.js","OpenLayers/Format/WKT.js","OpenLayers/Format/OSM.js","OpenLayers/Format/SLD.js","OpenLayers/Format/SLD/v1.js","OpenLayers/Format/SLD/v1_0_0.js","OpenLayers/Format/Text.js","OpenLayers/Format/JSON.js","OpenLayers/Format/GeoJSON.js","OpenLayers/Format/WMC.js","OpenLayers/Format/WMC/v1.js","OpenLayers/Format/WMC/v1_0_0.js","OpenLayers/Format/WMC/v1_1_0.js","OpenLayers/Layer/WFS.js","OpenLayers/Control/MouseToolbar.js","OpenLayers/Control/NavToolbar.js","OpenLayers/Control/EditingToolbar.js","OpenLayers/Lang.js","OpenLayers/Lang/en.js");var agent=navigator.userAgent;var docWrite=(agent.match("MSIE")||agent.match("Safari"));if(docWrite){var allScriptTags=new Array(jsfiles.length);}
-var host=OpenLayers._getScriptLocation()+"lib/";for(var i=0;i<jsfiles.length;i++){if(docWrite){allScriptTags[i]="<script src='"+host+jsfiles[i]+"'></script>";}else{var s=document.createElement("script");s.src=host+jsfiles[i];var h=document.getElementsByTagName("head").length?document.getElementsByTagName("head")[0]:document.body;h.appendChild(s);}}
-if(docWrite){document.write(allScriptTags.join(""));}}})();OpenLayers.VERSION_NUMBER="$Revision: 1.5.2.2 $";OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s*(.*?)\s*$/,"$1");},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1;i<oStringList.length;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);}
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+var OpenLayers={VERSION_NUMBER:"Release 2.12-rc2",singleFile:true,_getScriptLocation:(function(){var r=new RegExp("(^|(.*?\\/))(OpenLayers[^\\/]*?\\.js)(\\?|$)"),s=document.getElementsByTagName('script'),src,m,l="";for(var i=0,len=s.length;i<len;i++){src=s[i].getAttribute('src');if(src){m=src.match(r);if(m){l=m[1];break;}}}
+return(function(){return l;});})(),ImgPath:''};OpenLayers.Class=function(){var len=arguments.length;var P=arguments[0];var F=arguments[len-1];var C=typeof F.initialize=="function"?F.initialize:function(){P.prototype.initialize.apply(this,arguments);};if(len>1){var newArgs=[C,P].concat(Array.prototype.slice.call(arguments).slice(1,len-1),F);OpenLayers.inherit.apply(null,newArgs);}else{C.prototype=F;}
+return C;};OpenLayers.inherit=function(C,P){var F=function(){};F.prototype=P.prototype;C.prototype=new F;var i,l,o;for(i=2,l=arguments.length;i<l;i++){o=arguments[i];if(typeof o==="function"){o=o.prototype;}
+OpenLayers.Util.extend(C.prototype,o);}};OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.extend=function(destination,source){destination=destination||{};if(source){for(var property in source){var value=source[property];if(value!==undefined){destination[property]=value;}}
+var sourceIsEvt=typeof window.Event=="function"&&source instanceof window.Event;if(!sourceIsEvt&&source.hasOwnProperty&&source.hasOwnProperty("toString")){destination.toString=source.toString;}}
+return destination;};OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s\s*/,'').replace(/\s\s*$/,'');},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1,len=oStringList.length;i<len;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);}
return camelizedString;},format:function(template,context,args){if(!context){context=window;}
-var tokens=template.split("${");var item,last,replacement;for(var i=1;i<tokens.length;i++){item=tokens[i];last=item.indexOf("}");if(last>0){replacement=context[item.substring(0,last)];if(typeof replacement=="function"){replacement=args?replacement.apply(null,args):replacement();}
-tokens[i]=replacement+item.substring(++last);}else{tokens[i]="${"+item;}}
-return tokens.join("");}};if(!String.prototype.startsWith){String.prototype.startsWith=function(sStart){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.startsWith'}));return OpenLayers.String.startsWith(this,sStart);};}
-if(!String.prototype.contains){String.prototype.contains=function(str){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.contains'}));return OpenLayers.String.contains(this,str);};}
-if(!String.prototype.trim){String.prototype.trim=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.trim'}));return OpenLayers.String.trim(this);};}
-if(!String.prototype.camelize){String.prototype.camelize=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.camelize'}));return OpenLayers.String.camelize(this);};}
-OpenLayers.Number={decimalSeparator:".",thousandsSeparator:",",limitSigDigs:function(num,sig){var fig=0;if(sig>0){fig=parseFloat(num.toPrecision(sig));}
+var replacer=function(str,match){var replacement;var subs=match.split(/\.+/);for(var i=0;i<subs.length;i++){if(i==0){replacement=context;}
+replacement=replacement[subs[i]];}
+if(typeof replacement=="function"){replacement=args?replacement.apply(null,args):replacement();}
+if(typeof replacement=='undefined'){return'undefined';}else{return replacement;}};return template.replace(OpenLayers.String.tokenRegEx,replacer);},tokenRegEx:/\$\{([\w.]+?)\}/g,numberRegEx:/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/,isNumeric:function(value){return OpenLayers.String.numberRegEx.test(value);},numericIf:function(value,trimWhitespace){var originalValue=value;if(trimWhitespace===true&&value!=null&&value.replace){value=value.replace(/^\s*|\s*$/g,"");}
+return OpenLayers.String.isNumeric(value)?parseFloat(value):originalValue;}};OpenLayers.Number={decimalSeparator:".",thousandsSeparator:",",limitSigDigs:function(num,sig){var fig=0;if(sig>0){fig=parseFloat(num.toPrecision(sig));}
return fig;},format:function(num,dec,tsep,dsep){dec=(typeof dec!="undefined")?dec:0;tsep=(typeof tsep!="undefined")?tsep:OpenLayers.Number.thousandsSeparator;dsep=(typeof dsep!="undefined")?dsep:OpenLayers.Number.decimalSeparator;if(dec!=null){num=parseFloat(num.toFixed(dec));}
var parts=num.toString().split(".");if(parts.length==1&&dec==null){dec=0;}
var integer=parts[0];if(tsep){var thousands=/(-?[0-9]+)([0-9]{3})/;while(thousands.test(integer)){integer=integer.replace(thousands,"$1"+tsep+"$2");}}
var str;if(dec==0){str=integer;}else{var rem=parts.length>1?parts[1]:"0";if(dec!=null){rem=rem+new Array(dec-rem.length+1).join("0");}
str=integer+dsep+rem;}
-return str;}};if(!Number.prototype.limitSigDigs){Number.prototype.limitSigDigs=function(sig){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.limitSigDigs'}));return OpenLayers.Number.limitSigDigs(this,sig);};}
-OpenLayers.Function={bind:function(func,object){var args=Array.prototype.slice.apply(arguments,[2]);return function(){var newArgs=args.concat(Array.prototype.slice.apply(arguments,[0]));return func.apply(object,newArgs);};},bindAsEventListener:function(func,object){return function(event){return func.call(object,event||window.event);};}};if(!Function.prototype.bind){Function.prototype.bind=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.bind'}));Array.prototype.unshift.apply(arguments,[this]);return OpenLayers.Function.bind.apply(null,arguments);};}
-if(!Function.prototype.bindAsEventListener){Function.prototype.bindAsEventListener=function(object){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.bindAsEventListener'}));return OpenLayers.Function.bindAsEventListener(this,object);};}
-OpenLayers.Array={filter:function(array,callback,caller){var selected=[];if(Array.prototype.filter){selected=array.filter(callback,caller);}else{var len=array.length;if(typeof callback!="function"){throw new TypeError();}
+return str;}};OpenLayers.Function={bind:function(func,object){var args=Array.prototype.slice.apply(arguments,[2]);return function(){var newArgs=args.concat(Array.prototype.slice.apply(arguments,[0]));return func.apply(object,newArgs);};},bindAsEventListener:function(func,object){return function(event){return func.call(object,event||window.event);};},False:function(){return false;},True:function(){return true;},Void:function(){}};OpenLayers.Array={filter:function(array,callback,caller){var selected=[];if(Array.prototype.filter){selected=array.filter(callback,caller);}else{var len=array.length;if(typeof callback!="function"){throw new TypeError();}
for(var i=0;i<len;i++){if(i in array){var val=array[i];if(callback.call(caller,val,i,array)){selected.push(val);}}}}
-return selected;}};OpenLayers.Class=function(){var Class=function(){if(arguments&&arguments[0]!=OpenLayers.Class.isPrototype){this.initialize.apply(this,arguments);}};var extended={};var parent;for(var i=0;i<arguments.length;++i){if(typeof arguments[i]=="function"){parent=arguments[i].prototype;}else{parent=arguments[i];}
-OpenLayers.Util.extend(extended,parent);}
-Class.prototype=extended;return Class;};OpenLayers.Class.isPrototype=function(){};OpenLayers.Class.create=function(){return function(){if(arguments&&arguments[0]!=OpenLayers.Class.isPrototype){this.initialize.apply(this,arguments);}};};OpenLayers.Class.inherit=function(){var superClass=arguments[0];var proto=new superClass(OpenLayers.Class.isPrototype);for(var i=1;i<arguments.length;i++){if(typeof arguments[i]=="function"){var mixin=arguments[i];arguments[i]=new mixin(OpenLayers.Class.isPrototype);}
-OpenLayers.Util.extend(proto,arguments[i]);}
-return proto;};OpenLayers.Util={};OpenLayers.Util.getElement=function(){var elements=[];for(var i=0;i<arguments.length;i++){var element=arguments[i];if(typeof element=='string'){element=document.getElementById(element);}
+return selected;}};OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(left,bottom,right,top){if(OpenLayers.Util.isArray(left)){top=left[3];right=left[2];bottom=left[1];left=left[0];}
+if(left!=null){this.left=OpenLayers.Util.toFloat(left);}
+if(bottom!=null){this.bottom=OpenLayers.Util.toFloat(bottom);}
+if(right!=null){this.right=OpenLayers.Util.toFloat(right);}
+if(top!=null){this.top=OpenLayers.Util.toFloat(top);}},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top);},equals:function(bounds){var equals=false;if(bounds!=null){equals=((this.left==bounds.left)&&(this.right==bounds.right)&&(this.top==bounds.top)&&(this.bottom==bounds.bottom));}
+return equals;},toString:function(){return[this.left,this.bottom,this.right,this.top].join(",");},toArray:function(reverseAxisOrder){if(reverseAxisOrder===true){return[this.bottom,this.left,this.top,this.right];}else{return[this.left,this.bottom,this.right,this.top];}},toBBOX:function(decimal,reverseAxisOrder){if(decimal==null){decimal=6;}
+var mult=Math.pow(10,decimal);var xmin=Math.round(this.left*mult)/mult;var ymin=Math.round(this.bottom*mult)/mult;var xmax=Math.round(this.right*mult)/mult;var ymax=Math.round(this.top*mult)/mult;if(reverseAxisOrder===true){return ymin+","+xmin+","+ymax+","+xmax;}else{return xmin+","+ymin+","+xmax+","+ymax;}},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])]);},getWidth:function(){return(this.right-this.left);},getHeight:function(){return(this.top-this.bottom);},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight());},getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2);},getCenterLonLat:function(){if(!this.centerLonLat){this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2);}
+return this.centerLonLat;},scale:function(ratio,origin){if(origin==null){origin=this.getCenterLonLat();}
+var origx,origy;if(origin.CLASS_NAME=="OpenLayers.LonLat"){origx=origin.lon;origy=origin.lat;}else{origx=origin.x;origy=origin.y;}
+var left=(this.left-origx)*ratio+origx;var bottom=(this.bottom-origy)*ratio+origy;var right=(this.right-origx)*ratio+origx;var top=(this.top-origy)*ratio+origy;return new OpenLayers.Bounds(left,bottom,right,top);},add:function(x,y){if((x==null)||(y==null)){throw new TypeError('Bounds.add cannot receive null values');}
+return new OpenLayers.Bounds(this.left+x,this.bottom+y,this.right+x,this.top+y);},extend:function(object){var bounds=null;if(object){switch(object.CLASS_NAME){case"OpenLayers.LonLat":bounds=new OpenLayers.Bounds(object.lon,object.lat,object.lon,object.lat);break;case"OpenLayers.Geometry.Point":bounds=new OpenLayers.Bounds(object.x,object.y,object.x,object.y);break;case"OpenLayers.Bounds":bounds=object;break;}
+if(bounds){this.centerLonLat=null;if((this.left==null)||(bounds.left<this.left)){this.left=bounds.left;}
+if((this.bottom==null)||(bounds.bottom<this.bottom)){this.bottom=bounds.bottom;}
+if((this.right==null)||(bounds.right>this.right)){this.right=bounds.right;}
+if((this.top==null)||(bounds.top>this.top)){this.top=bounds.top;}}}},containsLonLat:function(ll,options){if(typeof options==="boolean"){options={inclusive:options};}
+options=options||{};var contains=this.contains(ll.lon,ll.lat,options.inclusive),worldBounds=options.worldBounds;if(worldBounds&&!contains){var worldWidth=worldBounds.getWidth();var worldCenterX=(worldBounds.left+worldBounds.right)/2;var worldsAway=Math.round((ll.lon-worldCenterX)/worldWidth);contains=this.containsLonLat({lon:ll.lon-worldsAway*worldWidth,lat:ll.lat},{inclusive:options.inclusive});}
+return contains;},containsPixel:function(px,inclusive){return this.contains(px.x,px.y,inclusive);},contains:function(x,y,inclusive){if(inclusive==null){inclusive=true;}
+if(x==null||y==null){return false;}
+x=OpenLayers.Util.toFloat(x);y=OpenLayers.Util.toFloat(y);var contains=false;if(inclusive){contains=((x>=this.left)&&(x<=this.right)&&(y>=this.bottom)&&(y<=this.top));}else{contains=((x>this.left)&&(x<this.right)&&(y>this.bottom)&&(y<this.top));}
+return contains;},intersectsBounds:function(bounds,options){if(typeof options==="boolean"){options={inclusive:options};}
+options=options||{};if(options.worldBounds){var self=this.wrapDateLine(options.worldBounds);bounds=bounds.wrapDateLine(options.worldBounds);}else{self=this;}
+if(options.inclusive==null){options.inclusive=true;}
+var intersects=false;var mightTouch=(self.left==bounds.right||self.right==bounds.left||self.top==bounds.bottom||self.bottom==bounds.top);if(options.inclusive||!mightTouch){var inBottom=(((bounds.bottom>=self.bottom)&&(bounds.bottom<=self.top))||((self.bottom>=bounds.bottom)&&(self.bottom<=bounds.top)));var inTop=(((bounds.top>=self.bottom)&&(bounds.top<=self.top))||((self.top>bounds.bottom)&&(self.top<bounds.top)));var inLeft=(((bounds.left>=self.left)&&(bounds.left<=self.right))||((self.left>=bounds.left)&&(self.left<=bounds.right)));var inRight=(((bounds.right>=self.left)&&(bounds.right<=self.right))||((self.right>=bounds.left)&&(self.right<=bounds.right)));intersects=((inBottom||inTop)&&(inLeft||inRight));}
+if(options.worldBounds&&!intersects){var world=options.worldBounds;var width=world.getWidth();var selfCrosses=!world.containsBounds(self);var boundsCrosses=!world.containsBounds(bounds);if(selfCrosses&&!boundsCrosses){bounds=bounds.add(-width,0);intersects=self.intersectsBounds(bounds,{inclusive:options.inclusive});}else if(boundsCrosses&&!selfCrosses){self=self.add(-width,0);intersects=bounds.intersectsBounds(self,{inclusive:options.inclusive});}}
+return intersects;},containsBounds:function(bounds,partial,inclusive){if(partial==null){partial=false;}
+if(inclusive==null){inclusive=true;}
+var bottomLeft=this.contains(bounds.left,bounds.bottom,inclusive);var bottomRight=this.contains(bounds.right,bounds.bottom,inclusive);var topLeft=this.contains(bounds.left,bounds.top,inclusive);var topRight=this.contains(bounds.right,bounds.top,inclusive);return(partial)?(bottomLeft||bottomRight||topLeft||topRight):(bottomLeft&&bottomRight&&topLeft&&topRight);},determineQuadrant:function(lonlat){var quadrant="";var center=this.getCenterLonLat();quadrant+=(lonlat.lat<center.lat)?"b":"t";quadrant+=(lonlat.lon<center.lon)?"l":"r";return quadrant;},transform:function(source,dest){this.centerLonLat=null;var ll=OpenLayers.Projection.transform({'x':this.left,'y':this.bottom},source,dest);var lr=OpenLayers.Projection.transform({'x':this.right,'y':this.bottom},source,dest);var ul=OpenLayers.Projection.transform({'x':this.left,'y':this.top},source,dest);var ur=OpenLayers.Projection.transform({'x':this.right,'y':this.top},source,dest);this.left=Math.min(ll.x,ul.x);this.bottom=Math.min(ll.y,lr.y);this.right=Math.max(lr.x,ur.x);this.top=Math.max(ul.y,ur.y);return this;},wrapDateLine:function(maxExtent,options){options=options||{};var leftTolerance=options.leftTolerance||0;var rightTolerance=options.rightTolerance||0;var newBounds=this.clone();if(maxExtent){var width=maxExtent.getWidth();while(newBounds.left<maxExtent.left&&newBounds.right-rightTolerance<=maxExtent.left){newBounds=newBounds.add(width,0);}
+while(newBounds.left+leftTolerance>=maxExtent.right&&newBounds.right>maxExtent.right){newBounds=newBounds.add(-width,0);}
+var newLeft=newBounds.left+leftTolerance;if(newLeft<maxExtent.right&&newLeft>maxExtent.left&&newBounds.right-rightTolerance>maxExtent.right){newBounds=newBounds.add(-width,0);}}
+return newBounds;},CLASS_NAME:"OpenLayers.Bounds"});OpenLayers.Bounds.fromString=function(str,reverseAxisOrder){var bounds=str.split(",");return OpenLayers.Bounds.fromArray(bounds,reverseAxisOrder);};OpenLayers.Bounds.fromArray=function(bbox,reverseAxisOrder){return reverseAxisOrder===true?new OpenLayers.Bounds(bbox[1],bbox[0],bbox[3],bbox[2]):new OpenLayers.Bounds(bbox[0],bbox[1],bbox[2],bbox[3]);};OpenLayers.Bounds.fromSize=function(size){return new OpenLayers.Bounds(0,size.h,size.w,0);};OpenLayers.Bounds.oppositeQuadrant=function(quadrant){var opp="";opp+=(quadrant.charAt(0)=='t')?'b':'t';opp+=(quadrant.charAt(1)=='l')?'r':'l';return opp;};OpenLayers.Element={visible:function(element){return OpenLayers.Util.getElement(element).style.display!='none';},toggle:function(){for(var i=0,len=arguments.length;i<len;i++){var element=OpenLayers.Util.getElement(arguments[i]);var display=OpenLayers.Element.visible(element)?'none':'';element.style.display=display;}},remove:function(element){element=OpenLayers.Util.getElement(element);element.parentNode.removeChild(element);},getHeight:function(element){element=OpenLayers.Util.getElement(element);return element.offsetHeight;},hasClass:function(element,name){var names=element.className;return(!!names&&new RegExp("(^|\\s)"+name+"(\\s|$)").test(names));},addClass:function(element,name){if(!OpenLayers.Element.hasClass(element,name)){element.className+=(element.className?" ":"")+name;}
+return element;},removeClass:function(element,name){var names=element.className;if(names){element.className=OpenLayers.String.trim(names.replace(new RegExp("(^|\\s+)"+name+"(\\s+|$)")," "));}
+return element;},toggleClass:function(element,name){if(OpenLayers.Element.hasClass(element,name)){OpenLayers.Element.removeClass(element,name);}else{OpenLayers.Element.addClass(element,name);}
+return element;},getStyle:function(element,style){element=OpenLayers.Util.getElement(element);var value=null;if(element&&element.style){value=element.style[OpenLayers.String.camelize(style)];if(!value){if(document.defaultView&&document.defaultView.getComputedStyle){var css=document.defaultView.getComputedStyle(element,null);value=css?css.getPropertyValue(style):null;}else if(element.currentStyle){value=element.currentStyle[OpenLayers.String.camelize(style)];}}
+var positions=['left','top','right','bottom'];if(window.opera&&(OpenLayers.Util.indexOf(positions,style)!=-1)&&(OpenLayers.Element.getStyle(element,'position')=='static')){value='auto';}}
+return value=='auto'?null:value;}};OpenLayers.LonLat=OpenLayers.Class({lon:0.0,lat:0.0,initialize:function(lon,lat){if(OpenLayers.Util.isArray(lon)){lat=lon[1];lon=lon[0];}
+this.lon=OpenLayers.Util.toFloat(lon);this.lat=OpenLayers.Util.toFloat(lat);},toString:function(){return("lon="+this.lon+",lat="+this.lat);},toShortString:function(){return(this.lon+", "+this.lat);},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat);},add:function(lon,lat){if((lon==null)||(lat==null)){throw new TypeError('LonLat.add cannot receive null values');}
+return new OpenLayers.LonLat(this.lon+OpenLayers.Util.toFloat(lon),this.lat+OpenLayers.Util.toFloat(lat));},equals:function(ll){var equals=false;if(ll!=null){equals=((this.lon==ll.lon&&this.lat==ll.lat)||(isNaN(this.lon)&&isNaN(this.lat)&&isNaN(ll.lon)&&isNaN(ll.lat)));}
+return equals;},transform:function(source,dest){var point=OpenLayers.Projection.transform({'x':this.lon,'y':this.lat},source,dest);this.lon=point.x;this.lat=point.y;return this;},wrapDateLine:function(maxExtent){var newLonLat=this.clone();if(maxExtent){while(newLonLat.lon<maxExtent.left){newLonLat.lon+=maxExtent.getWidth();}
+while(newLonLat.lon>maxExtent.right){newLonLat.lon-=maxExtent.getWidth();}}
+return newLonLat;},CLASS_NAME:"OpenLayers.LonLat"});OpenLayers.LonLat.fromString=function(str){var pair=str.split(",");return new OpenLayers.LonLat(pair[0],pair[1]);};OpenLayers.LonLat.fromArray=function(arr){var gotArr=OpenLayers.Util.isArray(arr),lon=gotArr&&arr[0],lat=gotArr&&arr[1];return new OpenLayers.LonLat(lon,lat);};OpenLayers.Pixel=OpenLayers.Class({x:0.0,y:0.0,initialize:function(x,y){this.x=parseFloat(x);this.y=parseFloat(y);},toString:function(){return("x="+this.x+",y="+this.y);},clone:function(){return new OpenLayers.Pixel(this.x,this.y);},equals:function(px){var equals=false;if(px!=null){equals=((this.x==px.x&&this.y==px.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(px.x)&&isNaN(px.y)));}
+return equals;},distanceTo:function(px){return Math.sqrt(Math.pow(this.x-px.x,2)+
+Math.pow(this.y-px.y,2));},add:function(x,y){if((x==null)||(y==null)){throw new TypeError('Pixel.add cannot receive null values');}
+return new OpenLayers.Pixel(this.x+x,this.y+y);},offset:function(px){var newPx=this.clone();if(px){newPx=this.add(px.x,px.y);}
+return newPx;},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0.0,h:0.0,initialize:function(w,h){this.w=parseFloat(w);this.h=parseFloat(h);},toString:function(){return("w="+this.w+",h="+this.h);},clone:function(){return new OpenLayers.Size(this.w,this.h);},equals:function(sz){var equals=false;if(sz!=null){equals=((this.w==sz.w&&this.h==sz.h)||(isNaN(this.w)&&isNaN(this.h)&&isNaN(sz.w)&&isNaN(sz.h)));}
+return equals;},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},userError:function(error){alert(error);},assert:function(){},dir:function(){},dirxml:function(){},trace:function(){},group:function(){},groupEnd:function(){},time:function(){},timeEnd:function(){},profile:function(){},profileEnd:function(){},count:function(){},CLASS_NAME:"OpenLayers.Console"};(function(){var scripts=document.getElementsByTagName("script");for(var i=0,len=scripts.length;i<len;++i){if(scripts[i].src.indexOf("firebug.js")!=-1){if(console){OpenLayers.Util.extend(OpenLayers.Console,console);break;}}}})();OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){if(!OpenLayers.Lang.code){OpenLayers.Lang.setCode();}
+return OpenLayers.Lang.code;},setCode:function(code){var lang;if(!code){code=(OpenLayers.BROWSER_NAME=="msie")?navigator.userLanguage:navigator.language;}
+var parts=code.split('-');parts[0]=parts[0].toLowerCase();if(typeof OpenLayers.Lang[parts[0]]=="object"){lang=parts[0];}
+if(parts[1]){var testLang=parts[0]+'-'+parts[1].toUpperCase();if(typeof OpenLayers.Lang[testLang]=="object"){lang=testLang;}}
+if(!lang){OpenLayers.Console.warn('Failed to find OpenLayers.Lang.'+parts.join("-")+' dictionary, falling back to default language');lang=OpenLayers.Lang.defaultCode;}
+OpenLayers.Lang.code=lang;},translate:function(key,context){var dictionary=OpenLayers.Lang[OpenLayers.Lang.getCode()];var message=dictionary&&dictionary[key];if(!message){message=key;}
+if(context){message=OpenLayers.String.format(message,context);}
+return message;}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.getElement=function(){var elements=[];for(var i=0,len=arguments.length;i<len;i++){var element=arguments[i];if(typeof element=='string'){element=document.getElementById(element);}
if(arguments.length==1){return element;}
elements.push(element);}
-return elements;};if($==null){var $=OpenLayers.Util.getElement;}
-OpenLayers.Util.extend=function(destination,source){if(destination&&source){for(var property in source){var value=source[property];if(value!==undefined){destination[property]=value;}}
-var sourceIsEvt=typeof window.Event=="function"&&source instanceof window.Event;if(!sourceIsEvt&&source.hasOwnProperty&&source.hasOwnProperty('toString')){destination.toString=source.toString;}}
-return destination;};OpenLayers.Util.removeItem=function(array,item){for(var i=array.length-1;i>=0;i--){if(array[i]==item){array.splice(i,1);}}
-return array;};OpenLayers.Util.clearArray=function(array){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'array = []'}));array.length=0;};OpenLayers.Util.indexOf=function(array,obj){for(var i=0;i<array.length;i++){if(array[i]==obj){return i;}}
-return-1;};OpenLayers.Util.modifyDOMElement=function(element,id,px,sz,position,border,overflow,opacity){if(id){element.id=id;}
+return elements;};OpenLayers.Util.isElement=function(o){return!!(o&&o.nodeType===1);};OpenLayers.Util.isArray=function(a){return(Object.prototype.toString.call(a)==='[object Array]');};if(typeof window.$==="undefined"){window.$=OpenLayers.Util.getElement;}
+OpenLayers.Util.removeItem=function(array,item){for(var i=array.length-1;i>=0;i--){if(array[i]==item){array.splice(i,1);}}
+return array;};OpenLayers.Util.indexOf=function(array,obj){if(typeof array.indexOf=="function"){return array.indexOf(obj);}else{for(var i=0,len=array.length;i<len;i++){if(array[i]==obj){return i;}}
+return-1;}};OpenLayers.Util.dotless=/\./g;OpenLayers.Util.modifyDOMElement=function(element,id,px,sz,position,border,overflow,opacity){if(id){element.id=id.replace(OpenLayers.Util.dotless,"_");}
if(px){element.style.left=px.x+"px";element.style.top=px.y+"px";}
if(sz){element.style.width=sz.w+"px";element.style.height=sz.h+"px";}
if(position){element.style.position=position;}
@@ -89,308 +142,94 @@ if(!id){id=OpenLayers.Util.createUniqueID("OpenLayersDiv");}
if(!position){position="absolute";}
OpenLayers.Util.modifyDOMElement(dom,id,px,sz,position,border,overflow,opacity);return dom;};OpenLayers.Util.createImage=function(id,px,sz,imgURL,position,border,opacity,delayDisplay){var image=document.createElement("img");if(!id){id=OpenLayers.Util.createUniqueID("OpenLayersDiv");}
if(!position){position="relative";}
-OpenLayers.Util.modifyDOMElement(image,id,px,sz,position,border,null,opacity);if(delayDisplay){image.style.display="none";OpenLayers.Event.observe(image,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,image));OpenLayers.Event.observe(image,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,image));}
+OpenLayers.Util.modifyDOMElement(image,id,px,sz,position,border,null,opacity);if(delayDisplay){image.style.display="none";function display(){image.style.display="";OpenLayers.Event.stopObservingElement(image);}
+OpenLayers.Event.observe(image,"load",display);OpenLayers.Event.observe(image,"error",display);}
image.style.alt=id;image.galleryImg="no";if(imgURL){image.src=imgURL;}
-return image;};OpenLayers.Util.setOpacity=function(element,opacity){OpenLayers.Util.modifyDOMElement(element,null,null,null,null,null,null,opacity);};OpenLayers.Util.onImageLoad=function(){if(!this.viewRequestID||(this.map&&this.viewRequestID==this.map.viewRequestID)){this.style.backgroundColor=null;this.style.display="";}};OpenLayers.Util.onImageLoadErrorColor="pink";OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;OpenLayers.Util.onImageLoadError=function(){this._attempts=(this._attempts)?(this._attempts+1):1;if(this._attempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS){this.src=this.src;}else{this.style.backgroundColor=OpenLayers.Util.onImageLoadErrorColor;}
-this.style.display="";};OpenLayers.Util.alphaHack=function(){var arVersion=navigator.appVersion.split("MSIE");var version=parseFloat(arVersion[1]);var filter=false;try{filter=!!(document.body.filters);}catch(e){}
-return(filter&&(version>=5.5)&&(version<7));};OpenLayers.Util.modifyAlphaImageDiv=function(div,id,px,sz,imgURL,position,border,sizing,opacity){OpenLayers.Util.modifyDOMElement(div,id,px,sz,null,null,null,opacity);var img=div.childNodes[0];if(imgURL){img.src=imgURL;}
-OpenLayers.Util.modifyDOMElement(img,div.id+"_innerImage",null,sz,"relative",border);if(OpenLayers.Util.alphaHack()){div.style.display="inline-block";if(sizing==null){sizing="scale";}
+return image;};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(OpenLayers.Util.alphaHackNeeded==null){var arVersion=navigator.appVersion.split("MSIE");var version=parseFloat(arVersion[1]);var filter=false;try{filter=!!(document.body.filters);}catch(e){}
+OpenLayers.Util.alphaHackNeeded=(filter&&(version>=5.5)&&(version<7));}
+return OpenLayers.Util.alphaHackNeeded;};OpenLayers.Util.modifyAlphaImageDiv=function(div,id,px,sz,imgURL,position,border,sizing,opacity){OpenLayers.Util.modifyDOMElement(div,id,px,sz,position,null,null,opacity);var img=div.childNodes[0];if(imgURL){img.src=imgURL;}
+OpenLayers.Util.modifyDOMElement(img,div.id+"_innerImage",null,sz,"relative",border);if(OpenLayers.Util.alphaHack()){if(div.style.display!="none"){div.style.display="inline-block";}
+if(sizing==null){sizing="scale";}
div.style.filter="progid:DXImageTransform.Microsoft"+".AlphaImageLoader(src='"+img.src+"', "+"sizingMethod='"+sizing+"')";if(parseFloat(div.style.opacity)>=0.0&&parseFloat(div.style.opacity)<1.0){div.style.filter+=" alpha(opacity="+div.style.opacity*100+")";}
-img.style.filter="alpha(opacity=0)";}};OpenLayers.Util.createAlphaImageDiv=function(id,px,sz,imgURL,position,border,sizing,opacity,delayDisplay){var div=OpenLayers.Util.createDiv();var img=OpenLayers.Util.createImage(null,null,null,null,null,null,null,false);div.appendChild(img);if(delayDisplay){img.style.display="none";OpenLayers.Event.observe(img,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,div));OpenLayers.Event.observe(img,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,div));}
-OpenLayers.Util.modifyAlphaImageDiv(div,id,px,sz,imgURL,position,border,sizing,opacity);return div;};OpenLayers.Util.upperCaseObject=function(object){var uObject={};for(var key in object){uObject[key.toUpperCase()]=object[key];}
-return uObject;};OpenLayers.Util.applyDefaults=function(to,from){var fromIsEvt=typeof window.Event=="function"&&from instanceof window.Event;for(var key in from){if(to[key]===undefined||(!fromIsEvt&&from.hasOwnProperty&&from.hasOwnProperty(key)&&!to.hasOwnProperty(key))){to[key]=from[key];}}
-if(!fromIsEvt&&from.hasOwnProperty&&from.hasOwnProperty('toString')&&!to.hasOwnProperty('toString')){to.toString=from.toString;}
-return to;};OpenLayers.Util.getParameterString=function(params){var paramsArray=[];for(var key in params){var value=params[key];if((value!=null)&&(typeof value!='function')){var encodedValue;if(typeof value=='object'&&value.constructor==Array){var encodedItemArray=[];for(var itemIndex=0;itemIndex<value.length;itemIndex++){encodedItemArray.push(encodeURIComponent(value[itemIndex]));}
+img.style.filter="alpha(opacity=0)";}};OpenLayers.Util.createAlphaImageDiv=function(id,px,sz,imgURL,position,border,sizing,opacity,delayDisplay){var div=OpenLayers.Util.createDiv();var img=OpenLayers.Util.createImage(null,null,null,null,null,null,null,delayDisplay);img.className="olAlphaImg";div.appendChild(img);OpenLayers.Util.modifyAlphaImageDiv(div,id,px,sz,imgURL,position,border,sizing,opacity);return div;};OpenLayers.Util.upperCaseObject=function(object){var uObject={};for(var key in object){uObject[key.toUpperCase()]=object[key];}
+return uObject;};OpenLayers.Util.applyDefaults=function(to,from){to=to||{};var fromIsEvt=typeof window.Event=="function"&&from instanceof window.Event;for(var key in from){if(to[key]===undefined||(!fromIsEvt&&from.hasOwnProperty&&from.hasOwnProperty(key)&&!to.hasOwnProperty(key))){to[key]=from[key];}}
+if(!fromIsEvt&&from&&from.hasOwnProperty&&from.hasOwnProperty('toString')&&!to.hasOwnProperty('toString')){to.toString=from.toString;}
+return to;};OpenLayers.Util.getParameterString=function(params){var paramsArray=[];for(var key in params){var value=params[key];if((value!=null)&&(typeof value!='function')){var encodedValue;if(typeof value=='object'&&value.constructor==Array){var encodedItemArray=[];var item;for(var itemIndex=0,len=value.length;itemIndex<len;itemIndex++){item=value[itemIndex];encodedItemArray.push(encodeURIComponent((item===null||item===undefined)?"":item));}
encodedValue=encodedItemArray.join(",");}
else{encodedValue=encodeURIComponent(value);}
paramsArray.push(encodeURIComponent(key)+"="+encodedValue);}}
-return paramsArray.join("&");};OpenLayers.ImgPath='http://openlayers.org/api/img/';OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||(OpenLayers._getScriptLocation()+"img/");};OpenLayers.Util.Try=function(){var returnValue=null;for(var i=0;i<arguments.length;i++){var lambda=arguments[i];try{returnValue=lambda();break;}catch(e){}}
-return returnValue;};OpenLayers.Util.getNodes=function(p,tagName){var nodes=OpenLayers.Util.Try(function(){return OpenLayers.Util._getNodes(p.documentElement.childNodes,tagName);},function(){return OpenLayers.Util._getNodes(p.childNodes,tagName);});return nodes;};OpenLayers.Util._getNodes=function(nodes,tagName){var retArray=[];for(var i=0;i<nodes.length;i++){if(nodes[i].nodeName==tagName){retArray.push(nodes[i]);}}
-return retArray;};OpenLayers.Util.getTagText=function(parent,item,index){var result=OpenLayers.Util.getNodes(parent,item);if(result&&(result.length>0))
-{if(!index){index=0;}
-if(result[index].childNodes.length>1){return result.childNodes[1].nodeValue;}
-else if(result[index].childNodes.length==1){return result[index].firstChild.nodeValue;}}else{return"";}};OpenLayers.Util.getXmlNodeValue=function(node){var val=null;OpenLayers.Util.Try(function(){val=node.text;if(!val){val=node.textContent;}
+return paramsArray.join("&");};OpenLayers.Util.urlAppend=function(url,paramStr){var newUrl=url;if(paramStr){var parts=(url+" ").split(/[?&]/);newUrl+=(parts.pop()===" "?paramStr:parts.length?"&"+paramStr:"?"+paramStr);}
+return newUrl;};OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||(OpenLayers._getScriptLocation()+"img/");};OpenLayers.Util.getImageLocation=function(image){return OpenLayers.Util.getImagesLocation()+image;};OpenLayers.Util.Try=function(){var returnValue=null;for(var i=0,len=arguments.length;i<len;i++){var lambda=arguments[i];try{returnValue=lambda();break;}catch(e){}}
+return returnValue;};OpenLayers.Util.getXmlNodeValue=function(node){var val=null;OpenLayers.Util.Try(function(){val=node.text;if(!val){val=node.textContent;}
if(!val){val=node.firstChild.nodeValue;}},function(){val=node.textContent;});return val;};OpenLayers.Util.mouseLeft=function(evt,div){var target=(evt.relatedTarget)?evt.relatedTarget:evt.toElement;while(target!=div&&target!=null){target=target.parentNode;}
-return(target!=div);};OpenLayers.Util.rad=function(x){return x*Math.PI/180;};OpenLayers.Util.distVincenty=function(p1,p2){var a=6378137,b=6356752.3142,f=1/298.257223563;var L=OpenLayers.Util.rad(p2.lon-p1.lon);var U1=Math.atan((1-f)*Math.tan(OpenLayers.Util.rad(p1.lat)));var U2=Math.atan((1-f)*Math.tan(OpenLayers.Util.rad(p2.lat)));var sinU1=Math.sin(U1),cosU1=Math.cos(U1);var sinU2=Math.sin(U2),cosU2=Math.cos(U2);var lambda=L,lambdaP=2*Math.PI;var iterLimit=20;while(Math.abs(lambda-lambdaP)>1e-12&&--iterLimit>0){var sinLambda=Math.sin(lambda),cosLambda=Math.cos(lambda);var sinSigma=Math.sqrt((cosU2*sinLambda)*(cosU2*sinLambda)+
+return(target!=div);};OpenLayers.Util.DEFAULT_PRECISION=14;OpenLayers.Util.toFloat=function(number,precision){if(precision==null){precision=OpenLayers.Util.DEFAULT_PRECISION;}
+if(typeof number!=="number"){number=parseFloat(number);}
+return precision===0?number:parseFloat(number.toPrecision(precision));};OpenLayers.Util.rad=function(x){return x*Math.PI/180;};OpenLayers.Util.deg=function(x){return x*180/Math.PI;};OpenLayers.Util.VincentyConstants={a:6378137,b:6356752.3142,f:1/298.257223563};OpenLayers.Util.distVincenty=function(p1,p2){var ct=OpenLayers.Util.VincentyConstants;var a=ct.a,b=ct.b,f=ct.f;var L=OpenLayers.Util.rad(p2.lon-p1.lon);var U1=Math.atan((1-f)*Math.tan(OpenLayers.Util.rad(p1.lat)));var U2=Math.atan((1-f)*Math.tan(OpenLayers.Util.rad(p2.lat)));var sinU1=Math.sin(U1),cosU1=Math.cos(U1);var sinU2=Math.sin(U2),cosU2=Math.cos(U2);var lambda=L,lambdaP=2*Math.PI;var iterLimit=20;while(Math.abs(lambda-lambdaP)>1e-12&&--iterLimit>0){var sinLambda=Math.sin(lambda),cosLambda=Math.cos(lambda);var sinSigma=Math.sqrt((cosU2*sinLambda)*(cosU2*sinLambda)+
(cosU1*sinU2-sinU1*cosU2*cosLambda)*(cosU1*sinU2-sinU1*cosU2*cosLambda));if(sinSigma==0){return 0;}
var cosSigma=sinU1*sinU2+cosU1*cosU2*cosLambda;var sigma=Math.atan2(sinSigma,cosSigma);var alpha=Math.asin(cosU1*cosU2*sinLambda/sinSigma);var cosSqAlpha=Math.cos(alpha)*Math.cos(alpha);var cos2SigmaM=cosSigma-2*sinU1*sinU2/cosSqAlpha;var C=f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha));lambdaP=lambda;lambda=L+(1-C)*f*Math.sin(alpha)*(sigma+C*sinSigma*(cos2SigmaM+C*cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)));}
if(iterLimit==0){return NaN;}
var uSq=cosSqAlpha*(a*a-b*b)/(b*b);var A=1+uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)));var B=uSq/1024*(256+uSq*(-128+uSq*(74-47*uSq)));var deltaSigma=B*sinSigma*(cos2SigmaM+B/4*(cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)-
-B/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM)));var s=b*A*(sigma-deltaSigma);var d=s.toFixed(3)/1000;return d;};OpenLayers.Util.getParameters=function(url){url=url||window.location.href;var paramsString="";if(OpenLayers.String.contains(url,'?')){var start=url.indexOf('?')+1;var end=OpenLayers.String.contains(url,"#")?url.indexOf('#'):url.length;paramsString=url.substring(start,end);}
-var parameters={};var pairs=paramsString.split(/[&;]/);for(var i=0;i<pairs.length;++i){var keyValue=pairs[i].split('=');if(keyValue[0]){var key=decodeURIComponent(keyValue[0]);var value=keyValue[1]||'';value=value.split(",");for(var j=0;j<value.length;j++){value[j]=decodeURIComponent(value[j]);}
-if(value.length==1){value=value[0];}
+B/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM)));var s=b*A*(sigma-deltaSigma);var d=s.toFixed(3)/1000;return d;};OpenLayers.Util.destinationVincenty=function(lonlat,brng,dist){var u=OpenLayers.Util;var ct=u.VincentyConstants;var a=ct.a,b=ct.b,f=ct.f;var lon1=lonlat.lon;var lat1=lonlat.lat;var s=dist;var alpha1=u.rad(brng);var sinAlpha1=Math.sin(alpha1);var cosAlpha1=Math.cos(alpha1);var tanU1=(1-f)*Math.tan(u.rad(lat1));var cosU1=1/Math.sqrt((1+tanU1*tanU1)),sinU1=tanU1*cosU1;var sigma1=Math.atan2(tanU1,cosAlpha1);var sinAlpha=cosU1*sinAlpha1;var cosSqAlpha=1-sinAlpha*sinAlpha;var uSq=cosSqAlpha*(a*a-b*b)/(b*b);var A=1+uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)));var B=uSq/1024*(256+uSq*(-128+uSq*(74-47*uSq)));var sigma=s/(b*A),sigmaP=2*Math.PI;while(Math.abs(sigma-sigmaP)>1e-12){var cos2SigmaM=Math.cos(2*sigma1+sigma);var sinSigma=Math.sin(sigma);var cosSigma=Math.cos(sigma);var deltaSigma=B*sinSigma*(cos2SigmaM+B/4*(cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)-
+B/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM)));sigmaP=sigma;sigma=s/(b*A)+deltaSigma;}
+var tmp=sinU1*sinSigma-cosU1*cosSigma*cosAlpha1;var lat2=Math.atan2(sinU1*cosSigma+cosU1*sinSigma*cosAlpha1,(1-f)*Math.sqrt(sinAlpha*sinAlpha+tmp*tmp));var lambda=Math.atan2(sinSigma*sinAlpha1,cosU1*cosSigma-sinU1*sinSigma*cosAlpha1);var C=f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha));var L=lambda-(1-C)*f*sinAlpha*(sigma+C*sinSigma*(cos2SigmaM+C*cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)));var revAz=Math.atan2(sinAlpha,-tmp);return new OpenLayers.LonLat(lon1+u.deg(L),u.deg(lat2));};OpenLayers.Util.getParameters=function(url){url=(url===null||url===undefined)?window.location.href:url;var paramsString="";if(OpenLayers.String.contains(url,'?')){var start=url.indexOf('?')+1;var end=OpenLayers.String.contains(url,"#")?url.indexOf('#'):url.length;paramsString=url.substring(start,end);}
+var parameters={};var pairs=paramsString.split(/[&;]/);for(var i=0,len=pairs.length;i<len;++i){var keyValue=pairs[i].split('=');if(keyValue[0]){var key=keyValue[0];try{key=decodeURIComponent(key);}catch(err){key=unescape(key);}
+var value=(keyValue[1]||'').replace(/\+/g," ");try{value=decodeURIComponent(value);}catch(err){value=unescape(value);}
+value=value.split(",");if(value.length==1){value=value[0];}
parameters[key]=value;}}
-return parameters;};OpenLayers.Util.getArgs=function(url){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Util.getParameters'}));return OpenLayers.Util.getParameters(url);};OpenLayers.Util.lastSeqID=0;OpenLayers.Util.createUniqueID=function(prefix){if(prefix==null){prefix="id_";}
-OpenLayers.Util.lastSeqID+=1;return prefix+OpenLayers.Util.lastSeqID;};OpenLayers.INCHES_PER_UNIT={'inches':1.0,'ft':12.0,'mi':63360.0,'m':39.3701,'km':39370.1,'dd':4374754,'yd':36};OpenLayers.INCHES_PER_UNIT["in"]=OpenLayers.INCHES_PER_UNIT.inches;OpenLayers.INCHES_PER_UNIT["degrees"]=OpenLayers.INCHES_PER_UNIT.dd;OpenLayers.INCHES_PER_UNIT["nmi"]=1852*OpenLayers.INCHES_PER_UNIT.m;OpenLayers.DOTS_PER_INCH=72;OpenLayers.Util.normalizeScale=function(scale){var normScale=(scale>1.0)?(1.0/scale):scale;return normScale;};OpenLayers.Util.getResolutionFromScale=function(scale,units){if(units==null){units="degrees";}
-var normScale=OpenLayers.Util.normalizeScale(scale);var resolution=1/(normScale*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH);return resolution;};OpenLayers.Util.getScaleFromResolution=function(resolution,units){if(units==null){units="degrees";}
-var scale=resolution*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH;return scale;};OpenLayers.Util.safeStopPropagation=function(evt){OpenLayers.Event.stop(evt,true);};OpenLayers.Util.pagePosition=function(forElement){var valueT=0,valueL=0;var element=forElement;var child=forElement;while(element){if(element==document.body){if(child&&child.style&&OpenLayers.Element.getStyle(child,'position')=='absolute'){break;}}
-valueT+=element.offsetTop||0;valueL+=element.offsetLeft||0;child=element;try{element=element.offsetParent;}catch(e){OpenLayers.Console.error(OpenLayers.i18n("pagePositionFailed",{'elemId':element.id}));break;}}
-element=forElement;while(element){valueT-=element.scrollTop||0;valueL-=element.scrollLeft||0;element=element.parentNode;}
-return[valueL,valueT];};OpenLayers.Util.isEquivalentUrl=function(url1,url2,options){options=options||{};OpenLayers.Util.applyDefaults(options,{ignoreCase:true,ignorePort80:true,ignoreHash:true});var urlObj1=OpenLayers.Util.createUrlObject(url1,options);var urlObj2=OpenLayers.Util.createUrlObject(url2,options);for(var key in urlObj1){if(options.test){alert(key+"\n1:"+urlObj1[key]+"\n2:"+urlObj2[key]);}
-var val1=urlObj1[key];var val2=urlObj2[key];switch(key){case"args":break;case"host":case"port":case"protocol":if((val1=="")||(val2=="")){break;}
-default:if((key!="args")&&(urlObj1[key]!=urlObj2[key])){return false;}
-break;}}
+return parameters;};OpenLayers.Util.lastSeqID=0;OpenLayers.Util.createUniqueID=function(prefix){if(prefix==null){prefix="id_";}else{prefix=prefix.replace(OpenLayers.Util.dotless,"_");}
+OpenLayers.Util.lastSeqID+=1;return prefix+OpenLayers.Util.lastSeqID;};OpenLayers.INCHES_PER_UNIT={'inches':1.0,'ft':12.0,'mi':63360.0,'m':39.3701,'km':39370.1,'dd':4374754,'yd':36};OpenLayers.INCHES_PER_UNIT["in"]=OpenLayers.INCHES_PER_UNIT.inches;OpenLayers.INCHES_PER_UNIT["degrees"]=OpenLayers.INCHES_PER_UNIT.dd;OpenLayers.INCHES_PER_UNIT["nmi"]=1852*OpenLayers.INCHES_PER_UNIT.m;OpenLayers.METERS_PER_INCH=0.02540005080010160020;OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{"Inch":OpenLayers.INCHES_PER_UNIT.inches,"Meter":1.0/OpenLayers.METERS_PER_INCH,"Foot":0.30480060960121920243/OpenLayers.METERS_PER_INCH,"IFoot":0.30480000000000000000/OpenLayers.METERS_PER_INCH,"ClarkeFoot":0.3047972651151/OpenLayers.METERS_PER_INCH,"SearsFoot":0.30479947153867624624/OpenLayers.METERS_PER_INCH,"GoldCoastFoot":0.30479971018150881758/OpenLayers.METERS_PER_INCH,"IInch":0.02540000000000000000/OpenLayers.METERS_PER_INCH,"MicroInch":0.00002540000000000000/OpenLayers.METERS_PER_INCH,"Mil":0.00000002540000000000/OpenLayers.METERS_PER_INCH,"Centimeter":0.01000000000000000000/OpenLayers.METERS_PER_INCH,"Kilometer":1000.00000000000000000000/OpenLayers.METERS_PER_INCH,"Yard":0.91440182880365760731/OpenLayers.METERS_PER_INCH,"SearsYard":0.914398414616029/OpenLayers.METERS_PER_INCH,"IndianYard":0.91439853074444079983/OpenLayers.METERS_PER_INCH,"IndianYd37":0.91439523/OpenLayers.METERS_PER_INCH,"IndianYd62":0.9143988/OpenLayers.METERS_PER_INCH,"IndianYd75":0.9143985/OpenLayers.METERS_PER_INCH,"IndianFoot":0.30479951/OpenLayers.METERS_PER_INCH,"IndianFt37":0.30479841/OpenLayers.METERS_PER_INCH,"IndianFt62":0.3047996/OpenLayers.METERS_PER_INCH,"IndianFt75":0.3047995/OpenLayers.METERS_PER_INCH,"Mile":1609.34721869443738887477/OpenLayers.METERS_PER_INCH,"IYard":0.91440000000000000000/OpenLayers.METERS_PER_INCH,"IMile":1609.34400000000000000000/OpenLayers.METERS_PER_INCH,"NautM":1852.00000000000000000000/OpenLayers.METERS_PER_INCH,"Lat-66":110943.316488932731/OpenLayers.METERS_PER_INCH,"Lat-83":110946.25736872234125/OpenLayers.METERS_PER_INCH,"Decimeter":0.10000000000000000000/OpenLayers.METERS_PER_INCH,"Millimeter":0.00100000000000000000/OpenLayers.METERS_PER_INCH,"Dekameter":10.00000000000000000000/OpenLayers.METERS_PER_INCH,"Decameter":10.00000000000000000000/OpenLayers.METERS_PER_INCH,"Hectometer":100.00000000000000000000/OpenLayers.METERS_PER_INCH,"GermanMeter":1.0000135965/OpenLayers.METERS_PER_INCH,"CaGrid":0.999738/OpenLayers.METERS_PER_INCH,"ClarkeChain":20.1166194976/OpenLayers.METERS_PER_INCH,"GunterChain":20.11684023368047/OpenLayers.METERS_PER_INCH,"BenoitChain":20.116782494375872/OpenLayers.METERS_PER_INCH,"SearsChain":20.11676512155/OpenLayers.METERS_PER_INCH,"ClarkeLink":0.201166194976/OpenLayers.METERS_PER_INCH,"GunterLink":0.2011684023368047/OpenLayers.METERS_PER_INCH,"BenoitLink":0.20116782494375872/OpenLayers.METERS_PER_INCH,"SearsLink":0.2011676512155/OpenLayers.METERS_PER_INCH,"Rod":5.02921005842012/OpenLayers.METERS_PER_INCH,"IntnlChain":20.1168/OpenLayers.METERS_PER_INCH,"IntnlLink":0.201168/OpenLayers.METERS_PER_INCH,"Perch":5.02921005842012/OpenLayers.METERS_PER_INCH,"Pole":5.02921005842012/OpenLayers.METERS_PER_INCH,"Furlong":201.1684023368046/OpenLayers.METERS_PER_INCH,"Rood":3.778266898/OpenLayers.METERS_PER_INCH,"CapeFoot":0.3047972615/OpenLayers.METERS_PER_INCH,"Brealey":375.00000000000000000000/OpenLayers.METERS_PER_INCH,"ModAmFt":0.304812252984505969011938/OpenLayers.METERS_PER_INCH,"Fathom":1.8288/OpenLayers.METERS_PER_INCH,"NautM-UK":1853.184/OpenLayers.METERS_PER_INCH,"50kilometers":50000.0/OpenLayers.METERS_PER_INCH,"150kilometers":150000.0/OpenLayers.METERS_PER_INCH});OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{"mm":OpenLayers.INCHES_PER_UNIT["Meter"]/1000.0,"cm":OpenLayers.INCHES_PER_UNIT["Meter"]/100.0,"dm":OpenLayers.INCHES_PER_UNIT["Meter"]*100.0,"km":OpenLayers.INCHES_PER_UNIT["Meter"]*1000.0,"kmi":OpenLayers.INCHES_PER_UNIT["nmi"],"fath":OpenLayers.INCHES_PER_UNIT["Fathom"],"ch":OpenLayers.INCHES_PER_UNIT["IntnlChain"],"link":OpenLayers.INCHES_PER_UNIT["IntnlLink"],"us-in":OpenLayers.INCHES_PER_UNIT["inches"],"us-ft":OpenLayers.INCHES_PER_UNIT["Foot"],"us-yd":OpenLayers.INCHES_PER_UNIT["Yard"],"us-ch":OpenLayers.INCHES_PER_UNIT["GunterChain"],"us-mi":OpenLayers.INCHES_PER_UNIT["Mile"],"ind-yd":OpenLayers.INCHES_PER_UNIT["IndianYd37"],"ind-ft":OpenLayers.INCHES_PER_UNIT["IndianFt37"],"ind-ch":20.11669506/OpenLayers.METERS_PER_INCH});OpenLayers.DOTS_PER_INCH=72;OpenLayers.Util.normalizeScale=function(scale){var normScale=(scale>1.0)?(1.0/scale):scale;return normScale;};OpenLayers.Util.getResolutionFromScale=function(scale,units){var resolution;if(scale){if(units==null){units="degrees";}
+var normScale=OpenLayers.Util.normalizeScale(scale);resolution=1/(normScale*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH);}
+return resolution;};OpenLayers.Util.getScaleFromResolution=function(resolution,units){if(units==null){units="degrees";}
+var scale=resolution*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH;return scale;};OpenLayers.Util.pagePosition=function(forElement){var pos=[0,0];var viewportElement=OpenLayers.Util.getViewportElement();if(!forElement||forElement==window||forElement==viewportElement){return pos;}
+var BUGGY_GECKO_BOX_OBJECT=OpenLayers.IS_GECKO&&document.getBoxObjectFor&&OpenLayers.Element.getStyle(forElement,'position')=='absolute'&&(forElement.style.top==''||forElement.style.left=='');var parent=null;var box;if(forElement.getBoundingClientRect){box=forElement.getBoundingClientRect();var scrollTop=viewportElement.scrollTop;var scrollLeft=viewportElement.scrollLeft;pos[0]=box.left+scrollLeft;pos[1]=box.top+scrollTop;}else if(document.getBoxObjectFor&&!BUGGY_GECKO_BOX_OBJECT){box=document.getBoxObjectFor(forElement);var vpBox=document.getBoxObjectFor(viewportElement);pos[0]=box.screenX-vpBox.screenX;pos[1]=box.screenY-vpBox.screenY;}else{pos[0]=forElement.offsetLeft;pos[1]=forElement.offsetTop;parent=forElement.offsetParent;if(parent!=forElement){while(parent){pos[0]+=parent.offsetLeft;pos[1]+=parent.offsetTop;parent=parent.offsetParent;}}
+var browser=OpenLayers.BROWSER_NAME;if(browser=="opera"||(browser=="safari"&&OpenLayers.Element.getStyle(forElement,'position')=='absolute')){pos[1]-=document.body.offsetTop;}
+parent=forElement.offsetParent;while(parent&&parent!=document.body){pos[0]-=parent.scrollLeft;if(browser!="opera"||parent.tagName!='TR'){pos[1]-=parent.scrollTop;}
+parent=parent.offsetParent;}}
+return pos;};OpenLayers.Util.getViewportElement=function(){var viewportElement=arguments.callee.viewportElement;if(viewportElement==undefined){viewportElement=(OpenLayers.BROWSER_NAME=="msie"&&document.compatMode!='CSS1Compat')?document.body:document.documentElement;arguments.callee.viewportElement=viewportElement;}
+return viewportElement;};OpenLayers.Util.isEquivalentUrl=function(url1,url2,options){options=options||{};OpenLayers.Util.applyDefaults(options,{ignoreCase:true,ignorePort80:true,ignoreHash:true});var urlObj1=OpenLayers.Util.createUrlObject(url1,options);var urlObj2=OpenLayers.Util.createUrlObject(url2,options);for(var key in urlObj1){if(key!=="args"){if(urlObj1[key]!=urlObj2[key]){return false;}}}
for(var key in urlObj1.args){if(urlObj1.args[key]!=urlObj2.args[key]){return false;}
delete urlObj2.args[key];}
for(var key in urlObj2.args){return false;}
-return true;};OpenLayers.Util.createUrlObject=function(url,options){options=options||{};var urlObject={};if(options.ignoreCase){url=url.toLowerCase();}
-var a=document.createElement('a');a.href=url;urlObject.host=a.host;var port=a.port;if(port.length<=0){var newHostLength=urlObject.host.length-(port.length);urlObject.host=urlObject.host.substring(0,newHostLength);}
-urlObject.protocol=a.protocol;urlObject.port=((port=="80")&&(options.ignorePort80))?"":port;urlObject.hash=(options.ignoreHash)?"":a.hash;var queryString=a.search;if(!queryString){var qMark=url.indexOf("?");queryString=(qMark!=-1)?url.substr(qMark):"";}
-urlObject.args=OpenLayers.Util.getParameters(queryString);if(((urlObject.protocol=="file:")&&(url.indexOf("file:")!=-1))||((urlObject.protocol!="file:")&&(urlObject.host!=""))){urlObject.pathname=a.pathname;var qIndex=urlObject.pathname.indexOf("?");if(qIndex!=-1){urlObject.pathname=urlObject.pathname.substring(0,qIndex);}}else{var relStr=OpenLayers.Util.removeTail(url);var backs=0;do{var index=relStr.indexOf("../");if(index==0){backs++;relStr=relStr.substr(3);}else if(index>=0){var prevChunk=relStr.substr(0,index-1);var slash=prevChunk.indexOf("/");prevChunk=(slash!=-1)?prevChunk.substr(0,slash+1):"";var postChunk=relStr.substr(index+3);relStr=prevChunk+postChunk;}}while(index!=-1)
-var windowAnchor=document.createElement("a");var windowUrl=window.location.href;if(options.ignoreCase){windowUrl=windowUrl.toLowerCase();}
-windowAnchor.href=windowUrl;urlObject.protocol=windowAnchor.protocol;var splitter=(windowAnchor.pathname.indexOf("/")!=-1)?"/":"\\";var dirs=windowAnchor.pathname.split(splitter);dirs.pop();while((backs>0)&&(dirs.length>0)){dirs.pop();backs--;}
-relStr=dirs.join("/")+"/"+relStr;urlObject.pathname=relStr;}
-if((urlObject.protocol=="file:")||(urlObject.protocol=="")){urlObject.host="localhost";}
-return urlObject;};OpenLayers.Util.removeTail=function(url){var head=null;var qMark=url.indexOf("?");var hashMark=url.indexOf("#");if(qMark==-1){head=(hashMark!=-1)?url.substr(0,hashMark):url;}else{head=(hashMark!=-1)?url.substr(0,Math.min(qMark,hashMark)):url.substr(0,qMark);}
-return head;};OpenLayers.Util.getBrowserName=function(){var browserName="";var ua=navigator.userAgent.toLowerCase();if(ua.indexOf("opera")!=-1){browserName="opera";}else if(ua.indexOf("msie")!=-1){browserName="msie";}else if(ua.indexOf("safari")!=-1){browserName="safari";}else if(ua.indexOf("mozilla")!=-1){if(ua.indexOf("firefox")!=-1){browserName="firefox";}else{browserName="mozilla";}}
-return browserName;};OpenLayers.Util.getRenderedDimensions=function(contentHTML,size){var w=h=null;var container=document.createElement("div");container.style.overflow="";container.style.position="absolute";container.style.left="-9999px";if(size){if(size.w){w=container.style.width=size.w;}else if(size.h){h=container.style.height=size.h;}}
-var content=document.createElement("div");content.innerHTML=contentHTML;container.appendChild(content);document.body.appendChild(container);if(!w){w=parseInt(content.scrollWidth);container.style.width=w+"px";}
+return true;};OpenLayers.Util.createUrlObject=function(url,options){options=options||{};if(!(/^\w+:\/\//).test(url)){var loc=window.location;var port=loc.port?":"+loc.port:"";var fullUrl=loc.protocol+"//"+loc.host.split(":").shift()+port;if(url.indexOf("/")===0){url=fullUrl+url;}else{var parts=loc.pathname.split("/");parts.pop();url=fullUrl+parts.join("/")+"/"+url;}}
+if(options.ignoreCase){url=url.toLowerCase();}
+var a=document.createElement('a');a.href=url;var urlObject={};urlObject.host=a.host.split(":").shift();urlObject.protocol=a.protocol;if(options.ignorePort80){urlObject.port=(a.port=="80"||a.port=="0")?"":a.port;}else{urlObject.port=(a.port==""||a.port=="0")?"80":a.port;}
+urlObject.hash=(options.ignoreHash||a.hash==="#")?"":a.hash;var queryString=a.search;if(!queryString){var qMark=url.indexOf("?");queryString=(qMark!=-1)?url.substr(qMark):"";}
+urlObject.args=OpenLayers.Util.getParameters(queryString);urlObject.pathname=(a.pathname.charAt(0)=="/")?a.pathname:"/"+a.pathname;return urlObject;};OpenLayers.Util.removeTail=function(url){var head=null;var qMark=url.indexOf("?");var hashMark=url.indexOf("#");if(qMark==-1){head=(hashMark!=-1)?url.substr(0,hashMark):url;}else{head=(hashMark!=-1)?url.substr(0,Math.min(qMark,hashMark)):url.substr(0,qMark);}
+return head;};OpenLayers.IS_GECKO=(function(){var ua=navigator.userAgent.toLowerCase();return ua.indexOf("webkit")==-1&&ua.indexOf("gecko")!=-1;})();OpenLayers.CANVAS_SUPPORTED=(function(){var elem=document.createElement('canvas');return!!(elem.getContext&&elem.getContext('2d'));})();OpenLayers.BROWSER_NAME=(function(){var name="";var ua=navigator.userAgent.toLowerCase();if(ua.indexOf("opera")!=-1){name="opera";}else if(ua.indexOf("msie")!=-1){name="msie";}else if(ua.indexOf("safari")!=-1){name="safari";}else if(ua.indexOf("mozilla")!=-1){if(ua.indexOf("firefox")!=-1){name="firefox";}else{name="mozilla";}}
+return name;})();OpenLayers.Util.getBrowserName=function(){return OpenLayers.BROWSER_NAME;};OpenLayers.Util.getRenderedDimensions=function(contentHTML,size,options){var w,h;var container=document.createElement("div");container.style.visibility="hidden";var containerElement=(options&&options.containerElement)?options.containerElement:document.body;if(size){if(size.w){w=size.w;container.style.width=w+"px";}else if(size.h){h=size.h;container.style.height=h+"px";}}
+if(options&&options.displayClass){container.className=options.displayClass;}
+var content=document.createElement("div");content.innerHTML=contentHTML;content.style.overflow="visible";if(content.childNodes){for(var i=0,l=content.childNodes.length;i<l;i++){if(!content.childNodes[i].style)continue;content.childNodes[i].style.overflow="visible";}}
+container.appendChild(content);containerElement.appendChild(container);var parentHasPositionAbsolute=false;var parent=container.parentNode;while(parent&&parent.tagName.toLowerCase()!="body"){var parentPosition=OpenLayers.Element.getStyle(parent,"position");if(parentPosition=="absolute"){parentHasPositionAbsolute=true;break;}else if(parentPosition&&parentPosition!="static"){break;}
+parent=parent.parentNode;}
+if(!parentHasPositionAbsolute){container.style.position="absolute";}
+if(!w){w=parseInt(content.scrollWidth);container.style.width=w+"px";}
if(!h){h=parseInt(content.scrollHeight);}
-container.removeChild(content);document.body.removeChild(container);return new OpenLayers.Size(w,h);};OpenLayers.Util.getScrollbarWidth=function(){var scrollbarWidth=OpenLayers.Util._scrollbarWidth;if(scrollbarWidth==null){var scr=null;var inn=null;var wNoScroll=0;var wScroll=0;scr=document.createElement('div');scr.style.position='absolute';scr.style.top='-1000px';scr.style.left='-1000px';scr.style.width='100px';scr.style.height='50px';scr.style.overflow='hidden';inn=document.createElement('div');inn.style.width='100%';inn.style.height='200px';scr.appendChild(inn);document.body.appendChild(scr);wNoScroll=inn.offsetWidth;scr.style.overflow='scroll';wScroll=inn.offsetWidth;document.body.removeChild(document.body.lastChild);OpenLayers.Util._scrollbarWidth=(wNoScroll-wScroll);scrollbarWidth=OpenLayers.Util._scrollbarWidth;}
-return scrollbarWidth;};OpenLayers.Rico=new Object();OpenLayers.Rico.Corner={round:function(e,options){e=OpenLayers.Util.getElement(e);this._setOptions(options);var color=this.options.color;if(this.options.color=="fromElement"){color=this._background(e);}
-var bgColor=this.options.bgColor;if(this.options.bgColor=="fromParent"){bgColor=this._background(e.offsetParent);}
-this._roundCornersImpl(e,color,bgColor);},changeColor:function(theDiv,newColor){theDiv.style.backgroundColor=newColor;var spanElements=theDiv.parentNode.getElementsByTagName("span");for(var currIdx=0;currIdx<spanElements.length;currIdx++){spanElements[currIdx].style.backgroundColor=newColor;}},changeOpacity:function(theDiv,newOpacity){var mozillaOpacity=newOpacity;var ieOpacity='alpha(opacity='+newOpacity*100+')';theDiv.style.opacity=mozillaOpacity;theDiv.style.filter=ieOpacity;var spanElements=theDiv.parentNode.getElementsByTagName("span");for(var currIdx=0;currIdx<spanElements.length;currIdx++){spanElements[currIdx].style.opacity=mozillaOpacity;spanElements[currIdx].style.filter=ieOpacity;}},reRound:function(theDiv,options){var topRico=theDiv.parentNode.childNodes[0];var bottomRico=theDiv.parentNode.childNodes[2];theDiv.parentNode.removeChild(topRico);theDiv.parentNode.removeChild(bottomRico);this.round(theDiv.parentNode,options);},_roundCornersImpl:function(e,color,bgColor){if(this.options.border){this._renderBorder(e,bgColor);}
-if(this._isTopRounded()){this._roundTopCorners(e,color,bgColor);}
-if(this._isBottomRounded()){this._roundBottomCorners(e,color,bgColor);}},_renderBorder:function(el,bgColor){var borderValue="1px solid "+this._borderColor(bgColor);var borderL="border-left: "+borderValue;var borderR="border-right: "+borderValue;var style="style='"+borderL+";"+borderR+"'";el.innerHTML="<div "+style+">"+el.innerHTML+"</div>";},_roundTopCorners:function(el,color,bgColor){var corner=this._createCorner(bgColor);for(var i=0;i<this.options.numSlices;i++){corner.appendChild(this._createCornerSlice(color,bgColor,i,"top"));}
-el.style.paddingTop=0;el.insertBefore(corner,el.firstChild);},_roundBottomCorners:function(el,color,bgColor){var corner=this._createCorner(bgColor);for(var i=(this.options.numSlices-1);i>=0;i--){corner.appendChild(this._createCornerSlice(color,bgColor,i,"bottom"));}
-el.style.paddingBottom=0;el.appendChild(corner);},_createCorner:function(bgColor){var corner=document.createElement("div");corner.style.backgroundColor=(this._isTransparent()?"transparent":bgColor);return corner;},_createCornerSlice:function(color,bgColor,n,position){var slice=document.createElement("span");var inStyle=slice.style;inStyle.backgroundColor=color;inStyle.display="block";inStyle.height="1px";inStyle.overflow="hidden";inStyle.fontSize="1px";var borderColor=this._borderColor(color,bgColor);if(this.options.border&&n==0){inStyle.borderTopStyle="solid";inStyle.borderTopWidth="1px";inStyle.borderLeftWidth="0px";inStyle.borderRightWidth="0px";inStyle.borderBottomWidth="0px";inStyle.height="0px";inStyle.borderColor=borderColor;}
-else if(borderColor){inStyle.borderColor=borderColor;inStyle.borderStyle="solid";inStyle.borderWidth="0px 1px";}
-if(!this.options.compact&&(n==(this.options.numSlices-1))){inStyle.height="2px";}
-this._setMargin(slice,n,position);this._setBorder(slice,n,position);return slice;},_setOptions:function(options){this.options={corners:"all",color:"fromElement",bgColor:"fromParent",blend:true,border:false,compact:false};OpenLayers.Util.extend(this.options,options||{});this.options.numSlices=this.options.compact?2:4;if(this._isTransparent()){this.options.blend=false;}},_whichSideTop:function(){if(this._hasString(this.options.corners,"all","top")){return"";}
-if(this.options.corners.indexOf("tl")>=0&&this.options.corners.indexOf("tr")>=0){return"";}
-if(this.options.corners.indexOf("tl")>=0){return"left";}else if(this.options.corners.indexOf("tr")>=0){return"right";}
-return"";},_whichSideBottom:function(){if(this._hasString(this.options.corners,"all","bottom")){return"";}
-if(this.options.corners.indexOf("bl")>=0&&this.options.corners.indexOf("br")>=0){return"";}
-if(this.options.corners.indexOf("bl")>=0){return"left";}else if(this.options.corners.indexOf("br")>=0){return"right";}
-return"";},_borderColor:function(color,bgColor){if(color=="transparent"){return bgColor;}else if(this.options.border){return this.options.border;}else if(this.options.blend){return this._blend(bgColor,color);}else{return"";}},_setMargin:function(el,n,corners){var marginSize=this._marginSize(n);var whichSide=corners=="top"?this._whichSideTop():this._whichSideBottom();if(whichSide=="left"){el.style.marginLeft=marginSize+"px";el.style.marginRight="0px";}
-else if(whichSide=="right"){el.style.marginRight=marginSize+"px";el.style.marginLeft="0px";}
-else{el.style.marginLeft=marginSize+"px";el.style.marginRight=marginSize+"px";}},_setBorder:function(el,n,corners){var borderSize=this._borderSize(n);var whichSide=corners=="top"?this._whichSideTop():this._whichSideBottom();if(whichSide=="left"){el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth="0px";}
-else if(whichSide=="right"){el.style.borderRightWidth=borderSize+"px";el.style.borderLeftWidth="0px";}
-else{el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth=borderSize+"px";}
-if(this.options.border!=false){el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth=borderSize+"px";}},_marginSize:function(n){if(this._isTransparent()){return 0;}
-var marginSizes=[5,3,2,1];var blendedMarginSizes=[3,2,1,0];var compactMarginSizes=[2,1];var smBlendedMarginSizes=[1,0];if(this.options.compact&&this.options.blend){return smBlendedMarginSizes[n];}else if(this.options.compact){return compactMarginSizes[n];}else if(this.options.blend){return blendedMarginSizes[n];}else{return marginSizes[n];}},_borderSize:function(n){var transparentBorderSizes=[5,3,2,1];var blendedBorderSizes=[2,1,1,1];var compactBorderSizes=[1,0];var actualBorderSizes=[0,2,0,0];if(this.options.compact&&(this.options.blend||this._isTransparent())){return 1;}else if(this.options.compact){return compactBorderSizes[n];}else if(this.options.blend){return blendedBorderSizes[n];}else if(this.options.border){return actualBorderSizes[n];}else if(this._isTransparent()){return transparentBorderSizes[n];}
-return 0;},_hasString:function(str){for(var i=1;i<arguments.length;i++)if(str.indexOf(arguments[i])>=0){return true;}return false;},_blend:function(c1,c2){var cc1=OpenLayers.Rico.Color.createFromHex(c1);cc1.blend(OpenLayers.Rico.Color.createFromHex(c2));return cc1;},_background:function(el){try{return OpenLayers.Rico.Color.createColorFromBackground(el).asHex();}catch(err){return"#ffffff";}},_isTransparent:function(){return this.options.color=="transparent";},_isTopRounded:function(){return this._hasString(this.options.corners,"all","top","tl","tr");},_isBottomRounded:function(){return this._hasString(this.options.corners,"all","bottom","bl","br");},_hasSingleTextChild:function(el){return el.childNodes.length==1&&el.childNodes[0].nodeType==3;}};OpenLayers.ProxyHost="";OpenLayers.nullHandler=function(request){alert(OpenLayers.i18n("unhandledRequest",{'statusText':request.statusText}));};OpenLayers.loadURL=function(uri,params,caller,onComplete,onFailure){var success=(onComplete)?OpenLayers.Function.bind(onComplete,caller):OpenLayers.nullHandler;var failure=(onFailure)?OpenLayers.Function.bind(onFailure,caller):OpenLayers.nullHandler;var request=new OpenLayers.Ajax.Request(uri,{method:'get',parameters:params,onComplete:success,onFailure:failure});return request.transport;};OpenLayers.parseXMLString=function(text){var index=text.indexOf('<');if(index>0){text=text.substring(index);}
-var ajaxResponse=OpenLayers.Util.Try(function(){var xmldom=new ActiveXObject('Microsoft.XMLDOM');xmldom.loadXML(text);return xmldom;},function(){return new DOMParser().parseFromString(text,'text/xml');},function(){var req=new XMLHttpRequest();req.open("GET","data:"+"text/xml"+";charset=utf-8,"+encodeURIComponent(text),false);if(req.overrideMimeType){req.overrideMimeType("text/xml");}
-req.send(null);return req.responseXML;});return ajaxResponse;};OpenLayers.Ajax={emptyFunction:function(){},getTransport:function(){return OpenLayers.Util.Try(function(){return new XMLHttpRequest();},function(){return new ActiveXObject('Msxml2.XMLHTTP');},function(){return new ActiveXObject('Microsoft.XMLHTTP');})||false;},activeRequestCount:0};OpenLayers.Ajax.Responders={responders:[],register:function(responderToAdd){for(var i=0;i<this.responders.length;i++){if(responderToAdd==this.responders[i]){return;}}
-this.responders.push(responderToAdd);},unregister:function(responderToRemove){OpenLayers.Util.removeItem(this.reponders,responderToRemove);},dispatch:function(callback,request,transport){var responder;for(var i=0;i<this.responders.length;i++){responder=this.responders[i];if(responder[callback]&&typeof responder[callback]=='function'){try{responder[callback].apply(responder,[request,transport]);}catch(e){}}}}};OpenLayers.Ajax.Responders.register({onCreate:function(){OpenLayers.Ajax.activeRequestCount++;},onComplete:function(){OpenLayers.Ajax.activeRequestCount--;}});OpenLayers.Ajax.Base=OpenLayers.Class({initialize:function(options){this.options={method:'post',asynchronous:true,contentType:'application/xml',parameters:''};OpenLayers.Util.extend(this.options,options||{});this.options.method=this.options.method.toLowerCase();if(typeof this.options.parameters=='string'){this.options.parameters=OpenLayers.Util.getParameters(this.options.parameters);}}});OpenLayers.Ajax.Request=OpenLayers.Class(OpenLayers.Ajax.Base,{_complete:false,initialize:function(url,options){OpenLayers.Ajax.Base.prototype.initialize.apply(this,[options]);if(OpenLayers.ProxyHost&&OpenLayers.String.startsWith(url,"http")){url=OpenLayers.ProxyHost+encodeURIComponent(url);}
-this.transport=OpenLayers.Ajax.getTransport();this.request(url);},request:function(url){this.url=url;this.method=this.options.method;var params=OpenLayers.Util.extend({},this.options.parameters);if(this.method!='get'&&this.method!='post'){params['_method']=this.method;this.method='post';}
-this.parameters=params;if(params=OpenLayers.Util.getParameterString(params)){if(this.method=='get'){this.url+=((this.url.indexOf('?')>-1)?'&':'?')+params;}else if(/Konqueror|Safari|KHTML/.test(navigator.userAgent)){params+='&_=';}}
-try{var response=new OpenLayers.Ajax.Response(this);if(this.options.onCreate){this.options.onCreate(response);}
-OpenLayers.Ajax.Responders.dispatch('onCreate',this,response);this.transport.open(this.method.toUpperCase(),this.url,this.options.asynchronous);if(this.options.asynchronous){window.setTimeout(OpenLayers.Function.bind(this.respondToReadyState,this,1),10);}
-this.transport.onreadystatechange=OpenLayers.Function.bind(this.onStateChange,this);this.setRequestHeaders();this.body=this.method=='post'?(this.options.postBody||params):null;this.transport.send(this.body);if(!this.options.asynchronous&&this.transport.overrideMimeType){this.onStateChange();}}catch(e){this.dispatchException(e);}},onStateChange:function(){var readyState=this.transport.readyState;if(readyState>1&&!((readyState==4)&&this._complete)){this.respondToReadyState(this.transport.readyState);}},setRequestHeaders:function(){var headers={'X-Requested-With':'XMLHttpRequest','Accept':'text/javascript, text/html, application/xml, text/xml, */*','OpenLayers':true};if(this.method=='post'){headers['Content-type']=this.options.contentType+
-(this.options.encoding?'; charset='+this.options.encoding:'');if(this.transport.overrideMimeType&&(navigator.userAgent.match(/Gecko\/(\d{4})/)||[0,2005])[1]<2005){headers['Connection']='close';}}
-if(typeof this.options.requestHeaders=='object'){var extras=this.options.requestHeaders;if(typeof extras.push=='function'){for(var i=0,length=extras.length;i<length;i+=2){headers[extras[i]]=extras[i+1];}}else{for(var i in extras){headers[i]=pair[i];}}}
-for(var name in headers){this.transport.setRequestHeader(name,headers[name]);}},success:function(){var status=this.getStatus();return!status||(status>=200&&status<300);},getStatus:function(){try{return this.transport.status||0;}catch(e){return 0;}},respondToReadyState:function(readyState){var state=OpenLayers.Ajax.Request.Events[readyState];var response=new OpenLayers.Ajax.Response(this);if(state=='Complete'){try{this._complete=true;(this.options['on'+response.status]||this.options['on'+(this.success()?'Success':'Failure')]||OpenLayers.Ajax.emptyFunction)(response);}catch(e){this.dispatchException(e);}
-var contentType=response.getHeader('Content-type');}
-try{(this.options['on'+state]||OpenLayers.Ajax.emptyFunction)(response);OpenLayers.Ajax.Responders.dispatch('on'+state,this,response);}catch(e){this.dispatchException(e);}
-if(state=='Complete'){this.transport.onreadystatechange=OpenLayers.Ajax.emptyFunction;}},getHeader:function(name){try{return this.transport.getResponseHeader(name);}catch(e){return null;}},dispatchException:function(exception){var handler=this.options.onException;if(handler){handler(this,exception);OpenLayers.Ajax.Responders.dispatch('onException',this,exception);}else{var listener=false;var responders=OpenLayers.Ajax.Responders.responders;for(var i=0;i<responders.length;i++){if(responders[i].onException){listener=true;break;}}
-if(listener){OpenLayers.Ajax.Responders.dispatch('onException',this,exception);}else{throw exception;}}}});OpenLayers.Ajax.Request.Events=['Uninitialized','Loading','Loaded','Interactive','Complete'];OpenLayers.Ajax.Response=OpenLayers.Class({status:0,statusText:'',initialize:function(request){this.request=request;var transport=this.transport=request.transport,readyState=this.readyState=transport.readyState;if((readyState>2&&!(!!(window.attachEvent&&!window.opera)))||readyState==4){this.status=this.getStatus();this.statusText=this.getStatusText();this.responseText=transport.responseText==null?'':String(transport.responseText);}
-if(readyState==4){var xml=transport.responseXML;this.responseXML=xml===undefined?null:xml;}},getStatus:OpenLayers.Ajax.Request.prototype.getStatus,getStatusText:function(){try{return this.transport.statusText||'';}catch(e){return'';}},getHeader:OpenLayers.Ajax.Request.prototype.getHeader,getResponseHeader:function(name){return this.transport.getResponseHeader(name);}});OpenLayers.Ajax.getElementsByTagNameNS=function(parentnode,nsuri,nsprefix,tagname){var elem=null;if(parentnode.getElementsByTagNameNS){elem=parentnode.getElementsByTagNameNS(nsuri,tagname);}else{elem=parentnode.getElementsByTagName(nsprefix+':'+tagname);}
-return elem;};OpenLayers.Ajax.serializeXMLToString=function(xmldom){var serializer=new XMLSerializer();var data=serializer.serializeToString(xmldom);return data;};OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,initialize:function(left,bottom,right,top){if(left!=null){this.left=parseFloat(left);}
-if(bottom!=null){this.bottom=parseFloat(bottom);}
-if(right!=null){this.right=parseFloat(right);}
-if(top!=null){this.top=parseFloat(top);}},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top);},equals:function(bounds){var equals=false;if(bounds!=null){equals=((this.left==bounds.left)&&(this.right==bounds.right)&&(this.top==bounds.top)&&(this.bottom==bounds.bottom));}
-return equals;},toString:function(){return("left-bottom=("+this.left+","+this.bottom+")"
-+" right-top=("+this.right+","+this.top+")");},toArray:function(){return[this.left,this.bottom,this.right,this.top];},toBBOX:function(decimal){if(decimal==null){decimal=6;}
-var mult=Math.pow(10,decimal);var bbox=Math.round(this.left*mult)/mult+","+
-Math.round(this.bottom*mult)/mult+","+
-Math.round(this.right*mult)/mult+","+
-Math.round(this.top*mult)/mult;return bbox;},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])]);},getWidth:function(){return(this.right-this.left);},getHeight:function(){return(this.top-this.bottom);},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight());},getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2);},getCenterLonLat:function(){return new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2);},add:function(x,y){if((x==null)||(y==null)){var msg=OpenLayers.i18n("boundsAddError");OpenLayers.Console.error(msg);return null;}
-return new OpenLayers.Bounds(this.left+x,this.bottom+y,this.right+x,this.top+y);},extend:function(object){var bounds=null;if(object){switch(object.CLASS_NAME){case"OpenLayers.LonLat":bounds=new OpenLayers.Bounds(object.lon,object.lat,object.lon,object.lat);break;case"OpenLayers.Geometry.Point":bounds=new OpenLayers.Bounds(object.x,object.y,object.x,object.y);break;case"OpenLayers.Bounds":bounds=object;break;}
-if(bounds){if((this.left==null)||(bounds.left<this.left)){this.left=bounds.left;}
-if((this.bottom==null)||(bounds.bottom<this.bottom)){this.bottom=bounds.bottom;}
-if((this.right==null)||(bounds.right>this.right)){this.right=bounds.right;}
-if((this.top==null)||(bounds.top>this.top)){this.top=bounds.top;}}}},containsLonLat:function(ll,inclusive){return this.contains(ll.lon,ll.lat,inclusive);},containsPixel:function(px,inclusive){return this.contains(px.x,px.y,inclusive);},contains:function(x,y,inclusive){if(inclusive==null){inclusive=true;}
-var contains=false;if(inclusive){contains=((x>=this.left)&&(x<=this.right)&&(y>=this.bottom)&&(y<=this.top));}else{contains=((x>this.left)&&(x<this.right)&&(y>this.bottom)&&(y<this.top));}
-return contains;},intersectsBounds:function(bounds,inclusive){if(inclusive==null){inclusive=true;}
-var inBottom=(bounds.bottom==this.bottom&&bounds.top==this.top)?true:(((bounds.bottom>this.bottom)&&(bounds.bottom<this.top))||((this.bottom>bounds.bottom)&&(this.bottom<bounds.top)));var inTop=(bounds.bottom==this.bottom&&bounds.top==this.top)?true:(((bounds.top>this.bottom)&&(bounds.top<this.top))||((this.top>bounds.bottom)&&(this.top<bounds.top)));var inRight=(bounds.right==this.right&&bounds.left==this.left)?true:(((bounds.right>this.left)&&(bounds.right<this.right))||((this.right>bounds.left)&&(this.right<bounds.right)));var inLeft=(bounds.right==this.right&&bounds.left==this.left)?true:(((bounds.left>this.left)&&(bounds.left<this.right))||((this.left>bounds.left)&&(this.left<bounds.right)));return(this.containsBounds(bounds,true,inclusive)||bounds.containsBounds(this,true,inclusive)||((inTop||inBottom)&&(inLeft||inRight)));},containsBounds:function(bounds,partial,inclusive){if(partial==null){partial=false;}
-if(inclusive==null){inclusive=true;}
-var inLeft;var inTop;var inRight;var inBottom;if(inclusive){inLeft=(bounds.left>=this.left)&&(bounds.left<=this.right);inTop=(bounds.top>=this.bottom)&&(bounds.top<=this.top);inRight=(bounds.right>=this.left)&&(bounds.right<=this.right);inBottom=(bounds.bottom>=this.bottom)&&(bounds.bottom<=this.top);}else{inLeft=(bounds.left>this.left)&&(bounds.left<this.right);inTop=(bounds.top>this.bottom)&&(bounds.top<this.top);inRight=(bounds.right>this.left)&&(bounds.right<this.right);inBottom=(bounds.bottom>this.bottom)&&(bounds.bottom<this.top);}
-return(partial)?(inTop||inBottom)&&(inLeft||inRight):(inTop&&inLeft&&inBottom&&inRight);},determineQuadrant:function(lonlat){var quadrant="";var center=this.getCenterLonLat();quadrant+=(lonlat.lat<center.lat)?"b":"t";quadrant+=(lonlat.lon<center.lon)?"l":"r";return quadrant;},transform:function(source,dest){var ll=OpenLayers.Projection.transform({'x':this.left,'y':this.bottom},source,dest);var lr=OpenLayers.Projection.transform({'x':this.right,'y':this.bottom},source,dest);var ul=OpenLayers.Projection.transform({'x':this.left,'y':this.top},source,dest);var ur=OpenLayers.Projection.transform({'x':this.right,'y':this.top},source,dest);this.left=Math.min(ll.x,ul.x);this.bottom=Math.min(ll.y,lr.y);this.right=Math.max(lr.x,ur.x);this.top=Math.max(ul.y,ur.y);return this;},wrapDateLine:function(maxExtent,options){options=options||{};var leftTolerance=options.leftTolerance||0;var rightTolerance=options.rightTolerance||0;var newBounds=this.clone();if(maxExtent){while(newBounds.left<maxExtent.left&&(newBounds.right-rightTolerance)<=maxExtent.left){newBounds=newBounds.add(maxExtent.getWidth(),0);}
-while((newBounds.left+leftTolerance)>=maxExtent.right&&newBounds.right>maxExtent.right){newBounds=newBounds.add(-maxExtent.getWidth(),0);}}
-return newBounds;},CLASS_NAME:"OpenLayers.Bounds"});OpenLayers.Bounds.fromString=function(str){var bounds=str.split(",");return OpenLayers.Bounds.fromArray(bounds);};OpenLayers.Bounds.fromArray=function(bbox){return new OpenLayers.Bounds(parseFloat(bbox[0]),parseFloat(bbox[1]),parseFloat(bbox[2]),parseFloat(bbox[3]));};OpenLayers.Bounds.fromSize=function(size){return new OpenLayers.Bounds(0,size.h,size.w,0);};OpenLayers.Bounds.oppositeQuadrant=function(quadrant){var opp="";opp+=(quadrant.charAt(0)=='t')?'b':'t';opp+=(quadrant.charAt(1)=='l')?'r':'l';return opp;};OpenLayers.Element={visible:function(element){return OpenLayers.Util.getElement(element).style.display!='none';},toggle:function(){for(var i=0;i<arguments.length;i++){var element=OpenLayers.Util.getElement(arguments[i]);var display=OpenLayers.Element.visible(element)?'hide':'show';OpenLayers.Element[display](element);}},hide:function(){for(var i=0;i<arguments.length;i++){var element=OpenLayers.Util.getElement(arguments[i]);element.style.display='none';}},show:function(){for(var i=0;i<arguments.length;i++){var element=OpenLayers.Util.getElement(arguments[i]);element.style.display='';}},remove:function(element){element=OpenLayers.Util.getElement(element);element.parentNode.removeChild(element);},getHeight:function(element){element=OpenLayers.Util.getElement(element);return element.offsetHeight;},getDimensions:function(element){element=OpenLayers.Util.getElement(element);if(OpenLayers.Element.getStyle(element,'display')!='none'){return{width:element.offsetWidth,height:element.offsetHeight};}
-var els=element.style;var originalVisibility=els.visibility;var originalPosition=els.position;els.visibility='hidden';els.position='absolute';els.display='';var originalWidth=element.clientWidth;var originalHeight=element.clientHeight;els.display='none';els.position=originalPosition;els.visibility=originalVisibility;return{width:originalWidth,height:originalHeight};},getStyle:function(element,style){element=OpenLayers.Util.getElement(element);var value=element.style[OpenLayers.String.camelize(style)];if(!value){if(document.defaultView&&document.defaultView.getComputedStyle){var css=document.defaultView.getComputedStyle(element,null);value=css?css.getPropertyValue(style):null;}else if(element.currentStyle){value=element.currentStyle[OpenLayers.String.camelize(style)];}}
-var positions=['left','top','right','bottom'];if(window.opera&&(OpenLayers.Util.indexOf(positions,style)!=-1)&&(OpenLayers.Element.getStyle(element,'position')=='static')){value='auto';}
-return value=='auto'?null:value;}};OpenLayers.LonLat=OpenLayers.Class({lon:0.0,lat:0.0,initialize:function(lon,lat){this.lon=parseFloat(lon);this.lat=parseFloat(lat);},toString:function(){return("lon="+this.lon+",lat="+this.lat);},toShortString:function(){return(this.lon+", "+this.lat);},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat);},add:function(lon,lat){if((lon==null)||(lat==null)){var msg=OpenLayers.i18n("lonlatAddError");OpenLayers.Console.error(msg);return null;}
-return new OpenLayers.LonLat(this.lon+lon,this.lat+lat);},equals:function(ll){var equals=false;if(ll!=null){equals=((this.lon==ll.lon&&this.lat==ll.lat)||(isNaN(this.lon)&&isNaN(this.lat)&&isNaN(ll.lon)&&isNaN(ll.lat)));}
-return equals;},transform:function(source,dest){var point=OpenLayers.Projection.transform({'x':this.lon,'y':this.lat},source,dest);this.lon=point.x;this.lat=point.y;return this;},wrapDateLine:function(maxExtent){var newLonLat=this.clone();if(maxExtent){while(newLonLat.lon<maxExtent.left){newLonLat.lon+=maxExtent.getWidth();}
-while(newLonLat.lon>maxExtent.right){newLonLat.lon-=maxExtent.getWidth();}}
-return newLonLat;},CLASS_NAME:"OpenLayers.LonLat"});OpenLayers.LonLat.fromString=function(str){var pair=str.split(",");return new OpenLayers.LonLat(parseFloat(pair[0]),parseFloat(pair[1]));};OpenLayers.Pixel=OpenLayers.Class({x:0.0,y:0.0,initialize:function(x,y){this.x=parseFloat(x);this.y=parseFloat(y);},toString:function(){return("x="+this.x+",y="+this.y);},clone:function(){return new OpenLayers.Pixel(this.x,this.y);},equals:function(px){var equals=false;if(px!=null){equals=((this.x==px.x&&this.y==px.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(px.x)&&isNaN(px.y)));}
-return equals;},add:function(x,y){if((x==null)||(y==null)){var msg=OpenLayers.i18n("pixelAddError");OpenLayers.Console.error(msg);return null;}
-return new OpenLayers.Pixel(this.x+x,this.y+y);},offset:function(px){var newPx=this.clone();if(px){newPx=this.add(px.x,px.y);}
-return newPx;},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0.0,h:0.0,initialize:function(w,h){this.w=parseFloat(w);this.h=parseFloat(h);},toString:function(){return("w="+this.w+",h="+this.h);},clone:function(){return new OpenLayers.Size(this.w,this.h);},equals:function(sz){var equals=false;if(sz!=null){equals=((this.w==sz.w&&this.h==sz.h)||(isNaN(this.w)&&isNaN(this.h)&&isNaN(sz.w)&&isNaN(sz.h)));}
-return equals;},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},assert:function(){},dir:function(){},dirxml:function(){},trace:function(){},group:function(){},groupEnd:function(){},time:function(){},timeEnd:function(){},profile:function(){},profileEnd:function(){},count:function(){},CLASS_NAME:"OpenLayers.Console"};(function(){if(window.console){var scripts=document.getElementsByTagName("script");for(var i=0;i<scripts.length;++i){if(scripts[i].src.indexOf("firebug.js")!=-1){OpenLayers.Util.extend(OpenLayers.Console,console);break;}}}})();OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:false,displayClass:"",title:"",active:null,handler:null,eventListeners:null,events:null,EVENT_TYPES:["activate","deactivate"],initialize:function(options){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,options);this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}
-this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){if(this.events){if(this.eventListeners){this.events.un(this.eventListeners);}
+container.removeChild(content);containerElement.removeChild(container);return new OpenLayers.Size(w,h);};OpenLayers.Util.getScrollbarWidth=function(){var scrollbarWidth=OpenLayers.Util._scrollbarWidth;if(scrollbarWidth==null){var scr=null;var inn=null;var wNoScroll=0;var wScroll=0;scr=document.createElement('div');scr.style.position='absolute';scr.style.top='-1000px';scr.style.left='-1000px';scr.style.width='100px';scr.style.height='50px';scr.style.overflow='hidden';inn=document.createElement('div');inn.style.width='100%';inn.style.height='200px';scr.appendChild(inn);document.body.appendChild(scr);wNoScroll=inn.offsetWidth;scr.style.overflow='scroll';wScroll=inn.offsetWidth;document.body.removeChild(document.body.lastChild);OpenLayers.Util._scrollbarWidth=(wNoScroll-wScroll);scrollbarWidth=OpenLayers.Util._scrollbarWidth;}
+return scrollbarWidth;};OpenLayers.Util.getFormattedLonLat=function(coordinate,axis,dmsOption){if(!dmsOption){dmsOption='dms';}
+coordinate=(coordinate+540)%360-180;var abscoordinate=Math.abs(coordinate);var coordinatedegrees=Math.floor(abscoordinate);var coordinateminutes=(abscoordinate-coordinatedegrees)/(1/60);var tempcoordinateminutes=coordinateminutes;coordinateminutes=Math.floor(coordinateminutes);var coordinateseconds=(tempcoordinateminutes-coordinateminutes)/(1/60);coordinateseconds=Math.round(coordinateseconds*10);coordinateseconds/=10;if(coordinateseconds>=60){coordinateseconds-=60;coordinateminutes+=1;if(coordinateminutes>=60){coordinateminutes-=60;coordinatedegrees+=1;}}
+if(coordinatedegrees<10){coordinatedegrees="0"+coordinatedegrees;}
+var str=coordinatedegrees+"\u00B0";if(dmsOption.indexOf('dm')>=0){if(coordinateminutes<10){coordinateminutes="0"+coordinateminutes;}
+str+=coordinateminutes+"'";if(dmsOption.indexOf('dms')>=0){if(coordinateseconds<10){coordinateseconds="0"+coordinateseconds;}
+str+=coordinateseconds+'"';}}
+if(axis=="lon"){str+=coordinate<0?OpenLayers.i18n("W"):OpenLayers.i18n("E");}else{str+=coordinate<0?OpenLayers.i18n("S"):OpenLayers.i18n("N");}
+return str;};OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:false,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;},destroy:function(){},read:function(data){throw new Error('Read not implemented.');},write:function(object){throw new Error('Write not implemented.');},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Format.CSWGetRecords=function(options){options=OpenLayers.Util.applyDefaults(options,OpenLayers.Format.CSWGetRecords.DEFAULTS);var cls=OpenLayers.Format.CSWGetRecords["v"+options.version.replace(/\./g,"_")];if(!cls){throw"Unsupported CSWGetRecords version: "+options.version;}
+return new cls(options);};OpenLayers.Format.CSWGetRecords.DEFAULTS={"version":"2.0.2"};OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:false,displayClass:"",title:"",autoActivate:false,active:null,handlerOptions:null,handler:null,eventListeners:null,events:null,initialize:function(options){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,options);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}
+if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");}},destroy:function(){if(this.events){if(this.eventListeners){this.events.un(this.eventListeners);}
this.events.destroy();this.events=null;}
this.eventListeners=null;if(this.handler){this.handler.destroy();this.handler=null;}
if(this.handlers){for(var key in this.handlers){if(this.handlers.hasOwnProperty(key)&&typeof this.handlers[key].destroy=="function"){this.handlers[key].destroy();}}
this.handlers=null;}
-if(this.map){this.map.removeControl(this);this.map=null;}},setMap:function(map){this.map=map;if(this.handler){this.handler.setMap(map);}},draw:function(px){if(this.div==null){this.div=OpenLayers.Util.createDiv(this.id);this.div.className=this.displayClass;if(!this.allowSelection){this.div.className+=" olControlNoSelect";this.div.setAttribute("unselectable","on",0);this.div.onselectstart=function(){return(false);};}
+if(this.map){this.map.removeControl(this);this.map=null;}
+this.div=null;},setMap:function(map){this.map=map;if(this.handler){this.handler.setMap(map);}},draw:function(px){if(this.div==null){this.div=OpenLayers.Util.createDiv(this.id);this.div.className=this.displayClass;if(!this.allowSelection){this.div.className+=" olControlNoSelect";this.div.setAttribute("unselectable","on",0);this.div.onselectstart=OpenLayers.Function.False;}
if(this.title!=""){this.div.title=this.title;}}
if(px!=null){this.position=px.clone();}
this.moveTo(this.position);return this.div;},moveTo:function(px){if((px!=null)&&(this.div!=null)){this.div.style.left=px.x+"px";this.div.style.top=px.y+"px";}},activate:function(){if(this.active){return false;}
if(this.handler){this.handler.activate();}
-this.active=true;this.events.triggerEvent("activate");return true;},deactivate:function(){if(this.active){if(this.handler){this.handler.deactivate();}
-this.active=false;this.events.triggerEvent("deactivate");return true;}
-return false;},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Icon=OpenLayers.Class({url:null,size:null,offset:null,calculateOffset:null,imageDiv:null,px:null,initialize:function(url,size,offset,calculateOffset){this.url=url;this.size=(size)?size:new OpenLayers.Size(20,20);this.offset=offset?offset:new OpenLayers.Pixel(-(this.size.w/2),-(this.size.h/2));this.calculateOffset=calculateOffset;var id=OpenLayers.Util.createUniqueID("OL_Icon_");this.imageDiv=OpenLayers.Util.createAlphaImageDiv(id);},destroy:function(){OpenLayers.Event.stopObservingElement(this.imageDiv.firstChild);this.imageDiv.innerHTML="";this.imageDiv=null;},clone:function(){return new OpenLayers.Icon(this.url,this.size,this.offset,this.calculateOffset);},setSize:function(size){if(size!=null){this.size=size;}
-this.draw();},setUrl:function(url){if(url!=null){this.url=url;}
-this.draw();},draw:function(px){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,this.size,this.url,"absolute");this.moveTo(px);return this.imageDiv;},setOpacity:function(opacity){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,null,null,null,null,null,opacity);},moveTo:function(px){if(px!=null){this.px=px;}
-if(this.imageDiv!=null){if(this.px==null){this.display(false);}else{if(this.calculateOffset){this.offset=this.calculateOffset(this.size);}
-var offsetPx=this.px.offset(this.offset);OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,offsetPx);}}},display:function(display){this.imageDiv.style.display=(display)?"":"none";},CLASS_NAME:"OpenLayers.Icon"});OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){if(!OpenLayers.Lang.code){OpenLayers.Lang.setCode();}
-return OpenLayers.Lang.code;},setCode:function(code){var lang;if(!code){code=(OpenLayers.Util.getBrowserName()=="msie")?navigator.userLanguage:navigator.language;}
-var parts=code.split('-');parts[0]=parts[0].toLowerCase();if(typeof OpenLayers.Lang[parts[0]]=="object"){lang=parts[0];}
-if(parts[1]){var testLang=parts[0]+'-'+parts[1].toUpperCase();if(typeof OpenLayers.Lang[testLang]=="object"){lang=testLang;}}
-if(!lang){OpenLayers.Console.warn('Failed to find OpenLayers.Lang.'+parts.join("-")+' dictionary, falling back to default language');lang=OpenLayers.Lang.defaultCode;}
-OpenLayers.Lang.code=lang;},translate:function(key,context){var dictionary=OpenLayers.Lang[OpenLayers.Lang.getCode()];var message=dictionary[key];if(!message){message=key;}
-if(context){message=OpenLayers.String.format(message,context);}
-return message;}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Popup=OpenLayers.Class({events:null,id:"",lonlat:null,div:null,size:null,contentHTML:"",backgroundColor:"",opacity:"",border:"",contentDiv:null,groupDiv:null,closeDiv:null,autoSize:false,minSize:null,maxSize:null,padding:0,fixPadding:function(){if(typeof this.padding=="number"){this.padding=new OpenLayers.Bounds(this.padding,this.padding,this.padding,this.padding);}},panMapIfOutOfView:false,map:null,initialize:function(id,lonlat,size,contentHTML,closeBox,closeBoxCallback){if(id==null){id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");}
-this.id=id;this.lonlat=lonlat;this.size=(size!=null)?size:new OpenLayers.Size(OpenLayers.Popup.WIDTH,OpenLayers.Popup.HEIGHT);if(contentHTML!=null){this.contentHTML=contentHTML;}
-this.backgroundColor=OpenLayers.Popup.COLOR;this.opacity=OpenLayers.Popup.OPACITY;this.border=OpenLayers.Popup.BORDER;this.div=OpenLayers.Util.createDiv(this.id,null,null,null,null,null,"hidden");this.div.className='olPopup';var groupDivId=this.id+"_GroupDiv";this.groupDiv=OpenLayers.Util.createDiv(groupDivId,null,null,null,"relative",null,"hidden");var id=this.div.id+"_contentDiv";this.contentDiv=OpenLayers.Util.createDiv(id,null,this.size.clone(),null,"relative");this.contentDiv.className='olPopupContent';this.groupDiv.appendChild(this.contentDiv);this.div.appendChild(this.groupDiv);if(closeBox){this.addCloseBox(closeBoxCallback);}
-this.registerEvents();},destroy:function(){this.id=null;this.lonlat=null;this.size=null;this.contentHTML=null;this.backgroundColor=null;this.opacity=null;this.border=null;this.events.destroy();this.events=null;if(this.closeDiv){OpenLayers.Event.stopObservingElement(this.closeDiv);this.groupDiv.removeChild(this.closeDiv);}
-this.closeDiv=null;this.div.removeChild(this.groupDiv);this.groupDiv=null;if(this.map!=null){this.map.removePopup(this);}
-this.map=null;this.div=null;this.autoSize=null;this.minSize=null;this.maxSize=null;this.padding=null;this.panMapIfOutOfView=null;},draw:function(px){if(px==null){if((this.lonlat!=null)&&(this.map!=null)){px=this.map.getLayerPxFromLonLat(this.lonlat);}}
-if(OpenLayers.Util.getBrowserName()=='firefox'){this.map.events.register("movestart",this,function(){var style=document.defaultView.getComputedStyle(this.contentDiv,null);var currentOverflow=style.getPropertyValue("overflow");if(currentOverflow!="hidden"){this.contentDiv._oldOverflow=currentOverflow;this.contentDiv.style.overflow="hidden";}});this.map.events.register("moveend",this,function(){var oldOverflow=this.contentDiv._oldOverflow;if(oldOverflow){this.contentDiv.style.overflow=oldOverflow;this.contentDiv._oldOverflow=null;}});}
-this.moveTo(px);if(!this.autoSize){this.setSize(this.size);}
-this.setBackgroundColor();this.setOpacity();this.setBorder();this.setContentHTML();if(this.panMapIfOutOfView){this.panIntoView();}
-return this.div;},updatePosition:function(){if((this.lonlat)&&(this.map)){var px=this.map.getLayerPxFromLonLat(this.lonlat);if(px){this.moveTo(px);}}},moveTo:function(px){if((px!=null)&&(this.div!=null)){this.div.style.left=px.x+"px";this.div.style.top=px.y+"px";}},visible:function(){return OpenLayers.Element.visible(this.div);},toggle:function(){if(this.visible()){this.hide();}else{this.show();}},show:function(){OpenLayers.Element.show(this.div);if(this.panMapIfOutOfView){this.panIntoView();}},hide:function(){OpenLayers.Element.hide(this.div);},setSize:function(size){this.size=size;var contentSize=this.size.clone();var contentDivPadding=this.getContentDivPadding();var wPadding=contentDivPadding.left+contentDivPadding.right;var hPadding=contentDivPadding.top+contentDivPadding.bottom;this.fixPadding();wPadding+=this.padding.left+this.padding.right;hPadding+=this.padding.top+this.padding.bottom;if(this.closeDiv){var closeDivWidth=parseInt(this.closeDiv.style.width);wPadding+=closeDivWidth+contentDivPadding.right;}
-this.size.w+=wPadding;this.size.h+=hPadding;if(OpenLayers.Util.getBrowserName()=="msie"){contentSize.w+=contentDivPadding.left+contentDivPadding.right;contentSize.h+=contentDivPadding.bottom+contentDivPadding.top;}
-if(this.div!=null){this.div.style.width=this.size.w+"px";this.div.style.height=this.size.h+"px";}
-if(this.contentDiv!=null){this.contentDiv.style.width=contentSize.w+"px";this.contentDiv.style.height=contentSize.h+"px";}},setBackgroundColor:function(color){if(color!=undefined){this.backgroundColor=color;}
-if(this.div!=null){this.div.style.backgroundColor=this.backgroundColor;}},setOpacity:function(opacity){if(opacity!=undefined){this.opacity=opacity;}
-if(this.div!=null){this.div.style.opacity=this.opacity;this.div.style.filter='alpha(opacity='+this.opacity*100+')';}},setBorder:function(border){if(border!=undefined){this.border=border;}
-if(this.div!=null){this.div.style.border=this.border;}},setContentHTML:function(contentHTML){if(contentHTML!=null){this.contentHTML=contentHTML;}
-if(this.autoSize){var realSize=OpenLayers.Util.getRenderedDimensions(this.contentHTML);var safeSize=this.getSafeContentSize(realSize);var newSize=null;if(safeSize.equals(realSize)){newSize=realSize;}else{var fixedSize=new OpenLayers.Size();fixedSize.w=(safeSize.w<realSize.w)?safeSize.w:null;fixedSize.h=(safeSize.h<realSize.h)?safeSize.h:null;if(fixedSize.w&&fixedSize.h){newSize=safeSize;}else{var clippedSize=OpenLayers.Util.getRenderedDimensions(this.contentHTML,fixedSize);var currentOverflow=OpenLayers.Element.getStyle(this.contentDiv,"overflow");if((currentOverflow!="hidden")&&(clippedSize.equals(safeSize))){var scrollBar=OpenLayers.Util.getScrollbarWidth();if(fixedSize.w){clippedSize.h+=scrollBar;}else{clippedSize.w+=scrollBar;}}
-newSize=this.getSafeContentSize(clippedSize);}}
-this.setSize(newSize);}
-if(this.contentDiv!=null){this.contentDiv.innerHTML=this.contentHTML;}},getSafeContentSize:function(size){var safeContentSize=size.clone();var contentDivPadding=this.getContentDivPadding();var wPadding=contentDivPadding.left+contentDivPadding.right;var hPadding=contentDivPadding.top+contentDivPadding.bottom;this.fixPadding();wPadding+=this.padding.left+this.padding.right;hPadding+=this.padding.top+this.padding.bottom;if(this.closeDiv){var closeDivWidth=parseInt(this.closeDiv.style.width);wPadding+=closeDivWidth+contentDivPadding.right;}
-if(this.minSize){safeContentSize.w=Math.max(safeContentSize.w,(this.minSize.w-wPadding));safeContentSize.h=Math.max(safeContentSize.h,(this.minSize.h-hPadding));}
-if(this.maxSize){safeContentSize.w=Math.min(safeContentSize.w,(this.maxSize.w-wPadding));safeContentSize.h=Math.min(safeContentSize.h,(this.maxSize.h-hPadding));}
-if(this.map&&this.map.size){var maxY=this.map.size.h-
-this.map.paddingForPopups.top-
-this.map.paddingForPopups.bottom-
-hPadding;var maxX=this.map.size.w-
-this.map.paddingForPopups.left-
-this.map.paddingForPopups.right-
-wPadding;safeContentSize.w=Math.min(safeContentSize.w,maxX);safeContentSize.h=Math.min(safeContentSize.h,maxY);}
-return safeContentSize;},getContentDivPadding:function(){var contentDivPadding=this._contentDivPadding;if(!contentDivPadding){this.div.style.display="none";document.body.appendChild(this.div);contentDivPadding=new OpenLayers.Bounds(OpenLayers.Element.getStyle(this.contentDiv,"padding-left"),OpenLayers.Element.getStyle(this.contentDiv,"padding-bottom"),OpenLayers.Element.getStyle(this.contentDiv,"padding-right"),OpenLayers.Element.getStyle(this.contentDiv,"padding-top"));this._contentDivPadding=contentDivPadding;document.body.removeChild(this.div);this.div.style.display="";}
-return contentDivPadding;},addCloseBox:function(callback){this.closeDiv=OpenLayers.Util.createDiv(this.id+"_close",null,new OpenLayers.Size(17,17));this.closeDiv.className="olPopupCloseBox";var contentDivPadding=this.getContentDivPadding();this.closeDiv.style.right=contentDivPadding.right+"px";this.closeDiv.style.top=contentDivPadding.top+"px";this.groupDiv.appendChild(this.closeDiv);var closePopup=callback||function(e){this.hide();OpenLayers.Event.stop(e);};OpenLayers.Event.observe(this.closeDiv,"click",OpenLayers.Function.bindAsEventListener(closePopup,this));},panIntoView:function(){var mapSize=this.map.getSize();var origTL=this.map.getViewPortPxFromLayerPx(new OpenLayers.Pixel(parseInt(this.div.style.left),parseInt(this.div.style.top)));var newTL=origTL.clone();if(origTL.x<this.map.paddingForPopups.left){newTL.x=this.map.paddingForPopups.left;}else
-if((origTL.x+this.size.w)>(mapSize.w-this.map.paddingForPopups.right)){newTL.x=mapSize.w-this.map.paddingForPopups.right-this.size.w;}
-if(origTL.y<this.map.paddingForPopups.top){newTL.y=this.map.paddingForPopups.top;}else
-if((origTL.y+this.size.h)>(mapSize.h-this.map.paddingForPopups.bottom)){newTL.y=mapSize.h-this.map.paddingForPopups.bottom-this.size.h;}
-var dx=origTL.x-newTL.x;var dy=origTL.y-newTL.y;this.map.pan(dx,dy);},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,true);this.events.on({"mousedown":this.onmousedown,"mousemove":this.onmousemove,"mouseup":this.onmouseup,"click":this.onclick,"mouseout":this.onmouseout,"dblclick":this.ondblclick,scope:this});},onmousedown:function(evt){this.mousedown=true;OpenLayers.Event.stop(evt,true);},onmousemove:function(evt){if(this.mousedown){OpenLayers.Event.stop(evt,true);}},onmouseup:function(evt){if(this.mousedown){this.mousedown=false;OpenLayers.Event.stop(evt,true);}},onclick:function(evt){OpenLayers.Event.stop(evt,true);},onmouseout:function(evt){this.mousedown=false;},ondblclick:function(evt){OpenLayers.Event.stop(evt,true);},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white";OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Renderer=OpenLayers.Class({container:null,extent:null,size:null,resolution:null,map:null,initialize:function(containerID){this.container=OpenLayers.Util.getElement(containerID);},destroy:function(){this.container=null;this.extent=null;this.size=null;this.resolution=null;this.map=null;},supported:function(){return false;},setExtent:function(extent){this.extent=extent.clone();this.resolution=null;},setSize:function(size){this.size=size.clone();this.resolution=null;},getResolution:function(){this.resolution=this.resolution||this.map.getResolution();return this.resolution;},drawFeature:function(feature,style){if(style==null){style=feature.style;}
-if(feature.geometry){this.drawGeometry(feature.geometry,style,feature.id);}},drawGeometry:function(geometry,style,featureId){},clear:function(){},getFeatureIdFromEvent:function(evt){},eraseFeatures:function(features){if(!(features instanceof Array)){features=[features];}
-for(var i=0;i<features.length;++i){this.eraseGeometry(features[i].geometry);}},eraseGeometry:function(geometry){},CLASS_NAME:"OpenLayers.Renderer"});OpenLayers.Tween=OpenLayers.Class({INTERVAL:10,easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,interval:null,playing:false,initialize:function(easing){this.easing=(easing)?easing:OpenLayers.Easing.Expo.easeOut;},start:function(begin,finish,duration,options){this.playing=true;this.begin=begin;this.finish=finish;this.duration=duration;this.callbacks=options.callbacks;this.time=0;if(this.interval){window.clearInterval(this.interval);this.interval=null;}
-if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin);}
-this.interval=window.setInterval(OpenLayers.Function.bind(this.play,this),this.INTERVAL);},stop:function(){if(!this.playing){return;}
-if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish);}
-window.clearInterval(this.interval);this.interval=null;this.playing=false;},play:function(){var value={};for(var i in this.begin){var b=this.begin[i];var f=this.finish[i];if(b==null||f==null||isNaN(b)||isNaN(f)){OpenLayers.Console.error('invalid value for Tween');}
-var c=f-b;value[i]=this.easing.apply(this,[this.time,b,c,this.duration]);}
-this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,value);}
-if(this.time>this.duration){if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish);this.playing=false;}
-window.clearInterval(this.interval);this.interval=null;}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(t,b,c,d){return c*t/d+b;},easeOut:function(t,b,c,d){return c*t/d+b;},easeInOut:function(t,b,c,d){return c*t/d+b;},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(t,b,c,d){return(t==0)?b:c*Math.pow(2,10*(t/d-1))+b;},easeOut:function(t,b,c,d){return(t==d)?b+c:c*(-Math.pow(2,-10*t/d)+1)+b;},easeInOut:function(t,b,c,d){if(t==0)return b;if(t==d)return b+c;if((t/=d/2)<1)return c/2*Math.pow(2,10*(t-1))+b;return c/2*(-Math.pow(2,-10*--t)+2)+b;},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(t,b,c,d){return c*(t/=d)*t+b;},easeOut:function(t,b,c,d){return-c*(t/=d)*(t-2)+b;},easeInOut:function(t,b,c,d){if((t/=d/2)<1)return c/2*t*t+b;return-c/2*((--t)*(t-2)-1)+b;},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Rico.Color=OpenLayers.Class({initialize:function(red,green,blue){this.rgb={r:red,g:green,b:blue};},setRed:function(r){this.rgb.r=r;},setGreen:function(g){this.rgb.g=g;},setBlue:function(b){this.rgb.b=b;},setHue:function(h){var hsb=this.asHSB();hsb.h=h;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},setSaturation:function(s){var hsb=this.asHSB();hsb.s=s;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},setBrightness:function(b){var hsb=this.asHSB();hsb.b=b;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},darken:function(percent){var hsb=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,Math.max(hsb.b-percent,0));},brighten:function(percent){var hsb=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,Math.min(hsb.b+percent,1));},blend:function(other){this.rgb.r=Math.floor((this.rgb.r+other.rgb.r)/2);this.rgb.g=Math.floor((this.rgb.g+other.rgb.g)/2);this.rgb.b=Math.floor((this.rgb.b+other.rgb.b)/2);},isBright:function(){var hsb=this.asHSB();return this.asHSB().b>0.5;},isDark:function(){return!this.isBright();},asRGB:function(){return"rgb("+this.rgb.r+","+this.rgb.g+","+this.rgb.b+")";},asHex:function(){return"#"+this.rgb.r.toColorPart()+this.rgb.g.toColorPart()+this.rgb.b.toColorPart();},asHSB:function(){return OpenLayers.Rico.Color.RGBtoHSB(this.rgb.r,this.rgb.g,this.rgb.b);},toString:function(){return this.asHex();}});OpenLayers.Rico.Color.createFromHex=function(hexCode){if(hexCode.length==4){var shortHexCode=hexCode;var hexCode='#';for(var i=1;i<4;i++){hexCode+=(shortHexCode.charAt(i)+
-shortHexCode.charAt(i));}}
-if(hexCode.indexOf('#')==0){hexCode=hexCode.substring(1);}
-var red=hexCode.substring(0,2);var green=hexCode.substring(2,4);var blue=hexCode.substring(4,6);return new OpenLayers.Rico.Color(parseInt(red,16),parseInt(green,16),parseInt(blue,16));};OpenLayers.Rico.Color.createColorFromBackground=function(elem){var actualColor=RicoUtil.getElementsComputedStyle(OpenLayers.Util.getElement(elem),"backgroundColor","background-color");if(actualColor=="transparent"&&elem.parentNode){return OpenLayers.Rico.Color.createColorFromBackground(elem.parentNode);}
-if(actualColor==null){return new OpenLayers.Rico.Color(255,255,255);}
-if(actualColor.indexOf("rgb(")==0){var colors=actualColor.substring(4,actualColor.length-1);var colorArray=colors.split(",");return new OpenLayers.Rico.Color(parseInt(colorArray[0]),parseInt(colorArray[1]),parseInt(colorArray[2]));}
-else if(actualColor.indexOf("#")==0){return OpenLayers.Rico.Color.createFromHex(actualColor);}
-else{return new OpenLayers.Rico.Color(255,255,255);}};OpenLayers.Rico.Color.HSBtoRGB=function(hue,saturation,brightness){var red=0;var green=0;var blue=0;if(saturation==0){red=parseInt(brightness*255.0+0.5);green=red;blue=red;}
-else{var h=(hue-Math.floor(hue))*6.0;var f=h-Math.floor(h);var p=brightness*(1.0-saturation);var q=brightness*(1.0-saturation*f);var t=brightness*(1.0-(saturation*(1.0-f)));switch(parseInt(h)){case 0:red=(brightness*255.0+0.5);green=(t*255.0+0.5);blue=(p*255.0+0.5);break;case 1:red=(q*255.0+0.5);green=(brightness*255.0+0.5);blue=(p*255.0+0.5);break;case 2:red=(p*255.0+0.5);green=(brightness*255.0+0.5);blue=(t*255.0+0.5);break;case 3:red=(p*255.0+0.5);green=(q*255.0+0.5);blue=(brightness*255.0+0.5);break;case 4:red=(t*255.0+0.5);green=(p*255.0+0.5);blue=(brightness*255.0+0.5);break;case 5:red=(brightness*255.0+0.5);green=(p*255.0+0.5);blue=(q*255.0+0.5);break;}}
-return{r:parseInt(red),g:parseInt(green),b:parseInt(blue)};};OpenLayers.Rico.Color.RGBtoHSB=function(r,g,b){var hue;var saturation;var brightness;var cmax=(r>g)?r:g;if(b>cmax){cmax=b;}
-var cmin=(r<g)?r:g;if(b<cmin){cmin=b;}
-brightness=cmax/255.0;if(cmax!=0){saturation=(cmax-cmin)/cmax;}else{saturation=0;}
-if(saturation==0){hue=0;}else{var redc=(cmax-r)/(cmax-cmin);var greenc=(cmax-g)/(cmax-cmin);var bluec=(cmax-b)/(cmax-cmin);if(r==cmax){hue=bluec-greenc;}else if(g==cmax){hue=2.0+redc-bluec;}else{hue=4.0+greenc-redc;}
-hue=hue/6.0;if(hue<0){hue=hue+1.0;}}
-return{h:hue,s:saturation,b:brightness};};OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0;i<this.map.controls.length;i++){var control=this.map.controls[i];if((control!=this)&&(control.CLASS_NAME=="OpenLayers.Control.ArgParser")){if(control.displayProjection!=this.displayProjection){this.displayProjection=control.displayProjection;}
-break;}}
-if(i==this.map.controls.length){var args=OpenLayers.Util.getParameters();if(args.layers){this.layers=args.layers;this.map.events.register('addlayer',this,this.configureLayers);this.configureLayers();}
-if(args.lat&&args.lon){this.center=new OpenLayers.LonLat(parseFloat(args.lon),parseFloat(args.lat));if(args.zoom){this.zoom=parseInt(args.zoom);}
-this.map.events.register('changebaselayer',this,this.setCenter);this.setCenter();}}},setCenter:function(){if(this.map.baseLayer){this.map.events.unregister('changebaselayer',this,this.setCenter);if(this.displayProjection){this.center.transform(this.displayProjection,this.map.getProjectionObject());}
-this.map.setCenter(this.center,this.zoom);}},configureLayers:function(){if(this.layers.length==this.map.layers.length){this.map.events.unregister('addlayer',this,this.configureLayers);for(var i=0;i<this.layers.length;i++){var layer=this.map.layers[i];var c=this.layers.charAt(i);if(c=="B"){this.map.setBaseLayer(layer);}else if((c=="T")||(c=="F")){layer.setVisibility(c=="T");}}}},CLASS_NAME:"OpenLayers.Control.ArgParser"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){this.map.events.un({"removelayer":this.updateAttribution,"addlayer":this.updateAttribution,"changelayer":this.updateAttribution,"changebaselayer":this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({'changebaselayer':this.updateAttribution,'changelayer':this.updateAttribution,'addlayer':this.updateAttribution,'removelayer':this.updateAttribution,scope:this});this.updateAttribution();return this.div;},updateAttribution:function(){var attributions=[];if(this.map&&this.map.layers){for(var i=0;i<this.map.layers.length;i++){var layer=this.map.layers[i];if(layer.attribution&&layer.getVisibility()){attributions.push(layer.attribution);}}
-this.div.innerHTML=attributions.join(this.separator);}},CLASS_NAME:"OpenLayers.Control.Attribution"});OpenLayers.Control.Button=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_BUTTON,trigger:function(){},CLASS_NAME:"OpenLayers.Control.Button"});OpenLayers.Control.LayerSwitcher=OpenLayers.Class(OpenLayers.Control,{activeColor:"darkblue",layerStates:null,layersDiv:null,baseLayersDiv:null,baseLayers:null,dataLbl:null,dataLayersDiv:null,dataLayers:null,minimizeDiv:null,maximizeDiv:null,ascending:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.layerStates=[];},destroy:function(){OpenLayers.Event.stopObservingElement(this.div);OpenLayers.Event.stopObservingElement(this.minimizeDiv);OpenLayers.Event.stopObservingElement(this.maximizeDiv);this.clearLayersArray("base");this.clearLayersArray("data");this.map.events.un({"addlayer":this.redraw,"changelayer":this.redraw,"removelayer":this.redraw,"changebaselayer":this.redraw,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.on({"addlayer":this.redraw,"changelayer":this.redraw,"removelayer":this.redraw,"changebaselayer":this.redraw,scope:this});},draw:function(){OpenLayers.Control.prototype.draw.apply(this);this.loadContents();if(!this.outsideViewport){this.minimizeControl();}
-this.redraw();return this.div;},clearLayersArray:function(layersType){var layers=this[layersType+"Layers"];if(layers){for(var i=0;i<layers.length;i++){var layer=layers[i];OpenLayers.Event.stopObservingElement(layer.inputElem);OpenLayers.Event.stopObservingElement(layer.labelSpan);}}
-this[layersType+"LayersDiv"].innerHTML="";this[layersType+"Layers"]=[];},checkRedraw:function(){var redraw=false;if(!this.layerStates.length||(this.map.layers.length!=this.layerStates.length)){redraw=true;}else{for(var i=0;i<this.layerStates.length;i++){var layerState=this.layerStates[i];var layer=this.map.layers[i];if((layerState.name!=layer.name)||(layerState.inRange!=layer.inRange)||(layerState.id!=layer.id)||(layerState.visibility!=layer.visibility)){redraw=true;break;}}}
-return redraw;},redraw:function(){if(!this.checkRedraw()){return this.div;}
-this.clearLayersArray("base");this.clearLayersArray("data");var containsOverlays=false;var containsBaseLayers=false;this.layerStates=new Array(this.map.layers.length);for(var i=0;i<this.map.layers.length;i++){var layer=this.map.layers[i];this.layerStates[i]={'name':layer.name,'visibility':layer.visibility,'inRange':layer.inRange,'id':layer.id};}
-var layers=this.map.layers.slice();if(!this.ascending){layers.reverse();}
-for(var i=0;i<layers.length;i++){var layer=layers[i];var baseLayer=layer.isBaseLayer;if(layer.displayInLayerSwitcher){if(baseLayer){containsBaseLayers=true;}else{containsOverlays=true;}
-var checked=(baseLayer)?(layer==this.map.baseLayer):layer.getVisibility();var inputElem=document.createElement("input");inputElem.id="input_"+layer.name;inputElem.name=(baseLayer)?"baseLayers":layer.name;inputElem.type=(baseLayer)?"radio":"checkbox";inputElem.value=layer.name;inputElem.checked=checked;inputElem.defaultChecked=checked;if(!baseLayer&&!layer.inRange){inputElem.disabled=true;}
-var context={'inputElem':inputElem,'layer':layer,'layerSwitcher':this};OpenLayers.Event.observe(inputElem,"mouseup",OpenLayers.Function.bindAsEventListener(this.onInputClick,context));var labelSpan=document.createElement("span");if(!baseLayer&&!layer.inRange){labelSpan.style.color="gray";}
-labelSpan.innerHTML=layer.name;labelSpan.style.verticalAlign=(baseLayer)?"bottom":"baseline";OpenLayers.Event.observe(labelSpan,"click",OpenLayers.Function.bindAsEventListener(this.onInputClick,context));var br=document.createElement("br");var groupArray=(baseLayer)?this.baseLayers:this.dataLayers;groupArray.push({'layer':layer,'inputElem':inputElem,'labelSpan':labelSpan});var groupDiv=(baseLayer)?this.baseLayersDiv:this.dataLayersDiv;groupDiv.appendChild(inputElem);groupDiv.appendChild(labelSpan);groupDiv.appendChild(br);}}
-this.dataLbl.style.display=(containsOverlays)?"":"none";this.baseLbl.style.display=(containsBaseLayers)?"":"none";return this.div;},onInputClick:function(e){if(!this.inputElem.disabled){if(this.inputElem.type=="radio"){this.inputElem.checked=true;this.layer.map.setBaseLayer(this.layer);}else{this.inputElem.checked=!this.inputElem.checked;this.layerSwitcher.updateMap();}}
-OpenLayers.Event.stop(e);},onLayerClick:function(e){this.updateMap();},updateMap:function(){for(var i=0;i<this.baseLayers.length;i++){var layerEntry=this.baseLayers[i];if(layerEntry.inputElem.checked){this.map.setBaseLayer(layerEntry.layer,false);}}
-for(var i=0;i<this.dataLayers.length;i++){var layerEntry=this.dataLayers[i];layerEntry.layer.setVisibility(layerEntry.inputElem.checked);}},maximizeControl:function(e){this.div.style.width="20em";this.div.style.height="";this.showControls(false);if(e!=null){OpenLayers.Event.stop(e);}},minimizeControl:function(e){this.div.style.width="0px";this.div.style.height="0px";this.showControls(true);if(e!=null){OpenLayers.Event.stop(e);}},showControls:function(minimize){this.maximizeDiv.style.display=minimize?"":"none";this.minimizeDiv.style.display=minimize?"none":"";this.layersDiv.style.display=minimize?"none":"";},loadContents:function(){this.div.style.position="absolute";this.div.style.top="25px";this.div.style.right="0px";this.div.style.left="";this.div.style.fontFamily="sans-serif";this.div.style.fontWeight="bold";this.div.style.marginTop="3px";this.div.style.marginLeft="3px";this.div.style.marginBottom="3px";this.div.style.fontSize="smaller";this.div.style.color="white";this.div.style.backgroundColor="transparent";OpenLayers.Event.observe(this.div,"mouseup",OpenLayers.Function.bindAsEventListener(this.mouseUp,this));OpenLayers.Event.observe(this.div,"click",this.ignoreEvent);OpenLayers.Event.observe(this.div,"mousedown",OpenLayers.Function.bindAsEventListener(this.mouseDown,this));OpenLayers.Event.observe(this.div,"dblclick",this.ignoreEvent);this.layersDiv=document.createElement("div");this.layersDiv.id="layersDiv";this.layersDiv.style.paddingTop="5px";this.layersDiv.style.paddingLeft="10px";this.layersDiv.style.paddingBottom="5px";this.layersDiv.style.paddingRight="75px";this.layersDiv.style.backgroundColor=this.activeColor;this.layersDiv.style.width="100%";this.layersDiv.style.height="100%";this.baseLbl=document.createElement("div");this.baseLbl.innerHTML=OpenLayers.i18n("baseLayer");this.baseLbl.style.marginTop="3px";this.baseLbl.style.marginLeft="3px";this.baseLbl.style.marginBottom="3px";this.baseLayersDiv=document.createElement("div");this.baseLayersDiv.style.paddingLeft="10px";this.dataLbl=document.createElement("div");this.dataLbl.innerHTML=OpenLayers.i18n("overlays");this.dataLbl.style.marginTop="3px";this.dataLbl.style.marginLeft="3px";this.dataLbl.style.marginBottom="3px";this.dataLayersDiv=document.createElement("div");this.dataLayersDiv.style.paddingLeft="10px";if(this.ascending){this.layersDiv.appendChild(this.baseLbl);this.layersDiv.appendChild(this.baseLayersDiv);this.layersDiv.appendChild(this.dataLbl);this.layersDiv.appendChild(this.dataLayersDiv);}else{this.layersDiv.appendChild(this.dataLbl);this.layersDiv.appendChild(this.dataLayersDiv);this.layersDiv.appendChild(this.baseLbl);this.layersDiv.appendChild(this.baseLayersDiv);}
-this.div.appendChild(this.layersDiv);OpenLayers.Rico.Corner.round(this.div,{corners:"tl bl",bgColor:"transparent",color:this.activeColor,blend:false});OpenLayers.Rico.Corner.changeOpacity(this.layersDiv,0.75);var imgLocation=OpenLayers.Util.getImagesLocation();var sz=new OpenLayers.Size(18,18);var img=imgLocation+'layer-switcher-maximize.png';this.maximizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MaximizeDiv",null,sz,img,"absolute");this.maximizeDiv.style.top="5px";this.maximizeDiv.style.right="0px";this.maximizeDiv.style.left="";this.maximizeDiv.style.display="none";OpenLayers.Event.observe(this.maximizeDiv,"click",OpenLayers.Function.bindAsEventListener(this.maximizeControl,this));this.div.appendChild(this.maximizeDiv);var img=imgLocation+'layer-switcher-minimize.png';var sz=new OpenLayers.Size(18,18);this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MinimizeDiv",null,sz,img,"absolute");this.minimizeDiv.style.top="5px";this.minimizeDiv.style.right="0px";this.minimizeDiv.style.left="";this.minimizeDiv.style.display="none";OpenLayers.Event.observe(this.minimizeDiv,"click",OpenLayers.Function.bindAsEventListener(this.minimizeControl,this));this.div.appendChild(this.minimizeDiv);},ignoreEvent:function(evt){OpenLayers.Event.stop(evt);},mouseDown:function(evt){this.isMouseDown=true;this.ignoreEvent(evt);},mouseUp:function(evt){if(this.isMouseDown){this.isMouseDown=false;this.ignoreEvent(evt);}},CLASS_NAME:"OpenLayers.Control.LayerSwitcher"});OpenLayers.Control.MouseDefaults=OpenLayers.Class(OpenLayers.Control,{performedDrag:false,wheelObserver:null,initialize:function(){OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){if(this.handler){this.handler.destroy();}
-this.handler=null;this.map.events.un({"click":this.defaultClick,"dblclick":this.defaultDblClick,"mousedown":this.defaultMouseDown,"mouseup":this.defaultMouseUp,"mousemove":this.defaultMouseMove,"mouseout":this.defaultMouseOut,scope:this});OpenLayers.Event.stopObserving(window,"DOMMouseScroll",this.wheelObserver);OpenLayers.Event.stopObserving(window,"mousewheel",this.wheelObserver);OpenLayers.Event.stopObserving(document,"mousewheel",this.wheelObserver);this.wheelObserver=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){this.map.events.on({"click":this.defaultClick,"dblclick":this.defaultDblClick,"mousedown":this.defaultMouseDown,"mouseup":this.defaultMouseUp,"mousemove":this.defaultMouseMove,"mouseout":this.defaultMouseOut,scope:this});this.registerWheelEvents();},registerWheelEvents:function(){this.wheelObserver=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this);OpenLayers.Event.observe(window,"DOMMouseScroll",this.wheelObserver);OpenLayers.Event.observe(window,"mousewheel",this.wheelObserver);OpenLayers.Event.observe(document,"mousewheel",this.wheelObserver);},defaultClick:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-var notAfterDrag=!this.performedDrag;this.performedDrag=false;return notAfterDrag;},defaultDblClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom+1);OpenLayers.Event.stop(evt);return false;},defaultMouseDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-this.mouseDragStart=evt.xy.clone();this.performedDrag=false;if(evt.shiftKey){this.map.div.style.cursor="crosshair";this.zoomBox=OpenLayers.Util.createDiv('zoomBox',this.mouseDragStart,null,null,"absolute","2px solid red");this.zoomBox.style.backgroundColor="white";this.zoomBox.style.filter="alpha(opacity=50)";this.zoomBox.style.opacity="0.50";this.zoomBox.style.fontSize="1px";this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.viewPortDiv.appendChild(this.zoomBox);}
-document.onselectstart=function(){return false;};OpenLayers.Event.stop(evt);},defaultMouseMove:function(evt){this.mousePosition=evt.xy.clone();if(this.mouseDragStart!=null){if(this.zoomBox){var deltaX=Math.abs(this.mouseDragStart.x-evt.xy.x);var deltaY=Math.abs(this.mouseDragStart.y-evt.xy.y);this.zoomBox.style.width=Math.max(1,deltaX)+"px";this.zoomBox.style.height=Math.max(1,deltaY)+"px";if(evt.xy.x<this.mouseDragStart.x){this.zoomBox.style.left=evt.xy.x+"px";}
-if(evt.xy.y<this.mouseDragStart.y){this.zoomBox.style.top=evt.xy.y+"px";}}else{var deltaX=this.mouseDragStart.x-evt.xy.x;var deltaY=this.mouseDragStart.y-evt.xy.y;var size=this.map.getSize();var newXY=new OpenLayers.Pixel(size.w/2+deltaX,size.h/2+deltaY);var newCenter=this.map.getLonLatFromViewPortPx(newXY);this.map.setCenter(newCenter,null,true);this.mouseDragStart=evt.xy.clone();this.map.div.style.cursor="move";}
-this.performedDrag=true;}},defaultMouseUp:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-if(this.zoomBox){this.zoomBoxEnd(evt);}else{if(this.performedDrag){this.map.setCenter(this.map.center);}}
-document.onselectstart=null;this.mouseDragStart=null;this.map.div.style.cursor="";},defaultMouseOut:function(evt){if(this.mouseDragStart!=null&&OpenLayers.Util.mouseLeft(evt,this.map.div)){if(this.zoomBox){this.removeZoomBox();}
-this.mouseDragStart=null;}},defaultWheelUp:function(evt){if(this.map.getZoom()<=this.map.getNumZoomLevels()){this.map.setCenter(this.map.getLonLatFromPixel(evt.xy),this.map.getZoom()+1);}},defaultWheelDown:function(evt){if(this.map.getZoom()>0){this.map.setCenter(this.map.getLonLatFromPixel(evt.xy),this.map.getZoom()-1);}},zoomBoxEnd:function(evt){if(this.mouseDragStart!=null){if(Math.abs(this.mouseDragStart.x-evt.xy.x)>5||Math.abs(this.mouseDragStart.y-evt.xy.y)>5){var start=this.map.getLonLatFromViewPortPx(this.mouseDragStart);var end=this.map.getLonLatFromViewPortPx(evt.xy);var top=Math.max(start.lat,end.lat);var bottom=Math.min(start.lat,end.lat);var left=Math.min(start.lon,end.lon);var right=Math.max(start.lon,end.lon);var bounds=new OpenLayers.Bounds(left,bottom,right,top);this.map.zoomToExtent(bounds);}else{var end=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(new OpenLayers.LonLat((end.lon),(end.lat)),this.map.getZoom()+1);}
-this.removeZoomBox();}},removeZoomBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.zoomBox=null;},onWheelEvent:function(e){var inMap=false;var elem=OpenLayers.Event.element(e);while(elem!=null){if(this.map&&elem==this.map.div){inMap=true;break;}
-elem=elem.parentNode;}
-if(inMap){var delta=0;if(!e){e=window.event;}
-if(e.wheelDelta){delta=e.wheelDelta/120;if(window.opera&&window.opera.version()<9.2){delta=-delta;}}else if(e.detail){delta=-e.detail/3;}
-if(delta){e.xy=this.mousePosition;if(delta<0){this.defaultWheelDown(e);}else{this.defaultWheelUp(e);}}
-OpenLayers.Event.stop(e);}},CLASS_NAME:"OpenLayers.Control.MouseDefaults"});OpenLayers.Control.MousePosition=OpenLayers.Class(OpenLayers.Control,{element:null,prefix:'',separator:', ',suffix:'',numdigits:5,granularity:10,lastXy:null,displayProjection:null,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){if(this.map){this.map.events.unregister('mousemove',this,this.redraw);}
-OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.element){this.div.left="";this.div.top="";this.element=this.div;}
-this.redraw();return this.div;},redraw:function(evt){var lonLat;if(evt==null){lonLat=new OpenLayers.LonLat(0,0);}else{if(this.lastXy==null||Math.abs(evt.xy.x-this.lastXy.x)>this.granularity||Math.abs(evt.xy.y-this.lastXy.y)>this.granularity)
-{this.lastXy=evt.xy;return;}
-lonLat=this.map.getLonLatFromPixel(evt.xy);if(!lonLat){return;}
-if(this.displayProjection){lonLat.transform(this.map.getProjectionObject(),this.displayProjection);}
-this.lastXy=evt.xy;}
-var newHtml=this.formatOutput(lonLat);if(newHtml!=this.element.innerHTML){this.element.innerHTML=newHtml;}},formatOutput:function(lonLat){var digits=parseInt(this.numdigits);var newHtml=this.prefix+
-lonLat.lon.toFixed(digits)+
-this.separator+
-lonLat.lat.toFixed(digits)+
-this.suffix;return newHtml;},setMap:function(){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.register('mousemove',this,this.redraw);},CLASS_NAME:"OpenLayers.Control.MousePosition"});OpenLayers.Control.NavigationHistory=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOGGLE,previous:null,previousOptions:null,next:null,nextOptions:null,limit:50,activateOnDraw:true,clearOnDeactivate:false,registry:null,nextStack:null,previousStack:null,listeners:null,restoring:false,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.registry=OpenLayers.Util.extend({"moveend":function(){return{center:this.map.getCenter(),resolution:this.map.getResolution()};}},this.registry);this.clear();var previousOptions={trigger:OpenLayers.Function.bind(this.previousTrigger,this),displayClass:this.displayClass+"Previous"};OpenLayers.Util.extend(previousOptions,this.previousOptions);this.previous=new OpenLayers.Control.Button(previousOptions);var nextOptions={trigger:OpenLayers.Function.bind(this.nextTrigger,this),displayClass:this.displayClass+"Next"};OpenLayers.Util.extend(nextOptions,this.nextOptions);this.next=new OpenLayers.Control.Button(nextOptions);},onPreviousChange:function(state,length){if(state&&!this.previous.active){this.previous.activate();}else if(!state&&this.previous.active){this.previous.deactivate();}},onNextChange:function(state,length){if(state&&!this.next.active){this.next.activate();}else if(!state&&this.next.active){this.next.deactivate();}},destroy:function(){OpenLayers.Control.prototype.destroy.apply(this);this.previous.destroy();this.next.destroy();this.deactivate();for(var prop in this){this[prop]=null;}},setMap:function(map){this.map=map;this.next.setMap(map);this.previous.setMap(map);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.next.draw();this.previous.draw();if(this.activateOnDraw){this.activate();}},previousTrigger:function(){var current=this.previousStack.shift();var state=this.previousStack.shift();if(state!=undefined){this.nextStack.unshift(current);this.previousStack.unshift(state);this.restoring=true;this.restore(state);this.restoring=false;this.onNextChange(this.nextStack[0],this.nextStack.length);this.onPreviousChange(this.previousStack[1],this.previousStack.length-1);}else{this.previousStack.unshift(current);}
-return state;},nextTrigger:function(){var state=this.nextStack.shift();if(state!=undefined){this.previousStack.unshift(state);this.restoring=true;this.restore(state);this.restoring=false;this.onNextChange(this.nextStack[0],this.nextStack.length);this.onPreviousChange(this.previousStack[1],this.previousStack.length-1);}
-return state;},clear:function(){this.previousStack=[];this.nextStack=[];},restore:function(state){var zoom=this.map.getZoomForResolution(state.resolution);this.map.setCenter(state.center,zoom);},setListeners:function(){this.listeners={};for(var type in this.registry){this.listeners[type]=OpenLayers.Function.bind(function(){if(!this.restoring){var state=this.registry[type].apply(this,arguments);this.previousStack.unshift(state);if(this.previousStack.length>1){this.onPreviousChange(this.previousStack[1],this.previousStack.length-1);}
-if(this.previousStack.length>(this.limit+1)){this.previousStack.pop();}
-if(this.nextStack.length>0){this.nextStack=[];this.onNextChange(null,0);}}
-return true;},this);}},activate:function(){var activated=false;if(this.map){if(OpenLayers.Control.prototype.activate.apply(this)){if(this.listeners==null){this.setListeners();}
-for(var type in this.listeners){this.map.events.register(type,this,this.listeners[type]);}
-activated=true;if(this.previousStack.length==0){this.initStack();}}}
-return activated;},initStack:function(){if(this.map.getCenter()){this.listeners.moveend();}},deactivate:function(){var deactivated=false;if(this.map){if(OpenLayers.Control.prototype.deactivate.apply(this)){for(var type in this.listeners){this.map.events.unregister(type,this,this.listeners[type]);}
-if(this.clearOnDeactivate){this.clear();}
-deactivated=true;}}
-return deactivated;},CLASS_NAME:"OpenLayers.Control.NavigationHistory"});OpenLayers.Control.PanZoom=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,buttons:null,position:null,initialize:function(options){this.position=new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,OpenLayers.Control.PanZoom.Y);OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){OpenLayers.Control.prototype.destroy.apply(this,arguments);while(this.buttons.length){var btn=this.buttons.shift();btn.map=null;OpenLayers.Event.stopObservingElement(btn);}
-this.buttons=null;this.position=null;},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position;this.buttons=[];var sz=new OpenLayers.Size(18,18);var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);this._addButton("panup","north-mini.png",centered,sz);px.y=centered.y+sz.h;this._addButton("panleft","west-mini.png",px,sz);this._addButton("panright","east-mini.png",px.add(sz.w,0),sz);this._addButton("pandown","south-mini.png",centered.add(0,sz.h*2),sz);this._addButton("zoomin","zoom-plus-mini.png",centered.add(0,sz.h*3+5),sz);this._addButton("zoomworld","zoom-world-mini.png",centered.add(0,sz.h*4+5),sz);this._addButton("zoomout","zoom-minus-mini.png",centered.add(0,sz.h*5+5),sz);return this.div;},_addButton:function(id,img,xy,sz){var imgLocation=OpenLayers.Util.getImagesLocation()+img;var btn=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_PanZoom_"+id,xy,sz,imgLocation,"absolute");this.div.appendChild(btn);OpenLayers.Event.observe(btn,"mousedown",OpenLayers.Function.bindAsEventListener(this.buttonDown,btn));OpenLayers.Event.observe(btn,"dblclick",OpenLayers.Function.bindAsEventListener(this.doubleClick,btn));OpenLayers.Event.observe(btn,"click",OpenLayers.Function.bindAsEventListener(this.doubleClick,btn));btn.action=id;btn.map=this.map;btn.slideFactor=this.slideFactor;this.buttons.push(btn);return btn;},doubleClick:function(evt){OpenLayers.Event.stop(evt);return false;},buttonDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-switch(this.action){case"panup":this.map.pan(0,-this.slideFactor);break;case"pandown":this.map.pan(0,this.slideFactor);break;case"panleft":this.map.pan(-this.slideFactor,0);break;case"panright":this.map.pan(this.slideFactor,0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;}
-OpenLayers.Event.stop(evt);},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Control.Panel=OpenLayers.Class(OpenLayers.Control,{controls:null,defaultControl:null,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.controls=[];},destroy:function(){OpenLayers.Control.prototype.destroy.apply(this,arguments);for(var i=this.controls.length-1;i>=0;i--){if(this.controls[i].events){this.controls[i].events.un({"activate":this.redraw,"deactivate":this.redraw,scope:this});}
-OpenLayers.Event.stopObservingElement(this.controls[i].panel_div);this.controls[i].panel_div=null;}},activate:function(){if(OpenLayers.Control.prototype.activate.apply(this,arguments)){for(var i=0;i<this.controls.length;i++){if(this.controls[i]==this.defaultControl){this.controls[i].activate();}}
-this.redraw();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){for(var i=0;i<this.controls.length;i++){this.controls[i].deactivate();}
-return true;}else{return false;}},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);for(var i=0;i<this.controls.length;i++){this.map.addControl(this.controls[i]);this.controls[i].deactivate();this.controls[i].events.on({"activate":this.redraw,"deactivate":this.redraw,scope:this});}
-this.activate();return this.div;},redraw:function(){this.div.innerHTML="";if(this.active){for(var i=0;i<this.controls.length;i++){var element=this.controls[i].panel_div;if(this.controls[i].active){element.className=this.controls[i].displayClass+"ItemActive";}else{element.className=this.controls[i].displayClass+"ItemInactive";}
-this.div.appendChild(element);}}},activateControl:function(control){if(!this.active){return false;}
-if(control.type==OpenLayers.Control.TYPE_BUTTON){control.trigger();return;}
-if(control.type==OpenLayers.Control.TYPE_TOGGLE){if(control.active){control.deactivate();}else{control.activate();}
-return;}
-for(var i=0;i<this.controls.length;i++){if(this.controls[i]!=control){if(this.controls[i].type!=OpenLayers.Control.TYPE_TOGGLE){this.controls[i].deactivate();}}}
-control.activate();},addControls:function(controls){if(!(controls instanceof Array)){controls=[controls];}
-this.controls=this.controls.concat(controls);for(var i=0;i<controls.length;i++){var element=document.createElement("div");var textNode=document.createTextNode(" ");controls[i].panel_div=element;if(controls[i].title!=""){controls[i].panel_div.title=controls[i].title;}
-OpenLayers.Event.observe(controls[i].panel_div,"click",OpenLayers.Function.bind(this.onClick,this,controls[i]));OpenLayers.Event.observe(controls[i].panel_div,"mousedown",OpenLayers.Function.bindAsEventListener(OpenLayers.Event.stop));}
-if(this.map){for(var i=0;i<controls.length;i++){this.map.addControl(controls[i]);controls[i].deactivate();controls[i].events.on({"activate":this.redraw,"deactivate":this.redraw,scope:this});}
-this.redraw();}},onClick:function(ctrl,evt){OpenLayers.Event.stop(evt?evt:window.event);this.activateControl(ctrl);},getControlsBy:function(property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this.controls,function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getControlsByName:function(match){return this.getControlsBy("name",match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},CLASS_NAME:"OpenLayers.Control.Panel"});OpenLayers.Control.Permalink=OpenLayers.Class(OpenLayers.Control,{element:null,base:'',displayProjection:null,initialize:function(element,base,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.element=OpenLayers.Util.getElement(element);this.base=base||document.location.href;},destroy:function(){if(this.element.parentNode==this.div){this.div.removeChild(this.element);}
-this.element=null;this.map.events.unregister('moveend',this,this.updateLink);OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0;i<this.map.controls.length;i++){var control=this.map.controls[i];if(control.CLASS_NAME=="OpenLayers.Control.ArgParser"){if(control.displayProjection!=this.displayProjection){this.displayProjection=control.displayProjection;}
-break;}}
-if(i==this.map.controls.length){this.map.addControl(new OpenLayers.Control.ArgParser({'displayProjection':this.displayProjection}));}},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.element){this.element=document.createElement("a");this.element.innerHTML=OpenLayers.i18n("permalink");this.element.href="";this.div.appendChild(this.element);}
-this.map.events.on({'moveend':this.updateLink,'changelayer':this.updateLink,'changebaselayer':this.updateLink,scope:this});return this.div;},updateLink:function(){var center=this.map.getCenter();if(!center){return;}
-var params=OpenLayers.Util.getParameters(this.base);params.zoom=this.map.getZoom();var lat=center.lat;var lon=center.lon;if(this.displayProjection){var mapPosition=OpenLayers.Projection.transform({x:lon,y:lat},this.map.getProjectionObject(),this.displayProjection);lon=mapPosition.x;lat=mapPosition.y;}
-params.lat=Math.round(lat*100000)/100000;params.lon=Math.round(lon*100000)/100000;params.layers='';for(var i=0;i<this.map.layers.length;i++){var layer=this.map.layers[i];if(layer.isBaseLayer){params.layers+=(layer==this.map.baseLayer)?"B":"0";}else{params.layers+=(layer.getVisibility())?"T":"F";}}
-var href=this.base;if(href.indexOf('?')!=-1){href=href.substring(0,href.indexOf('?'));}
-href+='?'+OpenLayers.Util.getParameterString(params);this.element.href=href;},CLASS_NAME:"OpenLayers.Control.Permalink"});OpenLayers.Control.Scale=OpenLayers.Class(OpenLayers.Control,{element:null,initialize:function(element,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.element=OpenLayers.Util.getElement(element);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.element){this.element=document.createElement("div");this.div.appendChild(this.element);}
-this.map.events.register('moveend',this,this.updateScale);this.updateScale();return this.div;},updateScale:function(){var scale=this.map.getScale();if(!scale){return;}
-if(scale>=9500&&scale<=950000){scale=Math.round(scale/1000)+"K";}else if(scale>=950000){scale=Math.round(scale/1000000)+"M";}else{scale=Math.round(scale);}
-this.element.innerHTML=OpenLayers.i18n("scale",{'scaleDenom':scale});},CLASS_NAME:"OpenLayers.Control.Scale"});OpenLayers.Control.ScaleLine=OpenLayers.Class(OpenLayers.Control,{maxWidth:100,topOutUnits:"km",topInUnits:"m",bottomOutUnits:"mi",bottomInUnits:"ft",eTop:null,eBottom:null,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,[options]);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.eTop){this.div.style.display="block";this.div.style.position="absolute";this.eTop=document.createElement("div");this.eTop.className=this.displayClass+"Top";var theLen=this.topInUnits.length;this.div.appendChild(this.eTop);if((this.topOutUnits=="")||(this.topInUnits=="")){this.eTop.style.visibility="hidden";}else{this.eTop.style.visibility="visible";}
-this.eBottom=document.createElement("div");this.eBottom.className=this.displayClass+"Bottom";this.div.appendChild(this.eBottom);if((this.bottomOutUnits=="")||(this.bottomInUnits=="")){this.eBottom.style.visibility="hidden";}else{this.eBottom.style.visibility="visible";}}
-this.map.events.register('moveend',this,this.update);this.update();return this.div;},getBarLen:function(maxLen){var digits=parseInt(Math.log(maxLen)/Math.log(10));var pow10=Math.pow(10,digits);var firstChar=parseInt(maxLen/pow10);var barLen;if(firstChar>5){barLen=5;}else if(firstChar>2){barLen=2;}else{barLen=1;}
-return barLen*pow10;},update:function(){var res=this.map.getResolution();if(!res){return;}
-var curMapUnits=this.map.units;var inches=OpenLayers.INCHES_PER_UNIT;var maxSizeData=this.maxWidth*res*inches[curMapUnits];var topUnits;var bottomUnits;if(maxSizeData>100000){topUnits=this.topOutUnits;bottomUnits=this.bottomOutUnits;}else{topUnits=this.topInUnits;bottomUnits=this.bottomInUnits;}
-var topMax=maxSizeData/inches[topUnits];var bottomMax=maxSizeData/inches[bottomUnits];var topRounded=this.getBarLen(topMax);var bottomRounded=this.getBarLen(bottomMax);topMax=topRounded/inches[curMapUnits]*inches[topUnits];bottomMax=bottomRounded/inches[curMapUnits]*inches[bottomUnits];var topPx=topMax/res;var bottomPx=bottomMax/res;this.eTop.style.width=Math.round(topPx)+"px";this.eBottom.style.width=Math.round(bottomPx)+"px";this.eTop.innerHTML=topRounded+" "+topUnits;this.eBottom.innerHTML=bottomRounded+" "+bottomUnits;},CLASS_NAME:"OpenLayers.Control.ScaleLine"});OpenLayers.Control.ZoomToMaxExtent=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_BUTTON,trigger:function(){if(this.map){this.map.zoomToMaxExtent();}},CLASS_NAME:"OpenLayers.Control.ZoomToMaxExtent"});OpenLayers.Event={observers:false,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(event){return event.target||event.srcElement;},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)));},stop:function(event,allowDefault){if(!allowDefault){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}}
+this.active=true;if(this.map){OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active");}
+this.events.triggerEvent("activate");return true;},deactivate:function(){if(this.active){if(this.handler){this.handler.deactivate();}
+this.active=false;if(this.map){OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active");}
+this.events.triggerEvent("deactivate");return true;}
+return false;},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Event={observers:false,KEY_SPACE:32,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(event){return event.target||event.srcElement;},isSingleTouch:function(event){return event.touches&&event.touches.length==1;},isMultiTouch:function(event){return event.touches&&event.touches.length>1;},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)));},isRightClick:function(event){return(((event.which)&&(event.which==3))||((event.button)&&(event.button==2)));},stop:function(event,allowDefault){if(!allowDefault){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}}
if(event.stopPropagation){event.stopPropagation();}else{event.cancelBubble=true;}},findElement:function(event,tagName){var element=OpenLayers.Event.element(event);while(element.parentNode&&(!element.tagName||(element.tagName.toUpperCase()!=tagName.toUpperCase()))){element=element.parentNode;}
return element;},observe:function(elementParam,name,observer,useCapture){var element=OpenLayers.Util.getElement(elementParam);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.attachEvent)){name='keydown';}
if(!this.observers){this.observers={};}
@@ -403,116 +242,95 @@ foundEntry=true;break;}
i++;}}
if(foundEntry){if(element.removeEventListener){element.removeEventListener(name,observer,useCapture);}else if(element&&element.detachEvent){element.detachEvent('on'+name,observer);}}
return foundEntry;},unloadCache:function(){if(OpenLayers.Event&&OpenLayers.Event.observers){for(var cacheID in OpenLayers.Event.observers){var elementObservers=OpenLayers.Event.observers[cacheID];OpenLayers.Event._removeElementObservers.apply(this,[elementObservers]);}
-OpenLayers.Event.observers=false;}},CLASS_NAME:"OpenLayers.Event"};OpenLayers.Event.observe(window,'unload',OpenLayers.Event.unloadCache,false);if(window.Event){OpenLayers.Util.applyDefaults(window.Event,OpenLayers.Event);}else{var Event=OpenLayers.Event;}
-OpenLayers.Events=OpenLayers.Class({BROWSER_EVENTS:["mouseover","mouseout","mousedown","mouseup","mousemove","click","dblclick","resize","focus","blur"],listeners:null,object:null,element:null,eventTypes:null,eventHandler:null,fallThrough:null,initialize:function(object,element,eventTypes,fallThrough){this.object=object;this.element=element;this.eventTypes=eventTypes;this.fallThrough=fallThrough;this.listeners={};this.eventHandler=OpenLayers.Function.bindAsEventListener(this.handleBrowserEvent,this);if(this.eventTypes!=null){for(var i=0;i<this.eventTypes.length;i++){this.addEventType(this.eventTypes[i]);}}
-if(this.element!=null){this.attachToElement(element);}},destroy:function(){if(this.element){OpenLayers.Event.stopObservingElement(this.element);}
-this.element=null;this.listeners=null;this.object=null;this.eventTypes=null;this.fallThrough=null;this.eventHandler=null;},addEventType:function(eventName){if(!this.listeners[eventName]){this.listeners[eventName]=[];}},attachToElement:function(element){for(var i=0;i<this.BROWSER_EVENTS.length;i++){var eventType=this.BROWSER_EVENTS[i];this.addEventType(eventType);OpenLayers.Event.observe(element,eventType,this.eventHandler);}
-OpenLayers.Event.observe(element,"dragstart",OpenLayers.Event.stop);},on:function(object){for(var type in object){if(type!="scope"){this.register(type,object.scope,object[type]);}}},register:function(type,obj,func){if(func!=null&&((this.eventTypes&&OpenLayers.Util.indexOf(this.eventTypes,type)!=-1)||OpenLayers.Util.indexOf(this.BROWSER_EVENTS,type)!=-1)){if(obj==null){obj=this.object;}
-var listeners=this.listeners[type];if(listeners!=null){listeners.push({obj:obj,func:func});}}},registerPriority:function(type,obj,func){if(func!=null){if(obj==null){obj=this.object;}
-var listeners=this.listeners[type];if(listeners!=null){listeners.unshift({obj:obj,func:func});}}},un:function(object){for(var type in object){if(type!="scope"){this.unregister(type,object.scope,object[type]);}}},unregister:function(type,obj,func){if(obj==null){obj=this.object;}
-var listeners=this.listeners[type];if(listeners!=null){for(var i=0;i<listeners.length;i++){if(listeners[i].obj==obj&&listeners[i].func==func){listeners.splice(i,1);break;}}}},remove:function(type){if(this.listeners[type]!=null){this.listeners[type]=[];}},triggerEvent:function(type,evt){if(evt==null){evt={};}
+OpenLayers.Event.observers=false;}},CLASS_NAME:"OpenLayers.Event"};OpenLayers.Event.observe(window,'unload',OpenLayers.Event.unloadCache,false);OpenLayers.Events=OpenLayers.Class({BROWSER_EVENTS:["mouseover","mouseout","mousedown","mouseup","mousemove","click","dblclick","rightclick","dblrightclick","resize","focus","blur","touchstart","touchmove","touchend","keydown"],listeners:null,object:null,element:null,eventHandler:null,fallThrough:null,includeXY:false,extensions:null,extensionCount:null,clearMouseListener:null,initialize:function(object,element,eventTypes,fallThrough,options){OpenLayers.Util.extend(this,options);this.object=object;this.fallThrough=fallThrough;this.listeners={};this.extensions={};this.extensionCount={};if(element!=null){this.attachToElement(element);}},destroy:function(){for(var e in this.extensions){if(typeof this.extensions[e]!=="boolean"){this.extensions[e].destroy();}}
+this.extensions=null;if(this.element){OpenLayers.Event.stopObservingElement(this.element);if(this.element.hasScrollEvent){OpenLayers.Event.stopObserving(window,"scroll",this.clearMouseListener);}}
+this.element=null;this.listeners=null;this.object=null;this.fallThrough=null;this.eventHandler=null;},addEventType:function(eventName){},attachToElement:function(element){if(this.element){OpenLayers.Event.stopObservingElement(this.element);}else{this.eventHandler=OpenLayers.Function.bindAsEventListener(this.handleBrowserEvent,this);this.clearMouseListener=OpenLayers.Function.bind(this.clearMouseCache,this);}
+this.element=element;for(var i=0,len=this.BROWSER_EVENTS.length;i<len;i++){OpenLayers.Event.observe(element,this.BROWSER_EVENTS[i],this.eventHandler);}
+OpenLayers.Event.observe(element,"dragstart",OpenLayers.Event.stop);},on:function(object){for(var type in object){if(type!="scope"&&object.hasOwnProperty(type)){this.register(type,object.scope,object[type]);}}},register:function(type,obj,func,priority){if(type in OpenLayers.Events&&!this.extensions[type]){this.extensions[type]=new OpenLayers.Events[type](this);}
+if(func!=null){if(obj==null){obj=this.object;}
+var listeners=this.listeners[type];if(!listeners){listeners=[];this.listeners[type]=listeners;this.extensionCount[type]=0;}
+var listener={obj:obj,func:func};if(priority){listeners.splice(this.extensionCount[type],0,listener);if(typeof priority==="object"&&priority.extension){this.extensionCount[type]++;}}else{listeners.push(listener);}}},registerPriority:function(type,obj,func){this.register(type,obj,func,true);},un:function(object){for(var type in object){if(type!="scope"&&object.hasOwnProperty(type)){this.unregister(type,object.scope,object[type]);}}},unregister:function(type,obj,func){if(obj==null){obj=this.object;}
+var listeners=this.listeners[type];if(listeners!=null){for(var i=0,len=listeners.length;i<len;i++){if(listeners[i].obj==obj&&listeners[i].func==func){listeners.splice(i,1);break;}}}},remove:function(type){if(this.listeners[type]!=null){this.listeners[type]=[];}},triggerEvent:function(type,evt){var listeners=this.listeners[type];if(!listeners||listeners.length==0){return undefined;}
+if(evt==null){evt={};}
evt.object=this.object;evt.element=this.element;if(!evt.type){evt.type=type;}
-var listeners=(this.listeners[type])?this.listeners[type].slice():null;if((listeners!=null)&&(listeners.length>0)){var continueChain;for(var i=0;i<listeners.length;i++){var callback=listeners[i];continueChain=callback.func.apply(callback.obj,[evt]);if((continueChain!=undefined)&&(continueChain==false)){break;}}
-if(!this.fallThrough){OpenLayers.Event.stop(evt,true);}}
-return continueChain;},handleBrowserEvent:function(evt){evt.xy=this.getMousePosition(evt);this.triggerEvent(evt.type,evt);},getMousePosition:function(evt){if(!this.element.offsets){this.element.offsets=OpenLayers.Util.pagePosition(this.element);this.element.offsets[0]+=(document.documentElement.scrollLeft||document.body.scrollLeft);this.element.offsets[1]+=(document.documentElement.scrollTop||document.body.scrollTop);}
-return new OpenLayers.Pixel((evt.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft))-this.element.offsets[0]
--(document.documentElement.clientLeft||0),(evt.clientY+(document.documentElement.scrollTop||document.body.scrollTop))-this.element.offsets[1]
--(document.documentElement.clientTop||0));},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Format=OpenLayers.Class({externalProjection:null,internalProjection:null,initialize:function(options){OpenLayers.Util.extend(this,options);},read:function(data){alert(OpenLayers.i18n("readNotImplemented"));},write:function(object){alert(OpenLayers.i18n("writeNotImplemented"));},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Lang.en={'unhandledRequest':"Unhandled request return ${statusText}",'permalink':"Permalink",'overlays':"Overlays",'baseLayer':"Base Layer",'sameProjection':"The overview map only works when it is in the same projection as the main map",'readNotImplemented':"Read not implemented.",'writeNotImplemented':"Write not implemented.",'noFID':"Can't update a feature for which there is no FID.",'errorLoadingGML':"Error in loading GML file ${url}",'browserNotSupported':"Your browser does not support vector rendering. Currently supported renderers are:\n${renderers}",'componentShouldBe':"addFeatures : component should be an ${geomType}",'getFeatureError':"getFeatureFromEvent called on layer with no renderer. This usually means you "+"destroyed a layer, but not some handler which is associated with it.",'minZoomLevelError':"The minZoomLevel property is only intended for use "+"with the FixedZoomLevels-descendent layers. That this "+"wfs layer checks for minZoomLevel is a relic of the"+"past. We cannot, however, remove it without possibly "+"breaking OL based applications that may depend on it."+" Therefore we are deprecating it -- the minZoomLevel "+"check below will be removed at 3.0. Please instead "+"use min/max resolution setting as described here: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: SUCCESS ${response}",'commitFailed':"WFS Transaction: FAILED ${response}",'googleWarning':"The Google Layer was unable to load correctly.<br><br>"+"To get rid of this message, select a new BaseLayer "+"in the layer switcher in the upper-right corner.<br><br>"+"Most likely, this is because the Google Maps library "+"script was either not included, or does not contain the "+"correct API key for your site.<br><br>"+"Developers: For help getting this working correctly, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>click here</a>",'getLayerWarning':"The ${layerType} Layer was unable to load correctly.<br><br>"+"To get rid of this message, select a new BaseLayer "+"in the layer switcher in the upper-right corner.<br><br>"+"Most likely, this is because the ${layerLib} library "+"script was either not correctly included.<br><br>"+"Developers: For help getting this working correctly, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>click here</a>",'scale':"Scale = 1 : ${scaleDenom}",'layerAlreadyAdded':"You tried to add the layer: ${layerName} to the map, but it has already been added",'reprojectDeprecated':"You are using the 'reproject' option "+"on the ${layerName} layer. This option is deprecated: "+"its use was designed to support displaying data over commercial "+"basemaps, but that functionality should now be achieved by using "+"Spherical Mercator support. More information is available from "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"This method has been deprecated and will be removed in 3.0. "+"Please use ${newMethod} instead.",'boundsAddError':"You must pass both x and y values to the add function.",'lonlatAddError':"You must pass both lon and lat values to the add function.",'pixelAddError':"You must pass both x and y values to the add function.",'unsupportedGeometryType':"Unsupported geometry type: ${geomType}",'pagePositionFailed':"OpenLayers.Util.pagePosition failed: element with id ${elemId} may be misplaced.",'end':''};OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,anchor:null,initialize:function(id,lonlat,size,contentHTML,anchor,closeBox,closeBoxCallback){var newArguments=new Array(id,lonlat,size,contentHTML,closeBox,closeBoxCallback);OpenLayers.Popup.prototype.initialize.apply(this,newArguments);this.anchor=(anchor!=null)?anchor:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)};},destroy:function(){this.anchor=null;this.relativePosition=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments);},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments);},moveTo:function(px){var oldRelativePosition=this.relativePosition;this.relativePosition=this.calculateRelativePosition(px);var newPx=this.calculateNewPx(px);var newArguments=new Array(newPx);OpenLayers.Popup.prototype.moveTo.apply(this,newArguments);if(this.relativePosition!=oldRelativePosition){this.updateRelativePosition();}},setSize:function(size){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if((this.lonlat)&&(this.map)){var px=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(px);}},calculateRelativePosition:function(px){var lonlat=this.map.getLonLatFromLayerPx(px);var extent=this.map.getExtent();var quadrant=extent.determineQuadrant(lonlat);return OpenLayers.Bounds.oppositeQuadrant(quadrant);},updateRelativePosition:function(){},calculateNewPx:function(px){var newPx=px.offset(this.anchor.offset);var top=(this.relativePosition.charAt(0)=='t');newPx.y+=(top)?-this.size.h:this.anchor.size.h;var left=(this.relativePosition.charAt(1)=='l');newPx.x+=(left)?-this.size.w:this.anchor.size.w;return newPx;},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,initialize:function(projCode,options){OpenLayers.Util.extend(this,options);this.projCode=projCode;if(window.Proj4js){this.proj=new Proj4js.Proj(projCode);}},getCode:function(){return this.proj?this.proj.srsCode:this.projCode;},getUnits:function(){return this.proj?this.proj.units:null;},toString:function(){return this.getCode();},equals:function(projection){if(projection&&projection.getCode){return this.getCode()==projection.getCode();}else{return false;}},destroy:function(){delete this.proj;delete this.projCode;},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};OpenLayers.Projection.addTransform=function(from,to,method){if(!OpenLayers.Projection.transforms[from]){OpenLayers.Projection.transforms[from]={};}
-OpenLayers.Projection.transforms[from][to]=method;};OpenLayers.Projection.transform=function(point,source,dest){if(source.proj&&dest.proj){point=Proj4js.transform(source.proj,dest.proj,point);}else if(source&&dest&&OpenLayers.Projection.transforms[source.getCode()]&&OpenLayers.Projection.transforms[source.getCode()][dest.getCode()]){OpenLayers.Projection.transforms[source.getCode()][dest.getCode()](point);}
-return point;};OpenLayers.Renderer.Elements=OpenLayers.Class(OpenLayers.Renderer,{rendererRoot:null,root:null,xmlns:null,minimumSymbolizer:{strokeLinecap:"round",strokeOpacity:1,fillOpacity:1,pointRadius:0},initialize:function(containerID){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.rendererRoot=this.createRenderRoot();this.root=this.createRoot();this.rendererRoot.appendChild(this.root);this.container.appendChild(this.rendererRoot);},destroy:function(){this.clear();this.rendererRoot=null;this.root=null;this.xmlns=null;OpenLayers.Renderer.prototype.destroy.apply(this,arguments);},clear:function(){if(this.root){while(this.root.childNodes.length>0){this.root.removeChild(this.root.firstChild);}}},getNodeType:function(geometry,style){},drawGeometry:function(geometry,style,featureId){var className=geometry.CLASS_NAME;if((className=="OpenLayers.Geometry.Collection")||(className=="OpenLayers.Geometry.MultiPoint")||(className=="OpenLayers.Geometry.MultiLineString")||(className=="OpenLayers.Geometry.MultiPolygon")){for(var i=0;i<geometry.components.length;i++){this.drawGeometry(geometry.components[i],style,featureId);}
-return;};if(style.display!="none"){var nodeType=this.getNodeType(geometry,style);var node=this.nodeFactory(geometry.id,nodeType);node._featureId=featureId;node._geometryClass=geometry.CLASS_NAME;node._style=style;node=this.drawGeometryNode(node,geometry);if(node.parentNode!=this.root){this.root.appendChild(node);}
-this.postDraw(node);}else{node=OpenLayers.Util.getElement(geometry.id);if(node){node.parentNode.removeChild(node);}}},drawGeometryNode:function(node,geometry,style){style=style||node._style;OpenLayers.Util.applyDefaults(style,this.minimumSymbolizer);var options={'isFilled':true,'isStroked':!!style.strokeWidth};switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":this.drawPoint(node,geometry);break;case"OpenLayers.Geometry.LineString":options.isFilled=false;this.drawLineString(node,geometry);break;case"OpenLayers.Geometry.LinearRing":this.drawLinearRing(node,geometry);break;case"OpenLayers.Geometry.Polygon":this.drawPolygon(node,geometry);break;case"OpenLayers.Geometry.Surface":this.drawSurface(node,geometry);break;case"OpenLayers.Geometry.Rectangle":this.drawRectangle(node,geometry);break;default:break;}
-node._style=style;node._options=options;return this.setStyle(node,style,options,geometry);},postDraw:function(node){},drawPoint:function(node,geometry){},drawLineString:function(node,geometry){},drawLinearRing:function(node,geometry){},drawPolygon:function(node,geometry){},drawRectangle:function(node,geometry){},drawCircle:function(node,geometry){},drawSurface:function(node,geometry){},getFeatureIdFromEvent:function(evt){var node=evt.target||evt.srcElement;return node._featureId;},eraseGeometry:function(geometry){if((geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPoint")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiLineString")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPolygon")){for(var i=0;i<geometry.components.length;i++){this.eraseGeometry(geometry.components[i]);}}else{var element=OpenLayers.Util.getElement(geometry.id);if(element&&element.parentNode){element.parentNode.removeChild(element);}}},nodeFactory:function(id,type){var node=OpenLayers.Util.getElement(id);if(node){if(!this.nodeTypeCompare(node,type)){node.parentNode.removeChild(node);node=this.nodeFactory(id,type);}}else{node=this.createNode(type,id);}
-return node;},CLASS_NAME:"OpenLayers.Renderer.Elements"});OpenLayers.Tile=OpenLayers.Class({EVENT_TYPES:["loadstart","loadend","reload","unload"],events:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:false,isBackBuffer:false,lastRatio:1,isFirstDraw:true,backBufferTile:null,initialize:function(layer,position,bounds,url,size){this.layer=layer;this.position=position.clone();this.bounds=bounds.clone();this.url=url;this.size=size.clone();this.id=OpenLayers.Util.createUniqueID("Tile_");this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);},unload:function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("unload");}},destroy:function(){if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){this.layer.events.unregister("loadend",this,this.resetBackBuffer);this.events.unregister('loadend',this,this.resetBackBuffer);}else{this.events.unregister('loadend',this,this.showTile);}
-this.layer=null;this.bounds=null;this.size=null;this.position=null;this.events.destroy();this.events=null;if(this.backBufferTile){this.backBufferTile.destroy();this.backBufferTile=null;}},clone:function(obj){if(obj==null){obj=new OpenLayers.Tile(this.layer,this.position,this.bounds,this.url,this.size);}
-OpenLayers.Util.applyDefaults(obj,this);return obj;},draw:function(){var maxExtent=this.layer.maxExtent;var withinMaxExtent=(maxExtent&&this.bounds.intersectsBounds(maxExtent,false));var drawTile=(withinMaxExtent||this.layer.displayOutsideMaxExtent);if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){if(drawTile){if(!this.backBufferTile){this.backBufferTile=this.clone();this.backBufferTile.hide();this.backBufferTile.isBackBuffer=true;this.events.register('loadend',this,this.resetBackBuffer);this.layer.events.register("loadend",this,this.resetBackBuffer);}
-this.startTransition();}else{if(this.backBufferTile){this.backBufferTile.clear();}}}else{if(drawTile&&this.isFirstDraw){this.events.register('loadend',this,this.showTile);this.isFirstDraw=false;}}
-this.shouldDraw=drawTile;this.clear();return drawTile;},moveTo:function(bounds,position,redraw){if(redraw==null){redraw=true;}
-this.bounds=bounds.clone();this.position=position.clone();if(redraw){this.draw();}},clear:function(){},getBoundsFromBaseLayer:function(position){var msg=OpenLayers.i18n('reprojectDeprecated',{'layerName':this.layer.name});OpenLayers.Console.warn(msg);var topLeft=this.layer.map.getLonLatFromLayerPx(position);var bottomRightPx=position.clone();bottomRightPx.x+=this.size.w;bottomRightPx.y+=this.size.h;var bottomRight=this.layer.map.getLonLatFromLayerPx(bottomRightPx);if(topLeft.lon>bottomRight.lon){if(topLeft.lon<0){topLeft.lon=-180-(topLeft.lon+180);}else{bottomRight.lon=180+bottomRight.lon+180;}}
-var bounds=new OpenLayers.Bounds(topLeft.lon,bottomRight.lat,bottomRight.lon,topLeft.lat);return bounds;},startTransition:function(){},resetBackBuffer:function(){this.showTile();if(this.backBufferTile&&(this.isFirstDraw||!this.layer.numLoadingTiles)){this.isFirstDraw=false;var maxExtent=this.layer.maxExtent;var withinMaxExtent=(maxExtent&&this.bounds.intersectsBounds(maxExtent,false));if(withinMaxExtent){this.backBufferTile.position=this.position;this.backBufferTile.bounds=this.bounds;this.backBufferTile.size=this.size;this.backBufferTile.imageSize=this.layer.imageSize||this.size;this.backBufferTile.imageOffset=this.layer.imageOffset;this.backBufferTile.resolution=this.layer.getResolution();this.backBufferTile.renderTile();}}},showTile:function(){if(this.shouldDraw){this.show();}},show:function(){},hide:function(){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Control.MouseToolbar=OpenLayers.Class(OpenLayers.Control.MouseDefaults,{mode:null,buttons:null,direction:"vertical",buttonClicked:null,initialize:function(position,direction){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.position=new OpenLayers.Pixel(OpenLayers.Control.MouseToolbar.X,OpenLayers.Control.MouseToolbar.Y);if(position){this.position=position;}
-if(direction){this.direction=direction;}
-this.measureDivs=[];},destroy:function(){for(var btnId in this.buttons){var btn=this.buttons[btnId];btn.map=null;btn.events.destroy();}
-OpenLayers.Control.MouseDefaults.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);OpenLayers.Control.MouseDefaults.prototype.draw.apply(this,arguments);this.buttons={};var sz=new OpenLayers.Size(28,28);var centered=new OpenLayers.Pixel(OpenLayers.Control.MouseToolbar.X,0);this._addButton("zoombox","drag-rectangle-off.png","drag-rectangle-on.png",centered,sz,"Shift->Drag to zoom to area");centered=centered.add((this.direction=="vertical"?0:sz.w),(this.direction=="vertical"?sz.h:0));this._addButton("pan","panning-hand-off.png","panning-hand-on.png",centered,sz,"Drag the map to pan.");centered=centered.add((this.direction=="vertical"?0:sz.w),(this.direction=="vertical"?sz.h:0));this.switchModeTo("pan");return this.div;},_addButton:function(id,img,activeImg,xy,sz,title){var imgLocation=OpenLayers.Util.getImagesLocation()+img;var activeImgLocation=OpenLayers.Util.getImagesLocation()+activeImg;var btn=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MouseToolbar_"+id,xy,sz,imgLocation,"absolute");this.div.appendChild(btn);btn.imgLocation=imgLocation;btn.activeImgLocation=activeImgLocation;btn.events=new OpenLayers.Events(this,btn,null,true);btn.events.on({"mousedown":this.buttonDown,"mouseup":this.buttonUp,"dblclick":OpenLayers.Event.stop,scope:this});btn.action=id;btn.title=title;btn.alt=title;btn.map=this.map;this.buttons[id]=btn;return btn;},buttonDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-this.buttonClicked=evt.element.action;OpenLayers.Event.stop(evt);},buttonUp:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-if(this.buttonClicked!=null){if(this.buttonClicked==evt.element.action){this.switchModeTo(evt.element.action);}
-OpenLayers.Event.stop(evt);this.buttonClicked=null;}},defaultDblClick:function(evt){this.switchModeTo("pan");this.performedDrag=false;var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom+1);OpenLayers.Event.stop(evt);return false;},defaultMouseDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-this.mouseDragStart=evt.xy.clone();this.performedDrag=false;this.startViaKeyboard=false;if(evt.shiftKey&&this.mode!="zoombox"){this.switchModeTo("zoombox");this.startViaKeyboard=true;}else if(evt.altKey&&this.mode!="measure"){this.switchModeTo("measure");}else if(!this.mode){this.switchModeTo("pan");}
-switch(this.mode){case"zoombox":this.map.div.style.cursor="crosshair";this.zoomBox=OpenLayers.Util.createDiv('zoomBox',this.mouseDragStart,null,null,"absolute","2px solid red");this.zoomBox.style.backgroundColor="white";this.zoomBox.style.filter="alpha(opacity=50)";this.zoomBox.style.opacity="0.50";this.zoomBox.style.fontSize="1px";this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.viewPortDiv.appendChild(this.zoomBox);this.performedDrag=true;break;case"measure":var distance="";if(this.measureStart){var measureEnd=this.map.getLonLatFromViewPortPx(this.mouseDragStart);distance=OpenLayers.Util.distVincenty(this.measureStart,measureEnd);distance=Math.round(distance*100)/100;distance=distance+"km";this.measureStartBox=this.measureBox;}
-this.measureStart=this.map.getLonLatFromViewPortPx(this.mouseDragStart);;this.measureBox=OpenLayers.Util.createDiv(null,this.mouseDragStart.add(-2-parseInt(this.map.layerContainerDiv.style.left),-2-parseInt(this.map.layerContainerDiv.style.top)),null,null,"absolute");this.measureBox.style.width="4px";this.measureBox.style.height="4px";this.measureBox.style.fontSize="1px";this.measureBox.style.backgroundColor="red";this.measureBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.layerContainerDiv.appendChild(this.measureBox);if(distance){this.measureBoxDistance=OpenLayers.Util.createDiv(null,this.mouseDragStart.add(-2-parseInt(this.map.layerContainerDiv.style.left),2-parseInt(this.map.layerContainerDiv.style.top)),null,null,"absolute");this.measureBoxDistance.innerHTML=distance;this.measureBoxDistance.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.layerContainerDiv.appendChild(this.measureBoxDistance);this.measureDivs.push(this.measureBoxDistance);}
-this.measureBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.layerContainerDiv.appendChild(this.measureBox);this.measureDivs.push(this.measureBox);break;default:this.map.div.style.cursor="move";break;}
-document.onselectstart=function(){return false;};OpenLayers.Event.stop(evt);},switchModeTo:function(mode){if(mode!=this.mode){if(this.mode&&this.buttons[this.mode]){OpenLayers.Util.modifyAlphaImageDiv(this.buttons[this.mode],null,null,null,this.buttons[this.mode].imgLocation);}
-if(this.mode=="measure"&&mode!="measure"){for(var i=0;i<this.measureDivs.length;i++){if(this.measureDivs[i]){this.map.layerContainerDiv.removeChild(this.measureDivs[i]);}}
-this.measureDivs=[];this.measureStart=null;}
-this.mode=mode;if(this.buttons[mode]){OpenLayers.Util.modifyAlphaImageDiv(this.buttons[mode],null,null,null,this.buttons[mode].activeImgLocation);}
-switch(this.mode){case"zoombox":this.map.div.style.cursor="crosshair";break;default:this.map.div.style.cursor="";break;}}},leaveMode:function(){this.switchModeTo("pan");},defaultMouseMove:function(evt){if(this.mouseDragStart!=null){switch(this.mode){case"zoombox":var deltaX=Math.abs(this.mouseDragStart.x-evt.xy.x);var deltaY=Math.abs(this.mouseDragStart.y-evt.xy.y);this.zoomBox.style.width=Math.max(1,deltaX)+"px";this.zoomBox.style.height=Math.max(1,deltaY)+"px";if(evt.xy.x<this.mouseDragStart.x){this.zoomBox.style.left=evt.xy.x+"px";}
-if(evt.xy.y<this.mouseDragStart.y){this.zoomBox.style.top=evt.xy.y+"px";}
-break;default:var deltaX=this.mouseDragStart.x-evt.xy.x;var deltaY=this.mouseDragStart.y-evt.xy.y;var size=this.map.getSize();var newXY=new OpenLayers.Pixel(size.w/2+deltaX,size.h/2+deltaY);var newCenter=this.map.getLonLatFromViewPortPx(newXY);this.map.setCenter(newCenter,null,true);this.mouseDragStart=evt.xy.clone();}
-this.performedDrag=true;}},defaultMouseUp:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-switch(this.mode){case"zoombox":this.zoomBoxEnd(evt);if(this.startViaKeyboard){this.leaveMode();}
-break;case"pan":if(this.performedDrag){this.map.setCenter(this.map.center);}}
-document.onselectstart=null;this.mouseDragStart=null;this.map.div.style.cursor="default";},defaultMouseOut:function(evt){if(this.mouseDragStart!=null&&OpenLayers.Util.mouseLeft(evt,this.map.div)){if(this.zoomBox){this.removeZoomBox();if(this.startViaKeyboard){this.leaveMode();}}
-this.mouseDragStart=null;this.map.div.style.cursor="default";}},defaultClick:function(evt){if(this.performedDrag){this.performedDrag=false;return false;}},CLASS_NAME:"OpenLayers.Control.MouseToolbar"});OpenLayers.Control.MouseToolbar.X=6;OpenLayers.Control.MouseToolbar.Y=300;OpenLayers.Control.PanZoomBar=OpenLayers.Class(OpenLayers.Control.PanZoom,{zoomStopWidth:18,zoomStopHeight:11,slider:null,sliderEvents:null,zoomBarDiv:null,divEvents:null,zoomWorldIcon:false,initialize:function(){OpenLayers.Control.PanZoom.prototype.initialize.apply(this,arguments);},destroy:function(){this.div.removeChild(this.slider);this.slider=null;this.sliderEvents.destroy();this.sliderEvents=null;this.div.removeChild(this.zoombarDiv);this.zoomBarDiv=null;this.divEvents.destroy();this.divEvents=null;this.map.events.un({"zoomend":this.moveZoomBar,"changebaselayer":this.redraw,scope:this});OpenLayers.Control.PanZoom.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.PanZoom.prototype.setMap.apply(this,arguments);this.map.events.register("changebaselayer",this,this.redraw);},redraw:function(){if(this.div!=null){this.div.innerHTML="";}
-this.draw();},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position.clone();this.buttons=[];var sz=new OpenLayers.Size(18,18);var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);var wposition=sz.w;if(this.zoomWorldIcon){centered=new OpenLayers.Pixel(px.x+sz.w,px.y);}
-this._addButton("panup","north-mini.png",centered,sz);px.y=centered.y+sz.h;this._addButton("panleft","west-mini.png",px,sz);if(this.zoomWorldIcon){this._addButton("zoomworld","zoom-world-mini.png",px.add(sz.w,0),sz);wposition*=2;}
-this._addButton("panright","east-mini.png",px.add(wposition,0),sz);this._addButton("pandown","south-mini.png",centered.add(0,sz.h*2),sz);this._addButton("zoomin","zoom-plus-mini.png",centered.add(0,sz.h*3+5),sz);centered=this._addZoomBar(centered.add(0,sz.h*4+5));this._addButton("zoomout","zoom-minus-mini.png",centered,sz);return this.div;},_addZoomBar:function(centered){var imgLocation=OpenLayers.Util.getImagesLocation();var id="OpenLayers_Control_PanZoomBar_Slider"+this.map.id;var zoomsToEnd=this.map.getNumZoomLevels()-1-this.map.getZoom();var slider=OpenLayers.Util.createAlphaImageDiv(id,centered.add(-1,zoomsToEnd*this.zoomStopHeight),new OpenLayers.Size(20,9),imgLocation+"slider.png","absolute");this.slider=slider;this.sliderEvents=new OpenLayers.Events(this,slider,null,true);this.sliderEvents.on({"mousedown":this.zoomBarDown,"mousemove":this.zoomBarDrag,"mouseup":this.zoomBarUp,"dblclick":this.doubleClick,"click":this.doubleClick});var sz=new OpenLayers.Size();sz.h=this.zoomStopHeight*this.map.getNumZoomLevels();sz.w=this.zoomStopWidth;var div=null;if(OpenLayers.Util.alphaHack()){var id="OpenLayers_Control_PanZoomBar"+this.map.id;div=OpenLayers.Util.createAlphaImageDiv(id,centered,new OpenLayers.Size(sz.w,this.zoomStopHeight),imgLocation+"zoombar.png","absolute",null,"crop");div.style.height=sz.h;}else{div=OpenLayers.Util.createDiv('OpenLayers_Control_PanZoomBar_Zoombar'+this.map.id,centered,sz,imgLocation+"zoombar.png");}
-this.zoombarDiv=div;this.divEvents=new OpenLayers.Events(this,div,null,true);this.divEvents.on({"mousedown":this.divClick,"mousemove":this.passEventToSlider,"dblclick":this.doubleClick,"click":this.doubleClick});this.div.appendChild(div);this.startTop=parseInt(div.style.top);this.div.appendChild(slider);this.map.events.register("zoomend",this,this.moveZoomBar);centered=centered.add(0,this.zoomStopHeight*this.map.getNumZoomLevels());return centered;},passEventToSlider:function(evt){this.sliderEvents.handleBrowserEvent(evt);},divClick:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-var y=evt.xy.y;var top=OpenLayers.Util.pagePosition(evt.object)[1];var levels=(y-top)/this.zoomStopHeight;if(!this.map.fractionalZoom){levels=Math.floor(levels);}
-var zoom=(this.map.getNumZoomLevels()-1)-levels;zoom=Math.min(Math.max(zoom,0),this.map.getNumZoomLevels()-1);this.map.zoomTo(zoom);OpenLayers.Event.stop(evt);},zoomBarDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-this.map.events.on({"mousemove":this.passEventToSlider,"mouseup":this.passEventToSlider,scope:this});this.mouseDragStart=evt.xy.clone();this.zoomStart=evt.xy.clone();this.div.style.cursor="move";this.zoombarDiv.offsets=null;OpenLayers.Event.stop(evt);},zoomBarDrag:function(evt){if(this.mouseDragStart!=null){var deltaY=this.mouseDragStart.y-evt.xy.y;var offsets=OpenLayers.Util.pagePosition(this.zoombarDiv);if((evt.clientY-offsets[1])>0&&(evt.clientY-offsets[1])<parseInt(this.zoombarDiv.style.height)-2){var newTop=parseInt(this.slider.style.top)-deltaY;this.slider.style.top=newTop+"px";}
-this.mouseDragStart=evt.xy.clone();OpenLayers.Event.stop(evt);}},zoomBarUp:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;}
-if(this.zoomStart){this.div.style.cursor="";this.map.events.un({"mouseup":this.passEventToSlider,"mousemove":this.passEventToSlider,scope:this});var deltaY=this.zoomStart.y-evt.xy.y;var zoomLevel=this.map.zoom;if(this.map.fractionalZoom){zoomLevel+=deltaY/this.zoomStopHeight;zoomLevel=Math.min(Math.max(zoomLevel,0),this.map.getNumZoomLevels()-1);}else{zoomLevel+=Math.round(deltaY/this.zoomStopHeight);}
-this.map.zoomTo(zoomLevel);this.moveZoomBar();this.mouseDragStart=null;OpenLayers.Event.stop(evt);}},moveZoomBar:function(){var newTop=((this.map.getNumZoomLevels()-1)-this.map.getZoom())*this.zoomStopHeight+this.startTop+1;this.slider.style.top=newTop+"px";},CLASS_NAME:"OpenLayers.Control.PanZoomBar"});OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:" ",space:" ",newline:"\n",level:0,pretty:false,initialize:function(options){OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(json,filter){try{if(/^[\],:{}\s]*$/.test(json.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){var object=eval('('+json+')');if(typeof filter==='function'){function walk(k,v){if(v&&typeof v==='object'){for(var i in v){if(v.hasOwnProperty(i)){v[i]=walk(i,v[i]);}}}
-return filter(k,v);}
-object=walk('',object);}
-return object;}}catch(e){}
-return null;},write:function(value,pretty){this.pretty=!!pretty;var json=null;var type=typeof value;if(this.serialize[type]){json=this.serialize[type].apply(this,[value]);}
-return json;},writeIndent:function(){var pieces=[];if(this.pretty){for(var i=0;i<this.level;++i){pieces.push(this.indent);}}
-return pieces.join('');},writeNewline:function(){return(this.pretty)?this.newline:'';},writeSpace:function(){return(this.pretty)?this.space:'';},serialize:{'object':function(object){if(object==null){return"null";}
-if(object.constructor==Date){return this.serialize.date.apply(this,[object]);}
-if(object.constructor==Array){return this.serialize.array.apply(this,[object]);}
-var pieces=['{'];this.level+=1;var key,keyJSON,valueJSON;var addComma=false;for(key in object){if(object.hasOwnProperty(key)){keyJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[key,this.pretty]);valueJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[object[key],this.pretty]);if(keyJSON!=null&&valueJSON!=null){if(addComma){pieces.push(',');}
-pieces.push(this.writeNewline(),this.writeIndent(),keyJSON,':',this.writeSpace(),valueJSON);addComma=true;}}}
-this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),'}');return pieces.join('');},'array':function(array){var json;var pieces=['['];this.level+=1;for(var i=0;i<array.length;++i){json=OpenLayers.Format.JSON.prototype.write.apply(this,[array[i],this.pretty]);if(json!=null){if(i>0){pieces.push(',');}
-pieces.push(this.writeNewline(),this.writeIndent(),json);}}
-this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),']');return pieces.join('');},'string':function(string){var m={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};if(/["\\\x00-\x1f]/.test(string)){return'"'+string.replace(/([\x00-\x1f\\"])/g,function(a,b){var c=m[b];if(c){return c;}
-c=b.charCodeAt();return'\\u00'+
-Math.floor(c/16).toString(16)+
-(c%16).toString(16);})+'"';}
-return'"'+string+'"';},'number':function(number){return isFinite(number)?String(number):"null";},'boolean':function(bool){return String(bool);},'date':function(date){function format(number){return(number<10)?'0'+number:number;}
-return'"'+date.getFullYear()+'-'+
-format(date.getMonth()+1)+'-'+
-format(date.getDate())+'T'+
-format(date.getHours())+':'+
-format(date.getMinutes())+':'+
-format(date.getSeconds())+'"';}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{xmldom:null,initialize:function(options){if(window.ActiveXObject){this.xmldom=new ActiveXObject("Microsoft.XMLDOM");}
-OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(text){var index=text.indexOf('<');if(index>0){text=text.substring(index);}
-var node=OpenLayers.Util.Try(OpenLayers.Function.bind((function(){var xmldom;if(window.ActiveXObject&&!this.xmldom){xmldom=new ActiveXObject("Microsoft.XMLDOM");}else{xmldom=this.xmldom;}
-xmldom.loadXML(text);return xmldom;}),this),function(){return new DOMParser().parseFromString(text,'text/xml');},function(){var req=new XMLHttpRequest();req.open("GET","data:"+"text/xml"+";charset=utf-8,"+encodeURIComponent(text),false);if(req.overrideMimeType){req.overrideMimeType("text/xml");}
-req.send(null);return req.responseXML;});return node;},write:function(node){var data;if(this.xmldom){data=node.xml;}else{var serializer=new XMLSerializer();if(node.nodeType==1){var doc=document.implementation.createDocument("","",null);if(doc.importNode){node=doc.importNode(node,true);}
-doc.appendChild(node);data=serializer.serializeToString(doc);}else{data=serializer.serializeToString(node);}}
-return data;},createElementNS:function(uri,name){var element;if(this.xmldom){if(typeof uri=="string"){element=this.xmldom.createNode(1,name,uri);}else{element=this.xmldom.createNode(1,name,"");}}else{element=document.createElementNS(uri,name);}
-return element;},createTextNode:function(text){var node;if(this.xmldom){node=this.xmldom.createTextNode(text);}else{node=document.createTextNode(text);}
-return node;},getElementsByTagNameNS:function(node,uri,name){var elements=[];if(node.getElementsByTagNameNS){elements=node.getElementsByTagNameNS(uri,name);}else{var allNodes=node.getElementsByTagName("*");var potentialNode,fullName;for(var i=0;i<allNodes.length;++i){potentialNode=allNodes[i];fullName=(potentialNode.prefix)?(potentialNode.prefix+":"+name):name;if((name=="*")||(fullName==potentialNode.nodeName)){if((uri=="*")||(uri==potentialNode.namespaceURI)){elements.push(potentialNode);}}}}
-return elements;},getAttributeNodeNS:function(node,uri,name){var attributeNode=null;if(node.getAttributeNodeNS){attributeNode=node.getAttributeNodeNS(uri,name);}else{var attributes=node.attributes;var potentialNode,fullName;for(var i=0;i<attributes.length;++i){potentialNode=attributes[i];if(potentialNode.namespaceURI==uri){fullName=(potentialNode.prefix)?(potentialNode.prefix+":"+name):name;if(fullName==potentialNode.nodeName){attributeNode=potentialNode;break;}}}}
-return attributeNode;},getAttributeNS:function(node,uri,name){var attributeValue="";if(node.getAttributeNS){attributeValue=node.getAttributeNS(uri,name)||"";}else{var attributeNode=this.getAttributeNodeNS(node,uri,name);if(attributeNode){attributeValue=attributeNode.nodeValue;}}
-return attributeValue;},getChildValue:function(node,def){var value;try{value=node.firstChild.nodeValue;}catch(e){value=(def!=undefined)?def:"";}
-return value;},concatChildValues:function(node,def){var value="";var child=node.firstChild;var childValue;while(child){childValue=child.nodeValue;if(childValue){value+=childValue;}
-child=child.nextSibling;}
-if(value==""&&def!=undefined){value=def;}
-return value;},hasAttributeNS:function(node,uri,name){var found=false;if(node.hasAttributeNS){found=node.hasAttributeNS(uri,name);}else{found=!!this.getAttributeNodeNS(node,uri,name);}
-return found;},setAttributeNS:function(node,uri,name,value){if(node.setAttributeNS){node.setAttributeNS(uri,name,value);}else{if(this.xmldom){if(uri){var attribute=node.ownerDocument.createNode(2,name,uri);attribute.nodeValue=value;node.setAttributeNode(attribute);}else{node.setAttribute(name,value);}}else{throw"setAttributeNS not implemented";}}},CLASS_NAME:"OpenLayers.Format.XML"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:false,evt:null,initialize:function(control,callbacks,options){OpenLayers.Util.extend(this,options);this.control=control;this.callbacks=callbacks;if(control.map){this.setMap(control.map);}
-OpenLayers.Util.extend(this,options);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},setMap:function(map){this.map=map;},checkModifiers:function(evt){if(this.keyMask==null){return true;}
-var keyModifiers=(evt.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(evt.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(evt.altKey?OpenLayers.Handler.MOD_ALT:0);return(keyModifiers==this.keyMask);},activate:function(){if(this.active){return false;}
-var events=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var i=0;i<events.length;i++){if(this[events[i]]){this.register(events[i],this[events[i]]);}}
-this.active=true;return true;},deactivate:function(){if(!this.active){return false;}
-var events=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var i=0;i<events.length;i++){if(this[events[i]]){this.unregister(events[i],this[events[i]]);}}
-this.active=false;return true;},callback:function(name,args){if(name&&this.callbacks[name]){this.callbacks[name].apply(this.control,args);}},register:function(name,method){this.map.events.registerPriority(name,this,method);this.map.events.registerPriority(name,this,this.setEvent);},unregister:function(name,method){this.map.events.unregister(name,this,method);this.map.events.unregister(name,this,this.setEvent);},setEvent:function(evt){this.evt=evt;return true;},destroy:function(){this.deactivate();this.control=this.map=null;},CLASS_NAME:"OpenLayers.Handler"});OpenLayers.Handler.MOD_NONE=0;OpenLayers.Handler.MOD_SHIFT=1;OpenLayers.Handler.MOD_CTRL=2;OpenLayers.Handler.MOD_ALT=4;OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Popup:750,Control:1000},EVENT_TYPES:["preaddlayer","addlayer","removelayer","changelayer","movestart","move","moveend","zoomend","popupopen","popupclose","addmarker","removemarker","clearmarkers","mouseover","mouseout","mousemove","dragstart","drag","dragend","changebaselayer"],id:null,fractionalZoom:false,events:null,div:null,dragging:false,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,viewRequestID:0,tileSize:null,projection:"EPSG:4326",units:'degrees',resolutions:null,maxResolution:1.40625,minResolution:null,maxScale:null,minScale:null,maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:true,panTween:null,eventListeners:null,panMethod:OpenLayers.Easing.Expo.easeOut,paddingForPopups:null,initialize:function(div,options){this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,OpenLayers.Map.TILE_HEIGHT);this.maxExtent=new OpenLayers.Bounds(-180,-90,180,90);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+'theme/default/style.css';OpenLayers.Util.extend(this,options);this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(div);var id=this.div.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(id,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);id=this.div.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(id);this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;this.viewPortDiv.appendChild(this.layerContainerDiv);this.events=new OpenLayers.Events(this,this.div,this.EVENT_TYPES,this.fallThrough);this.updateSize();if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}
-this.events.register("movestart",this,this.updateSize);if(OpenLayers.String.contains(navigator.appName,"Microsoft")){this.events.register("resize",this,this.updateSize);}else{this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this);OpenLayers.Event.observe(window,'resize',this.updateSizeDestroy);}
-if(this.theme){var addNode=true;var nodes=document.getElementsByTagName('link');for(var i=0;i<nodes.length;++i){if(OpenLayers.Util.isEquivalentUrl(nodes.item(i).href,this.theme)){addNode=false;break;}}
+listeners=listeners.slice();var continueChain;for(var i=0,len=listeners.length;i<len;i++){var callback=listeners[i];continueChain=callback.func.apply(callback.obj,[evt]);if((continueChain!=undefined)&&(continueChain==false)){break;}}
+if(!this.fallThrough){OpenLayers.Event.stop(evt,true);}
+return continueChain;},handleBrowserEvent:function(evt){var type=evt.type,listeners=this.listeners[type];if(!listeners||listeners.length==0){return;}
+var touches=evt.touches;if(touches&&touches[0]){var x=0;var y=0;var num=touches.length;var touch;for(var i=0;i<num;++i){touch=touches[i];x+=touch.clientX;y+=touch.clientY;}
+evt.clientX=x/num;evt.clientY=y/num;}
+if(this.includeXY){evt.xy=this.getMousePosition(evt);}
+this.triggerEvent(type,evt);},clearMouseCache:function(){this.element.scrolls=null;this.element.lefttop=null;var body=document.body;if(body&&!((body.scrollTop!=0||body.scrollLeft!=0)&&navigator.userAgent.match(/iPhone/i))){this.element.offsets=null;}},getMousePosition:function(evt){if(!this.includeXY){this.clearMouseCache();}else if(!this.element.hasScrollEvent){OpenLayers.Event.observe(window,"scroll",this.clearMouseListener);this.element.hasScrollEvent=true;}
+if(!this.element.scrolls){var viewportElement=OpenLayers.Util.getViewportElement();this.element.scrolls=[viewportElement.scrollLeft,viewportElement.scrollTop];}
+if(!this.element.lefttop){this.element.lefttop=[(document.documentElement.clientLeft||0),(document.documentElement.clientTop||0)];}
+if(!this.element.offsets){this.element.offsets=OpenLayers.Util.pagePosition(this.element);}
+return new OpenLayers.Pixel((evt.clientX+this.element.scrolls[0])-this.element.offsets[0]
+-this.element.lefttop[0],(evt.clientY+this.element.scrolls[1])-this.element.offsets[1]
+-this.element.lefttop[1]);},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Events.buttonclick=OpenLayers.Class({target:null,events:['mousedown','mouseup','click','dblclick','touchstart','touchmove','touchend','keydown'],startRegEx:/^mousedown|touchstart$/,cancelRegEx:/^touchmove$/,completeRegEx:/^mouseup|touchend$/,initialize:function(target){this.target=target;for(var i=this.events.length-1;i>=0;--i){this.target.register(this.events[i],this,this.buttonClick,{extension:true});}},destroy:function(){for(var i=this.events.length-1;i>=0;--i){this.target.unregister(this.events[i],this,this.buttonClick);}
+delete this.target;},getPressedButton:function(element){var depth=3,button;do{if(OpenLayers.Element.hasClass(element,"olButton")){button=element;break;}
+element=element.parentNode;}while(--depth>0&&element);return button;},buttonClick:function(evt){var propagate=true,element=OpenLayers.Event.element(evt);if(element&&(OpenLayers.Event.isLeftClick(evt)||!~evt.type.indexOf("mouse"))){var button=this.getPressedButton(element);if(button){if(evt.type==="keydown"){switch(evt.keyCode){case OpenLayers.Event.KEY_RETURN:case OpenLayers.Event.KEY_SPACE:this.target.triggerEvent("buttonclick",{buttonElement:button});OpenLayers.Event.stop(evt);propagate=false;break;}}else if(this.startEvt){if(this.completeRegEx.test(evt.type)){var pos=OpenLayers.Util.pagePosition(button);this.target.triggerEvent("buttonclick",{buttonElement:button,buttonXY:{x:this.startEvt.clientX-pos[0],y:this.startEvt.clientY-pos[1]}});}
+if(this.cancelRegEx.test(evt.type)){delete this.startEvt;}
+OpenLayers.Event.stop(evt);propagate=false;}
+if(this.startRegEx.test(evt.type)){this.startEvt=evt;OpenLayers.Event.stop(evt);propagate=false;}}else{delete this.startEvt;}}
+return propagate;}});OpenLayers.Control.OverviewMap=OpenLayers.Class(OpenLayers.Control,{element:null,ovmap:null,size:{w:180,h:90},layers:null,minRectSize:15,minRectDisplayClass:"RectReplacement",minRatio:8,maxRatio:32,mapOptions:null,autoPan:false,handlers:null,resolutionFactor:1,maximized:false,initialize:function(options){this.layers=[];this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,[options]);},destroy:function(){if(!this.mapDiv){return;}
+if(this.handlers.click){this.handlers.click.destroy();}
+if(this.handlers.drag){this.handlers.drag.destroy();}
+this.ovmap&&this.ovmap.viewPortDiv.removeChild(this.extentRectangle);this.extentRectangle=null;if(this.rectEvents){this.rectEvents.destroy();this.rectEvents=null;}
+if(this.ovmap){this.ovmap.destroy();this.ovmap=null;}
+this.element.removeChild(this.mapDiv);this.mapDiv=null;this.div.removeChild(this.element);this.element=null;if(this.maximizeDiv){this.div.removeChild(this.maximizeDiv);this.maximizeDiv=null;}
+if(this.minimizeDiv){this.div.removeChild(this.minimizeDiv);this.minimizeDiv=null;}
+this.map.events.un({buttonclick:this.onButtonClick,moveend:this.update,changebaselayer:this.baseLayerDraw,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(this.layers.length===0){if(this.map.baseLayer){var layer=this.map.baseLayer.clone();this.layers=[layer];}else{this.map.events.register("changebaselayer",this,this.baseLayerDraw);return this.div;}}
+this.element=document.createElement('div');this.element.className=this.displayClass+'Element';this.element.style.display='none';this.mapDiv=document.createElement('div');this.mapDiv.style.width=this.size.w+'px';this.mapDiv.style.height=this.size.h+'px';this.mapDiv.style.position='relative';this.mapDiv.style.overflow='hidden';this.mapDiv.id=OpenLayers.Util.createUniqueID('overviewMap');this.extentRectangle=document.createElement('div');this.extentRectangle.style.position='absolute';this.extentRectangle.style.zIndex=1000;this.extentRectangle.className=this.displayClass+'ExtentRectangle';this.element.appendChild(this.mapDiv);this.div.appendChild(this.element);if(!this.outsideViewport){this.div.className+=" "+this.displayClass+'Container';var img=OpenLayers.Util.getImageLocation('layer-switcher-maximize.png');this.maximizeDiv=OpenLayers.Util.createAlphaImageDiv(this.displayClass+'MaximizeButton',null,null,img,'absolute');this.maximizeDiv.style.display='none';this.maximizeDiv.className=this.displayClass+'MaximizeButton olButton';this.div.appendChild(this.maximizeDiv);var img=OpenLayers.Util.getImageLocation('layer-switcher-minimize.png');this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv('OpenLayers_Control_minimizeDiv',null,null,img,'absolute');this.minimizeDiv.style.display='none';this.minimizeDiv.className=this.displayClass+'MinimizeButton olButton';this.div.appendChild(this.minimizeDiv);this.minimizeControl();}else{this.element.style.display='';}
+if(this.map.getExtent()){this.update();}
+this.map.events.on({buttonclick:this.onButtonClick,moveend:this.update,scope:this});if(this.maximized){this.maximizeControl();}
+return this.div;},baseLayerDraw:function(){this.draw();this.map.events.unregister("changebaselayer",this,this.baseLayerDraw);},rectDrag:function(px){var deltaX=this.handlers.drag.last.x-px.x;var deltaY=this.handlers.drag.last.y-px.y;if(deltaX!=0||deltaY!=0){var rectTop=this.rectPxBounds.top;var rectLeft=this.rectPxBounds.left;var rectHeight=Math.abs(this.rectPxBounds.getHeight());var rectWidth=this.rectPxBounds.getWidth();var newTop=Math.max(0,(rectTop-deltaY));newTop=Math.min(newTop,this.ovmap.size.h-this.hComp-rectHeight);var newLeft=Math.max(0,(rectLeft-deltaX));newLeft=Math.min(newLeft,this.ovmap.size.w-this.wComp-rectWidth);this.setRectPxBounds(new OpenLayers.Bounds(newLeft,newTop+rectHeight,newLeft+rectWidth,newTop));}},mapDivClick:function(evt){var pxCenter=this.rectPxBounds.getCenterPixel();var deltaX=evt.xy.x-pxCenter.x;var deltaY=evt.xy.y-pxCenter.y;var top=this.rectPxBounds.top;var left=this.rectPxBounds.left;var height=Math.abs(this.rectPxBounds.getHeight());var width=this.rectPxBounds.getWidth();var newTop=Math.max(0,(top+deltaY));newTop=Math.min(newTop,this.ovmap.size.h-height);var newLeft=Math.max(0,(left+deltaX));newLeft=Math.min(newLeft,this.ovmap.size.w-width);this.setRectPxBounds(new OpenLayers.Bounds(newLeft,newTop+height,newLeft+width,newTop));this.updateMapToRect();},onButtonClick:function(evt){if(evt.buttonElement===this.minimizeDiv){this.minimizeControl();}else if(evt.buttonElement===this.maximizeDiv){this.maximizeControl();}},maximizeControl:function(e){this.element.style.display='';this.showToggle(false);if(e!=null){OpenLayers.Event.stop(e);}},minimizeControl:function(e){this.element.style.display='none';this.showToggle(true);if(e!=null){OpenLayers.Event.stop(e);}},showToggle:function(minimize){if(this.maximizeDiv){this.maximizeDiv.style.display=minimize?'':'none';}
+if(this.minimizeDiv){this.minimizeDiv.style.display=minimize?'none':'';}},update:function(){if(this.ovmap==null){this.createMap();}
+if(this.autoPan||!this.isSuitableOverview()){this.updateOverview();}
+this.updateRectToMap();},isSuitableOverview:function(){var mapExtent=this.map.getExtent();var maxExtent=this.map.maxExtent;var testExtent=new OpenLayers.Bounds(Math.max(mapExtent.left,maxExtent.left),Math.max(mapExtent.bottom,maxExtent.bottom),Math.min(mapExtent.right,maxExtent.right),Math.min(mapExtent.top,maxExtent.top));if(this.ovmap.getProjection()!=this.map.getProjection()){testExtent=testExtent.transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject());}
+var resRatio=this.ovmap.getResolution()/this.map.getResolution();return((resRatio>this.minRatio)&&(resRatio<=this.maxRatio)&&(this.ovmap.getExtent().containsBounds(testExtent)));},updateOverview:function(){var mapRes=this.map.getResolution();var targetRes=this.ovmap.getResolution();var resRatio=targetRes/mapRes;if(resRatio>this.maxRatio){targetRes=this.minRatio*mapRes;}else if(resRatio<=this.minRatio){targetRes=this.maxRatio*mapRes;}
+var center;if(this.ovmap.getProjection()!=this.map.getProjection()){center=this.map.center.clone();center.transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject());}else{center=this.map.center;}
+this.ovmap.setCenter(center,this.ovmap.getZoomForResolution(targetRes*this.resolutionFactor));this.updateRectToMap();},createMap:function(){var options=OpenLayers.Util.extend({controls:[],maxResolution:'auto',fallThrough:false},this.mapOptions);this.ovmap=new OpenLayers.Map(this.mapDiv,options);this.ovmap.viewPortDiv.appendChild(this.extentRectangle);OpenLayers.Event.stopObserving(window,'unload',this.ovmap.unloadDestroy);this.ovmap.addLayers(this.layers);this.ovmap.zoomToMaxExtent();this.wComp=parseInt(OpenLayers.Element.getStyle(this.extentRectangle,'border-left-width'))+
+parseInt(OpenLayers.Element.getStyle(this.extentRectangle,'border-right-width'));this.wComp=(this.wComp)?this.wComp:2;this.hComp=parseInt(OpenLayers.Element.getStyle(this.extentRectangle,'border-top-width'))+
+parseInt(OpenLayers.Element.getStyle(this.extentRectangle,'border-bottom-width'));this.hComp=(this.hComp)?this.hComp:2;this.handlers.drag=new OpenLayers.Handler.Drag(this,{move:this.rectDrag,done:this.updateMapToRect},{map:this.ovmap});this.handlers.click=new OpenLayers.Handler.Click(this,{"click":this.mapDivClick},{"single":true,"double":false,"stopSingle":true,"stopDouble":true,"pixelTolerance":1,map:this.ovmap});this.handlers.click.activate();this.rectEvents=new OpenLayers.Events(this,this.extentRectangle,null,true);this.rectEvents.register("mouseover",this,function(e){if(!this.handlers.drag.active&&!this.map.dragging){this.handlers.drag.activate();}});this.rectEvents.register("mouseout",this,function(e){if(!this.handlers.drag.dragging){this.handlers.drag.deactivate();}});if(this.ovmap.getProjection()!=this.map.getProjection()){var sourceUnits=this.map.getProjectionObject().getUnits()||this.map.units||this.map.baseLayer.units;var targetUnits=this.ovmap.getProjectionObject().getUnits()||this.ovmap.units||this.ovmap.baseLayer.units;this.resolutionFactor=sourceUnits&&targetUnits?OpenLayers.INCHES_PER_UNIT[sourceUnits]/OpenLayers.INCHES_PER_UNIT[targetUnits]:1;}},updateRectToMap:function(){var bounds;if(this.ovmap.getProjection()!=this.map.getProjection()){bounds=this.map.getExtent().transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject());}else{bounds=this.map.getExtent();}
+var pxBounds=this.getRectBoundsFromMapBounds(bounds);if(pxBounds){this.setRectPxBounds(pxBounds);}},updateMapToRect:function(){var lonLatBounds=this.getMapBoundsFromRectBounds(this.rectPxBounds);if(this.ovmap.getProjection()!=this.map.getProjection()){lonLatBounds=lonLatBounds.transform(this.ovmap.getProjectionObject(),this.map.getProjectionObject());}
+this.map.panTo(lonLatBounds.getCenterLonLat());},setRectPxBounds:function(pxBounds){var top=Math.max(pxBounds.top,0);var left=Math.max(pxBounds.left,0);var bottom=Math.min(pxBounds.top+Math.abs(pxBounds.getHeight()),this.ovmap.size.h-this.hComp);var right=Math.min(pxBounds.left+pxBounds.getWidth(),this.ovmap.size.w-this.wComp);var width=Math.max(right-left,0);var height=Math.max(bottom-top,0);if(width<this.minRectSize||height<this.minRectSize){this.extentRectangle.className=this.displayClass+
+this.minRectDisplayClass;var rLeft=left+(width/2)-(this.minRectSize/2);var rTop=top+(height/2)-(this.minRectSize/2);this.extentRectangle.style.top=Math.round(rTop)+'px';this.extentRectangle.style.left=Math.round(rLeft)+'px';this.extentRectangle.style.height=this.minRectSize+'px';this.extentRectangle.style.width=this.minRectSize+'px';}else{this.extentRectangle.className=this.displayClass+'ExtentRectangle';this.extentRectangle.style.top=Math.round(top)+'px';this.extentRectangle.style.left=Math.round(left)+'px';this.extentRectangle.style.height=Math.round(height)+'px';this.extentRectangle.style.width=Math.round(width)+'px';}
+this.rectPxBounds=new OpenLayers.Bounds(Math.round(left),Math.round(bottom),Math.round(right),Math.round(top));},getRectBoundsFromMapBounds:function(lonLatBounds){var leftBottomPx=this.getOverviewPxFromLonLat({lon:lonLatBounds.left,lat:lonLatBounds.bottom});var rightTopPx=this.getOverviewPxFromLonLat({lon:lonLatBounds.right,lat:lonLatBounds.top});var bounds=null;if(leftBottomPx&&rightTopPx){bounds=new OpenLayers.Bounds(leftBottomPx.x,leftBottomPx.y,rightTopPx.x,rightTopPx.y);}
+return bounds;},getMapBoundsFromRectBounds:function(pxBounds){var leftBottomLonLat=this.getLonLatFromOverviewPx({x:pxBounds.left,y:pxBounds.bottom});var rightTopLonLat=this.getLonLatFromOverviewPx({x:pxBounds.right,y:pxBounds.top});return new OpenLayers.Bounds(leftBottomLonLat.lon,leftBottomLonLat.lat,rightTopLonLat.lon,rightTopLonLat.lat);},getLonLatFromOverviewPx:function(overviewMapPx){var size=this.ovmap.size;var res=this.ovmap.getResolution();var center=this.ovmap.getExtent().getCenterLonLat();var deltaX=overviewMapPx.x-(size.w/2);var deltaY=overviewMapPx.y-(size.h/2);return{lon:center.lon+deltaX*res,lat:center.lat-deltaY*res};},getOverviewPxFromLonLat:function(lonlat){var res=this.ovmap.getResolution();var extent=this.ovmap.getExtent();if(extent){return{x:Math.round(1/res*(lonlat.lon-extent.left)),y:Math.round(1/res*(extent.top-lonlat.lat))};}},CLASS_NAME:'OpenLayers.Control.OverviewMap'});OpenLayers.Animation=(function(window){var isNative=!!(window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame);var requestFrame=(function(){var request=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(callback,element){window.setTimeout(callback,16);};return function(callback,element){request.apply(window,[callback,element]);};})();var counter=0;var loops={};function start(callback,duration,element){duration=duration>0?duration:Number.POSITIVE_INFINITY;var id=++counter;var start=+new Date;loops[id]=function(){if(loops[id]&&+new Date-start<=duration){callback();if(loops[id]){requestFrame(loops[id],element);}}else{delete loops[id];}};requestFrame(loops[id],element);return id;}
+function stop(id){delete loops[id];}
+return{isNative:isNative,requestFrame:requestFrame,start:start,stop:stop};})(window);OpenLayers.Tween=OpenLayers.Class({easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,animationId:null,playing:false,initialize:function(easing){this.easing=(easing)?easing:OpenLayers.Easing.Expo.easeOut;},start:function(begin,finish,duration,options){this.playing=true;this.begin=begin;this.finish=finish;this.duration=duration;this.callbacks=options.callbacks;this.time=0;OpenLayers.Animation.stop(this.animationId);this.animationId=null;if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin);}
+this.animationId=OpenLayers.Animation.start(OpenLayers.Function.bind(this.play,this));},stop:function(){if(!this.playing){return;}
+if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish);}
+OpenLayers.Animation.stop(this.animationId);this.animationId=null;this.playing=false;},play:function(){var value={};for(var i in this.begin){var b=this.begin[i];var f=this.finish[i];if(b==null||f==null||isNaN(b)||isNaN(f)){throw new TypeError('invalid value for Tween');}
+var c=f-b;value[i]=this.easing.apply(this,[this.time,b,c,this.duration]);}
+this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,value);}
+if(this.time>this.duration){this.stop();}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(t,b,c,d){return c*t/d+b;},easeOut:function(t,b,c,d){return c*t/d+b;},easeInOut:function(t,b,c,d){return c*t/d+b;},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(t,b,c,d){return(t==0)?b:c*Math.pow(2,10*(t/d-1))+b;},easeOut:function(t,b,c,d){return(t==d)?b+c:c*(-Math.pow(2,-10*t/d)+1)+b;},easeInOut:function(t,b,c,d){if(t==0)return b;if(t==d)return b+c;if((t/=d/2)<1)return c/2*Math.pow(2,10*(t-1))+b;return c/2*(-Math.pow(2,-10*--t)+2)+b;},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(t,b,c,d){return c*(t/=d)*t+b;},easeOut:function(t,b,c,d){return-c*(t/=d)*(t-2)+b;},easeInOut:function(t,b,c,d){if((t/=d/2)<1)return c/2*t*t+b;return-c/2*((--t)*(t-2)-1)+b;},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,titleRegEx:/\+title=[^\+]*/,initialize:function(projCode,options){OpenLayers.Util.extend(this,options);this.projCode=projCode;if(window.Proj4js){this.proj=new Proj4js.Proj(projCode);}},getCode:function(){return this.proj?this.proj.srsCode:this.projCode;},getUnits:function(){return this.proj?this.proj.units:null;},toString:function(){return this.getCode();},equals:function(projection){var p=projection,equals=false;if(p){if(!(p instanceof OpenLayers.Projection)){p=new OpenLayers.Projection(p);}
+if(window.Proj4js&&this.proj.defData&&p.proj.defData){equals=this.proj.defData.replace(this.titleRegEx,"")==p.proj.defData.replace(this.titleRegEx,"");}else if(p.getCode){var source=this.getCode(),target=p.getCode();equals=source==target||!!OpenLayers.Projection.transforms[source]&&OpenLayers.Projection.transforms[source][target]===OpenLayers.Projection.nullTransform;}}
+return equals;},destroy:function(){delete this.proj;delete this.projCode;},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};OpenLayers.Projection.defaults={"EPSG:4326":{units:"degrees",maxExtent:[-180,-90,180,90],yx:true},"CRS:84":{units:"degrees",maxExtent:[-180,-90,180,90]},"EPSG:900913":{units:"m",maxExtent:[-20037508.34,-20037508.34,20037508.34,20037508.34]}};OpenLayers.Projection.addTransform=function(from,to,method){if(method===OpenLayers.Projection.nullTransform){var defaults=OpenLayers.Projection.defaults[from];if(defaults&&!OpenLayers.Projection.defaults[to]){OpenLayers.Projection.defaults[to]=defaults;}}
+if(!OpenLayers.Projection.transforms[from]){OpenLayers.Projection.transforms[from]={};}
+OpenLayers.Projection.transforms[from][to]=method;};OpenLayers.Projection.transform=function(point,source,dest){if(source&&dest){if(!(source instanceof OpenLayers.Projection)){source=new OpenLayers.Projection(source);}
+if(!(dest instanceof OpenLayers.Projection)){dest=new OpenLayers.Projection(dest);}
+if(source.proj&&dest.proj){point=Proj4js.transform(source.proj,dest.proj,point);}else{var sourceCode=source.getCode();var destCode=dest.getCode();var transforms=OpenLayers.Projection.transforms;if(transforms[sourceCode]&&transforms[sourceCode][destCode]){transforms[sourceCode][destCode](point);}}}
+return point;};OpenLayers.Projection.nullTransform=function(point){return point;};(function(){var pole=20037508.34;function inverseMercator(xy){xy.x=180*xy.x/pole;xy.y=180/Math.PI*(2*Math.atan(Math.exp((xy.y/pole)*Math.PI))-Math.PI/2);return xy;}
+function forwardMercator(xy){xy.x=xy.x*pole/180;xy.y=Math.log(Math.tan((90+xy.y)*Math.PI/360))/Math.PI*pole;return xy;}
+function map(base,codes){var add=OpenLayers.Projection.addTransform;var same=OpenLayers.Projection.nullTransform;var i,len,code,other,j;for(i=0,len=codes.length;i<len;++i){code=codes[i];add(base,code,forwardMercator);add(code,base,inverseMercator);for(j=i+1;j<len;++j){other=codes[j];add(code,other,same);add(other,code,same);}}}
+var mercator=["EPSG:900913","EPSG:3857","EPSG:102113","EPSG:102100"],geographic=["CRS:84","urn:ogc:def:crs:EPSG:6.6:4326","EPSG:4326"],i;for(i=mercator.length-1;i>=0;--i){map(mercator[i],geographic);}
+for(i=geographic.length-1;i>=0;--i){map(geographic[i],mercator);}})();OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1000},id:null,fractionalZoom:false,events:null,allOverlays:false,div:null,dragging:false,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,options:null,tileSize:null,projection:"EPSG:4326",units:null,resolutions:null,maxResolution:null,minResolution:null,maxScale:null,minScale:null,maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:true,panTween:null,eventListeners:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,paddingForPopups:null,minPx:null,maxPx:null,initialize:function(div,options){if(arguments.length===1&&typeof div==="object"){options=div;div=options&&options.div;}
+this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,OpenLayers.Map.TILE_HEIGHT);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+'theme/default/style.css';this.options=OpenLayers.Util.extend({},options);OpenLayers.Util.extend(this,options);var projCode=this.projection instanceof OpenLayers.Projection?this.projection.projCode:this.projection;OpenLayers.Util.applyDefaults(this,OpenLayers.Projection.defaults[projCode]);if(this.maxExtent&&!(this.maxExtent instanceof OpenLayers.Bounds)){this.maxExtent=new OpenLayers.Bounds(this.maxExtent);}
+if(this.minExtent&&!(this.minExtent instanceof OpenLayers.Bounds)){this.minExtent=new OpenLayers.Bounds(this.minExtent);}
+if(this.restrictedExtent&&!(this.restrictedExtent instanceof OpenLayers.Bounds)){this.restrictedExtent=new OpenLayers.Bounds(this.restrictedExtent);}
+if(this.center&&!(this.center instanceof OpenLayers.LonLat)){this.center=new OpenLayers.LonLat(this.center);}
+this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(div);if(!this.div){this.div=document.createElement("div");this.div.style.height="1px";this.div.style.width="1px";}
+OpenLayers.Element.addClass(this.div,'olMap');var id=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(id,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);this.events=new OpenLayers.Events(this,this.viewPortDiv,null,this.fallThrough,{includeXY:true});id=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(id);this.layerContainerDiv.style.width='100px';this.layerContainerDiv.style.height='100px';this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;this.viewPortDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}
+if(parseFloat(navigator.appVersion.split("MSIE")[1])<9){this.events.register("resize",this,this.updateSize);}else{this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this);OpenLayers.Event.observe(window,'resize',this.updateSizeDestroy);}
+if(this.theme){var addNode=true;var nodes=document.getElementsByTagName('link');for(var i=0,len=nodes.length;i<len;++i){if(OpenLayers.Util.isEquivalentUrl(nodes.item(i).href,this.theme)){addNode=false;break;}}
if(addNode){var cssNode=document.createElement('link');cssNode.setAttribute('rel','stylesheet');cssNode.setAttribute('type','text/css');cssNode.setAttribute('href',this.theme);document.getElementsByTagName('head')[0].appendChild(cssNode);}}
-this.layers=[];if(this.controls==null){if(OpenLayers.Control!=null){this.controls=[new OpenLayers.Control.Navigation(),new OpenLayers.Control.PanZoom(),new OpenLayers.Control.ArgParser(),new OpenLayers.Control.Attribution()];}else{this.controls=[];}}
-for(var i=0;i<this.controls.length;i++){this.addControlToMap(this.controls[i]);}
-this.popups=[];this.unloadDestroy=OpenLayers.Function.bind(this.destroy,this);OpenLayers.Event.observe(window,'unload',this.unloadDestroy);},unloadDestroy:null,updateSizeDestroy:null,destroy:function(){if(!this.unloadDestroy){return false;}
+if(this.controls==null){this.controls=[];if(OpenLayers.Control!=null){if(OpenLayers.Control.Navigation){this.controls.push(new OpenLayers.Control.Navigation());}else if(OpenLayers.Control.TouchNavigation){this.controls.push(new OpenLayers.Control.TouchNavigation());}
+if(OpenLayers.Control.Zoom){this.controls.push(new OpenLayers.Control.Zoom());}else if(OpenLayers.Control.PanZoom){this.controls.push(new OpenLayers.Control.PanZoom());}
+if(OpenLayers.Control.ArgParser){this.controls.push(new OpenLayers.Control.ArgParser());}
+if(OpenLayers.Control.Attribution){this.controls.push(new OpenLayers.Control.Attribution());}}}
+for(var i=0,len=this.controls.length;i<len;i++){this.addControlToMap(this.controls[i]);}
+this.popups=[];this.unloadDestroy=OpenLayers.Function.bind(this.destroy,this);OpenLayers.Event.observe(window,'unload',this.unloadDestroy);if(options&&options.layers){delete this.center;this.addLayers(options.layers);if(options.center&&!this.getCenter()){this.setCenter(options.center,options.zoom);}}},getViewport:function(){return this.viewPortDiv;},render:function(div){this.div=OpenLayers.Util.getElement(div);OpenLayers.Element.addClass(this.div,'olMap');this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);this.div.appendChild(this.viewPortDiv);this.updateSize();},unloadDestroy:null,updateSizeDestroy:null,destroy:function(){if(!this.unloadDestroy){return false;}
+if(this.panTween){this.panTween.stop();this.panTween=null;}
OpenLayers.Event.stopObserving(window,'unload',this.unloadDestroy);this.unloadDestroy=null;if(this.updateSizeDestroy){OpenLayers.Event.stopObserving(window,'resize',this.updateSizeDestroy);}else{this.events.unregister("resize",this,this.updateSize);}
this.paddingForPopups=null;if(this.controls!=null){for(var i=this.controls.length-1;i>=0;--i){this.controls[i].destroy();}
this.controls=null;}
@@ -520,41 +338,55 @@ if(this.layers!=null){for(var i=this.layers.length-1;i>=0;--i){this.layers[i].de
this.layers=null;}
if(this.viewPortDiv){this.div.removeChild(this.viewPortDiv);}
this.viewPortDiv=null;if(this.eventListeners){this.events.un(this.eventListeners);this.eventListeners=null;}
-this.events.destroy();this.events=null;},setOptions:function(options){OpenLayers.Util.extend(this,options);},getTileSize:function(){return this.tileSize;},getBy:function(array,property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this[array],function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getLayersBy:function(property,match){return this.getBy("layers",property,match);},getLayersByName:function(match){return this.getLayersBy("name",match);},getLayersByClass:function(match){return this.getLayersBy("CLASS_NAME",match);},getControlsBy:function(property,match){return this.getBy("controls",property,match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},getLayer:function(id){var foundLayer=null;for(var i=0;i<this.layers.length;i++){var layer=this.layers[i];if(layer.id==id){foundLayer=layer;break;}}
+this.events.destroy();this.events=null;this.options=null;},setOptions:function(options){var updatePxExtent=this.minPx&&options.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,options);updatePxExtent&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:true});},getTileSize:function(){return this.tileSize;},getBy:function(array,property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this[array],function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getLayersBy:function(property,match){return this.getBy("layers",property,match);},getLayersByName:function(match){return this.getLayersBy("name",match);},getLayersByClass:function(match){return this.getLayersBy("CLASS_NAME",match);},getControlsBy:function(property,match){return this.getBy("controls",property,match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},getLayer:function(id){var foundLayer=null;for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];if(layer.id==id){foundLayer=layer;break;}}
return foundLayer;},setLayerZIndex:function(layer,zIdx){layer.setZIndex(this.Z_INDEX_BASE[layer.isBaseLayer?'BaseLayer':'Overlay']
-+zIdx*5);},resetLayersZIndex:function(){for(var i=0;i<this.layers.length;i++){var layer=this.layers[i];this.setLayerZIndex(layer,i);}},addLayer:function(layer){for(var i=0;i<this.layers.length;i++){if(this.layers[i]==layer){var msg=OpenLayers.i18n('layerAlreadyAdded',{'layerName':layer.name});OpenLayers.Console.warn(msg);return false;}}
-this.events.triggerEvent("preaddlayer",{layer:layer});layer.div.className="olLayerDiv";layer.div.style.overflow="";this.setLayerZIndex(layer,this.layers.length);if(layer.isFixed){this.viewPortDiv.appendChild(layer.div);}else{this.layerContainerDiv.appendChild(layer.div);}
-this.layers.push(layer);layer.setMap(this);if(layer.isBaseLayer){if(this.baseLayer==null){this.setBaseLayer(layer);}else{layer.setVisibility(false);}}else{layer.redraw();}
-this.events.triggerEvent("addlayer",{layer:layer});},addLayers:function(layers){for(var i=0;i<layers.length;i++){this.addLayer(layers[i]);}},removeLayer:function(layer,setNewBaseLayer){if(setNewBaseLayer==null){setNewBaseLayer=true;}
++zIdx*5);},resetLayersZIndex:function(){for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];this.setLayerZIndex(layer,i);}},addLayer:function(layer){for(var i=0,len=this.layers.length;i<len;i++){if(this.layers[i]==layer){return false;}}
+if(this.events.triggerEvent("preaddlayer",{layer:layer})===false){return false;}
+if(this.allOverlays){layer.isBaseLayer=false;}
+layer.div.className="olLayerDiv";layer.div.style.overflow="";this.setLayerZIndex(layer,this.layers.length);if(layer.isFixed){this.viewPortDiv.appendChild(layer.div);}else{this.layerContainerDiv.appendChild(layer.div);}
+this.layers.push(layer);layer.setMap(this);if(layer.isBaseLayer||(this.allOverlays&&!this.baseLayer)){if(this.baseLayer==null){this.setBaseLayer(layer);}else{layer.setVisibility(false);}}else{layer.redraw();}
+this.events.triggerEvent("addlayer",{layer:layer});layer.events.triggerEvent("added",{map:this,layer:layer});layer.afterAdd();return true;},addLayers:function(layers){for(var i=0,len=layers.length;i<len;i++){this.addLayer(layers[i]);}},removeLayer:function(layer,setNewBaseLayer){if(this.events.triggerEvent("preremovelayer",{layer:layer})===false){return;}
+if(setNewBaseLayer==null){setNewBaseLayer=true;}
if(layer.isFixed){this.viewPortDiv.removeChild(layer.div);}else{this.layerContainerDiv.removeChild(layer.div);}
-OpenLayers.Util.removeItem(this.layers,layer);layer.removeMap(this);layer.map=null;if(this.baseLayer==layer){this.baseLayer=null;if(setNewBaseLayer){for(var i=0;i<this.layers.length;i++){var iLayer=this.layers[i];if(iLayer.isBaseLayer){this.setBaseLayer(iLayer);break;}}}}
-this.resetLayersZIndex();this.events.triggerEvent("removelayer",{layer:layer});},getNumLayers:function(){return this.layers.length;},getLayerIndex:function(layer){return OpenLayers.Util.indexOf(this.layers,layer);},setLayerIndex:function(layer,idx){var base=this.getLayerIndex(layer);if(idx<0){idx=0;}else if(idx>this.layers.length){idx=this.layers.length;}
-if(base!=idx){this.layers.splice(base,1);this.layers.splice(idx,0,layer);for(var i=0;i<this.layers.length;i++){this.setLayerZIndex(this.layers[i],i);}
-this.events.triggerEvent("changelayer",{layer:layer,property:"order"});}},raiseLayer:function(layer,delta){var idx=this.getLayerIndex(layer)+delta;this.setLayerIndex(layer,idx);},setBaseLayer:function(newBaseLayer){var oldExtent=null;if(this.baseLayer){oldExtent=this.baseLayer.getExtent();}
-if(newBaseLayer!=this.baseLayer){if(OpenLayers.Util.indexOf(this.layers,newBaseLayer)!=-1){if(this.baseLayer!=null){this.baseLayer.setVisibility(false);}
-this.baseLayer=newBaseLayer;this.viewRequestID++;this.baseLayer.visibility=true;var center=this.getCenter();if(center!=null){var newCenter=(oldExtent)?oldExtent.getCenterLonLat():center;var newZoom=(oldExtent)?this.getZoomForExtent(oldExtent,true):this.getZoomForResolution(this.resolution,true);this.setCenter(newCenter,newZoom,false,true);}
-this.events.triggerEvent("changebaselayer",{layer:this.baseLayer});}}},addControl:function(control,px){this.controls.push(control);this.addControlToMap(control,px);},addControlToMap:function(control,px){control.outsideViewport=(control.div!=null);if(this.displayProjection&&!control.displayProjection){control.displayProjection=this.displayProjection;}
+OpenLayers.Util.removeItem(this.layers,layer);layer.removeMap(this);layer.map=null;if(this.baseLayer==layer){this.baseLayer=null;if(setNewBaseLayer){for(var i=0,len=this.layers.length;i<len;i++){var iLayer=this.layers[i];if(iLayer.isBaseLayer||this.allOverlays){this.setBaseLayer(iLayer);break;}}}}
+this.resetLayersZIndex();this.events.triggerEvent("removelayer",{layer:layer});layer.events.triggerEvent("removed",{map:this,layer:layer});},getNumLayers:function(){return this.layers.length;},getLayerIndex:function(layer){return OpenLayers.Util.indexOf(this.layers,layer);},setLayerIndex:function(layer,idx){var base=this.getLayerIndex(layer);if(idx<0){idx=0;}else if(idx>this.layers.length){idx=this.layers.length;}
+if(base!=idx){this.layers.splice(base,1);this.layers.splice(idx,0,layer);for(var i=0,len=this.layers.length;i<len;i++){this.setLayerZIndex(this.layers[i],i);}
+this.events.triggerEvent("changelayer",{layer:layer,property:"order"});if(this.allOverlays){if(idx===0){this.setBaseLayer(layer);}else if(this.baseLayer!==this.layers[0]){this.setBaseLayer(this.layers[0]);}}}},raiseLayer:function(layer,delta){var idx=this.getLayerIndex(layer)+delta;this.setLayerIndex(layer,idx);},setBaseLayer:function(newBaseLayer){if(newBaseLayer!=this.baseLayer){if(OpenLayers.Util.indexOf(this.layers,newBaseLayer)!=-1){var center=this.getCachedCenter();var newResolution=OpenLayers.Util.getResolutionFromScale(this.getScale(),newBaseLayer.units);if(this.baseLayer!=null&&!this.allOverlays){this.baseLayer.setVisibility(false);}
+this.baseLayer=newBaseLayer;if(!this.allOverlays||this.baseLayer.visibility){this.baseLayer.setVisibility(true);if(this.baseLayer.inRange===false){this.baseLayer.redraw();}}
+if(center!=null){var newZoom=this.getZoomForResolution(newResolution||this.resolution,true);this.setCenter(center,newZoom,false,true);}
+this.events.triggerEvent("changebaselayer",{layer:this.baseLayer});}}},addControl:function(control,px){this.controls.push(control);this.addControlToMap(control,px);},addControls:function(controls,pixels){var pxs=(arguments.length===1)?[]:pixels;for(var i=0,len=controls.length;i<len;i++){var ctrl=controls[i];var px=(pxs[i])?pxs[i]:null;this.addControl(ctrl,px);}},addControlToMap:function(control,px){control.outsideViewport=(control.div!=null);if(this.displayProjection&&!control.displayProjection){control.displayProjection=this.displayProjection;}
control.setMap(this);var div=control.draw(px);if(div){if(!control.outsideViewport){div.style.zIndex=this.Z_INDEX_BASE['Control']+
-this.controls.length;this.viewPortDiv.appendChild(div);}}},getControl:function(id){var returnControl=null;for(var i=0;i<this.controls.length;i++){var control=this.controls[i];if(control.id==id){returnControl=control;break;}}
+this.controls.length;this.viewPortDiv.appendChild(div);}}
+if(control.autoActivate){control.activate();}},getControl:function(id){var returnControl=null;for(var i=0,len=this.controls.length;i<len;i++){var control=this.controls[i];if(control.id==id){returnControl=control;break;}}
return returnControl;},removeControl:function(control){if((control)&&(control==this.getControl(control.id))){if(control.div&&(control.div.parentNode==this.viewPortDiv)){this.viewPortDiv.removeChild(control.div);}
OpenLayers.Util.removeItem(this.controls,control);}},addPopup:function(popup,exclusive){if(exclusive){for(var i=this.popups.length-1;i>=0;--i){this.removePopup(this.popups[i]);}}
popup.map=this;this.popups.push(popup);var popupDiv=popup.draw();if(popupDiv){popupDiv.style.zIndex=this.Z_INDEX_BASE['Popup']+
this.popups.length;this.layerContainerDiv.appendChild(popupDiv);}},removePopup:function(popup){OpenLayers.Util.removeItem(this.popups,popup);if(popup.div){try{this.layerContainerDiv.removeChild(popup.div);}
catch(e){}}
popup.map=null;},getSize:function(){var size=null;if(this.size!=null){size=this.size.clone();}
-return size;},updateSize:function(){this.events.element.offsets=null;var newSize=this.getCurrentSize();var oldSize=this.getSize();if(oldSize==null){this.size=oldSize=newSize;}
-if(!newSize.equals(oldSize)){this.size=newSize;for(var i=0;i<this.layers.length;i++){this.layers[i].onMapResize();}
-if(this.baseLayer!=null){var center=new OpenLayers.Pixel(newSize.w/2,newSize.h/2);var centerLL=this.getLonLatFromViewPortPx(center);var zoom=this.getZoom();this.zoom=null;this.setCenter(this.getCenter(),zoom);}}},getCurrentSize:function(){var size=new OpenLayers.Size(this.div.clientWidth,this.div.clientHeight);if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){var dim=OpenLayers.Element.getDimensions(this.div);size.w=dim.width;size.h=dim.height;}
+return size;},updateSize:function(){var newSize=this.getCurrentSize();if(newSize&&!isNaN(newSize.h)&&!isNaN(newSize.w)){this.events.clearMouseCache();var oldSize=this.getSize();if(oldSize==null){this.size=oldSize=newSize;}
+if(!newSize.equals(oldSize)){this.size=newSize;for(var i=0,len=this.layers.length;i<len;i++){this.layers[i].onMapResize();}
+var center=this.getCachedCenter();if(this.baseLayer!=null&¢er!=null){var zoom=this.getZoom();this.zoom=null;this.setCenter(center,zoom);}}}},getCurrentSize:function(){var size=new OpenLayers.Size(this.div.clientWidth,this.div.clientHeight);if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){size.w=this.div.offsetWidth;size.h=this.div.offsetHeight;}
if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){size.w=parseInt(this.div.style.width);size.h=parseInt(this.div.style.height);}
-return size;},calculateBounds:function(center,resolution){var extent=null;if(center==null){center=this.getCenter();}
+return size;},calculateBounds:function(center,resolution){var extent=null;if(center==null){center=this.getCachedCenter();}
if(resolution==null){resolution=this.getResolution();}
-if((center!=null)&&(resolution!=null)){var size=this.getSize();var w_deg=size.w*resolution;var h_deg=size.h*resolution;extent=new OpenLayers.Bounds(center.lon-w_deg/2,center.lat-h_deg/2,center.lon+w_deg/2,center.lat+h_deg/2);}
-return extent;},getCenter:function(){return this.center;},getZoom:function(){return this.zoom;},pan:function(dx,dy,options){if(!options){options={};}
-OpenLayers.Util.applyDefaults(options,{animate:true,dragging:false});var centerPx=this.getViewPortPxFromLonLat(this.getCenter());var newCenterPx=centerPx.add(dx,dy);if(!options.dragging||!newCenterPx.equals(centerPx)){var newCenterLonLat=this.getLonLatFromViewPortPx(newCenterPx);if(options.animate){this.panTo(newCenterLonLat);}else{this.setCenter(newCenterLonLat,null,options.dragging);}}},panTo:function(lonlat){if(this.panMethod&&this.getExtent().containsLonLat(lonlat)){if(!this.panTween){this.panTween=new OpenLayers.Tween(this.panMethod);}
-var center=this.getCenter();var from={lon:center.lon,lat:center.lat};var to={lon:lonlat.lon,lat:lonlat.lat};this.panTween.start(from,to,50,{callbacks:{start:OpenLayers.Function.bind(function(lonlat){this.events.triggerEvent("movestart");},this),eachStep:OpenLayers.Function.bind(function(lonlat){lonlat=new OpenLayers.LonLat(lonlat.lon,lonlat.lat);this.moveTo(lonlat,this.zoom,{'dragging':true,'noEvent':true});},this),done:OpenLayers.Function.bind(function(lonlat){lonlat=new OpenLayers.LonLat(lonlat.lon,lonlat.lat);this.moveTo(lonlat,this.zoom,{'noEvent':true});this.events.triggerEvent("moveend");},this)}});}else{this.setCenter(lonlat);}},setCenter:function(lonlat,zoom,dragging,forceZoomChange){this.moveTo(lonlat,zoom,{'dragging':dragging,'forceZoomChange':forceZoomChange,'caller':'setCenter'});},moveTo:function(lonlat,zoom,options){if(!options){options={};}
-var dragging=options.dragging;var forceZoomChange=options.forceZoomChange;var noEvent=options.noEvent;if(this.panTween&&options.caller=="setCenter"){this.panTween.stop();}
-if(!this.center&&!this.isValidLonLat(lonlat)){lonlat=this.maxExtent.getCenterLonLat();}
-if(this.restrictedExtent!=null){if(lonlat==null){lonlat=this.getCenter();}
+if((center!=null)&&(resolution!=null)){var halfWDeg=(this.size.w*resolution)/2;var halfHDeg=(this.size.h*resolution)/2;extent=new OpenLayers.Bounds(center.lon-halfWDeg,center.lat-halfHDeg,center.lon+halfWDeg,center.lat+halfHDeg);}
+return extent;},getCenter:function(){var center=null;var cachedCenter=this.getCachedCenter();if(cachedCenter){center=cachedCenter.clone();}
+return center;},getCachedCenter:function(){if(!this.center&&this.size){this.center=this.getLonLatFromViewPortPx({x:this.size.w/2,y:this.size.h/2});}
+return this.center;},getZoom:function(){return this.zoom;},pan:function(dx,dy,options){options=OpenLayers.Util.applyDefaults(options,{animate:true,dragging:false});if(options.dragging){if(dx!=0||dy!=0){this.moveByPx(dx,dy);}}else{var centerPx=this.getViewPortPxFromLonLat(this.getCachedCenter());var newCenterPx=centerPx.add(dx,dy);if(this.dragging||!newCenterPx.equals(centerPx)){var newCenterLonLat=this.getLonLatFromViewPortPx(newCenterPx);if(options.animate){this.panTo(newCenterLonLat);}else{this.moveTo(newCenterLonLat);if(this.dragging){this.dragging=false;this.events.triggerEvent("moveend");}}}}},panTo:function(lonlat){if(this.panMethod&&this.getExtent().scale(this.panRatio).containsLonLat(lonlat)){if(!this.panTween){this.panTween=new OpenLayers.Tween(this.panMethod);}
+var center=this.getCachedCenter();if(lonlat.equals(center)){return;}
+var from=this.getPixelFromLonLat(center);var to=this.getPixelFromLonLat(lonlat);var vector={x:to.x-from.x,y:to.y-from.y};var last={x:0,y:0};this.panTween.start({x:0,y:0},vector,this.panDuration,{callbacks:{eachStep:OpenLayers.Function.bind(function(px){var x=px.x-last.x,y=px.y-last.y;this.moveByPx(x,y);last.x=Math.round(px.x);last.y=Math.round(px.y);},this),done:OpenLayers.Function.bind(function(px){this.moveTo(lonlat);this.dragging=false;this.events.triggerEvent("moveend");},this)}});}else{this.setCenter(lonlat);}},setCenter:function(lonlat,zoom,dragging,forceZoomChange){this.panTween&&this.panTween.stop();this.moveTo(lonlat,zoom,{'dragging':dragging,'forceZoomChange':forceZoomChange});},moveByPx:function(dx,dy){var hw=this.size.w/2;var hh=this.size.h/2;var x=hw+dx;var y=hh+dy;var wrapDateLine=this.baseLayer.wrapDateLine;var xRestriction=0;var yRestriction=0;if(this.restrictedExtent){xRestriction=hw;yRestriction=hh;wrapDateLine=false;}
+dx=wrapDateLine||x<=this.maxPx.x-xRestriction&&x>=this.minPx.x+xRestriction?Math.round(dx):0;dy=y<=this.maxPx.y-yRestriction&&y>=this.minPx.y+yRestriction?Math.round(dy):0;if(dx||dy){if(!this.dragging){this.dragging=true;this.events.triggerEvent("movestart");}
+this.center=null;if(dx){this.layerContainerDiv.style.left=parseInt(this.layerContainerDiv.style.left)-dx+"px";this.minPx.x-=dx;this.maxPx.x-=dx;}
+if(dy){this.layerContainerDiv.style.top=parseInt(this.layerContainerDiv.style.top)-dy+"px";this.minPx.y-=dy;this.maxPx.y-=dy;}
+var layer,i,len;for(i=0,len=this.layers.length;i<len;++i){layer=this.layers[i];if(layer.visibility&&(layer===this.baseLayer||layer.inRange)){layer.moveByPx(dx,dy);layer.events.triggerEvent("move");}}
+this.events.triggerEvent("move");}},adjustZoom:function(zoom){var resolution,resolutions=this.baseLayer.resolutions,maxResolution=this.getMaxExtent().getWidth()/this.size.w;if(this.getResolutionForZoom(zoom)>maxResolution){for(var i=zoom|0,ii=resolutions.length;i<ii;++i){if(resolutions[i]<=maxResolution){zoom=i;break;}}}
+return zoom;},moveTo:function(lonlat,zoom,options){if(lonlat!=null&&!(lonlat instanceof OpenLayers.LonLat)){lonlat=new OpenLayers.LonLat(lonlat);}
+if(!options){options={};}
+if(zoom!=null){zoom=parseFloat(zoom);if(!this.fractionalZoom){zoom=Math.round(zoom);}}
+if(this.baseLayer.wrapDateLine){var requestedZoom=zoom;zoom=this.adjustZoom(zoom);if(zoom!==requestedZoom){lonlat=this.getCenter();}}
+var dragging=options.dragging||this.dragging;var forceZoomChange=options.forceZoomChange;if(!this.getCachedCenter()&&!this.isValidLonLat(lonlat)){lonlat=this.maxExtent.getCenterLonLat();this.center=lonlat.clone();}
+if(this.restrictedExtent!=null){if(lonlat==null){lonlat=this.center;}
if(zoom==null){zoom=this.getZoom();}
var resolution=this.getResolutionForZoom(zoom);var extent=this.calculateBounds(lonlat,resolution);if(!this.restrictedExtent.containsBounds(extent)){var maxCenter=this.restrictedExtent.getCenterLonLat();if(extent.getWidth()>this.restrictedExtent.getWidth()){lonlat=new OpenLayers.LonLat(maxCenter.lon,lonlat.lat);}else if(extent.left<this.restrictedExtent.left){lonlat=lonlat.add(this.restrictedExtent.left-
extent.left,0);}else if(extent.right>this.restrictedExtent.right){lonlat=lonlat.add(this.restrictedExtent.right-
@@ -563,603 +395,365 @@ if(extent.getHeight()>this.restrictedExtent.getHeight()){lonlat=new OpenLayers.L
extent.bottom);}
else if(extent.top>this.restrictedExtent.top){lonlat=lonlat.add(0,this.restrictedExtent.top-
extent.top);}}}
-var zoomChanged=forceZoomChange||((this.isValidZoomLevel(zoom))&&(zoom!=this.getZoom()));var centerChanged=(this.isValidLonLat(lonlat))&&(!lonlat.equals(this.center));if(zoomChanged||centerChanged||!dragging){if(!this.dragging&&!noEvent){this.events.triggerEvent("movestart");}
-if(centerChanged){if((!zoomChanged)&&(this.center)){this.centerLayerContainer(lonlat);}
+var zoomChanged=forceZoomChange||((this.isValidZoomLevel(zoom))&&(zoom!=this.getZoom()));var centerChanged=(this.isValidLonLat(lonlat))&&(!lonlat.equals(this.center));if(zoomChanged||centerChanged||dragging){dragging||this.events.triggerEvent("movestart");if(centerChanged){if(!zoomChanged&&this.center){this.centerLayerContainer(lonlat);}
this.center=lonlat.clone();}
-if((zoomChanged)||(this.layerContainerOrigin==null)){this.layerContainerOrigin=this.center.clone();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px";}
-if(zoomChanged){this.zoom=zoom;this.resolution=this.getResolutionForZoom(zoom);this.viewRequestID++;}
-var bounds=this.getExtent();this.baseLayer.moveTo(bounds,zoomChanged,dragging);bounds=this.baseLayer.getExtent();for(var i=0;i<this.layers.length;i++){var layer=this.layers[i];if(!layer.isBaseLayer){var inRange=layer.calculateInRange();if(layer.inRange!=inRange){layer.inRange=inRange;if(!inRange){layer.display(false);}
+var res=zoomChanged?this.getResolutionForZoom(zoom):this.getResolution();if(zoomChanged||this.layerContainerOrigin==null){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px";var maxExtent=this.getMaxExtent({restricted:true});var maxExtentCenter=maxExtent.getCenterLonLat();var lonDelta=this.center.lon-maxExtentCenter.lon;var latDelta=maxExtentCenter.lat-this.center.lat;var extentWidth=Math.round(maxExtent.getWidth()/res);var extentHeight=Math.round(maxExtent.getHeight()/res);this.minPx={x:(this.size.w-extentWidth)/2-lonDelta/res,y:(this.size.h-extentHeight)/2-latDelta/res};this.maxPx={x:this.minPx.x+Math.round(maxExtent.getWidth()/res),y:this.minPx.y+Math.round(maxExtent.getHeight()/res)};}
+if(zoomChanged){this.zoom=zoom;this.resolution=res;}
+var bounds=this.getExtent();if(this.baseLayer.visibility){this.baseLayer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});}
+bounds=this.baseLayer.getExtent();for(var i=this.layers.length-1;i>=0;--i){var layer=this.layers[i];if(layer!==this.baseLayer&&!layer.isBaseLayer){var inRange=layer.calculateInRange();if(layer.inRange!=inRange){layer.inRange=inRange;if(!inRange){layer.display(false);}
this.events.triggerEvent("changelayer",{layer:layer,property:"visibility"});}
-if(inRange&&layer.visibility){layer.moveTo(bounds,zoomChanged,dragging);}}}
-if(zoomChanged){for(var i=0;i<this.popups.length;i++){this.popups[i].updatePosition();}}
-this.events.triggerEvent("move");if(zoomChanged){this.events.triggerEvent("zoomend");}}
-if(!dragging&&!noEvent){this.events.triggerEvent("moveend");}
-this.dragging=!!dragging;},centerLayerContainer:function(lonlat){var originPx=this.getViewPortPxFromLonLat(this.layerContainerOrigin);var newPx=this.getViewPortPxFromLonLat(lonlat);if((originPx!=null)&&(newPx!=null)){this.layerContainerDiv.style.left=Math.round(originPx.x-newPx.x)+"px";this.layerContainerDiv.style.top=Math.round(originPx.y-newPx.y)+"px";}},isValidZoomLevel:function(zoomLevel){return((zoomLevel!=null)&&(zoomLevel>=0)&&(zoomLevel<this.getNumZoomLevels()));},isValidLonLat:function(lonlat){var valid=false;if(lonlat!=null){var maxExtent=this.getMaxExtent();valid=maxExtent.containsLonLat(lonlat);}
+if(inRange&&layer.visibility){layer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||layer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});}}}
+this.events.triggerEvent("move");dragging||this.events.triggerEvent("moveend");if(zoomChanged){for(var i=0,len=this.popups.length;i<len;i++){this.popups[i].updatePosition();}
+this.events.triggerEvent("zoomend");}}},centerLayerContainer:function(lonlat){var originPx=this.getViewPortPxFromLonLat(this.layerContainerOrigin);var newPx=this.getViewPortPxFromLonLat(lonlat);if((originPx!=null)&&(newPx!=null)){var oldLeft=parseInt(this.layerContainerDiv.style.left);var oldTop=parseInt(this.layerContainerDiv.style.top);var newLeft=Math.round(originPx.x-newPx.x);var newTop=Math.round(originPx.y-newPx.y);this.layerContainerDiv.style.left=newLeft+"px";this.layerContainerDiv.style.top=newTop+"px";var dx=oldLeft-newLeft;var dy=oldTop-newTop;this.minPx.x-=dx;this.maxPx.x-=dx;this.minPx.y-=dy;this.maxPx.y-=dy;}},isValidZoomLevel:function(zoomLevel){return((zoomLevel!=null)&&(zoomLevel>=0)&&(zoomLevel<this.getNumZoomLevels()));},isValidLonLat:function(lonlat){var valid=false;if(lonlat!=null){var maxExtent=this.getMaxExtent();var worldBounds=this.baseLayer.wrapDateLine&&maxExtent;valid=maxExtent.containsLonLat(lonlat,{worldBounds:worldBounds});}
return valid;},getProjection:function(){var projection=this.getProjectionObject();return projection?projection.getCode():null;},getProjectionObject:function(){var projection=null;if(this.baseLayer!=null){projection=this.baseLayer.projection;}
return projection;},getMaxResolution:function(){var maxResolution=null;if(this.baseLayer!=null){maxResolution=this.baseLayer.maxResolution;}
-return maxResolution;},getMaxExtent:function(){var maxExtent=null;if(this.baseLayer!=null){maxExtent=this.baseLayer.maxExtent;}
+return maxResolution;},getMaxExtent:function(options){var maxExtent=null;if(options&&options.restricted&&this.restrictedExtent){maxExtent=this.restrictedExtent;}else if(this.baseLayer!=null){maxExtent=this.baseLayer.maxExtent;}
return maxExtent;},getNumZoomLevels:function(){var numZoomLevels=null;if(this.baseLayer!=null){numZoomLevels=this.baseLayer.numZoomLevels;}
return numZoomLevels;},getExtent:function(){var extent=null;if(this.baseLayer!=null){extent=this.baseLayer.getExtent();}
-return extent;},getResolution:function(){var resolution=null;if(this.baseLayer!=null){resolution=this.baseLayer.getResolution();}
-return resolution;},getScale:function(){var scale=null;if(this.baseLayer!=null){var res=this.getResolution();var units=this.baseLayer.units;scale=OpenLayers.Util.getScaleFromResolution(res,units);}
+return extent;},getResolution:function(){var resolution=null;if(this.baseLayer!=null){resolution=this.baseLayer.getResolution();}else if(this.allOverlays===true&&this.layers.length>0){resolution=this.layers[0].getResolution();}
+return resolution;},getUnits:function(){var units=null;if(this.baseLayer!=null){units=this.baseLayer.units;}
+return units;},getScale:function(){var scale=null;if(this.baseLayer!=null){var res=this.getResolution();var units=this.baseLayer.units;scale=OpenLayers.Util.getScaleFromResolution(res,units);}
return scale;},getZoomForExtent:function(bounds,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForExtent(bounds,closest);}
return zoom;},getResolutionForZoom:function(zoom){var resolution=null;if(this.baseLayer){resolution=this.baseLayer.getResolutionForZoom(zoom);}
return resolution;},getZoomForResolution:function(resolution,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForResolution(resolution,closest);}
-return zoom;},zoomTo:function(zoom){if(this.isValidZoomLevel(zoom)){this.setCenter(null,zoom);}},zoomIn:function(){this.zoomTo(this.getZoom()+1);},zoomOut:function(){this.zoomTo(this.getZoom()-1);},zoomToExtent:function(bounds){var center=bounds.getCenterLonLat();if(this.baseLayer.wrapDateLine){var maxExtent=this.getMaxExtent();bounds=bounds.clone();while(bounds.right<bounds.left){bounds.right+=maxExtent.getWidth();}
+return zoom;},zoomTo:function(zoom){if(this.isValidZoomLevel(zoom)){this.setCenter(null,zoom);}},zoomIn:function(){this.zoomTo(this.getZoom()+1);},zoomOut:function(){this.zoomTo(this.getZoom()-1);},zoomToExtent:function(bounds,closest){if(!(bounds instanceof OpenLayers.Bounds)){bounds=new OpenLayers.Bounds(bounds);}
+var center=bounds.getCenterLonLat();if(this.baseLayer.wrapDateLine){var maxExtent=this.getMaxExtent();bounds=bounds.clone();while(bounds.right<bounds.left){bounds.right+=maxExtent.getWidth();}
center=bounds.getCenterLonLat().wrapDateLine(maxExtent);}
-this.setCenter(center,this.getZoomForExtent(bounds));},zoomToMaxExtent:function(){this.zoomToExtent(this.getMaxExtent());},zoomToScale:function(scale){var res=OpenLayers.Util.getResolutionFromScale(scale,this.baseLayer.units);var size=this.getSize();var w_deg=size.w*res;var h_deg=size.h*res;var center=this.getCenter();var extent=new OpenLayers.Bounds(center.lon-w_deg/2,center.lat-h_deg/2,center.lon+w_deg/2,center.lat+h_deg/2);this.zoomToExtent(extent);},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;if(this.baseLayer!=null){lonlat=this.baseLayer.getLonLatFromViewPortPx(viewPortPx);}
+this.setCenter(center,this.getZoomForExtent(bounds,closest));},zoomToMaxExtent:function(options){var restricted=(options)?options.restricted:true;var maxExtent=this.getMaxExtent({'restricted':restricted});this.zoomToExtent(maxExtent);},zoomToScale:function(scale,closest){var res=OpenLayers.Util.getResolutionFromScale(scale,this.baseLayer.units);var halfWDeg=(this.size.w*res)/2;var halfHDeg=(this.size.h*res)/2;var center=this.getCachedCenter();var extent=new OpenLayers.Bounds(center.lon-halfWDeg,center.lat-halfHDeg,center.lon+halfWDeg,center.lat+halfHDeg);this.zoomToExtent(extent,closest);},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;if(this.baseLayer!=null){lonlat=this.baseLayer.getLonLatFromViewPortPx(viewPortPx);}
return lonlat;},getViewPortPxFromLonLat:function(lonlat){var px=null;if(this.baseLayer!=null){px=this.baseLayer.getViewPortPxFromLonLat(lonlat);}
-return px;},getLonLatFromPixel:function(px){return this.getLonLatFromViewPortPx(px);},getPixelFromLonLat:function(lonlat){var px=this.getViewPortPxFromLonLat(lonlat);px.x=Math.round(px.x);px.y=Math.round(px.y);return px;},getViewPortPxFromLayerPx:function(layerPx){var viewPortPx=null;if(layerPx!=null){var dX=parseInt(this.layerContainerDiv.style.left);var dY=parseInt(this.layerContainerDiv.style.top);viewPortPx=layerPx.add(dX,dY);}
+return px;},getLonLatFromPixel:function(px){return this.getLonLatFromViewPortPx(px);},getPixelFromLonLat:function(lonlat){var px=this.getViewPortPxFromLonLat(lonlat);px.x=Math.round(px.x);px.y=Math.round(px.y);return px;},getGeodesicPixelSize:function(px){var lonlat=px?this.getLonLatFromPixel(px):(this.getCachedCenter()||new OpenLayers.LonLat(0,0));var res=this.getResolution();var left=lonlat.add(-res/2,0);var right=lonlat.add(res/2,0);var bottom=lonlat.add(0,-res/2);var top=lonlat.add(0,res/2);var dest=new OpenLayers.Projection("EPSG:4326");var source=this.getProjectionObject()||dest;if(!source.equals(dest)){left.transform(source,dest);right.transform(source,dest);bottom.transform(source,dest);top.transform(source,dest);}
+return new OpenLayers.Size(OpenLayers.Util.distVincenty(left,right),OpenLayers.Util.distVincenty(bottom,top));},getViewPortPxFromLayerPx:function(layerPx){var viewPortPx=null;if(layerPx!=null){var dX=parseInt(this.layerContainerDiv.style.left);var dY=parseInt(this.layerContainerDiv.style.top);viewPortPx=layerPx.add(dX,dY);}
return viewPortPx;},getLayerPxFromViewPortPx:function(viewPortPx){var layerPx=null;if(viewPortPx!=null){var dX=-parseInt(this.layerContainerDiv.style.left);var dY=-parseInt(this.layerContainerDiv.style.top);layerPx=viewPortPx.add(dX,dY);if(isNaN(layerPx.x)||isNaN(layerPx.y)){layerPx=null;}}
-return layerPx;},getLonLatFromLayerPx:function(px){px=this.getViewPortPxFromLayerPx(px);return this.getLonLatFromViewPortPx(px);},getLayerPxFromLonLat:function(lonlat){var px=this.getPixelFromLonLat(lonlat);return this.getLayerPxFromViewPortPx(px);},CLASS_NAME:"OpenLayers.Map"});OpenLayers.Map.TILE_WIDTH=256;OpenLayers.Map.TILE_HEIGHT=256;OpenLayers.Marker=OpenLayers.Class({icon:null,lonlat:null,events:null,map:null,initialize:function(lonlat,icon){this.lonlat=lonlat;var newIcon=(icon)?icon:OpenLayers.Marker.defaultIcon();if(this.icon==null){this.icon=newIcon;}else{this.icon.url=newIcon.url;this.icon.size=newIcon.size;this.icon.offset=newIcon.offset;this.icon.calculateOffset=newIcon.calculateOffset;}
-this.events=new OpenLayers.Events(this,this.icon.imageDiv,null);},destroy:function(){this.map=null;this.events.destroy();this.events=null;if(this.icon!=null){this.icon.destroy();this.icon=null;}},draw:function(px){return this.icon.draw(px);},moveTo:function(px){if((px!=null)&&(this.icon!=null)){this.icon.moveTo(px);}
-this.lonlat=this.map.getLonLatFromLayerPx(px);},onScreen:function(){var onScreen=false;if(this.map){var screenBounds=this.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);}
-return onScreen;},inflate:function(inflate){if(this.icon){var newSize=new OpenLayers.Size(this.icon.size.w*inflate,this.icon.size.h*inflate);this.icon.setSize(newSize);}},setOpacity:function(opacity){this.icon.setOpacity(opacity);},setUrl:function(url){this.icon.setUrl(url);},display:function(display){this.icon.display(display);},CLASS_NAME:"OpenLayers.Marker"});OpenLayers.Marker.defaultIcon=function(){var url=OpenLayers.Util.getImagesLocation()+"marker.png";var size=new OpenLayers.Size(21,25);var calculateOffset=function(size){return new OpenLayers.Pixel(-(size.w/2),-size.h);};return new OpenLayers.Icon(url,size,null,calculateOffset);};OpenLayers.Popup.AnchoredBubble=OpenLayers.Class(OpenLayers.Popup.Anchored,{rounded:false,initialize:function(id,lonlat,size,contentHTML,anchor,closeBox,closeBoxCallback){this.padding=new OpenLayers.Bounds(0,OpenLayers.Popup.AnchoredBubble.CORNER_SIZE,0,OpenLayers.Popup.AnchoredBubble.CORNER_SIZE);OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);},draw:function(px){OpenLayers.Popup.Anchored.prototype.draw.apply(this,arguments);this.setContentHTML();this.setBackgroundColor();this.setOpacity();return this.div;},updateRelativePosition:function(){this.setRicoCorners();},setSize:function(size){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.setRicoCorners();},setBackgroundColor:function(color){if(color!=undefined){this.backgroundColor=color;}
-if(this.div!=null){if(this.contentDiv!=null){this.div.style.background="transparent";OpenLayers.Rico.Corner.changeColor(this.groupDiv,this.backgroundColor);}}},setOpacity:function(opacity){OpenLayers.Popup.Anchored.prototype.setOpacity.call(this,opacity);if(this.div!=null){if(this.groupDiv!=null){OpenLayers.Rico.Corner.changeOpacity(this.groupDiv,this.opacity);}}},setBorder:function(border){this.border=0;},setRicoCorners:function(){var corners=this.getCornersToRound(this.relativePosition);var options={corners:corners,color:this.backgroundColor,bgColor:"transparent",blend:false};if(!this.rounded){OpenLayers.Rico.Corner.round(this.div,options);this.rounded=true;}else{OpenLayers.Rico.Corner.reRound(this.groupDiv,options);this.setBackgroundColor();this.setOpacity();}},getCornersToRound:function(){var corners=['tl','tr','bl','br'];var corner=OpenLayers.Bounds.oppositeQuadrant(this.relativePosition);OpenLayers.Util.removeItem(corners,corner);return corners.join(" ");},CLASS_NAME:"OpenLayers.Popup.AnchoredBubble"});OpenLayers.Popup.AnchoredBubble.CORNER_SIZE=5;OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:false,positionBlocks:null,blocks:null,fixedRelativePosition:false,initialize:function(id,lonlat,size,contentHTML,anchor,closeBox,closeBoxCallback){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);if(this.fixedRelativePosition){this.updateRelativePosition();this.calculateRelativePosition=function(px){return this.relativePosition;};}
-this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;if(closeBox){this.closeDiv.style.zIndex=1;}
-this.groupDiv.style.position="absolute";this.groupDiv.style.top="0px";this.groupDiv.style.left="0px";this.groupDiv.style.height="100%";this.groupDiv.style.width="100%";},destroy:function(){this.imageSrc=null;this.imageSize=null;this.isAlphaImage=null;this.fixedRelativePosition=false;this.positionBlocks=null;for(var i=0;i<this.blocks.length;i++){var block=this.blocks[i];if(block.image){block.div.removeChild(block.image);}
-block.image=null;if(block.div){this.groupDiv.removeChild(block.div);}
-block.div=null;}
-this.blocks=null;OpenLayers.Popup.Anchored.prototype.destroy.apply(this,arguments);},setBackgroundColor:function(color){},setBorder:function(){},setOpacity:function(opacity){},setSize:function(size){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.updateBlocks();},updateRelativePosition:function(){this.padding=this.positionBlocks[this.relativePosition].padding;if(this.closeDiv){var contentDivPadding=this.getContentDivPadding();this.closeDiv.style.right=contentDivPadding.right+
-this.padding.right+"px";this.closeDiv.style.top=contentDivPadding.top+
-this.padding.top+"px";}
-this.updateBlocks();},calculateNewPx:function(px){var newPx=OpenLayers.Popup.Anchored.prototype.calculateNewPx.apply(this,arguments);newPx=newPx.offset(this.positionBlocks[this.relativePosition].offset);return newPx;},createBlocks:function(){this.blocks=[];var firstPosition=null;for(var key in this.positionBlocks){firstPosition=key;break;}
-var position=this.positionBlocks[firstPosition];for(var i=0;i<position.blocks.length;i++){var block={};this.blocks.push(block);var divId=this.id+'_FrameDecorationDiv_'+i;block.div=OpenLayers.Util.createDiv(divId,null,null,null,"absolute",null,"hidden",null);var imgId=this.id+'_FrameDecorationImg_'+i;var imageCreator=(this.isAlphaImage)?OpenLayers.Util.createAlphaImageDiv:OpenLayers.Util.createImage;block.image=imageCreator(imgId,null,this.imageSize,this.imageSrc,"absolute",null,null,null);block.div.appendChild(block.image);this.groupDiv.appendChild(block.div);}},updateBlocks:function(){if(!this.blocks){this.createBlocks();}
-if(this.relativePosition){var position=this.positionBlocks[this.relativePosition];for(var i=0;i<position.blocks.length;i++){var positionBlock=position.blocks[i];var block=this.blocks[i];var l=positionBlock.anchor.left;var b=positionBlock.anchor.bottom;var r=positionBlock.anchor.right;var t=positionBlock.anchor.top;var w=(isNaN(positionBlock.size.w))?this.size.w-(r+l):positionBlock.size.w;var h=(isNaN(positionBlock.size.h))?this.size.h-(b+t):positionBlock.size.h;block.div.style.width=w+'px';block.div.style.height=h+'px';block.div.style.left=(l!=null)?l+'px':'';block.div.style.bottom=(b!=null)?b+'px':'';block.div.style.right=(r!=null)?r+'px':'';block.div.style.top=(t!=null)?t+'px':'';block.image.style.left=positionBlock.position.x+'px';block.image.style.top=positionBlock.position.y+'px';}
-this.contentDiv.style.left=this.padding.left+"px";this.contentDiv.style.top=this.padding.top+"px";}},CLASS_NAME:"OpenLayers.Popup.Framed"});OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",MAX_PIXEL:15000,localResolution:null,initialize:function(containerID){if(!this.supported()){return;}
-OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);},destroy:function(){OpenLayers.Renderer.Elements.prototype.destroy.apply(this,arguments);},supported:function(){var svgFeature="http://www.w3.org/TR/SVG11/feature#";return(document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature(svgFeature+"SVG","1.1")||document.implementation.hasFeature(svgFeature+"BasicStructure","1.1")));},inValidRange:function(x,y){return(x>=-this.MAX_PIXEL&&x<=this.MAX_PIXEL&&y>=-this.MAX_PIXEL&&y<=this.MAX_PIXEL);},setExtent:function(extent){OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();if(!this.localResolution||resolution!=this.localResolution){this.left=-extent.left/resolution;this.top=extent.top/resolution;}
-var left=0;var top=0;if(this.localResolution&&resolution==this.localResolution){left=(this.left)-(-extent.left/resolution);top=(this.top)-(extent.top/resolution);}
-this.localResolution=resolution;var extentString=left+" "+top+" "+
-extent.getWidth()/resolution+" "+extent.getHeight()/resolution;this.rendererRoot.setAttributeNS(null,"viewBox",extentString);},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w);this.rendererRoot.setAttributeNS(null,"height",this.size.h);},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":nodeType=style.externalGraphic?"image":"circle";break;case"OpenLayers.Geometry.Rectangle":nodeType="rect";break;case"OpenLayers.Geometry.LineString":nodeType="polyline";break;case"OpenLayers.Geometry.LinearRing":nodeType="polygon";break;case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":case"OpenLayers.Geometry.Surface":nodeType="path";break;default:break;}
-return nodeType;},setStyle:function(node,style,options){style=style||node._style;options=options||node._options;var r=parseFloat(node.getAttributeNS(null,"r"));if(node._geometryClass=="OpenLayers.Geometry.Point"&&r){if(style.externalGraphic){var x=parseFloat(node.getAttributeNS(null,"cx"));var y=parseFloat(node.getAttributeNS(null,"cy"));if(style.graphicWidth&&style.graphicHeight){node.setAttributeNS(null,"preserveAspectRatio","none");}
-var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;node.setAttributeNS(null,"x",(x+xOffset).toFixed());node.setAttributeNS(null,"y",(y+yOffset).toFixed());node.setAttributeNS(null,"width",width);node.setAttributeNS(null,"height",height);node.setAttributeNS("http://www.w3.org/1999/xlink","href",style.externalGraphic);node.setAttributeNS(null,"style","opacity: "+opacity);}else{node.setAttributeNS(null,"r",style.pointRadius);}}
-if(options.isFilled){node.setAttributeNS(null,"fill",style.fillColor);node.setAttributeNS(null,"fill-opacity",style.fillOpacity);}else{node.setAttributeNS(null,"fill","none");}
-if(options.isStroked){node.setAttributeNS(null,"stroke",style.strokeColor);node.setAttributeNS(null,"stroke-opacity",style.strokeOpacity);node.setAttributeNS(null,"stroke-width",style.strokeWidth);node.setAttributeNS(null,"stroke-linecap",style.strokeLinecap);}else{node.setAttributeNS(null,"stroke","none");}
-if(style.pointerEvents){node.setAttributeNS(null,"pointer-events",style.pointerEvents);}
-if(style.cursor!=null){node.setAttributeNS(null,"cursor",style.cursor);}
-return node;},createNode:function(type,id){var node=document.createElementNS(this.xmlns,type);if(id){node.setAttributeNS(null,"id",id);}
-return node;},nodeTypeCompare:function(node,type){return(type==node.nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_svgRoot","svg");},createRoot:function(){return this.nodeFactory(this.container.id+"_root","g");},drawPoint:function(node,geometry){this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){var resolution=this.getResolution();var x=(geometry.x/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"cx",x);node.setAttributeNS(null,"cy",y);node.setAttributeNS(null,"r",radius);}else{node.setAttributeNS(null,"cx","");node.setAttributeNS(null,"cy","");node.setAttributeNS(null,"r",0);}},drawLineString:function(node,geometry){node.setAttributeNS(null,"points",this.getComponentsString(geometry.components));},drawLinearRing:function(node,geometry){node.setAttributeNS(null,"points",this.getComponentsString(geometry.components));},drawPolygon:function(node,geometry){var d="";var draw=true;for(var j=0;j<geometry.components.length;j++){var linearRing=geometry.components[j];d+=" M";for(var i=0;i<linearRing.components.length;i++){var component=this.getShortString(linearRing.components[i]);if(component){d+=" "+component;}else{draw=false;}}}
-d+=" z";if(draw){node.setAttributeNS(null,"d",d);node.setAttributeNS(null,"fill-rule","evenodd");}else{node.setAttributeNS(null,"d","");}},drawRectangle:function(node,geometry){var resolution=this.getResolution();var x=(geometry.x/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"x",x);node.setAttributeNS(null,"y",y);node.setAttributeNS(null,"width",geometry.width/resolution);node.setAttributeNS(null,"height",geometry.height/resolution);}else{node.setAttributeNS(null,"x","");node.setAttributeNS(null,"y","");node.setAttributeNS(null,"width",0);node.setAttributeNS(null,"height",0);}},drawSurface:function(node,geometry){var d=null;var draw=true;for(var i=0;i<geometry.components.length;i++){if((i%3)==0&&(i/3)==0){var component=this.getShortString(geometry.components[i]);if(!component){draw=false;}
-d="M "+component;}else if((i%3)==1){var component=this.getShortString(geometry.components[i]);if(!component){draw=false;}
-d+=" C "+component;}else{var component=this.getShortString(geometry.components[i]);if(!component){draw=false;}
-d+=" "+component;}}
-d+=" Z";if(draw){node.setAttributeNS(null,"d",d);}else{node.setAttributeNS(null,"d","");}},getComponentsString:function(components){var strings=[];for(var i=0;i<components.length;i++){var component=this.getShortString(components[i]);if(component){strings.push(component);}}
-return strings.join(",");},getShortString:function(point){var resolution=this.getResolution();var x=(point.x/resolution+this.left);var y=(this.top-point.y/resolution);if(this.inValidRange(x,y)){return x+","+y;}else{return false;}},CLASS_NAME:"OpenLayers.Renderer.SVG"});OpenLayers.Renderer.VML=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"urn:schemas-microsoft-com:vml",initialize:function(containerID){if(!this.supported()){return;}
-if(!document.namespaces.olv){document.namespaces.add("olv",this.xmlns);var style=document.createStyleSheet();style.addRule('olv\\:*',"behavior: url(#default#VML); "+"position: absolute; display: inline-block;");}
-OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);},destroy:function(){OpenLayers.Renderer.Elements.prototype.destroy.apply(this,arguments);},supported:function(){return!!(document.namespaces);},setExtent:function(extent){OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var org=extent.left/resolution+" "+
-extent.top/resolution;this.root.setAttribute("coordorigin",org);var size=extent.getWidth()/resolution+" "+
--extent.getHeight()/resolution;this.root.setAttribute("coordsize",size);},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.style.width=this.size.w;this.rendererRoot.style.height=this.size.h;this.root.style.width=this.size.w;this.root.style.height=this.size.h;},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":nodeType=style.externalGraphic?"olv:rect":"olv:oval";break;case"OpenLayers.Geometry.Rectangle":nodeType="olv:rect";break;case"OpenLayers.Geometry.LineString":case"OpenLayers.Geometry.LinearRing":case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":case"OpenLayers.Geometry.Surface":nodeType="olv:shape";break;default:break;}
-return nodeType;},setStyle:function(node,style,options,geometry){style=style||node._style;options=options||node._options;if(node._geometryClass=="OpenLayers.Geometry.Point"){if(style.externalGraphic){var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var resolution=this.getResolution();var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);node.style.left=((geometry.x/resolution)+xOffset).toFixed();node.style.top=((geometry.y/resolution)-(yOffset+height)).toFixed();node.style.width=width;node.style.height=height;style.fillColor="none";options.isStroked=false;}else{this.drawCircle(node,geometry,style.pointRadius);}}
-if(options.isFilled){node.setAttribute("fillcolor",style.fillColor);}else{node.setAttribute("filled","false");}
-var fills=node.getElementsByTagName("fill");var fill=(fills.length==0)?null:fills[0];if(!options.isFilled){if(fill){node.removeChild(fill);}}else{if(!fill){fill=this.createNode('olv:fill',node.id+"_fill");}
-fill.setAttribute("opacity",style.fillOpacity);if(node._geometryClass=="OpenLayers.Geometry.Point"&&style.externalGraphic){if(style.graphicOpacity){fill.setAttribute("opacity",style.graphicOpacity);}
-fill.setAttribute("src",style.externalGraphic);fill.setAttribute("type","frame");node.style.flip="y";if(!(style.graphicWidth&&style.graphicHeight)){fill.aspect="atmost";}}
-if(fill.parentNode!=node){node.appendChild(fill);}}
-if(options.isStroked){node.setAttribute("strokecolor",style.strokeColor);node.setAttribute("strokeweight",style.strokeWidth+"px");}else{node.setAttribute("stroked","false");}
-var strokes=node.getElementsByTagName("stroke");var stroke=(strokes.length==0)?null:strokes[0];if(!options.isStroked){if(stroke){node.removeChild(stroke);}}else{if(!stroke){stroke=this.createNode('olv:stroke',node.id+"_stroke");node.appendChild(stroke);}
-stroke.setAttribute("opacity",style.strokeOpacity);stroke.setAttribute("endcap",!style.strokeLinecap||style.strokeLinecap=='butt'?'flat':style.strokeLinecap);}
-if(style.cursor!=null){node.style.cursor=style.cursor;}
-return node;},postDraw:function(node){var fillColor=node._style.fillColor;var strokeColor=node._style.strokeColor;if(fillColor=="none"&&node.getAttribute("fillcolor")!=fillColor){node.setAttribute("fillcolor",fillColor);}
-if(strokeColor=="none"&&node.getAttribute("strokecolor")!=strokeColor){node.setAttribute("strokecolor",strokeColor);}},setNodeDimension:function(node,geometry){var bbox=geometry.getBounds();if(bbox){var resolution=this.getResolution();var scaledBox=new OpenLayers.Bounds((bbox.left/resolution).toFixed(),(bbox.bottom/resolution).toFixed(),(bbox.right/resolution).toFixed(),(bbox.top/resolution).toFixed());node.style.left=scaledBox.left;node.style.top=scaledBox.top;node.style.width=scaledBox.getWidth();node.style.height=scaledBox.getHeight();node.coordorigin=scaledBox.left+" "+scaledBox.top;node.coordsize=scaledBox.getWidth()+" "+scaledBox.getHeight();}},createNode:function(type,id){var node=document.createElement(type);if(id){node.setAttribute('id',id);}
-node.setAttribute('unselectable','on',0);node.onselectstart=function(){return(false);};return node;},nodeTypeCompare:function(node,type){var subType=type;var splitIndex=subType.indexOf(":");if(splitIndex!=-1){subType=subType.substr(splitIndex+1);}
-var nodeName=node.nodeName;splitIndex=nodeName.indexOf(":");if(splitIndex!=-1){nodeName=nodeName.substr(splitIndex+1);}
-return(subType==nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_vmlRoot","div");},createRoot:function(){return this.nodeFactory(this.container.id+"_root","olv:group");},drawPoint:function(node,geometry){this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){if(!isNaN(geometry.x)&&!isNaN(geometry.y)){var resolution=this.getResolution();node.style.left=(geometry.x/resolution).toFixed()-radius;node.style.top=(geometry.y/resolution).toFixed()-radius;var diameter=radius*2;node.style.width=diameter;node.style.height=diameter;}},drawLineString:function(node,geometry){this.drawLine(node,geometry,false);},drawLinearRing:function(node,geometry){this.drawLine(node,geometry,true);},drawLine:function(node,geometry,closeLine){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var numComponents=geometry.components.length;var parts=new Array(numComponents);var comp,x,y;for(var i=0;i<numComponents;i++){comp=geometry.components[i];x=(comp.x/resolution);y=(comp.y/resolution);parts[i]=" "+x.toFixed()+","+y.toFixed()+" l ";}
-var end=(closeLine)?" x e":" e";node.path="m"+parts.join("")+end;},drawPolygon:function(node,geometry){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var path=[];var linearRing,i,comp,x,y;for(var j=0;j<geometry.components.length;j++){linearRing=geometry.components[j];path.push("m");for(i=0;i<linearRing.components.length;i++){comp=linearRing.components[i];x=comp.x/resolution;y=comp.y/resolution;path.push(" "+x.toFixed()+","+y.toFixed());if(i==0){path.push(" l");}}
-path.push(" x ");}
-path.push("e");node.path=path.join("");},drawRectangle:function(node,geometry){var resolution=this.getResolution();node.style.left=geometry.x/resolution;node.style.top=geometry.y/resolution;node.style.width=geometry.width/resolution;node.style.height=geometry.height/resolution;},drawSurface:function(node,geometry){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var path=[];var comp,x,y;for(var i=0;i<geometry.components.length;i++){comp=geometry.components[i];x=comp.x/resolution;y=comp.y/resolution;if((i%3)==0&&(i/3)==0){path.push("m");}else if((i%3)==1){path.push(" c");}
-path.push(" "+x+","+y);}
-path.push(" x e");node.path=path.join("");},CLASS_NAME:"OpenLayers.Renderer.VML"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,layerAlphaHack:null,initialize:function(layer,position,bounds,url,size){OpenLayers.Tile.prototype.initialize.apply(this,arguments);this.url=url;this.frame=document.createElement('div');this.frame.style.overflow='hidden';this.frame.style.position='absolute';this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();},destroy:function(){if(this.imgDiv!=null){if(this.layerAlphaHack){OpenLayers.Event.stopObservingElement(this.imgDiv.childNodes[0].id);}else{OpenLayers.Event.stopObservingElement(this.imgDiv.id);}
-if(this.imgDiv.parentNode==this.frame){this.frame.removeChild(this.imgDiv);this.imgDiv.map=null;}}
-this.imgDiv=null;if((this.frame!=null)&&(this.frame.parentNode==this.layer.div)){this.layer.div.removeChild(this.frame);}
-this.frame=null;OpenLayers.Tile.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Tile.Image(this.layer,this.position,this.bounds,this.url,this.size);}
-obj=OpenLayers.Tile.prototype.clone.apply(this,[obj]);obj.imgDiv=null;return obj;},draw:function(){if(this.layer!=this.layer.map.baseLayer&&this.layer.reproject){this.bounds=this.getBoundsFromBaseLayer(this.position);}
-if(!OpenLayers.Tile.prototype.draw.apply(this,arguments)){return false;}
-if(this.isLoading){this.events.triggerEvent("reload");}else{this.isLoading=true;this.events.triggerEvent("loadstart");}
-return this.renderTile();},renderTile:function(){if(this.imgDiv==null){this.initImgDiv();}
-this.imgDiv.viewRequestID=this.layer.map.viewRequestID;this.url=this.layer.getURL(this.bounds);OpenLayers.Util.modifyDOMElement(this.frame,null,this.position,this.size);var imageSize=this.layer.getImageSize();if(this.layerAlphaHack){OpenLayers.Util.modifyAlphaImageDiv(this.imgDiv,null,null,imageSize,this.url);}else{OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,imageSize);this.imgDiv.src=this.url;}
-return true;},clear:function(){if(this.imgDiv){this.hide();if(OpenLayers.Tile.Image.useBlankTile){this.imgDiv.src=OpenLayers.Util.getImagesLocation()+"blank.gif";}}},initImgDiv:function(){var offset=this.layer.imageOffset;var size=this.layer.getImageSize();if(this.layerAlphaHack){this.imgDiv=OpenLayers.Util.createAlphaImageDiv(null,offset,size,null,"relative",null,null,null,true);}else{this.imgDiv=OpenLayers.Util.createImage(null,offset,size,null,"relative",null,null,true);}
-this.imgDiv.className='olTileImage';this.frame.style.zIndex=this.isBackBuffer?0:1;this.frame.appendChild(this.imgDiv);this.layer.div.appendChild(this.frame);if(this.layer.opacity!=null){OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,null,null,null,null,this.layer.opacity);}
-this.imgDiv.map=this.layer.map;var onload=function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("loadend");}};if(this.layerAlphaHack){OpenLayers.Event.observe(this.imgDiv.childNodes[0],'load',OpenLayers.Function.bind(onload,this));}else{OpenLayers.Event.observe(this.imgDiv,'load',OpenLayers.Function.bind(onload,this));}
-var onerror=function(){if(this.imgDiv._attempts>OpenLayers.IMAGE_RELOAD_ATTEMPTS){onload.call(this);}};OpenLayers.Event.observe(this.imgDiv,"error",OpenLayers.Function.bind(onerror,this));},checkImgURL:function(){if(this.layer){var loaded=this.layerAlphaHack?this.imgDiv.firstChild.src:this.imgDiv.src;if(!OpenLayers.Util.isEquivalentUrl(loaded,this.url)){this.hide();}}},startTransition:function(){if(!this.backBufferTile||!this.backBufferTile.imgDiv){return;}
-var ratio=1;if(this.backBufferTile.resolution){ratio=this.backBufferTile.resolution/this.layer.getResolution();}
-if(ratio!=this.lastRatio){if(this.layer.transitionEffect=='resize'){var upperLeft=new OpenLayers.LonLat(this.backBufferTile.bounds.left,this.backBufferTile.bounds.top);var size=new OpenLayers.Size(this.backBufferTile.size.w*ratio,this.backBufferTile.size.h*ratio);var px=this.layer.map.getLayerPxFromLonLat(upperLeft);OpenLayers.Util.modifyDOMElement(this.backBufferTile.frame,null,px,size);var imageSize=this.backBufferTile.imageSize;imageSize=new OpenLayers.Size(imageSize.w*ratio,imageSize.h*ratio);var imageOffset=this.backBufferTile.imageOffset;if(imageOffset){imageOffset=new OpenLayers.Pixel(imageOffset.x*ratio,imageOffset.y*ratio);}
-OpenLayers.Util.modifyDOMElement(this.backBufferTile.imgDiv,null,imageOffset,imageSize);this.backBufferTile.show();}}else{if(this.layer.singleTile){this.backBufferTile.show();}else{this.backBufferTile.hide();}}
-this.lastRatio=ratio;},show:function(){this.frame.style.display='';if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){if(navigator.userAgent.toLowerCase().indexOf("gecko")!=-1){this.frame.scrollLeft=this.frame.scrollLeft;}}},hide:function(){this.frame.style.display='none';},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Tile.Image.useBlankTile=(OpenLayers.Util.getBrowserName()=="safari"||OpenLayers.Util.getBrowserName()=="opera");OpenLayers.Tile.WFS=OpenLayers.Class(OpenLayers.Tile,{features:null,url:null,request:null,initialize:function(layer,position,bounds,url,size){OpenLayers.Tile.prototype.initialize.apply(this,arguments);this.url=url;this.features=[];},destroy:function(){OpenLayers.Tile.prototype.destroy.apply(this,arguments);this.destroyAllFeatures();this.features=null;this.url=null;if(this.request){this.request.abort();this.request=null;}},clear:function(){this.destroyAllFeatures();},draw:function(){if(OpenLayers.Tile.prototype.draw.apply(this,arguments)){if(this.isLoading){this.events.triggerEvent("reload");}else{this.isLoading=true;this.events.triggerEvent("loadstart");}
-this.loadFeaturesForRegion(this.requestSuccess);}},loadFeaturesForRegion:function(success,failure){if(this.request){this.request.abort();}
-this.request=OpenLayers.loadURL(this.url,null,this,success);},requestSuccess:function(request){if(this.features){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=OpenLayers.Format.XML.prototype.read(request.responseText);}
-if(this.layer.vectorMode){this.layer.addFeatures(this.layer.formatObject.read(doc));}else{var resultFeatures=OpenLayers.Ajax.getElementsByTagNameNS(doc,"http://www.opengis.net/gml","gml","featureMember");this.addResults(resultFeatures);}}
-if(this.events){this.events.triggerEvent("loadend");}
-this.request=null;},addResults:function(results){for(var i=0;i<results.length;i++){var feature=new this.layer.featureClass(this.layer,results[i]);this.features.push(feature);}},destroyAllFeatures:function(){while(this.features.length>0){var feature=this.features.shift();feature.destroy();}},CLASS_NAME:"OpenLayers.Tile.WFS"});OpenLayers.Control.OverviewMap=OpenLayers.Class(OpenLayers.Control,{element:null,ovmap:null,size:new OpenLayers.Size(180,90),layers:null,minRectSize:15,minRectDisplayClass:"RectReplacement",minRatio:8,maxRatio:32,mapOptions:null,handlers:null,initialize:function(options){this.layers=[];this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,[options]);},destroy:function(){if(!this.mapDiv){return;}
-this.handlers.click.destroy();this.mapDiv.removeChild(this.extentRectangle);this.extentRectangle=null;this.rectEvents.destroy();this.rectEvents=null;this.ovmap.destroy();this.ovmap=null;this.element.removeChild(this.mapDiv);this.mapDiv=null;this.div.removeChild(this.element);this.element=null;if(this.maximizeDiv){OpenLayers.Event.stopObservingElement(this.maximizeDiv);this.div.removeChild(this.maximizeDiv);this.maximizeDiv=null;}
-if(this.minimizeDiv){OpenLayers.Event.stopObservingElement(this.minimizeDiv);this.div.removeChild(this.minimizeDiv);this.minimizeDiv=null;}
-this.map.events.un({"moveend":this.update,"changebaselayer":this.baseLayerDraw,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!(this.layers.length>0)){if(this.map.baseLayer){var layer=this.map.baseLayer.clone();this.layers=[layer];}else{this.map.events.register("changebaselayer",this,this.baseLayerDraw);return this.div;}}
-this.element=document.createElement('div');this.element.className=this.displayClass+'Element';this.element.style.display='none';this.mapDiv=document.createElement('div');this.mapDiv.style.width=this.size.w+'px';this.mapDiv.style.height=this.size.h+'px';this.mapDiv.style.position='relative';this.mapDiv.style.overflow='hidden';this.mapDiv.id=OpenLayers.Util.createUniqueID('overviewMap');this.extentRectangle=document.createElement('div');this.extentRectangle.style.position='absolute';this.extentRectangle.style.zIndex=1000;this.extentRectangle.className=this.displayClass+'ExtentRectangle';this.mapDiv.appendChild(this.extentRectangle);this.element.appendChild(this.mapDiv);this.div.appendChild(this.element);if(!this.outsideViewport){this.div.className+=" "+this.displayClass+'Container';var imgLocation=OpenLayers.Util.getImagesLocation();var img=imgLocation+'layer-switcher-maximize.png';this.maximizeDiv=OpenLayers.Util.createAlphaImageDiv(this.displayClass+'MaximizeButton',null,new OpenLayers.Size(18,18),img,'absolute');this.maximizeDiv.style.display='none';this.maximizeDiv.className=this.displayClass+'MaximizeButton';OpenLayers.Event.observe(this.maximizeDiv,'click',OpenLayers.Function.bindAsEventListener(this.maximizeControl,this));this.div.appendChild(this.maximizeDiv);var img=imgLocation+'layer-switcher-minimize.png';this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv('OpenLayers_Control_minimizeDiv',null,new OpenLayers.Size(18,18),img,'absolute');this.minimizeDiv.style.display='none';this.minimizeDiv.className=this.displayClass+'MinimizeButton';OpenLayers.Event.observe(this.minimizeDiv,'click',OpenLayers.Function.bindAsEventListener(this.minimizeControl,this));this.div.appendChild(this.minimizeDiv);var eventsToStop=['dblclick','mousedown'];for(var i=0;i<eventsToStop.length;i++){OpenLayers.Event.observe(this.maximizeDiv,eventsToStop[i],OpenLayers.Event.stop);OpenLayers.Event.observe(this.minimizeDiv,eventsToStop[i],OpenLayers.Event.stop);}
-this.minimizeControl();}else{this.element.style.display='';}
-if(this.map.getExtent()){this.update();}
-this.map.events.register('moveend',this,this.update);return this.div;},baseLayerDraw:function(){this.draw();this.map.events.unregister("changebaselayer",this,this.baseLayerDraw);},rectDrag:function(px){var deltaX=this.handlers.drag.last.x-px.x;var deltaY=this.handlers.drag.last.y-px.y;if(deltaX!=0||deltaY!=0){var rectTop=this.rectPxBounds.top;var rectLeft=this.rectPxBounds.left;var rectHeight=Math.abs(this.rectPxBounds.getHeight());var rectWidth=this.rectPxBounds.getWidth();var newTop=Math.max(0,(rectTop-deltaY));newTop=Math.min(newTop,this.ovmap.size.h-this.hComp-rectHeight);var newLeft=Math.max(0,(rectLeft-deltaX));newLeft=Math.min(newLeft,this.ovmap.size.w-this.wComp-rectWidth);this.setRectPxBounds(new OpenLayers.Bounds(newLeft,newTop+rectHeight,newLeft+rectWidth,newTop));}},mapDivClick:function(evt){var pxCenter=this.rectPxBounds.getCenterPixel();var deltaX=evt.xy.x-pxCenter.x;var deltaY=evt.xy.y-pxCenter.y;var top=this.rectPxBounds.top;var left=this.rectPxBounds.left;var height=Math.abs(this.rectPxBounds.getHeight());var width=this.rectPxBounds.getWidth();var newTop=Math.max(0,(top+deltaY));newTop=Math.min(newTop,this.ovmap.size.h-height);var newLeft=Math.max(0,(left+deltaX));newLeft=Math.min(newLeft,this.ovmap.size.w-width);this.setRectPxBounds(new OpenLayers.Bounds(newLeft,newTop+height,newLeft+width,newTop));this.updateMapToRect();},maximizeControl:function(e){this.element.style.display='';this.showToggle(false);if(e!=null){OpenLayers.Event.stop(e);}},minimizeControl:function(e){this.element.style.display='none';this.showToggle(true);if(e!=null){OpenLayers.Event.stop(e);}},showToggle:function(minimize){this.maximizeDiv.style.display=minimize?'':'none';this.minimizeDiv.style.display=minimize?'none':'';},update:function(){if(this.ovmap==null){this.createMap();}
-if(!this.isSuitableOverview()){this.updateOverview();}
-this.updateRectToMap();},isSuitableOverview:function(){var mapExtent=this.map.getExtent();var maxExtent=this.map.maxExtent;var testExtent=new OpenLayers.Bounds(Math.max(mapExtent.left,maxExtent.left),Math.max(mapExtent.bottom,maxExtent.bottom),Math.min(mapExtent.right,maxExtent.right),Math.min(mapExtent.top,maxExtent.top));var resRatio=this.ovmap.getResolution()/this.map.getResolution();return((resRatio>this.minRatio)&&(resRatio<=this.maxRatio)&&(this.ovmap.getExtent().containsBounds(testExtent)));},updateOverview:function(){var mapRes=this.map.getResolution();var targetRes=this.ovmap.getResolution();var resRatio=targetRes/mapRes;if(resRatio>this.maxRatio){targetRes=this.minRatio*mapRes;}else if(resRatio<=this.minRatio){targetRes=this.maxRatio*mapRes;}
-this.ovmap.setCenter(this.map.center,this.ovmap.getZoomForResolution(targetRes));this.updateRectToMap();},createMap:function(){var options=OpenLayers.Util.extend({controls:[],maxResolution:'auto',fallThrough:false},this.mapOptions);this.ovmap=new OpenLayers.Map(this.mapDiv,options);OpenLayers.Event.stopObserving(window,'unload',this.ovmap.unloadDestroy);this.ovmap.addLayers(this.layers);this.ovmap.zoomToMaxExtent();this.wComp=parseInt(OpenLayers.Element.getStyle(this.extentRectangle,'border-left-width'))+
-parseInt(OpenLayers.Element.getStyle(this.extentRectangle,'border-right-width'));this.wComp=(this.wComp)?this.wComp:2;this.hComp=parseInt(OpenLayers.Element.getStyle(this.extentRectangle,'border-top-width'))+
-parseInt(OpenLayers.Element.getStyle(this.extentRectangle,'border-bottom-width'));this.hComp=(this.hComp)?this.hComp:2;this.handlers.drag=new OpenLayers.Handler.Drag(this,{move:this.rectDrag,done:this.updateMapToRect},{map:this.ovmap});this.handlers.click=new OpenLayers.Handler.Click(this,{"click":this.mapDivClick},{"single":true,"double":false,"stopSingle":true,"stopDouble":true,"pixelTolerance":1,map:this.ovmap});this.handlers.click.activate();this.rectEvents=new OpenLayers.Events(this,this.extentRectangle,null,true);this.rectEvents.register("mouseover",this,function(e){if(!this.handlers.drag.active&&!this.map.dragging){this.handlers.drag.activate();}});this.rectEvents.register("mouseout",this,function(e){if(!this.handlers.drag.dragging){this.handlers.drag.deactivate();}});},updateRectToMap:function(){if(this.map.units!='degrees'){if(this.ovmap.getProjection()&&(this.map.getProjection()!=this.ovmap.getProjection())){alert(OpenLayers.i18n("sameProjection"));}}
-var pxBounds=this.getRectBoundsFromMapBounds(this.map.getExtent());if(pxBounds){this.setRectPxBounds(pxBounds);}},updateMapToRect:function(){var lonLatBounds=this.getMapBoundsFromRectBounds(this.rectPxBounds);this.map.panTo(lonLatBounds.getCenterLonLat());},setRectPxBounds:function(pxBounds){var top=Math.max(pxBounds.top,0);var left=Math.max(pxBounds.left,0);var bottom=Math.min(pxBounds.top+Math.abs(pxBounds.getHeight()),this.ovmap.size.h-this.hComp);var right=Math.min(pxBounds.left+pxBounds.getWidth(),this.ovmap.size.w-this.wComp);var width=Math.max(right-left,0);var height=Math.max(bottom-top,0);if(width<this.minRectSize||height<this.minRectSize){this.extentRectangle.className=this.displayClass+
-this.minRectDisplayClass;var rLeft=left+(width/2)-(this.minRectSize/2);var rTop=top+(height/2)-(this.minRectSize/2);this.extentRectangle.style.top=Math.round(rTop)+'px';this.extentRectangle.style.left=Math.round(rLeft)+'px';this.extentRectangle.style.height=this.minRectSize+'px';this.extentRectangle.style.width=this.minRectSize+'px';}else{this.extentRectangle.className=this.displayClass+'ExtentRectangle';this.extentRectangle.style.top=Math.round(top)+'px';this.extentRectangle.style.left=Math.round(left)+'px';this.extentRectangle.style.height=Math.round(height)+'px';this.extentRectangle.style.width=Math.round(width)+'px';}
-this.rectPxBounds=new OpenLayers.Bounds(Math.round(left),Math.round(bottom),Math.round(right),Math.round(top));},getRectBoundsFromMapBounds:function(lonLatBounds){var leftBottomLonLat=new OpenLayers.LonLat(lonLatBounds.left,lonLatBounds.bottom);var rightTopLonLat=new OpenLayers.LonLat(lonLatBounds.right,lonLatBounds.top);var leftBottomPx=this.getOverviewPxFromLonLat(leftBottomLonLat);var rightTopPx=this.getOverviewPxFromLonLat(rightTopLonLat);var bounds=null;if(leftBottomPx&&rightTopPx){bounds=new OpenLayers.Bounds(leftBottomPx.x,leftBottomPx.y,rightTopPx.x,rightTopPx.y);}
-return bounds;},getMapBoundsFromRectBounds:function(pxBounds){var leftBottomPx=new OpenLayers.Pixel(pxBounds.left,pxBounds.bottom);var rightTopPx=new OpenLayers.Pixel(pxBounds.right,pxBounds.top);var leftBottomLonLat=this.getLonLatFromOverviewPx(leftBottomPx);var rightTopLonLat=this.getLonLatFromOverviewPx(rightTopPx);return new OpenLayers.Bounds(leftBottomLonLat.lon,leftBottomLonLat.lat,rightTopLonLat.lon,rightTopLonLat.lat);},getLonLatFromOverviewPx:function(overviewMapPx){var size=this.ovmap.size;var res=this.ovmap.getResolution();var center=this.ovmap.getExtent().getCenterLonLat();var delta_x=overviewMapPx.x-(size.w/2);var delta_y=overviewMapPx.y-(size.h/2);return new OpenLayers.LonLat(center.lon+delta_x*res,center.lat-delta_y*res);},getOverviewPxFromLonLat:function(lonlat){var res=this.ovmap.getResolution();var extent=this.ovmap.getExtent();var px=null;if(extent){px=new OpenLayers.Pixel(Math.round(1/res*(lonlat.lon-extent.left)),Math.round(1/res*(extent.top-lonlat.lat)));}
-return px;},CLASS_NAME:'OpenLayers.Control.OverviewMap'});OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:OpenLayers.Popup.AnchoredBubble,popup:null,initialize:function(layer,lonlat,data){this.layer=layer;this.lonlat=lonlat;this.data=(data!=null)?data:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup);}}
-this.layer=null;this.id=null;this.lonlat=null;this.data=null;if(this.marker!=null){this.destroyMarker(this.marker);this.marker=null;}
-if(this.popup!=null){this.destroyPopup(this.popup);this.popup=null;}},onScreen:function(){var onScreen=false;if((this.layer!=null)&&(this.layer.map!=null)){var screenBounds=this.layer.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);}
-return onScreen;},createMarker:function(){if(this.lonlat!=null){this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon);}
-return this.marker;},destroyMarker:function(){this.marker.destroy();},createPopup:function(closeBox){if(this.lonlat!=null){var id=this.id+"_popup";var anchor=(this.marker)?this.marker.icon:null;if(!this.popup){this.popup=new this.popupClass(id,this.lonlat,this.data.popupSize,this.data.popupContentHTML,anchor,closeBox);}
-if(this.data.overflow!=null){this.popup.contentDiv.style.overflow=this.data.overflow;}
-this.popup.feature=this;}
-return this.popup;},destroyPopup:function(){if(this.popup){this.popup.feature=null;this.popup.destroy();this.popup=null;}},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.Format.WMC=OpenLayers.Class({defaultVersion:"1.1.0",version:null,layerOptions:null,parser:null,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;},read:function(data,options){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
-var root=data.documentElement;var version=this.version;if(!version){version=root.getAttribute("version");if(!version){version=this.defaultVersion;}}
-if(!this.parser||this.parser.VERSION!=version){var format=OpenLayers.Format.WMC["v"+version.replace(/\./g,"_")];if(!format){throw"Can't find a WMC parser for version "+
-version;}
-this.parser=new format(this.options);}
-var context=this.parser.read(data,options);var map;if(options.map){this.context=context;if(options.map instanceof OpenLayers.Map){map=this.mergeContextToMap(context,options.map);}else{map=this.contextToMap(context,options.map);}}else{map=context;}
-return map;},contextToMap:function(context,id){var map=new OpenLayers.Map(id,{maxExtent:context.maxExtent,projection:context.projection});map.addLayers(context.layers);map.setCenter(context.bounds.getCenterLonLat(),map.getZoomForExtent(context.bounds,true));return map;},mergeContextToMap:function(context,map){map.addLayers(context.layers);return map;},write:function(obj,options){if(obj.CLASS_NAME=="OpenLayers.Map"){obj=this.mapToContext(obj);}
-var version=(options&&options.version)||this.version||this.defaultVersion;if(!this.parser||this.parser.VERSION!=version){var format=OpenLayers.Format.WMC["v"+version.replace(/\./g,"_")];if(!format){throw"Can't find a WMS capabilities parser for version "+
-version;}
-this.parser=new format(this.options);}
-var wmc=this.parser.write(obj,options);return wmc;},mapToContext:function(map){var context={bounds:map.getExtent(),maxExtent:map.maxExtent,projection:map.projection,layers:map.layers,size:map.getSize()};return context;},CLASS_NAME:"OpenLayers.Format.WMC"});OpenLayers.Format.WMC.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ol:"http://openlayers.org/context",wmc:"http://www.opengis.net/context",sld:"http://www.opengis.net/sld",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"",getNamespacePrefix:function(uri){var prefix=null;if(uri==null){prefix=this.namespaces[this.defaultPrefix];}else{for(prefix in this.namespaces){if(this.namespaces[prefix]==uri){break;}}}
-return prefix;},defaultPrefix:"wmc",rootPrefix:null,defaultStyleName:"",defaultStyleTitle:"Default",initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
-var root=data.documentElement;this.rootPrefix=root.prefix;var context={version:root.getAttribute("version")};this.runChildNodes(context,root);return context;},runChildNodes:function(obj,node){var children=node.childNodes;var childNode,processor,prefix,local;for(var i=0;i<children.length;++i){childNode=children[i];if(childNode.nodeType==1){prefix=this.getNamespacePrefix(childNode.namespaceURI);local=childNode.nodeName.split(":").pop();processor=this["read_"+prefix+"_"+local];if(processor){processor.apply(this,[obj,childNode]);}}}},read_wmc_General:function(context,node){this.runChildNodes(context,node);},read_wmc_BoundingBox:function(context,node){context.projection=node.getAttribute("SRS");context.bounds=new OpenLayers.Bounds(parseFloat(node.getAttribute("minx")),parseFloat(node.getAttribute("miny")),parseFloat(node.getAttribute("maxx")),parseFloat(node.getAttribute("maxy")));},read_wmc_LayerList:function(context,node){context.layers=[];this.runChildNodes(context,node);},read_wmc_Layer:function(context,node){var layerInfo={params:{},options:{visibility:(node.getAttribute("hidden")!="1")},queryable:(node.getAttribute("queryable")=="1"),formats:[],styles:[]};this.runChildNodes(layerInfo,node);layerInfo.params.layers=layerInfo.name;layerInfo.options.maxExtent=layerInfo.maxExtent;var layer=this.getLayerFromInfo(layerInfo);context.layers.push(layer);},getLayerFromInfo:function(layerInfo){var options=layerInfo.options;if(this.layerOptions){OpenLayers.Util.applyDefaults(options,this.layerOptions);}
-var layer=new OpenLayers.Layer.WMS(layerInfo.title,layerInfo.href,layerInfo.params,options);return layer;},read_wmc_Extension:function(obj,node){this.runChildNodes(obj,node);},read_ol_units:function(layerInfo,node){layerInfo.options.units=this.getChildValue(node);},read_ol_maxExtent:function(obj,node){var bounds=new OpenLayers.Bounds(node.getAttribute("minx"),node.getAttribute("miny"),node.getAttribute("maxx"),node.getAttribute("maxy"));obj.maxExtent=bounds;},read_ol_transparent:function(layerInfo,node){layerInfo.params.transparent=this.getChildValue(node);},read_ol_numZoomLevels:function(layerInfo,node){layerInfo.options.numZoomLevels=parseInt(this.getChildValue(node));},read_ol_opacity:function(layerInfo,node){layerInfo.options.opacity=parseFloat(this.getChildValue(node));},read_ol_singleTile:function(layerInfo,node){layerInfo.options.singleTile=(this.getChildValue(node)=="true");},read_ol_isBaseLayer:function(layerInfo,node){layerInfo.options.isBaseLayer=(this.getChildValue(node)=="true");},read_ol_displayInLayerSwitcher:function(layerInfo,node){layerInfo.options.displayInLayerSwitcher=(this.getChildValue(node)=="true");},read_wmc_Server:function(layerInfo,node){layerInfo.params.version=node.getAttribute("version");this.runChildNodes(layerInfo,node);},read_wmc_FormatList:function(layerInfo,node){this.runChildNodes(layerInfo,node);},read_wmc_Format:function(layerInfo,node){var format=this.getChildValue(node);layerInfo.formats.push(format);if(node.getAttribute("current")=="1"){layerInfo.params.format=format;}},read_wmc_StyleList:function(layerInfo,node){this.runChildNodes(layerInfo,node);},read_wmc_Style:function(layerInfo,node){var style={};this.runChildNodes(style,node);if(node.getAttribute("current")=="1"){if(style.href){layerInfo.params.sld=style.href;}else if(style.body){layerInfo.params.sld_body=style.body;}else{layerInfo.params.styles=style.name;}}
-layerInfo.styles.push(style);},read_wmc_SLD:function(style,node){this.runChildNodes(style,node);},read_sld_StyledLayerDescriptor:function(sld,node){var xml=OpenLayers.Format.XML.prototype.write.apply(this,[node]);sld.body=xml;},read_wmc_OnlineResource:function(obj,node){obj.href=this.getAttributeNS(node,this.namespaces.xlink,"href");},read_wmc_Name:function(obj,node){var name=this.getChildValue(node);if(name){obj.name=name;}},read_wmc_Title:function(obj,node){var title=this.getChildValue(node);if(title){obj.title=title;}},read_wmc_Abstract:function(obj,node){var abst=this.getChildValue(node);if(abst){obj["abstract"]=abst;}},read_wmc_LatLonBoundingBox:function(layer,node){layer.llbbox=[parseFloat(node.getAttribute("minx")),parseFloat(node.getAttribute("miny")),parseFloat(node.getAttribute("maxx")),parseFloat(node.getAttribute("maxy"))];},read_wmc_LegendURL:function(style,node){var legend={width:node.getAttribute('width'),height:node.getAttribute('height')};var links=node.getElementsByTagName("OnlineResource");if(links.length>0){this.read_wmc_OnlineResource(legend,links[0]);}
-style.legend=legend;},write:function(context,options){var root=this.createElementDefaultNS("ViewContext");this.setAttributes(root,{version:this.VERSION,id:(options&&typeof options.id=="string")?options.id:OpenLayers.Util.createUniqueID("OpenLayers_Context_")});this.setAttributeNS(root,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);root.appendChild(this.write_wmc_General(context));root.appendChild(this.write_wmc_LayerList(context));return OpenLayers.Format.XML.prototype.write.apply(this,[root]);},createElementDefaultNS:function(name,childValue,attributes){var node=this.createElementNS(this.namespaces[this.defaultPrefix],name);if(childValue){node.appendChild(this.createTextNode(childValue));}
-if(attributes){this.setAttributes(node,attributes);}
-return node;},setAttributes:function(node,obj){var value;for(var name in obj){value=obj[name].toString();if(value.match(/[A-Z]/)){this.setAttributeNS(node,null,name,value);}else{node.setAttribute(name,value);}}},write_wmc_General:function(context){var node=this.createElementDefaultNS("General");if(context.size){node.appendChild(this.createElementDefaultNS("Window",null,{width:context.size.w,height:context.size.h}));}
-var bounds=context.bounds;node.appendChild(this.createElementDefaultNS("BoundingBox",null,{minx:bounds.left.toPrecision(10),miny:bounds.bottom.toPrecision(10),maxx:bounds.right.toPrecision(10),maxy:bounds.top.toPrecision(10),SRS:context.projection}));node.appendChild(this.createElementDefaultNS("Title",context.title));node.appendChild(this.write_ol_MapExtension(context));return node;},write_ol_MapExtension:function(context){var node=this.createElementDefaultNS("Extension");var bounds=context.maxExtent;if(bounds){var maxExtent=this.createElementNS(this.namespaces.ol,"ol:maxExtent");this.setAttributes(maxExtent,{minx:bounds.left.toPrecision(10),miny:bounds.bottom.toPrecision(10),maxx:bounds.right.toPrecision(10),maxy:bounds.top.toPrecision(10)});node.appendChild(maxExtent);}
-return node;},write_wmc_LayerList:function(context){var list=this.createElementDefaultNS("LayerList");var layer;for(var i=0;i<context.layers.length;++i){layer=context.layers[i];if(layer instanceof OpenLayers.Layer.WMS){list.appendChild(this.write_wmc_Layer(layer));}}
-return list;},write_wmc_Layer:function(layer){var node=this.createElementDefaultNS("Layer",null,{queryable:"1",hidden:layer.visibility?"0":"1"});node.appendChild(this.write_wmc_Server(layer));node.appendChild(this.createElementDefaultNS("Name",layer.params["LAYERS"]));node.appendChild(this.createElementDefaultNS("Title",layer.name));node.appendChild(this.write_wmc_FormatList(layer));node.appendChild(this.write_wmc_StyleList(layer));node.appendChild(this.write_wmc_LayerExtension(layer));return node;},write_wmc_LayerExtension:function(layer){var node=this.createElementDefaultNS("Extension");var bounds=layer.maxExtent;var maxExtent=this.createElementNS(this.namespaces.ol,"ol:maxExtent");this.setAttributes(maxExtent,{minx:bounds.left.toPrecision(10),miny:bounds.bottom.toPrecision(10),maxx:bounds.right.toPrecision(10),maxy:bounds.top.toPrecision(10)});node.appendChild(maxExtent);var param=layer.params["TRANSPARENT"];if(param){var trans=this.createElementNS(this.namespaces.ol,"ol:transparent");trans.appendChild(this.createTextNode(param));node.appendChild(trans);}
-var properties=["numZoomLevels","units","isBaseLayer","opacity","displayInLayerSwitcher","singleTile"];var child;for(var i=0;i<properties.length;++i){child=this.createOLPropertyNode(layer,properties[i]);if(child){node.appendChild(child);}}
-return node;},createOLPropertyNode:function(obj,prop){var node=null;if(obj[prop]!=null){node=this.createElementNS(this.namespaces.ol,"ol:"+prop);node.appendChild(this.createTextNode(obj[prop].toString()));}
-return node;},write_wmc_Server:function(layer){var node=this.createElementDefaultNS("Server");this.setAttributes(node,{service:"OGC:WMS",version:layer.params["VERSION"]});node.appendChild(this.write_wmc_OnlineResource(layer.url));return node;},write_wmc_FormatList:function(layer){var node=this.createElementDefaultNS("FormatList");node.appendChild(this.createElementDefaultNS("Format",layer.params["FORMAT"],{current:"1"}));return node;},write_wmc_StyleList:function(layer){var node=this.createElementDefaultNS("StyleList");var style=this.createElementDefaultNS("Style",null,{current:"1"});if(layer.params["SLD"]){var sld=this.createElementDefaultNS("SLD");var link=this.write_wmc_OnlineResource(layer.params["SLD"]);sld.appendChild(link);style.appendChild(sld);}else if(layer.params["SLD_BODY"]){var sld=this.createElementDefaultNS("SLD");var body=layer.params["SLD_BODY"];var doc=OpenLayers.Format.XML.prototype.read.apply(this,[body]);var imported=doc.documentElement;if(sld.ownerDocument&&sld.ownerDocument.importNode){imported=sld.ownerDocument.importNode(imported,true);}
-sld.appendChild(imported);style.appendChild(sld);}else{var name=layer.params["STYLES"]?layer.params["STYLES"]:this.defaultStyleName;style.appendChild(this.createElementDefaultNS("Name",name));style.appendChild(this.createElementDefaultNS("Title",this.defaultStyleTitle));}
-node.appendChild(style);return node;},write_wmc_OnlineResource:function(href){var node=this.createElementDefaultNS("OnlineResource");this.setAttributeNS(node,this.namespaces.xlink,"xlink:type","simple");this.setAttributeNS(node,this.namespaces.xlink,"xlink:href",href);return node;},CLASS_NAME:"OpenLayers.Format.WMC.v1"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:true,'double':false,pixelTolerance:0,stopSingle:false,stopDouble:false,timerId:null,down:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(this.pixelTolerance!=null){this.mousedown=function(evt){this.down=evt.xy;return true;};}},mousedown:null,dblclick:function(evt){if(this.passesTolerance(evt)){if(this["double"]){this.callback('dblclick',[evt]);}
-this.clearTimer();}
-return!this.stopDouble;},click:function(evt){if(this.passesTolerance(evt)){if(this.timerId!=null){this.clearTimer();}else{var clickEvent=this.single?OpenLayers.Util.extend({},evt):null;this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,clickEvent),this.delay);}}
-return!this.stopSingle;},passesTolerance:function(evt){var passes=true;if(this.pixelTolerance!=null&&this.down){var dpx=Math.sqrt(Math.pow(this.down.x-evt.xy.x,2)+
-Math.pow(this.down.y-evt.xy.y,2));if(dpx>this.pixelTolerance){passes=false;}}
-return passes;},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;}},delayedCall:function(evt){this.timerId=null;if(evt){this.callback('click',[evt]);}},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.clearTimer();this.down=null;deactivated=true;}
-return deactivated;},CLASS_NAME:"OpenLayers.Handler.Click"});OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:true,dragging:false,last:null,start:null,oldOnselectstart:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);},down:function(evt){},move:function(evt){},up:function(evt){},out:function(evt){},mousedown:function(evt){var propagate=true;this.dragging=false;if(this.checkModifiers(evt)&&OpenLayers.Event.isLeftClick(evt)){this.started=true;this.start=evt.xy;this.last=evt.xy;this.map.div.style.cursor="move";this.down(evt);this.callback("down",[evt.xy]);OpenLayers.Event.stop(evt);if(!this.oldOnselectstart){this.oldOnselectstart=(document.onselectstart)?document.onselectstart:function(){return true;};document.onselectstart=function(){return false;};}
-propagate=!this.stopDown;}else{this.started=false;this.start=null;this.last=null;}
-return propagate;},mousemove:function(evt){if(this.started){if(evt.xy.x!=this.last.x||evt.xy.y!=this.last.y){this.dragging=true;this.move(evt);this.callback("move",[evt.xy]);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart;document.onselectstart=function(){return false;};}
-this.last=evt.xy;}}
-return true;},mouseup:function(evt){if(this.started){var dragged=(this.start!=this.last);this.started=false;this.dragging=false;this.map.div.style.cursor="";this.up(evt);this.callback("up",[evt.xy]);if(dragged){this.callback("done",[evt.xy]);}
-document.onselectstart=this.oldOnselectstart;}
-return true;},mouseout:function(evt){if(this.started&&OpenLayers.Util.mouseLeft(evt,this.map.div)){var dragged=(this.start!=this.last);this.started=false;this.dragging=false;this.map.div.style.cursor="";this.out(evt);this.callback("out",[]);if(dragged){this.callback("done",[evt.xy]);}
-if(document.onselectstart){document.onselectstart=this.oldOnselectstart;}}
-return true;},click:function(evt){return(this.start==this.last);},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragging=false;activated=true;}
-return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.started=false;this.dragging=false;this.start=null;this.last=null;deactivated=true;}
-return deactivated;},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Handler.Feature=OpenLayers.Class(OpenLayers.Handler,{EVENTMAP:{'click':{'in':'click','out':'clickout'},'mousemove':{'in':'over','out':'out'},'dblclick':{'in':'dblclick','out':null},'mousedown':{'in':null,'out':null},'mouseup':{'in':null,'out':null}},feature:null,lastFeature:null,down:null,up:null,clickoutTolerance:4,geometryTypes:null,stopClick:true,stopDown:true,stopUp:true,layerIndex:null,initialize:function(control,layer,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,[control,callbacks,options]);this.layer=layer;},mousedown:function(evt){this.down=evt.xy;return this.handle(evt)?!this.stopDown:true;},mouseup:function(evt){this.up=evt.xy;return this.handle(evt)?!this.stopUp:true;},click:function(evt){return this.handle(evt)?!this.stopClick:true;},mousemove:function(evt){this.handle(evt);return true;},dblclick:function(evt){return!this.handle(evt);},geometryTypeMatches:function(feature){return this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1;},handle:function(evt){var type=evt.type;var handled=false;var previouslyIn=!!(this.feature);var click=(type=="click"||type=="dblclick");this.feature=this.layer.getFeatureFromEvent(evt);if(this.feature){var inNew=(this.feature!=this.lastFeature);if(this.geometryTypeMatches(this.feature)){if(previouslyIn&&inNew){this.triggerCallback(type,'out',[this.lastFeature]);this.triggerCallback(type,'in',[this.feature]);}else if(!previouslyIn||click){this.triggerCallback(type,'in',[this.feature]);}
-this.lastFeature=this.feature;handled=true;}else{if(previouslyIn&&inNew||(click&&this.lastFeature)){this.triggerCallback(type,'out',[this.lastFeature]);}
-this.feature=null;}}else{if(previouslyIn||(click&&this.lastFeature)){this.triggerCallback(type,'out',[this.lastFeature]);}}
-return handled;},triggerCallback:function(type,mode,args){var key=this.EVENTMAP[type][mode];if(key){if(type=='click'&&mode=='out'&&this.up&&this.down){var dpx=Math.sqrt(Math.pow(this.up.x-this.down.x,2)+
-Math.pow(this.up.y-this.down.y,2));if(dpx<=this.clickoutTolerance){this.callback(key,args);}}else{this.callback(key,args);}}},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.layerIndex=this.layer.div.style.zIndex;this.layer.div.style.zIndex=this.map.Z_INDEX_BASE['Popup']-1;activated=true;}
-return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){if(this.layer&&this.layer.div){this.layer.div.style.zIndex=this.layerIndex;}
-this.feature=null;this.lastFeature=null;this.down=null;this.up=null;deactivated=true;}
-return deactivated;},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Handler.Hover=OpenLayers.Class(OpenLayers.Handler,{delay:500,pixelTolerance:null,stopMove:false,px:null,timerId:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);},mousemove:function(evt){if(this.passesTolerance(evt.xy)){this.clearTimer();this.callback('move',[evt]);this.px=evt.xy;evt=OpenLayers.Util.extend({},evt);this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,evt),this.delay);}
-return!this.stopMove;},mouseout:function(evt){if(OpenLayers.Util.mouseLeft(evt,this.map.div)){this.clearTimer();this.callback('move',[evt]);}
-return true;},passesTolerance:function(px){var passes=true;if(this.pixelTolerance&&this.px){var dpx=Math.sqrt(Math.pow(this.px.x-px.x,2)+
-Math.pow(this.px.y-px.y,2));if(dpx<this.pixelTolerance){passes=false;}}
-return passes;},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;}},delayedCall:function(evt){this.callback('pause',[evt]);},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.clearTimer();deactivated=true;}
-return deactivated;},CLASS_NAME:"OpenLayers.Handler.Hover"});OpenLayers.Handler.Keyboard=OpenLayers.Class(OpenLayers.Handler,{KEY_EVENTS:["keydown","keypress","keyup"],eventListener:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.eventListener=OpenLayers.Function.bindAsEventListener(this.handleKeyEvent,this);},destroy:function(){this.deactivate();this.eventListener=null;OpenLayers.Handler.prototype.destroy.apply(this,arguments);},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){for(var i=0;i<this.KEY_EVENTS.length;i++){OpenLayers.Event.observe(window,this.KEY_EVENTS[i],this.eventListener);}
-return true;}else{return false;}},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){for(var i=0;i<this.KEY_EVENTS.length;i++){OpenLayers.Event.stopObserving(window,this.KEY_EVENTS[i],this.eventListener);}
-deactivated=true;}
-return deactivated;},handleKeyEvent:function(evt){if(this.checkModifiers(evt)){this.callback(evt.type,[evt.charCode||evt.keyCode]);}},CLASS_NAME:"OpenLayers.Handler.Keyboard"});OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,mousePosition:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this);},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null;},onWheelEvent:function(e){if(!this.map||!this.checkModifiers(e)){return;}
-var overScrollableDiv=false;var overLayerDiv=false;var overMapDiv=false;var elem=OpenLayers.Event.element(e);while((elem!=null)&&!overMapDiv&&!overScrollableDiv){if(!overScrollableDiv){try{if(elem.currentStyle){overflow=elem.currentStyle["overflow"];}else{var style=document.defaultView.getComputedStyle(elem,null);var overflow=style.getPropertyValue("overflow");}
-overScrollableDiv=(overflow&&(overflow=="auto")||(overflow=="scroll"));}catch(err){}}
-if(!overLayerDiv){for(var i=0;i<this.map.layers.length;i++){if(elem==this.map.layers[i].div||elem==this.map.layers[i].pane){overLayerDiv=true;break;}}}
-overMapDiv=(elem==this.map.div);elem=elem.parentNode;}
-if(!overScrollableDiv&&overMapDiv){if(overLayerDiv){this.wheelZoom(e);}
-OpenLayers.Event.stop(e);}},wheelZoom:function(e){var delta=0;if(!e){e=window.event;}
-if(e.wheelDelta){delta=e.wheelDelta/120;if(window.opera&&window.opera.version()<9.2){delta=-delta;}}else if(e.detail){delta=-e.detail/3;}
-if(delta){if(this.mousePosition){e.xy=this.mousePosition;}
-if(!e.xy){e.xy=this.map.getPixelFromLonLat(this.map.getCenter());}
-if(delta<0){this.callback("down",[e,delta]);}else{this.callback("up",[e,delta]);}}},mousemove:function(evt){this.mousePosition=evt.xy;},activate:function(evt){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.observe(window,"mousewheel",wheelListener);OpenLayers.Event.observe(document,"mousewheel",wheelListener);return true;}else{return false;}},deactivate:function(evt){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.stopObserving(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.stopObserving(window,"mousewheel",wheelListener);OpenLayers.Event.stopObserving(document,"mousewheel",wheelListener);return true;}else{return false;}},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Layer=OpenLayers.Class({id:null,name:null,div:null,opacity:null,EVENT_TYPES:["loadstart","loadend","loadcancel","visibilitychanged"],events:null,map:null,isBaseLayer:false,alpha:false,displayInLayerSwitcher:true,visibility:true,attribution:null,inRange:false,imageSize:null,imageOffset:null,options:null,eventListeners:null,gutter:0,projection:null,units:null,scales:null,resolutions:null,maxExtent:null,minExtent:null,maxResolution:null,minResolution:null,numZoomLevels:null,minScale:null,maxScale:null,displayOutsideMaxExtent:false,wrapDateLine:false,transitionEffect:null,SUPPORTED_TRANSITIONS:['resize'],initialize:function(name,options){this.addOptions(options);this.name=name;if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");this.div=OpenLayers.Util.createDiv(this.id);this.div.style.width="100%";this.div.style.height="100%";this.events=new OpenLayers.Events(this,this.div,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}}
-if(this.wrapDateLine){this.displayOutsideMaxExtent=true;}},destroy:function(setNewBaseLayer){if(setNewBaseLayer==null){setNewBaseLayer=true;}
+return layerPx;},getLonLatFromLayerPx:function(px){px=this.getViewPortPxFromLayerPx(px);return this.getLonLatFromViewPortPx(px);},getLayerPxFromLonLat:function(lonlat){var px=this.getPixelFromLonLat(lonlat);return this.getLayerPxFromViewPortPx(px);},CLASS_NAME:"OpenLayers.Map"});OpenLayers.Map.TILE_WIDTH=256;OpenLayers.Map.TILE_HEIGHT=256;OpenLayers.Layer=OpenLayers.Class({id:null,name:null,div:null,opacity:1,alwaysInRange:null,RESOLUTION_PROPERTIES:['scales','resolutions','maxScale','minScale','maxResolution','minResolution','numZoomLevels','maxZoomLevel'],events:null,map:null,isBaseLayer:false,alpha:false,displayInLayerSwitcher:true,visibility:true,attribution:null,inRange:false,imageSize:null,options:null,eventListeners:null,gutter:0,projection:null,units:null,scales:null,resolutions:null,maxExtent:null,minExtent:null,maxResolution:null,minResolution:null,numZoomLevels:null,minScale:null,maxScale:null,displayOutsideMaxExtent:false,wrapDateLine:false,metadata:null,initialize:function(name,options){this.metadata={};options=OpenLayers.Util.extend({},options);if(this.alwaysInRange!=null){options.alwaysInRange=this.alwaysInRange;}
+this.addOptions(options);this.name=name;if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");this.div=OpenLayers.Util.createDiv(this.id);this.div.style.width="100%";this.div.style.height="100%";this.div.dir="ltr";this.events=new OpenLayers.Events(this,this.div);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}}},destroy:function(setNewBaseLayer){if(setNewBaseLayer==null){setNewBaseLayer=true;}
if(this.map!=null){this.map.removeLayer(this,setNewBaseLayer);}
this.projection=null;this.map=null;this.name=null;this.div=null;this.options=null;if(this.events){if(this.eventListeners){this.events.un(this.eventListeners);}
this.events.destroy();}
-this.eventListeners=null;this.events=null;},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer(this.name,this.options);}
-OpenLayers.Util.applyDefaults(obj,this);obj.map=null;return obj;},setName:function(newName){if(newName!=this.name){this.name=newName;if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"name"});}}},addOptions:function(newOptions){if(this.options==null){this.options={};}
-OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);},onMapResize:function(){},redraw:function(){var redrawn=false;if(this.map){this.inRange=this.calculateInRange();var extent=this.getExtent();if(extent&&this.inRange&&this.visibility){this.moveTo(extent,true,false);redrawn=true;}}
+this.eventListeners=null;this.events=null;},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer(this.name,this.getOptions());}
+OpenLayers.Util.applyDefaults(obj,this);obj.map=null;return obj;},getOptions:function(){var options={};for(var o in this.options){options[o]=this[o];}
+return options;},setName:function(newName){if(newName!=this.name){this.name=newName;if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"name"});}}},addOptions:function(newOptions,reinitialize){if(this.options==null){this.options={};}
+if(newOptions){if(typeof newOptions.projection=="string"){newOptions.projection=new OpenLayers.Projection(newOptions.projection);}
+if(newOptions.projection){OpenLayers.Util.applyDefaults(newOptions,OpenLayers.Projection.defaults[newOptions.projection.getCode()]);}
+if(newOptions.maxExtent&&!(newOptions.maxExtent instanceof OpenLayers.Bounds)){newOptions.maxExtent=new OpenLayers.Bounds(newOptions.maxExtent);}
+if(newOptions.minExtent&&!(newOptions.minExtent instanceof OpenLayers.Bounds)){newOptions.minExtent=new OpenLayers.Bounds(newOptions.minExtent);}}
+OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);if(this.projection&&this.projection.getUnits()){this.units=this.projection.getUnits();}
+if(this.map){var resolution=this.map.getResolution();var properties=this.RESOLUTION_PROPERTIES.concat(["projection","units","minExtent","maxExtent"]);for(var o in newOptions){if(newOptions.hasOwnProperty(o)&&OpenLayers.Util.indexOf(properties,o)>=0){this.initResolutions();if(reinitialize&&this.map.baseLayer===this){this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(resolution),false,true);this.map.events.triggerEvent("changebaselayer",{layer:this});}
+break;}}}},onMapResize:function(){},redraw:function(){var redrawn=false;if(this.map){this.inRange=this.calculateInRange();var extent=this.getExtent();if(extent&&this.inRange&&this.visibility){var zoomChanged=true;this.moveTo(extent,zoomChanged,false);this.events.triggerEvent("moveend",{"zoomChanged":zoomChanged});redrawn=true;}}
return redrawn;},moveTo:function(bounds,zoomChanged,dragging){var display=this.visibility;if(!this.isBaseLayer){display=display&&this.inRange;}
-this.display(display);},setMap:function(map){if(this.map==null){this.map=map;this.maxExtent=this.maxExtent||this.map.maxExtent;this.projection=this.projection||this.map.projection;if(this.projection&&typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);}
+this.display(display);},moveByPx:function(dx,dy){},setMap:function(map){if(this.map==null){this.map=map;this.maxExtent=this.maxExtent||this.map.maxExtent;this.minExtent=this.minExtent||this.map.minExtent;this.projection=this.projection||this.map.projection;if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);}
this.units=this.projection.getUnits()||this.units||this.map.units;this.initResolutions();if(!this.isBaseLayer){this.inRange=this.calculateInRange();var show=((this.visibility)&&(this.inRange));this.div.style.display=show?"":"none";}
-this.setTileSize();}},removeMap:function(map){},getImageSize:function(){return(this.imageSize||this.tileSize);},setTileSize:function(size){var tileSize=(size)?size:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=tileSize;if(this.gutter){this.imageOffset=new OpenLayers.Pixel(-this.gutter,-this.gutter);this.imageSize=new OpenLayers.Size(tileSize.w+(2*this.gutter),tileSize.h+(2*this.gutter));}},getVisibility:function(){return this.visibility;},setVisibility:function(visibility){if(visibility!=this.visibility){this.visibility=visibility;this.display(visibility);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"});}
-this.events.triggerEvent("visibilitychanged");}},display:function(display){var inRange=this.calculateInRange();if(display!=(this.div.style.display!="none")){this.div.style.display=(display&&inRange)?"block":"none";}},calculateInRange:function(){var inRange=false;if(this.map){var resolution=this.map.getResolution();inRange=((resolution>=this.minResolution)&&(resolution<=this.maxResolution));}
-return inRange;},setIsBaseLayer:function(isBaseLayer){if(isBaseLayer!=this.isBaseLayer){this.isBaseLayer=isBaseLayer;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this});}}},initResolutions:function(){var props=new Array('projection','units','scales','resolutions','maxScale','minScale','maxResolution','minResolution','minExtent','maxExtent','numZoomLevels','maxZoomLevel');var confProps={};for(var i=0;i<props.length;i++){var property=props[i];confProps[property]=this.options[property]||this.map[property];}
-if(this.options.minScale!=null&&this.options.maxScale!=null&&this.options.scales==null){confProps.scales=null;}
-if(this.options.minResolution!=null&&this.options.maxResolution!=null&&this.options.resolutions==null){confProps.resolutions=null;}
-if((!confProps.numZoomLevels)&&(confProps.maxZoomLevel)){confProps.numZoomLevels=confProps.maxZoomLevel+1;}
-if((confProps.scales!=null)||(confProps.resolutions!=null)){if(confProps.scales!=null){confProps.resolutions=[];for(var i=0;i<confProps.scales.length;i++){var scale=confProps.scales[i];confProps.resolutions[i]=OpenLayers.Util.getResolutionFromScale(scale,confProps.units);}}
-confProps.numZoomLevels=confProps.resolutions.length;}else{if(confProps.minScale){confProps.maxResolution=OpenLayers.Util.getResolutionFromScale(confProps.minScale,confProps.units);}else if(confProps.maxResolution=="auto"){var viewSize=this.map.getSize();var wRes=confProps.maxExtent.getWidth()/viewSize.w;var hRes=confProps.maxExtent.getHeight()/viewSize.h;confProps.maxResolution=Math.max(wRes,hRes);}
-if(confProps.maxScale!=null){confProps.minResolution=OpenLayers.Util.getResolutionFromScale(confProps.maxScale,confProps.units);}else if((confProps.minResolution=="auto")&&(confProps.minExtent!=null)){var viewSize=this.map.getSize();var wRes=confProps.minExtent.getWidth()/viewSize.w;var hRes=confProps.minExtent.getHeight()/viewSize.h;confProps.minResolution=Math.max(wRes,hRes);}
-if(confProps.minResolution!=null&&this.options.numZoomLevels==undefined){var ratio=confProps.maxResolution/confProps.minResolution;confProps.numZoomLevels=Math.floor(Math.log(ratio)/Math.log(2))+1;}
-confProps.resolutions=new Array(confProps.numZoomLevels);var base=2;if(typeof confProps.minResolution=="number"&&confProps.numZoomLevels>1){base=Math.pow((confProps.maxResolution/confProps.minResolution),(1/(confProps.numZoomLevels-1)));}
-for(var i=0;i<confProps.numZoomLevels;i++){var res=confProps.maxResolution/Math.pow(base,i);confProps.resolutions[i]=res;}}
-confProps.resolutions.sort(function(a,b){return(b-a);});this.resolutions=confProps.resolutions;this.maxResolution=confProps.resolutions[0];var lastIndex=confProps.resolutions.length-1;this.minResolution=confProps.resolutions[lastIndex];this.scales=[];for(var i=0;i<confProps.resolutions.length;i++){this.scales[i]=OpenLayers.Util.getScaleFromResolution(confProps.resolutions[i],confProps.units);}
-this.minScale=this.scales[0];this.maxScale=this.scales[this.scales.length-1];this.numZoomLevels=confProps.numZoomLevels;},getResolution:function(){var zoom=this.map.getZoom();return this.getResolutionForZoom(zoom);},getExtent:function(){return this.map.calculateBounds();},getZoomForExtent:function(extent,closest){var viewSize=this.map.getSize();var idealResolution=Math.max(extent.getWidth()/viewSize.w,extent.getHeight()/viewSize.h);return this.getZoomForResolution(idealResolution,closest);},getDataExtent:function(){},getResolutionForZoom:function(zoom){zoom=Math.max(0,Math.min(zoom,this.resolutions.length-1));var resolution;if(this.map.fractionalZoom){var low=Math.floor(zoom);var high=Math.ceil(zoom);resolution=this.resolutions[high]+
+this.setTileSize();}},afterAdd:function(){},removeMap:function(map){},getImageSize:function(bounds){return(this.imageSize||this.tileSize);},setTileSize:function(size){var tileSize=(size)?size:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=tileSize;if(this.gutter){this.imageSize=new OpenLayers.Size(tileSize.w+(2*this.gutter),tileSize.h+(2*this.gutter));}},getVisibility:function(){return this.visibility;},setVisibility:function(visibility){if(visibility!=this.visibility){this.visibility=visibility;this.display(visibility);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"});}
+this.events.triggerEvent("visibilitychanged");}},display:function(display){if(display!=(this.div.style.display!="none")){this.div.style.display=(display&&this.calculateInRange())?"block":"none";}},calculateInRange:function(){var inRange=false;if(this.alwaysInRange){inRange=true;}else{if(this.map){var resolution=this.map.getResolution();inRange=((resolution>=this.minResolution)&&(resolution<=this.maxResolution));}}
+return inRange;},setIsBaseLayer:function(isBaseLayer){if(isBaseLayer!=this.isBaseLayer){this.isBaseLayer=isBaseLayer;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this});}}},initResolutions:function(){var i,len,p;var props={},alwaysInRange=true;for(i=0,len=this.RESOLUTION_PROPERTIES.length;i<len;i++){p=this.RESOLUTION_PROPERTIES[i];props[p]=this.options[p];if(alwaysInRange&&this.options[p]){alwaysInRange=false;}}
+if(this.options.alwaysInRange==null){this.alwaysInRange=alwaysInRange;}
+if(props.resolutions==null){props.resolutions=this.resolutionsFromScales(props.scales);}
+if(props.resolutions==null){props.resolutions=this.calculateResolutions(props);}
+if(props.resolutions==null){for(i=0,len=this.RESOLUTION_PROPERTIES.length;i<len;i++){p=this.RESOLUTION_PROPERTIES[i];props[p]=this.options[p]!=null?this.options[p]:this.map[p];}
+if(props.resolutions==null){props.resolutions=this.resolutionsFromScales(props.scales);}
+if(props.resolutions==null){props.resolutions=this.calculateResolutions(props);}}
+var maxResolution;if(this.options.maxResolution&&this.options.maxResolution!=="auto"){maxResolution=this.options.maxResolution;}
+if(this.options.minScale){maxResolution=OpenLayers.Util.getResolutionFromScale(this.options.minScale,this.units);}
+var minResolution;if(this.options.minResolution&&this.options.minResolution!=="auto"){minResolution=this.options.minResolution;}
+if(this.options.maxScale){minResolution=OpenLayers.Util.getResolutionFromScale(this.options.maxScale,this.units);}
+if(props.resolutions){props.resolutions.sort(function(a,b){return(b-a);});if(!maxResolution){maxResolution=props.resolutions[0];}
+if(!minResolution){var lastIdx=props.resolutions.length-1;minResolution=props.resolutions[lastIdx];}}
+this.resolutions=props.resolutions;if(this.resolutions){len=this.resolutions.length;this.scales=new Array(len);for(i=0;i<len;i++){this.scales[i]=OpenLayers.Util.getScaleFromResolution(this.resolutions[i],this.units);}
+this.numZoomLevels=len;}
+this.minResolution=minResolution;if(minResolution){this.maxScale=OpenLayers.Util.getScaleFromResolution(minResolution,this.units);}
+this.maxResolution=maxResolution;if(maxResolution){this.minScale=OpenLayers.Util.getScaleFromResolution(maxResolution,this.units);}},resolutionsFromScales:function(scales){if(scales==null){return;}
+var resolutions,i,len;len=scales.length;resolutions=new Array(len);for(i=0;i<len;i++){resolutions[i]=OpenLayers.Util.getResolutionFromScale(scales[i],this.units);}
+return resolutions;},calculateResolutions:function(props){var viewSize,wRes,hRes;var maxResolution=props.maxResolution;if(props.minScale!=null){maxResolution=OpenLayers.Util.getResolutionFromScale(props.minScale,this.units);}else if(maxResolution=="auto"&&this.maxExtent!=null){viewSize=this.map.getSize();wRes=this.maxExtent.getWidth()/viewSize.w;hRes=this.maxExtent.getHeight()/viewSize.h;maxResolution=Math.max(wRes,hRes);}
+var minResolution=props.minResolution;if(props.maxScale!=null){minResolution=OpenLayers.Util.getResolutionFromScale(props.maxScale,this.units);}else if(props.minResolution=="auto"&&this.minExtent!=null){viewSize=this.map.getSize();wRes=this.minExtent.getWidth()/viewSize.w;hRes=this.minExtent.getHeight()/viewSize.h;minResolution=Math.max(wRes,hRes);}
+if(typeof maxResolution!=="number"&&typeof minResolution!=="number"&&this.maxExtent!=null){var tileSize=this.tileSize||this.map.getTileSize();maxResolution=Math.max(this.maxExtent.getWidth()/tileSize.w,this.maxExtent.getHeight()/tileSize.h);}
+var maxZoomLevel=props.maxZoomLevel;var numZoomLevels=props.numZoomLevels;if(typeof minResolution==="number"&&typeof maxResolution==="number"&&numZoomLevels===undefined){var ratio=maxResolution/minResolution;numZoomLevels=Math.floor(Math.log(ratio)/Math.log(2))+1;}else if(numZoomLevels===undefined&&maxZoomLevel!=null){numZoomLevels=maxZoomLevel+1;}
+if(typeof numZoomLevels!=="number"||numZoomLevels<=0||(typeof maxResolution!=="number"&&typeof minResolution!=="number")){return;}
+var resolutions=new Array(numZoomLevels);var base=2;if(typeof minResolution=="number"&&typeof maxResolution=="number"){base=Math.pow((maxResolution/minResolution),(1/(numZoomLevels-1)));}
+var i;if(typeof maxResolution==="number"){for(i=0;i<numZoomLevels;i++){resolutions[i]=maxResolution/Math.pow(base,i);}}else{for(i=0;i<numZoomLevels;i++){resolutions[numZoomLevels-1-i]=minResolution*Math.pow(base,i);}}
+return resolutions;},getResolution:function(){var zoom=this.map.getZoom();return this.getResolutionForZoom(zoom);},getExtent:function(){return this.map.calculateBounds();},getZoomForExtent:function(extent,closest){var viewSize=this.map.getSize();var idealResolution=Math.max(extent.getWidth()/viewSize.w,extent.getHeight()/viewSize.h);return this.getZoomForResolution(idealResolution,closest);},getDataExtent:function(){},getResolutionForZoom:function(zoom){zoom=Math.max(0,Math.min(zoom,this.resolutions.length-1));var resolution;if(this.map.fractionalZoom){var low=Math.floor(zoom);var high=Math.ceil(zoom);resolution=this.resolutions[low]-
((zoom-low)*(this.resolutions[low]-this.resolutions[high]));}else{resolution=this.resolutions[Math.round(zoom)];}
-return resolution;},getZoomForResolution:function(resolution,closest){var zoom;if(this.map.fractionalZoom){var lowZoom=0;var highZoom=this.resolutions.length-1;var highRes=this.resolutions[lowZoom];var lowRes=this.resolutions[highZoom];var res;for(var i=0;i<this.resolutions.length;++i){res=this.resolutions[i];if(res>=resolution){highRes=res;lowZoom=i;}
+return resolution;},getZoomForResolution:function(resolution,closest){var zoom,i,len;if(this.map.fractionalZoom){var lowZoom=0;var highZoom=this.resolutions.length-1;var highRes=this.resolutions[lowZoom];var lowRes=this.resolutions[highZoom];var res;for(i=0,len=this.resolutions.length;i<len;++i){res=this.resolutions[i];if(res>=resolution){highRes=res;lowZoom=i;}
if(res<=resolution){lowRes=res;highZoom=i;break;}}
-var dRes=highRes-lowRes;if(dRes>0){zoom=lowZoom+((resolution-lowRes)/dRes);}else{zoom=lowZoom;}}else{var diff;var minDiff=Number.POSITIVE_INFINITY;for(var i=0;i<this.resolutions.length;i++){if(closest){diff=Math.abs(this.resolutions[i]-resolution);if(diff>minDiff){break;}
+var dRes=highRes-lowRes;if(dRes>0){zoom=lowZoom+((highRes-resolution)/dRes);}else{zoom=lowZoom;}}else{var diff;var minDiff=Number.POSITIVE_INFINITY;for(i=0,len=this.resolutions.length;i<len;i++){if(closest){diff=Math.abs(this.resolutions[i]-resolution);if(diff>minDiff){break;}
minDiff=diff;}else{if(this.resolutions[i]<resolution){break;}}}
zoom=Math.max(0,i-1);}
-return zoom;},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;if(viewPortPx!=null){var size=this.map.getSize();var center=this.map.getCenter();if(center){var res=this.map.getResolution();var delta_x=viewPortPx.x-(size.w/2);var delta_y=viewPortPx.y-(size.h/2);lonlat=new OpenLayers.LonLat(center.lon+delta_x*res,center.lat-delta_y*res);if(this.wrapDateLine){lonlat=lonlat.wrapDateLine(this.maxExtent);}}}
-return lonlat;},getViewPortPxFromLonLat:function(lonlat){var px=null;if(lonlat!=null){var resolution=this.map.getResolution();var extent=this.map.getExtent();px=new OpenLayers.Pixel((1/resolution*(lonlat.lon-extent.left)),(1/resolution*(extent.top-lonlat.lat)));}
-return px;},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;for(var i=0;i<this.div.childNodes.length;++i){var element=this.div.childNodes[i].firstChild;OpenLayers.Util.modifyDOMElement(element,null,null,null,null,null,null,opacity);}}},setZIndex:function(zIndex){this.div.style.zIndex=zIndex;},adjustBounds:function(bounds){if(this.gutter){var mapGutter=this.gutter*this.map.getResolution();bounds=new OpenLayers.Bounds(bounds.left-mapGutter,bounds.bottom-mapGutter,bounds.right+mapGutter,bounds.top+mapGutter);}
-if(this.wrapDateLine){var wrappingOptions={'rightTolerance':this.getResolution()};bounds=bounds.wrapDateLine(this.maxExtent,wrappingOptions);}
-return bounds;},CLASS_NAME:"OpenLayers.Layer"});OpenLayers.Marker.Box=OpenLayers.Class(OpenLayers.Marker,{bounds:null,div:null,initialize:function(bounds,borderColor,borderWidth){this.bounds=bounds;this.div=OpenLayers.Util.createDiv();this.div.style.overflow='hidden';this.events=new OpenLayers.Events(this,this.div,null);this.setBorder(borderColor,borderWidth);},destroy:function(){this.bounds=null;this.div=null;OpenLayers.Marker.prototype.destroy.apply(this,arguments);},setBorder:function(color,width){if(!color){color="red";}
-if(!width){width=2;}
-this.div.style.border=width+"px solid "+color;},draw:function(px,sz){OpenLayers.Util.modifyDOMElement(this.div,null,px,sz);return this.div;},onScreen:function(){var onScreen=false;if(this.map){var screenBounds=this.map.getExtent();onScreen=screenBounds.containsBounds(this.bounds,true,true);}
-return onScreen;},display:function(display){this.div.style.display=(display)?"":"none";},CLASS_NAME:"OpenLayers.Marker.Box"});OpenLayers.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{autoSize:true,panMapIfOutOfView:true,imageSize:new OpenLayers.Size(676,736),isAlphaImage:false,fixedRelativePosition:false,positionBlocks:{"tl":{'offset':new OpenLayers.Pixel(44,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-638,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,32,80,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-638,-629)},{size:new OpenLayers.Size(81,54),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(0,-668)}]},"tr":{'offset':new OpenLayers.Pixel(-45,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-638,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-638,-629)},{size:new OpenLayers.Size(81,54),anchor:new OpenLayers.Bounds(0,0,null,null),position:new OpenLayers.Pixel(-215,-668)}]},"bl":{'offset':new OpenLayers.Pixel(45,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-638,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-638,-629)},{size:new OpenLayers.Size(81,54),anchor:new OpenLayers.Bounds(null,null,0,0),position:new OpenLayers.Pixel(-101,-674)}]},"br":{'offset':new OpenLayers.Pixel(-44,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-638,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-638,-629)},{size:new OpenLayers.Size(81,54),anchor:new OpenLayers.Bounds(0,null,null,0),position:new OpenLayers.Pixel(-311,-674)}]}},minSize:new OpenLayers.Size(105,10),maxSize:new OpenLayers.Size(600,660),initialize:function(id,lonlat,size,contentHTML,anchor,closeBox,closeBoxCallback){this.imageSrc=OpenLayers.Util.getImagesLocation()+'cloud-popup-relative.png';OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className="olFramedCloudPopupContent";},destroy:function(){OpenLayers.Popup.Framed.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(feature,pixel){},onDrag:function(feature,pixel){},onComplete:function(feature,pixel){},layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature,up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks)),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})};},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[]);},activate:function(){return(this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments));},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=false;this.lastPixel=null;return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},overFeature:function(feature){if(!this.handlers.drag.dragging){this.feature=feature;this.handlers.drag.activate();this.over=true;this.map.div.style.cursor="move";}else{if(this.feature.id==feature.id){this.over=true;}else{this.over=false;}}},downFeature:function(pixel){this.lastPixel=pixel;this.onStart(this.feature,pixel);},moveFeature:function(pixel){var res=this.map.getResolution();this.feature.geometry.move(res*(pixel.x-this.lastPixel.x),res*(this.lastPixel.y-pixel.y));this.layer.drawFeature(this.feature);this.lastPixel=pixel;this.onDrag(this.feature,pixel);},upFeature:function(pixel){if(!this.over){this.handlers.drag.deactivate();this.feature=null;this.map.div.style.cursor="default";}},doneDragging:function(pixel){this.onComplete(this.feature,pixel);},outFeature:function(feature){if(!this.handlers.drag.dragging){this.over=false;this.handlers.drag.deactivate();this.map.div.style.cursor="default";this.feature=null;}else{if(this.feature.id==feature.id){this.over=false;}}},cancel:function(){this.handlers.drag.deactivate();this.over=false;},setMap:function(map){this.handlers.drag.setMap(map);this.handlers.feature.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:false,draw:function(){this.handler=new OpenLayers.Handler.Drag(this,{"move":this.panMap,"done":this.panMapDone});},panMap:function(xy){this.panned=true;this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:this.handler.dragging,animate:false});},panMapDone:function(xy){if(this.panned){this.panMap(xy);this.panned=false;}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Control.KeyboardDefaults=OpenLayers.Class(OpenLayers.Control,{slideFactor:75,initialize:function(){OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){if(this.handler){this.handler.destroy();}
-this.handler=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){this.handler=new OpenLayers.Handler.Keyboard(this,{"keypress":this.defaultKeyPress});this.activate();},defaultKeyPress:function(code){switch(code){case OpenLayers.Event.KEY_LEFT:this.map.pan(-this.slideFactor,0);break;case OpenLayers.Event.KEY_RIGHT:this.map.pan(this.slideFactor,0);break;case OpenLayers.Event.KEY_UP:this.map.pan(0,-this.slideFactor);break;case OpenLayers.Event.KEY_DOWN:this.map.pan(0,this.slideFactor);break;case 33:var size=this.map.getSize();this.map.pan(0,-0.75*size.h);break;case 34:var size=this.map.getSize();this.map.pan(0,0.75*size.h);break;case 35:var size=this.map.getSize();this.map.pan(0.75*size.w,0);break;case 36:var size=this.map.getSize();this.map.pan(-0.75*size.w,0);break;case 43:this.map.zoomIn();break;case 45:this.map.zoomOut();break;case 107:this.map.zoomIn();break;case 109:this.map.zoomOut();break;}},CLASS_NAME:"OpenLayers.Control.KeyboardDefaults"});OpenLayers.State={UNKNOWN:'Unknown',INSERT:'Insert',UPDATE:'Update',DELETE:'Delete'};OpenLayers.Feature.Vector=OpenLayers.Class(OpenLayers.Feature,{fid:null,geometry:null,attributes:null,state:null,style:null,renderIntent:"default",initialize:function(geometry,attributes,style){OpenLayers.Feature.prototype.initialize.apply(this,[null,null,attributes]);this.lonlat=null;this.geometry=geometry;this.state=null;this.attributes={};if(attributes){this.attributes=OpenLayers.Util.extend(this.attributes,attributes);}
-this.style=style?style:null;},destroy:function(){if(this.layer){this.layer.removeFeatures(this);this.layer=null;}
-this.geometry=null;OpenLayers.Feature.prototype.destroy.apply(this,arguments);},clone:function(){return new OpenLayers.Feature.Vector(this.geometry.clone(),this.attributes,this.style);},onScreen:function(boundsOnly){var onScreen=false;if(this.layer&&this.layer.map){var screenBounds=this.layer.map.getExtent();if(boundsOnly){var featureBounds=this.geometry.getBounds();onScreen=screenBounds.intersectsBounds(featureBounds);}else{var screenPoly=screenBounds.toGeometry();onScreen=screenPoly.intersects(this.geometry);}}
-return onScreen;},createMarker:function(){return null;},destroyMarker:function(){},createPopup:function(){return null;},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;if(this.geometry){atPoint=this.geometry.atPoint(lonlat,toleranceLon,toleranceLat);}
-return atPoint;},destroyPopup:function(){},toState:function(state){if(state==OpenLayers.State.UPDATE){switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=state;break;case OpenLayers.State.UPDATE:case OpenLayers.State.INSERT:break;}}else if(state==OpenLayers.State.INSERT){switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=state;break;}}else if(state==OpenLayers.State.DELETE){switch(this.state){case OpenLayers.State.INSERT:break;case OpenLayers.State.DELETE:break;case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=state;break;}}else if(state==OpenLayers.State.UNKNOWN){this.state=state;}},CLASS_NAME:"OpenLayers.Feature.Vector"});OpenLayers.Feature.Vector.style={'default':{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:""},'select':{fillColor:"blue",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer"},'temporary':{fillColor:"yellow",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"yellow",strokeOpacity:1,strokeLinecap:"round",strokeWidth:4,hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:""}};OpenLayers.Feature.WFS=OpenLayers.Class(OpenLayers.Feature,{initialize:function(layer,xmlNode){var newArguments=arguments;var data=this.processXMLNode(xmlNode);newArguments=new Array(layer,data.lonlat,data);OpenLayers.Feature.prototype.initialize.apply(this,newArguments);this.createMarker();this.layer.addMarker(this.marker);},destroy:function(){if(this.marker!=null){this.layer.removeMarker(this.marker);}
-OpenLayers.Feature.prototype.destroy.apply(this,arguments);},processXMLNode:function(xmlNode){var point=OpenLayers.Ajax.getElementsByTagNameNS(xmlNode,"http://www.opengis.net/gml","gml","Point");var text=OpenLayers.Util.getXmlNodeValue(OpenLayers.Ajax.getElementsByTagNameNS(point[0],"http://www.opengis.net/gml","gml","coordinates")[0]);var floats=text.split(",");return{lonlat:new OpenLayers.LonLat(parseFloat(floats[0]),parseFloat(floats[1])),id:null};},CLASS_NAME:"OpenLayers.Feature.WFS"});OpenLayers.Format.WMC.v1_0_0=OpenLayers.Class(OpenLayers.Format.WMC.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/context http://schemas.opengis.net/context/1.0.0/context.xsd",initialize:function(options){OpenLayers.Format.WMC.v1.prototype.initialize.apply(this,[options]);},CLASS_NAME:"OpenLayers.Format.WMC.v1_0_0"});OpenLayers.Format.WMC.v1_1_0=OpenLayers.Class(OpenLayers.Format.WMC.v1,{VERSION:"1.1.0",schemaLocation:"http://www.opengis.net/context http://schemas.opengis.net/context/1.1.0/context.xsd",initialize:function(options){OpenLayers.Format.WMC.v1.prototype.initialize.apply(this,[options]);},read_sld_MinScaleDenominator:function(layerInfo,node){layerInfo.options.maxScale=this.getChildValue(node);},read_sld_MaxScaleDenominator:function(layerInfo,node){layerInfo.options.minScale=this.getChildValue(node);},write_wmc_Layer:function(layer){var node=OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(this,[layer]);if(layer.options.resolutions||layer.options.scales||layer.options.minResolution||layer.options.maxScale){var minSD=this.createElementNS(this.namespaces.sld,"sld:MinScaleDenominator");minSD.appendChild(this.createTextNode(layer.maxScale.toPrecision(10)));node.insertBefore(minSD,node.childNodes[3]);}
-if(layer.options.resolutions||layer.options.scales||layer.options.maxResolution||layer.options.minScale){var maxSD=this.createElementNS(this.namespaces.sld,"sld:MaxScaleDenominator");maxSD.appendChild(this.createTextNode(layer.minScale.toPrecision(10)));node.insertBefore(maxSD,node.childNodes[4]);}
-return node;},CLASS_NAME:"OpenLayers.Format.WMC.v1_1_0"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:'olHandlerBoxZoomBox',initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);var callbacks={"down":this.startBox,"move":this.moveBox,"out":this.removeBox,"up":this.endBox};this.dragHandler=new OpenLayers.Handler.Drag(this,callbacks,{keyMask:this.keyMask});},setMap:function(map){OpenLayers.Handler.prototype.setMap.apply(this,arguments);if(this.dragHandler){this.dragHandler.setMap(map);}},startBox:function(xy){this.zoomBox=OpenLayers.Util.createDiv('zoomBox',this.dragHandler.start);this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.viewPortDiv.appendChild(this.zoomBox);this.map.div.style.cursor="crosshair";},moveBox:function(xy){var deltaX=Math.abs(this.dragHandler.start.x-xy.x);var deltaY=Math.abs(this.dragHandler.start.y-xy.y);this.zoomBox.style.width=Math.max(1,deltaX)+"px";this.zoomBox.style.height=Math.max(1,deltaY)+"px";if(xy.x<this.dragHandler.start.x){this.zoomBox.style.left=xy.x+"px";}
-if(xy.y<this.dragHandler.start.y){this.zoomBox.style.top=xy.y+"px";}},endBox:function(end){var result;if(Math.abs(this.dragHandler.start.x-end.x)>5||Math.abs(this.dragHandler.start.y-end.y)>5){var start=this.dragHandler.start;var top=Math.min(start.y,end.y);var bottom=Math.max(start.y,end.y);var left=Math.min(start.x,end.x);var right=Math.max(start.x,end.x);result=new OpenLayers.Bounds(left,bottom,right,top);}else{result=this.dragHandler.start.clone();}
-this.removeBox();this.map.div.style.cursor="";this.callback("done",[result]);},removeBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.zoomBox=null;},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.dragHandler.deactivate();return true;}else{return false;}},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Handler.RegularPolygon=OpenLayers.Class(OpenLayers.Handler.Drag,{sides:4,radius:null,snapAngle:null,snapToggle:'shiftKey',persist:false,irregular:false,angle:null,fixedRadius:false,feature:null,layer:null,origin:null,initialize:function(control,callbacks,options){this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'],{});OpenLayers.Handler.prototype.initialize.apply(this,[control,callbacks,options]);this.options=(options)?options:new Object();},setOptions:function(newOptions){OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var options={displayInLayerSwitcher:false};this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,options);this.map.addLayer(this.layer);activated=true;}
-return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.Drag.prototype.deactivate.apply(this,arguments)){if(this.dragging){this.cancel();}
-if(this.layer.map!=null){this.layer.destroy(false);if(this.feature){this.feature.destroy();}}
-this.layer=null;this.feature=null;deactivated=true;}
-return deactivated;},down:function(evt){this.fixedRadius=!!(this.radius);var maploc=this.map.getLonLatFromPixel(evt.xy);this.origin=new OpenLayers.Geometry.Point(maploc.lon,maploc.lat);if(!this.fixedRadius||this.irregular){this.radius=this.map.getResolution();}
-if(this.persist){this.clear();}
-this.feature=new OpenLayers.Feature.Vector();this.createGeometry();this.layer.addFeatures([this.feature],{silent:true});this.layer.drawFeature(this.feature,this.style);},move:function(evt){var maploc=this.map.getLonLatFromPixel(evt.xy);var point=new OpenLayers.Geometry.Point(maploc.lon,maploc.lat);if(this.irregular){var ry=Math.sqrt(2)*Math.abs(point.y-this.origin.y)/2;this.radius=Math.max(this.map.getResolution()/2,ry);}else if(this.fixedRadius){this.origin=point;}else{this.calculateAngle(point,evt);this.radius=Math.max(this.map.getResolution()/2,point.distanceTo(this.origin));}
-this.modifyGeometry();if(this.irregular){var dx=point.x-this.origin.x;var dy=point.y-this.origin.y;var ratio;if(dy==0){ratio=dx/(this.radius*Math.sqrt(2));}else{ratio=dx/dy;}
-this.feature.geometry.resize(1,this.origin,ratio);this.feature.geometry.move(dx/2,dy/2);}
-this.layer.drawFeature(this.feature,this.style);},up:function(evt){this.finalize();},out:function(evt){this.finalize();},createGeometry:function(){this.angle=Math.PI*((1/this.sides)-(1/2));if(this.snapAngle){this.angle+=this.snapAngle*(Math.PI/180);}
-this.feature.geometry=OpenLayers.Geometry.Polygon.createRegularPolygon(this.origin,this.radius,this.sides,this.snapAngle);},modifyGeometry:function(){var angle,dx,dy,point;var ring=this.feature.geometry.components[0];if(ring.components.length!=(this.sides+1)){this.createGeometry();ring=this.feature.geometry.components[0];}
-for(var i=0;i<this.sides;++i){point=ring.components[i];angle=this.angle+(i*2*Math.PI/this.sides);point.x=this.origin.x+(this.radius*Math.cos(angle));point.y=this.origin.y+(this.radius*Math.sin(angle));point.clearBounds();}},calculateAngle:function(point,evt){var alpha=Math.atan2(point.y-this.origin.y,point.x-this.origin.x);if(this.snapAngle&&(this.snapToggle&&!evt[this.snapToggle])){var snapAngleRad=(Math.PI/180)*this.snapAngle;this.angle=Math.round(alpha/snapAngleRad)*snapAngleRad;}else{this.angle=alpha;}},cancel:function(){this.callback("cancel",null);this.finalize();},finalize:function(){this.origin=null;this.radius=this.options.radius;},clear:function(){this.layer.renderer.clear();this.layer.destroyFeatures();},callback:function(name,args){if(this.callbacks[name]){this.callbacks[name].apply(this.control,[this.feature.geometry.clone()]);}
-if(!this.persist&&(name=="done"||name=="cancel")){this.clear();}},CLASS_NAME:"OpenLayers.Handler.RegularPolygon"});OpenLayers.Layer.EventPane=OpenLayers.Class(OpenLayers.Layer,{smoothDragPan:true,isBaseLayer:true,isFixed:true,pane:null,mapObject:null,initialize:function(name,options){OpenLayers.Layer.prototype.initialize.apply(this,arguments);if(this.pane==null){this.pane=OpenLayers.Util.createDiv(this.div.id+"_EventPane");}},destroy:function(){this.mapObject=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Layer.prototype.setMap.apply(this,arguments);this.pane.style.zIndex=parseInt(this.div.style.zIndex)+1;this.pane.style.display=this.div.style.display;this.pane.style.width="100%";this.pane.style.height="100%";if(OpenLayers.Util.getBrowserName()=="msie"){this.pane.style.background="url("+OpenLayers.Util.getImagesLocation()+"blank.gif)";}
+return zoom;},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;var map=this.map;if(viewPortPx!=null&&map.minPx){var res=map.getResolution();var maxExtent=map.getMaxExtent({restricted:true});var lon=(viewPortPx.x-map.minPx.x)*res+maxExtent.left;var lat=(map.minPx.y-viewPortPx.y)*res+maxExtent.top;lonlat=new OpenLayers.LonLat(lon,lat);if(this.wrapDateLine){lonlat=lonlat.wrapDateLine(this.maxExtent);}}
+return lonlat;},getViewPortPxFromLonLat:function(lonlat,resolution){var px=null;if(lonlat!=null){resolution=resolution||this.map.getResolution();var extent=this.map.calculateBounds(null,resolution);px=new OpenLayers.Pixel((1/resolution*(lonlat.lon-extent.left)),(1/resolution*(extent.top-lonlat.lat)));}
+return px;},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;var childNodes=this.div.childNodes;for(var i=0,len=childNodes.length;i<len;++i){var element=childNodes[i].firstChild||childNodes[i];var lastChild=childNodes[i].lastChild;if(lastChild&&lastChild.nodeName.toLowerCase()==="iframe"){element=lastChild.parentNode;}
+OpenLayers.Util.modifyDOMElement(element,null,null,null,null,null,null,opacity);}
+if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"});}}},getZIndex:function(){return this.div.style.zIndex;},setZIndex:function(zIndex){this.div.style.zIndex=zIndex;},adjustBounds:function(bounds){if(this.gutter){var mapGutter=this.gutter*this.map.getResolution();bounds=new OpenLayers.Bounds(bounds.left-mapGutter,bounds.bottom-mapGutter,bounds.right+mapGutter,bounds.top+mapGutter);}
+if(this.wrapDateLine){var wrappingOptions={'rightTolerance':this.getResolution(),'leftTolerance':this.getResolution()};bounds=bounds.wrapDateLine(this.maxExtent,wrappingOptions);}
+return bounds;},CLASS_NAME:"OpenLayers.Layer"});OpenLayers.Layer.SphericalMercator={getExtent:function(){var extent=null;if(this.sphericalMercator){extent=this.map.calculateBounds();}else{extent=OpenLayers.Layer.FixedZoomLevels.prototype.getExtent.apply(this);}
+return extent;},getLonLatFromViewPortPx:function(viewPortPx){return OpenLayers.Layer.prototype.getLonLatFromViewPortPx.apply(this,arguments);},getViewPortPxFromLonLat:function(lonlat){return OpenLayers.Layer.prototype.getViewPortPxFromLonLat.apply(this,arguments);},initMercatorParameters:function(){this.RESOLUTIONS=[];var maxResolution=156543.03390625;for(var zoom=0;zoom<=this.MAX_ZOOM_LEVEL;++zoom){this.RESOLUTIONS[zoom]=maxResolution/Math.pow(2,zoom);}
+this.units="m";this.projection=this.projection||"EPSG:900913";},forwardMercator:(function(){var gg=new OpenLayers.Projection("EPSG:4326");var sm=new OpenLayers.Projection("EPSG:900913");return function(lon,lat){var point=OpenLayers.Projection.transform({x:lon,y:lat},gg,sm);return new OpenLayers.LonLat(point.x,point.y);};})(),inverseMercator:(function(){var gg=new OpenLayers.Projection("EPSG:4326");var sm=new OpenLayers.Projection("EPSG:900913");return function(x,y){var point=OpenLayers.Projection.transform({x:x,y:y},sm,gg);return new OpenLayers.LonLat(point.x,point.y);};})()};OpenLayers.Layer.EventPane=OpenLayers.Class(OpenLayers.Layer,{smoothDragPan:true,isBaseLayer:true,isFixed:true,pane:null,mapObject:null,initialize:function(name,options){OpenLayers.Layer.prototype.initialize.apply(this,arguments);if(this.pane==null){this.pane=OpenLayers.Util.createDiv(this.div.id+"_EventPane");}},destroy:function(){this.mapObject=null;this.pane=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Layer.prototype.setMap.apply(this,arguments);this.pane.style.zIndex=parseInt(this.div.style.zIndex)+1;this.pane.style.display=this.div.style.display;this.pane.style.width="100%";this.pane.style.height="100%";if(OpenLayers.BROWSER_NAME=="msie"){this.pane.style.background="url("+OpenLayers.Util.getImageLocation("blank.gif")+")";}
if(this.isFixed){this.map.viewPortDiv.appendChild(this.pane);}else{this.map.layerContainerDiv.appendChild(this.pane);}
-this.loadMapObject();if(this.mapObject==null){this.loadWarningMessage();}},removeMap:function(map){if(this.pane&&this.pane.parentNode){this.pane.parentNode.removeChild(this.pane);this.pane=null;}
-OpenLayers.Layer.prototype.removeMap.apply(this,arguments);},loadWarningMessage:function(){this.div.style.backgroundColor="darkblue";var viewSize=this.map.getSize();var msgW=Math.min(viewSize.w,300);var msgH=Math.min(viewSize.h,200);var size=new OpenLayers.Size(msgW,msgH);var centerPx=new OpenLayers.Pixel(viewSize.w/2,viewSize.h/2);var topLeft=centerPx.add(-size.w/2,-size.h/2);var div=OpenLayers.Util.createDiv(this.name+"_warning",topLeft,size,null,null,null,"auto");div.style.padding="7px";div.style.backgroundColor="yellow";div.innerHTML=this.getWarningHTML();this.div.appendChild(div);},getWarningHTML:function(){return"";},display:function(display){OpenLayers.Layer.prototype.display.apply(this,arguments);this.pane.style.display=this.div.style.display;},setZIndex:function(zIndex){OpenLayers.Layer.prototype.setZIndex.apply(this,arguments);this.pane.style.zIndex=parseInt(this.div.style.zIndex)+1;},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);if(this.mapObject!=null){var newCenter=this.map.getCenter();var newZoom=this.map.getZoom();if(newCenter!=null){var moOldCenter=this.getMapObjectCenter();var oldCenter=this.getOLLonLatFromMapObjectLonLat(moOldCenter);var moOldZoom=this.getMapObjectZoom();var oldZoom=this.getOLZoomFromMapObjectZoom(moOldZoom);if(!(newCenter.equals(oldCenter))||!(newZoom==oldZoom)){if(dragging&&this.dragPanMapObject&&this.smoothDragPan){var oldPx=this.map.getViewPortPxFromLonLat(oldCenter);var newPx=this.map.getViewPortPxFromLonLat(newCenter);this.dragPanMapObject(newPx.x-oldPx.x,oldPx.y-newPx.y);}else{var center=this.getMapObjectLonLatFromOLLonLat(newCenter);var zoom=this.getMapObjectZoomFromOLZoom(newZoom);this.setMapObjectCenter(center,zoom,dragging);}}}}},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;if((this.mapObject!=null)&&(this.getMapObjectCenter()!=null)){var moPixel=this.getMapObjectPixelFromOLPixel(viewPortPx);var moLonLat=this.getMapObjectLonLatFromMapObjectPixel(moPixel);lonlat=this.getOLLonLatFromMapObjectLonLat(moLonLat);}
+this.loadMapObject();if(this.mapObject==null){this.loadWarningMessage();}},removeMap:function(map){if(this.pane&&this.pane.parentNode){this.pane.parentNode.removeChild(this.pane);}
+OpenLayers.Layer.prototype.removeMap.apply(this,arguments);},loadWarningMessage:function(){this.div.style.backgroundColor="darkblue";var viewSize=this.map.getSize();var msgW=Math.min(viewSize.w,300);var msgH=Math.min(viewSize.h,200);var size=new OpenLayers.Size(msgW,msgH);var centerPx=new OpenLayers.Pixel(viewSize.w/2,viewSize.h/2);var topLeft=centerPx.add(-size.w/2,-size.h/2);var div=OpenLayers.Util.createDiv(this.name+"_warning",topLeft,size,null,null,null,"auto");div.style.padding="7px";div.style.backgroundColor="yellow";div.innerHTML=this.getWarningHTML();this.div.appendChild(div);},getWarningHTML:function(){return"";},display:function(display){OpenLayers.Layer.prototype.display.apply(this,arguments);this.pane.style.display=this.div.style.display;},setZIndex:function(zIndex){OpenLayers.Layer.prototype.setZIndex.apply(this,arguments);this.pane.style.zIndex=parseInt(this.div.style.zIndex)+1;},moveByPx:function(dx,dy){OpenLayers.Layer.prototype.moveByPx.apply(this,arguments);if(this.dragPanMapObject){this.dragPanMapObject(dx,-dy);}else{this.moveTo(this.map.getCachedCenter());}},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);if(this.mapObject!=null){var newCenter=this.map.getCenter();var newZoom=this.map.getZoom();if(newCenter!=null){var moOldCenter=this.getMapObjectCenter();var oldCenter=this.getOLLonLatFromMapObjectLonLat(moOldCenter);var moOldZoom=this.getMapObjectZoom();var oldZoom=this.getOLZoomFromMapObjectZoom(moOldZoom);if(!(newCenter.equals(oldCenter))||newZoom!=oldZoom){if(!zoomChanged&&oldCenter&&this.dragPanMapObject&&this.smoothDragPan){var oldPx=this.map.getViewPortPxFromLonLat(oldCenter);var newPx=this.map.getViewPortPxFromLonLat(newCenter);this.dragPanMapObject(newPx.x-oldPx.x,oldPx.y-newPx.y);}else{var center=this.getMapObjectLonLatFromOLLonLat(newCenter);var zoom=this.getMapObjectZoomFromOLZoom(newZoom);this.setMapObjectCenter(center,zoom,dragging);}}}}},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;if((this.mapObject!=null)&&(this.getMapObjectCenter()!=null)){var moPixel=this.getMapObjectPixelFromOLPixel(viewPortPx);var moLonLat=this.getMapObjectLonLatFromMapObjectPixel(moPixel);lonlat=this.getOLLonLatFromMapObjectLonLat(moLonLat);}
return lonlat;},getViewPortPxFromLonLat:function(lonlat){var viewPortPx=null;if((this.mapObject!=null)&&(this.getMapObjectCenter()!=null)){var moLonLat=this.getMapObjectLonLatFromOLLonLat(lonlat);var moPixel=this.getMapObjectPixelFromMapObjectLonLat(moLonLat);viewPortPx=this.getOLPixelFromMapObjectPixel(moPixel);}
return viewPortPx;},getOLLonLatFromMapObjectLonLat:function(moLonLat){var olLonLat=null;if(moLonLat!=null){var lon=this.getLongitudeFromMapObjectLonLat(moLonLat);var lat=this.getLatitudeFromMapObjectLonLat(moLonLat);olLonLat=new OpenLayers.LonLat(lon,lat);}
return olLonLat;},getMapObjectLonLatFromOLLonLat:function(olLonLat){var moLatLng=null;if(olLonLat!=null){moLatLng=this.getMapObjectLonLatFromLonLat(olLonLat.lon,olLonLat.lat);}
return moLatLng;},getOLPixelFromMapObjectPixel:function(moPixel){var olPixel=null;if(moPixel!=null){var x=this.getXFromMapObjectPixel(moPixel);var y=this.getYFromMapObjectPixel(moPixel);olPixel=new OpenLayers.Pixel(x,y);}
return olPixel;},getMapObjectPixelFromOLPixel:function(olPixel){var moPixel=null;if(olPixel!=null){moPixel=this.getMapObjectPixelFromXY(olPixel.x,olPixel.y);}
-return moPixel;},CLASS_NAME:"OpenLayers.Layer.EventPane"});OpenLayers.Layer.FixedZoomLevels=OpenLayers.Class({initialize:function(){},initResolutions:function(){var props=new Array('minZoomLevel','maxZoomLevel','numZoomLevels');for(var i=0;i<props.length;i++){var property=props[i];this[property]=(this.options[property]!=null)?this.options[property]:this.map[property];}
+return moPixel;},CLASS_NAME:"OpenLayers.Layer.EventPane"});OpenLayers.Layer.FixedZoomLevels=OpenLayers.Class({initialize:function(){},initResolutions:function(){var props=['minZoomLevel','maxZoomLevel','numZoomLevels'];for(var i=0,len=props.length;i<len;i++){var property=props[i];this[property]=(this.options[property]!=null)?this.options[property]:this.map[property];}
if((this.minZoomLevel==null)||(this.minZoomLevel<this.MIN_ZOOM_LEVEL)){this.minZoomLevel=this.MIN_ZOOM_LEVEL;}
-var limitZoomLevels=this.MAX_ZOOM_LEVEL-this.minZoomLevel+1;if(this.numZoomLevels!=null){this.numZoomLevels=Math.min(this.numZoomLevels,limitZoomLevels);}else{if(this.maxZoomLevel!=null){var zoomDiff=this.maxZoomLevel-this.minZoomLevel+1;this.numZoomLevels=Math.min(zoomDiff,limitZoomLevels);}else{this.numZoomLevels=limitZoomLevels;}}
+var desiredZoomLevels;var limitZoomLevels=this.MAX_ZOOM_LEVEL-this.minZoomLevel+1;if(((this.options.numZoomLevels==null)&&(this.options.maxZoomLevel!=null))||((this.numZoomLevels==null)&&(this.maxZoomLevel!=null))){desiredZoomLevels=this.maxZoomLevel-this.minZoomLevel+1;}else{desiredZoomLevels=this.numZoomLevels;}
+if(desiredZoomLevels!=null){this.numZoomLevels=Math.min(desiredZoomLevels,limitZoomLevels);}else{this.numZoomLevels=limitZoomLevels;}
this.maxZoomLevel=this.minZoomLevel+this.numZoomLevels-1;if(this.RESOLUTIONS!=null){var resolutionsIndex=0;this.resolutions=[];for(var i=this.minZoomLevel;i<=this.maxZoomLevel;i++){this.resolutions[resolutionsIndex++]=this.RESOLUTIONS[i];}
this.maxResolution=this.resolutions[0];this.minResolution=this.resolutions[this.resolutions.length-1];}},getResolution:function(){if(this.resolutions!=null){return OpenLayers.Layer.prototype.getResolution.apply(this,arguments);}else{var resolution=null;var viewSize=this.map.getSize();var extent=this.getExtent();if((viewSize!=null)&&(extent!=null)){resolution=Math.max(extent.getWidth()/viewSize.w,extent.getHeight()/viewSize.h);}
-return resolution;}},getExtent:function(){var extent=null;var size=this.map.getSize();var tlPx=new OpenLayers.Pixel(0,0);var tlLL=this.getLonLatFromViewPortPx(tlPx);var brPx=new OpenLayers.Pixel(size.w,size.h);var brLL=this.getLonLatFromViewPortPx(brPx);if((tlLL!=null)&&(brLL!=null)){extent=new OpenLayers.Bounds(tlLL.lon,brLL.lat,brLL.lon,tlLL.lat);}
-return extent;},getZoomForResolution:function(resolution){if(this.resolutions!=null){return OpenLayers.Layer.prototype.getZoomForResolution.apply(this,arguments);}else{var extent=OpenLayers.Layer.prototype.getExtent.apply(this,[]);return this.getZoomForExtent(extent);}},getOLZoomFromMapObjectZoom:function(moZoom){var zoom=null;if(moZoom!=null){zoom=moZoom-this.minZoomLevel;}
-return zoom;},getMapObjectZoomFromOLZoom:function(olZoom){var zoom=null;if(olZoom!=null){zoom=olZoom+this.minZoomLevel;}
-return zoom;},CLASS_NAME:"FixedZoomLevels.js"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:false,initialize:function(name,url,params,options){var newArguments=arguments;newArguments=[name,options];OpenLayers.Layer.prototype.initialize.apply(this,newArguments);this.url=url;this.params=OpenLayers.Util.extend({},params);},destroy:function(){this.url=null;this.params=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.options);}
-obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);return obj;},setUrl:function(newUrl){this.url=newUrl;},mergeNewParams:function(newParams){this.params=OpenLayers.Util.extend(this.params,newParams);return this.redraw();},redraw:function(force){if(force){return this.mergeNewParams({"_olSalt":Math.random()});}else{return OpenLayers.Layer.prototype.redraw.apply(this,[]);}},selectUrl:function(paramString,urls){var product=1;for(var i=0;i<paramString.length;i++){product*=paramString.charCodeAt(i)*this.URL_HASH_FACTOR;product-=Math.floor(product);}
-return urls[Math.floor(product*urls.length)];},getFullRequestString:function(newParams,altUrl){var url=altUrl||this.url;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var paramsString=OpenLayers.Util.getParameterString(allParams);if(url instanceof Array){url=this.selectUrl(paramsString,url);}
-var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}}
-paramsString=OpenLayers.Util.getParameterString(allParams);var requestString=url;if(paramsString!=""){var lastServerChar=url.charAt(url.length-1);if((lastServerChar=="&")||(lastServerChar=="?")){requestString+=paramsString;}else{if(url.indexOf('?')==-1){requestString+='?'+paramsString;}else{requestString+='&'+paramsString;}}}
-return requestString;},CLASS_NAME:"OpenLayers.Layer.HTTPRequest"});OpenLayers.Layer.Image=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:true,url:null,extent:null,size:null,tile:null,aspectRatio:null,initialize:function(name,url,extent,size,options){this.url=url;this.extent=extent;this.size=size;OpenLayers.Layer.prototype.initialize.apply(this,[name,options]);this.aspectRatio=(this.extent.getHeight()/this.size.h)/(this.extent.getWidth()/this.size.w);},destroy:function(){if(this.tile){this.tile.destroy();this.tile=null;}
-OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Image(this.name,this.url,this.extent,this.size,this.options);}
-obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);return obj;},setMap:function(map){if(this.options.maxResolution==null){this.options.maxResolution=this.aspectRatio*this.extent.getWidth()/this.size.w;}
-OpenLayers.Layer.prototype.setMap.apply(this,arguments);},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var firstRendering=(this.tile==null);if(zoomChanged||firstRendering){this.setTileSize();var ul=new OpenLayers.LonLat(this.extent.left,this.extent.top);var ulPx=this.map.getLayerPxFromLonLat(ul);if(firstRendering){this.tile=new OpenLayers.Tile.Image(this,ulPx,this.extent,null,this.tileSize);}else{this.tile.size=this.tileSize.clone();this.tile.position=ulPx.clone();}
-this.tile.draw();}},setTileSize:function(){var tileWidth=this.extent.getWidth()/this.map.getResolution();var tileHeight=this.extent.getHeight()/this.map.getResolution();this.tileSize=new OpenLayers.Size(tileWidth,tileHeight);},setUrl:function(newUrl){this.url=newUrl;this.tile.draw();},getURL:function(bounds){return this.url;},CLASS_NAME:"OpenLayers.Layer.Image"});OpenLayers.Layer.Markers=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:false,markers:null,drawn:false,initialize:function(name,options){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.markers=[];},destroy:function(){this.clearMarkers();this.markers=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;for(var i=0;i<this.markers.length;i++){this.markers[i].setOpacity(this.opacity);}}},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);if(zoomChanged||!this.drawn){for(var i=0;i<this.markers.length;i++){this.drawMarker(this.markers[i]);}
-this.drawn=true;}},addMarker:function(marker){this.markers.push(marker);if(this.opacity!=null){marker.setOpacity(this.opacity);}
-if(this.map&&this.map.getExtent()){marker.map=this.map;this.drawMarker(marker);}},removeMarker:function(marker){if(this.markers&&this.markers.length){OpenLayers.Util.removeItem(this.markers,marker);if((marker.icon!=null)&&(marker.icon.imageDiv!=null)&&(marker.icon.imageDiv.parentNode==this.div)){this.div.removeChild(marker.icon.imageDiv);marker.drawn=false;}}},clearMarkers:function(){if(this.markers!=null){while(this.markers.length>0){this.removeMarker(this.markers[0]);}}},drawMarker:function(marker){var px=this.map.getLayerPxFromLonLat(marker.lonlat);if(px==null){marker.display(false);}else{var markerImg=marker.draw(px);if(!marker.drawn){this.div.appendChild(markerImg);marker.drawn=true;}}},getDataExtent:function(){var maxExtent=null;if(this.markers&&(this.markers.length>0)){var maxExtent=new OpenLayers.Bounds();for(var i=0;i<this.markers.length;i++){var marker=this.markers[i];maxExtent.extend(marker.lonlat);}}
-return maxExtent;},CLASS_NAME:"OpenLayers.Layer.Markers"});OpenLayers.Layer.SphericalMercator={getExtent:function(){var extent=null;if(this.sphericalMercator){extent=this.map.calculateBounds();}else{extent=OpenLayers.Layer.FixedZoomLevels.prototype.getExtent.apply(this);}
-return extent;},initMercatorParameters:function(){this.RESOLUTIONS=[];var maxResolution=156543.0339;for(var zoom=0;zoom<=this.MAX_ZOOM_LEVEL;++zoom){this.RESOLUTIONS[zoom]=maxResolution/Math.pow(2,zoom);}
-this.units="m";this.projection="EPSG:900913";},forwardMercator:function(lon,lat){var x=lon*20037508.34/180;var y=Math.log(Math.tan((90+lat)*Math.PI/360))/(Math.PI/180);y=y*20037508.34/180;return new OpenLayers.LonLat(x,y);},inverseMercator:function(x,y){var lon=(x/20037508.34)*180;var lat=(y/20037508.34)*180;lat=180/Math.PI*(2*Math.atan(Math.exp(lat*Math.PI/180))-Math.PI/2);return new OpenLayers.LonLat(lon,lat);},projectForward:function(point){var lonlat=OpenLayers.Layer.SphericalMercator.forwardMercator(point.x,point.y);point.x=lonlat.lon;point.y=lonlat.lat;return point;},projectInverse:function(point){var lonlat=OpenLayers.Layer.SphericalMercator.inverseMercator(point.x,point.y);point.x=lonlat.lon;point.y=lonlat.lat;return point;}};OpenLayers.Projection.addTransform("EPSG:4326","EPSG:900913",OpenLayers.Layer.SphericalMercator.projectForward);OpenLayers.Projection.addTransform("EPSG:900913","EPSG:4326",OpenLayers.Layer.SphericalMercator.projectInverse);OpenLayers.Control.DrawFeature=OpenLayers.Class(OpenLayers.Control,{layer:null,callbacks:null,featureAdded:function(){},handlerOptions:null,initialize:function(layer,handler,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.callbacks=OpenLayers.Util.extend({done:this.drawFeature},this.callbacks);this.layer=layer;this.handler=new handler(this,this.callbacks,this.handlerOptions);},drawFeature:function(geometry){var feature=new OpenLayers.Feature.Vector(geometry);this.layer.addFeatures([feature]);this.featureAdded(feature);},CLASS_NAME:"OpenLayers.Control.DrawFeature"});OpenLayers.Control.SelectFeature=OpenLayers.Class(OpenLayers.Control,{multipleKey:null,toggleKey:null,multiple:false,clickout:true,toggle:false,hover:false,onSelect:function(){},onUnselect:function(){},geometryTypes:null,layer:null,callbacks:null,selectStyle:null,renderIntent:"select",handler:null,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;this.callbacks=OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.callbacks);var handlerOptions={geometryTypes:this.geometryTypes};this.handler=new OpenLayers.Handler.Feature(this,layer,this.callbacks,handlerOptions);},unselectAll:function(options){var feature;for(var i=this.layer.selectedFeatures.length-1;i>=0;--i){feature=this.layer.selectedFeatures[i];if(!options||options.except!=feature){this.unselect(feature);}}},clickFeature:function(feature){if(!this.hover){var selected=(OpenLayers.Util.indexOf(this.layer.selectedFeatures,feature)>-1);if(selected){if(this.toggleSelect()){this.unselect(feature);}else if(!this.multipleSelect()){this.unselectAll({except:feature});}}else{if(!this.multipleSelect()){this.unselectAll({except:feature});}
-this.select(feature);}}},multipleSelect:function(){return this.multiple||this.handler.evt[this.multipleKey];},toggleSelect:function(){return this.toggle||this.handler.evt[this.toggleKey];},clickoutFeature:function(feature){if(!this.hover&&this.clickout){this.unselectAll();}},overFeature:function(feature){if(this.hover&&(OpenLayers.Util.indexOf(this.layer.selectedFeatures,feature)==-1)){this.select(feature);}},outFeature:function(feature){if(this.hover){this.unselect(feature);}},select:function(feature){this.layer.selectedFeatures.push(feature);var selectStyle=this.selectStyle||this.renderIntent;this.layer.drawFeature(feature,selectStyle);this.layer.events.triggerEvent("featureselected",{feature:feature});this.onSelect(feature);},unselect:function(feature){this.layer.drawFeature(feature,"default");OpenLayers.Util.removeItem(this.layer.selectedFeatures,feature);this.layer.events.triggerEvent("featureunselected",{feature:feature});this.onUnselect(feature);},setMap:function(map){this.handler.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:false,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask});},zoomBox:function(position){if(position instanceof OpenLayers.Bounds){if(!this.out){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));var bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);}else{var pixWidth=Math.abs(position.right-position.left);var pixHeight=Math.abs(position.top-position.bottom);var zoomFactor=Math.min((this.map.size.h/pixHeight),(this.map.size.w/pixWidth));var extent=this.map.getExtent();var center=this.map.getLonLatFromPixel(position.getCenterPixel());var xmin=center.lon-(extent.getWidth()/2)*zoomFactor;var xmax=center.lon+(extent.getWidth()/2)*zoomFactor;var ymin=center.lat-(extent.getHeight()/2)*zoomFactor;var ymax=center.lat+(extent.getHeight()/2)*zoomFactor;var bounds=new OpenLayers.Bounds(xmin,ymin,xmax,ymax);}
-this.map.zoomToExtent(bounds);}else{if(!this.out){this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()+1);}else{this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()-1);}}},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Format.WKT=OpenLayers.Class(OpenLayers.Format,{initialize:function(options){this.regExes={'typeStr':/^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,'spaces':/\s+/,'parenComma':/\)\s*,\s*\(/,'doubleParenComma':/\)\s*\)\s*,\s*\(\s*\(/,'trimParens':/^\s*\(?(.*?)\)?\s*$/};OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(wkt){var features,type,str;var matches=this.regExes.typeStr.exec(wkt);if(matches){type=matches[1].toLowerCase();str=matches[2];if(this.parse[type]){features=this.parse[type].apply(this,[str]);}
-if(this.internalProjection&&this.externalProjection){if(features&&features.CLASS_NAME=="OpenLayers.Feature.Vector"){features.geometry.transform(this.externalProjection,this.internalProjection);}else if(features&&typeof features=="object"){for(var i=0;i<features.length;i++){var component=features[i];component.geometry.transform(this.externalProjection,this.internalProjection);}}}}
-return features;},write:function(features){var collection,geometry,type,data,isCollection;if(features.constructor==Array){collection=features;isCollection=true;}else{collection=[features];isCollection=false;}
-var pieces=[];if(isCollection){pieces.push('GEOMETRYCOLLECTION(');}
-for(var i=0;i<collection.length;++i){if(isCollection&&i>0){pieces.push(',');}
-geometry=collection[i].geometry;type=geometry.CLASS_NAME.split('.')[2].toLowerCase();if(!this.extract[type]){return null;}
-if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);}
-data=this.extract[type].apply(this,[geometry]);pieces.push(type.toUpperCase()+'('+data+')');}
-if(isCollection){pieces.push(')');}
-return pieces.join('');},extract:{'point':function(point){return point.x+' '+point.y;},'multipoint':function(multipoint){var array=[];for(var i=0;i<multipoint.components.length;++i){array.push(this.extract.point.apply(this,[multipoint.components[i]]));}
-return array.join(',');},'linestring':function(linestring){var array=[];for(var i=0;i<linestring.components.length;++i){array.push(this.extract.point.apply(this,[linestring.components[i]]));}
-return array.join(',');},'multilinestring':function(multilinestring){var array=[];for(var i=0;i<multilinestring.components.length;++i){array.push('('+
-this.extract.linestring.apply(this,[multilinestring.components[i]])+')');}
-return array.join(',');},'polygon':function(polygon){var array=[];for(var i=0;i<polygon.components.length;++i){array.push('('+
-this.extract.linestring.apply(this,[polygon.components[i]])+')');}
-return array.join(',');},'multipolygon':function(multipolygon){var array=[];for(var i=0;i<multipolygon.components.length;++i){array.push('('+
-this.extract.polygon.apply(this,[multipolygon.components[i]])+')');}
-return array.join(',');}},parse:{'point':function(str){var coords=OpenLayers.String.trim(str).split(this.regExes.spaces);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(coords[0],coords[1]));},'multipoint':function(str){var points=OpenLayers.String.trim(str).split(',');var components=[];for(var i=0;i<points.length;++i){components.push(this.parse.point.apply(this,[points[i]]).geometry);}
-return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPoint(components));},'linestring':function(str){var points=OpenLayers.String.trim(str).split(',');var components=[];for(var i=0;i<points.length;++i){components.push(this.parse.point.apply(this,[points[i]]).geometry);}
-return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString(components));},'multilinestring':function(str){var line;var lines=OpenLayers.String.trim(str).split(this.regExes.parenComma);var components=[];for(var i=0;i<lines.length;++i){line=lines[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.linestring.apply(this,[line]).geometry);}
-return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiLineString(components));},'polygon':function(str){var ring,linestring,linearring;var rings=OpenLayers.String.trim(str).split(this.regExes.parenComma);var components=[];for(var i=0;i<rings.length;++i){ring=rings[i].replace(this.regExes.trimParens,'$1');linestring=this.parse.linestring.apply(this,[ring]).geometry;linearring=new OpenLayers.Geometry.LinearRing(linestring.components);components.push(linearring);}
-return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon(components));},'multipolygon':function(str){var polygon;var polygons=OpenLayers.String.trim(str).split(this.regExes.doubleParenComma);var components=[];for(var i=0;i<polygons.length;++i){polygon=polygons[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.polygon.apply(this,[polygon]).geometry);}
-return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPolygon(components));},'geometrycollection':function(str){str=str.replace(/,\s*([A-Za-z])/g,'|$1');var wktArray=OpenLayers.String.trim(str).split('|');var components=[];for(var i=0;i<wktArray.length;++i){components.push(OpenLayers.Format.WKT.prototype.read.apply(this,[wktArray[i]]));}
-return components;}},CLASS_NAME:"OpenLayers.Format.WKT"});OpenLayers.Layer.Boxes=OpenLayers.Class(OpenLayers.Layer.Markers,{initialize:function(name,options){OpenLayers.Layer.Markers.prototype.initialize.apply(this,arguments);},drawMarker:function(marker){var bounds=marker.bounds;var topleft=this.map.getLayerPxFromLonLat(new OpenLayers.LonLat(bounds.left,bounds.top));var botright=this.map.getLayerPxFromLonLat(new OpenLayers.LonLat(bounds.right,bounds.bottom));if(botright==null||topleft==null){marker.display(false);}else{var sz=new OpenLayers.Size(Math.max(1,botright.x-topleft.x),Math.max(1,botright.y-topleft.y));var markerDiv=marker.draw(topleft,sz);if(!marker.drawn){this.div.appendChild(markerDiv);marker.drawn=true;}}},removeMarker:function(marker){OpenLayers.Util.removeItem(this.markers,marker);if((marker.div!=null)&&(marker.div.parentNode==this.div)){this.div.removeChild(marker.div);}},CLASS_NAME:"OpenLayers.Layer.Boxes"});OpenLayers.Layer.GeoRSS=OpenLayers.Class(OpenLayers.Layer.Markers,{location:null,features:null,formatOptions:null,selectedFeature:null,icon:null,popupSize:null,useFeedTitle:true,initialize:function(name,location,options){OpenLayers.Layer.Markers.prototype.initialize.apply(this,[name,options]);this.location=location;this.features=[];},destroy:function(){OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);this.clearFeatures();this.features=null;},loadRSS:function(){if(!this.loaded){this.events.triggerEvent("loadstart");OpenLayers.loadURL(this.location,null,this,this.parseData);this.loaded=true;}},moveTo:function(bounds,zoomChanged,minor){OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);if(this.visibility&&!this.loaded){this.events.triggerEvent("loadstart");this.loadRSS();}},parseData:function(ajaxRequest){var doc=ajaxRequest.responseXML;if(!doc||!doc.documentElement){doc=OpenLayers.Format.XML.prototype.read(ajaxRequest.responseText);}
-if(this.useFeedTitle){var name=null;try{name=doc.getElementsByTagNameNS('*','title')[0].firstChild.nodeValue;}
-catch(e){name=doc.getElementsByTagName('title')[0].firstChild.nodeValue;}
-if(name){this.setName(name);}}
-var options={};OpenLayers.Util.extend(options,this.formatOptions);if(this.map&&!this.projection.equals(this.map.getProjectionObject())){options.externalProjection=this.projection;options.internalProjection=this.map.getProjectionObject();}
-var format=new OpenLayers.Format.GeoRSS(options);var features=format.read(doc);for(var i=0;i<features.length;i++){var data={};var feature=features[i];if(!feature.geometry){continue;}
-var title=feature.attributes.title?feature.attributes.title:"Untitled";var description=feature.attributes.description?feature.attributes.description:"No description.";var link=feature.attributes.link?feature.attributes.link:"";var location=feature.geometry.getBounds().getCenterLonLat();data.icon=this.icon==null?OpenLayers.Marker.defaultIcon():this.icon.clone();data.popupSize=this.popupSize?this.popupSize.clone():new OpenLayers.Size(250,120);if(title||description){var contentHTML='<div class="olLayerGeoRSSClose">[x]</div>';contentHTML+='<div class="olLayerGeoRSSTitle">';if(link){contentHTML+='<a class="link" href="'+link+'" target="_blank">';}
-contentHTML+=title;if(link){contentHTML+='</a>';}
-contentHTML+='</div>';contentHTML+='<div style="" class="olLayerGeoRSSDescription">';contentHTML+=description;contentHTML+='</div>';data['popupContentHTML']=contentHTML;}
-var feature=new OpenLayers.Feature(this,location,data);this.features.push(feature);var marker=feature.createMarker();marker.events.register('click',feature,this.markerClick);this.addMarker(marker);}
-this.events.triggerEvent("loadend");},markerClick:function(evt){var sameMarkerClicked=(this==this.layer.selectedFeature);this.layer.selectedFeature=(!sameMarkerClicked)?this:null;for(var i=0;i<this.layer.map.popups.length;i++){this.layer.map.removePopup(this.layer.map.popups[i]);}
-if(!sameMarkerClicked){var popup=this.createPopup();OpenLayers.Event.observe(popup.div,"click",OpenLayers.Function.bind(function(){for(var i=0;i<this.layer.map.popups.length;i++){this.layer.map.removePopup(this.layer.map.popups[i]);}},this));this.layer.map.addPopup(popup);}
-OpenLayers.Event.stop(evt);},clearFeatures:function(){if(this.features!=null){while(this.features.length>0){var feature=this.features[0];OpenLayers.Util.removeItem(this.features,feature);feature.destroy();}}},CLASS_NAME:"OpenLayers.Layer.GeoRSS"});OpenLayers.Layer.Google=OpenLayers.Class(OpenLayers.Layer.EventPane,OpenLayers.Layer.FixedZoomLevels,{MIN_ZOOM_LEVEL:0,MAX_ZOOM_LEVEL:19,RESOLUTIONS:[1.40625,0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125,0.00002145767211914062,0.00001072883605957031,0.00000536441802978515,0.00000268220901489257],type:null,sphericalMercator:false,dragObject:null,initialize:function(name,options){OpenLayers.Layer.EventPane.prototype.initialize.apply(this,arguments);OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,arguments);this.addContainerPxFunction();if(this.sphericalMercator){OpenLayers.Util.extend(this,OpenLayers.Layer.SphericalMercator);this.initMercatorParameters();}},loadMapObject:function(){try{this.mapObject=new GMap2(this.div);if(typeof this.mapObject.getDragObject=="function"){this.dragObject=this.mapObject.getDragObject();}else{this.dragPanMapObject=null;}
-var poweredBy=this.div.lastChild;this.div.removeChild(poweredBy);this.pane.appendChild(poweredBy);poweredBy.className="olLayerGooglePoweredBy gmnoprint";poweredBy.style.left="";poweredBy.style.bottom="";var termsOfUse=this.div.lastChild;this.div.removeChild(termsOfUse);this.pane.appendChild(termsOfUse);termsOfUse.className="olLayerGoogleCopyright";termsOfUse.style.right="";termsOfUse.style.bottom="";}catch(e){OpenLayers.Console.error(e);}},setMap:function(map){OpenLayers.Layer.EventPane.prototype.setMap.apply(this,arguments);if(this.type!=null){this.map.events.register("moveend",this,this.setMapType);}},setMapType:function(){if(this.mapObject.getCenter()!=null){if(OpenLayers.Util.indexOf(this.mapObject.getMapTypes(),this.type)==-1){this.mapObject.addMapType(this.type);}
-this.mapObject.setMapType(this.type);this.map.events.unregister("moveend",this,this.setMapType);}},onMapResize:function(){this.mapObject.checkResize();},getOLBoundsFromMapObjectBounds:function(moBounds){var olBounds=null;if(moBounds!=null){var sw=moBounds.getSouthWest();var ne=moBounds.getNorthEast();if(this.sphericalMercator){sw=this.forwardMercator(sw.lng(),sw.lat());ne=this.forwardMercator(ne.lng(),ne.lat());}else{sw=new OpenLayers.LonLat(sw.lng(),sw.lat());ne=new OpenLayers.LonLat(ne.lng(),ne.lat());}
+return resolution;}},getExtent:function(){var size=this.map.getSize();var tl=this.getLonLatFromViewPortPx({x:0,y:0});var br=this.getLonLatFromViewPortPx({x:size.w,y:size.h});if((tl!=null)&&(br!=null)){return new OpenLayers.Bounds(tl.lon,br.lat,br.lon,tl.lat);}else{return null;}},getZoomForResolution:function(resolution){if(this.resolutions!=null){return OpenLayers.Layer.prototype.getZoomForResolution.apply(this,arguments);}else{var extent=OpenLayers.Layer.prototype.getExtent.apply(this,[]);return this.getZoomForExtent(extent);}},getOLZoomFromMapObjectZoom:function(moZoom){var zoom=null;if(moZoom!=null){zoom=moZoom-this.minZoomLevel;if(this.map.baseLayer!==this){zoom=this.map.baseLayer.getZoomForResolution(this.getResolutionForZoom(zoom));}}
+return zoom;},getMapObjectZoomFromOLZoom:function(olZoom){var zoom=null;if(olZoom!=null){zoom=olZoom+this.minZoomLevel;if(this.map.baseLayer!==this){zoom=this.getZoomForResolution(this.map.baseLayer.getResolutionForZoom(zoom));}}
+return zoom;},CLASS_NAME:"OpenLayers.Layer.FixedZoomLevels"});OpenLayers.Layer.Google=OpenLayers.Class(OpenLayers.Layer.EventPane,OpenLayers.Layer.FixedZoomLevels,{MIN_ZOOM_LEVEL:0,MAX_ZOOM_LEVEL:21,RESOLUTIONS:[1.40625,0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125,0.00002145767211914062,0.00001072883605957031,0.00000536441802978515,0.00000268220901489257,0.0000013411045074462891,0.00000067055225372314453],type:null,wrapDateLine:true,sphericalMercator:false,version:null,initialize:function(name,options){options=options||{};if(!options.version){options.version=typeof GMap2==="function"?"2":"3";}
+var mixin=OpenLayers.Layer.Google["v"+
+options.version.replace(/\./g,"_")];if(mixin){OpenLayers.Util.applyDefaults(options,mixin);}else{throw"Unsupported Google Maps API version: "+options.version;}
+OpenLayers.Util.applyDefaults(options,mixin.DEFAULTS);if(options.maxExtent){options.maxExtent=options.maxExtent.clone();}
+OpenLayers.Layer.EventPane.prototype.initialize.apply(this,[name,options]);OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,[name,options]);if(this.sphericalMercator){OpenLayers.Util.extend(this,OpenLayers.Layer.SphericalMercator);this.initMercatorParameters();}},clone:function(){return new OpenLayers.Layer.Google(this.name,this.getOptions());},setVisibility:function(visible){var opacity=this.opacity==null?1:this.opacity;OpenLayers.Layer.EventPane.prototype.setVisibility.apply(this,arguments);this.setOpacity(opacity);},display:function(visible){if(!this._dragging){this.setGMapVisibility(visible);}
+OpenLayers.Layer.EventPane.prototype.display.apply(this,arguments);},moveTo:function(bounds,zoomChanged,dragging){this._dragging=dragging;OpenLayers.Layer.EventPane.prototype.moveTo.apply(this,arguments);delete this._dragging;},setOpacity:function(opacity){if(opacity!==this.opacity){if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"});}
+this.opacity=opacity;}
+if(this.getVisibility()){var container=this.getMapContainer();OpenLayers.Util.modifyDOMElement(container,null,null,null,null,null,null,opacity);}},destroy:function(){if(this.map){this.setGMapVisibility(false);var cache=OpenLayers.Layer.Google.cache[this.map.id];if(cache&&cache.count<=1){this.removeGMapElements();}}
+OpenLayers.Layer.EventPane.prototype.destroy.apply(this,arguments);},removeGMapElements:function(){var cache=OpenLayers.Layer.Google.cache[this.map.id];if(cache){var container=this.mapObject&&this.getMapContainer();if(container&&container.parentNode){container.parentNode.removeChild(container);}
+var termsOfUse=cache.termsOfUse;if(termsOfUse&&termsOfUse.parentNode){termsOfUse.parentNode.removeChild(termsOfUse);}
+var poweredBy=cache.poweredBy;if(poweredBy&&poweredBy.parentNode){poweredBy.parentNode.removeChild(poweredBy);}}},removeMap:function(map){if(this.visibility&&this.mapObject){this.setGMapVisibility(false);}
+var cache=OpenLayers.Layer.Google.cache[map.id];if(cache){if(cache.count<=1){this.removeGMapElements();delete OpenLayers.Layer.Google.cache[map.id];}else{--cache.count;}}
+delete this.termsOfUse;delete this.poweredBy;delete this.mapObject;delete this.dragObject;OpenLayers.Layer.EventPane.prototype.removeMap.apply(this,arguments);},getOLBoundsFromMapObjectBounds:function(moBounds){var olBounds=null;if(moBounds!=null){var sw=moBounds.getSouthWest();var ne=moBounds.getNorthEast();if(this.sphericalMercator){sw=this.forwardMercator(sw.lng(),sw.lat());ne=this.forwardMercator(ne.lng(),ne.lat());}else{sw=new OpenLayers.LonLat(sw.lng(),sw.lat());ne=new OpenLayers.LonLat(ne.lng(),ne.lat());}
olBounds=new OpenLayers.Bounds(sw.lon,sw.lat,ne.lon,ne.lat);}
-return olBounds;},getMapObjectBoundsFromOLBounds:function(olBounds){var moBounds=null;if(olBounds!=null){var sw=this.sphericalMercator?this.inverseMercator(olBounds.bottom,olBounds.left):new OpenLayers.LonLat(olBounds.bottom,olBounds.left);var ne=this.sphericalMercator?this.inverseMercator(olBounds.top,olBounds.right):new OpenLayers.LonLat(olBounds.top,olBounds.right);moBounds=new GLatLngBounds(new GLatLng(sw.lat,sw.lon),new GLatLng(ne.lat,ne.lon));}
-return moBounds;},addContainerPxFunction:function(){if((typeof GMap2!="undefined")&&!GMap2.prototype.fromLatLngToContainerPixel){GMap2.prototype.fromLatLngToContainerPixel=function(gLatLng){var gPoint=this.fromLatLngToDivPixel(gLatLng);var div=this.getContainer().firstChild.firstChild;gPoint.x+=div.offsetLeft;gPoint.y+=div.offsetTop;return gPoint;};}},getWarningHTML:function(){return OpenLayers.i18n("googleWarning");},setMapObjectCenter:function(center,zoom){this.mapObject.setCenter(center,zoom);},dragPanMapObject:function(dX,dY){this.dragObject.moveBy(new GSize(-dX,dY));},getMapObjectCenter:function(){return this.mapObject.getCenter();},getMapObjectZoom:function(){return this.mapObject.getZoom();},getMapObjectLonLatFromMapObjectPixel:function(moPixel){return this.mapObject.fromContainerPixelToLatLng(moPixel);},getMapObjectPixelFromMapObjectLonLat:function(moLonLat){return this.mapObject.fromLatLngToContainerPixel(moLonLat);},getMapObjectZoomFromMapObjectBounds:function(moBounds){return this.mapObject.getBoundsZoomLevel(moBounds);},getLongitudeFromMapObjectLonLat:function(moLonLat){return this.sphericalMercator?this.forwardMercator(moLonLat.lng(),moLonLat.lat()).lon:moLonLat.lng();},getLatitudeFromMapObjectLonLat:function(moLonLat){var lat=this.sphericalMercator?this.forwardMercator(moLonLat.lng(),moLonLat.lat()).lat:moLonLat.lat();return lat;},getMapObjectLonLatFromLonLat:function(lon,lat){var gLatLng;if(this.sphericalMercator){var lonlat=this.inverseMercator(lon,lat);gLatLng=new GLatLng(lonlat.lat,lonlat.lon);}else{gLatLng=new GLatLng(lat,lon);}
-return gLatLng;},getXFromMapObjectPixel:function(moPixel){return moPixel.x;},getYFromMapObjectPixel:function(moPixel){return moPixel.y;},getMapObjectPixelFromXY:function(x,y){return new GPoint(x,y);},CLASS_NAME:"OpenLayers.Layer.Google"});OpenLayers.Layer.Grid=OpenLayers.Class(OpenLayers.Layer.HTTPRequest,{tileSize:null,grid:null,singleTile:false,ratio:1.5,buffer:2,numLoadingTiles:0,initialize:function(name,url,params,options){OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,arguments);this.events.addEventType("tileloaded");this.grid=[];},destroy:function(){this.clearGrid();this.grid=null;this.tileSize=null;OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this,arguments);},clearGrid:function(){if(this.grid){for(var iRow=0;iRow<this.grid.length;iRow++){var row=this.grid[iRow];for(var iCol=0;iCol<row.length;iCol++){var tile=row[iCol];this.removeTileMonitoringHooks(tile);tile.destroy();}}
-this.grid=[];}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Grid(this.name,this.url,this.params,this.options);}
-obj=OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this,[obj]);if(this.tileSize!=null){obj.tileSize=this.tileSize.clone();}
-obj.grid=[];return obj;},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);bounds=bounds||this.map.getExtent();if(bounds!=null){var forceReTile=!this.grid.length||zoomChanged;var tilesBounds=this.getTilesBounds();if(this.singleTile){if(forceReTile||(!dragging&&!tilesBounds.containsBounds(bounds))){this.initSingleTile(bounds);}}else{if(forceReTile||!tilesBounds.containsBounds(bounds,true)){this.initGriddedTiles(bounds);}else{this.moveGriddedTiles(bounds);}}}},setTileSize:function(size){if(this.singleTile){size=this.map.getSize().clone();size.h=parseInt(size.h*this.ratio);size.w=parseInt(size.w*this.ratio);}
-OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this,[size]);},getGridBounds:function(){var msg="The getGridBounds() function is deprecated. It will be "+"removed in 3.0. Please use getTilesBounds() instead.";OpenLayers.Console.warn(msg);return this.getTilesBounds();},getTilesBounds:function(){var bounds=null;if(this.grid.length){var bottom=this.grid.length-1;var bottomLeftTile=this.grid[bottom][0];var right=this.grid[0].length-1;var topRightTile=this.grid[0][right];bounds=new OpenLayers.Bounds(bottomLeftTile.bounds.left,bottomLeftTile.bounds.bottom,topRightTile.bounds.right,topRightTile.bounds.top);}
-return bounds;},initSingleTile:function(bounds){var center=bounds.getCenterLonLat();var tileWidth=bounds.getWidth()*this.ratio;var tileHeight=bounds.getHeight()*this.ratio;var tileBounds=new OpenLayers.Bounds(center.lon-(tileWidth/2),center.lat-(tileHeight/2),center.lon+(tileWidth/2),center.lat+(tileHeight/2));var ul=new OpenLayers.LonLat(tileBounds.left,tileBounds.top);var px=this.map.getLayerPxFromLonLat(ul);if(!this.grid.length){this.grid[0]=[];}
-var tile=this.grid[0][0];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);tile.draw();this.grid[0][0]=tile;}else{tile.moveTo(tileBounds,px);}
-this.removeExcessTiles(1,1);},calculateGridLayout:function(bounds,extent,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left-extent.left;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=extent.left+tilecol*tilelon;var offsetlat=bounds.top-(extent.bottom+tilelat);var tilerow=Math.ceil(offsetlat/tilelat)+this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=-tilerowremain*this.tileSize.h;var tileoffsetlat=extent.bottom+tilerow*tilelat;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},initGriddedTiles:function(bounds){var viewSize=this.map.getSize();var minRows=Math.ceil(viewSize.h/this.tileSize.h)+
-Math.max(1,2*this.buffer);var minCols=Math.ceil(viewSize.w/this.tileSize.w)+
-Math.max(1,2*this.buffer);var extent=this.map.getMaxExtent();var resolution=this.map.getResolution();var tileLayout=this.calculateGridLayout(bounds,extent,resolution);var tileoffsetx=Math.round(tileLayout.tileoffsetx);var tileoffsety=Math.round(tileLayout.tileoffsety);var tileoffsetlon=tileLayout.tileoffsetlon;var tileoffsetlat=tileLayout.tileoffsetlat;var tilelon=tileLayout.tilelon;var tilelat=tileLayout.tilelat;this.origin=new OpenLayers.Pixel(tileoffsetx,tileoffsety);var startX=tileoffsetx;var startLon=tileoffsetlon;var rowidx=0;var layerContainerDivLeft=parseInt(this.map.layerContainerDiv.style.left);var layerContainerDivTop=parseInt(this.map.layerContainerDiv.style.top);do{var row=this.grid[rowidx++];if(!row){row=[];this.grid.push(row);}
-tileoffsetlon=startLon;tileoffsetx=startX;var colidx=0;do{var tileBounds=new OpenLayers.Bounds(tileoffsetlon,tileoffsetlat,tileoffsetlon+tilelon,tileoffsetlat+tilelat);var x=tileoffsetx;x-=layerContainerDivLeft;var y=tileoffsety;y-=layerContainerDivTop;var px=new OpenLayers.Pixel(x,y);var tile=row[colidx++];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);row.push(tile);}else{tile.moveTo(tileBounds,px,false);}
-tileoffsetlon+=tilelon;tileoffsetx+=this.tileSize.w;}while((tileoffsetlon<=bounds.right+tilelon*this.buffer)||colidx<minCols)
-tileoffsetlat-=tilelat;tileoffsety+=this.tileSize.h;}while((tileoffsetlat>=bounds.bottom-tilelat*this.buffer)||rowidx<minRows)
-this.removeExcessTiles(rowidx,colidx);this.spiralTileLoad();},spiralTileLoad:function(){var tileQueue=[];var directions=["right","down","left","up"];var iRow=0;var iCell=-1;var direction=OpenLayers.Util.indexOf(directions,"right");var directionsTried=0;while(directionsTried<directions.length){var testRow=iRow;var testCell=iCell;switch(directions[direction]){case"right":testCell++;break;case"down":testRow++;break;case"left":testCell--;break;case"up":testRow--;break;}
-var tile=null;if((testRow<this.grid.length)&&(testRow>=0)&&(testCell<this.grid[0].length)&&(testCell>=0)){tile=this.grid[testRow][testCell];}
-if((tile!=null)&&(!tile.queued)){tileQueue.unshift(tile);tile.queued=true;directionsTried=0;iRow=testRow;iCell=testCell;}else{direction=(direction+1)%4;directionsTried++;}}
-for(var i=0;i<tileQueue.length;i++){var tile=tileQueue[i];tile.draw();tile.queued=false;}},addTile:function(bounds,position){},addTileMonitoringHooks:function(tile){tile.onLoadStart=function(){if(this.numLoadingTiles==0){this.events.triggerEvent("loadstart");}
-this.numLoadingTiles++;};tile.events.register("loadstart",this,tile.onLoadStart);tile.onLoadEnd=function(){this.numLoadingTiles--;this.events.triggerEvent("tileloaded");if(this.numLoadingTiles==0){this.events.triggerEvent("loadend");}};tile.events.register("loadend",this,tile.onLoadEnd);tile.events.register("unload",this,tile.onLoadEnd);},removeTileMonitoringHooks:function(tile){tile.unload();tile.events.un({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,scope:this});},moveGriddedTiles:function(bounds){var buffer=this.buffer||1;while(true){var tlLayer=this.grid[0][0].position;var tlViewPort=this.map.getViewPortPxFromLayerPx(tlLayer);if(tlViewPort.x>-this.tileSize.w*(buffer-1)){this.shiftColumn(true);}else if(tlViewPort.x<-this.tileSize.w*buffer){this.shiftColumn(false);}else if(tlViewPort.y>-this.tileSize.h*(buffer-1)){this.shiftRow(true);}else if(tlViewPort.y<-this.tileSize.h*buffer){this.shiftRow(false);}else{break;}};},shiftRow:function(prepend){var modelRowIndex=(prepend)?0:(this.grid.length-1);var grid=this.grid;var modelRow=grid[modelRowIndex];var resolution=this.map.getResolution();var deltaY=(prepend)?-this.tileSize.h:this.tileSize.h;var deltaLat=resolution*-deltaY;var row=(prepend)?grid.pop():grid.shift();for(var i=0;i<modelRow.length;i++){var modelTile=modelRow[i];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.bottom=bounds.bottom+deltaLat;bounds.top=bounds.top+deltaLat;position.y=position.y+deltaY;row[i].moveTo(bounds,position);}
-if(prepend){grid.unshift(row);}else{grid.push(row);}},shiftColumn:function(prepend){var deltaX=(prepend)?-this.tileSize.w:this.tileSize.w;var resolution=this.map.getResolution();var deltaLon=resolution*deltaX;for(var i=0;i<this.grid.length;i++){var row=this.grid[i];var modelTileIndex=(prepend)?0:(row.length-1);var modelTile=row[modelTileIndex];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.left=bounds.left+deltaLon;bounds.right=bounds.right+deltaLon;position.x=position.x+deltaX;var tile=prepend?this.grid[i].pop():this.grid[i].shift();tile.moveTo(bounds,position);if(prepend){row.unshift(tile);}else{row.push(tile);}}},removeExcessTiles:function(rows,columns){while(this.grid.length>rows){var row=this.grid.pop();for(var i=0,l=row.length;i<l;i++){var tile=row[i];this.removeTileMonitoringHooks(tile);tile.destroy();}}
-while(this.grid[0].length>columns){for(var i=0,l=this.grid.length;i<l;i++){var row=this.grid[i];var tile=row.pop();this.removeTileMonitoringHooks(tile);tile.destroy();}}},onMapResize:function(){if(this.singleTile){this.clearGrid();this.setTileSize();}},getTileBounds:function(viewPortPx){var maxExtent=this.map.getMaxExtent();var resolution=this.getResolution();var tileMapWidth=resolution*this.tileSize.w;var tileMapHeight=resolution*this.tileSize.h;var mapPoint=this.getLonLatFromViewPortPx(viewPortPx);var tileLeft=maxExtent.left+(tileMapWidth*Math.floor((mapPoint.lon-
-maxExtent.left)/tileMapWidth));var tileBottom=maxExtent.bottom+(tileMapHeight*Math.floor((mapPoint.lat-
-maxExtent.bottom)/tileMapHeight));return new OpenLayers.Bounds(tileLeft,tileBottom,tileLeft+tileMapWidth,tileBottom+tileMapHeight);},CLASS_NAME:"OpenLayers.Layer.Grid"});OpenLayers.Layer.MultiMap=OpenLayers.Class(OpenLayers.Layer.EventPane,OpenLayers.Layer.FixedZoomLevels,{MIN_ZOOM_LEVEL:1,MAX_ZOOM_LEVEL:17,RESOLUTIONS:[9,1.40625,0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125],type:null,initialize:function(name,options){OpenLayers.Layer.EventPane.prototype.initialize.apply(this,arguments);OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,arguments);if(this.sphericalMercator){OpenLayers.Util.extend(this,OpenLayers.Layer.SphericalMercator);this.initMercatorParameters();this.RESOLUTIONS.unshift(10);}},loadMapObject:function(){try{this.mapObject=new MultimapViewer(this.div);}catch(e){}},getWarningHTML:function(){return OpenLayers.i18n("getLayerWarning",{'layerType':"MM",'layerLib':"MultiMap"});},setMapObjectCenter:function(center,zoom){this.mapObject.goToPosition(center,zoom);},getMapObjectCenter:function(){return this.mapObject.getCurrentPosition();},getMapObjectZoom:function(){return this.mapObject.getZoomFactor();},getMapObjectLonLatFromMapObjectPixel:function(moPixel){moPixel.x=moPixel.x-(this.map.getSize().w/2);moPixel.y=moPixel.y-(this.map.getSize().h/2);return this.mapObject.getMapPositionAt(moPixel);},getMapObjectPixelFromMapObjectLonLat:function(moLonLat){return this.mapObject.geoPosToContainerPixels(moLonLat);},getLongitudeFromMapObjectLonLat:function(moLonLat){return this.sphericalMercator?this.forwardMercator(moLonLat.lon,moLonLat.lat).lon:moLonLat.lon;},getLatitudeFromMapObjectLonLat:function(moLonLat){return this.sphericalMercator?this.forwardMercator(moLonLat.lon,moLonLat.lat).lat:moLonLat.lat;},getMapObjectLonLatFromLonLat:function(lon,lat){var mmLatLon;if(this.sphericalMercator){var lonlat=this.inverseMercator(lon,lat);mmLatLon=new MMLatLon(lonlat.lat,lonlat.lon);}else{mmLatLon=new MMLatLon(lat,lon);}
-return mmLatLon;},getXFromMapObjectPixel:function(moPixel){return moPixel.x;},getYFromMapObjectPixel:function(moPixel){return moPixel.y;},getMapObjectPixelFromXY:function(x,y){return new MMPoint(x,y);},CLASS_NAME:"OpenLayers.Layer.MultiMap"});OpenLayers.Layer.Text=OpenLayers.Class(OpenLayers.Layer.Markers,{location:null,features:null,formatOptions:null,selectedFeature:null,initialize:function(name,options){OpenLayers.Layer.Markers.prototype.initialize.apply(this,arguments);this.features=new Array();},destroy:function(){OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);this.clearFeatures();this.features=null;},loadText:function(){if(!this.loaded){if(this.location!=null){var onFail=function(e){this.events.triggerEvent("loadend");};this.events.triggerEvent("loadstart");OpenLayers.loadURL(this.location,null,this,this.parseData,onFail);this.loaded=true;}}},moveTo:function(bounds,zoomChanged,minor){OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);if(this.visibility&&!this.loaded){this.events.triggerEvent("loadstart");this.loadText();}},parseData:function(ajaxRequest){var text=ajaxRequest.responseText;var options={};OpenLayers.Util.extend(options,this.formatOptions);if(this.map&&!this.projection.equals(this.map.getProjectionObject())){options.externalProjection=this.projection;options.internalProjection=this.map.getProjectionObject();}
-var parser=new OpenLayers.Format.Text(options);features=parser.read(text);for(var i=0;i<features.length;i++){var data={};var feature=features[i];var location;var iconSize,iconOffset;location=new OpenLayers.LonLat(feature.geometry.x,feature.geometry.y);if(feature.style.graphicWidth&&feature.style.graphicHeight){iconSize=new OpenLayers.Size(feature.style.graphicWidth,feature.style.graphicHeight);}
-if(feature.style.graphicXOffset&&feature.style.graphicYOffset){iconOffset=new OpenLayers.Pixel(feature.style.graphicXOffset,feature.style.graphicYOffset);}
-if(feature.style.externalGraphic!=null){data.icon=new OpenLayers.Icon(feature.style.externalGraphic,iconSize,iconOffset);}else{data.icon=OpenLayers.Marker.defaultIcon();if(iconSize!=null){data.icon.setSize(iconSize);}}
-if((feature.attributes.title!=null)&&(feature.attributes.description!=null)){data['popupContentHTML']='<h2>'+feature.attributes.title+'</h2>'+'<p>'+feature.attributes.description+'</p>';}
-data['overflow']=feature.attributes.overflow||"auto";var markerFeature=new OpenLayers.Feature(this,location,data);this.features.push(markerFeature);var marker=markerFeature.createMarker();if((feature.attributes.title!=null)&&(feature.attributes.description!=null)){marker.events.register('click',markerFeature,this.markerClick);}
-this.addMarker(marker);}
-this.events.triggerEvent("loadend");},markerClick:function(evt){var sameMarkerClicked=(this==this.layer.selectedFeature);this.layer.selectedFeature=(!sameMarkerClicked)?this:null;for(var i=0;i<this.layer.map.popups.length;i++){this.layer.map.removePopup(this.layer.map.popups[i]);}
-if(!sameMarkerClicked){this.layer.map.addPopup(this.createPopup());}
-OpenLayers.Event.stop(evt);},clearFeatures:function(){if(this.features!=null){while(this.features.length>0){var feature=this.features[0];OpenLayers.Util.removeItem(this.features,feature);feature.destroy();}}},CLASS_NAME:"OpenLayers.Layer.Text"});OpenLayers.Layer.VirtualEarth=OpenLayers.Class(OpenLayers.Layer.EventPane,OpenLayers.Layer.FixedZoomLevels,{MIN_ZOOM_LEVEL:1,MAX_ZOOM_LEVEL:17,RESOLUTIONS:[1.40625,0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125],type:null,sphericalMercator:false,initialize:function(name,options){OpenLayers.Layer.EventPane.prototype.initialize.apply(this,arguments);OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,arguments);if(this.sphericalMercator){OpenLayers.Util.extend(this,OpenLayers.Layer.SphericalMercator);this.initMercatorParameters();}},loadMapObject:function(){var veDiv=OpenLayers.Util.createDiv(this.name);var sz=this.map.getSize();veDiv.style.width=sz.w;veDiv.style.height=sz.h;this.div.appendChild(veDiv);try{this.mapObject=new VEMap(this.name);}catch(e){}
-if(this.mapObject!=null){try{this.mapObject.LoadMap(null,null,this.type,true);this.mapObject.AttachEvent("onmousedown",function(){return true;});}catch(e){}
-this.mapObject.HideDashboard();}
-if(!this.mapObject||!this.mapObject.vemapcontrol||!this.mapObject.vemapcontrol.PanMap||(typeof this.mapObject.vemapcontrol.PanMap!="function")){this.dragPanMapObject=null;}},getWarningHTML:function(){return OpenLayers.i18n("getLayerWarning",{'layerType':'VE','layerLib':'VirtualEarth'});},setMapObjectCenter:function(center,zoom){this.mapObject.SetCenterAndZoom(center,zoom);},getMapObjectCenter:function(){return this.mapObject.GetCenter();},dragPanMapObject:function(dX,dY){this.mapObject.vemapcontrol.PanMap(dX,-dY);},getMapObjectZoom:function(){return this.mapObject.GetZoomLevel();},getMapObjectLonLatFromMapObjectPixel:function(moPixel){return this.mapObject.PixelToLatLong(moPixel.x,moPixel.y);},getMapObjectPixelFromMapObjectLonLat:function(moLonLat){return this.mapObject.LatLongToPixel(moLonLat);},getLongitudeFromMapObjectLonLat:function(moLonLat){return this.sphericalMercator?this.forwardMercator(moLonLat.Longitude,moLonLat.Latitude).lon:moLonLat.Longitude;},getLatitudeFromMapObjectLonLat:function(moLonLat){return this.sphericalMercator?this.forwardMercator(moLonLat.Longitude,moLonLat.Latitude).lat:moLonLat.Latitude;},getMapObjectLonLatFromLonLat:function(lon,lat){var veLatLong;if(this.sphericalMercator){var lonlat=this.inverseMercator(lon,lat);veLatLong=new VELatLong(lonlat.lat,lonlat.lon);}else{veLatLong=new VELatLong(lat,lon);}
-return veLatLong;},getXFromMapObjectPixel:function(moPixel){return moPixel.x;},getYFromMapObjectPixel:function(moPixel){return moPixel.y;},getMapObjectPixelFromXY:function(x,y){return new Msn.VE.Pixel(x,y);},CLASS_NAME:"OpenLayers.Layer.VirtualEarth"});OpenLayers.Layer.Yahoo=OpenLayers.Class(OpenLayers.Layer.EventPane,OpenLayers.Layer.FixedZoomLevels,{MIN_ZOOM_LEVEL:0,MAX_ZOOM_LEVEL:15,RESOLUTIONS:[1.40625,0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125],type:null,sphericalMercator:false,initialize:function(name,options){OpenLayers.Layer.EventPane.prototype.initialize.apply(this,arguments);OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,arguments);if(this.sphericalMercator){OpenLayers.Util.extend(this,OpenLayers.Layer.SphericalMercator);this.initMercatorParameters();}},loadMapObject:function(){try{var size=this.getMapObjectSizeFromOLSize(this.map.getSize());this.mapObject=new YMap(this.div,this.type,size);this.mapObject.disableKeyControls();this.mapObject.disableDragMap();if(!this.mapObject.moveByXY||(typeof this.mapObject.moveByXY!="function")){this.dragPanMapObject=null;}}catch(e){}},onMapResize:function(){try{var size=this.getMapObjectSizeFromOLSize(this.map.getSize());this.mapObject.resizeTo(size);}catch(e){}},setMap:function(map){OpenLayers.Layer.EventPane.prototype.setMap.apply(this,arguments);this.map.events.register("moveend",this,this.fixYahooEventPane);},fixYahooEventPane:function(){var yahooEventPane=OpenLayers.Util.getElement("ygddfdiv");if(yahooEventPane!=null){if(yahooEventPane.parentNode!=null){yahooEventPane.parentNode.removeChild(yahooEventPane);}
-this.map.events.unregister("moveend",this,this.fixYahooEventPane);}},getWarningHTML:function(){return OpenLayers.i18n("getLayerWarning",{'layerType':'Yahoo','layerLib':'Yahoo'});},getOLZoomFromMapObjectZoom:function(moZoom){var zoom=null;if(moZoom!=null){zoom=OpenLayers.Layer.FixedZoomLevels.prototype.getOLZoomFromMapObjectZoom.apply(this,[moZoom]);zoom=18-zoom;}
-return zoom;},getMapObjectZoomFromOLZoom:function(olZoom){var zoom=null;if(olZoom!=null){zoom=OpenLayers.Layer.FixedZoomLevels.prototype.getMapObjectZoomFromOLZoom.apply(this,[olZoom]);zoom=18-zoom;}
-return zoom;},setMapObjectCenter:function(center,zoom){this.mapObject.drawZoomAndCenter(center,zoom);},getMapObjectCenter:function(){return this.mapObject.getCenterLatLon();},dragPanMapObject:function(dX,dY){this.mapObject.moveByXY({'x':-dX,'y':dY});},getMapObjectZoom:function(){return this.mapObject.getZoomLevel();},getMapObjectLonLatFromMapObjectPixel:function(moPixel){return this.mapObject.convertXYLatLon(moPixel);},getMapObjectPixelFromMapObjectLonLat:function(moLonLat){return this.mapObject.convertLatLonXY(moLonLat);},getLongitudeFromMapObjectLonLat:function(moLonLat){return this.sphericalMercator?this.forwardMercator(moLonLat.Lon,moLonLat.Lat).lon:moLonLat.Lon;},getLatitudeFromMapObjectLonLat:function(moLonLat){return this.sphericalMercator?this.forwardMercator(moLonLat.Lon,moLonLat.Lat).lat:moLonLat.Lat;},getMapObjectLonLatFromLonLat:function(lon,lat){var yLatLong;if(this.sphericalMercator){var lonlat=this.inverseMercator(lon,lat);yLatLong=new YGeoPoint(lonlat.lat,lonlat.lon);}else{yLatLong=new YGeoPoint(lat,lon);}
-return yLatLong;},getXFromMapObjectPixel:function(moPixel){return moPixel.x;},getYFromMapObjectPixel:function(moPixel){return moPixel.y;},getMapObjectPixelFromXY:function(x,y){return new YCoordPoint(x,y);},getMapObjectSizeFromOLSize:function(olSize){return new YSize(olSize.w,olSize.h);},CLASS_NAME:"OpenLayers.Layer.Yahoo"});OpenLayers.Style=OpenLayers.Class({name:null,title:null,description:null,layerName:null,isDefault:false,rules:null,context:null,defaultStyle:null,propertyStyles:null,initialize:function(style,options){this.rules=[];this.setDefaultStyle(style||OpenLayers.Feature.Vector.style["default"]);OpenLayers.Util.extend(this,options);},destroy:function(){for(var i=0;i<this.rules.length;i++){this.rules[i].destroy();this.rules[i]=null;}
-this.rules=null;this.defaultStyle=null;},createSymbolizer:function(feature){var style=this.createLiterals(OpenLayers.Util.extend({},this.defaultStyle),feature);var rules=this.rules;var rule,context;var elseRules=[];var appliedRules=false;for(var i=0;i<rules.length;i++){rule=rules[i];var applies=rule.evaluate(feature);if(applies){if(rule instanceof OpenLayers.Rule&&rule.elseFilter){elseRules.push(rule);}else{appliedRules=true;this.applySymbolizer(rule,style,feature);}}}
-if(appliedRules==false&&elseRules.length>0){appliedRules=true;for(var i=0;i<elseRules.length;i++){this.applySymbolizer(elseRules[i],style,feature);}}
-if(rules.length>0&&appliedRules==false){style.display="none";}else{style.display="";}
-return style;},applySymbolizer:function(rule,style,feature){var symbolizerPrefix=feature.geometry?this.getSymbolizerPrefix(feature.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];var symbolizer=rule.symbolizer[symbolizerPrefix]||rule.symbolizer;return this.createLiterals(OpenLayers.Util.extend(style,symbolizer),feature);},createLiterals:function(style,feature){var context=this.context||feature.attributes||feature.data;for(var i in this.propertyStyles){style[i]=OpenLayers.Style.createLiteral(style[i],context,feature);}
-return style;},findPropertyStyles:function(){var propertyStyles={};var style=this.defaultStyle;this.addPropertyStyles(propertyStyles,style);var rules=this.rules;var symbolizer,value;for(var i=0;i<rules.length;i++){var symbolizer=rules[i].symbolizer;for(var key in symbolizer){value=symbolizer[key];if(typeof value=="object"){this.addPropertyStyles(propertyStyles,value);}else{this.addPropertyStyles(propertyStyles,symbolizer);break;}}}
+return olBounds;},getWarningHTML:function(){return OpenLayers.i18n("googleWarning");},getMapObjectCenter:function(){return this.mapObject.getCenter();},getMapObjectZoom:function(){return this.mapObject.getZoom();},getLongitudeFromMapObjectLonLat:function(moLonLat){return this.sphericalMercator?this.forwardMercator(moLonLat.lng(),moLonLat.lat()).lon:moLonLat.lng();},getLatitudeFromMapObjectLonLat:function(moLonLat){var lat=this.sphericalMercator?this.forwardMercator(moLonLat.lng(),moLonLat.lat()).lat:moLonLat.lat();return lat;},getXFromMapObjectPixel:function(moPixel){return moPixel.x;},getYFromMapObjectPixel:function(moPixel){return moPixel.y;},CLASS_NAME:"OpenLayers.Layer.Google"});OpenLayers.Layer.Google.cache={};OpenLayers.Layer.Google.v2={termsOfUse:null,poweredBy:null,dragObject:null,loadMapObject:function(){if(!this.type){this.type=G_NORMAL_MAP;}
+var mapObject,termsOfUse,poweredBy;var cache=OpenLayers.Layer.Google.cache[this.map.id];if(cache){mapObject=cache.mapObject;termsOfUse=cache.termsOfUse;poweredBy=cache.poweredBy;++cache.count;}else{var container=this.map.viewPortDiv;var div=document.createElement("div");div.id=this.map.id+"_GMap2Container";div.style.position="absolute";div.style.width="100%";div.style.height="100%";container.appendChild(div);try{mapObject=new GMap2(div);termsOfUse=div.lastChild;container.appendChild(termsOfUse);termsOfUse.style.zIndex="1100";termsOfUse.style.right="";termsOfUse.style.bottom="";termsOfUse.className="olLayerGoogleCopyright";poweredBy=div.lastChild;container.appendChild(poweredBy);poweredBy.style.zIndex="1100";poweredBy.style.right="";poweredBy.style.bottom="";poweredBy.className="olLayerGooglePoweredBy gmnoprint";}catch(e){throw(e);}
+OpenLayers.Layer.Google.cache[this.map.id]={mapObject:mapObject,termsOfUse:termsOfUse,poweredBy:poweredBy,count:1};}
+this.mapObject=mapObject;this.termsOfUse=termsOfUse;this.poweredBy=poweredBy;if(OpenLayers.Util.indexOf(this.mapObject.getMapTypes(),this.type)===-1){this.mapObject.addMapType(this.type);}
+if(typeof mapObject.getDragObject=="function"){this.dragObject=mapObject.getDragObject();}else{this.dragPanMapObject=null;}
+if(this.isBaseLayer===false){this.setGMapVisibility(this.div.style.display!=="none");}},onMapResize:function(){if(this.visibility&&this.mapObject.isLoaded()){this.mapObject.checkResize();}else{if(!this._resized){var layer=this;var handle=GEvent.addListener(this.mapObject,"load",function(){GEvent.removeListener(handle);delete layer._resized;layer.mapObject.checkResize();layer.moveTo(layer.map.getCenter(),layer.map.getZoom());});}
+this._resized=true;}},setGMapVisibility:function(visible){var cache=OpenLayers.Layer.Google.cache[this.map.id];if(cache){var container=this.mapObject.getContainer();if(visible===true){this.mapObject.setMapType(this.type);container.style.display="";this.termsOfUse.style.left="";this.termsOfUse.style.display="";this.poweredBy.style.display="";cache.displayed=this.id;}else{if(cache.displayed===this.id){delete cache.displayed;}
+if(!cache.displayed){container.style.display="none";this.termsOfUse.style.display="none";this.termsOfUse.style.left="-9999px";this.poweredBy.style.display="none";}}}},getMapContainer:function(){return this.mapObject.getContainer();},getMapObjectBoundsFromOLBounds:function(olBounds){var moBounds=null;if(olBounds!=null){var sw=this.sphericalMercator?this.inverseMercator(olBounds.bottom,olBounds.left):new OpenLayers.LonLat(olBounds.bottom,olBounds.left);var ne=this.sphericalMercator?this.inverseMercator(olBounds.top,olBounds.right):new OpenLayers.LonLat(olBounds.top,olBounds.right);moBounds=new GLatLngBounds(new GLatLng(sw.lat,sw.lon),new GLatLng(ne.lat,ne.lon));}
+return moBounds;},setMapObjectCenter:function(center,zoom){this.mapObject.setCenter(center,zoom);},dragPanMapObject:function(dX,dY){this.dragObject.moveBy(new GSize(-dX,dY));},getMapObjectLonLatFromMapObjectPixel:function(moPixel){return this.mapObject.fromContainerPixelToLatLng(moPixel);},getMapObjectPixelFromMapObjectLonLat:function(moLonLat){return this.mapObject.fromLatLngToContainerPixel(moLonLat);},getMapObjectZoomFromMapObjectBounds:function(moBounds){return this.mapObject.getBoundsZoomLevel(moBounds);},getMapObjectLonLatFromLonLat:function(lon,lat){var gLatLng;if(this.sphericalMercator){var lonlat=this.inverseMercator(lon,lat);gLatLng=new GLatLng(lonlat.lat,lonlat.lon);}else{gLatLng=new GLatLng(lat,lon);}
+return gLatLng;},getMapObjectPixelFromXY:function(x,y){return new GPoint(x,y);}};OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(layer,lonlat,data){this.layer=layer;this.lonlat=lonlat;this.data=(data!=null)?data:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup);}}
+if(this.layer!=null&&this.marker!=null){this.layer.removeMarker(this.marker);}
+this.layer=null;this.id=null;this.lonlat=null;this.data=null;if(this.marker!=null){this.destroyMarker(this.marker);this.marker=null;}
+if(this.popup!=null){this.destroyPopup(this.popup);this.popup=null;}},onScreen:function(){var onScreen=false;if((this.layer!=null)&&(this.layer.map!=null)){var screenBounds=this.layer.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);}
+return onScreen;},createMarker:function(){if(this.lonlat!=null){this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon);}
+return this.marker;},destroyMarker:function(){this.marker.destroy();},createPopup:function(closeBox){if(this.lonlat!=null){if(!this.popup){var anchor=(this.marker)?this.marker.icon:null;var popupClass=this.popupClass?this.popupClass:OpenLayers.Popup.Anchored;this.popup=new popupClass(this.id+"_popup",this.lonlat,this.data.popupSize,this.data.popupContentHTML,anchor,closeBox);}
+if(this.data.overflow!=null){this.popup.contentDiv.style.overflow=this.data.overflow;}
+this.popup.feature=this;}
+return this.popup;},destroyPopup:function(){if(this.popup){this.popup.feature=null;this.popup.destroy();this.popup=null;}},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.State={UNKNOWN:'Unknown',INSERT:'Insert',UPDATE:'Update',DELETE:'Delete'};OpenLayers.Feature.Vector=OpenLayers.Class(OpenLayers.Feature,{fid:null,geometry:null,attributes:null,bounds:null,state:null,style:null,url:null,renderIntent:"default",modified:null,initialize:function(geometry,attributes,style){OpenLayers.Feature.prototype.initialize.apply(this,[null,null,attributes]);this.lonlat=null;this.geometry=geometry?geometry:null;this.state=null;this.attributes={};if(attributes){this.attributes=OpenLayers.Util.extend(this.attributes,attributes);}
+this.style=style?style:null;},destroy:function(){if(this.layer){this.layer.removeFeatures(this);this.layer=null;}
+this.geometry=null;this.modified=null;OpenLayers.Feature.prototype.destroy.apply(this,arguments);},clone:function(){return new OpenLayers.Feature.Vector(this.geometry?this.geometry.clone():null,this.attributes,this.style);},onScreen:function(boundsOnly){var onScreen=false;if(this.layer&&this.layer.map){var screenBounds=this.layer.map.getExtent();if(boundsOnly){var featureBounds=this.geometry.getBounds();onScreen=screenBounds.intersectsBounds(featureBounds);}else{var screenPoly=screenBounds.toGeometry();onScreen=screenPoly.intersects(this.geometry);}}
+return onScreen;},getVisibility:function(){return!(this.style&&this.style.display=='none'||!this.layer||this.layer&&this.layer.styleMap&&this.layer.styleMap.createSymbolizer(this,this.renderIntent).display=='none'||this.layer&&!this.layer.getVisibility());},createMarker:function(){return null;},destroyMarker:function(){},createPopup:function(){return null;},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;if(this.geometry){atPoint=this.geometry.atPoint(lonlat,toleranceLon,toleranceLat);}
+return atPoint;},destroyPopup:function(){},move:function(location){if(!this.layer||!this.geometry.move){return undefined;}
+var pixel;if(location.CLASS_NAME=="OpenLayers.LonLat"){pixel=this.layer.getViewPortPxFromLonLat(location);}else{pixel=location;}
+var lastPixel=this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat());var res=this.layer.map.getResolution();this.geometry.move(res*(pixel.x-lastPixel.x),res*(lastPixel.y-pixel.y));this.layer.drawFeature(this);return lastPixel;},toState:function(state){if(state==OpenLayers.State.UPDATE){switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=state;break;case OpenLayers.State.UPDATE:case OpenLayers.State.INSERT:break;}}else if(state==OpenLayers.State.INSERT){switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=state;break;}}else if(state==OpenLayers.State.DELETE){switch(this.state){case OpenLayers.State.INSERT:break;case OpenLayers.State.DELETE:break;case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=state;break;}}else if(state==OpenLayers.State.UNKNOWN){this.state=state;}},CLASS_NAME:"OpenLayers.Feature.Vector"});OpenLayers.Feature.Vector.style={'default':{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},'select':{fillColor:"blue",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},'temporary':{fillColor:"#66cccc",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#66cccc",strokeOpacity:1,strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},'delete':{display:"none"}};OpenLayers.Style=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:false,rules:null,context:null,defaultStyle:null,defaultsPerSymbolizer:false,propertyStyles:null,initialize:function(style,options){OpenLayers.Util.extend(this,options);this.rules=[];if(options&&options.rules){this.addRules(options.rules);}
+this.setDefaultStyle(style||OpenLayers.Feature.Vector.style["default"]);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){for(var i=0,len=this.rules.length;i<len;i++){this.rules[i].destroy();this.rules[i]=null;}
+this.rules=null;this.defaultStyle=null;},createSymbolizer:function(feature){var style=this.defaultsPerSymbolizer?{}:this.createLiterals(OpenLayers.Util.extend({},this.defaultStyle),feature);var rules=this.rules;var rule,context;var elseRules=[];var appliedRules=false;for(var i=0,len=rules.length;i<len;i++){rule=rules[i];var applies=rule.evaluate(feature);if(applies){if(rule instanceof OpenLayers.Rule&&rule.elseFilter){elseRules.push(rule);}else{appliedRules=true;this.applySymbolizer(rule,style,feature);}}}
+if(appliedRules==false&&elseRules.length>0){appliedRules=true;for(var i=0,len=elseRules.length;i<len;i++){this.applySymbolizer(elseRules[i],style,feature);}}
+if(rules.length>0&&appliedRules==false){style.display="none";}
+if(style.label!=null&&typeof style.label!=="string"){style.label=String(style.label);}
+return style;},applySymbolizer:function(rule,style,feature){var symbolizerPrefix=feature.geometry?this.getSymbolizerPrefix(feature.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];var symbolizer=rule.symbolizer[symbolizerPrefix]||rule.symbolizer;if(this.defaultsPerSymbolizer===true){var defaults=this.defaultStyle;OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:defaults.pointRadius});if(symbolizer.stroke===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{strokeWidth:defaults.strokeWidth,strokeColor:defaults.strokeColor,strokeOpacity:defaults.strokeOpacity,strokeDashstyle:defaults.strokeDashstyle,strokeLinecap:defaults.strokeLinecap});}
+if(symbolizer.fill===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{fillColor:defaults.fillColor,fillOpacity:defaults.fillOpacity});}
+if(symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:this.defaultStyle.pointRadius,externalGraphic:this.defaultStyle.externalGraphic,graphicName:this.defaultStyle.graphicName,graphicOpacity:this.defaultStyle.graphicOpacity,graphicWidth:this.defaultStyle.graphicWidth,graphicHeight:this.defaultStyle.graphicHeight,graphicXOffset:this.defaultStyle.graphicXOffset,graphicYOffset:this.defaultStyle.graphicYOffset});}}
+return this.createLiterals(OpenLayers.Util.extend(style,symbolizer),feature);},createLiterals:function(style,feature){var context=OpenLayers.Util.extend({},feature.attributes||feature.data);OpenLayers.Util.extend(context,this.context);for(var i in this.propertyStyles){style[i]=OpenLayers.Style.createLiteral(style[i],context,feature,i);}
+return style;},findPropertyStyles:function(){var propertyStyles={};var style=this.defaultStyle;this.addPropertyStyles(propertyStyles,style);var rules=this.rules;var symbolizer,value;for(var i=0,len=rules.length;i<len;i++){symbolizer=rules[i].symbolizer;for(var key in symbolizer){value=symbolizer[key];if(typeof value=="object"){this.addPropertyStyles(propertyStyles,value);}else{this.addPropertyStyles(propertyStyles,symbolizer);break;}}}
return propertyStyles;},addPropertyStyles:function(propertyStyles,symbolizer){var property;for(var key in symbolizer){property=symbolizer[key];if(typeof property=="string"&&property.match(/\$\{\w+\}/)){propertyStyles[key]=true;}}
-return propertyStyles;},addRules:function(rules){this.rules=this.rules.concat(rules);this.propertyStyles=this.findPropertyStyles();},setDefaultStyle:function(style){this.defaultStyle=style;this.propertyStyles=this.findPropertyStyles();},getSymbolizerPrefix:function(geometry){var prefixes=OpenLayers.Style.SYMBOLIZER_PREFIXES;for(var i=0;i<prefixes.length;i++){if(geometry.CLASS_NAME.indexOf(prefixes[i])!=-1){return prefixes[i];}}},CLASS_NAME:"OpenLayers.Style"});OpenLayers.Style.createLiteral=function(value,context,feature){if(typeof value=="string"&&value.indexOf("${")!=-1){value=OpenLayers.String.format(value,context,[feature]);value=(isNaN(value)||!value)?value:parseFloat(value);}
-return value;};OpenLayers.Style.SYMBOLIZER_PREFIXES=['Point','Line','Polygon'];OpenLayers.Control.ModifyFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,clickout:true,toggle:true,layer:null,feature:null,vertices:null,virtualVertices:null,selectControl:null,dragControl:null,handlers:null,deleteCodes:null,virtualStyle:null,mode:null,radiusHandle:null,dragHandle:null,onModificationStart:function(){},onModification:function(){},onModificationEnd:function(){},initialize:function(layer,options){this.layer=layer;this.vertices=[];this.virtualVertices=[];this.virtualStyle=OpenLayers.Util.extend({},this.layer.style||this.layer.styleMap.createSymbolizer());this.virtualStyle.fillOpacity=0.3;this.virtualStyle.strokeOpacity=0.3;this.deleteCodes=[46,100];this.mode=OpenLayers.Control.ModifyFeature.RESHAPE;OpenLayers.Control.prototype.initialize.apply(this,[options]);if(!(this.deleteCodes instanceof Array)){this.deleteCodes=[this.deleteCodes];}
-var control=this;var selectOptions={geometryTypes:this.geometryTypes,clickout:this.clickout,toggle:this.toggle};this.selectControl=new OpenLayers.Control.SelectFeature(layer,selectOptions);this.layer.events.on({"featureselected":this.selectFeature,"featureunselected":this.unselectFeature,scope:this});var dragOptions={geometryTypes:["OpenLayers.Geometry.Point"],snappingOptions:this.snappingOptions,onStart:function(feature,pixel){control.dragStart.apply(control,[feature,pixel]);},onDrag:function(feature){control.dragVertex.apply(control,[feature]);},onComplete:function(feature){control.dragComplete.apply(control,[feature]);}};this.dragControl=new OpenLayers.Control.DragFeature(layer,dragOptions);var keyboardOptions={keypress:this.handleKeypress};this.handlers={keyboard:new OpenLayers.Handler.Keyboard(this,keyboardOptions)};},destroy:function(){this.layer.events.un({"featureselected":this.selectFeature,"featureunselected":this.unselectFeature,scope:this});this.layer=null;this.selectControl.destroy();this.dragControl.destroy();OpenLayers.Control.prototype.destroy.apply(this,[]);},activate:function(){return(this.selectControl.activate()&&this.handlers.keyboard.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments));},deactivate:function(){var deactivated=false;if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){this.layer.removeFeatures(this.vertices);this.layer.removeFeatures(this.virtualVertices);this.vertices=[];this.dragControl.deactivate();if(this.feature&&this.feature.geometry){this.selectControl.unselect.apply(this.selectControl,[this.feature]);}
-this.selectControl.deactivate();this.handlers.keyboard.deactivate();deactivated=true;}
-return deactivated;},selectFeature:function(object){this.feature=object.feature;this.resetVertices();this.dragControl.activate();this.onModificationStart(this.feature);this.layer.events.triggerEvent("beforefeaturemodified",{feature:this.feature});},unselectFeature:function(object){this.layer.removeFeatures(this.vertices);this.vertices=[];this.layer.destroyFeatures(this.virtualVertices);this.virtualVertices=[];if(this.dragHandle){this.layer.destroyFeatures([this.dragHandle]);delete this.dragHandle;}
-if(this.radiusHandle){this.layer.destroyFeatures([this.radiusHandle]);delete this.radiusHandle;}
-this.feature=null;this.dragControl.deactivate();this.onModificationEnd(object.feature);this.layer.events.triggerEvent("afterfeaturemodified",{feature:object.feature});},dragStart:function(feature,pixel){if(feature!=this.feature&&!feature.geometry.parent&&feature!=this.dragHandle&&feature!=this.radiusHandle){if(this.feature){this.selectControl.clickFeature.apply(this.selectControl,[this.feature]);}
-if(this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)!=-1){this.selectControl.clickFeature.apply(this.selectControl,[feature]);this.dragControl.overFeature.apply(this.dragControl,[feature]);this.dragControl.lastPixel=pixel;this.dragControl.handlers.drag.started=true;this.dragControl.handlers.drag.start=pixel;this.dragControl.handlers.drag.last=pixel;}}},dragVertex:function(vertex){if(this.feature.geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){if(this.feature!=vertex){this.feature=vertex;}}else{if(vertex._index){vertex.geometry.parent.addComponent(vertex.geometry,vertex._index);delete vertex._index;OpenLayers.Util.removeItem(this.virtualVertices,vertex);this.vertices.push(vertex);}else if(vertex==this.dragHandle){this.layer.removeFeatures(this.vertices);this.vertices=[];if(this.radiusHandle){this.layer.destroyFeatures([this.radiusHandle]);this.radiusHandle=null;}}
-if(this.virtualVertices.length>0){this.layer.destroyFeatures(this.virtualVertices);this.virtualVertices=[];}
-this.layer.drawFeature(this.feature,this.selectControl.renderIntent);}
-this.layer.drawFeature(vertex);},dragComplete:function(vertex){this.resetVertices();this.onModification(this.feature);this.layer.events.triggerEvent("featuremodified",{feature:this.feature});},resetVertices:function(){if(this.dragControl.feature){this.dragControl.outFeature(this.dragControl.feature);}
-if(this.vertices.length>0){this.layer.removeFeatures(this.vertices);this.vertices=[];}
-if(this.virtualVertices.length>0){this.layer.removeFeatures(this.virtualVertices);this.virtualVertices=[];}
-if(this.dragHandle){this.layer.destroyFeatures([this.dragHandle]);this.dragHandle=null;}
-if(this.radiusHandle){this.layer.destroyFeatures([this.radiusHandle]);this.radiusHandle=null;}
-if(this.feature&&this.feature.geometry.CLASS_NAME!="OpenLayers.Geometry.Point"){if((this.mode&OpenLayers.Control.ModifyFeature.DRAG)){this.collectDragHandle();}
-if((this.mode&(OpenLayers.Control.ModifyFeature.ROTATE|OpenLayers.Control.ModifyFeature.RESIZE))){this.collectRadiusHandle();}
-if((this.mode&OpenLayers.Control.ModifyFeature.RESHAPE)){this.collectVertices();}}},handleKeypress:function(code){if(this.feature&&OpenLayers.Util.indexOf(this.deleteCodes,code)!=-1){var vertex=this.dragControl.feature;if(vertex&&OpenLayers.Util.indexOf(this.vertices,vertex)!=-1&&!this.dragControl.handlers.drag.dragging&&vertex.geometry.parent){vertex.geometry.parent.removeComponent(vertex.geometry);this.layer.drawFeature(this.feature,this.selectControl.renderIntent);this.resetVertices();this.onModification(this.feature);this.layer.events.triggerEvent("featuremodified",{feature:this.feature});}}},collectVertices:function(){this.vertices=[];this.virtualVertices=[];var control=this;function collectComponentVertices(geometry){var i,vertex,component;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){vertex=new OpenLayers.Feature.Vector(geometry);control.vertices.push(vertex);}else{var numVert=geometry.components.length;if(geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){numVert-=1;}
-for(i=0;i<numVert;++i){component=geometry.components[i];if(component.CLASS_NAME=="OpenLayers.Geometry.Point"){vertex=new OpenLayers.Feature.Vector(component);control.vertices.push(vertex);}else{collectComponentVertices(component);}}
-if(geometry.CLASS_NAME!="OpenLayers.Geometry.MultiPoint"){for(i=0;i<geometry.components.length-1;++i){var prevVertex=geometry.components[i];var nextVertex=geometry.components[i+1];if(prevVertex.CLASS_NAME=="OpenLayers.Geometry.Point"&&nextVertex.CLASS_NAME=="OpenLayers.Geometry.Point"){var x=(prevVertex.x+nextVertex.x)/2;var y=(prevVertex.y+nextVertex.y)/2;var point=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(x,y),null,control.virtualStyle);point.geometry.parent=geometry;point._index=i+1;control.virtualVertices.push(point);}}}}}
-collectComponentVertices.call(this,this.feature.geometry);this.layer.addFeatures(this.vertices,{silent:true});this.layer.addFeatures(this.virtualVertices,{silent:true});},collectDragHandle:function(){var geometry=this.feature.geometry;var center=geometry.getBounds().getCenterLonLat();var originGeometry=new OpenLayers.Geometry.Point(center.lon,center.lat);var origin=new OpenLayers.Feature.Vector(originGeometry);originGeometry.move=function(x,y){OpenLayers.Geometry.Point.prototype.move.call(this,x,y);geometry.move(x,y);};this.dragHandle=origin;this.layer.addFeatures([this.dragHandle],{silent:true});},collectRadiusHandle:function(){var geometry=this.feature.geometry;var bounds=geometry.getBounds();var center=bounds.getCenterLonLat();var originGeometry=new OpenLayers.Geometry.Point(center.lon,center.lat);var radiusGeometry=new OpenLayers.Geometry.Point(bounds.right,bounds.bottom);var radius=new OpenLayers.Feature.Vector(radiusGeometry);var resize=(this.mode&OpenLayers.Control.ModifyFeature.RESIZE);var rotate=(this.mode&OpenLayers.Control.ModifyFeature.ROTATE);radiusGeometry.move=function(x,y){OpenLayers.Geometry.Point.prototype.move.call(this,x,y);var dx1=this.x-originGeometry.x;var dy1=this.y-originGeometry.y;var dx0=dx1-x;var dy0=dy1-y;if(rotate){var a0=Math.atan2(dy0,dx0);var a1=Math.atan2(dy1,dx1);var angle=a1-a0;angle*=180/Math.PI;geometry.rotate(angle,originGeometry);}
-if(resize){var l0=Math.sqrt((dx0*dx0)+(dy0*dy0));var l1=Math.sqrt((dx1*dx1)+(dy1*dy1));geometry.resize(l1/l0,originGeometry);}};this.radiusHandle=radius;this.layer.addFeatures([this.radiusHandle],{silent:true});},setMap:function(map){this.selectControl.setMap(map);this.dragControl.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.ModifyFeature"});OpenLayers.Control.ModifyFeature.RESHAPE=1;OpenLayers.Control.ModifyFeature.RESIZE=2;OpenLayers.Control.ModifyFeature.ROTATE=4;OpenLayers.Control.ModifyFeature.DRAG=8;OpenLayers.Control.Navigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,zoomBox:null,zoomWheelEnabled:true,initialize:function(options){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){this.deactivate();if(this.dragPan){this.dragPan.destroy();}
-this.dragPan=null;if(this.zoomBox){this.zoomBox.destroy();}
-this.zoomBox=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},activate:function(){this.dragPan.activate();if(this.zoomWheelEnabled){this.handlers.wheel.activate();}
-this.handlers.click.activate();this.zoomBox.activate();return OpenLayers.Control.prototype.activate.apply(this,arguments);},deactivate:function(){this.zoomBox.deactivate();this.dragPan.deactivate();this.handlers.click.deactivate();this.handlers.wheel.deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},draw:function(){this.handlers.click=new OpenLayers.Handler.Click(this,{'dblclick':this.defaultDblClick},{'double':true,'stopDouble':true});this.dragPan=new OpenLayers.Control.DragPan({map:this.map});this.zoomBox=new OpenLayers.Control.ZoomBox({map:this.map,keyMask:OpenLayers.Handler.MOD_SHIFT});this.dragPan.draw();this.zoomBox.draw();this.handlers.wheel=new OpenLayers.Handler.MouseWheel(this,{"up":this.wheelUp,"down":this.wheelDown});this.activate();},defaultDblClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom+1);},wheelChange:function(evt,deltaZ){var newZoom=this.map.getZoom()+deltaZ;if(!this.map.isValidZoomLevel(newZoom)){return;}
-var size=this.map.getSize();var deltaX=size.w/2-evt.xy.x;var deltaY=evt.xy.y-size.h/2;var newRes=this.map.baseLayer.getResolutionForZoom(newZoom);var zoomPoint=this.map.getLonLatFromPixel(evt.xy);var newCenter=new OpenLayers.LonLat(zoomPoint.lon+deltaX*newRes,zoomPoint.lat+deltaY*newRes);this.map.setCenter(newCenter,newZoom);},wheelUp:function(evt){this.wheelChange(evt,1);},wheelDown:function(evt){this.wheelChange(evt,-1);},disableZoomWheel:function(){this.zoomWheelEnabled=false;this.handlers.wheel.deactivate();},enableZoomWheel:function(){this.zoomWheelEnabled=true;if(this.active){this.handlers.wheel.activate();}},CLASS_NAME:"OpenLayers.Control.Navigation"});OpenLayers.Filter=OpenLayers.Class({initialize:function(options){OpenLayers.Util.extend(this,options);},destroy:function(){},evaluate:function(context){return true;},CLASS_NAME:"OpenLayers.Filter"});OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){this.id=null;this.bounds=null;},clone:function(){return new OpenLayers.Geometry();},setBounds:function(bounds){if(bounds){this.bounds=bounds.clone();}},clearBounds:function(){this.bounds=null;if(this.parent){this.parent.clearBounds();}},extendBounds:function(newBounds){var bounds=this.getBounds();if(!bounds){this.setBounds(newBounds);}else{this.bounds.extend(newBounds);}},getBounds:function(){if(this.bounds==null){this.calculateBounds();}
-return this.bounds;},calculateBounds:function(){},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;var bounds=this.getBounds();if((bounds!=null)&&(lonlat!=null)){var dX=(toleranceLon!=null)?toleranceLon:0;var dY=(toleranceLat!=null)?toleranceLat:0;var toleranceBounds=new OpenLayers.Bounds(this.bounds.left-dX,this.bounds.bottom-dY,this.bounds.right+dX,this.bounds.top+dY);atPoint=toleranceBounds.containsLonLat(lonlat);}
-return atPoint;},getLength:function(){return 0.0;},getArea:function(){return 0.0;},toString:function(){return OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this));},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.segmentsIntersect=function(seg1,seg2,point){var intersection=false;var x11_21=seg1.x1-seg2.x1;var y11_21=seg1.y1-seg2.y1;var x12_11=seg1.x2-seg1.x1;var y12_11=seg1.y2-seg1.y1;var y22_21=seg2.y2-seg2.y1;var x22_21=seg2.x2-seg2.x1;var d=(y22_21*x12_11)-(x22_21*y12_11);var n1=(x22_21*y11_21)-(y22_21*x11_21);var n2=(x12_11*y11_21)-(y12_11*x11_21);if(d==0){if(n1==0&&n2==0){intersection=true;}}else{var along1=n1/d;var along2=n2/d;if(along1>=0&&along1<=1&&along2>=0&&along2<=1){if(!point){intersection=true;}else{var x=seg1.x1+(along1*x12_11);var y=seg1.y1+(along1*y12_11);intersection=new OpenLayers.Geometry.Point(x,y);}}}
-return intersection;};OpenLayers.Layer.KaMap=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,units:null,resolution:OpenLayers.DOTS_PER_INCH,DEFAULT_PARAMS:{i:'jpeg',map:''},initialize:function(name,url,params,options){var newArguments=[];newArguments.push(name,url,params,options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);this.params=(params?params:{});if(params){OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS);}},getURL:function(bounds){bounds=this.adjustBounds(bounds);var mapRes=this.map.getResolution();var scale=Math.round((this.map.getScale()*10000))/10000;var pX=Math.round(bounds.left/mapRes);var pY=-Math.round(bounds.top/mapRes);return this.getFullRequestString({t:pY,l:pX,s:scale});},addTile:function(bounds,position){var url=this.getURL(bounds);return new OpenLayers.Tile.Image(this,position,bounds,url,this.tileSize);},calculateGridLayout:function(bounds,extent,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=tilecol*tilelon;var offsetlat=bounds.top;var tilerow=Math.ceil(offsetlat/tilelat)+this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=-(tilerowremain+1)*this.tileSize.h;var tileoffsetlat=tilerow*tilelat;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.KaMap(this.name,this.url,this.params,this.options);}
-obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);if(this.tileSize!=null){obj.tileSize=this.tileSize.clone();}
-obj.grid=[];return obj;},getTileBounds:function(viewPortPx){var resolution=this.getResolution();var tileMapWidth=resolution*this.tileSize.w;var tileMapHeight=resolution*this.tileSize.h;var mapPoint=this.getLonLatFromViewPortPx(viewPortPx);var tileLeft=tileMapWidth*Math.floor(mapPoint.lon/tileMapWidth);var tileBottom=tileMapHeight*Math.floor(mapPoint.lat/tileMapHeight);return new OpenLayers.Bounds(tileLeft,tileBottom,tileLeft+tileMapWidth,tileBottom+tileMapHeight);},CLASS_NAME:"OpenLayers.Layer.KaMap"});OpenLayers.Layer.MapGuide=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,singleTile:false,TILE_PARAMS:{operation:'GETTILEIMAGE',version:'1.2.0'},SINGLE_TILE_PARAMS:{operation:'GETMAPIMAGE',format:'PNG',locale:'en',clip:'1',version:'1.0.0'},defaultSize:new OpenLayers.Size(300,300),initialize:function(name,url,params,options){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);if(options==null||options.isBaseLayer==null){this.isBaseLayer=((this.transparent!="true")&&(this.transparent!=true));}
-if(this.singleTile){OpenLayers.Util.applyDefaults(this.params,this.SINGLE_TILE_PARAMS);}else{OpenLayers.Util.applyDefaults(this.params,this.TILE_PARAMS);this.setTileSize(this.defaultSize);}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.MapGuide(this.name,this.url,this.params,this.options);}
-obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},addTile:function(bounds,position){return new OpenLayers.Tile.Image(this,position,bounds,null,this.tileSize);},getURL:function(bounds){var url;var center=bounds.getCenterLonLat();var mapSize=this.map.getCurrentSize();if(this.singleTile){var params={};params.setdisplaydpi=OpenLayers.DOTS_PER_INCH;params.setdisplayheight=mapSize.h*this.ratio;params.setdisplaywidth=mapSize.w*this.ratio;params.setviewcenterx=center.lon;params.setviewcentery=center.lat;params.setviewscale=this.map.getScale();if(!this.isBaseLayer){this.params.operation="GETDYNAMICMAPOVERLAYIMAGE";var getVisParams={};getVisParams.operation="GETVISIBLEMAPEXTENT";getVisParams.version="1.0.0";getVisParams.session=this.params.session;getVisParams.mapName=this.params.mapName;getVisParams.format='text/xml';getVisParams=OpenLayers.Util.extend(getVisParams,params);new OpenLayers.Ajax.Request(this.url,{parameters:getVisParams,method:'get',asynchronous:false});}
-url=this.getFullRequestString(params);}else{var currentRes=this.map.getResolution();var colidx=Math.floor((bounds.left-this.maxExtent.left)/currentRes);colidx=Math.round(colidx/this.tileSize.w);var rowidx=Math.floor((this.maxExtent.top-bounds.top)/currentRes);rowidx=Math.round(rowidx/this.tileSize.h);url=this.getFullRequestString({tilecol:colidx,tilerow:rowidx,scaleindex:this.resolutions.length-this.map.zoom-1});}
-return url;},getFullRequestString:function(newParams,altUrl){var url=(altUrl==null)?this.url:altUrl;if(typeof url=="object"){url=url[Math.floor(Math.random()*url.length)];}
-var requestString=url;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getArgs(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}}
-var paramsString=OpenLayers.Util.getParameterString(allParams);paramsString=paramsString.replace(/,/g,"+");if(paramsString!=""){var lastServerChar=url.charAt(url.length-1);if((lastServerChar=="&")||(lastServerChar=="?")){requestString+=paramsString;}else{if(url.indexOf('?')==-1){requestString+='?'+paramsString;}else{requestString+='&'+paramsString;}}}
-return requestString;},calculateGridLayout:function(bounds,extent,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left-extent.left;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=extent.left+tilecol*tilelon;var offsetlat=extent.top-bounds.top+tilelat;var tilerow=Math.floor(offsetlat/tilelat)-this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=tilerowremain*this.tileSize.h;var tileoffsetlat=extent.top-tilelat*tilerow;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},CLASS_NAME:"OpenLayers.Layer.MapGuide"});OpenLayers.Layer.MapServer=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{mode:"map",map_imagetype:"png"},initialize:function(name,url,params,options){var newArguments=[];newArguments.push(name,url,params,options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);if(arguments.length>0){OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS);}
-if(options==null||options.isBaseLayer==null){this.isBaseLayer=((this.params.transparent!="true")&&(this.params.transparent!=true));}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.MapServer(this.name,this.url,this.params,this.options);}
-obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},addTile:function(bounds,position){return new OpenLayers.Tile.Image(this,position,bounds,null,this.tileSize);},getURL:function(bounds){bounds=this.adjustBounds(bounds);var extent=[bounds.left,bounds.bottom,bounds.right,bounds.top];var imageSize=this.getImageSize();var url=this.getFullRequestString({mapext:extent,imgext:extent,map_size:[imageSize.w,imageSize.h],imgx:imageSize.w/2,imgy:imageSize.h/2,imgxy:[imageSize.w,imageSize.h]});return url;},getFullRequestString:function(newParams,altUrl){var url=(altUrl==null)?this.url:altUrl;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var paramsString=OpenLayers.Util.getParameterString(allParams);if(url instanceof Array){url=this.selectUrl(paramsString,url);}
-var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}}
-paramsString=OpenLayers.Util.getParameterString(allParams);var requestString=url;paramsString=paramsString.replace(/,/g,"+");if(paramsString!=""){var lastServerChar=url.charAt(url.length-1);if((lastServerChar=="&")||(lastServerChar=="?")){requestString+=paramsString;}else{if(url.indexOf('?')==-1){requestString+='?'+paramsString;}else{requestString+='&'+paramsString;}}}
-return requestString;},CLASS_NAME:"OpenLayers.Layer.MapServer"});OpenLayers.Layer.TMS=OpenLayers.Class(OpenLayers.Layer.Grid,{serviceVersion:"1.0.0",isBaseLayer:true,tileOrigin:null,initialize:function(name,url,options){var newArguments=[];newArguments.push(name,url,{},options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.TMS(this.name,this.url,this.options);}
-obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){bounds=this.adjustBounds(bounds);var res=this.map.getResolution();var x=Math.round((bounds.left-this.tileOrigin.lon)/(res*this.tileSize.w));var y=Math.round((bounds.bottom-this.tileOrigin.lat)/(res*this.tileSize.h));var z=this.map.getZoom();var path=this.serviceVersion+"/"+this.layername+"/"+z+"/"+x+"/"+y+"."+this.type;var url=this.url;if(url instanceof Array){url=this.selectUrl(path,url);}
-return url+path;},addTile:function(bounds,position){return new OpenLayers.Tile.Image(this,position,bounds,null,this.tileSize);},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,this.map.maxExtent.bottom);}},CLASS_NAME:"OpenLayers.Layer.TMS"});OpenLayers.Layer.TileCache=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,tileOrigin:null,format:'image/png',initialize:function(name,url,layername,options){this.layername=layername;OpenLayers.Layer.Grid.prototype.initialize.apply(this,[name,url,{},options]);this.extension=this.format.split('/')[1].toLowerCase();this.extension=(this.extension=='jpg')?'jpeg':this.extension;},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.TileCache(this.name,this.url,this.layername,this.options);}
-obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){var res=this.map.getResolution();var bbox=this.maxExtent;var size=this.tileSize;var tileX=Math.round((bounds.left-bbox.left)/(res*size.w));var tileY=Math.round((bounds.bottom-bbox.bottom)/(res*size.h));var tileZ=this.map.zoom;function zeroPad(number,length){number=String(number);var zeros=[];for(var i=0;i<length;++i){zeros.push('0');}
-return zeros.join('').substring(0,length-number.length)+number;}
-var components=[this.layername,zeroPad(tileZ,2),zeroPad(parseInt(tileX/1000000),3),zeroPad((parseInt(tileX/1000)%1000),3),zeroPad((parseInt(tileX)%1000),3),zeroPad(parseInt(tileY/1000000),3),zeroPad((parseInt(tileY/1000)%1000),3),zeroPad((parseInt(tileY)%1000),3)+'.'+this.extension];var path=components.join('/');var url=this.url;if(url instanceof Array){url=this.selectUrl(path,url);}
-url=(url.charAt(url.length-1)=='/')?url:url+'/';return url+path;},addTile:function(bounds,position){var url=this.getURL(bounds);return new OpenLayers.Tile.Image(this,position,bounds,url,this.tileSize);},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,this.map.maxExtent.bottom);}},CLASS_NAME:"OpenLayers.Layer.TileCache"});OpenLayers.Layer.WMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{service:"WMS",version:"1.1.1",request:"GetMap",styles:"",exceptions:"application/vnd.ogc.se_inimage",format:"image/jpeg"},reproject:false,isBaseLayer:true,encodeBBOX:false,initialize:function(name,url,params,options){var newArguments=[];params=OpenLayers.Util.upperCaseObject(params);newArguments.push(name,url,params,options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));if(this.params.TRANSPARENT&&this.params.TRANSPARENT.toString().toLowerCase()=="true"){if((options==null)||(!options.isBaseLayer)){this.isBaseLayer=false;}
-if(this.params.FORMAT=="image/jpeg"){this.params.FORMAT=OpenLayers.Util.alphaHack()?"image/gif":"image/png";}}},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.WMS(this.name,this.url,this.params,this.options);}
-obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){bounds=this.adjustBounds(bounds);var imageSize=this.getImageSize();var newParams={'BBOX':this.encodeBBOX?bounds.toBBOX():bounds.toArray(),'WIDTH':imageSize.w,'HEIGHT':imageSize.h};var requestString=this.getFullRequestString(newParams);return requestString;},addTile:function(bounds,position){return new OpenLayers.Tile.Image(this,position,bounds,null,this.tileSize);},mergeNewParams:function(newParams){var upperParams=OpenLayers.Util.upperCaseObject(newParams);var newArguments=[upperParams];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,newArguments);},getFullRequestString:function(newParams,altUrl){var projectionCode=this.map.getProjection();this.params.SRS=(projectionCode=="none")?null:projectionCode;return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,arguments);},CLASS_NAME:"OpenLayers.Layer.WMS"});OpenLayers.Layer.WorldWind=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{},isBaseLayer:true,lzd:null,zoomLevels:null,initialize:function(name,url,lzd,zoomLevels,params,options){this.lzd=lzd;this.zoomLevels=zoomLevels;var newArguments=[];newArguments.push(name,url,params,options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);this.params=(params?params:{});if(params){OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS);}},addTile:function(bounds,position){return new OpenLayers.Tile.Image(this,position,bounds,null,this.tileSize);},getZoom:function(){var zoom=this.map.getZoom();var extent=this.map.getMaxExtent();zoom=zoom-Math.log(this.maxResolution/(this.lzd/512))/Math.log(2);return zoom;},getURL:function(bounds){bounds=this.adjustBounds(bounds);var zoom=this.getZoom();var extent=this.map.getMaxExtent();var deg=this.lzd/Math.pow(2,this.getZoom());var x=Math.floor((bounds.left-extent.left)/deg);var y=Math.floor((bounds.bottom-extent.bottom)/deg);if(this.map.getResolution()<=(this.lzd/512)&&this.getZoom()<=this.zoomLevels){return this.getFullRequestString({L:zoom,X:x,Y:y});}else{return OpenLayers.Util.getImagesLocation()+"blank.gif";}},CLASS_NAME:"OpenLayers.Layer.WorldWind"});OpenLayers.Rule=OpenLayers.Class({id:null,name:'default',title:null,description:null,context:null,filter:null,elseFilter:false,symbolizer:null,minScaleDenominator:null,maxScaleDenominator:null,initialize:function(options){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");this.symbolizer={};OpenLayers.Util.extend(this,options);},destroy:function(){for(var i in this.symbolizer){this.symbolizer[i]=null;}
-this.symbolizer=null;},evaluate:function(feature){var context=this.getContext(feature);var applies=true;if(this.minScaleDenominator||this.maxScaleDenominator){var scale=feature.layer.map.getScale();}
+return propertyStyles;},addRules:function(rules){Array.prototype.push.apply(this.rules,rules);this.propertyStyles=this.findPropertyStyles();},setDefaultStyle:function(style){this.defaultStyle=style;this.propertyStyles=this.findPropertyStyles();},getSymbolizerPrefix:function(geometry){var prefixes=OpenLayers.Style.SYMBOLIZER_PREFIXES;for(var i=0,len=prefixes.length;i<len;i++){if(geometry.CLASS_NAME.indexOf(prefixes[i])!=-1){return prefixes[i];}}},clone:function(){var options=OpenLayers.Util.extend({},this);if(this.rules){options.rules=[];for(var i=0,len=this.rules.length;i<len;++i){options.rules.push(this.rules[i].clone());}}
+options.context=this.context&&OpenLayers.Util.extend({},this.context);var defaultStyle=OpenLayers.Util.extend({},this.defaultStyle);return new OpenLayers.Style(defaultStyle,options);},CLASS_NAME:"OpenLayers.Style"});OpenLayers.Style.createLiteral=function(value,context,feature,property){if(typeof value=="string"&&value.indexOf("${")!=-1){value=OpenLayers.String.format(value,context,[feature,property]);value=(isNaN(value)||!value)?value:parseFloat(value);}
+return value;};OpenLayers.Style.SYMBOLIZER_PREFIXES=['Point','Line','Polygon','Text','Raster'];OpenLayers.Rule=OpenLayers.Class({id:null,name:null,title:null,description:null,context:null,filter:null,elseFilter:false,symbolizer:null,symbolizers:null,minScaleDenominator:null,maxScaleDenominator:null,initialize:function(options){this.symbolizer={};OpenLayers.Util.extend(this,options);if(this.symbolizers){delete this.symbolizer;}
+this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){for(var i in this.symbolizer){this.symbolizer[i]=null;}
+this.symbolizer=null;delete this.symbolizers;},evaluate:function(feature){var context=this.getContext(feature);var applies=true;if(this.minScaleDenominator||this.maxScaleDenominator){var scale=feature.layer.map.getScale();}
if(this.minScaleDenominator){applies=scale>=OpenLayers.Style.createLiteral(this.minScaleDenominator,context);}
if(applies&&this.maxScaleDenominator){applies=scale<OpenLayers.Style.createLiteral(this.maxScaleDenominator,context);}
if(applies&&this.filter){if(this.filter.CLASS_NAME=="OpenLayers.Filter.FeatureId"){applies=this.filter.evaluate(feature);}else{applies=this.filter.evaluate(context);}}
return applies;},getContext:function(feature){var context=this.context;if(!context){context=feature.attributes||feature.data;}
-return context;},CLASS_NAME:"OpenLayers.Rule"});OpenLayers.StyleMap=OpenLayers.Class({styles:null,extendDefault:true,initialize:function(style,options){this.styles={"default":new OpenLayers.Style(OpenLayers.Feature.Vector.style["default"]),"select":new OpenLayers.Style(OpenLayers.Feature.Vector.style["select"]),"temporary":new OpenLayers.Style(OpenLayers.Feature.Vector.style["temporary"])};if(style instanceof OpenLayers.Style){this.styles["default"]=style;this.styles["select"]=style;this.styles["temporary"]=style;}else if(typeof style=="object"){for(var key in style){if(style[key]instanceof OpenLayers.Style){this.styles[key]=style[key];}else if(typeof style[key]=="object"){this.styles[key]=new OpenLayers.Style(style[key]);}else{this.styles["default"]=new OpenLayers.Style(style);this.styles["select"]=new OpenLayers.Style(style);this.styles["temporary"]=new OpenLayers.Style(style);break;}}}
-OpenLayers.Util.extend(this,options);},destroy:function(){for(var key in this.styles){this.styles[key].destroy();}
-this.styles=null;},createSymbolizer:function(feature,intent){if(!feature){feature=new OpenLayers.Feature.Vector();}
-if(!this.styles[intent]){intent="default";}
-feature.renderIntent=intent;var defaultSymbolizer={};if(this.extendDefault&&intent!="default"){defaultSymbolizer=this.styles["default"].createSymbolizer(feature);}
-return OpenLayers.Util.extend(defaultSymbolizer,this.styles[intent].createSymbolizer(feature));},addUniqueValueRules:function(renderIntent,property,symbolizers){var rules=[];for(var value in symbolizers){rules.push(new OpenLayers.Rule({symbolizer:symbolizers[value],filter:new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,property:property,value:value})}));}
-this.styles[renderIntent].addRules(rules);},CLASS_NAME:"OpenLayers.StyleMap"});OpenLayers.Control.NavToolbar=OpenLayers.Class(OpenLayers.Control.Panel,{initialize:function(options){OpenLayers.Control.Panel.prototype.initialize.apply(this,[options]);this.addControls([new OpenLayers.Control.Navigation(),new OpenLayers.Control.ZoomBox()]);},draw:function(){var div=OpenLayers.Control.Panel.prototype.draw.apply(this,arguments);this.activateControl(this.controls[0]);return div;},CLASS_NAME:"OpenLayers.Control.NavToolbar"});OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,lowerBoundary:null,upperBoundary:null,initialize:function(options){OpenLayers.Filter.prototype.initialize.apply(this,[options]);},evaluate:function(context){switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:case OpenLayers.Filter.Comparison.LESS_THAN:case OpenLayers.Filter.Comparison.GREATER_THAN:case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:return this.binaryCompare(context,this.property,this.value);case OpenLayers.Filter.Comparison.BETWEEN:var result=context[this.property]>=this.lowerBoundary;result=result&&context[this.property]<=this.upperBoundary;return result;case OpenLayers.Filter.Comparison.LIKE:var regexp=new RegExp(this.value,"gi");return regexp.test(context[this.property]);}},value2regex:function(wildCard,singleChar,escapeChar){if(wildCard=="."){var msg="'.' is an unsupported wildCard character for "+"OpenLayers.Filter.Comparison";OpenLayers.Console.error(msg);return null;}
-wildCard=wildCard?wildCard:"*";singleChar=singleChar?singleChar:".";escapeChar=escapeChar?escapeChar:"!";this.value=this.value.replace(new RegExp("\\"+escapeChar,"g"),"\\");this.value=this.value.replace(new RegExp("\\"+singleChar,"g"),".");this.value=this.value.replace(new RegExp("\\"+wildCard,"g"),".*");this.value=this.value.replace(new RegExp("\\\\.\\*","g"),"\\"+wildCard);this.value=this.value.replace(new RegExp("\\\\\\.","g"),"\\"+singleChar);return this.value;},regex2value:function(){var value=this.value;value=value.replace(/!/g,"!!");value=value.replace(/(\\)?\\\./g,function($0,$1){return $1?$0:"!.";});value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"!*";});value=value.replace(/\\\\/g,"\\");value=value.replace(/\.\*/g,"*");return value;},binaryCompare:function(context,property,value){switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:return context[property]==value;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:return context[property]!=value;case OpenLayers.Filter.Comparison.LESS_THAN:return context[property]<value;case OpenLayers.Filter.Comparison.GREATER_THAN:return context[property]>value;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:return context[property]<=value;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:return context[property]>=value;}},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Filter.FeatureId=OpenLayers.Class(OpenLayers.Filter,{fids:null,initialize:function(options){this.fids=[];OpenLayers.Filter.prototype.initialize.apply(this,[options]);},evaluate:function(feature){for(var i=0;i<this.fids.length;i++){var fid=feature.fid||feature.id;if(fid==this.fids[i]){return true;}}
-return false;},CLASS_NAME:"OpenLayers.Filter.FeatureId"});OpenLayers.Filter.Logical=OpenLayers.Class(OpenLayers.Filter,{filters:null,type:null,initialize:function(options){this.filters=[];OpenLayers.Filter.prototype.initialize.apply(this,[options]);},destroy:function(){this.filters=null;OpenLayers.Filter.prototype.destroy.apply(this);},evaluate:function(context){switch(this.type){case OpenLayers.Filter.Logical.AND:for(var i=0;i<this.filters.length;i++){if(this.filters[i].evaluate(context)==false){return false;}}
-return true;case OpenLayers.Filter.Logical.OR:for(var i=0;i<this.filters.length;i++){if(this.filters[i].evaluate(context)==true){return true;}}
-return false;case OpenLayers.Filter.Logical.NOT:return(!this.filters[0].evaluate(context));}},CLASS_NAME:"OpenLayers.Filter.Logical"});OpenLayers.Filter.Logical.AND="&&";OpenLayers.Filter.Logical.OR="||";OpenLayers.Filter.Logical.NOT="!";OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(components){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];if(components!=null){this.addComponents(components);}},destroy:function(){this.components.length=0;this.components=null;},clone:function(){var geometry=eval("new "+this.CLASS_NAME+"()");for(var i=0;i<this.components.length;i++){geometry.addComponent(this.components[i].clone());}
-OpenLayers.Util.applyDefaults(geometry,this);return geometry;},getComponentsString:function(){var strings=[];for(var i=0;i<this.components.length;i++){strings.push(this.components[i].toShortString());}
-return strings.join(",");},calculateBounds:function(){this.bounds=null;if(this.components&&this.components.length>0){this.setBounds(this.components[0].getBounds());for(var i=1;i<this.components.length;i++){this.extendBounds(this.components[i].getBounds());}}},addComponents:function(components){if(!(components instanceof Array)){components=[components];}
-for(var i=0;i<components.length;i++){this.addComponent(components[i]);}},addComponent:function(component,index){var added=false;if(component){if(this.componentTypes==null||(OpenLayers.Util.indexOf(this.componentTypes,component.CLASS_NAME)>-1)){if(index!=null&&(index<this.components.length)){var components1=this.components.slice(0,index);var components2=this.components.slice(index,this.components.length);components1.push(component);this.components=components1.concat(components2);}else{this.components.push(component);}
-component.parent=this;this.clearBounds();added=true;}}
-return added;},removeComponents:function(components){if(!(components instanceof Array)){components=[components];}
-for(var i=components.length-1;i>=0;--i){this.removeComponent(components[i]);}},removeComponent:function(component){OpenLayers.Util.removeItem(this.components,component);this.clearBounds();},getLength:function(){var length=0.0;for(var i=0;i<this.components.length;i++){length+=this.components[i].getLength();}
-return length;},getArea:function(){var area=0.0;for(var i=0;i<this.components.length;i++){area+=this.components[i].getArea();}
-return area;},move:function(x,y){for(var i=0;i<this.components.length;i++){this.components[i].move(x,y);}},rotate:function(angle,origin){for(var i=0;i<this.components.length;++i){this.components[i].rotate(angle,origin);}},resize:function(scale,origin,ratio){for(var i=0;i<this.components.length;++i){this.components[i].resize(scale,origin,ratio);}},equals:function(geometry){var equivalent=true;if(!geometry||!geometry.CLASS_NAME||(this.CLASS_NAME!=geometry.CLASS_NAME)){equivalent=false;}else if(!(geometry.components instanceof Array)||(geometry.components.length!=this.components.length)){equivalent=false;}else{for(var i=0;i<this.components.length;++i){if(!this.components[i].equals(geometry.components[i])){equivalent=false;break;}}}
-return equivalent;},transform:function(source,dest){if(source&&dest){for(var i=0;i<this.components.length;i++){var component=this.components[i];component.transform(source,dest);}}
-return this;},intersects:function(geometry){var intersect=false;for(var i=0;i<this.components.length;++i){intersect=geometry.intersects(this.components[i]);if(intersect){break;}}
-return intersect;},CLASS_NAME:"OpenLayers.Geometry.Collection"});OpenLayers.Geometry.Point=OpenLayers.Class(OpenLayers.Geometry,{x:null,y:null,initialize:function(x,y){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.x=parseFloat(x);this.y=parseFloat(y);},clone:function(obj){if(obj==null){obj=new OpenLayers.Geometry.Point(this.x,this.y);}
-OpenLayers.Util.applyDefaults(obj,this);return obj;},calculateBounds:function(){this.bounds=new OpenLayers.Bounds(this.x,this.y,this.x,this.y);},distanceTo:function(point){var distance=0.0;if((this.x!=null)&&(this.y!=null)&&(point!=null)&&(point.x!=null)&&(point.y!=null)){var dx2=Math.pow(this.x-point.x,2);var dy2=Math.pow(this.y-point.y,2);distance=Math.sqrt(dx2+dy2);}
-return distance;},equals:function(geom){var equals=false;if(geom!=null){equals=((this.x==geom.x&&this.y==geom.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(geom.x)&&isNaN(geom.y)));}
-return equals;},toShortString:function(){return(this.x+", "+this.y);},move:function(x,y){this.x=this.x+x;this.y=this.y+y;this.clearBounds();},rotate:function(angle,origin){angle*=Math.PI/180;var radius=this.distanceTo(origin);var theta=angle+Math.atan2(this.y-origin.y,this.x-origin.x);this.x=origin.x+(radius*Math.cos(theta));this.y=origin.y+(radius*Math.sin(theta));this.clearBounds();},resize:function(scale,origin,ratio){ratio=(ratio==undefined)?1:ratio;this.x=origin.x+(scale*ratio*(this.x-origin.x));this.y=origin.y+(scale*(this.y-origin.y));this.clearBounds();},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.equals(geometry);}else{intersect=geometry.intersects(this);}
-return intersect;},transform:function(source,dest){if((source&&dest)){OpenLayers.Projection.transform(this,source,dest);}
-return this;},CLASS_NAME:"OpenLayers.Geometry.Point"});OpenLayers.Geometry.Rectangle=OpenLayers.Class(OpenLayers.Geometry,{x:null,y:null,width:null,height:null,initialize:function(x,y,width,height){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.x=x;this.y=y;this.width=width;this.height=height;},calculateBounds:function(){this.bounds=new OpenLayers.Bounds(this.x,this.y,this.x+this.width,this.y+this.height);},getLength:function(){var length=(2*this.width)+(2*this.height);return length;},getArea:function(){var area=this.width*this.height;return area;},CLASS_NAME:"OpenLayers.Geometry.Rectangle"});OpenLayers.Geometry.Surface=OpenLayers.Class(OpenLayers.Geometry,{initialize:function(){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Geometry.Surface"});OpenLayers.Layer.MapServer.Untiled=OpenLayers.Class(OpenLayers.Layer.MapServer,{singleTile:true,initialize:function(name,url,params,options){OpenLayers.Layer.MapServer.prototype.initialize.apply(this,arguments);var msg="The OpenLayers.Layer.MapServer.Untiled class is deprecated and "+"will be removed in 3.0. Instead, you should use the "+"normal OpenLayers.Layer.MapServer class, passing it the option "+"'singleTile' as true.";OpenLayers.Console.warn(msg);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.MapServer.Untiled(this.name,this.url,this.params,this.options);}
-obj=OpenLayers.Layer.MapServer.prototype.clone.apply(this,[obj]);return obj;},CLASS_NAME:"OpenLayers.Layer.MapServer.Untiled"});OpenLayers.Layer.Vector=OpenLayers.Class(OpenLayers.Layer,{EVENT_TYPES:["beforefeatureadded","featureadded","featuresadded","featureselected","featureunselected","beforefeaturemodified","featuremodified","afterfeaturemodified"],isBaseLayer:false,isFixed:false,isVector:true,features:null,selectedFeatures:null,reportError:true,style:null,styleMap:null,renderers:['SVG','VML'],renderer:null,geometryType:null,drawn:false,initialize:function(name,options){this.EVENT_TYPES=OpenLayers.Layer.Vector.prototype.EVENT_TYPES.concat(OpenLayers.Layer.prototype.EVENT_TYPES);OpenLayers.Layer.prototype.initialize.apply(this,arguments);if(!this.renderer||!this.renderer.supported()){this.assignRenderer();}
-if(!this.renderer||!this.renderer.supported()){this.renderer=null;this.displayError();}
-if(!this.styleMap){this.styleMap=new OpenLayers.StyleMap();}
-this.features=[];this.selectedFeatures=[];},destroy:function(){OpenLayers.Layer.prototype.destroy.apply(this,arguments);this.destroyFeatures();this.features=null;this.selectedFeatures=null;if(this.renderer){this.renderer.destroy();}
-this.renderer=null;this.geometryType=null;this.drawn=null;},assignRenderer:function(){for(var i=0;i<this.renderers.length;i++){var rendererClass=OpenLayers.Renderer[this.renderers[i]];if(rendererClass&&rendererClass.prototype.supported()){this.renderer=new rendererClass(this.div);break;}}},displayError:function(){if(this.reportError){alert(OpenLayers.i18n("browserNotSupported",{'renderers':this.renderers.join("\n")}));}},setMap:function(map){OpenLayers.Layer.prototype.setMap.apply(this,arguments);if(!this.renderer){this.map.removeLayer(this);}else{this.renderer.map=this.map;this.renderer.setSize(this.map.getSize());}},onMapResize:function(){OpenLayers.Layer.prototype.onMapResize.apply(this,arguments);this.renderer.setSize(this.map.getSize());},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);if(!dragging){this.renderer.root.style.visibility="hidden";if(navigator.userAgent.toLowerCase().indexOf("gecko")!=-1){this.div.scrollLeft=this.div.scrollLeft;}
-this.div.style.left=-parseInt(this.map.layerContainerDiv.style.left)+"px";this.div.style.top=-parseInt(this.map.layerContainerDiv.style.top)+"px";var extent=this.map.getExtent();this.renderer.setExtent(extent);this.renderer.root.style.visibility="visible";}
-if(!this.drawn||zoomChanged){this.drawn=true;for(var i=0;i<this.features.length;i++){var feature=this.features[i];this.drawFeature(feature);}}},addFeatures:function(features,options){if(!(features instanceof Array)){features=[features];}
-var notify=!options||!options.silent;for(var i=0;i<features.length;i++){var feature=features[i];if(this.geometryType&&!(feature.geometry instanceof this.geometryType)){var throwStr=OpenLayers.i18n('componentShouldBe',{'geomType':this.geometryType.prototype.CLASS_NAME});throw throwStr;}
-this.features.push(feature);feature.layer=this;if(!feature.style&&this.style){feature.style=OpenLayers.Util.extend({},this.style);}
-if(notify){this.events.triggerEvent("beforefeatureadded",{feature:feature});this.preFeatureInsert(feature);}
-if(this.drawn){this.drawFeature(feature);}
-if(notify){this.events.triggerEvent("featureadded",{feature:feature});this.onFeatureInsert(feature);}}
-if(notify){this.events.triggerEvent("featuresadded",{features:features});}},removeFeatures:function(features){if(!(features instanceof Array)){features=[features];}
-for(var i=features.length-1;i>=0;i--){var feature=features[i];this.features=OpenLayers.Util.removeItem(this.features,feature);if(feature.geometry){this.renderer.eraseGeometry(feature.geometry);}
-if(OpenLayers.Util.indexOf(this.selectedFeatures,feature)!=-1){OpenLayers.Util.removeItem(this.selectedFeatures,feature);}}},destroyFeatures:function(features){var all=(features==undefined);if(all){features=this.features;this.selectedFeatures=[];}
-this.eraseFeatures(features);var feature;for(var i=features.length-1;i>=0;i--){feature=features[i];if(!all){OpenLayers.Util.removeItem(this.selectedFeatures,feature);}
-feature.destroy();}},drawFeature:function(feature,style){if(typeof style!="object"){var renderIntent=typeof style=="string"?style:feature.renderIntent;style=feature.style||this.style;if(!style){style=this.styleMap.createSymbolizer(feature,renderIntent);}}
-this.renderer.drawFeature(feature,style);},eraseFeatures:function(features){this.renderer.eraseFeatures(features);},getFeatureFromEvent:function(evt){if(!this.renderer){OpenLayers.Console.error(OpenLayers.i18n("getFeatureError"));return null;}
-var featureId=this.renderer.getFeatureIdFromEvent(evt);return this.getFeatureById(featureId);},getFeatureById:function(featureId){var feature=null;for(var i=0;i<this.features.length;++i){if(this.features[i].id==featureId){feature=this.features[i];break;}}
-return feature;},onFeatureInsert:function(feature){},preFeatureInsert:function(feature){},CLASS_NAME:"OpenLayers.Layer.Vector"});OpenLayers.Layer.WMS.Untiled=OpenLayers.Class(OpenLayers.Layer.WMS,{singleTile:true,initialize:function(name,url,params,options){OpenLayers.Layer.WMS.prototype.initialize.apply(this,arguments);var msg="The OpenLayers.Layer.WMS.Untiled class is deprecated and "+"will be removed in 3.0. Instead, you should use the "+"normal OpenLayers.Layer.WMS class, passing it the option "+"'singleTile' as true.";OpenLayers.Console.warn(msg);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.WMS.Untiled(this.name,this.url,this.params,this.options);}
-obj=OpenLayers.Layer.WMS.prototype.clone.apply(this,[obj]);return obj;},CLASS_NAME:"OpenLayers.Layer.WMS.Untiled"});OpenLayers.Format.SLD=OpenLayers.Class(OpenLayers.Format.XML,{defaultVersion:"1.0.0",version:null,parser:null,initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},write:function(sld,options){var version=(options&&options.version)||this.version||this.defaultVersion;if(!this.parser||this.parser.VERSION!=version){var format=OpenLayers.Format.SLD["v"+version.replace(/\./g,"_")];if(!format){throw"Can't find a SLD parser for version "+
-version;}
-this.parser=new format(this.options);}
-var root=this.parser.write(sld);return OpenLayers.Format.XML.prototype.write.apply(this,[root]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
-var root=data.documentElement;var version=this.version;if(!version){version=root.getAttribute("version");if(!version){version=this.defaultVersion;}}
-if(!this.parser||this.parser.VERSION!=version){var format=OpenLayers.Format.SLD["v"+version.replace(/\./g,"_")];if(!format){throw"Can't find a SLD parser for version "+
-version;}
+if(typeof this.context=="function"){context=this.context(feature);}
+return context;},clone:function(){var options=OpenLayers.Util.extend({},this);if(this.symbolizers){var len=this.symbolizers.length;options.symbolizers=new Array(len);for(var i=0;i<len;++i){options.symbolizers[i]=this.symbolizers[i].clone();}}else{options.symbolizer={};var value,type;for(var key in this.symbolizer){value=this.symbolizer[key];type=typeof value;if(type==="object"){options.symbolizer[key]=OpenLayers.Util.extend({},value);}else if(type==="string"){options.symbolizer[key]=value;}}}
+options.filter=this.filter&&this.filter.clone();options.context=this.context&&OpenLayers.Util.extend({},this.context);return new OpenLayers.Rule(options);},CLASS_NAME:"OpenLayers.Rule"});OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{namespaces:null,namespaceAlias:null,defaultPrefix:null,readers:{},writers:{},xmldom:null,initialize:function(options){if(window.ActiveXObject){this.xmldom=new ActiveXObject("Microsoft.XMLDOM");}
+OpenLayers.Format.prototype.initialize.apply(this,[options]);this.namespaces=OpenLayers.Util.extend({},this.namespaces);this.namespaceAlias={};for(var alias in this.namespaces){this.namespaceAlias[this.namespaces[alias]]=alias;}},destroy:function(){this.xmldom=null;OpenLayers.Format.prototype.destroy.apply(this,arguments);},setNamespace:function(alias,uri){this.namespaces[alias]=uri;this.namespaceAlias[uri]=alias;},read:function(text){var index=text.indexOf('<');if(index>0){text=text.substring(index);}
+var node=OpenLayers.Util.Try(OpenLayers.Function.bind((function(){var xmldom;if(window.ActiveXObject&&!this.xmldom){xmldom=new ActiveXObject("Microsoft.XMLDOM");}else{xmldom=this.xmldom;}
+xmldom.loadXML(text);return xmldom;}),this),function(){return new DOMParser().parseFromString(text,'text/xml');},function(){var req=new XMLHttpRequest();req.open("GET","data:"+"text/xml"+";charset=utf-8,"+encodeURIComponent(text),false);if(req.overrideMimeType){req.overrideMimeType("text/xml");}
+req.send(null);return req.responseXML;});if(this.keepData){this.data=node;}
+return node;},write:function(node){var data;if(this.xmldom){data=node.xml;}else{var serializer=new XMLSerializer();if(node.nodeType==1){var doc=document.implementation.createDocument("","",null);if(doc.importNode){node=doc.importNode(node,true);}
+doc.appendChild(node);data=serializer.serializeToString(doc);}else{data=serializer.serializeToString(node);}}
+return data;},createElementNS:function(uri,name){var element;if(this.xmldom){if(typeof uri=="string"){element=this.xmldom.createNode(1,name,uri);}else{element=this.xmldom.createNode(1,name,"");}}else{element=document.createElementNS(uri,name);}
+return element;},createTextNode:function(text){var node;if(typeof text!=="string"){text=String(text);}
+if(this.xmldom){node=this.xmldom.createTextNode(text);}else{node=document.createTextNode(text);}
+return node;},getElementsByTagNameNS:function(node,uri,name){var elements=[];if(node.getElementsByTagNameNS){elements=node.getElementsByTagNameNS(uri,name);}else{var allNodes=node.getElementsByTagName("*");var potentialNode,fullName;for(var i=0,len=allNodes.length;i<len;++i){potentialNode=allNodes[i];fullName=(potentialNode.prefix)?(potentialNode.prefix+":"+name):name;if((name=="*")||(fullName==potentialNode.nodeName)){if((uri=="*")||(uri==potentialNode.namespaceURI)){elements.push(potentialNode);}}}}
+return elements;},getAttributeNodeNS:function(node,uri,name){var attributeNode=null;if(node.getAttributeNodeNS){attributeNode=node.getAttributeNodeNS(uri,name);}else{var attributes=node.attributes;var potentialNode,fullName;for(var i=0,len=attributes.length;i<len;++i){potentialNode=attributes[i];if(potentialNode.namespaceURI==uri){fullName=(potentialNode.prefix)?(potentialNode.prefix+":"+name):name;if(fullName==potentialNode.nodeName){attributeNode=potentialNode;break;}}}}
+return attributeNode;},getAttributeNS:function(node,uri,name){var attributeValue="";if(node.getAttributeNS){attributeValue=node.getAttributeNS(uri,name)||"";}else{var attributeNode=this.getAttributeNodeNS(node,uri,name);if(attributeNode){attributeValue=attributeNode.nodeValue;}}
+return attributeValue;},getChildValue:function(node,def){var value=def||"";if(node){for(var child=node.firstChild;child;child=child.nextSibling){switch(child.nodeType){case 3:case 4:value+=child.nodeValue;}}}
+return value;},isSimpleContent:function(node){var simple=true;for(var child=node.firstChild;child;child=child.nextSibling){if(child.nodeType===1){simple=false;break;}}
+return simple;},contentType:function(node){var simple=false,complex=false;var type=OpenLayers.Format.XML.CONTENT_TYPE.EMPTY;for(var child=node.firstChild;child;child=child.nextSibling){switch(child.nodeType){case 1:complex=true;break;case 8:break;default:simple=true;}
+if(complex&&simple){break;}}
+if(complex&&simple){type=OpenLayers.Format.XML.CONTENT_TYPE.MIXED;}else if(complex){return OpenLayers.Format.XML.CONTENT_TYPE.COMPLEX;}else if(simple){return OpenLayers.Format.XML.CONTENT_TYPE.SIMPLE;}
+return type;},hasAttributeNS:function(node,uri,name){var found=false;if(node.hasAttributeNS){found=node.hasAttributeNS(uri,name);}else{found=!!this.getAttributeNodeNS(node,uri,name);}
+return found;},setAttributeNS:function(node,uri,name,value){if(node.setAttributeNS){node.setAttributeNS(uri,name,value);}else{if(this.xmldom){if(uri){var attribute=node.ownerDocument.createNode(2,name,uri);attribute.nodeValue=value;node.setAttributeNode(attribute);}else{node.setAttribute(name,value);}}else{throw"setAttributeNS not implemented";}}},createElementNSPlus:function(name,options){options=options||{};var uri=options.uri||this.namespaces[options.prefix];if(!uri){var loc=name.indexOf(":");uri=this.namespaces[name.substring(0,loc)];}
+if(!uri){uri=this.namespaces[this.defaultPrefix];}
+var node=this.createElementNS(uri,name);if(options.attributes){this.setAttributes(node,options.attributes);}
+var value=options.value;if(value!=null){node.appendChild(this.createTextNode(value));}
+return node;},setAttributes:function(node,obj){var value,uri;for(var name in obj){if(obj[name]!=null&&obj[name].toString){value=obj[name].toString();uri=this.namespaces[name.substring(0,name.indexOf(":"))]||null;this.setAttributeNS(node,uri,name,value);}}},readNode:function(node,obj){if(!obj){obj={};}
+var group=this.readers[node.namespaceURI?this.namespaceAlias[node.namespaceURI]:this.defaultPrefix];if(group){var local=node.localName||node.nodeName.split(":").pop();var reader=group[local]||group["*"];if(reader){reader.apply(this,[node,obj]);}}
+return obj;},readChildNodes:function(node,obj){if(!obj){obj={};}
+var children=node.childNodes;var child;for(var i=0,len=children.length;i<len;++i){child=children[i];if(child.nodeType==1){this.readNode(child,obj);}}
+return obj;},writeNode:function(name,obj,parent){var prefix,local;var split=name.indexOf(":");if(split>0){prefix=name.substring(0,split);local=name.substring(split+1);}else{if(parent){prefix=this.namespaceAlias[parent.namespaceURI];}else{prefix=this.defaultPrefix;}
+local=name;}
+var child=this.writers[prefix][local].apply(this,[obj]);if(parent){parent.appendChild(child);}
+return child;},getChildEl:function(node,name,uri){return node&&this.getThisOrNextEl(node.firstChild,name,uri);},getNextEl:function(node,name,uri){return node&&this.getThisOrNextEl(node.nextSibling,name,uri);},getThisOrNextEl:function(node,name,uri){outer:for(var sibling=node;sibling;sibling=sibling.nextSibling){switch(sibling.nodeType){case 1:if((!name||name===(sibling.localName||sibling.nodeName.split(":").pop()))&&(!uri||uri===sibling.namespaceURI)){break outer;}
+sibling=null;break outer;case 3:if(/^\s*$/.test(sibling.nodeValue)){break;}
+case 4:case 6:case 12:case 10:case 11:sibling=null;break outer;}}
+return sibling||null;},lookupNamespaceURI:function(node,prefix){var uri=null;if(node){if(node.lookupNamespaceURI){uri=node.lookupNamespaceURI(prefix);}else{outer:switch(node.nodeType){case 1:if(node.namespaceURI!==null&&node.prefix===prefix){uri=node.namespaceURI;break outer;}
+var len=node.attributes.length;if(len){var attr;for(var i=0;i<len;++i){attr=node.attributes[i];if(attr.prefix==="xmlns"&&attr.name==="xmlns:"+prefix){uri=attr.value||null;break outer;}else if(attr.name==="xmlns"&&prefix===null){uri=attr.value||null;break outer;}}}
+uri=this.lookupNamespaceURI(node.parentNode,prefix);break outer;case 2:uri=this.lookupNamespaceURI(node.ownerElement,prefix);break outer;case 9:uri=this.lookupNamespaceURI(node.documentElement,prefix);break outer;case 6:case 12:case 10:case 11:break outer;default:uri=this.lookupNamespaceURI(node.parentNode,prefix);break outer;}}}
+return uri;},getXMLDoc:function(){if(!OpenLayers.Format.XML.document&&!this.xmldom){if(document.implementation&&document.implementation.createDocument){OpenLayers.Format.XML.document=document.implementation.createDocument("","",null);}else if(!this.xmldom&&window.ActiveXObject){this.xmldom=new ActiveXObject("Microsoft.XMLDOM");}}
+return OpenLayers.Format.XML.document||this.xmldom;},CLASS_NAME:"OpenLayers.Format.XML"});OpenLayers.Format.XML.CONTENT_TYPE={EMPTY:0,SIMPLE:1,COMPLEX:2,MIXED:3};OpenLayers.Format.XML.lookupNamespaceURI=OpenLayers.Function.bind(OpenLayers.Format.XML.prototype.lookupNamespaceURI,OpenLayers.Format.XML.prototype);OpenLayers.Format.XML.document=null;OpenLayers.Format.OGCExceptionReport=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc"},regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},defaultPrefix:"ogc",read:function(data){var result;if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var root=data.documentElement;var exceptionInfo={exceptionReport:null};if(root){this.readChildNodes(data,exceptionInfo);if(exceptionInfo.exceptionReport===null){exceptionInfo=new OpenLayers.Format.OWSCommon().read(data);}}
+return exceptionInfo;},readers:{"ogc":{"ServiceExceptionReport":function(node,obj){obj.exceptionReport={exceptions:[]};this.readChildNodes(node,obj.exceptionReport);},"ServiceException":function(node,exceptionReport){var exception={code:node.getAttribute("code"),locator:node.getAttribute("locator"),text:this.getChildValue(node)};exceptionReport.exceptions.push(exception);}}},CLASS_NAME:"OpenLayers.Format.OGCExceptionReport"});OpenLayers.Format.XML.VersionedOGC=OpenLayers.Class(OpenLayers.Format.XML,{defaultVersion:null,version:null,profile:null,errorProperty:null,name:null,stringifyOutput:false,parser:null,initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);var className=this.CLASS_NAME;this.name=className.substring(className.lastIndexOf(".")+1);},getVersion:function(root,options){var version;if(root){version=this.version;if(!version){version=root.getAttribute("version");if(!version){version=this.defaultVersion;}}}else{version=(options&&options.version)||this.version||this.defaultVersion;}
+return version;},getParser:function(version){version=version||this.defaultVersion;var profile=this.profile?"_"+this.profile:"";if(!this.parser||this.parser.VERSION!=version){var format=OpenLayers.Format[this.name]["v"+version.replace(/\./g,"_")+profile];if(!format){throw"Can't find a "+this.name+" parser for version "+
+version+profile;}
this.parser=new format(this.options);}
-var sld=this.parser.read(data);return sld;},CLASS_NAME:"OpenLayers.Format.SLD"});OpenLayers.Format.Text=OpenLayers.Class(OpenLayers.Format,{initialize:function(options){OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(text){var lines=text.split('\n');var columns;var features=[];for(var lcv=0;lcv<(lines.length-1);lcv++){var currLine=lines[lcv].replace(/^\s*/,'').replace(/\s*$/,'');if(currLine.charAt(0)!='#'){if(!columns){columns=currLine.split('\t');}else{var vals=currLine.split('\t');var geometry=new OpenLayers.Geometry.Point(0,0);var attributes={};var style={};var icon,iconSize,iconOffset,overflow;var set=false;for(var valIndex=0;valIndex<vals.length;valIndex++){if(vals[valIndex]){if(columns[valIndex]=='point'){var coords=vals[valIndex].split(',');geometry.y=parseFloat(coords[0]);geometry.x=parseFloat(coords[1]);set=true;}else if(columns[valIndex]=='lat'){geometry.y=parseFloat(vals[valIndex]);set=true;}else if(columns[valIndex]=='lon'){geometry.x=parseFloat(vals[valIndex]);set=true;}else if(columns[valIndex]=='title')
-attributes['title']=vals[valIndex];else if(columns[valIndex]=='image'||columns[valIndex]=='icon')
-style['externalGraphic']=vals[valIndex];else if(columns[valIndex]=='iconSize'){var size=vals[valIndex].split(',');style['graphicWidth']=parseFloat(size[0]);style['graphicHeight']=parseFloat(size[1]);}else if(columns[valIndex]=='iconOffset'){var offset=vals[valIndex].split(',');style['graphicXOffset']=parseFloat(offset[0]);style['graphicYOffset']=parseFloat(offset[1]);}else if(columns[valIndex]=='description'){attributes['description']=vals[valIndex];}else if(columns[valIndex]=='overflow'){attributes['overflow']=vals[valIndex];}}}
-if(set){if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}
-var feature=new OpenLayers.Feature.Vector(geometry,attributes,style);features.push(feature);}}}}
-return features;},CLASS_NAME:"OpenLayers.Format.Text"});OpenLayers.Geometry.MultiLineString=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LineString"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Geometry.MultiLineString"});OpenLayers.Geometry.MultiPoint=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},addPoint:function(point,index){this.addComponent(point,index);},removePoint:function(point){this.removeComponent(point);},CLASS_NAME:"OpenLayers.Geometry.MultiPoint"});OpenLayers.Geometry.MultiPolygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Polygon"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Geometry.MultiPolygon"});OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},getArea:function(){var area=0.0;if(this.components&&(this.components.length>0)){area+=Math.abs(this.components[0].getArea());for(var i=1;i<this.components.length;i++){area-=Math.abs(this.components[i].getArea());}}
-return area;},containsPoint:function(point){var numRings=this.components.length;var contained=false;if(numRings>0){contained=this.components[0].containsPoint(point);if(contained!==1){if(contained&&numRings>1){var hole;for(var i=1;i<numRings;++i){hole=this.components[i].containsPoint(point);if(hole){if(hole===1){contained=1;}else{contained=false;}
-break;}}}}}
-return contained;},intersects:function(geometry){var intersect=false;var i;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.containsPoint(geometry);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"||geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){for(i=0;i<this.components.length;++i){intersect=geometry.intersects(this.components[i]);if(intersect){break;}}
-if(!intersect){for(i=0;i<geometry.components.length;++i){intersect=this.containsPoint(geometry.components[i]);if(intersect){break;}}}}else{for(i=0;i<geometry.components.length;++i){intersect=this.intersects(geometry.components[i]);if(intersect){break;}}}
-if(!intersect&&geometry.CLASS_NAME=="OpenLayers.Geometry.Polygon"){var ring=this.components[0];for(i=0;i<ring.components.length;++i){intersect=geometry.containsPoint(ring.components[i]);if(intersect){break;}}}
-return intersect;},CLASS_NAME:"OpenLayers.Geometry.Polygon"});OpenLayers.Geometry.Polygon.createRegularPolygon=function(origin,radius,sides,rotation){var angle=Math.PI*((1/sides)-(1/2));if(rotation){angle+=(rotation/180)*Math.PI;}
-var rotatedAngle,x,y;var points=[];for(var i=0;i<sides;++i){rotatedAngle=angle+(i*2*Math.PI/sides);x=origin.x+(radius*Math.cos(rotatedAngle));y=origin.y+(radius*Math.sin(rotatedAngle));points.push(new OpenLayers.Geometry.Point(x,y));}
-var ring=new OpenLayers.Geometry.LinearRing(points);return new OpenLayers.Geometry.Polygon([ring]);};OpenLayers.Handler.Point=OpenLayers.Class(OpenLayers.Handler,{point:null,layer:null,drawing:false,mouseDown:false,lastDown:null,lastUp:null,initialize:function(control,callbacks,options){this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'],{});OpenLayers.Handler.prototype.initialize.apply(this,arguments);},activate:function(){if(!OpenLayers.Handler.prototype.activate.apply(this,arguments)){return false;}
-var options={displayInLayerSwitcher:false,calculateInRange:function(){return true;}};this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,options);this.map.addLayer(this.layer);return true;},createFeature:function(){this.point=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point());},deactivate:function(){if(!OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){return false;}
-if(this.drawing){this.cancel();}
-if(this.layer.map!=null){this.layer.destroy(false);}
-this.layer=null;return true;},destroyFeature:function(){if(this.point){this.point.destroy();}
-this.point=null;},finalize:function(){this.layer.renderer.clear();this.drawing=false;this.mouseDown=false;this.lastDown=null;this.lastUp=null;this.callback("done",[this.geometryClone()]);this.destroyFeature();},cancel:function(){this.layer.renderer.clear();this.drawing=false;this.mouseDown=false;this.lastDown=null;this.lastUp=null;this.callback("cancel",[this.geometryClone()]);this.destroyFeature();},click:function(evt){OpenLayers.Event.stop(evt);return false;},dblclick:function(evt){OpenLayers.Event.stop(evt);return false;},drawFeature:function(){this.layer.drawFeature(this.point,this.style);},geometryClone:function(){return this.point.geometry.clone();},mousedown:function(evt){if(!this.checkModifiers(evt)){return true;}
-if(this.lastDown&&this.lastDown.equals(evt.xy)){return true;}
-if(this.lastDown==null){this.createFeature();}
-this.lastDown=evt.xy;this.drawing=true;var lonlat=this.map.getLonLatFromPixel(evt.xy);this.point.geometry.x=lonlat.lon;this.point.geometry.y=lonlat.lat;this.drawFeature();return false;},mousemove:function(evt){if(this.drawing){var lonlat=this.map.getLonLatFromPixel(evt.xy);this.point.geometry.x=lonlat.lon;this.point.geometry.y=lonlat.lat;this.point.geometry.clearBounds();this.drawFeature();}
-return true;},mouseup:function(evt){if(this.drawing){this.finalize();return false;}else{return true;}},CLASS_NAME:"OpenLayers.Handler.Point"});OpenLayers.Layer.GML=OpenLayers.Class(OpenLayers.Layer.Vector,{loaded:false,format:null,formatOptions:null,initialize:function(name,url,options){var newArguments=[];newArguments.push(name,options);OpenLayers.Layer.Vector.prototype.initialize.apply(this,newArguments);this.url=url;},setVisibility:function(visibility,noEvent){OpenLayers.Layer.Vector.prototype.setVisibility.apply(this,arguments);if(this.visibility&&!this.loaded){this.loadGML();}},moveTo:function(bounds,zoomChanged,minor){OpenLayers.Layer.Vector.prototype.moveTo.apply(this,arguments);if(this.visibility&&!this.loaded){this.events.triggerEvent("loadstart");this.loadGML();}},loadGML:function(){if(!this.loaded){var results=OpenLayers.loadURL(this.url,null,this,this.requestSuccess,this.requestFailure);this.loaded=true;}},setUrl:function(url){this.url=url;this.destroyFeatures();this.loaded=false;this.events.triggerEvent("loadstart");this.loadGML();},requestSuccess:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
-var options={};OpenLayers.Util.extend(options,this.formatOptions);if(this.map&&!this.projection.equals(this.map.getProjectionObject())){options.externalProjection=this.projection;options.internalProjection=this.map.getProjectionObject();}
-var gml=this.format?new this.format(options):new OpenLayers.Format.GML(options);this.addFeatures(gml.read(doc));this.events.triggerEvent("loadend");},requestFailure:function(request){alert(OpenLayers.i18n("errorLoadingGML",{'url':this.url}));this.events.triggerEvent("loadend");},CLASS_NAME:"OpenLayers.Layer.GML"});OpenLayers.Layer.PointTrack=OpenLayers.Class(OpenLayers.Layer.Vector,{dataFrom:null,initialize:function(name,options){OpenLayers.Layer.Vector.prototype.initialize.apply(this,arguments);},addNodes:function(pointFeatures){if(pointFeatures.length<2){OpenLayers.Console.error("At least two point features have to be added to create"+"a line from");return;}
-var lines=new Array(pointFeatures.length-1);var pointFeature,startPoint,endPoint;for(var i=0;i<pointFeatures.length;i++){pointFeature=pointFeatures[i];endPoint=pointFeature.geometry;if(!endPoint){var lonlat=pointFeature.lonlat;endPoint=new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat);}else if(endPoint.CLASS_NAME!="OpenLayers.Geometry.Point"){OpenLayers.Console.error("Only features with point geometries are supported.");return;}
-if(i>0){var attributes=(this.dataFrom!=null)?(pointFeatures[i+this.dataFrom].data||pointFeatures[i+this.dataFrom].attributes):null;var line=new OpenLayers.Geometry.LineString([startPoint,endPoint]);lines[i-1]=new OpenLayers.Feature.Vector(line,attributes);}
-startPoint=endPoint;}
-this.addFeatures(lines);},CLASS_NAME:"OpenLayers.Layer.PointTrack"});OpenLayers.Layer.PointTrack.dataFrom={'SOURCE_NODE':-1,'TARGET_NODE':0};OpenLayers.Layer.WFS=OpenLayers.Class(OpenLayers.Layer.Vector,OpenLayers.Layer.Markers,{isBaseLayer:false,tile:null,ratio:2,DEFAULT_PARAMS:{service:"WFS",version:"1.0.0",request:"GetFeature"},featureClass:null,format:null,formatObject:null,formatOptions:null,vectorMode:true,encodeBBOX:false,extractAttributes:false,initialize:function(name,url,params,options){if(options==undefined){options={};}
-if(options.featureClass||!OpenLayers.Layer.Vector||!OpenLayers.Feature.Vector){this.vectorMode=false;}
-OpenLayers.Util.extend(options,{'reportError':false});var newArguments=[];newArguments.push(name,options);OpenLayers.Layer.Vector.prototype.initialize.apply(this,newArguments);if(!this.renderer||!this.vectorMode){this.vectorMode=false;if(!options.featureClass){options.featureClass=OpenLayers.Feature.WFS;}
-OpenLayers.Layer.Markers.prototype.initialize.apply(this,newArguments);}
-if(this.params&&this.params.typename&&!this.options.typename){this.options.typename=this.params.typename;}
-if(!this.options.geometry_column){this.options.geometry_column="the_geom";}
-this.params=params;OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));this.url=url;},destroy:function(){if(this.vectorMode){OpenLayers.Layer.Vector.prototype.destroy.apply(this,arguments);}else{OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);}
-if(this.tile){this.tile.destroy();}
-this.tile=null;this.ratio=null;this.featureClass=null;this.format=null;if(this.formatObject&&this.formatObject.destroy){this.formatObject.destroy();}
-this.formatObject=null;this.formatOptions=null;this.vectorMode=null;this.encodeBBOX=null;this.extractAttributes=null;},setMap:function(map){if(this.vectorMode){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);var options={'extractAttributes':this.extractAttributes};OpenLayers.Util.extend(options,this.formatOptions);if(this.map&&!this.projection.equals(this.map.getProjectionObject())){options.externalProjection=this.projection;options.internalProjection=this.map.getProjectionObject();}
-this.formatObject=this.format?new this.format(options):new OpenLayers.Format.GML(options);}else{OpenLayers.Layer.Markers.prototype.setMap.apply(this,arguments);}},moveTo:function(bounds,zoomChanged,dragging){if(this.vectorMode){OpenLayers.Layer.Vector.prototype.moveTo.apply(this,arguments);}else{OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);}
-if(dragging){return false;}
-if(zoomChanged){if(this.vectorMode){this.renderer.clear();}}
-if(this.options.minZoomLevel){OpenLayers.Console.warn(OpenLayers.i18n('minZoomLevelError'));if(this.map.getZoom()<this.options.minZoomLevel){return null;}}
-if(bounds==null){bounds=this.map.getExtent();}
-var firstRendering=(this.tile==null);var outOfBounds=(!firstRendering&&!this.tile.bounds.containsBounds(bounds));if(zoomChanged||firstRendering||(!dragging&&outOfBounds)){var center=bounds.getCenterLonLat();var tileWidth=bounds.getWidth()*this.ratio;var tileHeight=bounds.getHeight()*this.ratio;var tileBounds=new OpenLayers.Bounds(center.lon-(tileWidth/2),center.lat-(tileHeight/2),center.lon+(tileWidth/2),center.lat+(tileHeight/2));var tileSize=this.map.getSize();tileSize.w=tileSize.w*this.ratio;tileSize.h=tileSize.h*this.ratio;var ul=new OpenLayers.LonLat(tileBounds.left,tileBounds.top);var pos=this.map.getLayerPxFromLonLat(ul);var url=this.getFullRequestString();var params={BBOX:this.encodeBBOX?tileBounds.toBBOX():tileBounds.toArray()};if(this.map&&!this.projection.equals(this.map.getProjectionObject())){var projectedBounds=tileBounds.clone();projectedBounds.transform(this.map.getProjectionObject(),this.projection);params.BBOX=this.encodeBBOX?projectedBounds.toBBOX():projectedBounds.toArray();}
-url+="&"+OpenLayers.Util.getParameterString(params);if(!this.tile){this.tile=new OpenLayers.Tile.WFS(this,pos,tileBounds,url,tileSize);this.addTileMonitoringHooks(this.tile);this.tile.draw();}else{if(this.vectorMode){this.destroyFeatures();this.renderer.clear();}else{this.clearMarkers();}
-this.removeTileMonitoringHooks(this.tile);this.tile.destroy();this.tile=null;this.tile=new OpenLayers.Tile.WFS(this,pos,tileBounds,url,tileSize);this.addTileMonitoringHooks(this.tile);this.tile.draw();}}},addTileMonitoringHooks:function(tile){tile.onLoadStart=function(){if(this==this.layer.tile){this.layer.events.triggerEvent("loadstart");}};tile.events.register("loadstart",tile,tile.onLoadStart);tile.onLoadEnd=function(){if(this==this.layer.tile){this.layer.events.triggerEvent("tileloaded");this.layer.events.triggerEvent("loadend");}};tile.events.register("loadend",tile,tile.onLoadEnd);tile.events.register("unload",tile,tile.onLoadEnd);},removeTileMonitoringHooks:function(tile){tile.unload();tile.events.un({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,scope:tile});},onMapResize:function(){if(this.vectorMode){OpenLayers.Layer.Vector.prototype.onMapResize.apply(this,arguments);}else{OpenLayers.Layer.Markers.prototype.onMapResize.apply(this,arguments);}},mergeNewParams:function(newParams){var upperParams=OpenLayers.Util.upperCaseObject(newParams);var newArguments=[upperParams];return OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this,newArguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.WFS(this.name,this.url,this.params,this.options);}
-if(this.vectorMode){obj=OpenLayers.Layer.Vector.prototype.clone.apply(this,[obj]);}else{obj=OpenLayers.Layer.Markers.prototype.clone.apply(this,[obj]);}
-return obj;},getFullRequestString:function(newParams,altUrl){var projectionCode=this.map.getProjection();this.params.SRS=(projectionCode=="none")?null:projectionCode;return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,arguments);},commit:function(){if(!this.writer){var options={};if(this.map&&!this.projection.equals(this.map.getProjectionObject())){options.externalProjection=this.projection;options.internalProjection=this.map.getProjectionObject();}
-this.writer=new OpenLayers.Format.WFS(options,this);}
-var data=this.writer.write(this.features);var url=this.url;var success=OpenLayers.Function.bind(this.commitSuccess,this);var failure=OpenLayers.Function.bind(this.commitFailure,this);new OpenLayers.Ajax.Request(url,{method:'post',postBody:data,onComplete:success,onFailure:failure});},commitSuccess:function(request){var response=request.responseText;if(response.indexOf('SUCCESS')!=-1){this.commitReport(OpenLayers.i18n("commitSuccess",{'response':response}));for(var i=0;i<this.features.length;i++){this.features[i].state=null;}}else if(response.indexOf('FAILED')!=-1||response.indexOf('Exception')!=-1){this.commitReport(OpenLayers.i18n("commitFailed",{'response':response}));}},commitFailure:function(request){},commitReport:function(string,response){alert(string);},refresh:function(){if(this.tile){if(this.vectorMode){this.renderer.clear();this.features.length=0;}else{this.clearMarkers();this.markers.length=0;}
-this.tile.draw();}},CLASS_NAME:"OpenLayers.Layer.WFS"});OpenLayers.Format.SLD.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{sld:"http://www.opengis.net/sld",ogc:"http://www.opengis.net/ogc",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"sld",schemaLocation:null,defaultSymbolizer:{fillColor:"#808080",fillOpacity:1,strokeColor:"#000000",strokeOpacity:1,strokeWidth:1,pointRadius:6},initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){var sld={namedLayers:{}};this.readChildNodes(data,sld);return sld;},readers:{"sld":{"StyledLayerDescriptor":function(node,sld){sld.version=node.getAttribute("version");this.readChildNodes(node,sld);},"Name":function(node,obj){obj.name=this.getChildValue(node);},"Title":function(node,obj){obj.title=this.getChildValue(node);},"Abstract":function(node,obj){obj.description=this.getChildValue(node);},"NamedLayer":function(node,sld){var layer={userStyles:[],namedStyles:[]};this.readChildNodes(node,layer);for(var i=0;i<layer.userStyles.length;++i){layer.userStyles[i].layerName=layer.name;}
-sld.namedLayers[layer.name]=layer;},"NamedStyle":function(node,layer){layer.namedStyles.push(this.getChildName(node.firstChild));},"UserStyle":function(node,layer){var style=new OpenLayers.Style(this.defaultSymbolizer);this.readChildNodes(node,style);layer.userStyles.push(style);},"IsDefault":function(node,style){if(this.getChildValue(node)=="1"){style.isDefault=true;}},"FeatureTypeStyle":function(node,style){var obj={rules:[]};this.readChildNodes(node,obj);style.rules=obj.rules;},"Rule":function(node,obj){var rule=new OpenLayers.Rule();this.readChildNodes(node,rule);obj.rules.push(rule);},"ElseFilter":function(node,rule){rule.elseFilter=true;},"MinScaleDenominator":function(node,rule){rule.minScaleDenominator=this.getChildValue(node);},"MaxScaleDenominator":function(node,rule){rule.maxScaleDenominator=this.getChildValue(node);},"LineSymbolizer":function(node,rule){var symbolizer=rule.symbolizer["Line"]||{};this.readChildNodes(node,symbolizer);rule.symbolizer["Line"]=symbolizer;},"PolygonSymbolizer":function(node,rule){var symbolizer=rule.symbolizer["Polygon"]||{};this.readChildNodes(node,symbolizer);rule.symbolizer["Polygon"]=symbolizer;},"PointSymbolizer":function(node,rule){var symbolizer=rule.symbolizer["Point"]||{};this.readChildNodes(node,symbolizer);rule.symbolizer["Point"]=symbolizer;},"Stroke":function(node,symbolizer){this.readChildNodes(node,symbolizer);},"Fill":function(node,symbolizer){this.readChildNodes(node,symbolizer);},"CssParameter":function(node,symbolizer){var cssProperty=node.getAttribute("name");var symProperty=this.cssMap[cssProperty];if(symProperty){var value=this.readOgcExpression(node);if(value){symbolizer[symProperty]=value;}}},"Graphic":function(node,symbolizer){var graphic={};this.readChildNodes(node,graphic);var properties=["strokeColor","strokeWidth","strokeOpacity","strokeLinecap","fillColor","fillOpacity","graphicName","rotation","graphicFormat"];var prop,value;for(var i=0;i<properties.length;++i){prop=properties[i];value=graphic[prop];if(value!=undefined){symbolizer[prop]=value;}}
-if(graphic.opacity!=undefined){symbolizer.graphicOpacity=graphic.opacity;}
-if(graphic.size!=undefined){symbolizer.pointRadius=graphic.size;}
-if(graphic.href!=undefined){symbolizer.externalGraphic=graphic.href;}},"ExternalGraphic":function(node,graphic){this.readChildNodes(node,graphic);},"Mark":function(node,graphic){this.readChildNodes(node,graphic);},"WellKnownName":function(node,graphic){graphic.graphicName=this.getChildValue(node);},"Opacity":function(node,obj){var opacity=this.getChildValue(node);if(opacity){obj.opacity=opacity;}},"Size":function(node,obj){var size=this.getChildValue(node);if(size){obj.size=size;}},"Rotation":function(node,obj){var rotation=this.getChildValue(node);if(rotation){obj.rotation=rotation;}},"OnlineResource":function(node,obj){obj.href=this.getAttributeNS(node,this.namespaces.xlink,"href");},"Format":function(node,graphic){graphic.graphicFormat=this.getChildValue(node);}},"ogc":{"Filter":function(node,rule){var obj={fids:[],filters:[]};this.readChildNodes(node,obj);if(obj.fids.length>0){rule.filter=new OpenLayers.Filter.FeatureId({fids:obj.fids});}else if(obj.filters.length>0){rule.filter=obj.filters[0];}},"FeatureId":function(node,obj){var fid=node.getAttribute("fid");if(fid){obj.fids.push(fid);}},"And":function(node,obj){var filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND});this.readChildNodes(node,filter);obj.filters.push(filter);},"Or":function(node,obj){var filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.OR});this.readChildNodes(node,filter);obj.filters.push(filter);},"Not":function(node,obj){var filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.NOT});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsEqualTo":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsNotEqualTo":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsLessThan":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsGreaterThan":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsLessThanOrEqualTo":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsGreaterThanOrEqualTo":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsBetween":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.BETWEEN});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsLike":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(node,filter);var wildCard=node.getAttribute("wildCard");var singleChar=node.getAttribute("singleChar");var esc=node.getAttribute("escape");filter.value2regex(wildCard,singleChar,esc);obj.filters.push(filter);},"Literal":function(node,obj){obj.value=this.getChildValue(node);},"PropertyName":function(node,filter){filter.property=this.getChildValue(node);},"LowerBoundary":function(node,filter){filter.lowerBoundary=this.readOgcExpression(node);},"UpperBoundary":function(node,filter){filter.upperBoundary=this.readOgcExpression(node);}}},readOgcExpression:function(node){var obj={};this.readChildNodes(node,obj);var value=obj.value;if(!value){value=this.getChildValue(node);}
-return value;},cssMap:{"stroke":"strokeColor","stroke-opacity":"strokeOpacity","stroke-width":"strokeWidth","stroke-linecap":"strokeLinecap","fill":"fillColor","fill-opacity":"fillOpacity"},getCssProperty:function(sym){var css=null;for(var prop in this.cssMap){if(this.cssMap[prop]==sym){css=prop;break;}}
-return css;},getGraphicFormat:function(href){var format,regex;for(var key in this.graphicFormats){if(this.graphicFormats[key].test(href)){format=key;break;}}
-return format||this.defautlGraphicFormat;},defaultGraphicFormat:"image/png",graphicFormats:{"image/jpeg":/\.jpe?g$/i,"image/gif":/\.gif$/i,"image/png":/\.png$/i},write:function(sld){return this.writers.sld.StyledLayerDescriptor.apply(this,[sld]);},writers:{"sld":{"StyledLayerDescriptor":function(sld){var root=this.createElementNSPlus("StyledLayerDescriptor",{attributes:{"version":this.VERSION,"xsi:schemaLocation":this.schemaLocation}});if(sld.name){this.writeNode(root,"Name",sld.name);}
-if(sld.title){this.writeNode(root,"Title",sld.title);}
-if(sld.description){this.writeNode(root,"Abstract",sld.description);}
-for(var name in sld.namedLayers){this.writeNode(root,"NamedLayer",sld.namedLayers[name]);}
-return root;},"Name":function(name){return this.createElementNSPlus("Name",{value:name});},"Title":function(title){return this.createElementNSPlus("Title",{value:title});},"Abstract":function(description){return this.createElementNSPlus("Abstract",{value:description});},"NamedLayer":function(layer){var node=this.createElementNSPlus("NamedLayer");this.writeNode(node,"Name",layer.name);if(layer.namedStyles){for(var i=0;i<layer.namedStyles.length;++i){this.writeNode(node,"NamedStyle",layer.namedStyles[i]);}}
-if(layer.userStyles){for(var i=0;i<layer.userStyles.length;++i){this.writeNode(node,"UserStyle",layer.userStyles[i]);}}
-return node;},"NamedStyle":function(name){var node=this.createElementNSPlus("NamedStyle");this.writeNode(node,"Name",name);return node;},"UserStyle":function(style){var node=this.createElementNSPlus("UserStyle");if(style.name){this.writeNode(node,"Name",style.name);}
-if(style.title){this.writeNode(node,"Title",style.title);}
-if(style.description){this.writeNode(node,"Abstract",style.description);}
-if(style.isDefault){this.writeNode(node,"IsDefault",style.isDefault);}
-this.writeNode(node,"FeatureTypeStyle",style);return node;},"IsDefault":function(bool){return this.createElementNSPlus("IsDefault",{value:(bool)?"1":"0"});},"FeatureTypeStyle":function(style){var node=this.createElementNSPlus("FeatureTypeStyle");for(var i=0;i<style.rules.length;++i){this.writeNode(node,"Rule",style.rules[i]);}
-return node;},"Rule":function(rule){var node=this.createElementNSPlus("Rule");if(rule.name){this.writeNode(node,"Name",rule.name);}
-if(rule.title){this.writeNode(node,"Title",rule.title);}
-if(rule.description){this.writeNode(node,"Abstract",rule.description);}
-if(rule.elseFilter){this.writeNode(node,"ElseFilter");}else if(rule.filter){this.writeNode(node,"ogc:Filter",rule.filter);}
-if(rule.minScaleDenominator!=undefined){this.writeNode(node,"MinScaleDenominator",rule.minScaleDenominator);}
-if(rule.maxScaleDenominator!=undefined){this.writeNode(node,"MaxScaleDenominator",rule.maxScaleDenominator);}
-var types=OpenLayers.Style.SYMBOLIZER_PREFIXES;var type,symbolizer;for(var i=0;i<types.length;++i){type=types[i];symbolizer=rule.symbolizer[type];if(symbolizer){this.writeNode(node,type+"Symbolizer",symbolizer);}}
-return node;},"ElseFilter":function(){return this.createElementNSPlus("ElseFilter");},"MinScaleDenominator":function(scale){return this.createElementNSPlus("MinScaleDenominator",{value:scale});},"MaxScaleDenominator":function(scale){return this.createElementNSPlus("MaxScaleDenominator",{value:scale});},"LineSymbolizer":function(symbolizer){var node=this.createElementNSPlus("LineSymbolizer");this.writeNode(node,"Stroke",symbolizer);return node;},"Stroke":function(symbolizer){var node=this.createElementNSPlus("Stroke");if(symbolizer.strokeColor!=undefined){this.writeNode(node,"CssParameter",{symbolizer:symbolizer,key:"strokeColor"});}
-if(symbolizer.strokeOpacity!=undefined){this.writeNode(node,"CssParameter",{symbolizer:symbolizer,key:"strokeOpacity"});}
-if(symbolizer.strokeWidth!=undefined){this.writeNode(node,"CssParameter",{symbolizer:symbolizer,key:"strokeWidth"});}
-return node;},"CssParameter":function(obj){return this.createElementNSPlus("CssParameter",{attributes:{name:this.getCssProperty(obj.key)},value:obj.symbolizer[obj.key]});},"PolygonSymbolizer":function(symbolizer){var node=this.createElementNSPlus("PolygonSymbolizer");this.writeNode(node,"Fill",symbolizer);this.writeNode(node,"Stroke",symbolizer);return node;},"Fill":function(symbolizer){var node=this.createElementNSPlus("Fill");if(symbolizer.fillColor){this.writeNode(node,"CssParameter",{symbolizer:symbolizer,key:"fillColor"});}
-if(symbolizer.fillOpacity){this.writeNode(node,"CssParameter",{symbolizer:symbolizer,key:"fillOpacity"});}
-return node;},"PointSymbolizer":function(symbolizer){var node=this.createElementNSPlus("PointSymbolizer");this.writeNode(node,"Graphic",symbolizer);return node;},"Graphic":function(symbolizer){var node=this.createElementNSPlus("Graphic");if(symbolizer.externalGraphic!=undefined){this.writeNode(node,"ExternalGraphic",symbolizer);}else if(symbolizer.graphicName){this.writeNode(node,"Mark",symbolizer);}
-if(symbolizer.graphicOpacity!=undefined){this.writeNode(node,"Opacity",symbolizer.graphicOpacity);}
-if(symbolizer.pointRadius!=undefined){this.writeNode(node,"Size",symbolizer.pointRadius);}
-if(symbolizer.rotation!=undefined){this.writeNode(node,"Rotation",symbolizer.rotation);}
-return node;},"ExternalGraphic":function(symbolizer){var node=this.createElementNSPlus("ExternalGraphic");this.writeNode(node,"OnlineResource",symbolizer.externalGraphic);var format=symbolizer.graphicFormat||this.getGraphicFormat(symbolizer.externalGraphic);this.writeNode(node,"Format",format);return node;},"Mark":function(symbolizer){var node=this.createElementNSPlus("Mark");this.writeNode(node,"WellKnownName",symbolizer.graphicName);this.writeNode(node,"Fill",symbolizer);this.writeNode(node,"Stroke",symbolizer);return node;},"WellKnownName":function(name){return this.createElementNSPlus("WellKnownName",{value:name});},"Opacity":function(value){return this.createElementNSPlus("Opacity",{value:value});},"Size":function(value){return this.createElementNSPlus("Size",{value:value});},"Rotation":function(value){return this.createElementNSPlus("Rotation",{value:value});},"OnlineResource":function(href){return this.createElementNSPlus("OnlineResource",{attributes:{"xlink:type":"simple","xlink:href":href}});},"Format":function(format){return this.createElementNSPlus("Format",{value:format});}},"ogc":{"Filter":function(filter){var node=this.createElementNSPlus("ogc:Filter");var sub=filter.CLASS_NAME.split(".").pop();if(sub=="FeatureId"){for(var i=0;i<filter.fids.length;++i){this.writeNode(node,"FeatureId",filter.fids[i]);}}else{this.writeNode(node,this.getFilterType(filter),filter);}
-return node;},"FeatureId":function(fid){return this.createElementNSPlus("ogc:FeatureId",{attributes:{fid:fid}});},"And":function(filter){var node=this.createElementNSPlus("ogc:And");var childFilter;for(var i=0;i<filter.filters.length;++i){childFilter=filter.filters[i];this.writeNode(node,this.getFilterType(childFilter),childFilter);}
-return node;},"Or":function(filter){var node=this.createElementNSPlus("ogc:Or");var childFilter;for(var i=0;i<filter.filters.length;++i){childFilter=filter.filters[i];this.writeNode(node,this.getFilterType(childFilter),childFilter);}
-return node;},"Not":function(filter){var node=this.createElementNSPlus("ogc:Not");var childFilter=filter.filters[0];this.writeNode(node,this.getFilterType(childFilter),childFilter);return node;},"PropertyIsEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsEqualTo");this.writeNode(node,"PropertyName",filter);this.writeNode(node,"Literal",filter.value);return node;},"PropertyIsNotEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsNotEqualTo");this.writeNode(node,"PropertyName",filter);this.writeNode(node,"Literal",filter.value);return node;},"PropertyIsLessThan":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsLessThan");this.writeNode(node,"PropertyName",filter);this.writeNode(node,"Literal",filter.value);return node;},"PropertyIsGreaterThan":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsGreaterThan");this.writeNode(node,"PropertyName",filter);this.writeNode(node,"Literal",filter.value);return node;},"PropertyIsLessThanOrEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsLessThanOrEqualTo");this.writeNode(node,"PropertyName",filter);this.writeNode(node,"Literal",filter.value);return node;},"PropertyIsGreaterThanOrEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsGreaterThanOrEqualTo");this.writeNode(node,"PropertyName",filter);this.writeNode(node,"Literal",filter.value);return node;},"PropertyIsBetween":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsBetween");this.writeNode(node,"PropertyName",filter);this.writeNode(node,"LowerBoundary",filter);this.writeNode(node,"UpperBoundary",filter);return node;},"PropertyIsLike":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsLike",{attributes:{wildCard:"*",singleChar:".",escape:"!"}});this.writeNode(node,"PropertyName",filter);this.writeNode(node,"Literal",filter.regex2value());return node;},"PropertyName":function(filter){return this.createElementNSPlus("ogc:PropertyName",{value:filter.property});},"Literal":function(value){return this.createElementNSPlus("ogc:Literal",{value:value});},"LowerBoundary":function(filter){var node=this.createElementNSPlus("ogc:LowerBoundary");this.writeNode(node,"Literal",filter.lowerBoundary);return node;},"UpperBoundary":function(filter){var node=this.createElementNSPlus("ogc:UpperBoundary");this.writeNode(node,"Literal",filter.upperBoundary);return node;}}},getFilterType:function(filter){var filterType=this.filterMap[filter.type];if(!filterType){throw"SLD writing not supported for rule type: "+filter.type;}
-return filterType;},filterMap:{"&&":"And","||":"Or","!":"Not","==":"PropertyIsEqualTo","!=":"PropertyIsNotEqualTo","<":"PropertyIsLessThan",">":"PropertyIsGreaterThan","<=":"PropertyIsLessThanOrEqualTo",">=":"PropertyIsGreaterThanOrEqualTo","..":"PropertyIsBetween","~":"PropertyIsLike"},getNamespacePrefix:function(uri){var prefix=null;if(uri==null){prefix=this.namespaces[this.defaultPrefix];}else{var gotPrefix=false;for(prefix in this.namespaces){if(this.namespaces[prefix]==uri){gotPrefix=true;break;}}
-if(!gotPrefix){prefix=null;}}
-return prefix;},readChildNodes:function(node,obj){var children=node.childNodes;var child,group,reader,prefix,local;for(var i=0;i<children.length;++i){child=children[i];if(child.nodeType==1){prefix=this.getNamespacePrefix(child.namespaceURI);local=child.nodeName.split(":").pop();group=this.readers[prefix];if(group){reader=group[local];if(reader){reader.apply(this,[child,obj]);}}}}},writeNode:function(parent,name,obj){var prefix,local;var split=name.indexOf(":");if(split>0){prefix=name.substring(0,split);local=name.substring(split+1);}else{prefix=this.getNamespacePrefix(parent.namespaceURI);local=name;}
-var child=this.writers[prefix][local].apply(this,[obj]);parent.appendChild(child);return child;},createElementNSPlus:function(name,options){options=options||{};var loc=name.indexOf(":");var uri=options.uri||this.namespaces[options.prefix];if(!uri){loc=name.indexOf(":");uri=this.namespaces[name.substring(0,loc)];}
-if(!uri){uri=this.namespaces[this.defaultPrefix];}
-var node=this.createElementNS(uri,name);if(options.attributes){this.setAttributes(node,options.attributes);}
-if(options.value){node.appendChild(this.createTextNode(options.value));}
-return node;},setAttributes:function(node,obj){var value,loc,alias,uri;for(var name in obj){value=obj[name].toString();uri=this.namespaces[name.substring(0,name.indexOf(":"))]||null;this.setAttributeNS(node,uri,name,value);}},CLASS_NAME:"OpenLayers.Format.SLD.v1"});OpenLayers.Geometry.Curve=OpenLayers.Class(OpenLayers.Geometry.MultiPoint,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(points){OpenLayers.Geometry.MultiPoint.prototype.initialize.apply(this,arguments);},getLength:function(){var length=0.0;if(this.components&&(this.components.length>1)){for(var i=1;i<this.components.length;i++){length+=this.components[i-1].distanceTo(this.components[i]);}}
-return length;},CLASS_NAME:"OpenLayers.Geometry.Curve"});OpenLayers.Format.SLD.v1_0_0=OpenLayers.Class(OpenLayers.Format.SLD.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd",initialize:function(options){OpenLayers.Format.SLD.v1.prototype.initialize.apply(this,[options]);},CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0"});OpenLayers.Geometry.LineString=OpenLayers.Class(OpenLayers.Geometry.Curve,{initialize:function(points){OpenLayers.Geometry.Curve.prototype.initialize.apply(this,arguments);},removeComponent:function(point){if(this.components&&(this.components.length>2)){OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);}},intersects:function(geometry){var intersect=false;var type=geometry.CLASS_NAME;if(type=="OpenLayers.Geometry.LineString"||type=="OpenLayers.Geometry.LinearRing"||type=="OpenLayers.Geometry.Point"){var segs1=this.getSortedSegments();var segs2;if(type=="OpenLayers.Geometry.Point"){segs2=[{x1:geometry.x,y1:geometry.y,x2:geometry.x,y2:geometry.y}];}else{segs2=geometry.getSortedSegments();}
-var seg1,seg1x1,seg1x2,seg1y1,seg1y2,seg2,seg2y1,seg2y2;outer:for(var i=0;i<segs1.length;++i){seg1=segs1[i];seg1x1=seg1.x1;seg1x2=seg1.x2;seg1y1=seg1.y1;seg1y2=seg1.y2;inner:for(var j=0;j<segs2.length;++j){seg2=segs2[j];if(seg2.x1>seg1x2){break;}
+return this.parser;},write:function(obj,options){var version=this.getVersion(null,options);this.parser=this.getParser(version);var root=this.parser.write(obj,options);if(this.stringifyOutput===false){return root;}else{return OpenLayers.Format.XML.prototype.write.apply(this,[root]);}},read:function(data,options){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var root=data.documentElement;var version=this.getVersion(root);this.parser=this.getParser(version);var obj=this.parser.read(data,options);if(this.errorProperty!==null&&obj[this.errorProperty]===undefined){var format=new OpenLayers.Format.OGCExceptionReport();obj.error=format.read(data);}
+obj.version=version;return obj;},CLASS_NAME:"OpenLayers.Format.XML.VersionedOGC"});OpenLayers.Filter=OpenLayers.Class({initialize:function(options){OpenLayers.Util.extend(this,options);},destroy:function(){},evaluate:function(context){return true;},clone:function(){return null;},toString:function(){var string;if(OpenLayers.Format&&OpenLayers.Format.CQL){string=OpenLayers.Format.CQL.prototype.write(this);}else{string=Object.prototype.toString.call(this);}
+return string;},CLASS_NAME:"OpenLayers.Filter"});OpenLayers.Filter.FeatureId=OpenLayers.Class(OpenLayers.Filter,{fids:null,type:"FID",initialize:function(options){this.fids=[];OpenLayers.Filter.prototype.initialize.apply(this,[options]);},evaluate:function(feature){for(var i=0,len=this.fids.length;i<len;i++){var fid=feature.fid||feature.id;if(fid==this.fids[i]){return true;}}
+return false;},clone:function(){var filter=new OpenLayers.Filter.FeatureId();OpenLayers.Util.extend(filter,this);filter.fids=this.fids.slice();return filter;},CLASS_NAME:"OpenLayers.Filter.FeatureId"});OpenLayers.Filter.Logical=OpenLayers.Class(OpenLayers.Filter,{filters:null,type:null,initialize:function(options){this.filters=[];OpenLayers.Filter.prototype.initialize.apply(this,[options]);},destroy:function(){this.filters=null;OpenLayers.Filter.prototype.destroy.apply(this);},evaluate:function(context){var i,len;switch(this.type){case OpenLayers.Filter.Logical.AND:for(i=0,len=this.filters.length;i<len;i++){if(this.filters[i].evaluate(context)==false){return false;}}
+return true;case OpenLayers.Filter.Logical.OR:for(i=0,len=this.filters.length;i<len;i++){if(this.filters[i].evaluate(context)==true){return true;}}
+return false;case OpenLayers.Filter.Logical.NOT:return(!this.filters[0].evaluate(context));}
+return undefined;},clone:function(){var filters=[];for(var i=0,len=this.filters.length;i<len;++i){filters.push(this.filters[i].clone());}
+return new OpenLayers.Filter.Logical({type:this.type,filters:filters});},CLASS_NAME:"OpenLayers.Filter.Logical"});OpenLayers.Filter.Logical.AND="&&";OpenLayers.Filter.Logical.OR="||";OpenLayers.Filter.Logical.NOT="!";OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:true,lowerBoundary:null,upperBoundary:null,initialize:function(options){OpenLayers.Filter.prototype.initialize.apply(this,[options]);if(this.type===OpenLayers.Filter.Comparison.LIKE&&options.matchCase===undefined){this.matchCase=null;}},evaluate:function(context){if(context instanceof OpenLayers.Feature.Vector){context=context.attributes;}
+var result=false;var got=context[this.property];var exp;switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()==exp.toUpperCase());}else{result=(got==exp);}
+break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()!=exp.toUpperCase());}else{result=(got!=exp);}
+break;case OpenLayers.Filter.Comparison.LESS_THAN:result=got<this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN:result=got>this.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:result=got<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:result=got>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:result=(got>=this.lowerBoundary)&&(got<=this.upperBoundary);break;case OpenLayers.Filter.Comparison.LIKE:var regexp=new RegExp(this.value,"gi");result=regexp.test(got);break;}
+return result;},value2regex:function(wildCard,singleChar,escapeChar){if(wildCard=="."){throw new Error("'.' is an unsupported wildCard character for "+"OpenLayers.Filter.Comparison");}
+wildCard=wildCard?wildCard:"*";singleChar=singleChar?singleChar:".";escapeChar=escapeChar?escapeChar:"!";this.value=this.value.replace(new RegExp("\\"+escapeChar+"(.|$)","g"),"\\$1");this.value=this.value.replace(new RegExp("\\"+singleChar,"g"),".");this.value=this.value.replace(new RegExp("\\"+wildCard,"g"),".*");this.value=this.value.replace(new RegExp("\\\\.\\*","g"),"\\"+wildCard);this.value=this.value.replace(new RegExp("\\\\\\.","g"),"\\"+singleChar);return this.value;},regex2value:function(){var value=this.value;value=value.replace(/!/g,"!!");value=value.replace(/(\\)?\\\./g,function($0,$1){return $1?$0:"!.";});value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"!*";});value=value.replace(/\\\\/g,"\\");value=value.replace(/\.\*/g,"*");return value;},clone:function(){return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison(),this);},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Filter.Spatial=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,distance:null,distanceUnits:null,evaluate:function(feature){var intersect=false;switch(this.type){case OpenLayers.Filter.Spatial.BBOX:case OpenLayers.Filter.Spatial.INTERSECTS:if(feature.geometry){var geom=this.value;if(this.value.CLASS_NAME=="OpenLayers.Bounds"){geom=this.value.toGeometry();}
+if(feature.geometry.intersects(geom)){intersect=true;}}
+break;default:throw new Error('evaluate is not implemented for this filter type.');}
+return intersect;},clone:function(){var options=OpenLayers.Util.applyDefaults({value:this.value&&this.value.clone&&this.value.clone()},this);return new OpenLayers.Filter.Spatial(options);},CLASS_NAME:"OpenLayers.Filter.Spatial"});OpenLayers.Filter.Spatial.BBOX="BBOX";OpenLayers.Filter.Spatial.INTERSECTS="INTERSECTS";OpenLayers.Filter.Spatial.DWITHIN="DWITHIN";OpenLayers.Filter.Spatial.WITHIN="WITHIN";OpenLayers.Filter.Spatial.CONTAINS="CONTAINS";OpenLayers.Format.SLD=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{profile:null,defaultVersion:"1.0.0",stringifyOutput:true,namedLayersAsArray:false,CLASS_NAME:"OpenLayers.Format.SLD"});OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){this.id=null;this.bounds=null;},clone:function(){return new OpenLayers.Geometry();},setBounds:function(bounds){if(bounds){this.bounds=bounds.clone();}},clearBounds:function(){this.bounds=null;if(this.parent){this.parent.clearBounds();}},extendBounds:function(newBounds){var bounds=this.getBounds();if(!bounds){this.setBounds(newBounds);}else{this.bounds.extend(newBounds);}},getBounds:function(){if(this.bounds==null){this.calculateBounds();}
+return this.bounds;},calculateBounds:function(){},distanceTo:function(geometry,options){},getVertices:function(nodes){},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;var bounds=this.getBounds();if((bounds!=null)&&(lonlat!=null)){var dX=(toleranceLon!=null)?toleranceLon:0;var dY=(toleranceLat!=null)?toleranceLat:0;var toleranceBounds=new OpenLayers.Bounds(this.bounds.left-dX,this.bounds.bottom-dY,this.bounds.right+dX,this.bounds.top+dY);atPoint=toleranceBounds.containsLonLat(lonlat);}
+return atPoint;},getLength:function(){return 0.0;},getArea:function(){return 0.0;},getCentroid:function(){return null;},toString:function(){var string;if(OpenLayers.Format&&OpenLayers.Format.WKT){string=OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this));}else{string=Object.prototype.toString.call(this);}
+return string;},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.fromWKT=function(wkt){var geom;if(OpenLayers.Format&&OpenLayers.Format.WKT){var format=OpenLayers.Geometry.fromWKT.format;if(!format){format=new OpenLayers.Format.WKT();OpenLayers.Geometry.fromWKT.format=format;}
+var result=format.read(wkt);if(result instanceof OpenLayers.Feature.Vector){geom=result.geometry;}else if(OpenLayers.Util.isArray(result)){var len=result.length;var components=new Array(len);for(var i=0;i<len;++i){components[i]=result[i].geometry;}
+geom=new OpenLayers.Geometry.Collection(components);}}
+return geom;};OpenLayers.Geometry.segmentsIntersect=function(seg1,seg2,options){var point=options&&options.point;var tolerance=options&&options.tolerance;var intersection=false;var x11_21=seg1.x1-seg2.x1;var y11_21=seg1.y1-seg2.y1;var x12_11=seg1.x2-seg1.x1;var y12_11=seg1.y2-seg1.y1;var y22_21=seg2.y2-seg2.y1;var x22_21=seg2.x2-seg2.x1;var d=(y22_21*x12_11)-(x22_21*y12_11);var n1=(x22_21*y11_21)-(y22_21*x11_21);var n2=(x12_11*y11_21)-(y12_11*x11_21);if(d==0){if(n1==0&&n2==0){intersection=true;}}else{var along1=n1/d;var along2=n2/d;if(along1>=0&&along1<=1&&along2>=0&&along2<=1){if(!point){intersection=true;}else{var x=seg1.x1+(along1*x12_11);var y=seg1.y1+(along1*y12_11);intersection=new OpenLayers.Geometry.Point(x,y);}}}
+if(tolerance){var dist;if(intersection){if(point){var segs=[seg1,seg2];var seg,x,y;outer:for(var i=0;i<2;++i){seg=segs[i];for(var j=1;j<3;++j){x=seg["x"+j];y=seg["y"+j];dist=Math.sqrt(Math.pow(x-intersection.x,2)+
+Math.pow(y-intersection.y,2));if(dist<tolerance){intersection.x=x;intersection.y=y;break outer;}}}}}else{var segs=[seg1,seg2];var source,target,x,y,p,result;outer:for(var i=0;i<2;++i){source=segs[i];target=segs[(i+1)%2];for(var j=1;j<3;++j){p={x:source["x"+j],y:source["y"+j]};result=OpenLayers.Geometry.distanceToSegment(p,target);if(result.distance<tolerance){if(point){intersection=new OpenLayers.Geometry.Point(p.x,p.y);}else{intersection=true;}
+break outer;}}}}}
+return intersection;};OpenLayers.Geometry.distanceToSegment=function(point,segment){var x0=point.x;var y0=point.y;var x1=segment.x1;var y1=segment.y1;var x2=segment.x2;var y2=segment.y2;var dx=x2-x1;var dy=y2-y1;var along=((dx*(x0-x1))+(dy*(y0-y1)))/(Math.pow(dx,2)+Math.pow(dy,2));var x,y;if(along<=0.0){x=x1;y=y1;}else if(along>=1.0){x=x2;y=y2;}else{x=x1+along*dx;y=y1+along*dy;}
+return{distance:Math.sqrt(Math.pow(x-x0,2)+Math.pow(y-y0,2)),x:x,y:y};};OpenLayers.Geometry.Point=OpenLayers.Class(OpenLayers.Geometry,{x:null,y:null,initialize:function(x,y){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.x=parseFloat(x);this.y=parseFloat(y);},clone:function(obj){if(obj==null){obj=new OpenLayers.Geometry.Point(this.x,this.y);}
+OpenLayers.Util.applyDefaults(obj,this);return obj;},calculateBounds:function(){this.bounds=new OpenLayers.Bounds(this.x,this.y,this.x,this.y);},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var details=edge&&options&&options.details;var distance,x0,y0,x1,y1,result;if(geometry instanceof OpenLayers.Geometry.Point){x0=this.x;y0=this.y;x1=geometry.x;y1=geometry.y;distance=Math.sqrt(Math.pow(x0-x1,2)+Math.pow(y0-y1,2));result=!details?distance:{x0:x0,y0:y0,x1:x1,y1:y1,distance:distance};}else{result=geometry.distanceTo(this,options);if(details){result={x0:result.x1,y0:result.y1,x1:result.x0,y1:result.y0,distance:result.distance};}}
+return result;},equals:function(geom){var equals=false;if(geom!=null){equals=((this.x==geom.x&&this.y==geom.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(geom.x)&&isNaN(geom.y)));}
+return equals;},toShortString:function(){return(this.x+", "+this.y);},move:function(x,y){this.x=this.x+x;this.y=this.y+y;this.clearBounds();},rotate:function(angle,origin){angle*=Math.PI/180;var radius=this.distanceTo(origin);var theta=angle+Math.atan2(this.y-origin.y,this.x-origin.x);this.x=origin.x+(radius*Math.cos(theta));this.y=origin.y+(radius*Math.sin(theta));this.clearBounds();},getCentroid:function(){return new OpenLayers.Geometry.Point(this.x,this.y);},resize:function(scale,origin,ratio){ratio=(ratio==undefined)?1:ratio;this.x=origin.x+(scale*ratio*(this.x-origin.x));this.y=origin.y+(scale*(this.y-origin.y));this.clearBounds();return this;},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.equals(geometry);}else{intersect=geometry.intersects(this);}
+return intersect;},transform:function(source,dest){if((source&&dest)){OpenLayers.Projection.transform(this,source,dest);this.bounds=null;}
+return this;},getVertices:function(nodes){return[this];},CLASS_NAME:"OpenLayers.Geometry.Point"});OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(components){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];if(components!=null){this.addComponents(components);}},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments);},clone:function(){var geometry=eval("new "+this.CLASS_NAME+"()");for(var i=0,len=this.components.length;i<len;i++){geometry.addComponent(this.components[i].clone());}
+OpenLayers.Util.applyDefaults(geometry,this);return geometry;},getComponentsString:function(){var strings=[];for(var i=0,len=this.components.length;i<len;i++){strings.push(this.components[i].toShortString());}
+return strings.join(",");},calculateBounds:function(){this.bounds=null;var bounds=new OpenLayers.Bounds();var components=this.components;if(components){for(var i=0,len=components.length;i<len;i++){bounds.extend(components[i].getBounds());}}
+if(bounds.left!=null&&bounds.bottom!=null&&bounds.right!=null&&bounds.top!=null){this.setBounds(bounds);}},addComponents:function(components){if(!(OpenLayers.Util.isArray(components))){components=[components];}
+for(var i=0,len=components.length;i<len;i++){this.addComponent(components[i]);}},addComponent:function(component,index){var added=false;if(component){if(this.componentTypes==null||(OpenLayers.Util.indexOf(this.componentTypes,component.CLASS_NAME)>-1)){if(index!=null&&(index<this.components.length)){var components1=this.components.slice(0,index);var components2=this.components.slice(index,this.components.length);components1.push(component);this.components=components1.concat(components2);}else{this.components.push(component);}
+component.parent=this;this.clearBounds();added=true;}}
+return added;},removeComponents:function(components){var removed=false;if(!(OpenLayers.Util.isArray(components))){components=[components];}
+for(var i=components.length-1;i>=0;--i){removed=this.removeComponent(components[i])||removed;}
+return removed;},removeComponent:function(component){OpenLayers.Util.removeItem(this.components,component);this.clearBounds();return true;},getLength:function(){var length=0.0;for(var i=0,len=this.components.length;i<len;i++){length+=this.components[i].getLength();}
+return length;},getArea:function(){var area=0.0;for(var i=0,len=this.components.length;i<len;i++){area+=this.components[i].getArea();}
+return area;},getGeodesicArea:function(projection){var area=0.0;for(var i=0,len=this.components.length;i<len;i++){area+=this.components[i].getGeodesicArea(projection);}
+return area;},getCentroid:function(weighted){if(!weighted){return this.components.length&&this.components[0].getCentroid();}
+var len=this.components.length;if(!len){return false;}
+var areas=[];var centroids=[];var areaSum=0;var minArea=Number.MAX_VALUE;var component;for(var i=0;i<len;++i){component=this.components[i];var area=component.getArea();var centroid=component.getCentroid(true);if(isNaN(area)||isNaN(centroid.x)||isNaN(centroid.y)){continue;}
+areas.push(area);areaSum+=area;minArea=(area<minArea&&area>0)?area:minArea;centroids.push(centroid);}
+len=areas.length;if(areaSum===0){for(var i=0;i<len;++i){areas[i]=1;}
+areaSum=areas.length;}else{for(var i=0;i<len;++i){areas[i]/=minArea;}
+areaSum/=minArea;}
+var xSum=0,ySum=0,centroid,area;for(var i=0;i<len;++i){centroid=centroids[i];area=areas[i];xSum+=centroid.x*area;ySum+=centroid.y*area;}
+return new OpenLayers.Geometry.Point(xSum/areaSum,ySum/areaSum);},getGeodesicLength:function(projection){var length=0.0;for(var i=0,len=this.components.length;i<len;i++){length+=this.components[i].getGeodesicLength(projection);}
+return length;},move:function(x,y){for(var i=0,len=this.components.length;i<len;i++){this.components[i].move(x,y);}},rotate:function(angle,origin){for(var i=0,len=this.components.length;i<len;++i){this.components[i].rotate(angle,origin);}},resize:function(scale,origin,ratio){for(var i=0;i<this.components.length;++i){this.components[i].resize(scale,origin,ratio);}
+return this;},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var details=edge&&options&&options.details;var result,best,distance;var min=Number.POSITIVE_INFINITY;for(var i=0,len=this.components.length;i<len;++i){result=this.components[i].distanceTo(geometry,options);distance=details?result.distance:result;if(distance<min){min=distance;best=result;if(min==0){break;}}}
+return best;},equals:function(geometry){var equivalent=true;if(!geometry||!geometry.CLASS_NAME||(this.CLASS_NAME!=geometry.CLASS_NAME)){equivalent=false;}else if(!(OpenLayers.Util.isArray(geometry.components))||(geometry.components.length!=this.components.length)){equivalent=false;}else{for(var i=0,len=this.components.length;i<len;++i){if(!this.components[i].equals(geometry.components[i])){equivalent=false;break;}}}
+return equivalent;},transform:function(source,dest){if(source&&dest){for(var i=0,len=this.components.length;i<len;i++){var component=this.components[i];component.transform(source,dest);}
+this.bounds=null;}
+return this;},intersects:function(geometry){var intersect=false;for(var i=0,len=this.components.length;i<len;++i){intersect=geometry.intersects(this.components[i]);if(intersect){break;}}
+return intersect;},getVertices:function(nodes){var vertices=[];for(var i=0,len=this.components.length;i<len;++i){Array.prototype.push.apply(vertices,this.components[i].getVertices(nodes));}
+return vertices;},CLASS_NAME:"OpenLayers.Geometry.Collection"});OpenLayers.Geometry.MultiPoint=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Point"],addPoint:function(point,index){this.addComponent(point,index);},removePoint:function(point){this.removeComponent(point);},CLASS_NAME:"OpenLayers.Geometry.MultiPoint"});OpenLayers.Geometry.Curve=OpenLayers.Class(OpenLayers.Geometry.MultiPoint,{componentTypes:["OpenLayers.Geometry.Point"],getLength:function(){var length=0.0;if(this.components&&(this.components.length>1)){for(var i=1,len=this.components.length;i<len;i++){length+=this.components[i-1].distanceTo(this.components[i]);}}
+return length;},getGeodesicLength:function(projection){var geom=this;if(projection){var gg=new OpenLayers.Projection("EPSG:4326");if(!gg.equals(projection)){geom=this.clone().transform(projection,gg);}}
+var length=0.0;if(geom.components&&(geom.components.length>1)){var p1,p2;for(var i=1,len=geom.components.length;i<len;i++){p1=geom.components[i-1];p2=geom.components[i];length+=OpenLayers.Util.distVincenty({lon:p1.x,lat:p1.y},{lon:p2.x,lat:p2.y});}}
+return length*1000;},CLASS_NAME:"OpenLayers.Geometry.Curve"});OpenLayers.Geometry.LineString=OpenLayers.Class(OpenLayers.Geometry.Curve,{removeComponent:function(point){var removed=this.components&&(this.components.length>2);if(removed){OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);}
+return removed;},intersects:function(geometry){var intersect=false;var type=geometry.CLASS_NAME;if(type=="OpenLayers.Geometry.LineString"||type=="OpenLayers.Geometry.LinearRing"||type=="OpenLayers.Geometry.Point"){var segs1=this.getSortedSegments();var segs2;if(type=="OpenLayers.Geometry.Point"){segs2=[{x1:geometry.x,y1:geometry.y,x2:geometry.x,y2:geometry.y}];}else{segs2=geometry.getSortedSegments();}
+var seg1,seg1x1,seg1x2,seg1y1,seg1y2,seg2,seg2y1,seg2y2;outer:for(var i=0,len=segs1.length;i<len;++i){seg1=segs1[i];seg1x1=seg1.x1;seg1x2=seg1.x2;seg1y1=seg1.y1;seg1y2=seg1.y2;inner:for(var j=0,jlen=segs2.length;j<jlen;++j){seg2=segs2[j];if(seg2.x1>seg1x2){break;}
if(seg2.x2<seg1x1){continue;}
seg2y1=seg2.y1;seg2y2=seg2.y2;if(Math.min(seg2y1,seg2y2)>Math.max(seg1y1,seg1y2)){continue;}
if(Math.max(seg2y1,seg2y2)<Math.min(seg1y1,seg1y2)){continue;}
if(OpenLayers.Geometry.segmentsIntersect(seg1,seg2)){intersect=true;break outer;}}}}else{intersect=geometry.intersects(this);}
-return intersect;},getSortedSegments:function(){var numSeg=this.components.length-1;var segments=new Array(numSeg);for(var i=0;i<numSeg;++i){point1=this.components[i];point2=this.components[i+1];if(point1.x<point2.x){segments[i]={x1:point1.x,y1:point1.y,x2:point2.x,y2:point2.y};}else{segments[i]={x1:point2.x,y1:point2.y,x2:point1.x,y2:point1.y};}}
+return intersect;},getSortedSegments:function(){var numSeg=this.components.length-1;var segments=new Array(numSeg),point1,point2;for(var i=0;i<numSeg;++i){point1=this.components[i];point2=this.components[i+1];if(point1.x<point2.x){segments[i]={x1:point1.x,y1:point1.y,x2:point2.x,y2:point2.y};}else{segments[i]={x1:point2.x,y1:point2.y,x2:point1.x,y2:point1.y};}}
function byX1(seg1,seg2){return seg1.x1-seg2.x1;}
-return segments.sort(byX1);},CLASS_NAME:"OpenLayers.Geometry.LineString"});OpenLayers.Format.GML=OpenLayers.Class(OpenLayers.Format.XML,{featureNS:"http://mapserver.gis.umn.edu/mapserver",featurePrefix:"feature",featureName:"featureMember",layerName:"features",geometryName:"geometry",collectionName:"FeatureCollection",gmlns:"http://www.opengis.net/gml",extractAttributes:true,xy:true,initialize:function(options){this.regExes={trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)};OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+return segments.sort(byX1);},splitWithSegment:function(seg,options){var edge=!(options&&options.edge===false);var tolerance=options&&options.tolerance;var lines=[];var verts=this.getVertices();var points=[];var intersections=[];var split=false;var vert1,vert2,point;var node,vertex,target;var interOptions={point:true,tolerance:tolerance};var result=null;for(var i=0,stop=verts.length-2;i<=stop;++i){vert1=verts[i];points.push(vert1.clone());vert2=verts[i+1];target={x1:vert1.x,y1:vert1.y,x2:vert2.x,y2:vert2.y};point=OpenLayers.Geometry.segmentsIntersect(seg,target,interOptions);if(point instanceof OpenLayers.Geometry.Point){if((point.x===seg.x1&&point.y===seg.y1)||(point.x===seg.x2&&point.y===seg.y2)||point.equals(vert1)||point.equals(vert2)){vertex=true;}else{vertex=false;}
+if(vertex||edge){if(!point.equals(intersections[intersections.length-1])){intersections.push(point.clone());}
+if(i===0){if(point.equals(vert1)){continue;}}
+if(point.equals(vert2)){continue;}
+split=true;if(!point.equals(vert1)){points.push(point);}
+lines.push(new OpenLayers.Geometry.LineString(points));points=[point.clone()];}}}
+if(split){points.push(vert2.clone());lines.push(new OpenLayers.Geometry.LineString(points));}
+if(intersections.length>0){var xDir=seg.x1<seg.x2?1:-1;var yDir=seg.y1<seg.y2?1:-1;result={lines:lines,points:intersections.sort(function(p1,p2){return(xDir*p1.x-xDir*p2.x)||(yDir*p1.y-yDir*p2.y);})};}
+return result;},split:function(target,options){var results=null;var mutual=options&&options.mutual;var sourceSplit,targetSplit,sourceParts,targetParts;if(target instanceof OpenLayers.Geometry.LineString){var verts=this.getVertices();var vert1,vert2,seg,splits,lines,point;var points=[];sourceParts=[];for(var i=0,stop=verts.length-2;i<=stop;++i){vert1=verts[i];vert2=verts[i+1];seg={x1:vert1.x,y1:vert1.y,x2:vert2.x,y2:vert2.y};targetParts=targetParts||[target];if(mutual){points.push(vert1.clone());}
+for(var j=0;j<targetParts.length;++j){splits=targetParts[j].splitWithSegment(seg,options);if(splits){lines=splits.lines;if(lines.length>0){lines.unshift(j,1);Array.prototype.splice.apply(targetParts,lines);j+=lines.length-2;}
+if(mutual){for(var k=0,len=splits.points.length;k<len;++k){point=splits.points[k];if(!point.equals(vert1)){points.push(point);sourceParts.push(new OpenLayers.Geometry.LineString(points));if(point.equals(vert2)){points=[];}else{points=[point.clone()];}}}}}}}
+if(mutual&&sourceParts.length>0&&points.length>0){points.push(vert2.clone());sourceParts.push(new OpenLayers.Geometry.LineString(points));}}else{results=target.splitWith(this,options);}
+if(targetParts&&targetParts.length>1){targetSplit=true;}else{targetParts=[];}
+if(sourceParts&&sourceParts.length>1){sourceSplit=true;}else{sourceParts=[];}
+if(targetSplit||sourceSplit){if(mutual){results=[sourceParts,targetParts];}else{results=targetParts;}}
+return results;},splitWith:function(geometry,options){return geometry.split(this,options);},getVertices:function(nodes){var vertices;if(nodes===true){vertices=[this.components[0],this.components[this.components.length-1]];}else if(nodes===false){vertices=this.components.slice(1,this.components.length-1);}else{vertices=this.components.slice();}
+return vertices;},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var details=edge&&options&&options.details;var result,best={};var min=Number.POSITIVE_INFINITY;if(geometry instanceof OpenLayers.Geometry.Point){var segs=this.getSortedSegments();var x=geometry.x;var y=geometry.y;var seg;for(var i=0,len=segs.length;i<len;++i){seg=segs[i];result=OpenLayers.Geometry.distanceToSegment(geometry,seg);if(result.distance<min){min=result.distance;best=result;if(min===0){break;}}else{if(seg.x2>x&&((y>seg.y1&&y<seg.y2)||(y<seg.y1&&y>seg.y2))){break;}}}
+if(details){best={distance:best.distance,x0:best.x,y0:best.y,x1:x,y1:y};}else{best=best.distance;}}else if(geometry instanceof OpenLayers.Geometry.LineString){var segs0=this.getSortedSegments();var segs1=geometry.getSortedSegments();var seg0,seg1,intersection,x0,y0;var len1=segs1.length;var interOptions={point:true};outer:for(var i=0,len=segs0.length;i<len;++i){seg0=segs0[i];x0=seg0.x1;y0=seg0.y1;for(var j=0;j<len1;++j){seg1=segs1[j];intersection=OpenLayers.Geometry.segmentsIntersect(seg0,seg1,interOptions);if(intersection){min=0;best={distance:0,x0:intersection.x,y0:intersection.y,x1:intersection.x,y1:intersection.y};break outer;}else{result=OpenLayers.Geometry.distanceToSegment({x:x0,y:y0},seg1);if(result.distance<min){min=result.distance;best={distance:min,x0:x0,y0:y0,x1:result.x,y1:result.y};}}}}
+if(!details){best=best.distance;}
+if(min!==0){if(seg0){result=geometry.distanceTo(new OpenLayers.Geometry.Point(seg0.x2,seg0.y2),options);var dist=details?result.distance:result;if(dist<min){if(details){best={distance:min,x0:result.x1,y0:result.y1,x1:result.x0,y1:result.y0};}else{best=dist;}}}}}else{best=geometry.distanceTo(this,options);if(details){best={distance:best.distance,x0:best.x1,y0:best.y1,x1:best.x0,y1:best.y0};}}
+return best;},simplify:function(tolerance){if(this&&this!==null){var points=this.getVertices();if(points.length<3){return this;}
+var compareNumbers=function(a,b){return(a-b);};var douglasPeuckerReduction=function(points,firstPoint,lastPoint,tolerance){var maxDistance=0;var indexFarthest=0;for(var index=firstPoint,distance;index<lastPoint;index++){distance=perpendicularDistance(points[firstPoint],points[lastPoint],points[index]);if(distance>maxDistance){maxDistance=distance;indexFarthest=index;}}
+if(maxDistance>tolerance&&indexFarthest!=firstPoint){pointIndexsToKeep.push(indexFarthest);douglasPeuckerReduction(points,firstPoint,indexFarthest,tolerance);douglasPeuckerReduction(points,indexFarthest,lastPoint,tolerance);}};var perpendicularDistance=function(point1,point2,point){var area=Math.abs(0.5*(point1.x*point2.y+point2.x*point.y+point.x*point1.y-point2.x*point1.y-point.x*point2.y-point1.x*point.y));var bottom=Math.sqrt(Math.pow(point1.x-point2.x,2)+Math.pow(point1.y-point2.y,2));var height=area/bottom*2;return height;};var firstPoint=0;var lastPoint=points.length-1;var pointIndexsToKeep=[];pointIndexsToKeep.push(firstPoint);pointIndexsToKeep.push(lastPoint);while(points[firstPoint].equals(points[lastPoint])){lastPoint--;pointIndexsToKeep.push(lastPoint);}
+douglasPeuckerReduction(points,firstPoint,lastPoint,tolerance);var returnPoints=[];pointIndexsToKeep.sort(compareNumbers);for(var index=0;index<pointIndexsToKeep.length;index++){returnPoints.push(points[pointIndexsToKeep[index]]);}
+return new OpenLayers.Geometry.LineString(returnPoints);}
+else{return this;}},CLASS_NAME:"OpenLayers.Geometry.LineString"});OpenLayers.Geometry.MultiLineString=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LineString"],split:function(geometry,options){var results=null;var mutual=options&&options.mutual;var splits,sourceLine,sourceLines,sourceSplit,targetSplit;var sourceParts=[];var targetParts=[geometry];for(var i=0,len=this.components.length;i<len;++i){sourceLine=this.components[i];sourceSplit=false;for(var j=0;j<targetParts.length;++j){splits=sourceLine.split(targetParts[j],options);if(splits){if(mutual){sourceLines=splits[0];for(var k=0,klen=sourceLines.length;k<klen;++k){if(k===0&&sourceParts.length){sourceParts[sourceParts.length-1].addComponent(sourceLines[k]);}else{sourceParts.push(new OpenLayers.Geometry.MultiLineString([sourceLines[k]]));}}
+sourceSplit=true;splits=splits[1];}
+if(splits.length){splits.unshift(j,1);Array.prototype.splice.apply(targetParts,splits);break;}}}
+if(!sourceSplit){if(sourceParts.length){sourceParts[sourceParts.length-1].addComponent(sourceLine.clone());}else{sourceParts=[new OpenLayers.Geometry.MultiLineString(sourceLine.clone())];}}}
+if(sourceParts&&sourceParts.length>1){sourceSplit=true;}else{sourceParts=[];}
+if(targetParts&&targetParts.length>1){targetSplit=true;}else{targetParts=[];}
+if(sourceSplit||targetSplit){if(mutual){results=[sourceParts,targetParts];}else{results=targetParts;}}
+return results;},splitWith:function(geometry,options){var results=null;var mutual=options&&options.mutual;var splits,targetLine,sourceLines,sourceSplit,targetSplit,sourceParts,targetParts;if(geometry instanceof OpenLayers.Geometry.LineString){targetParts=[];sourceParts=[geometry];for(var i=0,len=this.components.length;i<len;++i){targetSplit=false;targetLine=this.components[i];for(var j=0;j<sourceParts.length;++j){splits=sourceParts[j].split(targetLine,options);if(splits){if(mutual){sourceLines=splits[0];if(sourceLines.length){sourceLines.unshift(j,1);Array.prototype.splice.apply(sourceParts,sourceLines);j+=sourceLines.length-2;}
+splits=splits[1];if(splits.length===0){splits=[targetLine.clone()];}}
+for(var k=0,klen=splits.length;k<klen;++k){if(k===0&&targetParts.length){targetParts[targetParts.length-1].addComponent(splits[k]);}else{targetParts.push(new OpenLayers.Geometry.MultiLineString([splits[k]]));}}
+targetSplit=true;}}
+if(!targetSplit){if(targetParts.length){targetParts[targetParts.length-1].addComponent(targetLine.clone());}else{targetParts=[new OpenLayers.Geometry.MultiLineString([targetLine.clone()])];}}}}else{results=geometry.split(this);}
+if(sourceParts&&sourceParts.length>1){sourceSplit=true;}else{sourceParts=[];}
+if(targetParts&&targetParts.length>1){targetSplit=true;}else{targetParts=[];}
+if(sourceSplit||targetSplit){if(mutual){results=[sourceParts,targetParts];}else{results=targetParts;}}
+return results;},CLASS_NAME:"OpenLayers.Geometry.MultiLineString"});OpenLayers.Geometry.LinearRing=OpenLayers.Class(OpenLayers.Geometry.LineString,{componentTypes:["OpenLayers.Geometry.Point"],addComponent:function(point,index){var added=false;var lastPoint=this.components.pop();if(index!=null||!point.equals(lastPoint)){added=OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,arguments);}
+var firstPoint=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[firstPoint]);return added;},removeComponent:function(point){var removed=this.components&&(this.components.length>3);if(removed){this.components.pop();OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);var firstPoint=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[firstPoint]);}
+return removed;},move:function(x,y){for(var i=0,len=this.components.length;i<len-1;i++){this.components[i].move(x,y);}},rotate:function(angle,origin){for(var i=0,len=this.components.length;i<len-1;++i){this.components[i].rotate(angle,origin);}},resize:function(scale,origin,ratio){for(var i=0,len=this.components.length;i<len-1;++i){this.components[i].resize(scale,origin,ratio);}
+return this;},transform:function(source,dest){if(source&&dest){for(var i=0,len=this.components.length;i<len-1;i++){var component=this.components[i];component.transform(source,dest);}
+this.bounds=null;}
+return this;},getCentroid:function(){if(this.components){var len=this.components.length;if(len>0&&len<=2){return this.components[0].clone();}else if(len>2){var sumX=0.0;var sumY=0.0;var x0=this.components[0].x;var y0=this.components[0].y;var area=-1*this.getArea();if(area!=0){for(var i=0;i<len-1;i++){var b=this.components[i];var c=this.components[i+1];sumX+=(b.x+c.x-2*x0)*((b.x-x0)*(c.y-y0)-(c.x-x0)*(b.y-y0));sumY+=(b.y+c.y-2*y0)*((b.x-x0)*(c.y-y0)-(c.x-x0)*(b.y-y0));}
+var x=x0+sumX/(6*area);var y=y0+sumY/(6*area);}else{for(var i=0;i<len-1;i++){sumX+=this.components[i].x;sumY+=this.components[i].y;}
+var x=sumX/(len-1);var y=sumY/(len-1);}
+return new OpenLayers.Geometry.Point(x,y);}else{return null;}}},getArea:function(){var area=0.0;if(this.components&&(this.components.length>2)){var sum=0.0;for(var i=0,len=this.components.length;i<len-1;i++){var b=this.components[i];var c=this.components[i+1];sum+=(b.x+c.x)*(c.y-b.y);}
+area=-sum/2.0;}
+return area;},getGeodesicArea:function(projection){var ring=this;if(projection){var gg=new OpenLayers.Projection("EPSG:4326");if(!gg.equals(projection)){ring=this.clone().transform(projection,gg);}}
+var area=0.0;var len=ring.components&&ring.components.length;if(len>2){var p1,p2;for(var i=0;i<len-1;i++){p1=ring.components[i];p2=ring.components[i+1];area+=OpenLayers.Util.rad(p2.x-p1.x)*(2+Math.sin(OpenLayers.Util.rad(p1.y))+
+Math.sin(OpenLayers.Util.rad(p2.y)));}
+area=area*6378137.0*6378137.0/2.0;}
+return area;},containsPoint:function(point){var approx=OpenLayers.Number.limitSigDigs;var digs=14;var px=approx(point.x,digs);var py=approx(point.y,digs);function getX(y,x1,y1,x2,y2){return(y-y2)*((x2-x1)/(y2-y1))+x2;}
+var numSeg=this.components.length-1;var start,end,x1,y1,x2,y2,cx,cy;var crosses=0;for(var i=0;i<numSeg;++i){start=this.components[i];x1=approx(start.x,digs);y1=approx(start.y,digs);end=this.components[i+1];x2=approx(end.x,digs);y2=approx(end.y,digs);if(y1==y2){if(py==y1){if(x1<=x2&&(px>=x1&&px<=x2)||x1>=x2&&(px<=x1&&px>=x2)){crosses=-1;break;}}
+continue;}
+cx=approx(getX(py,x1,y1,x2,y2),digs);if(cx==px){if(y1<y2&&(py>=y1&&py<=y2)||y1>y2&&(py<=y1&&py>=y2)){crosses=-1;break;}}
+if(cx<=px){continue;}
+if(x1!=x2&&(cx<Math.min(x1,x2)||cx>Math.max(x1,x2))){continue;}
+if(y1<y2&&(py>=y1&&py<y2)||y1>y2&&(py<y1&&py>=y2)){++crosses;}}
+var contained=(crosses==-1)?1:!!(crosses&1);return contained;},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.containsPoint(geometry);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"){intersect=geometry.intersects(this);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){intersect=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[geometry]);}else{for(var i=0,len=geometry.components.length;i<len;++i){intersect=geometry.components[i].intersects(this);if(intersect){break;}}}
+return intersect;},getVertices:function(nodes){return(nodes===true)?[]:this.components.slice(0,this.components.length-1);},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],getArea:function(){var area=0.0;if(this.components&&(this.components.length>0)){area+=Math.abs(this.components[0].getArea());for(var i=1,len=this.components.length;i<len;i++){area-=Math.abs(this.components[i].getArea());}}
+return area;},getGeodesicArea:function(projection){var area=0.0;if(this.components&&(this.components.length>0)){area+=Math.abs(this.components[0].getGeodesicArea(projection));for(var i=1,len=this.components.length;i<len;i++){area-=Math.abs(this.components[i].getGeodesicArea(projection));}}
+return area;},containsPoint:function(point){var numRings=this.components.length;var contained=false;if(numRings>0){contained=this.components[0].containsPoint(point);if(contained!==1){if(contained&&numRings>1){var hole;for(var i=1;i<numRings;++i){hole=this.components[i].containsPoint(point);if(hole){if(hole===1){contained=1;}else{contained=false;}
+break;}}}}}
+return contained;},intersects:function(geometry){var intersect=false;var i,len;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.containsPoint(geometry);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"||geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){for(i=0,len=this.components.length;i<len;++i){intersect=geometry.intersects(this.components[i]);if(intersect){break;}}
+if(!intersect){for(i=0,len=geometry.components.length;i<len;++i){intersect=this.containsPoint(geometry.components[i]);if(intersect){break;}}}}else{for(i=0,len=geometry.components.length;i<len;++i){intersect=this.intersects(geometry.components[i]);if(intersect){break;}}}
+if(!intersect&&geometry.CLASS_NAME=="OpenLayers.Geometry.Polygon"){var ring=this.components[0];for(i=0,len=ring.components.length;i<len;++i){intersect=geometry.containsPoint(ring.components[i]);if(intersect){break;}}}
+return intersect;},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var result;if(!edge&&this.intersects(geometry)){result=0;}else{result=OpenLayers.Geometry.Collection.prototype.distanceTo.apply(this,[geometry,options]);}
+return result;},CLASS_NAME:"OpenLayers.Geometry.Polygon"});OpenLayers.Geometry.Polygon.createRegularPolygon=function(origin,radius,sides,rotation){var angle=Math.PI*((1/sides)-(1/2));if(rotation){angle+=(rotation/180)*Math.PI;}
+var rotatedAngle,x,y;var points=[];for(var i=0;i<sides;++i){rotatedAngle=angle+(i*2*Math.PI/sides);x=origin.x+(radius*Math.cos(rotatedAngle));y=origin.y+(radius*Math.sin(rotatedAngle));points.push(new OpenLayers.Geometry.Point(x,y));}
+var ring=new OpenLayers.Geometry.LinearRing(points);return new OpenLayers.Geometry.Polygon([ring]);};OpenLayers.Geometry.MultiPolygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Polygon"],CLASS_NAME:"OpenLayers.Geometry.MultiPolygon"});OpenLayers.Format.GML=OpenLayers.Class(OpenLayers.Format.XML,{featureNS:"http://mapserver.gis.umn.edu/mapserver",featurePrefix:"feature",featureName:"featureMember",layerName:"features",geometryName:"geometry",collectionName:"FeatureCollection",gmlns:"http://www.opengis.net/gml",extractAttributes:true,xy:true,initialize:function(options){this.regExes={trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)};OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
var featureNodes=this.getElementsByTagNameNS(data.documentElement,this.gmlns,this.featureName);var features=[];for(var i=0;i<featureNodes.length;i++){var feature=this.parseFeature(featureNodes[i]);if(feature){features.push(feature);}}
-return features;},parseFeature:function(node){var order=["MultiPolygon","Polygon","MultiLineString","LineString","MultiPoint","Point","Envelope"];var type,nodeList,geometry,parser;for(var i=0;i<order.length;++i){type=order[i];nodeList=this.getElementsByTagNameNS(node,this.gmlns,type);if(nodeList.length>0){var parser=this.parseGeometry[type.toLowerCase()];if(parser){geometry=parser.apply(this,[nodeList[0]]);if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}}else{OpenLayers.Console.error(OpenLayers.i18n("unsupportedGeometryType",{'geomType':type}));}
+return features;},parseFeature:function(node){var order=["MultiPolygon","Polygon","MultiLineString","LineString","MultiPoint","Point","Envelope"];var type,nodeList,geometry,parser;for(var i=0;i<order.length;++i){type=order[i];nodeList=this.getElementsByTagNameNS(node,this.gmlns,type);if(nodeList.length>0){parser=this.parseGeometry[type.toLowerCase()];if(parser){geometry=parser.apply(this,[nodeList[0]]);if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}}else{throw new TypeError("Unsupported geometry type: "+type);}
break;}}
+var bounds;var boxNodes=this.getElementsByTagNameNS(node,this.gmlns,"Box");for(i=0;i<boxNodes.length;++i){var boxNode=boxNodes[i];var box=this.parseGeometry["box"].apply(this,[boxNode]);var parentNode=boxNode.parentNode;var parentName=parentNode.localName||parentNode.nodeName.split(":").pop();if(parentName==="boundedBy"){bounds=box;}else{geometry=box.toGeometry();}}
var attributes;if(this.extractAttributes){attributes=this.parseAttributes(node);}
-var feature=new OpenLayers.Feature.Vector(geometry,attributes);var childNode=node.firstChild;var fid;while(childNode){if(childNode.nodeType==1){fid=childNode.getAttribute("fid")||childNode.getAttribute("id");if(fid){break;}}
+var feature=new OpenLayers.Feature.Vector(geometry,attributes);feature.bounds=bounds;feature.gml={featureType:node.firstChild.nodeName.split(":")[1],featureNS:node.firstChild.namespaceURI,featureNSPrefix:node.firstChild.prefix};var childNode=node.firstChild;var fid;while(childNode){if(childNode.nodeType==1){fid=childNode.getAttribute("fid")||childNode.getAttribute("id");if(fid){break;}}
childNode=childNode.nextSibling;}
feature.fid=fid;return feature;},parseGeometry:{point:function(node){var nodeList,coordString;var coords=[];var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"pos");if(nodeList.length>0){coordString=nodeList[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.trimSpace,"");coords=coordString.split(this.regExes.splitSpace);}
if(coords.length==0){nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coordinates");if(nodeList.length>0){coordString=nodeList[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.removeSpace,"");coords=coordString.split(",");}}
@@ -1167,8 +761,8 @@ if(coords.length==0){nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coord
if(coords.length==2){coords[2]=null;}
if(this.xy){return new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}
else{return new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]);}},multipoint:function(node){var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"Point");var components=[];if(nodeList.length>0){var point;for(var i=0;i<nodeList.length;++i){point=this.parseGeometry.point.apply(this,[nodeList[i]]);if(point){components.push(point);}}}
-return new OpenLayers.Geometry.MultiPoint(components);},linestring:function(node,ring){var nodeList,coordString;var coords=[];var points=[];nodeList=this.getElementsByTagNameNS(node,this.gmlns,"posList");if(nodeList.length>0){coordString=this.concatChildValues(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coords=coordString.split(this.regExes.splitSpace);var dim=parseInt(nodeList[0].getAttribute("dimension"));var j,x,y,z;for(var i=0;i<coords.length/dim;++i){j=i*dim;x=coords[j];y=coords[j+1];z=(dim==2)?null:coords[j+2];if(this.xy){points.push(new OpenLayers.Geometry.Point(x,y,z));}else{points.push(new OpenLayers.Geometry.Point(y,x,z));}}}
-if(coords.length==0){nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coordinates");if(nodeList.length>0){coordString=this.concatChildValues(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coordString=coordString.replace(this.regExes.trimComma,",");var pointList=coordString.split(this.regExes.splitSpace);for(var i=0;i<pointList.length;++i){coords=pointList[i].split(",");if(coords.length==2){coords[2]=null;}
+return new OpenLayers.Geometry.MultiPoint(components);},linestring:function(node,ring){var nodeList,coordString;var coords=[];var points=[];nodeList=this.getElementsByTagNameNS(node,this.gmlns,"posList");if(nodeList.length>0){coordString=this.getChildValue(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coords=coordString.split(this.regExes.splitSpace);var dim=parseInt(nodeList[0].getAttribute("dimension"));var j,x,y,z;for(var i=0;i<coords.length/dim;++i){j=i*dim;x=coords[j];y=coords[j+1];z=(dim==2)?null:coords[j+2];if(this.xy){points.push(new OpenLayers.Geometry.Point(x,y,z));}else{points.push(new OpenLayers.Geometry.Point(y,x,z));}}}
+if(coords.length==0){nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coordinates");if(nodeList.length>0){coordString=this.getChildValue(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coordString=coordString.replace(this.regExes.trimComma,",");var pointList=coordString.split(this.regExes.splitSpace);for(var i=0;i<pointList.length;++i){coords=pointList[i].split(",");if(coords.length==2){coords[2]=null;}
if(this.xy){points.push(new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]));}else{points.push(new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]));}}}}
var line=null;if(points.length!=0){if(ring){line=new OpenLayers.Geometry.LinearRing(points);}else{line=new OpenLayers.Geometry.LineString(points);}}
return line;},multilinestring:function(node){var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"LineString");var components=[];if(nodeList.length>0){var line;for(var i=0;i<nodeList.length;++i){line=this.parseGeometry.linestring.apply(this,[nodeList[i]]);if(line){components.push(line);}}}
@@ -1181,10 +775,11 @@ var upoint=this.getElementsByTagNameNS(node,this.gmlns,"upperCorner");if(upoint.
if(coords.length==2){coords[2]=null;}
if(this.xy){var upperPoint=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{var upperPoint=new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]);}}
if(lowerPoint&&upperPoint){components.push(new OpenLayers.Geometry.Point(lowerPoint.x,lowerPoint.y));components.push(new OpenLayers.Geometry.Point(upperPoint.x,lowerPoint.y));components.push(new OpenLayers.Geometry.Point(upperPoint.x,upperPoint.y));components.push(new OpenLayers.Geometry.Point(lowerPoint.x,upperPoint.y));components.push(new OpenLayers.Geometry.Point(lowerPoint.x,lowerPoint.y));var ring=new OpenLayers.Geometry.LinearRing(components);envelope=new OpenLayers.Geometry.Polygon([ring]);}
-return envelope;}},parseAttributes:function(node){var attributes={};var childNode=node.firstChild;var children,i,child,grandchildren,grandchild,name,value;while(childNode){if(childNode.nodeType==1){children=childNode.childNodes;for(i=0;i<children.length;++i){child=children[i];if(child.nodeType==1){grandchildren=child.childNodes;if(grandchildren.length==1){grandchild=grandchildren[0];if(grandchild.nodeType==3||grandchild.nodeType==4){name=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;value=grandchild.nodeValue.replace(this.regExes.trimSpace,"");attributes[name]=value;}}}}
+return envelope;},box:function(node){var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coordinates");var coordString;var coords,beginPoint=null,endPoint=null;if(nodeList.length>0){coordString=nodeList[0].firstChild.nodeValue;coords=coordString.split(" ");if(coords.length==2){beginPoint=coords[0].split(",");endPoint=coords[1].split(",");}}
+if(beginPoint!==null&&endPoint!==null){return new OpenLayers.Bounds(parseFloat(beginPoint[0]),parseFloat(beginPoint[1]),parseFloat(endPoint[0]),parseFloat(endPoint[1]));}}},parseAttributes:function(node){var attributes={};var childNode=node.firstChild;var children,i,child,grandchildren,grandchild,name,value;while(childNode){if(childNode.nodeType==1){children=childNode.childNodes;for(i=0;i<children.length;++i){child=children[i];if(child.nodeType==1){grandchildren=child.childNodes;if(grandchildren.length==1){grandchild=grandchildren[0];if(grandchild.nodeType==3||grandchild.nodeType==4){name=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;value=grandchild.nodeValue.replace(this.regExes.trimSpace,"");attributes[name]=value;}}else{attributes[child.nodeName.split(":").pop()]=null;}}}
break;}
childNode=childNode.nextSibling;}
-return attributes;},write:function(features){if(!(features instanceof Array)){features=[features];}
+return attributes;},write:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];}
var gml=this.createElementNS("http://www.opengis.net/wfs","wfs:"+this.collectionName);for(var i=0;i<features.length;i++){gml.appendChild(this.createFeatureXML(features[i]));}
return OpenLayers.Format.XML.prototype.write.apply(this,[gml]);},createFeatureXML:function(feature){var geometry=feature.geometry;var geometryNode=this.buildGeometryNode(geometry);var geomContainer=this.createElementNS(this.featureNS,this.featurePrefix+":"+
this.geometryName);geomContainer.appendChild(geometryNode);var featureNode=this.createElementNS(this.gmlns,"gml:"+this.featureName);var featureContainer=this.createElementNS(this.featureNS,this.featurePrefix+":"+
@@ -1195,82 +790,998 @@ var className=geometry.CLASS_NAME;var type=className.substring(className.lastInd
return gml;},linestring:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:LineString");gml.appendChild(this.buildCoordinatesNode(geometry));return gml;},multilinestring:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:MultiLineString");var lines=geometry.components;var lineMember,lineGeom;for(var i=0;i<lines.length;++i){lineMember=this.createElementNS(this.gmlns,"gml:lineStringMember");lineGeom=this.buildGeometry.linestring.apply(this,[lines[i]]);lineMember.appendChild(lineGeom);gml.appendChild(lineMember);}
return gml;},linearring:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:LinearRing");gml.appendChild(this.buildCoordinatesNode(geometry));return gml;},polygon:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:Polygon");var rings=geometry.components;var ringMember,ringGeom,type;for(var i=0;i<rings.length;++i){type=(i==0)?"outerBoundaryIs":"innerBoundaryIs";ringMember=this.createElementNS(this.gmlns,"gml:"+type);ringGeom=this.buildGeometry.linearring.apply(this,[rings[i]]);ringMember.appendChild(ringGeom);gml.appendChild(ringMember);}
return gml;},multipolygon:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:MultiPolygon");var polys=geometry.components;var polyMember,polyGeom;for(var i=0;i<polys.length;++i){polyMember=this.createElementNS(this.gmlns,"gml:polygonMember");polyGeom=this.buildGeometry.polygon.apply(this,[polys[i]]);polyMember.appendChild(polyGeom);gml.appendChild(polyMember);}
-return gml;}},buildCoordinatesNode:function(geometry){var coordinatesNode=this.createElementNS(this.gmlns,"gml:coordinates");coordinatesNode.setAttribute("decimal",".");coordinatesNode.setAttribute("cs",",");coordinatesNode.setAttribute("ts"," ");var points=(geometry.components)?geometry.components:[geometry];var parts=[];for(var i=0;i<points.length;i++){parts.push(points[i].x+","+points[i].y);}
-var txtNode=this.createTextNode(parts.join(" "));coordinatesNode.appendChild(txtNode);return coordinatesNode;},CLASS_NAME:"OpenLayers.Format.GML"});OpenLayers.Format.GeoJSON=OpenLayers.Class(OpenLayers.Format.JSON,{initialize:function(options){OpenLayers.Format.JSON.prototype.initialize.apply(this,[options]);},read:function(json,type,filter){type=(type)?type:"FeatureCollection";var results=null;var obj=null;if(typeof json=="string"){obj=OpenLayers.Format.JSON.prototype.read.apply(this,[json,filter]);}else{obj=json;}
+return gml;},bounds:function(bounds){var gml=this.createElementNS(this.gmlns,"gml:Box");gml.appendChild(this.buildCoordinatesNode(bounds));return gml;}},buildCoordinatesNode:function(geometry){var coordinatesNode=this.createElementNS(this.gmlns,"gml:coordinates");coordinatesNode.setAttribute("decimal",".");coordinatesNode.setAttribute("cs",",");coordinatesNode.setAttribute("ts"," ");var parts=[];if(geometry instanceof OpenLayers.Bounds){parts.push(geometry.left+","+geometry.bottom);parts.push(geometry.right+","+geometry.top);}else{var points=(geometry.components)?geometry.components:[geometry];for(var i=0;i<points.length;i++){parts.push(points[i].x+","+points[i].y);}}
+var txtNode=this.createTextNode(parts.join(" "));coordinatesNode.appendChild(txtNode);return coordinatesNode;},CLASS_NAME:"OpenLayers.Format.GML"});if(!OpenLayers.Format.GML){OpenLayers.Format.GML={};}
+OpenLayers.Format.GML.Base=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",wfs:"http://www.opengis.net/wfs"},defaultPrefix:"gml",schemaLocation:null,featureType:null,featureNS:null,geometryName:"geometry",extractAttributes:true,srsName:null,xy:true,geometryTypes:null,singleFeatureType:null,regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g),featureMember:(/^(.*:)?featureMembers?$/)},initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);this.setGeometryTypes();if(options&&options.featureNS){this.setNamespace("feature",options.featureNS);}
+this.singleFeatureType=!options||(typeof options.featureType==="string");},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var features=[];this.readNode(data,{features:features},true);if(features.length==0){var elements=this.getElementsByTagNameNS(data,this.namespaces.gml,"featureMember");if(elements.length){for(var i=0,len=elements.length;i<len;++i){this.readNode(elements[i],{features:features},true);}}else{var elements=this.getElementsByTagNameNS(data,this.namespaces.gml,"featureMembers");if(elements.length){this.readNode(elements[0],{features:features},true);}}}
+return features;},readNode:function(node,obj,first){if(first===true&&this.autoConfig===true){this.featureType=null;delete this.namespaceAlias[this.featureNS];delete this.namespaces["feature"];this.featureNS=null;}
+if(!this.featureNS&&(!(node.prefix in this.namespaces)&&node.parentNode.namespaceURI==this.namespaces["gml"]&&this.regExes.featureMember.test(node.parentNode.nodeName))){this.featureType=node.nodeName.split(":").pop();this.setNamespace("feature",node.namespaceURI);this.featureNS=node.namespaceURI;this.autoConfig=true;}
+return OpenLayers.Format.XML.prototype.readNode.apply(this,[node,obj]);},readers:{"gml":{"featureMember":function(node,obj){this.readChildNodes(node,obj);},"featureMembers":function(node,obj){this.readChildNodes(node,obj);},"name":function(node,obj){obj.name=this.getChildValue(node);},"boundedBy":function(node,obj){var container={};this.readChildNodes(node,container);if(container.components&&container.components.length>0){obj.bounds=container.components[0];}},"Point":function(node,container){var obj={points:[]};this.readChildNodes(node,obj);if(!container.components){container.components=[];}
+container.components.push(obj.points[0]);},"coordinates":function(node,obj){var str=this.getChildValue(node).replace(this.regExes.trimSpace,"");str=str.replace(this.regExes.trimComma,",");var pointList=str.split(this.regExes.splitSpace);var coords;var numPoints=pointList.length;var points=new Array(numPoints);for(var i=0;i<numPoints;++i){coords=pointList[i].split(",");if(this.xy){points[i]=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{points[i]=new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]);}}
+obj.points=points;},"coord":function(node,obj){var coord={};this.readChildNodes(node,coord);if(!obj.points){obj.points=[];}
+obj.points.push(new OpenLayers.Geometry.Point(coord.x,coord.y,coord.z));},"X":function(node,coord){coord.x=this.getChildValue(node);},"Y":function(node,coord){coord.y=this.getChildValue(node);},"Z":function(node,coord){coord.z=this.getChildValue(node);},"MultiPoint":function(node,container){var obj={components:[]};this.readChildNodes(node,obj);container.components=[new OpenLayers.Geometry.MultiPoint(obj.components)];},"pointMember":function(node,obj){this.readChildNodes(node,obj);},"LineString":function(node,container){var obj={};this.readChildNodes(node,obj);if(!container.components){container.components=[];}
+container.components.push(new OpenLayers.Geometry.LineString(obj.points));},"MultiLineString":function(node,container){var obj={components:[]};this.readChildNodes(node,obj);container.components=[new OpenLayers.Geometry.MultiLineString(obj.components)];},"lineStringMember":function(node,obj){this.readChildNodes(node,obj);},"Polygon":function(node,container){var obj={outer:null,inner:[]};this.readChildNodes(node,obj);obj.inner.unshift(obj.outer);if(!container.components){container.components=[];}
+container.components.push(new OpenLayers.Geometry.Polygon(obj.inner));},"LinearRing":function(node,obj){var container={};this.readChildNodes(node,container);obj.components=[new OpenLayers.Geometry.LinearRing(container.points)];},"MultiPolygon":function(node,container){var obj={components:[]};this.readChildNodes(node,obj);container.components=[new OpenLayers.Geometry.MultiPolygon(obj.components)];},"polygonMember":function(node,obj){this.readChildNodes(node,obj);},"GeometryCollection":function(node,container){var obj={components:[]};this.readChildNodes(node,obj);container.components=[new OpenLayers.Geometry.Collection(obj.components)];},"geometryMember":function(node,obj){this.readChildNodes(node,obj);}},"feature":{"*":function(node,obj){var name;var local=node.localName||node.nodeName.split(":").pop();if(obj.features){if(!this.singleFeatureType&&(OpenLayers.Util.indexOf(this.featureType,local)!==-1)){name="_typeName";}else if(local===this.featureType){name="_typeName";}}else{if(node.childNodes.length==0||(node.childNodes.length==1&&node.firstChild.nodeType==3)){if(this.extractAttributes){name="_attribute";}}else{name="_geometry";}}
+if(name){this.readers.feature[name].apply(this,[node,obj]);}},"_typeName":function(node,obj){var container={components:[],attributes:{}};this.readChildNodes(node,container);if(container.name){container.attributes.name=container.name;}
+var feature=new OpenLayers.Feature.Vector(container.components[0],container.attributes);if(!this.singleFeatureType){feature.type=node.nodeName.split(":").pop();feature.namespace=node.namespaceURI;}
+var fid=node.getAttribute("fid")||this.getAttributeNS(node,this.namespaces["gml"],"id");if(fid){feature.fid=fid;}
+if(this.internalProjection&&this.externalProjection&&feature.geometry){feature.geometry.transform(this.externalProjection,this.internalProjection);}
+if(container.bounds){feature.bounds=container.bounds;}
+obj.features.push(feature);},"_geometry":function(node,obj){if(!this.geometryName){this.geometryName=node.nodeName.split(":").pop();}
+this.readChildNodes(node,obj);},"_attribute":function(node,obj){var local=node.localName||node.nodeName.split(":").pop();var value=this.getChildValue(node);obj.attributes[local]=value;}},"wfs":{"FeatureCollection":function(node,obj){this.readChildNodes(node,obj);}}},write:function(features){var name;if(OpenLayers.Util.isArray(features)){name="featureMembers";}else{name="featureMember";}
+var root=this.writeNode("gml:"+name,features);this.setAttributeNS(root,this.namespaces["xsi"],"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[root]);},writers:{"gml":{"featureMember":function(feature){var node=this.createElementNSPlus("gml:featureMember");this.writeNode("feature:_typeName",feature,node);return node;},"MultiPoint":function(geometry){var node=this.createElementNSPlus("gml:MultiPoint");var components=geometry.components||[geometry];for(var i=0,ii=components.length;i<ii;++i){this.writeNode("pointMember",components[i],node);}
+return node;},"pointMember":function(geometry){var node=this.createElementNSPlus("gml:pointMember");this.writeNode("Point",geometry,node);return node;},"MultiLineString":function(geometry){var node=this.createElementNSPlus("gml:MultiLineString");var components=geometry.components||[geometry];for(var i=0,ii=components.length;i<ii;++i){this.writeNode("lineStringMember",components[i],node);}
+return node;},"lineStringMember":function(geometry){var node=this.createElementNSPlus("gml:lineStringMember");this.writeNode("LineString",geometry,node);return node;},"MultiPolygon":function(geometry){var node=this.createElementNSPlus("gml:MultiPolygon");var components=geometry.components||[geometry];for(var i=0,ii=components.length;i<ii;++i){this.writeNode("polygonMember",components[i],node);}
+return node;},"polygonMember":function(geometry){var node=this.createElementNSPlus("gml:polygonMember");this.writeNode("Polygon",geometry,node);return node;},"GeometryCollection":function(geometry){var node=this.createElementNSPlus("gml:GeometryCollection");for(var i=0,len=geometry.components.length;i<len;++i){this.writeNode("geometryMember",geometry.components[i],node);}
+return node;},"geometryMember":function(geometry){var node=this.createElementNSPlus("gml:geometryMember");var child=this.writeNode("feature:_geometry",geometry);node.appendChild(child.firstChild);return node;}},"feature":{"_typeName":function(feature){var node=this.createElementNSPlus("feature:"+this.featureType,{attributes:{fid:feature.fid}});if(feature.geometry){this.writeNode("feature:_geometry",feature.geometry,node);}
+for(var name in feature.attributes){var value=feature.attributes[name];if(value!=null){this.writeNode("feature:_attribute",{name:name,value:value},node);}}
+return node;},"_geometry":function(geometry){if(this.externalProjection&&this.internalProjection){geometry=geometry.clone().transform(this.internalProjection,this.externalProjection);}
+var node=this.createElementNSPlus("feature:"+this.geometryName);var type=this.geometryTypes[geometry.CLASS_NAME];var child=this.writeNode("gml:"+type,geometry,node);if(this.srsName){child.setAttribute("srsName",this.srsName);}
+return node;},"_attribute":function(obj){return this.createElementNSPlus("feature:"+obj.name,{value:obj.value});}},"wfs":{"FeatureCollection":function(features){var node=this.createElementNSPlus("wfs:FeatureCollection");for(var i=0,len=features.length;i<len;++i){this.writeNode("gml:featureMember",features[i],node);}
+return node;}}},setGeometryTypes:function(){this.geometryTypes={"OpenLayers.Geometry.Point":"Point","OpenLayers.Geometry.MultiPoint":"MultiPoint","OpenLayers.Geometry.LineString":"LineString","OpenLayers.Geometry.MultiLineString":"MultiLineString","OpenLayers.Geometry.Polygon":"Polygon","OpenLayers.Geometry.MultiPolygon":"MultiPolygon","OpenLayers.Geometry.Collection":"GeometryCollection"};},CLASS_NAME:"OpenLayers.Format.GML.Base"});OpenLayers.Format.GML.v2=OpenLayers.Class(OpenLayers.Format.GML.Base,{schemaLocation:"http://www.opengis.net/gml http://schemas.opengis.net/gml/2.1.2/feature.xsd",initialize:function(options){OpenLayers.Format.GML.Base.prototype.initialize.apply(this,[options]);},readers:{"gml":OpenLayers.Util.applyDefaults({"outerBoundaryIs":function(node,container){var obj={};this.readChildNodes(node,obj);container.outer=obj.components[0];},"innerBoundaryIs":function(node,container){var obj={};this.readChildNodes(node,obj);container.inner.push(obj.components[0]);},"Box":function(node,container){var obj={};this.readChildNodes(node,obj);if(!container.components){container.components=[];}
+var min=obj.points[0];var max=obj.points[1];container.components.push(new OpenLayers.Bounds(min.x,min.y,max.x,max.y));}},OpenLayers.Format.GML.Base.prototype.readers["gml"]),"feature":OpenLayers.Format.GML.Base.prototype.readers["feature"],"wfs":OpenLayers.Format.GML.Base.prototype.readers["wfs"]},write:function(features){var name;if(OpenLayers.Util.isArray(features)){name="wfs:FeatureCollection";}else{name="gml:featureMember";}
+var root=this.writeNode(name,features);this.setAttributeNS(root,this.namespaces["xsi"],"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[root]);},writers:{"gml":OpenLayers.Util.applyDefaults({"Point":function(geometry){var node=this.createElementNSPlus("gml:Point");this.writeNode("coordinates",[geometry],node);return node;},"coordinates":function(points){var numPoints=points.length;var parts=new Array(numPoints);var point;for(var i=0;i<numPoints;++i){point=points[i];if(this.xy){parts[i]=point.x+","+point.y;}else{parts[i]=point.y+","+point.x;}
+if(point.z!=undefined){parts[i]+=","+point.z;}}
+return this.createElementNSPlus("gml:coordinates",{attributes:{decimal:".",cs:",",ts:" "},value:(numPoints==1)?parts[0]:parts.join(" ")});},"LineString":function(geometry){var node=this.createElementNSPlus("gml:LineString");this.writeNode("coordinates",geometry.components,node);return node;},"Polygon":function(geometry){var node=this.createElementNSPlus("gml:Polygon");this.writeNode("outerBoundaryIs",geometry.components[0],node);for(var i=1;i<geometry.components.length;++i){this.writeNode("innerBoundaryIs",geometry.components[i],node);}
+return node;},"outerBoundaryIs":function(ring){var node=this.createElementNSPlus("gml:outerBoundaryIs");this.writeNode("LinearRing",ring,node);return node;},"innerBoundaryIs":function(ring){var node=this.createElementNSPlus("gml:innerBoundaryIs");this.writeNode("LinearRing",ring,node);return node;},"LinearRing":function(ring){var node=this.createElementNSPlus("gml:LinearRing");this.writeNode("coordinates",ring.components,node);return node;},"Box":function(bounds){var node=this.createElementNSPlus("gml:Box");this.writeNode("coordinates",[{x:bounds.left,y:bounds.bottom},{x:bounds.right,y:bounds.top}],node);if(this.srsName){node.setAttribute("srsName",this.srsName);}
+return node;}},OpenLayers.Format.GML.Base.prototype.writers["gml"]),"feature":OpenLayers.Format.GML.Base.prototype.writers["feature"],"wfs":OpenLayers.Format.GML.Base.prototype.writers["wfs"]},CLASS_NAME:"OpenLayers.Format.GML.v2"});OpenLayers.Format.Filter=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.Filter"});OpenLayers.Filter.Function=OpenLayers.Class(OpenLayers.Filter,{name:null,params:null,CLASS_NAME:"OpenLayers.Filter.Function"});OpenLayers.Format.Filter.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"ogc",schemaLocation:null,initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){var obj={};this.readers.ogc["Filter"].apply(this,[data,obj]);return obj.filter;},readers:{"ogc":{"_expression":function(node){var obj,value="";for(var child=node.firstChild;child;child=child.nextSibling){switch(child.nodeType){case 1:obj=this.readNode(child);if(obj.property){value+="${"+obj.property+"}";}else if(obj.value!==undefined){value+=obj.value;}
+break;case 3:case 4:value+=child.nodeValue;}}
+return value;},"Filter":function(node,parent){var obj={fids:[],filters:[]};this.readChildNodes(node,obj);if(obj.fids.length>0){parent.filter=new OpenLayers.Filter.FeatureId({fids:obj.fids});}else if(obj.filters.length>0){parent.filter=obj.filters[0];}},"FeatureId":function(node,obj){var fid=node.getAttribute("fid");if(fid){obj.fids.push(fid);}},"And":function(node,obj){var filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND});this.readChildNodes(node,filter);obj.filters.push(filter);},"Or":function(node,obj){var filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.OR});this.readChildNodes(node,filter);obj.filters.push(filter);},"Not":function(node,obj){var filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.NOT});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsLessThan":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsGreaterThan":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsLessThanOrEqualTo":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsGreaterThanOrEqualTo":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsBetween":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.BETWEEN});this.readChildNodes(node,filter);obj.filters.push(filter);},"Literal":function(node,obj){obj.value=OpenLayers.String.numericIf(this.getChildValue(node),true);},"PropertyName":function(node,filter){filter.property=this.getChildValue(node);},"LowerBoundary":function(node,filter){filter.lowerBoundary=OpenLayers.String.numericIf(this.readers.ogc._expression.call(this,node),true);},"UpperBoundary":function(node,filter){filter.upperBoundary=OpenLayers.String.numericIf(this.readers.ogc._expression.call(this,node),true);},"Intersects":function(node,obj){this.readSpatial(node,obj,OpenLayers.Filter.Spatial.INTERSECTS);},"Within":function(node,obj){this.readSpatial(node,obj,OpenLayers.Filter.Spatial.WITHIN);},"Contains":function(node,obj){this.readSpatial(node,obj,OpenLayers.Filter.Spatial.CONTAINS);},"DWithin":function(node,obj){this.readSpatial(node,obj,OpenLayers.Filter.Spatial.DWITHIN);},"Distance":function(node,obj){obj.distance=parseInt(this.getChildValue(node));obj.distanceUnits=node.getAttribute("units");},"Function":function(node,obj){return;}}},readSpatial:function(node,obj,type){var filter=new OpenLayers.Filter.Spatial({type:type});this.readChildNodes(node,filter);filter.value=filter.components[0];delete filter.components;obj.filters.push(filter);},writeOgcExpression:function(value,node){if(value instanceof OpenLayers.Filter.Function){var child=this.writeNode("Function",value,node);node.appendChild(child);}else{this.writeNode("Literal",value,node);}
+return node;},write:function(filter){return this.writers.ogc["Filter"].apply(this,[filter]);},writeFeatureIdNodes:function(filter,node){for(var i=0,ii=filter.fids.length;i<ii;++i){this.writeNode("FeatureId",filter.fids[i],node);}},writers:{"ogc":{"Filter":function(filter){var node=this.createElementNSPlus("ogc:Filter");if(filter.type==="FID"){OpenLayers.Format.Filter.v1.prototype.writeFeatureIdNodes.call(this,filter,node);}else{this.writeNode(this.getFilterType(filter),filter,node);}
+return node;},"FeatureId":function(fid){return this.createElementNSPlus("ogc:FeatureId",{attributes:{fid:fid}});},"And":function(filter){var node=this.createElementNSPlus("ogc:And");var childFilter;for(var i=0,ii=filter.filters.length;i<ii;++i){childFilter=filter.filters[i];if(childFilter.type==="FID"){OpenLayers.Format.Filter.v1.prototype.writeFeatureIdNodes.call(this,childFilter,node);}else{this.writeNode(this.getFilterType(childFilter),childFilter,node);}}
+return node;},"Or":function(filter){var node=this.createElementNSPlus("ogc:Or");var childFilter;for(var i=0,ii=filter.filters.length;i<ii;++i){childFilter=filter.filters[i];if(childFilter.type==="FID"){OpenLayers.Format.Filter.v1.prototype.writeFeatureIdNodes.call(this,childFilter,node);}else{this.writeNode(this.getFilterType(childFilter),childFilter,node);}}
+return node;},"Not":function(filter){var node=this.createElementNSPlus("ogc:Not");var childFilter=filter.filters[0];if(childFilter.type==="FID"){OpenLayers.Format.Filter.v1.prototype.writeFeatureIdNodes.call(this,childFilter,node);}else{this.writeNode(this.getFilterType(childFilter),childFilter,node);}
+return node;},"PropertyIsLessThan":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsLessThan");this.writeNode("PropertyName",filter,node);this.writeOgcExpression(filter.value,node);return node;},"PropertyIsGreaterThan":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsGreaterThan");this.writeNode("PropertyName",filter,node);this.writeOgcExpression(filter.value,node);return node;},"PropertyIsLessThanOrEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsLessThanOrEqualTo");this.writeNode("PropertyName",filter,node);this.writeOgcExpression(filter.value,node);return node;},"PropertyIsGreaterThanOrEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsGreaterThanOrEqualTo");this.writeNode("PropertyName",filter,node);this.writeOgcExpression(filter.value,node);return node;},"PropertyIsBetween":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsBetween");this.writeNode("PropertyName",filter,node);this.writeNode("LowerBoundary",filter,node);this.writeNode("UpperBoundary",filter,node);return node;},"PropertyName":function(filter){return this.createElementNSPlus("ogc:PropertyName",{value:filter.property});},"Literal":function(value){return this.createElementNSPlus("ogc:Literal",{value:value});},"LowerBoundary":function(filter){var node=this.createElementNSPlus("ogc:LowerBoundary");this.writeOgcExpression(filter.lowerBoundary,node);return node;},"UpperBoundary":function(filter){var node=this.createElementNSPlus("ogc:UpperBoundary");this.writeNode("Literal",filter.upperBoundary,node);return node;},"INTERSECTS":function(filter){return this.writeSpatial(filter,"Intersects");},"WITHIN":function(filter){return this.writeSpatial(filter,"Within");},"CONTAINS":function(filter){return this.writeSpatial(filter,"Contains");},"DWITHIN":function(filter){var node=this.writeSpatial(filter,"DWithin");this.writeNode("Distance",filter,node);return node;},"Distance":function(filter){return this.createElementNSPlus("ogc:Distance",{attributes:{units:filter.distanceUnits},value:filter.distance});},"Function":function(filter){var node=this.createElementNSPlus("ogc:Function",{attributes:{name:filter.name}});var params=filter.params;for(var i=0,len=params.length;i<len;i++){this.writeOgcExpression(params[i],node);}
+return node;}}},getFilterType:function(filter){var filterType=this.filterMap[filter.type];if(!filterType){throw"Filter writing not supported for rule type: "+filter.type;}
+return filterType;},filterMap:{"&&":"And","||":"Or","!":"Not","==":"PropertyIsEqualTo","!=":"PropertyIsNotEqualTo","<":"PropertyIsLessThan",">":"PropertyIsGreaterThan","<=":"PropertyIsLessThanOrEqualTo",">=":"PropertyIsGreaterThanOrEqualTo","..":"PropertyIsBetween","~":"PropertyIsLike","BBOX":"BBOX","DWITHIN":"DWITHIN","WITHIN":"WITHIN","CONTAINS":"CONTAINS","INTERSECTS":"INTERSECTS","FID":"FeatureId"},CLASS_NAME:"OpenLayers.Format.Filter.v1"});OpenLayers.Format.Filter.v1_0_0=OpenLayers.Class(OpenLayers.Format.GML.v2,OpenLayers.Format.Filter.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/ogc/filter/1.0.0/filter.xsd",initialize:function(options){OpenLayers.Format.GML.v2.prototype.initialize.apply(this,[options]);},readers:{"ogc":OpenLayers.Util.applyDefaults({"PropertyIsEqualTo":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsNotEqualTo":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsLike":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(node,filter);var wildCard=node.getAttribute("wildCard");var singleChar=node.getAttribute("singleChar");var esc=node.getAttribute("escape");filter.value2regex(wildCard,singleChar,esc);obj.filters.push(filter);}},OpenLayers.Format.Filter.v1.prototype.readers["ogc"]),"gml":OpenLayers.Format.GML.v2.prototype.readers["gml"],"feature":OpenLayers.Format.GML.v2.prototype.readers["feature"]},writers:{"ogc":OpenLayers.Util.applyDefaults({"PropertyIsEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsEqualTo");this.writeNode("PropertyName",filter,node);this.writeOgcExpression(filter.value,node);return node;},"PropertyIsNotEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsNotEqualTo");this.writeNode("PropertyName",filter,node);this.writeOgcExpression(filter.value,node);return node;},"PropertyIsLike":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsLike",{attributes:{wildCard:"*",singleChar:".",escape:"!"}});this.writeNode("PropertyName",filter,node);this.writeNode("Literal",filter.regex2value(),node);return node;},"BBOX":function(filter){var node=this.createElementNSPlus("ogc:BBOX");filter.property&&this.writeNode("PropertyName",filter,node);var box=this.writeNode("gml:Box",filter.value,node);if(filter.projection){box.setAttribute("srsName",filter.projection);}
+return node;}},OpenLayers.Format.Filter.v1.prototype.writers["ogc"]),"gml":OpenLayers.Format.GML.v2.prototype.writers["gml"],"feature":OpenLayers.Format.GML.v2.prototype.writers["feature"]},writeSpatial:function(filter,name){var node=this.createElementNSPlus("ogc:"+name);this.writeNode("PropertyName",filter,node);if(filter.value instanceof OpenLayers.Filter.Function){this.writeNode("Function",filter.value,node);}else{var child;if(filter.value instanceof OpenLayers.Geometry){child=this.writeNode("feature:_geometry",filter.value).firstChild;}else{child=this.writeNode("gml:Box",filter.value);}
+if(filter.projection){child.setAttribute("srsName",filter.projection);}
+node.appendChild(child);}
+return node;},CLASS_NAME:"OpenLayers.Format.Filter.v1_0_0"});OpenLayers.Symbolizer=OpenLayers.Class({zIndex:0,initialize:function(config){OpenLayers.Util.extend(this,config);},clone:function(){var Type=eval(this.CLASS_NAME);return new Type(OpenLayers.Util.extend({},this));},CLASS_NAME:"OpenLayers.Symbolizer"});OpenLayers.Symbolizer.Point=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Point"});OpenLayers.Symbolizer.Line=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Line"});OpenLayers.Symbolizer.Polygon=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Polygon"});OpenLayers.Symbolizer.Text=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Text"});OpenLayers.Symbolizer.Raster=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Raster"});OpenLayers.Format.SLD.v1=OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0,{namespaces:{sld:"http://www.opengis.net/sld",ogc:"http://www.opengis.net/ogc",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"sld",schemaLocation:null,multipleSymbolizers:false,featureTypeCounter:null,defaultSymbolizer:{fillColor:"#808080",fillOpacity:1,strokeColor:"#000000",strokeOpacity:1,strokeWidth:1,strokeDashstyle:"solid",pointRadius:3,graphicName:"square"},read:function(data,options){options=OpenLayers.Util.applyDefaults(options,this.options);var sld={namedLayers:options.namedLayersAsArray===true?[]:{}};this.readChildNodes(data,sld);return sld;},readers:OpenLayers.Util.applyDefaults({"sld":{"StyledLayerDescriptor":function(node,sld){sld.version=node.getAttribute("version");this.readChildNodes(node,sld);},"Name":function(node,obj){obj.name=this.getChildValue(node);},"Title":function(node,obj){obj.title=this.getChildValue(node);},"Abstract":function(node,obj){obj.description=this.getChildValue(node);},"NamedLayer":function(node,sld){var layer={userStyles:[],namedStyles:[]};this.readChildNodes(node,layer);for(var i=0,len=layer.userStyles.length;i<len;++i){layer.userStyles[i].layerName=layer.name;}
+if(OpenLayers.Util.isArray(sld.namedLayers)){sld.namedLayers.push(layer);}else{sld.namedLayers[layer.name]=layer;}},"NamedStyle":function(node,layer){layer.namedStyles.push(this.getChildName(node.firstChild));},"UserStyle":function(node,layer){var obj={defaultsPerSymbolizer:true,rules:[]};this.featureTypeCounter=-1;this.readChildNodes(node,obj);var style;if(this.multipleSymbolizers){delete obj.defaultsPerSymbolizer;style=new OpenLayers.Style2(obj);}else{style=new OpenLayers.Style(this.defaultSymbolizer,obj);}
+layer.userStyles.push(style);},"IsDefault":function(node,style){if(this.getChildValue(node)=="1"){style.isDefault=true;}},"FeatureTypeStyle":function(node,style){++this.featureTypeCounter;var obj={rules:this.multipleSymbolizers?style.rules:[]};this.readChildNodes(node,obj);if(!this.multipleSymbolizers){style.rules=obj.rules;}},"Rule":function(node,obj){var config;if(this.multipleSymbolizers){config={symbolizers:[]};}
+var rule=new OpenLayers.Rule(config);this.readChildNodes(node,rule);obj.rules.push(rule);},"ElseFilter":function(node,rule){rule.elseFilter=true;},"MinScaleDenominator":function(node,rule){rule.minScaleDenominator=parseFloat(this.getChildValue(node));},"MaxScaleDenominator":function(node,rule){rule.maxScaleDenominator=parseFloat(this.getChildValue(node));},"TextSymbolizer":function(node,rule){var config={};this.readChildNodes(node,config);if(this.multipleSymbolizers){config.zIndex=this.featureTypeCounter;rule.symbolizers.push(new OpenLayers.Symbolizer.Text(config));}else{rule.symbolizer["Text"]=OpenLayers.Util.applyDefaults(config,rule.symbolizer["Text"]);}},"LabelPlacement":function(node,symbolizer){this.readChildNodes(node,symbolizer);},"PointPlacement":function(node,symbolizer){var config={};this.readChildNodes(node,config);config.labelRotation=config.rotation;delete config.rotation;var labelAlign,x=symbolizer.labelAnchorPointX,y=symbolizer.labelAnchorPointY;if(x<=1/3){labelAlign='l';}else if(x>1/3&&x<2/3){labelAlign='c';}else if(x>=2/3){labelAlign='r';}
+if(y<=1/3){labelAlign+='b';}else if(y>1/3&&y<2/3){labelAlign+='m';}else if(y>=2/3){labelAlign+='t';}
+config.labelAlign=labelAlign;OpenLayers.Util.applyDefaults(symbolizer,config);},"AnchorPoint":function(node,symbolizer){this.readChildNodes(node,symbolizer);},"AnchorPointX":function(node,symbolizer){var labelAnchorPointX=this.readers.ogc._expression.call(this,node);if(labelAnchorPointX){symbolizer.labelAnchorPointX=labelAnchorPointX;}},"AnchorPointY":function(node,symbolizer){var labelAnchorPointY=this.readers.ogc._expression.call(this,node);if(labelAnchorPointY){symbolizer.labelAnchorPointY=labelAnchorPointY;}},"Displacement":function(node,symbolizer){this.readChildNodes(node,symbolizer);},"DisplacementX":function(node,symbolizer){var labelXOffset=this.readers.ogc._expression.call(this,node);if(labelXOffset){symbolizer.labelXOffset=labelXOffset;}},"DisplacementY":function(node,symbolizer){var labelYOffset=this.readers.ogc._expression.call(this,node);if(labelYOffset){symbolizer.labelYOffset=labelYOffset;}},"LinePlacement":function(node,symbolizer){this.readChildNodes(node,symbolizer);},"PerpendicularOffset":function(node,symbolizer){var labelPerpendicularOffset=this.readers.ogc._expression.call(this,node);if(labelPerpendicularOffset){symbolizer.labelPerpendicularOffset=labelPerpendicularOffset;}},"Label":function(node,symbolizer){var value=this.readers.ogc._expression.call(this,node);if(value){symbolizer.label=value;}},"Font":function(node,symbolizer){this.readChildNodes(node,symbolizer);},"Halo":function(node,symbolizer){var obj={};this.readChildNodes(node,obj);symbolizer.haloRadius=obj.haloRadius;symbolizer.haloColor=obj.fillColor;symbolizer.haloOpacity=obj.fillOpacity;},"Radius":function(node,symbolizer){var radius=this.readers.ogc._expression.call(this,node);if(radius!=null){symbolizer.haloRadius=radius;}},"RasterSymbolizer":function(node,rule){var config={};this.readChildNodes(node,config);if(this.multipleSymbolizers){config.zIndex=this.featureTypeCounter;rule.symbolizers.push(new OpenLayers.Symbolizer.Raster(config));}else{rule.symbolizer["Raster"]=OpenLayers.Util.applyDefaults(config,rule.symbolizer["Raster"]);}},"Geometry":function(node,obj){obj.geometry={};this.readChildNodes(node,obj.geometry);},"ColorMap":function(node,symbolizer){symbolizer.colorMap=[];this.readChildNodes(node,symbolizer.colorMap);},"ColorMapEntry":function(node,colorMap){var q=node.getAttribute("quantity");var o=node.getAttribute("opacity");colorMap.push({color:node.getAttribute("color"),quantity:q!==null?parseFloat(q):undefined,label:node.getAttribute("label")||undefined,opacity:o!==null?parseFloat(o):undefined});},"LineSymbolizer":function(node,rule){var config={};this.readChildNodes(node,config);if(this.multipleSymbolizers){config.zIndex=this.featureTypeCounter;rule.symbolizers.push(new OpenLayers.Symbolizer.Line(config));}else{rule.symbolizer["Line"]=OpenLayers.Util.applyDefaults(config,rule.symbolizer["Line"]);}},"PolygonSymbolizer":function(node,rule){var config={fill:false,stroke:false};if(!this.multipleSymbolizers){config=rule.symbolizer["Polygon"]||config;}
+this.readChildNodes(node,config);if(this.multipleSymbolizers){config.zIndex=this.featureTypeCounter;rule.symbolizers.push(new OpenLayers.Symbolizer.Polygon(config));}else{rule.symbolizer["Polygon"]=config;}},"PointSymbolizer":function(node,rule){var config={fill:false,stroke:false,graphic:false};if(!this.multipleSymbolizers){config=rule.symbolizer["Point"]||config;}
+this.readChildNodes(node,config);if(this.multipleSymbolizers){config.zIndex=this.featureTypeCounter;rule.symbolizers.push(new OpenLayers.Symbolizer.Point(config));}else{rule.symbolizer["Point"]=config;}},"Stroke":function(node,symbolizer){symbolizer.stroke=true;this.readChildNodes(node,symbolizer);},"Fill":function(node,symbolizer){symbolizer.fill=true;this.readChildNodes(node,symbolizer);},"CssParameter":function(node,symbolizer){var cssProperty=node.getAttribute("name");var symProperty=this.cssMap[cssProperty];if(symbolizer.label){if(cssProperty==='fill'){symProperty="fontColor";}else if(cssProperty==='fill-opacity'){symProperty="fontOpacity";}}
+if(symProperty){var value=this.readers.ogc._expression.call(this,node);if(value){symbolizer[symProperty]=value;}}},"Graphic":function(node,symbolizer){symbolizer.graphic=true;var graphic={};this.readChildNodes(node,graphic);var properties=["stroke","strokeColor","strokeWidth","strokeOpacity","strokeLinecap","fill","fillColor","fillOpacity","graphicName","rotation","graphicFormat"];var prop,value;for(var i=0,len=properties.length;i<len;++i){prop=properties[i];value=graphic[prop];if(value!=undefined){symbolizer[prop]=value;}}
+if(graphic.opacity!=undefined){symbolizer.graphicOpacity=graphic.opacity;}
+if(graphic.size!=undefined){var pointRadius=graphic.size/2;if(isNaN(pointRadius)){symbolizer.graphicWidth=graphic.size;}else{symbolizer.pointRadius=graphic.size/2;}}
+if(graphic.href!=undefined){symbolizer.externalGraphic=graphic.href;}
+if(graphic.rotation!=undefined){symbolizer.rotation=graphic.rotation;}},"ExternalGraphic":function(node,graphic){this.readChildNodes(node,graphic);},"Mark":function(node,graphic){this.readChildNodes(node,graphic);},"WellKnownName":function(node,graphic){graphic.graphicName=this.getChildValue(node);},"Opacity":function(node,obj){var opacity=this.readers.ogc._expression.call(this,node);if(opacity){obj.opacity=opacity;}},"Size":function(node,obj){var size=this.readers.ogc._expression.call(this,node);if(size){obj.size=size;}},"Rotation":function(node,obj){var rotation=this.readers.ogc._expression.call(this,node);if(rotation){obj.rotation=rotation;}},"OnlineResource":function(node,obj){obj.href=this.getAttributeNS(node,this.namespaces.xlink,"href");},"Format":function(node,graphic){graphic.graphicFormat=this.getChildValue(node);}}},OpenLayers.Format.Filter.v1_0_0.prototype.readers),cssMap:{"stroke":"strokeColor","stroke-opacity":"strokeOpacity","stroke-width":"strokeWidth","stroke-linecap":"strokeLinecap","stroke-dasharray":"strokeDashstyle","fill":"fillColor","fill-opacity":"fillOpacity","font-family":"fontFamily","font-size":"fontSize","font-weight":"fontWeight","font-style":"fontStyle"},getCssProperty:function(sym){var css=null;for(var prop in this.cssMap){if(this.cssMap[prop]==sym){css=prop;break;}}
+return css;},getGraphicFormat:function(href){var format,regex;for(var key in this.graphicFormats){if(this.graphicFormats[key].test(href)){format=key;break;}}
+return format||this.defaultGraphicFormat;},defaultGraphicFormat:"image/png",graphicFormats:{"image/jpeg":/\.jpe?g$/i,"image/gif":/\.gif$/i,"image/png":/\.png$/i},write:function(sld){return this.writers.sld.StyledLayerDescriptor.apply(this,[sld]);},writers:OpenLayers.Util.applyDefaults({"sld":{"_OGCExpression":function(nodeName,value){var node=this.createElementNSPlus(nodeName);var tokens=typeof value=="string"?value.split("${"):[value];node.appendChild(this.createTextNode(tokens[0]));var item,last;for(var i=1,len=tokens.length;i<len;i++){item=tokens[i];last=item.indexOf("}");if(last>0){this.writeNode("ogc:PropertyName",{property:item.substring(0,last)},node);node.appendChild(this.createTextNode(item.substring(++last)));}else{node.appendChild(this.createTextNode("${"+item));}}
+return node;},"StyledLayerDescriptor":function(sld){var root=this.createElementNSPlus("sld:StyledLayerDescriptor",{attributes:{"version":this.VERSION,"xsi:schemaLocation":this.schemaLocation}});root.setAttribute("xmlns:ogc",this.namespaces.ogc);root.setAttribute("xmlns:gml",this.namespaces.gml);if(sld.name){this.writeNode("Name",sld.name,root);}
+if(sld.title){this.writeNode("Title",sld.title,root);}
+if(sld.description){this.writeNode("Abstract",sld.description,root);}
+if(OpenLayers.Util.isArray(sld.namedLayers)){for(var i=0,len=sld.namedLayers.length;i<len;++i){this.writeNode("NamedLayer",sld.namedLayers[i],root);}}else{for(var name in sld.namedLayers){this.writeNode("NamedLayer",sld.namedLayers[name],root);}}
+return root;},"Name":function(name){return this.createElementNSPlus("sld:Name",{value:name});},"Title":function(title){return this.createElementNSPlus("sld:Title",{value:title});},"Abstract":function(description){return this.createElementNSPlus("sld:Abstract",{value:description});},"NamedLayer":function(layer){var node=this.createElementNSPlus("sld:NamedLayer");this.writeNode("Name",layer.name,node);if(layer.namedStyles){for(var i=0,len=layer.namedStyles.length;i<len;++i){this.writeNode("NamedStyle",layer.namedStyles[i],node);}}
+if(layer.userStyles){for(var i=0,len=layer.userStyles.length;i<len;++i){this.writeNode("UserStyle",layer.userStyles[i],node);}}
+return node;},"NamedStyle":function(name){var node=this.createElementNSPlus("sld:NamedStyle");this.writeNode("Name",name,node);return node;},"UserStyle":function(style){var node=this.createElementNSPlus("sld:UserStyle");if(style.name){this.writeNode("Name",style.name,node);}
+if(style.title){this.writeNode("Title",style.title,node);}
+if(style.description){this.writeNode("Abstract",style.description,node);}
+if(style.isDefault){this.writeNode("IsDefault",style.isDefault,node);}
+if(this.multipleSymbolizers&&style.rules){var rulesByZ={0:[]};var zValues=[0];var rule,ruleMap,symbolizer,zIndex,clone;for(var i=0,ii=style.rules.length;i<ii;++i){rule=style.rules[i];if(rule.symbolizers){ruleMap={};for(var j=0,jj=rule.symbolizers.length;j<jj;++j){symbolizer=rule.symbolizers[j];zIndex=symbolizer.zIndex;if(!(zIndex in ruleMap)){clone=rule.clone();clone.symbolizers=[];ruleMap[zIndex]=clone;}
+ruleMap[zIndex].symbolizers.push(symbolizer.clone());}
+for(zIndex in ruleMap){if(!(zIndex in rulesByZ)){zValues.push(zIndex);rulesByZ[zIndex]=[];}
+rulesByZ[zIndex].push(ruleMap[zIndex]);}}else{rulesByZ[0].push(rule.clone());}}
+zValues.sort();var rules;for(var i=0,ii=zValues.length;i<ii;++i){rules=rulesByZ[zValues[i]];if(rules.length>0){clone=style.clone();clone.rules=rulesByZ[zValues[i]];this.writeNode("FeatureTypeStyle",clone,node);}}}else{this.writeNode("FeatureTypeStyle",style,node);}
+return node;},"IsDefault":function(bool){return this.createElementNSPlus("sld:IsDefault",{value:(bool)?"1":"0"});},"FeatureTypeStyle":function(style){var node=this.createElementNSPlus("sld:FeatureTypeStyle");for(var i=0,len=style.rules.length;i<len;++i){this.writeNode("Rule",style.rules[i],node);}
+return node;},"Rule":function(rule){var node=this.createElementNSPlus("sld:Rule");if(rule.name){this.writeNode("Name",rule.name,node);}
+if(rule.title){this.writeNode("Title",rule.title,node);}
+if(rule.description){this.writeNode("Abstract",rule.description,node);}
+if(rule.elseFilter){this.writeNode("ElseFilter",null,node);}else if(rule.filter){this.writeNode("ogc:Filter",rule.filter,node);}
+if(rule.minScaleDenominator!=undefined){this.writeNode("MinScaleDenominator",rule.minScaleDenominator,node);}
+if(rule.maxScaleDenominator!=undefined){this.writeNode("MaxScaleDenominator",rule.maxScaleDenominator,node);}
+var type,symbolizer;if(this.multipleSymbolizers&&rule.symbolizers){var symbolizer;for(var i=0,ii=rule.symbolizers.length;i<ii;++i){symbolizer=rule.symbolizers[i];type=symbolizer.CLASS_NAME.split(".").pop();this.writeNode(type+"Symbolizer",symbolizer,node);}}else{var types=OpenLayers.Style.SYMBOLIZER_PREFIXES;for(var i=0,len=types.length;i<len;++i){type=types[i];symbolizer=rule.symbolizer[type];if(symbolizer){this.writeNode(type+"Symbolizer",symbolizer,node);}}}
+return node;},"ElseFilter":function(){return this.createElementNSPlus("sld:ElseFilter");},"MinScaleDenominator":function(scale){return this.createElementNSPlus("sld:MinScaleDenominator",{value:scale});},"MaxScaleDenominator":function(scale){return this.createElementNSPlus("sld:MaxScaleDenominator",{value:scale});},"LineSymbolizer":function(symbolizer){var node=this.createElementNSPlus("sld:LineSymbolizer");this.writeNode("Stroke",symbolizer,node);return node;},"Stroke":function(symbolizer){var node=this.createElementNSPlus("sld:Stroke");if(symbolizer.strokeColor!=undefined){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"strokeColor"},node);}
+if(symbolizer.strokeOpacity!=undefined){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"strokeOpacity"},node);}
+if(symbolizer.strokeWidth!=undefined){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"strokeWidth"},node);}
+if(symbolizer.strokeDashstyle!=undefined&&symbolizer.strokeDashstyle!=="solid"){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"strokeDashstyle"},node);}
+if(symbolizer.strokeLinecap!=undefined){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"strokeLinecap"},node);}
+return node;},"CssParameter":function(obj){return this.createElementNSPlus("sld:CssParameter",{attributes:{name:this.getCssProperty(obj.key)},value:obj.symbolizer[obj.key]});},"TextSymbolizer":function(symbolizer){var node=this.createElementNSPlus("sld:TextSymbolizer");if(symbolizer.label!=null){this.writeNode("Label",symbolizer.label,node);}
+if(symbolizer.fontFamily!=null||symbolizer.fontSize!=null||symbolizer.fontWeight!=null||symbolizer.fontStyle!=null){this.writeNode("Font",symbolizer,node);}
+if(symbolizer.labelAnchorPointX!=null||symbolizer.labelAnchorPointY!=null||symbolizer.labelAlign!=null||symbolizer.labelXOffset!=null||symbolizer.labelYOffset!=null||symbolizer.labelRotation!=null||symbolizer.labelPerpendicularOffset!=null){this.writeNode("LabelPlacement",symbolizer,node);}
+if(symbolizer.haloRadius!=null||symbolizer.haloColor!=null||symbolizer.haloOpacity!=null){this.writeNode("Halo",symbolizer,node);}
+if(symbolizer.fontColor!=null||symbolizer.fontOpacity!=null){this.writeNode("Fill",{fillColor:symbolizer.fontColor,fillOpacity:symbolizer.fontOpacity},node);}
+return node;},"LabelPlacement":function(symbolizer){var node=this.createElementNSPlus("sld:LabelPlacement");if((symbolizer.labelAnchorPointX!=null||symbolizer.labelAnchorPointY!=null||symbolizer.labelAlign!=null||symbolizer.labelXOffset!=null||symbolizer.labelYOffset!=null||symbolizer.labelRotation!=null)&&symbolizer.labelPerpendicularOffset==null){this.writeNode("PointPlacement",symbolizer,node);}
+if(symbolizer.labelPerpendicularOffset!=null){this.writeNode("LinePlacement",symbolizer,node);}
+return node;},"LinePlacement":function(symbolizer){var node=this.createElementNSPlus("sld:LinePlacement");this.writeNode("PerpendicularOffset",symbolizer.labelPerpendicularOffset,node);return node;},"PerpendicularOffset":function(value){return this.createElementNSPlus("sld:PerpendicularOffset",{value:value});},"PointPlacement":function(symbolizer){var node=this.createElementNSPlus("sld:PointPlacement");if(symbolizer.labelAnchorPointX!=null||symbolizer.labelAnchorPointY!=null||symbolizer.labelAlign!=null){this.writeNode("AnchorPoint",symbolizer,node);}
+if(symbolizer.labelXOffset!=null||symbolizer.labelYOffset!=null){this.writeNode("Displacement",symbolizer,node);}
+if(symbolizer.labelRotation!=null){this.writeNode("Rotation",symbolizer.labelRotation,node);}
+return node;},"AnchorPoint":function(symbolizer){var node=this.createElementNSPlus("sld:AnchorPoint");var x=symbolizer.labelAnchorPointX,y=symbolizer.labelAnchorPointY;if(x!=null){this.writeNode("AnchorPointX",x,node);}
+if(y!=null){this.writeNode("AnchorPointY",y,node);}
+if(x==null&&y==null){var xAlign=symbolizer.labelAlign.substr(0,1),yAlign=symbolizer.labelAlign.substr(1,1);if(xAlign==="l"){x=0;}else if(xAlign==="c"){x=0.5;}else if(xAlign==="r"){x=1;}
+if(yAlign==="b"){y=0;}else if(yAlign==="m"){y=0.5;}else if(yAlign==="t"){y=1;}
+this.writeNode("AnchorPointX",x,node);this.writeNode("AnchorPointY",y,node);}
+return node;},"AnchorPointX":function(value){return this.createElementNSPlus("sld:AnchorPointX",{value:value});},"AnchorPointY":function(value){return this.createElementNSPlus("sld:AnchorPointY",{value:value});},"Displacement":function(symbolizer){var node=this.createElementNSPlus("sld:Displacement");if(symbolizer.labelXOffset!=null){this.writeNode("DisplacementX",symbolizer.labelXOffset,node);}
+if(symbolizer.labelYOffset!=null){this.writeNode("DisplacementY",symbolizer.labelYOffset,node);}
+return node;},"DisplacementX":function(value){return this.createElementNSPlus("sld:DisplacementX",{value:value});},"DisplacementY":function(value){return this.createElementNSPlus("sld:DisplacementY",{value:value});},"Font":function(symbolizer){var node=this.createElementNSPlus("sld:Font");if(symbolizer.fontFamily){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"fontFamily"},node);}
+if(symbolizer.fontSize){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"fontSize"},node);}
+if(symbolizer.fontWeight){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"fontWeight"},node);}
+if(symbolizer.fontStyle){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"fontStyle"},node);}
+return node;},"Label":function(label){return this.writers.sld._OGCExpression.call(this,"sld:Label",label);},"Halo":function(symbolizer){var node=this.createElementNSPlus("sld:Halo");if(symbolizer.haloRadius){this.writeNode("Radius",symbolizer.haloRadius,node);}
+if(symbolizer.haloColor||symbolizer.haloOpacity){this.writeNode("Fill",{fillColor:symbolizer.haloColor,fillOpacity:symbolizer.haloOpacity},node);}
+return node;},"Radius":function(value){return this.createElementNSPlus("sld:Radius",{value:value});},"RasterSymbolizer":function(symbolizer){var node=this.createElementNSPlus("sld:RasterSymbolizer");if(symbolizer.geometry){this.writeNode("Geometry",symbolizer.geometry,node);}
+if(symbolizer.opacity){this.writeNode("Opacity",symbolizer.opacity,node);}
+if(symbolizer.colorMap){this.writeNode("ColorMap",symbolizer.colorMap,node);}
+return node;},"Geometry":function(geometry){var node=this.createElementNSPlus("sld:Geometry");if(geometry.property){this.writeNode("ogc:PropertyName",geometry,node);}
+return node;},"ColorMap":function(colorMap){var node=this.createElementNSPlus("sld:ColorMap");for(var i=0,len=colorMap.length;i<len;++i){this.writeNode("ColorMapEntry",colorMap[i],node);}
+return node;},"ColorMapEntry":function(colorMapEntry){var node=this.createElementNSPlus("sld:ColorMapEntry");var a=colorMapEntry;node.setAttribute("color",a.color);a.opacity!==undefined&&node.setAttribute("opacity",parseFloat(a.opacity));a.quantity!==undefined&&node.setAttribute("quantity",parseFloat(a.quantity));a.label!==undefined&&node.setAttribute("label",a.label);return node;},"PolygonSymbolizer":function(symbolizer){var node=this.createElementNSPlus("sld:PolygonSymbolizer");if(symbolizer.fill!==false){this.writeNode("Fill",symbolizer,node);}
+if(symbolizer.stroke!==false){this.writeNode("Stroke",symbolizer,node);}
+return node;},"Fill":function(symbolizer){var node=this.createElementNSPlus("sld:Fill");if(symbolizer.fillColor){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"fillColor"},node);}
+if(symbolizer.fillOpacity!=null){this.writeNode("CssParameter",{symbolizer:symbolizer,key:"fillOpacity"},node);}
+return node;},"PointSymbolizer":function(symbolizer){var node=this.createElementNSPlus("sld:PointSymbolizer");this.writeNode("Graphic",symbolizer,node);return node;},"Graphic":function(symbolizer){var node=this.createElementNSPlus("sld:Graphic");if(symbolizer.externalGraphic!=undefined){this.writeNode("ExternalGraphic",symbolizer,node);}else{this.writeNode("Mark",symbolizer,node);}
+if(symbolizer.graphicOpacity!=undefined){this.writeNode("Opacity",symbolizer.graphicOpacity,node);}
+if(symbolizer.pointRadius!=undefined){this.writeNode("Size",symbolizer.pointRadius*2,node);}else if(symbolizer.graphicWidth!=undefined){this.writeNode("Size",symbolizer.graphicWidth,node);}
+if(symbolizer.rotation!=undefined){this.writeNode("Rotation",symbolizer.rotation,node);}
+return node;},"ExternalGraphic":function(symbolizer){var node=this.createElementNSPlus("sld:ExternalGraphic");this.writeNode("OnlineResource",symbolizer.externalGraphic,node);var format=symbolizer.graphicFormat||this.getGraphicFormat(symbolizer.externalGraphic);this.writeNode("Format",format,node);return node;},"Mark":function(symbolizer){var node=this.createElementNSPlus("sld:Mark");if(symbolizer.graphicName){this.writeNode("WellKnownName",symbolizer.graphicName,node);}
+if(symbolizer.fill!==false){this.writeNode("Fill",symbolizer,node);}
+if(symbolizer.stroke!==false){this.writeNode("Stroke",symbolizer,node);}
+return node;},"WellKnownName":function(name){return this.createElementNSPlus("sld:WellKnownName",{value:name});},"Opacity":function(value){return this.createElementNSPlus("sld:Opacity",{value:value});},"Size":function(value){return this.writers.sld._OGCExpression.call(this,"sld:Size",value);},"Rotation":function(value){return this.createElementNSPlus("sld:Rotation",{value:value});},"OnlineResource":function(href){return this.createElementNSPlus("sld:OnlineResource",{attributes:{"xlink:type":"simple","xlink:href":href}});},"Format":function(format){return this.createElementNSPlus("sld:Format",{value:format});}}},OpenLayers.Format.Filter.v1_0_0.prototype.writers),CLASS_NAME:"OpenLayers.Format.SLD.v1"});OpenLayers.Format.WFST=function(options){options=OpenLayers.Util.applyDefaults(options,OpenLayers.Format.WFST.DEFAULTS);var cls=OpenLayers.Format.WFST["v"+options.version.replace(/\./g,"_")];if(!cls){throw"Unsupported WFST version: "+options.version;}
+return new cls(options);};OpenLayers.Format.WFST.DEFAULTS={"version":"1.0.0"};OpenLayers.Format.WFST.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",wfs:"http://www.opengis.net/wfs",gml:"http://www.opengis.net/gml",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows"},defaultPrefix:"wfs",version:null,schemaLocations:null,srsName:null,extractAttributes:true,xy:true,stateName:null,initialize:function(options){this.stateName={};this.stateName[OpenLayers.State.INSERT]="wfs:Insert";this.stateName[OpenLayers.State.UPDATE]="wfs:Update";this.stateName[OpenLayers.State.DELETE]="wfs:Delete";OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},getSrsName:function(feature,options){var srsName=options&&options.srsName;if(!srsName){if(feature&&feature.layer){srsName=feature.layer.projection.getCode();}else{srsName=this.srsName;}}
+return srsName;},read:function(data,options){options=options||{};OpenLayers.Util.applyDefaults(options,{output:"features"});if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var obj={};if(data){this.readNode(data,obj,true);}
+if(obj.features&&options.output==="features"){obj=obj.features;}
+return obj;},readers:{"wfs":{"FeatureCollection":function(node,obj){obj.features=[];this.readChildNodes(node,obj);}}},write:function(features,options){var node=this.writeNode("wfs:Transaction",{features:features,options:options});var value=this.schemaLocationAttr();if(value){this.setAttributeNS(node,this.namespaces["xsi"],"xsi:schemaLocation",value);}
+return OpenLayers.Format.XML.prototype.write.apply(this,[node]);},writers:{"wfs":{"GetFeature":function(options){var node=this.createElementNSPlus("wfs:GetFeature",{attributes:{service:"WFS",version:this.version,handle:options&&options.handle,outputFormat:options&&options.outputFormat,maxFeatures:options&&options.maxFeatures,"xsi:schemaLocation":this.schemaLocationAttr(options)}});if(typeof this.featureType=="string"){this.writeNode("Query",options,node);}else{for(var i=0,len=this.featureType.length;i<len;i++){options.featureType=this.featureType[i];this.writeNode("Query",options,node);}}
+return node;},"Transaction":function(obj){obj=obj||{};var options=obj.options||{};var node=this.createElementNSPlus("wfs:Transaction",{attributes:{service:"WFS",version:this.version,handle:options.handle}});var i,len;var features=obj.features;if(features){if(options.multi===true){OpenLayers.Util.extend(this.geometryTypes,{"OpenLayers.Geometry.Point":"MultiPoint","OpenLayers.Geometry.LineString":(this.multiCurve===true)?"MultiCurve":"MultiLineString","OpenLayers.Geometry.Polygon":(this.multiSurface===true)?"MultiSurface":"MultiPolygon"});}
+var name,feature;for(i=0,len=features.length;i<len;++i){feature=features[i];name=this.stateName[feature.state];if(name){this.writeNode(name,{feature:feature,options:options},node);}}
+if(options.multi===true){this.setGeometryTypes();}}
+if(options.nativeElements){for(i=0,len=options.nativeElements.length;i<len;++i){this.writeNode("wfs:Native",options.nativeElements[i],node);}}
+return node;},"Native":function(nativeElement){var node=this.createElementNSPlus("wfs:Native",{attributes:{vendorId:nativeElement.vendorId,safeToIgnore:nativeElement.safeToIgnore},value:nativeElement.value});return node;},"Insert":function(obj){var feature=obj.feature;var options=obj.options;var node=this.createElementNSPlus("wfs:Insert",{attributes:{handle:options&&options.handle}});this.srsName=this.getSrsName(feature);this.writeNode("feature:_typeName",feature,node);return node;},"Update":function(obj){var feature=obj.feature;var options=obj.options;var node=this.createElementNSPlus("wfs:Update",{attributes:{handle:options&&options.handle,typeName:(this.featureNS?this.featurePrefix+":":"")+
+this.featureType}});if(this.featureNS){node.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);}
+var modified=feature.modified;if(this.geometryName!==null&&(!modified||modified.geometry!==undefined)){this.srsName=this.getSrsName(feature);this.writeNode("Property",{name:this.geometryName,value:feature.geometry},node);}
+for(var key in feature.attributes){if(feature.attributes[key]!==undefined&&(!modified||!modified.attributes||(modified.attributes&&modified.attributes[key]!==undefined))){this.writeNode("Property",{name:key,value:feature.attributes[key]},node);}}
+this.writeNode("ogc:Filter",new OpenLayers.Filter.FeatureId({fids:[feature.fid]}),node);return node;},"Property":function(obj){var node=this.createElementNSPlus("wfs:Property");this.writeNode("Name",obj.name,node);if(obj.value!==null){this.writeNode("Value",obj.value,node);}
+return node;},"Name":function(name){return this.createElementNSPlus("wfs:Name",{value:name});},"Value":function(obj){var node;if(obj instanceof OpenLayers.Geometry){node=this.createElementNSPlus("wfs:Value");var geom=this.writeNode("feature:_geometry",obj).firstChild;node.appendChild(geom);}else{node=this.createElementNSPlus("wfs:Value",{value:obj});}
+return node;},"Delete":function(obj){var feature=obj.feature;var options=obj.options;var node=this.createElementNSPlus("wfs:Delete",{attributes:{handle:options&&options.handle,typeName:(this.featureNS?this.featurePrefix+":":"")+
+this.featureType}});if(this.featureNS){node.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);}
+this.writeNode("ogc:Filter",new OpenLayers.Filter.FeatureId({fids:[feature.fid]}),node);return node;}}},schemaLocationAttr:function(options){options=OpenLayers.Util.extend({featurePrefix:this.featurePrefix,schema:this.schema},options);var schemaLocations=OpenLayers.Util.extend({},this.schemaLocations);if(options.schema){schemaLocations[options.featurePrefix]=options.schema;}
+var parts=[];var uri;for(var key in schemaLocations){uri=this.namespaces[key];if(uri){parts.push(uri+" "+schemaLocations[key]);}}
+var value=parts.join(" ")||undefined;return value;},setFilterProperty:function(filter){if(filter.filters){for(var i=0,len=filter.filters.length;i<len;++i){OpenLayers.Format.WFST.v1.prototype.setFilterProperty.call(this,filter.filters[i]);}}else{if(filter instanceof OpenLayers.Filter.Spatial&&!filter.property){filter.property=this.geometryName;}}},CLASS_NAME:"OpenLayers.Format.WFST.v1"});OpenLayers.Format.GML.v3=OpenLayers.Class(OpenLayers.Format.GML.Base,{schemaLocation:"http://www.opengis.net/gml http://schemas.opengis.net/gml/3.1.1/profiles/gmlsfProfile/1.0.0/gmlsf.xsd",curve:false,multiCurve:true,surface:false,multiSurface:true,initialize:function(options){OpenLayers.Format.GML.Base.prototype.initialize.apply(this,[options]);},readers:{"gml":OpenLayers.Util.applyDefaults({"featureMembers":function(node,obj){this.readChildNodes(node,obj);},"Curve":function(node,container){var obj={points:[]};this.readChildNodes(node,obj);if(!container.components){container.components=[];}
+container.components.push(new OpenLayers.Geometry.LineString(obj.points));},"segments":function(node,obj){this.readChildNodes(node,obj);},"LineStringSegment":function(node,container){var obj={};this.readChildNodes(node,obj);if(obj.points){Array.prototype.push.apply(container.points,obj.points);}},"pos":function(node,obj){var str=this.getChildValue(node).replace(this.regExes.trimSpace,"");var coords=str.split(this.regExes.splitSpace);var point;if(this.xy){point=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{point=new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]);}
+obj.points=[point];},"posList":function(node,obj){var str=this.getChildValue(node).replace(this.regExes.trimSpace,"");var coords=str.split(this.regExes.splitSpace);var dim=parseInt(node.getAttribute("dimension"))||2;var j,x,y,z;var numPoints=coords.length/dim;var points=new Array(numPoints);for(var i=0,len=coords.length;i<len;i+=dim){x=coords[i];y=coords[i+1];z=(dim==2)?undefined:coords[i+2];if(this.xy){points[i/dim]=new OpenLayers.Geometry.Point(x,y,z);}else{points[i/dim]=new OpenLayers.Geometry.Point(y,x,z);}}
+obj.points=points;},"Surface":function(node,obj){this.readChildNodes(node,obj);},"patches":function(node,obj){this.readChildNodes(node,obj);},"PolygonPatch":function(node,obj){this.readers.gml.Polygon.apply(this,[node,obj]);},"exterior":function(node,container){var obj={};this.readChildNodes(node,obj);container.outer=obj.components[0];},"interior":function(node,container){var obj={};this.readChildNodes(node,obj);container.inner.push(obj.components[0]);},"MultiCurve":function(node,container){var obj={components:[]};this.readChildNodes(node,obj);if(obj.components.length>0){container.components=[new OpenLayers.Geometry.MultiLineString(obj.components)];}},"curveMember":function(node,obj){this.readChildNodes(node,obj);},"MultiSurface":function(node,container){var obj={components:[]};this.readChildNodes(node,obj);if(obj.components.length>0){container.components=[new OpenLayers.Geometry.MultiPolygon(obj.components)];}},"surfaceMember":function(node,obj){this.readChildNodes(node,obj);},"surfaceMembers":function(node,obj){this.readChildNodes(node,obj);},"pointMembers":function(node,obj){this.readChildNodes(node,obj);},"lineStringMembers":function(node,obj){this.readChildNodes(node,obj);},"polygonMembers":function(node,obj){this.readChildNodes(node,obj);},"geometryMembers":function(node,obj){this.readChildNodes(node,obj);},"Envelope":function(node,container){var obj={points:new Array(2)};this.readChildNodes(node,obj);if(!container.components){container.components=[];}
+var min=obj.points[0];var max=obj.points[1];container.components.push(new OpenLayers.Bounds(min.x,min.y,max.x,max.y));},"lowerCorner":function(node,container){var obj={};this.readers.gml.pos.apply(this,[node,obj]);container.points[0]=obj.points[0];},"upperCorner":function(node,container){var obj={};this.readers.gml.pos.apply(this,[node,obj]);container.points[1]=obj.points[0];}},OpenLayers.Format.GML.Base.prototype.readers["gml"]),"feature":OpenLayers.Format.GML.Base.prototype.readers["feature"],"wfs":OpenLayers.Format.GML.Base.prototype.readers["wfs"]},write:function(features){var name;if(OpenLayers.Util.isArray(features)){name="featureMembers";}else{name="featureMember";}
+var root=this.writeNode("gml:"+name,features);this.setAttributeNS(root,this.namespaces["xsi"],"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[root]);},writers:{"gml":OpenLayers.Util.applyDefaults({"featureMembers":function(features){var node=this.createElementNSPlus("gml:featureMembers");for(var i=0,len=features.length;i<len;++i){this.writeNode("feature:_typeName",features[i],node);}
+return node;},"Point":function(geometry){var node=this.createElementNSPlus("gml:Point");this.writeNode("pos",geometry,node);return node;},"pos":function(point){var pos=(this.xy)?(point.x+" "+point.y):(point.y+" "+point.x);return this.createElementNSPlus("gml:pos",{value:pos});},"LineString":function(geometry){var node=this.createElementNSPlus("gml:LineString");this.writeNode("posList",geometry.components,node);return node;},"Curve":function(geometry){var node=this.createElementNSPlus("gml:Curve");this.writeNode("segments",geometry,node);return node;},"segments":function(geometry){var node=this.createElementNSPlus("gml:segments");this.writeNode("LineStringSegment",geometry,node);return node;},"LineStringSegment":function(geometry){var node=this.createElementNSPlus("gml:LineStringSegment");this.writeNode("posList",geometry.components,node);return node;},"posList":function(points){var len=points.length;var parts=new Array(len);var point;for(var i=0;i<len;++i){point=points[i];if(this.xy){parts[i]=point.x+" "+point.y;}else{parts[i]=point.y+" "+point.x;}}
+return this.createElementNSPlus("gml:posList",{value:parts.join(" ")});},"Surface":function(geometry){var node=this.createElementNSPlus("gml:Surface");this.writeNode("patches",geometry,node);return node;},"patches":function(geometry){var node=this.createElementNSPlus("gml:patches");this.writeNode("PolygonPatch",geometry,node);return node;},"PolygonPatch":function(geometry){var node=this.createElementNSPlus("gml:PolygonPatch",{attributes:{interpolation:"planar"}});this.writeNode("exterior",geometry.components[0],node);for(var i=1,len=geometry.components.length;i<len;++i){this.writeNode("interior",geometry.components[i],node);}
+return node;},"Polygon":function(geometry){var node=this.createElementNSPlus("gml:Polygon");this.writeNode("exterior",geometry.components[0],node);for(var i=1,len=geometry.components.length;i<len;++i){this.writeNode("interior",geometry.components[i],node);}
+return node;},"exterior":function(ring){var node=this.createElementNSPlus("gml:exterior");this.writeNode("LinearRing",ring,node);return node;},"interior":function(ring){var node=this.createElementNSPlus("gml:interior");this.writeNode("LinearRing",ring,node);return node;},"LinearRing":function(ring){var node=this.createElementNSPlus("gml:LinearRing");this.writeNode("posList",ring.components,node);return node;},"MultiCurve":function(geometry){var node=this.createElementNSPlus("gml:MultiCurve");var components=geometry.components||[geometry];for(var i=0,len=components.length;i<len;++i){this.writeNode("curveMember",components[i],node);}
+return node;},"curveMember":function(geometry){var node=this.createElementNSPlus("gml:curveMember");if(this.curve){this.writeNode("Curve",geometry,node);}else{this.writeNode("LineString",geometry,node);}
+return node;},"MultiSurface":function(geometry){var node=this.createElementNSPlus("gml:MultiSurface");var components=geometry.components||[geometry];for(var i=0,len=components.length;i<len;++i){this.writeNode("surfaceMember",components[i],node);}
+return node;},"surfaceMember":function(polygon){var node=this.createElementNSPlus("gml:surfaceMember");if(this.surface){this.writeNode("Surface",polygon,node);}else{this.writeNode("Polygon",polygon,node);}
+return node;},"Envelope":function(bounds){var node=this.createElementNSPlus("gml:Envelope");this.writeNode("lowerCorner",bounds,node);this.writeNode("upperCorner",bounds,node);if(this.srsName){node.setAttribute("srsName",this.srsName);}
+return node;},"lowerCorner":function(bounds){var pos=(this.xy)?(bounds.left+" "+bounds.bottom):(bounds.bottom+" "+bounds.left);return this.createElementNSPlus("gml:lowerCorner",{value:pos});},"upperCorner":function(bounds){var pos=(this.xy)?(bounds.right+" "+bounds.top):(bounds.top+" "+bounds.right);return this.createElementNSPlus("gml:upperCorner",{value:pos});}},OpenLayers.Format.GML.Base.prototype.writers["gml"]),"feature":OpenLayers.Format.GML.Base.prototype.writers["feature"],"wfs":OpenLayers.Format.GML.Base.prototype.writers["wfs"]},setGeometryTypes:function(){this.geometryTypes={"OpenLayers.Geometry.Point":"Point","OpenLayers.Geometry.MultiPoint":"MultiPoint","OpenLayers.Geometry.LineString":(this.curve===true)?"Curve":"LineString","OpenLayers.Geometry.MultiLineString":(this.multiCurve===false)?"MultiLineString":"MultiCurve","OpenLayers.Geometry.Polygon":(this.surface===true)?"Surface":"Polygon","OpenLayers.Geometry.MultiPolygon":(this.multiSurface===false)?"MultiPolygon":"MultiSurface","OpenLayers.Geometry.Collection":"GeometryCollection"};},CLASS_NAME:"OpenLayers.Format.GML.v3"});OpenLayers.Format.Filter.v1_1_0=OpenLayers.Class(OpenLayers.Format.GML.v3,OpenLayers.Format.Filter.v1,{VERSION:"1.1.0",schemaLocation:"http://www.opengis.net/ogc/filter/1.1.0/filter.xsd",initialize:function(options){OpenLayers.Format.GML.v3.prototype.initialize.apply(this,[options]);},readers:{"ogc":OpenLayers.Util.applyDefaults({"PropertyIsEqualTo":function(node,obj){var matchCase=node.getAttribute("matchCase");var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,matchCase:!(matchCase==="false"||matchCase==="0")});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsNotEqualTo":function(node,obj){var matchCase=node.getAttribute("matchCase");var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO,matchCase:!(matchCase==="false"||matchCase==="0")});this.readChildNodes(node,filter);obj.filters.push(filter);},"PropertyIsLike":function(node,obj){var filter=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(node,filter);var wildCard=node.getAttribute("wildCard");var singleChar=node.getAttribute("singleChar");var esc=node.getAttribute("escapeChar");filter.value2regex(wildCard,singleChar,esc);obj.filters.push(filter);}},OpenLayers.Format.Filter.v1.prototype.readers["ogc"]),"gml":OpenLayers.Format.GML.v3.prototype.readers["gml"],"feature":OpenLayers.Format.GML.v3.prototype.readers["feature"]},writers:{"ogc":OpenLayers.Util.applyDefaults({"PropertyIsEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsEqualTo",{attributes:{matchCase:filter.matchCase}});this.writeNode("PropertyName",filter,node);this.writeOgcExpression(filter.value,node);return node;},"PropertyIsNotEqualTo":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsNotEqualTo",{attributes:{matchCase:filter.matchCase}});this.writeNode("PropertyName",filter,node);this.writeOgcExpression(filter.value,node);return node;},"PropertyIsLike":function(filter){var node=this.createElementNSPlus("ogc:PropertyIsLike",{attributes:{matchCase:filter.matchCase,wildCard:"*",singleChar:".",escapeChar:"!"}});this.writeNode("PropertyName",filter,node);this.writeNode("Literal",filter.regex2value(),node);return node;},"BBOX":function(filter){var node=this.createElementNSPlus("ogc:BBOX");filter.property&&this.writeNode("PropertyName",filter,node);var box=this.writeNode("gml:Envelope",filter.value);if(filter.projection){box.setAttribute("srsName",filter.projection);}
+node.appendChild(box);return node;},"SortBy":function(sortProperties){var node=this.createElementNSPlus("ogc:SortBy");for(var i=0,l=sortProperties.length;i<l;i++){this.writeNode("ogc:SortProperty",sortProperties[i],node);}
+return node;},"SortProperty":function(sortProperty){var node=this.createElementNSPlus("ogc:SortProperty");this.writeNode("ogc:PropertyName",sortProperty,node);this.writeNode("ogc:SortOrder",(sortProperty.order=='DESC')?'DESC':'ASC',node);return node;},"SortOrder":function(value){var node=this.createElementNSPlus("ogc:SortOrder",{value:value});return node;}},OpenLayers.Format.Filter.v1.prototype.writers["ogc"]),"gml":OpenLayers.Format.GML.v3.prototype.writers["gml"],"feature":OpenLayers.Format.GML.v3.prototype.writers["feature"]},writeSpatial:function(filter,name){var node=this.createElementNSPlus("ogc:"+name);this.writeNode("PropertyName",filter,node);if(filter.value instanceof OpenLayers.Filter.Function){this.writeNode("Function",filter.value,node);}else{var child;if(filter.value instanceof OpenLayers.Geometry){child=this.writeNode("feature:_geometry",filter.value).firstChild;}else{child=this.writeNode("gml:Envelope",filter.value);}
+if(filter.projection){child.setAttribute("srsName",filter.projection);}
+node.appendChild(child);}
+return node;},CLASS_NAME:"OpenLayers.Format.Filter.v1_1_0"});OpenLayers.Format.OWSCommon=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",getVersion:function(root,options){var version=this.version;if(!version){var uri=root.getAttribute("xmlns:ows");if(uri&&uri.substring(uri.lastIndexOf("/")+1)==="1.1"){version="1.1.0";}
+if(!version){version=this.defaultVersion;}}
+return version;},CLASS_NAME:"OpenLayers.Format.OWSCommon"});OpenLayers.Format.OWSCommon.v1=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},read:function(data,options){options=OpenLayers.Util.applyDefaults(options,this.options);var ows={};this.readChildNodes(data,ows);return ows;},readers:{"ows":{"Exception":function(node,exceptionReport){var exception={code:node.getAttribute('exceptionCode'),locator:node.getAttribute('locator'),texts:[]};exceptionReport.exceptions.push(exception);this.readChildNodes(node,exception);},"ExceptionText":function(node,exception){var text=this.getChildValue(node);exception.texts.push(text);},"ServiceIdentification":function(node,obj){obj.serviceIdentification={};this.readChildNodes(node,obj.serviceIdentification);},"Title":function(node,obj){obj.title=this.getChildValue(node);},"Abstract":function(node,serviceIdentification){serviceIdentification["abstract"]=this.getChildValue(node);},"Keywords":function(node,serviceIdentification){serviceIdentification.keywords={};this.readChildNodes(node,serviceIdentification.keywords);},"Keyword":function(node,keywords){keywords[this.getChildValue(node)]=true;},"ServiceType":function(node,serviceIdentification){serviceIdentification.serviceType={codeSpace:node.getAttribute('codeSpace'),value:this.getChildValue(node)};},"ServiceTypeVersion":function(node,serviceIdentification){serviceIdentification.serviceTypeVersion=this.getChildValue(node);},"Fees":function(node,serviceIdentification){serviceIdentification.fees=this.getChildValue(node);},"AccessConstraints":function(node,serviceIdentification){serviceIdentification.accessConstraints=this.getChildValue(node);},"ServiceProvider":function(node,obj){obj.serviceProvider={};this.readChildNodes(node,obj.serviceProvider);},"ProviderName":function(node,serviceProvider){serviceProvider.providerName=this.getChildValue(node);},"ProviderSite":function(node,serviceProvider){serviceProvider.providerSite=this.getAttributeNS(node,this.namespaces.xlink,"href");},"ServiceContact":function(node,serviceProvider){serviceProvider.serviceContact={};this.readChildNodes(node,serviceProvider.serviceContact);},"IndividualName":function(node,serviceContact){serviceContact.individualName=this.getChildValue(node);},"PositionName":function(node,serviceContact){serviceContact.positionName=this.getChildValue(node);},"ContactInfo":function(node,serviceContact){serviceContact.contactInfo={};this.readChildNodes(node,serviceContact.contactInfo);},"Phone":function(node,contactInfo){contactInfo.phone={};this.readChildNodes(node,contactInfo.phone);},"Voice":function(node,phone){phone.voice=this.getChildValue(node);},"Address":function(node,contactInfo){contactInfo.address={};this.readChildNodes(node,contactInfo.address);},"DeliveryPoint":function(node,address){address.deliveryPoint=this.getChildValue(node);},"City":function(node,address){address.city=this.getChildValue(node);},"AdministrativeArea":function(node,address){address.administrativeArea=this.getChildValue(node);},"PostalCode":function(node,address){address.postalCode=this.getChildValue(node);},"Country":function(node,address){address.country=this.getChildValue(node);},"ElectronicMailAddress":function(node,address){address.electronicMailAddress=this.getChildValue(node);},"Role":function(node,serviceContact){serviceContact.role=this.getChildValue(node);},"OperationsMetadata":function(node,obj){obj.operationsMetadata={};this.readChildNodes(node,obj.operationsMetadata);},"Operation":function(node,operationsMetadata){var name=node.getAttribute("name");operationsMetadata[name]={};this.readChildNodes(node,operationsMetadata[name]);},"DCP":function(node,operation){operation.dcp={};this.readChildNodes(node,operation.dcp);},"HTTP":function(node,dcp){dcp.http={};this.readChildNodes(node,dcp.http);},"Get":function(node,http){if(!http.get){http.get=[];}
+var obj={url:this.getAttributeNS(node,this.namespaces.xlink,"href")};this.readChildNodes(node,obj);http.get.push(obj);},"Post":function(node,http){if(!http.post){http.post=[];}
+var obj={url:this.getAttributeNS(node,this.namespaces.xlink,"href")};this.readChildNodes(node,obj);http.post.push(obj);},"Parameter":function(node,operation){if(!operation.parameters){operation.parameters={};}
+var name=node.getAttribute("name");operation.parameters[name]={};this.readChildNodes(node,operation.parameters[name]);},"Constraint":function(node,obj){if(!obj.constraints){obj.constraints={};}
+var name=node.getAttribute("name");obj.constraints[name]={};this.readChildNodes(node,obj.constraints[name]);},"Value":function(node,allowedValues){allowedValues[this.getChildValue(node)]=true;},"OutputFormat":function(node,obj){obj.formats.push({value:this.getChildValue(node)});this.readChildNodes(node,obj);},"WGS84BoundingBox":function(node,obj){var boundingBox={};boundingBox.crs=node.getAttribute("crs");if(obj.BoundingBox){obj.BoundingBox.push(boundingBox);}else{obj.projection=boundingBox.crs;boundingBox=obj;}
+this.readChildNodes(node,boundingBox);},"BoundingBox":function(node,obj){this.readers['ows']['WGS84BoundingBox'].apply(this,[node,obj]);},"LowerCorner":function(node,obj){var str=this.getChildValue(node).replace(this.regExes.trimSpace,"");str=str.replace(this.regExes.trimComma,",");var pointList=str.split(this.regExes.splitSpace);obj.left=pointList[0];obj.bottom=pointList[1];},"UpperCorner":function(node,obj){var str=this.getChildValue(node).replace(this.regExes.trimSpace,"");str=str.replace(this.regExes.trimComma,",");var pointList=str.split(this.regExes.splitSpace);obj.right=pointList[0];obj.top=pointList[1];obj.bounds=new OpenLayers.Bounds(obj.left,obj.bottom,obj.right,obj.top);delete obj.left;delete obj.bottom;delete obj.right;delete obj.top;},"Language":function(node,obj){obj.language=this.getChildValue(node);}}},writers:{"ows":{"BoundingBox":function(options,nodeName){var node=this.createElementNSPlus(nodeName||"ows:BoundingBox",{attributes:{crs:options.projection}});this.writeNode("ows:LowerCorner",options,node);this.writeNode("ows:UpperCorner",options,node);return node;},"LowerCorner":function(options){var node=this.createElementNSPlus("ows:LowerCorner",{value:options.bounds.left+" "+options.bounds.bottom});return node;},"UpperCorner":function(options){var node=this.createElementNSPlus("ows:UpperCorner",{value:options.bounds.right+" "+options.bounds.top});return node;},"Identifier":function(identifier){var node=this.createElementNSPlus("ows:Identifier",{value:identifier});return node;},"Title":function(title){var node=this.createElementNSPlus("ows:Title",{value:title});return node;},"Abstract":function(abstractValue){var node=this.createElementNSPlus("ows:Abstract",{value:abstractValue});return node;},"OutputFormat":function(format){var node=this.createElementNSPlus("ows:OutputFormat",{value:format});return node;}}},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1"});OpenLayers.Format.OWSCommon.v1_0_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1,{namespaces:{ows:"http://www.opengis.net/ows",xlink:"http://www.w3.org/1999/xlink"},readers:{"ows":OpenLayers.Util.applyDefaults({"ExceptionReport":function(node,obj){obj.success=false;obj.exceptionReport={version:node.getAttribute('version'),language:node.getAttribute('language'),exceptions:[]};this.readChildNodes(node,obj.exceptionReport);}},OpenLayers.Format.OWSCommon.v1.prototype.readers.ows)},writers:{"ows":OpenLayers.Format.OWSCommon.v1.prototype.writers.ows},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1_0_0"});OpenLayers.Format.WFST.v1_1_0=OpenLayers.Class(OpenLayers.Format.Filter.v1_1_0,OpenLayers.Format.WFST.v1,{version:"1.1.0",schemaLocations:{"wfs":"http://schemas.opengis.net/wfs/1.1.0/wfs.xsd"},initialize:function(options){OpenLayers.Format.Filter.v1_1_0.prototype.initialize.apply(this,[options]);OpenLayers.Format.WFST.v1.prototype.initialize.apply(this,[options]);},readNode:function(node,obj,first){return OpenLayers.Format.GML.v3.prototype.readNode.apply(this,arguments);},readers:{"wfs":OpenLayers.Util.applyDefaults({"FeatureCollection":function(node,obj){obj.numberOfFeatures=parseInt(node.getAttribute("numberOfFeatures"));OpenLayers.Format.WFST.v1.prototype.readers["wfs"]["FeatureCollection"].apply(this,arguments);},"TransactionResponse":function(node,obj){obj.insertIds=[];obj.success=false;this.readChildNodes(node,obj);},"TransactionSummary":function(node,obj){obj.success=true;},"InsertResults":function(node,obj){this.readChildNodes(node,obj);},"Feature":function(node,container){var obj={fids:[]};this.readChildNodes(node,obj);container.insertIds.push(obj.fids[0]);}},OpenLayers.Format.WFST.v1.prototype.readers["wfs"]),"gml":OpenLayers.Format.GML.v3.prototype.readers["gml"],"feature":OpenLayers.Format.GML.v3.prototype.readers["feature"],"ogc":OpenLayers.Format.Filter.v1_1_0.prototype.readers["ogc"],"ows":OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers["ows"]},writers:{"wfs":OpenLayers.Util.applyDefaults({"GetFeature":function(options){var node=OpenLayers.Format.WFST.v1.prototype.writers["wfs"]["GetFeature"].apply(this,arguments);options&&this.setAttributes(node,{resultType:options.resultType,startIndex:options.startIndex,count:options.count});return node;},"Query":function(options){options=OpenLayers.Util.extend({featureNS:this.featureNS,featurePrefix:this.featurePrefix,featureType:this.featureType,srsName:this.srsName},options);var prefix=options.featurePrefix;var node=this.createElementNSPlus("wfs:Query",{attributes:{typeName:(prefix?prefix+":":"")+
+options.featureType,srsName:options.srsName}});if(options.featureNS){node.setAttribute("xmlns:"+prefix,options.featureNS);}
+if(options.propertyNames){for(var i=0,len=options.propertyNames.length;i<len;i++){this.writeNode("wfs:PropertyName",{property:options.propertyNames[i]},node);}}
+if(options.filter){OpenLayers.Format.WFST.v1_1_0.prototype.setFilterProperty.call(this,options.filter);this.writeNode("ogc:Filter",options.filter,node);}
+return node;},"PropertyName":function(obj){return this.createElementNSPlus("wfs:PropertyName",{value:obj.property});}},OpenLayers.Format.WFST.v1.prototype.writers["wfs"]),"gml":OpenLayers.Format.GML.v3.prototype.writers["gml"],"feature":OpenLayers.Format.GML.v3.prototype.writers["feature"],"ogc":OpenLayers.Format.Filter.v1_1_0.prototype.writers["ogc"]},CLASS_NAME:"OpenLayers.Format.WFST.v1_1_0"});OpenLayers.Protocol=OpenLayers.Class({format:null,options:null,autoDestroy:true,defaultFilter:null,initialize:function(options){options=options||{};OpenLayers.Util.extend(this,options);this.options=options;},mergeWithDefaultFilter:function(filter){var merged;if(filter&&this.defaultFilter){merged=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.defaultFilter,filter]});}else{merged=filter||this.defaultFilter||undefined;}
+return merged;},destroy:function(){this.options=null;this.format=null;},read:function(options){options=options||{};options.filter=this.mergeWithDefaultFilter(options.filter);},create:function(){},update:function(){},"delete":function(){},commit:function(){},abort:function(response){},createCallback:function(method,response,options){return OpenLayers.Function.bind(function(){method.apply(this,[response,options]);},this);},CLASS_NAME:"OpenLayers.Protocol"});OpenLayers.Protocol.Response=OpenLayers.Class({code:null,requestType:null,last:true,features:null,data:null,reqFeatures:null,priv:null,error:null,initialize:function(options){OpenLayers.Util.extend(this,options);},success:function(){return this.code>0;},CLASS_NAME:"OpenLayers.Protocol.Response"});OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:" ",space:" ",newline:"\n",level:0,pretty:false,nativeJSON:(function(){return!!(window.JSON&&typeof JSON.parse=="function"&&typeof JSON.stringify=="function");})(),read:function(json,filter){var object;if(this.nativeJSON){object=JSON.parse(json,filter);}else try{if(/^[\],:{}\s]*$/.test(json.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){object=eval('('+json+')');if(typeof filter==='function'){function walk(k,v){if(v&&typeof v==='object'){for(var i in v){if(v.hasOwnProperty(i)){v[i]=walk(i,v[i]);}}}
+return filter(k,v);}
+object=walk('',object);}}}catch(e){}
+if(this.keepData){this.data=object;}
+return object;},write:function(value,pretty){this.pretty=!!pretty;var json=null;var type=typeof value;if(this.serialize[type]){try{json=(!this.pretty&&this.nativeJSON)?JSON.stringify(value):this.serialize[type].apply(this,[value]);}catch(err){OpenLayers.Console.error("Trouble serializing: "+err);}}
+return json;},writeIndent:function(){var pieces=[];if(this.pretty){for(var i=0;i<this.level;++i){pieces.push(this.indent);}}
+return pieces.join('');},writeNewline:function(){return(this.pretty)?this.newline:'';},writeSpace:function(){return(this.pretty)?this.space:'';},serialize:{'object':function(object){if(object==null){return"null";}
+if(object.constructor==Date){return this.serialize.date.apply(this,[object]);}
+if(object.constructor==Array){return this.serialize.array.apply(this,[object]);}
+var pieces=['{'];this.level+=1;var key,keyJSON,valueJSON;var addComma=false;for(key in object){if(object.hasOwnProperty(key)){keyJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[key,this.pretty]);valueJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[object[key],this.pretty]);if(keyJSON!=null&&valueJSON!=null){if(addComma){pieces.push(',');}
+pieces.push(this.writeNewline(),this.writeIndent(),keyJSON,':',this.writeSpace(),valueJSON);addComma=true;}}}
+this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),'}');return pieces.join('');},'array':function(array){var json;var pieces=['['];this.level+=1;for(var i=0,len=array.length;i<len;++i){json=OpenLayers.Format.JSON.prototype.write.apply(this,[array[i],this.pretty]);if(json!=null){if(i>0){pieces.push(',');}
+pieces.push(this.writeNewline(),this.writeIndent(),json);}}
+this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),']');return pieces.join('');},'string':function(string){var m={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};if(/["\\\x00-\x1f]/.test(string)){return'"'+string.replace(/([\x00-\x1f\\"])/g,function(a,b){var c=m[b];if(c){return c;}
+c=b.charCodeAt();return'\\u00'+
+Math.floor(c/16).toString(16)+
+(c%16).toString(16);})+'"';}
+return'"'+string+'"';},'number':function(number){return isFinite(number)?String(number):"null";},'boolean':function(bool){return String(bool);},'date':function(date){function format(number){return(number<10)?'0'+number:number;}
+return'"'+date.getFullYear()+'-'+
+format(date.getMonth()+1)+'-'+
+format(date.getDate())+'T'+
+format(date.getHours())+':'+
+format(date.getMinutes())+':'+
+format(date.getSeconds())+'"';}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Format.GeoJSON=OpenLayers.Class(OpenLayers.Format.JSON,{ignoreExtraDims:false,read:function(json,type,filter){type=(type)?type:"FeatureCollection";var results=null;var obj=null;if(typeof json=="string"){obj=OpenLayers.Format.JSON.prototype.read.apply(this,[json,filter]);}else{obj=json;}
if(!obj){OpenLayers.Console.error("Bad JSON: "+json);}else if(typeof(obj.type)!="string"){OpenLayers.Console.error("Bad GeoJSON - no type: "+json);}else if(this.isValidType(obj,type)){switch(type){case"Geometry":try{results=this.parseGeometry(obj);}catch(err){OpenLayers.Console.error(err);}
break;case"Feature":try{results=this.parseFeature(obj);results.type="Feature";}catch(err){OpenLayers.Console.error(err);}
break;case"FeatureCollection":results=[];switch(obj.type){case"Feature":try{results.push(this.parseFeature(obj));}catch(err){results=null;OpenLayers.Console.error(err);}
-break;case"FeatureCollection":for(var i=0;i<obj.features.length;++i){try{results.push(this.parseFeature(obj.features[i]));}catch(err){results=null;OpenLayers.Console.error(err);}}
+break;case"FeatureCollection":for(var i=0,len=obj.features.length;i<len;++i){try{results.push(this.parseFeature(obj.features[i]));}catch(err){results=null;OpenLayers.Console.error(err);}}
break;default:try{var geom=this.parseGeometry(obj);results.push(new OpenLayers.Feature.Vector(geom));}catch(err){results=null;OpenLayers.Console.error(err);}}
break;}}
return results;},isValidType:function(obj,type){var valid=false;switch(type){case"Geometry":if(OpenLayers.Util.indexOf(["Point","MultiPoint","LineString","MultiLineString","Polygon","MultiPolygon","Box","GeometryCollection"],obj.type)==-1){OpenLayers.Console.error("Unsupported geometry type: "+
obj.type);}else{valid=true;}
break;case"FeatureCollection":valid=true;break;default:if(obj.type==type){valid=true;}else{OpenLayers.Console.error("Cannot convert types from "+
obj.type+" to "+type);}}
-return valid;},parseFeature:function(obj){var feature,geometry,attributes;attributes=(obj.properties)?obj.properties:{};try{geometry=this.parseGeometry(obj.geometry);}catch(err){throw err;}
-feature=new OpenLayers.Feature.Vector(geometry,attributes);if(obj.id){feature.fid=obj.id;}
-return feature;},parseGeometry:function(obj){var geometry;if(obj.type=="GeometryCollection"){if(!(obj.geometries instanceof Array)){throw"GeometryCollection must have geometries array: "+obj;}
+return valid;},parseFeature:function(obj){var feature,geometry,attributes,bbox;attributes=(obj.properties)?obj.properties:{};bbox=(obj.geometry&&obj.geometry.bbox)||obj.bbox;try{geometry=this.parseGeometry(obj.geometry);}catch(err){throw err;}
+feature=new OpenLayers.Feature.Vector(geometry,attributes);if(bbox){feature.bounds=OpenLayers.Bounds.fromArray(bbox);}
+if(obj.id){feature.fid=obj.id;}
+return feature;},parseGeometry:function(obj){if(obj==null){return null;}
+var geometry,collection=false;if(obj.type=="GeometryCollection"){if(!(OpenLayers.Util.isArray(obj.geometries))){throw"GeometryCollection must have geometries array: "+obj;}
var numGeom=obj.geometries.length;var components=new Array(numGeom);for(var i=0;i<numGeom;++i){components[i]=this.parseGeometry.apply(this,[obj.geometries[i]]);}
-geometry=new OpenLayers.Geometry.Collection(components);}else{if(!(obj.coordinates instanceof Array)){throw"Geometry must have coordinates array: "+obj;}
+geometry=new OpenLayers.Geometry.Collection(components);collection=true;}else{if(!(OpenLayers.Util.isArray(obj.coordinates))){throw"Geometry must have coordinates array: "+obj;}
if(!this.parseCoords[obj.type.toLowerCase()]){throw"Unsupported geometry type: "+obj.type;}
try{geometry=this.parseCoords[obj.type.toLowerCase()].apply(this,[obj.coordinates]);}catch(err){throw err;}}
-if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}
-return geometry;},parseCoords:{"point":function(array){if(array.length!=2){throw"Only 2D points are supported: "+array;}
-return new OpenLayers.Geometry.Point(array[0],array[1]);},"multipoint":function(array){var points=[];var p=null;for(var i=0;i<array.length;++i){try{p=this.parseCoords["point"].apply(this,[array[i]]);}catch(err){throw err;}
+if(this.internalProjection&&this.externalProjection&&!collection){geometry.transform(this.externalProjection,this.internalProjection);}
+return geometry;},parseCoords:{"point":function(array){if(this.ignoreExtraDims==false&&array.length!=2){throw"Only 2D points are supported: "+array;}
+return new OpenLayers.Geometry.Point(array[0],array[1]);},"multipoint":function(array){var points=[];var p=null;for(var i=0,len=array.length;i<len;++i){try{p=this.parseCoords["point"].apply(this,[array[i]]);}catch(err){throw err;}
points.push(p);}
-return new OpenLayers.Geometry.MultiPoint(points);},"linestring":function(array){var points=[];var p=null;for(var i=0;i<array.length;++i){try{p=this.parseCoords["point"].apply(this,[array[i]]);}catch(err){throw err;}
+return new OpenLayers.Geometry.MultiPoint(points);},"linestring":function(array){var points=[];var p=null;for(var i=0,len=array.length;i<len;++i){try{p=this.parseCoords["point"].apply(this,[array[i]]);}catch(err){throw err;}
points.push(p);}
-return new OpenLayers.Geometry.LineString(points);},"multilinestring":function(array){var lines=[];var l=null;for(var i=0;i<array.length;++i){try{l=this.parseCoords["linestring"].apply(this,[array[i]]);}catch(err){throw err;}
+return new OpenLayers.Geometry.LineString(points);},"multilinestring":function(array){var lines=[];var l=null;for(var i=0,len=array.length;i<len;++i){try{l=this.parseCoords["linestring"].apply(this,[array[i]]);}catch(err){throw err;}
lines.push(l);}
-return new OpenLayers.Geometry.MultiLineString(lines);},"polygon":function(array){var rings=[];var r,l;for(var i=0;i<array.length;++i){try{l=this.parseCoords["linestring"].apply(this,[array[i]]);}catch(err){throw err;}
+return new OpenLayers.Geometry.MultiLineString(lines);},"polygon":function(array){var rings=[];var r,l;for(var i=0,len=array.length;i<len;++i){try{l=this.parseCoords["linestring"].apply(this,[array[i]]);}catch(err){throw err;}
r=new OpenLayers.Geometry.LinearRing(l.components);rings.push(r);}
-return new OpenLayers.Geometry.Polygon(rings);},"multipolygon":function(array){var polys=[];var p=null;for(var i=0;i<array.length;++i){try{p=this.parseCoords["polygon"].apply(this,[array[i]]);}catch(err){throw err;}
+return new OpenLayers.Geometry.Polygon(rings);},"multipolygon":function(array){var polys=[];var p=null;for(var i=0,len=array.length;i<len;++i){try{p=this.parseCoords["polygon"].apply(this,[array[i]]);}catch(err){throw err;}
polys.push(p);}
return new OpenLayers.Geometry.MultiPolygon(polys);},"box":function(array){if(array.length!=2){throw"GeoJSON box coordinates must have 2 elements";}
-return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(array[0][0],array[0][1]),new OpenLayers.Geometry.Point(array[1][0],array[0][1]),new OpenLayers.Geometry.Point(array[1][0],array[1][1]),new OpenLayers.Geometry.Point(array[0][0],array[1][1]),new OpenLayers.Geometry.Point(array[0][0],array[0][1])])]);}},write:function(obj,pretty){var geojson={"type":null};if(obj instanceof Array){geojson.type="FeatureCollection";var numFeatures=obj.length;geojson.features=new Array(numFeatures);for(var i=0;i<numFeatures;++i){var element=obj[i];if(!element instanceof OpenLayers.Feature.Vector){var msg="FeatureCollection only supports collections "+"of features: "+element;throw msg;}
+return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(array[0][0],array[0][1]),new OpenLayers.Geometry.Point(array[1][0],array[0][1]),new OpenLayers.Geometry.Point(array[1][0],array[1][1]),new OpenLayers.Geometry.Point(array[0][0],array[1][1]),new OpenLayers.Geometry.Point(array[0][0],array[0][1])])]);}},write:function(obj,pretty){var geojson={"type":null};if(OpenLayers.Util.isArray(obj)){geojson.type="FeatureCollection";var numFeatures=obj.length;geojson.features=new Array(numFeatures);for(var i=0;i<numFeatures;++i){var element=obj[i];if(!element instanceof OpenLayers.Feature.Vector){var msg="FeatureCollection only supports collections "+"of features: "+element;throw msg;}
geojson.features[i]=this.extract.feature.apply(this,[element]);}}else if(obj.CLASS_NAME.indexOf("OpenLayers.Geometry")==0){geojson=this.extract.geometry.apply(this,[obj]);}else if(obj instanceof OpenLayers.Feature.Vector){geojson=this.extract.feature.apply(this,[obj]);if(obj.layer&&obj.layer.projection){geojson.crs=this.createCRSObject(obj);}}
-return OpenLayers.Format.JSON.prototype.write.apply(this,[geojson,pretty]);},createCRSObject:function(object){var proj=object.layer.projection.toString();var crs={};if(proj.match(/epsg:/i)){var code=parseInt(proj.substring(proj.indexOf(":")+1));if(code==4326){crs={"type":"OGC","properties":{"urn":"urn:ogc:def:crs:OGC:1.3:CRS84"}};}else{crs={"type":"EPSG","properties":{"code":code}};}}
-return crs;},extract:{'feature':function(feature){var geom=this.extract.geometry.apply(this,[feature.geometry]);return{"type":"Feature","id":feature.fid==null?feature.id:feature.fid,"properties":feature.attributes,"geometry":geom};},'geometry':function(geometry){if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);}
+return OpenLayers.Format.JSON.prototype.write.apply(this,[geojson,pretty]);},createCRSObject:function(object){var proj=object.layer.projection.toString();var crs={};if(proj.match(/epsg:/i)){var code=parseInt(proj.substring(proj.indexOf(":")+1));if(code==4326){crs={"type":"name","properties":{"name":"urn:ogc:def:crs:OGC:1.3:CRS84"}};}else{crs={"type":"name","properties":{"name":"EPSG:"+code}};}}
+return crs;},extract:{'feature':function(feature){var geom=this.extract.geometry.apply(this,[feature.geometry]);var json={"type":"Feature","properties":feature.attributes,"geometry":geom};if(feature.fid!=null){json.id=feature.fid;}
+return json;},'geometry':function(geometry){if(geometry==null){return null;}
+if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);}
var geometryType=geometry.CLASS_NAME.split('.')[2];var data=this.extract[geometryType.toLowerCase()].apply(this,[geometry]);var json;if(geometryType=="Collection"){json={"type":"GeometryCollection","geometries":data};}else{json={"type":geometryType,"coordinates":data};}
-return json;},'point':function(point){return[point.x,point.y];},'multipoint':function(multipoint){var array=[];for(var i=0;i<multipoint.components.length;++i){array.push(this.extract.point.apply(this,[multipoint.components[i]]));}
-return array;},'linestring':function(linestring){var array=[];for(var i=0;i<linestring.components.length;++i){array.push(this.extract.point.apply(this,[linestring.components[i]]));}
-return array;},'multilinestring':function(multilinestring){var array=[];for(var i=0;i<multilinestring.components.length;++i){array.push(this.extract.linestring.apply(this,[multilinestring.components[i]]));}
-return array;},'polygon':function(polygon){var array=[];for(var i=0;i<polygon.components.length;++i){array.push(this.extract.linestring.apply(this,[polygon.components[i]]));}
-return array;},'multipolygon':function(multipolygon){var array=[];for(var i=0;i<multipolygon.components.length;++i){array.push(this.extract.polygon.apply(this,[multipolygon.components[i]]));}
+return json;},'point':function(point){return[point.x,point.y];},'multipoint':function(multipoint){var array=[];for(var i=0,len=multipoint.components.length;i<len;++i){array.push(this.extract.point.apply(this,[multipoint.components[i]]));}
+return array;},'linestring':function(linestring){var array=[];for(var i=0,len=linestring.components.length;i<len;++i){array.push(this.extract.point.apply(this,[linestring.components[i]]));}
+return array;},'multilinestring':function(multilinestring){var array=[];for(var i=0,len=multilinestring.components.length;i<len;++i){array.push(this.extract.linestring.apply(this,[multilinestring.components[i]]));}
+return array;},'polygon':function(polygon){var array=[];for(var i=0,len=polygon.components.length;i<len;++i){array.push(this.extract.linestring.apply(this,[polygon.components[i]]));}
+return array;},'multipolygon':function(multipolygon){var array=[];for(var i=0,len=multipolygon.components.length;i<len;++i){array.push(this.extract.polygon.apply(this,[multipolygon.components[i]]));}
return array;},'collection':function(collection){var len=collection.components.length;var array=new Array(len);for(var i=0;i<len;++i){array[i]=this.extract.geometry.apply(this,[collection.components[i]]);}
-return array;}},CLASS_NAME:"OpenLayers.Format.GeoJSON"});OpenLayers.Format.GeoRSS=OpenLayers.Class(OpenLayers.Format.XML,{rssns:"http://backend.userland.com/rss2",featureNS:"http://mapserver.gis.umn.edu/mapserver",georssns:"http://www.georss.org/georss",geons:"http://www.w3.org/2003/01/geo/wgs84_pos#",featureTitle:"Untitled",featureDescription:"No Description",gmlParser:null,xy:false,initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},createGeometryFromItem:function(item){var point=this.getElementsByTagNameNS(item,this.georssns,"point");var lat=this.getElementsByTagNameNS(item,this.geons,'lat');var lon=this.getElementsByTagNameNS(item,this.geons,'long');var line=this.getElementsByTagNameNS(item,this.georssns,"line");var polygon=this.getElementsByTagNameNS(item,this.georssns,"polygon");var where=this.getElementsByTagNameNS(item,this.georssns,"where");if(point.length>0||(lat.length>0&&lon.length>0)){var location;if(point.length>0){location=OpenLayers.String.trim(point[0].firstChild.nodeValue).split(/\s+/);if(location.length!=2){location=OpenLayers.String.trim(point[0].firstChild.nodeValue).split(/\s*,\s*/);}}else{location=[parseFloat(lat[0].firstChild.nodeValue),parseFloat(lon[0].firstChild.nodeValue)];}
-var geometry=new OpenLayers.Geometry.Point(parseFloat(location[1]),parseFloat(location[0]));}else if(line.length>0){var coords=OpenLayers.String.trim(line[0].firstChild.nodeValue).split(/\s+/);var components=[];var point;for(var i=0;i<coords.length;i+=2){point=new OpenLayers.Geometry.Point(parseFloat(coords[i+1]),parseFloat(coords[i]));components.push(point);}
-geometry=new OpenLayers.Geometry.LineString(components);}else if(polygon.length>0){var coords=OpenLayers.String.trim(polygon[0].firstChild.nodeValue).split(/\s+/);var components=[];var point;for(var i=0;i<coords.length;i+=2){point=new OpenLayers.Geometry.Point(parseFloat(coords[i+1]),parseFloat(coords[i]));components.push(point);}
-geometry=new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]);}else if(where.length>0){if(!this.gmlParser){this.gmlParser=new OpenLayers.Format.GML({'xy':this.xy});}
-var feature=this.gmlParser.parseFeature(where[0]);geometry=feature.geometry;}
-if(geometry&&this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}
-return geometry;},createFeatureFromItem:function(item){var geometry=this.createGeometryFromItem(item);var title=this.getChildValue(item,"*","title",this.featureTitle);var description=this.getChildValue(item,"*","description",this.getChildValue(item,"*","content",this.featureDescription));var link=this.getChildValue(item,"*","link");if(!link){try{link=this.getElementsByTagNameNS(item,"*","link")[0].getAttribute("href");}catch(e){link=null;}}
-var id=this.getChildValue(item,"*","id",null);var data={"title":title,"description":description,"link":link};var feature=new OpenLayers.Feature.Vector(geometry,data);feature.fid=id;return feature;},getChildValue:function(node,nsuri,name,def){var value;try{value=this.getElementsByTagNameNS(node,nsuri,name)[0].firstChild.nodeValue;}catch(e){value=(def==undefined)?"":def;}
-return value;},read:function(doc){if(typeof doc=="string"){doc=OpenLayers.Format.XML.prototype.read.apply(this,[doc]);}
-var itemlist=null;itemlist=this.getElementsByTagNameNS(doc,'*','item');if(itemlist.length==0){itemlist=this.getElementsByTagNameNS(doc,'*','entry');}
-var numItems=itemlist.length;var features=new Array(numItems);for(var i=0;i<numItems;i++){features[i]=this.createFeatureFromItem(itemlist[i]);}
-return features;},write:function(features){var georss;if(features instanceof Array){georss=this.createElementNS(this.rssns,"rss");for(var i=0;i<features.length;i++){georss.appendChild(this.createFeatureXML(features[i]));}}else{georss=this.createFeatureXML(features);}
-return OpenLayers.Format.XML.prototype.write.apply(this,[georss]);},createFeatureXML:function(feature){var geometryNode=this.buildGeometryNode(feature.geometry);var featureNode=this.createElementNS(this.rssns,"item");var titleNode=this.createElementNS(this.rssns,"title");titleNode.appendChild(this.createTextNode(feature.attributes.title?feature.attributes.title:""));var descNode=this.createElementNS(this.rssns,"description");descNode.appendChild(this.createTextNode(feature.attributes.description?feature.attributes.description:""));featureNode.appendChild(titleNode);featureNode.appendChild(descNode);if(feature.attributes.link){var linkNode=this.createElementNS(this.rssns,"link");linkNode.appendChild(this.createTextNode(feature.attributes.link));featureNode.appendChild(linkNode);}
-for(var attr in feature.attributes){if(attr=="link"||attr=="title"||attr=="description"){continue;}
-var attrText=this.createTextNode(feature.attributes[attr]);var nodename=attr;if(attr.search(":")!=-1){nodename=attr.split(":")[1];}
-var attrContainer=this.createElementNS(this.featureNS,"feature:"+nodename);attrContainer.appendChild(attrText);featureNode.appendChild(attrContainer);}
-featureNode.appendChild(geometryNode);return featureNode;},buildGeometryNode:function(geometry){if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);}
-var node;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Polygon"){node=this.createElementNS(this.georssns,'georss:polygon');node.appendChild(this.buildCoordinatesNode(geometry.components[0]));}
-else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"){node=this.createElementNS(this.georssns,'georss:line');node.appendChild(this.buildCoordinatesNode(geometry));}
-else if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){node=this.createElementNS(this.georssns,'georss:point');node.appendChild(this.buildCoordinatesNode(geometry));}else{throw"Couldn't parse "+geometry.CLASS_NAME;}
-return node;},buildCoordinatesNode:function(geometry){var points=null;if(geometry.components){points=geometry.components;}
-var path;if(points){var numPoints=points.length;var parts=new Array(numPoints);for(var i=0;i<numPoints;i++){parts[i]=points[i].y+" "+points[i].x;}
-path=parts.join(" ");}else{path=geometry.y+" "+geometry.x;}
-return this.createTextNode(path);},CLASS_NAME:"OpenLayers.Format.GeoRSS"});OpenLayers.Format.KML=OpenLayers.Class(OpenLayers.Format.XML,{kmlns:"http://earth.google.com/kml/2.0",placemarksDesc:"No description available",foldersName:"OpenLayers export",foldersDesc:"Exported on "+new Date(),extractAttributes:true,extractStyles:false,internalns:null,features:null,styles:null,styleBaseUrl:"",fetched:null,maxDepth:0,initialize:function(options){this.regExes={trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g),kmlColor:(/(\w{2})(\w{2})(\w{2})(\w{2})/),kmlIconPalette:(/root:\/\/icons\/palette-(\d+)(\.\w+)/),straightBracket:(/\$\[(.*?)\]/g)};OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){this.features=[];this.styles={};this.fetched={};var options={depth:this.maxDepth,styleBaseUrl:this.styleBaseUrl};return this.parseData(data,options);},parseData:function(data,options){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
-var types=["Link","NetworkLink","Style","StyleMap","Placemark"];for(var i=0;i<types.length;++i){var type=types[i];var nodes=this.getElementsByTagNameNS(data,"*",type);if(nodes.length==0){continue;}
+return array;}},CLASS_NAME:"OpenLayers.Format.GeoJSON"});OpenLayers.Protocol.Script=OpenLayers.Class(OpenLayers.Protocol,{url:null,params:null,callback:null,callbackTemplate:"OpenLayers.Protocol.Script.registry.${id}",callbackKey:"callback",callbackPrefix:"",scope:null,format:null,pendingRequests:null,srsInBBOX:false,initialize:function(options){options=options||{};this.params={};this.pendingRequests={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.format){this.format=new OpenLayers.Format.GeoJSON();}
+if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var format=new OpenLayers.Format.QueryStringFilter({srsInBBOX:this.srsInBBOX});this.filterToParams=function(filter,params){return format.write(filter,params);};}},read:function(options){OpenLayers.Protocol.prototype.read.apply(this,arguments);options=OpenLayers.Util.applyDefaults(options,this.options);options.params=OpenLayers.Util.applyDefaults(options.params,this.options.params);if(options.filter&&this.filterToParams){options.params=this.filterToParams(options.filter,options.params);}
+var response=new OpenLayers.Protocol.Response({requestType:"read"});var request=this.createRequest(options.url,options.params,OpenLayers.Function.bind(function(data){response.data=data;this.handleRead(response,options);},this));response.priv=request;return response;},createRequest:function(url,params,callback){var id=OpenLayers.Protocol.Script.register(callback);var name=OpenLayers.String.format(this.callbackTemplate,{id:id});params=OpenLayers.Util.extend({},params);params[this.callbackKey]=this.callbackPrefix+name;url=OpenLayers.Util.urlAppend(url,OpenLayers.Util.getParameterString(params));var script=document.createElement("script");script.type="text/javascript";script.src=url;script.id="OpenLayers_Protocol_Script_"+id;this.pendingRequests[script.id]=script;var head=document.getElementsByTagName("head")[0];head.appendChild(script);return script;},destroyRequest:function(script){OpenLayers.Protocol.Script.unregister(script.id.split("_").pop());delete this.pendingRequests[script.id];if(script.parentNode){script.parentNode.removeChild(script);}},handleRead:function(response,options){this.handleResponse(response,options);},handleResponse:function(response,options){if(options.callback){if(response.data){response.features=this.parseFeatures(response.data);response.code=OpenLayers.Protocol.Response.SUCCESS;}else{response.code=OpenLayers.Protocol.Response.FAILURE;}
+this.destroyRequest(response.priv);options.callback.call(options.scope,response);}},parseFeatures:function(data){return this.format.read(data);},abort:function(response){if(response){this.destroyRequest(response.priv);}else{for(var key in this.pendingRequests){this.destroyRequest(this.pendingRequests[key]);}}},destroy:function(){this.abort();delete this.params;delete this.format;OpenLayers.Protocol.prototype.destroy.apply(this);},CLASS_NAME:"OpenLayers.Protocol.Script"});(function(){var o=OpenLayers.Protocol.Script;var counter=0;o.registry={};o.register=function(callback){var id="c"+(++counter);o.registry[id]=function(){callback.apply(this,arguments);};return id;};o.unregister=function(id){delete o.registry[id];};})();OpenLayers.Control.Panel=OpenLayers.Class(OpenLayers.Control,{controls:null,autoActivate:true,defaultControl:null,saveState:false,allowDepress:false,activeState:null,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.controls=[];this.activeState={};},destroy:function(){if(this.map){this.map.events.unregister("buttonclick",this,this.onButtonClick);}
+OpenLayers.Control.prototype.destroy.apply(this,arguments);for(var ctl,i=this.controls.length-1;i>=0;i--){ctl=this.controls[i];if(ctl.events){ctl.events.un({activate:this.iconOn,deactivate:this.iconOff});}
+ctl.panel_div=null;}
+this.activeState=null;},activate:function(){if(OpenLayers.Control.prototype.activate.apply(this,arguments)){var control;for(var i=0,len=this.controls.length;i<len;i++){control=this.controls[i];if(control===this.defaultControl||(this.saveState&&this.activeState[control.id])){control.activate();}}
+if(this.saveState===true){this.defaultControl=null;}
+this.redraw();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){var control;for(var i=0,len=this.controls.length;i<len;i++){control=this.controls[i];this.activeState[control.id]=control.deactivate();}
+this.redraw();return true;}else{return false;}},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(this.outsideViewport){this.events.attachToElement(this.div);this.events.register("buttonclick",this,this.onButtonClick);}else{this.map.events.register("buttonclick",this,this.onButtonClick);}
+this.addControlsToMap(this.controls);return this.div;},redraw:function(){for(var l=this.div.childNodes.length,i=l-1;i>=0;i--){this.div.removeChild(this.div.childNodes[i]);}
+this.div.innerHTML="";if(this.active){for(var i=0,len=this.controls.length;i<len;i++){this.div.appendChild(this.controls[i].panel_div);}}},activateControl:function(control){if(!this.active){return false;}
+if(control.type==OpenLayers.Control.TYPE_BUTTON){control.trigger();return;}
+if(control.type==OpenLayers.Control.TYPE_TOGGLE){if(control.active){control.deactivate();}else{control.activate();}
+return;}
+if(this.allowDepress&&control.active){control.deactivate();}else{var c;for(var i=0,len=this.controls.length;i<len;i++){c=this.controls[i];if(c!=control&&(c.type===OpenLayers.Control.TYPE_TOOL||c.type==null)){c.deactivate();}}
+control.activate();}},addControls:function(controls){if(!(OpenLayers.Util.isArray(controls))){controls=[controls];}
+this.controls=this.controls.concat(controls);for(var i=0,len=controls.length;i<len;i++){var control=controls[i],element=this.createControlMarkup(control);OpenLayers.Element.addClass(element,control.displayClass+"ItemInactive");OpenLayers.Element.addClass(element,"olButton");if(control.title!=""&&!element.title){element.title=control.title;}
+control.panel_div=element;}
+if(this.map){this.addControlsToMap(controls);this.redraw();}},createControlMarkup:function(control){return document.createElement("div");},addControlsToMap:function(controls){var control;for(var i=0,len=controls.length;i<len;i++){control=controls[i];if(control.autoActivate===true){control.autoActivate=false;this.map.addControl(control);control.autoActivate=true;}else{this.map.addControl(control);control.deactivate();}
+control.events.on({activate:this.iconOn,deactivate:this.iconOff});}},iconOn:function(){var d=this.panel_div;var re=new RegExp("\\b("+this.displayClass+"Item)Inactive\\b");d.className=d.className.replace(re,"$1Active");},iconOff:function(){var d=this.panel_div;var re=new RegExp("\\b("+this.displayClass+"Item)Active\\b");d.className=d.className.replace(re,"$1Inactive");},onButtonClick:function(evt){var controls=this.controls,button=evt.buttonElement;for(var i=controls.length-1;i>=0;--i){if(controls[i].panel_div===button){this.activateControl(controls[i]);break;}}},getControlsBy:function(property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this.controls,function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getControlsByName:function(match){return this.getControlsBy("name",match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},CLASS_NAME:"OpenLayers.Control.Panel"});OpenLayers.Control.ZoomIn=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_BUTTON,trigger:function(){this.map.zoomIn();},CLASS_NAME:"OpenLayers.Control.ZoomIn"});OpenLayers.Control.ZoomOut=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_BUTTON,trigger:function(){this.map.zoomOut();},CLASS_NAME:"OpenLayers.Control.ZoomOut"});OpenLayers.Control.ZoomToMaxExtent=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_BUTTON,trigger:function(){if(this.map){this.map.zoomToMaxExtent();}},CLASS_NAME:"OpenLayers.Control.ZoomToMaxExtent"});OpenLayers.Control.ZoomPanel=OpenLayers.Class(OpenLayers.Control.Panel,{initialize:function(options){OpenLayers.Control.Panel.prototype.initialize.apply(this,[options]);this.addControls([new OpenLayers.Control.ZoomIn(),new OpenLayers.Control.ZoomToMaxExtent(),new OpenLayers.Control.ZoomOut()]);},CLASS_NAME:"OpenLayers.Control.ZoomPanel"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:false,initialize:function(name,url,params,options){OpenLayers.Layer.prototype.initialize.apply(this,[name,options]);this.url=url;if(!this.params){this.params=OpenLayers.Util.extend({},params);}},destroy:function(){this.url=null;this.params=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions());}
+obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);return obj;},setUrl:function(newUrl){this.url=newUrl;},mergeNewParams:function(newParams){this.params=OpenLayers.Util.extend(this.params,newParams);var ret=this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"params"});}
+return ret;},redraw:function(force){if(force){return this.mergeNewParams({"_olSalt":Math.random()});}else{return OpenLayers.Layer.prototype.redraw.apply(this,[]);}},selectUrl:function(paramString,urls){var product=1;for(var i=0,len=paramString.length;i<len;i++){product*=paramString.charCodeAt(i)*this.URL_HASH_FACTOR;product-=Math.floor(product);}
+return urls[Math.floor(product*urls.length)];},getFullRequestString:function(newParams,altUrl){var url=altUrl||this.url;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var paramsString=OpenLayers.Util.getParameterString(allParams);if(OpenLayers.Util.isArray(url)){url=this.selectUrl(paramsString,url);}
+var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}}
+paramsString=OpenLayers.Util.getParameterString(allParams);return OpenLayers.Util.urlAppend(url,paramsString);},CLASS_NAME:"OpenLayers.Layer.HTTPRequest"});OpenLayers.Tile=OpenLayers.Class({events:null,eventListeners:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:false,initialize:function(layer,position,bounds,url,size,options){this.layer=layer;this.position=position.clone();this.setBounds(bounds);this.url=url;if(size){this.size=size.clone();}
+this.id=OpenLayers.Util.createUniqueID("Tile_");OpenLayers.Util.extend(this,options);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}},unload:function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("unload");}},destroy:function(){this.layer=null;this.bounds=null;this.size=null;this.position=null;if(this.eventListeners){this.events.un(this.eventListeners);}
+this.events.destroy();this.eventListeners=null;this.events=null;},draw:function(deferred){if(!deferred){this.clear();}
+var draw=this.shouldDraw();if(draw&&!deferred){draw=this.events.triggerEvent("beforedraw")!==false;}
+return draw;},shouldDraw:function(){var withinMaxExtent=false,maxExtent=this.layer.maxExtent;if(maxExtent){var map=this.layer.map;var worldBounds=map.baseLayer.wrapDateLine&&map.getMaxExtent();if(this.bounds.intersectsBounds(maxExtent,{inclusive:false,worldBounds:worldBounds})){withinMaxExtent=true;}}
+return withinMaxExtent||this.layer.displayOutsideMaxExtent;},setBounds:function(bounds){bounds=bounds.clone();if(this.layer.map.baseLayer.wrapDateLine){var worldExtent=this.layer.map.getMaxExtent(),tolerance=this.layer.map.getResolution();bounds=bounds.wrapDateLine(worldExtent,{leftTolerance:tolerance,rightTolerance:tolerance});}
+this.bounds=bounds;},moveTo:function(bounds,position,redraw){if(redraw==null){redraw=true;}
+this.setBounds(bounds);this.position=position.clone();if(redraw){this.draw();}},clear:function(draw){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,imageReloadAttempts:null,layerAlphaHack:null,asyncRequestId:null,blankImageUrl:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAQAIBRAA7",maxGetUrlLength:null,canvasContext:null,crossOriginKeyword:null,initialize:function(layer,position,bounds,url,size,options){OpenLayers.Tile.prototype.initialize.apply(this,arguments);this.url=url;this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();if(this.maxGetUrlLength!=null||this.layer.gutter||this.layerAlphaHack){this.frame=document.createElement("div");this.frame.style.position="absolute";this.frame.style.overflow="hidden";}
+if(this.maxGetUrlLength!=null){OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame);}},destroy:function(){if(this.imgDiv){this.clear();this.imgDiv=null;this.frame=null;}
+this.asyncRequestId=null;OpenLayers.Tile.prototype.destroy.apply(this,arguments);},draw:function(){var drawn=OpenLayers.Tile.prototype.draw.apply(this,arguments);if(drawn){if(this.layer!=this.layer.map.baseLayer&&this.layer.reproject){this.bounds=this.getBoundsFromBaseLayer(this.position);}
+if(this.isLoading){this._loadEvent="reload";}else{this.isLoading=true;this._loadEvent="loadstart";}
+this.positionTile();this.renderTile();}else{this.unload();}
+return drawn;},renderTile:function(){this.layer.div.appendChild(this.getTile());if(this.layer.async){var id=this.asyncRequestId=(this.asyncRequestId||0)+1;this.layer.getURLasync(this.bounds,function(url){if(id==this.asyncRequestId){this.url=url;this.initImage();}},this);}else{this.url=this.layer.getURL(this.bounds);this.initImage();}},positionTile:function(){var style=this.getTile().style,size=this.frame?this.size:this.layer.getImageSize(this.bounds);style.left=this.position.x+"%";style.top=this.position.y+"%";style.width=size.w+"%";style.height=size.h+"%";},clear:function(){OpenLayers.Tile.prototype.clear.apply(this,arguments);var img=this.imgDiv;if(img){OpenLayers.Event.stopObservingElement(img);var tile=this.getTile();if(tile.parentNode===this.layer.div){this.layer.div.removeChild(tile);}
+this.setImgSrc();if(this.layerAlphaHack===true){img.style.filter="";}
+OpenLayers.Element.removeClass(img,"olImageLoadError");}
+this.canvasContext=null;},getImage:function(){if(!this.imgDiv){this.imgDiv=document.createElement("img");this.imgDiv.className="olTileImage";this.imgDiv.galleryImg="no";var style=this.imgDiv.style;if(this.frame){var left=0,top=0;if(this.layer.gutter){left=this.layer.gutter/this.layer.tileSize.w*100;top=this.layer.gutter/this.layer.tileSize.h*100;}
+style.left=-left+"%";style.top=-top+"%";style.width=(2*left+100)+"%";style.height=(2*top+100)+"%";}
+style.visibility="hidden";style.opacity=0;if(this.layer.opacity<1){style.filter='alpha(opacity='+
+(this.layer.opacity*100)+')';}
+style.position="absolute";if(this.layerAlphaHack){style.paddingTop=style.height;style.height="0";style.width="100%";}
+if(this.frame){this.frame.appendChild(this.imgDiv);}}
+return this.imgDiv;},initImage:function(){this.events.triggerEvent(this._loadEvent);var img=this.getImage();if(this.url&&img.getAttribute("src")==this.url){this.onImageLoad();}else{var load=OpenLayers.Function.bind(function(){OpenLayers.Event.stopObservingElement(img);OpenLayers.Event.observe(img,"load",OpenLayers.Function.bind(this.onImageLoad,this));OpenLayers.Event.observe(img,"error",OpenLayers.Function.bind(this.onImageError,this));this.imageReloadAttempts=0;this.setImgSrc(this.url);},this);if(img.getAttribute("src")==this.blankImageUrl){load();}else{OpenLayers.Event.observe(img,"load",load);OpenLayers.Event.observe(img,"error",load);if(this.crossOriginKeyword){img.removeAttribute("crossorigin");}
+img.src=this.blankImageUrl;}}},setImgSrc:function(url){var img=this.imgDiv;img.style.visibility='hidden';img.style.opacity=0;if(url){if(this.crossOriginKeyword){if(url.substr(0,5)!=='data:'){img.setAttribute("crossorigin",this.crossOriginKeyword);}else{img.removeAttribute("crossorigin");}}
+img.src=url;}},getTile:function(){return this.frame?this.frame:this.getImage();},createBackBuffer:function(){if(!this.imgDiv||this.isLoading){return;}
+var backBuffer;if(this.frame){backBuffer=this.frame.cloneNode(false);backBuffer.appendChild(this.imgDiv);}else{backBuffer=this.imgDiv;}
+this.imgDiv=null;return backBuffer;},onImageLoad:function(){var img=this.imgDiv;OpenLayers.Event.stopObservingElement(img);img.style.visibility='inherit';img.style.opacity=this.layer.opacity;this.isLoading=false;this.canvasContext=null;this.events.triggerEvent("loadend");if(parseFloat(navigator.appVersion.split("MSIE")[1])<7&&this.layer&&this.layer.div){var span=document.createElement("span");span.style.display="none";var layerDiv=this.layer.div;layerDiv.appendChild(span);window.setTimeout(function(){span.parentNode===layerDiv&&span.parentNode.removeChild(span);},0);}
+if(this.layerAlphaHack===true){img.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+
+img.src+"', sizingMethod='scale')";}},onImageError:function(){var img=this.imgDiv;if(img.src!=null){this.imageReloadAttempts++;if(this.imageReloadAttempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS){this.setImgSrc(this.layer.getURL(this.bounds));}else{OpenLayers.Element.addClass(img,"olImageLoadError");this.events.triggerEvent("loaderror");this.onImageLoad();}}},getCanvasContext:function(){if(OpenLayers.CANVAS_SUPPORTED&&this.imgDiv&&!this.isLoading){if(!this.canvasContext){var canvas=document.createElement("canvas");canvas.width=this.size.w;canvas.height=this.size.h;this.canvasContext=canvas.getContext("2d");this.canvasContext.drawImage(this.imgDiv,0,0);}
+return this.canvasContext;}},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Layer.Grid=OpenLayers.Class(OpenLayers.Layer.HTTPRequest,{tileSize:null,tileOriginCorner:"bl",tileOrigin:null,tileOptions:null,tileClass:OpenLayers.Tile.Image,grid:null,singleTile:false,ratio:1.5,buffer:0,transitionEffect:null,numLoadingTiles:0,tileLoadingDelay:85,serverResolutions:null,moveTimerId:null,deferMoveGriddedTiles:null,tileQueueId:null,tileQueue:null,loading:false,backBuffer:null,gridResolution:null,backBufferResolution:null,backBufferLonLat:null,backBufferTimerId:null,removeBackBufferDelay:null,className:null,initialize:function(name,url,params,options){OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,arguments);this.grid=[];this.tileQueue=[];if(this.removeBackBufferDelay===null){this.removeBackBufferDelay=this.singleTile?0:2500;}
+if(this.className===null){this.className=this.singleTile?'olLayerGridSingleTile':'olLayerGrid';}
+if(!OpenLayers.Animation.isNative){this.deferMoveGriddedTiles=OpenLayers.Function.bind(function(){this.moveGriddedTiles(true);this.moveTimerId=null;},this);}},setMap:function(map){OpenLayers.Layer.HTTPRequest.prototype.setMap.call(this,map);OpenLayers.Element.addClass(this.div,this.className);},removeMap:function(map){if(this.moveTimerId!==null){window.clearTimeout(this.moveTimerId);this.moveTimerId=null;}
+this.clearTileQueue();if(this.backBufferTimerId!==null){window.clearTimeout(this.backBufferTimerId);this.backBufferTimerId=null;}},destroy:function(){this.removeBackBuffer();this.clearGrid();this.grid=null;this.tileSize=null;OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this,arguments);},clearGrid:function(){this.clearTileQueue();if(this.grid){for(var iRow=0,len=this.grid.length;iRow<len;iRow++){var row=this.grid[iRow];for(var iCol=0,clen=row.length;iCol<clen;iCol++){var tile=row[iCol];this.destroyTile(tile);}}
+this.grid=[];this.gridResolution=null;}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Grid(this.name,this.url,this.params,this.getOptions());}
+obj=OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this,[obj]);if(this.tileSize!=null){obj.tileSize=this.tileSize.clone();}
+obj.grid=[];obj.gridResolution=null;obj.backBuffer=null;obj.backBufferTimerId=null;obj.tileQueue=[];obj.tileQueueId=null;obj.loading=false;obj.moveTimerId=null;return obj;},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);bounds=bounds||this.map.getExtent();if(bounds!=null){var forceReTile=!this.grid.length||zoomChanged;var tilesBounds=this.getTilesBounds();var resolution=this.map.getResolution();var serverResolution=this.getServerResolution(resolution);if(this.singleTile){if(forceReTile||(!dragging&&!tilesBounds.containsBounds(bounds))){if(zoomChanged&&this.transitionEffect!=='resize'){this.removeBackBuffer();}
+if(!zoomChanged||this.transitionEffect==='resize'){this.applyBackBuffer(serverResolution);}
+this.initSingleTile(bounds);}}else{forceReTile=forceReTile||!tilesBounds.intersectsBounds(bounds,{worldBounds:this.map.baseLayer.wrapDateLine&&this.map.getMaxExtent()});if(resolution!==serverResolution){bounds=this.map.calculateBounds(null,serverResolution);if(forceReTile){var scale=serverResolution/resolution;this.transformDiv(scale);}}else{this.div.style.width='100%';this.div.style.height='100%';this.div.style.left='0%';this.div.style.top='0%';}
+if(forceReTile){if(zoomChanged&&this.transitionEffect==='resize'){this.applyBackBuffer(serverResolution);}
+this.initGriddedTiles(bounds);}else{this.moveGriddedTiles();}}}},getTileData:function(loc){var data=null,x=loc.lon,y=loc.lat,numRows=this.grid.length;if(this.map&&numRows){var res=this.map.getResolution(),tileWidth=this.tileSize.w,tileHeight=this.tileSize.h,bounds=this.grid[0][0].bounds,left=bounds.left,top=bounds.top;if(x<left){if(this.map.baseLayer.wrapDateLine){var worldWidth=this.map.getMaxExtent().getWidth();var worldsAway=Math.ceil((left-x)/worldWidth);x+=worldWidth*worldsAway;}}
+var dtx=(x-left)/(res*tileWidth);var dty=(top-y)/(res*tileHeight);var col=Math.floor(dtx);var row=Math.floor(dty);if(row>=0&&row<numRows){var tile=this.grid[row][col];if(tile){data={tile:tile,i:Math.floor((dtx-col)*tileWidth),j:Math.floor((dty-row)*tileHeight)};}}}
+return data;},queueTileDraw:function(evt){var tile=evt.object;if(!~OpenLayers.Util.indexOf(this.tileQueue,tile)){this.tileQueue.push(tile);}
+if(!this.tileQueueId){this.tileQueueId=OpenLayers.Animation.start(OpenLayers.Function.bind(this.drawTileFromQueue,this),null,this.div);}
+return false;},drawTileFromQueue:function(){if(this.tileQueue.length===0){this.clearTileQueue();}else{this.tileQueue.shift().draw(true);}},clearTileQueue:function(){OpenLayers.Animation.stop(this.tileQueueId);this.tileQueueId=null;this.tileQueue=[];},destroyTile:function(tile){this.removeTileMonitoringHooks(tile);tile.destroy();},getServerResolution:function(resolution){resolution=resolution||this.map.getResolution();if(this.serverResolutions&&OpenLayers.Util.indexOf(this.serverResolutions,resolution)===-1){var i,serverResolution;for(i=this.serverResolutions.length-1;i>=0;i--){serverResolution=this.serverResolutions[i];if(serverResolution>resolution){resolution=serverResolution;break;}}
+if(i===-1){throw'no appropriate resolution in serverResolutions';}}
+return resolution;},getServerZoom:function(){return this.map.getZoomForResolution(this.getServerResolution());},transformDiv:function(scale){this.div.style.width=100*scale+'%';this.div.style.height=100*scale+'%';var size=this.map.getSize();var lcX=parseInt(this.map.layerContainerDiv.style.left,10);var lcY=parseInt(this.map.layerContainerDiv.style.top,10);var x=(lcX-(size.w/2.0))*(scale-1);var y=(lcY-(size.h/2.0))*(scale-1);this.div.style.left=x+'%';this.div.style.top=y+'%';},getResolutionScale:function(){return parseInt(this.div.style.width,10)/100;},applyBackBuffer:function(resolution){if(this.backBufferTimerId!==null){this.removeBackBuffer();}
+var backBuffer=this.backBuffer;if(!backBuffer){backBuffer=this.createBackBuffer();if(!backBuffer){return;}
+this.div.insertBefore(backBuffer,this.div.firstChild);this.backBuffer=backBuffer;var topLeftTileBounds=this.grid[0][0].bounds;this.backBufferLonLat={lon:topLeftTileBounds.left,lat:topLeftTileBounds.top};this.backBufferResolution=this.gridResolution;}
+var style=backBuffer.style;var ratio=this.backBufferResolution/resolution;style.width=100*ratio+'%';style.height=100*ratio+'%';var position=this.getViewPortPxFromLonLat(this.backBufferLonLat,resolution);var leftOffset=parseInt(this.map.layerContainerDiv.style.left,10);var topOffset=parseInt(this.map.layerContainerDiv.style.top,10);backBuffer.style.left=Math.round(position.x-leftOffset)+'%';backBuffer.style.top=Math.round(position.y-topOffset)+'%';},createBackBuffer:function(){var backBuffer;if(this.grid.length>0){backBuffer=document.createElement('div');backBuffer.id=this.div.id+'_bb';backBuffer.className='olBackBuffer';backBuffer.style.position='absolute';backBuffer.style.width='100%';backBuffer.style.height='100%';for(var i=0,lenI=this.grid.length;i<lenI;i++){for(var j=0,lenJ=this.grid[i].length;j<lenJ;j++){var tile=this.grid[i][j].createBackBuffer();if(!tile){continue;}
+tile.style.top=(i*this.tileSize.h)+'%';tile.style.left=(j*this.tileSize.w)+'%';backBuffer.appendChild(tile);}}}
+return backBuffer;},removeBackBuffer:function(){if(this.backBuffer){this.div.removeChild(this.backBuffer);this.backBuffer=null;this.backBufferResolution=null;if(this.backBufferTimerId!==null){window.clearTimeout(this.backBufferTimerId);this.backBufferTimerId=null;}}},moveByPx:function(dx,dy){if(!this.singleTile){this.moveGriddedTiles();}},setTileSize:function(size){if(this.singleTile){size=this.map.getSize();size.h=parseInt(size.h*this.ratio);size.w=parseInt(size.w*this.ratio);}
+OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this,[size]);},getTilesBounds:function(){var bounds=null;var length=this.grid.length;if(length){var bottomLeftTileBounds=this.grid[length-1][0].bounds,width=this.grid[0].length*bottomLeftTileBounds.getWidth(),height=this.grid.length*bottomLeftTileBounds.getHeight();bounds=new OpenLayers.Bounds(bottomLeftTileBounds.left,bottomLeftTileBounds.bottom,bottomLeftTileBounds.left+width,bottomLeftTileBounds.bottom+height);}
+return bounds;},initSingleTile:function(bounds){this.clearTileQueue();var center=bounds.getCenterLonLat();var tileWidth=bounds.getWidth()*this.ratio;var tileHeight=bounds.getHeight()*this.ratio;var tileBounds=new OpenLayers.Bounds(center.lon-(tileWidth/2),center.lat-(tileHeight/2),center.lon+(tileWidth/2),center.lat+(tileHeight/2));var px=this.map.getLayerPxFromLonLat({lon:tileBounds.left,lat:tileBounds.top});if(!this.grid.length){this.grid[0]=[];}
+var tile=this.grid[0][0];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);tile.draw();this.grid[0][0]=tile;}else{tile.moveTo(tileBounds,px);}
+this.removeExcessTiles(1,1);this.gridResolution=this.getServerResolution();},calculateGridLayout:function(bounds,origin,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left-origin.lon;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=origin.lon+tilecol*tilelon;var offsetlat=bounds.top-(origin.lat+tilelat);var tilerow=Math.ceil(offsetlat/tilelat)+this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=-tilerowremain*this.tileSize.h;var tileoffsetlat=origin.lat+tilerow*tilelat;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},getTileOrigin:function(){var origin=this.tileOrigin;if(!origin){var extent=this.getMaxExtent();var edges=({"tl":["left","top"],"tr":["right","top"],"bl":["left","bottom"],"br":["right","bottom"]})[this.tileOriginCorner];origin=new OpenLayers.LonLat(extent[edges[0]],extent[edges[1]]);}
+return origin;},initGriddedTiles:function(bounds){this.clearTileQueue();var viewSize=this.map.getSize();var minRows=Math.ceil(viewSize.h/this.tileSize.h)+
+Math.max(1,2*this.buffer);var minCols=Math.ceil(viewSize.w/this.tileSize.w)+
+Math.max(1,2*this.buffer);var origin=this.getTileOrigin();var resolution=this.getServerResolution();var tileLayout=this.calculateGridLayout(bounds,origin,resolution);var tileoffsetx=Math.round(tileLayout.tileoffsetx);var tileoffsety=Math.round(tileLayout.tileoffsety);var tileoffsetlon=tileLayout.tileoffsetlon;var tileoffsetlat=tileLayout.tileoffsetlat;var tilelon=tileLayout.tilelon;var tilelat=tileLayout.tilelat;var startX=tileoffsetx;var startLon=tileoffsetlon;var rowidx=0;var layerContainerDivLeft=parseInt(this.map.layerContainerDiv.style.left);var layerContainerDivTop=parseInt(this.map.layerContainerDiv.style.top);var tileData=[],center=this.map.getCenter();do{var row=this.grid[rowidx++];if(!row){row=[];this.grid.push(row);}
+tileoffsetlon=startLon;tileoffsetx=startX;var colidx=0;do{var tileBounds=new OpenLayers.Bounds(tileoffsetlon,tileoffsetlat,tileoffsetlon+tilelon,tileoffsetlat+tilelat);var x=tileoffsetx;x-=layerContainerDivLeft;var y=tileoffsety;y-=layerContainerDivTop;var px=new OpenLayers.Pixel(x,y);var tile=row[colidx++];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);row.push(tile);}else{tile.moveTo(tileBounds,px,false);}
+var tileCenter=tileBounds.getCenterLonLat();tileData.push({tile:tile,distance:Math.pow(tileCenter.lon-center.lon,2)+
+Math.pow(tileCenter.lat-center.lat,2)});tileoffsetlon+=tilelon;tileoffsetx+=this.tileSize.w;}while((tileoffsetlon<=bounds.right+tilelon*this.buffer)||colidx<minCols);tileoffsetlat-=tilelat;tileoffsety+=this.tileSize.h;}while((tileoffsetlat>=bounds.bottom-tilelat*this.buffer)||rowidx<minRows);this.removeExcessTiles(rowidx,colidx);this.gridResolution=this.getServerResolution();tileData.sort(function(a,b){return a.distance-b.distance;});for(var i=0,ii=tileData.length;i<ii;++i){tileData[i].tile.draw();}},getMaxExtent:function(){return this.maxExtent;},addTile:function(bounds,position){var tile=new this.tileClass(this,position,bounds,null,this.tileSize,this.tileOptions);tile.events.register("beforedraw",this,this.queueTileDraw);return tile;},addTileMonitoringHooks:function(tile){tile.onLoadStart=function(){if(this.loading===false){this.loading=true;this.events.triggerEvent("loadstart");}
+this.events.triggerEvent("tileloadstart",{tile:tile});this.numLoadingTiles++;};tile.onLoadEnd=function(){this.numLoadingTiles--;this.events.triggerEvent("tileloaded",{tile:tile});if(this.tileQueue.length===0&&this.numLoadingTiles===0){this.loading=false;this.events.triggerEvent("loadend");if(this.backBuffer){this.backBufferTimerId=window.setTimeout(OpenLayers.Function.bind(this.removeBackBuffer,this),this.removeBackBufferDelay);}}};tile.onLoadError=function(){this.events.triggerEvent("tileerror",{tile:tile});};tile.events.on({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,"loaderror":tile.onLoadError,scope:this});},removeTileMonitoringHooks:function(tile){tile.unload();tile.events.un({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,"loaderror":tile.onLoadError,scope:this});},moveGriddedTiles:function(deferred){if(!deferred&&!OpenLayers.Animation.isNative){if(this.moveTimerId!=null){window.clearTimeout(this.moveTimerId);}
+this.moveTimerId=window.setTimeout(this.deferMoveGriddedTiles,this.tileLoadingDelay);return;}
+var buffer=this.buffer||1;var scale=this.getResolutionScale();while(true){var tlViewPort={x:(this.grid[0][0].position.x*scale)+
+parseInt(this.div.style.left,10)+
+parseInt(this.map.layerContainerDiv.style.left),y:(this.grid[0][0].position.y*scale)+
+parseInt(this.div.style.top,10)+
+parseInt(this.map.layerContainerDiv.style.top)};var tileSize={w:this.tileSize.w*scale,h:this.tileSize.h*scale};if(tlViewPort.x>-tileSize.w*(buffer-1)){this.shiftColumn(true);}else if(tlViewPort.x<-tileSize.w*buffer){this.shiftColumn(false);}else if(tlViewPort.y>-tileSize.h*(buffer-1)){this.shiftRow(true);}else if(tlViewPort.y<-tileSize.h*buffer){this.shiftRow(false);}else{break;}}},shiftRow:function(prepend){var modelRowIndex=(prepend)?0:(this.grid.length-1);var grid=this.grid;var modelRow=grid[modelRowIndex];var resolution=this.getServerResolution();var deltaY=(prepend)?-this.tileSize.h:this.tileSize.h;var deltaLat=resolution*-deltaY;var row=(prepend)?grid.pop():grid.shift();for(var i=0,len=modelRow.length;i<len;i++){var modelTile=modelRow[i];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.bottom=bounds.bottom+deltaLat;bounds.top=bounds.top+deltaLat;position.y=position.y+deltaY;row[i].moveTo(bounds,position);}
+if(prepend){grid.unshift(row);}else{grid.push(row);}},shiftColumn:function(prepend){var deltaX=(prepend)?-this.tileSize.w:this.tileSize.w;var resolution=this.getServerResolution();var deltaLon=resolution*deltaX;for(var i=0,len=this.grid.length;i<len;i++){var row=this.grid[i];var modelTileIndex=(prepend)?0:(row.length-1);var modelTile=row[modelTileIndex];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.left=bounds.left+deltaLon;bounds.right=bounds.right+deltaLon;position.x=position.x+deltaX;var tile=prepend?this.grid[i].pop():this.grid[i].shift();tile.moveTo(bounds,position);if(prepend){row.unshift(tile);}else{row.push(tile);}}},removeExcessTiles:function(rows,columns){while(this.grid.length>rows){var row=this.grid.pop();for(var i=0,l=row.length;i<l;i++){var tile=row[i];this.destroyTile(tile);}}
+while(this.grid[0].length>columns){for(var i=0,l=this.grid.length;i<l;i++){var row=this.grid[i];var tile=row.pop();this.destroyTile(tile);}}},onMapResize:function(){if(this.singleTile){this.clearGrid();this.setTileSize();}},getTileBounds:function(viewPortPx){var maxExtent=this.maxExtent;var resolution=this.getResolution();var tileMapWidth=resolution*this.tileSize.w;var tileMapHeight=resolution*this.tileSize.h;var mapPoint=this.getLonLatFromViewPortPx(viewPortPx);var tileLeft=maxExtent.left+(tileMapWidth*Math.floor((mapPoint.lon-
+maxExtent.left)/tileMapWidth));var tileBottom=maxExtent.bottom+(tileMapHeight*Math.floor((mapPoint.lat-
+maxExtent.bottom)/tileMapHeight));return new OpenLayers.Bounds(tileLeft,tileBottom,tileLeft+tileMapWidth,tileBottom+tileMapHeight);},CLASS_NAME:"OpenLayers.Layer.Grid"});OpenLayers.Format.ArcXML=OpenLayers.Class(OpenLayers.Format.XML,{fontStyleKeys:['antialiasing','blockout','font','fontcolor','fontsize','fontstyle','glowing','interval','outline','printmode','shadow','transparency'],request:null,response:null,initialize:function(options){this.request=new OpenLayers.Format.ArcXML.Request();this.response=new OpenLayers.Format.ArcXML.Response();if(options){if(options.requesttype=="feature"){this.request.get_image=null;var qry=this.request.get_feature.query;this.addCoordSys(qry.featurecoordsys,options.featureCoordSys);this.addCoordSys(qry.filtercoordsys,options.filterCoordSys);if(options.polygon){qry.isspatial=true;qry.spatialfilter.polygon=options.polygon;}else if(options.envelope){qry.isspatial=true;qry.spatialfilter.envelope={minx:0,miny:0,maxx:0,maxy:0};this.parseEnvelope(qry.spatialfilter.envelope,options.envelope);}}else if(options.requesttype=="image"){this.request.get_feature=null;var props=this.request.get_image.properties;this.parseEnvelope(props.envelope,options.envelope);this.addLayers(props.layerlist,options.layers);this.addImageSize(props.imagesize,options.tileSize);this.addCoordSys(props.featurecoordsys,options.featureCoordSys);this.addCoordSys(props.filtercoordsys,options.filterCoordSys);}else{this.request=null;}}
+OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},parseEnvelope:function(env,arr){if(arr&&arr.length==4){env.minx=arr[0];env.miny=arr[1];env.maxx=arr[2];env.maxy=arr[3];}},addLayers:function(ll,lyrs){for(var lind=0,len=lyrs.length;lind<len;lind++){ll.push(lyrs[lind]);}},addImageSize:function(imsize,olsize){if(olsize!==null){imsize.width=olsize.w;imsize.height=olsize.h;imsize.printwidth=olsize.w;imsize.printheight=olsize.h;}},addCoordSys:function(featOrFilt,fsys){if(typeof fsys=="string"){featOrFilt.id=parseInt(fsys);featOrFilt.string=fsys;}
+else if(typeof fsys=="object"&&fsys.proj!==null){featOrFilt.id=fsys.proj.srsProjNumber;featOrFilt.string=fsys.proj.srsCode;}else{featOrFilt=fsys;}},iserror:function(data){var ret=null;if(!data){ret=(this.response.error!=='');}else{data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);var errorNodes=data.documentElement.getElementsByTagName("ERROR");ret=(errorNodes!==null&&errorNodes.length>0);}
+return ret;},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var arcNode=null;if(data&&data.documentElement){if(data.documentElement.nodeName=="ARCXML"){arcNode=data.documentElement;}else{arcNode=data.documentElement.getElementsByTagName("ARCXML")[0];}}
+if(!arcNode||arcNode.firstChild.nodeName==='parsererror'){var error,source;try{error=data.firstChild.nodeValue;source=data.firstChild.childNodes[1].firstChild.nodeValue;}catch(err){}
+throw{message:"Error parsing the ArcXML request",error:error,source:source};}
+var response=this.parseResponse(arcNode);return response;},write:function(request){if(!request){request=this.request;}
+var root=this.createElementNS("","ARCXML");root.setAttribute("version","1.1");var reqElem=this.createElementNS("","REQUEST");if(request.get_image!=null){var getElem=this.createElementNS("","GET_IMAGE");reqElem.appendChild(getElem);var propElem=this.createElementNS("","PROPERTIES");getElem.appendChild(propElem);var props=request.get_image.properties;if(props.featurecoordsys!=null){var feat=this.createElementNS("","FEATURECOORDSYS");propElem.appendChild(feat);if(props.featurecoordsys.id===0){feat.setAttribute("string",props.featurecoordsys['string']);}
+else{feat.setAttribute("id",props.featurecoordsys.id);}}
+if(props.filtercoordsys!=null){var filt=this.createElementNS("","FILTERCOORDSYS");propElem.appendChild(filt);if(props.filtercoordsys.id===0){filt.setAttribute("string",props.filtercoordsys.string);}
+else{filt.setAttribute("id",props.filtercoordsys.id);}}
+if(props.envelope!=null){var env=this.createElementNS("","ENVELOPE");propElem.appendChild(env);env.setAttribute("minx",props.envelope.minx);env.setAttribute("miny",props.envelope.miny);env.setAttribute("maxx",props.envelope.maxx);env.setAttribute("maxy",props.envelope.maxy);}
+var imagesz=this.createElementNS("","IMAGESIZE");propElem.appendChild(imagesz);imagesz.setAttribute("height",props.imagesize.height);imagesz.setAttribute("width",props.imagesize.width);if(props.imagesize.height!=props.imagesize.printheight||props.imagesize.width!=props.imagesize.printwidth){imagesz.setAttribute("printheight",props.imagesize.printheight);imagesz.setArrtibute("printwidth",props.imagesize.printwidth);}
+if(props.background!=null){var backgrnd=this.createElementNS("","BACKGROUND");propElem.appendChild(backgrnd);backgrnd.setAttribute("color",props.background.color.r+","+
+props.background.color.g+","+
+props.background.color.b);if(props.background.transcolor!==null){backgrnd.setAttribute("transcolor",props.background.transcolor.r+","+
+props.background.transcolor.g+","+
+props.background.transcolor.b);}}
+if(props.layerlist!=null&&props.layerlist.length>0){var layerlst=this.createElementNS("","LAYERLIST");propElem.appendChild(layerlst);for(var ld=0;ld<props.layerlist.length;ld++){var ldef=this.createElementNS("","LAYERDEF");layerlst.appendChild(ldef);ldef.setAttribute("id",props.layerlist[ld].id);ldef.setAttribute("visible",props.layerlist[ld].visible);if(typeof props.layerlist[ld].query=="object"){var query=props.layerlist[ld].query;if(query.where.length<0){continue;}
+var queryElem=null;if(typeof query.spatialfilter=="boolean"&&query.spatialfilter){queryElem=this.createElementNS("","SPATIALQUERY");}
+else{queryElem=this.createElementNS("","QUERY");}
+queryElem.setAttribute("where",query.where);if(typeof query.accuracy=="number"&&query.accuracy>0){queryElem.setAttribute("accuracy",query.accuracy);}
+if(typeof query.featurelimit=="number"&&query.featurelimit<2000){queryElem.setAttribute("featurelimit",query.featurelimit);}
+if(typeof query.subfields=="string"&&query.subfields!="#ALL#"){queryElem.setAttribute("subfields",query.subfields);}
+if(typeof query.joinexpression=="string"&&query.joinexpression.length>0){queryElem.setAttribute("joinexpression",query.joinexpression);}
+if(typeof query.jointables=="string"&&query.jointables.length>0){queryElem.setAttribute("jointables",query.jointables);}
+ldef.appendChild(queryElem);}
+if(typeof props.layerlist[ld].renderer=="object"){this.addRenderer(ldef,props.layerlist[ld].renderer);}}}}else if(request.get_feature!=null){var getElem=this.createElementNS("","GET_FEATURES");getElem.setAttribute("outputmode","newxml");getElem.setAttribute("checkesc","true");if(request.get_feature.geometry){getElem.setAttribute("geometry",request.get_feature.geometry);}
+else{getElem.setAttribute("geometry","false");}
+if(request.get_feature.compact){getElem.setAttribute("compact",request.get_feature.compact);}
+if(request.get_feature.featurelimit=="number"){getElem.setAttribute("featurelimit",request.get_feature.featurelimit);}
+getElem.setAttribute("globalenvelope","true");reqElem.appendChild(getElem);if(request.get_feature.layer!=null&&request.get_feature.layer.length>0){var lyrElem=this.createElementNS("","LAYER");lyrElem.setAttribute("id",request.get_feature.layer);getElem.appendChild(lyrElem);}
+var fquery=request.get_feature.query;if(fquery!=null){var qElem=null;if(fquery.isspatial){qElem=this.createElementNS("","SPATIALQUERY");}else{qElem=this.createElementNS("","QUERY");}
+getElem.appendChild(qElem);if(typeof fquery.accuracy=="number"){qElem.setAttribute("accuracy",fquery.accuracy);}
+if(fquery.featurecoordsys!=null){var fcsElem1=this.createElementNS("","FEATURECOORDSYS");if(fquery.featurecoordsys.id==0){fcsElem1.setAttribute("string",fquery.featurecoordsys.string);}else{fcsElem1.setAttribute("id",fquery.featurecoordsys.id);}
+qElem.appendChild(fcsElem1);}
+if(fquery.filtercoordsys!=null){var fcsElem2=this.createElementNS("","FILTERCOORDSYS");if(fquery.filtercoordsys.id===0){fcsElem2.setAttribute("string",fquery.filtercoordsys.string);}else{fcsElem2.setAttribute("id",fquery.filtercoordsys.id);}
+qElem.appendChild(fcsElem2);}
+if(fquery.buffer>0){var bufElem=this.createElementNS("","BUFFER");bufElem.setAttribute("distance",fquery.buffer);qElem.appendChild(bufElem);}
+if(fquery.isspatial){var spfElem=this.createElementNS("","SPATIALFILTER");spfElem.setAttribute("relation",fquery.spatialfilter.relation);qElem.appendChild(spfElem);if(fquery.spatialfilter.envelope){var envElem=this.createElementNS("","ENVELOPE");envElem.setAttribute("minx",fquery.spatialfilter.envelope.minx);envElem.setAttribute("miny",fquery.spatialfilter.envelope.miny);envElem.setAttribute("maxx",fquery.spatialfilter.envelope.maxx);envElem.setAttribute("maxy",fquery.spatialfilter.envelope.maxy);spfElem.appendChild(envElem);}else if(typeof fquery.spatialfilter.polygon=="object"){spfElem.appendChild(this.writePolygonGeometry(fquery.spatialfilter.polygon));}}
+if(fquery.where!=null&&fquery.where.length>0){qElem.setAttribute("where",fquery.where);}}}
+root.appendChild(reqElem);return OpenLayers.Format.XML.prototype.write.apply(this,[root]);},addGroupRenderer:function(ldef,toprenderer){var topRelem=this.createElementNS("","GROUPRENDERER");ldef.appendChild(topRelem);for(var rind=0;rind<toprenderer.length;rind++){var renderer=toprenderer[rind];this.addRenderer(topRelem,renderer);}},addRenderer:function(topRelem,renderer){if(OpenLayers.Util.isArray(renderer)){this.addGroupRenderer(topRelem,renderer);}else{var renderElem=this.createElementNS("",renderer.type.toUpperCase()+"RENDERER");topRelem.appendChild(renderElem);if(renderElem.tagName=="VALUEMAPRENDERER"){this.addValueMapRenderer(renderElem,renderer);}else if(renderElem.tagName=="VALUEMAPLABELRENDERER"){this.addValueMapLabelRenderer(renderElem,renderer);}else if(renderElem.tagName=="SIMPLELABELRENDERER"){this.addSimpleLabelRenderer(renderElem,renderer);}else if(renderElem.tagName=="SCALEDEPENDENTRENDERER"){this.addScaleDependentRenderer(renderElem,renderer);}}},addScaleDependentRenderer:function(renderElem,renderer){if(typeof renderer.lower=="string"||typeof renderer.lower=="number"){renderElem.setAttribute("lower",renderer.lower);}
+if(typeof renderer.upper=="string"||typeof renderer.upper=="number"){renderElem.setAttribute("upper",renderer.upper);}
+this.addRenderer(renderElem,renderer.renderer);},addValueMapLabelRenderer:function(renderElem,renderer){renderElem.setAttribute("lookupfield",renderer.lookupfield);renderElem.setAttribute("labelfield",renderer.labelfield);if(typeof renderer.exacts=="object"){for(var ext=0,extlen=renderer.exacts.length;ext<extlen;ext++){var exact=renderer.exacts[ext];var eelem=this.createElementNS("","EXACT");if(typeof exact.value=="string"){eelem.setAttribute("value",exact.value);}
+if(typeof exact.label=="string"){eelem.setAttribute("label",exact.label);}
+if(typeof exact.method=="string"){eelem.setAttribute("method",exact.method);}
+renderElem.appendChild(eelem);if(typeof exact.symbol=="object"){var selem=null;if(exact.symbol.type=="text"){selem=this.createElementNS("","TEXTSYMBOL");}
+if(selem!=null){var keys=this.fontStyleKeys;for(var i=0,len=keys.length;i<len;i++){var key=keys[i];if(exact.symbol[key]){selem.setAttribute(key,exact.symbol[key]);}}
+eelem.appendChild(selem);}}}}},addValueMapRenderer:function(renderElem,renderer){renderElem.setAttribute("lookupfield",renderer.lookupfield);if(typeof renderer.ranges=="object"){for(var rng=0,rnglen=renderer.ranges.length;rng<rnglen;rng++){var range=renderer.ranges[rng];var relem=this.createElementNS("","RANGE");relem.setAttribute("lower",range.lower);relem.setAttribute("upper",range.upper);renderElem.appendChild(relem);if(typeof range.symbol=="object"){var selem=null;if(range.symbol.type=="simplepolygon"){selem=this.createElementNS("","SIMPLEPOLYGONSYMBOL");}
+if(selem!=null){if(typeof range.symbol.boundarycolor=="string"){selem.setAttribute("boundarycolor",range.symbol.boundarycolor);}
+if(typeof range.symbol.fillcolor=="string"){selem.setAttribute("fillcolor",range.symbol.fillcolor);}
+if(typeof range.symbol.filltransparency=="number"){selem.setAttribute("filltransparency",range.symbol.filltransparency);}
+relem.appendChild(selem);}}}}else if(typeof renderer.exacts=="object"){for(var ext=0,extlen=renderer.exacts.length;ext<extlen;ext++){var exact=renderer.exacts[ext];var eelem=this.createElementNS("","EXACT");if(typeof exact.value=="string"){eelem.setAttribute("value",exact.value);}
+if(typeof exact.label=="string"){eelem.setAttribute("label",exact.label);}
+if(typeof exact.method=="string"){eelem.setAttribute("method",exact.method);}
+renderElem.appendChild(eelem);if(typeof exact.symbol=="object"){var selem=null;if(exact.symbol.type=="simplemarker"){selem=this.createElementNS("","SIMPLEMARKERSYMBOL");}
+if(selem!=null){if(typeof exact.symbol.antialiasing=="string"){selem.setAttribute("antialiasing",exact.symbol.antialiasing);}
+if(typeof exact.symbol.color=="string"){selem.setAttribute("color",exact.symbol.color);}
+if(typeof exact.symbol.outline=="string"){selem.setAttribute("outline",exact.symbol.outline);}
+if(typeof exact.symbol.overlap=="string"){selem.setAttribute("overlap",exact.symbol.overlap);}
+if(typeof exact.symbol.shadow=="string"){selem.setAttribute("shadow",exact.symbol.shadow);}
+if(typeof exact.symbol.transparency=="number"){selem.setAttribute("transparency",exact.symbol.transparency);}
+if(typeof exact.symbol.usecentroid=="string"){selem.setAttribute("usecentroid",exact.symbol.usecentroid);}
+if(typeof exact.symbol.width=="number"){selem.setAttribute("width",exact.symbol.width);}
+eelem.appendChild(selem);}}}}},addSimpleLabelRenderer:function(renderElem,renderer){renderElem.setAttribute("field",renderer.field);var keys=['featureweight','howmanylabels','labelbufferratio','labelpriorities','labelweight','linelabelposition','rotationalangles'];for(var i=0,len=keys.length;i<len;i++){var key=keys[i];if(renderer[key]){renderElem.setAttribute(key,renderer[key]);}}
+if(renderer.symbol.type=="text"){var symbol=renderer.symbol;var selem=this.createElementNS("","TEXTSYMBOL");renderElem.appendChild(selem);var keys=this.fontStyleKeys;for(var i=0,len=keys.length;i<len;i++){var key=keys[i];if(symbol[key]){selem.setAttribute(key,renderer[key]);}}}},writePolygonGeometry:function(polygon){if(!(polygon instanceof OpenLayers.Geometry.Polygon)){throw{message:'Cannot write polygon geometry to ArcXML with an '+
+polygon.CLASS_NAME+' object.',geometry:polygon};}
+var polyElem=this.createElementNS("","POLYGON");for(var ln=0,lnlen=polygon.components.length;ln<lnlen;ln++){var ring=polygon.components[ln];var ringElem=this.createElementNS("","RING");for(var rn=0,rnlen=ring.components.length;rn<rnlen;rn++){var point=ring.components[rn];var pointElem=this.createElementNS("","POINT");pointElem.setAttribute("x",point.x);pointElem.setAttribute("y",point.y);ringElem.appendChild(pointElem);}
+polyElem.appendChild(ringElem);}
+return polyElem;},parseResponse:function(data){if(typeof data=="string"){var newData=new OpenLayers.Format.XML();data=newData.read(data);}
+var response=new OpenLayers.Format.ArcXML.Response();var errorNode=data.getElementsByTagName("ERROR");if(errorNode!=null&&errorNode.length>0){response.error=this.getChildValue(errorNode,"Unknown error.");}else{var responseNode=data.getElementsByTagName("RESPONSE");if(responseNode==null||responseNode.length==0){response.error="No RESPONSE tag found in ArcXML response.";return response;}
+var rtype=responseNode[0].firstChild.nodeName;if(rtype=="#text"){rtype=responseNode[0].firstChild.nextSibling.nodeName;}
+if(rtype=="IMAGE"){var envelopeNode=data.getElementsByTagName("ENVELOPE");var outputNode=data.getElementsByTagName("OUTPUT");if(envelopeNode==null||envelopeNode.length==0){response.error="No ENVELOPE tag found in ArcXML response.";}else if(outputNode==null||outputNode.length==0){response.error="No OUTPUT tag found in ArcXML response.";}else{var envAttr=this.parseAttributes(envelopeNode[0]);var outputAttr=this.parseAttributes(outputNode[0]);if(typeof outputAttr.type=="string"){response.image={envelope:envAttr,output:{type:outputAttr.type,data:this.getChildValue(outputNode[0])}};}else{response.image={envelope:envAttr,output:outputAttr};}}}else if(rtype=="FEATURES"){var features=responseNode[0].getElementsByTagName("FEATURES");var featureCount=features[0].getElementsByTagName("FEATURECOUNT");response.features.featurecount=featureCount[0].getAttribute("count");if(response.features.featurecount>0){var envelope=features[0].getElementsByTagName("ENVELOPE");response.features.envelope=this.parseAttributes(envelope[0],typeof(0));var featureList=features[0].getElementsByTagName("FEATURE");for(var fn=0;fn<featureList.length;fn++){var feature=new OpenLayers.Feature.Vector();var fields=featureList[fn].getElementsByTagName("FIELD");for(var fdn=0;fdn<fields.length;fdn++){var fieldName=fields[fdn].getAttribute("name");var fieldValue=fields[fdn].getAttribute("value");feature.attributes[fieldName]=fieldValue;}
+var geom=featureList[fn].getElementsByTagName("POLYGON");if(geom.length>0){var ring=geom[0].getElementsByTagName("RING");var polys=[];for(var rn=0;rn<ring.length;rn++){var linearRings=[];linearRings.push(this.parsePointGeometry(ring[rn]));var holes=ring[rn].getElementsByTagName("HOLE");for(var hn=0;hn<holes.length;hn++){linearRings.push(this.parsePointGeometry(holes[hn]));}
+holes=null;polys.push(new OpenLayers.Geometry.Polygon(linearRings));linearRings=null;}
+ring=null;if(polys.length==1){feature.geometry=polys[0];}else
+{feature.geometry=new OpenLayers.Geometry.MultiPolygon(polys);}}
+response.features.feature.push(feature);}}}else{response.error="Unidentified response type.";}}
+return response;},parseAttributes:function(node,type){var attributes={};for(var attr=0;attr<node.attributes.length;attr++){if(type=="number"){attributes[node.attributes[attr].nodeName]=parseFloat(node.attributes[attr].nodeValue);}else{attributes[node.attributes[attr].nodeName]=node.attributes[attr].nodeValue;}}
+return attributes;},parsePointGeometry:function(node){var ringPoints=[];var coords=node.getElementsByTagName("COORDS");if(coords.length>0){var coordArr=this.getChildValue(coords[0]);coordArr=coordArr.split(/;/);for(var cn=0;cn<coordArr.length;cn++){var coordItems=coordArr[cn].split(/ /);ringPoints.push(new OpenLayers.Geometry.Point(coordItems[0],coordItems[1]));}
+coords=null;}else{var point=node.getElementsByTagName("POINT");if(point.length>0){for(var pn=0;pn<point.length;pn++){ringPoints.push(new OpenLayers.Geometry.Point(parseFloat(point[pn].getAttribute("x")),parseFloat(point[pn].getAttribute("y"))));}}
+point=null;}
+return new OpenLayers.Geometry.LinearRing(ringPoints);},CLASS_NAME:"OpenLayers.Format.ArcXML"});OpenLayers.Format.ArcXML.Request=OpenLayers.Class({initialize:function(params){var defaults={get_image:{properties:{background:null,draw:true,envelope:{minx:0,miny:0,maxx:0,maxy:0},featurecoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},filtercoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},imagesize:{height:0,width:0,dpi:96,printheight:0,printwidth:0,scalesymbols:false},layerlist:[],output:{baseurl:"",legendbaseurl:"",legendname:"",legendpath:"",legendurl:"",name:"",path:"",type:"jpg",url:""}}},get_feature:{layer:"",query:{isspatial:false,featurecoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},filtercoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},buffer:0,where:"",spatialfilter:{relation:"envelope_intersection",envelope:null}}},environment:{separators:{cs:" ",ts:";"}},layer:[],workspaces:[]};return OpenLayers.Util.extend(this,defaults);},CLASS_NAME:"OpenLayers.Format.ArcXML.Request"});OpenLayers.Format.ArcXML.Response=OpenLayers.Class({initialize:function(params){var defaults={image:{envelope:null,output:''},features:{featurecount:0,envelope:null,feature:[]},error:''};return OpenLayers.Util.extend(this,defaults);},CLASS_NAME:"OpenLayers.Format.ArcXML.Response"});(function(){var oXMLHttpRequest=window.XMLHttpRequest;var bGecko=!!window.controllers,bIE=window.document.all&&!window.opera,bIE7=bIE&&window.navigator.userAgent.match(/MSIE 7.0/);function fXMLHttpRequest(){this._object=oXMLHttpRequest&&!bIE7?new oXMLHttpRequest:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[];};function cXMLHttpRequest(){return new fXMLHttpRequest;};cXMLHttpRequest.prototype=fXMLHttpRequest.prototype;if(bGecko&&oXMLHttpRequest.wrapped)
+cXMLHttpRequest.wrapped=oXMLHttpRequest.wrapped;cXMLHttpRequest.UNSENT=0;cXMLHttpRequest.OPENED=1;cXMLHttpRequest.HEADERS_RECEIVED=2;cXMLHttpRequest.LOADING=3;cXMLHttpRequest.DONE=4;cXMLHttpRequest.prototype.readyState=cXMLHttpRequest.UNSENT;cXMLHttpRequest.prototype.responseText='';cXMLHttpRequest.prototype.responseXML=null;cXMLHttpRequest.prototype.status=0;cXMLHttpRequest.prototype.statusText='';cXMLHttpRequest.prototype.priority="NORMAL";cXMLHttpRequest.prototype.onreadystatechange=null;cXMLHttpRequest.onreadystatechange=null;cXMLHttpRequest.onopen=null;cXMLHttpRequest.onsend=null;cXMLHttpRequest.onabort=null;cXMLHttpRequest.prototype.open=function(sMethod,sUrl,bAsync,sUser,sPassword){delete this._headers;if(arguments.length<3)
+bAsync=true;this._async=bAsync;var oRequest=this,nState=this.readyState,fOnUnload;if(bIE&&bAsync){fOnUnload=function(){if(nState!=cXMLHttpRequest.DONE){fCleanTransport(oRequest);oRequest.abort();}};window.attachEvent("onunload",fOnUnload);}
+if(cXMLHttpRequest.onopen)
+cXMLHttpRequest.onopen.apply(this,arguments);if(arguments.length>4)
+this._object.open(sMethod,sUrl,bAsync,sUser,sPassword);else
+if(arguments.length>3)
+this._object.open(sMethod,sUrl,bAsync,sUser);else
+this._object.open(sMethod,sUrl,bAsync);this.readyState=cXMLHttpRequest.OPENED;fReadyStateChange(this);this._object.onreadystatechange=function(){if(bGecko&&!bAsync)
+return;oRequest.readyState=oRequest._object.readyState;fSynchronizeValues(oRequest);if(oRequest._aborted){oRequest.readyState=cXMLHttpRequest.UNSENT;return;}
+if(oRequest.readyState==cXMLHttpRequest.DONE){delete oRequest._data;fCleanTransport(oRequest);if(bIE&&bAsync)
+window.detachEvent("onunload",fOnUnload);}
+if(nState!=oRequest.readyState)
+fReadyStateChange(oRequest);nState=oRequest.readyState;}};function fXMLHttpRequest_send(oRequest){oRequest._object.send(oRequest._data);if(bGecko&&!oRequest._async){oRequest.readyState=cXMLHttpRequest.OPENED;fSynchronizeValues(oRequest);while(oRequest.readyState<cXMLHttpRequest.DONE){oRequest.readyState++;fReadyStateChange(oRequest);if(oRequest._aborted)
+return;}}};cXMLHttpRequest.prototype.send=function(vData){if(cXMLHttpRequest.onsend)
+cXMLHttpRequest.onsend.apply(this,arguments);if(!arguments.length)
+vData=null;if(vData&&vData.nodeType){vData=window.XMLSerializer?new window.XMLSerializer().serializeToString(vData):vData.xml;if(!this._headers["Content-Type"])
+this._object.setRequestHeader("Content-Type","application/xml");}
+this._data=vData;fXMLHttpRequest_send(this);};cXMLHttpRequest.prototype.abort=function(){if(cXMLHttpRequest.onabort)
+cXMLHttpRequest.onabort.apply(this,arguments);if(this.readyState>cXMLHttpRequest.UNSENT)
+this._aborted=true;this._object.abort();fCleanTransport(this);this.readyState=cXMLHttpRequest.UNSENT;delete this._data;};cXMLHttpRequest.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders();};cXMLHttpRequest.prototype.getResponseHeader=function(sName){return this._object.getResponseHeader(sName);};cXMLHttpRequest.prototype.setRequestHeader=function(sName,sValue){if(!this._headers)
+this._headers={};this._headers[sName]=sValue;return this._object.setRequestHeader(sName,sValue);};cXMLHttpRequest.prototype.addEventListener=function(sName,fHandler,bUseCapture){for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++)
+if(oListener[0]==sName&&oListener[1]==fHandler&&oListener[2]==bUseCapture)
+return;this._listeners.push([sName,fHandler,bUseCapture]);};cXMLHttpRequest.prototype.removeEventListener=function(sName,fHandler,bUseCapture){for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++)
+if(oListener[0]==sName&&oListener[1]==fHandler&&oListener[2]==bUseCapture)
+break;if(oListener)
+this._listeners.splice(nIndex,1);};cXMLHttpRequest.prototype.dispatchEvent=function(oEvent){var oEventPseudo={'type':oEvent.type,'target':this,'currentTarget':this,'eventPhase':2,'bubbles':oEvent.bubbles,'cancelable':oEvent.cancelable,'timeStamp':oEvent.timeStamp,'stopPropagation':function(){},'preventDefault':function(){},'initEvent':function(){}};if(oEventPseudo.type=="readystatechange"&&this.onreadystatechange)
+(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[oEventPseudo]);for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++)
+if(oListener[0]==oEventPseudo.type&&!oListener[2])
+(oListener[1].handleEvent||oListener[1]).apply(this,[oEventPseudo]);};cXMLHttpRequest.prototype.toString=function(){return'['+"object"+' '+"XMLHttpRequest"+']';};cXMLHttpRequest.toString=function(){return'['+"XMLHttpRequest"+']';};function fReadyStateChange(oRequest){if(cXMLHttpRequest.onreadystatechange)
+cXMLHttpRequest.onreadystatechange.apply(oRequest);oRequest.dispatchEvent({'type':"readystatechange",'bubbles':false,'cancelable':false,'timeStamp':new Date+0});};function fGetDocument(oRequest){var oDocument=oRequest.responseXML,sResponse=oRequest.responseText;if(bIE&&sResponse&&oDocument&&!oDocument.documentElement&&oRequest.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/)){oDocument=new window.ActiveXObject("Microsoft.XMLDOM");oDocument.async=false;oDocument.validateOnParse=false;oDocument.loadXML(sResponse);}
+if(oDocument)
+if((bIE&&oDocument.parseError!=0)||!oDocument.documentElement||(oDocument.documentElement&&oDocument.documentElement.tagName=="parsererror"))
+return null;return oDocument;};function fSynchronizeValues(oRequest){try{oRequest.responseText=oRequest._object.responseText;}catch(e){}
+try{oRequest.responseXML=fGetDocument(oRequest._object);}catch(e){}
+try{oRequest.status=oRequest._object.status;}catch(e){}
+try{oRequest.statusText=oRequest._object.statusText;}catch(e){}};function fCleanTransport(oRequest){oRequest._object.onreadystatechange=new window.Function;};if(!window.Function.prototype.apply){window.Function.prototype.apply=function(oRequest,oArguments){if(!oArguments)
+oArguments=[];oRequest.__func=this;oRequest.__func(oArguments[0],oArguments[1],oArguments[2],oArguments[3],oArguments[4]);delete oRequest.__func;};};OpenLayers.Request.XMLHttpRequest=cXMLHttpRequest;})();OpenLayers.ProxyHost="";OpenLayers.Request={DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:true,user:undefined,password:undefined,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this),makeSameOrigin:function(url,proxy){var sameOrigin=url.indexOf("http")!==0;var urlParts=!sameOrigin&&url.match(this.URL_SPLIT_REGEX);if(urlParts){var location=window.location;sameOrigin=urlParts[1]==location.protocol&&urlParts[3]==location.hostname;var uPort=urlParts[4],lPort=location.port;if(uPort!=80&&uPort!=""||lPort!="80"&&lPort!=""){sameOrigin=sameOrigin&&uPort==lPort;}}
+if(!sameOrigin){if(proxy){if(typeof proxy=="function"){url=proxy(url);}else{url=proxy+encodeURIComponent(url);}}else{OpenLayers.Console.warn(OpenLayers.i18n("proxyNeeded"),{url:url});}}
+return url;},issue:function(config){var defaultConfig=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});config=OpenLayers.Util.applyDefaults(config,defaultConfig);var customRequestedWithHeader=false,headerKey;for(headerKey in config.headers){if(config.headers.hasOwnProperty(headerKey)){if(headerKey.toLowerCase()==='x-requested-with'){customRequestedWithHeader=true;}}}
+if(customRequestedWithHeader===false){config.headers['X-Requested-With']='XMLHttpRequest';}
+var request=new OpenLayers.Request.XMLHttpRequest();var url=OpenLayers.Util.urlAppend(config.url,OpenLayers.Util.getParameterString(config.params||{}));url=OpenLayers.Request.makeSameOrigin(url,config.proxy);request.open(config.method,url,config.async,config.user,config.password);for(var header in config.headers){request.setRequestHeader(header,config.headers[header]);}
+var events=this.events;var self=this;request.onreadystatechange=function(){if(request.readyState==OpenLayers.Request.XMLHttpRequest.DONE){var proceed=events.triggerEvent("complete",{request:request,config:config,requestUrl:url});if(proceed!==false){self.runCallbacks({request:request,config:config,requestUrl:url});}}};if(config.async===false){request.send(config.data);}else{window.setTimeout(function(){if(request.readyState!==0){request.send(config.data);}},0);}
+return request;},runCallbacks:function(options){var request=options.request;var config=options.config;var complete=(config.scope)?OpenLayers.Function.bind(config.callback,config.scope):config.callback;var success;if(config.success){success=(config.scope)?OpenLayers.Function.bind(config.success,config.scope):config.success;}
+var failure;if(config.failure){failure=(config.scope)?OpenLayers.Function.bind(config.failure,config.scope):config.failure;}
+if(OpenLayers.Util.createUrlObject(config.url).protocol=="file:"&&request.responseText){request.status=200;}
+complete(request);if(!request.status||(request.status>=200&&request.status<300)){this.events.triggerEvent("success",options);if(success){success(request);}}
+if(request.status&&(request.status<200||request.status>=300)){this.events.triggerEvent("failure",options);if(failure){failure(request);}}},GET:function(config){config=OpenLayers.Util.extend(config,{method:"GET"});return OpenLayers.Request.issue(config);},POST:function(config){config=OpenLayers.Util.extend(config,{method:"POST"});config.headers=config.headers?config.headers:{};if(!("CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(config.headers))){config.headers["Content-Type"]="application/xml";}
+return OpenLayers.Request.issue(config);},PUT:function(config){config=OpenLayers.Util.extend(config,{method:"PUT"});config.headers=config.headers?config.headers:{};if(!("CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(config.headers))){config.headers["Content-Type"]="application/xml";}
+return OpenLayers.Request.issue(config);},DELETE:function(config){config=OpenLayers.Util.extend(config,{method:"DELETE"});return OpenLayers.Request.issue(config);},HEAD:function(config){config=OpenLayers.Util.extend(config,{method:"HEAD"});return OpenLayers.Request.issue(config);},OPTIONS:function(config){config=OpenLayers.Util.extend(config,{method:"OPTIONS"});return OpenLayers.Request.issue(config);}};OpenLayers.Layer.ArcIMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{ClientVersion:"9.2",ServiceName:''},featureCoordSys:"4326",filterCoordSys:"4326",layers:null,async:true,name:"ArcIMS",isBaseLayer:true,DEFAULT_OPTIONS:{tileSize:new OpenLayers.Size(512,512),featureCoordSys:"4326",filterCoordSys:"4326",layers:null,isBaseLayer:true,async:true,name:"ArcIMS"},initialize:function(name,url,options){this.tileSize=new OpenLayers.Size(512,512);this.params=OpenLayers.Util.applyDefaults({ServiceName:options.serviceName},this.DEFAULT_PARAMS);this.options=OpenLayers.Util.applyDefaults(options,this.DEFAULT_OPTIONS);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[name,url,this.params,options]);if(this.transparent){if(!this.isBaseLayer){this.isBaseLayer=false;}
+if(this.format=="image/jpeg"){this.format=OpenLayers.Util.alphaHack()?"image/gif":"image/png";}}
+if(this.options.layers===null){this.options.layers=[];}},getURL:function(bounds){var url="";bounds=this.adjustBounds(bounds);var axlReq=new OpenLayers.Format.ArcXML(OpenLayers.Util.extend(this.options,{requesttype:"image",envelope:bounds.toArray(),tileSize:this.tileSize}));var req=new OpenLayers.Request.POST({url:this.getFullRequestString(),data:axlReq.write(),async:false});if(req!=null){var doc=req.responseXML;if(!doc||!doc.documentElement){doc=req.responseText;}
+var axlResp=new OpenLayers.Format.ArcXML();var arcxml=axlResp.read(doc);url=this.getUrlOrImage(arcxml.image.output);}
+return url;},getURLasync:function(bounds,callback,scope){bounds=this.adjustBounds(bounds);var axlReq=new OpenLayers.Format.ArcXML(OpenLayers.Util.extend(this.options,{requesttype:"image",envelope:bounds.toArray(),tileSize:this.tileSize}));OpenLayers.Request.POST({url:this.getFullRequestString(),async:true,data:axlReq.write(),callback:function(req){var doc=req.responseXML;if(!doc||!doc.documentElement){doc=req.responseText;}
+var axlResp=new OpenLayers.Format.ArcXML();var arcxml=axlResp.read(doc);callback.call(scope,this.getUrlOrImage(arcxml.image.output));},scope:this});},getUrlOrImage:function(output){var ret="";if(output.url){ret=output.url;}else if(output.data){ret="data:image/"+output.type+";base64,"+output.data;}
+return ret;},setLayerQuery:function(id,querydef){for(var lyr=0;lyr<this.options.layers.length;lyr++){if(id==this.options.layers[lyr].id){this.options.layers[lyr].query=querydef;return;}}
+this.options.layers.push({id:id,visible:true,query:querydef});},getFeatureInfo:function(geometry,layer,options){var buffer=options.buffer||1;var callback=options.callback||function(){};var scope=options.scope||window;var requestOptions={};OpenLayers.Util.extend(requestOptions,this.options);requestOptions.requesttype="feature";if(geometry instanceof OpenLayers.LonLat){requestOptions.polygon=null;requestOptions.envelope=[geometry.lon-buffer,geometry.lat-buffer,geometry.lon+buffer,geometry.lat+buffer];}else if(geometry instanceof OpenLayers.Geometry.Polygon){requestOptions.envelope=null;requestOptions.polygon=geometry;}
+var arcxml=new OpenLayers.Format.ArcXML(requestOptions);OpenLayers.Util.extend(arcxml.request.get_feature,options);arcxml.request.get_feature.layer=layer.id;if(typeof layer.query.accuracy=="number"){arcxml.request.get_feature.query.accuracy=layer.query.accuracy;}else{var mapCenter=this.map.getCenter();var viewPx=this.map.getViewPortPxFromLonLat(mapCenter);viewPx.x++;var mapOffCenter=this.map.getLonLatFromPixel(viewPx);arcxml.request.get_feature.query.accuracy=mapOffCenter.lon-mapCenter.lon;}
+arcxml.request.get_feature.query.where=layer.query.where;arcxml.request.get_feature.query.spatialfilter.relation="area_intersection";OpenLayers.Request.POST({url:this.getFullRequestString({'CustomService':'Query'}),data:arcxml.write(),callback:function(request){var response=arcxml.parseResponse(request.responseText);if(!arcxml.iserror()){callback.call(scope,response.features);}else{callback.call(scope,null);}}});},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.ArcIMS(this.name,this.url,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},CLASS_NAME:"OpenLayers.Layer.ArcIMS"});OpenLayers.Format.OWSCommon.v1_1_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1,{namespaces:{ows:"http://www.opengis.net/ows/1.1",xlink:"http://www.w3.org/1999/xlink"},readers:{"ows":OpenLayers.Util.applyDefaults({"ExceptionReport":function(node,obj){obj.exceptionReport={version:node.getAttribute('version'),language:node.getAttribute('xml:lang'),exceptions:[]};this.readChildNodes(node,obj.exceptionReport);},"AllowedValues":function(node,parameter){parameter.allowedValues={};this.readChildNodes(node,parameter.allowedValues);},"AnyValue":function(node,parameter){parameter.anyValue=true;},"DataType":function(node,parameter){parameter.dataType=this.getChildValue(node);},"Range":function(node,allowedValues){allowedValues.range={};this.readChildNodes(node,allowedValues.range);},"MinimumValue":function(node,range){range.minValue=this.getChildValue(node);},"MaximumValue":function(node,range){range.maxValue=this.getChildValue(node);},"Identifier":function(node,obj){obj.identifier=this.getChildValue(node);},"SupportedCRS":function(node,obj){obj.supportedCRS=this.getChildValue(node);}},OpenLayers.Format.OWSCommon.v1.prototype.readers["ows"])},writers:{"ows":OpenLayers.Util.applyDefaults({"Range":function(range){var node=this.createElementNSPlus("ows:Range",{attributes:{'ows:rangeClosure':range.closure}});this.writeNode("ows:MinimumValue",range.minValue,node);this.writeNode("ows:MaximumValue",range.maxValue,node);return node;},"MinimumValue":function(minValue){var node=this.createElementNSPlus("ows:MinimumValue",{value:minValue});return node;},"MaximumValue":function(maxValue){var node=this.createElementNSPlus("ows:MaximumValue",{value:maxValue});return node;},"Value":function(value){var node=this.createElementNSPlus("ows:Value",{value:value});return node;}},OpenLayers.Format.OWSCommon.v1.prototype.writers["ows"])},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1_1_0"});OpenLayers.Format.WCSGetCoverage=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows/1.1",wcs:"http://www.opengis.net/wcs/1.1",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},VERSION:"1.1.2",schemaLocation:"http://www.opengis.net/wcs/1.1 http://schemas.opengis.net/wcs/1.1/wcsGetCoverage.xsd",write:function(options){var node=this.writeNode("wcs:GetCoverage",options);this.setAttributeNS(node,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[node]);},writers:{"wcs":{"GetCoverage":function(options){var node=this.createElementNSPlus("wcs:GetCoverage",{attributes:{version:options.version||this.VERSION,service:'WCS'}});this.writeNode("ows:Identifier",options.identifier,node);this.writeNode("wcs:DomainSubset",options.domainSubset,node);this.writeNode("wcs:Output",options.output,node);return node;},"DomainSubset":function(domainSubset){var node=this.createElementNSPlus("wcs:DomainSubset",{});this.writeNode("ows:BoundingBox",domainSubset.boundingBox,node);if(domainSubset.temporalSubset){this.writeNode("wcs:TemporalSubset",domainSubset.temporalSubset,node);}
+return node;},"TemporalSubset":function(temporalSubset){var node=this.createElementNSPlus("wcs:TemporalSubset",{});for(var i=0,len=temporalSubset.timePeriods.length;i<len;++i){this.writeNode("wcs:TimePeriod",temporalSubset.timePeriods[i],node);}
+return node;},"TimePeriod":function(timePeriod){var node=this.createElementNSPlus("wcs:TimePeriod",{});this.writeNode("wcs:BeginPosition",timePeriod.begin,node);this.writeNode("wcs:EndPosition",timePeriod.end,node);if(timePeriod.resolution){this.writeNode("wcs:TimeResolution",timePeriod.resolution,node);}
+return node;},"BeginPosition":function(begin){var node=this.createElementNSPlus("wcs:BeginPosition",{value:begin});return node;},"EndPosition":function(end){var node=this.createElementNSPlus("wcs:EndPosition",{value:end});return node;},"TimeResolution":function(resolution){var node=this.createElementNSPlus("wcs:TimeResolution",{value:resolution});return node;},"Output":function(output){var node=this.createElementNSPlus("wcs:Output",{attributes:{format:output.format,store:output.store}});if(output.gridCRS){this.writeNode("wcs:GridCRS",output.gridCRS,node);}
+return node;},"GridCRS":function(gridCRS){var node=this.createElementNSPlus("wcs:GridCRS",{});this.writeNode("wcs:GridBaseCRS",gridCRS.baseCRS,node);if(gridCRS.type){this.writeNode("wcs:GridType",gridCRS.type,node);}
+if(gridCRS.origin){this.writeNode("wcs:GridOrigin",gridCRS.origin,node);}
+this.writeNode("wcs:GridOffsets",gridCRS.offsets,node);if(gridCRS.CS){this.writeNode("wcs:GridCS",gridCRS.CS,node);}
+return node;},"GridBaseCRS":function(baseCRS){return this.createElementNSPlus("wcs:GridBaseCRS",{value:baseCRS});},"GridOrigin":function(origin){return this.createElementNSPlus("wcs:GridOrigin",{value:origin});},"GridType":function(type){return this.createElementNSPlus("wcs:GridType",{value:type});},"GridOffsets":function(offsets){return this.createElementNSPlus("wcs:GridOffsets",{value:offsets});},"GridCS":function(CS){return this.createElementNSPlus("wcs:GridCS",{value:CS});}},"ows":OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows},CLASS_NAME:"OpenLayers.Format.WCSGetCoverage"});OpenLayers.Format.WPSExecute=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows/1.1",gml:"http://www.opengis.net/gml",wps:"http://www.opengis.net/wps/1.0.0",wfs:"http://www.opengis.net/wfs",ogc:"http://www.opengis.net/ogc",wcs:"http://www.opengis.net/wcs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd",schemaLocationAttr:function(options){return undefined;},write:function(options){var doc;if(window.ActiveXObject){doc=new ActiveXObject("Microsoft.XMLDOM");this.xmldom=doc;}else{doc=document.implementation.createDocument("","",null);}
+var node=this.writeNode("wps:Execute",options,doc);this.setAttributeNS(node,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[node]);},writers:{"wps":{"Execute":function(options){var node=this.createElementNSPlus("wps:Execute",{attributes:{version:this.VERSION,service:'WPS'}});this.writeNode("ows:Identifier",options.identifier,node);this.writeNode("wps:DataInputs",options.dataInputs,node);this.writeNode("wps:ResponseForm",options.responseForm,node);return node;},"ResponseForm":function(responseForm){var node=this.createElementNSPlus("wps:ResponseForm",{});if(responseForm.rawDataOutput){this.writeNode("wps:RawDataOutput",responseForm.rawDataOutput,node);}
+if(responseForm.responseDocument){this.writeNode("wps:ResponseDocument",responseForm.responseDocument,node);}
+return node;},"ResponseDocument":function(responseDocument){var node=this.createElementNSPlus("wps:ResponseDocument",{attributes:{storeExecuteResponse:responseDocument.storeExecuteResponse,lineage:responseDocument.lineage,status:responseDocument.status}});if(responseDocument.output){this.writeNode("wps:Output",responseDocument.output,node);}
+return node;},"Output":function(output){var node=this.createElementNSPlus("wps:Output",{attributes:{asReference:output.asReference}});this.writeNode("ows:Identifier",output.identifier,node);this.writeNode("ows:Title",output.title,node);this.writeNode("ows:Abstract",output["abstract"],node);return node;},"RawDataOutput":function(rawDataOutput){var node=this.createElementNSPlus("wps:RawDataOutput",{attributes:{mimeType:rawDataOutput.mimeType}});this.writeNode("ows:Identifier",rawDataOutput.identifier,node);return node;},"DataInputs":function(dataInputs){var node=this.createElementNSPlus("wps:DataInputs",{});for(var i=0,ii=dataInputs.length;i<ii;++i){this.writeNode("wps:Input",dataInputs[i],node);}
+return node;},"Input":function(input){var node=this.createElementNSPlus("wps:Input",{});this.writeNode("ows:Identifier",input.identifier,node);if(input.title){this.writeNode("ows:Title",input.title,node);}
+if(input.data){this.writeNode("wps:Data",input.data,node);}
+if(input.reference){this.writeNode("wps:Reference",input.reference,node);}
+if(input.boundingBoxData){this.writeNode("wps:BoundingBoxData",input.boundingBoxData,node);}
+return node;},"Data":function(data){var node=this.createElementNSPlus("wps:Data",{});if(data.literalData){this.writeNode("wps:LiteralData",data.literalData,node);}else if(data.complexData){this.writeNode("wps:ComplexData",data.complexData,node);}
+return node;},"LiteralData":function(literalData){var node=this.createElementNSPlus("wps:LiteralData",{attributes:{uom:literalData.uom},value:literalData.value});return node;},"ComplexData":function(complexData){var node=this.createElementNSPlus("wps:ComplexData",{attributes:{mimeType:complexData.mimeType,encoding:complexData.encoding,schema:complexData.schema}});var data=complexData.value;if(typeof data==="string"){node.appendChild(this.getXMLDoc().createCDATASection(complexData.value));}else{node.appendChild(data);}
+return node;},"Reference":function(reference){var node=this.createElementNSPlus("wps:Reference",{attributes:{mimeType:reference.mimeType,"xlink:href":reference.href,method:reference.method,encoding:reference.encoding,schema:reference.schema}});if(reference.body){this.writeNode("wps:Body",reference.body,node);}
+return node;},"BoundingBoxData":function(node,obj){this.writers['ows']['BoundingBox'].apply(this,[node,obj,"wps:BoundingBoxData"]);},"Body":function(body){var node=this.createElementNSPlus("wps:Body",{});if(body.wcs){this.writeNode("wcs:GetCoverage",body.wcs,node);}
+else if(body.wfs){this.featureType=body.wfs.featureType;this.version=body.wfs.version;this.writeNode("wfs:GetFeature",body.wfs,node);}else{this.writeNode("wps:Execute",body,node);}
+return node;}},"wcs":OpenLayers.Format.WCSGetCoverage.prototype.writers.wcs,"wfs":OpenLayers.Format.WFST.v1_1_0.prototype.writers.wfs,"ogc":OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc,"ows":OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows},CLASS_NAME:"OpenLayers.Format.WPSExecute"});OpenLayers.Control.PanZoom=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,slideRatio:null,buttons:null,position:null,initialize:function(options){this.position=new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,OpenLayers.Control.PanZoom.Y);OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){if(this.map){this.map.events.unregister("buttonclick",this,this.onButtonClick);}
+this.removeButtons();this.buttons=null;this.position=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.register("buttonclick",this,this.onButtonClick);},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position;this.buttons=[];var sz={w:18,h:18};var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);this._addButton("panup","north-mini.png",centered,sz);px.y=centered.y+sz.h;this._addButton("panleft","west-mini.png",px,sz);this._addButton("panright","east-mini.png",px.add(sz.w,0),sz);this._addButton("pandown","south-mini.png",centered.add(0,sz.h*2),sz);this._addButton("zoomin","zoom-plus-mini.png",centered.add(0,sz.h*3+5),sz);this._addButton("zoomworld","zoom-world-mini.png",centered.add(0,sz.h*4+5),sz);this._addButton("zoomout","zoom-minus-mini.png",centered.add(0,sz.h*5+5),sz);return this.div;},_addButton:function(id,img,xy,sz){var imgLocation=OpenLayers.Util.getImageLocation(img);var btn=OpenLayers.Util.createAlphaImageDiv(this.id+"_"+id,xy,sz,imgLocation,"absolute");btn.style.cursor="pointer";this.div.appendChild(btn);btn.action=id;btn.className="olButton";this.buttons.push(btn);return btn;},_removeButton:function(btn){this.div.removeChild(btn);OpenLayers.Util.removeItem(this.buttons,btn);},removeButtons:function(){for(var i=this.buttons.length-1;i>=0;--i){this._removeButton(this.buttons[i]);}},onButtonClick:function(evt){var btn=evt.buttonElement;switch(btn.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;}},getSlideFactor:function(dim){return this.slideRatio?this.map.getSize()[dim]*this.slideRatio:this.slideFactor;},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Control.PanZoomBar=OpenLayers.Class(OpenLayers.Control.PanZoom,{zoomStopWidth:18,zoomStopHeight:11,slider:null,sliderEvents:null,zoombarDiv:null,zoomWorldIcon:false,panIcons:true,forceFixedZoomLevel:false,mouseDragStart:null,deltaY:null,zoomStart:null,destroy:function(){this._removeZoomBar();this.map.events.un({"changebaselayer":this.redraw,scope:this});OpenLayers.Control.PanZoom.prototype.destroy.apply(this,arguments);delete this.mouseDragStart;delete this.zoomStart;},setMap:function(map){OpenLayers.Control.PanZoom.prototype.setMap.apply(this,arguments);this.map.events.register("changebaselayer",this,this.redraw);},redraw:function(){if(this.div!=null){this.removeButtons();this._removeZoomBar();}
+this.draw();},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position.clone();this.buttons=[];var sz={w:18,h:18};if(this.panIcons){var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);var wposition=sz.w;if(this.zoomWorldIcon){centered=new OpenLayers.Pixel(px.x+sz.w,px.y);}
+this._addButton("panup","north-mini.png",centered,sz);px.y=centered.y+sz.h;this._addButton("panleft","west-mini.png",px,sz);if(this.zoomWorldIcon){this._addButton("zoomworld","zoom-world-mini.png",px.add(sz.w,0),sz);wposition*=2;}
+this._addButton("panright","east-mini.png",px.add(wposition,0),sz);this._addButton("pandown","south-mini.png",centered.add(0,sz.h*2),sz);this._addButton("zoomin","zoom-plus-mini.png",centered.add(0,sz.h*3+5),sz);centered=this._addZoomBar(centered.add(0,sz.h*4+5));this._addButton("zoomout","zoom-minus-mini.png",centered,sz);}
+else{this._addButton("zoomin","zoom-plus-mini.png",px,sz);centered=this._addZoomBar(px.add(0,sz.h));this._addButton("zoomout","zoom-minus-mini.png",centered,sz);if(this.zoomWorldIcon){centered=centered.add(0,sz.h+3);this._addButton("zoomworld","zoom-world-mini.png",centered,sz);}}
+return this.div;},_addZoomBar:function(centered){var imgLocation=OpenLayers.Util.getImageLocation("slider.png");var id=this.id+"_"+this.map.id;var zoomsToEnd=this.map.getNumZoomLevels()-1-this.map.getZoom();var slider=OpenLayers.Util.createAlphaImageDiv(id,centered.add(-1,zoomsToEnd*this.zoomStopHeight),{w:20,h:9},imgLocation,"absolute");slider.style.cursor="move";this.slider=slider;this.sliderEvents=new OpenLayers.Events(this,slider,null,true,{includeXY:true});this.sliderEvents.on({"touchstart":this.zoomBarDown,"touchmove":this.zoomBarDrag,"touchend":this.zoomBarUp,"mousedown":this.zoomBarDown,"mousemove":this.zoomBarDrag,"mouseup":this.zoomBarUp});var sz={w:this.zoomStopWidth,h:this.zoomStopHeight*this.map.getNumZoomLevels()};var imgLocation=OpenLayers.Util.getImageLocation("zoombar.png");var div=null;if(OpenLayers.Util.alphaHack()){var id=this.id+"_"+this.map.id;div=OpenLayers.Util.createAlphaImageDiv(id,centered,{w:sz.w,h:this.zoomStopHeight},imgLocation,"absolute",null,"crop");div.style.height=sz.h+"px";}else{div=OpenLayers.Util.createDiv('OpenLayers_Control_PanZoomBar_Zoombar'+this.map.id,centered,sz,imgLocation);}
+div.style.cursor="pointer";div.className="olButton";this.zoombarDiv=div;this.div.appendChild(div);this.startTop=parseInt(div.style.top);this.div.appendChild(slider);this.map.events.register("zoomend",this,this.moveZoomBar);centered=centered.add(0,this.zoomStopHeight*this.map.getNumZoomLevels());return centered;},_removeZoomBar:function(){this.sliderEvents.un({"touchstart":this.zoomBarDown,"touchmove":this.zoomBarDrag,"touchend":this.zoomBarUp,"mousedown":this.zoomBarDown,"mousemove":this.zoomBarDrag,"mouseup":this.zoomBarUp});this.sliderEvents.destroy();this.div.removeChild(this.zoombarDiv);this.zoombarDiv=null;this.div.removeChild(this.slider);this.slider=null;this.map.events.unregister("zoomend",this,this.moveZoomBar);},onButtonClick:function(evt){OpenLayers.Control.PanZoom.prototype.onButtonClick.apply(this,arguments);if(evt.buttonElement===this.zoombarDiv){var levels=evt.buttonXY.y/this.zoomStopHeight;if(this.forceFixedZoomLevel||!this.map.fractionalZoom){levels=Math.floor(levels);}
+var zoom=(this.map.getNumZoomLevels()-1)-levels;zoom=Math.min(Math.max(zoom,0),this.map.getNumZoomLevels()-1);this.map.zoomTo(zoom);}},passEventToSlider:function(evt){this.sliderEvents.handleBrowserEvent(evt);},zoomBarDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)&&!OpenLayers.Event.isSingleTouch(evt)){return;}
+this.map.events.on({"touchmove":this.passEventToSlider,"mousemove":this.passEventToSlider,"mouseup":this.passEventToSlider,scope:this});this.mouseDragStart=evt.xy.clone();this.zoomStart=evt.xy.clone();this.div.style.cursor="move";this.zoombarDiv.offsets=null;OpenLayers.Event.stop(evt);},zoomBarDrag:function(evt){if(this.mouseDragStart!=null){var deltaY=this.mouseDragStart.y-evt.xy.y;var offsets=OpenLayers.Util.pagePosition(this.zoombarDiv);if((evt.clientY-offsets[1])>0&&(evt.clientY-offsets[1])<parseInt(this.zoombarDiv.style.height)-2){var newTop=parseInt(this.slider.style.top)-deltaY;this.slider.style.top=newTop+"px";this.mouseDragStart=evt.xy.clone();}
+this.deltaY=this.zoomStart.y-evt.xy.y;OpenLayers.Event.stop(evt);}},zoomBarUp:function(evt){if(!OpenLayers.Event.isLeftClick(evt)&&evt.type!=="touchend"){return;}
+if(this.mouseDragStart){this.div.style.cursor="";this.map.events.un({"touchmove":this.passEventToSlider,"mouseup":this.passEventToSlider,"mousemove":this.passEventToSlider,scope:this});var zoomLevel=this.map.zoom;if(!this.forceFixedZoomLevel&&this.map.fractionalZoom){zoomLevel+=this.deltaY/this.zoomStopHeight;zoomLevel=Math.min(Math.max(zoomLevel,0),this.map.getNumZoomLevels()-1);}else{zoomLevel+=this.deltaY/this.zoomStopHeight;zoomLevel=Math.max(Math.round(zoomLevel),0);}
+this.map.zoomTo(zoomLevel);this.mouseDragStart=null;this.zoomStart=null;this.deltaY=0;OpenLayers.Event.stop(evt);}},moveZoomBar:function(){var newTop=((this.map.getNumZoomLevels()-1)-this.map.getZoom())*this.zoomStopHeight+this.startTop+1;this.slider.style.top=newTop+"px";},CLASS_NAME:"OpenLayers.Control.PanZoomBar"});OpenLayers.Format.WFSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",errorProperty:"service",CLASS_NAME:"OpenLayers.Format.WFSCapabilities"});OpenLayers.Format.WFSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{wfs:"http://www.opengis.net/wfs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",ows:"http://www.opengis.net/ows"},defaultPrefix:"wfs",read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var raw=data;if(data&&data.nodeType==9){data=data.documentElement;}
+var capabilities={};this.readNode(data,capabilities);return capabilities;},readers:{"wfs":{"WFS_Capabilities":function(node,obj){this.readChildNodes(node,obj);},"FeatureTypeList":function(node,request){request.featureTypeList={featureTypes:[]};this.readChildNodes(node,request.featureTypeList);},"FeatureType":function(node,featureTypeList){var featureType={};this.readChildNodes(node,featureType);featureTypeList.featureTypes.push(featureType);},"Name":function(node,obj){var name=this.getChildValue(node);if(name){var parts=name.split(":");obj.name=parts.pop();if(parts.length>0){obj.featureNS=this.lookupNamespaceURI(node,parts[0]);}}},"Title":function(node,obj){var title=this.getChildValue(node);if(title){obj.title=title;}},"Abstract":function(node,obj){var abst=this.getChildValue(node);if(abst){obj["abstract"]=abst;}}}},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1"});OpenLayers.Format.WFSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WFSCapabilities.v1,{regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},readers:{"wfs":OpenLayers.Util.applyDefaults({"DefaultSRS":function(node,obj){var defaultSRS=this.getChildValue(node);if(defaultSRS){obj.srs=defaultSRS;}}},OpenLayers.Format.WFSCapabilities.v1.prototype.readers["wfs"]),"ows":OpenLayers.Format.OWSCommon.v1.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1_1_0"});OpenLayers.Layer.Image=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:true,url:null,extent:null,size:null,tile:null,aspectRatio:null,initialize:function(name,url,extent,size,options){this.url=url;this.extent=extent;this.maxExtent=extent;this.size=size;OpenLayers.Layer.prototype.initialize.apply(this,[name,options]);this.aspectRatio=(this.extent.getHeight()/this.size.h)/(this.extent.getWidth()/this.size.w);},destroy:function(){if(this.tile){this.removeTileMonitoringHooks(this.tile);this.tile.destroy();this.tile=null;}
+OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Image(this.name,this.url,this.extent,this.size,this.getOptions());}
+obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);return obj;},setMap:function(map){if(this.options.maxResolution==null){this.options.maxResolution=this.aspectRatio*this.extent.getWidth()/this.size.w;}
+OpenLayers.Layer.prototype.setMap.apply(this,arguments);},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var firstRendering=(this.tile==null);if(zoomChanged||firstRendering){this.setTileSize();var ulPx=this.map.getLayerPxFromLonLat({lon:this.extent.left,lat:this.extent.top});if(firstRendering){this.tile=new OpenLayers.Tile.Image(this,ulPx,this.extent,null,this.tileSize);this.addTileMonitoringHooks(this.tile);}else{this.tile.size=this.tileSize.clone();this.tile.position=ulPx.clone();}
+this.tile.draw();}},setTileSize:function(){var tileWidth=this.extent.getWidth()/this.map.getResolution();var tileHeight=this.extent.getHeight()/this.map.getResolution();this.tileSize=new OpenLayers.Size(tileWidth,tileHeight);},addTileMonitoringHooks:function(tile){tile.onLoadStart=function(){this.events.triggerEvent("loadstart");};tile.events.register("loadstart",this,tile.onLoadStart);tile.onLoadEnd=function(){this.events.triggerEvent("loadend");};tile.events.register("loadend",this,tile.onLoadEnd);tile.events.register("unload",this,tile.onLoadEnd);},removeTileMonitoringHooks:function(tile){tile.unload();tile.events.un({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,scope:this});},setUrl:function(newUrl){this.url=newUrl;this.tile.draw();},getURL:function(bounds){return this.url;},CLASS_NAME:"OpenLayers.Layer.Image"});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:true,autoDestroy:true,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;this.active=false;},destroy:function(){this.deactivate();this.layer=null;this.options=null;},setLayer:function(layer){this.layer=layer;},activate:function(){if(!this.active){this.active=true;return true;}
+return false;},deactivate:function(){if(this.active){this.active=false;return true;}
+return false;},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Save=OpenLayers.Class(OpenLayers.Strategy,{events:null,auto:false,timer:null,initialize:function(options){OpenLayers.Strategy.prototype.initialize.apply(this,[options]);this.events=new OpenLayers.Events(this);},activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){if(this.auto){if(typeof this.auto==="number"){this.timer=window.setInterval(OpenLayers.Function.bind(this.save,this),this.auto*1000);}else{this.layer.events.on({"featureadded":this.triggerSave,"afterfeaturemodified":this.triggerSave,scope:this});}}}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){if(this.auto){if(typeof this.auto==="number"){window.clearInterval(this.timer);}else{this.layer.events.un({"featureadded":this.triggerSave,"afterfeaturemodified":this.triggerSave,scope:this});}}}
+return deactivated;},triggerSave:function(event){var feature=event.feature;if(feature.state===OpenLayers.State.INSERT||feature.state===OpenLayers.State.UPDATE||feature.state===OpenLayers.State.DELETE){this.save([event.feature]);}},save:function(features){if(!features){features=this.layer.features;}
+this.events.triggerEvent("start",{features:features});var remote=this.layer.projection;var local=this.layer.map.getProjectionObject();if(!local.equals(remote)){var len=features.length;var clones=new Array(len);var orig,clone;for(var i=0;i<len;++i){orig=features[i];clone=orig.clone();clone.fid=orig.fid;clone.state=orig.state;if(orig.url){clone.url=orig.url;}
+clone._original=orig;clone.geometry.transform(local,remote);clones[i]=clone;}
+features=clones;}
+this.layer.protocol.commit(features,{callback:this.onCommit,scope:this});},onCommit:function(response){var evt={"response":response};if(response.success()){var features=response.reqFeatures;var state,feature;var destroys=[];var insertIds=response.insertIds||[];var j=0;for(var i=0,len=features.length;i<len;++i){feature=features[i];feature=feature._original||feature;state=feature.state;if(state){if(state==OpenLayers.State.DELETE){destroys.push(feature);}else if(state==OpenLayers.State.INSERT){feature.fid=insertIds[j];++j;}
+feature.state=null;}}
+if(destroys.length>0){this.layer.destroyFeatures(destroys);}
+this.events.triggerEvent("success",evt);}else{this.events.triggerEvent("fail",evt);}},CLASS_NAME:"OpenLayers.Strategy.Save"});OpenLayers.Format.GPX=OpenLayers.Class(OpenLayers.Format.XML,{defaultDesc:"No description available",extractWaypoints:true,extractTracks:true,extractRoutes:true,extractAttributes:true,namespaces:{gpx:"http://www.topografix.com/GPX/1/1",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd",creator:"OpenLayers",initialize:function(options){this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(doc){if(typeof doc=="string"){doc=OpenLayers.Format.XML.prototype.read.apply(this,[doc]);}
+var features=[];if(this.extractTracks){var tracks=doc.getElementsByTagName("trk");for(var i=0,len=tracks.length;i<len;i++){var attrs={};if(this.extractAttributes){attrs=this.parseAttributes(tracks[i]);}
+var segs=this.getElementsByTagNameNS(tracks[i],tracks[i].namespaceURI,"trkseg");for(var j=0,seglen=segs.length;j<seglen;j++){var track=this.extractSegment(segs[j],"trkpt");features.push(new OpenLayers.Feature.Vector(track,attrs));}}}
+if(this.extractRoutes){var routes=doc.getElementsByTagName("rte");for(var k=0,klen=routes.length;k<klen;k++){var attrs={};if(this.extractAttributes){attrs=this.parseAttributes(routes[k]);}
+var route=this.extractSegment(routes[k],"rtept");features.push(new OpenLayers.Feature.Vector(route,attrs));}}
+if(this.extractWaypoints){var waypoints=doc.getElementsByTagName("wpt");for(var l=0,len=waypoints.length;l<len;l++){var attrs={};if(this.extractAttributes){attrs=this.parseAttributes(waypoints[l]);}
+var wpt=new OpenLayers.Geometry.Point(waypoints[l].getAttribute("lon"),waypoints[l].getAttribute("lat"));features.push(new OpenLayers.Feature.Vector(wpt,attrs));}}
+if(this.internalProjection&&this.externalProjection){for(var g=0,featLength=features.length;g<featLength;g++){features[g].geometry.transform(this.externalProjection,this.internalProjection);}}
+return features;},extractSegment:function(segment,segmentType){var points=this.getElementsByTagNameNS(segment,segment.namespaceURI,segmentType);var point_features=[];for(var i=0,len=points.length;i<len;i++){point_features.push(new OpenLayers.Geometry.Point(points[i].getAttribute("lon"),points[i].getAttribute("lat")));}
+return new OpenLayers.Geometry.LineString(point_features);},parseAttributes:function(node){var attributes={};var attrNode=node.firstChild,value,name;while(attrNode){if(attrNode.nodeType==1&&attrNode.firstChild){value=attrNode.firstChild;if(value.nodeType==3||value.nodeType==4){name=(attrNode.prefix)?attrNode.nodeName.split(":")[1]:attrNode.nodeName;if(name!="trkseg"&&name!="rtept"){attributes[name]=value.nodeValue;}}}
+attrNode=attrNode.nextSibling;}
+return attributes;},write:function(features,metadata){features=OpenLayers.Util.isArray(features)?features:[features];var gpx=this.createElementNS(this.namespaces.gpx,"gpx");gpx.setAttribute("version","1.1");gpx.setAttribute("creator",this.creator);this.setAttributes(gpx,{"xsi:schemaLocation":this.schemaLocation});if(metadata&&typeof metadata=='object'){gpx.appendChild(this.buildMetadataNode(metadata));}
+for(var i=0,len=features.length;i<len;i++){gpx.appendChild(this.buildFeatureNode(features[i]));}
+return OpenLayers.Format.XML.prototype.write.apply(this,[gpx]);},buildMetadataNode:function(metadata){var types=['name','desc','author'],node=this.createElementNSPlus('gpx:metadata');for(var i=0;i<types.length;i++){var type=types[i];if(metadata[type]){var n=this.createElementNSPlus("gpx:"+type);n.appendChild(this.createTextNode(metadata[type]));node.appendChild(n);}}
+return node;},buildFeatureNode:function(feature){var geometry=feature.geometry;geometry=geometry.clone();if(this.internalProjection&&this.externalProjection){geometry.transform(this.internalProjection,this.externalProjection);}
+if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){var wpt=this.buildWptNode(feature);return wpt;}else{var trkNode=this.createElementNSPlus("gpx:trk");this.appendAttributesNode(trkNode,feature);var trkSegNodes=this.buildTrkSegNode(geometry);trkSegNodes=OpenLayers.Util.isArray(trkSegNodes)?trkSegNodes:[trkSegNodes];for(var i=0,len=trkSegNodes.length;i<len;i++){trkNode.appendChild(trkSegNodes[i]);}
+return trkNode;}},buildTrkSegNode:function(geometry){var node,i,len,point,nodes;if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"||geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){node=this.createElementNSPlus("gpx:trkseg");for(i=0,len=geometry.components.length;i<len;i++){point=geometry.components[i];node.appendChild(this.buildTrkPtNode(point));}
+return node;}else{nodes=[];for(i=0,len=geometry.components.length;i<len;i++){nodes.push(this.buildTrkSegNode(geometry.components[i]));}
+return nodes;}},buildTrkPtNode:function(point){var node=this.createElementNSPlus("gpx:trkpt");node.setAttribute("lon",point.x);node.setAttribute("lat",point.y);return node;},buildWptNode:function(feature){var node=this.createElementNSPlus("gpx:wpt");node.setAttribute("lon",feature.geometry.x);node.setAttribute("lat",feature.geometry.y);this.appendAttributesNode(node,feature);return node;},appendAttributesNode:function(node,feature){var name=this.createElementNSPlus('gpx:name');name.appendChild(this.createTextNode(feature.attributes.name||feature.id));node.appendChild(name);var desc=this.createElementNSPlus('gpx:desc');desc.appendChild(this.createTextNode(feature.attributes.description||this.defaultDesc));node.appendChild(desc);},CLASS_NAME:"OpenLayers.Format.GPX"});OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:false,updateWithPOST:false,deleteWithPOST:false,wildcarded:false,srsInBBOX:false,initialize:function(options){options=options||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var format=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams=function(filter,params){return format.write(filter,params);};}},destroy:function(){this.params=null;this.headers=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){OpenLayers.Protocol.prototype.read.apply(this,arguments);options=options||{};options.params=OpenLayers.Util.applyDefaults(options.params,this.options.params);options=OpenLayers.Util.applyDefaults(options,this.options);if(options.filter&&this.filterToParams){options.params=this.filterToParams(options.filter,options.params);}
+var readWithPOST=(options.readWithPOST!==undefined)?options.readWithPOST:this.readWithPOST;var resp=new OpenLayers.Protocol.Response({requestType:"read"});if(readWithPOST){var headers=options.headers||{};headers["Content-Type"]="application/x-www-form-urlencoded";resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,resp,options),data:OpenLayers.Util.getParameterString(options.params),headers:headers});}else{resp.priv=OpenLayers.Request.GET({url:options.url,callback:this.createCallback(this.handleRead,resp,options),params:options.params,headers:options.headers});}
+return resp;},handleRead:function(resp,options){this.handleResponse(resp,options);},create:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:features,requestType:"create"});resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleCreate,resp,options),headers:options.headers,data:this.format.write(features)});return resp;},handleCreate:function(resp,options){this.handleResponse(resp,options);},update:function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"update"});var method=this.updateWithPOST?"POST":"PUT";resp.priv=OpenLayers.Request[method]({url:url,callback:this.createCallback(this.handleUpdate,resp,options),headers:options.headers,data:this.format.write(feature)});return resp;},handleUpdate:function(resp,options){this.handleResponse(resp,options);},"delete":function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"delete"});var method=this.deleteWithPOST?"POST":"DELETE";var requestOptions={url:url,callback:this.createCallback(this.handleDelete,resp,options),headers:options.headers};if(this.deleteWithPOST){requestOptions.data=this.format.write(feature);}
+resp.priv=OpenLayers.Request[method](requestOptions);return resp;},handleDelete:function(resp,options){this.handleResponse(resp,options);},handleResponse:function(resp,options){var request=resp.priv;if(options.callback){if(request.status>=200&&request.status<300){if(resp.requestType!="delete"){resp.features=this.parseFeatures(request);}
+resp.code=OpenLayers.Protocol.Response.SUCCESS;}else{resp.code=OpenLayers.Protocol.Response.FAILURE;}
+options.callback.call(options.scope,resp);}},parseFeatures:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
+if(!doc||doc.length<=0){return null;}
+return this.format.read(doc);},commit:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=[],nResponses=0;var types={};types[OpenLayers.State.INSERT]=[];types[OpenLayers.State.UPDATE]=[];types[OpenLayers.State.DELETE]=[];var feature,list,requestFeatures=[];for(var i=0,len=features.length;i<len;++i){feature=features[i];list=types[feature.state];if(list){list.push(feature);requestFeatures.push(feature);}}
+var nRequests=(types[OpenLayers.State.INSERT].length>0?1:0)+
+types[OpenLayers.State.UPDATE].length+
+types[OpenLayers.State.DELETE].length;var success=true;var finalResponse=new OpenLayers.Protocol.Response({reqFeatures:requestFeatures});function insertCallback(response){var len=response.features?response.features.length:0;var fids=new Array(len);for(var i=0;i<len;++i){fids[i]=response.features[i].fid;}
+finalResponse.insertIds=fids;callback.apply(this,[response]);}
+function callback(response){this.callUserCallback(response,options);success=success&&response.success();nResponses++;if(nResponses>=nRequests){if(options.callback){finalResponse.code=success?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE;options.callback.apply(options.scope,[finalResponse]);}}}
+var queue=types[OpenLayers.State.INSERT];if(queue.length>0){resp.push(this.create(queue,OpenLayers.Util.applyDefaults({callback:insertCallback,scope:this},options.create)));}
+queue=types[OpenLayers.State.UPDATE];for(var i=queue.length-1;i>=0;--i){resp.push(this.update(queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options.update)));}
+queue=types[OpenLayers.State.DELETE];for(var i=queue.length-1;i>=0;--i){resp.push(this["delete"](queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options["delete"])));}
+return resp;},abort:function(response){if(response){response.priv.abort();}},callUserCallback:function(resp,options){var opt=options[resp.requestType];if(opt&&opt.callback){opt.callback.call(opt.scope,resp);}},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Format.WMSDescribeLayer=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.1",getVersion:function(root,options){var version=OpenLayers.Format.XML.VersionedOGC.prototype.getVersion.apply(this,arguments);if(version=="1.1.1"||version=="1.1.0"){version="1.1";}
+return version;},CLASS_NAME:"OpenLayers.Format.WMSDescribeLayer"});OpenLayers.Format.WMSDescribeLayer.v1_1=OpenLayers.Class(OpenLayers.Format.WMSDescribeLayer,{initialize:function(options){OpenLayers.Format.WMSDescribeLayer.prototype.initialize.apply(this,[options]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var root=data.documentElement;var children=root.childNodes;var describelayer=[];var childNode,nodeName;for(var i=0;i<children.length;++i){childNode=children[i];nodeName=childNode.nodeName;if(nodeName=='LayerDescription'){var layerName=childNode.getAttribute('name');var owsType='';var owsURL='';var typeName='';if(childNode.getAttribute('owsType')){owsType=childNode.getAttribute('owsType');owsURL=childNode.getAttribute('owsURL');}else{if(childNode.getAttribute('wfs')!=''){owsType='WFS';owsURL=childNode.getAttribute('wfs');}else if(childNode.getAttribute('wcs')!=''){owsType='WCS';owsURL=childNode.getAttribute('wcs');}}
+var query=childNode.getElementsByTagName('Query');if(query.length>0){typeName=query[0].getAttribute('typeName');if(!typeName){typeName=query[0].getAttribute('typename');}}
+describelayer.push({layerName:layerName,owsType:owsType,owsURL:owsURL,typeName:typeName});}else if(nodeName=='ServiceException'){var parser=new OpenLayers.Format.OGCExceptionReport();return{error:parser.read(data)};}}
+return describelayer;},CLASS_NAME:"OpenLayers.Format.WMSDescribeLayer.v1_1"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:false,evt:null,initialize:function(control,callbacks,options){OpenLayers.Util.extend(this,options);this.control=control;this.callbacks=callbacks;var map=this.map||control.map;if(map){this.setMap(map);}
+this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},setMap:function(map){this.map=map;},checkModifiers:function(evt){if(this.keyMask==null){return true;}
+var keyModifiers=(evt.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(evt.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(evt.altKey?OpenLayers.Handler.MOD_ALT:0);return(keyModifiers==this.keyMask);},activate:function(){if(this.active){return false;}
+var events=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var i=0,len=events.length;i<len;i++){if(this[events[i]]){this.register(events[i],this[events[i]]);}}
+this.active=true;return true;},deactivate:function(){if(!this.active){return false;}
+var events=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var i=0,len=events.length;i<len;i++){if(this[events[i]]){this.unregister(events[i],this[events[i]]);}}
+this.active=false;return true;},callback:function(name,args){if(name&&this.callbacks[name]){this.callbacks[name].apply(this.control,args);}},register:function(name,method){this.map.events.registerPriority(name,this,method);this.map.events.registerPriority(name,this,this.setEvent);},unregister:function(name,method){this.map.events.unregister(name,this,method);this.map.events.unregister(name,this,this.setEvent);},setEvent:function(evt){this.evt=evt;return true;},destroy:function(){this.deactivate();this.control=this.map=null;},CLASS_NAME:"OpenLayers.Handler"});OpenLayers.Handler.MOD_NONE=0;OpenLayers.Handler.MOD_SHIFT=1;OpenLayers.Handler.MOD_CTRL=2;OpenLayers.Handler.MOD_ALT=4;OpenLayers.Handler.Point=OpenLayers.Class(OpenLayers.Handler,{point:null,layer:null,multi:false,citeCompliant:false,mouseDown:false,stoppedDown:null,lastDown:null,lastUp:null,persist:false,stopDown:false,stopUp:false,layerOptions:null,pixelTolerance:5,touch:false,lastTouchPx:null,initialize:function(control,callbacks,options){if(!(options&&options.layerOptions&&options.layerOptions.styleMap)){this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'],{});}
+OpenLayers.Handler.prototype.initialize.apply(this,arguments);},activate:function(){if(!OpenLayers.Handler.prototype.activate.apply(this,arguments)){return false;}
+var options=OpenLayers.Util.extend({displayInLayerSwitcher:false,calculateInRange:OpenLayers.Function.True,wrapDateLine:this.citeCompliant},this.layerOptions);this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,options);this.map.addLayer(this.layer);return true;},createFeature:function(pixel){var lonlat=this.layer.getLonLatFromViewPortPx(pixel);var geometry=new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat);this.point=new OpenLayers.Feature.Vector(geometry);this.callback("create",[this.point.geometry,this.point]);this.point.geometry.clearBounds();this.layer.addFeatures([this.point],{silent:true});},deactivate:function(){if(!OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){return false;}
+this.cancel();if(this.layer.map!=null){this.destroyFeature(true);this.layer.destroy(false);}
+this.layer=null;this.touch=false;return true;},destroyFeature:function(force){if(this.layer&&(force||!this.persist)){this.layer.destroyFeatures();}
+this.point=null;},destroyPersistedFeature:function(){var layer=this.layer;if(layer&&layer.features.length>1){this.layer.features[0].destroy();}},finalize:function(cancel){var key=cancel?"cancel":"done";this.mouseDown=false;this.lastDown=null;this.lastUp=null;this.lastTouchPx=null;this.callback(key,[this.geometryClone()]);this.destroyFeature(cancel);},cancel:function(){this.finalize(true);},click:function(evt){OpenLayers.Event.stop(evt);return false;},dblclick:function(evt){OpenLayers.Event.stop(evt);return false;},modifyFeature:function(pixel){if(!this.point){this.createFeature(pixel);}
+var lonlat=this.layer.getLonLatFromViewPortPx(pixel);this.point.geometry.x=lonlat.lon;this.point.geometry.y=lonlat.lat;this.callback("modify",[this.point.geometry,this.point,false]);this.point.geometry.clearBounds();this.drawFeature();},drawFeature:function(){this.layer.drawFeature(this.point,this.style);},getGeometry:function(){var geometry=this.point&&this.point.geometry;if(geometry&&this.multi){geometry=new OpenLayers.Geometry.MultiPoint([geometry]);}
+return geometry;},geometryClone:function(){var geom=this.getGeometry();return geom&&geom.clone();},mousedown:function(evt){return this.down(evt);},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,dblclick:this.dblclick,scope:this});}
+this.lastTouchPx=evt.xy;return this.down(evt);},mousemove:function(evt){return this.move(evt);},touchmove:function(evt){this.lastTouchPx=evt.xy;return this.move(evt);},mouseup:function(evt){return this.up(evt);},touchend:function(evt){evt.xy=this.lastTouchPx;return this.up(evt);},down:function(evt){this.mouseDown=true;this.lastDown=evt.xy;if(!this.touch){this.modifyFeature(evt.xy);}
+this.stoppedDown=this.stopDown;return!this.stopDown;},move:function(evt){if(!this.touch&&(!this.mouseDown||this.stoppedDown)){this.modifyFeature(evt.xy);}
+return true;},up:function(evt){this.mouseDown=false;this.stoppedDown=this.stopDown;if(!this.checkModifiers(evt)){return true;}
+if(this.lastUp&&this.lastUp.equals(evt.xy)){return true;}
+if(this.lastDown&&this.passesTolerance(this.lastDown,evt.xy,this.pixelTolerance)){if(this.touch){this.modifyFeature(evt.xy);}
+if(this.persist){this.destroyPersistedFeature();}
+this.lastUp=evt.xy;this.finalize();return!this.stopUp;}else{return true;}},mouseout:function(evt){if(OpenLayers.Util.mouseLeft(evt,this.map.viewPortDiv)){this.stoppedDown=this.stopDown;this.mouseDown=false;}},passesTolerance:function(pixel1,pixel2,tolerance){var passes=true;if(tolerance!=null&&pixel1&&pixel2){var dist=pixel1.distanceTo(pixel2);if(dist>tolerance){passes=false;}}
+return passes;},CLASS_NAME:"OpenLayers.Handler.Point"});OpenLayers.Handler.Path=OpenLayers.Class(OpenLayers.Handler.Point,{line:null,maxVertices:null,doubleTouchTolerance:20,freehand:false,freehandToggle:'shiftKey',timerId:null,redoStack:null,createFeature:function(pixel){var lonlat=this.layer.getLonLatFromViewPortPx(pixel);var geometry=new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat);this.point=new OpenLayers.Feature.Vector(geometry);this.line=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([this.point.geometry]));this.callback("create",[this.point.geometry,this.getSketch()]);this.point.geometry.clearBounds();this.layer.addFeatures([this.line,this.point],{silent:true});},destroyFeature:function(force){OpenLayers.Handler.Point.prototype.destroyFeature.call(this,force);this.line=null;},destroyPersistedFeature:function(){var layer=this.layer;if(layer&&layer.features.length>2){this.layer.features[0].destroy();}},removePoint:function(){if(this.point){this.layer.removeFeatures([this.point]);}},addPoint:function(pixel){this.layer.removeFeatures([this.point]);var lonlat=this.layer.getLonLatFromViewPortPx(pixel);this.point=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat));this.line.geometry.addComponent(this.point.geometry,this.line.geometry.components.length);this.layer.addFeatures([this.point]);this.callback("point",[this.point.geometry,this.getGeometry()]);this.callback("modify",[this.point.geometry,this.getSketch()]);this.drawFeature();delete this.redoStack;},insertXY:function(x,y){this.line.geometry.addComponent(new OpenLayers.Geometry.Point(x,y),this.getCurrentPointIndex());this.drawFeature();delete this.redoStack;},insertDeltaXY:function(dx,dy){var previousIndex=this.getCurrentPointIndex()-1;var p0=this.line.geometry.components[previousIndex];if(p0&&!isNaN(p0.x)&&!isNaN(p0.y)){this.insertXY(p0.x+dx,p0.y+dy);}},insertDirectionLength:function(direction,length){direction*=Math.PI/180;var dx=length*Math.cos(direction);var dy=length*Math.sin(direction);this.insertDeltaXY(dx,dy);},insertDeflectionLength:function(deflection,length){var previousIndex=this.getCurrentPointIndex()-1;if(previousIndex>0){var p1=this.line.geometry.components[previousIndex];var p0=this.line.geometry.components[previousIndex-1];var theta=Math.atan2(p1.y-p0.y,p1.x-p0.x);this.insertDirectionLength((theta*180/Math.PI)+deflection,length);}},getCurrentPointIndex:function(){return this.line.geometry.components.length-1;},undo:function(){var geometry=this.line.geometry;var components=geometry.components;var index=this.getCurrentPointIndex()-1;var target=components[index];var undone=geometry.removeComponent(target);if(undone){if(!this.redoStack){this.redoStack=[];}
+this.redoStack.push(target);this.drawFeature();}
+return undone;},redo:function(){var target=this.redoStack&&this.redoStack.pop();if(target){this.line.geometry.addComponent(target,this.getCurrentPointIndex());this.drawFeature();}
+return!!target;},freehandMode:function(evt){return(this.freehandToggle&&evt[this.freehandToggle])?!this.freehand:this.freehand;},modifyFeature:function(pixel,drawing){if(!this.line){this.createFeature(pixel);}
+var lonlat=this.layer.getLonLatFromViewPortPx(pixel);this.point.geometry.x=lonlat.lon;this.point.geometry.y=lonlat.lat;this.callback("modify",[this.point.geometry,this.getSketch(),drawing]);this.point.geometry.clearBounds();this.drawFeature();},drawFeature:function(){this.layer.drawFeature(this.line,this.style);this.layer.drawFeature(this.point,this.style);},getSketch:function(){return this.line;},getGeometry:function(){var geometry=this.line&&this.line.geometry;if(geometry&&this.multi){geometry=new OpenLayers.Geometry.MultiLineString([geometry]);}
+return geometry;},touchstart:function(evt){if(this.timerId&&this.passesTolerance(this.lastTouchPx,evt.xy,this.doubleTouchTolerance)){this.finishGeometry();window.clearTimeout(this.timerId);this.timerId=null;return false;}else{if(this.timerId){window.clearTimeout(this.timerId);this.timerId=null;}
+this.timerId=window.setTimeout(OpenLayers.Function.bind(function(){this.timerId=null;},this),300);return OpenLayers.Handler.Point.prototype.touchstart.call(this,evt);}},down:function(evt){var stopDown=this.stopDown;if(this.freehandMode(evt)){stopDown=true;if(this.touch){this.modifyFeature(evt.xy,!!this.lastUp);OpenLayers.Event.stop(evt);}}
+if(!this.touch&&(!this.lastDown||!this.passesTolerance(this.lastDown,evt.xy,this.pixelTolerance))){this.modifyFeature(evt.xy,!!this.lastUp);}
+this.mouseDown=true;this.lastDown=evt.xy;this.stoppedDown=stopDown;return!stopDown;},move:function(evt){if(this.stoppedDown&&this.freehandMode(evt)){if(this.persist){this.destroyPersistedFeature();}
+if(this.maxVertices&&this.line&&this.line.geometry.components.length===this.maxVertices){this.removePoint();this.finalize();}else{this.addPoint(evt.xy);}
+return false;}
+if(!this.touch&&(!this.mouseDown||this.stoppedDown)){this.modifyFeature(evt.xy,!!this.lastUp);}
+return true;},up:function(evt){if(this.mouseDown&&(!this.lastUp||!this.lastUp.equals(evt.xy))){if(this.stoppedDown&&this.freehandMode(evt)){if(this.persist){this.destroyPersistedFeature();}
+this.removePoint();this.finalize();}else{if(this.passesTolerance(this.lastDown,evt.xy,this.pixelTolerance)){if(this.touch){this.modifyFeature(evt.xy);}
+if(this.lastUp==null&&this.persist){this.destroyPersistedFeature();}
+this.addPoint(evt.xy);this.lastUp=evt.xy;if(this.line.geometry.components.length===this.maxVertices+1){this.finishGeometry();}}}}
+this.stoppedDown=this.stopDown;this.mouseDown=false;return!this.stopUp;},finishGeometry:function(){var index=this.line.geometry.components.length-1;this.line.geometry.removeComponent(this.line.geometry.components[index]);this.removePoint();this.finalize();},dblclick:function(evt){if(!this.freehandMode(evt)){this.finishGeometry();}
+return false;},CLASS_NAME:"OpenLayers.Handler.Path"});OpenLayers.Handler.Polygon=OpenLayers.Class(OpenLayers.Handler.Path,{holeModifier:null,drawingHole:false,polygon:null,createFeature:function(pixel){var lonlat=this.layer.getLonLatFromViewPortPx(pixel);var geometry=new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat);this.point=new OpenLayers.Feature.Vector(geometry);this.line=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LinearRing([this.point.geometry]));this.polygon=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon([this.line.geometry]));this.callback("create",[this.point.geometry,this.getSketch()]);this.point.geometry.clearBounds();this.layer.addFeatures([this.polygon,this.point],{silent:true});},addPoint:function(pixel){if(!this.drawingHole&&this.holeModifier&&this.evt&&this.evt[this.holeModifier]){var geometry=this.point.geometry;var features=this.control.layer.features;var candidate,polygon;for(var i=features.length-1;i>=0;--i){candidate=features[i].geometry;if((candidate instanceof OpenLayers.Geometry.Polygon||candidate instanceof OpenLayers.Geometry.MultiPolygon)&&candidate.intersects(geometry)){polygon=features[i];this.control.layer.removeFeatures([polygon],{silent:true});this.control.layer.events.registerPriority("sketchcomplete",this,this.finalizeInteriorRing);this.control.layer.events.registerPriority("sketchmodified",this,this.enforceTopology);polygon.geometry.addComponent(this.line.geometry);this.polygon=polygon;this.drawingHole=true;break;}}}
+OpenLayers.Handler.Path.prototype.addPoint.apply(this,arguments);},getCurrentPointIndex:function(){return this.line.geometry.components.length-2;},enforceTopology:function(event){var point=event.vertex;var components=this.line.geometry.components;if(!this.polygon.geometry.intersects(point)){var last=components[components.length-3];point.x=last.x;point.y=last.y;}},finishGeometry:function(){var index=this.line.geometry.components.length-2;this.line.geometry.removeComponent(this.line.geometry.components[index]);this.removePoint();this.finalize();},finalizeInteriorRing:function(){var ring=this.line.geometry;var modified=(ring.getArea()!==0);if(modified){var rings=this.polygon.geometry.components;for(var i=rings.length-2;i>=0;--i){if(ring.intersects(rings[i])){modified=false;break;}}
+if(modified){var target;outer:for(var i=rings.length-2;i>0;--i){var points=rings[i].components;for(var j=0,jj=points.length;j<jj;++j){if(ring.containsPoint(points[j])){modified=false;break outer;}}}}}
+if(modified){if(this.polygon.state!==OpenLayers.State.INSERT){this.polygon.state=OpenLayers.State.UPDATE;}}else{this.polygon.geometry.removeComponent(ring);}
+this.restoreFeature();return false;},cancel:function(){if(this.drawingHole){this.polygon.geometry.removeComponent(this.line.geometry);this.restoreFeature(true);}
+return OpenLayers.Handler.Path.prototype.cancel.apply(this,arguments);},restoreFeature:function(cancel){this.control.layer.events.unregister("sketchcomplete",this,this.finalizeInteriorRing);this.control.layer.events.unregister("sketchmodified",this,this.enforceTopology);this.layer.removeFeatures([this.polygon],{silent:true});this.control.layer.addFeatures([this.polygon],{silent:true});this.drawingHole=false;if(!cancel){this.control.layer.events.triggerEvent("sketchcomplete",{feature:this.polygon});}},destroyFeature:function(force){OpenLayers.Handler.Path.prototype.destroyFeature.call(this,force);this.polygon=null;},drawFeature:function(){this.layer.drawFeature(this.polygon,this.style);this.layer.drawFeature(this.point,this.style);},getSketch:function(){return this.polygon;},getGeometry:function(){var geometry=this.polygon&&this.polygon.geometry;if(geometry&&this.multi){geometry=new OpenLayers.Geometry.MultiPolygon([geometry]);}
+return geometry;},CLASS_NAME:"OpenLayers.Handler.Polygon"});OpenLayers.Renderer=OpenLayers.Class({container:null,root:null,extent:null,locked:false,size:null,resolution:null,map:null,featureDx:0,initialize:function(containerID,options){this.container=OpenLayers.Util.getElement(containerID);OpenLayers.Util.extend(this,options);},destroy:function(){this.container=null;this.extent=null;this.size=null;this.resolution=null;this.map=null;},supported:function(){return false;},setExtent:function(extent,resolutionChanged){this.extent=extent.clone();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var ratio=extent.getWidth()/this.map.getExtent().getWidth(),extent=extent.scale(1/ratio);this.extent=extent.wrapDateLine(this.map.getMaxExtent()).scale(ratio);}
+if(resolutionChanged){this.resolution=null;}
+return true;},setSize:function(size){this.size=size.clone();this.resolution=null;},getResolution:function(){this.resolution=this.resolution||this.map.getResolution();return this.resolution;},drawFeature:function(feature,style){if(style==null){style=feature.style;}
+if(feature.geometry){var bounds=feature.geometry.getBounds();if(bounds){var worldBounds;if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){worldBounds=this.map.getMaxExtent();}
+if(!bounds.intersectsBounds(this.extent,{worldBounds:worldBounds})){style={display:"none"};}else{this.calculateFeatureDx(bounds,worldBounds);}
+var rendered=this.drawGeometry(feature.geometry,style,feature.id);if(style.display!="none"&&style.label&&rendered!==false){var location=feature.geometry.getCentroid();if(style.labelXOffset||style.labelYOffset){var xOffset=isNaN(style.labelXOffset)?0:style.labelXOffset;var yOffset=isNaN(style.labelYOffset)?0:style.labelYOffset;var res=this.getResolution();location.move(xOffset*res,yOffset*res);}
+this.drawText(feature.id,style,location);}else{this.removeText(feature.id);}
+return rendered;}}},calculateFeatureDx:function(bounds,worldBounds){this.featureDx=0;if(worldBounds){var worldWidth=worldBounds.getWidth(),rendererCenterX=(this.extent.left+this.extent.right)/2,featureCenterX=(bounds.left+bounds.right)/2,worldsAway=Math.round((featureCenterX-rendererCenterX)/worldWidth);this.featureDx=worldsAway*worldWidth;}},drawGeometry:function(geometry,style,featureId){},drawText:function(featureId,style,location){},removeText:function(featureId){},clear:function(){},getFeatureIdFromEvent:function(evt){},eraseFeatures:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];}
+for(var i=0,len=features.length;i<len;++i){var feature=features[i];this.eraseGeometry(feature.geometry,feature.id);this.removeText(feature.id);}},eraseGeometry:function(geometry,featureId){},moveRoot:function(renderer){},getRenderLayerId:function(){return this.container.id;},applyDefaultSymbolizer:function(symbolizer){var result=OpenLayers.Util.extend({},OpenLayers.Renderer.defaultSymbolizer);if(symbolizer.stroke===false){delete result.strokeWidth;delete result.strokeColor;}
+if(symbolizer.fill===false){delete result.fillColor;}
+OpenLayers.Util.extend(result,symbolizer);return result;},CLASS_NAME:"OpenLayers.Renderer"});OpenLayers.Renderer.defaultSymbolizer={fillColor:"#000000",strokeColor:"#000000",strokeWidth:2,fillOpacity:1,strokeOpacity:1,pointRadius:0,labelAlign:'cm'};OpenLayers.Renderer.symbol={"star":[350,75,379,161,469,161,397,215,423,301,350,250,277,301,303,215,231,161,321,161,350,75],"cross":[4,0,6,0,6,4,10,4,10,6,6,6,6,10,4,10,4,6,0,6,0,4,4,4,4,0],"x":[0,0,25,0,50,35,75,0,100,0,65,50,100,100,75,100,50,65,25,100,0,100,35,50,0,0],"square":[0,0,0,1,1,1,1,0,0,0],"triangle":[0,10,10,10,5,0,0,10]};OpenLayers.Renderer.Canvas=OpenLayers.Class(OpenLayers.Renderer,{hitDetection:true,hitOverflow:0,canvas:null,features:null,pendingRedraw:false,cachedSymbolBounds:{},initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.root=document.createElement("canvas");this.container.appendChild(this.root);this.canvas=this.root.getContext("2d");this.features={};if(this.hitDetection){this.hitCanvas=document.createElement("canvas");this.hitContext=this.hitCanvas.getContext("2d");}},setExtent:function(){OpenLayers.Renderer.prototype.setExtent.apply(this,arguments);return false;},eraseGeometry:function(geometry,featureId){this.eraseFeatures(this.features[featureId][0]);},supported:function(){return OpenLayers.CANVAS_SUPPORTED;},setSize:function(size){this.size=size.clone();var root=this.root;root.style.width=size.w+"px";root.style.height=size.h+"px";root.width=size.w;root.height=size.h;this.resolution=null;if(this.hitDetection){var hitCanvas=this.hitCanvas;hitCanvas.style.width=size.w+"px";hitCanvas.style.height=size.h+"px";hitCanvas.width=size.w;hitCanvas.height=size.h;}},drawFeature:function(feature,style){var rendered;if(feature.geometry){style=this.applyDefaultSymbolizer(style||feature.style);var bounds=feature.geometry.getBounds();var worldBounds;if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){worldBounds=this.map.getMaxExtent();}
+var intersects=bounds&&bounds.intersectsBounds(this.extent,{worldBounds:worldBounds});rendered=(style.display!=="none")&&!!bounds&&intersects;if(rendered){this.features[feature.id]=[feature,style];}
+else{delete(this.features[feature.id]);}
+this.pendingRedraw=true;}
+if(this.pendingRedraw&&!this.locked){this.redraw();this.pendingRedraw=false;}
+return rendered;},drawGeometry:function(geometry,style,featureId){var className=geometry.CLASS_NAME;if((className=="OpenLayers.Geometry.Collection")||(className=="OpenLayers.Geometry.MultiPoint")||(className=="OpenLayers.Geometry.MultiLineString")||(className=="OpenLayers.Geometry.MultiPolygon")){for(var i=0;i<geometry.components.length;i++){this.drawGeometry(geometry.components[i],style,featureId);}
+return;}
+switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":this.drawPoint(geometry,style,featureId);break;case"OpenLayers.Geometry.LineString":this.drawLineString(geometry,style,featureId);break;case"OpenLayers.Geometry.LinearRing":this.drawLinearRing(geometry,style,featureId);break;case"OpenLayers.Geometry.Polygon":this.drawPolygon(geometry,style,featureId);break;default:break;}},drawExternalGraphic:function(geometry,style,featureId){var img=new Image();if(style.graphicTitle){img.title=style.graphicTitle;}
+var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;var onLoad=function(){if(!this.features[featureId]){return;}
+var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var x=(p0+xOffset)|0;var y=(p1+yOffset)|0;var canvas=this.canvas;canvas.globalAlpha=opacity;var factor=OpenLayers.Renderer.Canvas.drawImageScaleFactor||(OpenLayers.Renderer.Canvas.drawImageScaleFactor=/android 2.1/.test(navigator.userAgent.toLowerCase())?320/window.screen.width:1);canvas.drawImage(img,x*factor,y*factor,width*factor,height*factor);if(this.hitDetection){this.setHitContextStyle("fill",featureId);this.hitContext.fillRect(x,y,width,height);}}};img.onload=OpenLayers.Function.bind(onLoad,this);img.src=style.externalGraphic;},drawNamedSymbol:function(geometry,style,featureId){var x,y,cx,cy,i,symbolBounds,scaling,angle;var unscaledStrokeWidth;var deg2rad=Math.PI/180.0;var symbol=OpenLayers.Renderer.symbol[style.graphicName];if(!symbol){throw new Error(style.graphicName+' is not a valid symbol name');}
+if(!symbol.length||symbol.length<2)return;var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(isNaN(p0)||isNaN(p1))return;this.canvas.lineCap="round";this.canvas.lineJoin="round";if(this.hitDetection){this.hitContext.lineCap="round";this.hitContext.lineJoin="round";}
+if(style.graphicName in this.cachedSymbolBounds){symbolBounds=this.cachedSymbolBounds[style.graphicName];}else{symbolBounds=new OpenLayers.Bounds();for(i=0;i<symbol.length;i+=2){symbolBounds.extend(new OpenLayers.LonLat(symbol[i],symbol[i+1]));}
+this.cachedSymbolBounds[style.graphicName]=symbolBounds;}
+this.canvas.save();if(this.hitDetection){this.hitContext.save();}
+this.canvas.translate(p0,p1);if(this.hitDetection){this.hitContext.translate(p0,p1);}
+angle=deg2rad*style.rotation;if(!isNaN(angle)){this.canvas.rotate(angle);if(this.hitDetection){this.hitContext.rotate(angle);}}
+scaling=2.0*style.pointRadius/Math.max(symbolBounds.getWidth(),symbolBounds.getHeight());this.canvas.scale(scaling,scaling);if(this.hitDetection){this.hitContext.scale(scaling,scaling);}
+cx=symbolBounds.getCenterLonLat().lon;cy=symbolBounds.getCenterLonLat().lat;this.canvas.translate(-cx,-cy);if(this.hitDetection){this.hitContext.translate(-cx,-cy);}
+unscaledStrokeWidth=style.strokeWidth;style.strokeWidth=unscaledStrokeWidth/scaling;if(style.fill!==false){this.setCanvasStyle("fill",style);this.canvas.beginPath();for(i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];if(i==0)this.canvas.moveTo(x,y);this.canvas.lineTo(x,y);}
+this.canvas.closePath();this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.hitContext.beginPath();for(i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];if(i==0)this.canvas.moveTo(x,y);this.hitContext.lineTo(x,y);}
+this.hitContext.closePath();this.hitContext.fill();}}
+if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.canvas.beginPath();for(i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];if(i==0)this.canvas.moveTo(x,y);this.canvas.lineTo(x,y);}
+this.canvas.closePath();this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style,scaling);this.hitContext.beginPath();for(i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];if(i==0)this.hitContext.moveTo(x,y);this.hitContext.lineTo(x,y);}
+this.hitContext.closePath();this.hitContext.stroke();}}
+style.strokeWidth=unscaledStrokeWidth;this.canvas.restore();if(this.hitDetection){this.hitContext.restore();}
+this.setCanvasStyle("reset");},setCanvasStyle:function(type,style){if(type==="fill"){this.canvas.globalAlpha=style['fillOpacity'];this.canvas.fillStyle=style['fillColor'];}else if(type==="stroke"){this.canvas.globalAlpha=style['strokeOpacity'];this.canvas.strokeStyle=style['strokeColor'];this.canvas.lineWidth=style['strokeWidth'];}else{this.canvas.globalAlpha=0;this.canvas.lineWidth=1;}},featureIdToHex:function(featureId){var id=Number(featureId.split("_").pop())+1;if(id>=16777216){this.hitOverflow=id-16777215;id=id%16777216+1;}
+var hex="000000"+id.toString(16);var len=hex.length;hex="#"+hex.substring(len-6,len);return hex;},setHitContextStyle:function(type,featureId,symbolizer,strokeScaling){var hex=this.featureIdToHex(featureId);if(type=="fill"){this.hitContext.globalAlpha=1.0;this.hitContext.fillStyle=hex;}else if(type=="stroke"){this.hitContext.globalAlpha=1.0;this.hitContext.strokeStyle=hex;if(typeof strokeScaling==="undefined"){this.hitContext.lineWidth=symbolizer.strokeWidth+2;}else{if(!isNaN(strokeScaling)){this.hitContext.lineWidth=symbolizer.strokeWidth+2.0/strokeScaling;}}}else{this.hitContext.globalAlpha=0;this.hitContext.lineWidth=1;}},drawPoint:function(geometry,style,featureId){if(style.graphic!==false){if(style.externalGraphic){this.drawExternalGraphic(geometry,style,featureId);}else if(style.graphicName&&(style.graphicName!="circle")){this.drawNamedSymbol(geometry,style,featureId);}else{var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var twoPi=Math.PI*2;var radius=style.pointRadius;if(style.fill!==false){this.setCanvasStyle("fill",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.fill();}}
+if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.stroke();}
+this.setCanvasStyle("reset");}}}}},drawLineString:function(geometry,style,featureId){style=OpenLayers.Util.applyDefaults({fill:false},style);this.drawLinearRing(geometry,style,featureId);},drawLinearRing:function(geometry,style,featureId){if(style.fill!==false){this.setCanvasStyle("fill",style);this.renderPath(this.canvas,geometry,style,featureId,"fill");if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"fill");}}
+if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.renderPath(this.canvas,geometry,style,featureId,"stroke");if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"stroke");}}
+this.setCanvasStyle("reset");},renderPath:function(context,geometry,style,featureId,type){var components=geometry.components;var len=components.length;context.beginPath();var start=this.getLocalXY(components[0]);var x=start[0];var y=start[1];if(!isNaN(x)&&!isNaN(y)){context.moveTo(start[0],start[1]);for(var i=1;i<len;++i){var pt=this.getLocalXY(components[i]);context.lineTo(pt[0],pt[1]);}
+if(type==="fill"){context.fill();}else{context.stroke();}}},drawPolygon:function(geometry,style,featureId){var components=geometry.components;var len=components.length;this.drawLinearRing(components[0],style,featureId);for(var i=1;i<len;++i){this.canvas.globalCompositeOperation="destination-out";if(this.hitDetection){this.hitContext.globalCompositeOperation="destination-out";}
+this.drawLinearRing(components[i],OpenLayers.Util.applyDefaults({stroke:false,fillOpacity:1.0},style),featureId);this.canvas.globalCompositeOperation="source-over";if(this.hitDetection){this.hitContext.globalCompositeOperation="source-over";}
+this.drawLinearRing(components[i],OpenLayers.Util.applyDefaults({fill:false},style),featureId);}},drawText:function(location,style){var pt=this.getLocalXY(location);this.setCanvasStyle("reset");this.canvas.fillStyle=style.fontColor;this.canvas.globalAlpha=style.fontOpacity||1.0;var fontStyle=[style.fontStyle?style.fontStyle:"normal","normal",style.fontWeight?style.fontWeight:"normal",style.fontSize?style.fontSize:"1em",style.fontFamily?style.fontFamily:"sans-serif"].join(" ");var labelRows=style.label.split('\n');var numRows=labelRows.length;if(this.canvas.fillText){this.canvas.font=fontStyle;this.canvas.textAlign=OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[0]]||"center";this.canvas.textBaseline=OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[1]]||"middle";var vfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];if(vfactor==null){vfactor=-.5;}
+var lineHeight=this.canvas.measureText('Mg').height||this.canvas.measureText('xx').width;pt[1]+=lineHeight*vfactor*(numRows-1);for(var i=0;i<numRows;i++){if(style.labelOutlineWidth){this.canvas.save();this.canvas.strokeStyle=style.labelOutlineColor;this.canvas.lineWidth=style.labelOutlineWidth;this.canvas.strokeText(labelRows[i],pt[0],pt[1]+(lineHeight*i)+1);this.canvas.restore();}
+this.canvas.fillText(labelRows[i],pt[0],pt[1]+(lineHeight*i));}}else if(this.canvas.mozDrawText){this.canvas.mozTextStyle=fontStyle;var hfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[0]];if(hfactor==null){hfactor=-.5;}
+var vfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];if(vfactor==null){vfactor=-.5;}
+var lineHeight=this.canvas.mozMeasureText('xx');pt[1]+=lineHeight*(1+(vfactor*numRows));for(var i=0;i<numRows;i++){var x=pt[0]+(hfactor*this.canvas.mozMeasureText(labelRows[i]));var y=pt[1]+(i*lineHeight);this.canvas.translate(x,y);this.canvas.mozDrawText(labelRows[i]);this.canvas.translate(-x,-y);}}
+this.setCanvasStyle("reset");},getLocalXY:function(point){var resolution=this.getResolution();var extent=this.extent;var x=((point.x-this.featureDx)/resolution+(-extent.left/resolution));var y=((extent.top/resolution)-point.y/resolution);return[x,y];},clear:function(){var height=this.root.height;var width=this.root.width;this.canvas.clearRect(0,0,width,height);this.features={};if(this.hitDetection){this.hitContext.clearRect(0,0,width,height);}},getFeatureIdFromEvent:function(evt){var featureId,feature;if(this.hitDetection&&this.root.style.display!=="none"){if(!this.map.dragging){var xy=evt.xy;var x=xy.x|0;var y=xy.y|0;var data=this.hitContext.getImageData(x,y,1,1).data;if(data[3]===255){var id=data[2]+(256*(data[1]+(256*data[0])));if(id){featureId="OpenLayers_Feature_Vector_"+(id-1+this.hitOverflow);try{feature=this.features[featureId][0];}catch(err){}}}}}
+return feature;},eraseFeatures:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];}
+for(var i=0;i<features.length;++i){delete this.features[features[i].id];}
+this.redraw();},redraw:function(){if(!this.locked){var height=this.root.height;var width=this.root.width;this.canvas.clearRect(0,0,width,height);if(this.hitDetection){this.hitContext.clearRect(0,0,width,height);}
+var labelMap=[];var feature,geometry,style;var worldBounds=(this.map.baseLayer&&this.map.baseLayer.wrapDateLine)&&this.map.getMaxExtent();for(var id in this.features){if(!this.features.hasOwnProperty(id)){continue;}
+feature=this.features[id][0];geometry=feature.geometry;this.calculateFeatureDx(geometry.getBounds(),worldBounds);style=this.features[id][1];this.drawGeometry(geometry,style,feature.id);if(style.label){labelMap.push([feature,style]);}}
+var item;for(var i=0,len=labelMap.length;i<len;++i){item=labelMap[i];this.drawText(item[0].geometry.getCentroid(),item[1]);}}},CLASS_NAME:"OpenLayers.Renderer.Canvas"});OpenLayers.Renderer.Canvas.LABEL_ALIGN={"l":"left","r":"right","t":"top","b":"bottom"};OpenLayers.Renderer.Canvas.LABEL_FACTOR={"l":0,"r":-1,"t":0,"b":-1};OpenLayers.Renderer.Canvas.drawImageScaleFactor=null;OpenLayers.Format.OSM=OpenLayers.Class(OpenLayers.Format.XML,{checkTags:false,interestingTagsExclude:null,areaTags:null,initialize:function(options){var layer_defaults={'interestingTagsExclude':['source','source_ref','source:ref','history','attribution','created_by'],'areaTags':['area','building','leisure','tourism','ruins','historic','landuse','military','natural','sport']};layer_defaults=OpenLayers.Util.extend(layer_defaults,options);var interesting={};for(var i=0;i<layer_defaults.interestingTagsExclude.length;i++){interesting[layer_defaults.interestingTagsExclude[i]]=true;}
+layer_defaults.interestingTagsExclude=interesting;var area={};for(var i=0;i<layer_defaults.areaTags.length;i++){area[layer_defaults.areaTags[i]]=true;}
+layer_defaults.areaTags=area;this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[layer_defaults]);},read:function(doc){if(typeof doc=="string"){doc=OpenLayers.Format.XML.prototype.read.apply(this,[doc]);}
+var nodes=this.getNodes(doc);var ways=this.getWays(doc);var feat_list=new Array(ways.length);for(var i=0;i<ways.length;i++){var point_list=new Array(ways[i].nodes.length);var poly=this.isWayArea(ways[i])?1:0;for(var j=0;j<ways[i].nodes.length;j++){var node=nodes[ways[i].nodes[j]];var point=new OpenLayers.Geometry.Point(node.lon,node.lat);point.osm_id=parseInt(ways[i].nodes[j]);point_list[j]=point;node.used=true;}
+var geometry=null;if(poly){geometry=new OpenLayers.Geometry.Polygon(new OpenLayers.Geometry.LinearRing(point_list));}else{geometry=new OpenLayers.Geometry.LineString(point_list);}
+if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}
+var feat=new OpenLayers.Feature.Vector(geometry,ways[i].tags);feat.osm_id=parseInt(ways[i].id);feat.fid="way."+feat.osm_id;feat_list[i]=feat;}
+for(var node_id in nodes){var node=nodes[node_id];if(!node.used||this.checkTags){var tags=null;if(this.checkTags){var result=this.getTags(node.node,true);if(node.used&&!result[1]){continue;}
+tags=result[0];}else{tags=this.getTags(node.node);}
+var feat=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(node['lon'],node['lat']),tags);if(this.internalProjection&&this.externalProjection){feat.geometry.transform(this.externalProjection,this.internalProjection);}
+feat.osm_id=parseInt(node_id);feat.fid="node."+feat.osm_id;feat_list.push(feat);}
+node.node=null;}
+return feat_list;},getNodes:function(doc){var node_list=doc.getElementsByTagName("node");var nodes={};for(var i=0;i<node_list.length;i++){var node=node_list[i];var id=node.getAttribute("id");nodes[id]={'lat':node.getAttribute("lat"),'lon':node.getAttribute("lon"),'node':node};}
+return nodes;},getWays:function(doc){var way_list=doc.getElementsByTagName("way");var return_ways=[];for(var i=0;i<way_list.length;i++){var way=way_list[i];var way_object={id:way.getAttribute("id")};way_object.tags=this.getTags(way);var node_list=way.getElementsByTagName("nd");way_object.nodes=new Array(node_list.length);for(var j=0;j<node_list.length;j++){way_object.nodes[j]=node_list[j].getAttribute("ref");}
+return_ways.push(way_object);}
+return return_ways;},getTags:function(dom_node,interesting_tags){var tag_list=dom_node.getElementsByTagName("tag");var tags={};var interesting=false;for(var j=0;j<tag_list.length;j++){var key=tag_list[j].getAttribute("k");tags[key]=tag_list[j].getAttribute("v");if(interesting_tags){if(!this.interestingTagsExclude[key]){interesting=true;}}}
+return interesting_tags?[tags,interesting]:tags;},isWayArea:function(way){var poly_shaped=false;var poly_tags=false;if(way.nodes[0]==way.nodes[way.nodes.length-1]){poly_shaped=true;}
+if(this.checkTags){for(var key in way.tags){if(this.areaTags[key]){poly_tags=true;break;}}}
+return poly_shaped&&(this.checkTags?poly_tags:true);},write:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];}
+this.osm_id=1;this.created_nodes={};var root_node=this.createElementNS(null,"osm");root_node.setAttribute("version","0.5");root_node.setAttribute("generator","OpenLayers "+OpenLayers.VERSION_NUMBER);for(var i=features.length-1;i>=0;i--){var nodes=this.createFeatureNodes(features[i]);for(var j=0;j<nodes.length;j++){root_node.appendChild(nodes[j]);}}
+return OpenLayers.Format.XML.prototype.write.apply(this,[root_node]);},createFeatureNodes:function(feature){var nodes=[];var className=feature.geometry.CLASS_NAME;var type=className.substring(className.lastIndexOf(".")+1);type=type.toLowerCase();var builder=this.createXML[type];if(builder){nodes=builder.apply(this,[feature]);}
+return nodes;},createXML:{'point':function(point){var id=null;var geometry=point.geometry?point.geometry:point;if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);}
+var already_exists=false;if(point.osm_id){id=point.osm_id;if(this.created_nodes[id]){already_exists=true;}}else{id=-this.osm_id;this.osm_id++;}
+if(already_exists){node=this.created_nodes[id];}else{var node=this.createElementNS(null,"node");}
+this.created_nodes[id]=node;node.setAttribute("id",id);node.setAttribute("lon",geometry.x);node.setAttribute("lat",geometry.y);if(point.attributes){this.serializeTags(point,node);}
+this.setState(point,node);return already_exists?[]:[node];},linestring:function(feature){var id;var nodes=[];var geometry=feature.geometry;if(feature.osm_id){id=feature.osm_id;}else{id=-this.osm_id;this.osm_id++;}
+var way=this.createElementNS(null,"way");way.setAttribute("id",id);for(var i=0;i<geometry.components.length;i++){var node=this.createXML['point'].apply(this,[geometry.components[i]]);if(node.length){node=node[0];var node_ref=node.getAttribute("id");nodes.push(node);}else{node_ref=geometry.components[i].osm_id;node=this.created_nodes[node_ref];}
+this.setState(feature,node);var nd_dom=this.createElementNS(null,"nd");nd_dom.setAttribute("ref",node_ref);way.appendChild(nd_dom);}
+this.serializeTags(feature,way);nodes.push(way);return nodes;},polygon:function(feature){var attrs=OpenLayers.Util.extend({'area':'yes'},feature.attributes);var feat=new OpenLayers.Feature.Vector(feature.geometry.components[0],attrs);feat.osm_id=feature.osm_id;return this.createXML['linestring'].apply(this,[feat]);}},serializeTags:function(feature,node){for(var key in feature.attributes){var tag=this.createElementNS(null,"tag");tag.setAttribute("k",key);tag.setAttribute("v",feature.attributes[key]);node.appendChild(tag);}},setState:function(feature,node){if(feature.state){var state=null;switch(feature.state){case OpenLayers.State.UPDATE:state="modify";case OpenLayers.State.DELETE:state="delete";}
+if(state){node.setAttribute("action",state);}}},CLASS_NAME:"OpenLayers.Format.OSM"});OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:true,dragging:false,touch:false,last:null,start:null,lastMoveEvt:null,oldOnselectstart:null,interval:0,timeoutId:null,documentDrag:false,documentEvents:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(this.documentDrag===true){var me=this;this._docMove=function(evt){me.mousemove({xy:{x:evt.clientX,y:evt.clientY},element:document});};this._docUp=function(evt){me.mouseup({xy:{x:evt.clientX,y:evt.clientY}});};}},dragstart:function(evt){var propagate=true;this.dragging=false;if(this.checkModifiers(evt)&&(OpenLayers.Event.isLeftClick(evt)||OpenLayers.Event.isSingleTouch(evt))){this.started=true;this.start=evt.xy;this.last=evt.xy;OpenLayers.Element.addClass(this.map.viewPortDiv,"olDragDown");this.down(evt);this.callback("down",[evt.xy]);OpenLayers.Event.stop(evt);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart?document.onselectstart:OpenLayers.Function.True;}
+document.onselectstart=OpenLayers.Function.False;propagate=!this.stopDown;}else{this.started=false;this.start=null;this.last=null;}
+return propagate;},dragmove:function(evt){this.lastMoveEvt=evt;if(this.started&&!this.timeoutId&&(evt.xy.x!=this.last.x||evt.xy.y!=this.last.y)){if(this.documentDrag===true&&this.documentEvents){if(evt.element===document){this.adjustXY(evt);this.setEvent(evt);}else{this.removeDocumentEvents();}}
+if(this.interval>0){this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval);}
+this.dragging=true;this.move(evt);this.callback("move",[evt.xy]);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart;document.onselectstart=OpenLayers.Function.False;}
+this.last=evt.xy;}
+return true;},dragend:function(evt){if(this.started){if(this.documentDrag===true&&this.documentEvents){this.adjustXY(evt);this.removeDocumentEvents();}
+var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(evt);this.callback("up",[evt.xy]);if(dragged){this.callback("done",[evt.xy]);}
+document.onselectstart=this.oldOnselectstart;}
+return true;},down:function(evt){},move:function(evt){},up:function(evt){},out:function(evt){},mousedown:function(evt){return this.dragstart(evt);},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,scope:this});}
+return this.dragstart(evt);},mousemove:function(evt){return this.dragmove(evt);},touchmove:function(evt){return this.dragmove(evt);},removeTimeout:function(){this.timeoutId=null;if(this.dragging){this.mousemove(this.lastMoveEvt);}},mouseup:function(evt){return this.dragend(evt);},touchend:function(evt){evt.xy=this.last;return this.dragend(evt);},mouseout:function(evt){if(this.started&&OpenLayers.Util.mouseLeft(evt,this.map.viewPortDiv)){if(this.documentDrag===true){this.addDocumentEvents();}else{var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(evt);this.callback("out",[]);if(dragged){this.callback("done",[evt.xy]);}
+if(document.onselectstart){document.onselectstart=this.oldOnselectstart;}}}
+return true;},click:function(evt){return(this.start==this.last);},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragging=false;activated=true;}
+return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.touch=false;this.started=false;this.dragging=false;this.start=null;this.last=null;deactivated=true;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");}
+return deactivated;},adjustXY:function(evt){var pos=OpenLayers.Util.pagePosition(this.map.viewPortDiv);evt.xy.x-=pos[0];evt.xy.y-=pos[1];},addDocumentEvents:function(){OpenLayers.Element.addClass(document.body,"olDragDown");this.documentEvents=true;OpenLayers.Event.observe(document,"mousemove",this._docMove);OpenLayers.Event.observe(document,"mouseup",this._docUp);},removeDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents=false;OpenLayers.Event.stopObserving(document,"mousemove",this._docMove);OpenLayers.Event.stopObserving(document,"mouseup",this._docUp);},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Handler.Feature=OpenLayers.Class(OpenLayers.Handler,{EVENTMAP:{'click':{'in':'click','out':'clickout'},'mousemove':{'in':'over','out':'out'},'dblclick':{'in':'dblclick','out':null},'mousedown':{'in':null,'out':null},'mouseup':{'in':null,'out':null},'touchstart':{'in':'click','out':'clickout'}},feature:null,lastFeature:null,down:null,up:null,touch:false,clickTolerance:4,geometryTypes:null,stopClick:true,stopDown:true,stopUp:false,initialize:function(control,layer,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,[control,callbacks,options]);this.layer=layer;},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,dblclick:this.dblclick,scope:this});}
+return OpenLayers.Event.isMultiTouch(evt)?true:this.mousedown(evt);},touchmove:function(evt){OpenLayers.Event.stop(evt);},mousedown:function(evt){if(OpenLayers.Event.isLeftClick(evt)||OpenLayers.Event.isSingleTouch(evt)){this.down=evt.xy;}
+return this.handle(evt)?!this.stopDown:true;},mouseup:function(evt){this.up=evt.xy;return this.handle(evt)?!this.stopUp:true;},click:function(evt){return this.handle(evt)?!this.stopClick:true;},mousemove:function(evt){if(!this.callbacks['over']&&!this.callbacks['out']){return true;}
+this.handle(evt);return true;},dblclick:function(evt){return!this.handle(evt);},geometryTypeMatches:function(feature){return this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1;},handle:function(evt){if(this.feature&&!this.feature.layer){this.feature=null;}
+var type=evt.type;var handled=false;var previouslyIn=!!(this.feature);var click=(type=="click"||type=="dblclick"||type=="touchstart");this.feature=this.layer.getFeatureFromEvent(evt);if(this.feature&&!this.feature.layer){this.feature=null;}
+if(this.lastFeature&&!this.lastFeature.layer){this.lastFeature=null;}
+if(this.feature){if(type==="touchstart"){OpenLayers.Event.stop(evt);}
+var inNew=(this.feature!=this.lastFeature);if(this.geometryTypeMatches(this.feature)){if(previouslyIn&&inNew){if(this.lastFeature){this.triggerCallback(type,'out',[this.lastFeature]);}
+this.triggerCallback(type,'in',[this.feature]);}else if(!previouslyIn||click){this.triggerCallback(type,'in',[this.feature]);}
+this.lastFeature=this.feature;handled=true;}else{if(this.lastFeature&&(previouslyIn&&inNew||click)){this.triggerCallback(type,'out',[this.lastFeature]);}
+this.feature=null;}}else{if(this.lastFeature&&(previouslyIn||click)){this.triggerCallback(type,'out',[this.lastFeature]);}}
+return handled;},triggerCallback:function(type,mode,args){var key=this.EVENTMAP[type][mode];if(key){if(type=='click'&&this.up&&this.down){var dpx=Math.sqrt(Math.pow(this.up.x-this.down.x,2)+
+Math.pow(this.up.y-this.down.y,2));if(dpx<=this.clickTolerance){this.callback(key,args);}}else{this.callback(key,args);}}},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.moveLayerToTop();this.map.events.on({"removelayer":this.handleMapEvents,"changelayer":this.handleMapEvents,scope:this});activated=true;}
+return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.moveLayerBack();this.feature=null;this.lastFeature=null;this.down=null;this.up=null;this.touch=false;this.map.events.un({"removelayer":this.handleMapEvents,"changelayer":this.handleMapEvents,scope:this});deactivated=true;}
+return deactivated;},handleMapEvents:function(evt){if(evt.type=="removelayer"||evt.property=="order"){this.moveLayerToTop();}},moveLayerToTop:function(){var index=Math.max(this.map.Z_INDEX_BASE['Feature']-1,this.layer.getZIndex())+1;this.layer.setZIndex(index);},moveLayerBack:function(){var index=this.layer.getZIndex()-1;if(index>=this.map.Z_INDEX_BASE['Feature']){this.layer.setZIndex(index);}else{this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer));}},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(feature,pixel){},onDrag:function(feature,pixel){},onComplete:function(feature,pixel){},onEnter:function(feature){},onLeave:function(feature){},documentDrag:false,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature,up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks),{documentDrag:this.documentDrag}),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})};},clickFeature:function(feature){if(this.handlers.feature.touch&&!this.over&&this.overFeature(feature)){this.handlers.drag.dragstart(this.handlers.feature.evt);this.handlers.drag.stopDown=false;}},clickoutFeature:function(feature){if(this.handlers.feature.touch&&this.over){this.outFeature(feature);this.handlers.drag.stopDown=true;}},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[]);},activate:function(){return(this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments));},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=false;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},overFeature:function(feature){var activated=false;if(!this.handlers.drag.dragging){this.feature=feature;this.handlers.drag.activate();activated=true;this.over=true;OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over");this.onEnter(feature);}else{if(this.feature.id==feature.id){this.over=true;}else{this.over=false;}}
+return activated;},downFeature:function(pixel){this.lastPixel=pixel;this.onStart(this.feature,pixel);},moveFeature:function(pixel){var res=this.map.getResolution();this.feature.geometry.move(res*(pixel.x-this.lastPixel.x),res*(this.lastPixel.y-pixel.y));this.layer.drawFeature(this.feature);this.lastPixel=pixel;this.onDrag(this.feature,pixel);},upFeature:function(pixel){if(!this.over){this.handlers.drag.deactivate();}},doneDragging:function(pixel){this.onComplete(this.feature,pixel);},outFeature:function(feature){if(!this.handlers.drag.dragging){this.over=false;this.handlers.drag.deactivate();OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");this.onLeave(feature);this.feature=null;}else{if(this.feature.id==feature.id){this.over=false;}}},cancel:function(){this.handlers.drag.deactivate();this.over=false;},setMap:function(map){this.handlers.drag.setMap(map);this.handlers.feature.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.StyleMap=OpenLayers.Class({styles:null,extendDefault:true,initialize:function(style,options){this.styles={"default":new OpenLayers.Style(OpenLayers.Feature.Vector.style["default"]),"select":new OpenLayers.Style(OpenLayers.Feature.Vector.style["select"]),"temporary":new OpenLayers.Style(OpenLayers.Feature.Vector.style["temporary"]),"delete":new OpenLayers.Style(OpenLayers.Feature.Vector.style["delete"])};if(style instanceof OpenLayers.Style){this.styles["default"]=style;this.styles["select"]=style;this.styles["temporary"]=style;this.styles["delete"]=style;}else if(typeof style=="object"){for(var key in style){if(style[key]instanceof OpenLayers.Style){this.styles[key]=style[key];}else if(typeof style[key]=="object"){this.styles[key]=new OpenLayers.Style(style[key]);}else{this.styles["default"]=new OpenLayers.Style(style);this.styles["select"]=new OpenLayers.Style(style);this.styles["temporary"]=new OpenLayers.Style(style);this.styles["delete"]=new OpenLayers.Style(style);break;}}}
+OpenLayers.Util.extend(this,options);},destroy:function(){for(var key in this.styles){this.styles[key].destroy();}
+this.styles=null;},createSymbolizer:function(feature,intent){if(!feature){feature=new OpenLayers.Feature.Vector();}
+if(!this.styles[intent]){intent="default";}
+feature.renderIntent=intent;var defaultSymbolizer={};if(this.extendDefault&&intent!="default"){defaultSymbolizer=this.styles["default"].createSymbolizer(feature);}
+return OpenLayers.Util.extend(defaultSymbolizer,this.styles[intent].createSymbolizer(feature));},addUniqueValueRules:function(renderIntent,property,symbolizers,context){var rules=[];for(var value in symbolizers){rules.push(new OpenLayers.Rule({symbolizer:symbolizers[value],context:context,filter:new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,property:property,value:value})}));}
+this.styles[renderIntent].addRules(rules);},CLASS_NAME:"OpenLayers.StyleMap"});OpenLayers.Layer.Vector=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:false,isFixed:false,features:null,filter:null,selectedFeatures:null,unrenderedFeatures:null,reportError:true,style:null,styleMap:null,strategies:null,protocol:null,renderers:['SVG','VML','Canvas'],renderer:null,rendererOptions:null,geometryType:null,drawn:false,ratio:1,initialize:function(name,options){OpenLayers.Layer.prototype.initialize.apply(this,arguments);if(!this.renderer||!this.renderer.supported()){this.assignRenderer();}
+if(!this.renderer||!this.renderer.supported()){this.renderer=null;this.displayError();}
+if(!this.styleMap){this.styleMap=new OpenLayers.StyleMap();}
+this.features=[];this.selectedFeatures=[];this.unrenderedFeatures={};if(this.strategies){for(var i=0,len=this.strategies.length;i<len;i++){this.strategies[i].setLayer(this);}}},destroy:function(){if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoDestroy){strategy.destroy();}}
+this.strategies=null;}
+if(this.protocol){if(this.protocol.autoDestroy){this.protocol.destroy();}
+this.protocol=null;}
+this.destroyFeatures();this.features=null;this.selectedFeatures=null;this.unrenderedFeatures=null;if(this.renderer){this.renderer.destroy();}
+this.renderer=null;this.geometryType=null;this.drawn=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Vector(this.name,this.getOptions());}
+obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);var features=this.features;var len=features.length;var clonedFeatures=new Array(len);for(var i=0;i<len;++i){clonedFeatures[i]=features[i].clone();}
+obj.features=clonedFeatures;return obj;},refresh:function(obj){if(this.calculateInRange()&&this.visibility){this.events.triggerEvent("refresh",obj);}},assignRenderer:function(){for(var i=0,len=this.renderers.length;i<len;i++){var rendererClass=this.renderers[i];var renderer=(typeof rendererClass=="function")?rendererClass:OpenLayers.Renderer[rendererClass];if(renderer&&renderer.prototype.supported()){this.renderer=new renderer(this.div,this.rendererOptions);break;}}},displayError:function(){if(this.reportError){OpenLayers.Console.userError(OpenLayers.i18n("browserNotSupported",{renderers:this.renderers.join('\n')}));}},setMap:function(map){OpenLayers.Layer.prototype.setMap.apply(this,arguments);if(!this.renderer){this.map.removeLayer(this);}else{this.renderer.map=this.map;var newSize=this.map.getSize();newSize.w=newSize.w*this.ratio;newSize.h=newSize.h*this.ratio;this.renderer.setSize(newSize);}},afterAdd:function(){if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoActivate){strategy.activate();}}}},removeMap:function(map){this.drawn=false;if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoActivate){strategy.deactivate();}}}},onMapResize:function(){OpenLayers.Layer.prototype.onMapResize.apply(this,arguments);var newSize=this.map.getSize();newSize.w=newSize.w*this.ratio;newSize.h=newSize.h*this.ratio;this.renderer.setSize(newSize);},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var coordSysUnchanged=true;if(!dragging){this.renderer.root.style.visibility='hidden';var viewSize=this.map.getSize(),viewWidth=viewSize.w,viewHeight=viewSize.h,offsetLeft=(viewWidth/2*this.ratio)-viewWidth/2,offsetTop=(viewHeight/2*this.ratio)-viewHeight/2;offsetLeft+=parseInt(this.map.layerContainerDiv.style.left,10);offsetLeft=-Math.round(offsetLeft);offsetTop+=parseInt(this.map.layerContainerDiv.style.top,10);offsetTop=-Math.round(offsetTop);this.div.style.left=offsetLeft+'px';this.div.style.top=offsetTop+'px';var extent=this.map.getExtent().scale(this.ratio);coordSysUnchanged=this.renderer.setExtent(extent,zoomChanged);this.renderer.root.style.visibility='visible';if(OpenLayers.IS_GECKO===true){this.div.scrollLeft=this.div.scrollLeft;}
+if(!zoomChanged&&coordSysUnchanged){for(var i in this.unrenderedFeatures){var feature=this.unrenderedFeatures[i];this.drawFeature(feature);}}}
+if(!this.drawn||zoomChanged||!coordSysUnchanged){this.drawn=true;var feature;for(var i=0,len=this.features.length;i<len;i++){this.renderer.locked=(i!==(len-1));feature=this.features[i];this.drawFeature(feature);}}},display:function(display){OpenLayers.Layer.prototype.display.apply(this,arguments);var currentDisplay=this.div.style.display;if(currentDisplay!=this.renderer.root.style.display){this.renderer.root.style.display=currentDisplay;}},addFeatures:function(features,options){if(!(OpenLayers.Util.isArray(features))){features=[features];}
+var notify=!options||!options.silent;if(notify){var event={features:features};var ret=this.events.triggerEvent("beforefeaturesadded",event);if(ret===false){return;}
+features=event.features;}
+var featuresAdded=[];for(var i=0,len=features.length;i<len;i++){if(i!=(features.length-1)){this.renderer.locked=true;}else{this.renderer.locked=false;}
+var feature=features[i];if(this.geometryType&&!(feature.geometry instanceof this.geometryType)){throw new TypeError('addFeatures: component should be an '+
+this.geometryType.prototype.CLASS_NAME);}
+feature.layer=this;if(!feature.style&&this.style){feature.style=OpenLayers.Util.extend({},this.style);}
+if(notify){if(this.events.triggerEvent("beforefeatureadded",{feature:feature})===false){continue;}
+this.preFeatureInsert(feature);}
+featuresAdded.push(feature);this.features.push(feature);this.drawFeature(feature);if(notify){this.events.triggerEvent("featureadded",{feature:feature});this.onFeatureInsert(feature);}}
+if(notify){this.events.triggerEvent("featuresadded",{features:featuresAdded});}},removeFeatures:function(features,options){if(!features||features.length===0){return;}
+if(features===this.features){return this.removeAllFeatures(options);}
+if(!(OpenLayers.Util.isArray(features))){features=[features];}
+if(features===this.selectedFeatures){features=features.slice();}
+var notify=!options||!options.silent;if(notify){this.events.triggerEvent("beforefeaturesremoved",{features:features});}
+for(var i=features.length-1;i>=0;i--){if(i!=0&&features[i-1].geometry){this.renderer.locked=true;}else{this.renderer.locked=false;}
+var feature=features[i];delete this.unrenderedFeatures[feature.id];if(notify){this.events.triggerEvent("beforefeatureremoved",{feature:feature});}
+this.features=OpenLayers.Util.removeItem(this.features,feature);feature.layer=null;if(feature.geometry){this.renderer.eraseFeatures(feature);}
+if(OpenLayers.Util.indexOf(this.selectedFeatures,feature)!=-1){OpenLayers.Util.removeItem(this.selectedFeatures,feature);}
+if(notify){this.events.triggerEvent("featureremoved",{feature:feature});}}
+if(notify){this.events.triggerEvent("featuresremoved",{features:features});}},removeAllFeatures:function(options){var notify=!options||!options.silent;var features=this.features;if(notify){this.events.triggerEvent("beforefeaturesremoved",{features:features});}
+var feature;for(var i=features.length-1;i>=0;i--){feature=features[i];if(notify){this.events.triggerEvent("beforefeatureremoved",{feature:feature});}
+feature.layer=null;if(notify){this.events.triggerEvent("featureremoved",{feature:feature});}}
+this.renderer.clear();this.features=[];this.unrenderedFeatures={};this.selectedFeatures=[];if(notify){this.events.triggerEvent("featuresremoved",{features:features});}},destroyFeatures:function(features,options){var all=(features==undefined);if(all){features=this.features;}
+if(features){this.removeFeatures(features,options);for(var i=features.length-1;i>=0;i--){features[i].destroy();}}},drawFeature:function(feature,style){if(!this.drawn){return;}
+if(typeof style!="object"){if(!style&&feature.state===OpenLayers.State.DELETE){style="delete";}
+var renderIntent=style||feature.renderIntent;style=feature.style||this.style;if(!style){style=this.styleMap.createSymbolizer(feature,renderIntent);}}
+var drawn=this.renderer.drawFeature(feature,style);if(drawn===false||drawn===null){this.unrenderedFeatures[feature.id]=feature;}else{delete this.unrenderedFeatures[feature.id];}},eraseFeatures:function(features){this.renderer.eraseFeatures(features);},getFeatureFromEvent:function(evt){if(!this.renderer){throw new Error('getFeatureFromEvent called on layer with no '+'renderer. This usually means you destroyed a '+'layer, but not some handler which is associated '+'with it.');}
+var feature=null;var featureId=this.renderer.getFeatureIdFromEvent(evt);if(featureId){if(typeof featureId==="string"){feature=this.getFeatureById(featureId);}else{feature=featureId;}}
+return feature;},getFeatureBy:function(property,value){var feature=null;for(var i=0,len=this.features.length;i<len;++i){if(this.features[i][property]==value){feature=this.features[i];break;}}
+return feature;},getFeatureById:function(featureId){return this.getFeatureBy('id',featureId);},getFeatureByFid:function(featureFid){return this.getFeatureBy('fid',featureFid);},getFeaturesByAttribute:function(attrName,attrValue){var i,feature,len=this.features.length,foundFeatures=[];for(i=0;i<len;i++){feature=this.features[i];if(feature&&feature.attributes){if(feature.attributes[attrName]===attrValue){foundFeatures.push(feature);}}}
+return foundFeatures;},onFeatureInsert:function(feature){},preFeatureInsert:function(feature){},getDataExtent:function(){var maxExtent=null;var features=this.features;if(features&&(features.length>0)){var geometry=null;for(var i=0,len=features.length;i<len;i++){geometry=features[i].geometry;if(geometry){if(maxExtent===null){maxExtent=new OpenLayers.Bounds();}
+maxExtent.extend(geometry.getBounds());}}}
+return maxExtent;},CLASS_NAME:"OpenLayers.Layer.Vector"});OpenLayers.Layer.Vector.RootContainer=OpenLayers.Class(OpenLayers.Layer.Vector,{displayInLayerSwitcher:false,layers:null,display:function(){},getFeatureFromEvent:function(evt){var layers=this.layers;var feature;for(var i=0;i<layers.length;i++){feature=layers[i].getFeatureFromEvent(evt);if(feature){return feature;}}},setMap:function(map){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);this.collectRoots();map.events.register("changelayer",this,this.handleChangeLayer);},removeMap:function(map){map.events.unregister("changelayer",this,this.handleChangeLayer);this.resetRoots();OpenLayers.Layer.Vector.prototype.removeMap.apply(this,arguments);},collectRoots:function(){var layer;for(var i=0;i<this.map.layers.length;++i){layer=this.map.layers[i];if(OpenLayers.Util.indexOf(this.layers,layer)!=-1){layer.renderer.moveRoot(this.renderer);}}},resetRoots:function(){var layer;for(var i=0;i<this.layers.length;++i){layer=this.layers[i];if(this.renderer&&layer.renderer.getRenderLayerId()==this.id){this.renderer.moveRoot(layer.renderer);}}},handleChangeLayer:function(evt){var layer=evt.layer;if(evt.property=="order"&&OpenLayers.Util.indexOf(this.layers,layer)!=-1){this.resetRoots();this.collectRoots();}},CLASS_NAME:"OpenLayers.Layer.Vector.RootContainer"});OpenLayers.Control.SelectFeature=OpenLayers.Class(OpenLayers.Control,{multipleKey:null,toggleKey:null,multiple:false,clickout:true,toggle:false,hover:false,highlightOnly:false,box:false,onBeforeSelect:function(){},onSelect:function(){},onUnselect:function(){},scope:null,geometryTypes:null,layer:null,layers:null,callbacks:null,selectStyle:null,renderIntent:"select",handlers:null,initialize:function(layers,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);if(this.scope===null){this.scope=this;}
+this.initLayer(layers);var callbacks={click:this.clickFeature,clickout:this.clickoutFeature};if(this.hover){callbacks.over=this.overFeature;callbacks.out=this.outFeature;}
+this.callbacks=OpenLayers.Util.extend(callbacks,this.callbacks);this.handlers={feature:new OpenLayers.Handler.Feature(this,this.layer,this.callbacks,{geometryTypes:this.geometryTypes})};if(this.box){this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},{boxDivClassName:"olHandlerBoxSelectFeature"});}},initLayer:function(layers){if(OpenLayers.Util.isArray(layers)){this.layers=layers;this.layer=new OpenLayers.Layer.Vector.RootContainer(this.id+"_container",{layers:layers});}else{this.layer=layers;}},destroy:function(){if(this.active&&this.layers){this.map.removeLayer(this.layer);}
+OpenLayers.Control.prototype.destroy.apply(this,arguments);if(this.layers){this.layer.destroy();}},activate:function(){if(!this.active){if(this.layers){this.map.addLayer(this.layer);}
+this.handlers.feature.activate();if(this.box&&this.handlers.box){this.handlers.box.activate();}}
+return OpenLayers.Control.prototype.activate.apply(this,arguments);},deactivate:function(){if(this.active){this.handlers.feature.deactivate();if(this.handlers.box){this.handlers.box.deactivate();}
+if(this.layers){this.map.removeLayer(this.layer);}}
+return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},unselectAll:function(options){var layers=this.layers||[this.layer];var layer,feature;for(var l=0;l<layers.length;++l){layer=layers[l];for(var i=layer.selectedFeatures.length-1;i>=0;--i){feature=layer.selectedFeatures[i];if(!options||options.except!=feature){this.unselect(feature);}}}},clickFeature:function(feature){if(!this.hover){var selected=(OpenLayers.Util.indexOf(feature.layer.selectedFeatures,feature)>-1);if(selected){if(this.toggleSelect()){this.unselect(feature);}else if(!this.multipleSelect()){this.unselectAll({except:feature});}}else{if(!this.multipleSelect()){this.unselectAll({except:feature});}
+this.select(feature);}}},multipleSelect:function(){return this.multiple||(this.handlers.feature.evt&&this.handlers.feature.evt[this.multipleKey]);},toggleSelect:function(){return this.toggle||(this.handlers.feature.evt&&this.handlers.feature.evt[this.toggleKey]);},clickoutFeature:function(feature){if(!this.hover&&this.clickout){this.unselectAll();}},overFeature:function(feature){var layer=feature.layer;if(this.hover){if(this.highlightOnly){this.highlight(feature);}else if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}},outFeature:function(feature){if(this.hover){if(this.highlightOnly){if(feature._lastHighlighter==this.id){if(feature._prevHighlighter&&feature._prevHighlighter!=this.id){delete feature._lastHighlighter;var control=this.map.getControl(feature._prevHighlighter);if(control){control.highlight(feature);}}else{this.unhighlight(feature);}}}else{this.unselect(feature);}}},highlight:function(feature){var layer=feature.layer;var cont=this.events.triggerEvent("beforefeaturehighlighted",{feature:feature});if(cont!==false){feature._prevHighlighter=feature._lastHighlighter;feature._lastHighlighter=this.id;var style=this.selectStyle||this.renderIntent;layer.drawFeature(feature,style);this.events.triggerEvent("featurehighlighted",{feature:feature});}},unhighlight:function(feature){var layer=feature.layer;if(feature._prevHighlighter==undefined){delete feature._lastHighlighter;}else if(feature._prevHighlighter==this.id){delete feature._prevHighlighter;}else{feature._lastHighlighter=feature._prevHighlighter;delete feature._prevHighlighter;}
+layer.drawFeature(feature,feature.style||feature.layer.style||"default");this.events.triggerEvent("featureunhighlighted",{feature:feature});},select:function(feature){var cont=this.onBeforeSelect.call(this.scope,feature);var layer=feature.layer;if(cont!==false){cont=layer.events.triggerEvent("beforefeatureselected",{feature:feature});if(cont!==false){layer.selectedFeatures.push(feature);this.highlight(feature);if(!this.handlers.feature.lastFeature){this.handlers.feature.lastFeature=layer.selectedFeatures[0];}
+layer.events.triggerEvent("featureselected",{feature:feature});this.onSelect.call(this.scope,feature);}}},unselect:function(feature){var layer=feature.layer;this.unhighlight(feature);OpenLayers.Util.removeItem(layer.selectedFeatures,feature);layer.events.triggerEvent("featureunselected",{feature:feature});this.onUnselect.call(this.scope,feature);},selectBox:function(position){if(position instanceof OpenLayers.Bounds){var minXY=this.map.getLonLatFromPixel({x:position.left,y:position.bottom});var maxXY=this.map.getLonLatFromPixel({x:position.right,y:position.top});var bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);if(!this.multipleSelect()){this.unselectAll();}
+var prevMultiple=this.multiple;this.multiple=true;var layers=this.layers||[this.layer];this.events.triggerEvent("boxselectionstart",{layers:layers});var layer;for(var l=0;l<layers.length;++l){layer=layers[l];for(var i=0,len=layer.features.length;i<len;++i){var feature=layer.features[i];if(!feature.getVisibility()){continue;}
+if(this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1){if(bounds.toGeometry().intersects(feature.geometry)){if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}}}}
+this.multiple=prevMultiple;this.events.triggerEvent("boxselectionend",{layers:layers});}},setMap:function(map){this.handlers.feature.setMap(map);if(this.box){this.handlers.box.setMap(map);}
+OpenLayers.Control.prototype.setMap.apply(this,arguments);},setLayer:function(layers){var isActive=this.active;this.unselectAll();this.deactivate();if(this.layers){this.layer.destroy();this.layers=null;}
+this.initLayer(layers);this.handlers.feature.layer=this.layer;if(isActive){this.activate();}},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Handler.Keyboard=OpenLayers.Class(OpenLayers.Handler,{KEY_EVENTS:["keydown","keyup"],eventListener:null,observeElement:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.eventListener=OpenLayers.Function.bindAsEventListener(this.handleKeyEvent,this);},destroy:function(){this.deactivate();this.eventListener=null;OpenLayers.Handler.prototype.destroy.apply(this,arguments);},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.observeElement=this.observeElement||document;for(var i=0,len=this.KEY_EVENTS.length;i<len;i++){OpenLayers.Event.observe(this.observeElement,this.KEY_EVENTS[i],this.eventListener);}
+return true;}else{return false;}},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){for(var i=0,len=this.KEY_EVENTS.length;i<len;i++){OpenLayers.Event.stopObserving(this.observeElement,this.KEY_EVENTS[i],this.eventListener);}
+deactivated=true;}
+return deactivated;},handleKeyEvent:function(evt){if(this.checkModifiers(evt)){this.callback(evt.type,[evt]);}},CLASS_NAME:"OpenLayers.Handler.Keyboard"});OpenLayers.Control.ModifyFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,clickout:true,toggle:true,standalone:false,layer:null,feature:null,vertices:null,virtualVertices:null,selectControl:null,dragControl:null,handlers:null,deleteCodes:null,virtualStyle:null,vertexRenderIntent:null,mode:null,createVertices:true,modified:false,radiusHandle:null,dragHandle:null,onModificationStart:function(){},onModification:function(){},onModificationEnd:function(){},initialize:function(layer,options){options=options||{};this.layer=layer;this.vertices=[];this.virtualVertices=[];this.virtualStyle=OpenLayers.Util.extend({},this.layer.style||this.layer.styleMap.createSymbolizer(null,options.vertexRenderIntent));this.virtualStyle.fillOpacity=0.3;this.virtualStyle.strokeOpacity=0.3;this.deleteCodes=[46,68];this.mode=OpenLayers.Control.ModifyFeature.RESHAPE;OpenLayers.Control.prototype.initialize.apply(this,[options]);if(!(OpenLayers.Util.isArray(this.deleteCodes))){this.deleteCodes=[this.deleteCodes];}
+var control=this;var selectOptions={geometryTypes:this.geometryTypes,clickout:this.clickout,toggle:this.toggle,onBeforeSelect:this.beforeSelectFeature,onSelect:this.selectFeature,onUnselect:this.unselectFeature,scope:this};if(this.standalone===false){this.selectControl=new OpenLayers.Control.SelectFeature(layer,selectOptions);}
+var dragOptions={geometryTypes:["OpenLayers.Geometry.Point"],onStart:function(feature,pixel){control.dragStart.apply(control,[feature,pixel]);},onDrag:function(feature,pixel){control.dragVertex.apply(control,[feature,pixel]);},onComplete:function(feature){control.dragComplete.apply(control,[feature]);},featureCallbacks:{over:function(feature){if(control.standalone!==true||feature._sketch||control.feature===feature){control.dragControl.overFeature.apply(control.dragControl,[feature]);}}}};this.dragControl=new OpenLayers.Control.DragFeature(layer,dragOptions);var keyboardOptions={keydown:this.handleKeypress};this.handlers={keyboard:new OpenLayers.Handler.Keyboard(this,keyboardOptions)};},destroy:function(){this.layer=null;this.standalone||this.selectControl.destroy();this.dragControl.destroy();OpenLayers.Control.prototype.destroy.apply(this,[]);},activate:function(){return((this.standalone||this.selectControl.activate())&&this.handlers.keyboard.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments));},deactivate:function(){var deactivated=false;if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){this.layer.removeFeatures(this.vertices,{silent:true});this.layer.removeFeatures(this.virtualVertices,{silent:true});this.vertices=[];this.dragControl.deactivate();var feature=this.feature;var valid=feature&&feature.geometry&&feature.layer;if(this.standalone===false){if(valid){this.selectControl.unselect.apply(this.selectControl,[feature]);}
+this.selectControl.deactivate();}else{if(valid){this.unselectFeature(feature);}}
+this.handlers.keyboard.deactivate();deactivated=true;}
+return deactivated;},beforeSelectFeature:function(feature){return this.layer.events.triggerEvent("beforefeaturemodified",{feature:feature});},selectFeature:function(feature){if(!this.standalone||this.beforeSelectFeature(feature)!==false){this.feature=feature;this.modified=false;this.resetVertices();this.dragControl.activate();this.onModificationStart(this.feature);}
+var modified=feature.modified;if(feature.geometry&&!(modified&&modified.geometry)){this._originalGeometry=feature.geometry.clone();}},unselectFeature:function(feature){this.layer.removeFeatures(this.vertices,{silent:true});this.vertices=[];this.layer.destroyFeatures(this.virtualVertices,{silent:true});this.virtualVertices=[];if(this.dragHandle){this.layer.destroyFeatures([this.dragHandle],{silent:true});delete this.dragHandle;}
+if(this.radiusHandle){this.layer.destroyFeatures([this.radiusHandle],{silent:true});delete this.radiusHandle;}
+this.feature=null;this.dragControl.deactivate();this.onModificationEnd(feature);this.layer.events.triggerEvent("afterfeaturemodified",{feature:feature,modified:this.modified});this.modified=false;},dragStart:function(feature,pixel){if(feature!=this.feature&&!feature.geometry.parent&&feature!=this.dragHandle&&feature!=this.radiusHandle){if(this.standalone===false&&this.feature){this.selectControl.clickFeature.apply(this.selectControl,[this.feature]);}
+if(this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)!=-1){this.standalone||this.selectControl.clickFeature.apply(this.selectControl,[feature]);this.dragControl.overFeature.apply(this.dragControl,[feature]);this.dragControl.lastPixel=pixel;this.dragControl.handlers.drag.started=true;this.dragControl.handlers.drag.start=pixel;this.dragControl.handlers.drag.last=pixel;}}},dragVertex:function(vertex,pixel){this.modified=true;if(this.feature.geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){if(this.feature!=vertex){this.feature=vertex;}
+this.layer.events.triggerEvent("vertexmodified",{vertex:vertex.geometry,feature:this.feature,pixel:pixel});}else{if(vertex._index){vertex.geometry.parent.addComponent(vertex.geometry,vertex._index);delete vertex._index;OpenLayers.Util.removeItem(this.virtualVertices,vertex);this.vertices.push(vertex);}else if(vertex==this.dragHandle){this.layer.removeFeatures(this.vertices,{silent:true});this.vertices=[];if(this.radiusHandle){this.layer.destroyFeatures([this.radiusHandle],{silent:true});this.radiusHandle=null;}}else if(vertex!==this.radiusHandle){this.layer.events.triggerEvent("vertexmodified",{vertex:vertex.geometry,feature:this.feature,pixel:pixel});}
+if(this.virtualVertices.length>0){this.layer.destroyFeatures(this.virtualVertices,{silent:true});this.virtualVertices=[];}
+this.layer.drawFeature(this.feature,this.standalone?undefined:this.selectControl.renderIntent);}
+this.layer.drawFeature(vertex);},dragComplete:function(vertex){this.resetVertices();this.setFeatureState();this.onModification(this.feature);this.layer.events.triggerEvent("featuremodified",{feature:this.feature});},setFeatureState:function(){if(this.feature.state!=OpenLayers.State.INSERT&&this.feature.state!=OpenLayers.State.DELETE){this.feature.state=OpenLayers.State.UPDATE;if(this.modified&&this._originalGeometry){var feature=this.feature;feature.modified=OpenLayers.Util.extend(feature.modified,{geometry:this._originalGeometry});delete this._originalGeometry;}}},resetVertices:function(){if(this.dragControl.feature){this.dragControl.outFeature(this.dragControl.feature);}
+if(this.vertices.length>0){this.layer.removeFeatures(this.vertices,{silent:true});this.vertices=[];}
+if(this.virtualVertices.length>0){this.layer.removeFeatures(this.virtualVertices,{silent:true});this.virtualVertices=[];}
+if(this.dragHandle){this.layer.destroyFeatures([this.dragHandle],{silent:true});this.dragHandle=null;}
+if(this.radiusHandle){this.layer.destroyFeatures([this.radiusHandle],{silent:true});this.radiusHandle=null;}
+if(this.feature&&this.feature.geometry.CLASS_NAME!="OpenLayers.Geometry.Point"){if((this.mode&OpenLayers.Control.ModifyFeature.DRAG)){this.collectDragHandle();}
+if((this.mode&(OpenLayers.Control.ModifyFeature.ROTATE|OpenLayers.Control.ModifyFeature.RESIZE))){this.collectRadiusHandle();}
+if(this.mode&OpenLayers.Control.ModifyFeature.RESHAPE){if(!(this.mode&OpenLayers.Control.ModifyFeature.RESIZE)){this.collectVertices();}}}},handleKeypress:function(evt){var code=evt.keyCode;if(this.feature&&OpenLayers.Util.indexOf(this.deleteCodes,code)!=-1){var vertex=this.dragControl.feature;if(vertex&&OpenLayers.Util.indexOf(this.vertices,vertex)!=-1&&!this.dragControl.handlers.drag.dragging&&vertex.geometry.parent){vertex.geometry.parent.removeComponent(vertex.geometry);this.layer.events.triggerEvent("vertexremoved",{vertex:vertex.geometry,feature:this.feature,pixel:evt.xy});this.layer.drawFeature(this.feature,this.standalone?undefined:this.selectControl.renderIntent);this.modified=true;this.resetVertices();this.setFeatureState();this.onModification(this.feature);this.layer.events.triggerEvent("featuremodified",{feature:this.feature});}}},collectVertices:function(){this.vertices=[];this.virtualVertices=[];var control=this;function collectComponentVertices(geometry){var i,vertex,component,len;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){vertex=new OpenLayers.Feature.Vector(geometry);vertex._sketch=true;vertex.renderIntent=control.vertexRenderIntent;control.vertices.push(vertex);}else{var numVert=geometry.components.length;if(geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){numVert-=1;}
+for(i=0;i<numVert;++i){component=geometry.components[i];if(component.CLASS_NAME=="OpenLayers.Geometry.Point"){vertex=new OpenLayers.Feature.Vector(component);vertex._sketch=true;vertex.renderIntent=control.vertexRenderIntent;control.vertices.push(vertex);}else{collectComponentVertices(component);}}
+if(control.createVertices&&geometry.CLASS_NAME!="OpenLayers.Geometry.MultiPoint"){for(i=0,len=geometry.components.length;i<len-1;++i){var prevVertex=geometry.components[i];var nextVertex=geometry.components[i+1];if(prevVertex.CLASS_NAME=="OpenLayers.Geometry.Point"&&nextVertex.CLASS_NAME=="OpenLayers.Geometry.Point"){var x=(prevVertex.x+nextVertex.x)/2;var y=(prevVertex.y+nextVertex.y)/2;var point=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(x,y),null,control.virtualStyle);point.geometry.parent=geometry;point._index=i+1;point._sketch=true;control.virtualVertices.push(point);}}}}}
+collectComponentVertices.call(this,this.feature.geometry);this.layer.addFeatures(this.virtualVertices,{silent:true});this.layer.addFeatures(this.vertices,{silent:true});},collectDragHandle:function(){var geometry=this.feature.geometry;var center=geometry.getBounds().getCenterLonLat();var originGeometry=new OpenLayers.Geometry.Point(center.lon,center.lat);var origin=new OpenLayers.Feature.Vector(originGeometry);originGeometry.move=function(x,y){OpenLayers.Geometry.Point.prototype.move.call(this,x,y);geometry.move(x,y);};origin._sketch=true;this.dragHandle=origin;this.dragHandle.renderIntent=this.vertexRenderIntent;this.layer.addFeatures([this.dragHandle],{silent:true});},collectRadiusHandle:function(){var geometry=this.feature.geometry;var bounds=geometry.getBounds();var center=bounds.getCenterLonLat();var originGeometry=new OpenLayers.Geometry.Point(center.lon,center.lat);var radiusGeometry=new OpenLayers.Geometry.Point(bounds.right,bounds.bottom);var radius=new OpenLayers.Feature.Vector(radiusGeometry);var resize=(this.mode&OpenLayers.Control.ModifyFeature.RESIZE);var reshape=(this.mode&OpenLayers.Control.ModifyFeature.RESHAPE);var rotate=(this.mode&OpenLayers.Control.ModifyFeature.ROTATE);radiusGeometry.move=function(x,y){OpenLayers.Geometry.Point.prototype.move.call(this,x,y);var dx1=this.x-originGeometry.x;var dy1=this.y-originGeometry.y;var dx0=dx1-x;var dy0=dy1-y;if(rotate){var a0=Math.atan2(dy0,dx0);var a1=Math.atan2(dy1,dx1);var angle=a1-a0;angle*=180/Math.PI;geometry.rotate(angle,originGeometry);}
+if(resize){var scale,ratio;if(reshape){scale=dy1/dy0;ratio=(dx1/dx0)/scale;}else{var l0=Math.sqrt((dx0*dx0)+(dy0*dy0));var l1=Math.sqrt((dx1*dx1)+(dy1*dy1));scale=l1/l0;}
+geometry.resize(scale,originGeometry,ratio);}};radius._sketch=true;this.radiusHandle=radius;this.radiusHandle.renderIntent=this.vertexRenderIntent;this.layer.addFeatures([this.radiusHandle],{silent:true});},setMap:function(map){this.standalone||this.selectControl.setMap(map);this.dragControl.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.ModifyFeature"});OpenLayers.Control.ModifyFeature.RESHAPE=1;OpenLayers.Control.ModifyFeature.RESIZE=2;OpenLayers.Control.ModifyFeature.ROTATE=4;OpenLayers.Control.ModifyFeature.DRAG=8;OpenLayers.Layer.XYZ=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,sphericalMercator:false,zoomOffset:0,serverResolutions:null,initialize:function(name,url,options){if(options&&options.sphericalMercator||this.sphericalMercator){options=OpenLayers.Util.extend({projection:"EPSG:900913",numZoomLevels:19},options);}
+OpenLayers.Layer.Grid.prototype.initialize.apply(this,[name||this.name,url||this.url,{},options]);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.XYZ(this.name,this.url,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){var xyz=this.getXYZ(bounds);var url=this.url;if(OpenLayers.Util.isArray(url)){var s=''+xyz.x+xyz.y+xyz.z;url=this.selectUrl(s,url);}
+return OpenLayers.String.format(url,xyz);},getXYZ:function(bounds){var res=this.getServerResolution();var x=Math.round((bounds.left-this.maxExtent.left)/(res*this.tileSize.w));var y=Math.round((this.maxExtent.top-bounds.top)/(res*this.tileSize.h));var resolutions=this.serverResolutions||this.resolutions;var z=this.zoomOffset==0?OpenLayers.Util.indexOf(resolutions,res):this.getServerZoom()+this.zoomOffset;if(this.wrapDateLine){var limit=Math.pow(2,z);x=((x%limit)+limit)%limit;}
+return{'x':x,'y':y,'z':z};},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.bottom);}},CLASS_NAME:"OpenLayers.Layer.XYZ"});OpenLayers.Layer.Bing=OpenLayers.Class(OpenLayers.Layer.XYZ,{key:null,serverResolutions:[156543.03390625,78271.516953125,39135.7584765625,19567.87923828125,9783.939619140625,4891.9698095703125,2445.9849047851562,1222.9924523925781,611.4962261962891,305.74811309814453,152.87405654907226,76.43702827453613,38.218514137268066,19.109257068634033,9.554628534317017,4.777314267158508,2.388657133579254,1.194328566789627,0.5971642833948135,0.29858214169740677,0.14929107084870338,0.07464553542435169],attributionTemplate:'<span class="olBingAttribution ${type}">'+'<div><a target="_blank" href="http://www.bing.com/maps/">'+'<img src="${logo}" /></a></div>${copyrights}'+'<a style="white-space: nowrap" target="_blank" '+'href="http://www.microsoft.com/maps/product/terms.html">'+'Terms of Use</a></span>',metadata:null,type:"Road",culture:"en-US",metadataParams:null,tileOptions:null,initialize:function(options){options=OpenLayers.Util.applyDefaults({sphericalMercator:true},options);var name=options.name||"Bing "+(options.type||this.type);var newArgs=[name,null,options];OpenLayers.Layer.XYZ.prototype.initialize.apply(this,newArgs);this.tileOptions=OpenLayers.Util.extend({crossOriginKeyword:'anonymous'},this.options.tileOptions);this.loadMetadata();},loadMetadata:function(){this._callbackId="_callback_"+this.id.replace(/\./g,"_");window[this._callbackId]=OpenLayers.Function.bind(OpenLayers.Layer.Bing.processMetadata,this);var params=OpenLayers.Util.applyDefaults({key:this.key,jsonp:this._callbackId,include:"ImageryProviders"},this.metadataParams);var url="http://dev.virtualearth.net/REST/v1/Imagery/Metadata/"+
+this.type+"?"+OpenLayers.Util.getParameterString(params);var script=document.createElement("script");script.type="text/javascript";script.src=url;script.id=this._callbackId;document.getElementsByTagName("head")[0].appendChild(script);},initLayer:function(){var res=this.metadata.resourceSets[0].resources[0];var url=res.imageUrl.replace("{quadkey}","${quadkey}");url=url.replace("{culture}",this.culture);this.url=[];for(var i=0;i<res.imageUrlSubdomains.length;++i){this.url.push(url.replace("{subdomain}",res.imageUrlSubdomains[i]));}
+this.addOptions({maxResolution:Math.min(this.serverResolutions[res.zoomMin],this.maxResolution||Number.POSITIVE_INFINITY),numZoomLevels:Math.min(res.zoomMax+1-res.zoomMin,this.numZoomLevels)},true);this.updateAttribution();},drawTileFromQueue:function(){if(this.url){OpenLayers.Layer.XYZ.prototype.drawTileFromQueue.apply(this,arguments);}},getURL:function(bounds){var xyz=this.getXYZ(bounds),x=xyz.x,y=xyz.y,z=xyz.z;var quadDigits=[];for(var i=z;i>0;--i){var digit='0';var mask=1<<(i-1);if((x&mask)!=0){digit++;}
+if((y&mask)!=0){digit++;digit++;}
+quadDigits.push(digit);}
+var quadKey=quadDigits.join("");var url=this.selectUrl(''+x+y+z,this.url);return OpenLayers.String.format(url,{'quadkey':quadKey});},updateAttribution:function(){var metadata=this.metadata;if(!metadata.resourceSets||!this.map||!this.map.center){return;}
+var res=metadata.resourceSets[0].resources[0];var extent=this.map.getExtent().transform(this.map.getProjectionObject(),new OpenLayers.Projection("EPSG:4326"));var providers=res.imageryProviders,zoom=this.serverResolutions.indexOf(this.getServerResolution()),copyrights="",provider,i,ii,j,jj,bbox,coverage;for(i=0,ii=providers.length;i<ii;++i){provider=providers[i];for(j=0,jj=provider.coverageAreas.length;j<jj;++j){coverage=provider.coverageAreas[j];bbox=OpenLayers.Bounds.fromArray(coverage.bbox,true);if(extent.intersectsBounds(bbox)&&zoom<=coverage.zoomMax&&zoom>=coverage.zoomMin){copyrights+=provider.attribution+" ";}}}
+this.attribution=OpenLayers.String.format(this.attributionTemplate,{type:this.type.toLowerCase(),logo:metadata.brandLogoUri,copyrights:copyrights});this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"attribution"});},setMap:function(){OpenLayers.Layer.XYZ.prototype.setMap.apply(this,arguments);this.map.events.register("moveend",this,this.updateAttribution);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Bing(this.options);}
+obj=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[obj]);return obj;},destroy:function(){this.map&&this.map.events.unregister("moveend",this,this.updateAttribution);OpenLayers.Layer.XYZ.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Layer.Bing"});OpenLayers.Layer.Bing.processMetadata=function(metadata){this.metadata=metadata;this.initLayer();var script=document.getElementById(this._callbackId);script.parentNode.removeChild(script);window[this._callbackId]=undefined;delete this._callbackId;};OpenLayers.Layer.PointGrid=OpenLayers.Class(OpenLayers.Layer.Vector,{dx:null,dy:null,ratio:1.5,maxFeatures:250,rotation:0,origin:null,gridBounds:null,initialize:function(config){config=config||{};OpenLayers.Layer.Vector.prototype.initialize.apply(this,[config.name,config]);},setMap:function(map){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);map.events.register("moveend",this,this.onMoveEnd);},removeMap:function(map){map.events.unregister("moveend",this,this.onMoveEnd);OpenLayers.Layer.Vector.prototype.removeMap.apply(this,arguments);},setRatio:function(ratio){this.ratio=ratio;this.updateGrid(true);},setMaxFeatures:function(maxFeatures){this.maxFeatures=maxFeatures;this.updateGrid(true);},setSpacing:function(dx,dy){this.dx=dx;this.dy=dy||dx;this.updateGrid(true);},setOrigin:function(origin){this.origin=origin;this.updateGrid(true);},getOrigin:function(){if(!this.origin){this.origin=this.map.getExtent().getCenterLonLat();}
+return this.origin;},setRotation:function(rotation){this.rotation=rotation;this.updateGrid(true);},onMoveEnd:function(){this.updateGrid();},getViewBounds:function(){var bounds=this.map.getExtent();if(this.rotation){var origin=this.getOrigin();var rotationOrigin=new OpenLayers.Geometry.Point(origin.lon,origin.lat);var rect=bounds.toGeometry();rect.rotate(-this.rotation,rotationOrigin);bounds=rect.getBounds();}
+return bounds;},updateGrid:function(force){if(force||this.invalidBounds()){var viewBounds=this.getViewBounds();var origin=this.getOrigin();var rotationOrigin=new OpenLayers.Geometry.Point(origin.lon,origin.lat);var viewBoundsWidth=viewBounds.getWidth();var viewBoundsHeight=viewBounds.getHeight();var aspectRatio=viewBoundsWidth/viewBoundsHeight;var maxHeight=Math.sqrt(this.dx*this.dy*this.maxFeatures/aspectRatio);var maxWidth=maxHeight*aspectRatio;var gridWidth=Math.min(viewBoundsWidth*this.ratio,maxWidth);var gridHeight=Math.min(viewBoundsHeight*this.ratio,maxHeight);var center=viewBounds.getCenterLonLat();this.gridBounds=new OpenLayers.Bounds(center.lon-(gridWidth/2),center.lat-(gridHeight/2),center.lon+(gridWidth/2),center.lat+(gridHeight/2));var rows=Math.floor(gridHeight/this.dy);var cols=Math.floor(gridWidth/this.dx);var gridLeft=origin.lon+(this.dx*Math.ceil((this.gridBounds.left-origin.lon)/this.dx));var gridBottom=origin.lat+(this.dy*Math.ceil((this.gridBounds.bottom-origin.lat)/this.dy));var features=new Array(rows*cols);var x,y,point;for(var i=0;i<cols;++i){x=gridLeft+(i*this.dx);for(var j=0;j<rows;++j){y=gridBottom+(j*this.dy);point=new OpenLayers.Geometry.Point(x,y);if(this.rotation){point.rotate(this.rotation,rotationOrigin);}
+features[(i*rows)+j]=new OpenLayers.Feature.Vector(point);}}
+this.destroyFeatures(this.features,{silent:true});this.addFeatures(features,{silent:true});}},invalidBounds:function(){return!this.gridBounds||!this.gridBounds.containsBounds(this.getViewBounds());},CLASS_NAME:"OpenLayers.Layer.PointGrid"});OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,mousePosition:null,interval:0,delta:0,cumulative:true,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this);},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null;},onWheelEvent:function(e){if(!this.map||!this.checkModifiers(e)){return;}
+var overScrollableDiv=false;var overLayerDiv=false;var overMapDiv=false;var elem=OpenLayers.Event.element(e);while((elem!=null)&&!overMapDiv&&!overScrollableDiv){if(!overScrollableDiv){try{if(elem.currentStyle){overflow=elem.currentStyle["overflow"];}else{var style=document.defaultView.getComputedStyle(elem,null);var overflow=style.getPropertyValue("overflow");}
+overScrollableDiv=(overflow&&(overflow=="auto")||(overflow=="scroll"));}catch(err){}}
+if(!overLayerDiv){for(var i=0,len=this.map.layers.length;i<len;i++){if(elem==this.map.layers[i].div||elem==this.map.layers[i].pane){overLayerDiv=true;break;}}}
+overMapDiv=(elem==this.map.div);elem=elem.parentNode;}
+if(!overScrollableDiv&&overMapDiv){if(overLayerDiv){var delta=0;if(!e){e=window.event;}
+if(e.wheelDelta){delta=e.wheelDelta/120;if(window.opera&&window.opera.version()<9.2){delta=-delta;}}else if(e.detail){delta=-e.detail/3;}
+this.delta=this.delta+delta;if(this.interval){window.clearTimeout(this._timeoutId);this._timeoutId=window.setTimeout(OpenLayers.Function.bind(function(){this.wheelZoom(e);},this),this.interval);}else{this.wheelZoom(e);}}
+OpenLayers.Event.stop(e);}},wheelZoom:function(e){var delta=this.delta;this.delta=0;if(delta){if(this.mousePosition){e.xy=this.mousePosition;}
+if(!e.xy){e.xy=this.map.getPixelFromLonLat(this.map.getCenter());}
+if(delta<0){this.callback("down",[e,this.cumulative?delta:-1]);}else{this.callback("up",[e,this.cumulative?delta:1]);}}},mousemove:function(evt){this.mousePosition=evt.xy;},activate:function(evt){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.observe(window,"mousewheel",wheelListener);OpenLayers.Event.observe(document,"mousewheel",wheelListener);return true;}else{return false;}},deactivate:function(evt){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.stopObserving(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.stopObserving(window,"mousewheel",wheelListener);OpenLayers.Event.stopObserving(document,"mousewheel",wheelListener);return true;}else{return false;}},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Format.WMSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.1",profile:null,CLASS_NAME:"OpenLayers.Format.WMSCapabilities"});OpenLayers.Format.WMSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{wms:"http://www.opengis.net/wms",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"wms",read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var raw=data;if(data&&data.nodeType==9){data=data.documentElement;}
+var capabilities={};this.readNode(data,capabilities);if(capabilities.service===undefined){var parser=new OpenLayers.Format.OGCExceptionReport();capabilities.error=parser.read(raw);}
+return capabilities;},readers:{"wms":{"Service":function(node,obj){obj.service={};this.readChildNodes(node,obj.service);},"Name":function(node,obj){obj.name=this.getChildValue(node);},"Title":function(node,obj){obj.title=this.getChildValue(node);},"Abstract":function(node,obj){obj["abstract"]=this.getChildValue(node);},"BoundingBox":function(node,obj){var bbox={};bbox.bbox=[parseFloat(node.getAttribute("minx")),parseFloat(node.getAttribute("miny")),parseFloat(node.getAttribute("maxx")),parseFloat(node.getAttribute("maxy"))];var res={x:parseFloat(node.getAttribute("resx")),y:parseFloat(node.getAttribute("resy"))};if(!(isNaN(res.x)&&isNaN(res.y))){bbox.res=res;}
+return bbox;},"OnlineResource":function(node,obj){obj.href=this.getAttributeNS(node,this.namespaces.xlink,"href");},"ContactInformation":function(node,obj){obj.contactInformation={};this.readChildNodes(node,obj.contactInformation);},"ContactPersonPrimary":function(node,obj){obj.personPrimary={};this.readChildNodes(node,obj.personPrimary);},"ContactPerson":function(node,obj){obj.person=this.getChildValue(node);},"ContactOrganization":function(node,obj){obj.organization=this.getChildValue(node);},"ContactPosition":function(node,obj){obj.position=this.getChildValue(node);},"ContactAddress":function(node,obj){obj.contactAddress={};this.readChildNodes(node,obj.contactAddress);},"AddressType":function(node,obj){obj.type=this.getChildValue(node);},"Address":function(node,obj){obj.address=this.getChildValue(node);},"City":function(node,obj){obj.city=this.getChildValue(node);},"StateOrProvince":function(node,obj){obj.stateOrProvince=this.getChildValue(node);},"PostCode":function(node,obj){obj.postcode=this.getChildValue(node);},"Country":function(node,obj){obj.country=this.getChildValue(node);},"ContactVoiceTelephone":function(node,obj){obj.phone=this.getChildValue(node);},"ContactFacsimileTelephone":function(node,obj){obj.fax=this.getChildValue(node);},"ContactElectronicMailAddress":function(node,obj){obj.email=this.getChildValue(node);},"Fees":function(node,obj){var fees=this.getChildValue(node);if(fees&&fees.toLowerCase()!="none"){obj.fees=fees;}},"AccessConstraints":function(node,obj){var constraints=this.getChildValue(node);if(constraints&&constraints.toLowerCase()!="none"){obj.accessConstraints=constraints;}},"Capability":function(node,obj){obj.capability={nestedLayers:[],layers:[]};this.readChildNodes(node,obj.capability);},"Request":function(node,obj){obj.request={};this.readChildNodes(node,obj.request);},"GetCapabilities":function(node,obj){obj.getcapabilities={formats:[]};this.readChildNodes(node,obj.getcapabilities);},"Format":function(node,obj){if(OpenLayers.Util.isArray(obj.formats)){obj.formats.push(this.getChildValue(node));}else{obj.format=this.getChildValue(node);}},"DCPType":function(node,obj){this.readChildNodes(node,obj);},"HTTP":function(node,obj){this.readChildNodes(node,obj);},"Get":function(node,obj){obj.get={};this.readChildNodes(node,obj.get);if(!obj.href){obj.href=obj.get.href;}},"Post":function(node,obj){obj.post={};this.readChildNodes(node,obj.post);if(!obj.href){obj.href=obj.get.href;}},"GetMap":function(node,obj){obj.getmap={formats:[]};this.readChildNodes(node,obj.getmap);},"GetFeatureInfo":function(node,obj){obj.getfeatureinfo={formats:[]};this.readChildNodes(node,obj.getfeatureinfo);},"Exception":function(node,obj){obj.exception={formats:[]};this.readChildNodes(node,obj.exception);},"Layer":function(node,obj){var parentLayer,capability;if(obj.capability){capability=obj.capability;parentLayer=obj;}else{capability=obj;}
+var attrNode=node.getAttributeNode("queryable");var queryable=(attrNode&&attrNode.specified)?node.getAttribute("queryable"):null;attrNode=node.getAttributeNode("cascaded");var cascaded=(attrNode&&attrNode.specified)?node.getAttribute("cascaded"):null;attrNode=node.getAttributeNode("opaque");var opaque=(attrNode&&attrNode.specified)?node.getAttribute('opaque'):null;var noSubsets=node.getAttribute('noSubsets');var fixedWidth=node.getAttribute('fixedWidth');var fixedHeight=node.getAttribute('fixedHeight');var parent=parentLayer||{},extend=OpenLayers.Util.extend;var layer={nestedLayers:[],styles:parentLayer?[].concat(parentLayer.styles):[],srs:parentLayer?extend({},parent.srs):{},metadataURLs:[],bbox:parentLayer?extend({},parent.bbox):{},llbbox:parent.llbbox,dimensions:parentLayer?extend({},parent.dimensions):{},authorityURLs:parentLayer?extend({},parent.authorityURLs):{},identifiers:{},keywords:[],queryable:(queryable&&queryable!=="")?(queryable==="1"||queryable==="true"):(parent.queryable||false),cascaded:(cascaded!==null)?parseInt(cascaded):(parent.cascaded||0),opaque:opaque?(opaque==="1"||opaque==="true"):(parent.opaque||false),noSubsets:(noSubsets!==null)?(noSubsets==="1"||noSubsets==="true"):(parent.noSubsets||false),fixedWidth:(fixedWidth!=null)?parseInt(fixedWidth):(parent.fixedWidth||0),fixedHeight:(fixedHeight!=null)?parseInt(fixedHeight):(parent.fixedHeight||0),minScale:parent.minScale,maxScale:parent.maxScale,attribution:parent.attribution};obj.nestedLayers.push(layer);layer.capability=capability;this.readChildNodes(node,layer);delete layer.capability;if(layer.name){var parts=layer.name.split(":"),request=capability.request,gfi=request.getfeatureinfo;if(parts.length>0){layer.prefix=parts[0];}
+capability.layers.push(layer);if(layer.formats===undefined){layer.formats=request.getmap.formats;}
+if(layer.infoFormats===undefined&&gfi){layer.infoFormats=gfi.formats;}}},"Attribution":function(node,obj){obj.attribution={};this.readChildNodes(node,obj.attribution);},"LogoURL":function(node,obj){obj.logo={width:node.getAttribute("width"),height:node.getAttribute("height")};this.readChildNodes(node,obj.logo);},"Style":function(node,obj){var style={};obj.styles.push(style);this.readChildNodes(node,style);},"LegendURL":function(node,obj){var legend={width:node.getAttribute("width"),height:node.getAttribute("height")};obj.legend=legend;this.readChildNodes(node,legend);},"MetadataURL":function(node,obj){var metadataURL={type:node.getAttribute("type")};obj.metadataURLs.push(metadataURL);this.readChildNodes(node,metadataURL);},"DataURL":function(node,obj){obj.dataURL={};this.readChildNodes(node,obj.dataURL);},"FeatureListURL":function(node,obj){obj.featureListURL={};this.readChildNodes(node,obj.featureListURL);},"AuthorityURL":function(node,obj){var name=node.getAttribute("name");var authority={};this.readChildNodes(node,authority);obj.authorityURLs[name]=authority.href;},"Identifier":function(node,obj){var authority=node.getAttribute("authority");obj.identifiers[authority]=this.getChildValue(node);},"KeywordList":function(node,obj){this.readChildNodes(node,obj);},"SRS":function(node,obj){obj.srs[this.getChildValue(node)]=true;}}},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1"});OpenLayers.Format.WMSCapabilities.v1_3=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1,{readers:{"wms":OpenLayers.Util.applyDefaults({"WMS_Capabilities":function(node,obj){this.readChildNodes(node,obj);},"LayerLimit":function(node,obj){obj.layerLimit=parseInt(this.getChildValue(node));},"MaxWidth":function(node,obj){obj.maxWidth=parseInt(this.getChildValue(node));},"MaxHeight":function(node,obj){obj.maxHeight=parseInt(this.getChildValue(node));},"BoundingBox":function(node,obj){var bbox=OpenLayers.Format.WMSCapabilities.v1.prototype.readers["wms"].BoundingBox.apply(this,[node,obj]);bbox.srs=node.getAttribute("CRS");obj.bbox[bbox.srs]=bbox;},"CRS":function(node,obj){this.readers.wms.SRS.apply(this,[node,obj]);},"EX_GeographicBoundingBox":function(node,obj){obj.llbbox=[];this.readChildNodes(node,obj.llbbox);},"westBoundLongitude":function(node,obj){obj[0]=this.getChildValue(node);},"eastBoundLongitude":function(node,obj){obj[2]=this.getChildValue(node);},"southBoundLatitude":function(node,obj){obj[1]=this.getChildValue(node);},"northBoundLatitude":function(node,obj){obj[3]=this.getChildValue(node);},"MinScaleDenominator":function(node,obj){obj.maxScale=parseFloat(this.getChildValue(node)).toPrecision(16);},"MaxScaleDenominator":function(node,obj){obj.minScale=parseFloat(this.getChildValue(node)).toPrecision(16);},"Dimension":function(node,obj){var name=node.getAttribute("name").toLowerCase();var dim={name:name,units:node.getAttribute("units"),unitsymbol:node.getAttribute("unitSymbol"),nearestVal:node.getAttribute("nearestValue")==="1",multipleVal:node.getAttribute("multipleValues")==="1","default":node.getAttribute("default")||"",current:node.getAttribute("current")==="1",values:this.getChildValue(node).split(",")};obj.dimensions[dim.name]=dim;},"Keyword":function(node,obj){var keyword={value:this.getChildValue(node),vocabulary:node.getAttribute("vocabulary")};if(obj.keywords){obj.keywords.push(keyword);}}},OpenLayers.Format.WMSCapabilities.v1.prototype.readers["wms"]),"sld":{"UserDefinedSymbolization":function(node,obj){this.readers.wms.UserDefinedSymbolization.apply(this,[node,obj]);obj.userSymbols.inlineFeature=parseInt(node.getAttribute("InlineFeature"))==1;obj.userSymbols.remoteWCS=parseInt(node.getAttribute("RemoteWCS"))==1;},"DescribeLayer":function(node,obj){this.readers.wms.DescribeLayer.apply(this,[node,obj]);},"GetLegendGraphic":function(node,obj){this.readers.wms.GetLegendGraphic.apply(this,[node,obj]);}}},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_3"});OpenLayers.Format.WMSCapabilities.v1_3_0=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_3,{version:"1.3.0",CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_3_0"});OpenLayers.Format.WFST.v1_0_0=OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0,OpenLayers.Format.WFST.v1,{version:"1.0.0",srsNameInQuery:false,schemaLocations:{"wfs":"http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd"},initialize:function(options){OpenLayers.Format.Filter.v1_0_0.prototype.initialize.apply(this,[options]);OpenLayers.Format.WFST.v1.prototype.initialize.apply(this,[options]);},readNode:function(node,obj,first){return OpenLayers.Format.GML.v2.prototype.readNode.apply(this,arguments);},readers:{"wfs":OpenLayers.Util.applyDefaults({"WFS_TransactionResponse":function(node,obj){obj.insertIds=[];obj.success=false;this.readChildNodes(node,obj);},"InsertResult":function(node,container){var obj={fids:[]};this.readChildNodes(node,obj);container.insertIds.push(obj.fids[0]);},"TransactionResult":function(node,obj){this.readChildNodes(node,obj);},"Status":function(node,obj){this.readChildNodes(node,obj);},"SUCCESS":function(node,obj){obj.success=true;}},OpenLayers.Format.WFST.v1.prototype.readers["wfs"]),"gml":OpenLayers.Format.GML.v2.prototype.readers["gml"],"feature":OpenLayers.Format.GML.v2.prototype.readers["feature"],"ogc":OpenLayers.Format.Filter.v1_0_0.prototype.readers["ogc"]},writers:{"wfs":OpenLayers.Util.applyDefaults({"Query":function(options){options=OpenLayers.Util.extend({featureNS:this.featureNS,featurePrefix:this.featurePrefix,featureType:this.featureType,srsName:this.srsName,srsNameInQuery:this.srsNameInQuery},options);var prefix=options.featurePrefix;var node=this.createElementNSPlus("wfs:Query",{attributes:{typeName:(prefix?prefix+":":"")+
+options.featureType}});if(options.srsNameInQuery&&options.srsName){node.setAttribute("srsName",options.srsName);}
+if(options.featureNS){node.setAttribute("xmlns:"+prefix,options.featureNS);}
+if(options.propertyNames){for(var i=0,len=options.propertyNames.length;i<len;i++){this.writeNode("ogc:PropertyName",{property:options.propertyNames[i]},node);}}
+if(options.filter){this.setFilterProperty(options.filter);this.writeNode("ogc:Filter",options.filter,node);}
+return node;}},OpenLayers.Format.WFST.v1.prototype.writers["wfs"]),"gml":OpenLayers.Format.GML.v2.prototype.writers["gml"],"feature":OpenLayers.Format.GML.v2.prototype.writers["feature"],"ogc":OpenLayers.Format.Filter.v1_0_0.prototype.writers["ogc"]},CLASS_NAME:"OpenLayers.Format.WFST.v1_0_0"});OpenLayers.ElementsIndexer=OpenLayers.Class({maxZIndex:null,order:null,indices:null,compare:null,initialize:function(yOrdering){this.compare=yOrdering?OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER:OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;this.clear();},insert:function(newNode){if(this.exists(newNode)){this.remove(newNode);}
+var nodeId=newNode.id;this.determineZIndex(newNode);var leftIndex=-1;var rightIndex=this.order.length;var middle;while(rightIndex-leftIndex>1){middle=parseInt((leftIndex+rightIndex)/2);var placement=this.compare(this,newNode,OpenLayers.Util.getElement(this.order[middle]));if(placement>0){leftIndex=middle;}else{rightIndex=middle;}}
+this.order.splice(rightIndex,0,nodeId);this.indices[nodeId]=this.getZIndex(newNode);return this.getNextElement(rightIndex);},remove:function(node){var nodeId=node.id;var arrayIndex=OpenLayers.Util.indexOf(this.order,nodeId);if(arrayIndex>=0){this.order.splice(arrayIndex,1);delete this.indices[nodeId];if(this.order.length>0){var lastId=this.order[this.order.length-1];this.maxZIndex=this.indices[lastId];}else{this.maxZIndex=0;}}},clear:function(){this.order=[];this.indices={};this.maxZIndex=0;},exists:function(node){return(this.indices[node.id]!=null);},getZIndex:function(node){return node._style.graphicZIndex;},determineZIndex:function(node){var zIndex=node._style.graphicZIndex;if(zIndex==null){zIndex=this.maxZIndex;node._style.graphicZIndex=zIndex;}else if(zIndex>this.maxZIndex){this.maxZIndex=zIndex;}},getNextElement:function(index){var nextIndex=index+1;if(nextIndex<this.order.length){var nextElement=OpenLayers.Util.getElement(this.order[nextIndex]);if(nextElement==undefined){nextElement=this.getNextElement(nextIndex);}
+return nextElement;}else{return null;}},CLASS_NAME:"OpenLayers.ElementsIndexer"});OpenLayers.ElementsIndexer.IndexingMethods={Z_ORDER:function(indexer,newNode,nextNode){var newZIndex=indexer.getZIndex(newNode);var returnVal=0;if(nextNode){var nextZIndex=indexer.getZIndex(nextNode);returnVal=newZIndex-nextZIndex;}
+return returnVal;},Z_ORDER_DRAWING_ORDER:function(indexer,newNode,nextNode){var returnVal=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(indexer,newNode,nextNode);if(nextNode&&returnVal==0){returnVal=1;}
+return returnVal;},Z_ORDER_Y_ORDER:function(indexer,newNode,nextNode){var returnVal=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(indexer,newNode,nextNode);if(nextNode&&returnVal===0){var result=nextNode._boundsBottom-newNode._boundsBottom;returnVal=(result===0)?1:result;}
+return returnVal;}};OpenLayers.Renderer.Elements=OpenLayers.Class(OpenLayers.Renderer,{rendererRoot:null,root:null,vectorRoot:null,textRoot:null,xmlns:null,xOffset:0,indexer:null,BACKGROUND_ID_SUFFIX:"_background",LABEL_ID_SUFFIX:"_label",LABEL_OUTLINE_SUFFIX:"_outline",initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.rendererRoot=this.createRenderRoot();this.root=this.createRoot("_root");this.vectorRoot=this.createRoot("_vroot");this.textRoot=this.createRoot("_troot");this.root.appendChild(this.vectorRoot);this.root.appendChild(this.textRoot);this.rendererRoot.appendChild(this.root);this.container.appendChild(this.rendererRoot);if(options&&(options.zIndexing||options.yOrdering)){this.indexer=new OpenLayers.ElementsIndexer(options.yOrdering);}},destroy:function(){this.clear();this.rendererRoot=null;this.root=null;this.xmlns=null;OpenLayers.Renderer.prototype.destroy.apply(this,arguments);},clear:function(){var child;var root=this.vectorRoot;if(root){while(child=root.firstChild){root.removeChild(child);}}
+root=this.textRoot;if(root){while(child=root.firstChild){root.removeChild(child);}}
+if(this.indexer){this.indexer.clear();}},setExtent:function(extent,resolutionChanged){var coordSysUnchanged=OpenLayers.Renderer.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var rightOfDateLine,ratio=extent.getWidth()/this.map.getExtent().getWidth(),extent=extent.scale(1/ratio),world=this.map.getMaxExtent();if(world.right>extent.left&&world.right<extent.right){rightOfDateLine=true;}else if(world.left>extent.left&&world.left<extent.right){rightOfDateLine=false;}
+if(rightOfDateLine!==this.rightOfDateLine||resolutionChanged){coordSysUnchanged=false;this.xOffset=rightOfDateLine===true?world.getWidth()/resolution:0;}
+this.rightOfDateLine=rightOfDateLine;}
+return coordSysUnchanged;},getNodeType:function(geometry,style){},drawGeometry:function(geometry,style,featureId){var className=geometry.CLASS_NAME;var rendered=true;if((className=="OpenLayers.Geometry.Collection")||(className=="OpenLayers.Geometry.MultiPoint")||(className=="OpenLayers.Geometry.MultiLineString")||(className=="OpenLayers.Geometry.MultiPolygon")){for(var i=0,len=geometry.components.length;i<len;i++){rendered=this.drawGeometry(geometry.components[i],style,featureId)&&rendered;}
+return rendered;}
+rendered=false;var removeBackground=false;if(style.display!="none"){if(style.backgroundGraphic){this.redrawBackgroundNode(geometry.id,geometry,style,featureId);}else{removeBackground=true;}
+rendered=this.redrawNode(geometry.id,geometry,style,featureId);}
+if(rendered==false){var node=document.getElementById(geometry.id);if(node){if(node._style.backgroundGraphic){removeBackground=true;}
+node.parentNode.removeChild(node);}}
+if(removeBackground){var node=document.getElementById(geometry.id+this.BACKGROUND_ID_SUFFIX);if(node){node.parentNode.removeChild(node);}}
+return rendered;},redrawNode:function(id,geometry,style,featureId){style=this.applyDefaultSymbolizer(style);var node=this.nodeFactory(id,this.getNodeType(geometry,style));node._featureId=featureId;node._boundsBottom=geometry.getBounds().bottom;node._geometryClass=geometry.CLASS_NAME;node._style=style;var drawResult=this.drawGeometryNode(node,geometry,style);if(drawResult===false){return false;}
+node=drawResult.node;if(this.indexer){var insert=this.indexer.insert(node);if(insert){this.vectorRoot.insertBefore(node,insert);}else{this.vectorRoot.appendChild(node);}}else{if(node.parentNode!==this.vectorRoot){this.vectorRoot.appendChild(node);}}
+this.postDraw(node);return drawResult.complete;},redrawBackgroundNode:function(id,geometry,style,featureId){var backgroundStyle=OpenLayers.Util.extend({},style);backgroundStyle.externalGraphic=backgroundStyle.backgroundGraphic;backgroundStyle.graphicXOffset=backgroundStyle.backgroundXOffset;backgroundStyle.graphicYOffset=backgroundStyle.backgroundYOffset;backgroundStyle.graphicZIndex=backgroundStyle.backgroundGraphicZIndex;backgroundStyle.graphicWidth=backgroundStyle.backgroundWidth||backgroundStyle.graphicWidth;backgroundStyle.graphicHeight=backgroundStyle.backgroundHeight||backgroundStyle.graphicHeight;backgroundStyle.backgroundGraphic=null;backgroundStyle.backgroundXOffset=null;backgroundStyle.backgroundYOffset=null;backgroundStyle.backgroundGraphicZIndex=null;return this.redrawNode(id+this.BACKGROUND_ID_SUFFIX,geometry,backgroundStyle,null);},drawGeometryNode:function(node,geometry,style){style=style||node._style;var options={'isFilled':style.fill===undefined?true:style.fill,'isStroked':style.stroke===undefined?!!style.strokeWidth:style.stroke};var drawn;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.graphic===false){options.isFilled=false;options.isStroked=false;}
+drawn=this.drawPoint(node,geometry);break;case"OpenLayers.Geometry.LineString":options.isFilled=false;drawn=this.drawLineString(node,geometry);break;case"OpenLayers.Geometry.LinearRing":drawn=this.drawLinearRing(node,geometry);break;case"OpenLayers.Geometry.Polygon":drawn=this.drawPolygon(node,geometry);break;case"OpenLayers.Geometry.Rectangle":drawn=this.drawRectangle(node,geometry);break;default:break;}
+node._options=options;if(drawn!=false){return{node:this.setStyle(node,style,options,geometry),complete:drawn};}else{return false;}},postDraw:function(node){},drawPoint:function(node,geometry){},drawLineString:function(node,geometry){},drawLinearRing:function(node,geometry){},drawPolygon:function(node,geometry){},drawRectangle:function(node,geometry){},drawCircle:function(node,geometry){},removeText:function(featureId){var label=document.getElementById(featureId+this.LABEL_ID_SUFFIX);if(label){this.textRoot.removeChild(label);}
+var outline=document.getElementById(featureId+this.LABEL_OUTLINE_SUFFIX);if(outline){this.textRoot.removeChild(outline);}},getFeatureIdFromEvent:function(evt){var target=evt.target;var useElement=target&&target.correspondingUseElement;var node=useElement?useElement:(target||evt.srcElement);return node._featureId;},eraseGeometry:function(geometry,featureId){if((geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPoint")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiLineString")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPolygon")||(geometry.CLASS_NAME=="OpenLayers.Geometry.Collection")){for(var i=0,len=geometry.components.length;i<len;i++){this.eraseGeometry(geometry.components[i],featureId);}}else{var element=OpenLayers.Util.getElement(geometry.id);if(element&&element.parentNode){if(element.geometry){element.geometry.destroy();element.geometry=null;}
+element.parentNode.removeChild(element);if(this.indexer){this.indexer.remove(element);}
+if(element._style.backgroundGraphic){var backgroundId=geometry.id+this.BACKGROUND_ID_SUFFIX;var bElem=OpenLayers.Util.getElement(backgroundId);if(bElem&&bElem.parentNode){bElem.parentNode.removeChild(bElem);}}}}},nodeFactory:function(id,type){var node=OpenLayers.Util.getElement(id);if(node){if(!this.nodeTypeCompare(node,type)){node.parentNode.removeChild(node);node=this.nodeFactory(id,type);}}else{node=this.createNode(type,id);}
+return node;},nodeTypeCompare:function(node,type){},createNode:function(type,id){},moveRoot:function(renderer){var root=this.root;if(renderer.root.parentNode==this.rendererRoot){root=renderer.root;}
+root.parentNode.removeChild(root);renderer.rendererRoot.appendChild(root);},getRenderLayerId:function(){return this.root.parentNode.parentNode.id;},isComplexSymbol:function(graphicName){return(graphicName!="circle")&&!!graphicName;},CLASS_NAME:"OpenLayers.Renderer.Elements"});OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(url){url=url||window.location.href;var parameters=OpenLayers.Util.getParameters(url);var index=url.indexOf('#');if(index>0){url='?'+url.substring(index+1,url.length);OpenLayers.Util.extend(parameters,OpenLayers.Util.getParameters(url));}
+return parameters;},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0,len=this.map.controls.length;i<len;i++){var control=this.map.controls[i];if((control!=this)&&(control.CLASS_NAME=="OpenLayers.Control.ArgParser")){if(control.displayProjection!=this.displayProjection){this.displayProjection=control.displayProjection;}
+break;}}
+if(i==this.map.controls.length){var args=this.getParameters();if(args.layers){this.layers=args.layers;this.map.events.register('addlayer',this,this.configureLayers);this.configureLayers();}
+if(args.lat&&args.lon){this.center=new OpenLayers.LonLat(parseFloat(args.lon),parseFloat(args.lat));if(args.zoom){this.zoom=parseFloat(args.zoom);}
+this.map.events.register('changebaselayer',this,this.setCenter);this.setCenter();}}},setCenter:function(){if(this.map.baseLayer){this.map.events.unregister('changebaselayer',this,this.setCenter);if(this.displayProjection){this.center.transform(this.displayProjection,this.map.getProjectionObject());}
+this.map.setCenter(this.center,this.zoom);}},configureLayers:function(){if(this.layers.length==this.map.layers.length){this.map.events.unregister('addlayer',this,this.configureLayers);for(var i=0,len=this.layers.length;i<len;i++){var layer=this.map.layers[i];var c=this.layers.charAt(i);if(c=="B"){this.map.setBaseLayer(layer);}else if((c=="T")||(c=="F")){layer.setVisibility(c=="T");}}}},CLASS_NAME:"OpenLayers.Control.ArgParser"});OpenLayers.Control.Permalink=OpenLayers.Class(OpenLayers.Control,{argParserClass:OpenLayers.Control.ArgParser,element:null,anchor:false,base:'',displayProjection:null,initialize:function(element,base,options){if(element!==null&&typeof element=='object'&&!OpenLayers.Util.isElement(element)){options=element;this.base=document.location.href;OpenLayers.Control.prototype.initialize.apply(this,[options]);if(this.element!=null){this.element=OpenLayers.Util.getElement(this.element);}}
+else{OpenLayers.Control.prototype.initialize.apply(this,[options]);this.element=OpenLayers.Util.getElement(element);this.base=base||document.location.href;}},destroy:function(){if(this.element&&this.element.parentNode==this.div){this.div.removeChild(this.element);this.element=null;}
+if(this.map){this.map.events.unregister('moveend',this,this.updateLink);}
+OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0,len=this.map.controls.length;i<len;i++){var control=this.map.controls[i];if(control.CLASS_NAME==this.argParserClass.CLASS_NAME){if(control.displayProjection!=this.displayProjection){this.displayProjection=control.displayProjection;}
+break;}}
+if(i==this.map.controls.length){this.map.addControl(new this.argParserClass({'displayProjection':this.displayProjection}));}},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.element&&!this.anchor){this.element=document.createElement("a");this.element.innerHTML=OpenLayers.i18n("Permalink");this.element.href="";this.div.appendChild(this.element);}
+this.map.events.on({'moveend':this.updateLink,'changelayer':this.updateLink,'changebaselayer':this.updateLink,scope:this});this.updateLink();return this.div;},updateLink:function(){var separator=this.anchor?'#':'?';var href=this.base;var anchor=null;if(href.indexOf("#")!=-1&&this.anchor==false){anchor=href.substring(href.indexOf("#"),href.length);}
+if(href.indexOf(separator)!=-1){href=href.substring(0,href.indexOf(separator));}
+var splits=href.split("#");href=splits[0]+separator+OpenLayers.Util.getParameterString(this.createParams());if(anchor){href+=anchor;}
+if(this.anchor&&!this.element){window.location.href=href;}
+else{this.element.href=href;}},createParams:function(center,zoom,layers){center=center||this.map.getCenter();var params=OpenLayers.Util.getParameters(this.base);if(center){params.zoom=zoom||this.map.getZoom();var lat=center.lat;var lon=center.lon;if(this.displayProjection){var mapPosition=OpenLayers.Projection.transform({x:lon,y:lat},this.map.getProjectionObject(),this.displayProjection);lon=mapPosition.x;lat=mapPosition.y;}
+params.lat=Math.round(lat*100000)/100000;params.lon=Math.round(lon*100000)/100000;layers=layers||this.map.layers;params.layers='';for(var i=0,len=layers.length;i<len;i++){var layer=layers[i];if(layer.isBaseLayer){params.layers+=(layer==this.map.baseLayer)?"B":"0";}else{params.layers+=(layer.getVisibility())?"T":"F";}}}
+return params;},CLASS_NAME:"OpenLayers.Control.Permalink"});OpenLayers.Layer.TMS=OpenLayers.Class(OpenLayers.Layer.Grid,{serviceVersion:"1.0.0",layername:null,type:null,isBaseLayer:true,tileOrigin:null,serverResolutions:null,zoomOffset:0,initialize:function(name,url,options){var newArguments=[];newArguments.push(name,url,{},options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.TMS(this.name,this.url,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){bounds=this.adjustBounds(bounds);var res=this.getServerResolution();var x=Math.round((bounds.left-this.tileOrigin.lon)/(res*this.tileSize.w));var y=Math.round((bounds.bottom-this.tileOrigin.lat)/(res*this.tileSize.h));var z=this.serverResolutions!=null?OpenLayers.Util.indexOf(this.serverResolutions,res):this.getServerZoom()+this.zoomOffset;var path=this.serviceVersion+"/"+this.layername+"/"+z+"/"+x+"/"+y+"."+this.type;var url=this.url;if(OpenLayers.Util.isArray(url)){url=this.selectUrl(path,url);}
+return url+path;},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,this.map.maxExtent.bottom);}},CLASS_NAME:"OpenLayers.Layer.TMS"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:false,activate:function(){if(OpenLayers.Strategy.prototype.activate.apply(this,arguments)){this.layer.events.on({"refresh":this.load,scope:this});if(this.layer.visibility==true||this.preload){this.load();}else{this.layer.events.on({"visibilitychanged":this.load,scope:this});}
+return true;}
+return false;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.layer.events.un({"refresh":this.load,"visibilitychanged":this.load,scope:this});}
+return deactivated;},load:function(options){var layer=this.layer;layer.events.triggerEvent("loadstart");layer.protocol.read(OpenLayers.Util.applyDefaults({callback:OpenLayers.Function.bind(this.merge,this,layer.map.getProjectionObject()),filter:layer.filter},options));layer.events.un({"visibilitychanged":this.load,scope:this});},merge:function(mapProjection,resp){var layer=this.layer;layer.destroyFeatures();var features=resp.features;if(features&&features.length>0){if(!mapProjection.equals(layer.projection)){var geom;for(var i=0,len=features.length;i<len;++i){geom=features[i].geometry;if(geom){geom.transform(layer.projection,mapProjection);}}}
+layer.addFeatures(features);}
+layer.events.triggerEvent("loadend");},CLASS_NAME:"OpenLayers.Strategy.Fixed"});OpenLayers.Control.Zoom=OpenLayers.Class(OpenLayers.Control,{zoomInText:"+",zoomInId:"olZoomInLink",zoomOutText:"-",zoomOutId:"olZoomOutLink",draw:function(){var div=OpenLayers.Control.prototype.draw.apply(this),links=this.getOrCreateLinks(div),zoomIn=links.zoomIn,zoomOut=links.zoomOut,eventsInstance=this.map.events;if(zoomOut.parentNode!==div){eventsInstance=this.events;eventsInstance.attachToElement(zoomOut.parentNode);}
+eventsInstance.register("buttonclick",this,this.onZoomClick);this.zoomInLink=zoomIn;this.zoomOutLink=zoomOut;return div;},getOrCreateLinks:function(el){var zoomIn=document.getElementById(this.zoomInId),zoomOut=document.getElementById(this.zoomOutId);if(!zoomIn){zoomIn=document.createElement("a");zoomIn.href="#zoomIn";zoomIn.appendChild(document.createTextNode(this.zoomInText));zoomIn.className="olControlZoomIn";el.appendChild(zoomIn);}
+OpenLayers.Element.addClass(zoomIn,"olButton");if(!zoomOut){zoomOut=document.createElement("a");zoomOut.href="#zoomOut";zoomOut.appendChild(document.createTextNode(this.zoomOutText));zoomOut.className="olControlZoomOut";el.appendChild(zoomOut);}
+OpenLayers.Element.addClass(zoomOut,"olButton");return{zoomIn:zoomIn,zoomOut:zoomOut};},onZoomClick:function(evt){var button=evt.buttonElement;if(button===this.zoomInLink){this.map.zoomIn();}else if(button===this.zoomOutLink){this.map.zoomOut();}},destroy:function(){if(this.map){this.map.events.unregister("buttonclick",this,this.onZoomClick);}
+delete this.zoomInLink;delete this.zoomOutLink;OpenLayers.Control.prototype.destroy.apply(this);},CLASS_NAME:"OpenLayers.Control.Zoom"});OpenLayers.Layer.PointTrack=OpenLayers.Class(OpenLayers.Layer.Vector,{dataFrom:null,styleFrom:null,addNodes:function(pointFeatures,options){if(pointFeatures.length<2){throw new Error("At least two point features have to be added to "+"create a line from");}
+var lines=new Array(pointFeatures.length-1);var pointFeature,startPoint,endPoint;for(var i=0,len=pointFeatures.length;i<len;i++){pointFeature=pointFeatures[i];endPoint=pointFeature.geometry;if(!endPoint){var lonlat=pointFeature.lonlat;endPoint=new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat);}else if(endPoint.CLASS_NAME!="OpenLayers.Geometry.Point"){throw new TypeError("Only features with point geometries are supported.");}
+if(i>0){var attributes=(this.dataFrom!=null)?(pointFeatures[i+this.dataFrom].data||pointFeatures[i+this.dataFrom].attributes):null;var style=(this.styleFrom!=null)?(pointFeatures[i+this.styleFrom].style):null;var line=new OpenLayers.Geometry.LineString([startPoint,endPoint]);lines[i-1]=new OpenLayers.Feature.Vector(line,attributes,style);}
+startPoint=endPoint;}
+this.addFeatures(lines,options);},CLASS_NAME:"OpenLayers.Layer.PointTrack"});OpenLayers.Layer.PointTrack.SOURCE_NODE=-1;OpenLayers.Layer.PointTrack.TARGET_NODE=0;OpenLayers.Layer.PointTrack.dataFrom={'SOURCE_NODE':-1,'TARGET_NODE':0};OpenLayers.Protocol.WFS=function(options){options=OpenLayers.Util.applyDefaults(options,OpenLayers.Protocol.WFS.DEFAULTS);var cls=OpenLayers.Protocol.WFS["v"+options.version.replace(/\./g,"_")];if(!cls){throw"Unsupported WFS version: "+options.version;}
+return new cls(options);};OpenLayers.Protocol.WFS.fromWMSLayer=function(layer,options){var typeName,featurePrefix;var param=layer.params["LAYERS"];var parts=(OpenLayers.Util.isArray(param)?param[0]:param).split(":");if(parts.length>1){featurePrefix=parts[0];}
+typeName=parts.pop();var protocolOptions={url:layer.url,featureType:typeName,featurePrefix:featurePrefix,srsName:layer.projection&&layer.projection.getCode()||layer.map&&layer.map.getProjectionObject().getCode(),version:"1.1.0"};return new OpenLayers.Protocol.WFS(OpenLayers.Util.applyDefaults(options,protocolOptions));};OpenLayers.Protocol.WFS.DEFAULTS={"version":"1.0.0"};OpenLayers.Layer.Markers=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:false,markers:null,drawn:false,initialize:function(name,options){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.markers=[];},destroy:function(){this.clearMarkers();this.markers=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;for(var i=0,len=this.markers.length;i<len;i++){this.markers[i].setOpacity(this.opacity);}}},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);if(zoomChanged||!this.drawn){for(var i=0,len=this.markers.length;i<len;i++){this.drawMarker(this.markers[i]);}
+this.drawn=true;}},addMarker:function(marker){this.markers.push(marker);if(this.opacity<1){marker.setOpacity(this.opacity);}
+if(this.map&&this.map.getExtent()){marker.map=this.map;this.drawMarker(marker);}},removeMarker:function(marker){if(this.markers&&this.markers.length){OpenLayers.Util.removeItem(this.markers,marker);marker.erase();}},clearMarkers:function(){if(this.markers!=null){while(this.markers.length>0){this.removeMarker(this.markers[0]);}}},drawMarker:function(marker){var px=this.map.getLayerPxFromLonLat(marker.lonlat);if(px==null){marker.display(false);}else{if(!marker.isDrawn()){var markerImg=marker.draw(px);this.div.appendChild(markerImg);}else if(marker.icon){marker.icon.moveTo(px);}}},getDataExtent:function(){var maxExtent=null;if(this.markers&&(this.markers.length>0)){var maxExtent=new OpenLayers.Bounds();for(var i=0,len=this.markers.length;i<len;i++){var marker=this.markers[i];maxExtent.extend(marker.lonlat);}}
+return maxExtent;},CLASS_NAME:"OpenLayers.Layer.Markers"});OpenLayers.Control.Pan=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,slideRatio:null,direction:null,type:OpenLayers.Control.TYPE_BUTTON,initialize:function(direction,options){this.direction=direction;this.CLASS_NAME+=this.direction;OpenLayers.Control.prototype.initialize.apply(this,[options]);},trigger:function(){var getSlideFactor=OpenLayers.Function.bind(function(dim){return this.slideRatio?this.map.getSize()[dim]*this.slideRatio:this.slideFactor;},this);switch(this.direction){case OpenLayers.Control.Pan.NORTH:this.map.pan(0,-getSlideFactor("h"));break;case OpenLayers.Control.Pan.SOUTH:this.map.pan(0,getSlideFactor("h"));break;case OpenLayers.Control.Pan.WEST:this.map.pan(-getSlideFactor("w"),0);break;case OpenLayers.Control.Pan.EAST:this.map.pan(getSlideFactor("w"),0);break;}},CLASS_NAME:"OpenLayers.Control.Pan"});OpenLayers.Control.Pan.NORTH="North";OpenLayers.Control.Pan.SOUTH="South";OpenLayers.Control.Pan.EAST="East";OpenLayers.Control.Pan.WEST="West";OpenLayers.Format.CSWGetDomain=function(options){options=OpenLayers.Util.applyDefaults(options,OpenLayers.Format.CSWGetDomain.DEFAULTS);var cls=OpenLayers.Format.CSWGetDomain["v"+options.version.replace(/\./g,"_")];if(!cls){throw"Unsupported CSWGetDomain version: "+options.version;}
+return new cls(options);};OpenLayers.Format.CSWGetDomain.DEFAULTS={"version":"2.0.2"};OpenLayers.Format.CSWGetDomain.v2_0_2=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",csw:"http://www.opengis.net/cat/csw/2.0.2"},defaultPrefix:"csw",version:"2.0.2",schemaLocation:"http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd",PropertyName:null,ParameterName:null,read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var obj={};this.readNode(data,obj);return obj;},readers:{"csw":{"GetDomainResponse":function(node,obj){this.readChildNodes(node,obj);},"DomainValues":function(node,obj){if(!(OpenLayers.Util.isArray(obj.DomainValues))){obj.DomainValues=[];}
+var attrs=node.attributes;var domainValue={};for(var i=0,len=attrs.length;i<len;++i){domainValue[attrs[i].name]=attrs[i].nodeValue;}
+this.readChildNodes(node,domainValue);obj.DomainValues.push(domainValue);},"PropertyName":function(node,obj){obj.PropertyName=this.getChildValue(node);},"ParameterName":function(node,obj){obj.ParameterName=this.getChildValue(node);},"ListOfValues":function(node,obj){if(!(OpenLayers.Util.isArray(obj.ListOfValues))){obj.ListOfValues=[];}
+this.readChildNodes(node,obj.ListOfValues);},"Value":function(node,obj){var attrs=node.attributes;var value={};for(var i=0,len=attrs.length;i<len;++i){value[attrs[i].name]=attrs[i].nodeValue;}
+value.value=this.getChildValue(node);obj.push({Value:value});},"ConceptualScheme":function(node,obj){obj.ConceptualScheme={};this.readChildNodes(node,obj.ConceptualScheme);},"Name":function(node,obj){obj.Name=this.getChildValue(node);},"Document":function(node,obj){obj.Document=this.getChildValue(node);},"Authority":function(node,obj){obj.Authority=this.getChildValue(node);},"RangeOfValues":function(node,obj){obj.RangeOfValues={};this.readChildNodes(node,obj.RangeOfValues);},"MinValue":function(node,obj){var attrs=node.attributes;var value={};for(var i=0,len=attrs.length;i<len;++i){value[attrs[i].name]=attrs[i].nodeValue;}
+value.value=this.getChildValue(node);obj.MinValue=value;},"MaxValue":function(node,obj){var attrs=node.attributes;var value={};for(var i=0,len=attrs.length;i<len;++i){value[attrs[i].name]=attrs[i].nodeValue;}
+value.value=this.getChildValue(node);obj.MaxValue=value;}}},write:function(options){var node=this.writeNode("csw:GetDomain",options);return OpenLayers.Format.XML.prototype.write.apply(this,[node]);},writers:{"csw":{"GetDomain":function(options){var node=this.createElementNSPlus("csw:GetDomain",{attributes:{service:"CSW",version:this.version}});if(options.PropertyName||this.PropertyName){this.writeNode("csw:PropertyName",options.PropertyName||this.PropertyName,node);}else if(options.ParameterName||this.ParameterName){this.writeNode("csw:ParameterName",options.ParameterName||this.ParameterName,node);}
+this.readChildNodes(node,options);return node;},"PropertyName":function(value){var node=this.createElementNSPlus("csw:PropertyName",{value:value});return node;},"ParameterName":function(value){var node=this.createElementNSPlus("csw:ParameterName",{value:value});return node;}}},CLASS_NAME:"OpenLayers.Format.CSWGetDomain.v2_0_2"});OpenLayers.Format.ArcXML.Features=OpenLayers.Class(OpenLayers.Format.XML,{read:function(data){var axl=new OpenLayers.Format.ArcXML();var parsed=axl.read(data);return parsed.features.feature;}});OpenLayers.Control.Snapping=OpenLayers.Class(OpenLayers.Control,{DEFAULTS:{tolerance:10,node:true,edge:true,vertex:true},greedy:true,precedence:["node","vertex","edge"],resolution:null,geoToleranceCache:null,layer:null,feature:null,point:null,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.options=options||{};if(this.options.layer){this.setLayer(this.options.layer);}
+var defaults=OpenLayers.Util.extend({},this.options.defaults);this.defaults=OpenLayers.Util.applyDefaults(defaults,this.DEFAULTS);this.setTargets(this.options.targets);if(this.targets.length===0&&this.layer){this.addTargetLayer(this.layer);}
+this.geoToleranceCache={};},setLayer:function(layer){if(this.active){this.deactivate();this.layer=layer;this.activate();}else{this.layer=layer;}},setTargets:function(targets){this.targets=[];if(targets&&targets.length){var target;for(var i=0,len=targets.length;i<len;++i){target=targets[i];if(target instanceof OpenLayers.Layer.Vector){this.addTargetLayer(target);}else{this.addTarget(target);}}}},addTargetLayer:function(layer){this.addTarget({layer:layer});},addTarget:function(target){target=OpenLayers.Util.applyDefaults(target,this.defaults);target.nodeTolerance=target.nodeTolerance||target.tolerance;target.vertexTolerance=target.vertexTolerance||target.tolerance;target.edgeTolerance=target.edgeTolerance||target.tolerance;this.targets.push(target);},removeTargetLayer:function(layer){var target;for(var i=this.targets.length-1;i>=0;--i){target=this.targets[i];if(target.layer===layer){this.removeTarget(target);}}},removeTarget:function(target){return OpenLayers.Util.removeItem(this.targets,target);},activate:function(){var activated=OpenLayers.Control.prototype.activate.call(this);if(activated){if(this.layer&&this.layer.events){this.layer.events.on({sketchstarted:this.onSketchModified,sketchmodified:this.onSketchModified,vertexmodified:this.onVertexModified,scope:this});}}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Control.prototype.deactivate.call(this);if(deactivated){if(this.layer&&this.layer.events){this.layer.events.un({sketchstarted:this.onSketchModified,sketchmodified:this.onSketchModified,vertexmodified:this.onVertexModified,scope:this});}}
+this.feature=null;this.point=null;return deactivated;},onSketchModified:function(event){this.feature=event.feature;this.considerSnapping(event.vertex,event.vertex);},onVertexModified:function(event){this.feature=event.feature;var loc=this.layer.map.getLonLatFromViewPortPx(event.pixel);this.considerSnapping(event.vertex,new OpenLayers.Geometry.Point(loc.lon,loc.lat));},considerSnapping:function(point,loc){var best={rank:Number.POSITIVE_INFINITY,dist:Number.POSITIVE_INFINITY,x:null,y:null};var snapped=false;var result,target;for(var i=0,len=this.targets.length;i<len;++i){target=this.targets[i];result=this.testTarget(target,loc);if(result){if(this.greedy){best=result;best.target=target;snapped=true;break;}else{if((result.rank<best.rank)||(result.rank===best.rank&&result.dist<best.dist)){best=result;best.target=target;snapped=true;}}}}
+if(snapped){var proceed=this.events.triggerEvent("beforesnap",{point:point,x:best.x,y:best.y,distance:best.dist,layer:best.target.layer,snapType:this.precedence[best.rank]});if(proceed!==false){point.x=best.x;point.y=best.y;this.point=point;this.events.triggerEvent("snap",{point:point,snapType:this.precedence[best.rank],layer:best.target.layer,distance:best.dist});}else{snapped=false;}}
+if(this.point&&!snapped){point.x=loc.x;point.y=loc.y;this.point=null;this.events.triggerEvent("unsnap",{point:point});}},testTarget:function(target,loc){var resolution=this.layer.map.getResolution();if("minResolution"in target){if(resolution<target.minResolution){return null;}}
+if("maxResolution"in target){if(resolution>=target.maxResolution){return null;}}
+var tolerance={node:this.getGeoTolerance(target.nodeTolerance,resolution),vertex:this.getGeoTolerance(target.vertexTolerance,resolution),edge:this.getGeoTolerance(target.edgeTolerance,resolution)};var maxTolerance=Math.max(tolerance.node,tolerance.vertex,tolerance.edge);var result={rank:Number.POSITIVE_INFINITY,dist:Number.POSITIVE_INFINITY};var eligible=false;var features=target.layer.features;var feature,type,vertices,vertex,closest,dist,found;var numTypes=this.precedence.length;var ll=new OpenLayers.LonLat(loc.x,loc.y);for(var i=0,len=features.length;i<len;++i){feature=features[i];if(feature!==this.feature&&!feature._sketch&&feature.state!==OpenLayers.State.DELETE&&(!target.filter||target.filter.evaluate(feature))){if(feature.atPoint(ll,maxTolerance,maxTolerance)){for(var j=0,stop=Math.min(result.rank+1,numTypes);j<stop;++j){type=this.precedence[j];if(target[type]){if(type==="edge"){closest=feature.geometry.distanceTo(loc,{details:true});dist=closest.distance;if(dist<=tolerance[type]&&dist<result.dist){result={rank:j,dist:dist,x:closest.x0,y:closest.y0};eligible=true;break;}}else{vertices=feature.geometry.getVertices(type==="node");found=false;for(var k=0,klen=vertices.length;k<klen;++k){vertex=vertices[k];dist=vertex.distanceTo(loc);if(dist<=tolerance[type]&&(j<result.rank||(j===result.rank&&dist<result.dist))){result={rank:j,dist:dist,x:vertex.x,y:vertex.y};eligible=true;found=true;}}
+if(found){break;}}}}}}}
+return eligible?result:null;},getGeoTolerance:function(tolerance,resolution){if(resolution!==this.resolution){this.resolution=resolution;this.geoToleranceCache={};}
+var geoTolerance=this.geoToleranceCache[tolerance];if(geoTolerance===undefined){geoTolerance=tolerance*resolution;this.geoToleranceCache[tolerance]=geoTolerance;}
+return geoTolerance;},destroy:function(){if(this.active){this.deactivate();}
+delete this.layer;delete this.targets;OpenLayers.Control.prototype.destroy.call(this);},CLASS_NAME:"OpenLayers.Control.Snapping"});OpenLayers.Layer.Boxes=OpenLayers.Class(OpenLayers.Layer.Markers,{drawMarker:function(marker){var topleft=this.map.getLayerPxFromLonLat({lon:marker.bounds.left,lat:marker.bounds.top});var botright=this.map.getLayerPxFromLonLat({lon:marker.bounds.right,lat:marker.bounds.bottom});if(botright==null||topleft==null){marker.display(false);}else{var markerDiv=marker.draw(topleft,{w:Math.max(1,botright.x-topleft.x),h:Math.max(1,botright.y-topleft.y)});if(!marker.drawn){this.div.appendChild(markerDiv);marker.drawn=true;}}},removeMarker:function(marker){OpenLayers.Util.removeItem(this.markers,marker);if((marker.div!=null)&&(marker.div.parentNode==this.div)){this.div.removeChild(marker.div);}},CLASS_NAME:"OpenLayers.Layer.Boxes"});OpenLayers.Format.Text=OpenLayers.Class(OpenLayers.Format,{defaultStyle:null,extractStyles:true,initialize:function(options){options=options||{};if(options.extractStyles!==false){options.defaultStyle={'externalGraphic':OpenLayers.Util.getImageLocation("marker.png"),'graphicWidth':21,'graphicHeight':25,'graphicXOffset':-10.5,'graphicYOffset':-12.5};}
+OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(text){var lines=text.split('\n');var columns;var features=[];for(var lcv=0;lcv<(lines.length-1);lcv++){var currLine=lines[lcv].replace(/^\s*/,'').replace(/\s*$/,'');if(currLine.charAt(0)!='#'){if(!columns){columns=currLine.split('\t');}else{var vals=currLine.split('\t');var geometry=new OpenLayers.Geometry.Point(0,0);var attributes={};var style=this.defaultStyle?OpenLayers.Util.applyDefaults({},this.defaultStyle):null;var icon,iconSize,iconOffset,overflow;var set=false;for(var valIndex=0;valIndex<vals.length;valIndex++){if(vals[valIndex]){if(columns[valIndex]=='point'){var coords=vals[valIndex].split(',');geometry.y=parseFloat(coords[0]);geometry.x=parseFloat(coords[1]);set=true;}else if(columns[valIndex]=='lat'){geometry.y=parseFloat(vals[valIndex]);set=true;}else if(columns[valIndex]=='lon'){geometry.x=parseFloat(vals[valIndex]);set=true;}else if(columns[valIndex]=='title')
+attributes['title']=vals[valIndex];else if(columns[valIndex]=='image'||columns[valIndex]=='icon'&&style){style['externalGraphic']=vals[valIndex];}else if(columns[valIndex]=='iconSize'&&style){var size=vals[valIndex].split(',');style['graphicWidth']=parseFloat(size[0]);style['graphicHeight']=parseFloat(size[1]);}else if(columns[valIndex]=='iconOffset'&&style){var offset=vals[valIndex].split(',');style['graphicXOffset']=parseFloat(offset[0]);style['graphicYOffset']=parseFloat(offset[1]);}else if(columns[valIndex]=='description'){attributes['description']=vals[valIndex];}else if(columns[valIndex]=='overflow'){attributes['overflow']=vals[valIndex];}else{attributes[columns[valIndex]]=vals[valIndex];}}}
+if(set){if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}
+var feature=new OpenLayers.Feature.Vector(geometry,attributes,style);features.push(feature);}}}}
+return features;},CLASS_NAME:"OpenLayers.Format.Text"});OpenLayers.Layer.Text=OpenLayers.Class(OpenLayers.Layer.Markers,{location:null,features:null,formatOptions:null,selectedFeature:null,initialize:function(name,options){OpenLayers.Layer.Markers.prototype.initialize.apply(this,arguments);this.features=[];},destroy:function(){OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);this.clearFeatures();this.features=null;},loadText:function(){if(!this.loaded){if(this.location!=null){var onFail=function(e){this.events.triggerEvent("loadend");};this.events.triggerEvent("loadstart");OpenLayers.Request.GET({url:this.location,success:this.parseData,failure:onFail,scope:this});this.loaded=true;}}},moveTo:function(bounds,zoomChanged,minor){OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);if(this.visibility&&!this.loaded){this.loadText();}},parseData:function(ajaxRequest){var text=ajaxRequest.responseText;var options={};OpenLayers.Util.extend(options,this.formatOptions);if(this.map&&!this.projection.equals(this.map.getProjectionObject())){options.externalProjection=this.projection;options.internalProjection=this.map.getProjectionObject();}
+var parser=new OpenLayers.Format.Text(options);var features=parser.read(text);for(var i=0,len=features.length;i<len;i++){var data={};var feature=features[i];var location;var iconSize,iconOffset;location=new OpenLayers.LonLat(feature.geometry.x,feature.geometry.y);if(feature.style.graphicWidth&&feature.style.graphicHeight){iconSize=new OpenLayers.Size(feature.style.graphicWidth,feature.style.graphicHeight);}
+if(feature.style.graphicXOffset!==undefined&&feature.style.graphicYOffset!==undefined){iconOffset=new OpenLayers.Pixel(feature.style.graphicXOffset,feature.style.graphicYOffset);}
+if(feature.style.externalGraphic!=null){data.icon=new OpenLayers.Icon(feature.style.externalGraphic,iconSize,iconOffset);}else{data.icon=OpenLayers.Marker.defaultIcon();if(iconSize!=null){data.icon.setSize(iconSize);}}
+if((feature.attributes.title!=null)&&(feature.attributes.description!=null)){data['popupContentHTML']='<h2>'+feature.attributes.title+'</h2>'+'<p>'+feature.attributes.description+'</p>';}
+data['overflow']=feature.attributes.overflow||"auto";var markerFeature=new OpenLayers.Feature(this,location,data);this.features.push(markerFeature);var marker=markerFeature.createMarker();if((feature.attributes.title!=null)&&(feature.attributes.description!=null)){marker.events.register('click',markerFeature,this.markerClick);}
+this.addMarker(marker);}
+this.events.triggerEvent("loadend");},markerClick:function(evt){var sameMarkerClicked=(this==this.layer.selectedFeature);this.layer.selectedFeature=(!sameMarkerClicked)?this:null;for(var i=0,len=this.layer.map.popups.length;i<len;i++){this.layer.map.removePopup(this.layer.map.popups[i]);}
+if(!sameMarkerClicked){this.layer.map.addPopup(this.createPopup());}
+OpenLayers.Event.stop(evt);},clearFeatures:function(){if(this.features!=null){while(this.features.length>0){var feature=this.features[0];OpenLayers.Util.removeItem(this.features,feature);feature.destroy();}}},CLASS_NAME:"OpenLayers.Layer.Text"});OpenLayers.Date={dateRegEx:/^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/,toISOString:(function(){if("toISOString"in Date.prototype){return function(date){return date.toISOString();};}else{function pad(num,len){var str=num+"";while(str.length<len){str="0"+str;}
+return str;}
+return function(date){var str;if(isNaN(date.getTime())){str="Invalid Date";}else{str=date.getUTCFullYear()+"-"+
+pad(date.getUTCMonth()+1,2)+"-"+
+pad(date.getUTCDate(),2)+"T"+
+pad(date.getUTCHours(),2)+":"+
+pad(date.getUTCMinutes(),2)+":"+
+pad(date.getUTCSeconds(),2)+"."+
+pad(date.getUTCMilliseconds(),3)+"Z";}
+return str;};}})(),parse:function(str){var date;var match=str.match(this.dateRegEx);if(match&&(match[1]||match[7])){var year=parseInt(match[1],10)||0;var month=(parseInt(match[2],10)-1)||0;var day=parseInt(match[3],10)||1;date=new Date(Date.UTC(year,month,day));var type=match[7];if(type){var hours=parseInt(match[4],10);var minutes=parseInt(match[5],10);var secFrac=parseFloat(match[6]);var seconds=secFrac|0;var milliseconds=Math.round(1000*(secFrac-seconds));date.setUTCHours(hours,minutes,seconds,milliseconds);if(type!=="Z"){var hoursOffset=parseInt(type,10);var minutesOffset=parseInt(match[8],10)||0;var offset=-1000*(60*(hoursOffset*60)+minutesOffset*60);date=new Date(date.getTime()+offset);}}}else{date=new Date("invalid");}
+return date;}};OpenLayers.Format.KML=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{kml:"http://www.opengis.net/kml/2.2",gx:"http://www.google.com/kml/ext/2.2"},kmlns:"http://earth.google.com/kml/2.0",placemarksDesc:"No description available",foldersName:"OpenLayers export",foldersDesc:"Exported on "+new Date(),extractAttributes:true,kvpAttributes:false,extractStyles:false,extractTracks:false,trackAttributes:null,internalns:null,features:null,styles:null,styleBaseUrl:"",fetched:null,maxDepth:0,initialize:function(options){this.regExes={trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g),kmlColor:(/(\w{2})(\w{2})(\w{2})(\w{2})/),kmlIconPalette:(/root:\/\/icons\/palette-(\d+)(\.\w+)/),straightBracket:(/\$\[(.*?)\]/g)};this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){this.features=[];this.styles={};this.fetched={};var options={depth:0,styleBaseUrl:this.styleBaseUrl};return this.parseData(data,options);},parseData:function(data,options){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var types=["Link","NetworkLink","Style","StyleMap","Placemark"];for(var i=0,len=types.length;i<len;++i){var type=types[i];var nodes=this.getElementsByTagNameNS(data,"*",type);if(nodes.length==0){continue;}
switch(type.toLowerCase()){case"link":case"networklink":this.parseLinks(nodes,options);break;case"style":if(this.extractStyles){this.parseStyles(nodes,options);}
break;case"stylemap":if(this.extractStyles){this.parseStyleMaps(nodes,options);}
break;case"placemark":this.parseFeatures(nodes,options);break;}}
return this.features;},parseLinks:function(nodes,options){if(options.depth>=this.maxDepth){return false;}
-var newOptions=OpenLayers.Util.extend({},options);newOptions.depth++;for(var i=0;i<nodes.length;i++){var href=this.parseProperty(nodes[i],"*","href");if(href&&!this.fetched[href]){this.fetched[href]=true;var data=this.fetchLink(href);if(data){this.parseData(data,newOptions);}}}},fetchLink:function(href){var request=new OpenLayers.Ajax.Request(href,{method:'get',asynchronous:false});if(request&&request.transport){return request.transport.responseText;}},parseStyles:function(nodes,options){for(var i=0;i<nodes.length;i++){var style=this.parseStyle(nodes[i]);if(style){styleName=(options.styleBaseUrl||"")+"#"+style.id;this.styles[styleName]=style;}}},parseStyle:function(node){var style={};var types=["LineStyle","PolyStyle","IconStyle","BalloonStyle"];var type,nodeList,geometry,parser;for(var i=0;i<types.length;++i){type=types[i];styleTypeNode=this.getElementsByTagNameNS(node,"*",type)[0];if(!styleTypeNode){continue;}
-switch(type.toLowerCase()){case"linestyle":var color=this.parseProperty(styleTypeNode,"*","color");if(color){var matches=(color.toString()).match(this.regExes.kmlColor);var alpha=matches[1];style["strokeOpacity"]=parseInt(alpha,16)/255;var b=matches[2];var g=matches[3];var r=matches[4];style["strokeColor"]="#"+r+g+b;}
+var newOptions=OpenLayers.Util.extend({},options);newOptions.depth++;for(var i=0,len=nodes.length;i<len;i++){var href=this.parseProperty(nodes[i],"*","href");if(href&&!this.fetched[href]){this.fetched[href]=true;var data=this.fetchLink(href);if(data){this.parseData(data,newOptions);}}}},fetchLink:function(href){var request=OpenLayers.Request.GET({url:href,async:false});if(request){return request.responseText;}},parseStyles:function(nodes,options){for(var i=0,len=nodes.length;i<len;i++){var style=this.parseStyle(nodes[i]);if(style){var styleName=(options.styleBaseUrl||"")+"#"+style.id;this.styles[styleName]=style;}}},parseKmlColor:function(kmlColor){var color=null;if(kmlColor){var matches=kmlColor.match(this.regExes.kmlColor);if(matches){color={color:'#'+matches[4]+matches[3]+matches[2],opacity:parseInt(matches[1],16)/255};}}
+return color;},parseStyle:function(node){var style={};var types=["LineStyle","PolyStyle","IconStyle","BalloonStyle","LabelStyle"];var type,styleTypeNode,nodeList,geometry,parser;for(var i=0,len=types.length;i<len;++i){type=types[i];styleTypeNode=this.getElementsByTagNameNS(node,"*",type)[0];if(!styleTypeNode){continue;}
+switch(type.toLowerCase()){case"linestyle":var kmlColor=this.parseProperty(styleTypeNode,"*","color");var color=this.parseKmlColor(kmlColor);if(color){style["strokeColor"]=color.color;style["strokeOpacity"]=color.opacity;}
var width=this.parseProperty(styleTypeNode,"*","width");if(width){style["strokeWidth"]=width;}
-case"polystyle":var color=this.parseProperty(styleTypeNode,"*","color");if(color){var matches=(color.toString()).match(this.regExes.kmlColor);var alpha=matches[1];style["fillOpacity"]=parseInt(alpha,16)/255;var b=matches[2];var g=matches[3];var r=matches[4];style["fillColor"]="#"+r+g+b;}
+break;case"polystyle":var kmlColor=this.parseProperty(styleTypeNode,"*","color");var color=this.parseKmlColor(kmlColor);if(color){style["fillOpacity"]=color.opacity;style["fillColor"]=color.color;}
+var fill=this.parseProperty(styleTypeNode,"*","fill");if(fill=="0"){style["fillColor"]="none";}
+var outline=this.parseProperty(styleTypeNode,"*","outline");if(outline=="0"){style["strokeWidth"]="0";}
break;case"iconstyle":var scale=parseFloat(this.parseProperty(styleTypeNode,"*","scale")||1);var width=32*scale;var height=32*scale;var iconNode=this.getElementsByTagNameNS(styleTypeNode,"*","Icon")[0];if(iconNode){var href=this.parseProperty(iconNode,"*","href");if(href){var w=this.parseProperty(iconNode,"*","w");var h=this.parseProperty(iconNode,"*","h");var google="http://maps.google.com/mapfiles/kml";if(OpenLayers.String.startsWith(href,google)&&!w&&!h){w=64;h=64;scale=scale/2;}
w=w||h;h=h||w;if(w){width=parseInt(w)*scale;}
if(h){height=parseInt(h)*scale;}
@@ -1284,99 +1795,1002 @@ var yUnits=hotSpotNode.getAttribute("yunits");if(yUnits=="pixels"){style["graphi
else if(yUnits=="insetPixels"){style["graphicYOffset"]=-(y*scale)+1;}
else if(yUnits=="fraction"){style["graphicYOffset"]=-height*(1-y)+1;}}
style["graphicWidth"]=width;style["graphicHeight"]=height;break;case"balloonstyle":var balloonStyle=OpenLayers.Util.getXmlNodeValue(styleTypeNode);if(balloonStyle){style["balloonStyle"]=balloonStyle.replace(this.regExes.straightBracket,"${$1}");}
+break;case"labelstyle":var kmlColor=this.parseProperty(styleTypeNode,"*","color");var color=this.parseKmlColor(kmlColor);if(color){style["fontColor"]=color.color;style["fontOpacity"]=color.opacity;}
break;default:}}
if(!style["strokeColor"]&&style["fillColor"]){style["strokeColor"]=style["fillColor"];}
var id=node.getAttribute("id");if(id&&style){style.id=id;}
-return style;},parseStyleMaps:function(nodes,options){for(var i=0;i<nodes.length;i++){var node=nodes[i];var pairs=this.getElementsByTagNameNS(node,"*","Pair");var id=node.getAttribute("id");for(var j=0;j<pairs.length;j++){var pair=pairs[j];var key=this.parseProperty(pair,"*","key");var styleUrl=this.parseProperty(pair,"*","styleUrl");if(styleUrl&&key=="normal"){this.styles[(options.styleBaseUrl||"")+"#"+id]=this.styles[(options.styleBaseUrl||"")+styleUrl];}
-if(styleUrl&&key=="highlight"){}}}},parseFeatures:function(nodes,options){var features=new Array(nodes.length);for(var i=0;i<nodes.length;i++){var featureNode=nodes[i];var feature=this.parseFeature.apply(this,[featureNode]);if(feature){if(this.extractStyles&&feature.attributes&&feature.attributes.styleUrl){feature.style=this.getStyle(feature.attributes.styleUrl);}
-var inlineStyleNode=this.getElementsByTagNameNS(featureNode,"*","Style")[0];if(inlineStyleNode){var inlineStyle=this.parseStyle(inlineStyleNode);if(inlineStyle){feature.style=OpenLayers.Util.extend({},feature.style);OpenLayers.Util.extend(feature.style,inlineStyle);}}
-features[i]=feature;}else{throw"Bad Placemark: "+i;}}
-this.features=this.features.concat(features);},parseFeature:function(node){var order=["MultiGeometry","Polygon","LineString","Point"];var type,nodeList,geometry,parser;for(var i=0;i<order.length;++i){type=order[i];this.internalns=node.namespaceURI?node.namespaceURI:this.kmlns;nodeList=this.getElementsByTagNameNS(node,this.internalns,type);if(nodeList.length>0){var parser=this.parseGeometry[type.toLowerCase()];if(parser){geometry=parser.apply(this,[nodeList[0]]);if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}}else{OpenLayers.Console.error(OpenLayers.i18n("unsupportedGeometryType",{'geomType':type}));}
+return style;},parseStyleMaps:function(nodes,options){for(var i=0,len=nodes.length;i<len;i++){var node=nodes[i];var pairs=this.getElementsByTagNameNS(node,"*","Pair");var id=node.getAttribute("id");for(var j=0,jlen=pairs.length;j<jlen;j++){var pair=pairs[j];var key=this.parseProperty(pair,"*","key");var styleUrl=this.parseProperty(pair,"*","styleUrl");if(styleUrl&&key=="normal"){this.styles[(options.styleBaseUrl||"")+"#"+id]=this.styles[(options.styleBaseUrl||"")+styleUrl];}}}},parseFeatures:function(nodes,options){var features=[];for(var i=0,len=nodes.length;i<len;i++){var featureNode=nodes[i];var feature=this.parseFeature.apply(this,[featureNode]);if(feature){if(this.extractStyles&&feature.attributes&&feature.attributes.styleUrl){feature.style=this.getStyle(feature.attributes.styleUrl,options);}
+if(this.extractStyles){var inlineStyleNode=this.getElementsByTagNameNS(featureNode,"*","Style")[0];if(inlineStyleNode){var inlineStyle=this.parseStyle(inlineStyleNode);if(inlineStyle){feature.style=OpenLayers.Util.extend(feature.style,inlineStyle);}}}
+if(this.extractTracks){var tracks=this.getElementsByTagNameNS(featureNode,this.namespaces.gx,"Track");if(tracks&&tracks.length>0){var track=tracks[0];var container={features:[],feature:feature};this.readNode(track,container);if(container.features.length>0){features.push.apply(features,container.features);}}}else{features.push(feature);}}else{throw"Bad Placemark: "+i;}}
+this.features=this.features.concat(features);},readers:{"kml":{"when":function(node,container){container.whens.push(OpenLayers.Date.parse(this.getChildValue(node)));},"_trackPointAttribute":function(node,container){var name=node.nodeName.split(":").pop();container.attributes[name].push(this.getChildValue(node));}},"gx":{"Track":function(node,container){var obj={whens:[],points:[],angles:[]};if(this.trackAttributes){var name;obj.attributes={};for(var i=0,ii=this.trackAttributes.length;i<ii;++i){name=this.trackAttributes[i];obj.attributes[name]=[];if(!(name in this.readers.kml)){this.readers.kml[name]=this.readers.kml._trackPointAttribute;}}}
+this.readChildNodes(node,obj);if(obj.whens.length!==obj.points.length){throw new Error("gx:Track with unequal number of when ("+
+obj.whens.length+") and gx:coord ("+
+obj.points.length+") elements.");}
+var hasAngles=obj.angles.length>0;if(hasAngles&&obj.whens.length!==obj.angles.length){throw new Error("gx:Track with unequal number of when ("+
+obj.whens.length+") and gx:angles ("+
+obj.angles.length+") elements.");}
+var feature,point,angles;for(var i=0,ii=obj.whens.length;i<ii;++i){feature=container.feature.clone();feature.fid=container.feature.fid||container.feature.id;point=obj.points[i];feature.geometry=point;if("z"in point){feature.attributes.altitude=point.z;}
+if(this.internalProjection&&this.externalProjection){feature.geometry.transform(this.externalProjection,this.internalProjection);}
+if(this.trackAttributes){for(var j=0,jj=this.trackAttributes.length;j<jj;++j){feature.attributes[name]=obj.attributes[this.trackAttributes[j]][i];}}
+feature.attributes.when=obj.whens[i];feature.attributes.trackId=container.feature.id;if(hasAngles){angles=obj.angles[i];feature.attributes.heading=parseFloat(angles[0]);feature.attributes.tilt=parseFloat(angles[1]);feature.attributes.roll=parseFloat(angles[2]);}
+container.features.push(feature);}},"coord":function(node,container){var str=this.getChildValue(node);var coords=str.replace(this.regExes.trimSpace,"").split(/\s+/);var point=new OpenLayers.Geometry.Point(coords[0],coords[1]);if(coords.length>2){point.z=parseFloat(coords[2]);}
+container.points.push(point);},"angles":function(node,container){var str=this.getChildValue(node);var parts=str.replace(this.regExes.trimSpace,"").split(/\s+/);container.angles.push(parts);}}},parseFeature:function(node){var order=["MultiGeometry","Polygon","LineString","Point"];var type,nodeList,geometry,parser;for(var i=0,len=order.length;i<len;++i){type=order[i];this.internalns=node.namespaceURI?node.namespaceURI:this.kmlns;nodeList=this.getElementsByTagNameNS(node,this.internalns,type);if(nodeList.length>0){var parser=this.parseGeometry[type.toLowerCase()];if(parser){geometry=parser.apply(this,[nodeList[0]]);if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}}else{throw new TypeError("Unsupported geometry type: "+type);}
break;}}
var attributes;if(this.extractAttributes){attributes=this.parseAttributes(node);}
var feature=new OpenLayers.Feature.Vector(geometry,attributes);var fid=node.getAttribute("id")||node.getAttribute("name");if(fid!=null){feature.fid=fid;}
return feature;},getStyle:function(styleUrl,options){var styleBaseUrl=OpenLayers.Util.removeTail(styleUrl);var newOptions=OpenLayers.Util.extend({},options);newOptions.depth++;newOptions.styleBaseUrl=styleBaseUrl;if(!this.styles[styleUrl]&&!OpenLayers.String.startsWith(styleUrl,"#")&&newOptions.depth<=this.maxDepth&&!this.fetched[styleBaseUrl]){var data=this.fetchLink(styleBaseUrl);if(data){this.parseData(data,newOptions);}}
-var style=this.styles[styleUrl];return style;},parseGeometry:{point:function(node){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"coordinates");var coords=[];if(nodeList.length>0){var coordString=nodeList[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.removeSpace,"");coords=coordString.split(",");}
+var style=OpenLayers.Util.extend({},this.styles[styleUrl]);return style;},parseGeometry:{point:function(node){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"coordinates");var coords=[];if(nodeList.length>0){var coordString=nodeList[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.removeSpace,"");coords=coordString.split(",");}
var point=null;if(coords.length>1){if(coords.length==2){coords[2]=null;}
point=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{throw"Bad coordinate string: "+coordString;}
-return point;},linestring:function(node,ring){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"coordinates");var line=null;if(nodeList.length>0){var coordString=this.concatChildValues(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coordString=coordString.replace(this.regExes.trimComma,",");var pointList=coordString.split(this.regExes.splitSpace);var numPoints=pointList.length;var points=new Array(numPoints);var coords,numCoords;for(var i=0;i<numPoints;++i){coords=pointList[i].split(",");numCoords=coords.length;if(numCoords>1){if(coords.length==2){coords[2]=null;}
+return point;},linestring:function(node,ring){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"coordinates");var line=null;if(nodeList.length>0){var coordString=this.getChildValue(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coordString=coordString.replace(this.regExes.trimComma,",");var pointList=coordString.split(this.regExes.splitSpace);var numPoints=pointList.length;var points=new Array(numPoints);var coords,numCoords;for(var i=0;i<numPoints;++i){coords=pointList[i].split(",");numCoords=coords.length;if(numCoords>1){if(coords.length==2){coords[2]=null;}
points[i]=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{throw"Bad LineString point coordinates: "+
pointList[i];}}
if(numPoints){if(ring){line=new OpenLayers.Geometry.LinearRing(points);}else{line=new OpenLayers.Geometry.LineString(points);}}else{throw"Bad LineString coordinates: "+coordString;}}
-return line;},polygon:function(node){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"LinearRing");var numRings=nodeList.length;var components=new Array(numRings);if(numRings>0){var ring;for(var i=0;i<nodeList.length;++i){ring=this.parseGeometry.linestring.apply(this,[nodeList[i],true]);if(ring){components[i]=ring;}else{throw"Bad LinearRing geometry: "+i;}}}
-return new OpenLayers.Geometry.Polygon(components);},multigeometry:function(node){var child,parser;var parts=[];var children=node.childNodes;for(var i=0;i<children.length;++i){child=children[i];if(child.nodeType==1){var type=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;var parser=this.parseGeometry[type.toLowerCase()];if(parser){parts.push(parser.apply(this,[child]));}}}
-return new OpenLayers.Geometry.Collection(parts);}},parseAttributes:function(node){var attributes={};var child,grandchildren,grandchild;var children=node.childNodes;for(var i=0;i<children.length;++i){child=children[i];if(child.nodeType==1){grandchildren=child.childNodes;if(grandchildren.length==1||grandchildren.length==3){var grandchild;switch(grandchildren.length){case 1:grandchild=grandchildren[0];break;case 3:default:grandchild=grandchildren[1];break;}
+return line;},polygon:function(node){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"LinearRing");var numRings=nodeList.length;var components=new Array(numRings);if(numRings>0){var ring;for(var i=0,len=nodeList.length;i<len;++i){ring=this.parseGeometry.linestring.apply(this,[nodeList[i],true]);if(ring){components[i]=ring;}else{throw"Bad LinearRing geometry: "+i;}}}
+return new OpenLayers.Geometry.Polygon(components);},multigeometry:function(node){var child,parser;var parts=[];var children=node.childNodes;for(var i=0,len=children.length;i<len;++i){child=children[i];if(child.nodeType==1){var type=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;var parser=this.parseGeometry[type.toLowerCase()];if(parser){parts.push(parser.apply(this,[child]));}}}
+return new OpenLayers.Geometry.Collection(parts);}},parseAttributes:function(node){var attributes={};var edNodes=node.getElementsByTagName("ExtendedData");if(edNodes.length){attributes=this.parseExtendedData(edNodes[0]);}
+var child,grandchildren,grandchild;var children=node.childNodes;for(var i=0,len=children.length;i<len;++i){child=children[i];if(child.nodeType==1){grandchildren=child.childNodes;if(grandchildren.length>=1&&grandchildren.length<=3){var grandchild;switch(grandchildren.length){case 1:grandchild=grandchildren[0];break;case 2:var c1=grandchildren[0];var c2=grandchildren[1];grandchild=(c1.nodeType==3||c1.nodeType==4)?c1:c2;break;case 3:default:grandchild=grandchildren[1];break;}
if(grandchild.nodeType==3||grandchild.nodeType==4){var name=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;var value=OpenLayers.Util.getXmlNodeValue(grandchild);if(value){value=value.replace(this.regExes.trimSpace,"");attributes[name]=value;}}}}}
+return attributes;},parseExtendedData:function(node){var attributes={};var i,len,data,key;var dataNodes=node.getElementsByTagName("Data");for(i=0,len=dataNodes.length;i<len;i++){data=dataNodes[i];key=data.getAttribute("name");var ed={};var valueNode=data.getElementsByTagName("value");if(valueNode.length){ed['value']=this.getChildValue(valueNode[0]);}
+if(this.kvpAttributes){attributes[key]=ed['value'];}else{var nameNode=data.getElementsByTagName("displayName");if(nameNode.length){ed['displayName']=this.getChildValue(nameNode[0]);}
+attributes[key]=ed;}}
+var simpleDataNodes=node.getElementsByTagName("SimpleData");for(i=0,len=simpleDataNodes.length;i<len;i++){var ed={};data=simpleDataNodes[i];key=data.getAttribute("name");ed['value']=this.getChildValue(data);if(this.kvpAttributes){attributes[key]=ed['value'];}else{ed['displayName']=key;attributes[key]=ed;}}
return attributes;},parseProperty:function(xmlNode,namespace,tagName){var value;var nodeList=this.getElementsByTagNameNS(xmlNode,namespace,tagName);try{value=OpenLayers.Util.getXmlNodeValue(nodeList[0]);}catch(e){value=null;}
-return value;},write:function(features){if(!(features instanceof Array)){features=[features];}
-var kml=this.createElementNS(this.kmlns,"kml");var folder=this.createFolderXML();for(var i=0;i<features.length;++i){folder.appendChild(this.createPlacemarkXML(features[i]));}
-kml.appendChild(folder);return OpenLayers.Format.XML.prototype.write.apply(this,[kml]);},createFolderXML:function(){var folderName=this.createElementNS(this.kmlns,"name");var folderNameText=this.createTextNode(this.foldersName);folderName.appendChild(folderNameText);var folderDesc=this.createElementNS(this.kmlns,"description");var folderDescText=this.createTextNode(this.foldersDesc);folderDesc.appendChild(folderDescText);var folder=this.createElementNS(this.kmlns,"Folder");folder.appendChild(folderName);folder.appendChild(folderDesc);return folder;},createPlacemarkXML:function(feature){var placemarkName=this.createElementNS(this.kmlns,"name");var name=(feature.attributes.name)?feature.attributes.name:feature.id;placemarkName.appendChild(this.createTextNode(name));var placemarkDesc=this.createElementNS(this.kmlns,"description");var desc=(feature.attributes.description)?feature.attributes.description:this.placemarksDesc;placemarkDesc.appendChild(this.createTextNode(desc));var placemarkNode=this.createElementNS(this.kmlns,"Placemark");if(feature.fid!=null){placemarkNode.setAttribute("id",feature.fid);}
-placemarkNode.appendChild(placemarkName);placemarkNode.appendChild(placemarkDesc);var geometryNode=this.buildGeometryNode(feature.geometry);placemarkNode.appendChild(geometryNode);return placemarkNode;},buildGeometryNode:function(geometry){if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);}
-var className=geometry.CLASS_NAME;var type=className.substring(className.lastIndexOf(".")+1);var builder=this.buildGeometry[type.toLowerCase()];var node=null;if(builder){node=builder.apply(this,[geometry]);}
-return node;},buildGeometry:{point:function(geometry){var kml=this.createElementNS(this.kmlns,"Point");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},multipoint:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},linestring:function(geometry){var kml=this.createElementNS(this.kmlns,"LineString");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},multilinestring:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},linearring:function(geometry){var kml=this.createElementNS(this.kmlns,"LinearRing");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},polygon:function(geometry){var kml=this.createElementNS(this.kmlns,"Polygon");var rings=geometry.components;var ringMember,ringGeom,type;for(var i=0;i<rings.length;++i){type=(i==0)?"outerBoundaryIs":"innerBoundaryIs";ringMember=this.createElementNS(this.kmlns,type);ringGeom=this.buildGeometry.linearring.apply(this,[rings[i]]);ringMember.appendChild(ringGeom);kml.appendChild(ringMember);}
-return kml;},multipolygon:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},collection:function(geometry){var kml=this.createElementNS(this.kmlns,"MultiGeometry");var child;for(var i=0;i<geometry.components.length;++i){child=this.buildGeometryNode.apply(this,[geometry.components[i]]);if(child){kml.appendChild(child);}}
-return kml;}},buildCoordinatesNode:function(geometry){var coordinatesNode=this.createElementNS(this.kmlns,"coordinates");var path;var points=geometry.components;if(points){var point;var numPoints=points.length;var parts=new Array(numPoints);for(var i=0;i<numPoints;++i){point=points[i];parts[i]=point.x+","+point.y;}
-path=parts.join(" ");}else{path=geometry.x+","+geometry.y;}
-var txtNode=this.createTextNode(path);coordinatesNode.appendChild(txtNode);return coordinatesNode;},CLASS_NAME:"OpenLayers.Format.KML"});OpenLayers.Format.OSM=OpenLayers.Class(OpenLayers.Format.XML,{checkTags:false,interestingTagsExclude:null,areaTags:null,initialize:function(options){var layer_defaults={'interestingTagsExclude':['source','source_ref','source:ref','history','attribution','created_by'],'areaTags':['area','building','leisure','tourism','ruins','historic','landuse','military','natural','sport']};layer_defaults=OpenLayers.Util.extend(layer_defaults,options);var interesting={};for(var i=0;i<layer_defaults.interestingTagsExclude.length;i++){interesting[layer_defaults.interestingTagsExclude[i]]=true;}
-layer_defaults.interestingTagsExclude=interesting;var area={};for(var i=0;i<layer_defaults.areaTags.length;i++){area[layer_defaults.areaTags[i]]=true;}
-layer_defaults.areaTags=area;OpenLayers.Format.XML.prototype.initialize.apply(this,[layer_defaults]);},read:function(doc){if(typeof doc=="string"){doc=OpenLayers.Format.XML.prototype.read.apply(this,[doc]);}
-var nodes=this.getNodes(doc);var ways=this.getWays(doc);var feat_list=new Array(ways.length);for(var i=0;i<ways.length;i++){var point_list=new Array(ways[i].nodes.length);var poly=this.isWayArea(ways[i])?1:0;for(var j=0;j<ways[i].nodes.length;j++){var node=nodes[ways[i].nodes[j]];var point=new OpenLayers.Geometry.Point(node.lon,node.lat);point.osm_id=parseInt(ways[i].nodes[j]);point_list[j]=point;node.used=true;}
-var geometry=null;if(poly){geometry=new OpenLayers.Geometry.Polygon(new OpenLayers.Geometry.LinearRing(point_list));}else{geometry=new OpenLayers.Geometry.LineString(point_list);}
-if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}
-var feat=new OpenLayers.Feature.Vector(geometry,ways[i].tags);feat.osm_id=parseInt(ways[i].id);feat.fid="way."+feat.osm_id;feat_list[i]=feat;}
-for(var node_id in nodes){var node=nodes[node_id];if(!node.used||this.checkTags){var tags=null;if(this.checkTags){var result=this.getTags(node.node,true);if(node.used&&!result[1]){continue;}
-tags=result[0];}else{tags=this.getTags(node.node);}
-var feat=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(node['lon'],node['lat']),tags);if(this.internalProjection&&this.externalProjection){feat.geometry.transform(this.externalProjection,this.internalProjection);}
-feat.osm_id=parseInt(node_id);feat.fid="node."+feat.osm_id;feat_list.push(feat);}
-node.node=null;}
-return feat_list;},getNodes:function(doc){var node_list=doc.getElementsByTagName("node");var nodes={};for(var i=0;i<node_list.length;i++){var node=node_list[i];var id=node.getAttribute("id");nodes[id]={'lat':node.getAttribute("lat"),'lon':node.getAttribute("lon"),'node':node};}
-return nodes;},getWays:function(doc){var way_list=doc.getElementsByTagName("way");var return_ways=[];for(var i=0;i<way_list.length;i++){var way=way_list[i];var way_object={id:way.getAttribute("id")};way_object.tags=this.getTags(way);var node_list=way.getElementsByTagName("nd");way_object.nodes=new Array(node_list.length);for(var j=0;j<node_list.length;j++){way_object.nodes[j]=node_list[j].getAttribute("ref");}
-return_ways.push(way_object);}
-return return_ways;},getTags:function(dom_node,interesting_tags){var tag_list=dom_node.getElementsByTagName("tag");var tags={};var interesting=false;for(var j=0;j<tag_list.length;j++){var key=tag_list[j].getAttribute("k");tags[key]=tag_list[j].getAttribute("v");if(interesting_tags){if(!this.interestingTagsExclude[key]){interesting=true;}}}
-return interesting_tags?[tags,interesting]:tags;},isWayArea:function(way){var poly_shaped=false;var poly_tags=false;if(way.nodes[0]==way.nodes[way.nodes.length-1]){poly_shaped=true;}
-if(this.checkTags){for(var key in way.tags){if(this.areaTags[key]){poly_tags=true;break;}}}
-return poly_shaped&&(this.checkTags?poly_tags:true);},write:function(features){if(!(features instanceof Array)){features=[features];}
-this.osm_id=1;this.created_nodes={};var root_node=this.createElementNS(null,"osm");root_node.setAttribute("version","0.5");root_node.setAttribute("generator","OpenLayers "+OpenLayers.VERSION_NUMBER);for(var i=features.length-1;i>=0;i--){var nodes=this.createFeatureNodes(features[i]);for(var j=0;j<nodes.length;j++){root_node.appendChild(nodes[j]);}}
-return OpenLayers.Format.XML.prototype.write.apply(this,[root_node]);},createFeatureNodes:function(feature){var nodes=[];var className=feature.geometry.CLASS_NAME;var type=className.substring(className.lastIndexOf(".")+1);type=type.toLowerCase();var builder=this.createXML[type];if(builder){nodes=builder.apply(this,[feature]);}
-return nodes;},createXML:{'point':function(point){var id=null;var geometry=point.geometry?point.geometry:point;var already_exists=false;if(point.osm_id){id=point.osm_id;if(this.created_nodes[id]){already_exists=true;}}else{id=-this.osm_id;this.osm_id++;}
-if(already_exists){node=this.created_nodes[id];}else{var node=this.createElementNS(null,"node");}
-this.created_nodes[id]=node;node.setAttribute("id",id);node.setAttribute("lon",geometry.x);node.setAttribute("lat",geometry.y);if(point.attributes){this.serializeTags(point,node);}
-this.setState(point,node);return already_exists?[]:[node];},linestring:function(feature){var nodes=[];var geometry=feature.geometry;if(feature.osm_id){id=feature.osm_id;}else{id=-this.osm_id;this.osm_id++;}
-var way=this.createElementNS(null,"way");way.setAttribute("id",id);for(var i=0;i<geometry.components.length;i++){var node=this.createXML['point'].apply(this,[geometry.components[i]]);if(node.length){node=node[0];var node_ref=node.getAttribute("id");nodes.push(node);}else{node_ref=geometry.components[i].osm_id;node=this.created_nodes[node_ref];}
-this.setState(feature,node);var nd_dom=this.createElementNS(null,"nd");nd_dom.setAttribute("ref",node_ref);way.appendChild(nd_dom);}
-this.serializeTags(feature,way);nodes.push(way);return nodes;},polygon:function(feature){var attrs=OpenLayers.Util.extend({'area':'yes'},feature.attributes);var feat=new OpenLayers.Feature.Vector(feature.geometry.components[0],attrs);feat.osm_id=feature.osm_id;return this.createXML['linestring'].apply(this,[feat]);}},serializeTags:function(feature,node){for(var key in feature.attributes){var tag=this.createElementNS(null,"tag");tag.setAttribute("k",key);tag.setAttribute("v",feature.attributes[key]);node.appendChild(tag);}},setState:function(feature,node){if(feature.state){var state=null;switch(feature.state){case OpenLayers.State.UPDATE:state="modify";case OpenLayers.State.DELETE:state="delete";}
-if(state){node.setAttribute("action",state);}}},CLASS_NAME:"OpenLayers.Format.OSM"});OpenLayers.Geometry.LinearRing=OpenLayers.Class(OpenLayers.Geometry.LineString,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(points){OpenLayers.Geometry.LineString.prototype.initialize.apply(this,arguments);},addComponent:function(point,index){var added=false;var lastPoint=this.components.pop();if(index!=null||!point.equals(lastPoint)){added=OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,arguments);}
-var firstPoint=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[firstPoint]);return added;},removeComponent:function(point){if(this.components.length>4){this.components.pop();OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);var firstPoint=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[firstPoint]);}},move:function(x,y){for(var i=0;i<this.components.length-1;i++){this.components[i].move(x,y);}},rotate:function(angle,origin){for(var i=0;i<this.components.length-1;++i){this.components[i].rotate(angle,origin);}},resize:function(scale,origin,ratio){for(var i=0;i<this.components.length-1;++i){this.components[i].resize(scale,origin,ratio);}},transform:function(source,dest){if(source&&dest){for(var i=0;i<this.components.length-1;i++){var component=this.components[i];component.transform(source,dest);}}
-return this;},getArea:function(){var area=0.0;if(this.components&&(this.components.length>2)){var sum=0.0;for(var i=0;i<this.components.length-1;i++){var b=this.components[i];var c=this.components[i+1];sum+=(b.x+c.x)*(c.y-b.y);}
-area=-sum/2.0;}
-return area;},containsPoint:function(point){var approx=OpenLayers.Number.limitSigDigs;var digs=14;var px=approx(point.x,digs);var py=approx(point.y,digs);function getX(y,x1,y1,x2,y2){return(((x1-x2)*y)+((x2*y1)-(x1*y2)))/(y1-y2);}
-var numSeg=this.components.length-1;var start,end,x1,y1,x2,y2,cx,cy;var crosses=0;for(var i=0;i<numSeg;++i){start=this.components[i];x1=approx(start.x,digs);y1=approx(start.y,digs);end=this.components[i+1];x2=approx(end.x,digs);y2=approx(end.y,digs);if(y1==y2){if(py==y1){if(x1<=x2&&(px>=x1&&px<=x2)||x1>=x2&&(px<=x1&&px>=x2)){crosses=-1;break;}}
-continue;}
-cx=approx(getX(py,x1,y1,x2,y2),digs);if(cx==px){if(y1<y2&&(py>=y1&&py<=y2)||y1>y2&&(py<=y1&&py>=y2)){crosses=-1;break;}}
-if(cx<=px){continue;}
-if(x1!=x2&&(cx<Math.min(x1,x2)||cx>Math.max(x1,x2))){continue;}
-if(y1<y2&&(py>=y1&&py<y2)||y1>y2&&(py<y1&&py>=y2)){++crosses;}}
-var contained=(crosses==-1)?1:!!(crosses&1);return contained;},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.containsPoint(geometry);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"){intersect=geometry.intersects(this);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){intersect=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[geometry]);}else{for(var i=0;i<geometry.components.length;++i){intersect=geometry.components[i].intersects(this);if(intersect){break;}}}
-return intersect;},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Handler.Path=OpenLayers.Class(OpenLayers.Handler.Point,{line:null,freehand:false,freehandToggle:'shiftKey',initialize:function(control,callbacks,options){OpenLayers.Handler.Point.prototype.initialize.apply(this,arguments);},createFeature:function(){this.line=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString());this.point=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point());},destroyFeature:function(){OpenLayers.Handler.Point.prototype.destroyFeature.apply(this);if(this.line){this.line.destroy();}
-this.line=null;},addPoint:function(){this.line.geometry.addComponent(this.point.geometry.clone(),this.line.geometry.components.length);this.callback("point",[this.point.geometry]);},freehandMode:function(evt){return(this.freehandToggle&&evt[this.freehandToggle])?!this.freehand:this.freehand;},modifyFeature:function(){var index=this.line.geometry.components.length-1;this.line.geometry.components[index].x=this.point.geometry.x;this.line.geometry.components[index].y=this.point.geometry.y;this.line.geometry.components[index].clearBounds();},drawFeature:function(){this.layer.drawFeature(this.line,this.style);this.layer.drawFeature(this.point,this.style);},geometryClone:function(){return this.line.geometry.clone();},mousedown:function(evt){if(this.lastDown&&this.lastDown.equals(evt.xy)){return false;}
-if(this.lastDown==null){this.createFeature();}
-this.mouseDown=true;this.lastDown=evt.xy;var lonlat=this.control.map.getLonLatFromPixel(evt.xy);this.point.geometry.x=lonlat.lon;this.point.geometry.y=lonlat.lat;if((this.lastUp==null)||!this.lastUp.equals(evt.xy)){this.addPoint();}
-this.drawFeature();this.drawing=true;return false;},mousemove:function(evt){if(this.drawing){var lonlat=this.map.getLonLatFromPixel(evt.xy);this.point.geometry.x=lonlat.lon;this.point.geometry.y=lonlat.lat;if(this.mouseDown&&this.freehandMode(evt)){this.addPoint();}else{this.modifyFeature();}
-this.drawFeature();}
-return true;},mouseup:function(evt){this.mouseDown=false;if(this.drawing){if(this.freehandMode(evt)){this.finalize();}else{if(this.lastUp==null){this.addPoint();}
-this.lastUp=evt.xy;}
-return false;}
-return true;},dblclick:function(evt){if(!this.freehandMode(evt)){var index=this.line.geometry.components.length-1;this.line.geometry.removeComponent(this.line.geometry.components[index]);this.finalize();}
-return false;},CLASS_NAME:"OpenLayers.Handler.Path"});OpenLayers.Format.WFS=OpenLayers.Class(OpenLayers.Format.GML,{layer:null,wfsns:"http://www.opengis.net/wfs",ogcns:"http://www.opengis.net/ogc",initialize:function(options,layer){OpenLayers.Format.GML.prototype.initialize.apply(this,[options]);this.layer=layer;if(this.layer.featureNS){this.featureNS=this.layer.featureNS;}
+return value;},write:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];}
+var kml=this.createElementNS(this.kmlns,"kml");var folder=this.createFolderXML();for(var i=0,len=features.length;i<len;++i){folder.appendChild(this.createPlacemarkXML(features[i]));}
+kml.appendChild(folder);return OpenLayers.Format.XML.prototype.write.apply(this,[kml]);},createFolderXML:function(){var folder=this.createElementNS(this.kmlns,"Folder");if(this.foldersName){var folderName=this.createElementNS(this.kmlns,"name");var folderNameText=this.createTextNode(this.foldersName);folderName.appendChild(folderNameText);folder.appendChild(folderName);}
+if(this.foldersDesc){var folderDesc=this.createElementNS(this.kmlns,"description");var folderDescText=this.createTextNode(this.foldersDesc);folderDesc.appendChild(folderDescText);folder.appendChild(folderDesc);}
+return folder;},createPlacemarkXML:function(feature){var placemarkName=this.createElementNS(this.kmlns,"name");var name=feature.style&&feature.style.label?feature.style.label:feature.attributes.name||feature.id;placemarkName.appendChild(this.createTextNode(name));var placemarkDesc=this.createElementNS(this.kmlns,"description");var desc=feature.attributes.description||this.placemarksDesc;placemarkDesc.appendChild(this.createTextNode(desc));var placemarkNode=this.createElementNS(this.kmlns,"Placemark");if(feature.fid!=null){placemarkNode.setAttribute("id",feature.fid);}
+placemarkNode.appendChild(placemarkName);placemarkNode.appendChild(placemarkDesc);var geometryNode=this.buildGeometryNode(feature.geometry);placemarkNode.appendChild(geometryNode);if(feature.attributes){var edNode=this.buildExtendedData(feature.attributes);if(edNode){placemarkNode.appendChild(edNode);}}
+return placemarkNode;},buildGeometryNode:function(geometry){var className=geometry.CLASS_NAME;var type=className.substring(className.lastIndexOf(".")+1);var builder=this.buildGeometry[type.toLowerCase()];var node=null;if(builder){node=builder.apply(this,[geometry]);}
+return node;},buildGeometry:{point:function(geometry){var kml=this.createElementNS(this.kmlns,"Point");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},multipoint:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},linestring:function(geometry){var kml=this.createElementNS(this.kmlns,"LineString");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},multilinestring:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},linearring:function(geometry){var kml=this.createElementNS(this.kmlns,"LinearRing");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},polygon:function(geometry){var kml=this.createElementNS(this.kmlns,"Polygon");var rings=geometry.components;var ringMember,ringGeom,type;for(var i=0,len=rings.length;i<len;++i){type=(i==0)?"outerBoundaryIs":"innerBoundaryIs";ringMember=this.createElementNS(this.kmlns,type);ringGeom=this.buildGeometry.linearring.apply(this,[rings[i]]);ringMember.appendChild(ringGeom);kml.appendChild(ringMember);}
+return kml;},multipolygon:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},collection:function(geometry){var kml=this.createElementNS(this.kmlns,"MultiGeometry");var child;for(var i=0,len=geometry.components.length;i<len;++i){child=this.buildGeometryNode.apply(this,[geometry.components[i]]);if(child){kml.appendChild(child);}}
+return kml;}},buildCoordinatesNode:function(geometry){var coordinatesNode=this.createElementNS(this.kmlns,"coordinates");var path;var points=geometry.components;if(points){var point;var numPoints=points.length;var parts=new Array(numPoints);for(var i=0;i<numPoints;++i){point=points[i];parts[i]=this.buildCoordinates(point);}
+path=parts.join(" ");}else{path=this.buildCoordinates(geometry);}
+var txtNode=this.createTextNode(path);coordinatesNode.appendChild(txtNode);return coordinatesNode;},buildCoordinates:function(point){if(this.internalProjection&&this.externalProjection){point=point.clone();point.transform(this.internalProjection,this.externalProjection);}
+return point.x+","+point.y;},buildExtendedData:function(attributes){var extendedData=this.createElementNS(this.kmlns,"ExtendedData");for(var attributeName in attributes){if(attributes[attributeName]&&attributeName!="name"&&attributeName!="description"&&attributeName!="styleUrl"){var data=this.createElementNS(this.kmlns,"Data");data.setAttribute("name",attributeName);var value=this.createElementNS(this.kmlns,"value");if(typeof attributes[attributeName]=="object"){if(attributes[attributeName].value){value.appendChild(this.createTextNode(attributes[attributeName].value));}
+if(attributes[attributeName].displayName){var displayName=this.createElementNS(this.kmlns,"displayName");displayName.appendChild(this.getXMLDoc().createCDATASection(attributes[attributeName].displayName));data.appendChild(displayName);}}else{value.appendChild(this.createTextNode(attributes[attributeName]));}
+data.appendChild(value);extendedData.appendChild(data);}}
+if(this.isSimpleContent(extendedData)){return null;}else{return extendedData;}},CLASS_NAME:"OpenLayers.Format.KML"});OpenLayers.Popup=OpenLayers.Class({events:null,id:"",lonlat:null,div:null,contentSize:null,size:null,contentHTML:null,backgroundColor:"",opacity:"",border:"",contentDiv:null,groupDiv:null,closeDiv:null,autoSize:false,minSize:null,maxSize:null,displayClass:"olPopup",contentDisplayClass:"olPopupContent",padding:0,disableFirefoxOverflowHack:false,fixPadding:function(){if(typeof this.padding=="number"){this.padding=new OpenLayers.Bounds(this.padding,this.padding,this.padding,this.padding);}},panMapIfOutOfView:false,keepInMap:false,closeOnMove:false,map:null,initialize:function(id,lonlat,contentSize,contentHTML,closeBox,closeBoxCallback){if(id==null){id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");}
+this.id=id;this.lonlat=lonlat;this.contentSize=(contentSize!=null)?contentSize:new OpenLayers.Size(OpenLayers.Popup.WIDTH,OpenLayers.Popup.HEIGHT);if(contentHTML!=null){this.contentHTML=contentHTML;}
+this.backgroundColor=OpenLayers.Popup.COLOR;this.opacity=OpenLayers.Popup.OPACITY;this.border=OpenLayers.Popup.BORDER;this.div=OpenLayers.Util.createDiv(this.id,null,null,null,null,null,"hidden");this.div.className=this.displayClass;var groupDivId=this.id+"_GroupDiv";this.groupDiv=OpenLayers.Util.createDiv(groupDivId,null,null,null,"relative",null,"hidden");var id=this.div.id+"_contentDiv";this.contentDiv=OpenLayers.Util.createDiv(id,null,this.contentSize.clone(),null,"relative");this.contentDiv.className=this.contentDisplayClass;this.groupDiv.appendChild(this.contentDiv);this.div.appendChild(this.groupDiv);if(closeBox){this.addCloseBox(closeBoxCallback);}
+this.registerEvents();},destroy:function(){this.id=null;this.lonlat=null;this.size=null;this.contentHTML=null;this.backgroundColor=null;this.opacity=null;this.border=null;if(this.closeOnMove&&this.map){this.map.events.unregister("movestart",this,this.hide);}
+this.events.destroy();this.events=null;if(this.closeDiv){OpenLayers.Event.stopObservingElement(this.closeDiv);this.groupDiv.removeChild(this.closeDiv);}
+this.closeDiv=null;this.div.removeChild(this.groupDiv);this.groupDiv=null;if(this.map!=null){this.map.removePopup(this);}
+this.map=null;this.div=null;this.autoSize=null;this.minSize=null;this.maxSize=null;this.padding=null;this.panMapIfOutOfView=null;},draw:function(px){if(px==null){if((this.lonlat!=null)&&(this.map!=null)){px=this.map.getLayerPxFromLonLat(this.lonlat);}}
+if(this.closeOnMove){this.map.events.register("movestart",this,this.hide);}
+if(!this.disableFirefoxOverflowHack&&OpenLayers.BROWSER_NAME=='firefox'){this.map.events.register("movestart",this,function(){var style=document.defaultView.getComputedStyle(this.contentDiv,null);var currentOverflow=style.getPropertyValue("overflow");if(currentOverflow!="hidden"){this.contentDiv._oldOverflow=currentOverflow;this.contentDiv.style.overflow="hidden";}});this.map.events.register("moveend",this,function(){var oldOverflow=this.contentDiv._oldOverflow;if(oldOverflow){this.contentDiv.style.overflow=oldOverflow;this.contentDiv._oldOverflow=null;}});}
+this.moveTo(px);if(!this.autoSize&&!this.size){this.setSize(this.contentSize);}
+this.setBackgroundColor();this.setOpacity();this.setBorder();this.setContentHTML();if(this.panMapIfOutOfView){this.panIntoView();}
+return this.div;},updatePosition:function(){if((this.lonlat)&&(this.map)){var px=this.map.getLayerPxFromLonLat(this.lonlat);if(px){this.moveTo(px);}}},moveTo:function(px){if((px!=null)&&(this.div!=null)){this.div.style.left=px.x+"px";this.div.style.top=px.y+"px";}},visible:function(){return OpenLayers.Element.visible(this.div);},toggle:function(){if(this.visible()){this.hide();}else{this.show();}},show:function(){this.div.style.display='';if(this.panMapIfOutOfView){this.panIntoView();}},hide:function(){this.div.style.display='none';},setSize:function(contentSize){this.size=contentSize.clone();var contentDivPadding=this.getContentDivPadding();var wPadding=contentDivPadding.left+contentDivPadding.right;var hPadding=contentDivPadding.top+contentDivPadding.bottom;this.fixPadding();wPadding+=this.padding.left+this.padding.right;hPadding+=this.padding.top+this.padding.bottom;if(this.closeDiv){var closeDivWidth=parseInt(this.closeDiv.style.width);wPadding+=closeDivWidth+contentDivPadding.right;}
+this.size.w+=wPadding;this.size.h+=hPadding;if(OpenLayers.BROWSER_NAME=="msie"){this.contentSize.w+=contentDivPadding.left+contentDivPadding.right;this.contentSize.h+=contentDivPadding.bottom+contentDivPadding.top;}
+if(this.div!=null){this.div.style.width=this.size.w+"px";this.div.style.height=this.size.h+"px";}
+if(this.contentDiv!=null){this.contentDiv.style.width=contentSize.w+"px";this.contentDiv.style.height=contentSize.h+"px";}},updateSize:function(){var preparedHTML="<div class='"+this.contentDisplayClass+"'>"+
+this.contentDiv.innerHTML+"</div>";var containerElement=(this.map)?this.map.div:document.body;var realSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,null,{displayClass:this.displayClass,containerElement:containerElement});var safeSize=this.getSafeContentSize(realSize);var newSize=null;if(safeSize.equals(realSize)){newSize=realSize;}else{var fixedSize={w:(safeSize.w<realSize.w)?safeSize.w:null,h:(safeSize.h<realSize.h)?safeSize.h:null};if(fixedSize.w&&fixedSize.h){newSize=safeSize;}else{var clippedSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,fixedSize,{displayClass:this.contentDisplayClass,containerElement:containerElement});var currentOverflow=OpenLayers.Element.getStyle(this.contentDiv,"overflow");if((currentOverflow!="hidden")&&(clippedSize.equals(safeSize))){var scrollBar=OpenLayers.Util.getScrollbarWidth();if(fixedSize.w){clippedSize.h+=scrollBar;}else{clippedSize.w+=scrollBar;}}
+newSize=this.getSafeContentSize(clippedSize);}}
+this.setSize(newSize);},setBackgroundColor:function(color){if(color!=undefined){this.backgroundColor=color;}
+if(this.div!=null){this.div.style.backgroundColor=this.backgroundColor;}},setOpacity:function(opacity){if(opacity!=undefined){this.opacity=opacity;}
+if(this.div!=null){this.div.style.opacity=this.opacity;this.div.style.filter='alpha(opacity='+this.opacity*100+')';}},setBorder:function(border){if(border!=undefined){this.border=border;}
+if(this.div!=null){this.div.style.border=this.border;}},setContentHTML:function(contentHTML){if(contentHTML!=null){this.contentHTML=contentHTML;}
+if((this.contentDiv!=null)&&(this.contentHTML!=null)&&(this.contentHTML!=this.contentDiv.innerHTML)){this.contentDiv.innerHTML=this.contentHTML;if(this.autoSize){this.registerImageListeners();this.updateSize();}}},registerImageListeners:function(){var onImgLoad=function(){if(this.popup.id===null){return;}
+this.popup.updateSize();if(this.popup.visible()&&this.popup.panMapIfOutOfView){this.popup.panIntoView();}
+OpenLayers.Event.stopObserving(this.img,"load",this.img._onImageLoad);};var images=this.contentDiv.getElementsByTagName("img");for(var i=0,len=images.length;i<len;i++){var img=images[i];if(img.width==0||img.height==0){var context={'popup':this,'img':img};img._onImgLoad=OpenLayers.Function.bind(onImgLoad,context);OpenLayers.Event.observe(img,'load',img._onImgLoad);}}},getSafeContentSize:function(size){var safeContentSize=size.clone();var contentDivPadding=this.getContentDivPadding();var wPadding=contentDivPadding.left+contentDivPadding.right;var hPadding=contentDivPadding.top+contentDivPadding.bottom;this.fixPadding();wPadding+=this.padding.left+this.padding.right;hPadding+=this.padding.top+this.padding.bottom;if(this.closeDiv){var closeDivWidth=parseInt(this.closeDiv.style.width);wPadding+=closeDivWidth+contentDivPadding.right;}
+if(this.minSize){safeContentSize.w=Math.max(safeContentSize.w,(this.minSize.w-wPadding));safeContentSize.h=Math.max(safeContentSize.h,(this.minSize.h-hPadding));}
+if(this.maxSize){safeContentSize.w=Math.min(safeContentSize.w,(this.maxSize.w-wPadding));safeContentSize.h=Math.min(safeContentSize.h,(this.maxSize.h-hPadding));}
+if(this.map&&this.map.size){var extraX=0,extraY=0;if(this.keepInMap&&!this.panMapIfOutOfView){var px=this.map.getPixelFromLonLat(this.lonlat);switch(this.relativePosition){case"tr":extraX=px.x;extraY=this.map.size.h-px.y;break;case"tl":extraX=this.map.size.w-px.x;extraY=this.map.size.h-px.y;break;case"bl":extraX=this.map.size.w-px.x;extraY=px.y;break;case"br":extraX=px.x;extraY=px.y;break;default:extraX=px.x;extraY=this.map.size.h-px.y;break;}}
+var maxY=this.map.size.h-
+this.map.paddingForPopups.top-
+this.map.paddingForPopups.bottom-
+hPadding-extraY;var maxX=this.map.size.w-
+this.map.paddingForPopups.left-
+this.map.paddingForPopups.right-
+wPadding-extraX;safeContentSize.w=Math.min(safeContentSize.w,maxX);safeContentSize.h=Math.min(safeContentSize.h,maxY);}
+return safeContentSize;},getContentDivPadding:function(){var contentDivPadding=this._contentDivPadding;if(!contentDivPadding){if(this.div.parentNode==null){this.div.style.display="none";document.body.appendChild(this.div);}
+contentDivPadding=new OpenLayers.Bounds(OpenLayers.Element.getStyle(this.contentDiv,"padding-left"),OpenLayers.Element.getStyle(this.contentDiv,"padding-bottom"),OpenLayers.Element.getStyle(this.contentDiv,"padding-right"),OpenLayers.Element.getStyle(this.contentDiv,"padding-top"));this._contentDivPadding=contentDivPadding;if(this.div.parentNode==document.body){document.body.removeChild(this.div);this.div.style.display="";}}
+return contentDivPadding;},addCloseBox:function(callback){this.closeDiv=OpenLayers.Util.createDiv(this.id+"_close",null,{w:17,h:17});this.closeDiv.className="olPopupCloseBox";var contentDivPadding=this.getContentDivPadding();this.closeDiv.style.right=contentDivPadding.right+"px";this.closeDiv.style.top=contentDivPadding.top+"px";this.groupDiv.appendChild(this.closeDiv);var closePopup=callback||function(e){this.hide();OpenLayers.Event.stop(e);};OpenLayers.Event.observe(this.closeDiv,"touchend",OpenLayers.Function.bindAsEventListener(closePopup,this));OpenLayers.Event.observe(this.closeDiv,"click",OpenLayers.Function.bindAsEventListener(closePopup,this));},panIntoView:function(){var mapSize=this.map.getSize();var origTL=this.map.getViewPortPxFromLayerPx(new OpenLayers.Pixel(parseInt(this.div.style.left),parseInt(this.div.style.top)));var newTL=origTL.clone();if(origTL.x<this.map.paddingForPopups.left){newTL.x=this.map.paddingForPopups.left;}else
+if((origTL.x+this.size.w)>(mapSize.w-this.map.paddingForPopups.right)){newTL.x=mapSize.w-this.map.paddingForPopups.right-this.size.w;}
+if(origTL.y<this.map.paddingForPopups.top){newTL.y=this.map.paddingForPopups.top;}else
+if((origTL.y+this.size.h)>(mapSize.h-this.map.paddingForPopups.bottom)){newTL.y=mapSize.h-this.map.paddingForPopups.bottom-this.size.h;}
+var dx=origTL.x-newTL.x;var dy=origTL.y-newTL.y;this.map.pan(dx,dy);},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,true);function onTouchstart(evt){OpenLayers.Event.stop(evt,true);}
+this.events.on({"mousedown":this.onmousedown,"mousemove":this.onmousemove,"mouseup":this.onmouseup,"click":this.onclick,"mouseout":this.onmouseout,"dblclick":this.ondblclick,"touchstart":onTouchstart,scope:this});},onmousedown:function(evt){this.mousedown=true;OpenLayers.Event.stop(evt,true);},onmousemove:function(evt){if(this.mousedown){OpenLayers.Event.stop(evt,true);}},onmouseup:function(evt){if(this.mousedown){this.mousedown=false;OpenLayers.Event.stop(evt,true);}},onclick:function(evt){OpenLayers.Event.stop(evt,true);},onmouseout:function(evt){this.mousedown=false;},ondblclick:function(evt){OpenLayers.Event.stop(evt,true);},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white";OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:true,anchor:null,initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){var newArguments=[id,lonlat,contentSize,contentHTML,closeBox,closeBoxCallback];OpenLayers.Popup.prototype.initialize.apply(this,newArguments);this.anchor=(anchor!=null)?anchor:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)};},destroy:function(){this.anchor=null;this.relativePosition=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments);},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments);},moveTo:function(px){var oldRelativePosition=this.relativePosition;this.relativePosition=this.calculateRelativePosition(px);var newPx=this.calculateNewPx(px);var newArguments=new Array(newPx);OpenLayers.Popup.prototype.moveTo.apply(this,newArguments);if(this.relativePosition!=oldRelativePosition){this.updateRelativePosition();}},setSize:function(contentSize){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if((this.lonlat)&&(this.map)){var px=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(px);}},calculateRelativePosition:function(px){var lonlat=this.map.getLonLatFromLayerPx(px);var extent=this.map.getExtent();var quadrant=extent.determineQuadrant(lonlat);return OpenLayers.Bounds.oppositeQuadrant(quadrant);},updateRelativePosition:function(){},calculateNewPx:function(px){var newPx=px.offset(this.anchor.offset);var size=this.size||this.contentSize;var top=(this.relativePosition.charAt(0)=='t');newPx.y+=(top)?-size.h:this.anchor.size.h;var left=(this.relativePosition.charAt(1)=='l');newPx.x+=(left)?-size.w:this.anchor.size.w;return newPx;},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Console.warn("OpenLayers.Rico is deprecated");OpenLayers.Rico=OpenLayers.Rico||{};OpenLayers.Rico.Color=OpenLayers.Class({initialize:function(red,green,blue){this.rgb={r:red,g:green,b:blue};},setRed:function(r){this.rgb.r=r;},setGreen:function(g){this.rgb.g=g;},setBlue:function(b){this.rgb.b=b;},setHue:function(h){var hsb=this.asHSB();hsb.h=h;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},setSaturation:function(s){var hsb=this.asHSB();hsb.s=s;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},setBrightness:function(b){var hsb=this.asHSB();hsb.b=b;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},darken:function(percent){var hsb=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,Math.max(hsb.b-percent,0));},brighten:function(percent){var hsb=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,Math.min(hsb.b+percent,1));},blend:function(other){this.rgb.r=Math.floor((this.rgb.r+other.rgb.r)/2);this.rgb.g=Math.floor((this.rgb.g+other.rgb.g)/2);this.rgb.b=Math.floor((this.rgb.b+other.rgb.b)/2);},isBright:function(){var hsb=this.asHSB();return this.asHSB().b>0.5;},isDark:function(){return!this.isBright();},asRGB:function(){return"rgb("+this.rgb.r+","+this.rgb.g+","+this.rgb.b+")";},asHex:function(){return"#"+this.rgb.r.toColorPart()+this.rgb.g.toColorPart()+this.rgb.b.toColorPart();},asHSB:function(){return OpenLayers.Rico.Color.RGBtoHSB(this.rgb.r,this.rgb.g,this.rgb.b);},toString:function(){return this.asHex();}});OpenLayers.Rico.Color.createFromHex=function(hexCode){if(hexCode.length==4){var shortHexCode=hexCode;var hexCode='#';for(var i=1;i<4;i++){hexCode+=(shortHexCode.charAt(i)+
+shortHexCode.charAt(i));}}
+if(hexCode.indexOf('#')==0){hexCode=hexCode.substring(1);}
+var red=hexCode.substring(0,2);var green=hexCode.substring(2,4);var blue=hexCode.substring(4,6);return new OpenLayers.Rico.Color(parseInt(red,16),parseInt(green,16),parseInt(blue,16));};OpenLayers.Rico.Color.createColorFromBackground=function(elem){var actualColor=OpenLayers.Element.getStyle(OpenLayers.Util.getElement(elem),"backgroundColor");if(actualColor=="transparent"&&elem.parentNode){return OpenLayers.Rico.Color.createColorFromBackground(elem.parentNode);}
+if(actualColor==null){return new OpenLayers.Rico.Color(255,255,255);}
+if(actualColor.indexOf("rgb(")==0){var colors=actualColor.substring(4,actualColor.length-1);var colorArray=colors.split(",");return new OpenLayers.Rico.Color(parseInt(colorArray[0]),parseInt(colorArray[1]),parseInt(colorArray[2]));}
+else if(actualColor.indexOf("#")==0){return OpenLayers.Rico.Color.createFromHex(actualColor);}
+else{return new OpenLayers.Rico.Color(255,255,255);}};OpenLayers.Rico.Color.HSBtoRGB=function(hue,saturation,brightness){var red=0;var green=0;var blue=0;if(saturation==0){red=parseInt(brightness*255.0+0.5);green=red;blue=red;}
+else{var h=(hue-Math.floor(hue))*6.0;var f=h-Math.floor(h);var p=brightness*(1.0-saturation);var q=brightness*(1.0-saturation*f);var t=brightness*(1.0-(saturation*(1.0-f)));switch(parseInt(h)){case 0:red=(brightness*255.0+0.5);green=(t*255.0+0.5);blue=(p*255.0+0.5);break;case 1:red=(q*255.0+0.5);green=(brightness*255.0+0.5);blue=(p*255.0+0.5);break;case 2:red=(p*255.0+0.5);green=(brightness*255.0+0.5);blue=(t*255.0+0.5);break;case 3:red=(p*255.0+0.5);green=(q*255.0+0.5);blue=(brightness*255.0+0.5);break;case 4:red=(t*255.0+0.5);green=(p*255.0+0.5);blue=(brightness*255.0+0.5);break;case 5:red=(brightness*255.0+0.5);green=(p*255.0+0.5);blue=(q*255.0+0.5);break;}}
+return{r:parseInt(red),g:parseInt(green),b:parseInt(blue)};};OpenLayers.Rico.Color.RGBtoHSB=function(r,g,b){var hue;var saturation;var brightness;var cmax=(r>g)?r:g;if(b>cmax){cmax=b;}
+var cmin=(r<g)?r:g;if(b<cmin){cmin=b;}
+brightness=cmax/255.0;if(cmax!=0){saturation=(cmax-cmin)/cmax;}else{saturation=0;}
+if(saturation==0){hue=0;}else{var redc=(cmax-r)/(cmax-cmin);var greenc=(cmax-g)/(cmax-cmin);var bluec=(cmax-b)/(cmax-cmin);if(r==cmax){hue=bluec-greenc;}else if(g==cmax){hue=2.0+redc-bluec;}else{hue=4.0+greenc-redc;}
+hue=hue/6.0;if(hue<0){hue=hue+1.0;}}
+return{h:hue,s:saturation,b:brightness};};OpenLayers.Console.warn("OpenLayers.Rico is deprecated");OpenLayers.Rico=OpenLayers.Rico||{};OpenLayers.Rico.Corner={round:function(e,options){e=OpenLayers.Util.getElement(e);this._setOptions(options);var color=this.options.color;if(this.options.color=="fromElement"){color=this._background(e);}
+var bgColor=this.options.bgColor;if(this.options.bgColor=="fromParent"){bgColor=this._background(e.offsetParent);}
+this._roundCornersImpl(e,color,bgColor);},changeColor:function(theDiv,newColor){theDiv.style.backgroundColor=newColor;var spanElements=theDiv.parentNode.getElementsByTagName("span");for(var currIdx=0;currIdx<spanElements.length;currIdx++){spanElements[currIdx].style.backgroundColor=newColor;}},changeOpacity:function(theDiv,newOpacity){var mozillaOpacity=newOpacity;var ieOpacity='alpha(opacity='+newOpacity*100+')';theDiv.style.opacity=mozillaOpacity;theDiv.style.filter=ieOpacity;var spanElements=theDiv.parentNode.getElementsByTagName("span");for(var currIdx=0;currIdx<spanElements.length;currIdx++){spanElements[currIdx].style.opacity=mozillaOpacity;spanElements[currIdx].style.filter=ieOpacity;}},reRound:function(theDiv,options){var topRico=theDiv.parentNode.childNodes[0];var bottomRico=theDiv.parentNode.childNodes[2];theDiv.parentNode.removeChild(topRico);theDiv.parentNode.removeChild(bottomRico);this.round(theDiv.parentNode,options);},_roundCornersImpl:function(e,color,bgColor){if(this.options.border){this._renderBorder(e,bgColor);}
+if(this._isTopRounded()){this._roundTopCorners(e,color,bgColor);}
+if(this._isBottomRounded()){this._roundBottomCorners(e,color,bgColor);}},_renderBorder:function(el,bgColor){var borderValue="1px solid "+this._borderColor(bgColor);var borderL="border-left: "+borderValue;var borderR="border-right: "+borderValue;var style="style='"+borderL+";"+borderR+"'";el.innerHTML="<div "+style+">"+el.innerHTML+"</div>";},_roundTopCorners:function(el,color,bgColor){var corner=this._createCorner(bgColor);for(var i=0;i<this.options.numSlices;i++){corner.appendChild(this._createCornerSlice(color,bgColor,i,"top"));}
+el.style.paddingTop=0;el.insertBefore(corner,el.firstChild);},_roundBottomCorners:function(el,color,bgColor){var corner=this._createCorner(bgColor);for(var i=(this.options.numSlices-1);i>=0;i--){corner.appendChild(this._createCornerSlice(color,bgColor,i,"bottom"));}
+el.style.paddingBottom=0;el.appendChild(corner);},_createCorner:function(bgColor){var corner=document.createElement("div");corner.style.backgroundColor=(this._isTransparent()?"transparent":bgColor);return corner;},_createCornerSlice:function(color,bgColor,n,position){var slice=document.createElement("span");var inStyle=slice.style;inStyle.backgroundColor=color;inStyle.display="block";inStyle.height="1px";inStyle.overflow="hidden";inStyle.fontSize="1px";var borderColor=this._borderColor(color,bgColor);if(this.options.border&&n==0){inStyle.borderTopStyle="solid";inStyle.borderTopWidth="1px";inStyle.borderLeftWidth="0px";inStyle.borderRightWidth="0px";inStyle.borderBottomWidth="0px";inStyle.height="0px";inStyle.borderColor=borderColor;}
+else if(borderColor){inStyle.borderColor=borderColor;inStyle.borderStyle="solid";inStyle.borderWidth="0px 1px";}
+if(!this.options.compact&&(n==(this.options.numSlices-1))){inStyle.height="2px";}
+this._setMargin(slice,n,position);this._setBorder(slice,n,position);return slice;},_setOptions:function(options){this.options={corners:"all",color:"fromElement",bgColor:"fromParent",blend:true,border:false,compact:false};OpenLayers.Util.extend(this.options,options||{});this.options.numSlices=this.options.compact?2:4;if(this._isTransparent()){this.options.blend=false;}},_whichSideTop:function(){if(this._hasString(this.options.corners,"all","top")){return"";}
+if(this.options.corners.indexOf("tl")>=0&&this.options.corners.indexOf("tr")>=0){return"";}
+if(this.options.corners.indexOf("tl")>=0){return"left";}else if(this.options.corners.indexOf("tr")>=0){return"right";}
+return"";},_whichSideBottom:function(){if(this._hasString(this.options.corners,"all","bottom")){return"";}
+if(this.options.corners.indexOf("bl")>=0&&this.options.corners.indexOf("br")>=0){return"";}
+if(this.options.corners.indexOf("bl")>=0){return"left";}else if(this.options.corners.indexOf("br")>=0){return"right";}
+return"";},_borderColor:function(color,bgColor){if(color=="transparent"){return bgColor;}else if(this.options.border){return this.options.border;}else if(this.options.blend){return this._blend(bgColor,color);}else{return"";}},_setMargin:function(el,n,corners){var marginSize=this._marginSize(n);var whichSide=corners=="top"?this._whichSideTop():this._whichSideBottom();if(whichSide=="left"){el.style.marginLeft=marginSize+"px";el.style.marginRight="0px";}
+else if(whichSide=="right"){el.style.marginRight=marginSize+"px";el.style.marginLeft="0px";}
+else{el.style.marginLeft=marginSize+"px";el.style.marginRight=marginSize+"px";}},_setBorder:function(el,n,corners){var borderSize=this._borderSize(n);var whichSide=corners=="top"?this._whichSideTop():this._whichSideBottom();if(whichSide=="left"){el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth="0px";}
+else if(whichSide=="right"){el.style.borderRightWidth=borderSize+"px";el.style.borderLeftWidth="0px";}
+else{el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth=borderSize+"px";}
+if(this.options.border!=false){el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth=borderSize+"px";}},_marginSize:function(n){if(this._isTransparent()){return 0;}
+var marginSizes=[5,3,2,1];var blendedMarginSizes=[3,2,1,0];var compactMarginSizes=[2,1];var smBlendedMarginSizes=[1,0];if(this.options.compact&&this.options.blend){return smBlendedMarginSizes[n];}else if(this.options.compact){return compactMarginSizes[n];}else if(this.options.blend){return blendedMarginSizes[n];}else{return marginSizes[n];}},_borderSize:function(n){var transparentBorderSizes=[5,3,2,1];var blendedBorderSizes=[2,1,1,1];var compactBorderSizes=[1,0];var actualBorderSizes=[0,2,0,0];if(this.options.compact&&(this.options.blend||this._isTransparent())){return 1;}else if(this.options.compact){return compactBorderSizes[n];}else if(this.options.blend){return blendedBorderSizes[n];}else if(this.options.border){return actualBorderSizes[n];}else if(this._isTransparent()){return transparentBorderSizes[n];}
+return 0;},_hasString:function(str){for(var i=1;i<arguments.length;i++)if(str.indexOf(arguments[i])>=0){return true;}return false;},_blend:function(c1,c2){var cc1=OpenLayers.Rico.Color.createFromHex(c1);cc1.blend(OpenLayers.Rico.Color.createFromHex(c2));return cc1;},_background:function(el){try{return OpenLayers.Rico.Color.createColorFromBackground(el).asHex();}catch(err){return"#ffffff";}},_isTransparent:function(){return this.options.color=="transparent";},_isTopRounded:function(){return this._hasString(this.options.corners,"all","top","tl","tr");},_isBottomRounded:function(){return this._hasString(this.options.corners,"all","bottom","bl","br");},_hasSingleTextChild:function(el){return el.childNodes.length==1&&el.childNodes[0].nodeType==3;}};OpenLayers.Popup.AnchoredBubble=OpenLayers.Class(OpenLayers.Popup.Anchored,{rounded:false,initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){OpenLayers.Console.warn('AnchoredBubble is deprecated');this.padding=new OpenLayers.Bounds(0,OpenLayers.Popup.AnchoredBubble.CORNER_SIZE,0,OpenLayers.Popup.AnchoredBubble.CORNER_SIZE);OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);},draw:function(px){OpenLayers.Popup.Anchored.prototype.draw.apply(this,arguments);this.setContentHTML();this.setBackgroundColor();this.setOpacity();return this.div;},updateRelativePosition:function(){this.setRicoCorners();},setSize:function(contentSize){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.setRicoCorners();},setBackgroundColor:function(color){if(color!=undefined){this.backgroundColor=color;}
+if(this.div!=null){if(this.contentDiv!=null){this.div.style.background="transparent";OpenLayers.Rico.Corner.changeColor(this.groupDiv,this.backgroundColor);}}},setOpacity:function(opacity){OpenLayers.Popup.Anchored.prototype.setOpacity.call(this,opacity);if(this.div!=null){if(this.groupDiv!=null){OpenLayers.Rico.Corner.changeOpacity(this.groupDiv,this.opacity);}}},setBorder:function(border){this.border=0;},setRicoCorners:function(){var corners=this.getCornersToRound(this.relativePosition);var options={corners:corners,color:this.backgroundColor,bgColor:"transparent",blend:false};if(!this.rounded){OpenLayers.Rico.Corner.round(this.div,options);this.rounded=true;}else{OpenLayers.Rico.Corner.reRound(this.groupDiv,options);this.setBackgroundColor();this.setOpacity();}},getCornersToRound:function(){var corners=['tl','tr','bl','br'];var corner=OpenLayers.Bounds.oppositeQuadrant(this.relativePosition);OpenLayers.Util.removeItem(corners,corner);return corners.join(" ");},CLASS_NAME:"OpenLayers.Popup.AnchoredBubble"});OpenLayers.Popup.AnchoredBubble.CORNER_SIZE=5;OpenLayers.Protocol.WFS.v1=OpenLayers.Class(OpenLayers.Protocol,{version:null,srsName:"EPSG:4326",featureType:null,featureNS:null,geometryName:"the_geom",schema:null,featurePrefix:"feature",formatOptions:null,readFormat:null,readOptions:null,initialize:function(options){OpenLayers.Protocol.prototype.initialize.apply(this,[options]);if(!options.format){this.format=OpenLayers.Format.WFST(OpenLayers.Util.extend({version:this.version,featureType:this.featureType,featureNS:this.featureNS,featurePrefix:this.featurePrefix,geometryName:this.geometryName,srsName:this.srsName,schema:this.schema},this.formatOptions));}
+if(!options.geometryName&&parseFloat(this.format.version)>1.0){this.setGeometryName(null);}},destroy:function(){if(this.options&&!this.options.format){this.format.destroy();}
+this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){OpenLayers.Protocol.prototype.read.apply(this,arguments);options=OpenLayers.Util.extend({},options);OpenLayers.Util.applyDefaults(options,this.options||{});var response=new OpenLayers.Protocol.Response({requestType:"read"});var data=OpenLayers.Format.XML.prototype.write.apply(this.format,[this.format.writeNode("wfs:GetFeature",options)]);response.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,response,options),params:options.params,headers:options.headers,data:data});return response;},setFeatureType:function(featureType){this.featureType=featureType;this.format.featureType=featureType;},setGeometryName:function(geometryName){this.geometryName=geometryName;this.format.geometryName=geometryName;},handleRead:function(response,options){options=OpenLayers.Util.extend({},options);OpenLayers.Util.applyDefaults(options,this.options);if(options.callback){var request=response.priv;if(request.status>=200&&request.status<300){var result=this.parseResponse(request,options.readOptions);if(result&&result.success!==false){if(options.readOptions&&options.readOptions.output=="object"){OpenLayers.Util.extend(response,result);}else{response.features=result;}
+response.code=OpenLayers.Protocol.Response.SUCCESS;}else{response.code=OpenLayers.Protocol.Response.FAILURE;response.error=result;}}else{response.code=OpenLayers.Protocol.Response.FAILURE;}
+options.callback.call(options.scope,response);}},parseResponse:function(request,options){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
+if(!doc||doc.length<=0){return null;}
+var result=(this.readFormat!==null)?this.readFormat.read(doc):this.format.read(doc,options);if(!this.featureNS){var format=this.readFormat||this.format;this.featureNS=format.featureNS;format.autoConfig=false;if(!this.geometryName){this.setGeometryName(format.geometryName);}}
+return result;},commit:function(features,options){options=OpenLayers.Util.extend({},options);OpenLayers.Util.applyDefaults(options,this.options);var response=new OpenLayers.Protocol.Response({requestType:"commit",reqFeatures:features});response.priv=OpenLayers.Request.POST({url:options.url,headers:options.headers,data:this.format.write(features,options),callback:this.createCallback(this.handleCommit,response,options)});return response;},handleCommit:function(response,options){if(options.callback){var request=response.priv;var data=request.responseXML;if(!data||!data.documentElement){data=request.responseText;}
+var obj=this.format.read(data)||{};response.insertIds=obj.insertIds||[];if(obj.success){response.code=OpenLayers.Protocol.Response.SUCCESS;}else{response.code=OpenLayers.Protocol.Response.FAILURE;response.error=obj;}
+options.callback.call(options.scope,response);}},filterDelete:function(filter,options){options=OpenLayers.Util.extend({},options);OpenLayers.Util.applyDefaults(options,this.options);var response=new OpenLayers.Protocol.Response({requestType:"commit"});var root=this.format.createElementNSPlus("wfs:Transaction",{attributes:{service:"WFS",version:this.version}});var deleteNode=this.format.createElementNSPlus("wfs:Delete",{attributes:{typeName:(options.featureNS?this.featurePrefix+":":"")+
+options.featureType}});if(options.featureNS){deleteNode.setAttribute("xmlns:"+this.featurePrefix,options.featureNS);}
+var filterNode=this.format.writeNode("ogc:Filter",filter);deleteNode.appendChild(filterNode);root.appendChild(deleteNode);var data=OpenLayers.Format.XML.prototype.write.apply(this.format,[root]);return OpenLayers.Request.POST({url:this.url,callback:options.callback||function(){},data:data});},abort:function(response){if(response){response.priv.abort();}},CLASS_NAME:"OpenLayers.Protocol.WFS.v1"});OpenLayers.Spherical=OpenLayers.Spherical||{};OpenLayers.Spherical.DEFAULT_RADIUS=6378137;OpenLayers.Spherical.computeDistanceBetween=function(from,to,radius){var R=radius||OpenLayers.Spherical.DEFAULT_RADIUS;var sinHalfDeltaLon=Math.sin(Math.PI*(to.lon-from.lon)/360);var sinHalfDeltaLat=Math.sin(Math.PI*(to.lat-from.lat)/360);var a=sinHalfDeltaLat*sinHalfDeltaLat+
+sinHalfDeltaLon*sinHalfDeltaLon*Math.cos(Math.PI*from.lat/180)*Math.cos(Math.PI*to.lat/180);return 2*R*Math.atan2(Math.sqrt(a),Math.sqrt(1-a));};OpenLayers.Spherical.computeHeading=function(from,to){var y=Math.sin(Math.PI*(from.lon-to.lon)/180)*Math.cos(Math.PI*to.lat/180);var x=Math.cos(Math.PI*from.lat/180)*Math.sin(Math.PI*to.lat/180)-
+Math.sin(Math.PI*from.lat/180)*Math.cos(Math.PI*to.lat/180)*Math.cos(Math.PI*(from.lon-to.lon)/180);return 180*Math.atan2(y,x)/Math.PI;};OpenLayers.Control.CacheWrite=OpenLayers.Class(OpenLayers.Control,{layers:null,imageFormat:"image/png",quotaRegEx:(/quota/i),setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);var i,layers=this.layers||map.layers;for(i=layers.length-1;i>=0;--i){this.addLayer({layer:layers[i]});}
+if(!this.layers){map.events.on({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this});}},addLayer:function(evt){evt.layer.events.on({tileloadstart:this.makeSameOrigin,tileloaded:this.cache,scope:this});},removeLayer:function(evt){evt.layer.events.un({tileloadstart:this.makeSameOrigin,tileloaded:this.cache,scope:this});},makeSameOrigin:function(evt){if(this.active){var tile=evt.tile;if(tile instanceof OpenLayers.Tile.Image&&!tile.crossOriginKeyword&&tile.url.substr(0,5)!=="data:"){var sameOriginUrl=OpenLayers.Request.makeSameOrigin(tile.url,OpenLayers.ProxyHost);OpenLayers.Control.CacheWrite.urlMap[sameOriginUrl]=tile.url;tile.url=sameOriginUrl;}}},cache:function(obj){if(this.active&&window.localStorage){var tile=obj.tile;if(tile instanceof OpenLayers.Tile.Image&&tile.url.substr(0,5)!=='data:'){try{var canvasContext=tile.getCanvasContext();if(canvasContext){var urlMap=OpenLayers.Control.CacheWrite.urlMap;var url=urlMap[tile.url]||tile.url;window.localStorage.setItem("olCache_"+url,canvasContext.canvas.toDataURL(this.imageFormat));delete urlMap[tile.url];}}catch(e){var reason=e.name||e.message;if(reason&&this.quotaRegEx.test(reason)){this.events.triggerEvent("cachefull",{tile:tile});}else{OpenLayers.Console.error(e.toString());}}}}},destroy:function(){if(this.layers||this.map){var i,layers=this.layers||this.map.layers;for(i=layers.length-1;i>=0;--i){this.removeLayer({layer:layers[i]});}}
+if(this.map){this.map.events.un({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this});}
+OpenLayers.Control.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.CacheWrite"});OpenLayers.Control.CacheWrite.clearCache=function(){if(!window.localStorage){return;}
+var i,key;for(i=window.localStorage.length-1;i>=0;--i){key=window.localStorage.key(i);if(key.substr(0,8)==="olCache_"){window.localStorage.removeItem(key);}}};OpenLayers.Control.CacheWrite.urlMap={};OpenLayers.Control.PanPanel=OpenLayers.Class(OpenLayers.Control.Panel,{slideFactor:50,slideRatio:null,initialize:function(options){OpenLayers.Control.Panel.prototype.initialize.apply(this,[options]);var options={slideFactor:this.slideFactor,slideRatio:this.slideRatio};this.addControls([new OpenLayers.Control.Pan(OpenLayers.Control.Pan.NORTH,options),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.SOUTH,options),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.EAST,options),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.WEST,options)]);},CLASS_NAME:"OpenLayers.Control.PanPanel"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",template:"${layers}",destroy:function(){this.map.events.un({"removelayer":this.updateAttribution,"addlayer":this.updateAttribution,"changelayer":this.updateAttribution,"changebaselayer":this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({'changebaselayer':this.updateAttribution,'changelayer':this.updateAttribution,'addlayer':this.updateAttribution,'removelayer':this.updateAttribution,scope:this});this.updateAttribution();return this.div;},updateAttribution:function(){var attributions=[];if(this.map&&this.map.layers){for(var i=0,len=this.map.layers.length;i<len;i++){var layer=this.map.layers[i];if(layer.attribution&&layer.getVisibility()){if(OpenLayers.Util.indexOf(attributions,layer.attribution)===-1){attributions.push(layer.attribution);}}}
+this.div.innerHTML=OpenLayers.String.format(this.template,{layers:attributions.join(this.separator)});}},CLASS_NAME:"OpenLayers.Control.Attribution"});OpenLayers.Kinetic=OpenLayers.Class({threshold:0,deceleration:0.0035,nbPoints:100,delay:200,points:undefined,timerId:undefined,initialize:function(options){OpenLayers.Util.extend(this,options);},begin:function(){OpenLayers.Animation.stop(this.timerId);this.timerId=undefined;this.points=[];},update:function(xy){this.points.unshift({xy:xy,tick:new Date().getTime()});if(this.points.length>this.nbPoints){this.points.pop();}},end:function(xy){var last,now=new Date().getTime();for(var i=0,l=this.points.length,point;i<l;i++){point=this.points[i];if(now-point.tick>this.delay){break;}
+last=point;}
+if(!last){return;}
+var time=new Date().getTime()-last.tick;var dist=Math.sqrt(Math.pow(xy.x-last.xy.x,2)+
+Math.pow(xy.y-last.xy.y,2));var speed=dist/time;if(speed==0||speed<this.threshold){return;}
+var theta=Math.asin((xy.y-last.xy.y)/dist);if(last.xy.x<=xy.x){theta=Math.PI-theta;}
+return{speed:speed,theta:theta};},move:function(info,callback){var v0=info.speed;var fx=Math.cos(info.theta);var fy=-Math.sin(info.theta);var initialTime=new Date().getTime();var lastX=0;var lastY=0;var timerCallback=function(){if(this.timerId==null){return;}
+var t=new Date().getTime()-initialTime;var p=(-this.deceleration*Math.pow(t,2))/2.0+v0*t;var x=p*fx;var y=p*fy;var args={};args.end=false;var v=-this.deceleration*t+v0;if(v<=0){OpenLayers.Animation.stop(this.timerId);this.timerId=null;args.end=true;}
+args.x=x-lastX;args.y=y-lastY;lastX=x;lastY=y;callback(args.x,args.y,args.end);};this.timerId=OpenLayers.Animation.start(OpenLayers.Function.bind(timerCallback,this));},CLASS_NAME:"OpenLayers.Kinetic"});OpenLayers.Layer.GeoRSS=OpenLayers.Class(OpenLayers.Layer.Markers,{location:null,features:null,formatOptions:null,selectedFeature:null,icon:null,popupSize:null,useFeedTitle:true,initialize:function(name,location,options){OpenLayers.Layer.Markers.prototype.initialize.apply(this,[name,options]);this.location=location;this.features=[];},destroy:function(){OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);this.clearFeatures();this.features=null;},loadRSS:function(){if(!this.loaded){this.events.triggerEvent("loadstart");OpenLayers.Request.GET({url:this.location,success:this.parseData,scope:this});this.loaded=true;}},moveTo:function(bounds,zoomChanged,minor){OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);if(this.visibility&&!this.loaded){this.loadRSS();}},parseData:function(ajaxRequest){var doc=ajaxRequest.responseXML;if(!doc||!doc.documentElement){doc=OpenLayers.Format.XML.prototype.read(ajaxRequest.responseText);}
+if(this.useFeedTitle){var name=null;try{name=doc.getElementsByTagNameNS('*','title')[0].firstChild.nodeValue;}
+catch(e){name=doc.getElementsByTagName('title')[0].firstChild.nodeValue;}
+if(name){this.setName(name);}}
+var options={};OpenLayers.Util.extend(options,this.formatOptions);if(this.map&&!this.projection.equals(this.map.getProjectionObject())){options.externalProjection=this.projection;options.internalProjection=this.map.getProjectionObject();}
+var format=new OpenLayers.Format.GeoRSS(options);var features=format.read(doc);for(var i=0,len=features.length;i<len;i++){var data={};var feature=features[i];if(!feature.geometry){continue;}
+var title=feature.attributes.title?feature.attributes.title:"Untitled";var description=feature.attributes.description?feature.attributes.description:"No description.";var link=feature.attributes.link?feature.attributes.link:"";var location=feature.geometry.getBounds().getCenterLonLat();data.icon=this.icon==null?OpenLayers.Marker.defaultIcon():this.icon.clone();data.popupSize=this.popupSize?this.popupSize.clone():new OpenLayers.Size(250,120);if(title||description){data.title=title;data.description=description;var contentHTML='<div class="olLayerGeoRSSClose">[x]</div>';contentHTML+='<div class="olLayerGeoRSSTitle">';if(link){contentHTML+='<a class="link" href="'+link+'" target="_blank">';}
+contentHTML+=title;if(link){contentHTML+='</a>';}
+contentHTML+='</div>';contentHTML+='<div style="" class="olLayerGeoRSSDescription">';contentHTML+=description;contentHTML+='</div>';data['popupContentHTML']=contentHTML;}
+var feature=new OpenLayers.Feature(this,location,data);this.features.push(feature);var marker=feature.createMarker();marker.events.register('click',feature,this.markerClick);this.addMarker(marker);}
+this.events.triggerEvent("loadend");},markerClick:function(evt){var sameMarkerClicked=(this==this.layer.selectedFeature);this.layer.selectedFeature=(!sameMarkerClicked)?this:null;for(var i=0,len=this.layer.map.popups.length;i<len;i++){this.layer.map.removePopup(this.layer.map.popups[i]);}
+if(!sameMarkerClicked){var popup=this.createPopup();OpenLayers.Event.observe(popup.div,"click",OpenLayers.Function.bind(function(){for(var i=0,len=this.layer.map.popups.length;i<len;i++){this.layer.map.removePopup(this.layer.map.popups[i]);}},this));this.layer.map.addPopup(popup);}
+OpenLayers.Event.stop(evt);},clearFeatures:function(){if(this.features!=null){while(this.features.length>0){var feature=this.features[0];OpenLayers.Util.removeItem(this.features,feature);feature.destroy();}}},CLASS_NAME:"OpenLayers.Layer.GeoRSS"});OpenLayers.Control.TransformFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,layer:null,preserveAspectRatio:false,rotate:true,feature:null,renderIntent:"temporary",rotationHandleSymbolizer:null,box:null,center:null,scale:1,ratio:1,rotation:0,handles:null,rotationHandles:null,dragControl:null,irregular:false,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;if(!this.rotationHandleSymbolizer){this.rotationHandleSymbolizer={stroke:false,pointRadius:10,fillOpacity:0,cursor:"pointer"};}
+this.createBox();this.createControl();},activate:function(){var activated=false;if(OpenLayers.Control.prototype.activate.apply(this,arguments)){this.dragControl.activate();this.layer.addFeatures([this.box]);this.rotate&&this.layer.addFeatures(this.rotationHandles);this.layer.addFeatures(this.handles);activated=true;}
+return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){this.layer.removeFeatures(this.handles);this.rotate&&this.layer.removeFeatures(this.rotationHandles);this.layer.removeFeatures([this.box]);this.dragControl.deactivate();deactivated=true;}
+return deactivated;},setMap:function(map){this.dragControl.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},setFeature:function(feature,initialParams){initialParams=OpenLayers.Util.applyDefaults(initialParams,{rotation:0,scale:1,ratio:1});var oldRotation=this.rotation;var oldCenter=this.center;OpenLayers.Util.extend(this,initialParams);var cont=this.events.triggerEvent("beforesetfeature",{feature:feature});if(cont===false){return;}
+this.feature=feature;this.activate();this._setfeature=true;var featureBounds=this.feature.geometry.getBounds();this.box.move(featureBounds.getCenterLonLat());this.box.geometry.rotate(-oldRotation,oldCenter);this._angle=0;var ll;if(this.rotation){var geom=feature.geometry.clone();geom.rotate(-this.rotation,this.center);var box=new OpenLayers.Feature.Vector(geom.getBounds().toGeometry());box.geometry.rotate(this.rotation,this.center);this.box.geometry.rotate(this.rotation,this.center);this.box.move(box.geometry.getBounds().getCenterLonLat());var llGeom=box.geometry.components[0].components[0];ll=llGeom.getBounds().getCenterLonLat();}else{ll=new OpenLayers.LonLat(featureBounds.left,featureBounds.bottom);}
+this.handles[0].move(ll);delete this._setfeature;this.events.triggerEvent("setfeature",{feature:feature});},unsetFeature:function(){if(this.active){this.deactivate();}else{this.feature=null;this.rotation=0;this.scale=1;this.ratio=1;}},createBox:function(){var control=this;this.center=new OpenLayers.Geometry.Point(0,0);this.box=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([new OpenLayers.Geometry.Point(-1,-1),new OpenLayers.Geometry.Point(0,-1),new OpenLayers.Geometry.Point(1,-1),new OpenLayers.Geometry.Point(1,0),new OpenLayers.Geometry.Point(1,1),new OpenLayers.Geometry.Point(0,1),new OpenLayers.Geometry.Point(-1,1),new OpenLayers.Geometry.Point(-1,0),new OpenLayers.Geometry.Point(-1,-1)]),null,typeof this.renderIntent=="string"?null:this.renderIntent);this.box.geometry.move=function(x,y){control._moving=true;OpenLayers.Geometry.LineString.prototype.move.apply(this,arguments);control.center.move(x,y);delete control._moving;};var vertexMoveFn=function(x,y){OpenLayers.Geometry.Point.prototype.move.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.move(x,y);this._handle.geometry.move(x,y);};var vertexResizeFn=function(scale,center,ratio){OpenLayers.Geometry.Point.prototype.resize.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.resize(scale,center,ratio);this._handle.geometry.resize(scale,center,ratio);};var vertexRotateFn=function(angle,center){OpenLayers.Geometry.Point.prototype.rotate.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.rotate(angle,center);this._handle.geometry.rotate(angle,center);};var handleMoveFn=function(x,y){var oldX=this.x,oldY=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,x,y);if(control._moving){return;}
+var evt=control.dragControl.handlers.drag.evt;var preserveAspectRatio=!control._setfeature&&control.preserveAspectRatio;var reshape=!preserveAspectRatio&&!(evt&&evt.shiftKey);var oldGeom=new OpenLayers.Geometry.Point(oldX,oldY);var centerGeometry=control.center;this.rotate(-control.rotation,centerGeometry);oldGeom.rotate(-control.rotation,centerGeometry);var dx1=this.x-centerGeometry.x;var dy1=this.y-centerGeometry.y;var dx0=dx1-(this.x-oldGeom.x);var dy0=dy1-(this.y-oldGeom.y);if(control.irregular&&!control._setfeature){dx1-=(this.x-oldGeom.x)/2;dy1-=(this.y-oldGeom.y)/2;}
+this.x=oldX;this.y=oldY;var scale,ratio=1;if(reshape){scale=Math.abs(dy0)<0.00001?1:dy1/dy0;ratio=(Math.abs(dx0)<0.00001?1:(dx1/dx0))/scale;}else{var l0=Math.sqrt((dx0*dx0)+(dy0*dy0));var l1=Math.sqrt((dx1*dx1)+(dy1*dy1));scale=l1/l0;}
+control._moving=true;control.box.geometry.rotate(-control.rotation,centerGeometry);delete control._moving;control.box.geometry.resize(scale,centerGeometry,ratio);control.box.geometry.rotate(control.rotation,centerGeometry);control.transformFeature({scale:scale,ratio:ratio});if(control.irregular&&!control._setfeature){var newCenter=centerGeometry.clone();newCenter.x+=Math.abs(oldX-centerGeometry.x)<0.00001?0:(this.x-oldX);newCenter.y+=Math.abs(oldY-centerGeometry.y)<0.00001?0:(this.y-oldY);control.box.geometry.move(this.x-oldX,this.y-oldY);control.transformFeature({center:newCenter});}};var rotationHandleMoveFn=function(x,y){var oldX=this.x,oldY=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,x,y);if(control._moving){return;}
+var evt=control.dragControl.handlers.drag.evt;var constrain=(evt&&evt.shiftKey)?45:1;var centerGeometry=control.center;var dx1=this.x-centerGeometry.x;var dy1=this.y-centerGeometry.y;var dx0=dx1-x;var dy0=dy1-y;this.x=oldX;this.y=oldY;var a0=Math.atan2(dy0,dx0);var a1=Math.atan2(dy1,dx1);var angle=a1-a0;angle*=180/Math.PI;control._angle=(control._angle+angle)%360;var diff=control.rotation%constrain;if(Math.abs(control._angle)>=constrain||diff!==0){angle=Math.round(control._angle/constrain)*constrain-
+diff;control._angle=0;control.box.geometry.rotate(angle,centerGeometry);control.transformFeature({rotation:angle});}};var handles=new Array(8);var rotationHandles=new Array(4);var geom,handle,rotationHandle;var positions=["sw","s","se","e","ne","n","nw","w"];for(var i=0;i<8;++i){geom=this.box.geometry.components[i];handle=new OpenLayers.Feature.Vector(geom.clone(),{role:positions[i]+"-resize"},typeof this.renderIntent=="string"?null:this.renderIntent);if(i%2==0){rotationHandle=new OpenLayers.Feature.Vector(geom.clone(),{role:positions[i]+"-rotate"},typeof this.rotationHandleSymbolizer=="string"?null:this.rotationHandleSymbolizer);rotationHandle.geometry.move=rotationHandleMoveFn;geom._rotationHandle=rotationHandle;rotationHandles[i/2]=rotationHandle;}
+geom.move=vertexMoveFn;geom.resize=vertexResizeFn;geom.rotate=vertexRotateFn;handle.geometry.move=handleMoveFn;geom._handle=handle;handles[i]=handle;}
+this.rotationHandles=rotationHandles;this.handles=handles;},createControl:function(){var control=this;this.dragControl=new OpenLayers.Control.DragFeature(this.layer,{documentDrag:true,moveFeature:function(pixel){if(this.feature===control.feature){this.feature=control.box;}
+OpenLayers.Control.DragFeature.prototype.moveFeature.apply(this,arguments);},onDrag:function(feature,pixel){if(feature===control.box){control.transformFeature({center:control.center});}},onStart:function(feature,pixel){var eligible=!control.geometryTypes||OpenLayers.Util.indexOf(control.geometryTypes,feature.geometry.CLASS_NAME)!==-1;var i=OpenLayers.Util.indexOf(control.handles,feature);i+=OpenLayers.Util.indexOf(control.rotationHandles,feature);if(feature!==control.feature&&feature!==control.box&&i==-2&&eligible){control.setFeature(feature);}},onComplete:function(feature,pixel){control.events.triggerEvent("transformcomplete",{feature:control.feature});}});},drawHandles:function(){var layer=this.layer;for(var i=0;i<8;++i){if(this.rotate&&i%2===0){layer.drawFeature(this.rotationHandles[i/2],this.rotationHandleSymbolizer);}
+layer.drawFeature(this.handles[i],this.renderIntent);}},transformFeature:function(mods){if(!this._setfeature){this.scale*=(mods.scale||1);this.ratio*=(mods.ratio||1);var oldRotation=this.rotation;this.rotation=(this.rotation+(mods.rotation||0))%360;if(this.events.triggerEvent("beforetransform",mods)!==false){var feature=this.feature;var geom=feature.geometry;var center=this.center;geom.rotate(-oldRotation,center);if(mods.scale||mods.ratio){geom.resize(mods.scale,center,mods.ratio);}else if(mods.center){feature.move(mods.center.getBounds().getCenterLonLat());}
+geom.rotate(this.rotation,center);this.layer.drawFeature(feature);feature.toState(OpenLayers.State.UPDATE);this.events.triggerEvent("transform",mods);}}
+this.layer.drawFeature(this.box,this.renderIntent);this.drawHandles();},destroy:function(){var geom;for(var i=0;i<8;++i){geom=this.box.geometry.components[i];geom._handle.destroy();geom._handle=null;geom._rotationHandle&&geom._rotationHandle.destroy();geom._rotationHandle=null;}
+this.center=null;this.feature=null;this.handles=null;this.rotationHandleSymbolizer=null;this.rotationHandles=null;this.box.destroy();this.box=null;this.layer=null;this.dragControl.destroy();this.dragControl=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.TransformFeature"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:'olHandlerBoxZoomBox',boxOffsets:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask});},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);if(this.dragHandler){this.dragHandler.destroy();this.dragHandler=null;}},setMap:function(map){OpenLayers.Handler.prototype.setMap.apply(this,arguments);if(this.dragHandler){this.dragHandler.setMap(map);}},startBox:function(xy){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv('zoomBox',{x:-9999,y:-9999});this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.viewPortDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.viewPortDiv,"olDrawBox");},moveBox:function(xy){var startX=this.dragHandler.start.x;var startY=this.dragHandler.start.y;var deltaX=Math.abs(startX-xy.x);var deltaY=Math.abs(startY-xy.y);var offset=this.getBoxOffsets();this.zoomBox.style.width=(deltaX+offset.width+1)+"px";this.zoomBox.style.height=(deltaY+offset.height+1)+"px";this.zoomBox.style.left=(xy.x<startX?startX-deltaX-offset.left:startX-offset.left)+"px";this.zoomBox.style.top=(xy.y<startY?startY-deltaY-offset.top:startY-offset.top)+"px";},endBox:function(end){var result;if(Math.abs(this.dragHandler.start.x-end.x)>5||Math.abs(this.dragHandler.start.y-end.y)>5){var start=this.dragHandler.start;var top=Math.min(start.y,end.y);var bottom=Math.max(start.y,end.y);var left=Math.min(start.x,end.x);var right=Math.max(start.x,end.x);result=new OpenLayers.Bounds(left,bottom,right,top);}else{result=this.dragHandler.start.clone();}
+this.removeBox();this.callback("done",[result]);},removeBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.zoomBox=null;this.boxOffsets=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDrawBox");},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){if(this.dragHandler.deactivate()){if(this.zoomBox){this.removeBox();}}
+return true;}else{return false;}},getBoxOffsets:function(){if(!this.boxOffsets){var testDiv=document.createElement("div");testDiv.style.position="absolute";testDiv.style.border="1px solid black";testDiv.style.width="3px";document.body.appendChild(testDiv);var w3cBoxModel=testDiv.clientWidth==3;document.body.removeChild(testDiv);var left=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width"));var right=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width"));var top=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-top-width"));var bottom=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"));this.boxOffsets={left:left,right:right,top:top,bottom:bottom,width:w3cBoxModel===false?left+right:0,height:w3cBoxModel===false?top+bottom:0};}
+return this.boxOffsets;},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:false,keyMask:null,alwaysZoom:false,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask});},zoomBox:function(position){if(position instanceof OpenLayers.Bounds){var bounds;if(!this.out){var minXY=this.map.getLonLatFromPixel({x:position.left,y:position.bottom});var maxXY=this.map.getLonLatFromPixel({x:position.right,y:position.top});bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);}else{var pixWidth=Math.abs(position.right-position.left);var pixHeight=Math.abs(position.top-position.bottom);var zoomFactor=Math.min((this.map.size.h/pixHeight),(this.map.size.w/pixWidth));var extent=this.map.getExtent();var center=this.map.getLonLatFromPixel(position.getCenterPixel());var xmin=center.lon-(extent.getWidth()/2)*zoomFactor;var xmax=center.lon+(extent.getWidth()/2)*zoomFactor;var ymin=center.lat-(extent.getHeight()/2)*zoomFactor;var ymax=center.lat+(extent.getHeight()/2)*zoomFactor;bounds=new OpenLayers.Bounds(xmin,ymin,xmax,ymax);}
+var lastZoom=this.map.getZoom();this.map.zoomToExtent(bounds);if(lastZoom==this.map.getZoom()&&this.alwaysZoom==true){this.map.zoomTo(lastZoom+(this.out?-1:1));}}else{if(!this.out){this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()+1);}else{this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()-1);}}},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:false,interval:1,documentDrag:false,kinetic:null,enableKinetic:false,kineticInterval:10,draw:function(){if(this.enableKinetic){var config={interval:this.kineticInterval};if(typeof this.enableKinetic==="object"){config=OpenLayers.Util.extend(config,this.enableKinetic);}
+this.kinetic=new OpenLayers.Kinetic(config);}
+this.handler=new OpenLayers.Handler.Drag(this,{"move":this.panMap,"done":this.panMapDone,"down":this.panMapStart},{interval:this.interval,documentDrag:this.documentDrag});},panMapStart:function(){if(this.kinetic){this.kinetic.begin();}},panMap:function(xy){if(this.kinetic){this.kinetic.update(xy);}
+this.panned=true;this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:true,animate:false});},panMapDone:function(xy){if(this.panned){var res=null;if(this.kinetic){res=this.kinetic.end(xy);}
+this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:!!res,animate:false});if(res){var self=this;this.kinetic.move(res,function(x,y,end){self.map.pan(x,y,{dragging:!end,animate:false});});}
+this.panned=false;}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:true,'double':false,pixelTolerance:0,dblclickTolerance:13,stopSingle:false,stopDouble:false,timerId:null,touch:false,down:null,last:null,first:null,rightclickTimerId:null,touchstart:function(evt){if(!this.touch){this.unregisterMouseListeners();this.touch=true;}
+this.down=this.getEventInfo(evt);this.last=this.getEventInfo(evt);return true;},touchmove:function(evt){this.last=this.getEventInfo(evt);return true;},touchend:function(evt){if(this.down){evt.xy=this.last.xy;evt.lastTouches=this.last.touches;this.handleSingle(evt);this.down=null;}
+return true;},unregisterMouseListeners:function(){this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,click:this.click,dblclick:this.dblclick,scope:this});},mousedown:function(evt){this.down=this.getEventInfo(evt);this.last=this.getEventInfo(evt);return true;},mouseup:function(evt){var propagate=true;if(this.checkModifiers(evt)&&this.control.handleRightClicks&&OpenLayers.Event.isRightClick(evt)){propagate=this.rightclick(evt);}
+return propagate;},rightclick:function(evt){if(this.passesTolerance(evt)){if(this.rightclickTimerId!=null){this.clearTimer();this.callback('dblrightclick',[evt]);return!this.stopDouble;}else{var clickEvent=this['double']?OpenLayers.Util.extend({},evt):this.callback('rightclick',[evt]);var delayedRightCall=OpenLayers.Function.bind(this.delayedRightCall,this,clickEvent);this.rightclickTimerId=window.setTimeout(delayedRightCall,this.delay);}}
+return!this.stopSingle;},delayedRightCall:function(evt){this.rightclickTimerId=null;if(evt){this.callback('rightclick',[evt]);}},click:function(evt){if(!this.last){this.last=this.getEventInfo(evt);}
+this.handleSingle(evt);return!this.stopSingle;},dblclick:function(evt){this.handleDouble(evt);return!this.stopDouble;},handleDouble:function(evt){if(this.passesDblclickTolerance(evt)){if(this["double"]){this.callback("dblclick",[evt]);}
+this.clearTimer();}},handleSingle:function(evt){if(this.passesTolerance(evt)){if(this.timerId!=null){if(this.last.touches&&this.last.touches.length===1){if(this["double"]){OpenLayers.Event.stop(evt);}
+this.handleDouble(evt);}
+if(!this.last.touches||this.last.touches.length!==2){this.clearTimer();}}else{this.first=this.getEventInfo(evt);var clickEvent=this.single?OpenLayers.Util.extend({},evt):null;this.queuePotentialClick(clickEvent);}}},queuePotentialClick:function(evt){this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,evt),this.delay);},passesTolerance:function(evt){var passes=true;if(this.pixelTolerance!=null&&this.down&&this.down.xy){passes=this.pixelTolerance>=this.down.xy.distanceTo(evt.xy);if(passes&&this.touch&&this.down.touches.length===this.last.touches.length){for(var i=0,ii=this.down.touches.length;i<ii;++i){if(this.getTouchDistance(this.down.touches[i],this.last.touches[i])>this.pixelTolerance){passes=false;break;}}}}
+return passes;},getTouchDistance:function(from,to){return Math.sqrt(Math.pow(from.clientX-to.clientX,2)+
+Math.pow(from.clientY-to.clientY,2));},passesDblclickTolerance:function(evt){var passes=true;if(this.down&&this.first){passes=this.down.xy.distanceTo(this.first.xy)<=this.dblclickTolerance;}
+return passes;},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;}
+if(this.rightclickTimerId!=null){window.clearTimeout(this.rightclickTimerId);this.rightclickTimerId=null;}},delayedCall:function(evt){this.timerId=null;if(evt){this.callback("click",[evt]);}},getEventInfo:function(evt){var touches;if(evt.touches){var len=evt.touches.length;touches=new Array(len);var touch;for(var i=0;i<len;i++){touch=evt.touches[i];touches[i]={clientX:touch.clientX,clientY:touch.clientY};}}
+return{xy:evt.xy,touches:touches};},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.clearTimer();this.down=null;this.first=null;this.last=null;this.touch=false;deactivated=true;}
+return deactivated;},CLASS_NAME:"OpenLayers.Handler.Click"});OpenLayers.Control.Navigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,dragPanOptions:null,pinchZoom:null,pinchZoomOptions:null,documentDrag:false,zoomBox:null,zoomBoxEnabled:true,zoomWheelEnabled:true,mouseWheelOptions:null,handleRightClicks:false,zoomBoxKeyMask:OpenLayers.Handler.MOD_SHIFT,autoActivate:true,initialize:function(options){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){this.deactivate();if(this.dragPan){this.dragPan.destroy();}
+this.dragPan=null;if(this.zoomBox){this.zoomBox.destroy();}
+this.zoomBox=null;if(this.pinchZoom){this.pinchZoom.destroy();}
+this.pinchZoom=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},activate:function(){this.dragPan.activate();if(this.zoomWheelEnabled){this.handlers.wheel.activate();}
+this.handlers.click.activate();if(this.zoomBoxEnabled){this.zoomBox.activate();}
+if(this.pinchZoom){this.pinchZoom.activate();}
+return OpenLayers.Control.prototype.activate.apply(this,arguments);},deactivate:function(){if(this.pinchZoom){this.pinchZoom.deactivate();}
+this.zoomBox.deactivate();this.dragPan.deactivate();this.handlers.click.deactivate();this.handlers.wheel.deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},draw:function(){if(this.handleRightClicks){this.map.viewPortDiv.oncontextmenu=OpenLayers.Function.False;}
+var clickCallbacks={'click':this.defaultClick,'dblclick':this.defaultDblClick,'dblrightclick':this.defaultDblRightClick};var clickOptions={'double':true,'stopDouble':true};this.handlers.click=new OpenLayers.Handler.Click(this,clickCallbacks,clickOptions);this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map,documentDrag:this.documentDrag},this.dragPanOptions));this.zoomBox=new OpenLayers.Control.ZoomBox({map:this.map,keyMask:this.zoomBoxKeyMask});this.dragPan.draw();this.zoomBox.draw();this.handlers.wheel=new OpenLayers.Handler.MouseWheel(this,{"up":this.wheelUp,"down":this.wheelDown},this.mouseWheelOptions);if(OpenLayers.Control.PinchZoom){this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map},this.pinchZoomOptions));}},defaultClick:function(evt){if(evt.lastTouches&&evt.lastTouches.length==2){this.map.zoomOut();}},defaultDblClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom+1);},defaultDblRightClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom-1);},wheelChange:function(evt,deltaZ){var currentZoom=this.map.getZoom();var newZoom=this.map.getZoom()+Math.round(deltaZ);newZoom=Math.max(newZoom,0);newZoom=Math.min(newZoom,this.map.getNumZoomLevels());if(newZoom===currentZoom){return;}
+var size=this.map.getSize();var deltaX=size.w/2-evt.xy.x;var deltaY=evt.xy.y-size.h/2;var newRes=this.map.baseLayer.getResolutionForZoom(newZoom);var zoomPoint=this.map.getLonLatFromPixel(evt.xy);var newCenter=new OpenLayers.LonLat(zoomPoint.lon+deltaX*newRes,zoomPoint.lat+deltaY*newRes);this.map.setCenter(newCenter,newZoom);},wheelUp:function(evt,delta){this.wheelChange(evt,delta||1);},wheelDown:function(evt,delta){this.wheelChange(evt,delta||-1);},disableZoomBox:function(){this.zoomBoxEnabled=false;this.zoomBox.deactivate();},enableZoomBox:function(){this.zoomBoxEnabled=true;if(this.active){this.zoomBox.activate();}},disableZoomWheel:function(){this.zoomWheelEnabled=false;this.handlers.wheel.deactivate();},enableZoomWheel:function(){this.zoomWheelEnabled=true;if(this.active){this.handlers.wheel.activate();}},CLASS_NAME:"OpenLayers.Control.Navigation"});OpenLayers.Layer.WMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{service:"WMS",version:"1.1.1",request:"GetMap",styles:"",format:"image/jpeg"},isBaseLayer:true,encodeBBOX:false,noMagic:false,yx:{},initialize:function(name,url,params,options){var newArguments=[];params=OpenLayers.Util.upperCaseObject(params);if(parseFloat(params.VERSION)>=1.3&&!params.EXCEPTIONS){params.EXCEPTIONS="INIMAGE";}
+newArguments.push(name,url,params,options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));if(!this.noMagic&&this.params.TRANSPARENT&&this.params.TRANSPARENT.toString().toLowerCase()=="true"){if((options==null)||(!options.isBaseLayer)){this.isBaseLayer=false;}
+if(this.params.FORMAT=="image/jpeg"){this.params.FORMAT=OpenLayers.Util.alphaHack()?"image/gif":"image/png";}}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.WMS(this.name,this.url,this.params,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},reverseAxisOrder:function(){var projCode=this.projection.getCode();return parseFloat(this.params.VERSION)>=1.3&&!!(this.yx[projCode]||OpenLayers.Projection.defaults[projCode].yx);},getURL:function(bounds){bounds=this.adjustBounds(bounds);var imageSize=this.getImageSize();var newParams={};var reverseAxisOrder=this.reverseAxisOrder();newParams.BBOX=this.encodeBBOX?bounds.toBBOX(null,reverseAxisOrder):bounds.toArray(reverseAxisOrder);newParams.WIDTH=imageSize.w;newParams.HEIGHT=imageSize.h;var requestString=this.getFullRequestString(newParams);return requestString;},mergeNewParams:function(newParams){var upperParams=OpenLayers.Util.upperCaseObject(newParams);var newArguments=[upperParams];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,newArguments);},getFullRequestString:function(newParams,altUrl){var mapProjection=this.map.getProjectionObject();var projectionCode=this.projection&&this.projection.equals(mapProjection)?this.projection.getCode():mapProjection.getCode();var value=(projectionCode=="none")?null:projectionCode;if(parseFloat(this.params.VERSION)>=1.3){this.params.CRS=value;}else{this.params.SRS=value;}
+if(typeof this.params.TRANSPARENT=="boolean"){newParams.TRANSPARENT=this.params.TRANSPARENT?"TRUE":"FALSE";}
+return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,arguments);},CLASS_NAME:"OpenLayers.Layer.WMS"});OpenLayers.Format.Context=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{layerOptions:null,layerParams:null,read:function(data,options){var context=OpenLayers.Format.XML.VersionedOGC.prototype.read.apply(this,arguments);var map;if(options&&options.map){this.context=context;if(options.map instanceof OpenLayers.Map){map=this.mergeContextToMap(context,options.map);}else{var mapOptions=options.map;if(OpenLayers.Util.isElement(mapOptions)||typeof mapOptions=="string"){mapOptions={div:mapOptions};}
+map=this.contextToMap(context,mapOptions);}}else{map=context;}
+return map;},getLayerFromContext:function(layerContext){var i,len;var options={queryable:layerContext.queryable,visibility:layerContext.visibility,maxExtent:layerContext.maxExtent,metadata:OpenLayers.Util.applyDefaults(layerContext.metadata,{styles:layerContext.styles,formats:layerContext.formats,"abstract":layerContext["abstract"],dataURL:layerContext.dataURL}),numZoomLevels:layerContext.numZoomLevels,units:layerContext.units,isBaseLayer:layerContext.isBaseLayer,opacity:layerContext.opacity,displayInLayerSwitcher:layerContext.displayInLayerSwitcher,singleTile:layerContext.singleTile,tileSize:(layerContext.tileSize)?new OpenLayers.Size(layerContext.tileSize.width,layerContext.tileSize.height):undefined,minScale:layerContext.minScale||layerContext.maxScaleDenominator,maxScale:layerContext.maxScale||layerContext.minScaleDenominator,srs:layerContext.srs,dimensions:layerContext.dimensions,metadataURL:layerContext.metadataURL};if(this.layerOptions){OpenLayers.Util.applyDefaults(options,this.layerOptions);}
+var params={layers:layerContext.name,transparent:layerContext.transparent,version:layerContext.version};if(layerContext.formats&&layerContext.formats.length>0){params.format=layerContext.formats[0].value;for(i=0,len=layerContext.formats.length;i<len;i++){var format=layerContext.formats[i];if(format.current==true){params.format=format.value;break;}}}
+if(layerContext.styles&&layerContext.styles.length>0){for(i=0,len=layerContext.styles.length;i<len;i++){var style=layerContext.styles[i];if(style.current==true){if(style.href){params.sld=style.href;}else if(style.body){params.sld_body=style.body;}else{params.styles=style.name;}
+break;}}}
+if(this.layerParams){OpenLayers.Util.applyDefaults(params,this.layerParams);}
+var layer=null;var service=layerContext.service;if(service==OpenLayers.Format.Context.serviceTypes.WFS){options.strategies=[new OpenLayers.Strategy.BBOX()];options.protocol=new OpenLayers.Protocol.WFS({url:layerContext.url,featurePrefix:layerContext.name.split(":")[0],featureType:layerContext.name.split(":").pop()});layer=new OpenLayers.Layer.Vector(layerContext.title||layerContext.name,options);}else if(service==OpenLayers.Format.Context.serviceTypes.KML){options.strategies=[new OpenLayers.Strategy.Fixed()];options.protocol=new OpenLayers.Protocol.HTTP({url:layerContext.url,format:new OpenLayers.Format.KML()});layer=new OpenLayers.Layer.Vector(layerContext.title||layerContext.name,options);}else if(service==OpenLayers.Format.Context.serviceTypes.GML){options.strategies=[new OpenLayers.Strategy.Fixed()];options.protocol=new OpenLayers.Protocol.HTTP({url:layerContext.url,format:new OpenLayers.Format.GML()});layer=new OpenLayers.Layer.Vector(layerContext.title||layerContext.name,options);}else if(layerContext.features){layer=new OpenLayers.Layer.Vector(layerContext.title||layerContext.name,options);layer.addFeatures(layerContext.features);}else if(layerContext.categoryLayer!==true){layer=new OpenLayers.Layer.WMS(layerContext.title||layerContext.name,layerContext.url,params,options);}
+return layer;},getLayersFromContext:function(layersContext){var layers=[];for(var i=0,len=layersContext.length;i<len;i++){var layer=this.getLayerFromContext(layersContext[i]);if(layer!==null){layers.push(layer);}}
+return layers;},contextToMap:function(context,options){options=OpenLayers.Util.applyDefaults({maxExtent:context.maxExtent,projection:context.projection,units:context.units},options);if(options.maxExtent){options.maxResolution=options.maxExtent.getWidth()/OpenLayers.Map.TILE_WIDTH;}
+var metadata={contactInformation:context.contactInformation,"abstract":context["abstract"],keywords:context.keywords,logo:context.logo,descriptionURL:context.descriptionURL};options.metadata=metadata;var map=new OpenLayers.Map(options);map.addLayers(this.getLayersFromContext(context.layersContext));map.setCenter(context.bounds.getCenterLonLat(),map.getZoomForExtent(context.bounds,true));return map;},mergeContextToMap:function(context,map){map.addLayers(this.getLayersFromContext(context.layersContext));return map;},write:function(obj,options){obj=this.toContext(obj);return OpenLayers.Format.XML.VersionedOGC.prototype.write.apply(this,arguments);},CLASS_NAME:"OpenLayers.Format.Context"});OpenLayers.Format.Context.serviceTypes={"WMS":"urn:ogc:serviceType:WMS","WFS":"urn:ogc:serviceType:WFS","WCS":"urn:ogc:serviceType:WCS","GML":"urn:ogc:serviceType:GML","SLD":"urn:ogc:serviceType:SLD","FES":"urn:ogc:serviceType:FES","KML":"urn:ogc:serviceType:KML"};OpenLayers.Format.WMC=OpenLayers.Class(OpenLayers.Format.Context,{defaultVersion:"1.1.0",layerToContext:function(layer){var parser=this.getParser();var layerContext={queryable:layer.queryable,visibility:layer.visibility,name:layer.params["LAYERS"],title:layer.name,"abstract":layer.metadata["abstract"],dataURL:layer.metadata.dataURL,metadataURL:layer.metadataURL,server:{version:layer.params["VERSION"],url:layer.url},maxExtent:layer.maxExtent,transparent:layer.params["TRANSPARENT"],numZoomLevels:layer.numZoomLevels,units:layer.units,isBaseLayer:layer.isBaseLayer,opacity:layer.opacity==1?undefined:layer.opacity,displayInLayerSwitcher:layer.displayInLayerSwitcher,singleTile:layer.singleTile,tileSize:(layer.singleTile||!layer.tileSize)?undefined:{width:layer.tileSize.w,height:layer.tileSize.h},minScale:(layer.options.resolutions||layer.options.scales||layer.options.maxResolution||layer.options.minScale)?layer.minScale:undefined,maxScale:(layer.options.resolutions||layer.options.scales||layer.options.minResolution||layer.options.maxScale)?layer.maxScale:undefined,formats:[],styles:[],srs:layer.srs,dimensions:layer.dimensions};if(layer.metadata.servertitle){layerContext.server.title=layer.metadata.servertitle;}
+if(layer.metadata.formats&&layer.metadata.formats.length>0){for(var i=0,len=layer.metadata.formats.length;i<len;i++){var format=layer.metadata.formats[i];layerContext.formats.push({value:format.value,current:(format.value==layer.params["FORMAT"])});}}else{layerContext.formats.push({value:layer.params["FORMAT"],current:true});}
+if(layer.metadata.styles&&layer.metadata.styles.length>0){for(var i=0,len=layer.metadata.styles.length;i<len;i++){var style=layer.metadata.styles[i];if((style.href==layer.params["SLD"])||(style.body==layer.params["SLD_BODY"])||(style.name==layer.params["STYLES"])){style.current=true;}else{style.current=false;}
+layerContext.styles.push(style);}}else{layerContext.styles.push({href:layer.params["SLD"],body:layer.params["SLD_BODY"],name:layer.params["STYLES"]||parser.defaultStyleName,title:parser.defaultStyleTitle,current:true});}
+return layerContext;},toContext:function(obj){var context={};var layers=obj.layers;if(obj.CLASS_NAME=="OpenLayers.Map"){var metadata=obj.metadata||{};context.size=obj.getSize();context.bounds=obj.getExtent();context.projection=obj.projection;context.title=obj.title;context.keywords=metadata.keywords;context["abstract"]=metadata["abstract"];context.logo=metadata.logo;context.descriptionURL=metadata.descriptionURL;context.contactInformation=metadata.contactInformation;context.maxExtent=obj.maxExtent;}else{OpenLayers.Util.applyDefaults(context,obj);if(context.layers!=undefined){delete(context.layers);}}
+if(context.layersContext==undefined){context.layersContext=[];}
+if(layers!=undefined&&OpenLayers.Util.isArray(layers)){for(var i=0,len=layers.length;i<len;i++){var layer=layers[i];if(layer instanceof OpenLayers.Layer.WMS){context.layersContext.push(this.layerToContext(layer));}}}
+return context;},CLASS_NAME:"OpenLayers.Format.WMC"});OpenLayers.Format.WMC.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ol:"http://openlayers.org/context",wmc:"http://www.opengis.net/context",sld:"http://www.opengis.net/sld",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"",getNamespacePrefix:function(uri){var prefix=null;if(uri==null){prefix=this.namespaces[this.defaultPrefix];}else{for(prefix in this.namespaces){if(this.namespaces[prefix]==uri){break;}}}
+return prefix;},defaultPrefix:"wmc",rootPrefix:null,defaultStyleName:"",defaultStyleTitle:"Default",initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var root=data.documentElement;this.rootPrefix=root.prefix;var context={version:root.getAttribute("version")};this.runChildNodes(context,root);return context;},runChildNodes:function(obj,node){var children=node.childNodes;var childNode,processor,prefix,local;for(var i=0,len=children.length;i<len;++i){childNode=children[i];if(childNode.nodeType==1){prefix=this.getNamespacePrefix(childNode.namespaceURI);local=childNode.nodeName.split(":").pop();processor=this["read_"+prefix+"_"+local];if(processor){processor.apply(this,[obj,childNode]);}}}},read_wmc_General:function(context,node){this.runChildNodes(context,node);},read_wmc_BoundingBox:function(context,node){context.projection=node.getAttribute("SRS");context.bounds=new OpenLayers.Bounds(node.getAttribute("minx"),node.getAttribute("miny"),node.getAttribute("maxx"),node.getAttribute("maxy"));},read_wmc_LayerList:function(context,node){context.layersContext=[];this.runChildNodes(context,node);},read_wmc_Layer:function(context,node){var layerContext={visibility:(node.getAttribute("hidden")!="1"),queryable:(node.getAttribute("queryable")=="1"),formats:[],styles:[],metadata:{}};this.runChildNodes(layerContext,node);context.layersContext.push(layerContext);},read_wmc_Extension:function(obj,node){this.runChildNodes(obj,node);},read_ol_units:function(layerContext,node){layerContext.units=this.getChildValue(node);},read_ol_maxExtent:function(obj,node){var bounds=new OpenLayers.Bounds(node.getAttribute("minx"),node.getAttribute("miny"),node.getAttribute("maxx"),node.getAttribute("maxy"));obj.maxExtent=bounds;},read_ol_transparent:function(layerContext,node){layerContext.transparent=this.getChildValue(node);},read_ol_numZoomLevels:function(layerContext,node){layerContext.numZoomLevels=parseInt(this.getChildValue(node));},read_ol_opacity:function(layerContext,node){layerContext.opacity=parseFloat(this.getChildValue(node));},read_ol_singleTile:function(layerContext,node){layerContext.singleTile=(this.getChildValue(node)=="true");},read_ol_tileSize:function(layerContext,node){var obj={"width":node.getAttribute("width"),"height":node.getAttribute("height")};layerContext.tileSize=obj;},read_ol_isBaseLayer:function(layerContext,node){layerContext.isBaseLayer=(this.getChildValue(node)=="true");},read_ol_displayInLayerSwitcher:function(layerContext,node){layerContext.displayInLayerSwitcher=(this.getChildValue(node)=="true");},read_wmc_Server:function(layerContext,node){layerContext.version=node.getAttribute("version");layerContext.url=this.getOnlineResource_href(node);layerContext.metadata.servertitle=node.getAttribute("title");},read_wmc_FormatList:function(layerContext,node){this.runChildNodes(layerContext,node);},read_wmc_Format:function(layerContext,node){var format={value:this.getChildValue(node)};if(node.getAttribute("current")=="1"){format.current=true;}
+layerContext.formats.push(format);},read_wmc_StyleList:function(layerContext,node){this.runChildNodes(layerContext,node);},read_wmc_Style:function(layerContext,node){var style={};this.runChildNodes(style,node);if(node.getAttribute("current")=="1"){style.current=true;}
+layerContext.styles.push(style);},read_wmc_SLD:function(style,node){this.runChildNodes(style,node);},read_sld_StyledLayerDescriptor:function(sld,node){var xml=OpenLayers.Format.XML.prototype.write.apply(this,[node]);sld.body=xml;},read_sld_FeatureTypeStyle:function(sld,node){var xml=OpenLayers.Format.XML.prototype.write.apply(this,[node]);sld.body=xml;},read_wmc_OnlineResource:function(obj,node){obj.href=this.getAttributeNS(node,this.namespaces.xlink,"href");},read_wmc_Name:function(obj,node){var name=this.getChildValue(node);if(name){obj.name=name;}},read_wmc_Title:function(obj,node){var title=this.getChildValue(node);if(title){obj.title=title;}},read_wmc_MetadataURL:function(layerContext,node){layerContext.metadataURL=this.getOnlineResource_href(node);},read_wmc_KeywordList:function(context,node){context.keywords=[];this.runChildNodes(context.keywords,node);},read_wmc_Keyword:function(keywords,node){keywords.push(this.getChildValue(node));},read_wmc_Abstract:function(obj,node){var abst=this.getChildValue(node);if(abst){obj["abstract"]=abst;}},read_wmc_LogoURL:function(context,node){context.logo={width:node.getAttribute("width"),height:node.getAttribute("height"),format:node.getAttribute("format"),href:this.getOnlineResource_href(node)};},read_wmc_DescriptionURL:function(context,node){context.descriptionURL=this.getOnlineResource_href(node);},read_wmc_ContactInformation:function(obj,node){var contact={};this.runChildNodes(contact,node);obj.contactInformation=contact;},read_wmc_ContactPersonPrimary:function(contact,node){var personPrimary={};this.runChildNodes(personPrimary,node);contact.personPrimary=personPrimary;},read_wmc_ContactPerson:function(primaryPerson,node){var person=this.getChildValue(node);if(person){primaryPerson.person=person;}},read_wmc_ContactOrganization:function(primaryPerson,node){var organization=this.getChildValue(node);if(organization){primaryPerson.organization=organization;}},read_wmc_ContactPosition:function(contact,node){var position=this.getChildValue(node);if(position){contact.position=position;}},read_wmc_ContactAddress:function(contact,node){var contactAddress={};this.runChildNodes(contactAddress,node);contact.contactAddress=contactAddress;},read_wmc_AddressType:function(contactAddress,node){var type=this.getChildValue(node);if(type){contactAddress.type=type;}},read_wmc_Address:function(contactAddress,node){var address=this.getChildValue(node);if(address){contactAddress.address=address;}},read_wmc_City:function(contactAddress,node){var city=this.getChildValue(node);if(city){contactAddress.city=city;}},read_wmc_StateOrProvince:function(contactAddress,node){var stateOrProvince=this.getChildValue(node);if(stateOrProvince){contactAddress.stateOrProvince=stateOrProvince;}},read_wmc_PostCode:function(contactAddress,node){var postcode=this.getChildValue(node);if(postcode){contactAddress.postcode=postcode;}},read_wmc_Country:function(contactAddress,node){var country=this.getChildValue(node);if(country){contactAddress.country=country;}},read_wmc_ContactVoiceTelephone:function(contact,node){var phone=this.getChildValue(node);if(phone){contact.phone=phone;}},read_wmc_ContactFacsimileTelephone:function(contact,node){var fax=this.getChildValue(node);if(fax){contact.fax=fax;}},read_wmc_ContactElectronicMailAddress:function(contact,node){var email=this.getChildValue(node);if(email){contact.email=email;}},read_wmc_DataURL:function(layerContext,node){layerContext.dataURL=this.getOnlineResource_href(node);},read_wmc_LegendURL:function(style,node){var legend={width:node.getAttribute('width'),height:node.getAttribute('height'),format:node.getAttribute('format'),href:this.getOnlineResource_href(node)};style.legend=legend;},read_wmc_DimensionList:function(layerContext,node){layerContext.dimensions={};this.runChildNodes(layerContext.dimensions,node);},read_wmc_Dimension:function(dimensions,node){var name=node.getAttribute("name").toLowerCase();var dim={name:name,units:node.getAttribute("units")||"",unitSymbol:node.getAttribute("unitSymbol")||"",userValue:node.getAttribute("userValue")||"",nearestValue:node.getAttribute("nearestValue")==="1",multipleValues:node.getAttribute("multipleValues")==="1",current:node.getAttribute("current")==="1","default":node.getAttribute("default")||""};var values=this.getChildValue(node);dim.values=values.split(",");dimensions[dim.name]=dim;},write:function(context,options){var root=this.createElementDefaultNS("ViewContext");this.setAttributes(root,{version:this.VERSION,id:(options&&typeof options.id=="string")?options.id:OpenLayers.Util.createUniqueID("OpenLayers_Context_")});this.setAttributeNS(root,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);root.appendChild(this.write_wmc_General(context));root.appendChild(this.write_wmc_LayerList(context));return OpenLayers.Format.XML.prototype.write.apply(this,[root]);},createElementDefaultNS:function(name,childValue,attributes){var node=this.createElementNS(this.namespaces[this.defaultPrefix],name);if(childValue){node.appendChild(this.createTextNode(childValue));}
+if(attributes){this.setAttributes(node,attributes);}
+return node;},setAttributes:function(node,obj){var value;for(var name in obj){value=obj[name].toString();if(value.match(/[A-Z]/)){this.setAttributeNS(node,null,name,value);}else{node.setAttribute(name,value);}}},write_wmc_General:function(context){var node=this.createElementDefaultNS("General");if(context.size){node.appendChild(this.createElementDefaultNS("Window",null,{width:context.size.w,height:context.size.h}));}
+var bounds=context.bounds;node.appendChild(this.createElementDefaultNS("BoundingBox",null,{minx:bounds.left.toPrecision(18),miny:bounds.bottom.toPrecision(18),maxx:bounds.right.toPrecision(18),maxy:bounds.top.toPrecision(18),SRS:context.projection}));node.appendChild(this.createElementDefaultNS("Title",context.title));if(context.keywords){node.appendChild(this.write_wmc_KeywordList(context.keywords));}
+if(context["abstract"]){node.appendChild(this.createElementDefaultNS("Abstract",context["abstract"]));}
+if(context.logo){node.appendChild(this.write_wmc_URLType("LogoURL",context.logo.href,context.logo));}
+if(context.descriptionURL){node.appendChild(this.write_wmc_URLType("DescriptionURL",context.descriptionURL));}
+if(context.contactInformation){node.appendChild(this.write_wmc_ContactInformation(context.contactInformation));}
+node.appendChild(this.write_ol_MapExtension(context));return node;},write_wmc_KeywordList:function(keywords){var node=this.createElementDefaultNS("KeywordList");for(var i=0,len=keywords.length;i<len;i++){node.appendChild(this.createElementDefaultNS("Keyword",keywords[i]));}
+return node;},write_wmc_ContactInformation:function(contact){var node=this.createElementDefaultNS("ContactInformation");if(contact.personPrimary){node.appendChild(this.write_wmc_ContactPersonPrimary(contact.personPrimary));}
+if(contact.position){node.appendChild(this.createElementDefaultNS("ContactPosition",contact.position));}
+if(contact.contactAddress){node.appendChild(this.write_wmc_ContactAddress(contact.contactAddress));}
+if(contact.phone){node.appendChild(this.createElementDefaultNS("ContactVoiceTelephone",contact.phone));}
+if(contact.fax){node.appendChild(this.createElementDefaultNS("ContactFacsimileTelephone",contact.fax));}
+if(contact.email){node.appendChild(this.createElementDefaultNS("ContactElectronicMailAddress",contact.email));}
+return node;},write_wmc_ContactPersonPrimary:function(personPrimary){var node=this.createElementDefaultNS("ContactPersonPrimary");if(personPrimary.person){node.appendChild(this.createElementDefaultNS("ContactPerson",personPrimary.person));}
+if(personPrimary.organization){node.appendChild(this.createElementDefaultNS("ContactOrganization",personPrimary.organization));}
+return node;},write_wmc_ContactAddress:function(contactAddress){var node=this.createElementDefaultNS("ContactAddress");if(contactAddress.type){node.appendChild(this.createElementDefaultNS("AddressType",contactAddress.type));}
+if(contactAddress.address){node.appendChild(this.createElementDefaultNS("Address",contactAddress.address));}
+if(contactAddress.city){node.appendChild(this.createElementDefaultNS("City",contactAddress.city));}
+if(contactAddress.stateOrProvince){node.appendChild(this.createElementDefaultNS("StateOrProvince",contactAddress.stateOrProvince));}
+if(contactAddress.postcode){node.appendChild(this.createElementDefaultNS("PostCode",contactAddress.postcode));}
+if(contactAddress.country){node.appendChild(this.createElementDefaultNS("Country",contactAddress.country));}
+return node;},write_ol_MapExtension:function(context){var node=this.createElementDefaultNS("Extension");var bounds=context.maxExtent;if(bounds){var maxExtent=this.createElementNS(this.namespaces.ol,"ol:maxExtent");this.setAttributes(maxExtent,{minx:bounds.left.toPrecision(18),miny:bounds.bottom.toPrecision(18),maxx:bounds.right.toPrecision(18),maxy:bounds.top.toPrecision(18)});node.appendChild(maxExtent);}
+return node;},write_wmc_LayerList:function(context){var list=this.createElementDefaultNS("LayerList");for(var i=0,len=context.layersContext.length;i<len;++i){list.appendChild(this.write_wmc_Layer(context.layersContext[i]));}
+return list;},write_wmc_Layer:function(context){var node=this.createElementDefaultNS("Layer",null,{queryable:context.queryable?"1":"0",hidden:context.visibility?"0":"1"});node.appendChild(this.write_wmc_Server(context));node.appendChild(this.createElementDefaultNS("Name",context.name));node.appendChild(this.createElementDefaultNS("Title",context.title));if(context["abstract"]){node.appendChild(this.createElementDefaultNS("Abstract",context["abstract"]));}
+if(context.dataURL){node.appendChild(this.write_wmc_URLType("DataURL",context.dataURL));}
+if(context.metadataURL){node.appendChild(this.write_wmc_URLType("MetadataURL",context.metadataURL));}
+return node;},write_wmc_LayerExtension:function(context){var node=this.createElementDefaultNS("Extension");var bounds=context.maxExtent;var maxExtent=this.createElementNS(this.namespaces.ol,"ol:maxExtent");this.setAttributes(maxExtent,{minx:bounds.left.toPrecision(18),miny:bounds.bottom.toPrecision(18),maxx:bounds.right.toPrecision(18),maxy:bounds.top.toPrecision(18)});node.appendChild(maxExtent);if(context.tileSize&&!context.singleTile){var size=this.createElementNS(this.namespaces.ol,"ol:tileSize");this.setAttributes(size,context.tileSize);node.appendChild(size);}
+var properties=["transparent","numZoomLevels","units","isBaseLayer","opacity","displayInLayerSwitcher","singleTile"];var child;for(var i=0,len=properties.length;i<len;++i){child=this.createOLPropertyNode(context,properties[i]);if(child){node.appendChild(child);}}
+return node;},createOLPropertyNode:function(obj,prop){var node=null;if(obj[prop]!=null){node=this.createElementNS(this.namespaces.ol,"ol:"+prop);node.appendChild(this.createTextNode(obj[prop].toString()));}
+return node;},write_wmc_Server:function(context){var server=context.server;var node=this.createElementDefaultNS("Server");var attributes={service:"OGC:WMS",version:server.version};if(server.title){attributes.title=server.title;}
+this.setAttributes(node,attributes);node.appendChild(this.write_wmc_OnlineResource(server.url));return node;},write_wmc_URLType:function(elName,url,attr){var node=this.createElementDefaultNS(elName);node.appendChild(this.write_wmc_OnlineResource(url));if(attr){var optionalAttributes=["width","height","format"];for(var i=0;i<optionalAttributes.length;i++){if(optionalAttributes[i]in attr){node.setAttribute(optionalAttributes[i],attr[optionalAttributes[i]]);}}}
+return node;},write_wmc_DimensionList:function(context){var node=this.createElementDefaultNS("DimensionList");var required_attributes={name:true,units:true,unitSymbol:true,userValue:true};for(var dim in context.dimensions){var attributes={};var dimension=context.dimensions[dim];for(var name in dimension){if(typeof dimension[name]=="boolean"){attributes[name]=Number(dimension[name]);}else{attributes[name]=dimension[name];}}
+var values="";if(attributes.values){values=attributes.values.join(",");delete attributes.values;}
+node.appendChild(this.createElementDefaultNS("Dimension",values,attributes));}
+return node;},write_wmc_FormatList:function(context){var node=this.createElementDefaultNS("FormatList");for(var i=0,len=context.formats.length;i<len;i++){var format=context.formats[i];node.appendChild(this.createElementDefaultNS("Format",format.value,(format.current&&format.current==true)?{current:"1"}:null));}
+return node;},write_wmc_StyleList:function(layer){var node=this.createElementDefaultNS("StyleList");var styles=layer.styles;if(styles&&OpenLayers.Util.isArray(styles)){var sld;for(var i=0,len=styles.length;i<len;i++){var s=styles[i];var style=this.createElementDefaultNS("Style",null,(s.current&&s.current==true)?{current:"1"}:null);if(s.href){sld=this.createElementDefaultNS("SLD");if(s.name){sld.appendChild(this.createElementDefaultNS("Name",s.name));}
+if(s.title){sld.appendChild(this.createElementDefaultNS("Title",s.title));}
+if(s.legend){sld.appendChild(this.write_wmc_URLType("LegendURL",s.legend.href,s.legend));}
+var link=this.write_wmc_OnlineResource(s.href);sld.appendChild(link);style.appendChild(sld);}else if(s.body){sld=this.createElementDefaultNS("SLD");if(s.name){sld.appendChild(this.createElementDefaultNS("Name",s.name));}
+if(s.title){sld.appendChild(this.createElementDefaultNS("Title",s.title));}
+if(s.legend){sld.appendChild(this.write_wmc_URLType("LegendURL",s.legend.href,s.legend));}
+var doc=OpenLayers.Format.XML.prototype.read.apply(this,[s.body]);var imported=doc.documentElement;if(sld.ownerDocument&&sld.ownerDocument.importNode){imported=sld.ownerDocument.importNode(imported,true);}
+sld.appendChild(imported);style.appendChild(sld);}else{style.appendChild(this.createElementDefaultNS("Name",s.name));style.appendChild(this.createElementDefaultNS("Title",s.title));if(s['abstract']){style.appendChild(this.createElementDefaultNS("Abstract",s['abstract']));}
+if(s.legend){style.appendChild(this.write_wmc_URLType("LegendURL",s.legend.href,s.legend));}}
+node.appendChild(style);}}
+return node;},write_wmc_OnlineResource:function(href){var node=this.createElementDefaultNS("OnlineResource");this.setAttributeNS(node,this.namespaces.xlink,"xlink:type","simple");this.setAttributeNS(node,this.namespaces.xlink,"xlink:href",href);return node;},getOnlineResource_href:function(node){var object={};var links=node.getElementsByTagName("OnlineResource");if(links.length>0){this.read_wmc_OnlineResource(object,links[0]);}
+return object.href;},CLASS_NAME:"OpenLayers.Format.WMC.v1"});OpenLayers.Format.WMC.v1_1_0=OpenLayers.Class(OpenLayers.Format.WMC.v1,{VERSION:"1.1.0",schemaLocation:"http://www.opengis.net/context http://schemas.opengis.net/context/1.1.0/context.xsd",initialize:function(options){OpenLayers.Format.WMC.v1.prototype.initialize.apply(this,[options]);},read_sld_MinScaleDenominator:function(layerContext,node){var minScaleDenominator=parseFloat(this.getChildValue(node));if(minScaleDenominator>0){layerContext.maxScale=minScaleDenominator;}},read_sld_MaxScaleDenominator:function(layerContext,node){layerContext.minScale=parseFloat(this.getChildValue(node));},read_wmc_SRS:function(layerContext,node){if(!("srs"in layerContext)){layerContext.srs={};}
+layerContext.srs[this.getChildValue(node)]=true;},write_wmc_Layer:function(context){var node=OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(this,[context]);if(context.maxScale){var minSD=this.createElementNS(this.namespaces.sld,"sld:MinScaleDenominator");minSD.appendChild(this.createTextNode(context.maxScale.toPrecision(16)));node.appendChild(minSD);}
+if(context.minScale){var maxSD=this.createElementNS(this.namespaces.sld,"sld:MaxScaleDenominator");maxSD.appendChild(this.createTextNode(context.minScale.toPrecision(16)));node.appendChild(maxSD);}
+if(context.srs){for(var name in context.srs){node.appendChild(this.createElementDefaultNS("SRS",name));}}
+node.appendChild(this.write_wmc_FormatList(context));node.appendChild(this.write_wmc_StyleList(context));if(context.dimensions){node.appendChild(this.write_wmc_DimensionList(context));}
+node.appendChild(this.write_wmc_LayerExtension(context));return node;},CLASS_NAME:"OpenLayers.Format.WMC.v1_1_0"});OpenLayers.Format.XLS=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",stringifyOutput:true,CLASS_NAME:"OpenLayers.Format.XLS"});OpenLayers.Format.XLS.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xls:"http://www.opengis.net/xls",gml:"http://www.opengis.net/gml",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},xy:true,defaultPrefix:"xls",schemaLocation:null,read:function(data,options){options=OpenLayers.Util.applyDefaults(options,this.options);var xls={};this.readChildNodes(data,xls);return xls;},readers:{"xls":{"XLS":function(node,xls){xls.version=node.getAttribute("version");this.readChildNodes(node,xls);},"Response":function(node,xls){this.readChildNodes(node,xls);},"GeocodeResponse":function(node,xls){xls.responseLists=[];this.readChildNodes(node,xls);},"GeocodeResponseList":function(node,xls){var responseList={features:[],numberOfGeocodedAddresses:parseInt(node.getAttribute("numberOfGeocodedAddresses"))};xls.responseLists.push(responseList);this.readChildNodes(node,responseList);},"GeocodedAddress":function(node,responseList){var feature=new OpenLayers.Feature.Vector();responseList.features.push(feature);this.readChildNodes(node,feature);feature.geometry=feature.components[0];},"GeocodeMatchCode":function(node,feature){feature.attributes.matchCode={accuracy:parseFloat(node.getAttribute("accuracy")),matchType:node.getAttribute("matchType")};},"Address":function(node,feature){var address={countryCode:node.getAttribute("countryCode"),addressee:node.getAttribute("addressee"),street:[],place:[]};feature.attributes.address=address;this.readChildNodes(node,address);},"freeFormAddress":function(node,address){address.freeFormAddress=this.getChildValue(node);},"StreetAddress":function(node,address){this.readChildNodes(node,address);},"Building":function(node,address){address.building={'number':node.getAttribute("number"),subdivision:node.getAttribute("subdivision"),buildingName:node.getAttribute("buildingName")};},"Street":function(node,address){address.street.push(this.getChildValue(node));},"Place":function(node,address){address.place[node.getAttribute("type")]=this.getChildValue(node);},"PostalCode":function(node,address){address.postalCode=this.getChildValue(node);}},"gml":OpenLayers.Format.GML.v3.prototype.readers.gml},write:function(request){return this.writers.xls.XLS.apply(this,[request]);},writers:{"xls":{"XLS":function(request){var root=this.createElementNSPlus("xls:XLS",{attributes:{"version":this.VERSION,"xsi:schemaLocation":this.schemaLocation}});this.writeNode("RequestHeader",request.header,root);this.writeNode("Request",request,root);return root;},"RequestHeader":function(header){return this.createElementNSPlus("xls:RequestHeader");},"Request":function(request){var node=this.createElementNSPlus("xls:Request",{attributes:{methodName:"GeocodeRequest",requestID:request.requestID||"",version:this.VERSION}});this.writeNode("GeocodeRequest",request.addresses,node);return node;},"GeocodeRequest":function(addresses){var node=this.createElementNSPlus("xls:GeocodeRequest");for(var i=0,len=addresses.length;i<len;i++){this.writeNode("Address",addresses[i],node);}
+return node;},"Address":function(address){var node=this.createElementNSPlus("xls:Address",{attributes:{countryCode:address.countryCode}});if(address.freeFormAddress){this.writeNode("freeFormAddress",address.freeFormAddress,node);}else{if(address.street){this.writeNode("StreetAddress",address,node);}
+if(address.municipality){this.writeNode("Municipality",address.municipality,node);}
+if(address.countrySubdivision){this.writeNode("CountrySubdivision",address.countrySubdivision,node);}
+if(address.postalCode){this.writeNode("PostalCode",address.postalCode,node);}}
+return node;},"freeFormAddress":function(freeFormAddress){return this.createElementNSPlus("freeFormAddress",{value:freeFormAddress});},"StreetAddress":function(address){var node=this.createElementNSPlus("xls:StreetAddress");if(address.building){this.writeNode(node,"Building",address.building);}
+var street=address.street;if(!(OpenLayers.Util.isArray(street))){street=[street];}
+for(var i=0,len=street.length;i<len;i++){this.writeNode("Street",street[i],node);}
+return node;},"Building":function(building){return this.createElementNSPlus("xls:Building",{attributes:{"number":building["number"],"subdivision":building.subdivision,"buildingName":building.buildingName}});},"Street":function(street){return this.createElementNSPlus("xls:Street",{value:street});},"Municipality":function(municipality){return this.createElementNSPlus("xls:Place",{attributes:{type:"Municipality"},value:municipality});},"CountrySubdivision":function(countrySubdivision){return this.createElementNSPlus("xls:Place",{attributes:{type:"CountrySubdivision"},value:countrySubdivision});},"PostalCode":function(postalCode){return this.createElementNSPlus("xls:PostalCode",{value:postalCode});}}},CLASS_NAME:"OpenLayers.Format.XLS.v1"});OpenLayers.Format.XLS.v1_1_0=OpenLayers.Class(OpenLayers.Format.XLS.v1,{VERSION:"1.1",schemaLocation:"http://www.opengis.net/xls http://schemas.opengis.net/ols/1.1.0/LocationUtilityService.xsd",CLASS_NAME:"OpenLayers.Format.XLS.v1_1_0"});OpenLayers.Format.XLS.v1_1=OpenLayers.Format.XLS.v1_1_0;OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",xlinkns:"http://www.w3.org/1999/xlink",MAX_PIXEL:15000,translationParameters:null,symbolMetrics:null,initialize:function(containerID){if(!this.supported()){return;}
+OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);this.translationParameters={x:0,y:0};this.symbolMetrics={};},supported:function(){var svgFeature="http://www.w3.org/TR/SVG11/feature#";return(document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature(svgFeature+"SVG","1.1")||document.implementation.hasFeature(svgFeature+"BasicStructure","1.1")));},inValidRange:function(x,y,xyOnly){var left=x+(xyOnly?0:this.translationParameters.x);var top=y+(xyOnly?0:this.translationParameters.y);return(left>=-this.MAX_PIXEL&&left<=this.MAX_PIXEL&&top>=-this.MAX_PIXEL&&top<=this.MAX_PIXEL);},setExtent:function(extent,resolutionChanged){var coordSysUnchanged=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution(),left=-extent.left/resolution,top=extent.top/resolution;if(resolutionChanged){this.left=left;this.top=top;var extentString="0 0 "+this.size.w+" "+this.size.h;this.rendererRoot.setAttributeNS(null,"viewBox",extentString);this.translate(this.xOffset,0);return true;}else{var inRange=this.translate(left-this.left+this.xOffset,top-this.top);if(!inRange){this.setExtent(extent,true);}
+return coordSysUnchanged&&inRange;}},translate:function(x,y){if(!this.inValidRange(x,y,true)){return false;}else{var transformString="";if(x||y){transformString="translate("+x+","+y+")";}
+this.root.setAttributeNS(null,"transform",transformString);this.translationParameters={x:x,y:y};return true;}},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w);this.rendererRoot.setAttributeNS(null,"height",this.size.h);},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="image";}else if(this.isComplexSymbol(style.graphicName)){nodeType="svg";}else{nodeType="circle";}
+break;case"OpenLayers.Geometry.Rectangle":nodeType="rect";break;case"OpenLayers.Geometry.LineString":nodeType="polyline";break;case"OpenLayers.Geometry.LinearRing":nodeType="polygon";break;case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":nodeType="path";break;default:break;}
+return nodeType;},setStyle:function(node,style,options){style=style||node._style;options=options||node._options;var r=parseFloat(node.getAttributeNS(null,"r"));var widthFactor=1;var pos;if(node._geometryClass=="OpenLayers.Geometry.Point"&&r){node.style.visibility="";if(style.graphic===false){node.style.visibility="hidden";}else if(style.externalGraphic){pos=this.getPosition(node);if(style.graphicTitle){node.setAttributeNS(null,"title",style.graphicTitle);var titleNode=node.getElementsByTagName("title");if(titleNode.length>0){titleNode[0].firstChild.textContent=style.graphicTitle;}else{var label=this.nodeFactory(null,"title");label.textContent=style.graphicTitle;node.appendChild(label);}}
+if(style.graphicWidth&&style.graphicHeight){node.setAttributeNS(null,"preserveAspectRatio","none");}
+var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;node.setAttributeNS(null,"x",(pos.x+xOffset).toFixed());node.setAttributeNS(null,"y",(pos.y+yOffset).toFixed());node.setAttributeNS(null,"width",width);node.setAttributeNS(null,"height",height);node.setAttributeNS(this.xlinkns,"href",style.externalGraphic);node.setAttributeNS(null,"style","opacity: "+opacity);node.onclick=OpenLayers.Renderer.SVG.preventDefault;}else if(this.isComplexSymbol(style.graphicName)){var offset=style.pointRadius*3;var size=offset*2;var src=this.importSymbol(style.graphicName);pos=this.getPosition(node);widthFactor=this.symbolMetrics[src.id][0]*3/size;var parent=node.parentNode;var nextSibling=node.nextSibling;if(parent){parent.removeChild(node);}
+node.firstChild&&node.removeChild(node.firstChild);node.appendChild(src.firstChild.cloneNode(true));node.setAttributeNS(null,"viewBox",src.getAttributeNS(null,"viewBox"));node.setAttributeNS(null,"width",size);node.setAttributeNS(null,"height",size);node.setAttributeNS(null,"x",pos.x-offset);node.setAttributeNS(null,"y",pos.y-offset);if(nextSibling){parent.insertBefore(node,nextSibling);}else if(parent){parent.appendChild(node);}}else{node.setAttributeNS(null,"r",style.pointRadius);}
+var rotation=style.rotation;if((rotation!==undefined||node._rotation!==undefined)&&pos){node._rotation=rotation;rotation|=0;if(node.nodeName!=="svg"){node.setAttributeNS(null,"transform","rotate("+rotation+" "+pos.x+" "+
+pos.y+")");}else{var metrics=this.symbolMetrics[src.id];node.firstChild.setAttributeNS(null,"transform","rotate("
++rotation+" "
++metrics[1]+" "
++metrics[2]+")");}}}
+if(options.isFilled){node.setAttributeNS(null,"fill",style.fillColor);node.setAttributeNS(null,"fill-opacity",style.fillOpacity);}else{node.setAttributeNS(null,"fill","none");}
+if(options.isStroked){node.setAttributeNS(null,"stroke",style.strokeColor);node.setAttributeNS(null,"stroke-opacity",style.strokeOpacity);node.setAttributeNS(null,"stroke-width",style.strokeWidth*widthFactor);node.setAttributeNS(null,"stroke-linecap",style.strokeLinecap||"round");node.setAttributeNS(null,"stroke-linejoin","round");style.strokeDashstyle&&node.setAttributeNS(null,"stroke-dasharray",this.dashStyle(style,widthFactor));}else{node.setAttributeNS(null,"stroke","none");}
+if(style.pointerEvents){node.setAttributeNS(null,"pointer-events",style.pointerEvents);}
+if(style.cursor!=null){node.setAttributeNS(null,"cursor",style.cursor);}
+return node;},dashStyle:function(style,widthFactor){var w=style.strokeWidth*widthFactor;var str=style.strokeDashstyle;switch(str){case'solid':return'none';case'dot':return[1,4*w].join();case'dash':return[4*w,4*w].join();case'dashdot':return[4*w,4*w,1,4*w].join();case'longdash':return[8*w,4*w].join();case'longdashdot':return[8*w,4*w,1,4*w].join();default:return OpenLayers.String.trim(str).replace(/\s+/g,",");}},createNode:function(type,id){var node=document.createElementNS(this.xmlns,type);if(id){node.setAttributeNS(null,"id",id);}
+return node;},nodeTypeCompare:function(node,type){return(type==node.nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_svgRoot","svg");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"g");},createDefs:function(){var defs=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(defs);return defs;},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){var resolution=this.getResolution();var x=((geometry.x-this.featureDx)/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"cx",x);node.setAttributeNS(null,"cy",y);node.setAttributeNS(null,"r",radius);return node;}else{return false;}},drawLineString:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawLinearRing:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawPolygon:function(node,geometry){var d="";var draw=true;var complete=true;var linearRingResult,path;for(var j=0,len=geometry.components.length;j<len;j++){d+=" M";linearRingResult=this.getComponentsString(geometry.components[j].components," ");path=linearRingResult.path;if(path){d+=" "+path;complete=linearRingResult.complete&&complete;}else{draw=false;}}
+d+=" z";if(draw){node.setAttributeNS(null,"d",d);node.setAttributeNS(null,"fill-rule","evenodd");return complete?node:null;}else{return false;}},drawRectangle:function(node,geometry){var resolution=this.getResolution();var x=((geometry.x-this.featureDx)/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"x",x);node.setAttributeNS(null,"y",y);node.setAttributeNS(null,"width",geometry.width/resolution);node.setAttributeNS(null,"height",geometry.height/resolution);return node;}else{return false;}},drawText:function(featureId,style,location){var drawOutline=(!!style.labelOutlineWidth);if(drawOutline){var outlineStyle=OpenLayers.Util.extend({},style);outlineStyle.fontColor=outlineStyle.labelOutlineColor;outlineStyle.fontStrokeColor=outlineStyle.labelOutlineColor;outlineStyle.fontStrokeWidth=style.labelOutlineWidth;delete outlineStyle.labelOutlineWidth;this.drawText(featureId,outlineStyle,location);}
+var resolution=this.getResolution();var x=((location.x-this.featureDx)/resolution+this.left);var y=(location.y/resolution-this.top);var suffix=(drawOutline)?this.LABEL_OUTLINE_SUFFIX:this.LABEL_ID_SUFFIX;var label=this.nodeFactory(featureId+suffix,"text");label.setAttributeNS(null,"x",x);label.setAttributeNS(null,"y",-y);if(style.fontColor){label.setAttributeNS(null,"fill",style.fontColor);}
+if(style.fontStrokeColor){label.setAttributeNS(null,"stroke",style.fontStrokeColor);}
+if(style.fontStrokeWidth){label.setAttributeNS(null,"stroke-width",style.fontStrokeWidth);}
+if(style.fontOpacity){label.setAttributeNS(null,"opacity",style.fontOpacity);}
+if(style.fontFamily){label.setAttributeNS(null,"font-family",style.fontFamily);}
+if(style.fontSize){label.setAttributeNS(null,"font-size",style.fontSize);}
+if(style.fontWeight){label.setAttributeNS(null,"font-weight",style.fontWeight);}
+if(style.fontStyle){label.setAttributeNS(null,"font-style",style.fontStyle);}
+if(style.labelSelect===true){label.setAttributeNS(null,"pointer-events","visible");label._featureId=featureId;}else{label.setAttributeNS(null,"pointer-events","none");}
+var align=style.labelAlign||OpenLayers.Renderer.defaultSymbolizer.labelAlign;label.setAttributeNS(null,"text-anchor",OpenLayers.Renderer.SVG.LABEL_ALIGN[align[0]]||"middle");if(OpenLayers.IS_GECKO===true){label.setAttributeNS(null,"dominant-baseline",OpenLayers.Renderer.SVG.LABEL_ALIGN[align[1]]||"central");}
+var labelRows=style.label.split('\n');var numRows=labelRows.length;while(label.childNodes.length>numRows){label.removeChild(label.lastChild);}
+for(var i=0;i<numRows;i++){var tspan=this.nodeFactory(featureId+suffix+"_tspan_"+i,"tspan");if(style.labelSelect===true){tspan._featureId=featureId;tspan._geometry=location;tspan._geometryClass=location.CLASS_NAME;}
+if(OpenLayers.IS_GECKO===false){tspan.setAttributeNS(null,"baseline-shift",OpenLayers.Renderer.SVG.LABEL_VSHIFT[align[1]]||"-35%");}
+tspan.setAttribute("x",x);if(i==0){var vfactor=OpenLayers.Renderer.SVG.LABEL_VFACTOR[align[1]];if(vfactor==null){vfactor=-.5;}
+tspan.setAttribute("dy",(vfactor*(numRows-1))+"em");}else{tspan.setAttribute("dy","1em");}
+tspan.textContent=(labelRows[i]==='')?' ':labelRows[i];if(!tspan.parentNode){label.appendChild(tspan);}}
+if(!label.parentNode){this.textRoot.appendChild(label);}},getComponentsString:function(components,separator){var renderCmp=[];var complete=true;var len=components.length;var strings=[];var str,component;for(var i=0;i<len;i++){component=components[i];renderCmp.push(component);str=this.getShortString(component);if(str){strings.push(str);}else{if(i>0){if(this.getShortString(components[i-1])){strings.push(this.clipLine(components[i],components[i-1]));}}
+if(i<len-1){if(this.getShortString(components[i+1])){strings.push(this.clipLine(components[i],components[i+1]));}}
+complete=false;}}
+return{path:strings.join(separator||","),complete:complete};},clipLine:function(badComponent,goodComponent){if(goodComponent.equals(badComponent)){return"";}
+var resolution=this.getResolution();var maxX=this.MAX_PIXEL-this.translationParameters.x;var maxY=this.MAX_PIXEL-this.translationParameters.y;var x1=(goodComponent.x-this.featureDx)/resolution+this.left;var y1=this.top-goodComponent.y/resolution;var x2=(badComponent.x-this.featureDx)/resolution+this.left;var y2=this.top-badComponent.y/resolution;var k;if(x2<-maxX||x2>maxX){k=(y2-y1)/(x2-x1);x2=x2<0?-maxX:maxX;y2=y1+(x2-x1)*k;}
+if(y2<-maxY||y2>maxY){k=(x2-x1)/(y2-y1);y2=y2<0?-maxY:maxY;x2=x1+(y2-y1)*k;}
+return x2+","+y2;},getShortString:function(point){var resolution=this.getResolution();var x=((point.x-this.featureDx)/resolution+this.left);var y=(this.top-point.y/resolution);if(this.inValidRange(x,y)){return x+","+y;}else{return false;}},getPosition:function(node){return({x:parseFloat(node.getAttributeNS(null,"cx")),y:parseFloat(node.getAttributeNS(null,"cy"))});},importSymbol:function(graphicName){if(!this.defs){this.defs=this.createDefs();}
+var id=this.container.id+"-"+graphicName;var existing=document.getElementById(id);if(existing!=null){return existing;}
+var symbol=OpenLayers.Renderer.symbol[graphicName];if(!symbol){throw new Error(graphicName+' is not a valid symbol name');}
+var symbolNode=this.nodeFactory(id,"symbol");var node=this.nodeFactory(null,"polygon");symbolNode.appendChild(node);var symbolExtent=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);var points=[];var x,y;for(var i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];symbolExtent.left=Math.min(symbolExtent.left,x);symbolExtent.bottom=Math.min(symbolExtent.bottom,y);symbolExtent.right=Math.max(symbolExtent.right,x);symbolExtent.top=Math.max(symbolExtent.top,y);points.push(x,",",y);}
+node.setAttributeNS(null,"points",points.join(" "));var width=symbolExtent.getWidth();var height=symbolExtent.getHeight();var viewBox=[symbolExtent.left-width,symbolExtent.bottom-height,width*3,height*3];symbolNode.setAttributeNS(null,"viewBox",viewBox.join(" "));this.symbolMetrics[id]=[Math.max(width,height),symbolExtent.getCenterLonLat().lon,symbolExtent.getCenterLonLat().lat];this.defs.appendChild(symbolNode);return symbolNode;},getFeatureIdFromEvent:function(evt){var featureId=OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this,arguments);if(!featureId){var target=evt.target;featureId=target.parentNode&&target!=this.rendererRoot?target.parentNode._featureId:undefined;}
+return featureId;},CLASS_NAME:"OpenLayers.Renderer.SVG"});OpenLayers.Renderer.SVG.LABEL_ALIGN={"l":"start","r":"end","b":"bottom","t":"hanging"};OpenLayers.Renderer.SVG.LABEL_VSHIFT={"t":"-70%","b":"0"};OpenLayers.Renderer.SVG.LABEL_VFACTOR={"t":0,"b":-1};OpenLayers.Renderer.SVG.preventDefault=function(e){e.preventDefault&&e.preventDefault();};OpenLayers.Format.SLD.v1_0_0=OpenLayers.Class(OpenLayers.Format.SLD.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd",CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0"});OpenLayers.Format.OWSContext=OpenLayers.Class(OpenLayers.Format.Context,{defaultVersion:"0.3.1",getVersion:function(root,options){var version=OpenLayers.Format.XML.VersionedOGC.prototype.getVersion.apply(this,arguments);if(version==="0.3.0"){version=this.defaultVersion;}
+return version;},toContext:function(obj){var context={};if(obj.CLASS_NAME=="OpenLayers.Map"){context.bounds=obj.getExtent();context.maxExtent=obj.maxExtent;context.projection=obj.projection;context.size=obj.getSize();context.layers=obj.layers;}
+return context;},CLASS_NAME:"OpenLayers.Format.OWSContext"});OpenLayers.Format.OWSContext.v0_3_1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{owc:"http://www.opengis.net/ows-context",gml:"http://www.opengis.net/gml",kml:"http://www.opengis.net/kml/2.2",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows",sld:"http://www.opengis.net/sld",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},VERSION:"0.3.1",schemaLocation:"http://www.opengis.net/ows-context http://www.ogcnetwork.net/schemas/owc/0.3.1/owsContext.xsd",defaultPrefix:"owc",extractAttributes:true,xy:true,regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},featureNS:"http://mapserver.gis.umn.edu/mapserver",featureType:'vector',geometryName:'geometry',nestingLayerLookup:null,initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);OpenLayers.Format.GML.v2.prototype.setGeometryTypes.call(this);},setNestingPath:function(l){if(l.layersContext){for(var i=0,len=l.layersContext.length;i<len;i++){var layerContext=l.layersContext[i];var nPath=[];var nTitle=l.title||"";if(l.metadata&&l.metadata.nestingPath){nPath=l.metadata.nestingPath.slice();}
+if(nTitle!=""){nPath.push(nTitle);}
+layerContext.metadata.nestingPath=nPath;if(layerContext.layersContext){this.setNestingPath(layerContext);}}}},decomposeNestingPath:function(nPath){var a=[];if(OpenLayers.Util.isArray(nPath)){var path=nPath.slice();while(path.length>0){a.push(path.slice());path.pop();}
+a.reverse();}
+return a;},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var context={};this.readNode(data,context);this.setNestingPath({layersContext:context.layersContext});var layers=[];this.processLayer(layers,context);delete context.layersContext;context.layersContext=layers;return context;},processLayer:function(layerArray,layer){if(layer.layersContext){for(var i=0,len=layer.layersContext.length;i<len;i++){var l=layer.layersContext[i];layerArray.push(l);if(l.layersContext){this.processLayer(layerArray,l);}}}},write:function(context,options){var name="OWSContext";this.nestingLayerLookup={};options=options||{};OpenLayers.Util.applyDefaults(options,context);var root=this.writeNode(name,options);this.nestingLayerLookup=null;this.setAttributeNS(root,this.namespaces["xsi"],"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[root]);},readers:{"kml":{"Document":function(node,obj){obj.features=new OpenLayers.Format.KML({kmlns:this.namespaces.kml,extractStyles:true}).read(node);}},"owc":{"OWSContext":function(node,obj){this.readChildNodes(node,obj);},"General":function(node,obj){this.readChildNodes(node,obj);},"ResourceList":function(node,obj){this.readChildNodes(node,obj);},"Layer":function(node,obj){var layerContext={metadata:{},visibility:(node.getAttribute("hidden")!="1"),queryable:(node.getAttribute("queryable")=="1"),opacity:((node.getAttribute("opacity")!=null)?parseFloat(node.getAttribute("opacity")):null),name:node.getAttribute("name"),categoryLayer:(node.getAttribute("name")==null),formats:[],styles:[]};if(!obj.layersContext){obj.layersContext=[];}
+obj.layersContext.push(layerContext);this.readChildNodes(node,layerContext);},"InlineGeometry":function(node,obj){obj.features=[];var elements=this.getElementsByTagNameNS(node,this.namespaces.gml,"featureMember");var el;if(elements.length>=1){el=elements[0];}
+if(el&&el.firstChild){var featurenode=(el.firstChild.nextSibling)?el.firstChild.nextSibling:el.firstChild;this.setNamespace("feature",featurenode.namespaceURI);this.featureType=featurenode.localName||featurenode.nodeName.split(":").pop();this.readChildNodes(node,obj);}},"Server":function(node,obj){if((!obj.service&&!obj.version)||(obj.service!=OpenLayers.Format.Context.serviceTypes.WMS)){obj.service=node.getAttribute("service");obj.version=node.getAttribute("version");this.readChildNodes(node,obj);}},"Name":function(node,obj){obj.name=this.getChildValue(node);this.readChildNodes(node,obj);},"Title":function(node,obj){obj.title=this.getChildValue(node);this.readChildNodes(node,obj);},"StyleList":function(node,obj){this.readChildNodes(node,obj.styles);},"Style":function(node,obj){var style={};obj.push(style);this.readChildNodes(node,style);},"LegendURL":function(node,obj){var legend={};obj.legend=legend;this.readChildNodes(node,legend);},"OnlineResource":function(node,obj){obj.url=this.getAttributeNS(node,this.namespaces.xlink,"href");this.readChildNodes(node,obj);}},"ows":OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows,"gml":OpenLayers.Format.GML.v2.prototype.readers.gml,"sld":OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld,"feature":OpenLayers.Format.GML.v2.prototype.readers.feature},writers:{"owc":{"OWSContext":function(options){var node=this.createElementNSPlus("OWSContext",{attributes:{version:this.VERSION,id:options.id||OpenLayers.Util.createUniqueID("OpenLayers_OWSContext_")}});this.writeNode("General",options,node);this.writeNode("ResourceList",options,node);return node;},"General":function(options){var node=this.createElementNSPlus("General");this.writeNode("ows:BoundingBox",options,node);this.writeNode("ows:Title",options.title||'OpenLayers OWSContext',node);return node;},"ResourceList":function(options){var node=this.createElementNSPlus("ResourceList");for(var i=0,len=options.layers.length;i<len;i++){var layer=options.layers[i];var decomposedPath=this.decomposeNestingPath(layer.metadata.nestingPath);this.writeNode("_Layer",{layer:layer,subPaths:decomposedPath},node);}
+return node;},"Server":function(options){var node=this.createElementNSPlus("Server",{attributes:{version:options.version,service:options.service}});this.writeNode("OnlineResource",options,node);return node;},"OnlineResource":function(options){var node=this.createElementNSPlus("OnlineResource",{attributes:{"xlink:href":options.url}});return node;},"InlineGeometry":function(layer){var node=this.createElementNSPlus("InlineGeometry");this.writeNode("gml:boundedBy",layer.getDataExtent(),node);for(var i=0,len=layer.features.length;i<len;i++){this.writeNode("gml:featureMember",layer.features[i],node);}
+return node;},"StyleList":function(styles){var node=this.createElementNSPlus("StyleList");for(var i=0,len=styles.length;i<len;i++){this.writeNode("Style",styles[i],node);}
+return node;},"Style":function(style){var node=this.createElementNSPlus("Style");this.writeNode("Name",style,node);this.writeNode("Title",style,node);if(style.legend){this.writeNode("LegendURL",style,node);}
+return node;},"Name":function(obj){var node=this.createElementNSPlus("Name",{value:obj.name});return node;},"Title":function(obj){var node=this.createElementNSPlus("Title",{value:obj.title});return node;},"LegendURL":function(style){var node=this.createElementNSPlus("LegendURL");this.writeNode("OnlineResource",style.legend,node);return node;},"_WMS":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:layer.params.LAYERS,queryable:layer.queryable?"1":"0",hidden:layer.visibility?"0":"1",opacity:layer.hasOwnProperty("opacity")?layer.opacity:null}});this.writeNode("ows:Title",layer.name,node);this.writeNode("ows:OutputFormat",layer.params.FORMAT,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WMS,version:layer.params.VERSION,url:layer.url},node);if(layer.metadata.styles&&layer.metadata.styles.length>0){this.writeNode("StyleList",layer.metadata.styles,node);}
+return node;},"_Layer":function(options){var layer,subPaths,node,title;layer=options.layer;subPaths=options.subPaths;node=null;title=null;if(subPaths.length>0){var path=subPaths[0].join("/");var index=path.lastIndexOf("/");node=this.nestingLayerLookup[path];title=(index>0)?path.substring(index+1,path.length):path;if(!node){node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",title,node);this.nestingLayerLookup[path]=node;}
+options.subPaths.shift();this.writeNode("_Layer",options,node);return node;}else{if(layer instanceof OpenLayers.Layer.WMS){node=this.writeNode("_WMS",layer);}else if(layer instanceof OpenLayers.Layer.Vector){if(layer.protocol instanceof OpenLayers.Protocol.WFS.v1){node=this.writeNode("_WFS",layer);}else if(layer.protocol instanceof OpenLayers.Protocol.HTTP){if(layer.protocol.format instanceof OpenLayers.Format.GML){layer.protocol.format.version="2.1.2";node=this.writeNode("_GML",layer);}else if(layer.protocol.format instanceof OpenLayers.Format.KML){layer.protocol.format.version="2.2";node=this.writeNode("_KML",layer);}}else{this.setNamespace("feature",this.featureNS);node=this.writeNode("_InlineGeometry",layer);}}
+if(layer.options.maxScale){this.writeNode("sld:MinScaleDenominator",layer.options.maxScale,node);}
+if(layer.options.minScale){this.writeNode("sld:MaxScaleDenominator",layer.options.minScale,node);}
+this.nestingLayerLookup[layer.name]=node;return node;}},"_WFS":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:layer.protocol.featurePrefix+":"+layer.protocol.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WFS,version:layer.protocol.version,url:layer.protocol.url},node);return node;},"_InlineGeometry":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:this.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("InlineGeometry",layer,node);return node;},"_GML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.GML,url:layer.protocol.url,version:layer.protocol.format.version},node);return node;},"_KML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.KML,version:layer.protocol.format.version,url:layer.protocol.url},node);return node;}},"gml":OpenLayers.Util.applyDefaults({"boundedBy":function(bounds){var node=this.createElementNSPlus("gml:boundedBy");this.writeNode("gml:Box",bounds,node);return node;}},OpenLayers.Format.GML.v2.prototype.writers.gml),"ows":OpenLayers.Format.OWSCommon.v1_0_0.prototype.writers.ows,"sld":OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld,"feature":OpenLayers.Format.GML.v2.prototype.writers.feature},CLASS_NAME:"OpenLayers.Format.OWSContext.v0_3_1"});OpenLayers.Control.ScaleLine=OpenLayers.Class(OpenLayers.Control,{maxWidth:100,topOutUnits:"km",topInUnits:"m",bottomOutUnits:"mi",bottomInUnits:"ft",eTop:null,eBottom:null,geodesic:false,draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.eTop){this.eTop=document.createElement("div");this.eTop.className=this.displayClass+"Top";var theLen=this.topInUnits.length;this.div.appendChild(this.eTop);if((this.topOutUnits=="")||(this.topInUnits=="")){this.eTop.style.visibility="hidden";}else{this.eTop.style.visibility="visible";}
+this.eBottom=document.createElement("div");this.eBottom.className=this.displayClass+"Bottom";this.div.appendChild(this.eBottom);if((this.bottomOutUnits=="")||(this.bottomInUnits=="")){this.eBottom.style.visibility="hidden";}else{this.eBottom.style.visibility="visible";}}
+this.map.events.register('moveend',this,this.update);this.update();return this.div;},getBarLen:function(maxLen){var digits=parseInt(Math.log(maxLen)/Math.log(10));var pow10=Math.pow(10,digits);var firstChar=parseInt(maxLen/pow10);var barLen;if(firstChar>5){barLen=5;}else if(firstChar>2){barLen=2;}else{barLen=1;}
+return barLen*pow10;},update:function(){var res=this.map.getResolution();if(!res){return;}
+var curMapUnits=this.map.getUnits();var inches=OpenLayers.INCHES_PER_UNIT;var maxSizeData=this.maxWidth*res*inches[curMapUnits];var geodesicRatio=1;if(this.geodesic===true){var maxSizeGeodesic=(this.map.getGeodesicPixelSize().w||0.000001)*this.maxWidth;var maxSizeKilometers=maxSizeData/inches["km"];geodesicRatio=maxSizeGeodesic/maxSizeKilometers;maxSizeData*=geodesicRatio;}
+var topUnits;var bottomUnits;if(maxSizeData>100000){topUnits=this.topOutUnits;bottomUnits=this.bottomOutUnits;}else{topUnits=this.topInUnits;bottomUnits=this.bottomInUnits;}
+var topMax=maxSizeData/inches[topUnits];var bottomMax=maxSizeData/inches[bottomUnits];var topRounded=this.getBarLen(topMax);var bottomRounded=this.getBarLen(bottomMax);topMax=topRounded/inches[curMapUnits]*inches[topUnits];bottomMax=bottomRounded/inches[curMapUnits]*inches[bottomUnits];var topPx=topMax/res/geodesicRatio;var bottomPx=bottomMax/res/geodesicRatio;if(this.eBottom.style.visibility=="visible"){this.eBottom.style.width=Math.round(bottomPx)+"px";this.eBottom.innerHTML=bottomRounded+" "+bottomUnits;}
+if(this.eTop.style.visibility=="visible"){this.eTop.style.width=Math.round(topPx)+"px";this.eTop.innerHTML=topRounded+" "+topUnits;}},CLASS_NAME:"OpenLayers.Control.ScaleLine"});OpenLayers.Icon=OpenLayers.Class({url:null,size:null,offset:null,calculateOffset:null,imageDiv:null,px:null,initialize:function(url,size,offset,calculateOffset){this.url=url;this.size=size||{w:20,h:20};this.offset=offset||{x:-(this.size.w/2),y:-(this.size.h/2)};this.calculateOffset=calculateOffset;var id=OpenLayers.Util.createUniqueID("OL_Icon_");this.imageDiv=OpenLayers.Util.createAlphaImageDiv(id);},destroy:function(){this.erase();OpenLayers.Event.stopObservingElement(this.imageDiv.firstChild);this.imageDiv.innerHTML="";this.imageDiv=null;},clone:function(){return new OpenLayers.Icon(this.url,this.size,this.offset,this.calculateOffset);},setSize:function(size){if(size!=null){this.size=size;}
+this.draw();},setUrl:function(url){if(url!=null){this.url=url;}
+this.draw();},draw:function(px){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,this.size,this.url,"absolute");this.moveTo(px);return this.imageDiv;},erase:function(){if(this.imageDiv!=null&&this.imageDiv.parentNode!=null){OpenLayers.Element.remove(this.imageDiv);}},setOpacity:function(opacity){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,null,null,null,null,null,opacity);},moveTo:function(px){if(px!=null){this.px=px;}
+if(this.imageDiv!=null){if(this.px==null){this.display(false);}else{if(this.calculateOffset){this.offset=this.calculateOffset(this.size);}
+OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,{x:this.px.x+this.offset.x,y:this.px.y+this.offset.y});}}},display:function(display){this.imageDiv.style.display=(display)?"":"none";},isDrawn:function(){var isDrawn=(this.imageDiv&&this.imageDiv.parentNode&&(this.imageDiv.parentNode.nodeType!=11));return isDrawn;},CLASS_NAME:"OpenLayers.Icon"});OpenLayers.Marker=OpenLayers.Class({icon:null,lonlat:null,events:null,map:null,initialize:function(lonlat,icon){this.lonlat=lonlat;var newIcon=(icon)?icon:OpenLayers.Marker.defaultIcon();if(this.icon==null){this.icon=newIcon;}else{this.icon.url=newIcon.url;this.icon.size=newIcon.size;this.icon.offset=newIcon.offset;this.icon.calculateOffset=newIcon.calculateOffset;}
+this.events=new OpenLayers.Events(this,this.icon.imageDiv);},destroy:function(){this.erase();this.map=null;this.events.destroy();this.events=null;if(this.icon!=null){this.icon.destroy();this.icon=null;}},draw:function(px){return this.icon.draw(px);},erase:function(){if(this.icon!=null){this.icon.erase();}},moveTo:function(px){if((px!=null)&&(this.icon!=null)){this.icon.moveTo(px);}
+this.lonlat=this.map.getLonLatFromLayerPx(px);},isDrawn:function(){var isDrawn=(this.icon&&this.icon.isDrawn());return isDrawn;},onScreen:function(){var onScreen=false;if(this.map){var screenBounds=this.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);}
+return onScreen;},inflate:function(inflate){if(this.icon){this.icon.setSize({w:this.icon.size.w*inflate,h:this.icon.size.h*inflate});}},setOpacity:function(opacity){this.icon.setOpacity(opacity);},setUrl:function(url){this.icon.setUrl(url);},display:function(display){this.icon.display(display);},CLASS_NAME:"OpenLayers.Marker"});OpenLayers.Marker.defaultIcon=function(){return new OpenLayers.Icon(OpenLayers.Util.getImageLocation("marker.png"),{w:21,h:25},{x:-10.5,y:-25});};OpenLayers.Layer.TileCache=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,format:'image/png',serverResolutions:null,initialize:function(name,url,layername,options){this.layername=layername;OpenLayers.Layer.Grid.prototype.initialize.apply(this,[name,url,{},options]);this.extension=this.format.split('/')[1].toLowerCase();this.extension=(this.extension=='jpg')?'jpeg':this.extension;},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.TileCache(this.name,this.url,this.layername,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){var res=this.getServerResolution();var bbox=this.maxExtent;var size=this.tileSize;var tileX=Math.round((bounds.left-bbox.left)/(res*size.w));var tileY=Math.round((bounds.bottom-bbox.bottom)/(res*size.h));var tileZ=this.serverResolutions!=null?OpenLayers.Util.indexOf(this.serverResolutions,res):this.map.getZoom();function zeroPad(number,length){number=String(number);var zeros=[];for(var i=0;i<length;++i){zeros.push('0');}
+return zeros.join('').substring(0,length-number.length)+number;}
+var components=[this.layername,zeroPad(tileZ,2),zeroPad(parseInt(tileX/1000000),3),zeroPad((parseInt(tileX/1000)%1000),3),zeroPad((parseInt(tileX)%1000),3),zeroPad(parseInt(tileY/1000000),3),zeroPad((parseInt(tileY/1000)%1000),3),zeroPad((parseInt(tileY)%1000),3)+'.'+this.extension];var path=components.join('/');var url=this.url;if(OpenLayers.Util.isArray(url)){url=this.selectUrl(path,url);}
+url=(url.charAt(url.length-1)=='/')?url:url+'/';return url+path;},CLASS_NAME:"OpenLayers.Layer.TileCache"});OpenLayers.Layer.KaMap=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,DEFAULT_PARAMS:{i:'jpeg',map:''},initialize:function(name,url,params,options){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS);},getURL:function(bounds){bounds=this.adjustBounds(bounds);var mapRes=this.map.getResolution();var scale=Math.round((this.map.getScale()*10000))/10000;var pX=Math.round(bounds.left/mapRes);var pY=-Math.round(bounds.top/mapRes);return this.getFullRequestString({t:pY,l:pX,s:scale});},calculateGridLayout:function(bounds,origin,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=tilecol*tilelon;var offsetlat=bounds.top;var tilerow=Math.ceil(offsetlat/tilelat)+this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=-(tilerowremain+1)*this.tileSize.h;var tileoffsetlat=tilerow*tilelat;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.KaMap(this.name,this.url,this.params,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);if(this.tileSize!=null){obj.tileSize=this.tileSize.clone();}
+obj.grid=[];return obj;},getTileBounds:function(viewPortPx){var resolution=this.getResolution();var tileMapWidth=resolution*this.tileSize.w;var tileMapHeight=resolution*this.tileSize.h;var mapPoint=this.getLonLatFromViewPortPx(viewPortPx);var tileLeft=tileMapWidth*Math.floor(mapPoint.lon/tileMapWidth);var tileBottom=tileMapHeight*Math.floor(mapPoint.lat/tileMapHeight);return new OpenLayers.Bounds(tileLeft,tileBottom,tileLeft+tileMapWidth,tileBottom+tileMapHeight);},CLASS_NAME:"OpenLayers.Layer.KaMap"});OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:false,positionBlocks:null,blocks:null,fixedRelativePosition:false,initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);if(this.fixedRelativePosition){this.updateRelativePosition();this.calculateRelativePosition=function(px){return this.relativePosition;};}
+this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;if(closeBox){this.closeDiv.style.zIndex=1;}
+this.groupDiv.style.position="absolute";this.groupDiv.style.top="0px";this.groupDiv.style.left="0px";this.groupDiv.style.height="100%";this.groupDiv.style.width="100%";},destroy:function(){this.imageSrc=null;this.imageSize=null;this.isAlphaImage=null;this.fixedRelativePosition=false;this.positionBlocks=null;for(var i=0;i<this.blocks.length;i++){var block=this.blocks[i];if(block.image){block.div.removeChild(block.image);}
+block.image=null;if(block.div){this.groupDiv.removeChild(block.div);}
+block.div=null;}
+this.blocks=null;OpenLayers.Popup.Anchored.prototype.destroy.apply(this,arguments);},setBackgroundColor:function(color){},setBorder:function(){},setOpacity:function(opacity){},setSize:function(contentSize){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.updateBlocks();},updateRelativePosition:function(){this.padding=this.positionBlocks[this.relativePosition].padding;if(this.closeDiv){var contentDivPadding=this.getContentDivPadding();this.closeDiv.style.right=contentDivPadding.right+
+this.padding.right+"px";this.closeDiv.style.top=contentDivPadding.top+
+this.padding.top+"px";}
+this.updateBlocks();},calculateNewPx:function(px){var newPx=OpenLayers.Popup.Anchored.prototype.calculateNewPx.apply(this,arguments);newPx=newPx.offset(this.positionBlocks[this.relativePosition].offset);return newPx;},createBlocks:function(){this.blocks=[];var firstPosition=null;for(var key in this.positionBlocks){firstPosition=key;break;}
+var position=this.positionBlocks[firstPosition];for(var i=0;i<position.blocks.length;i++){var block={};this.blocks.push(block);var divId=this.id+'_FrameDecorationDiv_'+i;block.div=OpenLayers.Util.createDiv(divId,null,null,null,"absolute",null,"hidden",null);var imgId=this.id+'_FrameDecorationImg_'+i;var imageCreator=(this.isAlphaImage)?OpenLayers.Util.createAlphaImageDiv:OpenLayers.Util.createImage;block.image=imageCreator(imgId,null,this.imageSize,this.imageSrc,"absolute",null,null,null);block.div.appendChild(block.image);this.groupDiv.appendChild(block.div);}},updateBlocks:function(){if(!this.blocks){this.createBlocks();}
+if(this.size&&this.relativePosition){var position=this.positionBlocks[this.relativePosition];for(var i=0;i<position.blocks.length;i++){var positionBlock=position.blocks[i];var block=this.blocks[i];var l=positionBlock.anchor.left;var b=positionBlock.anchor.bottom;var r=positionBlock.anchor.right;var t=positionBlock.anchor.top;var w=(isNaN(positionBlock.size.w))?this.size.w-(r+l):positionBlock.size.w;var h=(isNaN(positionBlock.size.h))?this.size.h-(b+t):positionBlock.size.h;block.div.style.width=(w<0?0:w)+'px';block.div.style.height=(h<0?0:h)+'px';block.div.style.left=(l!=null)?l+'px':'';block.div.style.bottom=(b!=null)?b+'px':'';block.div.style.right=(r!=null)?r+'px':'';block.div.style.top=(t!=null)?t+'px':'';block.image.style.left=positionBlock.position.x+'px';block.image.style.top=positionBlock.position.y+'px';}
+this.contentDiv.style.left=this.padding.left+"px";this.contentDiv.style.top=this.padding.top+"px";}},CLASS_NAME:"OpenLayers.Popup.Framed"});OpenLayers.Control.DrawFeature=OpenLayers.Class(OpenLayers.Control,{layer:null,callbacks:null,multi:false,featureAdded:function(){},initialize:function(layer,handler,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.callbacks=OpenLayers.Util.extend({done:this.drawFeature,modify:function(vertex,feature){this.layer.events.triggerEvent("sketchmodified",{vertex:vertex,feature:feature});},create:function(vertex,feature){this.layer.events.triggerEvent("sketchstarted",{vertex:vertex,feature:feature});}},this.callbacks);this.layer=layer;this.handlerOptions=this.handlerOptions||{};this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{renderers:layer.renderers,rendererOptions:layer.rendererOptions});if(!("multi"in this.handlerOptions)){this.handlerOptions.multi=this.multi;}
+var sketchStyle=this.layer.styleMap&&this.layer.styleMap.styles.temporary;if(sketchStyle){this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{styleMap:new OpenLayers.StyleMap({"default":sketchStyle})});}
+this.handler=new handler(this,this.callbacks,this.handlerOptions);},drawFeature:function(geometry){var feature=new OpenLayers.Feature.Vector(geometry);var proceed=this.layer.events.triggerEvent("sketchcomplete",{feature:feature});if(proceed!==false){feature.state=OpenLayers.State.INSERT;this.layer.addFeatures([feature]);this.featureAdded(feature);this.events.triggerEvent("featureadded",{feature:feature});}},insertXY:function(x,y){if(this.handler&&this.handler.line){this.handler.insertXY(x,y);}},insertDeltaXY:function(dx,dy){if(this.handler&&this.handler.line){this.handler.insertDeltaXY(dx,dy);}},insertDirectionLength:function(direction,length){if(this.handler&&this.handler.line){this.handler.insertDirectionLength(direction,length);}},insertDeflectionLength:function(deflection,length){if(this.handler&&this.handler.line){this.handler.insertDeflectionLength(deflection,length);}},undo:function(){return this.handler.undo&&this.handler.undo();},redo:function(){return this.handler.redo&&this.handler.redo();},finishSketch:function(){this.handler.finishGeometry();},cancel:function(){this.handler.cancel();},CLASS_NAME:"OpenLayers.Control.DrawFeature"});OpenLayers.Control.EditingToolbar=OpenLayers.Class(OpenLayers.Control.Panel,{citeCompliant:false,initialize:function(layer,options){OpenLayers.Control.Panel.prototype.initialize.apply(this,[options]);this.addControls([new OpenLayers.Control.Navigation()]);var controls=[new OpenLayers.Control.DrawFeature(layer,OpenLayers.Handler.Point,{displayClass:'olControlDrawFeaturePoint',handlerOptions:{citeCompliant:this.citeCompliant}}),new OpenLayers.Control.DrawFeature(layer,OpenLayers.Handler.Path,{displayClass:'olControlDrawFeaturePath',handlerOptions:{citeCompliant:this.citeCompliant}}),new OpenLayers.Control.DrawFeature(layer,OpenLayers.Handler.Polygon,{displayClass:'olControlDrawFeaturePolygon',handlerOptions:{citeCompliant:this.citeCompliant}})];this.addControls(controls);},draw:function(){var div=OpenLayers.Control.Panel.prototype.draw.apply(this,arguments);if(this.defaultControl===null){this.defaultControl=this.controls[0];}
+return div;},CLASS_NAME:"OpenLayers.Control.EditingToolbar"});OpenLayers.Strategy.BBOX=OpenLayers.Class(OpenLayers.Strategy,{bounds:null,resolution:null,ratio:2,resFactor:null,response:null,activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){this.layer.events.on({"moveend":this.update,scope:this});this.layer.events.on({"refresh":this.update,scope:this});if(this.layer.visibility===true&&this.layer.inRange===true){this.update();}else{this.layer.events.on({"visibilitychanged":this.update,scope:this});}}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.layer.events.un({"moveend":this.update,"refresh":this.update,"visibilitychanged":this.update,scope:this});}
+return deactivated;},update:function(options){var mapBounds=this.getMapBounds();if(mapBounds!==null&&((options&&options.force)||this.invalidBounds(mapBounds))){this.calculateBounds(mapBounds);this.resolution=this.layer.map.getResolution();this.triggerRead(options);}},getMapBounds:function(){if(this.layer.map===null){return null;}
+var bounds=this.layer.map.getExtent();if(bounds&&!this.layer.projection.equals(this.layer.map.getProjectionObject())){bounds=bounds.clone().transform(this.layer.map.getProjectionObject(),this.layer.projection);}
+return bounds;},invalidBounds:function(mapBounds){if(!mapBounds){mapBounds=this.getMapBounds();}
+var invalid=!this.bounds||!this.bounds.containsBounds(mapBounds);if(!invalid&&this.resFactor){var ratio=this.resolution/this.layer.map.getResolution();invalid=(ratio>=this.resFactor||ratio<=(1/this.resFactor));}
+return invalid;},calculateBounds:function(mapBounds){if(!mapBounds){mapBounds=this.getMapBounds();}
+var center=mapBounds.getCenterLonLat();var dataWidth=mapBounds.getWidth()*this.ratio;var dataHeight=mapBounds.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(center.lon-(dataWidth/2),center.lat-(dataHeight/2),center.lon+(dataWidth/2),center.lat+(dataHeight/2));},triggerRead:function(options){if(this.response&&!(options&&options.noAbort===true)){this.layer.protocol.abort(this.response);this.layer.events.triggerEvent("loadend");}
+this.layer.events.triggerEvent("loadstart");this.response=this.layer.protocol.read(OpenLayers.Util.applyDefaults({filter:this.createFilter(),callback:this.merge,scope:this},options));},createFilter:function(){var filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:this.bounds,projection:this.layer.projection});if(this.layer.filter){filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.layer.filter,filter]});}
+return filter;},merge:function(resp){this.layer.destroyFeatures();var features=resp.features;if(features&&features.length>0){var remote=this.layer.projection;var local=this.layer.map.getProjectionObject();if(!local.equals(remote)){var geom;for(var i=0,len=features.length;i<len;++i){geom=features[i].geometry;if(geom){geom.transform(remote,local);}}}
+this.layer.addFeatures(features);}
+this.response=null;this.layer.events.triggerEvent("loadend");},CLASS_NAME:"OpenLayers.Strategy.BBOX"});OpenLayers.Layer.WorldWind=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{},isBaseLayer:true,lzd:null,zoomLevels:null,initialize:function(name,url,lzd,zoomLevels,params,options){this.lzd=lzd;this.zoomLevels=zoomLevels;var newArguments=[];newArguments.push(name,url,params,options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS);},getZoom:function(){var zoom=this.map.getZoom();var extent=this.map.getMaxExtent();zoom=zoom-Math.log(this.maxResolution/(this.lzd/512))/Math.log(2);return zoom;},getURL:function(bounds){bounds=this.adjustBounds(bounds);var zoom=this.getZoom();var extent=this.map.getMaxExtent();var deg=this.lzd/Math.pow(2,this.getZoom());var x=Math.floor((bounds.left-extent.left)/deg);var y=Math.floor((bounds.bottom-extent.bottom)/deg);if(this.map.getResolution()<=(this.lzd/512)&&this.getZoom()<=this.zoomLevels){return this.getFullRequestString({L:zoom,X:x,Y:y});}else{return OpenLayers.Util.getImageLocation("blank.gif");}},CLASS_NAME:"OpenLayers.Layer.WorldWind"});OpenLayers.Protocol.CSW=function(options){options=OpenLayers.Util.applyDefaults(options,OpenLayers.Protocol.CSW.DEFAULTS);var cls=OpenLayers.Protocol.CSW["v"+options.version.replace(/\./g,"_")];if(!cls){throw"Unsupported CSW version: "+options.version;}
+return new cls(options);};OpenLayers.Protocol.CSW.DEFAULTS={"version":"2.0.2"};OpenLayers.Protocol.WFS.v1_1_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.1.0",initialize:function(options){OpenLayers.Protocol.WFS.v1.prototype.initialize.apply(this,arguments);if(this.outputFormat&&!this.readFormat){if(this.outputFormat.toLowerCase()=="gml2"){this.readFormat=new OpenLayers.Format.GML.v2({featureType:this.featureType,featureNS:this.featureNS,geometryName:this.geometryName});}else if(this.outputFormat.toLowerCase()=="json"){this.readFormat=new OpenLayers.Format.GeoJSON();}}},CLASS_NAME:"OpenLayers.Protocol.WFS.v1_1_0"});OpenLayers.Format.WMTSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",yx:{"urn:ogc:def:crs:EPSG::4326":true},createLayer:function(capabilities,config){var layer;var required={layer:true,matrixSet:true};for(var prop in required){if(!(prop in config)){throw new Error("Missing property '"+prop+"' in layer configuration.");}}
+var contents=capabilities.contents;var matrixSet=contents.tileMatrixSets[config.matrixSet];var layers=contents.layers;var layerDef;for(var i=0,ii=contents.layers.length;i<ii;++i){if(contents.layers[i].identifier===config.layer){layerDef=contents.layers[i];break;}}
+if(layerDef&&matrixSet){var style;for(var i=0,ii=layerDef.styles.length;i<ii;++i){style=layerDef.styles[i];if(style.isDefault){break;}}
+layer=new OpenLayers.Layer.WMTS(OpenLayers.Util.applyDefaults(config,{url:config.requestEncoding==="REST"&&layerDef.resourceUrl?layerDef.resourceUrl.tile.template:capabilities.operationsMetadata.GetTile.dcp.http.get[0].url,name:layerDef.title,style:style.identifier,matrixIds:matrixSet.matrixIds,tileFullExtent:matrixSet.bounds}));}
+return layer;},CLASS_NAME:"OpenLayers.Format.WMTSCapabilities"});OpenLayers.Layer.OSM=OpenLayers.Class(OpenLayers.Layer.XYZ,{name:"OpenStreetMap",url:['http://a.tile.openstreetmap.org/${z}/${x}/${y}.png','http://b.tile.openstreetmap.org/${z}/${x}/${y}.png','http://c.tile.openstreetmap.org/${z}/${x}/${y}.png'],attribution:"Data CC-By-SA by <a href='http://openstreetmap.org/'>OpenStreetMap</a>",sphericalMercator:true,wrapDateLine:true,tileOptions:null,initialize:function(name,url,options){OpenLayers.Layer.XYZ.prototype.initialize.apply(this,arguments);this.tileOptions=OpenLayers.Util.extend({crossOriginKeyword:'anonymous'},this.options&&this.options.tileOptions);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions());}
+obj=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[obj]);return obj;},CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Layer.Google.v3={DEFAULTS:{sphericalMercator:true,projection:"EPSG:900913"},animationEnabled:true,loadMapObject:function(){if(!this.type){this.type=google.maps.MapTypeId.ROADMAP;}
+var mapObject;var cache=OpenLayers.Layer.Google.cache[this.map.id];if(cache){mapObject=cache.mapObject;++cache.count;}else{var container=this.map.viewPortDiv;var div=document.createElement("div");div.id=this.map.id+"_GMapContainer";div.style.position="absolute";div.style.width="100%";div.style.height="100%";container.appendChild(div);var center=this.map.getCenter();mapObject=new google.maps.Map(div,{center:center?new google.maps.LatLng(center.lat,center.lon):new google.maps.LatLng(0,0),zoom:this.map.getZoom()||0,mapTypeId:this.type,disableDefaultUI:true,keyboardShortcuts:false,draggable:false,disableDoubleClickZoom:true,scrollwheel:false,streetViewControl:false});cache={mapObject:mapObject,count:1};OpenLayers.Layer.Google.cache[this.map.id]=cache;this.repositionListener=google.maps.event.addListenerOnce(mapObject,"center_changed",OpenLayers.Function.bind(this.repositionMapElements,this));}
+this.mapObject=mapObject;this.setGMapVisibility(this.visibility);},repositionMapElements:function(){google.maps.event.trigger(this.mapObject,"resize");var div=this.mapObject.getDiv().firstChild;if(!div||div.childNodes.length<3){this.repositionTimer=window.setTimeout(OpenLayers.Function.bind(this.repositionMapElements,this),250);return false;}
+var cache=OpenLayers.Layer.Google.cache[this.map.id];var container=this.map.viewPortDiv;while(div.lastChild.style.display=="none"){container.appendChild(div.lastChild);}
+var termsOfUse=div.lastChild;container.appendChild(termsOfUse);termsOfUse.style.zIndex="1100";termsOfUse.style.bottom="";termsOfUse.className="olLayerGoogleCopyright olLayerGoogleV3";termsOfUse.style.display="";cache.termsOfUse=termsOfUse;var poweredBy=div.lastChild;container.appendChild(poweredBy);poweredBy.style.zIndex="1100";poweredBy.style.bottom="";poweredBy.className="olLayerGooglePoweredBy olLayerGoogleV3 gmnoprint";poweredBy.style.display="";cache.poweredBy=poweredBy;this.setGMapVisibility(this.visibility);},onMapResize:function(){if(this.visibility){google.maps.event.trigger(this.mapObject,"resize");}else{var cache=OpenLayers.Layer.Google.cache[this.map.id];if(!cache.resized){var layer=this;google.maps.event.addListenerOnce(this.mapObject,"tilesloaded",function(){google.maps.event.trigger(layer.mapObject,"resize");layer.moveTo(layer.map.getCenter(),layer.map.getZoom());delete cache.resized;});}
+cache.resized=true;}},setGMapVisibility:function(visible){var cache=OpenLayers.Layer.Google.cache[this.map.id];if(cache){var type=this.type;var layers=this.map.layers;var layer;for(var i=layers.length-1;i>=0;--i){layer=layers[i];if(layer instanceof OpenLayers.Layer.Google&&layer.visibility===true&&layer.inRange===true){type=layer.type;visible=true;break;}}
+var container=this.mapObject.getDiv();if(visible===true){this.mapObject.setMapTypeId(type);container.style.left="";if(cache.termsOfUse&&cache.termsOfUse.style){cache.termsOfUse.style.left="";cache.termsOfUse.style.display="";cache.poweredBy.style.display="";}
+cache.displayed=this.id;}else{delete cache.displayed;container.style.left="-9999px";if(cache.termsOfUse&&cache.termsOfUse.style){cache.termsOfUse.style.display="none";cache.termsOfUse.style.left="-9999px";cache.poweredBy.style.display="none";}}}},getMapContainer:function(){return this.mapObject.getDiv();},getMapObjectBoundsFromOLBounds:function(olBounds){var moBounds=null;if(olBounds!=null){var sw=this.sphericalMercator?this.inverseMercator(olBounds.bottom,olBounds.left):new OpenLayers.LonLat(olBounds.bottom,olBounds.left);var ne=this.sphericalMercator?this.inverseMercator(olBounds.top,olBounds.right):new OpenLayers.LonLat(olBounds.top,olBounds.right);moBounds=new google.maps.LatLngBounds(new google.maps.LatLng(sw.lat,sw.lon),new google.maps.LatLng(ne.lat,ne.lon));}
+return moBounds;},getMapObjectLonLatFromMapObjectPixel:function(moPixel){var size=this.map.getSize();var lon=this.getLongitudeFromMapObjectLonLat(this.mapObject.center);var lat=this.getLatitudeFromMapObjectLonLat(this.mapObject.center);var res=this.map.getResolution();var delta_x=moPixel.x-(size.w/2);var delta_y=moPixel.y-(size.h/2);var lonlat=new OpenLayers.LonLat(lon+delta_x*res,lat-delta_y*res);if(this.wrapDateLine){lonlat=lonlat.wrapDateLine(this.maxExtent);}
+return this.getMapObjectLonLatFromLonLat(lonlat.lon,lonlat.lat);},getMapObjectPixelFromMapObjectLonLat:function(moLonLat){var lon=this.getLongitudeFromMapObjectLonLat(moLonLat);var lat=this.getLatitudeFromMapObjectLonLat(moLonLat);var res=this.map.getResolution();var extent=this.map.getExtent();return this.getMapObjectPixelFromXY((1/res*(lon-extent.left)),(1/res*(extent.top-lat)));},setMapObjectCenter:function(center,zoom){if(this.animationEnabled===false&&zoom!=this.mapObject.zoom){var mapContainer=this.getMapContainer();google.maps.event.addListenerOnce(this.mapObject,"idle",function(){mapContainer.style.visibility="";});mapContainer.style.visibility="hidden";}
+this.mapObject.setOptions({center:center,zoom:zoom});},getMapObjectZoomFromMapObjectBounds:function(moBounds){return this.mapObject.getBoundsZoomLevel(moBounds);},getMapObjectLonLatFromLonLat:function(lon,lat){var gLatLng;if(this.sphericalMercator){var lonlat=this.inverseMercator(lon,lat);gLatLng=new google.maps.LatLng(lonlat.lat,lonlat.lon);}else{gLatLng=new google.maps.LatLng(lat,lon);}
+return gLatLng;},getMapObjectPixelFromXY:function(x,y){return new google.maps.Point(x,y);},destroy:function(){if(this.repositionListener){google.maps.event.removeListener(this.repositionListener);}
+if(this.repositionTimer){window.clearTimeout(this.repositionTimer);}
+OpenLayers.Layer.Google.prototype.destroy.apply(this,arguments);}};OpenLayers.Format.WPSDescribeProcess=OpenLayers.Class(OpenLayers.Format.XML,{VERSION:"1.0.0",namespaces:{wps:"http://www.opengis.net/wps/1.0.0",ows:"http://www.opengis.net/ows/1.1",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd",defaultPrefix:"wps",regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var info={};this.readNode(data,info);return info;},readers:{"wps":{"ProcessDescriptions":function(node,obj){obj.processDescriptions={};this.readChildNodes(node,obj.processDescriptions);},"ProcessDescription":function(node,processDescriptions){var processVersion=this.getAttributeNS(node,this.namespaces.wps,"processVersion");var processDescription={processVersion:processVersion,statusSupported:(node.getAttribute("statusSupported")==="true"),storeSupported:(node.getAttribute("storeSupported")==="true")};this.readChildNodes(node,processDescription);processDescriptions[processDescription.identifier]=processDescription;},"DataInputs":function(node,processDescription){processDescription.dataInputs=[];this.readChildNodes(node,processDescription.dataInputs);},"ProcessOutputs":function(node,processDescription){processDescription.processOutputs=[];this.readChildNodes(node,processDescription.processOutputs);},"Output":function(node,processOutputs){var output={};this.readChildNodes(node,output);processOutputs.push(output);},"ComplexOutput":function(node,output){output.complexOutput={};this.readChildNodes(node,output.complexOutput);},"Input":function(node,dataInputs){var input={maxOccurs:parseInt(node.getAttribute("maxOccurs")),minOccurs:parseInt(node.getAttribute("minOccurs"))};this.readChildNodes(node,input);dataInputs.push(input);},"BoundingBoxData":function(node,input){input.boundingBoxData={};this.readChildNodes(node,input.boundingBoxData);},"CRS":function(node,obj){if(!obj.CRSs){obj.CRSs={};}
+obj.CRSs[this.getChildValue(node)]=true;},"LiteralData":function(node,input){input.literalData={};this.readChildNodes(node,input.literalData);},"ComplexData":function(node,input){input.complexData={};this.readChildNodes(node,input.complexData);},"Default":function(node,complexData){complexData["default"]={};this.readChildNodes(node,complexData["default"]);},"Supported":function(node,complexData){complexData["supported"]={};this.readChildNodes(node,complexData["supported"]);},"Format":function(node,obj){var format={};this.readChildNodes(node,format);if(!obj.formats){obj.formats={};}
+obj.formats[format.mimeType]=true;},"MimeType":function(node,format){format.mimeType=this.getChildValue(node);}},"ows":OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]},CLASS_NAME:"OpenLayers.Format.WPSDescribeProcess"});OpenLayers.Format.CSWGetRecords.v2_0_2=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{csw:"http://www.opengis.net/cat/csw/2.0.2",dc:"http://purl.org/dc/elements/1.1/",dct:"http://purl.org/dc/terms/",gmd:"http://www.isotc211.org/2005/gmd",geonet:"http://www.fao.org/geonetwork",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"csw",version:"2.0.2",schemaLocation:"http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd",requestId:null,resultType:null,outputFormat:null,outputSchema:null,startPosition:null,maxRecords:null,DistributedSearch:null,ResponseHandler:null,Query:null,regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var obj={};this.readNode(data,obj);return obj;},readers:{"csw":{"GetRecordsResponse":function(node,obj){obj.records=[];this.readChildNodes(node,obj);var version=this.getAttributeNS(node,"",'version');if(version!=""){obj.version=version;}},"RequestId":function(node,obj){obj.RequestId=this.getChildValue(node);},"SearchStatus":function(node,obj){obj.SearchStatus={};var timestamp=this.getAttributeNS(node,"",'timestamp');if(timestamp!=""){obj.SearchStatus.timestamp=timestamp;}},"SearchResults":function(node,obj){this.readChildNodes(node,obj);var attrs=node.attributes;var SearchResults={};for(var i=0,len=attrs.length;i<len;++i){if((attrs[i].name=="numberOfRecordsMatched")||(attrs[i].name=="numberOfRecordsReturned")||(attrs[i].name=="nextRecord")){SearchResults[attrs[i].name]=parseInt(attrs[i].nodeValue);}else{SearchResults[attrs[i].name]=attrs[i].nodeValue;}}
+obj.SearchResults=SearchResults;},"SummaryRecord":function(node,obj){var record={type:"SummaryRecord"};this.readChildNodes(node,record);obj.records.push(record);},"BriefRecord":function(node,obj){var record={type:"BriefRecord"};this.readChildNodes(node,record);obj.records.push(record);},"DCMIRecord":function(node,obj){var record={type:"DCMIRecord"};this.readChildNodes(node,record);obj.records.push(record);},"Record":function(node,obj){var record={type:"Record"};this.readChildNodes(node,record);obj.records.push(record);},"*":function(node,obj){var name=node.localName||node.nodeName.split(":").pop();obj[name]=this.getChildValue(node);}},"geonet":{"info":function(node,obj){var gninfo={};this.readChildNodes(node,gninfo);obj.gninfo=gninfo;}},"dc":{"*":function(node,obj){var name=node.localName||node.nodeName.split(":").pop();if(!(OpenLayers.Util.isArray(obj[name]))){obj[name]=[];}
+var dc_element={};var attrs=node.attributes;for(var i=0,len=attrs.length;i<len;++i){dc_element[attrs[i].name]=attrs[i].nodeValue;}
+dc_element.value=this.getChildValue(node);if(dc_element.value!=""){obj[name].push(dc_element);}}},"dct":{"*":function(node,obj){var name=node.localName||node.nodeName.split(":").pop();if(!(OpenLayers.Util.isArray(obj[name]))){obj[name]=[];}
+obj[name].push(this.getChildValue(node));}},"ows":OpenLayers.Util.applyDefaults({"BoundingBox":function(node,obj){if(obj.bounds){obj.BoundingBox=[{crs:obj.projection,value:[obj.bounds.left,obj.bounds.bottom,obj.bounds.right,obj.bounds.top]}];delete obj.projection;delete obj.bounds;}
+OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers["ows"]["BoundingBox"].apply(this,arguments);}},OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers["ows"])},write:function(options){var node=this.writeNode("csw:GetRecords",options);node.setAttribute("xmlns:gmd",this.namespaces.gmd);return OpenLayers.Format.XML.prototype.write.apply(this,[node]);},writers:{"csw":{"GetRecords":function(options){if(!options){options={};}
+var node=this.createElementNSPlus("csw:GetRecords",{attributes:{service:"CSW",version:this.version,requestId:options.requestId||this.requestId,resultType:options.resultType||this.resultType,outputFormat:options.outputFormat||this.outputFormat,outputSchema:options.outputSchema||this.outputSchema,startPosition:options.startPosition||this.startPosition,maxRecords:options.maxRecords||this.maxRecords}});if(options.DistributedSearch||this.DistributedSearch){this.writeNode("csw:DistributedSearch",options.DistributedSearch||this.DistributedSearch,node);}
+var ResponseHandler=options.ResponseHandler||this.ResponseHandler;if(OpenLayers.Util.isArray(ResponseHandler)&&ResponseHandler.length>0){for(var i=0,len=ResponseHandler.length;i<len;i++){this.writeNode("csw:ResponseHandler",ResponseHandler[i],node);}}
+this.writeNode("Query",options.Query||this.Query,node);return node;},"DistributedSearch":function(options){var node=this.createElementNSPlus("csw:DistributedSearch",{attributes:{hopCount:options.hopCount}});return node;},"ResponseHandler":function(options){var node=this.createElementNSPlus("csw:ResponseHandler",{value:options.value});return node;},"Query":function(options){if(!options){options={};}
+var node=this.createElementNSPlus("csw:Query",{attributes:{typeNames:options.typeNames||"csw:Record"}});var ElementName=options.ElementName;if(OpenLayers.Util.isArray(ElementName)&&ElementName.length>0){for(var i=0,len=ElementName.length;i<len;i++){this.writeNode("csw:ElementName",ElementName[i],node);}}else{this.writeNode("csw:ElementSetName",options.ElementSetName||{value:'summary'},node);}
+if(options.Constraint){this.writeNode("csw:Constraint",options.Constraint,node);}
+if(options.SortBy){this.writeNode("ogc:SortBy",options.SortBy,node);}
+return node;},"ElementName":function(options){var node=this.createElementNSPlus("csw:ElementName",{value:options.value});return node;},"ElementSetName":function(options){var node=this.createElementNSPlus("csw:ElementSetName",{attributes:{typeNames:options.typeNames},value:options.value});return node;},"Constraint":function(options){var node=this.createElementNSPlus("csw:Constraint",{attributes:{version:options.version}});if(options.Filter){var format=new OpenLayers.Format.Filter({version:options.version});node.appendChild(format.write(options.Filter));}else if(options.CqlText){var child=this.createElementNSPlus("CqlText",{value:options.CqlText.value});node.appendChild(child);}
+return node;}},"ogc":OpenLayers.Format.Filter.v1_1_0.prototype.writers["ogc"]},CLASS_NAME:"OpenLayers.Format.CSWGetRecords.v2_0_2"});OpenLayers.Marker.Box=OpenLayers.Class(OpenLayers.Marker,{bounds:null,div:null,initialize:function(bounds,borderColor,borderWidth){this.bounds=bounds;this.div=OpenLayers.Util.createDiv();this.div.style.overflow='hidden';this.events=new OpenLayers.Events(this,this.div);this.setBorder(borderColor,borderWidth);},destroy:function(){this.bounds=null;this.div=null;OpenLayers.Marker.prototype.destroy.apply(this,arguments);},setBorder:function(color,width){if(!color){color="red";}
+if(!width){width=2;}
+this.div.style.border=width+"px solid "+color;},draw:function(px,sz){OpenLayers.Util.modifyDOMElement(this.div,null,px,sz);return this.div;},onScreen:function(){var onScreen=false;if(this.map){var screenBounds=this.map.getExtent();onScreen=screenBounds.containsBounds(this.bounds,true,true);}
+return onScreen;},display:function(display){this.div.style.display=(display)?"":"none";},CLASS_NAME:"OpenLayers.Marker.Box"});OpenLayers.Handler.Hover=OpenLayers.Class(OpenLayers.Handler,{delay:500,pixelTolerance:null,stopMove:false,px:null,timerId:null,mousemove:function(evt){if(this.passesTolerance(evt.xy)){this.clearTimer();this.callback('move',[evt]);this.px=evt.xy;evt=OpenLayers.Util.extend({},evt);this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,evt),this.delay);}
+return!this.stopMove;},mouseout:function(evt){if(OpenLayers.Util.mouseLeft(evt,this.map.viewPortDiv)){this.clearTimer();this.callback('move',[evt]);}
+return true;},passesTolerance:function(px){var passes=true;if(this.pixelTolerance&&this.px){var dpx=Math.sqrt(Math.pow(this.px.x-px.x,2)+
+Math.pow(this.px.y-px.y,2));if(dpx<this.pixelTolerance){passes=false;}}
+return passes;},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;}},delayedCall:function(evt){this.callback('pause',[evt]);},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.clearTimer();deactivated=true;}
+return deactivated;},CLASS_NAME:"OpenLayers.Handler.Hover"});OpenLayers.Format.WMSGetFeatureInfo=OpenLayers.Class(OpenLayers.Format.XML,{layerIdentifier:'_layer',featureIdentifier:'_feature',regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},gmlFormat:null,read:function(data){var result;if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+var root=data.documentElement;if(root){var scope=this;var read=this["read_"+root.nodeName];if(read){result=read.call(this,root);}else{result=new OpenLayers.Format.GML((this.options?this.options:{})).read(data);}}else{result=data;}
+return result;},read_msGMLOutput:function(data){var response=[];var layerNodes=this.getSiblingNodesByTagCriteria(data,this.layerIdentifier);if(layerNodes){for(var i=0,len=layerNodes.length;i<len;++i){var node=layerNodes[i];var layerName=node.nodeName;if(node.prefix){layerName=layerName.split(':')[1];}
+var layerName=layerName.replace(this.layerIdentifier,'');var featureNodes=this.getSiblingNodesByTagCriteria(node,this.featureIdentifier);if(featureNodes){for(var j=0;j<featureNodes.length;j++){var featureNode=featureNodes[j];var geomInfo=this.parseGeometry(featureNode);var attributes=this.parseAttributes(featureNode);var feature=new OpenLayers.Feature.Vector(geomInfo.geometry,attributes,null);feature.bounds=geomInfo.bounds;feature.type=layerName;response.push(feature);}}}}
+return response;},read_FeatureInfoResponse:function(data){var response=[];var featureNodes=this.getElementsByTagNameNS(data,'*','FIELDS');for(var i=0,len=featureNodes.length;i<len;i++){var featureNode=featureNodes[i];var geom=null;var attributes={};var j;var jlen=featureNode.attributes.length;if(jlen>0){for(j=0;j<jlen;j++){var attribute=featureNode.attributes[j];attributes[attribute.nodeName]=attribute.nodeValue;}}else{var nodes=featureNode.childNodes;for(j=0,jlen=nodes.length;j<jlen;++j){var node=nodes[j];if(node.nodeType!=3){attributes[node.getAttribute("name")]=node.getAttribute("value");}}}
+response.push(new OpenLayers.Feature.Vector(geom,attributes,null));}
+return response;},getSiblingNodesByTagCriteria:function(node,criteria){var nodes=[];var children,tagName,n,matchNodes,child;if(node&&node.hasChildNodes()){children=node.childNodes;n=children.length;for(var k=0;k<n;k++){child=children[k];while(child&&child.nodeType!=1){child=child.nextSibling;k++;}
+tagName=(child?child.nodeName:'');if(tagName.length>0&&tagName.indexOf(criteria)>-1){nodes.push(child);}else{matchNodes=this.getSiblingNodesByTagCriteria(child,criteria);if(matchNodes.length>0){(nodes.length==0)?nodes=matchNodes:nodes.push(matchNodes);}}}}
+return nodes;},parseAttributes:function(node){var attributes={};if(node.nodeType==1){var children=node.childNodes;var n=children.length;for(var i=0;i<n;++i){var child=children[i];if(child.nodeType==1){var grandchildren=child.childNodes;var name=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;if(grandchildren.length==0){attributes[name]=null;}else if(grandchildren.length==1){var grandchild=grandchildren[0];if(grandchild.nodeType==3||grandchild.nodeType==4){var value=grandchild.nodeValue.replace(this.regExes.trimSpace,"");attributes[name]=value;}}}}}
+return attributes;},parseGeometry:function(node){if(!this.gmlFormat){this.gmlFormat=new OpenLayers.Format.GML();}
+var feature=this.gmlFormat.parseFeature(node);var geometry,bounds=null;if(feature){geometry=feature.geometry&&feature.geometry.clone();bounds=feature.bounds&&feature.bounds.clone();feature.destroy();}
+return{geometry:geometry,bounds:bounds};},CLASS_NAME:"OpenLayers.Format.WMSGetFeatureInfo"});OpenLayers.Control.WMTSGetFeatureInfo=OpenLayers.Class(OpenLayers.Control,{hover:false,requestEncoding:"KVP",drillDown:false,maxFeatures:10,clickCallback:"click",layers:null,queryVisible:true,infoFormat:'text/html',vendorParams:{},format:null,formatOptions:null,handler:null,hoverRequest:null,pending:0,initialize:function(options){options=options||{};options.handlerOptions=options.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[options]);if(!this.format){this.format=new OpenLayers.Format.WMSGetFeatureInfo(options.formatOptions);}
+if(this.drillDown===true){this.hover=false;}
+if(this.hover){this.handler=new OpenLayers.Handler.Hover(this,{move:this.cancelHover,pause:this.getInfoForHover},OpenLayers.Util.extend(this.handlerOptions.hover||{},{delay:250}));}else{var callbacks={};callbacks[this.clickCallback]=this.getInfoForClick;this.handler=new OpenLayers.Handler.Click(this,callbacks,this.handlerOptions.click||{});}},getInfoForClick:function(evt){this.request(evt.xy,{});},getInfoForHover:function(evt){this.request(evt.xy,{hover:true});},cancelHover:function(){if(this.hoverRequest){--this.pending;if(this.pending<=0){OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait");this.pending=0;}
+this.hoverRequest.abort();this.hoverRequest=null;}},findLayers:function(){var candidates=this.layers||this.map.layers;var layers=[];var layer;for(var i=candidates.length-1;i>=0;--i){layer=candidates[i];if(layer instanceof OpenLayers.Layer.WMTS&&layer.requestEncoding===this.requestEncoding&&(!this.queryVisible||layer.getVisibility())){layers.push(layer);if(!this.drillDown||this.hover){break;}}}
+return layers;},buildRequestOptions:function(layer,xy){var loc=this.map.getLonLatFromPixel(xy);var getTileUrl=layer.getURL(new OpenLayers.Bounds(loc.lon,loc.lat,loc.lon,loc.lat));var params=OpenLayers.Util.getParameters(getTileUrl);var tileInfo=layer.getTileInfo(loc);OpenLayers.Util.extend(params,{service:"WMTS",version:layer.version,request:"GetFeatureInfo",infoFormat:this.infoFormat,i:tileInfo.i,j:tileInfo.j});OpenLayers.Util.applyDefaults(params,this.vendorParams);return{url:OpenLayers.Util.isArray(layer.url)?layer.url[0]:layer.url,params:OpenLayers.Util.upperCaseObject(params),callback:function(request){this.handleResponse(xy,request,layer);},scope:this};},request:function(xy,options){options=options||{};var layers=this.findLayers();if(layers.length>0){var issue,layer;for(var i=0,len=layers.length;i<len;i++){layer=layers[i];issue=this.events.triggerEvent("beforegetfeatureinfo",{xy:xy,layer:layer});if(issue!==false){++this.pending;var requestOptions=this.buildRequestOptions(layer,xy);var request=OpenLayers.Request.GET(requestOptions);if(options.hover===true){this.hoverRequest=request;}}}
+if(this.pending>0){OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait");}}},handleResponse:function(xy,request,layer){--this.pending;if(this.pending<=0){OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait");this.pending=0;}
+if(request.status&&(request.status<200||request.status>=300)){this.events.triggerEvent("exception",{xy:xy,request:request,layer:layer});}else{var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
+var features,except;try{features=this.format.read(doc);}catch(error){except=true;this.events.triggerEvent("exception",{xy:xy,request:request,error:error,layer:layer});}
+if(!except){this.events.triggerEvent("getfeatureinfo",{text:request.responseText,features:features,request:request,xy:xy,layer:layer});}}},CLASS_NAME:"OpenLayers.Control.WMTSGetFeatureInfo"});OpenLayers.Handler.RegularPolygon=OpenLayers.Class(OpenLayers.Handler.Drag,{sides:4,radius:null,snapAngle:null,snapToggle:'shiftKey',layerOptions:null,persist:false,irregular:false,citeCompliant:false,angle:null,fixedRadius:false,feature:null,layer:null,origin:null,initialize:function(control,callbacks,options){if(!(options&&options.layerOptions&&options.layerOptions.styleMap)){this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'],{});}
+OpenLayers.Handler.Drag.prototype.initialize.apply(this,[control,callbacks,options]);this.options=(options)?options:{};},setOptions:function(newOptions){OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);},activate:function(){var activated=false;if(OpenLayers.Handler.Drag.prototype.activate.apply(this,arguments)){var options=OpenLayers.Util.extend({displayInLayerSwitcher:false,calculateInRange:OpenLayers.Function.True,wrapDateLine:this.citeCompliant},this.layerOptions);this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,options);this.map.addLayer(this.layer);activated=true;}
+return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.Drag.prototype.deactivate.apply(this,arguments)){if(this.dragging){this.cancel();}
+if(this.layer.map!=null){this.layer.destroy(false);if(this.feature){this.feature.destroy();}}
+this.layer=null;this.feature=null;deactivated=true;}
+return deactivated;},down:function(evt){this.fixedRadius=!!(this.radius);var maploc=this.layer.getLonLatFromViewPortPx(evt.xy);this.origin=new OpenLayers.Geometry.Point(maploc.lon,maploc.lat);if(!this.fixedRadius||this.irregular){this.radius=this.map.getResolution();}
+if(this.persist){this.clear();}
+this.feature=new OpenLayers.Feature.Vector();this.createGeometry();this.callback("create",[this.origin,this.feature]);this.layer.addFeatures([this.feature],{silent:true});this.layer.drawFeature(this.feature,this.style);},move:function(evt){var maploc=this.layer.getLonLatFromViewPortPx(evt.xy);var point=new OpenLayers.Geometry.Point(maploc.lon,maploc.lat);if(this.irregular){var ry=Math.sqrt(2)*Math.abs(point.y-this.origin.y)/2;this.radius=Math.max(this.map.getResolution()/2,ry);}else if(this.fixedRadius){this.origin=point;}else{this.calculateAngle(point,evt);this.radius=Math.max(this.map.getResolution()/2,point.distanceTo(this.origin));}
+this.modifyGeometry();if(this.irregular){var dx=point.x-this.origin.x;var dy=point.y-this.origin.y;var ratio;if(dy==0){ratio=dx/(this.radius*Math.sqrt(2));}else{ratio=dx/dy;}
+this.feature.geometry.resize(1,this.origin,ratio);this.feature.geometry.move(dx/2,dy/2);}
+this.layer.drawFeature(this.feature,this.style);},up:function(evt){this.finalize();if(this.start==this.last){this.callback("done",[evt.xy]);}},out:function(evt){this.finalize();},createGeometry:function(){this.angle=Math.PI*((1/this.sides)-(1/2));if(this.snapAngle){this.angle+=this.snapAngle*(Math.PI/180);}
+this.feature.geometry=OpenLayers.Geometry.Polygon.createRegularPolygon(this.origin,this.radius,this.sides,this.snapAngle);},modifyGeometry:function(){var angle,point;var ring=this.feature.geometry.components[0];if(ring.components.length!=(this.sides+1)){this.createGeometry();ring=this.feature.geometry.components[0];}
+for(var i=0;i<this.sides;++i){point=ring.components[i];angle=this.angle+(i*2*Math.PI/this.sides);point.x=this.origin.x+(this.radius*Math.cos(angle));point.y=this.origin.y+(this.radius*Math.sin(angle));point.clearBounds();}},calculateAngle:function(point,evt){var alpha=Math.atan2(point.y-this.origin.y,point.x-this.origin.x);if(this.snapAngle&&(this.snapToggle&&!evt[this.snapToggle])){var snapAngleRad=(Math.PI/180)*this.snapAngle;this.angle=Math.round(alpha/snapAngleRad)*snapAngleRad;}else{this.angle=alpha;}},cancel:function(){this.callback("cancel",null);this.finalize();},finalize:function(){this.origin=null;this.radius=this.options.radius;},clear:function(){if(this.layer){this.layer.renderer.clear();this.layer.destroyFeatures();}},callback:function(name,args){if(this.callbacks[name]){this.callbacks[name].apply(this.control,[this.feature.geometry.clone()]);}
+if(!this.persist&&(name=="done"||name=="cancel")){this.clear();}},CLASS_NAME:"OpenLayers.Handler.RegularPolygon"});OpenLayers.Control.SLDSelect=OpenLayers.Class(OpenLayers.Control,{clearOnDeactivate:false,layers:null,callbacks:null,selectionSymbolizer:{'Polygon':{fillColor:'#FF0000',stroke:false},'Line':{strokeColor:'#FF0000',strokeWidth:2},'Point':{graphicName:'square',fillColor:'#FF0000',pointRadius:5}},layerOptions:null,sketchStyle:null,wfsCache:{},layerCache:{},initialize:function(handler,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.callbacks=OpenLayers.Util.extend({done:this.select,click:this.select},this.callbacks);this.handlerOptions=this.handlerOptions||{};this.layerOptions=OpenLayers.Util.applyDefaults(this.layerOptions,{displayInLayerSwitcher:false,tileOptions:{maxGetUrlLength:2048}});if(this.sketchStyle){this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{styleMap:new OpenLayers.StyleMap({"default":this.sketchStyle})});}
+this.handler=new handler(this,this.callbacks,this.handlerOptions);},destroy:function(){for(var key in this.layerCache){delete this.layerCache[key];}
+for(var key in this.wfsCache){delete this.wfsCache[key];}
+OpenLayers.Control.prototype.destroy.apply(this,arguments);},coupleLayerVisiblity:function(evt){this.setVisibility(evt.object.getVisibility());},createSelectionLayer:function(source){var selectionLayer;if(!this.layerCache[source.id]){selectionLayer=new OpenLayers.Layer.WMS(source.name,source.url,source.params,OpenLayers.Util.applyDefaults(this.layerOptions,source.getOptions()));this.layerCache[source.id]=selectionLayer;if(this.layerOptions.displayInLayerSwitcher===false){source.events.on({"visibilitychanged":this.coupleLayerVisiblity,scope:selectionLayer});}
+this.map.addLayer(selectionLayer);}else{selectionLayer=this.layerCache[source.id];}
+return selectionLayer;},createSLD:function(layer,filters,geometryAttributes){var sld={version:"1.0.0",namedLayers:{}};var layerNames=[layer.params.LAYERS].join(",").split(",");for(var i=0,len=layerNames.length;i<len;i++){var name=layerNames[i];sld.namedLayers[name]={name:name,userStyles:[]};var symbolizer=this.selectionSymbolizer;var geometryAttribute=geometryAttributes[i];if(geometryAttribute.type.indexOf('Polygon')>=0){symbolizer={Polygon:this.selectionSymbolizer['Polygon']};}else if(geometryAttribute.type.indexOf('LineString')>=0){symbolizer={Line:this.selectionSymbolizer['Line']};}else if(geometryAttribute.type.indexOf('Point')>=0){symbolizer={Point:this.selectionSymbolizer['Point']};}
+var filter=filters[i];sld.namedLayers[name].userStyles.push({name:'default',rules:[new OpenLayers.Rule({symbolizer:symbolizer,filter:filter,maxScaleDenominator:layer.options.minScale})]});}
+return new OpenLayers.Format.SLD({srsName:this.map.getProjection()}).write(sld);},parseDescribeLayer:function(request){var format=new OpenLayers.Format.WMSDescribeLayer();var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
+var describeLayer=format.read(doc);var typeNames=[];var url=null;for(var i=0,len=describeLayer.length;i<len;i++){if(describeLayer[i].owsType=="WFS"){typeNames.push(describeLayer[i].typeName);url=describeLayer[i].owsURL;}}
+var options={url:url,params:{SERVICE:"WFS",TYPENAME:typeNames.toString(),REQUEST:"DescribeFeatureType",VERSION:"1.0.0"},callback:function(request){var format=new OpenLayers.Format.WFSDescribeFeatureType();var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
+var describeFeatureType=format.read(doc);this.control.wfsCache[this.layer.id]=describeFeatureType;this.control._queue&&this.control.applySelection();},scope:this};OpenLayers.Request.GET(options);},getGeometryAttributes:function(layer){var result=[];var cache=this.wfsCache[layer.id];for(var i=0,len=cache.featureTypes.length;i<len;i++){var typeName=cache.featureTypes[i];var properties=typeName.properties;for(var j=0,lenj=properties.length;j<lenj;j++){var property=properties[j];var type=property.type;if((type.indexOf('LineString')>=0)||(type.indexOf('GeometryAssociationType')>=0)||(type.indexOf('GeometryPropertyType')>=0)||(type.indexOf('Point')>=0)||(type.indexOf('Polygon')>=0)){result.push(property);}}}
+return result;},activate:function(){var activated=OpenLayers.Control.prototype.activate.call(this);if(activated){for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];if(layer&&!this.wfsCache[layer.id]){var options={url:layer.url,params:{SERVICE:"WMS",VERSION:layer.params.VERSION,LAYERS:layer.params.LAYERS,REQUEST:"DescribeLayer"},callback:this.parseDescribeLayer,scope:{layer:layer,control:this}};OpenLayers.Request.GET(options);}}}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Control.prototype.deactivate.call(this);if(deactivated){for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];if(layer&&this.clearOnDeactivate===true){var layerCache=this.layerCache;var selectionLayer=layerCache[layer.id];if(selectionLayer){layer.events.un({"visibilitychanged":this.coupleLayerVisiblity,scope:selectionLayer});selectionLayer.destroy();delete layerCache[layer.id];}}}}
+return deactivated;},setLayers:function(layers){if(this.active){this.deactivate();this.layers=layers;this.activate();}else{this.layers=layers;}},createFilter:function(geometryAttribute,geometry){var filter=null;if(this.handler instanceof OpenLayers.Handler.RegularPolygon){if(this.handler.irregular===true){filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,property:geometryAttribute.name,value:geometry.getBounds()});}else{filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:geometryAttribute.name,value:geometry});}}else if(this.handler instanceof OpenLayers.Handler.Polygon){filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:geometryAttribute.name,value:geometry});}else if(this.handler instanceof OpenLayers.Handler.Path){if(geometryAttribute.type.indexOf('Point')>=0){filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,property:geometryAttribute.name,distance:this.map.getExtent().getWidth()*0.01,distanceUnits:this.map.getUnits(),value:geometry});}else{filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:geometryAttribute.name,value:geometry});}}else if(this.handler instanceof OpenLayers.Handler.Click){if(geometryAttribute.type.indexOf('Polygon')>=0){filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:geometryAttribute.name,value:geometry});}else{filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,property:geometryAttribute.name,distance:this.map.getExtent().getWidth()*0.01,distanceUnits:this.map.getUnits(),value:geometry});}}
+return filter;},select:function(geometry){this._queue=function(){for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];var geometryAttributes=this.getGeometryAttributes(layer);var filters=[];for(var j=0,lenj=geometryAttributes.length;j<lenj;j++){var geometryAttribute=geometryAttributes[j];if(geometryAttribute!==null){if(!(geometry instanceof OpenLayers.Geometry)){var point=this.map.getLonLatFromPixel(geometry.xy);geometry=new OpenLayers.Geometry.Point(point.lon,point.lat);}
+var filter=this.createFilter(geometryAttribute,geometry);if(filter!==null){filters.push(filter);}}}
+var selectionLayer=this.createSelectionLayer(layer);var sld=this.createSLD(layer,filters,geometryAttributes);this.events.triggerEvent("selected",{layer:layer,filters:filters});selectionLayer.mergeNewParams({SLD_BODY:sld});delete this._queue;}};this.applySelection();},applySelection:function(){var canApply=true;for(var i=0,len=this.layers.length;i<len;i++){if(!this.wfsCache[this.layers[i].id]){canApply=false;break;}}
+canApply&&this._queue.call(this);},CLASS_NAME:"OpenLayers.Control.SLDSelect"});OpenLayers.Control.Scale=OpenLayers.Class(OpenLayers.Control,{element:null,geodesic:false,initialize:function(element,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.element=OpenLayers.Util.getElement(element);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.element){this.element=document.createElement("div");this.div.appendChild(this.element);}
+this.map.events.register('moveend',this,this.updateScale);this.updateScale();return this.div;},updateScale:function(){var scale;if(this.geodesic===true){var units=this.map.getUnits();if(!units){return;}
+var inches=OpenLayers.INCHES_PER_UNIT;scale=(this.map.getGeodesicPixelSize().w||0.000001)*inches["km"]*OpenLayers.DOTS_PER_INCH;}else{scale=this.map.getScale();}
+if(!scale){return;}
+if(scale>=9500&&scale<=950000){scale=Math.round(scale/1000)+"K";}else if(scale>=950000){scale=Math.round(scale/1000000)+"M";}else{scale=Math.round(scale);}
+this.element.innerHTML=OpenLayers.i18n("Scale = 1 : ${scaleDenom}",{'scaleDenom':scale});},CLASS_NAME:"OpenLayers.Control.Scale"});OpenLayers.Protocol.SOS=function(options){options=OpenLayers.Util.applyDefaults(options,OpenLayers.Protocol.SOS.DEFAULTS);var cls=OpenLayers.Protocol.SOS["v"+options.version.replace(/\./g,"_")];if(!cls){throw"Unsupported SOS version: "+options.version;}
+return new cls(options);};OpenLayers.Protocol.SOS.DEFAULTS={"version":"1.0.0"};OpenLayers.Format.SOSGetFeatureOfInterest=OpenLayers.Class(OpenLayers.Format.XML,{VERSION:"1.0.0",namespaces:{sos:"http://www.opengis.net/sos/1.0",gml:"http://www.opengis.net/gml",sa:"http://www.opengis.net/sampling/1.0",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosAll.xsd",defaultPrefix:"sos",regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var info={features:[]};this.readNode(data,info);var features=[];for(var i=0,len=info.features.length;i<len;i++){var container=info.features[i];if(this.internalProjection&&this.externalProjection&&container.components[0]){container.components[0].transform(this.externalProjection,this.internalProjection);}
+var feature=new OpenLayers.Feature.Vector(container.components[0],container.attributes);features.push(feature);}
+return features;},readers:{"sa":{"SamplingPoint":function(node,obj){if(!obj.attributes){var feature={attributes:{}};obj.features.push(feature);obj=feature;}
+obj.attributes.id=this.getAttributeNS(node,this.namespaces.gml,"id");this.readChildNodes(node,obj);},"position":function(node,obj){this.readChildNodes(node,obj);}},"gml":OpenLayers.Util.applyDefaults({"FeatureCollection":function(node,obj){this.readChildNodes(node,obj);},"featureMember":function(node,obj){var feature={attributes:{}};obj.features.push(feature);this.readChildNodes(node,feature);},"name":function(node,obj){obj.attributes.name=this.getChildValue(node);},"pos":function(node,obj){if(!this.externalProjection){this.externalProjection=new OpenLayers.Projection(node.getAttribute("srsName"));}
+OpenLayers.Format.GML.v3.prototype.readers.gml.pos.apply(this,[node,obj]);}},OpenLayers.Format.GML.v3.prototype.readers.gml)},writers:{"sos":{"GetFeatureOfInterest":function(options){var node=this.createElementNSPlus("GetFeatureOfInterest",{attributes:{version:this.VERSION,service:'SOS',"xsi:schemaLocation":this.schemaLocation}});for(var i=0,len=options.fois.length;i<len;i++){this.writeNode("FeatureOfInterestId",{foi:options.fois[i]},node);}
+return node;},"FeatureOfInterestId":function(options){var node=this.createElementNSPlus("FeatureOfInterestId",{value:options.foi});return node;}}},CLASS_NAME:"OpenLayers.Format.SOSGetFeatureOfInterest"});OpenLayers.Protocol.SOS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol,{fois:null,formatOptions:null,initialize:function(options){OpenLayers.Protocol.prototype.initialize.apply(this,[options]);if(!options.format){this.format=new OpenLayers.Format.SOSGetFeatureOfInterest(this.formatOptions);}},destroy:function(){if(this.options&&!this.options.format){this.format.destroy();}
+this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){options=OpenLayers.Util.extend({},options);OpenLayers.Util.applyDefaults(options,this.options||{});var response=new OpenLayers.Protocol.Response({requestType:"read"});var format=this.format;var data=OpenLayers.Format.XML.prototype.write.apply(format,[format.writeNode("sos:GetFeatureOfInterest",{fois:this.fois})]);response.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,response,options),data:data});return response;},handleRead:function(response,options){if(options.callback){var request=response.priv;if(request.status>=200&&request.status<300){response.features=this.parseFeatures(request);response.code=OpenLayers.Protocol.Response.SUCCESS;}else{response.code=OpenLayers.Protocol.Response.FAILURE;}
+options.callback.call(options.scope,response);}},parseFeatures:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
+if(!doc||doc.length<=0){return null;}
+return this.format.read(doc);},CLASS_NAME:"OpenLayers.Protocol.SOS.v1_0_0"});OpenLayers.Layer.MapGuide=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,useHttpTile:false,singleTile:false,useOverlay:false,useAsyncOverlay:true,TILE_PARAMS:{operation:'GETTILEIMAGE',version:'1.2.0'},SINGLE_TILE_PARAMS:{operation:'GETMAPIMAGE',format:'PNG',locale:'en',clip:'1',version:'1.0.0'},OVERLAY_PARAMS:{operation:'GETDYNAMICMAPOVERLAYIMAGE',format:'PNG',locale:'en',clip:'1',version:'2.0.0'},FOLDER_PARAMS:{tileColumnsPerFolder:30,tileRowsPerFolder:30,format:'png',querystring:null},defaultSize:new OpenLayers.Size(300,300),tileOriginCorner:"tl",initialize:function(name,url,params,options){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);if(options==null||options.isBaseLayer==null){this.isBaseLayer=((this.transparent!="true")&&(this.transparent!=true));}
+if(options&&options.useOverlay!=null){this.useOverlay=options.useOverlay;}
+if(this.singleTile){if(this.useOverlay){OpenLayers.Util.applyDefaults(this.params,this.OVERLAY_PARAMS);if(!this.useAsyncOverlay){this.params.version="1.0.0";}}else{OpenLayers.Util.applyDefaults(this.params,this.SINGLE_TILE_PARAMS);}}else{if(this.useHttpTile){OpenLayers.Util.applyDefaults(this.params,this.FOLDER_PARAMS);}else{OpenLayers.Util.applyDefaults(this.params,this.TILE_PARAMS);}
+this.setTileSize(this.defaultSize);}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.MapGuide(this.name,this.url,this.params,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){var url;var center=bounds.getCenterLonLat();var mapSize=this.map.getSize();if(this.singleTile){var params={setdisplaydpi:OpenLayers.DOTS_PER_INCH,setdisplayheight:mapSize.h*this.ratio,setdisplaywidth:mapSize.w*this.ratio,setviewcenterx:center.lon,setviewcentery:center.lat,setviewscale:this.map.getScale()};if(this.useOverlay&&!this.useAsyncOverlay){var getVisParams={};getVisParams=OpenLayers.Util.extend(getVisParams,params);getVisParams.operation="GETVISIBLEMAPEXTENT";getVisParams.version="1.0.0";getVisParams.session=this.params.session;getVisParams.mapName=this.params.mapName;getVisParams.format='text/xml';url=this.getFullRequestString(getVisParams);OpenLayers.Request.GET({url:url,async:false});}
+url=this.getFullRequestString(params);}else{var currentRes=this.map.getResolution();var colidx=Math.floor((bounds.left-this.maxExtent.left)/currentRes);colidx=Math.round(colidx/this.tileSize.w);var rowidx=Math.floor((this.maxExtent.top-bounds.top)/currentRes);rowidx=Math.round(rowidx/this.tileSize.h);if(this.useHttpTile){url=this.getImageFilePath({tilecol:colidx,tilerow:rowidx,scaleindex:this.resolutions.length-this.map.zoom-1});}else{url=this.getFullRequestString({tilecol:colidx,tilerow:rowidx,scaleindex:this.resolutions.length-this.map.zoom-1});}}
+return url;},getFullRequestString:function(newParams,altUrl){var url=(altUrl==null)?this.url:altUrl;if(typeof url=="object"){url=url[Math.floor(Math.random()*url.length)];}
+var requestString=url;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}}
+var paramsString=OpenLayers.Util.getParameterString(allParams);paramsString=paramsString.replace(/,/g,"+");if(paramsString!=""){var lastServerChar=url.charAt(url.length-1);if((lastServerChar=="&")||(lastServerChar=="?")){requestString+=paramsString;}else{if(url.indexOf('?')==-1){requestString+='?'+paramsString;}else{requestString+='&'+paramsString;}}}
+return requestString;},getImageFilePath:function(newParams,altUrl){var url=(altUrl==null)?this.url:altUrl;if(typeof url=="object"){url=url[Math.floor(Math.random()*url.length)];}
+var requestString=url;var tileRowGroup="";var tileColGroup="";if(newParams.tilerow<0){tileRowGroup='-';}
+if(newParams.tilerow==0){tileRowGroup+='0';}else{tileRowGroup+=Math.floor(Math.abs(newParams.tilerow/this.params.tileRowsPerFolder))*this.params.tileRowsPerFolder;}
+if(newParams.tilecol<0){tileColGroup='-';}
+if(newParams.tilecol==0){tileColGroup+='0';}else{tileColGroup+=Math.floor(Math.abs(newParams.tilecol/this.params.tileColumnsPerFolder))*this.params.tileColumnsPerFolder;}
+var tilePath='/S'+Math.floor(newParams.scaleindex)
++'/'+this.params.basemaplayergroupname
++'/R'+tileRowGroup
++'/C'+tileColGroup
++'/'+(newParams.tilerow%this.params.tileRowsPerFolder)
++'_'+(newParams.tilecol%this.params.tileColumnsPerFolder)
++'.'+this.params.format;if(this.params.querystring){tilePath+="?"+this.params.querystring;}
+requestString+=tilePath;return requestString;},calculateGridLayout:function(bounds,origin,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left-origin.lon;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=origin.lon+tilecol*tilelon;var offsetlat=origin.lat-bounds.top+tilelat;var tilerow=Math.floor(offsetlat/tilelat)-this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=tilerowremain*this.tileSize.h;var tileoffsetlat=origin.lat-tilelat*tilerow;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},CLASS_NAME:"OpenLayers.Layer.MapGuide"});OpenLayers.Control.Measure=OpenLayers.Class(OpenLayers.Control,{callbacks:null,displaySystem:'metric',geodesic:false,displaySystemUnits:{geographic:['dd'],english:['mi','ft','in'],metric:['km','m']},partialDelay:300,delayedTrigger:null,persist:false,immediate:false,initialize:function(handler,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);var callbacks={done:this.measureComplete,point:this.measurePartial};if(this.immediate){callbacks.modify=this.measureImmediate;}
+this.callbacks=OpenLayers.Util.extend(callbacks,this.callbacks);this.handlerOptions=OpenLayers.Util.extend({persist:this.persist},this.handlerOptions);this.handler=new handler(this,this.callbacks,this.handlerOptions);},deactivate:function(){this.cancelDelay();return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},cancel:function(){this.cancelDelay();this.handler.cancel();},setImmediate:function(immediate){this.immediate=immediate;if(this.immediate){this.callbacks.modify=this.measureImmediate;}else{delete this.callbacks.modify;}},updateHandler:function(handler,options){var active=this.active;if(active){this.deactivate();}
+this.handler=new handler(this,this.callbacks,options);if(active){this.activate();}},measureComplete:function(geometry){this.cancelDelay();this.measure(geometry,"measure");},measurePartial:function(point,geometry){this.cancelDelay();geometry=geometry.clone();if(this.handler.freehandMode(this.handler.evt)){this.measure(geometry,"measurepartial");}else{this.delayedTrigger=window.setTimeout(OpenLayers.Function.bind(function(){this.delayedTrigger=null;this.measure(geometry,"measurepartial");},this),this.partialDelay);}},measureImmediate:function(point,feature,drawing){if(drawing&&!this.handler.freehandMode(this.handler.evt)){this.cancelDelay();this.measure(feature.geometry,"measurepartial");}},cancelDelay:function(){if(this.delayedTrigger!==null){window.clearTimeout(this.delayedTrigger);this.delayedTrigger=null;}},measure:function(geometry,eventType){var stat,order;if(geometry.CLASS_NAME.indexOf('LineString')>-1){stat=this.getBestLength(geometry);order=1;}else{stat=this.getBestArea(geometry);order=2;}
+this.events.triggerEvent(eventType,{measure:stat[0],units:stat[1],order:order,geometry:geometry});},getBestArea:function(geometry){var units=this.displaySystemUnits[this.displaySystem];var unit,area;for(var i=0,len=units.length;i<len;++i){unit=units[i];area=this.getArea(geometry,unit);if(area>1){break;}}
+return[area,unit];},getArea:function(geometry,units){var area,geomUnits;if(this.geodesic){area=geometry.getGeodesicArea(this.map.getProjectionObject());geomUnits="m";}else{area=geometry.getArea();geomUnits=this.map.getUnits();}
+var inPerDisplayUnit=OpenLayers.INCHES_PER_UNIT[units];if(inPerDisplayUnit){var inPerMapUnit=OpenLayers.INCHES_PER_UNIT[geomUnits];area*=Math.pow((inPerMapUnit/inPerDisplayUnit),2);}
+return area;},getBestLength:function(geometry){var units=this.displaySystemUnits[this.displaySystem];var unit,length;for(var i=0,len=units.length;i<len;++i){unit=units[i];length=this.getLength(geometry,unit);if(length>1){break;}}
+return[length,unit];},getLength:function(geometry,units){var length,geomUnits;if(this.geodesic){length=geometry.getGeodesicLength(this.map.getProjectionObject());geomUnits="m";}else{length=geometry.getLength();geomUnits=this.map.getUnits();}
+var inPerDisplayUnit=OpenLayers.INCHES_PER_UNIT[units];if(inPerDisplayUnit){var inPerMapUnit=OpenLayers.INCHES_PER_UNIT[geomUnits];length*=(inPerMapUnit/inPerDisplayUnit);}
+return length;},CLASS_NAME:"OpenLayers.Control.Measure"});OpenLayers.Format.WMC.v1_0_0=OpenLayers.Class(OpenLayers.Format.WMC.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/context http://schemas.opengis.net/context/1.0.0/context.xsd",initialize:function(options){OpenLayers.Format.WMC.v1.prototype.initialize.apply(this,[options]);},read_wmc_SRS:function(layerContext,node){var srs=this.getChildValue(node);if(typeof layerContext.projections!="object"){layerContext.projections={};}
+var values=srs.split(/ +/);for(var i=0,len=values.length;i<len;i++){layerContext.projections[values[i]]=true;}},write_wmc_Layer:function(context){var node=OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(this,[context]);if(context.srs){var projections=[];for(var name in context.srs){projections.push(name);}
+node.appendChild(this.createElementDefaultNS("SRS",projections.join(" ")));}
+node.appendChild(this.write_wmc_FormatList(context));node.appendChild(this.write_wmc_StyleList(context));if(context.dimensions){node.appendChild(this.write_wmc_DimensionList(context));}
+node.appendChild(this.write_wmc_LayerExtension(context));},CLASS_NAME:"OpenLayers.Format.WMC.v1_0_0"});OpenLayers.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:true,panMapIfOutOfView:true,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:false,fixedRelativePosition:false,positionBlocks:{"tl":{'offset':new OpenLayers.Pixel(44,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,18),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-632)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(0,-688)}]},"tr":{'offset':new OpenLayers.Pixel(-45,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,19),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-631)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(0,0,null,null),position:new OpenLayers.Pixel(-215,-687)}]},"bl":{'offset':new OpenLayers.Pixel(45,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(null,null,0,0),position:new OpenLayers.Pixel(-101,-674)}]},"br":{'offset':new OpenLayers.Pixel(-44,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(0,null,null,0),position:new OpenLayers.Pixel(-311,-674)}]}},minSize:new OpenLayers.Size(105,10),maxSize:new OpenLayers.Size(1200,660),initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){this.imageSrc=OpenLayers.Util.getImageLocation('cloud-popup-relative.png');OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass;},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Format.SOSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.SOSCapabilities"});OpenLayers.Format.SOSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.SOSCapabilities,{namespaces:{ows:"http://www.opengis.net/ows/1.1",sos:"http://www.opengis.net/sos/1.0",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink"},regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);this.options=options;},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var capabilities={};this.readNode(data,capabilities);return capabilities;},readers:{"gml":OpenLayers.Util.applyDefaults({"name":function(node,obj){obj.name=this.getChildValue(node);},"TimePeriod":function(node,obj){obj.timePeriod={};this.readChildNodes(node,obj.timePeriod);},"beginPosition":function(node,timePeriod){timePeriod.beginPosition=this.getChildValue(node);},"endPosition":function(node,timePeriod){timePeriod.endPosition=this.getChildValue(node);}},OpenLayers.Format.GML.v3.prototype.readers["gml"]),"sos":{"Capabilities":function(node,obj){this.readChildNodes(node,obj);},"Contents":function(node,obj){obj.contents={};this.readChildNodes(node,obj.contents);},"ObservationOfferingList":function(node,contents){contents.offeringList={};this.readChildNodes(node,contents.offeringList);},"ObservationOffering":function(node,offeringList){var id=this.getAttributeNS(node,this.namespaces.gml,"id");offeringList[id]={procedures:[],observedProperties:[],featureOfInterestIds:[],responseFormats:[],resultModels:[],responseModes:[]};this.readChildNodes(node,offeringList[id]);},"time":function(node,offering){offering.time={};this.readChildNodes(node,offering.time);},"procedure":function(node,offering){offering.procedures.push(this.getAttributeNS(node,this.namespaces.xlink,"href"));},"observedProperty":function(node,offering){offering.observedProperties.push(this.getAttributeNS(node,this.namespaces.xlink,"href"));},"featureOfInterest":function(node,offering){offering.featureOfInterestIds.push(this.getAttributeNS(node,this.namespaces.xlink,"href"));},"responseFormat":function(node,offering){offering.responseFormats.push(this.getChildValue(node));},"resultModel":function(node,offering){offering.resultModels.push(this.getChildValue(node));},"responseMode":function(node,offering){offering.responseModes.push(this.getChildValue(node));}},"ows":OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]},CLASS_NAME:"OpenLayers.Format.SOSCapabilities.v1_0_0"});OpenLayers.Handler.Pinch=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:false,pinching:false,last:null,start:null,touchstart:function(evt){var propagate=true;this.pinching=false;if(OpenLayers.Event.isMultiTouch(evt)){this.started=true;this.last=this.start={distance:this.getDistance(evt.touches),delta:0,scale:1};this.callback("start",[evt,this.start]);propagate=!this.stopDown;}else{this.started=false;this.start=null;this.last=null;}
+OpenLayers.Event.stop(evt);return propagate;},touchmove:function(evt){if(this.started&&OpenLayers.Event.isMultiTouch(evt)){this.pinching=true;var current=this.getPinchData(evt);this.callback("move",[evt,current]);this.last=current;OpenLayers.Event.stop(evt);}
+return true;},touchend:function(evt){if(this.started){this.started=false;this.pinching=false;this.callback("done",[evt,this.start,this.last]);this.start=null;this.last=null;}
+return true;},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.pinching=false;activated=true;}
+return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.started=false;this.pinching=false;this.start=null;this.last=null;deactivated=true;}
+return deactivated;},getDistance:function(touches){var t0=touches[0];var t1=touches[1];return Math.sqrt(Math.pow(t0.clientX-t1.clientX,2)+
+Math.pow(t0.clientY-t1.clientY,2));},getPinchData:function(evt){var distance=this.getDistance(evt.touches);var scale=distance/this.start.distance;return{distance:distance,delta:this.last.distance-distance,scale:scale};},CLASS_NAME:"OpenLayers.Handler.Pinch"});OpenLayers.Control.NavToolbar=OpenLayers.Class(OpenLayers.Control.Panel,{initialize:function(options){OpenLayers.Control.Panel.prototype.initialize.apply(this,[options]);this.addControls([new OpenLayers.Control.Navigation(),new OpenLayers.Control.ZoomBox()]);},draw:function(){var div=OpenLayers.Control.Panel.prototype.draw.apply(this,arguments);if(this.defaultControl===null){this.defaultControl=this.controls[0];}
+return div;},CLASS_NAME:"OpenLayers.Control.NavToolbar"});OpenLayers.Strategy.Refresh=OpenLayers.Class(OpenLayers.Strategy,{force:false,interval:0,timer:null,activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){if(this.layer.visibility===true){this.start();}
+this.layer.events.on({"visibilitychanged":this.reset,scope:this});}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.stop();}
+return deactivated;},reset:function(){if(this.layer.visibility===true){this.start();}else{this.stop();}},start:function(){if(this.interval&&typeof this.interval==="number"&&this.interval>0){this.timer=window.setInterval(OpenLayers.Function.bind(this.refresh,this),this.interval);}},refresh:function(){if(this.layer&&this.layer.refresh&&typeof this.layer.refresh=="function"){this.layer.refresh({force:this.force});}},stop:function(){if(this.timer!==null){window.clearInterval(this.timer);this.timer=null;}},CLASS_NAME:"OpenLayers.Strategy.Refresh"});OpenLayers.Control.Geolocate=OpenLayers.Class(OpenLayers.Control,{geolocation:navigator.geolocation,bind:true,watch:false,geolocationOptions:null,destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments);},activate:function(){if(!this.geolocation){this.events.triggerEvent("locationuncapable");return false;}
+if(OpenLayers.Control.prototype.activate.apply(this,arguments)){if(this.watch){this.watchId=this.geolocation.watchPosition(OpenLayers.Function.bind(this.geolocate,this),OpenLayers.Function.bind(this.failure,this),this.geolocationOptions);}else{this.getCurrentLocation();}
+return true;}
+return false;},deactivate:function(){if(this.active&&this.watchId!==null){this.geolocation.clearWatch(this.watchId);}
+return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},geolocate:function(position){var center=new OpenLayers.LonLat(position.coords.longitude,position.coords.latitude).transform(new OpenLayers.Projection("EPSG:4326"),this.map.getProjectionObject());if(this.bind){this.map.setCenter(center);}
+this.events.triggerEvent("locationupdated",{position:position,point:new OpenLayers.Geometry.Point(center.lon,center.lat)});},getCurrentLocation:function(){if(!this.active||this.watch){return false;}
+this.geolocation.getCurrentPosition(OpenLayers.Function.bind(this.geolocate,this),OpenLayers.Function.bind(this.failure,this),this.geolocationOptions);return true;},failure:function(error){this.events.triggerEvent("locationfailed",{error:error});},CLASS_NAME:"OpenLayers.Control.Geolocate"});OpenLayers.Layer.ArcGIS93Rest=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{format:"png"},isBaseLayer:true,initialize:function(name,url,params,options){var newArguments=[];params=OpenLayers.Util.upperCaseObject(params);newArguments.push(name,url,params,options);OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));if(this.params.TRANSPARENT&&this.params.TRANSPARENT.toString().toLowerCase()=="true"){if((options==null)||(!options.isBaseLayer)){this.isBaseLayer=false;}
+if(this.params.FORMAT=="jpg"){this.params.FORMAT=OpenLayers.Util.alphaHack()?"gif":"png";}}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.ArcGIS93Rest(this.name,this.url,this.params,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){bounds=this.adjustBounds(bounds);var projWords=this.projection.getCode().split(":");var srid=projWords[projWords.length-1];var imageSize=this.getImageSize();var newParams={'BBOX':bounds.toBBOX(),'SIZE':imageSize.w+","+imageSize.h,'F':"image",'BBOXSR':srid,'IMAGESR':srid};if(this.layerDefs){var layerDefStrList=[];var layerID;for(layerID in this.layerDefs){if(this.layerDefs.hasOwnProperty(layerID)){if(this.layerDefs[layerID]){layerDefStrList.push(layerID);layerDefStrList.push(":");layerDefStrList.push(this.layerDefs[layerID]);layerDefStrList.push(";");}}}
+if(layerDefStrList.length>0){newParams['LAYERDEFS']=layerDefStrList.join("");}}
+var requestString=this.getFullRequestString(newParams);return requestString;},setLayerFilter:function(id,queryDef){if(!this.layerDefs){this.layerDefs={};}
+if(queryDef){this.layerDefs[id]=queryDef;}else{delete this.layerDefs[id];}},clearLayerFilter:function(id){if(id){delete this.layerDefs[id];}else{delete this.layerDefs;}},mergeNewParams:function(newParams){var upperParams=OpenLayers.Util.upperCaseObject(newParams);var newArguments=[upperParams];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,newArguments);},CLASS_NAME:"OpenLayers.Layer.ArcGIS93Rest"});OpenLayers.Format.WKT=OpenLayers.Class(OpenLayers.Format,{initialize:function(options){this.regExes={'typeStr':/^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,'spaces':/\s+/,'parenComma':/\)\s*,\s*\(/,'doubleParenComma':/\)\s*\)\s*,\s*\(\s*\(/,'trimParens':/^\s*\(?(.*?)\)?\s*$/};OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(wkt){var features,type,str;wkt=wkt.replace(/[\n\r]/g," ");var matches=this.regExes.typeStr.exec(wkt);if(matches){type=matches[1].toLowerCase();str=matches[2];if(this.parse[type]){features=this.parse[type].apply(this,[str]);}
+if(this.internalProjection&&this.externalProjection){if(features&&features.CLASS_NAME=="OpenLayers.Feature.Vector"){features.geometry.transform(this.externalProjection,this.internalProjection);}else if(features&&type!="geometrycollection"&&typeof features=="object"){for(var i=0,len=features.length;i<len;i++){var component=features[i];component.geometry.transform(this.externalProjection,this.internalProjection);}}}}
+return features;},write:function(features){var collection,geometry,type,data,isCollection;if(features.constructor==Array){collection=features;isCollection=true;}else{collection=[features];isCollection=false;}
+var pieces=[];if(isCollection){pieces.push('GEOMETRYCOLLECTION(');}
+for(var i=0,len=collection.length;i<len;++i){if(isCollection&&i>0){pieces.push(',');}
+geometry=collection[i].geometry;pieces.push(this.extractGeometry(geometry));}
+if(isCollection){pieces.push(')');}
+return pieces.join('');},extractGeometry:function(geometry){var type=geometry.CLASS_NAME.split('.')[2].toLowerCase();if(!this.extract[type]){return null;}
+if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);}
+var wktType=type=='collection'?'GEOMETRYCOLLECTION':type.toUpperCase();var data=wktType+'('+this.extract[type].apply(this,[geometry])+')';return data;},extract:{'point':function(point){return point.x+' '+point.y;},'multipoint':function(multipoint){var array=[];for(var i=0,len=multipoint.components.length;i<len;++i){array.push('('+
+this.extract.point.apply(this,[multipoint.components[i]])+')');}
+return array.join(',');},'linestring':function(linestring){var array=[];for(var i=0,len=linestring.components.length;i<len;++i){array.push(this.extract.point.apply(this,[linestring.components[i]]));}
+return array.join(',');},'multilinestring':function(multilinestring){var array=[];for(var i=0,len=multilinestring.components.length;i<len;++i){array.push('('+
+this.extract.linestring.apply(this,[multilinestring.components[i]])+')');}
+return array.join(',');},'polygon':function(polygon){var array=[];for(var i=0,len=polygon.components.length;i<len;++i){array.push('('+
+this.extract.linestring.apply(this,[polygon.components[i]])+')');}
+return array.join(',');},'multipolygon':function(multipolygon){var array=[];for(var i=0,len=multipolygon.components.length;i<len;++i){array.push('('+
+this.extract.polygon.apply(this,[multipolygon.components[i]])+')');}
+return array.join(',');},'collection':function(collection){var array=[];for(var i=0,len=collection.components.length;i<len;++i){array.push(this.extractGeometry.apply(this,[collection.components[i]]));}
+return array.join(',');}},parse:{'point':function(str){var coords=OpenLayers.String.trim(str).split(this.regExes.spaces);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(coords[0],coords[1]));},'multipoint':function(str){var point;var points=OpenLayers.String.trim(str).split(',');var components=[];for(var i=0,len=points.length;i<len;++i){point=points[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.point.apply(this,[point]).geometry);}
+return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPoint(components));},'linestring':function(str){var points=OpenLayers.String.trim(str).split(',');var components=[];for(var i=0,len=points.length;i<len;++i){components.push(this.parse.point.apply(this,[points[i]]).geometry);}
+return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString(components));},'multilinestring':function(str){var line;var lines=OpenLayers.String.trim(str).split(this.regExes.parenComma);var components=[];for(var i=0,len=lines.length;i<len;++i){line=lines[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.linestring.apply(this,[line]).geometry);}
+return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiLineString(components));},'polygon':function(str){var ring,linestring,linearring;var rings=OpenLayers.String.trim(str).split(this.regExes.parenComma);var components=[];for(var i=0,len=rings.length;i<len;++i){ring=rings[i].replace(this.regExes.trimParens,'$1');linestring=this.parse.linestring.apply(this,[ring]).geometry;linearring=new OpenLayers.Geometry.LinearRing(linestring.components);components.push(linearring);}
+return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon(components));},'multipolygon':function(str){var polygon;var polygons=OpenLayers.String.trim(str).split(this.regExes.doubleParenComma);var components=[];for(var i=0,len=polygons.length;i<len;++i){polygon=polygons[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.polygon.apply(this,[polygon]).geometry);}
+return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPolygon(components));},'geometrycollection':function(str){str=str.replace(/,\s*([A-Za-z])/g,'|$1');var wktArray=OpenLayers.String.trim(str).split('|');var components=[];for(var i=0,len=wktArray.length;i<len;++i){components.push(OpenLayers.Format.WKT.prototype.read.apply(this,[wktArray[i]]));}
+return components;}},CLASS_NAME:"OpenLayers.Format.WKT"});OpenLayers.Control.GetFeature=OpenLayers.Class(OpenLayers.Control,{protocol:null,multipleKey:null,toggleKey:null,modifiers:null,multiple:false,click:true,single:true,clickout:true,toggle:false,clickTolerance:5,hover:false,box:false,maxFeatures:10,features:null,hoverFeature:null,handlers:null,hoverResponse:null,filterType:OpenLayers.Filter.Spatial.BBOX,initialize:function(options){options.handlerOptions=options.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[options]);this.features={};this.handlers={};if(this.click){this.handlers.click=new OpenLayers.Handler.Click(this,{click:this.selectClick},this.handlerOptions.click||{});}
+if(this.box){this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},OpenLayers.Util.extend(this.handlerOptions.box,{boxDivClassName:"olHandlerBoxSelectFeature"}));}
+if(this.hover){this.handlers.hover=new OpenLayers.Handler.Hover(this,{'move':this.cancelHover,'pause':this.selectHover},OpenLayers.Util.extend(this.handlerOptions.hover,{'delay':250,'pixelTolerance':2}));}},activate:function(){if(!this.active){for(var i in this.handlers){this.handlers[i].activate();}}
+return OpenLayers.Control.prototype.activate.apply(this,arguments);},deactivate:function(){if(this.active){for(var i in this.handlers){this.handlers[i].deactivate();}}
+return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},selectClick:function(evt){var bounds=this.pixelToBounds(evt.xy);this.setModifiers(evt);this.request(bounds,{single:this.single});},selectBox:function(position){var bounds;if(position instanceof OpenLayers.Bounds){var minXY=this.map.getLonLatFromPixel({x:position.left,y:position.bottom});var maxXY=this.map.getLonLatFromPixel({x:position.right,y:position.top});bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);}else{if(this.click){return;}
+bounds=this.pixelToBounds(position);}
+this.setModifiers(this.handlers.box.dragHandler.evt);this.request(bounds);},selectHover:function(evt){var bounds=this.pixelToBounds(evt.xy);this.request(bounds,{single:true,hover:true});},cancelHover:function(){if(this.hoverResponse){this.protocol.abort(this.hoverResponse);this.hoverResponse=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait");}},request:function(bounds,options){options=options||{};var filter=new OpenLayers.Filter.Spatial({type:this.filterType,value:bounds});OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait");var response=this.protocol.read({maxFeatures:options.single==true?this.maxFeatures:undefined,filter:filter,callback:function(result){if(result.success()){if(result.features.length){if(options.single==true){this.selectBestFeature(result.features,bounds.getCenterLonLat(),options);}else{this.select(result.features);}}else if(options.hover){this.hoverSelect();}else{this.events.triggerEvent("clickout");if(this.clickout){this.unselectAll();}}}
+OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait");},scope:this});if(options.hover==true){this.hoverResponse=response;}},selectBestFeature:function(features,clickPosition,options){options=options||{};if(features.length){var point=new OpenLayers.Geometry.Point(clickPosition.lon,clickPosition.lat);var feature,resultFeature,dist;var minDist=Number.MAX_VALUE;for(var i=0;i<features.length;++i){feature=features[i];if(feature.geometry){dist=point.distanceTo(feature.geometry,{edge:false});if(dist<minDist){minDist=dist;resultFeature=feature;if(minDist==0){break;}}}}
+if(options.hover==true){this.hoverSelect(resultFeature);}else{this.select(resultFeature||features);}}},setModifiers:function(evt){this.modifiers={multiple:this.multiple||(this.multipleKey&&evt[this.multipleKey]),toggle:this.toggle||(this.toggleKey&&evt[this.toggleKey])};},select:function(features){if(!this.modifiers.multiple&&!this.modifiers.toggle){this.unselectAll();}
+if(!(OpenLayers.Util.isArray(features))){features=[features];}
+var cont=this.events.triggerEvent("beforefeaturesselected",{features:features});if(cont!==false){var selectedFeatures=[];var feature;for(var i=0,len=features.length;i<len;++i){feature=features[i];if(this.features[feature.fid||feature.id]){if(this.modifiers.toggle){this.unselect(this.features[feature.fid||feature.id]);}}else{cont=this.events.triggerEvent("beforefeatureselected",{feature:feature});if(cont!==false){this.features[feature.fid||feature.id]=feature;selectedFeatures.push(feature);this.events.triggerEvent("featureselected",{feature:feature});}}}
+this.events.triggerEvent("featuresselected",{features:selectedFeatures});}},hoverSelect:function(feature){var fid=feature?feature.fid||feature.id:null;var hfid=this.hoverFeature?this.hoverFeature.fid||this.hoverFeature.id:null;if(hfid&&hfid!=fid){this.events.triggerEvent("outfeature",{feature:this.hoverFeature});this.hoverFeature=null;}
+if(fid&&fid!=hfid){this.events.triggerEvent("hoverfeature",{feature:feature});this.hoverFeature=feature;}},unselect:function(feature){delete this.features[feature.fid||feature.id];this.events.triggerEvent("featureunselected",{feature:feature});},unselectAll:function(){for(var fid in this.features){this.unselect(this.features[fid]);}},setMap:function(map){for(var i in this.handlers){this.handlers[i].setMap(map);}
+OpenLayers.Control.prototype.setMap.apply(this,arguments);},pixelToBounds:function(pixel){var llPx=pixel.add(-this.clickTolerance/2,this.clickTolerance/2);var urPx=pixel.add(this.clickTolerance/2,-this.clickTolerance/2);var ll=this.map.getLonLatFromPixel(llPx);var ur=this.map.getLonLatFromPixel(urPx);return new OpenLayers.Bounds(ll.lon,ll.lat,ur.lon,ur.lat);},CLASS_NAME:"OpenLayers.Control.GetFeature"});OpenLayers.Format.QueryStringFilter=(function(){var cmpToStr={};cmpToStr[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";cmpToStr[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN]="lt";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";cmpToStr[OpenLayers.Filter.Comparison.LIKE]="ilike";function regex2value(value){value=value.replace(/%/g,"\\%");value=value.replace(/\\\\\.(\*)?/g,function($0,$1){return $1?$0:"\\\\_";});value=value.replace(/\\\\\.\*/g,"\\\\%");value=value.replace(/(\\)?\.(\*)?/g,function($0,$1,$2){return $1||$2?$0:"_";});value=value.replace(/(\\)?\.\*/g,function($0,$1){return $1?$0:"%";});value=value.replace(/\\\./g,".");value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"*";});return value;}
+return OpenLayers.Class(OpenLayers.Format,{wildcarded:false,srsInBBOX:false,write:function(filter,params){params=params||{};var className=filter.CLASS_NAME;var filterType=className.substring(className.lastIndexOf(".")+1);switch(filterType){case"Spatial":switch(filter.type){case OpenLayers.Filter.Spatial.BBOX:params.bbox=filter.value.toArray();if(this.srsInBBOX&&filter.projection){params.bbox.push(filter.projection.getCode());}
+break;case OpenLayers.Filter.Spatial.DWITHIN:params.tolerance=filter.distance;case OpenLayers.Filter.Spatial.WITHIN:params.lon=filter.value.x;params.lat=filter.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+filter.type);}
+break;case"Comparison":var op=cmpToStr[filter.type];if(op!==undefined){var value=filter.value;if(filter.type==OpenLayers.Filter.Comparison.LIKE){value=regex2value(value);if(this.wildcarded){value="%"+value+"%";}}
+params[filter.property+"__"+op]=value;params.queryable=params.queryable||[];params.queryable.push(filter.property);}else{OpenLayers.Console.warn("Unknown comparison filter type "+filter.type);}
+break;case"Logical":if(filter.type===OpenLayers.Filter.Logical.AND){for(var i=0,len=filter.filters.length;i<len;i++){params=this.write(filter.filters[i],params);}}else{OpenLayers.Console.warn("Unsupported logical filter type "+filter.type);}
+break;default:OpenLayers.Console.warn("Unknown filter type "+filterType);}
+return params;},CLASS_NAME:"OpenLayers.Format.QueryStringFilter"});})();OpenLayers.Control.MousePosition=OpenLayers.Class(OpenLayers.Control,{autoActivate:true,element:null,prefix:'',separator:', ',suffix:'',numDigits:5,granularity:10,emptyString:null,lastXy:null,displayProjection:null,destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments);},activate:function(){if(OpenLayers.Control.prototype.activate.apply(this,arguments)){this.map.events.register('mousemove',this,this.redraw);this.map.events.register('mouseout',this,this.reset);this.redraw();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){this.map.events.unregister('mousemove',this,this.redraw);this.map.events.unregister('mouseout',this,this.reset);this.element.innerHTML="";return true;}else{return false;}},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.element){this.div.left="";this.div.top="";this.element=this.div;}
+return this.div;},redraw:function(evt){var lonLat;if(evt==null){this.reset();return;}else{if(this.lastXy==null||Math.abs(evt.xy.x-this.lastXy.x)>this.granularity||Math.abs(evt.xy.y-this.lastXy.y)>this.granularity)
+{this.lastXy=evt.xy;return;}
+lonLat=this.map.getLonLatFromPixel(evt.xy);if(!lonLat){return;}
+if(this.displayProjection){lonLat.transform(this.map.getProjectionObject(),this.displayProjection);}
+this.lastXy=evt.xy;}
+var newHtml=this.formatOutput(lonLat);if(newHtml!=this.element.innerHTML){this.element.innerHTML=newHtml;}},reset:function(evt){if(this.emptyString!=null){this.element.innerHTML=this.emptyString;}},formatOutput:function(lonLat){var digits=parseInt(this.numDigits);var newHtml=this.prefix+
+lonLat.lon.toFixed(digits)+
+this.separator+
+lonLat.lat.toFixed(digits)+
+this.suffix;return newHtml;},CLASS_NAME:"OpenLayers.Control.MousePosition"});OpenLayers.Tile.UTFGrid=OpenLayers.Class(OpenLayers.Tile,{url:null,utfgridResolution:2,json:null,format:null,destroy:function(){this.clear();OpenLayers.Tile.prototype.destroy.apply(this,arguments);},draw:function(){var drawn=OpenLayers.Tile.prototype.draw.apply(this,arguments);if(drawn){if(this.isLoading){this.abortLoading();this.events.triggerEvent("reload");}else{this.isLoading=true;this.events.triggerEvent("loadstart");}
+this.url=this.layer.getURL(this.bounds);if(this.layer.useJSONP){var ols=new OpenLayers.Protocol.Script({url:this.url,callback:function(response){this.isLoading=false;this.events.triggerEvent("loadend");this.json=response.data;},scope:this});ols.read();this.request=ols;}else{this.request=OpenLayers.Request.GET({url:this.url,callback:function(response){this.isLoading=false;this.events.triggerEvent("loadend");if(response.status===200){this.parseData(response.responseText);}},scope:this});}}else{this.unload();}
+return drawn;},abortLoading:function(){if(this.request){this.request.abort();delete this.request;}
+this.isLoading=false;},getFeatureInfo:function(i,j){var info=null;if(this.json){var id=this.getFeatureId(i,j);if(id!==null){info={id:id,data:this.json.data[id]};}}
+return info;},getFeatureId:function(i,j){var id=null;if(this.json){var resolution=this.utfgridResolution;var row=Math.floor(j/resolution);var col=Math.floor(i/resolution);var charCode=this.json.grid[row].charCodeAt(col);var index=this.indexFromCharCode(charCode);var keys=this.json.keys;if(!isNaN(index)&&(index in keys)){id=keys[index];}}
+return id;},indexFromCharCode:function(charCode){if(charCode>=93){charCode--;}
+if(charCode>=35){charCode--;}
+return charCode-32;},parseData:function(str){if(!this.format){this.format=new OpenLayers.Format.JSON();}
+this.json=this.format.read(str);},clear:function(){this.json=null;},CLASS_NAME:"OpenLayers.Tile.UTFGrid"});OpenLayers.Control.Button=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_BUTTON,trigger:function(){},CLASS_NAME:"OpenLayers.Control.Button"});OpenLayers.Control.NavigationHistory=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOGGLE,previous:null,previousOptions:null,next:null,nextOptions:null,limit:50,autoActivate:true,clearOnDeactivate:false,registry:null,nextStack:null,previousStack:null,listeners:null,restoring:false,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.registry=OpenLayers.Util.extend({"moveend":this.getState},this.registry);var previousOptions={trigger:OpenLayers.Function.bind(this.previousTrigger,this),displayClass:this.displayClass+" "+this.displayClass+"Previous"};OpenLayers.Util.extend(previousOptions,this.previousOptions);this.previous=new OpenLayers.Control.Button(previousOptions);var nextOptions={trigger:OpenLayers.Function.bind(this.nextTrigger,this),displayClass:this.displayClass+" "+this.displayClass+"Next"};OpenLayers.Util.extend(nextOptions,this.nextOptions);this.next=new OpenLayers.Control.Button(nextOptions);this.clear();},onPreviousChange:function(state,length){if(state&&!this.previous.active){this.previous.activate();}else if(!state&&this.previous.active){this.previous.deactivate();}},onNextChange:function(state,length){if(state&&!this.next.active){this.next.activate();}else if(!state&&this.next.active){this.next.deactivate();}},destroy:function(){OpenLayers.Control.prototype.destroy.apply(this);this.previous.destroy();this.next.destroy();this.deactivate();for(var prop in this){this[prop]=null;}},setMap:function(map){this.map=map;this.next.setMap(map);this.previous.setMap(map);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.next.draw();this.previous.draw();},previousTrigger:function(){var current=this.previousStack.shift();var state=this.previousStack.shift();if(state!=undefined){this.nextStack.unshift(current);this.previousStack.unshift(state);this.restoring=true;this.restore(state);this.restoring=false;this.onNextChange(this.nextStack[0],this.nextStack.length);this.onPreviousChange(this.previousStack[1],this.previousStack.length-1);}else{this.previousStack.unshift(current);}
+return state;},nextTrigger:function(){var state=this.nextStack.shift();if(state!=undefined){this.previousStack.unshift(state);this.restoring=true;this.restore(state);this.restoring=false;this.onNextChange(this.nextStack[0],this.nextStack.length);this.onPreviousChange(this.previousStack[1],this.previousStack.length-1);}
+return state;},clear:function(){this.previousStack=[];this.previous.deactivate();this.nextStack=[];this.next.deactivate();},getState:function(){return{center:this.map.getCenter(),resolution:this.map.getResolution(),projection:this.map.getProjectionObject(),units:this.map.getProjectionObject().getUnits()||this.map.units||this.map.baseLayer.units};},restore:function(state){var center,zoom;if(this.map.getProjectionObject()==state.projection){zoom=this.map.getZoomForResolution(state.resolution);center=state.center;}else{center=state.center.clone();center.transform(state.projection,this.map.getProjectionObject());var sourceUnits=state.units;var targetUnits=this.map.getProjectionObject().getUnits()||this.map.units||this.map.baseLayer.units;var resolutionFactor=sourceUnits&&targetUnits?OpenLayers.INCHES_PER_UNIT[sourceUnits]/OpenLayers.INCHES_PER_UNIT[targetUnits]:1;zoom=this.map.getZoomForResolution(resolutionFactor*state.resolution);}
+this.map.setCenter(center,zoom);},setListeners:function(){this.listeners={};for(var type in this.registry){this.listeners[type]=OpenLayers.Function.bind(function(){if(!this.restoring){var state=this.registry[type].apply(this,arguments);this.previousStack.unshift(state);if(this.previousStack.length>1){this.onPreviousChange(this.previousStack[1],this.previousStack.length-1);}
+if(this.previousStack.length>(this.limit+1)){this.previousStack.pop();}
+if(this.nextStack.length>0){this.nextStack=[];this.onNextChange(null,0);}}
+return true;},this);}},activate:function(){var activated=false;if(this.map){if(OpenLayers.Control.prototype.activate.apply(this)){if(this.listeners==null){this.setListeners();}
+for(var type in this.listeners){this.map.events.register(type,this,this.listeners[type]);}
+activated=true;if(this.previousStack.length==0){this.initStack();}}}
+return activated;},initStack:function(){if(this.map.getCenter()){this.listeners.moveend();}},deactivate:function(){var deactivated=false;if(this.map){if(OpenLayers.Control.prototype.deactivate.apply(this)){for(var type in this.listeners){this.map.events.unregister(type,this,this.listeners[type]);}
+if(this.clearOnDeactivate){this.clear();}
+deactivated=true;}}
+return deactivated;},CLASS_NAME:"OpenLayers.Control.NavigationHistory"});OpenLayers.Protocol.WFS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.0.0",CLASS_NAME:"OpenLayers.Protocol.WFS.v1_0_0"});OpenLayers.Strategy.Cluster=OpenLayers.Class(OpenLayers.Strategy,{distance:20,threshold:null,features:null,clusters:null,clustering:false,resolution:null,activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){this.layer.events.on({"beforefeaturesadded":this.cacheFeatures,"moveend":this.cluster,scope:this});}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.clearCache();this.layer.events.un({"beforefeaturesadded":this.cacheFeatures,"moveend":this.cluster,scope:this});}
+return deactivated;},cacheFeatures:function(event){var propagate=true;if(!this.clustering){this.clearCache();this.features=event.features;this.cluster();propagate=false;}
+return propagate;},clearCache:function(){this.features=null;},cluster:function(event){if((!event||event.zoomChanged)&&this.features){var resolution=this.layer.map.getResolution();if(resolution!=this.resolution||!this.clustersExist()){this.resolution=resolution;var clusters=[];var feature,clustered,cluster;for(var i=0;i<this.features.length;++i){feature=this.features[i];if(feature.geometry){clustered=false;for(var j=clusters.length-1;j>=0;--j){cluster=clusters[j];if(this.shouldCluster(cluster,feature)){this.addToCluster(cluster,feature);clustered=true;break;}}
+if(!clustered){clusters.push(this.createCluster(this.features[i]));}}}
+this.layer.removeAllFeatures();if(clusters.length>0){if(this.threshold>1){var clone=clusters.slice();clusters=[];var candidate;for(var i=0,len=clone.length;i<len;++i){candidate=clone[i];if(candidate.attributes.count<this.threshold){Array.prototype.push.apply(clusters,candidate.cluster);}else{clusters.push(candidate);}}}
+this.clustering=true;this.layer.addFeatures(clusters);this.clustering=false;}
+this.clusters=clusters;}}},clustersExist:function(){var exist=false;if(this.clusters&&this.clusters.length>0&&this.clusters.length==this.layer.features.length){exist=true;for(var i=0;i<this.clusters.length;++i){if(this.clusters[i]!=this.layer.features[i]){exist=false;break;}}}
+return exist;},shouldCluster:function(cluster,feature){var cc=cluster.geometry.getBounds().getCenterLonLat();var fc=feature.geometry.getBounds().getCenterLonLat();var distance=(Math.sqrt(Math.pow((cc.lon-fc.lon),2)+Math.pow((cc.lat-fc.lat),2))/this.resolution);return(distance<=this.distance);},addToCluster:function(cluster,feature){cluster.cluster.push(feature);cluster.attributes.count+=1;},createCluster:function(feature){var center=feature.geometry.getBounds().getCenterLonLat();var cluster=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(center.lon,center.lat),{count:1});cluster.cluster=[feature];return cluster;},CLASS_NAME:"OpenLayers.Strategy.Cluster"});OpenLayers.Strategy.Filter=OpenLayers.Class(OpenLayers.Strategy,{filter:null,cache:null,caching:false,activate:function(){var activated=OpenLayers.Strategy.prototype.activate.apply(this,arguments);if(activated){this.cache=[];this.layer.events.on({"beforefeaturesadded":this.handleAdd,"beforefeaturesremoved":this.handleRemove,scope:this});}
+return activated;},deactivate:function(){this.cache=null;if(this.layer&&this.layer.events){this.layer.events.un({"beforefeaturesadded":this.handleAdd,"beforefeaturesremoved":this.handleRemove,scope:this});}
+return OpenLayers.Strategy.prototype.deactivate.apply(this,arguments);},handleAdd:function(event){if(!this.caching&&this.filter){var features=event.features;event.features=[];var feature;for(var i=0,ii=features.length;i<ii;++i){feature=features[i];if(this.filter.evaluate(feature)){event.features.push(feature);}else{this.cache.push(feature);}}}},handleRemove:function(event){if(!this.caching){this.cache=[];}},setFilter:function(filter){this.filter=filter;var previousCache=this.cache;this.cache=[];this.handleAdd({features:this.layer.features});if(this.cache.length>0){this.caching=true;this.layer.removeFeatures(this.cache.slice());this.caching=false;}
+if(previousCache.length>0){var event={features:previousCache};this.handleAdd(event);if(event.features.length>0){this.caching=true;this.layer.addFeatures(event.features);this.caching=false;}}},CLASS_NAME:"OpenLayers.Strategy.Filter"});OpenLayers.Format.WFSDescribeFeatureType=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xsd:"http://www.w3.org/2001/XMLSchema"},readers:{"xsd":{"schema":function(node,obj){var complexTypes=[];var customTypes={};var schema={complexTypes:complexTypes,customTypes:customTypes};this.readChildNodes(node,schema);var attributes=node.attributes;var attr,name;for(var i=0,len=attributes.length;i<len;++i){attr=attributes[i];name=attr.name;if(name.indexOf("xmlns")==0){this.setNamespace(name.split(":")[1]||"",attr.value);}else{obj[name]=attr.value;}}
+obj.featureTypes=complexTypes;obj.targetPrefix=this.namespaceAlias[obj.targetNamespace];var complexType,customType;for(var i=0,len=complexTypes.length;i<len;++i){complexType=complexTypes[i];customType=customTypes[complexType.typeName];if(customTypes[complexType.typeName]){complexType.typeName=customType.name;}}},"complexType":function(node,obj){var complexType={"typeName":node.getAttribute("name")};this.readChildNodes(node,complexType);obj.complexTypes.push(complexType);},"complexContent":function(node,obj){this.readChildNodes(node,obj);},"extension":function(node,obj){this.readChildNodes(node,obj);},"sequence":function(node,obj){var sequence={elements:[]};this.readChildNodes(node,sequence);obj.properties=sequence.elements;},"element":function(node,obj){if(obj.elements){var element={};var attributes=node.attributes;var attr;for(var i=0,len=attributes.length;i<len;++i){attr=attributes[i];element[attr.name]=attr.value;}
+var type=element.type;if(!type){type={};this.readChildNodes(node,type);element.restriction=type;element.type=type.base;}
+var fullType=type.base||type;element.localType=fullType.split(":").pop();obj.elements.push(element);}
+if(obj.complexTypes){var type=node.getAttribute("type");var localType=type.split(":").pop();obj.customTypes[localType]={"name":node.getAttribute("name"),"type":type};}},"simpleType":function(node,obj){this.readChildNodes(node,obj);},"restriction":function(node,obj){obj.base=node.getAttribute("base");this.readRestriction(node,obj);}}},readRestriction:function(node,obj){var children=node.childNodes;var child,nodeName,value;for(var i=0,len=children.length;i<len;++i){child=children[i];if(child.nodeType==1){nodeName=child.nodeName.split(":").pop();value=child.getAttribute("value");if(!obj[nodeName]){obj[nodeName]=value;}else{if(typeof obj[nodeName]=="string"){obj[nodeName]=[obj[nodeName]];}
+obj[nodeName].push(value);}}}},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var schema={};this.readNode(data,schema);return schema;},CLASS_NAME:"OpenLayers.Format.WFSDescribeFeatureType"});OpenLayers.Format.GeoRSS=OpenLayers.Class(OpenLayers.Format.XML,{rssns:"http://backend.userland.com/rss2",featureNS:"http://mapserver.gis.umn.edu/mapserver",georssns:"http://www.georss.org/georss",geons:"http://www.w3.org/2003/01/geo/wgs84_pos#",featureTitle:"Untitled",featureDescription:"No Description",gmlParser:null,xy:false,createGeometryFromItem:function(item){var point=this.getElementsByTagNameNS(item,this.georssns,"point");var lat=this.getElementsByTagNameNS(item,this.geons,'lat');var lon=this.getElementsByTagNameNS(item,this.geons,'long');var line=this.getElementsByTagNameNS(item,this.georssns,"line");var polygon=this.getElementsByTagNameNS(item,this.georssns,"polygon");var where=this.getElementsByTagNameNS(item,this.georssns,"where");var box=this.getElementsByTagNameNS(item,this.georssns,"box");if(point.length>0||(lat.length>0&&lon.length>0)){var location;if(point.length>0){location=OpenLayers.String.trim(point[0].firstChild.nodeValue).split(/\s+/);if(location.length!=2){location=OpenLayers.String.trim(point[0].firstChild.nodeValue).split(/\s*,\s*/);}}else{location=[parseFloat(lat[0].firstChild.nodeValue),parseFloat(lon[0].firstChild.nodeValue)];}
+var geometry=new OpenLayers.Geometry.Point(location[1],location[0]);}else if(line.length>0){var coords=OpenLayers.String.trim(this.getChildValue(line[0])).split(/\s+/);var components=[];var point;for(var i=0,len=coords.length;i<len;i+=2){point=new OpenLayers.Geometry.Point(coords[i+1],coords[i]);components.push(point);}
+geometry=new OpenLayers.Geometry.LineString(components);}else if(polygon.length>0){var coords=OpenLayers.String.trim(this.getChildValue(polygon[0])).split(/\s+/);var components=[];var point;for(var i=0,len=coords.length;i<len;i+=2){point=new OpenLayers.Geometry.Point(coords[i+1],coords[i]);components.push(point);}
+geometry=new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]);}else if(where.length>0){if(!this.gmlParser){this.gmlParser=new OpenLayers.Format.GML({'xy':this.xy});}
+var feature=this.gmlParser.parseFeature(where[0]);geometry=feature.geometry;}else if(box.length>0){var coords=OpenLayers.String.trim(box[0].firstChild.nodeValue).split(/\s+/);var components=[];var point;if(coords.length>3){point=new OpenLayers.Geometry.Point(coords[1],coords[0]);components.push(point);point=new OpenLayers.Geometry.Point(coords[1],coords[2]);components.push(point);point=new OpenLayers.Geometry.Point(coords[3],coords[2]);components.push(point);point=new OpenLayers.Geometry.Point(coords[3],coords[0]);components.push(point);point=new OpenLayers.Geometry.Point(coords[1],coords[0]);components.push(point);}
+geometry=new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]);}
+if(geometry&&this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}
+return geometry;},createFeatureFromItem:function(item){var geometry=this.createGeometryFromItem(item);var title=this._getChildValue(item,"*","title",this.featureTitle);var description=this._getChildValue(item,"*","description",this._getChildValue(item,"*","content",this._getChildValue(item,"*","summary",this.featureDescription)));var link=this._getChildValue(item,"*","link");if(!link){try{link=this.getElementsByTagNameNS(item,"*","link")[0].getAttribute("href");}catch(e){link=null;}}
+var id=this._getChildValue(item,"*","id",null);var data={"title":title,"description":description,"link":link};var feature=new OpenLayers.Feature.Vector(geometry,data);feature.fid=id;return feature;},_getChildValue:function(node,nsuri,name,def){var value;var eles=this.getElementsByTagNameNS(node,nsuri,name);if(eles&&eles[0]&&eles[0].firstChild&&eles[0].firstChild.nodeValue){value=this.getChildValue(eles[0]);}else{value=(def==undefined)?"":def;}
+return value;},read:function(doc){if(typeof doc=="string"){doc=OpenLayers.Format.XML.prototype.read.apply(this,[doc]);}
+var itemlist=null;itemlist=this.getElementsByTagNameNS(doc,'*','item');if(itemlist.length==0){itemlist=this.getElementsByTagNameNS(doc,'*','entry');}
+var numItems=itemlist.length;var features=new Array(numItems);for(var i=0;i<numItems;i++){features[i]=this.createFeatureFromItem(itemlist[i]);}
+return features;},write:function(features){var georss;if(OpenLayers.Util.isArray(features)){georss=this.createElementNS(this.rssns,"rss");for(var i=0,len=features.length;i<len;i++){georss.appendChild(this.createFeatureXML(features[i]));}}else{georss=this.createFeatureXML(features);}
+return OpenLayers.Format.XML.prototype.write.apply(this,[georss]);},createFeatureXML:function(feature){var geometryNode=this.buildGeometryNode(feature.geometry);var featureNode=this.createElementNS(this.rssns,"item");var titleNode=this.createElementNS(this.rssns,"title");titleNode.appendChild(this.createTextNode(feature.attributes.title?feature.attributes.title:""));var descNode=this.createElementNS(this.rssns,"description");descNode.appendChild(this.createTextNode(feature.attributes.description?feature.attributes.description:""));featureNode.appendChild(titleNode);featureNode.appendChild(descNode);if(feature.attributes.link){var linkNode=this.createElementNS(this.rssns,"link");linkNode.appendChild(this.createTextNode(feature.attributes.link));featureNode.appendChild(linkNode);}
+for(var attr in feature.attributes){if(attr=="link"||attr=="title"||attr=="description"){continue;}
+var attrText=this.createTextNode(feature.attributes[attr]);var nodename=attr;if(attr.search(":")!=-1){nodename=attr.split(":")[1];}
+var attrContainer=this.createElementNS(this.featureNS,"feature:"+nodename);attrContainer.appendChild(attrText);featureNode.appendChild(attrContainer);}
+featureNode.appendChild(geometryNode);return featureNode;},buildGeometryNode:function(geometry){if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);}
+var node;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Polygon"){node=this.createElementNS(this.georssns,'georss:polygon');node.appendChild(this.buildCoordinatesNode(geometry.components[0]));}
+else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"){node=this.createElementNS(this.georssns,'georss:line');node.appendChild(this.buildCoordinatesNode(geometry));}
+else if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){node=this.createElementNS(this.georssns,'georss:point');node.appendChild(this.buildCoordinatesNode(geometry));}else{throw"Couldn't parse "+geometry.CLASS_NAME;}
+return node;},buildCoordinatesNode:function(geometry){var points=null;if(geometry.components){points=geometry.components;}
+var path;if(points){var numPoints=points.length;var parts=new Array(numPoints);for(var i=0;i<numPoints;i++){parts[i]=points[i].y+" "+points[i].x;}
+path=parts.join(" ");}else{path=geometry.y+" "+geometry.x;}
+return this.createTextNode(path);},CLASS_NAME:"OpenLayers.Format.GeoRSS"});OpenLayers.Format.WPSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.WPSCapabilities"});OpenLayers.Format.WPSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows/1.1",wps:"http://www.opengis.net/wps/1.0.0",xlink:"http://www.w3.org/1999/xlink"},regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var capabilities={};this.readNode(data,capabilities);return capabilities;},readers:{"wps":{"Capabilities":function(node,obj){this.readChildNodes(node,obj);},"ProcessOfferings":function(node,obj){obj.processOfferings={};this.readChildNodes(node,obj.processOfferings);},"Process":function(node,processOfferings){var processVersion=this.getAttributeNS(node,this.namespaces.wps,"processVersion");var process={processVersion:processVersion};this.readChildNodes(node,process);processOfferings[process.identifier]=process;},"Languages":function(node,obj){obj.languages=[];this.readChildNodes(node,obj.languages);},"Default":function(node,languages){var language={isDefault:true};this.readChildNodes(node,language);languages.push(language);},"Supported":function(node,languages){var language={};this.readChildNodes(node,language);languages.push(language);}},"ows":OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]},CLASS_NAME:"OpenLayers.Format.WPSCapabilities.v1_0_0"});OpenLayers.Control.PinchZoom=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,containerCenter:null,pinchOrigin:null,currentCenter:null,autoActivate:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.handler=new OpenLayers.Handler.Pinch(this,{start:this.pinchStart,move:this.pinchMove,done:this.pinchDone},this.handlerOptions);},activate:function(){var activated=OpenLayers.Control.prototype.activate.apply(this,arguments);if(activated){this.map.events.on({moveend:this.updateContainerCenter,scope:this});this.updateContainerCenter();}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Control.prototype.deactivate.apply(this,arguments);if(this.map&&this.map.events){this.map.events.un({moveend:this.updateContainerCenter,scope:this});}
+return deactivated;},updateContainerCenter:function(){var container=this.map.layerContainerDiv;this.containerCenter={x:parseInt(container.style.left,10)+50,y:parseInt(container.style.top,10)+50};},pinchStart:function(evt,pinchData){this.pinchOrigin=evt.xy;this.currentCenter=evt.xy;},pinchMove:function(evt,pinchData){var scale=pinchData.scale;var containerCenter=this.containerCenter;var pinchOrigin=this.pinchOrigin;var current=evt.xy;var dx=Math.round((current.x-pinchOrigin.x)+(scale-1)*(containerCenter.x-pinchOrigin.x));var dy=Math.round((current.y-pinchOrigin.y)+(scale-1)*(containerCenter.y-pinchOrigin.y));this.applyTransform("translate("+dx+"px, "+dy+"px) scale("+scale+")");this.currentCenter=current;},applyTransform:function(transform){var style=this.map.layerContainerDiv.style;style['-webkit-transform']=transform;style['-moz-transform']=transform;},pinchDone:function(evt,start,last){this.applyTransform("");var zoom=this.map.getZoomForResolution(this.map.getResolution()/last.scale,true);if(zoom!==this.map.getZoom()||!this.currentCenter.equals(this.pinchOrigin)){var resolution=this.map.getResolutionForZoom(zoom);var location=this.map.getLonLatFromPixel(this.pinchOrigin);var zoomPixel=this.currentCenter;var size=this.map.getSize();location.lon+=resolution*((size.w/2)-zoomPixel.x);location.lat-=resolution*((size.h/2)-zoomPixel.y);this.map.div.clientWidth=this.map.div.clientWidth;this.map.setCenter(location,zoom);}},CLASS_NAME:"OpenLayers.Control.PinchZoom"});OpenLayers.Control.TouchNavigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,dragPanOptions:null,pinchZoom:null,pinchZoomOptions:null,clickHandlerOptions:null,documentDrag:false,autoActivate:true,initialize:function(options){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){this.deactivate();if(this.dragPan){this.dragPan.destroy();}
+this.dragPan=null;if(this.pinchZoom){this.pinchZoom.destroy();delete this.pinchZoom;}
+OpenLayers.Control.prototype.destroy.apply(this,arguments);},activate:function(){if(OpenLayers.Control.prototype.activate.apply(this,arguments)){this.dragPan.activate();this.handlers.click.activate();this.pinchZoom.activate();return true;}
+return false;},deactivate:function(){if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){this.dragPan.deactivate();this.handlers.click.deactivate();this.pinchZoom.deactivate();return true;}
+return false;},draw:function(){var clickCallbacks={click:this.defaultClick,dblclick:this.defaultDblClick};var clickOptions=OpenLayers.Util.extend({"double":true,stopDouble:true,pixelTolerance:2},this.clickHandlerOptions);this.handlers.click=new OpenLayers.Handler.Click(this,clickCallbacks,clickOptions);this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map,documentDrag:this.documentDrag},this.dragPanOptions));this.dragPan.draw();this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map},this.pinchZoomOptions));},defaultClick:function(evt){if(evt.lastTouches&&evt.lastTouches.length==2){this.map.zoomOut();}},defaultDblClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom+1);},CLASS_NAME:"OpenLayers.Control.TouchNavigation"});OpenLayers.Style2=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:false,rules:null,initialize:function(config){OpenLayers.Util.extend(this,config);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){for(var i=0,len=this.rules.length;i<len;i++){this.rules[i].destroy();}
+delete this.rules;},clone:function(){var config=OpenLayers.Util.extend({},this);if(this.rules){config.rules=[];for(var i=0,len=this.rules.length;i<len;++i){config.rules.push(this.rules[i].clone());}}
+return new OpenLayers.Style2(config);},CLASS_NAME:"OpenLayers.Style2"});OpenLayers.Format.SLD.v1_0_0_GeoServer=OpenLayers.Class(OpenLayers.Format.SLD.v1_0_0,{version:"1.0.0",profile:"GeoServer",readers:OpenLayers.Util.applyDefaults({"sld":OpenLayers.Util.applyDefaults({"Priority":function(node,obj){var value=this.readers.ogc._expression.call(this,node);if(value){obj.priority=value;}},"VendorOption":function(node,obj){if(!obj.vendorOptions){obj.vendorOptions={};}
+obj.vendorOptions[node.getAttribute("name")]=this.getChildValue(node);},"TextSymbolizer":function(node,rule){OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld.TextSymbolizer.apply(this,arguments);var symbolizer=this.multipleSymbolizers?rule.symbolizers[rule.symbolizers.length-1]:rule.symbolizer["Text"];if(symbolizer.graphic===undefined){symbolizer.graphic=false;}}},OpenLayers.Format.SLD.v1_0_0.prototype.readers["sld"])},OpenLayers.Format.SLD.v1_0_0.prototype.readers),writers:OpenLayers.Util.applyDefaults({"sld":OpenLayers.Util.applyDefaults({"Priority":function(priority){return this.writers.sld._OGCExpression.call(this,"sld:Priority",priority);},"VendorOption":function(option){return this.createElementNSPlus("sld:VendorOption",{attributes:{name:option.name},value:option.value});},"TextSymbolizer":function(symbolizer){var writers=OpenLayers.Format.SLD.v1_0_0.prototype.writers;var node=writers["sld"]["TextSymbolizer"].apply(this,arguments);if(symbolizer.graphic!==false&&(symbolizer.externalGraphic||symbolizer.graphicName)){this.writeNode("Graphic",symbolizer,node);}
+if("priority"in symbolizer){this.writeNode("Priority",symbolizer.priority,node);}
+return this.addVendorOptions(node,symbolizer);},"PointSymbolizer":function(symbolizer){var writers=OpenLayers.Format.SLD.v1_0_0.prototype.writers;var node=writers["sld"]["PointSymbolizer"].apply(this,arguments);return this.addVendorOptions(node,symbolizer);},"LineSymbolizer":function(symbolizer){var writers=OpenLayers.Format.SLD.v1_0_0.prototype.writers;var node=writers["sld"]["LineSymbolizer"].apply(this,arguments);return this.addVendorOptions(node,symbolizer);},"PolygonSymbolizer":function(symbolizer){var writers=OpenLayers.Format.SLD.v1_0_0.prototype.writers;var node=writers["sld"]["PolygonSymbolizer"].apply(this,arguments);return this.addVendorOptions(node,symbolizer);}},OpenLayers.Format.SLD.v1_0_0.prototype.writers["sld"])},OpenLayers.Format.SLD.v1_0_0.prototype.writers),addVendorOptions:function(node,symbolizer){var options=symbolizer.vendorOptions;if(options){for(var key in symbolizer.vendorOptions){this.writeNode("VendorOption",{name:key,value:symbolizer.vendorOptions[key]},node);}}
+return node;},CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0_GeoServer"});OpenLayers.Format.WFSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.WFSCapabilities.v1,{readers:{"wfs":OpenLayers.Util.applyDefaults({"Service":function(node,capabilities){capabilities.service={};this.readChildNodes(node,capabilities.service);},"Fees":function(node,service){var fees=this.getChildValue(node);if(fees&&fees.toLowerCase()!="none"){service.fees=fees;}},"AccessConstraints":function(node,service){var constraints=this.getChildValue(node);if(constraints&&constraints.toLowerCase()!="none"){service.accessConstraints=constraints;}},"OnlineResource":function(node,service){var onlineResource=this.getChildValue(node);if(onlineResource&&onlineResource.toLowerCase()!="none"){service.onlineResource=onlineResource;}},"Keywords":function(node,service){var keywords=this.getChildValue(node);if(keywords&&keywords.toLowerCase()!="none"){service.keywords=keywords.split(', ');}},"Capability":function(node,capabilities){capabilities.capability={};this.readChildNodes(node,capabilities.capability);},"Request":function(node,obj){obj.request={};this.readChildNodes(node,obj.request);},"GetFeature":function(node,request){request.getfeature={href:{},formats:[]};this.readChildNodes(node,request.getfeature);},"ResultFormat":function(node,obj){var children=node.childNodes;var childNode;for(var i=0;i<children.length;i++){childNode=children[i];if(childNode.nodeType==1){obj.formats.push(childNode.nodeName);}}},"DCPType":function(node,obj){this.readChildNodes(node,obj);},"HTTP":function(node,obj){this.readChildNodes(node,obj.href);},"Get":function(node,obj){obj.get=node.getAttribute("onlineResource");},"Post":function(node,obj){obj.post=node.getAttribute("onlineResource");},"SRS":function(node,obj){var srs=this.getChildValue(node);if(srs){obj.srs=srs;}}},OpenLayers.Format.WFSCapabilities.v1.prototype.readers["wfs"])},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1_0_0"});OpenLayers.Format.SOSGetObservation=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows",gml:"http://www.opengis.net/gml",sos:"http://www.opengis.net/sos/1.0",ogc:"http://www.opengis.net/ogc",om:"http://www.opengis.net/om/1.0",sa:"http://www.opengis.net/sampling/1.0",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd",defaultPrefix:"sos",read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var info={measurements:[],observations:[]};this.readNode(data,info);return info;},write:function(options){var node=this.writeNode("sos:GetObservation",options);node.setAttribute("xmlns:om",this.namespaces.om);node.setAttribute("xmlns:ogc",this.namespaces.ogc);this.setAttributeNS(node,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[node]);},readers:{"om":{"ObservationCollection":function(node,obj){obj.id=this.getAttributeNS(node,this.namespaces.gml,"id");this.readChildNodes(node,obj);},"member":function(node,observationCollection){this.readChildNodes(node,observationCollection);},"Measurement":function(node,observationCollection){var measurement={};observationCollection.measurements.push(measurement);this.readChildNodes(node,measurement);},"Observation":function(node,observationCollection){var observation={};observationCollection.observations.push(observation);this.readChildNodes(node,observation);},"samplingTime":function(node,measurement){var samplingTime={};measurement.samplingTime=samplingTime;this.readChildNodes(node,samplingTime);},"observedProperty":function(node,measurement){measurement.observedProperty=this.getAttributeNS(node,this.namespaces.xlink,"href");this.readChildNodes(node,measurement);},"procedure":function(node,measurement){measurement.procedure=this.getAttributeNS(node,this.namespaces.xlink,"href");this.readChildNodes(node,measurement);},"featureOfInterest":function(node,observation){var foi={features:[]};observation.fois=[];observation.fois.push(foi);this.readChildNodes(node,foi);var features=[];for(var i=0,len=foi.features.length;i<len;i++){var feature=foi.features[i];features.push(new OpenLayers.Feature.Vector(feature.components[0],feature.attributes));}
+foi.features=features;},"result":function(node,measurement){var result={};measurement.result=result;if(this.getChildValue(node)!==''){result.value=this.getChildValue(node);result.uom=node.getAttribute("uom");}else{this.readChildNodes(node,result);}}},"sa":OpenLayers.Format.SOSGetFeatureOfInterest.prototype.readers.sa,"gml":OpenLayers.Util.applyDefaults({"TimeInstant":function(node,samplingTime){var timeInstant={};samplingTime.timeInstant=timeInstant;this.readChildNodes(node,timeInstant);},"timePosition":function(node,timeInstant){timeInstant.timePosition=this.getChildValue(node);}},OpenLayers.Format.SOSGetFeatureOfInterest.prototype.readers.gml)},writers:{"sos":{"GetObservation":function(options){var node=this.createElementNSPlus("GetObservation",{attributes:{version:this.VERSION,service:'SOS'}});this.writeNode("offering",options,node);if(options.eventTime){this.writeNode("eventTime",options,node);}
+for(var procedure in options.procedures){this.writeNode("procedure",options.procedures[procedure],node);}
+for(var observedProperty in options.observedProperties){this.writeNode("observedProperty",options.observedProperties[observedProperty],node);}
+if(options.foi){this.writeNode("featureOfInterest",options.foi,node);}
+this.writeNode("responseFormat",options,node);if(options.resultModel){this.writeNode("resultModel",options,node);}
+if(options.responseMode){this.writeNode("responseMode",options,node);}
+return node;},"featureOfInterest":function(foi){var node=this.createElementNSPlus("featureOfInterest");this.writeNode("ObjectID",foi.objectId,node);return node;},"ObjectID":function(options){return this.createElementNSPlus("ObjectID",{value:options});},"responseFormat":function(options){return this.createElementNSPlus("responseFormat",{value:options.responseFormat});},"procedure":function(procedure){return this.createElementNSPlus("procedure",{value:procedure});},"offering":function(options){return this.createElementNSPlus("offering",{value:options.offering});},"observedProperty":function(observedProperty){return this.createElementNSPlus("observedProperty",{value:observedProperty});},"eventTime":function(options){var node=this.createElementNSPlus("eventTime");if(options.eventTime==='latest'){this.writeNode("ogc:TM_Equals",options,node);}
+return node;},"resultModel":function(options){return this.createElementNSPlus("resultModel",{value:options.resultModel});},"responseMode":function(options){return this.createElementNSPlus("responseMode",{value:options.responseMode});}},"ogc":{"TM_Equals":function(options){var node=this.createElementNSPlus("ogc:TM_Equals");this.writeNode("ogc:PropertyName",{property:"urn:ogc:data:time:iso8601"},node);if(options.eventTime==='latest'){this.writeNode("gml:TimeInstant",{value:'latest'},node);}
+return node;},"PropertyName":function(options){return this.createElementNSPlus("ogc:PropertyName",{value:options.property});}},"gml":{"TimeInstant":function(options){var node=this.createElementNSPlus("gml:TimeInstant");this.writeNode("gml:timePosition",options,node);return node;},"timePosition":function(options){var node=this.createElementNSPlus("gml:timePosition",{value:options.value});return node;}}},CLASS_NAME:"OpenLayers.Format.SOSGetObservation"});OpenLayers.Layer.Zoomify=OpenLayers.Class(OpenLayers.Layer.Grid,{size:null,isBaseLayer:true,standardTileSize:256,tileOriginCorner:"tl",numberOfTiers:0,tileCountUpToTier:null,tierSizeInTiles:null,tierImageSize:null,initialize:function(name,url,size,options){this.initializeZoomify(size);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[name,url,size,{},options]);},initializeZoomify:function(size){var imageSize=size.clone();var tiles=new OpenLayers.Size(Math.ceil(imageSize.w/this.standardTileSize),Math.ceil(imageSize.h/this.standardTileSize));this.tierSizeInTiles=[tiles];this.tierImageSize=[imageSize];while(imageSize.w>this.standardTileSize||imageSize.h>this.standardTileSize){imageSize=new OpenLayers.Size(Math.floor(imageSize.w/2),Math.floor(imageSize.h/2));tiles=new OpenLayers.Size(Math.ceil(imageSize.w/this.standardTileSize),Math.ceil(imageSize.h/this.standardTileSize));this.tierSizeInTiles.push(tiles);this.tierImageSize.push(imageSize);}
+this.tierSizeInTiles.reverse();this.tierImageSize.reverse();this.numberOfTiers=this.tierSizeInTiles.length;this.tileCountUpToTier=[0];for(var i=1;i<this.numberOfTiers;i++){this.tileCountUpToTier.push(this.tierSizeInTiles[i-1].w*this.tierSizeInTiles[i-1].h+
+this.tileCountUpToTier[i-1]);}},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments);this.tileCountUpToTier.length=0;this.tierSizeInTiles.length=0;this.tierImageSize.length=0;},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Zoomify(this.name,this.url,this.size,this.options);}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){bounds=this.adjustBounds(bounds);var res=this.map.getResolution();var x=Math.round((bounds.left-this.tileOrigin.lon)/(res*this.tileSize.w));var y=Math.round((this.tileOrigin.lat-bounds.top)/(res*this.tileSize.h));var z=this.map.getZoom();var tileIndex=x+y*this.tierSizeInTiles[z].w+this.tileCountUpToTier[z];var path="TileGroup"+Math.floor((tileIndex)/256)+"/"+z+"-"+x+"-"+y+".jpg";var url=this.url;if(OpenLayers.Util.isArray(url)){url=this.selectUrl(path,url);}
+return url+path;},getImageSize:function(){if(arguments.length>0){var bounds=this.adjustBounds(arguments[0]);var res=this.map.getResolution();var x=Math.round((bounds.left-this.tileOrigin.lon)/(res*this.tileSize.w));var y=Math.round((this.tileOrigin.lat-bounds.top)/(res*this.tileSize.h));var z=this.map.getZoom();var w=this.standardTileSize;var h=this.standardTileSize;if(x==this.tierSizeInTiles[z].w-1){var w=this.tierImageSize[z].w%this.standardTileSize;}
+if(y==this.tierSizeInTiles[z].h-1){var h=this.tierImageSize[z].h%this.standardTileSize;}
+return(new OpenLayers.Size(w,h));}else{return this.tileSize;}},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,this.map.maxExtent.top);},calculateGridLayout:function(bounds,origin,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left-origin.lon;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=origin.lon+tilecol*tilelon;var offsetlat=origin.lat-bounds.top+tilelat;var tilerow=Math.floor(offsetlat/tilelat)-this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=tilerowremain*this.tileSize.h;var tileoffsetlat=origin.lat-tilelat*tilerow;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},CLASS_NAME:"OpenLayers.Layer.Zoomify"});OpenLayers.Layer.WMTS=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,version:"1.0.0",requestEncoding:"KVP",url:null,layer:null,matrixSet:null,style:null,format:"image/jpeg",tileOrigin:null,tileFullExtent:null,formatSuffix:null,matrixIds:null,dimensions:null,params:null,zoomOffset:0,serverResolutions:null,formatSuffixMap:{"image/png":"png","image/png8":"png","image/png24":"png","image/png32":"png","png":"png","image/jpeg":"jpg","image/jpg":"jpg","jpeg":"jpg","jpg":"jpg"},matrix:null,initialize:function(config){var required={url:true,layer:true,style:true,matrixSet:true};for(var prop in required){if(!(prop in config)){throw new Error("Missing property '"+prop+"' in layer configuration.");}}
+config.params=OpenLayers.Util.upperCaseObject(config.params);var args=[config.name,config.url,config.params,config];OpenLayers.Layer.Grid.prototype.initialize.apply(this,args);if(!this.formatSuffix){this.formatSuffix=this.formatSuffixMap[this.format]||this.format.split("/").pop();}
+if(this.matrixIds){var len=this.matrixIds.length;if(len&&typeof this.matrixIds[0]==="string"){var ids=this.matrixIds;this.matrixIds=new Array(len);for(var i=0;i<len;++i){this.matrixIds[i]={identifier:ids[i]};}}}},setMap:function(){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);this.updateMatrixProperties();},updateMatrixProperties:function(){this.matrix=this.getMatrix();if(this.matrix){if(this.matrix.topLeftCorner){this.tileOrigin=this.matrix.topLeftCorner;}
+if(this.matrix.tileWidth&&this.matrix.tileHeight){this.tileSize=new OpenLayers.Size(this.matrix.tileWidth,this.matrix.tileHeight);}
+if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.top);}
+if(!this.tileFullExtent){this.tileFullExtent=this.maxExtent;}}},moveTo:function(bounds,zoomChanged,dragging){if(zoomChanged||!this.matrix){this.updateMatrixProperties();}
+return OpenLayers.Layer.Grid.prototype.moveTo.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.WMTS(this.options);}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getIdentifier:function(){return this.serverResolutions!=null?OpenLayers.Util.indexOf(this.serverResolutions,this.getServerResolution()):this.getServerZoom()+this.zoomOffset;},getMatrix:function(){var matrix;if(!this.matrixIds||this.matrixIds.length===0){matrix={identifier:this.getIdentifier()};}else{if("scaleDenominator"in this.matrixIds[0]){var denom=OpenLayers.METERS_PER_INCH*OpenLayers.INCHES_PER_UNIT[this.units]*this.getServerResolution()/0.28E-3;var diff=Number.POSITIVE_INFINITY;var delta;for(var i=0,ii=this.matrixIds.length;i<ii;++i){delta=Math.abs(1-(this.matrixIds[i].scaleDenominator/denom));if(delta<diff){diff=delta;matrix=this.matrixIds[i];}}}else{matrix=this.matrixIds[this.getIdentifier()];}}
+return matrix;},getTileInfo:function(loc){var res=this.getServerResolution();var fx=(loc.lon-this.tileOrigin.lon)/(res*this.tileSize.w);var fy=(this.tileOrigin.lat-loc.lat)/(res*this.tileSize.h);var col=Math.floor(fx);var row=Math.floor(fy);return{col:col,row:row,i:Math.floor((fx-col)*this.tileSize.w),j:Math.floor((fy-row)*this.tileSize.h)};},getURL:function(bounds){bounds=this.adjustBounds(bounds);var url="";if(!this.tileFullExtent||this.tileFullExtent.intersectsBounds(bounds)){var center=bounds.getCenterLonLat();var info=this.getTileInfo(center);var matrixId=this.matrix.identifier;var dimensions=this.dimensions,params;if(this.requestEncoding.toUpperCase()==="REST"){params=this.params;if(typeof this.url==="string"&&this.url.indexOf("{")!==-1){var template=this.url.replace(/\{/g,"${");var context={style:this.style,Style:this.style,TileMatrixSet:this.matrixSet,TileMatrix:this.matrix.identifier,TileRow:info.row,TileCol:info.col};if(dimensions){var dimension,i;for(i=dimensions.length-1;i>=0;--i){dimension=dimensions[i];context[dimension]=params[dimension.toUpperCase()];}}
+url=OpenLayers.String.format(template,context);}else{var path=this.version+"/"+this.layer+"/"+this.style+"/";if(dimensions){for(var i=0;i<dimensions.length;i++){if(params[dimensions[i]]){path=path+params[dimensions[i]]+"/";}}}
+path=path+this.matrixSet+"/"+this.matrix.identifier+"/"+info.row+"/"+info.col+"."+this.formatSuffix;if(OpenLayers.Util.isArray(this.url)){url=this.selectUrl(path,this.url);}else{url=this.url;}
+if(!url.match(/\/$/)){url=url+"/";}
+url=url+path;}}else if(this.requestEncoding.toUpperCase()==="KVP"){params={SERVICE:"WMTS",REQUEST:"GetTile",VERSION:this.version,LAYER:this.layer,STYLE:this.style,TILEMATRIXSET:this.matrixSet,TILEMATRIX:this.matrix.identifier,TILEROW:info.row,TILECOL:info.col,FORMAT:this.format};url=OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,[params]);}}
+return url;},mergeNewParams:function(newParams){if(this.requestEncoding.toUpperCase()==="KVP"){return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,[OpenLayers.Util.upperCaseObject(newParams)]);}},CLASS_NAME:"OpenLayers.Layer.WMTS"});OpenLayers.Layer.MapServer=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{mode:"map",map_imagetype:"png"},initialize:function(name,url,params,options){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS);if(options==null||options.isBaseLayer==null){this.isBaseLayer=((this.params.transparent!="true")&&(this.params.transparent!=true));}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.MapServer(this.name,this.url,this.params,this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){bounds=this.adjustBounds(bounds);var extent=[bounds.left,bounds.bottom,bounds.right,bounds.top];var imageSize=this.getImageSize();var url=this.getFullRequestString({mapext:extent,imgext:extent,map_size:[imageSize.w,imageSize.h],imgx:imageSize.w/2,imgy:imageSize.h/2,imgxy:[imageSize.w,imageSize.h]});return url;},getFullRequestString:function(newParams,altUrl){var url=(altUrl==null)?this.url:altUrl;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var paramsString=OpenLayers.Util.getParameterString(allParams);if(OpenLayers.Util.isArray(url)){url=this.selectUrl(paramsString,url);}
+var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}}
+paramsString=OpenLayers.Util.getParameterString(allParams);var requestString=url;paramsString=paramsString.replace(/,/g,"+");if(paramsString!=""){var lastServerChar=url.charAt(url.length-1);if((lastServerChar=="&")||(lastServerChar=="?")){requestString+=paramsString;}else{if(url.indexOf('?')==-1){requestString+='?'+paramsString;}else{requestString+='&'+paramsString;}}}
+return requestString;},CLASS_NAME:"OpenLayers.Layer.MapServer"});OpenLayers.Renderer.VML=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"urn:schemas-microsoft-com:vml",symbolCache:{},offset:null,initialize:function(containerID){if(!this.supported()){return;}
+if(!document.namespaces.olv){document.namespaces.add("olv",this.xmlns);var style=document.createStyleSheet();var shapes=['shape','rect','oval','fill','stroke','imagedata','group','textbox'];for(var i=0,len=shapes.length;i<len;i++){style.addRule('olv\\:'+shapes[i],"behavior: url(#default#VML); "+"position: absolute; display: inline-block;");}}
+OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);},supported:function(){return!!(document.namespaces);},setExtent:function(extent,resolutionChanged){var coordSysUnchanged=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var left=(extent.left/resolution)|0;var top=(extent.top/resolution-this.size.h)|0;if(resolutionChanged||!this.offset){this.offset={x:left,y:top};left=0;top=0;}else{left=left-this.offset.x;top=top-this.offset.y;}
+var org=(left-this.xOffset)+" "+top;this.root.coordorigin=org;var roots=[this.root,this.vectorRoot,this.textRoot];var root;for(var i=0,len=roots.length;i<len;++i){root=roots[i];var size=this.size.w+" "+this.size.h;root.coordsize=size;}
+this.root.style.flip="y";return coordSysUnchanged;},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);var roots=[this.rendererRoot,this.root,this.vectorRoot,this.textRoot];var w=this.size.w+"px";var h=this.size.h+"px";var root;for(var i=0,len=roots.length;i<len;++i){root=roots[i];root.style.width=w;root.style.height=h;}},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="olv:rect";}else if(this.isComplexSymbol(style.graphicName)){nodeType="olv:shape";}else{nodeType="olv:oval";}
+break;case"OpenLayers.Geometry.Rectangle":nodeType="olv:rect";break;case"OpenLayers.Geometry.LineString":case"OpenLayers.Geometry.LinearRing":case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":nodeType="olv:shape";break;default:break;}
+return nodeType;},setStyle:function(node,style,options,geometry){style=style||node._style;options=options||node._options;var fillColor=style.fillColor;if(node._geometryClass==="OpenLayers.Geometry.Point"){if(style.externalGraphic){options.isFilled=true;if(style.graphicTitle){node.title=style.graphicTitle;}
+var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var resolution=this.getResolution();var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);node.style.left=((((geometry.x-this.featureDx)/resolution-this.offset.x)+xOffset)|0)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)-(yOffset+height))|0)+"px";node.style.width=width+"px";node.style.height=height+"px";node.style.flip="y";fillColor="none";options.isStroked=false;}else if(this.isComplexSymbol(style.graphicName)){var cache=this.importSymbol(style.graphicName);node.path=cache.path;node.coordorigin=cache.left+","+cache.bottom;var size=cache.size;node.coordsize=size+","+size;this.drawCircle(node,geometry,style.pointRadius);node.style.flip="y";}else{this.drawCircle(node,geometry,style.pointRadius);}}
+if(options.isFilled){node.fillcolor=fillColor;}else{node.filled="false";}
+var fills=node.getElementsByTagName("fill");var fill=(fills.length==0)?null:fills[0];if(!options.isFilled){if(fill){node.removeChild(fill);}}else{if(!fill){fill=this.createNode('olv:fill',node.id+"_fill");}
+fill.opacity=style.fillOpacity;if(node._geometryClass==="OpenLayers.Geometry.Point"&&style.externalGraphic){if(style.graphicOpacity){fill.opacity=style.graphicOpacity;}
+fill.src=style.externalGraphic;fill.type="frame";if(!(style.graphicWidth&&style.graphicHeight)){fill.aspect="atmost";}}
+if(fill.parentNode!=node){node.appendChild(fill);}}
+var rotation=style.rotation;if((rotation!==undefined||node._rotation!==undefined)){node._rotation=rotation;if(style.externalGraphic){this.graphicRotate(node,xOffset,yOffset,style);fill.opacity=0;}else if(node._geometryClass==="OpenLayers.Geometry.Point"){node.style.rotation=rotation||0;}}
+var strokes=node.getElementsByTagName("stroke");var stroke=(strokes.length==0)?null:strokes[0];if(!options.isStroked){node.stroked=false;if(stroke){stroke.on=false;}}else{if(!stroke){stroke=this.createNode('olv:stroke',node.id+"_stroke");node.appendChild(stroke);}
+stroke.on=true;stroke.color=style.strokeColor;stroke.weight=style.strokeWidth+"px";stroke.opacity=style.strokeOpacity;stroke.endcap=style.strokeLinecap=='butt'?'flat':(style.strokeLinecap||'round');if(style.strokeDashstyle){stroke.dashstyle=this.dashStyle(style);}}
+if(style.cursor!="inherit"&&style.cursor!=null){node.style.cursor=style.cursor;}
+return node;},graphicRotate:function(node,xOffset,yOffset,style){var style=style||node._style;var rotation=style.rotation||0;var aspectRatio,size;if(!(style.graphicWidth&&style.graphicHeight)){var img=new Image();img.onreadystatechange=OpenLayers.Function.bind(function(){if(img.readyState=="complete"||img.readyState=="interactive"){aspectRatio=img.width/img.height;size=Math.max(style.pointRadius*2,style.graphicWidth||0,style.graphicHeight||0);xOffset=xOffset*aspectRatio;style.graphicWidth=size*aspectRatio;style.graphicHeight=size;this.graphicRotate(node,xOffset,yOffset,style);}},this);img.src=style.externalGraphic;return;}else{size=Math.max(style.graphicWidth,style.graphicHeight);aspectRatio=style.graphicWidth/style.graphicHeight;}
+var width=Math.round(style.graphicWidth||size*aspectRatio);var height=Math.round(style.graphicHeight||size);node.style.width=width+"px";node.style.height=height+"px";var image=document.getElementById(node.id+"_image");if(!image){image=this.createNode("olv:imagedata",node.id+"_image");node.appendChild(image);}
+image.style.width=width+"px";image.style.height=height+"px";image.src=style.externalGraphic;image.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader("+"src='', sizingMethod='scale')";var rot=rotation*Math.PI/180;var sintheta=Math.sin(rot);var costheta=Math.cos(rot);var filter="progid:DXImageTransform.Microsoft.Matrix(M11="+costheta+",M12="+(-sintheta)+",M21="+sintheta+",M22="+costheta+",SizingMethod='auto expand')\n";var opacity=style.graphicOpacity||style.fillOpacity;if(opacity&&opacity!=1){filter+="progid:DXImageTransform.Microsoft.BasicImage(opacity="+
+opacity+")\n";}
+node.style.filter=filter;var centerPoint=new OpenLayers.Geometry.Point(-xOffset,-yOffset);var imgBox=new OpenLayers.Bounds(0,0,width,height).toGeometry();imgBox.rotate(style.rotation,centerPoint);var imgBounds=imgBox.getBounds();node.style.left=Math.round(parseInt(node.style.left)+imgBounds.left)+"px";node.style.top=Math.round(parseInt(node.style.top)-imgBounds.bottom)+"px";},postDraw:function(node){node.style.visibility="visible";var fillColor=node._style.fillColor;var strokeColor=node._style.strokeColor;if(fillColor=="none"&&node.fillcolor!=fillColor){node.fillcolor=fillColor;}
+if(strokeColor=="none"&&node.strokecolor!=strokeColor){node.strokecolor=strokeColor;}},setNodeDimension:function(node,geometry){var bbox=geometry.getBounds();if(bbox){var resolution=this.getResolution();var scaledBox=new OpenLayers.Bounds(((bbox.left-this.featureDx)/resolution-this.offset.x)|0,(bbox.bottom/resolution-this.offset.y)|0,((bbox.right-this.featureDx)/resolution-this.offset.x)|0,(bbox.top/resolution-this.offset.y)|0);node.style.left=scaledBox.left+"px";node.style.top=scaledBox.top+"px";node.style.width=scaledBox.getWidth()+"px";node.style.height=scaledBox.getHeight()+"px";node.coordorigin=scaledBox.left+" "+scaledBox.top;node.coordsize=scaledBox.getWidth()+" "+scaledBox.getHeight();}},dashStyle:function(style){var dash=style.strokeDashstyle;switch(dash){case'solid':case'dot':case'dash':case'dashdot':case'longdash':case'longdashdot':return dash;default:var parts=dash.split(/[ ,]/);if(parts.length==2){if(1*parts[0]>=2*parts[1]){return"longdash";}
+return(parts[0]==1||parts[1]==1)?"dot":"dash";}else if(parts.length==4){return(1*parts[0]>=2*parts[1])?"longdashdot":"dashdot";}
+return"solid";}},createNode:function(type,id){var node=document.createElement(type);if(id){node.id=id;}
+node.unselectable='on';node.onselectstart=OpenLayers.Function.False;return node;},nodeTypeCompare:function(node,type){var subType=type;var splitIndex=subType.indexOf(":");if(splitIndex!=-1){subType=subType.substr(splitIndex+1);}
+var nodeName=node.nodeName;splitIndex=nodeName.indexOf(":");if(splitIndex!=-1){nodeName=nodeName.substr(splitIndex+1);}
+return(subType==nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_vmlRoot","div");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"olv:group");},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){if(!isNaN(geometry.x)&&!isNaN(geometry.y)){var resolution=this.getResolution();node.style.left=((((geometry.x-this.featureDx)/resolution-this.offset.x)|0)-radius)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)|0)-radius)+"px";var diameter=radius*2;node.style.width=diameter+"px";node.style.height=diameter+"px";return node;}
+return false;},drawLineString:function(node,geometry){return this.drawLine(node,geometry,false);},drawLinearRing:function(node,geometry){return this.drawLine(node,geometry,true);},drawLine:function(node,geometry,closeLine){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var numComponents=geometry.components.length;var parts=new Array(numComponents);var comp,x,y;for(var i=0;i<numComponents;i++){comp=geometry.components[i];x=((comp.x-this.featureDx)/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;parts[i]=" "+x+","+y+" l ";}
+var end=(closeLine)?" x e":" e";node.path="m"+parts.join("")+end;return node;},drawPolygon:function(node,geometry){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var path=[];var j,jj,points,area,first,second,i,ii,comp,pathComp,x,y;for(j=0,jj=geometry.components.length;j<jj;j++){path.push("m");points=geometry.components[j].components;area=(j===0);first=null;second=null;for(i=0,ii=points.length;i<ii;i++){comp=points[i];x=((comp.x-this.featureDx)/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;pathComp=" "+x+","+y;path.push(pathComp);if(i==0){path.push(" l");}
+if(!area){if(!first){first=pathComp;}else if(first!=pathComp){if(!second){second=pathComp;}else if(second!=pathComp){area=true;}}}}
+path.push(area?" x ":" ");}
+path.push("e");node.path=path.join("");return node;},drawRectangle:function(node,geometry){var resolution=this.getResolution();node.style.left=(((geometry.x-this.featureDx)/resolution-this.offset.x)|0)+"px";node.style.top=((geometry.y/resolution-this.offset.y)|0)+"px";node.style.width=((geometry.width/resolution)|0)+"px";node.style.height=((geometry.height/resolution)|0)+"px";return node;},drawText:function(featureId,style,location){var label=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX,"olv:rect");var textbox=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX+"_textbox","olv:textbox");var resolution=this.getResolution();label.style.left=(((location.x-this.featureDx)/resolution-this.offset.x)|0)+"px";label.style.top=((location.y/resolution-this.offset.y)|0)+"px";label.style.flip="y";textbox.innerText=style.label;if(style.cursor!="inherit"&&style.cursor!=null){textbox.style.cursor=style.cursor;}
+if(style.fontColor){textbox.style.color=style.fontColor;}
+if(style.fontOpacity){textbox.style.filter='alpha(opacity='+(style.fontOpacity*100)+')';}
+if(style.fontFamily){textbox.style.fontFamily=style.fontFamily;}
+if(style.fontSize){textbox.style.fontSize=style.fontSize;}
+if(style.fontWeight){textbox.style.fontWeight=style.fontWeight;}
+if(style.fontStyle){textbox.style.fontStyle=style.fontStyle;}
+if(style.labelSelect===true){label._featureId=featureId;textbox._featureId=featureId;textbox._geometry=location;textbox._geometryClass=location.CLASS_NAME;}
+textbox.style.whiteSpace="nowrap";textbox.inset="1px,0px,0px,0px";if(!label.parentNode){label.appendChild(textbox);this.textRoot.appendChild(label);}
+var align=style.labelAlign||"cm";if(align.length==1){align+="m";}
+var xshift=textbox.clientWidth*(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(0,1)]);var yshift=textbox.clientHeight*(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(1,1)]);label.style.left=parseInt(label.style.left)-xshift-1+"px";label.style.top=parseInt(label.style.top)+yshift+"px";},moveRoot:function(renderer){var layer=this.map.getLayer(renderer.container.id);if(layer instanceof OpenLayers.Layer.Vector.RootContainer){layer=this.map.getLayer(this.container.id);}
+layer&&layer.renderer.clear();OpenLayers.Renderer.Elements.prototype.moveRoot.apply(this,arguments);layer&&layer.redraw();},importSymbol:function(graphicName){var id=this.container.id+"-"+graphicName;var cache=this.symbolCache[id];if(cache){return cache;}
+var symbol=OpenLayers.Renderer.symbol[graphicName];if(!symbol){throw new Error(graphicName+' is not a valid symbol name');}
+var symbolExtent=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);var pathitems=["m"];for(var i=0;i<symbol.length;i=i+2){var x=symbol[i];var y=symbol[i+1];symbolExtent.left=Math.min(symbolExtent.left,x);symbolExtent.bottom=Math.min(symbolExtent.bottom,y);symbolExtent.right=Math.max(symbolExtent.right,x);symbolExtent.top=Math.max(symbolExtent.top,y);pathitems.push(x);pathitems.push(y);if(i==0){pathitems.push("l");}}
+pathitems.push("x e");var path=pathitems.join(" ");var diff=(symbolExtent.getWidth()-symbolExtent.getHeight())/2;if(diff>0){symbolExtent.bottom=symbolExtent.bottom-diff;symbolExtent.top=symbolExtent.top+diff;}else{symbolExtent.left=symbolExtent.left+diff;symbolExtent.right=symbolExtent.right-diff;}
+cache={path:path,size:symbolExtent.getWidth(),left:symbolExtent.left,bottom:symbolExtent.bottom};this.symbolCache[id]=cache;return cache;},CLASS_NAME:"OpenLayers.Renderer.VML"});OpenLayers.Renderer.VML.LABEL_SHIFT={"l":0,"c":.5,"r":1,"t":0,"m":.5,"b":1};OpenLayers.Control.CacheRead=OpenLayers.Class(OpenLayers.Control,{fetchEvent:"tileloadstart",layers:null,autoActivate:true,setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);var i,layers=this.layers||map.layers;for(i=layers.length-1;i>=0;--i){this.addLayer({layer:layers[i]});}
+if(!this.layers){map.events.on({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this});}},addLayer:function(evt){evt.layer.events.register(this.fetchEvent,this,this.fetch);},removeLayer:function(evt){evt.layer.events.unregister(this.fetchEvent,this,this.fetch);},fetch:function(evt){if(this.active&&window.localStorage&&evt.tile instanceof OpenLayers.Tile.Image){var tile=evt.tile,url=tile.url;if(!tile.layer.crossOriginKeyword&&OpenLayers.ProxyHost&&url.indexOf(OpenLayers.ProxyHost)===0){url=OpenLayers.Control.CacheWrite.urlMap[url];}
+var dataURI=window.localStorage.getItem("olCache_"+url);if(dataURI){tile.url=dataURI;if(evt.type==="tileerror"){tile.setImgSrc(dataURI);}}}},destroy:function(){if(this.layers||this.map){var i,layers=this.layers||this.map.layers;for(i=layers.length-1;i>=0;--i){this.removeLayer({layer:layers[i]});}}
+if(this.map){this.map.events.un({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this});}
+OpenLayers.Control.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.CacheRead"});OpenLayers.Strategy.Paging=OpenLayers.Class(OpenLayers.Strategy,{features:null,length:10,num:null,paging:false,activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){this.layer.events.on({"beforefeaturesadded":this.cacheFeatures,scope:this});}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.clearCache();this.layer.events.un({"beforefeaturesadded":this.cacheFeatures,scope:this});}
+return deactivated;},cacheFeatures:function(event){if(!this.paging){this.clearCache();this.features=event.features;this.pageNext(event);}},clearCache:function(){if(this.features){for(var i=0;i<this.features.length;++i){this.features[i].destroy();}}
+this.features=null;this.num=null;},pageCount:function(){var numFeatures=this.features?this.features.length:0;return Math.ceil(numFeatures/this.length);},pageNum:function(){return this.num;},pageLength:function(newLength){if(newLength&&newLength>0){this.length=newLength;}
+return this.length;},pageNext:function(event){var changed=false;if(this.features){if(this.num===null){this.num=-1;}
+var start=(this.num+1)*this.length;changed=this.page(start,event);}
+return changed;},pagePrevious:function(){var changed=false;if(this.features){if(this.num===null){this.num=this.pageCount();}
+var start=(this.num-1)*this.length;changed=this.page(start);}
+return changed;},page:function(start,event){var changed=false;if(this.features){if(start>=0&&start<this.features.length){var num=Math.floor(start/this.length);if(num!=this.num){this.paging=true;var features=this.features.slice(start,start+this.length);this.layer.removeFeatures(this.layer.features);this.num=num;if(event&&event.features){event.features=features;}else{this.layer.addFeatures(features);}
+this.paging=false;changed=true;}}}
+return changed;},CLASS_NAME:"OpenLayers.Strategy.Paging"});OpenLayers.Protocol.CSW.v2_0_2=OpenLayers.Class(OpenLayers.Protocol,{formatOptions:null,initialize:function(options){OpenLayers.Protocol.prototype.initialize.apply(this,[options]);if(!options.format){this.format=new OpenLayers.Format.CSWGetRecords.v2_0_2(OpenLayers.Util.extend({},this.formatOptions));}},destroy:function(){if(this.options&&!this.options.format){this.format.destroy();}
+this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){options=OpenLayers.Util.extend({},options);OpenLayers.Util.applyDefaults(options,this.options||{});var response=new OpenLayers.Protocol.Response({requestType:"read"});var data=this.format.write(options.params||options);response.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,response,options),params:options.params,headers:options.headers,data:data});return response;},handleRead:function(response,options){if(options.callback){var request=response.priv;if(request.status>=200&&request.status<300){response.data=this.parseData(request);response.code=OpenLayers.Protocol.Response.SUCCESS;}else{response.code=OpenLayers.Protocol.Response.FAILURE;}
+options.callback.call(options.scope,response);}},parseData:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
+if(!doc||doc.length<=0){return null;}
+return this.format.read(doc);},CLASS_NAME:"OpenLayers.Protocol.CSW.v2_0_2"});OpenLayers.Format.WMSCapabilities.v1_1=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1,{readers:{"wms":OpenLayers.Util.applyDefaults({"WMT_MS_Capabilities":function(node,obj){this.readChildNodes(node,obj);},"Keyword":function(node,obj){if(obj.keywords){obj.keywords.push(this.getChildValue(node));}},"DescribeLayer":function(node,obj){obj.describelayer={formats:[]};this.readChildNodes(node,obj.describelayer);},"GetLegendGraphic":function(node,obj){obj.getlegendgraphic={formats:[]};this.readChildNodes(node,obj.getlegendgraphic);},"GetStyles":function(node,obj){obj.getstyles={formats:[]};this.readChildNodes(node,obj.getstyles);},"PutStyles":function(node,obj){obj.putstyles={formats:[]};this.readChildNodes(node,obj.putstyles);},"UserDefinedSymbolization":function(node,obj){var userSymbols={supportSLD:parseInt(node.getAttribute("SupportSLD"))==1,userLayer:parseInt(node.getAttribute("UserLayer"))==1,userStyle:parseInt(node.getAttribute("UserStyle"))==1,remoteWFS:parseInt(node.getAttribute("RemoteWFS"))==1};obj.userSymbols=userSymbols;},"LatLonBoundingBox":function(node,obj){obj.llbbox=[parseFloat(node.getAttribute("minx")),parseFloat(node.getAttribute("miny")),parseFloat(node.getAttribute("maxx")),parseFloat(node.getAttribute("maxy"))];},"BoundingBox":function(node,obj){var bbox=OpenLayers.Format.WMSCapabilities.v1.prototype.readers["wms"].BoundingBox.apply(this,[node,obj]);bbox.srs=node.getAttribute("SRS");obj.bbox[bbox.srs]=bbox;},"ScaleHint":function(node,obj){var min=node.getAttribute("min");var max=node.getAttribute("max");var rad2=Math.pow(2,0.5);var ipm=OpenLayers.INCHES_PER_UNIT["m"];obj.maxScale=parseFloat(((min/rad2)*ipm*OpenLayers.DOTS_PER_INCH).toPrecision(13));obj.minScale=parseFloat(((max/rad2)*ipm*OpenLayers.DOTS_PER_INCH).toPrecision(13));},"Dimension":function(node,obj){var name=node.getAttribute("name").toLowerCase();var dim={name:name,units:node.getAttribute("units"),unitsymbol:node.getAttribute("unitSymbol")};obj.dimensions[dim.name]=dim;},"Extent":function(node,obj){var name=node.getAttribute("name").toLowerCase();if(name in obj["dimensions"]){var extent=obj.dimensions[name];extent.nearestVal=node.getAttribute("nearestValue")==="1";extent.multipleVal=node.getAttribute("multipleValues")==="1";extent.current=node.getAttribute("current")==="1";extent["default"]=node.getAttribute("default")||"";var values=this.getChildValue(node);extent.values=values.split(",");}}},OpenLayers.Format.WMSCapabilities.v1.prototype.readers["wms"])},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1"});OpenLayers.Control.Graticule=OpenLayers.Class(OpenLayers.Control,{autoActivate:true,intervals:[45,30,20,10,5,2,1,0.5,0.2,0.1,0.05,0.01,0.005,0.002,0.001],displayInLayerSwitcher:true,visible:true,numPoints:50,targetSize:200,layerName:null,labelled:true,labelFormat:'dm',lineSymbolizer:{strokeColor:"#333",strokeWidth:1,strokeOpacity:0.5},labelSymbolizer:{},gratLayer:null,initialize:function(options){options=options||{};options.layerName=options.layerName||OpenLayers.i18n("Graticule");OpenLayers.Control.prototype.initialize.apply(this,[options]);this.labelSymbolizer.stroke=false;this.labelSymbolizer.fill=false;this.labelSymbolizer.label="${label}";this.labelSymbolizer.labelAlign="${labelAlign}";this.labelSymbolizer.labelXOffset="${xOffset}";this.labelSymbolizer.labelYOffset="${yOffset}";},destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments);if(this.gratLayer){this.gratLayer.destroy();this.gratLayer=null;}},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.gratLayer){var gratStyle=new OpenLayers.Style({},{rules:[new OpenLayers.Rule({'symbolizer':{"Point":this.labelSymbolizer,"Line":this.lineSymbolizer}})]});this.gratLayer=new OpenLayers.Layer.Vector(this.layerName,{styleMap:new OpenLayers.StyleMap({'default':gratStyle}),visibility:this.visible,displayInLayerSwitcher:this.displayInLayerSwitcher});}
+return this.div;},activate:function(){if(OpenLayers.Control.prototype.activate.apply(this,arguments)){this.map.addLayer(this.gratLayer);this.map.events.register('moveend',this,this.update);this.update();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){this.map.events.unregister('moveend',this,this.update);this.map.removeLayer(this.gratLayer);return true;}else{return false;}},update:function(){var mapBounds=this.map.getExtent();if(!mapBounds){return;}
+this.gratLayer.destroyFeatures();var llProj=new OpenLayers.Projection("EPSG:4326");var mapProj=this.map.getProjectionObject();var mapRes=this.map.getResolution();if(mapProj.proj&&mapProj.proj.projName=="longlat"){this.numPoints=1;}
+var mapCenter=this.map.getCenter();var mapCenterLL=new OpenLayers.Pixel(mapCenter.lon,mapCenter.lat);OpenLayers.Projection.transform(mapCenterLL,mapProj,llProj);var testSq=this.targetSize*mapRes;testSq*=testSq;var llInterval;for(var i=0;i<this.intervals.length;++i){llInterval=this.intervals[i];var delta=llInterval/2;var p1=mapCenterLL.offset({x:-delta,y:-delta});var p2=mapCenterLL.offset({x:delta,y:delta});OpenLayers.Projection.transform(p1,llProj,mapProj);OpenLayers.Projection.transform(p2,llProj,mapProj);var distSq=(p1.x-p2.x)*(p1.x-p2.x)+(p1.y-p2.y)*(p1.y-p2.y);if(distSq<=testSq){break;}}
+mapCenterLL.x=Math.floor(mapCenterLL.x/llInterval)*llInterval;mapCenterLL.y=Math.floor(mapCenterLL.y/llInterval)*llInterval;var iter=0;var centerLonPoints=[mapCenterLL.clone()];var newPoint=mapCenterLL.clone();var mapXY;do{newPoint=newPoint.offset({x:0,y:llInterval});mapXY=OpenLayers.Projection.transform(newPoint.clone(),llProj,mapProj);centerLonPoints.unshift(newPoint);}while(mapBounds.containsPixel(mapXY)&&++iter<1000);newPoint=mapCenterLL.clone();do{newPoint=newPoint.offset({x:0,y:-llInterval});mapXY=OpenLayers.Projection.transform(newPoint.clone(),llProj,mapProj);centerLonPoints.push(newPoint);}while(mapBounds.containsPixel(mapXY)&&++iter<1000);iter=0;var centerLatPoints=[mapCenterLL.clone()];newPoint=mapCenterLL.clone();do{newPoint=newPoint.offset({x:-llInterval,y:0});mapXY=OpenLayers.Projection.transform(newPoint.clone(),llProj,mapProj);centerLatPoints.unshift(newPoint);}while(mapBounds.containsPixel(mapXY)&&++iter<1000);newPoint=mapCenterLL.clone();do{newPoint=newPoint.offset({x:llInterval,y:0});mapXY=OpenLayers.Projection.transform(newPoint.clone(),llProj,mapProj);centerLatPoints.push(newPoint);}while(mapBounds.containsPixel(mapXY)&&++iter<1000);var lines=[];for(var i=0;i<centerLatPoints.length;++i){var lon=centerLatPoints[i].x;var pointList=[];var labelPoint=null;var latEnd=Math.min(centerLonPoints[0].y,90);var latStart=Math.max(centerLonPoints[centerLonPoints.length-1].y,-90);var latDelta=(latEnd-latStart)/this.numPoints;var lat=latStart;for(var j=0;j<=this.numPoints;++j){var gridPoint=new OpenLayers.Geometry.Point(lon,lat);gridPoint.transform(llProj,mapProj);pointList.push(gridPoint);lat+=latDelta;if(gridPoint.y>=mapBounds.bottom&&!labelPoint){labelPoint=gridPoint;}}
+if(this.labelled){var labelPos=new OpenLayers.Geometry.Point(labelPoint.x,mapBounds.bottom);var labelAttrs={value:lon,label:this.labelled?OpenLayers.Util.getFormattedLonLat(lon,"lon",this.labelFormat):"",labelAlign:"cb",xOffset:0,yOffset:2};this.gratLayer.addFeatures(new OpenLayers.Feature.Vector(labelPos,labelAttrs));}
+var geom=new OpenLayers.Geometry.LineString(pointList);lines.push(new OpenLayers.Feature.Vector(geom));}
+for(var j=0;j<centerLonPoints.length;++j){lat=centerLonPoints[j].y;if(lat<-90||lat>90){continue;}
+var pointList=[];var lonStart=centerLatPoints[0].x;var lonEnd=centerLatPoints[centerLatPoints.length-1].x;var lonDelta=(lonEnd-lonStart)/this.numPoints;var lon=lonStart;var labelPoint=null;for(var i=0;i<=this.numPoints;++i){var gridPoint=new OpenLayers.Geometry.Point(lon,lat);gridPoint.transform(llProj,mapProj);pointList.push(gridPoint);lon+=lonDelta;if(gridPoint.x<mapBounds.right){labelPoint=gridPoint;}}
+if(this.labelled){var labelPos=new OpenLayers.Geometry.Point(mapBounds.right,labelPoint.y);var labelAttrs={value:lat,label:this.labelled?OpenLayers.Util.getFormattedLonLat(lat,"lat",this.labelFormat):"",labelAlign:"rb",xOffset:-2,yOffset:2};this.gratLayer.addFeatures(new OpenLayers.Feature.Vector(labelPos,labelAttrs));}
+var geom=new OpenLayers.Geometry.LineString(pointList);lines.push(new OpenLayers.Feature.Vector(geom));}
+this.gratLayer.addFeatures(lines);},CLASS_NAME:"OpenLayers.Control.Graticule"});OpenLayers.Layer.UTFGrid=OpenLayers.Class(OpenLayers.Layer.XYZ,{isBaseLayer:false,projection:new OpenLayers.Projection("EPSG:900913"),useJSONP:false,tileClass:OpenLayers.Tile.UTFGrid,initialize:function(options){OpenLayers.Layer.Grid.prototype.initialize.apply(this,[options.name,options.url,{},options]);this.tileOptions=OpenLayers.Util.extend({utfgridResolution:this.utfgridResolution},this.tileOptions);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.UTFGrid(this.getOptions());}
+obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getFeatureInfo:function(location){var info=null;var tileInfo=this.getTileData(location);if(tileInfo.tile){info=tileInfo.tile.getFeatureInfo(tileInfo.i,tileInfo.j);}
+return info;},getFeatureId:function(location){var id=null;var info=this.getTileData(location);if(info.tile){id=info.tile.getFeatureId(info.i,info.j);}
+return id;},CLASS_NAME:"OpenLayers.Layer.UTFGrid"});OpenLayers.Layer.ArcGISCache=OpenLayers.Class(OpenLayers.Layer.XYZ,{url:null,tileOrigin:null,tileSize:new OpenLayers.Size(256,256),useArcGISServer:true,type:'png',useScales:false,overrideDPI:false,initialize:function(name,url,options){OpenLayers.Layer.XYZ.prototype.initialize.apply(this,arguments);if(this.resolutions){this.serverResolutions=this.resolutions;this.maxExtent=this.getMaxExtentForResolution(this.resolutions[0]);}
+if(this.layerInfo){var info=this.layerInfo;var startingTileExtent=new OpenLayers.Bounds(info.fullExtent.xmin,info.fullExtent.ymin,info.fullExtent.xmax,info.fullExtent.ymax);this.projection='EPSG:'+info.spatialReference.wkid;this.sphericalMercator=(info.spatialReference.wkid==102100);this.units=(info.units=="esriFeet")?'ft':'m';if(!!info.tileInfo){this.tileSize=new OpenLayers.Size(info.tileInfo.width||info.tileInfo.cols,info.tileInfo.height||info.tileInfo.rows);this.tileOrigin=new OpenLayers.LonLat(info.tileInfo.origin.x,info.tileInfo.origin.y);var upperLeft=new OpenLayers.Geometry.Point(startingTileExtent.left,startingTileExtent.top);var bottomRight=new OpenLayers.Geometry.Point(startingTileExtent.right,startingTileExtent.bottom);if(this.useScales){this.scales=[];}else{this.resolutions=[];}
+this.lods=[];for(var key in info.tileInfo.lods){if(info.tileInfo.lods.hasOwnProperty(key)){var lod=info.tileInfo.lods[key];if(this.useScales){this.scales.push(lod.scale);}else{this.resolutions.push(lod.resolution);}
+var start=this.getContainingTileCoords(upperLeft,lod.resolution);lod.startTileCol=start.x;lod.startTileRow=start.y;var end=this.getContainingTileCoords(bottomRight,lod.resolution);lod.endTileCol=end.x;lod.endTileRow=end.y;this.lods.push(lod);}}
+this.maxExtent=this.calculateMaxExtentWithLOD(this.lods[0]);this.serverResolutions=this.resolutions;if(this.overrideDPI&&info.tileInfo.dpi){OpenLayers.DOTS_PER_INCH=info.tileInfo.dpi;}}}},getContainingTileCoords:function(point,res){return new OpenLayers.Pixel(Math.max(Math.floor((point.x-this.tileOrigin.lon)/(this.tileSize.w*res)),0),Math.max(Math.floor((this.tileOrigin.lat-point.y)/(this.tileSize.h*res)),0));},calculateMaxExtentWithLOD:function(lod){var numTileCols=(lod.endTileCol-lod.startTileCol)+1;var numTileRows=(lod.endTileRow-lod.startTileRow)+1;var minX=this.tileOrigin.lon+(lod.startTileCol*this.tileSize.w*lod.resolution);var maxX=minX+(numTileCols*this.tileSize.w*lod.resolution);var maxY=this.tileOrigin.lat-(lod.startTileRow*this.tileSize.h*lod.resolution);var minY=maxY-(numTileRows*this.tileSize.h*lod.resolution);return new OpenLayers.Bounds(minX,minY,maxX,maxY);},calculateMaxExtentWithExtent:function(extent,res){var upperLeft=new OpenLayers.Geometry.Point(extent.left,extent.top);var bottomRight=new OpenLayers.Geometry.Point(extent.right,extent.bottom);var start=this.getContainingTileCoords(upperLeft,res);var end=this.getContainingTileCoords(bottomRight,res);var lod={resolution:res,startTileCol:start.x,startTileRow:start.y,endTileCol:end.x,endTileRow:end.y};return this.calculateMaxExtentWithLOD(lod);},getUpperLeftTileCoord:function(res){var upperLeft=new OpenLayers.Geometry.Point(this.maxExtent.left,this.maxExtent.top);return this.getContainingTileCoords(upperLeft,res);},getLowerRightTileCoord:function(res){var bottomRight=new OpenLayers.Geometry.Point(this.maxExtent.right,this.maxExtent.bottom);return this.getContainingTileCoords(bottomRight,res);},getMaxExtentForResolution:function(res){var start=this.getUpperLeftTileCoord(res);var end=this.getLowerRightTileCoord(res);var numTileCols=(end.x-start.x)+1;var numTileRows=(end.y-start.y)+1;var minX=this.tileOrigin.lon+(start.x*this.tileSize.w*res);var maxX=minX+(numTileCols*this.tileSize.w*res);var maxY=this.tileOrigin.lat-(start.y*this.tileSize.h*res);var minY=maxY-(numTileRows*this.tileSize.h*res);return new OpenLayers.Bounds(minX,minY,maxX,maxY);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.ArcGISCache(this.name,this.url,this.options);}
+return OpenLayers.Layer.XYZ.prototype.clone.apply(this,[obj]);},getMaxExtent:function(){var resolution=this.map.getResolution();return this.maxExtent=this.getMaxExtentForResolution(resolution);},getTileOrigin:function(){var extent=this.getMaxExtent();return new OpenLayers.LonLat(extent.left,extent.bottom);},getURL:function(bounds){var res=this.getResolution();var originTileX=(this.tileOrigin.lon+(res*this.tileSize.w/2));var originTileY=(this.tileOrigin.lat-(res*this.tileSize.h/2));var center=bounds.getCenterLonLat();var point={x:center.lon,y:center.lat};var x=(Math.round(Math.abs((center.lon-originTileX)/(res*this.tileSize.w))));var y=(Math.round(Math.abs((originTileY-center.lat)/(res*this.tileSize.h))));var z=this.map.getZoom();if(this.lods){var lod=this.lods[this.map.getZoom()];if((x<lod.startTileCol||x>lod.endTileCol)||(y<lod.startTileRow||y>lod.endTileRow)){return null;}}
+else{var start=this.getUpperLeftTileCoord(res);var end=this.getLowerRightTileCoord(res);if((x<start.x||x>=end.x)||(y<start.y||y>=end.y)){return null;}}
+var url=this.url;var s=''+x+y+z;if(OpenLayers.Util.isArray(url)){url=this.selectUrl(s,url);}
+if(this.useArcGISServer){url=url+'/tile/${z}/${y}/${x}';}else{x='C'+this.zeroPad(x,8,16);y='R'+this.zeroPad(y,8,16);z='L'+this.zeroPad(z,2,16);url=url+'/${z}/${y}/${x}.'+this.type;}
+url=OpenLayers.String.format(url,{'x':x,'y':y,'z':z});return OpenLayers.Util.urlAppend(url,OpenLayers.Util.getParameterString(this.params));},zeroPad:function(num,len,radix){var str=num.toString(radix||10);while(str.length<len){str="0"+str;}
+return str;},CLASS_NAME:'OpenLayers.Layer.ArcGISCache'});OpenLayers.Control.WMSGetFeatureInfo=OpenLayers.Class(OpenLayers.Control,{hover:false,drillDown:false,maxFeatures:10,clickCallback:"click",output:"features",layers:null,queryVisible:false,url:null,layerUrls:null,infoFormat:'text/html',vendorParams:{},format:null,formatOptions:null,handler:null,hoverRequest:null,initialize:function(options){options=options||{};options.handlerOptions=options.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[options]);if(!this.format){this.format=new OpenLayers.Format.WMSGetFeatureInfo(options.formatOptions);}
+if(this.drillDown===true){this.hover=false;}
+if(this.hover){this.handler=new OpenLayers.Handler.Hover(this,{'move':this.cancelHover,'pause':this.getInfoForHover},OpenLayers.Util.extend(this.handlerOptions.hover||{},{'delay':250}));}else{var callbacks={};callbacks[this.clickCallback]=this.getInfoForClick;this.handler=new OpenLayers.Handler.Click(this,callbacks,this.handlerOptions.click||{});}},getInfoForClick:function(evt){this.events.triggerEvent("beforegetfeatureinfo",{xy:evt.xy});OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait");this.request(evt.xy,{});},getInfoForHover:function(evt){this.events.triggerEvent("beforegetfeatureinfo",{xy:evt.xy});this.request(evt.xy,{hover:true});},cancelHover:function(){if(this.hoverRequest){this.hoverRequest.abort();this.hoverRequest=null;}},findLayers:function(){var candidates=this.layers||this.map.layers;var layers=[];var layer,url;for(var i=candidates.length-1;i>=0;--i){layer=candidates[i];if(layer instanceof OpenLayers.Layer.WMS&&(!this.queryVisible||layer.getVisibility())){url=OpenLayers.Util.isArray(layer.url)?layer.url[0]:layer.url;if(this.drillDown===false&&!this.url){this.url=url;}
+if(this.drillDown===true||this.urlMatches(url)){layers.push(layer);}}}
+return layers;},urlMatches:function(url){var matches=OpenLayers.Util.isEquivalentUrl(this.url,url);if(!matches&&this.layerUrls){for(var i=0,len=this.layerUrls.length;i<len;++i){if(OpenLayers.Util.isEquivalentUrl(this.layerUrls[i],url)){matches=true;break;}}}
+return matches;},buildWMSOptions:function(url,layers,clickPosition,format){var layerNames=[],styleNames=[];for(var i=0,len=layers.length;i<len;i++){if(layers[i].params.LAYERS!=null){layerNames=layerNames.concat(layers[i].params.LAYERS);styleNames=styleNames.concat(this.getStyleNames(layers[i]));}}
+var firstLayer=layers[0];var projection=this.map.getProjection();var layerProj=firstLayer.projection;if(layerProj&&layerProj.equals(this.map.getProjectionObject())){projection=layerProj.getCode();}
+var params=OpenLayers.Util.extend({service:"WMS",version:firstLayer.params.VERSION,request:"GetFeatureInfo",exceptions:firstLayer.params.EXCEPTIONS,bbox:this.map.getExtent().toBBOX(null,firstLayer.reverseAxisOrder()),feature_count:this.maxFeatures,height:this.map.getSize().h,width:this.map.getSize().w,format:format,info_format:firstLayer.params.INFO_FORMAT||this.infoFormat},(parseFloat(firstLayer.params.VERSION)>=1.3)?{crs:projection,i:parseInt(clickPosition.x),j:parseInt(clickPosition.y)}:{srs:projection,x:parseInt(clickPosition.x),y:parseInt(clickPosition.y)});if(layerNames.length!=0){params=OpenLayers.Util.extend({layers:layerNames,query_layers:layerNames,styles:styleNames},params);}
+OpenLayers.Util.applyDefaults(params,this.vendorParams);return{url:url,params:OpenLayers.Util.upperCaseObject(params),callback:function(request){this.handleResponse(clickPosition,request,url);},scope:this};},getStyleNames:function(layer){var styleNames;if(layer.params.STYLES){styleNames=layer.params.STYLES;}else{if(OpenLayers.Util.isArray(layer.params.LAYERS)){styleNames=new Array(layer.params.LAYERS.length);}else{styleNames=layer.params.LAYERS.replace(/[^,]/g,"");}}
+return styleNames;},request:function(clickPosition,options){var layers=this.findLayers();if(layers.length==0){this.events.triggerEvent("nogetfeatureinfo");OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait");return;}
+options=options||{};if(this.drillDown===false){var wmsOptions=this.buildWMSOptions(this.url,layers,clickPosition,layers[0].params.FORMAT);var request=OpenLayers.Request.GET(wmsOptions);if(options.hover===true){this.hoverRequest=request;}}else{this._requestCount=0;this._numRequests=0;this.features=[];var services={},url;for(var i=0,len=layers.length;i<len;i++){var layer=layers[i];var service,found=false;url=OpenLayers.Util.isArray(layer.url)?layer.url[0]:layer.url;if(url in services){services[url].push(layer);}else{this._numRequests++;services[url]=[layer];}}
+var layers;for(var url in services){layers=services[url];var wmsOptions=this.buildWMSOptions(url,layers,clickPosition,layers[0].params.FORMAT);OpenLayers.Request.GET(wmsOptions);}}},triggerGetFeatureInfo:function(request,xy,features){this.events.triggerEvent("getfeatureinfo",{text:request.responseText,features:features,request:request,xy:xy});OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait");},handleResponse:function(xy,request,url){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;}
+var features=this.format.read(doc);if(this.drillDown===false){this.triggerGetFeatureInfo(request,xy,features);}else{this._requestCount++;if(this.output==="object"){this._features=(this._features||[]).concat({url:url,features:features});}else{this._features=(this._features||[]).concat(features);}
+if(this._requestCount===this._numRequests){this.triggerGetFeatureInfo(request,xy,this._features.concat());delete this._features;delete this._requestCount;delete this._numRequests;}}},CLASS_NAME:"OpenLayers.Control.WMSGetFeatureInfo"});OpenLayers.Format.WFS=OpenLayers.Class(OpenLayers.Format.GML,{layer:null,wfsns:"http://www.opengis.net/wfs",ogcns:"http://www.opengis.net/ogc",initialize:function(options,layer){OpenLayers.Format.GML.prototype.initialize.apply(this,[options]);this.layer=layer;if(this.layer.featureNS){this.featureNS=this.layer.featureNS;}
if(this.layer.options.geometry_column){this.geometryName=this.layer.options.geometry_column;}
if(this.layer.options.typename){this.featureName=this.layer.options.typename;}},write:function(features){var transaction=this.createElementNS(this.wfsns,'wfs:Transaction');transaction.setAttribute("version","1.0.0");transaction.setAttribute("service","WFS");for(var i=0;i<features.length;i++){switch(features[i].state){case OpenLayers.State.INSERT:transaction.appendChild(this.insert(features[i]));break;case OpenLayers.State.UPDATE:transaction.appendChild(this.update(features[i]));break;case OpenLayers.State.DELETE:transaction.appendChild(this.remove(features[i]));break;}}
return OpenLayers.Format.XML.prototype.write.apply(this,[transaction]);},createFeatureXML:function(feature){var geometryNode=this.buildGeometryNode(feature.geometry);var geomContainer=this.createElementNS(this.featureNS,"feature:"+this.geometryName);geomContainer.appendChild(geometryNode);var featureContainer=this.createElementNS(this.featureNS,"feature:"+this.featureName);featureContainer.appendChild(geomContainer);for(var attr in feature.attributes){var attrText=this.createTextNode(feature.attributes[attr]);var nodename=attr;if(attr.search(":")!=-1){nodename=attr.split(":")[1];}
var attrContainer=this.createElementNS(this.featureNS,"feature:"+nodename);attrContainer.appendChild(attrText);featureContainer.appendChild(attrContainer);}
-return featureContainer;},insert:function(feature){var insertNode=this.createElementNS(this.wfsns,'wfs:Insert');insertNode.appendChild(this.createFeatureXML(feature));return insertNode;},update:function(feature){if(!feature.fid){alert(OpenLayers.i18n("noFID"));}
-var updateNode=this.createElementNS(this.wfsns,'wfs:Update');updateNode.setAttribute("typeName",this.layerName);var propertyNode=this.createElementNS(this.wfsns,'wfs:Property');var nameNode=this.createElementNS(this.wfsns,'wfs:Name');var txtNode=this.createTextNode(this.geometryName);nameNode.appendChild(txtNode);propertyNode.appendChild(nameNode);var valueNode=this.createElementNS(this.wfsns,'wfs:Value');var geometryNode=this.buildGeometryNode(feature.geometry);if(feature.layer){geometryNode.setAttribute("srsName",feature.layer.projection.getCode());}
+return featureContainer;},insert:function(feature){var insertNode=this.createElementNS(this.wfsns,'wfs:Insert');insertNode.appendChild(this.createFeatureXML(feature));return insertNode;},update:function(feature){if(!feature.fid){OpenLayers.Console.userError(OpenLayers.i18n("noFID"));}
+var updateNode=this.createElementNS(this.wfsns,'wfs:Update');updateNode.setAttribute("typeName",this.featurePrefix+':'+this.featureName);updateNode.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);var propertyNode=this.createElementNS(this.wfsns,'wfs:Property');var nameNode=this.createElementNS(this.wfsns,'wfs:Name');var txtNode=this.createTextNode(this.geometryName);nameNode.appendChild(txtNode);propertyNode.appendChild(nameNode);var valueNode=this.createElementNS(this.wfsns,'wfs:Value');var geometryNode=this.buildGeometryNode(feature.geometry);if(feature.layer){geometryNode.setAttribute("srsName",feature.layer.projection.getCode());}
valueNode.appendChild(geometryNode);propertyNode.appendChild(valueNode);updateNode.appendChild(propertyNode);for(var propName in feature.attributes){propertyNode=this.createElementNS(this.wfsns,'wfs:Property');nameNode=this.createElementNS(this.wfsns,'wfs:Name');nameNode.appendChild(this.createTextNode(propName));propertyNode.appendChild(nameNode);valueNode=this.createElementNS(this.wfsns,'wfs:Value');valueNode.appendChild(this.createTextNode(feature.attributes[propName]));propertyNode.appendChild(valueNode);updateNode.appendChild(propertyNode);}
-var filterNode=this.createElementNS(this.ogcns,'ogc:Filter');var filterIdNode=this.createElementNS(this.ogcns,'ogc:FeatureId');filterIdNode.setAttribute("fid",feature.fid);filterNode.appendChild(filterIdNode);updateNode.appendChild(filterNode);return updateNode;},remove:function(feature){if(!feature.fid){alert(OpenLayers.i18n("noFID"));return false;}
-var deleteNode=this.createElementNS(this.wfsns,'wfs:Delete');deleteNode.setAttribute("typeName",this.layerName);var filterNode=this.createElementNS(this.ogcns,'ogc:Filter');var filterIdNode=this.createElementNS(this.ogcns,'ogc:FeatureId');filterIdNode.setAttribute("fid",feature.fid);filterNode.appendChild(filterIdNode);deleteNode.appendChild(filterNode);return deleteNode;},destroy:function(){this.layer=null;},CLASS_NAME:"OpenLayers.Format.WFS"});OpenLayers.Handler.Polygon=OpenLayers.Class(OpenLayers.Handler.Path,{polygon:null,initialize:function(control,callbacks,options){OpenLayers.Handler.Path.prototype.initialize.apply(this,arguments);},createFeature:function(){this.polygon=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon());this.line=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LinearRing());this.polygon.geometry.addComponent(this.line.geometry);this.point=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point());},destroyFeature:function(){OpenLayers.Handler.Path.prototype.destroyFeature.apply(this);if(this.polygon){this.polygon.destroy();}
-this.polygon=null;},modifyFeature:function(){var index=this.line.geometry.components.length-2;this.line.geometry.components[index].x=this.point.geometry.x;this.line.geometry.components[index].y=this.point.geometry.y;this.line.geometry.components[index].clearBounds();},drawFeature:function(){this.layer.drawFeature(this.polygon,this.style);this.layer.drawFeature(this.point,this.style);},geometryClone:function(){return this.polygon.geometry.clone();},dblclick:function(evt){if(!this.freehandMode(evt)){var index=this.line.geometry.components.length-2;this.line.geometry.removeComponent(this.line.geometry.components[index]);this.finalize();}
-return false;},CLASS_NAME:"OpenLayers.Handler.Polygon"});OpenLayers.Control.EditingToolbar=OpenLayers.Class(OpenLayers.Control.Panel,{initialize:function(layer,options){OpenLayers.Control.Panel.prototype.initialize.apply(this,[options]);this.addControls([new OpenLayers.Control.Navigation()]);var controls=[new OpenLayers.Control.DrawFeature(layer,OpenLayers.Handler.Point,{'displayClass':'olControlDrawFeaturePoint'}),new OpenLayers.Control.DrawFeature(layer,OpenLayers.Handler.Path,{'displayClass':'olControlDrawFeaturePath'}),new OpenLayers.Control.DrawFeature(layer,OpenLayers.Handler.Polygon,{'displayClass':'olControlDrawFeaturePolygon'})];for(var i=0;i<controls.length;i++){controls[i].featureAdded=function(feature){feature.state=OpenLayers.State.INSERT;};}
-this.addControls(controls);},draw:function(){var div=OpenLayers.Control.Panel.prototype.draw.apply(this,arguments);this.activateControl(this.controls[0]);return div;},CLASS_NAME:"OpenLayers.Control.EditingToolbar"});
+var filterNode=this.createElementNS(this.ogcns,'ogc:Filter');var filterIdNode=this.createElementNS(this.ogcns,'ogc:FeatureId');filterIdNode.setAttribute("fid",feature.fid);filterNode.appendChild(filterIdNode);updateNode.appendChild(filterNode);return updateNode;},remove:function(feature){if(!feature.fid){OpenLayers.Console.userError(OpenLayers.i18n("noFID"));return false;}
+var deleteNode=this.createElementNS(this.wfsns,'wfs:Delete');deleteNode.setAttribute("typeName",this.featurePrefix+':'+this.featureName);deleteNode.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);var filterNode=this.createElementNS(this.ogcns,'ogc:Filter');var filterIdNode=this.createElementNS(this.ogcns,'ogc:FeatureId');filterIdNode.setAttribute("fid",feature.fid);filterNode.appendChild(filterIdNode);deleteNode.appendChild(filterNode);return deleteNode;},destroy:function(){this.layer=null;},CLASS_NAME:"OpenLayers.Format.WFS"});OpenLayers.Control.UTFGrid=OpenLayers.Class(OpenLayers.Control,{autoActivate:true,layers:null,defaultHandlerOptions:{'delay':300,'pixelTolerance':4,'stopMove':false,'single':true,'double':false,'stopSingle':false,'stopDouble':false},handlerMode:'click',setHandler:function(hm){this.handlerMode=hm;this.resetHandler();},resetHandler:function(){if(this.handler){this.handler.deactivate();this.handler.destroy();this.handler=null;}
+if(this.handlerMode=='hover'){this.handler=new OpenLayers.Handler.Hover(this,{'pause':this.handleEvent,'move':this.reset},this.handlerOptions);}else if(this.handlerMode=='click'){this.handler=new OpenLayers.Handler.Click(this,{'click':this.handleEvent},this.handlerOptions);}else if(this.handlerMode=='move'){this.handler=new OpenLayers.Handler.Hover(this,{'pause':this.handleEvent,'move':this.handleEvent},this.handlerOptions);}
+if(this.handler){return true;}else{return false;}},initialize:function(options){options=options||{};options.handlerOptions=options.handlerOptions||this.defaultHandlerOptions;OpenLayers.Control.prototype.initialize.apply(this,[options]);this.resetHandler();},handleEvent:function(evt){if(evt==null){this.reset();return;}
+var lonLat=this.map.getLonLatFromPixel(evt.xy);if(!lonLat){return;}
+var layers=this.findLayers();if(layers.length>0){var infoLookup={};var layer,idx;for(var i=0,len=layers.length;i<len;i++){layer=layers[i];idx=OpenLayers.Util.indexOf(this.map.layers,layer);infoLookup[idx]=layer.getFeatureInfo(lonLat);}
+this.callback(infoLookup,lonLat,evt.xy);}},callback:function(infoLookup){},reset:function(evt){this.callback(null);},findLayers:function(){var candidates=this.layers||this.map.layers;var layers=[];var layer;for(var i=candidates.length-1;i>=0;--i){layer=candidates[i];if(layer instanceof OpenLayers.Layer.UTFGrid){layers.push(layer);}}
+return layers;},CLASS_NAME:"OpenLayers.Control.UTFGrid"});OpenLayers.Format.CQL=(function(){var tokens=["PROPERTY","COMPARISON","VALUE","LOGICAL"],patterns={PROPERTY:/^[_a-zA-Z]\w*/,COMPARISON:/^(=|<>|<=|<|>=|>|LIKE)/i,COMMA:/^,/,LOGICAL:/^(AND|OR)/i,VALUE:/^('\w+'|\d+(\.\d*)?|\.\d+)/,LPAREN:/^\(/,RPAREN:/^\)/,SPATIAL:/^(BBOX|INTERSECTS|DWITHIN|WITHIN|CONTAINS)/i,NOT:/^NOT/i,BETWEEN:/^BETWEEN/i,GEOMETRY:function(text){var type=/^(POINT|LINESTRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)/.exec(text);if(type){var len=text.length;var idx=text.indexOf("(",type[0].length);if(idx>-1){var depth=1;while(idx<len&&depth>0){idx++;switch(text.charAt(idx)){case'(':depth++;break;case')':depth--;break;default:}}}
+return[text.substr(0,idx+1)];}},END:/^$/},follows={LPAREN:['GEOMETRY','SPATIAL','PROPERTY','VALUE','LPAREN'],RPAREN:['NOT','LOGICAL','END','RPAREN'],PROPERTY:['COMPARISON','BETWEEN','COMMA'],BETWEEN:['VALUE'],COMPARISON:['VALUE'],COMMA:['GEOMETRY','VALUE','PROPERTY'],VALUE:['LOGICAL','COMMA','RPAREN','END'],SPATIAL:['LPAREN'],LOGICAL:['NOT','VALUE','SPATIAL','PROPERTY','LPAREN'],NOT:['PROPERTY','LPAREN'],GEOMETRY:['COMMA','RPAREN']},operators={'=':OpenLayers.Filter.Comparison.EQUAL_TO,'<>':OpenLayers.Filter.Comparison.NOT_EQUAL_TO,'<':OpenLayers.Filter.Comparison.LESS_THAN,'<=':OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO,'>':OpenLayers.Filter.Comparison.GREATER_THAN,'>=':OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO,'LIKE':OpenLayers.Filter.Comparison.LIKE,'BETWEEN':OpenLayers.Filter.Comparison.BETWEEN},operatorReverse={},logicals={'AND':OpenLayers.Filter.Logical.AND,'OR':OpenLayers.Filter.Logical.OR},logicalReverse={},precedence={'RPAREN':3,'LOGICAL':2,'COMPARISON':1};var i;for(i in operators){if(operators.hasOwnProperty(i)){operatorReverse[operators[i]]=i;}}
+for(i in logicals){if(logicals.hasOwnProperty(i)){logicalReverse[logicals[i]]=i;}}
+function tryToken(text,pattern){if(pattern instanceof RegExp){return pattern.exec(text);}else{return pattern(text);}}
+function nextToken(text,tokens){var i,token,len=tokens.length;for(i=0;i<len;i++){token=tokens[i];var pat=patterns[token];var matches=tryToken(text,pat);if(matches){var match=matches[0];var remainder=text.substr(match.length).replace(/^\s*/,"");return{type:token,text:match,remainder:remainder};}}
+var msg="ERROR: In parsing: ["+text+"], expected one of: ";for(i=0;i<len;i++){token=tokens[i];msg+="\n "+token+": "+patterns[token];}
+throw new Error(msg);}
+function tokenize(text){var results=[];var token,expect=["NOT","GEOMETRY","SPATIAL","PROPERTY","LPAREN"];do{token=nextToken(text,expect);text=token.remainder;expect=follows[token.type];if(token.type!="END"&&!expect){throw new Error("No follows list for "+token.type);}
+results.push(token);}while(token.type!="END");return results;}
+function buildAst(tokens){var operatorStack=[],postfix=[];while(tokens.length){var tok=tokens.shift();switch(tok.type){case"PROPERTY":case"GEOMETRY":case"VALUE":postfix.push(tok);break;case"COMPARISON":case"BETWEEN":case"LOGICAL":var p=precedence[tok.type];while(operatorStack.length>0&&(precedence[operatorStack[operatorStack.length-1].type]<=p)){postfix.push(operatorStack.pop());}
+operatorStack.push(tok);break;case"SPATIAL":case"NOT":case"LPAREN":operatorStack.push(tok);break;case"RPAREN":while(operatorStack.length>0&&(operatorStack[operatorStack.length-1].type!="LPAREN")){postfix.push(operatorStack.pop());}
+operatorStack.pop();if(operatorStack.length>0&&operatorStack[operatorStack.length-1].type=="SPATIAL"){postfix.push(operatorStack.pop());}
+case"COMMA":case"END":break;default:throw new Error("Unknown token type "+tok.type);}}
+while(operatorStack.length>0){postfix.push(operatorStack.pop());}
+function buildTree(){var tok=postfix.pop();switch(tok.type){case"LOGICAL":var rhs=buildTree(),lhs=buildTree();return new OpenLayers.Filter.Logical({filters:[lhs,rhs],type:logicals[tok.text.toUpperCase()]});case"NOT":var operand=buildTree();return new OpenLayers.Filter.Logical({filters:[operand],type:OpenLayers.Filter.Logical.NOT});case"BETWEEN":var min,max,property;postfix.pop();max=buildTree();min=buildTree();property=buildTree();return new OpenLayers.Filter.Comparison({property:property,lowerBoundary:min,upperBoundary:max,type:OpenLayers.Filter.Comparison.BETWEEN});case"COMPARISON":var value=buildTree(),property=buildTree();return new OpenLayers.Filter.Comparison({property:property,value:value,type:operators[tok.text.toUpperCase()]});case"VALUE":if((/^'.*'$/).test(tok.text)){return tok.text.substr(1,tok.text.length-2);}else{return Number(tok.text);}
+case"SPATIAL":switch(tok.text.toUpperCase()){case"BBOX":var maxy=buildTree(),maxx=buildTree(),miny=buildTree(),minx=buildTree(),prop=buildTree();return new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,property:prop,value:OpenLayers.Bounds.fromArray([minx,miny,maxx,maxy])});case"INTERSECTS":var value=buildTree(),property=buildTree();return new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:property,value:value});case"WITHIN":var value=buildTree(),property=buildTree();return new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.WITHIN,property:property,value:value});case"CONTAINS":var value=buildTree(),property=buildTree();return new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.CONTAINS,property:property,value:value});case"DWITHIN":var distance=buildTree(),value=buildTree(),property=buildTree();return new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,value:value,property:property,distance:Number(distance)});}
+case"GEOMETRY":return OpenLayers.Geometry.fromWKT(tok.text);default:return tok.text;}}
+var result=buildTree();if(postfix.length>0){var msg="Remaining tokens after building AST: \n";for(var i=postfix.length-1;i>=0;i--){msg+=postfix[i].type+": "+postfix[i].text+"\n";}
+throw new Error(msg);}
+return result;}
+return OpenLayers.Class(OpenLayers.Format,{read:function(text){var result=buildAst(tokenize(text));if(this.keepData){this.data=result;}
+return result;},write:function(filter){if(filter instanceof OpenLayers.Geometry){return filter.toString();}
+switch(filter.CLASS_NAME){case"OpenLayers.Filter.Spatial":switch(filter.type){case OpenLayers.Filter.Spatial.BBOX:return"BBOX("+
+filter.property+","+
+filter.value.toBBOX()+")";case OpenLayers.Filter.Spatial.DWITHIN:return"DWITHIN("+
+filter.property+", "+
+this.write(filter.value)+", "+
+filter.distance+")";case OpenLayers.Filter.Spatial.WITHIN:return"WITHIN("+
+filter.property+", "+
+this.write(filter.value)+")";case OpenLayers.Filter.Spatial.INTERSECTS:return"INTERSECTS("+
+filter.property+", "+
+this.write(filter.value)+")";case OpenLayers.Filter.Spatial.CONTAINS:return"CONTAINS("+
+filter.property+", "+
+this.write(filter.value)+")";default:throw new Error("Unknown spatial filter type: "+filter.type);}
+case"OpenLayers.Filter.Logical":if(filter.type==OpenLayers.Filter.Logical.NOT){return"NOT ("+this.write(filter.filters[0])+")";}else{var res="(";var first=true;for(var i=0;i<filter.filters.length;i++){if(first){first=false;}else{res+=") "+logicalReverse[filter.type]+" (";}
+res+=this.write(filter.filters[i]);}
+return res+")";}
+case"OpenLayers.Filter.Comparison":if(filter.type==OpenLayers.Filter.Comparison.BETWEEN){return filter.property+" BETWEEN "+
+this.write(filter.lowerBoundary)+" AND "+
+this.write(filter.upperBoundary);}else{return filter.property+" "+operatorReverse[filter.type]+" "+
+this.write(filter.value);}
+case undefined:if(typeof filter==="string"){return"'"+filter+"'";}else if(typeof filter==="number"){return String(filter);}
+default:throw new Error("Can't encode: "+filter.CLASS_NAME+" "+filter);}},CLASS_NAME:"OpenLayers.Format.CQL"});})();OpenLayers.Control.Split=OpenLayers.Class(OpenLayers.Control,{layer:null,source:null,sourceOptions:null,tolerance:null,edge:true,deferDelete:false,mutual:true,targetFilter:null,sourceFilter:null,handler:null,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.options=options||{};if(this.options.source){this.setSource(this.options.source);}},setSource:function(layer){if(this.active){this.deactivate();if(this.handler){this.handler.destroy();delete this.handler;}
+this.source=layer;this.activate();}else{this.source=layer;}},activate:function(){var activated=OpenLayers.Control.prototype.activate.call(this);if(activated){if(!this.source){if(!this.handler){this.handler=new OpenLayers.Handler.Path(this,{done:function(geometry){this.onSketchComplete({feature:new OpenLayers.Feature.Vector(geometry)});}},{layerOptions:this.sourceOptions});}
+this.handler.activate();}else if(this.source.events){this.source.events.on({sketchcomplete:this.onSketchComplete,afterfeaturemodified:this.afterFeatureModified,scope:this});}}
+return activated;},deactivate:function(){var deactivated=OpenLayers.Control.prototype.deactivate.call(this);if(deactivated){if(this.source&&this.source.events){this.layer.events.un({sketchcomplete:this.onSketchComplete,afterfeaturemodified:this.afterFeatureModified,scope:this});}}
+return deactivated;},onSketchComplete:function(event){this.feature=null;return!this.considerSplit(event.feature);},afterFeatureModified:function(event){if(event.modified){var feature=event.feature;if(typeof feature.geometry.split==="function"){this.feature=event.feature;this.considerSplit(event.feature);}}},removeByGeometry:function(features,geometry){for(var i=0,len=features.length;i<len;++i){if(features[i].geometry===geometry){features.splice(i,1);break;}}},isEligible:function(target){if(!target.geometry){return false;}else{return(target.state!==OpenLayers.State.DELETE)&&(typeof target.geometry.split==="function")&&(this.feature!==target)&&(!this.targetFilter||this.targetFilter.evaluate(target.attributes));}},considerSplit:function(feature){var sourceSplit=false;var targetSplit=false;if(!this.sourceFilter||this.sourceFilter.evaluate(feature.attributes)){var features=this.layer&&this.layer.features||[];var target,results,proceed;var additions=[],removals=[];var mutual=(this.layer===this.source)&&this.mutual;var options={edge:this.edge,tolerance:this.tolerance,mutual:mutual};var sourceParts=[feature.geometry];var targetFeature,targetParts;var source,parts;for(var i=0,len=features.length;i<len;++i){targetFeature=features[i];if(this.isEligible(targetFeature)){targetParts=[targetFeature.geometry];for(var j=0;j<sourceParts.length;++j){source=sourceParts[j];for(var k=0;k<targetParts.length;++k){target=targetParts[k];if(source.getBounds().intersectsBounds(target.getBounds())){results=source.split(target,options);if(results){proceed=this.events.triggerEvent("beforesplit",{source:feature,target:targetFeature});if(proceed!==false){if(mutual){parts=results[0];if(parts.length>1){parts.unshift(j,1);Array.prototype.splice.apply(sourceParts,parts);j+=parts.length-3;}
+results=results[1];}
+if(results.length>1){results.unshift(k,1);Array.prototype.splice.apply(targetParts,results);k+=results.length-3;}}}}}}
+if(targetParts&&targetParts.length>1){this.geomsToFeatures(targetFeature,targetParts);this.events.triggerEvent("split",{original:targetFeature,features:targetParts});Array.prototype.push.apply(additions,targetParts);removals.push(targetFeature);targetSplit=true;}}}
+if(sourceParts&&sourceParts.length>1){this.geomsToFeatures(feature,sourceParts);this.events.triggerEvent("split",{original:feature,features:sourceParts});Array.prototype.push.apply(additions,sourceParts);removals.push(feature);sourceSplit=true;}
+if(sourceSplit||targetSplit){if(this.deferDelete){var feat,destroys=[];for(var i=0,len=removals.length;i<len;++i){feat=removals[i];if(feat.state===OpenLayers.State.INSERT){destroys.push(feat);}else{feat.state=OpenLayers.State.DELETE;this.layer.drawFeature(feat);}}
+this.layer.destroyFeatures(destroys,{silent:true});for(var i=0,len=additions.length;i<len;++i){additions[i].state=OpenLayers.State.INSERT;}}else{this.layer.destroyFeatures(removals,{silent:true});}
+this.layer.addFeatures(additions,{silent:true});this.events.triggerEvent("aftersplit",{source:feature,features:additions});}}
+return sourceSplit;},geomsToFeatures:function(feature,geoms){var clone=feature.clone();delete clone.geometry;var newFeature;for(var i=0,len=geoms.length;i<len;++i){newFeature=clone.clone();newFeature.geometry=geoms[i];newFeature.state=OpenLayers.State.INSERT;geoms[i]=newFeature;}},destroy:function(){if(this.active){this.deactivate();}
+OpenLayers.Control.prototype.destroy.call(this);},CLASS_NAME:"OpenLayers.Control.Split"});OpenLayers.Layer.KaMapCache=OpenLayers.Class(OpenLayers.Layer.KaMap,{IMAGE_EXTENSIONS:{'jpeg':'jpg','gif':'gif','png':'png','png8':'png','png24':'png','dithered':'png'},DEFAULT_FORMAT:'jpeg',initialize:function(name,url,params,options){OpenLayers.Layer.KaMap.prototype.initialize.apply(this,arguments);this.extension=this.IMAGE_EXTENSIONS[this.params.i.toLowerCase()||this.DEFAULT_FORMAT];},getURL:function(bounds){bounds=this.adjustBounds(bounds);var mapRes=this.map.getResolution();var scale=Math.round((this.map.getScale()*10000))/10000;var pX=Math.round(bounds.left/mapRes);var pY=-Math.round(bounds.top/mapRes);var metaX=Math.floor(pX/this.tileSize.w/this.params.metaTileSize.w)*this.tileSize.w*this.params.metaTileSize.w;var metaY=Math.floor(pY/this.tileSize.h/this.params.metaTileSize.h)*this.tileSize.h*this.params.metaTileSize.h;var components=["/",this.params.map,"/",scale,"/",this.params.g.replace(/\s/g,'_'),"/def/t",metaY,"/l",metaX,"/t",pY,"l",pX,".",this.extension];var url=this.url;if(OpenLayers.Util.isArray(url)){url=this.selectUrl(components.join(''),url);}
+return url+components.join("");},CLASS_NAME:"OpenLayers.Layer.KaMapCache"});OpenLayers.Format.WMSCapabilities.v1_1_1=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1,{version:"1.1.1",readers:{"wms":OpenLayers.Util.applyDefaults({"SRS":function(node,obj){obj.srs[this.getChildValue(node)]=true;}},OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers["wms"])},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_1"});OpenLayers.Format.WMSCapabilities.v1_1_1_WMSC=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1_1,{version:"1.1.1",profile:"WMSC",readers:{"wms":OpenLayers.Util.applyDefaults({"VendorSpecificCapabilities":function(node,obj){obj.vendorSpecific={tileSets:[]};this.readChildNodes(node,obj.vendorSpecific);},"TileSet":function(node,vendorSpecific){var tileset={srs:{},bbox:{},resolutions:[]};this.readChildNodes(node,tileset);vendorSpecific.tileSets.push(tileset);},"Resolutions":function(node,tileset){var res=this.getChildValue(node).split(" ");for(var i=0,len=res.length;i<len;i++){if(res[i]!=""){tileset.resolutions.push(parseFloat(res[i]));}}},"Width":function(node,tileset){tileset.width=parseInt(this.getChildValue(node));},"Height":function(node,tileset){tileset.height=parseInt(this.getChildValue(node));},"Layers":function(node,tileset){tileset.layers=this.getChildValue(node);},"Styles":function(node,tileset){tileset.styles=this.getChildValue(node);}},OpenLayers.Format.WMSCapabilities.v1_1_1.prototype.readers["wms"])},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_1_WMSC"});OpenLayers.Format.WMSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1,{version:"1.1.0",readers:{"wms":OpenLayers.Util.applyDefaults({"SRS":function(node,obj){var srs=this.getChildValue(node);var values=srs.split(/ +/);for(var i=0,len=values.length;i<len;i++){obj.srs[values[i]]=true;}}},OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers["wms"])},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_0"});OpenLayers.Format.Atom=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{atom:"http://www.w3.org/2005/Atom",georss:"http://www.georss.org/georss"},feedTitle:"untitled",defaultEntryTitle:"untitled",gmlParser:null,xy:false,read:function(doc){if(typeof doc=="string"){doc=OpenLayers.Format.XML.prototype.read.apply(this,[doc]);}
+return this.parseFeatures(doc);},write:function(features){var doc;if(OpenLayers.Util.isArray(features)){doc=this.createElementNSPlus("atom:feed");doc.appendChild(this.createElementNSPlus("atom:title",{value:this.feedTitle}));for(var i=0,ii=features.length;i<ii;i++){doc.appendChild(this.buildEntryNode(features[i]));}}
+else{doc=this.buildEntryNode(features);}
+return OpenLayers.Format.XML.prototype.write.apply(this,[doc]);},buildContentNode:function(content){var node=this.createElementNSPlus("atom:content",{attributes:{type:content.type||null}});if(content.src){node.setAttribute("src",content.src);}else{if(content.type=="text"||content.type==null){node.appendChild(this.createTextNode(content.value));}else if(content.type=="html"){if(typeof content.value!="string"){throw"HTML content must be in form of an escaped string";}
+node.appendChild(this.createTextNode(content.value));}else if(content.type=="xhtml"){node.appendChild(content.value);}else if(content.type=="xhtml"||content.type.match(/(\+|\/)xml$/)){node.appendChild(content.value);}
+else{node.appendChild(this.createTextNode(content.value));}}
+return node;},buildEntryNode:function(feature){var attrib=feature.attributes;var atomAttrib=attrib.atom||{};var entryNode=this.createElementNSPlus("atom:entry");if(atomAttrib.authors){var authors=OpenLayers.Util.isArray(atomAttrib.authors)?atomAttrib.authors:[atomAttrib.authors];for(var i=0,ii=authors.length;i<ii;i++){entryNode.appendChild(this.buildPersonConstructNode("author",authors[i]));}}
+if(atomAttrib.categories){var categories=OpenLayers.Util.isArray(atomAttrib.categories)?atomAttrib.categories:[atomAttrib.categories];var category;for(var i=0,ii=categories.length;i<ii;i++){category=categories[i];entryNode.appendChild(this.createElementNSPlus("atom:category",{attributes:{term:category.term,scheme:category.scheme||null,label:category.label||null}}));}}
+if(atomAttrib.content){entryNode.appendChild(this.buildContentNode(atomAttrib.content));}
+if(atomAttrib.contributors){var contributors=OpenLayers.Util.isArray(atomAttrib.contributors)?atomAttrib.contributors:[atomAttrib.contributors];for(var i=0,ii=contributors.length;i<ii;i++){entryNode.appendChild(this.buildPersonConstructNode("contributor",contributors[i]));}}
+if(feature.fid){entryNode.appendChild(this.createElementNSPlus("atom:id",{value:feature.fid}));}
+if(atomAttrib.links){var links=OpenLayers.Util.isArray(atomAttrib.links)?atomAttrib.links:[atomAttrib.links];var link;for(var i=0,ii=links.length;i<ii;i++){link=links[i];entryNode.appendChild(this.createElementNSPlus("atom:link",{attributes:{href:link.href,rel:link.rel||null,type:link.type||null,hreflang:link.hreflang||null,title:link.title||null,length:link.length||null}}));}}
+if(atomAttrib.published){entryNode.appendChild(this.createElementNSPlus("atom:published",{value:atomAttrib.published}));}
+if(atomAttrib.rights){entryNode.appendChild(this.createElementNSPlus("atom:rights",{value:atomAttrib.rights}));}
+if(atomAttrib.summary||attrib.description){entryNode.appendChild(this.createElementNSPlus("atom:summary",{value:atomAttrib.summary||attrib.description}));}
+entryNode.appendChild(this.createElementNSPlus("atom:title",{value:atomAttrib.title||attrib.title||this.defaultEntryTitle}));if(atomAttrib.updated){entryNode.appendChild(this.createElementNSPlus("atom:updated",{value:atomAttrib.updated}));}
+if(feature.geometry){var whereNode=this.createElementNSPlus("georss:where");whereNode.appendChild(this.buildGeometryNode(feature.geometry));entryNode.appendChild(whereNode);}
+return entryNode;},initGmlParser:function(){this.gmlParser=new OpenLayers.Format.GML.v3({xy:this.xy,featureNS:"http://example.com#feature",internalProjection:this.internalProjection,externalProjection:this.externalProjection});},buildGeometryNode:function(geometry){if(!this.gmlParser){this.initGmlParser();}
+var node=this.gmlParser.writeNode("feature:_geometry",geometry);return node.firstChild;},buildPersonConstructNode:function(name,value){var oNames=["uri","email"];var personNode=this.createElementNSPlus("atom:"+name);personNode.appendChild(this.createElementNSPlus("atom:name",{value:value.name}));for(var i=0,ii=oNames.length;i<ii;i++){if(value[oNames[i]]){personNode.appendChild(this.createElementNSPlus("atom:"+oNames[i],{value:value[oNames[i]]}));}}
+return personNode;},getFirstChildValue:function(node,nsuri,name,def){var value;var nodes=this.getElementsByTagNameNS(node,nsuri,name);if(nodes&&nodes.length>0){value=this.getChildValue(nodes[0],def);}else{value=def;}
+return value;},parseFeature:function(node){var atomAttrib={};var value=null;var nodes=null;var attval=null;var atomns=this.namespaces.atom;this.parsePersonConstructs(node,"author",atomAttrib);nodes=this.getElementsByTagNameNS(node,atomns,"category");if(nodes.length>0){atomAttrib.categories=[];}
+for(var i=0,ii=nodes.length;i<ii;i++){value={};value.term=nodes[i].getAttribute("term");attval=nodes[i].getAttribute("scheme");if(attval){value.scheme=attval;}
+attval=nodes[i].getAttribute("label");if(attval){value.label=attval;}
+atomAttrib.categories.push(value);}
+nodes=this.getElementsByTagNameNS(node,atomns,"content");if(nodes.length>0){value={};attval=nodes[0].getAttribute("type");if(attval){value.type=attval;}
+attval=nodes[0].getAttribute("src");if(attval){value.src=attval;}else{if(value.type=="text"||value.type=="html"||value.type==null){value.value=this.getFirstChildValue(node,atomns,"content",null);}else if(value.type=="xhtml"||value.type.match(/(\+|\/)xml$/)){value.value=this.getChildEl(nodes[0]);}else{value.value=this.getFirstChildValue(node,atomns,"content",null);}
+atomAttrib.content=value;}}
+this.parsePersonConstructs(node,"contributor",atomAttrib);atomAttrib.id=this.getFirstChildValue(node,atomns,"id",null);nodes=this.getElementsByTagNameNS(node,atomns,"link");if(nodes.length>0){atomAttrib.links=new Array(nodes.length);}
+var oAtts=["rel","type","hreflang","title","length"];for(var i=0,ii=nodes.length;i<ii;i++){value={};value.href=nodes[i].getAttribute("href");for(var j=0,jj=oAtts.length;j<jj;j++){attval=nodes[i].getAttribute(oAtts[j]);if(attval){value[oAtts[j]]=attval;}}
+atomAttrib.links[i]=value;}
+value=this.getFirstChildValue(node,atomns,"published",null);if(value){atomAttrib.published=value;}
+value=this.getFirstChildValue(node,atomns,"rights",null);if(value){atomAttrib.rights=value;}
+value=this.getFirstChildValue(node,atomns,"summary",null);if(value){atomAttrib.summary=value;}
+atomAttrib.title=this.getFirstChildValue(node,atomns,"title",null);atomAttrib.updated=this.getFirstChildValue(node,atomns,"updated",null);var featureAttrib={title:atomAttrib.title,description:atomAttrib.summary,atom:atomAttrib};var geometry=this.parseLocations(node)[0];var feature=new OpenLayers.Feature.Vector(geometry,featureAttrib);feature.fid=atomAttrib.id;return feature;},parseFeatures:function(node){var features=[];var entries=this.getElementsByTagNameNS(node,this.namespaces.atom,"entry");if(entries.length==0){entries=[node];}
+for(var i=0,ii=entries.length;i<ii;i++){features.push(this.parseFeature(entries[i]));}
+return features;},parseLocations:function(node){var georssns=this.namespaces.georss;var locations={components:[]};var where=this.getElementsByTagNameNS(node,georssns,"where");if(where&&where.length>0){if(!this.gmlParser){this.initGmlParser();}
+for(var i=0,ii=where.length;i<ii;i++){this.gmlParser.readChildNodes(where[i],locations);}}
+var components=locations.components;var point=this.getElementsByTagNameNS(node,georssns,"point");if(point&&point.length>0){for(var i=0,ii=point.length;i<ii;i++){var xy=OpenLayers.String.trim(point[i].firstChild.nodeValue).split(/\s+/);if(xy.length!=2){xy=OpenLayers.String.trim(point[i].firstChild.nodeValue).split(/\s*,\s*/);}
+components.push(new OpenLayers.Geometry.Point(xy[1],xy[0]));}}
+var line=this.getElementsByTagNameNS(node,georssns,"line");if(line&&line.length>0){var coords;var p;var points;for(var i=0,ii=line.length;i<ii;i++){coords=OpenLayers.String.trim(line[i].firstChild.nodeValue).split(/\s+/);points=[];for(var j=0,jj=coords.length;j<jj;j+=2){p=new OpenLayers.Geometry.Point(coords[j+1],coords[j]);points.push(p);}
+components.push(new OpenLayers.Geometry.LineString(points));}}
+var polygon=this.getElementsByTagNameNS(node,georssns,"polygon");if(polygon&&polygon.length>0){var coords;var p;var points;for(var i=0,ii=polygon.length;i<ii;i++){coords=OpenLayers.String.trim(polygon[i].firstChild.nodeValue).split(/\s+/);points=[];for(var j=0,jj=coords.length;j<jj;j+=2){p=new OpenLayers.Geometry.Point(coords[j+1],coords[j]);points.push(p);}
+components.push(new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]));}}
+if(this.internalProjection&&this.externalProjection){for(var i=0,ii=components.length;i<ii;i++){if(components[i]){components[i].transform(this.externalProjection,this.internalProjection);}}}
+return components;},parsePersonConstructs:function(node,name,data){var persons=[];var atomns=this.namespaces.atom;var nodes=this.getElementsByTagNameNS(node,atomns,name);var oAtts=["uri","email"];for(var i=0,ii=nodes.length;i<ii;i++){var value={};value.name=this.getFirstChildValue(nodes[i],atomns,"name",null);for(var j=0,jj=oAtts.length;j<jj;j++){var attval=this.getFirstChildValue(nodes[i],atomns,oAtts[j],null);if(attval){value[oAtts[j]]=attval;}}
+persons.push(value);}
+if(persons.length>0){data[name+"s"]=persons;}},CLASS_NAME:"OpenLayers.Format.Atom"});OpenLayers.Control.LayerSwitcher=OpenLayers.Class(OpenLayers.Control,{roundedCorner:false,roundedCornerColor:"darkblue",layerStates:null,layersDiv:null,baseLayersDiv:null,baseLayers:null,dataLbl:null,dataLayersDiv:null,dataLayers:null,minimizeDiv:null,maximizeDiv:null,ascending:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.layerStates=[];if(this.roundedCorner){OpenLayers.Console.warn('roundedCorner option is deprecated');}},destroy:function(){this.clearLayersArray("base");this.clearLayersArray("data");this.map.events.un({buttonclick:this.onButtonClick,addlayer:this.redraw,changelayer:this.redraw,removelayer:this.redraw,changebaselayer:this.redraw,scope:this});this.events.unregister("buttonclick",this,this.onButtonClick);OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.on({addlayer:this.redraw,changelayer:this.redraw,removelayer:this.redraw,changebaselayer:this.redraw,scope:this});if(this.outsideViewport){this.events.attachToElement(this.div);this.events.register("buttonclick",this,this.onButtonClick);}else{this.map.events.register("buttonclick",this,this.onButtonClick);}},draw:function(){OpenLayers.Control.prototype.draw.apply(this);this.loadContents();if(!this.outsideViewport){this.minimizeControl();}
+this.redraw();return this.div;},onButtonClick:function(evt){var button=evt.buttonElement;if(button===this.minimizeDiv){this.minimizeControl();}else if(button===this.maximizeDiv){this.maximizeControl();}else if(button._layerSwitcher===this.id){if(button["for"]){button=document.getElementById(button["for"]);}
+if(!button.disabled){if(button.type=="radio"){button.checked=true;this.map.setBaseLayer(this.map.getLayer(button._layer));}else{button.checked=!button.checked;this.updateMap();}}}},clearLayersArray:function(layersType){this[layersType+"LayersDiv"].innerHTML="";this[layersType+"Layers"]=[];},checkRedraw:function(){var redraw=false;if(!this.layerStates.length||(this.map.layers.length!=this.layerStates.length)){redraw=true;}else{for(var i=0,len=this.layerStates.length;i<len;i++){var layerState=this.layerStates[i];var layer=this.map.layers[i];if((layerState.name!=layer.name)||(layerState.inRange!=layer.inRange)||(layerState.id!=layer.id)||(layerState.visibility!=layer.visibility)){redraw=true;break;}}}
+return redraw;},redraw:function(){if(!this.checkRedraw()){return this.div;}
+this.clearLayersArray("base");this.clearLayersArray("data");var containsOverlays=false;var containsBaseLayers=false;var len=this.map.layers.length;this.layerStates=new Array(len);for(var i=0;i<len;i++){var layer=this.map.layers[i];this.layerStates[i]={'name':layer.name,'visibility':layer.visibility,'inRange':layer.inRange,'id':layer.id};}
+var layers=this.map.layers.slice();if(!this.ascending){layers.reverse();}
+for(var i=0,len=layers.length;i<len;i++){var layer=layers[i];var baseLayer=layer.isBaseLayer;if(layer.displayInLayerSwitcher){if(baseLayer){containsBaseLayers=true;}else{containsOverlays=true;}
+var checked=(baseLayer)?(layer==this.map.baseLayer):layer.getVisibility();var inputElem=document.createElement("input");inputElem.id=this.id+"_input_"+layer.name;inputElem.name=(baseLayer)?this.id+"_baseLayers":layer.name;inputElem.type=(baseLayer)?"radio":"checkbox";inputElem.value=layer.name;inputElem.checked=checked;inputElem.defaultChecked=checked;inputElem.className="olButton";inputElem._layer=layer.id;inputElem._layerSwitcher=this.id;if(!baseLayer&&!layer.inRange){inputElem.disabled=true;}
+var labelSpan=document.createElement("label");labelSpan["for"]=inputElem.id;OpenLayers.Element.addClass(labelSpan,"labelSpan olButton");labelSpan._layer=layer.id;labelSpan._layerSwitcher=this.id;if(!baseLayer&&!layer.inRange){labelSpan.style.color="gray";}
+labelSpan.innerHTML=layer.name;labelSpan.style.verticalAlign=(baseLayer)?"bottom":"baseline";var br=document.createElement("br");var groupArray=(baseLayer)?this.baseLayers:this.dataLayers;groupArray.push({'layer':layer,'inputElem':inputElem,'labelSpan':labelSpan});var groupDiv=(baseLayer)?this.baseLayersDiv:this.dataLayersDiv;groupDiv.appendChild(inputElem);groupDiv.appendChild(labelSpan);groupDiv.appendChild(br);}}
+this.dataLbl.style.display=(containsOverlays)?"":"none";this.baseLbl.style.display=(containsBaseLayers)?"":"none";return this.div;},updateMap:function(){for(var i=0,len=this.baseLayers.length;i<len;i++){var layerEntry=this.baseLayers[i];if(layerEntry.inputElem.checked){this.map.setBaseLayer(layerEntry.layer,false);}}
+for(var i=0,len=this.dataLayers.length;i<len;i++){var layerEntry=this.dataLayers[i];layerEntry.layer.setVisibility(layerEntry.inputElem.checked);}},maximizeControl:function(e){this.div.style.width="";this.div.style.height="";this.showControls(false);if(e!=null){OpenLayers.Event.stop(e);}},minimizeControl:function(e){this.div.style.width="0px";this.div.style.height="0px";this.showControls(true);if(e!=null){OpenLayers.Event.stop(e);}},showControls:function(minimize){this.maximizeDiv.style.display=minimize?"":"none";this.minimizeDiv.style.display=minimize?"none":"";this.layersDiv.style.display=minimize?"none":"";},loadContents:function(){this.layersDiv=document.createElement("div");this.layersDiv.id=this.id+"_layersDiv";OpenLayers.Element.addClass(this.layersDiv,"layersDiv");this.baseLbl=document.createElement("div");this.baseLbl.innerHTML=OpenLayers.i18n("Base Layer");OpenLayers.Element.addClass(this.baseLbl,"baseLbl");this.baseLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.baseLayersDiv,"baseLayersDiv");this.dataLbl=document.createElement("div");this.dataLbl.innerHTML=OpenLayers.i18n("Overlays");OpenLayers.Element.addClass(this.dataLbl,"dataLbl");this.dataLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.dataLayersDiv,"dataLayersDiv");if(this.ascending){this.layersDiv.appendChild(this.baseLbl);this.layersDiv.appendChild(this.baseLayersDiv);this.layersDiv.appendChild(this.dataLbl);this.layersDiv.appendChild(this.dataLayersDiv);}else{this.layersDiv.appendChild(this.dataLbl);this.layersDiv.appendChild(this.dataLayersDiv);this.layersDiv.appendChild(this.baseLbl);this.layersDiv.appendChild(this.baseLayersDiv);}
+this.div.appendChild(this.layersDiv);if(this.roundedCorner){OpenLayers.Rico.Corner.round(this.div,{corners:"tl bl",bgColor:"transparent",color:this.roundedCornerColor,blend:false});OpenLayers.Rico.Corner.changeOpacity(this.layersDiv,0.75);}
+var img=OpenLayers.Util.getImageLocation('layer-switcher-maximize.png');this.maximizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MaximizeDiv",null,null,img,"absolute");OpenLayers.Element.addClass(this.maximizeDiv,"maximizeDiv olButton");this.maximizeDiv.style.display="none";this.div.appendChild(this.maximizeDiv);var img=OpenLayers.Util.getImageLocation('layer-switcher-minimize.png');this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MinimizeDiv",null,null,img,"absolute");OpenLayers.Element.addClass(this.minimizeDiv,"minimizeDiv olButton");this.minimizeDiv.style.display="none";this.div.appendChild(this.minimizeDiv);},CLASS_NAME:"OpenLayers.Control.LayerSwitcher"});OpenLayers.Tile.Image.IFrame={useIFrame:null,draw:function(){var draw=OpenLayers.Tile.Image.prototype.shouldDraw.call(this);if(draw){var url=this.layer.getURL(this.bounds);var usedIFrame=this.useIFrame;this.useIFrame=this.maxGetUrlLength!==null&&!this.layer.async&&url.length>this.maxGetUrlLength;var fromIFrame=usedIFrame&&!this.useIFrame;var toIFrame=!usedIFrame&&this.useIFrame;if(fromIFrame||toIFrame){if(this.imgDiv&&this.imgDiv.parentNode===this.frame){this.frame.removeChild(this.imgDiv);}
+this.imgDiv=null;if(fromIFrame){this.blankImageUrl=this._blankImageUrl;this.frame.removeChild(this.frame.firstChild);}else{this._blankImageUrl=this.blankImageUrl;this.blankImageUrl="about:blank";}}}
+return OpenLayers.Tile.Image.prototype.draw.apply(this,arguments);},getImage:function(){if(this.useIFrame===true){if(!this.frame.childNodes.length){var eventPane=document.createElement("div"),style=eventPane.style;style.position="absolute";style.width="100%";style.height="100%";style.zIndex=1;style.backgroundImage="url("+this._blankImageUrl+")";this.frame.appendChild(eventPane);}
+var id=this.id+'_iFrame',iframe;if(parseFloat(navigator.appVersion.split("MSIE")[1])<9){iframe=document.createElement('<iframe name="'+id+'">');iframe.style.backgroundColor='#FFFFFF';iframe.style.filter='chroma(color=#FFFFFF)';}
+else{iframe=document.createElement('iframe');iframe.style.backgroundColor='transparent';iframe.name=id;}
+iframe.scrolling='no';iframe.marginWidth='0px';iframe.marginHeight='0px';iframe.frameBorder='0';iframe.style.position="absolute";iframe.style.width="100%";iframe.style.height="100%";if(this.layer.opacity<1){OpenLayers.Util.modifyDOMElement(iframe,null,null,null,null,null,null,this.layer.opacity);}
+this.frame.appendChild(iframe);this.imgDiv=iframe;return iframe;}else{return OpenLayers.Tile.Image.prototype.getImage.apply(this,arguments);}},createRequestForm:function(){var form=document.createElement('form');form.method='POST';var cacheId=this.layer.params["_OLSALT"];cacheId=(cacheId?cacheId+"_":"")+this.bounds.toBBOX();form.action=OpenLayers.Util.urlAppend(this.layer.url,cacheId);form.target=this.id+'_iFrame';var imageSize=this.layer.getImageSize(),params=OpenLayers.Util.getParameters(this.url),field;for(var par in params){field=document.createElement('input');field.type='hidden';field.name=par;field.value=params[par];form.appendChild(field);}
+return form;},setImgSrc:function(url){if(this.useIFrame===true){if(url){var form=this.createRequestForm();this.frame.appendChild(form);form.submit();this.frame.removeChild(form);}else if(this.imgDiv.parentNode===this.frame){this.frame.removeChild(this.imgDiv);this.imgDiv=null;}}else{OpenLayers.Tile.Image.prototype.setImgSrc.apply(this,arguments);}},onImageLoad:function(){OpenLayers.Tile.Image.prototype.onImageLoad.apply(this,arguments);if(this.useIFrame===true){this.imgDiv.style.opacity=1;this.frame.style.opacity=this.layer.opacity;}},createBackBuffer:function(){var backBuffer;if(this.useIFrame===false){backBuffer=OpenLayers.Tile.Image.prototype.createBackBuffer.call(this);}
+return backBuffer;}};OpenLayers.Control.KeyboardDefaults=OpenLayers.Class(OpenLayers.Control,{autoActivate:true,slideFactor:75,observeElement:null,draw:function(){var observeElement=this.observeElement||document;this.handler=new OpenLayers.Handler.Keyboard(this,{"keydown":this.defaultKeyPress},{observeElement:observeElement});},defaultKeyPress:function(evt){var size,handled=true;switch(evt.keyCode){case OpenLayers.Event.KEY_LEFT:this.map.pan(-this.slideFactor,0);break;case OpenLayers.Event.KEY_RIGHT:this.map.pan(this.slideFactor,0);break;case OpenLayers.Event.KEY_UP:this.map.pan(0,-this.slideFactor);break;case OpenLayers.Event.KEY_DOWN:this.map.pan(0,this.slideFactor);break;case 33:size=this.map.getSize();this.map.pan(0,-0.75*size.h);break;case 34:size=this.map.getSize();this.map.pan(0,0.75*size.h);break;case 35:size=this.map.getSize();this.map.pan(0.75*size.w,0);break;case 36:size=this.map.getSize();this.map.pan(-0.75*size.w,0);break;case 43:case 61:case 187:case 107:this.map.zoomIn();break;case 45:case 109:case 189:case 95:this.map.zoomOut();break;default:handled=false;}
+if(handled){OpenLayers.Event.stop(evt);}},CLASS_NAME:"OpenLayers.Control.KeyboardDefaults"});OpenLayers.Format.WMTSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1_1_0,{version:"1.0.0",namespaces:{ows:"http://www.opengis.net/ows/1.1",wmts:"http://www.opengis.net/wmts/1.0",xlink:"http://www.w3.org/1999/xlink"},yx:null,defaultPrefix:"wmts",initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);this.options=options;var yx=OpenLayers.Util.extend({},OpenLayers.Format.WMTSCapabilities.prototype.yx);this.yx=OpenLayers.Util.extend(yx,this.yx);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);}
+if(data&&data.nodeType==9){data=data.documentElement;}
+var capabilities={};this.readNode(data,capabilities);capabilities.version=this.version;return capabilities;},readers:{"wmts":{"Capabilities":function(node,obj){this.readChildNodes(node,obj);},"Contents":function(node,obj){obj.contents={};obj.contents.layers=[];obj.contents.tileMatrixSets={};this.readChildNodes(node,obj.contents);},"Layer":function(node,obj){var layer={styles:[],formats:[],dimensions:[],tileMatrixSetLinks:[]};layer.layers=[];this.readChildNodes(node,layer);obj.layers.push(layer);},"Style":function(node,obj){var style={};style.isDefault=(node.getAttribute("isDefault")==="true");this.readChildNodes(node,style);obj.styles.push(style);},"Format":function(node,obj){obj.formats.push(this.getChildValue(node));},"TileMatrixSetLink":function(node,obj){var tileMatrixSetLink={};this.readChildNodes(node,tileMatrixSetLink);obj.tileMatrixSetLinks.push(tileMatrixSetLink);},"TileMatrixSet":function(node,obj){if(obj.layers){var tileMatrixSet={matrixIds:[]};this.readChildNodes(node,tileMatrixSet);obj.tileMatrixSets[tileMatrixSet.identifier]=tileMatrixSet;}else{obj.tileMatrixSet=this.getChildValue(node);}},"TileMatrix":function(node,obj){var tileMatrix={supportedCRS:obj.supportedCRS};this.readChildNodes(node,tileMatrix);obj.matrixIds.push(tileMatrix);},"ScaleDenominator":function(node,obj){obj.scaleDenominator=parseFloat(this.getChildValue(node));},"TopLeftCorner":function(node,obj){var topLeftCorner=this.getChildValue(node);var coords=topLeftCorner.split(" ");var yx;if(obj.supportedCRS){var crs=obj.supportedCRS.replace(/urn:ogc:def:crs:(\w+):.+:(\w+)$/,"urn:ogc:def:crs:$1::$2");yx=!!this.yx[crs];}
+if(yx){obj.topLeftCorner=new OpenLayers.LonLat(coords[1],coords[0]);}else{obj.topLeftCorner=new OpenLayers.LonLat(coords[0],coords[1]);}},"TileWidth":function(node,obj){obj.tileWidth=parseInt(this.getChildValue(node));},"TileHeight":function(node,obj){obj.tileHeight=parseInt(this.getChildValue(node));},"MatrixWidth":function(node,obj){obj.matrixWidth=parseInt(this.getChildValue(node));},"MatrixHeight":function(node,obj){obj.matrixHeight=parseInt(this.getChildValue(node));},"ResourceURL":function(node,obj){obj.resourceUrl=obj.resourceUrl||{};obj.resourceUrl[node.getAttribute("resourceType")]={format:node.getAttribute("format"),template:node.getAttribute("template")};},"WSDL":function(node,obj){obj.wsdl={};obj.wsdl.href=node.getAttribute("xlink:href");},"ServiceMetadataURL":function(node,obj){obj.serviceMetadataUrl={};obj.serviceMetadataUrl.href=node.getAttribute("xlink:href");},"LegendURL":function(node,obj){obj.legend={};obj.legend.href=node.getAttribute("xlink:href");obj.legend.format=node.getAttribute("format");},"Dimension":function(node,obj){var dimension={values:[]};this.readChildNodes(node,dimension);obj.dimensions.push(dimension);},"Default":function(node,obj){obj["default"]=this.getChildValue(node);},"Value":function(node,obj){obj.values.push(this.getChildValue(node));}},"ows":OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]},CLASS_NAME:"OpenLayers.Format.WMTSCapabilities.v1_0_0"});
\ No newline at end of file
diff --git a/binsrc/oat/toolkit/ajax.js b/binsrc/oat/toolkit/ajax.js
index 4e10372..1e2a14c 100644
--- a/binsrc/oat/toolkit/ajax.js
+++ b/binsrc/oat/toolkit/ajax.js
@@ -1,9 +1,9 @@
/*
- * $Id: ajax.js,v 1.10.2.7 2011/08/29 10:19:49 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software AJAX Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/anchor.js b/binsrc/oat/toolkit/anchor.js
index 355e6b6..fa565a9 100644
--- a/binsrc/oat/toolkit/anchor.js
+++ b/binsrc/oat/toolkit/anchor.js
@@ -1,9 +1,9 @@
/*
- * $Id: anchor.js,v 1.34.2.5 2011/03/08 13:08:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/animation.js b/binsrc/oat/toolkit/animation.js
index e537474..92d9197 100644
--- a/binsrc/oat/toolkit/animation.js
+++ b/binsrc/oat/toolkit/animation.js
@@ -1,9 +1,9 @@
/*
- * $Id: animation.js,v 1.9.2.3 2011/06/24 11:27:27 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/barchart.js b/binsrc/oat/toolkit/barchart.js
index b07bed8..12d339a 100644
--- a/binsrc/oat/toolkit/barchart.js
+++ b/binsrc/oat/toolkit/barchart.js
@@ -1,9 +1,9 @@
/*
- * $Id: barchart.js,v 1.8.2.3 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/bezier.js b/binsrc/oat/toolkit/bezier.js
index f22b241..2e89135 100644
--- a/binsrc/oat/toolkit/bezier.js
+++ b/binsrc/oat/toolkit/bezier.js
@@ -1,9 +1,9 @@
/*
- * $Id: bezier.js,v 1.6.2.3 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/bindings.js b/binsrc/oat/toolkit/bindings.js
index 8604302..d8fab29 100644
--- a/binsrc/oat/toolkit/bindings.js
+++ b/binsrc/oat/toolkit/bindings.js
@@ -1,9 +1,9 @@
/*
- * $Id: bindings.js,v 1.6.2.4 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/calendar.js b/binsrc/oat/toolkit/calendar.js
index 3d6217e..4e45e43 100644
--- a/binsrc/oat/toolkit/calendar.js
+++ b/binsrc/oat/toolkit/calendar.js
@@ -1,9 +1,9 @@
/*
- * $Id: calendar.js,v 1.11.2.5 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/canvas.js b/binsrc/oat/toolkit/canvas.js
index 4762029..60b7e9f 100644
--- a/binsrc/oat/toolkit/canvas.js
+++ b/binsrc/oat/toolkit/canvas.js
@@ -1,9 +1,9 @@
/*
- * $Id: canvas.js,v 1.6.2.2 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/color.js b/binsrc/oat/toolkit/color.js
index 803eed1..4468955 100644
--- a/binsrc/oat/toolkit/color.js
+++ b/binsrc/oat/toolkit/color.js
@@ -1,9 +1,9 @@
/*
- * $Id: color.js,v 1.8.2.4 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/combobox.js b/binsrc/oat/toolkit/combobox.js
index dfff1f8..927e2f4 100644
--- a/binsrc/oat/toolkit/combobox.js
+++ b/binsrc/oat/toolkit/combobox.js
@@ -1,9 +1,9 @@
/*
- * $Id: combobox.js,v 1.8.2.4 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/combobutton.js b/binsrc/oat/toolkit/combobutton.js
index 958118d..f9ecfcb 100644
--- a/binsrc/oat/toolkit/combobutton.js
+++ b/binsrc/oat/toolkit/combobutton.js
@@ -1,9 +1,9 @@
/*
- * $Id: combobutton.js,v 1.8.2.4 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/combolist.js b/binsrc/oat/toolkit/combolist.js
index 9144abb..d73548d 100644
--- a/binsrc/oat/toolkit/combolist.js
+++ b/binsrc/oat/toolkit/combolist.js
@@ -1,9 +1,9 @@
/*
- * $Id: combolist.js,v 1.12.2.4 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/connection.js b/binsrc/oat/toolkit/connection.js
index 2119f6f..78a5882 100644
--- a/binsrc/oat/toolkit/connection.js
+++ b/binsrc/oat/toolkit/connection.js
@@ -1,9 +1,9 @@
/*
- * $Id: connection.js,v 1.8.2.3 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/datasource.js b/binsrc/oat/toolkit/datasource.js
index c7c60ad..5bd19b4 100644
--- a/binsrc/oat/toolkit/datasource.js
+++ b/binsrc/oat/toolkit/datasource.js
@@ -1,9 +1,9 @@
/*
- * $Id: datasource.js,v 1.10.2.3 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dav.js b/binsrc/oat/toolkit/dav.js
index 163a81c..1435df3 100644
--- a/binsrc/oat/toolkit/dav.js
+++ b/binsrc/oat/toolkit/dav.js
@@ -1,9 +1,9 @@
/*
- * $Id: dav.js,v 1.36.2.4 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/declarative.js b/binsrc/oat/toolkit/declarative.js
index 093f466..779c886 100644
--- a/binsrc/oat/toolkit/declarative.js
+++ b/binsrc/oat/toolkit/declarative.js
@@ -1,9 +1,9 @@
/*
- * $Id: declarative.js,v 1.7.2.3 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dereference.js b/binsrc/oat/toolkit/dereference.js
index c1d175c..1a52937 100644
--- a/binsrc/oat/toolkit/dereference.js
+++ b/binsrc/oat/toolkit/dereference.js
@@ -1,9 +1,9 @@
/*
- * $Id: dereference.js,v 1.23.2.3 2010/04/06 16:46:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dialog.js b/binsrc/oat/toolkit/dialog.js
index 6bc1c0c..547e4ec 100644
--- a/binsrc/oat/toolkit/dialog.js
+++ b/binsrc/oat/toolkit/dialog.js
@@ -1,9 +1,9 @@
/*
- * $Id: dialog.js,v 1.13.2.6 2011/02/16 20:54:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dimmer.js b/binsrc/oat/toolkit/dimmer.js
index e3ff8cb..b2acc87 100644
--- a/binsrc/oat/toolkit/dimmer.js
+++ b/binsrc/oat/toolkit/dimmer.js
@@ -1,9 +1,9 @@
/*
- * $Id: dimmer.js,v 1.12.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dock.js b/binsrc/oat/toolkit/dock.js
index e73ea01..bedffff 100644
--- a/binsrc/oat/toolkit/dock.js
+++ b/binsrc/oat/toolkit/dock.js
@@ -1,9 +1,9 @@
/*
- * $Id: dock.js,v 1.11.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/drag.js b/binsrc/oat/toolkit/drag.js
index 781a969..1d3d6db 100644
--- a/binsrc/oat/toolkit/drag.js
+++ b/binsrc/oat/toolkit/drag.js
@@ -1,9 +1,9 @@
/*
- * $Id: drag.js,v 1.11.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dstransport.js b/binsrc/oat/toolkit/dstransport.js
index a7b78bd..03c438e 100644
--- a/binsrc/oat/toolkit/dstransport.js
+++ b/binsrc/oat/toolkit/dstransport.js
@@ -1,9 +1,9 @@
/*
- * $Id: dstransport.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/fisheye.js b/binsrc/oat/toolkit/fisheye.js
index 6820518..f8aefba 100644
--- a/binsrc/oat/toolkit/fisheye.js
+++ b/binsrc/oat/toolkit/fisheye.js
@@ -1,9 +1,9 @@
/*
- * $Id: fisheye.js,v 1.7.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/form.js b/binsrc/oat/toolkit/form.js
index fe0dfdc..7b07e21 100644
--- a/binsrc/oat/toolkit/form.js
+++ b/binsrc/oat/toolkit/form.js
@@ -1,9 +1,9 @@
/*
- * $Id: form.js,v 1.10.2.5 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/formobject.js b/binsrc/oat/toolkit/formobject.js
index 7e270ac..418e5f5 100644
--- a/binsrc/oat/toolkit/formobject.js
+++ b/binsrc/oat/toolkit/formobject.js
@@ -1,9 +1,9 @@
/*
- * $Id: formobject.js,v 1.14.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/fresnel.js b/binsrc/oat/toolkit/fresnel.js
index ef4dcdd..c488c40 100644
--- a/binsrc/oat/toolkit/fresnel.js
+++ b/binsrc/oat/toolkit/fresnel.js
@@ -1,9 +1,9 @@
/*
- * $Id: fresnel.js,v 1.9.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/geometry.js b/binsrc/oat/toolkit/geometry.js
index feba3a1..8af19e4 100644
--- a/binsrc/oat/toolkit/geometry.js
+++ b/binsrc/oat/toolkit/geometry.js
@@ -1,9 +1,9 @@
/*
- * $Id: geometry.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/ghostdrag.js b/binsrc/oat/toolkit/ghostdrag.js
index f4e3362..59ab0e7 100644
--- a/binsrc/oat/toolkit/ghostdrag.js
+++ b/binsrc/oat/toolkit/ghostdrag.js
@@ -1,9 +1,9 @@
/*
- * $Id: ghostdrag.js,v 1.13.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -117,12 +117,18 @@ OAT.GhostDrag = function() {
self.processes.push(process);
self.callbacks.push(callback);
var cica = true;
- var ref = function(event) {
- OAT.Event.prevent(event);
+ 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 index = self.sources.indexOf(elm);
if (index == -1) return;
- var x = event.clientX;
- var y = event.clientY;
+ var x = e.clientX;
+ var y = e.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 28f0eb2..2beb0e2 100644
--- a/binsrc/oat/toolkit/graph.js
+++ b/binsrc/oat/toolkit/graph.js
@@ -1,9 +1,9 @@
/*
- * $Id: graph.js,v 1.6.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/graphsidebar.js b/binsrc/oat/toolkit/graphsidebar.js
index df13ee3..91a7a89 100644
--- a/binsrc/oat/toolkit/graphsidebar.js
+++ b/binsrc/oat/toolkit/graphsidebar.js
@@ -1,9 +1,9 @@
/*
- * $Id: graphsidebar.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/graphsvg.js b/binsrc/oat/toolkit/graphsvg.js
index d7f598a..b5eb226 100644
--- a/binsrc/oat/toolkit/graphsvg.js
+++ b/binsrc/oat/toolkit/graphsvg.js
@@ -1,9 +1,9 @@
/*
- * $Id: graphsvg.js,v 1.12.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/grid.js b/binsrc/oat/toolkit/grid.js
index 580730e..0bea585 100644
--- a/binsrc/oat/toolkit/grid.js
+++ b/binsrc/oat/toolkit/grid.js
@@ -1,9 +1,9 @@
/*
- * $Id: grid.js,v 1.16.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/instant.js b/binsrc/oat/toolkit/instant.js
index 10f3737..0371490 100644
--- a/binsrc/oat/toolkit/instant.js
+++ b/binsrc/oat/toolkit/instant.js
@@ -1,9 +1,9 @@
/*
- * $Id: instant.js,v 1.8.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/jsobj.js b/binsrc/oat/toolkit/jsobj.js
index 62100c7..812de0f 100644
--- a/binsrc/oat/toolkit/jsobj.js
+++ b/binsrc/oat/toolkit/jsobj.js
@@ -1,9 +1,9 @@
/*
- * $Id: jsobj.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/json.js b/binsrc/oat/toolkit/json.js
index eea9910..fde9387 100644
--- a/binsrc/oat/toolkit/json.js
+++ b/binsrc/oat/toolkit/json.js
@@ -1,9 +1,9 @@
/*
- * $Id: json.js,v 1.8.2.4 2011/05/03 14:03:49 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/keyboard.js b/binsrc/oat/toolkit/keyboard.js
index 3bf3af9..1e0ceb4 100644
--- a/binsrc/oat/toolkit/keyboard.js
+++ b/binsrc/oat/toolkit/keyboard.js
@@ -1,9 +1,9 @@
/*
- * $Id: keyboard.js,v 1.5.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/layers.js b/binsrc/oat/toolkit/layers.js
index 5076796..47cffe7 100644
--- a/binsrc/oat/toolkit/layers.js
+++ b/binsrc/oat/toolkit/layers.js
@@ -1,9 +1,9 @@
/*
- * $Id: layers.js,v 1.7.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/linechart.js b/binsrc/oat/toolkit/linechart.js
index fd77ecb..07da93b 100644
--- a/binsrc/oat/toolkit/linechart.js
+++ b/binsrc/oat/toolkit/linechart.js
@@ -1,9 +1,9 @@
/*
- * $Id: linechart.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/loader.js b/binsrc/oat/toolkit/loader.js
index 6e210f9..69dc2b8 100644
--- a/binsrc/oat/toolkit/loader.js
+++ b/binsrc/oat/toolkit/loader.js
@@ -1,9 +1,9 @@
/*
- * $Id: loader.js,v 1.87.2.25 2011/10/25 23:37:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 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.2",
- build: "$Date: 2011/10/25 23:37:37 $",
+ version: "2.9.3",
+ build: "$Date: 2011/11/17 16:38:25 $",
httpError: 1, /* show http errors */
allowDefaultResize: 1,
allowDefaultDrag: 1
diff --git a/binsrc/oat/toolkit/location.js b/binsrc/oat/toolkit/location.js
index 402e8a4..0eedae1 100644
--- a/binsrc/oat/toolkit/location.js
+++ b/binsrc/oat/toolkit/location.js
@@ -1,9 +1,9 @@
/*
- * $Id: location.js,v 1.1.4.2 2011/10/25 23:37:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2011 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/macwin.js b/binsrc/oat/toolkit/macwin.js
index ef3bec2..2156960 100644
--- a/binsrc/oat/toolkit/macwin.js
+++ b/binsrc/oat/toolkit/macwin.js
@@ -1,9 +1,9 @@
/*
- * $Id: macwin.js,v 1.9.2.5 2010/09/07 21:56:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/map.js b/binsrc/oat/toolkit/map.js
index 853f9d3..5da1845 100644
--- a/binsrc/oat/toolkit/map.js
+++ b/binsrc/oat/toolkit/map.js
@@ -1,9 +1,9 @@
/*
- * $Id: map.js,v 1.17.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -172,17 +172,26 @@ OAT.Map = function(something, provider, optionsObject, specificOptions) {
self.obj = new OpenLayers.Map(self.elm,opts);
/*
- * classic openlayers map, add special prop
+ * Using OpenStreetMap by default (CC-by-SA attribution shown automatically on map)
* to enable layer switching
*/
- var map = new OpenLayers.Layer.WMS("Map","http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+
+ self.fromProjection =
+
+ self.fromProj = new OpenLayers.Projection("EPSG:4326");
+ self.toProj = new OpenLayers.Projection("EPSG:900913");
+
+ var map = new OpenLayers.Layer.OSM();
map.OAT_MAP_TYPE = OAT.Map.MAP_MAP;
self.obj.addLayer(map);
/* satellite (NASA) */
- var sat = new OpenLayers.Layer.WMS("Satellite","http://wms.jpl.nasa.gov/wms.cgi?", {layers: 'BMNG', format: 'image/png'});
- sat.OAT_MAP_TYPE = OAT.Map.MAP_ORTO;
- self.obj.addLayer(sat);
+// var sat = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
+// "http://wms.jpl.nasa.gov/wms.cgi",
+// {layers: "global_mosaic"});
+
+// sat.OAT_MAP_TYPE = OAT.Map.MAP_ORTO;
+// self.obj.addLayer(sat);
/* markers */
self.markersLayer = new OpenLayers.Layer.Markers("Marker Pins");
@@ -322,7 +331,7 @@ OAT.Map = function(something, provider, optionsObject, specificOptions) {
return [p.x,p.y];
break;
case OAT.Map.TYPE_OL:
- var ll = new OpenLayers.LonLat(geoPosition[1],geoPosition[0]);
+ var ll = new OpenLayers.LonLat(geoPosition[1],geoPosition[0]).transform(self.fromProj,self.toProj);
var p = self.obj.getPixelFromLonLat(ll);
return [p.x,p.y];
break;
@@ -617,24 +626,16 @@ OAT.Map = function(something, provider, optionsObject, specificOptions) {
break;
case OAT.Map.TYPE_OL:
- var minLat = 180;
- var minLon = 180;
- var maxLat = -180;
- var maxLon = -180;
+ var bounds = new OpenLayers.Bounds();
for (var i=0;i<points.length;i++) {
var lat = points[i][0];
var lon = points[i][1];
- /* resize bounding box */
- if (lat > maxLat) { maxLat = lat; }
- if (lat < minLat) { minLat = lat; }
- if (lon > maxLon) { maxLon = lon; }
- if (lon < minLon) { minLon = lon; }
+ bounds.extend(new OpenLayers.LonLat(points[i][1], points[i][0]).transform(self.fromProj, self.toProj));
}
- var bounds = new OpenLayers.Bounds(minLon,minLat,maxLon,maxLat);
var c = bounds.getCenterLonLat();
var clat = c.lat;
var clon = c.lon;
- var autoZoom = self.obj.getZoomForExtent(bounds);
+ var autoZoom = self.obj.getZoomForExtent(bounds,true);
break;
}
@@ -707,7 +708,7 @@ OAT.Map = function(something, provider, optionsObject, specificOptions) {
OAT.Dom.clear(w.contentDiv);
OAT.Dom.append([w.contentDiv,elm]);
-
+ w.updateSize();
w.show();
break;
}
@@ -850,7 +851,7 @@ OAT.Map = function(something, provider, optionsObject, specificOptions) {
} /* for all groups */
if (self.provider == OAT.Map.TYPE_OL) { /* redraw markers layer */
- self.obj.layers[2].redraw();
+ self.obj.layers[1].redraw();
}
}
@@ -951,22 +952,29 @@ OAT.Map = function(something, provider, optionsObject, specificOptions) {
case OAT.Map.TYPE_OL:
/* custom marker icon */
var size = self.options.markerIconSize;
- var icon = new OpenLayers.Icon(self.options.markerIcon,new OpenLayers.Size(size[0],size[1]));
+ var offs = new OpenLayers.Pixel(-(size[0]/2),-size[1]);
+ var icon = new OpenLayers.Icon(self.options.markerIcon,new OpenLayers.Size(size[0],size[1]),offs);
/* marker */
- var marker = new OpenLayers.Marker( new OpenLayers.LonLat(lon,lat), icon.clone() );
+ var marker =
+ new OpenLayers.Marker(new OpenLayers.LonLat(lon,lat).transform(self.fromProj, self.toProj),
+ icon.clone());
+
self.markersLayer.addMarker(marker);
/* we need to associate infowin with popup */
- marker.__window = new OpenLayers.Popup.AnchoredBubble(null,
+ marker.__window = new OpenLayers.Popup.Anchored(null,
marker.lonlat,
- new OpenLayers.Size(300,50),
+ new OpenLayers.Size(300,100),
"",
icon,
true,
marker.closeInfoWindow);
+
+ marker.__window.maxSize = new OpenLayers.Size(self.elm.clientWidth-50,self.elm.clientHeight-50);
marker.__window.hide();
marker.__window.panMapIfOutOfView = true;
+
marker.closeInfoWindow = function() { marker.__window.hide(); }
self.obj.addPopup(marker.__window,false);
@@ -976,6 +984,10 @@ OAT.Map = function(something, provider, optionsObject, specificOptions) {
OAT.MSG.send(self,"MAP_MARKER_CLICK",marker);
});
+ OAT.Event.attach(marker.icon.imageDiv,"touchend",function() {
+ OAT.MSG.send(self,"MAP_MARKER_CLICK",marker);
+ });
+
OAT.Event.attach(marker.icon.imageDiv,"mouseover",function() {
OAT.MSG.send(self,"MAP_MARKER_OVER",marker);
});
@@ -1176,6 +1188,7 @@ 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 370ed0a..1f19a5d 100644
--- a/binsrc/oat/toolkit/menu.js
+++ b/binsrc/oat/toolkit/menu.js
@@ -1,9 +1,9 @@
/*
- * $Id: menu.js,v 1.11.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/mswin.js b/binsrc/oat/toolkit/mswin.js
index 1611aca..2404e7c 100644
--- a/binsrc/oat/toolkit/mswin.js
+++ b/binsrc/oat/toolkit/mswin.js
@@ -1,9 +1,9 @@
/*
- * $Id: mswin.js,v 1.9.2.4 2010/09/07 21:56:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/n3.js b/binsrc/oat/toolkit/n3.js
index 2d02b85..918741f 100644
--- a/binsrc/oat/toolkit/n3.js
+++ b/binsrc/oat/toolkit/n3.js
@@ -1,9 +1,9 @@
/*
- * $Id: n3.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/notify.js b/binsrc/oat/toolkit/notify.js
index 6c4fc0b..b3921ad 100644
--- a/binsrc/oat/toolkit/notify.js
+++ b/binsrc/oat/toolkit/notify.js
@@ -1,9 +1,9 @@
/*
- * $Id: notify.js,v 1.6.2.6 2011/09/05 15:26:06 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/panelbar.js b/binsrc/oat/toolkit/panelbar.js
index 489a95c..7b69588 100644
--- a/binsrc/oat/toolkit/panelbar.js
+++ b/binsrc/oat/toolkit/panelbar.js
@@ -1,9 +1,9 @@
/*
- * $Id: panelbar.js,v 1.14.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/piechart.js b/binsrc/oat/toolkit/piechart.js
index 383353c..a16f9a8 100644
--- a/binsrc/oat/toolkit/piechart.js
+++ b/binsrc/oat/toolkit/piechart.js
@@ -1,9 +1,9 @@
/*
- * $Id: piechart.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/pivot.js b/binsrc/oat/toolkit/pivot.js
index 993da14..4f16cd7 100644
--- a/binsrc/oat/toolkit/pivot.js
+++ b/binsrc/oat/toolkit/pivot.js
@@ -1,9 +1,9 @@
/*
- * $Id: pivot.js,v 1.10.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/profiler.js b/binsrc/oat/toolkit/profiler.js
index e29117d..772a4a5 100644
--- a/binsrc/oat/toolkit/profiler.js
+++ b/binsrc/oat/toolkit/profiler.js
@@ -1,9 +1,9 @@
/*
- * $Id: profiler.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/quickedit.js b/binsrc/oat/toolkit/quickedit.js
index b8f4e40..6d0192b 100644
--- a/binsrc/oat/toolkit/quickedit.js
+++ b/binsrc/oat/toolkit/quickedit.js
@@ -1,9 +1,9 @@
/*
- * $Id: quickedit.js,v 1.6.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rdf.js b/binsrc/oat/toolkit/rdf.js
index cd88d6f..4d8e209 100644
--- a/binsrc/oat/toolkit/rdf.js
+++ b/binsrc/oat/toolkit/rdf.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdf.js,v 1.13.2.10 2011/08/21 12:50:21 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rdfbrowser.js b/binsrc/oat/toolkit/rdfbrowser.js
index da5d840..cbe7a4a 100644
--- a/binsrc/oat/toolkit/rdfbrowser.js
+++ b/binsrc/oat/toolkit/rdfbrowser.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdfbrowser.js,v 1.28.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rdfmini.js b/binsrc/oat/toolkit/rdfmini.js
index 54b133e..9b233b5 100644
--- a/binsrc/oat/toolkit/rdfmini.js
+++ b/binsrc/oat/toolkit/rdfmini.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdfmini.js,v 1.7.2.12 2011/08/29 10:22:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -33,7 +33,8 @@ OAT.RDFMini = function(div,optObj) {
imagePath:OAT.Preferences.imagePath,
endpoint:"/sparql?query=",
store: false,
- sel_ctr: false // optional place view selector in custom place
+ sel_ctr: false, // optional place view selector in custom place
+ defaultTab: 2
}
for (var p in optObj) { this.options[p] = optObj[p]; }
@@ -42,6 +43,7 @@ OAT.RDFMini = function(div,optObj) {
this.content = OAT.Dom.create("div",{className:"rdf_mini"});
this.tabs = [];
this.select = false;
+ this.curTabIdx = this.lastTabIdx = self.options.defaultTab;
this.executeSparql = function(template,replace) {
var str = template;
@@ -53,6 +55,30 @@ OAT.RDFMini = function(div,optObj) {
self.open(url);
}
+ this.getCurrentTabType = function () {
+ return (self.options.tabs[self.curTabIdx][0]);
+ }
+
+ this.getCurrentTab = function () {
+ return (self.select.selectedIndex);
+ }
+
+ this.setTab = function (i) {
+ if (i < self.select.options.length) {
+ self.lastTabIdx = self.curTabIdx;
+ self.curTabIdx = self.select.selectedIndex = i;
+ self.redraw();
+ }
+ }
+
+ this.setDefaultTab = function () {
+ self.setTab (self.options.defaultTab);
+ }
+
+ this.setLastTab = function () {
+ self.setTab (self.lastTabIdx);
+ }
+
this.search = function(str) {
var s = (str ? str : $v(self.searchInput));
if (!s.trim()) { return; }
@@ -103,7 +129,7 @@ OAT.RDFMini = function(div,optObj) {
self.tabs.push(obj);
OAT.Dom.option(t[1],t[1],s);
}
- OAT.Event.attach(s,"change",self.redraw);
+ OAT.Event.attach(s, "change", self.tabSelChangeH);
self.select = s;
var sel_ctr;
@@ -123,7 +149,11 @@ OAT.RDFMini = function(div,optObj) {
self.tabs.push(obj);
}
- OAT.MSG.attach ("*","MAP_NOTHING_TO_SHOW", function (_s,_m,_e) { s.selectedIndex = 0;self.redraw() })
+ OAT.MSG.attach ("*","MAP_NOTHING_TO_SHOW",
+ function (_s,_m,_e) {
+ self.setLastTab();
+ self.redraw()
+ });
var ua = navigator.userAgent;
@@ -142,6 +172,11 @@ OAT.RDFMini = function(div,optObj) {
self.parent.appendChild(self.content);
}
+ this.tabSelChangeH = function (e) {
+ self.setTab(e.target.selectedIndex);
+ self.redraw();
+ }
+
this.redraw = function() { /* change vis */
var index = 0;
if (self.select) { index = self.select.selectedIndex; }
@@ -151,6 +186,7 @@ OAT.RDFMini = function(div,optObj) {
self.tabs[index].redraw();
var et = {};
et.tabIndex = index;
+ et.tabType = self.options.tabs[index][0];
OAT.MSG.send (self,"RDFMINI_VIEW_CHANGED",et);
}
@@ -193,7 +229,10 @@ OAT.RDFMini = function(div,optObj) {
ciri = OAT.IRIDB.resolveCIRI(data_.getValue());
content = OAT.Dom.create("span");
var a = OAT.Dom.create("a");
- a.innerHTML = (label ? label : ciri);
+
+ if (label) a.innerHTML = label;
+ else a.innerHTML = (self.options.raw_iris ? data : ciri);
+
a.href = data;
content.appendChild(a);
self.processLink(a,data,disabledActions);
@@ -208,7 +247,10 @@ OAT.RDFMini = function(div,optObj) {
label = data_.label;
content = OAT.Dom.create("span");
var a = OAT.Dom.create("a");
- a.innerHTML = (label ? label : ciri);
+
+ if (label) a.innerHTML = label;
+ else a.innerHTML = (self.options.raw_iris ? data : 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 622ef76..c26629b 100644
--- a/binsrc/oat/toolkit/rdfstore.js
+++ b/binsrc/oat/toolkit/rdfstore.js
@@ -1,9 +1,8 @@
-/*
- * $Id: rdfstore.js,v 1.32.2.9 2011/08/21 12:50:21 source Exp $
+/* $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -713,7 +712,10 @@ OAT.RDFStore = function(tripleChangeCallback, optObj) {
if (!!item.label)
return item.label;
else
- return self.getCIRIorSplit (item.iid)
+ if (self.options.raw_iris)
+ return OAT.IRIDB.getIRI (item.iid);
+ else
+ return self.getCIRIorSplit (item.iid);
}
// XXX
diff --git a/binsrc/oat/toolkit/rdftabs.js b/binsrc/oat/toolkit/rdftabs.js
index ae76dee..72d07c3 100644
--- a/binsrc/oat/toolkit/rdftabs.js
+++ b/binsrc/oat/toolkit/rdftabs.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdftabs.js,v 1.63.2.25 2011/09/20 12:03:04 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -64,7 +64,8 @@ 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"
+ desc:"RDF data by subject resource",
+ raw_iris: false
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -344,7 +345,10 @@ OAT.RDFTabs.browser = function(parent,optObj) {
elm.href = OAT.IRIDB.getIRI(value);
attach(elm,value);
}
- elm.innerHTML = self.parent.store.getCIRIorSplit(value);
+
+ if (self.options.raw_iris) elm.innerHTML = elm.href;
+ else elm.innerHTML = self.parent.store.getCIRIorSplit(value);
+
if (i) { self.sortDiv.appendChild(OAT.Dom.text(", ")); }
self.sortDiv.appendChild(elm);
}
@@ -374,7 +378,8 @@ 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)"
+ desc:"Navigate through locally cached data (Filters not applied)",
+ raw_iris: false
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -595,7 +600,10 @@ OAT.RDFTabs.navigator = function(parent,optObj) {
} else if (type == 1) { /* dereferencable link */
content = OAT.Dom.create("a");
content.href = value.getIRI();
- content.innerHTML = self.parent.store.getCIRIorSplit(value.getIID());
+
+ if (self.options.raw_iris) content.innerHTML = value.getIRI();
+ else content.innerHTML = self.parent.store.getCIRIorSplit(value.getIID());
+
self.dattach(content,value.getIRI());
}
} else { /* text */
@@ -696,6 +704,9 @@ 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);
@@ -766,15 +777,25 @@ 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];
}//]
- td.innerHTML = simple;
- td.title = OAT.IRIDB.getIRI(label);
+ 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);
tr.appendChild(td);
+
OAT.Event.attach(arrow,"click",function() {
state = (state+1) % 2;
arrow.innerHTML = states[state];
@@ -945,7 +966,8 @@ OAT.RDFTabs.triples = function(parent,optObj) {
pageSize:100,
removeNS:true,
description:"This module displays all filtered triples.",
- desc:"All filtered triples"
+ desc:"All filtered triples",
+ raw_iris: false
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -1039,7 +1061,12 @@ 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");
- col_v_elm.innerHTML = self.parent.store.getCIRIorSplit(iid);
+
+ if (self.options.raw_iris)
+ col_v_elm.innerHTML = iri;
+ else
+ col_v_elm = self.parent.store.getCIRIorSplit(iid);
+
col_v_elm.href = iri;
self.parent.processLink(col_v_elm, iri);
} catch (e) {
@@ -1081,7 +1108,8 @@ OAT.RDFTabs.svg = function(parent,optObj) {
this.options = {
limit:100,
description:"",
- desc:"Filtered data as SVG Graph"
+ desc:"Filtered data as SVG Graph",
+ raw_iris: false
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -1327,7 +1355,8 @@ OAT.RDFTabs.map = function(parent,optObj) {
hoverPopup:true,
height: "600px",
useMobileOpts:false,
- supportedMobileDetected:false
+ supportedMobileDetected:false,
+ raw_iris: false
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -1470,7 +1499,7 @@ OAT.RDFTabs.map = function(parent,optObj) {
}
if (coords[0] != 0 && coords[1] != 0) {
- if (!!window.console) window.console.log ('found coords :' + coords[0] + ' ' + coords[1]);
+ if (!!window.console && window.oat_debug) window.console.log ('found coords :' + coords[0] + ' ' + coords[1]);
self.attachMarker(coords, item);
return;
}
@@ -1480,7 +1509,7 @@ OAT.RDFTabs.map = function(parent,optObj) {
}
if (!pointResource && locValue) { /* geocode location */
- if (!!window.console) window.console.log ('geocoding: '+locValue);
+ if (!!window.console && window.oat_debug) window.console.log ('geocoding: '+locValue);
self.geoCode(locValue,item);
return;
}
@@ -1654,7 +1683,13 @@ 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 = self.parent.store.getCIRIorSplit(p);
+ var simple;
+
+ if (self.options.raw_iris)
+ simple = OAT.IRIDB.getIRI (p);
+ else
+ 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"});
@@ -1830,9 +1865,10 @@ OAT.RDFTabs.map = function(parent,optObj) {
note.send(msg, {timeout: 4000});
OAT.MSG.send (self, "MAP_NOTHING_TO_SHOW", false);
}
+ clearTimeout (window.tryListTo);
self.map.optimalPosition(self.pointList.makePointsArray(false));
} else {
- setTimeout(tryList,500);
+ window.tryListTo = setTimeout(tryList,500);
}
}
tryList();
@@ -1846,7 +1882,8 @@ 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"
+ desc:"Date/time on timeline",
+ raw_iris: false
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -1958,6 +1995,10 @@ OAT.RDFTabs.timeline = function(parent,optObj) {
}
}
+//
+// XXX unfinished
+//
+
OAT.RDFTabs.people = function(parent,optObj) {
var self = this;
OAT.RDFTabs.parent(self);
@@ -1965,7 +2006,8 @@ OAT.RDFTabs.people = function(parent,optObj) {
this.options = {
pictSize:150,
columns: 2,
- width: 800
+ width: 800,
+ raw_iris: false
};
this.personTypes = ["http://xmlns.com/foaf/0.1/Person"];
@@ -1991,8 +2033,10 @@ 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"
+ desc:"Images from filtered data set",
+ raw_iris: false
}
+
for (var p in optObj) { self.options[p] = optObj[p]; }
this.elm.style.textAlign = "center";
@@ -2189,7 +2233,8 @@ 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"
+ desc:"Links from filtered data set",
+ raw_iris: false
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -2280,7 +2325,8 @@ 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"
+ desc:"Fresnel RDF Vocabularies to dereferenced data",
+ raw_iris: false
}
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 8b72284..a05b2ea 100644
--- a/binsrc/oat/toolkit/rectwin.js
+++ b/binsrc/oat/toolkit/rectwin.js
@@ -1,9 +1,9 @@
/*
- * $Id: rectwin.js,v 1.10.2.4 2010/09/07 21:56:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/resize.js b/binsrc/oat/toolkit/resize.js
index 3ac7881..b73f48f 100644
--- a/binsrc/oat/toolkit/resize.js
+++ b/binsrc/oat/toolkit/resize.js
@@ -1,9 +1,9 @@
/*
- * $Id: resize.js,v 1.7.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rotator.js b/binsrc/oat/toolkit/rotator.js
index 14431a2..1c83efa 100644
--- a/binsrc/oat/toolkit/rotator.js
+++ b/binsrc/oat/toolkit/rotator.js
@@ -1,9 +1,9 @@
/*
- * $Id: rotator.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/roundwin.js b/binsrc/oat/toolkit/roundwin.js
index 9280498..d3a7916 100644
--- a/binsrc/oat/toolkit/roundwin.js
+++ b/binsrc/oat/toolkit/roundwin.js
@@ -1,9 +1,9 @@
/*
- * $Id: roundwin.js,v 1.9.2.4 2010/09/07 21:56:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rssreader.js b/binsrc/oat/toolkit/rssreader.js
index 8792a4a..583e406 100644
--- a/binsrc/oat/toolkit/rssreader.js
+++ b/binsrc/oat/toolkit/rssreader.js
@@ -1,9 +1,9 @@
/*
- * $Id: rssreader.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/schema.js b/binsrc/oat/toolkit/schema.js
index c4df412..7b2a7b3 100644
--- a/binsrc/oat/toolkit/schema.js
+++ b/binsrc/oat/toolkit/schema.js
@@ -1,9 +1,9 @@
/*
- * $Id: schema.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/simplefx.js b/binsrc/oat/toolkit/simplefx.js
index 830c0c2..bed6135 100644
--- a/binsrc/oat/toolkit/simplefx.js
+++ b/binsrc/oat/toolkit/simplefx.js
@@ -1,9 +1,9 @@
/*
- * $Id: simplefx.js,v 1.13.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/slidebar.js b/binsrc/oat/toolkit/slidebar.js
index 0275225..1703b9e 100644
--- a/binsrc/oat/toolkit/slidebar.js
+++ b/binsrc/oat/toolkit/slidebar.js
@@ -1,9 +1,9 @@
/*
- * $Id: slidebar.js,v 1.4.2.5 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/slider.js b/binsrc/oat/toolkit/slider.js
index f1c5027..6d4c347 100644
--- a/binsrc/oat/toolkit/slider.js
+++ b/binsrc/oat/toolkit/slider.js
@@ -1,9 +1,9 @@
/*
- * $Id: slider.js,v 1.8.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/soap.js b/binsrc/oat/toolkit/soap.js
index 35fa765..4443449 100644
--- a/binsrc/oat/toolkit/soap.js
+++ b/binsrc/oat/toolkit/soap.js
@@ -1,9 +1,9 @@
/*
- * $Id: soap.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/sparkline.js b/binsrc/oat/toolkit/sparkline.js
index 872c657..57a1625 100644
--- a/binsrc/oat/toolkit/sparkline.js
+++ b/binsrc/oat/toolkit/sparkline.js
@@ -1,9 +1,9 @@
/*
- * $Id: sparkline.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/sparql.js b/binsrc/oat/toolkit/sparql.js
index 800f380..dfb9741 100644
--- a/binsrc/oat/toolkit/sparql.js
+++ b/binsrc/oat/toolkit/sparql.js
@@ -1,9 +1,9 @@
/*
- * $Id: sparql.js,v 1.13.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/sqlquery.js b/binsrc/oat/toolkit/sqlquery.js
index 6d83868..908e6fa 100644
--- a/binsrc/oat/toolkit/sqlquery.js
+++ b/binsrc/oat/toolkit/sqlquery.js
@@ -1,9 +1,9 @@
/*
- * $Id: sqlquery.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/statistics.js b/binsrc/oat/toolkit/statistics.js
index 6e2b12b..743d0b5 100644
--- a/binsrc/oat/toolkit/statistics.js
+++ b/binsrc/oat/toolkit/statistics.js
@@ -1,9 +1,9 @@
/*
- * $Id: statistics.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/svg.js b/binsrc/oat/toolkit/svg.js
index ca58d06..353cc6f 100644
--- a/binsrc/oat/toolkit/svg.js
+++ b/binsrc/oat/toolkit/svg.js
@@ -1,9 +1,9 @@
/*
- * $Id: svg.js,v 1.6.2.2 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/svgsparql.js b/binsrc/oat/toolkit/svgsparql.js
index 2e090d5..dae166d 100644
--- a/binsrc/oat/toolkit/svgsparql.js
+++ b/binsrc/oat/toolkit/svgsparql.js
@@ -1,9 +1,9 @@
/*
- * $Id: svgsparql.js,v 1.6.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/tab.js b/binsrc/oat/toolkit/tab.js
index 9cd2033..e34d9ab 100644
--- a/binsrc/oat/toolkit/tab.js
+++ b/binsrc/oat/toolkit/tab.js
@@ -1,9 +1,9 @@
/*
- * $Id: tab.js,v 1.12.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/tagcloud.js b/binsrc/oat/toolkit/tagcloud.js
index 34db665..c1b5b56 100644
--- a/binsrc/oat/toolkit/tagcloud.js
+++ b/binsrc/oat/toolkit/tagcloud.js
@@ -1,9 +1,9 @@
/*
- * $Id: tagcloud.js,v 1.3.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/ticker.js b/binsrc/oat/toolkit/ticker.js
index 761c338..25ad71a 100644
--- a/binsrc/oat/toolkit/ticker.js
+++ b/binsrc/oat/toolkit/ticker.js
@@ -1,9 +1,9 @@
/*
- * $Id: ticker.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/timeline.js b/binsrc/oat/toolkit/timeline.js
index 294fc99..f8bfd5d 100644
--- a/binsrc/oat/toolkit/timeline.js
+++ b/binsrc/oat/toolkit/timeline.js
@@ -1,9 +1,9 @@
/*
- * $Id: timeline.js,v 1.16.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/tlscale.js b/binsrc/oat/toolkit/tlscale.js
index 8b32fdf..c52316d 100644
--- a/binsrc/oat/toolkit/tlscale.js
+++ b/binsrc/oat/toolkit/tlscale.js
@@ -1,9 +1,9 @@
/*
- * $Id: tlscale.js,v 1.11.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/toolbar.js b/binsrc/oat/toolkit/toolbar.js
index 16f42e9..c135832 100644
--- a/binsrc/oat/toolkit/toolbar.js
+++ b/binsrc/oat/toolkit/toolbar.js
@@ -1,9 +1,9 @@
/*
- * $Id: toolbar.js,v 1.8.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/tree.js b/binsrc/oat/toolkit/tree.js
index c4e1e65..229c760 100644
--- a/binsrc/oat/toolkit/tree.js
+++ b/binsrc/oat/toolkit/tree.js
@@ -1,9 +1,9 @@
/*
- * $Id: tree.js,v 1.19.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/upload.js b/binsrc/oat/toolkit/upload.js
index fcd0c56..bbade76 100644
--- a/binsrc/oat/toolkit/upload.js
+++ b/binsrc/oat/toolkit/upload.js
@@ -1,9 +1,9 @@
/*
- * $Id: upload.js,v 1.6.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/validation.js b/binsrc/oat/toolkit/validation.js
index 587dbbd..1765d41 100644
--- a/binsrc/oat/toolkit/validation.js
+++ b/binsrc/oat/toolkit/validation.js
@@ -1,9 +1,9 @@
/*
- * $Id: validation.js,v 1.7.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/webclipbinding.js b/binsrc/oat/toolkit/webclipbinding.js
index 49c6fb5..3e45138 100644
--- a/binsrc/oat/toolkit/webclipbinding.js
+++ b/binsrc/oat/toolkit/webclipbinding.js
@@ -1,9 +1,9 @@
/*
- * $Id: webclipbinding.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/win.js b/binsrc/oat/toolkit/win.js
index 351b74d..2b77c76 100644
--- a/binsrc/oat/toolkit/win.js
+++ b/binsrc/oat/toolkit/win.js
@@ -1,9 +1,9 @@
/*
- * $Id: win.js,v 1.16.2.5 2011/02/16 20:54:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/window.js b/binsrc/oat/toolkit/window.js
index 19c1ac1..7b1b469 100644
--- a/binsrc/oat/toolkit/window.js
+++ b/binsrc/oat/toolkit/window.js
@@ -1,9 +1,9 @@
/*
- * $Id: window.js,v 1.10.2.4 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/ws.js b/binsrc/oat/toolkit/ws.js
index a790aae..1fdf1c0 100644
--- a/binsrc/oat/toolkit/ws.js
+++ b/binsrc/oat/toolkit/ws.js
@@ -1,9 +1,9 @@
/*
- * $Id: ws.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/xml.js b/binsrc/oat/toolkit/xml.js
index 22d2c36..0a099d3 100644
--- a/binsrc/oat/toolkit/xml.js
+++ b/binsrc/oat/toolkit/xml.js
@@ -1,9 +1,9 @@
/*
- * $Id: xml.js,v 1.14.2.8 2011/05/03 14:03:49 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/xmla.js b/binsrc/oat/toolkit/xmla.js
index 774b73e..3744550 100644
--- a/binsrc/oat/toolkit/xmla.js
+++ b/binsrc/oat/toolkit/xmla.js
@@ -1,9 +1,9 @@
/*
- * $Id: xmla.js,v 1.8.2.3 2010/04/06 16:46:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2010 OpenLink Software
+ * Copyright (C) 2005-2012 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/xslt/designview.xsl b/binsrc/oat/xslt/designview.xsl
index ad0cc39..f315376 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.1 2010/04/06 16:46:12 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2010 OpenLink Software
+ Copyright (C) 2005-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
diff --git a/binsrc/oat/xslt/formview.xsl b/binsrc/oat/xslt/formview.xsl
index c656033..8b8ff9f 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.1 2010/04/06 16:46:12 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2010 OpenLink Software
+ Copyright (C) 2005-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
diff --git a/binsrc/oat/xslt/grid.xsl b/binsrc/oat/xslt/grid.xsl
index e67e7cf..f84cc80 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.1 2010/04/06 16:46:12 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2010 OpenLink Software
+ Copyright (C) 2005-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
diff --git a/binsrc/oat/xslt/pivotview.xsl b/binsrc/oat/xslt/pivotview.xsl
index 624a161..1658b32 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.2 2010/04/06 16:46:12 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2010 OpenLink Software
+ Copyright (C) 2005-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
diff --git a/binsrc/oat/xslt/query.xsl b/binsrc/oat/xslt/query.xsl
index f4077cd..d7bde95 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.3 2010/04/06 16:46:12 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2010 OpenLink Software
+ Copyright (C) 2005-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
diff --git a/binsrc/oat/xslt/rdfbrowser.xsl b/binsrc/oat/xslt/rdfbrowser.xsl
index bb177a8..2d069f5 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.1 2010/04/06 16:46:12 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2010 OpenLink Software
+ Copyright (C) 2005-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
diff --git a/binsrc/oat/xslt/tree.xsl b/binsrc/oat/xslt/tree.xsl
index caa14fc..c499908 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.1 2010/04/06 16:46:12 source Exp $
+ $Id$
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2010 OpenLink Software
+ Copyright (C) 2005-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
diff --git a/binsrc/rdb2rdf/Makefile.am b/binsrc/rdb2rdf/Makefile.am
new file mode 100644
index 0000000..fa7d72a
--- /dev/null
+++ b/binsrc/rdb2rdf/Makefile.am
@@ -0,0 +1,50 @@
+#
+# 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_RDB2RDF_VAD
+nodist_vad_DATA = rdb2rdf_dav.vad
+endif
+
+noinst_SCRIPTS = make_vad.sh
+CLEANFILES = \
+ make_vad.output \
+ make_rdb2rdf_vad.output \
+ rdb2rdf_dav.vad
+
+rdb2rdf_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 = \
+ make_vad.sh \
+ *.sql \
+ *.ttl \
+ *.xml \
+ vad_version
diff --git a/binsrc/rdb2rdf/Makefile.in b/binsrc/rdb2rdf/Makefile.in
new file mode 100644
index 0000000..067cc83
--- /dev/null
+++ b/binsrc/rdb2rdf/Makefile.in
@@ -0,0 +1,494 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@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/rdb2rdf
+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 =
+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 = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
+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@
+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@
+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_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_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_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+vaddir = @vaddir@
+ at WITH_RDB2RDF_VAD_TRUE@nodist_vad_DATA = rdb2rdf_dav.vad
+noinst_SCRIPTS = make_vad.sh
+CLEANFILES = \
+ make_vad.output \
+ make_rdb2rdf_vad.output \
+ rdb2rdf_dav.vad
+
+
+# ----------------------------------------------------------------------
+#
+# Additional files to distribute
+#
+# ----------------------------------------------------------------------
+EXTRA_DIST = \
+ make_vad.sh \
+ *.sql \
+ *.ttl \
+ *.xml \
+ vad_version
+
+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 \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/rdb2rdf/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/rdb2rdf/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
+
+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)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
+ done
+
+uninstall-nodist_vadDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
+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 $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$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)
+
+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
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nodist_vadDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: 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
+
+
+rdb2rdf_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/rdb2rdf/make_vad.sh b/binsrc/rdb2rdf/make_vad.sh
new file mode 100755
index 0000000..ad98e23
--- /dev/null
+++ b/binsrc/rdb2rdf/make_vad.sh
@@ -0,0 +1,367 @@
+#!/bin/sh
+#
+# $Id:$
+#
+# 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
+#
+#
+
+
+# ----------------------------------------------------------------------
+# Fix issues with LOCALE
+# ----------------------------------------------------------------------
+LANG=C
+LC_ALL=POSIX
+export LANG LC_ALL
+
+LOGDIR=`pwd`
+LOGFILE="${LOGDIR}/make_rdb2rdf_vad.output"
+STICKER_DAV="vad_dav.xml"
+
+SERVER=${SERVER-}
+THOST=${THOST-localhost}
+TPORT=${TPORT-8440}
+PORT=${PORT-1940}
+ISQL=${ISQL-isql}
+DSN="$HOST:$PORT"
+HOST_OS=`uname -s | grep WIN`
+NEED_VERSION=06.02.3130
+VERSION=1.00.0000 # see automatic versioning below
+
+BUILDDATE=`date +"%Y-%m-%d"`
+
+if [ "x$1" = "xdev" ]
+then
+ DEV="1"
+fi
+
+if [ "x$HOST_OS" != "x" ]
+then
+ TEMPFILE="`cygpath -m $TMP/isql.$$`"
+ STICKER_DAV="`cygpath -m $STICKER_DAV`"
+ 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 -rf"
+fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
+
+if [ "z$SERVER" = "z" ]
+then
+ if [ "x$HOST_OS" != "x" ]
+ then
+ SERVER=virtuoso-odbc-t.exe
+ else
+ SERVER=virtuoso
+ fi
+fi
+
+. $HOME/binsrc/tests/suite/test_fn.sh
+
+if [ -f /usr/xpg4/bin/rm ]
+then
+ myrm=/usr/xpg4/bin/rm
+else
+ myrm=$RM
+fi
+
+VERSION_INIT()
+{
+ if [ $VOS -eq 1 ]
+ then
+ if [ -f vad_version ]
+ then
+ VERSION=`cat vad_version`
+ else
+ LOG "The vad_version does not exist, please verify your checkout"
+ exit 1
+ fi
+ else
+ rm -f version.tmp
+ for i in `find . -name 'Entries'`; do
+ cat "$i" | grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
+ done
+ LANG=POSIX
+ export LANG
+ VERSION=`cat version.tmp | awk ' BEGIN { cnt=180 } { cnt = cnt + $1 } END { printf "1.0%01.04f", cnt/10000 }'`
+ rm -f version.tmp
+ echo "$VERSION" > vad_version
+ fi
+}
+
+virtuoso_start() {
+ echo "Starting $SERVER"
+ echo $BUILD
+ 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 $SERVER start on port $PORT..."
+ stat=`netstat -an | grep "[\.\:]$PORT " | grep LISTEN`
+ if [ "z$stat" != "z" ]
+ then
+ sleep 7
+ LOG "PASSED: $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 $SERVER within $timeout seconds"
+ exit 1
+ fi
+ done
+}
+
+do_command_safe () {
+ _dsn=$1
+ command=$2
+ shift
+ shift
+ echo "+ " $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE
+ if [ "x$HOST_OS" != "x" -a "z$BUILD" != "z" ]
+ then
+ $BUILD/../bin/isql.exe $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* > "${LOGFILE}.tmp"
+ else
+ $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* > "${LOGFILE}.tmp"
+ fi
+ if test $? -ne 0
+ then
+ LOG "***FAILED: starting $command"
+ else
+ if grep '^\*\*\*' "${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 vad_files 2>/dev/null
+ $myrm *.db 2>/dev/null
+ $myrm *.trx 2>/dev/null
+ $myrm *.tdb 2>/dev/null
+ $myrm *.pxa 2>/dev/null
+ $myrm *.log 2>/dev/null
+ $myrm *.ini 2>/dev/null
+}
+
+directory_init() {
+ mkdir vad_files
+ mkdir vad_files/vsp
+ mkdir vad_files/vsp/rdb2rdf
+ cp ovl.sql vad_files/vsp/rdb2rdf/
+ cp r2rml.sql vad_files/vsp/rdb2rdf/
+ cp r2rml_validation_metas.sql vad_files/vsp/rdb2rdf/
+ cp northwind_r2rml.ttl vad_files/vsp/rdb2rdf/
+ cd $LOGDIR
+}
+
+virtuoso_shutdown() {
+ LOG "Shutdown $DSN ..."
+ do_command_safe $DSN "shutdown" 2>/dev/null
+ sleep 5
+}
+
+sticker_init() {
+ ISDAV=$1
+ BASE_PATH_DAV="/DAV/VAD"
+ BASE_PATH_FS="/vad/vsp"
+}
+
+virtuoso_init() {
+ LOG "Virtuoso.ini creation..."
+ echo "
+[Database]
+DatabaseFile = virtuoso.db
+TransactionFile = virtuoso.trx
+ErrorLogFile = virtuoso.log
+ErrorLogLevel = 7
+FileExtend = 200
+Striping = 0
+LogSegments = 0
+Syslog = 0
+
+;
+; Server parameters
+;
+[Parameters]
+ServerPort = $PORT
+ServerThreads = 10
+CheckpointInterval = 0
+NumberOfBuffers = 2000
+MaxDirtyBuffers = 1200
+MaxCheckpointRemap = 2000
+UnremapQuota = 0
+AtomicDive = 1
+PrefixResultNames = 0
+CaseMode = 2
+DisableMtWrite = 0
+MaxStaticCursorRows = 5000
+AllowOSCalls = 0
+DirsAllowed = $HOME
+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() {
+ if [ ! -d vad ];then
+ mkdir vad
+ fi
+ mv vad_files/vsp vad
+ do_command_safe $DSN "DB.DBA.VAD_PACK('$STICKER_DAV', '.', 'rdb2rdf_dav.vad')"
+ do_command_safe $DSN "commit work"
+ do_command_safe $DSN "checkpoint"
+ mv vad/vsp vad_files
+}
+
+generate_files() {
+ echo "No extra targets to generate"
+}
+
+$myrm "$LOGFILE" 2>/dev/null
+BANNER 'RDB2RDF VAD create'
+
+$ISQL -? 2>/dev/null 1>/dev/null
+if [ $? -eq 127 ] ; then
+ LOG "***ABORTED: rdb2rdf PACKAGING, isql is not available"
+ exit 1
+fi
+$SERVER -? 2>/dev/null 1>/dev/null
+if [ $? -eq 127 ] ; then
+ LOG "***ABORTED: rdb2rdf PACKAGING, server is not available"
+ exit 1
+fi
+
+if [ "x$DEV" = "x1" ]
+then
+ directory_clean
+ directory_init
+ generate_files
+else
+ STOP_SERVER
+ directory_clean
+ VERSION_INIT
+ directory_init
+ virtuoso_init
+ generate_files
+ sticker_init 0
+# sticker_init 1
+ vad_create
+ virtuoso_shutdown
+ STOP_SERVER
+ chmod 644 rdb2rdf_dav.vad
+fi
+
+CHECK_LOG
+RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
+if test $STATUS -eq 0
+then
+ $myrm -f *.vad
+ exit 1
+fi
+
+directory_clean
+
+BANNER "COMPLETED VAD PACKAGING"
+exit 0
diff --git a/binsrc/rdb2rdf/northwind_r2rml.ttl b/binsrc/rdb2rdf/northwind_r2rml.ttl
new file mode 100644
index 0000000..3d224a0
--- /dev/null
+++ b/binsrc/rdb2rdf/northwind_r2rml.ttl
@@ -0,0 +1,136 @@
+ at prefix rr: <http://www.w3.org/ns/r2rml#> .
+ at prefix Demo: <http://localhost:8890/schemas/Demo/> .
+ at prefix demo-stat: <http://localhost:8890/Demo/stat#> .
+ at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+ at prefix void: <http://rdfs.org/ns/void#> .
+ at prefix scovo: <http://purl.org/NET/scovo#> .
+ at prefix aowl: <http://bblfish.net/work/atom-owl/2006-06-06/> .
+
+
+<#TriplesMapCategories> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Categories" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/categories/{CategoryID}"; rr:class Demo:Categories; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:categoryid ] ; rr:objectMap [ rr:column "CategoryID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:categoryname ] ; rr:objectMap [ rr:column "CategoryName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:description ] ; rr:objectMap [ rr:column "Description" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:picture ] ; rr:objectMap [ rr:column "Picture" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:categories_of_products ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapProducts>; rr:joinCondition [ rr:child "CategoryID" ; rr:parent "CategoryID" ] ; ]; ] .
+
+<#TriplesMapCountries> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Countries" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/countries/{Name}"; rr:class Demo:Countries; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:name ] ; rr:objectMap [ rr:column "Name" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:code ] ; rr:objectMap [ rr:column "Code" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:smallflagdavresourcename ] ; rr:objectMap [ rr:column "SmallFlagDAVResourceName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:largeflagdavresourcename ] ; rr:objectMap [ rr:column "LargeFlagDAVResourceName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:smallflagdavresourceuri ] ; rr:objectMap [ rr:column "SmallFlagDAVResourceURI" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:largeflagdavresourceuri ] ; rr:objectMap [ rr:column "LargeFlagDAVResourceURI" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:lat ] ; rr:objectMap [ rr:column "Lat" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:lng ] ; rr:objectMap [ rr:column "Lng" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:countries_of_provinces ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapProvinces>; rr:joinCondition [ rr:child "Code" ; rr:parent "CountryCode" ] ; ]; ] .
+
+<#TriplesMapCustomers> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Customers" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/customers/{CustomerID}"; rr:class Demo:Customers; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:customerid ] ; rr:objectMap [ rr:column "CustomerID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:companyname ] ; rr:objectMap [ rr:column "CompanyName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:contactname ] ; rr:objectMap [ rr:column "ContactName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:contacttitle ] ; rr:objectMap [ rr:column "ContactTitle" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:address ] ; rr:objectMap [ rr:column "Address" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:city ] ; rr:objectMap [ rr:column "City" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:region ] ; rr:objectMap [ rr:column "Region" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:postalcode ] ; rr:objectMap [ rr:column "PostalCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:country ] ; rr:objectMap [ rr:column "Country" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:countrycode ] ; rr:objectMap [ rr:column "CountryCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:phone ] ; rr:objectMap [ rr:column "Phone" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:fax ] ; rr:objectMap [ rr:column "Fax" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:customers_of_orders ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrders>; rr:joinCondition [ rr:child "CustomerID" ; rr:parent "CustomerID" ] ; ]; ] .
+
+<#TriplesMapEmployees> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Employees" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/employees/{EmployeeID}"; rr:class Demo:Employees; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:employeeid ] ; rr:objectMap [ rr:column "EmployeeID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:lastname ] ; rr:objectMap [ rr:column "LastName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:firstname ] ; rr:objectMap [ rr:column "FirstName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:title ] ; rr:objectMap [ rr:column "Title" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:titleofcourtesy ] ; rr:objectMap [ rr:column "TitleOfCourtesy" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:birthdate ] ; rr:objectMap [ rr:column "BirthDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:hiredate ] ; rr:objectMap [ rr:column "HireDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:address ] ; rr:objectMap [ rr:column "Address" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:city ] ; rr:objectMap [ rr:column "City" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:region ] ; rr:objectMap [ rr:column "Region" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:postalcode ] ; rr:objectMap [ rr:column "PostalCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:country ] ; rr:objectMap [ rr:column "Country" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:countrycode ] ; rr:objectMap [ rr:column "CountryCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:homephone ] ; rr:objectMap [ rr:column "HomePhone" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:extension ] ; rr:objectMap [ rr:column "Extension" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:photo ] ; rr:objectMap [ rr:column "Photo" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:notes ] ; rr:objectMap [ rr:column "Notes" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:reportsto ] ; rr:objectMap [ rr:column "ReportsTo" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:employees_of_orders ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrders>; rr:joinCondition [ rr:child "EmployeeID" ; rr:parent "EmployeeID" ] ; ]; ] .
+
+<#TriplesMapOrder_Details> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Order_Details" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/order_details/{OrderID}/{ProductID}"; rr:class Demo:Order_Details; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:unitprice ] ; rr:objectMap [ rr:column "UnitPrice" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:quantity ] ; rr:objectMap [ rr:column "Quantity" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:discount ] ; rr:objectMap [ rr:column "Discount" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:order_details_has_orders ] ; rr:objectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/orders/{OrderID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:order_details_has_products ] ; rr:objectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/products/{ProductID}" ]; ] .
+
+<#TriplesMapOrders> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Orders" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/orders/{OrderID}"; rr:class Demo:Orders; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orderid ] ; rr:objectMap [ rr:column "OrderID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orderdate ] ; rr:objectMap [ rr:column "OrderDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:requireddate ] ; rr:objectMap [ rr:column "RequiredDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shippeddate ] ; rr:objectMap [ rr:column "ShippedDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:freight ] ; rr:objectMap [ rr:column "Freight" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipname ] ; rr:objectMap [ rr:column "ShipName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipaddress ] ; rr:objectMap [ rr:column "ShipAddress" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipcity ] ; rr:objectMap [ rr:column "ShipCity" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipregion ] ; rr:objectMap [ rr:column "ShipRegion" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shippostalcode ] ; rr:objectMap [ rr:column "ShipPostalCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipcountry ] ; rr:objectMap [ rr:column "ShipCountry" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipcountrycode ] ; rr:objectMap [ rr:column "ShipCountryCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orders_has_customers ] ; rr:objectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/customers/{CustomerID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orders_has_employees ] ; rr:objectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/employees/{EmployeeID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orders_has_shippers ] ; rr:objectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/shippers/{ShipVia}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orders_of_order_details ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrder_Details>; rr:joinCondition [ rr:child "OrderID" ; rr:parent "OrderID" ] ; ]; ] .
+
+<#TriplesMapProducts> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Products" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/products/{ProductID}"; rr:class Demo:Products; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:productid ] ; rr:objectMap [ rr:column "ProductID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:productname ] ; rr:objectMap [ rr:column "ProductName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:quantityperunit ] ; rr:objectMap [ rr:column "QuantityPerUnit" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:unitprice ] ; rr:objectMap [ rr:column "UnitPrice" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:unitsinstock ] ; rr:objectMap [ rr:column "UnitsInStock" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:unitsonorder ] ; rr:objectMap [ rr:column "UnitsOnOrder" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:reorderlevel ] ; rr:objectMap [ rr:column "ReorderLevel" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:discontinued ] ; rr:objectMap [ rr:column "Discontinued" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:products_has_categories ] ; rr:objectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/categories/{CategoryID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:products_has_suppliers ] ; rr:objectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/suppliers/{SupplierID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:products_of_order_details ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrder_Details>; rr:joinCondition [ rr:child "ProductID" ; rr:parent "ProductID" ] ; ]; ] .
+
+<#TriplesMapProvinces> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Provinces" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/provinces/{CountryCode}/{Province}"; rr:class Demo:Provinces; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:province ] ; rr:objectMap [ rr:column "Province" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:provinces_has_countries ] ; rr:objectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/countries/{CountryCode}" ]; ] .
+
+<#TriplesMapShippers> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Shippers" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/shippers/{ShipperID}"; rr:class Demo:Shippers; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipperid ] ; rr:objectMap [ rr:column "ShipperID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:companyname ] ; rr:objectMap [ rr:column "CompanyName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:phone ] ; rr:objectMap [ rr:column "Phone" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shippers_of_orders ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrders>; rr:joinCondition [ rr:child "ShipperID" ; rr:parent "ShipVia" ] ; ]; ] .
+
+<#TriplesMapSuppliers> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Suppliers" ];
+rr:subjectMap [ rr:termType rr:IRI ; rr:template "http://localhost:8890/Demo/suppliers/{SupplierID}"; rr:class Demo:Suppliers; rr:graph <http://localhost:8890/Demo#> ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:supplierid ] ; rr:objectMap [ rr:column "SupplierID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:companyname ] ; rr:objectMap [ rr:column "CompanyName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:contactname ] ; rr:objectMap [ rr:column "ContactName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:contacttitle ] ; rr:objectMap [ rr:column "ContactTitle" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:address ] ; rr:objectMap [ rr:column "Address" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:city ] ; rr:objectMap [ rr:column "City" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:region ] ; rr:objectMap [ rr:column "Region" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:postalcode ] ; rr:objectMap [ rr:column "PostalCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:country ] ; rr:objectMap [ rr:column "Country" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:countrycode ] ; rr:objectMap [ rr:column "CountryCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:phone ] ; rr:objectMap [ rr:column "Phone" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:fax ] ; rr:objectMap [ rr:column "Fax" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:homepage ] ; rr:objectMap [ rr:column "HomePage" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:suppliers_of_products ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapProducts>; rr:joinCondition [ rr:child "SupplierID" ; rr:parent "SupplierID" ] ; ]; ] .
diff --git a/binsrc/rdb2rdf/ovl.sql b/binsrc/rdb2rdf/ovl.sql
new file mode 100644
index 0000000..1783b7b
--- /dev/null
+++ b/binsrc/rdb2rdf/ovl.sql
@@ -0,0 +1,325 @@
+--
+-- 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.XML_SET_NS_DECL ( 'OVL' , 'http://www.openlinksw.com/schemas/OVL#' , 2)
+;
+
+create function DB.DBA.OVL_NODE_NAME (in source_g_iri varchar, in node_iid varchar)
+{
+ if (isstring (node_iid) and bit_and (__box_flags (node_iid), 1))
+ node_iid := iri_to_id (node_iid);
+ else if (node_iid is null)
+ return null;
+ if (isiri_id (node_iid))
+ {
+ declare bnlabel varchar;
+ declare bnrow integer;
+ if (is_named_iri_id(node_iid))
+ return '<' || id_to_iri (node_iid) || '>';
+ bnlabel := (sparql define input:storage "" select ?l where { graph `iri(?:source_g_iri)` { `iri(?:node_iid)` virtrdf:bnode-label ?l }});
+ if (bnlabel is not null)
+ return '_:' || bnlabel;
+ bnrow := (sparql define input:storage "" select ?r where { graph `iri(?:source_g_iri)` { `iri(?:node_iid)` virtrdf:bnode-row ?r }});
+ if (bnrow is not null)
+ return 'bnode at row ' || cast (bnrow as varchar);
+ return id_to_iri (node_iid);
+ }
+ return 'literal ' || cast (node_iid as varchar);
+}
+;
+
+create function DB.DBA.OVL_EXEC_SPARQL (in source_g_iri varchar, in extras_g_iri varchar, in rules_g_iri varchar, in qry varchar) returns any
+{
+ declare full_qry, state, msg varchar;
+ declare qry_params, rset, metas any;
+ state := '00000';
+ full_qry := concat ('sparql define input:storage "" define input:default-graph-uri <', source_g_iri, '> define input:default-graph-uri <', extras_g_iri, '> define input:named-graph-uri <', rules_g_iri, '> ', qry);
+ -- qry_params := vector ('source_g_iri', source_g_iri, 'extras_g_iri', extras_g_iri, 'rules_g_iri', rules_g_iri);
+ qry_params := vector (extras_g_iri);
+ -- dbg_obj_princ ('DB.DBA.OVL_EXEC_SPARQL () executes ', qry);
+ exec (full_qry, state, msg, qry_params, 1000, metas, rset);
+ if (state <> '00000')
+ {
+ -- dbg_obj_princ ('DB.DBA.OVL_EXEC_SPARQL () signals ', state, msg);
+ return vector (vector (null, 'Error', 'OVL validation has signalled ' || state || ': ' || msg || ' on query ' || qry));
+ }
+ -- dbg_obj_princ ('DB.DBA.OVL_EXEC_SPARQL () makes the result ', rset);
+ if (not isvector (metas) or 3 <> length (metas[0]) or ('severity' <> metas[0][1][0]))
+ return vector ();
+ return rset;
+}
+;
+
+create function DB.DBA.OVL_DERIVE_EXTRAS (in source_g_iri varchar, in extras_g_iri varchar, in rules_g_iri varchar) returns any
+{
+ declare baserules, err_agg any;
+ declare old_extras_count, new_extras_count integer;
+ vectorbld_init (err_agg);
+ baserules := vector (
+ ' select ?s, ("Error") as ?severity,
+ "Nothing to validate?!" as ?message
+ where {
+ optional { ?s ?p ?o }
+ filter (!bound (?s)) } limit 1',
+ ' select ?s, ("Error") as ?severity,
+ "No graph with validation data?!" as ?message
+ where {
+ optional { graph ?rs { ?s ?p ?o } }
+ filter (!bound (?s)) } limit 1',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> is obsolete. ", bif:coalesce(str(?prop_cmt), ""))) as ?message
+ where {
+ ?s ?prop ?o .
+ graph ?rs {
+ ?prop a OVL:ObsoleteProperty .
+ optional { ?prop rdfs:comment ?prop_cmt } } }
+ group by ?s ?o order by asc (str(?s)) asc (str(?prop))
+ ',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> is not know (typo in its IRI?)")) as ?message
+ where {
+ ?s ?prop ?o .
+ graph ?rs { ?prefx a OVL:ClosedWorldPrefix }
+ optional { graph ?rs { ?prop a ?t } }
+ filter (!bound (?t))
+ filter (bif:starts_with (str (?prop), str(?prefx))) }
+ group by ?s ?o order by asc (str(?s)) asc (str(?prop))
+ ',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> has domain <", str (?prop_dom), "> but the actual type of its subject is <", str (?t), ">")) as ?message
+ where {
+ ?s a ?t ; ?prop ?o .
+ graph ?rs {
+ ?prop a rdf:Property ; rdfs:domain ?prop_dom .
+ optional { ?prop_dom OVL:superClassOf ?prop_subdom } .
+ optional { ?t OVL:superClassOf ?sub_of_t filter (?sub_of_t = ?prop_dom) } .
+ filter (!bound (?prop_subdom))
+ filter (!bound (?sub_of_t)) }
+ filter (?t != ?prop_dom) }
+ group by ?s ?t ?prop ?prop_dom order by asc (str(?s)) asc (str(?prop))
+ ',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> has domain <", str (?prop_dom), "> (with subtypes) but the actual type of its subject is <", str (?t), "> is not a subtype of the domain")) as ?message
+ where {
+ ?s a ?t ; ?prop ?o .
+ graph ?rs {
+ ?prop a rdf:Property ; rdfs:domain ?prop_dom . ?prop_dom OVL:superClassOf ?prop_subdom
+ optional { ?prop_dom OVL:superClassOf ?t1 . filter (?t1 = ?t) } }
+ filter (!bound (?t1)) }
+ group by ?s ?t ?prop ?prop_dom order by asc(str(?s)) asc (str(?prop))
+ ',
+ ' insert in graph iri(??) { ?prop_obj a ?range ; OVL:info `bif:concat("Node <", str (?prop_obj), "> gets type <", str (?range), "> because it is in range of <", str (?prop), ">")` }
+ where {
+ graph ?rs { ?prop a rdf:Property, OVL:InferTypeFromRange ; rdfs:range ?range }
+ ?s ?prop ?prop_obj . optional { ?prop_obj a ?t }
+ filter (!bound(?t))
+ filter (!isliteral (?prop_obj)) }
+ ' );
+ old_extras_count := 0;
+next_round:
+ foreach (varchar qry in baserules) do
+ {
+ declare new_errs any;
+ new_errs := DB.DBA.OVL_EXEC_SPARQL (source_g_iri, extras_g_iri, rules_g_iri, qry);
+ if (length (new_errs))
+ {
+ vectorbld_concat_acc (err_agg, new_errs);
+ goto no_more_rounds;
+ }
+ }
+ new_extras_count := (sparql select count (*) where { graph `iri(?:extras_g_iri)` { ?s ?p ?o }});
+ if (new_extras_count <= old_extras_count)
+ goto no_more_rounds;
+ old_extras_count := new_extras_count;
+ goto next_round;
+no_more_rounds:
+ vectorbld_final (err_agg);
+ return err_agg;
+}
+;
+
+create function DB.DBA.OVL_VALIDATE_READONLY (in source_g_iri varchar, in extras_g_iri varchar, in rules_g_iri varchar) returns any
+{
+ declare baserules, err_agg any;
+ baserules := vector (
+-- Checks for ranges:
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> has range <", str (?prop_range), "> but the actual type of its object <", str (?o), "> is <", str (?t), ">")) as ?message
+ where {
+ ?s ?prop ?o . ?o a ?t .
+ graph ?rs {
+ ?prop a rdf:Property ; rdfs:range ?prop_range .
+ optional { ?prop_range OVL:superClassOf ?prop_subrange }
+ filter (!bound (?prop_subrange)) }
+ filter (?t != ?prop_range) }
+ group by ?s ?t ?prop ?prop_range ?o order by asc (str(?s)) asc (str(?prop))',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> has range <", str (?prop_range), "> but the actual type of its object <", str (?o), "> is not specified")) as ?message
+ where {
+ ?s ?prop ?o . optional { ?o a ?t } . filter (!isliteral(?o)) . filter (!bound(?t))
+ graph ?rs {
+ ?prop a rdf:Property ; rdfs:range ?prop_range .
+ optional { ?prop_range OVL:superClassOf ?prop_subrange }
+ optional { ?prop_range OVL:enumOf ?enum_val }
+ filter (!bound (?prop_subrange))
+ filter (!bound (?enum_val))
+ filter (?prop_range != xsd:anyURI)
+ filter (isIRI(?o) && (?prop_range = rdfs:Class)) } }
+ group by ?s ?t ?prop ?prop_range ?o order by asc (str(?s)) asc (str(?prop))',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> has range <", str (?prop_range), "> but the actual type of its object \'", str (?o), "\' is <", str (?prop_range), ">")) as ?message
+ where {
+ ?s ?prop ?o . filter (isLiteral(?o))
+ graph ?rs {
+ ?prop a rdf:Property ; rdfs:range ?prop_range .
+ optional { ?prop_range OVL:enumOf ?enum_val }
+ filter (!bound (?enum_val))
+ filter (datatype (?o) != ?prop_range) } }
+ group by ?s ?prop ?prop_range ?o order by asc (str(?s)) asc (str(?prop))',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> has enum <", str (?prop_range), "> as range but the actual value is ", str (?enum_val) )) as ?message
+ where {
+ ?s ?prop ?enum_val
+ graph ?rs {
+ ?prop a rdf:Property ; rdfs:range ?prop_range .
+ ?prop_range OVL:enumOf ?enum_val_1 . }
+ optional { graph ?rs { ?prop_range OVL:enumOf ?enum_val_2 } . FILTER (?enum_val_2 = ?enum_val) }
+ filter (!bound (?enum_val_2)) }
+ group by ?s ?prop ?prop_range ?o order by asc (str(?s)) asc (str(?prop))',
+-- Checks for cardinalities:
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> is mandatory but not specified")) as ?message
+ where {
+ graph ?rs {
+ ?prop a rdf:Property ; rdfs:domain ?prop_dom ; owl:minCardinality ?minc . filter (?minc > 0)
+ optional { ?prop_dom OVL:superClassOf ?prop_subdom } }
+ { ?s a ?prop_dom } union { ?s a ?prop_subdom }
+ optional { ?s ?prop ?o }
+ filter (!bound(?o)) }
+ group by ?s ?prop order by asc (str(?s)) asc (str(?prop))',
+ ' select ?s, ("Warning") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> has suspiciously many values (", str(count(?o)), " values, whereas ", str(min(?maxgoodc)), " is more than enough)")) as ?message
+ where {
+ graph ?rs {
+ ?prop a rdf:Property ; OVL:maxGoodCard ?maxgoodc . optional { ?prop owl:maxCardinality ?maxc } }
+ ?s ?prop ?o }
+ group by ?s ?prop
+ having ((count(?o) > min (?maxgoodc)) && (!count (?maxc) || (count(?o) <= min (?maxc))))
+ order by asc (str(?s)) asc (str(?prop))',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Property <", str(?prop), "> has prohibitively many values (", str(count(?o)), " values, max ", str(min (?maxc)), " allowed)")) as ?message
+ where {
+ graph ?rs {
+ ?prop a rdf:Property ; owl:maxCardinality ?maxc }
+ ?s ?prop ?o }
+ group by ?s ?prop
+ having (count(?o) > min (?maxc))
+ order by asc (str(?s)) asc (str(?prop))',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Properties <", str(?prop1), "> and <", str(?prop2), "> are mutualy exclusive for type <", str(?prop_dom), ">")) as ?message
+ where {
+ graph ?rs {
+ ?prop_dom OVL:typeRestriction [ OVL:mutuallyExclusivePredicates ?prop1, ?prop2 ] . filter (str(?prop1) < str(?prop2))
+ optional { ?prop_dom OVL:superClassOf ?prop_subdom } }
+ { ?s a ?prop_dom } union { ?s a ?prop_subdom }
+ ?s ?prop1 ?o1 ; ?prop2 ?o2 }
+ group by ?s ?prop1 ?prop2
+ order by asc (str(?s)) asc (str(?prop1)) asc (str(?prop2))',
+ ' select ?s, ("Error") as ?severity,
+ (bif:concat ("Subject of type <", str(?prop_dom), "> does not have any of predicates of a mandatory group")) as ?message
+ where {
+ graph ?rs {
+ ?prop_dom OVL:typeRestriction ?restr .
+ ?restr OVL:needSomeOfPredicates ?pred .
+ optional { ?prop_dom OVL:superClassOf ?prop_subdom } }
+ { ?s a ?prop_dom } union { ?s a ?prop_subdom }
+ optional { ?s ?pred ?o } }
+ group by ?s ?prop_dom ?restr
+ having (count (?o) = 0)
+ order by asc (str(?s)) asc (str(?prop_dom))' );
+ vectorbld_init (err_agg);
+ foreach (varchar qry in baserules) do
+ {
+ declare new_errs any;
+ new_errs := DB.DBA.OVL_EXEC_SPARQL (source_g_iri, extras_g_iri, rules_g_iri, qry);
+ -- dbg_obj_princ ('OVL_VALIDATE_READONLY after ', qry, ': ', new_errs);
+ vectorbld_concat_acc (err_agg, new_errs);
+ }
+ for (sparql define input:storage ""
+ select ?qry
+ where { graph `iri (?:rules_g_iri)` { ?pred OVL:inconsistencyOfPredicate ?qry } }
+ order by asc (str(?qry)) ) do
+ {
+ declare new_errs any;
+ new_errs := DB.DBA.OVL_EXEC_SPARQL (source_g_iri, extras_g_iri, rules_g_iri, "qry");
+ -- dbg_obj_princ ('OVL_VALIDATE_READONLY after ', "qry", ': ', new_errs);
+ vectorbld_concat_acc (err_agg, new_errs);
+ }
+ vectorbld_final (err_agg);
+ return err_agg;
+}
+;
+
+create procedure DB.DBA.OVL_VALIDATE (in source_g_iri varchar, in rules_g_iri varchar)
+{
+ declare extras_g_iri varchar;
+ declare err_agg, res any;
+ declare SUBJ, SEVERITY, MESSAGE varchar;
+ result_names (SUBJ, SEVERITY, MESSAGE);
+ extras_g_iri := 'http://virtuoso.openlinksw.com/tmp/OVL/' || DB.DBA.R2RML_MD5_IRI (vector (source_g_iri, rules_g_iri));
+ sparql clear graph iri (?:extras_g_iri);
+ commit work;
+ vectorbld_init (err_agg);
+ res := DB.DBA.OVL_DERIVE_EXTRAS (source_g_iri, extras_g_iri, rules_g_iri);
+ if (length (res))
+ {
+ vectorbld_concat_acc (err_agg, res);
+ goto final_report;
+ }
+ res := DB.DBA.OVL_VALIDATE_READONLY (source_g_iri, extras_g_iri, rules_g_iri);
+ vectorbld_concat_acc (err_agg, res);
+final_report:
+ vectorbld_final (err_agg);
+ if (length (err_agg))
+ {
+ for (sparql define input:storage "" select ?s, ?info where { graph `iri(?:extras_g_iri)` { ?s OVL:info ?info }} order by 1 2) do
+ {
+ result (DB.DBA.OVL_NODE_NAME (source_g_iri, "s"), 'Info', "info");
+ }
+ }
+ else
+ {
+ declare infocount integer;
+ result (NULL, 'Info', 'No errors or warnings found');
+ infocount := ((sparql define input:storage "" select count (1) where { graph `iri(?:extras_g_iri)` { ?s OVL:info ?info }}));
+ if (infocount > 0)
+ {
+ result (NULL, 'Info', sprintf ('The validator has made %d small additions to the R2RML source', infocount));
+ result (NULL, 'Info', 'The added triples are saved in graph <' || extras_g_iri || '> for reference');
+ }
+ }
+ foreach (any err in err_agg) do
+ {
+ result (DB.DBA.OVL_NODE_NAME (source_g_iri, err[0]), err[1], err[2]);
+ }
+}
+;
diff --git a/binsrc/rdb2rdf/r2rml.sql b/binsrc/rdb2rdf/r2rml.sql
new file mode 100644
index 0000000..394a367
--- /dev/null
+++ b/binsrc/rdb2rdf/r2rml.sql
@@ -0,0 +1,1153 @@
+--
+-- Converter from R2RML graph to SPARQL-BI declaration of RDF Views.
+--
+-- The implemented version of the spec is "Overview.html,v 1.59 2011/05/24 19:22:21 rcygania2 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.XML_SET_NS_DECL ( 'rr' , 'http://www.w3.org/ns/r2rml#' , 2)
+;
+
+DB.DBA.XML_SET_NS_DECL ( 'exa' , 'http://example.com/ns#' , 1)
+;
+
+EXEC_STMT ('drop type DB.DBA.R2RML_MAP', 0)
+;
+
+create type DB.DBA.R2RML_MAP as (
+ graph_iid IRI_ID, --!< IRI_ID of a graph with R2RML description in question. Set by constructor, constant after that
+ triplesmap_metas_cache any, --!< Dictionary with rr:TriplesMap IRI_IDs as keys and metadata vectors of tables/SQLQueries as values
+-- Metadata vector is (('TABLE'/'QUERY', schema, owner, text), (column_name, (NULL, column_name, column_metas), ...))
+ declared_jsos any, --!< Dictionary with IRI_IDs of all JSOs that have the 'create' source code written into codegen_ses
+ declared_ns_prefixes any, --!< Dictionary with namespace IRIs as keys and theird declared prefixes as values
+ declared_tmap_aliases any, --!< Dictionary with TripleMap IRI_IDs as keys and aliases of tables/queries as values
+ used_fld_tmap_aliases any, --!< Vector of vectors of table/query aliases used in G, S, P, O and WHERE of the current map.
+ default_constg IRI_ID, --!< Default constant graph of quad map, if not a variable and if single value
+ prev_p_md5 varchar, --!< Checksum of last printed predicate of QM declaration
+ codegen_ses any --!< String output for the generated SPARQL text
+ ) self as ref
+constructor method R2RML_MAP (in graph_iid IRI_ID),
+method R2RML_DEST_IID_OF_THING (in src_iid IRI_ID, in depth_limit integer) returns IRI_ID,
+method R2RML_ADD_NS_PREFIX_TO_CACHE (in iri varchar) returns integer,
+method R2RML_FILL_NS_PREFIXES_CACHE () returns integer,
+method R2RML_IRI_ID_AS_QNAME (in iid any) returns varchar,
+method R2RML_FILL_TRIPLESMAP_METAS_CACHE () returns integer,
+method R2RML_TRIPLESMAP_TABLE_REPORT_NAME (in triplesmap_iid IRI_ID) returns varchar,
+method R2RML_GET_COL_DESC (in triplesmap_iid IRI_ID, in col_name varchar) returns any, --!< Returns vector (triplesmap_iid, triplesmap_metas[0], column_metas)
+method R2RML_GEN_CONST_FLD (in constfld any, in termtype varchar, in dt IRI_ID, in lang varchar) returns integer,
+method R2RML_RESET_USES_OF_TMAPS (in fld_idx integer) returns any,
+method R2RML_REGISTER_USE_OF_TMAP (in fld_idx integer, in tmap IRI_ID) returns varchar,
+method R2RML_GEN_CREATE_IOL_CLASS_OR_REF (in fld_idx integer, in mode integer, in triplesmap_iid IRI_ID, in src_template varchar, in termtype varchar, in dt IRI_ID, in lang varchar) returns IRI_ID,
+method R2RML_GEN_FLD (in fld_idx integer, in constfld any, in triplesmap_iid IRI_ID, in col varchar, in src_template varchar, in termtype varchar, in dt IRI_ID, in lang varchar) returns integer,
+method R2RML_VALIDATE () returns any,
+method R2RML_MAKE_QM_IMPL_IOL_CLASSES () returns any,
+method R2RML_MAKE_QM_IMPL_CHILDS (in needs_inner_g_field integer) returns any,
+method R2RML_MAKE_QM_IMPL_REL_PO (in tmap IRI_ID, in tmap2 IRI_ID, in tmap2sfld IRI_ID, in pofld IRI_ID, in pconst IRI_ID, in pfld IRI_ID, in rofld IRI_ID) returns any,
+method R2RML_MAKE_QM_IMPL_PLAIN_PO (in tmap IRI_ID, in pofld IRI_ID, in pconst IRI_ID, in pfld IRI_ID, in oconst any, in ofld IRI_ID) returns any,
+method R2RML_MAKE_QM (in storage_iid IRI_ID, in rdfview_iid IRI_ID) returns any
+;
+
+create constructor method R2RML_MAP (in graph_iid IRI_ID) for DB.DBA.R2RML_MAP
+{
+ self.graph_iid := graph_iid;
+ self.codegen_ses := null;
+ self.declared_ns_prefixes := dict_new (31);
+
+}
+;
+
+create function DB.DBA.R2RML_MD5_IRI (inout box any) returns varchar
+{
+ declare hex, md5, res varchar;
+ declare i integer;
+ -- return sprintf ('%U', serialize (box));
+ md5 := md5_box (box);
+ res := space (32);
+ hex := '0123456789abcdef';
+ for (i := 0; i < 16; i := i + 1)
+ {
+ res[i*2] := hex[md5[i]/16];
+ res[i*2+1] := hex[mod(md5[i],16)];
+ }
+ return res;
+}
+;
+
+create method R2RML_DEST_IID_OF_THING (in src_iid IRI_ID, in depth_limit integer := 10) for DB.DBA.R2RML_MAP
+{
+ declare parts_agg any;
+ if (src_iid is null)
+ return NULL;
+ if (src_iid < min_bnode_iri_id())
+ return src_iid;
+ if (0 > depth_limit)
+ signal ('R2RML', 'Cyclic dependency in R2RML data or an abnormal nesting depth');
+ depth_limit := depth_limit - 1;
+ vectorbld_init (parts_agg);
+ for (sparql define input:storage "" define output:valmode "LONG"
+ select ?p ?o where { graph `iri(?:self.graph_iid)` { `iri(?:src_iid)` ?p ?o } } ) do
+ {
+ if (isiri_id ("o"))
+ vectorbld_agg (parts_agg, self.R2RML_DEST_IID_OF_THING ("o", depth_limit));
+ else
+ vectorbld_agg (parts_agg, md5_box ("o"));
+ }
+ vectorbld_final (parts_agg);
+ gvector_sort (parts_agg, 1, 0, 0);
+ return 'r2rml:virt01-' || DB.DBA.R2RML_MD5_IRI (parts_agg);
+}
+;
+
+create function R2RML_NS_OF_IRI (in iri varchar) returns varchar
+{
+ declare irilen, patchedlen, taillen integer;
+ declare patched varchar;
+ if (iri = '')
+ return null;
+ if (subseq (iri, 0, 2) = '_:')
+ return null; -- 0123456789
+ if (subseq (iri, 0, 9) = 'nodeID://')
+ return null;
+ patched := sprintf ('%U', iri);
+ irilen := length (iri);
+ patchedlen := length (patched);
+ for (taillen := 0; taillen < irilen; taillen := taillen + 1)
+ {
+ if (iri[irilen-(1+taillen)] <> patched[patchedlen-(1+taillen)])
+ goto found_diff;
+ }
+found_diff:
+ if (taillen >= irilen)
+ return NULL;
+ return subseq (iri, 0, irilen-taillen);
+}
+;
+
+create method R2RML_ADD_NS_PREFIX_TO_CACHE (in iri varchar) returns integer for DB.DBA.R2RML_MAP
+{
+ declare ns varchar;
+ declare prefx varchar;
+ ns := DB.DBA.R2RML_NS_OF_IRI (iri);
+ if (ns is null)
+ return 0;
+ prefx := dict_get (self.declared_ns_prefixes, ns, null);
+ if (prefx is not null)
+ return 0;
+ prefx := coalesce (__xml_get_ns_prefix (ns, 3), sprintf ('ns%d', dict_size (self.declared_ns_prefixes)));
+ dict_put (self.declared_ns_prefixes, ns, prefx);
+ http ('prefix ' || prefx || ': <' || ns || '>\n', self.codegen_ses);
+}
+;
+
+create method R2RML_FILL_NS_PREFIXES_CACHE () returns integer for DB.DBA.R2RML_MAP
+{
+ for (sparql define input:storage ""
+ select distinct ?i where { graph `iri(?:self.graph_iid)` {
+ {
+ ?s ?p ?i .
+ filter (?p in (rr:graph, rr:subject, rr:predicate, rr:object))
+ }
+ union
+ {
+ ?i a ?t .
+ filter (?t in (rr:GraphMap, rr:SubjectMap, rr:PredicateObjectMap, rr:PredicateMap, rr:ObjectMap))
+ }
+ filter (isIRI (?i)) } }
+ order by asc (str (?i)) ) do
+ {
+ self.R2RML_ADD_NS_PREFIX_TO_CACHE ("i");
+ }
+ return dict_size (self.declared_ns_prefixes);
+}
+;
+
+create method R2RML_IRI_ID_AS_QNAME (in iid any) returns varchar for DB.DBA.R2RML_MAP
+{
+ declare iri, ns varchar;
+ if (isstring (iid))
+ {
+ iri := iid;
+ if (subseq (iri, 0, 2) = '_:')
+ return iri; -- 0123456789
+ if (subseq (iri, 0, 9) = 'nodeID://')
+ return '_:' || subseq (iri, 9);
+ }
+ else
+ {
+ if (iid >= min_bnode_iri_id ())
+ {
+ if (iid >= min_named_bnode_iri_id ())
+ return '<' || id_to_iri (iid) || '>';
+ return '_:' || subseq (id_to_iri (iid), 9);
+ }
+ iri := id_to_iri (iid);
+ }
+ ns := DB.DBA.R2RML_NS_OF_IRI (iri);
+ if (ns is not null)
+ {
+ declare prefx varchar;
+ prefx := dict_get (self.declared_ns_prefixes, ns, null);
+ if (prefx is not null)
+ return prefx || ':' || subseq (iri, length (ns));
+ }
+ return '<' || iri || '>';
+}
+;
+
+create function DB.DBA.R2RML_UNQUOTE_NAME (in name varchar) returns varchar
+{
+ if (name like '"%"')
+ name := subseq (name, 1, length (name) - 1);
+ if (strchr (name, '"') is not null)
+ signal ('R2RML', 'Invalid or unsupported type of SQL name: "' || name || '"');
+ return name;
+}
+;
+
+create method R2RML_FILL_TRIPLESMAP_METAS_CACHE () returns integer for DB.DBA.R2RML_MAP
+{
+ self.triplesmap_metas_cache := dict_new (11);
+ for (sparql define input:storage ""
+ select distinct ?triplesmap ?q ?ts ?to ?tn where { graph `iri(?:self.graph_iid)` {
+ ?triplesmap a rr:TriplesMap .
+ optional { ?triplesmap rr:logicalTable ?ltbl }
+ { ?lt rr:sqlQuery ?q }
+ UNION
+ { ?lt rr:tableName ?tn .
+ OPTIONAL { ?lt rr:tableOwner ?to }
+ OPTIONAL { ?lt rr:tableSchema ?ts } }
+ filter (?lt in (?triplesmap, ?ltbl)) } } ) do
+ {
+ declare triplesmap_iid IRI_ID;
+ declare text_to_prepare, stat, msg varchar;
+ declare exec_metas, all_metas any;
+ declare colctr, colcount integer;
+ triplesmap_iid := iri_to_id ("triplesmap");
+ if (dict_get (self.triplesmap_metas_cache, triplesmap_iid, NULL) is not null)
+ signal ('R2RML', 'Multiple declaration of data source for <' || "triplesmap" || '>');
+ all_metas := vector (null, null);
+ if ("q" is not null)
+ {
+ while (("q" <> '') and strchr (' \t\r\n', chr ("q" [length ("q") - 1])) is not null)
+ "q" := "LEFT" ("q", length ("q") - 1);
+ if (("q" <> '') and ';' = chr ("q" [length ("q") - 1]))
+ "q" := "LEFT" ("q", length ("q") - 1);
+ all_metas[0] := vector ('QUERY', null, null, "q");
+ text_to_prepare := "q";
+ }
+ else
+ {
+ all_metas[0] := vector ('TABLE', DB.DBA.R2RML_UNQUOTE_NAME (coalesce ("ts", 'DB')), DB.DBA.R2RML_UNQUOTE_NAME (coalesce ("to", 'DBA')), DB.DBA.R2RML_UNQUOTE_NAME ("tn"));
+ text_to_prepare := sprintf ('select * from "%I"."%I"."%I"', all_metas[0][1], all_metas[0][2], all_metas[0][3]);
+ }
+ stat := '00000';
+ exec_metadata (text_to_prepare, stat, msg, exec_metas);
+ if (stat <> '00000')
+ signal ('R2RML', 'Error ' || stat || ' in declaration of data source for <' || "triplesmap" || '>: ' || msg || '; failed test query is ' || text_to_prepare);
+ if (exec_metas[1] <> 1)
+ signal ('R2RML', 'The declaration of data source for <' || "triplesmap" || '> is a potentially dangerous DML');
+ exec_metas := exec_metas[0];
+ colcount := length (exec_metas);
+ all_metas[1] := make_array (colcount*2, 'any');
+ for (colctr := 0; colctr < colcount; colctr := colctr + 1)
+ {
+ all_metas[1][colctr*2] := exec_metas[colctr][0];
+ all_metas[1][colctr*2+1] := exec_metas[colctr];
+ }
+ dict_put (self.triplesmap_metas_cache, triplesmap_iid, all_metas);
+ }
+ return dict_size (self.triplesmap_metas_cache);
+}
+;
+
+create function DB.DBA.R2RML_MAIN_KEY_EXISTS (in q varchar, in u varchar, in n varchar, in case_prec integer := 0)
+{
+ if (case_prec)
+ return (select top 1 KEY_TABLE from DB.DBA.SYS_KEYS
+ where KEY_IS_MAIN and 0 = casemode_strcmp (sprintf ('%s.%s.%s', coalesce (q, 'DB'), coalesce (u, 'DBA'), n), KEY_TABLE) );
+ return (select top 1 KEY_TABLE from DB.DBA.SYS_KEYS
+ where KEY_IS_MAIN and sprintf ('%s.%s.%s', coalesce (q, 'DB'), coalesce (u, 'DBA'), n) = KEY_TABLE );
+}
+;
+
+grant execute on DB.DBA.R2RML_MAIN_KEY_EXISTS to public
+;
+
+create function DB.DBA.R2RML_KEY_COLUMN_EXISTS (in q varchar, in u varchar, in n varchar, in c varchar, in case_prec integer := 0)
+{
+ if (case_prec)
+ return (select top 1 "COLUMN" from DB.DBA.SYS_KEY_COLUMNS
+ where 0 = casemode_strcmp (sprintf ('%s.%s.%s', coalesce (q, 'DB'), coalesce (u, 'DBA'), n), "TABLE")
+ and 0 = casemode_strcmp (c, "COLUMN") );
+ return (select top 1 "COLUMN" from DB.DBA.SYS_KEY_COLUMNS
+ where sprintf ('%s.%s.%s', coalesce (q, 'DB'), coalesce (u, 'DBA'), n) = "TABLE"
+ and c = "COLUMN" );
+}
+;
+
+grant execute on DB.DBA.R2RML_KEY_COLUMN_EXISTS to public
+;
+
+create method R2RML_TRIPLESMAP_TABLE_REPORT_NAME (in triplesmap_iid IRI_ID) returns varchar for DB.DBA.R2RML_MAP
+{
+ declare all_metas any;
+ all_metas := dict_get (self.triplesmap_metas_cache, triplesmap_iid, null);
+ if (dict_get (self.triplesmap_metas_cache, triplesmap_iid, NULL) is null)
+ return '(Undeclared data source <' || id_to_iri (triplesmap_iid) || '>)';
+ for (sparql define input:storage ""
+ select ?q ?tn ?to where { graph `iri(?:self.graph_iid)` {
+ ?triplesmap a rr:TriplesMap .
+ filter (?triplesmap = iri(?:triplesmap_iid))
+ optional { ?triplesmap rr:logicalTable ?ltbl }
+ { ?lt rr:sqlQuery ?q }
+ UNION
+ { ?lt rr:tableName ?tn .
+ OPTIONAL { ?lt rr:tableOwner ?to }
+ OPTIONAL { ?lt rr:tableSchema ?ts } }
+ filter (?lt in (?triplesmap, ?ltbl)) } } ) do
+ {
+ if ("q" is not null)
+ return 'query in TriplesMap <' || id_to_iri (triplesmap_iid) || '>';
+ if ("to" is null)
+ return 'table ' || "tn";
+ else
+ return 'table DB.' || "to" || '.' || "tn";
+ }
+}
+;
+
+create method R2RML_GET_COL_DESC (in triplesmap_iid IRI_ID, in col_name varchar) returns any for DB.DBA.R2RML_MAP
+{
+ declare all_metas, res any;
+ all_metas := dict_get (self.triplesmap_metas_cache, triplesmap_iid, null);
+ if (dict_get (self.triplesmap_metas_cache, triplesmap_iid, NULL) is null)
+ signal ('R2RML', 'Undeclared data source <' || id_to_iri (triplesmap_iid) || '>');
+ res := get_keyword (col_name, all_metas[1], null);
+ if (res is null)
+ signal ('R2RML', 'Data source <' || id_to_iri (triplesmap_iid) || '> does not produce column "' || col_name || '"');
+ res := vector (triplesmap_iid, all_metas[0], res);
+ -- dbg_obj_princ ('R2RML_GET_COL_DESC (', triplesmap_iid, col_name, ') returns ', res);
+ return res;
+}
+;
+
+create function DB.DBA.R2RML_SPLIT_TEMPLATE (in strg varchar) returns any
+{
+ declare splitlbra, parts any;
+ declare ctr, len, rbra_idx integer;
+ splitlbra := split_and_decode (strg, 0, '\0\0{');
+ len := length (splitlbra);
+ parts := make_array ((len * 2) - 1, 'any');
+ if (strchr (splitlbra[0], '}') is not null)
+ signal ('R2RML', 'Syntax error in template: first "}" is before first "{"');
+ parts[0] := splitlbra[0];
+ for (ctr := 1; ctr < len; ctr := ctr + 1)
+ {
+ rbra_idx := strchr (splitlbra[ctr], '}');
+ if (rbra_idx is null)
+ signal ('R2RML', 'Syntax error in template: "{" without matching "}"');
+ parts[ctr*2-1] := DB.DBA.R2RML_UNQUOTE_NAME (subseq (splitlbra[ctr], 0, rbra_idx));
+ parts[ctr*2] := subseq (splitlbra[ctr], rbra_idx+1);
+ }
+ return parts;
+}
+;
+
+create method R2RML_GEN_CONST_FLD (in constfld any, in termtype varchar, in dt IRI_ID, in lang varchar) returns integer for DB.DBA.R2RML_MAP
+{
+ if ((termtype in ('http://www.w3.org/ns/r2rml#IRI', 'http://www.w3.org/ns/r2rml#BlankNode'))
+ or (__tag (constfld) = __tag of IRI_ID)
+ or (isstring (constfld) and bit_and (__box_flags (constfld), 1)) )
+ {
+ http (self.R2RML_IRI_ID_AS_QNAME (constfld), self.codegen_ses);
+ return 0;
+ }
+ if (__tag (constfld) = __tag of RDF_BOX)
+ {
+ http ('"', self.codegen_ses);
+ http_escape (__rdf_strsqlval (constfld), 11, self.codegen_ses, 1, 1);
+ http ('"', self.codegen_ses);
+ if (dt is null)
+ {
+ declare dt_twobytes integer;
+ dt_twobytes := rdf_box_type (constfld);
+ if (257 <> dt_twobytes)
+ dt := iri_to_id ((select RDT_QNAME from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = dt_twobytes));
+ }
+ if (lang is null)
+ {
+ declare lang_twobytes integer;
+ lang_twobytes := rdf_box_lang (constfld);
+ if (257 <> lang_twobytes)
+ lang := (select RL_ID from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = lang_twobytes);
+ }
+ }
+ else if (__tag of XML = __tag (constfld))
+ {
+ http ('"', self.codegen_ses);
+ http_escape (serialize_to_UTF8_xml (constfld), 11, self.codegen_ses, 1, 1);
+ http ('"', self.codegen_ses);
+ }
+ else if (isstring (constfld) or (__tag of XML = __tag (constfld)))
+ {
+ http ('"', self.codegen_ses);
+ http_escape (constfld, 11, self.codegen_ses, 1, 1);
+ http ('"', self.codegen_ses);
+ }
+ else
+ {
+ http ('"', self.codegen_ses);
+ http_escape (cast (constfld as varchar), 11, self.codegen_ses, 1, 1);
+ http ('"', self.codegen_ses);
+ if (dt is null)
+ dt := iri_to_id (__xsd_type (constfld, null));
+ }
+ if (dt is not null)
+ {
+ http ('^^', self.codegen_ses);
+ self.R2RML_IRI_ID_AS_QNAME (dt);
+ }
+ else if (isstring (lang))
+ {
+ http ('@', self.codegen_ses);
+ http (lang, self.codegen_ses);
+ }
+ return 0;
+}
+;
+
+create function DB.DBA.R2RML_XSD_TYPE_OF_DTP (in dtp integer)
+{
+ if (__tag of datetime = dtp) return 'http://www.w3.org/2001/XMLSchema#dateTime';
+ if (__tag of date = dtp) return 'http://www.w3.org/2001/XMLSchema#date';
+ if (__tag of time = dtp) return 'http://www.w3.org/2001/XMLSchema#time';
+ if (dtp in (__tag of varchar, __tag of nvarchar, __tag of long varchar, __tag of long nvarchar)) return NULL;
+ if (__tag of integer = dtp) return 'http://www.w3.org/2001/XMLSchema#integer';
+ if (__tag of double precision = dtp) return 'http://www.w3.org/2001/XMLSchema#double';
+ if (__tag of numeric = dtp) return 'http://www.w3.org/2001/XMLSchema#double';
+ if (__tag of real = dtp) return 'http://www.w3.org/2001/XMLSchema#float';
+ if (230) return 'http://www.w3.org/2001/XMLSchema#XMLLiteral';
+ if (238) return 'http://www.openlinksw.com/schemas/virtrdf#Geometry';
+ return 'http://www.w3.org/2001/XMLSchema#any';
+}
+;
+
+create method R2RML_RESET_USES_OF_TMAPS (in fld_idx integer) returns any for DB.DBA.R2RML_MAP
+{
+ declare all_aliases any;
+ all_aliases := self.used_fld_tmap_aliases;
+ all_aliases[fld_idx] := vector ();
+ self.used_fld_tmap_aliases := all_aliases;
+ -- dbg_obj_princ ('R2RML_RESET_USES_OF_TMAPS (', fld_idx, ') resulted in ', self.used_fld_tmap_aliases);
+}
+;
+
+create method R2RML_REGISTER_USE_OF_TMAP (in fld_idx integer, in tmap IRI_ID) returns varchar for DB.DBA.R2RML_MAP
+{
+ declare alias varchar;
+ declare all_aliases any;
+ alias := dict_get (self.declared_tmap_aliases, tmap, null);
+ if (alias is null)
+ signal ('R2RML', sprintf ('The table source "%s" is used but not defined, maybe strange R2RML', tmap));
+ all_aliases := self.used_fld_tmap_aliases;
+ if (0 >= position (alias, all_aliases[fld_idx]))
+ {
+ all_aliases[fld_idx] := vector_concat (all_aliases[fld_idx], vector (alias));
+ self.used_fld_tmap_aliases := all_aliases;
+ }
+ -- dbg_obj_princ ('R2RML_REGISTER_USE_OF_TMAP (', fld_idx, tmap, ') resulted in ', self.used_fld_tmap_aliases);
+ return alias;
+}
+;
+
+create method R2RML_GEN_CREATE_IOL_CLASS_OR_REF (in fld_idx integer, in mode integer, in triplesmap_iid IRI_ID, in src_template varchar, in termtype varchar, in dt IRI_ID, in lang varchar) returns IRI_ID for DB.DBA.R2RML_MAP
+{
+ declare format_string, class_iri varchar;
+ declare format_ses, format_parts, col_descs, argtypes, class_digest any;
+ declare argctr, argcount integer;
+ -- dbg_obj_princ ('R2RML_GEN_CREATE_IOL_CLASS_OR_REF (', fld_idx, mode, triplesmap_iid, src_template, termtype, dt, lang, ')');
+ if (termtype = 'http://www.w3.org/ns/r2rml#BlankNode')
+ {
+ src_template := '_:r2rml' || src_template;
+ termtype := 'http://www.w3.org/ns/r2rml#IRI';
+ }
+ format_parts := DB.DBA.R2RML_SPLIT_TEMPLATE (src_template);
+ argcount := (length (format_parts) - 1) / 2;
+ if (0 = argcount) -- constant written as a template for some reason.
+ {
+ if (2 = mode) -- i.e., CREATE IRI CLASS or CREATE LITERAL CLASS statement
+ self.R2RML_GEN_CONST_FLD (src_template, termtype, dt, lang);
+ return null;
+ }
+ argtypes := make_array (argcount, 'any');
+ col_descs := make_array (argcount, 'any');
+ format_ses := string_output ();
+ for (argctr := 0; argctr < argcount; argctr := argctr + 1)
+ {
+ declare col_name, coltype, col_fmt varchar;
+ declare col_desc any;
+ col_name := format_parts[argctr * 2 + 1];
+ col_desc := self.R2RML_GET_COL_DESC (triplesmap_iid, col_name);
+ col_descs[argctr] := col_desc;
+ if (col_desc is null)
+ signal ('R2RML', sprintf ('The column "%s" is used in template "%s" but not in result set of <%s>', col_name, src_template, id_to_iri (triplesmap_iid)));
+ coltype := col_desc[2];
+ argtypes[argctr] := vector (coltype[1], coltype[4]);
+ col_fmt := case
+ when (coltype[1] in (__tag of date, __tag of datetime, __tag of datetime)) then '%D'
+ when (coltype[1] in (__tag of integer)) then '%d'
+ when (coltype[1] in (__tag of real, __tag of double precision, __tag of numeric)) then '%g'
+ when (coltype[1] in (__tag of varchar, __tag of nvarchar)) then
+ case (termtype) when 'http://www.w3.org/ns/r2rml#Literal' then '%s' else '%U' end
+ else
+ signal ('R2RML',
+ sprintf ('Unsupported column type %d, column %s of %s',
+ coltype[1], col_desc[2][0], self.R2RML_TRIPLESMAP_TABLE_REPORT_NAME (triplesmap_iid) ) )
+ end;
+ http_escape (replace (format_parts[argctr * 2], '%', '%%'), 11, format_ses);
+ http (col_fmt, format_ses);
+ }
+ http_escape (replace (format_parts[argcount * 2], '%', '%%'), 11, format_ses);
+ format_string := string_output_string (format_ses);
+ class_digest := vector (termtype, format_string, argtypes, dt, lang);
+ class_iri := 'r2rml:virt02-' || DB.DBA.R2RML_MD5_IRI (class_digest);
+ if (1 = mode) -- i.e., CREATE IRI CLASS or CREATE LITERAL CLASS statement
+ goto create_iol_class;
+ if (2 = mode) -- i.e., quad map value in form class_iri (args)
+ goto print_field;
+ signal ('R2RML', 'iternal error: bad mode');
+create_iol_class:
+ if (dict_get (self.declared_jsos, class_iri, null) is null)
+ {
+ http ('create ' || subseq (termtype, length ('http://www.w3.org/ns/r2rml#')) || ' class <' || class_iri || '> "' || format_string || '" (', self.codegen_ses);
+ for (argctr := 0; argctr < argcount; argctr := argctr + 1)
+ {
+ declare argdtp integer;
+ declare argname varchar;
+ argdtp := argtypes[argctr][0];
+ argname := format_parts[argctr * 2 + 1];
+ if (argname <> sprintf ('%U', argname))
+ argname := sprintf ('%s_n%d', replace (replace (sprintf ('%U', argname), '+', '_'), '%', '__'), argctr);
+ if (argctr > 0)
+ http (', ', self.codegen_ses);
+ http ('in ' || argname || ' ' ||
+ case (argdtp)
+ when __tag of date then 'date'
+ when __tag of time then 'time'
+ when __tag of datetime then 'datetime'
+ when __tag of integer then 'integer'
+ when __tag of real then 'real'
+ when __tag of double precision then 'double precision'
+ when __tag of numeric then 'numeric'
+ when __tag of varchar then 'varchar'
+ when __tag of nvarchar then 'nvarchar'
+ else 'any' end ||
+ case (argtypes[argctr][0]) when 0 then ' not null' else '' end,
+ self.codegen_ses );
+ }
+ http (') ', self.codegen_ses);
+ if (dt is not null or lang is not null)
+ {
+ http ('option (', self.codegen_ses);
+ if (dt is not null)
+ {
+ http ('datatype ', self.codegen_ses);
+ http (self.R2RML_IRI_ID_AS_QNAME (dt), self.codegen_ses);
+ }
+ if (lang is not null)
+ {
+ http ('lang "', self.codegen_ses);
+ http_escape (lang, 11, self.codegen_ses);
+ http ('"', self.codegen_ses);
+ }
+ http (') ', self.codegen_ses);
+ }
+ http ('.\n', self.codegen_ses);
+ dict_put (self.declared_jsos, class_iri, class_digest);
+ }
+ return iri_to_id (class_iri);
+print_field:
+ http ('<' || class_iri || '> (', self.codegen_ses);
+ for (argctr := 0; argctr < argcount; argctr := argctr + 1)
+ {
+ declare col_desc any;
+ if (argctr > 0)
+ http (', ', self.codegen_ses);
+ col_desc := col_descs[argctr]; -- col_desc is a vector (triplesmap_iid, all_metas[0], (NULL, column_name, column_metas));
+ -- dbg_obj_princ ('R2RML_GEN_CREATE_IOL_CLASS_OR_REF(): desc #', argctr, ' is ', col_desc);
+ http (self.R2RML_REGISTER_USE_OF_TMAP (fld_idx, col_desc[0]), self.codegen_ses);
+ http ('."', self.codegen_ses);
+ http_escape (col_desc[2][0], 11, self.codegen_ses);
+ http ('"', self.codegen_ses);
+ }
+ http (')', self.codegen_ses);
+ return iri_to_id (class_iri);
+}
+;
+
+create method R2RML_GEN_FLD (in fld_idx integer, in constfld any, in triplesmap_iid IRI_ID, in col varchar, in src_template varchar, in termtype varchar, in dt IRI_ID, in lang varchar) returns integer for DB.DBA.R2RML_MAP
+{
+ self.R2RML_RESET_USES_OF_TMAPS (fld_idx);
+ if (src_template is not null)
+ self.R2RML_GEN_CREATE_IOL_CLASS_OR_REF (fld_idx, 2, triplesmap_iid, src_template, termtype, dt, lang);
+ else if (col is not null)
+ {
+ if ((termtype <> 'http://www.w3.org/ns/r2rml#Literal') or (dt is not null) or (lang is not null))
+ self.R2RML_GEN_CREATE_IOL_CLASS_OR_REF (fld_idx, 2, triplesmap_iid, '{' || col || '}', termtype, dt, lang);
+ else
+ {
+ declare col_desc any;
+ col_desc := self.R2RML_GET_COL_DESC (triplesmap_iid, col);
+ http (self.R2RML_REGISTER_USE_OF_TMAP (fld_idx, col_desc[0]), self.codegen_ses);
+ http (sprintf ('."%I"', col), self.codegen_ses);
+ }
+ }
+ else if (constfld is not null)
+ return self.R2RML_GEN_CONST_FLD (constfld, termtype, dt, lang);
+ else
+ signal ('R2RML', 'FLD without const, col or src_template');
+ return 0;
+}
+;
+
+create method R2RML_MAKE_QM_IMPL_IOL_CLASSES () returns any for DB.DBA.R2RML_MAP
+{
+ foreach (varchar dflttt in vector ('http://www.w3.org/ns/r2rml#IRI', 'http://www.w3.org/ns/r2rml#Literal')) do
+ {
+ for (sparql define input:storage ""
+ select ?triplesmap ?fldmap ?template ?termtype ?dt ?lang
+ where { graph `iri(?:self.graph_iid)` {
+ ?triplesmap a rr:TriplesMap .
+ { ?triplesmap rr:subjectMap [ rr:graphMap ?fldmap ] }
+ union
+ { ?triplesmap rr:predicateObjectMap [ rr:graphMap ?fldmap ] }
+ union
+ { ?triplesmap rr:subjectMap ?fldmap }
+ union
+ { ?triplesmap rr:predicateObjectMap [ rr:predicateMap ?fldmap ] }
+ union
+ { ?triplesmap rr:predicateObjectMap [ rr:objectMap ?fldmap ] }
+ ?fldmap rr:template ?template .
+ optional { ?fldmap rr:termType ?termtype . }
+ optional { ?fldmap rr:datatype ?dt . }
+ optional { ?fldmap rr:language ?lang . }
+ } } ) do
+ {
+ self.R2RML_GEN_CREATE_IOL_CLASS_OR_REF (-1, 1, iri_to_id ("triplesmap"), "template", coalesce (cast ("termtype" as varchar), dflttt), iri_to_id ("dt"), "lang");
+ }
+ }
+ for (sparql define input:storage ""
+ select ?triplesmap ?fldmap ?col ?termtype
+ where { graph `iri(?:self.graph_iid)` {
+ ?triplesmap a rr:TriplesMap .
+ { ?triplesmap rr:subjectMap [ rr:graphMap ?fldmap ] }
+ union
+ { ?triplesmap rr:predicateObjectMap [ rr:graphMap ?fldmap ] }
+ union
+ { ?triplesmap rr:subjectMap ?fldmap }
+ union
+ { ?triplesmap rr:predicateObjectMap [ rr:predicateMap ?fldmap ] }
+ ?fldmap rr:column ?col .
+ optional { ?fldmap rr:termType ?termtype . }
+ } } ) do
+ {
+ self.R2RML_GEN_CREATE_IOL_CLASS_OR_REF (-1, 1, iri_to_id ("triplesmap"), '{' || DB.DBA.R2RML_UNQUOTE_NAME ("col") || '}', coalesce (cast ("termtype" as varchar), 'http://www.w3.org/ns/r2rml#IRI'), null, null);
+ }
+ for (sparql define input:storage ""
+ select ?triplesmap ?fldmap ?col ?termtype ?dt ?lang
+ where { graph `iri(?:self.graph_iid)` {
+ ?triplesmap a rr:TriplesMap .
+ ?triplesmap rr:predicateObjectMap [ rr:objectMap ?fldmap ] .
+ ?fldmap rr:column ?col .
+ optional { ?fldmap rr:termType ?termtype . }
+ optional { ?fldmap rr:datatype ?dt . }
+ optional { ?fldmap rr:language ?lang . } } } ) do
+ {
+ if ((("termtype" is not null) and ("termtype" <> 'http://www.w3.org/ns/r2rml#Literal')) or ("dt" is not null) or ("lang" is not null))
+ self.R2RML_GEN_CREATE_IOL_CLASS_OR_REF (-1, 1, iri_to_id ("triplesmap"), '{' || DB.DBA.R2RML_UNQUOTE_NAME ("col") || '}', coalesce ("termtype", 'http://www.w3.org/ns/r2rml#Literal'), iri_to_id ("dt"), "lang");
+ }
+}
+;
+
+create method R2RML_MAKE_QM_IMPL_REL_PO (in tmap IRI_ID, in tmap2 IRI_ID, in tmap2sfld IRI_ID, in pofld IRI_ID, in pconst IRI_ID, in pfld IRI_ID, in rofld IRI_ID) returns any for DB.DBA.R2RML_MAP
+{
+ declare p_md5 varchar;
+ declare where_is_opened integer;
+ -- dbg_obj_princ ('R2RML_MAKE_QM: cross from ', "tmap", ' to ', "tmap2" );
+ for (sparql define input:storage "" define output:valmode "LONG"
+ select ?constp, ?consto, ?ocol, ?otmpl, ?ott
+ where { graph `iri(?:self.graph_iid)` {
+ { `iri(?:pofld)` rr:predicate ?constp . filter (?constp = iri(?:pconst)) }
+ union
+ { `iri(?:pfld)` rr:constant ?constp }
+ { `iri(?:tmap2)` rr:subject ?consto }
+ union
+ { `iri(?:tmap2sfld)` rr:constant ?consto }
+ union
+ { `iri(?:tmap2sfld)` rr:column ?ocol }
+ union
+ { `iri(?:tmap2sfld)` rr:template ?otmpl }
+ optional { `iri(?:tmap2sfld)` rr:termType ?ott }
+ } }
+ order by 1 2 3 4 5) do
+ {
+ p_md5 := md5_box (vector (__rdf_strsqlval ("constp"), null, null));
+ if (self.prev_p_md5 is null or self.prev_p_md5 <> p_md5)
+ {
+ if (self.prev_p_md5 is not null)
+ {
+ http (' ;\n', self.codegen_ses);
+ self.prev_p_md5 := null;
+ }
+ http (' ', self.codegen_ses);
+ self.R2RML_GEN_FLD (2 /* for P */, "constp", tmap, NULL, NULL, 'http://www.w3.org/ns/r2rml#IRI', null, null);
+ http (' ', self.codegen_ses);
+ self.prev_p_md5 := p_md5;
+ }
+ else
+ http (',\n ', self.codegen_ses);
+ self.R2RML_GEN_FLD (3 /* for O */, "consto", tmap2, DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("ocol")), __rdf_strsqlval("otmpl"), coalesce (__rdf_strsqlval("ott"), 'http://www.w3.org/ns/r2rml#IRI'), NULL, NULL);
+ where_is_opened := 0;
+ self.R2RML_RESET_USES_OF_TMAPS (4 /* for WHERE condition */);
+ for (sparql define input:storage ""
+ select ?child ?parent
+ where { graph `iri(?:self.graph_iid)` {
+ `iri(?:rofld)` rr:joinCondition [ rr:child ?child ; rr:parent ?parent ] } }
+ order by 1 2) do
+ {
+ self.R2RML_GET_COL_DESC (tmap, DB.DBA.R2RML_UNQUOTE_NAME ("child"));
+ self.R2RML_GET_COL_DESC (tmap2, DB.DBA.R2RML_UNQUOTE_NAME ("parent"));
+ http (case (where_is_opened) when 0 then ' where ((' else ') and (' end, self.codegen_ses);
+ http (sprintf ('^{%s.}^."%I" = ^{%s.}^."%I"',
+ self.R2RML_REGISTER_USE_OF_TMAP (4 /* for WHERE condition */, tmap), DB.DBA.R2RML_UNQUOTE_NAME ("child"),
+ self.R2RML_REGISTER_USE_OF_TMAP (4 /* for WHERE condition */, tmap2), DB.DBA.R2RML_UNQUOTE_NAME ("parent") ),
+ self.codegen_ses);
+ where_is_opened := 1;
+ }
+ if (where_is_opened)
+ {
+ declare all_aliases, where_aliases, extra_aliases any;
+ declare fld_idx, alias_ctr, alias_count integer;
+ http ('))', self.codegen_ses);
+ all_aliases := self.used_fld_tmap_aliases;
+ where_aliases := all_aliases[4];
+ extra_aliases := vector ();
+ foreach (varchar wa in where_aliases) do
+ {
+ for (fld_idx := 0; fld_idx < 4; fld_idx := fld_idx + 1)
+ {
+ if (0 < position (wa, all_aliases[fld_idx]))
+ goto wa_done;
+ }
+ extra_aliases := vector_concat (extra_aliases, vector (wa));
+wa_done: ;
+ }
+ alias_count := length (extra_aliases);
+ if (alias_count)
+ {
+ http (' OPTION (', self.codegen_ses);
+ for (alias_ctr := 0; alias_ctr < alias_count; alias_ctr := alias_ctr + 1)
+ {
+ if (alias_ctr)
+ http (', ', self.codegen_ses);
+ http ('USING ' || extra_aliases[alias_ctr], self.codegen_ses);
+ }
+ http (' )', self.codegen_ses);
+ }
+ }
+ }
+}
+;
+
+create method R2RML_MAKE_QM_IMPL_PLAIN_PO (in tmap IRI_ID, in pofld IRI_ID, in pconst IRI_ID, in pfld IRI_ID, in oconst any, in ofld IRI_ID) returns any for DB.DBA.R2RML_MAP
+{
+ declare p_md5 varchar;
+ for (sparql define input:storage "" define output:valmode "LONG"
+ select ?constp, ?pcol, ?ptmpl, ?consto, ?ocol, ?otmpl, ?ott, ?odatatype, ?lang
+ where { graph `iri(?:self.graph_iid)` {
+ { `iri(?:pofld)` rr:predicate ?constp . filter (?constp = iri(?:pconst)) }
+ union
+ { `iri(?:pfld)` rr:constant ?constp }
+ union
+ { `iri(?:pfld)` rr:column ?pcol }
+ union
+ { `iri(?:pfld)` rr:template ?ptmpl }
+ { `iri(?:pofld)` rr:object ?consto . filter (?consto = iri(?:oconst)) }
+ union
+ { `iri(?:ofld)` rr:constant ?consto }
+ union
+ { `iri(?:ofld)` rr:column ?ocol }
+ union
+ { `iri(?:ofld)` rr:template ?otmpl }
+ optional { `iri(?:ofld)` rr:termType ?ott }
+ optional { `iri(?:ofld)` rr:datatype ?odatatype }
+ optional { `iri(?:ofld)` rr:language ?olang }
+ } }
+ order by 1 2 3 4 5 6 7 8 9) do
+ {
+ p_md5 := md5_box (vector (__rdf_strsqlval("constp"), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("pcol")), __rdf_strsqlval("ptmpl")));
+ if (self.prev_p_md5 is null or self.prev_p_md5 <> p_md5)
+ {
+ if (self.prev_p_md5 is not null)
+ {
+ http (' ;\n', self.codegen_ses);
+ self.prev_p_md5 := null;
+ }
+ http (' ', self.codegen_ses);
+ self.R2RML_GEN_FLD (2 /* for P */, "constp", tmap, DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("pcol")), __rdf_strsqlval("ptmpl"), 'http://www.w3.org/ns/r2rml#IRI', null, null);
+ http (' ', self.codegen_ses);
+ self.prev_p_md5 := p_md5;
+ }
+ else
+ http (',\n ', self.codegen_ses);
+ self.R2RML_GEN_FLD (3 /* for O */, "consto", tmap, DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("ocol")), __rdf_strsqlval("otmpl"), coalesce (__rdf_strsqlval("ott"), 'http://www.w3.org/ns/r2rml#Literal'), "odatatype", __rdf_strsqlval("lang"));
+ }
+}
+;
+
+create method R2RML_MAKE_QM_IMPL_CHILDS (in needs_inner_g_field integer) returns any for DB.DBA.R2RML_MAP
+{
+ declare prev_g_md5, prev_s_md5 any;
+ -- For each combination of mapclasses and graph
+ prev_g_md5 := prev_s_md5 := null;
+ self.prev_p_md5 := null;
+ for (sparql define input:storage "" define output:valmode "LONG"
+ select ?constg, ?gcol, ?gtmpl, ?tmap, ?sfld, ?consts, ?scol, ?stmpl, ?stt, ?sclass, ?pofld, ?pconst, ?pfld, ?oconst, ?ofld, ?tmap2, ?tmap2sfld
+ where { graph `iri(?:self.graph_iid)` {
+ ?tmap a rr:TriplesMap .
+ { ?tmap rr:subject ?consts }
+ union
+ {
+ ?tmap rr:subjectMap ?sfld .
+ { ?sfld rr:constant ?consts }
+ union
+ { ?sfld rr:column ?scol }
+ union
+ { ?sfld rr:template ?stmpl }
+ optional { ?sfld rr:termType ?stt }
+ }
+ {
+ ?sfld rr:class ?sclass .
+ }
+ union
+ {
+ ?tmap rr:predicateObjectMap ?pofld .
+ { ?pofld rr:predicate ?pconst }
+ union
+ { ?pofld rr:predicateMap ?pfld }
+ { ?pofld rr:object ?oconst }
+ union
+ { ?pofld rr:objectMap ?ofld
+ optional {
+ ?ofld rr:parentTriplesMap ?tmap2 .
+ ?tmap2 a rr:TriplesMap ;
+ rr:subjectMap ?tmap2sfld . }
+ }
+ }
+ optional {
+ { ?gcontainer rr:graph ?constg . }
+ union
+ {
+ ?gcontainer rr:graphMap ?gfld .
+ { ?gfld rr:constant ?constg }
+ union
+ { ?gfld rr:column ?gcol }
+ union
+ { ?gfld rr:template ?gtmpl } }
+ filter (?gcontainer in (?sfld, ?pofld)) }
+ } }
+ order by 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16) do
+ {
+ declare s_md5, p_md5 varchar;
+ -- dbg_obj_princ ('R2RML_MAKE_QM: g is ', "constg", "gcol", "gtmpl", '; tmap is ', "tmap", '; s is ', "sfld", "consts", "scol", "stmpl", "stt", "sclass", '; po is ', "pconst", "pfld", ' and ', "oconst", "ofld");
+ if (needs_inner_g_field)
+ {
+ declare g_md5 any;
+ g_md5 := md5_box (vector (coalesce ("constg", self.default_constg), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("gcol")), __rdf_strsqlval("gtmpl")));
+ if (prev_g_md5 is null or prev_g_md5 <> g_md5)
+ {
+ if (prev_g_md5 is not null)
+ {
+ http (' . }\n', self.codegen_ses);
+ prev_g_md5 := prev_s_md5:= null;
+ self.prev_p_md5 := null;
+ self.R2RML_RESET_USES_OF_TMAPS (1 /* S is reset */);
+ self.R2RML_RESET_USES_OF_TMAPS (2 /* P is reset */);
+ self.R2RML_RESET_USES_OF_TMAPS (3 /* O is reset */);
+ }
+ http (' graph ', self.codegen_ses);
+ self.R2RML_GEN_FLD (0 /* for G */, coalesce ("constg", self.default_constg), "tmap", DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("gcol")), __rdf_strsqlval("gtmpl"), 'http://www.w3.org/ns/r2rml#IRI', null, null);
+ http (' {\n', self.codegen_ses);
+ prev_g_md5 := g_md5;
+ }
+ }
+ s_md5 := md5_box (vector (__rdf_strsqlval("consts"), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("scol")), __rdf_strsqlval("stmpl"), __rdf_strsqlval("stt")));
+ if (prev_s_md5 is null or prev_s_md5 <> s_md5)
+ {
+ if (prev_s_md5 is not null)
+ {
+ http (' .\n', self.codegen_ses);
+ prev_s_md5 := null;
+ self.prev_p_md5 := null;
+ self.R2RML_RESET_USES_OF_TMAPS (2 /* P is reset */);
+ self.R2RML_RESET_USES_OF_TMAPS (3 /* O is reset */);
+ }
+ http (' ', self.codegen_ses);
+ self.R2RML_GEN_FLD (1 /* for S */, __rdf_strsqlval("consts"), "tmap", DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("scol")), __rdf_strsqlval("stmpl"), coalesce (__rdf_strsqlval("stt"), 'http://www.w3.org/ns/r2rml#IRI'), null, null);
+ http ('\n', self.codegen_ses);
+ prev_s_md5 := s_md5;
+ }
+ if ("sclass" is not null)
+ {
+ p_md5 := 'rdf:type';
+ if (self.prev_p_md5 is null or self.prev_p_md5 <> p_md5)
+ {
+ if (self.prev_p_md5 is not null)
+ {
+ http (' ;\n', self.codegen_ses);
+ self.prev_p_md5 := null;
+ }
+ self.R2RML_RESET_USES_OF_TMAPS (2 /* for P that is printed here as "a" bypassing R2RML_GEN_FLD */);
+ http (' a ', self.codegen_ses);
+ self.prev_p_md5 := p_md5;
+ }
+ else
+ http (',\n ', self.codegen_ses);
+ self.R2RML_GEN_FLD (3 /* for O */, "sclass", "tmap", null, null, 'http://www.w3.org/ns/r2rml#IRI', null, null);
+ }
+ else if ("tmap2" is not null)
+ {
+ self.R2RML_MAKE_QM_IMPL_REL_PO ("tmap", "tmap2", "tmap2sfld", "pofld", "pconst", "pfld", "ofld");
+ }
+ else
+ {
+ self.R2RML_MAKE_QM_IMPL_PLAIN_PO ("tmap", "pofld", "pconst", "pfld", "oconst", "ofld");
+ }
+ self.R2RML_RESET_USES_OF_TMAPS (4 /* for WHERE that is printed already and cannot be reused */);
+skip_the_quad_map: ;
+ }
+ if (needs_inner_g_field)
+ {
+ if (prev_g_md5 is not null)
+ {
+ http (' . }\n', self.codegen_ses);
+ prev_s_md5 := self.prev_p_md5 := null;
+ }
+ }
+ else
+ http (' }\n', self.codegen_ses);
+}
+;
+
+create method R2RML_MAKE_QM (in storage_iid IRI_ID := null, in rdfview_iid IRI_ID := null) returns any for DB.DBA.R2RML_MAP
+{
+ declare const_graph_count, var_graph_count, needs_inner_g_field integer;
+ declare iter, iter_tmap, iter_metas any;
+ if (storage_iid is null)
+ storage_iid := iri_to_id ('http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage');
+ if (rdfview_iid is null)
+ rdfview_iid := self.graph_iid;
+ if (self.codegen_ses is null)
+ self.codegen_ses := string_output ();
+ self.R2RML_ADD_NS_PREFIX_TO_CACHE (id_to_iri (storage_iid));
+ self.R2RML_ADD_NS_PREFIX_TO_CACHE (id_to_iri (rdfview_iid));
+ self.R2RML_FILL_NS_PREFIXES_CACHE ();
+ self.declared_jsos := dict_new (31);
+ self.declared_tmap_aliases := dict_new (11);
+ for (sparql define input:storage "" define output:valmode "LONG"
+ select ?triplesmap
+ where { graph `iri(?:self.graph_iid)` {
+ ?triplesmap a rr:TriplesMap } } ) do
+ {
+ dict_put (self.declared_tmap_aliases, "triplesmap", sprintf ('tbl%d', dict_size (self.declared_tmap_aliases)));
+ }
+ if (0 = self.R2RML_FILL_TRIPLESMAP_METAS_CACHE ())
+ signal ('R2RML', 'No valid instances of TriplesMap, hence nothing to do');
+ self.R2RML_MAKE_QM_IMPL_IOL_CLASSES ();
+ const_graph_count := (sparql define input:storage ""
+ select count(distinct ?constg)
+ where { graph `iri(?:self.graph_iid)` {
+ ?tmap a rr:TriplesMap .
+ optional {
+ { ?tmap rr:subjectMap ?smap }
+ union
+ { ?tmap rr:predicateObjectMap ?pomap } }
+ { ?gcontainer rr:graph ?constg }
+ union
+ {
+ ?gcontainer rr:graphMap ?gfld .
+ ?gfld rr:constant ?constg }
+ filter (?gcontainer in (?smap, ?pomap)) } } );
+ var_graph_count := (sparql define input:storage ""
+ select count(distinct bif:concat (str(?tmap), ' ', ?c, ' ', ?t))
+ where { graph `iri(?:self.graph_iid)` {
+ ?tmap a rr:TriplesMap .
+ optional {
+ { ?tmap rr:subjectMap ?smap }
+ union
+ { ?tmap rr:predicateObjectMap ?pomap } }
+ ?gcontainer rr:graphMap ?gfld .
+ { ?gfld rr:column ?c }
+ union { ?gfld rr:template ?t }
+ filter (?gcontainer in (?smap, ?pomap)) } } );
+-- -- dbg_obj_princ ('const_graph_count = ', const_graph_count, ', var_graph_count = ', var_graph_count);
+ http ('alter quad storage ' || self.R2RML_IRI_ID_AS_QNAME (storage_iid) || '\n', self.codegen_ses);
+ iter := self.triplesmap_metas_cache;
+ for (dict_iter_rewind (iter); dict_iter_next (iter, iter_tmap, iter_metas); )
+ {
+ declare tos_alias varchar;
+ tos_alias := dict_get (self.declared_tmap_aliases, iter_tmap, null);
+ if ('TABLE' = iter_metas[0][0])
+ http ('from "' || iter_metas[0][1] || '"."' || iter_metas[0][2] || '"."' || iter_metas[0][3] || '" as ' || tos_alias || '\n', self.codegen_ses);
+ else
+ http ('from sqlquery (' || iter_metas[0][3] || ') as ' || tos_alias || '\n', self.codegen_ses);
+ }
+ http (' {\n', self.codegen_ses);
+ self.used_fld_tmap_aliases := vector (vector(), vector(), vector(), vector(), vector());
+ http (' create ' || self.R2RML_IRI_ID_AS_QNAME (rdfview_iid) || ' as', self.codegen_ses);
+ if (self.default_constg is null)
+ self.default_constg := iri_to_id (sprintf ('http://example.com/r2rml?graph=%U', id_to_iri(self.graph_iid)));
+ if ((const_graph_count + var_graph_count) <= 1)
+ {
+ http (' graph ', self.codegen_ses);
+ if (0 = var_graph_count)
+ {
+ declare constg IRI_ID;
+ constg := (sparql define input:storage "" define output:valmode "LONG"
+ select ?constg
+ where { graph `iri(?:self.graph_iid)` {
+ ?tmap a rr:TriplesMap .
+ optional {
+ { ?tmap rr:subjectMap ?smap }
+ union
+ { ?tmap rr:predicateObjectMap ?pomap } }
+ { ?gcontainer rr:graph ?constg }
+ union
+ {
+ ?gcontainer rr:graphMap ?gfld .
+ ?gfld rr:constant ?constg }
+ filter (?gcontainer in (?smap, ?pomap)) } } );
+ if (constg is null)
+ constg := self.default_constg;
+ self.R2RML_GEN_FLD (0 /* for G */, constg, null, null, null, 'http://www.w3.org/ns/r2rml#IRI', null, null);
+ http (' option (soft exclusive)', self.codegen_ses);
+ }
+ else
+ {
+ for (sparql define input:storage ""
+ select ?tmap, ?c, ?t
+ where { graph `iri(?:self.graph_iid)` {
+ ?tmap a rr:TriplesMap .
+ optional {
+ { ?tmap rr:subjectMap ?smap }
+ union
+ { ?tmap rr:predicateObjectMap ?pomap } }
+ ?gcontainer rr:graphMap ?gfld .
+ { ?gfld rr:column ?c }
+ union { ?gfld rr:template ?t }
+ filter (?gcontainer in (?smap, ?pomap)) } } limit 1 ) do
+ {
+ self.R2RML_GEN_FLD (0 /* for G */, null, iri_to_id ("tmap"), DB.DBA.R2RML_UNQUOTE_NAME ("c"), "t", 'http://www.w3.org/ns/r2rml#IRI', null, null);
+ }
+ }
+ needs_inner_g_field := 0;
+ }
+ else
+ needs_inner_g_field := 1;
+ http (' {\n', self.codegen_ses);
+ self.R2RML_MAKE_QM_IMPL_CHILDS (needs_inner_g_field);
+ http (' }\n', self.codegen_ses);
+}
+;
+
+create function R2RML_MAKE_QM_FROM_G (in g varchar, in tgt_graph varchar := null) returns varchar
+{
+ declare m R2RML_MAP;
+ m := DB.DBA.R2RML_MAP (iri_to_id (g));
+ m.default_constg := iri_to_id (tgt_graph);
+ m.R2RML_MAKE_QM (null, null);
+ return string_output_string (m.codegen_ses);
+}
+;
+
+create function R2RML_TEST (in g varchar)
+{
+ declare m R2RML_MAP;
+ m := DB.DBA.R2RML_MAP (iri_to_id (g));
+ m.R2RML_MAKE_QM (null, null);
+ -- return string_output_string (m.codegen_ses);
+ declare _text varchar;
+ declare _strings any;
+ declare _slen, _sctr any;
+ result_names (_text);
+ _text := string_output_string (m.codegen_ses);
+ _strings := split_and_decode (_text,0,'\0\0\n');
+ _slen := length (_strings);
+ _sctr := 0;
+ while (_sctr < _slen)
+ {
+ result (aref (_strings, _sctr));
+ _sctr := _sctr+1;
+ }
+}
+;
+
+create procedure R2RML_GENERATE_LINKED_VIEW (in source varchar, in destination_graph varchar, in graph_type int := 0, in clear_source_graph int := 1)
+{
+ declare str, vstr, mime, vgraph, get_url varchar;
+ if (source like 'dav:%')
+ get_url := 'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:' || subseq (source, 4);
+ else
+ get_url := source;
+ str := XML_URI_GET ('', get_url);
+ mime := DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE (source, '', str);
+ if (clear_source_graph)
+ {
+ sparql clear graph iri(?:source) ;
+ }
+ if (mime = 'application/rdf+xml')
+ DB.DBA.RDF_LOAD_RDFXML (str, source, source);
+ else
+ DB.DBA.TTLP (str, source, source);
+ if (graph_type = 0)
+ vgraph := destination_graph;
+ else
+ vgraph := sprintf ('http://example.com/r2rml?graph=%U', source);
+ if (graph_type = 1)
+ {
+ if (exists (sparql define input:storage "" prefix rr: <http://www.w3.org/ns/r2rml#> ask { graph `iri(?:source)` { [] rr:graphMap ?m . ?m rr:template ?g }}))
+ signal ('42000', 'Can not sync graph template to physical graph');
+ }
+ vstr := DB.DBA.R2RML_MAKE_QM_FROM_G (source, vgraph);
+ exec ('sparql ' || vstr);
+ if (graph_type = 1)
+ {
+ RDF_VIEW_SYNC_TO_PHYSICAL (vgraph, 1, destination_graph);
+ 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
+ {
+ RDF_VIEW_SYNC_TO_PHYSICAL ("g", 1, destination_graph);
+ }
+ }
+}
+;
diff --git a/binsrc/rdb2rdf/r2rml_validation_metas.sql b/binsrc/rdb2rdf/r2rml_validation_metas.sql
new file mode 100644
index 0000000..4231307
--- /dev/null
+++ b/binsrc/rdb2rdf/r2rml_validation_metas.sql
@@ -0,0 +1,194 @@
+--
+-- 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
+--
+--
+
+
+sparql clear graph <http://www.w3.org/ns/r2rml#OVL>
+;
+
+DB.DBA.TTLP ('
+ at prefix OVL: <http://www.openlinksw.com/schemas/OVL#> .
+ at prefix owl: <http://www.w3.org/2002/07/owl#> .
+ at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+ at prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+ at prefix rr: <http://www.w3.org/ns/r2rml#> .
+ at prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+rr: a OVL:ClosedWorldPrefix .
+
+rr:child a rdf:Property ; rdfs:domain rr:Join ; rdfs:range xsd:string ; owl:minCardinality 1 ; owl:maxCardinality 1 ; rdfs:comment "Names a column in the child table of a join" .
+rr:class a rdf:Property ; rdfs:domain rr:SubjectMap ; rdfs:range rdfs:Class ; owl:minCardinality 0 ; OVL:maxGoodCard 10 ; rdfs:comment "The subject value generated for a logical table row will be asserted as an instance of this RDFS class" .
+rr:column a rdf:Property ; rdfs:domain rr:OVL-G_S_P_O_Map ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Name of a column in the logical table. When generating RDF triples from a logical table row, value from the specified column is used as the graph, subject, predicate, or object (based upon the specific domain)" .
+rr:datatype a rdf:Property ; rdfs:domain rr:ObjectMap ; rdfs:range rdfs:Datatype ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Specifies the datatype of the object component for the generated triple from a logical table row" .
+rr:constant a rdf:Property ; rdfs:domain rr:OVL-G_S_P_O_Map ; rdfs:range rdfs:Resource ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Specifies the datatype of the object component for the generated triple from a logical table row" .
+rr:graph a rdf:Property ; rdfs:domain rr:OVL-S_Po_Map ; rdfs:range xsd:anyURI ; owl:minCardinality 0 ; OVL:maxGoodCard 3 ; rdfs:comment "Specifies a graph IRI reference. When used with a SubjectMap element, all the RDF triples generated from a logical row will be stored in the specified named graph. Otherwise, the RDF triple generated using the (predicate, object) pair will be stored in the specified named graph" .
+rr:graphMap a rdf:Property ; rdfs:domain rr:OVL-S_Po_Map ; rdfs:range rr:GraphMap ; owl:minCardinality 0 ; owl:maxGoodCard 10 ; rdfs:comment "A GraphMap element to generate a graph from a logical table row" .
+rr:inverseExpression a rdf:Property ; rdfs:domain rr:OVL-G_S_P_O_Map ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "An expression that allows, at query processing time, use of index-based access to the the (underlying) relational tables, instead of simply retrieving the table rows first and then applying a filter. This property is useful for retrieval based on conditions involving graph, subject, predicate, or object generated from logical table column(s) and involves some transformation" .
+rr:joinCondition a rdf:Property ; rdfs:domain rr:RefObjectMap ; rdfs:range rr:Join ; owl:minCardinality 1 ; OVL:maxGoodCard 3 ; rdfs:comment "Specifies the join condition for joining the child logical table with the parent logical table of the foreign key constraint" .
+rr:language a rdf:Property ; rdfs:domain rr:ObjectMap ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Specifies the language for the object component for the generated triple from a logical table row" .
+rr:logicalTable a rdf:Property ; rdfs:domain rr:TriplesMap ; rdfs:range rr:LogicalTable ; owl:minCardinality 1 ; owl:maxCardinality 1 ; rdfs:comment "Definition of logical table to be mapped" .
+rr:object a rdf:Property ; rdfs:domain rr:PredicateObjectMap ; rdfs:range rdfs:Resource ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Specifies the object for the generated triple from the logical table row" .
+rr:objectMap a rdf:Property ; rdfs:domain rr:PredicateObjectMap ; rdfs:range rr:OVL-O_Ro_Map ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "An ObjectMap element to generate the object component of the (predicate, object) pair from a logical table row" .
+rr:parent a rdf:Property ; rdfs:domain rr:Join ; rdfs:range xsd:string ; owl:minCardinality 1 ; owl:maxCardinality 1 ; rdfs:comment "Names a column in the parent table of a join" .
+rr:parentTriplesMap a rdf:Property ; rdfs:domain rr:RefObjectMap ; rdfs:range rr:TriplesMap ; owl:minCardinality 1 ; owl:maxCardinality 1 ; rdfs:comment "Specifies the TriplesMap element corresponding to the parent logical table of the foreign key constraint" .
+rr:predicate a rdf:Property ; rdfs:domain rr:PredicateObjectMap ; rdfs:range rdf:Property ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Specifies the predicate for the generated triple from the logical table row" .
+rr:predicateMap a rdf:Property ; rdfs:domain rr:PredicateObjectMap ; rdfs:range rr:PredicateMap ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "A PredicateMap element to generate the predicate component of the (predicate, object) pair from a logical table row" .
+rr:predicateObjectMap a rdf:Property ; rdfs:domain rr:TriplesMap ; rdfs:range rr:PredicateObjectMap ; owl:minCardinality 0 ; OVL:maxGoodCard 50 ; rdfs:comment "A PredicateObjectMap element to generate (predicate, object) pair from a logical table row" .
+rr:sqlQuery a rdf:Property ; rdfs:domain rr:LogicalTable ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "A valid SQL query" .
+rr:sqlVersion a rdf:Property ; rdfs:domain rr:LogicalTable ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "SQL version identifier" .
+rr:subject a rdf:Property ; rdfs:domain rr:TriplesMap ; rdfs:range OVL:anyREF ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "An IRI reference or a blank node for use as subject for all the RDF triples generated from a logical table row" .
+rr:subjectMap a rdf:Property ; rdfs:domain rr:TriplesMap ; rdfs:range rr:SubjectMap ; owl:minCardinality 1 ; owl:maxCardinality 1 ; rdfs:comment "A SubjectMap element to generate a subject from a logical table row" .
+rr:tableName a rdf:Property ; rdfs:domain rr:LogicalTable ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Name of a table or view" .
+rr:tableOwner a rdf:Property ; rdfs:domain rr:LogicalTable ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Name of table owner" .
+rr:tableSchema a rdf:Property ; rdfs:domain rr:LogicalTable ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "Database schema name of table" .
+rr:template a rdf:Property ; rdfs:domain rr:OVL-G_S_P_O_Map ; rdfs:range xsd:string ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "A template (format string) to specify how to generate a value for a subject, predicate, or object, using one or more columns from a logical table row" .
+rr:termType a rdf:Property ; rdfs:domain rr:OVL-S_O_Map ; rdfs:range rr:OVL-termtype ; owl:minCardinality 0 ; owl:maxCardinality 1 ; rdfs:comment "A string indicating whether subject or object generated using the value from column name specified for rr:column should be an IRI reference, blank node, or (if object) a literal" .
+
+rr:graphTemplate a OVL:ObsoleteProperty ; rdfs:comment "Use rr:graph and rr:template intead" .
+rr:termtype a OVL:ObsoleteProperty ; rdfs:comment "Use rr:termType (with uppercase T) instead and replace ''IRI''/''BlankNode''/''Literal'' with rr:IRI/rr:BlankNode/rr:Literal" .
+rr:useLogicalTable a OVL:ObsoleteProperty ; rdfs:comment "Use rr:logicalTable instead" .
+rr:useObjectMap a OVL:ObsoleteProperty ; rdfs:comment "Use rr:objectMap instead" .
+rr:usePredicateMap a OVL:ObsoleteProperty ; rdfs:comment "Use rr:predicateMap instead" .
+rr:usePredicateObjectMap a OVL:ObsoleteProperty ; rdfs:comment "Use rr:predicateObjectMap instead" .
+rr:useRefObjectMap a OVL:ObsoleteProperty ; rdfs:comment "Use nodes of rr:RefObjectMap type instead" .
+rr:useRefPredicateMap a OVL:ObsoleteProperty ; rdfs:comment "Use nodes of rr:RefObjectMap type instead" .
+rr:useRefPredicateObjectMap a OVL:ObsoleteProperty ; rdfs:comment "Use nodes of rr:RefObjectMap type instead" .
+rr:useSubjectMap a OVL:ObsoleteProperty ; rdfs:comment "Use rr:subjectMap instead" .
+
+
+rr:OVL-G_S_P_O_Map OVL:superClassOf rr:GraphMap, rr:SubjectMap, rr:PredicateMap, rr:ObjectMap .
+rr:OVL-S_P_O_Map OVL:superClassOf rr:SubjectMap, rr:PredicateMap, rr:ObjectMap .
+rr:OVL-S_Po_Map OVL:superClassOf rr:SubjectMap, rr:PredicateObjectMap .
+rr:OVL-S_O_Map OVL:superClassOf rr:SubjectMap, rr:ObjectMap .
+rr:OVL-O_Ro_Map OVL:superClassOf rr:ObjectMap, rr:RefObjectMap .
+
+rr:LogicalTable OVL:superClassOf rr:TriplesMap .
+
+rr:OVL-termtype OVL:enumOf rr:IRI, rr:BlankNode, rr:Literal .
+
+rr:TriplesMap OVL:typeRestriction
+ [ OVL:needSomeOfPredicates rr:subject, rr:subjectMap ] .
+rr:PredicateObjectMap OVL:typeRestriction
+ [ OVL:needSomeOfPredicates rr:predicate, rr:predicateMap ] ,
+ [ OVL:needSomeOfPredicates rr:object, rr:objectMap ] .
+rr:LogicalTable OVL:typeRestriction
+ [ OVL:mutuallyExclusivePredicates rr:tableName, rr:sqlQuery ] ,
+ [ OVL:mutuallyExclusivePredicates rr:tableOwner, rr:sqlQuery ] .
+OVL:anyREF OVL:typeRestriction
+ [ OVL:mutuallyExclusivePredicates rr:constant, rr:column, rr:template ] ,
+ [ OVL:mutuallyExclusivePredicates rr:datatype, rr:language ] .
+rr:OVL-G_S_P_O_Map OVL:typeRestriction
+ [ OVL:needSomeOfPredicates rr:constant, rr:column, rr:template ] .
+
+rr:logicalTable a OVL:InferTypeFromRange .
+rr:subjectMap a OVL:InferTypeFromRange .
+rr:predicateObjectMap a OVL:InferTypeFromRange .
+rr:predicateMap a OVL:InferTypeFromRange .
+rr:objectMap a OVL:InferTypeFromRange .
+rr:useRefPredicateObjectMap a OVL:InferTypeFromRange .
+rr:useRefPredicateMap a OVL:InferTypeFromRange .
+rr:useRefObjectMap a OVL:InferTypeFromRange .
+rr:joinCondition a OVL:InferTypeFromRange .
+
+rr:termType OVL:inconsistencyOfPredicate """select ?s, ("Error") as ?severity,
+ ("rr:Literal is not a valid value for rr:termType property of a rr:SubjectMap element") as ?message
+ where {
+ ?s a rr:SubjectMap ; rr:termType rr:Literal . }""" .
+rr:datatype OVL:inconsistencyOfPredicate """select ?s, ("Error") as ?severity,
+ ("rr:datatype can be specified only if rr:termType is not an rr:IRI or rr:BlankNode") as ?message
+ where {
+ ?s a ?t ; rr:datatype ?dt .
+ optional { ?s rr:termType ?tt } .
+ filter ((bound (?tt) && (?tt != rr:Literal)) || (?t = rr:SubjectMap)) }""" .
+rr:language OVL:inconsistencyOfPredicate """select ?s, ("Error") as ?severity,
+ ("rr:language can be specified only if rr:termType is not an rr:IRI or rr:BlankNode") as ?message
+ where {
+ ?s a ?t ; rr:language ?lang .
+ optional { ?s rr:termType ?tt } .
+ filter ((bound (?tt) && (?tt != rr:Literal)) || (?t = rr:SubjectMap)) }""" .
+rr:tableName OVL:inconsistencyOfPredicate """select ?lt, ("Warning") as ?severity,
+ (if (bif:isnotnull (sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 1)),
+ bif:concat ("rr:tableName refers to ", sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 1), " as to ",
+ bif:sprintf ("%s.%s.%s", bif:coalesce (?to, "DB"), bif:coalesce (?ts, "DBA"), ?tn),
+ ", i.e., using wrong character case ; adjust the R2RML or the table before generating an RDF View" ),
+ "rr:tableName refers to table that does not exists ; adjust the R2RML or create the table before generating an RDF View" ) ) as ?message
+ where {
+ ?lt rr:tableName ?tn .
+ OPTIONAL { ?lt rr:tableOwner ?to }
+ OPTIONAL { ?lt rr:tableSchema ?ts }
+ filter (bif:isnull (sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0))) }""" .
+rr:column OVL:inconsistencyOfPredicate """select ?fldmap as ?s, ("Warning") as ?severity,
+ (if (bif:isnotnull (sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 1)),
+ bif:concat ("rr:column refers to column ", ?col , " that is misspelled name of column ",
+ sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 1), " that the table ",
+ sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0), " contains now ; adjust the R2RML or the table before generating an RDF View" ),
+ bif:concat ("rr:column refers to column ", ?col , " that is not found in table ",
+ sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0), " ; adjust the R2RML or the table before generating an RDF View" ) ) ) as ?message
+ where {
+ ?lt rr:tableName ?tn .
+ OPTIONAL { ?lt rr:tableOwner ?to }
+ OPTIONAL { ?lt rr:tableSchema ?ts }
+ filter (bif:isnotnull (sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0)))
+ ?triplesmap a rr:TriplesMap ; rr:logicalTable ?lt .
+ { ?triplesmap rr:subjectMap [ rr:graphMap ?fldmap ] }
+ union
+ { ?triplesmap rr:predicateObjectMap [ rr:graphMap ?fldmap ] }
+ union
+ { ?triplesmap rr:subjectMap ?fldmap }
+ union
+ { ?triplesmap rr:predicateObjectMap [ rr:predicateMap ?fldmap ] }
+ union
+ { ?triplesmap rr:predicateObjectMap [ rr:objectMap ?fldmap ] }
+ ?fldmap rr:column ?col
+ filter (bif:isnull (sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 0))) }""" .
+rr:parent OVL:inconsistencyOfPredicate """select ?join as ?s, ("Warning") as ?severity,
+ (if (bif:isnotnull (sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 1)),
+ bif:concat ("rr:parent refers to column ", ?col , " that is misspelled name of column ",
+ sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 1), " that the table ",
+ sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0), " contains now ; adjust the R2RML or the table before generating an RDF View" ),
+ bif:concat ("rr:parent refers to column ", ?col , " that is not found in table ",
+ sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0), " ; adjust the R2RML or the table before generating an RDF View" ) ) ) as ?message
+ where {
+ ?lt rr:tableName ?tn .
+ OPTIONAL { ?lt rr:tableOwner ?to }
+ OPTIONAL { ?lt rr:tableSchema ?ts }
+ filter (bif:isnotnull (sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0)))
+ ?ptriplesmap a rr:TriplesMap ; rr:logicalTable ?lt .
+ ?objmap rr:parentTriplesMap ?ptriplesmap ; rr:joinCondition ?join .
+ ?join rr:parent ?col .
+ filter (bif:isnull (sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 0))) }""" .
+rr:child OVL:inconsistencyOfPredicate """select ?join as ?s, ("Warning") as ?severity,
+ (if (bif:isnotnull (sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 1)),
+ bif:concat ("rr:child refers to column ", ?col , " that is misspelled name of column ",
+ sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 1), " that the table ",
+ sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0), " contains now ; adjust the R2RML or the table before generating an RDF View" ),
+ bif:concat ("rr:child refers to column ", ?col , " that is not found in table ",
+ sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0), " ; adjust the R2RML or the table before generating an RDF View" ) ) ) as ?message
+ where {
+ ?lt rr:tableName ?tn .
+ OPTIONAL { ?lt rr:tableOwner ?to }
+ OPTIONAL { ?lt rr:tableSchema ?ts }
+ filter (bif:isnotnull (sql:R2RML_MAIN_KEY_EXISTS (?ts, ?to, ?tn, 0)))
+ ?triplesmap a rr:TriplesMap ; rr:logicalTable ?lt ; rr:predicateObjectMap [ rr:objectMap ?objmap ] .
+ ?objmap rr:joinCondition ?join .
+ ?join rr:child ?col .
+ filter (bif:isnull (sql:R2RML_KEY_COLUMN_EXISTS (?ts, ?to, ?tn, ?col, 0))) }""" .
+', 'http://www.w3.org/ns/r2rml#OVL', 'http://www.w3.org/ns/r2rml#OVL')
+;
diff --git a/binsrc/rdb2rdf/vad_dav.xml b/binsrc/rdb2rdf/vad_dav.xml
new file mode 100644
index 0000000..c2b736c
--- /dev/null
+++ b/binsrc/rdb2rdf/vad_dav.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!DOCTYPE sticker SYSTEM "vad_sticker.dtd">
+<!--
+ -
+ - $Id:$
+ -
+ - 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
+ -
+ -
+-->
+
+<sticker version="1.0.010505A" xml:lang="en-UK">
+ <caption>
+ <name package="rdb2rdf">
+ <prop name="Title" value="RDB2RDF support"/>
+ <prop name="Developer" value="OpenLink Software"/>
+ <prop name="Copyright" value="(C) 2012 OpenLink Software"/>
+ <prop name="Download" value="http://www.openlinksw.com/virtuoso/rdb2rdf/download"/>
+ <prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/rdb2rdf/download"/>
+ </name>
+ <version package="1.00.0003">
+ <prop name="Release Date" value="2011-09-05 12:01"/>
+ <prop name="Build" value="Release, optimized"/>
+ </version>
+ </caption>
+ <dependencies/>
+ <procedures uninstallation="supported">
+ <sql purpose="pre-install"></sql>
+ <sql purpose="post-install"></sql>
+ </procedures>
+ <ddls>
+ <sql purpose="pre-install">if (lt (sys_stat ('st_dbms_ver'), '06.01.3127')) { result ('ERROR', 'The RDB2RDF package requires server version 06.01.3127 or greater'); signal ('FATAL', 'The conductor package requires server version 06.01.3127 or greater'); } </sql>
+ <sql purpose="post-install">
+ "DB"."DBA"."VAD_LOAD_SQL_FILE"('/DAV/VAD/rdb2rdf/ovl.sql', 1, 'report', 1);
+ "DB"."DBA"."VAD_LOAD_SQL_FILE"('/DAV/VAD/rdb2rdf/r2rml.sql', 1, 'report', 1);
+ "DB"."DBA"."VAD_LOAD_SQL_FILE"('/DAV/VAD/rdb2rdf/r2rml_validation_metas.sql', 1, 'report', 1);
+ </sql>
+ <sql purpose="post-uninstall">
+ ;
+ </sql>
+ </ddls>
+ <resources>
+ <file type="dav" source="http" target_uri="rdb2rdf/ovl.sql" dav_owner='dav' dav_grp='administrators' dav_perm='110100100NN' makepath="yes"/>
+ <file type="dav" source="http" target_uri="rdb2rdf/r2rml.sql" dav_owner='dav' dav_grp='administrators' dav_perm='110100100NN' makepath="yes"/>
+ <file type="dav" source="http" target_uri="rdb2rdf/r2rml_validation_metas.sql" dav_owner='dav' dav_grp='administrators' dav_perm='110100100NN' makepath="yes"/>
+ <file type="dav" source="http" target_uri="rdb2rdf/northwind_r2rml.ttl" dav_owner='dav' dav_grp='administrators' dav_perm='110100100NN' makepath="yes"/>
+ </resources>
+ <registry>
+ </registry>
+</sticker>
diff --git a/binsrc/rdb2rdf/vad_version b/binsrc/rdb2rdf/vad_version
new file mode 100644
index 0000000..b5fe71b
--- /dev/null
+++ b/binsrc/rdb2rdf/vad_version
@@ -0,0 +1 @@
+1.00.0258
diff --git a/binsrc/rdf_mappers/Makefile.am b/binsrc/rdf_mappers/Makefile.am
index 3d80e10..67d2e60 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-2007 OpenLink Software
+# 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
diff --git a/binsrc/rdf_mappers/Makefile.in b/binsrc/rdf_mappers/Makefile.in
index 6c32a4d..eb420a4 100644
--- a/binsrc/rdf_mappers/Makefile.in
+++ b/binsrc/rdf_mappers/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2007 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -71,7 +69,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
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 =
@@ -80,23 +77,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -186,7 +169,6 @@ 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@
@@ -270,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -291,7 +272,6 @@ 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@
@@ -349,14 +329,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/rdf_mappers/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/rdf_mappers/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/rdf_mappers/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/rdf_mappers/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -374,7 +354,6 @@ $(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
@@ -384,23 +363,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -424,17 +400,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -466,7 +438,6 @@ clean-generic:
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"
@@ -485,8 +456,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -495,28 +464,18 @@ 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
@@ -557,7 +516,6 @@ rdf_mappers_dav.vad: $(EXTRA_DIST)
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/rdf_mappers/make_vad.sh b/binsrc/rdf_mappers/make_vad.sh
index 2c610cb..1128298 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.14 2011/06/09 15:35:35 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -206,6 +206,7 @@ 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
@@ -216,6 +217,7 @@ 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/
@@ -235,7 +237,7 @@ directory_init() {
#
# Install minimal OAT toolkit
#
- for i in loader.js animation.js slidebar.js resize.js
+ for i in loader.js animation.js slidebar.js resize.js ajax.js json.js
do
cp ../oat/toolkit/$i vad/vsp/rdf_mappers/rdfdesc/oat/
done
@@ -313,7 +315,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-2011 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
@@ -331,6 +333,11 @@ 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
@@ -349,6 +356,7 @@ 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
@@ -370,6 +378,7 @@ 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 14bfbe2..d21c282 100644
--- a/binsrc/rdf_mappers/ontologies/owl/attribution.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/attribution.owl
@@ -1,5 +1,26 @@
<?xml version="1.0" ?>
<!--
+
+ $Id$
+
+ 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.
-->
@@ -101,12 +122,13 @@
<rdfs:isDefinedBy rdf:resource="&opl;"/>
</owl:Class>
- <owl:Property rdf:about="&opl;namedEntityConcept">
- <rdfs:comment>The concept (type of thing) the named entity represents</rdfs:comment>
+ <owl:Property rdf:about="&opl;entityType">
+ <rdfs:comment>The type or ontological category of a named entity</rdfs:comment>
<rdfs:domain rdf:resource="&opl;NamedEntity"/>
<rdfs:isDefinedBy rdf:resource="&opl;"/>
- <rdfs:label>named entity concept</rdfs:label>
+ <rdfs:label>entity type</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 2d78a5b..d13b8d6 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl
@@ -1,11 +1,11 @@
<!--
- $Id: oplamazon.owl,v 1.1.2.4 2010/01/25 15:36:25 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2010 OpenLink Software
+ 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplangel.owl b/binsrc/rdf_mappers/ontologies/owl/oplangel.owl
new file mode 100644
index 0000000..bf45938
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/oplangel.owl
@@ -0,0 +1,244 @@
+<!--
+
+ $Id$
+
+ 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
new file mode 100644
index 0000000..e19a05a
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/oplbase.owl
@@ -0,0 +1,78 @@
+<!--
+
+ 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 ce90257..a6e5920 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl
@@ -1,11 +1,11 @@
<!--
- $Id: oplbestbuy.owl,v 1.1.2.4 2010/01/25 15:36:25 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2010 OpenLink Software
+ 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcert.owl b/binsrc/rdf_mappers/ontologies/owl/oplcert.owl
new file mode 100644
index 0000000..9143e97
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/oplcert.owl
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+
+ $Id$
+
+ 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 2cdd5d5..e788af0 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl
@@ -1,11 +1,11 @@
<!--
- $Id: oplcnet.owl,v 1.1.2.4 2010/01/25 15:36:25 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2010 OpenLink Software
+ 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl b/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl
new file mode 100644
index 0000000..65c8eaf
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl
@@ -0,0 +1,663 @@
+<!--
+
+ $Id$
+
+ 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#Acquisition">
+ <rdfs:comment>Acquisition</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Acquisition</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Funding_round">
+ <rdfs:comment>Funding round</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Funding round</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Investment">
+ <rdfs:comment>Investment</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Investment</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Milestone">
+ <rdfs:comment>Milestone</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Milestone</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Office">
+ <rdfs:comment>Office</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Office</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Product">
+ <rdfs:comment>Product</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Product</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Providership">
+ <rdfs:comment>Providership</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Providership</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Relationship">
+ <rdfs:comment>Relationship</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Relationship</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Screenshot">
+ <rdfs:comment>Screenshot</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Screenshot</rdfs:label>
+ </owl:Class>
+
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Video_embed">
+ <rdfs:comment>Video embed</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>Video embed</rdfs:label>
+ </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.openlinksw.com/schemas/crunchbase#Acquisition"/>
+ </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>acquisitions</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_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 company 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.openlinksw.com/schemas/crunchbase#Funding_round"/>
+ </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.openlinksw.com/schemas/crunchbase#Funding_round"/>
+ </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.openlinksw.com/schemas/crunchbase#Investment"/>
+ </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>investments</rdfs:label>
+ <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/crunchbase#Investment"/>
+ </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#milestone">
+ <rdfs:comment>Milestone 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.openlinksw.com/schemas/crunchbase#Milestone"/>
+ </owl:ObjectProperty>
+
+ <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.openlinksw.com/schemas/crunchbase#Milestone"/>
+ </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#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.openlinksw.com/schemas/crunchbase#Office"/>
+ </owl:ObjectProperty>
+
+ <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.openlinksw.com/schemas/crunchbase#Office"/>
+ </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:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#product">
+ <rdfs:comment>Details of one of a company's product</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>product</rdfs:label>
+ <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/crunchbase#Product"/>
+ </owl:ObjectProperty>
+
+ <owl:ObjectProperty 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.openlinksw.com/schemas/crunchbase#Product"/>
+ </owl:ObjectProperty>
+
+ <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:ObjectProperty 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.openlinksw.com/schemas/crunchbase#Providership"/>
+ </owl:ObjectProperty>
+
+ <owl:ObjectProperty 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.openlinksw.com/schemas/crunchbase#Providership"/>
+ </owl:ObjectProperty>
+
+ <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:ObjectProperty 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.openlinksw.com/schemas/crunchbase#Relationship"/>
+ </owl:ObjectProperty>
+
+ <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#relationships">
+ <rdfs:comment>Details of a person associated with a company</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
+ <rdfs:label>relationships</rdfs:label>
+ <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/crunchbase#Relationship"/>
+ </owl:ObjectProperty>
+
+ <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:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#screenshot">
+ <rdfs:comment>Screenshot 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.openlinksw.com/schemas/crunchbase#Screenshot"/>
+ </owl:ObjectProperty>
+
+ <owl:ObjectProperty 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.openlinksw.com/schemas/crunchbase#Screenshot"/>
+ </owl:ObjectProperty>
+
+ <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: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_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.openlinksw.com/schemas/crunchbase#Video_embed"/>
+ </owl:ObjectProperty>
+
+ <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.openlinksw.com/schemas/crunchbase#Video_embed"/>
+ </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 770aa64..daac812 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplcv.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplcv.owl
@@ -1,4 +1,26 @@
<!--
+
+ $Id$
+
+ 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
new file mode 100644
index 0000000..f2e8975
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/opldbps.owl
@@ -0,0 +1,73 @@
+<!--
+
+ $Id$
+
+ 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 3309ecf..4ab3734 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplebay.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplebay.owl
@@ -1,11 +1,11 @@
<!--
- $Id: oplebay.owl,v 1.1.2.4 2010/01/25 15:36:25 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2010 OpenLink Software
+ 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplevri.owl b/binsrc/rdf_mappers/ontologies/owl/oplevri.owl
index fe9f244..943f2e9 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplevri.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplevri.owl
@@ -1,4 +1,26 @@
<!--
+
+ $Id$
+
+ 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 d6ccdbd..658aa84 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl
@@ -1,11 +1,11 @@
<!--
- $Id: oplgooglebase.owl,v 1.1.2.3 2010/01/28 00:28:52 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2010 OpenLink Software
+ 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplgoogleplus.owl b/binsrc/rdf_mappers/ontologies/owl/oplgoogleplus.owl
index 66ac4ee..a310898 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplgoogleplus.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplgoogleplus.owl
@@ -1,13 +1,23 @@
<!-- Processed by Id: cwm.py,v 1.197 2007/12/13 15:38:39 syosi Exp -->
-<!-- using base file:///Users/carl/dev/oplsrc/cartridges/google+/oplgoogleplus.n3-->
+<!-- using base file:///Users/rtsekova/dev/oplsrc/cartridges/google+/oplgoogleplus.n3-->
-<rdf:RDF xmlns="http://www.w3.org/2000/01/rdf-schema#"
+<rdf:RDF xmlns="http://www.openlinksw.com/schemas/googleplus#"
+ xmlns:bibo="http://purl.org/ontology/bibo/"
+ xmlns:dbpedia="http://dbpedia.org/ontology/"
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: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#">
<owl:Ontology rdf:about="http://www.openlinksw.com/schemas/googleplus">
<dc:creator>OpenLink Software, http://www.openlinksw.com</dc:creator>
@@ -17,978 +27,957 @@
</owl:Ontology>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Access">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#AccessItem">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Activity">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#ActivityObject">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Actor">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Attachment">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Comment">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Email">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#EmbeddableLink">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#FullImage">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#InReplyTo">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Name">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Object">
- <comment>A base class representing all Google+ objects</comment>
- <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <label>Google+ object</label>
+ <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>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Organization">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Person">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#PlaceLived">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#PreviewImage">
- <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"/>
+ <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"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Url">
- <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"/>
+ <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"/>
</owl:Class>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#aboutMe">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access_description">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access_item">
- <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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access_item_type">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access_kind">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_object">
- <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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_object_type">
- <comment>The type of the activity object. e.g.
+ <rdfs:comment>The type of the activity object. e.g.
'note' - Textual content.
'activity' - A Google+ activity.
- </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"/>
+ </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"/>
</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"/>
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_title">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#actor_displayName">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#actor_profile_image">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#actor_profile_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#address">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#annotation">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#associatedWith">
- <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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:ObjectProperty rdf:about="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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#attachment_displayName">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#attachment_media_type">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#attachment_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#comment_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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#comment_content">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#comment_self_link">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#comment_verb">
- <comment>An comment's verb, indicating what action was performed e.g.
+ <rdfs:comment>An comment's verb, indicating what action was performed e.g.
'post' - Publish content to the stream.
- </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"/>
+ </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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#content">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#crosspostSource">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#currentLocation">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#date_of_birth">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#department">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#displayName">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#email_type">
- <comment>The type of email address. Possible values are:
+ <rdfs:comment>The type of email address. Possible values are:
'home' - Home email address
'work' - Work email address
'other' - Other
- </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"/>
+ </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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#email_value">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#embed">
- <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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#embed_media_type">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#embed_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#endDate">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#familyName">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#formatted">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#full_image_height">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#full_image_media_type">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#full_image_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#full_image_width">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#gender">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#geocode">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#givenName">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#hasApp">
- <comment>If true, indicates that the person has installed the app
+ <rdfs: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).
- </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"/>
+ </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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#has_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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#honorificPrefix">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#honorificSuffix">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#html_content">
- <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"/>
+ <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"/>
</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" />
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#in_reply_to">
- <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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#in_reply_to_object">
- <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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#in_reply_to_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#location">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#middleName">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#nickname">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#object_actor">
- <comment>If an activity's object is itself another activity (for example, when a person reshares an activity),
+ <rdfs: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.
- </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"/>
+ </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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#object_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#organization_name">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#organization_type">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#originalContent">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#performed_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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#placeId">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#placeName">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#plusoners_total">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="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"/>
+ <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"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#preview_image_height">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#preview_image_media_type">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#preview_image_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#preview_image_width">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#primary_email">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#primary_organization">
- <comment>If true, indicates this organization is the person's
+ <rdfs:comment>If true, indicates this organization is the person's
primary one (typically indicated as current one).
- </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"/>
+ </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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#primary_residence">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#primary_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#profile_image">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#profile_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#providerTitle">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#published">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#radius">
- <comment>Radius, in metres, of the region where this activity occurred, centered at the latitude and
+ <rdfs:comment>Radius, in metres, of the region where this activity occurred, centered at the latitude and
longitude identified by geocode
- </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"/>
+ </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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#relationshipStatus">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#replies_total">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#resharers_total">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#residence_location">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#role">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#shared_url">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#speaksLanguage">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#startDate">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#tagline">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#title">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#updated">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#url_type">
- <comment>The type of this Google+ profile URL -
+ <rdfs:comment>The type of this Google+ profile URL -
'home', 'work', 'blog', 'profile', 'other'
- </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"/>
+ </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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#url_value">
- <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"/>
+ <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"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#verb">
- <comment>An activity's verb, indicating what action was performed e.g.
+ <rdfs: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.
- </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"/>
+ </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"/>
</owl:DatatypeProperty>
</rdf:RDF>
+
+
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplklout.owl b/binsrc/rdf_mappers/ontologies/owl/oplklout.owl
new file mode 100644
index 0000000..c78b67c
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/oplklout.owl
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<!--
+
+ $Id$
+
+ 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 ec992b2..137e79f 100644
--- a/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl
@@ -1,4 +1,25 @@
<!--
+
+ $Id$
+
+ 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
@@ -20,7 +41,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:umbelrc="http://umbel.org/umbel/rc/"
- xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#"
+ xmlns:vcard="http://www.w3.org/2006/vcard/ns#"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
<owl:Ontology rdf:about="http://www.openlinksw.com/schemas/linkedin">
@@ -42,7 +63,6 @@
<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">
@@ -57,7 +77,13 @@
<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#JobPosting">
+ <rdfs:comment>A LinkedIn job posting</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>Job Posting</rdfs:label>
+ <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/linkedin#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/linkedin#Language">
@@ -65,7 +91,6 @@
<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">
@@ -86,7 +111,6 @@
<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">
@@ -94,7 +118,6 @@
<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">
@@ -115,9 +138,7 @@
<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">
@@ -139,7 +160,6 @@
<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">
@@ -164,7 +184,6 @@
<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">
@@ -224,7 +243,7 @@
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#company">
- <rdfs:comment>The company the member works for</rdfs:comment>
+ <rdfs:comment>The company a LinkedIn member works for</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Position"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>company</rdfs:label>
@@ -242,6 +261,7 @@
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#company_name">
<rdfs:comment>The name of a company</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>company name</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
@@ -255,6 +275,14 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#company_status">
+ <rdfs:comment>Company operating status</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>company 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/linkedin#company_type">
<rdfs:comment>Indicates if the company is public or private</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
@@ -272,7 +300,8 @@
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#country_code">
- <rdfs:comment>Country code for the LinkedIn member (ISO 3166-1 alpha-2 standard)</rdfs:comment>
+ <rdfs:comment>Country code for a LinkedIn member or job location (ISO 3166-1 alpha-2 standard)</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>country code</rdfs:label>
@@ -285,7 +314,6 @@
<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">
@@ -344,6 +372,22 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#email_domain">
+ <rdfs:comment>Company email domains</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>email domain</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#employee_count_range">
+ <rdfs:comment>Number of employees at the company (expressed as a range code and number range)</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>employee count</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#end_date">
<rdfs:comment>Date when a member left a position</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Position"/>
@@ -352,6 +396,22 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#experience_level">
+ <rdfs:comment>Experience level required for a posted position</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>experience level</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#expiration_date">
+ <rdfs:comment>The expiry date of a job posting</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>expiration date</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+ </owl:DatatypeProperty>
+
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#field_of_study">
<rdfs:comment>The field of study at the school</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Education"/>
@@ -366,7 +426,14 @@
<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:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#founded_year">
+ <rdfs:comment>Year listed for the company's founding</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>founded year</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#has_im_account">
@@ -383,7 +450,6 @@
<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">
@@ -435,7 +501,8 @@
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#industry">
- <rdfs:comment>The industry the LinkedIn member has indicated their profile belongs to</rdfs:comment>
+ <rdfs:comment>The industry a LinkedIn member works in or a job posting relates to</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>industry</rdfs:label>
@@ -467,13 +534,39 @@
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#is_current">
- <rdfs:comment>Indicates when a member currently holds this position</rdfs:comment>
+ <rdfs:comment>Indicates whether a position, company location (described by a VCard) or job posting is current</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Position"/>
+ <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#VCard"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>is current</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#is_headquarters">
+ <rdfs:comment>Indicates whether a company location (described by a VCard) is the company headquarters</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#VCard"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>is headquarters</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
+ </owl:DatatypeProperty>
+
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#job_function">
+ <rdfs:comment>The job function of a posted position</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>job function</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#job_type">
+ <rdfs:comment>Job type for a posted position</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>job type</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#language">
<rdfs:comment>A language spoken by a member</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
@@ -504,17 +597,25 @@
<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">
- <rdfs:comment>Generic name of the location of the LinkedIn member</rdfs:comment>
+ <rdfs:comment>Generic name of the location of a LinkedIn member or advertised job</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>location 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/linkedin#logo_url">
+ <rdfs:comment>URL for the company logo in JPG format</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>company logo 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/linkedin#main_address">
<rdfs:comment>A member's main address (could be home or work etc.)</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
@@ -555,6 +656,14 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#num_followers">
+ <rdfs:comment>The number of followers for the company's profile</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
+ <rdfs:label>followers 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/linkedin#num_recommenders">
<rdfs:comment>Number of recommendations a member has</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
@@ -641,7 +750,6 @@
<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">
@@ -658,7 +766,6 @@
<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">
@@ -670,13 +777,22 @@
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#position_summary">
- <rdfs:comment>A summary of the member's position</rdfs:comment>
+ <rdfs:comment>A summary of a member's position or an advertised position</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Position"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>position summary</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#posting_date">
+ <rdfs:comment>Date a position was posted</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>posting date</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+ </owl:DatatypeProperty>
+
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#proposal_comments">
<rdfs:comment>A member's description of how they approach proposals</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
@@ -702,12 +818,11 @@
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#public_profile_url">
- <rdfs:comment>URL to a member's public profile</rdfs:comment>
+ <rdfs:comment>URL to a LinkedIn 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>public profile URL</rdfs:label>
+ <rdfs:label>LinkedIn 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">
@@ -740,7 +855,6 @@
<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">
@@ -749,7 +863,6 @@
<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">
@@ -784,6 +897,22 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#referral_bonus">
+ <rdfs:comment>Information about any referral bonus</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>referral bonus</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#salary">
+ <rdfs:comment>The salary listed for a posted job</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>salary</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#school_name">
<rdfs:comment>The name of an educational establishment attended by a LinkedIn member</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Education"/>
@@ -824,6 +953,14 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#skills_and_experience">
+ <rdfs:comment>Description of the skills and experience needed for the posted position</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>skills and experience</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#specialties">
<rdfs:comment>A member's description of their professional specialties</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
@@ -840,6 +977,22 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
</owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#stock_exchange_code">
+ <rdfs:comment>Code identifying the stock exchange the company is in</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>stock exchange 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/linkedin#stock_exchange_name">
+ <rdfs:comment>Stock exchange the company is in</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>stock exchange 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/linkedin#summary">
<rdfs:comment>A member's description of their professional profile</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
@@ -857,12 +1010,28 @@
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#title">
- <rdfs:comment>Job title of a position held</rdfs:comment>
+ <rdfs:comment>Job title of a position held or described in a job posting</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#JobPosting"/>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Position"/>
<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>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#universal_name">
+ <rdfs:comment>The unique string identifier used by LinkedIn for a company</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>universal 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/linkedin#vcard">
+ <rdfs:comment>A VCard for a LinkedIn individual or company</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Company"/>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
+ <rdfs:label>vcard</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#VCard"/>
+ </owl:ObjectProperty>
+</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl b/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl
index c3f455f..4e11059 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl
@@ -1,3 +1,27 @@
+<!--
+
+ $Id$
+
+ 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
new file mode 100644
index 0000000..976ddc9
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/oplnyt.owl
@@ -0,0 +1,93 @@
+<!--
+
+ $Id$
+
+ 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 8b2d85c..41a9dcd 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl
@@ -1,4 +1,26 @@
<!--
+
+ $Id$
+
+ 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
@@ -9,6 +31,7 @@
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#"
@@ -100,6 +123,13 @@
<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"/>
@@ -225,6 +255,32 @@
<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"/>
@@ -233,6 +289,39 @@
<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"/>
@@ -241,6 +330,14 @@
<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"/>
@@ -265,6 +362,78 @@
<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"/>
@@ -273,6 +442,30 @@
<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"/>
@@ -344,13 +537,21 @@
</owl:ObjectProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#has_post">
- <rdfs:comment>A application's own post</rdfs:comment>
+ <rdfs:comment>An 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"/>
@@ -359,6 +560,22 @@
<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"/>
@@ -367,6 +584,71 @@
<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"/>
@@ -375,6 +657,15 @@
<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"/>
@@ -431,12 +722,23 @@
<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"/>
@@ -445,6 +747,22 @@
<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"/>
@@ -453,14 +771,120 @@
<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 name of an Open Graph object</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Object"/>
+ <rdfs:comment>The user's full 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>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"/>
@@ -477,6 +901,14 @@
<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"/>
@@ -485,6 +917,78 @@
<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"/>
@@ -493,6 +997,14 @@
<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"/>
@@ -501,6 +1013,14 @@
<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"/>
@@ -509,16 +1029,40 @@
<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>The URI of a Facebook user's Facebook home page</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Product"/>
+ <rdfs:comment>A link to an OpenGraph resource</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>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>A user's Facebook username</rdfs:comment>
+ <rdfs:comment>The 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>
@@ -526,10 +1070,34 @@
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#verified">
- <rdfs:comment>A user's account verification status</rdfs:comment>
+ <rdfs:comment>The user's account verification status, either 'true' or 'false' </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>
@@ -540,4 +1108,12 @@
<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
new file mode 100644
index 0000000..1c84ae1
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/oplstackoverflow.owl
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ $Id$
+
+ 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 d8d7f65..a643ecc 100644
--- a/binsrc/rdf_mappers/ontologies/owl/opltesco.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/opltesco.owl
@@ -1,4 +1,25 @@
<!--
+
+ $Id$
+
+ 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 d461c1c..e44bd82 100644
--- a/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl
@@ -1,5 +1,26 @@
<!--
- Generated from opllinkedin.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
+
+ $Id$
+
+ 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/
An OpenLink ontology for Twitter
@@ -17,6 +38,7 @@
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">
@@ -26,6 +48,13 @@
<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"/>
@@ -37,7 +66,6 @@
<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">
@@ -45,9 +73,17 @@
<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"/>
- <owl:equivalentClass rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
+ <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/virtrdf-meta-entity-class#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"/>
@@ -110,9 +146,24 @@
<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"/>
@@ -120,4 +171,12 @@
<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/oplwolframalpha.owl b/binsrc/rdf_mappers/ontologies/owl/oplwolframalpha.owl
new file mode 100644
index 0000000..32dd85f
--- /dev/null
+++ b/binsrc/rdf_mappers/ontologies/owl/oplwolframalpha.owl
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:virtrdfmec="http://www.openlinksw.com/schemas/virtrdf-meta-entity-class#"
+ xmlns:wa="http://www.openlinksw.com/schemas/wolframalpha#"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
+ <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/wolframalpha#">
+ <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/wolframalpha#Answer">
+ <rdfs:comment>Answer that Wolfram|Alpha considers authoritative</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
+ <rdfs:label>WolframAlpha Answer</rdfs:label>
+ </owl:Class>
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/wolframalpha#Query">
+ <rdfs:comment>A Wolfram|Alpha Query</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
+ <rdfs:label>WolframAlpha Query</rdfs:label>
+ </owl:Class>
+ <owl:Class rdf:about="http://www.openlinksw.com/schemas/wolframalpha#Source">
+ <rdfs:comment>Attributed source for a Wolfram|Alpha Query</rdfs:comment>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
+ <rdfs:label>WolframAlpha Source</rdfs:label>
+ </owl:Class>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/wolframalpha#normative_query">
+ <rdfs:comment>How Wolfram|Alpha resolved the query</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/wolframalpha#Query"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
+ <rdfs:label>Normalised query</rdfs:label>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/wolframalpha#primary_answer">
+ <rdfs:comment>Primary answer from Wolfram|Alpha</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/wolframalpha#Query"/>
+ <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
+ <rdfs:label>Answer</rdfs:label>
+ <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/wolframalpha#Answer"/>
+ </owl:DatatypeProperty>
+ <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/wolframalpha#score">
+ <rdfs:comment>(Computed) measure of a Wolfram|Alpha query result's relevance</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/wolframalpha#Query"/>
+ <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>
+</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl b/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl
index d3948a1..c6ef3ef 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl
@@ -1,11 +1,11 @@
<!--
- $Id: oplzillow.owl,v 1.1.2.5 2010/01/25 15:36:26 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2010 OpenLink Software
+ 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/owl.owl b/binsrc/rdf_mappers/ontologies/owl/owl.owl
index e8bdf5c..829d978 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 $Date: 2009/12/15 23:13:00 $</versionInfo>
+ <versionInfo>10 February 2004, revised $Date$</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 594cfb3..a486b62 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: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: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#">
<owl:Ontology rdf:about="">
<rdfs:comment>OWL ontology for XBRL</rdfs:comment>
<owl:imports rdf:resource="http://www.xbrl.org/2003/instance#"/>
@@ -105,6 +105,16 @@
</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 a50fa6f..ea8dfc7 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.133 2011/10/25 23:36:21 source Exp $
+-- $Id$
--
-- RDF Mappings
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -24,6 +24,8 @@
--
--
+--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';
@@ -31,6 +33,7 @@ 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
@@ -70,7 +73,8 @@ 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)
@@ -78,7 +82,8 @@ 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)
@@ -132,10 +137,14 @@ 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)');
@@ -148,10 +157,6 @@ 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'));
@@ -162,7 +167,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)
@@ -193,9 +198,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)
@@ -219,7 +224,8 @@ 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://feeds.delicious.com/.*)|(http://del.icio.us/.*)',
+ values ('(http://.*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)
@@ -284,7 +290,8 @@ 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)
@@ -305,8 +312,7 @@ 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/.*)|' ||
- '(http://search.twitter.com/.*)',
+ values ('(http://.*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)
@@ -314,6 +320,10 @@ 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');
@@ -340,57 +350,73 @@ 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');
+ 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');
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 ('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');
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 ('.*', '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';
+ 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'));
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.*',
@@ -405,33 +431,73 @@ 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);
+ 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', ''));
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 ('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, 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 ('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'));
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('https?://plus.google.com/.*', 'URL', 'DB.DBA.RDF_LOAD_GOOGLE_PLUS', null, 'Google+');
+ 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);
+
+insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_ENABLED)
+ values ('^https?://www.wolframalpha.com/input/.*',
+ 'URL', 'DB.DBA.RDF_LOAD_WOLFRAMALPHA', null, 'Wolfram|Alpha', 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';
-- 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
@@ -445,10 +511,12 @@ 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/[^/]+(/.*)?)|'||
@@ -456,7 +524,7 @@ update DB.DBA.SYS_RDF_MAPPERS set RM_PATTERN =
'(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';
@@ -467,42 +535,30 @@ 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;
}
;
@@ -511,9 +567,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));
}
;
@@ -529,12 +585,16 @@ 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 (
@@ -545,8 +605,11 @@ 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_META_CARTRIDGES_LOG (
+'create table DB.DBA.RDF_CARTRIDGES_LOG (
ML_SESSION varchar, -- session id
ML_ID integer identity, -- an unique number
ML_TS timestamp, -- ts
@@ -558,11 +621,11 @@ DB.DBA.EXEC_STMT(
ML_RESULT long varchar, -- transformation to rdf
primary key (ML_SESSION, ML_ID)
)
-alter index RDF_META_CARTRIDGES_LOG on DB.DBA.RDF_META_CARTRIDGES_LOG partition cluster replicated', 0)
+alter index RDF_CARTRIDGES_LOG on DB.DBA.RDF_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,
@@ -573,63 +636,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, 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 ());
+ 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 ());
}
;
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_META_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_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_META_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_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_META_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_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';
}
;
@@ -637,38 +700,33 @@ 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;
- }
- }
-
- --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';
+ 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';
}
;
@@ -677,34 +735,33 @@ 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';
}
;
@@ -852,23 +909,24 @@ 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 y any)
+create procedure DB.DBA.RM_XLAT_CONCAT (in x any, in p any, in s_or_o any, in y any)
{
- if (not isstring (x))
- return x;
- if (registry_get ('__rdf_cartridges_original_doc_uri__') = '1')
- return x;
- if (http_mime_type (x) like 'image/%')
- {
+ --dbg_obj_print_vars (x, p);
+ if (not isstring (x))
return x;
- }
- return DB.DBA.RDF_PROXY_ENTITY_IRI(x);
+ if (registry_get ('__rdf_cartridges_original_doc_uri__') = '1')
+ 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);
}
;
EXEC_STMT ('grant execute on DB.DBA.RM_XLAT_CONCAT to "SPARQL_SPONGE"', 0);
-create procedure DB.DBA.RM_RDF_SPONGE_ERROR (in pname varchar, in graph_iri varchar, in dest varchar, in sql_message varchar)
+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)
{
declare gr, errs_iri, err_iri, nam any;
if (0 = length (sql_message) or pname is null)
@@ -880,15 +938,47 @@ create procedure DB.DBA.RM_RDF_SPONGE_ERROR (in pname varchar, in graph_iri varc
nam := lower (name_part (pname, 2));
err_iri := gr ||'#'||nam;
errs_iri := gr||'#errors';
- 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);
+ 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);
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 (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 (inout triple_dict any, 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));
@@ -902,6 +992,16 @@ create procedure DB.DBA.RM_RDF_LOAD_RDFXML (in strg varchar, in base varchar, in
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);
@@ -922,11 +1022,12 @@ create procedure DB.DBA.RM_RDF_LOAD_RDFXML (in strg varchar, in base varchar, in
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 (in proc varchar, in base varchar, in graph varchar, in service_url varchar)
+create procedure DB.DBA.RM_ADD_PRV (inout triple_dict any, in proc varchar, in base varchar, in graph varchar, in service_url varchar)
{
declare ses, iri, h any;
@@ -937,7 +1038,9 @@ create procedure DB.DBA.RM_ADD_PRV (in proc varchar, in base varchar, in graph v
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 ();
@@ -960,15 +1063,27 @@ create procedure DB.DBA.RM_ADD_PRV (in proc varchar, in base varchar, in graph v
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 (in dest varchar, in graph_iri varchar, in new_origin_uri varchar, inout opts any)
+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)
{
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'
{
@@ -1005,12 +1120,43 @@ 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 function DB.DBA.shtml2text(in content varchar)
+{
+ declare long_content long varchar;
+ long_content := content;
+ return DB.DBA.html2text(long_content);
+};
+
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 is null)
+ return '';
+ 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;
@@ -1116,8 +1262,7 @@ 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)
@@ -1162,6 +1307,12 @@ create procedure DB.DBA.XSLT_HTTP_STRING_DATE (in val varchar)
}
;
+create procedure DB.DBA.ESCAPEURI (in uri varchar) returns varchar
+{
+ return sprintf('%U', uri);
+}
+;
+
create procedure DB.DBA.XSLT_TRIM (in val varchar, in tr varchar)
{
if (val is not null and length(val) > 0)
@@ -1177,72 +1328,106 @@ 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 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);
+ 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)
+ else
+ ret := http_string_date (val, null, null);
+ if (ret is not null)
{
- ret := dt_set_tz (ret, 0);
- ret := date_iso8601 (ret);
+ ret := dt_set_tz (ret, 0);
+ ret := date_iso8601 (ret);
+ }
+ 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)
+ {
+ --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);
}
- return coalesce (ret, val);
+ http ('</result>', ses);
+ return xtree_doc (ses);
}
;
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';
}
;
@@ -1251,56 +1436,101 @@ 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 ();
+ 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;
+}
+;
- if (frag = 'this' or frag = '#this') -- comment out to do old behaviour
- frag := '';
+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;
+}
+;
- if (length (frag) and frag[0] <> '#'[0])
- frag := '#' || sprintf ('%U', frag);
- if (strchr (uri, '#') is not null)
- frag := '';
+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))', 0);
- --if (http_mime_type (uri) like 'image/%')
- --return uri;
+create procedure RDF_SPONGE_PROXY_IRI_MAP (in uri_identifier varchar, in graph varchar)
+{
+ 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);
+ if (0 = length (graph))
+ graph := null;
+ insert soft DB.DBA.RDF_PROXY_IRI_MAP (RPIM_IRI, RPIM_SOURCE_IRI) values (iri_to_id (ret), iri_to_id (graph));
+ return ret;
+}
+;
- ua := rfc1808_parse_uri (uri);
- url_sch := ua[0];
- ua [0] := '';
- uri := vspx_uri_compose (ua);
- uri := ltrim (uri, '/');
+create procedure RDF_SPONGE_PROXY_IRI_GRAPH_BY_ID (in id varchar)
+{
+ declare cname, iid varchar;
+ declare ret any;
+ cname := DB.DBA.RDF_PROXY_GET_HTTP_HOST ();
+ ret := sprintf ('%s://%s/proxy-iri/%s', RDF_SPONGE_IRI_SCH (), cname, id);
+ iid := iri_to_id (ret);
+ ret := (select RPIM_SOURCE_IRI from DB.DBA.RDF_PROXY_IRI_MAP where RPIM_IRI = iid);
+ return id_to_iri (ret);
+}
+;
- 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);
+create procedure RDF_SPONGE_PROXY_IRI_BY_ID (in id varchar)
+{
+ declare cname, ret, iid varchar;
+ cname := DB.DBA.RDF_PROXY_GET_HTTP_HOST ();
+ ret := sprintf ('%s://%s/proxy-iri/%s', RDF_SPONGE_IRI_SCH (), cname, id);
return ret;
}
;
-create function DB.DBA.RDF_PROXY_GET_HTTP_HOST ()
+grant execute on RDF_SPONGE_PROXY_IRI_MAP to public;
+
+xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:iriMap', fix_identifier_case ('DB.DBA.RDF_SPONGE_PROXY_IRI_MAP'));
+
+create procedure RDF_SPONGE_PROXY_IRI_GET_GRAPH (in iri any)
{
- 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;
+ declare iid, ret varchar;
+ iid := iri_to_id (iri);
+ ret := (select RPIM_SOURCE_IRI from DB.DBA.RDF_PROXY_IRI_MAP where RPIM_IRI = iid);
+ if (ret is null)
+ return iri;
+ return id_to_iri (ret);
}
;
@@ -1311,7 +1541,7 @@ create procedure DB.DBA.RDF_PROXY_ENTITY_IRI (in uri varchar := '', in login var
{
declare cname any;
declare ret any;
- declare url_sch varchar;
+ declare url_sch, local_prx varchar;
declare ua any;
cname := DB.DBA.RDF_PROXY_GET_HTTP_HOST ();
@@ -1329,12 +1559,16 @@ 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;
}
@@ -1427,72 +1661,69 @@ 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 '*' {
- return base || '#' || word;
- };
-
- uri := MOAT_APPLY (http_dav_uid (), word);
- if (uri is not null)
+ declare res, xp, xt, url varchar;
+ declare uri varchar;
+ declare st int;
+ declare dbp_iri any;
+ declare exit handler for sqlstate '*'
{
- 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 := 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 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;
}
;
@@ -1509,38 +1740,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;
}
;
@@ -1549,63 +1780,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;
}
@@ -1657,22 +1888,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
@@ -1685,33 +1916,56 @@ 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;
+ 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;
}
;
@@ -1731,9 +1985,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);
}
;
@@ -1765,48 +2019,75 @@ 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);
+ 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;
}
-
- if (multiplier > 1)
- converted_sval := sprintf('%.lf', base_dval * multiplier);
- else
- converted_sval := base_sval;
- }
+ return converted_sval;
+}
+;
- return converted_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;
}
;
+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;
@@ -1832,6 +2113,11 @@ 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;
+grant execute on DB.DBA.shtml2text to public;
+grant execute on DB.DBA.escapeURI 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'));
@@ -1843,6 +2129,7 @@ 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');
@@ -1850,6 +2137,7 @@ 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');
@@ -1867,66 +2155,71 @@ 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');
+xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:html2text', fix_identifier_case ('DB.DBA.shtml2text'));
+xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:escapeURI', fix_identifier_case('DB.DBA.ESCAPEURI'));
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'))
- {
- 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)
-{
- declare xd, tmp, fn any;
- tmp := null;
- declare exit handler for sqlstate \'*\'
+ set_qualifier ('APERTURE');
+ if (not udt_is_available ('APERTURE.DBA.MetaExtractor'))
{
- if (length (tmp))
+ 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 (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');
+ 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\');
+ 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');
}
;
@@ -1937,121 +2230,141 @@ 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;
+ 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)
+create procedure DB.DBA.STREE_ELEM (in tag varchar)
{
- 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);
- }
- }
+ declare x any;
+ x := replace(replace(tag, ' ', '_'), '@', '');
+ if (strchr ('!"#$%&\'()*+,-./:;<=>?@[\]^_`{|}~0123456789', x[0]) is not null)
+ return 'elem_' || x;
+ return x;
+}
+;
+
+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);
+ }
+ }
}
;
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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare hdr any;
declare tree, xt, xd any;
@@ -2059,7 +2372,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
username_ := get_keyword ('username', opts);
@@ -2077,18 +2390,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);
@@ -2326,30 +2639,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 (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 (triple_dict, 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 (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');
+ 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');
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) 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, in triple_dict any := null) returns integer
{
declare xt, xd any;
declare tmp, test1, test2, test3 varchar;
@@ -2364,15 +2677,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 (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);
+ 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);
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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare xt, xd any;
declare url, tmp varchar;
@@ -2380,7 +2693,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
what_ := '';
@@ -2393,9 +2706,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
return 1;
}
else if (new_origin_uri like 'http://search.twitter.com/search?q=%')
@@ -2405,9 +2718,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
return 1;
}
else if (new_origin_uri like 'http://twitter.com/%/status/%')
@@ -2418,15 +2731,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
return 1;
}
@@ -2438,15 +2751,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
return 1;
@@ -2490,60 +2803,55 @@ create procedure DB.DBA.RDF_LOAD_TWITTER(in graph_iri varchar, in new_origin_uri
}
else
return 0;
-
friends_and_followers: ;
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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) = 0)
+ if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict) = 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) = 0)
+ if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict) = 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) = 0)
+ if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict) = 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) = 0)
+ if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict) = 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);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare xt, xd any;
declare url, tmp varchar;
@@ -2551,7 +2859,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
tree := json_parse (_ret_body);
@@ -2562,13 +2870,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, 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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare qr, path, hdr any;
declare tree, xt, xd, types, is_search any;
@@ -2576,12 +2884,11 @@ 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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://getsatisfaction.com/%')
@@ -2683,7 +2990,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
if (what_ = 'topics')
{
xd := xtree_doc (tmp);
@@ -2698,39 +3005,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 (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);
+ 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);
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)
+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)
{
declare xd, xt any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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 (dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ 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_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)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare thisgr, cont varchar;
thisgr := coalesce (dest, graph_iri);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
--ret_body := replace (ret_body, '= \'<script', '= \'<scr\' + \'ipt');
@@ -2752,22 +3059,22 @@ create procedure DB.DBA.RDF_LOAD_OVERSTOCK (in graph_iri varchar, in new_origin_
'</div>');
}
if (dest is null)
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RDF_LOAD_RDFA_1 (cont, new_origin_uri, thisgr, 0);
+ 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);
--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)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare thisgr, cont varchar;
thisgr := coalesce (dest, graph_iri);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (get_keyword ('use_tidy', opts) = 'yes')
@@ -2775,20 +3082,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (cont, new_origin_uri, thisgr, 0);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 0);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (cont, new_origin_uri, thisgr, 1);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 1);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (cont, new_origin_uri, thisgr, 2);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 2);
rdfa_end:;
}
return 1;
@@ -2796,14 +3103,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)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare thisgr, cont varchar;
thisgr := coalesce (dest, graph_iri);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (get_keyword ('use_tidy', opts) = 'yes')
@@ -2811,20 +3118,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA (cont, new_origin_uri, thisgr, 0);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 0, 0);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA (cont, new_origin_uri, thisgr, 1);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 1, 0);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA (cont, new_origin_uri, thisgr, 2);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 2, 0);
rdfa_end:;
}
return 1;
@@ -2832,7 +3139,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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare qr, path, hdr any;
declare tree, xt, xd, types, is_search any;
@@ -2841,7 +3148,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -2883,7 +3190,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 (current_proc_name (), graph_iri, dest, hdr[0]);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, hdr[0]);
return 0;
}
if (new_origin_uri like 'http://api.crunchbase.com/v/1/search.js?query=%')
@@ -2891,15 +3198,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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 (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);
+ 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);
return 1;
}
;
@@ -2981,7 +3288,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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare qr, path, hdr any;
declare tree, xt, xd, types any;
@@ -2992,7 +3299,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -3010,9 +3317,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
-- cb-- As was
- --DB.DBA.RM_RDF_LOAD_RDFXML (cnt, new_origin_uri, coalesce (dest, graph_iri));
+ --DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, cnt, new_origin_uri, coalesce (dest, graph_iri));
-- cb++
xt := xtree_doc(cnt);
@@ -3020,11 +3327,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, 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 (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), new_url);
+ DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), new_url);
have_rdf := 1;
goto done;
}
@@ -3056,7 +3363,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
foreach (any tp in types) do
{
qr := sprintf ('{"ROOT":{"query":{%s, "type":"%s", "*":[]}}}', k, tp);
@@ -3069,9 +3376,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 (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);
+ 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);
have_rdf := 1;
}
done:;
@@ -3098,14 +3405,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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -3168,14 +3475,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, 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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
goto end_sp;
try_profile:
@@ -3194,7 +3501,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, 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);
@@ -3202,7 +3509,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, 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);
@@ -3210,16 +3517,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, 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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
goto end_sp;
end_sp:
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 'http://api.facebook.com/restserver.php');
+ DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 'http://api.facebook.com/restserver.php');
return 1;
};
@@ -3238,6 +3545,8 @@ 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
@@ -3280,221 +3589,374 @@ EXEC_STMT(
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)
+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, 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 integer;
- declare og_timeout integer; -- Timeout when accessing Open Graph collections
- declare http_new_origin_uri varchar;
-
- og_timeout := 60;
+ 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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
+ 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);
+ 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=%')
+ 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 %')
{
- 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;
+ signal ('22023', trim(hdr[0], '\r\n'), 'RDFXX');
+ return 0;
}
- else if (http_new_origin_uri like 'http://www.facebook.com/pages/%/%')
+ 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)
{
- 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;
+ 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/');
}
- else if (http_new_origin_uri like 'http://www.facebook.com/album.php?aid=%&id=%')
+ 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
{
- 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;
+ 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;
}
- else if (http_new_origin_uri like 'http://www.facebook.com/%')
+ 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)
{
- 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;
+ log_message (sprintf('%s: No access token is available to query this OpenGraph object\'s metadata.', current_proc_name()));
+ return 0;
}
- else if (http_new_origin_uri like 'http://graph.facebook.com/%')
+ foreach (any _token in access_tokens) do
{
- 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
+ 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)
{
- 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;
+ access_token := token;
+ goto got_usable_token_for_object;
}
- url := sprintf ('https://graph.facebook.com/%s?metadata=1', id);
- cnt := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
+ }
+ }
+ 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);
- -- 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);
- -- dbg_printf('og_id: %s - access token: %s', og_id, access_token);
+ -- 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);
+ }
- retries := 0;
+ 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)
+ -- 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;
+
+ -- batch request
+ declare br, req, rtree any;
+
+next_page_batch:
+ page := page + 1;
+ more_pages := 0;
+ br := '[';
+ 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;
- }
- }
- }
+ 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;
+
+ og_conn_type := og_conns[i];
+ ibatch := ibatch + 1;
+
+ if (og_conn_type = '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)
+ {
+ 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:
- ;
+ 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
+ {
+ 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);
+ }
+ }
+ 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;
+ }
}
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
- return 1;
+ }
+ }
+ 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;
+ goto retry_without_access_token;
+ }
+ }
+next_conn:;
+ }
+ if (more_pages)
+ goto next_page_batch;
+
+ DB.DBA.RM_ADD_PRV (triple_dict, 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)
+create procedure DB.DBA.OPENGRAPH_OBJ_CONNECTIONS (in xt any, in access_token varchar, in append_access_token integer)
{
declare og_conns, conns any;
declare conn_str, token_str varchar;
token_str := '';
- if (access_token is not null and length (access_token) > 0)
+ if (append_access_token and access_token is not null and length (access_token) > 0)
token_str := '?access_token=' || access_token;
og_conns := vector();
@@ -3536,62 +3998,114 @@ create procedure DB.DBA.OPENGRAPH_GET_ACCESS_TOKEN (in og_id varchar)
access_token := null;
- 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
+ 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
OGAT_ACCESS_TOKEN as _token
from
DB.DBA.OPENGRAPH_ACCESS_TOKENS
where
- OGAT_GRANTOR_ID = og_id and OGAT_EXPIRES is null
+ OGAT_GRANTOR_ID = og_id and OGAT_EXPIRES is null and OGAT_APP_SITE_URL like '%facebook_oauth/'
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()
+ OGAT_GRANTOR_ID = og_id and OGAT_EXPIRES > now() and OGAT_APP_SITE_URL like '%facebook_oauth/'
)
- 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
+ OGAT_EXPIRES is null and OGAT_APP_SITE_URL like '%facebook_oauth/'
order by OGAT_CREATED desc
)
- do
+ do
+ {
+ access_token := _token;
+ }
+
+ return access_token;
+ }
+ else
{
- access_token := _token;
+ 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'))
+ {
+ 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;
+ }
+
+ -- 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;
}
;
@@ -3658,7 +4172,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)
+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)
{
declare xt, xd any;
declare test int;
@@ -3667,7 +4181,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.zoopla.co.uk/property/%')
@@ -3714,20 +4228,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 (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);
+ 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);
}
;
-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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -3844,9 +4358,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 (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);
+ 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);
-- GetUpdatedPropertyDetails often returns error code 501:
-- "The updated data for the property you are requesting is not available due to legal restrictions"
@@ -3863,20 +4377,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url2);
+ 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);
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)
+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)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif any;
asin := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://friendfeed.com/search?q=%')
@@ -3902,23 +4416,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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 (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);
+ 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);
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)
+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)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif any;
asin := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -3956,14 +4470,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 (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);
+ 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);
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)
+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)
{
declare xt, xd any;
declare developer_key_, username_, password_, url, tmp, ses, query varchar;
@@ -3974,7 +4488,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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_));
@@ -3997,9 +4511,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 (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);
+ 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);
return 1;
}
;
@@ -4016,7 +4530,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)
+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)
{
declare qr, path, hdr any;
declare test integer;
@@ -4034,7 +4548,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
ts := cast(datediff ('second', stringdate ('1970-1-1'), stringdate(datestring_GMT(now ()))) as varchar);
@@ -4106,14 +4620,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 (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);
+ 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);
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)
+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)
{
declare qr, path, hdr any;
declare test, pos integer;
@@ -4122,7 +4636,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://disqus.com/people/%')
@@ -4163,10 +4677,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 (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);
+ 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);
return 1;
}
;
@@ -4205,13 +4719,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)
+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)
{
declare xd, xt, url, tmp, id, id2, indicators any;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.rhapsody.com/goto?%&variant=data')
@@ -4242,25 +4756,25 @@ create procedure DB.DBA.RDF_LOAD_RHAPSODY (in graph_iri varchar, in new_origin_u
}
else
return 0;
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
email_ := get_keyword ('email', opts);
@@ -4307,20 +4821,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
urls := vector();
@@ -4357,7 +4871,7 @@ create procedure DB.DBA.RDF_LOAD_IDIOMAG (in graph_iri varchar, in new_origin_ur
else
return 0;
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
for (i := 0, l := length (urls); i < l; i := i + 1)
{
url := urls[i];
@@ -4365,20 +4879,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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_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)
+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)
{
declare xd, xt, url, tmp, id, id2, indicators any;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.radiopop.co.uk/users/%')
@@ -4420,15 +4934,15 @@ create procedure DB.DBA.RDF_LOAD_RADIOPOP (in graph_iri varchar, in new_origin_u
}
else
return 0;
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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 (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);
+ 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);
return 1;
}
else
@@ -4436,14 +4950,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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -4494,20 +5008,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 (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);
+ 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);
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)
+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)
{
declare xd, xt, url, tmp, api_key, id any;
id := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -4541,14 +5055,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 (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);
+ 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);
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)
+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)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif, books any;
declare is_book integer;
@@ -4556,7 +5070,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -4655,14 +5169,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 (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);
+ 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);
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) 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, in triple_dict any := null) returns integer
{
declare xt, xd, hdr any;
declare tmp, test1, test2 varchar;
@@ -4671,140 +5185,140 @@ 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 (current_proc_name (), graph_iri, dest, 'API call failed:' || hdr[0]);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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_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)
+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)
{
- 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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
- api_key := _key;
- base := concat(trim(new_origin_uri, '/'), '/');
- if (new_origin_uri like 'http://%.meetup.com/%')
- {
- tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s/%s/%s/%s/%s', 0);
- if (tmp is null)
- tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s/%s/%s/%s', 0);
- if (tmp is null)
- tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s/%s/%s', 0);
- if (tmp is null)
- tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s/%s', 0);
- if (tmp is null)
- tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s', 0);
- len := length(tmp);
- if (len > 5)
- id5 := tmp[5];
- if (len > 4)
- id4 := tmp[4];
- if (len > 3)
- id3 := tmp[3];
- if (len > 2)
- id2 := tmp[2];
- if (len > 1)
- id1 := tmp[1];
- if (len > 0)
- id0 := tmp[0];
- if (id0 is null or (id0 = 'www' and id1 is null))
- return 0;
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
- if (id0 = 'www')
- {
- if (id1 = 'cities')
- {
- if (id2 is not null)
- {
- url := concat('http://api.meetup.com/groups.xml/?country=', id2);
- if (id3 is not null and id4 is not null)
- {
- url := concat(url, '&state=', id3);
- if (id4 is not null and id4 <> 'groups')
- {
- url := concat(url, '&city=', id4);
- }
- }
- else if (id3 is not null and (id4 is null or id4 = 'groups'))
- {
- url := concat(url, '&city=', id3);
- }
- what_ := 'groups';
- }
- else
- return 0;
- url := concat(url, '&key=', api_key );
- 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);
- }
- else
- {
- base := concat('http://www.meetup.com/', id1, '/');
- if (id1 is not null and id2 = 'members')
- {
- 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);
- }
- else if (id1 is not null and id2 = 'calendar')
- {
- if (id3 is null or id3 = '')
- {
- 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);
- }
- 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);
- }
- }
- 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);
- }
- 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);
-
- 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);
-
- 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);
-
- 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);
- }
- }
- }
+ 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);
+ return 0;
+ };
+ api_key := _key;
+ base := concat(trim(new_origin_uri, '/'), '/');
+ if (new_origin_uri like 'http://%.meetup.com/%')
+ {
+ tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s/%s/%s/%s/%s', 0);
+ if (tmp is null)
+ tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s/%s/%s/%s', 0);
+ if (tmp is null)
+ tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s/%s/%s', 0);
+ if (tmp is null)
+ tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s/%s', 0);
+ if (tmp is null)
+ tmp := sprintf_inverse (new_origin_uri, 'http://%s.meetup.com/%s', 0);
+ len := length(tmp);
+ if (len > 5)
+ id5 := tmp[5];
+ if (len > 4)
+ id4 := tmp[4];
+ if (len > 3)
+ id3 := tmp[3];
+ if (len > 2)
+ id2 := tmp[2];
+ if (len > 1)
+ id1 := tmp[1];
+ if (len > 0)
+ 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);
+ if (id0 = 'www')
+ {
+ if (id1 = 'cities')
+ {
+ if (id2 is not null)
+ {
+ url := concat('http://api.meetup.com/groups.xml/?country=', id2);
+ if (id3 is not null and id4 is not null)
+ {
+ url := concat(url, '&state=', id3);
+ if (id4 is not null and id4 <> 'groups')
+ {
+ url := concat(url, '&city=', id4);
+ }
+ }
+ else if (id3 is not null and (id4 is null or id4 = 'groups'))
+ {
+ url := concat(url, '&city=', id3);
+ }
+ what_ := 'groups';
+ }
+ 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);
+ }
+ 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);
+ }
+ else
+ {
+ base := concat('http://www.meetup.com/', id1, '/');
+ if (id1 is not null and id2 = 'members')
+ {
+ 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);
+ }
+ else if (id1 is not null and (id2 = 'calendar' or id2 = 'events'))
+ {
+ if (id3 is null or id3 = '')
+ {
+ 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);
+ }
+ 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);
+ }
+ }
+ 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);
+ }
+ 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);
+
+ 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);
+
+ 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);
+
+ 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);
+ }
+ }
+ }
else
{
if (id1 = 'cities')
@@ -4829,7 +5343,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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
}
else
{
@@ -4838,13 +5352,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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
}
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
}
if (id1 is not null and id2 = 'calendar')
{
@@ -4852,14 +5366,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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
}
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
}
}
if (id1 is null or id1 = '')
@@ -4868,37 +5382,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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
}
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
}
}
}
@@ -4907,7 +5421,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)
+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)
returns integer
{
declare xt, xd any;
@@ -4916,14 +5430,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 (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);
+ --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);
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)
+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)
{
declare xd, xt, url, tmp, tmp1, server, api_key, hdr, gr_iri any;
declare pos, len int;
@@ -4935,7 +5449,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -4968,7 +5482,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
if (id0 = 'music')
{
if (id1 is not null and id1 <> '')
@@ -4977,70 +5491,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
}
else
{
if (strchr(id2, '+') = 0) -- todo: perhaps it needs some processing?
{
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
}
else if (id1 = '+noredirect')
{
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
}
else
{
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
}
}
}
else
{
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
}
}
else
@@ -5050,19 +5564,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
}
else
return 0;
@@ -5074,10 +5588,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
}
else
return 0;
@@ -5086,28 +5600,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
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);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
xd := xtree_doc (tmp);
@@ -5123,8 +5637,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url2);
+ 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);
}
}
else if (id1 is not null and id1 <> '' and (id2 = 'library' and id3 = 'playlists' and id4 <> '' and id4 is not null))
@@ -5140,14 +5654,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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (
@@ -5196,9 +5710,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 (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);
+ 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);
return 1;
}
else
@@ -5209,13 +5723,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)
+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)
{
declare xd, xt, url, tmp, geo_id any;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%.geonames.org/%')
@@ -5233,20 +5747,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 (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);
+ 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);
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)
+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)
{
declare xd, xt, url, tmp, hdr, id any;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://vimeo.com/%')
@@ -5276,21 +5790,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -5346,8 +5860,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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;
}
else
@@ -5357,21 +5871,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://digg.com/search?%')
@@ -5387,10 +5901,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 (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);
+ 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);
return 1;
}
else if (new_origin_uri like 'http://digg.com/%')
@@ -5408,9 +5922,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 (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);
+ 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);
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;
@@ -5431,9 +5945,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 (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);
+ 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);
return 1;
}
ret:
@@ -5441,7 +5955,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)
+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)
{
declare xd, section_name, search, xt, url, tmp any;
declare entity varchar;
@@ -5449,7 +5963,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -5481,14 +5995,15 @@ 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 (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);
+ 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);
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)
+
+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)
{
declare xd, section_name, search, xt, url, tmp any;
declare entity varchar;
@@ -5496,7 +6011,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.eol.org/pages/%')
@@ -5519,20 +6034,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://rdfohloh.wikier.org/%/%')
@@ -5562,20 +6077,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 (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);
+ 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);
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)
+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)
{
declare xd, section_name, search, xt, url, tmp any;
declare what varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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/%')
@@ -5615,9 +6130,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 (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);
+ 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);
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);
@@ -5650,7 +6165,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)
+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)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif any;
declare pos int;
@@ -5660,7 +6175,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
auth_header := null;
@@ -5714,14 +6229,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 (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);
+ 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);
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)
+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)
{
declare xd, xd2, host_part, xt, url, tmp, api_key, hdr, ids, exif any;
declare pos int;
@@ -5731,7 +6246,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
auth_header := null;
@@ -5771,9 +6286,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 (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);
+ 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);
ids := xpath_eval ('/feed/entry/link[@rel="http://schemas.google.com/spreadsheets/2006#cellsfeed"]/@href', xd, 0);
foreach (any y in ids) do
@@ -5784,21 +6299,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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_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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.oreilly.com/catalog/%')
@@ -5828,21 +6343,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://books.google.com/books?id=%')
@@ -5863,21 +6378,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (length (_key) = 0)
@@ -5922,9 +6437,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 (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);
+ 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);
return 1;
}
else
@@ -5934,14 +6449,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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -5954,10 +6469,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
}
else if (new_origin_uri like 'https://plus.google.com/%/about')
{
@@ -5968,10 +6483,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
}
else if (new_origin_uri like 'https://plus.google.com/%/photos')
{
@@ -5982,10 +6497,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
}
else if (new_origin_uri like 'https://plus.google.com/%')
{
@@ -6001,19 +6516,19 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE (in graph_iri varchar, in new_or
else
return 0;
}
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
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);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
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);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
}
else
return 0;
@@ -6021,7 +6536,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)
+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)
{
declare xd, xt, tmp, hdr any;
tmp := http_client_ext (url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
@@ -6031,21 +6546,25 @@ 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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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);
}
;
-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)
+-- /* 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)
{
- declare xd, xd2, xt, api_urls, tmp any;
- declare url, people_api_url, activity_api_url any;
+ declare xd, xd2, xt, api_urls, tmp, hdr any;
+ declare url, base_url, people_api_url, activity_api_url any;
declare uid, post_id, api_mode varchar;
- declare first_pass integer;
+ 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 exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -6055,6 +6574,20 @@ 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
--
@@ -6068,28 +6601,51 @@ 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. 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.
+ -- required post.
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);
- tmp := '';
- tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- if (length (tmp) = 0)
+ post_url := replace (new_origin_uri, 'http://', 'https://');
+ base_url := url;
+
+ next_page := 1;
+ while (next_page > 0)
{
- log_message (sprintf ('%s: Failed HTTP GET: %s', current_proc_name(), url));
- return 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;
}
- 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);
+
+got_activity_id:
if (activity_id is null)
{
- log_message (sprintf ('%s: Couldn''t find post ID %s amongst the user''s 100 most recent', current_proc_name(), post_id));
+ log_message (sprintf ('%s: Couldn''t find post ID %s amongst the user''s posts', 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));
@@ -6103,11 +6659,12 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS (in graph_iri varchar, in new_origi
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 (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);
+ 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);
- DB.DBA.RDF_LOAD_GOOGLE_PLUS_COMMENTS (graph_iri, new_origin_uri, dest, _key, opts, activity_id);
+ 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);
return 1;
}
@@ -6118,21 +6675,34 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS (in graph_iri varchar, in new_origi
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=100', uid, _key);
- api_urls := vector (vector (people_api_url, 'people'), vector (activity_api_url, 'activity'));
+ 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')));
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;
- tmp := json_parse (tmp);
+ 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);
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));
@@ -6140,66 +6710,161 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS (in graph_iri varchar, in new_origi
if (first_pass)
{
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
first_pass := 0;
}
- 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);
+ 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);
- if (api_mode = 'activity')
+ if (api_mode = 'activity' and max_comment_pages >= 0)
{
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, null, replies_url);
+ 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_GOOGLE_PLUS_COMMENTS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, in _key any, in opts any,
+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;
+}
+;
+
+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,
in activity_id varchar, -- Used when sponging a G+ Post directly
- in replies_url varchar := null -- Used when sponging an G+ Activities list
+ in replies_url varchar := null, -- Used when sponging an G+ Activities list
+ in items_per_comment_page integer,
+ in max_comment_pages integer
)
{
- declare url, tmp, xd, xt any;
+ declare base_url, url, tmp, xd, xd2, xt any;
+ declare page_token varchar;
+ declare next_page integer;
if (activity_id is not null)
- url := sprintf ('https://www.googleapis.com/plus/v1/activities/%s/comments?key=%s', activity_id, _key);
+ url := sprintf ('https://www.googleapis.com/plus/v1/activities/%s/comments?key=%s&maxResults=%d', activity_id, _key, items_per_comment_page);
else if (replies_url is not null)
- url := sprintf ('%s?key=%s', replies_url, _key);
+ url := sprintf ('%s?key=%s&maxResults=%d', replies_url, _key, items_per_comment_page);
else
return;
- tmp := '';
- tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- if (length (tmp) = 0)
+
+ base_url := url;
+ next_page := 1;
+ while (next_page > 0)
{
- log_message (sprintf ('%s: Failed HTTP GET: %s', current_proc_name(), url));
- return;
+ 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;
}
- 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);
+got_all_comments_pages:;
}
;
-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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.etsy.com/people/%')
@@ -6245,21 +6910,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.guardian.co.uk/politics/person/%')
@@ -6283,14 +6948,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 (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);
+ 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);
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)
+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)
{
declare xd, host_part, xt, url, tmp, hdr, tree, methods any;
declare pos int;
@@ -6300,7 +6965,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%seevl.net/entity/%')
@@ -6331,22 +6996,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 (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);
+ --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);
}
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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/')
@@ -6381,20 +7046,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.wine.com/V6/%/wine/%/%')
@@ -6421,20 +7086,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.evri.com/%/%')
@@ -6455,21 +7120,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
email_ := get_keyword ('email', opts);
@@ -6506,21 +7171,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
client_id := get_keyword ('client_id', opts);
@@ -6564,21 +7229,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://upcoming.yahoo.com/venue/%')
@@ -6614,14 +7279,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 (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);
+ 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);
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)
+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)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare entity_id, app_key_, user_key_ varchar;
@@ -6632,7 +7297,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.eventbrite.com/event/%')
@@ -6664,14 +7329,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 (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);
+ 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);
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)
+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)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare entity_id, app_key_, user_key_ varchar;
@@ -6681,7 +7346,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://eventful.com/%events/%E0-%')
@@ -6736,21 +7401,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
consumer_key := get_keyword ('consumer_key', opts, null);
@@ -6776,21 +7441,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http%://%seatgeek.com/%-tickets/%')
@@ -6808,21 +7473,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
--email_ := get_keyword ('email', opts);
@@ -6880,21 +7545,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.download.com/%/%.html%')
@@ -6960,21 +7625,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.googlestore.com/%/%/%.axd%')
@@ -7006,14 +7671,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 (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);
+ 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);
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)
+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)
{
declare xd, host_part, xt, url, tmp, api_key, tree, hdr, exif any;
declare pos int;
@@ -7026,7 +7691,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://gowalla.com/spots/%')
@@ -7089,14 +7754,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 (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);
+ 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);
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)
+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)
{
declare xd, xt, url, tmp, asin any;
declare pos int;
@@ -7104,7 +7769,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.programmableweb.com/mashup/%')
@@ -7139,9 +7804,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 (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);
+ 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);
return 1;
}
;
@@ -7222,7 +7887,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)
+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)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif, tree any;
declare pos int;
@@ -7230,7 +7895,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
consumer_key := get_keyword ('consumer_key', opts, null);
@@ -7259,21 +7924,21 @@ create procedure DB.DBA.RDF_LOAD_YELP (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/yelp2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- 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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%revyu.com/people/%')
@@ -7293,19 +7958,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 (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);
+ 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);
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)
+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)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
tmp := sprintf_inverse (new_origin_uri, '%s://%s/show_bug.cgi?id=%s', 0);
@@ -7325,14 +7990,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 (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);
+ 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);
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)
+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)
{
declare qr, path any;
declare tree, xt, xd, types any;
@@ -7340,7 +8005,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
tmp := sprintf_inverse (new_origin_uri, 'http://openlibrary.org/b/%s', 0);
@@ -7359,14 +8024,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 (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);
+ 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);
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)
+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)
{
declare qr, path, hdr any;
declare tree, xt, xd, types any;
@@ -7374,7 +8039,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
url := new_origin_uri;
@@ -7383,9 +8048,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 (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);
+ 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);
return 1;
}
;
@@ -7479,18 +8144,140 @@ create procedure csv_to_xml (in s any)
http ('\n\t</row>\n', ss);
rcnt := rcnt + 1;
}
- }
- http ('</csv>', ss);
- return ss;
+ }
+ http ('</csv>', ss);
+ return ss;
+}
+;
+
+create procedure DB.DBA.RDF_LOAD_WOLFRAMALPHA(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, 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;
+ };
+
+ if(not length(_key)) {
+ log_message (sprintf ('%s: Wolfram|Alpha cartridge needs an API key', current_proc_name()));
+ return 0;
+ }
+
+ urlpart:=regexp_substr('^http://www.wolframalpha.com/input/\?.*i=([^&]*)', new_origin_uri, 1);
+
+ hdr:=null;
+ url:=sprintf('http://api.wolframalpha.com/v2/query?input=%s&appid=%s', urlpart, _key);
+
+ 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 := xtree_doc(content);
+ xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/wolfram_alpha2rdf.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);
+ return 1;
+}
+;
+
+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)
+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)
{
declare xd, xt, url, tmp any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -7499,21 +8286,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 (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);
+ 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_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)
+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)
{
declare xd, xt, url, tmp any;
declare exit handler for sqlstate '*'
{
-- dbg_printf('Error: [%s]', __SQL_MESSAGE);
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -7523,8 +8310,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 (xd, new_origin_uri, COALESCE(DEST, GRAPH_IRI));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, COALESCE(DEST, GRAPH_IRI), null);
+ 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;
}
;
@@ -7543,26 +8330,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)
+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)
{
declare xd, xt, url, tmp, api_key, img_id, hdr, exif any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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 (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);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare meta, tmp varchar;
declare xt, xd any;
@@ -7578,8 +8365,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 (dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ 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));
string_to_file (tmp, _ret_body, -2);
meta := unzip_file (tmp, 'docProps/core.xml');
file_delete (tmp, 1);
@@ -7588,15 +8375,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare meta, tmp varchar;
declare xt, xd any;
@@ -7611,76 +8398,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 (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);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare meta, tmp varchar;
declare xt, xd any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare meta, tmp varchar;
declare xt, xd any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
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)
+ 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, tmp, api_key, asin, hdr, exif any;
declare pos, is_sku, is_store integer;
@@ -7690,7 +8477,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%.productwiki.com/%')
@@ -7717,22 +8504,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 (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);
+ 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);
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)
+ 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, 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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.zappos.com/product/%')
@@ -7763,16 +8550,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 (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);
+ 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);
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)
+ 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, tmp, api_key, asin, hdr, exif any;
declare pos, is_sku, is_store integer;
@@ -7781,7 +8568,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://stores.bestbuy.com/%')
@@ -7863,9 +8650,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 (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);
+ 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);
return 1;
}
;
@@ -7886,7 +8673,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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
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;
@@ -7896,7 +8683,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%amazon.%/gp/product/product-description/%')
@@ -7909,12 +8696,13 @@ 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], '/');
}
- 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;
- }
+ -- 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.%/s?%')
{
tmp := sprintf_inverse (new_origin_uri, 'http://%samazon.%s/s?%skeywords=%s', 0);
@@ -8003,7 +8791,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)))
+ if ((0 = length (api_key)) or (0 = length (secret_key)) or (0 = length (associate_key)))
return 0;
if (asin is null)
return 0;
@@ -8012,18 +8800,22 @@ 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)
{
- 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);
+ -- 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;
}
else if (is_wish_list = 2)
{
- 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);
+ 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);
}
else
{
- 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);
+ 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);
}
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);
@@ -8031,58 +8823,15 @@ 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);
- {
- 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);
+ 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);
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)
+ 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, tmp, lon1, lat1, hdr, exif any;
declare zoom, layers varchar;
@@ -8091,7 +8840,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%openstreetmap.org/%?lat=%&lon=%')
@@ -8132,19 +8881,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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_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)
+ 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, tmp, api_key, img_id, hdr, what, pos any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -8194,19 +8943,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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_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)
+ 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, tmp, api_key, img_id, hdr, exif any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -8248,21 +8997,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout ser_key any, inout opts any, in triple_dict any := null)
{
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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -8310,7 +9059,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 (xd_utf8, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd_utf8, new_origin_uri, coalesce (dest, graph_iri));
-- Get any reviews
node := xpath_eval('//Item/ProductID[@type="Reference"]', xd);
@@ -8327,16 +9076,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
skipReviews:
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout ser_key any, inout opts any, in triple_dict any := null)
{
declare xd, localdest, groupdest, dep any;
localdest := coalesce (dest, graph_iri);
@@ -8344,9 +9093,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 (xd, new_origin_uri, localdest);
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, localdest);
if (groupdest is not null)
- DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, groupdest);
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, groupdest);
return 1;
}
dep := (sparql define input:storage ""
@@ -8433,7 +9182,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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare xt, xd, tmp, cnt, hdr any;
declare mail, pwd, auth, auth_header varchar;
@@ -8442,7 +9191,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
auth_header := null;
@@ -8467,15 +9216,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare get_uri, body, dbpiri any;
declare code, base, primary_topic, doc_iri any;
@@ -8486,7 +9235,7 @@ create procedure DB.DBA.RDF_LOAD_WIKIPEDIA_ARTICLE
{
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
body := sprintf('<?xml version=\"1.0\" encoding=\"utf-8\"?>
@@ -8498,11 +9247,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 (dest, graph_iri, new_origin_uri, opts);
+ --RM_CLEAN_DEST (triple_dict, 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 (body, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, 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)
{
@@ -8515,19 +9264,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 (dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (triple_dict, 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 (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ 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_DO_XSLT_AND_LOAD (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
+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,
in xt any, inout mdta any, in xslt_sheet varchar, in what varchar, in base varchar, inout opts any)
{
declare xslt_uri varchar;
@@ -8548,7 +9297,7 @@ create procedure DB.DBA.RDF_DO_XSLT_AND_LOAD (in graph_iri varchar, in new_origi
{
-- /* 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))
@@ -8568,17 +9317,17 @@ create procedure DB.DBA.RDF_DO_XSLT_AND_LOAD (in graph_iri varchar, in new_origi
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.TTLP (xd, base, coalesce (dest, graph_iri));
- mdta := mdta + 1;
+ DB.DBA.RM_RDF_TTL_LOAD_DICT (xd, base, coalesce (dest, graph_iri), triple_dict);
+ mdta := mdta + 1;
}
else
- DB.DBA.RDF_LOAD_RDFXML (xd, base, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_RDFXML_LOAD_DICT (xd, base, coalesce (dest, graph_iri), triple_dict);
goto try_next;
}
try_w3c:
@@ -8634,7 +9383,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 (in doc_base varchar, in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
+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,
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;
@@ -8778,12 +9527,12 @@ create procedure DB.DBA.RDF_LOAD_GRDDL_REC (in doc_base varchar, in graph_iri va
declare ret any;
foreach (any pf_item in pf_docs) do
{
- ret := DB.DBA.RDF_LOAD_GRDDL_REC (base_url, graph_iri, pf_item[0], dest, pf_item[1], mdta, visited, 'pf', lev, opts);
+ 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);
all_xslt := vector_concat (all_xslt, ret);
}
foreach (any ns_item in ns_doc) do
{
- ret := DB.DBA.RDF_LOAD_GRDDL_REC (base_url, graph_iri, ns_item[0], dest, ns_item[1], mdta, visited, 'ns', lev, opts);
+ 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);
all_xslt := vector_concat (all_xslt, ret);
}
}
@@ -8797,7 +9546,7 @@ create procedure DB.DBA.RDF_LOAD_GRDDL_REC (in doc_base varchar, in graph_iri va
{
if (0)
log_message (sprintf ('TRANSFORM=[%s] XSLT=[%s]', new_origin_uri, xslt));
- ret := DB.DBA.RDF_DO_XSLT_AND_LOAD (graph_iri, new_origin_uri, dest, xt, mdta, xslt, what, base_url, opts);
+ ret := DB.DBA.RDF_DO_XSLT_AND_LOAD (triple_dict, graph_iri, new_origin_uri, dest, xt, mdta, xslt, what, base_url, opts);
ret_arr := vector_concat (ret_arr, ret);
}
}
@@ -8807,8 +9556,14 @@ create procedure DB.DBA.RDF_LOAD_GRDDL_REC (in doc_base varchar, in graph_iri va
--
-- /* RDFA comaptibility wrapper */
--
-create procedure DB.DBA.RDF_LOAD_RDFA_1 (inout ret_body any, inout new_origin_uri varchar, inout thisgr varchar, in flag int)
+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)
{
+ 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
@@ -8821,7 +9576,7 @@ create procedure DB.DBA.RDF_LOAD_RDFA_1 (inout ret_body any, inout new_origin_ur
-- /* 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)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
-- check to microformats
declare xt_sav, xt, xd, profile, mdta, xslt_style, profs, profs_done, feed_url, xt_xml any;
@@ -8903,16 +9658,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_LOAD_RDFXML (content, new_origin_uri, coalesce (dest, graph_iri), 0);
+ DB.DBA.RM_RDF_RDFXML_LOAD_DICT (content, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
else
- DB.DBA.TTLP (content, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_TTL_LOAD_DICT (content, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
mdta := mdta + 1;
dict_put (dict, rdf_url, 1);
rdf_url_inx := rdf_url_inx + 1;
ret_flag := -1;
try_next_link:;
}
- DB.DBA.TTLP (ss, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_TTL_LOAD_DICT (ss, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
}
-- sometimes RDF is inside the xhtml
if (xpath_eval ('/html//rdf', xt) is not null and xt_xml is not null)
@@ -8922,7 +9677,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_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri), 0);
+ DB.DBA.RM_RDF_RDFXML_LOAD_DICT (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
mdta := mdta + 1;
}
}
@@ -8946,7 +9701,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.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_RDFXML_LOAD_DICT (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
mdta := mdta + 1;
}
not_rdf:;
@@ -8959,9 +9714,10 @@ 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 (doc_base, graph_iri, new_origin_uri, dest, xt, mdta, reg, '', 0, opts);
+ DB.DBA.RDF_LOAD_GRDDL_REC (triple_dict, 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:;
@@ -8972,31 +9728,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 (ret_body, new_origin_uri, thisgr, 0);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, ret_body, new_origin_uri, thisgr, 0);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (ret_body, new_origin_uri, thisgr, 1);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, ret_body, new_origin_uri, thisgr, 1);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*' { goto try_grddl1; };
- DB.DBA.RDF_LOAD_RDFA_1 (ret_body, new_origin_uri, thisgr, 2);
+ DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, 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
@@ -9016,7 +9772,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.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
profs_done := vector_concat (profs_done, vector (prof));
}
next_prof:;
@@ -9039,8 +9795,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 (dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ 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 (GM_FLAG > 0)
return mdta;
}
@@ -9115,8 +9871,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 (xd, new_origin_uri, coalesce (dest, graph_iri), 0);
- DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri));
+ 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);
ret_flag := 1;
no_feed:;
}
@@ -9124,12 +9880,22 @@ 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));
- if (xpath_eval ('count(/RDF/*)', xd) > 0)
+ 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)
{
mdta := mdta + 1;
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri), 1);
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri), 1);
}
}
ret:
@@ -9162,16 +9928,17 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
return vector ('seeAlso', dep);
}
}
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return mdta;
no_microformats:;
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_ADD_PRV (triple_dict, 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)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare content, xd, xt, ret_flag, mdta any;
content := ret_body;
@@ -9202,7 +9969,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
goto no_feed;
}
else if (xpath_eval ('/service', xt) is not null)
@@ -9211,7 +9978,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
goto no_feed;
}
else
@@ -9223,7 +9990,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));
+ mdta := DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
no_feed:
declare ord, mime any;
@@ -9244,7 +10011,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, in is_disc int := '')
+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 := '')
{
declare xt, xd any;
declare exit handler for sqlstate '*'
@@ -9254,8 +10021,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 (xd, iri, graph_iri, 0);
- DB.DBA.RM_ADD_PRV (current_proc_name (), iri, graph_iri, null);
+ 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);
return 1;
no_sioc:
return 0;
@@ -9355,8 +10122,36 @@ create procedure DB.DBA.SYS_WEBCAL_SPONGE_UP (in local_iri varchar, in get_uri v
}
;
+create procedure DB.DBA.SYS_FTP_SPONGE_UP (in local_iri varchar, in get_uri varchar, in options any)
+{
+ declare h, host, remote, local, rc any;
+ declare ses, data_ses, data_addr, content, get_soft any;
+ declare mime_type, tmp, dummy any;
+ h := rfc1808_parse_uri (get_uri);
+ remote := h[2];
+ host := h[1];
+ data_ses := NULL;
+ content := string_output (http_strses_memory_size ());
+ data_addr := FTP_CONNECT (host, 'anonymous', 'user at domain.com', ses, 1);
+ data_ses := ses_connect (data_addr);
+ FTP_COMMAND (ses, concat ('retr ', remote), vector (150,125));
+ FTP_SES_GET (data_addr, content, data_ses);
+ FTP_COMMAND (ses, concat ('quit'), NULL);
+ ses_disconnect (ses);
+ --rc := ftp_get (host, 'anonymous', 'user at domain.com', remote, '/tmp/webilu.html');
+ get_soft := get_keyword_ucase ('get:soft', options, '');
+ tmp := vector ('OK');
+ dummy := vector ();
+ mime_type := null;
+ if (get_soft <> 'add')
+ DB.DBA.RDF_FORGET_HTTP_RESPONSE (local_iri, get_uri, options);
+ DB.DBA.RDF_LOAD_HTTP_RESPONSE (local_iri, get_uri, mime_type, tmp, content, options, dummy);
+ return local_iri;
+}
+;
+
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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare meta, tmp, content varchar;
declare symbol varchar;
@@ -9364,24 +10159,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, 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);
- 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);
+ 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);
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)
+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)
{
declare arr, cnt, ses, content, url any;
declare xt, xd any;
@@ -9409,13 +10204,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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;
}
;
-create procedure rdfm_yq_get_history (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any)
+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)
{
declare arr, cnt, ses, content, url any;
declare xt, xd any;
@@ -9445,8 +10240,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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;
}
;
@@ -9468,7 +10263,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)
+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)
{
declare content, iri any;
declare xt, xd, xp, ses any;
@@ -9487,12 +10282,12 @@ create procedure rdfm_yq_get_competitors (in symbol varchar, in new_origin_uri v
}
}
content := string_output_string (ses);
- TTLP (content, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_TTL_LOAD_DICT (content, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
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)
+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)
{
declare content, iri any;
declare xt, xd, xp, ses any;
@@ -9530,13 +10325,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 (content, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), iri);
+ 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);
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)
+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)
{
declare content, hdr any;
declare xt, xp any;
@@ -9551,7 +10346,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)
+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)
{
declare xt, xd any;
xt := xtree_doc (content);
@@ -9572,18 +10367,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri));
+ 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);
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)
+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)
{
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);
+ rdfm_yq_load_feed (content, new_origin_uri, dest, graph_iri, triple_dict);
return;
}
;
@@ -9687,6 +10482,8 @@ 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);
@@ -9702,9 +10499,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 (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);
+ 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);
}
return local_iri;
}
@@ -9814,7 +10611,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 _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, inout triple_dict any
)
{
declare urihost, baseUri, original_dest varchar;
@@ -9827,7 +10624,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (__proc_exists ('unzip_file', 2) is null)
@@ -9875,7 +10672,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.RDF_LOAD_RDFXML (tmp, new_origin_uri, original_dest);
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, tmp, new_origin_uri, original_dest);
}
-- Get base RDF description of presentation
@@ -9886,7 +10683,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.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
}
-- Get a colon-delimited list of slides contained in the presentation
xt := xtree_doc (slides_meta);
@@ -9933,7 +10730,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.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
}
-- Extract each embedded image file and place it in DAV storage
@@ -10067,7 +10864,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.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
-- Construct RDF to hold text from each individual slide
-- ses2 := string_output();
@@ -10115,7 +10912,7 @@ next_slide:
http ('</rdf:Description>\n', ses);
http ('</rdf:RDF>\n', ses);
tmp := string_output_string (ses);
- DB.DBA.RDF_LOAD_RDFXML (tmp, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (tmp, new_origin_uri, coalesce (dest, graph_iri));
}
--dbg_printf('.PPTX Cartridge - Presentation text extraction done');
}
@@ -10127,7 +10924,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 kind varchar, in id varchar, in inc varchar, inout opts any, in triple_dict any := null)
{
declare uri, cnt, xt, xd, hdr any;
uri := sprintf ('http://musicbrainz.org/ws/1/%s/%s?type=xml&inc=%U', kind, id, inc);
@@ -10135,12 +10932,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 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), 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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare kind, id varchar;
declare tmp, incs any;
@@ -10149,7 +10946,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (length (tmp) < 6)
@@ -10179,38 +10976,35 @@ 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 (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);
+ 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);
foreach (any inc1 in incs) do
{
- DB.DBA.RDF_LOAD_MBZ_1 (graph_iri, new_origin_uri, dest, kind, id, inc1, opts);
+ DB.DBA.RDF_LOAD_MBZ_1 (graph_iri, new_origin_uri, dest, kind, id, inc1, opts, triple_dict);
}
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)
+
+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)
{
- declare xt, cnt, xd any;
- declare linkedin_id, tmp, required_profile_fields varchar;
- declare is_owner_key integer;
- declare api_url, url, public_profile_url any;
- declare consumer_key, consumer_secret, oauth_token, oauth_secret varchar;
+ declare url, public_profile_url any;
+ declare consumer_key, consumer_secret, oauth_token, oauth_secret, accept_lang varchar;
declare oauth_keys any;
- declare li_object_type varchar; -- Type of LinkedIn object being handled
+ declare is_owner_key integer;
+ declare li_object_type, li_id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ log_message (sprintf ('%s exit handler:\n %s', current_proc_name (), __SQL_MESSAGE));
return 0;
};
-- Get cartridge options
consumer_key := get_keyword ('consumer_key', opts);
consumer_secret := get_keyword ('consumer_secret', opts);
+ accept_lang := get_keyword ('accept_lang', opts);
if (subseq (new_origin_uri, 0, 5) = 'https')
new_origin_uri := 'http' || subseq (new_origin_uri, 5);
@@ -10224,12 +11018,34 @@ create procedure DB.DBA.RDF_LOAD_LINKEDIN (in graph_iri varchar, in new_origin_u
-- Public profile URL
-- e.g. http://uk.linkedin.com/pub/hugh-williams/0/1a0/559
public_profile_url := new_origin_uri;
+ li_object_type := 'person';
}
else if (new_origin_uri like 'http://%.linkedin.com/in/%')
{
-- Public profile URL
-- e.g. http://www.linkedin.com/in/kidehen
public_profile_url := new_origin_uri;
+ li_object_type := 'person';
+ }
+ else if (new_origin_uri like 'http://%.linkedin.com/jobs%')
+ {
+ -- Job posting
+ -- e.g. http://www.linkedin.com/jobs?viewJob&jobId=2700841&trk=jobs_share_fb
+ li_id := regexp_substr ('jobId=([[:digit:]]+)', new_origin_uri, 1);
+ if (li_id is null)
+ return 0;
+ public_profile_url := null;
+ li_object_type := 'job';
+ }
+ else if (new_origin_uri like 'http://%.linkedin.com/company/%')
+ {
+ -- Company profile
+ -- e.g. http://www.linkedin.com/company/27491[?...]
+ li_id := regexp_substr ('company/([[:digit:]]+)', new_origin_uri, 1);
+ if (li_id is null)
+ return 0;
+ public_profile_url := null;
+ li_object_type := 'company';
}
else
{
@@ -10248,25 +11064,121 @@ create procedure DB.DBA.RDF_LOAD_LINKEDIN (in graph_iri varchar, in new_origin_u
return 0;
}
+ if (li_object_type = 'person')
+ {
+ DB.DBA.RDF_LOAD_LINKEDIN_SPONGE_USER (graph_iri, new_origin_uri, dest, opts, triple_dict,
+ consumer_key, consumer_secret, oauth_token, oauth_secret, is_owner_key, public_profile_url);
+ }
+ else if (li_object_type = 'job' or li_object_type = 'company')
+ {
+ DB.DBA.RDF_LOAD_LINKEDIN_SPONGE_JOB_OR_COMPANY (graph_iri, new_origin_uri, dest, opts, triple_dict,
+ consumer_key, consumer_secret, oauth_token, oauth_secret, li_id, li_object_type, accept_lang);
+ }
+
+ return 1;
+}
+;
+
+create procedure DB.DBA.RDF_LOAD_LINKEDIN_SPONGE_USER (
+ in graph_iri varchar, in new_origin_uri varchar, in dest varchar, in opts any, in triple_dict any,
+ in consumer_key varchar, in consumer_secret varchar, in oauth_token varchar, in oauth_secret varchar, in is_owner_key integer,
+ in public_profile_url any)
+{
+ declare xt, cnt, xd any;
+ declare required_profile_fields varchar;
+ declare api_url, url any;
+ declare li_object_type varchar;
+
+ -- Retrieve most data apart from a user's 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 || ',connections,twitter-accounts';
+ required_profile_fields := required_profile_fields || ',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);
- li_object_type := 'unknown';
+ declare person_id any;
+ li_object_type := 'person';
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 (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;
+ 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), api_url);
+}
+;
+
+create procedure DB.DBA.RDF_LOAD_LINKEDIN_SPONGE_JOB_OR_COMPANY (
+ in graph_iri varchar, in new_origin_uri varchar, in dest varchar, in opts any, in triple_dict any,
+ in consumer_key varchar, in consumer_secret varchar, in oauth_token varchar, in oauth_secret varchar,
+ in li_id varchar, in li_object_type varchar, in accept_lang varchar)
+{
+ declare xt, cnt, xd any;
+ declare required_fields varchar;
+ declare api_url, url any;
+
+ if (li_object_type = 'job')
+ {
+ required_fields := 'id,customer-job-code,active,posting-date,expiration-date,posting-timestamp,company:(id,name),position:(title,location,job-functions,industries,job-type,experience-level),skills-and-experience,description-snippet,description,salary,job-poster:(id,first-name,last-name,headline),referral-bonus,site-job-url,location-description';
+ api_url := sprintf ('https://api.linkedin.com/v1/jobs/%s:(%s)', li_id, required_fields);
+ }
+ else if (li_object_type = 'company')
+ {
+ required_fields := 'id,name,universal-name,email-domains,company-type,ticker,website-url,industry,status,logo-url,square-logo-url,blog-rss-url,twitter-id,employee-count-range,specialties,locations:(description,is-headquarters,is-active,address:(street1,street2,city,state,postal-code,country-code,region-code),contact-info:(phone1,phone2,fax)),description,stock-exchange,founded-year,end-year,num-followers';
+ api_url := sprintf ('https://api.linkedin.com/v1/companies/%s:(%s)', li_id, required_fields);
+ }
+
+ url := DB.DBA.sign_request ('GET', api_url, '', consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
+ -- Some job fields may appear in a locale dependent on the server location.
+ -- Accept-Language can be used to force these job fields to the desired locale. e.g. accept_lang ::= { ko-kr | fr-fr | en-us | ... }
+ -- Company and person profiles appear unaffected by these location/locale dependencies and immune to the Accept-Language header setting.
+ if (accept_lang is not null)
+ cnt := http_get (url, null, 'GET', sprintf ('Accept-Language: %s', accept_lang));
+ else
+ cnt := http_get (url);
+ xd := xtree_doc (cnt);
+ 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));
+ DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), api_url);
}
;
@@ -10589,7 +11501,8 @@ 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
+ in oauth_secret varchar,
+ inout triple_dict any
)
{
declare xt, cnt, xd any;
@@ -10631,7 +11544,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
tw_param := '';
tw_batch_count := 0;
@@ -10647,7 +11560,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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare xt, cnt, xd any;
declare url, api_url, api_params any;
@@ -10661,7 +11574,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
log_message (sprintf ('%s Error: %s', current_proc_name (), __SQL_MESSAGE));
return 0;
};
@@ -10762,8 +11675,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 (dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ 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));
goto done;
}
@@ -10778,7 +11691,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 (current_proc_name (), graph_iri, dest, twitter_error);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, twitter_error);
log_message (sprintf ('%s Error: %s', current_proc_name (), twitter_error));
return 0;
}
@@ -10786,8 +11699,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 (dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ 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));
--
-- Get friends: up to 5000 per page
@@ -10801,7 +11714,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);
+ dest, graph_iri, consumer_key, consumer_secret, oauth_token, oauth_secret, triple_dict);
if (next_cursor = 0)
goto friends_done;
page := page + 1;
@@ -10821,7 +11734,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);
+ dest, graph_iri, consumer_key, consumer_secret, oauth_token, oauth_secret, triple_dict);
if (next_cursor = 0)
goto followers_done;
page := page + 1;
@@ -10844,7 +11757,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
if (empty_test = 0)
goto favorites_done;
@@ -10869,7 +11782,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 (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
if (empty_test = 0)
goto user_timeline_done;
@@ -10879,13 +11792,58 @@ favorites_done:;
user_timeline_done:;
done:;
- DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ 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_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)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
{
declare api_key, hdr, ret_body, tmp, jgsw_params, xd, xt any;
declare vec any;
@@ -10894,7 +11852,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 (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -10987,11 +11945,8 @@ 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.
@@ -11014,7 +11969,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
@@ -11022,11 +11977,67 @@ 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));
+ 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));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ 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);
+
return 1;
}
;
@@ -11182,16 +12193,168 @@ 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 any;
- declare rc int;
+ declare dummy, spmode, triples, graph, tmp, labels, dict any;
+ declare f_delete_orig_triples, rc, mc_api int;
dummy := null;
- RM_LOG_CLEAR ();
+ f_delete_orig_triples := 0;
+ mc_api := 0;
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')
@@ -11199,6 +12362,7 @@ 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]));
@@ -11259,7 +12423,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);
+ rc := call (MC_HOOK) (graph_iri, new_origin_uri, dest, ret_body, dummy, dummy, MC_KEY, new_opts, dict);
RM_GRAPH_PT_CK (graph_iri, dest);
prof_sample (MC_HOOK, msec_time () - st, 1);
if (registry_get ('__sparql_mappers_debug') = '1')
@@ -11268,17 +12432,54 @@ 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)
+ if (rc < 0 or rc > 0 or ( (MC_API_TYPE=0 or MC_API_TYPE=3) and dict_size (dict)))
{
+ 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 (spmode <> '')
- DB.DBA.RDF_DELETE_TRIPLES (graph, triples);
+ if (f_delete_orig_triples)
+ {
+ DB.DBA.RDF_DELETE_TRIPLES (graph, triples);
+ f_delete_orig_triples := 0;
+ }
if (registry_get ('__sparql_mappers_debug') = '1')
dbg_obj_prin1 ('END of PP mappings');
+ if (dict_size (dict))
+ goto ins_triples;
}
;
@@ -11371,9 +12572,11 @@ 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)
+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)
{
declare dedl int;
+ --dbg_obj_print_vars (sp_mode);
set_user_id ('SPARQL');
dedl := 10;
declare exit handler for sqlstate '40001'
@@ -11386,9 +12589,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', 'soft', 'refresh_free_text' , 0, 'meta-cartridges-mode', sp_type));
+ DB.DBA.RDF_SPONGE_UP (_G, vector ('get:soft', sp_mode, 'refresh_free_text' , 0, 'meta-cartridges-mode', sp_type, 'get:accept', accept_mode));
else
- DB.DBA.RDF_SPONGE_UP (_G, vector ('get:soft', 'soft', 'refresh_free_text' , 1, 'meta-cartridges-mode', sp_type, 'get:refresh', do_refresh));
+ 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));
}
;
@@ -11509,7 +12712,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 (
@@ -11560,10 +12763,54 @@ 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://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'
);
r := position (id_to_iri (p), r);
- if (r = 0)
+ if (r <= 0)
return 100;
return r;
}
@@ -11574,10 +12821,11 @@ 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 any;
+ declare html_start, xd, dict any;
declare rc, deadl int;
html_start := null;
+ dict := null;
_graph := get_keyword ('rdf-graph', opts, graph);
_base := url;
@@ -11654,7 +12902,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);
+ rc := call (RM_HOOK) (_graph, _base, null, content, aq, aq, RM_KEY, new_opts, dict);
}
if (rc < 0 or rc > 0)
return;
@@ -11665,3 +12913,21 @@ 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 f4bb868..263a24f 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.1 2011/06/09 15:35:36 source Exp $
+-- $Id$
--
-- RDF Mappings
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/rdf_mappers/rdfdesc/description.sql b/binsrc/rdf_mappers/rdfdesc/description.sql
index 95a24c8..8aa5e40 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.68 2011/10/25 23:36:21 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -83,6 +83,8 @@ 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);
@@ -128,8 +130,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) , 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);
+ 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);
best_str := '';
best_q := 0;
if (length (data))
@@ -172,8 +174,10 @@ create procedure rdfdesc_label_1 (in _S any, in lines any := null)
langs := http_request_header_full (lines, 'Accept-Language', 'en');
}
stat := '00000';
- 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 ('select subseq (__ro2sq (O), 0, 512), 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);
best_str := '';
best_q := 0;
if (stat = '00000' and length (data))
@@ -191,7 +195,10 @@ create procedure rdfdesc_label_1 (in _S any, in lines any := null)
}
label := best_str;
if (__tag of rdf_box = __tag (label))
- label := rdf_box_data (label);
+ {
+ __rdf_box_make_complete (label);
+ label := rdf_box_data (label);
+ }
if (not isstring (label))
label := cast (label as varchar);
label := cast (xtree_doc (label, 2) as varchar);
@@ -334,6 +341,33 @@ 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)
{
@@ -353,7 +387,7 @@ create procedure rdfdesc_uri_local_part (in uri varchar)
create procedure rdfdesc_http_url (in url varchar)
{
- declare host, pref, pref2, proxy_iri_fn, xhost varchar;
+ declare host, pref, pref2, pref3, proxy_iri_fn, xhost varchar;
declare url_sch varchar;
declare ua, lines any;
@@ -382,7 +416,8 @@ create procedure rdfdesc_http_url (in url varchar)
host := http_request_header(lines, 'Host', null, null);
pref := 'http%://'||host||'/about/html/';
pref2 := 'http%://'||host||'/about/id/';
- if (url not like pref || '%' and url not like pref2 || '%')
+ pref3 := 'http%://'||host||'/proxy-iri/';
+ if (url not like pref || '%' and url not like pref2 || '%' and url not like pref3 || '%')
{
ua := rfc1808_parse_uri (url);
url_sch := ua[0];
@@ -477,7 +512,7 @@ again:
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));
+ http (sprintf ('<div id="x_content"><iframe src="%s" width="100%%" height="100%% frameborder="0" sandbox=""><p>Your browser does not support iframes.</p></iframe></div><br/>', src));
}
else if (http_mime_type (_url) like 'image/%' and _url not like 'http://%/about/id/%')
http (sprintf ('<a class="uri" %s href="%s"><img src="%s" height="160" style="border-width:0"/></a>', rdfa, rdfdesc_http_url (_url), _url));
@@ -612,6 +647,8 @@ 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;
@@ -718,7 +755,7 @@ create procedure virt_proxy_init_about ()
-- /about/rdf/http/<domain+path>
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_about_http_proxy_rule_3', 1,
- '/about/([^/\?\&:]*)/(http|https|webcal|feed|nodeID)/(.*)', vector ('force', 'schema', 'url'), 3,
+ '/about/([^/\?\&:]*)/(http|https|webcal|feed|nodeID|ftp)/(.*)', vector ('force', 'schema', 'url'), 3,
'/about?url=%U://%U&force=%U', vector ('schema', 'url', 'force'), null, null, 2);
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_about_http_proxy_rule_3_am', 1,
'/about/([^/\?\&:]*)/(acct|mailto)[/:]+(.*)', vector ('force', 'schema', 'url'), 3,
@@ -734,7 +771,7 @@ create procedure virt_proxy_init_about ()
'/rdfdesc/description.vsp?g=%U:%U', vector ('sch', 'g'), null, null, 2);
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_about_http_proxy_rule_6', 1,
- '/about/html/(http|https|webcal|feed|nodeID)/(.*)', vector ('sch', 'g'), 2,
+ '/about/html/(http|https|webcal|feed|nodeID|ftp)/(.*)', vector ('sch', 'g'), 2,
'/rdfdesc/description.vsp?g=%U://%U', vector ('sch', 'g'), null, null, 2);
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_about_http_proxy_rule_6_am', 1,
'/about/html/(acct|mailto)[/:]+(.*)', vector ('sch', 'g'), 2,
@@ -765,7 +802,7 @@ create procedure virt_proxy_init_about ()
--# the new iris
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_new_restrict', 1,
- '/about/id/(http|https|acct|mailto|webcal|feed|nodeID)[/:](.*)', vector ('sch', 'g'), 2,
+ '/about/id/(http|https|acct|mailto|webcal|feed|nodeID|ftp)[/:](.*)', vector ('sch', 'g'), 2,
'/about/html/%s/%s', vector ('sch', 'g'), null, null, 2, 406, null);
--DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_new_page', 1,
@@ -773,10 +810,10 @@ create procedure virt_proxy_init_about ()
-- '/about/html/%s/%s', vector ('sch', 'g'), null, '(text/html)|(application/xhtml.xml)|(\\*/\\*)', 2, 303, null);
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_new_data', 1,
- '/about/id/(http|https|acct|mailto|webcal|feed|nodeID)[/:](.*)', vector ('sch', 'g'), 2,
+ '/about/id/(http|https|acct|mailto|webcal|feed|nodeID|ftp)[/:](.*)', 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/rdf.json)|(application/json)|(text/html)|(text/plain)|(application/atom.xml)|(application/odata.json)|(application/ld.json)|(application/microdata.json)|(\\*/\\*)',
2, 303, null);
delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'ext_ahp_rule_list_new';
@@ -787,8 +824,10 @@ 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', 0.80);
+ 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/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 (
@@ -803,14 +842,14 @@ create procedure virt_proxy_init_about ()
--# /id/entity
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_entity_rl_restrict', 1,
- '/about/id/entity/(http|https|webcal|feed|nodeID|mailto|acct)/(.*)', vector ('sch', 'g'), 2,
+ '/about/id/entity/(http|https|webcal|feed|nodeID|mailto|acct|ftp)/(.*)', vector ('sch', 'g'), 2,
'/dummy', vector (), null, null, 2, 406, null);
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_entity_rl_data', 1,
- '/about/id/entity/(http|https|acct|mailto|webcal|feed|nodeID)/(.*)', vector ('sch', 'g'), 2,
+ '/about/id/entity/(http|https|acct|mailto|webcal|feed|nodeID|ftp)/(.*)', 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/rdf.json)|(application/json)|(text/html)|(text/plain)|(application/atom.xml)|(application/odata.json)|(application/ld.json)|(application/microdata.json)|(\\*/\\*)',
2, 303, null);
delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'sp_entity_rll';
@@ -821,10 +860,12 @@ 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', 0.80);
+ 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/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'));
@@ -834,14 +875,14 @@ create procedure virt_proxy_init_about ()
--# information resources for /about/id/x
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_1', 1,
- '/about/data/(xml|n3|nt|ttl|text|turtle)/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('fmt', 'sch', 'url'), 3,
+ '/about/data/(xml|n3|nt|ttl|text|turtle)/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('fmt', 'sch', 'url'), 3,
'/about?url=%s://%U&force=rdf&output-format=%U', vector ('sch', 'url', 'fmt'), null, null, 2, null, '^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_1_am', 1,
'/about/data/(xml|n3|nt|ttl|text|turtle)/(acct|mailto)/(.*)\0x24', vector ('fmt', 'sch', 'url'), 3,
'/about?url=%s:%U&force=rdf&output-format=%U', vector ('sch', 'url', 'fmt'), null, null, 2, null, '^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_2', 1,
- '/about/data/turtle/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/turtle/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=text%%2Fturtle', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: text/turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_2_am', 1,
@@ -850,7 +891,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: text/turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_3', 1,
- '/about/data/ttl/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/ttl/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=application%%2Fx-turtle', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/x-turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_3_am', 1,
@@ -859,7 +900,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: application/x-turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_4', 1,
- '/about/data/jrdf/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/jrdf/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=json', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/rdf+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_4_am', 1,
@@ -868,7 +909,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: application/rdf+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_5', 1,
- '/about/data/json/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/json/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=json', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_5_am', 1,
@@ -877,7 +918,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: application/json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_6', 1,
- '/about/data/atom/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/atom/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=application%%2Fatom%%2Bxml', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/atom+xml\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_6_am', 1,
@@ -886,7 +927,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: application/atom+xml\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_7', 1,
- '/about/data/jsod/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/jsod/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/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_7_am', 1,
@@ -894,6 +935,24 @@ 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|ftp)/(.*)\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|ftp)/(.*)\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',
@@ -903,13 +962,17 @@ 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_7_am',
+ 'ext_ahp_rule_data_8_am',
+ 'ext_ahp_rule_data_9_am'
)
);
@@ -918,7 +981,7 @@ create procedure virt_proxy_init_about ()
--# information resources for /about/id/entity/x
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_1', 1,
- '/about/data/entity/(xml|n3|nt|ttl|text|turtle|json)/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('fmt', 'sch', 'url'), 3,
+ '/about/data/entity/(xml|n3|nt|ttl|text|turtle|json)/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('fmt', 'sch', 'url'), 3,
'/about?url=%s://%U&force=rdf&output-format=%U', vector ('sch', 'url', 'fmt'), null, null, 2, null,
'^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_1_am', 1,
@@ -927,7 +990,7 @@ create procedure virt_proxy_init_about ()
'^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_2', 1,
- '/about/data/entity/turtle/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/entity/turtle/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=text%%2Fturtle', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: text/turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_2_am', 1,
@@ -936,7 +999,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: text/turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_3', 1,
- '/about/data/entity/ttl/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/entity/ttl/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=application%%2Fx-turtle', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/x-turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_3_am', 1,
@@ -945,7 +1008,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: application/x-turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_4', 1,
- '/about/data/entity/json/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/entity/json/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=json', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_4_am', 1,
@@ -954,7 +1017,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: application/json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_5', 1,
- '/about/data/entity/jrdf/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/entity/jrdf/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=json', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/rdf+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_5_am', 1,
@@ -963,7 +1026,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: application/rdf+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_6', 1,
- '/about/data/entity/atom/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/entity/atom/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/about?url=%s://%U&force=rdf&output-format=application%%2Fatom%%2Bxml', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/atom+xml\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_6_am', 1,
@@ -972,7 +1035,7 @@ create procedure virt_proxy_init_about ()
'Content-Type: application/atom+xml\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_7', 1,
- '/about/data/entity/jsod/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
+ '/about/data/entity/jsod/(http|https|webcal|feed|nodeID|ftp)/(.*)\0x24', vector ('sch', 'url'), 2,
'/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_7_am', 1,
@@ -980,6 +1043,24 @@ 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|ftp)/(.*)\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|ftp)/(.*)\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',
@@ -989,13 +1070,17 @@ 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_7_am',
+ 'sp_ent_data_rl_8_am',
+ 'sp_ent_data_rl_9_am'
)
);
@@ -1040,6 +1125,11 @@ create procedure RM_LINK_HDR (in path varchar)
parts := sprintf_inverse (path, '/about/data/entity/%s/%s', 0);
fmt := '/about/data/entity/%s/' || parts[1];
}
+ else if (path like '/proxy-iri/data/%')
+ {
+ parts := sprintf_inverse (path, '/proxy-iri/data/%s/%s', 0);
+ fmt := '/proxy-iri/data/%s/' || parts[1];
+ }
else
{
parts := sprintf_inverse (path, '/about/data/%s/%s', 0);
@@ -1050,7 +1140,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'||fmt||'>;\r\n rel="alternate"; type="%s"; title="%s",\r\n', host, exts[i][0], exts[i][1], exts[i][2]);
+ 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 := rtrim (h, ',\r\n');
return h;
@@ -1259,3 +1349,136 @@ create procedure rdfdesc_links_mup (in subj any, in desc_link any)
http (links);
}
;
+
+--===========================================
+-- PROXY MAP VD
+--===========================================
+
+-- This always redirects to /proxy-iri/data
+
+ DB.DBA.VHOST_REMOVE (lpath=>'/proxy-iri');
+ DB.DBA.VHOST_DEFINE (lpath=>'/proxy-iri', ppath=>'/dummy', soap_user=>'PROXY', opts=>vector('url_rewrite', 'iri_map_rule_list_1'));
+
+ DB.DBA.URLREWRITE_CREATE_RULELIST ('iri_map_rule_list_1', 1,
+ vector (
+ 'iri_map_rule_1'
+ ));
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_1', 1,
+ '/proxy-iri/(.*)', vector ('id'), 2,
+ '/proxy-iri/data/%s', vector ('id'), 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)|(\\*/\\*)',
+ 2, 303, null);
+
+
+ delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'iri_map_rule_list_1';
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/xml/\x241', 'application/rdf+xml', 0.95);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/nt/\x241', 'text/n3', 0.80);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/n3/\x241', 'text/rdf+n3', 0.80);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/ttl/\x241', 'application/x-turtle', 0.80);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/turtle/\x241', 'text/turtle', 0.80);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/json/\x241', 'application/json', 0.70);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/jrdf/\x241', 'application/rdf+json', 0.70);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/html/\x241', 'text/html', 1.0);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/text/\x241', 'text/plain', 0.20);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/ld/\x241', 'application/ld+json', 0.70);
+ DB.DBA.HTTP_VARIANT_ADD ('iri_map_rule_list_1', '/proxy-iri/data/(.*)', '/proxy-iri/data/md/\x241', 'application/microdata+json', 0.70);
+
+ --# information resources for /proxy-iri/data/x
+ DB.DBA.VHOST_REMOVE (lpath=>'/proxy-iri/data');
+ DB.DBA.VHOST_DEFINE (lpath=>'/proxy-iri/data', ppath=>'/', is_dav=>0, def_page=>'', opts=>vector('url_rewrite', 'iri_map_rule_list_data'));
+
+create procedure RDF_IRI_MAP_GET_IRI (in par any, in fmt any, in val any)
+{
+ if (par = 'url')
+ val := RDF_IRI_MAP_SPARQL_DESC (val); --RDF_SPONGE_PROXY_IRI_GRAPH_BY_ID (val);
+ if (par = 'graph-and-iri')
+ {
+ declare g, res any;
+ res := RDF_SPONGE_PROXY_IRI_BY_ID (val);
+ g := RDF_SPONGE_PROXY_IRI_GRAPH_BY_ID (val);
+ return sprintf ('g=%U&res=%U', g, res);
+ }
+ return sprintf (fmt, val);
+}
+;
+
+create procedure RDF_IRI_MAP_SPARQL_DESC (in id varchar)
+{
+ declare g, res, tmp any;
+ res := RDF_SPONGE_PROXY_IRI_BY_ID (id);
+ g := RDF_SPONGE_PROXY_IRI_GRAPH_BY_ID (id);
+ tmp := sprintf ('define sql:describe-mode "SCBD" DESCRIBE <%s> FROM <%s>', res, g);
+ return tmp;
+}
+;
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_1', 1,
+ '/proxy-iri/data/(xml|n3|nt|ttl|text|turtle)/(.*)\0x24', vector ('fmt', 'url'), 3,
+ '/sparql?query=%U&output-format=%U', vector ('url', 'fmt'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ '^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_2', 1,
+ '/proxy-iri/data/turtle/(.*)\0x24', vector ('url'), 2,
+ '/sparql?query=%U&output-format=text%%2Fturtle', vector ('url'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: text/turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_3', 1,
+ '/proxy-iri/data/ttl/(.*)\0x24', vector ('url'), 2,
+ '/sparql?query=%U&output-format=application%%2Fx-turtle', vector ('url'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: application/x-turtle\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_4', 1,
+ '/proxy-iri/data/jrdf/(.*)\0x24', vector ('url'), 2,
+ '/sparql?query=%U&output-format=json', vector ('url'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: application/rdf+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_5', 1,
+ '/proxy-iri/data/json/(.*)\0x24', vector ('url'), 2,
+ '/sparql?query=%U&output-format=json', vector ('url'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: application/json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_6', 1,
+ '/proxy-iri/data/atom/(.*)\0x24', vector ('url'), 2,
+ '/sparql?query=%U&output-format=application%%2Fatom%%2Bxml', vector ('url'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: application/atom+xml\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_7', 1,
+ '/proxy-iri/data/jsod/(.*)\0x24', vector ('url'), 2,
+ '/sparql?query=%U&output-format=application%%2Fodata%%2Bjson', vector ('url'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: application/odata+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_8', 1,
+ '/proxy-iri/data/ld/(.*)\0x24', vector ('url'), 2,
+ '/sparql?query=%U&output-format=application%%2Fld%%2Bjson', vector ('url'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: application/ld+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_9', 1,
+ '/proxy-iri/data/md/(.*)\0x24', vector ('url'), 2,
+ '/sparql?query=%U&output-format=application%%2Fmicrodata%%2Bjson', vector ('url'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: application/microdata+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('iri_map_rule_data_10', 1,
+ '/proxy-iri/data/html/(.*)\0x24', vector ('graph-and-iri'), 2,
+ '/rdfdesc/description.vsp?%s', vector ('graph-and-iri'), 'DB.DBA.RDF_IRI_MAP_GET_IRI', null, 2, null,
+ 'Content-Type: text/html\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
+
+ DB.DBA.URLREWRITE_CREATE_RULELIST ( 'iri_map_rule_list_data', 1,
+ vector (
+ 'iri_map_rule_data_1',
+ 'iri_map_rule_data_2',
+ 'iri_map_rule_data_3',
+ 'iri_map_rule_data_4',
+ 'iri_map_rule_data_5',
+ 'iri_map_rule_data_6',
+ 'iri_map_rule_data_7',
+ 'iri_map_rule_data_8',
+ 'iri_map_rule_data_9',
+ 'iri_map_rule_data_10'
+ )
+ );
+
+--===========================================
+-- END PROXY MAP VD
+--===========================================
diff --git a/binsrc/rdf_mappers/rdfdesc/description.vsp b/binsrc/rdf_mappers/rdfdesc/description.vsp
index 58f2179..d7e09a3 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 varchar;
+ declare iri_type, iri_uri, links, langs, dspace, sid, error_message, cookiestr, dsn, ua, sp_mode, accept_mode varchar;
declare do_sponge, force_clean, do_refresh, local_lookup, sponge_type, proxy_iri_fn, expir int;
set http_charset='utf-8';
@@ -64,6 +64,17 @@
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;
@@ -118,7 +129,7 @@
--if (arr[5] <> '')
-- do_sponge := 0;
arr[0] := lower (arr[0]);
- if (arr[0] not in ('http', 'https', 'file', 'feed', 'doi', 'webcal', 'oai', 'acct', 'mailto') and _G not like 'urn:lsid:%')
+ if (arr[0] not in ('http', 'https', 'file', 'feed', 'doi', 'webcal', 'oai', 'acct', 'mailto', 'ftp') and _G not like 'urn:lsid:%')
{
do_sponge := 0;
local_lookup := 1;
@@ -206,7 +217,7 @@
{
sparql clear graph ?:_G;
}
- DB.DBA.RM_DO_SPONGE (_G, sponge_type, do_refresh);
+ DB.DBA.RM_DO_SPONGE (_G, sponge_type, do_refresh, sp_mode, accept_mode);
commit work;
}
else if (_S like 'nodeID://%' or local_lookup = 1)
@@ -311,6 +322,11 @@
<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>
@@ -361,7 +377,7 @@
</a>
</div>
<div id="entity_info">
- <h1 id="title">About: <a href="<?= case when _S like 'nodeID://%' then rdfdesc_http_url (_S) else _S end ?>"><?vsp http (label); ?></a></h1>
+ <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>
<div id="homelink">
</div>
<div class="page-resource-uri">
@@ -563,6 +579,7 @@
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 c3b4c25..2bbfc65 100644
--- a/binsrc/rdf_mappers/rdfdesc/statics/script.js
+++ b/binsrc/rdf_mappers/rdfdesc/statics/script.js
@@ -1,4 +1,32 @@
-var featureList = ["slidebar", "resize"];
+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);
+ }
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"});
@@ -9,6 +37,7 @@ 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 c8dca17..fbebd03 100644
--- a/binsrc/rdf_mappers/rdfdesc/statics/style_w.css
+++ b/binsrc/rdf_mappers/rdfdesc/statics/style_w.css
@@ -175,3 +175,5 @@ 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
new file mode 100644
index 0000000..446ea43
--- /dev/null
+++ b/binsrc/rdf_mappers/sponger_coref_post_process.sql
@@ -0,0 +1,495 @@
+--
+-- $Id$
+--
+-- 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 a37c7f8..52b6f33 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) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
</div>
</div>
</div>
- </body></html>
\ No newline at end of file
+ </body></html>
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 731ce96..ad1a29c 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\/.*@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.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.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';
-
+ 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);
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=%s&redirect_uri=%U&client_secret=%s&code=%s',
+ oauth_url := sprintf ('https://graph.facebook.com/oauth/access_token?client_id=%U&redirect_uri=%U&client_secret=%U&code=%U',
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?@Lookup@=&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?sponger:get=add&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&sp=1', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _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?@Lookup@=&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?sponger:get=add&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&sp=1', _host, entity_uri);
- describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sp=1', _host, entity_uri);
+ --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);
?>
<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) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. 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 7441f97..451d15f 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:window.location='http://linkeddata.uriburner.com/about/html/http/'+window.location.host+window.location.pathname+window.location.search">
+ "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;">
Page Description</a> (default: XHTML with embedded
RDFa)</li>
<!--
@@ -190,7 +190,7 @@
<ul>
<li><a href=
- "javascript:window.location='http://linkeddata.uriburner.com/ode/?uri='+window.location">
+ "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;">
OpenLink Data Explorer (a Linked Data
Browser)</a></li>
</ul>
@@ -221,13 +221,34 @@ 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="HTML"></a>HTML+Microdata:</h4>
+ <h4><a id="HTMLMicroformats"></a>HTML+Microformats:</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>
@@ -296,32 +317,34 @@ 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="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="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_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=Foursquare"><img alt="foursquare icon" src=
+ "<?=skinpfx?>/i/foursquare.png" title="Sponge your Foursquare 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="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>
</ul>
</div>
@@ -411,7 +434,7 @@ href="http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}"
<div class="reset">
<div id="footer">
- Copyright (C) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. 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 a496468..c7168f4 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?@Lookup@=&refresh=0', _host, _host, profile_proxy_url);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?sponger:get=add&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&sp=1', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _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) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. 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 426fa19..b13d972 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\/.*@Lookup@/, 'id/entity/' + item_id + '?@Lookup@');
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/id\/entity\/.*sponger:get/, 'id/entity/' + item_id + '?sponger:get');
entity_uri = entity_uri.replace(/id\/entity\/.*/, 'id/entity/' + item_id);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
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?@Lookup@=&refresh=0', _host, _host, 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);
entity_uri := sprintf ('http://%s/about/id/entity/%s', _host, item_id);
- --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);
+ --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);
?>
<?vsp
@@ -194,7 +194,7 @@
<div class="reset">
<div id="footer">
- Copyright (C) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. 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 ec93be4..6fddc94 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)
+ function build_sponge_links (site_name, host, entity_uri, about_sponge_uri)
{
var describe_href;
@@ -51,22 +51,38 @@
switch (site_name)
{
case 'Twitter':
- el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/twitter.com\/.*@Lookup@/, 'twitter.com/' + user_id + '?@Lookup@');
+ el_about_sponge_uri.href = about_sponge_uri.replace(/twitter.com\/.*sponger:get/, 'twitter.com/' + user_id + '?sponger:get');
entity_uri = entity_uri.replace(/twitter.com\/.*/, 'twitter.com/' + user_id);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
el_describe_sponge_uri.href = describe_href;
break;
case 'Delicious':
- el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/twitter.com\/.*@Lookup@/, 'www.delicious.com/' + user_id + '?@Lookup@');
+ el_about_sponge_uri.href = about_sponge_uri.replace(/twitter.com\/.*sponger:get/, 'www.delicious.com/' + user_id + '?sponger:get');
entity_uri = entity_uri.replace(/twitter.com\/.*/, 'www.delicious.com/' + user_id);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
el_describe_sponge_uri.href = describe_href;
break;
case 'Google+':
- el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/http\/twitter.com\/.*@Lookup@/,
- 'https/plus.google.com/' + user_id + '?@Lookup@');
+ 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');
entity_uri = entity_uri.replace(/http\/twitter.com\/.*/, 'https/plus.google.com/' + user_id);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
el_describe_sponge_uri.href = describe_href;
break;
}
@@ -90,7 +106,7 @@
if (site_name = 'Google+')
{
- rm_key := (select RM_KEY from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_GOOGLE_PROFILE');
+ rm_key := (select RM_KEY from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_GOOGLE_PLUS');
if (length(rm_key) = 0)
api_key_missing := 1;
}
@@ -138,10 +154,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?@Lookup@=&refresh=0', _host, _host, 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);
entity_uri := sprintf ('http://%s/about/id/entity/http/twitter.com/%s', _host, user_id);
- --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);
+ --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);
?>
<?vsp
@@ -161,8 +177,9 @@
else
http (sprintf ('<label for="fld_user_id">%s username: </label>', site_name));
?>
- <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?>');"/>
+ <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?>');"/>
<?vsp
if (site_name = 'Google+')
{
@@ -214,7 +231,7 @@
<div class="reset">
<div id="footer">
- Copyright (C) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. 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 0704670..1ef4039 100644
--- a/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp
@@ -33,6 +33,7 @@
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');
@@ -59,21 +60,24 @@
switch (site_name)
{
case 'WebID':
- 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_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_describe_sponge_uri.href = describe_href;
break;
case 'WebFinger':
- 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';
+ 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_describe_sponge_uri.href = describe_href;
break;
case 'LinkedIn':
case 'Flickr':
- 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';
+ 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';
el_describe_sponge_uri.href = describe_href;
break;
}
@@ -93,7 +97,7 @@
<?vsp
declare _host varchar;
declare site_name varchar;
- declare rm_key varchar;
+ declare rm_key, rm_opt varchar;
declare api_key_missing integer;
site_name := http_param ('site');
@@ -105,7 +109,13 @@
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)
+ 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)
api_key_missing := 1;
}
?>
@@ -160,27 +170,27 @@
item_id := 'UNKNOWN_ITEM_ID';
if (site_name = 'WebID')
{
- about_sponge_uri := sprintf ('http://%s/about/html/%s?@Lookup@=&refresh=0', _host, item_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/%s?sponger:get=add&refresh=0', _host, item_id);
entity_uri := item_id;
}
else if (site_name = 'WebFinger')
{
- about_sponge_uri := sprintf ('http://%s/about/html/acct:%s?@Lookup@=&refresh=0', _host, item_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/acct:%s?sponger:get=add&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?@Lookup@=&refresh=0', _host, _host, 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);
entity_uri := sprintf ('http://%s/about/id/entity/%s', _host, item_id);
}
- --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);
+ --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);
?>
<?vsp
if (api_key_missing)
{
- 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));
+ 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));
}
else
{
@@ -192,8 +202,10 @@
<?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" />
@@ -257,7 +269,7 @@
<div class="reset">
<div id="footer">
- Copyright (C) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. 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 72bbf60..d4d0d69 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) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. 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 ff38594..5691137 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) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. 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 12d40fc..1d79106 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?@Lookup@=&refresh=0', _host, _host, profile_proxy_url);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?sponger:get=add&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&sp=1', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _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) OpenLink Software 2011. All rights reserved.
+ Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
</div>
</div>
</div><!-- outer -->
diff --git a/binsrc/rdf_mappers/vad_version b/binsrc/rdf_mappers/vad_version
index 96729c8..31c140b 100644
--- a/binsrc/rdf_mappers/vad_version
+++ b/binsrc/rdf_mappers/vad_version
@@ -1 +1 @@
-1.31.21
+1.34.72
diff --git a/binsrc/rdf_mappers/virt_rdf_label.sql b/binsrc/rdf_mappers/virt_rdf_label.sql
index 10c9c7e..174557d 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.7 2011/10/13 18:36:28 source Exp $
+-- $Id$
--
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -23,6 +23,8 @@
--
--
+delete from RDF_QUAD where G = iri_to_id ('virtrdf-label');
+
TTLP (
'@prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix dc: <http://purl.org/dc/elements/1.1/> .
@@ -41,6 +43,18 @@ 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 .
@@ -78,22 +92,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 owl:subPropertyOf foaf:depiction .
+foaf:logo rdfs:subPropertyOf foaf:depiction .
<http://umbel.org/umbel#isAbout> owl:equivalentProperty foaf:focus .
-gr:name owl:equivalentProperty foaf:name .
+gr:name rdfs:subPropertyOf 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 owl:equivalentProperty dc:description .
+dv:instructions rdfs:subPropertyOf 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> owl:equivalentProperty foaf:nick.
-<http://www.openlinksw.com/schemas/virtcxml#Custom-Real%20Name> owl:equivalentProperty foaf:name .
+<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#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 .
@@ -106,6 +120,643 @@ 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 0ffec56..b0be03b 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.3 2010/12/09 12:36:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl b/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl
index 5d1a2a8..26de654 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.28 2011/10/25 23:36:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -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/2005-10-05">
+<!ENTITY amz "http://webservices.amazon.com/AWSECommerceService/2011-08-01">
<!ENTITY oplamz "http://www.openlinksw.com/schemas/amazon#">
]>
<xsl:stylesheet
@@ -255,24 +255,25 @@
<rdfs:label>
<xsl:value-of select="concat('Offer ', position(), ':', //amz:ItemAttributes/amz:Title)"/>
</rdfs:label>
- <gr:hasEAN_UCC-13>
- <xsl:value-of select="//amz:ItemAttributes/amz:EAN"/>
- </gr:hasEAN_UCC-13>
+ <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>
<oplamz:condition>
<xsl:value-of select="./amz:OfferAttributes/amz:Condition"/>
</oplamz:condition>
- <oplamz:conditionNote>
- <xsl:value-of select="./amz:OfferAttributes/amz:ConditionNote"/>
- </oplamz:conditionNote>
+ <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: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>
@@ -288,6 +289,7 @@
<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>
@@ -303,31 +305,10 @@
<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
new file mode 100644
index 0000000..30d2691
--- /dev/null
+++ b/binsrc/rdf_mappers/xslt/main/angellist2rdf.xsl
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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 3624ace..1c38fde 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.10 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -66,6 +66,7 @@
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" />
@@ -128,8 +129,15 @@
</xsl:template>
<xsl:template match="a:author">
- <dc:creator><xsl:value-of select="a:name" /> <<xsl:value-of select="a:email" />></dc:creator>
+ <dc:creator><xsl:value-of select="a:name" />
+ <xsl:if test="a:email">
+ <<xsl:value-of select="a:email" />>
+ </xsl:if>
+ </dc:creator>
+ <xsl:if test="a:email">
<foaf:mbox rdf:resource="mailto:{a:email}"/>
+ <opl:email_address_digest rdf:resource="{vi:di-uri (a:email)}"/>
+ </xsl:if>
</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 95c3cf2..aa93920 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.6 2011/07/15 11:23:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -68,6 +68,7 @@
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" />
@@ -142,7 +143,8 @@
<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}"/>
+ <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/atomentry2rdf.xsl b/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl
index 88d4821..b2d1d7c 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.11 2011/07/15 11:23:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl
index 47b0b1d..21422b7 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.27 2011/09/09 13:12:17 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -80,7 +80,7 @@
<foaf:primaryTopic rdf:resource="{$resourceURL}"/>
<dcterms:subject rdf:resource="{$resourceURL}"/>
</rdf:Description>
- <gr:LocationOfSalesOrServiceProvisioning rdf:about="{$resourceURL}">
+ <gr:Location 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:LocationOfSalesOrServiceProvisioning>
+ </gr:Location>
</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 58ab983..e6088fd 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.12 2011/07/15 11:23:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -53,6 +53,7 @@
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" />
@@ -108,6 +109,7 @@
<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>
@@ -153,6 +155,7 @@
<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 cf0672f..319d69e 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.3 2011/07/15 11:23:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl
index 4597521..6d3b95f 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.17 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl b/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl
index 57405ce..6e82aa1 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.14 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -303,6 +303,7 @@
<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">
@@ -336,20 +337,32 @@
<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:value-of select="translate ($space, '_', '-')"/>
+ <!--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: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="{name()}">
+ <xsl:element namespace="{$ns}" name="{$field_name}">
<xsl:element name="{$type}" namespace="&foaf;">
<xsl:attribute name="rdf:about">
<xsl:value-of select="vi:proxyIRI(concat ($base, $nspace, '/', permalink, $suffix))"/>
@@ -363,7 +376,7 @@
<xsl:apply-templates />
</xsl:when>
<xsl:otherwise>
- <xsl:element namespace="{$ns}" name="{name()}">
+ <xsl:element namespace="{$ns}" name="{$field_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 b374ca0..e5e7548 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.3 2011/07/15 11:23:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl
index 29a5085..3beb574 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.5 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl b/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl
index 808587e..e33938f 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.10 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl b/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl
index dc38e11..f10008a 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.4 2011/07/15 11:23:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl b/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl
index e72b0c1..c313002 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.9 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl
index 73133f2..7e8d9dc 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.22 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl
index f360377..d7a08b6 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.2 2011/01/03 23:40:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl b/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl
index 178fbf5..89f41e1 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.3 2011/07/15 11:23:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl
index 33244e8..2ae41cf 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.11 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl
index adef82b..c1da2ea 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.4 2011/07/15 11:23:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl
index d6f13ff..afccf68 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.2 2011/08/09 10:58:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl b/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl
index a056145..137c6c6 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.6 2011/08/09 11:17:47 source Exp $
+- $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
-- Copyright (C) 1998-2010 OpenLink Software
+- 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
diff --git a/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl
index d7a0c72..e47cbe5 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.11 2011/09/12 10:52:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -21,9 +21,13 @@
- 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/">
@@ -32,43 +36,47 @@
<!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 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#">
+<!ENTITY oplcert "http://www.openlinksw.com/schemas/cert#">
+<!ENTITY cert "http://www.w3.org/ns/auth/cert#">
]>
<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:fb="http://www.facebook.com/2008/fbml"
+ xmlns:oplcert="&oplcert;"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:geo="&geo;"
version="1.0"
>
@@ -87,116 +95,126 @@
<xsl:when test="$og_object_type = 'general'">
<xsl:apply-templates mode="general"/>
</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:apply-templates mode="album"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'user'">
+ <xsl:when test="$og_object_type = 'album_photos'">
+ <xsl:apply-templates mode="album_photos"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'application'">
<xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="user"/>
+ <xsl:apply-templates mode="application"/>
</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 = 'application'">
- <xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="application"/>
- </xsl:when>
<xsl:when test="$og_object_type = 'group'">
<xsl:apply-templates mode="root"/>
<xsl:apply-templates mode="group"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'album'">
- <xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="album"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'photo'">
- <xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="photo"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'status'">
- <xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="status"/>
- </xsl:when>
<xsl:when test="$og_object_type = 'link'">
<xsl:apply-templates mode="root"/>
<xsl:apply-templates mode="link"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'user_activities'">
- <xsl:apply-templates mode="user_activities"/>
+ <xsl:when test="$og_object_type = 'link_comments'">
+ <xsl:apply-templates mode="status_comments"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'page_notes'">
- <xsl:apply-templates mode="page_notes"/>
+ <xsl:when test="$og_object_type = 'page'">
+ <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 = 'user_links'">
- <xsl:apply-templates mode="user_links"/>
+ <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:when>
+ <xsl:when test="$og_object_type = 'photo'">
+ <xsl:apply-templates mode="root"/>
+ <xsl:apply-templates mode="photo"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'status'">
+ <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: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: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>
<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_albums'">
- <xsl:apply-templates mode="user_albums"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_albums'">
- <xsl:apply-templates mode="user_albums"/>
+ <xsl:when test="$og_object_type = 'user_games'">
+ <xsl:apply-templates mode="user_games"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'page_statuses'">
- <xsl:apply-templates mode="page_statuses"/>
+ <xsl:when test="$og_object_type = 'user_interests'">
+ <xsl:apply-templates mode="user_interests"/>
</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_interests'">
- <xsl:apply-templates mode="user_interests"/>
+ <xsl:when test="$og_object_type = 'user_links'">
+ <xsl:apply-templates mode="user_links"/>
</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 = '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 test="$og_object_type = 'video'">
+ <xsl:apply-templates mode="root"/>
+ <xsl:apply-templates mode="video"/>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates />
@@ -332,7 +350,11 @@
<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"/>
@@ -341,14 +363,43 @@
<xsl:value-of select="width"/>
</oplog:width>
<xsl:for-each select="images">
- <foaf:depiction rdf:resource="{source}"/>
+ <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>
<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>
@@ -383,12 +434,9 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <dc:title>
+ <sioc:content>
<xsl:value-of select="message" />
- </dc:title>
- <dc:description>
- <xsl:value-of select="message" />
- </dc:description>
+ </sioc:content>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -400,7 +448,14 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
+ <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>
@@ -453,6 +508,7 @@
</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="{.}"/>
@@ -471,7 +527,14 @@
<xsl:if test="id">
<oplog:id><xsl:value-of select="id"/></oplog:id>
</xsl:if>
- <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
+ <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>
@@ -515,12 +578,9 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <dc:title>
- <xsl:value-of select="message" />
- </dc:title>
- <dc:description>
+ <sioc:content>
<xsl:value-of select="message" />
- </dc:description>
+ </sioc:content>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -532,7 +592,11 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
+ <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>
@@ -575,7 +639,7 @@
<oplog:locale><xsl:value-of select="locale"/></oplog:locale>
</xsl:if>
<xsl:if test="link">
- <oplog:uri rdf:resource="{link}"/>
+ <oplog:public_profile_url rdf:resource="{link}"/>
</xsl:if>
<xsl:if test="username">
<foaf:nick><xsl:value-of select="username"/></foaf:nick>
@@ -845,12 +909,9 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <dc:title>
- <xsl:value-of select="message" />
- </dc:title>
- <dc:description>
+ <sioc:content>
<xsl:value-of select="message" />
- </dc:description>
+ </sioc:content>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -862,7 +923,11 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
+ <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>
@@ -926,9 +991,9 @@
<dc:title>
<xsl:value-of select="concat('Comment from ', from/name, ' ', from/id)" />
</dc:title>
- <dc:description>
+ <sioc:content>
<xsl:value-of select="message" />
- </dc:description>
+ </sioc:content>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -940,7 +1005,11 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
+ <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>
@@ -1013,12 +1082,9 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <dc:title>
+ <sioc:content>
<xsl:value-of select="message" />
- </dc:title>
- <dc:description>
- <xsl:value-of select="message" />
- </dc:description>
+ </sioc:content>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1030,7 +1096,11 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
+ <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>
@@ -1231,12 +1301,9 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <dc:title>
- <xsl:value-of select="message" />
- </dc:title>
- <dc:description>
+ <sioc:content>
<xsl:value-of select="message" />
- </dc:description>
+ </sioc:content>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1248,7 +1315,11 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
+ <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>
@@ -1465,10 +1536,8 @@
<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>
@@ -1491,6 +1560,43 @@
</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>
@@ -1512,7 +1618,16 @@
<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 ('Link ', $id)"/></rdfs:label>
+ <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>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1561,7 +1676,6 @@
<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">
@@ -1586,12 +1700,40 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:modified>
- <!--
- <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: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>
@@ -1621,10 +1763,13 @@
<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>
- <oplog:to><xsl:value-of select="concat (to/data/name, ' (', to/data/id, ')')"/></oplog:to>
+ <xsl:if test="to">
+ <oplog:to>
+ <xsl:value-of select="concat (to/data/name, ' (', to/data/id, ')')"/>
+ </oplog:to>
+ </xsl:if>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1647,7 +1792,40 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:modified>
- <rdfs:label><xsl:value-of select="concat ('Post ', $id)"/></rdfs:label>
+
+ <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>
@@ -1662,7 +1840,47 @@
</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>
@@ -1678,16 +1896,14 @@
<rdfs:label>
<xsl:value-of select="message" />
</rdfs:label>
- <dc:title>
+ <sioc:content>
<xsl:value-of select="message" />
- </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: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>
<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')"/>
@@ -1707,6 +1923,248 @@
</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 0ac8310..40d100a 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.4 2011/07/15 11:23:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl b/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl
index 07d8e60..0eddd4a 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.14 2011/07/15 11:23:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -66,6 +66,7 @@
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" />
@@ -163,7 +164,7 @@
<xsl:template match="rss:link">
<sioc:link rdf:resource="{string(.)}" />
- <xsl:if test="not ($baseUri like 'http://%.nytimes.com/%')">
+ <xsl:if test="not ($baseUri like 'http://%.nytimes.com/%' and $baseUri like 'http://stackoverflow.com/%' and $baseUri like 'http://%.stackexchange.com/%')">
<awol:content>
<awol:Content rdf:ID="content{generate-id()}">
<awol:src rdf:resource="{string(.)}"/>
@@ -211,6 +212,7 @@
</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 45b7c25..6193a9e 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.10 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl
index ea2cc50..e340cdf 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl b/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl
index 61dc53f..9e2f7f7 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.5 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -144,6 +144,7 @@
</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)}"/>
@@ -218,7 +219,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">
- <sioc:topic>
+ <oplfq:category>
<bibo:Document rdf:about="{vi:proxyIRI ($baseUri, '', concat('category_', id))}">
<rdfs:label>
<xsl:value-of select="name"/>
@@ -231,7 +232,7 @@
</dc:description>
<foaf:depiction rdf:resource="{icon}"/>
</bibo:Document>
- </sioc:topic>
+ </oplfq:category>
</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 6132b3a..ca73afa 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl b/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl
index 8a3ac94..9633b3a 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.6 2011/07/15 11:23:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl
index 25f0a05..6b3cb8f 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.3 2011/07/15 11:23:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl b/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl
index 8bf08b1..ac26585 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.8 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -85,7 +85,8 @@
</opl:providedBy>
<rdf:type rdf:resource="&geonames;Feature"/>
- <rdf:type rdf:resource="&gr;LocationOfSalesOrServiceProvisioning"/>
+ <rdf:type rdf:resource="&gr;Location"/>
+ <rdfs:label><xsl:value-of select="geonames:name"/></rdfs:label>
<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 87c9b0b..20be867 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/google2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google2rdf.xsl
index 88dcb96..4b382bd 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.8 2011/07/15 11:23:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -54,6 +54,7 @@
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"/>
@@ -147,6 +148,7 @@
<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 5597559..bf3ff58 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.4 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl
index 8536f12..188db18 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.9 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl
index f86eecf..a2e40c1 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.2 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl
index 69f398c..109363b 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.3 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -34,6 +34,7 @@
<!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">
]>
@@ -64,6 +65,7 @@
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 46c6b51..1638f76 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.8 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl
index e9ccb57..7d9286d 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.5 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl b/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl
index dab4e4d..e4a52d8 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.12 2011/08/09 10:58:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl b/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl
index 2f9b063..bd439ce 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.3 2011/10/25 23:36:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -40,6 +40,7 @@
<!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;"
@@ -60,6 +61,7 @@
xmlns:xsd="&xsd;"
xmlns:xsi="&xsi;"
xmlns:xsl="&xsl;"
+ xmlns:oplcert="&oplcert;"
version="1.0">
<xsl:output method="xml" indent="yes"/>
@@ -105,7 +107,7 @@
</rdf:RDF>
</xsl:template>
- <!-- People mapping --------------------->
+ <!-- People mapping -->
<xsl:template match="/results/kind" mode="people">
<xsl:if test="contains(. ,'person')">
@@ -139,7 +141,7 @@
<xsl:template match="/results/name" mode="people">
<xsl:if test="contains(/results/kind ,'person')">
<oplgp:name>
- <oplgp:Name rdf:about="{concat($resourceURL,'#Name')}">
+ <oplgp:Name rdf:about="{vi:iriMap (concat($resourceURL,'#Name'), $baseUri)}">
<xsl:if test="string-length(familyName) > 0">
<oplgp:familyName>
<xsl:value-of select="familyName"/>
@@ -239,7 +241,7 @@
<!--
<xsl:template match="urls" mode="people">
<oplgp:shared_url>
- <oplgp:Url rdf:about="{concat($resourceURL,'#Url_', position(.))}">
+ <oplgp:Url rdf:about="{vi:iriMap (concat($resourceURL,'#Url_', position(.)), $baseUri)}">
<rdfs:label>
<xsl:choose>
<xsl:when test="primary = '1'">
@@ -288,7 +290,7 @@
<xsl:template match="organizations" mode="people">
<oplgp:associatedWith>
- <oplgp:Organization rdf:about="{concat($resourceURL,'#Organization_',position(.))}">
+ <oplgp:Organization rdf:about="{vi:iriMap (concat($resourceURL,'#Organization_',position(.)), $baseUri)}">
<xsl:if test="string-length(department) > 0">
<oplgp:department>
<xsl:value-of select="department"/>
@@ -340,7 +342,7 @@
<xsl:template match="placesLived" mode="people">
<oplgp:placeLived>
- <oplgp:PlaceLived rdf:about="{concat($resourceURL,'#PlaceLived_',position(.))}">
+ <oplgp:PlaceLived rdf:about="{vi:iriMap (concat($resourceURL,'#PlaceLived_',position(.)), $baseUri)}">
<rdfs:label>
<xsl:choose>
<!-- 'primary residence' suffix may confuse meta-cartridge lookups?
@@ -367,13 +369,13 @@
<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 -->
<xsl:template match="items" mode="activity">
<oplgp:performed_activity>
- <rdf:Description rdf:about="{concat($resourceURL, '#Activity_', id)}">
+ <rdf:Description rdf:about="{vi:iriMap (concat($resourceURL, '#Activity_', id), $baseUri)}">
<xsl:call-template name="activity"/>
</rdf:Description>
</oplgp:performed_activity>
@@ -381,7 +383,7 @@
<xsl:template match="access" mode="activity">
<xsl:variable name="activity_id" select="../id" />
- <oplgp:Access rdf:about="{concat($resourceURL, '#Access_', $activity_id)}">
+ <oplgp:Access rdf:about="{vi:iriMap (concat($resourceURL, '#Access_', $activity_id), $baseUri)}">
<xsl:if test="string-length(kind) > 0">
<oplgp:access_kind>
<xsl:value-of select="kind"/>
@@ -397,7 +399,7 @@
</xsl:if>
<xsl:for-each select="items">
<oplgp:access_item>
- <oplgp:AccessItem rdf:about="{concat($resourceURL, '#AccessItem_', $activity_id, '_', position())}">
+ <oplgp:AccessItem rdf:about="{vi:iriMap (concat($resourceURL, '#AccessItem_', $activity_id, '_', position()), $baseUri)}">
<rdfs:label>
<xsl:value-of select="concat('AccessItem (type: ', type, ')')"/>
</rdfs:label>
@@ -416,7 +418,7 @@
</xsl:template>
<xsl:template match="actor" mode="activity">
- <oplgp:Actor rdf:about="{concat($resourceURL, '#Actor_', id)}">
+ <oplgp:Actor rdf:about="{vi:iriMap (concat($resourceURL, '#Actor_', id), $baseUri)}">
<oplgp:id>
<xsl:value-of select="id"/>
</oplgp:id>
@@ -428,11 +430,28 @@
<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>
<xsl:template match="object" mode="activity">
- <oplgp:ActivityObject rdf:about="{concat($resourceURL, '#ActivityObject_', ../id)}">
+ <oplgp:ActivityObject rdf:about="{vi:iriMap (concat($resourceURL, '#ActivityObject_', ../id), $baseUri)}">
<xsl:if test="id">
<oplgp:id>
<xsl:value-of select="id"/>
@@ -499,7 +518,7 @@
<xsl:variable name="activity_id" select="../../id"/>
<xsl:variable name="attachment_idx" select="position(.)"/>
<oplgp:attachment>
- <oplgp:Attachment rdf:about="{concat($resourceURL, '#Attachment_', $activity_id, '_', $attachment_idx)}">
+ <oplgp:Attachment rdf:about="{vi:iriMap (concat($resourceURL, '#Attachment_', $activity_id, '_', $attachment_idx), $baseUri)}">
<xsl:if test="id">
<oplgp:id>
<xsl:value-of select="id"/>
@@ -551,14 +570,14 @@
</oplgp:attachment>
</xsl:template>
- <!-- Comments mapping ---------------------->
+ <!-- Comments mapping -->
<xsl:template match="items" mode="comment">
<xsl:variable name="activity_id" select="inReplyTo/id"/>
- <xsl:variable name="activity_object_url" select="concat($resourceURL, '#ActivityObject_', $activity_id)"/>
+ <xsl:variable name="activity_object_url" select="vi:iriMap (concat($resourceURL, '#ActivityObject_', $activity_id), $baseUri)"/>
<rdf:Description rdf:about="{$activity_object_url}">
<oplgp:has_comment>
- <oplgp:Comment rdf:about="{concat($resourceURL, '#Comment_', id)}">
+ <oplgp:Comment rdf:about="{vi:iriMap (concat($resourceURL, '#Comment_', id), $baseUri)}">
<rdfs:label>
<xsl:variable name="plain_content">
<xsl:call-template name="strip-HTML">
@@ -582,12 +601,12 @@
<xsl:value-of select="object/content"/>
</oplgp:comment_content>
<xsl:if test="string-length(published) > 0">
- <oplgp:published rdf:datatype="&xsd;date">
+ <oplgp:published rdf:datatype="&xsd;dateTime">
<xsl:value-of select="published"/>
</oplgp:published>
</xsl:if>
<xsl:if test="string-length(updated) > 0">
- <oplgp:updated rdf:datatype="&xsd;date">
+ <oplgp:updated rdf:datatype="&xsd;dateTime">
<xsl:value-of select="updated"/>
</oplgp:updated>
</xsl:if>
@@ -596,7 +615,7 @@
<xsl:value-of select="verb"/>
</oplgp:comment_verb>
<oplgp:in_reply_to_object>
- <oplgp:InReplyTo rdf:about="{concat($resourceURL, '#InReplyTo_', $activity_id, '_', position(.))}">
+ <oplgp:InReplyTo rdf:about="{vi:iriMap (concat($resourceURL, '#InReplyTo_', $activity_id, '_', position(.)), $baseUri)}">
<oplgp:activity_replied_to_id>
<xsl:value-of select="inReplyTo/id"/>
</oplgp:activity_replied_to_id>
@@ -686,7 +705,7 @@
</oplgp:providerTitle>
</xsl:if>
<xsl:if test="string-length(published) > 0">
- <oplgp:published rdf:datatype="&xsd;date">
+ <oplgp:published rdf:datatype="&xsd;dateTime">
<xsl:value-of select="published"/>
</oplgp:published>
</xsl:if>
@@ -701,7 +720,7 @@
</oplgp:activity_title>
</xsl:if>
<xsl:if test="string-length(updated) > 0">
- <oplgp:updated rdf:datatype="&xsd;date">
+ <oplgp:updated rdf:datatype="&xsd;dateTime">
<xsl:value-of select="updated"/>
</oplgp:updated>
</xsl:if>
@@ -713,7 +732,7 @@
<xsl:param name="attachment_idx"/>
<xsl:for-each select="$fullImage">
<oplgp:fullImage>
- <oplgp:FullImage rdf:about="{concat($resourceURL, '#FullImageAttachment_', $activity_id, '_', $attachment_idx)}">
+ <oplgp:FullImage rdf:about="{vi:iriMap (concat($resourceURL, '#FullImageAttachment_', $activity_id, '_', $attachment_idx), $baseUri)}">
<rdfs:label>
<xsl:value-of select="concat ('full image attached to object of activity ', $activity_id)"/>
</rdfs:label>
@@ -738,7 +757,7 @@
<xsl:param name="attachment_idx"/>
<xsl:for-each select="$image">
<oplgp:previewImage>
- <oplgp:PreviewImage rdf:about="{concat($resourceURL, '#PreviewImageAttachment_', $activity_id, '_', $attachment_idx)}">
+ <oplgp:PreviewImage rdf:about="{vi:iriMap (concat($resourceURL, '#PreviewImageAttachment_', $activity_id, '_', $attachment_idx), $baseUri)}">
<rdfs:label>
<xsl:value-of select="concat ('preview image attached to object of activity ', $activity_id)"/>
</rdfs:label>
@@ -767,7 +786,7 @@
<xsl:param name="attachment_idx"/>
<xsl:for-each select="$embed">
<oplgp:embed>
- <oplgp:EmbeddableLink rdf:about="{concat($resourceURL, '#EmbedAttachment_', $activity_id, '_', $attachment_idx)}">
+ <oplgp:EmbeddableLink rdf:about="{vi:iriMap (concat($resourceURL, '#EmbedAttachment_', $activity_id, '_', $attachment_idx), $baseUri)}">
<rdfs:label>
<xsl:value-of select="concat ('embeddable link attached to object of activity ', $activity_id)"/>
</rdfs:label>
diff --git a/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl b/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl
index 61c52ad..b2225e2 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.4 2011/08/01 14:19:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl b/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl
index 0cc7850..3280b23 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.6 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl b/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl
index 6ff5464..25702cf 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.4 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -83,6 +83,7 @@
</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 9006ed6..d468b9c 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.9 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl
index 2686987..c21fadf 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.10 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -21,6 +21,18 @@
- 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#"
@@ -29,13 +41,15 @@
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:docproxyIRI($baseUri)"/>
+ <xsl:variable name="docproxyIRI" select="vi:proxyIRI($baseUri)"/>
<xsl:template match="/">
<rdf:RDF>
@@ -51,6 +65,26 @@
</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>
@@ -65,6 +99,24 @@
<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 dbb5ded..522913e 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.7 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl
index 06218b7..e3048fb 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.9 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl
index 5878830..0a67248 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.6 2011/07/15 11:23:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl
index a477661..5d64474 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.6 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -25,6 +25,7 @@
<!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"
@@ -39,6 +40,7 @@ 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="*" />
@@ -219,7 +221,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, '', replace(concat('hrecipe', .), ' ', '_')) }">
+ <dv:Ingredient rdf:about="{vi:proxyIRI ($baseUri, '', escape-uri(concat('hrecipe', substring( replace(normalize-space(.), ' ', ''), 1 , 20) ), true())) }">
<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 4052c86..d95db72 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.7 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl
index 06410ca..d70f7f9 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.6 2011/07/15 11:23:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl
index 7e5928a..342a631 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.2 2010/12/14 12:07:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -160,9 +160,11 @@ xmlns:hrev="http://www.purl.org/stuff/hrev#" version="1.0">
</dcterms:modified>
</xsl:if>
<xsl:if test="$rating != 0">
- <review:rating>
- <xsl:value-of select="." />
- </review:rating>
+ <xsl:if test="string-length(.) > 0">
+ <review:rating>
+ <xsl:value-of select="." />
+ </review:rating>
+ </xsl:if>
</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 2cd1499..6b99d0f 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.5 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/html2rdf.xsl b/binsrc/rdf_mappers/xslt/main/html2rdf.xsl
index 8739e49..c920464 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.19 2011/07/15 11:23:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -29,6 +29,9 @@
<!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"
@@ -45,6 +48,7 @@
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"/>
@@ -80,16 +84,73 @@
<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/%')">
+ <xsl:if test="not ($baseUri like 'http://%.nytimes.com/%' or $baseUri like 'http://stackoverflow.com/%' or $baseUri like 'http://%.stackexchange.com/%')">
<awol:content rdf:resource="{$resourceURL}#content"/>
</xsl:if>
</rdf:Description>
- <xsl:if test="not ($baseUri like 'http://%.nytimes.com/%')">
+ <xsl:if test="not ($baseUri like 'http://%.nytimes.com/%' or $baseUri like 'http://stackoverflow.com/%' or $baseUri like 'http://%.stackexchange.com/%')">
<rdf:Description rdf:about="{$resourceURL}#content">
<rdf:type rdf:resource="&awol;Content"/>
<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 d18d9c1..5c9cbf7 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.6 2011/07/15 11:23:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl b/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl
new file mode 100644
index 0000000..b12c8d9
--- /dev/null
+++ b/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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 7abc109..81a6c63 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.3 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl
index 4899055..a70c17f 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.11 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl b/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl
index d9b40d8..86d1726 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.6 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl b/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl
index fae2a57..cc361a0 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl b/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl
index 69aa00f..c29cd08 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.2 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl b/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl
new file mode 100644
index 0000000..e46e080
--- /dev/null
+++ b/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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 fb2c1ad..b11b21f 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.12 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl b/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl
index 6661e1f..6fc66ee 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.3 2011/07/15 11:14:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -23,32 +23,37 @@
-->
<!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 h "http://www.w3.org/1999/xhtml">
<!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 rdfs "http://www.w3.org/2000/01/rdf-schema#">
<!ENTITY sioc "http://rdfs.org/sioc/ns#">
<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
<!ENTITY vi "http://www.openlinksw.com/virtuoso/xslt/">
+<!ENTITY vcard "http://www.w3.org/2006/vcard/ns#">
]>
<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:bibo="&bibo;"
xmlns:oplcv="&oplcv;"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
+ xmlns:dc="&dc;"
+ xmlns:dcterms="&dcterms;"
xmlns:foaf="&foaf;"
- xmlns:h="http://www.w3.org/1999/xhtml"
+ xmlns:h="&h;"
xmlns:oplli="&oplli;"
xmlns:opl="&opl;"
xmlns:owl="&owl;"
xmlns:rdf="&rdfns;"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:rdfs="&rdfs;"
xmlns:sioc="&sioc;"
xmlns:vi="&vi;"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
+ xmlns:vcard="&vcard;"
>
<xsl:param name="baseUri" />
@@ -58,7 +63,6 @@
<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>
@@ -72,17 +76,31 @@
<foaf:primaryTopic rdf:resource="{$resourceURL}"/>
<dcterms:subject rdf:resource="{$resourceURL}"/>
<xsl:if test="normalize-space (name) != ''">
- <dc:title><xsl:value-of select="name"/></dc:title>
+ <dc:title>
+ <xsl:value-of select="name"/>
+ </dc:title>
</xsl:if>
<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>
@@ -93,40 +111,72 @@
</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" />
<oplli:education>
<oplli:Education rdf:about="{vi:proxyIRI ($baseUri, '', concat('Education_', $id))}">
- <oplli:id><xsl:value-of select="$id"/></oplli:id>
+ <oplli:id>
+ <xsl:value-of select="$id"/>
+ </oplli:id>
<xsl:if test="school-name">
- <oplli:school_name><xsl:value-of select="school-name"/></oplli:school_name>
+ <oplli:school_name>
+ <xsl:value-of select="school-name"/>
+ </oplli:school_name>
</xsl:if>
<xsl:if test="string-length (degree)">
- <oplli:education_degree><xsl:value-of select="degree"/></oplli:education_degree>
+ <oplli:education_degree>
+ <xsl:value-of select="degree"/>
+ </oplli:education_degree>
</xsl:if>
<xsl:if test="string-length (field-of-study)">
- <oplli:field_of_study><xsl:value-of select="field-of-study"/></oplli:field_of_study>
+ <oplli:field_of_study>
+ <xsl:value-of select="field-of-study"/>
+ </oplli:field_of_study>
</xsl:if>
<xsl:if test="string-length(notes) > 0">
- <oplli:education_notes><xsl:value-of select="notes"/></oplli:education_notes>
+ <oplli:education_notes>
+ <xsl:value-of select="notes"/>
+ </oplli:education_notes>
</xsl:if>
<xsl:if test="string-length(activities) > 0">
- <oplli:education_activities><xsl:value-of select="activities"/></oplli:education_activities>
+ <oplli:education_activities>
+ <xsl:value-of select="activities"/>
+ </oplli:education_activities>
</xsl:if>
-
<xsl:choose>
<xsl:when test="string-length (school-name) and string-length (field-of-study)">
- <rdfs:label><xsl:value-of select="concat (field-of-study, ' : ', school-name)"/></rdfs:label>
+ <rdfs:label>
+ <xsl:value-of select="concat (field-of-study, ' : ', school-name)"/>
+ </rdfs:label>
</xsl:when>
<xsl:when test="string-length (school-name)">
- <rdfs:label><xsl:value-of select="school-name"/></rdfs:label>
+ <rdfs:label>
+ <xsl:value-of select="school-name"/>
+ </rdfs:label>
</xsl:when>
<xsl:when test="string-length (field-of-study)">
- <rdfs:label><xsl:value-of select="field-of-study"/></rdfs:label>
+ <rdfs:label>
+ <xsl:value-of select="field-of-study"/>
+ </rdfs:label>
</xsl:when>
</xsl:choose>
-
<xsl:if test="start-date">
<xsl:variable name="start_year" select="start-date/year" />
<xsl:variable name="start_month">
@@ -146,9 +196,10 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <oplli:start_date rdf:datatype="&xsd;date"><xsl:value-of select="concat($start_year,'-', $start_month, '-01')" /></oplli:start_date>
+ <oplli:start_date rdf:datatype="&xsd;date">
+ <xsl:value-of select="concat($start_year,'-', $start_month, '-01')"/>
+ </oplli:start_date>
</xsl:if>
-
<xsl:if test="end-date">
<xsl:variable name="end_year" select="end-date/year" />
<xsl:variable name="end_month">
@@ -168,9 +219,10 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <oplli:end_date rdf:datatype="&xsd;date"><xsl:value-of select="concat($end_year,'-', $end_month, '-01')" /></oplli:end_date>
+ <oplli:end_date rdf:datatype="&xsd;date">
+ <xsl:value-of select="concat($end_year,'-', $end_month, '-01')"/>
+ </oplli:end_date>
</xsl:if>
-
</oplli:Education>
</oplli:education>
</xsl:for-each>
@@ -249,7 +301,9 @@
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplcv;OtherInfo" />
<rdfs:label>Interests</rdfs:label>
- <oplcv:otherInfoDescription><xsl:value-of select="." /></oplcv:otherInfoDescription>
+ <oplcv:otherInfoDescription>
+ <xsl:value-of select="."/>
+ </oplcv:otherInfoDescription>
<oplcv:otherInfo rdf:resource="&oplcv;Interests"/>
</rdf:Description>
</oplcv:hasOtherInfo>
@@ -261,55 +315,83 @@
<rdf:Description rdf:about="{$personURI}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&foaf;Person" />
- <rdfs:label><xsl:value-of select="concat (first-name, ' ', last-name)"/></rdfs:label>
- <oplli:id><xsl:value-of select="id"/></oplli:id>
+ <rdfs:label>
+ <xsl:value-of select="concat (first-name, ' ', last-name)"/>
+ </rdfs:label>
+ <oplli:id>
+ <xsl:value-of select="id"/>
+ </oplli:id>
<xsl:if test="public-profile-url">
- <oplli:public_profile_url><xsl:value-of select="public-profile-url"/></oplli:public_profile_url>
+ <oplli:public_profile_url>
+ <xsl:value-of select="public-profile-url"/>
+ </oplli:public_profile_url>
</xsl:if>
<xsl:if test="first-name">
- <foaf:firstName><xsl:value-of select="first-name"/></foaf:firstName>
+ <foaf:firstName>
+ <xsl:value-of select="first-name"/>
+ </foaf:firstName>
</xsl:if>
<xsl:if test="last-name">
- <foaf:lastName><xsl:value-of select="last-name"/></foaf:lastName>
+ <foaf:lastName>
+ <xsl:value-of select="last-name"/>
+ </foaf:lastName>
</xsl:if>
<xsl:if test="first-name and last-name">
- <foaf:name><xsl:value-of select="concat (first-name, ' ', last-name)"/></foaf:name>
+ <foaf:name>
+ <xsl:value-of select="concat (first-name, ' ', last-name)"/>
+ </foaf:name>
</xsl:if>
<xsl:if test="industry">
- <oplli:industry><xsl:value-of select="industry"/></oplli:industry>
+ <oplli:industry>
+ <xsl:value-of select="industry"/>
+ </oplli:industry>
</xsl:if>
<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>
+ <oplli:headline>
+ <xsl:value-of select="headline"/>
+ </oplli:headline>
</xsl:if>
<xsl:if test="picture-url">
<foaf:img rdf:resource="{picture-url}"/>
</xsl:if>
<xsl:if test="string-length(specialties)">
- <oplli:specialties><xsl:value-of select="specialties"/></oplli:specialties>
+ <oplli:specialties>
+ <xsl:value-of select="specialties"/>
+ </oplli:specialties>
</xsl:if>
<xsl:if test="string-length(interests)">
- <oplli:interests><xsl:value-of select="interests"/></oplli:interests>
+ <oplli:interests>
+ <xsl:value-of select="interests"/>
+ </oplli:interests>
</xsl:if>
<xsl:if test="string-length(honors)">
- <oplli:honors><xsl:value-of select="honors"/></oplli:honors>
+ <oplli:honors>
+ <xsl:value-of select="honors"/>
+ </oplli:honors>
</xsl:if>
- <!-- associations -->
+ <!-- associations -->
<!-- Derive a CV from the primary LinkedIn user's profile (but not for people he/she knows) -->
<xsl:if test="not(ancestor::connections)">
<oplcv:has_CV>
<rdf:Description rdf:about="{vi:proxyIRI($baseUri, '', concat('CV_', id))}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplcv;CV" />
- <rdfs:label><xsl:value-of select="concat ('Auto-generated CV for ', first-name, ' ', last-name)"/></rdfs:label>
- <rdfs:comment><xsl:value-of select="concat ('A CV derived from the LinkedIn profile of ', first-name, ' ', last-name)"/></rdfs:comment>
- <foaf:firstName><xsl:value-of select="first-name"/></foaf:firstName>
- <foaf:lastName><xsl:value-of select="last-name"/></foaf:lastName>
- <foaf:name><xsl:value-of select="concat (first-name, ' ', last-name)"/></foaf:name>
-
+ <rdfs:label>
+ <xsl:value-of select="concat ('Auto-generated CV for ', first-name, ' ', last-name)"/>
+ </rdfs:label>
+ <rdfs:comment>
+ <xsl:value-of select="concat ('A CV derived from the LinkedIn profile of ', first-name, ' ', last-name)"/>
+ </rdfs:comment>
+ <foaf:firstName>
+ <xsl:value-of select="first-name"/>
+ </foaf:firstName>
+ <foaf:lastName>
+ <xsl:value-of select="last-name"/>
+ </foaf:lastName>
+ <foaf:name>
+ <xsl:value-of select="concat (first-name, ' ', last-name)"/>
+ </foaf:name>
<xsl:apply-templates select="*" mode="cv" />
</rdf:Description>
</oplcv:has_CV>
@@ -320,8 +402,12 @@
</xsl:template>
<xsl:template match="location">
- <oplli:location_name><xsl:value-of select="name" /></oplli:location_name>
- <oplli:country_code><xsl:value-of select="country/code" /></oplli:country_code>
+ <oplli:location_name>
+ <xsl:value-of select="name"/>
+ </oplli:location_name>
+ <oplli:country_code>
+ <xsl:value-of select="country/code"/>
+ </oplli:country_code>
</xsl:template>
<xsl:template name="position">
@@ -329,9 +415,15 @@
<rdf:Description rdf:about="{$positionURI}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplli;Position" />
- <rdfs:label><xsl:value-of select="title"/></rdfs:label>
- <oplli:id><xsl:value-of select="id"/></oplli:id>
- <oplli:title><xsl:value-of select="title" /></oplli:title>
+ <rdfs:label>
+ <xsl:value-of select="title"/>
+ </rdfs:label>
+ <oplli:id>
+ <xsl:value-of select="id"/>
+ </oplli:id>
+ <oplli:title>
+ <xsl:value-of select="title"/>
+ </oplli:title>
<xsl:if test="is-current">
<oplli:is_current rdf:datatype="&xsd;boolean">
<xsl:value-of select="is-current" />
@@ -356,7 +448,9 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <oplli:start_date rdf:datatype="&xsd;date"><xsl:value-of select="concat($start_year,'-', $start_month, '-01')" /></oplli:start_date>
+ <oplli:start_date rdf:datatype="&xsd;date">
+ <xsl:value-of select="concat($start_year,'-', $start_month, '-01')"/>
+ </oplli:start_date>
</xsl:if>
<xsl:if test="end-date">
<xsl:variable name="end_year" select="end-date/year" />
@@ -377,7 +471,9 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <oplli:end_date rdf:datatype="&xsd;date"><xsl:value-of select="concat($end_year,'-', $end_month, '-01')" /></oplli:end_date>
+ <oplli:end_date rdf:datatype="&xsd;date">
+ <xsl:value-of select="concat($end_year,'-', $end_month, '-01')"/>
+ </oplli:end_date>
</xsl:if>
<xsl:if test="company">
<xsl:variable name="company_id">
@@ -393,19 +489,31 @@
<oplli:company>
<rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat('Company_', $company_id))}">
<rdf:type rdf:resource="&oplli;Company" />
- <rdfs:label><xsl:value-of select="company/name"/></rdfs:label>
- <oplli:company_name><xsl:value-of select="company/name"/></oplli:company_name>
+ <rdfs:label>
+ <xsl:value-of select="company/name"/>
+ </rdfs:label>
+ <oplli:company_name>
+ <xsl:value-of select="company/name"/>
+ </oplli:company_name>
<xsl:if test="company/id">
- <oplli:id><xsl:value-of select="company/id"/></oplli:id>
+ <oplli:id>
+ <xsl:value-of select="company/id"/>
+ </oplli:id>
</xsl:if>
<xsl:if test="company/industry">
- <oplli:company_industry><xsl:value-of select="company/industry"/></oplli:company_industry>
+ <oplli:company_industry>
+ <xsl:value-of select="company/industry"/>
+ </oplli:company_industry>
</xsl:if>
<xsl:if test="company/type">
- <oplli:company_type><xsl:value-of select="company/type"/></oplli:company_type>
+ <oplli:company_type>
+ <xsl:value-of select="company/type"/>
+ </oplli:company_type>
</xsl:if>
<xsl:if test="company/size">
- <oplli:company_size><xsl:value-of select="company/size"/></oplli:company_size>
+ <oplli:company_size>
+ <xsl:value-of select="company/size"/>
+ </oplli:company_size>
</xsl:if>
</rdf:Description>
</oplli:company>
@@ -418,9 +526,15 @@
<xsl:variable name="id" select="provider-account-id" />
<oplli:has_twitter_account>
<oplli:TwitterAccount rdf:about="{vi:proxyIRI ($baseUri, '', concat('TwitterAccount_', $id))}">
- <oplli:provider_account_id><xsl:value-of select="$id"/></oplli:provider_account_id>
- <oplli:provider_account_name><xsl:value-of select="provider-account-name"/></oplli:provider_account_name>
- <rdfs:label><xsl:value-of select="provider-account-name"/></rdfs:label>
+ <oplli:provider_account_id>
+ <xsl:value-of select="$id"/>
+ </oplli:provider_account_id>
+ <oplli:provider_account_name>
+ <xsl:value-of select="provider-account-name"/>
+ </oplli:provider_account_name>
+ <rdfs:label>
+ <xsl:value-of select="provider-account-name"/>
+ </rdfs:label>
</oplli:TwitterAccount>
</oplli:has_twitter_account>
</xsl:for-each>
@@ -431,9 +545,15 @@
<rdf:Description rdf:about="{$skillURI}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplli;Skill" />
- <rdfs:label><xsl:value-of select="skill/name"/></rdfs:label>
- <oplli:id><xsl:value-of select="id"/></oplli:id>
- <oplli:skill_name><xsl:value-of select="skill/name" /></oplli:skill_name>
+ <rdfs:label>
+ <xsl:value-of select="skill/name"/>
+ </rdfs:label>
+ <oplli:id>
+ <xsl:value-of select="id"/>
+ </oplli:id>
+ <oplli:skill_name>
+ <xsl:value-of select="skill/name"/>
+ </oplli:skill_name>
</rdf:Description>
</xsl:template>
@@ -444,8 +564,12 @@
<rdf:Description rdf:about="{$work_history_URI}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplcv;WorkHistory" />
- <rdfs:label><xsl:value-of select="title" /></rdfs:label>
- <oplcv:jobTitle><xsl:value-of select="title" /></oplcv:jobTitle>
+ <rdfs:label>
+ <xsl:value-of select="title"/>
+ </rdfs:label>
+ <oplcv:jobTitle>
+ <xsl:value-of select="title"/>
+ </oplcv:jobTitle>
<xsl:choose>
<xsl:when test="contains(translate(title, $uc, $lc), 'contractor')">
<oplcv:jobType rdf:resource="&oplcv;Contractor" />
@@ -478,7 +602,9 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <oplcv:startDate rdf:datatype="&xsd;date"><xsl:value-of select="concat($start_year,'-', $start_month, '-01')" /></oplcv:startDate>
+ <oplcv:startDate rdf:datatype="&xsd;date">
+ <xsl:value-of select="concat($start_year,'-', $start_month, '-01')"/>
+ </oplcv:startDate>
</xsl:if>
<xsl:if test="end-date">
<xsl:variable name="end_year" select="end-date/year" />
@@ -499,7 +625,9 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <oplcv:endDate rdf:datatype="&xsd;date"><xsl:value-of select="concat($end_year,'-', $end_month, '-01')" /></oplcv:endDate>
+ <oplcv:endDate rdf:datatype="&xsd;date">
+ <xsl:value-of select="concat($end_year,'-', $end_month, '-01')"/>
+ </oplcv:endDate>
</xsl:if>
<xsl:if test="company">
<xsl:variable name="company_id">
@@ -515,10 +643,16 @@
<oplcv:employedIn>
<rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat('cvCompany_', $company_id))}">
<rdf:type rdf:resource="&oplcv;Company" />
- <rdfs:label><xsl:value-of select="company/name"/></rdfs:label>
- <oplcv:organization_name><xsl:value-of select="company/name"/></oplcv:organization_name>
+ <rdfs:label>
+ <xsl:value-of select="company/name"/>
+ </rdfs:label>
+ <oplcv:organization_name>
+ <xsl:value-of select="company/name"/>
+ </oplcv:organization_name>
<xsl:if test="company/industry">
- <oplcv:industry><xsl:value-of select="company/industry"/></oplcv:industry>
+ <oplcv:industry>
+ <xsl:value-of select="company/industry"/>
+ </oplcv:industry>
</xsl:if>
</rdf:Description>
</oplcv:employedIn>
@@ -546,8 +680,12 @@
</xsl:choose>
</xsl:if>
<xsl:if test="string-length (field-of-study)">
- <oplcv:eduMajor><xsl:value-of select="field-of-study"/></oplcv:eduMajor>
- <oplcv:eduDescription><xsl:value-of select="field-of-study"/></oplcv:eduDescription>
+ <oplcv:eduMajor>
+ <xsl:value-of select="field-of-study"/>
+ </oplcv:eduMajor>
+ <oplcv:eduDescription>
+ <xsl:value-of select="field-of-study"/>
+ </oplcv:eduDescription>
</xsl:if>
<xsl:if test="string-length (school-name)">
<oplcv:studiedIn>
@@ -555,8 +693,12 @@
<rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat('cvEducationalOrg_', $school_name))}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplcv;EducationalOrg" />
- <oplcv:organization_name><xsl:value-of select="school-name"/></oplcv:organization_name>
- <rdfs:label><xsl:value-of select="school-name"/></rdfs:label>
+ <oplcv:organization_name>
+ <xsl:value-of select="school-name"/>
+ </oplcv:organization_name>
+ <rdfs:label>
+ <xsl:value-of select="school-name"/>
+ </rdfs:label>
</rdf:Description>
</oplcv:studiedIn>
</xsl:if>
@@ -579,7 +721,9 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <oplcv:eduStartDate rdf:datatype="&xsd;date"><xsl:value-of select="concat($start_year,'-', $start_month, '-01')" /></oplcv:eduStartDate>
+ <oplcv:eduStartDate rdf:datatype="&xsd;date">
+ <xsl:value-of select="concat($start_year,'-', $start_month, '-01')"/>
+ </oplcv:eduStartDate>
</xsl:if>
<xsl:if test="end-date">
<xsl:variable name="end_year" select="end-date/year" />
@@ -600,18 +744,25 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <oplcv:eduGradDate rdf:datatype="&xsd;date"><xsl:value-of select="concat($end_year,'-', $end_month, '-01')" /></oplcv:eduGradDate>
+ <oplcv:eduGradDate rdf:datatype="&xsd;date">
+ <xsl:value-of select="concat($end_year,'-', $end_month, '-01')"/>
+ </oplcv:eduGradDate>
</xsl:if>
-
<xsl:choose>
<xsl:when test="string-length (school-name) and string-length (field-of-study)">
- <rdfs:label><xsl:value-of select="concat (field-of-study, ' : ', school-name)"/></rdfs:label>
+ <rdfs:label>
+ <xsl:value-of select="concat (field-of-study, ' : ', school-name)"/>
+ </rdfs:label>
</xsl:when>
<xsl:when test="string-length (school-name)">
- <rdfs:label><xsl:value-of select="school-name"/></rdfs:label>
+ <rdfs:label>
+ <xsl:value-of select="school-name"/>
+ </rdfs:label>
</xsl:when>
<xsl:when test="string-length (field-of-study)">
- <rdfs:label><xsl:value-of select="field-of-study"/></rdfs:label>
+ <rdfs:label>
+ <xsl:value-of select="field-of-study"/>
+ </rdfs:label>
</xsl:when>
</xsl:choose>
</rdf:Description>
@@ -622,9 +773,330 @@
<rdf:Description rdf:about="{$skillURI}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplcv;Skill" />
- <rdfs:label><xsl:value-of select="skill/name"/></rdfs:label>
- <oplcv:skillName><xsl:value-of select="skill/name" /></oplcv:skillName>
+ <rdfs:label>
+ <xsl:value-of select="skill/name"/>
+ </rdfs:label>
+ <oplcv:skillName>
+ <xsl:value-of select="skill/name"/>
+ </oplcv:skillName>
+ </rdf:Description>
+ </xsl:template>
+
+ <!--
+ For details of job post fields, see
+ http://developer.linkedin.com/documents/job-lookup-api-and-fields
+ http://developer.linkedin.com/documents/job-fields
+ Some are optional, some may contain HTML
+ -->
+ <xsl:template match="/job">
+ <rdf:Description rdf:about="{$resourceURL}">
+ <opl:providedBy rdf:resource="{$providedByIRI}"/>
+ <rdf:type rdf:resource="&oplli;JobPosting"/>
+ <rdfs:seeAlso rdf:resource="{job_url}"/>
+ <rdfs:label>
+ <xsl:value-of select="concat (position/title, ': ', company/name)"/>
+ </rdfs:label>
+ <oplli:id>
+ <xsl:value-of select="id"/>
+ </oplli:id>
+ <oplli:posting_date rdf:datatype="&xsd;date">
+ <xsl:call-template name="format_job_date">
+ <xsl:with-param name="year" select="posting-date/year"/>
+ <xsl:with-param name="month" select="posting-date/month"/>
+ <xsl:with-param name="day" select="posting-date/day"/>
+ </xsl:call-template>
+ </oplli:posting_date>
+ <oplli:expiration_date rdf:datatype="&xsd;date">
+ <xsl:call-template name="format_job_date">
+ <xsl:with-param name="year" select="expiration-date/year"/>
+ <xsl:with-param name="month" select="expiration-date/month"/>
+ <xsl:with-param name="day" select="expiration-date/day"/>
+ </xsl:call-template>
+ </oplli:expiration_date>
+ <oplli:is_current>
+ <xsl:value-of select="active"/>
+ </oplli:is_current>
+ <oplli:company_name>
+ <xsl:value-of select="company/name"/>
+ </oplli:company_name>
+ <oplli:title>
+ <xsl:value-of select="position/title"/>
+ </oplli:title>
+ <oplli:location_name>
+ <xsl:value-of select="position/location/name"/>
+ </oplli:location_name>
+ <oplli:country_code>
+ <xsl:value-of select="position/location/country/code"/>
+ </oplli:country_code>
+ <oplli:job_type>
+ <xsl:value-of select="position/job-type/name"/>
+ </oplli:job_type>
+ <oplli:experience_level>
+ <xsl:value-of select="position/experience-level/name"/>
+ </oplli:experience_level>
+ <oplli:position_summary>
+ <xsl:value-of select="description-snippet"/>
+ </oplli:position_summary>
+ <oplli:description>
+ <xsl:value-of select="vi:html2text(description)"/>
+ </oplli:description>
+ <xsl:for-each select="position/job-functions/job-function">
+ <oplli:job_function>
+ <xsl:value-of select="name"/>
+ </oplli:job_function>
+ </xsl:for-each>
+ <xsl:for-each select="position/industries/industry">
+ <oplli:industry>
+ <xsl:value-of select="name"/>
+ </oplli:industry>
+ </xsl:for-each>
+ <xsl:if test="string-length(skills-and-experience) > 0">
+ <oplli:skills_and_experience>
+ <xsl:value-of select="vi:html2text(skills-and-experience)"/>
+ </oplli:skills_and_experience>
+ </xsl:if>
+ <xsl:if test="string-length(salary) > 0">
+ <oplli:salary>
+ <xsl:value-of select="salary"/>
+ </oplli:salary>
+ </xsl:if>
+ <xsl:if test="string-length(referral-bonus) > 0">
+ <oplli:referral_bonus>
+ <xsl:value-of select="referral-bonus"/>
+ </oplli:referral_bonus>
+ </xsl:if>
+ </rdf:Description>
+ </xsl:template>
+
+ <xsl:template name="format_job_date">
+ <xsl:param name="year"/>
+ <xsl:param name="month"/>
+ <xsl:param name="day"/>
+ <xsl:variable name="_day">
+ <xsl:choose>
+ <xsl:when test="string-length($day) = 0">
+ <xsl:text>01</xsl:text>
+ </xsl:when>
+ <xsl:when test="string-length($day) > 1">
+ <xsl:value-of select="$day"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat('0', $day)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:variable name="_month">
+ <xsl:choose>
+ <xsl:when test="string-length($month) > 1">
+ <xsl:value-of select="$month"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat('0', $month)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:value-of select="concat($year,'-', $_month, '-', $_day)"/>
+ </xsl:template>
+
+ <xsl:template match="/company">
+ <rdf:Description rdf:about="{$resourceURL}">
+ <opl:providedBy rdf:resource="{$providedByIRI}"/>
+ <rdf:type rdf:resource="&oplli;Company"/>
+ <rdfs:label>
+ <xsl:value-of select="name"/>
+ </rdfs:label>
+ <oplli:id>
+ <xsl:value-of select="id"/>
+ </oplli:id>
+ <oplli:universal_name>
+ <xsl:value-of select="universal-name"/>
+ </oplli:universal_name>
+ <oplli:company_type>
+ <xsl:value-of select="company-type/name"/>
+ </oplli:company_type>
+ <xsl:if test="string-length(ticker) > 0">
+ <oplli:ticker>
+ <xsl:value-of select="ticker"/>
+ </oplli:ticker>
+ </xsl:if>
+ <foaf:homepage>
+ <xsl:value-of select="website-url"/>
+ </foaf:homepage>
+ <oplli:industry>
+ <xsl:value-of select="industry"/>
+ </oplli:industry>
+ <oplli:company_status>
+ <xsl:value-of select="status/name"/>
+ </oplli:company_status>
+ <xsl:if test="string-length(logo-url) > 0">
+ <oplli:logo_url>
+ <xsl:value-of select="logo-url"/>
+ </oplli:logo_url>
+ </xsl:if>
+ <xsl:if test="string-length(blog-rss-url) > 0">
+ <foaf:weblog>
+ <xsl:value-of select="blog-rss-url"/>
+ </foaf:weblog>
+ </xsl:if>
+ <xsl:if test="string-length(twitter-id) > 0">
+ <oplli:twitter_id>
+ <xsl:value-of select="twitter-id"/>
+ </oplli:twitter_id>
+ </xsl:if>
+ <xsl:if test="string-length(employee-count-range) > 0">
+ <oplli:employee_count_range>
+ <xsl:value-of select="concat (employee-count-range/code, ': ', employee-count-range/name)"/>
+ </oplli:employee_count_range>
+ </xsl:if>
+ <xsl:if test="string-length(founded-year) > 0">
+ <oplli:founded_year>
+ <xsl:value-of select="founded-year"/>
+ </oplli:founded_year>
+ </xsl:if>
+ <xsl:if test="string-length(stock-exchange/code) > 0">
+ <oplli:stock_exchange_code>
+ <xsl:value-of select="stock-exchange/code"/>
+ </oplli:stock_exchange_code>
+ </xsl:if>
+ <xsl:if test="string-length(stock-exchange/name) > 0">
+ <oplli:stock_exchange_name>
+ <xsl:value-of select="stock-exchange/name"/>
+ </oplli:stock_exchange_name>
+ </xsl:if>
+ <oplli:num_followers>
+ <xsl:value-of select="num-followers"/>
+ </oplli:num_followers>
+ <dc:description>
+ <xsl:value-of select="description"/>
+ </dc:description>
+
+ <xsl:for-each select="specialties/specialty">
+ <oplli:specialties>
+ <xsl:value-of select="."/>
+ </oplli:specialties>
+ </xsl:for-each>
+ <xsl:for-each select="email-domains/email-domain">
+ <oplli:email_domain>
+ <xsl:value-of select="."/>
+ </oplli:email_domain>
+ </xsl:for-each>
+ <xsl:for-each select="locations/location">
+ <oplli:vcard>
+ <xsl:call-template name="vcard_company_location">
+ <xsl:with-param name="companyLocationVcardURI" select="vi:proxyIRI ($baseUri, '', concat('CompanyLocationVcard_', position()))"/>
+ </xsl:call-template>
+ </oplli:vcard>
+ </xsl:for-each>
+ </rdf:Description>
+ </xsl:template>
+
+ <xsl:template name="vcard_company_location">
+ <xsl:param name="companyLocationVcardURI"/>
+ <xsl:variable name="vcard_base_label" select="concat (/company/name, ' - ', description)"/>
+
+ <!-- See http://www.w3.org/Submission/vcard-rdf/ -->
+ <vcard:VCard rdf:about="{$companyLocationVcardURI}">
+ <rdfs:label>
+ <xsl:value-of select="$vcard_base_label"/>
+ </rdfs:label>
+ <oplli:is_headquarters>
+ <xsl:value-of select="is-headquarters"/>
+ </oplli:is_headquarters>
+ <oplli:is_current>
+ <xsl:value-of select="is-active"/>
+ </oplli:is_current>
+ <vcard:fn>
+ <xsl:value-of select="$vcard_base_label"/>
+ </vcard:fn>
+
+ <vcard:org>
+ <vcard:Organization rdf:about="{concat($companyLocationVcardURI, '_org')}">
+ <rdfs:label>
+ <xsl:value-of select="concat('Unit: ', description)"/>
+ </rdfs:label>
+ <vcard:organization-name>
+ <xsl:value-of select="/company/name"/>
+ </vcard:organization-name>
+ <vcard:organization-unit>
+ <xsl:value-of select="description"/>
+ </vcard:organization-unit>
+ </vcard:Organization>
+ </vcard:org>
+
+ <vcard:adr>
+ <vcard:Address rdf:about="{concat($companyLocationVcardURI, '_adr')}">
+ <rdfs:label>
+ <xsl:value-of select="concat ('Address: ', description)"/>
+ </rdfs:label>
+ <xsl:if test="string-length(address/street1) > 0">
+ <vcard:street-address>
+ <xsl:value-of select="address/street1"/>
+ </vcard:street-address>
+ </xsl:if>
+ <xsl:if test="string-length(address/street2) > 0">
+ <vcard:street-address>
+ <xsl:value-of select="address/street2"/>
+ </vcard:street-address>
+ </xsl:if>
+ <xsl:if test="string-length(address/city) > 0">
+ <vcard:locality>
+ <xsl:value-of select="address/city" />
+ </vcard:locality>
+ </xsl:if>
+ <xsl:if test="string-length(address/state) > 0">
+ <vcard:region>
+ <xsl:value-of select="address/state" />
+ </vcard:region>
+ </xsl:if>
+ <xsl:if test="string-length(address/postal-code) > 0">
+ <vcard:postal-code>
+ <xsl:value-of select="address/postal-code" />
+ </vcard:postal-code>
+ </xsl:if>
+ <xsl:if test="string-length(address/country-code) > 0">
+ <!-- Should be country-name, but we use country-code -->
+ <vcard:country-name>
+ <xsl:value-of select="translate(address/country-code, $lc, $uc)" />
+ </vcard:country-name>
+ </xsl:if>
+ </vcard:Address>
+ </vcard:adr>
+
+ <xsl:if test="string-length(contact-info/phone1) > 0">
+ <vcard:tel>
+ <rdf:Description rdf:about="{concat($companyLocationVcardURI, '_phone1')}">
+ <rdf:type rdf:resource="&vcard;Work"/>
+ <rdf:value>
+ <xsl:value-of select="contact-info/phone1"/>
+ </rdf:value>
</rdf:Description>
+ </vcard:tel>
+ </xsl:if>
+
+ <xsl:if test="string-length(contact-info/phone2) > 0">
+ <vcard:tel>
+ <rdf:Description rdf:about="{concat($companyLocationVcardURI, '_phone2')}">
+ <rdf:type rdf:resource="&vcard;Work"/>
+ <rdf:value>
+ <xsl:value-of select="contact-info/phone2"/>
+ </rdf:value>
+ </rdf:Description>
+ </vcard:tel>
+ </xsl:if>
+
+ <xsl:if test="string-length(contact-info/fax) > 0">
+ <vcard:tel>
+ <rdf:Description rdf:about="{concat($companyLocationVcardURI, '_fax')}">
+ <rdf:type rdf:resource="&vcard;Work"/>
+ <rdf:type rdf:resource="&vcard;Fax"/>
+ <rdf:value>
+ <xsl:value-of select="contact-info/fax"/>
+ </rdf:value>
+ </rdf:Description>
+ </vcard:tel>
+ </xsl:if>
+
+ </vcard:VCard>
</xsl:template>
<xsl:template match="*|text()"/>
diff --git a/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl b/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl
new file mode 100644
index 0000000..74d3732
--- /dev/null
+++ b/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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 709ae9b..9fa6aa2 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl b/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl
index bd9d7a0..a9214da 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.9 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl b/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl
index 85537bd..17cf99f 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.10 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl b/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl
index b77b277..82ae3af 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.4 2011/07/15 11:23:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl b/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl
index 3857aba..b35995b 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.6 2011/07/15 11:23:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl
index ec8ed3c..c96da38 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.5 2011/07/15 11:23:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl
index e3b1b6b..275580a 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.4 2011/07/15 11:23:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl
index 6d80069..c43e8c8 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.6 2011/07/15 11:23:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl
index 4ca878a..3c72a2d 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.3 2011/07/15 11:23:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl b/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl
new file mode 100644
index 0000000..610f450
--- /dev/null
+++ b/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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 5472945..1310c40 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.6 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl b/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl
index 25658b7..d11601f 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.4 2011/07/15 11:23:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl
index c524107..f100d76 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.3 2011/07/15 11:23:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl b/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl
index 953c771..67abbc0 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl
index 47b5650..86c5a35 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.8 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl b/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl
index 6aba5cf..aff646b 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.18 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl
index 99141a0..ea22828 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.3 2011/07/15 11:23:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl b/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl
index bb62fba..35c2d6c 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.9 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl b/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl
index 4085c88..c464f68 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.3 2011/07/15 11:15:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl b/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl
index 570a9be..25adb19 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl b/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl
index 6b107f6..cb4a982 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.5 2011/07/15 11:23:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl b/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl
index a3facad..70c02a9 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.6 2011/07/15 11:23:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl b/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl
index e390983..2c8ccde 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.3 2011/07/15 11:23:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl b/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl
index 26c3207..296e297 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.5 2011/07/15 11:23:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl b/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl
index 3f6ada8..3d4892c 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.3 2011/07/15 11:23:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl b/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl
index cdc3154..abde4fd 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.6 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl b/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl
index 3b391c2..b4fa214 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.8 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl b/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl
index a15c9cf..0719c29 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.2 2011/08/29 10:37:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl b/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl
index 986a019..b46420d 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.4 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl b/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl
index f84808a..582a212 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.8 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl b/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl
index 4c24f2f..3856d40 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.4 2011/07/15 11:23:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl
index 80d0d95..13ce6c1 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.2 2011/08/09 10:58:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl b/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl
index 660bd4e..d9b5b22 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.10 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -196,10 +196,10 @@
</xsl:choose>
</bibo:content>
<dcterms:created rdf:datatype="&xsd;dateTime">
- <xsl:value-of select="Created" />
+ <xsl:value-of select="vi:string2date(Created)" />
</dcterms:created>
<dcterms:modified rdf:datatype="&xsd;dateTime">
- <xsl:value-of select="Updated" />
+ <xsl:value-of select="vi:string2date(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 5d161fa..26d4bf6 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.6 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl
index afd7d9a..f08c43c 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl b/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl
new file mode 100644
index 0000000..027fdb7
--- /dev/null
+++ b/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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
new file mode 100644
index 0000000..c98572a
--- /dev/null
+++ b/binsrc/rdf_mappers/xslt/main/stackoverflow2rdf.xsl
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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 f7bffbf..9f3b984 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.4 2011/07/15 11:23:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2008 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl b/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl
index 53d11c2..40bdd2c 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.15 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl b/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl
index 6af7306..e950017 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.5 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl
index eca7166..4beac65 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.7 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl
index 90f4fde..5c6c4bb 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.9 2011/07/15 11:23:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl
index 91dc08d..2b0e1d7 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.2 2011/10/25 23:36:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -26,29 +26,16 @@
<!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/attribution#">
+<!ENTITY opl "http://www.openlinksw.com/schema/cert#">
+<!ENTITY cert "http://www.w3.org/ns/auth/cert#">
]>
<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" />
@@ -58,16 +45,24 @@
<xsl:variable name="resourceURL" select="vi:proxyIRI ($baseUri)"/>
<xsl:template match="/">
<rdf:RDF>
- <xsl:for-each select="//results[starts-with (string (text), '#Self #WebID #Fingerprint:')]">
+ <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>
<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:hasFingerprint>
- <xsl:value-of select="substring-after (text, '#Self #WebID #Fingerprint:')"/>
- </opl:hasFingerprint>
+ <opl:hasCertificate rdf:resource="{vi:proxyIRI ($baseUri, '', $fp)}"/>
</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 3eda82b..ddaafbb 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.3 2011/10/25 23:36:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -39,6 +39,8 @@
<!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;"
@@ -47,6 +49,7 @@
xmlns:dcterms="&dcterms;"
xmlns:foaf="&foaf;"
xmlns:opl="&opl;"
+ xmlns:oplcert="&oplcert;"
xmlns:owl="&owl;"
xmlns:rdf="&rdf;"
xmlns:rdfs= "&rdfs;"
@@ -141,6 +144,7 @@
<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" />
@@ -172,7 +176,8 @@
<foaf:title>
<xsl:value-of select="description" />
</foaf:title>
- <owl:sameAs rdf:resource="{concat('http://twitter.com/!#/', screen_name)}"/>
+ <twitter:public_profile_url rdf:resource="{concat('http://twitter.com/', screen_name)}"/>
+ <owl:sameAs rdf:resource="{concat('http://twitter.com/#!/', screen_name)}"/>
</foaf:Person>
</xsl:template>
@@ -183,14 +188,47 @@
<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>
+ </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 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 -->
+
+ <foaf:Person rdf:about="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name))}">
<xsl:choose>
<xsl:when test="$what = 'favorites'">
<twitter:has_favorite rdf:resource="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name, '/status/', id))}"/>
@@ -201,6 +239,24 @@
</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))}"/>
@@ -215,6 +271,8 @@
<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 01026eb..8e4b677 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.3 2011/07/15 11:23:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl
index 5b3b118..59e8d1d 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.5 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl
index f7150e3..1b6e7d8 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.5 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl b/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl
index ecfb176..8cafde3 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.11 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/wolfram_alpha2rdf.xsl b/binsrc/rdf_mappers/xslt/main/wolfram_alpha2rdf.xsl
new file mode 100644
index 0000000..7e32376
--- /dev/null
+++ b/binsrc/rdf_mappers/xslt/main/wolfram_alpha2rdf.xsl
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+ - project.
+ -
+ - Copyright (C) 1998-2009 OpenLink Software
+ -
+ - This project 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 wa "http://www.openlinksw.com/schemas/wolframalpha#">
+]>
+
+<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:wa="&wa;"
+ xmlns:sioc="&sioc;"
+ xmlns:foaf="&foaf;"
+ 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="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>
+
+ <xsl:apply-templates select="/queryresult/pod" mode="predicates" />
+
+ <rdf:Description rdf:about="{$resourceURL}">
+ <xsl:apply-templates select="/queryresult/pod" />
+ <wa:score><xsl:value-of select="1.0 div (1.0+count(//assumption))" /></wa:score>
+ <rdf:type rdf:resource="&wa;Query" />
+ <xsl:apply-templates select="/queryresult/sources/source" mode="source" />
+ </rdf:Description>
+ </rdf:RDF>
+ </xsl:template>
+
+ <xsl:template match="pod[@primary='true']">
+ <!-- If we know W|A are so certain about it, we promote it to being an "official" answer -->
+ <wa:primary_answer><xsl:value-of select="./subpod/plaintext" /></wa:primary_answer>
+ <rdf:type rdf:resource="&wa;Answer" />
+ </xsl:template>
+
+ <xsl:template match="pod[@id='Input']">
+ <!-- Special pod indicates how the input query was resolved -->
+ <wa:normative_query><xsl:value-of select="./subpod/plaintext" /></wa:normative_query>
+ <rdfs:seeAlso>
+ <wa:Query rdf:about="{concat('http://www.wolframalpha.com/input/?i=', vi:escapeURI(./subpod/plaintext))}">
+ <rdfs:label><xsl:value-of select="subpod/plaintext" /></rdfs:label>
+ </wa:Query>
+ </rdfs:seeAlso>
+ </xsl:template>
+
+ <xsl:template match="pod" mode="predicates">
+ <!-- Generate ontology statements about predicates -->
+ <xsl:variable name="pred" select="concat('&wa;', vi:saneURI(./@title))" />
+ <owl:DatatypeProperty rdf:about="{$pred}">
+ <rdfs:isDefinedBy rdf:resource="&wa;" />
+ <rdfs:label><xsl:value-of select="@title" /></rdfs:label>
+ <rdfs:comment><xsl:value-of select="concat(@title, ' - ', @id)" /></rdfs:comment>
+ </owl:DatatypeProperty>
+ </xsl:template>
+
+ <xsl:template match="pod">
+ <!-- Each pod determines the predicate at hand -->
+ <xsl:apply-templates select="subpod">
+ <xsl:with-param name="pred"><xsl:value-of select="vi:saneURI(./@title)" /></xsl:with-param>
+ </xsl:apply-templates>
+ </xsl:template>
+
+ <xsl:template match="subpod[string-length(normalize-space(plaintext))>0]">
+ <xsl:param name="pred" />
+ <xsl:element name="{$pred}" namespace="&wa;"><xsl:value-of select="plaintext" /></xsl:element>
+ </xsl:template>
+
+ <xsl:template match="source" mode="source">
+ <rdfs:seeAlso>
+ <wa:Source rdf:about="{@url}">
+ <rdfs:label><xsl:value-of select="@text" /></rdfs:label>
+ </wa:Source>
+ </rdfs:seeAlso>
+ </xsl:template>
+
+ <xsl:template match="*|@*|text()"/>
+ <xsl:template match="*|@*|text()" mode="predicates" />
+ <xsl:template match="*|@*|text()" mode="source" />
+</xsl:stylesheet>
+
diff --git a/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl
index 7236345..6b86808 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.12 2011/10/13 18:36:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -190,7 +190,14 @@
</xsl:if>
<sioc:has_container rdf:resource="{$contextRef}" />
<rdfs:label>
- <xsl:value-of select="$canonical_name"/>
+ <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>
</rdfs:label>
</rdf:Description>
diff --git a/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl
index 742b010..d2c62c8 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.5 2011/07/15 11:23:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl
index 6585538..77e411a 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.5 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl b/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl
index c0bbca0..d1f998e 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.2 2011/08/01 14:19:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl
index 19648a2..163e5b5 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl
index 0e8f05f..de3e564 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl
index f93b9e0..78dd339 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.14 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -79,7 +79,7 @@
</foaf:Organization>
</opl:providedBy>
- <rdf:type rdf:resource="&gr;LocationOfSalesOrServiceProvisioning"/>
+ <rdf:type rdf:resource="&gr;Location"/>
<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 052fab0..4d4661d 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.3 2011/07/15 11:23:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl
index 015256b..cd0202c 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.7 2011/08/09 11:17:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl
index c933f31..945421a 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.20 2011/08/09 10:58:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl
index a5ff215..59ad461 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.5 2011/08/09 10:58:33 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/redland/Makefile.am b/binsrc/redland/Makefile.am
index e0ec170..d8554e4 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-2007 OpenLink Software
+# 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
diff --git a/binsrc/redland/Makefile.in b/binsrc/redland/Makefile.in
index ace86b5..2beecc0 100644
--- a/binsrc/redland/Makefile.in
+++ b/binsrc/redland/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2007 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -287,14 +281,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/redland/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/redland/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/redland/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/redland/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -312,7 +306,6 @@ $(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
@@ -342,17 +335,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -380,7 +369,6 @@ clean-generic:
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"
@@ -399,8 +387,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -409,28 +395,18 @@ install-data-am:
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
@@ -464,7 +440,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/redland/rdf_storage_virtuoso.c b/binsrc/redland/rdf_storage_virtuoso.c
index 0b60a98..d4ba22a 100644
--- a/binsrc/redland/rdf_storage_virtuoso.c
+++ b/binsrc/redland/rdf_storage_virtuoso.c
@@ -2,7 +2,7 @@
*
* rdf_storage_virtuoso.c - RDF Storage in Virtuoso DBMS interface definition.
*
- * $Id: rdf_storage_virtuoso.c,v 1.6 2008/06/13 15:10:25 source Exp $
+ * $Id$
*
* Based in part on rdf_storage_virtuoso
*
diff --git a/binsrc/samples/JDBC/BrowserCheck.java b/binsrc/samples/JDBC/BrowserCheck.java
index cea2cf6..00fa2c6 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Check the version of JVM in the browser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/Makefile.am b/binsrc/samples/JDBC/Makefile.am
index 76334f4..a1d0d96 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/Makefile.in b/binsrc/samples/JDBC/Makefile.in
index 8cecb83..5c70c97 100644
--- a/binsrc/samples/JDBC/Makefile.in
+++ b/binsrc/samples/JDBC/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -358,14 +352,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/JDBC/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/JDBC/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/JDBC/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/JDBC/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -383,7 +377,6 @@ $(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
@@ -413,17 +406,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -451,7 +440,6 @@ clean-generic:
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"
@@ -470,8 +458,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -480,28 +466,18 @@ install-data-am:
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
@@ -535,7 +511,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/samples/JDBC/index.htm b/binsrc/samples/JDBC/index.htm
index 839dee3..b28420a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat
index f09ad5e..752cacc 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 bf19b5d..81deacd 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh
index 2fe5c15..c09f86b 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html
index 302d268..c10bb54 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java
index 87daf8e..a0553cc 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.1/index.htm b/binsrc/samples/JDBC/jdk1.1/index.htm
index c233df0..84ba7fc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat
index f09ad5e..752cacc 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 baeaaa4..e057c42 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh
index 2fe5c15..c09f86b 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html
index 9ec1e8e..638e86a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java
index 1586727..8728679 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat
index e54f9f6..57b2274 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 3ea00b5..5427bc2 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh
index 16413cb..bdd9bca 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html
index 1a3e3f5..8674f6f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java
index 79e4291..8d77cce 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm
index eb3ddd2..b49e95b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.2/index.htm b/binsrc/samples/JDBC/jdk1.2/index.htm
index 78fd061..50d9622 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat
index f09ad5e..752cacc 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 6bab0e0..84e2117 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh
index 2fe5c15..c09f86b 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html
index e2f2b7e..e0e318d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java
index 1586727..8728679 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat
index 367849f..93ce276 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 61053b1..65be3d7 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh
index 71e22f9..05cbd37 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html
index c33dcbe..ebaa184 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java
index 3acb998..a41a8ee 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.3/index.htm b/binsrc/samples/JDBC/jdk1.3/index.htm
index a38d5b8..5c62cca 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat
index 711ad19..c51441a 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 afc5f13..4b6e0a9 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh
index 6fd09b0..33d4400 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java
index ad58cb7..fac89f5 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java
index f63b914..b1ef25d 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html
index 272e6c2..b88ee3f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java
index 9b75459..b2b666f 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat
index f09ad5e..752cacc 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 c181736..eea22ce 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh
index 2fe5c15..c09f86b 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html
index 0569058..da285d6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java
index 87daf8e..a0553cc 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat
index 367849f..93ce276 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 dfd74d0..e6063b1 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh
index 71e22f9..05cbd37 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html
index 0f79303..ae17514 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java
index 3acb998..a41a8ee 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.4/index.htm b/binsrc/samples/JDBC/jdk1.4/index.htm
index 9cb148a..0fb24b0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat
index 711ad19..c51441a 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 afc5f13..4b6e0a9 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh
index 6fd09b0..33d4400 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java
index ad58cb7..fac89f5 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java
index f63b914..b1ef25d 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html
index 272e6c2..b88ee3f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java
index 9b75459..b2b666f 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat
index f09ad5e..752cacc 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 c181736..eea22ce 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh
index 2fe5c15..c09f86b 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html
index 0569058..da285d6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java
index 87daf8e..a0553cc 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java
index 860b490..70f434c 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java
index 23361e7..b55bce0 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat
index 367849f..93ce276 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 2006/04/11 17:56:11 source Exp $
+REM $Id$
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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 dfd74d0..e6063b1 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh
index 71e22f9..05cbd37 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html
index 0f79303..ae17514 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java
index 3acb998..a41a8ee 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 2006/04/11 17:56:11 source Exp $
+ * $Id$
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/JDBC/jdk1.5/index.htm b/binsrc/samples/JDBC/jdk1.5/index.htm
index daef147..70b2e1a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/Makefile.am b/binsrc/samples/Makefile.am
index 4a73c5a..1fac926 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/Makefile.in b/binsrc/samples/Makefile.in
index 407a1fd..b67b895 100644
--- a/binsrc/samples/Makefile.in
+++ b/binsrc/samples/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -16,9 +15,8 @@
@SET_MAKE@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -48,7 +46,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -60,38 +57,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -179,7 +148,6 @@ 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@
@@ -263,7 +231,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -284,7 +251,6 @@ 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@
@@ -293,7 +259,7 @@ vaddir = @vaddir@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -324,14 +290,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -349,7 +315,6 @@ $(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
@@ -364,7 +329,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -381,7 +346,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -389,7 +354,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -415,16 +380,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -432,14 +397,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -451,43 +416,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -508,44 +469,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -575,7 +521,6 @@ clean-generic:
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"
@@ -594,8 +539,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -604,28 +547,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -646,8 +579,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -663,7 +596,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
-
# 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/samples/demo/Makefile.am b/binsrc/samples/demo/Makefile.am
index a439ebe..f3b294a 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/demo/Makefile.in b/binsrc/samples/demo/Makefile.in
index 69c8723..3e22afd 100644
--- a/binsrc/samples/demo/Makefile.in
+++ b/binsrc/samples/demo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -17,9 +16,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -49,7 +47,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -57,26 +54,10 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -165,7 +146,6 @@ 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@
@@ -191,7 +171,7 @@ SYSLIBS = @SYSLIBS@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -270,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -291,7 +270,6 @@ 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@
@@ -431,14 +409,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/demo/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/demo/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/demo/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/demo/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -456,7 +434,6 @@ $(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
@@ -466,23 +443,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -491,10 +465,9 @@ CTAGS:
check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
- $(am__tty_colors); \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
@@ -503,63 +476,49 @@ check-TESTS: $(TESTS)
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
+ echo "XPASS: $$tst"; \
;; \
*) \
- col=$$grn; res=PASS; \
+ echo "PASS: $$tst"; \
;; \
esac; \
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
*) \
failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
+ echo "FAIL: $$tst"; \
;; \
esac; \
else \
skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
+ echo "SKIP: $$tst"; \
fi; \
- echo "$${col}$$res$${std}: $$tst"; \
done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
- fi; \
if test "$$failed" -eq 0; then \
if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
+ banner="All $$all tests passed"; \
else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
fi; \
else \
if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
+ banner="$$failed of $$all tests failed"; \
else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
fi; \
fi; \
dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
- else \
- skipped="($$skip tests were not run)"; \
- fi; \
+ skipped="($$skip tests were not run)"; \
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -570,15 +529,11 @@ check-TESTS: $(TESTS)
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
- else \
- echo "$$red$$dashes"; \
- fi; \
+ echo "$$dashes"; \
echo "$$banner"; \
test -z "$$skipped" || echo "$$skipped"; \
test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$$dashes"; \
test "$$failed" -eq 0; \
else :; fi
@@ -598,17 +553,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -641,7 +592,6 @@ clean-generic:
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"
@@ -660,8 +610,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -670,28 +618,18 @@ install-data-am: install-data-local 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
@@ -712,7 +650,7 @@ ps-am:
uninstall-am: uninstall-local uninstall-nodist_vadDATA
-.MAKE: check-am install-am install-strip
+.MAKE: install-am install-strip
.PHONY: all all-am check check-TESTS check-am clean clean-generic \
clean-libtool clean-local distclean distclean-generic \
@@ -783,7 +721,6 @@ uninstall-local:
clean-local:
-rm -rf art flags vad plugin classlib
-
# 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/samples/demo/art.sql b/binsrc/samples/demo/art.sql
index fc6327c..dc6b7ba 100644
--- a/binsrc/samples/demo/art.sql
+++ b/binsrc/samples/demo/art.sql
@@ -1,10 +1,10 @@
--
--- $Id: art.sql,v 1.2 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/art_vad.sql b/binsrc/samples/demo/art_vad.sql
index 691ca0f..440e9d3 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.1 2009/11/06 17:17:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/check_demo.sql b/binsrc/samples/demo/check_demo.sql
index d2243e9..6106fdc 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 2007/11/19 13:33:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -25,7 +25,7 @@ ECHO BOTH "STARTED: Checking security objects on Demo DB\n";
SET ARGV[0] 0;
SET ARGV[1] 0;
-select count(*) from SYS_USERS where U_ACCOUNT_DISABLED = 0 and U_IS_ROLE = 0 and U_NAME not in ('dba', 'dav', 'demo', 'nobody', 'tutorial_demo');
+select count(*) from SYS_USERS where U_ACCOUNT_DISABLED = 0 and U_IS_ROLE = 0 and U_NAME not in ('dba', 'dav', 'demo', 'nobody', 'tutorial_demo', '__rdf_repl');
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": " $LAST[1] " Users enabled different than dba,dav,demo.\n";
diff --git a/binsrc/samples/demo/countries.sql b/binsrc/samples/demo/countries.sql
index 1259881..8152656 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 2006/05/26 11:23:44 source Exp $
+-- $Id$
--
-- Creates a countries database
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/countries_vad.sql b/binsrc/samples/demo/countries_vad.sql
index 4b51fa0..bad7a24 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 2007/04/03 09:58:59 source Exp $
+-- $Id$
--
-- Creates a countries database
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/doc.owl b/binsrc/samples/demo/doc.owl
index dce28b5..c92bc11 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 2008/03/24 17:26:06 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/binsrc/samples/demo/drop.sql b/binsrc/samples/demo/drop.sql
index 2e1113f..01285d8 100644
--- a/binsrc/samples/demo/drop.sql
+++ b/binsrc/samples/demo/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.2 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/make_vad.sh b/binsrc/samples/demo/make_vad.sh
index dfee25a..230ee37 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.4 2011/02/03 10:37:51 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -285,7 +285,7 @@ directory_init() {
cp -f art_vad.sql vad/data/demo/sql
cp -f uninst.sql vad/data/demo/sql
cp -f uninst.sql vad/data/demo/sql
- cp -f $HOME/binsrc/dav/DET_RDFData.sql vad/data/demo/sql
+ #cp -f $HOME/binsrc/dav/DET_RDFData.sql vad/data/demo/sql
cp -f $HOME/binsrc/vsp/soapdemo/fishselect.sql vad/data/demo/sql
cp -f $HOME/binsrc/vsp/soapdemo/soap_validator.sql vad/data/demo/sql
cp -f $HOME/binsrc/vsp/soapdemo/interop-xsd.sql vad/data/demo/sql
@@ -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-2011 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 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
@@ -430,7 +430,7 @@ sticker_init() {
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/demo/sql/eNews_vad.sql', 1, 'report', 1);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/demo/sql/def_vad.sql', 1, 'report', 1);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/demo/sql/func_vad.sql', 1, 'report', 1);" >> $STICKER
- echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/demo/sql/DET_RDFData.sql', 1, 'report', 1);" >> $STICKER
+ #echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/demo/sql/DET_RDFData.sql', 1, 'report', 1);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/demo/sql/sql_rdf.sql', 1, 'report', 1);" >> $STICKER
#echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/demo/sql/tpch.sql', 1, 'report', 1);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/demo/sql/rd_v_1.sql', 1, 'report', 1);" >> $STICKER
diff --git a/binsrc/samples/demo/mkdemo.bat b/binsrc/samples/demo/mkdemo.bat
index d957c73..e2cf755 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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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.ini b/binsrc/samples/demo/mkdemo.ini
index 7c579b4..82b8fb2 100644
--- a/binsrc/samples/demo/mkdemo.ini
+++ b/binsrc/samples/demo/mkdemo.ini
@@ -1,7 +1,7 @@
;
; mkdemo.ini
;
-; $Id: mkdemo.ini,v 1.8 2008/07/16 09:26:42 source Exp $
+; $Id$
;
; Configuration file for the creation of the demo database
;
diff --git a/binsrc/samples/demo/mkdemo.sh b/binsrc/samples/demo/mkdemo.sh
index 87de4ab..33d9119 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.4 2010/09/21 13:12:36 source Exp $
+# $Id$
#
# Creates a demo database
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -251,6 +251,7 @@ then
(cd $HOME/binsrc/bpel; make)
(cd $HOME/binsrc/isparql ; make)
(cd $HOME/binsrc/rdf_mappers ; make)
+ (cd $HOME/binsrc/rdb2rdf ; make)
(cd $HOME/binsrc/samples/image_magick ; make)
(cd $HOME/binsrc/samples/sparql_demo ; make)
(cd $HOME/binsrc/tutorial ; make)
@@ -342,6 +343,7 @@ $LN $HOME/binsrc/b3s/fct_dav.vad .
$LN $HOME/binsrc/bpel/bpel_dav.vad .
$LN $HOME/binsrc/isparql/isparql_dav.vad .
$LN $HOME/binsrc/rdf_mappers/rdf_mappers_dav.vad .
+$LN $HOME/binsrc/rdb2rdf/rdb2rdf_dav.vad .
$LN $HOME/binsrc/samples/sparql_demo/sparql_demo_dav.vad .
$LN $HOME/binsrc/tutorial/tutorial_dav.vad .
$LN $HOME/binsrc/yacutia/conductor_dav.vad .
@@ -350,6 +352,7 @@ $LN $HOME/binsrc/yacutia/conductor_dav.vad .
[ -f fct_dav.vad ] && DO_COMMAND "vad_install ('fct_dav.vad')" dba dba
[ -f doc_dav.vad ] && DO_COMMAND "vad_install ('doc_dav.vad')" dba dba
[ -f rdf_mappers_dav.vad ] && DO_COMMAND "vad_install ('rdf_mappers_dav.vad')" dba dba
+[ -f rdb2rdf_dav.vad ] && DO_COMMAND "vad_install ('rdb2rdf_dav.vad')" dba dba
[ -f isparql_dav.vad ] && DO_COMMAND "vad_install ('isparql_dav.vad')" dba dba
[ -f bpel_dav.vad ] && DO_COMMAND "vad_install ('bpel_dav.vad')" dba dba
[ -f sparql_demo_dav.vad ] && DO_COMMAND "vad_install ('sparql_demo_dav.vad')" dba dba
diff --git a/binsrc/samples/demo/mkdemo.sql b/binsrc/samples/demo/mkdemo.sql
index 100ec12..1915815 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 2007/11/19 13:33:36 source Exp $
+-- $Id$
--
-- Creates a demo database
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/mkdemo_vad.sql b/binsrc/samples/demo/mkdemo_vad.sql
index 08dca05..cc21f1b 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.1 2009/11/25 22:11:16 source Exp $
+-- $Id$
--
-- Creates a demo database
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/mkdoc.sh b/binsrc/samples/demo/mkdoc.sh
index 12393a8..f313640 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.2 2011/02/03 10:37:51 source Exp $
+# $Id$
#
# Creates Virtuoso Documentation
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -365,7 +365,7 @@ LOG "Directory init..."
cp mksearch.sql vad/data/doc/code/.
cp drop.sql vad/data/doc/code/.
cp doc_sql_rdf.sql vad/data/doc/code/.
- cp -f $HOME/binsrc/dav/DET_RDFData.sql vad/data/doc/code/.
+ #cp -f $HOME/binsrc/dav/DET_RDFData.sql vad/data/doc/code/.
}
sticker_init() {
@@ -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-2011 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
@@ -410,7 +410,7 @@ sticker_init() {
echo " registry_set('_doc_build_', '$PACKDATE');" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH"/doc/code/drop.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH"/doc/code/mksearch.sql', 1, 'report', $ISDAV);" >> $STICKER
- echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH"/doc/code/DET_RDFData.sql', 1, 'report', $ISDAV);" >> $STICKER
+ #echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH"/doc/code/DET_RDFData.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH"/doc/code/doc_sql_rdf.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VHOST_REMOVE(lpath=>'/doc',del_vsps => 1);" >> $STICKER
echo " DB.DBA.VHOST_REMOVE(lpath=>'/doc/html',del_vsps => 1);" >> $STICKER
diff --git a/binsrc/samples/demo/mkdoc.sql b/binsrc/samples/demo/mkdoc.sql
index c241150..4a2ea5c 100644
--- a/binsrc/samples/demo/mkdoc.sql
+++ b/binsrc/samples/demo/mkdoc.sql
@@ -1,10 +1,10 @@
--
--- $Id: mkdoc.sql,v 1.3 2008/09/16 21:04:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/mkdoc_new.sql b/binsrc/samples/demo/mkdoc_new.sql
index 94dcdd6..1b6319c 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 2008/01/18 13:56:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/mksearch.sql b/binsrc/samples/demo/mksearch.sql
index 97a7dde..1f4bdcb 100644
--- a/binsrc/samples/demo/mksearch.sql
+++ b/binsrc/samples/demo/mksearch.sql
@@ -1,10 +1,10 @@
--
--- $Id: mksearch.sql,v 1.4 2007/05/08 17:44:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/mkvspxdoc.sql b/binsrc/samples/demo/mkvspxdoc.sql
index 7f0e7ca..d8312d2 100644
--- a/binsrc/samples/demo/mkvspxdoc.sql
+++ b/binsrc/samples/demo/mkvspxdoc.sql
@@ -1,10 +1,10 @@
--
--- $Id: mkvspxdoc.sql,v 1.2 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/demo/nw.owl b/binsrc/samples/demo/nw.owl
index 41aa26f..5ee6367 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.2 2009/12/15 23:01:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/binsrc/samples/hslookup/Makefile.am b/binsrc/samples/hslookup/Makefile.am
index 57d5dba..2f018f7 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-2008 OpenLink Software
+# 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
diff --git a/binsrc/samples/hslookup/Makefile.in b/binsrc/samples/hslookup/Makefile.in
index 52beeb4..7064e72 100644
--- a/binsrc/samples/hslookup/Makefile.in
+++ b/binsrc/samples/hslookup/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2008 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,29 +68,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(hostingdir)"
+hostingLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(hosting_LTLIBRARIES)
am__DEPENDENCIES_1 =
hslookup_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -103,10 +86,9 @@ hslookup_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(hslookup_la_CFLAGS) \
$(CFLAGS) $(hslookup_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_HSL_TRUE at am_hslookup_la_rpath = -rpath $(hostingdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -208,7 +190,6 @@ 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@
@@ -292,7 +273,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -313,7 +293,6 @@ 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@
@@ -348,14 +327,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/hslookup/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/hslookup/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/hslookup/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/hslookup/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -373,28 +352,23 @@ $(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):
install-hostingLTLIBRARIES: $(hosting_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(hostingdir)" || $(MKDIR_P) "$(DESTDIR)$(hostingdir)"
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hostingdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hostingdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(hostingdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(hostingdir)"; \
- }
+ done
uninstall-hostingLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$f"; \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$p"; \
done
clean-hostingLTLIBRARIES:
@@ -419,38 +393,38 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
hslookup_la-hslookup.lo: hslookup.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hslookup_la_CFLAGS) $(CFLAGS) -MT hslookup_la-hslookup.lo -MD -MP -MF $(DEPDIR)/hslookup_la-hslookup.Tpo -c -o hslookup_la-hslookup.lo `test -f 'hslookup.c' || echo '$(srcdir)/'`hslookup.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hslookup_la-hslookup.Tpo $(DEPDIR)/hslookup_la-hslookup.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hslookup_la_CFLAGS) $(CFLAGS) -MT hslookup_la-hslookup.lo -MD -MP -MF $(DEPDIR)/hslookup_la-hslookup.Tpo -c -o hslookup_la-hslookup.lo `test -f 'hslookup.c' || echo '$(srcdir)/'`hslookup.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hslookup_la-hslookup.Tpo $(DEPDIR)/hslookup_la-hslookup.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hslookup.c' object='hslookup_la-hslookup.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hslookup_la_CFLAGS) $(CFLAGS) -c -o hslookup_la-hslookup.lo `test -f 'hslookup.c' || echo '$(srcdir)/'`hslookup.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hslookup_la_CFLAGS) $(CFLAGS) -c -o hslookup_la-hslookup.lo `test -f 'hslookup.c' || echo '$(srcdir)/'`hslookup.c
hslookup_la-import_gate_virtuoso.lo: $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hslookup_la_CFLAGS) $(CFLAGS) -MT hslookup_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/hslookup_la-import_gate_virtuoso.Tpo -c -o hslookup_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hslookup_la-import_gate_virtuoso.Tpo $(DEPDIR)/hslookup_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hslookup_la_CFLAGS) $(CFLAGS) -MT hslookup_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/hslookup_la-import_gate_virtuoso.Tpo -c -o hslookup_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hslookup_la-import_gate_virtuoso.Tpo $(DEPDIR)/hslookup_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' object='hslookup_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hslookup_la_CFLAGS) $(CFLAGS) -c -o hslookup_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hslookup_la_CFLAGS) $(CFLAGS) -c -o hslookup_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
mostlyclean-libtool:
-rm -f *.lo
@@ -463,49 +437,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -526,17 +496,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -567,7 +533,6 @@ clean-generic:
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"
@@ -589,8 +554,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -599,28 +562,18 @@ install-data-am: install-hostingLTLIBRARIES
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
@@ -659,7 +612,6 @@ uninstall-am: uninstall-hostingLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-hostingLTLIBRARIES
-
# 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/samples/hslookup/hslookup.c b/binsrc/samples/hslookup/hslookup.c
index 2a34754..b53249e 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-2006 OpenLink Software
+ * 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
@@ -38,7 +38,7 @@
#include <time.h>
#ifdef WIN32
-#include <hdl/handle.h>
+#include <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 d75d129..dd7b0cb 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/image_magick/Makefile.in b/binsrc/samples/image_magick/Makefile.in
index 8fa08d3..b6c0549 100644
--- a/binsrc/samples/image_magick/Makefile.in
+++ b/binsrc/samples/image_magick/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,29 +68,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(hostingdir)"
+hostingLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(hosting_LTLIBRARIES)
am__DEPENDENCIES_1 =
im_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -102,10 +85,9 @@ im_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(im_la_CFLAGS) $(CFLAGS) $(im_la_LDFLAGS) \
$(LDFLAGS) -o $@
@WITH_IM_TRUE at am_im_la_rpath = -rpath $(hostingdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -207,7 +189,6 @@ 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@
@@ -291,7 +272,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -312,7 +292,6 @@ 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@
@@ -348,14 +327,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/image_magick/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/image_magick/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/image_magick/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/image_magick/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -373,28 +352,23 @@ $(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):
install-hostingLTLIBRARIES: $(hosting_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(hostingdir)" || $(MKDIR_P) "$(DESTDIR)$(hostingdir)"
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hostingdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hostingdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(hostingdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(hostingdir)"; \
- }
+ done
uninstall-hostingLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$f"; \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$p"; \
done
clean-hostingLTLIBRARIES:
@@ -419,38 +393,38 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
im_la-im.lo: im.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(im_la_CFLAGS) $(CFLAGS) -MT im_la-im.lo -MD -MP -MF $(DEPDIR)/im_la-im.Tpo -c -o im_la-im.lo `test -f 'im.c' || echo '$(srcdir)/'`im.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/im_la-im.Tpo $(DEPDIR)/im_la-im.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(im_la_CFLAGS) $(CFLAGS) -MT im_la-im.lo -MD -MP -MF $(DEPDIR)/im_la-im.Tpo -c -o im_la-im.lo `test -f 'im.c' || echo '$(srcdir)/'`im.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/im_la-im.Tpo $(DEPDIR)/im_la-im.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='im.c' object='im_la-im.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(im_la_CFLAGS) $(CFLAGS) -c -o im_la-im.lo `test -f 'im.c' || echo '$(srcdir)/'`im.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(im_la_CFLAGS) $(CFLAGS) -c -o im_la-im.lo `test -f 'im.c' || echo '$(srcdir)/'`im.c
im_la-import_gate_virtuoso.lo: $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(im_la_CFLAGS) $(CFLAGS) -MT im_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/im_la-import_gate_virtuoso.Tpo -c -o im_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/im_la-import_gate_virtuoso.Tpo $(DEPDIR)/im_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(im_la_CFLAGS) $(CFLAGS) -MT im_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/im_la-import_gate_virtuoso.Tpo -c -o im_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/im_la-import_gate_virtuoso.Tpo $(DEPDIR)/im_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' object='im_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(im_la_CFLAGS) $(CFLAGS) -c -o im_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(im_la_CFLAGS) $(CFLAGS) -c -o im_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
mostlyclean-libtool:
-rm -f *.lo
@@ -463,49 +437,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -526,17 +496,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -567,7 +533,6 @@ clean-generic:
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"
@@ -589,8 +554,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -599,28 +562,18 @@ install-data-am: install-hostingLTLIBRARIES
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
@@ -659,7 +612,6 @@ uninstall-am: uninstall-hostingLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-hostingLTLIBRARIES
-
# 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/samples/image_magick/demo.sql b/binsrc/samples/image_magick/demo.sql
index 891d57a..d7f0862 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 2007/01/22 13:16:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/image_magick/im.c b/binsrc/samples/image_magick/im.c
index 8efcf86..0584edf 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-2006 OpenLink Software
+ * 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
@@ -696,6 +696,7 @@ 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 ();
@@ -709,7 +710,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");
- int image_ctr = BOX_ELEMENTS (args) / 2;
+ image_ctr = BOX_ELEMENTS (args) / 2;
if (image_ctr > 4)
image_ctr = 4;
while (0 < image_ctr--)
@@ -764,6 +765,7 @@ 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 4271ecc..becc8ce 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/odp/Makefile.in b/binsrc/samples/odp/Makefile.in
index 10d9c25..d2974dc 100644
--- a/binsrc/samples/odp/Makefile.in
+++ b/binsrc/samples/odp/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -290,14 +284,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/odp/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/odp/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/odp/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/odp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -315,7 +309,6 @@ $(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
@@ -345,17 +338,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -383,7 +372,6 @@ clean-generic:
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"
@@ -402,8 +390,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -412,28 +398,18 @@ install-data-am:
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
@@ -467,7 +443,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/samples/odp/_current_config.sql b/binsrc/samples/odp/_current_config.sql
index 3f54670..9c1273c 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/all_profiles.vsp b/binsrc/samples/odp/http/all_profiles.vsp
index eb9965f..7cc482c 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/dmoz_s1.vsp b/binsrc/samples/odp/http/dmoz_s1.vsp
index 022ec4e..cae9413 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/edit_topic.vsp b/binsrc/samples/odp/http/edit_topic.vsp
index 654e86d..08f4524 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/editor.vsp b/binsrc/samples/odp/http/editor.vsp
index a4e6519..2cb759e 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/editors.vsp b/binsrc/samples/odp/http/editors.vsp
index 85db7bf..f052cf0 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/main.vsp b/binsrc/samples/odp/http/main.vsp
index 58d81d8..ccfecf6 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/perform_search.vsp b/binsrc/samples/odp/http/perform_search.vsp
index 78fb508..78422c0 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/search.vsp b/binsrc/samples/odp/http/search.vsp
index e4a5061..edf6660 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/status.vsp b/binsrc/samples/odp/http/status.vsp
index 4c2d83a..fd3681a 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/topic.vsp b/binsrc/samples/odp/http/topic.vsp
index 244d5a0..ded891a 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/http/topic_descr.vsp b/binsrc/samples/odp/http/topic_descr.vsp
index 5b233ee..677e8f7 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/odp_boot.sql b/binsrc/samples/odp/odp_boot.sql
index 35c2bff..c39f3e7 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/odp_lib.sql b/binsrc/samples/odp/odp_lib.sql
index 1fef20b..5581f54 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/odp_vsp.sql b/binsrc/samples/odp/odp_vsp.sql
index 51ea462..4ab34cf 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/rdf_lib.sql b/binsrc/samples/odp/rdf_lib.sql
index b6e11e9..34962ca 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/setup.isql b/binsrc/samples/odp/setup.isql
index 332da64..ca06ac1 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/odp/virtodp.sh b/binsrc/samples/odp/virtodp.sh
index 8f4bc77..aa441c8 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/samples/sparql_demo/Makefile.am b/binsrc/samples/sparql_demo/Makefile.am
index ba64b9e..82a7109 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/sparql_demo/Makefile.in b/binsrc/samples/sparql_demo/Makefile.in
index c28dc65..cfd03cd 100644
--- a/binsrc/samples/sparql_demo/Makefile.in
+++ b/binsrc/samples/sparql_demo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -78,23 +75,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -184,7 +167,6 @@ 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@
@@ -268,7 +250,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -289,7 +270,6 @@ 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@
@@ -331,14 +311,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/sparql_demo/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/sparql_demo/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/sparql_demo/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/sparql_demo/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -356,7 +336,6 @@ $(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
@@ -366,23 +345,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -406,17 +382,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -448,7 +420,6 @@ clean-generic:
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"
@@ -467,8 +438,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -477,28 +446,18 @@ 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
@@ -539,7 +498,6 @@ sparql_demo_dav.vad: $(EXTRA_DIST)
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/samples/sparql_demo/data_upload.vsp b/binsrc/samples/sparql_demo/data_upload.vsp
index d06697d..5e806ef 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 2006/08/03 18:48:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/default.css b/binsrc/samples/sparql_demo/default.css
index eecbeff..357605d 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.1 2009/10/07 19:37:48 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/sparql_demo/explain.vsp b/binsrc/samples/sparql_demo/explain.vsp
index 9c81bf9..276a35c 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 2006/08/03 18:48:32 source Exp $
+-- $Id$
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/grid.css b/binsrc/samples/sparql_demo/grid.css
index 7595ed2..4648299 100644
--- a/binsrc/samples/sparql_demo/grid.css
+++ b/binsrc/samples/sparql_demo/grid.css
@@ -1,5 +1,5 @@
/*
- * $Id: grid.css,v 1.1 2007/05/15 14:46:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
diff --git a/binsrc/samples/sparql_demo/load_dawg_usecase.vsp b/binsrc/samples/sparql_demo/load_dawg_usecase.vsp
index 8df9bec..1001a3b 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 2007/01/22 22:04:56 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/load_sq.vsp b/binsrc/samples/sparql_demo/load_sq.vsp
index 7b778d1..b4f2b8c 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 2006/08/03 18:48:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/load_uris.vsp b/binsrc/samples/sparql_demo/load_uris.vsp
index b2c3b47..c2c3336 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 2006/08/03 18:48:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/make_vad.sh b/binsrc/samples/sparql_demo/make_vad.sh
index 1fc88a9..57c4e8b 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.2 2011/02/03 10:37:51 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -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-2011 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
diff --git a/binsrc/samples/sparql_demo/remote.vsp b/binsrc/samples/sparql_demo/remote.vsp
index d77eb3b..055b0f9 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 2006/08/03 18:48:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/setup.sql b/binsrc/samples/sparql_demo/setup.sql
index 666fc02..345c27c 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.1 2009/07/27 22:55:28 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/setup_demo_db.sql b/binsrc/samples/sparql_demo/setup_demo_db.sql
index 6101258..da1be25 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 2007/04/03 10:00:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/setup_queries.sql b/binsrc/samples/sparql_demo/setup_queries.sql
index 99e1848..1abb093 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 2006/08/03 18:48:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/sparql_ajax.js b/binsrc/samples/sparql_demo/sparql_ajax.js
index 0775568..1c04b11 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/sparql_demo/sparql_ajax.vsp b/binsrc/samples/sparql_demo/sparql_ajax.vsp
index 6db1557..a53999f 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.2 2010/03/18 10:50:28 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/sparql_auth.vsp b/binsrc/samples/sparql_demo/sparql_auth.vsp
index d38a14d..57222ea 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 2006/10/18 12:21:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/sparql_file.vsp b/binsrc/samples/sparql_demo/sparql_file.vsp
index bda95bc..d2c865c 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 2006/10/26 00:11:54 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/sparql_demo/webdav.css b/binsrc/samples/sparql_demo/webdav.css
index a882dd2..2386ec9 100644
--- a/binsrc/samples/sparql_demo/webdav.css
+++ b/binsrc/samples/sparql_demo/webdav.css
@@ -1,5 +1,5 @@
/*
- * $Id: webdav.css,v 1.4 2007/05/15 14:46:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
diff --git a/binsrc/samples/wbxml2/Makefile.am b/binsrc/samples/wbxml2/Makefile.am
index 8bf8ab4..6ba4f94 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/wbxml2/Makefile.in b/binsrc/samples/wbxml2/Makefile.in
index 1f86736..e8a8ab0 100644
--- a/binsrc/samples/wbxml2/Makefile.in
+++ b/binsrc/samples/wbxml2/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,29 +68,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(hostingdir)"
+hostingLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(hosting_LTLIBRARIES)
am__DEPENDENCIES_1 =
wbxml2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -103,10 +86,9 @@ wbxml2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(wbxml2_la_CFLAGS) \
$(CFLAGS) $(wbxml2_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_WBXML2_TRUE at am_wbxml2_la_rpath = -rpath $(hostingdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -208,7 +190,6 @@ 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@
@@ -292,7 +273,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -313,7 +293,6 @@ 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@
@@ -350,14 +329,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/wbxml2/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/wbxml2/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/wbxml2/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/wbxml2/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -375,28 +354,23 @@ $(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):
install-hostingLTLIBRARIES: $(hosting_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(hostingdir)" || $(MKDIR_P) "$(DESTDIR)$(hostingdir)"
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hostingdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(hostingLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hostingdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(hostingdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(hostingdir)"; \
- }
+ done
uninstall-hostingLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(hosting_LTLIBRARIES)'; test -n "$(hostingdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$f"; \
+ @list='$(hosting_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hostingdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hostingdir)/$$p"; \
done
clean-hostingLTLIBRARIES:
@@ -421,38 +395,38 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
wbxml2_la-wbxml2.lo: wbxml2.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wbxml2_la_CFLAGS) $(CFLAGS) -MT wbxml2_la-wbxml2.lo -MD -MP -MF $(DEPDIR)/wbxml2_la-wbxml2.Tpo -c -o wbxml2_la-wbxml2.lo `test -f 'wbxml2.c' || echo '$(srcdir)/'`wbxml2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wbxml2_la-wbxml2.Tpo $(DEPDIR)/wbxml2_la-wbxml2.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wbxml2_la_CFLAGS) $(CFLAGS) -MT wbxml2_la-wbxml2.lo -MD -MP -MF $(DEPDIR)/wbxml2_la-wbxml2.Tpo -c -o wbxml2_la-wbxml2.lo `test -f 'wbxml2.c' || echo '$(srcdir)/'`wbxml2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wbxml2_la-wbxml2.Tpo $(DEPDIR)/wbxml2_la-wbxml2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wbxml2.c' object='wbxml2_la-wbxml2.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(wbxml2_la_CFLAGS) $(CFLAGS) -c -o wbxml2_la-wbxml2.lo `test -f 'wbxml2.c' || echo '$(srcdir)/'`wbxml2.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wbxml2_la_CFLAGS) $(CFLAGS) -c -o wbxml2_la-wbxml2.lo `test -f 'wbxml2.c' || echo '$(srcdir)/'`wbxml2.c
wbxml2_la-import_gate_virtuoso.lo: $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wbxml2_la_CFLAGS) $(CFLAGS) -MT wbxml2_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/wbxml2_la-import_gate_virtuoso.Tpo -c -o wbxml2_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wbxml2_la-import_gate_virtuoso.Tpo $(DEPDIR)/wbxml2_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wbxml2_la_CFLAGS) $(CFLAGS) -MT wbxml2_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/wbxml2_la-import_gate_virtuoso.Tpo -c -o wbxml2_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wbxml2_la-import_gate_virtuoso.Tpo $(DEPDIR)/wbxml2_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' object='wbxml2_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(wbxml2_la_CFLAGS) $(CFLAGS) -c -o wbxml2_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wbxml2_la_CFLAGS) $(CFLAGS) -c -o wbxml2_la-import_gate_virtuoso.lo `test -f '$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c' || echo '$(srcdir)/'`$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
mostlyclean-libtool:
-rm -f *.lo
@@ -465,49 +439,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -528,17 +498,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -569,7 +535,6 @@ clean-generic:
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"
@@ -591,8 +556,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -601,28 +564,18 @@ install-data-am: install-hostingLTLIBRARIES
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
@@ -665,7 +618,6 @@ uninstall-am: uninstall-hostingLTLIBRARIES
@WITH_WBXML2_FALSE@ @echo "**"
@WITH_WBXML2_FALSE@ @echo "** WARNING: wbxml2 plugin can not be build"
@WITH_WBXML2_FALSE@ @echo "**"
-
# 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/samples/wbxml2/wbxml2.c b/binsrc/samples/wbxml2/wbxml2.c
index 0ce5190..bb17af5 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/webapp/Makefile.am b/binsrc/samples/webapp/Makefile.am
index 2f4995e..f1cbe4d 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/webapp/Makefile.in b/binsrc/samples/webapp/Makefile.in
index 64128f1..f83d869 100644
--- a/binsrc/samples/webapp/Makefile.in
+++ b/binsrc/samples/webapp/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -313,14 +307,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/webapp/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/webapp/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/webapp/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/webapp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -338,7 +332,6 @@ $(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
@@ -368,17 +361,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -406,7 +395,6 @@ clean-generic:
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"
@@ -425,8 +413,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -435,28 +421,18 @@ install-data-am:
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
@@ -490,7 +466,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/samples/webapp/app_common.sql b/binsrc/samples/webapp/app_common.sql
index 70bf8f7..5c80290 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appcookie/appcookie.sql b/binsrc/samples/webapp/appcookie/appcookie.sql
index dffd781..2c13ff1 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appcookie/default.vsp b/binsrc/samples/webapp/appcookie/default.vsp
index c032b23..d6ccfd4 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appcookie/front.vsp b/binsrc/samples/webapp/appcookie/front.vsp
index c58963e..37d9eae 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appcookie/login.vsp b/binsrc/samples/webapp/appcookie/login.vsp
index 65c5530..11d756c 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appcookie/logout.vsp b/binsrc/samples/webapp/appcookie/logout.vsp
index 2852558..2b706bb 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appcookie/register.vsp b/binsrc/samples/webapp/appcookie/register.vsp
index ab36f0e..00213f5 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appcookie/relogin.vsp b/binsrc/samples/webapp/appcookie/relogin.vsp
index f6ac157..f98369a 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appdigest/appdigest.sql b/binsrc/samples/webapp/appdigest/appdigest.sql
index 97fc870..342bf0e 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appdigest/default.vsp b/binsrc/samples/webapp/appdigest/default.vsp
index e8b57bb..a498808 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appdigest/front.vsp b/binsrc/samples/webapp/appdigest/front.vsp
index 6a3f061..d13c6ff 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appdigest/logout.vsp b/binsrc/samples/webapp/appdigest/logout.vsp
index b6d121e..2715e4c 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appdigest/register.vsp b/binsrc/samples/webapp/appdigest/register.vsp
index 56a8223..a47dd54 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appjs/appjs.sql b/binsrc/samples/webapp/appjs/appjs.sql
index eef2eba..6c8b525 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appjs/default.vsp b/binsrc/samples/webapp/appjs/default.vsp
index e8b57bb..a498808 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appjs/front.vsp b/binsrc/samples/webapp/appjs/front.vsp
index 6a3f061..d13c6ff 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appjs/logout.vsp b/binsrc/samples/webapp/appjs/logout.vsp
index 742ad60..9c964bf 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appjs/register.vsp b/binsrc/samples/webapp/appjs/register.vsp
index 6961936..57f0208 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appsimple/simple_session.sql b/binsrc/samples/webapp/appsimple/simple_session.sql
index 7e7293f..e25f5cf 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appsimple/simple_session.vsp b/binsrc/samples/webapp/appsimple/simple_session.vsp
index cfc4451..1362237 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appssl/appssl.sql b/binsrc/samples/webapp/appssl/appssl.sql
index dc3705d..6c62110 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appssl/default.vsp b/binsrc/samples/webapp/appssl/default.vsp
index 7fcaeb9..6af6f2c 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appssl/front.vsp b/binsrc/samples/webapp/appssl/front.vsp
index c58963e..37d9eae 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appssl/login.vsp b/binsrc/samples/webapp/appssl/login.vsp
index 86c19e0..64cf18b 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appssl/logout.vsp b/binsrc/samples/webapp/appssl/logout.vsp
index 4e0407d..5dbaeb9 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appssl/register.vsp b/binsrc/samples/webapp/appssl/register.vsp
index d2e4666..1f31421 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appssl/relogin.vsp b/binsrc/samples/webapp/appssl/relogin.vsp
index 40f5f63..9b9dd8f 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurl/appurl.sql b/binsrc/samples/webapp/appurl/appurl.sql
index b60392d..7746707 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurl/default.vsp b/binsrc/samples/webapp/appurl/default.vsp
index dcb9068..df30469 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurl/front.vsp b/binsrc/samples/webapp/appurl/front.vsp
index c58963e..37d9eae 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurl/login.vsp b/binsrc/samples/webapp/appurl/login.vsp
index 8375066..ade1eb8 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurl/logout.vsp b/binsrc/samples/webapp/appurl/logout.vsp
index 6f33cf3..ec24135 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurl/register.vsp b/binsrc/samples/webapp/appurl/register.vsp
index 1612b1c..305a9dc 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurl/relogin.vsp b/binsrc/samples/webapp/appurl/relogin.vsp
index f7b3a74..354a337 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurla/appurla.sql b/binsrc/samples/webapp/appurla/appurla.sql
index 80055c6..7aad6dc 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurla/default.vsp b/binsrc/samples/webapp/appurla/default.vsp
index 7ce16a5..080d042 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurla/front.vsp b/binsrc/samples/webapp/appurla/front.vsp
index c58963e..37d9eae 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurla/login.vsp b/binsrc/samples/webapp/appurla/login.vsp
index e1f5d46..619c489 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurla/logout.vsp b/binsrc/samples/webapp/appurla/logout.vsp
index e5c7316..237041d 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurla/register.vsp b/binsrc/samples/webapp/appurla/register.vsp
index 71bdd7b..ac97833 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/appurla/relogin.vsp b/binsrc/samples/webapp/appurla/relogin.vsp
index 1bf3170..e67c3cb 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/changeNews.vsp b/binsrc/samples/webapp/eNews/changeNews.vsp
index f396009..afc955e 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/css/one.css b/binsrc/samples/webapp/eNews/css/one.css
index 0c2cfdc..1d280cd 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 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/webapp/eNews/css/two.css b/binsrc/samples/webapp/eNews/css/two.css
index 1016456..4f34a37 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 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/webapp/eNews/dhtml.js b/binsrc/samples/webapp/eNews/dhtml.js
index df0c912..e92290c 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/samples/webapp/eNews/eNews.sql b/binsrc/samples/webapp/eNews/eNews.sql
index 57d98c4..327b05e 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 2006/08/16 07:58:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/eNews_vad.sql b/binsrc/samples/webapp/eNews/eNews_vad.sql
index 4107bb6..0dedc8a 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 2007/09/20 12:09:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/newslogin.vsp b/binsrc/samples/webapp/eNews/newslogin.vsp
index eaf2090..6eb3791 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/newsmenu.vsp b/binsrc/samples/webapp/eNews/newsmenu.vsp
index 43e5207..180dee5 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/newsregistration.vsp b/binsrc/samples/webapp/eNews/newsregistration.vsp
index 53c8cbe..1edb3fd 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/newsview.vsp b/binsrc/samples/webapp/eNews/newsview.vsp
index 7ad7356..de33aa4 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/newswatch.vsp b/binsrc/samples/webapp/eNews/newswatch.vsp
index d69bbed..73e9f1b 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/eNews/noblankscroll.xsl b/binsrc/samples/webapp/eNews/noblankscroll.xsl
index 7a2d97c..6fbc4eb 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/block.xsl b/binsrc/samples/webapp/eNews/stylesheets/block.xsl
index c3d1474..bd0e988 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/grid.xsl b/binsrc/samples/webapp/eNews/stylesheets/grid.xsl
index 1b6401f..9847e4f 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl
index b9282ad..410be7c 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl
index 25f82fe..f2c43a6 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl
index bd1c87c..e88a530 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/confirm.vsp b/binsrc/samples/webapp/forums/confirm.vsp
index 11de3b5..a616077 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/def.sql b/binsrc/samples/webapp/forums/def.sql
index 0894f2e..9bd1ee4 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/def_vad.sql b/binsrc/samples/webapp/forums/def_vad.sql
index 48be6dc..23f276e 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 2007/09/20 12:09:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/error.vsp b/binsrc/samples/webapp/forums/error.vsp
index acdebea..349b32e 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/forum.vsp b/binsrc/samples/webapp/forums/forum.vsp
index db88029..9018321 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/func.sql b/binsrc/samples/webapp/forums/func.sql
index e50e929..99bb732 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/func_vad.sql b/binsrc/samples/webapp/forums/func_vad.sql
index 87cb35e..d7dbbdc 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 2007/11/29 15:05:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/home.vsp b/binsrc/samples/webapp/forums/home.vsp
index a374ff2..93fa0fd 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/login.vsp b/binsrc/samples/webapp/forums/login.vsp
index 1cabbc6..848f2a6 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/post_messages.vsp b/binsrc/samples/webapp/forums/post_messages.vsp
index 4c50040..5a42baa 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/registr.vsp b/binsrc/samples/webapp/forums/registr.vsp
index 13f5813..0cf5a81 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/search.vsp b/binsrc/samples/webapp/forums/search.vsp
index 2529ba4..6cf7e45 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/subforums.vsp b/binsrc/samples/webapp/forums/subforums.vsp
index 83f3238..1b9fe05 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/thread.vsp b/binsrc/samples/webapp/forums/thread.vsp
index 0ed1294..8541a24 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 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl b/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl
index 4545b87..6d2618d 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/error.xsl b/binsrc/samples/webapp/forums/xslt/forums/error.xsl
index b312431..e9ed40a 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/forum.xsl b/binsrc/samples/webapp/forums/xslt/forums/forum.xsl
index 145d910..bbc58e6 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/home.xsl b/binsrc/samples/webapp/forums/xslt/forums/home.xsl
index 26839e0..44ec0f6 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/login.xsl b/binsrc/samples/webapp/forums/xslt/forums/login.xsl
index 31d271c..5a976b5 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl b/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl
index c2ae173..1a8fd53 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl b/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl
index 0bd6141..7b8c98f 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/registr.xsl b/binsrc/samples/webapp/forums/xslt/forums/registr.xsl
index ab387e0..55792b8 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/search.xsl b/binsrc/samples/webapp/forums/xslt/forums/search.xsl
index 37656a9..54c55b9 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl b/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl
index d31cbed..ac7eb85 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/thread.xsl b/binsrc/samples/webapp/forums/xslt/forums/thread.xsl
index 3cd744a..44facd9 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/samples/xpath/Makefile.am b/binsrc/samples/xpath/Makefile.am
index 4658880..07a3f16 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/xpath/Makefile.in b/binsrc/samples/xpath/Makefile.in
index ddd7a62..8209309 100644
--- a/binsrc/samples/xpath/Makefile.in
+++ b/binsrc/samples/xpath/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -289,14 +283,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/xpath/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/xpath/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/xpath/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/xpath/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -314,7 +308,6 @@ $(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
@@ -344,17 +337,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -382,7 +371,6 @@ clean-generic:
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"
@@ -401,8 +389,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -411,28 +397,18 @@ install-data-am:
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
@@ -466,7 +442,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/samples/xpath/R-tables.sql b/binsrc/samples/xpath/R-tables.sql
index 1bd7eb1..00ca701 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/border.vsp b/binsrc/samples/xpath/border.vsp
index c3547a1..4635f0f 100644
--- a/binsrc/samples/xpath/border.vsp
+++ b/binsrc/samples/xpath/border.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: border.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/case.vsp b/binsrc/samples/xpath/case.vsp
index 715286e..8589b63 100644
--- a/binsrc/samples/xpath/case.vsp
+++ b/binsrc/samples/xpath/case.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: case.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/demo.vsp b/binsrc/samples/xpath/demo.vsp
index 995e839..0ec6579 100644
--- a/binsrc/samples/xpath/demo.vsp
+++ b/binsrc/samples/xpath/demo.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: demo.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/desk.sql b/binsrc/samples/xpath/desk.sql
index ee7e4f5..f4ea68b 100644
--- a/binsrc/samples/xpath/desk.sql
+++ b/binsrc/samples/xpath/desk.sql
@@ -1,10 +1,10 @@
--
--- $Id: desk.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/desk.vsp b/binsrc/samples/xpath/desk.vsp
index a497c3d..61bb4e0 100644
--- a/binsrc/samples/xpath/desk.vsp
+++ b/binsrc/samples/xpath/desk.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: desk.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/deskall.vsp b/binsrc/samples/xpath/deskall.vsp
index 2a8b2a8..3b41e5d 100644
--- a/binsrc/samples/xpath/deskall.vsp
+++ b/binsrc/samples/xpath/deskall.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskall.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/deskdata.vsp b/binsrc/samples/xpath/deskdata.vsp
index be0817b..df4a073 100644
--- a/binsrc/samples/xpath/deskdata.vsp
+++ b/binsrc/samples/xpath/deskdata.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskdata.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/deskhome.vsp b/binsrc/samples/xpath/deskhome.vsp
index 995c342..df03b63 100644
--- a/binsrc/samples/xpath/deskhome.vsp
+++ b/binsrc/samples/xpath/deskhome.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskhome.vsp,v 1.3 2007/01/22 13:21:44 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/deskmeta.vsp b/binsrc/samples/xpath/deskmeta.vsp
index 7065c4f..ffd1264 100644
--- a/binsrc/samples/xpath/deskmeta.vsp
+++ b/binsrc/samples/xpath/deskmeta.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskmeta.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/faq.vsp b/binsrc/samples/xpath/faq.vsp
index 37d6de0..1be048b 100644
--- a/binsrc/samples/xpath/faq.vsp
+++ b/binsrc/samples/xpath/faq.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: faq.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/files2dav.sh b/binsrc/samples/xpath/files2dav.sh
index be285d7..3c55f8f 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 2009/02/12 15:15:13 source Exp $
+# $Id$
#
# Creates a demo database
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/xpath/header.vsp b/binsrc/samples/xpath/header.vsp
index abe5f0d..3f2f487 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-2006 OpenLink Software
+-- 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
@@ -22,7 +22,7 @@
declare _version_id any;
-- 020801
- _version_id := split_and_decode('$Id: header.vsp,v 1.2 2006/08/15 19:30:33 source Exp $', 0, '\x0\x0\x20');
+ _version_id := split_and_decode('$Id$', 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 6ff1cb9..62a5635 100644
--- a/binsrc/samples/xpath/list.vsp
+++ b/binsrc/samples/xpath/list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: list.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/main.vsp b/binsrc/samples/xpath/main.vsp
index 8eeb306..99f6863 100644
--- a/binsrc/samples/xpath/main.vsp
+++ b/binsrc/samples/xpath/main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: main.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/metadata.sql b/binsrc/samples/xpath/metadata.sql
index c1c2a73..3795cc2 100644
--- a/binsrc/samples/xpath/metadata.sql
+++ b/binsrc/samples/xpath/metadata.sql
@@ -1,10 +1,10 @@
--
--- $Id: metadata.sql,v 1.3 2007/01/22 13:21:44 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/postsetup.sql b/binsrc/samples/xpath/postsetup.sql
index 8888599..32c4015 100644
--- a/binsrc/samples/xpath/postsetup.sql
+++ b/binsrc/samples/xpath/postsetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: postsetup.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/presetup.sql b/binsrc/samples/xpath/presetup.sql
index 72f4a48..aa97841 100644
--- a/binsrc/samples/xpath/presetup.sql
+++ b/binsrc/samples/xpath/presetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: presetup.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xpath/sample.sql b/binsrc/samples/xpath/sample.sql
index d413e83..5a06eeb 100644
--- a/binsrc/samples/xpath/sample.sql
+++ b/binsrc/samples/xpath/sample.sql
@@ -1,10 +1,10 @@
--
--- $Id: sample.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/Makefile.am b/binsrc/samples/xquery/Makefile.am
index ede683c..a79a4a3 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/xquery/Makefile.in b/binsrc/samples/xquery/Makefile.in
index d8d7e55..5e1ef80 100644
--- a/binsrc/samples/xquery/Makefile.in
+++ b/binsrc/samples/xquery/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -289,14 +283,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/xquery/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/samples/xquery/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/samples/xquery/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/samples/xquery/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -314,7 +308,6 @@ $(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
@@ -344,17 +337,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -382,7 +371,6 @@ clean-generic:
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"
@@ -401,8 +389,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -411,28 +397,18 @@ install-data-am:
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
@@ -466,7 +442,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/samples/xquery/R-tables.sql b/binsrc/samples/xquery/R-tables.sql
index 4495827..5e65870 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/border.vsp b/binsrc/samples/xquery/border.vsp
index c3547a1..4635f0f 100644
--- a/binsrc/samples/xquery/border.vsp
+++ b/binsrc/samples/xquery/border.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: border.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/case.vsp b/binsrc/samples/xquery/case.vsp
index e0db98b..742f9c2 100644
--- a/binsrc/samples/xquery/case.vsp
+++ b/binsrc/samples/xquery/case.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: case.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/demo.vsp b/binsrc/samples/xquery/demo.vsp
index e8af0ae..16c308e 100644
--- a/binsrc/samples/xquery/demo.vsp
+++ b/binsrc/samples/xquery/demo.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: demo.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/desk.sql b/binsrc/samples/xquery/desk.sql
index e57a290..18785b0 100644
--- a/binsrc/samples/xquery/desk.sql
+++ b/binsrc/samples/xquery/desk.sql
@@ -1,10 +1,10 @@
--
--- $Id: desk.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/desk.vsp b/binsrc/samples/xquery/desk.vsp
index 2eb31bf..f959497 100644
--- a/binsrc/samples/xquery/desk.vsp
+++ b/binsrc/samples/xquery/desk.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: desk.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/deskall.vsp b/binsrc/samples/xquery/deskall.vsp
index 64dbe4f..478e4e3 100644
--- a/binsrc/samples/xquery/deskall.vsp
+++ b/binsrc/samples/xquery/deskall.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskall.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/deskdata.vsp b/binsrc/samples/xquery/deskdata.vsp
index 2731c73..f5069dd 100644
--- a/binsrc/samples/xquery/deskdata.vsp
+++ b/binsrc/samples/xquery/deskdata.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskdata.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/deskhome.vsp b/binsrc/samples/xquery/deskhome.vsp
index 9ab4989..a7e6edc 100644
--- a/binsrc/samples/xquery/deskhome.vsp
+++ b/binsrc/samples/xquery/deskhome.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskhome.vsp,v 1.3 2007/01/22 13:44:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/deskmeta.vsp b/binsrc/samples/xquery/deskmeta.vsp
index f02c315..46800b7 100644
--- a/binsrc/samples/xquery/deskmeta.vsp
+++ b/binsrc/samples/xquery/deskmeta.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskmeta.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/faq.vsp b/binsrc/samples/xquery/faq.vsp
index 37d6de0..1be048b 100644
--- a/binsrc/samples/xquery/faq.vsp
+++ b/binsrc/samples/xquery/faq.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: faq.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/files2dav.sh b/binsrc/samples/xquery/files2dav.sh
index be5b658..ef42816 100755
--- a/binsrc/samples/xquery/files2dav.sh
+++ b/binsrc/samples/xquery/files2dav.sh
@@ -2,14 +2,14 @@
#
#
#
-# $Id: files2dav.sh,v 1.3 2009/04/14 12:16:49 source Exp $
+# $Id$
#
#
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/samples/xquery/header.vsp b/binsrc/samples/xquery/header.vsp
index 68c0767..92e9b4b 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-2006 OpenLink Software
+-- 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
@@ -22,7 +22,7 @@
declare _version_id any;
-- 020801
- _version_id := split_and_decode('$Id: header.vsp,v 1.2 2006/08/15 19:30:33 source Exp $', 0, '\x0\x0\x20');
+ _version_id := split_and_decode('$Id$', 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 8aab4dc..543728e 100644
--- a/binsrc/samples/xquery/list.vsp
+++ b/binsrc/samples/xquery/list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: list.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/main.vsp b/binsrc/samples/xquery/main.vsp
index c3c6f0a..928ad0d 100644
--- a/binsrc/samples/xquery/main.vsp
+++ b/binsrc/samples/xquery/main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: main.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/metadata.sql b/binsrc/samples/xquery/metadata.sql
index 9cedca1..b1950d4 100644
--- a/binsrc/samples/xquery/metadata.sql
+++ b/binsrc/samples/xquery/metadata.sql
@@ -1,10 +1,10 @@
--
--- $Id: metadata.sql,v 1.3 2007/01/22 13:44:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/postsetup.sql b/binsrc/samples/xquery/postsetup.sql
index af6ba8d..c89f0c9 100644
--- a/binsrc/samples/xquery/postsetup.sql
+++ b/binsrc/samples/xquery/postsetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: postsetup.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/presetup.sql b/binsrc/samples/xquery/presetup.sql
index e062594..5e93e68 100644
--- a/binsrc/samples/xquery/presetup.sql
+++ b/binsrc/samples/xquery/presetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: presetup.sql,v 1.3 2008/04/28 12:05:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/search.sql b/binsrc/samples/xquery/search.sql
index 8e2af6c..020bcb5 100644
--- a/binsrc/samples/xquery/search.sql
+++ b/binsrc/samples/xquery/search.sql
@@ -1,10 +1,10 @@
--
--- $Id: search.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/search.vsp b/binsrc/samples/xquery/search.vsp
index 24aa99e..cd1c58d 100644
--- a/binsrc/samples/xquery/search.vsp
+++ b/binsrc/samples/xquery/search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: search.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/setup.isql b/binsrc/samples/xquery/setup.isql
index aaac284..b0d771c 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/samples/xquery/text.vsp b/binsrc/samples/xquery/text.vsp
index 51c3d52..ae466a6 100644
--- a/binsrc/samples/xquery/text.vsp
+++ b/binsrc/samples/xquery/text.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: text.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/sesame/Makefile.am b/binsrc/sesame/Makefile.am
index abfbc57..1a448d5 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-2007 OpenLink Software
+# 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
diff --git a/binsrc/sesame/Makefile.in b/binsrc/sesame/Makefile.in
index 596f264..0466f84 100644
--- a/binsrc/sesame/Makefile.in
+++ b/binsrc/sesame/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2007 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -303,14 +297,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sesame/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/sesame/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sesame/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/sesame/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -328,7 +322,6 @@ $(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
@@ -358,17 +351,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -396,7 +385,6 @@ clean-generic:
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"
@@ -415,8 +403,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -425,28 +411,18 @@ install-data-am: install-data-local
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
@@ -502,7 +478,6 @@ virt_sesame.jar: $(SESAME_SRC)
$(SESAME_SRC)
env PATH="$(JDK)/Commands:$(JDK)/bin:$(PATH)" \
$(JAR) cvf virt_sesame.jar -C out.driver virtuoso
-
# 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/sesame/virtuoso_driver/VirtuosoAdminListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java
index 31a5cd4..9d99114 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 2007/11/21 11:10:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java
index dc84c1e..918d666 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 2007/11/23 21:47:41 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java
index 62a53e5..8f21d4c 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 2007/11/23 21:47:41 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java
index 8b7762e..ec5ced1 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 2008/04/28 12:16:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2008 OpenLink Software
+ * 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java
index da7145f..a41d969 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 2007/11/21 11:10:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java
index 0c83189..909453e 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 2007/11/21 11:10:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java
index 0055228..a3e1ded 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 2008/04/28 12:16:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java b/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java
index d2a6459..d6384ee 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 2007/11/27 11:21:19 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java b/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java
index 9b572b1..90d3c90 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 2007/11/28 09:54:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame2/Makefile.am b/binsrc/sesame2/Makefile.am
index 94c7f19..f49e81c 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-2008 OpenLink Software
+# 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
@@ -53,7 +53,7 @@ SESAME_XSL = \
SAMPLES_SOURCE= \
virtuoso_driver/VirtuosoTest.java
-SESAME_CLASSPATH= lib/slf4j-api-1.6.1.jar:lib/slf4j-simple-1.6.1.jar:lib/openrdf-sesame-2.5.1-onejar.jar:$(top_srcdir)/libsrc/JDBCDriverType4/virtjdbc3.jar
+SESAME_CLASSPATH= lib/slf4j-api-1.6.1.jar:lib/slf4j-simple-1.6.1.jar:lib/openrdf-sesame-2.6.5-onejar.jar:$(top_srcdir)/libsrc/JDBCDriverType4/virtjdbc3.jar
all-am: $(TARGETS)
diff --git a/binsrc/sesame2/Makefile.in b/binsrc/sesame2/Makefile.in
index e00957d..356b1c9 100644
--- a/binsrc/sesame2/Makefile.in
+++ b/binsrc/sesame2/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2008 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -298,7 +292,7 @@ SESAME_XSL = \
SAMPLES_SOURCE = \
virtuoso_driver/VirtuosoTest.java
-SESAME_CLASSPATH = lib/slf4j-api-1.6.1.jar:lib/slf4j-simple-1.6.1.jar:lib/openrdf-sesame-2.5.1-onejar.jar:$(top_srcdir)/libsrc/JDBCDriverType4/virtjdbc3.jar
+SESAME_CLASSPATH = lib/slf4j-api-1.6.1.jar:lib/slf4j-simple-1.6.1.jar:lib/openrdf-sesame-2.6.5-onejar.jar:$(top_srcdir)/libsrc/JDBCDriverType4/virtjdbc3.jar
# ----------------------------------------------------------------------
#
@@ -321,14 +315,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sesame2/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/sesame2/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sesame2/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/sesame2/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -346,7 +340,6 @@ $(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
@@ -376,17 +369,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -414,7 +403,6 @@ clean-generic:
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"
@@ -433,8 +421,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -443,28 +429,18 @@ install-data-am: install-data-local
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
@@ -553,7 +529,6 @@ version: virt_sesame2.jar
clean-local:
-rm -rf out.driver out.examples doc
-rmdir lib
-
# 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/sesame2/virtuoso_driver/Version.java b/binsrc/sesame2/virtuoso_driver/Version.java
index c65a74d..f8201bb 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.6 2011/10/13 22:49:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -26,10 +26,10 @@ package virtuoso.sesame2.driver;
public class Version {
- protected static final String DRV_VER = "2.5.1";
+ protected static final String DRV_VER = "2.6.5";
// The major and minor version number
- protected static final String build_id = "1.5";
+ protected static final String build_id = "1.7";
public static void main(String args[])
{
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java
index 41bbfea..231f753 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.2 2010/02/25 20:23:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java
index 77d4e28..bbbb020 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.2 2010/02/25 20:23:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java b/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java
index 1ea1c3e..e79e00c 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.2 2011/10/13 22:49:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2011 OpenLink Software
+ * 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java
index 3914f4e..43e6b68 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.4 2011/10/13 22:49:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java
index c59aa8a..6c5e9e2 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.9 2011/05/17 13:56:31 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java
index 04f8478..0a3b28f 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.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);
- }
- }
-}
+/*
+ * $Id$
+ *
+ * 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);
+ }
+ }
+}
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java
index 35de3f1..6d6ca2a 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.15 2011/10/13 22:49:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -89,13 +89,16 @@ import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.openrdf.repository.RepositoryResult;
+import org.openrdf.rio.ParserConfig;
import org.openrdf.rio.RDFFormat;
import org.openrdf.rio.RDFHandler;
import org.openrdf.rio.RDFHandlerException;
import org.openrdf.rio.RDFParseException;
import org.openrdf.rio.RDFParser;
+import org.openrdf.rio.RDFParser.DatatypeHandling;
import org.openrdf.rio.Rio;
import org.openrdf.rio.helpers.RDFHandlerBase;
+import org.openrdf.rio.helpers.ParseErrorLogger;
import org.openrdf.rio.n3.N3ParserFactory;
import org.openrdf.rio.ntriples.NTriplesParserFactory;
import org.openrdf.rio.rdfxml.RDFXMLParserFactory;
@@ -153,13 +156,14 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
private static Resource nilContext;
private Connection quadStoreConnection;
protected VirtuosoRepository repository;
- 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 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 int BATCH_SIZE = 5000;
private PreparedStatement psInsert;
private int psInsertCount = 0;
private boolean useLazyAdd = false;
private int prefetchSize = 200;
+ private volatile ParserConfig parserConfig = new ParserConfig(true, true, false, DatatypeHandling.IGNORE);
public VirtuosoRepositoryConnection(VirtuosoRepository repository, Connection connection) throws RepositoryException {
@@ -181,6 +185,29 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
/**
+ * Set the parser configuration this connection should use for
+ * RDFParser-based operations.
+ *
+ * @param config
+ * a Rio RDF Parser configuration.
+ */
+ public void setParserConfig(ParserConfig config)
+ {
+ this.parserConfig = parserConfig;
+ }
+
+ /**
+ * Returns the parser configuration this connection uses for Rio-based
+ * operations.
+ *
+ * @return a Rio RDF parser configuration.
+ */
+ public ParserConfig getParserConfig()
+ {
+ return parserConfig;
+ }
+
+ /**
* Gets a ValueFactory for this RepositoryConnection.
*
* @return A repository-specific ValueFactory.
@@ -901,11 +928,10 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
try {
RDFParser parser = Rio.createParser(format, getRepository().getValueFactory());
+ parser.setParserConfig(getParserConfig());
+ parser.setParseErrorListener(new ParseErrorLogger());
// set up a handler for parsing the data from reader
- parser.setVerifyData(true);
- parser.setStopAtFirstError(true);
- parser.setDatatypeHandling(RDFParser.DatatypeHandling.IGNORE);
final PreparedStatement ps = prepareStatement(VirtuosoRepositoryConnection.S_INSERT);
final Resource[] _contexts = checkDMLContext(contexts);
@@ -1807,7 +1833,7 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
verifyIsOpen();
flushDelayAdd();
stmt = createStatement();
- stmt.execute("sparql\n define output:format '_JAVA_'\n " + query);
+ stmt.execute("sparql\n " + query);
return stmt.getUpdateCount();
}
catch (SQLException e) {
@@ -1910,25 +1936,8 @@ 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 9ae5ddb..61ab03b 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.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;
- }
-}
+/*
+ * $Id$
+ *
+ * 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;
+ }
+}
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java
index fc5ef9e..e0f6c63 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.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");
- }
-}
-
+/*
+ * $Id$
+ *
+ * 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");
+ }
+}
+
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java b/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java
index 47796fa..4e0294a 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.3 2010/03/01 10:06:02 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -120,7 +120,7 @@ public class VirtuosoTest {
// test add data to the repository
boolean ok = true;
String query = null;
- String strurl = "http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com/foaf.rdf";
+ String strurl = "http://dbpedia.org/data/Berlin.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 84a784b..f5a4609 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.2 2010/02/25 20:23:06 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java b/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java
index 809298a..767d7ba 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.2 2011/10/13 22:49:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2011 OpenLink Software
+ * 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
diff --git a/binsrc/sesame3/Makefile.am b/binsrc/sesame3/Makefile.am
index a6118b8..8224ee6 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-2008 OpenLink Software
+# 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
diff --git a/binsrc/sesame3/Makefile.in b/binsrc/sesame3/Makefile.in
index 138921a..6244628 100644
--- a/binsrc/sesame3/Makefile.in
+++ b/binsrc/sesame3/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2008 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -318,14 +312,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sesame3/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/sesame3/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sesame3/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/sesame3/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -343,7 +337,6 @@ $(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
@@ -373,17 +366,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -411,7 +400,6 @@ clean-generic:
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"
@@ -430,8 +418,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -440,28 +426,18 @@ install-data-am: install-data-local
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
@@ -550,7 +526,6 @@ version: virt_sesame3.jar
clean-local:
-rm -rf out.driver out.examples doc
-rmdir lib
-
# 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/sesame3/virtuoso_driver/Version.java b/binsrc/sesame3/virtuoso_driver/Version.java
index f2cca93..f304457 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.5 2011/05/17 13:56:31 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -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.4";
+ protected static final String build_id = "1.5";
public static void main(String args[])
{
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java
index 5db2efb..1d73ec0 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 2009/03/26 13:57:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java
index f49a258..b323161 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 2009/03/26 13:57:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java
index 0fe64ac..39de1ae 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 2009/03/26 13:57:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java
index b249d8b..54a69cf 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.9 2011/05/17 13:56:31 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java
index fd0f935..01b3830 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.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);
- }
- }
-}
+/*
+ * $Id$
+ *
+ * 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);
+ }
+ }
+}
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java
index ca9b280..f817c14 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.11 2011/05/17 13:56:31 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
@@ -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 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 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 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 define output:format '_JAVA_'\n " + query);
+ stmt.execute("sparql\n " + query);
return stmt.getUpdateCount();
}
catch (SQLException e) {
@@ -2409,25 +2409,11 @@ 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 09e29fc..a84cbb2 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.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;
- }
-}
+/*
+ * $Id$
+ *
+ * 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;
+ }
+}
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java
index 8ad943a..109f079 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 2009/03/26 13:57:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java
index 18d00b6..59fb020 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.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");
- }
-}
-
+/*
+ * $Id$
+ *
+ * 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");
+ }
+}
+
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java b/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java
index b0f48d3..4c56791 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.1 2009/09/18 16:11:19 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2008 OpenLink Software
+ * 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java
index fc91078..d541bee 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 2009/03/26 13:57:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/binsrc/sqldoc/Makefile.am b/binsrc/sqldoc/Makefile.am
index 85f0dda..3780605 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/sqldoc/Makefile.in b/binsrc/sqldoc/Makefile.in
index 26bda7b..11b9c34 100644
--- a/binsrc/sqldoc/Makefile.in
+++ b/binsrc/sqldoc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -17,9 +16,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -51,7 +49,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
cutter_SOURCES = cutter.c
cutter_OBJECTS = cutter.$(OBJEXT)
@@ -62,10 +59,9 @@ escape8bit_LDADD = $(LDADD)
isql_log_normalize_SOURCES = isql_log_normalize.c
isql_log_normalize_OBJECTS = isql_log_normalize.$(OBJEXT)
isql_log_normalize_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -167,7 +163,6 @@ 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@
@@ -251,7 +246,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -272,7 +266,6 @@ 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@
@@ -297,14 +290,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sqldoc/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/sqldoc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sqldoc/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/sqldoc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -322,16 +315,13 @@ $(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):
clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
cutter$(EXEEXT): $(cutter_OBJECTS) $(cutter_DEPENDENCIES)
@rm -f cutter$(EXEEXT)
$(LINK) $(cutter_OBJECTS) $(cutter_LDADD) $(LIBS)
@@ -354,21 +344,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -384,49 +374,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -447,17 +433,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -485,7 +467,6 @@ clean-generic:
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"
@@ -507,8 +488,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -517,28 +496,18 @@ install-data-am:
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
@@ -576,7 +545,6 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
-
# 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/sqldoc/bif_sps.sql b/binsrc/sqldoc/bif_sps.sql
index b6db011..dcd1dbe 100644
--- a/binsrc/sqldoc/bif_sps.sql
+++ b/binsrc/sqldoc/bif_sps.sql
@@ -1,10 +1,10 @@
--
--- $Id: bif_sps.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/sqldoc/cutter.c b/binsrc/sqldoc/cutter.c
index 9681f10..04b13ea 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-2006 OpenLink Software
+ * 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
@@ -48,6 +48,7 @@ typedef struct cut_match_s
size_t cm_pattern_len;
int cm_flags;
int cm_score;
+ int cm_end_is_included;
const char *cm_replace;
size_t cm_replace_len;
} cut_match_t;
@@ -59,6 +60,7 @@ typedef struct cut_config_s
int cc_min_labels_score;
int cc_strip_trailing_whitespaces;
int cc_isql_norm;
+ int cc_keep_pragmas;
cut_match_t *cc_block_starts;
int cc_block_starts_count;
int cc_min_block_starts_score;
@@ -238,6 +240,10 @@ get_cut_name:
frag_end++;
goto get_cut_name;
}
+ if (env->ce_cfg.cc_keep_pragmas)
+ {
+ (tgt_lineidx_list_tail++)[0] = line_no-1;
+ }
continue;
plain_line:
if (cur_score >= env->ce_cfg.cc_min_labels_score)
@@ -372,6 +378,9 @@ search_for_hits:
ptrdiff_t hit_pos = cut_find_hit_position (curr_cm, line);
if (0 <= hit_pos)
{
+ if (curr_cm->cm_end_is_included)
+ block_end_lineidx_ptr = src_lineidx_list_tail;
+ else
block_end_lineidx_ptr = src_lineidx_list_tail-1;
goto block_done;
}
@@ -405,6 +414,40 @@ int strends (const char * haystack, const char * needle)
return (hlen >= nlen) && !strcmp (haystack+hlen-nlen, needle);
}
+void isql_norm_line_with_xxx (char *line)
+{
+ char *frag;
+ if (NULL != (frag = strstr (line, "parse error")))
+ {
+ strcpy (frag, "parse error");
+ }
+ else if (NULL != (frag = strstr (line, "syntax error")))
+ {
+ strcpy (frag, "parse error"); /* The string "parse error" is shorter than the string "syntax error" so the source is shortened safely */
+ } /* 012345678 */
+ if (NULL != (frag = strstr (line, "at line ")))
+ {
+ char *tail = frag + 8;
+ while (isdigit (tail[0])) tail++;
+ while (' ' == (tail[0])) tail++;
+ strcpy (frag, "at XXX ");
+ memmove (frag+7, tail, strlen (tail)+1);
+ } /* 0123456789 */
+ if (NULL != (frag = strstr (line, "at lines ")))
+ {
+ char *tail = frag + 9;
+ while (isdigit (tail[0])) tail++;
+ if ('-' == tail[0])
+ {
+ tail++;
+ while (isdigit (tail[0])) tail++;
+ }
+ while (' ' == (tail[0])) tail++;
+ strcpy (frag, "at XXX ");
+ memmove (frag+7, tail, strlen (tail)+1);
+ }
+}
+
void isql_norm (cut_env_t *env, int *src_lineidx_list, int *tgt_lineidx_list)
{
char **lines = env->ce_src.cb_lines;
@@ -415,35 +458,27 @@ again:
{
char *line = lines [src_lineidx_list_tail[0]];
char *frag;
-#if 0
+ isql_norm_line_with_xxx (line);
if (strbegins (line, "*** Error"))
{
char *line_scan;
+ int *li_scan_in, ctr;
int *li_scan = src_lineidx_list_tail + 1;
- if (li_scan[0] < 0)
- goto errmsg_ok;
- line_scan = lines [(li_scan++)[0]];
- if (strcmp (line_scan, "in"))
- goto errmsg_ok;
- while (li_scan[0] >= 0)
+ /* 012345678901234567 */
+ if (NULL != (frag = strstr (line, "[Virtuoso Server]")))
{
- line_scan = lines [li_scan[0]];
- if (strbegins (line_scan, "at line "))
- {
- (tgt_lineidx_list_tail++)[0] = (src_lineidx_list_tail++)[0];
- (tgt_lineidx_list_tail++)[0] = li_scan[0];
- src_lineidx_list_tail = li_scan + 1;
- goto again;
- }
- li_scan++;
+ char *tail = frag + 17;
+ while (' ' == (tail[0])) tail++;
+ strcpy (frag, "VS ");
+ memmove (frag+3, tail, strlen (tail)+1);
+ } /* 012345678901234567 */
+ if (NULL != (frag = strstr (line, "[Virtuoso Driver]")))
+ {
+ char *tail = frag + 17;
+ while (' ' == (tail[0])) tail++;
+ strcpy (frag, "VD ");
+ memmove (frag+3, tail, strlen (tail)+1);
}
- }
-#else
- if (strbegins (line, "*** Error"))
- {
- char *line_scan;
- int *li_scan_in, ctr;
- int *li_scan = src_lineidx_list_tail + 1;
ctr = 0;
for (;;)
{
@@ -461,18 +496,45 @@ again:
line_scan = lines [li_scan[0]];
if (strbegins (line_scan, "at line ") || strbegins (line_scan, "in lines"))
{
+ char *err_detail_line;
while (src_lineidx_list_tail < li_scan_in)
+ {
+ err_detail_line = lines [src_lineidx_list_tail[0]];
+ isql_norm_line_with_xxx (err_detail_line);
(tgt_lineidx_list_tail++)[0] = (src_lineidx_list_tail++)[0];
+ }
+#if 0
+ err_detail_line = lines [li_scan[0]];
+ isql_norm_line_with_xxx (err_detail_line);
(tgt_lineidx_list_tail++)[0] = li_scan[0];
src_lineidx_list_tail = li_scan + 1;
+#else
+ src_lineidx_list_tail = li_scan;
+#endif
goto again;
}
li_scan++;
}
}
-#endif
errmsg_ok:
-
+ if (strbegins (line, "Warning "))
+ {
+ /* 012345678901234567 */
+ if (NULL != (frag = strstr (line, "[Virtuoso Server]")))
+ {
+ char *tail = frag + 17;
+ while (' ' == (tail[0])) tail++;
+ strcpy (frag, "VS ");
+ memmove (frag+3, tail, strlen (tail)+1);
+ } /* 012345678901234567 */
+ if (NULL != (frag = strstr (line, "[Virtuoso Driver]")))
+ {
+ char *tail = frag + 17;
+ while (' ' == (tail[0])) tail++;
+ strcpy (frag, "VD ");
+ memmove (frag+3, tail, strlen (tail)+1);
+ }
+ }
if (!strcmp (line, "Type HELP; for help and EXIT; to exit.") ||
strbegins (line, "--#") ||
strbegins (line, "--src ") ||
@@ -481,15 +543,22 @@ errmsg_ok:
{
src_lineidx_list_tail++;
goto again;
- }
- if (NULL != (frag = strstr (line, "parse error")))
+ } /* 012345678 */
+ if (strbegins (line, "-- Line "))
{
- strcpy (frag, "parse error");
- }
- else if (NULL != (frag = strstr (line, "syntax error")))
+ char *tail = line + 8;
+ while (isdigit (tail[0])) tail++;
+ while (' ' == (tail[0])) tail++;
+ if (':' == tail[0])
{
- strcpy (frag, "parse error");
+ tail++;
+ while (' ' == tail[0]) tail++;
}
+ if ('\0' == tail[0])
+ line[2] = '\0';
+ else
+ memmove (line+3, tail, strlen (tail)+1);
+ } /* 012345678 */
else if (strends (line, " msec."))
{
char *lineend = line + strlen (line) - strlen (" msec.");
@@ -568,11 +637,17 @@ nextline: ;
fclose (f);
}
+void *malloc_zero (size_t sz)
+{
+ void *res = malloc (sz);
+ memset (res, sz, 0);
+ return res;
+}
int main (int argc, const char *argv[])
{
char *err = NULL;
- cut_env_t *env = malloc (sizeof (cut_env_t));
+ cut_env_t *env = malloc_zero (sizeof (cut_env_t));
int argctr = 1;
int score = 1;
int default_min_labels_score = 0;
@@ -588,17 +663,17 @@ int main (int argc, const char *argv[])
env->ce_tgt.cb_buf = NULL;
env->ce_src.cb_len = 0;
env->ce_tgt.cb_len = 0;
- env->ce_cfg.cc_labels = malloc (sizeof (cut_label_t) * argc);
+ env->ce_cfg.cc_labels = malloc_zero (sizeof (cut_label_t) * argc);
env->ce_cfg.cc_labels_count = 0;
- env->ce_cfg.cc_block_starts = malloc (sizeof (cut_match_t) * argc);
+ env->ce_cfg.cc_block_starts = malloc_zero (sizeof (cut_match_t) * argc);
env->ce_cfg.cc_block_starts_count = 0;
- env->ce_cfg.cc_block_hits = malloc (sizeof (cut_match_t) * argc);
+ env->ce_cfg.cc_block_hits = malloc_zero (sizeof (cut_match_t) * argc);
env->ce_cfg.cc_block_hits_count = 0;
- env->ce_cfg.cc_block_ends = malloc (sizeof (cut_match_t) * argc);
+ env->ce_cfg.cc_block_ends = malloc_zero (sizeof (cut_match_t) * argc);
env->ce_cfg.cc_block_ends_count = 0;
- env->ce_cfg.cc_repls = malloc (sizeof (cut_match_t) * argc);
+ env->ce_cfg.cc_repls = malloc_zero (sizeof (cut_match_t) * argc);
env->ce_cfg.cc_repls_count = 0;
- env->ce_cfg.cc_rlines = malloc (sizeof (cut_match_t) * argc);
+ env->ce_cfg.cc_rlines = malloc_zero (sizeof (cut_match_t) * argc);
env->ce_cfg.cc_rlines_count = 0;
while (argctr < argc)
@@ -659,6 +734,17 @@ int main (int argc, const char *argv[])
argctr += 2;
continue;
}
+ if (!strncmp ("-BE", argv[argctr],3) && (argctr < (argc-1)))
+ {
+ cut_match_t *new_cm = env->ce_cfg.cc_block_ends + env->ce_cfg.cc_block_ends_count++;
+ new_cm->cm_pattern = argv [argctr+1];
+ new_cm->cm_pattern_len = strlen (new_cm->cm_pattern);
+ new_cm->cm_flags = atoi (argv[argctr]+3);
+ new_cm->cm_end_is_included = 1;
+ new_cm->cm_score = 1;
+ argctr += 2;
+ continue;
+ }
if (!strcmp ("-N", argv[argctr]) && (argctr < (argc-1)))
{
env->ce_cfg.cc_min_labels_score = atoi (argv[argctr+1]);
@@ -708,6 +794,12 @@ int main (int argc, const char *argv[])
argctr += 1;
continue;
}
+ if (!strcmp ("-KP", argv[argctr]))
+ {
+ env->ce_cfg.cc_keep_pragmas = 1;
+ argctr += 1;
+ continue;
+ }
if (!strcmp ("-WS", argv[argctr]))
{
env->ce_cfg.cc_strip_trailing_whitespaces = 1;
@@ -807,10 +899,12 @@ usage:
"-N <integer>\tMinimal score of tags that makes the line valid\n"
"\n"
"-ISQL\tEdit the text to wipe out minor details of ISQL log\n"
+"-KP\tKeep #pragma begin/end lines (the default is to filter them out)\n"
"\n"
"-BS<flag> <pattern>\tAdd <pattern> with <flags> to scoring as block start\n"
"-BH<flag> <pattern>\tAdd <pattern> with <flags> to scoring as block hit\n"
-"-BT<flag> <pattern>\tAdd <pattern> with <flags> to scoring as block end\n"
+"-BE<flag> <pattern>\tAdd <pattern> with <flags> to scoring as block end\n"
+"-BT<flag> <pattern>\tSame as -BE but for first line past the end of block\n"
"-NBS <integer>\tMinimal score of block starts that makes the block valid\n"
"-NBH <integer>\tMinimal score of block hits that makes the block valid\n"
"\n"
@@ -833,7 +927,7 @@ usage:
"\n"
"Groups of lines may start with lines that match 'begin' patterns and end with\n"
"lines that match 'end' patterns; all lines of a group pass the 'block test' if\n"
-"the group contains sufficient number of likes that match 'hit' patterns.\n"
+"the group contains sufficient number of lines that match 'hit' patterns.\n"
"This let you extract blocks of program code.\n"
"\n"
"Lines with substrings like '#pragma begin <tag1>, <tag2>,... ,<tagN>'\n"
@@ -865,7 +959,7 @@ usage:
"filtered according to block rules.\n"
"\n"
"-ISQL normalizes the text if it's an output of ISQL client. The normalization\n"
-"\ntakes place after processing 'by pragmas' but before processing 'by blocks'.\n"
+"takes place after processing 'by pragmas' but before processing 'by blocks'.\n"
"\n"
"Search and replace is the last operation before writing the result.\n"
"First of all, whole lines are repalced (-RL options). Lines that are not\n"
diff --git a/binsrc/sqldoc/escape8bit.c b/binsrc/sqldoc/escape8bit.c
index 46a42b9..ffea3ed 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/sqldoc/functions.sql b/binsrc/sqldoc/functions.sql
index 0df804e..3e20248 100644
--- a/binsrc/sqldoc/functions.sql
+++ b/binsrc/sqldoc/functions.sql
@@ -1,10 +1,10 @@
--
--- $Id: functions.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/sqldoc/isql_log_normalize.c b/binsrc/sqldoc/isql_log_normalize.c
index 3471569..32bd769 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/sqldoc/mkfuncref.bat b/binsrc/sqldoc/mkfuncref.bat
index eac404a..52f590c 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-2006 OpenLink Software
+rem Copyright (C) 1998-2012 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 542b34f..ab8e54e 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/sqldoc/vspx_doc.sh b/binsrc/sqldoc/vspx_doc.sh
index 5b5978c..928ce93 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/sync/Makefile.am b/binsrc/sync/Makefile.am
index 9960a01..838ea96 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/sync/Makefile.in b/binsrc/sync/Makefile.in
index 3b581f6..9c30dfa 100644
--- a/binsrc/sync/Makefile.in
+++ b/binsrc/sync/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -71,7 +69,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
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 =
@@ -80,23 +77,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -186,7 +169,6 @@ 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@
@@ -270,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -291,7 +272,6 @@ 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@
@@ -328,14 +308,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sync/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/sync/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/sync/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/sync/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -353,7 +333,6 @@ $(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
@@ -363,23 +342,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -403,17 +379,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -445,7 +417,6 @@ clean-generic:
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"
@@ -464,8 +435,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -474,28 +443,18 @@ 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
@@ -536,7 +495,6 @@ syncml_dav.vad: $(EXTRA_DIST)
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/sync/drop.sql b/binsrc/sync/drop.sql
index 24fa45c..5955367 100644
--- a/binsrc/sync/drop.sql
+++ b/binsrc/sync/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/sync/make_vad.sh b/binsrc/sync/make_vad.sh
index 01f2e9c..996e577 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.3 2011/10/25 23:58:36 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -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-2011 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 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 3db8fc2..df8c60c 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-2006 OpenLink Software
+-- 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
@@ -19,7 +19,7 @@
--
--
--
--- $Id: sync.sql,v 1.1.1.1 2006/04/11 17:56:10 source Exp $
+-- $Id$
--
vhost_remove (lpath => '/sync');
diff --git a/binsrc/sync/sync.vsp b/binsrc/sync/sync.vsp
index 590ba8e..15fa761 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-2006 OpenLink Software
+-- 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
@@ -20,7 +20,7 @@
--
--
?>
-<!-- $Id: sync.vsp,v 1.1.1.1 2006/04/11 17:56:10 source Exp $ -->
+<!-- $Id$ -->
<?vsp
declare _accept varchar;
declare _req varchar;
diff --git a/binsrc/sync/syncml.sql b/binsrc/sync/syncml.sql
index 6a79b88..22e0fbe 100644
--- a/binsrc/sync/syncml.sql
+++ b/binsrc/sync/syncml.sql
@@ -1,10 +1,10 @@
--
--- $Id: syncml.sql,v 1.10.2.1 2011/09/12 10:55:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2011 OpenLink Software
+-- 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
diff --git a/binsrc/sync/syncml_drop.sql b/binsrc/sync/syncml_drop.sql
index 0fa89d1..eb2a92b 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.2 2011/10/25 23:58:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2011 OpenLink Software
+-- 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
diff --git a/binsrc/sync/wbxml.sql b/binsrc/sync/wbxml.sql
index b554f43..b7f3379 100644
--- a/binsrc/sync/wbxml.sql
+++ b/binsrc/sync/wbxml.sql
@@ -1,10 +1,10 @@
--
--- $Id: wbxml.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/Makefile.am b/binsrc/tests/Makefile.am
index 4df0a17..2736231 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/Makefile.in b/binsrc/tests/Makefile.in
index b250ed5..a241864 100644
--- a/binsrc/tests/Makefile.in
+++ b/binsrc/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -82,10 +80,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
@WITH_IODBC_TRUE at am__EXEEXT_1 = isql-iodbc$(EXEEXT) \
@WITH_IODBC_TRUE@ isqlw-iodbc$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@WITH_IODBC_TRUE at am__EXEEXT_2 = scroll-iodbc$(EXEEXT) \
@WITH_IODBC_TRUE@ ins-iodbc$(EXEEXT) getdata-iodbc$(EXEEXT) \
@WITH_IODBC_TRUE@ burstoff-iodbc$(EXEEXT) \
@@ -241,10 +239,9 @@ urlsimu_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_virtdriver_OBJECTS = virtdriver.$(OBJEXT) time.$(OBJEXT)
virtdriver_OBJECTS = $(am_virtdriver_OBJECTS)
virtdriver_DEPENDENCIES = $(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -285,38 +282,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
HEADERS = $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -404,7 +373,6 @@ 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@
@@ -488,7 +456,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -509,7 +476,6 @@ 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@
@@ -641,14 +607,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -666,59 +632,41 @@ $(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):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
M2$(EXEEXT): $(M2_OBJECTS) $(M2_DEPENDENCIES)
@rm -f M2$(EXEEXT)
$(LINK) $(M2_OBJECTS) $(M2_LDADD) $(LIBS)
@@ -869,287 +817,287 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
burstoff_iodbc-burstoff.o: burstoff.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(burstoff_iodbc_CFLAGS) $(CFLAGS) -MT burstoff_iodbc-burstoff.o -MD -MP -MF $(DEPDIR)/burstoff_iodbc-burstoff.Tpo -c -o burstoff_iodbc-burstoff.o `test -f 'burstoff.c' || echo '$(srcdir)/'`burstoff.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/burstoff_iodbc-burstoff.Tpo $(DEPDIR)/burstoff_iodbc-burstoff.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/burstoff_iodbc-burstoff.Tpo $(DEPDIR)/burstoff_iodbc-burstoff.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='burstoff.c' object='burstoff_iodbc-burstoff.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(burstoff_iodbc_CFLAGS) $(CFLAGS) -c -o burstoff_iodbc-burstoff.o `test -f 'burstoff.c' || echo '$(srcdir)/'`burstoff.c
burstoff_iodbc-burstoff.obj: burstoff.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(burstoff_iodbc_CFLAGS) $(CFLAGS) -MT burstoff_iodbc-burstoff.obj -MD -MP -MF $(DEPDIR)/burstoff_iodbc-burstoff.Tpo -c -o burstoff_iodbc-burstoff.obj `if test -f 'burstoff.c'; then $(CYGPATH_W) 'burstoff.c'; else $(CYGPATH_W) '$(srcdir)/burstoff.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/burstoff_iodbc-burstoff.Tpo $(DEPDIR)/burstoff_iodbc-burstoff.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/burstoff_iodbc-burstoff.Tpo $(DEPDIR)/burstoff_iodbc-burstoff.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='burstoff.c' object='burstoff_iodbc-burstoff.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(burstoff_iodbc_CFLAGS) $(CFLAGS) -c -o burstoff_iodbc-burstoff.obj `if test -f 'burstoff.c'; then $(CYGPATH_W) 'burstoff.c'; else $(CYGPATH_W) '$(srcdir)/burstoff.c'; fi`
force_dbms_name_iodbc-force_dbms_name.o: force_dbms_name.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(force_dbms_name_iodbc_CFLAGS) $(CFLAGS) -MT force_dbms_name_iodbc-force_dbms_name.o -MD -MP -MF $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Tpo -c -o force_dbms_name_iodbc-force_dbms_name.o `test -f 'force_dbms_name.c' || echo '$(srcdir)/'`force_dbms_name.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Tpo $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Tpo $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='force_dbms_name.c' object='force_dbms_name_iodbc-force_dbms_name.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(force_dbms_name_iodbc_CFLAGS) $(CFLAGS) -c -o force_dbms_name_iodbc-force_dbms_name.o `test -f 'force_dbms_name.c' || echo '$(srcdir)/'`force_dbms_name.c
force_dbms_name_iodbc-force_dbms_name.obj: force_dbms_name.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(force_dbms_name_iodbc_CFLAGS) $(CFLAGS) -MT force_dbms_name_iodbc-force_dbms_name.obj -MD -MP -MF $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Tpo -c -o force_dbms_name_iodbc-force_dbms_name.obj `if test -f 'force_dbms_name.c'; then $(CYGPATH_W) 'force_dbms_name.c'; else $(CYGPATH_W) '$(srcdir)/force_dbms_name.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Tpo $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Tpo $(DEPDIR)/force_dbms_name_iodbc-force_dbms_name.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='force_dbms_name.c' object='force_dbms_name_iodbc-force_dbms_name.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(force_dbms_name_iodbc_CFLAGS) $(CFLAGS) -c -o force_dbms_name_iodbc-force_dbms_name.obj `if test -f 'force_dbms_name.c'; then $(CYGPATH_W) 'force_dbms_name.c'; else $(CYGPATH_W) '$(srcdir)/force_dbms_name.c'; fi`
getdata_iodbc-getdata.o: getdata.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getdata_iodbc_CFLAGS) $(CFLAGS) -MT getdata_iodbc-getdata.o -MD -MP -MF $(DEPDIR)/getdata_iodbc-getdata.Tpo -c -o getdata_iodbc-getdata.o `test -f 'getdata.c' || echo '$(srcdir)/'`getdata.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/getdata_iodbc-getdata.Tpo $(DEPDIR)/getdata_iodbc-getdata.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/getdata_iodbc-getdata.Tpo $(DEPDIR)/getdata_iodbc-getdata.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getdata.c' object='getdata_iodbc-getdata.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getdata_iodbc_CFLAGS) $(CFLAGS) -c -o getdata_iodbc-getdata.o `test -f 'getdata.c' || echo '$(srcdir)/'`getdata.c
getdata_iodbc-getdata.obj: getdata.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getdata_iodbc_CFLAGS) $(CFLAGS) -MT getdata_iodbc-getdata.obj -MD -MP -MF $(DEPDIR)/getdata_iodbc-getdata.Tpo -c -o getdata_iodbc-getdata.obj `if test -f 'getdata.c'; then $(CYGPATH_W) 'getdata.c'; else $(CYGPATH_W) '$(srcdir)/getdata.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/getdata_iodbc-getdata.Tpo $(DEPDIR)/getdata_iodbc-getdata.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/getdata_iodbc-getdata.Tpo $(DEPDIR)/getdata_iodbc-getdata.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getdata.c' object='getdata_iodbc-getdata.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getdata_iodbc_CFLAGS) $(CFLAGS) -c -o getdata_iodbc-getdata.obj `if test -f 'getdata.c'; then $(CYGPATH_W) 'getdata.c'; else $(CYGPATH_W) '$(srcdir)/getdata.c'; fi`
inifile-inifile.o: inifile.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(inifile_CFLAGS) $(CFLAGS) -MT inifile-inifile.o -MD -MP -MF $(DEPDIR)/inifile-inifile.Tpo -c -o inifile-inifile.o `test -f 'inifile.c' || echo '$(srcdir)/'`inifile.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/inifile-inifile.Tpo $(DEPDIR)/inifile-inifile.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/inifile-inifile.Tpo $(DEPDIR)/inifile-inifile.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='inifile.c' object='inifile-inifile.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(inifile_CFLAGS) $(CFLAGS) -c -o inifile-inifile.o `test -f 'inifile.c' || echo '$(srcdir)/'`inifile.c
inifile-inifile.obj: inifile.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(inifile_CFLAGS) $(CFLAGS) -MT inifile-inifile.obj -MD -MP -MF $(DEPDIR)/inifile-inifile.Tpo -c -o inifile-inifile.obj `if test -f 'inifile.c'; then $(CYGPATH_W) 'inifile.c'; else $(CYGPATH_W) '$(srcdir)/inifile.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/inifile-inifile.Tpo $(DEPDIR)/inifile-inifile.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/inifile-inifile.Tpo $(DEPDIR)/inifile-inifile.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='inifile.c' object='inifile-inifile.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(inifile_CFLAGS) $(CFLAGS) -c -o inifile-inifile.obj `if test -f 'inifile.c'; then $(CYGPATH_W) 'inifile.c'; else $(CYGPATH_W) '$(srcdir)/inifile.c'; fi`
inifile-inifile.vers.o: inifile.vers.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(inifile_CFLAGS) $(CFLAGS) -MT inifile-inifile.vers.o -MD -MP -MF $(DEPDIR)/inifile-inifile.vers.Tpo -c -o inifile-inifile.vers.o `test -f 'inifile.vers.c' || echo '$(srcdir)/'`inifile.vers.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/inifile-inifile.vers.Tpo $(DEPDIR)/inifile-inifile.vers.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/inifile-inifile.vers.Tpo $(DEPDIR)/inifile-inifile.vers.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='inifile.vers.c' object='inifile-inifile.vers.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(inifile_CFLAGS) $(CFLAGS) -c -o inifile-inifile.vers.o `test -f 'inifile.vers.c' || echo '$(srcdir)/'`inifile.vers.c
inifile-inifile.vers.obj: inifile.vers.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(inifile_CFLAGS) $(CFLAGS) -MT inifile-inifile.vers.obj -MD -MP -MF $(DEPDIR)/inifile-inifile.vers.Tpo -c -o inifile-inifile.vers.obj `if test -f 'inifile.vers.c'; then $(CYGPATH_W) 'inifile.vers.c'; else $(CYGPATH_W) '$(srcdir)/inifile.vers.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/inifile-inifile.vers.Tpo $(DEPDIR)/inifile-inifile.vers.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/inifile-inifile.vers.Tpo $(DEPDIR)/inifile-inifile.vers.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='inifile.vers.c' object='inifile-inifile.vers.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(inifile_CFLAGS) $(CFLAGS) -c -o inifile-inifile.vers.obj `if test -f 'inifile.vers.c'; then $(CYGPATH_W) 'inifile.vers.c'; else $(CYGPATH_W) '$(srcdir)/inifile.vers.c'; fi`
ins_iodbc-ins.o: ins.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ins_iodbc_CFLAGS) $(CFLAGS) -MT ins_iodbc-ins.o -MD -MP -MF $(DEPDIR)/ins_iodbc-ins.Tpo -c -o ins_iodbc-ins.o `test -f 'ins.c' || echo '$(srcdir)/'`ins.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ins_iodbc-ins.Tpo $(DEPDIR)/ins_iodbc-ins.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ins_iodbc-ins.Tpo $(DEPDIR)/ins_iodbc-ins.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ins.c' object='ins_iodbc-ins.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ins_iodbc_CFLAGS) $(CFLAGS) -c -o ins_iodbc-ins.o `test -f 'ins.c' || echo '$(srcdir)/'`ins.c
ins_iodbc-ins.obj: ins.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ins_iodbc_CFLAGS) $(CFLAGS) -MT ins_iodbc-ins.obj -MD -MP -MF $(DEPDIR)/ins_iodbc-ins.Tpo -c -o ins_iodbc-ins.obj `if test -f 'ins.c'; then $(CYGPATH_W) 'ins.c'; else $(CYGPATH_W) '$(srcdir)/ins.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ins_iodbc-ins.Tpo $(DEPDIR)/ins_iodbc-ins.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ins_iodbc-ins.Tpo $(DEPDIR)/ins_iodbc-ins.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ins.c' object='ins_iodbc-ins.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ins_iodbc_CFLAGS) $(CFLAGS) -c -o ins_iodbc-ins.obj `if test -f 'ins.c'; then $(CYGPATH_W) 'ins.c'; else $(CYGPATH_W) '$(srcdir)/ins.c'; fi`
ins_iodbc-time.o: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ins_iodbc_CFLAGS) $(CFLAGS) -MT ins_iodbc-time.o -MD -MP -MF $(DEPDIR)/ins_iodbc-time.Tpo -c -o ins_iodbc-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ins_iodbc-time.Tpo $(DEPDIR)/ins_iodbc-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ins_iodbc-time.Tpo $(DEPDIR)/ins_iodbc-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='ins_iodbc-time.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ins_iodbc_CFLAGS) $(CFLAGS) -c -o ins_iodbc-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
ins_iodbc-time.obj: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ins_iodbc_CFLAGS) $(CFLAGS) -MT ins_iodbc-time.obj -MD -MP -MF $(DEPDIR)/ins_iodbc-time.Tpo -c -o ins_iodbc-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ins_iodbc-time.Tpo $(DEPDIR)/ins_iodbc-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ins_iodbc-time.Tpo $(DEPDIR)/ins_iodbc-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='ins_iodbc-time.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ins_iodbc_CFLAGS) $(CFLAGS) -c -o ins_iodbc-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
isql-isql.o: isql.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_CFLAGS) $(CFLAGS) -MT isql-isql.o -MD -MP -MF $(DEPDIR)/isql-isql.Tpo -c -o isql-isql.o `test -f 'isql.c' || echo '$(srcdir)/'`isql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isql-isql.Tpo $(DEPDIR)/isql-isql.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isql-isql.Tpo $(DEPDIR)/isql-isql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql.c' object='isql-isql.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_CFLAGS) $(CFLAGS) -c -o isql-isql.o `test -f 'isql.c' || echo '$(srcdir)/'`isql.c
isql-isql.obj: isql.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_CFLAGS) $(CFLAGS) -MT isql-isql.obj -MD -MP -MF $(DEPDIR)/isql-isql.Tpo -c -o isql-isql.obj `if test -f 'isql.c'; then $(CYGPATH_W) 'isql.c'; else $(CYGPATH_W) '$(srcdir)/isql.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isql-isql.Tpo $(DEPDIR)/isql-isql.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isql-isql.Tpo $(DEPDIR)/isql-isql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql.c' object='isql-isql.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_CFLAGS) $(CFLAGS) -c -o isql-isql.obj `if test -f 'isql.c'; then $(CYGPATH_W) 'isql.c'; else $(CYGPATH_W) '$(srcdir)/isql.c'; fi`
isql-time.o: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_CFLAGS) $(CFLAGS) -MT isql-time.o -MD -MP -MF $(DEPDIR)/isql-time.Tpo -c -o isql-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isql-time.Tpo $(DEPDIR)/isql-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isql-time.Tpo $(DEPDIR)/isql-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='isql-time.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_CFLAGS) $(CFLAGS) -c -o isql-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
isql-time.obj: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_CFLAGS) $(CFLAGS) -MT isql-time.obj -MD -MP -MF $(DEPDIR)/isql-time.Tpo -c -o isql-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isql-time.Tpo $(DEPDIR)/isql-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isql-time.Tpo $(DEPDIR)/isql-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='isql-time.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_CFLAGS) $(CFLAGS) -c -o isql-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
isql_iodbc-isql.o: isql.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_iodbc_CFLAGS) $(CFLAGS) -MT isql_iodbc-isql.o -MD -MP -MF $(DEPDIR)/isql_iodbc-isql.Tpo -c -o isql_iodbc-isql.o `test -f 'isql.c' || echo '$(srcdir)/'`isql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isql_iodbc-isql.Tpo $(DEPDIR)/isql_iodbc-isql.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isql_iodbc-isql.Tpo $(DEPDIR)/isql_iodbc-isql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql.c' object='isql_iodbc-isql.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_iodbc_CFLAGS) $(CFLAGS) -c -o isql_iodbc-isql.o `test -f 'isql.c' || echo '$(srcdir)/'`isql.c
isql_iodbc-isql.obj: isql.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_iodbc_CFLAGS) $(CFLAGS) -MT isql_iodbc-isql.obj -MD -MP -MF $(DEPDIR)/isql_iodbc-isql.Tpo -c -o isql_iodbc-isql.obj `if test -f 'isql.c'; then $(CYGPATH_W) 'isql.c'; else $(CYGPATH_W) '$(srcdir)/isql.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isql_iodbc-isql.Tpo $(DEPDIR)/isql_iodbc-isql.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isql_iodbc-isql.Tpo $(DEPDIR)/isql_iodbc-isql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql.c' object='isql_iodbc-isql.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_iodbc_CFLAGS) $(CFLAGS) -c -o isql_iodbc-isql.obj `if test -f 'isql.c'; then $(CYGPATH_W) 'isql.c'; else $(CYGPATH_W) '$(srcdir)/isql.c'; fi`
isql_iodbc-time.o: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_iodbc_CFLAGS) $(CFLAGS) -MT isql_iodbc-time.o -MD -MP -MF $(DEPDIR)/isql_iodbc-time.Tpo -c -o isql_iodbc-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isql_iodbc-time.Tpo $(DEPDIR)/isql_iodbc-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isql_iodbc-time.Tpo $(DEPDIR)/isql_iodbc-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='isql_iodbc-time.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_iodbc_CFLAGS) $(CFLAGS) -c -o isql_iodbc-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
isql_iodbc-time.obj: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_iodbc_CFLAGS) $(CFLAGS) -MT isql_iodbc-time.obj -MD -MP -MF $(DEPDIR)/isql_iodbc-time.Tpo -c -o isql_iodbc-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isql_iodbc-time.Tpo $(DEPDIR)/isql_iodbc-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isql_iodbc-time.Tpo $(DEPDIR)/isql_iodbc-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='isql_iodbc-time.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isql_iodbc_CFLAGS) $(CFLAGS) -c -o isql_iodbc-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
isqlw-isql.o: isql.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -MT isqlw-isql.o -MD -MP -MF $(DEPDIR)/isqlw-isql.Tpo -c -o isqlw-isql.o `test -f 'isql.c' || echo '$(srcdir)/'`isql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw-isql.Tpo $(DEPDIR)/isqlw-isql.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw-isql.Tpo $(DEPDIR)/isqlw-isql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql.c' object='isqlw-isql.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -c -o isqlw-isql.o `test -f 'isql.c' || echo '$(srcdir)/'`isql.c
isqlw-isql.obj: isql.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -MT isqlw-isql.obj -MD -MP -MF $(DEPDIR)/isqlw-isql.Tpo -c -o isqlw-isql.obj `if test -f 'isql.c'; then $(CYGPATH_W) 'isql.c'; else $(CYGPATH_W) '$(srcdir)/isql.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw-isql.Tpo $(DEPDIR)/isqlw-isql.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw-isql.Tpo $(DEPDIR)/isqlw-isql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql.c' object='isqlw-isql.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -c -o isqlw-isql.obj `if test -f 'isql.c'; then $(CYGPATH_W) 'isql.c'; else $(CYGPATH_W) '$(srcdir)/isql.c'; fi`
isqlw-time.o: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -MT isqlw-time.o -MD -MP -MF $(DEPDIR)/isqlw-time.Tpo -c -o isqlw-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw-time.Tpo $(DEPDIR)/isqlw-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw-time.Tpo $(DEPDIR)/isqlw-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='isqlw-time.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -c -o isqlw-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
isqlw-time.obj: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -MT isqlw-time.obj -MD -MP -MF $(DEPDIR)/isqlw-time.Tpo -c -o isqlw-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw-time.Tpo $(DEPDIR)/isqlw-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw-time.Tpo $(DEPDIR)/isqlw-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='isqlw-time.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -c -o isqlw-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
isqlw-isql_wfuncs.o: isql_wfuncs.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -MT isqlw-isql_wfuncs.o -MD -MP -MF $(DEPDIR)/isqlw-isql_wfuncs.Tpo -c -o isqlw-isql_wfuncs.o `test -f 'isql_wfuncs.c' || echo '$(srcdir)/'`isql_wfuncs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw-isql_wfuncs.Tpo $(DEPDIR)/isqlw-isql_wfuncs.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw-isql_wfuncs.Tpo $(DEPDIR)/isqlw-isql_wfuncs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql_wfuncs.c' object='isqlw-isql_wfuncs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -c -o isqlw-isql_wfuncs.o `test -f 'isql_wfuncs.c' || echo '$(srcdir)/'`isql_wfuncs.c
isqlw-isql_wfuncs.obj: isql_wfuncs.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -MT isqlw-isql_wfuncs.obj -MD -MP -MF $(DEPDIR)/isqlw-isql_wfuncs.Tpo -c -o isqlw-isql_wfuncs.obj `if test -f 'isql_wfuncs.c'; then $(CYGPATH_W) 'isql_wfuncs.c'; else $(CYGPATH_W) '$(srcdir)/isql_wfuncs.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw-isql_wfuncs.Tpo $(DEPDIR)/isqlw-isql_wfuncs.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw-isql_wfuncs.Tpo $(DEPDIR)/isqlw-isql_wfuncs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql_wfuncs.c' object='isqlw-isql_wfuncs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_CFLAGS) $(CFLAGS) -c -o isqlw-isql_wfuncs.obj `if test -f 'isql_wfuncs.c'; then $(CYGPATH_W) 'isql_wfuncs.c'; else $(CYGPATH_W) '$(srcdir)/isql_wfuncs.c'; fi`
isqlw_iodbc-isql.o: isql.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -MT isqlw_iodbc-isql.o -MD -MP -MF $(DEPDIR)/isqlw_iodbc-isql.Tpo -c -o isqlw_iodbc-isql.o `test -f 'isql.c' || echo '$(srcdir)/'`isql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw_iodbc-isql.Tpo $(DEPDIR)/isqlw_iodbc-isql.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw_iodbc-isql.Tpo $(DEPDIR)/isqlw_iodbc-isql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql.c' object='isqlw_iodbc-isql.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -c -o isqlw_iodbc-isql.o `test -f 'isql.c' || echo '$(srcdir)/'`isql.c
isqlw_iodbc-isql.obj: isql.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -MT isqlw_iodbc-isql.obj -MD -MP -MF $(DEPDIR)/isqlw_iodbc-isql.Tpo -c -o isqlw_iodbc-isql.obj `if test -f 'isql.c'; then $(CYGPATH_W) 'isql.c'; else $(CYGPATH_W) '$(srcdir)/isql.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw_iodbc-isql.Tpo $(DEPDIR)/isqlw_iodbc-isql.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw_iodbc-isql.Tpo $(DEPDIR)/isqlw_iodbc-isql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql.c' object='isqlw_iodbc-isql.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -c -o isqlw_iodbc-isql.obj `if test -f 'isql.c'; then $(CYGPATH_W) 'isql.c'; else $(CYGPATH_W) '$(srcdir)/isql.c'; fi`
isqlw_iodbc-time.o: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -MT isqlw_iodbc-time.o -MD -MP -MF $(DEPDIR)/isqlw_iodbc-time.Tpo -c -o isqlw_iodbc-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw_iodbc-time.Tpo $(DEPDIR)/isqlw_iodbc-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw_iodbc-time.Tpo $(DEPDIR)/isqlw_iodbc-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='isqlw_iodbc-time.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -c -o isqlw_iodbc-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
isqlw_iodbc-time.obj: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -MT isqlw_iodbc-time.obj -MD -MP -MF $(DEPDIR)/isqlw_iodbc-time.Tpo -c -o isqlw_iodbc-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw_iodbc-time.Tpo $(DEPDIR)/isqlw_iodbc-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw_iodbc-time.Tpo $(DEPDIR)/isqlw_iodbc-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='isqlw_iodbc-time.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -c -o isqlw_iodbc-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
isqlw_iodbc-isql_wfuncs.o: isql_wfuncs.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -MT isqlw_iodbc-isql_wfuncs.o -MD -MP -MF $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Tpo -c -o isqlw_iodbc-isql_wfuncs.o `test -f 'isql_wfuncs.c' || echo '$(srcdir)/'`isql_wfuncs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Tpo $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Tpo $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql_wfuncs.c' object='isqlw_iodbc-isql_wfuncs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -c -o isqlw_iodbc-isql_wfuncs.o `test -f 'isql_wfuncs.c' || echo '$(srcdir)/'`isql_wfuncs.c
isqlw_iodbc-isql_wfuncs.obj: isql_wfuncs.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -MT isqlw_iodbc-isql_wfuncs.obj -MD -MP -MF $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Tpo -c -o isqlw_iodbc-isql_wfuncs.obj `if test -f 'isql_wfuncs.c'; then $(CYGPATH_W) 'isql_wfuncs.c'; else $(CYGPATH_W) '$(srcdir)/isql_wfuncs.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Tpo $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Tpo $(DEPDIR)/isqlw_iodbc-isql_wfuncs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='isql_wfuncs.c' object='isqlw_iodbc-isql_wfuncs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(isqlw_iodbc_CFLAGS) $(CFLAGS) -c -o isqlw_iodbc-isql_wfuncs.obj `if test -f 'isql_wfuncs.c'; then $(CYGPATH_W) 'isql_wfuncs.c'; else $(CYGPATH_W) '$(srcdir)/isql_wfuncs.c'; fi`
scroll_iodbc-scroll.o: scroll.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scroll_iodbc_CFLAGS) $(CFLAGS) -MT scroll_iodbc-scroll.o -MD -MP -MF $(DEPDIR)/scroll_iodbc-scroll.Tpo -c -o scroll_iodbc-scroll.o `test -f 'scroll.c' || echo '$(srcdir)/'`scroll.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/scroll_iodbc-scroll.Tpo $(DEPDIR)/scroll_iodbc-scroll.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/scroll_iodbc-scroll.Tpo $(DEPDIR)/scroll_iodbc-scroll.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='scroll.c' object='scroll_iodbc-scroll.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scroll_iodbc_CFLAGS) $(CFLAGS) -c -o scroll_iodbc-scroll.o `test -f 'scroll.c' || echo '$(srcdir)/'`scroll.c
scroll_iodbc-scroll.obj: scroll.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scroll_iodbc_CFLAGS) $(CFLAGS) -MT scroll_iodbc-scroll.obj -MD -MP -MF $(DEPDIR)/scroll_iodbc-scroll.Tpo -c -o scroll_iodbc-scroll.obj `if test -f 'scroll.c'; then $(CYGPATH_W) 'scroll.c'; else $(CYGPATH_W) '$(srcdir)/scroll.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/scroll_iodbc-scroll.Tpo $(DEPDIR)/scroll_iodbc-scroll.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/scroll_iodbc-scroll.Tpo $(DEPDIR)/scroll_iodbc-scroll.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='scroll.c' object='scroll_iodbc-scroll.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scroll_iodbc_CFLAGS) $(CFLAGS) -c -o scroll_iodbc-scroll.obj `if test -f 'scroll.c'; then $(CYGPATH_W) 'scroll.c'; else $(CYGPATH_W) '$(srcdir)/scroll.c'; fi`
scroll_iodbc-time.o: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scroll_iodbc_CFLAGS) $(CFLAGS) -MT scroll_iodbc-time.o -MD -MP -MF $(DEPDIR)/scroll_iodbc-time.Tpo -c -o scroll_iodbc-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/scroll_iodbc-time.Tpo $(DEPDIR)/scroll_iodbc-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/scroll_iodbc-time.Tpo $(DEPDIR)/scroll_iodbc-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='scroll_iodbc-time.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scroll_iodbc_CFLAGS) $(CFLAGS) -c -o scroll_iodbc-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
scroll_iodbc-time.obj: time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scroll_iodbc_CFLAGS) $(CFLAGS) -MT scroll_iodbc-time.obj -MD -MP -MF $(DEPDIR)/scroll_iodbc-time.Tpo -c -o scroll_iodbc-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/scroll_iodbc-time.Tpo $(DEPDIR)/scroll_iodbc-time.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/scroll_iodbc-time.Tpo $(DEPDIR)/scroll_iodbc-time.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='time.c' object='scroll_iodbc-time.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scroll_iodbc_CFLAGS) $(CFLAGS) -c -o scroll_iodbc-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
@@ -1167,7 +1115,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -1184,7 +1132,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -1192,7 +1140,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -1218,16 +1166,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -1235,14 +1183,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -1254,43 +1202,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1311,44 +1255,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -1381,7 +1310,6 @@ clean-generic:
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"
@@ -1403,8 +1331,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -1413,28 +1339,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am: install-binPROGRAMS
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -1457,8 +1373,8 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-binPROGRAMS \
@@ -1479,7 +1395,6 @@ uninstall-am: uninstall-binPROGRAMS
inifile.vers.c:
$(MAKEVER) -o inifile.vers.c -p "Ini file configuration utility" -v 1.4
-
# 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/tests/b3078.c b/binsrc/tests/b3078.c
index a878bac..a45ed9b 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/Makefile.am b/binsrc/tests/biftest/Makefile.am
index 8d42379..b569944 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/biftest/Makefile.in b/binsrc/tests/biftest/Makefile.in
index fb85177..1bb9c44 100644
--- a/binsrc/tests/biftest/Makefile.in
+++ b/binsrc/tests/biftest/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,10 +70,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
@INTEG_JDK_TRUE at am__EXEEXT_1 = virtuoso-javavm-t$(EXEEXT)
@INTEG_JDK_TRUE@@WITH_IODBC_TRUE at am__EXEEXT_2 = virtuoso-iodbc-javavm_t$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@WITH_IODBC_TRUE at am__EXEEXT_3 = virtuoso-iodbc-sample-t$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_virtuoso_iodbc_javavm_t_OBJECTS = \
@@ -123,10 +121,9 @@ virtuoso_sample_t_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(virtuoso_sample_t_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -144,8 +141,6 @@ DIST_SOURCES = $(virtuoso_iodbc_javavm_t_SOURCES) \
$(virtuoso_javavm_t_SOURCES) $(virtuoso_sample_t_SOURCES)
ETAGS = etags
CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -234,7 +229,6 @@ 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@
@@ -318,7 +312,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -339,7 +332,6 @@ 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@
@@ -450,14 +442,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/biftest/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/biftest/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/biftest/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/biftest/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -475,59 +467,41 @@ $(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):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
virtuoso-iodbc-javavm_t$(EXEEXT): $(virtuoso_iodbc_javavm_t_OBJECTS) $(virtuoso_iodbc_javavm_t_DEPENDENCIES)
@rm -f virtuoso-iodbc-javavm_t$(EXEEXT)
$(virtuoso_iodbc_javavm_t_LINK) $(virtuoso_iodbc_javavm_t_OBJECTS) $(virtuoso_iodbc_javavm_t_LDADD) $(LIBS)
@@ -562,189 +536,189 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
virtuoso_iodbc_javavm_t-javavm.o: javavm.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-javavm.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Tpo -c -o virtuoso_iodbc_javavm_t-javavm.o `test -f 'javavm.c' || echo '$(srcdir)/'`javavm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='javavm.c' object='virtuoso_iodbc_javavm_t-javavm.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-javavm.o `test -f 'javavm.c' || echo '$(srcdir)/'`javavm.c
virtuoso_iodbc_javavm_t-javavm.obj: javavm.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-javavm.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Tpo -c -o virtuoso_iodbc_javavm_t-javavm.obj `if test -f 'javavm.c'; then $(CYGPATH_W) 'javavm.c'; else $(CYGPATH_W) '$(srcdir)/javavm.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-javavm.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='javavm.c' object='virtuoso_iodbc_javavm_t-javavm.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-javavm.obj `if test -f 'javavm.c'; then $(CYGPATH_W) 'javavm.c'; else $(CYGPATH_W) '$(srcdir)/javavm.c'; fi`
virtuoso_iodbc_javavm_t-sql_code_javavm.o: sql_code_javavm.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-sql_code_javavm.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Tpo -c -o virtuoso_iodbc_javavm_t-sql_code_javavm.o `test -f 'sql_code_javavm.c' || echo '$(srcdir)/'`sql_code_javavm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_javavm.c' object='virtuoso_iodbc_javavm_t-sql_code_javavm.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-sql_code_javavm.o `test -f 'sql_code_javavm.c' || echo '$(srcdir)/'`sql_code_javavm.c
virtuoso_iodbc_javavm_t-sql_code_javavm.obj: sql_code_javavm.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-sql_code_javavm.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Tpo -c -o virtuoso_iodbc_javavm_t-sql_code_javavm.obj `if test -f 'sql_code_javavm.c'; then $(CYGPATH_W) 'sql_code_javavm.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_javavm.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_javavm.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_javavm.c' object='virtuoso_iodbc_javavm_t-sql_code_javavm.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-sql_code_javavm.obj `if test -f 'sql_code_javavm.c'; then $(CYGPATH_W) 'sql_code_javavm.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_javavm.c'; fi`
virtuoso_iodbc_javavm_t-java_code.o: java_code.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-java_code.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Tpo -c -o virtuoso_iodbc_javavm_t-java_code.o `test -f 'java_code.c' || echo '$(srcdir)/'`java_code.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='java_code.c' object='virtuoso_iodbc_javavm_t-java_code.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-java_code.o `test -f 'java_code.c' || echo '$(srcdir)/'`java_code.c
virtuoso_iodbc_javavm_t-java_code.obj: java_code.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-java_code.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Tpo -c -o virtuoso_iodbc_javavm_t-java_code.obj `if test -f 'java_code.c'; then $(CYGPATH_W) 'java_code.c'; else $(CYGPATH_W) '$(srcdir)/java_code.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-java_code.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='java_code.c' object='virtuoso_iodbc_javavm_t-java_code.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-java_code.obj `if test -f 'java_code.c'; then $(CYGPATH_W) 'java_code.c'; else $(CYGPATH_W) '$(srcdir)/java_code.c'; fi`
virtuoso_iodbc_javavm_t-sql_code_clr.o: sql_code_clr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-sql_code_clr.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Tpo -c -o virtuoso_iodbc_javavm_t-sql_code_clr.o `test -f 'sql_code_clr.c' || echo '$(srcdir)/'`sql_code_clr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_clr.c' object='virtuoso_iodbc_javavm_t-sql_code_clr.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-sql_code_clr.o `test -f 'sql_code_clr.c' || echo '$(srcdir)/'`sql_code_clr.c
virtuoso_iodbc_javavm_t-sql_code_clr.obj: sql_code_clr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-sql_code_clr.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Tpo -c -o virtuoso_iodbc_javavm_t-sql_code_clr.obj `if test -f 'sql_code_clr.c'; then $(CYGPATH_W) 'sql_code_clr.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_clr.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_clr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_clr.c' object='virtuoso_iodbc_javavm_t-sql_code_clr.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-sql_code_clr.obj `if test -f 'sql_code_clr.c'; then $(CYGPATH_W) 'sql_code_clr.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_clr.c'; fi`
virtuoso_iodbc_javavm_t-sql_code_xslt.o: sql_code_xslt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-sql_code_xslt.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Tpo -c -o virtuoso_iodbc_javavm_t-sql_code_xslt.o `test -f 'sql_code_xslt.c' || echo '$(srcdir)/'`sql_code_xslt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_xslt.c' object='virtuoso_iodbc_javavm_t-sql_code_xslt.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-sql_code_xslt.o `test -f 'sql_code_xslt.c' || echo '$(srcdir)/'`sql_code_xslt.c
virtuoso_iodbc_javavm_t-sql_code_xslt.obj: sql_code_xslt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_javavm_t-sql_code_xslt.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Tpo -c -o virtuoso_iodbc_javavm_t-sql_code_xslt.obj `if test -f 'sql_code_xslt.c'; then $(CYGPATH_W) 'sql_code_xslt.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_xslt.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_iodbc_javavm_t-sql_code_xslt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_xslt.c' object='virtuoso_iodbc_javavm_t-sql_code_xslt.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_javavm_t-sql_code_xslt.obj `if test -f 'sql_code_xslt.c'; then $(CYGPATH_W) 'sql_code_xslt.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_xslt.c'; fi`
virtuoso_iodbc_sample_t-bif_sample.o: bif_sample.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_sample_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_sample_t-bif_sample.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Tpo -c -o virtuoso_iodbc_sample_t-bif_sample.o `test -f 'bif_sample.c' || echo '$(srcdir)/'`bif_sample.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Tpo $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Tpo $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_sample.c' object='virtuoso_iodbc_sample_t-bif_sample.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_sample_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_sample_t-bif_sample.o `test -f 'bif_sample.c' || echo '$(srcdir)/'`bif_sample.c
virtuoso_iodbc_sample_t-bif_sample.obj: bif_sample.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_sample_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_sample_t-bif_sample.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Tpo -c -o virtuoso_iodbc_sample_t-bif_sample.obj `if test -f 'bif_sample.c'; then $(CYGPATH_W) 'bif_sample.c'; else $(CYGPATH_W) '$(srcdir)/bif_sample.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Tpo $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Tpo $(DEPDIR)/virtuoso_iodbc_sample_t-bif_sample.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_sample.c' object='virtuoso_iodbc_sample_t-bif_sample.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_sample_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_sample_t-bif_sample.obj `if test -f 'bif_sample.c'; then $(CYGPATH_W) 'bif_sample.c'; else $(CYGPATH_W) '$(srcdir)/bif_sample.c'; fi`
virtuoso_javavm_t-javavm.o: javavm.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-javavm.o -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-javavm.Tpo -c -o virtuoso_javavm_t-javavm.o `test -f 'javavm.c' || echo '$(srcdir)/'`javavm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-javavm.Tpo $(DEPDIR)/virtuoso_javavm_t-javavm.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-javavm.Tpo $(DEPDIR)/virtuoso_javavm_t-javavm.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='javavm.c' object='virtuoso_javavm_t-javavm.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-javavm.o `test -f 'javavm.c' || echo '$(srcdir)/'`javavm.c
virtuoso_javavm_t-javavm.obj: javavm.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-javavm.obj -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-javavm.Tpo -c -o virtuoso_javavm_t-javavm.obj `if test -f 'javavm.c'; then $(CYGPATH_W) 'javavm.c'; else $(CYGPATH_W) '$(srcdir)/javavm.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-javavm.Tpo $(DEPDIR)/virtuoso_javavm_t-javavm.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-javavm.Tpo $(DEPDIR)/virtuoso_javavm_t-javavm.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='javavm.c' object='virtuoso_javavm_t-javavm.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-javavm.obj `if test -f 'javavm.c'; then $(CYGPATH_W) 'javavm.c'; else $(CYGPATH_W) '$(srcdir)/javavm.c'; fi`
virtuoso_javavm_t-sql_code_javavm.o: sql_code_javavm.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-sql_code_javavm.o -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Tpo -c -o virtuoso_javavm_t-sql_code_javavm.o `test -f 'sql_code_javavm.c' || echo '$(srcdir)/'`sql_code_javavm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_javavm.c' object='virtuoso_javavm_t-sql_code_javavm.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-sql_code_javavm.o `test -f 'sql_code_javavm.c' || echo '$(srcdir)/'`sql_code_javavm.c
virtuoso_javavm_t-sql_code_javavm.obj: sql_code_javavm.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-sql_code_javavm.obj -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Tpo -c -o virtuoso_javavm_t-sql_code_javavm.obj `if test -f 'sql_code_javavm.c'; then $(CYGPATH_W) 'sql_code_javavm.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_javavm.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_javavm.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_javavm.c' object='virtuoso_javavm_t-sql_code_javavm.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-sql_code_javavm.obj `if test -f 'sql_code_javavm.c'; then $(CYGPATH_W) 'sql_code_javavm.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_javavm.c'; fi`
virtuoso_javavm_t-java_code.o: java_code.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-java_code.o -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-java_code.Tpo -c -o virtuoso_javavm_t-java_code.o `test -f 'java_code.c' || echo '$(srcdir)/'`java_code.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-java_code.Tpo $(DEPDIR)/virtuoso_javavm_t-java_code.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-java_code.Tpo $(DEPDIR)/virtuoso_javavm_t-java_code.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='java_code.c' object='virtuoso_javavm_t-java_code.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-java_code.o `test -f 'java_code.c' || echo '$(srcdir)/'`java_code.c
virtuoso_javavm_t-java_code.obj: java_code.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-java_code.obj -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-java_code.Tpo -c -o virtuoso_javavm_t-java_code.obj `if test -f 'java_code.c'; then $(CYGPATH_W) 'java_code.c'; else $(CYGPATH_W) '$(srcdir)/java_code.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-java_code.Tpo $(DEPDIR)/virtuoso_javavm_t-java_code.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-java_code.Tpo $(DEPDIR)/virtuoso_javavm_t-java_code.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='java_code.c' object='virtuoso_javavm_t-java_code.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-java_code.obj `if test -f 'java_code.c'; then $(CYGPATH_W) 'java_code.c'; else $(CYGPATH_W) '$(srcdir)/java_code.c'; fi`
virtuoso_javavm_t-sql_code_clr.o: sql_code_clr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-sql_code_clr.o -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Tpo -c -o virtuoso_javavm_t-sql_code_clr.o `test -f 'sql_code_clr.c' || echo '$(srcdir)/'`sql_code_clr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_clr.c' object='virtuoso_javavm_t-sql_code_clr.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-sql_code_clr.o `test -f 'sql_code_clr.c' || echo '$(srcdir)/'`sql_code_clr.c
virtuoso_javavm_t-sql_code_clr.obj: sql_code_clr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-sql_code_clr.obj -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Tpo -c -o virtuoso_javavm_t-sql_code_clr.obj `if test -f 'sql_code_clr.c'; then $(CYGPATH_W) 'sql_code_clr.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_clr.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_clr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_clr.c' object='virtuoso_javavm_t-sql_code_clr.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-sql_code_clr.obj `if test -f 'sql_code_clr.c'; then $(CYGPATH_W) 'sql_code_clr.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_clr.c'; fi`
virtuoso_javavm_t-sql_code_xslt.o: sql_code_xslt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-sql_code_xslt.o -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Tpo -c -o virtuoso_javavm_t-sql_code_xslt.o `test -f 'sql_code_xslt.c' || echo '$(srcdir)/'`sql_code_xslt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_xslt.c' object='virtuoso_javavm_t-sql_code_xslt.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-sql_code_xslt.o `test -f 'sql_code_xslt.c' || echo '$(srcdir)/'`sql_code_xslt.c
virtuoso_javavm_t-sql_code_xslt.obj: sql_code_xslt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -MT virtuoso_javavm_t-sql_code_xslt.obj -MD -MP -MF $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Tpo -c -o virtuoso_javavm_t-sql_code_xslt.obj `if test -f 'sql_code_xslt.c'; then $(CYGPATH_W) 'sql_code_xslt.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_xslt.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Tpo $(DEPDIR)/virtuoso_javavm_t-sql_code_xslt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_xslt.c' object='virtuoso_javavm_t-sql_code_xslt.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_javavm_t_CFLAGS) $(CFLAGS) -c -o virtuoso_javavm_t-sql_code_xslt.obj `if test -f 'sql_code_xslt.c'; then $(CYGPATH_W) 'sql_code_xslt.c'; else $(CYGPATH_W) '$(srcdir)/sql_code_xslt.c'; fi`
virtuoso_sample_t-bif_sample.o: bif_sample.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_sample_t_CFLAGS) $(CFLAGS) -MT virtuoso_sample_t-bif_sample.o -MD -MP -MF $(DEPDIR)/virtuoso_sample_t-bif_sample.Tpo -c -o virtuoso_sample_t-bif_sample.o `test -f 'bif_sample.c' || echo '$(srcdir)/'`bif_sample.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_sample_t-bif_sample.Tpo $(DEPDIR)/virtuoso_sample_t-bif_sample.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_sample_t-bif_sample.Tpo $(DEPDIR)/virtuoso_sample_t-bif_sample.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_sample.c' object='virtuoso_sample_t-bif_sample.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_sample_t_CFLAGS) $(CFLAGS) -c -o virtuoso_sample_t-bif_sample.o `test -f 'bif_sample.c' || echo '$(srcdir)/'`bif_sample.c
virtuoso_sample_t-bif_sample.obj: bif_sample.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_sample_t_CFLAGS) $(CFLAGS) -MT virtuoso_sample_t-bif_sample.obj -MD -MP -MF $(DEPDIR)/virtuoso_sample_t-bif_sample.Tpo -c -o virtuoso_sample_t-bif_sample.obj `if test -f 'bif_sample.c'; then $(CYGPATH_W) 'bif_sample.c'; else $(CYGPATH_W) '$(srcdir)/bif_sample.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_sample_t-bif_sample.Tpo $(DEPDIR)/virtuoso_sample_t-bif_sample.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_sample_t-bif_sample.Tpo $(DEPDIR)/virtuoso_sample_t-bif_sample.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_sample.c' object='virtuoso_sample_t-bif_sample.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_sample_t_CFLAGS) $(CFLAGS) -c -o virtuoso_sample_t-bif_sample.obj `if test -f 'bif_sample.c'; then $(CYGPATH_W) 'bif_sample.c'; else $(CYGPATH_W) '$(srcdir)/bif_sample.c'; fi`
@@ -760,58 +734,53 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
- $(am__tty_colors); \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
@@ -820,63 +789,49 @@ check-TESTS: $(TESTS)
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
+ echo "XPASS: $$tst"; \
;; \
*) \
- col=$$grn; res=PASS; \
+ echo "PASS: $$tst"; \
;; \
esac; \
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
*) \
failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
+ echo "FAIL: $$tst"; \
;; \
esac; \
else \
skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
+ echo "SKIP: $$tst"; \
fi; \
- echo "$${col}$$res$${std}: $$tst"; \
done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
- fi; \
if test "$$failed" -eq 0; then \
if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
+ banner="All $$all tests passed"; \
else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
fi; \
else \
if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
+ banner="$$failed of $$all tests failed"; \
else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
fi; \
fi; \
dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
- else \
- skipped="($$skip tests were not run)"; \
- fi; \
+ skipped="($$skip tests were not run)"; \
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -887,15 +842,11 @@ check-TESTS: $(TESTS)
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
- else \
- echo "$$red$$dashes"; \
- fi; \
+ echo "$$dashes"; \
echo "$$banner"; \
test -z "$$skipped" || echo "$$skipped"; \
test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$$dashes"; \
test "$$failed" -eq 0; \
else :; fi
@@ -915,17 +866,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -960,7 +907,6 @@ clean-generic:
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"
@@ -983,8 +929,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -993,28 +937,18 @@ install-data-am:
install-dvi: install-dvi-am
-install-dvi-am:
-
install-exec-am: install-binPROGRAMS
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
@@ -1037,7 +971,7 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS
-.MAKE: all check check-am install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-binPROGRAMS clean-generic clean-libtool \
@@ -1081,7 +1015,6 @@ sql_code_xslt.c: javavm_type.xsl $(top_srcdir)/libsrc/Wi/sql_to_c.awk
-v pass_bootstrap_cli=1 \
-v pl_stats=$(PLSTATS) \
javavm_type.xsl
-
# 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/tests/biftest/bif_sample.c b/binsrc/tests/biftest/bif_sample.c
index bec8e6c..ecabbb9 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/bif_sample_win32.c b/binsrc/tests/biftest/bif_sample_win32.c
index 140c229..b6e1160 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/bif_server.c b/binsrc/tests/biftest/bif_server.c
index b467939..9c6e413 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/import_clr.sql b/binsrc/tests/biftest/import_clr.sql
index 051bb01..6de0ae0 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.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/java/BpelVarsAdaptor.java b/binsrc/tests/biftest/java/BpelVarsAdaptor.java
index 7df1328..a2a385a 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java/Restricted.java b/binsrc/tests/biftest/java/Restricted.java
index aa1673a..2c60533 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java/Unrestricted.java b/binsrc/tests/biftest/java/Unrestricted.java
index 544f5ea..b40edff 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java/__virt_access_granter.java b/binsrc/tests/biftest/java/__virt_access_granter.java
index 82ace35..edcf8f8 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java/__virt_class_loader_r.java b/binsrc/tests/biftest/java/__virt_class_loader_r.java
index d6ccfb9..3bf074b 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java/__virt_class_loader_ur.java b/binsrc/tests/biftest/java/__virt_class_loader_ur.java
index 8ae2f29..86d104c 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java/__virt_helper.java b/binsrc/tests/biftest/java/__virt_helper.java
index 1b1c37c..6b6db26 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java_code.c b/binsrc/tests/biftest/java_code.c
index 07aa2f0..3d27d6d 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java_skel.c b/binsrc/tests/biftest/java_skel.c
index f200b59..a6ca45f 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/java_to_c.awk b/binsrc/tests/biftest/java_to_c.awk
index 1a24d03..dc04ffc 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.1 2009/04/20 21:14:00 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/biftest/javavm.c b/binsrc/tests/biftest/javavm.c
index b5bcee5..854d967 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/javavm_pl.xsl b/binsrc/tests/biftest/javavm_pl.xsl
index 793ce44..6fb3b6c 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.1 2009/04/20 21:14:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/biftest/javavm_type.xsl b/binsrc/tests/biftest/javavm_type.xsl
index 0a0b329..b88ba8f 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.1 2009/04/20 21:14:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/biftest/javavm_xml.sql b/binsrc/tests/biftest/javavm_xml.sql
index b0ef325..6cc9ad9 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.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/javavm_xml2.sql b/binsrc/tests/biftest/javavm_xml2.sql
index e96465a..927c132 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.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/javavm_xml3.sql b/binsrc/tests/biftest/javavm_xml3.sql
index 7f87904..84bd5cf 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.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/lang_sample.c b/binsrc/tests/biftest/lang_sample.c
index b8f8820..69b8f95 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/sql_code_xslt.c b/binsrc/tests/biftest/sql_code_xslt.c
index 3e08f00..276203f 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.1 2009/04/20 21:14:00 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 8f43b78..618f10c 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/tests/Point_src.aspx b/binsrc/tests/biftest/tests/Point_src.aspx
index d669e2d..c789e16 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.1 2009/04/20 21:14:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/binsrc/tests/biftest/tests/Write_no.java b/binsrc/tests/biftest/tests/Write_no.java
index c472dc3..d168620 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/tests/Write_yes.java b/binsrc/tests/biftest/tests/Write_yes.java
index 70d90c0..28b8d06 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/tests/java_ts.sql b/binsrc/tests/biftest/tests/java_ts.sql
index 77c7326..f5cb227 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.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/tests/java_ts2.sql b/binsrc/tests/biftest/tests/java_ts2.sql
index 704ff61..ff69e4a 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.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/tests/java_ts3.sql b/binsrc/tests/biftest/tests/java_ts3.sql
index a03af1d..cf7715c 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.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/tests/my_finances.java b/binsrc/tests/biftest/tests/my_finances.java
index 3a051f9..7bbbdf6 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/tests/test_tax_java.sql b/binsrc/tests/biftest/tests/test_tax_java.sql
index 0688aa1..9079dc8 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.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/tests/testsuite.java b/binsrc/tests/biftest/tests/testsuite.java
index 963b54c..407d8a4 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/tests/testsuite_base.java b/binsrc/tests/biftest/tests/testsuite_base.java
index 39cc862..8d43903 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/tests/testsuite_ns.java b/binsrc/tests/biftest/tests/testsuite_ns.java
index ebd5640..ed1e373 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/biftest/tests/tjavavm.sh b/binsrc/tests/biftest/tests/tjavavm.sh
index dc1c4f9..1b885af 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.1 2009/04/20 21:14:00 source Exp $
+# $Id$
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/biftest/thook.sh b/binsrc/tests/biftest/thook.sh
index 5c190dc..b5fffc1 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.1 2009/04/20 21:14:00 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/biftest/thook.sql b/binsrc/tests/biftest/thook.sql
index a76a41a..54a7d15 100644
--- a/binsrc/tests/biftest/thook.sql
+++ b/binsrc/tests/biftest/thook.sql
@@ -1,10 +1,10 @@
--
--- $Id: thook.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/thook1.sql b/binsrc/tests/biftest/thook1.sql
index 018710a..f87d5cd 100644
--- a/binsrc/tests/biftest/thook1.sql
+++ b/binsrc/tests/biftest/thook1.sql
@@ -1,10 +1,10 @@
--
--- $Id: thook1.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/thook2.sql b/binsrc/tests/biftest/thook2.sql
index 0532289..1b19cb8 100644
--- a/binsrc/tests/biftest/thook2.sql
+++ b/binsrc/tests/biftest/thook2.sql
@@ -1,10 +1,10 @@
--
--- $Id: thook2.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/biftest/win32.mk b/binsrc/tests/biftest/win32.mk
index 0d3a8da..ac9ab1f 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.2 2010/01/29 16:18:03 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/blobnulls.c b/binsrc/tests/blobnulls.c
index 459c701..8f150d3 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.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/blobs.c b/binsrc/tests/blobs.c
index 38dd9de..a0903e9 100644
--- a/binsrc/tests/blobs.c
+++ b/binsrc/tests/blobs.c
@@ -1,14 +1,14 @@
/*
* blobs.c
*
- * $Id: blobs.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* BLOBS test
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/blobs2.c b/binsrc/tests/blobs2.c
index 627ef62..477425d 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.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* BLOBS test
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/bsbm/Makefile.am b/binsrc/tests/bsbm/Makefile.am
index b3cadaa..b8054e6 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-2008 OpenLink Software
+# 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
diff --git a/binsrc/tests/bsbm/Makefile.in b/binsrc/tests/bsbm/Makefile.in
index dce12fe..9643dfd 100644
--- a/binsrc/tests/bsbm/Makefile.in
+++ b/binsrc/tests/bsbm/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2008 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -301,14 +295,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/bsbm/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/bsbm/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/bsbm/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/bsbm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -326,7 +320,6 @@ $(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
@@ -356,17 +349,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -394,7 +383,6 @@ clean-generic:
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"
@@ -413,8 +401,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -423,28 +409,18 @@ install-data-am:
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
@@ -478,7 +454,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tests/bsbm/run_javac.sh b/binsrc/tests/bsbm/run_javac.sh
index 47f0443..5ab529d 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/bsbm/run_test.sh b/binsrc/tests/bsbm/run_test.sh
index fb965f6..f593ecf 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/bsbm/src/benchmark/vocabulary/RDF.java b/binsrc/tests/bsbm/src/benchmark/vocabulary/RDF.java
index ecd9993..b8dfc10 100644
--- a/binsrc/tests/bsbm/src/benchmark/vocabulary/RDF.java
+++ b/binsrc/tests/bsbm/src/benchmark/vocabulary/RDF.java
@@ -1,7 +1,7 @@
/*
(c) Copyright 2000, 2001, 2002, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Hewlett-Packard Development Company, LP
[See end of file]
- $Id: RDF.java,v 1.1 2008/08/07 13:58:15 source Exp $
+ $Id$
*/
package benchmark.vocabulary;
diff --git a/binsrc/tests/burstoff.c b/binsrc/tests/burstoff.c
index b34c930..7cba20b 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/butils.h b/binsrc/tests/butils.h
index a118b6d..81b1fd9 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/chil.c b/binsrc/tests/chil.c
index 59f8877..aad3fa3 100644
--- a/binsrc/tests/chil.c
+++ b/binsrc/tests/chil.c
@@ -1,14 +1,14 @@
/*
* chil.c
*
- * $Id: chil.c,v 1.5.2.3 2011/10/13 18:29:57 source Exp $
+ * $Id$
*
* Server main
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/cursor.c b/binsrc/tests/cursor.c
index 56a2c57..2629f81 100644
--- a/binsrc/tests/cursor.c
+++ b/binsrc/tests/cursor.c
@@ -1,10 +1,10 @@
/*
- * $Id: cursor.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/davperf.sql b/binsrc/tests/davperf.sql
index 04e0127..9a47f65 100644
--- a/binsrc/tests/davperf.sql
+++ b/binsrc/tests/davperf.sql
@@ -1,10 +1,10 @@
--
--- $Id: davperf.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/dbdump.c b/binsrc/tests/dbdump.c
index b599bb9..35fb3b7 100644
--- a/binsrc/tests/dbdump.c
+++ b/binsrc/tests/dbdump.c
@@ -1,10 +1,10 @@
/*
- * $Id: dbdump.c,v 1.5.2.2 2009/05/14 18:32:25 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/dotnet/Makefile.am b/binsrc/tests/dotnet/Makefile.am
index 820aa06..9842458 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-2006 OpenLink Software
+# 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
@@ -28,7 +28,6 @@
EXTRA_DIST = \
README \
harness/AssemblyInfo.cs \
- harness/.cvsignore \
harness/Makefile \
harness/Makefile.mono \
harness/OpenLink/Testing/Framework/ComparisonException.cs \
@@ -55,7 +54,6 @@ EXTRA_DIST = \
VirtuosoClientSuite/CommandBuilderTest.cs \
VirtuosoClientSuite/CommandTest.cs \
VirtuosoClientSuite/ConnectionTest.cs \
- VirtuosoClientSuite/.cvsignore \
VirtuosoClientSuite/DtcTest.cs \
VirtuosoClientSuite/Makefile \
VirtuosoClientSuite/Makefile.mono \
diff --git a/binsrc/tests/dotnet/Makefile.in b/binsrc/tests/dotnet/Makefile.in
index 3826a74..8fa78c7 100644
--- a/binsrc/tests/dotnet/Makefile.in
+++ b/binsrc/tests/dotnet/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -278,7 +272,6 @@ vaddir = @vaddir@
EXTRA_DIST = \
README \
harness/AssemblyInfo.cs \
- harness/.cvsignore \
harness/Makefile \
harness/Makefile.mono \
harness/OpenLink/Testing/Framework/ComparisonException.cs \
@@ -305,7 +298,6 @@ EXTRA_DIST = \
VirtuosoClientSuite/CommandBuilderTest.cs \
VirtuosoClientSuite/CommandTest.cs \
VirtuosoClientSuite/ConnectionTest.cs \
- VirtuosoClientSuite/.cvsignore \
VirtuosoClientSuite/DtcTest.cs \
VirtuosoClientSuite/Makefile \
VirtuosoClientSuite/Makefile.mono \
@@ -324,14 +316,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/dotnet/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/dotnet/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/dotnet/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/dotnet/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -349,7 +341,6 @@ $(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
@@ -379,17 +370,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -417,7 +404,6 @@ clean-generic:
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"
@@ -436,8 +422,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -446,28 +430,18 @@ install-data-am:
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
@@ -501,7 +475,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tests/dotnet/Test.cs b/binsrc/tests/dotnet/Test.cs
index 22d7bd1..7acc78a 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/.cvsignore b/binsrc/tests/dotnet/VirtuosoClientSuite/.cvsignore
deleted file mode 100644
index a3ea3b8..0000000
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenLink.Testing.dll
-OpenLink.Data.Virtuoso.dll
-VirtuosoSuite.dll
-OpenLink.Data.VirtuosoClient.dll
-VirtuosoClientSuite.dll
-OpenLink.Data.VirtuosoOdbcClient.dll
-VirtuosoOdbcClientSuite.dll
-VirtuosoDtcClientSuite.dll
-VirtuosoDtcClientSuite.tlb
-VirtuosoDtcOdbcClientSuite.dll
-VirtuosoDtcOdbcClientSuite.tlb
-VirtuosoDtcSuite.dll
-VirtuosoDtcSuite.tlb
-*.pdb
-*.mdb
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs
index e336d90..8d2034c 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs
index 2e50eff..8dba951 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs
index 9801451..056aaf5 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs
index a086037..e714d5a 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs
index a792531..b78ca59 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs
index 0ccc437..c820250 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/Makefile b/binsrc/tests/dotnet/VirtuosoClientSuite/Makefile
index 3df143a..fe25604 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/Makefile
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
+# $Id$
#
DLL_SOURCES=\
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/Makefile.mono b/binsrc/tests/dotnet/VirtuosoClientSuite/Makefile.mono
index 7948869..e8b87a8 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/Makefile.mono
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/Makefile.mono
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.mono,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
+# $Id$
#
CSC=mcs
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs
index f366eb5..afa411e 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs
index 7f1d3e9..947aab4 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs
index 8b2f072..1936ec0 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs
index d9ec6b0..fa9dbe3 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs
index 98c18f8..c9dfd9b 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs
index 9dcf148..2a45003 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/.cvsignore b/binsrc/tests/dotnet/harness/.cvsignore
deleted file mode 100644
index 4317ad0..0000000
--- a/binsrc/tests/dotnet/harness/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-OpenLink.Testing.dll
-OpenLink.Testing.dll.mdb
-OpenLink.Testing.pdb
diff --git a/binsrc/tests/dotnet/harness/AssemblyInfo.cs b/binsrc/tests/dotnet/harness/AssemblyInfo.cs
index c0dc3fa..8345963 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/Makefile b/binsrc/tests/dotnet/harness/Makefile
index 1f5b0ea..513ffee 100644
--- a/binsrc/tests/dotnet/harness/Makefile
+++ b/binsrc/tests/dotnet/harness/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
+# $Id$
#
CSFLAGS=/optimize+
diff --git a/binsrc/tests/dotnet/harness/Makefile.mono b/binsrc/tests/dotnet/harness/Makefile.mono
index 1cc71f9..0829035 100644
--- a/binsrc/tests/dotnet/harness/Makefile.mono
+++ b/binsrc/tests/dotnet/harness/Makefile.mono
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.mono,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
+# $Id$
#
CSC=mcs
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs
index 857b070..58f45fa 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs
index c09c8f6..8faa0d4 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs
index da41823..a335af4 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs
index 3bc8404..30555c8 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs
index 6f1e4f4..f462748 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs
index be11a96..2913ccf 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs
index 91618d9..f8af511 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs
index 9f8533c..0ee902b 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs
index 56e904c..064a4a3 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs
index af35284..ad63a52 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.1 2009/04/20 21:15:31 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs
index 3934500..8fac920 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.1 2009/04/20 21:15:32 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs
index 152c75e..1b73632 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.1 2009/04/20 21:15:32 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs
index 0d27424..aef550d 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.1 2009/04/20 21:15:32 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs
index 1312906..dad4a30 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.1 2009/04/20 21:15:32 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs
index 0a4159a..d22fc7b 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.1 2009/04/20 21:15:32 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs
index f18df1e..9f8f585 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.1 2009/04/20 21:15:32 source Exp $
+// $Id$
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2009 OpenLink Software
+// 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
diff --git a/binsrc/tests/dotnet/test_server.sh b/binsrc/tests/dotnet/test_server.sh
index 9b26be6..91cb771 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.1 2009/04/20 21:15:31 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/force_dbms_name.c b/binsrc/tests/force_dbms_name.c
index ca8337d..7104083 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.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/getdata.c b/binsrc/tests/getdata.c
index bd99a13..5754a1a 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/inifile.c b/binsrc/tests/inifile.c
index edb22bb..7238c33 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.2 2009/11/26 20:37:00 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/inifile.vers.c b/binsrc/tests/inifile.vers.c
index 7907448..693495a 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 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";
+Version 1.4 as of Fri Mar 23 14:30:37 CET 2012.\n\
+Compiled for Darwin 11.3.0\n\
+Copyright (C) 1998-2012 OpenLink Software.\n";
diff --git a/binsrc/tests/ins.c b/binsrc/tests/ins.c
index 929b849..8a866a6 100644
--- a/binsrc/tests/ins.c
+++ b/binsrc/tests/ins.c
@@ -1,14 +1,14 @@
/*
* ins.c
*
- * $Id: ins.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* Insert test
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/isql.c b/binsrc/tests/isql.c
index 76341c7..270b7ff 100644
--- a/binsrc/tests/isql.c
+++ b/binsrc/tests/isql.c
@@ -1,10 +1,10 @@
/*
- * $Id: isql.c,v 1.3.2.4 2011/03/25 17:47:30 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -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;
+int print_banner_flag = 1, print_types_also = 1, verbose_mode = 1, echo_mode = 0, explain_mode = 0, sparql_translate_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;
@@ -2153,7 +2153,7 @@ unescape_string (TCHAR * _string)
case 'x': /* There's a hexadecimal char constant \xhh */
case 'X':
{ /* Well, we should check that only max 2 digits are parsed */
- *res_ptr++ = ((UTCHAR) hextoi (&string, ++string));
+ *res_ptr++ = ((UTCHAR) hextoi (&string, string+1));
continue;
}
/* The following might conflict with some other usage. Commented out. */
@@ -2625,6 +2625,8 @@ 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),
@@ -5901,9 +5903,32 @@ 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? */
@@ -9353,10 +9378,6 @@ 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)))
{
/*
@@ -9483,6 +9504,9 @@ _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
@@ -10251,7 +10275,7 @@ line_from_html_file (TCHAR *templatename)
{
TCHAR tmp1[2002];
- return (isqlt_fgetts (tmp1, (sizeof (tmp1) - 1), html_infp));
+ return (isqlt_fgetts (tmp1, ((sizeof (tmp1) / sizeof (TCHAR)) - 1), html_infp));
}
/* Return the whole string in one piece. After that return NULL.
diff --git a/binsrc/tests/isql_tchar.h b/binsrc/tests/isql_tchar.h
index 99d82b5..3107c80 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/isql_wfuncs.c b/binsrc/tests/isql_wfuncs.c
index e205f40..07fc571 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/isql_win32.c b/binsrc/tests/isql_win32.c
index 5516a00..84d93fe 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/lubm-cli.c b/binsrc/tests/lubm-cli.c
index b3f0a6a..c70ba06 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/lubm/Makefile.am b/binsrc/tests/lubm/Makefile.am
index 37d563d..cf27161 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-2008 OpenLink Software
+# 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
diff --git a/binsrc/tests/lubm/Makefile.in b/binsrc/tests/lubm/Makefile.in
index 2b7605a..1a07f51 100644
--- a/binsrc/tests/lubm/Makefile.in
+++ b/binsrc/tests/lubm/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2008 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,11 +67,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -162,7 +157,6 @@ 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@
@@ -246,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -267,7 +260,6 @@ 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@
@@ -296,14 +288,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/lubm/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/lubm/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/lubm/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/lubm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -321,7 +313,6 @@ $(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
@@ -336,10 +327,9 @@ CTAGS:
check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
- $(am__tty_colors); \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
@@ -348,63 +338,49 @@ check-TESTS: $(TESTS)
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
+ echo "XPASS: $$tst"; \
;; \
*) \
- col=$$grn; res=PASS; \
+ echo "PASS: $$tst"; \
;; \
esac; \
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
*) \
failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
+ echo "FAIL: $$tst"; \
;; \
esac; \
else \
skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
+ echo "SKIP: $$tst"; \
fi; \
- echo "$${col}$$res$${std}: $$tst"; \
done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
- fi; \
if test "$$failed" -eq 0; then \
if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
+ banner="All $$all tests passed"; \
else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
fi; \
else \
if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
+ banner="$$failed of $$all tests failed"; \
else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
fi; \
fi; \
dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
- else \
- skipped="($$skip tests were not run)"; \
- fi; \
+ skipped="($$skip tests were not run)"; \
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -415,15 +391,11 @@ check-TESTS: $(TESTS)
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
- else \
- echo "$$red$$dashes"; \
- fi; \
+ echo "$$dashes"; \
echo "$$banner"; \
test -z "$$skipped" || echo "$$skipped"; \
test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$$dashes"; \
test "$$failed" -eq 0; \
else :; fi
@@ -443,17 +415,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -482,7 +450,6 @@ clean-generic:
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"
@@ -501,8 +468,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -511,28 +476,18 @@ install-data-am:
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
@@ -553,7 +508,7 @@ ps-am:
uninstall-am:
-.MAKE: check-am install-am install-strip
+.MAKE: install-am install-strip
.PHONY: all all-am check check-TESTS check-am clean clean-generic \
clean-libtool clean-local distclean distclean-generic \
@@ -577,7 +532,6 @@ clean-local:
-rm -f virtuoso.pxa
-rm -f virtuoso.tdb
-rm -f virtuoso.trx
-
# 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/tests/lubm/big-lubm-load.sql b/binsrc/tests/lubm/big-lubm-load.sql
index d1e096a..6df4f28 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.1 2009/12/22 10:37:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/lubm/lubm-cp.sql b/binsrc/tests/lubm/lubm-cp.sql
index 3d3ba8b..665d00c 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.1 2009/12/22 10:37:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/lubm/lubm-inf.sql b/binsrc/tests/lubm/lubm-inf.sql
index f498c89..b6d3485 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.1 2009/12/22 10:37:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/lubm/lubm-load.sql b/binsrc/tests/lubm/lubm-load.sql
index 40c38d0..9998a97 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.1 2009/12/22 10:37:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/lubm/lubm-org.sql b/binsrc/tests/lubm/lubm-org.sql
index 8cacda0..e5e7d1e 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.1 2009/12/22 10:37:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/lubm/lubm-phys.sql b/binsrc/tests/lubm/lubm-phys.sql
index dcec348..a997fdb 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.1 2009/12/22 10:37:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/lubm/lubm.sql b/binsrc/tests/lubm/lubm.sql
index b85e76e..fb6df86 100644
--- a/binsrc/tests/lubm/lubm.sql
+++ b/binsrc/tests/lubm/lubm.sql
@@ -1,10 +1,10 @@
--
--- $Id: lubm.sql,v 1.2.2.1 2009/12/22 10:37:52 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/lubm/test_server.sh b/binsrc/tests/lubm/test_server.sh
index 9209ef8..6012f04 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.2 2010/01/05 19:12:15 source Exp $
+# $Id$
#
# choose a server to run with
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/lubm/tlubm.sh b/binsrc/tests/lubm/tlubm.sh
index b051191..8ead938 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.2 2010/01/05 19:12:15 source Exp $
+# $Id$
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/lubm/trdfrng.sql b/binsrc/tests/lubm/trdfrng.sql
index 5bbb60a..17d6735 100644
--- a/binsrc/tests/lubm/trdfrng.sql
+++ b/binsrc/tests/lubm/trdfrng.sql
@@ -1,10 +1,10 @@
--
--- $Id: trdfrng.sql,v 1.1.2.3 2010/01/05 19:12:15 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/binsrc/tests/lubm/virtuoso-1111.ini b/binsrc/tests/lubm/virtuoso-1111.ini
index 320cc00..81caf45 100644
--- a/binsrc/tests/lubm/virtuoso-1111.ini
+++ b/binsrc/tests/lubm/virtuoso-1111.ini
@@ -1,7 +1,7 @@
;
; virtuoso.ini
;
-; $Id: virtuoso-1111.ini,v 1.2 2008/12/17 16:55:28 source Exp $
+; $Id$
;
; Configuration file for the OpenLink Virtuoso VDBMS Server
;
diff --git a/binsrc/tests/mail_virt.c b/binsrc/tests/mail_virt.c
index 5d15305..0a56be4 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.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* Virtuoso Local mailer
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/odbcinc.h b/binsrc/tests/odbcinc.h
index 75ba622..4a34747 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.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* Include the ODBC header, whichever appropriate
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/odbcuti.h b/binsrc/tests/odbcuti.h
index d808620..e1703d7 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.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* ODBC utility macros
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/oledb/Makefile.am b/binsrc/tests/oledb/Makefile.am
index 652e0f8..11ce103 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/oledb/Makefile.in b/binsrc/tests/oledb/Makefile.in
index 431871f..927d361 100644
--- a/binsrc/tests/oledb/Makefile.in
+++ b/binsrc/tests/oledb/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -291,14 +285,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/oledb/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/oledb/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/oledb/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/oledb/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -316,7 +310,6 @@ $(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
@@ -346,17 +339,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -384,7 +373,6 @@ clean-generic:
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"
@@ -403,8 +391,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -413,28 +399,18 @@ install-data-am:
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
@@ -468,7 +444,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tests/oledb/dts_import.sql b/binsrc/tests/oledb/dts_import.sql
index c955fcf..605d895 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/paramstats.c b/binsrc/tests/paramstats.c
index bd535a1..1faecaf 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.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* param status pointer test (bug 1293)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/rdf/Makefile.am b/binsrc/tests/rdf/Makefile.am
index e1d4713..2d30cfb 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/rdf/Makefile.in b/binsrc/tests/rdf/Makefile.in
index 93c454d..cada2ba 100644
--- a/binsrc/tests/rdf/Makefile.in
+++ b/binsrc/tests/rdf/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -293,14 +287,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/rdf/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/rdf/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/rdf/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/rdf/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -318,7 +312,6 @@ $(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
@@ -348,17 +341,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -386,7 +375,6 @@ clean-generic:
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"
@@ -405,8 +393,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -415,28 +401,18 @@ install-data-am:
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
@@ -470,7 +446,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tests/rdf/articles.sql b/binsrc/tests/rdf/articles.sql
index 6f0c36d..8db539e 100644
--- a/binsrc/tests/rdf/articles.sql
+++ b/binsrc/tests/rdf/articles.sql
@@ -1,10 +1,10 @@
--
--- $Id: articles.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/rdf/rdf-exp-load.xsl b/binsrc/tests/rdf/rdf-exp-load.xsl
index c755b36..df38220 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl b/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl
index b207902..aeb16f5 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/rdf/rdf-exp.sql b/binsrc/tests/rdf/rdf-exp.sql
index b6b1909..6deffdc 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/rdf/rdfbase.sql b/binsrc/tests/rdf/rdfbase.sql
index 1bf8524..02648d2 100644
--- a/binsrc/tests/rdf/rdfbase.sql
+++ b/binsrc/tests/rdf/rdfbase.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdfbase.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/rdf/rdfxmlload.xsl b/binsrc/tests/rdf/rdfxmlload.xsl
index fe3d9dd..5d4441f 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/rdf/wordnet.sql b/binsrc/tests/rdf/wordnet.sql
index 41c604a..8f29d7d 100644
--- a/binsrc/tests/rdf/wordnet.sql
+++ b/binsrc/tests/rdf/wordnet.sql
@@ -1,10 +1,10 @@
--
--- $Id: wordnet.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/runbg.c b/binsrc/tests/runbg.c
index 1c1c4a3..07465e7 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.2 2009/11/26 20:37:27 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/scroll.c b/binsrc/tests/scroll.c
index 0293f12..86874f8 100644
--- a/binsrc/tests/scroll.c
+++ b/binsrc/tests/scroll.c
@@ -1,14 +1,14 @@
/*
* scroll.c
*
- * $Id: scroll.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* scroll test
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/setcurs.c b/binsrc/tests/setcurs.c
index 6ccf2f4..90ab061 100644
--- a/binsrc/tests/setcurs.c
+++ b/binsrc/tests/setcurs.c
@@ -1,7 +1,7 @@
/*
* setcurs.c
*
- * $Id: setcurs.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/smtpsend.c b/binsrc/tests/smtpsend.c
index 63e9b30..b8ff89e 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/suite/Makefile.am b/binsrc/tests/suite/Makefile.am
index ff45796..6c1f459 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/Makefile.in b/binsrc/tests/suite/Makefile.in
index 16bb03f..826f8fa 100644
--- a/binsrc/tests/suite/Makefile.in
+++ b/binsrc/tests/suite/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -81,40 +78,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -202,7 +169,6 @@ 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@
@@ -286,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -307,7 +272,6 @@ 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@
@@ -431,14 +395,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/suite/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/suite/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/suite/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/suite/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -456,7 +420,6 @@ $(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
@@ -471,7 +434,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -488,7 +451,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -496,7 +459,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -522,16 +485,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -539,14 +502,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -558,52 +521,47 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
- $(am__tty_colors); \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
@@ -612,63 +570,49 @@ check-TESTS: $(TESTS)
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
+ echo "XPASS: $$tst"; \
;; \
*) \
- col=$$grn; res=PASS; \
+ echo "PASS: $$tst"; \
;; \
esac; \
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
*) \
failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
+ echo "FAIL: $$tst"; \
;; \
esac; \
else \
skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
+ echo "SKIP: $$tst"; \
fi; \
- echo "$${col}$$res$${std}: $$tst"; \
done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
- fi; \
if test "$$failed" -eq 0; then \
if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
+ banner="All $$all tests passed"; \
else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
fi; \
else \
if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
+ banner="$$failed of $$all tests failed"; \
else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
fi; \
fi; \
dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
- else \
- skipped="($$skip tests were not run)"; \
- fi; \
+ skipped="($$skip tests were not run)"; \
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -679,15 +623,11 @@ check-TESTS: $(TESTS)
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
- else \
- echo "$$red$$dashes"; \
- fi; \
+ echo "$$dashes"; \
echo "$$banner"; \
test -z "$$skipped" || echo "$$skipped"; \
test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$$dashes"; \
test "$$failed" -eq 0; \
else :; fi
@@ -707,44 +647,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -776,7 +701,6 @@ clean-generic:
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"
@@ -795,8 +719,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -805,28 +727,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -847,8 +759,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
- ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-TESTS check-am clean clean-generic \
@@ -867,7 +779,6 @@ uninstall-am:
clean-local:
./clean.sh
-
# 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/tests/suite/audit.txt b/binsrc/tests/suite/audit.txt
deleted file mode 100644
index 06cdc16..0000000
--- a/binsrc/tests/suite/audit.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-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 e0d01fd..a8a8408 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.1 2009/04/16 12:37:42 source Exp $
+-- $Id$
--
-- Make an On-Line Backup
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -41,4 +41,3 @@ wait_for_children;
cl_exec ('backup \'backup2.log\'');
wait_for_children;
ECHO BOTH "COMPLETED: On-Line Backup Test, part 1, recovery check soon follows\n";
-
diff --git a/binsrc/tests/suite/blobs.sql b/binsrc/tests/suite/blobs.sql
index c7a3171..bc92f8d 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Check Blob fields
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/bpel.sh b/binsrc/tests/suite/bpel.sh
index e0b23d0..bde89f8 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/bpel_temp.sql b/binsrc/tests/suite/bpel_temp.sql
deleted file mode 100644
index fa0c362..0000000
--- a/binsrc/tests/suite/bpel_temp.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-vhost_define (vhost=>'*ini*', lhost=>'*ini*', lpath=>'/SRC/', ppath=>'/', vsp_user=>'BPEL');
-ECHO BOTH $IF $EQU $STATE 'OK' "PASSED" "***FAILED";
-SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-ECHO BOTH ": source vhost STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
diff --git a/binsrc/tests/suite/byteorder.sh b/binsrc/tests/suite/byteorder.sh
index 6efc29a..878b13c 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# VARIOUS MACHINE BYTEORDER support
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/byteorder.sql b/binsrc/tests/suite/byteorder.sql
index 0e285a4..611b237 100644
--- a/binsrc/tests/suite/byteorder.sql
+++ b/binsrc/tests/suite/byteorder.sql
@@ -1,10 +1,10 @@
--
--- $Id: byteorder.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -97,5 +97,3 @@ ECHO BOTH ": BACKUP STATE: " $STATE "\n";
select check_dav_blobs ('factbook.xml', 4222646);
ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
ECHO BOTH ": BACKUP STATE: " $STATE "\n";
-
-
diff --git a/binsrc/tests/suite/ce.xml b/binsrc/tests/suite/ce.xml
index 43a6552..722d8dc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/clean.sh b/binsrc/tests/suite/clean.sh
index 7ab62de..c3b2239 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.3 2009/11/17 21:01:00 source Exp $
+# $Id$
#
# Cleanup after running the testsuite
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/csv_loader.sql b/binsrc/tests/suite/csv_loader.sql
index 815bba1..fceff1a 100644
--- a/binsrc/tests/suite/csv_loader.sql
+++ b/binsrc/tests/suite/csv_loader.sql
@@ -401,4 +401,3 @@ create procedure csv_loader_run (in max_files integer := null, in log_enable int
return;
}
;
-
diff --git a/binsrc/tests/suite/cube.sql b/binsrc/tests/suite/cube.sql
index 0dc6f3c..7238c9c 100644
--- a/binsrc/tests/suite/cube.sql
+++ b/binsrc/tests/suite/cube.sql
@@ -1,10 +1,10 @@
--
--- $Id: cube.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/dbev_login.sql b/binsrc/tests/suite/dbev_login.sql
index dc21c1c..b52188c 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/docsrc/dbconcepts.xml b/binsrc/tests/suite/docsrc/dbconcepts.xml
index 31d7401..bedc8de 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/html_common_v.xsl b/binsrc/tests/suite/docsrc/html_common_v.xsl
index ad9f31f..83b4f58 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/intl.xml b/binsrc/tests/suite/docsrc/intl.xml
index 7bd3685..8aa8397 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/odbcimplementation.xml b/binsrc/tests/suite/docsrc/odbcimplementation.xml
index 6d6f347..679b5c4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/ptune.xml b/binsrc/tests/suite/docsrc/ptune.xml
index 3bacc47..47c6d9d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/repl.xml b/binsrc/tests/suite/docsrc/repl.xml
index 8bb191d..2e731c5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/server.xml b/binsrc/tests/suite/docsrc/server.xml
index d0705d9..2c9fbcb 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-2006 OpenLink Software
+ - 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
@@ -94,7 +94,7 @@ started from the Control Panel or automatically at system startup.
;
; virtuoso.ini
;
-; $Id: server.xml,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
+; $Id$
;
; 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 03f4cf3..706e761 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/sqlprocedures.xml b/binsrc/tests/suite/docsrc/sqlprocedures.xml
index d18e3c0..0ef467a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/sqlreference.xml b/binsrc/tests/suite/docsrc/sqlreference.xml
index 64962d3..d3f985b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/tsales.xml b/binsrc/tests/suite/docsrc/tsales.xml
index eb57961..fb5f106 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/tsales.xsl b/binsrc/tests/suite/docsrc/tsales.xsl
index 4c04766..7a8d5d9 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/tsales2.xsl b/binsrc/tests/suite/docsrc/tsales2.xsl
index c84346b..111c914 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/docsrc/vdbconcepts.xml b/binsrc/tests/suite/docsrc/vdbconcepts.xml
index deef2f1..5074923 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/emp.xsl b/binsrc/tests/suite/emp.xsl
index baf84e4..99ef733 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/emp_my.xsl b/binsrc/tests/suite/emp_my.xsl
index 4cd57d2..30d4451 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 2006/08/15 22:09:20 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/error.sql b/binsrc/tests/suite/error.sql
index 2dc7f8e..4164091 100644
--- a/binsrc/tests/suite/error.sql
+++ b/binsrc/tests/suite/error.sql
@@ -1,10 +1,10 @@
--
--- $Id: error.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/ftirepl.sql b/binsrc/tests/suite/ftirepl.sql
index 9b697a0..9637089 100644
--- a/binsrc/tests/suite/ftirepl.sql
+++ b/binsrc/tests/suite/ftirepl.sql
@@ -1,10 +1,10 @@
--
--- $Id: ftirepl.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -118,42 +118,42 @@ INSERT INTO FTT1 (FILE,DT) values ('/virtdocs.xml',file_to_string ('../docsrc/vi
INSERT INTO FTT1 (FILE,DT) values ('/ce.xml',file_to_string ('../ce.xml'));
select t from FTT1 where xpath_contains (DT, '//title', t);
-echo both $if $equ $rowcnt 792 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 792 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title\n";
select t from FTT1 where xpath_contains (DT, '//title [. like ''%ISOLATION%'' ]', t);
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
select t from FTT1 where xpath_contains (DT, '//title [.=''ISOLATION'' ]', t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]\n";
select t from FTT1 where xpath_contains (DT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 16 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from FTT1 where xpath_contains (DT, '//title [.=''ISOLATION'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
select t from FTT1 where xpath_contains (DT, '//chapter/title', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title\n";
select t from FTT1 where xpath_contains (DT, '//chapter/title[position () = 1]', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title[position () = 1]\n";
select count (*) from FTT1 where xpath_contains (DT, '//chapter//para[position () > 10]', t);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
select count (*) from FTT1 where xpath_contains (DT, '//chapter/descendant::para[position () > 10]', t);
-echo both $if $equ $last[1] 1630 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 1630 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
DROP TABLE FTT2;
CREATE TABLE FTT2 (ID INTEGER IDENTITY NOT NULL PRIMARY KEY, FILE varchar, DT LONG VARCHAR IDENTIFIED BY FILE);
@@ -172,42 +172,42 @@ INSERT INTO FTT2 (FILE,DT) values ('/virtdocs.xml', xml_persistent (file_to_stri
INSERT INTO FTT2 (FILE,DT) values ('/ce.xml', xml_persistent (file_to_string ('../ce.xml')));
select t from FTT2 where xpath_contains (DT, '//title', t);
-echo both $if $equ $rowcnt 792 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 792 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title\n";
select t from FTT2 where xpath_contains (DT, '//title [. like ''%ISOLATION%'' ]', t);
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
select t from FTT2 where xpath_contains (DT, '//title [.=''ISOLATION'' ]', t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]\n";
select t from FTT2 where xpath_contains (DT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 16 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from FTT2 where xpath_contains (DT, '//title [.=''ISOLATION'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
select t from FTT2 where xpath_contains (DT, '//chapter/title', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title\n";
select t from FTT2 where xpath_contains (DT, '//chapter/title[position () = 1]', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title[position () = 1]\n";
select count (*) from FTT1 where xpath_contains (DT, '//chapter//para[position () > 10]', t);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
select count (*) from FTT1 where xpath_contains (DT, '//chapter/descendant::para[position () > 10]', t);
-echo both $if $equ $last[1] 1630 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 1630 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
--REPL_UNPUBLISH ('tbl');
REPL_PUBLISH ('tblx', 'tblx.log');
@@ -294,79 +294,78 @@ ECHO BOTH ": query 'cde' produces offband data member 2 : " $LAST[1] "\n";
select t from FTT1 where xpath_contains (DT, '//title', t);
-echo both $if $equ $rowcnt 792 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 792 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title\n";
select t from FTT1 where xpath_contains (DT, '//title [. like ''%ISOLATION%'' ]', t);
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
select t from FTT1 where xpath_contains (DT, '//title [.=''ISOLATION'' ]', t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]\n";
select t from FTT1 where xpath_contains (DT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 16 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from FTT1 where xpath_contains (DT, '//title [.=''ISOLATION'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
select t from FTT1 where xpath_contains (DT, '//chapter/title', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title\n";
select t from FTT1 where xpath_contains (DT, '//chapter/title[position () = 1]', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title[position () = 1]\n";
select count (*) from FTT1 where xpath_contains (DT, '//chapter//para[position () > 10]', t);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
select count (*) from FTT1 where xpath_contains (DT, '//chapter/descendant::para[position () > 10]', t);
-echo both $if $equ $last[1] 1630 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 1630 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
select t from FTT2 where xpath_contains (DT, '//title', t);
-echo both $if $equ $rowcnt 792 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 792 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title\n";
select t from FTT2 where xpath_contains (DT, '//title [. like ''%ISOLATION%'' ]', t);
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
select t from FTT2 where xpath_contains (DT, '//title [.=''ISOLATION'' ]', t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]\n";
select t from FTT2 where xpath_contains (DT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 16 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from FTT2 where xpath_contains (DT, '//title [.=''ISOLATION'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
select t from FTT2 where xpath_contains (DT, '//chapter/title', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title\n";
select t from FTT2 where xpath_contains (DT, '//chapter/title[position () = 1]', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title[position () = 1]\n";
select count (*) from FTT2 where xpath_contains (DT, '//chapter//para[position () > 10]', t);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
select count (*) from FTT2 where xpath_contains (DT, '//chapter/descendant::para[position () > 10]', t);
-echo both $if $equ $last[1] 1630 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
-
+ECHO BOTH $IF $EQU $LAST[1] 1630 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
diff --git a/binsrc/tests/suite/gtkbench.sh b/binsrc/tests/suite/gtkbench.sh
index 4c8c040..c1071db 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/ident.txt b/binsrc/tests/suite/ident.txt
deleted file mode 100644
index 0f4c16f..0000000
--- a/binsrc/tests/suite/ident.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-REPORT
-VARCHAR
-_______________________________________________________________________________
-
-OpenLink Virtuoso Server
-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, 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
-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, 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,
- Currently 1 threads running 0 threads waiting 0 threads in vdb.
-Pending:
-
-Client 1111:1: Account: dba, 203 bytes in, 256 bytes out, 1 stmts.
-PID: 8379, OS: unix, Application: unknown, IP#: 127.0.0.1
-Transaction status: PENDING, 1 threads.
-Locks:
-
-
-Running Statements:
- Time (msec) Text
- 30 status()
-
-
-Hash indexes
-
diff --git a/binsrc/tests/suite/inprocess.sh b/binsrc/tests/suite/inprocess.sh
index b9b4962..410b4da 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# inprocess client tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/inprocess.sql b/binsrc/tests/suite/inprocess.sql
index 149d2e8..b255065 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- inprocess client tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/large_db.sh b/binsrc/tests/suite/large_db.sh
index 24faa44..573ea16 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# Large (>2Gb) database file support tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/large_db.sql b/binsrc/tests/suite/large_db.sql
index 6022e50..5a914cc 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -96,7 +96,3 @@ ECHO BOTH "traverse all trees";
backup '/dev/null';
ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
ECHO BOTH ": Travers all trees\n"
-
-
-
-
diff --git a/binsrc/tests/suite/large_db_3g.sql b/binsrc/tests/suite/large_db_3g.sql
index 456f49e..8f0034a 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -83,5 +83,3 @@ ECHO BOTH " Inserted: " $LAST[1] " bytes\n";
select make_1G('3G', 20000);
ECHO BOTH $IF $EQU $LAST[1] '3G' "PASSED" "***FAILED";
ECHO BOTH " Inserted: " $LAST[1] " bytes\n";
-
-
diff --git a/binsrc/tests/suite/large_db_3g_check.sql b/binsrc/tests/suite/large_db_3g_check.sql
index b3a327e..ef98046 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -37,4 +37,3 @@ ECHO BOTH ": Travers all trees\n";
select check_sum();
ECHO BOTH $IF $EQU $LAST[1] "373" "PASSED" "***FAILED";
ECHO BOTH " CHECK SUM:" $LAST[1] "\n"
-
diff --git a/binsrc/tests/suite/large_db_5g.sql b/binsrc/tests/suite/large_db_5g.sql
index 94f75d3..cb50a73 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -76,4 +76,3 @@ ECHO BOTH " Inserted: " $LAST[1] " bytes\n";
backup '/dev/null';
ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
ECHO BOTH ": Travers all trees\n";
-
diff --git a/binsrc/tests/suite/large_db_backup.sql b/binsrc/tests/suite/large_db_backup.sql
index 49cb7a1..65bf391 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/large_db_check.sql b/binsrc/tests/suite/large_db_check.sql
index 6d6b5b2..cb1ff82 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -32,4 +32,3 @@ ECHO BOTH " TEST table contains " $LAST[1] " rows\n";
backup '/dev/null';
ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
ECHO BOTH ": Travers all trees\n";
-
diff --git a/binsrc/tests/suite/ldmeter.sql b/binsrc/tests/suite/ldmeter.sql
index efa9fa2..1a15cf4 100644
--- a/binsrc/tests/suite/ldmeter.sql
+++ b/binsrc/tests/suite/ldmeter.sql
@@ -70,11 +70,17 @@ 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);
- exec ('ld_sample (0)', null, null, null);
+ stat := '00000';
+ exec ('ld_sample (0)', stat, msg, null);
+ if (stat <> '00000')
+ {
+ rollback work;
+ log_message (stat || ' ' || msg);
+ }
}
}
-
diff --git a/binsrc/tests/suite/lowerall.sh b/binsrc/tests/suite/lowerall.sh
index f4ea530..7374f01 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/mail.sql b/binsrc/tests/suite/mail.sql
index c5b7cf0..7294669 100644
--- a/binsrc/tests/suite/mail.sql
+++ b/binsrc/tests/suite/mail.sql
@@ -1,10 +1,10 @@
--
--- $Id: mail.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -153,4 +153,3 @@ select pop3_get ('localhost $U{POP3PORT}', 'user1', 'wrong_pwd', 88888, 'UiDL');
ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": POP3 wrong password check : STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-
diff --git a/binsrc/tests/suite/msdtc.sh b/binsrc/tests/suite/msdtc.sh
index 2bc183a..124b904 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 2007/03/14 14:18:51 source Exp $
+# $Id$
#
# MS DTC tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/msdtc_conn_check.sql b/binsrc/tests/suite/msdtc_conn_check.sql
index a548171..f1d37d2 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -27,5 +27,5 @@
-- ECHO BOTH ": mts_connect() : STATE=" $STATE "\n";
select mts_status ('MTS');
-echo both $if $equ $last[1] 'connected' "PASSED" "*** FAILED";
-echo both ": server " $last[1] " to MS DTC\n";
+ECHO BOTH $IF $EQU $LAST[1] 'connected' "PASSED" "***FAILED";
+ECHO BOTH ": server " $LAST[1] " to MS DTC\n";
diff --git a/binsrc/tests/suite/netmeter.sql b/binsrc/tests/suite/netmeter.sql
index 2afd8ed..c935c83 100644
--- a/binsrc/tests/suite/netmeter.sql
+++ b/binsrc/tests/suite/netmeter.sql
@@ -22,14 +22,15 @@ 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 int;
+ declare i, h, n, nh int;
+ nh := sys_stat ('cl_n_hosts');
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 < sys_stat ('cl_n_hosts'); h:= h + 1)
+ for (h := 1; h <= nh; 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 c975c93..b3066d4 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/noise.txt b/binsrc/tests/suite/noise.txt
deleted file mode 100644
index b6aedfe..0000000
--- a/binsrc/tests/suite/noise.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-Language: x-ViDoc
-1
-2
-3
-4
-5
-6
-7
-8
-9
-0
-$
-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
-about
-after
-all
-also
-an
-and
-another
-any
-are
-as
-at
-be
-because
-been
-before
-being
-between
-both
-but
-by
-came
-can
-come
-could
-did
-do
-does
-each
-else
-for
-from
-get
-got
-has
-had
-he
-have
-her
-here
-him
-himself
-his
-how
-if
-in
-into
-is
-it
-its
-just
-like
-make
-many
-me
-might
-more
-most
-much
-must
-my
-never
-now
-of
-on
-only
-or
-other
-our
-out
-over
-re
-said
-same
-see
-should
-since
-so
-some
-still
-such
-take
-than
-that
-the
-their
-them
-then
-there
-these
-they
-this
-those
-through
-to
-too
-under
-up
-use
-very
-want
-was
-way
-we
-well
-were
-what
-when
-where
-which
-while
-who
-will
-with
-would
-you
-your
diff --git a/binsrc/tests/suite/nwdemo.sql b/binsrc/tests/suite/nwdemo.sql
index 7fa1244..5235468 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/nwdemo_norefs.sql b/binsrc/tests/suite/nwdemo_norefs.sql
index 05fabde..5e9a9b0 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/nwdemo_update.sql b/binsrc/tests/suite/nwdemo_update.sql
index a5990ad..1b77742 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -30,4 +30,3 @@ UPDATE "Demo"."demo"."Products" SET "ProductName" = 'updated';
UPDATE "Demo"."demo"."Customers" SET "ContactTitle" = 'updated';
UPDATE "Demo"."demo"."Employees" SET "Address" = 'updated';
UPDATE "Demo"."demo"."Orders" SET "ShipName" = 'updated';
-
diff --git a/binsrc/tests/suite/nwxml.sh b/binsrc/tests/suite/nwxml.sh
index e2bc10b..9342239 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.2 2010/01/31 20:18:26 source Exp $
+# $Id$
#
# XML tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/nwxml.sql b/binsrc/tests/suite/nwxml.sql
index b279814..b4c0875 100644
--- a/binsrc/tests/suite/nwxml.sql
+++ b/binsrc/tests/suite/nwxml.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml.sql,v 1.2.2.1 2009/04/16 12:37:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -106,36 +106,36 @@ xml_view_doc ('ord', 'ord1');
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '/*/*', n);
-echo both $if $equ $last[1] 107 "PASSED" "*** FAILED";
-echo both ": " $last[1] " top level entities\n";
+ECHO BOTH $IF $EQU $LAST[1] 107 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " top level entities\n";
explain ('select count (n) from XML_TEXT where xpath_contains (XT_TEXT, ''/*/*'', n)', 2);
-echo both $if $equ $state OK "PASSED" "*** FAILED";
-echo both ": BUG 5796: scrollable cursor over xpath_contains STATE=" $state " MESSAGE=" $message "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": BUG 5796: scrollable cursor over xpath_contains STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '/document/category/@description', n);
-echo both $if $equ $last[1] 16 "PASSED" "*** FAILED";
-echo both ": " $last[1] " top level category entities\n";
+ECHO BOTH $IF $EQU $LAST[1] 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " top level category entities\n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category/product/@ProductName', n);
-echo both $if $equ $rowcnt 154 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under categories \n";
+ECHO BOTH $IF $EQU $ROWCNT 154 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under categories \n";
select count(n) from XML_TEXT where xpath_contains (XT_TEXT, '//product', n);
-echo both $if $equ $last[1] 2309 "PASSED" "*** FAILED";
-echo both ": " $last[1] " products under // \n";
+ECHO BOTH $IF $EQU $LAST[1] 2309 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " products under // \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category [@description like ''%Bread%''] /product/@ProductName', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under bread category in cat1 \n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under bread category in cat1 \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[../@description like ''Sea%'']', n);
-echo both $if $equ $rowcnt 24 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under seafood parent \n";
+ECHO BOTH $IF $EQU $ROWCNT 24 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under seafood parent \n";
@@ -144,17 +144,18 @@ select n from XML_TEXT where xpath_contains (XT_TEXT, '/*/category', n) and XT_F
-- compares BLOB colum
--XPATH [__view 'cat'] //product[../@description like 'Sea%' ];
---echo both $if $equ $rowcnt 12 "PASSED" "*** FAILED";
---echo both ": " $rowcnt " products in cat view under seafood parent \n";
+--ECHO BOTH $IF $EQU $ROWCNT 12 "PASSED" "***FAILED";
+--ECHO BOTH ": " $ROWCNT " products in cat view under seafood parent \n";
select count (*) from (XPATH '[__key __view "cat"] //*') n;
-echo both $if $equ $last[1] 85 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view cat \n";
+ECHO BOTH $IF $EQU $LAST[1] 85 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view cat \n";
+
select count (*) from (XPATH '[ __view "ord"] //*') n;
-echo both $if $equ $last[1] 5231 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view ord \n";
+ECHO BOTH $IF $EQU $LAST[1] 5231 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view ord \n";
@@ -163,25 +164,25 @@ echo both ": " $last[1] " in //* in view ord \n";
XPATH [__view 'cat'] //product[@ProductName like '%' ];
XPATH [__view 'cat'] /category/@description;
-echo both $if $equ $rowcnt 8 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " categories in cat view\n";
+ECHO BOTH $IF $EQU $ROWCNT 8 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " categories in cat view\n";
--select count (*) from (XPATH '[__* __doc "ord1"] //product') n;
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '//product', n) and XT_FILE = 'ord1';
-echo both $if $equ $last[1] 2155 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view ord \n";
+ECHO BOTH $IF $EQU $LAST[1] 2155 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view ord \n";
select count (*) from (XPATH '[__* __view "ord"] //product') n;
-echo both $if $equ $last[1] 2155 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view ord \n";
+ECHO BOTH $IF $EQU $LAST[1] 2155 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view ord \n";
XPATH [__key __view 'cat'] //product[@ProductName like '%nla%' ]/@ProductName;
-echo both $if $equ $last[1] "Inlagd Sill" "PASSED" "*** FAILED";
-echo both ": " $last[1] " is the name of %nla% in cat view\n";
+ECHO BOTH $IF $EQU $LAST[1] "Inlagd Sill" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " is the name of %nla% in cat view\n";
XPATH [__view 'cat'] /category[@description like 'Sea%'];
@@ -202,8 +203,8 @@ XPATH [__view 'cat'] /category[@* = 1];
-- compares BLOB column
--XPATH [__view 'cat'] //*[@* = 1];
---echo both $if $equ $rowcnt 1 "PASSED" "*** FAILED";
---echo both ": " $rowcnt " entities in cat with * = 1 \n";
+--ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+--ECHO BOTH ": " $ROWCNT " entities in cat with * = 1 \n";
@@ -211,13 +212,13 @@ XPATH [__view 'cat'] /category[@* = 1];
XPATH [__view 'cat'] length (category/@description);
--XPATH [__view 'cat'] /category[@description like 'Sea%']/product | /category[@description like '%Bread%']/product;
---echo both $if $equ $rowcnt 19 "PASSED" "*** FAILED";
---echo both ": " $rowcnt " rows in seafood union breads \n";
+--ECHO BOTH $IF $EQU $ROWCNT 19 "PASSED" "***FAILED";
+--ECHO BOTH ": " $ROWCNT " rows in seafood union breads \n";
XPATH [__view 'cat'] /category [.//product [@ProductName like 'L%']];
-echo both $if $equ $rowcnt 3 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " categories with a product like L% \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " categories with a product like L% \n";
@@ -265,20 +266,20 @@ select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName =
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/following-sibling::*', n);
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/preceding-sibling::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " siblings before Sill \n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " siblings before Sill \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/following-sibling::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " siblings after Sill \n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " siblings after Sill \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category[@description like ''**fish'']/descendant-or-self::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 13 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in seafood and descendants \n";
+ECHO BOTH $IF $EQU $ROWCNT 13 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in seafood and descendants \n";
-- test of XPATH reserved words
@@ -314,105 +315,105 @@ insert into xte values (sequence_next ('xte'), '<Ancestor/>');
select id,p from xte where xpath_contains (dt,'/div', p);
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/mod', p);
-echo both $if $equ $last[1] 2 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/not',p);
-echo both $if $equ $last[1] 3 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/or',p);
-echo both $if $equ $last[1] 4 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/and',p);
-echo both $if $equ $last[1] 5 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 5 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/ancestor',p);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/ancestor-or-self',p);
-echo both $if $equ $last[1] 7 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/attribute',p);
-echo both $if $equ $last[1] 8 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 8 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/child',p);
-echo both $if $equ $last[1] 9 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/descendant',p);
-echo both $if $equ $last[1] 10 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/descendant-or-self',p);
-echo both $if $equ $last[1] 11 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 11 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/following',p);
-echo both $if $equ $last[1] 12 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 12 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/following-sibling',p);
-echo both $if $equ $last[1] 13 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 13 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/node',p);
-echo both $if $equ $last[1] 14 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 14 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/text',p);
-echo both $if $equ $last[1] 15 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 15 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/processing-instruction',p);
-echo both $if $equ $last[1] 16 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/comment',p);
-echo both $if $equ $last[1] 17 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 17 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/namespace',p);
-echo both $if $equ $last[1] 18 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 18 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/parent',p);
-echo both $if $equ $last[1] 19 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 19 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/preceding',p);
-echo both $if $equ $last[1] 20 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/preceding-sibling',p);
-echo both $if $equ $last[1] 21 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 21 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/self',p);
-echo both $if $equ $last[1] 22 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 22 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
--select id,p from xte where xpath_contains (dt,'/near',p);
---echo both $if $equ $last[1] 23 "PASSED" "*** FAILED";
---echo both ": " $last[2] " keyword as path expression \n";
+--ECHO BOTH $IF $EQU $LAST[1] 23 "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
--select id,p from xte where xpath_contains (dt,'/like',p);
---echo both $if $equ $last[1] 24 "PASSED" "*** FAILED";
---echo both ": " $last[2] " keyword as path expression \n";
+--ECHO BOTH $IF $EQU $LAST[1] 24 "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/DiV',p);
-echo both $if $equ $last[1] 25 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 25 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/Ancestor',p);
-echo both $if $equ $last[1] 26 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 26 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/Div',p);
-echo both $if $equ $rowcnt 0 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " row(s) on /Div expression \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " row(s) on /Div expression \n";
insert into xte values (sequence_next ('xte'), '<a><not>and</not></a>');
select id from xte where xpath_contains(dt,'//not[not . = ''and'']');
-echo both $if $equ $last[1] 3 "PASSED" "*** FAILED";
-echo both ": " $last[1] " id on row contains //not[not . = 'and'] \n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " id on row contains //not[not . = 'and'] \n";
select * from xte where xpath_contains(dt,'//*[not (substring(not,1,2) = ''not'')]');
-echo both $if $equ $rowcnt 27 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " row(s) contains //*[not substring(not,1,2) = 'not'] \n";
+ECHO BOTH $IF $EQU $ROWCNT 27 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " row(s) contains //*[not substring(not,1,2) = 'not'] \n";
select * from xte where xpath_contains(dt,'//*[not (div = div)]');
-echo both $if $equ $rowcnt 27 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " row(s) contains //*[not div = div] \n";
+ECHO BOTH $IF $EQU $ROWCNT 27 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " row(s) contains //*[not div = div] \n";
select * from xte where xpath_contains(dt,'//*[not not = not]');
-echo both $if $equ $rowcnt 27 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " row(s) contains //*[not not = not] \n";
+ECHO BOTH $IF $EQU $ROWCNT 27 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " row(s) contains //*[not not = not] \n";
-- These queries should not crash
select xquery_eval ('//*', xtree_doc('<q><w/></q>'), 0);
diff --git a/binsrc/tests/suite/nwxml1.sql b/binsrc/tests/suite/nwxml1.sql
index 1ed12b6..19d23f7 100644
--- a/binsrc/tests/suite/nwxml1.sql
+++ b/binsrc/tests/suite/nwxml1.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml1.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -106,33 +106,33 @@ xml_view_doc ('ord', 'ord1');
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '/*/*', n);
-echo both $if $equ $last[1] 107 "PASSED" "*** FAILED";
-echo both ": " $last[1] " top level entities\n";
+ECHO BOTH $IF $EQU $LAST[1] 107 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " top level entities\n";
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '/document/category/@description', n);
-echo both $if $equ $last[1] 16 "PASSED" "*** FAILED";
-echo both ": " $last[1] " top level category entities\n";
+ECHO BOTH $IF $EQU $LAST[1] 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " top level category entities\n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category/product/@ProductName', n);
-echo both $if $equ $rowcnt 154 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under categories \n";
+ECHO BOTH $IF $EQU $ROWCNT 154 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under categories \n";
select count(n) from XML_TEXT where xpath_contains (XT_TEXT, '//product', n);
-echo both $if $equ $last[1] 2309 "PASSED" "*** FAILED";
-echo both ": " $last[1] " products under // \n";
+ECHO BOTH $IF $EQU $LAST[1] 2309 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " products under // \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category [@description like ''%Bread%''] /product/@ProductName', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under bread category in cat1 \n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under bread category in cat1 \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[../@description like ''Sea%'']', n);
-echo both $if $equ $rowcnt 24 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under seafood parent \n";
+ECHO BOTH $IF $EQU $ROWCNT 24 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under seafood parent \n";
@@ -141,8 +141,8 @@ select n from XML_TEXT where xpath_contains (XT_TEXT, '/*/category', n) and XT_F
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '//product', n) and XT_FILE = 'ord1';
-echo both $if $equ $last[1] 2155 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view ord \n";
+ECHO BOTH $IF $EQU $LAST[1] 2155 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view ord \n";
@@ -187,20 +187,20 @@ select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName =
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/following-sibling::*', n);
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/preceding-sibling::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " siblings before Sill \n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " siblings before Sill \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/following-sibling::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " siblings after Sill \n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " siblings after Sill \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category[@description like ''**fish'']/descendant-or-self::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 13 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in seafood and descendants \n";
+ECHO BOTH $IF $EQU $ROWCNT 13 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in seafood and descendants \n";
-- test of XPATH reserved words
@@ -236,105 +236,102 @@ insert into xte values (sequence_next ('xte'), '<Ancestor/>');
select id,p from xte where xpath_contains (dt,'/div', p);
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/mod', p);
-echo both $if $equ $last[1] 2 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/not',p);
-echo both $if $equ $last[1] 3 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/or',p);
-echo both $if $equ $last[1] 4 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/and',p);
-echo both $if $equ $last[1] 5 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 5 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/ancestor',p);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/ancestor-or-self',p);
-echo both $if $equ $last[1] 7 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/attribute',p);
-echo both $if $equ $last[1] 8 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 8 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/child',p);
-echo both $if $equ $last[1] 9 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/descendant',p);
-echo both $if $equ $last[1] 10 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/descendant-or-self',p);
-echo both $if $equ $last[1] 11 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 11 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/following',p);
-echo both $if $equ $last[1] 12 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 12 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/following-sibling',p);
-echo both $if $equ $last[1] 13 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 13 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/node',p);
-echo both $if $equ $last[1] 14 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 14 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/text',p);
-echo both $if $equ $last[1] 15 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 15 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/processing-instruction',p);
-echo both $if $equ $last[1] 16 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/comment',p);
-echo both $if $equ $last[1] 17 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 17 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/namespace',p);
-echo both $if $equ $last[1] 18 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 18 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/parent',p);
-echo both $if $equ $last[1] 19 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 19 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/preceding',p);
-echo both $if $equ $last[1] 20 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/preceding-sibling',p);
-echo both $if $equ $last[1] 21 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 21 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/self',p);
-echo both $if $equ $last[1] 22 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 22 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
--select id,p from xte where xpath_contains (dt,'/near',p);
---echo both $if $equ $last[1] 23 "PASSED" "*** FAILED";
---echo both ": " $last[2] " keyword as path expression \n";
+--ECHO BOTH $IF $EQU $LAST[1] 23 "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
--select id,p from xte where xpath_contains (dt,'/like',p);
---echo both $if $equ $last[1] 24 "PASSED" "*** FAILED";
---echo both ": " $last[2] " keyword as path expression \n";
+--ECHO BOTH $IF $EQU $LAST[1] 24 "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/DiV',p);
-echo both $if $equ $last[1] 25 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 25 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/Ancestor',p);
-echo both $if $equ $last[1] 26 "PASSED" "*** FAILED";
-echo both ": " $last[2] " keyword as path expression \n";
+ECHO BOTH $IF $EQU $LAST[1] 26 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[2] " keyword as path expression \n";
select id,p from xte where xpath_contains (dt,'/Div',p);
-echo both $if $equ $rowcnt 0 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " row(s) on /Div expression \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " row(s) on /Div expression \n";
insert into xte values (sequence_next ('xte'), '<a><not>and</not></a>');
select id from xte where xpath_contains(dt,'//not[not . = ''and'']');
-echo both $if $equ $last[1] 3 "PASSED" "*** FAILED";
-echo both ": " $last[1] " id on row contains //not[not . = 'and'] \n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " id on row contains //not[not . = 'and'] \n";
select * from xte where xpath_contains(dt,'//*[not substring(not,1,2) = ''not'']');
-echo both $if $equ $rowcnt 27 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " row(s) contains //*[not substring(not,1,2) = 'not'] \n";
+ECHO BOTH $IF $EQU $ROWCNT 27 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " row(s) contains //*[not substring(not,1,2) = 'not'] \n";
select * from xte where xpath_contains(dt,'//*[not div = div]');
-echo both $if $equ $rowcnt 27 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " row(s) contains //*[not div = div] \n";
+ECHO BOTH $IF $EQU $ROWCNT 27 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " row(s) contains //*[not div = div] \n";
select * from xte where xpath_contains(dt,'//*[not not = not]');
-echo both $if $equ $rowcnt 27 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " row(s) contains //*[not not = not] \n";
-
-
-
+ECHO BOTH $IF $EQU $ROWCNT 27 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " row(s) contains //*[not not = not] \n";
diff --git a/binsrc/tests/suite/nwxml2.sql b/binsrc/tests/suite/nwxml2.sql
index 6144a56..d534735 100644
--- a/binsrc/tests/suite/nwxml2.sql
+++ b/binsrc/tests/suite/nwxml2.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml2.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -35,20 +35,20 @@ select p from XML_TEXT where xpath_contains (XT_TEXT, '/document/category[@descr
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//*', p);
-echo both $if $equ $last[1] 5404 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in xpath_contains '//*'\n";
+ECHO BOTH $IF $EQU $LAST[1] 5404 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in xpath_contains '//*'\n";
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//*/*', p);
-echo both $if $equ $last[1] 5401 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in xpath_contains '//*/*'\n";
+ECHO BOTH $IF $EQU $LAST[1] 5401 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in xpath_contains '//*/*'\n";
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//*[@* = ''Inlagd Sill'']', p);
-echo both $if $equ $last[1] 33 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in xpath_contains //*[@* = 'Inlagd Sill']\n";
+ECHO BOTH $IF $EQU $LAST[1] 33 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in xpath_contains //*[@* = 'Inlagd Sill']\n";
select xpath_eval ('@product_name', p) from XML_TEXT where xpath_contains (XT_TEXT, '//*[@* = ''Inlagd Sill'']', p);
-echo both $if $equ $rowcnt 33 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_eval (@product_name) of xpath_contains //*[@* = 'Inlagd Sill']\n";
+ECHO BOTH $IF $EQU $ROWCNT 33 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_eval (@product_name) of xpath_contains //*[@* = 'Inlagd Sill']\n";
select p from XML_TEXT where xpath_contains (XT_TEXT, '//*[@* = ''Inlagd Sill'' and @unit_price > 100]', p);
@@ -153,48 +153,48 @@ DB.DBA.vt_inc_index_DB_DBA_XML_TEXT ();
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title', t);
-echo both $if $equ $rowcnt 792 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 792 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]', t);
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title [.=''ISOLATION'' ]', t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 16 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title [.=''ISOLATION'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
--- echo both $if $equ $last[1] "<title>SQL Reference</title>" "PASSED" "*** FAILED";
--- echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
+-- ECHO BOTH $IF $EQU $LAST[1] "<title>SQL Reference</title>" "PASSED" "***FAILED";
+-- ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//chapter/title', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title\n";
---echo both $if $equ $last[1] "<title>Virtual Database Concepts</title>" "PASSED" "*** FAILED";
---echo both ": " $last[1] " last row in xpath_contains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title\n";
+--ECHO BOTH $IF $EQU $LAST[1] "<title>Virtual Database Concepts</title>" "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[1] " last row in xpath_contains //chapter/title\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//chapter/title[position () = 1]', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title[position () = 1]\n";
--- echo both $if $equ $last[1] "<title>International character support and compatibility</title>" "PASSED" "*** FAILED";
--- echo both ": " $last[1] " last row in xpath_contains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title[position () = 1]\n";
+-- ECHO BOTH $IF $EQU $LAST[1] "<title>International character support and compatibility</title>" "PASSED" "***FAILED";
+-- ECHO BOTH ": " $LAST[1] " last row in xpath_contains //chapter/title[position () = 1]\n";
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//chapter//para[position () > 10]', t);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//chapter/descendant::para[position () > 10]', t);
-echo both $if $equ $last[1] 1630 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 1630 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
select c from XML_TEXT where xpath_contains (XT_TEXT, '//customer[.//product/@unit_price > 20]/@name', c);
@@ -204,8 +204,8 @@ select p from XML_TEXT where xpath_contains (XT_TEXT, '(document/category/produc
select p from XML_TEXT where xpath_contains (XT_TEXT, '(document/category/product)[position () > 22 and position() < 33]', p);
select count (*) from XML_TEXT where XT_ID = 1 and xpath_contains (XT_TEXT, '1 > 2 != 2 > 1');
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains 1 > 2 != 2 > 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains 1 > 2 != 2 > 1\n";
select p from XML_TEXT where xpath_contains (XT_TEXT, '[xmlns:r="http://www.w3.org/TR/RDF/"]//*[@r:id = "Top"]', p);
@@ -213,14 +213,14 @@ select p from XML_TEXT where xpath_contains (XT_TEXT, '[xmlns:r="http://www.w3.o
select SCORE, XT_FILE from XML_TEXT where contains (XT_TEXT, '"case sensitive"');
-echo both $if $equ $rowcnt 3 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in contains case sensitive\n";
-echo both $if $equ $last[1] 120 "PASSED" "*** FAILED";
-echo both ": " $last[1] " last score in contains case sensitive\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in contains case sensitive\n";
+ECHO BOTH $IF $EQU $LAST[1] 120 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last score in contains case sensitive\n";
explain ('select SCORE, XT_FILE from XML_TEXT where contains (XT_TEXT, ''"case sensitive"'')', 2);
-echo both $if $equ $state OK "PASSED" "*** FAILED";
-echo both ": BUG 5796: scrollable cursor over contains STATE=" $state " MESSAGE=" $message "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": BUG 5796: scrollable cursor over contains STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select SCORE, XT_FILE from XML_TEXT where contains (XT_TEXT, '"case sensitive"') order by XT_ID desc;
@@ -268,12 +268,12 @@ select xpath_eval ('translate ("1234567 1234567", "123", "abc")', xml_tree_doc (
select xpath_eval ('round-number (11.2)', xml_tree_doc (xml_tree ('<a><b>11</b><b>33</b></a>')), 1);
select length (xpath_eval ('//@href', xml_tree_doc (xml_tree ('<html><a href="1">11</a><ul><a href = "2"></a></ul><ul><a name="test"></a></ul></html>')), 0));
-echo both $IF $EQU $LAST[1] 2 "PASSED" "*** FAILED";
-echo both ": " $LAST[1] " rows in xpath_eval //@href\n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "*** FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_eval //@href\n";
select length (xpath_eval ('//a/@name', xml_tree_doc (xml_tree ('<html><a href="1">11</a><ul><a href = "2"></a></ul><ul><a name="test"></a></ul></html>')), 0));
-echo both $IF $EQU $LAST[1] 1 "PASSED" "*** FAILED";
-echo both ": " $LAST[1] " rows in xpath_eval //a/@name\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "*** FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_eval //a/@name\n";
--- free text options
diff --git a/binsrc/tests/suite/nwxml2_vad.sql b/binsrc/tests/suite/nwxml2_vad.sql
index fce38ab..630b884 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 2007/03/22 13:08:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/nwxml3.sql b/binsrc/tests/suite/nwxml3.sql
index 93b4c7c..707e892 100644
--- a/binsrc/tests/suite/nwxml3.sql
+++ b/binsrc/tests/suite/nwxml3.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml3.sql,v 1.2.2.1 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -97,48 +97,48 @@ vt_inc_index_DB_DBA_XML_TEXT2 ();
select xtree_doc (XT_TEXT) from XML_TEXT2 where XT_FILE = 'ce.xml';
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title', t);
-echo both $if $equ $rowcnt 792 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 792 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]', t);
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title [.=''ISOLATION'' ]', t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 16 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title [.=''ISOLATION'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
--- echo both $if $equ $last[1] "<title>SQL Reference</title>" "PASSED" "*** FAILED";
--- echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
+-- ECHO BOTH $IF $EQU $LAST[1] "<title>SQL Reference</title>" "PASSED" "***FAILED";
+-- ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//chapter/title', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title\n";
---echo both $if $equ $last[1] "<title>Virtual Database Concepts</title>" "PASSED" "*** FAILED";
---echo both ": " $last[1] " last row in xpath_contains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title\n";
+--ECHO BOTH $IF $EQU $LAST[1] "<title>Virtual Database Concepts</title>" "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[1] " last row in xpath_contains //chapter/title\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//chapter/title[position () = 1]', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title[position () = 1]\n";
--- echo both $if $equ $last[1] "<title>International character support and compatibility</title>" "PASSED" "*** FAILED";
--- echo both ": " $last[1] " last row in xpath_contains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title[position () = 1]\n";
+-- ECHO BOTH $IF $EQU $LAST[1] "<title>International character support and compatibility</title>" "PASSED" "***FAILED";
+-- ECHO BOTH ": " $LAST[1] " last row in xpath_contains //chapter/title[position () = 1]\n";
select count (*) from XML_TEXT2 where xpath_contains (XT_TEXT, '//chapter//para[position () > 10]', t);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
select count (*) from XML_TEXT2 where xpath_contains (XT_TEXT, '//chapter/descendant::para[position () > 10]', t);
-echo both $if $equ $last[1] 1630 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 1630 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
select c from XML_TEXT2 where xpath_contains (XT_TEXT, '//customer[.//product/@unit_price > 20]/@name', c);
@@ -148,8 +148,8 @@ select p from XML_TEXT2 where xpath_contains (XT_TEXT, '(document/category/produ
select p from XML_TEXT2 where xpath_contains (XT_TEXT, '(document/category/product)[position () > 22 and position() < 33]', p);
select count (*) from XML_TEXT2 where XT_ID = 1 and xpath_contains (XT_TEXT, '1 > 2 != 2 > 1');
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains 1 > 2 != 2 > 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains 1 > 2 != 2 > 1\n";
select p from XML_TEXT2 where xpath_contains (XT_TEXT, '[xmlns:r="http://www.w3.org/TR/RDF/"]//*[@r:id = "Top"]', p);
@@ -157,10 +157,10 @@ select p from XML_TEXT2 where xpath_contains (XT_TEXT, '[xmlns:r="http://www.w3.
select SCORE, XT_FILE from XML_TEXT2 where contains (XT_TEXT, '"case sensitive"');
-echo both $if $equ $rowcnt 3 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in contains case sensitive\n";
-echo both $if $equ $last[1] 176 "PASSED" "*** FAILED";
-echo both ": " $last[1] " last score in contains case sensitive\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in contains case sensitive\n";
+ECHO BOTH $IF $EQU $LAST[1] 176 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last score in contains case sensitive\n";
select SCORE, XT_FILE from XML_TEXT2 where contains (XT_TEXT, '"case sensitive"') order by XT_ID desc;
@@ -200,4 +200,3 @@ select n from XML_TEXT2 where xpath_contains (XT_TEXT, '//product [contains (@Pr
select n from XML_TEXT2 where xpath_contains (XT_TEXT, '//product [string-length (@ProductName) > 25]', n);
-
diff --git a/binsrc/tests/suite/nwxml3a.sql b/binsrc/tests/suite/nwxml3a.sql
index 4ad2f4c..e70bcaf 100644
--- a/binsrc/tests/suite/nwxml3a.sql
+++ b/binsrc/tests/suite/nwxml3a.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml3a.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -85,8 +85,8 @@ create procedure fill_xtf_3()
fill_xtf_1_2();
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG2 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " XPERs were cropped with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " XPERs were cropped with errors\n";
insert into LONG_XML_TEXTS (LXML_NAME, LXML_DOC) values ('/Doc' , '<a/>');
insert into LONG_XML_TEXTS (LXML_NAME, LXML_DOC) values ('/Doc/cha1' , '<a/>');
@@ -101,11 +101,11 @@ checkpoint;
fill_xtf_3();
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG2 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " explicitly cropped XPERs were filled with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " explicitly cropped XPERs were filled with errors\n";
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG3 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " implicitly cropped XPERs were filled with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " implicitly cropped XPERs were filled with errors\n";
update LONG_XML_TEXTS set LXML_DOC = '<?xml version="1.0"?>
<!DOCTYPE book [
@@ -146,5 +146,5 @@ where LXML_NAME = '/Doc/sub22';
select LXML_NAME, FRAG from LONG_XML_TEXTS where xpath_contains (LXML_DOC, '//*', FRAG);
select count (FRAG) from LONG_XML_TEXTS where xpath_contains (LXML_DOC, '//*', FRAG);
-- There was a bug here: there must be 19 fragments, not 11 or 15.
-echo both $if $equ $last[1] 19 "PASSED" "*** FAILED";
-echo both ": " $last[1] " fragments in LONG XML column before log replay\n";
+ECHO BOTH $IF $EQU $LAST[1] 19 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " fragments in LONG XML column before log replay\n";
diff --git a/binsrc/tests/suite/nwxml3b.sql b/binsrc/tests/suite/nwxml3b.sql
index 428a94b..4d57e07 100644
--- a/binsrc/tests/suite/nwxml3b.sql
+++ b/binsrc/tests/suite/nwxml3b.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml3b.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -21,14 +21,14 @@
--
--
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG2 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " explicitly cropped XPERs were recovered from log with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " explicitly cropped XPERs were recovered from log with errors\n";
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG3 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " implicitly cropped XPERs were recovered from log with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " implicitly cropped XPERs were recovered from log with errors\n";
select LXML_NAME, FRAG from LONG_XML_TEXTS where xpath_contains (LXML_DOC, '//*', FRAG);
select count (FRAG) from LONG_XML_TEXTS where xpath_contains (LXML_DOC, '//*', FRAG);
-- There was an bug here: must be 19 frags, not 11 or 15.
-echo both $if $equ $last[1] 19 "PASSED" "*** FAILED";
-echo both ": " $last[1] " fragments in LONG XML column after log replay\n";
+ECHO BOTH $IF $EQU $LAST[1] 19 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " fragments in LONG XML column after log replay\n";
diff --git a/binsrc/tests/suite/nwxml3c.sql b/binsrc/tests/suite/nwxml3c.sql
index add165f..d3741ba 100644
--- a/binsrc/tests/suite/nwxml3c.sql
+++ b/binsrc/tests/suite/nwxml3c.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml3c.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -20,16 +20,16 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
--
---echo both "\nnwxml3c - Attribute tests\n"
+--ECHO BOTH "\nnwxml3c - Attribute tests\n"
select count(*) from XML_TEXT2 where XT_FILE like '%proce%' and xcontains (XT_TEXT, '//sect1[@id = "whilestmt"]');
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xcontains //sect1[@id = ''whilestmt''] where XT_FILE like '%proce%'\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xcontains //sect1[@id = ''whilestmt''] where XT_FILE like '%proce%'\n";
select count(*) from XML_TEXT2 where XT_FILE like '%proce%' and xcontains (XT_TEXT, '//sect2[@id like "whilestmt"]');
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xcontains //sect2[@id like ''whilestmt''] where XT_FILE like '%proce%'\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xcontains //sect2[@id like ''whilestmt''] where XT_FILE like '%proce%'\n";
select count(*) from XML_TEXT2 where XT_FILE like '%proce%' and xcontains (XT_TEXT, '//sect2[@id = "whilestmt"]');
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xcontains //sect2[@id = ''whilestmt''] where XT_FILE like '%proce%'\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xcontains //sect2[@id = ''whilestmt''] where XT_FILE like '%proce%'\n";
diff --git a/binsrc/tests/suite/nwxml4.sql b/binsrc/tests/suite/nwxml4.sql
index 055f95f..4874668 100644
--- a/binsrc/tests/suite/nwxml4.sql
+++ b/binsrc/tests/suite/nwxml4.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml4.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -21,40 +21,40 @@
--
--
select t from XML_TEXT2 where xcontains (XT_TEXT, '//title', 0, t);
-echo both $if $equ $rowcnt 397 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xcontains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 397 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xcontains //title\n";
explain ('select t from XML_TEXT2 where xcontains (XT_TEXT, ''//title'', 0, t)', 2);
-echo both $if $equ $state OK "PASSED" "*** FAILED";
-echo both ": BUG 5796: scrollable cursor over xcontains STATE=" $state " MESSAGE=" $message "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": BUG 5796: scrollable cursor over xcontains STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select t from XML_TEXT2 where xcontains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]', 0, t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xcontains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xcontains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xcontains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xcontains //title [. like '%ISOLATION%' ]\n";
select t from XML_TEXT2 where xcontains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', 0, t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xcontains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
-echo both $if $equ $last[1] "<title>SQL Reference</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xcontains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xcontains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL Reference</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xcontains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT2 where xcontains (XT_TEXT, '//chapter/title', 0, t);
-echo both $if $equ $rowcnt 10 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xcontains //chapter/title\n";
-echo both $if $equ $last[1] "<title>Virtual Database Concepts</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xcontains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xcontains //chapter/title\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>Virtual Database Concepts</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xcontains //chapter/title\n";
select t from XML_TEXT2 where xcontains (XT_TEXT, '//chapter/title[position () = 1]', 0, t);
-echo both $if $equ $rowcnt 10 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xcontains //chapter/title[position () = 1]\n";
-echo both $if $equ $last[1] "<title>Virtual Database Concepts</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xcontains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xcontains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>Virtual Database Concepts</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xcontains //chapter/title[position () = 1]\n";
select count (*) from XML_TEXT2 where xcontains (XT_TEXT, '//chapter//para[position () > 10]', 0, t);
-echo both $if $equ $last[1] 3 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xcontains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xcontains //chapter//para[position () > 10]\n";
select c from XML_TEXT2 where xcontains (XT_TEXT, '//customer[.//product/@unit_price > 20]/@name', 0, c);
@@ -64,17 +64,17 @@ select p from XML_TEXT2 where xcontains (XT_TEXT, '(document/category/product)[2
select p from XML_TEXT2 where xcontains (XT_TEXT, '(document/category/product)[position () > 22 and position() < 33]', 0, p);
select count (*) from XML_TEXT2 where XT_ID = 1 and xcontains (XT_TEXT, '1 > 2 != 2 > 1');
---echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
---echo both ": " $last[1] " rows in xcontains 1 > 2 != 2 > 1\n";
+--ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[1] " rows in xcontains 1 > 2 != 2 > 1\n";
select p from XML_TEXT2 where xcontains (XT_TEXT, '[xmlns:r="http://www.w3.org/TR/RDF/"]//*[@r:id = "Top"]', 0, p);
select SCORE, XT_FILE from XML_TEXT2 where contains (XT_TEXT, '"case sensitive"');
-echo both $if $equ $rowcnt 3 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in contains case sensitive\n";
-echo both $if $equ $last[1] 176 "PASSED" "*** FAILED";
-echo both ": " $last[1] " last score in contains case sensitive\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in contains case sensitive\n";
+ECHO BOTH $IF $EQU $LAST[1] 176 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last score in contains case sensitive\n";
select SCORE, XT_FILE from XML_TEXT2 where contains (XT_TEXT, '"case sensitive"') order by XT_ID desc;
diff --git a/binsrc/tests/suite/nwxml_vad.sql b/binsrc/tests/suite/nwxml_vad.sql
index 092e545..279c8fe 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 2007/11/30 09:41:08 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/nwxmla.sql b/binsrc/tests/suite/nwxmla.sql
index 21ad71f..afea407 100644
--- a/binsrc/tests/suite/nwxmla.sql
+++ b/binsrc/tests/suite/nwxmla.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmla.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -215,4 +215,3 @@ XPATH [__view 'pay'] //*;
ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": xml view with a large number of columns STATE=" $STATE " MESSAGE=" $MESSAGE " rows\n";
-
diff --git a/binsrc/tests/suite/nwxmlb.sql b/binsrc/tests/suite/nwxmlb.sql
index 461363a..4b42900 100644
--- a/binsrc/tests/suite/nwxmlb.sql
+++ b/binsrc/tests/suite/nwxmlb.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmlb.sql,v 1.1 2007/07/09 23:13:03 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -107,36 +107,36 @@ xml_view_doc ('ord', 'ord1');
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '/*/*', n);
-echo both $if $equ $last[1] 107 "PASSED" "*** FAILED";
-echo both ": " $last[1] " top level entities\n";
+ECHO BOTH $IF $EQU $LAST[1] 107 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " top level entities\n";
explain ('select count (n) from XML_TEXT where xpath_contains (XT_TEXT, ''/*/*'', n)', 2);
-echo both $if $equ $state OK "PASSED" "*** FAILED";
-echo both ": BUG 5796: scrollable cursor over xpath_contains STATE=" $state " MESSAGE=" $message "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": BUG 5796: scrollable cursor over xpath_contains STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '/document/category/@description', n);
-echo both $if $equ $last[1] 16 "PASSED" "*** FAILED";
-echo both ": " $last[1] " top level category entities\n";
+ECHO BOTH $IF $EQU $LAST[1] 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " top level category entities\n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category/product/@ProductName', n);
-echo both $if $equ $rowcnt 154 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under categories \n";
+ECHO BOTH $IF $EQU $ROWCNT 154 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under categories \n";
select count(n) from XML_TEXT where xpath_contains (XT_TEXT, '//product', n);
-echo both $if $equ $last[1] 2309 "PASSED" "*** FAILED";
-echo both ": " $last[1] " products under // \n";
+ECHO BOTH $IF $EQU $LAST[1] 2309 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " products under // \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category [@description like ''%Bread%''] /product/@ProductName', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under bread category in cat1 \n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under bread category in cat1 \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[../@description like ''Sea%'']', n);
-echo both $if $equ $rowcnt 24 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " products under seafood parent \n";
+ECHO BOTH $IF $EQU $ROWCNT 24 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " products under seafood parent \n";
@@ -145,17 +145,17 @@ select n from XML_TEXT where xpath_contains (XT_TEXT, '/*/category', n) and XT_F
-- compares BLOB colum
--XPATH [__view 'cat'] //product[../@description like 'Sea%' ];
---echo both $if $equ $rowcnt 12 "PASSED" "*** FAILED";
---echo both ": " $rowcnt " products in cat view under seafood parent \n";
+--ECHO BOTH $IF $EQU $ROWCNT 12 "PASSED" "***FAILED";
+--ECHO BOTH ": " $ROWCNT " products in cat view under seafood parent \n";
select count (*) from (XPATH '[__key __view "cat"] //*') n;
-echo both $if $equ $last[1] 85 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view cat \n";
+ECHO BOTH $IF $EQU $LAST[1] 85 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view cat \n";
select count (*) from (XPATH '[ __view "ord"] //*') n;
-echo both $if $equ $last[1] 5231 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view ord \n";
+ECHO BOTH $IF $EQU $LAST[1] 5231 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view ord \n";
@@ -164,25 +164,25 @@ echo both ": " $last[1] " in //* in view ord \n";
XPATH [__view 'cat'] //product[@ProductName like '%' ];
XPATH [__view 'cat'] /category/@description;
-echo both $if $equ $rowcnt 8 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " categories in cat view\n";
+ECHO BOTH $IF $EQU $ROWCNT 8 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " categories in cat view\n";
--select count (*) from (XPATH '[__* __doc "ord1"] //product') n;
select count (n) from XML_TEXT where xpath_contains (XT_TEXT, '//product', n) and XT_FILE = 'ord1';
-echo both $if $equ $last[1] 2155 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view ord \n";
+ECHO BOTH $IF $EQU $LAST[1] 2155 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view ord \n";
select count (*) from (XPATH '[__* __view "ord"] //product') n;
-echo both $if $equ $last[1] 2155 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in //* in view ord \n";
+ECHO BOTH $IF $EQU $LAST[1] 2155 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in //* in view ord \n";
XPATH [__key __view 'cat'] //product[@ProductName like '%nla%' ]/@ProductName;
-echo both $if $equ $last[1] "Inlagd Sill" "PASSED" "*** FAILED";
-echo both ": " $last[1] " is the name of %nla% in cat view\n";
+ECHO BOTH $IF $EQU $LAST[1] "Inlagd Sill" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " is the name of %nla% in cat view\n";
XPATH [__view 'cat'] /category[@description like 'Sea%'];
@@ -203,8 +203,8 @@ XPATH [__view 'cat'] /category[@* = 1];
-- compares BLOB column
--XPATH [__view 'cat'] //*[@* = 1];
---echo both $if $equ $rowcnt 1 "PASSED" "*** FAILED";
---echo both ": " $rowcnt " entities in cat with * = 1 \n";
+--ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+--ECHO BOTH ": " $ROWCNT " entities in cat with * = 1 \n";
@@ -212,13 +212,13 @@ XPATH [__view 'cat'] /category[@* = 1];
XPATH [__view 'cat'] length (category/@description);
--XPATH [__view 'cat'] /category[@description like 'Sea%']/product | /category[@description like '%Bread%']/product;
---echo both $if $equ $rowcnt 19 "PASSED" "*** FAILED";
---echo both ": " $rowcnt " rows in seafood union breads \n";
+--ECHO BOTH $IF $EQU $ROWCNT 19 "PASSED" "***FAILED";
+--ECHO BOTH ": " $ROWCNT " rows in seafood union breads \n";
XPATH [__view 'cat'] /category [.//product [@ProductName like 'L%']];
-echo both $if $equ $rowcnt 3 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " categories with a product like L% \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " categories with a product like L% \n";
@@ -266,20 +266,20 @@ select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName =
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/following-sibling::*', n);
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/preceding-sibling::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " siblings before Sill \n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " siblings before Sill \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '//product[@ProductName = ''Inlagd Sill'']/following-sibling::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " siblings after Sill \n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " siblings after Sill \n";
select n from XML_TEXT where xpath_contains (XT_TEXT, '/document/category[@description like ''**fish'']/descendant-or-self::*', n) and XT_FILE = 'cat1';
-echo both $if $equ $rowcnt 13 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in seafood and descendants \n";
+ECHO BOTH $IF $EQU $ROWCNT 13 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in seafood and descendants \n";
select cat from XML_TEXT where xpath_contains (XT_TEXT, 'document/category', cat);
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, 'document/category', cat);
@@ -292,20 +292,20 @@ select p from XML_TEXT where xpath_contains (XT_TEXT, '/document/category[@descr
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//*', p);
-echo both $if $equ $last[1] 5404 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in xpath_contains '//*'\n";
+ECHO BOTH $IF $EQU $LAST[1] 5404 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in xpath_contains '//*'\n";
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//*/*', p);
-echo both $if $equ $last[1] 5401 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in xpath_contains '//*/*'\n";
+ECHO BOTH $IF $EQU $LAST[1] 5401 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in xpath_contains '//*/*'\n";
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//*[@* = ''Inlagd Sill'']', p);
-echo both $if $equ $last[1] 33 "PASSED" "*** FAILED";
-echo both ": " $last[1] " in xpath_contains //*[@* = 'Inlagd Sill']\n";
+ECHO BOTH $IF $EQU $LAST[1] 33 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in xpath_contains //*[@* = 'Inlagd Sill']\n";
select xpath_eval ('@product_name', p) from XML_TEXT where xpath_contains (XT_TEXT, '//*[@* = ''Inlagd Sill'']', p);
-echo both $if $equ $rowcnt 33 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_eval (@product_name) of xpath_contains //*[@* = 'Inlagd Sill']\n";
+ECHO BOTH $IF $EQU $ROWCNT 33 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_eval (@product_name) of xpath_contains //*[@* = 'Inlagd Sill']\n";
select p from XML_TEXT where xpath_contains (XT_TEXT, '//*[@* = ''Inlagd Sill'' and @unit_price > 100]', p);
@@ -410,48 +410,48 @@ DB.DBA.vt_inc_index_DB_DBA_XML_TEXT ();
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title', t);
-echo both $if $equ $rowcnt 792 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 792 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]', t);
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title [.=''ISOLATION'' ]', t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 16 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//title [.=''ISOLATION'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
--- echo both $if $equ $last[1] "<title>SQL Reference</title>" "PASSED" "*** FAILED";
--- echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
+-- ECHO BOTH $IF $EQU $LAST[1] "<title>SQL Reference</title>" "PASSED" "***FAILED";
+-- ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//chapter/title', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title\n";
---echo both $if $equ $last[1] "<title>Virtual Database Concepts</title>" "PASSED" "*** FAILED";
---echo both ": " $last[1] " last row in xpath_contains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title\n";
+--ECHO BOTH $IF $EQU $LAST[1] "<title>Virtual Database Concepts</title>" "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[1] " last row in xpath_contains //chapter/title\n";
select t from XML_TEXT where xpath_contains (XT_TEXT, '//chapter/title[position () = 1]', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title[position () = 1]\n";
--- echo both $if $equ $last[1] "<title>International character support and compatibility</title>" "PASSED" "*** FAILED";
--- echo both ": " $last[1] " last row in xpath_contains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title[position () = 1]\n";
+-- ECHO BOTH $IF $EQU $LAST[1] "<title>International character support and compatibility</title>" "PASSED" "***FAILED";
+-- ECHO BOTH ": " $LAST[1] " last row in xpath_contains //chapter/title[position () = 1]\n";
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//chapter//para[position () > 10]', t);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
select count (*) from XML_TEXT where xpath_contains (XT_TEXT, '//chapter/descendant::para[position () > 10]', t);
-echo both $if $equ $last[1] 1630 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 1630 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
select c from XML_TEXT where xpath_contains (XT_TEXT, '//customer[.//product/@unit_price > 20]/@name', c);
@@ -461,8 +461,8 @@ select p from XML_TEXT where xpath_contains (XT_TEXT, '(document/category/produc
select p from XML_TEXT where xpath_contains (XT_TEXT, '(document/category/product)[position () > 22 and position() < 33]', p);
select count (*) from XML_TEXT where XT_ID = 10000000000 and xpath_contains (XT_TEXT, '1 > 2 != 2 > 1');
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains 1 > 2 != 2 > 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains 1 > 2 != 2 > 1\n";
select p from XML_TEXT where xpath_contains (XT_TEXT, '[xmlns:r="http://www.w3.org/TR/RDF/"]//*[@r:id = "Top"]', p);
@@ -470,14 +470,14 @@ select p from XML_TEXT where xpath_contains (XT_TEXT, '[xmlns:r="http://www.w3.o
select SCORE, XT_FILE from XML_TEXT where contains (XT_TEXT, '"case sensitive"');
-echo both $if $equ $rowcnt 3 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in contains case sensitive\n";
-echo both $if $equ $last[1] 120 "PASSED" "*** FAILED";
-echo both ": " $last[1] " last score in contains case sensitive\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in contains case sensitive\n";
+ECHO BOTH $IF $EQU $LAST[1] 120 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last score in contains case sensitive\n";
explain ('select SCORE, XT_FILE from XML_TEXT where contains (XT_TEXT, ''"case sensitive"'')', 2);
-echo both $if $equ $state OK "PASSED" "*** FAILED";
-echo both ": BUG 5796: scrollable cursor over contains STATE=" $state " MESSAGE=" $message "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": BUG 5796: scrollable cursor over contains STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select SCORE, XT_FILE from XML_TEXT where contains (XT_TEXT, '"case sensitive"') order by XT_ID desc;
@@ -525,12 +525,12 @@ select xpath_eval ('translate ("1234567 1234567", "123", "abc")', xml_tree_doc (
select xpath_eval ('round-number (11.2)', xml_tree_doc (xml_tree ('<a><b>11</b><b>33</b></a>')), 1);
select length (xpath_eval ('//@href', xml_tree_doc (xml_tree ('<html><a href="1">11</a><ul><a href = "2"></a></ul><ul><a name="test"></a></ul></html>')), 0));
-echo both $IF $EQU $LAST[1] 2 "PASSED" "*** FAILED";
-echo both ": " $LAST[1] " rows in xpath_eval //@href\n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "*** FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_eval //@href\n";
select length (xpath_eval ('//a/@name', xml_tree_doc (xml_tree ('<html><a href="1">11</a><ul><a href = "2"></a></ul><ul><a name="test"></a></ul></html>')), 0));
-echo both $IF $EQU $LAST[1] 1 "PASSED" "*** FAILED";
-echo both ": " $LAST[1] " rows in xpath_eval //a/@name\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "*** FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_eval //a/@name\n";
--- free text options
diff --git a/binsrc/tests/suite/nwxmlco.sql b/binsrc/tests/suite/nwxmlco.sql
index 5c3300f..bae2a39 100644
--- a/binsrc/tests/suite/nwxmlco.sql
+++ b/binsrc/tests/suite/nwxmlco.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmlco.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -93,5 +93,3 @@ vt_batch_update ('DB.DBA.XML_TEXT', 'OFF', 0);
update xml_text set xt_text = xt_text;
select count (*) from xml_text_xt_text_hit;
-
-
diff --git a/binsrc/tests/suite/nwxmlo.sql b/binsrc/tests/suite/nwxmlo.sql
index a8c6d7b..ea63904 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.2 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- For XML auto testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/nwxmltype3.sql b/binsrc/tests/suite/nwxmltype3.sql
index c3662b7..f7a9d86 100644
--- a/binsrc/tests/suite/nwxmltype3.sql
+++ b/binsrc/tests/suite/nwxmltype3.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmltype3.sql,v 1.2.2.1 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -97,48 +97,48 @@ vt_inc_index_DB_DBA_XML_TEXT2 ();
select xml_persistent (XT_TEXT) from XML_TEXT2 where XT_FILE = 'ce.xml';
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title', t);
-echo both $if $equ $rowcnt 792 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title\n";
+ECHO BOTH $IF $EQU $ROWCNT 792 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]', t);
-echo both $if $equ $rowcnt 4 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
-echo both $if $equ $last[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "*** FAILED";
-echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]\n";
+ECHO BOTH $IF $EQU $LAST[1] "<title>SQL_TXN_ISOLATION</title>" "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title [.=''ISOLATION'' ]', t);
-echo both $if $equ $rowcnt 2 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title [. like ''%ISOLATION%'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 16 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 16 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//title [.=''ISOLATION'' ]/ancestor::*/title', t);
-echo both $if $equ $rowcnt 7 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
--- echo both $if $equ $last[1] "<title>SQL Reference</title>" "PASSED" "*** FAILED";
--- echo both ": " $last[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //title [.='ISOLATION' ]/ancestor::*/title\n";
+-- ECHO BOTH $IF $EQU $LAST[1] "<title>SQL Reference</title>" "PASSED" "***FAILED";
+-- ECHO BOTH ": " $LAST[1] " last row in xpath_contains //title [. like '%ISOLATION%' ]/ancestor::*/title\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//chapter/title', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title\n";
---echo both $if $equ $last[1] "<title>Virtual Database Concepts</title>" "PASSED" "*** FAILED";
---echo both ": " $last[1] " last row in xpath_contains //chapter/title\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title\n";
+--ECHO BOTH $IF $EQU $LAST[1] "<title>Virtual Database Concepts</title>" "PASSED" "***FAILED";
+--ECHO BOTH ": " $LAST[1] " last row in xpath_contains //chapter/title\n";
select t from XML_TEXT2 where xpath_contains (XT_TEXT, '//chapter/title[position () = 1]', t);
-echo both $if $equ $rowcnt 20 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in xpath_contains //chapter/title[position () = 1]\n";
--- echo both $if $equ $last[1] "<title>International character support and compatibility</title>" "PASSED" "*** FAILED";
--- echo both ": " $last[1] " last row in xpath_contains //chapter/title[position () = 1]\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in xpath_contains //chapter/title[position () = 1]\n";
+-- ECHO BOTH $IF $EQU $LAST[1] "<title>International character support and compatibility</title>" "PASSED" "***FAILED";
+-- ECHO BOTH ": " $LAST[1] " last row in xpath_contains //chapter/title[position () = 1]\n";
select count (*) from XML_TEXT2 where xpath_contains (XT_TEXT, '//chapter//para[position () > 10]', t);
-echo both $if $equ $last[1] 6 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter//para[position () > 10]\n";
select count (*) from XML_TEXT2 where xpath_contains (XT_TEXT, '//chapter/descendant::para[position () > 10]', t);
-echo both $if $equ $last[1] 1630 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
+ECHO BOTH $IF $EQU $LAST[1] 1630 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains //chapter/descendant::para[position () > 10]\n";
select c from XML_TEXT2 where xpath_contains (XT_TEXT, '//customer[.//product/@unit_price > 20]/@name', c);
@@ -148,8 +148,8 @@ select p from XML_TEXT2 where xpath_contains (XT_TEXT, '(document/category/produ
select p from XML_TEXT2 where xpath_contains (XT_TEXT, '(document/category/product)[position () > 22 and position() < 33]', p);
select count (*) from XML_TEXT2 where XT_ID = 1 and xpath_contains (XT_TEXT, '1 > 2 != 2 > 1');
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xpath_contains 1 > 2 != 2 > 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xpath_contains 1 > 2 != 2 > 1\n";
select p from XML_TEXT2 where xpath_contains (XT_TEXT, '[xmlns:r="http://www.w3.org/TR/RDF/"]//*[@r:id = "Top"]', p);
@@ -157,10 +157,10 @@ select p from XML_TEXT2 where xpath_contains (XT_TEXT, '[xmlns:r="http://www.w3.
select SCORE, XT_FILE from XML_TEXT2 where contains (XT_TEXT, '"case sensitive"');
-echo both $if $equ $rowcnt 3 "PASSED" "*** FAILED";
-echo both ": " $rowcnt " rows in contains case sensitive\n";
-echo both $if $equ $last[1] 176 "PASSED" "*** FAILED";
-echo both ": " $last[1] " last score in contains case sensitive\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in contains case sensitive\n";
+ECHO BOTH $IF $EQU $LAST[1] 176 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " last score in contains case sensitive\n";
select SCORE, XT_FILE from XML_TEXT2 where contains (XT_TEXT, '"case sensitive"') order by XT_ID desc;
@@ -200,4 +200,3 @@ select n from XML_TEXT2 where xpath_contains (XT_TEXT, '//product [contains (@Pr
select n from XML_TEXT2 where xpath_contains (XT_TEXT, '//product [string-length (@ProductName) > 25]', n);
-
diff --git a/binsrc/tests/suite/nwxmltype3a.sql b/binsrc/tests/suite/nwxmltype3a.sql
index a0d7d41..497cde5 100644
--- a/binsrc/tests/suite/nwxmltype3a.sql
+++ b/binsrc/tests/suite/nwxmltype3a.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmltype3a.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -85,8 +85,8 @@ create procedure fill_xtf_3()
fill_xtf_1_2();
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG2 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " XMLType instances were cropped with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " XMLType instances were cropped with errors\n";
insert into LONG_XML_TEXTS (LXML_NAME, LXML_DOC) values ('/Doc' , '<a/>');
insert into LONG_XML_TEXTS (LXML_NAME, LXML_DOC) values ('/Doc/cha1' , '<a/>');
@@ -101,11 +101,11 @@ checkpoint;
fill_xtf_3();
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG2 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " explicitly cropped XMLType instances were filled with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " explicitly cropped XMLType instances were filled with errors\n";
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG3 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " implicitly cropped XMLType instances were filled with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " implicitly cropped XMLType instances were filled with errors\n";
update LONG_XML_TEXTS set LXML_DOC = '<?xml version="1.0"?>
<!DOCTYPE book [
@@ -146,5 +146,5 @@ where LXML_NAME = '/Doc/sub22';
select LXML_NAME, FRAG from LONG_XML_TEXTS where xpath_contains (LXML_DOC, '//*', FRAG);
select count (FRAG) from LONG_XML_TEXTS where xpath_contains (LXML_DOC, '//*', FRAG);
-- There was an bug here: must be 19 frags, not 11 or 15.
-echo both $if $equ $last[1] 19 "PASSED" "*** FAILED";
-echo both ": " $last[1] " fragments in XMLType column before log replay\n";
+ECHO BOTH $IF $EQU $LAST[1] 19 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " fragments in XMLType column before log replay\n";
diff --git a/binsrc/tests/suite/nwxmltype3b.sql b/binsrc/tests/suite/nwxmltype3b.sql
index db4adfd..b5c4929 100644
--- a/binsrc/tests/suite/nwxmltype3b.sql
+++ b/binsrc/tests/suite/nwxmltype3b.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmltype3b.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -21,14 +21,14 @@
--
--
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG2 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " explicitly cropped XMLType instances were recovered from log with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " explicitly cropped XMLType instances were recovered from log with errors\n";
select count(*) from XML_TEXT_FRAGS where cast(XTF_FRAG1 as varchar) <> cast(XTF_FRAG3 as varchar);
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " implicitly cropped XMLType instances were recovered from log with errors\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " implicitly cropped XMLType instances were recovered from log with errors\n";
select LXML_NAME, FRAG from LONG_XML_TEXTS where xpath_contains (LXML_DOC, '//*', FRAG);
select count (FRAG) from LONG_XML_TEXTS where xpath_contains (LXML_DOC, '//*', FRAG);
-- There was an bug here: must be 19 frags, not 11 or 15.
-echo both $if $equ $last[1] 19 "PASSED" "*** FAILED";
-echo both ": " $last[1] " fragments in XMLType column after log replay\n";
+ECHO BOTH $IF $EQU $LAST[1] 19 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " fragments in XMLType column after log replay\n";
diff --git a/binsrc/tests/suite/nwxmltype3c.sql b/binsrc/tests/suite/nwxmltype3c.sql
index 3c05777..d3741ba 100644
--- a/binsrc/tests/suite/nwxmltype3c.sql
+++ b/binsrc/tests/suite/nwxmltype3c.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmltype3c.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -20,16 +20,16 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
--
---echo both "\nnwxml3c - Attribute tests\n"
+--ECHO BOTH "\nnwxml3c - Attribute tests\n"
select count(*) from XML_TEXT2 where XT_FILE like '%proce%' and xcontains (XT_TEXT, '//sect1[@id = "whilestmt"]');
-echo both $if $equ $last[1] 0 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xcontains //sect1[@id = ''whilestmt''] where XT_FILE like '%proce%'\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xcontains //sect1[@id = ''whilestmt''] where XT_FILE like '%proce%'\n";
select count(*) from XML_TEXT2 where XT_FILE like '%proce%' and xcontains (XT_TEXT, '//sect2[@id like "whilestmt"]');
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xcontains //sect2[@id like ''whilestmt''] where XT_FILE like '%proce%'\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xcontains //sect2[@id like ''whilestmt''] where XT_FILE like '%proce%'\n";
select count(*) from XML_TEXT2 where XT_FILE like '%proce%' and xcontains (XT_TEXT, '//sect2[@id = "whilestmt"]');
-echo both $if $equ $last[1] 1 "PASSED" "*** FAILED";
-echo both ": " $last[1] " rows in xcontains //sect2[@id = ''whilestmt''] where XT_FILE like '%proce%'\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in xcontains //sect2[@id = ''whilestmt''] where XT_FILE like '%proce%'\n";
diff --git a/binsrc/tests/suite/nwxp.sql b/binsrc/tests/suite/nwxp.sql
index 153a608..867a170 100644
--- a/binsrc/tests/suite/nwxp.sql
+++ b/binsrc/tests/suite/nwxp.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxp.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/ob_tpcc_check.sql b/binsrc/tests/suite/ob_tpcc_check.sql
index 7a00e1c..e078ce4 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -22,7 +22,7 @@
--
select backup_pages();
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " pages changed since last backup (in checkpoint space) = " $LAST[1] "\n";
+ECHO BOTH ": pages changed since last backup (in checkpoint space) = " $LAST[1] "\n";
create procedure xcheck (in xname varchar, in xval any)
{
@@ -42,31 +42,31 @@ select count (*) from xvals;
select xcheck('tax', common_tax());
ECHO BOTH $IF $EQU $LAST[1] "EQUALS" "PASSED" "***FAILED";
-ECHO BOTH " tax is " $LAST[1] "\n";
+ECHO BOTH ": tax is " $LAST[1] "\n";
select xcheck('tax2', common_tax_2());
ECHO BOTH $IF $EQU $LAST[1] "EQUALS" "PASSED" "***FAILED";
-ECHO BOTH " tax2 is " $LAST[1] "\n";
+ECHO BOTH ": tax2 is " $LAST[1] "\n";
select xcheck('bal', common_bal());
ECHO BOTH $IF $EQU $LAST[1] "EQUALS" "PASSED" "***FAILED";
-ECHO BOTH " bal is " $LAST[1] "\n";
+ECHO BOTH ": bal is " $LAST[1] "\n";
--select xcheck('amnt', common_amnt());
--ECHO BOTH $IF $EQU $LAST[1] "EQUALS" "PASSED" "***FAILED";
---ECHO BOTH " amnt is " $LAST[1] "\n";
+--ECHO BOTH ": amnt is " $LAST[1] "\n";
--select xcheck('bal2', common_bal2());
--ECHO BOTH $IF $EQU $LAST[1] "EQUALS" "PASSED" "***FAILED";
---ECHO BOTH " bal2 is " $LAST[1] "\n";
+--ECHO BOTH ": bal2 is " $LAST[1] "\n";
--select xcheck('quant', common_quant());
--ECHO BOTH $IF $EQU $LAST[1] "EQUALS" "PASSED" "***FAILED";
---ECHO BOTH " quant is " $LAST[1] "\n";
+--ECHO BOTH ": quant is " $LAST[1] "\n";
select count (*) from warehouse;
ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
-ECHO BOTH " count (warehouse) = " $LAST[1] "\n";
+ECHO BOTH ": count (warehouse) = " $LAST[1] "\n";
create procedure check_orders (in cc integer)
@@ -82,13 +82,12 @@ create procedure check_orders (in cc integer)
;
select check_orders (count_orders());
ECHO BOTH $IF $EQU $LAST[1] "EQUAL" "PASSED" "***FAILED";
-ECHO BOTH " count (orders) = " $LAST[1] "\n";
+ECHO BOTH ": count (orders) = " $LAST[1] "\n";
select count (*) from item;
ECHO BOTH $IF $EQU $LAST[1] 100000 "PASSED" "***FAILED";
-ECHO BOTH " count (item) = " $LAST[1] "\n";
+ECHO BOTH ": count (item) = " $LAST[1] "\n";
select count (*) from stock;
ECHO BOTH $IF $EQU $LAST[1] 1000000 "PASSED" "***FAILED";
-ECHO BOTH " count (stock) = " $LAST[1] "\n";
-
+ECHO BOTH ": count (stock) = " $LAST[1] "\n";
diff --git a/binsrc/tests/suite/obackup.sh b/binsrc/tests/suite/obackup.sh
index 500bb11..a87de45 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.4 2010/01/28 14:33:20 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/obackup.sql b/binsrc/tests/suite/obackup.sql
index 7d41f68..263989f 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.3 2009/07/09 13:04:50 source Exp $
+-- $Id$
--
-- Concurrency test #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -45,40 +45,32 @@ delete from "Demo.demo.Order_Details";
select count (*) from "Demo.demo.Categories";
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Categoriess table has " $LAST[1] " entries\n";
+ECHO BOTH ": Categoriess table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Shippers";
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Shippers table has " $LAST[1] " entries\n";
+ECHO BOTH ": Shippers table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Suppliers";
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Suppliers table has " $LAST[1] " entries\n";
+ECHO BOTH ": Suppliers table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Products";
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Products table has " $LAST[1] " entries\n";
+ECHO BOTH ": Products table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Customers";
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Customers table has " $LAST[1] " entries\n";
+ECHO BOTH ": Customers table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Employees";
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Employees table has " $LAST[1] " entries\n";
+ECHO BOTH ": Employees table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Orders";
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Orders table has " $LAST[1] " entries\n";
+ECHO BOTH ": Orders table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Order_Details";
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Ordre_Details table has " $LAST[1] " entries\n";
-
-
-
-
-
-
-
-
+ECHO BOTH ": Ordre_Details table has " $LAST[1] " entries\n";
diff --git a/binsrc/tests/suite/obackup0.sql b/binsrc/tests/suite/obackup0.sql
index 1d36834..feb2ca5 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.1 2009/04/16 12:37:42 source Exp $
+-- $Id$
--
-- Online Backup stage 0
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -40,10 +40,3 @@ ECHO BOTH ": " $LAST[1] " checkpoint remap pages\n";
backup_max_dir_size (300000);
backup_online ('nwdemo_i_#', 150,0, vector ('nw1', 'nw2', 'nw3', 'nw4', 'nw5'));
-
-
-
-
-
-
-
diff --git a/binsrc/tests/suite/obackup1.sql b/binsrc/tests/suite/obackup1.sql
index 1a32cd2..92a3dd3 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Online Backup stage 0
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -32,7 +32,7 @@ ECHO BOTH $LAST[1] " checkpoint remap pages\n";
select backup_pages();
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " pages changed since last backup (in checkpoint space) = " $LAST[1] "\n";
+ECHO BOTH ": pages changed since last backup (in checkpoint space) = " $LAST[1] "\n";
ECHO BOTH "update Orders\n";
update "Demo"."demo"."Orders" set "Freight" = "Freight" + 1;
@@ -50,5 +50,3 @@ backup_max_dir_size (300000);
backup_online ('nwdemo_i_#', 150,0, vector ('nw1', 'nw2', 'nw3', 'nw4', 'nw5'));
shutdown;
-
-
diff --git a/binsrc/tests/suite/obackup_userck.sql b/binsrc/tests/suite/obackup_userck.sql
index cfde353..87e7313 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.3 2009/07/09 13:04:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -52,11 +52,13 @@ succ:
;
SELECT CHECK_UNAUTH_BACKUP_SEC();
-ECHO BOTH "Invoking BACKUP_ONLINE procedure from unauthtorized user test is " $LAST[1] "\n";
+ECHO BOTH $LAST[1];
+ECHO BOTH ": Invoking BACKUP_ONLINE procedure from unauthtorized user test\n";
RECONNECT dba;
SELECT CHECK_AUTH_BACKUP_SEC();
-ECHO BOTH "Invoking BACKUP_ONLINE procedure from authtorized user test is " $LAST[1] "\n";
+ECHO BOTH $LAST[1];
+ECHO BOTH ": Invoking BACKUP_ONLINE procedure from authtorized user test\n";
ADD USER GROUP IMPOSTER "DBA";
@@ -65,7 +67,8 @@ ADD USER GROUP IMPOSTER "DBA";
RECONNECT "IMPOSTER";
SELECT CHECK_AUTH_BACKUP_SEC();
-ECHO BOTH "Invoking BACKUP_ONLINE procedure from authtorized user test is " $LAST[1] "\n";
+ECHO BOTH $LAST[1];
+ECHO BOTH ": Invoking BACKUP_ONLINE procedure from authtorized user test\n";
BACKUP_ONLINE ('/usr/aaa_#', 150, 200);
ECHO BOTH $IF $EQU $STATE 42000 "PASSED" "***FAILED";
@@ -131,5 +134,3 @@ create_seqs ('bx', 10000);
create_seqs ('x', 10000);
backup_online ('vvv', 150);
-
-
diff --git a/binsrc/tests/suite/obackup_userck2.sql b/binsrc/tests/suite/obackup_userck2.sql
index 372fc43..e04036f 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.1 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Concurrency test #N..
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -34,21 +34,20 @@ ECHO BOTH $LAST[1] " checkpoint remap pages\n";
select backup_pages();
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " number of pages changed since last backup = " $LAST[1] "\n";
+ECHO BOTH ": number of pages changed since last backup = " $LAST[1] "\n";
select check_seqs ('h', 10000, 1);
ECHO BOTH $IF $EQU $LAST[1] "EQUAL" "PASSED" "***FAILED";
-ECHO BOTH " all sequences hNNNN are " $LAST[1] " to 1\n";
+ECHO BOTH ": all sequences hNNNN are " $LAST[1] " to 1\n";
select check_seqs ('x', 10000, 1);
ECHO BOTH $IF $EQU $LAST[1] "EQUAL" "PASSED" "***FAILED";
-ECHO BOTH " all sequence xNNNN = " $LAST[1] " to 0\n";
+ECHO BOTH ": all sequence xNNNN = " $LAST[1] " to 0\n";
select check_seqs ('ax', 10000, 1);
ECHO BOTH $IF $EQU $LAST[1] "EQUAL" "PASSED" "***FAILED";
-ECHO BOTH " all sequence axNNNN = " $LAST[1] " to 0\n";
+ECHO BOTH ": all sequence axNNNN = " $LAST[1] " to 0\n";
select check_seqs ('bx', 10000, 1);
ECHO BOTH $IF $EQU $LAST[1] "EQUAL" "PASSED" "***FAILED";
-ECHO BOTH " all sequence bxNNNN = " $LAST[1] " to 0\n";
-
+ECHO BOTH ": all sequence bxNNNN = " $LAST[1] " to 0\n";
diff --git a/binsrc/tests/suite/obackupck.sql b/binsrc/tests/suite/obackupck.sql
index 29c97b0..cab5a6d 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Concurrency test #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -45,71 +45,70 @@ ECHO BOTH $LAST[1] " checkpoint remap pages\n";
select backup_pages();
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " pages changed since last backup (in checkpoint space) = " $LAST[1] "\n";
+ECHO BOTH ": pages changed since last backup (in checkpoint space) = " $LAST[1] "\n";
select count (*) from "Demo.demo.Categories";
ECHO BOTH $IF $EQU $LAST[1] 8 "PASSED" "***FAILED";
-ECHO BOTH " Categoriess table has " $LAST[1] " entries\n";
+ECHO BOTH ": Categoriess table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Shippers";
ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
-ECHO BOTH " Shippers table has " $LAST[1] " entries\n";
+ECHO BOTH ": Shippers table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Suppliers";
ECHO BOTH $IF $EQU $LAST[1] 29 "PASSED" "***FAILED";
-ECHO BOTH " Suppliers table has " $LAST[1] " entries\n";
+ECHO BOTH ": Suppliers table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Products";
ECHO BOTH $IF $EQU $LAST[1] 77 "PASSED" "***FAILED";
-ECHO BOTH " Products table has " $LAST[1] " entries\n";
+ECHO BOTH ": Products table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Customers";
ECHO BOTH $IF $EQU $LAST[1] 91 "PASSED" "***FAILED";
-ECHO BOTH " Customers table has " $LAST[1] " entries\n";
+ECHO BOTH ": Customers table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Employees";
ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "***FAILED";
-ECHO BOTH " Employees table has " $LAST[1] " entries\n";
+ECHO BOTH ": Employees table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Orders";
ECHO BOTH $IF $EQU $LAST[1] 830 "PASSED" "***FAILED";
-ECHO BOTH " Orders table has " $LAST[1] " entries\n";
+ECHO BOTH ": Orders table has " $LAST[1] " entries\n";
select count (*) from "Demo.demo.Order_Details";
ECHO BOTH $IF $EQU $LAST[1] 2155 "PASSED" "***FAILED";
-ECHO BOTH " Ordre_Details table has " $LAST[1] " entries\n";
+ECHO BOTH ": Ordre_Details table has " $LAST[1] " entries\n";
select count (*) from "Demo"."demo"."Categories" where cast ("Description" as varchar) = 'updated';
ECHO BOTH $IF $EQU $LAST[1] 8 "PASSED" "***FAILED";
-ECHO BOTH " Categories table has " $LAST[1] " updated entries\n";
+ECHO BOTH ": Categories table has " $LAST[1] " updated entries\n";
select count (*) from "Demo"."demo"."Shippers" where "Phone" = 'updated';
ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
-ECHO BOTH " Shippers table has " $LAST[1] " updated entries\n";
+ECHO BOTH ": Shippers table has " $LAST[1] " updated entries\n";
select count (*) from "Demo"."demo"."Suppliers" where "City" = 'updated';
ECHO BOTH $IF $EQU $LAST[1] 29 "PASSED" "***FAILED";
-ECHO BOTH " Suppliers table has " $LAST[1] " updated entries\n";
+ECHO BOTH ": Suppliers table has " $LAST[1] " updated entries\n";
select count (*) from "Demo"."demo"."Products" where "ProductName" = 'updated';
ECHO BOTH $IF $EQU $LAST[1] 77 "PASSED" "***FAILED";
-ECHO BOTH " Products table has " $LAST[1] " updated entries\n";
+ECHO BOTH ": Products table has " $LAST[1] " updated entries\n";
select count (*) from "Demo"."demo"."Customers" where "ContactTitle" = 'updated';
ECHO BOTH $IF $EQU $LAST[1] 91 "PASSED" "***FAILED";
-ECHO BOTH " Customers table has " $LAST[1] " updated entries\n";
+ECHO BOTH ": Customers table has " $LAST[1] " updated entries\n";
select count (*) from "Demo"."demo"."Employees" where "Address" = 'updated';
ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "***FAILED";
-ECHO BOTH " Employees table has " $LAST[1] " updated entries\n";
+ECHO BOTH ": Employees table has " $LAST[1] " updated entries\n";
select count (*) from "Demo"."demo"."Orders" where "ShipName" = 'updated';
ECHO BOTH $IF $EQU $LAST[1] 830 "PASSED" "***FAILED";
-ECHO BOTH " Orders table has " $LAST[1] " updated entries\n";
+ECHO BOTH ": Orders table has " $LAST[1] " updated entries\n";
select count (*) from "Demo"."demo"."Order_Details" where "Quantity" = -1;
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " Order_Details table has " $LAST[1] " updated entries\n";
+ECHO BOTH ": Order_Details table has " $LAST[1] " updated entries\n";
select beautify (sum ("Freight")) from "Demo"."demo"."Orders";
ECHO BOTH $IF $EQU $LAST[1] 65772.69 "PASSED" "***FAILED";
-ECHO BOTH " Common freight " $LAST[1] "\n";
+ECHO BOTH ": Common freight " $LAST[1] "\n";
select beautify (sum ("UnitPrice" * "Quantity")) from "Demo"."demo"."Order_Details";
ECHO BOTH $IF $EQU $LAST[1] 102634.00 "PASSED" "***FAILED";
-ECHO BOTH " Price of all goods " $LAST[1] "\n";
-
+ECHO BOTH ": Price of all goods " $LAST[1] "\n";
diff --git a/binsrc/tests/suite/oledb.sh b/binsrc/tests/suite/oledb.sh
index f4df764..89b8f0d 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.1 2009/04/16 12:37:42 source Exp $
+# $Id$
#
# OLE DB tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/pass.sql b/binsrc/tests/suite/pass.sql
index 216673c..7bfd8fa 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- function pass-trough testsuite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/pddin.sql b/binsrc/tests/suite/pddin.sql
index df376d6..f446950 100644
--- a/binsrc/tests/suite/pddin.sql
+++ b/binsrc/tests/suite/pddin.sql
@@ -1,10 +1,10 @@
--
--- $Id: pddin.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -66,4 +66,3 @@ select string_to_file('pddd2.txt',blob_to_string("c"),-2) from "pdd" where "a" =
select string_to_file('pddd3.txt',blob_to_string("b"),-2) from "pdd" where "a" = 2;
select string_to_file('pddd4.txt',blob_to_string("c"),-2) from "pdd" where "a" = 2;
select string_to_file('pddd5.txt',blob_to_string("d"),-2) from "pdd" where "a" = 2;
-
diff --git a/binsrc/tests/suite/pddin2.sql b/binsrc/tests/suite/pddin2.sql
index 0099a6e..1c71ec3 100644
--- a/binsrc/tests/suite/pddin2.sql
+++ b/binsrc/tests/suite/pddin2.sql
@@ -1,10 +1,10 @@
--
--- $Id: pddin2.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -75,4 +75,3 @@ ECHO BOTH ": updating narrow data; STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
--select string_to_file('pddd3.txt',blob_to_string("b"),-2) from "pdd" where "a" = 2;
--select string_to_file('pddd4.txt',blob_to_string("c"),-2) from "pdd" where "a" = 2;
--select string_to_file('pddd5.txt',blob_to_string("d"),-2) from "pdd" where "a" = 2;
-
diff --git a/binsrc/tests/suite/r4/complex-doc-1.xsd b/binsrc/tests/suite/r4/complex-doc-1.xsd
index 498089d..3477e1e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/complex-doc-2.xsd b/binsrc/tests/suite/r4/complex-doc-2.xsd
index 15acbb4..799b009 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/complex-doc-3.xsd b/binsrc/tests/suite/r4/complex-doc-3.xsd
index f70177a..bacdbff 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/complex-doc-literal.sql b/binsrc/tests/suite/r4/complex-doc-literal.sql
index a6fc472..e2ea8b3 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/complex-rpc-encoded.sql b/binsrc/tests/suite/r4/complex-rpc-encoded.sql
index b79e897..c1d9d47 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/complex-rpc-encoded.xsd b/binsrc/tests/suite/r4/complex-rpc-encoded.xsd
index c5df132..c5af8f5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/dime-doc.sql b/binsrc/tests/suite/r4/dime-doc.sql
index 7dff621..3f220d2 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/dime-doc.xsd b/binsrc/tests/suite/r4/dime-doc.xsd
index 05959e1..83d3590 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/dime-rpc.sql b/binsrc/tests/suite/r4/dime-rpc.sql
index 8fcd8fb..a04a472 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/dime-rpc.xsd b/binsrc/tests/suite/r4/dime-rpc.xsd
index 3232d20..1efc506 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/load_xsd.sql b/binsrc/tests/suite/r4/load_xsd.sql
index cd7be4c..11831ed 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/mime-doc.sql b/binsrc/tests/suite/r4/mime-doc.sql
index 250b948..6efe4f5 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/mime-rpc.sql b/binsrc/tests/suite/r4/mime-rpc.sql
index d22664b..8e5a196 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/round4xsd-1.xsd b/binsrc/tests/suite/r4/round4xsd-1.xsd
index 2b2a736..220945e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/round4xsd-2.xsd b/binsrc/tests/suite/r4/round4xsd-2.xsd
index c227165..c6b3b6a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/round4xsd-3.xsd b/binsrc/tests/suite/r4/round4xsd-3.xsd
index 0a5afd5..56d3cb0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/round4xsd-4.xsd b/binsrc/tests/suite/r4/round4xsd-4.xsd
index fdc4d7d..73f6859 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/simple-doc-literal-1.xsd b/binsrc/tests/suite/r4/simple-doc-literal-1.xsd
index 063d013..b1d4462 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/simple-doc-literal-2.xsd b/binsrc/tests/suite/r4/simple-doc-literal-2.xsd
index 0725377..8df51ee 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/simple-doc-literal-3.xsd b/binsrc/tests/suite/r4/simple-doc-literal-3.xsd
index 12963a3..cf5c02d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/simple-doc-literal.sql b/binsrc/tests/suite/r4/simple-doc-literal.sql
index 24b673a..e980643 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/simple-rpc-encoded.sql b/binsrc/tests/suite/r4/simple-rpc-encoded.sql
index 2b37c31..60abb8f 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/r4/simple-rpc-encoded.xsd b/binsrc/tests/suite/r4/simple-rpc-encoded.xsd
index 57b8037..c14b56e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/r4/xsd.sql b/binsrc/tests/suite/r4/xsd.sql
index 95d8093..03331d5 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rdfldck.sql b/binsrc/tests/suite/rdfldck.sql
index 0dd4c07..d39fb45 100644
--- a/binsrc/tests/suite/rdfldck.sql
+++ b/binsrc/tests/suite/rdfldck.sql
@@ -2,10 +2,34 @@
-- 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);
@@ -17,6 +41,8 @@ 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);
@@ -84,13 +110,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 varcjar, in id iri_id)
+create procedure DEL_IRI_PK_DP (in n varchar, 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 varcjar)
+create procedure DEL_IRI_ID_DP (in id iri_id, in n varchar)
{
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);
@@ -248,3 +274,131 @@ 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 ('pogs Slice %d out of whack by %d', slid, cnt));
+ cnt := (select count (*) from rdf_quad a table option (index rdf_quad, no cluster) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad, 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 ('psog Slice %d out of whack by %d', slid, cnt));
+ cnt := (select count (*) from rdf_quad a table option (index rdf_quad_op, index_only, no cluster) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_op, index_only, no cluster) where a.p = b.p and a.o = b.o));
+ if (0 <> cnt)
+ log_message (sprintf ('op Slice %d out of whack by %d', slid, cnt));
+ cnt := (select count (*) from rdf_quad a table option (index rdf_quad_sp, index_only, no cluster) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_sp, index_only, no cluster) where a.p = b.p and a.s = b.s));
+ if (0 <> cnt)
+ log_message (sprintf ('sp Slice %d out of whack by %d', slid, cnt));
+ cnt := (select count (*) from rdf_quad a table option (index rdf_quad_gs, index_only, no cluster) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_gs, index_only, no cluster) where a.s = b.s and a.g = b.g));
+ if (0 <> cnt)
+ log_message (sprintf ('gs Slice %d out of whack by %d', slid, cnt));
+}
+
+create procedure slice_ck_slice_op (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_op, index_only, no cluster) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_op, index_only, no cluster) where a.p = b.p and a.o = b.o ));
+ if (0 <> cnt)
+ log_message (sprintf ('Slice %d out of whack by %d', slid, cnt));
+}
+
+create procedure slice_ck (in exits int := 0)
+{
+ cl_detach_thread ();
+ cl_exec ('cl_call_local_slices (''DB.DBA.RDF_QUAD'', ''RDF_QUAD'', ''slice_ck_slice'', vector (exits))');
+}
+
+
+
+
+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) - 100000, 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/rdflddir.sql b/binsrc/tests/suite/rdflddir.sql
index bbde1ee..beb5188 100644
--- a/binsrc/tests/suite/rdflddir.sql
+++ b/binsrc/tests/suite/rdflddir.sql
@@ -194,4 +194,3 @@ create procedure gogo (in coff any)
dbg_obj_print ('Finish gogo.');
}
;
-
diff --git a/binsrc/tests/suite/rdflddir2.sql b/binsrc/tests/suite/rdflddir2.sql
index 1499d0d..2013860 100644
--- a/binsrc/tests/suite/rdflddir2.sql
+++ b/binsrc/tests/suite/rdflddir2.sql
@@ -348,4 +348,3 @@ create procedure load_grdf (in f varchar)
-- cl_exec ('set lock_escalation_pct = 110');
-- cl_exec ('DB.DBA.RDF_LD_SRV (1)') &
-- cl_exec ('DB.DBA.RDF_LD_SRV (2)') &
-
diff --git a/binsrc/tests/suite/recovck1.sql b/binsrc/tests/suite/recovck1.sql
index 3a12959..463c0fd 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Recovery check test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/recovck1_noreg.sql b/binsrc/tests/suite/recovck1_noreg.sql
index 7130cce..05124a9 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.2 2009/11/10 15:54:05 source Exp $
+-- $Id$
--
-- Recovery check test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -42,7 +42,7 @@ select count(*) from iutest;
--ECHO BOTH $IF $EQU $LAST[3] 500020 "PASSED" "***FAILED";
--ECHO BOTH ": BLOBS sum(length (B3))= " $LAST[3] " \n";
-echo both "recovck1_noreg check trees\n";
+ECHO BOTH "recovck1_noreg check trees\n";
cl_exec ('backup ''/dev/null''');
@@ -115,12 +115,12 @@ select count (*), sum (length (b.b1)) from tb_stat c, tblob b where c.k = b.k
select k, length (b1), length (b2), length (b3), length (b4), * from tblob b where not exists (select 1 from tb_stat c where c.k = b.k and length (b1) = b1_l and length (b2) = b2_l and length (b3) = b3_l and length (b4) = b4_l and b. e1 = c. e1 and b. e2 = c. e2);
tb_check (1);
---echo both $if $equ $state OK "PASSED" "***FAILED";
---echo both ": blobs rollback / roll forward consistency " $state "\n";
+--ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+--ECHO BOTH ": blobs rollback / roll forward consistency " $STATE "\n";
select * from tblob where length (blob_to_string (b4)) <> length (b4);
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": tblob length check 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": tblob length check 2\n";
insert into B2437 values (1);
ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
@@ -191,18 +191,18 @@ ECHO BOTH ": FKRFWD3 AFK_BAD1 no FK STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
delete from FK_OK2 where ID = 100;
insert into FK_OK2 values (100, 100);
-echo both $if $NEQ $STATE OK "PASSED" "***FAILED";
-echo both ": FKRFWD4 FK_OK2 stoped STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": FKRFWD4 FK_OK2 stoped STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
delete from AFK_OK2 where ID = 100;
insert into AFK_OK2 values (100, 100);
-echo both $if $NEQ $STATE OK "PASSED" "***FAILED";
-echo both ": FKRFWD5 AFK_OK2 stoped STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": FKRFWD5 AFK_OK2 stoped STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
delete from AFK_BAD2 where ID = 100;
insert into AFK_BAD2 values (100, 100);
-echo both $if $EQU $STATE OK "PASSED" "***FAILED";
-echo both ": FKRFWD6 FK_BAD2 allowed STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": FKRFWD6 FK_BAD2 allowed STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-- rename
@@ -251,6 +251,5 @@ ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
ECHO BOTH ": B6978-10 table with data copied does have data. ROWCNT=" $ROWCNT "\n";
select length (b) from rep_blob;
-echo both $if $equ $last[1] 20000000 "PASSED" "***FAILED";
-echo both ": replicated ins replacing of large blob\n";
-
+ECHO BOTH $IF $EQU $LAST[1] 20000000 "PASSED" "***FAILED";
+ECHO BOTH ": replicated ins replacing of large blob\n";
diff --git a/binsrc/tests/suite/revstr.sql b/binsrc/tests/suite/revstr.sql
index 0c3fe4c..0dc504e 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Stored Procedure to reverse a string argument
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rexecute.sql b/binsrc/tests/suite/rexecute.sql
index 22ec207..1a8cfe5 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- rexecute suite testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rls.sql b/binsrc/tests/suite/rls.sql
index 1afdc7e..d249ba6 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Row level security tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rls_attach.sql b/binsrc/tests/suite/rls_attach.sql
index 42d0e09..eee9588 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rls_create.sql b/binsrc/tests/suite/rls_create.sql
index 559a4b3..cd1c295 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 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rpjoin.sql b/binsrc/tests/suite/rpjoin.sql
index 725901b..3fba8a6 100644
--- a/binsrc/tests/suite/rpjoin.sql
+++ b/binsrc/tests/suite/rpjoin.sql
@@ -1,10 +1,10 @@
--
--- $Id: rpjoin.sql,v 1.3.2.2 2009/07/09 13:04:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -25,7 +25,7 @@ DROP TABLE T_LOC;
CREATE TABLE T_LOC (S_DATE DATE, S_STATUS VARCHAR, S_NO VARCHAR);
-echo both "Joins with remotes and proc views rpjoin.sql\n";
+ECHO BOTH "Joins with remotes and proc views rpjoin.sql\n";
INSERT INTO T_LOC SELECT FDATE, substring (FS4, 1, 1), concat ('0102-', STRING1) FROM R1..T1 WHERE ROW_NO > 100 AND ROW_NO < 121;
@@ -77,34 +77,32 @@ SELECT CAST('GUARANTEED' AS VARCHAR), S.STRING1, S.STRING2, S.FDATE, G.S_STATUS,
R1..T1 S INNER JOIN DELIVERY_VIEW G ON ( GD_TRACKING_NO(S.STRING1) = G.S_NO );
ECHO BOTH $IF $EQU $ROWCNT 80 "PASSED" "***FAILED";
-ECHO BOTH ": INNER JOIN on procedure view and remote table " $rowcnt " rows\n";
+ECHO BOTH ": INNER JOIN on procedure view and remote table " $ROWCNT " rows\n";
SELECT CAST('GUARANTEED' AS VARCHAR), S.STRING1, S.STRING2, S.FDATE, G.S_STATUS, G.S_NO FROM
R1..T1 S, DELIVERY_VIEW G WHERE GD_TRACKING_NO(S.STRING1) = G.S_NO option (order);
ECHO BOTH $IF $EQU $ROWCNT 80 "PASSED" "***FAILED";
-ECHO BOTH ": JOIN comma syntax on procedure view and remote table " $rowcnt " rows\n";
+ECHO BOTH ": JOIN comma syntax on procedure view and remote table " $ROWCNT " rows\n";
SELECT CAST('GUARANTEED' AS VARCHAR), S.STRING1, S.STRING2, S.FDATE, G.S_STATUS, G.S_NO FROM
R1..T1 S LEFT OUTER JOIN DELIVERY_VIEW G ON ( GD_TRACKING_NO(S.STRING1) = G.S_NO );
ECHO BOTH $IF $EQU $ROWCNT 1000 "PASSED" "***FAILED";
-ECHO BOTH ": LEFT OUTER JOIN on procedure view and remote table " $rowcnt " rows\n";
+ECHO BOTH ": LEFT OUTER JOIN on procedure view and remote table " $ROWCNT " rows\n";
SELECT CAST('GUARANTEED' AS VARCHAR), S.STRING1, S.STRING2, S.FDATE, G.S_STATUS, G.S_NO FROM
R1..T1 S RIGHT OUTER JOIN DELIVERY_VIEW G ON ( GD_TRACKING_NO(S.STRING1) = G.S_NO );
ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
-ECHO BOTH ": RIGHT OUTER JOIN on procedure view and remote table " $rowcnt " rows\n";
+ECHO BOTH ": RIGHT OUTER JOIN on procedure view and remote table " $ROWCNT " rows\n";
SELECT CAST('GUARANTEED' AS VARCHAR), S.STRING1, S.STRING2, S.FDATE, G.S_STATUS, G.S_NO FROM
DELIVERY_VIEW G RIGHT OUTER JOIN R1..T1 S ON (G.S_NO = GD_TRACKING_NO(S.STRING1));
ECHO BOTH $IF $EQU $ROWCNT 1000 "PASSED" "***FAILED";
-ECHO BOTH ": RIGHT OUTER JOIN on procedure view and remote table " $rowcnt " rows\n";
+ECHO BOTH ": RIGHT OUTER JOIN on procedure view and remote table " $ROWCNT " rows\n";
SELECT CAST('GUARANTEED' AS VARCHAR), S.STRING1, S.STRING2, S.FDATE, G.S_STATUS, G.S_NO FROM
DELIVERY_VIEW G LEFT OUTER JOIN R1..T1 S ON (G.S_NO = GD_TRACKING_NO(S.STRING1));
ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
-ECHO BOTH ": LEFT OUTER JOIN on procedure view and remote table " $rowcnt " rows\n";
-
-
+ECHO BOTH ": LEFT OUTER JOIN on procedure view and remote table " $ROWCNT " rows\n";
diff --git a/binsrc/tests/suite/rproc1.sql b/binsrc/tests/suite/rproc1.sql
index cc61376..a11ecd4 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- procedure attachment testsuite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rproc2.sql b/binsrc/tests/suite/rproc2.sql
index 4870479..4098a0b 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- procedure attachment testsuite destination part
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rtest.sh b/binsrc/tests/suite/rtest.sh
index aaa3669..2d6cc25 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.2 2010/01/31 20:18:26 source Exp $
+# $Id$
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -92,7 +92,7 @@ then
exit 1
fi
-../blobs $DS1
+RUN $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 fcc6f0f..f72691b 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Remote database testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rtest1.sql b/binsrc/tests/suite/rtest1.sql
index 6e6cb18..9d626db 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Remote database testing part 1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rtest2-1.sql b/binsrc/tests/suite/rtest2-1.sql
index 5739d1b..942a813 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Remote database testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -223,25 +223,25 @@ ECHO BOTH ": " $LAST[1] " rows in remote x remote natural join\n";
select (select count (*) from R1..T1 where ROW_NO < 110) from R1..T1 where ROW_NO < 110;
-echo both $if $equ $last[1] 10 "PASSED" "***FAILED";
-echo both ": " $last[1] " count of remote scalar subq #1.\n";
+ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " count of remote scalar subq #1.\n";
select (select count (*) from R1..T1 where ROW_NO < n_identity (110)) from R1..T1 where ROW_NO < 110;
-echo both $if $equ $last[1] 10 "PASSED" "***FAILED";
-echo both ": " $last[1] " count of remote scalar subq #2.\n";
+ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " count of remote scalar subq #2.\n";
create view TU as select ROW_NO, FI2 from T1 union all select ROW_NO, FI2 from R1..T1;
select count (*) from TU A where ROW_NO < 300 and exists (select 1 from TU B where A.ROW_NO = B.ROW_NO);
-echo both $if $equ $last[1] 200 "PASSED" "***FAILED";
-echo both " " $last[1] " from union view as an existence predicate\n";
+ECHO BOTH $IF $EQU $LAST[1] 200 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " from union view as an existence predicate\n";
select ROW_NO, T1_UN.ROW_NO, DBA.T1_UN.ROW_NO, DB.DBA.T1_UN.ROW_NO from T1_UN where ROW_NO = 111;
-echo both $if $equ $last[1] 111 "PASSED" "***FAILED";
-echo both " " $last[1] " from funny correlated ref to union view col\n";
+ECHO BOTH $IF $EQU $LAST[1] 111 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " from funny correlated ref to union view col\n";
create view T1_FR3 as
select ROW_NO, STRING1, STRING2, FI2 from R1..T1 where ROW_NO < 120
@@ -250,25 +250,25 @@ create view T1_FR3 as
select ROW_NO from T1_FR3 where ROW_NO < 1200;
-echo both $if $equ $rowcnt 40 "PASSED" "***FAILED";
-echo both " " $rowcnt " rows in t1_fr3 < 1200\n";
+ECHO BOTH $IF $EQU $ROWCNT 40 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in t1_fr3 < 1200\n";
select count (*) from T1_FR3;
-echo both $if $equ$last[1] 61 "PASSED" "***FAILED";
-echo both " " $last[1] " count of t1_fr3\n";
+ECHO BOTH $IF $EQU$LAST[1] 61 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " count of t1_fr3\n";
select max (ROW_NO) as xx from T1_FR3 where ROW_NO < 1200;
-echo both $if $equ $last[1] 1099 "PASSED" "***FAILED";
-echo both " " $last[1] " max row_no of t1_fr3 where row_no < 1200 \n";
+ECHO BOTH $IF $EQU $LAST[1] 1099 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " max row_no of t1_fr3 where row_no < 1200 \n";
select FI2, max (ROW_NO) from T1_FR3 group by FI2 order by FI2 desc;
-echo both $if $equ$last[1] 1111 "PASSED" "***FAILED";
-echo both " " $last[1] " fi2 from t1_fr3 gb, ob fi2 desc\n";
+ECHO BOTH $IF $EQU$LAST[1] 1111 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " fi2 from t1_fr3 gb, ob fi2 desc\n";
select FI2, max (ROW_NO) as xx from T1_FR3 group by FI2 having xx > 3000 order by FI2 desc;
-echo both $if $equ$last[1] 1111 "PASSED" "***FAILED";
-echo both " " $last[1] " fi2 from t1_fr3 gb,having max > 3000 ob fi2 desc\n";
+ECHO BOTH $IF $EQU$LAST[1] 1111 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " fi2 from t1_fr3 gb,having max > 3000 ob fi2 desc\n";
@@ -276,6 +276,3 @@ echo both " " $last[1] " fi2 from t1_fr3 gb,having max > 3000 ob fi2 desc\n";
-- End of test
--
ECHO BOTH "COMPLETED: Remote test 2 (rtest2.sql) WITH " $ARGV[0] " FAILED, " $ARGV[1] " PASSED\n\n";
-
-
-
diff --git a/binsrc/tests/suite/rtest2.sql b/binsrc/tests/suite/rtest2.sql
index 6d86360..35b6a43 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Remote database testing part 2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -36,4 +36,3 @@ load rtest2-1.sql;
select count (*) from T1 A where exists (select *, *, *, *, *, *, *, *, *, *, *, *, *, * from R1..T1 B where B.ROW_NO > A.ROW_NO - 2900 );
ECHO BOTH $IF $EQU $LAST[1] 999 "PASSED" "***FAILED";
ECHO BOTH ": " $LAST[1] " rows in remote select close timing test\n";
-
diff --git a/binsrc/tests/suite/rtest3.sql b/binsrc/tests/suite/rtest3.sql
index b314bb9..cbbda4c 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Remote database testing part 3
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rtest4.sql b/binsrc/tests/suite/rtest4.sql
index ece7f96..1ec8cc3 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Remote database testing part 4
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rtest5.sql b/binsrc/tests/suite/rtest5.sql
index 98a5855..f12de1e 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Remote database testing part 5
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/rtesta.sql b/binsrc/tests/suite/rtesta.sql
index 56b5d99..e421725 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.2 2009/09/17 14:47:09 source Exp $
+-- $Id$
--
-- Remote database testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -140,8 +140,8 @@ from r1..t1 a,
where b.row_no = f(a.row_no) and c.row_no = f (b.row_no) and c.row_no = f(b.row_no) and d.row_no = f(c.row_no)
option (order);
-echo both $if $equ $last[2] 2398000 "PASSED" "***FAILED";
-echo both ": sum of row_no in 4 way dt, hash,loop join of r1..t1.\n";
+ECHO BOTH $IF $EQU $LAST[2] 2398000 "PASSED" "***FAILED";
+ECHO BOTH ": sum of row_no in 4 way dt, hash,loop join of r1..t1.\n";
select count (*) from (select * from r1..t1 union select * from r1..t1) f where row_no < (select max (row_no) from t1) - 2900;
ECHO BOTH $IF $EQU $LAST[1] 999 "PASSED" "***FAILED";
@@ -161,5 +161,5 @@ ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
ECHO BOTH ": count " $LAST[1] " count union r1..t1, r1..t1\n";
select top 10 a.row_no, b.row_no from r1..t1 a, (select top 1 row_no from r1..t1) b where b.row_no between f (a.row_no - 1) and f (a.row_no + 1) option (order, loop);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": arrayed subq with top\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": arrayed subq with top\n";
diff --git a/binsrc/tests/suite/rtrxdead.sql b/binsrc/tests/suite/rtrxdead.sql
index 3bd2cf6..f2a2f96 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.3 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- Remote database transaction testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/selt1.sql b/binsrc/tests/suite/selt1.sql
index 6d1f0c1..25241dc 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.1 2010/01/25 23:27:37 source Exp $
+-- $Id$
--
-- checkpoint errors #1.
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/selt2.sql b/binsrc/tests/suite/selt2.sql
index 89b3877..9cf9073 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.1 2010/01/25 23:27:37 source Exp $
+-- $Id$
--
-- checkpoint errors #2.
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/selt3.sql b/binsrc/tests/suite/selt3.sql
index c1ec662..0dac802 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.1 2010/01/25 23:27:37 source Exp $
+-- $Id$
--
-- checkpoint errors #3.
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/selt4.sql b/binsrc/tests/suite/selt4.sql
index 40d0119..a1413e1 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.1 2010/01/25 23:27:37 source Exp $
+-- $Id$
--
-- checkpoint errors #4.
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/selt5.sql b/binsrc/tests/suite/selt5.sql
index 29503d5..37eb333 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- checkpoint errors #1.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -34,4 +34,3 @@ create procedure p (in q int)
set autocommit on;
select * from t1 order by p (fi2);
commit work;
-
diff --git a/binsrc/tests/suite/soapauth.sql b/binsrc/tests/suite/soapauth.sql
index def45ea..7695849 100644
--- a/binsrc/tests/suite/soapauth.sql
+++ b/binsrc/tests/suite/soapauth.sql
@@ -1,10 +1,10 @@
--
--- $Id: soapauth.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/sqlo.sql b/binsrc/tests/suite/sqlo.sql
index 3829acc..48de59c 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.7 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- Various SQL optimized compiler tests.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -127,8 +127,8 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": where FI3 between 100 and 110 order by STRING1 desc last row FI2=" $LAST[2] "\n";
select STRING1, FI2 from T1 where FI3 between 2000 and 2010 order by STRING1 desc;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": not exists and partitioned sort\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": not exists and partitioned sort\n";
select top 2 FS1 from T1 order by 1 - ROW_NO;
ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
@@ -1040,29 +1040,28 @@ create procedure f (in x any)
select count (*) from t1 a, t1 b where a.fi2 = b.fi2 and f(a.row_no) = f(b.row_no) and f(b.row_no) < 1000 option (order, hash);
ECHO BOTH $IF $EQU $LAST[1] 980 "PASSED" "*** FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-echo both ": count with hash j with expression hash key reused in after join test\n";
+ECHO BOTH ": count with hash j with expression hash key reused in after join test\n";
select count (*) from (select distinct row_no from t1) f where f.row_no is null or f.row_no is null;
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "*** FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-echo both ": count of dt with inported false const preds\n";
+ECHO BOTH ": count of dt with inported false const preds\n";
select count (*) from (select distinct row_no from t1) f where not (f.row_no is null or f.row_no is null);
ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "*** FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-echo both ": count of dt with inported true const preds\n";
+ECHO BOTH ": count of dt with inported true const preds\n";
select a.row_no, b.row_no from t1 a, (select top 4 row_no from t1) b where a.row_no = b.row_no option (order) ;
-echo both $if $equ $rowcnt 4 "PASSED" "***FAILED";
-echo both ": dt with top does not import preds\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": dt with top does not import preds\n";
select __max (__min (1000), count (1)) from sys_users where u_id = 1111;
-echo both $if $equ $last[1] 1000 "PASSED" "***FAILED";
-echo both ": emppty agg with data independent false cond inits data independent exps\n";
+ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
+ECHO BOTH ": emppty agg with data independent false cond inits data independent exps\n";
ECHO BOTH "COMPLETED: SQL Optimizer tests (sqlo.sql) WITH " $ARGV[0] " FAILED, " $ARGV[1] " PASSED\n\n";
-
diff --git a/binsrc/tests/suite/sqlo2.sql b/binsrc/tests/suite/sqlo2.sql
index e3d3c82..18eeaa2 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.5 2010/12/10 12:24:41 source Exp $
+-- $Id$
--
-- Various SQL optimized compiler tests, part 2.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -1341,8 +1341,8 @@ create view t1order as select row_no, string1, string2 from t1 order by row_no;
select top 2 * from t1order where row_no is null or row_no > 111;
-echo both $if $equ $last[1] 113 "PASSED" "***FAILED";
-echo both "or of known false in dt predf import\n";
+ECHO BOTH $IF $EQU $LAST[1] 113 "PASSED" "***FAILED";
+ECHO BOTH ": or of known false in dt predf import\n";
select top 2 * from t1order a where row_no is null or exists (select 1 from t1order b where a.row_no = 1 + b.row_no);
@@ -1353,12 +1353,12 @@ select count (*) from t1 where row_no = 111 or (row_no is null and (row_no is n
-- hash fillers with hash joined existences
explain ('select count (*) from t1 a, t1 b where a.row_no = b.row_no and exists (select * from t1 c table option (hash) where c.row_no = b.row_no and c.string1 like ''1%'') option (order, hash)');
select count (*) from t1 a, t1 b where a.row_no = b.row_no and exists (select * from t1 c table option (hash) where c.row_no = b.row_no and c.string1 like '1%') option (order, hash);
-echo both $if $equ $last[1] 353 "PASSED" "***FAILED";
-echo both ": hash join with filter with hash filler with hashed exists\n";
+ECHO BOTH $IF $EQU $LAST[1] 353 "PASSED" "***FAILED";
+ECHO BOTH ": hash join with filter with hash filler with hashed exists\n";
select count (*) from t1 a, t1 b where a.row_no = b.row_no and exists (select * from t1 c table option (loop) where c.row_no = b.row_no and c.string1 like '1%') option (order, loop);
-echo both $if $equ $last[1] 353 "PASSED" "***FAILED";
-echo both ": verify above with ibid with loop\n";
+ECHO BOTH $IF $EQU $LAST[1] 353 "PASSED" "***FAILED";
+ECHO BOTH ": verify above with ibid with loop\n";
diff --git a/binsrc/tests/suite/sqlovdb.sql b/binsrc/tests/suite/sqlovdb.sql
index ceb9e38..1cbae79 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.3 2009/08/09 00:16:20 source Exp $
+-- $Id$
--
-- SQLO Remote database testing part 1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -271,7 +271,7 @@ ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": local/remote eq join with remote where returned " $ROWCNT " rows\n";
-echo both "explain here \n";
+ECHO BOTH "explain here \n";
explain ('select A.ROW_NO, B.ROW_NO from T1 A left join R1..T1 B on A.ROW_NO - 1 = B.ROW_NO where A.ROW_NO < 111');
select A.ROW_NO, B.ROW_NO from T1 A left join R1..T1 B on A.ROW_NO - 1 = B.ROW_NO where A.ROW_NO < 111;
@@ -403,112 +403,112 @@ create procedure leq (in a any, in b any)
select count (*) from r1..t1 a left join r1..t1 b on a.row_no = b.row_no;
select count (*) from r1..t1 a left join r1..t1 b on a.row_no = b.row_no and leq (1 + a.row_no, b.row_no);
-ECHO BOTH $IF $EQU $last[1] 1000 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
ECHO BOTH ": left oj with proc false cond.\n";
select count (*) from r1..t1 a left join r1..t1 b on a.row_no = b.row_no and a.row_no + 1 = b.row_no;
-ECHO BOTH $IF $EQU $last[1] 1000 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
ECHO BOTH ": left oj with pass through false cond.\n";
select count (2) from r1..t1 a left join (select row_no, count (*) as ct from r1..t1 group by row_no) b on a.row_no = b.row_no and a.row_no + 1 = b.row_no;
-ECHO BOTH $IF $EQU $last[1] 1000 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
ECHO BOTH ": left oj with dt with pass through false cond.\n";
select count (*) from r1..t1 a join (select row_no, count (*) as ct from r1..t1 group by row_no) b on 1 + a.row_no = b.row_no;
-ECHO BOTH $IF $EQU $last[1] 999 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 999 "PASSED" "***FAILED";
ECHO BOTH ": qual inner join with dt with pass through true cond.\n";
select count (*) from r1..t1 a, (select row_no, count (*) as ct from r1..t1 group by row_no) b where 1 + a.row_no = b.row_no;
-ECHO BOTH $IF $EQU $last[1] 999 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 999 "PASSED" "***FAILED";
ECHO BOTH ": join with dt with pass through true cond.\n";
select count (2) from t1 a left join (select row_no, count (*) as ct from r1..t1 group by row_no) b on a.row_no = b.row_no and a.row_no + 1 = b.row_no;
-ECHO BOTH $IF $EQU $last[1] 1000 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
ECHO BOTH ": MIX left oj with dt with pass through false cond.\n";
select count (*) from t1 a join (select row_no, count (*) as ct from r1..t1 group by row_no) b on 1 + a.row_no = b.row_no;
-ECHO BOTH $IF $EQU $last[1] 999 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 999 "PASSED" "***FAILED";
ECHO BOTH ": MIX qual inner join with dt with pass through true cond.\n";
select count (*) from r1..t1 a, (select row_no, count (*) as ct from t1 group by row_no) b where 1 + a.row_no = b.row_no;
-ECHO BOTH $IF $EQU $last[1] 999 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 999 "PASSED" "***FAILED";
ECHO BOTH ": join with dt with pass through true cond.\n";
select sum (fi2), string1 from r1..t1 a group by string1 having sum (fi2) > (select min (s) from (select sum (fi2) as s, string1 from t1 b group by b.string1) c);
-ECHO BOTH $IF $EQU $rowcnt 100 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $ROWCNT 100 "PASSED" "***FAILED";
ECHO BOTH ": MIX grou with having with group \n";
select sum (fi2), string1 from r1..t1 a group by string1 having sum (fi2) > (select min (s) from (select sum (fi2) as s, string1 from r1..t1 b group by b.string1) c);
-ECHO BOTH $IF $EQU $rowcnt 100 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $ROWCNT 100 "PASSED" "***FAILED";
ECHO BOTH ": grou with having with group \n";
select sum (fi2), string1 from r1..t1 a group by string1 having sum (fi2) >= (select min (s) from (select sum (fi2) as s, string1 from t1 b group by b.string1) c);
-ECHO BOTH $IF $EQU $rowcnt 300 "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $ROWCNT 300 "PASSED" "***FAILED";
ECHO BOTH ": group with sum >= min of same sum grouped \n";
select count (*) from t1 a, t1 b where a.row_no = b.row_no and a.row_no < 111 and b.row_no < 109;
-echo both $if $equ $last[1] 9 "PASSED" "***FAILED";
-echo both ": t1 inner t1 b.row_no < 109 \n";
+ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inner t1 b.row_no < 109 \n";
select count (*) from t1 a join t1 b on a.row_no = b.row_no where b.row_no < 111;
-echo both $if $equ $last[1] 11 "PASSED" "***FAILED";
-echo both ": t1 inner t1 b.row_no < 111 \n";
+ECHO BOTH $IF $EQU $LAST[1] 11 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inner t1 b.row_no < 111 \n";
create view t1_g as select a.row_no as r1, b.row_no as r2, sum (a.row_no) as sm from t1 a join t1 b on a.row_no = b.row_no group by a.row_no, b.row_no;
create view r1..t1_g as select a.row_no as r1, b.row_no as r2, sum (a.row_no) as sm from r1..t1 a join r1..t1 b on a.row_no = b.row_no group by a.row_no, b.row_no;
select row_no, r1, sm from t1 join t1_g on r1 = row_no where r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": t1 x t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": t1 x t1_g \n";
select row_no, r1, sm from t1 join r1..t1_g on r1 = row_no where r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": t1 x t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": t1 x t1_g \n";
select row_no, r1, sm from r1..t1 join r1..t1_g on r1 = row_no where r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": r1..t1 x r1..t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 x r1..t1_g \n";
select row_no, r1, sm from r1..t1 join t1_g on r1 = row_no where r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": r1..t1 x t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 x t1_g \n";
select row_no, r1, sm from r1..t1, r1..t1_g where r1 = row_no and r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": r1..t1 x t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 x t1_g \n";
select row_no, r1, sm from t1 left join t1_g on r1 = row_no where r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": t1 left x t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": t1 left x t1_g \n";
select row_no, r1, sm from t1 left join r1..t1_g on r1 = row_no where r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": t1 left x t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": t1 left x t1_g \n";
select row_no, r1, sm from r1..t1 left join r1..t1_g on r1 = row_no where r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": r1..t1 left x r1..t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 left x r1..t1_g \n";
select row_no, r1, sm from r1..t1 left join t1_g on r1 = row_no where r2 < 111;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": r1..t1 left x t1_g \n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 left x t1_g \n";
@@ -517,12 +517,12 @@ echo both ": r1..t1 left x t1_g \n";
-----
select * from (select 't1' as xx , row_no from r1..t1 where row_no < 105 union all select 't2' as xx, row_no from t1 where row_no < 105) ff;
select * from (select 't1' as xx , row_no from r1..t1 where row_no < 105 union all select 't2' as xx, row_no from t1 where row_no < 105) ff where xx = 't1';
-echo both $if $equ $rowcnt 5 "PASSED" "***FAILED";
-echo both ": union filter on term const\n";
+ECHO BOTH $IF $EQU $ROWCNT 5 "PASSED" "***FAILED";
+ECHO BOTH ": union filter on term const\n";
select * from (select 't1' as xx , row_no from r1..t1 where row_no < 105 union all select 't2' as xx, row_no from t1 where row_no < 105) ff where xx = 'xx';
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": union filter on term const\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": union filter on term const\n";
@@ -632,8 +632,8 @@ create view t1order as select row_no, string1, string2 from r1..t1 order by row_
select top 2 * from t1order where row_no is null or row_no > 111;
-echo both $if $equ $last[1] 113 "PASSED" "***FAILED";
-echo both ": or of known false in dt predf import\n";
+ECHO BOTH $IF $EQU $LAST[1] 113 "PASSED" "***FAILED";
+ECHO BOTH ": or of known false in dt predf import\n";
-- *** the 2 below do not work. Bad locus after import of preds into the dt.
select top 2 * from t1order a where row_no is null or exists (select 1 from t1order b where a.row_no = 1 + b.row_no);
@@ -682,30 +682,30 @@ ECHO BOTH ": B8669-3: pass-through of SQLX statements\n";
-- hash fillers nested
select count (*) from t1 a, r1..t1 b where a.row_no = b.row_no and exists (select * from r1..t1 c table option (hash) where c.row_no = b.row_no and c.string1 like '1%') option (order, hash);
-echo both $if $equ $last[1] 433 "PASSED" "***FAILED";
-echo both ": vdb hash join with filter with hash filler with hashed exists\n";
+ECHO BOTH $IF $EQU $LAST[1] 433 "PASSED" "***FAILED";
+ECHO BOTH ": vdb hash join with filter with hash filler with hashed exists\n";
select count (*) from t1 a, r1..t1 b where a.row_no = b.row_no and exists (select * from r1..t1 c table option (loop) where c.row_no = b.row_no and c.string1 like '1%') option (order, loop, loop exists);
-echo both $if $equ $last[1] 433 "PASSED" "***FAILED";
-echo both ": ibid verify with loop\n";
+ECHO BOTH $IF $EQU $LAST[1] 433 "PASSED" "***FAILED";
+ECHO BOTH ": ibid verify with loop\n";
select count (*) from t1 a, r1..t1 b where a.row_no = b.row_no and exists (select * from r1..t1 c table option (loop) where c.row_no = b.row_no and c.string1 like '1%') option (order, loop, do not loop exists);
-echo both $if $equ $last[1] 433 "PASSED" "***FAILED";
-echo both ": ibid verify with loop\n";
+ECHO BOTH $IF $EQU $LAST[1] 433 "PASSED" "***FAILED";
+ECHO BOTH ": ibid verify with loop\n";
select top 101 a.row_no , (select b.row_no from r1..t1 b where b.row_no between case when 0 = mod (a.row_no, 5) then cast (a.row_no - 1 as varchar) else a.row_no - 1 end and a.row_no + 1) from t1 a order by 1;
---echo both $if $equ $last[2] 199 "PASSED" "***FAILED";
---echo both ": vdb array params with changing types\n";
+--ECHO BOTH $IF $EQU $LAST[2] 199 "PASSED" "***FAILED";
+--ECHO BOTH ": vdb array params with changing types\n";
select fi2, ct from (select fi2, count (*) as ct from r1..t1 group by fi2) xx where ct = (select max (ct2) from (select fi2, count (*) as ct2 from r1..t1 group by fi2) qq);
-echo both $if $equ $last[2] 1000 "PASSED" "***FAILED";
-echo both " count gb where count is max count gb\n";
+ECHO BOTH $IF $EQU $LAST[2] 1000 "PASSED" "***FAILED";
+ECHO BOTH ": count gb where count is max count gb\n";
select fi2, ct from (select fi2, count (*) as ct from r1..t1 group by fi2) xx where ct = f ((select max (ct2) from (select fi2, count (*) as ct2 from r1..t1 group by fi2) qq));
-echo both $if $equ $last[2] 1000 "PASSED" "***FAILED";
-echo both " count gb where count is max count gb break with f\n";
+ECHO BOTH $IF $EQU $LAST[2] 1000 "PASSED" "***FAILED";
+ECHO BOTH ": count gb where count is max count gb break with f\n";
@@ -713,5 +713,3 @@ echo both " count gb where count is max count gb break with f\n";
-- End of test
--
ECHO BOTH "COMPLETED: SQLO Remote test (sqlovdb.sql) WITH " $ARGV[0] " FAILED, " $ARGV[1] " PASSED\n\n";
-
-
diff --git a/binsrc/tests/suite/stat.sql b/binsrc/tests/suite/stat.sql
index 5f9339c..e84441f 100644
--- a/binsrc/tests/suite/stat.sql
+++ b/binsrc/tests/suite/stat.sql
@@ -1,10 +1,10 @@
--
--- $Id: stat.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -88,7 +88,3 @@ stat_fill_counts_2 ();
select sprintf ('%.1f%%', avg ((abs (cc_prec - cc_ex + 0.0) / cc_ex) * 100)) from stat_counts where cc_ex > 1000;
echo BOTH "Average error = " $LAST[1] "\n";
-
-
-
-
diff --git a/binsrc/tests/suite/succ.sql b/binsrc/tests/suite/succ.sql
index 0cd30f6..c60b01e 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/t.xsl b/binsrc/tests/suite/t.xsl
deleted file mode 100644
index fe810e5..0000000
--- a/binsrc/tests/suite/t.xsl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/TR/WD-xsl">
- <xsl:template match="/">
- <document>
- <xsl:for-each select="root">
- <g><xsl:value-of select="a"/></g>
- </xsl:for-each>
- </document>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/binsrc/tests/suite/tac.sql b/binsrc/tests/suite/tac.sql
index 3abe802..47b453f 100644
--- a/binsrc/tests/suite/tac.sql
+++ b/binsrc/tests/suite/tac.sql
@@ -2,7 +2,7 @@
-- autocompact
-echo both "Autocompact and vacuum test\n";
+ECHO BOTH "Autocompact and vacuum test\n";
create table tac (s varchar primary key, d varchar);
@@ -19,26 +19,26 @@ tac_fill (0, 10);
delete from tac where atoi (s) > 3;
autocompact ();
-echo both "tac 1\n";
+ECHO BOTH "tac 1\n";
delete from tac;
tac_fill (0, 10);
delete from tac where atoi (s) > 3 and atoi (s) < 9;
autocompact ();
-echo both "tac 2\n";
+ECHO BOTH "tac 2\n";
delete from tac;
tac_fill (1, 10);
delete from tac where atoi (s) > 3 and atoi (s) < 9;
vacuum ('DB.DBA.TAC');
-echo both "tac 3\n";
+ECHO BOTH "tac 3\n";
delete from tac;
tac_fill (0, 1000);
delete from tac where atoi (s) > 500 and mod (atoi (s), 10) <> 0;
autocompact ();
-echo both "tac 4\n";
+ECHO BOTH "tac 4\n";
delete from tac;
@@ -48,5 +48,5 @@ vacuum ('DB.DBA.TAC');
vacuum ('DB.DBA.TAC');
vacuum ('DB.DBA.TAC');
vacuum ('DB.DBA.TAC');
-echo both "tac 5\n";
+ECHO BOTH "tac 5\n";
diff --git a/binsrc/tests/suite/tacl.sql b/binsrc/tests/suite/tacl.sql
index 87daa03..4e3932b 100644
--- a/binsrc/tests/suite/tacl.sql
+++ b/binsrc/tests/suite/tacl.sql
@@ -1,10 +1,10 @@
--
--- $Id: tacl.sql,v 1.2.2.1 2010/09/20 08:27:40 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tany.sql b/binsrc/tests/suite/tany.sql
index 2d6f180..3011ad5 100644
--- a/binsrc/tests/suite/tany.sql
+++ b/binsrc/tests/suite/tany.sql
@@ -1,6 +1,6 @@
-echo both "Any type collation, rdf boxes and ranges\n";
+ECHO BOTH "Any type collation, rdf boxes and ranges\n";
create table anybl (id int prim,primary key, xx long varchar);
@@ -30,20 +30,20 @@ insert into arn values ('str');
insert into arn values (stringdate ('2001-1-1'));
select * from arn where k > '' and k < 1.23;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": het any 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": het any 1\n";
select * from arn where k > '' and k < 'x';
-echo both $if $equ $rowcnt1 "PASSED" "***FAILED";
-echo both ": het any 2\n";
+ECHO BOTH $IF $EQU $ROWCNT1 "PASSED" "***FAILED";
+ECHO BOTH ": het any 2\n";
-- STop here, rdf boxes are not stored with content any more so the rest does not apply
exit;
insert into arn values (rdf_box (1, 257, 257, 1, 0));
-echo both $if $neq $state OK "PASSED" "FAILED";
-echo both ": het any unq\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "FAILED";
+ECHO BOTH ": het any unq\n";
insert into arn values (rdf_box (1.1, 257, 257, 1, 0));
@@ -51,8 +51,8 @@ insert into arn values (rdf_box ('strl', 258, 257, 1, 0));
insert into arn values (rdf_box ('stra', 259, 257, 1, 0));
select k from arn where k <= 'strl';
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": het any 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": het any 3\n";
insert into arn values (rdf_box ('at260', 260, 257, 1, 0));
insert into arn values (rdf_box ('bt260', 260, 257, 1, 0));
@@ -73,44 +73,44 @@ insert into arn values (rdf_box ('cl261', 257, 261, 1, 0));
select k from arn where k > 'a';
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": het any 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": het any 3\n";
select k from arn where k < rdf_box ('c', 260, 257, 1, 0);
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": het any 4\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": het any 4\n";
select k from arn where k < rdf_box ('c', 257, 260, 1, 0);
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": het any 5\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": het any 5\n";
select count (*) from arn a, arn b where a.k = b.k option (loop);
-echo both $if $equ $last[1] 20 "PASSED" "***FAILED";
-echo both ": arn x arn loop\m";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": arn x arn loop\m";
select count (*) from arn a, arn b where a.k = b.k option (hash);
-echo both $if $equ $last[1] 20 "PASSED" "***FAILED";
-echo both ": arn x arn hash\n";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": arn x arn hash\n";
alter table arn add d any;
update arn set d = k;
select * from arn where d > '' and d < 1.23;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": het any nk 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": het any nk 1\n";
select d from arn where d < rdf_box ('c', 257, 260, 1, 0);
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": het any nk 5\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": het any nk 5\n";
select d from arn where d > rdf_box ('b', 257, 260, 1, 0);
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": het any nk 6\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": het any nk 6\n";
select d from arn where d > rdf_box (1, 257, 257, 1, 0);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": het any nk 7\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": het any nk 7\n";
diff --git a/binsrc/tests/suite/tany2.sql b/binsrc/tests/suite/tany2.sql
index 6afb33a..7c6a560 100644
--- a/binsrc/tests/suite/tany2.sql
+++ b/binsrc/tests/suite/tany2.sql
@@ -1,6 +1,6 @@
-echo both "Any number collation\n";
+ECHO BOTH "Any number collation\n";
drop table tnum;
@@ -57,12 +57,12 @@ create procedure controversy (in exp int)
}
select controversy (52);
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": controversy 52\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": controversy 52\n";
select controversy (53);
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": controversy 53\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": controversy 53\n";
nfill (100000);
@@ -77,12 +77,12 @@ select count (*) from tnum a table option (index primary key), tnum b table opti
select __tag (k), * from tnum a table option (index ii) where not exists (select 1 from tnum b table option (loop, index primary key) where a.k = b.k and a.id = b.id);
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": any num coll 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": any num coll 1\n";
select __tag (k), * from tnum a table option (index primary key) where not exists (select 1 from tnum b table option (loop, index ii) where a.k = b.k and a.id = b.id);
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": any num coll 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": any num coll 2\n";
diff --git a/binsrc/tests/suite/tanytime.sql b/binsrc/tests/suite/tanytime.sql
index 6d29bb1..c4ca1d7 100644
--- a/binsrc/tests/suite/tanytime.sql
+++ b/binsrc/tests/suite/tanytime.sql
@@ -2,7 +2,7 @@
-echo both "Anytime timeout test\n";
+ECHO BOTH "Anytime timeout test\n";
set result_timeout = 1000;
@@ -12,8 +12,8 @@ select fi2 from t1 where delay (fi2 - fi2 + 0.2) = 0;
select fi2 from t1 where case when mod (fi2, 4) = 1 then delay (fi2 - fi2 + 0.2) else 0 end = 0 option (any order);
select fi2 from t1 where case when mod (fi2, 4) = 0 then delay (fi2 - fi2 + 0.4) else 0 end = 0 option (any order);
-echo both $if $equ $sqlstate S1TAT "PASSED" "***FAILED";
-echo both ": Anytime 1\n";
+ECHO BOTH $IF $EQU $SQLSTATE S1TAT "PASSED" "***FAILED";
+ECHO BOTH ": Anytime 1\n";
select count (fi2) from t1 where case when mod (fi2, 4) = 0 then delay (fi2 - fi2 + 0.3) else 0 end = 0 option (any order);
select count (fi2) from t1 where case when mod (fi2, 4) <> 0 then delay (fi2 - fi2 + 0.3) else 0 end = 0 option (any order);
@@ -21,8 +21,8 @@ select count (fi2) from t1 where case when mod (fi2, 4) <> 0 then delay (fi2 -
select count (fi2) from t1 where delay (fi2 - fi2 + 0.2) = 0 option (any order);
-echo both $if $equ $sqlstate S1TAT "PASSED" "***FAILED";
-echo both ": Anytime 2\n";
+ECHO BOTH $IF $EQU $SQLSTATE S1TAT "PASSED" "***FAILED";
+ECHO BOTH ": Anytime 2\n";
-- with dfg
@@ -32,8 +32,8 @@ select count (*) from t1 a, t1 b where b.fi2 = 1 + a.fi2 and 0 = case when mod (
-- dfg timeout on host 2
select count (*) from t1 a, t1 b where b.fi2 = 1 + a.fi2 and 0 = case when mod (b.fi2, 4) = 1 then delay (b.fi2 - b.fi2 + 0.2) else 0 end option (loop, order);
-echo both $if $equ $sqlstate S1TAT "PASSED" "***FAILED";
-echo both ": Anytime 3\n";
+ECHO BOTH $IF $EQU $SQLSTATE S1TAT "PASSED" "***FAILED";
+ECHO BOTH ": Anytime 3\n";
-- with index order
@@ -47,8 +47,8 @@ select a.fi2, b.fi2 from t1 a, t1 b where b.fi2 = 1 + a.fi2 and 0 = case when mo
-- non agg dfg timeout on host2
select a.fi2, b.fi2 from t1 a, t1 b where b.fi2 = 1 + a.fi2 and 0 = case when mod (b.fi2, 4) = 1 then delay (b.fi2 - b.fi2 + 0.2) else 0 end order by a.fi2 + 1, b.fi2 + 1 option (loop, order);
-echo both $if $equ $sqlstate S1TAT "PASSED" "***FAILED";
-echo both ": Anytime 4\n";
+ECHO BOTH $IF $EQU $SQLSTATE S1TAT "PASSED" "***FAILED";
+ECHO BOTH ": Anytime 4\n";
-- value qf in index order
@@ -78,8 +78,8 @@ select a.fi2, count (*) from t1 a, t1 b where b.fi2 > a.fi2 and 0 = delay (b.fi2
select dt.fi2, cnt, (select count (*) from t1 c where c.fi2 > dt.fi2 )
from (select a.fi2, count (*) as cnt from t1 a, t1 b where b.fi2 > a.fi2 and 0 = delay (b.fi2 - b.fi2 + 0.003) group by a.fi2 order by 2 desc option (order, loop)) dt;
-echo both $if $equ $sqlstate S1TAT "PASSED" "***FAILED";
-echo both ": Anytime 5\n";
+ECHO BOTH $IF $EQU $SQLSTATE S1TAT "PASSED" "***FAILED";
+ECHO BOTH ": Anytime 5\n";
-- timeout the counting also.
@@ -96,13 +96,13 @@ select string2, (select count (*) from t1 b where b.string2 > dt.string2 and 0 =
where cnt = 1
order by 2;
-echo both $if $equ $sqlstate S1TAT "PASSED" "***FAILED";
-echo both ": Anytime 6\n";
+ECHO BOTH $IF $EQU $SQLSTATE S1TAT "PASSED" "***FAILED";
+ECHO BOTH ": Anytime 6\n";
update t1 set fi6 = row_no where 0 = delay (fi2 - fi2 + 0.04);
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": Anytime update not stopped\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": Anytime update not stopped\n";
@@ -121,8 +121,8 @@ create procedure at_upd ()
}
at_upd ();
--- echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
--- echo both ": Anytime proc update\n";
+-- ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+-- ECHO BOTH ": Anytime proc update\n";
@@ -139,4 +139,3 @@ select top 20 a.fi2, count (*) from t1 a, t1 b where b.fi2 > a.fi2 group by a.fi
-- timeout before the 1st ssa iter
select top 20 a.fi2, count (*) from t1 a, t1 b where b.fi2 > a.fi2 group by a.fi2 order by count (*) + delay (0.05 + count (*) - count (*)) desc;
-
diff --git a/binsrc/tests/suite/taq.sql b/binsrc/tests/suite/taq.sql
index afabaee..7969479 100644
--- a/binsrc/tests/suite/taq.sql
+++ b/binsrc/tests/suite/taq.sql
@@ -5,7 +5,7 @@
-- Test for async queue
-echo both "Async Queue Tests\n";
+ECHO BOTH "Async Queue Tests\n";
drop table aqi;
@@ -118,6 +118,5 @@ create procedure FIAQ (in i int)
}
select fiaq (29);
-echo both $if $equ $last[1] 514229 "PASSED" "***FAILED";
-echo both ": aq fi\n";
-
+ECHO BOTH $IF $EQU $LAST[1] 514229 "PASSED" "***FAILED";
+ECHO BOTH ": aq fi\n";
diff --git a/binsrc/tests/suite/tarith.sql b/binsrc/tests/suite/tarith.sql
index 456b725..0b6be14 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Arithmetic tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -39,4 +39,3 @@ ECHO BOTH ": atof stored as " $LAST[1] "\n";
select count (*) from DB.DBA.SYS_KEYS where KEY_TABLE like case when 201 < 101 then '' else '%' end;
ECHO BOTH $IF $GT $LAST[1] 0 "PASSED" "***FAILED";
ECHO BOTH ": BUG4118: case in where returned " $LAST[1] " rows\n";
-
diff --git a/binsrc/tests/suite/tarray.sql b/binsrc/tests/suite/tarray.sql
index f6c5b09..ed323f9 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Testing array fields
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tbak.sql b/binsrc/tests/suite/tbak.sql
index dea703d..c523a91 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test backup functionality
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tbfree.sql b/binsrc/tests/suite/tbfree.sql
index cbd8dde..adc0e65 100644
--- a/binsrc/tests/suite/tbfree.sql
+++ b/binsrc/tests/suite/tbfree.sql
@@ -1,10 +1,10 @@
--
--- $Id: tbfree.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tbin.sql b/binsrc/tests/suite/tbin.sql
index eefda12..f10ce02 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test distinct varbinary and varchar
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -69,15 +69,15 @@ create procedure tbin_fill (in n integer)
tbin_fill (1000);
select count (distinct kb) from tbin;
-echo both $if $equ $last[1] 1000 "PASSED" "***FAILED";
-echo both ": " $last[1] " distinct bin\n";
+ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " distinct bin\n";
insert into tbin (id, kb) select id + 1000, kc from tbin where id < 1000;
select count (distinct kb) from tbin;
-echo both $if $equ $last[1] 1000 "PASSED" "***FAILED";
-echo both ": " $last[1] " distinct bin + varchar\n";
+ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " distinct bin + varchar\n";
select count (distinct cast (kb as varchar)) from tbin;
-echo both $if $equ $last[1] 1000 "PASSED" "***FAILED";
-echo both ": " $last[1] " distinct cast to varchar\n";
+ECHO BOTH $IF $EQU $LAST[1] 1000 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " distinct cast to varchar\n";
diff --git a/binsrc/tests/suite/tbint.sql b/binsrc/tests/suite/tbint.sql
index 7549219..b4d3f3a 100644
--- a/binsrc/tests/suite/tbint.sql
+++ b/binsrc/tests/suite/tbint.sql
@@ -8,14 +8,14 @@ insert into bint values ('5000000000', 11);
insert into bint values (1000000 * 1000000, 12);
select * from bint a, bint b where a.bi = b.bi option (hash);
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": hash join of bigint\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": hash join of bigint\n";
select * from bint order by bi + 1;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": oby bigint col\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": oby bigint col\n";
select * from bint order by i + 10000000000;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": oby large int exp\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": oby large int exp\n";
diff --git a/binsrc/tests/suite/tbitmap.sql b/binsrc/tests/suite/tbitmap.sql
index 901dc26..5f0d408 100644
--- a/binsrc/tests/suite/tbitmap.sql
+++ b/binsrc/tests/suite/tbitmap.sql
@@ -1,4 +1,7 @@
-echo both "Bitmap index tests\n";
+ECHO BOTH "Bitmap index tests\n";
+
+--set echo on;
+
drop table tb;
create table tb (id int primary key, k1 int, k2 int);
@@ -11,6 +14,10 @@ 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);
@@ -84,57 +91,61 @@ select top 5 * from tb table option (index k1) where id > 32900 and id < 82003
select top 5 * from tb table option (index k1) where id < 32800 and k1 = 12 order by id desc;
select top 5000 * from tb table option (index k1) where id > 32900 and id < 82003 and k1 = 12 order by id desc;
-echo both $if $equ $rowcnt 722 "PASSED" "***FAILED";
-echo both ": asc order bm range\n";
+ECHO BOTH $IF $EQU $ROWCNT 722 "PASSED" "***FAILED";
+ECHO BOTH ": asc order bm range\n";
select top 5000 * from tb table option (index k1) where id > 32900 and id < 33000 and k1 = 12 order by id desc;
select top 5000 * from tb table option (index k1) where id > 32900 and id < 82003 and k1 = 12 order by id;
-echo both $if $equ $rowcnt 722 "PASSED" "***FAILED";
-echo both ": desc order bm range\n";
+ECHO BOTH $IF $EQU $ROWCNT 722 "PASSED" "***FAILED";
+ECHO BOTH ": desc order bm range\n";
select id, k1 from tb a table option (index primary key) where not exists (select 1 from tb b table option (index k1) where b.k1 = a.k1 and b.id > a.id);
-
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 desc);
-echo both $if $equ $rowcnt 704 "PASSED" "***FAILED";
-echo both ": bm select of previous in desc order with lt\n";
+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);
+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 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 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";
-echo both ": bm select of previous in desc order with lt : double check with pk\n";
+ECHO BOTH $IF $EQU $ROWCNT 704 "PASSED" "***FAILED";
+ECHO BOTH ": bm select of previous in desc order with lt : double check with pk\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) where b.k1 = a.k1 and b.id <= a.id - 1 order by b.id desc);
-echo both $if $equ $rowcnt 704 "PASSED" "***FAILED";
-echo both ": bm select of previous in desc order with lte\n";
+ECHO BOTH $IF $EQU $ROWCNT 704 "PASSED" "***FAILED";
+ECHO BOTH ": bm select of previous in desc order with lte\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) where b.k1 = a.k1 and b.id > a.id order by b.id);
-echo both $if $equ $rowcnt 704 "PASSED" "***FAILED";
-echo both ": bm select of next in order with gt\n";
+ECHO BOTH $IF $EQU $ROWCNT 704 "PASSED" "***FAILED";
+ECHO BOTH ": bm select of next in order with gt\n";
bmck (4);
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 + 1 and b.id < a.id + 10 order by b.id);
-echo both $if $equ $rowcnt 599 "PASSED" "***FAILED";
-echo both ": bm select of next in order with gte and range\n";
+ECHO BOTH $IF $EQU $ROWCNT 599 "PASSED" "***FAILED";
+ECHO BOTH ": bm select of next in order with gte and range\n";
select top 10 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 + 1 and b.id < a.id + 2100000 order by b.id);
-echo both $if $equ $last[1] 30071 "PASSED" "***FAILED";
-echo both ": last of select next in bm order with range.\n";
+ECHO BOTH $IF $EQU $LAST[1] 30071 "PASSED" "***FAILED";
+ECHO BOTH ": last of select next in bm order with range.\n";
select top 10 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 + 1 order by b.id);
-echo both $if $equ $last[1] 30061 "PASSED" "***FAILED";
-echo both ": last of select next in bm order.\n";
+ECHO BOTH $IF $EQU $LAST[1] 30061 "PASSED" "***FAILED";
+ECHO BOTH ": last of select next in bm order.\n";
bmck (5);
@@ -147,8 +158,8 @@ bmck (6);
update tb set k1 = 20;
select distinct k1 from tb table option (index k1);
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": distinct k1 after update.\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": distinct k1 after update.\n";
bmck (7);
rollback work;
@@ -156,8 +167,8 @@ rollback work;
bmck (9);
select distinct k1 from tb table option (index k1);
---echo both $if $equ $rowcnt 4 "PASSED" "***FAILED";
---echo both ": distinct k1 after rollback.\n";
+--ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+--ECHO BOTH ": distinct k1 after rollback.\n";
set autocommit off;
@@ -177,8 +188,8 @@ create procedure tb1 ()
}
tb1();
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": bm inx cursor maint over delete\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": bm inx cursor maint over delete\n";
create procedure tb2 ()
{
@@ -197,25 +208,25 @@ create procedure tb2 ()
}
--tb2();
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": bm inx cursor maint over bm row split\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": bm inx cursor maint over bm row split\n";
bins (100,1024000, 511, 2);
bins (100,1024000 + 9000, 1, 2);
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": ins at end of one less than full array\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": ins at end of one less than full array\n";
bins (100,1024000 + 8000, 1, 2);
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": ins at end of one less than full array 2\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": ins at end of one less than full array 2\n";
bmck (10);
select count (*) from tb where k1 = 100;
-echo both $if $equ $last[1] 513 "PASSED" "***FAILED";
-echo both ": rows w k1 100\n";
+ECHO BOTH $IF $EQU $LAST[1] 513 "PASSED" "***FAILED";
+ECHO BOTH ": rows w k1 100\n";
bmck (11);
@@ -228,12 +239,12 @@ insert into bmdel values (1,1,1);
insert into bmdel values (2,5,1);
insert into bmdel values (3,3,1);
select * from bmdel;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both " table with bitmap contains " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": table with bitmap contains " $ROWCNT " rows\n";
delete from bmdel where id3 = 1;
select * from bmdel;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both " after delete on bitmap index table contains " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": after delete on bitmap index table contains " $ROWCNT " rows\n";
bmck (12);
@@ -248,7 +259,7 @@ bmck (14);
rollback work;
bmck (15);
-
+exit;
set autocommit manual;
update tb set k1 = id;
bmck (16);
@@ -257,8 +268,8 @@ bmck (17);
rollback work;
bmck (18);
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": bm and pk consistency\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": bm and pk consistency\n";
diff --git a/binsrc/tests/suite/tblob.sql b/binsrc/tests/suite/tblob.sql
index 1732e80..c5ffed0 100644
--- a/binsrc/tests/suite/tblob.sql
+++ b/binsrc/tests/suite/tblob.sql
@@ -1,10 +1,10 @@
--
--- $Id: tblob.sql,v 1.2.2.3 2009/11/10 15:54:05 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -68,22 +68,22 @@ create procedure tb_e2 ()
tb_e2 ();
-echo both $if $neq $sqlstate OK "PASSED" "***FAILED";
-echo both ": row too long check\n";
+ECHO BOTH $IF $NEQ $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": row too long check\n";
update tblob set b3 = '12345678901234567890';
update tblob set b1 = b3, b2 = b3, b4 = b3;
-echo both $if $neq $sqlstate OK "PASSED" "***FAILED";
-echo both ": row too long check 2\n";
+ECHO BOTH $IF $NEQ $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": row too long check 2\n";
update tblob set e1 = '123';
-echo both $if $neq $sqlstate OK "PASSED" "***FAILED";
-echo both ": row too long check 3\n";
+ECHO BOTH $IF $NEQ $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": row too long check 3\n";
update tblob set e2 = make_string (4000);
-echo both $if $neq $sqlstate OK "PASSED" "***FAILED";
-echo both ": row too long check 4\n";
+ECHO BOTH $IF $NEQ $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": row too long check 4\n";
update tblob set e2 = '1234';
@@ -169,10 +169,10 @@ again:
}
-echo both "starting blob random update ...\n";
+ECHO BOTH "starting blob random update ...\n";
tb_upd (2000, '');
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": blob random update " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": blob random update " $STATE "\n";
insert into tb_stat select k, length (b1), length (b2), length (b3), length (b4), e1, e2 from tblob;
@@ -189,18 +189,19 @@ create procedure tb_check (in q integer)
tb_check (1);
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": blobs rollback / roll forward consistency " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": blobs rollback / roll forward consistency " $STATE "\n";
-echo both "starting blob random update ...\n";
+
+ECHO BOTH "starting blob random update ...\n";
tb_upd (2000 , 'rb');
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": rollback blob random update " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": rollback blob random update " $STATE "\n";
tb_check (1);
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": blob check after 2000 rollbacks " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": blob check after 2000 rollbacks " $STATE "\n";
@@ -214,8 +215,8 @@ update tblob set b1 = make_string (3000), ed = '--';
update tblob set b1 = make_string (2000), ed = 'qq';
tb_check (1);
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": blobs rollback / roll forward consistency " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": blobs rollback / roll forward consistency " $STATE "\n";
create procedure tb_ins (in ct integer, in mode varchar)
@@ -268,13 +269,13 @@ create procedure bad_upd_1 (in q integer)
--bad_upd_1 (1);
-echo both "starting blob random insert ...\n";
+ECHO BOTH "starting blob random insert ...\n";
tb_ins (1000, '');
-echo both "finished blob random insert\n";
+ECHO BOTH "finished blob random insert\n";
select * from tblob where length (blob_to_string (b4)) <> length (b4);
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": tblob length check\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": tblob length check\n";
cl_exec ('__dbf_set (''dbf_cl_blob_autosend_limit'', 100000)');
@@ -299,21 +300,21 @@ foreach blob in words.esp update tblob set b1 = ?, b2 = '', b3 = '', b4 = '', e1
-- subseq done in cluster
select subseq (b1, 10000, 10500) from tblob where k > 9999;
-echo both $if $equ $rowcnt 8 "PASSED" "***FAILED";
-echo both ": b subseq 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 8 "PASSED" "***FAILED";
+ECHO BOTH ": b subseq 1\n";
-- subseq in cluster with sql func, then subseq done in coordinator. id_to_iri is a location sequence break.
create procedure f (in q any) {return q;};
create procedure f_noloc (in q any) { id_to_iri (#i1); return q;};
select subseq (f (b1), 10000, 10500) from tblob where k > 9999;
-echo both $if $equ $rowcnt 8 "PASSED" "***FAILED";
-echo both ": b subseq 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 8 "PASSED" "***FAILED";
+ECHO BOTH ": b subseq 2\n";
select subseq (f_noloc (b1), 10000, 10100) from tblob where k > 9999;
-echo both $if $equ $rowcnt 8 "PASSED" "***FAILED";
-echo both ": b subseq 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 8 "PASSED" "***FAILED";
+ECHO BOTH ": b subseq 3\n";
-- master to c2
@@ -326,8 +327,8 @@ update tblob set k = 11000 where k = 10003;
load clexpck.sql;
select explain_check ('select length (blob_to_string (bl)) from (select b1 as bl from tblob order by -k) f', 'cl fref read');
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": blob sort compilation\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": blob sort compilation\n";
select length (blob_to_string (bl)) from (select b1 as bl from tblob order by -k) f;
@@ -339,8 +340,8 @@ delete from tb_stat;
insert into tb_stat select k, length (b1), length (b2), length (b3), length (b4), e1, e2 from tblob;
tb_check (1);
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": tblob insert check " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": tblob insert check " $STATE "\n";
create table rep_blob (id int primary key, b long varchar);
alter index rep_blob on rep_blob partition cluster replicated;
@@ -357,12 +358,7 @@ create procedure large_repl ()
large_repl ();
large_repl ();
select length (b) from rep_blob;
-echo both $if $equ $last[1] 20000000 "PASSED" "***FAILED";
-echo both ": replicated ins replacing of large blob\n";
+ECHO BOTH $IF $EQU $LAST[1] 20000000 "PASSED" "***FAILED";
+ECHO BOTH ": replicated ins replacing of large blob\n";
cl_exec ('backup ''/dev/null''');
-
-
-
-
-
diff --git a/binsrc/tests/suite/tblob_recode.sh b/binsrc/tests/suite/tblob_recode.sh
index 2f28d4b..33a0284 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# blob recoding tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tblog.sql b/binsrc/tests/suite/tblog.sql
index f6bd4c5..f42be79 100644
--- a/binsrc/tests/suite/tblog.sql
+++ b/binsrc/tests/suite/tblog.sql
@@ -1,10 +1,10 @@
--
--- $Id: tblog.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tblogq.sql b/binsrc/tests/suite/tblogq.sql
index 6d5f067..f5cae87 100644
--- a/binsrc/tests/suite/tblogq.sql
+++ b/binsrc/tests/suite/tblogq.sql
@@ -1,10 +1,10 @@
--
--- $Id: tblogq.sql,v 1.2 2006/08/16 07:58:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -128,4 +128,3 @@ make_wwwroot ()
make_user_blog_and_posts ()
;
-
diff --git a/binsrc/tests/suite/tbreakup.sql b/binsrc/tests/suite/tbreakup.sql
index b2c43ff..e71885f 100644
--- a/binsrc/tests/suite/tbreakup.sql
+++ b/binsrc/tests/suite/tbreakup.sql
@@ -5,25 +5,25 @@
select * from (select breakup (row_no, fi2) (row_no, fi3) from r1..t1 where row_no <10)f;
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both ": remote breakup no cond\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": remote breakup no cond\n";
select * from (select breakup (row_no, fi2) (row_no, fi3 where fi3 = 3333) from r1..t1 where row_no <10)f;
-echo both $if $equ $rowcnt 10 "PASSED" "***FAILED";
-echo both ": remote breakup false cond\n";
+ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+ECHO BOTH ": remote breakup false cond\n";
select * from (select breakup (row_no, fi2) (row_no, fi3 where fi3 is null) from r1..t1 where row_no <10)f;
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both ": remote breakup true cond\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": remote breakup true cond\n";
select * from (select breakup (a.row_no, b.fi2) (b.row_no, a.fi3 where a.fi3 is null) from r1..t1 a, r1..t1 b where a.row_no <10 and b.row_no = a.row_no)f;
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both ": remote join breakup true cond\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": remote join breakup true cond\n";
select * from (select breakup (a.row_no, b.fi2) (b.row_no, a.fi3 where a.fi3 is null) from r1..t1 a, r1..t1 b where a.row_no <10 and b.row_no = a.row_no union select breakup (a.row_no, b.fi2) (b.row_no, a.fi3 where a.fi3 is null) from r1..t1 a, r1..t1 b where a.row_no <15 and b.row_no = a.row_no)f;
-echo both $if $equ $rowcnt 30 "PASSED" "***FAILED";
-echo both ": union remote join breakup true cond\n";
+ECHO BOTH $IF $EQU $ROWCNT 30 "PASSED" "***FAILED";
+ECHO BOTH ": union remote join breakup true cond\n";
diff --git a/binsrc/tests/suite/tbunion.sql b/binsrc/tests/suite/tbunion.sql
index 495241c..f4bf5ca 100644
--- a/binsrc/tests/suite/tbunion.sql
+++ b/binsrc/tests/suite/tbunion.sql
@@ -1,10 +1,10 @@
--
--- $Id: tbunion.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tcast.sql b/binsrc/tests/suite/tcast.sql
index 414fbd6..397fa3a 100644
--- a/binsrc/tests/suite/tcast.sql
+++ b/binsrc/tests/suite/tcast.sql
@@ -1,10 +1,10 @@
--
--- $Id: tcast.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -41,8 +41,8 @@ select * from tn where
d between 0 and 10 and
n between 0 and 10;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both " search cast 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": search cast 1\n";
@@ -53,8 +53,8 @@ select * from tn where
d between 0 and cast (10 as double precision) and
n between 0 and cast (10 as double precision);
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both " search cast 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": search cast 2\n";
@@ -67,8 +67,8 @@ select * from tn where
d between 0 and cast (10 as numeric) and
n between 0 and cast (10 as numeric);
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both " search cast 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": search cast 3\n";
select * from tn where
@@ -78,12 +78,12 @@ select * from tn where
d between 0 and cast (10 as real) and
n between 0 and cast (10 as real);
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both " search cast 4\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": search cast 4\n";
select count (*) from tn where n between 1e-100 and 1e100;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both " dbl and num range cmp.\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": dbl and num range cmp.\n";
@@ -91,11 +91,9 @@ insert into tn (r,d, n) values (1e36, 1e100, 9999999999999999999999999999999999
select count (*) from tn where r < 1e100;
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both " real-dbl comp\n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": real-dbl comp\n";
select count (*) from tn where r < n;
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both " real- num comp\n";
-
-
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": real- num comp\n";
diff --git a/binsrc/tests/suite/tchars.sql b/binsrc/tests/suite/tchars.sql
index 3e30170..e64292a 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- strict chars testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tcheck.sql b/binsrc/tests/suite/tcheck.sql
index 22f0be3..083cdf8 100644
--- a/binsrc/tests/suite/tcheck.sql
+++ b/binsrc/tests/suite/tcheck.sql
@@ -1,10 +1,10 @@
--
--- $Id: tcheck.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tclcast.sql b/binsrc/tests/suite/tclcast.sql
index 8f25658..7516edb 100644
--- a/binsrc/tests/suite/tclcast.sql
+++ b/binsrc/tests/suite/tclcast.sql
@@ -14,7 +14,5 @@ insert into ot values (stringdate ('2001-1-1'));
insert into ot values (rdf_box (stringdate ('2001-1-1'), 257, 257, 0, 1));
select * from ot;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": rows in ot after non-unq inserts with different dtps and rdf boxes\n";
-
-
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": rows in ot after non-unq inserts with different dtps and rdf boxes\n";
diff --git a/binsrc/tests/suite/tcldfg.sql b/binsrc/tests/suite/tcldfg.sql
index 744c26d..0616cb3 100644
--- a/binsrc/tests/suite/tcldfg.sql
+++ b/binsrc/tests/suite/tcldfg.sql
@@ -20,28 +20,28 @@ select b.fi2 from t1 a, t1 b where b.fi2 = 1 + a.fi2 and a.fi2 = 21 order by 1 +
select b.fi2 from t1 a, t1 b where b.fi2 between a.fi2 - 2 and a.fi2 + 2 and a.fi2 = 21 order by 1 + b.fi2 option (loop);
select count (*) from t1 a, t1 b where b.fi2 = 1+ a.fi2 and a.fi2 in ( 21, 22) option (loop);
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both ": select count with in";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": select count with in";
select count (*) from t1 a, t1 b where b.fi2 = 1+ a.fi2 and a.fi2 in ( 21, 22) option (loop);
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both ": select count with in\n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": select count with in\n";
select count (*) from t1 a, t1 b where b.fi2 = 1+ a.fi2 option (loop);
-echo both $if $equ $last[1] 99 "PASSED" "***FAILED";
-echo both ": select count f2 = f2 + 1 \n";
+ECHO BOTH $IF $EQU $LAST[1] 99 "PASSED" "***FAILED";
+ECHO BOTH ": select count f2 = f2 + 1 \n";
select count (*) from t1 a, t1 b where b.fi2 between a.fi2 - 200 and a.fi2 + 200 option (loop);
-echo both $if $equ $last[1] 10201 "PASSED" "***FAILED";
-echo both ": select count f2 = f2 + 1 \n";
+ECHO BOTH $IF $EQU $LAST[1] 10201 "PASSED" "***FAILED";
+ECHO BOTH ": select count f2 = f2 + 1 \n";
select a.fi2, (select count (*) from t1 b, t1 c where c.fi2 = b.fi2 + 1 and b.fi2 = a.fi2 + 1) from t1 a where a.fi2 < 40;
-echo both $if $equ $last[2] 1 "PASSED" "***FAILED";
-echo both ": dfg multistate count subq\n";
+ECHO BOTH $IF $EQU $LAST[2] 1 "PASSED" "***FAILED";
+ECHO BOTH ": dfg multistate count subq\n";
select a.fi2, c.fi2, c from t1 a, (select b.fi2, count (*) as c from t1 b group by b.fi2) c where c.fi2 between a.fi2 - 2 and a.fi2 + 2 option (loop, order);
@@ -89,4 +89,3 @@ create procedure df (in n int, in stage int)
}
select count (*) from t1 a, t1 b, t1 c where b.fi2 = df (a.fi2, 1) and c.fi2 = df (b.fi2, 2) option (order, loop);
-
diff --git a/binsrc/tests/suite/tcldt.sql b/binsrc/tests/suite/tcldt.sql
index 290b822..425609f 100644
--- a/binsrc/tests/suite/tcldt.sql
+++ b/binsrc/tests/suite/tcldt.sql
@@ -8,7 +8,7 @@
-echo both "Cluster multistate derived tables\n";
+ECHO BOTH "Cluster multistate derived tables\n";
__dbf_set ('cl_req_batch_size', 7);
@@ -41,61 +41,61 @@ explain ('select row_no, (select top 1 b.row_no as ct from t1 b where b.row_no
explain ('select row_no, (select b.row_no as ct from t1 b table option (loop) where b.row_no = 1 + a.row_no) as cnt from t1 a');
select row_no, (select b.row_no as ct from t1 b table option (loop) where b.row_no = 1 + a.row_no) as cnt from t1 a order by row_no;
-echo both $if $equ $rowcnt 101 "PASSED" "***FAILED";
-echo both ": single row scalar subq\n";
-echo both $if $equ $last[2] NULL "PASSED" "***FAILED";
-echo both ": null as scalar subq when no match\n";
+ECHO BOTH $IF $EQU $ROWCNT 101 "PASSED" "***FAILED";
+ECHO BOTH ": single row scalar subq\n";
+ECHO BOTH $IF $EQU $LAST[2] NULL "PASSED" "***FAILED";
+ECHO BOTH ": null as scalar subq when no match\n";
select fi2, (select b.fi2 as ct from t1 b table option (loop) where b.fi2 >= 1 + a.fi2) as cnt from t1 a order by fi2;
-echo both $if $equ $rowcnt 101 "PASSED" "***FAILED";
-echo both ": implied top 1 in range subq\n";
+ECHO BOTH $IF $EQU $ROWCNT 101 "PASSED" "***FAILED";
+ECHO BOTH ": implied top 1 in range subq\n";
select top 1 fi2, (select b.fi2 as ct from t1 b table option (loop) where sqrt (b.fi2) > 0 and b.fi2 >= 1 + a.fi2) as cnt from t1 a order by fi2;
-echo both $if $equ $last[2] 21 "PASSED" "***FAILED";
-echo both ": double implied top 1\n";
+ECHO BOTH $IF $EQU $LAST[2] 21 "PASSED" "***FAILED";
+ECHO BOTH ": double implied top 1\n";
select fi2, (select b.fi2 as ct from t1 b table option (loop) where l_inc (b.fi2) > 0 and b.fi2 >= 1 + a.fi2) as cnt from t1 a order by fi2;
-echo both $if $equ $rowcnt 101 "PASSED" "***FAILED";
-echo both ": no implied top 1 in subq with func\n";
+ECHO BOTH $IF $EQU $ROWCNT 101 "PASSED" "***FAILED";
+ECHO BOTH ": no implied top 1 in subq with func\n";
select fi2, (select b.fi2 as ct from t1 b table option (loop) where l_inc_pass (b.fi2) > 0 and b.fi2 >= 1 + a.fi2) as cnt from t1 a order by fi2;
-echo both $if $equ $rowcnt 101 "PASSED" "***FAILED";
-echo both ":With colocated sql func: no implied top 1 in subq with func\n";
+ECHO BOTH $IF $EQU $ROWCNT 101 "PASSED" "***FAILED";
+ECHO BOTH ":With colocated sql func: no implied top 1 in subq with func\n";
select fi2, (select b.fi2 as ct from t1 b table option (loop) where dpinc (b.fi2) > 0 and b.fi2 >= 1 + a.fi2) as cnt from t1 a order by fi2;
-echo both $if $equ $rowcnt 101 "PASSED" "***FAILED";
-echo both ": no implied top 1 in subq with dp func\n";
+ECHO BOTH $IF $EQU $ROWCNT 101 "PASSED" "***FAILED";
+ECHO BOTH ": no implied top 1 in subq with dp func\n";
select fi2, (select dpinc (b.fi2) as ct from t1 b table option (loop) where b.fi2 >= 1 + a.fi2) as cnt from t1 a order by fi2;
-echo both $if $equ $rowcnt 101 "PASSED" "***FAILED";
-echo both ": skipping sets with dp node in value subq\n";
+ECHO BOTH $IF $EQU $ROWCNT 101 "PASSED" "***FAILED";
+ECHO BOTH ": skipping sets with dp node in value subq\n";
select dpinc (row_no), (select b.row_no as ct from t1 b table option (loop) where b.row_no in ( 1 + a.row_no, 3 + a.row_no)) as cnt from t1 a table option (index primary key);
-echo both $if $equ $rowcnt 101 "PASSED" "***FAILED";
-echo both ": scalar subq with in and dp\n";
+ECHO BOTH $IF $EQU $ROWCNT 101 "PASSED" "***FAILED";
+ECHO BOTH ": scalar subq with in and dp\n";
select row_no, (select top 1 b.row_no as ct from t1 b where b.row_no between a.row_no - 2 and a.row_no + 2) as cnt from t1 a order by row_no;
-echo both $if $equ $last[2] 119 "PASSED" "***FAILED";
-echo both ": scalar subq with top and range\n";
+ECHO BOTH $IF $EQU $LAST[2] 119 "PASSED" "***FAILED";
+ECHO BOTH ": scalar subq with top and range\n";
select row_no, (select count (*) as ct from t1 b where b.row_no between a.row_no - 2 and a.row_no + 2) as cnt from t1 a order by row_no;
-echo both $if $equ $last[2] 2 "PASSED" "***FAILED";
-echo both ": scalar subq with count\n";
+ECHO BOTH $IF $EQU $LAST[2] 2 "PASSED" "***FAILED";
+ECHO BOTH ": scalar subq with count\n";
explain ('select a.row_no, b.row_no from t1 a left join (select row_no from t1) b on b.row_no in (a.row_no + 1, a.row_no + 2)');
select a.row_no, b.row_no from t1 a left join (select row_no from t1) b on b.row_no in (a.row_no + 1, a.row_no + 2);
-echo both $if $equ $rowcnt 199 "PASSED" "***FAILED";
-echo both ": oj of dt 199 rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 199 "PASSED" "***FAILED";
+ECHO BOTH ": oj of dt 199 rows\n";
select a.row_no, b.row_no from t1 a left join (select row_no from t1) b on b.row_no in (a.row_no + 199, a.row_no + 299);
-echo both $if $equ $rowcnt 101 "PASSED" "***FAILED";
-echo both ": oj of dt no hit 101 rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 101 "PASSED" "***FAILED";
+ECHO BOTH ": oj of dt no hit 101 rows\n";
@@ -107,16 +107,16 @@ select a.row_no, (select count (*) from t1 b where b.row_no between a.row_no - 2
select a.row_no, (select b.row_no from t1 b where b.row_no between a.row_no - 2 and a.row_no + 2) from t1 a ;
-- other partition with fi2 inx
select a.row_no, (select b.row_no from t1 b where b.fi2 between a.row_no - 2 and a.row_no + 2) from t1 a order by row_no;
-echo both $if $equ $last[2] 119 "PASSED" "***FAILED";
-echo both ": scalar subq with multivalue range\n";
+ECHO BOTH $IF $EQU $LAST[2] 119 "PASSED" "***FAILED";
+ECHO BOTH ": scalar subq with multivalue range\n";
select a.row_no, (select b.row_no from t1 b, t1 d where b.fi2 between a.row_no - 2 and a.row_no + 2 and d.fi2 > b.row_no) from t1 a ;
select a.row_no, (select d.row_no from t1 b, t1 d where b.fi2 between a.row_no - 2 and a.row_no + 2 and d.fi2 > b.row_no - 2) from t1 a order by row_no;
-echo both $if $equ $last[2] 118 "PASSED" "***FAILED";
-echo both ": scalar subq with joined multivalue range\n";
+ECHO BOTH $IF $EQU $LAST[2] 118 "PASSED" "***FAILED";
+ECHO BOTH ": scalar subq with joined multivalue range\n";
-- top and skip of derived table
@@ -126,8 +126,8 @@ select a.row_no, b.row_no from t1 a, (select top 3 c.row_no from t1 c) b where b
--select a.row_no, b.row_no from t1 a table option (index t1), (select top 3 c.row_no from t1 c ) b where b.row_no in ( a.row_no, a.row_no + 1) option (loop, order);
---echo both $if $equ $rowcnt 200 "PASSED" "***FAILED";
---echo both ": dt with in\n";
+--ECHO BOTH $IF $EQU $ROWCNT 200 "PASSED" "***FAILED";
+--ECHO BOTH ": dt with in\n";
-- group by
@@ -136,53 +136,53 @@ update t1 set fi6 = row_no / 10;
create index fi6 on t1 (fi6) partition (fi6 int);
select fi6, count (*) from t1 group by fi6 order by 2 desc;
-echo both $if $equ $last[2] 1 "PASSED" "***FAILED";
-echo both ": simple group by\n";
+ECHO BOTH $IF $EQU $LAST[2] 1 "PASSED" "***FAILED";
+ECHO BOTH ": simple group by\n";
select a.fi6, b.* from (select distinct fi6 from t1) a, (select fi6, count (*) as ct from t1 group by fi6) b where b.fi6 = a.fi6 option (order);
-echo both $if $equ $last[3] 1 "PASSED" "***FAILED";
-echo both ": multistate group by dt\n";
+ECHO BOTH $IF $EQU $LAST[3] 1 "PASSED" "***FAILED";
+ECHO BOTH ": multistate group by dt\n";
select a.fi6, b.* from (select distinct fi6 from t1) a, (select fi6, count (*) as ct from t1 group by fi6) b where b.fi6 between a.fi6 - 1 and a.fi6 + 1 order by 1, 2 option (order);
-echo both $if $equ $last[3] 1 "PASSED" "***FAILED";
-echo both ": multistate group by dt with range, gb partitioned\n";
+ECHO BOTH $IF $EQU $LAST[3] 1 "PASSED" "***FAILED";
+ECHO BOTH ": multistate group by dt with range, gb partitioned\n";
select a.fi6, b.* from (select distinct fi6 from t1) a, (select fi6, fi6 + 0 as dum, count (*) as ct from t1 group by fi6, fi6 + 0) b where b.fi6 between a.fi6 - 1 and a.fi6 + 1 order by 1, 2 option (order);
-echo both $if $equ $last[4] 1 "PASSED" "***FAILED";
-echo both ": multistate group by dt with range, gb not partitioned\n";
+ECHO BOTH $IF $EQU $LAST[4] 1 "PASSED" "***FAILED";
+ECHO BOTH ": multistate group by dt with range, gb not partitioned\n";
-- existence
select a.row_no from t1 a where not exists (select 1 from t1 b where b.row_no > a.row_no + 30) and not exists (select 1 from t1 c where c.row_no < a.row_no - 30);
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": not exists and not exists empty\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": not exists and not exists empty\n";
select a.row_no from t1 a where not exists (select 1 from t1 b where b.row_no > a.row_no + 60) and not exists (select 1 from t1 c where c.row_no < a.row_no - 60);
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both ": not exists and not exists 20\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": not exists and not exists 20\n";
select a.fi2 from t1 a where not exists (select 1 from t1 b where b.fi2 > a.fi2 + 60) and not exists (select 1 from t1 c where c.fi2 < a.fi2 - 60);
select a.fi2 from t1 a where exists (select 1 from t1 b where b.fi2 > a.fi2 + 60) and exists (select 1 from t1 c where c.fi2 < a.fi2 - 60);
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": exists and exists 2 0\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": exists and exists 2 0\n";
select a.fi2 from t1 a where exists (select 1 from t1 b where b.fi2 > a.fi2 + 40) and exists (select 1 from t1 c where c.fi2 < a.fi2 - 40);
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both ": exists and exists 20\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": exists and exists 20\n";
select a.fi2 from t1 a where exists (select 1 from t1 b where b.fi2 in (a.fi2 + 40, a.fi2 + 41)) and exists (select 1 from t1 c where c.fi2 in ( a.fi2 - 40, a.fi2 - 41));
-echo both $if $equ $rowcnt 22 "PASSED" "***FAILED";
-echo both ": exists and exists 22\n";
+ECHO BOTH $IF $EQU $ROWCNT 22 "PASSED" "***FAILED";
+ECHO BOTH ": exists and exists 22\n";
select fi2 from t1 a where mod (fi2, 2) = 1 and exists (select 1 from t1 b where b.fi2 = 1 + a.fi2) ;
-echo both $if $equ $rowcnt 49 "PASSED" "***FAILED";
-echo both ":sparse exists\n";
+ECHO BOTH $IF $EQU $ROWCNT 49 "PASSED" "***FAILED";
+ECHO BOTH ":sparse exists\n";
select fi2, s.string1 from (select distinct string1 from t1) s, t1 where row_no = (select max (row_no) from t1 where string1 = s.string1);
@@ -194,36 +194,40 @@ select row_no, (select count (*) from t1 b where b.string1 = a.string1) from t1
-- unions
select a.fi2, b.fi2 from t1 a, (select fi2 from t1 union select row_no from t1) b where a.fi2 + 1 = b.fi2 option (order);
-echo both $if $equ $rowcnt 99 "PASSED" "***FAILED";
-echo both ": union\n";
+ECHO BOTH $IF $EQU $ROWCNT 99 "PASSED" "***FAILED";
+ECHO BOTH ": union\n";
select a.fi2, b.fi2 from t1 a, (select fi2 from t1 union all select row_no from t1) b where a.fi2 + 1 = b.fi2 option (order);
-echo both $if $equ $rowcnt 198 "PASSED" "***FAILED";
-echo both ": union all\n";
+ECHO BOTH $IF $EQU $ROWCNT 198 "PASSED" "***FAILED";
+ECHO BOTH ": union all\n";
+
+
+
+
-- multistate except not supported
-- select a.fi2, b.fi2 from t1 a, (select fi2 from t1 except select row_no from t1) b where a.fi2 + 1 = b.fi2 option (order);
--- echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
--- echo both ": except \n";
+-- ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+-- ECHO BOTH ": except \n";
select fi2 from t1 a where a.fi2 in (select b.fi2 from t1 b where b.fi2 = a.fi2 group by b.fi2 having sum (b.fi2) > 80) option (do not loop exists);
-echo both $if $equ $rowcnt 40 "PASSED" "***FAILED";
-echo both ": having over group by agg in existence subq, the gb is done by the partitions, no looping of exists\n";
+ECHO BOTH $IF $EQU $ROWCNT 40 "PASSED" "***FAILED";
+ECHO BOTH ": having over group by agg in existence subq, the gb is done by the partitions, no looping of exists\n";
select fi2 from t1 a where a.fi2 in (select b.row_no - 1 from t1 b where b.fi2 >= a.fi2 + 1 and b.fi2 < a.fi2 + 2 group by b.row_no - 1 having sum (b.row_no) > 80) option (do not loop exists);
-echo both $if $equ $rowcnt 39 "PASSED" "***FAILED";
-echo both ": having over group by agg in existence subq, the gb is summed on coordinator, no looping of exists\n";
+ECHO BOTH $IF $EQU $ROWCNT 39 "PASSED" "***FAILED";
+ECHO BOTH ": having over group by agg in existence subq, the gb is summed on coordinator, no looping of exists\n";
select c.fi2, sum (c.row_no) from t1 a, t1 b table option (hash), t1 c where b.fi2 = a.fi2 + 1 and c.fi2 = b.fi2 group by c.fi2 order by 2 desc option (order);
-echo both $if $equ $rowcnt 99 "PASSED" "***FAILED";
-echo both ": final partitioned gb oby, many batches, one set\n";
+ECHO BOTH $IF $EQU $ROWCNT 99 "PASSED" "***FAILED";
+ECHO BOTH ": final partitioned gb oby, many batches, one set\n";
select c.fi2, sum (c.row_no) from t1 a, t1 b table option (hash), t1 d, t1 c where b.fi2 = a.fi2 + 1 and d.fi2 = b.fi2 and c.fi2 = d.fi2 + 1 group by c.fi2 order by 2 desc option (order);
-echo both $if $equ $rowcnt 98 "PASSED" "***FAILED";
-echo both ": final dfg w partitioned gb oby, many batches, one set\n";
+ECHO BOTH $IF $EQU $ROWCNT 98 "PASSED" "***FAILED";
+ECHO BOTH ": final dfg w partitioned gb oby, many batches, one set\n";
diff --git a/binsrc/tests/suite/tclins.sql b/binsrc/tests/suite/tclins.sql
index 50e4be2..8884a2b 100644
--- a/binsrc/tests/suite/tclins.sql
+++ b/binsrc/tests/suite/tclins.sql
@@ -2,7 +2,7 @@
-- replacing and soft inserts in cluster
-echo both "Cluster insert replacing and soft\n";
+ECHO BOTH "Cluster insert replacing and soft\n";
drop table ko;
drop table kd;
@@ -26,31 +26,31 @@ insert soft kd select * from kd;
insert soft kd select k1 + 1, ku + 1, nu + 1 from kd where k1 < 7;
select * from kd;
-echo both $if $equ $last[1] 7 "PASSED" "***FAILED";
-echo both ": ins repl + soft no1\n";
+ECHO BOTH $IF $EQU $LAST[1] 7 "PASSED" "***FAILED";
+ECHO BOTH ": ins repl + soft no1\n";
set autocommit manual;
insert replacing kd values (4, 6, 7);
-echo both $if $neq $sqlstate OK "PASSED" "***FAILED";
-echo both ": non unq 2nd in ins repl\n";
+ECHO BOTH $IF $NEQ $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": non unq 2nd in ins repl\n";
rollback work;
set autocommit off;
insert replacing kd values (5, 7, 8);
-echo both $if $neq $sqlstate OK "PASSED" "***FAILED";
-echo both ": non unq 2nd in ins repl 2\n";
+ECHO BOTH $IF $NEQ $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": non unq 2nd in ins repl 2\n";
rollback work;
insert replacing kd values (4, 10, 11);
select * from kd where k1 = 4;
-echo both $if $equ $last[3] 11 "PASSED" "***FAILED";
-echo both ": ins repl ok\n";
+ECHO BOTH $IF $EQU $LAST[3] 11 "PASSED" "***FAILED";
+ECHO BOTH ": ins repl ok\n";
insert soft kd values (5, 10, 11);
select * from kd where k1 = 5;
-echo both $if $equ $last[3] 7 "PASSED" "***FAILED";
-echo both ": ins soft ok\n";
+ECHO BOTH $IF $EQU $LAST[3] 7 "PASSED" "***FAILED";
+ECHO BOTH ": ins soft ok\n";
diff --git a/binsrc/tests/suite/tcljoin.sql b/binsrc/tests/suite/tcljoin.sql
index fcae8e1..57a85d4 100644
--- a/binsrc/tests/suite/tcljoin.sql
+++ b/binsrc/tests/suite/tcljoin.sql
@@ -9,79 +9,79 @@ update t1 set fi2 = row_no, fi3 = row_no;
create index fi2 on t1 (fi2) partition (fi2 int);
create unique index fi3 on t1 (fi3) partition (fi3 int);
-echo both "Cluster outer join\n";
+ECHO BOTH "Cluster outer join\n";
insert into t1 (row_no, fi2, string1) values (121, 121, '121');
__dbf_set ('cl_req_batch_size', 5);
select a.fi2, b.fi2 from t1 a left join t1 b on b.fi2 = a.fi2 + 5 where a.fi2 > 110 option (loop);
-echo both $if $equ $rowcnt 10 "PASSED" "***FAILED";
-echo both ": cl oj 1: " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 1: " $ROWCNT " rows\n";
select count (a.fi2), count (b.fi2) from t1 a left join t1 b on b.fi2 = a.fi2 + 5 where a.fi2 > 110 option (loop);
-echo both $if $equ $last[2] 5 "PASSED" "***FAILED";
-echo both ": cl oj 2\n";
+ECHO BOTH $IF $EQU $LAST[2] 5 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2\n";
-- f is a colocation sequence break because of id to iri. f_pass is safely colocatable
create procedure f (in q any) { id_to_iri (#i100); return q;};
create procedure f_pass (in q any) { return q;};
select f (b.fi2) from t1 a left join t1 b on b.fi2 = a.fi2 + 5 where a.fi2 > 110 and b.fi2 - b.fi2 = 0 option (loop, any order);
-echo both $if $equ $rowcnt 5 "PASSED" "***FAILED";
-echo both ": outer dfg with after join test\n";
+ECHO BOTH $IF $EQU $ROWCNT 5 "PASSED" "***FAILED";
+ECHO BOTH ": outer dfg with after join test\n";
select f (b.fi2) from t1 a left join t1 b on b.fi2 = a.fi2 + 5 where a.fi2 > 110 and b.fi2 - b.fi2 = 0 option (loop);
-echo both $if $equ $rowcnt 5 "PASSED" "***FAILED";
-echo both ": outer dfg with after join test\n";
+ECHO BOTH $IF $EQU $ROWCNT 5 "PASSED" "***FAILED";
+ECHO BOTH ": outer dfg with after join test\n";
select count (a.fi2), count (f (b.fi2)) from t1 a left join t1 b on b.fi2 = a.fi2 + 5 where a.fi2 > 110 option (loop);
-echo both $if $equ $last[1] 10 "PASSED" "***FAILED";
-echo both ": cl oj 2\n";
+ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2\n";
-echo both $if $equ $last[2] 5 "PASSED" "***FAILED";
-echo both ": cl oj 2\n";
+ECHO BOTH $IF $EQU $LAST[2] 5 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2\n";
select count (a.fi2), count (b.fi2) from t1 a left join t1 b on b.fi2 = a.fi2 + 5 where a.fi2 > 110 option (loop);
-echo both $if $equ $last[1] 10 "PASSED" "***FAILED";
-echo both ": cl oj 3-1\n";
-echo both $if $equ $last[2] 5 "PASSED" "***FAILED";
-echo both ": cl oj 3-2\n";
+ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 3-1\n";
+ECHO BOTH $IF $EQU $LAST[2] 5 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 3-2\n";
select a.fi2, b.fi2, b.string1 from t1 a left join t1 b table option (loop, index fi2) on b.fi2 = a.fi2 + 5 where a.fi2 > 110 option (loop);
-echo both $if $equ $rowcnt 10 "PASSED" "***FAILED";
-echo both ": cl oj 2nd key 1: " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2nd key 1: " $ROWCNT " rows\n";
select count (a.fi2), count (b.fi2), count (b.string1) from t1 a left join t1 b on b.fi2 = a.fi2 + 5 where a.fi2 > 110 option (loop);
-echo both $if $equ $last[1] 10 "PASSED" "***FAILED";
-echo both ": cl oj 2nd key 3-1\n";
-echo both $if $equ $last[2] 5 "PASSED" "***FAILED";
-echo both ": cl oj 2nd key 3-2\n";
+ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2nd key 3-1\n";
+ECHO BOTH $IF $EQU $LAST[2] 5 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2nd key 3-2\n";
select count (a.fi2), count (b.fi2), count (b.string1) from t1 a left join t1 b table option (index t1) on b.fi2 = a.fi2 + 5 where a.fi2 > 110 option (loop);
-echo both $if $equ $last[1] 10 "PASSED" "***FAILED";
-echo both ": cl oj flood key 1-1\n";
-echo both $if $equ $last[2] 5 "PASSED" "***FAILED";
-echo both ": cl oj flood join key 1-2\n";
+ECHO BOTH $IF $EQU $LAST[1] 10 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj flood key 1-1\n";
+ECHO BOTH $IF $EQU $LAST[2] 5 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj flood join key 1-2\n";
select a.fi2, b.fi2, b.string1 from t1 a left join t1 b table option (loop, index fi2) on b.fi2 in (a.fi2 + 5, a.fi2 + 6) where a.fi2 > 110 option (loop);
-echo both $if $equ $rowcnt 13 "PASSED" "***FAILED";
-echo both ": cl oj 2nd key in pred 1: " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 13 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2nd key in pred 1: " $ROWCNT " rows\n";
select a.fi2, b.fi2, b.string1 from t1 a left join t1 b table option (loop, index fi2) on b.fi2 in (sprintf ('bad%d', a.fi2 + 5), a.fi2 + 6) where a.fi2 > 110 option (loop, quietcast);
-echo both $if $equ $rowcnt 10 "PASSED" "***FAILED";
-echo both ": cl oj 2nd key quietcast in pred 1: " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2nd key quietcast in pred 1: " $ROWCNT " rows\n";
select a.fi2, b.fi2 from t1 a left join t1 b table option (loop, index fi2) on b.fi2 in (sprintf ('bad%d', a.fi2 + 5), a.fi2 + 6) where a.fi2 > 110 option (loop, quietcast);
@@ -89,32 +89,32 @@ select a.fi2, b.fi2 from t1 a left join t1 b table option (loop, index fi2) on
select a.fi2, b.fi2 from t1 a left join t1 b table option (loop, index fi2) on b.fi2 = sprintf ('bad%d', a.fi2 + 5) where a.fi2 > 110 option (loop, quietcast);
-echo both $if $equ $rowcnt 10 "PASSED" "***FAILED";
-echo both ": cl oj 1st key quietcast in pred 1: " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 1st key quietcast in pred 1: " $ROWCNT " rows\n";
select count (a.fi2), count (b.fi2), count (b.string1) from t1 a left join t1 b table option (loop, index fi2) on b.fi2 in (a.fi2 + 5, a.fi2 + 6) where a.fi2 > 110 option (loop);
-echo both $if $equ $last[1] 13 "PASSED" "***FAILED";
-echo both ": cl oj 2nd key in pred 3-1\n";
-echo both $if $equ $last[2] 9 "PASSED" "***FAILED";
-echo both ": cl oj 2nd key in pred 3-2\n";
+ECHO BOTH $IF $EQU $LAST[1] 13 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2nd key in pred 3-1\n";
+ECHO BOTH $IF $EQU $LAST[2] 9 "PASSED" "***FAILED";
+ECHO BOTH ": cl oj 2nd key in pred 3-2\n";
select c.fi2, a.fi2, b.fi2, b.string1 from t1 c join t1 a on a.fi2 > c.fi2 left join t1 b table option (loop, index fi2) on b.fi2 in (a.fi2 + 5, a.fi2 + 6) where c.fi2 in (110, 111) option (order, loop);
-echo both $if $equ $rowcnt 24 "PASSED" "***FAILED";
-echo both ": cl 3 table oj 2nd key in pred 1: " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 24 "PASSED" "***FAILED";
+ECHO BOTH ": cl 3 table oj 2nd key in pred 1: " $ROWCNT " rows\n";
select count (*) from t1 a left join t1 b table option (loop) on b.row_no = a.row_no + 100 where b.row_no is null;
-echo both $if $equ $last[1] 100 "PASSED" "***FAILED";
-echo both ": outer unordered 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 100 "PASSED" "***FAILED";
+ECHO BOTH ": outer unordered 1\n";
select count (*) from t1 a left join t1 b table option (loop) on b.row_no = a.row_no + 100 where f (b.row_no) is null;
-echo both $if $equ $last[1] 100 "PASSED" "***FAILED";
-echo both ": outer unordered 2\n";
+ECHO BOTH $IF $EQU $LAST[1] 100 "PASSED" "***FAILED";
+ECHO BOTH ": outer unordered 2\n";
select count (*) from (select top 1000 b.row_no from t1 a left join t1 b table option (loop) on b.row_no = a.row_no + 100) c where f (c.row_no) is null;
-echo both $if $equ $last[1] 100 "PASSED" "***FAILED";
-echo both ": outer unordered 3\n";
+ECHO BOTH $IF $EQU $LAST[1] 100 "PASSED" "***FAILED";
+ECHO BOTH ": outer unordered 3\n";
create procedure cl_oj ()
diff --git a/binsrc/tests/suite/tcllock.sql b/binsrc/tests/suite/tcllock.sql
index 7168fcc..4b37e01 100644
--- a/binsrc/tests/suite/tcllock.sql
+++ b/binsrc/tests/suite/tcllock.sql
@@ -45,16 +45,16 @@ insert into cllk (id) values (14) &
sleep (0.2);
select count (*) from cllk;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": cl serializable insert 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": cl serializable insert 1\n";
commit work;
delay (0.2);
select count (*) from cllk;
-echo both $if $equ $last[1] 5 "PASSED" "***FAILED";
-echo both ": cl serializable insert 2\n";
+ECHO BOTH $IF $EQU $LAST[1] 5 "PASSED" "***FAILED";
+ECHO BOTH ": cl serializable insert 2\n";
sread (10);
diff --git a/binsrc/tests/suite/tcllock2.sql b/binsrc/tests/suite/tcllock2.sql
index f756d9d..5e65e60 100644
--- a/binsrc/tests/suite/tcllock2.sql
+++ b/binsrc/tests/suite/tcllock2.sql
@@ -22,8 +22,8 @@ cl_exec ('registry_set (''kill_id'', ?)', vector (sprintf ('%ld', __cl_txn_id ()
cl_exec ('__cl_kill_txn (atod (registry_get (''kill_id'')))', delay => 0.3, hosts => vector (2, 3)) &
delay (0.1);
commit work;
-echo both $if $equ $sqlstate "40004" "PASSED" "***FAILED";
-echo both ": async deadlock kill in mid 2pc\n";
+ECHO BOTH $IF $EQU $SQLSTATE "40004" "PASSED" "***FAILED";
+ECHO BOTH ": async deadlock kill in mid 2pc\n";
-- out of log
@@ -34,8 +34,8 @@ update tblob b1 set b1 = (select b1 from tblob b2 where b2.k = b1.k + 1) where k
cl_exec ('__dbf_set (''dbf_log_no_disk'', 1)', hosts => vector (2, 3));
commit work;
-echo both $if $equ $sqlstate "40004" "PASSED" "***FAILED";
-echo both ": log out of disk\n";
+ECHO BOTH $IF $EQU $SQLSTATE "40004" "PASSED" "***FAILED";
+ECHO BOTH ": log out of disk\n";
cl_exec ('__dbf_set (''dbf_log_no_disk'', 0)', hosts => vector (2, 3));
@@ -50,8 +50,8 @@ update tblob b1 set b1 = (select b1 from tblob b2 where b2.k = b1.k + 1) where k
cl_exec ('checkpoint', delay => 0.5) &
delay (0.2);
commit work;
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": checkpoint in mid 2pc\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": checkpoint in mid 2pc\n";
-- 2pc recov cycle with blobs. Ends with committed
@@ -64,8 +64,8 @@ update tblob b1 set b1 = (select b1 from tblob b2 where b2.k = b1.k + 1) where k
cl_exec ('raw_exit ()', delay => 1.5, hosts => vector (2, 3)) &
delay (0.2);
commit work;
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": OK for 2pc commit with branch failure after prepare. Recov cycle will say committed\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": OK for 2pc commit with branch failure after prepare. Recov cycle will say committed\n";
-- 2pc recov cycle with blobs. Ends with not committed
@@ -83,5 +83,3 @@ cl_exec ('raw_exit ()', delay => 1.7, hosts => vector (1)) &
delay (0.15);
commit work;
-
-
diff --git a/binsrc/tests/suite/tclparts.sql b/binsrc/tests/suite/tclparts.sql
index 4870f89..5ef5fa1 100644
--- a/binsrc/tests/suite/tclparts.sql
+++ b/binsrc/tests/suite/tclparts.sql
@@ -3,7 +3,7 @@
-- test cluster partitioned group by + order by
-echo both "Cluster partitioned oby and gby/oby\n";
+ECHO BOTH "Cluster partitioned oby and gby/oby\n";
__dbf_set ('enable_setp_partition', 1);
@@ -15,28 +15,28 @@ cl_exec ('__dbf_set (''cl_res_buffer_bytes'', 100)');
__dbf_set ('enable_setp_partition', 1);
select row_no, string2 from t1 table option (index str2) where row_no < 1100 order by row_no + 1;
-echo both $if $equ $last[1] 121 "PASSED" "***FAILED";
-echo both ": single partitioned oby\n";
+ECHO BOTH $IF $EQU $LAST[1] 121 "PASSED" "***FAILED";
+ECHO BOTH ": single partitioned oby\n";
select a.fi2, b.fi2 from t1 a, (select fi2 from t1 order by fi2 + 1) b where b.fi2 between a.fi2 - 2 and a.fi2 + 2 and a.fi2 < 30 option (order);
-echo both $if $equ $rowcnt 47 "PASSED" "***FAILED";
-echo both ": partitioned oby in dt\n";
+ECHO BOTH $IF $EQU $ROWCNT 47 "PASSED" "***FAILED";
+ECHO BOTH ": partitioned oby in dt\n";
select a.fi2, b.fi2, dfi2 from t1 a, (select c.fi2, d.fi2 as dfi2 from t1 c, t1 d where d.fi2 = c.fi2 - 1 order by fi2 + 1) b where b.fi2 between a.fi2 - 2 and a.fi2 + 2 and a.fi2 < 30 option (order);
-echo both $if $equ $rowcnt 44 "PASSED" "***FAILED";
-echo both ": partitioned oby in dfg dt\n";
+ECHO BOTH $IF $EQU $ROWCNT 44 "PASSED" "***FAILED";
+ECHO BOTH ": partitioned oby in dfg dt\n";
-- the 2 below commented out since dt changed not to import join preds inside a top dt
select a.fi2, b.fi2 from t1 a, (select top 3 fi2 from t1 order by fi2 + 1) b where b.fi2 between a.fi2 - 2 and a.fi2 + 2 and a.fi2 < 30 option (order);
---echo both $if $equ $rowcnt 30 "PASSED" "***FAILED";
---echo both ": partitioned oby in top dt\n";
+--ECHO BOTH $IF $EQU $ROWCNT 30 "PASSED" "***FAILED";
+--ECHO BOTH ": partitioned oby in top dt\n";
select a.fi2, b.fi2, dfi2 from t1 a, (select top 4 c.fi2, d.fi2 as dfi2 from t1 c, t1 d where d.fi2 = c.fi2 - 1 order by fi2 + 1) b where b.fi2 between a.fi2 - 2 and a.fi2 + 2 and a.fi2 < 30 option (order);
---echo both $if $equ $rowcnt 37 "PASSED" "***FAILED";
---echo both ": partitioned oby in top dfg dt\n";
+--ECHO BOTH $IF $EQU $ROWCNT 37 "PASSED" "***FAILED";
+--ECHO BOTH ": partitioned oby in top dfg dt\n";
@@ -137,32 +137,32 @@ update t1 set fs4 = sprintf ('fs4 - %d', row_no);
explain ('select fi6, strconc (fs4) from t1 group by fi6');
select fi6, strconc (fs4) from t1 group by fi6;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": ua with gb\n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": ua with gb\n";
select fi6, strconc (fs4) from t1 group by fi6 order by length (strconc (fs4)) desc;
-echo both $if $equ $rowcnt 11 "PASSED" "***FAILED";
-echo both ": ua with gb and oby\n";
+ECHO BOTH $IF $EQU $ROWCNT 11 "PASSED" "***FAILED";
+ECHO BOTH ": ua with gb and oby\n";
select top 5 fi6, strconc (fs4) from t1 group by fi6 order by length (strconc (fs4)) desc;
-echo both $if $equ $rowcnt 5 "PASSED" "***FAILED";
-echo both ": ua with gb and top oby\n";
+ECHO BOTH $IF $EQU $ROWCNT 5 "PASSED" "***FAILED";
+ECHO BOTH ": ua with gb and top oby\n";
select fi6, strconc (fs4 || make_string (500)) from t1 group by fi6 order by length (strconc (fs4)) desc;
-echo both $if $equ $sqlstate 22026 "PASSED" "***FAILED";
-echo both ": row too long in ua temp\n";
+ECHO BOTH $IF $EQU $SQLSTATE 22026 "PASSED" "***FAILED";
+ECHO BOTH ": row too long in ua temp\n";
select fi6, strconc (fs4) from t1 table option (index str1) where fi2 < 0 group by fi6 order by length (strconc (fs4)) desc;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": part ua, no rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": part ua, no rows\n";
-- validate the result of the next
select count (*) from (select a.fi6, b.fi6 from t1 a, (select distinct fi6 from t1) b where b.fi6 between a.fi6 - 1 and a.fi6 + 1) q;
-echo both $if $equ $last[1] 292 "PASSED" "***FAILED";
-echo both ": 292 for fi6 x distinct fi6 range\n";
+ECHO BOTH $IF $EQU $LAST[1] 292 "PASSED" "***FAILED";
+ECHO BOTH ": 292 for fi6 x distinct fi6 range\n";
@@ -170,16 +170,16 @@ select a.fi6, b.fi6, ff
from t1 a, (select fi6, strconc (fs4) as ff from t1 table option (index str1) group by fi6 order by (strconc (fs4)) || ' ' desc) b
where b.fi6 between a.fi6 - 1 and a.fi6 + 1 option (order);
-echo both $if $equ $rowcnt 292 "PASSED" "***FAILED";
-echo both ": part ua,multistate dfg dt with gb/oby\n";
+ECHO BOTH $IF $EQU $ROWCNT 292 "PASSED" "***FAILED";
+ECHO BOTH ": part ua,multistate dfg dt with gb/oby\n";
update t1 set fi6 = row_no;
select a.fi6, b.fi6, ff
from t1 a, (select fi6, strconc (fs4) as ff from t1 table option (index str1) group by fi6 order by (strconc (fs4)) || ' ' desc) b
where b.fi6 between a.fi6 - 1 and a.fi6 + 1 option (order);
-echo both $if $equ $rowcnt 299 "PASSED" "***FAILED";
-echo both ": part ua,multistate dfg dt with gb/oby - 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 299 "PASSED" "***FAILED";
+ECHO BOTH ": part ua,multistate dfg dt with gb/oby - 2\n";
diff --git a/binsrc/tests/suite/tcoll.sql b/binsrc/tests/suite/tcoll.sql
index 4a38d4c..882a2a0 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Collation tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tconcur2.sql b/binsrc/tests/suite/tconcur2.sql
index 6adc04f..fa9555d 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.1 2009/04/16 12:37:43 source Exp $
+-- $Id$
--
-- Concurrency test #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tcpt.sh b/binsrc/tests/suite/tcpt.sh
index 9648d78..134d543 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 2008/06/19 11:35:01 source Exp $
+# $Id$
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tcptck.sql b/binsrc/tests/suite/tcptck.sql
index 5197955..a601060 100644
--- a/binsrc/tests/suite/tcptck.sql
+++ b/binsrc/tests/suite/tcptck.sql
@@ -13,16 +13,16 @@ ECHO BOTH $IF $EQU $ROWCNT 90000 "PASSED" "***FAILED";
ECHO BOTH ": " $ROWCNT" rows in t1 after cpt recov\n";
select count (distinct length (fs5)) from t1;
-echo both $if $equ $last[1] 15 "PASSED" "***FAILED";
-echo both ": " $last[1] " distinct lengths of fs5 after cpt rb and restart.\n";
+ECHO BOTH $if $equ $last[1] 15 "PASSED" "***FAILED";
+ECHO BOTH ": " $last[1] " distinct lengths of fs5 after cpt rb and restart.\n";
select count (distinct fi2) from t1;
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both ": " $last[1] " distinct numbers in fi2 after cpt rb and restart.\n";
+ECHO BOTH $if $equ $last[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $last[1] " distinct numbers in fi2 after cpt rb and restart.\n";
select distinct fs5 from t1 where row_no > 70000 and mod (row_no, 20) = 2;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": " $rowcnt " rows in pre cpt update.\n";
+ECHO BOTH $if $equ $rowcnt 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $rowcnt " rows in pre cpt update.\n";
checkpoint;
--drop table t1;
diff --git a/binsrc/tests/suite/tcptdt.sql b/binsrc/tests/suite/tcptdt.sql
index 3ebd385..ed3799b 100644
--- a/binsrc/tests/suite/tcptdt.sql
+++ b/binsrc/tests/suite/tcptdt.sql
@@ -30,16 +30,16 @@ ECHO BOTH $IF $EQU $ROWCNT 90000 "PASSED" "***FAILED";
ECHO BOTH ": " $ROWCNT" rows in t1 after cpt recov\n";
select count (distinct length (fs5)) from t1;
-echo both $if $equ $last[1] 15 "PASSED" "***FAILED";
-echo both ": " $last[1] " distinct lengths of fs5 after cpt rb and restart.\n";
+ECHO BOTH $if $equ $last[1] 15 "PASSED" "***FAILED";
+ECHO BOTH ": " $last[1] " distinct lengths of fs5 after cpt rb and restart.\n";
select count (distinct fi2) from t1;
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both ": " $last[1] " distinct numbers in fi2 after cpt rb and restart.\n";
+ECHO BOTH $if $equ $last[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $last[1] " distinct numbers in fi2 after cpt rb and restart.\n";
select distinct fs5 from t1 where row_no > 70000 and mod (row_no, 20) = 2;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": " $rowcnt " rows in pre cpt update.\n";
+ECHO BOTH $if $equ $rowcnt 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $rowcnt " rows in pre cpt update.\n";
delete from T2 where ROW_NO > 50; -- 50 left
@@ -48,12 +48,12 @@ set autocommit manual;
delete from T2 where ROW_NO <= 50; -- empty
delete from T1 where row_no > 60000 and mod (row_no, 20) = 0;
-echo both $if $equ $rowcnt 2000 "PASSED" "***FAILED";
-echo both ": count of deld pre cpt rows=" $rowcnt " where ropw_no mod 20 = 0.\n";
+ECHO BOTH $if $equ $rowcnt 2000 "PASSED" "***FAILED";
+ECHO BOTH ": count of deld pre cpt rows=" $rowcnt " where ropw_no mod 20 = 0.\n";
update t1 set fs5 = 'que pasa' where row_no > 70000 and mod (row_no, 20) = 2;
-echo both $if $equ $rowcnt 1500 "PASSED" "***FAILED";
-echo both ": " $rowcnt " rows in pre cpt update.\n";
+ECHO BOTH $if $equ $rowcnt 1500 "PASSED" "***FAILED";
+ECHO BOTH ": " $rowcnt " rows in pre cpt update.\n";
delete from T1 where row_no > 90000; -- 78000 left
diff --git a/binsrc/tests/suite/tcptrb.sql b/binsrc/tests/suite/tcptrb.sql
index 67b8309..a09f575 100644
--- a/binsrc/tests/suite/tcptrb.sql
+++ b/binsrc/tests/suite/tcptrb.sql
@@ -26,26 +26,26 @@ set autocommit manual;
update T1 set lst = 'parashakti aum' || cast (row_no as varchar) where row_no between 50000 and 55000 and mod (row_no, 10) = 5;
update t1 set fs5 = make_string (mod (row_no, 14)) where row_no < 40000;
str2ck ();
-echo both "done str2ck 1\n";
+ECHO BOTH "done str2ck 1\n";
delete from t1 where row_no < 10000;
str2ck ();
-echo both "done str2ck 2\n";
+ECHO BOTH "done str2ck 2\n";
insert into t2 (row_no, string1, string2) select row_no, string1, string2 from t1 where row_no < 60000;
str2ck ();
-echo both "done str2ck 3\n";
+ECHO BOTH "done str2ck 3\n";
delete from T1 where row_no > 60000 and mod (row_no, 20) = 0;
-echo both $if $equ $rowcnt 2004 "PASSED" "***FAILED";
-echo both ": count of deld pre cpt where ropw_no mod 20 = 0.\n";
+ECHO BOTH $IF $EQU $ROWCNT 2004 "PASSED" "***FAILED";
+ECHO BOTH ": count of deld pre cpt where ropw_no mod 20 = 0.\n";
str2ck ();
-echo both "Done str2ck 3\n";
+ECHO BOTH "Done str2ck 3\n";
update t1 set fs5 = 'que pasa' where row_no > 70000 and mod (row_no, 20) = 2;
-echo both $if $equ $rowcnt 1505 "PASSED" "***FAILED";
-echo both ": rows in pre cpt update.\n";
+ECHO BOTH $IF $EQU $ROWCNT 1505 "PASSED" "***FAILED";
+ECHO BOTH ": rows in pre cpt update.\n";
select fs5 from t1 where row_no between 90000 and 90010 for update;
@@ -54,38 +54,36 @@ update T2 set epyter = make_string (1000) where row_no between 55000 and 55500;
update t2 set epyter = make_string (100000) where row_no = 56000;
update t2 set epyter = make_string (200000) where row_no = 56000;
-echo both "cpt intermediate\n";
+ECHO BOTH "cpt intermediate\n";
checkpoint &
wait_for_children;
str2ck ();
-echo both "done str2ck 4\n";
+ECHO BOTH "done str2ck 4\n";
load tcptrbck.sql &
wait_for_children;
-echo both "done history str2ck 1\n";
+ECHO BOTH "done history str2ck 1\n";
checkpoint &
wait_for_children;
load tcptrbck.sql &
wait_for_children;
-echo both "done history str2ck 2\n";
+ECHO BOTH "done history str2ck 2\n";
str2ck ();
-echo both "done str2ck 5\n";
+ECHO BOTH "done str2ck 5\n";
select count (*) from t1 where length (fs5) < 5;
-echo both $if $equ $last[1] 10713 "PASSED" "***FAILED";
-echo both ": len fs5 < 5 in t1 before cpt\n";
+ECHO BOTH $IF $EQU $LAST[1] 10713 "PASSED" "***FAILED";
+ECHO BOTH ": len fs5 < 5 in t1 before cpt\n";
select count (*) from t1;
-echo both $if $equ $last[1] 88096 "PASSED" "***FAILED";
-echo both ": count of T1 pre cpt\n";
+ECHO BOTH $IF $EQU $LAST[1] 88096 "PASSED" "***FAILED";
+ECHO BOTH ": count of T1 pre cpt\n";
select count (*) from t2;
-echo both $if $equ $last[1] 50000 "PASSED" "***FAILED";
-echo both ": count of T2 pre chpt.\n";
-
-
+ECHO BOTH $IF $EQU $LAST[1] 50000 "PASSED" "***FAILED";
+ECHO BOTH ": count of T2 pre chpt.\n";
diff --git a/binsrc/tests/suite/tcptrb2.sql b/binsrc/tests/suite/tcptrb2.sql
index dd08e69..0f6af2f 100644
--- a/binsrc/tests/suite/tcptrb2.sql
+++ b/binsrc/tests/suite/tcptrb2.sql
@@ -7,60 +7,60 @@ backup '/dev/null';
str2ck ();
-echo both "Done str2ck 1\n";
+ECHO BOTH "Done str2ck 1\n";
select count (*) from t1;
-echo both $if $equ $last[1] 100000 "PASSED" "***FAILED";
-echo both ": OK count of T1 after cpt rb and restart.\n";
+ECHO BOTH $IF $EQU $LAST[1] 100000 "PASSED" "***FAILED";
+ECHO BOTH ": OK count of T1 after cpt rb and restart.\n";
select count (distinct length (fs5)) from t1;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": distinct lengths of fs5 after cpt rb and restart.\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": distinct lengths of fs5 after cpt rb and restart.\n";
select count (*) from t2;
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": empty T2 after cpt rollback.\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": empty T2 after cpt rollback.\n";
select count (*) from t2 where row_no = 11111;
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": empty T2 after cpt rollback 2.\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": empty T2 after cpt rollback 2.\n";
set autocommit manual;
insert into t2 (row_no, string1, string2) select row_no, string1, string2 from t1 where row_no < 60000;
select count (*) from t2;
-echo both $if $equ $last[1] 59900 "PASSED" "***FAILED\n";
-echo both ": Inserted into t2 with empty pages after cpt rollback.\n";
+ECHO BOTH $IF $EQU $LAST[1] 59900 "PASSED" "***FAILED\n";
+ECHO BOTH ": Inserted into t2 with empty pages after cpt rollback.\n";
checkpoint &
wait_for_children;
rollback work;
str2ck ();
-echo both "Done str2ck 2\n";
+ECHO BOTH "Done str2ck 2\n";
vacuum ();
checkpoint;
str2ck ();
-echo both "Done str2ck 3\n";
+ECHO BOTH "Done str2ck 3\n";
vacuum ();
str2ck ();
-echo both "Done str2ck 4\n";
+ECHO BOTH "Done str2ck 4\n";
select count (*) from t2;
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": 0 in T2 after insert, cpt and rb of insert.\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": 0 in T2 after insert, cpt and rb of insert.\n";
update t1 set fi2 = fi2 + 1;
str2ck ();
-echo both "Done str2ck 5\n";
+ECHO BOTH "Done str2ck 5\n";
checkpoint;
-- now the idea is that a good number of t1 main row pages will have checkpoint remap.
str2ck ();
-echo both "Done str2ck 6\n";
+ECHO BOTH "Done str2ck 6\n";
set autocommit manual;
@@ -70,26 +70,26 @@ checkpoint &
wait_for_children;
str2ck();
-echo both "Done str2ck 7\n";
+ECHO BOTH "Done str2ck 7\n";
select count (distinct fi2) from t1;
-echo both $if $equ $last[1] 100000 "PASSED" "***FAILED";
-echo both ": distinct fi2 after update 100000.\n";
+ECHO BOTH $IF $EQU $LAST[1] 100000 "PASSED" "***FAILED";
+ECHO BOTH ": distinct fi2 after update 100000.\n";
rollback work;
str2ck();
-echo both "Done str2ck 8\n";
+ECHO BOTH "Done str2ck 8\n";
select count (distinct fi2) from t1;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": distinct fi2 after rb of update 1.\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": distinct fi2 after rb of update 1.\n";
checkpoint;
str2ck();
-echo both "Done str2ck 9\n";
+ECHO BOTH "Done str2ck 9\n";
load tcptrb3.sql;
@@ -97,7 +97,3 @@ drop
table t1;
drop table t2;
shutdown;
-
-
-
-
diff --git a/binsrc/tests/suite/tcptrb3.sql b/binsrc/tests/suite/tcptrb3.sql
index 2ebe953..12f5140 100644
--- a/binsrc/tests/suite/tcptrb3.sql
+++ b/binsrc/tests/suite/tcptrb3.sql
@@ -18,5 +18,4 @@ checkpoint &
sleep 3;
commit work;
-echo both "cpt rb with multiple registered, on and beside rb'd insert\n";
-
+ECHO BOTH "cpt rb with multiple registered, on and beside rb'd insert\n";
diff --git a/binsrc/tests/suite/tcptrbck.sql b/binsrc/tests/suite/tcptrbck.sql
index 77c096b..c1331c7 100644
--- a/binsrc/tests/suite/tcptrbck.sql
+++ b/binsrc/tests/suite/tcptrbck.sql
@@ -1,4 +1,4 @@
set autocommit on;
str2ck (1);
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": check of read committed of previous t1\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": check of read committed of previous t1\n";
diff --git a/binsrc/tests/suite/tcred.sql b/binsrc/tests/suite/tcred.sql
index 7a93151..0183786 100644
--- a/binsrc/tests/suite/tcred.sql
+++ b/binsrc/tests/suite/tcred.sql
@@ -1,10 +1,10 @@
--
--- $Id: tcred.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdate.sql b/binsrc/tests/suite/tdate.sql
index 29c27ec..2a90a71 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Some simple date checking functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdatefun.sql b/binsrc/tests/suite/tdatefun.sql
index 3af6932..b8f39df 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 2009/03/10 14:32:26 source Exp $
+-- $Id$
--
-- Test date and timestamp functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -1012,8 +1012,8 @@ select LEFT('$U{DATESTRING}',4), $U{YEAR},
'Thursday','Friday','Saturday'),$U{DAYOFWEEK}),
'$U{DAYNAME}',
- one_of_these('$U{DAYNAME}','Sunday','Monday','Tuesday','Wednesday',
- 'Thursday','Friday','Saturday'),
+ position ('$U{DAYNAME}', vector ('Sunday','Monday','Tuesday','Wednesday',
+ 'Thursday','Friday','Saturday')),
$U{DAYOFWEEK},
aref(vector('No-Zero-Month!','January','February','March','April',
diff --git a/binsrc/tests/suite/tdav.sh b/binsrc/tests/suite/tdav.sh
index 0649062..101892b 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.3 2010/01/28 14:33:20 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tdav.sql b/binsrc/tests/suite/tdav.sql
index f31dfe7..b23779a 100644
--- a/binsrc/tests/suite/tdav.sql
+++ b/binsrc/tests/suite/tdav.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav.sql,v 1.3 2007/01/22 14:09:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdav1.sql b/binsrc/tests/suite/tdav1.sql
index e6be68c..bced25d 100644
--- a/binsrc/tests/suite/tdav1.sql
+++ b/binsrc/tests/suite/tdav1.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav1.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -74,4 +74,3 @@ id_tst ();
--c_mkcol ('http://$U{HOST}/DAV/TDAV1/');
ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
ECHO BOTH ": UNIQUE IDs TEST : STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-
diff --git a/binsrc/tests/suite/tdav_conc.sql b/binsrc/tests/suite/tdav_conc.sql
index e3a4ba2..9833625 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 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdav_meta.sh b/binsrc/tests/suite/tdav_meta.sh
index 7ee4cf1..077c4ea 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.4 2011/03/28 23:11:40 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tdav_meta.sql b/binsrc/tests/suite/tdav_meta.sql
index 83a20a8..b843a2b 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.2 2010/03/04 23:48:20 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -136,7 +136,7 @@ ECHO BOTH "Starting URIQA tests. In case of errors this may result a wait for ti
select isnull (strstr (TDAV_URIQA ('$U{HOST}', '/DAV/tdav_meta_home/zip_samples/', 'MGET',''), 'Kingsley Idehen.foaf'));
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH $LAST[1] ": MGET on collection\n";
+ECHO BOTH ": MGET on collection\n";
select isnull (strstr (TDAV_URIQA ('$U{HOST}', '/DAV/tdav_meta_home/zip_samples/Kingsley%20Idehen.foaf', 'MGET',''), 'RDF'));
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
diff --git a/binsrc/tests/suite/tdav_meta_checks.sql b/binsrc/tests/suite/tdav_meta_checks.sql
index 1f67fdf..3634cc0 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.1 2010/03/04 23:48:20 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdav_meta_rdf.sql b/binsrc/tests/suite/tdav_meta_rdf.sql
index 0714f0a..f067f2b 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 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -41,7 +41,7 @@ create procedure TDAV_RDF_QUAD_CHECK (in resname varchar, in propuri varchar, in
full_res_uri := DB.DBA.DAV_FULL_PATH_TO_IRI (new_dav_graph, '/DAV/tdav_meta_home/zip_samples/' || resname);
dbg_obj_princ ('TDAV_RDF_QUAD_CHECK: ', full_res_uri, propuri, encoded_propval);
if (crop <> 0)
- return
+ return;
if (exists (sparql ask where { graph ?:new_dav_graph {
?:full_res_uri ?:propuri ?:propval } } ))
actual := 1;
diff --git a/binsrc/tests/suite/tdav_meta_rdf_checks.sql b/binsrc/tests/suite/tdav_meta_rdf_checks.sql
deleted file mode 100644
index 2482985..0000000
--- a/binsrc/tests/suite/tdav_meta_rdf_checks.sql
+++ /dev/null
@@ -1,2465 +0,0 @@
---
--- $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-2006 OpenLink Software
---
--- This project 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
---
---
-TDAV_RDF_QUAD_CHECK ('Dimitar Dimitrov.vcf', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'text^2fdirectory');
-TDAV_RDF_QUAD_CHECK ('Dimitar Dimitrov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#EMAIL', 'ddimitrov at openlinksw.com (PREF)');
-TDAV_RDF_QUAD_CHECK ('Dimitar Dimitrov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#FN', 'Dimitar Dimitrov');
-TDAV_RDF_QUAD_CHECK ('Dimitar Dimitrov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#N', 'Dimitrov;Dimitar;;;');
-TDAV_RDF_QUAD_CHECK ('Dimitar Dimitrov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Name-Family', 'Dimitrov');
-TDAV_RDF_QUAD_CHECK ('Dimitar Dimitrov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Name-Given', 'Dimitar');
-TDAV_RDF_QUAD_CHECK ('Dimitar Dimitrov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Org-Orgname', 'OpenLink Bulgaria');
-TDAV_RDF_QUAD_CHECK ('Dimitar Dimitrov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#REV', '20050411T183643Z');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'text^2fdirectory');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#ADR', ';;8 Bulair Str.;Plovdiv;Plovdiv;4003;Bulgaria (POSTAL)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#ADR', ';;My postal address is ^3a=0D=0A12 Surnena Gora . . .');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Country', 'Bulgaria');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Extadd', '! empty property value !');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Locality', 'Plovdiv');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Locality', 'Plovdiv,');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Pcode', '4003');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Pobox', '! empty property value !');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Region', '! empty property value !');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Region', 'Plovdiv');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Street', '8 Bulair Str.');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Address-Street', 'My postal address is ^3a=0D=0A12 Surnena Gora Str.');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#EMAIL', 'gkodinov at openlinksw.co.uk (PREF)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#FN', 'George Kodinov');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#LABEL', ' 4003=0D=0ABulgaria (WORK)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#LABEL', ' Plovdiv 4003=0D=0ABulgaria (POSTAL)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#LABEL', '8 Bulair Str.=0D=0APlovdiv (POSTAL)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#LABEL', 'My postal address is ^3a=0D=0A12 Surnena Gora Str.=0D=0APlovdiv (WORK)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#N', 'Kodinov;George;;;');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#NOTE', '562391=0D=0A=0D=0A+359 32 637 475=0D=0A+359 32 637 . . .');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Name-Family', 'Kodinov');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Name-Given', 'George');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Org-Orgname', 'OpenLink Software');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Org-Orgunit', 'Virtuoso');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#REV', '20050411T183644Z');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#TEL', '+359 (32) 637 476 (WORK)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#TEL', '+359 (3254) 27 34 (HOME)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#TEL', '+359 32637475 (WORK)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#TEL', '+359 887 700566 (CELL)');
-TDAV_RDF_QUAD_CHECK ('George Kodinov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#TITLE', 'Developer');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'text^2fdirectory');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#EMAIL', 'imitko at openlinksw.co.uk (PREF)');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#FN', 'Mitko Iliev');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#N', 'Iliev;Mitko;;;');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#NOTE', '+359 32 637 476=0D=0A');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Name-Family', 'Iliev');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Name-Given', 'Mitko');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Org-Orgname', 'OpenLink Software');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#REV', '20050411T183644Z');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#TEL', '+359 (32) 637 475 (WORK)');
-TDAV_RDF_QUAD_CHECK ('Mitko Iliev.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#TEL', '+359 (32) 637 476 (WORK)');
-TDAV_RDF_QUAD_CHECK ('News_Feeds.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('News_Feeds.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('News_Feeds.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'text^2fdirectory');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#EMAIL', 'ruslan at openlinksw.com (PREF)');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#FN', 'Ruslan Abdulkhalikov');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#N', 'Abdulkhalikov;Ruslan;;;');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Name-Family', 'Abdulkhalikov');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Name-Given', 'Ruslan');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#Org-Orgname', 'OpenLink Software');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#REV', '20050411T183644Z');
-TDAV_RDF_QUAD_CHECK ('Ruslan Abdulkhalikov.vcf', 'http://www.w3.org/2001/vcard-rdf/3.0#TITLE', 'Developer - Virtuoso Team');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.openlinksw.com/virtdav#dynArchiver', 'XBEL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fxbel+xml');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', '.NET Common Data Classes');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', '.Net Ports and Implementations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', '3G Wireless');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', '3rd Party Data Access Components');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'AD Creation etc.');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ADO');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ADO For Java');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ADO.NET');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'API Implementations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'APIS');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'APIS & SDKS');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'APIs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'APIs & Frameworks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ASPZone');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Abstraction Layers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Account & Integrated Biz Systems Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Accounting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Acquisition or Partner Prospects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Active Server Page Components');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Active Server Pages Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ActiveX');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Advertising');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Africa Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Agent Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Agent Technology Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Aggregators');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Agriculture');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'All Inclusive Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'All Purpose Collaboration');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Animated Demo Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Animation Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Animations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Animations & Grpahics Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Anti Spam');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Apache');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'AppFoundry (Netscape App Centre)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Apple');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Applets & Applications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Appliances');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Assembly Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Demos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Design & Modelling');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Dev Frameworks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Development');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Server & Xml ASPs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Servers & Web Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Service Providers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles & Essays');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles & Samples');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles & White Papers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles & Whitepapers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles and White Papers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles and Whitepapers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Artificial Intelligence');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Assembly environments');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Auction Prowlers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Auctions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Authoring Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Authoring and Browsing Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Auto Discovery');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Automobiles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'B2B Exchanges');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'B2B Integration');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'B2B Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'BNFs & Grammers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'BSD');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Backbone Providers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bandwidth Aggregators');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Banking');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Banner AD Utilities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bargain Searchers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Barter Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bash');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Benchmark Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Benchmark Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Benchmarking');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Benchmarks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Berlin - GUI & DOM & CORBA');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Biologial Warfare');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Biometrics');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Biotechnology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Blog Databases ');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Blog Search Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Blogging & WebLogs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bluetooth');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmark & Favorites Handling');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmarklets');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmarks Formats');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmarks Storage');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Books');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Brazil (Sun)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Broadcasters');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Browser Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Browsers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bulk E-mail Packages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Busines to Consumer');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Activity Monitoring');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Integration Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Networking');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Oriented');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Process Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Processing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Rules & Inference Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business To Business');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business To Consumer (B2C)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'C & C++');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'C Development');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'C and C++');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'CD-ROM & DVD Dupliaction');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'CLR Ports (.NET)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'CRM & SFA Focused');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'CRM & SFA Solutions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendar & Scheduling');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendar Data Storage');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendar Diary Discussion and Folders');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendaring');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendering');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendering & Group Scheduling');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendering & Scheduling');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Case Studies - Succcessful Projects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Catalog & Merchant Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Catalog Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Class Libraries');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Classification Schemes');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Client Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Clients');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Clothing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Clustering');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Clustering Oriented');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Code & Algorithms');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Code Factories (International)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Collaboration');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Collaboration & Analysis');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Collaboration Products & Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Collaborative Information Filtering');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Commercial');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Commercial Sites Generated By Blogware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Comms Layers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Communities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Companies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Company & Software Developer Matching Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Company Position Papers and Statements');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Comparative Analysis');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Competitive Analysis');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Competitor or Co-opetitor Roadmaps');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compiler Construction & Meta Lang Assemblers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compilers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Complaint Data Sources');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compliance & Stress Testing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compliant Browsers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compliant Tools & Compilers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Component DBs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Components');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Componentware & Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Computer Fabrics related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Computer Telephony Integration');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Computers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Configuration MGMT');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Connectivity');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consortia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consultant Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consumer Food & Beverages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consumer Opinion & Disccusion');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consumer To Consumer');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Contact Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Contacts Storage (vCard)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content - Directories & Encylopedia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Archives');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Bookmarking ');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Integration Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Management & Syndication');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Syndication & Aggregation');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Applications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Blogs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Demos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Examples');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Platforms & Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Web Services Consumer Apps & Add-ins');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Course Developers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Courseware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Currency & Cash');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Custom Books and Documenation');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Asset Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Asset Management & E-Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Asset Mgmt. & SFA');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Service');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customization Techniques');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DB Admin Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DB Application RAD Environements');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DB Based File systems & Commom Data Sorage');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DB Front-Ends');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DCOM');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DNS Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DOM');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DSL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DTDs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access & Data Exchange');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access & ODBC');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Abstraction Layers & APIs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Components');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Middleware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Network Layers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Query & Management Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Admin Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Backup & Recovery Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Capture & Exchange Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Carrier Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Driven Animation Tools (ODBC or JDBC)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Encryption & Security');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Feeds');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Migration & Cleansing Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Mining');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Modelling Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Providers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Storage');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Storage & File Sharing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Storage (Web Briefcase)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Transmission');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Visualization');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Visualization & Modelling Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Warehousing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database & Data Access Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database & Search Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database APIs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Connectivity');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Driven');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Engine');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database IDEs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database to Database');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Databases');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Databases General');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dedicated Hardware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dedicated XML Information Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Deductive & Other New Format Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Delivery and Personal Assistance');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Demo Applications (Complete Solutions)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Demos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Demos & Tutorials');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Design & Modelling Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Design Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop & Window Managers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop Productivity Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop Productivity Tools - Office etc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop applications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DevX Articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Developer Sources');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Developer Specific');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Developer Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development & Integration Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development Libraries');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development Tools & Components');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Devices');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dictionaries & Encylopedia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Books & Publishing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Asset Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Entertainement');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Formas & Codecs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital IDs & Certificates Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Identities Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Imaging');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Libraries');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Music');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Rights Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital UNIX');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Video Cameras');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Directory Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion & Collaboration');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion & News Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Clients');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Forum & News Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Forums');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Forums Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Services (NNTP etc..)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Display Devices');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Display Devices (Monitors etc.)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Display Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Display Technology''');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distribubted Computing (CORBA Based)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed Components Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed Computing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed Database Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed IPCs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed Transactions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distribution');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Documentation & KBASE Projects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Drivers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Drivers & Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dublin Core Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dynamic DB Driven Web Middleware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dynamic HTML');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dynamic Service Discovry & UDDI Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dynamic XML');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Business');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Commerce');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Commerce & Biz related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Commerce Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Tailing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-business');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-commerce');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-mail');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-mail Marketing & Mail Merge');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-mail Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-mail Spec');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'EAI');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ECMA');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'EII ');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ERP Systems');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Editors');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Electronic Ink');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Electronic Stock Trading Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Email Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Embedded');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Embedded DB Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Encoding Schemes');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Encryption - Technology & Export Rules');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Encryption Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Encyclopedia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Engine Implmentations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Engine Models');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'English Language');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise Application Integration');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise GroupWare');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise Information Portal Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise Information Portals');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise Java Beans');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Entertainment');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Environments');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Ethernet');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Event Planning');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Examples & Practical Use');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Exchange Building Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Eye');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'FAQs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'FOAF');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'FTP Clients');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Facial');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Fashion');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Fashion Retail');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Fiberless Optics');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'File Sharing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'File System Driver Development');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'File Systems');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'File Systems & Server Devices');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Files System & Sharing Protocols');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Filtering Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Finance & Corporate Information');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Finance & Reporting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Finance Industry Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Finger Prints');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Firewall Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Flash');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Flash Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Food & Groceries');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Frameworks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Frameworks & Environments');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Frameworks and SDKs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Frameworks etc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Free ORB Directory');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Free Source Code');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Free with Source');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Free-Space-Optics');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Freedom & Free Speech etc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Fulfillment Processing Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Futuristic Visions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI Application Tools & Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI Toolkits & Frameworks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI and Human-Computer Interaction');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Game Consoles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Games');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General - CTO Level');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General Information');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General Java Information Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General TV');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General XML related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Genetics');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Geography');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Glossaries');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Gnome');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Graphical User Interfaces');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Graphics');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Graphics & Animation & 3D Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Graphics Related - Very Cool');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Grid Computing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Group Development & Testing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GroupWare');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HOWTOS');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HR');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTML Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTML Editors & Publishing Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTML UI');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTML for Conversion');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTTP Protocol Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Handhelds');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Handhelds & PDAs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Handsets');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Handwriting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hardware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hardware Providers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Healthcare');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HelpDesk');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HelpDesk & CRM');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Helpdesk');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Helpdesk & Support');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High Level Dev. Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High Level Object Languages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High Tech');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High-Tech');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High-Tech Equipment Companies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Home');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Home Appliances');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Home Furniture');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Applications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Solutions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Solutions (ASP Model)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HotSpots');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'How To Docs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hubs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Human Interface');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Human Resource Management etc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hypertext Systems');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IBM');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IDES');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IDEs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IETF Protocols');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IP Based Telephony');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IRIX');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IVR Solutions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Immunology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Independent Artists');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Independent Films');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Indexing & Search Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'India');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Industry Players');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Industry Specific');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Inferno');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Info Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Info Sources');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information & Intelligent Consumer Electronics');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Appliances');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Appliances - Thin Clients');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Application & Retrieval Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Casting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Casting & Retrieval');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Mediation & Dissemination');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Search');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Sources');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Infrastructure Providers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Infrastructure Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Initiatives and Specifications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Initiatives of Interest');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Innovative Solutions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Installer Programs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Installer Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Instant Messaging');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Instant Messaging Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Instant Messaging Software');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Insurance');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Integrated Development Environments (IDEs)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Integration Servers (Middleware)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Intelligent Devices');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Interesting Database Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Interesting WIKIs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internationalization');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internationalization and Localization');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Appliances & Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Assistants');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Commerce');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Infrastructure Technology & Providers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Interactivity - Realtime Chat & User Discovery Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Intranet Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Intranet Solutions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Intranet Suites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC Aware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC Based Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC v ADO Technical Comparisons');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JSP Engine');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Jav Bean Generation');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java & New Generation');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java Based Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java Developers Journal Code Library');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java ServLet Containers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Journal & Publishing Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Journals & Publishing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Key Contact Web Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Key Personalities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Key Researchers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledge & Information & Agent Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledge & Information Casting & Corporate Portal Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledge & Information Processing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledge-Information-Metadata');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledgebases & Agent Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'LDAP');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'LDAP Classes');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Labs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Language Comparisons (Java n Python)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Lead Sources');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Legacy Application Logic for Conversion');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Licence Enforcement Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Licensing Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Life Style');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Linux');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Linux Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Linux based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Linux on CDROM');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Locator Portals');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MP3 - Music over NET Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MP3 Casting and Content Production');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MP3 Players');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MP3 search Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MPEG-4');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MPEG-7');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mac OS X Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MacOS');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mach');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Macintosh');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Macintosh 68K Versions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mag Articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mail');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mail Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mail Transfer Agents (MTAs)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mail to SMS Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mapping & GIS');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Maps & Catography');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Market Analysis');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Market Research');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Marketing Automation Software');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Marketing Presntations Portals');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Markup Languages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Meeting Facilitators (Face to Face)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Merchant Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Message Oriented Middleware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Messaging');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Metadata');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Metadata & Resource Definition Framework (RDF)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Metadatea Specs & Consortia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Methodology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft Articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft Java APIs & SDKs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft Provided');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft.NET');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft.NET Demos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Middleware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Middleware and Management Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mixed Data Access Mechanisms');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mixing Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mixtapes');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Calendar Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Computing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Enterprise');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Network Providers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Office Solutions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Players for Cars');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Modeling (XML Vocabularies, Data, and Systems)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Modelling Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mono');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mortgages & Loans');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Movie Creation');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Movie Industry');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Movies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Movies Database');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mozilla');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multi Purpose');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multimedia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multimedia & Graphics');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multimedia Appliances');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multimedia Sharing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Music');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Music Industry');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MySQL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MySQL Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MySQL Specific');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'NIC Drivers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'NNTP Clients');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'NNTP Clients & Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'NNTP Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Naming & Directory Interface (JNDI)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Native Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Native XML Databases');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Natural Language Processing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Natural Language Query Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Natural Language Query Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Net Conferencing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Net Life Style');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Netcasting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Netscape');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Computers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Diagnostic Utilities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Management & Design Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Monitoring');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Programming Matters');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Networking');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Networking Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Networks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Media');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Media Broadcasting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Media Innovations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Product Ideas');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'News');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'News Collection & Distribution');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'News Delivery & Exchange');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'News Specific Crawlers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Newton');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Next Generation Computer Interconnects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Nokia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Notations and Style');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OCS Data');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ODBC Based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OLAP');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OLAP Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OLE DB related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OLE-DB');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OMG Papers (New OMA Architecture)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OMG Specs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ORBS');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OS390');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Databases');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Description Language');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Frameworks & APIs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Modelling Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Request Brokers & Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object-Relational');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object-Relational Mappers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Offshore');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Offshore Development Companies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Ad Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Demos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Gaming');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Labs & Compile Farms');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Record Companies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Research Labs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Trading');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Training');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online demos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Ontologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Ontology Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open APIs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Software & GNU World');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Software Desc (ODS) Spec - Push & Replication');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Source');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Source Projects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Source Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open source');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OpenVMS');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Operating Environments');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Operating Environments (VMs)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Operating Systems');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Operational Resource Management (ORM)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Optical Character Reconition');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Optical Networking');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Oracle');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Organizations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Organizations & Consortia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Other DB Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Other Projects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Others');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'P2P Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PABX');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PC Cards');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PCs & Workstations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDA & Embedded DB Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDA & Embedded Edition Kernel Ports');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDA Applications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDA related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDAs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PERL Interfaces');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PPC Version');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PR');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PThreads');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Parallel Programming Technology & Issues');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Parser Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Parsers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Parsers & Compilers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Patent Monitoring Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Patents');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Payment Processing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Payment Processing & E-Currency');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Peer to Peer');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Peer-Peer Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Pen Like Devices');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Perl');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Perl DBI');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Personal & Small Business Site Building');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Personal Networking');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Personalities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Pharmaceuticals & Drug Stores');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Phones');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Photos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Photos & Digital Art');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Players');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Podcasting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Polls and Surveys');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portability & Binary Interface Standards');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portability kits');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portable Players');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portal (All in One)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portals');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Ports');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Potential Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Presentations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Presentations & Demos - Video Streaming');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Presentations & White Papers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Privacy Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Processor Architectures');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Processor Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Processors');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Product Comparisons');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Product Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Product Directory');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Product Reviews');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Products & API Implementations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Professional Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Profiling');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Programming Langs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Programming Languages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Programming Techniques');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Programming Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Project Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Projects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Protocols');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Public Key Infrastructure Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Publishing Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Push Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Python');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'QA Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Engines etc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Languages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Languages & Protocols');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Tools & Components');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Tools & Report Writers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Querying RDF Data');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RDF');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RDFSchemas');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RPC Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RSS Data');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Radio');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Radio Frequency Identification (RFID)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Raw XML for Transformation');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Real Estate');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Real Names & URI related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RealVideo');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Rebol');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Recommendations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Recrruitment');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Relational');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Rentable Applications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Replication');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Replication & Synchronization');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Replication Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Report Generation Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Report Writers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Reporting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Reports and Analysis');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Repositories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Groups');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Labs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Projects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Projects & Teams');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Researchers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Resource & Project Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Resource Binder Research');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Resource Description Framework (RDF)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Resource Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Response Managers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Restaurant Reservations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Retail');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Retailers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Rotor');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'S390 - IBM Mainframe');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SAML');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SDKs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SDKs & Toolkits');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SET Compliant Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SGML');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SMIL Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SMS');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SMTP & MIME Data');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SOAP Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SQL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SQL-XML');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SQL-XML Middleware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SVG');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sales Configuration Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sales Force Automation & CRM');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sample Applications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sample Apps');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sample Data');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sample Use Of Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Samples');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Samples & Demos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'San Francisco Project');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sash');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Satellite');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Scenarios & Usage');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Schema Registries');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Schemas');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Screen Capture & Demo Recording Software');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Scripting Langs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Search Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Search Engines & Web Resource Retrieval');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Secure Shells');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Security');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Security & Encryption & Cryptography');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Security & Hacking Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semantic Agent Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semantic Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semantic Web');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semantic Web Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semiconductor & Memory Chip Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Seminars & Presentations (Webcasting)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Server Appliances');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Serverlet Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Servers & Systems');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Bus Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Dicovery & Brokering');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Directories');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Location Protocol (SLP)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Providers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Set-Top & TV Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SetTop Box technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SetTop Boxes');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SeverLet Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Shopping Cart Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Short Films Portal');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sign-On & Authentication Protocols');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Site Design');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Site Development Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Site Optimization and Analysis');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Site Ratings');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Small Business');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Small Business Suites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Small business');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Smart Card Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Smart Cards Embedding (JavaOS)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Soap Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Social Networking');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Software');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Software Distribution');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Software Distribution Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Software Updates etc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Source Code');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Specifications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Specs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Speech');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Speech & Voice Recognition');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Speech & Writing Recongnition Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sports');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Spreadsheet');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards & Initiatives');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards & Specifications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards & Specs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards & Standards Bodies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Bodies & Assoc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Bodies & Consortia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Consortia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Issues');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Organizations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Specs & Consortia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards and Specs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Storage');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Storage Technology (SANS)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Storage and Query Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Store Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Stress Testing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Study Material & Samples etc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sun');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Support');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Support Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Synchronization');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Synchronization & Replication');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Syndicates');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Syndication');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Systems & Event Management Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Systems Management Software');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'TCL Interfaces');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'TP Monitors');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'TV');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'TV Listings');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tablet PCs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Taxonomies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Team & Project Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technical Articles & White Papers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technical Support');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technical Support & Help Desk');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology & Terminology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Application Case Studies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Demo Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Demos & Samples');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Demos & Testbeds');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Parks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Telephone');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Telephony');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Telephony Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Terminal Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Test Suites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Testsuites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'The Future');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Thin Client & Network Computers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Third Party VM & Compilers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Third Party VMs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Threaded Discussion');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Time Management');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tips and Tricks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Training');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Training Specialist Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Transaction Processing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Translation Services & Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Transport Protocols');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Travel Industry');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Troubleshooting Utilities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Troubleshooting and Benchmark Utilities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials & Demos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials & Learning');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials Sites');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials and White Papers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'UK');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'UK Players');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'UNIX');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'UNIX Driver Managers etc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Universal Data Access Technologies');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Universal Modelling Language Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Universities (Projects)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Universities Courses');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'University Research');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'University Research & Grad Student Pages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Use Cases');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'User Interface & Interaction');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'User Interface Definition');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Using XSL & CSS Together');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Utilities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Utilities and Add-ins');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'VB Components');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'VPN Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Variants');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Various Schemas');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Various Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Vector Markup Language (VML)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Vendor Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Vendor Specific');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Venture Incubators');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video & Audio Streaming');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video & Audio Streaming Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video & Voice Streaming');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Blogging');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Clips & Broadcasts');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Conferencing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Conferencing & Collaboration');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Search Engines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Streaming Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video over IP');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Videos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Labs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Component Databases');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Databases');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Machines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Machines & Compilers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visionaries & Players');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visual Bsic Specific');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visual IDEs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visual Interdev');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visual Mapping & Integration Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visualization and Drawing Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice & Telephony');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice Infomediaries');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice over IP');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice over IP related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WAP');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WAP Clients');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WAP Development');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WIFI');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WIKIs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WIN64');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WLAN');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wearable Computer Devices');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web & Internet Based Artificial Intelligence');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Application Development & Solutions');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Bots and Crawlers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Content Syndicators');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Data');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Editing & Publishing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web IDEs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Innovation');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Innovations');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Management Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Page Formating and Display');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Publishing & Management Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Servers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Servers (HHTPD)');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Servers Supporting ServeLets');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Services');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Services Hosting');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Site & Application Modelling');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Site Building');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Technology Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web To DB Products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Utilities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WebCasts');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WebDAV');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Webdav');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Webzines');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Paper & Articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Papers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Papers & Articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Papers & Tutorials');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Papers and Articles');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Whitepapers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wikis');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wikki');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Windows');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Windows Portability & Crossover');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Windows based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Winsock & Network Programming');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Winsock Compliant');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wireless');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wireless Communications');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WorkFlow Specification');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Workflow');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Workflow Technology');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Workflow and Process Integration');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Working Groups & Charters');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Works In Progress');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'X-OQL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XBRL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XBRL Data');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XForms');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XHTML');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XInclude');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Application & Use');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Data');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Doc Generators');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML For Analysis');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Protocols');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Query Language Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Repositories & DBs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML and RDF Frameworks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML based Markup Languages Index');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML-HTML Conversion Tools');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML-QL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XMLRPC Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XMLSchema');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XMlLRPC');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XPath related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XPointer related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XQL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XSL Processors');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XSL Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XUL');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Xlink Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Zero Config Networking');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'books');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ch');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'e-commerce');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'e-mail packages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eBook Readers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eBooks');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eBooks & ePublishing');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eCRM');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eGov');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eLibraries');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eMeetings & eDemos');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ePayment and Digicash Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eXtensible Markup Language');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ebXML');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'fiber optics');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'hip hop');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'iODBC');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'iODBC Language Interfaces');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'iodbc based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'kde');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'lua');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'mailing list information');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'middleware');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'odbc');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'odmg');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ole-db');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'open source');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'p2p based');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'portals');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'products');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'projects');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'protocols');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'scripting languages');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'specifications & consotia');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'specs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'standards');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'standards & specs');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'tcl');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'utilities');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'vXML Related');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/folderTitle', 'white papers');
-TDAV_RDF_QUAD_CHECK ('bookmarks.xml', 'http://www.python.org/topics/xml/xbel/title', 'Advanced Research');
-TDAV_RDF_QUAD_CHECK ('business_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('business_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('business_blogs.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('ceo_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('ceo_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('ceo_blogs.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('community_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('community_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('community_blogs.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('daily_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('daily_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('daily_blogs.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('ed.foaf', 'http://xmlns.com/foaf/0.1/mbox-uri', 'mailto^3afred1 at example.com');
-TDAV_RDF_QUAD_CHECK ('ed.foaf', 'http://xmlns.com/foaf/0.1/name', 'Fictional Fred');
-TDAV_RDF_QUAD_CHECK ('female_bloggers.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('female_bloggers.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('female_bloggers.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('industry_news.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('industry_news.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('industry_news.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('kingsley_rss.xml', 'http://purl.org/rss/1.0/description', 'Knowledge, Information, and Data Dispatch Outlet');
-TDAV_RDF_QUAD_CHECK ('kingsley_rss.xml', 'http://purl.org/rss/1.0/lastBuildDate', '2005-04-25T21^3a12^3a20');
-TDAV_RDF_QUAD_CHECK ('kingsley_rss.xml', 'http://purl.org/rss/1.0/link', 'http^3a^2f^2fwww.openlinksw.com^3a80^2fblog^2f~kidehen^2f');
-TDAV_RDF_QUAD_CHECK ('kingsley_rss.xml', 'http://purl.org/rss/1.0/title', 'Kingsley Idehen''s Weblog');
-TDAV_RDF_QUAD_CHECK ('microsoft_bloggers.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('microsoft_bloggers.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('microsoft_bloggers.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('my_analyst_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('my_analyst_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('my_analyst_blogroll.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('my_complete_feed_list.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('my_complete_feed_list.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('my_complete_feed_list.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('my_daily_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('my_daily_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('my_daily_blogroll.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('my_journalist_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('my_journalist_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('my_journalist_blogroll.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('my_other_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('my_other_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('my_other_blogroll.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('my_semweb_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('my_semweb_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('my_semweb_blogroll.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('my_yasn_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('my_yasn_blogroll.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('my_yasn_blogroll.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('mybookmarks.xbel', 'http://www.openlinksw.com/virtdav#dynArchiver', 'XBEL');
-TDAV_RDF_QUAD_CHECK ('mybookmarks.xbel', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fxbel+xml');
-TDAV_RDF_QUAD_CHECK ('mybookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Blogs');
-TDAV_RDF_QUAD_CHECK ('mybookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OpenLink');
-TDAV_RDF_QUAD_CHECK ('mybookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Blogs');
-TDAV_RDF_QUAD_CHECK ('mybookmarks.xbel', 'http://www.python.org/topics/xml/xbel/title', 'RSS Feeds');
-TDAV_RDF_QUAD_CHECK ('openlink_internal_feeds.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('openlink_internal_feeds.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('openlink_internal_feeds.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('other_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('other_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('other_blogs.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('product_weblogs.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('product_weblogs.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('product_weblogs.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.openlinksw.com/virtdav#dynArchiver', 'XBEL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fxbel+xml');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', '.NET Common Data Classes');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', '.Net Ports and Implementations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', '3G Wireless');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', '3rd Party Data Access Components');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'AD Creation etc.');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ADO');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ADO For Java');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ADO.NET');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'API Implementations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'APIS');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'APIS & SDKS');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'APIs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'APIs & Frameworks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ASPZone');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Abstraction Layers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Account & Integrated Biz Systems Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Accounting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Acquisition or Partner Prospects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Active Server Page Components');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Active Server Pages Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ActiveX');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Advertising');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Africa Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Agent Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Agent Technology Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Aggregators');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Agriculture');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'All Inclusive Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'All Purpose Collaboration');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Animated Demo Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Animation Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Animations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Animations & Grpahics Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Anti Spam');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Apache');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'AppFoundry (Netscape App Centre)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Apple');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Applets & Applications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Appliances');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Assembly Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Demos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Design & Modelling');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Dev Frameworks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Development');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Server & Xml ASPs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Servers & Web Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Application Service Providers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Article Annotation');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles & Essays');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles & Samples');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles & White Papers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles & Whitepapers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles and White Papers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Articles and Whitepapers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Artificial Intelligence');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Assembly environments');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Auction Prowlers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Auctions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Authoring Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Authoring and Browsing Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Auto Discovery');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Automobiles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'B2B Exchanges');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'B2B Integration');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'B2B Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'BNFs & Grammers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'BSD');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Backbone Providers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bandwidth Aggregators');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Banking');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Banner AD Utilities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bargain Searchers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Barter Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bash');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Benchmark Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Benchmark Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Benchmarking');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Benchmarks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Berlin - GUI & DOM & CORBA');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bibliography');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Biologial Warfare');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Biometrics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Biotechnology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Blog Databases ');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Blog Search Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Blogging & WebLogs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bluetooth');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmark & Favorites Handling');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmarking & Tagging');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmarklets');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmarks Formats');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bookmarks Storage');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Books');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Brazil (Sun)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Broadcasters');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Broadcasting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Browser Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Browsers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Bulk E-mail Packages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Busines to Consumer');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Activity Monitoring');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Integration Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Networking');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Oriented');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Process Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Processing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business Rules & Inference Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business To Business');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Business To Consumer (B2C)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'C & C++');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'C Development');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'C and C++');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'CD-ROM & DVD Dupliaction');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'CLR Ports (.NET)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'CRM & SFA Focused');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'CRM & SFA Solutions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendar & Scheduling');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendar Data Storage');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendar Diary Discussion and Folders');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendaring');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendering');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendering & Group Scheduling');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Calendering & Scheduling');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Case Studies - Succcessful Projects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Catalog & Merchant Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Catalog Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Chat & Instant Messaging');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Class Libraries');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Classification Schemes');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Client Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Clients');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Clothing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Clustering');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Clustering Oriented');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Code & Algorithms');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Code Factories (International)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Collaboration');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Collaboration & Analysis');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Collaboration Products & Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Collaborative Information Filtering');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Commercial');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Commercial Sites Generated By Blogware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Comms Layers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Communities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Community');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Companies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Company & Software Developer Matching Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Company Position Papers and Statements');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Comparative Analysis');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Competitive Analysis');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Competitor or Co-opetitor Roadmaps');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compiler Construction & Meta Lang Assemblers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compilers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Complaint Data Sources');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compliance & Stress Testing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compliant Browsers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Compliant Tools & Compilers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Component DBs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Components');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Componentware & Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Computer Fabrics related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Computer Telephony Integration');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Computers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Configuration MGMT');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Connectivity');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consortia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consultant Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consumer Food & Beverages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consumer Opinion & Disccusion');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Consumer To Consumer');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Contact Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Contacts Storage (vCard)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content - Directories & Encylopedia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Archives');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Integration Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Management & Syndication');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Content Syndication & Aggregation');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Conversation & Bibliographic Tagging');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Applications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Blogs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Demos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Examples');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Platforms & Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Cool Web Services Consumer Apps & Add-ins');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Course Developers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Courseware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Currency & Cash');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Custom Books and Documenation');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Asset Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Asset Management & E-Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Asset Mgmt. & SFA');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Service');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customer Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Customization Techniques');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DB Admin Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DB Application RAD Environements');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DB Based File systems & Commom Data Sorage');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DB Front-Ends');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DCOM');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DNS Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DOM');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DSL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DTDs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access & Data Exchange');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access & ODBC');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Abstraction Layers & APIs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Components');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Middleware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Network Layers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Access Query & Management Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Admin Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Backup & Recovery Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Capture & Exchange Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Carrier Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Driven Animation Tools (ODBC or JDBC)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Encryption & Security');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Feeds');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Mining');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Modelling Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Providers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Storage');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Storage & File Sharing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Storage (Web Briefcase)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Transmission');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Visualization');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Visualization & Modelling Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Data Warehousing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database & Data Access Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database & Search Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database APIs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Connectivity');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Driven');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Engine');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database IDEs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Middleware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Database to Database');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Databases');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Databases General');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dedicated Hardware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dedicated XML Information Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Deductive & Other New Format Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Delivery and Personal Assistance');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Demo Applications (Complete Solutions)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Demos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Demos & Tutorials');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Design & Modelling Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Design Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop & Window Managers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop Productivity Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop Productivity Tools - Office etc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Desktop applications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'DevX Articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Developer Sources');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Developer Specific');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Developer Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development & Integration Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development Libraries');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Development Tools & Components');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Devices');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dictionaries & Encylopedia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Books & Publishing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Asset Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Entertainement');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Formas & Codecs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital IDs & Certificates Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Identities Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Imaging');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Libraries');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Music');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Rights Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital UNIX');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Digital Video Cameras');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Directory Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion & Collaboration');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion & News Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Clients');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Forum & News Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Forums');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Forums Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Discussion Services (NNTP etc..)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Display Devices');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Display Devices (Monitors etc.)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Display Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Display Technology''');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distribubted Computing (CORBA Based)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed Components Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed Computing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed Database Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed IPCs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributed Transactions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distribution');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Distributions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Documentation & KBASE Projects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Drivers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Drivers & Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dublin Core Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dynamic DB Driven Web Middleware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dynamic HTML');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dynamic Service Discovry & UDDI Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Dynamic XML');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Business');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Commerce');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Commerce & Biz related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Commerce Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-Tailing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-business');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-commerce');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-mail');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-mail Marketing & Mail Merge');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-mail Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'E-mail Spec');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'EAI');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ECMA');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'EII ');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ERP Systems');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ETL and Replication');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Editors');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Electronic Ink');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Electronic Stock Trading Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Email');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Email Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Embedded');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Embedded DB Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Encoding Schemes');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Encryption - Technology & Export Rules');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Encryption Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Encyclopedia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Engine Implmentations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Engine Models');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'English Language');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise Application Integration');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise GroupWare');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise Information Portal Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise Information Portals');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Enterprise Java Beans');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Entertainment');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Environments');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Ethernet');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Event Planning');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Examples & Practical Use');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Exchange Building Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Eye');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'FAQs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'FOAF');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'FTP Clients');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Facial');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Fashion');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Fashion Retail');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Feed Generators');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Fiberless Optics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'File Sharing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'File System Driver Development');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'File Systems');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'File Systems & Server Devices');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Files System & Sharing Protocols');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Filtering Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Finance & Corporate Information');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Finance & Reporting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Finance Industry Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Finger Prints');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Firewall Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Flash');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Flash Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Food & Groceries');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Frameworks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Frameworks & Environments');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Frameworks and SDKs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Frameworks etc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Free ORB Directory');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Free Source Code');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Free with Source');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Free-Space-Optics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Freedom & Free Speech etc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Fulfillment Processing Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Futuristic Visions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI Application Tools & Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI Toolkits & Frameworks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI and Human-Computer Interaction');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GUI related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Game Consoles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Games');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General - CTO Level');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General Information');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General Java Information Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General TV');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'General XML related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Genetics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Geography');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Glossaries');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Gnome');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Graphical User Interfaces');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Graphics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Graphics & Animation & 3D Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Graphics Related - Very Cool');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Grid Computing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Group Development & Testing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'GroupWare');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HOWTOS');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HR');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTML Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTML Editors & Publishing Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTML UI');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTML for Conversion');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HTTP Protocol Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Handhelds');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Handhelds & PDAs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Handsets');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Handwriting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hardware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hardware Providers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Healthcare');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HelpDesk');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HelpDesk & CRM');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Helpdesk');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Helpdesk & Support');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High Level Dev. Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High Level Object Languages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High Tech');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High-Tech');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'High-Tech Equipment Companies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'History');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Home');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Home Appliances');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Home Furniture');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Applications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Communities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Solutions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hosted Solutions (ASP Model)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'HotSpots');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'How To Docs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hubs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Human Interface');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Human Resource Management etc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Hypertext Systems');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IBM');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IDES');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IDEs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IETF Protocols');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IP Based Telephony');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IRIX');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'IVR Solutions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Immunology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Independent Artists');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Independent Films');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Indexing & Search Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'India');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Industry Players');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Industry Specific');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Inferno');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Info Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Info Sources');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information & Intelligent Consumer Electronics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Appliances');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Appliances - Thin Clients');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Application & Retrieval Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Casting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Casting & Retrieval');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Mediation & Dissemination');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Search');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Information Sources');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Infrastructure Providers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Infrastructure Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Initiatives and Specifications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Initiatives of Interest');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Innovative Solutions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Installer Programs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Installer Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Instant Messaging');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Instant Messaging Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Instant Messaging Software');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Insurance');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Integrated Development Environments (IDEs)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Integration Servers (Middleware)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Intelligent Devices');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Interesting Database Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Interesting WIKIs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internationalization');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internationalization and Localization');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Appliances & Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Assistants');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Commerce');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Infrastructure Technology & Providers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Interactivity - Realtime Chat & User Discovery Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Internet Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Intranet Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Intranet Solutions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Intranet Suites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC Aware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC Based Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JDBC v ADO Technical Comparisons');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'JSP Engine');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Jav Bean Generation');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java & New Generation');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java Based Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java Developers Journal Code Library');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java ServLet Containers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Java based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Javascript Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Journal & Publishing Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Journals & Publishing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Key Contact Web Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Key Personalities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Key Researchers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledge & Information & Agent Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledge & Information Casting & Corporate Portal Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledge & Information Processing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledge-Information-Metadata');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Knowledgebases & Agent Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'LDAP');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'LDAP Classes');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Labs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Language Comparisons (Java n Python)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Lead Sources');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Legacy Application Logic for Conversion');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Licence Enforcement Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Licensing Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Life Style');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Linux');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Linux Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Linux based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Linux on CDROM');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Locator Portals');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Lookup Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MP3 - Music over NET Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MP3 Casting and Content Production');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MP3 Players');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MP3 search Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MPEG-4');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MPEG-7');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mac OS X Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MacOS');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mach');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Macintosh');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Macintosh 68K Versions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mag Articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mail');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mail Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mail Transfer Agents (MTAs)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mail to SMS Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mapping & GIS');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Maps & Catography');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Market Analysis');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Market Research');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Marketing Automation Software');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Marketing Presntations Portals');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Markup Languages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Meeting Facilitators (Face to Face)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Merchant Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Message Oriented Middleware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Messaging');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Metadata');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Metadata & Resource Definition Framework (RDF)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Metadatea Specs & Consortia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Methodology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft Articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft Java APIs & SDKs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft Provided');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft.NET');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Microsoft.NET Demos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Middleware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Middleware and Management Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mixed Data Access Mechanisms');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mixing Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mixtapes');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Calendar Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Computing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Enterprise');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Network Providers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Office Solutions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mobile Players for Cars');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Modeling (XML Vocabularies, Data, and Systems)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Modelling Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mono');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mortgages & Loans');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Movie Creation');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Movie Industry');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Movies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Movies Database');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Mozilla');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multi Purpose');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multimedia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multimedia & Graphics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multimedia Appliances');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Multimedia Sharing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Music');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Music Databases');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Music Industry');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MySQL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MySQL Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'MySQL Specific');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'NIC Drivers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'NNTP Clients');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'NNTP Clients & Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'NNTP Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Naming & Directory Interface (JNDI)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Native Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Native XML Databases');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Natural Language Processing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Natural Language Query Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Natural Language Query Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Net Conferencing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Net Life Style');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Netcasting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Netscape');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Computers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Diagnostic Utilities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Management & Design Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Monitoring');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Network Programming Matters');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Networking');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Networking Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Networks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Media');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Media Broadcasting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Media Innovations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Product Ideas');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'New Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'News');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'News Collection & Distribution');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'News Delivery & Exchange');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'News Specific Crawlers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Newton');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Next Generation Computer Interconnects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Nokia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Notations and Style');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OCS Data');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ODBC Based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OLAP');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OLAP Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OLE DB related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OLE-DB');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OMG Papers (New OMA Architecture)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OMG Specs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ORBS');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OS390');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Databases');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Description Language');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Frameworks & APIs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Modelling Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object Request Brokers & Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object-Relational');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Object-Relational Mappers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Offshore');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Offshore Development Companies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Ad Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Demos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Gaming');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Labs & Compile Farms');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Record Companies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Research Labs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Trading');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online Training');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Online demos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Ontologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Ontology Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open APIs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Software & GNU World');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Software Desc (ODS) Spec - Push & Replication');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Source');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Source Projects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open Source Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Open source');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'OpenVMS');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Operating Environments');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Operating Environments (VMs)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Operating Systems');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Operational Resource Management (ORM)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Optical Character Reconition');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Optical Networking');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Oracle');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Organizations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Organizations & Consortia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Other DB Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Other Projects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Others');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'P2P Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PABX');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PC Cards');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PCs & Workstations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDA & Embedded DB Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDA & Embedded Edition Kernel Ports');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDA Applications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDA related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PDAs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PERL Interfaces');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PPC Version');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PR');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'PThreads');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Parallel Programming Technology & Issues');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Parser Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Parsers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Parsers & Compilers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Patent Monitoring Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Patents');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Payment Processing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Payment Processing & E-Currency');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Peer to Peer');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Peer-Peer Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Pen Like Devices');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Perl');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Perl DBI');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Personal & Small Business Site Building');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Personal Networking');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Personalities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Pharmaceuticals & Drug Stores');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Phones');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Photo Sharing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Photos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Photos & Digital Art');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Players');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Podcasting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Polls and Surveys');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portability & Binary Interface Standards');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portability kits');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portable Players');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portal (All in One)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Portals');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Ports');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Potential Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Presentations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Presentations & Demos - Video Streaming');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Presentations & White Papers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Privacy Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Processor Architectures');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Processor Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Processors');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Product Comparisons');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Product Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Product Directory');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Product Reviews');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Production Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Products & API Implementations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Professional Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Profiling');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Programming Langs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Programming Languages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Programming Techniques');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Programming Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Project Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Projects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Protocols');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Public Key Infrastructure Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Publishing Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Push Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Python');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'QA Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Engines etc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Languages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Languages & Protocols');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Tools & Components');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Query Tools & Report Writers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Querying RDF Data');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RDF');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RDFSchemas');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RPC Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RSS Data');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Radio');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Radio Frequency Identification (RFID)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Raw XML for Transformation');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Real Estate');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Real Names & URI related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'RealVideo');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Rebol');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Recommendations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Recrruitment');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Relational');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Rentable Applications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Replication');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Replication & Synchronization');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Replication Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Report Generation Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Report Writers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Reporting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Reports and Analysis');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Repositories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Groups');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Labs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Projects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Projects & Teams');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Research sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Researchers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Resource & Project Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Resource Binder Research');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Resource Description Framework (RDF)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Resource Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Response Managers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Restaurant Reservations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Retail');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Retailers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Rotor');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'S390 - IBM Mainframe');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SAML');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SDKs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SDKs & Toolkits');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SET Compliant Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SGML');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SMIL Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SMS');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SMTP & MIME Data');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SOAP Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SQL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SQL-XML');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SQL-XML Middleware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SVG');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sales Configuration Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sales Force Automation & CRM');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sample Applications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sample Apps');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sample Data');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sample Use Of Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Samples');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Samples & Demos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'San Francisco Project');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sash');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Satellite');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Scenarios & Usage');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Scheduling & Task Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Schema Registries');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Schemas');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Screen Capture & Demo Recording Software');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Scripting Langs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Search Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Search Engines & Web Resource Retrieval');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Secure Shells');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Security');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Security & Encryption & Cryptography');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Security & Hacking Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semantic Agent Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semantic Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semantic Web');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semantic Web Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Semiconductor & Memory Chip Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Seminars & Presentations (Webcasting)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Server Appliances');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Serverlet Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Servers & Systems');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Bus Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Dicovery & Brokering');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Directories');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Location Protocol (SLP)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Service Providers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Set-Top & TV Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SetTop Box technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SetTop Boxes');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'SeverLet Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Shopping Cart Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Short Films Portal');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sign-On & Authentication Protocols');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Site Design');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Site Development Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Site Optimization and Analysis');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Site Ratings');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Small Business');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Small Business Suites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Small business');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Smart Card Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Smart Cards Embedding (JavaOS)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Soap Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Social Networking');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Software');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Software Distribution');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Software Distribution Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Software Updates etc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Source Code');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Specifications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Specs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Speech');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Speech & Voice Recognition');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Speech & Writing Recongnition Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sports');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Spreadsheet');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards & Initiatives');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards & Specifications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards & Specs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards & Standards Bodies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Bodies & Assoc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Bodies & Consortia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Consortia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Issues');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Organizations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards Specs & Consortia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Standards and Specs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Storage');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Storage Technology (SANS)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Storage and Query Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Store Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Stress Testing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Study Material & Samples etc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Stylesheets Library');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Sun');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Support');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Support Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Synchronization');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Synchronization & Replication');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Syndicates');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Syndication');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Systems & Event Management Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Systems Management Software');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'TCL Interfaces');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'TP Monitors');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'TV');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'TV Listings');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tablet PCs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Taxonomies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Team & Project Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technical Articles & White Papers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technical Support');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technical Support & Help Desk');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology & Terminology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Application Case Studies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Demo Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Demos & Samples');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Demos & Testbeds');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Technology Parks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Telephone');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Telephony');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Telephony Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Terminal Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Test Suites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Testsuites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'The Future');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Thin Client & Network Computers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Third Party VM & Compilers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Third Party VMs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Threaded Discussion');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Time Management');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tips and Tricks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Training');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Training Specialist Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Transaction Processing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Translation Services & Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Transport Protocols');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Travel Industry');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Triple Storage Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Troubleshooting Utilities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Troubleshooting and Benchmark Utilities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials & Demos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials & Learning');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials Sites');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Tutorials and White Papers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'UK');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'UK Players');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'UNIX');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'UNIX Driver Managers etc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Universal Data Access Technologies');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Universal Modelling Language Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Universities (Projects)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Universities Courses');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'University Research');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'University Research & Grad Student Pages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Use Cases');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'User Interface & Interaction');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'User Interface Definition');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Using XSL & CSS Together');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Utilities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Utilities and Add-ins');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'VB Components');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'VPN Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Variants');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Various Schemas');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Various Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Vector Markup Language (VML)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Vendor Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Vendor Specific');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Venture Incubators');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video & Audio Streaming');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video & Audio Streaming Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video & Voice Streaming');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Blogging');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Clips & Broadcasts');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Conferencing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Conferencing & Collaboration');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Search Engines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Sharing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video Streaming Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Video over IP');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Videos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Labs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Component Databases');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Databases');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Machines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Virtual Machines & Compilers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visionaries & Players');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visual Bsic Specific');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visual IDEs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visual Interdev');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visual Mapping & Integration Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Visualization and Drawing Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice & Telephony');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice Infomediaries');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice over IP');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Voice over IP related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WAP');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WAP Clients');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WAP Development');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WIFI');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WIKIs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WIN64');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WLAN');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wearable Computer Devices');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web & Internet Based Artificial Intelligence');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Application Development & Solutions');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Bots and Crawlers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Content Syndicators');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Data');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Editing & Publishing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web IDEs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Innovation');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Innovations');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Management Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Page Formating and Display');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Publishing & Management Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Servers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Servers (HHTPD)');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Servers Supporting ServeLets');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Services');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Services Hosting');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Site & Application Modelling');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Site Building');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Statistics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Technology Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web To DB Products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Web Utilities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WebCasts');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WebDAV');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Webdav');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Webzines');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Paper & Articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Papers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Papers & Articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Papers & Tutorials');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'White Papers and Articles');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Whitepapers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wikis');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wikki');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Windows');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Windows Portability & Crossover');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Windows based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Winsock & Network Programming');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Winsock Compliant');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wireless');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Wireless Communications');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'WorkFlow Specification');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Workflow');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Workflow Technology');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Workflow and Process Integration');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Working Groups & Charters');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Works In Progress');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'X-OQL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XBRL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XBRL Data');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XForms');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XHTML');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XInclude');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Application & Use');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Data');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Doc Generators');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML For Analysis');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Protocols');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Query Language Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML Repositories & DBs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML and RDF Frameworks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML based Markup Languages Index');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML-HTML Conversion Tools');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XML-QL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XMLRPC Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XMLSchema');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XMlLRPC');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XPath related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XPointer related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XQL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XSL Processors');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XSL Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'XUL');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Xlink Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'Zero Config Networking');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'books');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ch');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'e-commerce');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'e-mail packages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eBook Readers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eBooks');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eBooks & ePublishing');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eCRM');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eGov');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eLibraries');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eMeetings & eDemos');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ePayment and Digicash Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'eXtensible Markup Language');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ebXML');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'fiber optics');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'hip hop');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'iODBC');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'iODBC Language Interfaces');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'iodbc based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'kde');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'lua');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'mailing list information');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'middleware');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'odbc');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'odmg');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'ole-db');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'open source');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'p2p based');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'portals');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'products');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'projects');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'protocols');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'scripting languages');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'specifications & consotia');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'specs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'standards');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'standards & specs');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'tcl');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'utilities');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'vXML Related');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/folderTitle', 'white papers');
-TDAV_RDF_QUAD_CHECK ('technology_bookmarks.xbel', 'http://www.python.org/topics/xml/xbel/title', 'Advanced Research');
-TDAV_RDF_QUAD_CHECK ('vc_bloggers.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('vc_bloggers.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('vc_bloggers.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('weblogs_I_follow.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('weblogs_I_follow.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('weblogs_I_follow.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
-TDAV_RDF_QUAD_CHECK ('yasn_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#ownerName', 'Unknown OPML owner');
-TDAV_RDF_QUAD_CHECK ('yasn_blogs.opml', 'http://www.openlinksw.com/schemas/OPML#title', 'Untitled OPML');
-TDAV_RDF_QUAD_CHECK ('yasn_blogs.opml', 'http://www.openlinksw.com/virtdav#dynRdfExtractor', 'application^2fopml+xml');
diff --git a/binsrc/tests/suite/tdavmigr1.sql b/binsrc/tests/suite/tdavmigr1.sql
index 5292c74..41eba41 100644
--- a/binsrc/tests/suite/tdavmigr1.sql
+++ b/binsrc/tests/suite/tdavmigr1.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdavmigr1.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdavmigr2.sql b/binsrc/tests/suite/tdavmigr2.sql
index d3ec8ec..18e4bb2 100644
--- a/binsrc/tests/suite/tdavmigr2.sql
+++ b/binsrc/tests/suite/tdavmigr2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdavmigr2.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdbp.sh b/binsrc/tests/suite/tdbp.sh
index 637a023..576ef41 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# DBPUMP tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tdcascade.sql b/binsrc/tests/suite/tdcascade.sql
index 93d5cc5..1993454 100644
--- a/binsrc/tests/suite/tdcascade.sql
+++ b/binsrc/tests/suite/tdcascade.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdcascade.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdconv.sh b/binsrc/tests/suite/tdconv.sh
index 0162d88..3da3229 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# VAD tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tdelete.sql b/binsrc/tests/suite/tdelete.sql
index 996e92b..94b7dc1 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.2 2009/07/16 06:17:17 source Exp $
+-- $Id$
--
-- Test delete functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -149,23 +149,23 @@ ECHO BOTH $IF $EQU $LAST[1] 76469 "PASSED" "***FAILED";
ECHO BOTH ": " $LAST[1] " rows_1 in words_2 after delete\n";
delete from words table option (index primary key) where len > 7 option (index len);
-echo both $if $equ $state 42000 "PASSED" "***FAILED";
-echo both ": error with different inx for single key del and the search\n";
+ECHO BOTH $IF $EQU $STATE 42000 "PASSED" "***FAILED";
+ECHO BOTH ": error with different inx for single key del and the search\n";
set autocommit manual;
delete from words table option (index len, no cluster) where len > 7 option (index len);
-echo both $if $equ $sqlstate OK "PASSED" "***FAILED";
-echo both ": del single key\n";
+ECHO BOTH $IF $EQU $SQLSTATE OK "PASSED" "***FAILED";
+ECHO BOTH ": del single key\n";
select (select count (*) from words table option (index primary key)) - (select count (*) from words table option (index len));
-echo both $if $neq $last[1] 0 "PASSED" "***FAILED";
-echo both ": count after single key del\n";
+ECHO BOTH $IF $NEQ $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": count after single key del\n";
select count (*) from words table option (index primary key);
-echo both $if $equ $last[1] 76469 "PASSED" "***FAILED";
-echo both ": pk count after single key del\n";
+ECHO BOTH $IF $EQU $LAST[1] 76469 "PASSED" "***FAILED";
+ECHO BOTH ": pk count after single key del\n";
rollback work;
set autocommit off;
diff --git a/binsrc/tests/suite/tdrop.sh b/binsrc/tests/suite/tdrop.sh
index c0ffc6e..42a88fb 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tdrop.sql b/binsrc/tests/suite/tdrop.sql
index 6f63dba..cde30e9 100644
--- a/binsrc/tests/suite/tdrop.sql
+++ b/binsrc/tests/suite/tdrop.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdrop.sql,v 1.2 2006/08/16 07:58:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -249,4 +249,3 @@ ECHO BOTH ": PRIMARY KEY ALTERED : COUNT=" $LAST[1] "\n";
select count(id) from PK_TEST;
ECHO BOTH $IF $EQU $LAST[1] 5 "PASSED" "***FAILED";
ECHO BOTH ": PRIMARY KEY TEST TABLE : COUNT=" $LAST[1] "\n";
-
diff --git a/binsrc/tests/suite/tdrop1.sql b/binsrc/tests/suite/tdrop1.sql
index 2532fee..3ae29a9 100644
--- a/binsrc/tests/suite/tdrop1.sql
+++ b/binsrc/tests/suite/tdrop1.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdrop1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tdrop2.sql b/binsrc/tests/suite/tdrop2.sql
index a9c2c5f..1c152b1 100644
--- a/binsrc/tests/suite/tdrop2.sql
+++ b/binsrc/tests/suite/tdrop2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdrop2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/terror.sql b/binsrc/tests/suite/terror.sql
index 9986468..423086b 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.5 2009/11/17 21:01:00 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
@@ -1302,15 +1302,15 @@ create procedure bf2 ()
commit work;
return blob_to_string (_b1);
}
-echo both "Error messages about reading free pages and bad blobs are expected next. Ignore until a message says that this is no longer expected.\n";
+ECHO BOTH "Error messages about reading free pages and bad blobs are expected next. Ignore until a message says that this is no longer expected.\n";
--bf();
--bf2();
---echo both $if $equ $sqlstate "22023" "PASSED" "***FAILED";
---echo both ": deleted blob read in blob_to_string\n";
+--ECHO BOTH $IF $EQU $SQLSTATE "22023" "PASSED" "***FAILED";
+--ECHO BOTH ": deleted blob read in blob_to_string\n";
-echo both "Error messages about bad blobs or reading free pages are not expected after this point.\n";
+ECHO BOTH "Error messages about bad blobs or reading free pages are not expected after this point.\n";
-- bad nvarchar processing in ins replacing
diff --git a/binsrc/tests/suite/tescape.sql b/binsrc/tests/suite/tescape.sql
index 5cbadb0..8a301ea 100644
--- a/binsrc/tests/suite/tescape.sql
+++ b/binsrc/tests/suite/tescape.sql
@@ -1,10 +1,10 @@
--
--- $Id: tescape.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/test_fn.sh b/binsrc/tests/suite/test_fn.sh
index f903215..3e05cfe 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.5 2010/01/28 14:33:20 source Exp $
+# $Id$
#
# 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-2006 OpenLink Software
+# 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
@@ -42,6 +42,7 @@ 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 b7aa2d5..ccf265e 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# choose a server to run with
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/testall.sh b/binsrc/tests/suite/testall.sh
index 33964bd..d1e8b57 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.1 2009/04/16 12:37:43 source Exp $
+# $Id$
#
# Call all tests in succession
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/testgz.sql b/binsrc/tests/suite/testgz.sql
index 5c242a0..59ae0ac 100644
--- a/binsrc/tests/suite/testgz.sql
+++ b/binsrc/tests/suite/testgz.sql
@@ -1,10 +1,10 @@
--
--- $Id: testgz.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/testtext.sql b/binsrc/tests/suite/testtext.sql
index fcef34d..bf9917d 100644
--- a/binsrc/tests/suite/testtext.sql
+++ b/binsrc/tests/suite/testtext.sql
@@ -1,10 +1,10 @@
--
--- $Id: testtext.sql,v 1.2.2.2 2009/07/14 22:24:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/texcept.sql b/binsrc/tests/suite/texcept.sql
index 50110c9..41b8808 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Exception handling tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/texecute.sql b/binsrc/tests/suite/texecute.sql
index 64b5e79..d124878 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- exec suite testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/text.sql b/binsrc/tests/suite/text.sql
index 01b3b7a..1c06137 100644
--- a/binsrc/tests/suite/text.sql
+++ b/binsrc/tests/suite/text.sql
@@ -1,10 +1,10 @@
--
--- $Id: text.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -413,7 +413,3 @@ create procedure index_batch_test (in start integer, in id2 integer, in flag int
vt_batch_process (vtb);
return;
}
-
-
-
-
diff --git a/binsrc/tests/suite/textdef.sql b/binsrc/tests/suite/textdef.sql
index d3fcca8..0f1581d 100644
--- a/binsrc/tests/suite/textdef.sql
+++ b/binsrc/tests/suite/textdef.sql
@@ -1,10 +1,10 @@
--
--- $Id: textdef.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -88,6 +88,3 @@ vt_name);
__ddl_changed (KEY_TABLE);
}
}
-
-
-
diff --git a/binsrc/tests/suite/tfk.sql b/binsrc/tests/suite/tfk.sql
index 8913977..fb6e4e4 100644
--- a/binsrc/tests/suite/tfk.sql
+++ b/binsrc/tests/suite/tfk.sql
@@ -1,10 +1,10 @@
--
--- $Id: tfk.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tfref.sql b/binsrc/tests/suite/tfref.sql
index b0cb4bf..97471b6 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Function reference tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tft_offband.sql b/binsrc/tests/suite/tft_offband.sql
index 238a155..e5f5545 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -150,7 +150,7 @@ vt_inc_index_db_dba_toff ();
select c_o_1 from toff where contains (dt, 'abc', OFFBAND, c_o_1);
ECHO BOTH $IF $EQU $LAST[1] "abccde1qq" "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-ECHO BOTH ": " $last[1] " as offband after batch update\n";
+ECHO BOTH ": " $LAST[1] " as offband after batch update\n";
diff --git a/binsrc/tests/suite/tftext.sql b/binsrc/tests/suite/tftext.sql
index 98a7ae5..6c5a394 100644
--- a/binsrc/tests/suite/tftext.sql
+++ b/binsrc/tests/suite/tftext.sql
@@ -1,10 +1,10 @@
--
--- $Id: tftext.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tftp.sql b/binsrc/tests/suite/tftp.sql
index d370d53..71b26a7 100644
--- a/binsrc/tests/suite/tftp.sql
+++ b/binsrc/tests/suite/tftp.sql
@@ -1,10 +1,10 @@
--
--- $Id: tftp.sql,v 1.3.2.1 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tftt.sql b/binsrc/tests/suite/tftt.sql
index 6fab525..d87e49f 100644
--- a/binsrc/tests/suite/tftt.sql
+++ b/binsrc/tests/suite/tftt.sql
@@ -1,10 +1,10 @@
--
--- $Id: tftt.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tgroup.sql b/binsrc/tests/suite/tgroup.sql
index 0cee6ce..2eff079 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Group By test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -25,7 +25,7 @@
--
--
-echo both "Group By test\n";
+ECHO BOTH "Group By test\n";
select count (word), LEFT (word, 2) from words group by 2 order by count (word);
ECHO BOTH $IF $EQU $ROWCNT 379 "PASSED" "***FAILED";
@@ -56,68 +56,68 @@ ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
ECHO BOTH ": " $ROWCNT " rows T1, gb ob exp\n";
select top 500 word from words order by 1 desc;
-echo both $if $equ $last[1] "zootécnico" "PASSED" "*** FAILED";
-echo both ": 500th from end is " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] "zootécnico" "PASSED" "***FAILED";
+ECHO BOTH ": 500th from end is " $LAST[1] "\n";
select top 500 concat (word) from words order by 1 desc;
-echo both $if $equ $last[1] "zootécnico" "PASSED" "*** FAILED";
-echo both ": 500th from end sorted is " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] "zootécnico" "PASSED" "***FAILED";
+ECHO BOTH ": 500th from end sorted is " $LAST[1] "\n";
select top (100 + 400) word from words order by 1 desc;
-echo both $if $equ $last[1] "zootécnico" "PASSED" "*** FAILED";
-echo both ": plus exp top 500 is " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] "zootécnico" "PASSED" "***FAILED";
+ECHO BOTH ": plus exp top 500 is " $LAST[1] "\n";
select top ('500') word from words order by 1 desc;
-echo both $if $equ $last[1] "zootécnico" "PASSED" "*** FAILED";
-echo both ": cast exp end 500 is " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] "zootécnico" "PASSED" "***FAILED";
+ECHO BOTH ": cast exp end 500 is " $LAST[1] "\n";
select top ('500') concat (word) from words order by 1 desc;
-echo both $if $equ $last[1] "zootécnico" "PASSED" "*** FAILED";
-echo both ": cast sorted exp end 500 is " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] "zootécnico" "PASSED" "***FAILED";
+ECHO BOTH ": cast sorted exp end 500 is " $LAST[1] "\n";
select top -1 word from words;
-echo both $if $NEQ $STATE OK "PASSED" "*** FAILED";
-echo both ": negative top yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": negative top yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select top -1,1 word from words;
-echo both $if $NEQ $STATE OK "PASSED" "*** FAILED";
-echo both ": negative skip part yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": negative skip part yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select top 1,-2 word from words;
-echo both $if $NEQ $STATE OK "PASSED" "*** FAILED";
-echo both ": negative top part yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": negative top part yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select top (-2) word from words;
-echo both $if $NEQ $STATE OK "PASSED" "*** FAILED";
-echo both ": negative calc top yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": negative calc top yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select top (-1,1) word from words;
-echo both $if $NEQ $STATE OK "PASSED" "*** FAILED";
-echo both ": negative calc skip part yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": negative calc skip part yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select top (1,-2) word from words;
-echo both $if $NEQ $STATE OK "PASSED" "*** FAILED";
-echo both ": negative calc top part yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": negative calc top part yelds STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select top 1,1 word from words order by 1 desc;
-echo both $if $equ $last[1] "úvea" "PASSED" "*** FAILED";
-echo both ": 2nd from end is " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] "úvea" "PASSED" "***FAILED";
+ECHO BOTH ": 2nd from end is " $LAST[1] "\n";
select top 1,1 concat (word) from words order by 1 desc;
-echo both $if $equ $last[1] "úvea" "PASSED" "*** FAILED";
-echo both ": 2nd from end sorted is " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] "úvea" "PASSED" "***FAILED";
+ECHO BOTH ": 2nd from end sorted is " $LAST[1] "\n";
select top 1,1 concat (word) from words order by word;
-echo both $if $equ $last[1] "aarónica" "PASSED" "*** FAILED";
-echo both ": 2nd skip exp from start " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] "aarónica" "PASSED" "***FAILED";
+ECHO BOTH ": 2nd skip exp from start " $LAST[1] "\n";
select top 5 len, word from words order by 1 desc;
-- XXX: with ties sorted oby not supported
--select top 5 with ties len, word from words order by 1 desc;
---echo both $if $equ $rowcnt 304 "PASSED" "*** FAILED";
---echo both ": " $rowcnt " top 5 length desc with ties\n";
+--ECHO BOTH $IF $EQU $ROWCNT 304 "PASSED" "***FAILED";
+--ECHO BOTH ": " $ROWCNT " top 5 length desc with ties\n";
-- suite for bug 2094
DROP TABLE B2094;
diff --git a/binsrc/tests/suite/thttp.sh b/binsrc/tests/suite/thttp.sh
index 16cb012..d8e22ab 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.5 2010/01/28 14:33:20 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -744,8 +744,26 @@ case $1 in
if [ "$MAKE_VAD" = "yes" ] ; then
if [ $do_mappers_only -eq 1 ]
then
- (cd ../../../rdf_mappers; make)
- cp ../../../rdf_mappers/rdf_mappers_dav.vad ./
+ 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 .
elif [ "x$HOST_OS" = "x" ]
then
LOG "Create ODS VAD Package"
@@ -1040,6 +1058,68 @@ 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 8cd29e8..20af659 100644
--- a/binsrc/tests/suite/thttp.sql
+++ b/binsrc/tests/suite/thttp.sql
@@ -1,10 +1,10 @@
--
--- $Id: thttp.sql,v 1.4.2.1 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tidxksize.sql b/binsrc/tests/suite/tidxksize.sql
index 5f6fcf3..c49e12b 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Index key sizes test suite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/timsg.sh b/binsrc/tests/suite/timsg.sh
index aec2363..f2bbb96 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tinl.sql b/binsrc/tests/suite/tinl.sql
index 3cdf2cc..38727db 100644
--- a/binsrc/tests/suite/tinl.sql
+++ b/binsrc/tests/suite/tinl.sql
@@ -1,5 +1,5 @@
-echo both "Test inlining exists as dt\n";
+ECHO BOTH "Test inlining exists as dt\n";
-- Test for changing a subquery into a outer loop for joining.
@@ -37,42 +37,41 @@ explain ('select count (*) from t1 where (row_no, fi2) in (select row_no, fi2 fr
explain ('select count (*) from t1 where string1 in (select string2 from r1..t1 where row_no = 222)');
select count (*) from t1 where string1 in (select string2 from r1..t1 where row_no = 222);
-echo both $if $equ $last[1] 3 "PASSED" "***FAILED";
-echo both ": r1..t1 in r1..t1 \n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 in r1..t1 \n";
explain ('select count (*) from t1 where string1 in (select string2 from r1..t1 where row_no = 222) option (do not loop exists)');
select count (*) from r1..t1 a, t1 b where a.string1 in (select string2 from r1..t1 where row_no = 222) and b.row_no = a.row_no;
-echo both $if $equ $last[1] 3 "PASSED" "***FAILED";
-echo both ": r1..t1 in r1..t1, t1 \n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 in r1..t1, t1 \n";
select count (*) from r1..t1 a, t1 b where a.string1 in (select string2 from r1..t1 where row_no = 222) and b.row_no = a.row_no option (do not loop exists);
-echo both $if $equ $last[1] 3 "PASSED" "***FAILED";
-echo both ": r1..t1 in r1..t1, t1 do not loop exists\n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 in r1..t1, t1 do not loop exists\n";
select count (*) from r1..t1 a, t1 b where a.string1 in (select string2 from r1..t1 where row_no = 222) and b.row_no = a.row_no option (loop exists);
-echo both $if $equ $last[1] 3 "PASSED" "***FAILED";
-echo both ": r1..t1 in r1..t1, t1 loop exists\n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 in r1..t1, t1 loop exists\n";
select count (*) from r1..t1 a, t1 b where a.string1 in (select string2 from r1..t1 c where c.row_no = 222 and c.row_no = a.fi2) and b.row_no = a.row_no option ( loop exists);
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": r1..t1 in r1..t1, t1, 2 in join conds, loop exists\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": r1..t1 in r1..t1, t1, 2 in join conds, loop exists\n";
update t1 set fi2 = fi2 + 2 where row_no in (select row_no from r1..t1 where string1 = '11');
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": update t1 in r1..t1\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": update t1 in r1..t1\n";
update r1..t1 set fi2 = fi2 + 2 where row_no in (select row_no from r1..t1 where string1 = '11');
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": update t1 in r1..t1\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": update t1 in r1..t1\n";
update r1..t1 set fi2 = fi2 + 2 where row_no in (select row_no from t1 where string1 = '11');
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": update r1..t1 in t1\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": update r1..t1 in t1\n";
update r1..t1 set fi2 = fi2 + 2 where row_no in (select row_no from t1 where string1 > '11') and row_no = 411;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": update r1..t1 in t1 and row_no = 411\n";
-
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": update r1..t1 in t1 and row_no = 411\n";
diff --git a/binsrc/tests/suite/tinlist.sql b/binsrc/tests/suite/tinlist.sql
index 9995464..37cce98 100644
--- a/binsrc/tests/suite/tinlist.sql
+++ b/binsrc/tests/suite/tinlist.sql
@@ -1,5 +1,5 @@
-echo both "Test for index usage with in predicate of exp list\n";
+ECHO BOTH "Test for index usage with in predicate of exp list\n";
@@ -11,33 +11,33 @@ insert into tinl values (3, 6, 9);
select * from tinl where k1 in (1, 1+1, 3, 4);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": 1st key in list \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": 1st key in list \n";
select * from tinl where k1 in (1, vector (1+1, 3), 4);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": 1st key in list 2-d element is array \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": 1st key in list 2-d element is array \n";
select * from tinl where k1 in (1, 1+1, 3, 4) and k2 in (2, 4);
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both ": 1st and 2nd key in list\n";
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": 1st and 2nd key in list \n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": 1st and 2nd key in list\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": 1st and 2nd key in list \n";
select k1 from tinl where d1 in (2, 3,9);
-echo both $if $equ $last[1] 3 "PASSED" "***FAILED";
-echo both ": dependent in list\n";
+ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
+ECHO BOTH ": dependent in list\n";
select d1 from tinl where k2 in (2, 4);
-echo both $if $equ $last[1] 6 "PASSED" "***FAILED";
-echo both ": 2nd key in list\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": 2nd key in list\n";
select a.k1, b.k1 from tinl a, tinl b where b.k1 in (a.d1);
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": in list join\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": in list join\n";
select count (*) from sys_users where u_name in (u_name);
@@ -48,24 +48,24 @@ create index tinidx on tin (id2);
foreach integer between 1 10 insert into tin values (?, ?+1, ?+2);
select * from tin table option (index tin) where id1 in (1, 2, 3);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": id1 IN on main index \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": id1 IN on main index \n";
select * from tin table option (index tin) where id2 in (2, 3, 4);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": id2 IN on main index \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": id2 IN on main index \n";
select * from tin table option (index tin) where id3 in (3, 4, 5);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": id3 IN on main index \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": id3 IN on main index \n";
select * from tin table option (index tinidx) where id1 in (1, 2, 3);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": id1 IN on secondary index \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": id1 IN on secondary index \n";
select * from tin table option (index tinidx) where id2 in (2, 3, 4);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": id1 IN on secondary index \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": id1 IN on secondary index \n";
select * from tin table option (index tinidx) where id3 in (3, 4, 5);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": id1 IN on secondary index \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": id1 IN on secondary index \n";
DROP TABLE BB_topics;
DROP TABLE BB_topics_posted;
@@ -101,5 +101,5 @@ SELECT t.forum_id, t.topic_type FROM BB_topics t
LEFT JOIN BB_topics_track tt ON (tt.topic_id = t.topic_id AND tt.user_id = 2)
WHERE (t.forum_id IN (6, 0) AND t.topic_type in (2,3));
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": IN on non-key columns in after test \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": IN on non-key columns in after test \n";
diff --git a/binsrc/tests/suite/tinx.sql b/binsrc/tests/suite/tinx.sql
index 42c5a32..f969a5a 100644
--- a/binsrc/tests/suite/tinx.sql
+++ b/binsrc/tests/suite/tinx.sql
@@ -1,10 +1,10 @@
--
--- $Id: tinx.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -52,36 +52,32 @@ tinx_fill (10, 10, 10);
update tinx set k1 = null where row_no < 500;
select k1, k2, k3 from tinx where k1> 3;
-echo both $if $equ $rowcnt 500 "PASSED" "**FAILED";
-echo both " tinx k1 > 3 " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 500 "PASSED" "**FAILED";
+ECHO BOTH ": tinx k1 > 3 " $ROWCNT " rows\n";
select k1, k2, k3 from tinx where k1> 3 order by k1 desc;
-echo both $if $equ $rowcnt 500 "PASSED" "**FAILED";
-echo both " tinx k1 > 3 " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 500 "PASSED" "**FAILED";
+ECHO BOTH ": tinx k1 > 3 " $ROWCNT " rows\n";
update tinx set k1 = row_no / 100;
select k1, k2, k3 from tinx where k1 < 3;
-echo both $if $equ $rowcnt 300 "PASSED" "**FAILED";
-echo both " tinx k1 < 3 " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 300 "PASSED" "**FAILED";
+ECHO BOTH ": tinx k1 < 3 " $ROWCNT " rows\n";
select k1, k2, k3 from tinx where k1 < 3 order by k1 desc;
-echo both $if $equ $rowcnt 300 "PASSED" "**FAILED";
-echo both " tinx k1 < 3 " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 300 "PASSED" "**FAILED";
+ECHO BOTH ": tinx k1 < 3 " $ROWCNT " rows\n";
delete from tinx;
tinx_fill (10, 10, 10);
update tinx set k1 = null where row_no < 495;
select k1, k2, k3 from tinx where k1 < 7;
-echo both $if $equ $rowcnt 205 "PASSED" "**FAILED";
-echo both " tinx k1 < 7 " $rowcnt " rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 205 "PASSED" "**FAILED";
+ECHO BOTH ": tinx k1 < 7 " $ROWCNT " rows\n";
select k1, k2, k3 from tinx where k1 < 7 order by k1 desc;
-echo both $if $equ $rowcnt 205 "PASSED" "**FAILED";
-echo both " tinx k1 < 7 " $rowcnt " rows\n";
-
-
-
-
+ECHO BOTH $IF $EQU $ROWCNT 205 "PASSED" "**FAILED";
+ECHO BOTH ": tinx k1 < 7 " $ROWCNT " rows\n";
diff --git a/binsrc/tests/suite/tinxint.sql b/binsrc/tests/suite/tinxint.sql
index 1caa5f6..d3766c8 100644
--- a/binsrc/tests/suite/tinxint.sql
+++ b/binsrc/tests/suite/tinxint.sql
@@ -1,10 +1,10 @@
--
--- $Id: tinxint.sql,v 1.3.2.1 2009/04/16 12:37:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -23,7 +23,7 @@
-echo both "Index intersecction tests\n";
+ECHO BOTH "Index intersecction tests\n";
update t1 set fi3 = mod (row_no, 11), fi2 = mod (row_no, 7);
@@ -33,61 +33,59 @@ create index fi3 on t1 (fi3) partition (fi3 int);
select count (*) from t1 where fi2 = 3 and fi3 = 3;
-echo both $if $equ $last[1] 130 "PASSED" "*** FAILED";
-echo both " t1 inx int count\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx int count\n";
select count (*) from t1 table option (index fi2) where fi2 = 3 and fi3 = 3;
-echo both $if $equ $last[1] 130 "PASSED" "*** FAILED";
-echo both " t1 inx fi2 count\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx fi2 count\n";
select count (*) from t1 table option (index primary key) where fi2 = 3 and fi3 = 3;
-echo both $if $equ $last[1] 130 "PASSED" "*** FAILED";
-echo both " t1 pk count\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 pk count\n";
select sum (fi6) from t1 where fi2 = 3 and fi3 = 3;
-echo both $if $equ $last[1] 866580 "PASSED" "*** FAILED";
-echo both ": ti inx int fi6 sum.\n";
+ECHO BOTH $IF $EQU $LAST[1] 866580 "PASSED" "***FAILED";
+ECHO BOTH ": ti inx int fi6 sum.\n";
update t1 set fi6 = 11 where fi2 = 4 and fi3 = 5;
-echo both $if $equ $rowcnt 130 "PASSED" "*** FAILED";
-echo both " t1 inx int update 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx int update 1\n";
update t1 set fi6 = 11 where fi2 = 4 and fi3 = 5 and fi6 = 11;
-echo both $if $equ $rowcnt 130 "PASSED" "*** FAILED";
-echo both " t1 inx int update 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx int update 2\n";
update t1 set fi6 = 11 where fi2 = 4 and fi3 = 5 and fi6 = 22;
-echo both $if $equ $rowcnt 0 "PASSED" "*** FAILED";
-echo both " t1 inx int update 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx int update 3\n";
create procedure f (in a any) {return a;};
select count (*) from t1 a, t1 b where a.fi2 = 3 and b.fi3 = 4 and a.row_no = b.row_no;
-echo both $if $equ $last[1] 130 "PASSED" "***FAILED";
-echo both ": inx int join 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": inx int join 1\n";
select count (*) from t1 a, t1 b where a.fi2 = 3 and b.fi3 = 4 and a.row_no = b.row_no and f(a.row_no) < 2000;
-echo both $if $equ $last[1] 25 "PASSED" "***FAILED";
-echo both ": inx int join 2\n";
+ECHO BOTH $IF $EQU $LAST[1] 25 "PASSED" "***FAILED";
+ECHO BOTH ": inx int join 2\n";
select count (*) from t1 a, t1 b where a.fi2 = 3 and b.fi3 = 4 and a.row_no = b.row_no and f(a.row_no + b.row_no) < 4000;
-echo both $if $equ $last[1] 25 "PASSED" "***FAILED";
-echo both ": inx int join 3\n";
+ECHO BOTH $IF $EQU $LAST[1] 25 "PASSED" "***FAILED";
+ECHO BOTH ": inx int join 3\n";
select count (*) from t1 a, t1 b, t1 c where a.fi2 = 4 and b.fi2 = 4 and c.fi3 = 3 and a.row_no = b.row_no and b.row_no = c.row_no and f(a.fi2) is not null and f(c.fs1) is not null;
-echo both $if $equ $last[1] 130 "PASSED" "***FAILED";
-echo both ": inx int join 3 tables\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": inx int join 3 tables\n";
drop table t1;
-- the next test tjoin needs to fill this from scratch
-
-
diff --git a/binsrc/tests/suite/tinxintbm.sql b/binsrc/tests/suite/tinxintbm.sql
index a3bbff8..468e84c 100644
--- a/binsrc/tests/suite/tinxintbm.sql
+++ b/binsrc/tests/suite/tinxintbm.sql
@@ -1,10 +1,10 @@
--
--- $Id: tinxintbm.sql,v 1.1.2.2 2009/07/09 13:04:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -23,7 +23,7 @@
-echo both "Index intersecction tests with bitmap index\n";
+ECHO BOTH "Index intersecction tests with bitmap index\n";
update t1 set fi3 = mod (row_no, 11), fi2 = mod (row_no, 7);
@@ -33,57 +33,57 @@ create bitmap index fi3 on t1 (fi3) partition (fi3 int);
select count (*) from t1 where fi2 = 3 and fi3 = 3;
-echo both $if $equ $last[1] 130 "PASSED" "*** FAILED";
-echo both " t1 inx int count\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx int count\n";
select count (*) from t1 table option (index fi2) where fi2 = 3 and fi3 = 3;
-echo both $if $equ $last[1] 130 "PASSED" "*** FAILED";
-echo both " t1 inx fi2 count\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx fi2 count\n";
select count (*) from t1 table option (index primary key) where fi2 = 3 and fi3 = 3;
-echo both $if $equ $last[1] 130 "PASSED" "*** FAILED";
-echo both " t1 pk count\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 pk count\n";
select sum (fi6) from t1 where fi2 = 3 and fi3 = 3;
-echo both $if $equ $last[1] 866580 "PASSED" "*** FAILED";
-echo both ": ti inx int fi6 sum.\n";
+ECHO BOTH $IF $EQU $LAST[1] 866580 "PASSED" "***FAILED";
+ECHO BOTH ": ti inx int fi6 sum.\n";
update t1 set fi6 = 11 where fi2 = 4 and fi3 = 5;
-echo both $if $equ $rowcnt 130 "PASSED" "*** FAILED";
-echo both " t1 inx int update 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx int update 1\n";
update t1 set fi6 = 11 where fi2 = 4 and fi3 = 5 and fi6 = 11;
-echo both $if $equ $rowcnt 130 "PASSED" "*** FAILED";
-echo both " t1 inx int update 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 130 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx int update 2\n";
update t1 set fi6 = 11 where fi2 = 4 and fi3 = 5 and fi6 = 22;
-echo both $if $equ $rowcnt 0 "PASSED" "*** FAILED";
-echo both " t1 inx int update 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": t1 inx int update 3\n";
create procedure f (in a any) {return a;};
select count (*) from t1 a, t1 b where a.fi2 = 3 and b.fi3 = 4 and a.row_no = b.row_no;
-echo both $if $equ $last[1] 130 "PASSED" "***FAILED";
-echo both ": inx int join 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": inx int join 1\n";
select count (*) from t1 a, t1 b where a.fi2 = 3 and b.fi3 = 4 and a.row_no = b.row_no and f(a.row_no) < 2000;
-echo both $if $equ $last[1] 25 "PASSED" "***FAILED";
-echo both ": inx int join 2\n";
+ECHO BOTH $IF $EQU $LAST[1] 25 "PASSED" "***FAILED";
+ECHO BOTH ": inx int join 2\n";
select count (*) from t1 a, t1 b where a.fi2 = 3 and b.fi3 = 4 and a.row_no = b.row_no and f(a.row_no + b.row_no) < 4000;
-echo both $if $equ $last[1] 25 "PASSED" "***FAILED";
-echo both ": inx int join 3\n";
+ECHO BOTH $IF $EQU $LAST[1] 25 "PASSED" "***FAILED";
+ECHO BOTH ": inx int join 3\n";
select count (*) from t1 a, t1 b, t1 c where a.fi2 = 4 and b.fi2 = 4 and c.fi3 = 3 and a.row_no = b.row_no and b.row_no = c.row_no and f(a.fi2) is not null and f(c.fs1) is not null;
-echo both $if $equ $last[1] 130 "PASSED" "***FAILED";
-echo both ": inx int join 3 tables\n";
+ECHO BOTH $IF $EQU $LAST[1] 130 "PASSED" "***FAILED";
+ECHO BOTH ": inx int join 3 tables\n";
create procedure t1bm1 ()
@@ -107,5 +107,3 @@ return 0;
drop table t1;
-- the next test tjoin needs to fill this from scratch
-
-
diff --git a/binsrc/tests/suite/tiri.sql b/binsrc/tests/suite/tiri.sql
index 501edc7..55baa31 100644
--- a/binsrc/tests/suite/tiri.sql
+++ b/binsrc/tests/suite/tiri.sql
@@ -1,10 +1,10 @@
--
--- $Id: tiri.sql,v 1.3.2.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -46,32 +46,32 @@ insert into at values (iri_id_from_num (-3000));
insert into it values (#i1);
-echo both $if $equ $sqlstate 23000 "PASSED" "***FAILED";
-echo both " IRI_ID IRI_ID unq\n";
+ECHO BOTH $IF $EQU $SQLSTATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": IRI_ID IRI_ID unq\n";
insert into at values (#i1);
-echo both $if $equ $sqlstate 23000 "PASSED" "***FAILED";
-echo both " any IRI_ID unq\n";
+ECHO BOTH $IF $EQU $SQLSTATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": any IRI_ID unq\n";
select iri_id_num (max (i)) from it;
-echo both $if $equ $last[1] 4000003000 "PASSED" "***FAILED";
-echo both " IRI_ID max\n";
+ECHO BOTH $IF $EQU $LAST[1] 4000003000 "PASSED" "***FAILED";
+ECHO BOTH ": IRI_ID max\n";
select iri_id_num (max (i)) from at;
-echo both $if $equ $last[1] -3 "PASSED" "***FAILED";
-echo both " any IRI_ID max\n";
+ECHO BOTH $IF $EQU $LAST[1] -3 "PASSED" "***FAILED";
+ECHO BOTH ": any IRI_ID max\n";
select count (distinct i) from it;
select * from it a, it b table option (hash) where a.i = b.i option (order);
-echo both $if $equ $rowcnt 5 "PASSED" "***FAILED";
-echo both " IRI_ID hash join\n";
+ECHO BOTH $IF $EQU $ROWCNT 5 "PASSED" "***FAILED";
+ECHO BOTH ": IRI_ID hash join\n";
select * from at a, at b table option (hash) where a.i = b.i option (order);
-echo both $if $equ $rowcnt 5 "PASSED" "***FAILED";
-echo both " any IRI_ID hash join\n";
+ECHO BOTH $IF $EQU $ROWCNT 5 "PASSED" "***FAILED";
+ECHO BOTH ": any IRI_ID hash join\n";
@@ -79,8 +79,8 @@ echo both " any IRI_ID hash join\n";
select * from it order by iri_id_num (i);
select * from it a, it b table option (loop) where a.i = b.i option (order);
-echo both $if $equ $rowcnt 5 "PASSED" "***FAILED";
-echo both " IRI_ID loop join\n";
+ECHO BOTH $IF $EQU $ROWCNT 5 "PASSED" "***FAILED";
+ECHO BOTH ": IRI_ID loop join\n";
create table it2 (ik IRI_ID, id IRI_ID, primary key (ik));
@@ -88,11 +88,9 @@ insert into it2 select i, i from it;
insert into it2 select iri_id_from_num (iri_id_num (i) + 10), i from it;
select id, count (*) from it2 group by id;
-echo both $if $equ $rowcnt 5 "PASSED" "***FAILED";
-echo both " IRI_ID group by\n";
+ECHO BOTH $IF $EQU $ROWCNT 5 "PASSED" "***FAILED";
+ECHO BOTH ": IRI_ID group by\n";
select * from it2 order by id desc;
-echo both $if $equ $last[1] #i11 "PASSED" "**FAILED";
-echo both " IRI_ID order by\n";
-
-
+ECHO BOTH $IF $EQU $LAST[1] #i11 "PASSED" "**FAILED";
+ECHO BOTH ": IRI_ID order by\n";
diff --git a/binsrc/tests/suite/tiso.sql b/binsrc/tests/suite/tiso.sql
index 6b48f52..77e62e9 100644
--- a/binsrc/tests/suite/tiso.sql
+++ b/binsrc/tests/suite/tiso.sql
@@ -1,10 +1,10 @@
--
--- $Id: tiso.sql,v 1.2.2.1 2009/04/16 12:37:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -22,7 +22,7 @@
--
-echo both "Transaction Isolation Tests\n";
+ECHO BOTH "Transaction Isolation Tests\n";
drop table rc_test;
create table rc_test (id int not null primary key, ctr int default 1, d varchar)
@@ -274,7 +274,7 @@ rct_u (10000, 1000) &
wait_for_children;
-echo both "Done rct_u\n";
+ECHO BOTH "Done rct_u\n";
rct_s (10000, 1000) &
@@ -282,14 +282,14 @@ rct_s (10000, 1000) &
rct_s (10000, 1000) &
rct_s (10000, 1000) &
wait_for_children;
-echo both "Done rct_s\n";
+ECHO BOTH "Done rct_s\n";
rct_su (10000, 1000) &
rct_su (10000, 1000) &
rct_su (10000, 1000) &
rct_su (10000, 1000) &
wait_for_children;
-echo both "Done rct_su\n";
+ECHO BOTH "Done rct_su\n";
rct_su (10000, 2) &
@@ -297,7 +297,7 @@ rct_su (10000, 2) &
rct_su (10000, 2) &
rct_su (10000, 2) &
wait_for_children;
-echo both "Done rct_u 2\n";
+ECHO BOTH "Done rct_u 2\n";
@@ -307,7 +307,7 @@ rct_r (10000, 1000) &
rct_r (10000, 1000) &
rct_r (10000, 1000) &
wait_for_children;
-echo both "Done rct_r\n";
+ECHO BOTH "Done rct_r\n";
rct_c (10000, 1000) &
@@ -315,7 +315,7 @@ rct_c (10000, 1000) &
rct_c (10000, 1000) &
rct_c (10000, 1000) &
wait_for_children;
-echo both "Done rct_c\n";
+ECHO BOTH "Done rct_c\n";
@@ -325,7 +325,7 @@ rct_s_ne (10000, 1000) &
rct_s_ne (10000, 1000) &
wait_for_children;
-echo both "Done rct_ne\n";
+ECHO BOTH "Done rct_ne\n";
@@ -334,7 +334,7 @@ rct_r (10000, 100) &
rct_r (10000, 100) &
rct_r (10000, 100) &
wait_for_children;
-echo both "Done rct_r 2\n";
+ECHO BOTH "Done rct_r 2\n";
diff --git a/binsrc/tests/suite/tjdbc.sh b/binsrc/tests/suite/tjdbc.sh
index 6a1dd93..a19ffc8 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# JDBC tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tjoin.sql b/binsrc/tests/suite/tjoin.sql
index 71db318..4187d44 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.3 2011/03/25 15:10:16 source Exp $
+-- $Id$
--
-- Outer Join tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -64,10 +64,10 @@ select a.row_no, b.row_no, c.row_no from t1 a left join (t1 b join t1 c on c.row
select a.row_no, b.row_no, c.row_no from t1 a left join (t1 b left join t1 c on c.row_no = b.row_no + 5) on b.row_no = a.row_no + 5;
select count (a.row_no), count (b.row_no), count (c.row_no) from t1 a left join (t1 b join t1 c on c.row_no = b.row_no + 5) on b.row_no = a.row_no + 5;
-echo both $if $equ $last[1] 20 "PASSED" "***FAILED";
-echo both ": a left (b join c)\n";
-echo both $if $equ $last[2] 10 "PASSED" "***FAILED";
-echo both ": a left (b join c) 2\n";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": a left (b join c)\n";
+ECHO BOTH $IF $EQU $LAST[2] 10 "PASSED" "***FAILED";
+ECHO BOTH ": a left (b join c) 2\n";
--
@@ -527,8 +527,8 @@ ECHO BOTH ": null in blob hash temp col : " $ROWCNT " rows\n";
update t1 set fi2 = row_no;
select case when b.fi2 in (100,110,111) then 1 else 0 end from t1 a, t1 b where case when b.fi2 in (100,110,111) then 1 else 0 end = 1 and a.row_no = b.row_no option (hash, order);
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": cond exp shared between filter of hash filler and result set\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": cond exp shared between filter of hash filler and result set\n";
explain ('sparql define input:storage ""
PREFIX conversion: <http://purl.org/twc/vocab/conversion/>
@@ -692,4 +692,3 @@ OPTIONAL
ECHO BOTH $IF $EQU $LAST[2] descriminator "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": bug 14207-6 keep all optionals LAST=" $LAST[2] "\n";
-
diff --git a/binsrc/tests/suite/tjoin2.sql b/binsrc/tests/suite/tjoin2.sql
index 1f4e413..e2f8758 100644
--- a/binsrc/tests/suite/tjoin2.sql
+++ b/binsrc/tests/suite/tjoin2.sql
@@ -2,49 +2,47 @@
-- test all combinations of inlined dt's in froms and in join exps
-echo both "Different dt inlining in join exps tjoin2.sql\n";
+ECHO BOTH "Different dt inlining in join exps tjoin2.sql\n";
select count (*) from (select row_no as s from t1) f;
select count (*) from (select a.row_no + b.row_no as s from t1 a, t1 b where b.row_no = a.row_no + 1) f;
select count (*) from (select b.row_no from t1 a, t1 b where b.row_no = a.row_no + 1) f inner join t1 c on c.row_no = f.row_no + 1;
-echo both $if $equ $last[1] 18 "PASSED" "***FAILED";
-echo both ": dt inline inner 1 \n";
+ECHO BOTH $IF $EQU $LAST[1] 18 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline inner 1 \n";
select count (*) from (select b.row_no from t1 a join t1 b on b.row_no = a.row_no + 1) f inner join t1 c on c.row_no = f.row_no + 1;
-echo both $if $equ $last[1] 18 "PASSED" "***FAILED";
-echo both ": dt inline inner 2 \n";
+ECHO BOTH $IF $EQU $LAST[1] 18 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline inner 2 \n";
select count (*) from (select b.row_no from t1 a left join t1 b on b.row_no = a.row_no + 1) f left join t1 c on c.row_no = f.row_no + 1;
-echo both $if $equ $last[1] 20 "PASSED" "***FAILED";
-echo both ": dt inline outer 1\n";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline outer 1\n";
select count (*) from (select b.row_no from t1 a left join t1 b on b.row_no = a.row_no + 1) f left join (select c.row_no from t1 c) g on g.row_no = f.row_no + 1;
-echo both $if $equ $last[1] 20 "PASSED" "***FAILED";
-echo both ": dt inline outer single\n";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline outer single\n";
select count (f.r1), count (f.r2), count (g.r1), count (g.r2) from (select a.row_no as r1, b.row_no as r2 from t1 a left join t1 b on b.row_no = a.row_no + 1) f left join (select c.row_no as r1, d.row_no as r2 from t1 c join t1 d on d.row_no = c.row_no + 1) g on g.r1 = f.r2 + 1;
-echo both $if $equ $last[1] 20 "PASSED" "***FAILED";
-echo both ": dt inline outer dt 1\n";
-echo both $if $equ $last[4] 17 "PASSED" "***FAILED";
-echo both ": dt inline outer dt2\n";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline outer dt 1\n";
+ECHO BOTH $IF $EQU $LAST[4] 17 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline outer dt2\n";
select count (f.r1), count (f.r2), count (g.r1), count (g.r2) from (select a.row_no as r1, b.row_no as r2 from t1 a left join t1 b on b.row_no = a.row_no + 1) f left join (select * from (select c.row_no as r1, d.row_no as r2 from t1 c join t1 d on d.row_no = c.row_no + 1) gp) g on g.r1 = f.r2 + 1;
-echo both $if $equ $last[1] 20 "PASSED" "***FAILED";
-echo both ": dt inline outer dbl dt 1\n";
-echo both $if $equ $last[4] 17 "PASSED" "***FAILED";
-echo both ": dt inline outer dbl dt2\n";
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline outer dbl dt 1\n";
+ECHO BOTH $IF $EQU $LAST[4] 17 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline outer dbl dt2\n";
select count (f.r1), count (f.r2), count (c.row_no), count (d.row_no) from (select a.row_no as r1, b.row_no as r2 from t1 a left join t1 b on b.row_no = a.row_no + 1) f left join (t1 c join t1 d on d.row_no = c.row_no + 1) on c.row_no = f.r2 + 1;
-echo both $if $equ $last[1] 20 "PASSED" "***FAILED";
-echo both ": dt inline outer outer join exp 1\n";
-echo both $if $equ $last[4] 17 "PASSED" "***FAILED";
-echo both ": dt inline outer join exp 2\n";
-
-
+ECHO BOTH $IF $EQU $LAST[1] 20 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline outer outer join exp 1\n";
+ECHO BOTH $IF $EQU $LAST[4] 17 "PASSED" "***FAILED";
+ECHO BOTH ": dt inline outer join exp 2\n";
diff --git a/binsrc/tests/suite/tkwd.sql b/binsrc/tests/suite/tkwd.sql
index 4691fd4..c404d9d 100644
--- a/binsrc/tests/suite/tkwd.sql
+++ b/binsrc/tests/suite/tkwd.sql
@@ -1,10 +1,10 @@
--
--- $Id: tkwd.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tldap.sql b/binsrc/tests/suite/tldap.sql
index 2ef7bb9..20d411a 100644
--- a/binsrc/tests/suite/tldap.sql
+++ b/binsrc/tests/suite/tldap.sql
@@ -1,10 +1,10 @@
--
--- $Id: tldap.sql,v 1.4.2.1 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tlock.sql b/binsrc/tests/suite/tlock.sql
index 0c75ea3..822a373 100644
--- a/binsrc/tests/suite/tlock.sql
+++ b/binsrc/tests/suite/tlock.sql
@@ -1,10 +1,10 @@
--
--- $Id: tlock.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -46,7 +46,7 @@ wait_for_children;
set DEADLOCK_RETRIES = 0;
select count (*), count (distinct CTR)from LOCK_TT;
-#echo both $if $equ $last[1] 90000 "PASSED" "***FAILED";
-#$echo both ": Inserted " $last[1] " rows\n";
-#echo both $if $equ $last[2] 50000 "PASSED" "***FAILED";
-#echo both ": Inserted " $last[2] " distinct CTR values\n";
+#ECHO BOTH $IF $EQU $LAST[1] 90000 "PASSED" "***FAILED";
+#$ECHO BOTH ": Inserted " $LAST[1] " rows\n";
+#ECHO BOTH $IF $EQU $LAST[2] 50000 "PASSED" "***FAILED";
+#ECHO BOTH ": Inserted " $LAST[2] " distinct CTR values\n";
diff --git a/binsrc/tests/suite/tlogft1.sql b/binsrc/tests/suite/tlogft1.sql
index 9c14034..d002247 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Test freetext interaction with transaction log #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tlogft2.sql b/binsrc/tests/suite/tlogft2.sql
index 7fdd9b3..d2746f2 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Test freetext interaction with transaction log #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tmulgrp.sql b/binsrc/tests/suite/tmulgrp.sql
index 644b73c..2b761e7 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Check multiple user group functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tmulgrp1.sql b/binsrc/tests/suite/tmulgrp1.sql
index 09fafce..c2ea2eb 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Check multiple user group functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tmulgrp2.sql b/binsrc/tests/suite/tmulgrp2.sql
index 1c20a92..b308c65 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Check multiple user group functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tnull.sql b/binsrc/tests/suite/tnull.sql
index 94db659..5c2aa17 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test NULL handling
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -25,7 +25,7 @@
--
--
-echo both "schema integrity \n";
+ECHO BOTH "schema integrity \n";
select * from sys_key_parts;
select * from sys_cols;
@@ -49,100 +49,100 @@ insert into nt values (5, null);
-- create index n on nt (a);
select count (*) from nt;
-echo both $if $equ $last[1] 6 "PASSED" "***FAILED";
-echo both ": " $last[1] " in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " in nt\n";
select count (*) from nt where a < 2;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": " $last[1] " < 2 in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " < 2 in nt\n";
select count (*) from nt where a > 2;
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both ": " $last[1] " > 2 in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " > 2 in nt\n";
select count (*) from nt where a = null;
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": " $last[1] " a = null in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " a = null in nt\n";
select count (*) from nt where b = null;
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": " $last[1] " b = null in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " b = null in nt\n";
select count (*) from nt where a is null;
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both ": " $last[1] " a is null in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " a is null in nt\n";
select max (a) from nt;
-echo both $if $equ $last[1] 5 "PASSED" "***FAILED";
-echo both ": " $last[1] " max a in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 5 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " max a in nt\n";
select min (a) from nt;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": " $last[1] " min a in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " min a in nt\n";
select count (*) from nt where not (a = null);
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": " $last[1] " not a = null in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " not a = null in nt\n";
select count (*) from nt where a = 2 or a = null;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": " $last[1] " a = null or xx in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " a = null or xx in nt\n";
select count (*) from nt where not (a = 2 or a = null);
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": " $last[1] " not (xx or a = null) in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " not (xx or a = null) in nt\n";
select count (*) from nt where a = 2 and a <> null;
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": " $last[1] " a = null and xx in nt\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " a = null and xx in nt\n";
select count (*) from nt;
-echo both $if $equ $last[1] 6 "PASSED" "***FAILED";
-echo both ": " $last[1] " count (*)\n";
+ECHO BOTH $IF $EQU $LAST[1] 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " count (*)\n";
select count (a) from nt;
-echo both $if $equ $last[1] 4 "PASSED" "***FAILED";
-echo both ": " $last[1] " count (a)\n";
+ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " count (a)\n";
select count (distinct a) from nt;
-echo both $if $equ $last[1] 4 "PASSED" "***FAILED";
-echo both ": " $last[1] " count (a)\n";
+ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " count (a)\n";
select count (*) from (select distinct a from nt) f;
-echo both $if $equ $last[1] 5 "PASSED" "***FAILED";
-echo both ": " $last[1] " count (*) of distinct derived table\n";
+ECHO BOTH $IF $EQU $LAST[1] 5 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " count (*) of distinct derived table\n";
select min (a), max (a), count (a), '--' from nt group by 4;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": " $last[1] " min in group \n";
-echo both $if $equ $last[2] 5 "PASSED" "***FAILED";
-echo both ": " $last[1] " max in group \n";
-echo both $if $equ $last[3] 4 "PASSED" "***FAILED";
-echo both ": " $last[1] " count in group \n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " min in group \n";
+ECHO BOTH $IF $EQU $LAST[2] 5 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " max in group \n";
+ECHO BOTH $IF $EQU $LAST[3] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " count in group \n";
select a + 1 from nt;
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": " $rowcnt " count (*) of distinct derived table\n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " count (*) of distinct derived table\n";
select sum (a) from nt;
select avg (a) from nt;
-echo both $if $equ $last[1] 2 "PASSED" "***FAILED";
-echo both ": " $last[1] " avg (a)\n";
+ECHO BOTH $IF $EQU $LAST[1] 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " avg (a)\n";
select avg (coalesce (a, 0)) from nt;
-echo both $if $equ $last[1] 1 "PASSED" "***FAILED";
-echo both ": " $last[1] " avg (coalesce (a, 0))\n";
+ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " avg (coalesce (a, 0))\n";
select avg (cast (a as numeric)), '--' from nt group by 2;
-echo both $if $equ $last[1] 2.75 "PASSED" "***FAILED";
-echo both ": " $last[1] " avg ( a) group by const)\n";
+ECHO BOTH $IF $EQU $LAST[1] 2.75 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " avg ( a) group by const)\n";
select sum (cast (a as numeric)) / count (a), '--' from nt group by 2;
-echo both $if $equ $last[1] 2.75 "PASSED" "***FAILED";
-echo both ": " $last[1] " sum/count ( a) group by const)\n";
+ECHO BOTH $IF $EQU $LAST[1] 2.75 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " sum/count ( a) group by const)\n";
-- raw_exit ();
diff --git a/binsrc/tests/suite/tnum.sql b/binsrc/tests/suite/tnum.sql
index cde0124..da77078 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Number tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tnumr.sql b/binsrc/tests/suite/tnumr.sql
index 815e999..49aafa4 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.1 2010/01/25 23:28:52 source Exp $
+-- $Id$
--
-- Number tests
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tnumt.sql b/binsrc/tests/suite/tnumt.sql
index 74b0110..df64e54 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Number tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tnwords.sql b/binsrc/tests/suite/tnwords.sql
index c940b69..46b1cfb 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 2007/05/04 13:02:28 source Exp $
+-- $Id$
--
-- Word tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tnwords_create.sql b/binsrc/tests/suite/tnwords_create.sql
index 6f37ece..48735f3 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Creates the tables for Word tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tnwords_remote.sql b/binsrc/tests/suite/tnwords_remote.sql
index 587a1b1..8a9d093 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tobject.sql b/binsrc/tests/suite/tobject.sql
index e856213..2e50c7b 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Object feature tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/toutdsk.sql b/binsrc/tests/suite/toutdsk.sql
index 6f609e7..eea0190 100644
--- a/binsrc/tests/suite/toutdsk.sql
+++ b/binsrc/tests/suite/toutdsk.sql
@@ -1,10 +1,10 @@
--
--- $Id: toutdsk.sql,v 1.3.2.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/toutdskck.sql b/binsrc/tests/suite/toutdskck.sql
index 2b695d2..9685e22 100644
--- a/binsrc/tests/suite/toutdskck.sql
+++ b/binsrc/tests/suite/toutdskck.sql
@@ -1,10 +1,10 @@
--
--- $Id: toutdskck.sql,v 1.4.2.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tp.sh b/binsrc/tests/suite/tp.sh
index f8dc6e7..5167488 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tpc-d/LOAD.sh b/binsrc/tests/suite/tpc-d/LOAD.sh
index 05b08fe..89a78e4 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.2 2009/04/20 21:19:39 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -426,6 +426,6 @@ in
;;
z*)
- LOG "usage $0 (tables | indexes | procedures | cleanprocedures | cleantables | cleandata | load | attach )"
+ LOG "usage $0 database username password (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 f06ede6..435d093 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-2008 OpenLink Software
+# 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
@@ -26,8 +26,8 @@ TESTS_ENVIRONMENT=PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" \
PORT=$(PORT) HOME="$(TOP)" JDK2="$(JDK2)" JDK3="$(JDK3)" HOST=localhost SERVER=virtuoso-t
clean-local:
- $(RM) -f tpcd.db tpcd.log tpcd.pxa tpcd.trx tpcd.tdb
- $(RM) -f tpcd.output tpcd.ini
+ rm -f tpcd.db tpcd.log tpcd.pxa tpcd.trx tpcd.tdb
+ rm -f tpcd.output tpcd.ini
# ----------------------------------------------------------------------
#
diff --git a/binsrc/tests/suite/tpc-d/Makefile.in b/binsrc/tests/suite/tpc-d/Makefile.in
index 03484e6..332836b 100644
--- a/binsrc/tests/suite/tpc-d/Makefile.in
+++ b/binsrc/tests/suite/tpc-d/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2008 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,11 +67,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -162,7 +157,6 @@ 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@
@@ -246,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -267,7 +260,6 @@ 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@
@@ -298,14 +290,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/suite/tpc-d/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/suite/tpc-d/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/suite/tpc-d/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/suite/tpc-d/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -323,7 +315,6 @@ $(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
@@ -338,10 +329,9 @@ CTAGS:
check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
- $(am__tty_colors); \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
@@ -350,63 +340,49 @@ check-TESTS: $(TESTS)
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
+ echo "XPASS: $$tst"; \
;; \
*) \
- col=$$grn; res=PASS; \
+ echo "PASS: $$tst"; \
;; \
esac; \
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
+ *$$ws$$tst$$ws*) \
xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
*) \
failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
+ echo "FAIL: $$tst"; \
;; \
esac; \
else \
skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
+ echo "SKIP: $$tst"; \
fi; \
- echo "$${col}$$res$${std}: $$tst"; \
done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
- fi; \
if test "$$failed" -eq 0; then \
if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
+ banner="All $$all tests passed"; \
else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
fi; \
else \
if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
+ banner="$$failed of $$all tests failed"; \
else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
fi; \
fi; \
dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
- else \
- skipped="($$skip tests were not run)"; \
- fi; \
+ skipped="($$skip tests were not run)"; \
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -417,15 +393,11 @@ check-TESTS: $(TESTS)
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
- else \
- echo "$$red$$dashes"; \
- fi; \
+ echo "$$dashes"; \
echo "$$banner"; \
test -z "$$skipped" || echo "$$skipped"; \
test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$$dashes"; \
test "$$failed" -eq 0; \
else :; fi
@@ -445,17 +417,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -484,7 +452,6 @@ clean-generic:
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"
@@ -503,8 +470,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -513,28 +478,18 @@ install-data-am:
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
@@ -555,7 +510,7 @@ ps-am:
uninstall-am:
-.MAKE: check-am install-am install-strip
+.MAKE: install-am install-strip
.PHONY: all all-am check check-TESTS check-am clean clean-generic \
clean-libtool clean-local distclean distclean-generic \
@@ -571,9 +526,8 @@ uninstall-am:
clean-local:
- $(RM) -f tpcd.db tpcd.log tpcd.pxa tpcd.trx tpcd.tdb
- $(RM) -f tpcd.output tpcd.ini
-
+ rm -f tpcd.db tpcd.log tpcd.pxa tpcd.trx tpcd.tdb
+ rm -f tpcd.output tpcd.ini
# 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/tests/suite/tpc-d/Q.sql b/binsrc/tests/suite/tpc-d/Q.sql
index f481b88..de74f4a 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q1.sql b/binsrc/tests/suite/tpc-d/Q1.sql
index dc36bd2..3f03b30 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q10.sql b/binsrc/tests/suite/tpc-d/Q10.sql
index 43b9e63..33e27a8 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q11.sql b/binsrc/tests/suite/tpc-d/Q11.sql
index 7c98939..6b516d8 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q12.sql b/binsrc/tests/suite/tpc-d/Q12.sql
index b9f9b12..5f9ba00 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q13.sql b/binsrc/tests/suite/tpc-d/Q13.sql
index b814c2f..522b8be 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q14.sql b/binsrc/tests/suite/tpc-d/Q14.sql
index 2558047..3d324f3 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q15.sql b/binsrc/tests/suite/tpc-d/Q15.sql
index a9c0065..1dc3153 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q16.sql b/binsrc/tests/suite/tpc-d/Q16.sql
index aada77c..ae940b8 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q17.sql b/binsrc/tests/suite/tpc-d/Q17.sql
index 23f5805..f14447c 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q18.sql b/binsrc/tests/suite/tpc-d/Q18.sql
index 2e81685..b434099 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.1 2009/07/09 13:04:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q19.sql b/binsrc/tests/suite/tpc-d/Q19.sql
index d27e5de..3b2e6ce 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q2.sql b/binsrc/tests/suite/tpc-d/Q2.sql
index ba65f33..1181a99 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q20.sql b/binsrc/tests/suite/tpc-d/Q20.sql
index 74e2298..5cd3d74 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q21.sql b/binsrc/tests/suite/tpc-d/Q21.sql
index 187bb01..9713cff 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q22.sql b/binsrc/tests/suite/tpc-d/Q22.sql
index c5dd3bb..ba7e91c 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q3.sql b/binsrc/tests/suite/tpc-d/Q3.sql
index d63b979..41ea702 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q4.sql b/binsrc/tests/suite/tpc-d/Q4.sql
index a3a82ca..b3da072 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q5.sql b/binsrc/tests/suite/tpc-d/Q5.sql
index 03cc6ed..92b779f 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q6.sql b/binsrc/tests/suite/tpc-d/Q6.sql
index 5727519..cc80406 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q7.sql b/binsrc/tests/suite/tpc-d/Q7.sql
index f8d4eab..b12d136 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q8.sql b/binsrc/tests/suite/tpc-d/Q8.sql
index cc7babe..45887bc 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q9.sql b/binsrc/tests/suite/tpc-d/Q9.sql
index 4d79827..ced4bfc 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS1.sql b/binsrc/tests/suite/tpc-d/QS1.sql
index b6c5efa..1575522 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS10.sql b/binsrc/tests/suite/tpc-d/QS10.sql
index fd4942c..8c25f4b 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS11.sql b/binsrc/tests/suite/tpc-d/QS11.sql
index 2f7ea0f..96b50a8 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS12.sql b/binsrc/tests/suite/tpc-d/QS12.sql
index c30343a..c85d2ad 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS13.sql b/binsrc/tests/suite/tpc-d/QS13.sql
index 5d04509..59caa9b 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS14.sql b/binsrc/tests/suite/tpc-d/QS14.sql
index bf90ca1..eb3d936 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS15.sql b/binsrc/tests/suite/tpc-d/QS15.sql
index 85030dd..a949330 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS17.sql b/binsrc/tests/suite/tpc-d/QS17.sql
index 7ac0cbd..10dbf5d 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS18.sql b/binsrc/tests/suite/tpc-d/QS18.sql
index 4ae612a..78205e3 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS18o.sql b/binsrc/tests/suite/tpc-d/QS18o.sql
index 2f81037..376d981 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS2.sql b/binsrc/tests/suite/tpc-d/QS2.sql
index ddd9ec4..d404609 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS20.sql b/binsrc/tests/suite/tpc-d/QS20.sql
index 3506caa..a480594 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS21.sql b/binsrc/tests/suite/tpc-d/QS21.sql
index 72caca3..55eeba3 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS22.sql b/binsrc/tests/suite/tpc-d/QS22.sql
index 7cf2dce..47f2000 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS3.sql b/binsrc/tests/suite/tpc-d/QS3.sql
index 2b01e3c..befbdde 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS4.sql b/binsrc/tests/suite/tpc-d/QS4.sql
index 2a27fb3..71fca54 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS5.sql b/binsrc/tests/suite/tpc-d/QS5.sql
index a351b4f..9457f38 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS6.sql b/binsrc/tests/suite/tpc-d/QS6.sql
index b6fbc80..cc80406 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS7.sql b/binsrc/tests/suite/tpc-d/QS7.sql
index 0b636e4..00ba2e1 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS8.sql b/binsrc/tests/suite/tpc-d/QS8.sql
index 86681af..c738c2d 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/QS9.sql b/binsrc/tests/suite/tpc-d/QS9.sql
index f0cb646..ffc11c9 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q_dt.sql b/binsrc/tests/suite/tpc-d/Q_dt.sql
index af18b64..0a7862e 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q_mysql.sql b/binsrc/tests/suite/tpc-d/Q_mysql.sql
index 10e0465..8b7a38c 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.2 2009/04/16 20:15:22 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q_ora.sql b/binsrc/tests/suite/tpc-d/Q_ora.sql
index 0a4a556..737b391 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 2007/03/28 11:47:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q_sparql_map.sql b/binsrc/tests/suite/tpc-d/Q_sparql_map.sql
index 1b2b37d..dddad01 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.2 2009/04/16 20:15:22 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 2e0db14..2e9170a 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.5 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4962862..f1a7446 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 2008/06/17 07:55:21 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 535ba4e..57eeeb7 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.1 2009/07/09 13:04:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 0c43083..126b16c 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.2 2009/07/09 13:04:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/Q_virt.sql b/binsrc/tests/suite/tpc-d/Q_virt.sql
index 2fe2eb3..51f715a 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.1 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/all_ms.sql b/binsrc/tests/suite/tpc-d/all_ms.sql
index 3590c37..ecf248d 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/attach_tpcd.sql b/binsrc/tests/suite/tpc-d/attach_tpcd.sql
index faed3d0..bf24420 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- TPC-D Benchmark
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql b/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql
index f5a0306..7af50e7 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- TPC-D Benchmark
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/create_indexes.sql b/binsrc/tests/suite/tpc-d/create_indexes.sql
index 297ae6b..aad9283 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/create_procedures.sql b/binsrc/tests/suite/tpc-d/create_procedures.sql
index 70c574b..3851aff 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.1 2009/09/17 14:47:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/create_tables.sql b/binsrc/tests/suite/tpc-d/create_tables.sql
index 72d87bb..1477de1 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/deattach_tpcd.sql b/binsrc/tests/suite/tpc-d/deattach_tpcd.sql
index 205fc57..5923fcd 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- TPC-D Benchmark
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/load_query.sql b/binsrc/tests/suite/tpc-d/load_query.sql
index 9e476c7..be060a1 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.1 2009/04/16 20:15:22 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/msaccess.sql b/binsrc/tests/suite/tpc-d/msaccess.sql
index 9eaf337..f865cb6 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/mssql.sql b/binsrc/tests/suite/tpc-d/mssql.sql
index dcfcfc0..b5ad5a7 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/ora.sql b/binsrc/tests/suite/tpc-d/ora.sql
index 40c40d3..a4c4f31 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/q31.sql b/binsrc/tests/suite/tpc-d/q31.sql
index 189b4e4..38803ae 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/q32.sql b/binsrc/tests/suite/tpc-d/q32.sql
index d81a820..948e026 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/q33.sql b/binsrc/tests/suite/tpc-d/q33.sql
index ce4b60c..38803ae 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/q34.sql b/binsrc/tests/suite/tpc-d/q34.sql
index 077b859..435cda2 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/res.sh b/binsrc/tests/suite/tpc-d/res.sh
index 3b3b2d6..7fe83a1 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.1 2009/09/17 14:47:09 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tpc-d/runtests.sh b/binsrc/tests/suite/tpc-d/runtests.sh
index 7a47259..95243ff 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tpc-d/stat-tpcd.sql b/binsrc/tests/suite/tpc-d/stat-tpcd.sql
index accd73f..9231cb5 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/test_ms.sql b/binsrc/tests/suite/tpc-d/test_ms.sql
index 54d971f..7b1202a 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/test_tbl.sql b/binsrc/tests/suite/tpc-d/test_tbl.sql
index afb0085..cbc5a75 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 2008/03/05 16:05:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpc-d/tpcd.sh b/binsrc/tests/suite/tpc-d/tpcd.sh
index 95e4143..8cde046 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.2 2009/04/16 20:15:22 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tpcc_update.sql b/binsrc/tests/suite/tpcc_update.sql
index 5339e30..14d3d97 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -147,8 +147,3 @@ ECHO BOTH " CHECKPOINT STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
backup_online ('tpcc_k_#', 5000);
ECHO BOTH $IF $EQU $STATE "OK" "PASSED" "***FAILED";
ECHO BOTH " BACKUP ONLINE STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-
-
-
-
-
diff --git a/binsrc/tests/suite/tpcc_update1.sql b/binsrc/tests/suite/tpcc_update1.sql
index 449d0d0..58b1f27 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpcc_update2.sql b/binsrc/tests/suite/tpcc_update2.sql
index 9130497..ae48b2e 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpcd.sh b/binsrc/tests/suite/tpcd.sh
index 4ac3c1b..65d7c26 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.4 2009/09/17 14:47:09 source Exp $
+# $Id$
#
# TPC-D tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tping.sql b/binsrc/tests/suite/tping.sql
index ef273ca..8e204d3 100644
--- a/binsrc/tests/suite/tping.sql
+++ b/binsrc/tests/suite/tping.sql
@@ -18,4 +18,3 @@ create procedure ust1 (in n int, in len int := 10000)
for (ctr := 0; ctr < n; ctr := ctr + 1)
update t1 set fs4 = str, fi2 = fi2 + 1 where row_no = 100000;
}
-
diff --git a/binsrc/tests/suite/tpkopt.sql b/binsrc/tests/suite/tpkopt.sql
index 42102c7..335db61 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Test primary keys
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -34,12 +34,12 @@ create unique index prime on idt (k1, k2, k3);
create unique index unq2 on idt (k2, k1);
columns IDT;
-echo both $if $equ $rowcnt 4 "PASSED" "***FAILED";
-echo both ": column count of idt\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": column count of idt\n";
statistics IDT;
-echo both $if $equ $rowcnt 10 "PASSED" "***FAILED";
-echo both ": column count of idt\n";
+ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+ECHO BOTH ": column count of idt\n";
-- select key_id, key_name, kp_nth, column from sys_keys, sys_key_parts, sys_cols where key_table = 'DB.DBA.IDT' and kp_key_id = key_id and col_id = kp_col;
@@ -47,16 +47,16 @@ echo both ": column count of idt\n";
insert into idt (k1, k2, k3, d) values (1, 2, 3, 'd1');
insert into idt (k1, k2, k3, d) values (1, 2, 3, 'e1');
-echo both $if $equ $state 23000 "PASSED" "***FAILED";
-echo both ": non unq prime key state " $state "\n";
+ECHO BOTH $IF $EQU $STATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": non unq prime key state " $STATE "\n";
insert into idt (k1, k2, k3, d) values (1, 2, 3, 'd1');
-echo both $if $equ $state 23000 "PASSED" "***FAILED";
-echo both ": non unq prime key state " $state "\n";
+ECHO BOTH $IF $EQU $STATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": non unq prime key state " $STATE "\n";
insert into idt (k1, k2, k3, d) values (1, 2, 4, 'd1');
-echo both $if $equ $state 23000 "PASSED" "***FAILED";
-echo both ": non unq unique key state " $state "\n";
+ECHO BOTH $IF $EQU $STATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": non unq unique key state " $STATE "\n";
insert into idt (k1, k2, k3, d) values (1, 3, 3, 'd1');
@@ -65,35 +65,35 @@ insert into idt (k1, k2, k3, d) values (1, 4, 3, 'd1');
insert into idt (k1, k2, k3, d) values (4, 2, 3, 'd1');
select count (*) from idt order by k3;
-echo both $if $equ $last[1] 4 "PASSED" "***FAILED";
-echo both ": " $last[1] " rows in idt\n";
+ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in idt\n";
select count (*) from idt order by k2, k1;
-echo both $if $equ $last[1] 4 "PASSED" "***FAILED";
-echo both ": " $last[1] " rows in idt\n";
+ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in idt\n";
select count (*) from idt order by d desc;
-echo both $if $equ $last[1] 4 "PASSED" "***FAILED";
-echo both ": " $last[1] " rows in idt\n";
+ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in idt\n";
select count (*) from idt;
-echo both $if $equ $last[1] 4 "PASSED" "***FAILED";
-echo both ": " $last[1] " rows in idt\n";
+ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in idt\n";
delete from idt;
select count (*) from idt;
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both ": " $last[1] " rows in idt\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " rows in idt\n";
insert into idt (k1, k2, k3, d) values (1, 2, 3, 'd1');
insert into idt (k1, k2, k3, d) values (1, 2, 3, 'e1');
-echo both $if $equ $state 23000 "PASSED" "***FAILED";
-echo both ": non unq prime key state " $state "\n";
+ECHO BOTH $IF $EQU $STATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": non unq prime key state " $STATE "\n";
insert into idt (k1, k2, k3, d) values (1, 2, 3, 'd1');
-echo both $if $equ $state 23000 "PASSED" "***FAILED";
-echo both ": non unq prime key state " $state "\n";
+ECHO BOTH $IF $EQU $STATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": non unq prime key state " $STATE "\n";
insert into idt (k1, k2, k3, d) values (1, 2, 4, 'd1');
insert into idt (k1, k2, k3, d) values (1, 3, 3, 'd1');
@@ -103,23 +103,23 @@ insert into idt (k1, k2, k3, d) values (4, 2, 3, 'd1');
-- XXX: was 23000 error check, but cluster gives another error
create unique index d on idt (d);
-echo both $if $neq $state OK "PASSED" "***FAILED";
-echo both ": make unique index on non unique column, state " $state "\n";
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": make unique index on non unique column, state " $STATE "\n";
select * from idt order by d;
-echo both $if $equ $rowcnt 4 "PASSED" "***FAILED";
-echo both ": " $rowcnt " rows in idt\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in idt\n";
update idt set d = sprintf ('%d-%d-%d', k1, k2, k3);
create unique index d on idt (d);
select * from idt order by d;
-echo both $if $equ $rowcnt 4 "PASSED" "***FAILED";
-echo both ": " $rowcnt " rows in idt\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " rows in idt\n";
update idt set d = '11';
-echo both $if $equ $state 23000 "PASSED" "***FAILED";
-echo both ": update unique column to non-unique " $state "\n";
+ECHO BOTH $IF $EQU $STATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": update unique column to non-unique " $STATE "\n";
drop table idt2;
@@ -134,16 +134,16 @@ update idt set d = concat (d, '-');delete from idt;
alter table IDT modify primary key (K1, K2);
primarykeys IDT;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": " $rowcnt " pk parts after alter pk.\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " pk parts after alter pk.\n";
alter table IDT modify primary key (K1);
-echo both $if $equ $state 23000 "PASSED" "***FAILED";
-echo both ": state " $state " attempt to alter to non unique pk.\n";
+ECHO BOTH $IF $EQU $STATE 23000 "PASSED" "***FAILED";
+ECHO BOTH ": state " $STATE " attempt to alter to non unique pk.\n";
primarykeys IDT;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": " $rowcnt " pk parts after alter pk.\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " pk parts after alter pk.\n";
@@ -170,8 +170,8 @@ create table B1569(
insert into B1569 values (1, 'a');
alter table B1569 modify primary key (ID, NAME);
primarykeys B1569;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": bug 1569: " $rowcnt " pk parts after alter pk.\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": bug 1569: " $ROWCNT " pk parts after alter pk.\n";
select * from B1569;
-echo both $if $equ $last[2] a "PASSED" "***FAILED";
-echo both ": bug 1569: " $last[1] " in select after alter pk.\n";
+ECHO BOTH $IF $EQU $LAST[2] a "PASSED" "***FAILED";
+ECHO BOTH ": bug 1569: " $LAST[1] " in select after alter pk.\n";
diff --git a/binsrc/tests/suite/tplinverse.sql b/binsrc/tests/suite/tplinverse.sql
index cf38441..9511750 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- PL inverse functions suite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tplmodule.sql b/binsrc/tests/suite/tplmodule.sql
index 74774bc..46342d2 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- PL Modules suite testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tplscroll.sql b/binsrc/tests/suite/tplscroll.sql
index 5d4b08b..6df7439 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- PL Scrollable cursors suite testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpm.sql b/binsrc/tests/suite/tpm.sql
index ade1ac1..5b1cc09 100644
--- a/binsrc/tests/suite/tpm.sql
+++ b/binsrc/tests/suite/tpm.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpm.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tpmfinal.sql b/binsrc/tests/suite/tpmfinal.sql
index b1cea2d..cf80861 100644
--- a/binsrc/tests/suite/tpmfinal.sql
+++ b/binsrc/tests/suite/tpmfinal.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpmfinal.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -25,4 +25,3 @@ select now ();
select ((select sum (d_next_o_id) from district) - (select t_n_orders from tpm))
/ datediff ('minute', now (), (select t_time from tpm));
-
diff --git a/binsrc/tests/suite/tpminit.sql b/binsrc/tests/suite/tpminit.sql
index 283da3c..e963465 100644
--- a/binsrc/tests/suite/tpminit.sql
+++ b/binsrc/tests/suite/tpminit.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpminit.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -26,5 +26,3 @@ create table tpm (t_n_orders int, t_time datetime);
set autocommit on;
insert into tpm values ((select sum (d_next_o_id) from district), now ());
select * from tpm;
-
-
diff --git a/binsrc/tests/suite/tproviders.sh b/binsrc/tests/suite/tproviders.sh
index 6ae12bc..73e4dae 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tproxy.sh b/binsrc/tests/suite/tproxy.sh
index cec65af..338611a 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.3 2010/01/28 14:33:20 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tpview.sql b/binsrc/tests/suite/tpview.sql
index 39d70de..0418d0c 100644
--- a/binsrc/tests/suite/tpview.sql
+++ b/binsrc/tests/suite/tpview.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpview.sql,v 1.3 2006/09/25 14:25:10 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -36,11 +36,11 @@ create procedure numbers ()
select n, n2 from numbers () (n int, n2 int) f;
ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
-ECHO BOTH ": proc table no params " $rowcnt " rows\n";
+ECHO BOTH ": proc table no params " $ROWCNT " rows\n";
select 3*n, n2, n3, __tag (n3) from numbers () (n int, n2 int, n3 int) f;
ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
-ECHO BOTH ": proc table no params with calculations " $rowcnt " rows\n";
+ECHO BOTH ": proc table no params with calculations " $ROWCNT " rows\n";
@@ -61,7 +61,7 @@ create procedure n_range (in first integer, in last integer)
select n, n2 from n_range (first, last) (n int, n2 int) n where first = 2 and last = 12;
ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
-ECHO BOTH ": proc params " $rowcnt " rows\n";
+ECHO BOTH ": proc params " $ROWCNT " rows\n";
select n, n2 from n_range (first, last) (n int, n2 int) n where first = 2 and last = 12 and last = 13;
@@ -69,7 +69,7 @@ select n, n2 from n_range (first, last) (n int, n2 int) n where first = 2 and la
select a.n, b.n from n_range (first, last) (n int, n2 int) a, n_range (f2, l2) (n int, n2 int) b where first = 2 and last = 12 and f2 = a.n - 2 and l2 = a.n + 2;
ECHO BOTH $IF $EQU $ROWCNT 40 "PASSED" "***FAILED";
-ECHO BOTH ": proc derived table " $rowcnt " rows\n";
+ECHO BOTH ": proc derived table " $ROWCNT " rows\n";
@@ -80,11 +80,11 @@ create procedure view n_range as n_range (first, last) (n1 int, n2 int);
select * from n_range where first = 1 and n_range.last = 11 ;
ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
-ECHO BOTH ": proc view " $rowcnt " rows\n";
+ECHO BOTH ": proc view " $ROWCNT " rows\n";
select * from n_range a, n_range b where a.first = 1 and a.last = 11 and b.last = a.n1 + 2 and b.first = a.n1 - 2;
ECHO BOTH $IF $EQU $ROWCNT 40 "PASSED" "***FAILED";
-ECHO BOTH ": 2 proc views " $rowcnt " rows\n";
+ECHO BOTH ": 2 proc views " $ROWCNT " rows\n";
@@ -120,22 +120,22 @@ create procedure BIGTABLE_P(in PARAM_VALUE varchar)
-- Call stored procedure
call BIGTABLE_P(null);
ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
-ECHO BOTH ": 2 rows procedure call with BLOB result columns" $rowcnt " rows\n";
+ECHO BOTH ": 2 rows procedure call with BLOB result columns" $ROWCNT " rows\n";
call BIGTABLE_P(1700);
ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
-ECHO BOTH ": first row procedure call with BLOB result columns" $rowcnt " rows\n";
+ECHO BOTH ": first row procedure call with BLOB result columns" $ROWCNT " rows\n";
call BIGTABLE_P(2000);
ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
-ECHO BOTH ": second row procedure call with BLOB result columns" $rowcnt " rows\n";
+ECHO BOTH ": second row procedure call with BLOB result columns" $ROWCNT " rows\n";
create procedure view BIGTABLE_V as BIGTABLE_P(PVALUE)(NAME varchar, VALUE long varchar, NVALUE long nvarchar, BVALUE long varbinary);
-- Perform query tests
select * from BIGTABLE_V;
ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
-ECHO BOTH ": 2 rows procedure view select with BLOB result columns" $rowcnt " rows\n";
+ECHO BOTH ": 2 rows procedure view select with BLOB result columns" $ROWCNT " rows\n";
select NAME,
length (VALUE), dv_type_title (__tag (VALUE)),
@@ -143,7 +143,7 @@ select NAME,
length (BVALUE), dv_type_title (__tag (BVALUE))
from BIGTABLE_V where PVALUE = 1700;
ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
-ECHO BOTH ": first row procedure view select with BLOB result columns" $rowcnt " rows\n";
+ECHO BOTH ": first row procedure view select with BLOB result columns" $ROWCNT " rows\n";
ECHO BOTH $IF $EQU $LAST[2] 1700 "PASSED" "***FAILED";
ECHO BOTH ": length of a LONG VARCHAR BLOB from a procedure view select = " $LAST[2] " chars\n";
@@ -506,7 +506,7 @@ create procedure B4000P (in first integer, in last integer)
};
select n, n2 from B4000P (first, last) (n int, n2 int) n where first = 2 and last = 12;
ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
-ECHO BOTH ": BUG4000: proc table w/ end_result returned " $rowcnt " rows\n";
+ECHO BOTH ": BUG4000: proc table w/ end_result returned " $ROWCNT " rows\n";
drop view B1499_HASH_V2;
diff --git a/binsrc/tests/suite/trdf.sql b/binsrc/tests/suite/trdf.sql
index 0b45ed6..4301372 100644
--- a/binsrc/tests/suite/trdf.sql
+++ b/binsrc/tests/suite/trdf.sql
@@ -1,10 +1,10 @@
--
--- $Id: trdf.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -182,18 +182,18 @@ rdf ('John', 'isa', url ('person'));
select thi.o from rdf per, rdf thi where thi.s = url ('thing') and thi.p = url ('pred')
and thi.o = per.s and per.o = url ('person') and per.p = url ('isa') option (sparql);
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both " inx int of any and IRI_ID in sparql mode ok 1.\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH " inx int of any and IRI_ID in sparql mode ok 1.\n";
select count (*) from sys_keys where key_id = 'qq' option (sparql);
-echo both $if $equ $last[1] 0 "PASSED" "***FAILED";
-echo both " cast error ignore 1.\n";
+ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
+ECHO BOTH " cast error ignore 1.\n";
select count (*) from sys_keys where key_id = 'qq';
-echo both $if $equ $sqlstate 22005 "PASSED" "***FAILED";
-echo both " cast error ignore 2.\n";
+ECHO BOTH $IF $EQU $SQLSTATE 22005 "PASSED" "***FAILED";
+ECHO BOTH " cast error ignore 2.\n";
diff --git a/binsrc/tests/suite/trdfbox.sql b/binsrc/tests/suite/trdfbox.sql
index e654016..b7686eb 100644
--- a/binsrc/tests/suite/trdfbox.sql
+++ b/binsrc/tests/suite/trdfbox.sql
@@ -1,10 +1,10 @@
--
--- $Id: trdfbox.sql,v 1.2.2.3 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/trdfcol.sql b/binsrc/tests/suite/trdfcol.sql
index 02c86b5..566f9ac 100644
--- a/binsrc/tests/suite/trdfcol.sql
+++ b/binsrc/tests/suite/trdfcol.sql
@@ -40,4 +40,3 @@ ct := ct + 1;
if (ct > 10) return ct;}
}
return ct;
-}
diff --git a/binsrc/tests/suite/trdfhi.sql b/binsrc/tests/suite/trdfhi.sql
index 41f7684..2607cc1 100644
--- a/binsrc/tests/suite/trdfhi.sql
+++ b/binsrc/tests/suite/trdfhi.sql
@@ -1,10 +1,10 @@
--
--- $Id: trdfhi.sql,v 1.1 2008/03/19 14:27:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -63,8 +63,7 @@ SPARQL
WHERE { ?s ?p <http://xmlns.com/foaf/0.1/Person>.
OPTIONAL { ?s rss:title ?rss_title }}
;
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": distict with long string\n";
+ECHO BOTH $if $equ $state OK "PASSED" "***FAILED";
+ECHO BOTH ": distict with long string\n";
select hic_set_memcache_size (100000);
-
diff --git a/binsrc/tests/suite/trdfinf.sql b/binsrc/tests/suite/trdfinf.sql
index 335a191..39421c5 100644
--- a/binsrc/tests/suite/trdfinf.sql
+++ b/binsrc/tests/suite/trdfinf.sql
@@ -59,41 +59,41 @@ create procedure f (in q any) {return q;};
rdfs_rule_set ('inft', 'sc');
sparql define input:inference 'inft' select * from <inft> where { ?s <pd11> ?o };
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": 3 rows with pd11 and 2 inverses, pi11 and pi12\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": 3 rows with pd11 and 2 inverses, pi11 and pi12\n";
sparql define input:inference 'inft' select * from <inft> where { ?s <pi11> ?o };
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": 2 rows with pi11 and 1 inverse, pd11\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": 2 rows with pi11 and 1 inverse, pd11\n";
sparql define input:inference 'inft' select * from <inft> where { ?s <pi12> ?o };
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": 2 rows with pi12 and 1 inverse, pd11\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": 2 rows with pi12 and 1 inverse, pd11\n";
sparql define input:inference 'inft' select * from <inft> where { ?s <pd22> ?o };
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": 2 rows with symmetric pd22\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": 2 rows with symmetric pd22\n";
sparql define input:inference 'inft' select * from <inft> where { ?s <pt1> ?o . filter (?s = <subj-t1-11>) };
-echo both $if $equ $rowcnt 4 "PASSED" "***FAILED";
-echo both ": 4 rows with unidirectional transitive pt1\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": 4 rows with unidirectional transitive pt1\n";
sparql define input:inference 'inft' select * from <inft> where { ?s <pdt1> ?o option (T_DISTINCT) . filter (?s = <subj-dt1-11>) };
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": 6 rows with symmetric transitive pdt1\n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": 6 rows with symmetric transitive pdt1\n";
select id_to_iri (s) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft',0) and p = iri_to_id ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 0) and o = iri_to_id ('c1', 0);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": 3 inst of c1 without f \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": 3 inst of c1 without f \n";
select id_to_iri (s) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft',0) and p = f (iri_to_id ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 0)) and o = f (iri_to_id ('c1', 0));
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": 3 inst of c1 with f \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": 3 inst of c1 with f \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0);
-echo both $if $equ $rowcnt 33 "PASSED" "***FAILED";
-echo both ": 33 triples in g inft\n";
+ECHO BOTH $IF $EQU $ROWCNT 33 "PASSED" "***FAILED";
+ECHO BOTH ": 33 triples in g inft\n";
@@ -104,8 +104,8 @@ where a.g = iri_to_id ('inft', 0) and b.g = iri_to_id ('inft', 0)
and b.p = iri_to_id ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 0)
and a.s = b.s;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": inx int on o = c1 and p = rdfs:type\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": inx int on o = c1 and p = rdfs:type\n";
explain ('select 1 from rdf_quad a table option (with ''inft''), rdf_quad b table option (with ''inft '')
@@ -119,8 +119,8 @@ where a.g = iri_to_id (''inft'', 0) and b.g = iri_to_id (''inft'', 0)
select s, p from rdf_quad table option (with 'inft')
where g = iri_to_id ('inft', 0) and o = iri_to_id ('c1', 0);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": o = c1 3 rows\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": o = c1 3 rows\n";
create table ps (ps iri_id primary key);
@@ -129,74 +129,74 @@ insert into ps values (iri_to_id ('c1', 1));
insert into ps values (iri_to_id ('c4', 1));
select ps, s, p, o from ps left join rdf_quad table option (with 'inft') on g = iri_to_id ('inft', 0) and ps = o;
-echo both $if $equ $rowcnt 4 "PASSED" "***FAILED";
-echo both ": inf oj rowcnt\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": inf oj rowcnt\n";
--- Complete combinations
--- fs fp fo
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0);
-echo both $if $equ $rowcnt 33 "PASSED" "***FAILED";
-echo both ": fs fp fp \n";
+ECHO BOTH $IF $EQU $ROWCNT 33 "PASSED" "***FAILED";
+ECHO BOTH ": fs fp fp \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and o = iri_to_id ('c1', 0);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": fs fp go = c1 \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": fs fp go = c1 \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and o = f (iri_to_id ('c1', 0));
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": fs fp go = f c1 \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": fs fp go = f c1 \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and o = f (iri_to_id ('ic1p1', 0));
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": fs fp go = f ic1p1 \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": fs fp go = f ic1p1 \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and p = iri_to_id ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 0);
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": fs gp = rdfstype fo \n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": fs gp = rdfstype fo \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and p = f (iri_to_id ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 0));
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": fs gp = f rdfstype fo \n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": fs gp = f rdfstype fo \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and p = f (iri_to_id ('p0', 0));
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": fs gp = f p0 fo \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": fs gp = f p0 fo \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and p = iri_to_id ('p0', 0);
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": fs gp = p0 fo \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": fs gp = p0 fo \n";
-- fs gp go
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and p = iri_to_id ('p0', 0) and o = iri_to_id ('ic1p1',0);
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": fs gp = p0 go = ic1p1 \n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": fs gp = p0 go = ic1p1 \n";
select id_to_iri (s), id_to_iri (p), id_to_iri (o) from rdf_quad table option (with 'inft') where g = iri_to_id ('inft', 0) and p = iri_to_id ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 0) and o = iri_to_id ('c2',0);
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": fs gp = rdfstype go = c2 \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": fs gp = rdfstype go = c2 \n";
sparql define input:inference 'inft' select ?s ?p from <inft> where { ?s ?p <c1> . };
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": fs fp go with sparql\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": fs fp go with sparql\n";
sparql define input:inference 'inft' select * from <inft> where { ?s ?p <c1> . ?s ?p1 <ic2p1> . };
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": fs fp go join fs fp go with sparql\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": fs fp go join fs fp go with sparql\n";
sparql define input:inference 'inft' select * from <inft> where { ?s ?p <c1> . ?s ?p1 <ic2p1> option (inference 'none') . };
-echo both $if $neq $state OK "PASSED" "***FAILED";
-echo both ": fs fp go join fs fp go with sparql inf none STATE=" $state " MESSAGE=" $message "\n" ;
+ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": fs fp go join fs fp go with sparql inf none STATE=" $STATE " MESSAGE=" $MESSAGE "\n" ;
sparql select * from <inft> where { ?s ?p <c1> option (inference 'inft') . ?s ?p1 <ic2p1> . };
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": fs fp go join fs fp go with sparql inf inft\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": fs fp go join fs fp go with sparql inf inft\n";
sparql define input:inference 'inft' select count (*) from <inft> where {?s ?p ?o};
@@ -211,8 +211,8 @@ sparql define input:inference 'inft' select ?s ?p count (?o) from <inft> from <
sparql define input:inference 'inft'
select ?icpe ?cl from <inft> from <extra> where { ?icpe <icpe> ?v . optional { ?icpe a ?cl } };
-echo both $if $equ $rowcnt 7 "PASSED" "***FAILED";
-echo both ": 2 graph oj \n";
+ECHO BOTH $IF $EQU $ROWCNT 7 "PASSED" "***FAILED";
+ECHO BOTH ": 2 graph oj \n";
ttlp (
@@ -227,13 +227,13 @@ ttlp (
sparql define input:inference 'inft'
select ?cl from <inft> from <sas> where { <syn3-ic1> a ?cl };
---echo both $if $equ $last[1] c1 "PASSED" "***FAILED";
---echo both ": same-as with class\n";
+--ECHO BOTH $IF $EQU $LAST[1] c1 "PASSED" "***FAILED";
+--ECHO BOTH ": same-as with class\n";
sparql define input:inference 'inft'
select ?p ?o from <inft> from <sas> where { <syn3-ic1> ?p ?o };
---echo both $if $equ $rowcnt 10 "PASSED" "***FAILED";
---echo both ": properties following same-as\n";
+--ECHO BOTH $IF $EQU $ROWCNT 10 "PASSED" "***FAILED";
+--ECHO BOTH ": properties following same-as\n";
sparql define input:inference 'inft'
@@ -260,18 +260,18 @@ rdfs_rule_set ('sas-p', 'sas-p');
sparql define input:inference 'sas-p' define input:same-as "yes"
select * from <sas-p> where { ?s <p0> ?o };
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": same-as for super property\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": same-as for super property\n";
sparql define input:inference 'sas-p' define input:same-as "yes"
select distinct * from <sas-p> where { ?s <p1> ?o };
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": same-as for property\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": same-as for property\n";
sparql define input:inference 'sas-p' define input:same-as "yes"
select distinct * from <sas-p> where { ?s <sas-p1> ?o };
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": same-as for sameAs property\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": same-as for sameAs property\n";
create procedure s_list (in ctx varchare, in iri varchar, in axis int)
@@ -283,52 +283,52 @@ create procedure s_list (in ctx varchare, in iri varchar, in axis int)
result (id_to_iri (a[inx]));
}
-sparql clear <g1>;
-sparql clear <g2>;
-sparql clear <g3>;
+sparql clear graph <g1>;
+sparql clear graph <g2>;
+sparql clear graph <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 . };
sparql select * where { graph ?g { ?s ?p ?o . filter (?g = <g3>) }};
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": 2 rows filter (?g = <g3>) \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": 2 rows filter (?g = <g3>) \n";
sparql select * where { graph ?g { ?s <p> ?o . filter (?g = <g1>) }};
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": 1 row { ?s <p> ?o . filter (?g = <g1>) } \n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": 1 row { ?s <p> ?o . filter (?g = <g1>) } \n";
sparql select * where { graph ?g { ?s <p> ?o . filter (?g in (<g1>, <g2>, <g3>)) }};
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": 3 rows ?s <p> ?o . filter (?g in (<g1>, <g2>, <g3>)) \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": 3 rows ?s <p> ?o . filter (?g in (<g1>, <g2>, <g3>)) \n";
explain('sparql select * where { graph ?g { ?s ?p ?o . filter (?s in (<s1>, <s2>, <s3>)) }}');
explain('sparql select * where { graph ?g { ?s ?p ?o . filter (?g in (<g1>, <g2>, <g3>)) }}');
sparql select * where { graph ?g { ?s ?p ?o . filter (?s in (<s1>, <s2>, <s3>)) }};
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": 6 rows ?s in (<s1>, <s2>, <s3>) \n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": 6 rows ?s in (<s1>, <s2>, <s3>) \n";
sparql select * where { graph ?g { ?s ?p ?o . filter (?g in (<g1>, <g2>, <g3>)) }};
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": 6 rows ?g in (<g1>, <g2>, <g3>) \n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": 6 rows ?g in (<g1>, <g2>, <g3>) \n";
select * from DB.DBA.RDF_QUAD table option (index RDF_QUAD) where g in ( __i2id ( UNAME'g3' ) , __i2id ( UNAME'g2' ) , __i2id ( UNAME'g1' ));
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": 6 rows g in (g1, g2, g3) by PK \n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": 6 rows g in (g1, g2, g3) by PK \n";
select * from DB.DBA.RDF_QUAD table option (index RDF_QUAD) where s in ( __i2id ( UNAME's3' ) , __i2id ( UNAME's2' ) , __i2id ( UNAME's1' ));
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": 6 rows s in (s1, s2, s3) by PK\n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": 6 rows s in (s1, s2, s3) by PK\n";
select * from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where g in ( __i2id ( UNAME'g3' ) , __i2id ( UNAME'g2' ) , __i2id ( UNAME'g1' ));
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": 6 rows g in (g1, g2, g3) by GS\n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": 6 rows g in (g1, g2, g3) by GS\n";
select * from DB.DBA.RDF_QUAD table option (index RDF_QUAD_SP) where s in ( __i2id ( UNAME's3' ) , __i2id ( UNAME's2' ) , __i2id ( UNAME's1' ));
-echo both $if $equ $rowcnt 6 "PASSED" "***FAILED";
-echo both ": 6 rows s in (s1, s2, s3) by SP\n";
+ECHO BOTH $IF $EQU $ROWCNT 6 "PASSED" "***FAILED";
+ECHO BOTH ": 6 rows s in (s1, s2, s3) by SP\n";
explain('sparql select * where { graph ?g { ?s ?p ?o . filter (?o in (10,20,30)) }}');
sparql select * where { graph ?g { ?s ?p ?o . filter (?o in (10,20,30)) }};
@@ -339,11 +339,10 @@ explain ('delete from rdf_quad table option (index RDF_QUAD) where g in ( __i2id
explain ('delete from rdf_quad table option (index RDF_QUAD_GS) where g in ( __i2id ( UNAME\'g3\' ) , __i2id ( UNAME\'g2\' ) , __i2id ( UNAME\'g1\' ))');
delete from rdf_quad table option (index RDF_QUAD_GS) where g in ( __i2id ( UNAME'g3' ) , __i2id ( UNAME'g2' ) );
select * from DB.DBA.RDF_QUAD table option (index RDF_QUAD) where s in ( __i2id ( UNAME's3' ) , __i2id ( UNAME's2' ) , __i2id ( UNAME's1' ));
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": 2 rows s in (s1, s2, s3) by PK\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": 2 rows s in (s1, s2, s3) by PK\n";
select * from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where g in ( __i2id ( UNAME'g3' ) , __i2id ( UNAME'g2' ) , __i2id ( UNAME'g1' ));
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": 2 rows g in (g1, g2, g3) by GS\n";
-
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": 2 rows g in (g1, g2, g3) by GS\n";
diff --git a/binsrc/tests/suite/trdfinfifp.sql b/binsrc/tests/suite/trdfinfifp.sql
index 8592c84..2d2826d 100644
--- a/binsrc/tests/suite/trdfinfifp.sql
+++ b/binsrc/tests/suite/trdfinfifp.sql
@@ -1,6 +1,6 @@
-echo both "RDF IFP Test\n";
+ECHO BOTH "RDF IFP Test\n";
ttlp ('
<john1> a <person> .
@@ -31,23 +31,21 @@ rdfs_rule_set ('ifps', 'ifp_list');
sparql define input:inference 'ifps' select * from <ifps> where {<john1> ?p ?o};
-echo both $if $equ $rowcnt 9 "PASSED" "***FAILED";
-echo both ": properties of john\n";
+ECHO BOTH $IF $EQU $ROWCNT 9 "PASSED" "***FAILED";
+ECHO BOTH ": properties of john\n";
sparql define input:inference 'ifps' select * from <ifps> where { ?person a <person> . ?person <knows> ?somebody . ?somebody ?p ?o};
sparql select distinct ?p from <ifps> where { ?p a <person>};
-echo both $if $equ $rowcnt 4 "PASSED" "***FAILED";
-echo both ": distinct persons\n";
+ECHO BOTH $IF $EQU $ROWCNT 4 "PASSED" "***FAILED";
+ECHO BOTH ": distinct persons\n";
sparql define input:inference "ifps" select distinct ?p from <ifps> where { ?p a <person>};
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": distinct persons with ifp inf\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": distinct persons with ifp inf\n";
-- rdf_inf_set_ifp_exclude_list ('ifps', iri_to_id ('name'), vector ('John'));
-- sparql define input:inference "ifps" select distinct ?p from <ifps> where { ?p a <person>};
-
-
diff --git a/binsrc/tests/suite/trecov.sh b/binsrc/tests/suite/trecov.sh
index c49d0e3..25349e7 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/trecov_schema.sh b/binsrc/tests/suite/trecov_schema.sh
index b56273a..8af4195 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.3 2009/09/17 14:47:09 source Exp $
+# $Id$
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/treg1.sql b/binsrc/tests/suite/treg1.sql
index 9c28400..cc204ba 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test DB Registry
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/treg2.sql b/binsrc/tests/suite/treg2.sql
index af72a3a..a12e3e6 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test Database Registry
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tregexp.sql b/binsrc/tests/suite/tregexp.sql
index 9d2376d..93f14f0 100644
--- a/binsrc/tests/suite/tregexp.sql
+++ b/binsrc/tests/suite/tregexp.sql
@@ -1,10 +1,10 @@
--
--- $Id: tregexp.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tregexpN.sql b/binsrc/tests/suite/tregexpN.sql
index cd7bc00..d4fcd6f 100644
--- a/binsrc/tests/suite/tregexpN.sql
+++ b/binsrc/tests/suite/tregexpN.sql
@@ -1,10 +1,10 @@
--
--- $Id: tregexpN.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/trepl.sh b/binsrc/tests/suite/trepl.sh
index 9f0f9f9..85ee16c 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.2 2010/12/10 12:24:41 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/trepl.sql b/binsrc/tests/suite/trepl.sql
index 8a9bb59..56fe907 100644
--- a/binsrc/tests/suite/trepl.sql
+++ b/binsrc/tests/suite/trepl.sql
@@ -1,10 +1,10 @@
--
--- $Id: trepl.sql,v 1.3.2.1 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -428,21 +428,20 @@ repl_dav_proc ('WS.WS.REMOTE_COL', 'WS.WS.REMOTE_RES', 1, 1);
select RES_FULL_PATH, md5 (blob_to_string (RES_CONTENT)) from WS.WS.SYS_DAV_RES
except
select RES_FULL_PATH, md5 (blob_to_string (RES_CONTENT)) from WS.WS.REMOTE_RES;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": " $rowcnt " WebDAV resources with different content\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " WebDAV resources with different content\n";
select RES_FULL_PATH from WS.WS.SYS_DAV_RES except select RES_FULL_PATH from WS.WS.REMOTE_RES;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": " $rowcnt " WebDAV resources differ\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " WebDAV resources differ\n";
select count(*) from WS.WS.SYS_DAV_COL a, WS.WS.REMOTE_COL b where WS.WS.COL_PATH (a.COL_ID) = DAV_COL_PATH (b.COL_ID);
-echo both $if $equ $last[1] 9 "PASSED" "***FAILED";
-echo both ": " $last[1] " WebDAV collections found, should be 9\n";
+ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " WebDAV collections found, should be 9\n";
select count(*) from WS.WS.SYS_DAV_RES a, WS.WS.REMOTE_RES b where a.RES_FULL_PATH = b.RES_FULL_PATH;
-echo both $if $equ $last[1] 9 "PASSED" "***FAILED";
-echo both ": " $last[1] " WebDAV resources found, should be 9\n";
+ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "***FAILED";
+ECHO BOTH ": " $LAST[1] " WebDAV resources found, should be 9\n";
ECHO BOTH "COMPLETED WITH " $ARGV[0] " FAILED, " $ARGV[1] " PASSED: WebDAV transactional replication tests\n";
-
diff --git a/binsrc/tests/suite/trepl_ddl.sql b/binsrc/tests/suite/trepl_ddl.sql
index 4d1455e..018341e 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- DDL replication suite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/trepl_p1.sql b/binsrc/tests/suite/trepl_p1.sql
index a5b9c5f..0974125 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -174,5 +174,3 @@ WAIT_FOR_SYNC ('rep1', 'proc', 10);
select count(*) from p_test;
ECHO BOTH $IF $EQU $LAST[1] 256 "PASSED" "*** FAILED";
ECHO BOTH ": " $LAST[1] " entries in test table replicated with 2 calls (one is keyword parameter call)\n";
-
-
diff --git a/binsrc/tests/suite/trepl_t1.sql b/binsrc/tests/suite/trepl_t1.sql
index e77a1a5..44d5777 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -242,4 +242,3 @@ ECHO BOTH ": B7157 : LAST[1]=" $LAST[1] " (XML ENTITY)\n";
select length(X) from B7260;
ECHO BOTH $IF $EQU $LAST[1] 835106 "PASSED" "***FAILED";
ECHO BOTH ": B7260 : length (X)=" $LAST[1] " (words.esp)\n";
-
diff --git a/binsrc/tests/suite/treplh-dsn-odbc.cfg b/binsrc/tests/suite/treplh-dsn-odbc.cfg
index 6912721..9ebb996 100644
--- a/binsrc/tests/suite/treplh-dsn-odbc.cfg
+++ b/binsrc/tests/suite/treplh-dsn-odbc.cfg
@@ -1,5 +1,5 @@
#
-# $Id: treplh-dsn-odbc.cfg,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
+# $Id$
#
v2:1112:dba:dba
mssql:mssql:demo:demo
diff --git a/binsrc/tests/suite/treplh-test-odbc.cfg b/binsrc/tests/suite/treplh-test-odbc.cfg
index 189a7e1..3a7ec78 100644
--- a/binsrc/tests/suite/treplh-test-odbc.cfg
+++ b/binsrc/tests/suite/treplh-test-odbc.cfg
@@ -1,5 +1,5 @@
#
-# $Id: treplh-test-odbc.cfg,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
+# $Id$
#
mssql
oracle
diff --git a/binsrc/tests/suite/treplh.sh b/binsrc/tests/suite/treplh.sh
index 0e2c036..4a2642d 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tschema1.sql b/binsrc/tests/suite/tschema1.sql
index e3d356d..dbdf212 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.3 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- Test DDL functionality #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -474,6 +474,5 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": B9948 test case returns " $ROWCNT " cols STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-echo both "tschema1 check trees\n";
+ECHO BOTH "tschema1 check trees\n";
cl_exec ('backup ''/dev/null''');
-
diff --git a/binsrc/tests/suite/tschema2.sql b/binsrc/tests/suite/tschema2.sql
index b3c02b5..4d9b797 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test DDL functionality #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tschema3.sql b/binsrc/tests/suite/tschema3.sql
index bcccd6e..2816451 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test DDL functionality #3
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tschema4.sql b/binsrc/tests/suite/tschema4.sql
index 7e34044..9cb29f5 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Test DDL functionality #4
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsec.sh b/binsrc/tests/suite/tsec.sh
index f321704..41594af 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.2 2010/01/31 20:18:26 source Exp $
+# $Id$
#
# Security tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -49,7 +49,22 @@ 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 1f3d532..72f0014 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Procedures security tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsec_role.sql b/binsrc/tests/suite/tsec_role.sql
index c41902e..891062b 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsec_role1.sql b/binsrc/tests/suite/tsec_role1.sql
index 48f5026..410c02e 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsec_role2.sql b/binsrc/tests/suite/tsec_role2.sql
index c9ed661..66525de 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsecend.sql b/binsrc/tests/suite/tsecend.sql
index a928e6d..8784a32 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test Security
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsecini-1.sql b/binsrc/tests/suite/tsecini-1.sql
index d25f258..f7db3f5 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Security checks
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsecini.sql b/binsrc/tests/suite/tsecini.sql
index b9908e1..a72de52 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test security - initialization
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -83,6 +83,7 @@ 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;
@@ -107,6 +108,24 @@ 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 9e741de..a4980c0 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Security test #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -316,13 +316,13 @@ ECHO BOTH "COMPLETED WITH " $ARGV[0] " FAILED, " $ARGV[1] " PASSED: " $ARGV[4] "
select * from T1;
-echo both $IF $equ $state 42000 "PASSED" "***FAILED";
-echo both ": T1 not grant to u1\n";
+ECHO BOTH $IF $EQU $STATE 42000 "PASSED" "***FAILED";
+ECHO BOTH ": T1 not grant to u1\n";
select * from SEC_T1;
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both ": SEC_T1 view granted to U1\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": SEC_T1 view granted to U1\n";
create table U1_T1 (ROW_NO integer, STRING1 varchar, STRING2 varchar, TIME1 timestamp,
primary key (ROW_NO));
@@ -331,20 +331,20 @@ grant select on U1_T1 to U2;
grant select on SEC_T1 to public;
-echo both $if $equ $state 42000 "PASSED" "***FAILED";
-echo both ": forbidden re-grant of SEC_T1\n";
+ECHO BOTH $IF $EQU $STATE 42000 "PASSED" "***FAILED";
+ECHO BOTH ": forbidden re-grant of SEC_T1\n";
create view SEC_T1_U1 as select * from T1;
-echo both $if $equ $state 42000 "PASSED" "***FAILED";
-echo both ": forbidden view to T1\n";
+ECHO BOTH $IF $EQU $STATE 42000 "PASSED" "***FAILED";
+ECHO BOTH ": forbidden view to T1\n";
create view U1_T1_V as select * from U1_T1, T1 where T1.ROW_NO = 111;
-echo both $if $equ $state 42000 "PASSED" "***FAILED";
-echo both ": forbidden join view 2 \n";
+ECHO BOTH $IF $EQU $STATE 42000 "PASSED" "***FAILED";
+ECHO BOTH ": forbidden join view 2 \n";
select * from U1_T1;
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both ": U1_T1 view granted to U1\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": U1_T1 view granted to U1\n";
create view U1_T2 as select * from T2;
grant select, insert, update, delete on U1_T2 to U3;
@@ -358,12 +358,12 @@ grant select, update on U1_T1_V to U3;
------- proc
pda1 (11);
-echo both $if $equ $state 42001 "PASSED" "***FAILED";
-echo both ": pdba1 state " $state "\n";
+ECHO BOTH $IF $EQU $STATE 42001 "PASSED" "***FAILED";
+ECHO BOTH ": pdba1 state " $STATE "\n";
pda2 (11);
-echo both $if $equ $state 42001 "PASSED" "***FAILED";
-echo both ": pdba1 state " $state "\n";
+ECHO BOTH $IF $EQU $STATE 42001 "PASSED" "***FAILED";
+ECHO BOTH ": pdba1 state " $STATE "\n";
@@ -388,26 +388,26 @@ insert into u1_tt (k) values (2);
update u1_tt set d = 12;
select d2 from u1_tt;
-echo both $if $equ $last[1] 12 "PASSED" "***FAILED";
-echo both ": u1 trigger update = " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] 12 "PASSED" "***FAILED";
+ECHO BOTH ": u1 trigger update = " $LAST[1] "\n";
alter table u1_tt add x integer;
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": alter by owner 1 ate " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": alter by owner 1 ate " $STATE "\n";
alter table u1_tt drop x;
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": alter by owner 2 ate " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": alter by owner 2 ate " $STATE "\n";
alter table u1_tt rename temp;
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": alter by owner 3 ate " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": alter by owner 3 ate " $STATE "\n";
alter table temp rename u1_tt;
-echo both $if $equ $state OK "PASSED" "***FAILED";
-echo both ": alter by owner 4 ate " $state "\n";
+ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
+ECHO BOTH ": alter by owner 4 ate " $STATE "\n";
create view forbidden as select * from SEC_T1, T1;
-echo both $if $equ $state 42000 "PASSED" "***FAILED";
-echo both ": unauthorized view state " $state "\n";
+ECHO BOTH $IF $EQU $STATE 42000 "PASSED" "***FAILED";
+ECHO BOTH ": unauthorized view state " $STATE "\n";
diff --git a/binsrc/tests/suite/tsecu1-2.sql b/binsrc/tests/suite/tsecu1-2.sql
index c4d343a..1749fae 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Security test #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsecu3-1.sql b/binsrc/tests/suite/tsecu3-1.sql
index 1e71c2a..834fca1 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Security test #3
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -268,24 +268,24 @@ ECHO BOTH ": Granting privileges WITHOUT permission: STATE=" $STATE " MESSAGE="
ECHO BOTH "COMPLETED WITH " $ARGV[0] " FAILED, " $ARGV[1] " PASSED: " $ARGV[4] " -- Privileges of user " $ARGV[2] ", part 1\n";
select ROW_NO from U1_T1;
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both ": U1_T1 view granted to U3\n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": U1_T1 view granted to U3\n";
select * from U1_T2;
-echo both $if $equ $rowcnt 13 "PASSED" "***FAILED";
-echo both ": U1_T2 view granted to U3\n";
+ECHO BOTH $IF $EQU $ROWCNT 13 "PASSED" "***FAILED";
+ECHO BOTH ": U1_T2 view granted to U3\n";
update U1_T1_V set STRING1 = concat ('--', STRING1);
-echo both $if $equ $rowcnt 20 "PASSED" "***FAILED";
-echo both $rowcnt " update of U1_T1_V by U3 \n";
+ECHO BOTH $IF $EQU $ROWCNT 20 "PASSED" "***FAILED";
+ECHO BOTH ": " $ROWCNT " update of U1_T1_V by U3 \n";
update SEC_T1 set STRING1 = '111';
-echo both $if $equ $state 42000 "PASSED" "***FAILED";
-echo both $state " for ungranted update of SEC_T1\n";
+ECHO BOTH $IF $EQU $STATE 42000 "PASSED" "***FAILED";
+ECHO BOTH ": " $STATE " for ungranted update of SEC_T1\n";
update u1_tt set d = 31;
select d2 from u1_tt;
-echo both $if $equ $last[1] 31 "PASSED" "***FAILED";
-echo both ": u1 granted update on non-granted trigger action = " $last[1] "\n";
+ECHO BOTH $IF $EQU $LAST[1] 31 "PASSED" "***FAILED";
+ECHO BOTH ": u1 granted update on non-granted trigger action = " $LAST[1] "\n";
diff --git a/binsrc/tests/suite/tsecu3-2.sql b/binsrc/tests/suite/tsecu3-2.sql
index 55ee8b9..d7dd462 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.2 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- Security test #3 part 2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsecu5-1.sql b/binsrc/tests/suite/tsecu5-1.sql
index 3aa3fcd..9be108e 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Security test #5
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsnaprepl.sql b/binsrc/tests/suite/tsnaprepl.sql
index fe5c252..30ba26d 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Snapshot replication local tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsoap.sql b/binsrc/tests/suite/tsoap.sql
index e96a140..ae81299 100644
--- a/binsrc/tests/suite/tsoap.sql
+++ b/binsrc/tests/suite/tsoap.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoap.sql,v 1.2.2.1 2010/12/10 12:24:41 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -385,6 +385,9 @@ create procedure DB.DBA.SOAPTEST ()
ECHO BOTH $IF $EQU $STATE OK "PASSED" "*** FAILED";
ECHO BOTH ": creating VSP SOAP server procedure STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+create user SOAP_SRV;
+grant execute on DB.DBA.SOAPTEST to SOAP_SRV;
+
soap_call ('localhost:$U{HTTPPORT}', '/vspsoap.vsp', 'fake', 'test', vector(), 11);
ECHO BOTH $IF $EQU $STATE OK "PASSED" "*** FAILED";
ECHO BOTH ": calling the VSP SOAP server with fake#test STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
@@ -403,6 +406,8 @@ create module DB.DBA.SOAPMOD {
procedure SOAPMOD3() { return 14; };
};
+GRANT EXECUTE ON DB.DBA.SOAPMOD TO SOAP_SRV;
+
select xml_tree_doc (soap_sdl ('DB.DBA.SOAPMOD', 'URL'));
ECHO BOTH $IF $EQU $STATE OK "PASSED" "*** FAILED";
ECHO BOTH ": SDL for a module valid STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
diff --git a/binsrc/tests/suite/tsoap12.sh b/binsrc/tests/suite/tsoap12.sh
index dde8538..e769c69 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsoap_new.sql b/binsrc/tests/suite/tsoap_new.sql
index 27c307a..b78d9e5 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -363,6 +363,8 @@ create procedure DB.DBA.SOAPTEST ()
ECHO BOTH $IF $EQU $STATE OK "PASSED" "*** FAILED";
ECHO BOTH ": creating VSP SOAP server procedure STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
+grant execute on DB.DBA.SOAPTEST to SOAP_SRV;
+
soap_call_new ('localhost:$U{HTTPPORT}', '/vspsoap.vsp', 'fake', 'test', vector(), 11);
ECHO BOTH $IF $EQU $STATE OK "PASSED" "*** FAILED";
ECHO BOTH ": calling the VSP SOAP server with fake#test STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
@@ -380,6 +382,7 @@ create module DB.DBA.SOAPMOD {
procedure SOAPMOD2(inout par2 int) { return par2 + 1; };
procedure SOAPMOD3() { return 14; };
};
+GRANT EXECUTE ON DB.DBA.SOAPMOD TO SOAP_SRV;
select xml_tree_doc (soap_sdl ('DB.DBA.SOAPMOD', 'URL'));
ECHO BOTH $IF $EQU $STATE OK "PASSED" "*** FAILED";
diff --git a/binsrc/tests/suite/tsoap_r3.sql b/binsrc/tests/suite/tsoap_r3.sql
index 8a7281f..e2326da 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsoap_r4.sql b/binsrc/tests/suite/tsoap_r4.sql
index 3603242..8f74f16 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -380,4 +380,3 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": echoVoidSoapHeader : " $LAST[1] "\n";
ECHO BOTH "COMPLETED WITH " $ARGV[0] " FAILED, " $ARGV[1] " PASSED: SOAP Interop IV tests\n";
-
diff --git a/binsrc/tests/suite/tsoap_rpc.sql b/binsrc/tests/suite/tsoap_rpc.sql
index ee739b4..ca14540 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -795,7 +795,7 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": InteropTests.echoFloat : " $LAST[1] "\n";
select soap_box_xml_entity_validating (aref(InteropTests.echoFloat(cast(1e40 as float)),1), 'float');
-ECHO BOTH $IF $EQU $LAST[1] '1e+40' "PASSED" $if $EQU $LAST[1] '1e+040' "PASSED" "***FAILED";
+ECHO BOTH $IF $EQU $LAST[1] '1e+40' "PASSED" $IF $EQU $LAST[1] '1e+040' "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": InteropTests.echoFloat : " $LAST[1] "\n";
diff --git a/binsrc/tests/suite/tsoapcpl.sql b/binsrc/tests/suite/tsoapcpl.sql
index dc435d8..c38e019 100644
--- a/binsrc/tests/suite/tsoapcpl.sql
+++ b/binsrc/tests/suite/tsoapcpl.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoapcpl.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsoapudt.sql b/binsrc/tests/suite/tsoapudt.sql
index b3b1cca..94da33d 100644
--- a/binsrc/tests/suite/tsoapudt.sql
+++ b/binsrc/tests/suite/tsoapudt.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoapudt.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsparql.sh b/binsrc/tests/suite/tsparql.sh
index e3636ca..27d91ab 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsparql_demo.sh b/binsrc/tests/suite/tsparql_demo.sh
index 4e6d9c3..a38dd8f 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsponge.sql b/binsrc/tests/suite/tsponge.sql
index 456ded2..2283834 100644
--- a/binsrc/tests/suite/tsponge.sql
+++ b/binsrc/tests/suite/tsponge.sql
@@ -13,6 +13,7 @@ delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_HTTP_SESSION
delete 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_FEED_RESPONSE';
delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH';
+delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_HTMLTABLE';
update DB.DBA.SYS_RDF_MAPPERS set RM_OPTIONS = vector ('add-html-meta', 'no', 'get-feeds', 'no') where RM_HOOK = 'DB.DBA.RDF_LOAD_HTML_RESPONSE';
delete from DB.DBA.RDF_META_CARTRIDGES;
diff --git a/binsrc/tests/suite/tspotlight.sql b/binsrc/tests/suite/tspotlight.sql
index 5c1825b..bb74964 100644
--- a/binsrc/tests/suite/tspotlight.sql
+++ b/binsrc/tests/suite/tspotlight.sql
@@ -1,10 +1,10 @@
--
--- $Id: tspotlight.sql,v 1.2.2.1 2009/04/16 12:37:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsql.sh b/binsrc/tests/suite/tsql.sh
index 2864e62..b0664f5 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.4 2009/08/09 00:16:20 source Exp $
+# $Id$
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsql2.sh b/binsrc/tests/suite/tsql2.sh
index d31c18c..d1b5e7e 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.3 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsql3.sh b/binsrc/tests/suite/tsql3.sh
index bfdce0f..fb48090 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.5 2009/11/19 19:24:11 source Exp $
+# $Id$
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsqllite.sh b/binsrc/tests/suite/tsqllite.sh
index b021e7a..84b9b4a 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.1 2009/04/16 12:37:43 source Exp $
+# $Id$
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsqlo.sh b/binsrc/tests/suite/tsqlo.sh
index adc1b66..acd3f24 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.1 2009/04/16 12:37:43 source Exp $
+# $Id$
#
# SQL Optimizer tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsqlo2.sql b/binsrc/tests/suite/tsqlo2.sql
index 98b61b5..442f0e1 100644
--- a/binsrc/tests/suite/tsqlo2.sql
+++ b/binsrc/tests/suite/tsqlo2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsqlo2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -88,5 +88,3 @@ select a.row_no, b.row_no, mi from t1, (select row_no, string1, string2, max (
select a.row_no, b.row_no, mi from t1 a, (select row_no, string1, string2, max (fi2) as mi from r1..t1 group by 1, 2, 3) b where a.row_no = b.row_no order by a.row_no desc;
select row_no + 1 as r, count (string1) from r1..t1 group by r order by r;
-
-
diff --git a/binsrc/tests/suite/tstriping.sh b/binsrc/tests/suite/tstriping.sh
index ae24d82..c1dfee7 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.2 2010/01/31 20:18:26 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tstrses.sql b/binsrc/tests/suite/tstrses.sql
index 25dc3fc..54cd412 100644
--- a/binsrc/tests/suite/tstrses.sql
+++ b/binsrc/tests/suite/tstrses.sql
@@ -1,10 +1,10 @@
--
--- $Id: tstrses.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsxml.sh b/binsrc/tests/suite/tsxml.sh
index d23b7ef..3a62c76 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tsxml.sql b/binsrc/tests/suite/tsxml.sql
index 516314b..96e6045 100644
--- a/binsrc/tests/suite/tsxml.sql
+++ b/binsrc/tests/suite/tsxml.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsxml.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tsyncml.sql b/binsrc/tests/suite/tsyncml.sql
index 0e9337f..ae21fc6 100644
--- a/binsrc/tests/suite/tsyncml.sql
+++ b/binsrc/tests/suite/tsyncml.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsyncml.sql,v 1.4.2.1 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/ttext.sql b/binsrc/tests/suite/ttext.sql
index 72ff668..c0320e7 100644
--- a/binsrc/tests/suite/ttext.sql
+++ b/binsrc/tests/suite/ttext.sql
@@ -1,10 +1,10 @@
--
--- $Id: ttext.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -75,4 +75,3 @@ select count (*) from ttt_test where contains (text, '"html" and "body"', 1111);
select count (*) from ttt_test where contains (text, '"con*ion"');
select count (*) from ttt_test where contains (text, '"con*ion" and not "conf*"', 1111);
-
diff --git a/binsrc/tests/suite/ttext_qual_hf.sql b/binsrc/tests/suite/ttext_qual_hf.sql
index 1932a23..a60fcb9 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/ttrans.sql b/binsrc/tests/suite/ttrans.sql
index 1d03c5f..c39ee47 100644
--- a/binsrc/tests/suite/ttrans.sql
+++ b/binsrc/tests/suite/ttrans.sql
@@ -3,7 +3,7 @@
-- transitive dt
-echo both "SQL Transitivity\n";
+ECHO BOTH "SQL Transitivity\n";
create table knows (p1 int, p2 int, primary key (p1, p2))
alter index knows on knows partition (p1 int);
@@ -21,54 +21,53 @@ insert into knows values (2, 4);
select * from (select transitive t_in (1) t_out (2) t_distinct p1, p2 from knows) k where k.p1 = 1;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans lr\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans lr\n";
select * from (select transitive t_in (1) t_out (2) t_distinct p1, p2 from knows) k where k.p2 = 1;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": trans lr 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": trans lr 2\n";
select * from (select transitive t_in (1) t_out (2) t_distinct p1, p2 from knows) k where k.p2 = 4;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": trans rl\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": trans rl\n";
select * from (select transitive t_in (1) t_out (2) t_distinct p1, p2 from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 1\n";
select * from (select transitive t_in (1) t_out (2) t_direction 1 t_distinct p1, p2 from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 2\n";
select * from (select transitive t_in (1) t_out (2) t_direction 2 t_distinct p1, p2 from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 3\n";
select * from (select transitive t_in (1) t_out (2) t_direction 3 t_distinct t_shortest_only p1, p2 from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 4\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 4\n";
select * from (select transitive t_in (1) t_out (2) t_distinct p1, p2 from (select p1, p2 from knows union all select p2, p1 from knows) k2) k where k.p2 = 4;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans rl union\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans rl union\n";
select * from (select transitive t_in (1) t_out (2) t_direction 1 t_distinct p1, p2, t_step (1) as via, t_step ('path_id') as path , t_step ('step_no') as step from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans steps d1\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans steps d1\n";
select * from (select transitive t_in (1) t_out (2) t_direction 2 t_distinct p1, p2, t_step (1) as via, t_step ('path_id') as path , t_step ('step_no') as step from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans steps d2\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans steps d2\n";
select * from (select transitive t_in (1) t_out (2) t_direction 3 t_distinct t_shortest_only p1, p2, t_step (1) as via, t_step ('path_id') as path , t_step ('step_no') as step from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans steps d3\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans steps d3\n";
select p2, dist, (select count (*) from knows c where c.p1 = k.p2) from (select transitive t_in (1) t_out (2) t_distinct p1, p2, t_step ('step_no') as dist from knows) k where p1 = 1 order by dist, 3 desc;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans order dist, friend count\n";
-
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans order dist, friend count\n";
diff --git a/binsrc/tests/suite/ttrans1.sql b/binsrc/tests/suite/ttrans1.sql
index cd14715..70f58a9 100644
--- a/binsrc/tests/suite/ttrans1.sql
+++ b/binsrc/tests/suite/ttrans1.sql
@@ -3,7 +3,7 @@
-- transitive dt
-echo both "SPARQL Transitivity with mapping\n";
+ECHO BOTH "SPARQL Transitivity with mapping\n";
create table knows (p1 int, p2 int, primary key (p1, p2))
alter index knows on knows partition (p1 int);
@@ -36,8 +36,8 @@ sparql
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?s=<psn://1>)}
;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans lr\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans lr\n";
select sparql_to_sql_text ('
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
@@ -47,8 +47,8 @@ sparql
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?o=<psn://1>)}
;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": trans lr 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": trans lr 2\n";
select sparql_to_sql_text ('
@@ -59,8 +59,8 @@ sparql
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": trans rl\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": trans rl\n";
select sparql_to_sql_text ('
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
@@ -70,8 +70,8 @@ sparql
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 1\n";
select sparql_to_sql_text ('
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }} option
@@ -81,8 +81,8 @@ sparql
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_direction 1, t_in(?s), t_out(?o)) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 2\n";
select sparql_to_sql_text ('
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
@@ -92,8 +92,8 @@ sparql
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_direction 2, t_in(?s), t_out(?o)) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 3\n";
select sparql_to_sql_text ('
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
@@ -103,8 +103,8 @@ sparql
select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_direction 3, t_shortest_only, t_in(?s), t_out(?o)) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 4\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 4\n";
select sparql_to_sql_text ('
select * from <psn> where { {select * from <psn> where {{?s <knows> ?o} union {?o <knows> ?s}}}
@@ -113,8 +113,8 @@ select * from <psn> where { {select * from <psn> where {{?s <knows> ?o} union {?
sparql select * from <psn> where { {select * from <psn> where {{?s <knows> ?o} union {?o <knows> ?s}}}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans rl union\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans rl union\n";
select sparql_to_sql_text ('
@@ -126,19 +126,18 @@ select * from <psn> where { {select * from <psn> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_direction 1, t_in(?s), t_out(?o), t_step (?s) as ?via, t_step ("path_id") as ?path, t_step ("step_no") as ?step) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
select * from (select transitive t_in (1) t_out (2) t_direction 1 t_distinct p1, p2, t_step (1) as via, t_step ('path_id') as path , t_step ('step_no') as step from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans steps d1\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans steps d1\n";
select * from (select transitive t_in (1) t_out (2) t_direction 2 t_distinct p1, p2, t_step (1) as via, t_step ('path_id') as path , t_step ('step_no') as step from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans steps d2\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans steps d2\n";
select * from (select transitive t_in (1) t_out (2) t_direction 3 t_distinct t_shortest_only p1, p2, t_step (1) as via, t_step ('path_id') as path , t_step ('step_no') as step from knows) k where p1 = 1 and p2 = 4;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans steps d3\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans steps d3\n";
select p2, dist, (select count (*) from knows c where c.p1 = k.p2) from (select transitive t_in (1) t_out (2) t_distinct p1, p2, t_step ('step_no') as dist from knows) k where p1 = 1 order by dist, 3 desc;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans order dist, friend count\n";
-
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans order dist, friend count\n";
diff --git a/binsrc/tests/suite/ttrans2.sql b/binsrc/tests/suite/ttrans2.sql
index 4ce1513..b61e89e 100644
--- a/binsrc/tests/suite/ttrans2.sql
+++ b/binsrc/tests/suite/ttrans2.sql
@@ -3,7 +3,7 @@
-- transitive dt
-echo both "SPARQL Triples Transitivity\n";
+ECHO BOTH "SPARQL Triples Transitivity\n";
@@ -21,8 +21,8 @@ sparql
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?s=<psn://1>)}
;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans lr\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans lr\n";
select sparql_to_sql_text ('
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
@@ -32,8 +32,8 @@ sparql
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?o=<psn://1>)}
;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-echo both ": trans lr 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+ECHO BOTH ": trans lr 2\n";
select sparql_to_sql_text ('
@@ -44,8 +44,8 @@ sparql
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-echo both ": trans rl\n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+ECHO BOTH ": trans rl\n";
select sparql_to_sql_text ('
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
@@ -55,8 +55,8 @@ sparql
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 1\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 1\n";
select sparql_to_sql_text ('
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }} option
@@ -66,8 +66,8 @@ sparql
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_direction 1, t_in(?s), t_out(?o)) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 2\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 2\n";
select sparql_to_sql_text ('
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
@@ -77,8 +77,8 @@ sparql
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_direction 2, t_in(?s), t_out(?o)) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 3\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 3\n";
select sparql_to_sql_text ('
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
@@ -88,8 +88,8 @@ sparql
select * from <psn1> where { {select * from <psn1> where { ?s <knows> ?o }}
option (transitive, t_distinct, t_direction 3, t_shortest_only, t_in(?s), t_out(?o)) . filter (?s=<psn://1> && ?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-echo both ": trans lrrl 4\n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+ECHO BOTH ": trans lrrl 4\n";
select sparql_to_sql_text ('
select * from <psn1> where { {select * from <psn1> where {{?s <knows> ?o} union {?o <knows> ?s}}}
@@ -98,8 +98,8 @@ select * from <psn1> where { {select * from <psn1> where {{?s <knows> ?o} union
sparql select * from <psn1> where { {select * from <psn1> where {{?s <knows> ?o} union {?o <knows> ?s}}}
option (transitive, t_distinct, t_in(?s), t_out(?o)) . filter (?o=<psn://4>)}
;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both ": trans rl union\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": trans rl union\n";
select sparql_to_sql_text ('
diff --git a/binsrc/tests/suite/ttrig1.sql b/binsrc/tests/suite/ttrig1.sql
index 45ec56b..ee7fc44 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test local or remote table triggers.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/ttrig2.sql b/binsrc/tests/suite/ttrig2.sql
index 1d838c0..2f96e9c 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test INSTEAD OF & view triggers.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -68,8 +68,8 @@ create procedure tv_upd ()
tv_upd ();
select * from tt;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-echo both " test with constant col in view with instead of triggers.\n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+ECHO BOTH ": test with constant col in view with instead of triggers.\n";
diff --git a/binsrc/tests/suite/ttrigr.sql b/binsrc/tests/suite/ttrigr.sql
index a3ba0fb..87a5f09 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Trigger testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/ttrigt.sql b/binsrc/tests/suite/ttrigt.sql
index 2d9c563..ac6d344 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Trigger testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/ttrigtrig.sql b/binsrc/tests/suite/ttrigtrig.sql
index e5e92fb..46a3760 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Trigger testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/ttutorial.sh b/binsrc/tests/suite/ttutorial.sh
index 46c689c..7de16e2 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tunder1.sql b/binsrc/tests/suite/tunder1.sql
index 74e2013..7067581 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Test DDL functionality #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tunder2.sql b/binsrc/tests/suite/tunder2.sql
index 0951f40..43e0b68 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 2006/10/09 12:32:39 source Exp $
+-- $Id$
--
-- Test DDL functionality #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tunq.sql b/binsrc/tests/suite/tunq.sql
index ff516c3..90f3854 100644
--- a/binsrc/tests/suite/tunq.sql
+++ b/binsrc/tests/suite/tunq.sql
@@ -1,10 +1,10 @@
--
--- $Id: tunq.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tupdate.sql b/binsrc/tests/suite/tupdate.sql
index dc53a32..ae3140d 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.3 2009/07/16 06:17:17 source Exp $
+-- $Id$
--
-- Update tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -283,7 +283,7 @@ create procedure LOCK_TT_FILL (in N int)
select sys_stat ('tc_pl_split_while_wait');
-echo both " tc_pl_split_while_wait=" $last[1] "\n";
+ECHO BOTH " tc_pl_split_while_wait=" $LAST[1] "\n";
drop table trb;
@@ -576,9 +576,9 @@ insert into XX (a) values (2);
insert into XX (a) values (3);
select * from XX;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows after insert \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows after insert \n";
update XX set a = a + 2 where a > 1;
@@ -587,24 +587,24 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": update ... where a > 1 : STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select * from XX where a > 3;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows with a > 3 after update with instead of trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows with a > 3 after update with instead of trigger \n";
select * from XX_upd_log where dt = 'bu';
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in before update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in before update trigger \n";
select * from XX_upd_log where dt = 'iu';
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in instead of update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in instead of update trigger \n";
select * from XX_upd_log where dt = 'au';
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in after update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in after update trigger \n";
drop trigger XX_U_INST;
delete from XX_upd_log;
@@ -615,24 +615,24 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": update ... where a > 1 : STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select * from XX where a > 3;
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows with a > 3 after update w/o instead of trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows with a > 3 after update w/o instead of trigger \n";
select * from XX_upd_log where dt = 'bu';
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in before update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in before update trigger \n";
select * from XX_upd_log where dt = 'iu';
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in instead of update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in instead of update trigger \n";
select * from XX_upd_log where dt = 'au';
-echo both $if $equ $rowcnt 2 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in after update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 2 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in after update trigger \n";
delete from XX;
delete from XX_upd_log;
@@ -642,9 +642,9 @@ insert into XX (a) values (2);
insert into XX (a) values (3);
select * from XX;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows after insert \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows after insert \n";
create trigger XX_U_B before update on XX referencing old as O, new as N {
dbg_obj_print ('before update - signal', O.a, N.a, N.b);
@@ -660,24 +660,24 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": update ... where a > 1 : STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select * from XX where a > 3;
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows with a > 3 after update with signal in before update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows with a > 3 after update with signal in before update trigger \n";
select * from XX_upd_log where dt = 'bu';
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in before update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in before update trigger \n";
select * from XX_upd_log where dt = 'iu';
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in instead of update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in instead of update trigger \n";
select * from XX_upd_log where dt = 'au';
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in after update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in after update trigger \n";
drop trigger XX_U_B;
create trigger XX_U_B before update on XX referencing old as O, new as N {
@@ -693,9 +693,9 @@ insert into XX (a) values (2);
insert into XX (a) values (3);
select * from XX;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows after insert \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows after insert \n";
create trigger XX_U_A after update on XX referencing old as O, new as N {
dbg_obj_print ('after update with signal' , O.a, N.a, N.b);
@@ -710,24 +710,24 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": update ... where a > 1 error in after trigger : STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
select * from XX where a > 3;
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows with a > 3 after update with signal in after update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows with a > 3 after update with signal in after update trigger \n";
select * from XX_upd_log where dt = 'bu';
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in before update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in before update trigger \n";
select * from XX_upd_log where dt = 'iu';
-echo both $if $equ $rowcnt 0 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in instead of update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 0 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in instead of update trigger \n";
select * from XX_upd_log where dt = 'au';
-echo both $if $equ $rowcnt 1 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows logged to be updated in after update trigger \n";
+ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows logged to be updated in after update trigger \n";
delete from XX;
delete from XX_upd_log;
@@ -739,9 +739,9 @@ insert into XX (a) values (2);
insert into XX (a) values (3);
select * from XX;
-echo both $if $equ $rowcnt 3 "PASSED" "***FAILED";
-set argv[$lif] $+ $argv[$lif] 1;
-echo both " " $rowcnt " rows after insert \n";
+ECHO BOTH $IF $EQU $ROWCNT 3 "PASSED" "***FAILED";
+SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
+ECHO BOTH ": " $ROWCNT " rows after insert \n";
create trigger XX_U_A after update on XX referencing old as O, new as N {
dbg_obj_print ('after update - recreated' , O.a, N.a, N.b);
diff --git a/binsrc/tests/suite/tupdg.sql b/binsrc/tests/suite/tupdg.sql
index e153f14..7039bfd 100644
--- a/binsrc/tests/suite/tupdg.sql
+++ b/binsrc/tests/suite/tupdg.sql
@@ -1,10 +1,10 @@
--
--- $Id: tupdg.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tupgrade_recov.sh b/binsrc/tests/suite/tupgrade_recov.sh
index b1e4a25..6de31ea 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# Database recovery tests afer database upgrade
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tvad.sh b/binsrc/tests/suite/tvad.sh
index e73ee61..362d7c1 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.3 2011/03/25 15:10:16 source Exp $
+# $Id$
#
# VAD tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -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-2011 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2012 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-2011 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2012 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-2011 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2012 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-2011 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2012 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 70aea44..8a9b696 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# VAD tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tview.sql b/binsrc/tests/suite/tview.sql
index 45af294..a1f978a 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- UNION and VIEW tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -114,7 +114,7 @@ ECHO BOTH ": " $LAST[1] " words in words_v with len = 6\n";
select *, 1 from T1 union all select *, 2 from T1 order by ROW_NO;
ECHO BOTH $IF $EQU $ROWCNT 40 "PASSED" "***FAILED";
-ECHO BOTH ": sorted union all " $rowcnt " rows\n";
+ECHO BOTH ": sorted union all " $ROWCNT " rows\n";
drop table TVUPDATE;
create table TVUPDATE (ROW_NO integer not null primary key, STRING1 varchar, STRING2 varchar);
@@ -137,7 +137,7 @@ ECHO BOTH ": inserted into view " $ROWCNT " rows\n";
delete from TVUPDATE_LOW_10 where R >= 200;
select * from TVUPDATE_LOW_10;
ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
-ECHO BOTH ": deld from inserted view, now " $rowcnt " rows\n";
+ECHO BOTH ": deld from inserted view, now " $ROWCNT " rows\n";
drop view TVUPDATE;
select * from TVUPDATE_LOW_10;
diff --git a/binsrc/tests/suite/tviewqual.sql b/binsrc/tests/suite/tviewqual.sql
index 62015ef..cfc4c23 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- expansion of the view qualifiers
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tvsp.sh b/binsrc/tests/suite/tvsp.sh
index 7c1ffa7..d5b3285 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 2008/12/17 16:55:28 source Exp $
+# $Id$
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tvsp.sql b/binsrc/tests/suite/tvsp.sql
index 7fccd6a..867de26 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- Check vsp functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/tvspx.sh b/binsrc/tests/suite/tvspx.sh
index cca58e3..52b0a3f 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.3 2010/01/28 14:33:20 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tvspxex.awk b/binsrc/tests/suite/tvspxex.awk
index 54e3eb6..b7a5785 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/tvspxex.sh b/binsrc/tests/suite/tvspxex.sh
index 09d8ba9..888997f 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.1 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/twcopy.sh b/binsrc/tests/suite/twcopy.sh
index 9061201..eb830bd 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.4 2011/03/25 15:10:16 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/twcopy.sql b/binsrc/tests/suite/twcopy.sql
index aed7a4c..9815209 100644
--- a/binsrc/tests/suite/twcopy.sql
+++ b/binsrc/tests/suite/twcopy.sql
@@ -1,10 +1,10 @@
--
--- $Id: twcopy.sql,v 1.2.2.1 2010/01/31 20:18:26 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -74,19 +74,19 @@ ECHO BOTH ": Retrival of the non existing site done : STATE=" $STATE " MESSAGE="
select count (*) from WS.WS.VFS_QUEUE;
-echo both $if $equ $last[1] 36 "PASSED" "*** FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 36 "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-echo both ": " $last[1] " entries in queue processed\n";
+ECHO BOTH ": " $LAST[1] " entries in queue processed\n";
select * from WS.WS.VFS_URL;
select count (*) from WS.WS.VFS_URL;
-echo both $if $equ $last[1] 21 "PASSED" "*** FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 21 "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-echo both ": " $last[1] " urls retrieved\n";
+ECHO BOTH ": " $LAST[1] " urls retrieved\n";
select count (*) from WS.WS.SYS_DAV_RES;
-echo both $if $equ $last[1] 21 "PASSED" "*** FAILED";
+ECHO BOTH $IF $EQU $LAST[1] 21 "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-echo both ": " $last[1] " urls stored\n";
+ECHO BOTH ": " $LAST[1] " urls stored\n";
ECHO BOTH "Export to local file system\n";
diff --git a/binsrc/tests/suite/twiki.sh b/binsrc/tests/suite/twiki.sh
index a441418..ce26d6d 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.2 2009/07/09 13:04:50 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/twiki.sql b/binsrc/tests/suite/twiki.sql
index 556dbd9..c66be4d 100644
--- a/binsrc/tests/suite/twiki.sql
+++ b/binsrc/tests/suite/twiki.sql
@@ -117,10 +117,3 @@ ECHO BOTH ": delete from and upload to Test : STATE=" $STATE " MESSAGE=" $MESSAG
delete_cluster_test('Test');
ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED";
ECHO BOTH ": delete Test : STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-
-
-
-
-
-
-
diff --git a/binsrc/tests/suite/twords.sql b/binsrc/tests/suite/twords.sql
index 60dcb69..94cf9b6 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.2 2009/07/09 13:04:50 source Exp $
+-- $Id$
--
-- Word tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -415,19 +415,18 @@ ECHO BOTH ": " $LAST [2] " distinct word lengths.\n";
select count (*) from words wherre word like 'burro';
-echo both $if $equ $last[1] "PASSED" "***FAILED";
-echo both " exact like OK.\n";
+ECHO BOTH $IF $EQU $LAST[1] "PASSED" "***FAILED";
+ECHO BOTH ": exact like OK.\n";
select count (*) from words where word like '%';
-echo both $if $equ $last[1] 86061 "PASSED" "***FAILED";
-echo both " % like OK.\n";
+ECHO BOTH $IF $EQU $LAST[1] 86061 "PASSED" "***FAILED";
+ECHO BOTH ": % like OK.\n";
select count (*) from words where word like 'bur%';
-echo both $if $equ $last[1] 90 "PASSED" "***FAILED";
-echo both " prefix % like OK.\n";
-
+ECHO BOTH $IF $EQU $LAST[1] 90 "PASSED" "***FAILED";
+ECHO BOTH ": prefix % like OK.\n";
ECHO BOTH "COMPLETED WITH " $ARGV[0] " FAILED, " $ARGV[1] " PASSED: Wordtest\n";
diff --git a/binsrc/tests/suite/twsrm.sql b/binsrc/tests/suite/twsrm.sql
index ba59530..8b600a0 100644
--- a/binsrc/tests/suite/twsrm.sql
+++ b/binsrc/tests/suite/twsrm.sql
@@ -1,10 +1,10 @@
--
--- $Id: twsrm.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/twsrp.sql b/binsrc/tests/suite/twsrp.sql
index d91c4dd..b7a3084 100644
--- a/binsrc/tests/suite/twsrp.sql
+++ b/binsrc/tests/suite/twsrp.sql
@@ -1,10 +1,10 @@
--
--- $Id: twsrp.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/twss.sql b/binsrc/tests/suite/twss.sql
index 4d949a8..ae7afae 100644
--- a/binsrc/tests/suite/twss.sql
+++ b/binsrc/tests/suite/twss.sql
@@ -1,10 +1,10 @@
--
--- $Id: twss.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/twstr.sql b/binsrc/tests/suite/twstr.sql
index 91e9227..8eccba9 100644
--- a/binsrc/tests/suite/twstr.sql
+++ b/binsrc/tests/suite/twstr.sql
@@ -1,10 +1,10 @@
--
--- $Id: twstr.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -436,4 +436,3 @@ select count (*) from WS_S_5;
ECHO BOTH $IF $EQU $LAST[1] 3 "PASSED" "***FAILED";
SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": WS-TRUST CHECK RESULT TABLE ROWS = " $LAST[1] "\n";
-
diff --git a/binsrc/tests/suite/txml.sql b/binsrc/tests/suite/txml.sql
index a3fdafa..88e6a7f 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 2006/04/11 17:56:11 source Exp $
+-- $Id$
--
-- XML tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/txmla.sql b/binsrc/tests/suite/txmla.sql
index ace47cf..5e9445d 100644
--- a/binsrc/tests/suite/txmla.sql
+++ b/binsrc/tests/suite/txmla.sql
@@ -1,10 +1,10 @@
--
--- $Id: txmla.sql,v 1.4.2.1 2009/04/20 21:19:39 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/txmla3.sql b/binsrc/tests/suite/txmla3.sql
index 5e4c6bc..dc419fd 100644
--- a/binsrc/tests/suite/txmla3.sql
+++ b/binsrc/tests/suite/txmla3.sql
@@ -1,10 +1,10 @@
--
--- $Id: txmla3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -265,4 +265,3 @@ select test_bookmark_suite ('localhost', server_http_port(),
;
ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED";
ECHO BOTH ": XMLA Bookmark test 5 : STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-
diff --git a/binsrc/tests/suite/txmlload.sql b/binsrc/tests/suite/txmlload.sql
index f31ad3f..bd85a1f 100644
--- a/binsrc/tests/suite/txmlload.sql
+++ b/binsrc/tests/suite/txmlload.sql
@@ -1,10 +1,10 @@
--
--- $Id: txmlload.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -34,4 +34,3 @@ xml_test ('http://localhost:$U{HTTPPORT}/docsrc/sqlreference.xml');
xml_test ('http://localhost:$U{HTTPPORT}/docsrc/user.xml');
xml_test ('http://localhost:$U{HTTPPORT}/docsrc/vdbconcepts.xml');
xml_test ('http://localhost:$U{HTTPPORT}/docsrc/virtdocs.xml');
-
diff --git a/binsrc/tests/suite/txsl.sql b/binsrc/tests/suite/txsl.sql
index 81906a5..f36f920 100644
--- a/binsrc/tests/suite/txsl.sql
+++ b/binsrc/tests/suite/txsl.sql
@@ -1,10 +1,10 @@
--
--- $Id: txsl.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/txslt.sh b/binsrc/tests/suite/txslt.sh
index e28d93c..4c0037f 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.1 2009/04/20 21:17:47 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/tests/suite/txslt.sql b/binsrc/tests/suite/txslt.sql
index 1917721..337cbd8 100644
--- a/binsrc/tests/suite/txslt.sql
+++ b/binsrc/tests/suite/txslt.sql
@@ -1,10 +1,10 @@
--
--- $Id: txslt.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -123,4 +123,3 @@ nfuser:
return;
}
;
-
diff --git a/binsrc/tests/suite/txslt1.sql b/binsrc/tests/suite/txslt1.sql
index bf2b072..855fe66 100644
--- a/binsrc/tests/suite/txslt1.sql
+++ b/binsrc/tests/suite/txslt1.sql
@@ -1,10 +1,10 @@
--
--- $Id: txslt1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/txslt_funcext.sql b/binsrc/tests/suite/txslt_funcext.sql
index 72a88fd..02d498e 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/uaggr_test.sql b/binsrc/tests/suite/uaggr_test.sql
index 14cf283..9fbbe31 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -167,4 +167,3 @@ ECHO BOTH ": REGR_SYY = REGR_COUNT () * VAR_POP (x) = " $LAST[1] "\n";
select BB (REGR_SXY (i, val)), BB(REGR_COUNT(i,val) * COVAR_POP (i,val)) from var_test where val is not null;
ECHO BOTH $IF $EQU $LAST[1] $LAST[2] "PASSED" "***FAILED";
ECHO BOTH ": REGR_SXY = REGR_COUNT () * COVAR_POP (x,y) = " $LAST[1] "\n";
-
diff --git a/binsrc/tests/suite/udtsec.sql b/binsrc/tests/suite/udtsec.sql
index ac3d90b..b0328b0 100644
--- a/binsrc/tests/suite/udtsec.sql
+++ b/binsrc/tests/suite/udtsec.sql
@@ -1,10 +1,10 @@
--
--- $Id: udtsec.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/udttest.sql b/binsrc/tests/suite/udttest.sql
index 64f292e..5698879 100644
--- a/binsrc/tests/suite/udttest.sql
+++ b/binsrc/tests/suite/udttest.sql
@@ -1,10 +1,10 @@
--
--- $Id: udttest.sql,v 1.2.2.1 2009/07/14 22:24:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/udttest1.sql b/binsrc/tests/suite/udttest1.sql
index d485d15..bb135a0 100644
--- a/binsrc/tests/suite/udttest1.sql
+++ b/binsrc/tests/suite/udttest1.sql
@@ -1,10 +1,10 @@
--
--- $Id: udttest1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/uri_test.sql b/binsrc/tests/suite/uri_test.sql
index f442682..535b5f7 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/uri_wide_test.sql b/binsrc/tests/suite/uri_wide_test.sql
index 47aec30..00e22de 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 2007/11/18 15:10:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/url_rewrite_test.sql b/binsrc/tests/suite/url_rewrite_test.sql
index aa9d699..42a79f8 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 2007/05/15 12:40:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -30,23 +30,23 @@ delete from DB.DBA.URL_REWRITE_RULE_LIST;
DB.DBA.URLREWRITE_CREATE_SPRINTF_RULE('rule1', 1, '/%s/%s/%d', vector('app_name', 'user_name', 'post_id'), 3, '/app_name=%s&post_id=%d&user_name=%s', vector('app_name', 'post_id', 'user_name'), NULL);
select URLREWRITE_ENUMERATE_RULES('%rul%')[0];
ECHO BOTH $IF $EQU $LAST[1] rule1 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
DB.DBA.URLREWRITE_CREATE_SPRINTF_RULE('rule2', 1, '/%s/%s/%d', vector('app_name', 'user_name', 'post_id'), 3, '/app_name=%s&post_id=%d&user_name=%s', vector('app_name', 'post_id', 'user_name'), NULL);
select URLREWRITE_ENUMERATE_RULES('%rul%')[1];
ECHO BOTH $IF $EQU $LAST[1] rule2 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
DB.DBA.URLREWRITE_CREATE_SPRINTF_RULE('rule22', 1, '/%s/%s/%d', vector('app_name', 'user_name', 'post_id'), 3, '/app_name2=%s&post_id2=%d&user_name2=%s', vector('app_name', 'post_id', 'user_name'), NULL);
select URLREWRITE_ENUMERATE_RULES('%rul%')[2];
ECHO BOTH $IF $EQU $LAST[1] rule22 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
DB.DBA.URLREWRITE_CREATE_REGEX_RULE('rule4', 1, '/\([^/]*\)/\([^/]*\)/\([^/]*\)', vector('app_name', 'user_name', 'post_id'), 3, '/app_name3=%s&post_id3=%s&user_name3=%s', vector('app_name', 'post_id', 'user_name'), NULL);
select URLREWRITE_ENUMERATE_RULES('%rule4')[0];
ECHO BOTH $IF $EQU $LAST[1] rule4 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
DB.DBA.URLREWRITE_CREATE_RULELIST('rule_list2', 1, vector('rule1', 'rule2'));
DB.DBA.URLREWRITE_CREATE_RULELIST('rule_list1', 1, vector('rule_list2'));
@@ -54,33 +54,33 @@ DB.DBA.URLREWRITE_CREATE_RULELIST('rule_list22', 1, vector('rule22'));
select DB.DBA.URLREWRITE_ENUMERATE_RULELISTS('%rul%')[0];
ECHO BOTH $IF $EQU $LAST[1] rule_list1 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
select DB.DBA.URLREWRITE_ENUMERATE_RULELISTS('%rul%')[1];
ECHO BOTH $IF $EQU $LAST[1] rule_list2 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
DB.DBA.URLREWRITE_CREATE_SPRINTF_RULE('rule3', 1, '%/%s/%d', vector('app_name', 'user_name', 'post_id'), 3, '/app_name=%s&post_id=%d&user_name=%s', vector('app_name', 'post_id', 'user_name'), NULL);
select URLREWRITE_ENUMERATE_RULES('%rul%')[2];
ECHO BOTH $IF $EQU $LAST[1] rule22 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
DB.DBA.URLREWRITE_DROP_RULE('rule3');
select length(URLREWRITE_ENUMERATE_RULES('%rule3'));
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
DB.DBA.URLREWRITE_CREATE_RULELIST('rule_list4', 1, vector('rule4'));
DB.DBA.URLREWRITE_CREATE_RULELIST('rule_list3', 1, vector('rule_list2', 'rule1'));
select DB.DBA.URLREWRITE_ENUMERATE_RULELISTS('rule_list3')[0];
ECHO BOTH $IF $EQU $LAST[1] rule_list3 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
DB.DBA.URLREWRITE_DROP_RULELIST('rule_list3');
select length(DB.DBA.URLREWRITE_ENUMERATE_RULELISTS('rule_list3'));
ECHO BOTH $IF $EQU $LAST[1] 0 "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
VHOST_REMOVE ('*ini*', '*ini*', '/weblog');
VHOST_REMOVE ('*ini*', '*ini*', '/weblog/aziz');
@@ -111,7 +111,7 @@ create procedure DB.DBA.test_sprintf(in path varchar) returns any
};
select DB.DBA.test_sprintf('http://localhost:$U{HTTPPORT}/weblog/aziz/1');
ECHO BOTH $IF $EQU $LAST[1] '/app_name=weblog&post_id=1&user_name=aziz' "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
VHOST_REMOVE ('*ini*', '*ini*', '/weblog/aziz');
@@ -120,11 +120,11 @@ DB.DBA.VHOST_DEFINE(lpath=>'/weblog/aziz', ppath=>'/weblog/aziz/', vsp_user=>'db
opts=>vector ('url_rewrite', 'rule_list22'));
select DB.DBA.test_sprintf('http://localhost:$U{HTTPPORT}/weblog/aziz/1');
ECHO BOTH $IF $EQU $LAST[1] '/app_name2=weblog&post_id2=1&user_name2=aziz' "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
select DB.DBA.test_sprintf('http://localhost:$U{HTTPPORT}/weblog/aziz');
ECHO BOTH $IF $EQU $LAST[1] '/app_name2=weblog&user_name2=aziz' "***FAILED" "PASSED" ;
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
VHOST_REMOVE ('*ini*', '*ini*', '/weblog');
@@ -154,16 +154,16 @@ create procedure DB.DBA.test_regexp(in path varchar) returns any
};
select DB.DBA.test_regexp('http://localhost:$U{HTTPPORT}/weblog/aziz/1');
ECHO BOTH $IF $EQU $LAST[1] '/app_name=weblog&post_id=1&user_name=aziz' "***FAILED" "PASSED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
VHOST_REMOVE ('*ini*', '*ini*', '/weblog/aziz');
select DB.DBA.test_regexp('http://localhost:$U{HTTPPORT}/weblog/aziz/1');
ECHO BOTH $IF $EQU $LAST[1] '/app_name3=weblog&post_id3=1&user_name3=aziz' "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
select DB.DBA.test_regexp('http://localhost:$U{HTTPPORT}/weblog/aziz');
ECHO BOTH $IF $EQU $LAST[1] '/app_name3=weblog&user_name3=aziz' "***FAILED" "PASSED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
create procedure DB.DBA.test_inverse(in rule varchar, in path varchar)
@@ -193,24 +193,23 @@ create procedure DB.DBA.test_inverse(in rule varchar, in path varchar)
select DB.DBA.test_inverse('rule1', 'http://localhost:$U{HTTPPORT}/app_name=weblog&post_id=1&user_name=aziz');
ECHO BOTH $IF $EQU $LAST[1] 'weblog/aziz/1' "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
select DB.DBA.test_inverse('rule2', 'http://localhost:$U{HTTPPORT}/app_name=weblog&post_id=1&user_name=aziz');
ECHO BOTH $IF $EQU $LAST[1] 'weblog/aziz/1' "PASSED" "***FAILED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
select DB.DBA.test_inverse('rule4', 'http://localhost:$U{HTTPPORT}/app_name=weblog&post_id=1&user_name=aziz');
ECHO BOTH $IF $EQU $LAST[1] 'weblog/aziz/1' "***FAILED" "PASSED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
select DB.DBA.test_inverse('rule3', 'http://localhost:$U{HTTPPORT}/app_name=weblog&post_id=1&user_name=aziz');
ECHO BOTH $IF $EQU $LAST[1] 'weblog/aziz/1' "***FAILED" "PASSED";
-ECHO BOTH " " $LAST[1] "\n";
+ECHO BOTH ": " $LAST[1] "\n";
select DB.DBA.test_inverse('rule22', 'http://localhost:$U{HTTPPORT}/app_name=weblog&post_id=1&user_name=aziz');
ECHO BOTH $IF $EQU $LAST[1] 'weblog/aziz/1' "***FAILED" "PASSED";
-ECHO BOTH " " $LAST[1] "\n";
-
+ECHO BOTH ": " $LAST[1] "\n";
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 747e935..946f23b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e44406d..87bc85d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4646846..4459fef 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 747e935..946f23b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e44406d..87bc85d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 7ab6593..ca47e70 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/vad_test1.xml b/binsrc/tests/suite/vad_test1.xml
index b241161..dd02165 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-2011 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2012 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 ba85f93..74c99a8 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-2011 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2012 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/virtuoso-1111.ini b/binsrc/tests/suite/virtuoso-1111.ini
index 295f208..6e578be 100644
--- a/binsrc/tests/suite/virtuoso-1111.ini
+++ b/binsrc/tests/suite/virtuoso-1111.ini
@@ -1,7 +1,7 @@
;
; virtuoso.ini
;
-; $Id: virtuoso-1111.ini,v 1.4.2.1 2009/07/09 13:04:50 source Exp $
+; $Id$
;
; Configuration file for the OpenLink Virtuoso VDBMS Server
;
diff --git a/binsrc/tests/suite/vspsoap.vsp b/binsrc/tests/suite/vspsoap.vsp
index 711c51b..83e1549 100644
--- a/binsrc/tests/suite/vspsoap.vsp
+++ b/binsrc/tests/suite/vspsoap.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vspsoap.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -96,6 +96,7 @@
else if (soap_method in ('fake#test'))
{
declare res any;
+ set_user_id ('SOAP_SRV');
res := soap_server (soap_xml, soap_method, lines, 11, vector ('fake:test', 'DB.DBA.SOAPTEST'));
dbg_obj_print ('vspsoap result', res);
http (res);
diff --git a/binsrc/tests/suite/vspsoap_mod.vsp b/binsrc/tests/suite/vspsoap_mod.vsp
index 8407120..415ee47 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -96,6 +96,7 @@
else if (soap_method in ('fake#SOAPMOD3'))
{
declare res any;
+ set_user_id ('SOAP_SRV');
res := soap_server (soap_xml, soap_method, lines, 11, 'DB.DBA.SOAPMOD');
dbg_obj_print ('vspsoap result', res);
http (res);
diff --git a/binsrc/tests/suite/wsdl_suite.sql b/binsrc/tests/suite/wsdl_suite.sql
index 50c3fc9..a3f75b1 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/xmlsql.sql b/binsrc/tests/suite/xmlsql.sql
index 90531cc..354c2d3 100644
--- a/binsrc/tests/suite/xmlsql.sql
+++ b/binsrc/tests/suite/xmlsql.sql
@@ -1,10 +1,10 @@
--
--- $Id: xmlsql.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/xmlsql_vad.sql b/binsrc/tests/suite/xmlsql_vad.sql
index 2933624..8c8c14a 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 2007/03/22 13:08:32 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/xmlsupp.sql b/binsrc/tests/suite/xmlsupp.sql
index 50d17da..3f12c34 100644
--- a/binsrc/tests/suite/xmlsupp.sql
+++ b/binsrc/tests/suite/xmlsupp.sql
@@ -1,10 +1,10 @@
--
--- $Id: xmlsupp.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/suite/xsl_samples/attr_entity.xml b/binsrc/tests/suite/xsl_samples/attr_entity.xml
index cb5e323..c1f6ecc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/attr_entity.xsl b/binsrc/tests/suite/xsl_samples/attr_entity.xsl
index cd8d50c..1728d66 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/auction1.xml b/binsrc/tests/suite/xsl_samples/auction1.xml
index e29f40e..6e5d4ac 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/auction2.xml b/binsrc/tests/suite/xsl_samples/auction2.xml
index f7b0a82..ea615ea 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/auction3.xml b/binsrc/tests/suite/xsl_samples/auction3.xml
index 8783a65..eb1fc63 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/authors.xml b/binsrc/tests/suite/xsl_samples/authors.xml
index fe1aba0..72ce4c8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/bids-table.xsl b/binsrc/tests/suite/xsl_samples/bids-table.xsl
index 120c845..3a6925e 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/bids-table2.xsl b/binsrc/tests/suite/xsl_samples/bids-table2.xsl
index ff60d7c..2bc1ede 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/booksshort.xml b/binsrc/tests/suite/xsl_samples/booksshort.xml
index 2889cf9..708e44c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/bug1174.xml b/binsrc/tests/suite/xsl_samples/bug1174.xml
index cbb6e11..3e7fd72 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/bug1174.xsl b/binsrc/tests/suite/xsl_samples/bug1174.xsl
index dacd5e0..f96fb0e 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/bug3342.xml b/binsrc/tests/suite/xsl_samples/bug3342.xml
index 9572ef1..bc5872d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/bug3342.xsl b/binsrc/tests/suite/xsl_samples/bug3342.xsl
index 30f5751..fff74cc 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/convert.xsl b/binsrc/tests/suite/xsl_samples/convert.xsl
index b78380b..80352ee 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/defaultss.xsl b/binsrc/tests/suite/xsl_samples/defaultss.xsl
index ba084b2..a90a362 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/empty_comment.xml b/binsrc/tests/suite/xsl_samples/empty_comment.xml
index 07424b7..84bcf62 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/empty_comment.xsl b/binsrc/tests/suite/xsl_samples/empty_comment.xsl
index ffc2d39..3840e76 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/externalScript.xml b/binsrc/tests/suite/xsl_samples/externalScript.xml
index 96e68e2..bfe0060 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/family.xml b/binsrc/tests/suite/xsl_samples/family.xml
index 030400b..433b27d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/family.xsl b/binsrc/tests/suite/xsl_samples/family.xsl
index 79c9c91..9baed0d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/grocery-list.xml b/binsrc/tests/suite/xsl_samples/grocery-list.xml
index 10e2976..57aba86 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/grocery-list.xsl b/binsrc/tests/suite/xsl_samples/grocery-list.xsl
index f5a6976..eee078d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/grocery-list2.xml b/binsrc/tests/suite/xsl_samples/grocery-list2.xml
index 230cff5..b25c67d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/grocery-list2.xsl b/binsrc/tests/suite/xsl_samples/grocery-list2.xsl
index edce84a..645bc94 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/hilite-xml.xsl b/binsrc/tests/suite/xsl_samples/hilite-xml.xsl
index 6d9f9f6..b44d19c 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/identityxfm.xsl b/binsrc/tests/suite/xsl_samples/identityxfm.xsl
index a00f695..e622252 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/identityxfm1.xsl b/binsrc/tests/suite/xsl_samples/identityxfm1.xsl
index d924a42..7b260e8 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl b/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl
index 0987131..c81c3db 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/investments.xml b/binsrc/tests/suite/xsl_samples/investments.xml
index 7a7ff0c..de1a017 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/invoice.xml b/binsrc/tests/suite/xsl_samples/invoice.xml
index 378df6f..59cf9ae 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/invoice.xsl b/binsrc/tests/suite/xsl_samples/invoice.xsl
index 06f93a0..689c4fc 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/ledger.xml b/binsrc/tests/suite/xsl_samples/ledger.xml
index 41c5717..15c25c3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/ledger.xsl b/binsrc/tests/suite/xsl_samples/ledger.xsl
index c290b81..7799999 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/number_format.xml b/binsrc/tests/suite/xsl_samples/number_format.xml
index 07ee3a4..2d3aa54 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/number_format.xsl b/binsrc/tests/suite/xsl_samples/number_format.xsl
index d1af14a..3f88573 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/number_format1.xsl b/binsrc/tests/suite/xsl_samples/number_format1.xsl
index 89f63b4..c8ffdd2 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/pole.xml b/binsrc/tests/suite/xsl_samples/pole.xml
index 9c52bce..583d20d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/pole.xsl b/binsrc/tests/suite/xsl_samples/pole.xsl
index 14eaf4c..7699bb1 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/pole2.xml b/binsrc/tests/suite/xsl_samples/pole2.xml
index 7d9a9d6..2da2cca 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/pole2.xsl b/binsrc/tests/suite/xsl_samples/pole2.xsl
index eb75af8..f30c737 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/pole3.xml b/binsrc/tests/suite/xsl_samples/pole3.xml
index d4b3000..af98bfb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/pole3.xsl b/binsrc/tests/suite/xsl_samples/pole3.xsl
index bc0b08d..f2cd83a 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/pole4.xml b/binsrc/tests/suite/xsl_samples/pole4.xml
index 9a92dc1..a250f09 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/pole4.xsl b/binsrc/tests/suite/xsl_samples/pole4.xsl
index a9e5507..f0ab92f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml
index 3f27062..1ba6e53 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl
index 56b0337..34c391d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-choose.xml b/binsrc/tests/suite/xsl_samples/portfolio-choose.xml
index b0d89af..3548ccc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl b/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl
index dea7396..08d12ea 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl b/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl
index c5704e0..4349530 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-if.xml b/binsrc/tests/suite/xsl_samples/portfolio-if.xml
index 299dc3b..136d51a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-if.xsl b/binsrc/tests/suite/xsl_samples/portfolio-if.xsl
index dced44d..7d340d2 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-schema.xml b/binsrc/tests/suite/xsl_samples/portfolio-schema.xml
index 37820bb..db484d1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl b/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl
index 952399f..1d93a62 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml
index 6f73d62..56f9508 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl
index dfb6ec1..17043b2 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl b/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl
index 60a1b24..16a038f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio.xml b/binsrc/tests/suite/xsl_samples/portfolio.xml
index a8664a4..1fbc7d0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio.xsl b/binsrc/tests/suite/xsl_samples/portfolio.xsl
index df48e23..110efbf 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio2.xml b/binsrc/tests/suite/xsl_samples/portfolio2.xml
index f9a37e0..b6ef57e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio2.xsl b/binsrc/tests/suite/xsl_samples/portfolio2.xsl
index aa1715b..393cb08 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/price-graph.xsl b/binsrc/tests/suite/xsl_samples/price-graph.xsl
index ea2ea62..f48159e 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/product-list.xml b/binsrc/tests/suite/xsl_samples/product-list.xml
index c452ec1..c88f175 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/product-list.xsl b/binsrc/tests/suite/xsl_samples/product-list.xsl
index b242c02..8d660aa 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/product-list2.xml b/binsrc/tests/suite/xsl_samples/product-list2.xml
index 41c96cb..2d7302e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/product-list2.xsl b/binsrc/tests/suite/xsl_samples/product-list2.xsl
index e590bd0..362196a 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/raw-xml.xsl b/binsrc/tests/suite/xsl_samples/raw-xml.xsl
index 11d1170..4599c1d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/rename.xsl b/binsrc/tests/suite/xsl_samples/rename.xsl
index d01c53d..4b4c52f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl b/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl
index 42241b3..212e63b 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review-bad-script.xsl b/binsrc/tests/suite/xsl_samples/review-bad-script.xsl
index ca07226..b13e918 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review-bad.xml b/binsrc/tests/suite/xsl_samples/review-bad.xml
index 750a0b4..835662f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review-bad.xsl b/binsrc/tests/suite/xsl_samples/review-bad.xsl
index d52b17e..ac48970 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review-css.xml b/binsrc/tests/suite/xsl_samples/review-css.xml
index 44f02a4..a8b886d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review-embedded-css.xml b/binsrc/tests/suite/xsl_samples/review-embedded-css.xml
index e65375d..e6db6cb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review-simple.xsl b/binsrc/tests/suite/xsl_samples/review-simple.xsl
index 954e42b..541b87a 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review.xml b/binsrc/tests/suite/xsl_samples/review.xml
index 36dc6de..3c47c5a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/review.xsl b/binsrc/tests/suite/xsl_samples/review.xsl
index dc7024b..8c6e36a 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/simple.xml b/binsrc/tests/suite/xsl_samples/simple.xml
index 8f6bbfc..509ff99 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/simple.xsl b/binsrc/tests/suite/xsl_samples/simple.xsl
index 0c9c6a1..2b4a96a 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl
index 454f7ea..6d9a7b1 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl
index f00cee9..35ba380 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl
index 9e5cc03..fe1ec69 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder.xsl
index cf14bc2..5a6d6e1 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/sort.xsl b/binsrc/tests/suite/xsl_samples/sort.xsl
index 168d4dc..bda3b7f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml
index a18261e..cecbcdc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl
index aa3eb61..ee6892b 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter.xml b/binsrc/tests/suite/xsl_samples/stock-sorter.xml
index 92aa1f7..7a6e180 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter.xsl b/binsrc/tests/suite/xsl_samples/stock-sorter.xsl
index b31c35e..07bb30b 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 2006/08/16 08:31:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/utf8.xml b/binsrc/tests/suite/xsl_samples/utf8.xml
index bd39635..670453e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/utf8.xsl b/binsrc/tests/suite/xsl_samples/utf8.xsl
index 9669677..eec12d4 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl b/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl
index 26b118b..4f7993c 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 2006/08/16 08:31:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/suite/xsl_samples/xsl-toc.xml b/binsrc/tests/suite/xsl_samples/xsl-toc.xml
index 640fc51..3227297 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-2006 OpenLink Software
+ - 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
@@ -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 2006/04/11 17:56:11 source Exp $ -->
+<!-- $Id$ -->
<!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 9e725d2..75c0086 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-2006 OpenLink Software
+ - 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
@@ -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 2006/04/11 17:56:11 source Exp $ -->
+<!-- $Id$ -->
<!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/xslt.vsp b/binsrc/tests/suite/xslt.vsp
deleted file mode 100644
index 4db510c..0000000
--- a/binsrc/tests/suite/xslt.vsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?vsp
- http ('<root><a>Test</a></root>');
- http_xslt ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:/DAV/xslt/t.xsl');
-?>
diff --git a/binsrc/tests/testlock.c b/binsrc/tests/testlock.c
index e3cd253..105eb47 100644
--- a/binsrc/tests/testlock.c
+++ b/binsrc/tests/testlock.c
@@ -1,10 +1,10 @@
/*
- * $Id: testlock.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2008 OpenLink Software
+ * 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
diff --git a/binsrc/tests/time.c b/binsrc/tests/time.c
index 06f79a5..c3e75de 100644
--- a/binsrc/tests/time.c
+++ b/binsrc/tests/time.c
@@ -1,14 +1,14 @@
/*
* time.c
*
- * $Id: time.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* Timing functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/timeacct.h b/binsrc/tests/timeacct.h
index f81ddf7..b934023 100644
--- a/binsrc/tests/timeacct.h
+++ b/binsrc/tests/timeacct.h
@@ -1,14 +1,14 @@
/*
* timeacct.h
*
- * $Id: timeacct.h,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* Timing macros and functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/tkset.c b/binsrc/tests/tkset.c
index e4a8a78..e314223 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/tpcc.c b/binsrc/tests/tpcc.c
index df701e0..0855c55 100644
--- a/binsrc/tests/tpcc.c
+++ b/binsrc/tests/tpcc.c
@@ -1,14 +1,14 @@
/*
* tpcc.c
*
- * $Id: tpcc.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* TPC-C Benchmark
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/tpcc.h b/binsrc/tests/tpcc.h
index ce3b2f0..8cad8e2 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/tpcc.sql b/binsrc/tests/tpcc.sql
index e86be76..f4824ed 100644
--- a/binsrc/tests/tpcc.sql
+++ b/binsrc/tests/tpcc.sql
@@ -1,14 +1,14 @@
--
-- tpcc.sql
--
--- $Id: tpcc.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+-- $Id$
--
-- TPC-C Benchmark transactions as stored procedures.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpccddk.sql b/binsrc/tests/tpccddk.sql
index 89d26a0..a2c3236 100644
--- a/binsrc/tests/tpccddk.sql
+++ b/binsrc/tests/tpccddk.sql
@@ -1,14 +1,14 @@
--
-- tpccddk.sql
--
--- $Id: tpccddk.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+-- $Id$
--
-- TPC-C Benchmark
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpccoci.c b/binsrc/tests/tpccoci.c
index e54c77f..73826e5 100644
--- a/binsrc/tests/tpccoci.c
+++ b/binsrc/tests/tpccoci.c
@@ -1,14 +1,14 @@
/*
* tpcctrx.c
*
- * $Id: tpccoci.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* TPC-C Transactions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/tpccodbc.c b/binsrc/tests/tpccodbc.c
index 85e0f65..8a99cce 100644
--- a/binsrc/tests/tpccodbc.c
+++ b/binsrc/tests/tpccodbc.c
@@ -1,14 +1,14 @@
/*
* tpccodbc.c
*
- * $Id: tpccodbc.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* TPC-C Transactions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/tpcctrx.c b/binsrc/tests/tpcctrx.c
index a4a702b..47de8c0 100644
--- a/binsrc/tests/tpcctrx.c
+++ b/binsrc/tests/tpcctrx.c
@@ -1,14 +1,14 @@
/*
* tpcctrx.c
*
- * $Id: tpcctrx.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* TPC-C Transactions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tests/tpcrun/Makefile.am b/binsrc/tests/tpcrun/Makefile.am
index e7e6e23..8579f2f 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/tpcrun/Makefile.in b/binsrc/tests/tpcrun/Makefile.in
index 2270841..7480f9c 100644
--- a/binsrc/tests/tpcrun/Makefile.in
+++ b/binsrc/tests/tpcrun/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -293,14 +287,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/tpcrun/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/tpcrun/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/tpcrun/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/tpcrun/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -318,7 +312,6 @@ $(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
@@ -348,17 +341,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -386,7 +375,6 @@ clean-generic:
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"
@@ -405,8 +393,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -415,28 +401,18 @@ install-data-am:
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
@@ -470,7 +446,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tests/tpcrun/checkdb.sql b/binsrc/tests/tpcrun/checkdb.sql
index 6eeceb0..442bd46 100644
--- a/binsrc/tests/tpcrun/checkdb.sql
+++ b/binsrc/tests/tpcrun/checkdb.sql
@@ -1,10 +1,10 @@
--
--- $Id: checkdb.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpcrun/repl_ck.sql b/binsrc/tests/tpcrun/repl_ck.sql
index ec56d19..ab86387 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpcrun/repl_ck_init.sql b/binsrc/tests/tpcrun/repl_ck_init.sql
index f3d4ff0..0af4fb0 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpcrun/repl_pub_tpcc.sql b/binsrc/tests/tpcrun/repl_pub_tpcc.sql
index 9032930..a5ee165 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.1 2009/11/25 22:12:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpcrun/repl_sub_tpcc.sql b/binsrc/tests/tpcrun/repl_sub_tpcc.sql
index 9fc1966..8907c78 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.1 2009/11/25 22:12:11 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpcrun/test_server.sh b/binsrc/tests/tpcrun/test_server.sh
index 4755a07..5fa1cd0 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 2006/04/11 17:56:11 source Exp $
+# $Id$
#
# choose a server to run with
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/tpcrun/tpc_back.sql b/binsrc/tests/tpcrun/tpc_back.sql
index 74400b7..4e65a00 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 2009/02/03 15:47:27 source Exp $
+-- $Id$
--
-- Make an On-Line Backup
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpcrun/tpc_cpts.sql b/binsrc/tests/tpcrun/tpc_cpts.sql
index 868dc2f..a4c9802 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 2009/02/03 15:47:27 source Exp $
+-- $Id$
--
-- Do regular checkpoints
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/tpcrun/tpc_run.sh b/binsrc/tests/tpcrun/tpc_run.sh
index d53f2a7..531bb29 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.1 2009/04/20 21:14:24 source Exp $
+# $Id$
#
# Running the TPC benchmark
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/tpm.sql b/binsrc/tests/tpm.sql
index 539dd8c..6f2d674 100644
--- a/binsrc/tests/tpm.sql
+++ b/binsrc/tests/tpm.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpm.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/urlsimu.c b/binsrc/tests/urlsimu.c
index e22517e..5704d8e 100644
--- a/binsrc/tests/urlsimu.c
+++ b/binsrc/tests/urlsimu.c
@@ -1,5 +1,5 @@
/*
- * $Id: urlsimu.c,v 1.1.1.1.2.1 2009/04/20 21:18:31 source Exp $
+ * $Id$
*
* URLSIMU - Url simulator
*
@@ -10,7 +10,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/virtdriver.c b/binsrc/tests/virtdriver.c
index be25e6e..7db4a39 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-2009 OpenLink Software
+ * 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
diff --git a/binsrc/tests/virtdriver.sql b/binsrc/tests/virtdriver.sql
index 15b2862..df7681e 100644
--- a/binsrc/tests/virtdriver.sql
+++ b/binsrc/tests/virtdriver.sql
@@ -1,10 +1,10 @@
--
--- $Id: virtdriver.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tests/wb/Makefile.am b/binsrc/tests/wb/Makefile.am
index 9b4aaed..afe6771 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tests/wb/Makefile.in b/binsrc/tests/wb/Makefile.in
index 8f872e9..03a5d28 100644
--- a/binsrc/tests/wb/Makefile.in
+++ b/binsrc/tests/wb/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -286,14 +280,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/wb/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tests/wb/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tests/wb/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tests/wb/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -311,7 +305,6 @@ $(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
@@ -341,17 +334,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -379,7 +368,6 @@ clean-generic:
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"
@@ -398,8 +386,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -408,28 +394,18 @@ install-data-am:
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
@@ -463,7 +439,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tests/wb/inputs/XqW3cUseCases/20010215.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml
index b7a964e..d1506d5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml
index a9678fe..d868b35 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml
index 51d1e2a..8c35b80 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml
index 56c0146..193be7f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml
index 61c045b..c3a1eea 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml
index b0b2ab9..66da722 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml
index 2668125..43f3fe1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml
index 2292a0d..2609da9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml
index 2292a0d..2609da9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml
index be09097..1dc399d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml
index 79ec099..b079c44 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml
index 15eb353..2e3f0b2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml
index c4e023c..887490a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml
index 6376e79..e9986ed 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml
index 4367be4..5c17d06 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml
index c27cf01..8f6e9ed 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml
index bf66d94..858f55e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml
index 3a317c0..ff91c0b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml
index 2702d59..c5a59a9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml
index 4f117d4..dd54a2a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tests/wi.cfg b/binsrc/tests/wi.cfg
index 387a5f9..c84db2b 100644
--- a/binsrc/tests/wi.cfg
+++ b/binsrc/tests/wi.cfg
@@ -1,5 +1,5 @@
#
-# $Id: wi.cfg,v 1.1.1.1 2006/04/11 17:56:10 source Exp $
+# $Id$
#
database_file: wi.db
log_file: wi.log
diff --git a/binsrc/tutorial/1x1.html b/binsrc/tutorial/1x1.html
index 99564d0..fe3a1f8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/Makefile.am b/binsrc/tutorial/Makefile.am
index 70b5777..26d2016 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-2006 OpenLink Software
+# 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
@@ -33,7 +33,7 @@ tutorial_filesystem.vad tutorial_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
+ -rm -rf vad vad_files
# ----------------------------------------------------------------------
#
diff --git a/binsrc/tutorial/Makefile.in b/binsrc/tutorial/Makefile.in
index 7b45c00..179c681 100644
--- a/binsrc/tutorial/Makefile.in
+++ b/binsrc/tutorial/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +68,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -85,58 +82,16 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -224,7 +179,6 @@ 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@
@@ -308,7 +262,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -329,7 +282,6 @@ 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@
@@ -554,14 +506,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tutorial/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tutorial/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -579,7 +531,6 @@ $(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
@@ -589,23 +540,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -614,7 +562,7 @@ uninstall-nodist_vadDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -631,7 +579,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -639,7 +587,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -665,16 +613,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -682,14 +630,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -701,43 +649,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -758,44 +702,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -829,7 +758,6 @@ clean-generic:
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"
@@ -848,8 +776,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -858,28 +784,18 @@ install-data-am: install-nodist_vadDATA
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -900,8 +816,8 @@ ps-am:
uninstall-am: uninstall-nodist_vadDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -923,8 +839,7 @@ tutorial_filesystem.vad tutorial_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
-
+ -rm -rf vad vad_files
# 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/tutorial/apps/Makefile.am b/binsrc/tutorial/apps/Makefile.am
index 2afa3e1..69cdfc1 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/apps/Makefile.in b/binsrc/tutorial/apps/Makefile.in
index 20558e4..c7f41ae 100644
--- a/binsrc/tutorial/apps/Makefile.in
+++ b/binsrc/tutorial/apps/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -303,14 +297,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/apps/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tutorial/apps/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/apps/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tutorial/apps/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -328,7 +322,6 @@ $(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
@@ -358,17 +351,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -396,7 +385,6 @@ clean-generic:
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"
@@ -415,8 +403,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -425,28 +411,18 @@ install-data-am:
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
@@ -480,7 +456,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tutorial/apps/blog/blog.sql b/binsrc/tutorial/apps/blog/blog.sql
index 74ff7f9..97c3273 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/apps/blog/blog.xml b/binsrc/tutorial/apps/blog/blog.xml
index ebda7b2..6ce9240 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog/blog_home.vspx b/binsrc/tutorial/apps/blog/blog_home.vspx
index 5dee4a5..0d4869f 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog/blog_login.vspx b/binsrc/tutorial/apps/blog/blog_login.vspx
index 8dde097..b1a3a45 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog/blog_setup.vspx b/binsrc/tutorial/apps/blog/blog_setup.vspx
index 713eec9..10e6852 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog/get_blogs.vspx b/binsrc/tutorial/apps/blog/get_blogs.vspx
index 1ff58aa..d82540d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog/options.xml b/binsrc/tutorial/apps/blog/options.xml
index 903f35b..917a036 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog/register.vspx b/binsrc/tutorial/apps/blog/register.vspx
index 427af0d..b51cea3 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_bridge/blog.vspx b/binsrc/tutorial/apps/blog_bridge/blog.vspx
index ea2bdd0..f962565 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql b/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql
index d164840..2ac5564 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml b/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml
index 17c8de8..9a57fc1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_bridge/bridge.vspx b/binsrc/tutorial/apps/blog_bridge/bridge.vspx
index 466cd0c..bb849a0 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx b/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx
index 59adccf..5c389ba 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_bridge/login.vspx b/binsrc/tutorial/apps/blog_bridge/login.vspx
index 517f903..b26b5fc 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_bridge/options.xml b/binsrc/tutorial/apps/blog_bridge/options.xml
index a83ecca..93b5319 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_bridge/register.vspx b/binsrc/tutorial/apps/blog_bridge/register.vspx
index 50f3e58..f740b77 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_query/blog_query.sql b/binsrc/tutorial/apps/blog_query/blog_query.sql
index 8c4bef7..ac5de43 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/apps/blog_query/blog_query.xml b/binsrc/tutorial/apps/blog_query/blog_query.xml
index 29384a4..3909528 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_query/opml.xml b/binsrc/tutorial/apps/blog_query/opml.xml
index eadd713..edf0673 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/blog_query/options.xml b/binsrc/tutorial/apps/blog_query/options.xml
index ab82036..65438c9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/demo.css b/binsrc/tutorial/apps/demo.css
index 3bbab5c..b74b43f 100644
--- a/binsrc/tutorial/apps/demo.css
+++ b/binsrc/tutorial/apps/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/apps/forums/forums.xml b/binsrc/tutorial/apps/forums/forums.xml
index 0a495fc..4acdd0e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/forums/options.xml b/binsrc/tutorial/apps/forums/options.xml
index 580d97f..a427cc5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml b/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml
index bf0ba5a..3730ad0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/ibuyspy/options.xml b/binsrc/tutorial/apps/ibuyspy/options.xml
index 3f5be09..79a5895 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/index.xml b/binsrc/tutorial/apps/index.xml
index 69d2e06..c3832dc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/petshop/options.xml b/binsrc/tutorial/apps/petshop/options.xml
index 3d03ecb..ed137b5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/petshop/petshop.xml b/binsrc/tutorial/apps/petshop/petshop.xml
index 4360621..af74e47 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/petshop/petshopinit.sql b/binsrc/tutorial/apps/petshop/petshopinit.sql
index 675227f..b4180b5 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/apps/rss_feed/blog.vspx b/binsrc/tutorial/apps/rss_feed/blog.vspx
index 9c0d688..ccf3525 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/rss_feed/blogs.sql b/binsrc/tutorial/apps/rss_feed/blogs.sql
index 7ff8cef..f97cc42 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/apps/rss_feed/options.xml b/binsrc/tutorial/apps/rss_feed/options.xml
index bd4092f..7ccd823 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/rss_feed/rss.vsp b/binsrc/tutorial/apps/rss_feed/rss.vsp
index 16bb189..e302f7b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/apps/rss_feed/rss2upg.xsl b/binsrc/tutorial/apps/rss_feed/rss2upg.xsl
index 263176e..3eb587b 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/apps/rss_feed/rss_feed.xml b/binsrc/tutorial/apps/rss_feed/rss_feed.xml
index e939722..670a18c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/atom.vsp b/binsrc/tutorial/atom.vsp
index a0f7539..1503396 100644
--- a/binsrc/tutorial/atom.vsp
+++ b/binsrc/tutorial/atom.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: atom.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/dev.sql b/binsrc/tutorial/dev.sql
index 6cf4dc2..e60e3ed 100644
--- a/binsrc/tutorial/dev.sql
+++ b/binsrc/tutorial/dev.sql
@@ -1,10 +1,10 @@
--
--- $Id: dev.sql,v 1.6.2.1 2011/07/20 09:50:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -98,7 +98,7 @@ create procedure TUT_get_xml(in path varchar){
if(isnull(xpath_eval('@wwwpath',xp_example)))
{
- if (_ex_optxml and lower(xpath_eval('string(/init/@is_vspx)',_ex_optxml)) = 'yes')
+ if (_ex_optxml is not null 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));
};
@@ -222,7 +222,7 @@ create procedure TUT_generate_files(
subseq(xsl_mountpoint,length(xsl_mountpoint) - 4,length(xsl_mountpoint)) = '.vsp' or
subseq(xsl_mountpoint,length(xsl_mountpoint) - 5,length(xsl_mountpoint)) = '.vspx')
)
- xsl_mountpoint := regexp_replace(xsl_mountpoint,'[^/]*\$','');
+ xsl_mountpoint := regexp_replace(xsl_mountpoint,'[^/]+\$','');
xsl_mountpoint := trim(xsl_mountpoint,'/');
if (xsl_mountpoint = '')
xsl_mountpoint := '.';
diff --git a/binsrc/tutorial/dev.vsp b/binsrc/tutorial/dev.vsp
index 5e9419a..e1de12d 100644
--- a/binsrc/tutorial/dev.vsp
+++ b/binsrc/tutorial/dev.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dev.vsp,v 1.7 2007/05/08 17:41:08 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/example.js b/binsrc/tutorial/example.js
index f3299d4..44c1b28 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/guide.vsp b/binsrc/tutorial/guide.vsp
index acdd2d6..71878ac 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.1 2010/01/07 16:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/Makefile.am b/binsrc/tutorial/hosting/Makefile.am
index 9c1122e..413f875 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/Makefile.in b/binsrc/tutorial/hosting/Makefile.in
index fbdc983..50a1723 100644
--- a/binsrc/tutorial/hosting/Makefile.in
+++ b/binsrc/tutorial/hosting/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -433,14 +427,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/hosting/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tutorial/hosting/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/hosting/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tutorial/hosting/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -458,7 +452,6 @@ $(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
@@ -488,17 +481,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -526,7 +515,6 @@ clean-generic:
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"
@@ -545,8 +533,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -555,28 +541,18 @@ install-data-am:
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
@@ -610,7 +586,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tutorial/hosting/demo.css b/binsrc/tutorial/hosting/demo.css
index f14191e..953773b 100644
--- a/binsrc/tutorial/hosting/demo.css
+++ b/binsrc/tutorial/hosting/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/Point.java b/binsrc/tutorial/hosting/ho_s_1/Point.java
index 8f6d005..7dafa06 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-2006 OpenLink Software
+ * 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
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 2621e2d..128e2f3 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 f154dc3..967a43c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/my_finances.java b/binsrc/tutorial/hosting/ho_s_1/my_finances.java
index 59abedc..a39527b 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/options.xml b/binsrc/tutorial/hosting/ho_s_1/options.xml
index 67df1ea..e1644bd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp
index bd7d874..464e281 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp
index 77f9537..473364c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp
index c8380dd..a9b7c82 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp
index 1266855..24c77e0 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 300874d..e5ecdf8 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-2006 OpenLink Software
+// 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
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 5077023..837bf2d 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 27b9883..2e8138d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_10/options.xml b/binsrc/tutorial/hosting/ho_s_10/options.xml
index 1dba60f..18ae178 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp
index 8e97567..b2634b5 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 3196440..17b2b07 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e327eed..125b9ca 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/options.xml b/binsrc/tutorial/hosting/ho_s_11/options.xml
index 86827c0..fe5bb2c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/restricted.cs b/binsrc/tutorial/hosting/ho_s_11/restricted.cs
index 3350d70..55aa4ad 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/restricted.vsp b/binsrc/tutorial/hosting/ho_s_11/restricted.vsp
index 2ec941d..b7b9e9d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs b/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs
index 1d1b612..ff703f2 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp b/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp
index b6ba935..e6d165f 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs b/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs
index e55e191..6486509 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs b/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs
index 0006b99..b657804 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp b/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp
index 6f9b3ee..5baf179 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 ebcdb2a..89760c6 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6834aab..78c7664 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/options.xml b/binsrc/tutorial/hosting/ho_s_12/options.xml
index 8f31e10..32f6493 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/Restricted.java b/binsrc/tutorial/hosting/ho_s_13/Restricted.java
index ce22e0b..633393f 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java b/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java
index b20d5a2..282c212 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-2006 OpenLink Software
+ * 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
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 d743c7c..979a3e1 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 91c2c78..b111d71 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/options.xml b/binsrc/tutorial/hosting/ho_s_13/options.xml
index 67df1ea..e1644bd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/restricted.vsp b/binsrc/tutorial/hosting/ho_s_13/restricted.vsp
index 0684bb2..bd6dd47 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp b/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp
index 95177a9..25fbc2e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 bc700df..9b97835 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-2006 OpenLink Software
+// 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
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 51277bd..84ddb5e 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 afab1a4..8e884cf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_14/options.xml b/binsrc/tutorial/hosting/ho_s_14/options.xml
index c84efda..8853beb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp
index 38eab15..7b16e2d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 dc52899..30489e0 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-2006 OpenLink Software
+ * 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
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 bde0937..29028e3 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-2006 OpenLink Software
+ * 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
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 1d1b859..06c9763 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-2006 OpenLink Software
+ * 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
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 377bc79..9f4bc35 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-2006 OpenLink Software
+ * 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
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 9c8adbb..a115850 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-2006 OpenLink Software
+ * 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
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 1ca46b9..d681f6d 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp
index bde0937..29028e3 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h
index 1d1b859..06c9763 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-2006 OpenLink Software
+ * 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
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 d26382b..b1c50cd 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8deec95..97494fa 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/options.xml b/binsrc/tutorial/hosting/ho_s_15/options.xml
index d456df6..190cff7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp
index b7c6a21..fe9ed98 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_16/cgitest.rb b/binsrc/tutorial/hosting/ho_s_16/cgitest.rb
index 44b3235..ac83dc8 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-2006 OpenLink Software
+# 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
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 e2ced03..1732c11 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_16/options.xml b/binsrc/tutorial/hosting/ho_s_16/options.xml
index 4e962dc..5530c4c 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-2006 OpenLink Software
+ - 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
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 e54a357..f2816ff 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_17/options.xml b/binsrc/tutorial/hosting/ho_s_17/options.xml
index 67df1ea..e1644bd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs b/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs
index 447d78b..9670af0 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/Point.cs b/binsrc/tutorial/hosting/ho_s_2/Point.cs
index 66fd369..af9b7c4 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-2006 OpenLink Software
+// 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
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 0c6a4af..0401d43 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1084470..f93577c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/options.xml b/binsrc/tutorial/hosting/ho_s_2/options.xml
index c84efda..8853beb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp
index 156c862..0c9bcfe 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp
index 157a541..5a12820 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp
index ee3c584..c2ff772 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp
index 5c53a22..062921f 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/handler.vsp b/binsrc/tutorial/hosting/ho_s_3/handler.vsp
index a9b1e5f..73f9dab 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 fd91172..14e679d 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6229975..bb84474 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/options.xml b/binsrc/tutorial/hosting/ho_s_3/options.xml
index d456df6..190cff7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs b/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs
index fb56bd5..3d6f7f3 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs b/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs
index fa51f98..403d0e0 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp b/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp
index 7239811..58be717 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html
index 7df6cb8..ccb7971 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html
index a1c4602..ec8e076 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html
index 81135b9..3919428 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html
index 8e01221..89f6e1d 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-2006 OpenLink Software
+ - 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
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 e1842e0..27bac96 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-2006 OpenLink Software
+# 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
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 8b91e47..b3a8f67 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php
index 8bb20ec..a47d4fa 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-2006 OpenLink Software
+# 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
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 0d898d0..d630432 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-2006 OpenLink Software
+# 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
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 66da63e..cc6230d 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-2006 OpenLink Software
+# 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
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 a054aa6..a3c2aee 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-2006 OpenLink Software
+# 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
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 83c884f..a8a6005 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php
index 6b0f9ac..785e86e 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-2006 OpenLink Software
+# 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
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 11c90cc..b7d94f8 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php
index 3c87373..deb5f97 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php
index afd10b1..c0e1198 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php
index 31e4cb6..92b2283 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-2006 OpenLink Software
+# 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
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 0fb9a3a..0da9448 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-2006 OpenLink Software
+# 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
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 b1f4f5f..a44e978 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-2006 OpenLink Software
+# 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
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 4f09992..6f18282 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-2006 OpenLink Software
+# 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
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 693dc7e..2b75df8 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 90fff47..e0bdb21 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-2006 OpenLink Software
+# 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
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 6350e83..449eab0 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-2006 OpenLink Software
+# 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
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 0412857..b87a698 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-2006 OpenLink Software
+# 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
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 9c15409..4c45219 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-2006 OpenLink Software
+# 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
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 ee263e5..30bf448 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-2006 OpenLink Software
+# 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
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 851d5ea..751cf80 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php
index a5fe899..e3d40ca 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-2006 OpenLink Software
+# 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
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 aac0d6c..755e2e5 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-2006 OpenLink Software
+# 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
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 d8bbac9..0d6ce18 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-2006 OpenLink Software
+# 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
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 d6089bc..65318fa 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php
index 73a0f57..1275250 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-2006 OpenLink Software
+# 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
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 022d7bc..ccd7243 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-2006 OpenLink Software
+# 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
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 7f7d4e9..96e6595 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-2006 OpenLink Software
+# 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
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 0c8a241..cdcfb7a 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-2006 OpenLink Software
+# 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
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 a54ce81..4db3f9f 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-2006 OpenLink Software
+# 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
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 c1cd0fa..d0db2e9 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-2006 OpenLink Software
+# 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
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 e51311a..7959932 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-2006 OpenLink Software
+# 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
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 862c86a..2c0370f 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-2006 OpenLink Software
+# 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
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 99ff8e9..112c8b5 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-2006 OpenLink Software
+# 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
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 ffcd2dd..c13dc9d 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-2006 OpenLink Software
+# 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
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 1495ca8..a4d21c8 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-2006 OpenLink Software
+# 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
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 6b73e26..d8bdf6e 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-2006 OpenLink Software
+# 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
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 d39874c..c42a44a 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-2006 OpenLink Software
+ - 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
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 e7ecf5a..a4e9f3c 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-2006 OpenLink Software
+# 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
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 a95bc1d..03853cd 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-2006 OpenLink Software
+# 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
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 8a0029c..85db5fe 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-2006 OpenLink Software
+# 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
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 b31484c..91da199 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-2006 OpenLink Software
+# 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
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 b1c9e5b..dfbfda3 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-2006 OpenLink Software
+# 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
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 baa9c0c..b0334b6 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-2006 OpenLink Software
+# 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
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 17b36f4..b217ff3 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-2006 OpenLink Software
+# 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
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 08657db..797e96d 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-2006 OpenLink Software
+# 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
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 5f13a65..85fe593 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-2006 OpenLink Software
+# 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
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 db52d84..28f90d3 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-2006 OpenLink Software
+# 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
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 74c4d9b..feea5d7 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php
index 13b0a49..c9cabbb 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php
index bae0678..200e06c 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-2006 OpenLink Software
+# 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
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 b520590..9e2985b 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-2006 OpenLink Software
+# 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
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 30d384d..3cdc6cb 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php
index 426f5d9..bfa172f 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php
index 3680e85..404137f 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php
index 681ecf8..46fe923 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-2006 OpenLink Software
+# 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
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 0a200a3..8972d37 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php
index 81e2f58..ab8b573 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-2006 OpenLink Software
+# 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
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 e0343a9..994f1d0 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php
index 17c72e7..27e614a 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-2006 OpenLink Software
+# 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
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 2c76909..0e57796 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-2006 OpenLink Software
+# 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
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 2736bf1..7e47fd5 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-2006 OpenLink Software
+# 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
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 b9f806f..ff1d4e7 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-2006 OpenLink Software
+# 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
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 e0964c2..ed5df73 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 25f60cd..aa1ea27 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 76093f0..7021124 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 464615a..9f41667 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 fdd3d9e..fffd4d8 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 dcf2b43..21d3608 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 7ee3cae..d43484f 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-2006 OpenLink Software
+# 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
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 d6a5ae9..34076f0 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-2006 OpenLink Software
+# 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
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 0be489a..458c848 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-2006 OpenLink Software
+# 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
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 eb15a55..1026273 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-2006 OpenLink Software
+# 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
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 dd93f89..5e0acf7 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-2006 OpenLink Software
+# 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
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 8f5b53d..0f306b6 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/translations/Chinese-GB2312.txt b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/translations/Chinese-GB2312.txt
index 3c86161..3318e88 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/translations/Chinese-GB2312.txt
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/translations/Chinese-GB2312.txt
@@ -3,7 +3,7 @@
# There cannot be a ":" in the English text.
# Translated by: liao_bin at 371.net shenyi at jite.net
# Last update: 2002-6-26
-# $Id: Chinese-GB2312.txt,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
+# $Id$
# Translation last updated on 11-30-2002
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php
index dcaad97..9ba1d2f 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php
index 8c34160..dde7e80 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-2006 OpenLink Software
+# 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
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 4cfe2ee..6409f2e 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-2006 OpenLink Software
+# 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
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 6087be8..68b5671 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-2006 OpenLink Software
+# 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
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 9e99fe9..8c55e6d 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-2006 OpenLink Software
+# 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
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 3073255..7a6336b 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php
index 1750bfa..d0a1853 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-2006 OpenLink Software
+# 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
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 936e6b5..660ccdb 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-2006 OpenLink Software
+# 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
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 a7147b2..848a56c 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php
index c11bc5d..a23eff3 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-2006 OpenLink Software
+# 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
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 8a43c8b..14ac3dc 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-2006 OpenLink Software
+# 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
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 7bd6a75..0427a04 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php
index f9445da..b8fd862 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-2006 OpenLink Software
+# 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
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 5725b7b..fa213eb 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8a42a76..503b64f 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 9077056..5fa51c1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php b/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php
index 11b27ae..0fb37c1 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/options.xml b/binsrc/tutorial/hosting/ho_s_30/options.xml
index 111919d..f2efd0e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/webcalendar.php b/binsrc/tutorial/hosting/ho_s_30/webcalendar.php
index cbccd80..bbde43c 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/handler.vspx b/binsrc/tutorial/hosting/ho_s_4/handler.vspx
index 06fd0ed..195322b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 92eaf1a..d53f1e9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/options.xml b/binsrc/tutorial/hosting/ho_s_4/options.xml
index 8443e83..39a9569 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs
index fb56bd5..3d6f7f3 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql
index cadbcbe..ceee3ff 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs b/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs
index fa51f98..403d0e0 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx b/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx
index b02f867..0310e5d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/handler.vspx b/binsrc/tutorial/hosting/ho_s_5/handler.vspx
index c3e4909..5e2234a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 85d2ae2..f6f91dc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/options.xml b/binsrc/tutorial/hosting/ho_s_5/options.xml
index 555b1c2..13c20b7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs
index 5de9aea..1cd9509 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql
index 5efa9a9..68e4986 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx b/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx
index 7cf1629..1a4322a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/admin_style.css b/binsrc/tutorial/hosting/ho_s_6/admin_style.css
index c91cdf1..8cf9471 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 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/button.aspx b/binsrc/tutorial/hosting/ho_s_6/button.aspx
index 99cb6f8..813d8c0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/calendar.aspx b/binsrc/tutorial/hosting/ho_s_6/calendar.aspx
index d376aee..939e4a4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/code-render.aspx b/binsrc/tutorial/hosting/ho_s_6/code-render.aspx
index dcaee91..f3002e1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx
index 9e251ec..f495e60 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx
index 1c99fd5..09fc59f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx
index 35ffe27..25d5a1a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx
index 5227f33..f3a8aec 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-2006 OpenLink Software
+ - 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
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 14e073a..ed7d2be 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx
index f836c35..b5caedc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx
index 649c1af..33488bb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx
index 11961a1..33e5c8b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx
index 4cf24a0..f866efe 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx
index d424a9a..7286ccf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx
index de84df5..d21a272 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx
index e650764..7ac3c97 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx
index 599c2f0..3c6c9c3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx
index 12f1ef9..82b12c0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx
index 54f941c..e70d912 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx
index 07a9c86..31a1cd8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx
index 9caf958..fb9aa5b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx b/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx
index 5743f9d..1282341 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx b/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx
index e9109d1..3ed5f3c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/listitem.aspx b/binsrc/tutorial/hosting/ho_s_6/listitem.aspx
index c867787..388319a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/options.xml b/binsrc/tutorial/hosting/ho_s_6/options.xml
index cb264f2..e7e0021 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-2006 OpenLink Software
+ - 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
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 5f9d7ed..6f2949e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/session1.aspx b/binsrc/tutorial/hosting/ho_s_6/session1.aspx
index f74f63d..3106e75 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx
index 2d489f9..ee39a9c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs
index 287d75b..3f86c6b 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx
index 5bb3004..7411405 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs
index b699adb..d402caa 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/temperature.aspx b/binsrc/tutorial/hosting/ho_s_6/temperature.aspx
index 7daddae..c305415 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/validator1.aspx b/binsrc/tutorial/hosting/ho_s_6/validator1.aspx
index 30edd84..addc685 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx
index 2413c94..5d3326c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml
index e5aecf6..8dab32f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_button.aspx b/binsrc/tutorial/hosting/ho_s_6/web_button.aspx
index 963fe33..bc4e12a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx
index bbd0919..475b460 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx
index 636e962..e86a0b3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx
index ad85d08..a468a20 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx b/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx
index b74983b..4ed38a7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_image.aspx b/binsrc/tutorial/hosting/ho_s_6/web_image.aspx
index 4fd0cd4..8a671b0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx
index 317d5b3..6336753 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_label.aspx b/binsrc/tutorial/hosting/ho_s_6/web_label.aspx
index a37bf37..efd81b4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx
index 33598df..d67f265 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx
index 899dc58..d1f7c7b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx b/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx
index 36e8104..229e687 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx b/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx
index 5a7c3bb..4ca8458 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx b/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx
index 549c377..1145c33 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx
index 58033d9..d513d54 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx
index bd64312..c128f74 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx b/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx
index b41643c..33758db 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_table.aspx b/binsrc/tutorial/hosting/ho_s_6/web_table.aspx
index 100df60..e912e87 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx
index 813628f..830d7f0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx b/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx
index 7cb0961..e5193d1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql b/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql
index fefc649..f6cd74e 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e7c7e00..834d829 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_7/options.xml b/binsrc/tutorial/hosting/ho_s_7/options.xml
index 6d6e8d6..bc9443f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_8/cgi.pl b/binsrc/tutorial/hosting/ho_s_8/cgi.pl
index 8d64af0..e97667e 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/hosting/ho_s_8/cgidb.pl b/binsrc/tutorial/hosting/ho_s_8/cgidb.pl
index c262657..61b28a8 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-2006 OpenLink Software
+# 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
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 8a01f94..4455d70 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_8/options.xml b/binsrc/tutorial/hosting/ho_s_8/options.xml
index acda4fa..cbc0fab 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_9/cgitest.py b/binsrc/tutorial/hosting/ho_s_9/cgitest.py
index 7c30c87..9726c99 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-2006 OpenLink Software
+# 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
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 4c8faca..8bf595a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/ho_s_9/options.xml b/binsrc/tutorial/hosting/ho_s_9/options.xml
index 4660a26..3d33c4c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/hosting/index.xml b/binsrc/tutorial/hosting/index.xml
index 2552572..c630713 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/intprot/demo.css b/binsrc/tutorial/intprot/demo.css
index fed097d..bf9ab24 100644
--- a/binsrc/tutorial/intprot/demo.css
+++ b/binsrc/tutorial/intprot/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/intprot/index.xml b/binsrc/tutorial/intprot/index.xml
index 7fec117..e518b47 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-2006 OpenLink Software
+ - 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
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 2995dbc..3bd6a6a 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-2006 OpenLink Software
+ - 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
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 0b12104..f679527 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 99e3a36..3391d07 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-2006 OpenLink Software
+ - 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
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 49fa72e..4297bcf 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 322924d..1c2b8e4 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-2006 OpenLink Software
+ - 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
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 e71f3e3..f3bb72b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 205feba..2da6cd9 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-2006 OpenLink Software
+ - 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
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 d3cb13f..db83b52 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 f57d5ae..d49d3a3 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-2006 OpenLink Software
+ - 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
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 bd9ae79..635de75 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4639839..e95edbb 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-2006 OpenLink Software
+ - 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
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 5a4de8a..c51727b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/intprot/sm_s_5/options.xml b/binsrc/tutorial/intprot/sm_s_5/options.xml
index ce0933f..a85e679 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-2006 OpenLink Software
+ - 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
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 8df8fb9..7aeb975 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a335451..703c3e6 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-2006 OpenLink Software
+ - 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
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 4823fa9..0ff6298 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 82c6ff1..6f28bb0 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 53e083e..1a61ba0 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8f88fa2..fb3c2d8 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-2006 OpenLink Software
+ - 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
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 57b78ca..7bf9720 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 dd015b2..115ec5c 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-2006 OpenLink Software
+ - 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
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 d330ac0..88e9233 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/linkeddata/index.xml b/binsrc/tutorial/linkeddata/index.xml
index 38087d3..62dcf9e 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-2010 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/linkeddata/sem_s_1/options.xml b/binsrc/tutorial/linkeddata/sem_s_1/options.xml
index 43e2472..bb21991 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-2010 OpenLink Software
+ - 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
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 b751be0..62ec04c 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-2010 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/make_tutorial_dav_vad.xml b/binsrc/tutorial/make_tutorial_dav_vad.xml
index e5e081e..8507e76 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-2011 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2012 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="2011-10-28 19:33"/>
+ <version package="1.00.6895">
+ <prop name="Release Date" value="2012-08-02 00:18"/>
<prop name="Build" value="Release"/>
</version>
</caption>
@@ -67,7 +67,6 @@
)
;
DB.DBA.VAD_LOAD_SQL_FILE ('/DAV/VAD/tutorial/setup_search.sql', 1, 'report', 1);
- DB.DBA.VAD_LOAD_SQL_FILE ('/DAV/VAD/tutorial/DET_RDFData.sql', 1, 'report', 1);
DB.DBA.VAD_LOAD_SQL_FILE ('/DAV/VAD/tutorial/fill_search.sql', 1, 'report', 1);
DB.DBA.VAD_LOAD_SQL_FILE ('/DAV/VAD/tutorial/sql_rdf.sql', 1, 'report', 1);
exec('UPDATE DB.DBA.TUT_SEARCH set TS_PHPATH = ''/DAV/VAD/tutorial/'' || TS_PATH');
diff --git a/binsrc/tutorial/make_tutorial_fs_vad.xml b/binsrc/tutorial/make_tutorial_fs_vad.xml
index 3b41f54..9cfe2fa 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-2011 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2012 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="2011-10-28 19:32"/>
+ <version package="1.00.6895">
+ <prop name="Release Date" value="2012-08-02 00:17"/>
<prop name="Build" value="Release"/>
</version>
</caption>
@@ -67,7 +67,6 @@
)
;
DB.DBA.VAD_LOAD_SQL_FILE ('/vad/vsp/tutorial/setup_search.sql', 1, 'report', 0);
- DB.DBA.VAD_LOAD_SQL_FILE ('/vad/vsp/tutorial/DET_RDFData.sql', 1, 'report', 0);
DB.DBA.VAD_LOAD_SQL_FILE ('/vad/vsp/tutorial/fill_search.sql', 1, 'report', 0);
DB.DBA.VAD_LOAD_SQL_FILE ('/vad/vsp/tutorial/sql_rdf.sql', 1, 'report', 0);
exec('UPDATE DB.DBA.TUT_SEARCH set TS_PHPATH = ''/vad/vsp/tutorial/'' || TS_PATH');
diff --git a/binsrc/tutorial/make_vad.sh b/binsrc/tutorial/make_vad.sh
index e365f45..4bfd89a 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.5 2011/07/20 09:50:18 source Exp $
+# $Id$
# ----------------------------------------------------------------------
# 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-2011 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
@@ -404,7 +404,7 @@ sticker_init() {
echo " )" >> $STICKER
echo " ;" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE ('$BASE_PATH/tutorial/setup_search.sql', 1, 'report', $ISDAV);" >> $STICKER
- echo " DB.DBA.VAD_LOAD_SQL_FILE ('$BASE_PATH/tutorial/DET_RDFData.sql', 1, 'report', $ISDAV);" >> $STICKER
+ #echo " DB.DBA.VAD_LOAD_SQL_FILE ('$BASE_PATH/tutorial/DET_RDFData.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE ('$BASE_PATH/tutorial/fill_search.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE ('$BASE_PATH/tutorial/sql_rdf.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " exec('UPDATE DB.DBA.TUT_SEARCH set TS_PHPATH = ''$BASE_PATH/tutorial/'' || TS_PATH');" >> $STICKER
diff --git a/binsrc/tutorial/page.xsl b/binsrc/tutorial/page.xsl
index e04b076..5fb50ab 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/page_common.xsl b/binsrc/tutorial/page_common.xsl
index 76e2023..84a6a64 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 2006/09/25 14:38:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/page_html_common.xsl b/binsrc/tutorial/page_html_common.xsl
index ba0d8c5..f207653 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 2006/10/11 07:52:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/page_ocs_output.xsl b/binsrc/tutorial/page_ocs_output.xsl
index 796658e..7192a48 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 2006/09/25 14:38:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/page_opml_output.xsl b/binsrc/tutorial/page_opml_output.xsl
index 6151b08..baddbf4 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 2006/09/25 14:38:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/page_rss_output.xsl b/binsrc/tutorial/page_rss_output.xsl
index 249b5a7..f54c2f7 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 2006/09/25 14:38:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/page_sioc_output.xsl b/binsrc/tutorial/page_sioc_output.xsl
index 9caf2bf..ae4d555 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 2007/05/09 10:49:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rdf.vsp b/binsrc/tutorial/rdf.vsp
index 6f07211..249d814 100644
--- a/binsrc/tutorial/rdf.vsp
+++ b/binsrc/tutorial/rdf.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: rdf.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1299cc5..16de839 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.2 2010/04/26 07:56:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2010 OpenLink Software
+-- 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
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 af23946..3ef455c 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.2 2010/04/26 07:56:09 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
@@ -48,7 +48,7 @@ In order to have the rest of examples of this section working, the following ste
Follow instructions on <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtAuthServerUI">Virtuoso Authentication Server UI</ulink>
</listitem>
<listitem>
- In above step register your WebID with secure SPARQL endpoint.
+ In above step register your WebID with secure SPARQL endpoint. Note: "sparql-ssl" endpoint is alias of "sparql-webid" endpoint.
</listitem>
<listitem>
Export your certificate and key containing the WebID mentioned before from browsers key store as PKCS#12 package.
diff --git a/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp b/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp
index cc50747..914eccb 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.2 2010/04/26 07:56:09 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2010 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/rdf/index.xml b/binsrc/tutorial/rdf/index.xml
index 8df5ed8..61b6f3b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rdf/rd_s_1/options.xml b/binsrc/tutorial/rdf/rd_s_1/options.xml
index e306635..300e870 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-2006 OpenLink Software
+ - 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
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 8ed610f..400ff66 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rdf/rd_s_2/options.xml b/binsrc/tutorial/rdf/rd_s_2/options.xml
index 2cb2ee1..81f058f 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-2006 OpenLink Software
+ - 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
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 13e26d2..3fb57bc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rdf/ri_s_1/options.xml b/binsrc/tutorial/rdf/ri_s_1/options.xml
index 8ef4e14..68d7065 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-2006 OpenLink Software
+ - 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
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 4a111b0..d1673ad 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-2006 OpenLink Software
+ - 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
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 a06f908..bcd4b7b 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 2007/05/04 11:24:48 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/rdf/rq_s_2/options.xml b/binsrc/tutorial/rdf/rq_s_2/options.xml
index 111919d..f2efd0e 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-2006 OpenLink Software
+ - 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
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 009b44a..d143336 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rdf/rq_s_2/sparql_query.php b/binsrc/tutorial/rdf/rq_s_2/sparql_query.php
index 1aec1b9..328b396 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-2006 OpenLink Software
+ - 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
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 e07b154..746e40d 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 2007/05/04 11:24:48 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/rdf/rq_s_3/options.xml b/binsrc/tutorial/rdf/rq_s_3/options.xml
index 486a18d..b9739cc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rdf/rq_s_3/rdf_import.php b/binsrc/tutorial/rdf/rq_s_3/rdf_import.php
index 6233ae0..87620ee 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-2006 OpenLink Software
+ - 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
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 a271458..d6b97bc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rdfview/index.xml b/binsrc/tutorial/rdfview/index.xml
index 5c47127..781ad0a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rdfview/rd_v_1/options.xml b/binsrc/tutorial/rdfview/rd_v_1/options.xml
index 6323851..594a200 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-2006 OpenLink Software
+ - 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
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 3dc0507..2a121f9 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.2 2009/06/09 11:25:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
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 93be275..049be81 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/demo.css b/binsrc/tutorial/repl/demo.css
index fed097d..bf9ab24 100644
--- a/binsrc/tutorial/repl/demo.css
+++ b/binsrc/tutorial/repl/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/repl/index.xml b/binsrc/tutorial/repl/index.xml
index be2e25e..6c06e0f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_ds_1/options.xml b/binsrc/tutorial/repl/re_ds_1/options.xml
index b25e06d..1c7ee77 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-2006 OpenLink Software
+ - 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
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 52e6e2f..485e6da 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 3370cbe..254ac7b 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-2006 OpenLink Software
+ - 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
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 f3be3af..fd4f4b8 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 afb475b..8cac22f 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/repl/re_sb_1/options.xml b/binsrc/tutorial/repl/re_sb_1/options.xml
index 8ca9549..e81afa9 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-2006 OpenLink Software
+ - 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
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 2d940c2..5186d51 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1ad0d59..a4c963a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_sb_2/options.xml b/binsrc/tutorial/repl/re_sb_2/options.xml
index 7ada589..d811ea3 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-2006 OpenLink Software
+ - 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
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 ff50204..2f656a3 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 179d17e..7466c60 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_sb_3/options.xml b/binsrc/tutorial/repl/re_sb_3/options.xml
index 64aa0e0..e78cc07 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-2006 OpenLink Software
+ - 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
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 5943bdd..aacf232 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 23f475c..e6c785c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_sb_4/options.xml b/binsrc/tutorial/repl/re_sb_4/options.xml
index e94f071..c8a4fa2 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-2006 OpenLink Software
+ - 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
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 c7c8857..7d0c983 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 2609d99..aa0c8ed 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-2006 OpenLink Software
+ - 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
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 fabcfe6..d30650d 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-2006 OpenLink Software
+-- 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
@@ -20,7 +20,7 @@
--
--
?>
-<!-- $Id: re_sb_4_sample_1.vsp,v 1.1.1.1 2006/04/11 17:56:13 source Exp $ -->
+<!-- $Id$ -->
<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 00c12c8..29816d2 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-2006 OpenLink Software
+ - 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
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 0c8669b..bd80eb0 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 5aea349..aa373e4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_sd_2/options.xml b/binsrc/tutorial/repl/re_sd_2/options.xml
index fd8b99d..5c2deb7 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-2006 OpenLink Software
+ - 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
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 05e2eaf..2902a6c 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8a549dd..3348008 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_sd_3/options.xml b/binsrc/tutorial/repl/re_sd_3/options.xml
index 34b588a..5310657 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-2006 OpenLink Software
+ - 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
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 52ddff9..7f53e1a 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b03ff01..91be0aa 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_sm_1/options.xml b/binsrc/tutorial/repl/re_sm_1/options.xml
index 75dc4b0..bd0d22e 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-2006 OpenLink Software
+ - 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
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 2ee894e..4276571 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_xb_1/options.xml b/binsrc/tutorial/repl/re_xb_1/options.xml
index 94aa62e..b4a027c 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-2006 OpenLink Software
+ - 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
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 620697a..5254752 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 cf49d71..cbec096 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_xb_2/options.xml b/binsrc/tutorial/repl/re_xb_2/options.xml
index 65ec990..b024fb1 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-2006 OpenLink Software
+ - 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
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 414bd26..6f76af2 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8749064..1b233db 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_xb_3/options.xml b/binsrc/tutorial/repl/re_xb_3/options.xml
index 693e510..e496fd6 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-2006 OpenLink Software
+ - 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
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 245502f..f3aa12c 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 195d3b6..31830ea 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/repl/re_xb_4/options.xml b/binsrc/tutorial/repl/re_xb_4/options.xml
index 879516c..c1efbca 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-2006 OpenLink Software
+ - 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
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 aebcf84..4c3eab1 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6f483da..9d10efc 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/rss2xbel.xsl b/binsrc/tutorial/rss2xbel.xsl
index 38ed2b3..588860f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/semweb/index.xml b/binsrc/tutorial/semweb/index.xml
index 1b6acab..82ceec3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/semweb/sem_s_1/options.xml b/binsrc/tutorial/semweb/sem_s_1/options.xml
index d7aeb85..bb21991 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-2006 OpenLink Software
+ - 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
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 37d3926..62ec04c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/Makefile.am b/binsrc/tutorial/services/Makefile.am
index 03ec89b..72b8b26 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/services/Makefile.in b/binsrc/tutorial/services/Makefile.in
index 45b0692..a72924f 100644
--- a/binsrc/tutorial/services/Makefile.in
+++ b/binsrc/tutorial/services/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -485,14 +479,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/services/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tutorial/services/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/services/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tutorial/services/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -510,7 +504,6 @@ $(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
@@ -540,17 +533,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -578,7 +567,6 @@ clean-generic:
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"
@@ -597,8 +585,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -607,28 +593,18 @@ install-data-am:
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
@@ -662,7 +638,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tutorial/services/ajax_inc/ajax.js b/binsrc/tutorial/services/ajax_inc/ajax.js
index 9151447..b8d227a 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/services/ajax_inc/proxy.vsp b/binsrc/tutorial/services/ajax_inc/proxy.vsp
index 06f6ede..be7eed6 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl b/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl
index 0878d5b..e3f8356 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 2006/08/16 08:31:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl b/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl
index c56d159..7c56ff9 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 2006/08/16 08:31:03 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 805653c..4e3cb0a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/dc_s_1/options.xml b/binsrc/tutorial/services/dc_s_1/options.xml
index e0f39fa..80b3129 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/demo.css b/binsrc/tutorial/services/demo.css
index fa0f5ff..b66e918 100644
--- a/binsrc/tutorial/services/demo.css
+++ b/binsrc/tutorial/services/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
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 1577597..5297cd5 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-2006 OpenLink Software
+-- 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
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 96bca51..bd50a49 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/idp_s_1/options.xml b/binsrc/tutorial/services/idp_s_1/options.xml
index 65f9eb7..443d725 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/index.xml b/binsrc/tutorial/services/index.xml
index 41ab568..648da36 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/raw.xsl b/binsrc/tutorial/services/raw.xsl
index 349f039..22b85b9 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 f53d0a9..cfce431 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 2a7c716..b0bbf59 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/rm_s_1/rmcli.vsp b/binsrc/tutorial/services/rm_s_1/rmcli.vsp
index ba5241c..06a7ec2 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp b/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp
index 22e2e80..9bcf1c8 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/rn_s_1/options.xml b/binsrc/tutorial/services/rn_s_1/options.xml
index ea355c6..cbcedbd 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 2006/10/11 07:52:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/rn_s_1/res.vsp b/binsrc/tutorial/services/rn_s_1/res.vsp
index 32c90d1..8937c6f 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 2006/10/11 07:52:08 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 f5044b3..37cf871 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 2006/10/11 07:52:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 7b6ae8c..8d7b74d 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 2006/10/11 07:52:08 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/rp_s_1/RoutingClient.cs b/binsrc/tutorial/services/rp_s_1/RoutingClient.cs
index 745fe6d..d1555c9 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/services/rp_s_1/options.xml b/binsrc/tutorial/services/rp_s_1/options.xml
index fe5c9bd..aea8d0a 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-2006 OpenLink Software
+ - 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
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 4157d7f..f2c768c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/rp_s_1/wsrp.vsp b/binsrc/tutorial/services/rp_s_1/wsrp.vsp
index 2fb5f41..c18bff7 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 2008/04/25 15:08:01 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql b/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql
index f746af6..64e5129 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp b/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp
index fcd8bd6..95474fa 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/rp_s_2/options.xml b/binsrc/tutorial/services/rp_s_2/options.xml
index a493438..76308fe 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-2006 OpenLink Software
+ - 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
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 c940d58..2928969 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/rp_s_2/wsrf.vsp b/binsrc/tutorial/services/rp_s_2/wsrf.vsp
index 3d907b9..d756642 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_1/options.xml b/binsrc/tutorial/services/so_s_1/options.xml
index 93ee337..27f7625 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-2006 OpenLink Software
+ - 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
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 da0a9a5..cf14720 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 5362790..7ebe6e0 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-2006 OpenLink Software
+ - 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
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 7a91811..7b80a48 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html b/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html
index 32c88a3..6a42660 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_10/options.xml b/binsrc/tutorial/services/so_s_10/options.xml
index aad1b45..efa2446 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-2006 OpenLink Software
+ - 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
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 7898e9e..eb00043 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 5d0ece0..8cbb7bd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_10/sr.xsl b/binsrc/tutorial/services/so_s_10/sr.xsl
index c2d4c28..a0639ba 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/array2d.xsd b/binsrc/tutorial/services/so_s_11/array2d.xsd
index 366b7f4..635999b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/array_div.xsd b/binsrc/tutorial/services/so_s_11/array_div.xsd
index c31d6f6..b9f6b44 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/division.xsd b/binsrc/tutorial/services/so_s_11/division.xsd
index 4aad55d..87933df 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/factbook.xml b/binsrc/tutorial/services/so_s_11/factbook.xml
index 8303a92..cecfa11 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/moz.xsl b/binsrc/tutorial/services/so_s_11/moz.xsl
index c548ded..bae7445 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/options.xml b/binsrc/tutorial/services/so_s_11/options.xml
index e5fbc3f..64677f2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/provinces.xsd b/binsrc/tutorial/services/so_s_11/provinces.xsd
index 5425591..adafa63 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/provinces_ajax.html b/binsrc/tutorial/services/so_s_11/provinces_ajax.html
index ac8936a..e7bff8a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/raw.xsl b/binsrc/tutorial/services/so_s_11/raw.xsl
index fbd6346..6749b5d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 2e1ff69..fdd3d6b 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b4d7fdc..3f3cd94 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-2006 OpenLink Software
+ - 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
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 acc5118..212bbeb 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 f6cd318..e09d418 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_11/sr.xsl b/binsrc/tutorial/services/so_s_11/sr.xsl
index 34908a6..886bbbb 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_11/sr2d.xsl b/binsrc/tutorial/services/so_s_11/sr2d.xsl
index 18758e5..cc140ce 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_12/administrative_divisions.html b/binsrc/tutorial/services/so_s_12/administrative_divisions.html
index 2f4c6bc..975a090 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-2006 OpenLink Software
+ - 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
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 32a81f4..411ee81 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_12/options.xml b/binsrc/tutorial/services/so_s_12/options.xml
index 74ec062..21427e2 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-2006 OpenLink Software
+ - 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
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 16f1cf6..0eb09fb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_12/sr.xsl b/binsrc/tutorial/services/so_s_12/sr.xsl
index ecb6bd4..47f9fc8 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_13/options.xml b/binsrc/tutorial/services/so_s_13/options.xml
index 15dc7f9..f3d057d 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-2006 OpenLink Software
+ - 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
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 7a71977..d7dc5c3 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 aecc23d..6dcc90f 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-2006 OpenLink Software
+ - 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
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 0b14ce1..ac569f7 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_13/sr.xsl b/binsrc/tutorial/services/so_s_13/sr.xsl
index e994fb0..2962292 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_14/ms.sql b/binsrc/tutorial/services/so_s_14/ms.sql
index 68e015a..f627b4d 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_14/ms.xsl b/binsrc/tutorial/services/so_s_14/ms.xsl
index 884bb48..f1bb590 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_14/options.xml b/binsrc/tutorial/services/so_s_14/options.xml
index 4ba92e6..65f0ac7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_14/ora.sql b/binsrc/tutorial/services/so_s_14/ora.sql
index dacee76..814dc21 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_14/ora.xsl b/binsrc/tutorial/services/so_s_14/ora.xsl
index 723b964..c72a5e0 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 f98b3b3..18d3bd9 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e0eb9de..652f49c 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-2006 OpenLink Software
+ - 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
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 7145658..5b74d08 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 aa55bfe..54301ee 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_15/conversion.vsp b/binsrc/tutorial/services/so_s_15/conversion.vsp
index d9cfd54..732aeb8 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_15/converted_value.xsl b/binsrc/tutorial/services/so_s_15/converted_value.xsl
index f217cb9..5e6f55e 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 f03a29a..a20e111 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_15/currency_list.vsp b/binsrc/tutorial/services/so_s_15/currency_list.vsp
index 38dbb27..fa4ae48 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_15/currency_list.xsl b/binsrc/tutorial/services/so_s_15/currency_list.xsl
index a7fda90..1e7e264 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 5a2182e..1f5848b 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_15/exchange.sql b/binsrc/tutorial/services/so_s_15/exchange.sql
index 46428ae..3b810e4 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 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_15/exchange_rates.vsp b/binsrc/tutorial/services/so_s_15/exchange_rates.vsp
index 8d8c08d..b7ec42f 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a8789e6..771a3c4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_15/options.xml b/binsrc/tutorial/services/so_s_15/options.xml
index 84ffeda..bf937f3 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-2006 OpenLink Software
+ - 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
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 c083722..23656e8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_16/options.xml b/binsrc/tutorial/services/so_s_16/options.xml
index dad3c99..1ef0678 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_16/registration.html b/binsrc/tutorial/services/so_s_16/registration.html
index 3cf2eac..ba8dffe 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-2006 OpenLink Software
+ - 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
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 f3ea10c..583dcd0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_17/mail_validate.html b/binsrc/tutorial/services/so_s_17/mail_validate.html
index 59fb87f..67e7d9b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_17/mail_validate.xsl b/binsrc/tutorial/services/so_s_17/mail_validate.xsl
index f6f8faf..b9a823e 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_17/options.xml b/binsrc/tutorial/services/so_s_17/options.xml
index 4519811..8708cc7 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-2006 OpenLink Software
+ - 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
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 9cb1791..dc22ef8 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 90e1fc6..524eb6d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_18/options.xml b/binsrc/tutorial/services/so_s_18/options.xml
index 78a4c5a..15170cd 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-2006 OpenLink Software
+ - 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
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 1fb674d..56ba2ec 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_18/wsdl_import.sql b/binsrc/tutorial/services/so_s_18/wsdl_import.sql
index fee8efc..ab23719 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_18/wsdl_import.vsp b/binsrc/tutorial/services/so_s_18/wsdl_import.vsp
index 0083e0c..cbfd33e 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 2008/04/10 09:37:04 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_19/array4d.xsd b/binsrc/tutorial/services/so_s_19/array4d.xsd
index d9cba65..c32df8c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_19/contact.xsl b/binsrc/tutorial/services/so_s_19/contact.xsl
index ab3ad71..bb62d0c 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_19/contacts.html b/binsrc/tutorial/services/so_s_19/contacts.html
index 986d109..898ad1a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_19/contacts.sql b/binsrc/tutorial/services/so_s_19/contacts.sql
index d8b98d6..298bead 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_19/options.xml b/binsrc/tutorial/services/so_s_19/options.xml
index 4896610..8b8d4c9 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-2006 OpenLink Software
+ - 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
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 258b4f0..97563e6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_2/options.xml b/binsrc/tutorial/services/so_s_2/options.xml
index 2dcdad8..3a285a2 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-2006 OpenLink Software
+ - 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
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 2bfa39b..b661729 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 39a6034..7ed42b8 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-2006 OpenLink Software
+ - 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
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 4218ff0..d978c1b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/Extensibility.vsp b/binsrc/tutorial/services/so_s_20/Extensibility.vsp
index f72ac7e..474739c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp b/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp
index dc988f5..b48fec1 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/echoDocument.vsp b/binsrc/tutorial/services/so_s_20/echoDocument.vsp
index 9c7c648..d228d90 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 2008/04/11 09:09:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/echoEmployee.vsp b/binsrc/tutorial/services/so_s_20/echoEmployee.vsp
index 75d55c0..ccdbcb5 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 2008/04/11 09:09:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/echoPerson.vsp b/binsrc/tutorial/services/so_s_20/echoPerson.vsp
index 6952587..ad9d8cb 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 2008/04/11 09:09:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/echoString.vsp b/binsrc/tutorial/services/so_s_20/echoString.vsp
index 1d6d822..897192b 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 2008/04/11 09:09:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/echoStringArray.vsp b/binsrc/tutorial/services/so_s_20/echoStringArray.vsp
index 413b090..1490c03 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 2008/04/11 09:09:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/echoStruct.vsp b/binsrc/tutorial/services/so_s_20/echoStruct.vsp
index 2254a91..3429cda 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 2008/04/11 09:09:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/echoStructArray.vsp b/binsrc/tutorial/services/so_s_20/echoStructArray.vsp
index 6eca649..978b5ca 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 2008/04/11 09:09:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/echoStructLit.vsp b/binsrc/tutorial/services/so_s_20/echoStructLit.vsp
index 4e1c544..9ae4647 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 2008/04/11 09:09:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/interop3_clients.vsp b/binsrc/tutorial/services/so_s_20/interop3_clients.vsp
index 68c87c6..7490e00 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_20/options.xml b/binsrc/tutorial/services/so_s_20/options.xml
index 37a6dd8..989c845 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-2006 OpenLink Software
+ - 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
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 4a00436..de0d4b2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_21/google_api.sql b/binsrc/tutorial/services/so_s_21/google_api.sql
index ad7ff73..76abb03 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_21/google_api.vsp b/binsrc/tutorial/services/so_s_21/google_api.vsp
index a4d3deb..23a0659 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_21/options.xml b/binsrc/tutorial/services/so_s_21/options.xml
index 5b08612..1da2431 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_21/raw.xsl b/binsrc/tutorial/services/so_s_21/raw.xsl
index 1d66391..37779c1 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 7768ad3..a44c303 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_22/options.xml b/binsrc/tutorial/services/so_s_22/options.xml
index b163eae..a81d09c 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-2006 OpenLink Software
+ - 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
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 79e6465..34594f8 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 84c4c93..765122c 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-2006 OpenLink Software
+ - 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
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 f2515d9..7fd209c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 502023a..47a1907 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_23/java_server.java b/binsrc/tutorial/services/so_s_23/java_server.java
index 215960f..f89e6cc 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/services/so_s_23/javavm_pl.xsl b/binsrc/tutorial/services/so_s_23/javavm_pl.xsl
index e1961f2..df6953f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_23/javavm_xml.sql b/binsrc/tutorial/services/so_s_23/javavm_xml.sql
index 4575210..d3c0c34 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_23/options.xml b/binsrc/tutorial/services/so_s_23/options.xml
index 7c7b972..fc5e355 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-2006 OpenLink Software
+ - 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
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 7d41905..bef44ca 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_24/amazon.html b/binsrc/tutorial/services/so_s_24/amazon.html
index a20d569..2067df0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_24/amazon.sql b/binsrc/tutorial/services/so_s_24/amazon.sql
index e43118d..9de3c28 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_24/options.xml b/binsrc/tutorial/services/so_s_24/options.xml
index 2a35826..81a8b58 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-2006 OpenLink Software
+ - 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
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 3e28506..0cb20da 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_24/viewhtml.xsl b/binsrc/tutorial/services/so_s_24/viewhtml.xsl
index f84b7f1..d1185c1 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_24/viewraw.xsl b/binsrc/tutorial/services/so_s_24/viewraw.xsl
index ea524f6..6749b5d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_25/XSD.vsp b/binsrc/tutorial/services/so_s_25/XSD.vsp
index 72fadb8..71d0e05 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_25/complex-rpc.vsp b/binsrc/tutorial/services/so_s_25/complex-rpc.vsp
index 3041f83..bae54c6 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_25/dime-doc.vsp b/binsrc/tutorial/services/so_s_25/dime-doc.vsp
index e461b30..556f9d1 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_25/dime-rpc.vsp b/binsrc/tutorial/services/so_s_25/dime-rpc.vsp
index 3446041..3a2ce15 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_25/mime-doc.vsp b/binsrc/tutorial/services/so_s_25/mime-doc.vsp
index a9ba063..90fca71 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_25/mime-rpc.vsp b/binsrc/tutorial/services/so_s_25/mime-rpc.vsp
index 465cf28..c4814d3 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_25/simple-doc.vsp b/binsrc/tutorial/services/so_s_25/simple-doc.vsp
index 78c23e4..84ce32b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_25/simple-rpc.vsp b/binsrc/tutorial/services/so_s_25/simple-rpc.vsp
index df6b55f..4beb4d2 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 41058a4..b279929 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_26/handler.vspx b/binsrc/tutorial/services/so_s_26/handler.vspx
index 3b350aa..3b32bfb 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_26/options.xml b/binsrc/tutorial/services/so_s_26/options.xml
index 06a549e..269215b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_26/redcoalsms.sql b/binsrc/tutorial/services/so_s_26/redcoalsms.sql
index c73a40a..0b99ff0 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_26/setup_sms.vspx b/binsrc/tutorial/services/so_s_26/setup_sms.vspx
index fc5ef64..a20449d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 30cb17b..91f6c2f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_27/options.xml b/binsrc/tutorial/services/so_s_27/options.xml
index ee60d3f..1fca954 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_27/raw.xsl b/binsrc/tutorial/services/so_s_27/raw.xsl
index 5785cd0..32e8190 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 214d64f..210101d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_27/yahoo_geocode.html b/binsrc/tutorial/services/so_s_27/yahoo_geocode.html
index bc5abc6..264944f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql b/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql
index 9a31bd5..7c0adf3 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_28/data_xml.vsp b/binsrc/tutorial/services/so_s_28/data_xml.vsp
index 3a0970a..b8f1224 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_28/googlemaps.vsp b/binsrc/tutorial/services/so_s_28/googlemaps.vsp
index f20ddf1..56b9c23 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_28/options.xml b/binsrc/tutorial/services/so_s_28/options.xml
index 0e5feab..1eafa7c 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-2006 OpenLink Software
+ - 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
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 47ab8c3..68f5df2 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 81adbb8..3f3516c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_29/options.xml b/binsrc/tutorial/services/so_s_29/options.xml
index 0e5feab..1eafa7c 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-2006 OpenLink Software
+ - 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
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 b22f71a..45c3058 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_29/yahoomaps.vsp b/binsrc/tutorial/services/so_s_29/yahoomaps.vsp
index 869effc..05e8a1a 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_3/options.xml b/binsrc/tutorial/services/so_s_3/options.xml
index 221307b..21b8179 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-2006 OpenLink Software
+ - 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
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 a515705..915d635 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-2006 OpenLink Software
+ - 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
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 5b160c0..51f936a 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 49de24f..ffff77e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 545d17e..66b5f6c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8b12631..18b9c3a 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_30/options.xml b/binsrc/tutorial/services/so_s_30/options.xml
index a42c509..d4248f8 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-2006 OpenLink Software
+ - 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
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 11e5db2..adc1a6d 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-2006 OpenLink Software
+ * 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
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 3289df9..be322f6 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b44aefd..a4d17c8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_31/options.xml b/binsrc/tutorial/services/so_s_31/options.xml
index 09fb68a..4772708 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-2006 OpenLink Software
+ - 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
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 21e0524..f4ff9a9 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e7858ab..9221a55 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_32/options.xml b/binsrc/tutorial/services/so_s_32/options.xml
index d6f34a5..e827773 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-2006 OpenLink Software
+ - 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
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 0847395..c3abc8f 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-2006 OpenLink Software
+// 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
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 8e4794c..3cf726a 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 7718ac4..e6553c2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_33/redcoal.sql b/binsrc/tutorial/services/so_s_33/redcoal.sql
index 9d6e901..764e27e 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_33/sms.vsp b/binsrc/tutorial/services/so_s_33/sms.vsp
index 4fbe6f9..268dee3 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 73f5b86..3057d06 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_34/options.xml b/binsrc/tutorial/services/so_s_34/options.xml
index 9787a1b..395ded9 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-2006 OpenLink Software
+ - 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
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 01fd72d..172a0cc 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 72b2f19..c771520 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_35/mappoint.sql b/binsrc/tutorial/services/so_s_35/mappoint.sql
index e0d15c4..3ddbd42 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_35/mappoint.vsp b/binsrc/tutorial/services/so_s_35/mappoint.vsp
index 347668b..bfd176e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_35/mappoint.xsd b/binsrc/tutorial/services/so_s_35/mappoint.xsd
index c78e691..ba6f14f 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-2006 OpenLink Software
+ - 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
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 22b46fa..d6fcecd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_36/eBay.sql b/binsrc/tutorial/services/so_s_36/eBay.sql
index 8cc915e..cd1c1d1 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_36/eBayCategories.vspx b/binsrc/tutorial/services/so_s_36/eBayCategories.vspx
index 34ef728..3a95e13 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl b/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl
index fdcf5b5..f082e3a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl b/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl
index 7964f01..302769b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_36/ebay_demo.sql b/binsrc/tutorial/services/so_s_36/ebay_demo.sql
index 79534c3..bb498f0 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_36/options.xml b/binsrc/tutorial/services/so_s_36/options.xml
index a81b3b7..8bd5d36 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-2006 OpenLink Software
+ - 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
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 812f956..f59ae18 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_37/nwsetup.sql b/binsrc/tutorial/services/so_s_37/nwsetup.sql
index 6726cd6..a506efb 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 2008/04/21 08:09:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_37/options.xml b/binsrc/tutorial/services/so_s_37/options.xml
index b9f836a..e9beb58 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-2006 OpenLink Software
+ - 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
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 1450f72..06bc603 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_4/options.xml b/binsrc/tutorial/services/so_s_4/options.xml
index ce11f8d..6acb4e0 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-2006 OpenLink Software
+ - 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
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 2222085..a903eee 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6acd842..247d9ef 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-2006 OpenLink Software
+ - 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
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 5166f38..7c1da79 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 ff6f630..729a8d9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_6/options.xml b/binsrc/tutorial/services/so_s_6/options.xml
index aed7286..69b7cd5 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-2006 OpenLink Software
+ - 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
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 54384a7..3d6bb5a 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 559f111..fd8bd5d 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-2006 OpenLink Software
+ - 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
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 283c5eb..4a8e79f 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 735b396..33e5871 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 d72aac8..1d7dbd3 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_6/wsdl_call.xsl b/binsrc/tutorial/services/so_s_6/wsdl_call.xsl
index 898e53c..0aa5c15 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl b/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl
index 22021fb..3d84b22 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html b/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html
index 91887b0..b9a775e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_7/options.xml b/binsrc/tutorial/services/so_s_7/options.xml
index 9da2486..300c9bc 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-2006 OpenLink Software
+ - 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
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 2514965..12f5c51 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 0b6e10d..52253ff 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-2006 OpenLink Software
+ - 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
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 60a787d..578bb38 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 ac829ee..1ac7e6c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 3b6c167..a6040c2 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_7/sr.xsl b/binsrc/tutorial/services/so_s_7/sr.xsl
index 5fcde62..05f4a1e 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_8/options.xml b/binsrc/tutorial/services/so_s_8/options.xml
index 28ac0ef..634cb09 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-2006 OpenLink Software
+ - 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
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 6b66052..a2bc8c8 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 d0be1d2..dc7324b 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-2006 OpenLink Software
+ - 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
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 f4b176a..5f725bd 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 efe6644..a5e9045 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 77c59f4..45a38ef 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_8/sr.xsl b/binsrc/tutorial/services/so_s_8/sr.xsl
index 6754e82..e48c167 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/so_s_9/options.xml b/binsrc/tutorial/services/so_s_9/options.xml
index 0d6a9ef..9a9993b 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-2006 OpenLink Software
+ - 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
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 0997344..ebe451e 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 9504fc7..f344ea2 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-2006 OpenLink Software
+ - 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
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 68b9881..c6f3ef0 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/so_s_9/sr.xsl b/binsrc/tutorial/services/so_s_9/sr.xsl
index e25403d..baa449d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/soap.js b/binsrc/tutorial/services/soap.js
index 7e74882..dfd3c27 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/services/ud_s_1/options.xml b/binsrc/tutorial/services/ud_s_1/options.xml
index f0b492d..5e1961a 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-2006 OpenLink Software
+ - 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
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 4fe4701..2339671 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 18402bb..3d04e4f 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-2006 OpenLink Software
+ - 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
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 70dd38b..8512a54 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 80bd406..70ac086 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 d7a703d..d081cc9 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/ud_s_2/options.xml b/binsrc/tutorial/services/ud_s_2/options.xml
index cb07cf9..e4a3379 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-2006 OpenLink Software
+ - 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
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 2a8d634..2ea83e1 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 3e9677d..7312d92 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-2006 OpenLink Software
+ - 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
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 d482b8e..f2e745f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 120202a..d6d778f 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/ud_s_3/be.xml b/binsrc/tutorial/services/ud_s_3/be.xml
index 3ddf84d..a784e41 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ud_s_3/bnd.xml b/binsrc/tutorial/services/ud_s_3/bnd.xml
index 7f89189..ec6cc79 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ud_s_3/bs.xml b/binsrc/tutorial/services/ud_s_3/bs.xml
index 296cebf..6e56bc1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ud_s_3/options.xml b/binsrc/tutorial/services/ud_s_3/options.xml
index 15b3953..e69729c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ud_s_3/tm.xml b/binsrc/tutorial/services/ud_s_3/tm.xml
index 758b047..e43fe17 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-2006 OpenLink Software
+ - 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
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 840d8f2..ff72ea7 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 eee9fa8..e9f0900 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-2006 OpenLink Software
+ - 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
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 054de1d..4798a00 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 3031571..4616619 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 aca9c3a..d8e1b8d 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e053ea1..6369e1e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6b83996..7f8a029 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 dbbaae2..d3eeb0e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 d22f5b3..8277545 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 0e3a1b0..6c1a60d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 03bd7df..de07609 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 49f2eaf..f7ce5c4 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 99290cc..7f5619e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ws_s_2/SymClient.cs b/binsrc/tutorial/services/ws_s_2/SymClient.cs
index 1996b66..baa31f9 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-2006 OpenLink Software
+// 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
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 27cbece..effd448 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 c8364e6..1150f0d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 47cca67..4ba7a69 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ws_s_3/ASymClient.cs b/binsrc/tutorial/services/ws_s_3/ASymClient.cs
index aad0459..ca3a70a 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/services/ws_s_3/ASymClient2.cs b/binsrc/tutorial/services/ws_s_3/ASymClient2.cs
index e064fdf..f623fff 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-2006 OpenLink Software
+// 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
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 ee55c0d..a685ce1 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 065ac81..141ffae 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b3963cf..cb21950 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-2006 OpenLink Software
+ - 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
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 dcd1af2..3bf1192 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 58a5050..b8434cd 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 2df0238..d9cd907 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-2006 OpenLink Software
+ - 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
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 906464d..a616577 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/ws_s_4/x509.xml b/binsrc/tutorial/services/ws_s_4/x509.xml
index e8a0fc0..302239a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ws_s_4/x509Client.cs b/binsrc/tutorial/services/ws_s_4/x509Client.cs
index 8cb5285..e8809ce 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-2006 OpenLink Software
+// 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
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 e3bebf0..5d72c8c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs b/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs
index d09dee2..0035014 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs b/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs
index cd7e972..ec31057 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-2006 OpenLink Software
+// 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
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 625d9d9..1110e3d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 d295957..50dc7c9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/ws_s_5/trust_client.vsp b/binsrc/tutorial/services/ws_s_5/trust_client.vsp
index 81366b2..5bbca36 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 76d0666..496a81a 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 811593d..62014c8 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/xa_s_1/options.xml b/binsrc/tutorial/services/xa_s_1/options.xml
index 260d791..a81eb6d 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-2006 OpenLink Software
+ - 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
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 406219c..699e187 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/xa_s_1/xars.xsl b/binsrc/tutorial/services/xa_s_1/xars.xsl
index 6083f88..149dac4 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.1 2011/09/12 10:51:32 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/services/xa_s_1/xmla.vsp b/binsrc/tutorial/services/xa_s_1/xmla.vsp
index d4300db..3b1f931 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 73c0d1e..40c745e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/services/xa_s_1/xmla_setup.sql b/binsrc/tutorial/services/xa_s_1/xmla_setup.sql
index e44f143..6aa2ec2 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/setup_search.sql b/binsrc/tutorial/setup_search.sql
index 0faf5be..b253c21 100644
--- a/binsrc/tutorial/setup_search.sql
+++ b/binsrc/tutorial/setup_search.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup_search.sql,v 1.2 2006/08/16 07:58:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/setup_tutorial.sql b/binsrc/tutorial/setup_tutorial.sql
index ac9bfe4..a23c57b 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.2 2011/07/20 09:50:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/sioc_ttl.vsp b/binsrc/tutorial/sioc_ttl.vsp
index 5fecc2f..cf93272 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 2007/01/22 21:58:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/syntax/SyntaxHighlighter.css b/binsrc/tutorial/syntax/SyntaxHighlighter.css
index d31ae88..9818e21 100644
--- a/binsrc/tutorial/syntax/SyntaxHighlighter.css
+++ b/binsrc/tutorial/syntax/SyntaxHighlighter.css
@@ -1,10 +1,10 @@
/*
- * $Id: SyntaxHighlighter.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/syntax/shBrushCSharp.js b/binsrc/tutorial/syntax/shBrushCSharp.js
index c9d7c19..cc05164 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/syntax/shBrushDelphi.js b/binsrc/tutorial/syntax/shBrushDelphi.js
index a094726..bb26204 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/syntax/shBrushJScript.js b/binsrc/tutorial/syntax/shBrushJScript.js
index 9c47dcc..7e42ed2 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/syntax/shBrushPhp.js b/binsrc/tutorial/syntax/shBrushPhp.js
index a504943..b9f51b0 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/syntax/shBrushPython.js b/binsrc/tutorial/syntax/shBrushPython.js
index 3310b95..49547ae 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/syntax/shBrushSql.js b/binsrc/tutorial/syntax/shBrushSql.js
index 21273b0..6815d4a 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/syntax/shBrushVb.js b/binsrc/tutorial/syntax/shBrushVb.js
index 462d1ce..46d8ae4 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/syntax/shBrushXml.js b/binsrc/tutorial/syntax/shBrushXml.js
index 7897ee9..14508e9 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/tutorial.owl b/binsrc/tutorial/tutorial.owl
index bf38ffc..a38da1e 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 2008/07/24 09:22:25 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/tutorial.xml b/binsrc/tutorial/tutorial.xml
index 1f786e7..899ac52 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/tutorial3.css b/binsrc/tutorial/tutorial3.css
index 925b48f..7b6c5da 100644
--- a/binsrc/tutorial/tutorial3.css
+++ b/binsrc/tutorial/tutorial3.css
@@ -1,10 +1,10 @@
/*
- * $Id: tutorial3.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/vad_version b/binsrc/tutorial/vad_version
index 120daab..2068036 100644
--- a/binsrc/tutorial/vad_version
+++ b/binsrc/tutorial/vad_version
@@ -1 +1 @@
-1.00.6878
+1.00.6895
diff --git a/binsrc/tutorial/wap/demo.css b/binsrc/tutorial/wap/demo.css
index fed097d..bf9ab24 100644
--- a/binsrc/tutorial/wap/demo.css
+++ b/binsrc/tutorial/wap/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/wap/index.xml b/binsrc/tutorial/wap/index.xml
index cdceafb..e3d2451 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp b/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp
index 7314d96..30a6c90 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_1/html2wml.vsp b/binsrc/tutorial/wap/wa_b_1/html2wml.vsp
index 4f88fc9..d860693 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_1/html2wml.xsl b/binsrc/tutorial/wap/wa_b_1/html2wml.xsl
index 8eaf9f1..d7bcc2a 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/wap/wa_b_1/options.xml b/binsrc/tutorial/wap/wa_b_1/options.xml
index fa596ce..8b41563 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-2006 OpenLink Software
+ - 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
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 5850a25..7f7a75a 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-2006 OpenLink Software
+ - 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
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 2d7915a..36c2417 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/wap/wa_b_2/wapphone.vsp b/binsrc/tutorial/wap/wa_b_2/wapphone.vsp
index 2d9972a..0168624 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_2/wapphone.xsl b/binsrc/tutorial/wap/wa_b_2/wapphone.xsl
index 4378108..7a1fc9e 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp b/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp
index b5f1b16..c72f498 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/addressbook.vsp b/binsrc/tutorial/wap/wa_b_3/addressbook.vsp
index d03dd20..2701943 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/checkmail.vsp b/binsrc/tutorial/wap/wa_b_3/checkmail.vsp
index 058e36b..6a98a12 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/compose.vsp b/binsrc/tutorial/wap/wa_b_3/compose.vsp
index 156ab62..ff98e1b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/delete.vsp b/binsrc/tutorial/wap/wa_b_3/delete.vsp
index 5a383f0..e63736b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/folder.vsp b/binsrc/tutorial/wap/wa_b_3/folder.vsp
index 9718e06..a7547c6 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/folder_add.vsp b/binsrc/tutorial/wap/wa_b_3/folder_add.vsp
index 987bbed..92e8189 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/folders.vsp b/binsrc/tutorial/wap/wa_b_3/folders.vsp
index ce4fe7e..bb18bf8 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/forward.vsp b/binsrc/tutorial/wap/wa_b_3/forward.vsp
index 46edcd7..c9f15b4 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/getmail.vsp b/binsrc/tutorial/wap/wa_b_3/getmail.vsp
index 9121ce7..adfea07 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/handset.vsp b/binsrc/tutorial/wap/wa_b_3/handset.vsp
index 72cd7c2..722475b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/handset_update.vsp b/binsrc/tutorial/wap/wa_b_3/handset_update.vsp
index 2a40ddc..a505b50 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/index.vsp b/binsrc/tutorial/wap/wa_b_3/index.vsp
index 5586e28..301f9fd 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/login.vsp b/binsrc/tutorial/wap/wa_b_3/login.vsp
index f02df5a..357e0d6 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/logout.vsp b/binsrc/tutorial/wap/wa_b_3/logout.vsp
index 398bcb1..119c100 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/move.vsp b/binsrc/tutorial/wap/wa_b_3/move.vsp
index f92b785..472b030 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/options.xml b/binsrc/tutorial/wap/wa_b_3/options.xml
index 6c85671..878ee0c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/wap/wa_b_3/password.vsp b/binsrc/tutorial/wap/wa_b_3/password.vsp
index 1b8a94a..d7edc18 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/personal.vsp b/binsrc/tutorial/wap/wa_b_3/personal.vsp
index b788ad9..15a325f 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/personal_update.vsp b/binsrc/tutorial/wap/wa_b_3/personal_update.vsp
index 6961ab4..7784989 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account.vsp
index 7fb4316..55d6276 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp
index 57aaa31..2e2905d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp
index 836044f..bded8d7 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/read.vsp b/binsrc/tutorial/wap/wa_b_3/read.vsp
index 09ba7ab..d0e5dec 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/reply.vsp b/binsrc/tutorial/wap/wa_b_3/reply.vsp
index 9ed19de..4889e62 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/save_draft.vsp b/binsrc/tutorial/wap/wa_b_3/save_draft.vsp
index 22ab79a..b5fef20 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/send.vsp b/binsrc/tutorial/wap/wa_b_3/send.vsp
index 8ae2a8d..d00c3c4 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/setting.vsp b/binsrc/tutorial/wap/wa_b_3/setting.vsp
index 1c1709f..2efcde0 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/wap/wa_b_3/signup.vsp b/binsrc/tutorial/wap/wa_b_3/signup.vsp
index b2892ba..d4ac431 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4f25eee..f95d9ac 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 d440410..57d9ae0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/Makefile.am b/binsrc/tutorial/web/Makefile.am
index 3a06148..40fcc79 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/web/Makefile.in b/binsrc/tutorial/web/Makefile.in
index dbe448c..6df0939 100644
--- a/binsrc/tutorial/web/Makefile.in
+++ b/binsrc/tutorial/web/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -408,14 +402,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/web/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tutorial/web/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/web/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tutorial/web/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -433,7 +427,6 @@ $(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
@@ -463,17 +456,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -501,7 +490,6 @@ clean-generic:
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"
@@ -520,8 +508,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -530,28 +516,18 @@ install-data-am:
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
@@ -585,7 +561,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tutorial/web/demo.css b/binsrc/tutorial/web/demo.css
index 3ef4845..ebfcd25 100644
--- a/binsrc/tutorial/web/demo.css
+++ b/binsrc/tutorial/web/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.3 2007/05/04 11:24:48 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/web/index.xml b/binsrc/tutorial/web/index.xml
index 1cb5309..e9d1d67 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_b_1/options.xml b/binsrc/tutorial/web/vs_b_1/options.xml
index 8eab197..bb0f05c 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-2006 OpenLink Software
+ - 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
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 b015c52..9d76f3e 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e9acf4a..3123cff 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_b_2/options.xml b/binsrc/tutorial/web/vs_b_2/options.xml
index a8c8b11..2eae625 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-2006 OpenLink Software
+ - 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
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 e251748..07dc684 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-2006 OpenLink Software
+ - 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
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 c628cad..beda8ee 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 cd820af..56884db 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-2006 OpenLink Software
+ - 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
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 256b845..c75301b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 370596b..952a6db 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 fe59376..7c53d26 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 abb8e0b..d584ea5 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-2006 OpenLink Software
+ - 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
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 252ce5e..078d0ad 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 9552b6a..e091677 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 241013a..33c6a0a 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6fab715..2d6e4ec 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 460e34f..b5fc04c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 2d92c90..e8b4c19 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 56cb9f3..2945881 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-2006 OpenLink Software
+ - 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
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 5154646..e14a5aa 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-2006 OpenLink Software
+ - 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
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 a5b7a90..1e9e8d2 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1faa633..96b33e0 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp b/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp
index 3cf8cb3..72e5229 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_b_6/options.xml b/binsrc/tutorial/web/vs_b_6/options.xml
index 07576fc..e8b9a6d 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-2006 OpenLink Software
+ - 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
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 a32d070..56397a3 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-2006 OpenLink Software
+ - 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
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 17ce9d7..fee9644 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 fe998c0..734cb7c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a254dd4..a266751 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-2006 OpenLink Software
+ - 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
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 bdd5151..57800b7 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6d625ef..451d77a 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 bc5c389..2a51bb5 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8a2ad45..5c86e66 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 f826392..1efa8ad 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-2006 OpenLink Software
+ - 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
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 41ff75d..14c4944 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6ab6f8e..760ff6e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 be8c408..d49b027 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-2006 OpenLink Software
+ - 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
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 2fc185c..e155a1b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_c_1/long_task.vsp b/binsrc/tutorial/web/vs_c_1/long_task.vsp
index 737fbe4..ee994cd 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 2008/12/11 14:27:28 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 41faba2..0346d02 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-2006 OpenLink Software
+ - 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
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 fa4cad8..556356d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1f9c401..ea64adf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_d_2/propfind.vsp b/binsrc/tutorial/web/vs_d_2/propfind.vsp
index f6cbc9f..f5714da 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_d_2/proppatch.vsp b/binsrc/tutorial/web/vs_d_2/proppatch.vsp
index c2d3da1..2a2275a 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_d_3/options.xml b/binsrc/tutorial/web/vs_d_3/options.xml
index 52d2d64..557233e 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-2006 OpenLink Software
+ - 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
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 dd623a5..240c9e5 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-2006 OpenLink Software
+ - 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
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 b7678a6..b1337c7 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_d_4/options.xml b/binsrc/tutorial/web/vs_d_4/options.xml
index 8c7e93d..bcbd218 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-2006 OpenLink Software
+ - 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
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 b9c91ef..00951b8 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-2006 OpenLink Software
+ - 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
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 8019104..b0b0bef 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-2006 OpenLink Software
+ - 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
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 bb2a76a..79b36fd 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1a89eca..f457fab 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-2006 OpenLink Software
+ - 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
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 615eb9d..c3b6b5b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_d_7/options.xml b/binsrc/tutorial/web/vs_d_7/options.xml
index 190d017..e0ef80f 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-2006 OpenLink Software
+ - 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
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 c3c1792..848ef8e 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 5c2d532..cfff868 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_d_8/default.vsp b/binsrc/tutorial/web/vs_d_8/default.vsp
index 8727076..67b5021 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_d_8/front.vsp b/binsrc/tutorial/web/vs_d_8/front.vsp
index 5c5d377..2379a71 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_d_8/login.vsp b/binsrc/tutorial/web/vs_d_8/login.vsp
index 0acbef6..bd1f359 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_d_8/options.xml b/binsrc/tutorial/web/vs_d_8/options.xml
index 1406b39..430bdd3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_d_8/query_gen.vsp b/binsrc/tutorial/web/vs_d_8/query_gen.vsp
index 8a1483d..060ca77 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_d_8/register.vsp b/binsrc/tutorial/web/vs_d_8/register.vsp
index 31ad276..16cab28 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 9de6857..6cc4426 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 14441e3..1df98f6 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-2006 OpenLink Software
+ - 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
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 7a958dd..0a75ecb 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a5de033..68382d6 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-2006 OpenLink Software
+ - 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
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 d6d9f14..5da9fe4 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8eae2cc..c84b942 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 04fe87f..eeed3d4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_s_2/options.xml b/binsrc/tutorial/web/vs_s_2/options.xml
index 536e5b4..b9ece81 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-2006 OpenLink Software
+ - 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
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 ed1d7f2..75e40dc 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-2006 OpenLink Software
+ - 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
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 112ab30..fe45640 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1dc1b85..bf4752c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 850dfe0..a73f952 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8c23644..fc5d5bb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_s_4/options.xml b/binsrc/tutorial/web/vs_s_4/options.xml
index 190d017..e0ef80f 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-2006 OpenLink Software
+ - 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
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 a10d9bf..c3e37cb 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 c17a1cc..80b6ce5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_s_5/options.xml b/binsrc/tutorial/web/vs_s_5/options.xml
index e306635..300e870 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-2006 OpenLink Software
+ - 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
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 3b02179..af14a59 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6693799..5d3eaf7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_s_6/options.xml b/binsrc/tutorial/web/vs_s_6/options.xml
index e306635..300e870 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-2006 OpenLink Software
+ - 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
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 27f358d..e86ac48 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 7e06239..3ca6c10 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-2006 OpenLink Software
+ - 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
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 116a642..ed25772 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-2006 OpenLink Software
+ - 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
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 f8704a3..da58ce7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_2/default.vsp b/binsrc/tutorial/web/vs_u_2/default.vsp
index d2bf7cd..c0ceeb4 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_2/front.vsp b/binsrc/tutorial/web/vs_u_2/front.vsp
index 7ede421..2f6b0e1 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_2/login.vsp b/binsrc/tutorial/web/vs_u_2/login.vsp
index 7f50f9f..a9cc43c 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_2/options.xml b/binsrc/tutorial/web/vs_u_2/options.xml
index 4ca091a..bc26491 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_2/register.vsp b/binsrc/tutorial/web/vs_u_2/register.vsp
index 6955893..42ca95b 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 c513ef0..c15348b 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4ff66c7..9ed8ea7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_3/default.vsp b/binsrc/tutorial/web/vs_u_3/default.vsp
index 15561a0..b0c9a64 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_3/front.vsp b/binsrc/tutorial/web/vs_u_3/front.vsp
index 517c2a0..f00a1b9 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_3/login.vsp b/binsrc/tutorial/web/vs_u_3/login.vsp
index 4f5c10e..f83902d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_3/options.xml b/binsrc/tutorial/web/vs_u_3/options.xml
index 0b753fb..1553a74 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_3/register.vsp b/binsrc/tutorial/web/vs_u_3/register.vsp
index 6c0a4f1..d273ffe 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4cc32a5..5d2a2d3 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 adbf692..16613ac 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_4/default.vsp b/binsrc/tutorial/web/vs_u_4/default.vsp
index 518af4d..d00a94e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_4/front.vsp b/binsrc/tutorial/web/vs_u_4/front.vsp
index d916bdd..52213da 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_4/logout.vsp b/binsrc/tutorial/web/vs_u_4/logout.vsp
index 2977520..4e0a55f 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_4/options.xml b/binsrc/tutorial/web/vs_u_4/options.xml
index 9cfd6ce..db93532 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_4/register.vsp b/binsrc/tutorial/web/vs_u_4/register.vsp
index 8006f1d..c7eb952 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 3762fdd..8801412 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 18195c4..7d160d4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_5/default.vsp b/binsrc/tutorial/web/vs_u_5/default.vsp
index 60a9b88..2b7fa66 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_5/front.vsp b/binsrc/tutorial/web/vs_u_5/front.vsp
index 213328f..0bd8a74 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_5/login.vsp b/binsrc/tutorial/web/vs_u_5/login.vsp
index b6f782e..c6ff1d4 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_u_5/options.xml b/binsrc/tutorial/web/vs_u_5/options.xml
index 78995b3..44490c6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_5/register.vsp b/binsrc/tutorial/web/vs_u_5/register.vsp
index ed94fad..51803a4 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 53738d0..ddf99bc 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 06da023..9293e25 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_u_7/options.xml b/binsrc/tutorial/web/vs_u_7/options.xml
index 6d691a0..4bab9ca 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-2006 OpenLink Software
+ - 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
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 2923eb8..51eae86 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4da02cb..e0dfb8b 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-2006 OpenLink Software
+ - 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
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 389758e..3fc9c90 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b2cb091..d94b20e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4ee1040..0f21877 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_x_1/options.xml b/binsrc/tutorial/web/vs_x_1/options.xml
index a29e8ff..a7626d9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_x_1/shippers.vsp b/binsrc/tutorial/web/vs_x_1/shippers.vsp
index 21e8305..71fe96e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_x_1/shippers.xsl b/binsrc/tutorial/web/vs_x_1/shippers.xsl
index f02dc25..ec2bedc 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_x_1/tsales.vsp b/binsrc/tutorial/web/vs_x_1/tsales.vsp
index 0093c8a..650725d 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_x_1/tsales.xsl b/binsrc/tutorial/web/vs_x_1/tsales.xsl
index fc16e67..e62a0cb 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_x_1/tsales1.vsp b/binsrc/tutorial/web/vs_x_1/tsales1.vsp
index 104d7ad..76bbf99 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_x_1/tsales2.xsl b/binsrc/tutorial/web/vs_x_1/tsales2.xsl
index bd6d3cc..cf06fc8 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 ba248e4..38f3063 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_x_2/options.xml b/binsrc/tutorial/web/vs_x_2/options.xml
index a29e8ff..a7626d9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_x_2/shippers.vsp b/binsrc/tutorial/web/vs_x_2/shippers.vsp
index 6f23af2..ba01b83 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_x_2/shippers.xsl b/binsrc/tutorial/web/vs_x_2/shippers.xsl
index af2e96b..8b7c9a9 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 3ad9172..98a87a1 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_x_3/options.xml b/binsrc/tutorial/web/vs_x_3/options.xml
index a29e8ff..a7626d9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_x_3/shippers.vsp b/binsrc/tutorial/web/vs_x_3/shippers.vsp
index f5c62cd..bdaa60e 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_x_3/shippers.xsl b/binsrc/tutorial/web/vs_x_3/shippers.xsl
index 08dc12a..c050c50 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 b2f737f..a56130d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vs_xr_1/options.xml b/binsrc/tutorial/web/vs_xr_1/options.xml
index a29e8ff..a7626d9 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-2006 OpenLink Software
+ - 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
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 c3ac390..bb722a1 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-2006 OpenLink Software
+ - 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
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 56985ed..cf61e7e 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 f84ac63..cb285f0 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vs_xr_2/options.xml b/binsrc/tutorial/web/vs_xr_2/options.xml
index a29e8ff..a7626d9 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-2006 OpenLink Software
+ - 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
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 0941bfc..3bf95ef 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-2006 OpenLink Software
+ - 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
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 a841ef6..97260c0 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 b71a7cf..e77c810 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vx_s_1/options.xml b/binsrc/tutorial/web/vx_s_1/options.xml
index 9fd8902..408d1fd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_1/simple.vspx b/binsrc/tutorial/web/vx_s_1/simple.vspx
index 5308b1a..9e41b02 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 7cf1d63..1cdf23d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_10/order.vspx b/binsrc/tutorial/web/vx_s_10/order.vspx
index 79eb05e..cd477de 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 3e7ee25..a8f6e91 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 3e99a6e..670b60a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_11/options.xml b/binsrc/tutorial/web/vx_s_11/options.xml
index 3bab546..dd9b265 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-2006 OpenLink Software
+ - 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
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 4863612..99f96ec 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-2006 OpenLink Software
+ - 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
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 c39180b..e00321f 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_12/options.xml b/binsrc/tutorial/web/vx_s_12/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 e84306c..dee4355 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 0605281..9c67106 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-2006 OpenLink Software
+ - 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
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 742e879..ef05fb4 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_13/atom.xml b/binsrc/tutorial/web/vx_s_13/atom.xml
index 29b2ebc..48f9f93 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 2006/07/13 13:17:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_13/c_data.vspx b/binsrc/tutorial/web/vx_s_13/c_data.vspx
index b1d30b6..a9769ce 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_13/c_disp.vspx b/binsrc/tutorial/web/vx_s_13/c_disp.vspx
index b9b765a..ff1436f 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_13/c_edit.vspx b/binsrc/tutorial/web/vx_s_13/c_edit.vspx
index 6d2530b..d785f7c 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_13/countries.xml b/binsrc/tutorial/web/vx_s_13/countries.xml
index f5989f0..266af3a 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 2006/07/13 13:17:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_13/options.xml b/binsrc/tutorial/web/vx_s_13/options.xml
index 65df1ac..e16b9f3 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 2006/07/13 13:17:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_13/rdf.xml b/binsrc/tutorial/web/vx_s_13/rdf.xml
index c54557d..99c1641 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 2006/07/13 13:17:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_13/rss.xml b/binsrc/tutorial/web/vx_s_13/rss.xml
index 0590286..65e6ee0 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 2006/07/13 13:17:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 756acf1..145e7cd 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 2006/07/13 13:17:49 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/web/vx_s_2/check_box.vspx b/binsrc/tutorial/web/vx_s_2/check_box.vspx
index cc0c355..bca1c42 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_2/date.vspx b/binsrc/tutorial/web/vx_s_2/date.vspx
index cba9613..fbbdd1c 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_2/form.vspx b/binsrc/tutorial/web/vx_s_2/form.vspx
index 6b77ef5..42d2dec 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_2/options.xml b/binsrc/tutorial/web/vx_s_2/options.xml
index 9fd8902..408d1fd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_2/radio.vspx b/binsrc/tutorial/web/vx_s_2/radio.vspx
index 3d9112e..a395f99 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_2/radio_group.vspx b/binsrc/tutorial/web/vx_s_2/radio_group.vspx
index abd89c3..cac1e8b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_2/select.vspx b/binsrc/tutorial/web/vx_s_2/select.vspx
index 2f7bfd6..470d1fb 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_2/textarea.vspx b/binsrc/tutorial/web/vx_s_2/textarea.vspx
index bfa74b4..d2d3ab6 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 c3f7a9f..1617998 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_3/data_set.vspx b/binsrc/tutorial/web/vx_s_3/data_set.vspx
index f392917..6ae816b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_3/selectdb.vspx b/binsrc/tutorial/web/vx_s_3/selectdb.vspx
index 8c21335..3bcb2cc 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_3/update_form.vspx b/binsrc/tutorial/web/vx_s_3/update_form.vspx
index 8ad36d1..98890d4 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_3/update_radio.vspx b/binsrc/tutorial/web/vx_s_3/update_radio.vspx
index c6d5953..de83ead 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 2054d61..13b0b3d 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 6cb585f..1324e00 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_4/tree.vspx b/binsrc/tutorial/web/vx_s_4/tree.vspx
index 1fb48ab..5b35d72 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 2c1c61b..b7ddaab 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 f6c7f7b..70de336 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_5/emp.vspx b/binsrc/tutorial/web/vx_s_5/emp.vspx
index 657c07c..2023833 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_5/options.xml b/binsrc/tutorial/web/vx_s_5/options.xml
index 2bcbfae..44cad6d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_5/tab.vspx b/binsrc/tutorial/web/vx_s_5/tab.vspx
index c5817c0..20798b0 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 2898074..08ca77f 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a3c210b..59e94ae 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_6/login.vspx b/binsrc/tutorial/web/vx_s_6/login.vspx
index d481162..85adee0 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 703fea6..78279b9 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 7f11a3d..0e7432c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_7/options.xml b/binsrc/tutorial/web/vx_s_7/options.xml
index 568dde4..a8127f5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_7/products.vspx b/binsrc/tutorial/web/vx_s_7/products.vspx
index 89c4d4b..d87a346 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_7/sel_category.vspx b/binsrc/tutorial/web/vx_s_7/sel_category.vspx
index 973f206..530d5f3 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 2689f0f..4151e22 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_8/formdecor.vspx b/binsrc/tutorial/web/vx_s_8/formdecor.vspx
index 64e5b63..e4672ff 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_8/formsty.vspx b/binsrc/tutorial/web/vx_s_8/formsty.vspx
index 109dd45..d0ba5b8 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_8/formsty.xsl b/binsrc/tutorial/web/vx_s_8/formsty.xsl
index 0aa898d..f0a465b 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_8/options.xml b/binsrc/tutorial/web/vx_s_8/options.xml
index dd469b3..20a93d3 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-2006 OpenLink Software
+ - 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
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 085f5c8..32d019e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/button_0.vspx b/binsrc/tutorial/web/vx_s_9/button_0.vspx
index 3d7b974..75cc005 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/button_1.vspx b/binsrc/tutorial/web/vx_s_9/button_1.vspx
index dd241ae..f47a50a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/button_2.vspx b/binsrc/tutorial/web/vx_s_9/button_2.vspx
index 53d93e8..6ecad3c 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/button_3.vspx b/binsrc/tutorial/web/vx_s_9/button_3.vspx
index e872c52..1687f04 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/calendar_0.vspx b/binsrc/tutorial/web/vx_s_9/calendar_0.vspx
index c8cd07e..db986b7 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 becdee8..8757fdb 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 07465d7..48b7fdd 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 5346096..78b436d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 b8c91fd..ae1739f 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 203bdbc..a6dceaa 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 6e9d33e..8f70d7b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 164a06d..c9e03a9 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 dfb5c59..aa51a1a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 19f01f8..69b422e 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/footer.xml b/binsrc/tutorial/web/vx_s_9/footer.xml
index f691826..64c5881 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/form_0.vspx b/binsrc/tutorial/web/vx_s_9/form_0.vspx
index 332094e..75f9c47 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/form_1.vspx b/binsrc/tutorial/web/vx_s_9/form_1.vspx
index edc2a5d..e15421f 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/include_0.vspx b/binsrc/tutorial/web/vx_s_9/include_0.vspx
index 09e1023..8f28245 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/label_0.vspx b/binsrc/tutorial/web/vx_s_9/label_0.vspx
index b9697fc..7dbf7b2 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/login_0.vspx b/binsrc/tutorial/web/vx_s_9/login_0.vspx
index 8f7fe49..06e721f 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 10eecb4..5e22b73 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/page_0.vspx b/binsrc/tutorial/web/vx_s_9/page_0.vspx
index b94bb45..bbe101a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 3c6cb0d..f912480 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 2cfcf54..cf191f4 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 170851b..9ee6b1d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/tab_0.vspx b/binsrc/tutorial/web/vx_s_9/tab_0.vspx
index 0828992..59880a5 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/text_0.vspx b/binsrc/tutorial/web/vx_s_9/text_0.vspx
index e6f01ae..d54ccd3 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 a416f73..55b5427 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/tree_0.vspx b/binsrc/tutorial/web/vx_s_9/tree_0.vspx
index 83a538b..993e34b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/url_0.vspx b/binsrc/tutorial/web/vx_s_9/url_0.vspx
index a418ed1..597cf11 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/validator_0.vspx b/binsrc/tutorial/web/vx_s_9/validator_0.vspx
index 4aef7f2..3e6b500 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web/vx_s_9/variable_0.vspx b/binsrc/tutorial/web/vx_s_9/variable_0.vspx
index 59fcb75..53ff499 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 ce36faf..f2a7684 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 c02cf52..4880d10 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/web2/index.xml b/binsrc/tutorial/web2/index.xml
index 5b32580..9bbde6c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xbel.vsp b/binsrc/tutorial/xbel.vsp
index 0e7460f..c660399 100644
--- a/binsrc/tutorial/xbel.vsp
+++ b/binsrc/tutorial/xbel.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xbel.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/Makefile.am b/binsrc/tutorial/xml/Makefile.am
index 7a7c49e..36d36c3 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/tutorial/xml/Makefile.in b/binsrc/tutorial/xml/Makefile.in
index f07aa05..5a2f265 100644
--- a/binsrc/tutorial/xml/Makefile.in
+++ b/binsrc/tutorial/xml/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -334,14 +328,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/xml/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/tutorial/xml/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/tutorial/xml/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/tutorial/xml/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -359,7 +353,6 @@ $(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
@@ -389,17 +382,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -427,7 +416,6 @@ clean-generic:
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"
@@ -446,8 +434,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -456,28 +442,18 @@ install-data-am:
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
@@ -511,7 +487,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/tutorial/xml/demo.css b/binsrc/tutorial/xml/demo.css
index fed097d..bf9ab24 100644
--- a/binsrc/tutorial/xml/demo.css
+++ b/binsrc/tutorial/xml/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/xml/index.xml b/binsrc/tutorial/xml/index.xml
index 4a09de4..1760358 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/rq_s_1/options.xml b/binsrc/tutorial/xml/rq_s_1/options.xml
index e6abcae..4c281c9 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-2006 OpenLink Software
+ - 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
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 6bb1a7e..59dacc9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/sx_e_0/options.xml b/binsrc/tutorial/xml/sx_e_0/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 eca30c5..421a3ae 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/sx_e_1/options.xml b/binsrc/tutorial/xml/sx_e_1/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 5a12ca4..6d75acb 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-2006 OpenLink Software
+ - 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
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 582cc3a..b36bf31 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_e_2/options.xml b/binsrc/tutorial/xml/sx_e_2/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 97ff55c..eab1f24 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-2006 OpenLink Software
+ - 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
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 d2f5182..d7e4506 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_e_3/options.xml b/binsrc/tutorial/xml/sx_e_3/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 4d65bc1..cf1cbcb 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-2006 OpenLink Software
+ - 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
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 c6476b9..acb74a6 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_e_4/options.xml b/binsrc/tutorial/xml/sx_e_4/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 ac1b3e9..e50ec82 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-2006 OpenLink Software
+ - 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
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 c16a763..9d8c375 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_e_5/options.xml b/binsrc/tutorial/xml/sx_e_5/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 bf86ac1..31d5199 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-2006 OpenLink Software
+ - 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
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 e0c1c46..d57febc 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_e_6/options.xml b/binsrc/tutorial/xml/sx_e_6/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 186d8a9..2ae5d21 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-2006 OpenLink Software
+ - 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
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 bf57277..c3df449 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_e_7/options.xml b/binsrc/tutorial/xml/sx_e_7/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 24f264e..31a95a3 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-2006 OpenLink Software
+ - 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
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 f3b8aa9..8854c76 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_e_8/options.xml b/binsrc/tutorial/xml/sx_e_8/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 4d050a0..a582693 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-2006 OpenLink Software
+ - 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
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 8a9b56c..d22ac73 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 2006/08/15 19:30:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_e_9/options.xml b/binsrc/tutorial/xml/sx_e_9/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 50f7845..36f698a 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-2006 OpenLink Software
+ - 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
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 98f3fbb..625c395 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_f_1/options.xml b/binsrc/tutorial/xml/sx_f_1/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 a939060..cd04869 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-2006 OpenLink Software
+ - 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
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 088ced2..e03885d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_g_1/options.xml b/binsrc/tutorial/xml/sx_g_1/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 a4f8281..b224704 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-2006 OpenLink Software
+ - 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
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 166985e..e1da819 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_h_1/options.xml b/binsrc/tutorial/xml/sx_h_1/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 509153d..41f1fba 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-2006 OpenLink Software
+ - 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
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 f18aedf..67666fa 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/sx_output.xsl b/binsrc/tutorial/xml/sx_output.xsl
index 6a5048f..4a84610 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/map01.xsd b/binsrc/tutorial/xml/usecases/map01.xsd
index 9066fbd..ed37803 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/map02.xml b/binsrc/tutorial/xml/usecases/map02.xml
index a170e06..061f44a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/map02.xsd b/binsrc/tutorial/xml/usecases/map02.xsd
index b78c920..5a4ab9d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/map03.xml b/binsrc/tutorial/xml/usecases/map03.xml
index 141e519..0b99afe 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/options.xml b/binsrc/tutorial/xml/usecases/options.xml
index 9f98d66..8026ceb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/slash.xml b/binsrc/tutorial/xml/usecases/slash.xml
index ea04f53..4749882 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sq01.xml b/binsrc/tutorial/xml/usecases/sq01.xml
index a605e4a..ac3577d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sq02.xml b/binsrc/tutorial/xml/usecases/sq02.xml
index e03e553..4cb3e04 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sq03.xml b/binsrc/tutorial/xml/usecases/sq03.xml
index 18aa850..84f2e79 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sq04.xml b/binsrc/tutorial/xml/usecases/sq04.xml
index 82ed8a6..3599928 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sq05.xml b/binsrc/tutorial/xml/usecases/sq05.xml
index 4eb6b46..128f33a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sq06.xml b/binsrc/tutorial/xml/usecases/sq06.xml
index 41c23b9..c6d4732 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sqlx01.xml b/binsrc/tutorial/xml/usecases/sqlx01.xml
index a3e9f73..8017d0b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sqlx02.xml b/binsrc/tutorial/xml/usecases/sqlx02.xml
index eaff520..bf1bc86 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sqlx03.xml b/binsrc/tutorial/xml/usecases/sqlx03.xml
index fdcb491..4107d83 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/sqlx04.xml b/binsrc/tutorial/xml/usecases/sqlx04.xml
index 058777b..3f83825 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/usecases.sql b/binsrc/tutorial/xml/usecases/usecases.sql
index 95d9d89..636ad4d 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/usecases/usecases.vsp b/binsrc/tutorial/xml/usecases/usecases.vsp
index 940b092..a10e9ce 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/usecases/usecases_vad.sql b/binsrc/tutorial/xml/usecases/usecases_vad.sql
index 6600a85..82241f3 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 2007/04/02 07:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/usecases/xq04.xml b/binsrc/tutorial/xml/usecases/xq04.xml
index 857da3c..197bd34 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/xq05.xml b/binsrc/tutorial/xml/usecases/xq05.xml
index 180d619..6a87f6c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/xq06.xml b/binsrc/tutorial/xml/usecases/xq06.xml
index bc992a6..e304f84 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/xqr01.xml b/binsrc/tutorial/xml/usecases/xqr01.xml
index 3a1773b..5819176 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/xqr02.xml b/binsrc/tutorial/xml/usecases/xqr02.xml
index 08e4a62..d64b52f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/usecases/xqr03.xml b/binsrc/tutorial/xml/usecases/xqr03.xml
index 544a35b..3ae6425 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_1/options.xml b/binsrc/tutorial/xml/xq_s_1/options.xml
index 4dfe56d..599ba15 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-2006 OpenLink Software
+ - 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
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 99d14a2..d701075 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2/options.xml b/binsrc/tutorial/xml/xq_s_2/options.xml
index 9136e45..baea63d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2/search.sql b/binsrc/tutorial/xml/xq_s_2/search.sql
index cacbfec..e476097 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_2/search.vsp b/binsrc/tutorial/xml/xq_s_2/search.vsp
index 461cf13..a81e038 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_2/text.vsp b/binsrc/tutorial/xml/xq_s_2/text.vsp
index 51fff95..b227508 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1ec93d0..381e096 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/example.vsp b/binsrc/tutorial/xml/xq_s_2a/example.vsp
index bb8544d..f186e24 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss1.xml b/binsrc/tutorial/xml/xq_s_2a/rss1.xml
index b3a2178..f70debd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss10.xml b/binsrc/tutorial/xml/xq_s_2a/rss10.xml
index fdb714f..cc04558 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss11.xml b/binsrc/tutorial/xml/xq_s_2a/rss11.xml
index de4c0a5..1955d04 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss12.xml b/binsrc/tutorial/xml/xq_s_2a/rss12.xml
index 6d60b9b..1c5fc94 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss13.xml b/binsrc/tutorial/xml/xq_s_2a/rss13.xml
index 43afb62..9b41949 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss14.xml b/binsrc/tutorial/xml/xq_s_2a/rss14.xml
index d855418..8e3c213 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss2.xml b/binsrc/tutorial/xml/xq_s_2a/rss2.xml
index b99d208..f6dde88 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss3.xml b/binsrc/tutorial/xml/xq_s_2a/rss3.xml
index f8ba0e2..1cb3321 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss4.xml b/binsrc/tutorial/xml/xq_s_2a/rss4.xml
index 81856e7..0695c12 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss5.xml b/binsrc/tutorial/xml/xq_s_2a/rss5.xml
index f70b11b..34c0daf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss6.xml b/binsrc/tutorial/xml/xq_s_2a/rss6.xml
index 367455c..4416256 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss7.xml b/binsrc/tutorial/xml/xq_s_2a/rss7.xml
index 89a6610..c0535d9 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss8.xml b/binsrc/tutorial/xml/xq_s_2a/rss8.xml
index f039cd1..bb5ee54 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss9.xml b/binsrc/tutorial/xml/xq_s_2a/rss9.xml
index 3c4ed52..28f3c96 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-2006 OpenLink Software
+ - 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
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 9f93583..ad38f86 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 81bcaa9..2c83b86 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_3/slash.vsp b/binsrc/tutorial/xml/xq_s_3/slash.vsp
index 130bfb9..68bd24d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_3/slash.xml b/binsrc/tutorial/xml/xq_s_3/slash.xml
index b60845b..1765dcc 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-2006 OpenLink Software
+ - 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
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 146d7c8..27be758 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b0010e3..b7b41af 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp b/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp
index 9900907..8ceb007 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/atom.vsp b/binsrc/tutorial/xml/xq_s_4/atom.vsp
index 77c76a2..bf94626 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/blog100.vsp b/binsrc/tutorial/xml/xq_s_4/blog100.vsp
index a1b9c5f..8ceb007 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp b/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp
index fd1208b..8ceb007 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/ceo.vsp b/binsrc/tutorial/xml/xq_s_4/ceo.vsp
index ca50d9d..8ceb007 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/common.vsp b/binsrc/tutorial/xml/xq_s_4/common.vsp
index 6584417..8d586d2 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/foaf.vsp b/binsrc/tutorial/xml/xq_s_4/foaf.vsp
index 20f3b45..8146f18 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/foafmap.vsp b/binsrc/tutorial/xml/xq_s_4/foafmap.vsp
index 1f2c80a..0d57b2f 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp b/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp
index 67f394f..ecd9b11 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp b/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp
index 87b4848..0d57b2f 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp b/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp
index 593701c..8ceb007 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/o100.sql b/binsrc/tutorial/xml/xq_s_4/o100.sql
index f1f03c7..b0e219d 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/o100.vsp b/binsrc/tutorial/xml/xq_s_4/o100.vsp
index 01608f3..ecd9b11 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/options.xml b/binsrc/tutorial/xml/xq_s_4/options.xml
index 7162e10..0913121 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xml/xq_s_4/osc2003.vsp b/binsrc/tutorial/xml/xq_s_4/osc2003.vsp
index fa02348..ecd9b11 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/osc2005.vsp b/binsrc/tutorial/xml/xq_s_4/osc2005.vsp
index 7bc7a63..ecd9b11 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp b/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp
index 7643749..8ceb007 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp b/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp
index 42f60da..0d57b2f 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/sioc.vsp b/binsrc/tutorial/xml/xq_s_4/sioc.vsp
index 664d2aa..b8dccb3 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/status.vsp b/binsrc/tutorial/xml/xq_s_4/status.vsp
index 72e53a3..99cc713 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp b/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp
index 967130b..ecd9b11 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp b/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp
index 57e20c9..0d57b2f 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp b/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp
index 9523cc4..0d57b2f 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp b/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp
index 64c5307..0d57b2f 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 2007/01/22 22:01:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp b/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp
index d7cae56..ecd9b11 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xml/xq_s_4/web2005.vsp b/binsrc/tutorial/xml/xq_s_4/web2005.vsp
index 758898f..7b6dfeb 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a84c0c4..56bd9ec 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-2006 OpenLink Software
+ - 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
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 7543bd7..c6af223 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 2007/01/22 22:01:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 dbfbdac..e41bd1d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlapps/index.xml b/binsrc/tutorial/xmlapps/index.xml
index 4a09de4..1760358 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/demo.css b/binsrc/tutorial/xmlsql/demo.css
index fed097d..bf9ab24 100644
--- a/binsrc/tutorial/xmlsql/demo.css
+++ b/binsrc/tutorial/xmlsql/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/tutorial/xmlsql/index.xml b/binsrc/tutorial/xmlsql/index.xml
index 239b868..d7136bf 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd
index 23b169f..2ed49f7 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd b/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd
index 6fc593e..f35ebe4 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-2006 OpenLink Software
+ - 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
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 322341e..4c6dd0f 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-2006 OpenLink Software
+ - 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
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 1db942b..244b74b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd
index 8ce63e9..647f418 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd b/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd
index 1459407..8a43bdb 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-2006 OpenLink Software
+ - 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
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 1690961..d808283 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-2006 OpenLink Software
+-- 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
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 f8233d6..b6f6b85 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/options.xml b/binsrc/tutorial/xmlsql/ms_a_1/options.xml
index e2ca10e..8b6c0cb 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-2006 OpenLink Software
+ - 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
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 7eb6601..cd880ac 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-2006 OpenLink Software
+ - 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
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 9fa5629..6f37306 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 86b9070..2abb6f2 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_2/options.xml b/binsrc/tutorial/xmlsql/ms_a_2/options.xml
index 8f4e61e..7c9852e 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-2006 OpenLink Software
+ - 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
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 f7dd231..c5f8df8 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-2006 OpenLink Software
+ - 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
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 920c191..edf55a4 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a21e2b3..24e2781 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3/options.xml b/binsrc/tutorial/xmlsql/ms_a_3/options.xml
index 8f4e61e..7c9852e 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-2006 OpenLink Software
+ - 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
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 fcdd4d7..acf0cc4 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-2006 OpenLink Software
+ - 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
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 771557b..452610f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 d403f94..25b13ad 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/options.xml b/binsrc/tutorial/xmlsql/ms_a_3a/options.xml
index 8f4e61e..7c9852e 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-2006 OpenLink Software
+ - 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
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 10387c0..d39098d 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-2006 OpenLink Software
+ - 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
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 60ea760..19a5440 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 672aeff..50f025a 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/options.xml b/binsrc/tutorial/xmlsql/ms_a_3b/options.xml
index 8f4e61e..7c9852e 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-2006 OpenLink Software
+ - 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
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 b5628cb..27829b0 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-2006 OpenLink Software
+ - 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
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 f7635ea..b3b5292 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 71775d3..6d7806b 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_4/options.xml b/binsrc/tutorial/xmlsql/ms_a_4/options.xml
index 8f4e61e..7c9852e 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-2006 OpenLink Software
+ - 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
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 c04332c..416cd85 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-2006 OpenLink Software
+ - 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
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 54365fa..4e9d9cc 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 de7d7ae..b91333f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_5/options.xml b/binsrc/tutorial/xmlsql/ms_a_5/options.xml
index 8f4e61e..7c9852e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/sx_output.xsl b/binsrc/tutorial/xmlsql/sx_output.xsl
index 6a5048f..4a84610 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_1/options.xml b/binsrc/tutorial/xmlsql/xp_v_1/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 c15aa76..bcb59e2 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 23811af..359d4fb 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_2/options.xml b/binsrc/tutorial/xmlsql/xp_v_2/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 092ce6f..3d88d3b 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-2006 OpenLink Software
+ - 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
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 53ea389..f01d312 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_3/options.xml b/binsrc/tutorial/xmlsql/xp_v_3/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 186cf52..e2c3878 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_1/options.xml b/binsrc/tutorial/xmlsql/xs_s_1/options.xml
index 009cb28..3c5460e 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-2006 OpenLink Software
+ - 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
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 be37774..4f0bda8 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e114659..a025de3 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-2006 OpenLink Software
+ - 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
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 adc2633..3a95182 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_2/options.xml b/binsrc/tutorial/xmlsql/xs_s_2/options.xml
index 347b59f..27d89fe 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-2006 OpenLink Software
+ - 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
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 cee4460..49137b4 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b86c531..89436a9 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-2006 OpenLink Software
+ - 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
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 4bcfda1..c81c8e9 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_3/options.xml b/binsrc/tutorial/xmlsql/xs_s_3/options.xml
index e306635..300e870 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-2006 OpenLink Software
+ - 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
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 f4088b2..e5c8c0c 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-2006 OpenLink Software
+ - 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
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 57f9ec8..3d8e0ec 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_4/options.xml b/binsrc/tutorial/xmlsql/xs_s_4/options.xml
index e306635..300e870 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-2006 OpenLink Software
+ - 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
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 b7816bb..47bb64b 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-2006 OpenLink Software
+ - 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
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 631d1af..fbb7fb5 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 9093969..b0f8915 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 ba95dba..ce0e712 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-2006 OpenLink Software
+ - 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
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 bd7de08..17d99f8 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 459fdae..b88e682 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_6/options.xml b/binsrc/tutorial/xmlsql/xs_s_6/options.xml
index e306635..300e870 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-2006 OpenLink Software
+ - 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
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 860b8df..e082e20 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-2006 OpenLink Software
+ - 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
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 2f9d0e4..3c580f5 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 d8fc65e..3cedf90 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-2006 OpenLink Software
+ - 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
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 14df94f..a5aafae 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-2006 OpenLink Software
+ - 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
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 140f9cb..fb305a3 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 9654b33..b59d7c7 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_8/options.xml b/binsrc/tutorial/xmlsql/xs_s_8/options.xml
index e306635..300e870 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-2006 OpenLink Software
+ - 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
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 5a5f4f5..db9565e 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 469856e..986aa87 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-2006 OpenLink Software
+ - 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
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 15e4ffe..92b0b7d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/options.xml b/binsrc/tutorial/xmlsql/xs_s_9/options.xml
index e306635..300e870 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-2006 OpenLink Software
+ - 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
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 cc8684b..49a3077 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-2006 OpenLink Software
+ - 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
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 44f0d8c..27deef9 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 154ff2c..994e404 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 90f1c03..c8da2e3 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 03ae2f5..65a4bde 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 26bad0e..08c96cb 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 bfaddec..0e2fb98 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 eb86586..0d1591a7 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_1/options.xml b/binsrc/tutorial/xmlsql/xs_u_1/options.xml
index 73514ac..6ece952 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-2006 OpenLink Software
+ - 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
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 b86daa4..10f98b8 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-2006 OpenLink Software
+ - 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
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 12e6dde..3d1b262 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 dfeffee..310780a 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 45f5c21..d739c6b 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_2/options.xml b/binsrc/tutorial/xmlsql/xs_u_2/options.xml
index af0edae..7541c1e 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-2006 OpenLink Software
+ - 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
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 1de825e..6736a4b 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1a03abb..36329b6 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-2006 OpenLink Software
+ - 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
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 c6a0d11..0f66792 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1ce518a..f78d4f4 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/options.xml b/binsrc/tutorial/xmlsql/xs_u_3/options.xml
index 9bff0da..8296381 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.html b/binsrc/tutorial/xmlsql/xs_u_3/shippers.html
index fae1478..b08a7b3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml
index 5867551..51e8e3c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl
index 33d1a05..416d151 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 7acca5a..d8fcbc6 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a035ce1..1cd5b83 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlxslt/index.xml b/binsrc/tutorial/xmlxslt/index.xml
index 719fd76..5c37be0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlxslt/xs_d_1/options.xml b/binsrc/tutorial/xmlxslt/xs_d_1/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 7cde7e8..0a69390 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-2006 OpenLink Software
+ - 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
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 2aa957b..b0184d3 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/options.xml b/binsrc/tutorial/xmlxslt/xs_e_1/options.xml
index 1d71c38..3331d39 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-2006 OpenLink Software
+ - 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
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 c3a8812..06973d3 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8f0eab0..354ad89 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-2006 OpenLink Software
+ - 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
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 4f652d3..486968f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 e0c0139..1bb90a8 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e240c78..65d66a4 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b2fcedc..ae621cc 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 33bd68b..3e58a02 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 7136038..b369fc7 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 212fcca..3ab8e3d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/options.xml b/binsrc/tutorial/xmlxslt/xs_f_1/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 f06427c..a90df50 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-2006 OpenLink Software
+ - 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
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 e993dfe..8405bdc 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 08cce18..e312eca 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_2/options.xml b/binsrc/tutorial/xmlxslt/xs_f_2/options.xml
index 88cfba1..88a17a1 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-2006 OpenLink Software
+ - 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
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 59816a6..1ac8aa9 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-2006 OpenLink Software
+ - 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
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 9e05abe..9169842 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8a3934b..07558a2 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-2006 OpenLink Software
+ - 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
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 93904f2..29d149d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/options.xml b/binsrc/tutorial/xmlxslt/xs_t_1/options.xml
index 57d5c2c..4c8da8c 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-2006 OpenLink Software
+ - 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
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 c900414..2ed04e2 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 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 36062b2..4c2a8ed 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-2006 OpenLink Software
+ - 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
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 885d759..03385a6 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a257aa5..66b1d61 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b163095..e5ab466 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 fe161d6..b7ae5eb 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/Makefile.am b/binsrc/vad/Makefile.am
index 24ec372..6887e16 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/vad/Makefile.in b/binsrc/vad/Makefile.in
index 7747ec5..72d8a87 100644
--- a/binsrc/vad/Makefile.in
+++ b/binsrc/vad/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -311,14 +305,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/vad/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/vad/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/vad/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/vad/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -336,7 +330,6 @@ $(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
@@ -366,17 +359,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -404,7 +393,6 @@ clean-generic:
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"
@@ -423,8 +411,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -433,28 +419,18 @@ install-data-am:
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
@@ -488,7 +464,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/vad/http/regedit.vsp b/binsrc/vad/http/regedit.vsp
index 5a6461c..61db8a4 100644
--- a/binsrc/vad/http/regedit.vsp
+++ b/binsrc/vad/http/regedit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit.vsp,v 1.3 2007/03/28 11:42:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/http/regedit_data.vsp b/binsrc/vad/http/regedit_data.vsp
index fa4bc90..673addf 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/http/regedit_e1.vsp b/binsrc/vad/http/regedit_e1.vsp
index 5c49b35..9f1a53a 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/http/regedit_sql.vsp b/binsrc/vad/http/regedit_sql.vsp
index a137a7c..e50f73f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/http/regedit_sticker.vsp b/binsrc/vad/http/regedit_sticker.vsp
index 6544964..f44b365 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 2007/01/22 13:57:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/http/regedit_tree.vsp b/binsrc/vad/http/regedit_tree.vsp
index 9247489..95152c1 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/oper_pars.sql b/binsrc/vad/oper_pars.sql
index 5691fb1..3b4c027 100644
--- a/binsrc/vad/oper_pars.sql
+++ b/binsrc/vad/oper_pars.sql
@@ -1,10 +1,10 @@
--
--- $Id: oper_pars.sql,v 1.3 2007/01/22 13:57:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/operpars.awk b/binsrc/vad/operpars.awk
index 614e03a..4f96a41 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/vad/pars_init.sql b/binsrc/vad/pars_init.sql
index 4109edf..f397fd6 100644
--- a/binsrc/vad/pars_init.sql
+++ b/binsrc/vad/pars_init.sql
@@ -1,10 +1,10 @@
--
--- $Id: pars_init.sql,v 1.2 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/parse_oper_pars.sh b/binsrc/vad/parse_oper_pars.sh
index b695a97..decb751 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/vad/regedit.sql b/binsrc/vad/regedit.sql
index 29789f2..84f55c9 100644
--- a/binsrc/vad/regedit.sql
+++ b/binsrc/vad/regedit.sql
@@ -1,10 +1,10 @@
--
--- $Id: regedit.sql,v 1.2 2006/08/16 07:58:13 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/specs/sticker_rdf_lib.xml b/binsrc/vad/specs/sticker_rdf_lib.xml
index 834146a..b7a7abd 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-2011 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2012 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 cfa23a3..b2650a2 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/vad_boot.sql b/binsrc/vad/vad_boot.sql
index 3892b4f..b79c16d 100644
--- a/binsrc/vad/vad_boot.sql
+++ b/binsrc/vad/vad_boot.sql
@@ -1,10 +1,10 @@
--
--- $Id: vad_boot.sql,v 1.3 2007/01/22 13:57:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/vad_make.sql b/binsrc/vad/vad_make.sql
index aa05856..8178190 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.5 2011/10/26 00:00:54 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vad/vad_misc.sql b/binsrc/vad/vad_misc.sql
index 4d5d919..133b70b 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.3 2011/10/13 18:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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-2011 OpenLink Software.</P></TD></TR>',"VAD"."DBA"."VAD_VERSION" ()));
+ http (sprintf (' VAD Interface (%s) - Copyright© 1998-2012 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 dd6a0c5..355b312 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.1 2011/09/09 13:19:03 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/virtodbc/CLIsql3_w32.cpp b/binsrc/virtodbc/CLIsql3_w32.cpp
index 3a7598a..71bf6cb 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.2 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Win32 specific version of CLIsql3
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/Makefile.am b/binsrc/virtodbc/Makefile.am
index 2251197..dbbcd07 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-2010 OpenLink Software
+# 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
diff --git a/binsrc/virtodbc/Makefile.in b/binsrc/virtodbc/Makefile.in
index ac3cae6..1854913 100644
--- a/binsrc/virtodbc/Makefile.in
+++ b/binsrc/virtodbc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -304,14 +298,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/virtodbc/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/virtodbc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/virtodbc/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/virtodbc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -329,7 +323,6 @@ $(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
@@ -359,17 +352,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -397,7 +386,6 @@ clean-generic:
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"
@@ -416,8 +404,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -426,28 +412,18 @@ install-data-am:
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
@@ -481,7 +457,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/virtodbc/dialog.cpp b/binsrc/virtodbc/dialog.cpp
index 2793260..e264da2 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.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Common dialog code
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/dialog.h b/binsrc/virtodbc/dialog.h
index 108d95f..91e9d23 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.2 2010/02/01 23:10:14 source Exp $
+ * $Id$
*
* Common dialog code
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/kvlist.cpp b/binsrc/virtodbc/kvlist.cpp
index 5f709e0..1958296 100644
--- a/binsrc/virtodbc/kvlist.cpp
+++ b/binsrc/virtodbc/kvlist.cpp
@@ -1,14 +1,14 @@
/*
* kvlist.cpp
*
- * $Id: kvlist.cpp,v 1.3.2.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Key/Value pair matching for DSN parsing
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/kvlist.h b/binsrc/virtodbc/kvlist.h
index a92a4ec..04933b5 100644
--- a/binsrc/virtodbc/kvlist.h
+++ b/binsrc/virtodbc/kvlist.h
@@ -1,14 +1,14 @@
/*
* kvlist.h
*
- * $Id: kvlist.h,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Key/Value pair matching for DSN parsing
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/resource.h b/binsrc/virtodbc/resource.h
index 1495751..fb9ac79 100644
--- a/binsrc/virtodbc/resource.h
+++ b/binsrc/virtodbc/resource.h
@@ -1,10 +1,10 @@
/*
- * $Id: resource.h,v 1.2.2.2 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -21,10 +21,11 @@
*/
//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by VirtDSN.rc
+// Microsoft Visual C++ generated include file.
+// Used by virtodbc.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 4fd90d5..2acb914 100644
--- a/binsrc/virtodbc/virtodbc.cpp
+++ b/binsrc/virtodbc/virtodbc.cpp
@@ -1,14 +1,14 @@
/*
* virtodbc.cpp
*
- * $Id: virtodbc.cpp,v 1.5.2.2 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Common includes for win32 utilties
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/virtodbc.def b/binsrc/virtodbc/virtodbc.def
index b5643b5..fd6128e 100644
--- a/binsrc/virtodbc/virtodbc.def
+++ b/binsrc/virtodbc/virtodbc.def
@@ -1,14 +1,14 @@
;
; virtodbc.def
;
-; $Id: virtodbc.def,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
+; $Id$
;
; DLL link script
;
; This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
; project.
;
-; Copyright (C) 1998-2010 OpenLink Software
+; 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
diff --git a/binsrc/virtodbc/virtodbc.rc b/binsrc/virtodbc/virtodbc.rc
index 90466bd..b947474 100644
--- a/binsrc/virtodbc/virtodbc.rc
+++ b/binsrc/virtodbc/virtodbc.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -53,14 +53,13 @@ END
//
IDD_CONFIGDSN DIALOGEX 0, 0, 335, 204
-STYLE DS_MODALFRAME | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "OpenLink Virtuoso DSN Configuration"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
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
@@ -68,74 +67,61 @@ BEGIN
END
IDD_CONFIGPAGE1 DIALOGEX 0, 0, 234, 157
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
+STYLE DS_SETFONT | 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_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
+ 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
CONTROL "Use RoundRobin for failover connection",IDC_RROBIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,64,141,143,10
END
-IDD_CONFIGPAGE3 DIALOG DISCARDABLE 0, 0, 234, 157
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
+IDD_CONFIGPAGE3 DIALOG 0, 0, 234, 157
+STYLE DS_SETFONT | 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 DISCARDABLE 0, 0, 201, 113
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_ODBCERROR DIALOG 0, 0, 201, 113
+STYLE DS_SETFONT | 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 DISCARDABLE 0, 0, 235, 82
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_LOGINDLG DIALOG 0, 0, 235, 82
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "OpenLink Virtuoso Login"
FONT 8, "MS Sans Serif"
BEGIN
@@ -151,33 +137,26 @@ BEGIN
PUSHBUTTON "&Options >>",IDC_OPTIONS,178,61,50,14
END
-IDD_CONFIGPAGE2 DIALOG DISCARDABLE 0, 0, 234, 157
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
+IDD_CONFIGPAGE2 DIALOG 0, 0, 234, 157
+STYLE DS_SETFONT | 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
@@ -187,7 +166,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO
BEGIN
IDD_CONFIGDSN, DIALOG
BEGIN
@@ -243,14 +222,52 @@ END
// Bitmap
//
-IDB_BITMAPVIRT BITMAP DISCARDABLE "virtodbc.bmp"
+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
+
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_FINISH "Finish"
IDS_NEXT "&Next >"
@@ -266,6 +283,10 @@ 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 f7d7dd7..a2cebef 100644
--- a/binsrc/virtodbc/w32util.h
+++ b/binsrc/virtodbc/w32util.h
@@ -1,14 +1,14 @@
/*
* w32util.h
*
- * $Id: w32util.h,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Common includes for win32 utilties
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/waitcursor.h b/binsrc/virtodbc/waitcursor.h
index f937a68..ccadc82 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.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Wait cursor with dynamic scope
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/winctl.cpp b/binsrc/virtodbc/winctl.cpp
index 04412ee..42e1157 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.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Win32 controls
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/winctl.h b/binsrc/virtodbc/winctl.h
index 9bb059c..7153489 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.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Win32 controls
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/wizard.cpp b/binsrc/virtodbc/wizard.cpp
index 0c7eaaa..c83db2b 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.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Wizard Dialogs
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/wizard.h b/binsrc/virtodbc/wizard.h
index 843cfba..73393f6 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.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Wizard Dialogs
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/zcbrowser.cpp b/binsrc/virtodbc/zcbrowser.cpp
index ee8b4c6..ab417c9 100644
--- a/binsrc/virtodbc/zcbrowser.cpp
+++ b/binsrc/virtodbc/zcbrowser.cpp
@@ -1,14 +1,14 @@
/*
* zcbrowser.cpp
*
- * $Id: zcbrowser.cpp,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* Zero Config Browser (rendezvous)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/zcbrowser.h b/binsrc/virtodbc/zcbrowser.h
index 4040f93..06829af 100644
--- a/binsrc/virtodbc/zcbrowser.h
+++ b/binsrc/virtodbc/zcbrowser.h
@@ -1,14 +1,14 @@
/*
* zcbrowser.h
*
- * $Id: zcbrowser.h,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* ZeroConfig Browser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/zcbrowsercombo.cpp b/binsrc/virtodbc/zcbrowsercombo.cpp
index 95bd2d5..59828e4 100644
--- a/binsrc/virtodbc/zcbrowsercombo.cpp
+++ b/binsrc/virtodbc/zcbrowsercombo.cpp
@@ -1,14 +1,14 @@
/*
* zcbrowsercombo.cpp
*
- * $Id: zcbrowsercombo.cpp,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* ZeroConfig Browser Combo
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtodbc/zcbrowsercombo.h b/binsrc/virtodbc/zcbrowsercombo.h
index 6f42223..0233dbe 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.1 2010/01/25 22:43:36 source Exp $
+ * $Id$
*
* ZeroConfig Browser Combo
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/Makefile.am b/binsrc/virtoledb/Makefile.am
index 18ee650..ba269bc 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/virtoledb/Makefile.in b/binsrc/virtoledb/Makefile.in
index b3cf2ae..c3ced0a 100644
--- a/binsrc/virtoledb/Makefile.in
+++ b/binsrc/virtoledb/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -338,14 +332,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/virtoledb/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/virtoledb/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/virtoledb/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/virtoledb/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -363,7 +357,6 @@ $(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
@@ -393,17 +386,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -431,7 +420,6 @@ clean-generic:
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"
@@ -450,8 +438,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -460,28 +446,18 @@ install-data-am:
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
@@ -515,7 +491,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/virtoledb/asserts.cpp b/binsrc/virtoledb/asserts.cpp
index b84d012..9f4292f 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.1 2011/01/25 14:36:33 source Exp $
+ * $Id$
*
* Debugging and Assertion Routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/asserts.h b/binsrc/virtoledb/asserts.h
index e7a95f7..a3a4636 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Assertion Routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/baseobj.cpp b/binsrc/virtoledb/baseobj.cpp
index 401fc07..6cf3374 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Base class for COM objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/baseobj.h b/binsrc/virtoledb/baseobj.h
index 5e960e0..9c4f4ba 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Base class for COM objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/command.cpp b/binsrc/virtoledb/command.cpp
index 06d5c5e..b5eec43 100644
--- a/binsrc/virtoledb/command.cpp
+++ b/binsrc/virtoledb/command.cpp
@@ -1,11 +1,11 @@
/* command.cpp
*
- * $Id: command.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/command.h b/binsrc/virtoledb/command.h
index 3671718..b0cc684 100644
--- a/binsrc/virtoledb/command.h
+++ b/binsrc/virtoledb/command.h
@@ -1,11 +1,11 @@
/* command.h
*
- * $Id: command.h,v 1.2 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/connobj.cpp b/binsrc/virtoledb/connobj.cpp
index 292a64d..a0970d7 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Connectable objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/connobj.h b/binsrc/virtoledb/connobj.h
index 342dbed..98bb4ac 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Connectable objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/data.cpp b/binsrc/virtoledb/data.cpp
index e1e63f8..c182951 100644
--- a/binsrc/virtoledb/data.cpp
+++ b/binsrc/virtoledb/data.cpp
@@ -1,11 +1,11 @@
/* data.cpp
*
- * $Id: data.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/data.h b/binsrc/virtoledb/data.h
index b68f0bb..331aae1 100644
--- a/binsrc/virtoledb/data.h
+++ b/binsrc/virtoledb/data.h
@@ -1,11 +1,11 @@
/* data.h
*
- * $Id: data.h,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/datalink.cpp b/binsrc/virtoledb/datalink.cpp
index 91a5170..7a75fc0 100644
--- a/binsrc/virtoledb/datalink.cpp
+++ b/binsrc/virtoledb/datalink.cpp
@@ -1,13 +1,13 @@
/* datalink.cpp
*
- * $Id: datalink.cpp,v 1.2 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* Data Link property pages.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/datalink.h b/binsrc/virtoledb/datalink.h
index db83bd3..f0e8f3a 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Data Link property pages.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/dataobj.cpp b/binsrc/virtoledb/dataobj.cpp
index 2bbc693..e19efc2 100644
--- a/binsrc/virtoledb/dataobj.cpp
+++ b/binsrc/virtoledb/dataobj.cpp
@@ -1,13 +1,13 @@
/* dataobj.cpp
*
- * $Id: dataobj.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* Base class for Command and Rowset objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/dataobj.h b/binsrc/virtoledb/dataobj.h
index 553ecd8..59c0dda 100644
--- a/binsrc/virtoledb/dataobj.h
+++ b/binsrc/virtoledb/dataobj.h
@@ -1,13 +1,13 @@
/* dataobj.h
*
- * $Id: dataobj.h,v 1.2 2007/09/05 11:33:57 source Exp $
+ * $Id$
*
* Base class for Command and Rowset objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/datasource.cpp b/binsrc/virtoledb/datasource.cpp
index 4cff66b..c6e8012 100644
--- a/binsrc/virtoledb/datasource.cpp
+++ b/binsrc/virtoledb/datasource.cpp
@@ -1,11 +1,11 @@
/* datasource.cpp
*
- * $Id: datasource.cpp,v 1.2 2007/09/05 11:33:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/datasource.h b/binsrc/virtoledb/datasource.h
index 6d25f7c..9a40538 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/db.cpp b/binsrc/virtoledb/db.cpp
index d95f4cf..19873dc 100644
--- a/binsrc/virtoledb/db.cpp
+++ b/binsrc/virtoledb/db.cpp
@@ -1,11 +1,11 @@
/* db.cpp
*
- * $Id: db.cpp,v 1.2 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/db.h b/binsrc/virtoledb/db.h
index c073559..6aa7fa5 100644
--- a/binsrc/virtoledb/db.h
+++ b/binsrc/virtoledb/db.h
@@ -1,11 +1,11 @@
/* db.h
*
- * $Id: db.h,v 1.2 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/dllmodule.cpp b/binsrc/virtoledb/dllmodule.cpp
index 9b72603..4451173 100644
--- a/binsrc/virtoledb/dllmodule.cpp
+++ b/binsrc/virtoledb/dllmodule.cpp
@@ -1,11 +1,11 @@
/* dllmodule.cpp
*
- * $Id: dllmodule.cpp,v 1.2 2007/09/05 11:33:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/dllmodule.h b/binsrc/virtoledb/dllmodule.h
index becf381..9d7991a 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/error.cpp b/binsrc/virtoledb/error.cpp
index dd53642..341b916 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/error.h b/binsrc/virtoledb/error.h
index 17cb8d4..60d0293 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/filedsn.cpp b/binsrc/virtoledb/filedsn.cpp
index 730fd54..f828774 100644
--- a/binsrc/virtoledb/filedsn.cpp
+++ b/binsrc/virtoledb/filedsn.cpp
@@ -1,11 +1,11 @@
/* filedsn.h
*
- * $Id: filedsn.cpp,v 1.2 2007/09/05 11:33:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/filedsn.h b/binsrc/virtoledb/filedsn.h
index c85461c..fd80bce 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/globals.cpp b/binsrc/virtoledb/globals.cpp
index ef9fdfd..e757ff0 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/headers.cpp b/binsrc/virtoledb/headers.cpp
index 3555808..996f8ba 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/headers.h b/binsrc/virtoledb/headers.h
index 53806e3..5081919 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/lobdata.cpp b/binsrc/virtoledb/lobdata.cpp
index 8882030..a4197fa 100644
--- a/binsrc/virtoledb/lobdata.cpp
+++ b/binsrc/virtoledb/lobdata.cpp
@@ -1,11 +1,11 @@
/* lobdata.h
*
- * $Id: lobdata.cpp,v 1.2 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/lobdata.h b/binsrc/virtoledb/lobdata.h
index 4f40c33..25939b4 100644
--- a/binsrc/virtoledb/lobdata.h
+++ b/binsrc/virtoledb/lobdata.h
@@ -1,11 +1,11 @@
/* lobdata.h
*
- * $Id: lobdata.h,v 1.2 2007/09/05 11:33:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/mresults.cpp b/binsrc/virtoledb/mresults.cpp
index 4e5951d..2291ce1 100644
--- a/binsrc/virtoledb/mresults.cpp
+++ b/binsrc/virtoledb/mresults.cpp
@@ -1,11 +1,11 @@
/* mresults.cpp
*
- * $Id: mresults.cpp,v 1.2 2007/09/05 11:33:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/mresults.h b/binsrc/virtoledb/mresults.h
index 4ecef72..369eaa4 100644
--- a/binsrc/virtoledb/mresults.h
+++ b/binsrc/virtoledb/mresults.h
@@ -1,11 +1,11 @@
/* mresults.h
*
- * $Id: mresults.h,v 1.2 2007/09/05 11:33:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/os.h b/binsrc/virtoledb/os.h
index dbfcada..4e62cca 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Portability macros
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/paramdata.cpp b/binsrc/virtoledb/paramdata.cpp
index 4910f4c..a46d878 100644
--- a/binsrc/virtoledb/paramdata.cpp
+++ b/binsrc/virtoledb/paramdata.cpp
@@ -1,11 +1,11 @@
/* paramdata.cpp
*
- * $Id: paramdata.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/paramdata.h b/binsrc/virtoledb/paramdata.h
index 308f12e..b35120e 100644
--- a/binsrc/virtoledb/paramdata.h
+++ b/binsrc/virtoledb/paramdata.h
@@ -1,11 +1,11 @@
/* paramdata.h
*
- * $Id: paramdata.h,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/properties.cpp b/binsrc/virtoledb/properties.cpp
index 16644bd..d518ec7 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/properties.h b/binsrc/virtoledb/properties.h
index 04b436f..8d7fbde 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/refcounted.cpp b/binsrc/virtoledb/refcounted.cpp
index 5faae16..94285e5 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Reference counted objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/refcounted.h b/binsrc/virtoledb/refcounted.h
index f3a507a..fad00f6 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Reference counted objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/resource.h b/binsrc/virtoledb/resource.h
index 4ec7074..e17f578 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/rowset.cpp b/binsrc/virtoledb/rowset.cpp
index 2e1ee36..684d583 100644
--- a/binsrc/virtoledb/rowset.cpp
+++ b/binsrc/virtoledb/rowset.cpp
@@ -1,11 +1,11 @@
/* rowset.cpp
*
- * $Id: rowset.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/rowset.h b/binsrc/virtoledb/rowset.h
index ae3a44e..7a27b2d 100644
--- a/binsrc/virtoledb/rowset.h
+++ b/binsrc/virtoledb/rowset.h
@@ -1,11 +1,11 @@
/* rowset.h
*
- * $Id: rowset.h,v 1.2 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/rowsetdata.cpp b/binsrc/virtoledb/rowsetdata.cpp
index 067bf91..9fb4090 100644
--- a/binsrc/virtoledb/rowsetdata.cpp
+++ b/binsrc/virtoledb/rowsetdata.cpp
@@ -1,11 +1,11 @@
/* rowsetdata.cpp
*
- * $Id: rowsetdata.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/rowsetdata.h b/binsrc/virtoledb/rowsetdata.h
index 791ea8a..15c3510 100644
--- a/binsrc/virtoledb/rowsetdata.h
+++ b/binsrc/virtoledb/rowsetdata.h
@@ -1,11 +1,11 @@
/* rowsetdata.h
*
- * $Id: rowsetdata.h,v 1.3 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/rowsetprops.cpp b/binsrc/virtoledb/rowsetprops.cpp
index f0d0cc9..e8a6bb2 100644
--- a/binsrc/virtoledb/rowsetprops.cpp
+++ b/binsrc/virtoledb/rowsetprops.cpp
@@ -1,11 +1,11 @@
/* rowsetprops.h
*
- * $Id: rowsetprops.cpp,v 1.2 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/rowsetprops.h b/binsrc/virtoledb/rowsetprops.h
index 97c71ef..d7a410c 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/session.cpp b/binsrc/virtoledb/session.cpp
index 12919c6..f4fbeb2 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/session.h b/binsrc/virtoledb/session.h
index 3edb30f..bb2f3d5 100644
--- a/binsrc/virtoledb/session.h
+++ b/binsrc/virtoledb/session.h
@@ -1,11 +1,11 @@
/* session.h
*
- * $Id: session.h,v 1.2 2007/10/23 13:14:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/syncobj.cpp b/binsrc/virtoledb/syncobj.cpp
index 030ee92..d903090 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Synchronization objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/syncobj.h b/binsrc/virtoledb/syncobj.h
index 4f522cf..36c6965 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* Synchronization objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/util.cpp b/binsrc/virtoledb/util.cpp
index 9635a51..af298be 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/util.h b/binsrc/virtoledb/util.h
index 54f8048..a71658c 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtoledb/virtoledb.h b/binsrc/virtoledb/virtoledb.h
index e54f912..6f83528 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 2006/04/11 17:56:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso/Makefile.am b/binsrc/virtuoso/Makefile.am
index 996c368..39e2d5c 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-2006 OpenLink Software
+# 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
@@ -158,4 +158,13 @@ CLEANFILES = virtuoso
# Additional files to distribute
#
# ----------------------------------------------------------------------
-EXTRA_DIST = libviwin32.def virtuoso_key.pem virtuoso_cert.pem viwin32.bmp viwin32.ico viwin32.c virtuoso.ini
+EXTRA_DIST = \
+ libviwin32.def \
+ resource.h \
+ virtuoso.ini \
+ virtuoso_cert.pem \
+ virtuoso_key.pem \
+ virtuoso_t.rc \
+ viwin32.bmp \
+ viwin32.c \
+ viwin32.ico
diff --git a/binsrc/virtuoso/Makefile.in b/binsrc/virtuoso/Makefile.in
index e0666b8..b7ffa38 100644
--- a/binsrc/virtuoso/Makefile.in
+++ b/binsrc/virtuoso/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -40,9 +39,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -73,29 +71,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 = $(top_builddir)/libsrc/Dk/libdksrv.la \
$(top_builddir)/libsrc/Thread/libthrp_gc.la \
@@ -158,6 +141,7 @@ libvirtuoso_t_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libvirtuoso_t_la_CFLAGS) \
$(CFLAGS) $(libvirtuoso_t_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_IODBC_TRUE at am__EXEEXT_1 = virtuoso-iodbc-t$(EXEEXT)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_virtuoso_iodbc_t_OBJECTS = virtuoso_iodbc_t-viconfig.$(OBJEXT) \
virtuoso_iodbc_t-viunix.$(OBJEXT)
@@ -177,10 +161,9 @@ virtuoso_t_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(virtuoso_t_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SCRIPTS = $(noinst_SCRIPTS)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -288,7 +271,6 @@ 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@
@@ -372,7 +354,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -393,7 +374,6 @@ 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@
@@ -507,7 +487,17 @@ CLEANFILES = virtuoso
# Additional files to distribute
#
# ----------------------------------------------------------------------
-EXTRA_DIST = libviwin32.def virtuoso_key.pem virtuoso_cert.pem viwin32.bmp viwin32.ico viwin32.c virtuoso.ini
+EXTRA_DIST = \
+ libviwin32.def \
+ resource.h \
+ virtuoso.ini \
+ virtuoso_cert.pem \
+ virtuoso_key.pem \
+ virtuoso_t.rc \
+ viwin32.bmp \
+ viwin32.c \
+ viwin32.ico
+
all: all-am
.SUFFIXES:
@@ -516,14 +506,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/virtuoso/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/virtuoso/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/virtuoso/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/virtuoso/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -541,28 +531,23 @@ $(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):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- list2="$$list2 $$p"; \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
+ done
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -584,46 +569,31 @@ libvirtuoso-t.la: $(libvirtuoso_t_la_OBJECTS) $(libvirtuoso_t_la_DEPENDENCIES)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
virtuoso-iodbc-t$(EXEEXT): $(virtuoso_iodbc_t_OBJECTS) $(virtuoso_iodbc_t_DEPENDENCIES)
@rm -f virtuoso-iodbc-t$(EXEEXT)
$(virtuoso_iodbc_t_LINK) $(virtuoso_iodbc_t_OBJECTS) $(virtuoso_iodbc_t_LDADD) $(LIBS)
@@ -652,133 +622,133 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libvirtuoso_gc_t_la-viconfig.lo: viconfig.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_gc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_gc_t_la-viconfig.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_gc_t_la-viconfig.Tpo -c -o libvirtuoso_gc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtuoso_gc_t_la-viconfig.Tpo $(DEPDIR)/libvirtuoso_gc_t_la-viconfig.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_gc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_gc_t_la-viconfig.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_gc_t_la-viconfig.Tpo -c -o libvirtuoso_gc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtuoso_gc_t_la-viconfig.Tpo $(DEPDIR)/libvirtuoso_gc_t_la-viconfig.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viconfig.c' object='libvirtuoso_gc_t_la-viconfig.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtuoso_gc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_gc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_gc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_gc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
libvirtuoso_gc_t_la-viunix.lo: viunix.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_gc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_gc_t_la-viunix.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_gc_t_la-viunix.Tpo -c -o libvirtuoso_gc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtuoso_gc_t_la-viunix.Tpo $(DEPDIR)/libvirtuoso_gc_t_la-viunix.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_gc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_gc_t_la-viunix.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_gc_t_la-viunix.Tpo -c -o libvirtuoso_gc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtuoso_gc_t_la-viunix.Tpo $(DEPDIR)/libvirtuoso_gc_t_la-viunix.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viunix.c' object='libvirtuoso_gc_t_la-viunix.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtuoso_gc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_gc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_gc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_gc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
libvirtuoso_iodbc_gc_t_la-viconfig.lo: viconfig.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_gc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_iodbc_gc_t_la-viconfig.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viconfig.Tpo -c -o libvirtuoso_iodbc_gc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viconfig.Tpo $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viconfig.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_gc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_iodbc_gc_t_la-viconfig.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viconfig.Tpo -c -o libvirtuoso_iodbc_gc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viconfig.Tpo $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viconfig.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viconfig.c' object='libvirtuoso_iodbc_gc_t_la-viconfig.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtuoso_iodbc_gc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_iodbc_gc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_gc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_iodbc_gc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
libvirtuoso_iodbc_gc_t_la-viunix.lo: viunix.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_gc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_iodbc_gc_t_la-viunix.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viunix.Tpo -c -o libvirtuoso_iodbc_gc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viunix.Tpo $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viunix.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_gc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_iodbc_gc_t_la-viunix.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viunix.Tpo -c -o libvirtuoso_iodbc_gc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viunix.Tpo $(DEPDIR)/libvirtuoso_iodbc_gc_t_la-viunix.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viunix.c' object='libvirtuoso_iodbc_gc_t_la-viunix.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtuoso_iodbc_gc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_iodbc_gc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_gc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_iodbc_gc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
libvirtuoso_iodbc_t_la-viconfig.lo: viconfig.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_iodbc_t_la-viconfig.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_iodbc_t_la-viconfig.Tpo -c -o libvirtuoso_iodbc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtuoso_iodbc_t_la-viconfig.Tpo $(DEPDIR)/libvirtuoso_iodbc_t_la-viconfig.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_iodbc_t_la-viconfig.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_iodbc_t_la-viconfig.Tpo -c -o libvirtuoso_iodbc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtuoso_iodbc_t_la-viconfig.Tpo $(DEPDIR)/libvirtuoso_iodbc_t_la-viconfig.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viconfig.c' object='libvirtuoso_iodbc_t_la-viconfig.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtuoso_iodbc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_iodbc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_iodbc_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
libvirtuoso_iodbc_t_la-viunix.lo: viunix.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_iodbc_t_la-viunix.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_iodbc_t_la-viunix.Tpo -c -o libvirtuoso_iodbc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtuoso_iodbc_t_la-viunix.Tpo $(DEPDIR)/libvirtuoso_iodbc_t_la-viunix.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_iodbc_t_la-viunix.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_iodbc_t_la-viunix.Tpo -c -o libvirtuoso_iodbc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtuoso_iodbc_t_la-viunix.Tpo $(DEPDIR)/libvirtuoso_iodbc_t_la-viunix.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viunix.c' object='libvirtuoso_iodbc_t_la-viunix.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtuoso_iodbc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_iodbc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_iodbc_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_iodbc_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
libvirtuoso_t_la-viconfig.lo: viconfig.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_t_la-viconfig.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_t_la-viconfig.Tpo -c -o libvirtuoso_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtuoso_t_la-viconfig.Tpo $(DEPDIR)/libvirtuoso_t_la-viconfig.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_t_la-viconfig.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_t_la-viconfig.Tpo -c -o libvirtuoso_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtuoso_t_la-viconfig.Tpo $(DEPDIR)/libvirtuoso_t_la-viconfig.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viconfig.c' object='libvirtuoso_t_la-viconfig.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtuoso_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_t_la-viconfig.lo `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
libvirtuoso_t_la-viunix.lo: viunix.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_t_la-viunix.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_t_la-viunix.Tpo -c -o libvirtuoso_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libvirtuoso_t_la-viunix.Tpo $(DEPDIR)/libvirtuoso_t_la-viunix.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_t_la_CFLAGS) $(CFLAGS) -MT libvirtuoso_t_la-viunix.lo -MD -MP -MF $(DEPDIR)/libvirtuoso_t_la-viunix.Tpo -c -o libvirtuoso_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirtuoso_t_la-viunix.Tpo $(DEPDIR)/libvirtuoso_t_la-viunix.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viunix.c' object='libvirtuoso_t_la-viunix.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libvirtuoso_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirtuoso_t_la_CFLAGS) $(CFLAGS) -c -o libvirtuoso_t_la-viunix.lo `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
virtuoso_iodbc_t-viconfig.o: viconfig.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_t-viconfig.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_t-viconfig.Tpo -c -o virtuoso_iodbc_t-viconfig.o `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_t-viconfig.Tpo $(DEPDIR)/virtuoso_iodbc_t-viconfig.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_t-viconfig.Tpo $(DEPDIR)/virtuoso_iodbc_t-viconfig.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viconfig.c' object='virtuoso_iodbc_t-viconfig.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_t-viconfig.o `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
virtuoso_iodbc_t-viconfig.obj: viconfig.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_t-viconfig.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_t-viconfig.Tpo -c -o virtuoso_iodbc_t-viconfig.obj `if test -f 'viconfig.c'; then $(CYGPATH_W) 'viconfig.c'; else $(CYGPATH_W) '$(srcdir)/viconfig.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_t-viconfig.Tpo $(DEPDIR)/virtuoso_iodbc_t-viconfig.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_t-viconfig.Tpo $(DEPDIR)/virtuoso_iodbc_t-viconfig.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viconfig.c' object='virtuoso_iodbc_t-viconfig.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_t-viconfig.obj `if test -f 'viconfig.c'; then $(CYGPATH_W) 'viconfig.c'; else $(CYGPATH_W) '$(srcdir)/viconfig.c'; fi`
virtuoso_iodbc_t-viunix.o: viunix.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_t-viunix.o -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_t-viunix.Tpo -c -o virtuoso_iodbc_t-viunix.o `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_t-viunix.Tpo $(DEPDIR)/virtuoso_iodbc_t-viunix.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_t-viunix.Tpo $(DEPDIR)/virtuoso_iodbc_t-viunix.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viunix.c' object='virtuoso_iodbc_t-viunix.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_t-viunix.o `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
virtuoso_iodbc_t-viunix.obj: viunix.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_t_CFLAGS) $(CFLAGS) -MT virtuoso_iodbc_t-viunix.obj -MD -MP -MF $(DEPDIR)/virtuoso_iodbc_t-viunix.Tpo -c -o virtuoso_iodbc_t-viunix.obj `if test -f 'viunix.c'; then $(CYGPATH_W) 'viunix.c'; else $(CYGPATH_W) '$(srcdir)/viunix.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_iodbc_t-viunix.Tpo $(DEPDIR)/virtuoso_iodbc_t-viunix.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_iodbc_t-viunix.Tpo $(DEPDIR)/virtuoso_iodbc_t-viunix.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viunix.c' object='virtuoso_iodbc_t-viunix.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_iodbc_t_CFLAGS) $(CFLAGS) -c -o virtuoso_iodbc_t-viunix.obj `if test -f 'viunix.c'; then $(CYGPATH_W) 'viunix.c'; else $(CYGPATH_W) '$(srcdir)/viunix.c'; fi`
virtuoso_t-viconfig.o: viconfig.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_t_CFLAGS) $(CFLAGS) -MT virtuoso_t-viconfig.o -MD -MP -MF $(DEPDIR)/virtuoso_t-viconfig.Tpo -c -o virtuoso_t-viconfig.o `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_t-viconfig.Tpo $(DEPDIR)/virtuoso_t-viconfig.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_t-viconfig.Tpo $(DEPDIR)/virtuoso_t-viconfig.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viconfig.c' object='virtuoso_t-viconfig.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_t_CFLAGS) $(CFLAGS) -c -o virtuoso_t-viconfig.o `test -f 'viconfig.c' || echo '$(srcdir)/'`viconfig.c
virtuoso_t-viconfig.obj: viconfig.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_t_CFLAGS) $(CFLAGS) -MT virtuoso_t-viconfig.obj -MD -MP -MF $(DEPDIR)/virtuoso_t-viconfig.Tpo -c -o virtuoso_t-viconfig.obj `if test -f 'viconfig.c'; then $(CYGPATH_W) 'viconfig.c'; else $(CYGPATH_W) '$(srcdir)/viconfig.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_t-viconfig.Tpo $(DEPDIR)/virtuoso_t-viconfig.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_t-viconfig.Tpo $(DEPDIR)/virtuoso_t-viconfig.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viconfig.c' object='virtuoso_t-viconfig.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_t_CFLAGS) $(CFLAGS) -c -o virtuoso_t-viconfig.obj `if test -f 'viconfig.c'; then $(CYGPATH_W) 'viconfig.c'; else $(CYGPATH_W) '$(srcdir)/viconfig.c'; fi`
virtuoso_t-viunix.o: viunix.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_t_CFLAGS) $(CFLAGS) -MT virtuoso_t-viunix.o -MD -MP -MF $(DEPDIR)/virtuoso_t-viunix.Tpo -c -o virtuoso_t-viunix.o `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_t-viunix.Tpo $(DEPDIR)/virtuoso_t-viunix.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_t-viunix.Tpo $(DEPDIR)/virtuoso_t-viunix.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viunix.c' object='virtuoso_t-viunix.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_t_CFLAGS) $(CFLAGS) -c -o virtuoso_t-viunix.o `test -f 'viunix.c' || echo '$(srcdir)/'`viunix.c
virtuoso_t-viunix.obj: viunix.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_t_CFLAGS) $(CFLAGS) -MT virtuoso_t-viunix.obj -MD -MP -MF $(DEPDIR)/virtuoso_t-viunix.Tpo -c -o virtuoso_t-viunix.obj `if test -f 'viunix.c'; then $(CYGPATH_W) 'viunix.c'; else $(CYGPATH_W) '$(srcdir)/viunix.c'; fi`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/virtuoso_t-viunix.Tpo $(DEPDIR)/virtuoso_t-viunix.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/virtuoso_t-viunix.Tpo $(DEPDIR)/virtuoso_t-viunix.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='viunix.c' object='virtuoso_t-viunix.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virtuoso_t_CFLAGS) $(CFLAGS) -c -o virtuoso_t-viunix.obj `if test -f 'viunix.c'; then $(CYGPATH_W) 'viunix.c'; else $(CYGPATH_W) '$(srcdir)/viunix.c'; fi`
@@ -794,49 +764,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -857,17 +823,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -901,7 +863,6 @@ clean-generic:
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"
@@ -923,8 +884,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -933,28 +892,18 @@ install-data-am:
install-dvi: install-dvi-am
-install-dvi-am:
-
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
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
@@ -998,7 +947,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
virtuoso: $(VIRTUOSO_BIN)
rm -f virtuoso
ln -s $(VIRTUOSO_BIN) virtuoso
-
# 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/virtuoso/libviwin32.def b/binsrc/virtuoso/libviwin32.def
index 8aaa90e..1ba9e2e 100644
--- a/binsrc/virtuoso/libviwin32.def
+++ b/binsrc/virtuoso/libviwin32.def
@@ -1,14 +1,14 @@
;
; libviwin32.def
;
-; $Id: libviwin32.def,v 1.4.2.1 2010/01/25 22:44:12 source Exp $
+; $Id$
;
; 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-2010 OpenLink Software
+; 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
@@ -195,7 +195,6 @@ EXPORTS
sch_name_to_type @673
PrpcThreadAttach @674
PrpcThreadDetach @675
- decode_base64 @676
case_mode @677
virtuoso_odbc_port @678
uudecode_base64 @679
@@ -210,3 +209,4 @@ EXPORTS
isp_schema_1 @688
strses_enable_paging @689
http_ses_size @690
+ log_proc_overwrite @691
diff --git a/binsrc/virtuoso/resource.h b/binsrc/virtuoso/resource.h
new file mode 100755
index 0000000..ae1f83c
--- /dev/null
+++ b/binsrc/virtuoso/resource.h
@@ -0,0 +1,17 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by virtuoso_t.rc
+//
+#define IDI_ICON1 104
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC 1
+#define _APS_NEXT_RESOURCE_VALUE 105
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
diff --git a/binsrc/virtuoso/viconfig.c b/binsrc/virtuoso/viconfig.c
index 161e7b2..c76214c 100644
--- a/binsrc/virtuoso/viconfig.c
+++ b/binsrc/virtuoso/viconfig.c
@@ -1,12 +1,12 @@
/*
* viconfig.c
*
- * $Id: viconfig.c,v 1.38.2.28 2011/10/28 21:49:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -30,6 +30,8 @@
#include "sqlnode.h"
#include "sqlver.h"
+
+#include "util/sslengine.h"
#include "plugin.h"
#include "langfunc.h"
#include "msdtc.h"
@@ -117,6 +119,7 @@ extern int32 log_proc_overwrite;
extern char *https_port;
extern char *https_cert;
extern char *https_key;
+extern char *https_extra;
extern int32 https_client_verify;
extern int32 https_client_verify_depth;
extern char * https_client_verify_file;
@@ -125,6 +128,7 @@ extern char * https_client_verify_crl_file;
extern char *c_ssl_server_port;
extern char *c_ssl_server_cert;
extern char *c_ssl_server_key;
+extern char *c_ssl_server_extra_certs;
extern int32 ssl_server_verify;
extern int32 ssl_server_verify_depth;
extern char *ssl_server_verify_file;
@@ -154,6 +158,7 @@ extern char * http_client_id_string;
extern char * http_soap_client_id_string;
extern long http_ses_trap;
extern int http_check_rdf_accept;
+extern int32 http_limited;
extern int vd_use_mts;
@@ -175,9 +180,11 @@ 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;
+extern int32 c_compress_mode;
char * http_log_file_check (struct tm *now); /* http log name checking */
@@ -745,11 +752,15 @@ cfg_setup (void)
c_ssl_server_port = NULL;
if (cfg_getstring (pconfig, section, "SSLCertificate", &c_ssl_server_cert) == -1)
+ if (cfg_getstring (pconfig, section, "SSLPublicKey", &c_ssl_server_cert) == -1)
c_ssl_server_cert = NULL;
if (cfg_getstring (pconfig, section, "SSLPrivateKey", &c_ssl_server_key) == -1)
c_ssl_server_key = NULL;
+ if (cfg_getstring (pconfig, section, "SSLExtraChainCertificate", &c_ssl_server_extra_certs) == -1)
+ c_ssl_server_extra_certs = NULL;
+
if (cfg_getlong (pconfig, section, "X509ClientVerify", &ssl_server_verify) == -1)
ssl_server_verify = 0;
@@ -1009,6 +1020,8 @@ cfg_setup (void)
if (cfg_getlong (pconfig, section, "LogProcOverwrite", &log_proc_overwrite) == -1)
log_proc_overwrite = 1;
+ if (cfg_getlong (pconfig, section, "PageCompress", &c_compress_mode) == -1)
+ c_compress_mode = 0;
{
@@ -1264,8 +1277,12 @@ cfg_setup (void)
c_https_port = NULL;
if (cfg_getstring (pconfig, section, "SSLCertificate", &c_https_cert) == -1)
+ if (cfg_getstring (pconfig, section, "SSLPublicKey", &c_https_cert) == -1)
c_https_cert = NULL;
+ if (cfg_getstring (pconfig, section, "SSLExtraChainCertificate", &https_extra) == -1)
+ https_extra = NULL;
+
if (cfg_getstring (pconfig, section, "SSLPrivateKey", &c_https_key) == -1)
c_https_key = NULL;
@@ -1285,6 +1302,9 @@ cfg_setup (void)
if (c_http_threads < 1 && c_http_port)
c_http_threads = 1;
+ if (cfg_getlong (pconfig, section, "MaxRestrictedThreads", &http_limited) == -1)
+ http_limited = c_http_threads;
+
if (cfg_getlong (pconfig, section,
"MaxKeepAlives",
&c_http_max_keep_alives) == -1)
@@ -1359,7 +1379,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 = 0;
+ dbs_check_extent_free_pages = 1;
#if 0/*obsoleted*/
@@ -1447,9 +1467,31 @@ 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)
{
@@ -1870,6 +1912,58 @@ new_db_read_cfg (dbe_storage_t * ignore, char *mode)
i18n_volume_emergency_encoding = &eh__ISO8859_1;
}
+/*
+ * Parses string like "42K" which mean size of DB element (file, stripe etc).
+ * On return sets `size', if stated, `modifier', if stated, and `n_pages', if stated.
+ * returns 0 on success, nonzero on error.
+ */
+int
+cfg_parse_size_with_modifier (const char *valstr, unsigned long *size, char *modifier, unsigned long *n_pages)
+{
+ unsigned long size_ = 0;
+ char modifier_ = 0;
+ unsigned long n_pages_ = 0;
+
+ if (!valstr)
+ GPF_T;
+
+ size_ = (unsigned long) atol (valstr);
+ if (size_ == 0)
+ {
+ return -1;
+ }
+
+ modifier_ = toupper (valstr[strlen (valstr) - 1]);
+ switch (modifier_)
+ {
+ case 'K':
+ n_pages_ = size_ / KILOS_PER_PAGE;
+ size_ *= 1024;
+ break;
+ case 'M':
+ n_pages_ = (1024 * size_) / KILOS_PER_PAGE;
+ size_ *= 1024 * 1024;
+ break;
+ case 'G':
+ n_pages_ = (1024 * 1024 * size_) / KILOS_PER_PAGE;
+ size_ *= 1024 * 1024 * 1024;
+ break;
+ case 'B':
+ n_pages_ = size_;
+ break;
+ default:
+ if (!isdigit (modifier_))
+ return -1;
+ }
+
+ if (size)
+ *size = size_;
+ if (modifier)
+ *modifier = modifier_;
+ if (n_pages)
+ *n_pages = n_pages_;
+ return 0;
+}
void
new_dbs_read_cfg (dbe_storage_t * dbs, char *ignore_file_name)
@@ -1919,9 +2013,8 @@ new_dbs_read_cfg (dbe_storage_t * dbs, char *ignore_file_name)
int nlog_segments;
char keyname[32];
char s_name[100];
- long llen;
+ unsigned long llen;
log_segment_t **last_log = &c_log_segments;
- int modifier;
for (nlog_segments = 1;; nlog_segments++)
{
@@ -1929,43 +2022,25 @@ new_dbs_read_cfg (dbe_storage_t * dbs, char *ignore_file_name)
if (cfg_find (pconfig, section, keyname) != 0)
break;
- if (2 == sscanf (pconfig->value, "%s %ld", s_name, &llen))
+ if (sscanf (pconfig->value, "%s %s", s_name, keyname) != 2)
{
- NEW_VARZ (log_segment_t, ls);
-
- modifier = toupper (pconfig->value[strlen (pconfig->value) - 1]);
- switch (modifier)
- {
- case 'K':
- llen *= 1024L;
- break;
- case 'M':
- llen *= 1024L * 1024L;
- break;
- case 'G':
- llen *= 1024L * 1024L * 1024L;
- break;
- default:
- if (!isdigit (modifier))
- goto invalid_log_entries;
- break;
- case 'B':
- llen = llen;
- break;
- }
-
- ls->ls_file = box_string (s_name);
- ls->ls_bytes = llen;
- *last_log = ls;
- last_log = &ls->ls_next;
-
+ log_error ("The values for log segment %d are invalid", nlog_segments);
+ exit (-1);
}
- else
+
+ if (cfg_parse_size_with_modifier (keyname, &llen, NULL, NULL))
{
- invalid_log_entries:;
log_error ("The values for log segment %d are invalid", nlog_segments);
exit (-1);
}
+
+ {
+ NEW_VARZ (log_segment_t, ls);
+ ls->ls_file = box_string (s_name);
+ ls->ls_bytes = llen;
+ *last_log = ls;
+ last_log = &ls->ls_next;
+ }
}
if (nlog_segments == 1)
@@ -2000,9 +2075,9 @@ new_dbs_read_cfg (dbe_storage_t * dbs, char *ignore_file_name)
char *segszstr;
unsigned long segszvalue;
char keyname[32];
- long n_pages;
+ unsigned long n_pages;
int n_stripes;
- int modifier;
+ char modifier;
for (nsegs = 1;; nsegs++)
{
@@ -2012,56 +2087,37 @@ new_dbs_read_cfg (dbe_storage_t * dbs, char *ignore_file_name)
n_stripes = cslnumentries (pconfig->value) - 1;
segszstr = cslentry (pconfig->value, 1);
- segszvalue = atol (segszstr);
- if (segszvalue == 0)
+
+ if (cfg_parse_size_with_modifier (segszstr, &segszvalue, &modifier, &n_pages))
{
- invalid_size:;
log_error ("The size for strip segment %d is invalid", nsegs);
+ free (segszstr);
return;
}
- modifier = toupper (segszstr[strlen (segszstr) - 1]);
- /* THIS ASSUMES PAGE_SZ == 4k */
-# define KILOS_PER_PAGE (PAGE_SZ/1024)
- switch (modifier)
+ if (modifier == 'K' && segszvalue % KILOS_PER_PAGE)
{
- case 'K':
- if (segszvalue % KILOS_PER_PAGE)
- {
- log_error ("The size for stripe segment %d must be a multiple of %d", nsegs, PAGE_SZ);
- return;
- }
- n_pages = segszvalue / KILOS_PER_PAGE;
- break;
- case 'M':
- n_pages = (1024 * segszvalue) / KILOS_PER_PAGE;
- break;
- case 'G':
- n_pages = (1024 * 1024 * segszvalue) / KILOS_PER_PAGE;
- break;
- default:
- if (!isdigit (modifier))
- goto invalid_size;
- case 'B':
- n_pages = segszvalue;
- break;
+ log_error ("The size for stripe segment %d must be a multiple of %d", nsegs, PAGE_SZ);
+ free (segszstr);
+ return;
}
- if (n_pages < 0 || (n_pages / n_stripes) > (LONG_MAX / PAGE_SZ))
+ if ((n_pages / n_stripes) > (LONG_MAX / PAGE_SZ))
{
#if (!defined (FILE64) && !defined (WIN32))
n_pages = (LONG_MAX / PAGE_SZ) * n_stripes;
log_error ("The size for stripe segment #%d exceeds 2G limit, setting to maximum allowed %d pages", nsegs, n_pages);
#endif
}
- free (segszstr);
if (n_pages % (EXTENT_SZ * n_stripes) != 0)
{
int unit = EXTENT_SZ * n_stripes;
long old_pages = n_pages;
n_pages = ((n_pages / unit) + 1) * unit;
- log_warning ("The size for stripe segment %d is %ld pages, not a multiple of %d, will use %d pages",
+ log_warning ("The size for stripe segment %d is %ld pages, not a multiple of %d, will use %d pages",
nsegs, old_pages, unit, n_pages);
}
+ free (segszstr);
+
seg = (disk_segment_t *) dk_alloc (sizeof (disk_segment_t));
seg->ds_size = n_pages;
seg->ds_n_stripes = n_stripes;
@@ -2213,7 +2269,7 @@ static void
db_lck_write_pid (int fd)
{
char pid_arr[50];
- int len;
+ size_t len;
snprintf (pid_arr, sizeof (pid_arr), "VIRT_PID=%lu\n", (unsigned long) getpid ());
len = strlen (pid_arr);
diff --git a/binsrc/virtuoso/virtuoso.ini b/binsrc/virtuoso/virtuoso.ini
index 0400768..4925f0d 100644
--- a/binsrc/virtuoso/virtuoso.ini
+++ b/binsrc/virtuoso/virtuoso.ini
@@ -1,7 +1,7 @@
;
; virtuoso.ini
;
-; $Id: virtuoso.ini,v 1.1.1.1 2006/04/11 17:56:10 source Exp $
+; $Id$
;
; Configuration file for the OpenLink Virtuoso VDBMS Server
;
diff --git a/binsrc/virtuoso/virtuoso_t.rc b/binsrc/virtuoso/virtuoso_t.rc
new file mode 100755
index 0000000..35655ab
--- /dev/null
+++ b/binsrc/virtuoso/virtuoso_t.rc
@@ -0,0 +1,116 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Bulgarian (Bulgaria) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_BGR)
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Bulgarian (Bulgaria) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 6,1,5,3127
+ PRODUCTVERSION 6,1,5,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.5.3127"
+ VALUE "InternalName", "Virtuoso"
+ VALUE "LegalCopyright", "Copyright (C) 1998-2012 OpenLink Software"
+ VALUE "ProductName", "Virtuoso OpenSource"
+ VALUE "ProductVersion", "6.1.5.3127"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1 ICON "viwin32.ico"
+#endif // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/binsrc/virtuoso/viunix.c b/binsrc/virtuoso/viunix.c
index 63ba967..c59faa0 100644
--- a/binsrc/virtuoso/viunix.c
+++ b/binsrc/virtuoso/viunix.c
@@ -1,14 +1,14 @@
/*
* viunix.c
*
- * $Id: viunix.c,v 1.11.2.4 2011/10/28 21:49:35 source Exp $
+ * $Id$
*
* OpenLink Virtuoso VDBMS Server main
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso/viwin32.c b/binsrc/virtuoso/viwin32.c
index 990f86f..8f75e5c 100644
--- a/binsrc/virtuoso/viwin32.c
+++ b/binsrc/virtuoso/viwin32.c
@@ -1,7 +1,7 @@
/*
* viwin32.c
*
- * $Id: viwin32.c,v 1.11.2.2 2011/10/26 09:34:24 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
@@ -1632,3 +1632,14 @@ 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 77aa4ee..b7ff434 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 07b7211..40d8d3d 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/DBConnection.h b/binsrc/virtuoso_sink/DBConnection.h
index a4ded5e..1bd0dd9 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/DBConnectionPool.cpp b/binsrc/virtuoso_sink/DBConnectionPool.cpp
index aa3555c..13fa82b 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/DBConnectionPool.h b/binsrc/virtuoso_sink/DBConnectionPool.h
index a87426a..d48ad3e 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/MailMsg_i.c b/binsrc/virtuoso_sink/MailMsg_i.c
index 0fcdeeb..428f2bf 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/MailMsg_p.c b/binsrc/virtuoso_sink/MailMsg_p.c
index 99308d0..7c9bb0b 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/Makefile.am b/binsrc/virtuoso_sink/Makefile.am
index 18827ad..932eafc 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/virtuoso_sink/Makefile.in b/binsrc/virtuoso_sink/Makefile.in
index a3d58f8..8d46c91 100644
--- a/binsrc/virtuoso_sink/Makefile.in
+++ b/binsrc/virtuoso_sink/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -321,14 +315,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/virtuoso_sink/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/virtuoso_sink/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/virtuoso_sink/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/virtuoso_sink/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -346,7 +340,6 @@ $(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
@@ -376,17 +369,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -414,7 +403,6 @@ clean-generic:
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"
@@ -433,8 +421,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -443,28 +429,18 @@ install-data-am:
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
@@ -498,7 +474,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/virtuoso_sink/NNTP.cpp b/binsrc/virtuoso_sink/NNTP.cpp
index 2a76b4c..c31cb1d 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/NNTP.h b/binsrc/virtuoso_sink/NNTP.h
index 98761fe..7db2a00 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/SMTP.cpp b/binsrc/virtuoso_sink/SMTP.cpp
index 9c0ffe2..f059331 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/SMTP.h b/binsrc/virtuoso_sink/SMTP.h
index b14aaae..6be70a0 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/Seo_i.c b/binsrc/virtuoso_sink/Seo_i.c
index abe03d1..83a250b 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/Seo_p.c b/binsrc/virtuoso_sink/Seo_p.c
index e3ad410..1d841f1 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/SmtpEvent.h b/binsrc/virtuoso_sink/SmtpEvent.h
index 4e84990..c20e890 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/SmtpEvent_i.c b/binsrc/virtuoso_sink/SmtpEvent_i.c
index 8b2e891..c167d1a 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/SmtpEvent_p.c b/binsrc/virtuoso_sink/SmtpEvent_p.c
index 8743c06..74c055c 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/StdAfx.cpp b/binsrc/virtuoso_sink/StdAfx.cpp
index bedb5b0..14b6945 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/StdAfx.h b/binsrc/virtuoso_sink/StdAfx.h
index cf739c4..c89f702 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink.cpp b/binsrc/virtuoso_sink/VirtuosoSink.cpp
index ec72e1b..e5b4e2d 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink.h b/binsrc/virtuoso_sink/VirtuosoSink.h
index 0f57b0d..dd19cd8 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink.idl b/binsrc/virtuoso_sink/VirtuosoSink.idl
index 0cf7150..c45a446 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-2006 OpenLink Software
+// 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink_i.c b/binsrc/virtuoso_sink/VirtuosoSink_i.c
index 9a08e40..1beb180 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink_p.c b/binsrc/virtuoso_sink/VirtuosoSink_p.c
index 4fd76f2..345d1a0 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/dlldata.c b/binsrc/virtuoso_sink/dlldata.c
index cc3ead6..75ce7a1 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/virtuoso_sink/resource.h b/binsrc/virtuoso_sink/resource.h
index 5524684..64c1b5c 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/Makefile.am b/binsrc/vsp/Makefile.am
index 3e2a088..4632d56 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/vsp/Makefile.in b/binsrc/vsp/Makefile.in
index 6487732..90518df 100644
--- a/binsrc/vsp/Makefile.in
+++ b/binsrc/vsp/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -41,9 +40,8 @@
#dist_httproot_DATA = *.html *.css *.txt
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -73,7 +71,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,7 +161,6 @@ 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@
@@ -248,7 +244,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -269,7 +264,6 @@ 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@
@@ -378,14 +372,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/vsp/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/vsp/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/vsp/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/vsp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -403,7 +397,6 @@ $(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
@@ -433,17 +426,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -471,7 +460,6 @@ clean-generic:
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"
@@ -490,8 +478,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -500,28 +486,18 @@ install-data-am: install-data-local
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
@@ -574,7 +550,6 @@ install-data-local:
uninstall-local:
rm -rf "$(DESTDIR)$(httprootdir)"/*
-
# 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/vsp/admin/Hosted_Modules.vspx b/binsrc/vsp/admin/Hosted_Modules.vspx
index 6ffb186..5b232f0 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/Hosted_Modules_load.vspx b/binsrc/vsp/admin/Hosted_Modules_load.vspx
index d615680..829f64e 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/Hosted_Modules_load_results.vspx b/binsrc/vsp/admin/Hosted_Modules_load_results.vspx
index ce7ce74..b6c752a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/Hosted_Modules_select.vspx b/binsrc/vsp/admin/Hosted_Modules_select.vspx
index 376aeef..05e0c27 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/Hosted_Modules_select2.vspx b/binsrc/vsp/admin/Hosted_Modules_select2.vspx
index e757c13..a494881 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/adm_js_check.vsp b/binsrc/vsp/admin/adm_js_check.vsp
index 57d0da4..aa2600a 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin.sql b/binsrc/vsp/admin/admin.sql
index d7eb69e..f8641e6 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.3 2011/02/03 10:35:33 source Exp $
+-- $Id$
--
-- Virtuoso admin vsp interface
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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-2011 OpenLink Software.</P></TD></TR>');
+ http(' - Copyright© 1998-2012 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 d9bf8a6..5e141f7 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_conn_ds_add.vsp b/binsrc/vsp/admin/admin_conn_ds_add.vsp
index 9cfca5e..f24be05 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp b/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp
index cada748..36a7cf9 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp b/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp
index 116729f..680610b 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp b/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp
index a47c8ea..fb812b4 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp b/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp
index ae812f1..38bb47f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp b/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp
index eafd641..48572bd 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog.vsp b/binsrc/vsp/admin/admin_dav/admin_blog.vsp
index 3d326f1..f17e33d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp
index 3004a95..660d573 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp
index c7ad5a4..4689bad 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp
index f5fd7b8..f18304f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp
index 0422cf8..5db2c66 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp
index d8dbcf7..3a0f21c 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 d0bdb5c..99f832b 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp
index 21c0a14..ae2676f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp
index e69250c..32b6ea7 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4a95fc6..f14493e 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 2ce35b2..c3bebed 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp
index 3004a0a..b70d59f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 2e2ee25..779d4c4 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 c96bd82..d0d2f84 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e7d7290..7cbbc9c 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx b/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx
index 10f2aff..8834092 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
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 ff48eb1..4ef6914 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 ddded2e..5e9137f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp
index 36a33dd..15f38d5 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp
index fdc2aa3..ab43a87 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 2007/01/22 14:02:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b4dde48..3641d0f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp
index 2aa6c2f..4c48a18 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp
index 0a31ac2..ad4aae3 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp
index c1f8bf7..dd0aa6f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 c537fff..d2f68f7 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 2007/01/22 14:02:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp
index 0b8fa5f..d4e7463 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 cbddfbc..a3af84a 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 584281c..34370c3 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp
index 3aafac3..cdcf9ba 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp
index 041d393..8c29b3d 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_footer.vsp b/binsrc/vsp/admin/admin_dav/admin_footer.vsp
index 8eaba54..ed452da 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-2011 OpenLink Software</small></div>
+<hr><div class="copyright"><small>Virtuoso management interface. Copyright © 1998-2012 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 5cbed72..0dd60e1 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 cb4949e..005c564 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 b7a571d..724fe8e 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 f8804db..90bc082 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp b/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp
index 746d70d..dff0331 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp b/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp
index f90f52f..7c9a65a 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp b/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp
index 3f934c9..f3b8ab4 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 0ca549a..4fe7dcd 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp
index a0988a4..c892876 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp
index bd6e431..cb2d9d9 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp
index 1779c24..1f52d6b 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp b/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp
index a7708b5..b10b7e8 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp b/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp
index ac12106..db7fd7b 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp b/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp
index d8166b2..53b8b59 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/bridge.vspx b/binsrc/vsp/admin/admin_dav/bridge.vspx
index b9e2cb9..4c64990 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.css b/binsrc/vsp/admin/admin_dav/dav_browser.css
index d52ece7..5db6204 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 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.js b/binsrc/vsp/admin/admin_dav/dav_browser.js
index fec6c94..20f46fc 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.sql b/binsrc/vsp/admin/admin_dav/dav_browser.sql
index ce7f49b..39f5fe7 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.vsp b/binsrc/vsp/admin/admin_dav/dav_browser.vsp
index c7cd5e7..d40e739 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp
index 1d82fa6..3d17b1d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp
index a4a5c86..e531f31 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp
index f2d9be0..e00666d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp
index fc7c973..b676b9d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js b/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js
index 89d0acb..eae0efd 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_msie.js b/binsrc/vsp/admin/admin_dav/dav_browser_msie.js
index 4e87043..55e4c02 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp
index fe20985..da9a12e 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp b/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp
index 3205926..b4f6664 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_js.vsp b/binsrc/vsp/admin/admin_dav/dav_js.vsp
index 2c3a658..e00666d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp b/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp
index 40e5138..d28072f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/dir_list.vsp b/binsrc/vsp/admin/admin_dav/dir_list.vsp
index 5441437..9c16293 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/error.vsp b/binsrc/vsp/admin/admin_dav/error.vsp
index f65d97a..7da2919 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/error_pages.vspx b/binsrc/vsp/admin/admin_dav/error_pages.vspx
index 2b50bfe..891c4d3 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/admin_dav/ftt_hits.vsp b/binsrc/vsp/admin/admin_dav/ftt_hits.vsp
index 86bee50..604e4da 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/ftt_query.vsp b/binsrc/vsp/admin/admin_dav/ftt_query.vsp
index 497532b..8ace686 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/get_blogs.vspx b/binsrc/vsp/admin/admin_dav/get_blogs.vspx
index d19acc4..4c3b26f 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/admin_dav/portfolio.xml b/binsrc/vsp/admin/admin_dav/portfolio.xml
index fc7c215..7a15a51 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/admin_dav/portfolio.xsl b/binsrc/vsp/admin/admin_dav/portfolio.xsl
index 490aba7..c49ef06 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/admin_dav/search_help.html b/binsrc/vsp/admin/admin_dav/search_help.html
index 71b7d5c..f86cfdd 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/admin_dav/util.js b/binsrc/vsp/admin/admin_dav/util.js
index 79be980..a775cb0 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs.sql b/binsrc/vsp/admin/admin_dav/vfs.sql
index 5d9ab62..b512a93 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.28 2011/08/01 14:17:06 source Exp $
+-- $Id$
--
-- Site-copy robot.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -2129,7 +2129,7 @@ create procedure WS.WS.SITEMAP_RDF_STORE (in _host varchar, in _url varchar, in
}
if (url_ck like '%.rdf' or _c_type = 'application/rdf+xml')
{
- DB.DBA.RDF_LOAD_RDFXML (_content, base, graph, 3);
+ DB.DBA.RDF_LOAD_RDFXML (_content, base, graph, 0, 3);
}
else if (url_ck like '%.n3' or url_ck like '%.ttl' or url_ck like '%.nt' or _c_type = 'text/n3' or _c_type = 'text/rdf+n3')
{
diff --git a/binsrc/vsp/admin/admin_dav/vfs_export.vsp b/binsrc/vsp/admin/admin_dav/vfs_export.vsp
index e26cfe5..5ccb078 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp b/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp
index 61a3681..7be26de 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs_status.vsp b/binsrc/vsp/admin/admin_dav/vfs_status.vsp
index 6553a9a..d44161a 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp b/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp
index 09fc8b5..9fa89b9 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/vfsddk.sql b/binsrc/vsp/admin/admin_dav/vfsddk.sql
index c99d886..82880c0 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.16 2011/08/01 14:17:06 source Exp $
+-- $Id$
--
-- Site-copy robot DB.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dav/vsp_debug.vsp b/binsrc/vsp/admin/admin_dav/vsp_debug.vsp
index c800ef8..2342120 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 2006/11/30 13:49:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_ddl.sql b/binsrc/vsp/admin/admin_ddl.sql
index ea2d6e0..3af1d5a 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dsn.vsp b/binsrc/vsp/admin/admin_dsn.vsp
index fdcf741..14ef505 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dsn_add.vsp b/binsrc/vsp/admin/admin_dsn_add.vsp
index cf5f190..de8cc70 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dsn_add2.vsp b/binsrc/vsp/admin/admin_dsn_add2.vsp
index 94e60b0..ca6bd76 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dsn_add3.vsp b/binsrc/vsp/admin/admin_dsn_add3.vsp
index 587d4a4..098b120 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 2006/11/30 13:49:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dsn_add_generic32.vsp b/binsrc/vsp/admin/admin_dsn_add_generic32.vsp
index 232beaf..1108f92 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.2 2011/02/03 10:35:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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-2011 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-2012 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 ceca4ea..c506fcd 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dsn_add_virt.vsp b/binsrc/vsp/admin/admin_dsn_add_virt.vsp
index 3a4f8b1..dfc88a3 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dsn_edit.vsp b/binsrc/vsp/admin/admin_dsn_edit.vsp
index 8e95c01..eef6e50 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_dsn_edit_virt.vsp b/binsrc/vsp/admin/admin_dsn_edit_virt.vsp
index 06e9bc7..43cf332 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_evt_main.vsp b/binsrc/vsp/admin/admin_evt_main.vsp
index fc47cac..0cb803b 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_footer.vsp b/binsrc/vsp/admin/admin_footer.vsp
index 52a959d..1612bb0 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-2011 OpenLink Software. </P></TD></TR>
+<TR><TD><P CLASS="copyright">Virtuoso Universal Server (<?= sys_stat('st_dbms_ver') ?>) - Copyright© 1998-2012 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 06e78bf..04676ca 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_left.vsp b/binsrc/vsp/admin/admin_left.vsp
index 8877840..dbc613d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_link_proc.vsp b/binsrc/vsp/admin/admin_link_proc.vsp
index decac45..91d65bd 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_link_proc_1.vsp b/binsrc/vsp/admin/admin_link_proc_1.vsp
index 1b9c313..c1be07e 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_link_tables.js b/binsrc/vsp/admin/admin_link_tables.js
index 0b5319c..b750fdd 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_link_tables.vsp b/binsrc/vsp/admin/admin_link_tables.vsp
index 218106a..e571675 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_lt_wiz.vsp b/binsrc/vsp/admin/admin_lt_wiz.vsp
index 97771e9..56185be 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_lt_wiz_start.vsp b/binsrc/vsp/admin/admin_lt_wiz_start.vsp
index ea4da2b..970ba0c 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 2006/11/30 13:49:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_main.vsp b/binsrc/vsp/admin/admin_main.vsp
index 5d1771b..a94800b 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/admin_news.sql b/binsrc/vsp/admin/admin_news/admin_news.sql
index 6a1fbe5..d5d8536 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.1 2011/10/13 18:31:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/mime_display.vsp b/binsrc/vsp/admin/admin_news/mime_display.vsp
index 026a9a8..a55f7a1 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_acl.vsp b/binsrc/vsp/admin/admin_news/news_acl.vsp
index 3c9587e..6e0a7c4 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_available_processing.vsp b/binsrc/vsp/admin/admin_news/news_available_processing.vsp
index 8979a6c..950d1e7 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_available_update.vsp b/binsrc/vsp/admin/admin_news/news_available_update.vsp
index 20476d1..2df9050 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 cb03177..bd296e7 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 2006/11/30 13:49:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_frames.vsp b/binsrc/vsp/admin/admin_news/news_frames.vsp
index 53a6b87..18b3cae 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_group_detail.vsp b/binsrc/vsp/admin/admin_news/news_group_detail.vsp
index ac2e52f..a55cbaf 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_read.vsp b/binsrc/vsp/admin/admin_news/news_read.vsp
index fe1d497..18c5b93 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_read_banner.vsp b/binsrc/vsp/admin/admin_news/news_read_banner.vsp
index 08499fb..2fcf5c0 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 2006/11/30 13:49:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_search.vsp b/binsrc/vsp/admin/admin_news/news_search.vsp
index f4aad8b..57d7118 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_search_result.vsp b/binsrc/vsp/admin/admin_news/news_search_result.vsp
index 85799cd..d86a68f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_server_config.vsp b/binsrc/vsp/admin/admin_news/news_server_config.vsp
index 238f631..9a10d3a 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/news_server_list.vsp b/binsrc/vsp/admin/admin_news/news_server_list.vsp
index cbf0a00..ec86d90 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_news/newsgroups_add.vsp b/binsrc/vsp/admin/admin_news/newsgroups_add.vsp
index 3257e59..cb3ac4e 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_proc_edit.vsp b/binsrc/vsp/admin/admin_proc_edit.vsp
index ed8cf60..4aa9040 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_proc_view.vsp b/binsrc/vsp/admin/admin_proc_view.vsp
index ae2a5ff..952f39c 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_procs.vsp b/binsrc/vsp/admin/admin_procs.vsp
index 2fc3f10..53391f5 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_procs_verify.vsp b/binsrc/vsp/admin/admin_procs_verify.vsp
index 3b18539..6faa276 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp b/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp
index 2cf24ef..8c9fc47 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_repl/link_tables.js b/binsrc/vsp/admin/admin_repl/link_tables.js
index a113bee..ae65a4b 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp b/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp
index a5d6c7c..d17b613 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_bidir.vsp b/binsrc/vsp/admin/admin_repl/snp_bidir.vsp
index 8c11dd5..8b19e19 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp b/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp
index a7a137e..7e19c90 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 4b54b9c..3159d64 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_create.vsp b/binsrc/vsp/admin/admin_repl/snp_create.vsp
index ef269cf..7ba74a6 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_main.vsp b/binsrc/vsp/admin/admin_repl/snp_main.vsp
index a18c847..fc78081 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_sched.vsp b/binsrc/vsp/admin/admin_repl/snp_sched.vsp
index 2ab232c..2a18b8c 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp b/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp
index 7a7ec58..47d199b 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_start.vsp b/binsrc/vsp/admin/admin_start.vsp
index e4d15d9..4359cad 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_stat.vsp b/binsrc/vsp/admin/admin_stat.vsp
index 0f9e68b..1c968c1 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_stat_audit.vsp b/binsrc/vsp/admin/admin_stat_audit.vsp
index 46627fc..8db7189 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_stat_disk.vsp b/binsrc/vsp/admin/admin_stat_disk.vsp
index 842f30a..5c05128 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_stat_idx.vsp b/binsrc/vsp/admin/admin_stat_idx.vsp
index 6c6af6a..e3e9e31 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_stat_lock.vsp b/binsrc/vsp/admin/admin_stat_lock.vsp
index 1e74888..ec31110 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_stat_prof.vsp b/binsrc/vsp/admin/admin_stat_prof.vsp
index 526ccd3..975f533 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_stat_space.vsp b/binsrc/vsp/admin/admin_stat_space.vsp
index 4d86499..02d9357 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_stat_www.vsp b/binsrc/vsp/admin/admin_stat_www.vsp
index 6b941de..5a285ab 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_style.css b/binsrc/vsp/admin/admin_style.css
index 70fa9a6..a0582a0 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 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_tables.vsp b/binsrc/vsp/admin/admin_tables.vsp
index a0ae9bd..7471c0c 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_tables_verify.vsp b/binsrc/vsp/admin/admin_tables_verify.vsp
index e6dfd33..c908ac4 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_topleft.html b/binsrc/vsp/admin/admin_topleft.html
index 91c59d0..857e5d4 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/admin_triggers.vsp b/binsrc/vsp/admin/admin_triggers.vsp
index de3f01d..7a762c6 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_triggers_edit.vsp b/binsrc/vsp/admin/admin_triggers_edit.vsp
index fe2cf00..02d1ad6 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_triggers_verify.vsp b/binsrc/vsp/admin/admin_triggers_verify.vsp
index 77c891a..e666aa0 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp b/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp
index 5e5a492..d555517 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp
index 94ab08b..e4e4473 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp
index 5016006..625ae8b 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 7d11cd0..bac66d7 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 77bb70f..ee37ddd 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 e178cad..78cbe62 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 cc39c1a..b9740ea 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 a71587b..009e887 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 db46078..60bf186 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 5d1b449..4f0a800 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 1340257..ad9d927 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8908190..70ce217 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 cc149b0..a1614e4 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp
index 93913c0..afb6dc4 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 0f6de03..1598616 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 61c5103..1721180 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 7b12438..827e3d7 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
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 8176131..ebca408 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_unlink_proc.vsp b/binsrc/vsp/admin/admin_unlink_proc.vsp
index 2a7ee31..04a499c 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_user_types.vsp b/binsrc/vsp/admin/admin_user_types.vsp
index fd60633..1aeed7b 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_user_types_verify.vsp b/binsrc/vsp/admin/admin_user_types_verify.vsp
index 33253be..491d8fe 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_users.vsp b/binsrc/vsp/admin/admin_users.vsp
index 19f474b..b113b86 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_utils.js b/binsrc/vsp/admin/admin_utils.js
index 6e4d458..c38e5d1 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/admin/admin_views.vsp b/binsrc/vsp/admin/admin_views.vsp
index 95d727a..7da9bdf 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_views_edit.vsp b/binsrc/vsp/admin/admin_views_edit.vsp
index 70afd5f..af3b79a 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_views_verify.vsp b/binsrc/vsp/admin/admin_views_verify.vsp
index fc70c5d..3a04f14 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_virtini.vsp b/binsrc/vsp/admin/admin_virtini.vsp
index 54fe898..3d35acd 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_xml_documents_main.vsp b/binsrc/vsp/admin/admin_xml_documents_main.vsp
index 2cd429a..b558fb2 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_xml_documents_view.vsp b/binsrc/vsp/admin/admin_xml_documents_view.vsp
index bc74f0b..c62d160 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_xml_views_main.vsp b/binsrc/vsp/admin/admin_xml_views_main.vsp
index 7a15ab8..db7d437 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_xquery_main.vsp b/binsrc/vsp/admin/admin_xquery_main.vsp
index 0ec420c..ab3976e 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/admin_xquery_test.vsp b/binsrc/vsp/admin/admin_xquery_test.vsp
index 331b0cc..894c4a9 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/browse_page.vsp b/binsrc/vsp/admin/dbpump/browse_page.vsp
index b00028c..339dca1 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/comp_html.sql b/binsrc/vsp/admin/dbpump/comp_html.sql
index 419fe93..8f0d97e 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.2 2011/02/03 10:35:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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-2011 OpenLink Software.</P></TD></TR>');
+ http (' DBPUMP Interface - Copyright© 1998-2012 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 4c57fd5..676ff3a 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/comp_rpath.sql b/binsrc/vsp/admin/dbpump/comp_rpath.sql
index c335855..e88f350 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 2009/02/11 16:36:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/comp_tables.sql b/binsrc/vsp/admin/dbpump/comp_tables.sql
index 29f7cf8..879e6e0 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/components.sql b/binsrc/vsp/admin/dbpump/components.sql
index cabc1c7..2f22a7c 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dbdoc.vsp b/binsrc/vsp/admin/dbpump/dbdoc.vsp
index 3f81c2c..e93f32b 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dbhelp.vsp b/binsrc/vsp/admin/dbpump/dbhelp.vsp
index 761b2bc..e3bfe16 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dbpump.vsp b/binsrc/vsp/admin/dbpump/dbpump.vsp
index 7c16854..8f63d0f 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dbpump_root.sql b/binsrc/vsp/admin/dbpump/dbpump_root.sql
index cacb9c3..c94f232 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dbpump_scripts.html b/binsrc/vsp/admin/dbpump/dbpump_scripts.html
index 0c010d4..30c9366 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/debug.vsp b/binsrc/vsp/admin/dbpump/debug.vsp
index aa5a2f3..f864dab 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dump_itself.vsp b/binsrc/vsp/admin/dbpump/dump_itself.vsp
index f3b4d19..966d0a5 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dump_options.vsp b/binsrc/vsp/admin/dbpump/dump_options.vsp
index 53b06f1..a48eb25 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dump_page.vsp b/binsrc/vsp/admin/dbpump/dump_page.vsp
index 1caec61..fa7faee 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dump_schema.vsp b/binsrc/vsp/admin/dbpump/dump_schema.vsp
index 60deab1..8c72398 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp b/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp
index b86ece2..2ede4e8 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dump_tables.vsp b/binsrc/vsp/admin/dbpump/dump_tables.vsp
index 12400db..65eef3b 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp b/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp
index 4f57d48..1a16d99 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/filter_options.vsp b/binsrc/vsp/admin/dbpump/filter_options.vsp
index 42878aa..86de212 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/manifest.vsp b/binsrc/vsp/admin/dbpump/manifest.vsp
index 435329b..418fac0 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/manifest.xsl b/binsrc/vsp/admin/dbpump/manifest.xsl
index c18513e..c9dc0b0 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/oper_pars.sql b/binsrc/vsp/admin/dbpump/oper_pars.sql
index 3628b71..33e5437 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/operpars.awk b/binsrc/vsp/admin/dbpump/operpars.awk
index 02469e5..cb17797 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/vsp/admin/dbpump/pars_init.sql b/binsrc/vsp/admin/dbpump/pars_init.sql
index db5b255..e999913 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/parse_oper_pars.sh b/binsrc/vsp/admin/dbpump/parse_oper_pars.sh
index 3c89869..912d49f 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/vsp/admin/dbpump/passwd_page.vsp b/binsrc/vsp/admin/dbpump/passwd_page.vsp
index 60d5006..5e79cb6 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/restore_itself.vsp b/binsrc/vsp/admin/dbpump/restore_itself.vsp
index 5e53660..f3aa388 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/restore_options.vsp b/binsrc/vsp/admin/dbpump/restore_options.vsp
index f8712d1..71aa9fe 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/restore_page.vsp b/binsrc/vsp/admin/dbpump/restore_page.vsp
index a925d05..4d70566 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/restore_schema.vsp b/binsrc/vsp/admin/dbpump/restore_schema.vsp
index 49eb9bd..ea4acc9 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp b/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp
index e7b01ac..6d0c223 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/restore_tables.vsp b/binsrc/vsp/admin/dbpump/restore_tables.vsp
index 90bee0c..99f66c1 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp b/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp
index 95fa1c5..6b2acf0 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/root.isql b/binsrc/vsp/admin/dbpump/root.isql
index cfb53fe..8619bc4 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl b/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl
index 63ab66c..abf8cc9 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/schema_index_info.vsp b/binsrc/vsp/admin/dbpump/schema_index_info.vsp
index 469b257..f1c4af5 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/schema_index_info.xsl b/binsrc/vsp/admin/dbpump/schema_index_info.xsl
index 7d2b410..2df9941 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/schema_indices.vsp b/binsrc/vsp/admin/dbpump/schema_indices.vsp
index e34dcd8..96e1543 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/schema_indices.xsl b/binsrc/vsp/admin/dbpump/schema_indices.xsl
index 8db895d..51a920b 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/schema_info.vsp b/binsrc/vsp/admin/dbpump/schema_info.vsp
index 1573705..18c7e32 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/schema_proc_info.vsp b/binsrc/vsp/admin/dbpump/schema_proc_info.vsp
index b070ae8..b2ef2f5 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/schema_proc_info.xsl b/binsrc/vsp/admin/dbpump/schema_proc_info.xsl
index 74c000d..3d0c5a0 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/schema_procs.vsp b/binsrc/vsp/admin/dbpump/schema_procs.vsp
index a66e91c..9448f08 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/schema_procs.xsl b/binsrc/vsp/admin/dbpump/schema_procs.xsl
index 9194207..5e00964 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/schema_table_info.vsp b/binsrc/vsp/admin/dbpump/schema_table_info.vsp
index abe477a..548568c 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/schema_table_info.xsl b/binsrc/vsp/admin/dbpump/schema_table_info.xsl
index 060bbcd..2a1ad62 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/schema_tables.vsp b/binsrc/vsp/admin/dbpump/schema_tables.vsp
index 406a8bd..4736e24 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/schema_tables.xsl b/binsrc/vsp/admin/dbpump/schema_tables.xsl
index ba97463..1e38d18 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/schema_tables_select.xsl b/binsrc/vsp/admin/dbpump/schema_tables_select.xsl
index 2b4defa..4de9a0f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/dbpump/select_datasource.vsp b/binsrc/vsp/admin/dbpump/select_datasource.vsp
index 5cafa5a..f708fea 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/select_options.vsp b/binsrc/vsp/admin/dbpump/select_options.vsp
index 6fb6f33..c5f1ee3 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/dbpump/try_connect.vsp b/binsrc/vsp/admin/dbpump/try_connect.vsp
index c54aa44..3ef0fe4 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/debug/filter.awk b/binsrc/vsp/admin/debug/filter.awk
index a01f8b9..c29bd96 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/vsp/admin/debug/init.sql b/binsrc/vsp/admin/debug/init.sql
index b94bbe0..5f6988e 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/debug/make_vad.sh b/binsrc/vsp/admin/debug/make_vad.sh
index db4a7e2..6611d63 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.2 2011/02/03 10:35:34 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -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-2011 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
diff --git a/binsrc/vsp/admin/debug/record.vspx b/binsrc/vsp/admin/debug/record.vspx
index aa9ba64..9ee1b2f 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 2009/01/29 21:56:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/debug/record_login.vspx b/binsrc/vsp/admin/debug/record_login.vspx
index baf2e9b..cb22eda 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/admin/debug/run_tests.sh b/binsrc/vsp/admin/debug/run_tests.sh
index d93e7d4..22d5d82 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/vsp/admin/hosted_modules_grants.vsp b/binsrc/vsp/admin/hosted_modules_grants.vsp
index f288c72..a570f4d 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/hosted_modules_show_sql.vsp b/binsrc/vsp/admin/hosted_modules_show_sql.vsp
index 59e66d7..24fa3af 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/index_left.vsp b/binsrc/vsp/admin/index_left.vsp
index eec807a..1e692ff 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 2008/10/22 20:05:47 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/leftfr.vsp b/binsrc/vsp/admin/leftfr.vsp
index 40f16f4..9614af3 100644
--- a/binsrc/vsp/admin/leftfr.vsp
+++ b/binsrc/vsp/admin/leftfr.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: leftfr.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/dbdoc.vsp b/binsrc/vsp/admin/vad/dbdoc.vsp
index 544dcfb..03b1ee5 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/dbhelp.vsp b/binsrc/vsp/admin/vad/dbhelp.vsp
index 5010fde..893c3b2 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/regedit.vsp b/binsrc/vsp/admin/vad/regedit.vsp
index 8662799..61db8a4 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 2006/11/30 13:49:19 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/regedit_data.vsp b/binsrc/vsp/admin/vad/regedit_data.vsp
index e54b9d6..673addf 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/regedit_e1.vsp b/binsrc/vsp/admin/vad/regedit_e1.vsp
index 799debd..9f1a53a 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/regedit_sql.vsp b/binsrc/vsp/admin/vad/regedit_sql.vsp
index 6d4cf1f..e50f73f 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/regedit_sticker.vsp b/binsrc/vsp/admin/vad/regedit_sticker.vsp
index 430a154..f44b365 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/regedit_tree.vsp b/binsrc/vsp/admin/vad/regedit_tree.vsp
index 36f509e..95152c1 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/vad.vsp b/binsrc/vsp/admin/vad/vad.vsp
index 1a90f14..bed2399 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/vad_configs.vsp b/binsrc/vsp/admin/vad/vad_configs.vsp
index 3e85caa..30a1d86 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/vad_davs.vsp b/binsrc/vsp/admin/vad/vad_davs.vsp
index 45be7c2..498c631 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/vad_docs.vsp b/binsrc/vsp/admin/vad/vad_docs.vsp
index f92b263..8acd98e 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/vad_packages.vsp b/binsrc/vsp/admin/vad/vad_packages.vsp
index c064b31..8b815af 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin/vad/vad_vsps.vsp b/binsrc/vsp/admin/vad/vad_vsps.vsp
index ace46da..ab67321 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/admin_style.html b/binsrc/vsp/admin_style.html
index ae84a72..f183956 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/bugsfixed.html b/binsrc/vsp/bugsfixed.html
index 938374a..7b950b4 100644
--- a/binsrc/vsp/bugsfixed.html
+++ b/binsrc/vsp/bugsfixed.html
@@ -98,6 +98,6 @@
</UL>
<BR />
-<DIV CLASS="vtabfoot"> - Copyright 1998-2011, OpenLink Software - </DIV>
+<DIV CLASS="vtabfoot"> - Copyright 1998-2012, OpenLink Software - </DIV>
</BODY>
</HTML>
diff --git a/binsrc/vsp/default.css b/binsrc/vsp/default.css
index aa16545..16aa66e 100644
--- a/binsrc/vsp/default.css
+++ b/binsrc/vsp/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.3 2006/08/31 11:01:55 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/demo-index.html b/binsrc/vsp/demo-index.html
index 52bc779..ea39d0e 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-2011 OpenLink Software.
+ Administration Interface - Copyright© 1998-2012 OpenLink Software.
</P>
</TD></TR>
</TABLE>
diff --git a/binsrc/vsp/demo-index.vsp b/binsrc/vsp/demo-index.vsp
index f69210e..3c0367e 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.2 2011/02/03 10:35:33 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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-2011 OpenLink Software. </P></TD></TR>
+<TR><TD><P CLASS="copyright">Virtuoso Server <!--(<?= sys_stat('st_dbms_ver') ?>)--> Administration Interface - Copyright© 1998-2012 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 eb38026..61217d0 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 2009/01/29 21:56:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/doc/docs.vsp b/binsrc/vsp/doc/docs.vsp
index 3962802..0d9c6ab 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.2 2011/02/03 10:35:34 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -137,7 +137,7 @@ else
<TABLE BORDER="0" WIDTH="100%">
<TR><TD WIDTH="50"></TD>
<TD WIDTH="80%">
-<DIV CLASS="copyright">Copyright© 1998-2011 OpenLink Software</DIV>
+<DIV CLASS="copyright">Copyright© 1998-2012 OpenLink Software</DIV>
</TD>
<TD WIDTH="50"/>
</TR>
diff --git a/binsrc/vsp/doc/rss2xbel.xsl b/binsrc/vsp/doc/rss2xbel.xsl
index 6f64642..79e408d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/doc/search.css b/binsrc/vsp/doc/search.css
index ba8abfb..f3e6be6 100644
--- a/binsrc/vsp/doc/search.css
+++ b/binsrc/vsp/doc/search.css
@@ -1,10 +1,10 @@
/*
- * $Id: search.css,v 1.4 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/doc/search.vsp b/binsrc/vsp/doc/search.vsp
index 5d58d0e..9a6e894 100644
--- a/binsrc/vsp/doc/search.vsp
+++ b/binsrc/vsp/doc/search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: search.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/doc/translate.vsp b/binsrc/vsp/doc/translate.vsp
index f9ae414..3846167 100644
--- a/binsrc/vsp/doc/translate.vsp
+++ b/binsrc/vsp/doc/translate.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: translate.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/doc/translation.css b/binsrc/vsp/doc/translation.css
index 5554b33..7cf4167 100644
--- a/binsrc/vsp/doc/translation.css
+++ b/binsrc/vsp/doc/translation.css
@@ -1,10 +1,10 @@
/*
- * $Id: translation.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/downfr.html b/binsrc/vsp/downfr.html
index 7e0ad7d..c1d9428 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/index.html b/binsrc/vsp/index.html
index 6321c23..1c23251 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-2011 OpenLink Software
+ Copyright © 1998-2012 OpenLink Software
</td>
</tr>
</table>
diff --git a/binsrc/vsp/index1.html b/binsrc/vsp/index1.html
index 0a80ee4..9289b2c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/index_left.vsp b/binsrc/vsp/index_left.vsp
index 02d0186..3bf307f 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 2006/08/15 19:30:35 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/install.sh b/binsrc/vsp/install.sh
index c373dce..c658678 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/vsp/knownissues.html b/binsrc/vsp/knownissues.html
index 80fb323..bcfcb6e 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-2011, OpenLink Software - </DIV>
+<DIV CLASS="vtabfoot"> - Copyright 1998-2012, OpenLink Software - </DIV>
</BODY>
</HTML>
diff --git a/binsrc/vsp/leftfr.html b/binsrc/vsp/leftfr.html
index 03920da..8bd444b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/mainfr.html b/binsrc/vsp/mainfr.html
index f08c851..08841d6 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/mime/dav_res.vsp b/binsrc/vsp/mime/dav_res.vsp
index f61048d..b53fa8d 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/ftt_mail_hits.vsp b/binsrc/vsp/mime/ftt_mail_hits.vsp
index 334c78d..78a1556 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/ftt_mail_query.vsp b/binsrc/vsp/mime/ftt_mail_query.vsp
index 4049017..cf11b79 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/ftt_news_hits.vsp b/binsrc/vsp/mime/ftt_news_hits.vsp
index f8917ed..9360e4b 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/ftt_news_query.vsp b/binsrc/vsp/mime/ftt_news_query.vsp
index 496d9c4..7e0ddb7 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/mail_search.vsp b/binsrc/vsp/mime/mail_search.vsp
index 0b8fe7b..f2f8332 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/mime_compose.vsp b/binsrc/vsp/mime/mime_compose.vsp
index b555a78..5f4a1ae 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/mime_display.vsp b/binsrc/vsp/mime/mime_display.vsp
index e1292a4..70b3021 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/mime_plain.vsp b/binsrc/vsp/mime/mime_plain.vsp
index 8890c2e..03d8caf 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/mime_spam_filter.vsp b/binsrc/vsp/mime/mime_spam_filter.vsp
index 471c062..3b0022c 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/mime_spam_filter_setup.vsp b/binsrc/vsp/mime/mime_spam_filter_setup.vsp
index ade42ca..6430d11 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/mime/nntp_help.htm b/binsrc/vsp/mime/nntp_help.htm
index ae3a535..939785b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/mime/pop3_get.vsp b/binsrc/vsp/mime/pop3_get.vsp
index c1f6e95..029652b 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/newfeatures.html b/binsrc/vsp/newfeatures.html
index a2f8d3e..931e458 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-2011 OpenLink Software. All Rights Reserved.</font></div></div></td>
+ <p align="center"><font face="Verdana">Copyright 1998-2012 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 1bc4a7a..5393d5a 100644
--- a/binsrc/vsp/releasenotes.css
+++ b/binsrc/vsp/releasenotes.css
@@ -1,10 +1,10 @@
/*
- * $Id: releasenotes.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/soapdemo/SOAP.html b/binsrc/vsp/soapdemo/SOAP.html
index 61859e4..737c4bc 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-2011 OpenLink Software. </P></TD></TR>
+<TR><TD><P CLASS="copyright">Virtuoso SOAP Test Interface - Copyright© 1998-2012 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 7b0ef81..dec89f7 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/soapdemo/echoDocument.vsp b/binsrc/vsp/soapdemo/echoDocument.vsp
index b7cb4e3..3e5f73a 100644
--- a/binsrc/vsp/soapdemo/echoDocument.vsp
+++ b/binsrc/vsp/soapdemo/echoDocument.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoDocument.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/echoEmployee.vsp b/binsrc/vsp/soapdemo/echoEmployee.vsp
index d6f2d9e..51f20f8 100644
--- a/binsrc/vsp/soapdemo/echoEmployee.vsp
+++ b/binsrc/vsp/soapdemo/echoEmployee.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoEmployee.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/echoPerson.vsp b/binsrc/vsp/soapdemo/echoPerson.vsp
index 9a65346..aa4a2d4 100644
--- a/binsrc/vsp/soapdemo/echoPerson.vsp
+++ b/binsrc/vsp/soapdemo/echoPerson.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoPerson.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/echoString.vsp b/binsrc/vsp/soapdemo/echoString.vsp
index 1206a91..8da0db3 100644
--- a/binsrc/vsp/soapdemo/echoString.vsp
+++ b/binsrc/vsp/soapdemo/echoString.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoString.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/echoStringArray.vsp b/binsrc/vsp/soapdemo/echoStringArray.vsp
index 53070bd..5669456 100644
--- a/binsrc/vsp/soapdemo/echoStringArray.vsp
+++ b/binsrc/vsp/soapdemo/echoStringArray.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStringArray.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/echoStruct.vsp b/binsrc/vsp/soapdemo/echoStruct.vsp
index bd94cc9..fc8da78 100644
--- a/binsrc/vsp/soapdemo/echoStruct.vsp
+++ b/binsrc/vsp/soapdemo/echoStruct.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStruct.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/echoStructArray.vsp b/binsrc/vsp/soapdemo/echoStructArray.vsp
index 0a96e1b..61bc4a5 100644
--- a/binsrc/vsp/soapdemo/echoStructArray.vsp
+++ b/binsrc/vsp/soapdemo/echoStructArray.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStructArray.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/echoStructLit.vsp b/binsrc/vsp/soapdemo/echoStructLit.vsp
index c878b81..6294165 100644
--- a/binsrc/vsp/soapdemo/echoStructLit.vsp
+++ b/binsrc/vsp/soapdemo/echoStructLit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStructLit.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/echoVoid.vsp b/binsrc/vsp/soapdemo/echoVoid.vsp
index 1e97b99..28eab7d 100644
--- a/binsrc/vsp/soapdemo/echoVoid.vsp
+++ b/binsrc/vsp/soapdemo/echoVoid.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoVoid.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/extensions.wsdl.vsp b/binsrc/vsp/soapdemo/extensions.wsdl.vsp
index ae61481..d68d6cc 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/extensions_required.wsdl.vsp b/binsrc/vsp/soapdemo/extensions_required.wsdl.vsp
index 3453a42..5f8c138 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/fishselect.java b/binsrc/vsp/soapdemo/fishselect.java
index 37ea4df..046dedf 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/soapdemo/fishselect.sql b/binsrc/vsp/soapdemo/fishselect.sql
index c0bc7ac..acfffb4 100644
--- a/binsrc/vsp/soapdemo/fishselect.sql
+++ b/binsrc/vsp/soapdemo/fishselect.sql
@@ -1,10 +1,10 @@
--
--- $Id: fishselect.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/fishselectResponse.java b/binsrc/vsp/soapdemo/fishselectResponse.java
index a026097..8cc9d79 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/soapdemo/interop-xsd.sql b/binsrc/vsp/soapdemo/interop-xsd.sql
index 854778f..fd39650 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop.html b/binsrc/vsp/soapdemo/interop.html
index bebb03c..815494f 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-2011 OpenLink Software.
+ Administration Interface - Copyright© 1998-2012 OpenLink Software.
</P>
</TD></TR>
</TABLE>
diff --git a/binsrc/vsp/soapdemo/interop_client.sql b/binsrc/vsp/soapdemo/interop_client.sql
index 2038413..fa90386 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp b/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp
index d79a3de..02cd2ee 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop_main.vsp b/binsrc/vsp/soapdemo/interop_main.vsp
index 8bf9618..510df21 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop_req_res.vsp b/binsrc/vsp/soapdemo/interop_req_res.vsp
index 63b711d..cc2f1ae 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 2009/01/29 21:56:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop_results.vsp b/binsrc/vsp/soapdemo/interop_results.vsp
index 7ac20f0..4f332db 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop_results2.vsp b/binsrc/vsp/soapdemo/interop_results2.vsp
index 2a629e9..d569ed3 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop_services.vsp b/binsrc/vsp/soapdemo/interop_services.vsp
index bbae105..afb15b6 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop_test.vsp b/binsrc/vsp/soapdemo/interop_test.vsp
index 28e053a..837cf73 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/interop_test2.vsp b/binsrc/vsp/soapdemo/interop_test2.vsp
index f923edc..31e53ca 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r3_index.vsp b/binsrc/vsp/soapdemo/r3_index.vsp
index d145009..51616cc 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd
index 498089d..3477e1e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd
index 15acbb4..799b009 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd
index f70177a..bacdbff 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql b/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql
index 86bb804..de2419f 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql b/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql
index ce11d6b..9f432c5 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 2007/04/02 07:34:41 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql
index d3ca367..b6cd7a0 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd
index c5df132..c5af8f5 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql
index 28e990b..5c157ec 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 2007/04/02 07:34:41 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/dime-doc.sql b/binsrc/vsp/soapdemo/r4/dime-doc.sql
index 28787f4..e7c668b 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/dime-doc.xsd b/binsrc/vsp/soapdemo/r4/dime-doc.xsd
index 05959e1..83d3590 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/dime-rpc.sql b/binsrc/vsp/soapdemo/r4/dime-rpc.sql
index 33a1658..c1ccc6a 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/dime-rpc.xsd b/binsrc/vsp/soapdemo/r4/dime-rpc.xsd
index 3232d20..1efc506 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/load_xsd.sql b/binsrc/vsp/soapdemo/r4/load_xsd.sql
index 1b0f0d9..11831ed 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/mime-doc.sql b/binsrc/vsp/soapdemo/r4/mime-doc.sql
index fc3f1f8..7d1248f 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/mime-rpc.sql b/binsrc/vsp/soapdemo/r4/mime-rpc.sql
index 58be13f..4884644 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd
index 2b2a736..220945e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd
index c227165..c6b3b6a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd
index 0a5afd5..56d3cb0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd
index fdc4d7d..73f6859 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd
index 1aae21f..90d1d19 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd
index 0725377..8df51ee 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd
index 12963a3..cf5c02d 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql b/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql
index bce739f..017f46b 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-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql
index fce6924..342d6a6 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd
index 57b8037..c14b56e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/r4/xsd.sql b/binsrc/vsp/soapdemo/r4/xsd.sql
index d7184d6..7fa2f98 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/round2-B.sql b/binsrc/vsp/soapdemo/round2-B.sql
index b7ccd46..2cfdf09 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/round2-base.sql b/binsrc/vsp/soapdemo/round2-base.sql
index ffa1138..8f31fec 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/round2.sql b/binsrc/vsp/soapdemo/round2.sql
index c558fba..646f00d 100644
--- a/binsrc/vsp/soapdemo/round2.sql
+++ b/binsrc/vsp/soapdemo/round2.sql
@@ -1,10 +1,10 @@
--
--- $Id: round2.sql,v 1.3 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/round3-D.sql b/binsrc/vsp/soapdemo/round3-D.sql
index 2942957..371b660 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 2007/04/02 07:30:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/round3-E.sql b/binsrc/vsp/soapdemo/round3-E.sql
index 93f7246..ac9dae6 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 2007/04/02 07:30:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/round3-F.sql b/binsrc/vsp/soapdemo/round3-F.sql
index a7f669b..0063425 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/round3-F_vad.sql b/binsrc/vsp/soapdemo/round3-F_vad.sql
index b8280e6..3fb065b 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 2007/04/02 07:34:41 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/round3.html b/binsrc/vsp/soapdemo/round3.html
index 805cb17..ebc4428 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/round4.html b/binsrc/vsp/soapdemo/round4.html
index ffa3eca..a5e45a0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/soapdemo/soap.css b/binsrc/vsp/soapdemo/soap.css
index 7b27576..980df81 100644
--- a/binsrc/vsp/soapdemo/soap.css
+++ b/binsrc/vsp/soapdemo/soap.css
@@ -1,10 +1,10 @@
/*
- * $Id: soap.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/soapdemo/soap12-addon.sql b/binsrc/vsp/soapdemo/soap12-addon.sql
index a4fd732..8bb7747 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 2007/03/14 14:42:18 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/soapdemo/soap_validator.sql b/binsrc/vsp/soapdemo/soap_validator.sql
index 7951f78..7e55a8b 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 2007/04/02 07:30:55 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vsp/vsmx/default.css b/binsrc/vsp/vsmx/default.css
index 7a42094..6c9370d 100644
--- a/binsrc/vsp/vsmx/default.css
+++ b/binsrc/vsp/vsmx/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vsp/vsmx/msg.vspx b/binsrc/vsp/vsmx/msg.vspx
index 613dfcf..467fa4a 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.2 2011/02/03 10:35:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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-2011 OpenLink Software.</span></div>
+ <div class="foot"><span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2012 OpenLink Software.</span></div>
</body>
</html>
</v:page>
diff --git a/binsrc/vsp/vsmx/oper.vspx b/binsrc/vsp/vsmx/oper.vspx
index dd8aaf5..c2bdc55 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.2 2011/02/03 10:35:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -118,7 +118,7 @@
</table>
</v:form>
<div class="foot">
- <span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2011 OpenLink Software.</span>
+ <span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2012 OpenLink Software.</span>
</div>
</body>
</html>
diff --git a/binsrc/vsp/vsmx/vsmx.vspx b/binsrc/vsp/vsmx/vsmx.vspx
index db3d957..93c4af3 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.2 2011/02/03 10:35:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -73,7 +73,7 @@
</table>
</v:form>
<div class="foot">
- <span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2011 OpenLink Software.</span>
+ <span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2012 OpenLink Software.</span>
</div>
</body>
</html>
diff --git a/binsrc/vsp/vsmx/vsmx_msg.xsl b/binsrc/vsp/vsmx/vsmx_msg.xsl
index 47619a8..dad143d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/vsmx/vsmx_oper.xsl b/binsrc/vsp/vsmx/vsmx_oper.xsl
index 1b1a2ba..dbe0873 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/vsmx/vsmx_res.xsl b/binsrc/vsp/vsmx/vsmx_res.xsl
index bf32cb1..22b85b9 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vsp/vsp_auth.sql b/binsrc/vsp/vsp_auth.sql
index 2e63b83..7c41c93 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.2 2011/01/03 23:41:46 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
@@ -738,7 +738,7 @@ vsp_auth_get (in realm varchar, in domain varchar,
http_request_status ('HTTP/1.1 401 Unauthorized');
require_encrypted := sys_stat ('sql_encryption_on_password');
- if (require_encrypted = 1 or require_encrypted = 2)
+ if (allow_basic and (require_encrypted = 1 or require_encrypted = 2))
require_encrypted := 0;
else
require_encrypted := 1;
diff --git a/binsrc/vspx/Makefile.am b/binsrc/vspx/Makefile.am
index 5c96b09..0991341 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/vspx/Makefile.in b/binsrc/vspx/Makefile.in
index 161074b..d6ac482 100644
--- a/binsrc/vspx/Makefile.in
+++ b/binsrc/vspx/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -340,14 +334,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/vspx/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/vspx/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/vspx/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/vspx/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -365,7 +359,6 @@ $(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
@@ -395,17 +388,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -433,7 +422,6 @@ clean-generic:
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"
@@ -452,8 +440,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -462,28 +448,18 @@ install-data-am:
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
@@ -521,7 +497,6 @@ uninstall-am:
clean-local:
-rm -rf .vspxmeta
-
# 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/vspx/active_ctrls.vspx b/binsrc/vspx/active_ctrls.vspx
index 06fe0a0..5341eb1 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/box.vspx b/binsrc/vspx/box.vspx
index b3a51a1..3bd242b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/browser/admin_dav_browser.sql b/binsrc/vspx/browser/admin_dav_browser.sql
index 1968f80..66e92a4 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/browser/dav_browser.css b/binsrc/vspx/browser/dav_browser.css
index d52ece7..5db6204 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 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vspx/browser/dav_browser.js b/binsrc/vspx/browser/dav_browser.js
index 0129b6d..3f5dfc4 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vspx/browser/dav_browser.vsp b/binsrc/vspx/browser/dav_browser.vsp
index b14d21a..ee61a4a 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/browser/dav_browser_bot.vsp b/binsrc/vspx/browser/dav_browser_bot.vsp
index fcc9fb3..c52b715 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/browser/dav_browser_host.vsp b/binsrc/vspx/browser/dav_browser_host.vsp
index befe81b..08caee1 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/browser/dav_browser_list.vsp b/binsrc/vspx/browser/dav_browser_list.vsp
index c66d158..240f40d 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/browser/dav_browser_mozilla.js b/binsrc/vspx/browser/dav_browser_mozilla.js
index 89d0acb..eae0efd 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vspx/browser/dav_browser_msie.js b/binsrc/vspx/browser/dav_browser_msie.js
index 4e87043..55e4c02 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vspx/browser/dav_browser_top.vsp b/binsrc/vspx/browser/dav_browser_top.vsp
index ce6789d..90fe66a 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/browser/dav_js.vsp b/binsrc/vspx/browser/dav_js.vsp
index 107ec01..a6d290a 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/browser/util.js b/binsrc/vspx/browser/util.js
index 79be980..a775cb0 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/vspx/browser/vsp_debug.vsp b/binsrc/vspx/browser/vsp_debug.vsp
index eda2927..2721fa1 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 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/cal.vspx b/binsrc/vspx/cal.vspx
index 8d095d6..da466b2 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/check_box.vspx b/binsrc/vspx/check_box.vspx
index b8d7663..13621d1 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/code1.sql b/binsrc/vspx/code1.sql
index 16f18a2..f07ffbf 100644
--- a/binsrc/vspx/code1.sql
+++ b/binsrc/vspx/code1.sql
@@ -1,10 +1,10 @@
--
--- $Id: code1.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/code_behind.vspx b/binsrc/vspx/code_behind.vspx
index 24454aa..b39f084 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/combo.vspx b/binsrc/vspx/combo.vspx
index b15b87d..1021ad1 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/combo1.vspx b/binsrc/vspx/combo1.vspx
index 240d18c..e27e3c7 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/custinst.vspx b/binsrc/vspx/custinst.vspx
index e110be0..5910d44 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/custom_condition.vspx b/binsrc/vspx/custom_condition.vspx
index c4b56cf..5eb27d9 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/custom_format.vspx b/binsrc/vspx/custom_format.vspx
index 0f892a6..017ae2c 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/data_list.vspx b/binsrc/vspx/data_list.vspx
index 6acd9d2..bc58157 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/data_list_sql.vspx b/binsrc/vspx/data_list_sql.vspx
index 7ac2c86..c1bc7e6 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/data_set.vspx b/binsrc/vspx/data_set.vspx
index 80399d0..d60cd5e 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/data_set_arr.vspx b/binsrc/vspx/data_set_arr.vspx
index 9a7b4e2..14acf2b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/data_set_arr_paging.vspx b/binsrc/vspx/data_set_arr_paging.vspx
index 0b46010..ae73536 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/datagrid.vspx b/binsrc/vspx/datagrid.vspx
index 869cfd4..aa29592 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/dataset_new.vspx b/binsrc/vspx/dataset_new.vspx
index 33213f5..d25c5cd 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/dataset_new_2.vspx b/binsrc/vspx/dataset_new_2.vspx
index e62065e..264eac8 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/dataset_pager.vspx b/binsrc/vspx/dataset_pager.vspx
index 2b38d64..bbba35e 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/dataset_update_1.vspx b/binsrc/vspx/dataset_update_1.vspx
index d571a1a..1d3c689 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/datasource.vspx b/binsrc/vspx/datasource.vspx
index f65d950..a9365fb 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/date.vspx b/binsrc/vspx/date.vspx
index ce18802..d0115f2 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/dav_browser.vspx b/binsrc/vspx/dav_browser.vspx
index ee9eff0..835fa72 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/dgarr.vspx b/binsrc/vspx/dgarr.vspx
index 67b5f1a..8568d10 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/error.vsp b/binsrc/vspx/error.vsp
index 03d22fd..24506a8 100644
--- a/binsrc/vspx/error.vsp
+++ b/binsrc/vspx/error.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: error.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/errors.vspx b/binsrc/vspx/errors.vspx
index 977dd06..f28edd2 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/button__0.vspx b/binsrc/vspx/examples/button__0.vspx
index 5c3e76f..a2799a7 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/button__1.vspx b/binsrc/vspx/examples/button__1.vspx
index 264d1a5..3677a1d 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/button__2.vspx b/binsrc/vspx/examples/button__2.vspx
index df681d3..287f045 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/button__3.vspx b/binsrc/vspx/examples/button__3.vspx
index 93eed81..f732b60 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/button__4.vspx b/binsrc/vspx/examples/button__4.vspx
index 251cd13..8efdcf4 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/calendar__0.vspx b/binsrc/vspx/examples/calendar__0.vspx
index 60184f2..db986b7 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/check_box__0.vspx b/binsrc/vspx/examples/check_box__0.vspx
index a3d98f9..8757fdb 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/code_file__0.sql b/binsrc/vspx/examples/code_file__0.sql
index 477dae0..f7532d0 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/examples/code_file__0.vspx b/binsrc/vspx/examples/code_file__0.vspx
index 3d71818..0a8fa71 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/data_grid__0.vspx b/binsrc/vspx/examples/data_grid__0.vspx
index 815001b..3e46d3c 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/data_list__0.vspx b/binsrc/vspx/examples/data_list__0.vspx
index 15b464f..78b436d 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/data_list__1.vspx b/binsrc/vspx/examples/data_list__1.vspx
index 1de1bd8..ae1739f 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/data_set__0.vspx b/binsrc/vspx/examples/data_set__0.vspx
index 875ae59..df2453d 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/data_set__1.vspx b/binsrc/vspx/examples/data_set__1.vspx
index 21c95d6..867a03e 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/data_source__0.vspx b/binsrc/vspx/examples/data_source__0.vspx
index 458bc18..199fee2 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/error_summary__0.vspx b/binsrc/vspx/examples/error_summary__0.vspx
index 654e83f..aa51a1a 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/error_summary__1.vspx b/binsrc/vspx/examples/error_summary__1.vspx
index d9d0d18..69b422e 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/footer.xml b/binsrc/vspx/examples/footer.xml
index a017809..677d575 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/form__0.vspx b/binsrc/vspx/examples/form__0.vspx
index 78639fa..75f9c47 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/form__1.vspx b/binsrc/vspx/examples/form__1.vspx
index c7b5287..e15421f 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/include__0.vspx b/binsrc/vspx/examples/include__0.vspx
index 73b5a2c..e881bba 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/label__0.vspx b/binsrc/vspx/examples/label__0.vspx
index 9d5ac16..7f3835e 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/login__0.vspx b/binsrc/vspx/examples/login__0.vspx
index a93071a..06e721f 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/login_form__0.vspx b/binsrc/vspx/examples/login_form__0.vspx
index 2f5fd5b..96aac52 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/page__0.vspx b/binsrc/vspx/examples/page__0.vspx
index 85b113c..74626b9 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/radio_button__0.vspx b/binsrc/vspx/examples/radio_button__0.vspx
index 188b2ea..bd9bb7e 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/radio_group__0.vspx b/binsrc/vspx/examples/radio_group__0.vspx
index 3c4fc8e..cf191f4 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/select_list__0.vspx b/binsrc/vspx/examples/select_list__0.vspx
index ea09e25..9ee6b1d 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/tab__0.vspx b/binsrc/vspx/examples/tab__0.vspx
index 36e553e..59880a5 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/text__0.vspx b/binsrc/vspx/examples/text__0.vspx
index cb09a92..d54ccd3 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/text_area__0.vspx b/binsrc/vspx/examples/text_area__0.vspx
index 01c28ec..55b5427 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/tree__0.vspx b/binsrc/vspx/examples/tree__0.vspx
index ffd8dbc..b300c41 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/url__0.vspx b/binsrc/vspx/examples/url__0.vspx
index 5baf0de..f449b6d 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/validator__0.vspx b/binsrc/vspx/examples/validator__0.vspx
index eb107e9..3e6b500 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/variable__0.vspx b/binsrc/vspx/examples/variable__0.vspx
index 4961d1b..53ff499 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/vscx__0.vspx b/binsrc/vspx/examples/vscx__0.vspx
index 823017e..6aad2c8 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/examples/vscx__1.vspx b/binsrc/vspx/examples/vscx__1.vspx
index fb864d8..8616bb0 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/file.vspx b/binsrc/vspx/file.vspx
index 977736d..ebb33a9 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/file_browser.vspx b/binsrc/vspx/file_browser.vspx
index 160182b..3ad93fc 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/footer.xml b/binsrc/vspx/footer.xml
index fce8b73..ebe4529 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/form.vspx b/binsrc/vspx/form.vspx
index 22e4fe3..f3bd05e 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/formdecor.vspx b/binsrc/vspx/formdecor.vspx
index df68782..54d8465 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/formsty.vspx b/binsrc/vspx/formsty.vspx
index 3889ad9..40bcd12 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/formsty.xsl b/binsrc/vspx/formsty.xsl
index 0adbcb0..e32e144 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/golive_data_set_colored.vspx b/binsrc/vspx/golive_data_set_colored.vspx
index 7526062..a6e7c98 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/grid.vspx b/binsrc/vspx/grid.vspx
index 812827d..796935a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/hiding_test.vspx b/binsrc/vspx/hiding_test.vspx
index 4fd1b80..ac02fa7 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/htree.vspx b/binsrc/vspx/htree.vspx
index 9e62c31..d7308f0 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/index.vsp b/binsrc/vspx/index.vsp
index 8448f59..5a04d68 100644
--- a/binsrc/vspx/index.vsp
+++ b/binsrc/vspx/index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/isql_control.vspx b/binsrc/vspx/isql_control.vspx
index 88db1d3..7d0bbf1 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/label.vspx b/binsrc/vspx/label.vspx
index 239819b..688ea96 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/login.vspx b/binsrc/vspx/login.vspx
index 44a5775..4e460ef 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 2007/11/26 15:10:02 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/make_docs.sql b/binsrc/vspx/make_docs.sql
index df2a20c..5852bed 100644
--- a/binsrc/vspx/make_docs.sql
+++ b/binsrc/vspx/make_docs.sql
@@ -1,10 +1,10 @@
--
--- $Id: make_docs.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/new_post_handler.vspx b/binsrc/vspx/new_post_handler.vspx
index 58f9000..fc52d93 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/new_tree.vspx b/binsrc/vspx/new_tree.vspx
index c753169..5b68943 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/new_version_search.vspx b/binsrc/vspx/new_version_search.vspx
index ff5ffff..e80945a 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/products.vspx b/binsrc/vspx/products.vspx
index e90da51..fa50a00 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/radio.vspx b/binsrc/vspx/radio.vspx
index aef56e4..ee599aa 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/radio_group.vspx b/binsrc/vspx/radio_group.vspx
index 5450a5f..cb0c7c9 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/sample.vspx b/binsrc/vspx/sample.vspx
index fc735cc..1454732 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/search.vspx b/binsrc/vspx/search.vspx
index df3decb..5fd282d 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/search_login.vspx b/binsrc/vspx/search_login.vspx
index 12a9731..658e212 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/sel_category.vspx b/binsrc/vspx/sel_category.vspx
index cc661a9..3fd49c6 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/sel_datagrid.vspx b/binsrc/vspx/sel_datagrid.vspx
index 84874ff..8971057 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/sel_select.vspx b/binsrc/vspx/sel_select.vspx
index d634f21..7673615 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/select.vspx b/binsrc/vspx/select.vspx
index e5b604d..8480b70 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/show_params.vspx b/binsrc/vspx/show_params.vspx
index cb5f463..1ef86ef 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/suite/filter.awk b/binsrc/vspx/suite/filter.awk
index 8841130..dcd3b68 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/vspx/suite/run_tests.sh b/binsrc/vspx/suite/run_tests.sh
index a7c285e..c90cf2c 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/vspx/suite/vspx_suite.sh b/binsrc/vspx/suite/vspx_suite.sh
index 6e1c065..a398cdd 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 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/vspx/tab.vspx b/binsrc/vspx/tab.vspx
index 671e4fa..0f6cd1e 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/tab_custom.vspx b/binsrc/vspx/tab_custom.vspx
index 79e7966..102dc3b 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/text.vspx b/binsrc/vspx/text.vspx
index 1b67f3a..470dccb 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/textarea.vspx b/binsrc/vspx/textarea.vspx
index 4c53ad8..c1a42f0 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/tree.vspx b/binsrc/vspx/tree.vspx
index 0923d95..2ceef42 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 2007/08/03 13:29:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/two_browse_buttons.vspx b/binsrc/vspx/two_browse_buttons.vspx
index 9d23f2c..10a7031 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/update_form.vspx b/binsrc/vspx/update_form.vspx
index a90007b..cf8f568 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/update_radio.vspx b/binsrc/vspx/update_radio.vspx
index e0b109a..a090ada 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/var.vspx b/binsrc/vspx/var.vspx
index aabde00..f99ca73 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vdir.vspx b/binsrc/vspx/vdir.vspx
index a80319c..42d2649 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vdir_browser.vspx b/binsrc/vspx/vdir_browser.vspx
index 0d5a313..5578887 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vdir_helper.sql b/binsrc/vspx/vdir_helper.sql
index 5c26480..7515806 100644
--- a/binsrc/vspx/vdir_helper.sql
+++ b/binsrc/vspx/vdir_helper.sql
@@ -1,10 +1,10 @@
--
--- $Id: vdir_helper.sql,v 1.3 2008/07/11 11:47:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/vspx.sql b/binsrc/vspx/vspx.sql
index 08b6335..87ab7d8 100644
--- a/binsrc/vspx/vspx.sql
+++ b/binsrc/vspx/vspx.sql
@@ -2,14 +2,14 @@
--
-- vspx.vsp
--
--- $Id: vspx.sql,v 1.12.2.7 2011/10/13 18:32:24 source Exp $
+-- $Id$
--
-- Virtuoso VSPX core componets classes
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/vspx.xsd b/binsrc/vspx/vspx.xsd
index 55834a3..adfb8a2 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vspx.xsl b/binsrc/vspx/vspx.xsl
index 97ec5b8..4253e4c 100644
--- a/binsrc/vspx/vspx.xsl
+++ b/binsrc/vspx/vspx.xsl
@@ -4,12 +4,12 @@
]>
<!--
-
- - $Id: vspx.xsl,v 1.7 2008/03/13 13:52:04 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -289,7 +289,7 @@ create type <xsl:value-of select="$vspx_full_class_name" /> under vspx_page
<xsl:if test="@on-error-redirect or @on-deadlock-retry">
<xsl:text/> method vc_error_handler_<xsl:value-of select="$vspx_local_class_name" /> (state any, message any, deadl any) returns any,
</xsl:if>
-<xsl:text/> method vc_redirect (url varchar) returns any,
+<xsl:text/> method vc_redirect (url any) returns any,
<xsl:text/> method vc_render_<xsl:value-of select="$vspx_local_class_name" /> (control vspx_page) returns any
;
<!-- The page UDT declaration end -->
@@ -520,7 +520,7 @@ create method vc_error_handler_<xsl:value-of select="$vspx_local_class_name" />
;
</xsl:if>
-create method vc_redirect (in url varchar) for <xsl:value-of select="$vspx_full_class_name" />
+create method vc_redirect (in url any) for <xsl:value-of select="$vspx_full_class_name" />
{
if (length (self.sid))
url := vspx_uri_add_parameters (url, sprintf ('sid=%s&realm=%s', self.sid, self.realm));
@@ -3151,7 +3151,7 @@ toggle_label:
while (inx < len) {
declare ctrl vspx_control;
ctrl := node.vc_children[inx];
- if (ctrl and udt_instance_of (ctrl, fix_identifier_case ('vspx_button'))) {
+ if (ctrl is not null 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 a374112..440a36b 100755
--- a/binsrc/vspx/vspx4xsd.sh
+++ b/binsrc/vspx/vspx4xsd.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: vspx4xsd.sh,v 1.3 2009/04/14 12:16:49 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/binsrc/vspx/vspx_add_locations.xsl b/binsrc/vspx/vspx_add_locations.xsl
index a318c0d..a183b43 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vspx_demo_init.sql b/binsrc/vspx/vspx_demo_init.sql
index 93ec22d..404c14c 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/vspx_expand.xsl b/binsrc/vspx/vspx_expand.xsl
index 934c16b..97643f7 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vspx_log_format.xsl b/binsrc/vspx/vspx_log_format.xsl
index ad493ad..6901e21 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vspx_pre_sql.xsl b/binsrc/vspx/vspx_pre_sql.xsl
index 312969f..6c1aafa 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vspx_pre_xsd.xsl b/binsrc/vspx/vspx_pre_xsd.xsl
index b179ab7..2b67ca5 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vspx_reload.sql b/binsrc/vspx/vspx_reload.sql
index 27fdfca..c2f46a5 100644
--- a/binsrc/vspx/vspx_reload.sql
+++ b/binsrc/vspx/vspx_reload.sql
@@ -1,10 +1,10 @@
--
--- $Id: vspx_reload.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/vspx_vhost.sql b/binsrc/vspx/vspx_vhost.sql
index 1999e39..4f00b68 100644
--- a/binsrc/vspx/vspx_vhost.sql
+++ b/binsrc/vspx/vspx_vhost.sql
@@ -1,10 +1,10 @@
--
--- $Id: vspx_vhost.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/vspx_wizards.sql b/binsrc/vspx/vspx_wizards.sql
index 7367e7c..2005f48 100644
--- a/binsrc/vspx/vspx_wizards.sql
+++ b/binsrc/vspx/vspx_wizards.sql
@@ -1,10 +1,10 @@
--
--- $Id: vspx_wizards.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/vspxmeta.xml b/binsrc/vspx/vspxmeta.xml
index 9f25193..1afb820 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -722,12 +722,12 @@ placed into the resulting HTML with no changes.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: button__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1313,12 +1313,12 @@ with a option values their customer IDs.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_list__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1360,12 +1360,12 @@ with a option values their customer IDs.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_set__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1537,12 +1537,12 @@ Allows scrolling only of existing records.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_source__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1847,12 +1847,12 @@ the check-box is validated against ragio group
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: include__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -2003,12 +2003,12 @@ a simple post counter.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: login_form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -2055,12 +2055,12 @@ This example will render just a login form
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: page__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -2524,12 +2524,12 @@ This draws an anchor in browser screen.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: validator__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -2692,12 +2692,12 @@ as a child of outer page.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: vscx__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/vspxmeta2doc.xsl b/binsrc/vspx/vspxmeta2doc.xsl
index 81d74d5..095448e 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/xb_checkbox.vspx b/binsrc/vspx/xb_checkbox.vspx
index 08f0839..6edf7c3 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/xb_orderby.vspx b/binsrc/vspx/xb_orderby.vspx
index c47850f..b688678 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 2006/08/16 00:04:14 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/xb_orderby_e.vspx b/binsrc/vspx/xb_orderby_e.vspx
index adee034..91c71f5 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/xform.vspx b/binsrc/vspx/xform.vspx
index 0f10558..d92a089 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/xmldataset.vspx b/binsrc/vspx/xmldataset.vspx
index 1e4f6c5..a72b120 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/xsd2doc.xsl b/binsrc/vspx/xsd2doc.xsl
index 81996c1..d48e6df 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/vspx/xsd2vspx.vsp b/binsrc/vspx/xsd2vspx.vsp
index adb2776..9581a90 100644
--- a/binsrc/vspx/xsd2vspx.vsp
+++ b/binsrc/vspx/xsd2vspx.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xsd2vspx.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/vspx/xsd2vspx.xsl b/binsrc/vspx/xsd2vspx.xsl
index 8d09439..773beef 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/Makefile.am b/binsrc/ws/Makefile.am
index ab0d0ac..acab47c 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/ws/Makefile.in b/binsrc/ws/Makefile.in
index 1f7cf6d..cc6ad86 100644
--- a/binsrc/ws/Makefile.in
+++ b/binsrc/ws/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -81,38 +78,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -200,7 +169,6 @@ 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@
@@ -284,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -305,7 +272,6 @@ 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@
@@ -326,14 +292,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/ws/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/ws/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/ws/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/ws/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -351,7 +317,6 @@ $(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
@@ -366,7 +331,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -383,7 +348,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -391,7 +356,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -417,16 +382,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -434,14 +399,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -453,43 +418,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -510,44 +471,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -577,7 +523,6 @@ clean-generic:
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"
@@ -596,8 +541,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -606,28 +549,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -648,8 +581,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -665,7 +598,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
-
# 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/ws/wsrm/Makefile.am b/binsrc/ws/wsrm/Makefile.am
index 2170a17..99114f1 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/ws/wsrm/Makefile.in b/binsrc/ws/wsrm/Makefile.in
index b40d097..1009236 100644
--- a/binsrc/ws/wsrm/Makefile.in
+++ b/binsrc/ws/wsrm/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -305,14 +299,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/ws/wsrm/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/ws/wsrm/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/ws/wsrm/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/ws/wsrm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -330,7 +324,6 @@ $(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
@@ -360,17 +353,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -400,7 +389,6 @@ clean-generic:
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"
@@ -420,8 +408,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -430,28 +416,18 @@ install-data-am:
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
@@ -472,7 +448,7 @@ ps-am:
uninstall-am:
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
@@ -492,7 +468,6 @@ wsrm_xsd.sql: $(SCH_FILES) xsd2sql.awk Makefile
-f $(srcdir)/xsd2sql.awk \
-v prefix=wsrm \
$(SCH_FILES)
-
# 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/ws/wsrm/orabpel.xsd b/binsrc/ws/wsrm/orabpel.xsd
index 4bada7c..95cd857 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/utility.xsd b/binsrc/ws/wsrm/utility.xsd
index 2116af0..3f5c029 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/utility200306.xsd b/binsrc/ws/wsrm/utility200306.xsd
index 49d8b90..d924107 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/wsa.xsd b/binsrc/ws/wsrm/wsa.xsd
index d27e1eb..0f31936 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/wsa200403.xsd b/binsrc/ws/wsrm/wsa200403.xsd
index 88e49c2..054d4e0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/wsp.xsd b/binsrc/ws/wsrm/wsp.xsd
index f6d3c08..3f16d69 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/wsrm.xsd b/binsrc/ws/wsrm/wsrm.xsd
index 2506fb8..e5e156f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/wsrm_ddl.sql b/binsrc/ws/wsrm/wsrm_ddl.sql
index 58cafd1..4776d3b 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 2008/04/15 10:57:01 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/ws/wsrm/wsrmcall.xsl b/binsrc/ws/wsrm/wsrmcall.xsl
index 1ea9152..15b8dff 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/wsrmcli.sql b/binsrc/ws/wsrm/wsrmcli.sql
index 558ba66..e904d51 100644
--- a/binsrc/ws/wsrm/wsrmcli.sql
+++ b/binsrc/ws/wsrm/wsrmcli.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsrmcli.sql,v 1.4 2008/04/18 14:03:30 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/ws/wsrm/wsrmsrv.sql b/binsrc/ws/wsrm/wsrmsrv.sql
index 49d6e16..e6bd94f 100644
--- a/binsrc/ws/wsrm/wsrmsrv.sql
+++ b/binsrc/ws/wsrm/wsrmsrv.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsrmsrv.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/ws/wsrm/wss.xsd b/binsrc/ws/wsrm/wss.xsd
index f93e688..b00255c 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/wss0212.xsd b/binsrc/ws/wsrm/wss0212.xsd
index 76d4f55..91ec29a 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk
index 074a30d..4bba030 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-2010 OpenLink Software
+# 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
@@ -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 f0e57d0..81b6da8 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/ws/wstr/wstrcli.sql b/binsrc/ws/wstr/wstrcli.sql
index 5918c7c..e5bf620 100644
--- a/binsrc/ws/wstr/wstrcli.sql
+++ b/binsrc/ws/wstr/wstrcli.sql
@@ -1,10 +1,10 @@
--
--- $Id: wstrcli.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/ws/wstr/wstrsrv.sql b/binsrc/ws/wstr/wstrsrv.sql
index e2a4823..2cf12bd 100644
--- a/binsrc/ws/wstr/wstrsrv.sql
+++ b/binsrc/ws/wstr/wstrsrv.sql
@@ -1,10 +1,10 @@
--
--- $Id: wstrsrv.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/xddl/Makefile.am b/binsrc/xddl/Makefile.am
index 5226eb7..ee24268 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/xddl/Makefile.in b/binsrc/xddl/Makefile.in
index a229253..6fe7875 100644
--- a/binsrc/xddl/Makefile.in
+++ b/binsrc/xddl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -289,14 +283,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/xddl/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/xddl/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/xddl/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/xddl/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -314,7 +308,6 @@ $(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
@@ -344,17 +337,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -382,7 +371,6 @@ clean-generic:
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"
@@ -401,8 +389,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -411,28 +397,18 @@ install-data-am:
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
@@ -466,7 +442,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/xddl/demo.xml b/binsrc/xddl/demo.xml
index a2fae2b..50b85f0 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/xddl/fragment.xml b/binsrc/xddl/fragment.xml
index 2976a83..c38fffa 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/xddl/test.vsp b/binsrc/xddl/test.vsp
index f12d3a6..7189a9b 100644
--- a/binsrc/xddl/test.vsp
+++ b/binsrc/xddl/test.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: test.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/xddl/xddl.sql b/binsrc/xddl/xddl.sql
index 976e53a..d95bf2f 100644
--- a/binsrc/xddl/xddl.sql
+++ b/binsrc/xddl/xddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: xddl.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/xddl/xddl.xsd b/binsrc/xddl/xddl.xsd
index 1205a36..32d6d3e 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/xddl/xddl_dav.sql b/binsrc/xddl/xddl_dav.sql
index 85cc09f..0377bc0 100644
--- a/binsrc/xddl/xddl_dav.sql
+++ b/binsrc/xddl/xddl_dav.sql
@@ -1,10 +1,10 @@
--
--- $Id: xddl_dav.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/xddl/xddl_diff.xsl b/binsrc/xddl/xddl_diff.xsl
index 292ae84..fc6656d 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/xddl/xddl_exec.xsl b/binsrc/xddl/xddl_exec.xsl
index abf7036..0d5a4c7 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/xddl/xddl_filesystem.sql b/binsrc/xddl/xddl_filesystem.sql
index 454db00..f85d177 100644
--- a/binsrc/xddl/xddl_filesystem.sql
+++ b/binsrc/xddl/xddl_filesystem.sql
@@ -1,10 +1,10 @@
--
--- $Id: xddl_filesystem.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/xddl/xddl_procs.xsd b/binsrc/xddl/xddl_procs.xsd
index 52dfdcb..2a14a9b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/xddl/xddl_tables.xsd b/binsrc/xddl/xddl_tables.xsd
index d84a506..1892c76 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/xddl/xddl_views.xsd b/binsrc/xddl/xddl_views.xsd
index 0bd030e..aa24b72 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/INSTALL b/binsrc/yacutia/INSTALL
index 2b7993b..0cf852f 100644
--- a/binsrc/yacutia/INSTALL
+++ b/binsrc/yacutia/INSTALL
@@ -1,6 +1,6 @@
-- install
--
--- $Id: INSTALL,v 1.2.2.1 2010/09/20 10:16:34 source Exp $
+-- $Id$
--
--
diff --git a/binsrc/yacutia/Makefile.am b/binsrc/yacutia/Makefile.am
index 6dba70c..4e76478 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-2006 OpenLink Software
+# 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
diff --git a/binsrc/yacutia/Makefile.in b/binsrc/yacutia/Makefile.in
index 065c3a0..77a313e 100644
--- a/binsrc/yacutia/Makefile.in
+++ b/binsrc/yacutia/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
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 =
@@ -81,23 +78,9 @@ 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__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(vaddir)"
+nodist_vadDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nodist_vad_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -187,7 +170,6 @@ 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@
@@ -271,7 +253,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -292,7 +273,6 @@ 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@
@@ -348,14 +328,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/yacutia/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/yacutia/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/yacutia/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu binsrc/yacutia/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -373,7 +353,6 @@ $(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
@@ -383,23 +362,20 @@ clean-libtool:
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 \
+ @list='$(nodist_vad_DATA)'; 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 $$?; \
+ f=$(am__strip_dir) \
+ echo " $(nodist_vadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vaddir)/$$f'"; \
+ $(nodist_vadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vaddir)/$$f"; \
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
+ @list='$(nodist_vad_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(vaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vaddir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -423,17 +399,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -465,7 +437,6 @@ clean-generic:
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"
@@ -484,8 +455,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -494,28 +463,18 @@ 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
@@ -556,7 +515,6 @@ conductor_filesystem.vad conductor_dav.vad: $(EXTRA_DIST)
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/yacutia/account_create.vspx b/binsrc/yacutia/account_create.vspx
index c586a7f..a6e10ae 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.9 2011/05/20 11:49:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -68,6 +68,11 @@
</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()
@@ -258,7 +263,7 @@
<v:url name="b_url32" value="--'Roles'" format="%s" url="--'accounts_page.vspx?page=2'" xhtml_class="uddi"/>
</td>
<td class="page_tab" align="center">
- <v:url name="b_url14" value="Grants" url="accounts_page.vspx?page=3" xhtml_class="uddi"/>
+ <v:url name="b_url14" value="Grants" url="-- case when self.mode = 'edit' then sprintf ('caps_browser.vspx?mode=edit&user_name=%U', self.user_name) else 'accounts_page.vspx?page=3' end" xhtml_class="uddi"/>
</td>
<td class="page_tab" align="center">
<v:url name="b_url15" value="LDAP Import" url="ldap_import.vspx" xhtml_class="uddi"/>
@@ -279,7 +284,8 @@
<table class="tab_page">
<tr>
<td valign="top">
- <v:form name="account_form" type="simple" method="POST" action="" xhtml_enctype="multipart/form-data">
+ <v:form name="account_form" type="simple" method="POST" action=""
+ xhtml_enctype="multipart/form-data" xhtml_accept-charset="UTF-8">
<table class="main_page_area" style="valign: top">
<tr valign="top">
<td>
@@ -748,7 +754,13 @@
<tr>
<td>
<input type="checkbox" name="cb_key" value="<?V xenc_key ?>" />
- <?V xenc_key ?> (<?V xenc_type ?>)
+ <?V xenc_key ?> (<?V xenc_type ?>)
+ </td>
+ <td>
+ <?vsp if (xenc_type = 'X.509') { ?>
+ <v:url name="dwn1" value="Download" render-only="1"
+ url="--sprintf ('sec_pki_download.vsp?key=%U&user=%U', xenc_key, self.user_name)"/>
+ <?vsp } ?>
</td>
</tr>
<?vsp
@@ -756,7 +768,7 @@
}
if (i = 0)
{
- http ('<tr><td>~no keys available~</td></tr>');
+ http ('<tr><td colspan="2">~no keys available~</td></tr>');
}
?>
</table>
@@ -826,7 +838,7 @@
<v:script>
<![CDATA[
declare i, cnt, exist, u_ident, g_name integer;
- declare tmp, val, user_name, user_pwd, e_mail, os_name, os_password, user_perm, user_home varchar;
+ declare tmp, val, user_name, user_pwd, user_pwd2, e_mail, os_name, os_password, user_perm, user_home varchar;
declare attr any;
declare st, msg varchar;
declare webid varchar;
@@ -846,13 +858,14 @@
attr := vector();
user_name:= self.t_login_name.ufl_value;
- user_pwd:= self.t_user_password.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_');
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 <> self.t_user_password_conf.ufl_value)
+ if (user_pwd <> user_pwd2)
{
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 6345b4a..5229460 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.2 2010/09/20 10:16:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/account_remove_inc.vspx b/binsrc/yacutia/account_remove_inc.vspx
index 38e0759..8d4ab6e 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.4 2010/09/20 10:16:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/accounts.vspx b/binsrc/yacutia/accounts.vspx
index 2b80fb2..a3ff8ee 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.5 2011/01/25 14:21:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/accounts_page.vspx b/binsrc/yacutia/accounts_page.vspx
index 117b6d7..51c477d 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.3 2010/09/20 10:16:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/adm_login.vspx b/binsrc/yacutia/adm_login.vspx
index ef5f8fa..8434f6d 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.3 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/adm_navigation_bar.vspx b/binsrc/yacutia/adm_navigation_bar.vspx
index 3010a46..8318f46 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.3 2011/01/10 13:26:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/admin_utils.js b/binsrc/yacutia/admin_utils.js
index 33977cf..83b24b7 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/back_nav.vspx b/binsrc/yacutia/back_nav.vspx
index 216c9f7..6d308d4 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.2 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/bpel_service.vspx b/binsrc/yacutia/bpel_service.vspx
index 3ded631..c51658c 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.2 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/capabilities.vspx b/binsrc/yacutia/capabilities.vspx
index 6aea8fb..019d961 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.4 2011/01/10 13:26:08 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/caps_browser.vspx b/binsrc/yacutia/caps_browser.vspx
index 1dae158..c0715ee 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.3 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/caps_cols_browser.vspx b/binsrc/yacutia/caps_cols_browser.vspx
index 98271c7..d6474ca 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.3 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/cond_common.js b/binsrc/yacutia/cond_common.js
index 8ce4fd4..a8bb89f 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.3 2010/09/20 10:16:35 source Exp $
+ * $Id$
*
* Common (Java/ECMA)Script utilities for Yacutia
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/cond_help.css b/binsrc/yacutia/cond_help.css
index fd06ef3..1469ed7 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.2 2010/09/20 10:16:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/cond_help.html b/binsrc/yacutia/cond_help.html
index 1297169..afaeb34 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.3 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/cond_help.js b/binsrc/yacutia/cond_help.js
index d80aa91..5709e24 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/cond_help.xsl b/binsrc/yacutia/cond_help.xsl
index 07c12b3..9add1f6 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.2 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/conductor.list b/binsrc/yacutia/conductor.list
index b556527..0adb61f 100644
--- a/binsrc/yacutia/conductor.list
+++ b/binsrc/yacutia/conductor.list
@@ -291,6 +291,9 @@ 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
@@ -316,11 +319,14 @@ conductor/sec_acl_edit_sp.vspx
conductor/sec_acl_edit.vspx
conductor/sec_auth_serv_sp.vspx
conductor/sec_auth_serv.vspx
+conductor/sec_auth_sponger_1.vspx
+conductor/sec_auth_sponger_2.vspx
conductor/sec_pki_1.vspx
conductor/sec_pki_2_conf.vspx
conductor/sec_pki_2.vspx
conductor/sec_pki_3.vspx
conductor/sec_pki_4.vspx
+conductor/sec_pki_download.vsp
conductor/sec_pki_drop.vspx
conductor/site.vspx
conductor/soap_del_path.vspx
diff --git a/binsrc/yacutia/cont_management.vspx b/binsrc/yacutia/cont_management.vspx
index 47d9564..d70d215 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.3 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/cont_management_types.vspx b/binsrc/yacutia/cont_management_types.vspx
index bda6c3b..4d20049 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.3 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/cont_page.vspx b/binsrc/yacutia/cont_page.vspx
index 39d80e5..3bd3523 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.3 2010/09/20 10:16:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/cont_type_edit.vspx b/binsrc/yacutia/cont_type_edit.vspx
index 48b8f81..0c49d48 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.3 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/cont_type_remove.vspx b/binsrc/yacutia/cont_type_remove.vspx
index 16cb6fa..27f09f7 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.3 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/dashboard.vspx b/binsrc/yacutia/dashboard.vspx
index 6ec4eb1..d696ae6 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.2 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/dashboard_item.vspx b/binsrc/yacutia/dashboard_item.vspx
index 585c661..7266ea0 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.2 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/dashboard_item_show.vspx b/binsrc/yacutia/dashboard_item_show.vspx
index c444fa9..1697a83 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.2 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/dashboard_item_show.xsl b/binsrc/yacutia/dashboard_item_show.xsl
index 9879bcf..0e8f3d5 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.2 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/databases.vspx b/binsrc/yacutia/databases.vspx
index ec3f1d0..3cb083a 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.4 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -42,6 +42,7 @@
<v:variable name="db_tree_state" persist="session" type="any" default="null" />
<v:variable name="db_ds_state" persist="session" type="any" default="null" />
<v:variable name="last_bmk" persist="session" type="varchar" default="null" />
+ <v:variable name="rdf_obj" persist="temp" type="varchar" default="null" param-name="rdf_obj"/>
</vm:variables>
<vm:menu>
<vm:menuitem value="Schema Objects Management"/>
@@ -477,7 +478,7 @@ ORDER BY sch_name"
</td>
</tr>
</v:template>
- <v:template name="tp_views" type="simple" instantiate="--self.open_tmpl (control.vc_parent, 'Views')">
+ <v:template name="tp_views" type="simple" instantiate="--self.open_tmpl (control.vc_parent, 'Views (SQL)')">
<tr>
<td>
</td>
@@ -605,6 +606,92 @@ ORDER BY sch_name"
</td>
</tr>
</v:template>
+ <v:template name="tp_views_ld" type="simple" instantiate="--self.open_tmpl (control.vc_parent, 'Views (Linked Data)') * isnull (self.rdf_obj)">
+ <tr>
+ <td>
+ </td>
+ <td align="left">
+ <div class="scroll_area">
+ <table class="listing" rules="groups">
+ <thead>
+ <tr class="listing_row_odd">
+ <th>References</th>
+ </tr>
+ </thead>
+ <?vsp
+ declare cat, have_one any;
+ have_one := 0;
+ cat := sprintf ('"%s".%%', self.browse_cat);
+ for select "o" from (sparql select distinct ?o where
+ { ?s virtrdf:qmTableName ?tb_name ;
+ virtrdf:qmPredicateRange-rvrFixedValue ?ref .
+ ?ref <http://www.w3.org/2000/01/rdf-schema#domain> ?o .
+ filter (?tb_name like ?:cat ) }) x do
+ {
+ declare obj any;
+ obj := "o";
+ have_one := 1;
+ ?>
+ <tr>
+ <td>
+ <v:url render-only="1" name="rlink" value="--obj" url="--sprintf ('databases.vspx?rdf_obj=%U', obj)"/>
+ </td>
+ </tr>
+ <?vsp
+ }
+ if (have_one = 0)
+ {
+ ?>
+ <tr>
+ <td class="Attention">No linked data views defined</td>
+ </tr>
+ <?vsp
+ }
+ ?>
+ </table>
+ </div>
+ </td>
+ </tr>
+ </v:template>
+ <v:template name="tp_views_ld2" type="simple" instantiate="--self.open_tmpl (control.vc_parent, 'Views (Linked Data)') * equ (isnull (self.rdf_obj), 0)">
+ <tr>
+ <td>
+ </td>
+ <td align="left">
+ <div class="scroll_area">
+ <table class="listing" rules="groups">
+ <thead>
+ <tr class="listing_row_odd">
+ <th>S</th>
+ <th>P</th>
+ <th>O</th>
+ </tr>
+ </thead>
+ <?vsp
+ declare stat, msg, data, meta any;
+ exec (sprintf ('SPARQL define output:format "_UDBC_" define sql:describe-mode "SCBD" DESCRIBE <%s>', self.rdf_obj), stat, msg, vector (), 0, meta, data);
+ --dbg_obj_print (data);
+ foreach (any row in data) do
+ {
+ ?>
+ <tr>
+ <td> <v:url render-only="1" name="rlink" value="--row[0]" url="--sprintf ('databases.vspx?rdf_obj=%U', row[0])"/> </td>
+ <td> <v:url render-only="1" name="rlink" value="--row[1]" url="--sprintf ('databases.vspx?rdf_obj=%U', row[1])"/> </td>
+ <?vsp if (__box_flags (row[2])) { ?>
+ <td> <v:url render-only="1" name="rlink" value="--row[2]" url="--sprintf ('databases.vspx?rdf_obj=%U', row[2])"/> </td>
+ <?vsp } else { ?>
+ <td> <v:label render-only="1" name="rlink" value="--row[2]" /> </td>
+ <?vsp } ?>
+ </tr>
+ <?vsp
+ }
+
+ ?>
+ </table>
+ </div>
+ </td>
+ </tr>
+ </v:template>
<v:template name="tp_procs" type="simple" instantiate="--self.open_tmpl (control.vc_parent, 'Procedures')">
<tr>
<td>
diff --git a/binsrc/yacutia/databases_drop.vspx b/binsrc/yacutia/databases_drop.vspx
index 87e4fba..ceef0b3 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.4 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/databases_export.vspx b/binsrc/yacutia/databases_export.vspx
index e1c6cd8..f24dad5 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.4 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/databases_grants.vspx b/binsrc/yacutia/databases_grants.vspx
index 4c94d11..390dd26 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.4 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/databases_proc_edit.vspx b/binsrc/yacutia/databases_proc_edit.vspx
index 6cb41eb..76b5bc5 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.6 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/databases_table_constraints.vspx b/binsrc/yacutia/databases_table_constraints.vspx
index bf5f41a..eaff8bc 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.3 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/databases_table_edit.vspx b/binsrc/yacutia/databases_table_edit.vspx
index b9515e8..4662e11 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.4 2010/09/20 10:16:36 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -105,20 +105,31 @@
</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="5">
+ <table class="page_tab_row" align="left" border="0" cellspacing="0" cellpadding="6">
<tr>
- <td nowrap="nowrap">
+ <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">
<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 nowrap="nowrap">
+ <td width="10%" 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 nowrap="nowrap">
-
+ <td width="10%" 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">
@@ -135,12 +146,12 @@
]]></v:before-render>
</v:button>
</td>
- <td nowrap="nowrap">
+ <td width="10%" 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 nowrap="nowrap">
+ <td width="10%" 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 f97f123..8ba235b 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.3 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/databases_udt_edit.vspx b/binsrc/yacutia/databases_udt_edit.vspx
index 6f5ece4..e688ebb 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.3 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/databases_view_edit.vspx b/binsrc/yacutia/databases_view_edit.vspx
index a5d49e2..fa541a5 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.3 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/dav_browser.css b/binsrc/yacutia/dav_browser.css
index ae0c1da..d360b78 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.2 2010/09/20 10:16:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/dav_browser.xsl b/binsrc/yacutia/dav_browser.xsl
index 5ca4b15..61b3014 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.19 2011/10/25 23:34:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/dav_browser_props.js b/binsrc/yacutia/dav_browser_props.js
index a61fa6a..5bb5f04 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/dav_post.js b/binsrc/yacutia/dav_post.js
index fc8414e..7197368 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/db_backup.vspx b/binsrc/yacutia/db_backup.vspx
index 4c805bf..cc27701 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.4 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_backup_clear.vspx b/binsrc/yacutia/db_backup_clear.vspx
index 79fd1cf..2ad24ab 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.4 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_const_drop_conf.vspx b/binsrc/yacutia/db_const_drop_conf.vspx
index b008f0d..afc96f5 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.4 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_const_drop_errs.vspx b/binsrc/yacutia/db_const_drop_errs.vspx
index ff87747..582bcd2 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.4 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_drop_conf.vspx b/binsrc/yacutia/db_drop_conf.vspx
index 84ab850..345ad09 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.5 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_drop_errs.vspx b/binsrc/yacutia/db_drop_errs.vspx
index 54b8e95..a9f38f4 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.4 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_grant_errs.vspx b/binsrc/yacutia/db_grant_errs.vspx
index 4676f0d..771b5c0 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.4 2010/09/20 10:16:37 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_grant_many.vspx b/binsrc/yacutia/db_grant_many.vspx
index 3fe60d4..56fb92f 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.4 2010/09/20 10:16:38 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_rdf_class.vspx b/binsrc/yacutia/db_rdf_class.vspx
index 78221b9..9ab2996 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.4 2011/09/09 13:21:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_rdf_objects.vspx b/binsrc/yacutia/db_rdf_objects.vspx
index 68dd248..61ea47a 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.12 2011/10/13 18:33:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_rdf_owl.vspx b/binsrc/yacutia/db_rdf_owl.vspx
index f30d4ff..ba01212 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.4 2010/09/20 10:16:38 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_rdf_view_1.vspx b/binsrc/yacutia/db_rdf_view_1.vspx
index 0c70afc..499ed4f 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.9 2011/09/09 13:21:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_rdf_view_2.vspx b/binsrc/yacutia/db_rdf_view_2.vspx
index 95efa31..d842c6e 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.9 2011/10/13 18:33:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_rdf_view_3.vspx b/binsrc/yacutia/db_rdf_view_3.vspx
index c5ef637..e2bc2ea 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.19 2011/10/25 23:34:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -41,6 +41,7 @@
<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"/>
@@ -52,6 +53,7 @@
<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"/>
@@ -101,7 +103,7 @@
}
if (self.rdb_sync.ufl_selected)
{
- self.sync_ret := RDF_VIEW_DO_SYNC (self.base_url, self.fill.ufl_selected);
+ self.sync_ret := RDF_VIEW_DO_SYNC (self.base_url, self.fill.ufl_selected, self.pgraph.ufl_value);
if (0 = length (self.sync_ret))
self.sync_ret := vector (vector ('00000', 'OK'));
}
@@ -199,6 +201,10 @@
{
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);
@@ -235,6 +241,7 @@
{
?>
<h2>Execution Status</h2>
+ <div class="scroll_area">
<table class="listing">
<tr class="listing_header_row"><th>Status</th><th>Message</th></tr>
<?vsp
@@ -250,6 +257,7 @@
}
?>
</table>
+ </div>
<?vsp
if (length (self.sync_ret))
{
@@ -320,6 +328,28 @@
}
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)
{
@@ -356,6 +386,8 @@
<?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>
@@ -363,7 +395,9 @@
<?vsp } ?>
<?vsp } ?>
<?vsp if (self.text_e = 0 and __proc_exists ('DB.DBA.RDF_VIEW_DO_SYNC')) { ?>
- <br /><v:check-box name="rdb_sync" value="1" xhtml_id="rdb_sync" /> <label for="rdb_sync">Generate RDB2RDF triggers</label> <br/>
+ <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/>
<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 da175ef..3a750a3 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.11 2011/10/13 18:33:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -76,7 +76,7 @@
declare i int;
i := 0;
cols := make_array ((select count(*) from TABLE_COLS where "TABLE" = self.tbl), 'any');
- for select "COLUMN" as colname, COL_DTP from TABLE_COLS where "TABLE" = self.tbl order by COL_ID do
+ for select "COLUMN" as colname, COL_DTP from TABLE_COLS where "TABLE" = self.tbl and "COLUMN" <> '_IDN' order by COL_ID do
{
cols [i] := vector (0, '');
i := i + 1;
@@ -170,7 +170,7 @@
select distinct ?prop
{ graph ?:owl { ?prop rdfs:domain ?cls . }}) x);
--dbg_obj_print (props);
- for select "COLUMN" as col, COL_ID from TABLE_COLS where "TABLE" = self.tbl order by COL_ID do
+ for select "COLUMN" as col, COL_ID from TABLE_COLS where "TABLE" = self.tbl and "COLUMN" <> '_IDN' order by COL_ID do
{
?>
<tr class="<?V case when mod (i, 2) then 'listing_row_odd' else 'listing_row_even' end ?>">
@@ -238,7 +238,7 @@
}
pos := position (self.tbl, self.tbls);
cols := self.cols [pos - 1][1];
- for select "COLUMN" as col, COL_ID from TABLE_COLS where "TABLE" = self.tbl order by COL_ID do
+ for select "COLUMN" as col, COL_ID from TABLE_COLS where "TABLE" = self.tbl and "COLUMN" <> '_IDN' order by COL_ID do
{
x := atoi (get_keyword (sprintf ('sel_%d', COL_ID), e.ve_params, '0'));
if (x = 2)
diff --git a/binsrc/yacutia/db_rdf_view_pk.vspx b/binsrc/yacutia/db_rdf_view_pk.vspx
index 39bcf57..3b3ee3b 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.7 2011/10/25 23:34:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -105,7 +105,7 @@
}
avail := vector ();
- for select "COLUMN" from SYS_COLS where "TABLE" = self.tbl and not position ("COLUMN", self.pkeys) order by COL_ID do
+ for select "COLUMN" from SYS_COLS where "TABLE" = self.tbl and not position ("COLUMN", self.pkeys) and "COLUMN" <> '_IDN' order by COL_ID do
{
avail := vector_concat (avail, vector ("COLUMN"));
}
diff --git a/binsrc/yacutia/db_rdf_view_tb.vspx b/binsrc/yacutia/db_rdf_view_tb.vspx
index a8de9a4..35a450e 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.8 2011/10/13 18:33:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_basic.vspx b/binsrc/yacutia/db_repl_basic.vspx
index 5f55393..8e2d127 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.3 2010/09/20 10:16:38 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_basic_create.vspx b/binsrc/yacutia/db_repl_basic_create.vspx
index 21f8b9a..4ac602c 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.3 2010/09/20 10:16:38 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_basic_local.vspx b/binsrc/yacutia/db_repl_basic_local.vspx
index aea3e2b..135b39d 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_basic_local_create.vspx b/binsrc/yacutia/db_repl_basic_local_create.vspx
index 07b8ef0..f6f2c79 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_basic_local_start.vspx b/binsrc/yacutia/db_repl_basic_local_start.vspx
index 5a080e7..9003a3d 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_basic_start.vspx b/binsrc/yacutia/db_repl_basic_start.vspx
index 179f668..a028d41 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_bi.vspx b/binsrc/yacutia/db_repl_bi.vspx
index 4f2742c..692d584 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.5 2011/01/25 14:21:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_bi_add.vspx b/binsrc/yacutia/db_repl_bi_add.vspx
index b8a101f..0d5baab 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_bi_cr.vspx b/binsrc/yacutia/db_repl_bi_cr.vspx
index abd1855..764e469 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_bi_cr_edit.vspx b/binsrc/yacutia/db_repl_bi_cr_edit.vspx
index 09c60da..d15c0d6 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_bi_create.vspx b/binsrc/yacutia/db_repl_bi_create.vspx
index 6783d8f..dc082f3 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_bi_edit.vspx b/binsrc/yacutia/db_repl_bi_edit.vspx
index ee0a721..2c7f97b 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.3 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_bi_remove.vspx b/binsrc/yacutia/db_repl_bi_remove.vspx
index 79d4fad..a258ca2 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.4 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_cr_edit.vspx b/binsrc/yacutia/db_repl_cr_edit.vspx
index 61a28a3..7c164e1 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.2 2010/09/20 10:16:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_pub.vspx b/binsrc/yacutia/db_repl_pub.vspx
index c05c013..b6f78e3 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.4 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_pub_cr.vspx b/binsrc/yacutia/db_repl_pub_cr.vspx
index cfecfd1..242b78f 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.3 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_pub_cr_edit.vspx b/binsrc/yacutia/db_repl_pub_cr_edit.vspx
index 972c26e..6239631 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.2 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_pub_cr_edit2.vspx b/binsrc/yacutia/db_repl_pub_cr_edit2.vspx
index 56a2cf3..2c6a528 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.3 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_pub_create.vspx b/binsrc/yacutia/db_repl_pub_create.vspx
index a3d2854..100bc19 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.3 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_pub_edit.vspx b/binsrc/yacutia/db_repl_pub_edit.vspx
index 78819ee..b6a7cc2 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.4 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_rdf_pub_edit.vspx b/binsrc/yacutia/db_repl_rdf_pub_edit.vspx
index 57ae71c..ede7c95 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.3 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_snap.vspx b/binsrc/yacutia/db_repl_snap.vspx
index 0e06e41..84a9568 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.3 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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_url31" value="Local to Local" url="db_repl_snap_local.vspx"/>
+ <v:url name="b_url32" 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 6a696d5..6e504ed 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.3 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -54,6 +54,7 @@
<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"/>
@@ -558,6 +559,58 @@ 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>
@@ -577,9 +630,22 @@ self.vc_data_bind(e);
while (_idx < length(self.selcust))
{
_tblname := self.selcust[_idx];
- _idx := _idx + 1;
+
+ declare l1 integer;
+ declare _tblname2 any;
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 37ae9e1..4260dad 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.3 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -69,10 +69,10 @@
</colgroup>
<tr>
<td class="page_tab" align="center">
- <v:url name="b_url31" 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" align="center">
- <v:url name="b_url31" value="Remote to Local" url="db_repl_snap_pull.vspx"/>
+ <v:url name="b_url32" value="Local to Remote" url="db_repl_snap.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 b3e756c..d7c572d 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.3 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -54,6 +54,7 @@
<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"/>
@@ -352,6 +353,58 @@ 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>
@@ -368,14 +421,33 @@ 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, 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="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="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 d7f99bb..a97d452 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.4 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_snap_pull.vspx b/binsrc/yacutia/db_repl_snap_pull.vspx
index 6ee94b7..a1bdd16 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.4 2010/09/20 10:16:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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_url31" value="Local to Local" url="db_repl_snap_local.vspx"/>
+ <v:url name="b_url32" 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 ec073e9..c60c466 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.3 2010/09/20 10:16:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -54,6 +54,7 @@
<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"/>
@@ -357,6 +358,58 @@ 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>
@@ -373,14 +426,33 @@ 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, 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="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="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 20305d8..9654f07 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.3 2010/09/20 10:16:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_snap_start.vspx b/binsrc/yacutia/db_repl_snap_start.vspx
index 4c59d95..76f6e04 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.3 2010/09/20 10:16:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_sub.vspx b/binsrc/yacutia/db_repl_sub.vspx
index b685d60..a60a39f 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.4 2010/09/20 10:16:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_sub_create.vspx b/binsrc/yacutia/db_repl_sub_create.vspx
index f3fc4e2..ab80353 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.5 2010/09/20 10:16:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_sub_edit.vspx b/binsrc/yacutia/db_repl_sub_edit.vspx
index cf1b071..ca829f7 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.3 2010/09/20 10:16:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_sub_image.vspx b/binsrc/yacutia/db_repl_sub_image.vspx
index e35caef..f3e11fb 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.4 2011/09/09 13:21:28 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_sub_new_inc.vspx b/binsrc/yacutia/db_repl_sub_new_inc.vspx
index 49196cd..9dd5951 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.3 2010/09/20 10:16:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/db_repl_trans.vspx b/binsrc/yacutia/db_repl_trans.vspx
index 8d031b5..83d9c63 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.3 2010/09/20 10:16:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/error.vspx b/binsrc/yacutia/error.vspx
index 35cca06..3fcaa63 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.3 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/fb_popup.vspx b/binsrc/yacutia/fb_popup.vspx
index 627a821..0dced2d 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.2 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/file_browser.xsl b/binsrc/yacutia/file_browser.xsl
index dfd3e94..cb6a232 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.3 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/file_save.vsp b/binsrc/yacutia/file_save.vsp
index 4248979..c4048da 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.3 2010/09/20 10:16:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/form.xsl b/binsrc/yacutia/form.xsl
index 14f1472..02bb9d3 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.2 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help.vspx b/binsrc/yacutia/help.vspx
index ddf05fc..5f7d782 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.3 2011/01/25 14:21:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help.xsl b/binsrc/yacutia/help.xsl
index 4cc1c69..5957915 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.2 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/account_create.xml b/binsrc/yacutia/help/account_create.xml
index 8d7cd1c..41775a3 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/caps_browser.xml b/binsrc/yacutia/help/caps_browser.xml
index f39a06d..7206129 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/dav_browser_search.xml b/binsrc/yacutia/help/dav_browser_search.xml
index d1b746c..5579397 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/http_server_management.xml b/binsrc/yacutia/help/http_server_management.xml
index 160e3b9..ce4e177 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/inifile.xml b/binsrc/yacutia/help/inifile.xml
index d4cebaa..93bb836 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/sec_auth_serv.xml b/binsrc/yacutia/help/sec_auth_serv.xml
index 2357017..f95eb4b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/soap_services.xml b/binsrc/yacutia/help/soap_services.xml
index 8006d76..2ffde6f 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/soap_services_edit.xml b/binsrc/yacutia/help/soap_services_edit.xml
index b1f04fb..900eb22 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/url_rewrite.xml b/binsrc/yacutia/help/url_rewrite.xml
index 3a96b40..50b0f45 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/vdb_obj_link_opts.xml b/binsrc/yacutia/help/vdb_obj_link_opts.xml
index 48e83ff..9474e50 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/help/xquery.xml b/binsrc/yacutia/help/xquery.xml
index 4bcce0c..9298b2b 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-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/hosted_grant.vspx b/binsrc/yacutia/hosted_grant.vspx
index a29ad03..6a4a539 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.3 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/hosted_import.vspx b/binsrc/yacutia/hosted_import.vspx
index bf36e1a..dd95348 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.3 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/hosted_modules.vspx b/binsrc/yacutia/hosted_modules.vspx
index cebd871..35b99d6 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.3 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/hosted_modules_load_results.vspx b/binsrc/yacutia/hosted_modules_load_results.vspx
index 06d5fb1..3650c73 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.2 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/hosted_modules_select.vspx b/binsrc/yacutia/hosted_modules_select.vspx
index 414d4db..46a2d5c 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.2 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/hosted_modules_select2.vspx b/binsrc/yacutia/hosted_modules_select2.vspx
index 832eadb..13e73a4 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.2 2010/09/20 10:16:42 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/hosted_modules_show_sql.vsp b/binsrc/yacutia/hosted_modules_show_sql.vsp
index 023fe96..df711fb 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.2 2010/09/20 10:16:43 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/hosted_page.vspx b/binsrc/yacutia/hosted_page.vspx
index 173f2a1..6eb4213 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.3 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/http_add_path.vspx b/binsrc/yacutia/http_add_path.vspx
index 65613fa..05d9b24 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.5 2010/11/19 16:43:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -122,6 +122,7 @@
<v:variable name="auth_opt" persist="0" type="varchar" default="''" />
<v:variable name="global_opts" persist="0" type="varchar" default="''" />
<v:variable name="is_dav" persist="0" type="integer" default="0" />
+ <v:variable name="is_https" persist="0" type="integer" default="0" />
<v:variable name="cors" persist="0" type="varchar" default="''" />
<v:variable name="cors_rej" persist="0" type="integer" default="0" />
</vm:variables>
@@ -201,6 +202,8 @@
self.vspuser := '';
self.soapuser := '';
}
+ if (exists (select 1 from HTTP_PATH where HP_HOST = self._httphost and HP_LISTEN_HOST = self._host and HP_SECURITY = 'SSL'))
+ self.is_https := 1;
]]>
</v:script>
</v:before-data-bind>
@@ -283,6 +286,13 @@
<v:item name="Proxy server" value="3" />
<v:item name="SOAP access point" value="4" />
<v:item name="SPARQL access point" value="5" />
+ <v:after-data-bind>
+ if (self.is_https and __proc_exists ('DB.DBA.WEBID_AUTH') is not null)
+ {
+ control.vsl_items := vector_concat (control.vsl_items, vector ('WebID protection'));
+ control.vsl_item_values := vector_concat (control.vsl_item_values, vector ('6'));
+ }
+ </v:after-data-bind>
</v:select-list>
</td>
</tr>
@@ -446,6 +456,22 @@
self.is_dav := 1;
self.noinherit := 'yes';
}
+ else if (t_mode = '6')
+ {
+ self.lpath := '';
+ self.ppath := '/';
+ self.defpage := '';
+ self.dirbrowsing := 0;
+ self.xmlexec := 0;
+ self.vspuser := 'dba';
+ self.soapuser := '';
+ self.auth_realm := 'GENERIC';
+ self.auth_func := 'DB.DBA.WEBID_AUTH';
+ self.after_func := '';
+ self.is_dav := 0;
+ self.security := 'SSL';
+ self.auth_opt := (select deserialize (HP_AUTH_OPTIONS) from HTTP_PATH where HP_HOST = self._httphost and HP_LISTEN_HOST = self._host and HP_SECURITY = 'SSL' and HP_LPATH = '/');
+ }
}
self.mode := 'add2';
self.vc_data_bind(e);
diff --git a/binsrc/yacutia/http_del_path.vspx b/binsrc/yacutia/http_del_path.vspx
index 727007e..05ada6b 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.4 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/http_edit_paths.vspx b/binsrc/yacutia/http_edit_paths.vspx
index a45b1aa..021f54b 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.4 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/http_host_clone.vspx b/binsrc/yacutia/http_host_clone.vspx
index 935d78e..6ec4154 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.4 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/http_host_edit.vspx b/binsrc/yacutia/http_host_edit.vspx
index b948266..7d4ed30 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.8 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -42,6 +42,7 @@
<v:variable name="lhost1" persist="0" type="varchar" default="null"/>
<v:variable name="vhost1" persist="0" type="varchar" default="null"/>
<v:variable name="key1" persist="0" type="varchar" default="'none'"/>
+ <v:variable name="extra_cert" persist="0" type="varchar" default="null"/>
<v:variable name="verify1" persist="0" type="varchar" default="0"/>
<v:variable name="port1" persist="0" type="varchar" default="'80'"/>
<v:variable name="stopit" persist="0" type="int" default="1"/>
@@ -63,6 +64,7 @@
cert := subseq (cert, 3);
self.key1 := cert;
self.verify1 := cast (get_keyword ('https_verify', opts, 0) as varchar);
+ self.extra_cert := get_keyword ('https_extra_chain_certificates', opts, null);
}
}
if (self.stopit and 1 = http_listen_host (self.lhost, 2))
@@ -195,6 +197,13 @@
</td>
</tr>
<tr>
+ <td>Extra Chain Certificates</td>
+ <td>
+ <v:text name="extra_cert1" value="--self.extra_cert" xhtml_size="50">
+ </v:text>
+ </td>
+ </tr>
+ <tr>
<td>HTTPS verify</td>
<td>
<v:select-list name="verify" value="--self.verify1" >
@@ -241,7 +250,8 @@
lhost := concat (lhost_if, ':', self.lhost_port.ufl_value);
lhost := replace (lhost, '0.0.0.0', '');
- if (self.vhost = vhost and lhost = self.lhost and self.key_list.ufl_value = self.key1 and self.verify1 = self.verify.ufl_value)
+ if (self.vhost = vhost and lhost = self.lhost and self.key_list.ufl_value = self.key1 and self.verify1 = self.verify.ufl_value and
+ self.extra_cert1.ufl_value = self.extra_cert)
goto same_host;
ssl_opts := null;
for select
@@ -257,7 +267,7 @@
msg := '';
VHOST_REMOVE (vhost_o, lhost_o, HP_LPATH, 0);
opts := deserialize (HP_AUTH_OPTIONS);
- yac_set_ssl_key (self.key_list.ufl_value, self.verify.ufl_value, opts);
+ yac_set_ssl_key (self.key_list.ufl_value, self.verify.ufl_value, self.extra_cert1.ufl_value, opts);
HP_AUTH_OPTIONS := serialize (opts);
if (self.key_list.ufl_value <> 'none')
{
diff --git a/binsrc/yacutia/http_listeners.vspx b/binsrc/yacutia/http_listeners.vspx
index 759666b..b5c01d2 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.3 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/http_serv_mgmt.vspx b/binsrc/yacutia/http_serv_mgmt.vspx
index 342c8e0..1f42f5e 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.7 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/http_serv_monitoring.vspx b/binsrc/yacutia/http_serv_monitoring.vspx
index 0b0d8c6..8a43436 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.2 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/http_tcn.vspx b/binsrc/yacutia/http_tcn.vspx
index f270e9f..a6a2285 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.2 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/http_url_rewrite.vspx b/binsrc/yacutia/http_url_rewrite.vspx
index d42088a..b00ed10 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.3 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ie.vspx b/binsrc/yacutia/ie.vspx
index 78f9664..c17b351 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.3 2010/09/20 10:16:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ie_browser.vspx b/binsrc/yacutia/ie_browser.vspx
index 01dd0df..a335714 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.2 2010/09/20 10:16:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ie_export.vspx b/binsrc/yacutia/ie_export.vspx
index ea753c7..200c2d2 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.3 2010/09/20 10:16:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ie_import.vspx b/binsrc/yacutia/ie_import.vspx
index c267284..5c8a319 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.3 2010/09/20 10:16:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/import_csv_1.vspx b/binsrc/yacutia/import_csv_1.vspx
index 071e324..32deb33 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.6 2010/09/20 10:16:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
@@ -35,6 +35,7 @@
</vm:menu>
<vm:variables>
<v:variable name="upl_file" type="varchar" default="null" persist="temp" />
+ <v:variable name="enc_file" type="varchar" default="null" persist="temp" />
</vm:variables>
<vm:header caption="CSV Import"/>
@@ -94,7 +95,7 @@
if (mode = 3 and e.ve_is_post and e.ve_button is not null and e.ve_button.vc_name = 'upl_btn')
{
declare i, ret integer;
- declare tmp, arr, url any;
+ declare tmp, arr, url, h any;
declare tmp_name, path varchar;
declare exit handler for sqlstate '*' {
self.vc_is_valid := 0;
@@ -120,7 +121,7 @@
}
path := concat('/DAV/temp/', tmp_name, '.csv');
}
- ses := http_client (url);
+ ses := http_client_ext (url, headers=>h);
if (tmp_name like '%.gz' and isstring (ses))
{
tmp_name := regexp_replace (tmp_name, '\.gz\x24', '');
@@ -142,6 +143,7 @@
else
{
self.upl_file := path;
+ self.enc_file := http_request_header (h, 'Content-Type', 'charset', null);
}
}
@@ -268,7 +270,7 @@
self.vc_is_valid := 0;
return;
}
- self.vc_redirect (sprintf ('import_csv_opts.vspx?path=%U&mode=%d', path, case when mode = 2 then 0 else 1 end));
+ self.vc_redirect (sprintf ('import_csv_opts.vspx?path=%U&mode=%d&enc=%U', path, case when mode = 2 then 0 else 1 end, case when self.enc_file is not null then self.enc_file else '' end));
]]>
</v:on-post>
</v:button>
diff --git a/binsrc/yacutia/import_csv_2.vspx b/binsrc/yacutia/import_csv_2.vspx
index b7a6427..889aa08 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.7 2011/05/20 11:49:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/import_csv_3.vspx b/binsrc/yacutia/import_csv_3.vspx
index a952e84..56821c4 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.6 2011/05/20 11:49:34 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/import_csv_opts.vspx b/binsrc/yacutia/import_csv_opts.vspx
index 7b1c2ce..025c300 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.7 2011/03/23 12:03:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
@@ -32,6 +32,7 @@
<vm:variables>
<v:variable name="path" persist="0" type="varchar" default="null" param-name="path"/>
<v:variable name="mode" persist="0" type="integer" default="0" param-name="mode"/>
+ <v:variable name="enc_file" persist="0" type="varchar" default="null" param-name="enc"/>
</vm:variables>
<vm:menu>
</vm:menu>
@@ -116,6 +117,8 @@
enc := 'UTF-16BE';
if (self.enc.ufl_value is null)
self.enc.ufl_value := enc;
+ if (enc is null and length (self.enc_file))
+ self.enc.ufl_value := self.enc_file;
control.vs_set_selected ();
}
]]></v:after-data-bind>
@@ -194,7 +197,9 @@
http_value (i + 1, 'td');
foreach (any c in r) do
{
- http_value (c, 'td');
+ declare v any;
+ v := charset_recode (c, enc, '_WIDE_');
+ http_value (v, 'td');
}
http ('</tr>');
}
diff --git a/binsrc/yacutia/inifile.vspx b/binsrc/yacutia/inifile.vspx
index e46537c..0c7998e 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.4 2011/01/25 14:21:43 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile.xml b/binsrc/yacutia/inifile.xml
index 5908b27..cdd8845 100644
--- a/binsrc/yacutia/inifile.xml
+++ b/binsrc/yacutia/inifile.xml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: inifile.xml,v 1.1.1.1.2.3 2010/09/20 10:16:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile.xsl b/binsrc/yacutia/inifile.xsl
index 4ea8848..ebf1a47 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.2 2010/09/20 10:16:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_autorepair.vspx b/binsrc/yacutia/inifile_autorepair.vspx
index f31ba57..86bd733 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.2 2010/09/20 10:16:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_autorepair_inc.vspx b/binsrc/yacutia/inifile_autorepair_inc.vspx
index 3b32434..5845e27 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_client.vspx b/binsrc/yacutia/inifile_client.vspx
index 0d376db..250a1bf 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_client_inc.vspx b/binsrc/yacutia/inifile_client_inc.vspx
index a7958cb..a2bc754 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_database.vspx b/binsrc/yacutia/inifile_database.vspx
index 43b15d4..d21d50b 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_database_inc.vspx b/binsrc/yacutia/inifile_database_inc.vspx
index 748309e..3d17931 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_engine.vspx b/binsrc/yacutia/inifile_engine.vspx
index c69d98d..c9ccc0e 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_engine_inc.vspx b/binsrc/yacutia/inifile_engine_inc.vspx
index 57b2e72..2a1d19f 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_http.vspx b/binsrc/yacutia/inifile_http.vspx
index d939d3e..308d481 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_http_inc.vspx b/binsrc/yacutia/inifile_http_inc.vspx
index 71219b9..abb4b0e 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_metadata.xml b/binsrc/yacutia/inifile_metadata.xml
index b03a0ae..dbbecfa 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.3 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_repl.vspx b/binsrc/yacutia/inifile_repl.vspx
index 1ca9069..55dcca5 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_repl_inc.vspx b/binsrc/yacutia/inifile_repl_inc.vspx
index a471002..aabddba 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_style.xsl b/binsrc/yacutia/inifile_style.xsl
index 22f7c9e..ef54379 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.2 2010/09/20 10:16:45 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_vdb.vspx b/binsrc/yacutia/inifile_vdb.vspx
index cf2af57..8bd8e3b 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.2 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifile_vdb_inc.vspx b/binsrc/yacutia/inifile_vdb_inc.vspx
index bb95261..a1d504c 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.2 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/inifiles_load.sql b/binsrc/yacutia/inifiles_load.sql
index 7f6550b..ded4afe 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.2 2010/09/20 10:16:46 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/isql.vspx b/binsrc/yacutia/isql.vspx
index 25d3281..b2b0e3f 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.3 2011/02/16 20:45:16 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/isql_main.vspx b/binsrc/yacutia/isql_main.vspx
index b36b55a..5b7cad8 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.2 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/isql_main_inc.vspx b/binsrc/yacutia/isql_main_inc.vspx
index d3a0a83..422d9e5 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.4 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ldap_import.vspx b/binsrc/yacutia/ldap_import.vspx
index e8f2bcd..d65f668 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.4 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ldap_import_1.vspx b/binsrc/yacutia/ldap_import_1.vspx
index c94f590..cc14fc2 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.4 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ldap_import_2.vspx b/binsrc/yacutia/ldap_import_2.vspx
index 28e3a48..89c26ba 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.3 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ldap_import_3.vspx b/binsrc/yacutia/ldap_import_3.vspx
index 7cf63be..21db1e1 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.3 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/ldap_server.vspx b/binsrc/yacutia/ldap_server.vspx
index c50645f..c286562 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.4 2010/09/20 10:16:46 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/link_tables.js b/binsrc/yacutia/link_tables.js
index 99708f5..f835f1d 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/logging.vspx b/binsrc/yacutia/logging.vspx
index d0cad3e..8e023a7 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_cli.vspx b/binsrc/yacutia/logging_cli.vspx
index d583d3d..e972dce 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.2 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_db.vspx b/binsrc/yacutia/logging_db.vspx
index fc4db56..b35b84d 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_disk.vspx b/binsrc/yacutia/logging_disk.vspx
index afed50f..a0629ce 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_http.vspx b/binsrc/yacutia/logging_http.vspx
index e4b4218..0e61874 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_index.vspx b/binsrc/yacutia/logging_index.vspx
index 4931caa..5c043bd 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_lock.vspx b/binsrc/yacutia/logging_lock.vspx
index c704ac4..2e3334e 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_page.vspx b/binsrc/yacutia/logging_page.vspx
index c2fd10b..db2e2cb 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_prof.vspx b/binsrc/yacutia/logging_prof.vspx
index 3410bc3..fa2c84b 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_space.vspx b/binsrc/yacutia/logging_space.vspx
index 580c863..1aff0e6 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_tab.vspx b/binsrc/yacutia/logging_tab.vspx
index 6a6c330..b9136a1 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.2 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_tab.xsl b/binsrc/yacutia/logging_tab.xsl
index 1837641..2c00a06 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.2 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/logging_view.vspx b/binsrc/yacutia/logging_view.vspx
index 62afb5f..73ed520 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.3 2010/09/20 10:16:47 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/main_tabs.vspx b/binsrc/yacutia/main_tabs.vspx
index c42a847..378aaa0 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.2 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/make.xsl b/binsrc/yacutia/make.xsl
index e8e69da..e492e4f 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.2 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/mapped_schema_xml.vspx b/binsrc/yacutia/mapped_schema_xml.vspx
index cdfe5b9..a15fe01 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.2 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/merge.xsl b/binsrc/yacutia/merge.xsl
index a2f3764..dbc6750 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.2 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/mkvad.ini b/binsrc/yacutia/mkvad.ini
index ecda69f..c821f9d 100644
--- a/binsrc/yacutia/mkvad.ini
+++ b/binsrc/yacutia/mkvad.ini
@@ -1,7 +1,7 @@
;
; mkvad.ini
;
-; $Id: mkvad.ini,v 1.1.1.1.2.1 2010/09/20 10:16:48 source Exp $
+; $Id$
;
; Configuration file for the creation of the demo database
;
diff --git a/binsrc/yacutia/mkvad.sh b/binsrc/yacutia/mkvad.sh
index ad25cff..e85718c 100755
--- a/binsrc/yacutia/mkvad.sh
+++ b/binsrc/yacutia/mkvad.sh
@@ -2,14 +2,14 @@
#
# mkvad.sh
#
-# $Id: mkvad.sh,v 1.20.2.9 2011/10/13 18:33:27 source Exp $
+# $Id$
#
# Creates a vad package for Virtuoso Conductor
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -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-2011 OpenLink Software\"/>" >> $STICKER
+echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 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 4b5e1bb..95def58 100644
--- a/binsrc/yacutia/mkvad.sql
+++ b/binsrc/yacutia/mkvad.sql
@@ -1,10 +1,10 @@
--
--- $Id: mkvad.sql,v 1.1.1.1.2.3 2010/09/20 10:16:48 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/mm_menu1.js b/binsrc/yacutia/mm_menu1.js
index 7c74e89..bace2d3 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/msg_news_conf.vspx b/binsrc/yacutia/msg_news_conf.vspx
index 96795a8..5b4c1d4 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.3 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_conf_global.vspx b/binsrc/yacutia/msg_news_conf_global.vspx
index 3ba905a..d14bf26 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.3 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_group_info.vspx b/binsrc/yacutia/msg_news_group_info.vspx
index 0438f59..22ffbca 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.2 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_group_message_body.vspx b/binsrc/yacutia/msg_news_group_message_body.vspx
index 11841aa..4f68652 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.3 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_group_messages.vspx b/binsrc/yacutia/msg_news_group_messages.vspx
index 8c122fb..1c0ba1c 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.3 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_group_messages_list.vspx b/binsrc/yacutia/msg_news_group_messages_list.vspx
index 13fe0de..052e791 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.2 2010/09/20 10:16:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_group_subscribe.vspx b/binsrc/yacutia/msg_news_group_subscribe.vspx
index 726ac6f..302812c 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.3 2010/09/20 10:16:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_groups.vspx b/binsrc/yacutia/msg_news_groups.vspx
index 5f2c581..736072c 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.3 2010/09/20 10:16:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_server_details.vspx b/binsrc/yacutia/msg_news_server_details.vspx
index f7537cd..f9084df 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.2 2010/09/20 10:16:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/msg_news_server_info.vspx b/binsrc/yacutia/msg_news_server_info.vspx
index 6ea0810..8e294ac 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.2 2010/09/20 10:16:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/page.xsl b/binsrc/yacutia/page.xsl
index 02fbad6..430491d 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.2 2010/09/20 10:16:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/persistent_xmlns.vspx b/binsrc/yacutia/persistent_xmlns.vspx
index 799bd4c..dfef571 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.3 2010/09/20 10:16:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/popup2_browser.vspx b/binsrc/yacutia/popup2_browser.vspx
index 7606c5d..21c8661 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.2 2010/09/20 10:16:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/popup_browser.vspx b/binsrc/yacutia/popup_browser.vspx
index 7178d74..245e071 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.4 2010/09/20 10:16:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/r2rml_gen.vspx b/binsrc/yacutia/r2rml_gen.vspx
new file mode 100644
index 0000000..0587f95
--- /dev/null
+++ b/binsrc/yacutia/r2rml_gen.vspx
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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;
+ stat := '00000';
+ exec ('sparql ' || self.cr_view.ufl_value, stat, msg, vector (), 0, meta, data);
+ self.exec_ret := data;
+ if (stat <> '00000')
+ self.exec_ret := vector (vector (stat, msg));
+ 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
new file mode 100644
index 0000000..0181d79
--- /dev/null
+++ b/binsrc/yacutia/r2rml_import.vspx
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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 graph iri(?:_graph);
+ }
+
+ is_ttl := 1;
+ {
+ declare continue handler for SQLSTATE '*'
+ {
+ is_ttl := 0;
+ };
+ DB.DBA.TTLP (_file, _graph, _graph, 4096);
+ }
+ 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
new file mode 100644
index 0000000..eff5a07
--- /dev/null
+++ b/binsrc/yacutia/r2rml_validate.vspx
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - $Id$
+ -
+ - 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;
+ stat := '00000';
+ exec ('DB.DBA.OVL_VALIDATE (?, ''http://www.w3.org/ns/r2rml#OVL'')', stat, msg, vector (self.graph), 0, meta, data);
+ if (stat <> '00000')
+ data := vector (vector ('', stat, msg));
+ 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 17be0f7..df8c7c9 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.5 2011/05/02 14:13:40 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2010 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/rdf_console.vspx b/binsrc/yacutia/rdf_console.vspx
index 817e53c..c02ac2c 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.6 2010/11/08 11:45:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
@@ -46,7 +46,7 @@
<vm:pagebody>
<v:on-init><![CDATA[
if (self.del is not null)
- delete from DB.DBA.RDF_META_CARTRIDGES_LOG where ML_SESSION = self.del;
+ delete from DB.DBA.RDF_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_META_CARTRIDGES_LOG) x do {
+ for select mses from (select distinct ML_SESSION as mses from DB.DBA.RDF_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_META_CARTRIDGES_LOG where ML_SESSION = mses do
+ for select ML_ID, ML_PROC from DB.DBA.RDF_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_META_CARTRIDGES_LOG where ML_SESSION = self.detail and ML_ID = self.idn do {
+ for select * from DB.DBA.RDF_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 2197647..fdd9b42 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.10 2011/06/09 15:34:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -65,7 +65,7 @@
<td class="page_tab_selected" align="center" nowrap="1">
Extractor Cartridges
</td>
- <?vsp if (check_package('rdf_mappers')) { ?>
+ <?vsp if (check_package('rdf_mappers') or check_package ('cartridges')) { ?>
<td class="page_tab" align="center" nowrap="1">
<v:url name="url2" value="Meta Cartridges" format="%s" url="rdf_filters_pp.vspx" xhtml_class="uddi"/>
</td>
diff --git a/binsrc/yacutia/rdf_filters_pp.vspx b/binsrc/yacutia/rdf_filters_pp.vspx
index f8a05de..516cf83 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.9 2011/06/09 15:34:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -67,7 +67,7 @@
<td class="page_tab_selected" align="center" nowrap="1">
Meta Cartridges
</td>
- <?vsp if (check_package('rdf_mappers')) { ?>
+ <?vsp if (check_package('rdf_mappers') or check_package ('cartridges')) { ?>
<td class="page_tab" align="center" nowrap="1">
<v:url name="url2" value="Stylesheets" format="%s" url="sparql_filters.vspx" xhtml_class="uddi"/>
</td>
diff --git a/binsrc/yacutia/rdf_import.vspx b/binsrc/yacutia/rdf_import.vspx
index 15030dc..a06286f 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.5 2011/10/17 09:55:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -36,7 +36,7 @@
<v:variable name="message" default="null" type="varchar" persist="0"/>
</vm:variables>
<vm:menu>
- <vm:menuitem value="Linked Data Objects"/>
+ <vm:menuitem value="Linked Data"/>
</vm:menu>
<vm:header caption="Quad Store Upload"/>
<vm:pagebody>
@@ -128,7 +128,13 @@ declare _file, _graph, is_ttl, is_xml any;
exec (sprintf ('sparql load "%s" into <%s>', uri, _graph));
goto end_post;
}
-
+ declare magic any;
+ if (length (_file) > 2)
+ {
+ magic := subseq (_file, 0, 2);
+ if (magic[0] = 0hex1f and magic[1] = 0hex8b)
+ _file := gzip_uncompress (_file);
+ }
is_ttl := 1;
{
declare continue handler for SQLSTATE '*'
diff --git a/binsrc/yacutia/rdf_psh_subs.vspx b/binsrc/yacutia/rdf_psh_subs.vspx
index 1b13c30..60df6d4 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.6 2011/10/25 23:34:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -36,7 +36,7 @@
<v:variable name="message" default="null" type="varchar" persist="0"/>
</vm:variables>
<vm:menu>
- <vm:menuitem value="Linked Data Objects"/>
+ <vm:menuitem value="Linked Data"/>
</vm:menu>
<vm:header caption="Subscriptions (PHSB)"/>
<vm:pagebody>
diff --git a/binsrc/yacutia/rdf_schemas.vspx b/binsrc/yacutia/rdf_schemas.vspx
index c5a90f7..7922514 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.5 2010/09/20 10:16:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/rdf_void.vspx b/binsrc/yacutia/rdf_void.vspx
index bb9d2f5..a243d46 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.2 2010/09/20 10:16:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_control.vspx b/binsrc/yacutia/robot_control.vspx
index 93119ea..dd275a6 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.9 2011/05/02 14:13:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_edit.vspx b/binsrc/yacutia/robot_edit.vspx
index 335633e..c138c44 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.14 2011/05/02 14:13:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_export.vspx b/binsrc/yacutia/robot_export.vspx
index 98b7aa4..4db01a5 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.3 2010/09/20 10:16:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_process.vspx b/binsrc/yacutia/robot_process.vspx
index 340b455..5796f69 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.3 2010/09/20 10:16:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_queues.vspx b/binsrc/yacutia/robot_queues.vspx
index 2770733..af80466 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.7 2011/02/16 20:45:23 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_sched.vspx b/binsrc/yacutia/robot_sched.vspx
index d906bbb..b8832f8 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.3 2010/09/20 10:16:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_sites.vspx b/binsrc/yacutia/robot_sites.vspx
index a4842ed..c364d19 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.6 2011/02/16 20:45:24 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_status.vspx b/binsrc/yacutia/robot_status.vspx
index c9233ca..badfe2f 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.7 2011/03/08 13:38:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/robot_urls_list.vspx b/binsrc/yacutia/robot_urls_list.vspx
index 966350e..25883b0 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.3 2010/09/20 10:16:50 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/role_remove.vspx b/binsrc/yacutia/role_remove.vspx
index 2d382d8..1b30d05 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.3 2010/09/20 10:16:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/role_remove_inc.vspx b/binsrc/yacutia/role_remove_inc.vspx
index 895874f..fde5fa4 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.3 2010/09/20 10:16:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/roles.vspx b/binsrc/yacutia/roles.vspx
index 5d82a5d..4f35344 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.3 2010/09/20 10:16:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/roles_inc.vspx b/binsrc/yacutia/roles_inc.vspx
index 85d3b9f..87e2c4a 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.2 2010/09/20 10:16:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sec_acl_edit.vspx b/binsrc/yacutia/sec_acl_edit.vspx
index 942c952..82bf06f 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.4 2010/09/20 10:16:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sec_acl_edit_sp.vspx b/binsrc/yacutia/sec_acl_edit_sp.vspx
index ae4a500..4218e7b 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.2 2011/10/13 18:33:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sec_auth_serv.vspx b/binsrc/yacutia/sec_auth_serv.vspx
index e020c01..ddf3418 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.9 2011/10/13 18:33:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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">
@@ -188,8 +188,8 @@
}
?>
<!--?vsp if (DB.DBA.VAD_CHECK_VERSION ('Framework') is not null) { ?-->
- <!--td class="<?V self.astyle ('SPARQL-SSL') ?>" align="center">
- <v:url xhtml_style="page_tab" url="sparql_acl.vspx" value="SPARQL-SSL" render-only="1"/>
+ <!--td class="<?V self.astyle ('WebID ACLs') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sparql_acl.vspx" value="WebID ACLs" render-only="1"/>
</td-->
<!--?vsp } ?-->
<!--td class="page_tab_empty" align="center" width="100%">
@@ -462,7 +462,7 @@
</v:select-list>
</td>
</tr>
- <?vsp if (self.acl_name <> 'HTTP' and self.acl_name <> 'NEWS') { ?>
+ <?vsp if (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 4bf0e8c..03a612c 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.2 2011/10/13 18:33:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -143,18 +143,24 @@
<tr>
<?vsp
- if (vad_check_version ('rdf_mappers') is not null)
+ if (vad_check_version ('rdf_mappers') is not null or check_package ('cartridges'))
{
?>
<td class="<?V self.astyle ('Sponger') ?>" align="center">
<v:url xhtml_style="page_tab" url="sec_auth_serv_sp.vspx?acl=Sponger" value="Sponger" render-only="1"/>
</td>
+ <td class="<?V self.astyle ('Groups') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_sponger_1.vspx" value="Groups" render-only="1"/>
+ </td>
+ <td class="<?V self.astyle ('Cartridges') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_sponger_2.vspx" value="Cartridges" render-only="1"/>
+ </td>
<?vsp
}
?>
- <?vsp if (DB.DBA.VAD_CHECK_VERSION ('Framework') is not null) { ?>
- <td class="<?V self.astyle ('SPARQL-SSL') ?>" align="center">
- <v:url xhtml_style="page_tab" url="sparql_acl.vspx" value="SPARQL-SSL" render-only="1"/>
+ <?vsp if (DB.DBA.VAD_CHECK_VERSION ('Framework') is not null or DB.DBA.VAD_CHECK_VERSION ('policy_manager') is not null) { ?>
+ <td class="<?V self.astyle ('WebID ACLs') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sparql_acl.vspx" value="WebID ACLs" render-only="1"/>
</td>
<?vsp } ?>
diff --git a/binsrc/yacutia/sec_auth_sponger_1.vspx b/binsrc/yacutia/sec_auth_sponger_1.vspx
new file mode 100644
index 0000000..fa4c5b2
--- /dev/null
+++ b/binsrc/yacutia/sec_auth_sponger_1.vspx
@@ -0,0 +1,263 @@
+<?xml version="1.0"?>
+<!--
+ -
+ - $Id: sec_auth_sponger_1.vspx,v 1.1 2012/05/23 15:47:17 mitko 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="auth_serv"
+ decor="yacutia_decor.vspx"
+ style="yacutia_style.xsl"
+ 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>Virtuoso Access Control Lists</vm:pagetitle>
+ <vm:pagewrapper>
+ <vm:variables>
+ <v:variable persist="0" name="acl_name" type="varchar" default="'Groups'" />
+ <v:variable persist="0" name="data" type="any" default="null" />
+ <v:variable persist="0" name="acl_list_mta" type="any" default="null" />
+ <v:variable persist="0" name="edit" type="varchar" default="null" param-name="edit"/>
+ <v:variable persist="0" name="del" type="varchar" default="null" param-name="del"/>
+ <v:variable persist="0" name="addnew" type="int" default="0" param-name="add"/>
+ <v:variable persist="0" name="wdel" type="varchar" default="null" param-name="wdel"/>
+ <v:variable persist="0" name="wdata" type="any" default="null" param-name="d"/>
+
+ </vm:variables>
+ <vm:menu>
+ <vm:menuitem name="HTTP" value="Access Control Lists"/>
+ </vm:menu>
+ <vm:header caption="Access Control Lists">
+ <!--vm:help id="sec_auth_serv_sp" sect=""/-->
+ </vm:header>
+ <vm:pagebody>
+ <v:method name="astyle" arglist="in cmp varchar">
+ <![CDATA[
+ if ((self.acl_name = cmp))
+ return 'page_tab_selected';
+ return 'page_tab';
+ ]]>
+ </v:method>
+ <v:on-init>
+ <![CDATA[
+ if (self.edit is not null and self.vc_event.ve_is_post = 0)
+ {
+ self.data := (select vector_agg (AG_WEBID) from RDF_WEBID_ACL_GROUPS where AG_GROUP = self.edit);
+ }
+ if (self.wdata is not null)
+ self.data := deserialize (decode_base64 (self.wdata));
+ else if (self.data is null)
+ self.data := vector ();
+ if (self.del is not null)
+ {
+ delete from RDF_WEBID_ACL_GROUPS where AG_GROUP = self.del;
+ self.del := null;
+ }
+ if (self.wdel is not null)
+ {
+ declare newd any;
+ newd := vector ();
+ foreach (any w in self.data) do
+ {
+ if (w <> self.wdel)
+ newd := vector_concat (newd, vector (w));
+ }
+ self.data := newd;
+ }
+ ]]>
+ </v:on-init>
+ <v:form name="page_form" type="simple" method="POST">
+ <!-- top of security layout -->
+ <table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
+ <tr valign='top'>
+ <td>
+ <table cellpadding='10' cellspacing='0' border='0' width='100%'>
+ <tr>
+ <td>
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <!--td class="page_tab" align="center">
+
+ <v:url xhtml_style="page_tab" url="sec_pki_1.vspx" value="Public Key Infrastructure" render-only="1"/>
+ </td-->
+ <td class="page_tab_selected" align="center">
+ Access Control
+ </td>
+ <td class="page_tab_empty" align="right" width="100%">
+ </td>
+ </tr>
+ </table>
+ <table class="tab_page">
+ <tr>
+ <td valign="top">
+ <!-- end of top security layout -->
+ <table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
+ <tr valign='top'>
+ <td>
+ <table cellpadding='10' cellspacing='0' border='0' width='100%'>
+ <tr>
+ <td>
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <!--td class="<?V self.astyle ('Sponger') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_serv_sp.vspx?acl=Sponger" value="Sponger" render-only="1"/>
+ </td-->
+ <td class="<?V self.astyle ('Groups') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_sponger_1.vspx" value="Groups" render-only="1"/>
+ </td>
+ <?vsp
+ if (vad_check_version ('rdf_mappers') is not null or check_package ('cartridges'))
+ {
+ ?>
+ <td class="<?V self.astyle ('Cartridges') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_sponger_2.vspx" value="Cartridges" render-only="1"/>
+ </td>
+ <?vsp
+ }
+ ?>
+ <?vsp if (DB.DBA.VAD_CHECK_VERSION ('Framework') is not null or DB.DBA.VAD_CHECK_VERSION ('policy_manager') is not null) { ?>
+ <td class="<?V self.astyle ('WebID ACLs') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sparql_acl.vspx" value="WebID ACLs" render-only="1"/>
+ </td>
+ <?vsp } ?>
+
+ <td class="page_tab_empty" align="right" width="100%">
+ </td>
+ </tr>
+ </table>
+ <table class="tab_page">
+ <tr>
+ <td valign="top">
+ <!-- MAIN -->
+ <v:template name="list" type="simple" condition="self.addnew = 0 and self.edit is null">
+ <table class="listing">
+ <tr class="listing_header_row"><th>Group URI</th><th><v:url value="Add New" name="uadd" url="sec_auth_sponger_1.vspx?add=1" render-only="1"/></th></tr>
+ <?vsp
+ declare ctr int;
+ for select distinct AG_GROUP from RDF_WEBID_ACL_GROUPS do { ?>
+ <tr>
+ <td><?V AG_GROUP ?></td>
+ <td>
+ <v:url value="Edit" name="udel" url="--sprintf ('sec_auth_sponger_1.vspx?edit=%U', AG_GROUP)" render-only="1"/>
+ <v:url value="Delete" name="udel" url="--sprintf ('sec_auth_sponger_1.vspx?del=%U', AG_GROUP)" render-only="1"/>
+ </td>
+ </tr>
+ <?vsp ctr := ctr + 1; }
+ if (ctr = 0)
+ http ('<tr><td colspan="2">No groups defined</td></tr>');
+ ?>
+ </table>
+ </v:template>
+ <v:template name="tadd" type="simple" condition="self.addnew = 1 or self.edit is not null">
+ <div>
+ <label for="gname">Group URI</label> <v:text name="gname" value="--self.edit" xhtml_id="gname" xhtml_size="100"/> <br/>
+ <!--label for="gdesc">Group Description</label> <v:text name="gdesc" value="" xhtml_id="gdesc"/> <br/-->
+
+ <table class="listing">
+ <tr class="listing_header_row"><th>WebID URI</th><th></th></tr>
+ <?vsp
+ declare ctr int;
+ foreach (any w in self.data) do { ?>
+ <tr>
+ <td><?V w ?></td>
+ <td>
+ <v:url value="Delete" name="wdel" url="--sprintf ('sec_auth_sponger_1.vspx?%s&wdel=%U&d=%U',
+ case when self.addnew = 1 then 'add=1' else sprintf ('edit=%U', self.edit) end, w, encode_base64 (serialize (self.data)))" render-only="1"/>
+ </td>
+ </tr>
+ <?vsp ctr := ctr + 1; }
+ if (ctr = 0)
+ http ('<tr><td colspan="2">No WebIDs present</td></tr>');
+ ?>
+ </table> <br />
+ <label for="wname">WebID</label> <v:text name="wname" value="" xhtml_id="wname" xhtml_size="100"/>
+ <v:button action="simple" name="add_new" value="Add New">
+ <v:on-post>
+ self.wname.ufl_value := trim (self.wname.ufl_value);
+ if (not length (self.wname.ufl_value))
+ {
+ self.vc_is_valid := 0;
+ self.vc_error_message := 'Can not have empty WebID URI';
+ return 0;
+ }
+ if (not position (self.wname.ufl_value, self.data))
+ self.data := vector_concat (self.data, vector (self.wname.ufl_value));
+ self.wname.ufl_value := '';
+ </v:on-post>
+ </v:button>
+ <br/>
+ <v:button action="simple" name="cancel_new" value="Cancel">
+ <v:on-post>
+ self.vc_redirect ('sec_auth_sponger_1.vspx');
+ </v:on-post>
+ </v:button>
+ <v:button action="simple" name="save_new" value="Save">
+ <v:on-post>
+ self.gname.ufl_value := trim (self.gname.ufl_value);
+ if (not length (self.gname.ufl_value))
+ {
+ self.vc_is_valid := 0;
+ self.vc_error_message := 'Can not have empty Group URI';
+ return 0;
+ }
+ if (not length (self.data))
+ {
+ self.vc_is_valid := 0;
+ self.vc_error_message := 'Must have at least one WebID per group';
+ return 0;
+ }
+ delete from RDF_WEBID_ACL_GROUPS where AG_GROUP = self.gname.ufl_value;
+ foreach (any w in self.data) do
+ {
+ insert soft RDF_WEBID_ACL_GROUPS (AG_GROUP, AG_WEBID) values (self.gname.ufl_value, w);
+ }
+ commit work;
+ self.vc_redirect ('sec_auth_sponger_1.vspx');
+ </v:on-post>
+ </v:button>
+ </div>
+ </v:template>
+ <!-- END -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <!-- bottom of security layout -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <!-- end of bottom security layout -->
+ </v:form>
+ </vm:pagebody>
+ </vm:pagewrapper>
+</v:page>
+
diff --git a/binsrc/yacutia/sec_auth_sponger_2.vspx b/binsrc/yacutia/sec_auth_sponger_2.vspx
new file mode 100644
index 0000000..cf9f857
--- /dev/null
+++ b/binsrc/yacutia/sec_auth_sponger_2.vspx
@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<!--
+ -
+ - $Id: sec_auth_sponger_2.vspx,v 1.1 2012/05/23 15:47:17 mitko 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="auth_serv"
+ decor="yacutia_decor.vspx"
+ style="yacutia_style.xsl"
+ 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>Virtuoso Access Control Lists</vm:pagetitle>
+ <vm:pagewrapper>
+ <vm:variables>
+ <v:variable persist="0" name="acl_name" type="varchar" default="'Cartridges'" />
+ <v:variable persist="0" name="data" type="any" default="null" />
+ <v:variable persist="0" name="acl_list_mta" type="any" default="null" />
+ <v:variable persist="0" name="edit" type="varchar" default="null" param-name="edit"/>
+ <v:variable persist="0" name="del" type="varchar" default="null" param-name="del"/>
+ <v:variable persist="0" name="addnew" type="int" default="0" param-name="add"/>
+ <v:variable persist="0" name="wdel" type="varchar" default="null" param-name="wdel"/>
+ <v:variable persist="0" name="wdata" type="any" default="null" param-name="d"/>
+
+ </vm:variables>
+ <vm:menu>
+ <vm:menuitem name="HTTP" value="Access Control Lists"/>
+ </vm:menu>
+ <vm:header caption="Access Control Lists">
+ <!--vm:help id="sec_auth_serv_sp" sect=""/-->
+ </vm:header>
+ <vm:pagebody>
+ <![CDATA[
+ <script language="JavaScript" src="admin_utils.js"></script>
+ ]]>
+ <v:method name="astyle" arglist="in cmp varchar">
+ <![CDATA[
+ if ((self.acl_name = cmp))
+ return 'page_tab_selected';
+ return 'page_tab';
+ ]]>
+ </v:method>
+ <v:on-init>
+ <![CDATA[
+ if (self.del is not null)
+ {
+ delete from RDF_CARTRIDGES_ACL where RC_WEBID = self.del;
+ self.del := null;
+ }
+ ]]>
+ </v:on-init>
+ <v:form name="page_form" type="simple" method="POST">
+ <!-- top of security layout -->
+ <table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
+ <tr valign='top'>
+ <td>
+ <table cellpadding='10' cellspacing='0' border='0' width='100%'>
+ <tr>
+ <td>
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <!--td class="page_tab" align="center">
+
+ <v:url xhtml_style="page_tab" url="sec_pki_1.vspx" value="Public Key Infrastructure" render-only="1"/>
+ </td-->
+ <td class="page_tab_selected" align="center">
+ Access Control
+ </td>
+ <td class="page_tab_empty" align="right" width="100%">
+ </td>
+ </tr>
+ </table>
+ <table class="tab_page">
+ <tr>
+ <td valign="top">
+ <!-- end of top security layout -->
+ <table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
+ <tr valign='top'>
+ <td>
+ <table cellpadding='10' cellspacing='0' border='0' width='100%'>
+ <tr>
+ <td>
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <!--td class="<?V self.astyle ('Sponger') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_serv_sp.vspx?acl=Sponger" value="Sponger" render-only="1"/>
+ </td-->
+ <td class="<?V self.astyle ('Groups') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_sponger_1.vspx" value="Groups" render-only="1"/>
+ </td>
+ <?vsp
+ if (vad_check_version ('rdf_mappers') is not null or check_package ('cartridges'))
+ {
+ ?>
+ <td class="<?V self.astyle ('Cartridges') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_sponger_2.vspx" value="Cartridges" render-only="1"/>
+ </td>
+ <?vsp
+ }
+ ?>
+ <?vsp if (DB.DBA.VAD_CHECK_VERSION ('Framework') is not null or DB.DBA.VAD_CHECK_VERSION ('policy_manager') is not null) { ?>
+ <td class="<?V self.astyle ('WebID ACLs') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sparql_acl.vspx" value="WebID ACLs" render-only="1"/>
+ </td>
+ <?vsp } ?>
+
+ <td class="page_tab_empty" align="right" width="100%">
+ </td>
+ </tr>
+ </table>
+ <table class="tab_page">
+ <tr>
+ <td valign="top">
+ <!-- MAIN -->
+ <v:template name="list" type="simple" condition="self.addnew = 0 and self.edit is null">
+ <table class="listing">
+ <tr class="listing_header_row"><th>WebID/Group URI</th><th><v:url value="Add New" name="uadd" url="sec_auth_sponger_2.vspx?add=1" enabled="--(select 1 from FOAF_SSL_ACL where FS_REALM = 'Virtuoso Sponger')"/></th></tr>
+ <?vsp
+ declare ctr int;
+ for select distinct RC_WEBID from RDF_CARTRIDGES_ACL do { ?>
+ <tr>
+ <td><?V RC_WEBID ?></td>
+ <td>
+ <v:url value="Edit" name="udel" url="--sprintf ('sec_auth_sponger_2.vspx?edit=%U', RC_WEBID)" render-only="1"/>
+ <v:url value="Delete" name="udel" url="--sprintf ('sec_auth_sponger_2.vspx?del=%U', RC_WEBID)" render-only="1"/>
+ </td>
+ </tr>
+ <?vsp ctr := ctr + 1; }
+ if (ctr = 0)
+ http ('<tr><td colspan="2">No permissions defined</td></tr>');
+ ?>
+ </table>
+ </v:template>
+ <v:template name="tadd" type="simple" condition="self.addnew = 1 or self.edit is not null">
+ <div>
+ <label for="gname">WebID/Group URI pattern</label>
+ <!--v:text name="gname" value="-#-self.edit" xhtml_id="gname" xhtml_size="100"/-->
+ <v:data-list name="gname"
+ sql="select FS_URI from FOAF_SSL_ACL where FS_REALM = 'Virtuoso Sponger'"
+ key-column="FS_URI"
+ value-column="FS_URI"
+ value="--self.edit" />
+ <br/>
+ <table class="listing" rules="groups">
+ <tr class="listing_header_row">
+ <th style="width:5px;" nowrap="1"><input type="checkbox" name="select_all" value="Select All" onClick="selectAllCheckboxes_mask(this.form, this, 'cb_item')"/></th>
+ <th>Seq#</th>
+ <th colspan="2">Description</th>
+ </tr>
+ <v:data-source name="ds_maps" expression-type="sql" nrows="1000" initial-offset="0">
+ <v:param name="wid" value="--self.edit"/>
+ <v:before-data-bind>
+ <![CDATA[
+ control.ds_sql := 'select RM_PATTERN, RM_TYPE, RM_DESCRIPTION, RM_ID, RM_HOOK, RM_KEY, RC_PERMISSION, RM_OPTIONS from DB.DBA.SYS_RDF_MAPPERS left outer join (select * from RDF_CARTRIDGES_ACL where RC_WEBID = ? ) x on (RM_HOOK = RC_CART) order by 4';
+ ]]>
+ </v:before-data-bind>
+ </v:data-source>
+
+ <v:data-set name="maps" data-source="self.ds_maps" scrollable="1">
+ <v:template name="maps_rep" type="repeat">
+ <v:template name="maps_brows" type="browse">
+ <tr class="<?V case when mod(control.te_ctr, 2) then 'listing_row_odd' else 'listing_row_even' end ?>">
+ <td>
+ <v:check-box name="cb_item" value="--(control.vc_parent as vspx_row_template).te_rowset[3]" initial-checked="--(control.vc_parent as vspx_row_template).te_rowset[6]"/>
+ </td>
+ <td>
+ <v:label name="la2" value="--(control.vc_parent as vspx_row_template).te_rowset[3]" />
+ </td>
+ <td>
+ <v:label name="la3" value="--(control.vc_parent as vspx_row_template).te_rowset[2]" />
+ </td>
+ </tr>
+ </v:template>
+ </v:template>
+ <v:template name="maps_footer" type="simple">
+ <tr>
+ <td colspan="6" class="listing_col_action">
+ <vm:ds-navigation data-set="maps" type="set" />
+ </td>
+ </tr>
+ </v:template>
+ </v:data-set>
+ </table>
+ <v:button action="simple" name="cancel_new" value="Cancel">
+ <v:on-post>
+ self.vc_redirect ('sec_auth_sponger_2.vspx');
+ </v:on-post>
+ </v:button>
+ <v:button action="simple" name="save_new" value="Save">
+ <v:on-post><![CDATA[
+ declare N int;
+ self.gname.ufl_value := trim (self.gname.ufl_value);
+ if (not length (self.gname.ufl_value))
+ {
+ self.vc_is_valid := 0;
+ self.vc_error_message := 'Can not have empty Group URI';
+ return 0;
+ }
+ delete from RDF_CARTRIDGES_ACL where RC_WEBID = self.gname.ufl_value;
+ for (N := 0; N < length(params); N := N + 2)
+ {
+ if (params[N] like '%:cb_item%')
+ {
+ declare cid any;
+ cid := (select RM_HOOK from SYS_RDF_MAPPERS where RM_ID = cast (params[N+1] as integer));
+ insert into RDF_CARTRIDGES_ACL (RC_WEBID, RC_CART) values (self.gname.ufl_value, cid);
+ }
+ }
+ commit work;
+ self.vc_redirect ('sec_auth_sponger_2.vspx');
+ ]]></v:on-post>
+ </v:button>
+ </div>
+ </v:template>
+ <!-- END -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <!-- bottom of security layout -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <!-- end of bottom security layout -->
+ </v:form>
+ </vm:pagebody>
+ </vm:pagewrapper>
+</v:page>
+
diff --git a/binsrc/yacutia/sec_pki_1.vspx b/binsrc/yacutia/sec_pki_1.vspx
index c8e87e6..dcaf44e 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.7 2011/10/28 21:44:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -187,6 +187,11 @@
self.vc_redirect ('sec_pki_drop.vspx');
]]></v:on-post>
</v:button>
+ <v:button action="simple" name="dwncert" value="Download Certificate" enabled="--xenc_key_exists ('id_rsa')">
+ <v:on-post><![CDATA[
+ self.vc_redirect ('sec_pki_download.vsp?key=id_rsa');
+ ]]></v:on-post>
+ </v:button>
<!-- bottom of security layout -->
</div> <!-- #pki_form -->
</td>
diff --git a/binsrc/yacutia/sec_pki_2.vspx b/binsrc/yacutia/sec_pki_2.vspx
index adcf52b..e547b33 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.10 2011/10/28 21:44:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -38,6 +38,7 @@
<v:variable name="lhost1" persist="0" type="varchar" default="null"/>
<v:variable name="vhost1" persist="0" type="varchar" default="null"/>
<v:variable name="key1" persist="0" type="varchar" default="'none'"/>
+ <v:variable name="extra_cert" persist="0" type="varchar" default="null"/>
<v:variable name="verify1" persist="0" type="varchar" default="0"/>
<v:variable name="port1" persist="0" type="varchar" default="'443'"/>
<v:variable name="stopit" persist="0" type="int" default="1"/>
@@ -63,6 +64,7 @@
cert := subseq (cert, 3);
self.key1 := cert;
self.verify1 := cast (get_keyword ('https_verify', opts, 0) as varchar);
+ self.extra_cert := get_keyword ('https_extra_chain_certificates', opts, null);
}
}
if (self.stopit and 1 = http_listen_host (self.lhost, 2))
@@ -259,7 +261,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));
@@ -271,6 +273,13 @@
</td>
</tr>
<tr>
+ <td>Extra Chain Certificates</td>
+ <td>
+ <v:text name="extra_cert1" value="--self.extra_cert" xhtml_size="50">
+ </v:text>
+ </td>
+ </tr>
+ <tr>
<td>HTTPS verify</td>
<td>
<v:select-list name="verify" value="--self.verify1">
@@ -365,16 +374,16 @@
{
declare opts varchar;
opts := vector ();
- yac_set_ssl_key (self.key_list.ufl_value, self.verify.ufl_value, opts);
+ yac_set_ssl_key (self.key_list.ufl_value, self.verify.ufl_value, self.extra_cert1.ufl_value, opts);
VHOST_DEFINE (vhost=>vhost, lhost=>lhost, lpath=>'/', ppath=>'/', sec=>'SSL', auth_opts=>opts);
goto same_host;
}
- if (self.vhost = vhost and lhost = self.lhost and self.key_list.ufl_value = self.key1 and self.verify1 = self.verify.ufl_value)
+ if (self.vhost = vhost and lhost = self.lhost and self.key_list.ufl_value = self.key1 and self.verify1 = self.verify.ufl_value and self.extra_cert1.ufl_value = self.extra_cert)
{
declare opts varchar;
opts := vector ();
- yac_set_ssl_key (self.key_list.ufl_value, self.verify.ufl_value, opts);
+ yac_set_ssl_key (self.key_list.ufl_value, self.verify.ufl_value, self.extra_cert1.ufl_value, opts);
http_listen_host (lhost, 0, opts);
goto same_host;
}
@@ -392,7 +401,7 @@
msg := '';
VHOST_REMOVE (vhost_o, lhost_o, HP_LPATH, 0);
opts := deserialize (HP_AUTH_OPTIONS);
- yac_set_ssl_key (self.key_list.ufl_value, self.verify.ufl_value, opts);
+ yac_set_ssl_key (self.key_list.ufl_value, self.verify.ufl_value, self.extra_cert1.ufl_value, opts);
HP_AUTH_OPTIONS := serialize (opts);
if (self.key_list.ufl_value <> 'none')
{
diff --git a/binsrc/yacutia/sec_pki_2_conf.vspx b/binsrc/yacutia/sec_pki_2_conf.vspx
index eeeba10..42f1997 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.3 2010/09/20 10:16:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sec_pki_3.vspx b/binsrc/yacutia/sec_pki_3.vspx
index b675183..5d56067 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.6 2011/10/28 21:44:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sec_pki_4.vspx b/binsrc/yacutia/sec_pki_4.vspx
index 6e2f302..ad19fe2 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.4 2011/10/28 21:44:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sec_pki_download.vsp b/binsrc/yacutia/sec_pki_download.vsp
new file mode 100644
index 0000000..c9b0749
--- /dev/null
+++ b/binsrc/yacutia/sec_pki_download.vsp
@@ -0,0 +1,15 @@
+<?vsp
+ declare ret, username any;
+
+ username := {?'user'};
+
+ if (username is not null)
+ set_user_id (username);
+
+ ret := xenc_pem_export ({?'key'});
+
+ http_header (sprintf ('Content-Type: application/octet-stream\r\nContent-Disposition: attachment; filename=%U.pem\r\n', {?'key'}));
+ http_rewrite ();
+ http (ret);
+ return;
+?>
diff --git a/binsrc/yacutia/sec_pki_drop.vspx b/binsrc/yacutia/sec_pki_drop.vspx
index 5317ba2..e1d0824 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.3 2010/09/20 10:16:51 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/site.vspx b/binsrc/yacutia/site.vspx
index 1a8387e..c94a4ce 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.2 2010/09/20 10:16:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/soap_del_path.vspx b/binsrc/yacutia/soap_del_path.vspx
index 8ceb3ce..be9a94e 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.4 2010/09/20 10:16:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/soap_options_edit.vspx b/binsrc/yacutia/soap_options_edit.vspx
index 9130747..2a6aa41 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.3 2010/09/20 10:16:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/soap_services.vspx b/binsrc/yacutia/soap_services.vspx
index 88d9c42..796171a 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.5 2010/09/20 10:16:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/soap_services_edit.vspx b/binsrc/yacutia/soap_services_edit.vspx
index 6d60227..3cbd353 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.5 2010/09/20 10:16:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -147,6 +147,8 @@
<v:variable name="sp_add" persist="0" type="int" default="0"/>
<v:variable name="subtab" persist="0" type="int" default="1"/>
<v:variable name="xml_desc" persist="0" type="int" default="0"/>
+ <v:variable name="cors" persist="0" type="varchar" default="''" param-name="t_cors"/>
+ <v:variable name="cors_rej" persist="0" type="integer" default="0" param-name="c_cors_rej"/>
</vm:variables>
<vm:header caption="Options for Web Service Endpoint"/>
<vm:pagebody>
@@ -258,6 +260,11 @@
self.xmlexec := get_keyword('xml_templates', self.global_opts, NULL);
if (self.ovrexec = '' and isarray(self.global_opts) and not mod(length(self.global_opts),2))
self.ovrexec := get_keyword('executable', self.global_opts, NULL);
+ if (isarray(self.global_opts) and not mod(length(self.global_opts),2))
+ {
+ self.cors := get_keyword ('cors', self.global_opts, '');
+ self.cors_rej := get_keyword ('cors_restricted', self.global_opts, 0);
+ }
}
else if( self.mode = 'add1' )
{
@@ -411,6 +418,11 @@
new_tab_switch_button.vc_set_childs_focus (1, e);
self.vc_event.ve_button := new_tab_switch_button;
}
+ else
+ {
+ self.t_cors.ufl_value := self.cors;
+ self.c_cors_rej.ufl_selected := self.cors_rej;
+ }
]]>
</v:script>
</v:before-data-bind>
@@ -805,6 +817,14 @@
</v:browse-button>
</td>
</tr>
+ <tr>
+ <td valign="top"><label for="t_cors">Cross-Origin Resource Sharing</label></td>
+ <td>
+ <v:text name="t_cors" xhtml_cols="30" xhtml_rows="3" xhtml_size="70" xhtml_id="t_cors"/><br/>
+ <v:check-box name="c_cors_rej" value="1" xhtml_id="c_cors_rej"/>
+ <label for="c_cors_rej">Reject Unintended CORs</label>
+ </td>
+ </tr>
</table>
</td>
</tr>
@@ -2033,6 +2053,12 @@
if (self.c_xml_rpc.ufl_selected = 1)
self.soap_opt := vector_concat(self.soap_opt, vector('XML-RPC', 'yes'));
}
+ --dbg_obj_print_vars (self.cors, self.cors_rej);
+ if (length (self.cors) > 0)
+ {
+ self.global_opts := vector ('cors', self.cors, 'cors_restricted', self.cors_rej);
+ }
+ else
self.global_opts := NULL;
commit work;
if(exists (select 1 from DB.DBA.HTTP_PATH where HP_HOST = self._httphost and HP_LISTEN_HOST = self._host and HP_LPATH = self.lpath) ) {
diff --git a/binsrc/yacutia/soap_services_list.vspx b/binsrc/yacutia/soap_services_list.vspx
index abc6db5..973c12c 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.3 2010/09/20 10:16:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sparql_acl.vspx b/binsrc/yacutia/sparql_acl.vspx
index c26f3a2..4cd336e 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.5 2011/10/13 18:33:27 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -34,22 +34,150 @@
<v:variable persist="0" name="acl_name" type="varchar" default="'HTTP'" param-name="acl"/>
<v:variable persist="temp" name="msg_msg" type="varchar" default="''"/>
- <v:variable name="edit_oauth" type="varchar" default="null" param-name="edit" />
- <v:variable name="del_oauth" type="varchar" default="null" param-name="del" />
+ <v:variable name="edit_acl" type="varchar" default="null" param-name="edit" />
+ <v:variable name="edit_realm" type="varchar" default="null" param-name="edit_realm" />
+ <v:variable name="del_acl" type="varchar" default="null" param-name="del" />
<v:variable name="u_id" type="int" default="null" />
<v:variable name="apps" type="any" default="null" persist="temp"/>
+ <v:variable name="rules" type="any" default="null" persist="temp"/>
</vm:variables>
<vm:menu>
<vm:menuitem name="HTTP" value="Access Control Lists"/>
</vm:menu>
<vm:header caption="Access Control Lists">
+ <script type="text/javascript" src="tbl.js">;</script>
+ <script type="text/javascript">
+ <![CDATA[
+ function aclToggle (obj)
+ {
+ if ($v('type') != 'Advanced') {
+ OAT.Dom.show('webid');
+ OAT.Dom.hide('filter');
+ } else {
+ OAT.Dom.hide('webid');
+ OAT.Dom.show('filter');
+ }
+ }
+
+ function dateFormat(date, format)
+ {
+ function long(d) {
+ return ( ( d < 10 )? "0" : "" ) + d;
+ }
+ var result="";
+ var chr;
+ var token;
+ var i=0;
+ while (i < format.length)
+ {
+ chr = format.charAt(i);
+ token = "";
+ while ((format.charAt(i) == chr) && (i < format.length))
+ {
+ token += format.charAt(i++);
+ }
+ if (token == "y")
+ result += ""+date[0];
+ else if (token == "yy")
+ result += date[0].substring(2,4);
+ else if (token == "yyyy")
+ result += date[0];
+ else if (token == "M")
+ result += date[1];
+ else if (token == "MM")
+ result += long(date[1]);
+ else if (token == "d")
+ result += date[2];
+ else if (token == "dd")
+ result += long(date[2]);
+ else
+ result += token;
+ }
+ return result;
+ }
+
+ function dateParse(dateString, format)
+ {
+ var result = null;
+ var pattern = new RegExp('^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$');
+ if (dateString.match(pattern))
+ {
+ dateString = dateString.replace(/\//g, '-');
+ result = dateString.split('-');
+ result = [ parseInt(result[0], 10), parseInt(result[1], 10), parseInt(result[2], 10) ];
+ }
+ return result;
+ }
+
+ function datePopup(objName, format)
+ {
+ if (!format) {format = 'yyyy-MM-dd';}
+ var obj = $(objName);
+ var d = dateParse(obj.value, format);
+ var c = new OAT.Calendar({popup: true});
+ var coords = OAT.Dom.position(obj);
+ if (isNaN(coords[0])) {coords = [0, 0];}
+ var x = function(date) {
+ obj.value = dateFormat(date, format);
+ }
+ c.show(coords[0], coords[1] + 30, x, d);
+ }
+ ]]>
+ </script>
</vm:header>
<vm:pagebody>
+ <v:on-init>
+ self.rules := vector ();
+ </v:on-init>
<v:method name="astyle" arglist="in cmp varchar">
<![CDATA[
return 'page_tab';
]]>
</v:method>
+
+ <v:method name="aci_params" arglist="in params any">
+ <![CDATA[
+ declare N, M integer;
+ declare aclNo, retValue, V any;
+
+ M := 1;
+ retValue := vector ();
+ for (N := 0; N < length (params); N := N + 2)
+ {
+ if (params[N] like 's_fld_1_%')
+ {
+ aclNo := replace (params[N], 's_fld_1_', '');
+ V := vector (M,
+ trim (get_keyword ('s_fld_1_' || aclNo, params)),
+ trim (get_keyword ('s_fld_2_' || aclNo, params)),
+ trim (get_keyword ('s_fld_3_' || aclNo, params)),
+ trim (get_keyword ('s_fld_0_' || aclNo, params, ''))
+ );
+ retValue := vector_concat (retValue, vector (V));
+ M := M + 1;
+ }
+ }
+ return retValue;
+ ]]>
+ </v:method>
+
+ <v:method name="acl_lines" arglist="in _acl any">
+ <![CDATA[
+ declare N integer;
+ declare s, lo any;
+ s := string_output ();
+
+ for (N := 0; N < length (_acl); N := N + 1)
+ {
+ string_output_flush (s);
+ http_escape (_acl[N][4], 13, s);
+ lo := string_output_string (s);
+ http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 55, value: "%s", valueExt: "%s", tdCssText: "width: 33%%;"}, fld_2: {mode: 56, value: "%s", tdCssText: "width: 33%%; vertical-align: top;"}, fld_3: {mode: 57, value: "%s", tdCssText: "width: 33%%; vertical-align: top;"}});});', _acl[N][1], lo, _acl[N][2], _acl[N][3]));
+ }
+ ]]>
+ </v:method>
+
+
<vm:help id="sec_auth_serv" sect=""/>
<v:form name="page_form" type="simple" method="POST">
<!-- top of security layout -->
@@ -84,15 +212,21 @@
<td>
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <?vsp if (DB.DBA.VAD_CHECK_VERSION ('rdf_mappers') is not null) { ?>
- <td class="<?V self.astyle ('Sponger') ?>" align="center">
+ <!--td class="<?V self.astyle ('Sponger') ?>" align="center">
<v:url xhtml_style="page_tab" url="sec_auth_serv_sp.vspx?acl=Sponger" value="Sponger" render-only="1"/>
+ </td-->
+ <td class="<?V self.astyle ('Groups') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_sponger_1.vspx" value="Groups" render-only="1"/>
+ </td>
+ <?vsp if (DB.DBA.VAD_CHECK_VERSION ('rdf_mappers') is not null or check_package ('cartridges')) { ?>
+ <td class="<?V self.astyle ('Cartridges') ?>" align="center">
+ <v:url xhtml_style="page_tab" url="sec_auth_sponger_2.vspx" value="Cartridges" render-only="1"/>
</td>
<?vsp } ?>
- <?vsp if (DB.DBA.VAD_CHECK_VERSION ('Framework') is not null) { ?>
+ <?vsp if (DB.DBA.VAD_CHECK_VERSION ('Framework') is not null or DB.DBA.VAD_CHECK_VERSION ('policy_manager') is not null) { ?>
<td class="page_tab_selected" align="center">
- <v:url xhtml_style="page_tab" url="sparql_acl.vspx" value="SPARQL-SSL" render-only="1"/>
+ <v:url xhtml_style="page_tab" url="sparql_acl.vspx" value="WebID ACLs" render-only="1"/>
</td>
<?vsp } ?>
@@ -114,24 +248,22 @@
<div class="message"><v:label name="pwd_msg" value="--self.msg_msg" /></div>
<v:form type="simple" method="POST">
<table class="listing">
- <colgroup>
- <col/>
- <col/>
- <col/>
- </colgroup>
<tr class="listing_header_row">
- <th>Web ID</th>
- <th>Role</th>
+ <th>WebID/Group</th>
+ <th>Realm</th>
+ <th>SQL User Account</th>
<th>Action</th>
</tr>
- <v:data-set name="oauth" sql="select g.U_NAME, FS_URI from FOAF_SSL_ACL left outer join SYS_USERS u on (u.U_NAME = FS_UID)
- join SYS_USER_GROUP on (u.U_ID = UG_UID) join SYS_USERS g on (g.U_ID = UG_GID)" scrollable="1" editable="1" nrows="1000">
+ <v:data-set name="oauth"
+ sql="select null as DUMMY, FS_URI, FS_UID, FS_REALM, FS_APP_DATA, FS_PRIORITY
+ from FOAF_SSL_ACL left outer join SYS_USERS u on (u.U_NAME = FS_UID) order by FS_REALM, FS_PRIORITY"
+ scrollable="1" editable="1" nrows="1000">
<v:before-data-bind>
- if (not e.ve_is_post and self.del_oauth is not null)
+ if (not e.ve_is_post and self.del_acl is not null)
{
declare uid varchar;
- uid := (select FS_UID from FOAF_SSL_ACL where FS_URI = self.del_oauth);
- delete from FOAF_SSL_ACL where FS_URI = self.del_oauth;
+ uid := (select FS_UID from FOAF_SSL_ACL where FS_URI = self.del_acl and FS_REALM = self.edit_realm);
+ delete from FOAF_SSL_ACL where FS_URI = self.del_acl and FS_REALM = self.edit_realm;
if (uid like 'SPUID%')
USER_DROP (uid);
self.vc_redirect ('sparql_acl.vspx');
@@ -140,17 +272,34 @@
<v:template name="maps_rep" type="repeat">
<v:template name="template7" type="if-not-exists">
- <tr><td colspan="4">No applications registered</td></tr>
+ <tr><td colspan="4">No ACL(s)</td></tr>
</v:template>
<v:template name="maps_brows" type="browse">
<v:after-data-bind>
- if (not e.ve_is_post and control.te_rowset[1] = self.edit_oauth)
+ if (not e.ve_is_post and control.te_rowset[1] = self.edit_acl and control.te_rowset[3] = self.edit_realm)
{
+ declare tp any;
self.webid.ufl_value := control.te_rowset[1];
- self.rol.ufl_value := control.te_rowset[0];
+ self.rol.ufl_value := (select g.U_NAME from SYS_USERS u join SYS_USER_GROUP on (u.U_ID = UG_UID)
+ join SYS_USERS g on (g.U_ID = UG_GID) where u.U_NAME = control.te_rowset[2]
+ and g.U_NAME like 'SPARQL_%');
+ self.app_realm.ufl_value := control.te_rowset[3];
+ self.usr.ufl_value := control.te_rowset[2];
+ self.priority.ufl_value := control.te_rowset[5];
+ self.app_data.ufl_value := vector_to_text_opt (control.te_rowset[4]);
+ self.rules := (select vector_agg (vector (SWA_ID, SWA_PROP, SWA_OP, SWA_VAL, SWA_QUERY)) from SPARQL_WEBID_ACL
+ where SWA_RULE = self.edit_acl and SWA_REALM = self.edit_realm);
+ tp := (select FS_TYPE from FOAF_SSL_ACL where FS_URI = self.edit_acl and FS_REALM = self.edit_realm);
+ if (tp = 0)
+ self.type.ufl_value := 'Person';
+ if (tp = 1)
+ self.type.ufl_value := 'Group';
+ if (tp = 2)
+ self.type.ufl_value := 'Advanced';
}
</v:after-data-bind>
- <tr class="<?V case when self.edit_oauth = control.te_rowset[1] then 'listing_row_selected'
+ <tr class="<?V case when self.edit_acl = control.te_rowset[1] and self.edit_realm = control.te_rowset[3]
+ then 'listing_row_selected'
when mod(control.te_ctr, 2) then 'listing_row_odd' else 'listing_row_even' end ?>">
<td>
<v:label name="la2" value="--(control.vc_parent as vspx_row_template).te_rowset[1]"
@@ -160,19 +309,34 @@
<td>
<v:label name="ur1"
format="%s"
- value="--(control.vc_parent as vspx_row_template).te_rowset[0]"
+ value="--(control.vc_parent as vspx_row_template).te_rowset[3]"
+ />
+ </td>
+ <td>
+ <v:url name="ur2"
+ format="%s"
+ value="--(control.vc_parent as vspx_row_template).te_rowset[2]"
+ url="--sprintf ('account_create.vspx?mode=edit&user_name=%U', (control.vc_parent as vspx_row_template).te_rowset[2])"
+ render-only="1"
/>
</td>
<td>
<v:url name="ur3" value='<img src="images/icons/edit_16.png" hspace="3" border="0"/>Edit'
format="%s"
- url="--sprintf ('sparql_acl.vspx?edit=%U', (control.vc_parent as vspx_row_template).te_rowset[1])"
+ url="--sprintf ('sparql_acl.vspx?edit=%U&edit_realm=%U',
+ (control.vc_parent as vspx_row_template).te_rowset[1],
+ (control.vc_parent as vspx_row_template).te_rowset[3]
+ )
+ "
xhtml_title="Edit"
xhtml_alt="Edit"
/>
<v:url name="ur2" value='<img src="images/icons/del_16.png" hspace="3" border="0"/>Delete'
format="%s"
- url="--sprintf ('sparql_acl.vspx?del=%U', (control.vc_parent as vspx_row_template).te_rowset[1])"
+ url="--sprintf ('sparql_acl.vspx?del=%U&edit_realm=%U',
+ (control.vc_parent as vspx_row_template).te_rowset[1],
+ (control.vc_parent as vspx_row_template).te_rowset[3]
+ )"
xhtml_title="Delete"
xhtml_alt="Delete"
/>
@@ -192,37 +356,99 @@
</table>
<div class="fm">
<fieldset>
- Web ID: <v:text name="webid" value="" xhtml_size="100"/>
+ Type: <v:select-list name="type" xhtml_id="type" xhtml_onchange="javascript: aclToggle(this);">
+ <v:item name="Person" value="Person"/>
+ <v:item name="Group" value="Group"/>
+ <v:item name="Advanced" value="Advanced"/>
+ </v:select-list> <br/>
+ <span id="webid">
+ WebID/Group: <v:text name="webid" value="" xhtml_size="100"/>
<!--v:button action="browse" name="sel_id" value="Browse" selector="sel_user.vspx"
child-window-options="scrollbars=yes, menubar=no, height=630, width=600"
enabled="-#-coalesce ((select top 1 1 from SYS_KEYS where KEY_TABLE = 'DB.DBA.WA_USER_INFO'), 0)">
<v:field name="webid"/>
</v:button-->
+ </span><br/>
+ Realm: <v:text name="app_realm" value="" default_value="GENERIC" xhtml_size="100"/><br/>
+ Priority (0 - top): <v:text name="priority" value="" default_value="0" xhtml_size="3"/><br/>
+ Options: <br/><v:textarea name="app_data" xhtml_cols="30" xhtml_rows="5" xhtml_id="t_opt"/> <br/>
+ <span id="filter">
+ Filter:
+ <table id="s_tbl" style="width: 90%;">
+ <tr>
+ <td>
+ <table class="listing" style="width: 100%;">
+ <thead>
+ <tr class="listing_header_row">
+ <th width="33%">Property</th>
+ <th width="33%">Condition</th>
+ <th width="33%">Value</th>
+ <th>Action</th>
+ </tr>
+ </thead>
+ <tbody id="s_tbody">
+ <tr id="s_tr_no">
+ <td colspan="3">
+ <b>No Criteria</b>
+ </td>
+ </tr>
+ <![CDATA[
+ <script type="text/javascript">
+ <?vsp
+ self.acl_lines (self.rules);
+ ?>
+ </script>
+ ]]>
+ </tbody>
+ </table>
+ </td>
+ <td style="white-space: nowrap; vertical-align: top;">
+ <img border="0" title="Add Condition" alt="Add Condition" onclick="javascript: TBL.createRow('s', null, {fld_1: {mode: 55, tdCssText: 'width: 33%; vertical-align: top;', className: '_validate_'}, fld_2: {mode: 56, tdCssText: 'width: 33%; vertical-align: top;', cssText: 'display: none;', className: '_validate_'}, fld_3: {mode: 57, tdCssText: 'width: 33%; vertical-align: top;', cssText: 'display: none;', className: '_validate_'}, btn_1: {mode: 55}});" class="button pointer" src="/ods/images/icons/add_16.png" />
+ </td>
+ </tr>
+ </table>
+ </span>
<br/>
SPARQL Role: <v:select-list name="rol">
+ <v:item name="none" value="none"/>
<v:item name="SELECT" value="SPARQL_SELECT"/>
<v:item name="SPONGE" value="SPARQL_SPONGE"/>
<v:item name="UPDATE" value="SPARQL_UPDATE"/>
- </v:select-list>
+ </v:select-list> <br/>
+ Use existing User account: <v:data-list name="usr" sql="select U_NAME from (select 'none' as U_NAME) x union all select U_NAME from SYS_USERS where U_SQL_ENABLE = 1"
+ key-column="U_NAME" value-column="U_NAME"/> (for new ACL entry, leave none to create a new user)
<!-- SQL Account: <v:text name="acc" value="" xhtml_size="100"/--><br/>
<span class="fm_ctl_btn">
- <v:button name="cancel2" value="Cancel" action="simple" enabled="--equ(isnull(self.edit_oauth),0)">
+ <v:button name="cancel2" value="Cancel" action="simple" enabled="--equ(isnull(self.edit_acl),0)">
<v:on-post>
self.webid.ufl_value := null;
self.rol.ufl_value := null;
+ self.app_realm.ufl_value := 'GENERIC';
- self.edit_oauth := null;
+ self.edit_acl := null;
self.save1.vc_data_bind (e);
control.vc_enabled := 0;
</v:on-post>
</v:button>
</span>
<span class="fm_ctl_btn">
- <v:button name="save1" value="--case when self.edit_oauth is not null then 'Update' else 'Register' end" action="simple">
+ <v:button name="save1" value="--case when self.edit_acl is not null then 'Update' else 'Register' end" action="simple">
<v:on-post><![CDATA[
- declare uid, orole varchar;
+ declare uid, orole, tp varchar;
+ declare stat, msg, acl, opts any;
self.webid.ufl_value := trim (self.webid.ufl_value);
+ self.app_realm.ufl_value := trim (self.app_realm.ufl_value);
+ opts := text_opt_to_vector (self.app_data.ufl_value);
+ if (self.type.ufl_value = 'Advanced')
+ tp := 2;
+ else if (self.type.ufl_value = 'Group')
+ tp := 1;
+ else if (self.type.ufl_value = 'Person')
+ tp := 0;
+
+ if (self.type.ufl_value <> 'Advanced')
+ {
if (0 = length (self.webid.ufl_value))
{
self.vc_is_valid := 0;
@@ -230,13 +456,23 @@
return;
}
-- it is pattern
- if (0 and 0 = FOAF_CHECK_WEBID (self.webid.ufl_value))
+ if (0 and FOAF_CHECK_WEBID (self.webid.ufl_value))
{
self.vc_is_valid := 0;
self.vc_error_message := 'The WebID is inaccessible or does not contain certificate properties';
return;
}
- if (self.edit_oauth is null)
+ }
+ else
+ {
+ if (length (self.webid.ufl_value) = 0)
+ self.webid.ufl_value := sprintf ('Rule-%d', sequence_next ('sparql_webid_acl_rule'));
+ acl := self.aci_params (self.vc_page.vc_event.ve_params);
+ }
+
+ if (self.edit_acl is null)
+ {
+ if (self.usr.ufl_value = 'none')
{
if (exists (select 1 from FOAF_SSL_ACL where FS_URI = self.webid.ufl_value))
{
@@ -246,25 +482,68 @@
}
uid := sprintf ('SPUID%d', sequence_next ('__SPUID'));
USER_CREATE (uid, uuid());
+ if (self.rol.ufl_value <> 'none')
USER_GRANT_ROLE (uid, self.rol.ufl_value);
USER_SET_OPTION (uid, 'DISABLED', 1);
- insert into FOAF_SSL_ACL (FS_URI, FS_UID) values (self.webid.ufl_value, uid);
+ }
+ else
+ uid := self.usr.ufl_value;
+ insert into FOAF_SSL_ACL (FS_URI, FS_UID, FS_TYPE, FS_REALM, FS_APP_DATA, FS_PRIORITY)
+ values (self.webid.ufl_value, uid, tp, self.app_realm.ufl_value, opts, self.priority.ufl_value);
+ if (self.type.ufl_value = 'Advanced')
+ {
+ foreach (any x in acl) do
+ {
+ insert into SPARQL_WEBID_ACL (SWA_RULE, SWA_REALM, SWA_ID, SWA_PROP, SWA_OP, SWA_VAL, SWA_QUERY)
+ values (self.webid.ufl_value, self.app_realm.ufl_value, x[0], x[1], x[2], x[3], x[4]);
+ }
+ }
}
else
{
- uid := (select FS_UID from FOAF_SSL_ACL where FS_URI = self.edit_oauth);
+ if (self.usr.ufl_value = 'none')
+ {
+ self.vc_is_valid := 0;
+ self.vc_error_message := 'Can not remove users from ACL rules, please select a valid user';
+ return;
+ }
+ uid := (select FS_UID from FOAF_SSL_ACL where FS_URI = self.edit_acl);
+
orole := (select g.U_NAME from SYS_USERS u join SYS_USER_GROUP on (u.U_ID = UG_UID)
- join SYS_USERS g on (g.U_ID = UG_GID) where u.U_NAME = uid);
- USER_REVOKE_ROLE (uid, orole);
- USER_GRANT_ROLE (uid, self.rol.ufl_value);
- }
+ join SYS_USERS g on (g.U_ID = UG_GID) where u.U_NAME = uid and g.U_NAME like 'SPARQL_%');
+ if (orole is not null)
+ USER_REVOKE_ROLE (uid, orole);
+ uid := self.usr.ufl_value;
+ if (self.rol.ufl_value <> 'none')
+ exec ('DB.DBA.USER_GRANT_ROLE (?,?)', stat, msg, vector (uid, self.rol.ufl_value));
+ update FOAF_SSL_ACL set FS_UID = uid, FS_REALM = self.app_realm.ufl_value, FS_APP_DATA = opts,
+ FS_PRIORITY = self.priority.ufl_value
+ where FS_URI = self.edit_acl and FS_REALM = self.edit_realm;
+ delete from SPARQL_WEBID_ACL where SWA_RULE = self.edit_acl and SWA_REALM = self.edit_realm;
+ if (self.type.ufl_value = 'Advanced')
+ {
+ foreach (any x in acl) do
+ {
+ insert into SPARQL_WEBID_ACL (SWA_RULE, SWA_REALM, SWA_ID, SWA_PROP, SWA_OP, SWA_VAL, SWA_QUERY)
+ values (self.edit_acl, self.app_realm.ufl_value, x[0], x[1], x[2], x[3], x[4]);
+ }
+ }
+ }
+ if (__proc_exists (sprintf ('DB.DBA.WEBID_ACL_CHECK__%s_%s', self.webid.ufl_value, self.edit_realm))
+ is not null)
+ exec (sprintf ('drop procedure DB.DBA."WEBID_ACL_CHECK__%s_%s"', self.webid.ufl_value, self.edit_realm));
+ if (self.type.ufl_value = 'Advanced')
+ exec (WEBID_GEN_ACL_PROC (self.webid.ufl_value, self.app_realm.ufl_value));
self.vc_redirect ('sparql_acl.vspx');
]]></v:on-post>
</v:button>
</span>
</fieldset>
</div>
+ <script type="text/javascript">
+ aclToggle ($('type'));
+ </script>
</v:form>
<!-- END -->
</td>
diff --git a/binsrc/yacutia/sparql_filters.vspx b/binsrc/yacutia/sparql_filters.vspx
index b866543..1d369b6 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.5 2010/11/08 11:45:35 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sparql_graph.vspx b/binsrc/yacutia/sparql_graph.vspx
index b0055c0..4f6e917 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.5 2011/10/25 23:34:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sparql_input.vspx b/binsrc/yacutia/sparql_input.vspx
index f690c9e..90ffb9c 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.3 2010/09/20 10:16:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sparql_load.vspx b/binsrc/yacutia/sparql_load.vspx
index 42aa001..7bb406e 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.4 2010/09/20 10:16:52 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sqlbuilder.vsp b/binsrc/yacutia/sqlbuilder.vsp
index 842181c..2325989 100644
--- a/binsrc/yacutia/sqlbuilder.vsp
+++ b/binsrc/yacutia/sqlbuilder.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sqlbuilder.vsp,v 1.3.2.2 2010/09/20 10:16:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/syntax/SyntaxHighlighter.css b/binsrc/yacutia/syntax/SyntaxHighlighter.css
index bcca788..0ce3416 100644
--- a/binsrc/yacutia/syntax/SyntaxHighlighter.css
+++ b/binsrc/yacutia/syntax/SyntaxHighlighter.css
@@ -1,10 +1,10 @@
/*
- * $Id: SyntaxHighlighter.css,v 1.2.2.1 2010/09/20 10:17:00 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/syntax/shBrushSql.js b/binsrc/yacutia/syntax/shBrushSql.js
index 1a52f62..3dc4c35 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/syntax/shBrushXml.js b/binsrc/yacutia/syntax/shBrushXml.js
index 23c247a..aee0566 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-2006 OpenLink Software
+ * 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
diff --git a/binsrc/yacutia/sys_info.vspx b/binsrc/yacutia/sys_info.vspx
index cf4550b..d6327dd 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.2 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sys_queues.vspx b/binsrc/yacutia/sys_queues.vspx
index 49cb7c7..5f68394 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.5 2011/05/02 14:13:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sys_queues_edit.vspx b/binsrc/yacutia/sys_queues_edit.vspx
index 4e0760f..762baa2 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.3 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sys_queues_edit_inc.vspx b/binsrc/yacutia/sys_queues_edit_inc.vspx
index e04fa64..a543f67 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.2 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sys_queues_error.vspx b/binsrc/yacutia/sys_queues_error.vspx
index 88c9a06..15a6ba0 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.3 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/sys_queues_remove.vspx b/binsrc/yacutia/sys_queues_remove.vspx
index bb8da8d..2094dcf 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.4 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/tbl.js b/binsrc/yacutia/tbl.js
index 592eedd..832c4ff 100644
--- a/binsrc/yacutia/tbl.js
+++ b/binsrc/yacutia/tbl.js
@@ -1,10 +1,10 @@
/*
- * $Id: tbl.js,v 1.1.4.6 2011/09/09 13:21:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -28,23 +28,9 @@ TBL.selectOption = function(fld, fldValue, optionName, optionValue) {
o.selected = true;
}
-TBL.createRow = function (prefix, No, optionObject)
-{
- if (No != null)
+TBL.No = function (tbl, prefix, options)
{
- TBL.deleteRow(prefix, No);
- }
- else
- {
- var tbl = $(prefix+'_tbody');
- if (!tbl)
- tbl = $(prefix+'_tbl');
- if (tbl)
- {
- var options = {btn_1: {mode: 0}};
- for (var p in optionObject) {options[p] = optionObject[p]; }
-
- No = options.No;
+ var No = options.No;
if (!$(prefix+'_no')) {
var fld = OAT.Dom.create("input");
fld.type = 'hidden';
@@ -58,8 +44,36 @@ TBL.createRow = function (prefix, No, optionObject)
} else {
No = $v(prefix+'_no');
}
- No = parseInt(No)
+ return parseInt(No)
+}
+
+TBL.parent = function (obj, tag) {
+ var obj = obj.parentNode;
+ if (obj.tagName.toLowerCase() == tag)
+ return obj;
+ return TBL.parent(obj, tag);
+}
+TBL.createRow = function (prefix, No, optionObject, viewMode) {
+ if (No != null)
+ {
+ TBL.deleteRow(prefix, No);
+ }
+ else if (viewMode)
+ {
+ TBL.createViewRow(prefix, optionObject);
+ }
+ else
+ {
+ var tbl = $(prefix+'_tbody');
+ if (!tbl)
+ tbl = $(prefix+'_tbl');
+ if (tbl)
+ {
+ var options = {btn_1: {mode: 0}};
+ for (var p in optionObject) {options[p] = optionObject[p]; }
+
+ No = TBL.No(tbl, prefix, options);
OAT.Dom.hide (prefix+'_tr_no');
var tr = OAT.Dom.create('tr');
@@ -87,7 +101,7 @@ TBL.createRow = function (prefix, No, optionObject)
// actions
var td = OAT.Dom.create('td');
td.id = prefix+'_td_'+ No+'_btn';
- td.style.whiteSpace = 'nowrap';
+ td.style.cssText = 'white-space: nowrap; vertical-align: top;';
tr.appendChild(td);
if (options.id) {
var fld = OAT.Dom.create("input");
@@ -125,12 +139,16 @@ TBL.createRow = function (prefix, No, optionObject)
TBL.createViewRow = function (prefix, options)
{
- var tbl = $(prefix+'_tbl');
+ var tbl = $(prefix+'_tbody');
+ if (!tbl)
+ tbl = $(prefix+'_tbl');
if (tbl)
{
+ var No = TBL.No(tbl, prefix, options);
OAT.Dom.hide (prefix+'_tr_no');
var tr = OAT.Dom.create('tr');
+ tr.id = prefix+'_tr_' + No;
tbl.appendChild(tr);
// fields
@@ -145,7 +163,7 @@ TBL.createViewRow = function (prefix, options)
tr.appendChild(td);
if (fldOptions.mode) {
- fldName = prefix + '_' + fld + '_0';
+ fldName = prefix + '_' + fld + '_' + No;
var fn = TBL["viewCell"+fldOptions.mode];
if (fn)
fn(td, prefix, fldName, 0, fldOptions);
@@ -153,6 +171,7 @@ TBL.createViewRow = function (prefix, options)
td.innerHTML = fldOptions.value;
}
}
+ $(prefix+'_no').value = No + 1;
}
}
}
@@ -165,8 +184,7 @@ TBL.deleteRow = function (prefix, No, ask) {
OAT.Dom.unlink(prefix+'_tr_'+No+'_items');
OAT.Dom.unlink(prefix+'_tr_'+No+'_properties');
var No = parseInt($(prefix+'_no').value);
- for (var N = 0; N < No; N++)
- {
+ for (var N = 0; N < No; N++) {
if ($(prefix+'_tr_'+N))
return;
}
@@ -174,6 +192,15 @@ TBL.deleteRow = function (prefix, No, ask) {
return true;
}
+TBL.clean = function (prefix) {
+ var No = parseInt($(prefix+'_no').value);
+ for (var N = 0; N < No; N++)
+ OAT.Dom.unlink(prefix+'_tr_'+N);
+
+ OAT.Dom.show(prefix+'_tr_no');
+ return true;
+}
+
TBL.createCellSelect = function (fldName) {
var fld = OAT.Dom.create("select");
fld.name = fldName;
@@ -364,6 +391,197 @@ TBL.createCell53 = function (td, prefix, fldName, No, fldOptions)
return fld;
}
+TBL.changeCell55 = function (obj)
+{
+ var prefix = obj._prefix;
+ var No = obj._No;
+
+ TBL.createCell55Ext(obj);
+
+ var td = $(prefix+'_td_'+No+'_2');
+ td.innerHTML = '';
+ TBL.createCell56(td, prefix, prefix+'_fld_2_'+No, No, {className: '_validate_'});
+
+ var td = $(prefix+'_td_'+No+'_3');
+ td.innerHTML = '';
+ TBL.createCell57(td, prefix, prefix+'_fld_3_'+No, No, {className: '_validate_'});
+}
+
+TBL.createCell55 = function (td, prefix, fldName, No, fldOptions, disabled) {
+ var fld = TBL.createCellSelect(fldName, fldOptions);
+ fld._prefix = prefix;
+ fld._No = No;
+ fld.style.width = '95%';
+ OAT.Dom.option('', '', fld);
+ if (!TBL.predicates)
+ TBL.initValues();
+ if (TBL.predicates)
+ for (var i = 0; i < TBL.predicates.length; i = i + 2) {
+ OAT.Dom.option(TBL.predicates[i+1][0], TBL.predicates[i], fld);
+ }
+
+ if (fldOptions.value)
+ fld.value = fldOptions.value;
+
+ if (disabled)
+ fld.disabled = disabled;
+
+ if (!disabled)
+ fld.onchange = function(){TBL.changeCell55(this)};
+
+ td.appendChild(fld);
+ TBL.createCell55Ext(fld, fldOptions, disabled)
+
+ return fld;
+}
+
+TBL.createCell55Ext = function (obj, fldOptions, disabled) {
+ var prefix = obj._prefix;
+ var No = obj._No;
+
+ var predicate = TBL.predicateGet(prefix+'_fld_1_'+No);
+ if (!predicate)
+ return;
+
+ var fldName = prefix+'_fld_0_'+No;
+ if (predicate[1] != 'sparql') {
+ OAT.Dom.unlink(fldName);
+ return;
+ }
+
+ if ($(fldName))
+ return;
+
+ if (!fldOptions)
+ fldOptions = {valueExt: 'prefix sioc: <http://rdfs.org/sioc/ns#>\nprefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>\nprefix foaf: <http://xmlns.com/foaf/0.1/>\nASK where {^{webid}^ rdf:type foaf:Person}'};
+
+ var td = TBL.parent(obj, 'td');
+ var fld = OAT.Dom.create('textarea');
+ fld.id = fldName;
+ fld.name = fld.id;
+ fld.style.cssFloat = 'left';
+ fld.style.width = '94%';
+ fld.style.height = '8em';
+ if (fldOptions.valueExt)
+ fld.value = fldOptions.valueExt;
+ if (disabled)
+ fld.disabled = disabled;
+
+ td.appendChild(fld);
+}
+
+TBL.changeCell56 = function (obj) {
+ var prefix = obj._prefix;
+ var No = obj._No;
+
+ var td = $(prefix+'_td_'+No+'_3');
+ td.innerHTML = '';
+ TBL.createCell57(td, prefix, prefix+'_fld_3_'+No, No, {className: '_validate_'});
+}
+
+TBL.viewCell55 = function (td, prefix, fldName, No, fldOptions) {
+ TBL.createCell55(td, prefix, fldName, No, fldOptions, true);
+}
+
+TBL.createCell56 = function (td, prefix, fldName, No, fldOptions, disabled)
+{
+ var predicate = TBL.predicateGet(prefix+'_fld_1_'+No);
+ if (!predicate)
+ return;
+
+ var fld = TBL.createCellSelect(fldName, fldOptions);
+ fld._prefix = prefix;
+ fld._No = No;
+ fld.style.width = '95%';
+ OAT.Dom.option('', '', fld);
+ var predicateType = predicate[1];
+ if (TBL.compares)
+ for (var i = 0; i < TBL.compares.length; i = i + 2) {
+ var compareTypes = TBL.compares[i+1][1];
+ for (var j = 0; j < compareTypes.length; j++) {
+ if (compareTypes[j] == predicateType)
+ OAT.Dom.option(TBL.compares[i+1][0], TBL.compares[i], fld);
+ }
+ }
+ if (fldOptions.value)
+ fld.value = fldOptions.value;
+
+ if (disabled)
+ fld.disabled = disabled;
+
+ if (!disabled)
+ fld.onchange = function(){TBL.changeCell56(this)};
+
+ td.appendChild(fld);
+ return fld;
+}
+
+TBL.viewCell56 = function (td, prefix, fldName, No, fldOptions) {
+ TBL.createCell56(td, prefix, fldName, No, fldOptions, true);
+}
+
+TBL.createCell57 = function (td, prefix, fldName, No, fldOptions)
+{
+ var predicate = TBL.predicateGet(prefix+'_fld_1_'+No);
+ if (!predicate)
+ return;
+
+ var fld_2 = $(fldName.replace('fld_3', 'fld_2'));
+ if (!fld_2)
+ return;
+
+ var compare;
+ for (var i = 0; i < TBL.compares.length; i = i + 2) {
+ if (TBL.compares[i] == fld_2.value)
+ compare = TBL.compares[i+1];
+ }
+ if (!compare || (compare[2] == 0))
+ return;
+
+ if ((predicate[1] == 'boolean') || (predicate[1] == 'sparql')) {
+ var fld = OAT.Dom.create("select");
+ OAT.Dom.option('Yes', '1', fld);
+ OAT.Dom.option('No', '0', fld);
+ }
+ else
+ {
+ var fld = OAT.Dom.create("input");
+ fld.type = 'text';
+ }
+ fld.id = fldName;
+ fld.name = fld.id;
+ fld.style.width = '93%';
+ if (fldOptions.value)
+ fld.value = fldOptions.value;
+ if (fldOptions.className)
+ fld.className = fldOptions.className;
+ td.appendChild(fld);
+
+ for (var i = 0; i < predicate[3].length; i += 2) {
+ if (predicate[3][i] == 'size') {
+ fld['size'] = predicate[3][i+1];
+ fld.style.width = null;
+ }
+
+ if (predicate[3][i] == 'class')
+ fld.className = predicate[3][i+1];
+
+ if (predicate[3][i] == 'onclick')
+ OAT.Event.attach(fld, "click", new Function((predicate[3][i+1]).replace(/-FIELD-/g, fld.id)));
+
+ if (predicate[3][i] == 'button') {
+ var span = OAT.Dom.create("span");
+ span.innerHTML = ' ' + (predicate[3][i+1]).replace(/-FIELD-/g, fld.id);
+ td.appendChild(span);
+ }
+ }
+ return fld;
+}
+
+TBL.viewCell57 = function (td, prefix, fldName, No, fldOptions) {
+ TBL.createCell0(td, prefix, fldName, No, fldOptions, true);
+}
+
TBL.createButton0 = function (td, prefix, fldName, No, fldOptions)
{
var fld = OAT.Dom.create('span');
@@ -383,3 +601,39 @@ TBL.createButton0 = function (td, prefix, fldName, No, fldOptions)
td.appendChild(fld);
return fld;
}
+
+TBL.createButton55 = function (td, prefix, fldName, No, fldOptions)
+{
+ var img = OAT.Dom.create('img');
+ img.src = '/ods/images/icons/trash_16.png';
+ img.alt = 'Delete row';
+ img.title = img.alt;
+ img.onclick = function(){TBL.deleteRow(prefix, No);};
+ OAT.Dom.addClass(img, 'button');
+
+ td.appendChild(img);
+ return img;
+}
+
+TBL.initValues = function () {
+ // load filters data
+ var x = function(data) {
+ var o = OAT.JSON.parse(data);
+ TBL.predicates = o[0];
+ TBL.compares = o[1];
+ }
+ OAT.AJAX.GET('/ods/api/filtersData', false, x, {async: false});
+}
+
+TBL.predicateGet = function (fldName) {
+ var fld = $(fldName)
+ if (fld) {
+ if (!TBL.predicates)
+ TBL.initValues();
+ for (var i = 0; i < TBL.predicates.length; i += 2) {
+ if (TBL.predicates[i] == fld.value)
+ return TBL.predicates[i+1];
+ }
+ }
+ return null;
+}
diff --git a/binsrc/yacutia/text_queries.vspx b/binsrc/yacutia/text_queries.vspx
index 9327114..5f4770e 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.3 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/text_queries_edit.vspx b/binsrc/yacutia/text_queries_edit.vspx
index d249667..6f61bec 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.3 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/text_results.vspx b/binsrc/yacutia/text_results.vspx
index a78d80b..7df3255 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.3 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/text_search.vspx b/binsrc/yacutia/text_search.vspx
index 4a2289a..28eb24b 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.3 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/text_triggers.vspx b/binsrc/yacutia/text_triggers.vspx
index c263664..40d8cb6 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.3 2010/09/20 10:16:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/uddi_remove.vspx b/binsrc/yacutia/uddi_remove.vspx
index e5b2149..e93159d 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.4 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/uddi_serv.vspx b/binsrc/yacutia/uddi_serv.vspx
index c0f9188..b4fb2d7 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.3 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/uddi_serv_browse.vspx b/binsrc/yacutia/uddi_serv_browse.vspx
index f83a8a0..bb5f087 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.3 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/uddi_serv_create.vspx b/binsrc/yacutia/uddi_serv_create.vspx
index 0b9825d..c125bf6 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.3 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vad.vspx b/binsrc/yacutia/vad.vspx
index 647c107..cd91af7 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.4 2011/01/25 14:21:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vad_dav.xml b/binsrc/yacutia/vad_dav.xml
index 3525591..3ac9482 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-2011 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2012 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.7976">
- <prop name="Release Date" value="2011-10-28 23:51"/>
+ <version package="1.00.8070">
+ <prop name="Release Date" value="2012-08-02 00:19"/>
<prop name="Build" value="Release, optimized"/>
</version>
</caption>
@@ -328,6 +328,9 @@
<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"/>
@@ -353,11 +356,14 @@
<file type="dav" source="http" target_uri="conductor/sec_acl_edit.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/sec_auth_serv_sp.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/sec_auth_serv.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
+ <file type="dav" source="http" target_uri="conductor/sec_auth_sponger_1.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
+ <file type="dav" source="http" target_uri="conductor/sec_auth_sponger_2.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/sec_pki_1.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/sec_pki_2_conf.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/sec_pki_2.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/sec_pki_3.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/sec_pki_4.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
+ <file type="dav" source="http" target_uri="conductor/sec_pki_download.vsp" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/sec_pki_drop.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/site.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/soap_del_path.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 3b91b6e..ba653d3 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-2011 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2012 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.7976">
- <prop name="Release Date" value="2011-10-28 23:51"/>
+ <version package="1.00.8070">
+ <prop name="Release Date" value="2012-08-02 00:19"/>
<prop name="Build" value="Release, optimized"/>
</version>
</caption>
@@ -334,6 +334,9 @@
<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"/>
@@ -359,11 +362,14 @@
<file type="http" source="http" target_uri="conductor/sec_acl_edit.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/sec_auth_serv_sp.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/sec_auth_serv.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
+ <file type="http" source="http" target_uri="conductor/sec_auth_sponger_1.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
+ <file type="http" source="http" target_uri="conductor/sec_auth_sponger_2.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/sec_pki_1.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/sec_pki_2_conf.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/sec_pki_2.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/sec_pki_3.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/sec_pki_4.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
+ <file type="http" source="http" target_uri="conductor/sec_pki_download.vsp" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/sec_pki_drop.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/site.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/soap_del_path.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 e6474a8..df9614d 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.5 2011/01/25 14:21:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vad_install_batch.vspx b/binsrc/yacutia/vad_install_batch.vspx
index f6571db..99cf0b1 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.3 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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, 'required package Framework') is not null)
+ if (strstr (__SQL_MESSAGE, 'requires 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 a5388cf..e845e54 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.3 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vad_remove_batch.vspx b/binsrc/yacutia/vad_remove_batch.vspx
index 8ce3c1b..4c569b9 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.2 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vad_src.vspx b/binsrc/yacutia/vad_src.vspx
index 050ca6d..0dd883f 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.2 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vad_status.vspx b/binsrc/yacutia/vad_status.vspx
index 201e371..1945ac1 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.3 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vad_version b/binsrc/yacutia/vad_version
index 744f362..95b4bf2 100644
--- a/binsrc/yacutia/vad_version
+++ b/binsrc/yacutia/vad_version
@@ -1 +1 @@
-1.00.7976
+1.00.8070
diff --git a/binsrc/yacutia/vad_wa_config.vspx b/binsrc/yacutia/vad_wa_config.vspx
index ed21095..af38e85 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.3 2010/09/20 10:16:54 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vad_wa_create.vspx b/binsrc/yacutia/vad_wa_create.vspx
index f0cb74f..0ad980e 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.3 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_conf_dsn_edit.vspx b/binsrc/yacutia/vdb_conf_dsn_edit.vspx
index 99f2f56..0bf9fc4 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.5 2011/02/03 10:30:29 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -482,7 +482,7 @@
<tr>
<td colspan="3" align="middle">
<p class="copyright_noalign"><?V self.driver ?><br />
- <small>Copyright 1998-2011 OpenLink Software</small><br />
+ <small>Copyright 1998-2012 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 7339e06..0db1cc2 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.3 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_conf_dsn_remove.vspx b/binsrc/yacutia/vdb_conf_dsn_remove.vspx
index 47ebff8..f9995c1 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.4 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_config_dsn.vspx b/binsrc/yacutia/vdb_config_dsn.vspx
index 4497cbf..01743e2 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.3 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_conn_dsn.vspx b/binsrc/yacutia/vdb_conn_dsn.vspx
index 8082c32..9189070 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.3 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_conn_dsn_del.vspx b/binsrc/yacutia/vdb_conn_dsn_del.vspx
index 818d76b..3373fb8 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.4 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_conn_dsn_edit.vspx b/binsrc/yacutia/vdb_conn_dsn_edit.vspx
index 6006a4b..88c9c15 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.3 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_dsn_edit.vspx b/binsrc/yacutia/vdb_dsn_edit.vspx
index b86e324..9f0ac0a 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.3 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_dsns.vspx b/binsrc/yacutia/vdb_dsns.vspx
index 6a7d08b..3ca8d90 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.3 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_error_inc.vspx b/binsrc/yacutia/vdb_error_inc.vspx
index 3591606..3fec91a 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.3 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_errs.vspx b/binsrc/yacutia/vdb_errs.vspx
index 5a8e1d6..723eba1 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.4 2010/09/20 10:16:55 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_export.vspx b/binsrc/yacutia/vdb_export.vspx
index d192a88..9b69447 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.3 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_link.vspx b/binsrc/yacutia/vdb_link.vspx
index 5f467de..37b95eb 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.3 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_linked_obj.vspx b/binsrc/yacutia/vdb_linked_obj.vspx
index 51d2ea6..d6878f4 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.4 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_main.vspx b/binsrc/yacutia/vdb_main.vspx
index b0db9be..fb5e810 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.3 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_obj_link.vspx b/binsrc/yacutia/vdb_obj_link.vspx
index 5d1fa41..de5d86d 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.3 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_obj_link_opts.vspx b/binsrc/yacutia/vdb_obj_link_opts.vspx
index d63eb4c..aab5afe 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.4 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_obj_link_pk.vspx b/binsrc/yacutia/vdb_obj_link_pk.vspx
index 1819f5a..3ea6246 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.3 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_resources.vspx b/binsrc/yacutia/vdb_resources.vspx
index 33c2fa5..c1350cb 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.3 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdb_unlink_obj.vspx b/binsrc/yacutia/vdb_unlink_obj.vspx
index b1190b6..e5c748e 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.4 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vdir_browser.vspx b/binsrc/yacutia/vdir_browser.vspx
index c6e6e18..5cba664 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.4 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vfs_export.vspx b/binsrc/yacutia/vfs_export.vspx
index 1026353..193c495 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.5 2011/05/02 14:13:41 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/vhost_export.vspx b/binsrc/yacutia/vhost_export.vspx
index 76e4c4e..3c46b98 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.2 2010/09/20 10:16:56 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/view.vsp b/binsrc/yacutia/view.vsp
index a0dc903..29d2ba3 100644
--- a/binsrc/yacutia/view.vsp
+++ b/binsrc/yacutia/view.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: view.vsp,v 1.2.2.2 2010/09/20 10:16:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/view.vspx b/binsrc/yacutia/view.vspx
index 613266c..499664f 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.2 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/view_dav_res.vsp b/binsrc/yacutia/view_dav_res.vsp
index 04f0db3..fa4d9d7 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.2 2010/09/20 10:16:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/view_file.vsp b/binsrc/yacutia/view_file.vsp
index 2ccd97e..d2ec098 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.2 2010/09/20 10:16:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/virtuoso_splash.vspx b/binsrc/yacutia/virtuoso_splash.vspx
index e06eab0..548cee7 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.2 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/wsdl_service_create.vspx b/binsrc/yacutia/wsdl_service_create.vspx
index 9f06594..7381943 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.4 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/wsdl_services.vspx b/binsrc/yacutia/wsdl_services.vspx
index 49b4826..1e79518 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.3 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/wsdltree.vspx b/binsrc/yacutia/wsdltree.vspx
index 7d676c1..f7217ac 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.4 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xddl-tables.vspx b/binsrc/yacutia/xddl-tables.vspx
index acf76a9..037e371 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.4 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xddl.vspx b/binsrc/yacutia/xddl.vspx
index 6e1f180..fa9210c 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.2 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xml_check.vspx b/binsrc/yacutia/xml_check.vspx
index 0097120..39515dd 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.2 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xml_sql.vspx b/binsrc/yacutia/xml_sql.vspx
index 6e275a5..dea9d92 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.4 2010/09/20 10:16:57 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xml_sql2.vspx b/binsrc/yacutia/xml_sql2.vspx
index 1a6c228..77cc7d0 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.3 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xml_sql_check.vspx b/binsrc/yacutia/xml_sql_check.vspx
index 4745b29..e01924c 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.2 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xml_sql_view_show.vspx b/binsrc/yacutia/xml_sql_view_show.vspx
index 17f8259..f9ff543 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.2 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xml_xsd.vspx b/binsrc/yacutia/xml_xsd.vspx
index b4ef110..885a5b6 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.4 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xquery.vspx b/binsrc/yacutia/xquery.vspx
index 4735f68..b655da2 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.3 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xquery2.vspx b/binsrc/yacutia/xquery2.vspx
index df1b869..5f29991 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.3 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xquery3.vspx b/binsrc/yacutia/xquery3.vspx
index 17f718a..bafed2e 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.3 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xquery4.vspx b/binsrc/yacutia/xquery4.vspx
index ba38c18..372173d 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.3 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xquery_adv.vspx b/binsrc/yacutia/xquery_adv.vspx
index 4bcb86d..b7a51fa 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.3 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xquery_check.vspx b/binsrc/yacutia/xquery_check.vspx
index 42444fc..77131c0 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.2 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xquery_src_show.vspx b/binsrc/yacutia/xquery_src_show.vspx
index 9b54af3..6351630 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.2 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xquery_templates.vspx b/binsrc/yacutia/xquery_templates.vspx
index 7120c6c..77e15d7 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.4 2010/09/20 10:16:58 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xslt.vspx b/binsrc/yacutia/xslt.vspx
index bf51af6..cdc0033 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.3 2010/09/20 10:16:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xslt_inc.vspx b/binsrc/yacutia/xslt_inc.vspx
index 411ed58..7c9f17d 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.3 2010/09/20 10:16:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xslt_res.vsp b/binsrc/yacutia/xslt_res.vsp
index ef67db6..902c1d3 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.3 2010/09/20 10:16:59 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/xslt_res.vspx b/binsrc/yacutia/xslt_res.vspx
index f3855a5..fa50290 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.2 2010/09/20 10:16:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/xslt_result.vspx b/binsrc/yacutia/xslt_result.vspx
index 1acff0a..40253bf 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.3 2010/09/20 10:16:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/yac.sql b/binsrc/yacutia/yac.sql
index fe12bee..e23234a 100644
--- a/binsrc/yacutia/yac.sql
+++ b/binsrc/yacutia/yac.sql
@@ -1,10 +1,10 @@
--
--- $Id: yac.sql,v 1.1.1.1.2.3 2010/09/20 10:16:59 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/binsrc/yacutia/yacutia.sql b/binsrc/yacutia/yacutia.sql
index 80e43fb..7fbc60e 100644
--- a/binsrc/yacutia/yacutia.sql
+++ b/binsrc/yacutia/yacutia.sql
@@ -1,10 +1,10 @@
--
--- $Id: yacutia.sql,v 1.43.2.40 2011/10/25 23:34:29 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -18,6 +18,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
+--
/* Aggregate concat */
@@ -192,9 +193,10 @@ yacutia_http_log_ui_labels ()
create procedure adm_menu_tree ()
{
- declare wa_available, rdf_available integer;
- wa_available := gt (DB.DBA.VAD_CHECK_VERSION ('Framework'), '1.02.13');
- rdf_available := DB.DBA.VAD_CHECK_VERSION('rdf_mappers');
+ declare wa_available, rdf_available, policy_vad integer;
+ wa_available := VAD.DBA.VER_LT ('1.02.13', DB.DBA.VAD_CHECK_VERSION ('Framework'));
+ policy_vad := DB.DBA.VAD_CHECK_VERSION ('policy_manager');
+ rdf_available := check_package ('rdf_mappers') + check_package ('cartridges');
return concat (
'<?xml version="1.0" ?>
<adm_menu_tree>
@@ -331,10 +333,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.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_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_local.vspx" id="85" place="1"/>
<node name="Incremental" url="db_repl_snap_local_create.vspx" id="86" place="1" />
</node>
@@ -449,7 +451,7 @@ case when 0 and check_package('rdf_mappers') then
'<node name="Stylesheets" url="sparql_filters.vspx" id="190" tip="GRDDL " allowed="yacutia_message">
<node name="Stylesheets" url="sparql_filters.vspx" id="182" place="1" allowed="yacutia_sparql_page" />
</node>' else '' end,
- '<node name="Sponger" url="rdf_filters.vspx" id="191" tip="RDF Mappers " allowed="yacutia_message">
+ '<node name="Sponger" url="rdf_filters.vspx" id="191" tip="Linked Data Cartridges " allowed="yacutia_message">
<node name="Cartridges" url="rdf_filters.vspx" id="192" place="1" allowed="yacutia_sparql_page" />
<node name="Meta Cartridges" url="rdf_filters_pp.vspx" id="193" place="1" allowed="yacutia_sparql_page" />
<node name="Stylesheets" url="sparql_filters.vspx" id="182" place="1" allowed="yacutia_sparql_page" />
@@ -464,15 +466,18 @@ case when 0 and check_package('rdf_mappers') then
<node name="Schemas" url="rdf_schemas.vspx" id="184" place="1" allowed="yacutia_sparql_page" />
</node>
<node name="Namespaces" url="persistent_xmlns.vspx" id="183" allowed="yacutia_message" />',
- case when (wa_available is not null and rdf_available is null) then
+ case when ((wa_available > 0 or policy_vad is not null) and rdf_available > 0) then
' <node name="Access Control" url="sparql_acl.vspx" id="274" allowed="yacutia_acls">
- <node name="ACL List" url="sec_auth_serv_sp.vspx" id="277" place="1" allowed="yacutia_acls"/>'
+ <node name="ACL List" url="sec_auth_serv_sp.vspx" id="277" place="1" allowed="yacutia_acls"/>
+ <node name="Sponger Groups" url="sec_auth_sponger_1.vspx" id="277" place="1" allowed="yacutia_acls"/>
+ <node name="Sponger ACL" url="sec_auth_sponger_2.vspx" id="277" place="1" allowed="yacutia_acls"/>
+ '
else
'<node name="Access Control" url="sec_auth_serv_sp.vspx" id="274" allowed="yacutia_acls">
<node name="ACL List" url="sec_auth_serv_sp.vspx" id="275" place="1" allowed="yacutia_acls"/>'
end,
' <node name="ACL Edit" url="sec_acl_edit_sp.vspx" id="276" place="1" allowed="yacutia_acls"/>',
- case when (wa_available is not null) then
+ case when (wa_available > 0 or policy_vad is not null) then
'<node name="SPARQL ACL" url="sparql_acl.vspx" id="277" place="1" allowed="yacutia_acls"/>'
else '' end,
'</node>
@@ -484,8 +489,12 @@ case when 0 and check_package('rdf_mappers') then
<node name="Views" url="db_rdf_view_3.vspx" id="273" place="1"/>
<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="Quad Store Upload" url="rdf_import.vspx" id="271" allowed="rdf_import_page"/>',
+ <node name="Views" url="db_rdf_view_pk.vspx" id="273" place="1"/>',
+case when check_package('rdb2rdf') then
+ '<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"/>' else '' end,
+ '<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"/>'
else
@@ -669,7 +678,8 @@ adm_db_tree ()
i := i + 1;
http (sprintf ('<node name="%V" id="%d">', TABLE_QUAL, i), ses);
http (sprintf ('<node name="Tables" id="1-%d"/>\n', i), ses);
- http (sprintf ('<node name="Views" id="2-%d"/>\n', i), ses);
+ http (sprintf ('<node name="Views (SQL)" id="2-%d"/>\n', i), ses);
+ http (sprintf ('<node name="Views (Linked Data)" id="5-%d"/>\n', i), ses);
http (sprintf ('<node name="Procedures" id="3-%d"/>\n', i), ses);
http (sprintf ('<node name="User Defined Types" id="4-%d"/>\n', i), ses);
http ('</node>\n', ses);
@@ -4108,6 +4118,7 @@ YACUTIA_DAV_DIR_LIST_P (in path varchar := '/DAV/', in recursive integer := 0, i
}
;
+yacutia_exec_no_error ('drop view Y_DAV_DIR');
yacutia_exec_no_error('create procedure view Y_DAV_DIR as YACUTIA_DAV_DIR_LIST_P (path,recursive,auth_uid) (FULL_PATH varchar, TYPE varchar, RLENGTH integer, MOD_TIME datetime, ID integer, PERMS varchar, GRP varchar, OWNER varchar, CR_TIME datetime, MIME_TYPE varchar, NAME varchar)')
;
@@ -5892,7 +5903,7 @@ create procedure yac_vec_add (in k varchar, in v varchar, inout opts any)
create procedure
-yac_set_ssl_key (in k varchar, in v varchar, inout opts any)
+yac_set_ssl_key (in k varchar, in v varchar, in extra varchar, inout opts any)
{
if (k = 'none' or not length (k))
{
@@ -5900,7 +5911,7 @@ yac_set_ssl_key (in k varchar, in v varchar, inout opts any)
new_opts := vector ();
for (declare i, l int, i := 0, l := length (opts); i < l; i := i + 2)
{
- if (opts[i] not in ('https_cert', 'https_key', 'https_verify', 'https_cv_depth'))
+ if (opts[i] not in ('https_cert', 'https_key', 'https_verify', 'https_cv_depth', 'https_extra_chain_certificates'))
new_opts := vector_concat (new_opts, vector (opts[i], opts[i+1]));
}
opts := new_opts;
@@ -5909,6 +5920,7 @@ yac_set_ssl_key (in k varchar, in v varchar, inout opts any)
{
yac_vec_add ('https_cert', 'db:'||k, opts);
yac_vec_add ('https_key', 'db:'||k, opts);
+ yac_vec_add ('https_extra_chain_certificates', extra, opts);
yac_vec_add ('https_verify', cast (v as int), opts);
yac_vec_add ('https_cv_depth', 10, opts);
}
@@ -6232,6 +6244,8 @@ create procedure y_rdf_api_type (in t int)
return 'URL';
else if (t = 2)
return 'keywords';
+ else if (t = 3)
+ return 'preprocess';
return '';
}
;
@@ -6523,3 +6537,73 @@ 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;
+}
+;
+
+
+create procedure vector_to_text_opt (in v any)
+{
+ declare i int;
+ declare r varchar;
+ if (v is null) return '';
+ r := '';
+ for (i := 0; i < length (v); i := i + 2)
+ r := r || v[i] || '=' || v[i+1] || ';\r\n';
+ return r;
+}
+;
+
+create procedure text_opt_to_vector (in s varchar)
+{
+ declare inx int;
+ declare arr any;
+ s := replace (s, '\n', '');
+ s := replace (s, '\r', '');
+ s := trim (s);
+ s := rtrim (s, ';');
+ s := replace (s, ';', '&');
+ arr := split_and_decode (s);
+ if (0 = length (arr))
+ return NULL;
+ inx := 0;
+ foreach (varchar x in arr) do
+ {
+ arr[inx] := trim (x);
+ inx := inx + 1;
+ }
+ return arr;
+}
+;
diff --git a/binsrc/yacutia/yacutia_decor.vspx b/binsrc/yacutia/yacutia_decor.vspx
index 8350288..cf02cb9 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.4 2010/09/20 10:16:59 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -45,12 +45,11 @@
<link rel="alternate" type="application/rss+xml" title="Benchmark & Troubleshooting Utilities Screencasts"
href="http://support.openlinksw.com/viewlets/utilities_viewlets_rss.vsp" />
<title></title>
-
<![CDATA[
<script type="text/javascript" src="toolkit/loader.js"></script>
<script type="text/javascript">
OAT.Preferences.imagePath = "images/";
- OAT.Loader.load(["combolist", "ajax", "tab"], function(){OAT.MSG.send(OAT, 'PAGE_LOADED');});
+ OAT.Loader.load(["combolist", "ajax", "tab", "json", "calendar"], function(){OAT.MSG.send(OAT, 'PAGE_LOADED');});
</script>
]]>
</head>
diff --git a/binsrc/yacutia/yacutia_style.css b/binsrc/yacutia/yacutia_style.css
index db0ac9d..1ef39a7 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.8 2011/01/25 14:21:44 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2176,3 +2176,41 @@ span.button {
img.button {
margin-bottom: -3px;
}
+
+/* Popup Calendar */
+.calendar {
+ border: 1px solid #000;
+ background-color: #FFF;
+ z-index: 101;
+}
+
+.calendar_year, .calendar_month {
+ text-align: center;
+ border-bottom: 1px solid #aaa;
+ padding: 2px 0px;
+}
+
+.calendar table {
+ margin-top: 2px;
+}
+
+.calendar thead {
+ font-weight: bold;
+}
+
+.calendar thead td {
+ padding: 0px 2px;
+}
+
+.calendar td {
+ font-size: 75%;
+ text-align: center;
+}
+
+td.calendar_selected {
+ background-color: #faa;
+}
+
+.calendar_special {
+ color: #c55;
+}
diff --git a/binsrc/yacutia/yacutia_style.xsl b/binsrc/yacutia/yacutia_style.xsl
index 47b7adf..c927563 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.5 2011/01/25 14:21:44 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -26,7 +26,6 @@
-->
<!--
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 0b6aab1..6018098 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.3 2010/09/20 10:17:00 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/binsrc/yacutia/yacutia_vdir_style.css b/binsrc/yacutia/yacutia_vdir_style.css
index 2ca7adb..d1be98e 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.2 2010/09/20 10:17:00 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/configure b/configure
index 2db69c6..b15cd45 100755
--- a/configure
+++ b/configure
@@ -1,86 +1,63 @@
#! /bin/sh
-# From configure.in Id: configure.in.
+# From configure.in Id.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Virtuoso Open Source Edition 6.1.4.
+# Generated by GNU Autoconf 2.61 for Virtuoso Open Source Edition 6.1.6.
#
# Report bugs to <vos.admin at openlinksw.com>.
#
-#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
esac
+
fi
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
+ PATH_SEPARATOR=:
fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
+ rm -f conf$$.sh
fi
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
fi
@@ -89,19 +66,20 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
+as_nl='
+'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
IFS=$as_save_IFS
;;
@@ -112,278 +90,32 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
fi
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-"
- as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
- exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- 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"
- if (eval "$as_required") 2>/dev/null; then :
- as_have_required=yes
-else
- as_have_required=no
-fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- as_found=:
- case $as_dir in #(
- /*)
- for as_base in sh bash ksh sh5; do
- # Try only shells that exist, to save several forks.
- as_shell=$as_dir/$as_base
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
- CONFIG_SHELL=$as_shell as_have_required=yes
- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
- break 2
-fi
-fi
- done;;
- esac
- as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
- if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
else
- $as_echo "$0: Please tell bug-autoconf at gnu.org and
-$0: vos.admin at openlinksw.com about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
- fi
- exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} # as_fn_error
+done
+# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -397,17 +129,13 @@ else
as_basename=false
fi
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -422,276 +150,432 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
- as_lineno_1=$LINENO as_lineno_1a=$LINENO
- as_lineno_2=$LINENO 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'"' || {
- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+if test "x$CONFIG_SHELL" = x; then
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
+else
+ as_have_required=no
+fi
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
+ if test $as_have_required = yes && (eval ":
+(as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
}
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T=' ';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
+exitcode=0
+if as_func_success; then
+ :
else
- as_ln_s='cp -p'
+ exitcode=1
+ echo as_func_success failed.
fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
+if as_func_ret_success; then
+ :
else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
+ exitcode=1
+ echo as_func_ret_success failed.
fi
-as_executable_p=$as_test_x
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+test \$exitcode = 0) || { (exit 1); exit 1; }
+(
+ as_lineno_1=\$LINENO
+ as_lineno_2=\$LINENO
+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
+(
+ 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); exit 1; }
+") 2> /dev/null; then
+ :
+else
+ as_candidate_shells=
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ case $as_dir in
+ /*)
+ for as_base in sh bash ksh sh5; do
+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ done;;
+ esac
+done
+IFS=$as_save_IFS
-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!
- :
+ for as_shell in $as_candidate_shells $SHELL; do
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
else
- # Restart under the correct shell.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
-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
+:
+_ASEOF
+}; then
+ CONFIG_SHELL=$as_shell
+ as_have_required=yes
+ if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
- 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.
+fi
- 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
+:
+(as_func_return () {
+ (exit $1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); 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); exit 1; }
+
+_ASEOF
+}; then
+ break
+fi
+
+fi
+
+ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
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
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+ if test $as_have_required = no; then
+ echo This script requires a shell more modern than all the
+ echo shells that I found on your system. Please install a
+ echo modern shell, or manually run the script under such a
+ echo shell if you do have one.
+ { (exit 1); exit 1; }
+fi
+
- 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
+(eval "as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+ echo No shell found that supports shell functions.
+ echo Please tell autoconf at gnu.org about your system,
+ echo including any error possibly output before this
+ echo message
+}
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+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'"
+
+
+SHELL=${CONFIG_SHELL-/bin/sh}
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
+
+exec 7<&0 </dev/null 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -706,14 +590,14 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Virtuoso Open Source Edition'
PACKAGE_TARNAME='virtuoso-opensource'
-PACKAGE_VERSION='6.1.4'
-PACKAGE_STRING='Virtuoso Open Source Edition 6.1.4'
+PACKAGE_VERSION='6.1.6'
+PACKAGE_STRING='Virtuoso Open Source Edition 6.1.6'
PACKAGE_BUGREPORT='vos.admin at openlinksw.com'
-PACKAGE_URL=''
ac_unique_file="libsrc/Dk.h"
ac_default_prefix=/usr/local/virtuoso-opensource
@@ -753,1562 +637,6169 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-SYSLIBS
-VIRT_AM_CFLAGS
-clntlibs
-srvrlibs
-ccincl
-AM_LDFLAGS
-CCPLATFORMDEFS
-OPSYS
-WITH_TUTORIAL_VAD_FALSE
-WITH_TUTORIAL_VAD_TRUE
-WITH_SYNCML_VAD_FALSE
-WITH_SYNCML_VAD_TRUE
-WITH_SPARQLDEMO_VAD_FALSE
-WITH_SPARQLDEMO_VAD_TRUE
-WITH_RDFMAPPERS_VAD_FALSE
-WITH_RDFMAPPERS_VAD_TRUE
-WITH_ODS_VAD_FALSE
-WITH_ODS_VAD_TRUE
-WITH_ISPARQL_VAD_FALSE
-WITH_ISPARQL_VAD_TRUE
-WITH_FCT_VAD_FALSE
-WITH_FCT_VAD_TRUE
-WITH_DEMO_VAD_FALSE
-WITH_DEMO_VAD_TRUE
-WITH_CONDUCTOR_VAD_FALSE
-WITH_CONDUCTOR_VAD_TRUE
-WITH_BPEL_VAD_FALSE
-WITH_BPEL_VAD_TRUE
-PORT
-INTEG_JDK_FALSE
-INTEG_JDK_TRUE
-java_LDFLAGS
-java_CPPFLAGS
-ac_jdk4_path
-WITH_JDK4_FALSE
-WITH_JDK4_TRUE
-ac_jdk3_path
-WITH_JDK3_FALSE
-WITH_JDK3_TRUE
-ac_jdk2_path
-WITH_JDK2_FALSE
-WITH_JDK2_TRUE
-WITH_IODBC_FALSE
-WITH_IODBC_TRUE
-iodbc_LDFLAGS
-LIBDL
-LIBRDL
-WITH_PTHREADS_FALSE
-WITH_PTHREADS_TRUE
-LIBTHR
-GMODULE_LIBS
-GMODULE_CFLAGS
-GLIB_LIBS
-GLIB_CFLAGS
-BUILD_GLIB_LIBS
-BUILD_GLIB_CFLAGS
-PKG_CONFIG
-WITH_ZLIB_FALSE
-WITH_ZLIB_TRUE
-ZLIB_LIB
-ZLIB_INC
-RUBY_LDFLAGS
-RUBY_CFLAGS
-WITH_RUBY_FALSE
-WITH_RUBY_TRUE
-PYTHON_LDFLAGS
-PYTHON_CFLAGS
-WITH_PYTHON_FALSE
-WITH_PYTHON_TRUE
-PERL_LDFLAGS
-PERL_CFLAGS
-WITH_PERL_FALSE
-WITH_PERL_TRUE
-WBXML2_LDFLAGS
-WBXML2_CFLAGS
-WITH_WBXML2_FALSE
-WITH_WBXML2_TRUE
-IM_LIBS
-IM_LDFLAGS
-IM_CPPFLAGS
-WITH_IM_FALSE
-WITH_IM_TRUE
-IM_CONFIG
-HSL_LIBS
-HSL_LDFLAGS
-HSL_CPPFLAGS
-WITH_HSL_FALSE
-WITH_HSL_TRUE
-HS_LOOKUP
-HAVE_MONO_FALSE
-HAVE_MONO_TRUE
-WGET
-XML_LIBS
-XML_CPPFLAGS
-XML2_CONFIG
-php5_LDFLAGS
-php5_CFLAGS
-HAVE_PHP5_FALSE
-HAVE_PHP5_TRUE
-WITH_PLDEBUG_FALSE
-WITH_PLDEBUG_TRUE
-PLSTATS
-WITH_IMSG_FALSE
-WITH_IMSG_TRUE
-openldap_LDFLAGS
-openldap_CFLAGS
-WITH_LDAP_FALSE
-WITH_LDAP_TRUE
-openssl_LDFLAGS
-openssl_CFLAGS
-WITH_KERBEROS_FALSE
-WITH_KERBEROS_TRUE
-libxml_file
-BUILD_OPTS
-CCLIBS
-CCOPT
-CCDEFS
-CCWARN
-CCDEBUG
-LIBOBJS
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-lt_ECHO
-RANLIB
-AR
-OBJDUMP
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LIBTOOL
-RUBY
-PYTHON
-PERL
-GPERF
-GAWK
-FLEX
-LEXLIB
-LEX_OUTPUT_ROOT
-LEX
-WITH_HTMLDOC_FALSE
-WITH_HTMLDOC_TRUE
-HTMLDOC
-YFLAGS
-YACC
-LN_S
-LD
-FGREP
-EGREP
-GREP
-SED
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-CPP
-INCDIR
-BINDIR
-LIBDIR
-TOP
-hostingdir
-httprootdir
-pdfdocdir
-htmldocdir
-dbdir
-demodir
-vaddir
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
+ac_subst_vars='SHELL
PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_maintainer_mode
-with_layout
-enable_dependency_tracking
-with_gnu_ld
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-enable_libtool_lock
-with_debug
-enable_xml
-enable_krb
-enable_openssl
-enable_openldap
-enable_imsg
-enable_pldebug
-enable_rendezvous
-enable_php5
-with_xml_prefix
-with_xml_exec_prefix
-enable_xmltest
-enable_mono
-enable_hslookup
-enable_imagemagick
-enable_wbxml2
-enable_perl
-enable_python
-enable_ruby
-with_internal_zlib
-with_malloc_debug
-with_mtx_debug
-with_pthreads
-with_crosspkgdir
-enable_aio
-with_libs
-with_editline
-with_readline
-with_iodbc
-with_jdk2
-with_jdk3
-with_jdk4
-with_port
-enable_
-enable_bpel_vad
-enable_conductor_vad
-enable_demo_vad
-enable_fct_vad
-enable_isparql_vad
-enable_ods_vad
-enable_rdfmappers_vad
-enable_sparqldemo_vad
-enable_syncml_vad
-enable_tutorial_vad
-enable_all_vads
-'
- ac_precious_vars='build_alias
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
host_alias
target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-YACC
-YFLAGS'
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+am__isrc
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+vaddir
+demodir
+dbdir
+htmldocdir
+pdfdocdir
+httprootdir
+hostingdir
+TOP
+LIBDIR
+BINDIR
+INCDIR
+CPP
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+SED
+GREP
+EGREP
+FGREP
+LD
+LN_S
+YACC
+YFLAGS
+HTMLDOC
+WITH_HTMLDOC_TRUE
+WITH_HTMLDOC_FALSE
+LEX
+LEX_OUTPUT_ROOT
+LEXLIB
+FLEX
+GAWK
+GPERF
+PERL
+PYTHON
+RUBY
+LIBTOOL
+DUMPBIN
+ac_ct_DUMPBIN
+NM
+OBJDUMP
+AR
+RANLIB
+DSYMUTIL
+NMEDIT
+LIPO
+OTOOL
+OTOOL64
+LIBOBJS
+CCDEBUG
+CCWARN
+CCDEFS
+CCOPT
+CCLIBS
+BUILD_OPTS
+libxml_file
+WITH_KERBEROS_TRUE
+WITH_KERBEROS_FALSE
+openssl_CFLAGS
+openssl_LDFLAGS
+WITH_LDAP_TRUE
+WITH_LDAP_FALSE
+openldap_CFLAGS
+openldap_LDFLAGS
+WITH_IMSG_TRUE
+WITH_IMSG_FALSE
+PLSTATS
+WITH_PLDEBUG_TRUE
+WITH_PLDEBUG_FALSE
+HAVE_PHP5_TRUE
+HAVE_PHP5_FALSE
+php5_CFLAGS
+php5_LDFLAGS
+XML2_CONFIG
+XML_CPPFLAGS
+XML_LIBS
+WGET
+HAVE_MONO_TRUE
+HAVE_MONO_FALSE
+HS_LOOKUP
+WITH_HSL_TRUE
+WITH_HSL_FALSE
+HSL_CPPFLAGS
+HSL_LDFLAGS
+HSL_LIBS
+IM_CONFIG
+WITH_IM_TRUE
+WITH_IM_FALSE
+IM_CPPFLAGS
+IM_LDFLAGS
+IM_LIBS
+WITH_WBXML2_TRUE
+WITH_WBXML2_FALSE
+WBXML2_CFLAGS
+WBXML2_LDFLAGS
+WITH_PERL_TRUE
+WITH_PERL_FALSE
+PERL_CFLAGS
+PERL_LDFLAGS
+WITH_PYTHON_TRUE
+WITH_PYTHON_FALSE
+PYTHON_CFLAGS
+PYTHON_LDFLAGS
+WITH_RUBY_TRUE
+WITH_RUBY_FALSE
+RUBY_CFLAGS
+RUBY_LDFLAGS
+ZLIB_INC
+ZLIB_LIB
+WITH_ZLIB_TRUE
+WITH_ZLIB_FALSE
+PKG_CONFIG
+BUILD_GLIB_CFLAGS
+BUILD_GLIB_LIBS
+GLIB_CFLAGS
+GLIB_LIBS
+GMODULE_CFLAGS
+GMODULE_LIBS
+LIBTHR
+WITH_PTHREADS_TRUE
+WITH_PTHREADS_FALSE
+LIBRDL
+LIBDL
+iodbc_LDFLAGS
+WITH_IODBC_TRUE
+WITH_IODBC_FALSE
+WITH_JDK2_TRUE
+WITH_JDK2_FALSE
+ac_jdk2_path
+WITH_JDK3_TRUE
+WITH_JDK3_FALSE
+ac_jdk3_path
+WITH_JDK4_TRUE
+WITH_JDK4_FALSE
+ac_jdk4_path
+java_CPPFLAGS
+java_LDFLAGS
+INTEG_JDK_TRUE
+INTEG_JDK_FALSE
+PORT
+WITH_BPEL_VAD_TRUE
+WITH_BPEL_VAD_FALSE
+WITH_CONDUCTOR_VAD_TRUE
+WITH_CONDUCTOR_VAD_FALSE
+WITH_DBPEDIA_VAD_TRUE
+WITH_DBPEDIA_VAD_FALSE
+WITH_DEMO_VAD_TRUE
+WITH_DEMO_VAD_FALSE
+WITH_FCT_VAD_TRUE
+WITH_FCT_VAD_FALSE
+WITH_ISPARQL_VAD_TRUE
+WITH_ISPARQL_VAD_FALSE
+WITH_ODS_VAD_TRUE
+WITH_ODS_VAD_FALSE
+WITH_RDB2RDF_VAD_TRUE
+WITH_RDB2RDF_VAD_FALSE
+WITH_RDFMAPPERS_VAD_TRUE
+WITH_RDFMAPPERS_VAD_FALSE
+WITH_SPARQLDEMO_VAD_TRUE
+WITH_SPARQLDEMO_VAD_FALSE
+WITH_SYNCML_VAD_TRUE
+WITH_SYNCML_VAD_FALSE
+WITH_TUTORIAL_VAD_TRUE
+WITH_TUTORIAL_VAD_FALSE
+OPSYS
+CCPLATFORMDEFS
+AM_LDFLAGS
+ccincl
+srvrlibs
+clntlibs
+VIRT_AM_CFLAGS
+SYSLIBS
+LTLIBOBJS'
+ac_subst_files=''
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+YACC
+YFLAGS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+ eval $ac_prev=\$ac_option
+ ac_prev=
+ continue
+ fi
+
+ case $ac_option in
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir=$ac_optarg ;;
+
+ -build | --build | --buil | --bui | --bu)
+ ac_prev=build_alias ;;
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+ build_alias=$ac_optarg ;;
+
+ -cache-file | --cache-file | --cache-fil | --cache-fi \
+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+ ac_prev=cache_file ;;
+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+ cache_file=$ac_optarg ;;
+
+ --config-cache | -C)
+ cache_file=config.cache ;;
+
+ -datadir | --datadir | --datadi | --datad)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ datadir=$ac_optarg ;;
+
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
+ -disable-* | --disable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+ | --exec | --exe | --ex)
+ ac_prev=exec_prefix ;;
+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+ | --exec=* | --exe=* | --ex=*)
+ exec_prefix=$ac_optarg ;;
+
+ -gas | --gas | --ga | --g)
+ # Obsolete; use --with-gas.
+ with_gas=yes ;;
+
+ -help | --help | --hel | --he | -h)
+ ac_init_help=long ;;
+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+ ac_init_help=recursive ;;
+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+ ac_init_help=short ;;
+
+ -host | --host | --hos | --ho)
+ ac_prev=host_alias ;;
+ -host=* | --host=* | --hos=* | --ho=*)
+ host_alias=$ac_optarg ;;
+
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir=$ac_optarg ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir=$ac_optarg ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ libdir=$ac_optarg ;;
+
+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+ | --libexe | --libex | --libe)
+ ac_prev=libexecdir ;;
+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir=$ac_optarg ;;
+
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst | --locals)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ localstatedir=$ac_optarg ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir=$ac_optarg ;;
+
+ -nfp | --nfp | --nf)
+ # Obsolete; use --without-fp.
+ with_fp=no ;;
+
+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+ | --no-cr | --no-c | -n)
+ no_create=yes ;;
+
+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+ no_recursion=yes ;;
+
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir=$ac_optarg ;;
+
+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+ ac_prev=prefix ;;
+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+ prefix=$ac_optarg ;;
+
+ -program-prefix | --program-prefix | --program-prefi | --program-pref \
+ | --program-pre | --program-pr | --program-p)
+ ac_prev=program_prefix ;;
+ -program-prefix=* | --program-prefix=* | --program-prefi=* \
+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+ program_prefix=$ac_optarg ;;
+
+ -program-suffix | --program-suffix | --program-suffi | --program-suff \
+ | --program-suf | --program-su | --program-s)
+ ac_prev=program_suffix ;;
+ -program-suffix=* | --program-suffix=* | --program-suffi=* \
+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+ program_suffix=$ac_optarg ;;
+
+ -program-transform-name | --program-transform-name \
+ | --program-transform-nam | --program-transform-na \
+ | --program-transform-n | --program-transform- \
+ | --program-transform | --program-transfor \
+ | --program-transfo | --program-transf \
+ | --program-trans | --program-tran \
+ | --progr-tra | --program-tr | --program-t)
+ ac_prev=program_transform_name ;;
+ -program-transform-name=* | --program-transform-name=* \
+ | --program-transform-nam=* | --program-transform-na=* \
+ | --program-transform-n=* | --program-transform-=* \
+ | --program-transform=* | --program-transfor=* \
+ | --program-transfo=* | --program-transf=* \
+ | --program-trans=* | --program-tran=* \
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name=$ac_optarg ;;
+
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir=$ac_optarg ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir=$ac_optarg ;;
+
+ -site | --site | --sit)
+ ac_prev=site ;;
+ -site=* | --site=* | --sit=*)
+ site=$ac_optarg ;;
+
+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+ ac_prev=srcdir ;;
+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+ srcdir=$ac_optarg ;;
+
+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+ | --syscon | --sysco | --sysc | --sys | --sy)
+ ac_prev=sysconfdir ;;
+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+ sysconfdir=$ac_optarg ;;
+
+ -target | --target | --targe | --targ | --tar | --ta | --t)
+ ac_prev=target_alias ;;
+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+ target_alias=$ac_optarg ;;
+
+ -v | -verbose | --verbose | --verbos | --verbo | --verb)
+ verbose=yes ;;
+
+ -version | --version | --versio | --versi | --vers | -V)
+ ac_init_version=: ;;
+
+ -with-* | --with-*)
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=\$ac_optarg ;;
+
+ -without-* | --without-*)
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+ with_x=yes ;;
+
+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+ | --x-incl | --x-inc | --x-in | --x-i)
+ ac_prev=x_includes ;;
+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+ x_includes=$ac_optarg ;;
+
+ -x-libraries | --x-libraries | --x-librarie | --x-librari \
+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+ ac_prev=x_libraries ;;
+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
+ ;;
+
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+ # FIXME: should be removed in autoconf 3.0.
+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ ;;
+
+ esac
+done
+
+if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+ { echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
+fi
+
+# Be sure to have absolute directory names.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
+do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+ { echo "$as_me: error: Working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$0" ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$0" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ srcdir=$ac_confdir
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ srcdir=..
+ fi
+else
+ ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ { (exit 1); exit 1; }; }
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+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.6 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE. See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+ -h, --help display this help and exit
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+ -q, --quiet, --silent do not print \`checking...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+ [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/virtuoso-opensource]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
+_ACEOF
+
+ cat <<\_ACEOF
+
+Program names:
+ --program-prefix=PREFIX prepend PREFIX to installed program names
+ --program-suffix=SUFFIX append SUFFIX to installed program names
+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of Virtuoso Open Source Edition 6.1.6:";;
+ esac
+ cat <<\_ACEOF
+
+Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-shared[=PKGS] build shared libraries [default=yes]
+ --enable-static[=PKGS] build static libraries [default=yes]
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+ --disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-xml enable XML extension (default)
+ --disable-xml disable XML extension
+ --enable-krb(=DIR) enable Kerberos extension
+ --disable-krb disable Kerberos extension (default)
+ --enable-openssl(=DIR) enable OpenSSL support (default)
+ --disable-openssl disable OpenSSL support
+ --enable-openldap(=DIR) enable OpenLDAP support (default)
+ --disable-openldap disable OpenLDAP support
+ --enable-imsg enable POP3 and NNTP extension (default)
+ --disable-imsg disable POP3 and NNTP extension]
+ --enable-pldebug enable Virtuoso/PL debugger support (default)
+ --disable-pldebug disable Virtuoso/PL debugger support
+ --enable-rendezvous(=DIR)
+ enable rendezvous extension
+ --disable-rendezvous disable rendezvous extension (default)
+ --enable-php5(=DIR) enable PHP 5.x extension
+ --disable-php5 disable PHP 5.x extension (default)
+ --disable-xmltest Do not try to compile and run a test LIBXML program
+ --enable-mono enable Mono extension
+ --disable-mono disable Mono extension (default)
+ --enable-hslookup(=DIR) enable the hslookup plugin (default)
+ --disable-hslookup disable the hslookup plugin
+ --enable-imagemagick(=DIR)
+ enable the ImageMagick plugin (default)
+ --disable-imagemagick disable the ImageMagick plugin
+ --enable-wbxml2(=DIR) enable the WBXML2 plugin (default)
+ --disable-wbxml2 disable the WBXML2 plugin
+ --enable-perl enable PERL hosting
+ --disable-perl disable PERL hosting (default)
+ --enable-python enable PYTHON hosting
+ --disable-python disable PYTHON hosting (default)
+ --enable-ruby enable RUBY hosting
+ --disable-ruby disable RUBY hosting (default)
+ --enable-aio enable AIO support
+ --disable-aio disable AIO support (default)
+
+VAD Packages:
+ --enable-bpel-vad enable BPEL vad (default)
+ --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-dbpedia-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)
+ --disable-fct-vad disable Facet Browser vad package]
+ --enable-isparql-vad enable iSPARQL vad package (default)
+ --disable-isparql-vad disable iSPARQL vad package]
+ --enable-ods-vad enable ODS vad packages (default)
+ --disable-ods-vad disable ODS vad packages]
+ --enable-rdfmappers-vad enable Sparql Demo vad package (default)
+ --disable-rdfmappers-vad
+ disable Sparql Demo vad package]
+ --enable-rdb2rdf-vad enable Rdb2Rdf vad package (default)
+ --disable-rdb2rdf-vad disable Rdb2Rdf vad package]
+ --enable-sparqldemo-vad enable Sparql Demo vad package (default)
+ --disable-sparqldemo-vad
+ disable Sparql Demo vad package]
+ --enable-syncml-vad enable SyncML vad package (default)
+ --disable-syncml-vad disable SyncML vad package]
+ --enable-tutorial-vad enable Tutorial vad package (default)
+ --disable-tutorial-vad disable Tutorial vad package]
+ --disable-all-vads disable building all vad packages]
+
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-layout=LAYOUT Choose installation layout
+ --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-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)
+ --with-internal-zlib use internal zlib library (default)
+ --without-internal-zlib use external zlib support
+ --with-malloc-debug extra malloc debugging code
+ --with-mtx-debug extra mutex debugging code
+ --with-pthreads build pthread implementation if possible
+ --with-crosspkgdir=/path/to/pkg-config/dir
+ --with-libs='lib1 ...' link against additional libs
+ --with-editline(=DIR) use editline library
+ --with-readline(=DIR) use GNU readline library
+ --with-iodbc(=DIR) build with iODBC implementation if possible
+ --with-jdk2=DIR use the Sun JDK 1.3.x at the specified location
+
+ --with-jdk3=DIR use the Sun JDK 1.4.x or 1.5.x at the specified
+ location
+ --with-jdk4=DIR use the Sun JDK 1.6.x at the specified location
+ --with-port(=NUMBER) SQL port (1111 default)
+
+Some influential environment variables:
+ CC C compiler command
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ YACC The `Yet Another C Compiler' implementation to use. Defaults to
+ the first program found out of: `bison -y', `byacc', `yacc'.
+ YFLAGS The list of arguments that will be passed by default to $YACC.
+ This script will default YFLAGS to the empty string to avoid a
+ default value of `-d' given by some make applications.
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <vos.admin at openlinksw.com>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+ test -d "$ac_dir" || continue
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
+Virtuoso Open Source Edition configure 6.1.6
+generated by GNU Autoconf 2.61
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+ exit
+fi
+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.6, which was
+generated by GNU Autoconf 2.61. Invocation command line was
+
+ $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ echo "PATH: $as_dir"
+done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+ for ac_arg
+ do
+ case $ac_arg in
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+ *\'*)
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 2)
+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+ ac_must_keep_next=false # Got value, back to normal.
+ else
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+ ac_configure_args="$ac_configure_args '$ac_arg'"
+ ;;
+ esac
+ done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log. We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+ echo
+
+ cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
+ (set) 2>&1 |
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ sed -n \
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
+ *)
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+)
+ echo
+
+ cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+ echo
+ for ac_var in $ac_subst_vars
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+ cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+
+ if test -s confdefs.h; then
+ cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+ echo
+ cat confdefs.h
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
+ } >&5
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -n "$CONFIG_SITE"; then
+ set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
+fi
+shift
+for ac_site_file
+do
+ if test -r "$ac_site_file"; then
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+ . "$ac_site_file"
+ fi
+done
+
+if test -r "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
+ esac
+ fi
+else
+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+echo "$as_me: former value: $ac_old_val" >&2;}
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ esac
+ fi
+done
+if $ac_cache_corrupted; then
+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ac_aux_dir=
+for ac_dir in binsrc/config "$srcdir"/binsrc/config; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in binsrc/config \"$srcdir\"/binsrc/config" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in binsrc/config \"$srcdir\"/binsrc/config" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+
+
+ac_config_headers="$ac_config_headers libsrc/Dk/config.h"
+
+
+am__api_version='1.10'
+
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+done
+IFS=$as_save_IFS
+
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ test "$2" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $. echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm -f conftest.sed
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$AWK" && break
+done
+
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='virtuoso-opensource'
+ VERSION='6.1.6'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ 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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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"
+ echo "$as_me:$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
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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"
+ echo "$as_me:$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
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+
+{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
+echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; }
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar plaintar pax cpio none'
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ { echo "$as_me:$LINENO: $_am_tar --version" >&5
+ ($_am_tar --version) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && break
+ done
+ am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x ustar -w "$$tardir"'
+ am__tar_='pax -L -x ustar -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+ am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+ am__untar='cpio -i -H ustar -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_ustar}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+ (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+ ($am__untar <conftest.tar) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+if test "${am_cv_prog_tar_ustar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ am_cv_prog_tar_ustar=$_am_tool
+fi
+
+{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
+echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; }
+
+
+
+
+
+
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi
+
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+
+##########################################################################
+## ##
+## Check system type ##
+## ##
+##########################################################################
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
+
+
+
+##########################################################################
+## ##
+## Save configuration for later reuse ##
+## ##
+##########################################################################
+echo creating config.nice
+rm -f config.nice
+cat >config.nice<<CONFIG_NICE_EOF
+#!${SHELL-/bin/sh}
+#
+# Created by configure for $PACKAGE_STRING
+#
+
+# Environment
+CONFIG_NICE_EOF
+for var in SHELL CFLAGS CXXFLAGS CPPFLAGS LDFLAGS INCLUDES LIBS CC CXX
+do
+ eval val=\$$var
+ if test -n "$val"
+ then
+ echo "$var=\"$val\"; export $var" >> config.nice
+ fi
+done
+
+echo "" >> config.nice
+echo ${SHELL} "\"$0\" \\" >> config.nice
+
+eval "set -- $ac_configure_args"
+
+for arg
+do
+ echo "\"$arg\" \\" >> config.nice
+done
+
+echo '"$@"' >> config.nice
+chmod +x config.nice
+
+
+##########################################################################
+## ##
+## Set Layout for Virtuoso ##
+## ##
+##########################################################################
+
+
+{ echo "$as_me:$LINENO: checking for Virtuoso installation layout" >&5
+echo $ECHO_N "checking for Virtuoso installation layout... $ECHO_C" >&6; }
+
+# Check whether --with-layout was given.
+if test "${with_layout+set}" = set; then
+ withval=$with_layout; case "${withval}" in
+ yes|no) VIRTUOSO_LAYOUT=unset ;;
+ *) VIRTUOSO_LAYOUT=${withval} ;;
+ esac
+
+else
+ VIRTUOSO_LAYOUT=unset
+fi
+
+
+
+#
+# Defaults for Layout
+#
+
+case ${VIRTUOSO_LAYOUT} in
+ unset) # No Layout set
+ virtuoso_layout="default"
+ vaddir=$datadir/virtuoso/vad
+ docdir=$datadir/virtuoso/doc
+ htmldocdir=$datadir/virtuoso/doc/html
+ pdfdocdir=$datadir/virtuoso/doc/pdf
+ demodir=$localstatedir/lib/virtuoso/demo
+ dbdir=$localstatedir/lib/virtuoso/db
+ httprootdir=$localstatedir/lib/virtuoso/vsp
+ hostingdir=$libdir/virtuoso/hosting
+ ;;
+
+ [Gg][Nn][Uu]) # GNU
+ virtuoso_layout="GNU"
+ test "x$prefix" = xNONE && prefix=/usr/local
+ vaddir=$datadir/virtuoso/vad
+ docdir=$datadir/virtuoso/doc
+ htmldocdir=$datadir/virtuoso/doc/html
+ pdfdocdir=$datadir/virtuoso/doc/pdf
+ demodir=$localstatedir/lib/virtuoso/demo
+ dbdir=$localstatedir/lib/virtuoso/db
+ httprootdir=$localstatedir/lib/virtuoso/vsp
+ hostingdir=$libdir/virtuoso/hosting
+ ;;
+
+ [Dd][Ee][Bb][Ii][Aa][Nn]) # Debian
+ virtuoso_layout="Debian"
+ if test "x$prefix" = "xNONE"
+ then
+ prefix=/usr
+ localstatedir=/var
+ fi
+ vaddir=$datadir/virtuoso/vad
+ docdir=$datadir/doc/virtuoso
+ htmldocdir=$datadir/doc/virtuoso/html
+ pdfdocdir=$datadir/doc/virtuoso/pdf
+ demodir=$localstatedir/lib/virtuoso/demo
+ dbdir=$localstatedir/lib/virtuoso/db
+ httprootdir=$localstatedir/lib/virtuoso/vsp
+ hostingdir=$libdir/virtuoso/hosting
+ ;;
+
+ [Gg][Ee][Nn][Tt][Oo][Oo]) # Gentoo
+ virtuoso_layout="Gentoo"
+ if test "x$prefix" = "xNONE"
+ then
+ prefix=/usr
+ localstatedir=/var
+ fi
+ vaddir=$datadir/virtuoso/vad
+ docdir=$datadir/doc/virtuoso
+ htmldocdir=$datadir/doc/virtuoso/html
+ pdfdocdir=$datadir/doc/virtuoso/pdf
+ demodir=$localstatedir/lib/virtuoso/demo
+ dbdir=$localstatedir/lib/virtuoso/db
+ httprootdir=$localstatedir/lib/virtuoso/vsp
+ hostingdir=$libdir/virtuoso/hosting
+ ;;
+
+ [Rr][Ee][Dd][Hh][Aa][Tt]) # RedHat
+ virtuoso_layout=RedHat
+ if test "x$prefix" = "xNONE"
+ then
+ prefix=/usr
+ localstatedir=/var
+ fi
+ vaddir=$datadir/virtuoso/vad
+ docdir=$datadir/doc/virtuoso
+ htmldocdir=$datadir/doc/virtuoso/html
+ pdfdocdir=$datadir/doc/virtuoso/pdf
+ demodir=$localstatedir/lib/virtuoso/demo
+ dbdir=$localstatedir/lib/virtuoso/db
+ httprootdir=$localstatedir/lib/virtuoso/vsp
+ hostingdir=$libdir/virtuoso/hosting
+ ;;
+
+ [Oo][Pp][Ee][Nn][Ss][Uu][Ss][Ee]) # openSUSE
+ virtuoso_layout=openSUSE
+ if test "x$prefix" = "xNONE"
+ then
+ prefix=/usr
+ localstatedir=/var
+ fi
+ vaddir=$datadir/virtuoso/vad
+ docdir=$datadir/doc/packages/virtuoso
+ htmldocdir=$datadir/doc/packages/virtuoso/html
+ pdfdocdir=$datadir/doc/packages/virtuoso/pdf
+ demodir=$localstatedir/lib/virtuoso/demo
+ dbdir=$localstatedir/lib/virtuoso/db
+ httprootdir=$localstatedir/lib/virtuoso/vsp
+ hostingdir=$libdir/virtuoso/hosting
+ ;;
+
+ [Ff][Rr][Ee][Ee][Bb][Ss][Dd]) # FreeBSD
+ virtuoso_layout=FreeBSD
+ if test "x$prefix" = "xNONE"
+ then
+ prefix=/usr
+ localstatedir=/var
+ fi
+ vaddir=$datadir/virtuoso/vad
+ docdir=$datadir/virtuoso/doc
+ htmldocdir=$datadir/virtuoso/doc/html
+ pdfdocdir=$datadir/virtuoso/doc/pdf
+ demodir=$localstatedir/lib/virtuoso/demo
+ dbdir=$localstatedir/lib/virtuoso/db
+ httprootdir=$localstatedir/lib/virtuoso/vsp
+ hostingdir=$libdir/virtuoso/hosting
+ ;;
+
+ [Oo][Pp][Tt]) # /opt
+ virtuoso_layout=opt
+ test "x$prefix" = xNONE && prefix=/opt/virtuoso-opensource
+ vaddir='${prefix}/vad'
+ docdir='${prefix}/doc'
+ htmldocdir='${prefix}/doc/html'
+ pdfdocdir='${prefix}/doc/pdf'
+ demodir='${prefix}/demo'
+ dbdir='${prefix}/database'
+ httprootdir='${prefix}/vsp'
+ hostingdir='${prefix}/hosting'
+ ;;
+
+ [Oo][Pp][Ee][Nn][Ll][Ii][Nn][Kk]) # OpenLink
+ virtuoso_layout=openlink
+ test "x$prefix" = xNONE && prefix=/usr/local/virtuoso-opensource
+ vaddir='${prefix}/vad'
+ docdir='${prefix}/doc'
+ htmldocdir='${prefix}/doc/html'
+ pdfdocdir='${prefix}/doc/pdf'
+ demodir='${prefix}/demo'
+ dbdir='${prefix}/database'
+ httprootdir='${prefix}/vsp'
+ hostingdir='${prefix}/hosting'
+ ;;
+
+ *) # UNKNOWN
+ { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
+ echo ""
+ echo " Supported layouts: Debian FreeBSD GNU OpenLink opt RedHat"
+ echo ""
+ { { echo "$as_me:$LINENO: error: unable to continue" >&5
+echo "$as_me: error: unable to continue" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+esac
+{ echo "$as_me:$LINENO: result: ${virtuoso_layout}" >&5
+echo "${ECHO_T}${virtuoso_layout}" >&6; }
+
+
+
+
+
+
+
+
+
+##########################################################################
+## ##
+## Set TOP variable for OpenLink Source Tree ##
+## ##
+##########################################################################
+
+TOP=`pwd`
+LIBDIR=$TOP/lib
+BINDIR=$TOP/bin
+INCDIR=$TOP/include
+#OPLDIR=$TOP/openlink
+
+
+
+
+#AC_SUBST(OPLDIR)
+
+
+##########################################################################
+## ##
+## Check C compiler and features ##
+## ##
+##########################################################################
+
+#AC_PROG_CPP
+#actually prefer /lib/cpp : it's to be run on Java
+# Extract the first word of "cpp", so it can be a program name with args.
+set dummy cpp; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $CPP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CPP="$CPP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="/usr/bin:/lib:$PATH"
+for as_dir in $as_dummy
+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_path_CPP="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_CPP" && ac_cv_path_CPP="/lib/cpp"
+ ;;
+esac
+fi
+CPP=$ac_cv_path_CPP
+if test -n "$CPP"; then
+ { echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+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
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ 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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort. b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions. Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* )
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
+ break;;
+ * )
+ break;;
+ esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+ if { ac_try='./$ac_file'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+fi
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ break;;
+ * ) break;;
+ esac
+done
+else
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+if test "${ac_cv_objext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
+fi
+
+
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC" am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
+if test "x$CC" != xcc; then
+ { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+else
+ { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+fi
+set dummy $CC; ac_cc=`echo $2 |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+then
+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+ if test "x$CC" != xcc; then
+ # Test first that cc exists at all.
+ if { ac_try='cc -c conftest.$ac_ext >&5'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+ rm -f conftest2.*
+ if { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+ then
+ # cc works too.
+ :
+ else
+ # cc exists but doesn't like -o.
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ fi
+ fi
+ fi
+else
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f -r core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" | sed 99q >conftest.sed
+ $as_unset ac_script || ac_script=
+ # Extract the first word of "sed gsed" to use in msg output
+if test -z "$SED"; then
+set dummy sed gsed; ac_prog_name=$2
+if test "${ac_cv_path_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_SED_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+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_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ # Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_SED_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+SED="$ac_cv_path_SED"
+if test -z "$SED"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_SED=$SED
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_GREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_EGREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ echo "$as_me:$LINENO: checking for fgrep" >&5
+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+ then ac_cv_path_FGREP="$GREP -F"
+ else
+ # Extract the first word of "fgrep" to use in msg output
+if test -z "$FGREP"; then
+set dummy fgrep; ac_prog_name=$2
+if test "${ac_cv_path_FGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_FGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in fgrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ # Check for GNU ac_path_FGREP and select it if it is found.
+ # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'FGREP' >> "conftest.nl"
+ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_FGREP="$ac_path_FGREP"
+ ac_path_FGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_FGREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+FGREP="$ac_cv_path_FGREP"
+if test -z "$FGREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_FGREP=$FGREP
+fi
+
+
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ echo "$as_me:$LINENO: checking how to print strings" >&5
+echo $ECHO_N "checking how to print strings... $ECHO_C" >&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*) { echo "$as_me:$LINENO: result: printf" >&5
+echo "${ECHO_T}printf" >&6; } ;;
+ print*) { echo "$as_me:$LINENO: result: print -r" >&5
+echo "${ECHO_T}print -r" >&6; } ;;
+ *) { echo "$as_me:$LINENO: result: cat" >&5
+echo "${ECHO_T}cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | ?:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+else
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+ IFS="$lt_save_ifs"
+else
+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+ ;;
+*)
+ lt_cv_prog_gnu_ld=no
+ ;;
+esac
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+##########################################################################
+## ##
+## Various UNIX version specific checks ##
+## ##
+##########################################################################
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+{ echo "$as_me:$LINENO: checking for AIX" >&5
+echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef _AIX
+ yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+rm -f -r conftest*
+
+
+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_search_strerror=$ac_res
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
+fi
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_strerror+set}" = set; then
+ break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then
+ :
+else
+ ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-ac_prev=
-ac_dashdash=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
+fi
- case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
- esac
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
- # Accept the important Cygnus configure options, so we can diagnose typos.
+int
+main ()
+{
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
+ ac_cv_header_stdc=no
+fi
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f -r conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f -r conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- --config-cache | -C)
- cache_file=config.cache ;;
+ eval "$as_ac_Header=no"
+fi
- -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
+fi
- -disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=no ;;
+done
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for minix/config.h" >&5
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- -enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=\$ac_optarg ;;
+ ac_header_compiler=no
+fi
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
+# Is the header present?
+{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
+ ac_header_preproc=no
+fi
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
+fi
+if test $ac_cv_header_minix_config_h = yes; then
+ MINIX=yes
+else
+ MINIX=
+fi
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
+if test "$MINIX" = yes; then
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c | -n)
- no_create=yes ;;
+fi
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
+##########################STAGING area####################################
+##########################STAGING area####################################
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
+##########################################################################
+## ##
+## Check specific C constructions ##
+## ##
+##########################################################################
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/param.h>
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+ bogus endian macros
+#endif
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/param.h>
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_c_bigendian=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
+ ac_cv_c_bigendian=no
+fi
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
+ # It does not; compile a test program.
+if test "$cross_compiling" = yes; then
+ # try to guess the endianness by grepping values into an object file
+ ac_cv_c_bigendian=unknown
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+int
+main ()
+{
+ _ascii (); _ebcdic ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+ ac_cv_c_bigendian=yes
+fi
+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+ if test "$ac_cv_c_bigendian" = unknown; then
+ ac_cv_c_bigendian=no
+ else
+ # finding both strings is unlikely to happen, but who knows?
+ ac_cv_c_bigendian=unknown
+ fi
+fi
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
+fi
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+ long int l;
+ char c[sizeof (long int)];
+ } u;
+ u.l = 1;
+ return u.c[sizeof (long int) - 1] == 1;
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_c_bigendian=no
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- -with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=\$ac_optarg ;;
+( exit $ac_status )
+ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
- -without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=no ;;
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
+fi
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+case $ac_cv_c_bigendian in
+ yes)
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
+cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+ ;;
+ no)
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+echo "$as_me: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
- ;;
+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+if test "${ac_cv_c_const+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
- # Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
- esac
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
+int
+main ()
+{
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+ /* Ultrix mips cc rejects this. */
+ typedef int charset[2];
+ const charset cs;
+ /* SunOS 4.1.1 cc rejects this. */
+ char const *const *pcpcc;
+ char **ppc;
+ /* NEC SVR4.0.2 mips cc rejects this. */
+ struct point {int x, y;};
+ static struct point const zero = {0,0};
+ /* AIX XL C 1.02.0.0 rejects this.
+ It does not let you subtract one const X* pointer from another in
+ an arm of an if-expression whose if-part is not a constant
+ expression */
+ const char *g = "string";
+ pcpcc = &g + (g ? g-g : 0);
+ /* HPUX 7.0 cc rejects these. */
+ ++pcpcc;
+ ppc = (char**) pcpcc;
+ pcpcc = (char const *const *) ppc;
+ { /* SCO 3.2v4 cc rejects this. */
+ char *t;
+ char const *s = 0 ? (char *) 0 : (char const *) 0;
- *)
- # FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
- ;;
+ *t++ = 0;
+ if (s) return 0;
+ }
+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
+ int x[] = {25, 17};
+ const int *foo = &x[0];
+ ++foo;
+ }
+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+ typedef const int *iptr;
+ iptr p = 0;
+ ++p;
+ }
+ { /* AIX XL C 1.02.0.0 rejects this saying
+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+ struct s { int j; const int *ap[3]; };
+ struct s *b; b->j = 5;
+ }
+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+ const int foo = 10;
+ if (!foo) return 0;
+ }
+ return !cs[0] && !zero.x;
+#endif
- esac
-done
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_c_const=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ ac_cv_c_const=no
fi
-if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
- esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
-# Check all directory arguments for consistency.
-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
-do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
- case $ac_val in
- */ )
- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
- eval $ac_var=\$ac_val;;
- esac
- # Be sure to have absolute directory names.
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
+cat >>confdefs.h <<\_ACEOF
+#define const
+_ACEOF
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
+fi
+ { echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+if test "${ac_cv_c_inline+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_c_inline=$ac_kw
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-test "$silent" = yes && exec 6>/dev/null
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$ac_cv_c_inline" != no && break
+done
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_myself" : 'X\(//\)[^/]' \| \
- X"$as_myself" : 'X\(//\)$' \| \
- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
- pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+case $ac_cv_c_inline in
+ inline | yes) ;;
+ *)
+ case $ac_cv_c_inline in
+ no) ac_val=;;
+ *) ac_val=$ac_cv_c_inline;;
+ esac
+ cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+ ;;
esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-#
-# Report the --help message.
-#
-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.4 to adapt to many kinds of systems.
-Usage: $0 [OPTION]... [VAR=VALUE]...
+{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
+echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
+if test "${ac_cv_c_char_unsigned+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((char) -1) < 0)];
+test_array [0] = 0
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_c_char_unsigned=no
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-Defaults for the options are specified in brackets.
+ ac_cv_c_char_unsigned=yes
+fi
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
+echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6; }
+if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define __CHAR_UNSIGNED__ 1
+_ACEOF
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+fi
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-For better control, use the options below.
-Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root
- [DATAROOTDIR/doc/virtuoso-opensource]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ { echo "$as_me:$LINENO: checking for long double with more range or precision than double" >&5
+echo $ECHO_N "checking for long double with more range or precision than double... $ECHO_C" >&6; }
+if test "${ac_cv_type_long_double_wider+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <float.h>
+ long double const a[] =
+ {
+ 0.0L, DBL_MIN, DBL_MAX, DBL_EPSILON,
+ LDBL_MIN, LDBL_MAX, LDBL_EPSILON
+ };
+ long double
+ f (long double x)
+ {
+ return ((x + (unsigned long int) 10) * (-1 / x) + a[0]
+ + (x ? f (x) : 'c'));
+ }
- cat <<\_ACEOF
-
-Program names:
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+int
+main ()
+{
+static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP)
+ + (DBL_MANT_DIG < LDBL_MANT_DIG)
+ - (LDBL_MAX_EXP < DBL_MAX_EXP)
+ - (LDBL_MANT_DIG < DBL_MANT_DIG)))
+ && (int) LDBL_EPSILON == 0
+ )];
+test_array [0] = 0
-System types:
- --build=BUILD configure for building on BUILD [guessed]
- --host=HOST cross-compile to build programs to run on HOST [BUILD]
+ ;
+ return 0;
+}
_ACEOF
-fi
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_long_double_wider=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-if test -n "$ac_init_help"; then
- case $ac_init_help in
- short | recursive ) echo "Configuration of Virtuoso Open Source Edition 6.1.4:";;
- esac
- cat <<\_ACEOF
+ ac_cv_type_long_double_wider=no
+fi
-Optional Features:
- --disable-option-checking ignore unrecognized --enable/--with options
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
- --enable-shared[=PKGS] build shared libraries [default=yes]
- --enable-static[=PKGS] build static libraries [default=yes]
- --enable-fast-install[=PKGS]
- optimize for fast installation [default=yes]
- --disable-libtool-lock avoid locking (might break parallel builds)
- --enable-xml enable XML extension (default)
- --disable-xml disable XML extension
- --enable-krb(=DIR) enable Kerberos extension
- --disable-krb disable Kerberos extension (default)
- --enable-openssl(=DIR) enable OpenSSL support (default)
- --disable-openssl disable OpenSSL support
- --enable-openldap(=DIR) enable OpenLDAP support (default)
- --disable-openldap disable OpenLDAP support
- --enable-imsg enable POP3 and NNTP extension (default)
- --disable-imsg disable POP3 and NNTP extension]
- --enable-pldebug enable Virtuoso/PL debugger support (default)
- --disable-pldebug disable Virtuoso/PL debugger support
- --enable-rendezvous(=DIR)
- enable rendezvous extension
- --disable-rendezvous disable rendezvous extension (default)
- --enable-php5(=DIR) enable PHP 5.x extension
- --disable-php5 disable PHP 5.x extension (default)
- --disable-xmltest Do not try to compile and run a test LIBXML program
- --enable-mono enable Mono extension
- --disable-mono disable Mono extension (default)
- --enable-hslookup(=DIR) enable the hslookup plugin (default)
- --disable-hslookup disable the hslookup plugin
- --enable-imagemagick(=DIR)
- enable the ImageMagick plugin (default)
- --disable-imagemagick disable the ImageMagick plugin
- --enable-wbxml2(=DIR) enable the WBXML2 plugin (default)
- --disable-wbxml2 disable the WBXML2 plugin
- --enable-perl enable PERL hosting
- --disable-perl disable PERL hosting (default)
- --enable-python enable PYTHON hosting
- --disable-python disable PYTHON hosting (default)
- --enable-ruby enable RUBY hosting
- --disable-ruby disable RUBY hosting (default)
- --enable-aio enable AIO support
- --disable-aio disable AIO support (default)
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double_wider" >&5
+echo "${ECHO_T}$ac_cv_type_long_double_wider" >&6; }
+ if test $ac_cv_type_long_double_wider = yes; then
-VAD Packages:
- --enable-bpel-vad enable BPEL vad (default)
- --disable-bpel-vad disable BPEL vad]
- --enable-conductor-vad enable Conductor vad package (default)
- --disable-conductor-vad disable Conductor 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)
- --disable-fct-vad disable Facet Browser vad package]
- --enable-isparql-vad enable iSPARQL vad package (default)
- --disable-isparql-vad disable iSPARQL vad package]
- --enable-ods-vad enable ODS vad packages (default)
- --disable-ods-vad disable ODS vad packages]
- --enable-rdfmappers-vad enable Sparql Demo vad package (default)
- --disable-rdfmappers-vad
- disable Sparql Demo vad package]
- --enable-sparqldemo-vad enable Sparql Demo vad package (default)
- --disable-sparqldemo-vad
- disable Sparql Demo vad package]
- --enable-syncml-vad enable SyncML vad package (default)
- --disable-syncml-vad disable SyncML vad package]
- --enable-tutorial-vad enable Tutorial vad package (default)
- --disable-tutorial-vad disable Tutorial vad package]
- --disable-all-vads disable building all vad packages]
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_DOUBLE_WIDER 1
+_ACEOF
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-layout=LAYOUT Choose installation layout
- --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-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)
- --with-internal-zlib use internal zlib library (default)
- --without-internal-zlib use external zlib support
- --with-malloc-debug extra malloc debugging code
- --with-mtx-debug extra mutex debugging code
- --with-pthreads build pthread implementation if possible
- --with-crosspkgdir=/path/to/pkg-config/dir
- --with-libs='lib1 ...' link against additional libs
- --with-editline(=DIR) use editline library
- --with-readline(=DIR) use GNU readline library
- --with-iodbc(=DIR) build with iODBC implementation if possible
- --with-jdk2=DIR use the Sun JDK 1.3.x at the specified location
+ fi
- --with-jdk3=DIR use the Sun JDK 1.4.x or 1.5.x at the specified
- location
- --with-jdk4=DIR use the Sun JDK 1.6.x at the specified location
- --with-port(=NUMBER) SQL port (1111 default)
+ ac_cv_c_long_double=$ac_cv_type_long_double_wider
+ if test $ac_cv_c_long_double = yes; then
-Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- YACC The `Yet Another Compiler Compiler' implementation to use.
- Defaults to the first program found out of: `bison -y', `byacc',
- `yacc'.
- YFLAGS The list of arguments that will be passed by default to $YACC.
- This script will default YFLAGS to the empty string to avoid a
- default value of `-d' given by some make applications.
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_DOUBLE 1
+_ACEOF
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
+ fi
-Report bugs to <vos.admin at openlinksw.com>.
+
+
+##########################################################################
+## ##
+## Check lengths C datatypes ##
+## ##
+##########################################################################
+
+{ echo "$as_me:$LINENO: checking for char" >&5
+echo $ECHO_N "checking for char... $ECHO_C" >&6; }
+if test "${ac_cv_type_char+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
-ac_status=$?
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef char ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_char=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_char=no
fi
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
- continue
- ac_builddir=.
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
+echo "${ECHO_T}$ac_cv_type_char" >&6; }
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of char" >&5
+echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_char+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
- cat <<\_ACEOF
-Virtuoso Open Source Edition configure 6.1.4
-generated by GNU Autoconf 2.68
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
- exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char ac__type_sizeof_;
+int
+main ()
{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
- if { { ac_try="$ac_compile"
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>conftest.err
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
- ac_retval=0
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_lo= ac_hi=
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-} # ac_fn_c_try_compile
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char ac__type_sizeof_;
+int
+main ()
{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- }; then :
- ac_retval=0
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## --------------------------------------- ##
-## Report this to vos.admin at openlinksw.com ##
-## --------------------------------------- ##"
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
+done
+case $ac_lo in
+?*) ac_cv_sizeof_char=$ac_lo;;
+'') if test "$ac_cv_type_char" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (char)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_char=0
+ fi ;;
esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
-} # ac_fn_c_check_header_mongrel
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_char=`cat conftest.val`
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=$ac_status
+( exit $ac_status )
+if test "$ac_cv_type_char" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (char)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_char=0
+ fi
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
-} # ac_fn_c_try_run
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_c_check_header_compile
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
+{ echo "$as_me:$LINENO: checking for short" >&5
+echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+if test "${ac_cv_type_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef short ac__type_new_;
+int
+main ()
{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then :
- ac_retval=0
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_short=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_cv_type_short=no
fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-} # ac_fn_c_try_link
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+echo "${ECHO_T}$ac_cv_type_short" >&6; }
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$4
+$ac_includes_default
+ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(($2) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_lo=0 ac_mid=0
while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$4
+$ac_includes_default
+ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_hi=$ac_mid; break
else
- as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
if test $ac_lo -le $ac_mid; then
ac_lo= ac_hi=
break
fi
- as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$4
+$ac_includes_default
+ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(($2) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_hi=-1 ac_mid=-1
while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$4
+$ac_includes_default
+ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_lo=$ac_mid; break
else
- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
if test $ac_mid -le $ac_hi; then
ac_lo= ac_hi=
break
fi
- as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
- ac_lo= ac_hi=
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$4
+$ac_includes_default
+ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_hi=$ac_mid
else
- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
+case $ac_lo in
+?*) ac_cv_sizeof_short=$ac_lo;;
+'') if test "$ac_cv_type_short" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (short)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_short=0
+ fi ;;
esac
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
+$ac_includes_default
+ typedef short ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
@@ -2318,2971 +6809,4422 @@ main ()
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
- if (($2) < 0)
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
{
long int i = longval ();
- if (i != ($2))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%ld", i);
+ fprintf (f, "%ld\n", i);
}
else
{
unsigned long int i = ulongval ();
- if (i != ($2))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%lu", i);
+ fprintf (f, "%lu\n", i);
}
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_short=`cat conftest.val`
else
- ac_retval=1
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_short" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (short)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_short=0
+ fi
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
rm -f conftest.val
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
- fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_compute_int
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=no"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof ($2))
- return 0;
- ;
- return 0;
-}
+
+
+{ echo "$as_me:$LINENO: checking for unsigned" >&5
+echo $ECHO_N "checking for unsigned... $ECHO_C" >&6; }
+if test "${ac_cv_type_unsigned+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$4
+$ac_includes_default
+typedef unsigned ac__type_new_;
int
main ()
{
-if (sizeof (($2)))
- return 0;
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_unsigned=yes
else
- eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_unsigned=no
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned" >&6; }
-} # ac_fn_c_check_type
-
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
- $as_echo_n "(cached) " >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of unsigned" >&5
+echo $ECHO_N "checking size of unsigned... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_unsigned+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$5
+$ac_includes_default
+ typedef unsigned ac__type_sizeof_;
int
main ()
{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
+
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$5
+$ac_includes_default
+ typedef unsigned ac__type_sizeof_;
int
main ()
{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
else
- eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-eval ac_res=\$$4
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_c_check_member
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$4
+$ac_includes_default
+ typedef unsigned ac__type_sizeof_;
int
main ()
{
-#ifndef $as_decl_name
-#ifdef __cplusplus
- (void) $as_decl_use;
-#else
- (void) $as_decl_name;
-#endif
-#endif
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-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.4, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- $ $0 $@
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
-exec 5>>config.log
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef unsigned ac__type_sizeof_;
+int
+main ()
{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
- done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
+ ;
+ return 0;
+}
_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
- 2)
- as_fn_append ac_configure_args1 " '$ac_arg'"
- if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
- else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
- fi
- as_fn_append ac_configure_args " '$ac_arg'"
- ;;
- esac
- done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
- echo
- # The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- sed -n \
- "s/'\''/'\''\\\\'\'''\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
- ;; #(
- *)
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-)
- echo
-
- $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
- echo
- for ac_var in $ac_subst_files
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-
- if test -s confdefs.h; then
- $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
- echo
- cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-$as_echo "/* confdefs.h */" > confdefs.h
+ ac_lo= ac_hi=
+fi
-# Predefined preprocessor variables.
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef unsigned ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+ ;
+ return 0;
+}
_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_unsigned=$ac_lo;;
+'') if test "$ac_cv_type_unsigned" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (unsigned)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_unsigned=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef unsigned ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_unsigned=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_unsigned" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (unsigned)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_unsigned=0
+ fi
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned" >&6; }
+
+
cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
+#define SIZEOF_UNSIGNED $ac_cv_sizeof_unsigned
_ACEOF
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
-elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
+{ echo "$as_me:$LINENO: checking for int" >&5
+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+if test "${ac_cv_type_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special files
- # actually), so we avoid doing that. DJGPP emulates it as a regular file.
- if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef int ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_int=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
- # differences in whitespace do not lead to failure.
- ac_old_val_w=`echo x $ac_old_val`
- ac_new_val_w=`echo x $ac_new_val`
- if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- ac_cache_corrupted=:
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
- eval $ac_var=\$ac_old_val
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) as_fn_append ac_configure_args " '$ac_arg'" ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ ac_cv_type_int=no
fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_aux_dir=
-for ac_dir in binsrc/config "$srcdir"/binsrc/config; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in binsrc/config \"$srcdir\"/binsrc/config" "$LINENO" 5
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+echo "${ECHO_T}$ac_cv_type_int" >&6; }
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef int ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef int ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
-ac_config_headers="$ac_config_headers libsrc/Dk/config.h"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef int ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
-am__api_version='1.11'
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef int ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
- ./ | .// | /[cC]/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- fi
- done
- done
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- done
-IFS=$as_save_IFS
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
-rm -rf conftest.one conftest.two conftest.dir
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo= ac_hi=
fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef int ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name. Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
- *[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_int=$ac_lo;;
+'') if test "$ac_cv_type_int" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_int=0
+ fi ;;
esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef int ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_int=`cat conftest.val`
else
- as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
+( exit $ac_status )
+if test "$ac_cv_type_int" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_int=0
+ fi
fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-
-if test x"${install_sh}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
- esac
+rm -f conftest.val
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- 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
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
-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
+{ echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+if test "${ac_cv_type_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef long ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_long=yes
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
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_long=no
fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
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; }
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- 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 ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
- STRIP=$ac_ct_STRIP
- fi
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
else
- STRIP="$ac_cv_prog_STRIP"
-fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
- if ${ac_cv_path_mkdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
-IFS=$as_save_IFS
-
-fi
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- test -d ./--version && rmdir ./--version
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- MKDIR_P="$ac_install_sh -d"
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; 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_AWK+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
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_AWK="$ac_prog"
- $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
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
- test -n "$AWK" && break
-done
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
+ ;
+ return 0;
+}
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
-rmdir .tst 2>/dev/null
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
- fi
-fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long=$ac_lo;;
+'') if test "$ac_cv_type_long" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_long=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
else
- CYGPATH_W=echo
- fi
-fi
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_long=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_long" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_long=0
+ fi
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-# Define the identity of the package.
- PACKAGE='virtuoso-opensource'
- VERSION='6.1.4'
cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
+#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
+{ echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
+if test "${ac_cv_type_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef long long ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_long_long=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Some tools Automake needs.
+ ac_cv_type_long_long=no
+fi
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
+ ac_lo= ac_hi=
+fi
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
-$as_echo_n "checking how to create a ustar tar archive... " >&6; }
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar plaintar pax cpio none'
-_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- { echo "$as_me:$LINENO: $_am_tar --version" >&5
- ($_am_tar --version) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && break
- done
- am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x ustar -w "$$tardir"'
- am__tar_='pax -L -x ustar -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
- am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
- am__untar='cpio -i -H ustar -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_ustar}" && break
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
- (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- rm -rf conftest.dir
- if test -s conftest.tar; then
- { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
- ($am__untar <conftest.tar) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
-rm -rf conftest.dir
-
-if ${am_cv_prog_tar_ustar+:} false; then :
- $as_echo_n "(cached) " >&6
+case $ac_lo in
+?*) ac_cv_sizeof_long_long=$ac_lo;;
+'') if test "$ac_cv_type_long_long" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_long_long=0
+ fi ;;
+esac
else
- am_cv_prog_tar_ustar=$_am_tool
-fi
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long long ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
-$as_echo "$am_cv_prog_tar_ustar" >&6; }
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_long_long=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+( exit $ac_status )
+if test "$ac_cv_type_long_long" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_long_long=0
+ fi
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
- # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+{ echo "$as_me:$LINENO: checking for float" >&5
+echo $ECHO_N "checking for float... $ECHO_C" >&6; }
+if test "${ac_cv_type_float+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- USE_MAINTAINER_MODE=no
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef float ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_float=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_float=no
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
+echo "${ECHO_T}$ac_cv_type_float" >&6; }
- MAINT=$MAINTAINER_MODE_TRUE
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of float" >&5
+echo $ECHO_N "checking size of float... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_float+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef float ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef float ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-##########################################################################
-## ##
-## Check system type ##
-## ##
-##########################################################################
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef float ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef float ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
- $as_echo_n "(cached) " >&6
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo= ac_hi=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef float ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-##########################################################################
-## ##
-## Save configuration for later reuse ##
-## ##
-##########################################################################
-echo creating config.nice
-rm -f config.nice
-cat >config.nice<<CONFIG_NICE_EOF
-#!${SHELL-/bin/sh}
-#
-# Created by configure for $PACKAGE_STRING
-#
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
-# Environment
-CONFIG_NICE_EOF
-for var in SHELL CFLAGS CXXFLAGS CPPFLAGS LDFLAGS INCLUDES LIBS CC CXX
-do
- eval val=\$$var
- if test -n "$val"
- then
- echo "$var=\"$val\"; export $var" >> config.nice
- fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
+case $ac_lo in
+?*) ac_cv_sizeof_float=$ac_lo;;
+'') if test "$ac_cv_type_float" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (float)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_float=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef float ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
-echo "" >> config.nice
-echo ${SHELL} "\"$0\" \\" >> config.nice
-
-eval "set -- $ac_configure_args"
-
-for arg
-do
- echo "\"$arg\" \\" >> config.nice
-done
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
-echo '"$@"' >> config.nice
-chmod +x config.nice
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_float=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+( exit $ac_status )
+if test "$ac_cv_type_float" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (float)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_float=0
+ fi
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
+echo "${ECHO_T}$ac_cv_sizeof_float" >&6; }
-##########################################################################
-## ##
-## Set Layout for Virtuoso ##
-## ##
-##########################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Virtuoso installation layout" >&5
-$as_echo_n "checking for Virtuoso installation layout... " >&6; }
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_FLOAT $ac_cv_sizeof_float
+_ACEOF
-# Check whether --with-layout was given.
-if test "${with_layout+set}" = set; then :
- withval=$with_layout; case "${withval}" in
- yes|no) VIRTUOSO_LAYOUT=unset ;;
- *) VIRTUOSO_LAYOUT=${withval} ;;
- esac
+{ echo "$as_me:$LINENO: checking for double" >&5
+echo $ECHO_N "checking for double... $ECHO_C" >&6; }
+if test "${ac_cv_type_double+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef double ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_double=yes
else
- VIRTUOSO_LAYOUT=unset
-fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_double=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
+echo "${ECHO_T}$ac_cv_type_double" >&6; }
-#
-# Defaults for Layout
-#
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of double" >&5
+echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_double+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
-case ${VIRTUOSO_LAYOUT} in
- unset) # No Layout set
- virtuoso_layout="default"
- vaddir=$datadir/virtuoso/vad
- docdir=$datadir/virtuoso/doc
- htmldocdir=$datadir/virtuoso/doc/html
- pdfdocdir=$datadir/virtuoso/doc/pdf
- demodir=$localstatedir/lib/virtuoso/demo
- dbdir=$localstatedir/lib/virtuoso/db
- httprootdir=$localstatedir/lib/virtuoso/vsp
- hostingdir=$libdir/virtuoso/hosting
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
- [Gg][Nn][Uu]) # GNU
- virtuoso_layout="GNU"
- test "x$prefix" = xNONE && prefix=/usr/local
- vaddir=$datadir/virtuoso/vad
- docdir=$datadir/virtuoso/doc
- htmldocdir=$datadir/virtuoso/doc/html
- pdfdocdir=$datadir/virtuoso/doc/pdf
- demodir=$localstatedir/lib/virtuoso/demo
- dbdir=$localstatedir/lib/virtuoso/db
- httprootdir=$localstatedir/lib/virtuoso/vsp
- hostingdir=$libdir/virtuoso/hosting
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- [Dd][Ee][Bb][Ii][Aa][Nn]) # Debian
- virtuoso_layout="Debian"
- if test "x$prefix" = "xNONE"
- then
- prefix=/usr
- localstatedir=/var
- fi
- vaddir=$datadir/virtuoso/vad
- docdir=$datadir/doc/virtuoso
- htmldocdir=$datadir/doc/virtuoso/html
- pdfdocdir=$datadir/doc/virtuoso/pdf
- demodir=$localstatedir/lib/virtuoso/demo
- dbdir=$localstatedir/lib/virtuoso/db
- httprootdir=$localstatedir/lib/virtuoso/vsp
- hostingdir=$libdir/virtuoso/hosting
- ;;
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
- [Gg][Ee][Nn][Tt][Oo][Oo]) # Gentoo
- virtuoso_layout="Gentoo"
- if test "x$prefix" = "xNONE"
- then
- prefix=/usr
- localstatedir=/var
- fi
- vaddir=$datadir/virtuoso/vad
- docdir=$datadir/doc/virtuoso
- htmldocdir=$datadir/doc/virtuoso/html
- pdfdocdir=$datadir/doc/virtuoso/pdf
- demodir=$localstatedir/lib/virtuoso/demo
- dbdir=$localstatedir/lib/virtuoso/db
- httprootdir=$localstatedir/lib/virtuoso/vsp
- hostingdir=$libdir/virtuoso/hosting
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- [Rr][Ee][Dd][Hh][Aa][Tt]) # RedHat
- virtuoso_layout=RedHat
- if test "x$prefix" = "xNONE"
- then
- prefix=/usr
- localstatedir=/var
- fi
- vaddir=$datadir/virtuoso/vad
- docdir=$datadir/doc/virtuoso
- htmldocdir=$datadir/doc/virtuoso/html
- pdfdocdir=$datadir/doc/virtuoso/pdf
- demodir=$localstatedir/lib/virtuoso/demo
- dbdir=$localstatedir/lib/virtuoso/db
- httprootdir=$localstatedir/lib/virtuoso/vsp
- hostingdir=$libdir/virtuoso/hosting
- ;;
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
- [Ff][Rr][Ee][Ee][Bb][Ss][Dd]) # FreeBSD
- virtuoso_layout=FreeBSD
- if test "x$prefix" = "xNONE"
- then
- prefix=/usr
- localstatedir=/var
- fi
- vaddir=$datadir/virtuoso/vad
- docdir=$datadir/virtuoso/doc
- htmldocdir=$datadir/virtuoso/doc/html
- pdfdocdir=$datadir/virtuoso/doc/pdf
- demodir=$localstatedir/lib/virtuoso/demo
- dbdir=$localstatedir/lib/virtuoso/db
- httprootdir=$localstatedir/lib/virtuoso/vsp
- hostingdir=$libdir/virtuoso/hosting
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
- [Oo][Pp][Tt]) # /opt
- virtuoso_layout=opt
- test "x$prefix" = xNONE && prefix=/opt/virtuoso-opensource
- vaddir='${prefix}/vad'
- docdir='${prefix}/doc'
- htmldocdir='${prefix}/doc/html'
- pdfdocdir='${prefix}/doc/pdf'
- demodir='${prefix}/demo'
- dbdir='${prefix}/database'
- httprootdir='${prefix}/vsp'
- hostingdir='${prefix}/hosting'
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- [Oo][Pp][Ee][Nn][Ll][Ii][Nn][Kk]) # OpenLink
- virtuoso_layout=openlink
- test "x$prefix" = xNONE && prefix=/usr/local/virtuoso-opensource
- vaddir='${prefix}/vad'
- docdir='${prefix}/doc'
- htmldocdir='${prefix}/doc/html'
- pdfdocdir='${prefix}/doc/pdf'
- demodir='${prefix}/demo'
- dbdir='${prefix}/database'
- httprootdir='${prefix}/vsp'
- hostingdir='${prefix}/hosting'
- ;;
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
- *) # UNKNOWN
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
-$as_echo "unknown" >&6; }
- echo ""
- echo " Supported layouts: Debian FreeBSD GNU OpenLink opt RedHat"
- echo ""
- as_fn_error $? "unable to continue" "$LINENO" 5
- ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${virtuoso_layout}" >&5
-$as_echo "${virtuoso_layout}" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_double=$ac_lo;;
+'') if test "$ac_cv_type_double" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_double=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef double ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_double=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-##########################################################################
-## ##
-## Set TOP variable for OpenLink Source Tree ##
-## ##
-##########################################################################
+( exit $ac_status )
+if test "$ac_cv_type_double" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_double=0
+ fi
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
+echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
-TOP=`pwd`
-LIBDIR=$TOP/lib
-BINDIR=$TOP/bin
-INCDIR=$TOP/include
-#OPLDIR=$TOP/openlink
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_DOUBLE $ac_cv_sizeof_double
+_ACEOF
-#AC_SUBST(OPLDIR)
+{ echo "$as_me:$LINENO: checking for long double" >&5
+echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
+if test "${ac_cv_type_long_double+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef long double ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_long_double=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_long_double=no
+fi
-##########################################################################
-## ##
-## Check C compiler and features ##
-## ##
-##########################################################################
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
+echo "${ECHO_T}$ac_cv_type_long_double" >&6; }
-#AC_PROG_CPP
-#actually prefer /lib/cpp : it's to be run on Java
-# Extract the first word of "cpp", so it can be a program name with args.
-set dummy cpp; 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_path_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long double" >&5
+echo $ECHO_N "checking size of long double... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_long_double+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $CPP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CPP="$CPP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="/usr/bin:/lib:$PATH"
-for as_dir in $as_dummy
-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_path_CPP="$as_dir/$ac_word$ac_exec_ext"
- $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
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
- test -z "$ac_cv_path_CPP" && ac_cv_path_CPP="/lib/cpp"
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-fi
-CPP=$ac_cv_path_CPP
-if test -n "$CPP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; 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_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc"
- $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
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; 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_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
-IFS=$as_save_IFS
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo= ac_hi=
fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- if test "x$ac_ct_CC" = x; then
- CC=""
- 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 ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long double ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
- CC=$ac_ct_CC
- fi
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
else
- CC="$ac_cv_prog_CC"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; 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_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+case $ac_lo in
+?*) ac_cv_sizeof_long_double=$ac_lo;;
+'') if test "$ac_cv_type_long_double" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long double)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_long_double=0
+ fi ;;
+esac
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef long double ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; 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_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_long_double=`cat conftest.val`
else
- ac_prog_rejected=no
-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
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $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
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
+( exit $ac_status )
+if test "$ac_cv_type_long_double" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long double)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_long_double=0
+ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+rm -f conftest.val
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long_double" >&6; }
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- 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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog"
- $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
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
+_ACEOF
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; 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_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+{ echo "$as_me:$LINENO: checking for char *" >&5
+echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+if test "${ac_cv_type_char_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
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_CC="$ac_prog"
- $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
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef char * ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_char_p=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_char_p=no
fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of char *" >&5
+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_char_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char * ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
- test -n "$ac_ct_CC" && break
-done
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char * ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
- if test "x$ac_ct_CC" = x; then
- CC=""
- 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 ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
- CC=$ac_ct_CC
- fi
-fi
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char * ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+$ac_includes_default
+ typedef char * ac__type_sizeof_;
int
main ()
{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
;
return 0;
}
_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
-ac_rmfiles=
-for ac_file in $ac_files
-do
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
-done
-rm -f $ac_rmfiles
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char * ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
-if { { ac_try="$ac_link_default"
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link_default") 2>&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
- then :; else
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- fi
- # We set ac_cv_exeext here because the later test for it is not
- # safe: cross compilers may not add the suffix if given an `-o'
- # argument, so we may need to know it at that point already.
- # Even if this section looks crufty: it has the advantage of
- # actually working.
- break;;
- * )
- break;;
- esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
else
- ac_file=''
-fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_char_p=$ac_lo;;
+'') if test "$ac_cv_type_char_p" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (char *)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_char_p=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef char * ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- break;;
- * ) break;;
- esac
-done
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_char_p=`cat conftest.val`
else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_char_p" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (char *)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_char_p=0
+ fi
fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+_ACEOF
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+{ echo "$as_me:$LINENO: checking for void *" >&5
+echo $ECHO_N "checking for void *... $ECHO_C" >&6; }
+if test "${ac_cv_type_void_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+$ac_includes_default
+typedef void * ac__type_new_;
int
main ()
{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
;
return 0;
}
_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
- { { ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if { ac_try='./conftest$ac_cv_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
- fi
- fi
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_void_p=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_void_p=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of void *" >&5
+echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_void_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
;
return 0;
}
_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
-#ifndef __GNUC__
- choke me
-#endif
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_void_p=$ac_lo;;
+'') if test "$ac_cv_type_void_p" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (void *)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_void_p=0
+ fi ;;
+esac
else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdarg.h>
+$ac_includes_default
+ typedef void * ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
+#include <stdlib.h>
int
main ()
{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+ return ferror (f) || fclose (f) != 0;
+
;
return 0;
}
_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_void_p=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+( exit $ac_status )
+if test "$ac_cv_type_void_p" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (void *)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_void_p=0
+ fi
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+rm -f conftest.val
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-ac_config_commands="$ac_config_commands depfiles"
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
- enableval=$enable_dependency_tracking;
-fi
+##########################################################################
+## ##
+## Check for various programms ##
+## ##
+##########################################################################
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
+## Force install-sh to be accessed via an absolute path:
+ac_install_sh="$TOP/$ac_install_sh"
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+done
+IFS=$as_save_IFS
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
-depcc="$CC" am_compiler_list=
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
+fi
- cd ..
- rm -rf conftest.dir
+
+## We favor yacc above bizon or byacc, therefor we do not use AC_PROG_YACC
+for ac_prog in 'bison -y' byacc
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_YACC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- am_cv_CC_dependencies_compiler_type=none
+ if test -n "$YACC"; then
+ ac_cv_prog_YACC="$YACC" # 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_YACC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+ { echo "$as_me:$LINENO: result: $YACC" >&5
+echo "${ECHO_T}$YACC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
+ test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+## AC_CHECK_PROGS(YACC, yacc byacc 'bison -l', yacc)
+
+
+# Extract the first word of "htmldoc", so it can be a program name with args.
+set dummy htmldoc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_HTMLDOC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $HTMLDOC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_HTMLDOC="$HTMLDOC" # Let the user override the test with a path.
+ ;;
+ *)
+ 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_path_HTMLDOC="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+HTMLDOC=$ac_cv_path_HTMLDOC
+if test -n "$HTMLDOC"; then
+ { echo "$as_me:$LINENO: result: $HTMLDOC" >&5
+echo "${ECHO_T}$HTMLDOC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
+
+ if test "x$HTMLDOC" != "x"; then
+ WITH_HTMLDOC_TRUE=
+ WITH_HTMLDOC_FALSE='#'
else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
+ WITH_HTMLDOC_TRUE='#'
+ WITH_HTMLDOC_FALSE=
fi
-if test "x$CC" != xcc; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+for ac_prog in flex lex
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_LEX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$LEX"; then
+ ac_cv_prog_LEX="$LEX" # Let the user override the test.
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+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_LEX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
+fi
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+ { echo "$as_me:$LINENO: result: $LEX" >&5
+echo "${ECHO_T}$LEX" >&6; }
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
+if test "x$LEX" != "x:"; then
+ cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { yyless (input () != 0); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
+#endif
int
-main ()
+main (void)
{
-
- ;
- return 0;
+ return ! yylex () + ! yywrap ();
}
_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } &&
- test -f conftest2.$ac_objext && { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; };
-then
- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
- if test "x$CC" != xcc; then
- # Test first that cc exists at all.
- if { ac_try='cc -c conftest.$ac_ext >&5'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
- rm -f conftest2.*
- if { { case "(($ac_try" in
+{ (ac_try="$LEX conftest.l"
+case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$LEX conftest.l") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } &&
- test -f conftest2.$ac_objext && { { case "(($ac_try" in
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ echo "$as_me:$LINENO: checking lex output file root" >&5
+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
+if test "${ac_cv_prog_lex_root+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if test -f lex.yy.c; then
+ ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+ ac_cv_prog_lex_root=lexyy
+else
+ { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+
+if test -z "${LEXLIB+set}"; then
+ { echo "$as_me:$LINENO: checking lex library" >&5
+echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
+if test "${ac_cv_lib_lex+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ ac_save_LIBS=$LIBS
+ ac_cv_lib_lex='none needed'
+ for ac_lib in '' -lfl -ll; do
+ LIBS="$ac_lib $ac_save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; };
- then
- # cc works too.
- :
- else
- # cc exists but doesn't like -o.
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
- fi
- fi
- fi
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_lex=$ac_lib
else
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ test "$ac_cv_lib_lex" != 'none needed' && break
+ done
+ LIBS=$ac_save_LIBS
fi
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
+echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
+ test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
- $as_echo_n "(cached) " >&6
+
+{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- for ac_i in 1 2 3 4 5 6 7; do
- ac_script="$ac_script$as_nl$ac_script"
- done
- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- { ac_script=; unset ac_script;}
- if test -z "$SED"; then
- ac_path_SED_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- 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_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
- # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo '' >> "conftest.nl"
- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_SED_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_SED="$ac_path_SED"
- ac_path_SED_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent. Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+ac_save_LIBS=$LIBS
+LIBS="$LEXLIB $ac_save_LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#define YYTEXT_POINTER 1
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-
- $ac_path_SED_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
- fi
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_prog_lex_yytext_pointer=yes
else
- ac_cv_path_SED=$SED
-fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
- rm -f conftest.sed
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define YYTEXT_POINTER 1
+_ACEOF
+fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+fi
+if test "$LEX" = :; then
+ LEX=${am_missing_run}flex
+fi
+# Extract the first word of "flex", so it can be a program name with args.
+set dummy flex; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_FLEX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $FLEX in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path.
+ ;;
+ *)
+ 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_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+ test -z "$ac_cv_path_FLEX" && ac_cv_path_FLEX="flex"
+ ;;
+esac
+fi
+FLEX=$ac_cv_path_FLEX
+if test -n "$FLEX"; then
+ { echo "$as_me:$LINENO: result: $FLEX" >&5
+echo "${ECHO_T}$FLEX" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+# Extract the first word of "gawk", so it can be a program name with args.
+set dummy gawk; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_GAWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $GAWK in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GAWK="$GAWK" # Let the user override the test with a path.
+ ;;
+ *)
+ 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_path_GAWK="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+ test -z "$ac_cv_path_GAWK" && ac_cv_path_GAWK="gawk"
+ ;;
+esac
+fi
+GAWK=$ac_cv_path_GAWK
+if test -n "$GAWK"; then
+ { echo "$as_me:$LINENO: result: $GAWK" >&5
+echo "${ECHO_T}$GAWK" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
+# Extract the first word of "gperf", so it can be a program name with args.
+set dummy gperf; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_GPERF+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
+ case $GPERF in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GPERF="$GPERF" # Let the user override the test with a path.
+ ;;
+ *)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ 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_path_GPERF="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
-else
- ac_cv_path_GREP=$GREP
-fi
+done
+done
+IFS=$as_save_IFS
+ test -z "$ac_cv_path_GPERF" && ac_cv_path_GPERF="gperf"
+ ;;
+esac
+fi
+GPERF=$ac_cv_path_GPERF
+if test -n "$GPERF"; then
+ { echo "$as_me:$LINENO: result: $GPERF" >&5
+echo "${ECHO_T}$GPERF" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PERL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
+ case $PERL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+ ;;
+ *)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ 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_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
+done
+done
+IFS=$as_save_IFS
- fi
+ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
+ ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+ { echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
- $as_echo_n "(cached) " >&6
+# Extract the first word of "python", so it can be a program name with args.
+set dummy python; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PYTHON+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
- then ac_cv_path_FGREP="$GREP -F"
- else
- if test -z "$FGREP"; then
- ac_path_FGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
+ case $PYTHON in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+ ;;
+ *)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in fgrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
- # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'FGREP' >> "conftest.nl"
- "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_FGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_FGREP="$ac_path_FGREP"
- ac_path_FGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_FGREP_found && break 3
- done
- done
- done
+ 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_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
IFS=$as_save_IFS
- if test -z "$ac_cv_path_FGREP"; then
- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+
+ test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="python"
+ ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+ { echo "$as_me:$LINENO: result: $PYTHON" >&5
+echo "${ECHO_T}$PYTHON" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "ruby", so it can be a program name with args.
+set dummy ruby; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_RUBY+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $RUBY in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
+ ;;
+ *)
+ 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_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_RUBY" && ac_cv_path_RUBY="ruby"
+ ;;
+esac
+fi
+RUBY=$ac_cv_path_RUBY
+if test -n "$RUBY"; then
+ { echo "$as_me:$LINENO: result: $RUBY" >&5
+echo "${ECHO_T}$RUBY" >&6; }
else
- ac_cv_path_FGREP=$FGREP
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
+#AC_DECL_YYTEXT
-test -z "$GREP" && GREP=grep
+##########################################################################
+## ##
+## Use the new LibTool GNU package ##
+## ##
+##########################################################################
+case `pwd` in
+ *\ * | *\ *)
+ { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+macro_version='2.2.10'
+macro_revision='1.3175'
@@ -5296,2750 +11238,2399 @@ test -z "$GREP" && GREP=grep
+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'
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
- with_gnu_ld=no
-fi
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [\\/]* | ?:[\\/]*)
- re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+# 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'
+
+{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
+if test "${lt_cv_path_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
- $as_echo_n "(cached) " >&6
+ if test -n "$NM"; then
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
else
- if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
+ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ tmp_nm="$ac_dir/$lt_tmp_nm"
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ done
IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ : ${lt_cv_path_NM=no}
fi
fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+ NM="$lt_cv_path_NM"
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
- $as_echo_n "(cached) " >&6
+ # 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"
+ 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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-##########################################################################
-## ##
-## Various UNIX version specific checks ##
-## ##
-##########################################################################
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
+ if test -n "$DUMPBIN"; then
+ ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
+ 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_DUMPBIN="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+ { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+echo "${ECHO_T}$DUMPBIN" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- done
- ac_cv_prog_CPP=$CPP
+ test -n "$DUMPBIN" && break
+ done
fi
- CPP=$ac_cv_prog_CPP
+if test -z "$DUMPBIN"; then
+ ac_ct_DUMPBIN=$DUMPBIN
+ for ac_prog in dumpbin "link -dump"
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+ if test -n "$ac_ct_DUMPBIN"; then
+ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+ 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_DUMPBIN="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-else
- # Broken: fails on valid input.
-continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
else
- # Passes both tests.
-ac_preproc_ok=:
-break
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+ test -n "$ac_ct_DUMPBIN" && break
done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+ if test "x$ac_ct_DUMPBIN" = x; then
+ DUMPBIN=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ DUMPBIN=$ac_ct_DUMPBIN
+ fi
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
+ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
+ fi
+fi
+test -z "$NM" && NM=nm
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
+{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_stdc=no
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+ (eval echo "\"\$as_me:$LINENO: $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)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+ fi
+ rm -r -f conftest*
fi
-rm -f conftest*
+{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
-fi
+# find the maximum length of command line arguments
+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ i=0
+ teststring="ABCD"
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
+ # (any single argument exceeding 2000 bytes causes a buffer overrun
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
+ cygwin* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+ # you end up with a "frozen" computer, even though with patience
+ # the test eventually succeeds (with a max line length of 256k).
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
-fi
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
+ ;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # 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 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ # Only check the string length outside the loop.
+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on
+ # massive amounts of additional arguments before passing them to the
+ # linker. It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
+ ;;
+ esac
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+fi
+if test -n $lt_cv_sys_max_cmd_len ; then
+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-fi
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-fi
-done
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/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
+{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
+echo "${ECHO_T}$xsi_shell" >&6; }
+{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+ >/dev/null 2>&1 \
+ && lt_shell_append=yes
+{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+echo "${ECHO_T}$lt_shell_append" >&6; }
+
- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
- MINIX=yes
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
else
- MINIX=
+ lt_unset=false
fi
- if test "$MINIX" = yes; then
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ lt_SP2NL='tr \040 \012'
+ lt_NL2SP='tr \015\012 \040\040'
+ ;;
+ *) # EBCDIC based system
+ lt_SP2NL='tr \100 \n'
+ lt_NL2SP='tr \r\n \100\100'
+ ;;
+esac
+
+
-$as_echo "#define _MINIX 1" >>confdefs.h
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-# define __EXTENSIONS__ 1
- $ac_includes_default
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_safe_to_define___extensions__=yes
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ lt_cv_ld_reload_flag='-r'
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
- test $ac_cv_safe_to_define___extensions__ = yes &&
- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+ ;;
+esac
- $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
- $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
- $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
+done
+done
+IFS=$as_save_IFS
+
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
- break
fi
-done
-if ${ac_cv_search_strerror+:} false; then :
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+echo "${ECHO_T}$OBJDUMP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_search_strerror=no
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
fi
+test -z "$OBJDUMP" && OBJDUMP=objdump
-##########################STAGING area####################################
-##########################STAGING area####################################
-##########################################################################
-## ##
-## Check specific C constructions ##
-## ##
-##########################################################################
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
- not a universal capable compiler
- #endif
- typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
- # Check for potential -arch flags. It is not universal unless
- # there are at least two -arch flags with different values.
- ac_arch=
- ac_prev=
- for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
- if test -n "$ac_prev"; then
- case $ac_word in
- i?86 | x86_64 | ppc | ppc64)
- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
- ac_arch=$ac_word
- else
- ac_cv_c_bigendian=universal
- break
- fi
- ;;
- esac
- ac_prev=
- elif test "x$ac_word" = "x-arch"; then
- ac_prev=arch
- fi
- done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/param.h>
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
- && LITTLE_ENDIAN)
- bogus endian macros
- #endif
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/param.h>
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
- #endif
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
- bogus endian macros
- #endif
+beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to _BIG_ENDIAN or not.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
+bsdi[45]*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
- not big endian
- #endif
+cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # Compile a test program.
- if test "$cross_compiling" = yes; then :
- # Try to guess by grepping values from an object file.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-short int ascii_mm[] =
- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
- short int ascii_ii[] =
- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- int use_ascii (int i) {
- return ascii_mm[i] + ascii_ii[i];
- }
- short int ebcdic_ii[] =
- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
- short int ebcdic_mm[] =
- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- int use_ebcdic (int i) {
- return ebcdic_mm[i] + ebcdic_ii[i];
- }
- extern int foo;
+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
+ 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_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
- ac_cv_c_bigendian=yes
- fi
- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
- if test "$ac_cv_c_bigendian" = unknown; then
- ac_cv_c_bigendian=no
- else
- # finding both strings is unlikely to happen, but who knows?
- ac_cv_c_bigendian=unknown
- fi
- fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
+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'
+ ;;
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
- long int l;
- char c[sizeof (long int)];
- } u;
- u.l = 1;
- return u.c[sizeof (long int) - 1] == 1;
+darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_c_bigendian=no
-else
- ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+ esac
+ else
+ lt_cv_deplibs_check_method=pass_all
+ fi
+ ;;
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
- yes)
- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
- no)
- ;; #(
- universal)
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
- ;; #(
- *)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
+hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+ 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_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_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+ ;;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+interix[3-9]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
- const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *pcpcc;
- char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++pcpcc;
- ppc = (char**) pcpcc;
- pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
+irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
- *t++ = 0;
- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- if (!foo) return 0;
- }
- return !cs[0] && !zero.x;
-#endif
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_const=yes
-else
- ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
+netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+ fi
+ ;;
-$as_echo "#define const /**/" >>confdefs.h
+newos6*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
+*nto* | *qnx*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
-done
+openbsd*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ fi
+ ;;
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
+osf3* | osf4* | osf5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-case $ac_cv_c_inline in
- inline | yes) ;;
- *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
- esac
- cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
;;
-esac
+ ncr)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ sequent)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+ ;;
+ sni)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+ lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+ ;;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
-$as_echo_n "checking whether char is unsigned... " >&6; }
-if ${ac_cv_c_char_unsigned+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((char) -1) < 0)];
-test_array [0] = 0
+tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+esac
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_char_unsigned=no
-else
- ac_cv_c_char_unsigned=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
-$as_echo "$ac_cv_c_char_unsigned" >&6; }
-if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
- $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+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
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double with more range or precision than double" >&5
-$as_echo_n "checking for long double with more range or precision than double... " >&6; }
-if ${ac_cv_type_long_double_wider+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <float.h>
- long double const a[] =
- {
- 0.0L, DBL_MIN, DBL_MAX, DBL_EPSILON,
- LDBL_MIN, LDBL_MAX, LDBL_EPSILON
- };
- long double
- f (long double x)
- {
- return ((x + (unsigned long int) 10) * (-1 / x) + a[0]
- + (x ? f (x) : 'c'));
- }
-int
-main ()
-{
-static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP)
- + (DBL_MANT_DIG < LDBL_MANT_DIG)
- - (LDBL_MAX_EXP < DBL_MAX_EXP)
- - (LDBL_MANT_DIG < DBL_MANT_DIG)))
- && (int) LDBL_EPSILON == 0
- )];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_type_long_double_wider=yes
-else
- ac_cv_type_long_double_wider=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double_wider" >&5
-$as_echo "$ac_cv_type_long_double_wider" >&6; }
- if test $ac_cv_type_long_double_wider = yes; then
-$as_echo "#define HAVE_LONG_DOUBLE_WIDER 1" >>confdefs.h
- fi
- ac_cv_c_long_double=$ac_cv_type_long_double_wider
- if test $ac_cv_c_long_double = yes; then
-$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
- fi
+if test -n "$ac_tool_prefix"; then
+ # 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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ 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
+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_AR="${ac_tool_prefix}ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-##########################################################################
-## ##
-## Check lengths C datatypes ##
-## ##
-##########################################################################
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
-$as_echo_n "checking size of char... " >&6; }
-if ${ac_cv_sizeof_char+:} false; then :
- $as_echo_n "(cached) " >&6
+fi
+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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then :
+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_AR="ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6; }
else
- if test "$ac_cv_type_char" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (char)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_char=0
- fi
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+else
+ AR="$ac_cv_prog_AR"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
-$as_echo "$ac_cv_sizeof_char" >&6; }
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-_ACEOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
-else
- if test "$ac_cv_type_short" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (short)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_short=0
- fi
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned" >&5
-$as_echo_n "checking size of unsigned... " >&6; }
-if ${ac_cv_sizeof_unsigned+:} false; then :
- $as_echo_n "(cached) " >&6
+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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned))" "ac_cv_sizeof_unsigned" "$ac_includes_default"; then :
-
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
- if test "$ac_cv_type_unsigned" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_unsigned=0
- fi
-fi
+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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned" >&5
-$as_echo "$ac_cv_sizeof_unsigned" >&6; }
-
-
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED $ac_cv_sizeof_unsigned
-_ACEOF
+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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
- $as_echo_n "(cached) " >&6
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
else
- if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_int=0
- fi
+ STRIP="$ac_cv_prog_STRIP"
fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+test -z "$STRIP" && STRIP=:
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long=0
- fi
-fi
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
- $as_echo_n "(cached) " >&6
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
else
- if test "$ac_cv_type_long_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long_long=0
- fi
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+test -z "$RANLIB" && RANLIB=:
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
-$as_echo_n "checking size of float... " >&6; }
-if ${ac_cv_sizeof_float+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then :
-else
- if test "$ac_cv_type_float" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (float)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_float=0
- fi
-fi
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
-$as_echo "$ac_cv_sizeof_float" >&6; }
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FLOAT $ac_cv_sizeof_float
-_ACEOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
-$as_echo_n "checking size of double... " >&6; }
-if ${ac_cv_sizeof_double+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then :
-else
- if test "$ac_cv_type_double" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (double)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_double=0
- fi
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
-$as_echo "$ac_cv_sizeof_double" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
-_ACEOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5
-$as_echo_n "checking size of long double... " >&6; }
-if ${ac_cv_sizeof_long_double+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default"; then :
-else
- if test "$ac_cv_type_long_double" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long double)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long_double=0
- fi
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_double" >&5
-$as_echo "$ac_cv_sizeof_long_double" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
-_ACEOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char *" >&5
-$as_echo_n "checking size of char *... " >&6; }
-if ${ac_cv_sizeof_char_p+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char *))" "ac_cv_sizeof_char_p" "$ac_includes_default"; then :
-else
- if test "$ac_cv_type_char_p" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (char *)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_char_p=0
- fi
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char_p" >&5
-$as_echo "$ac_cv_sizeof_char_p" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-_ACEOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-$as_echo_n "checking size of void *... " >&6; }
-if ${ac_cv_sizeof_void_p+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
-else
- if test "$ac_cv_type_void_p" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (void *)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_void_p=0
- fi
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-$as_echo "$ac_cv_sizeof_void_p" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-_ACEOF
-##########################################################################
-## ##
-## Check for various programms ##
-## ##
-##########################################################################
-## Force install-sh to be accessed via an absolute path:
-ac_install_sh="$TOP/$ac_install_sh"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
-## We favor yacc above bizon or byacc, therefor we do not use AC_PROG_YACC
-for ac_prog in 'bison -y' byacc
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; 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_YACC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$YACC"; then
- ac_cv_prog_YACC="$YACC" # 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_YACC="$ac_prog"
- $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
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# Allow CC to be a program name with arguments.
+compiler=$CC
- test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-## AC_CHECK_PROGS(YACC, yacc byacc 'bison -l', yacc)
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-# Extract the first word of "htmldoc", so it can be a program name with args.
-set dummy htmldoc; 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_path_HTMLDOC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $HTMLDOC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_HTMLDOC="$HTMLDOC" # Let the user override the test with a path.
+# Define system-specific variables.
+case $host_os in
+aix*)
+ symcode='[BCDT]'
;;
- *)
- 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_path_HTMLDOC="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+cygwin* | mingw* | pw32* | cegcc*)
+ symcode='[ABCDGISTW]'
+ ;;
+hpux*)
+ if test "$host_cpu" = ia64; then
+ symcode='[ABCDEGRST]'
fi
-done
- done
-IFS=$as_save_IFS
-
+ ;;
+irix* | nonstopux*)
+ symcode='[BCDEGRST]'
+ ;;
+osf*)
+ symcode='[BCDEGQRST]'
+ ;;
+solaris*)
+ symcode='[BDRT]'
+ ;;
+sco3.2v5*)
+ symcode='[DT]'
+ ;;
+sysv4.2uw2*)
+ symcode='[DT]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[ABDT]'
+ ;;
+sysv4)
+ symcode='[DFNSTU]'
;;
esac
-fi
-HTMLDOC=$ac_cv_path_HTMLDOC
-if test -n "$HTMLDOC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HTMLDOC" >&5
-$as_echo "$HTMLDOC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+ symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- if test "x$HTMLDOC" != "x"; then
- WITH_HTMLDOC_TRUE=
- WITH_HTMLDOC_FALSE='#'
-else
- WITH_HTMLDOC_TRUE='#'
- WITH_HTMLDOC_FALSE=
-fi
+# 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'"
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+ ;;
+esac
-for ac_prog in flex lex
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; 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_LEX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$LEX"; then
- ac_cv_prog_LEX="$LEX" # 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_LEX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+ # Write the raw and C identifiers.
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Fake it for dumpbin and say T for any non-static function
+ # and D for any global variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+" {last_section=section; section=\$ 3};"\
+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" \$ 0!~/External *\|/{next};"\
+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+" {if(hide[section]) next};"\
+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" ' prfx=^$ac_symprfx"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
-done
- done
-IFS=$as_save_IFS
-fi
-fi
-LEX=$ac_cv_prog_LEX
-if test -n "$LEX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-$as_echo "$LEX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+ rm -r -f conftest*
+ cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
- test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+ if { (eval echo "$as_me:$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=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+ mv -f "$nlist"T "$nlist"
+ else
+ rm -f "$nlist"T
+ fi
-if test "x$LEX" != "x:"; then
- cat >conftest.l <<_ACEOF
-%%
-a { ECHO; }
-b { REJECT; }
-c { yymore (); }
-d { yyless (1); }
-e { yyless (input () != 0); }
-f { unput (yytext[0]); }
-. { BEGIN INITIAL; }
-%%
-#ifdef YYTEXT_POINTER
-extern char *yytext;
+ # Make sure that we snagged all the symbols we need.
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
#endif
-int
-main (void)
+
+_LT_EOF
+ # Now generate the symbol file.
+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+ cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols. */
+const struct {
+ const char *name;
+ void *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
{
- return ! yylex () + ! yywrap ();
+ { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt__PROGRAM__LTX_preloaded_symbols;
}
-_ACEOF
-{ { ac_try="$LEX conftest.l"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$LEX conftest.l") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-$as_echo_n "checking lex output file root... " >&6; }
-if ${ac_cv_prog_lex_root+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+#endif
-if test -f lex.yy.c; then
- ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
- ac_cv_prog_lex_root=lexyy
-else
- as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-$as_echo "$ac_cv_prog_lex_root" >&6; }
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+ # Now try linking the two files.
+ mv conftest.$ac_objext conftstm.$ac_objext
+ 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:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+ LIBS="$lt_save_LIBS"
+ CFLAGS="$lt_save_CFLAGS"
+ else
+ echo "cannot find nm_test_func in $nlist" >&5
+ fi
+ else
+ echo "cannot find nm_test_var in $nlist" >&5
+ fi
+ else
+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+ fi
+ else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ fi
+ rm -rf conftest* conftst*
-if test -z "${LEXLIB+set}"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-$as_echo_n "checking lex library... " >&6; }
-if ${ac_cv_lib_lex+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+ fi
+done
- ac_save_LIBS=$LIBS
- ac_cv_lib_lex='none needed'
- for ac_lib in '' -lfl -ll; do
- LIBS="$ac_lib $ac_save_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_lex=$ac_lib
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- test "$ac_cv_lib_lex" != 'none needed' && break
- done
- LIBS=$ac_save_LIBS
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+ lt_cv_sys_global_symbol_to_cdecl=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-$as_echo "$ac_cv_lib_lex" >&6; }
- test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+ { echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6; }
+else
+ { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-ac_save_LIBS=$LIBS
-LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- #define YYTEXT_POINTER 1
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_prog_lex_yytext_pointer=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
-fi
-rm -f conftest.l $LEX_OUTPUT_ROOT.c
-fi
-if test "$LEX" = :; then
- LEX=${am_missing_run}flex
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+ enableval=$enable_libtool_lock;
fi
-# Extract the first word of "flex", so it can be a program name with args.
-set dummy flex; 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_path_FLEX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $FLEX in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path.
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
;;
- *)
- 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_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+ ;;
+ *N32*)
+ LD="${LD-ld} -melf32bmipn32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
+ ;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
fi
-done
- done
-IFS=$as_save_IFS
+ rm -rf conftest*
+ ;;
- test -z "$ac_cv_path_FLEX" && ac_cv_path_FLEX="flex"
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+ LD="${LD-ld} -m elf_s390"
+ ;;
+ sparc64-*linux*)
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
+ esac
+ ;;
+ *64-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+ LD="${LD-ld} -m elf64_s390"
+ ;;
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-fi
-FLEX=$ac_cv_path_FLEX
-if test -n "$FLEX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
-$as_echo "$FLEX" >&6; }
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ lt_cv_cc_needs_belf=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ lt_cv_cc_needs_belf=no
fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Extract the first word of "gawk", so it can be a program name with args.
-set dummy gawk; 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_path_GAWK+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GAWK in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GAWK="$GAWK" # Let the user override the test with a path.
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
;;
- *)
- 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_path_GAWK="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
+ esac
+ ;;
+ esac
fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GAWK" && ac_cv_path_GAWK="gawk"
+ rm -rf conftest*
;;
esac
-fi
-GAWK=$ac_cv_path_GAWK
-if test -n "$GAWK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GAWK" >&5
-$as_echo "$GAWK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+
+need_locks="$enable_libtool_lock"
-# Extract the first word of "gperf", so it can be a program name with args.
-set dummy gperf; 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_path_GPERF+:} false; then :
- $as_echo_n "(cached) " >&6
+ case $host_os in
+ rhapsody* | darwin*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $GPERF in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GPERF="$GPERF" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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
+ 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_path_GPERF="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
- test -z "$ac_cv_path_GPERF" && ac_cv_path_GPERF="gperf"
- ;;
-esac
fi
-GPERF=$ac_cv_path_GPERF
-if test -n "$GPERF"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5
-$as_echo "$GPERF" >&6; }
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; 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_path_PERL+:} false; then :
- $as_echo_n "(cached) " >&6
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $PERL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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
+ 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_path_PERL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
- test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
- ;;
-esac
fi
-PERL=$ac_cv_path_PERL
-if test -n "$PERL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+ if test "x$ac_ct_DSYMUTIL" = x; then
+ DSYMUTIL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ DSYMUTIL=$ac_ct_DSYMUTIL
+ fi
+else
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
-# Extract the first word of "python", so it can be a program name with args.
-set dummy python; 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_path_PYTHON+:} false; then :
- $as_echo_n "(cached) " >&6
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $PYTHON in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # 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
+ 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_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="python"
- ;;
-esac
fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-# Extract the first word of "ruby", so it can be a program name with args.
-set dummy ruby; 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_path_RUBY+:} false; then :
- $as_echo_n "(cached) " >&6
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $RUBY in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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
+ 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_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
- test -z "$ac_cv_path_RUBY" && ac_cv_path_RUBY="ruby"
- ;;
-esac
fi
-RUBY=$ac_cv_path_RUBY
-if test -n "$RUBY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
-$as_echo "$RUBY" >&6; }
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-
-#AC_DECL_YYTEXT
-
-##########################################################################
-## ##
-## Use the new LibTool GNU package ##
-## ##
-##########################################################################
-case `pwd` in
- *\ * | *\ *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
esac
-
-
-
-macro_version='2.2.6b'
-macro_revision='1.3018'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-{ $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 :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
+ NMEDIT=$ac_ct_NMEDIT
fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- # Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
- break
- ;;
- *)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
- ;;
- esac
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
- done
- : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-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 "$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
- $as_echo_n "(cached) " >&6
+ NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$DUMPBIN"; then
- ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+ if test -n "$LIPO"; then
+ ac_cv_prog_LIPO="$LIPO" # 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
+ 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_DUMPBIN="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+ { echo "$as_me:$LINENO: result: $LIPO" >&5
+echo "${ECHO_T}$LIPO" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- test -n "$DUMPBIN" && break
- done
fi
-if test -z "$DUMPBIN"; then
- ac_ct_DUMPBIN=$DUMPBIN
- 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
-{ $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_DUMPBIN+:} false; then :
- $as_echo_n "(cached) " >&6
+if test -z "$ac_cv_prog_LIPO"; then
+ ac_ct_LIPO=$LIPO
+ # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$ac_ct_DUMPBIN"; then
- ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+ if test -n "$ac_ct_LIPO"; then
+ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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
+ 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_DUMPBIN="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_LIPO="lipo"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+echo "${ECHO_T}$ac_ct_LIPO" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-
- test -n "$ac_ct_DUMPBIN" && break
-done
-
- if test "x$ac_ct_DUMPBIN" = x; then
- DUMPBIN=":"
+ if test "x$ac_ct_LIPO" = x; then
+ LIPO=":"
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;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
esac
- DUMPBIN=$ac_ct_DUMPBIN
- fi
-fi
-
-
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
- fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7392: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&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:7398: output\"" >&5)
- cat conftest.out >&5
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
+ LIPO=$ac_ct_LIPO
fi
- rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- i=0
- teststring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw* | cegcc*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- 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.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
-
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
- # nice to cause kernel panics so lets avoid the loop below.
- # First set a reasonable default.
- lt_cv_sys_max_cmd_len=16384
- #
- if test -x /sbin/sysconfig; then
- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
- *1*) lt_cv_sys_max_cmd_len=-1 ;;
- esac
- fi
- ;;
- sco3.2v5*)
- lt_cv_sys_max_cmd_len=102400
- ;;
- sysv5* | sco5v6* | sysv4.2uw2*)
- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
- if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
- else
- lt_cv_sys_max_cmd_len=32768
- fi
- ;;
- *)
- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- else
- # Make teststring a little bigger before we do anything with it.
- # a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
- teststring=$teststring$teststring
- done
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- # 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"`$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`
- teststring=$teststring$teststring
- done
- # Only check the string length outside the loop.
- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
- teststring=
- # Add a significant safety factor because C++ compilers can tack on
- # massive amounts of additional arguments before passing them to the
- # linker. It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
- esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$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"}, \
- = c,a/b,, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- lt_unset=unset
-else
- lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- lt_SP2NL='tr \040 \012'
- lt_NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- lt_SP2NL='tr \100 \n'
- lt_NL2SP='tr \r\n \100\100'
- ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $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 :
- $as_echo_n "(cached) " >&6
else
- lt_cv_ld_reload_flag='-r'
+ LIPO="$ac_cv_prog_LIPO"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
- ;;
-esac
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+:} false; then :
- $as_echo_n "(cached) " >&6
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$OBJDUMP"; then
- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+ if test -n "$OTOOL"; then
+ ac_cv_prog_OTOOL="$OTOOL" # 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
+ 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_OBJDUMP="${ac_tool_prefix}objdump"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+ { echo "$as_me:$LINENO: result: $OTOOL" >&5
+echo "${ECHO_T}$OTOOL" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
- ac_ct_OBJDUMP=$OBJDUMP
- # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; 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_OBJDUMP+:} false; then :
- $as_echo_n "(cached) " >&6
+if test -z "$ac_cv_prog_OTOOL"; then
+ ac_ct_OTOOL=$OTOOL
+ # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$ac_ct_OBJDUMP"; then
- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+ if test -n "$ac_ct_OTOOL"; then
+ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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
+ 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_OBJDUMP="objdump"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_OTOOL="otool"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_OBJDUMP" = x; then
- OBJDUMP="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
- OBJDUMP=$ac_ct_OBJDUMP
- fi
-else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi[45]*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
-
-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.
- 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
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
-
-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'
- ;;
-
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
- 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]) 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_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-interix[3-9]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-*nto* | *qnx*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-rdos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- pc)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-tpf*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-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_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+ if test "x$ac_ct_OTOOL" = x; then
+ OTOOL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ OTOOL=$ac_ct_OTOOL
+ fi
+else
+ OTOOL="$ac_cv_prog_OTOOL"
+fi
-if test -n "$ac_tool_prefix"; then
- # 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_AR+:} false; then :
- $as_echo_n "(cached) " >&6
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
+ if test -n "$OTOOL64"; then
+ ac_cv_prog_OTOOL64="$OTOOL64" # 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
+ 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}ar"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
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; }
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+ { echo "$as_me:$LINENO: result: $OTOOL64" >&5
+echo "${ECHO_T}$OTOOL64" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
-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_AR+:} false; then :
- $as_echo_n "(cached) " >&6
+if test -z "$ac_cv_prog_OTOOL64"; then
+ ac_ct_OTOOL64=$OTOOL64
+ # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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_OTOOL64"; then
+ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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
+ 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="ar"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_OTOOL64="otool64"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
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; }
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_OTOOL64" = x; then
+ OTOOL64=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ OTOOL64=$ac_ct_OTOOL64
+ fi
+else
+ OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ rm -rf libconftest.dylib*
+ echo "int foo(void){return 1;}" > conftest.c
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ lt_cv_ld_exported_symbols_list=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+ { echo "$as_me:$LINENO: checking for -force_load linker flag" >&5
+echo $ECHO_N "checking for -force_load linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_force_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_force_load" >&5
+echo "${ECHO_T}$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[012]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ 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
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+
+
+for ac_header in dlfcn.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+
+
+
+ enable_dlopen=no
+
+
+ enable_win32_dll=no
+
+
+ # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ enable_shared=yes
fi
- 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
-else
- AR="$ac_cv_prog_AR"
-fi
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
@@ -8047,224 +13638,92 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+ # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
+else
+ enable_static=yes
+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; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- 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
- STRIP=$ac_ct_STRIP
- fi
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then
+ withval=$with_pic; pic_mode="$withval"
else
- STRIP="$ac_cv_prog_STRIP"
+ pic_mode=default
fi
-test -z "$STRIP" && STRIP=:
+test -z "$pic_mode" && pic_mode=default
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib"
- $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
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+
+ # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ enable_fast_install=yes
fi
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; 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_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib"
- $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_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- 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
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-test -z "$RANLIB" && RANLIB=:
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8291,6 +13750,7 @@ fi
+test -z "$LN_S" && LN_S="ln -s"
@@ -8299,247 +13759,252 @@ fi
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-# Allow CC to be a program name with arguments.
-compiler=$CC
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
- $as_echo_n "(cached) " >&6
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+
+{ echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+if test "${lt_cv_objdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
else
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[BCDT]'
- ;;
-cygwin* | mingw* | pw32* | cegcc*)
- symcode='[ABCDGISTW]'
- ;;
-hpux*)
- if test "$host_cpu" = ia64; then
- symcode='[ABCDEGRST]'
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
fi
;;
-irix* | nonstopux*)
- symcode='[BCDEGRST]'
- ;;
-osf*)
- symcode='[BCDEGQRST]'
- ;;
-solaris*)
- symcode='[BDRT]'
- ;;
-sco3.2v5*)
- symcode='[DT]'
- ;;
-sysv4.2uw2*)
- symcode='[DT]'
- ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
- symcode='[ABDT]'
- ;;
-sysv4)
- symcode='[DFNSTU]'
- ;;
esac
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[ABCDGIRSTW]' ;;
-esac
+# Global variables:
+ofile=libtool
+can_build_shared=yes
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
-# 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'"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
- # Write the raw and C identifiers.
- if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
- # Also find C++ and __fastcall symbols from MSVC++,
- # which start with @ or ?.
- lt_cv_sys_global_symbol_pipe="$AWK '"\
-" {last_section=section; section=\$ 3};"\
-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-" \$ 0!~/External *\|/{next};"\
-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-" ' prfx=^$ac_symprfx"
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- # Check to see that the pipe works correctly.
- pipe_works=no
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $MAGIC_CMD in
+[\\/*] | ?:[\\/]*)
+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD="$MAGIC_CMD"
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/${ac_tool_prefix}file; then
+ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <<_LT_EOF 1>&2
- rm -f conftest*
- cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
- 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; }; 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
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
- else
- rm -f "$nlist"T
+_LT_EOF
+ fi ;;
+ esac
fi
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+esac
+fi
- # Make sure that we snagged all the symbols we need.
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-_LT_EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
- cat <<_LT_EOF >> conftest.$ac_ext
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- void *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
- { "@PROGRAM@", (void *) 0 },
-_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
- cat <<\_LT_EOF >> conftest.$ac_ext
- {0, (void *) 0}
-};
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- 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
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- else
- echo "cannot find nm_test_var in $nlist" >&5
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+ { echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $MAGIC_CMD in
+[\\/*] | ?:[\\/]*)
+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD="$MAGIC_CMD"
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/file; then
+ lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+ fi ;;
+ esac
fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+ break
fi
+ done
+ IFS="$lt_save_ifs"
+ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
else
- echo "$progname: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ MAGIC_CMD=:
fi
- rm -rf conftest* conftst*
+fi
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
- else
- lt_cv_sys_global_symbol_pipe=
fi
-done
+ ;;
+esac
-fi
+# Use C for the default configuration in the libtool script
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
@@ -8547,1247 +14012,1888 @@ fi
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+# Allow CC to be a program name with arguments.
+compiler=$CC
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM -r conftest*
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+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
+ { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -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 "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $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
+ $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
+ fi
+ fi
+ $RM -r conftest*
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
- enableval=$enable_libtool_lock;
fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+ :
+fi
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- 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; }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *ELF-64*)
- HPUX_IA64_MODE="64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- 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=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -melf32bsmip"
- ;;
- *N32*)
- LD="${LD-ld} -melf32bmipn32"
- ;;
- *64-bit*)
- LD="${LD-ld} -melf64bmip"
- ;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
+fi
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- 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; }; then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_i386_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
- ppc64-*linux*|powerpc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- ppc*-*linux*|powerpc*-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*|s390*-*tpf*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- lt_cv_cc_needs_belf=yes
-else
- lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- 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; }; then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_static='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+ ;;
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | 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).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ ;;
+
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ 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
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+ # +Z the default
+ ;;
*)
- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- LD="${LD-ld} -64"
- fi
+ lt_prog_compiler_pic='-fPIC'
;;
esac
;;
+
+ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+ lt_prog_compiler_can_build_shared=no
+ enable_shared=no
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic='-fPIC -shared'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ lt_prog_compiler_pic=-Kconform_pic
+ fi
+ ;;
+
+ *)
+ lt_prog_compiler_pic='-fPIC'
+ ;;
esac
- fi
- rm -rf conftest*
- ;;
-esac
-need_locks="$enable_libtool_lock"
+ 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
+ aix*)
+ lt_prog_compiler_wl='-Wl,'
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ else
+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
+ mingw* | cygwin* | pw32* | os2* | 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).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ ;;
- case $host_os in
- rhapsody* | darwin*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$DSYMUTIL"; then
- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil"
- $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
+ hpux9* | hpux10* | hpux11*)
+ lt_prog_compiler_wl='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ lt_prog_compiler_pic='+Z'
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+ lt_prog_compiler_static='${wl}-a ${wl}archive'
+ ;;
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ irix5* | irix6* | nonstopux*)
+ lt_prog_compiler_wl='-Wl,'
+ # PIC (with -KPIC) is the default.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc* | ifort*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ # Lahey Fortran 8.1.
+ lf95*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='--shared'
+ lt_prog_compiler_static='--static'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ ccc*)
+ lt_prog_compiler_wl='-Wl,'
+ # 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
+ 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,'
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ newsos6)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
- ac_ct_DSYMUTIL=$DSYMUTIL
- # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; 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_DSYMUTIL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_DSYMUTIL"; then
- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_DSYMUTIL="dsymutil"
- $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
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic='-fPIC -shared'
+ ;;
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ osf3* | osf4* | osf5*)
+ lt_prog_compiler_wl='-Wl,'
+ # All OSF/1 code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
- if test "x$ac_ct_DSYMUTIL" = x; then
- DSYMUTIL=":"
- 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
- DSYMUTIL=$ac_ct_DSYMUTIL
- fi
-else
- DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
+ rdos*)
+ lt_prog_compiler_static='-non_shared'
+ ;;
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$NMEDIT"; then
- ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit"
- $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
+ solaris*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl='-Wl,';;
+ esac
+ ;;
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ sunos4*)
+ lt_prog_compiler_wl='-Qoption ld '
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
- ac_ct_NMEDIT=$NMEDIT
- # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; 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_NMEDIT+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_NMEDIT"; then
- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_NMEDIT="nmedit"
- $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
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+ lt_prog_compiler_pic='-Kconform_pic'
+ lt_prog_compiler_static='-Bstatic'
+ fi
+ ;;
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
- if test "x$ac_ct_NMEDIT" = x; then
- NMEDIT=":"
- 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
- NMEDIT=$ac_ct_NMEDIT
- fi
-else
- NMEDIT="$ac_cv_prog_NMEDIT"
-fi
+ unicos*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_can_build_shared=no
+ ;;
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; 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_LIPO+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$LIPO"; then
- ac_cv_prog_LIPO="$LIPO" # 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_LIPO="${ac_tool_prefix}lipo"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+ uts4*)
+ lt_prog_compiler_pic='-pic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ *)
+ lt_prog_compiler_can_build_shared=no
+ ;;
+ esac
fi
-done
- done
-IFS=$as_save_IFS
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+ ;;
+ *)
+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+ ;;
+esac
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-fi
-if test -z "$ac_cv_prog_LIPO"; then
- ac_ct_LIPO=$LIPO
- # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; 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_LIPO+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_LIPO"; then
- ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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_LIPO="lipo"
- $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_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- if test "x$ac_ct_LIPO" = x; then
- LIPO=":"
- 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
- LIPO=$ac_ct_LIPO
- fi
-else
- LIPO="$ac_cv_prog_LIPO"
-fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; 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_OTOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OTOOL"; then
- ac_cv_prog_OTOOL="$OTOOL" # 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_OTOOL="${ac_tool_prefix}otool"
- $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
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -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 "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $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
+ $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
+ fi
+ fi
+ $RM -r conftest*
fi
-if test -z "$ac_cv_prog_OTOOL"; then
- ac_ct_OTOOL=$OTOOL
- # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; 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_OTOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OTOOL"; then
- ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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_OTOOL="otool"
- $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
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+ esac
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ lt_prog_compiler_pic=
+ lt_prog_compiler_can_build_shared=no
fi
- if test "x$ac_ct_OTOOL" = x; then
- OTOOL=":"
- 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
- OTOOL=$ac_ct_OTOOL
- fi
-else
- OTOOL="$ac_cv_prog_OTOOL"
fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OTOOL64"; then
- ac_cv_prog_OTOOL64="$OTOOL64" # 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_OTOOL64="${ac_tool_prefix}otool64"
- $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
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
- ac_ct_OTOOL64=$OTOOL64
- # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; 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_OTOOL64+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OTOOL64"; then
- ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
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_OTOOL64="otool64"
- $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
+ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ 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_static_works=yes
+ fi
+ else
+ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ lt_prog_compiler_static=
fi
- if test "x$ac_ct_OTOOL64" = x; then
- OTOOL64=":"
- 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
- OTOOL64=$ac_ct_OTOOL64
- fi
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- OTOOL64="$ac_cv_prog_OTOOL64"
+ lt_cv_prog_compiler_c_o=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -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 "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $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
+ $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
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM -r conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM -r conftest*
+
fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_prog_compiler_c_o=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -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 "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $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
+ $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
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM -r conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM -r conftest*
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $RM -r conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+else
+ need_locks=no
+fi
+ { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ runpath_var=
+ allow_undefined_flag=
+ always_export_symbols=no
+ archive_cmds=
+ archive_expsym_cmds=
+ compiler_needs_object=no
+ enable_shared_with_static_runtimes=no
+ export_dynamic_flag_spec=
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ hardcode_automatic=no
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_flag_spec_ld=
+ hardcode_libdir_separator=
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+ inherit_rpath=no
+ link_all_deplibs=unknown
+ module_cmds=
+ module_expsym_cmds=
+ old_archive_from_new_cmds=
+ old_archive_from_expsyms_cmds=
+ thread_safe_flag_spec=
+ whole_archive_flag_spec=
+ # include_expsyms should be a list of space-separated symbols to be *always*
+ # included in the symbol list
+ include_expsyms=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+ 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}'
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec=
+ 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 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+*** Warning: the GNU linker, at least up to release 2.19, 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.
+_LT_EOF
+ fi
+ ;;
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
+ ;;
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _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/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
- # By default we will add the -single_module flag. You can override
- # by either setting the environment variable LT_MULTI_MODULE
- # non-empty at configure time, or by adding -multi_module to the
- # link flags.
- rm -rf libconftest.dylib*
- echo "int foo(void){return 1;}" > conftest.c
- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
- _lt_result=$?
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
- lt_cv_apple_cc_single_mod=yes
+ 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'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
else
- cat conftest.err >&5
- fi
- rm -rf libconftest.dylib*
- rm -f conftest.*
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs=no
fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- lt_cv_ld_exported_symbols_list=yes
-else
- lt_cv_ld_exported_symbols_list=no
-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_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
- case $host_os in
- rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- if test "$DSYMUTIL" != ":"; then
- _lt_dsymutil='~$DSYMUTIL $lib || :'
- else
- _lt_dsymutil=
- fi
- ;;
- esac
+ haiku*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
-for ac_header in dlfcn.h
-do :
- ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ 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'
+ ;;
-fi
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
+ 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'
+ 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'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ 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)
+ 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'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-done
+ 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~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ case $cc_basename in
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # 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'
+ 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'
+ fi
+ ;;
+ esac
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+ 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
+ ;;
-# Set options
+ solaris*)
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ 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
+ ;;
- enable_dlopen=no
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
- enable_win32_dll=no
+_LT_EOF
+ ;;
+ *)
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ 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
+ ;;
+ esac
+ ;;
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
- # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
- enableval=$enable_shared; p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
*)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_shared=yes
- fi
- done
- IFS="$lt_save_ifs"
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ 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
;;
esac
-else
- enable_shared=yes
-fi
-
-
+ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
+ whole_archive_flag_spec=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+ case $host_os in
+ aix3*)
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+ fi
+ ;;
+ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ 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'
+ 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
+ aix_use_runtimelinking=no
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ ;;
+ esac
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ archive_cmds=''
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ file_list_spec='${wl}-f,'
- # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
- enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
+ fi
+ ;;
+ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_static=yes
-fi
-
-
-
-
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+ export_dynamic_flag_spec='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ always_export_symbols=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+int
+main ()
+{
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+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
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
- withval=$with_pic; pic_mode="$withval"
-else
- pic_mode=default
fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-test -z "$pic_mode" && pic_mode=default
+ 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"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag="-z nodefs"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+int
+main ()
+{
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+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
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
- enableval=$enable_fast_install; p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_fast_install=yes
+ 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
+ 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'
fi
- done
- IFS="$lt_save_ifs"
+ fi
;;
- esac
-else
- enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
+ ;;
+ bsdi[45]*)
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ 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'
+ fix_srcfile_path='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes=yes
+ ;;
+ darwin* | rhapsody*)
+ archive_cmds_need_lc=no
+ 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
+ link_all_deplibs=yes
+ allow_undefined_flag="$_lt_dar_allow_undefined"
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=func_echo_all
+ 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}"
+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ dgux*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_shlibpath_var=no
+ ;;
+ freebsd1*)
+ ld_shlibs=no
+ ;;
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+ # extra space).
+ freebsd2.2*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
-test -z "$LN_S" && LN_S="ln -s"
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ freebsd2*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+ hpux9*)
+ if test "$GCC" = yes; then
+ 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
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ export_dynamic_flag_spec='${wl}-E'
+ ;;
+ hpux10*)
+ if test "$GCC" = yes && test "$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
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld='+b $libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ export_dynamic_flag_spec='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+ hpux11*)
+ if test "$GCC" = yes && test "$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 -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'
+ ;;
+ *)
+ # 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)
+ { echo "$as_me:$LINENO: checking if $CC understands -b" >&5
+echo $ECHO_N "checking if $CC understands -b... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler__b+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler__b" >&5
+echo "${ECHO_T}$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
+ ;;
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ case $host_cpu in
+ hppa*64*|ia64*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ export_dynamic_flag_spec='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ ;;
+ esac
+ fi
+ ;;
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared $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'
+ # 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.
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ archive_expsym_cmds='$CC -shared $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'
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ 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'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ inherit_rpath=yes
+ link_all_deplibs=yes
+ ;;
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+ fi
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+ newsos6)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_shlibpath_var=no
+ ;;
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
+ *nto* | *qnx*)
+ ;;
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case $host_os in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ os2*)
+ 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'
+ 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'
+ 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'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ 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} $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'
+ 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_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'
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_separator=:
+ ;;
+ solaris*)
+ no_undefined_flag=' -z defs'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+ 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 ${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"*)
+ wlarc=''
+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+ wlarc='${wl}'
+ archive_cmds='$CC -G${allow_undefined_flag} -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_shlibpath_var=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ if test "$GCC" = yes; then
+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
+ esac
+ link_all_deplibs=yes
+ ;;
+ sunos4*)
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+ sysv4)
+ case $host_vendor in
+ sni)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes # is this really true???
+ ;;
+ siemens)
+ ## LD is ld it makes a PLAMLIB
+ ## CC just makes a GrossModule.
+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ reload_cmds='$CC -r -o $output$reload_objs'
+ hardcode_direct=no
+ ;;
+ motorola)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+ ;;
+ esac
+ runpath_var='LD_RUN_PATH'
+ hardcode_shlibpath_var=no
+ ;;
+ sysv4.3*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_shlibpath_var=no
+ export_dynamic_flag_spec='-Bexport'
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_shlibpath_var=no
+ runpath_var=LD_RUN_PATH
+ hardcode_runpath_var=yes
+ ld_shlibs=yes
+ fi
+ ;;
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+ runpath_var='LD_RUN_PATH'
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag='${wl}-z,text'
+ allow_undefined_flag='${wl}-z,nodefs'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ export_dynamic_flag_spec='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+ uts4*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_shlibpath_var=no
+ ;;
+ *)
+ ld_shlibs=no
+ ;;
+ esac
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
+ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
fi
- ;;
-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'
+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
+with_gnu_ld=$with_gnu_ld
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-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
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MAGIC_CMD in
-[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<_LT_EOF 1>&2
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool at gnu.org
-_LT_EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac
-fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+ # Assume -lc should be added
+ archive_cmds_need_lc=yes
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
- $as_echo_n "(cached) " >&6
+ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $archive_cmds in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+ ;;
+ '$CC '*)
+ # 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.
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $MAGIC_CMD in
-[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<_LT_EOF 1>&2
+ $RM -r conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool at gnu.org
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 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:$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=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ 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 -r conftest*
-_LT_EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
+echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6; }
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+ ;;
+ esac
+ fi
;;
esac
-fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- else
- MAGIC_CMD=:
- fi
-fi
- fi
- ;;
-esac
-# Use C for the default configuration in the libtool script
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Source file extension for C test sources.
-ac_ext=c
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
@@ -9795,478 +15901,72 @@ lt_simple_link_test_code='int main(){return(0);}'
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-# Allow CC to be a program name with arguments.
-compiler=$CC
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-lt_prog_compiler_no_builtin_flag=
-if test "$GCC" = yes; then
- 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; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -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:9854: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&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 "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
- fi
- fi
- $RM conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
- :
-fi
-fi
- lt_prog_compiler_wl=
-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,'
- lt_prog_compiler_static='-static'
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- lt_prog_compiler_static='-Bstatic'
- fi
- ;;
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- lt_prog_compiler_pic='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | cygwin* | pw32* | os2* | 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).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- lt_prog_compiler_pic='-fno-common'
- ;;
- 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
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic='-fPIC'
- ;;
- esac
- ;;
- interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- lt_prog_compiler_can_build_shared=no
- enable_shared=no
- ;;
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- lt_prog_compiler_pic='-fPIC -shared'
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- lt_prog_compiler_pic=-Kconform_pic
- fi
- ;;
- *)
- lt_prog_compiler_pic='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- lt_prog_compiler_static='-Bstatic'
- else
- lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
- mingw* | cygwin* | pw32* | os2* | 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).
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
- hpux9* | hpux10* | hpux11*)
- lt_prog_compiler_wl='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
- ;;
- irix5* | irix6* | nonstopux*)
- lt_prog_compiler_wl='-Wl,'
- # PIC (with -KPIC) is the default.
- lt_prog_compiler_static='-non_shared'
- ;;
- linux* | k*bsd*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-static'
- ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-fPIC'
- lt_prog_compiler_static='-static'
- ;;
- # Lahey Fortran 8.1.
- lf95*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-fpic'
- lt_prog_compiler_static='-Bstatic'
- ;;
- ccc*)
- lt_prog_compiler_wl='-Wl,'
- # All Alpha code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
- 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\ 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
- ;;
- newsos6)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- lt_prog_compiler_pic='-fPIC -shared'
- ;;
- osf3* | osf4* | osf5*)
- lt_prog_compiler_wl='-Wl,'
- # All OSF/1 code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
- rdos*)
- lt_prog_compiler_static='-non_shared'
- ;;
- solaris*)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- f77* | f90* | f95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- esac
- ;;
- sunos4*)
- lt_prog_compiler_wl='-Qoption ld '
- lt_prog_compiler_pic='-PIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
- sysv4 | sysv4.2uw2* | sysv4.3*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
- sysv4*MP*)
- if test -d /usr/nec ;then
- lt_prog_compiler_pic='-Kconform_pic'
- lt_prog_compiler_static='-Bstatic'
- fi
- ;;
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
- unicos*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_can_build_shared=no
- ;;
- uts4*)
- lt_prog_compiler_pic='-pic'
- lt_prog_compiler_static='-Bstatic'
- ;;
- *)
- lt_prog_compiler_can_build_shared=no
- ;;
- esac
- fi
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic=
- ;;
- *)
- 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; }
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -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:10193: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&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 "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
- fi
- fi
- $RM conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
- "" | " "*) ;;
- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
- esac
-else
- lt_prog_compiler_pic=
- lt_prog_compiler_can_build_shared=no
-fi
-fi
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- 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 "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
- fi
- else
- lt_cv_prog_compiler_static_works=yes
- fi
- fi
- $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
-else
- lt_prog_compiler_static=
-fi
@@ -10274,584 +15974,521 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_c_o=no
- $RM -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -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:10298: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&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 "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
- fi
- fi
- chmod u+w . 2>&5
- $RM conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
- $RM out/* && rmdir out
- cd ..
- $RM -r conftest
- $RM conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_c_o=no
- $RM -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -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:10353: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&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 "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
- fi
- fi
- chmod u+w . 2>&5
- $RM conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
- $RM out/* && rmdir out
- cd ..
- $RM -r conftest
- $RM conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
- hard_links=yes
- $RM conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
-else
- need_locks=no
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- runpath_var=
- allow_undefined_flag=
- always_export_symbols=no
- archive_cmds=
- archive_expsym_cmds=
- compiler_needs_object=no
- enable_shared_with_static_runtimes=no
- export_dynamic_flag_spec=
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- hardcode_automatic=no
- hardcode_direct=no
- hardcode_direct_absolute=no
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld=
- hardcode_libdir_separator=
- hardcode_minus_L=no
- hardcode_shlibpath_var=unsupported
- inherit_rpath=no
- link_all_deplibs=unknown
- module_cmds=
- module_expsym_cmds=
- old_archive_from_new_cmds=
- old_archive_from_expsyms_cmds=
- thread_safe_flag_spec=
- whole_archive_flag_spec=
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- include_expsyms=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- esac
- ld_shlibs=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec=
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
- *\ [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 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
- cat <<_LT_EOF 1>&2
-*** 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 modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-_LT_EOF
- fi
- ;;
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds=''
- ;;
- m68k)
- archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- ;;
- esac
- ;;
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- allow_undefined_flag=unsupported
- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- ld_shlibs=no
- fi
- ;;
- cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec='-L$libdir'
- 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/'\'' | $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'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- ld_shlibs=no
- fi
- ;;
- interix[3-9]*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- 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)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
- esac
- fi
- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
- then
- 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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
- 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' ;;
- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
- tmp_addflag=' -i_dynamic -nofor_main' ;;
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- lf95*) # Lahey Fortran 8.1
- whole_archive_flag_spec=
- tmp_sharedflag='--shared' ;;
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- tmp_sharedflag='-qmkshrobj'
- tmp_addflag= ;;
- 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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- compiler_needs_object=yes
- tmp_sharedflag='-G' ;;
- *Sun\ F*) # Sun Fortran 8.3
- tmp_sharedflag='-G' ;;
- esac
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$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~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- case $cc_basename in
- 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 $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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+
+if test "$GCC" = yes; then
+ case $host_os in
+ 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
+ *\;*)
+ # 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
+ # 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=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ 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 '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ 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`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+ # the line `#! .'. This would cause the generated library to
+ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[01] | aix4.[01].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
else
- ld_shlibs=no
+ can_build_shared=no
fi
;;
+ esac
+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+ library_names_spec='${libname}${release}.a $libname.a'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
- netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- 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
- ;;
+amigaos*)
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ 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'
+ ;;
+ esac
+ ;;
- solaris*)
- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
- ld_shlibs=no
- cat <<_LT_EOF 1>&2
+beos*)
+ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
+bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
-_LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 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
+cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ 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}`~
+ 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~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+
+ case $host_os in
+ 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"
+ ;;
+ 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
+ ;;
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
- ld_shlibs=no
- cat <<_LT_EOF 1>&2
+ *)
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ ;;
+ esac
+ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-_LT_EOF
- ;;
- *)
- # For security reasons, it is highly recommended that you always
- # use absolute paths for naming shared libraries, and exclude the
- # DT_RUNPATH tag from executables and libraries. But doing so
- # requires that you compile everything twice, which is a pain.
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- 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
- ;;
- esac
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ 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=LD_LIBRARY_PATH
+ ;;
+
+freebsd1*)
+ dynamic_linker=no
+ ;;
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
- sunos4*)
- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ 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=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ ;;
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 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
- ;;
- esac
+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
+ ;;
- if test "$ld_shlibs" = no; then
- runpath_var=
- hardcode_libdir_flag_spec=
- export_dynamic_flag_spec=
- whole_archive_flag_spec=
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- allow_undefined_flag=unsupported
- always_export_symbols=yes
- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- hardcode_direct=unsupported
- fi
- ;;
-
- aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- 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
- 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")) && (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
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- ;;
- esac
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # 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
+ ;;
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
+interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux
+ else
+ version_type=irix
+ fi ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
- archive_cmds=''
- hardcode_direct=yes
- hardcode_direct_absolute=yes
- hardcode_libdir_separator=':'
- link_all_deplibs=yes
- file_list_spec='${wl}-f,'
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
- if test "$GCC" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" &&
- strings "$collect2name" | $GREP resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- hardcode_direct=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L=yes
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_libdir_separator=
- fi
- ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
- export_dynamic_flag_spec='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # Some binutils ld are patched to set DT_RUNPATH
+ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -10862,545 +16499,310 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+ lt_cv_shlibpath_overrides_runpath=yes
+fi
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
-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
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-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 $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'
- allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-int
-main ()
-{
+ # 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
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+ # 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="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+
+*nto* | *qnx*)
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+ 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=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case $host_os in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
+ fi
+ ;;
+
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
+
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+rdos*)
+ dynamic_linker=no
+ ;;
+
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ 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=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
+
+sysv4 | sysv4.3*)
+ version_type=linux
+ 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=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
+
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+uts4*)
+ version_type=linux
+ 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=LD_LIBRARY_PATH
+ ;;
+
+*)
+ dynamic_linker=no
+ ;;
+esac
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+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"`
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-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'
- # 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'
- fi
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds=''
- ;;
- m68k)
- archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- ;;
- esac
- ;;
- bsdi[45]*)
- export_dynamic_flag_spec=-rdynamic
- ;;
- cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- 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*)
- archive_cmds_need_lc=no
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
- link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
- case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
- *) _lt_dar_can_shared=$GCC ;;
- esac
- if test "$_lt_dar_can_shared" = "yes"; then
- 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}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- ld_shlibs=no
- fi
- ;;
- dgux*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_shlibpath_var=no
- ;;
- freebsd1*)
- ld_shlibs=no
- ;;
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_minus_L=yes
- hardcode_shlibpath_var=no
- ;;
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
- hpux9*)
- if test "$GCC" = yes; then
- 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
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_direct=yes
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
- ;;
- hpux10*)
- 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
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_libdir_separator=:
- hardcode_direct=yes
- hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- fi
- ;;
- hpux11*)
- 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 -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
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
- case $host_cpu in
- hppa*64*|ia64*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- ;;
- *)
- hardcode_direct=yes
- hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- ;;
- esac
- fi
- ;;
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- 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.
- 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 :
- 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"
- else
- 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'
- hardcode_libdir_separator=:
- inherit_rpath=yes
- link_all_deplibs=yes
- ;;
- netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
- newsos6)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_shlibpath_var=no
- ;;
- *nto* | *qnx*)
- ;;
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- hardcode_direct_absolute=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
- else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- else
- ld_shlibs=no
- fi
- ;;
- os2*)
- 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'
- 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" && $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" && $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'
- hardcode_libdir_separator=:
- ;;
- 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} $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" && $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 "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'
- fi
- archive_cmds_need_lc='no'
- hardcode_libdir_separator=:
- ;;
- solaris*)
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- 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 ${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"*)
- wlarc=''
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
- ;;
- *)
- wlarc='${wl}'
- archive_cmds='$CC -G${allow_undefined_flag} -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- ;;
- esac
- fi
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_shlibpath_var=no
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
- # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- else
- whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
- fi
- ;;
- esac
- link_all_deplibs=yes
- ;;
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_direct=yes
- hardcode_minus_L=yes
- hardcode_shlibpath_var=no
- ;;
- sysv4)
- case $host_vendor in
- sni)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- reload_cmds='$CC -r -o $output$reload_objs'
- hardcode_direct=no
- ;;
- motorola)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var=no
- ;;
- sysv4.3*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var=no
- export_dynamic_flag_spec='-Bexport'
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ld_shlibs=yes
- fi
- ;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
- runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-R,$libdir'
- hardcode_libdir_separator=':'
- link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
- uts4*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_shlibpath_var=no
- ;;
- *)
- ld_shlibs=no
- ;;
- esac
- if test x$host_vendor = xsni; then
- case $host in
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- ;;
- esac
- fi
- fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-with_gnu_ld=$with_gnu_ld
@@ -11416,68 +16818,8 @@ with_gnu_ld=$with_gnu_ld
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
- # Assume -lc should be added
- archive_cmds_need_lc=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $archive_cmds in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # 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.
- { $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; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 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
- (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
- 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
- ;;
-esac
@@ -11510,72 +16852,837 @@ esac
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+ test -n "$runpath_var" ||
+ test "X$hardcode_automatic" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+ if test "$hardcode_direct" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+ test "$hardcode_minus_L" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action=unsupported
+fi
+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+ test "$inherit_rpath" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+
+
+
+
+
+ if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+else
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
+
+ case $host_os in
+ beos*)
+ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32* | cegcc*)
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+ # if libdl is installed we need to link against it
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dl_dlopen=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+
+fi
+
+ ;;
+
+ *)
+ { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+if test "${ac_cv_func_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define shl_load innocuous_shl_load
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shl_load (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+#undef shl_load
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_shl_load || defined __stub___shl_load
+choke me
+#endif
+int
+main ()
+{
+return shl_load ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_shl_load=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_func_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+if test $ac_cv_func_shl_load = yes; then
+ lt_cv_dlopen="shl_load"
+else
+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_shl_load=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+if test $ac_cv_lib_dld_shl_load = yes; then
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+if test "${ac_cv_func_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define dlopen innocuous_dlopen
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dlopen (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+#undef dlopen
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_dlopen || defined __stub___dlopen
+choke me
+#endif
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_func_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+if test $ac_cv_func_dlopen = yes; then
+ lt_cv_dlopen="dlopen"
+else
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_svld_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+if test $ac_cv_lib_svld_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_dld_link=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+if test $ac_cv_lib_dld_dld_link = yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+fi
+fi
+fi
+fi
+fi
+ ;;
+ esac
+ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
+ else
+ enable_dlopen=no
+ fi
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS="$CPPFLAGS"
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+if test "${lt_cv_dlopen_self+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self=cross
+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"
+#include "confdefs.h"
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+#include <stdio.h>
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# 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))
+void fnord () __attribute__((visibility("default")));
+#endif
+void fnord () { int i=42; }
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
+ return status;
+}
+_LT_EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+ esac
+ else :
+ # compilation failed
+ lt_cv_dlopen_self=no
+ fi
+fi
+rm -fr conftest*
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self_static=cross
+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"
+#include "confdefs.h"
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+#include <stdio.h>
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# 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))
+void fnord () __attribute__((visibility("default")));
+#endif
+void fnord () { int i=42; }
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
+ return status;
+}
+_LT_EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+ esac
+ else :
+ # compilation failed
+ lt_cv_dlopen_self_static=no
+ fi
+fi
+rm -fr conftest*
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+ fi
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
+ ;;
+ esac
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
@@ -11593,6 +17700,35 @@ esac
+striplib=
+old_striplib=
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+ ;;
+ *)
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ ;;
+ esac
+fi
@@ -11605,15 +17741,54 @@ esac
+ # Report which library types will actually be built
+ { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
+ { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
+ { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ { echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+CC="$lt_save_CC"
@@ -11627,712 +17802,973 @@ esac
+ ac_config_commands="$ac_config_commands libtool"
+# Only expand once:
+#
+# Use our own libtool so we can perform Universal builds
+#
+case $host in
+ *-darwin*)
+ LIBTOOL='$(SHELL) $(top_srcdir)/bin/libtool.macosx'
+ ;;
+esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+##########################################################################
+## ##
+## Check various headers ##
+## ##
+##########################################################################
-if test "$GCC" = yes; then
- case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
- 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 -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=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
- test -d "$lt_sys_path" && \
- 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 '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
- for (lt_i = NF; lt_i > 0; lt_i--) {
- if ($lt_i != "" && $lt_i != ".") {
- if ($lt_i == "..") {
- lt_count++;
- } else {
- if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
- } else {
- lt_count--;
- }
- }
- }
- }
- if (lt_foo != "") { lt_freq[lt_foo]++; }
- if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
-aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[01] | aix4.[01].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
-amigaos*)
- case $host_cpu in
- powerpc)
- # Since July 2007 AmigaOS4 officially supports .so libraries.
- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- ;;
- 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=`$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
- ;;
+int
+main ()
+{
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-bsdi[45]*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
+ ac_cv_header_stdc=no
+fi
-cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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}`~
- 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~
- chmod a+x \$dldir/$dlname~
- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
- fi'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <string.h>
- case $host_os in
- 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="/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}'
- 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 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"`
- fi
- ;;
- 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
- ;;
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f -r conftest*
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
+fi
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f -r conftest*
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- 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=LD_LIBRARY_PATH
- ;;
+fi
-freebsd1*)
- dynamic_linker=no
- ;;
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
-freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
- if test -x /usr/bin/objformat; then
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
- freebsd[123]*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
- freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- esac
- ;;
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- 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=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
+fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
+fi
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- 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
- 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
+
+
+
+
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
+#include <$ac_hdr>
int
main ()
{
-
+if ((DIR *) 0)
+return 0;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- shlibpath_overrides_runpath=yes
-fi
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+_ACEOF
- # 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;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
+ac_header_dirent=$ac_hdr; break
+fi
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' dir; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
+ rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_search_opendir=$ac_res
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-*nto* | *qnx*)
- version_type=qnx
- need_lib_prefix=no
- need_version=no
- 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=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='ldqnx.so'
- ;;
+fi
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
+else
+ ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+else
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' x; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
else
- shlibpath_overrides_runpath=yes
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- ;;
+ rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_search_opendir=$ac_res
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
+else
+ ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+fi
+ { echo "$as_me:$LINENO: checking whether sys/types.h defines makedev" >&5
+echo $ECHO_N "checking whether sys/types.h defines makedev... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+int
+main ()
+{
+return makedev(0, 0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_header_sys_types_h_makedev=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_sys_types_h_makedev=no
+fi
-rdos*)
- dynamic_linker=no
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- 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=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_types_h_makedev" >&5
+echo "${ECHO_T}$ac_cv_header_sys_types_h_makedev" >&6; }
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
+if test $ac_cv_header_sys_types_h_makedev = no; then
+if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
+echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking sys/mkdev.h usability" >&5
+echo $ECHO_N "checking sys/mkdev.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/mkdev.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-sysv4 | sysv4.3*)
- version_type=linux
- 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=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
+ ac_header_compiler=no
+fi
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
+# Is the header present?
+{ echo "$as_me:$LINENO: checking sys/mkdev.h presence" >&5
+echo $ECHO_N "checking sys/mkdev.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/mkdev.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-tpf*)
- # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
+ ac_header_preproc=no
+fi
-uts4*)
- version_type=linux
- 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=LD_LIBRARY_PATH
- ;;
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
-*)
- dynamic_linker=no
- ;;
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sys/mkdev.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: sys/mkdev.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sys/mkdev.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sys/mkdev.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: sys/mkdev.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sys/mkdev.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: sys/mkdev.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+{ echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
+echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_sys_mkdev_h=$ac_header_preproc
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6; }
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+if test $ac_cv_header_sys_mkdev_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define MAJOR_IN_MKDEV 1
+_ACEOF
+
fi
+ if test $ac_cv_header_sys_mkdev_h = no; then
+ if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
+echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking sys/sysmacros.h usability" >&5
+echo $ECHO_N "checking sys/sysmacros.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/sysmacros.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+# Is the header present?
+{ echo "$as_me:$LINENO: checking sys/sysmacros.h presence" >&5
+echo $ECHO_N "checking sys/sysmacros.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/sysmacros.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sys/sysmacros.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: sys/sysmacros.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sys/sysmacros.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sys/sysmacros.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: sys/sysmacros.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sys/sysmacros.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: sys/sysmacros.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
+echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_sys_sysmacros_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6; }
+fi
+if test $ac_cv_header_sys_sysmacros_h = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define MAJOR_IN_SYSMACROS 1
+_ACEOF
+fi
+ fi
+fi
+{ echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6; }
+if test "${ac_cv_header_stat_broken+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/stat.h>
+#if defined S_ISBLK && defined S_IFDIR
+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
+#endif
+#if defined S_ISBLK && defined S_IFCHR
+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
+#endif
+#if defined S_ISLNK && defined S_IFREG
+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
+#endif
+#if defined S_ISSOCK && defined S_IFREG
+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stat_broken=no
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_header_stat_broken=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
+echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; }
+if test $ac_cv_header_stat_broken = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define STAT_MACROS_BROKEN 1
+_ACEOF
+fi
+ { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+if test "${ac_cv_header_time+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_time=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+echo "${ECHO_T}$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define TIME_WITH_SYS_TIME 1
+_ACEOF
+fi
+ { echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_wait_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+int
+main ()
+{
+ int s;
+ wait (&s);
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_sys_wait_h=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_header_sys_wait_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
+if test $ac_cv_header_sys_wait_h = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SYS_WAIT_H 1
+_ACEOF
+fi
@@ -12352,873 +18788,1989 @@ fi
+for ac_header in unistd.h limits.h sys/param.h fcntl.h string.h memory.h \
+ sys/timeb.h sys/sockio.h sys/resource.h \
+ malloc.h sys/select.h sys/time.h wchar.h wctype.h \
+ pwd.h grp.h sys/mman.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+fi
+done
+##########################################################################
+## ##
+## Check various typedefs in include headers ##
+## ##
+##########################################################################
+{ echo "$as_me:$LINENO: checking for mode_t" >&5
+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_mode_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef mode_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_mode_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_mode_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
+if test $ac_cv_type_mode_t = yes; then
+ :
+else
+cat >>confdefs.h <<_ACEOF
+#define mode_t int
+_ACEOF
+fi
+{ echo "$as_me:$LINENO: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_off_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef off_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_off_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_off_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
+if test $ac_cv_type_off_t = yes; then
+ :
+else
+cat >>confdefs.h <<_ACEOF
+#define off_t long int
+_ACEOF
+fi
+{ echo "$as_me:$LINENO: checking for pid_t" >&5
+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_pid_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef pid_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_pid_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_pid_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
+if test $ac_cv_type_pid_t = yes; then
+ :
+else
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+fi
+ { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+if test "${ac_cv_type_signal+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <signal.h>
+int
+main ()
+{
+return *(signal (0, 0)) (0) == 1;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_signal=int
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_signal=void
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+ { echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_size_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef size_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_size_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_size_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+if test $ac_cv_type_size_t = yes; then
+ :
+else
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
- { $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=
-if test -n "$hardcode_libdir_flag_spec" ||
- test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
+fi
+ { echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
+if test "${ac_cv_type_uid_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
- # We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action=immediate
- fi
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "uid_t" >/dev/null 2>&1; then
+ ac_cv_type_uid_t=yes
else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action=unsupported
+ ac_cv_type_uid_t=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
+rm -f -r conftest*
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+if test $ac_cv_type_uid_t = no; then
+cat >>confdefs.h <<\_ACEOF
+#define uid_t int
+_ACEOF
+cat >>confdefs.h <<\_ACEOF
+#define gid_t int
+_ACEOF
+fi
- if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
+##########################################################################
+## ##
+## Check various structs in include headers ##
+## ##
+##########################################################################
- darwin*)
- # if libdl is installed we need to link against it
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
+echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_blksize)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_blksize=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
int
main ()
{
-return dlopen ();
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_blksize)
+return 0;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_blksize=yes
else
- ac_cv_lib_dl_dlopen=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_stat_st_blksize=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; }
+if test $ac_cv_member_struct_stat_st_blksize = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ST_BLKSIZE 1
+_ACEOF
fi
- ;;
- *)
- ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
+echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
+$ac_includes_default
int
main ()
{
-return shl_load ();
+static struct stat ac_aggr;
+if (ac_aggr.st_blocks)
+return 0;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dld_shl_load=yes
-else
- ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
- ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_blocks=yes
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
int
main ()
{
-return dlopen ();
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_blocks)
+return 0;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_blocks=yes
else
- ac_cv_lib_dl_dlopen=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_stat_st_blocks=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; }
+if test $ac_cv_member_struct_stat_st_blocks = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BLOCKS 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ST_BLOCKS 1
+_ACEOF
+
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ case " $LIBOBJS " in
+ *" fileblocks.$ac_objext "* ) ;;
+ *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
+ ;;
+esac
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
+fi
+
+
+{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
+echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
int
main ()
{
-return dlopen ();
+static struct stat ac_aggr;
+if (ac_aggr.st_rdev)
+return 0;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_svld_dlopen=yes
-else
- ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
- $as_echo_n "(cached) " >&6
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_rdev=yes
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
int
main ()
{
-return dld_link ();
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_rdev)
+return 0;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dld_dld_link=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_rdev=yes
else
- ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_member_struct_stat_st_rdev=no
fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
+if test $ac_cv_member_struct_stat_st_rdev = yes; then
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
-#line 12721 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+_ACEOF
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ST_RDEV 1
+_ACEOF
- return status;
-}
-_LT_EOF
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
- fi
fi
-rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
+if test "${ac_cv_struct_tm+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
-#line 12817 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <time.h>
-void fnord() { int i=42;}
-int main ()
+int
+main ()
{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
-
- return status;
+struct tm tm;
+ int *p = &tm.tm_sec;
+ return !p;
+ ;
+ return 0;
}
-_LT_EOF
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- (eval $ac_link) 2>&5
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
-fi
-rm -fr conftest*
-
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_struct_tm=time.h
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_struct_tm=sys/time.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
- fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
+if test $ac_cv_struct_tm = sys/time.h; then
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
+cat >>confdefs.h <<\_ACEOF
+#define TM_IN_SYS_TIME 1
+_ACEOF
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
fi
+{ echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
+echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_ptrdiff_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef ptrdiff_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_ptrdiff_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_ptrdiff_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
+echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
+if test $ac_cv_type_ptrdiff_t = yes; then
+cat >>confdefs.h <<_ACEOF
+#define HAVE_PTRDIFF_T 1
+_ACEOF
+fi
+##########################################################################
+## ##
+## Check other structs in include headers ##
+## ##
+##########################################################################
+#AC_DECL_SYS_SIGLIST
+#AC_EGREP_HEADER(tm_gmtoff, time.h, AC_DEFINE(HAVE_TM_GMTOFF))
+#AC_EGREP_HEADER(tm_tzadj, time.h, AC_DEFINE(HAVE_TM_TZADJ))
+{ echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
+if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <$ac_cv_struct_tm>
+int
+main ()
+{
+struct tm tm; tm.tm_gmtoff;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_struct_tm_gmtoff=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_struct_tm_gmtoff=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
+echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6; }
+if test "$ac_cv_struct_tm_gmtoff" = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TM_GMTOFF 1
+_ACEOF
+fi
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: checking for tm_tzadj in struct tm" >&5
+echo $ECHO_N "checking for tm_tzadj in struct tm... $ECHO_C" >&6; }
+if test "${ac_cv_struct_tm_tzadj+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- ;;
- esac
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <$ac_cv_struct_tm>
+int
+main ()
+{
+struct tm tm; tm.tm_tzadj;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_struct_tm_tzadj=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_struct_tm_tzadj=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm_tzadj" >&5
+echo "${ECHO_T}$ac_cv_struct_tm_tzadj" >&6; }
+if test "$ac_cv_struct_tm_tzadj" = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TM_TZADJ 1
+_ACEOF
+fi
+##########################################################################
+## ##
+## Check libraries ##
+## ##
+##########################################################################
+# The following three (nsl,inet,socket) are needed on Sequent;
+# the order of checking must be this. Most SVR4 platforms will
+# need -lsocket and -lnsl. However on SGI IRIX 5, these exist but
+# broken. I see no elegant solution (probably CHECK_LIB should be
+# fixed to only add the library if the given entry point is not
+# satisfied without it).
+if test "$ac_sys_system" != IRIX
+then
+{ echo "$as_me:$LINENO: checking for t_open in -lnsl" >&5
+echo $ECHO_N "checking for t_open in -lnsl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_nsl_t_open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char t_open ();
+int
+main ()
+{
+return t_open ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_nsl_t_open=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_nsl_t_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_t_open" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_t_open" >&6; }
+if test $ac_cv_lib_nsl_t_open = yes; then
+ VLIBS="-lnsl $VLIBS"
+fi
+ # SVR4
+{ echo "$as_me:$LINENO: checking for gethostbyname in -linet" >&5
+echo $ECHO_N "checking for gethostbyname in -linet... $ECHO_C" >&6; }
+if test "${ac_cv_lib_inet_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-linet -lnsl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_inet_gethostbyname=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_inet_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_inet_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_inet_gethostbyname" >&6; }
+if test $ac_cv_lib_inet_gethostbyname = yes; then
+ VLIBS="-linet $VLIBS"
+fi
+ # Sequent
+{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
+if test "${ac_cv_lib_socket_socket+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $VLIBS $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
- # Report which library types will actually be built
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
+int
+main ()
+{
+return socket ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_socket_socket=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
+ ac_cv_lib_socket_socket=no
+fi
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
+if test $ac_cv_lib_socket_socket = yes; then
+ VLIBS="-lsocket $VLIBS"
+fi
+ # SVR4 sockets
+fi
+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
- aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_m_cos=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+ ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
+if test $ac_cv_lib_m_cos = yes; then
+ VLIBS="-lm $VLIBS"
+fi
+ # complex math
+##########################################################################
+## ##
+## Check various functions ##
+## ##
+##########################################################################
+#AC_FUNC_ALLOCA dnl this used to be AC_ALLOCA
+#AC_FUNC_CLOSEDIR_VOID
+#AC_FUNC_GETMNTENT
+#AC_FUNC_GETPGRP
+{ echo "$as_me:$LINENO: checking for working memcmp" >&5
+echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
+if test "${ac_cv_func_memcmp_working+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ ac_cv_func_memcmp_working=no
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ /* Some versions of memcmp are not 8-bit clean. */
+ char c0 = '\100', c1 = '\200', c2 = '\201';
+ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
+ return 1;
-CC="$lt_save_CC"
+ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
+ or more and with at least one buffer not starting on a 4-byte boundary.
+ William Lewis provided this test program. */
+ {
+ char foo[21];
+ char bar[21];
+ int i;
+ for (i = 0; i < 4; i++)
+ {
+ char *a = foo + i;
+ char *b = bar + i;
+ strcpy (a, "--------01111111");
+ strcpy (b, "--------10000000");
+ if (memcmp (a, b, 16) >= 0)
+ return 1;
+ }
+ return 0;
+ }
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_memcmp_working=yes
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+( exit $ac_status )
+ac_cv_func_memcmp_working=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+ *" memcmp.$ac_objext "* ) ;;
+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+ ;;
+esac
+#AC_FUNC_MMAP
+{ echo "$as_me:$LINENO: checking for function prototypes" >&5
+echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6; }
+if test "$ac_cv_prog_cc_c89" != no; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define PROTOTYPES 1
+_ACEOF
+cat >>confdefs.h <<\_ACEOF
+#define __PROTOTYPES 1
+_ACEOF
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+{ echo "$as_me:$LINENO: checking whether setvbuf arguments are reversed" >&5
+echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6; }
+if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_func_setvbuf_reversed=no
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdio.h>
+# ifdef PROTOTYPES
+ int (setvbuf) (FILE *, int, char *, size_t);
+# endif
+int
+main ()
+{
+char buf; return setvbuf (stdout, _IOLBF, &buf, 1);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdio.h>
+# ifdef PROTOTYPES
+ int (setvbuf) (FILE *, int, char *, size_t);
+# endif
+int
+main ()
+{
+char buf; return setvbuf (stdout, &buf, _IOLBF, 1);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ # It compiles and links either way, so it must not be declared
+ # with a prototype and most likely this is a K&R C compiler.
+ # Try running it.
+ if test "$cross_compiling" = yes; then
+ : # Assume setvbuf is not reversed when cross-compiling.
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+/* This call has the arguments reversed.
+ A reversed system may check and see that the address of buf
+ is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */
+ char buf;
+ if (setvbuf (stdout, _IOLBF, &buf, 1) != 0)
+ return 1;
+ putchar ('\r');
+ return 0; /* Non-reversed systems SEGV here. */
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_setvbuf_reversed=yes
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
- ac_config_commands="$ac_config_commands libtool"
+ ac_cv_func_setvbuf_reversed=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Only expand once:
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6; }
+if test $ac_cv_func_setvbuf_reversed = yes; then
-#
-# Use our own libtool so we can perform Universal builds
-#
-case $host in
- *-darwin*)
- LIBTOOL='$(SHELL) $(top_srcdir)/bin/libtool.macosx'
- ;;
-esac
+cat >>confdefs.h <<\_ACEOF
+#define SETVBUF_REVERSED 1
+_ACEOF
-##########################################################################
-## ##
-## Check various headers ##
-## ##
-##########################################################################
+fi
+ #AC_FUNC_STRCOLL
+#AC_FUNC_STRFTIME
+#AC_FUNC_UTIME_NULL
+#AC_FUNC_VFORK dnl this used to be AC_VFORK
+#AC_FUNC_VPRINTF
+#AC_FUNC_WAIT3
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
+for ac_header in unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
+$ac_includes_default
+#include <$ac_header>
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
else
- ac_cv_header_stdc=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <string.h>
-
+#include <$ac_header>
_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_header_preproc=no
fi
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_stdc=no
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
-rm -f conftest*
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
+fi
+
+done
+
+{ echo "$as_me:$LINENO: checking for working chown" >&5
+echo $ECHO_N "checking for working chown... $ECHO_C" >&6; }
+if test "${ac_cv_func_chown_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ ac_cv_func_chown_works=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+$ac_includes_default
+#include <fcntl.h>
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
int
main ()
{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
+ char *f = "conftest.chown";
+ struct stat before, after;
+
+ if (creat (f, 0600) < 0)
+ return 1;
+ if (stat (f, &before) < 0)
+ return 1;
+ if (chown (f, (uid_t) -1, (gid_t) -1) == -1)
+ return 1;
+ if (stat (f, &after) < 0)
+ return 1;
+ return ! (before.st_uid == after.st_uid && before.st_gid == after.st_gid);
+
+ ;
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_chown_works=yes
else
- ac_cv_header_stdc=no
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_chown_works=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+rm -f conftest.chown
+
fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_func_chown_works" >&5
+echo "${ECHO_T}$ac_cv_func_chown_works" >&6; }
+if test $ac_cv_func_chown_works = yes; then
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CHOWN 1
+_ACEOF
fi
- ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
- $as_echo_n "(cached) " >&6
+
+{ echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
+echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strerror_r+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <$ac_hdr>
-
+$ac_includes_default
int
main ()
{
-if ((DIR *) 0)
-return 0;
+#ifndef strerror_r
+ (void) strerror_r;
+#endif
+
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_ac_Header=yes"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strerror_r=yes
else
- eval "$as_ac_Header=no"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strerror_r=no
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-eval ac_res=\$$as_ac_Header
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6; }
+if test $ac_cv_have_decl_strerror_r = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR_R 1
+_ACEOF
+
+
+else
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define HAVE_DECL_STRERROR_R 0
_ACEOF
-ac_header_dirent=$ac_hdr; break
+
fi
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+for ac_func in strerror_r
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -13226,599 +20778,739 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char opendir ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
int
main ()
{
-return opendir ();
+return $ac_func ();
;
return 0;
}
_ACEOF
-for ac_lib in '' dir; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
-
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_search_opendir=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
fi
+done
+{ echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
+echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6; }
+if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
+ ac_cv_func_strerror_r_char_p=no
+ if test $ac_cv_have_decl_strerror_r = yes; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
int
main ()
{
-return opendir ();
+
+ char buf[100];
+ char x = *strerror_r (0, buf, sizeof buf);
+ char *p = strerror_r (0, buf, sizeof buf);
+ return !p || x;
+
;
return 0;
}
_ACEOF
-for ac_lib in '' x; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_func_strerror_r_char_p=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-else
- ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
-$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
-if ${ac_cv_header_sys_types_h_makedev+:} false; then :
- $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+ # strerror_r is not declared. Choose between
+ # systems that have relatively inaccessible declarations for the
+ # function. BeOS and DEC UNIX 4.0 fall in this category, but the
+ # former has a strerror_r that returns char*, while the latter
+ # has a strerror_r that returns `int'.
+ # This test should segfault on the DEC system.
+ if test "$cross_compiling" = yes; then
+ :
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
+$ac_includes_default
+ extern char *strerror_r ();
int
main ()
{
-return makedev(0, 0);
+char buf[100];
+ char x = *strerror_r (0, buf, sizeof buf);
+ return ! isalpha (x);
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_header_sys_types_h_makedev=yes
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_strerror_r_char_p=yes
else
- ac_cv_header_sys_types_h_makedev=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5
-$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
-if test $ac_cv_header_sys_types_h_makedev = no; then
-ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
-$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
+ fi
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
+echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6; }
+if test $ac_cv_func_strerror_r_char_p = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define STRERROR_R_CHAR_P 1
+_ACEOF
+fi
- if test $ac_cv_header_sys_mkdev_h = no; then
- ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
-$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
+##########################################################################
+## ##
+## Check other functions ##
+## ##
+##########################################################################
-fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
-$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if ${ac_cv_header_stat_broken+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
-#if defined S_ISBLK && defined S_IFDIR
-extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-#endif
-#if defined S_ISBLK && defined S_IFCHR
-extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-#endif
-#if defined S_ISLNK && defined S_IFREG
-extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-#endif
-#if defined S_ISSOCK && defined S_IFREG
-extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-#endif
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stat_broken=no
-else
- ac_cv_header_stat_broken=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-$as_echo "$ac_cv_header_stat_broken" >&6; }
-if test $ac_cv_header_stat_broken = yes; then
-$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+for ac_func in getpagesize gettimeofday strtok_r ftruncate fchmod fsync ftime localtime_r gmtime_r syslog
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_time=yes
-else
- ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if ${ac_cv_header_sys_wait_h+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
#endif
int
main ()
{
- int s;
- wait (&s);
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_sys_wait_h=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_header_sys_wait_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
-$as_echo "$ac_cv_header_sys_wait_h" >&6; }
-if test $ac_cv_header_sys_wait_h = yes; then
-
-$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_var=no"
fi
-
-for ac_header in unistd.h limits.h sys/param.h fcntl.h string.h memory.h \
- sys/timeb.h sys/sockio.h sys/resource.h \
- malloc.h sys/select.h sys/time.h wchar.h wctype.h \
- pwd.h grp.h sys/mman.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
-
done
-##########################################################################
-## ##
-## Check various typedefs in include headers ##
-## ##
-##########################################################################
-
-ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
+for ac_func in snprintf vsnprintf
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
-fi
-
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-else
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
+#undef $ac_func
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
int
main ()
{
-return *(signal (0, 0)) (0) == 1;
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_type_signal=int
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_type_signal=void
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
+done
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
+
+
+
+for ac_func in wcsdup wcscasecmp wcsicmp
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
- ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+#undef $ac_func
-else
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
_ACEOF
-
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
- $as_echo_n "(cached) " >&6
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "uid_t" >/dev/null 2>&1; then :
- ac_cv_type_uid_t=yes
-else
- ac_cv_type_uid_t=no
+ eval "$as_ac_var=no"
fi
-rm -f conftest*
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-$as_echo "#define uid_t int" >>confdefs.h
+fi
+done
-$as_echo "#define gid_t int" >>confdefs.h
-fi
-##########################################################################
-## ##
-## Check various structs in include headers ##
-## ##
-##########################################################################
-ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-_ACEOF
-$as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h
-fi
-ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-_ACEOF
-$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
-else
- case " $LIBOBJS " in
- *" fileblocks.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
- ;;
-esac
-fi
-ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
+for ac_func in wcscmp wcslen wcsncat wcsnicmp wcsncasecmp wcsncmp wcscpy iswspace iswdigit wcsncpy wtol wtoi wcschr wcsrchr wcsstr wcscat iswlower iswupper towlower towupper
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
-
-fi
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+#undef $ac_func
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <time.h>
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
int
main ()
{
-struct tm tm;
- int *p = &tm.tm_sec;
- return !p;
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_struct_tm=time.h
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_struct_tm=sys/time.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
fi
+done
-ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PTRDIFF_T 1
-_ACEOF
-fi
-##########################################################################
-## ##
-## Check other structs in include headers ##
-## ##
-##########################################################################
-#AC_DECL_SYS_SIGLIST
-#AC_EGREP_HEADER(tm_gmtoff, time.h, AC_DEFINE(HAVE_TM_GMTOFF))
-#AC_EGREP_HEADER(tm_tzadj, time.h, AC_DEFINE(HAVE_TM_TZADJ))
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
-$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
-if ${ac_cv_struct_tm_gmtoff+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <$ac_cv_struct_tm>
-int
-main ()
-{
-struct tm tm; tm.tm_gmtoff;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_struct_tm_gmtoff=yes
-else
- ac_cv_struct_tm_gmtoff=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm_gmtoff" >&5
-$as_echo "$ac_cv_struct_tm_gmtoff" >&6; }
-if test "$ac_cv_struct_tm_gmtoff" = yes; then
-$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_tzadj in struct tm" >&5
-$as_echo_n "checking for tm_tzadj in struct tm... " >&6; }
-if ${ac_cv_struct_tm_tzadj+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+for ac_func in wprintf fputws putwc swprintf fwprintf swscanf fgetws putwchar putws wfopen cwprintf wperror wexecvp
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <$ac_cv_struct_tm>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
int
main ()
{
-struct tm tm; tm.tm_tzadj;
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_struct_tm_tzadj=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_struct_tm_tzadj=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm_tzadj" >&5
-$as_echo "$ac_cv_struct_tm_tzadj" >&6; }
-if test "$ac_cv_struct_tm_tzadj" = yes; then
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-$as_echo "#define HAVE_TM_TZADJ 1" >>confdefs.h
+ eval "$as_ac_var=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+fi
+done
-##########################################################################
-## ##
-## Check libraries ##
-## ##
-##########################################################################
-# The following three (nsl,inet,socket) are needed on Sequent;
-# the order of checking must be this. Most SVR4 platforms will
-# need -lsocket and -lnsl. However on SGI IRIX 5, these exist but
-# broken. I see no elegant solution (probably CHECK_LIB should be
-# fixed to only add the library if the given entry point is not
-# satisfied without it).
-if test "$ac_sys_system" != IRIX
-then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5
-$as_echo_n "checking for t_open in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_t_open+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+for ac_func in wgetenv
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -13826,39 +21518,94 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char t_open ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
int
main ()
{
-return t_open ();
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_t_open=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_lib_nsl_t_open=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_t_open" >&5
-$as_echo "$ac_cv_lib_nsl_t_open" >&6; }
-if test "x$ac_cv_lib_nsl_t_open" = xyes; then :
- VLIBS="-lnsl $VLIBS"
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
fi
- # SVR4
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -linet" >&5
-$as_echo_n "checking for gethostbyname in -linet... " >&6; }
-if ${ac_cv_lib_inet_gethostbyname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet -lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+done
+
+
+
+for ac_func in wgetpass wgetpassphrase
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -13866,39 +21613,99 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char gethostbyname ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
int
main ()
{
-return gethostbyname ();
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet_gethostbyname=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_lib_inet_gethostbyname=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet_gethostbyname" >&5
-$as_echo "$ac_cv_lib_inet_gethostbyname" >&6; }
-if test "x$ac_cv_lib_inet_gethostbyname" = xyes; then :
- VLIBS="-linet $VLIBS"
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
fi
- # Sequent
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_socket+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $VLIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+done
+
+
+
+
+
+
+
+
+for ac_func in getpwnam getgrnam chmod getpwuid getgrgid setuid
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -13906,40 +21713,94 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char socket ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
int
main ()
{
-return socket ();
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_socket=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_lib_socket_socket=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes; then :
- VLIBS="-lsocket $VLIBS"
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
- # SVR4 sockets
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
-if ${ac_cv_lib_m_cos+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+done
+
+
+
+for ac_func in putenv setenv
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -13947,437 +21808,448 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char cos ();
-int
-main ()
-{
-return cos ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_m_cos=yes
-else
- ac_cv_lib_m_cos=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes; then :
- VLIBS="-lm $VLIBS"
-fi
- # complex math
-
-##########################################################################
-## ##
-## Check various functions ##
-## ##
-##########################################################################
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
-#AC_FUNC_ALLOCA dnl this used to be AC_ALLOCA
-#AC_FUNC_CLOSEDIR_VOID
-#AC_FUNC_GETMNTENT
-#AC_FUNC_GETPGRP
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
-$as_echo_n "checking for working memcmp... " >&6; }
-if ${ac_cv_func_memcmp_working+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- ac_cv_func_memcmp_working=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
int
main ()
{
-
- /* Some versions of memcmp are not 8-bit clean. */
- char c0 = '\100', c1 = '\200', c2 = '\201';
- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
- return 1;
-
- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
- or more and with at least one buffer not starting on a 4-byte boundary.
- William Lewis provided this test program. */
- {
- char foo[21];
- char bar[21];
- int i;
- for (i = 0; i < 4; i++)
- {
- char *a = foo + i;
- char *b = bar + i;
- strcpy (a, "--------01111111");
- strcpy (b, "--------10000000");
- if (memcmp (a, b, 16) >= 0)
- return 1;
- }
- return 0;
- }
-
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_memcmp_working=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_func_memcmp_working=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_var=no"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
-$as_echo "$ac_cv_func_memcmp_working" >&6; }
-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
- *" memcmp.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
- ;;
-esac
-
-#AC_FUNC_MMAP
-if ${ac_cv_func_setvbuf_reversed+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_func_setvbuf_reversed=no
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-
- #AC_FUNC_STRCOLL
-#AC_FUNC_STRFTIME
-#AC_FUNC_UTIME_NULL
-#AC_FUNC_VFORK dnl this used to be AC_VFORK
-#AC_FUNC_VPRINTF
-#AC_FUNC_WAIT3
-for ac_header in unistd.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_UNISTD_H 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
-
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working chown" >&5
-$as_echo_n "checking for working chown... " >&6; }
-if ${ac_cv_func_chown_works+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- ac_cv_func_chown_works=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+for ac_func in strerror
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <fcntl.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
int
main ()
{
- char *f = "conftest.chown";
- struct stat before, after;
-
- if (creat (f, 0600) < 0)
- return 1;
- if (stat (f, &before) < 0)
- return 1;
- if (chown (f, (uid_t) -1, (gid_t) -1) == -1)
- return 1;
- if (stat (f, &after) < 0)
- return 1;
- return ! (before.st_uid == after.st_uid && before.st_gid == after.st_gid);
-
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_chown_works=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- ac_cv_func_chown_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-rm -f conftest.chown
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_chown_works" >&5
-$as_echo "$ac_cv_func_chown_works" >&6; }
-if test $ac_cv_func_chown_works = yes; then
-
-$as_echo "#define HAVE_CHOWN 1" >>confdefs.h
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_var=no"
fi
-ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR_R $ac_have_decl
-_ACEOF
-
-for ac_func in strerror_r
-do :
- ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
-if test "x$ac_cv_func_strerror_r" = xyes; then :
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_STRERROR_R 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
-$as_echo_n "checking whether strerror_r returns char *... " >&6; }
-if ${ac_cv_func_strerror_r_char_p+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_func_strerror_r_char_p=no
- if test $ac_cv_have_decl_strerror_r = yes; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+for ac_func in strdup
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
- char buf[100];
- char x = *strerror_r (0, buf, sizeof buf);
- char *p = strerror_r (0, buf, sizeof buf);
- return !p || x;
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_func_strerror_r_char_p=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- # strerror_r is not declared. Choose between
- # systems that have relatively inaccessible declarations for the
- # function. BeOS and DEC UNIX 4.0 fall in this category, but the
- # former has a strerror_r that returns char*, while the latter
- # has a strerror_r that returns `int'.
- # This test should segfault on the DEC system.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
- extern char *strerror_r ();
int
main ()
{
-char buf[100];
- char x = *strerror_r (0, buf, sizeof buf);
- return ! isalpha (x);
+return $ac_func ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_strerror_r_char_p=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- fi
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_var=no"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
-if test $ac_cv_func_strerror_r_char_p = yes; then
-
-$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-
-
-##########################################################################
-## ##
-## Check other functions ##
-## ##
-##########################################################################
-
-for ac_func in getpagesize gettimeofday strtok_r ftruncate fchmod fsync ftime localtime_r gmtime_r syslog
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
-for ac_func in snprintf vsnprintf
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-for ac_func in wcsdup wcscasecmp wcsicmp
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+for ac_func in getrusage
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
-fi
-done
-
-for ac_func in wcscmp wcslen wcsncat wcsnicmp wcsncasecmp wcsncmp wcscpy iswspace iswdigit wcsncpy wtol wtoi wcschr wcsrchr wcsstr wcscat iswlower iswupper towlower towupper
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-fi
-done
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-for ac_func in wprintf fputws putwc swprintf fwprintf swscanf fgetws putwchar putws wfopen cwprintf wperror wexecvp
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+#undef $ac_func
-fi
-done
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
-for ac_func in wgetenv
-do :
- ac_fn_c_check_func "$LINENO" "wgetenv" "ac_cv_func_wgetenv"
-if test "x$ac_cv_func_wgetenv" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_WGETENV 1
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_var=no"
fi
-done
-for ac_func in wgetpass wgetpassphrase
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
-for ac_func in getpwnam getgrnam chmod getpwuid getgrgid setuid
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-fi
-done
-for ac_func in putenv setenv
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+for ac_func in memmove memmem memcpy
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
-fi
-done
-
-for ac_func in strerror
-do :
- ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_STRERROR 1
-_ACEOF
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-fi
-done
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-for ac_func in strdup
-do :
- ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
-if test "x$ac_cv_func_strdup" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_STRDUP 1
-_ACEOF
+#undef $ac_func
-fi
-done
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
-for ac_func in getrusage
-do :
- ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage"
-if test "x$ac_cv_func_getrusage" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GETRUSAGE 1
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_var=no"
fi
-done
-for ac_func in memmove memmem memcpy
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys_errlist" >&5
-$as_echo_n "checking for sys_errlist... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ echo "$as_me:$LINENO: checking for sys_errlist" >&5
+echo $ECHO_N "checking for sys_errlist... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
@@ -14393,30 +22265,57 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-$as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SYS_ERRLIST 1
+_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5
-$as_echo_n "checking whether va_copy exists... " >&6; }
-if ${ac_cv_have_va_copy+:} false; then :
- $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+{ echo "$as_me:$LINENO: checking whether va_copy exists" >&5
+echo $ECHO_N "checking whether va_copy exists... $ECHO_C" >&6; }
+if test "${ac_cv_have_va_copy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdarg.h>
va_list x,y;
@@ -14428,31 +22327,58 @@ va_copy(x,y);
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_have_va_copy="yes"
else
- ac_cv_have_va_copy="no"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_va_copy="no"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_va_copy" >&5
-$as_echo "$ac_cv_have_va_copy" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_have_va_copy" >&5
+echo "${ECHO_T}$ac_cv_have_va_copy" >&6; }
if test "x$ac_cv_have_va_copy" = "xyes" ; then
-$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_VA_COPY 1
+_ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __va_copy exists" >&5
-$as_echo_n "checking whether __va_copy exists... " >&6; }
-if ${ac_cv_have___va_copy+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking whether __va_copy exists" >&5
+echo $ECHO_N "checking whether __va_copy exists... $ECHO_C" >&6; }
+if test "${ac_cv_have___va_copy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdarg.h>
va_list x,y;
@@ -14464,21 +22390,44 @@ __va_copy(x,y);
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_have___va_copy="yes"
else
- ac_cv_have___va_copy="no"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have___va_copy="no"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___va_copy" >&5
-$as_echo "$ac_cv_have___va_copy" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_have___va_copy" >&5
+echo "${ECHO_T}$ac_cv_have___va_copy" >&6; }
if test "x$ac_cv_have___va_copy" = "xyes" ; then
-$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___VA_COPY 1
+_ACEOF
fi
@@ -14488,9 +22437,13 @@ fi
## ##
##########################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in <sys/file.h>" >&5
-$as_echo_n "checking for flock in <sys/file.h>... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ echo "$as_me:$LINENO: checking for flock in <sys/file.h>" >&5
+echo $ECHO_N "checking for flock in <sys/file.h>... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/file.h>
@@ -14505,19 +22458,42 @@ return (flock (0, LOCK_EX) || flock (0, LOCK_UN));
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-$as_echo "#define HAVE_FLOCK_IN_SYS_FILE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FLOCK_IN_SYS_FILE 1
+_ACEOF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
##########################################################################
@@ -14526,10 +22502,10 @@ rm -f core conftest.err conftest.$ac_objext \
## ##
##########################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether #! works in shell scripts" >&5
-$as_echo_n "checking whether #! works in shell scripts... " >&6; }
-if ${ac_cv_sys_interpreter+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking whether #! works in shell scripts" >&5
+echo $ECHO_N "checking whether #! works in shell scripts... $ECHO_C" >&6; }
+if test "${ac_cv_sys_interpreter+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
echo '#! /bin/cat
exit 69
@@ -14543,14 +22519,14 @@ else
fi
rm -f conftest
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_interpreter" >&5
-$as_echo "$ac_cv_sys_interpreter" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_interpreter" >&5
+echo "${ECHO_T}$ac_cv_sys_interpreter" >&6; }
interpval=$ac_cv_sys_interpreter
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
-$as_echo_n "checking for long file names... " >&6; }
-if ${ac_cv_sys_long_file_names+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for long file names" >&5
+echo $ECHO_N "checking for long file names... $ECHO_C" >&6; }
+if test "${ac_cv_sys_long_file_names+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_sys_long_file_names=yes
# Test for long file names in all the places we know might matter:
@@ -14579,26 +22555,33 @@ for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib
test $ac_cv_sys_long_file_names = no && break
done
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
-$as_echo "$ac_cv_sys_long_file_names" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5
+echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6; }
if test $ac_cv_sys_long_file_names = yes; then
-$as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_FILE_NAMES 1
+_ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for restartable system calls" >&5
-$as_echo_n "checking for restartable system calls... " >&6; }
-if ${ac_cv_sys_restartable_syscalls+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+{ echo "$as_me:$LINENO: checking for restartable system calls" >&5
+echo $ECHO_N "checking for restartable system calls... $ECHO_C" >&6; }
+if test "${ac_cv_sys_restartable_syscalls+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Exit 0 (true) if wait returns something other than -1,
i.e. the pid of the child, which means that wait was restarted
@@ -14640,21 +22623,47 @@ main ()
return status == -1;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_sys_restartable_syscalls=yes
else
- ac_cv_sys_restartable_syscalls=no
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_sys_restartable_syscalls=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_restartable_syscalls" >&5
-$as_echo "$ac_cv_sys_restartable_syscalls" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_restartable_syscalls" >&5
+echo "${ECHO_T}$ac_cv_sys_restartable_syscalls" >&6; }
if test $ac_cv_sys_restartable_syscalls = yes; then
-$as_echo "#define HAVE_RESTARTABLE_SYSCALLS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_RESTARTABLE_SYSCALLS 1
+_ACEOF
fi
@@ -14678,15 +22687,15 @@ CCWARN=""
CCDEBUG=""
CCLIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default compiler values..." >&5
-$as_echo "$as_me: checking default compiler values..." >&6;}
+{ echo "$as_me:$LINENO: checking default compiler values..." >&5
+echo "$as_me: checking default compiler values..." >&6;}
if eval "${CC-cc} $CFLAGS $AM_LDFLAGS -o binsrc/config/ccdefs binsrc/config/ccdefs.c" ; then
eval `binsrc/config/ccdefs`
fi
# Check whether --with-debug was given.
-if test "${with_debug+set}" = set; then :
+if test "${with_debug+set}" = set; then
withval=$with_debug; with_debug="$withval"
else
with_debug="no"
@@ -14716,9 +22725,13 @@ fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_t" >&5
-$as_echo_n "checking for uuid_t... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ echo "$as_me:$LINENO: checking for uuid_t" >&5
+echo $ECHO_N "checking for uuid_t... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef HAVE_UNISTD_H
@@ -14735,20 +22748,42 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-$as_echo "#define UUID_T_DEFINED 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define UUID_T_DEFINED 1
+_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -14763,12 +22798,16 @@ srvrlibs=""
clntlibs=""
# Check whether --enable-xml was given.
-if test "${enable_xml+set}" = set; then :
+if test "${enable_xml+set}" = set; then
enableval=$enable_xml;
case "${enableval}" in
yes) with_xml="yes";;
- no) as_fn_error $? "Xml extension required for Virtuoso" "$LINENO" 5 ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-xml" "$LINENO" 5 ;;
+ no) { { echo "$as_me:$LINENO: error: Xml extension required for Virtuoso" >&5
+echo "$as_me: error: Xml extension required for Virtuoso" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-xml" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-xml" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -14780,7 +22819,9 @@ fi
if test "$with_xml" = "yes"; then
BUILD_OPTS="$BUILD_OPTS xml"
-$as_echo "#define BIF_XML 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define BIF_XML 1
+_ACEOF
libxml_file=$LIBDIR/libxml.la
ccincl="$ccincl -I$TOP/libsrc/Xml.new"
@@ -14796,13 +22837,15 @@ fi
# #
##########################################################################
# Check whether --enable-krb was given.
-if test "${enable_krb+set}" = set; then :
+if test "${enable_krb+set}" = set; then
enableval=$enable_krb;
case "${enableval}" in
yes) with_krb="yes";;
no) with_krb="no";;
/*) with_krb="${enableval}";;
- *) as_fn_error $? "bad value ${enableval} for --disable-krb" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-krb" >&5
+echo "$as_me: error: bad value ${enableval} for --disable-krb" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -14818,14 +22861,18 @@ if test "$with_krb" != "no"; then
libkrb="-L$with_krb/lib $libkrb"
krbinc="-I$with_krb/include"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5
-$as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; }
-if ${ac_cv_lib_krb5_krb5_init_context+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for krb5_init_context in -lkrb5" >&5
+echo $ECHO_N "checking for krb5_init_context in -lkrb5... $ECHO_C" >&6; }
+if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkrb5 $libkrb $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -14843,18 +22890,39 @@ return krb5_init_context ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_krb5_krb5_init_context=yes
else
- ac_cv_lib_krb5_krb5_init_context=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_krb5_krb5_init_context=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5_krb5_init_context" >&5
-$as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; }
-if test "x$ac_cv_lib_krb5_krb5_init_context" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5
+echo "${ECHO_T}$ac_cv_lib_krb5_krb5_init_context" >&6; }
+if test $ac_cv_lib_krb5_krb5_init_context = yes; then
with_krb="yes"
@@ -14869,13 +22937,148 @@ fi
if test "$with_krb" != "no"; then
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$krbinc $CPPFLAGS"
- for ac_header in krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h gssapi/gssapi_krb5.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+
+
+
+
+for ac_header in krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h gssapi/gssapi_krb5.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
else
@@ -14890,10 +23093,14 @@ done
fi
if test "$with_krb" != "no"; then
-$as_echo "#define _KERBEROS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _KERBEROS 1
+_ACEOF
-$as_echo "#define GSSAPI 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define GSSAPI 1
+_ACEOF
BUILD_OPTS="$BUILD_OPTS krb"
if test "$with_krb" != "yes"; then
@@ -14917,13 +23124,17 @@ fi
# #
##########################################################################
# Check whether --enable-openssl was given.
-if test "${enable_openssl+set}" = set; then :
+if test "${enable_openssl+set}" = set; then
enableval=$enable_openssl;
case "${enableval}" in
yes) openssl_dir="/usr" ;;
- no) as_fn_error $? "OpenSSL required for Virtuoso" "$LINENO" 5 ;;
+ no) { { echo "$as_me:$LINENO: error: OpenSSL required for Virtuoso" >&5
+echo "$as_me: error: OpenSSL required for Virtuoso" >&2;}
+ { (exit 1); exit 1; }; } ;;
/*) openssl_dir="${enableval}" ;;
- *) as_fn_error $? "bad value ${enableval} for --disable-openssl" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-openssl" >&5
+echo "$as_me: error: bad value ${enableval} for --disable-openssl" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -14960,9 +23171,13 @@ case $host in
LIBS="$LIBS -lsocket"
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking validity of the OpenSSL headers in ${openssl_dir}" >&5
-$as_echo_n "checking validity of the OpenSSL headers in ${openssl_dir}... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ echo "$as_me:$LINENO: checking validity of the OpenSSL headers in ${openssl_dir}" >&5
+echo $ECHO_N "checking validity of the OpenSSL headers in ${openssl_dir}... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <openssl/rsa.h>
@@ -15015,27 +23230,54 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
-$as_echo "good" >&6; }
+ { echo "$as_me:$LINENO: result: good" >&5
+echo "${ECHO_T}good" >&6; }
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- as_fn_error $? "bad. Check config.log for details" "$LINENO" 5
+
+ { { echo "$as_me:$LINENO: error: bad. Check config.log for details" >&5
+echo "$as_me: error: bad. Check config.log for details" >&2;}
+ { (exit 1); exit 1; }; }
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version and usability of the OpenSSL lib in ${openssl_dir}" >&5
-$as_echo_n "checking version and usability of the OpenSSL lib in ${openssl_dir}... " >&6; }
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ echo "$as_me:$LINENO: checking version and usability of the OpenSSL lib in ${openssl_dir}" >&5
+echo $ECHO_N "checking version and usability of the OpenSSL lib in ${openssl_dir}... $ECHO_C" >&6; }
+if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <openssl/rsa.h>
@@ -15084,27 +23326,55 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
-$as_echo "good" >&6; }
+ { echo "$as_me:$LINENO: result: good" >&5
+echo "${ECHO_T}good" >&6; }
BUILD_OPTS="$BUILD_OPTS ssl"
ccincl="$ccincl $openssl_CFLAGS"
srvrlibs="$srvrlibs $openssl_LDFLAGS"
clntlibs="$clntlibs $openssl_LDFLAGS"
-$as_echo "#define _SSL 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _SSL 1
+_ACEOF
else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
- as_fn_error $? "bad. Check config.log for details" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: bad. Check config.log for details" >&5
+echo "$as_me: error: bad. Check config.log for details" >&2;}
+ { (exit 1); exit 1; }; }
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
LIBS="$save_LIBS"
CPPFLAGS="$save_CPPFLAGS"
@@ -15117,13 +23387,15 @@ CPPFLAGS="$save_CPPFLAGS"
# #
##########################################################################
# Check whether --enable-openldap was given.
-if test "${enable_openldap+set}" = set; then :
+if test "${enable_openldap+set}" = set; then
enableval=$enable_openldap;
case "${enableval}" in
yes) with_ldap="yes" ;;
no) with_ldap="no" ;;
/*) with_ldap="${enableval}" ;;
- *) as_fn_error $? "bad value ${enableval} for --disable-openldap" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-openldap" >&5
+echo "$as_me: error: bad value ${enableval} for --disable-openldap" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -15134,8 +23406,8 @@ fi
if test "x$with_ldap" != "xno"
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenLDAP library usability" >&5
-$as_echo_n "checking OpenLDAP library usability... " >&6; }
+ { echo "$as_me:$LINENO: checking OpenLDAP library usability" >&5
+echo $ECHO_N "checking OpenLDAP library usability... $ECHO_C" >&6; }
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
old_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
@@ -15153,13 +23425,18 @@ $as_echo_n "checking OpenLDAP library usability... " >&6; }
esac
CPPFLAGS="$CPPFLAGS $openldap_CFLAGS"
LIBS="$LIBS $openldap_LDFLAGS"
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ldap.h>
@@ -15177,27 +23454,53 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
-$as_echo "good" >&6; }
+ { echo "$as_me:$LINENO: result: good" >&5
+echo "${ECHO_T}good" >&6; }
BUILD_OPTS="$BUILD_OPTS ldap"
srvrlibs="$srvrlibs $openldap_LDFLAGS"
-$as_echo "#define _LDAP 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _LDAP 1
+_ACEOF
else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: bad. Check config.log for details" >&5
-$as_echo "bad. Check config.log for details" >&6; }
+( exit $ac_status )
+
+ { echo "$as_me:$LINENO: result: bad. Check config.log for details" >&5
+echo "${ECHO_T}bad. Check config.log for details" >&6; }
with_ldap="no"
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
LIBS="$save_LIBS"
CPPFLAGS="$save_CPPFLAGS"
LD_LIBRARY_PATH="$old_LD_LIBRARY_PATH"
@@ -15220,12 +23523,14 @@ fi
# #
##########################################################################
# Check whether --enable-imsg was given.
-if test "${enable_imsg+set}" = set; then :
+if test "${enable_imsg+set}" = set; then
enableval=$enable_imsg;
case "${enableval}" in
yes) with_imsg="yes";;
no) with_imsg="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-imsg" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-imsg" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-imsg" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -15237,7 +23542,9 @@ fi
if test "$with_imsg" = "yes"; then
BUILD_OPTS="$BUILD_OPTS imsg"
-$as_echo "#define _IMSG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _IMSG 1
+_ACEOF
fi
if test "x$with_imsg" = "xyes"; then
@@ -15256,12 +23563,14 @@ fi
# #
##########################################################################
# Check whether --enable-pldebug was given.
-if test "${enable_pldebug+set}" = set; then :
+if test "${enable_pldebug+set}" = set; then
enableval=$enable_pldebug;
case "${enableval}" in
yes) with_pldebug="yes" ;;
no) with_pldebug="no" ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-pldebug" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-pldebug" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-pldebug" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -15273,7 +23582,9 @@ fi
if test "$with_pldebug" = "yes"; then
BUILD_OPTS="$BUILD_OPTS pldebug"
-$as_echo "#define PLDBG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define PLDBG 1
+_ACEOF
PLSTATS=PLDBG
@@ -15295,13 +23606,15 @@ fi
##########################################################################
with_rvous_dir=""
# Check whether --enable-rendezvous was given.
-if test "${enable_rendezvous+set}" = set; then :
+if test "${enable_rendezvous+set}" = set; then
enableval=$enable_rendezvous;
case "${enableval}" in
yes) with_rvous="yes" ;;
no) with_rvous="no" ;;
/*) with_rvous="yes"; with_rvous_dir="${enableval}" ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-rendezvous" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-rendezvous" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-rendezvous" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -15313,7 +23626,9 @@ fi
if test "$with_rvous" = "yes"; then
BUILD_OPTS="$BUILD_OPTS rendezvous"
-$as_echo "#define _RENDEZVOUS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _RENDEZVOUS 1
+_ACEOF
if test -z "$with_rvous_dir"
then
@@ -15334,13 +23649,15 @@ fi
with_php5="no"
# Check whether --enable-php5 was given.
-if test "${enable_php5+set}" = set; then :
+if test "${enable_php5+set}" = set; then
enableval=$enable_php5;
case "${enableval}" in
yes) with_php5="yes" ;;
no) with_php5="no" ;;
/*) with_php5="${enableval}" ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-php5" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-php5" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-php5" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -15351,8 +23668,8 @@ fi
if test "x$with_php5" != "xno"
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking libphp5 library usability" >&5
-$as_echo_n "checking libphp5 library usability... " >&6; }
+ { echo "$as_me:$LINENO: checking libphp5 library usability" >&5
+echo $ECHO_N "checking libphp5 library usability... $ECHO_C" >&6; }
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
old_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
@@ -15370,13 +23687,18 @@ $as_echo_n "checking libphp5 library usability... " >&6; }
esac
LIBS="$LIBS $php5_LDFLAGS"
CPPFLAGS="$CPPFLAGS $php5_CFLAGS"
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
@@ -15389,27 +23711,53 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
-$as_echo "good" >&6; }
+ { echo "$as_me:$LINENO: result: good" >&5
+echo "${ECHO_T}good" >&6; }
BUILD_OPTS="$BUILD_OPTS php5"
-$as_echo "#define _PHP 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _PHP 1
+_ACEOF
with_php5="yes"
else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: bad. Check config.log for details" >&5
-$as_echo "bad. Check config.log for details" >&6; }
+( exit $ac_status )
+
+ { echo "$as_me:$LINENO: result: bad. Check config.log for details" >&5
+echo "${ECHO_T}bad. Check config.log for details" >&6; }
with_php5="no"
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
LIBS="$save_LIBS"
CPPFLAGS="$save_CPPFLAGS"
LD_LIBRARY_PATH="$old_LD_LIBRARY_PATH"
@@ -15436,7 +23784,7 @@ fi
# Check whether --with-xml-prefix was given.
-if test "${with_xml_prefix+set}" = set; then :
+if test "${with_xml_prefix+set}" = set; then
withval=$with_xml_prefix; xml_config_prefix="$withval"
else
xml_config_prefix=""
@@ -15444,14 +23792,14 @@ fi
# Check whether --with-xml-exec-prefix was given.
-if test "${with_xml_exec_prefix+set}" = set; then :
+if test "${with_xml_exec_prefix+set}" = set; then
withval=$with_xml_exec_prefix; xml_config_exec_prefix="$withval"
else
xml_config_exec_prefix=""
fi
# Check whether --enable-xmltest was given.
-if test "${enable_xmltest+set}" = set; then :
+if test "${enable_xmltest+set}" = set; then
enableval=$enable_xmltest;
else
enable_xmltest=yes
@@ -15473,10 +23821,10 @@ fi
# Extract the first word of "xml2-config", so it can be a program name with args.
set dummy xml2-config; 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_path_XML2_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XML2_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $XML2_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -15488,14 +23836,14 @@ 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
+ 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_path_XML2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_XML2_CONFIG" && ac_cv_path_XML2_CONFIG="no"
@@ -15504,17 +23852,17 @@ esac
fi
XML2_CONFIG=$ac_cv_path_XML2_CONFIG
if test -n "$XML2_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
-$as_echo "$XML2_CONFIG" >&6; }
+ { echo "$as_me:$LINENO: result: $XML2_CONFIG" >&5
+echo "${ECHO_T}$XML2_CONFIG" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
min_xml_version=2.4.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml - version >= $min_xml_version" >&5
-$as_echo_n "checking for libxml - version >= $min_xml_version... " >&6; }
+ { echo "$as_me:$LINENO: checking for libxml - version >= $min_xml_version" >&5
+echo $ECHO_N "checking for libxml - version >= $min_xml_version... $ECHO_C" >&6; }
no_xml=""
if test "$XML2_CONFIG" = "no" ; then
no_xml=yes
@@ -15533,10 +23881,14 @@ $as_echo_n "checking for libxml - version >= $min_xml_version... " >&6; }
CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
LIBS="$XML_LIBS $LIBS"
rm -f conf.xmltest
- if test "$cross_compiling" = yes; then :
+ if test "$cross_compiling" = yes; then
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
@@ -15615,27 +23967,51 @@ main()
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
else
- no_xml=yes
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+no_xml=yes
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_xml" = x ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&5
-$as_echo "yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&6; }
+ { echo "$as_me:$LINENO: result: yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&5
+echo "${ECHO_T}yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&6; }
:
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
if test "$XML2_CONFIG" = "no" ; then
echo "*** The xml2-config script installed by LIBXML could not be found"
echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
@@ -15648,7 +24024,11 @@ $as_echo "no" >&6; }
echo "*** Could not run libxml test program, checking why..."
CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
LIBS="$LIBS $XML_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libxml/xmlversion.h>
@@ -15662,7 +24042,24 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
@@ -15673,13 +24070,17 @@ if ac_fn_c_try_link "$LINENO"; then :
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
else
- echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
echo "*** may want to edit the xml2-config script: $XML2_CONFIG"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
@@ -15701,12 +24102,14 @@ rm -f core conftest.err conftest.$ac_objext \
# #
##########################################################################
# Check whether --enable-mono was given.
-if test "${enable_mono+set}" = set; then :
+if test "${enable_mono+set}" = set; then
enableval=$enable_mono;
case "${enableval}" in
yes) have_mono="yes" ;;
no) have_mono="no" ;;
- *) as_fn_error $? "bad value ${enableval} for --disable-mono" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-mono" >&5
+echo "$as_me: error: bad value ${enableval} for --disable-mono" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -15720,10 +24123,10 @@ then
BUILD_OPTS="$BUILD_OPTS mono"
# Extract the first word of "wget", so it can be a program name with args.
set dummy wget; 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_path_WGET+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_WGET+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $WGET in
[\\/]* | ?:[\\/]*)
@@ -15735,14 +24138,14 @@ 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
+ 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_path_WGET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -15750,11 +24153,11 @@ esac
fi
WGET=$ac_cv_path_WGET
if test -n "$WGET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-$as_echo "$WGET" >&6; }
+ { echo "$as_me:$LINENO: result: $WGET" >&5
+echo "${ECHO_T}$WGET" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -15776,13 +24179,15 @@ fi
# #
##########################################################################
# Check whether --enable-hslookup was given.
-if test "${enable_hslookup+set}" = set; then :
+if test "${enable_hslookup+set}" = set; then
enableval=$enable_hslookup;
case "${enableval}" in
yes) with_hsl="yes" ;;
no) with_hsl="no" ;;
/*) with_hsl="${enableval}" ;;
- *) as_fn_error $? "bad value ${enableval} for --disable-hslookup" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-hslookup" >&5
+echo "$as_me: error: bad value ${enableval} for --disable-hslookup" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -15795,10 +24200,10 @@ if test "x$with_hsl" != "xno"
then
# Extract the first word of "hslookup", so it can be a program name with args.
set dummy hslookup; 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_path_HS_LOOKUP+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_HS_LOOKUP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $HS_LOOKUP in
[\\/]* | ?:[\\/]*)
@@ -15811,14 +24216,14 @@ for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ 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_path_HS_LOOKUP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_HS_LOOKUP" && ac_cv_path_HS_LOOKUP="notfound"
@@ -15827,27 +24232,27 @@ esac
fi
HS_LOOKUP=$ac_cv_path_HS_LOOKUP
if test -n "$HS_LOOKUP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HS_LOOKUP" >&5
-$as_echo "$HS_LOOKUP" >&6; }
+ { echo "$as_me:$LINENO: result: $HS_LOOKUP" >&5
+echo "${ECHO_T}$HS_LOOKUP" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$HS_LOOKUP" = "xnotfound"
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The hslookup plugin will not be build" >&5
-$as_echo "$as_me: WARNING: The hslookup plugin will not be build" >&2;}
+ { echo "$as_me:$LINENO: WARNING: The hslookup plugin will not be build" >&5
+echo "$as_me: WARNING: The hslookup plugin will not be build" >&2;}
with_hsl=no
fi
fi
if test "x$with_hsl" != "xno"
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking hslookup library usability" >&5
-$as_echo_n "checking hslookup library usability... " >&6; }
+ { echo "$as_me:$LINENO: checking hslookup library usability" >&5
+echo $ECHO_N "checking hslookup library usability... $ECHO_C" >&6; }
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
@@ -15869,13 +24274,18 @@ $as_echo_n "checking hslookup library usability... " >&6; }
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_hsl/lib"
export LD_LIBRARY_PATH
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
@@ -15892,25 +24302,49 @@ main ()
exit (1);
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
-$as_echo "good" >&6; }
+ { echo "$as_me:$LINENO: result: good" >&5
+echo "${ECHO_T}good" >&6; }
else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: bad. Check config.log for details" >&5
-$as_echo "bad. Check config.log for details" >&6; }
+( exit $ac_status )
+
+ { echo "$as_me:$LINENO: result: bad. Check config.log for details" >&5
+echo "${ECHO_T}bad. Check config.log for details" >&6; }
with_hsl="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The ImageMagick plugin will not be build" >&5
-$as_echo "$as_me: WARNING: The ImageMagick plugin will not be build" >&2;}
+ { echo "$as_me:$LINENO: WARNING: The ImageMagick plugin will not be build" >&5
+echo "$as_me: WARNING: The ImageMagick plugin will not be build" >&2;}
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
LIBS="$save_LIBS"
CPPFLAGS="$save_CPPFLAGS"
LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH"
@@ -15935,13 +24369,15 @@ fi
# #
##########################################################################
# Check whether --enable-imagemagick was given.
-if test "${enable_imagemagick+set}" = set; then :
+if test "${enable_imagemagick+set}" = set; then
enableval=$enable_imagemagick;
case "${enableval}" in
yes) with_im="yes" ;;
no) with_im="no" ;;
/*) with_im="${enableval}" ;;
- *) as_fn_error $? "bad value ${enableval} for --disable-imagemagick" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-imagemagick" >&5
+echo "$as_me: error: bad value ${enableval} for --disable-imagemagick" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -15954,10 +24390,10 @@ if test "x$with_im" != "xno"
then
# Extract the first word of "Wand-config", so it can be a program name with args.
set dummy Wand-config; 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_path_IM_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_IM_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $IM_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -15970,14 +24406,14 @@ for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ 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_path_IM_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_IM_CONFIG" && ac_cv_path_IM_CONFIG="notfound"
@@ -15986,27 +24422,27 @@ esac
fi
IM_CONFIG=$ac_cv_path_IM_CONFIG
if test -n "$IM_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IM_CONFIG" >&5
-$as_echo "$IM_CONFIG" >&6; }
+ { echo "$as_me:$LINENO: result: $IM_CONFIG" >&5
+echo "${ECHO_T}$IM_CONFIG" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$IM_CONFIG" = "xnotfound"
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The ImageMagick plugin will not be build" >&5
-$as_echo "$as_me: WARNING: The ImageMagick plugin will not be build" >&2;}
+ { echo "$as_me:$LINENO: WARNING: The ImageMagick plugin will not be build" >&5
+echo "$as_me: WARNING: The ImageMagick plugin will not be build" >&2;}
with_im=no
fi
fi
if test "x$with_im" != "xno"
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ImageMagick library usability" >&5
-$as_echo_n "checking ImageMagick library usability... " >&6; }
+ { echo "$as_me:$LINENO: checking ImageMagick library usability" >&5
+echo $ECHO_N "checking ImageMagick library usability... $ECHO_C" >&6; }
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
@@ -16022,13 +24458,18 @@ $as_echo_n "checking ImageMagick library usability... " >&6; }
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_im/lib"
export LD_LIBRARY_PATH
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
@@ -16044,25 +24485,49 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
-$as_echo "good" >&6; }
+ { echo "$as_me:$LINENO: result: good" >&5
+echo "${ECHO_T}good" >&6; }
else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: bad. Check config.log for details" >&5
-$as_echo "bad. Check config.log for details" >&6; }
+ { echo "$as_me:$LINENO: result: bad. Check config.log for details" >&5
+echo "${ECHO_T}bad. Check config.log for details" >&6; }
with_im="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The ImageMagick plugin will not be build" >&5
-$as_echo "$as_me: WARNING: The ImageMagick plugin will not be build" >&2;}
+ { echo "$as_me:$LINENO: WARNING: The ImageMagick plugin will not be build" >&5
+echo "$as_me: WARNING: The ImageMagick plugin will not be build" >&2;}
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
LIBS="$save_LIBS"
CPPFLAGS="$save_CPPFLAGS"
LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH"
@@ -16087,13 +24552,15 @@ fi
# #
##########################################################################
# Check whether --enable-wbxml2 was given.
-if test "${enable_wbxml2+set}" = set; then :
+if test "${enable_wbxml2+set}" = set; then
enableval=$enable_wbxml2;
case "${enableval}" in
yes) with_wbxml2="yes" ;;
no) with_wbxml2="no" ;;
/*) with_wbxml2="${enableval}" ;;
- *) as_fn_error $? "bad value ${enableval} for --disable-wbxml2" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-wbxml2" >&5
+echo "$as_me: error: bad value ${enableval} for --disable-wbxml2" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -16104,8 +24571,8 @@ fi
if test "x$with_wbxml2" != "xno"
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking WBXML2 library usability" >&5
-$as_echo_n "checking WBXML2 library usability... " >&6; }
+ { echo "$as_me:$LINENO: checking WBXML2 library usability" >&5
+echo $ECHO_N "checking WBXML2 library usability... $ECHO_C" >&6; }
old_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
old_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
@@ -16125,13 +24592,18 @@ $as_echo_n "checking WBXML2 library usability... " >&6; }
CFLAGS="$CFLAGS $WBXML2_CFLAGS"
LIBS="$LIBS $WBXML2_LDFLAGS"
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
@@ -16146,22 +24618,46 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
-$as_echo "good" >&6; }
+ { echo "$as_me:$LINENO: result: good" >&5
+echo "${ECHO_T}good" >&6; }
else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: bad. Check config.log for details" >&5
-$as_echo "bad. Check config.log for details" >&6; }
+( exit $ac_status )
+
+ { echo "$as_me:$LINENO: result: bad. Check config.log for details" >&5
+echo "${ECHO_T}bad. Check config.log for details" >&6; }
with_wbxml2="no"
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
CFLAGS="$old_CFLAGS"
LIBS="$save_LIBS"
LD_LIBRARY_PATH="$old_LD_LIBRARY_PATH"
@@ -16186,12 +24682,14 @@ fi
##########################################################################
with_perl="no"
# Check whether --enable-perl was given.
-if test "${enable_perl+set}" = set; then :
+if test "${enable_perl+set}" = set; then
enableval=$enable_perl;
case "${enableval}" in
yes) with_perl="yes" ;;
no) with_perl="no" ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-perl" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-perl" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-perl" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -16223,12 +24721,14 @@ fi
##########################################################################
with_python="no"
# Check whether --enable-python was given.
-if test "${enable_python+set}" = set; then :
+if test "${enable_python+set}" = set; then
enableval=$enable_python;
case "${enableval}" in
yes) with_python="yes";;
no) with_python="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-python" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-python" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -16269,12 +24769,14 @@ fi
##########################################################################
with_ruby="no"
# Check whether --enable-ruby was given.
-if test "${enable_ruby+set}" = set; then :
+if test "${enable_ruby+set}" = set; then
enableval=$enable_ruby;
case "${enableval}" in
yes) with_ruby="yes";;
no) with_ruby="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-ruby" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-ruby" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-ruby" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -16292,15 +24794,20 @@ if test "x$RUBY" != "x" -a "x$with_ruby" != "xno" ; then
CPPFLAGS="$CPPFLAGS $RUBY_CFLAGS"
LIBS="$LIBS $RUBY_LDFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby library usability" >&5
-$as_echo_n "checking Ruby library usability... " >&6; }
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { echo "$as_me:$LINENO: checking Ruby library usability" >&5
+echo $ECHO_N "checking Ruby library usability... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
@@ -16313,23 +24820,47 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
-$as_echo "good" >&6; }
+ { echo "$as_me:$LINENO: result: good" >&5
+echo "${ECHO_T}good" >&6; }
else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: bad. Check config.log for details" >&5
-$as_echo "bad. Check config.log for details" >&6; }
+( exit $ac_status )
+
+ { echo "$as_me:$LINENO: result: bad. Check config.log for details" >&5
+echo "${ECHO_T}bad. Check config.log for details" >&6; }
with_ruby="no"
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
LIBS="$save_LIBS"
CPPFLAGS="$save_CPPFLAGS"
fi
@@ -16353,12 +24884,14 @@ fi
with_zlib="no"
# Check whether --with-internal-zlib was given.
-if test "${with_internal_zlib+set}" = set; then :
+if test "${with_internal_zlib+set}" = set; then
withval=$with_internal_zlib;
case "${withval}" in
yes) with_zlib="internal";;
no) with_zlib="external";;
- *) as_fn_error $? "bad value ${withval} for --enable-zlib" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --enable-zlib" >&5
+echo "$as_me: error: bad value ${withval} for --enable-zlib" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -16369,20 +24902,150 @@ fi
if test "x$with_zlib" != "xinternal"
then
- ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
+ if test "${ac_cv_header_zlib_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <zlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <zlib.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_zlib_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
-$as_echo_n "checking for main in -lz... " >&6; }
-if ${ac_cv_lib_z_main+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for main in -lz" >&5
+echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6; }
+if test "${ac_cv_lib_z_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16394,18 +25057,39 @@ return main ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_z_main=yes
else
- ac_cv_lib_z_main=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_z_main=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_main" >&5
-$as_echo "$ac_cv_lib_z_main" >&6; }
-if test "x$ac_cv_lib_z_main" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5
+echo "${ECHO_T}$ac_cv_lib_z_main" >&6; }
+if test $ac_cv_lib_z_main = yes; then
with_zlib=yes
else
with_zlib=internal
@@ -16442,7 +25126,7 @@ fi
# Check whether --with-malloc-debug was given.
-if test "${with_malloc_debug+set}" = set; then :
+if test "${with_malloc_debug+set}" = set; then
withval=$with_malloc_debug; with_malloc_debug="$withval"
else
with_malloc_debug="no"
@@ -16460,7 +25144,7 @@ fi
# Check whether --with-mtx-debug was given.
-if test "${with_mtx_debug+set}" = set; then :
+if test "${with_mtx_debug+set}" = set; then
withval=$with_mtx_debug; with_mtx_debug="$withval"
else
with_mtx_debug="no"
@@ -16484,7 +25168,7 @@ fi
# Check whether --with-pthreads was given.
-if test "${with_pthreads+set}" = set; then :
+if test "${with_pthreads+set}" = set; then
withval=$with_pthreads; with_pthreads="$withval"
else
with_pthreads="yes"
@@ -16493,14 +25177,18 @@ fi
if test $with_pthreads = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
-$as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
-if ${ac_cv_lib_pthreads_pthread_create+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
+echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthreads $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16518,18 +25206,39 @@ return pthread_create ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_pthreads_pthread_create=yes
else
- ac_cv_lib_pthreads_pthread_create=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pthreads_pthread_create=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_create" >&5
+echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_create" >&6; }
+if test $ac_cv_lib_pthreads_pthread_create = yes; then
BUILD_OPTS="$BUILD_OPTS pthreads"
WITH_PTHREADS="yes"
if test "$host_os" = "osf3.2"
@@ -16537,27 +25246,37 @@ if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then :
BUILD_OPTS="$BUILD_OPTS old_pthreads"
LIBTHR="-lpthreads -lmach -lc_r"
-$as_echo "#define OLD_PTHREADS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define OLD_PTHREADS 1
+_ACEOF
else
LIBTHR="-lpthreads"
fi
-$as_echo "#define _REENTRANT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
-$as_echo "#define WITH_PTHREADS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define WITH_PTHREADS 1
+_ACEOF
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16575,26 +25294,51 @@ return pthread_create ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_pthread_pthread_create=yes
else
- ac_cv_lib_pthread_pthread_create=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pthread_pthread_create=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+if test $ac_cv_lib_pthread_pthread_create = yes; then
BUILD_OPTS="$BUILD_OPTS pthreads"
WITH_PTHREADS="yes"
LIBTHR="-lpthread"
-$as_echo "#define _REENTRANT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
-$as_echo "#define WITH_PTHREADS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define WITH_PTHREADS 1
+_ACEOF
fi
@@ -16604,10 +25348,10 @@ fi
if test "x$have_mono" = "xyes" ; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; 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_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -16619,14 +25363,14 @@ 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
+ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -16635,16 +25379,18 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$PKG_CONFIG" = "xno"; then
- as_fn_error $? "You need to install pkg-config" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: You need to install pkg-config" >&5
+echo "$as_me: error: You need to install pkg-config" >&2;}
+ { (exit 1); exit 1; }; }
fi
BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
@@ -16655,7 +25401,7 @@ fi
pkg_config_path=
# Check whether --with-crosspkgdir was given.
-if test "${with_crosspkgdir+set}" = set; then :
+if test "${with_crosspkgdir+set}" = set; then
withval=$with_crosspkgdir; if test x$with_crosspkgdir = "x"; then
if test -s $PKG_CONFIG_PATH; then
pkg_config_path=$PKG_CONFIG_PATH
@@ -16674,7 +25420,9 @@ fi
$PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0
if test $? -gt 0 ; then
- as_fn_error $? "You need to install glib-2.0 version $GLIB_REQUIRED_VERSION or greater" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: You need to install glib-2.0 version $GLIB_REQUIRED_VERSION or greater" >&5
+echo "$as_me: error: You need to install glib-2.0 version $GLIB_REQUIRED_VERSION or greater" >&2;}
+ { (exit 1); exit 1; }; }
fi
# PKG_CHECK_MODULES_(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
@@ -16691,13 +25439,97 @@ fi
save_LIBS="$LIBS"
LIBS="$LIBTHR $LIBS"
+
+
+
for ac_func in pthread_attr_setstacksize pthread_attr_getstacksize pthread_sigmask
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -16721,44 +25553,183 @@ fi
# #
##########################################################################
# Check whether --enable-aio was given.
-if test "${enable_aio+set}" = set; then :
+if test "${enable_aio+set}" = set; then
enableval=$enable_aio;
case "${enableval}" in
yes) with_aio="yes" ;;
no) with_aio="no" ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-aio" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-aio" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-aio" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
- with_aio="no"
-
+ with_aio="no"
+
+fi
+
+
+if test "$with_aio" != "no"
+then
+ AIOLIB=""
+
+
+for ac_header in aio.h sched.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
-
-if test "$with_aio" != "no"
-then
- AIOLIB=""
- for ac_header in aio.h sched.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aio_read in -lrt" >&5
-$as_echo_n "checking for aio_read in -lrt... " >&6; }
-if ${ac_cv_lib_rt_aio_read+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for aio_read in -lrt" >&5
+echo $ECHO_N "checking for aio_read in -lrt... $ECHO_C" >&6; }
+if test "${ac_cv_lib_rt_aio_read+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lrt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16776,22 +25747,45 @@ return aio_read ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_rt_aio_read=yes
else
- ac_cv_lib_rt_aio_read=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_rt_aio_read=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_aio_read" >&5
-$as_echo "$ac_cv_lib_rt_aio_read" >&6; }
-if test "x$ac_cv_lib_rt_aio_read" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_aio_read" >&5
+echo "${ECHO_T}$ac_cv_lib_rt_aio_read" >&6; }
+if test $ac_cv_lib_rt_aio_read = yes; then
AIOLIB="-lrt"
-$as_echo "#define HAVE_AIO 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_AIO 1
+_ACEOF
fi
@@ -16806,19 +25800,19 @@ fi
## ##
##########################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libs" >&5
-$as_echo_n "checking for --with-libs... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-libs" >&5
+echo $ECHO_N "checking for --with-libs... $ECHO_C" >&6; }
# Check whether --with-libs was given.
-if test "${with_libs+set}" = set; then :
+if test "${with_libs+set}" = set; then
withval=$with_libs;
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+ { echo "$as_me:$LINENO: result: $withval" >&5
+echo "${ECHO_T}$withval" >&6; }
VLIBS="$withval $VLIBS"
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -16832,27 +25826,33 @@ fi
LIBRDL=""
_save_LIBS=$LIBS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-editline" >&5
-$as_echo_n "checking for --with-editline... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-editline" >&5
+echo $ECHO_N "checking for --with-editline... $ECHO_C" >&6; }
# Check whether --with-editline was given.
-if test "${with_editline+set}" = set; then :
+if test "${with_editline+set}" = set; then
withval=$with_editline;
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+ { echo "$as_me:$LINENO: result: $withval" >&5
+echo "${ECHO_T}$withval" >&6; }
-$as_echo "#define WITH_EDITLINE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define WITH_EDITLINE 1
+_ACEOF
if test -d "$withval"
then
LDFLAGS="$LDFLAGS -L$withval"
fi
# first check if we can compile without lib termcap
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ledit without -ltermcap" >&5
-$as_echo_n "checking for -ledit without -ltermcap... " >&6; }
+ { echo "$as_me:$LINENO: checking for -ledit without -ltermcap" >&5
+echo $ECHO_N "checking for -ledit without -ltermcap... $ECHO_C" >&6; }
# check if libedit exists
LIBS="$LIBS -ledit"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
extern char *readline();
int
@@ -16863,28 +25863,52 @@ char *line=readline();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
BUILD_OPTS="$BUILD_OPTS editline"
LIBRDL="-ledit"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ledit that needs -ltermcap..." >&5
-$as_echo "$as_me: checking for -ledit that needs -ltermcap..." >&6;}
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: checking for -ledit that needs -ltermcap..." >&5
+echo "$as_me: checking for -ledit that needs -ltermcap..." >&6;}
termcap=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-if ${ac_cv_lib_termcap_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
+echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6; }
+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermcap $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16902,29 +25926,54 @@ return tgetent ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_termcap_tgetent=yes
else
- ac_cv_lib_termcap_tgetent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_termcap_tgetent=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6; }
+if test $ac_cv_lib_termcap_tgetent = yes; then
termcap=termcap
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermlib" >&5
-$as_echo_n "checking for tgetent in -ltermlib... " >&6; }
-if ${ac_cv_lib_termlib_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for tgetent in -ltermlib" >&5
+echo $ECHO_N "checking for tgetent in -ltermlib... $ECHO_C" >&6; }
+if test "${ac_cv_lib_termlib_tgetent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermlib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16942,29 +25991,54 @@ return tgetent ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_termlib_tgetent=yes
else
- ac_cv_lib_termlib_tgetent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_termlib_tgetent=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termlib_tgetent" >&5
-$as_echo "$ac_cv_lib_termlib_tgetent" >&6; }
-if test "x$ac_cv_lib_termlib_tgetent" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_termlib_tgetent" >&6; }
+if test $ac_cv_lib_termlib_tgetent = yes; then
termcap=termlib
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
-$as_echo_n "checking for tgetent in -lcurses... " >&6; }
-if ${ac_cv_lib_curses_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
+echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6; }
+if test "${ac_cv_lib_curses_tgetent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16982,29 +26056,54 @@ return tgetent ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_curses_tgetent=yes
else
- ac_cv_lib_curses_tgetent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_curses_tgetent=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
-$as_echo "$ac_cv_lib_curses_tgetent" >&6; }
-if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6; }
+if test $ac_cv_lib_curses_tgetent = yes; then
termcap=curses
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
+echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6; }
+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lncurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17022,22 +26121,45 @@ return tgetent ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_ncurses_tgetent=yes
else
- ac_cv_lib_ncurses_tgetent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ncurses_tgetent=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6; }
+if test $ac_cv_lib_ncurses_tgetent = yes; then
termcap=ncurses
else
- as_fn_error $? "no working -ltermcap/termlib found -- do not use --with-editline" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: no working -ltermcap/termlib found -- do not use --with-editline" >&5
+echo "$as_me: error: no working -ltermcap/termlib found -- do not use --with-editline" >&2;}
+ { (exit 1); exit 1; }; }
fi
fi
@@ -17047,9 +26169,13 @@ fi
fi
LIBS="$LIBS -l$termcap"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ledit" >&5
-$as_echo_n "checking for -ledit... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { echo "$as_me:$LINENO: checking for -ledit" >&5
+echo $ECHO_N "checking for -ledit... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
extern char *readline();
int
@@ -17060,56 +26186,86 @@ char *line=readline();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
BUILD_OPTS="$BUILD_OPTS editline"
LIBRDL="-ledit -l$termcap"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
- as_fn_error $? "no working editline library found -- do not use --with-editline" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: no working editline library found -- do not use --with-editline" >&5
+echo "$as_me: error: no working editline library found -- do not use --with-editline" >&2;}
+ { (exit 1); exit 1; }; }
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-readline" >&5
-$as_echo_n "checking for --with-readline... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-readline" >&5
+echo $ECHO_N "checking for --with-readline... $ECHO_C" >&6; }
# Check whether --with-readline was given.
-if test "${with_readline+set}" = set; then :
+if test "${with_readline+set}" = set; then
withval=$with_readline;
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+ { echo "$as_me:$LINENO: result: $withval" >&5
+echo "${ECHO_T}$withval" >&6; }
-$as_echo "#define WITH_READLINE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define WITH_READLINE 1
+_ACEOF
if test -d "$withval"
then
LDFLAGS="$LDFLAGS -L$withval"
fi
# first check if we can compile without lib termcap
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lreadline without -ltermcap" >&5
-$as_echo_n "checking for -lreadline without -ltermcap... " >&6; }
+ { echo "$as_me:$LINENO: checking for -lreadline without -ltermcap" >&5
+echo $ECHO_N "checking for -lreadline without -ltermcap... $ECHO_C" >&6; }
# check if a libreadline exists
LIBS="$LIBS -lreadline"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
extern char *readline();
int
@@ -17120,28 +26276,52 @@ char *line=readline();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
BUILD_OPTS="$BUILD_OPTS readline"
LIBRDL="-lreadline"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lreadline that needs -ltermcap..." >&5
-$as_echo "$as_me: checking for -lreadline that needs -ltermcap..." >&6;}
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: checking for -lreadline that needs -ltermcap..." >&5
+echo "$as_me: checking for -lreadline that needs -ltermcap..." >&6;}
termcap=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-if ${ac_cv_lib_termcap_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
+echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6; }
+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermcap $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17159,29 +26339,54 @@ return tgetent ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_termcap_tgetent=yes
else
- ac_cv_lib_termcap_tgetent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_termcap_tgetent=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6; }
+if test $ac_cv_lib_termcap_tgetent = yes; then
termcap=termcap
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermlib" >&5
-$as_echo_n "checking for tgetent in -ltermlib... " >&6; }
-if ${ac_cv_lib_termlib_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for tgetent in -ltermlib" >&5
+echo $ECHO_N "checking for tgetent in -ltermlib... $ECHO_C" >&6; }
+if test "${ac_cv_lib_termlib_tgetent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermlib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17199,29 +26404,54 @@ return tgetent ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_termlib_tgetent=yes
else
- ac_cv_lib_termlib_tgetent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_termlib_tgetent=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termlib_tgetent" >&5
-$as_echo "$ac_cv_lib_termlib_tgetent" >&6; }
-if test "x$ac_cv_lib_termlib_tgetent" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_termlib_tgetent" >&6; }
+if test $ac_cv_lib_termlib_tgetent = yes; then
termcap=termlib
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
+echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6; }
+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lncurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17239,29 +26469,54 @@ return tgetent ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_ncurses_tgetent=yes
else
- ac_cv_lib_ncurses_tgetent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ncurses_tgetent=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6; }
+if test $ac_cv_lib_ncurses_tgetent = yes; then
termcap=ncurses
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
-$as_echo_n "checking for tgetent in -lcurses... " >&6; }
-if ${ac_cv_lib_curses_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
+echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6; }
+if test "${ac_cv_lib_curses_tgetent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17279,22 +26534,45 @@ return tgetent ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_curses_tgetent=yes
else
- ac_cv_lib_curses_tgetent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_curses_tgetent=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
-$as_echo "$ac_cv_lib_curses_tgetent" >&6; }
-if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6; }
+if test $ac_cv_lib_curses_tgetent = yes; then
termcap=curses
else
- as_fn_error $? "no working -ltermcap/termlib found -- do not use --with-readline" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: no working -ltermcap/termlib found -- do not use --with-readline" >&5
+echo "$as_me: error: no working -ltermcap/termlib found -- do not use --with-readline" >&2;}
+ { (exit 1); exit 1; }; }
fi
fi
@@ -17304,9 +26582,13 @@ fi
fi
LIBS="$LIBS -l$termcap"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lreadline" >&5
-$as_echo_n "checking for -lreadline... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { echo "$as_me:$LINENO: checking for -lreadline" >&5
+echo $ECHO_N "checking for -lreadline... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
extern char *readline();
int
@@ -17317,27 +26599,51 @@ char *line=readline();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
BUILD_OPTS="$BUILD_OPTS readline"
LIBRDL="-lreadline -lhistory -l$termcap"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- as_fn_error $? "no working GNU readline library found -- do not use --with-readline" "$LINENO" 5
+
+ { { echo "$as_me:$LINENO: error: no working GNU readline library found -- do not use --with-readline" >&5
+echo "$as_me: error: no working GNU readline library found -- do not use --with-readline" >&2;}
+ { (exit 1); exit 1; }; }
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -17354,18 +26660,102 @@ LIBS=$_save_LIBS
##########################################################################
LIBDL=""
-ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+{ echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+if test "${ac_cv_func_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define dlopen innocuous_dlopen
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dlopen (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef dlopen
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_dlopen || defined __stub___dlopen
+choke me
+#endif
+
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_dlopen=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+if test $ac_cv_func_dlopen = yes; then
LIBDL=""
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17383,18 +26773,39 @@ return dlopen ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dl_dlopen=yes
else
- ac_cv_lib_dl_dlopen=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dl_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
fi
@@ -17402,14 +26813,18 @@ fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17427,31 +26842,58 @@ return dlopen ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dl_dlopen=yes
else
- ac_cv_lib_dl_dlopen=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dl_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+if test $ac_cv_lib_dl_dlopen = yes; then
-$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17469,20 +26911,43 @@ return shl_load ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dld_shl_load=yes
else
- ac_cv_lib_dld_shl_load=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dld_shl_load=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+if test $ac_cv_lib_dld_shl_load = yes; then
-$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SHL_LOAD 1
+_ACEOF
fi
@@ -17496,19 +26961,21 @@ srvrlibs="$srvrlibs $LIBDL"
## ##
##########################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iODBC location" >&5
-$as_echo_n "checking for iODBC location... " >&6; }
+{ echo "$as_me:$LINENO: checking for iODBC location" >&5
+echo $ECHO_N "checking for iODBC location... $ECHO_C" >&6; }
virt_iodbc_dir="libsrc/odbcsdk"
virt_do_iodbc="no"
# Check whether --with-iodbc was given.
-if test "${with_iodbc+set}" = set; then :
+if test "${with_iodbc+set}" = set; then
withval=$with_iodbc;
case "${withval}" in
yes) virt_do_iodbc="yes" ;;
no) virt_do_iodbc="no" ;;
/*) virt_do_iodbc="yes" virt_iodbc_dir="${withval}" ;;
- *) as_fn_error $? "\"Invalid value for the --with-iodbc : must be an absolute path\"" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: \"Invalid value for the --with-iodbc : must be an absolute path\"" >&5
+echo "$as_me: error: \"Invalid value for the --with-iodbc : must be an absolute path\"" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -17516,10 +26983,12 @@ else
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $virt_iodbc_dir" >&5
-$as_echo "$virt_iodbc_dir" >&6; }
+{ echo "$as_me:$LINENO: result: $virt_iodbc_dir" >&5
+echo "${ECHO_T}$virt_iodbc_dir" >&6; }
-$as_echo "#define NO_UDBC_SDK 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define NO_UDBC_SDK 1
+_ACEOF
@@ -17533,13 +27002,149 @@ then
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS"
- for ac_header in sql.h sqlext.h sqlucode.h iodbcext.h odbcinst.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+
+
+
+
+
+for ac_header in sql.h sqlext.h sqlucode.h iodbcext.h odbcinst.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -17551,14 +27156,18 @@ done
ccincl="$iodbc_CPPFLAGS $ccincl"
iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLTables in -liodbc" >&5
-$as_echo_n "checking for SQLTables in -liodbc... " >&6; }
-if ${ac_cv_lib_iodbc_SQLTables+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for SQLTables in -liodbc" >&5
+echo $ECHO_N "checking for SQLTables in -liodbc... $ECHO_C" >&6; }
+if test "${ac_cv_lib_iodbc_SQLTables+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-liodbc $iodbc_LDFLAGS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17576,18 +27185,39 @@ return SQLTables ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_iodbc_SQLTables=yes
else
- ac_cv_lib_iodbc_SQLTables=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_iodbc_SQLTables=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLTables" >&5
-$as_echo "$ac_cv_lib_iodbc_SQLTables" >&6; }
-if test "x$ac_cv_lib_iodbc_SQLTables" = xyes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLTables" >&5
+echo "${ECHO_T}$ac_cv_lib_iodbc_SQLTables" >&6; }
+if test $ac_cv_lib_iodbc_SQLTables = yes; then
virt_do_iodbc="yes"
@@ -17603,22 +27233,32 @@ else
#
# we have a copy of these files internally
#
- $as_echo "#define HAVE_SQL_H 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SQL_H 1
+_ACEOF
- $as_echo "#define HAVE_SQLEXT_H 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SQLEXT_H 1
+_ACEOF
- $as_echo "#define HAVE_SQLUCODE_H 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SQLUCODE_H 1
+_ACEOF
- $as_echo "#define HAVE_ODBCINST_H 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_ODBCINST_H 1
+_ACEOF
- $as_echo "#define HAVE_IODBCEXT_H 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_IODBCEXT_H 1
+_ACEOF
fi
if test "x$virt_do_iodbc" = "xyes"; then
BUILD_OPTS="$BUILD_OPTS odbc"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Will build the iODBC binaries" >&5
-$as_echo "Will build the iODBC binaries" >&6; }
+ { echo "$as_me:$LINENO: result: Will build the iODBC binaries" >&5
+echo "${ECHO_T}Will build the iODBC binaries" >&6; }
fi
if test "x$virt_do_iodbc" = "xyes" ; then
@@ -17637,17 +27277,19 @@ fi
## ##
##########################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Java options" >&5
-$as_echo_n "checking for Java options... " >&6; }
+{ echo "$as_me:$LINENO: checking for Java options" >&5
+echo $ECHO_N "checking for Java options... $ECHO_C" >&6; }
ac_jdk2_path="none"
# Check whether --with-jdk2 was given.
-if test "${with_jdk2+set}" = set; then :
+if test "${with_jdk2+set}" = set; then
withval=$with_jdk2;
case "${withval}" in
yes)
- as_fn_error $? "\"You need to specify a directory\"" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: \"You need to specify a directory\"" >&5
+echo "$as_me: error: \"You need to specify a directory\"" >&2;}
+ { (exit 1); exit 1; }; }
;;
no)
@@ -17658,7 +27300,9 @@ if test "${with_jdk2+set}" = set; then :
if test -d "${withval}" ; then
ac_jdk2_path="${withval}"
else
- as_fn_error $? "\"Directory specified with --with-jdk2 does not exist\"" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: \"Directory specified with --with-jdk2 does not exist\"" >&5
+echo "$as_me: error: \"Directory specified with --with-jdk2 does not exist\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
;;
esac
@@ -17669,11 +27313,13 @@ fi
ac_jdk3_path="none"
# Check whether --with-jdk3 was given.
-if test "${with_jdk3+set}" = set; then :
+if test "${with_jdk3+set}" = set; then
withval=$with_jdk3;
case "${withval}" in
yes)
- as_fn_error $? "\"You need to specify a directory\"" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: \"You need to specify a directory\"" >&5
+echo "$as_me: error: \"You need to specify a directory\"" >&2;}
+ { (exit 1); exit 1; }; }
;;
no)
@@ -17684,25 +27330,29 @@ if test "${with_jdk3+set}" = set; then :
if test -d "${withval}" ; then
ac_jdk3_path="${withval}"
else
- as_fn_error $? "\"Directory specified with --with-jdk3 does not exist\"" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: \"Directory specified with --with-jdk3 does not exist\"" >&5
+echo "$as_me: error: \"Directory specified with --with-jdk3 does not exist\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
;;
esac
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
+{ echo "$as_me:$LINENO: result: done" >&5
+echo "${ECHO_T}done" >&6; }
ac_jdk4_path="none"
# Check whether --with-jdk4 was given.
-if test "${with_jdk4+set}" = set; then :
+if test "${with_jdk4+set}" = set; then
withval=$with_jdk4;
case "${withval}" in
yes)
- as_fn_error $? "\"You need to specify a directory\"" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: \"You need to specify a directory\"" >&5
+echo "$as_me: error: \"You need to specify a directory\"" >&2;}
+ { (exit 1); exit 1; }; }
;;
no)
@@ -17713,15 +27363,17 @@ if test "${with_jdk4+set}" = set; then :
if test -d "${withval}" ; then
ac_jdk4_path="${withval}"
else
- as_fn_error $? "\"Directory specified with --with-jdk4 does not exist\"" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: \"Directory specified with --with-jdk4 does not exist\"" >&5
+echo "$as_me: error: \"Directory specified with --with-jdk4 does not exist\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
;;
esac
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
+{ echo "$as_me:$LINENO: result: done" >&5
+echo "${ECHO_T}done" >&6; }
#AC_PROG_JAVA_WORKS (jdk_path, min_acceptable_ver, max_acceptable_ver)
@@ -17735,8 +27387,8 @@ ac_jw_max_minor="3"
ac_cv_prog_java_works=no
#echo macro called with ac_jw_jdk="$ac_jw_jdk" ac_jw_min_minor="$ac_jw_min_minor" ac_jw_max_minor="$ac_jw_max_minor"
if test "x$ac_jw_jdk" != "xnone" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk" >&5
-$as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk... " >&6; }
+ { echo "$as_me:$LINENO: checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk" >&5
+echo $ECHO_N "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk... $ECHO_C" >&6; }
if test -x "$ac_jw_jdk/Commands/java"; then
ac_jw_jdk="$ac_jw_jdk/Commands"
else
@@ -17748,45 +27400,51 @@ $as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x
ac_java_ver_major=`echo $ac_java_version | cut -f 1 -d .`
ac_java_ver_minor=`echo $ac_java_version | cut -f 2 -d .`
if test "x$ac_java_ver_major" != "x1" -o "0$ac_java_ver_minor" -lt "0$ac_jw_min_minor" -o "0$ac_java_ver_minor" -gt "0$ac_jw_max_minor" ; then
- as_fn_error $? "wrong version ($ac_java_ver_major.$ac_java_ver_minor)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: wrong version ($ac_java_ver_major.$ac_java_ver_minor)" >&5
+echo "$as_me: error: wrong version ($ac_java_ver_major.$ac_java_ver_minor)" >&2;}
+ { (exit 1); exit 1; }; }
fi
JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
-/* [#]line 17757 "configure" */
+/* [#]line 27411 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
} }
EOF
if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; } && test -s $CLASS_TEST; then
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } && test -s $CLASS_TEST; then
:
else
echo "configure: failed program was:" >&5
cat $JAVA_TEST >&5
- as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&5
+echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&2;}
+ { (exit 1); exit 1; }; }
fi
if { ac_try='$JAVA $JAVAFLAGS $TEST'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; } >/dev/null 2>&1; then
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } >/dev/null 2>&1; then
ac_cv_prog_java_works=yes
else
echo "configure: failed program was:" >&5
cat $JAVA_TEST >&5
- as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" >&5
+echo "$as_me: error: The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" >&2;}
+ { (exit 1); exit 1; }; }
fi
rm -fr $JAVA_TEST $CLASS_TEST Test.uue
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
fi
ac_jdk2_works="$ac_cv_prog_java_works"
@@ -17808,8 +27466,8 @@ ac_jw_max_minor="5"
ac_cv_prog_java_works=no
#echo macro called with ac_jw_jdk="$ac_jw_jdk" ac_jw_min_minor="$ac_jw_min_minor" ac_jw_max_minor="$ac_jw_max_minor"
if test "x$ac_jw_jdk" != "xnone" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk" >&5
-$as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk... " >&6; }
+ { echo "$as_me:$LINENO: checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk" >&5
+echo $ECHO_N "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk... $ECHO_C" >&6; }
if test -x "$ac_jw_jdk/Commands/java"; then
ac_jw_jdk="$ac_jw_jdk/Commands"
else
@@ -17821,45 +27479,51 @@ $as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x
ac_java_ver_major=`echo $ac_java_version | cut -f 1 -d .`
ac_java_ver_minor=`echo $ac_java_version | cut -f 2 -d .`
if test "x$ac_java_ver_major" != "x1" -o "0$ac_java_ver_minor" -lt "0$ac_jw_min_minor" -o "0$ac_java_ver_minor" -gt "0$ac_jw_max_minor" ; then
- as_fn_error $? "wrong version ($ac_java_ver_major.$ac_java_ver_minor)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: wrong version ($ac_java_ver_major.$ac_java_ver_minor)" >&5
+echo "$as_me: error: wrong version ($ac_java_ver_major.$ac_java_ver_minor)" >&2;}
+ { (exit 1); exit 1; }; }
fi
JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
-/* [#]line 17830 "configure" */
+/* [#]line 27490 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
} }
EOF
if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; } && test -s $CLASS_TEST; then
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } && test -s $CLASS_TEST; then
:
else
echo "configure: failed program was:" >&5
cat $JAVA_TEST >&5
- as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&5
+echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&2;}
+ { (exit 1); exit 1; }; }
fi
if { ac_try='$JAVA $JAVAFLAGS $TEST'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; } >/dev/null 2>&1; then
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } >/dev/null 2>&1; then
ac_cv_prog_java_works=yes
else
echo "configure: failed program was:" >&5
cat $JAVA_TEST >&5
- as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" >&5
+echo "$as_me: error: The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" >&2;}
+ { (exit 1); exit 1; }; }
fi
rm -fr $JAVA_TEST $CLASS_TEST Test.uue
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
fi
ac_jdk3_works="$ac_cv_prog_java_works"
@@ -17881,8 +27545,8 @@ ac_jw_max_minor="6"
ac_cv_prog_java_works=no
#echo macro called with ac_jw_jdk="$ac_jw_jdk" ac_jw_min_minor="$ac_jw_min_minor" ac_jw_max_minor="$ac_jw_max_minor"
if test "x$ac_jw_jdk" != "xnone" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk" >&5
-$as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk... " >&6; }
+ { echo "$as_me:$LINENO: checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk" >&5
+echo $ECHO_N "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk... $ECHO_C" >&6; }
if test -x "$ac_jw_jdk/Commands/java"; then
ac_jw_jdk="$ac_jw_jdk/Commands"
else
@@ -17894,45 +27558,51 @@ $as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x
ac_java_ver_major=`echo $ac_java_version | cut -f 1 -d .`
ac_java_ver_minor=`echo $ac_java_version | cut -f 2 -d .`
if test "x$ac_java_ver_major" != "x1" -o "0$ac_java_ver_minor" -lt "0$ac_jw_min_minor" -o "0$ac_java_ver_minor" -gt "0$ac_jw_max_minor" ; then
- as_fn_error $? "wrong version ($ac_java_ver_major.$ac_java_ver_minor)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: wrong version ($ac_java_ver_major.$ac_java_ver_minor)" >&5
+echo "$as_me: error: wrong version ($ac_java_ver_major.$ac_java_ver_minor)" >&2;}
+ { (exit 1); exit 1; }; }
fi
JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
-/* [#]line 17903 "configure" */
+/* [#]line 27569 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
} }
EOF
if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; } && test -s $CLASS_TEST; then
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } && test -s $CLASS_TEST; then
:
else
echo "configure: failed program was:" >&5
cat $JAVA_TEST >&5
- as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&5
+echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&2;}
+ { (exit 1); exit 1; }; }
fi
if { ac_try='$JAVA $JAVAFLAGS $TEST'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; } >/dev/null 2>&1; then
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } >/dev/null 2>&1; then
ac_cv_prog_java_works=yes
else
echo "configure: failed program was:" >&5
cat $JAVA_TEST >&5
- as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" >&5
+echo "$as_me: error: The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" >&2;}
+ { (exit 1); exit 1; }; }
fi
rm -fr $JAVA_TEST $CLASS_TEST Test.uue
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
fi
ac_jdk4_works="$ac_cv_prog_java_works"
@@ -17941,35 +27611,385 @@ ac_jdk4_path="$ac_jw_jdk"
WITH_JDK4_TRUE=
WITH_JDK4_FALSE='#'
else
- WITH_JDK4_TRUE='#'
- WITH_JDK4_FALSE=
-fi
+ WITH_JDK4_TRUE='#'
+ WITH_JDK4_FALSE=
+fi
+
+
+
+ac_integ_jdk=""
+if test "x$ac_jdk4_works" = "xyes" ; then
+ ac_integ_jdk="$ac_jdk4_path/.."
+elif test "x$ac_jdk3_works" = "xyes" ; then
+ ac_integ_jdk="$ac_jdk3_path/.."
+elif test "x$ac_jdk2_works" = "xyes"; then
+ ac_integ_jdk="ac_jdk2_path/.."
+fi
+
+if test "x$ac_integ_jdk" != "x" ; then
+ integ_jdk_CPPFLAGS=""
+ integ_jdk_LDFLAGS=""
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ #supported jvm hosting platforms : add more here
+ case $host in
+ x86_64-*-linux*)
+ CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
+
+for ac_header in jni.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
+else
+ ac_integ_jdk=""
+fi
+
+done
+
+ { echo "$as_me:$LINENO: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
+echo $ECHO_N "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... $ECHO_C" >&6; }
+if test "${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljvm "-L$ac_integ_jdk/jre/lib/amd64/server" $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char JNI_GetDefaultJavaVMInitArgs ();
+int
+main ()
+{
+return JNI_GetDefaultJavaVMInitArgs ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
+echo "${ECHO_T}$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
+if test $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs = yes; then
+ java_LDFLAGS="-L$ac_integ_jdk/jre/lib/amd64/server -R$ac_integ_jdk/jre/lib/amd64/server -ljvm"
+else
+ ac_integ_jdk=""
+fi
+
+ ;;
+ i?86-*-linux*)
+ CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
+
+for ac_header in jni.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
-ac_integ_jdk=""
-if test "x$ac_jdk4_works" = "xyes" ; then
- ac_integ_jdk="$ac_jdk4_path/.."
-elif test "x$ac_jdk3_works" = "xyes" ; then
- ac_integ_jdk="$ac_jdk3_path/.."
-elif test "x$ac_jdk2_works" = "xyes"; then
- ac_integ_jdk="ac_jdk2_path/.."
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
-if test "x$ac_integ_jdk" != "x" ; then
- integ_jdk_CPPFLAGS=""
- integ_jdk_LDFLAGS=""
- ac_save_CPPFLAGS="$CPPFLAGS"
- #supported jvm hosting platforms : add more here
- case $host in
- x86_64-*-linux*)
- CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
- for ac_header in jni.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = xyes; then :
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_JNI_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
else
@@ -17978,14 +27998,18 @@ fi
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
-$as_echo_n "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... " >&6; }
-if ${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
+echo $ECHO_N "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... $ECHO_C" >&6; }
+if test "${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljvm "-L$ac_integ_jdk/jre/lib/amd64/server" $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+LIBS="-ljvm "-L$ac_integ_jdk/jre/lib/i386/server" $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -18003,48 +28027,206 @@ return JNI_GetDefaultJavaVMInitArgs ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=yes
else
- ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
-$as_echo "$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
-if test "x$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" = xyes; then :
- java_LDFLAGS="-L$ac_integ_jdk/jre/lib/amd64/server -R$ac_integ_jdk/jre/lib/amd64/server -ljvm"
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
+echo "${ECHO_T}$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
+if test $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs = yes; then
+ java_LDFLAGS="-L$ac_integ_jdk/jre/lib/i386/server -ljvm"
else
ac_integ_jdk=""
fi
;;
- i?86-*-linux*)
- CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
- for ac_header in jni.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = xyes; then :
+ sparc-*-solaris*)
+ CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/solaris"
+
+for ac_header in jni.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_JNI_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
+ java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/solaris"
else
ac_integ_jdk=""
fi
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
-$as_echo_n "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... " >&6; }
-if ${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
+echo $ECHO_N "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... $ECHO_C" >&6; }
+if test "${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljvm "-L$ac_integ_jdk/jre/lib/i386/server" $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+LIBS="-ljvm "-L$ac_integ_jdk/jre/lib/sparc/server" $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -18062,48 +28244,206 @@ return JNI_GetDefaultJavaVMInitArgs ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=yes
else
- ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
-$as_echo "$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
-if test "x$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" = xyes; then :
- java_LDFLAGS="-L$ac_integ_jdk/jre/lib/i386/server -ljvm"
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
+echo "${ECHO_T}$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
+if test $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs = yes; then
+ java_LDFLAGS="-L$ac_integ_jdk/lib/jre/sparc/server -ljvm"
else
ac_integ_jdk=""
fi
;;
- sparc-*-solaris*)
- CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/solaris"
- for ac_header in jni.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = xyes; then :
+ hppa-*-hpux*)
+ CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/hp-ux"
+
+for ac_header in jni.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_JNI_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/solaris"
+ java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/hp-ux"
else
ac_integ_jdk=""
fi
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
-$as_echo_n "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... " >&6; }
-if ${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
+echo $ECHO_N "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... $ECHO_C" >&6; }
+if test "${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljvm "-L$ac_integ_jdk/jre/lib/sparc/server" $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+LIBS="-ljvm "-L$ac_integ_jdk/jre/PA_RISC/sparc/server" $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -18121,32 +28461,186 @@ return JNI_GetDefaultJavaVMInitArgs ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=yes
else
- ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
+echo "${ECHO_T}$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
+if test $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs = yes; then
+ java_LDFLAGS="-L$ac_integ_jdk/jre/lib/PA_RISC/server -ljvm"
+else
+ ac_integ_jdk=""
+fi
+
+ ;;
+ hppa2.0-*-hpux*)
+ CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/hp-ux"
+
+for ac_header in jni.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
-$as_echo "$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
-if test "x$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" = xyes; then :
- java_LDFLAGS="-L$ac_integ_jdk/lib/jre/sparc/server -ljvm"
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_integ_jdk=""
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
- ;;
- hppa-*-hpux*)
- CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/hp-ux"
- for ac_header in jni.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = xyes; then :
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_JNI_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/hp-ux"
else
@@ -18155,14 +28649,18 @@ fi
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
-$as_echo_n "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... " >&6; }
-if ${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+:} false; then :
- $as_echo_n "(cached) " >&6
+ { echo "$as_me:$LINENO: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
+echo $ECHO_N "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... $ECHO_C" >&6; }
+if test "${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljvm "-L$ac_integ_jdk/jre/PA_RISC/sparc/server" $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+LIBS="-ljvm "-L$ac_integ_jdk/jre/PA_RISC2.0/sparc/server" $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -18180,91 +28678,186 @@ return JNI_GetDefaultJavaVMInitArgs ();
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=yes
else
- ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
-$as_echo "$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
-if test "x$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" = xyes; then :
- java_LDFLAGS="-L$ac_integ_jdk/jre/lib/PA_RISC/server -ljvm"
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
+echo "${ECHO_T}$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
+if test $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs = yes; then
+ java_LDFLAGS="-L$ac_integ_jdk/jre/lib/PA_RISC2.0/server -ljvm"
else
ac_integ_jdk=""
fi
;;
- hppa2.0-*-hpux*)
- CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/hp-ux"
- for ac_header in jni.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_JNI_H 1
+ *-darwin*)
+ CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/JavaVM.framework/Headers"
+
+for ac_header in jni.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
- java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/hp-ux"
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
else
- ac_integ_jdk=""
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
fi
-done
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JNI_GetDefaultJavaVMInitArgs in -ljvm" >&5
-$as_echo_n "checking for JNI_GetDefaultJavaVMInitArgs in -ljvm... " >&6; }
-if ${ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljvm "-L$ac_integ_jdk/jre/PA_RISC2.0/sparc/server" $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char JNI_GetDefaultJavaVMInitArgs ();
-int
-main ()
-{
-return JNI_GetDefaultJavaVMInitArgs ();
- ;
- return 0;
-}
+#include <$ac_header>
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=yes
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
else
- ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&5
-$as_echo "$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" >&6; }
-if test "x$ac_cv_lib_jvm_JNI_GetDefaultJavaVMInitArgs" = xyes; then :
- java_LDFLAGS="-L$ac_integ_jdk/jre/lib/PA_RISC2.0/server -ljvm"
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to vos.admin at openlinksw.com ##
+## --------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_integ_jdk=""
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
- ;;
- *-darwin*)
- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/JavaVM.framework/Headers"
- for ac_header in jni.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = xyes; then :
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_JNI_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
java_CPPFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Headers"
@@ -18285,10 +28878,10 @@ done
fi
if test "x$ac_integ_jdk" != "x" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Java JNI C flags=\"$java_CPPFLAGS\"" >&5
-$as_echo "Java JNI C flags=\"$java_CPPFLAGS\"" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Java JNI LD flags=\"$java_LDFLAGS\"" >&5
-$as_echo "Java JNI LD flags=\"$java_LDFLAGS\"" >&6; }
+ { echo "$as_me:$LINENO: result: Java JNI C flags=\"$java_CPPFLAGS\"" >&5
+echo "${ECHO_T}Java JNI C flags=\"$java_CPPFLAGS\"" >&6; }
+ { echo "$as_me:$LINENO: result: Java JNI LD flags=\"$java_LDFLAGS\"" >&5
+echo "${ECHO_T}Java JNI LD flags=\"$java_LDFLAGS\"" >&6; }
fi
@@ -18311,7 +28904,7 @@ fi
PORT=1111
# Check whether --with-port was given.
-if test "${with_port+set}" = set; then :
+if test "${with_port+set}" = set; then
withval=$with_port; PORT=${withval}
fi
@@ -18324,18 +28917,20 @@ fi
# #
##########################################################################
# Check whether --enable- was given.
-if test "${enable_+set}" = set; then :
+if test "${enable_+set}" = set; then
enableval=$enable_;
fi
# Check whether --enable-bpel-vad was given.
-if test "${enable_bpel_vad+set}" = set; then :
+if test "${enable_bpel_vad+set}" = set; then
enableval=$enable_bpel_vad;
case "${enableval}" in
yes) with_bpel_vad="yes";;
no) with_bpel_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-bpel-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-bpel-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-bpel-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18345,12 +28940,14 @@ fi
# Check whether --enable-conductor-vad was given.
-if test "${enable_conductor_vad+set}" = set; then :
+if test "${enable_conductor_vad+set}" = set; then
enableval=$enable_conductor_vad;
case "${enableval}" in
yes) with_conductor_vad="yes";;
no) with_conductor_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-conductor-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-conductor-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-conductor-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18359,13 +28956,32 @@ 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";;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-dbpedia-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-dbpedia-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+
+else
+ with_dbpedia_vad="yes"
+
+fi
+
+
# Check whether --enable-demo-vad was given.
-if test "${enable_demo_vad+set}" = set; then :
+if test "${enable_demo_vad+set}" = set; then
enableval=$enable_demo_vad;
case "${enableval}" in
yes) with_demo_vad="yes";;
no) with_demo_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-demo-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-demo-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-demo-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18375,12 +28991,14 @@ fi
# Check whether --enable-fct-vad was given.
-if test "${enable_fct_vad+set}" = set; then :
+if test "${enable_fct_vad+set}" = set; then
enableval=$enable_fct_vad;
case "${enableval}" in
yes) with_fct_vad="yes";;
no) with_fct_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-fct-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-fct-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-fct-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18390,12 +29008,14 @@ fi
# Check whether --enable-isparql-vad was given.
-if test "${enable_isparql_vad+set}" = set; then :
+if test "${enable_isparql_vad+set}" = set; then
enableval=$enable_isparql_vad;
case "${enableval}" in
yes) with_isparql_vad="yes";;
no) with_isparql_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-isparql-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-isparql-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-isparql-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18405,12 +29025,14 @@ fi
# Check whether --enable-ods-vad was given.
-if test "${enable_ods_vad+set}" = set; then :
+if test "${enable_ods_vad+set}" = set; then
enableval=$enable_ods_vad;
case "${enableval}" in
yes) with_ods_vad="yes";;
no) with_ods_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-ods-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-ods-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-ods-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18420,12 +29042,14 @@ fi
# Check whether --enable-rdfmappers-vad was given.
-if test "${enable_rdfmappers_vad+set}" = set; then :
+if test "${enable_rdfmappers_vad+set}" = set; then
enableval=$enable_rdfmappers_vad;
case "${enableval}" in
yes) with_rdfmappers_vad="yes";;
no) with_rdfmappers_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-rdfmappers-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-rdfmappers-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-rdfmappers-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18434,13 +29058,32 @@ else
fi
+# Check whether --enable-rdb2rdf-vad was given.
+if test "${enable_rdb2rdf_vad+set}" = set; then
+ enableval=$enable_rdb2rdf_vad;
+ case "${enableval}" in
+ yes) with_rdb2rdf_vad="yes";;
+ no) with_rdb2rdf_vad="no";;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-rdb2rdf-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-rdb2rdf-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+
+else
+ with_rdb2rdf_vad="yes"
+
+fi
+
+
# Check whether --enable-sparqldemo-vad was given.
-if test "${enable_sparqldemo_vad+set}" = set; then :
+if test "${enable_sparqldemo_vad+set}" = set; then
enableval=$enable_sparqldemo_vad;
case "${enableval}" in
yes) with_sparqldemo_vad="yes";;
no) with_sparqldemo_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-sparqldemo-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-sparqldemo-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-sparqldemo-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18450,12 +29093,14 @@ fi
# Check whether --enable-syncml-vad was given.
-if test "${enable_syncml_vad+set}" = set; then :
+if test "${enable_syncml_vad+set}" = set; then
enableval=$enable_syncml_vad;
case "${enableval}" in
yes) with_syncml_vad="yes";;
no) with_syncml_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-syncml-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-syncml-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-syncml-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18465,12 +29110,14 @@ fi
# Check whether --enable-tutorial-vad was given.
-if test "${enable_tutorial_vad+set}" = set; then :
+if test "${enable_tutorial_vad+set}" = set; then
enableval=$enable_tutorial_vad;
case "${enableval}" in
yes) with_tutorial_vad="yes";;
no) with_tutorial_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-tutorial-vad" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-tutorial-vad" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-tutorial-vad" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18481,12 +29128,14 @@ fi
# Check whether --enable-all-vads was given.
-if test "${enable_all_vads+set}" = set; then :
+if test "${enable_all_vads+set}" = set; then
enableval=$enable_all_vads;
case "${enableval}" in
yes) with_all_vad="yes";;
no) with_all_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-all-vads" "$LINENO" 5 ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-all-vads" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-all-vads" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
else
@@ -18499,10 +29148,12 @@ 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"
with_ods_vad="no"
+ with_rdb2rdf_vad="no"
with_rdfmappers_vad="no"
with_sparqldemo_vad="no"
with_syncml_vad="no"
@@ -18525,6 +29176,14 @@ 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='#'
@@ -18557,6 +29216,14 @@ else
WITH_ODS_VAD_FALSE=
fi
+ if test "x$with_rdb2rdf_vad" = "xyes"; then
+ WITH_RDB2RDF_VAD_TRUE=
+ WITH_RDB2RDF_VAD_FALSE='#'
+else
+ WITH_RDB2RDF_VAD_TRUE='#'
+ WITH_RDB2RDF_VAD_FALSE=
+fi
+
if test "x$with_rdfmappers_vad" = "xyes"; then
WITH_RDFMAPPERS_VAD_TRUE=
WITH_RDFMAPPERS_VAD_FALSE='#'
@@ -18598,8 +29265,8 @@ fi
## ##
##########################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OS specific configuration" >&5
-$as_echo_n "checking for OS specific configuration... " >&6; }
+{ echo "$as_me:$LINENO: checking for OS specific configuration" >&5
+echo $ECHO_N "checking for OS specific configuration... $ECHO_C" >&6; }
OPSYS="Unknown"
case $host in
@@ -18704,8 +29371,8 @@ alpha-dec-osf*)
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ($OPSYS)" >&5
-$as_echo "($OPSYS)" >&6; }
+{ echo "$as_me:$LINENO: result: ($OPSYS)" >&5
+echo "${ECHO_T}($OPSYS)" >&6; }
@@ -18748,45 +29415,59 @@ case $host in
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OS specific defines" >&5
-$as_echo_n "checking for OS specific defines... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ($CCPLATFORMDEFS)" >&5
-$as_echo "($CCPLATFORMDEFS)" >&6; }
+{ echo "$as_me:$LINENO: checking for OS specific defines" >&5
+echo $ECHO_N "checking for OS specific defines... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: ($CCPLATFORMDEFS)" >&5
+echo "${ECHO_T}($CCPLATFORMDEFS)" >&6; }
LIBS="$VLIBS $LIBS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system libs" >&5
-$as_echo_n "checking for system libs... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VLIBS" >&5
-$as_echo "$VLIBS" >&6; }
+{ echo "$as_me:$LINENO: checking for system libs" >&5
+echo $ECHO_N "checking for system libs... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $VLIBS" >&5
+echo "${ECHO_T}$VLIBS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Configured: $BUILD_OPTS" >&5
-$as_echo "Configured: $BUILD_OPTS" >&6; }
+{ echo "$as_me:$LINENO: result: Configured: $BUILD_OPTS" >&5
+echo "${ECHO_T}Configured: $BUILD_OPTS" >&6; }
#AC_CONFIG_SUBDIRS(libsrc/zlib)
-$as_echo "#define VIRTTP 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define VIRTTP 1
+_ACEOF
-$as_echo "#define INC_BACKUP 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define INC_BACKUP 1
+_ACEOF
-$as_echo "#define INPROCESS_CLIENT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define INPROCESS_CLIENT 1
+_ACEOF
-$as_echo "#define BIF_TIDY 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define BIF_TIDY 1
+_ACEOF
-$as_echo "#define REPLICATION_SUPPORT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define REPLICATION_SUPPORT 1
+_ACEOF
-$as_echo "#define REPLICATION_SUPPORT2 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define REPLICATION_SUPPORT2 1
+_ACEOF
-$as_echo "#define VIRTUAL_DIR 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define VIRTUAL_DIR 1
+_ACEOF
@@ -18810,7 +29491,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/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/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/rdb2rdf/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"
@@ -18843,13 +29524,12 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
+ *) $as_unset $ac_var ;;
esac ;;
esac
done
@@ -18857,8 +29537,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -18880,24 +29560,13 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
+ test "x$cache_file" != "x/dev/null" &&
+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -18910,171 +29579,272 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ ac_i=`echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
- if test -n "$EXEEXT"; then
- am__EXEEXT_TRUE=
- am__EXEEXT_FALSE='#'
-else
- am__EXEEXT_TRUE='#'
- am__EXEEXT_FALSE=
-fi
-
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
-
if test -z "${WITH_HTMLDOC_TRUE}" && test -z "${WITH_HTMLDOC_FALSE}"; then
- as_fn_error $? "conditional \"WITH_HTMLDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_HTMLDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_HTMLDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_KERBEROS_TRUE}" && test -z "${WITH_KERBEROS_FALSE}"; then
- as_fn_error $? "conditional \"WITH_KERBEROS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_KERBEROS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_KERBEROS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_LDAP_TRUE}" && test -z "${WITH_LDAP_FALSE}"; then
- as_fn_error $? "conditional \"WITH_LDAP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_LDAP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_LDAP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_IMSG_TRUE}" && test -z "${WITH_IMSG_FALSE}"; then
- as_fn_error $? "conditional \"WITH_IMSG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_IMSG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_IMSG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_PLDEBUG_TRUE}" && test -z "${WITH_PLDEBUG_FALSE}"; then
- as_fn_error $? "conditional \"WITH_PLDEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_PLDEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_PLDEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${HAVE_PHP5_TRUE}" && test -z "${HAVE_PHP5_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_PHP5\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_PHP5\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_PHP5\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${HAVE_MONO_TRUE}" && test -z "${HAVE_MONO_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_MONO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_MONO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_MONO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_HSL_TRUE}" && test -z "${WITH_HSL_FALSE}"; then
- as_fn_error $? "conditional \"WITH_HSL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_HSL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_HSL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_IM_TRUE}" && test -z "${WITH_IM_FALSE}"; then
- as_fn_error $? "conditional \"WITH_IM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_IM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_IM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_WBXML2_TRUE}" && test -z "${WITH_WBXML2_FALSE}"; then
- as_fn_error $? "conditional \"WITH_WBXML2\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_WBXML2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_WBXML2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_PERL_TRUE}" && test -z "${WITH_PERL_FALSE}"; then
- as_fn_error $? "conditional \"WITH_PERL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_PERL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_PERL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_PYTHON_TRUE}" && test -z "${WITH_PYTHON_FALSE}"; then
- as_fn_error $? "conditional \"WITH_PYTHON\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_PYTHON\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_PYTHON\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_RUBY_TRUE}" && test -z "${WITH_RUBY_FALSE}"; then
- as_fn_error $? "conditional \"WITH_RUBY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_RUBY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_RUBY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_ZLIB_TRUE}" && test -z "${WITH_ZLIB_FALSE}"; then
- as_fn_error $? "conditional \"WITH_ZLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_PTHREADS_TRUE}" && test -z "${WITH_PTHREADS_FALSE}"; then
- as_fn_error $? "conditional \"WITH_PTHREADS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_PTHREADS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_PTHREADS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_IODBC_TRUE}" && test -z "${WITH_IODBC_FALSE}"; then
- as_fn_error $? "conditional \"WITH_IODBC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_IODBC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_IODBC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_JDK2_TRUE}" && test -z "${WITH_JDK2_FALSE}"; then
- as_fn_error $? "conditional \"WITH_JDK2\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_JDK2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_JDK2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_JDK3_TRUE}" && test -z "${WITH_JDK3_FALSE}"; then
- as_fn_error $? "conditional \"WITH_JDK3\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_JDK3\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_JDK3\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_JDK4_TRUE}" && test -z "${WITH_JDK4_FALSE}"; then
- as_fn_error $? "conditional \"WITH_JDK4\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_JDK4\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_JDK4\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${INTEG_JDK_TRUE}" && test -z "${INTEG_JDK_FALSE}"; then
- as_fn_error $? "conditional \"INTEG_JDK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"INTEG_JDK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"INTEG_JDK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_BPEL_VAD_TRUE}" && test -z "${WITH_BPEL_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_BPEL_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_BPEL_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_BPEL_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_CONDUCTOR_VAD_TRUE}" && test -z "${WITH_CONDUCTOR_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_CONDUCTOR_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_CONDUCTOR_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_CONDUCTOR_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${WITH_DBPEDIA_VAD_TRUE}" && test -z "${WITH_DBPEDIA_VAD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_DBPEDIA_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_DBPEDIA_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
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
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_DEMO_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_DEMO_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_FCT_VAD_TRUE}" && test -z "${WITH_FCT_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_FCT_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_FCT_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_FCT_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_ISPARQL_VAD_TRUE}" && test -z "${WITH_ISPARQL_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_ISPARQL_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_ISPARQL_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_ISPARQL_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_ODS_VAD_TRUE}" && test -z "${WITH_ODS_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_ODS_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_ODS_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_ODS_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${WITH_RDB2RDF_VAD_TRUE}" && test -z "${WITH_RDB2RDF_VAD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_RDB2RDF_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_RDB2RDF_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_RDFMAPPERS_VAD_TRUE}" && test -z "${WITH_RDFMAPPERS_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_RDFMAPPERS_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_RDFMAPPERS_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_RDFMAPPERS_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_SPARQLDEMO_VAD_TRUE}" && test -z "${WITH_SPARQLDEMO_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_SPARQLDEMO_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_SPARQLDEMO_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_SPARQLDEMO_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_SYNCML_VAD_TRUE}" && test -z "${WITH_SYNCML_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_SYNCML_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_SYNCML_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_SYNCML_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${WITH_TUTORIAL_VAD_TRUE}" && test -z "${WITH_TUTORIAL_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_TUTORIAL_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_TUTORIAL_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_TUTORIAL_VAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
+: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -19084,79 +29854,59 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-
SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
esac
+
fi
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
+ PATH_SEPARATOR=:
fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
+ rm -f conf$$.sh
fi
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
fi
@@ -19165,19 +29915,20 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
+as_nl='
+'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
IFS=$as_save_IFS
;;
@@ -19188,111 +29939,32 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
fi
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
+done
+# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -19306,17 +29978,13 @@ else
as_basename=false
fi
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -19331,103 +29999,104 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
-n*)
- case `echo 'xy\c'` in
+ case `echo 'x\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T=' ';;
+ *) ECHO_C='\c';;
esac;;
*)
ECHO_N='-n';;
esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
+ mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
else
as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
+ as_mkdir_p=:
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -19444,12 +30113,12 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
- case $1 in #(
- -*)set "./$1";;
+ case $1 in
+ -*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -19464,19 +30133,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
# 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.4, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by Virtuoso Open Source Edition $as_me 6.1.6, which was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -19489,16 +30152,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
_ACEOF
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
@@ -19506,25 +30160,22 @@ config_commands="$ac_config_commands"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration. Unless the files
-and actions are specified as TAGs, all are instantiated by default.
+\`$as_me' instantiates files from templates according to the
+current configuration.
-Usage: $0 [OPTION]... [TAG]...
+Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
+ -q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@ -19535,17 +30186,16 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <vos.admin at openlinksw.com>."
+Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Virtuoso Open Source Edition config.status 6.1.4
-configured by $0, generated by GNU Autoconf 2.68,
- with options \\"\$ac_cs_config\\"
+Virtuoso Open Source Edition config.status 6.1.6
+configured by $0, generated by GNU Autoconf 2.61,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -19553,26 +30203,20 @@ ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value. By we need to know if files were specified by the user.
ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -19585,41 +30229,34 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
- --config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
+ echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
- esac
- as_fn_append CONFIG_FILES " '$ac_optarg'"
+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+ { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
--help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
+ echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+ -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; } ;;
- *) as_fn_append ac_config_targets " $1"
+ *) ac_config_targets="$ac_config_targets $1"
ac_need_defaults=false ;;
esac
@@ -19634,29 +30271,27 @@ if $ac_cs_silent; then
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
export CONFIG_SHELL
- exec "\$@"
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- $as_echo "$ac_log"
+ echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
#
# INIT-COMMANDS
#
@@ -19670,134 +30305,146 @@ 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 "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"`'
+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"`'
+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"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $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"`'
+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_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $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"`'
+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"`'
+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $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"`'
+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"`'
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 \
@@ -19818,8 +30465,6 @@ 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 \
-SHELL \
-ECHO \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
@@ -19849,12 +30494,13 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
+install_override_mode \
finish_eval \
old_striplib \
striplib; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -19881,9 +30527,9 @@ postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -19891,12 +30537,6 @@ 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'
@@ -19919,7 +30559,7 @@ fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -19936,6 +30576,7 @@ 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" ;;
@@ -19951,6 +30592,7 @@ do
"binsrc/mono/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/mono/Makefile" ;;
"binsrc/oat/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/oat/Makefile" ;;
"binsrc/rdf_mappers/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/rdf_mappers/Makefile" ;;
+ "binsrc/rdb2rdf/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/rdb2rdf/Makefile" ;;
"binsrc/redland/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/redland/Makefile" ;;
"binsrc/samples/demo/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/samples/demo/Makefile" ;;
"binsrc/samples/hslookup/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/samples/hslookup/Makefile" ;;
@@ -20039,7 +30681,9 @@ do
"appsrc/ODS-Wiki/plugin/Makefile") CONFIG_FILES="$CONFIG_FILES appsrc/ODS-Wiki/plugin/Makefile" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
esac
done
@@ -20062,302 +30706,448 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
- trap 'as_fn_exit 1' 1 2 13 15
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
+} ||
+{
+ echo "$me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+}
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
- eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
-else
- ac_cs_awk_cr=$ac_cr
-fi
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "$CONFIG_FILES"; then
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
-{
- echo "cat >conf$$subs.awk <<_ACEOF" &&
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
-} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+vaddir!$vaddir$ac_delim
+demodir!$demodir$ac_delim
+dbdir!$dbdir$ac_delim
+htmldocdir!$htmldocdir$ac_delim
+pdfdocdir!$pdfdocdir$ac_delim
+httprootdir!$httprootdir$ac_delim
+hostingdir!$hostingdir$ac_delim
+TOP!$TOP$ac_delim
+LIBDIR!$LIBDIR$ac_delim
+BINDIR!$BINDIR$ac_delim
+INCDIR!$INCDIR$ac_delim
+CPP!$CPP$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+_ACEOF
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_set[key] = 1
- FS = ""
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field[1])
- for (i = 2; i < nfields; i++) {
- key = field[i]
- keylen = length(key)
- if (S_is_set[key]) {
- value = S[key]
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field[++i])
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
-_ACAWK
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
- cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[ ]*$//
-}'
-fi
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+SED!$SED$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+FGREP!$FGREP$ac_delim
+LD!$LD$ac_delim
+LN_S!$LN_S$ac_delim
+YACC!$YACC$ac_delim
+YFLAGS!$YFLAGS$ac_delim
+HTMLDOC!$HTMLDOC$ac_delim
+WITH_HTMLDOC_TRUE!$WITH_HTMLDOC_TRUE$ac_delim
+WITH_HTMLDOC_FALSE!$WITH_HTMLDOC_FALSE$ac_delim
+LEX!$LEX$ac_delim
+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
+LEXLIB!$LEXLIB$ac_delim
+FLEX!$FLEX$ac_delim
+GAWK!$GAWK$ac_delim
+GPERF!$GPERF$ac_delim
+PERL!$PERL$ac_delim
+PYTHON!$PYTHON$ac_delim
+RUBY!$RUBY$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+DUMPBIN!$DUMPBIN$ac_delim
+ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
+NM!$NM$ac_delim
+OBJDUMP!$OBJDUMP$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
+LIPO!$LIPO$ac_delim
+OTOOL!$OTOOL$ac_delim
+OTOOL64!$OTOOL64$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+CCDEBUG!$CCDEBUG$ac_delim
+CCWARN!$CCWARN$ac_delim
+CCDEFS!$CCDEFS$ac_delim
+CCOPT!$CCOPT$ac_delim
+CCLIBS!$CCLIBS$ac_delim
+BUILD_OPTS!$BUILD_OPTS$ac_delim
+libxml_file!$libxml_file$ac_delim
+WITH_KERBEROS_TRUE!$WITH_KERBEROS_TRUE$ac_delim
+WITH_KERBEROS_FALSE!$WITH_KERBEROS_FALSE$ac_delim
+openssl_CFLAGS!$openssl_CFLAGS$ac_delim
+openssl_LDFLAGS!$openssl_LDFLAGS$ac_delim
+WITH_LDAP_TRUE!$WITH_LDAP_TRUE$ac_delim
+WITH_LDAP_FALSE!$WITH_LDAP_FALSE$ac_delim
+openldap_CFLAGS!$openldap_CFLAGS$ac_delim
+openldap_LDFLAGS!$openldap_LDFLAGS$ac_delim
+WITH_IMSG_TRUE!$WITH_IMSG_TRUE$ac_delim
+WITH_IMSG_FALSE!$WITH_IMSG_FALSE$ac_delim
+PLSTATS!$PLSTATS$ac_delim
+WITH_PLDEBUG_TRUE!$WITH_PLDEBUG_TRUE$ac_delim
+WITH_PLDEBUG_FALSE!$WITH_PLDEBUG_FALSE$ac_delim
+HAVE_PHP5_TRUE!$HAVE_PHP5_TRUE$ac_delim
+HAVE_PHP5_FALSE!$HAVE_PHP5_FALSE$ac_delim
+php5_CFLAGS!$php5_CFLAGS$ac_delim
+php5_LDFLAGS!$php5_LDFLAGS$ac_delim
+XML2_CONFIG!$XML2_CONFIG$ac_delim
+XML_CPPFLAGS!$XML_CPPFLAGS$ac_delim
+XML_LIBS!$XML_LIBS$ac_delim
+WGET!$WGET$ac_delim
+HAVE_MONO_TRUE!$HAVE_MONO_TRUE$ac_delim
+HAVE_MONO_FALSE!$HAVE_MONO_FALSE$ac_delim
+HS_LOOKUP!$HS_LOOKUP$ac_delim
+WITH_HSL_TRUE!$WITH_HSL_TRUE$ac_delim
+WITH_HSL_FALSE!$WITH_HSL_FALSE$ac_delim
+HSL_CPPFLAGS!$HSL_CPPFLAGS$ac_delim
+HSL_LDFLAGS!$HSL_LDFLAGS$ac_delim
+HSL_LIBS!$HSL_LIBS$ac_delim
+IM_CONFIG!$IM_CONFIG$ac_delim
+WITH_IM_TRUE!$WITH_IM_TRUE$ac_delim
+WITH_IM_FALSE!$WITH_IM_FALSE$ac_delim
+IM_CPPFLAGS!$IM_CPPFLAGS$ac_delim
+IM_LDFLAGS!$IM_LDFLAGS$ac_delim
+IM_LIBS!$IM_LIBS$ac_delim
+WITH_WBXML2_TRUE!$WITH_WBXML2_TRUE$ac_delim
+WITH_WBXML2_FALSE!$WITH_WBXML2_FALSE$ac_delim
+WBXML2_CFLAGS!$WBXML2_CFLAGS$ac_delim
+WBXML2_LDFLAGS!$WBXML2_LDFLAGS$ac_delim
+WITH_PERL_TRUE!$WITH_PERL_TRUE$ac_delim
+WITH_PERL_FALSE!$WITH_PERL_FALSE$ac_delim
+PERL_CFLAGS!$PERL_CFLAGS$ac_delim
+PERL_LDFLAGS!$PERL_LDFLAGS$ac_delim
+WITH_PYTHON_TRUE!$WITH_PYTHON_TRUE$ac_delim
+WITH_PYTHON_FALSE!$WITH_PYTHON_FALSE$ac_delim
+PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim
+PYTHON_LDFLAGS!$PYTHON_LDFLAGS$ac_delim
+WITH_RUBY_TRUE!$WITH_RUBY_TRUE$ac_delim
+WITH_RUBY_FALSE!$WITH_RUBY_FALSE$ac_delim
+RUBY_CFLAGS!$RUBY_CFLAGS$ac_delim
+RUBY_LDFLAGS!$RUBY_LDFLAGS$ac_delim
+ZLIB_INC!$ZLIB_INC$ac_delim
+ZLIB_LIB!$ZLIB_LIB$ac_delim
+WITH_ZLIB_TRUE!$WITH_ZLIB_TRUE$ac_delim
+WITH_ZLIB_FALSE!$WITH_ZLIB_FALSE$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
_ACEOF
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
ac_delim='%!_!# '
-for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+BUILD_GLIB_CFLAGS!$BUILD_GLIB_CFLAGS$ac_delim
+BUILD_GLIB_LIBS!$BUILD_GLIB_LIBS$ac_delim
+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+GLIB_LIBS!$GLIB_LIBS$ac_delim
+GMODULE_CFLAGS!$GMODULE_CFLAGS$ac_delim
+GMODULE_LIBS!$GMODULE_LIBS$ac_delim
+LIBTHR!$LIBTHR$ac_delim
+WITH_PTHREADS_TRUE!$WITH_PTHREADS_TRUE$ac_delim
+WITH_PTHREADS_FALSE!$WITH_PTHREADS_FALSE$ac_delim
+LIBRDL!$LIBRDL$ac_delim
+LIBDL!$LIBDL$ac_delim
+iodbc_LDFLAGS!$iodbc_LDFLAGS$ac_delim
+WITH_IODBC_TRUE!$WITH_IODBC_TRUE$ac_delim
+WITH_IODBC_FALSE!$WITH_IODBC_FALSE$ac_delim
+WITH_JDK2_TRUE!$WITH_JDK2_TRUE$ac_delim
+WITH_JDK2_FALSE!$WITH_JDK2_FALSE$ac_delim
+ac_jdk2_path!$ac_jdk2_path$ac_delim
+WITH_JDK3_TRUE!$WITH_JDK3_TRUE$ac_delim
+WITH_JDK3_FALSE!$WITH_JDK3_FALSE$ac_delim
+ac_jdk3_path!$ac_jdk3_path$ac_delim
+WITH_JDK4_TRUE!$WITH_JDK4_TRUE$ac_delim
+WITH_JDK4_FALSE!$WITH_JDK4_FALSE$ac_delim
+ac_jdk4_path!$ac_jdk4_path$ac_delim
+java_CPPFLAGS!$java_CPPFLAGS$ac_delim
+java_LDFLAGS!$java_LDFLAGS$ac_delim
+INTEG_JDK_TRUE!$INTEG_JDK_TRUE$ac_delim
+INTEG_JDK_FALSE!$INTEG_JDK_FALSE$ac_delim
+PORT!$PORT$ac_delim
+WITH_BPEL_VAD_TRUE!$WITH_BPEL_VAD_TRUE$ac_delim
+WITH_BPEL_VAD_FALSE!$WITH_BPEL_VAD_FALSE$ac_delim
+WITH_CONDUCTOR_VAD_TRUE!$WITH_CONDUCTOR_VAD_TRUE$ac_delim
+WITH_CONDUCTOR_VAD_FALSE!$WITH_CONDUCTOR_VAD_FALSE$ac_delim
+WITH_DBPEDIA_VAD_TRUE!$WITH_DBPEDIA_VAD_TRUE$ac_delim
+WITH_DBPEDIA_VAD_FALSE!$WITH_DBPEDIA_VAD_FALSE$ac_delim
+WITH_DEMO_VAD_TRUE!$WITH_DEMO_VAD_TRUE$ac_delim
+WITH_DEMO_VAD_FALSE!$WITH_DEMO_VAD_FALSE$ac_delim
+WITH_FCT_VAD_TRUE!$WITH_FCT_VAD_TRUE$ac_delim
+WITH_FCT_VAD_FALSE!$WITH_FCT_VAD_FALSE$ac_delim
+WITH_ISPARQL_VAD_TRUE!$WITH_ISPARQL_VAD_TRUE$ac_delim
+WITH_ISPARQL_VAD_FALSE!$WITH_ISPARQL_VAD_FALSE$ac_delim
+WITH_ODS_VAD_TRUE!$WITH_ODS_VAD_TRUE$ac_delim
+WITH_ODS_VAD_FALSE!$WITH_ODS_VAD_FALSE$ac_delim
+WITH_RDB2RDF_VAD_TRUE!$WITH_RDB2RDF_VAD_TRUE$ac_delim
+WITH_RDB2RDF_VAD_FALSE!$WITH_RDB2RDF_VAD_FALSE$ac_delim
+WITH_RDFMAPPERS_VAD_TRUE!$WITH_RDFMAPPERS_VAD_TRUE$ac_delim
+WITH_RDFMAPPERS_VAD_FALSE!$WITH_RDFMAPPERS_VAD_FALSE$ac_delim
+WITH_SPARQLDEMO_VAD_TRUE!$WITH_SPARQLDEMO_VAD_TRUE$ac_delim
+WITH_SPARQLDEMO_VAD_FALSE!$WITH_SPARQLDEMO_VAD_FALSE$ac_delim
+WITH_SYNCML_VAD_TRUE!$WITH_SYNCML_VAD_TRUE$ac_delim
+WITH_SYNCML_VAD_FALSE!$WITH_SYNCML_VAD_FALSE$ac_delim
+WITH_TUTORIAL_VAD_TRUE!$WITH_TUTORIAL_VAD_TRUE$ac_delim
+WITH_TUTORIAL_VAD_FALSE!$WITH_TUTORIAL_VAD_FALSE$ac_delim
+OPSYS!$OPSYS$ac_delim
+CCPLATFORMDEFS!$CCPLATFORMDEFS$ac_delim
+AM_LDFLAGS!$AM_LDFLAGS$ac_delim
+ccincl!$ccincl$ac_delim
+srvrlibs!$srvrlibs$ac_delim
+clntlibs!$clntlibs$ac_delim
+VIRT_AM_CFLAGS!$VIRT_AM_CFLAGS$ac_delim
+SYSLIBS!$SYSLIBS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[ ]*#[ ]*define[ ][ ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- for (key in D) D_is_set[key] = 1
- FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
- line = \$ 0
- split(line, arg, " ")
- if (arg[1] == "#") {
- defundef = arg[2]
- mac1 = arg[3]
- } else {
- defundef = substr(arg[1], 2)
- mac1 = arg[2]
- }
- split(mac1, mac2, "(") #)
- macro = mac2[1]
- prefix = substr(line, 1, index(line, defundef) - 1)
- if (D_is_set[macro]) {
- # Preserve the white space surrounding the "#".
- print prefix "define", macro P[macro] D[macro]
- next
- } else {
- # Replace #undef with comments. This is necessary, for example,
- # in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
- next
- }
- }
-}
-{ print }
-_ACAWK
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
-shift
-for ac_tag
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[ ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ { (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -20376,7 +31166,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -20385,34 +31175,26 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
+ ac_file_inputs="$ac_file_inputs $ac_f"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input='Generated from '`
- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
- `' by configure.'
+ configure_input="Generated from "`IFS=:
+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
fi
- # Neutralize special characters interpreted by sed in replacement strings.
- case $configure_input in #(
- *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
- sed 's/[\\\\&|]/\\\\&/g'`;; #(
- *) ac_sed_conf_input=$configure_input;;
- esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin";;
esac
;;
esac
@@ -20422,7 +31204,42 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -20440,15 +31257,20 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
- as_dir="$ac_dir"; as_fn_mkdir_p
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -20493,12 +31315,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
esac
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
+
+case `sed -n '/datarootdir/ {
p
q
}
@@ -20506,37 +31328,36 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+/@mandir@/p
+' $ac_file_inputs` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
+s&@configure_input@&$configure_input&;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -20547,66 +31368,135 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
-
- rm -f "$ac_tmp/stdin"
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
- esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+ esac
;;
:H)
#
# CONFIG_HEADER
#
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status. If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless. But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
+ac_dB='\\)[ (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+ sed -n '
+ t rset
+ :rset
+ s/^[ ]*#[ ]*define[ ][ ]*//
+ t ok
+ d
+ :ok
+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[ #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+ # Write a here document:
+ cat >>$CONFIG_STATUS <<_ACEOF
+ # First, check the format of the line:
+ cat >"\$tmp/defines.sed" <<\\CEOF
+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*/b def
+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
+b
+:def
+_ACEOF
+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+ echo 'CEOF
+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+ grep . conftest.tail >/dev/null || break
+ rm -f conftest.defines
+ mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+ echo "/* $configure_input */" >"$tmp/config.h"
+ cat "$ac_result" >>"$tmp/config.h"
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
else
- rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ rm -f $ac_file
+ mv "$tmp/config.h" $ac_file
fi
else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ echo "/* $configure_input */"
+ cat "$ac_result"
fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
+ rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $ac_file | $ac_file:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$_am_arg" : 'X\(//\)[^/]' \| \
- X"$_am_arg" : 'X\(//\)$' \| \
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X$ac_file : 'X\(//\)[^/]' \| \
+ X$ac_file : 'X\(//\)$' \| \
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -20626,40 +31516,30 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -20677,33 +31557,68 @@ $as_echo X"$mf" |
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
+echo X"$file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -20721,12 +31636,16 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+ test -d "$as_dir" && break
done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
done
-}
+done
;;
"libtool":C)
@@ -20737,18 +31656,20 @@ $as_echo X"$file" |
fi
cfgfile="${ofile}T"
- trap "$RM \"$cfgfile\"; exit 1" 1 2 15
- $RM "$cfgfile"
+ trap "$RM -f \"$cfgfile\"; exit 1" 1 2 15
+ $RM -f "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# `$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 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -20795,6 +31716,12 @@ 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
@@ -20845,10 +31772,6 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
@@ -20870,6 +31793,9 @@ 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
@@ -20891,12 +31817,6 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
# 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
@@ -20959,6 +31879,9 @@ 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
@@ -20998,6 +31921,10 @@ 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
@@ -21257,7 +32184,7 @@ _LT_EOF
func_dirname ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
@@ -21268,7 +32195,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
}
@@ -21281,10 +32208,8 @@ func_basename ()
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}\$%%"`;;
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
esac
}
@@ -21295,20 +32220,20 @@ 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_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
}
# func_lo2o object
func_lo2o ()
{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
}
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
}
# func_arith arithmetic-term...
@@ -21370,13 +32295,11 @@ _LT_EOF
done # for ac_tag
-as_fn_exit 0
+{ (exit 0); exit 0; }
_ACEOF
+chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
-test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -21396,11 +32319,7 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ $ac_cs_success || { (exit 1); exit 1; }
fi
diff --git a/configure.in b/configure.in
index 06741d1..eeb19cb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
AC_PREREQ(2.59)
-AC_REVISION($Id: configure.in,v 1.262.2.46 2011/10/28 23:28:08 source Exp $)
+AC_REVISION($Id$)
#
# configure.in
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
@@ -30,7 +30,7 @@ AC_REVISION($Id: configure.in,v 1.262.2.46 2011/10/28 23:28:08 source Exp $)
##########################################################################
AC_INIT([Virtuoso Open Source Edition],
- [6.1.4],
+ [6.1.6],
[vos.admin at openlinksw.com],
[virtuoso-opensource])
AC_CONFIG_SRCDIR([libsrc/Dk.h])
@@ -200,6 +200,23 @@ case ${VIRTUOSO_LAYOUT} in
hostingdir=$libdir/virtuoso/hosting
;;
+ [[Oo]][[Pp]][[Ee]][[Nn]][[Ss]][[Uu]][[Ss]][[Ee]]) # openSUSE
+ virtuoso_layout=openSUSE
+ if test "x$prefix" = "xNONE"
+ then
+ prefix=/usr
+ localstatedir=/var
+ fi
+ vaddir=$datadir/virtuoso/vad
+ docdir=$datadir/doc/packages/virtuoso
+ htmldocdir=$datadir/doc/packages/virtuoso/html
+ pdfdocdir=$datadir/doc/packages/virtuoso/pdf
+ demodir=$localstatedir/lib/virtuoso/demo
+ dbdir=$localstatedir/lib/virtuoso/db
+ httprootdir=$localstatedir/lib/virtuoso/vsp
+ hostingdir=$libdir/virtuoso/hosting
+ ;;
+
[[Ff]][[Rr]][[Ee]][[Ee]][[Bb]][[Ss]][[Dd]]) # FreeBSD
virtuoso_layout=FreeBSD
if test "x$prefix" = "xNONE"
@@ -2231,6 +2248,19 @@ 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-dbpedia-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
@@ -2296,6 +2326,19 @@ AC_HELP_STRING([--disable-rdfmappers-vad], [disable Sparql Demo vad package])dnl
[ with_rdfmappers_vad="yes" ]
)
+AC_ARG_ENABLE(rdb2rdf-vad,
+AC_HELP_STRING([--enable-rdb2rdf-vad], [enable Rdb2Rdf vad package (default)])
+AC_HELP_STRING([--disable-rdb2rdf-vad], [disable Rdb2Rdf vad package])dnl
+], [
+ case "${enableval}" in
+ yes) with_rdb2rdf_vad="yes";;
+ no) with_rdb2rdf_vad="no";;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-rdb2rdf-vad) ;;
+ esac
+ ],
+ [ with_rdb2rdf_vad="yes" ]
+)
+
AC_ARG_ENABLE(sparqldemo-vad,
AC_HELP_STRING([--enable-sparqldemo-vad], [enable Sparql Demo vad package (default)])
AC_HELP_STRING([--disable-sparqldemo-vad], [disable Sparql Demo vad package])dnl
@@ -2352,10 +2395,12 @@ 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"
with_ods_vad="no"
+ with_rdb2rdf_vad="no"
with_rdfmappers_vad="no"
with_sparqldemo_vad="no"
with_syncml_vad="no"
@@ -2364,10 +2409,12 @@ 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")
AM_CONDITIONAL(WITH_ODS_VAD, test "x$with_ods_vad" = "xyes")
+AM_CONDITIONAL(WITH_RDB2RDF_VAD, test "x$with_rdb2rdf_vad" = "xyes")
AM_CONDITIONAL(WITH_RDFMAPPERS_VAD, test "x$with_rdfmappers_vad" = "xyes")
AM_CONDITIONAL(WITH_SPARQLDEMO_VAD, test "x$with_sparqldemo_vad" = "xyes")
AM_CONDITIONAL(WITH_SYNCML_VAD, test "x$with_syncml_vad" = "xyes")
@@ -2589,6 +2636,7 @@ 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
@@ -2604,6 +2652,7 @@ AC_CONFIG_FILES([
binsrc/mono/Makefile
binsrc/oat/Makefile
binsrc/rdf_mappers/Makefile
+ binsrc/rdb2rdf/Makefile
binsrc/redland/Makefile
binsrc/samples/demo/Makefile
binsrc/samples/hslookup/Makefile
diff --git a/docsrc/Makefile.am b/docsrc/Makefile.am
index 540595e..1ea7fe8 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/Makefile.in b/docsrc/Makefile.in
index 5e2e361..f0a4722 100644
--- a/docsrc/Makefile.in
+++ b/docsrc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -16,9 +15,8 @@
@SET_MAKE@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -48,7 +46,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -60,38 +57,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -179,7 +148,6 @@ 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@
@@ -263,7 +231,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -284,7 +251,6 @@ 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@
@@ -293,7 +259,7 @@ vaddir = @vaddir@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -328,14 +294,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -353,7 +319,6 @@ $(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
@@ -368,7 +333,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -385,7 +350,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -393,7 +358,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -419,16 +384,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -436,14 +401,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -455,43 +420,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -512,44 +473,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -579,7 +525,6 @@ clean-generic:
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"
@@ -598,8 +543,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -608,28 +551,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -650,8 +583,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -667,7 +600,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
-
# 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/docsrc/chm/Makefile.am b/docsrc/chm/Makefile.am
index a5c562d..5691533 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/chm/Makefile.in b/docsrc/chm/Makefile.in
index c9d45f5..612bec6 100644
--- a/docsrc/chm/Makefile.in
+++ b/docsrc/chm/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -286,14 +280,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/chm/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/chm/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/chm/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/chm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -311,7 +305,6 @@ $(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
@@ -341,17 +334,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -379,7 +368,6 @@ clean-generic:
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"
@@ -398,8 +386,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -408,28 +394,18 @@ install-data-am:
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
@@ -463,7 +439,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/docwiki/Makefile.am b/docsrc/docwiki/Makefile.am
index 3194e16..c198181 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/docwiki/Makefile.in b/docsrc/docwiki/Makefile.in
index 61ae7e8..0c3203d 100644
--- a/docsrc/docwiki/Makefile.in
+++ b/docsrc/docwiki/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -289,14 +283,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/docwiki/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/docwiki/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/docwiki/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/docwiki/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -314,7 +308,6 @@ $(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
@@ -344,17 +337,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -382,7 +371,6 @@ clean-generic:
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"
@@ -401,8 +389,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -411,28 +397,18 @@ install-data-am:
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
@@ -466,7 +442,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/docwiki/wiki.sql b/docsrc/docwiki/wiki.sql
index 676f21f..307fe36 100644
--- a/docsrc/docwiki/wiki.sql
+++ b/docsrc/docwiki/wiki.sql
@@ -1,10 +1,10 @@
--
--- $Id: wiki.sql,v 1.2 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/docsrc/docwiki/wiki.xsl b/docsrc/docwiki/wiki.xsl
index ed8b77c..3ebdfe5 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/docwiki/wiki_contents.xsl b/docsrc/docwiki/wiki_contents.xsl
index e832bc3..ca96a54 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/html_virt/Makefile.am b/docsrc/html_virt/Makefile.am
index 50898f5..ead5283 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/html_virt/Makefile.in b/docsrc/html_virt/Makefile.in
index cb29ff8..739ebe9 100644
--- a/docsrc/html_virt/Makefile.in
+++ b/docsrc/html_virt/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -277,14 +271,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/html_virt/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/html_virt/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/html_virt/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/html_virt/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -302,7 +296,6 @@ $(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
@@ -332,17 +325,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -371,7 +360,6 @@ clean-generic:
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"
@@ -390,8 +378,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -400,28 +386,18 @@ install-data-am:
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
@@ -455,7 +431,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/images/Makefile.am b/docsrc/images/Makefile.am
index 801902b..f1bfc5d 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/images/Makefile.in b/docsrc/images/Makefile.in
index 388df79..f622482 100644
--- a/docsrc/images/Makefile.in
+++ b/docsrc/images/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -299,14 +293,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/images/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/images/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/images/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -324,7 +318,6 @@ $(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
@@ -354,17 +347,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -392,7 +381,6 @@ clean-generic:
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"
@@ -411,8 +399,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -421,28 +407,18 @@ install-data-am:
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
@@ -476,7 +452,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/images/rdf18.png b/docsrc/images/rdf18.png
new file mode 100644
index 0000000..f811f08
Binary files /dev/null and b/docsrc/images/rdf18.png differ
diff --git a/docsrc/images/rdf19.png b/docsrc/images/rdf19.png
new file mode 100644
index 0000000..149aa2b
Binary files /dev/null and b/docsrc/images/rdf19.png differ
diff --git a/docsrc/images/ui/ag1.png b/docsrc/images/ui/ag1.png
new file mode 100644
index 0000000..42bd150
Binary files /dev/null and b/docsrc/images/ui/ag1.png differ
diff --git a/docsrc/images/ui/ag2.png b/docsrc/images/ui/ag2.png
new file mode 100644
index 0000000..55e7243
Binary files /dev/null and b/docsrc/images/ui/ag2.png differ
diff --git a/docsrc/images/ui/ag3.png b/docsrc/images/ui/ag3.png
new file mode 100644
index 0000000..0f2339a
Binary files /dev/null and b/docsrc/images/ui/ag3.png differ
diff --git a/docsrc/images/ui/auth1.png b/docsrc/images/ui/auth1.png
new file mode 100644
index 0000000..0901d22
Binary files /dev/null and b/docsrc/images/ui/auth1.png differ
diff --git a/docsrc/images/ui/auth3.png b/docsrc/images/ui/auth3.png
new file mode 100644
index 0000000..7c8a4cd
Binary files /dev/null and b/docsrc/images/ui/auth3.png differ
diff --git a/docsrc/images/ui/auth4.png b/docsrc/images/ui/auth4.png
new file mode 100644
index 0000000..e176a3e
Binary files /dev/null and b/docsrc/images/ui/auth4.png differ
diff --git a/docsrc/images/ui/auth5.png b/docsrc/images/ui/auth5.png
new file mode 100644
index 0000000..f60571e
Binary files /dev/null and b/docsrc/images/ui/auth5.png differ
diff --git a/docsrc/images/ui/auth6.png b/docsrc/images/ui/auth6.png
new file mode 100644
index 0000000..56c0155
Binary files /dev/null and b/docsrc/images/ui/auth6.png differ
diff --git a/docsrc/images/ui/cfolder.png b/docsrc/images/ui/cfolder.png
new file mode 100644
index 0000000..425eac6
Binary files /dev/null and b/docsrc/images/ui/cfolder.png differ
diff --git a/docsrc/images/ui/cr10.png b/docsrc/images/ui/cr10.png
new file mode 100644
index 0000000..a835a69
Binary files /dev/null and b/docsrc/images/ui/cr10.png differ
diff --git a/docsrc/images/ui/cr11b.png b/docsrc/images/ui/cr11b.png
new file mode 100644
index 0000000..5547edf
Binary files /dev/null and b/docsrc/images/ui/cr11b.png differ
diff --git a/docsrc/images/ui/cr12a.png b/docsrc/images/ui/cr12a.png
new file mode 100644
index 0000000..cabbe6a
Binary files /dev/null and b/docsrc/images/ui/cr12a.png differ
diff --git a/docsrc/images/ui/cr17a.png b/docsrc/images/ui/cr17a.png
new file mode 100644
index 0000000..b33b95c
Binary files /dev/null and b/docsrc/images/ui/cr17a.png differ
diff --git a/docsrc/images/ui/cr4.png b/docsrc/images/ui/cr4.png
new file mode 100644
index 0000000..29c0c9b
Binary files /dev/null and b/docsrc/images/ui/cr4.png differ
diff --git a/docsrc/images/ui/cr5.png b/docsrc/images/ui/cr5.png
new file mode 100644
index 0000000..db2a6c3
Binary files /dev/null and b/docsrc/images/ui/cr5.png differ
diff --git a/docsrc/images/ui/cr6.png b/docsrc/images/ui/cr6.png
new file mode 100644
index 0000000..fe3467a
Binary files /dev/null and b/docsrc/images/ui/cr6.png differ
diff --git a/docsrc/images/ui/cr7.png b/docsrc/images/ui/cr7.png
new file mode 100644
index 0000000..8895d1d
Binary files /dev/null and b/docsrc/images/ui/cr7.png differ
diff --git a/docsrc/images/ui/cr8.png b/docsrc/images/ui/cr8.png
new file mode 100644
index 0000000..229a2ee
Binary files /dev/null and b/docsrc/images/ui/cr8.png differ
diff --git a/docsrc/images/ui/cr9.png b/docsrc/images/ui/cr9.png
new file mode 100644
index 0000000..d861df7
Binary files /dev/null and b/docsrc/images/ui/cr9.png differ
diff --git a/docsrc/images/ui/cra1.png b/docsrc/images/ui/cra1.png
new file mode 100644
index 0000000..480d238
Binary files /dev/null and b/docsrc/images/ui/cra1.png differ
diff --git a/docsrc/images/ui/cra10.png b/docsrc/images/ui/cra10.png
new file mode 100644
index 0000000..87ed24a
Binary files /dev/null and b/docsrc/images/ui/cra10.png differ
diff --git a/docsrc/images/ui/cra11.png b/docsrc/images/ui/cra11.png
new file mode 100644
index 0000000..07df063
Binary files /dev/null and b/docsrc/images/ui/cra11.png differ
diff --git a/docsrc/images/ui/cra12.png b/docsrc/images/ui/cra12.png
new file mode 100644
index 0000000..021caaa
Binary files /dev/null and b/docsrc/images/ui/cra12.png differ
diff --git a/docsrc/images/ui/cra13.png b/docsrc/images/ui/cra13.png
new file mode 100644
index 0000000..2f2d00f
Binary files /dev/null and b/docsrc/images/ui/cra13.png differ
diff --git a/docsrc/images/ui/cra14.png b/docsrc/images/ui/cra14.png
new file mode 100644
index 0000000..85701d2
Binary files /dev/null and b/docsrc/images/ui/cra14.png differ
diff --git a/docsrc/images/ui/cra15.png b/docsrc/images/ui/cra15.png
new file mode 100644
index 0000000..c432212
Binary files /dev/null and b/docsrc/images/ui/cra15.png differ
diff --git a/docsrc/images/ui/cra2.png b/docsrc/images/ui/cra2.png
new file mode 100644
index 0000000..d28e1c5
Binary files /dev/null and b/docsrc/images/ui/cra2.png differ
diff --git a/docsrc/images/ui/cra3.png b/docsrc/images/ui/cra3.png
new file mode 100644
index 0000000..2df8c86
Binary files /dev/null and b/docsrc/images/ui/cra3.png differ
diff --git a/docsrc/images/ui/cra4.png b/docsrc/images/ui/cra4.png
new file mode 100644
index 0000000..2c9cb36
Binary files /dev/null and b/docsrc/images/ui/cra4.png differ
diff --git a/docsrc/images/ui/cra5.png b/docsrc/images/ui/cra5.png
new file mode 100644
index 0000000..69f4306
Binary files /dev/null and b/docsrc/images/ui/cra5.png differ
diff --git a/docsrc/images/ui/cra6.png b/docsrc/images/ui/cra6.png
new file mode 100644
index 0000000..630bd39
Binary files /dev/null and b/docsrc/images/ui/cra6.png differ
diff --git a/docsrc/images/ui/cra7.png b/docsrc/images/ui/cra7.png
new file mode 100644
index 0000000..1f7c6c8
Binary files /dev/null and b/docsrc/images/ui/cra7.png differ
diff --git a/docsrc/images/ui/cra8.png b/docsrc/images/ui/cra8.png
new file mode 100644
index 0000000..07df063
Binary files /dev/null and b/docsrc/images/ui/cra8.png differ
diff --git a/docsrc/images/ui/cra9.png b/docsrc/images/ui/cra9.png
new file mode 100644
index 0000000..fe5ec4e
Binary files /dev/null and b/docsrc/images/ui/cra9.png differ
diff --git a/docsrc/images/ui/editres.png b/docsrc/images/ui/editres.png
new file mode 100644
index 0000000..df3bc82
Binary files /dev/null and b/docsrc/images/ui/editres.png differ
diff --git a/docsrc/images/ui/f1.png b/docsrc/images/ui/f1.png
new file mode 100644
index 0000000..8c49fb9
Binary files /dev/null and b/docsrc/images/ui/f1.png differ
diff --git a/docsrc/images/ui/f10.png b/docsrc/images/ui/f10.png
new file mode 100644
index 0000000..b17c4fb
Binary files /dev/null and b/docsrc/images/ui/f10.png differ
diff --git a/docsrc/images/ui/f11.png b/docsrc/images/ui/f11.png
new file mode 100644
index 0000000..cfaa037
Binary files /dev/null and b/docsrc/images/ui/f11.png differ
diff --git a/docsrc/images/ui/f12.png b/docsrc/images/ui/f12.png
new file mode 100644
index 0000000..12098e7
Binary files /dev/null and b/docsrc/images/ui/f12.png differ
diff --git a/docsrc/images/ui/f13.png b/docsrc/images/ui/f13.png
new file mode 100644
index 0000000..971e796
Binary files /dev/null and b/docsrc/images/ui/f13.png differ
diff --git a/docsrc/images/ui/f14.png b/docsrc/images/ui/f14.png
new file mode 100644
index 0000000..13e3a81
Binary files /dev/null and b/docsrc/images/ui/f14.png differ
diff --git a/docsrc/images/ui/f15.png b/docsrc/images/ui/f15.png
new file mode 100644
index 0000000..f99fffd
Binary files /dev/null and b/docsrc/images/ui/f15.png differ
diff --git a/docsrc/images/ui/f16.png b/docsrc/images/ui/f16.png
new file mode 100644
index 0000000..6c1a4e9
Binary files /dev/null and b/docsrc/images/ui/f16.png differ
diff --git a/docsrc/images/ui/f17.png b/docsrc/images/ui/f17.png
new file mode 100644
index 0000000..42b601e
Binary files /dev/null and b/docsrc/images/ui/f17.png differ
diff --git a/docsrc/images/ui/f18.png b/docsrc/images/ui/f18.png
new file mode 100644
index 0000000..74b069e
Binary files /dev/null and b/docsrc/images/ui/f18.png differ
diff --git a/docsrc/images/ui/f19.png b/docsrc/images/ui/f19.png
new file mode 100644
index 0000000..786960f
Binary files /dev/null and b/docsrc/images/ui/f19.png differ
diff --git a/docsrc/images/ui/f2.png b/docsrc/images/ui/f2.png
new file mode 100644
index 0000000..717781e
Binary files /dev/null and b/docsrc/images/ui/f2.png differ
diff --git a/docsrc/images/ui/f20.png b/docsrc/images/ui/f20.png
new file mode 100644
index 0000000..c1eb760
Binary files /dev/null and b/docsrc/images/ui/f20.png differ
diff --git a/docsrc/images/ui/f21.png b/docsrc/images/ui/f21.png
new file mode 100644
index 0000000..60bed2f
Binary files /dev/null and b/docsrc/images/ui/f21.png differ
diff --git a/docsrc/images/ui/f22.png b/docsrc/images/ui/f22.png
new file mode 100644
index 0000000..194f8a5
Binary files /dev/null and b/docsrc/images/ui/f22.png differ
diff --git a/docsrc/images/ui/f23.png b/docsrc/images/ui/f23.png
new file mode 100644
index 0000000..8821a46
Binary files /dev/null and b/docsrc/images/ui/f23.png differ
diff --git a/docsrc/images/ui/f24.png b/docsrc/images/ui/f24.png
new file mode 100644
index 0000000..60bed2f
Binary files /dev/null and b/docsrc/images/ui/f24.png differ
diff --git a/docsrc/images/ui/f3.png b/docsrc/images/ui/f3.png
new file mode 100644
index 0000000..f9db530
Binary files /dev/null and b/docsrc/images/ui/f3.png differ
diff --git a/docsrc/images/ui/f4.png b/docsrc/images/ui/f4.png
new file mode 100644
index 0000000..bef6b69
Binary files /dev/null and b/docsrc/images/ui/f4.png differ
diff --git a/docsrc/images/ui/f5.png b/docsrc/images/ui/f5.png
new file mode 100644
index 0000000..56ea362
Binary files /dev/null and b/docsrc/images/ui/f5.png differ
diff --git a/docsrc/images/ui/f6.png b/docsrc/images/ui/f6.png
new file mode 100644
index 0000000..710b93b
Binary files /dev/null and b/docsrc/images/ui/f6.png differ
diff --git a/docsrc/images/ui/f7.png b/docsrc/images/ui/f7.png
new file mode 100644
index 0000000..e0d459c
Binary files /dev/null and b/docsrc/images/ui/f7.png differ
diff --git a/docsrc/images/ui/f8.png b/docsrc/images/ui/f8.png
new file mode 100644
index 0000000..64360d4
Binary files /dev/null and b/docsrc/images/ui/f8.png differ
diff --git a/docsrc/images/ui/f9.png b/docsrc/images/ui/f9.png
new file mode 100644
index 0000000..d841ba9
Binary files /dev/null and b/docsrc/images/ui/f9.png differ
diff --git a/docsrc/images/ui/fb1.png b/docsrc/images/ui/fb1.png
new file mode 100644
index 0000000..98adbe7
Binary files /dev/null and b/docsrc/images/ui/fb1.png differ
diff --git a/docsrc/images/ui/fb10.png b/docsrc/images/ui/fb10.png
new file mode 100644
index 0000000..76faf4f
Binary files /dev/null and b/docsrc/images/ui/fb10.png differ
diff --git a/docsrc/images/ui/fb11.png b/docsrc/images/ui/fb11.png
new file mode 100644
index 0000000..fd07a29
Binary files /dev/null and b/docsrc/images/ui/fb11.png differ
diff --git a/docsrc/images/ui/fb12.png b/docsrc/images/ui/fb12.png
new file mode 100644
index 0000000..02f8994
Binary files /dev/null and b/docsrc/images/ui/fb12.png differ
diff --git a/docsrc/images/ui/fb13.png b/docsrc/images/ui/fb13.png
new file mode 100644
index 0000000..1a02ad6
Binary files /dev/null and b/docsrc/images/ui/fb13.png differ
diff --git a/docsrc/images/ui/fb14.png b/docsrc/images/ui/fb14.png
new file mode 100644
index 0000000..db928e0
Binary files /dev/null and b/docsrc/images/ui/fb14.png differ
diff --git a/docsrc/images/ui/fb15.png b/docsrc/images/ui/fb15.png
new file mode 100644
index 0000000..ace1be5
Binary files /dev/null and b/docsrc/images/ui/fb15.png differ
diff --git a/docsrc/images/ui/fb16.png b/docsrc/images/ui/fb16.png
new file mode 100644
index 0000000..e143da6
Binary files /dev/null and b/docsrc/images/ui/fb16.png differ
diff --git a/docsrc/images/ui/fb17.png b/docsrc/images/ui/fb17.png
new file mode 100644
index 0000000..2bdaa46
Binary files /dev/null and b/docsrc/images/ui/fb17.png differ
diff --git a/docsrc/images/ui/fb18.png b/docsrc/images/ui/fb18.png
new file mode 100644
index 0000000..042b22d
Binary files /dev/null and b/docsrc/images/ui/fb18.png differ
diff --git a/docsrc/images/ui/fb19.png b/docsrc/images/ui/fb19.png
new file mode 100644
index 0000000..4dde589
Binary files /dev/null and b/docsrc/images/ui/fb19.png differ
diff --git a/docsrc/images/ui/fb2.png b/docsrc/images/ui/fb2.png
new file mode 100644
index 0000000..a357375
Binary files /dev/null and b/docsrc/images/ui/fb2.png differ
diff --git a/docsrc/images/ui/fb20.png b/docsrc/images/ui/fb20.png
new file mode 100644
index 0000000..a09c04a
Binary files /dev/null and b/docsrc/images/ui/fb20.png differ
diff --git a/docsrc/images/ui/fb21.png b/docsrc/images/ui/fb21.png
new file mode 100644
index 0000000..2558a26
Binary files /dev/null and b/docsrc/images/ui/fb21.png differ
diff --git a/docsrc/images/ui/fb22.png b/docsrc/images/ui/fb22.png
new file mode 100644
index 0000000..bb312c9
Binary files /dev/null and b/docsrc/images/ui/fb22.png differ
diff --git a/docsrc/images/ui/fb23.png b/docsrc/images/ui/fb23.png
new file mode 100644
index 0000000..47e2347
Binary files /dev/null and b/docsrc/images/ui/fb23.png differ
diff --git a/docsrc/images/ui/fb24.png b/docsrc/images/ui/fb24.png
new file mode 100644
index 0000000..591469e
Binary files /dev/null and b/docsrc/images/ui/fb24.png differ
diff --git a/docsrc/images/ui/fb25.png b/docsrc/images/ui/fb25.png
new file mode 100644
index 0000000..b1659a7
Binary files /dev/null and b/docsrc/images/ui/fb25.png differ
diff --git a/docsrc/images/ui/fb26.png b/docsrc/images/ui/fb26.png
new file mode 100644
index 0000000..b8682ac
Binary files /dev/null and b/docsrc/images/ui/fb26.png differ
diff --git a/docsrc/images/ui/fb27.png b/docsrc/images/ui/fb27.png
new file mode 100644
index 0000000..5615e19
Binary files /dev/null and b/docsrc/images/ui/fb27.png differ
diff --git a/docsrc/images/ui/fb28.png b/docsrc/images/ui/fb28.png
new file mode 100644
index 0000000..5b3c949
Binary files /dev/null and b/docsrc/images/ui/fb28.png differ
diff --git a/docsrc/images/ui/fb29.png b/docsrc/images/ui/fb29.png
new file mode 100644
index 0000000..8a52488
Binary files /dev/null and b/docsrc/images/ui/fb29.png differ
diff --git a/docsrc/images/ui/fb3.png b/docsrc/images/ui/fb3.png
new file mode 100644
index 0000000..ee47e73
Binary files /dev/null and b/docsrc/images/ui/fb3.png differ
diff --git a/docsrc/images/ui/fb30.png b/docsrc/images/ui/fb30.png
new file mode 100644
index 0000000..741abf1
Binary files /dev/null and b/docsrc/images/ui/fb30.png differ
diff --git a/docsrc/images/ui/fb31.png b/docsrc/images/ui/fb31.png
new file mode 100644
index 0000000..9e6a143
Binary files /dev/null and b/docsrc/images/ui/fb31.png differ
diff --git a/docsrc/images/ui/fb32.png b/docsrc/images/ui/fb32.png
new file mode 100644
index 0000000..f51a64f
Binary files /dev/null and b/docsrc/images/ui/fb32.png differ
diff --git a/docsrc/images/ui/fb33.png b/docsrc/images/ui/fb33.png
new file mode 100644
index 0000000..c259322
Binary files /dev/null and b/docsrc/images/ui/fb33.png differ
diff --git a/docsrc/images/ui/fb34.png b/docsrc/images/ui/fb34.png
new file mode 100644
index 0000000..21f8229
Binary files /dev/null and b/docsrc/images/ui/fb34.png differ
diff --git a/docsrc/images/ui/fb35.png b/docsrc/images/ui/fb35.png
new file mode 100644
index 0000000..68a363d
Binary files /dev/null and b/docsrc/images/ui/fb35.png differ
diff --git a/docsrc/images/ui/fb36.png b/docsrc/images/ui/fb36.png
new file mode 100644
index 0000000..139d14d
Binary files /dev/null and b/docsrc/images/ui/fb36.png differ
diff --git a/docsrc/images/ui/fb37.png b/docsrc/images/ui/fb37.png
new file mode 100644
index 0000000..363d2c6
Binary files /dev/null and b/docsrc/images/ui/fb37.png differ
diff --git a/docsrc/images/ui/fb38.png b/docsrc/images/ui/fb38.png
new file mode 100644
index 0000000..8808595
Binary files /dev/null and b/docsrc/images/ui/fb38.png differ
diff --git a/docsrc/images/ui/fb4.png b/docsrc/images/ui/fb4.png
new file mode 100644
index 0000000..08a0a00
Binary files /dev/null and b/docsrc/images/ui/fb4.png differ
diff --git a/docsrc/images/ui/fb5.png b/docsrc/images/ui/fb5.png
new file mode 100644
index 0000000..3594a10
Binary files /dev/null and b/docsrc/images/ui/fb5.png differ
diff --git a/docsrc/images/ui/fb6.png b/docsrc/images/ui/fb6.png
new file mode 100644
index 0000000..f4fbba3
Binary files /dev/null and b/docsrc/images/ui/fb6.png differ
diff --git a/docsrc/images/ui/fb7.png b/docsrc/images/ui/fb7.png
new file mode 100644
index 0000000..66a7ecb
Binary files /dev/null and b/docsrc/images/ui/fb7.png differ
diff --git a/docsrc/images/ui/fb8.png b/docsrc/images/ui/fb8.png
new file mode 100644
index 0000000..ad78594
Binary files /dev/null and b/docsrc/images/ui/fb8.png differ
diff --git a/docsrc/images/ui/fb9.png b/docsrc/images/ui/fb9.png
new file mode 100644
index 0000000..023fea8
Binary files /dev/null and b/docsrc/images/ui/fb9.png differ
diff --git a/docsrc/images/ui/lock_16.png b/docsrc/images/ui/lock_16.png
new file mode 100644
index 0000000..593e884
Binary files /dev/null and b/docsrc/images/ui/lock_16.png differ
diff --git a/docsrc/images/ui/m36a.png b/docsrc/images/ui/m36a.png
new file mode 100644
index 0000000..179ec18
Binary files /dev/null and b/docsrc/images/ui/m36a.png differ
diff --git a/docsrc/images/ui/meditres.png b/docsrc/images/ui/meditres.png
new file mode 100644
index 0000000..eaad678
Binary files /dev/null and b/docsrc/images/ui/meditres.png differ
diff --git a/docsrc/images/ui/meditres2.png b/docsrc/images/ui/meditres2.png
new file mode 100644
index 0000000..b23f055
Binary files /dev/null and b/docsrc/images/ui/meditres2.png differ
diff --git a/docsrc/images/ui/scp1.png b/docsrc/images/ui/scp1.png
new file mode 100644
index 0000000..aea4949
Binary files /dev/null and b/docsrc/images/ui/scp1.png differ
diff --git a/docsrc/images/ui/scp10.png b/docsrc/images/ui/scp10.png
new file mode 100644
index 0000000..5fb4600
Binary files /dev/null and b/docsrc/images/ui/scp10.png differ
diff --git a/docsrc/images/ui/scp11.png b/docsrc/images/ui/scp11.png
new file mode 100644
index 0000000..d114d1e
Binary files /dev/null and b/docsrc/images/ui/scp11.png differ
diff --git a/docsrc/images/ui/scp12.png b/docsrc/images/ui/scp12.png
new file mode 100644
index 0000000..6406aae
Binary files /dev/null and b/docsrc/images/ui/scp12.png differ
diff --git a/docsrc/images/ui/scp13.png b/docsrc/images/ui/scp13.png
new file mode 100644
index 0000000..642098b
Binary files /dev/null and b/docsrc/images/ui/scp13.png differ
diff --git a/docsrc/images/ui/scp14.png b/docsrc/images/ui/scp14.png
new file mode 100644
index 0000000..3d6eeb8
Binary files /dev/null and b/docsrc/images/ui/scp14.png differ
diff --git a/docsrc/images/ui/scp2.png b/docsrc/images/ui/scp2.png
new file mode 100644
index 0000000..2786a64
Binary files /dev/null and b/docsrc/images/ui/scp2.png differ
diff --git a/docsrc/images/ui/scp3.png b/docsrc/images/ui/scp3.png
new file mode 100644
index 0000000..c22de5b
Binary files /dev/null and b/docsrc/images/ui/scp3.png differ
diff --git a/docsrc/images/ui/scp4.png b/docsrc/images/ui/scp4.png
new file mode 100644
index 0000000..9744cde
Binary files /dev/null and b/docsrc/images/ui/scp4.png differ
diff --git a/docsrc/images/ui/scp5.png b/docsrc/images/ui/scp5.png
new file mode 100644
index 0000000..2aeca02
Binary files /dev/null and b/docsrc/images/ui/scp5.png differ
diff --git a/docsrc/images/ui/scp6.png b/docsrc/images/ui/scp6.png
new file mode 100644
index 0000000..f1f37ca
Binary files /dev/null and b/docsrc/images/ui/scp6.png differ
diff --git a/docsrc/images/ui/scp7.png b/docsrc/images/ui/scp7.png
new file mode 100644
index 0000000..9f512ed
Binary files /dev/null and b/docsrc/images/ui/scp7.png differ
diff --git a/docsrc/images/ui/scp8.png b/docsrc/images/ui/scp8.png
new file mode 100644
index 0000000..5c5a0c6
Binary files /dev/null and b/docsrc/images/ui/scp8.png differ
diff --git a/docsrc/images/ui/scp9.png b/docsrc/images/ui/scp9.png
new file mode 100644
index 0000000..0db820d
Binary files /dev/null and b/docsrc/images/ui/scp9.png differ
diff --git a/docsrc/images/ui/si1.png b/docsrc/images/ui/si1.png
new file mode 100644
index 0000000..0901d22
Binary files /dev/null and b/docsrc/images/ui/si1.png differ
diff --git a/docsrc/images/ui/si2.png b/docsrc/images/ui/si2.png
new file mode 100644
index 0000000..813d4c7
Binary files /dev/null and b/docsrc/images/ui/si2.png differ
diff --git a/docsrc/images/ui/si3.png b/docsrc/images/ui/si3.png
new file mode 100644
index 0000000..10a8b35
Binary files /dev/null and b/docsrc/images/ui/si3.png differ
diff --git a/docsrc/images/ui/si4.png b/docsrc/images/ui/si4.png
new file mode 100644
index 0000000..71e3aaa
Binary files /dev/null and b/docsrc/images/ui/si4.png differ
diff --git a/docsrc/images/ui/si5.png b/docsrc/images/ui/si5.png
new file mode 100644
index 0000000..56c0155
Binary files /dev/null and b/docsrc/images/ui/si5.png differ
diff --git a/docsrc/images/ui/si6.png b/docsrc/images/ui/si6.png
new file mode 100644
index 0000000..f7c4667
Binary files /dev/null and b/docsrc/images/ui/si6.png differ
diff --git a/docsrc/images/ui/si7.png b/docsrc/images/ui/si7.png
new file mode 100644
index 0000000..9ab7b6c
Binary files /dev/null and b/docsrc/images/ui/si7.png differ
diff --git a/docsrc/images/ui/sink1.png b/docsrc/images/ui/sink1.png
new file mode 100644
index 0000000..be318b2
Binary files /dev/null and b/docsrc/images/ui/sink1.png differ
diff --git a/docsrc/images/ui/sink2.png b/docsrc/images/ui/sink2.png
new file mode 100644
index 0000000..14ffbda
Binary files /dev/null and b/docsrc/images/ui/sink2.png differ
diff --git a/docsrc/images/ui/sink3.png b/docsrc/images/ui/sink3.png
new file mode 100644
index 0000000..63372e9
Binary files /dev/null and b/docsrc/images/ui/sink3.png differ
diff --git a/docsrc/images/ui/sink4.png b/docsrc/images/ui/sink4.png
new file mode 100644
index 0000000..83b2009
Binary files /dev/null and b/docsrc/images/ui/sink4.png differ
diff --git a/docsrc/images/ui/so1.png b/docsrc/images/ui/so1.png
new file mode 100644
index 0000000..bd2d9d1
Binary files /dev/null and b/docsrc/images/ui/so1.png differ
diff --git a/docsrc/images/ui/so11.png b/docsrc/images/ui/so11.png
new file mode 100644
index 0000000..6a62d69
Binary files /dev/null and b/docsrc/images/ui/so11.png differ
diff --git a/docsrc/images/ui/so12.png b/docsrc/images/ui/so12.png
new file mode 100644
index 0000000..f530b7c
Binary files /dev/null and b/docsrc/images/ui/so12.png differ
diff --git a/docsrc/images/ui/so13.png b/docsrc/images/ui/so13.png
new file mode 100644
index 0000000..e479fd9
Binary files /dev/null and b/docsrc/images/ui/so13.png differ
diff --git a/docsrc/images/ui/so14.png b/docsrc/images/ui/so14.png
new file mode 100644
index 0000000..612e292
Binary files /dev/null and b/docsrc/images/ui/so14.png differ
diff --git a/docsrc/images/ui/so15.png b/docsrc/images/ui/so15.png
new file mode 100644
index 0000000..9211b5a
Binary files /dev/null and b/docsrc/images/ui/so15.png differ
diff --git a/docsrc/images/ui/so16.png b/docsrc/images/ui/so16.png
new file mode 100644
index 0000000..8a154d9
Binary files /dev/null and b/docsrc/images/ui/so16.png differ
diff --git a/docsrc/images/ui/so2.png b/docsrc/images/ui/so2.png
new file mode 100644
index 0000000..19c0f55
Binary files /dev/null and b/docsrc/images/ui/so2.png differ
diff --git a/docsrc/images/ui/so3.png b/docsrc/images/ui/so3.png
new file mode 100644
index 0000000..e41d8ca
Binary files /dev/null and b/docsrc/images/ui/so3.png differ
diff --git a/docsrc/images/ui/so4.png b/docsrc/images/ui/so4.png
new file mode 100644
index 0000000..1b9148c
Binary files /dev/null and b/docsrc/images/ui/so4.png differ
diff --git a/docsrc/images/ui/so5.png b/docsrc/images/ui/so5.png
new file mode 100644
index 0000000..5f9f323
Binary files /dev/null and b/docsrc/images/ui/so5.png differ
diff --git a/docsrc/images/ui/so6.png b/docsrc/images/ui/so6.png
new file mode 100644
index 0000000..c5adbdb
Binary files /dev/null and b/docsrc/images/ui/so6.png differ
diff --git a/docsrc/images/ui/so7.png b/docsrc/images/ui/so7.png
new file mode 100644
index 0000000..c2a8da4
Binary files /dev/null and b/docsrc/images/ui/so7.png differ
diff --git a/docsrc/images/ui/so8.png b/docsrc/images/ui/so8.png
new file mode 100644
index 0000000..54f3add
Binary files /dev/null and b/docsrc/images/ui/so8.png differ
diff --git a/docsrc/images/ui/so9.png b/docsrc/images/ui/so9.png
new file mode 100644
index 0000000..1d9a2a9
Binary files /dev/null and b/docsrc/images/ui/so9.png differ
diff --git a/docsrc/images/ui/topo-scenario.png b/docsrc/images/ui/topo-scenario.png
new file mode 100644
index 0000000..5fe8aaa
Binary files /dev/null and b/docsrc/images/ui/topo-scenario.png differ
diff --git a/docsrc/images/ui/ufile.png b/docsrc/images/ui/ufile.png
new file mode 100644
index 0000000..bf4269d
Binary files /dev/null and b/docsrc/images/ui/ufile.png differ
diff --git a/docsrc/images/ui/usr2.png b/docsrc/images/ui/usr2.png
index f2361a6..451226b 100644
Binary files a/docsrc/images/ui/usr2.png and b/docsrc/images/ui/usr2.png differ
diff --git a/docsrc/index.html b/docsrc/index.html
index 226e0ff..c96c500 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© 2000 OpenLink Software</DIV>
+<DIV CLASS="copyright">Copyright © 1998-2012 OpenLink Software</DIV>
</TD>
<TD WIDTH="50"/>
</TR>
diff --git a/docsrc/pdf/Makefile.am b/docsrc/pdf/Makefile.am
index 027f51e..16cca68 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/pdf/Makefile.in b/docsrc/pdf/Makefile.in
index 9a86f09..ec284a1 100644
--- a/docsrc/pdf/Makefile.in
+++ b/docsrc/pdf/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -284,14 +278,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/pdf/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/pdf/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/pdf/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/pdf/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -309,7 +303,6 @@ $(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
@@ -339,17 +332,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -378,7 +367,6 @@ clean-generic:
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"
@@ -397,8 +385,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -407,28 +393,18 @@ install-data-am:
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
@@ -462,7 +438,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/readme.html b/docsrc/readme.html
index 832d1eb..67d250b 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.1 2009/07/07 12:15:33 source Exp $
- (C)Copyright 2001 OpenLink Software
+ $Id$
+ Copyright (C) 1998-2012 OpenLink Software
-->
<chapter label="TBD.xml" id="TBD">
<title>TBD</title>
diff --git a/docsrc/releasenotes/Makefile.am b/docsrc/releasenotes/Makefile.am
index 3447514..27af0d8 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/releasenotes/Makefile.in b/docsrc/releasenotes/Makefile.in
index f37d48b..766c217 100644
--- a/docsrc/releasenotes/Makefile.in
+++ b/docsrc/releasenotes/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -290,14 +284,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/releasenotes/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/releasenotes/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/releasenotes/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/releasenotes/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -315,7 +309,6 @@ $(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
@@ -345,17 +338,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -383,7 +372,6 @@ clean-generic:
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"
@@ -402,8 +390,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -412,28 +398,18 @@ install-data-am:
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
@@ -467,7 +443,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/releasenotes/ptrconv.xsl b/docsrc/releasenotes/ptrconv.xsl
index c42eb82..fb0e1f3 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/releasenotes/ptrconv_element.xsl b/docsrc/releasenotes/ptrconv_element.xsl
index 5fb5b70..231fb9f 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/releasenotes/relnotes.xml b/docsrc/releasenotes/relnotes.xml
index 21f9b21..398cb31 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/releasenotes/virtuoso_publish_element.xml b/docsrc/releasenotes/virtuoso_publish_element.xml
index 17b901d..6191913 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/releasenotes/vrelnotes-nw.xml b/docsrc/releasenotes/vrelnotes-nw.xml
index d3c6e6f..7895373 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/releasenotes/vrelnotes.xml b/docsrc/releasenotes/vrelnotes.xml
index ce3266a..e405c0d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/styleguide/Makefile.am b/docsrc/styleguide/Makefile.am
index e1b0ae4..5815f34 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/styleguide/Makefile.in b/docsrc/styleguide/Makefile.in
index 8ccf0fa..733b359 100644
--- a/docsrc/styleguide/Makefile.in
+++ b/docsrc/styleguide/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -285,14 +279,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/styleguide/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/styleguide/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/styleguide/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/styleguide/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -310,7 +304,6 @@ $(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
@@ -340,17 +333,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -378,7 +367,6 @@ clean-generic:
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"
@@ -397,8 +385,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -407,28 +393,18 @@ install-data-am:
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
@@ -462,7 +438,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/stylesheets/Makefile.am b/docsrc/stylesheets/Makefile.am
index a7e0f10..06b2d1c 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/stylesheets/Makefile.in b/docsrc/stylesheets/Makefile.in
index 022a9ef..2b5ee3c 100644
--- a/docsrc/stylesheets/Makefile.in
+++ b/docsrc/stylesheets/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -392,14 +386,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/stylesheets/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/stylesheets/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/stylesheets/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/stylesheets/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -417,7 +411,6 @@ $(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
@@ -447,17 +440,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -485,7 +474,6 @@ clean-generic:
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"
@@ -504,8 +492,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -514,28 +500,18 @@ install-data-am:
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
@@ -569,7 +545,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/stylesheets/chaptermenu.xsl b/docsrc/stylesheets/chaptermenu.xsl
index ee10ad9..2693806 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/chaptermenu_xt.xsl b/docsrc/stylesheets/chaptermenu_xt.xsl
index 5d78a97..7636aea 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/config.xsl b/docsrc/stylesheets/config.xsl
index 6d2883d..851b707 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_chapter.xsl b/docsrc/stylesheets/html_chapter.xsl
index 746ef6f..ebe2bbc 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 2006/08/15 22:09:21 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_debug.xsl b/docsrc/stylesheets/html_debug.xsl
index 602e057..36a029e 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_functions.xsl b/docsrc/stylesheets/html_functions.xsl
index ca0e502..26aa763 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_mp_chaptermenu.xsl b/docsrc/stylesheets/html_mp_chaptermenu.xsl
index 728c675..e7a676c 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_util.xsl b/docsrc/stylesheets/html_util.xsl
index 9d5f99e..959b446 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_virt_chapter.xsl b/docsrc/stylesheets/html_virt_chapter.xsl
index 23043ea..592ffc2 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_virt_chapter1.xsl b/docsrc/stylesheets/html_virt_chapter1.xsl
index a09b670..a5f7468 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_virt_chaptermenu.xsl b/docsrc/stylesheets/html_virt_chaptermenu.xsl
index d7ce91e..7636aea 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_virt_common.xsl b/docsrc/stylesheets/html_virt_common.xsl
index 2c070d7..6d13652 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl b/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl
index 13b0bf3..3eff186 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_virt_refentry.xsl b/docsrc/stylesheets/html_virt_refentry.xsl
index af5dd32..816f26a 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_virt_util.xsl b/docsrc/stylesheets/html_virt_util.xsl
index 9a831a6..e9a7f19 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/html_xt_common.xsl b/docsrc/stylesheets/html_xt_common.xsl
index 666836d..ebd5e36 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/list_api.xsl b/docsrc/stylesheets/list_api.xsl
index 8c58d6e..47e7d47 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/refentry.xsl b/docsrc/stylesheets/refentry.xsl
index 3243a25..e301da6 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/doc.css b/docsrc/stylesheets/sections/doc.css
index ddbbe5f..8b0d9ae 100644
--- a/docsrc/stylesheets/sections/doc.css
+++ b/docsrc/stylesheets/sections/doc.css
@@ -1,10 +1,10 @@
/*
- * $Id: doc.css,v 1.2 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/docsrc/stylesheets/sections/function_list.xsl b/docsrc/stylesheets/sections/function_list.xsl
index 45aa9f1..13e82e8 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/html_functions.xsl b/docsrc/stylesheets/sections/html_functions.xsl
index 8e52741..b6b145c 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/html_inline_refentry.xsl b/docsrc/stylesheets/sections/html_inline_refentry.xsl
index a5ceee8..5a2303b 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/html_sect1_common.xsl b/docsrc/stylesheets/sections/html_sect1_common.xsl
index 13bcc1d..9406f46 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 2009/01/12 10:36:53 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/html_sect1_tocs.xsl b/docsrc/stylesheets/sections/html_sect1_tocs.xsl
index 65e6f3a..c0c6ca9 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 2007/05/08 17:54:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/openlink.css b/docsrc/stylesheets/sections/openlink.css
index c4682ee..17a54c8 100644
--- a/docsrc/stylesheets/sections/openlink.css
+++ b/docsrc/stylesheets/sections/openlink.css
@@ -1,10 +1,10 @@
/*
- * $Id: openlink.css,v 1.3 2006/08/15 22:15:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/docsrc/stylesheets/sections/opml_sect1_mp.xsl b/docsrc/stylesheets/sections/opml_sect1_mp.xsl
index c8e7095..b612f23 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/sect1_list.xsl b/docsrc/stylesheets/sections/sect1_list.xsl
index 97b4883..2492a5d 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/sioc_book.xsl b/docsrc/stylesheets/sections/sioc_book.xsl
index cb6bceb..add8453 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 2007/05/08 17:54:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/sioc_chap.xsl b/docsrc/stylesheets/sections/sioc_chap.xsl
index 0bae823..454b375 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 2007/05/08 17:54:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/sections/sioc_sect1.xsl b/docsrc/stylesheets/sections/sioc_sect1.xsl
index 30ba89a..866adae 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 2007/05/08 17:54:39 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/virt_config.xsl b/docsrc/stylesheets/virt_config.xsl
index 78b8cee..6d1fdf0 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/vsp_contents.xsl b/docsrc/stylesheets/vsp_contents.xsl
index e463624..f414d77 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/stylesheets/vsp_contents_lmvector.xsl b/docsrc/stylesheets/vsp_contents_lmvector.xsl
index b440824..8d3c91b 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 2006/08/15 22:09:22 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/2pc.xml b/docsrc/xmlsource/2pc.xml
index 9a1a143..dfa5c1c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/DocBook/calstblx.dtd b/docsrc/xmlsource/DocBook/calstblx.dtd
index 0c5a530..023e6c5 100644
--- a/docsrc/xmlsource/DocBook/calstblx.dtd
+++ b/docsrc/xmlsource/DocBook/calstblx.dtd
@@ -10,7 +10,7 @@
This DTD is based on the CALS Table Model
PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
- $Id: calstblx.dtd,v 1.1.1.1 2006/04/11 17:56:14 source Exp $
+ $Id$
Permission to use, copy, modify and distribute the DocBook XML DTD
and its accompanying documentation for any purpose and without fee
diff --git a/docsrc/xmlsource/DocBook/dbcentx.mod b/docsrc/xmlsource/DocBook/dbcentx.mod
index 5110221..ab34da3 100644
--- a/docsrc/xmlsource/DocBook/dbcentx.mod
+++ b/docsrc/xmlsource/DocBook/dbcentx.mod
@@ -7,7 +7,7 @@
Corporation, Norman Walsh, and the Organization for the Advancement
of Structured Information Standards (OASIS).
- $Id: dbcentx.mod,v 1.1.1.1 2006/04/11 17:56:14 source Exp $
+ $Id$
Permission to use, copy, modify and distribute the DocBook XML DTD
and its accompanying documentation for any purpose and without fee
diff --git a/docsrc/xmlsource/DocBook/dbhierx.mod b/docsrc/xmlsource/DocBook/dbhierx.mod
index 7f83fb7..27779d9 100644
--- a/docsrc/xmlsource/DocBook/dbhierx.mod
+++ b/docsrc/xmlsource/DocBook/dbhierx.mod
@@ -7,7 +7,7 @@
Corporation, Norman Walsh, and the Organization for the Advancement
of Structured Information Standards (OASIS).
- $Id: dbhierx.mod,v 1.1.1.1 2006/04/11 17:56:14 source Exp $
+ $Id$
Permission to use, copy, modify and distribute the DocBook XML DTD
and its accompanying documentation for any purpose and without fee
diff --git a/docsrc/xmlsource/DocBook/dbnotnx.mod b/docsrc/xmlsource/DocBook/dbnotnx.mod
index 7487ef2..d183a06 100644
--- a/docsrc/xmlsource/DocBook/dbnotnx.mod
+++ b/docsrc/xmlsource/DocBook/dbnotnx.mod
@@ -7,7 +7,7 @@
Corporation, Norman Walsh, and the Organization for the Advancement
of Structured Information Standards (OASIS).
- $Id: dbnotnx.mod,v 1.1.1.1 2006/04/11 17:56:14 source Exp $
+ $Id$
Permission to use, copy, modify and distribute the DocBook XML DTD
and its accompanying documentation for any purpose and without fee
diff --git a/docsrc/xmlsource/DocBook/dbpoolx.mod b/docsrc/xmlsource/DocBook/dbpoolx.mod
index 046bcba..a13afdb 100644
--- a/docsrc/xmlsource/DocBook/dbpoolx.mod
+++ b/docsrc/xmlsource/DocBook/dbpoolx.mod
@@ -7,7 +7,7 @@
Corporation, Norman Walsh and the Organization for the Advancement
of Structured Information Standards (OASIS).
- $Id: dbpoolx.mod,v 1.1.1.1 2006/04/11 17:56:14 source Exp $
+ $Id$
Permission to use, copy, modify and distribute the DocBook XML DTD
and its accompanying documentation for any purpose and without fee
diff --git a/docsrc/xmlsource/DocBook/docbookx.dtd b/docsrc/xmlsource/DocBook/docbookx.dtd
index 7073cf9..651ce78 100644
--- a/docsrc/xmlsource/DocBook/docbookx.dtd
+++ b/docsrc/xmlsource/DocBook/docbookx.dtd
@@ -7,7 +7,7 @@
Corporation, Norman Walsh, and the Organization for the Advancement
of Structured Information Standards (OASIS).
- $Id: docbookx.dtd,v 1.1.1.1 2006/04/11 17:56:14 source Exp $
+ $Id$
Permission to use, copy, modify and distribute the DocBook XML DTD
and its accompanying documentation for any purpose and without fee
diff --git a/docsrc/xmlsource/DocBook/tblcals.xml b/docsrc/xmlsource/DocBook/tblcals.xml
index e0ea6c8..1605689 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/DocBook/tblxchg.xml b/docsrc/xmlsource/DocBook/tblxchg.xml
index 20477cb..e40af05 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/DocBook/test.xml b/docsrc/xmlsource/DocBook/test.xml
index bdae82b..41c526e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/Makefile.am b/docsrc/xmlsource/Makefile.am
index 5196232..990df20 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-2006 OpenLink Software
+# 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
diff --git a/docsrc/xmlsource/Makefile.in b/docsrc/xmlsource/Makefile.in
index 35d7f8f..f48bf4b 100644
--- a/docsrc/xmlsource/Makefile.in
+++ b/docsrc/xmlsource/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -307,14 +301,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/xmlsource/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docsrc/xmlsource/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docsrc/xmlsource/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docsrc/xmlsource/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -332,7 +326,6 @@ $(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
@@ -362,17 +355,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -400,7 +389,6 @@ clean-generic:
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"
@@ -419,8 +407,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -429,28 +415,18 @@ install-data-am:
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
@@ -484,7 +460,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/docsrc/xmlsource/XMLDOM.xml b/docsrc/xmlsource/XMLDOM.xml
index bdb1aed..81dbeda 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/XMLType.xml b/docsrc/xmlsource/XMLType.xml
index 354d2ca..db52d18 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/_DirInfo.sh b/docsrc/xmlsource/_DirInfo.sh
index 43f4afb..5739e5a 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 2009/02/12 15:15:13 source Exp $
- (C)Copyright 2001 OpenLink Software
+ $Id$
+ Copyright (C) 1998-2012 OpenLink Software
-->
<dirinfo>' >> $out
echo ' <dir path="">
diff --git a/docsrc/xmlsource/_DirInfo.xml b/docsrc/xmlsource/_DirInfo.xml
index b086051..8cd24a3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/accessinterfaces.xml b/docsrc/xmlsource/accessinterfaces.xml
index be85c8a..789d82e 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-2006 OpenLink Software
+ - 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
@@ -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.6 2011/03/05 00:03:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/docsrc/xmlsource/adminui.blogging.xml b/docsrc/xmlsource/adminui.blogging.xml
index caae721..0ca0529 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.dbadmin.xml b/docsrc/xmlsource/adminui.dbadmin.xml
index bd6c959..2772d41 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.internetdomains.xml b/docsrc/xmlsource/adminui.internetdomains.xml
index 36ed577..459fa78 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.mailsrvadm.xml b/docsrc/xmlsource/adminui.mailsrvadm.xml
index 7c80531..c5ec3df 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.newssrvadm.xml b/docsrc/xmlsource/adminui.newssrvadm.xml
index 2700735..61313cb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.querytools.xml b/docsrc/xmlsource/adminui.querytools.xml
index b0b1b9d..adcf5e1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.rdfadm.xml b/docsrc/xmlsource/adminui.rdfadm.xml
index cb45f8f..cde59f1 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-2006 OpenLink Software
+ - 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
@@ -146,9 +146,12 @@
<graphic fileref="rdf19.png"/>
</figure>
</sect4>
- <sect4 id="rdfadmaclsparqlssl"><title>SPARQL-SSL</title>
+ <sect4 id="rdfadmaclsparqlssl"><title>SPARQL-WebID</title>
<para>Here you can manage different WebID Protocol ACLs WebID ACL by granting
SPARQL Roles such as "SELECT", "UPDATE", "SPONGE":</para>
+ <para>This tab is available only when the
+ <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.3/virtuoso/policy_manager_dav.vad">policy__manager_dav.vad</ulink>
+ is installed.</para>
<figure id="adminuirdf15" float="1">
<title>RDF</title>
<graphic fileref="rdf18.png"/>
@@ -156,14 +159,14 @@
<tip><title>See Also:</title>
<para><link linkend="sparqwebservicetbl">Managing a SPARQL Web Service Endpoint</link></para>
<para><link linkend="sparqloauthendpointfoafssl">WebID Protocol ACLs</link></para>
- <para><link linkend="sparqloauthendpointfoafsslsparql">Creating and Using a SPARQL-SSL based Endpoint</link></para>
- <para><link linkend="rdfsparqlendpointexamples3">Example with curl and SPARQL-SSL endpoint</link></para>
+ <para><link linkend="sparqloauthendpointfoafsslsparql">Creating and Using a SPARQL-WebID based Endpoint</link></para>
+ <para><link linkend="rdfsparqlendpointexamples3">Example with curl and SPARQL-WebID endpoint</link></para>
</tip>
</sect4>
</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, RDF Views of SQL data). The language is an extension of the
+ functionality (also described as, Linked Data 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 +182,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 RDF Views over Relational Data Sources with Virtuoso.</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>
</tip>
</sect3>
<sect3 id="rdfadm"><title>Quad Store Upoload</title>
@@ -204,7 +207,7 @@
<para><ulink url="http://ods.openlinksw.com/wiki/ODS/VirtPubSubHub">Example of Linked Data Usage of PubSubHubbub Implementation.</ulink></para>
<para><ulink url="http://ods.openlinksw.com/wiki/ODS/VirtFeedPubSubHub">Feed subscription via PubSubHub Protocol.</ulink></para>
<para><ulink url="http://ods.openlinksw.com/wiki/ODS/VirtODSPubSubHub">Setting up PubSubHub in ODS.</ulink></para>
- <para><ulink url="http://ods.openlinksw.com/wiki/ODS/VirtAuthPolicyFOAFSSL">WebID Protocol ACLs Tutorial.</ulink></para>
+ <para><ulink url="http://ods.openlinksw.com/wiki/ODS/VirtSPARQLSecurityWebID">Securing your SPARQL Endpoint via WebID.</ulink></para>
</tip>
</sect3>
</sect2>
diff --git a/docsrc/xmlsource/adminui.replicationandsynchronization.xml b/docsrc/xmlsource/adminui.replicationandsynchronization.xml
index 7ed01e5..c2ea292 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.runtimehosting.xml b/docsrc/xmlsource/adminui.runtimehosting.xml
index 74ad3e1..27c20e8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.webdavadmin.xml b/docsrc/xmlsource/adminui.webdavadmin.xml
index 96831e2..8d658dc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/adminui.webservices.xml b/docsrc/xmlsource/adminui.webservices.xml
index 39f9693..ddee137 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-2006 OpenLink Software
+ - 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
@@ -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 sponged triples 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 network resource triples being fetched 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,6 +539,318 @@ 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 862212e..cdff8a8 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-2006 OpenLink Software
+ - 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
@@ -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 RDF views,
+ statistics, manage graphs, import schemas and define namespaces, generated Linked Data 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 1202931..31b4f12 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/aggregates.xml b/docsrc/xmlsource/aggregates.xml
index 1c34908..99404e4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/appendixa.xml b/docsrc/xmlsource/appendixa.xml
index 40dc12f..a2017e2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/backup.xml b/docsrc/xmlsource/backup.xml
index b65a31f..97842d6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bidirrepl.xml b/docsrc/xmlsource/bidirrepl.xml
index c3465e5..1ff8cda 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bidirtransrepl.xml b/docsrc/xmlsource/bidirtransrepl.xml
index 2a5843d..1c73570 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/blog_atom.xml b/docsrc/xmlsource/blog_atom.xml
index 472e439..970ab98 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/blogger.xml b/docsrc/xmlsource/blogger.xml
index 06c9a96..64c021c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel.xml b/docsrc/xmlsource/bpel.xml
index 93ec360..d333ac5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_compile_script.xml b/docsrc/xmlsource/bpel/bpel_compile_script.xml
index 9c9856f..dc8a013 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_copy_script.xml b/docsrc/xmlsource/bpel/bpel_copy_script.xml
index 1fe7469..b5d2252 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_get_partner_links.xml b/docsrc/xmlsource/bpel/bpel_get_partner_links.xml
index da002c4..9422adf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_get_var.xml b/docsrc/xmlsource/bpel/bpel_get_var.xml
index d82cf88..9514dff 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_import_script.xml b/docsrc/xmlsource/bpel/bpel_import_script.xml
index 7261398..2f4b460 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_instance_delete.xml b/docsrc/xmlsource/bpel/bpel_instance_delete.xml
index e37fdfc..48f1e8f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_plink_get_option.xml b/docsrc/xmlsource/bpel/bpel_plink_get_option.xml
index 1b17f12..e81717b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_plink_set_option.xml b/docsrc/xmlsource/bpel/bpel_plink_set_option.xml
index c0a973b..56a413d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_purge.xml b/docsrc/xmlsource/bpel/bpel_purge.xml
index 30085b3..56bd4d2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_delete.xml b/docsrc/xmlsource/bpel/bpel_script_delete.xml
index 0c9ad8c..9bf5015 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_obsolete.xml b/docsrc/xmlsource/bpel/bpel_script_obsolete.xml
index cd60443..96a140a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_source_update.xml b/docsrc/xmlsource/bpel/bpel_script_source_update.xml
index c8d3e4b..e84afb4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_upload.xml b/docsrc/xmlsource/bpel/bpel_script_upload.xml
index c1ac807..310f5d5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml b/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml
index 1cf4d90..4483a9d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_set_var.xml b/docsrc/xmlsource/bpel/bpel_set_var.xml
index 67856e9..b13e07f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml b/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml
index e1003b2..0727fbe 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/cinterface.xml b/docsrc/xmlsource/cinterface.xml
index 1d9398e..b419533 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/concepts.xml b/docsrc/xmlsource/concepts.xml
index d54c169..29bc369 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/createassembly.xml b/docsrc/xmlsource/createassembly.xml
index 377514d..a81d6c1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/createexthostproc.xml b/docsrc/xmlsource/createexthostproc.xml
index d279cb5..e3e1194 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/dbconcepts.xml b/docsrc/xmlsource/dbconcepts.xml
index 32755ca..2531d8d 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-2006 OpenLink Software
+ - 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
@@ -156,7 +156,7 @@ create table nokey (a integer);
expands to
</para>
<programlisting>
-create table nokey (a integer, _IDN integer identity, primary key (_IDB));
+create table nokey (a integer, _IDN integer identity, primary key (_IDN));
</programlisting>
<para>
The first unique index to be defined will become the primary key if the table
diff --git a/docsrc/xmlsource/dbpump.xml b/docsrc/xmlsource/dbpump.xml
index 056239c..94bf6e5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/errors.xml b/docsrc/xmlsource/errors.xml
index 2ff7611..08549dd 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/exposingws.xml b/docsrc/xmlsource/exposingws.xml
index b14fdbf..b35e265 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/fault.xml b/docsrc/xmlsource/fault.xml
index 7627286..41c3791 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/freetext.xml b/docsrc/xmlsource/freetext.xml
index a771b8f..542e76e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/ftp.xml b/docsrc/xmlsource/ftp.xml
index 268254e..516a444 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/GROUP_CONCAT.xml b/docsrc/xmlsource/funcref/GROUP_CONCAT.xml
index a0e8afd..23d7446 100644
--- a/docsrc/xmlsource/funcref/GROUP_CONCAT.xml
+++ b/docsrc/xmlsource/funcref/GROUP_CONCAT.xml
@@ -23,7 +23,9 @@
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: Using the "sql:" prefix is mandatory for this aggregate.</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_CONCAT">
<title>Parameters</title>
@@ -76,6 +78,8 @@ 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
new file mode 100644
index 0000000..adb8208
--- /dev/null
+++ b/docsrc/xmlsource/funcref/GROUP_DIGEST.xml
@@ -0,0 +1,79 @@
+<?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 30811cf..59d3e0f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml b/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml
index b9b8fb1..9ad5031 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml b/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml
index a10a5e8..47d3c3b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml
index 45e12f0..a45bc21 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml
index 48d14cb..65e65d0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml
index ca28683..f137fd5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml
index dd42279..0a100a0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml b/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml
index 389887b..ff3bf21 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml b/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml
index 200635c..99d47f9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml b/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml
index 918d74c..de71b6a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml b/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml
index 0072913..d0b7334 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/SAMPLE.xml b/docsrc/xmlsource/funcref/SAMPLE.xml
index 87f6033..7982bab 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,5 +55,7 @@ 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 d8b2c9f..3546ea6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml b/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml
index b8b94a1..3fdc11d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLAddAttribute.xml b/docsrc/xmlsource/funcref/XMLAddAttribute.xml
index 68847b3..161ad47 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLAppendChildren.xml b/docsrc/xmlsource/funcref/XMLAppendChildren.xml
index 11ea70c..be9ba91 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLCONCAT.xml b/docsrc/xmlsource/funcref/XMLCONCAT.xml
index 28825de..8aee191 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLELEMENT.xml b/docsrc/xmlsource/funcref/XMLELEMENT.xml
index 9faa30a..e67a597 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLFOREST.xml b/docsrc/xmlsource/funcref/XMLFOREST.xml
index 98cbc6d..ba6ea93 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLInsertAfter.xml b/docsrc/xmlsource/funcref/XMLInsertAfter.xml
index 1ac58e8..cb2db43 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLInsertBefore.xml b/docsrc/xmlsource/funcref/XMLInsertBefore.xml
index a95ae2a..0c0225e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLReplace.xml b/docsrc/xmlsource/funcref/XMLReplace.xml
index 483cdff..662a8ad 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.XMLType.xml b/docsrc/xmlsource/funcref/XMLType.XMLType.xml
index 31d60d8..8e20618 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml b/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml
index 2540fae..3620b48 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml b/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml
index 913ee82..be9f9a9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.createXML.xml b/docsrc/xmlsource/funcref/XMLType.createXML.xml
index 64369c4..3234190 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.existsNode.xml b/docsrc/xmlsource/funcref/XMLType.existsNode.xml
index faa8606..23208b4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.extract.xml b/docsrc/xmlsource/funcref/XMLType.extract.xml
index 3a1c391..477878b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getClobVal.xml b/docsrc/xmlsource/funcref/XMLType.getClobVal.xml
index da7f30e..ded53ed 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getNamespace.xml b/docsrc/xmlsource/funcref/XMLType.getNamespace.xml
index 7795c8e..66a43ce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getNumVal.xml b/docsrc/xmlsource/funcref/XMLType.getNumVal.xml
index ee0da4f..299bce8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getRootElement.xml b/docsrc/xmlsource/funcref/XMLType.getRootElement.xml
index a773ce7..e4a8a9d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml b/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml
index d7bad34..2cb5cd8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getStringVal.xml b/docsrc/xmlsource/funcref/XMLType.getStringVal.xml
index 316c69f..6a54b5d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.isFragment.xml b/docsrc/xmlsource/funcref/XMLType.isFragment.xml
index 64ec299..64f3edc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml
index eb8be12..c8ff437 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml
index 49a6dc9..8079d2e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml
index 21546d5..5704d32 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml b/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml
index f840995..8522b39 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml b/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml
index f5295e2..597a32e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.toObject.xml b/docsrc/xmlsource/funcref/XMLType.toObject.xml
index 0bdc03e..a65967b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/XMLType.transform.xml b/docsrc/xmlsource/funcref/XMLType.transform.xml
index c1a7c27..8b4cb3e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/abs.xml b/docsrc/xmlsource/funcref/abs.xml
index 52d0551..9f329e4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/any_grants.xml b/docsrc/xmlsource/funcref/any_grants.xml
index c636a8a..7a17fb1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/aref.xml b/docsrc/xmlsource/funcref/aref.xml
index bab57fd..8ddf72c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ascii.xml b/docsrc/xmlsource/funcref/ascii.xml
index b7d1db8..ad8c2b8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/aset.xml b/docsrc/xmlsource/funcref/aset.xml
index ca468e3..d0dcf27 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/atof.xml b/docsrc/xmlsource/funcref/atof.xml
index b4c4c59..820d96d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/atoi.xml b/docsrc/xmlsource/funcref/atoi.xml
index dec52d2..b321c0e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/att_local_name.xml b/docsrc/xmlsource/funcref/att_local_name.xml
index 5a8616c..ee26cc3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/backup.xml b/docsrc/xmlsource/funcref/backup.xml
index 5611c0e..02b6112 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/backup_context_clear.xml b/docsrc/xmlsource/funcref/backup_context_clear.xml
index f0252fd..ed75093 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/backup_online.xml b/docsrc/xmlsource/funcref/backup_online.xml
index 75634bb..fe721bf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_arg.xml b/docsrc/xmlsource/funcref/bif_arg.xml
index daa25f8..9e48da3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_array_arg.xml b/docsrc/xmlsource/funcref/bif_array_arg.xml
index d9cfa1b..c8b04fb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml b/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml
index 8c0bea3..cd81488 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_bin_arg.xml b/docsrc/xmlsource/funcref/bif_bin_arg.xml
index 89b0335..84b614d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_double_arg.xml b/docsrc/xmlsource/funcref/bif_double_arg.xml
index f8b7ee1..2c9a596 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_entity_arg.xml b/docsrc/xmlsource/funcref/bif_entity_arg.xml
index 6003d30..15a9745 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_float_arg.xml b/docsrc/xmlsource/funcref/bif_float_arg.xml
index 06fa964..ccafedc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_funcs.xml b/docsrc/xmlsource/funcref/bif_funcs.xml
index ebb5c2a..140259b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_long_arg.xml b/docsrc/xmlsource/funcref/bif_long_arg.xml
index 8d3d5cd..f98ba98 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml b/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml
index 41fd40d..22d36d3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_string_arg.xml b/docsrc/xmlsource/funcref/bif_string_arg.xml
index b1158ab..c2f4451 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml b/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml
index 616d560..29b8a6c 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-2006 OpenLink Software
+ - 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
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 fef5905..95589a5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bif_strses_arg.xml b/docsrc/xmlsource/funcref/bif_strses_arg.xml
index 7d58569..0512895 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bit_and.xml b/docsrc/xmlsource/funcref/bit_and.xml
index 37b05b4..c96335c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bit_not.xml b/docsrc/xmlsource/funcref/bit_not.xml
index b122efb..0560e66 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bit_or.xml b/docsrc/xmlsource/funcref/bit_or.xml
index ba88428..ef8755a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bit_shift.xml b/docsrc/xmlsource/funcref/bit_shift.xml
index 324341a..b16f206 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bit_xor.xml b/docsrc/xmlsource/funcref/bit_xor.xml
index 59bbb12..04b3f56 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blob_to_string.xml b/docsrc/xmlsource/funcref/blob_to_string.xml
index a834b72..7103723 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blob_to_string_output.xml b/docsrc/xmlsource/funcref/blob_to_string_output.xml
index 79c422a..73bf036 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.deletePost.xml b/docsrc/xmlsource/funcref/blogger.deletePost.xml
index 616054f..f5b3e3b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.editPost.xml b/docsrc/xmlsource/funcref/blogger.editPost.xml
index b628b6c..d551519 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.getPost.xml b/docsrc/xmlsource/funcref/blogger.getPost.xml
index 7bbfb87..cbbfae6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml b/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml
index 5125a4a..32bd5bb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.getTemplate.xml b/docsrc/xmlsource/funcref/blogger.getTemplate.xml
index 4500c8c..7efaa45 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.getUserInfo.xml b/docsrc/xmlsource/funcref/blogger.getUserInfo.xml
index 1ae916c..09ab9ce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml b/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml
index ebe24f8..c370dd4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.newPost.xml b/docsrc/xmlsource/funcref/blogger.newPost.xml
index 9d37af8..0dd705d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/blogger.setTemplate.xml b/docsrc/xmlsource/funcref/blogger.setTemplate.xml
index acf51c5..e7f1039 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/bookmark.xml b/docsrc/xmlsource/funcref/bookmark.xml
index 10a331e..125a016 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-2006 OpenLink Software
+ - 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
@@ -23,8 +23,7 @@
-
-->
<!--
- $Id: bookmark.xml,v 1.1.1.1.2.1 2010/01/06 21:33:50 source Exp $
- (C)Copyright 2005 OpenLink Software
+ $Id$
-->
<refentry id="fn_bookmark">
<refmeta>
diff --git a/docsrc/xmlsource/funcref/ceiling.xml b/docsrc/xmlsource/funcref/ceiling.xml
index 6e1ccd9..f2eeb23 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cfg_item_count.xml b/docsrc/xmlsource/funcref/cfg_item_count.xml
index 6e442d5..9f23b3f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cfg_item_name.xml b/docsrc/xmlsource/funcref/cfg_item_name.xml
index fe4100b..8febf54 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cfg_item_value.xml b/docsrc/xmlsource/funcref/cfg_item_value.xml
index bc90f51..e071f3e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cfg_section_count.xml b/docsrc/xmlsource/funcref/cfg_section_count.xml
index 69611a9..9c0e52b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cfg_section_name.xml b/docsrc/xmlsource/funcref/cfg_section_name.xml
index 87ffa54..c0c5fb2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cfg_write.xml b/docsrc/xmlsource/funcref/cfg_write.xml
index 6039dd1..00fc686 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/charset_define.xml b/docsrc/xmlsource/funcref/charset_define.xml
index 134b901..063a337 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/charset_recode.xml b/docsrc/xmlsource/funcref/charset_recode.xml
index e61bfa4..b0c9f55 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/charsets_list.xml b/docsrc/xmlsource/funcref/charsets_list.xml
index 5da3fa5..0291062 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/checkpoint_interval.xml b/docsrc/xmlsource/funcref/checkpoint_interval.xml
index b545bf6..318eab3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/chr.xml b/docsrc/xmlsource/funcref/chr.xml
index 3c99fc5..169f300 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/client_attr.xml b/docsrc/xmlsource/funcref/client_attr.xml
index 4adfc86..3cb14f8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/collation_define.xml b/docsrc/xmlsource/funcref/collation_define.xml
index 037200e..554e027 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/complete_table_name.xml b/docsrc/xmlsource/funcref/complete_table_name.xml
index d8b284f..1415798 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/composite.xml b/docsrc/xmlsource/funcref/composite.xml
index f00255a..85af9df 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/composite_ref.xml b/docsrc/xmlsource/funcref/composite_ref.xml
index 9d3a195..fc67d34 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/concat.xml b/docsrc/xmlsource/funcref/concat.xml
index 4c97e62..27cf325 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/concatenate.xml b/docsrc/xmlsource/funcref/concatenate.xml
index 781df9e..ec051ce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/connection_get.xml b/docsrc/xmlsource/funcref/connection_get.xml
index 342f3dd..884137a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/connection_id.xml b/docsrc/xmlsource/funcref/connection_id.xml
index e601827..b21519d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/connection_is_dirty.xml b/docsrc/xmlsource/funcref/connection_is_dirty.xml
index adb51e0..a90684f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/connection_set.xml b/docsrc/xmlsource/funcref/connection_set.xml
index fc1cabe..e6a3cac 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/connection_vars.xml b/docsrc/xmlsource/funcref/connection_vars.xml
index 15eaaad..92b885e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/connection_vars_set.xml b/docsrc/xmlsource/funcref/connection_vars_set.xml
index 0c42bd3..9f71f7b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/contains.xml b/docsrc/xmlsource/funcref/contains.xml
index c3eaa20..8a58a10 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/corr.xml b/docsrc/xmlsource/funcref/corr.xml
index ded8182..39f1ce7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cov_load.xml b/docsrc/xmlsource/funcref/cov_load.xml
index 383caff..8766b77 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cov_report.xml b/docsrc/xmlsource/funcref/cov_report.xml
index 5059d8b..ad65d36 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/cov_store.xml b/docsrc/xmlsource/funcref/cov_store.xml
index 9b4e853..ea8fd0a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/covar_pop.xml b/docsrc/xmlsource/funcref/covar_pop.xml
index 835db1b..1be6bc0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/covar_samp.xml b/docsrc/xmlsource/funcref/covar_samp.xml
index e125e93..80f7f04 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/createXML.xml b/docsrc/xmlsource/funcref/createXML.xml
index d8646d2..90fbacc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/curdate.xml b/docsrc/xmlsource/funcref/curdate.xml
index 60ac91a..4715e32 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/current_charset.xml b/docsrc/xmlsource/funcref/current_charset.xml
index 12ecb57..99451d2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dateadd.xml b/docsrc/xmlsource/funcref/dateadd.xml
index fa6b58c..1302ca7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/datediff.xml b/docsrc/xmlsource/funcref/datediff.xml
index 6a6cf9c..92f7d15 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/datestring.xml b/docsrc/xmlsource/funcref/datestring.xml
index 27b4e06..e08936a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/datestring_gmt.xml b/docsrc/xmlsource/funcref/datestring_gmt.xml
index 543fff1..77b05df 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dav_api_add.xml b/docsrc/xmlsource/funcref/dav_api_add.xml
index a2edbcd..eed009f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dav_api_change.xml b/docsrc/xmlsource/funcref/dav_api_change.xml
index 8424540..a21793a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dav_api_lock.xml b/docsrc/xmlsource/funcref/dav_api_lock.xml
index 127a151..5189d9f 100644
--- a/docsrc/xmlsource/funcref/dav_api_lock.xml
+++ b/docsrc/xmlsource/funcref/dav_api_lock.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: dav_api_lock.xml,v 1.2 2008/02/06 23:09:34 source Exp $
- (C)Copyright 2005 OpenLink Software
+ $Id$
-->
<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 95533ea..002d5b6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dav_api_user.xml b/docsrc/xmlsource/funcref/dav_api_user.xml
index e86dc3f..9bd7ccb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dav_exp.xml b/docsrc/xmlsource/funcref/dav_exp.xml
index 123ca80..543e9df 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dayname.xml b/docsrc/xmlsource/funcref/dayname.xml
index 20ba3d7..e6cf1c8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dayofmonth.xml b/docsrc/xmlsource/funcref/dayofmonth.xml
index 194b541..0757aeb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dayofweek.xml b/docsrc/xmlsource/funcref/dayofweek.xml
index 4c80e1e..b515237 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dayofyear.xml b/docsrc/xmlsource/funcref/dayofyear.xml
index a787ff1..7e20851 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dbg_obj_print.xml b/docsrc/xmlsource/funcref/dbg_obj_print.xml
index b3b8cc2..fa5e71f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dbg_printf.xml b/docsrc/xmlsource/funcref/dbg_printf.xml
index 2ad2c1c..cffc51a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dbname.xml b/docsrc/xmlsource/funcref/dbname.xml
index 8714f2b..cdb79fa 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/delay.xml b/docsrc/xmlsource/funcref/delay.xml
index 047c50b..8ddb1cb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dict_dec_or_remove.xml b/docsrc/xmlsource/funcref/dict_dec_or_remove.xml
index 38b433a..189664b 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-2009 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml b/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml
index 4ed7d60..0a2101c 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-2009 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_duplicate.xml b/docsrc/xmlsource/funcref/dict_duplicate.xml
index f0cff69..65029c9 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_get.xml b/docsrc/xmlsource/funcref/dict_get.xml
index 006d908..c60fe5e 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_inc_or_put.xml b/docsrc/xmlsource/funcref/dict_inc_or_put.xml
index 63e209d..b34ac0f 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-2009 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_iter_next.xml b/docsrc/xmlsource/funcref/dict_iter_next.xml
index 7de0727..70d15fb 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_iter_rewind.xml b/docsrc/xmlsource/funcref/dict_iter_rewind.xml
index 99280b3..16ae4eb 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_list_keys.xml b/docsrc/xmlsource/funcref/dict_list_keys.xml
index ccfd5fa..403be72 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_new.xml b/docsrc/xmlsource/funcref/dict_new.xml
index 4c087ad..2d3354c 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_put.xml b/docsrc/xmlsource/funcref/dict_put.xml
index e9e70eb..19ebe73 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_remove.xml b/docsrc/xmlsource/funcref/dict_remove.xml
index e4d5eb8..1aec176 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_size.xml b/docsrc/xmlsource/funcref/dict_size.xml
index 31b8468..1a59e6b 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-2009 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_to_vector.xml b/docsrc/xmlsource/funcref/dict_to_vector.xml
index cd27939..1dc4c60 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/dict_zap.xml b/docsrc/xmlsource/funcref/dict_zap.xml
index fb2e315..6f008a5 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-2009 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/disconnect_user.xml b/docsrc/xmlsource/funcref/disconnect_user.xml
index 93dffe1..34e301a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dsig_template_ext.xml b/docsrc/xmlsource/funcref/dsig_template_ext.xml
index 1a4b903..d59696d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dt_set_tz.xml b/docsrc/xmlsource/funcref/dt_set_tz.xml
index ba2e0a2..d4b6863 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/dvector.xml b/docsrc/xmlsource/funcref/dvector.xml
index e9d28c1..46434f5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/either.xml b/docsrc/xmlsource/funcref/either.xml
index 8876873..28eea9b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/elh_get_handler.xml b/docsrc/xmlsource/funcref/elh_get_handler.xml
index 498093e..0bc7d31 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/elh_load_handler.xml b/docsrc/xmlsource/funcref/elh_load_handler.xml
index 923e1a8..b18548e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/encode_b32_num.xml b/docsrc/xmlsource/funcref/encode_b32_num.xml
index 9dd00b9..f6ee0c5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/encode_base64.xml b/docsrc/xmlsource/funcref/encode_base64.xml
index a9c1c3a..dc0352d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/end_result.xml b/docsrc/xmlsource/funcref/end_result.xml
index a25b0d1..302107a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ends_with.xml b/docsrc/xmlsource/funcref/ends_with.xml
index 5e968bb..63997c9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/equ.xml b/docsrc/xmlsource/funcref/equ.xml
index 5e96122..199132e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/exec.xml b/docsrc/xmlsource/funcref/exec.xml
index 2a540b7..6ae1a39 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/exec_close.xml b/docsrc/xmlsource/funcref/exec_close.xml
index f33488a..8f226b5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/exec_metadata.xml b/docsrc/xmlsource/funcref/exec_metadata.xml
index e87697f..4d1d321 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/exec_next.xml b/docsrc/xmlsource/funcref/exec_next.xml
index 99aace7..5974859 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/exec_result.xml b/docsrc/xmlsource/funcref/exec_result.xml
index 7493408..a154fcf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/exec_result_names.xml b/docsrc/xmlsource/funcref/exec_result_names.xml
index 8f24cb8..cf4e130 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/exec_score.xml b/docsrc/xmlsource/funcref/exec_score.xml
index 315c5e8..0821fcf 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/exp.xml b/docsrc/xmlsource/funcref/exp.xml
index 18578a3..95050df 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/explain.xml b/docsrc/xmlsource/funcref/explain.xml
index 11f67f6..3b6d5bf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_delete.xml b/docsrc/xmlsource/funcref/file_delete.xml
index bed2603..4f4c0ca 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_dirlist.xml b/docsrc/xmlsource/funcref/file_dirlist.xml
index 16ec428..028adf6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_mkdir.xml b/docsrc/xmlsource/funcref/file_mkdir.xml
index 1bab282..6d9cb2a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_mkpath.xml b/docsrc/xmlsource/funcref/file_mkpath.xml
index 6645d3f..fa9cc61 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_open.xml b/docsrc/xmlsource/funcref/file_open.xml
index d421487..d7696a8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_stat.xml b/docsrc/xmlsource/funcref/file_stat.xml
index 520a341..2272256 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_to_string.xml b/docsrc/xmlsource/funcref/file_to_string.xml
index 26e295d..195b435 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_to_string_output.xml b/docsrc/xmlsource/funcref/file_to_string_output.xml
index 92c8170..28863e8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/file_unlink.xml b/docsrc/xmlsource/funcref/file_unlink.xml
index 92b8f3c..a398a1d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/fk_check_input_values.xml b/docsrc/xmlsource/funcref/fk_check_input_values.xml
index da8ab61..26d5ead 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/floor.xml b/docsrc/xmlsource/funcref/floor.xml
index 38ac921..5ec3eef 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ftp_get.xml b/docsrc/xmlsource/funcref/ftp_get.xml
index 42ecbbd..148fe8d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ftp_ls.xml b/docsrc/xmlsource/funcref/ftp_ls.xml
index cb22ce8..dd0e380 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ftp_put.xml b/docsrc/xmlsource/funcref/ftp_put.xml
index d984178..bab5af4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/get_certificate_info.xml b/docsrc/xmlsource/funcref/get_certificate_info.xml
index bd9e996..6cdbaee 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-2006 OpenLink Software
+ - 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
@@ -71,7 +71,8 @@ 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, modulus and exponent</member>
+ <member>9 - return a vector of three elements: the certificate's public key type, exponent and modulus</member>
+ <member>10 - return attribute value for given attribute name</member>
</simplelist>
</refsect2>
@@ -126,6 +127,29 @@ that string.
<para><link linkend=""></link></para>
</refsect1>
-->
+ <refsect1 id="examples_get_certificate_info"><title>Examples</title>
+ <example id="ex_get_certificate_info"><title>Simple examples</title>
+<programlisting><![CDATA[
+CREATE PROCEDURE get_mail_example (in cert any := null, in cert_type int := 0)
+{
+ declare alts, mail any;
+ mail := get_certificate_info (10, cert, cert_type, '', 'emailAddress');
+ if (mail is null)
+ {
+ alts := get_certificate_info (7, cert, cert_type, '', '1.10.16.25');
+ if (alts is not null)
+ {
+ alts := regexp_replace (alts, ',[ ]*', ',', 1, null);
+ alts := split_and_decode (alts, 0, '\0\0,:');
+ mail := get_keyword ('email', alts);
+ }
+ }
+ return mail;
+}
+;
+]]></programlisting>
+ </example>
+ </refsect1>
</refentry>
diff --git a/docsrc/xmlsource/funcref/get_keyword.xml b/docsrc/xmlsource/funcref/get_keyword.xml
index 8c3847e..23c928f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/get_keyword_ucase.xml b/docsrc/xmlsource/funcref/get_keyword_ucase.xml
index c48a32d..f3b12f2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/get_timestamp.xml b/docsrc/xmlsource/funcref/get_timestamp.xml
index ef662d3..c960814 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/getdate.xml b/docsrc/xmlsource/funcref/getdate.xml
index b026711..a6eef50 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/gvector_digit_sort.xml b/docsrc/xmlsource/funcref/gvector_digit_sort.xml
index 8dc3a0a..ad21ed4 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-2009 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/gvector_sort.xml b/docsrc/xmlsource/funcref/gvector_sort.xml
index 6dd81b8..9bdc1b5 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-2009 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/gz_compress.xml b/docsrc/xmlsource/funcref/gz_compress.xml
index f3a3a9a..58d4453 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/gz_file_open.xml b/docsrc/xmlsource/funcref/gz_file_open.xml
index b58d316..cb0aef8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/gz_uncompress.xml b/docsrc/xmlsource/funcref/gz_uncompress.xml
index d9cb81f..523ac8c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/hour.xml b/docsrc/xmlsource/funcref/hour.xml
index f753753..b6c7539 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/hs_resolve.xml b/docsrc/xmlsource/funcref/hs_resolve.xml
index dcecfcb..bd57fe3 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.2 2009/05/05 14:10:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http.xml b/docsrc/xmlsource/funcref/http.xml
index 81c252a..0d41459 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_acl_get.xml b/docsrc/xmlsource/funcref/http_acl_get.xml
index 93d84f3..9907c28 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_acl_remove.xml b/docsrc/xmlsource/funcref/http_acl_remove.xml
index 67fb1c2..da09764 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_acl_set.xml b/docsrc/xmlsource/funcref/http_acl_set.xml
index 9f39f59..0ba29b2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_body_read.xml b/docsrc/xmlsource/funcref/http_body_read.xml
index fe1f31a..ad06a2f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_client.xml b/docsrc/xmlsource/funcref/http_client.xml
index b8c69ad..770752e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_client_ext.xml b/docsrc/xmlsource/funcref/http_client_ext.xml
index 94ad1e8..b2348a3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_client_ip.xml b/docsrc/xmlsource/funcref/http_client_ip.xml
index 5c0ac39..16964fd 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_debug_log.xml b/docsrc/xmlsource/funcref/http_debug_log.xml
index 86f1f96..00c68d1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_enable_gz.xml b/docsrc/xmlsource/funcref/http_enable_gz.xml
index 92f65ce..f129e62 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_file.xml b/docsrc/xmlsource/funcref/http_file.xml
index d1dd76d..f9fde60 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_flush.xml b/docsrc/xmlsource/funcref/http_flush.xml
index 98d4689..865aae1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_get.xml b/docsrc/xmlsource/funcref/http_get.xml
index e143cee..0165b72 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_header.xml b/docsrc/xmlsource/funcref/http_header.xml
index a8ae460..f38f131 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_header_get.xml b/docsrc/xmlsource/funcref/http_header_get.xml
index ff26c93..363205b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_kill.xml b/docsrc/xmlsource/funcref/http_kill.xml
index d440dc9..0077750 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_listen_host.xml b/docsrc/xmlsource/funcref/http_listen_host.xml
index d9ae1d5..2a7960e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_lock.xml b/docsrc/xmlsource/funcref/http_lock.xml
index 46e1d05..1f97ac1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_map_get.xml b/docsrc/xmlsource/funcref/http_map_get.xml
index ea034ca..1a04aa7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_map_table.xml b/docsrc/xmlsource/funcref/http_map_table.xml
index 5db171a..106a772 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_param.xml b/docsrc/xmlsource/funcref/http_param.xml
index 71cf57d..c216547 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_path.xml b/docsrc/xmlsource/funcref/http_path.xml
index dcd82dc..18df564 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_pending_req.xml b/docsrc/xmlsource/funcref/http_pending_req.xml
index 181f6bf..287d86c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_physical_path.xml b/docsrc/xmlsource/funcref/http_physical_path.xml
index 954024c..a29057a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_proxy.xml b/docsrc/xmlsource/funcref/http_proxy.xml
index 5e05afd..410e96c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_request_get.xml b/docsrc/xmlsource/funcref/http_request_get.xml
index 6ed3108..ad27ce4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_request_header.xml b/docsrc/xmlsource/funcref/http_request_header.xml
index 1bb2edd..2dc403f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_request_header_full.xml b/docsrc/xmlsource/funcref/http_request_header_full.xml
index 0fb893d..c9fefd5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_request_status.xml b/docsrc/xmlsource/funcref/http_request_status.xml
index 409d1f1..c0f9a51 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_rewrite.xml b/docsrc/xmlsource/funcref/http_rewrite.xml
index f9ff52a..4cfa7e3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_root.xml b/docsrc/xmlsource/funcref/http_root.xml
index 38d6e45..e6b3495 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_unlock.xml b/docsrc/xmlsource/funcref/http_unlock.xml
index 7b5e132..437fafc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_url.xml b/docsrc/xmlsource/funcref/http_url.xml
index 51e5c03..0dbae4c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_value.xml b/docsrc/xmlsource/funcref/http_value.xml
index ad89e54..8b80ec7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/http_xslt.xml b/docsrc/xmlsource/funcref/http_xslt.xml
index 13c57f5..098bf94 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/identity_value.xml b/docsrc/xmlsource/funcref/identity_value.xml
index 37ce890..3c2a193 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/import_clr.xml b/docsrc/xmlsource/funcref/import_clr.xml
index 1094a74..aaa12ca 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/import_jar.xml b/docsrc/xmlsource/funcref/import_jar.xml
index e165c6c..5d43fbf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/initcap.xml b/docsrc/xmlsource/funcref/initcap.xml
index b51bb01..1073bf3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/internal_to_sql_type.xml b/docsrc/xmlsource/funcref/internal_to_sql_type.xml
index 0231848..63634f8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/internal_type.xml b/docsrc/xmlsource/funcref/internal_type.xml
index b67f1b9..0c23b0b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/internal_type_name.xml b/docsrc/xmlsource/funcref/internal_type_name.xml
index 4d6ba13..226c81a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isarray.xml b/docsrc/xmlsource/funcref/isarray.xml
index 4182ac6..138fbab 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isbinary.xml b/docsrc/xmlsource/funcref/isbinary.xml
index 253ef5a..a84a077 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isblob.xml b/docsrc/xmlsource/funcref/isblob.xml
index d2dfebe..e9d6aab 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isdouble.xml b/docsrc/xmlsource/funcref/isdouble.xml
index 8128de3..1c36c09 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isentity.xml b/docsrc/xmlsource/funcref/isentity.xml
index 19c6db3..f703caf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isfinitenumeric.xml b/docsrc/xmlsource/funcref/isfinitenumeric.xml
index 32c96ad..c1b4b0d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isfloat.xml b/docsrc/xmlsource/funcref/isfloat.xml
index c16a35d..852b7f1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isinteger.xml b/docsrc/xmlsource/funcref/isinteger.xml
index 89ae68b..3e8b153 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isnull.xml b/docsrc/xmlsource/funcref/isnull.xml
index 61281c7..e574b60 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isnumeric.xml b/docsrc/xmlsource/funcref/isnumeric.xml
index 767b870..a196c25 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/isstring.xml b/docsrc/xmlsource/funcref/isstring.xml
index 1ba2921..c7ebff1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/iszero.xml b/docsrc/xmlsource/funcref/iszero.xml
index 1c59aa2..5870bf5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/java_call_method.xml b/docsrc/xmlsource/funcref/java_call_method.xml
index 6fa9ff8..6579b1f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/java_get_property.xml b/docsrc/xmlsource/funcref/java_get_property.xml
index fe9791a..c7b4d65 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/java_load_class.xml b/docsrc/xmlsource/funcref/java_load_class.xml
index 0e80ec6..78972f1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/java_new_object.xml b/docsrc/xmlsource/funcref/java_new_object.xml
index 904f70a..56726f2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/java_set_property.xml b/docsrc/xmlsource/funcref/java_set_property.xml
index 1d870d6..63a643f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/java_vm_attach.xml b/docsrc/xmlsource/funcref/java_vm_attach.xml
index 493e65a..2c0cfdc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/java_vm_detach.xml b/docsrc/xmlsource/funcref/java_vm_detach.xml
index b8057ae..86590d0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/json_parse.xml b/docsrc/xmlsource/funcref/json_parse.xml
index e97426c..1896219 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/jvm_ref_import.xml b/docsrc/xmlsource/funcref/jvm_ref_import.xml
index ff83d63..4800a9b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/key_estimate.xml b/docsrc/xmlsource/funcref/key_estimate.xml
index a1ec4e5..3e41cbc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/lcase.xml b/docsrc/xmlsource/funcref/lcase.xml
index dc6b9e9..93a07bb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ldap_add.xml b/docsrc/xmlsource/funcref/ldap_add.xml
index 9bc3710..fc0accf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ldap_delete.xml b/docsrc/xmlsource/funcref/ldap_delete.xml
index 5aa9951..91ca915 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ldap_modify.xml b/docsrc/xmlsource/funcref/ldap_modify.xml
index e8d5415..accd49e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ldap_search.xml b/docsrc/xmlsource/funcref/ldap_search.xml
index 9050c45..bae855e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/left.xml b/docsrc/xmlsource/funcref/left.xml
index bdb5d9c..429a9ce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/length.xml b/docsrc/xmlsource/funcref/length.xml
index 75d2731..703871e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/lfs_exp.xml b/docsrc/xmlsource/funcref/lfs_exp.xml
index f8ec7b0..7c5b4dd 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/lh_get_handler.xml b/docsrc/xmlsource/funcref/lh_get_handler.xml
index 8ada40e..2058ab0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/lh_load_handler.xml b/docsrc/xmlsource/funcref/lh_load_handler.xml
index c379d0e..02ac206 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/locate.xml b/docsrc/xmlsource/funcref/locate.xml
index f2b9836..6757ff6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/log.xml b/docsrc/xmlsource/funcref/log.xml
index 1663a74..a92b69d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/log10.xml b/docsrc/xmlsource/funcref/log10.xml
index 218ebc0..b3baff9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/log_enable.xml b/docsrc/xmlsource/funcref/log_enable.xml
index e7b1e76..6bdd4fa 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/log_text.xml b/docsrc/xmlsource/funcref/log_text.xml
index c49478b..90d02d1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/lower.xml b/docsrc/xmlsource/funcref/lower.xml
index 187bdda..6fc7872 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ltrim.xml b/docsrc/xmlsource/funcref/ltrim.xml
index a6213ad..7524b0b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/make_array.xml b/docsrc/xmlsource/funcref/make_array.xml
index ec9bdc1..540e465 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/make_string.xml b/docsrc/xmlsource/funcref/make_string.xml
index a9f5a7f..c2196b2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/md5.xml b/docsrc/xmlsource/funcref/md5.xml
index 04d42ba..6b064af 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/md5_final.xml b/docsrc/xmlsource/funcref/md5_final.xml
index 4d9c22c..919edd7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/md5_init.xml b/docsrc/xmlsource/funcref/md5_init.xml
index 2b9e2e8..5d89044 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/md5_update.xml b/docsrc/xmlsource/funcref/md5_update.xml
index 0116f8a..8fdb4ab 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/metaWeblog.editPost.xml b/docsrc/xmlsource/funcref/metaWeblog.editPost.xml
index 8d50a8f..c023795 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/metaWeblog.getPost.xml b/docsrc/xmlsource/funcref/metaWeblog.getPost.xml
index 8eb2e26..92ab13e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml b/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml
index 49f02ae..0ba5407 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/metaWeblog.newPost.xml b/docsrc/xmlsource/funcref/metaWeblog.newPost.xml
index 5cfa003..ced6e50 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mime_body.xml b/docsrc/xmlsource/funcref/mime_body.xml
index 7fe6804..fea5553 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mime_part.xml b/docsrc/xmlsource/funcref/mime_part.xml
index 9e9f811..e749b91 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mime_tree.xml b/docsrc/xmlsource/funcref/mime_tree.xml
index 57338d3..a4e161c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/minute.xml b/docsrc/xmlsource/funcref/minute.xml
index 5d18575..72f6566 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mod.xml b/docsrc/xmlsource/funcref/mod.xml
index 34568f8..84ae2e0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/month.xml b/docsrc/xmlsource/funcref/month.xml
index 935706b..c4e34e0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/monthname.xml b/docsrc/xmlsource/funcref/monthname.xml
index 06321a6..6e18e0b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/msec_time.xml b/docsrc/xmlsource/funcref/msec_time.xml
index 8f8e131..14c6fff 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mt.getCategoryList.xml b/docsrc/xmlsource/funcref/mt.getCategoryList.xml
index 1f3c780..c898d61 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mt.getPostCategories.xml b/docsrc/xmlsource/funcref/mt.getPostCategories.xml
index 54c8287..ca3c67f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml b/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml
index 157d958..01b78b5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml b/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml
index 9cce8d0..0a29319 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mt.publishPost.xml b/docsrc/xmlsource/funcref/mt.publishPost.xml
index 13c2b2e..a7234c3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mt.setPostCategories.xml b/docsrc/xmlsource/funcref/mt.setPostCategories.xml
index 1f2bec8..dbfff3a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mt.supportedMethods.xml b/docsrc/xmlsource/funcref/mt.supportedMethods.xml
index 7efff8c..5b4ec51 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mts_connect.xml b/docsrc/xmlsource/funcref/mts_connect.xml
index 0ac7f9e..fb540b6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mts_get_timeout.xml b/docsrc/xmlsource/funcref/mts_get_timeout.xml
index f38419a..330d8d5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mts_set_timeout.xml b/docsrc/xmlsource/funcref/mts_set_timeout.xml
index 021a3d8..65661ba 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/mts_status.xml b/docsrc/xmlsource/funcref/mts_status.xml
index f76aaea..6104a6d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/name_part.xml b/docsrc/xmlsource/funcref/name_part.xml
index ffe7181..1159108 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/nm_max.xml b/docsrc/xmlsource/funcref/nm_max.xml
index 4512a8f..c7376d9 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-2011 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/nm_max_notnull.xml b/docsrc/xmlsource/funcref/nm_max_notnull.xml
index e347c61..22afd15 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-2011 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/nm_min.xml b/docsrc/xmlsource/funcref/nm_min.xml
index 27fa7f1..d49e021 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-2011 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/nm_min_notnull.xml b/docsrc/xmlsource/funcref/nm_min_notnull.xml
index 3628fca..1f7870b 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-2011 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/nntp_auth_get.xml b/docsrc/xmlsource/funcref/nntp_auth_get.xml
index 804b91b..0a8086a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/nntp_auth_post.xml b/docsrc/xmlsource/funcref/nntp_auth_post.xml
index a9ecd88..add1889 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/nntp_get.xml b/docsrc/xmlsource/funcref/nntp_get.xml
index bb31363..e5f3286 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/nntp_post.xml b/docsrc/xmlsource/funcref/nntp_post.xml
index ea7588c..3b6ae91 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/now.xml b/docsrc/xmlsource/funcref/now.xml
index 401fcfc..ff39fab 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/openxml.xml b/docsrc/xmlsource/funcref/openxml.xml
index 87ebc26..bbd002d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/os_chmod.xml b/docsrc/xmlsource/funcref/os_chmod.xml
index f5c3c85..1874025 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/os_chown.xml b/docsrc/xmlsource/funcref/os_chown.xml
index 3fcf029..4dd0933 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/pem_certificates_to_array.xml b/docsrc/xmlsource/funcref/pem_certificates_to_array.xml
index 815dcad..506f1ab 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/pldbg_stats.xml b/docsrc/xmlsource/funcref/pldbg_stats.xml
index 3716c75..fd58635 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/pldbg_stats_load.xml b/docsrc/xmlsource/funcref/pldbg_stats_load.xml
index 5c964e5..66c2eb9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/pop3_get.xml b/docsrc/xmlsource/funcref/pop3_get.xml
index b009344..d46f302 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/position.xml b/docsrc/xmlsource/funcref/position.xml
index 599c4f4..d4edf6d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/power.xml b/docsrc/xmlsource/funcref/power.xml
index 0513822..3a75792 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/prof_enable.xml b/docsrc/xmlsource/funcref/prof_enable.xml
index 5d374f3..1bf0ae6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/prof_sample.xml b/docsrc/xmlsource/funcref/prof_sample.xml
index 3ce50d5..2504b4b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/quarter.xml b/docsrc/xmlsource/funcref/quarter.xml
index a1d2110..2071f82 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/quote_dotted.xml b/docsrc/xmlsource/funcref/quote_dotted.xml
index 7d41d0e..9664517 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/randomize.xml b/docsrc/xmlsource/funcref/randomize.xml
index fde82b6..8cb2aae 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rclose.xml b/docsrc/xmlsource/funcref/rclose.xml
index 842d8c0..c25dc3b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml b/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml
index 22d6dfc..1cb92c3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rdf_audit_metadata.xml b/docsrc/xmlsource/funcref/rdf_audit_metadata.xml
index 2b041a8..c7d3f4e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rdf_backup_metadata.xml b/docsrc/xmlsource/funcref/rdf_backup_metadata.xml
index 8fb6910..72950b7 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-2006 OpenLink Software
+ 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
@@ -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 RDF Views and the like).</refpurpose>
+ <refpurpose>Makes a backup copy of RDF metadata (i.e., descriptions of Linked Data 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 aabc4f0..536113d 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 2008/03/19 20:12:43 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2008 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/rdf_graph_group_create.xml b/docsrc/xmlsource/funcref/rdf_graph_group_create.xml
index e7cb219..e7d2f8c 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.2 2009/05/05 14:10:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml b/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml
index 177d8ad..adbd62c 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.2 2009/05/05 14:10:10 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rdf_load_rdfa.xml b/docsrc/xmlsource/funcref/rdf_load_rdfa.xml
index 4af15ae..57533c3 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml b/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml
index 9226b65..a0aec97 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/rdf_load_turtle.xml b/docsrc/xmlsource/funcref/rdf_load_turtle.xml
index 68530ef..3c95485 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml b/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml
index 15111d6..683e9c1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml b/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml
index 12f50a0..d27722b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rdf_repl_start.xml b/docsrc/xmlsource/funcref/rdf_repl_start.xml
index a87da15..a280707 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rdf_restore_metadata.xml b/docsrc/xmlsource/funcref/rdf_restore_metadata.xml
index c5a1672..bc6d3c3 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-2006 OpenLink Software
+ 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
@@ -28,7 +28,7 @@
</refmeta>
<refnamediv>
<refname>DB.DBA.RDF_RESTORE_METADATA</refname>
- <refpurpose>Restores RDF metadata (descriptions of RDF Views and the like) from previously saved backup.</refpurpose>
+ <refpurpose>Restores RDF metadata (descriptions of Linked Data 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
new file mode 100644
index 0000000..a000fae
--- /dev/null
+++ b/docsrc/xmlsource/funcref/rdf_view_sync_to_physical.xml
@@ -0,0 +1,78 @@
+<?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 3c3bfdb..55fbccf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regexp_instr.xml b/docsrc/xmlsource/funcref/regexp_instr.xml
index e95f168..56e7035 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regexp_like.xml b/docsrc/xmlsource/funcref/regexp_like.xml
index 98a2123..c063779 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regexp_match.xml b/docsrc/xmlsource/funcref/regexp_match.xml
index 70ac4b2..1a0a851 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regexp_parse.xml b/docsrc/xmlsource/funcref/regexp_parse.xml
index cb76b56..f8d6f3d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regexp_replace.xml b/docsrc/xmlsource/funcref/regexp_replace.xml
index c09ae2f..6b4573f 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-2006 OpenLink Software
+ - 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
@@ -63,17 +63,17 @@ the number of extra spaces may not be the same everywhere in the text. </para>
<refsect2><title>position</title>
<para>By default this is set to 1.</para></refsect2>
<refsect2><title>occurrence</title>
- <para>By default this is set to 1. If you specify occurrence as DB NULL value it'll replace all the occurrences of the
-pattern in the string</para></refsect2>
+ <para>By default this is set to 0. If you specify occurrence as DB NULL value it will replace all
+ the occurrences of the pattern in the string.</para></refsect2>
<refsect2><title>match_parameter</title>
<para>By default this is set to null.</para></refsect2>
</refsect1>
<refsect1 id="ret_regexp_replace"><title>Returns</title>
<para>This function returns the a substring matching the regular expression.</para>
</refsect1>
- <refsect1 id="examples"><title>Examples</title>
+ <refsect1 id="examples_regexp_replace"><title>Examples</title>
<example id="ex_regexp_replace">
-<title>Examples</title>
+<title></title>
<para>This example has three spaces between Joe and Smith. The REPLACE function's
parameter specifies that two spaces should be replaced with one space. In
diff --git a/docsrc/xmlsource/funcref/regexp_substr.xml b/docsrc/xmlsource/funcref/regexp_substr.xml
index 5caf503..5c98979 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/registry_get.xml b/docsrc/xmlsource/funcref/registry_get.xml
index 7bb8a3e..2940c72 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/registry_get_all.xml b/docsrc/xmlsource/funcref/registry_get_all.xml
index f935b9a..c16a318 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/registry_name_is_protected.xml b/docsrc/xmlsource/funcref/registry_name_is_protected.xml
index e0de923..9adb57c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/registry_remove.xml b/docsrc/xmlsource/funcref/registry_remove.xml
index 3189843..422576b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/registry_set.xml b/docsrc/xmlsource/funcref/registry_set.xml
index 8977ad4..3bd79d1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_avgx.xml b/docsrc/xmlsource/funcref/regr_avgx.xml
index 374f1d9..bbce06c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_avgy.xml b/docsrc/xmlsource/funcref/regr_avgy.xml
index 6b08b32..0613b39 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_count.xml b/docsrc/xmlsource/funcref/regr_count.xml
index 8099a68..3fae6bb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_intercept.xml b/docsrc/xmlsource/funcref/regr_intercept.xml
index 79d0f8b..75f7b3c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_r2.xml b/docsrc/xmlsource/funcref/regr_r2.xml
index 0f75050..e3b20da 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_slope.xml b/docsrc/xmlsource/funcref/regr_slope.xml
index b39b45e..0e07507 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_sxx.xml b/docsrc/xmlsource/funcref/regr_sxx.xml
index 351f80d..1b3a726 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_sxy.xml b/docsrc/xmlsource/funcref/regr_sxy.xml
index 5790ccc..5a4e9f0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/regr_syy.xml b/docsrc/xmlsource/funcref/regr_syy.xml
index 4a3def3..e918cd6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repeat.xml b/docsrc/xmlsource/funcref/repeat.xml
index 3c6d97a..34287b1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_disconnect.xml b/docsrc/xmlsource/funcref/repl_disconnect.xml
index 48d233a..45887ad 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_grant.xml b/docsrc/xmlsource/funcref/repl_grant.xml
index c011385..2cea7e7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_init_copy.xml b/docsrc/xmlsource/funcref/repl_init_copy.xml
index 7cf9891..4f12cbb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_new_log.xml b/docsrc/xmlsource/funcref/repl_new_log.xml
index 19e0f5b..a114037 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_pub_add.xml b/docsrc/xmlsource/funcref/repl_pub_add.xml
index a9e21e8..e0ad893 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_pub_init_image.xml b/docsrc/xmlsource/funcref/repl_pub_init_image.xml
index 11d1038..885ad66 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_pub_remove.xml b/docsrc/xmlsource/funcref/repl_pub_remove.xml
index cc72143..4476c45 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_publish.xml b/docsrc/xmlsource/funcref/repl_publish.xml
index 61a11f2..e67c9c7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_purge.xml b/docsrc/xmlsource/funcref/repl_purge.xml
index 9768c4d..a7e1bb9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_revoke.xml b/docsrc/xmlsource/funcref/repl_revoke.xml
index 4517b1a..a3383e0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_sched_init.xml b/docsrc/xmlsource/funcref/repl_sched_init.xml
index b55a863..f306be8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_server.xml b/docsrc/xmlsource/funcref/repl_server.xml
index 833f7e6..e3a3948 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_server_rename.xml b/docsrc/xmlsource/funcref/repl_server_rename.xml
index 7481734..a575b9d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_stat.xml b/docsrc/xmlsource/funcref/repl_stat.xml
index d894144..5c07fba 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_status.xml b/docsrc/xmlsource/funcref/repl_status.xml
index a03c46b..6460030 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_subscribe.xml b/docsrc/xmlsource/funcref/repl_subscribe.xml
index 15a3fb7..8c7d381 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_sync.xml b/docsrc/xmlsource/funcref/repl_sync.xml
index 207fdfc..47e05bf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_sync_all.xml b/docsrc/xmlsource/funcref/repl_sync_all.xml
index 2d5e7ac..8a82bb7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_text.xml b/docsrc/xmlsource/funcref/repl_text.xml
index f872528..05dad87 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_this_server.xml b/docsrc/xmlsource/funcref/repl_this_server.xml
index a93fe91..19d003f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_unpublish.xml b/docsrc/xmlsource/funcref/repl_unpublish.xml
index 3e8fdef..d447865 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/repl_unsubscribe.xml b/docsrc/xmlsource/funcref/repl_unsubscribe.xml
index f057178..ffcecb6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/replace.xml b/docsrc/xmlsource/funcref/replace.xml
index e7042d5..e09a109 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/replay.xml b/docsrc/xmlsource/funcref/replay.xml
index 5ad9f5f..fc5131f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/result.xml b/docsrc/xmlsource/funcref/result.xml
index 3c3b57e..330473f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/result_names.xml b/docsrc/xmlsource/funcref/result_names.xml
index 999e49f..bfc468e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rexecute.xml b/docsrc/xmlsource/funcref/rexecute.xml
index 1629ac5..5a578f2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/right.xml b/docsrc/xmlsource/funcref/right.xml
index 17d0f0d..0e026ff 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rmoreresults.xml b/docsrc/xmlsource/funcref/rmoreresults.xml
index da4a826..1b11782 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rnd.xml b/docsrc/xmlsource/funcref/rnd.xml
index 164bb87..8cc6f7b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rnext.xml b/docsrc/xmlsource/funcref/rnext.xml
index 55794b2..7c12f8b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/row_count.xml b/docsrc/xmlsource/funcref/row_count.xml
index a8e8091..50e1490 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rowvector_digit_sort.xml b/docsrc/xmlsource/funcref/rowvector_digit_sort.xml
index 125767f..b490f21 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-2009 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/rstmtexec.xml b/docsrc/xmlsource/funcref/rstmtexec.xml
index 729da38..5da89c0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/rtrim.xml b/docsrc/xmlsource/funcref/rtrim.xml
index cc81f12..75e8f61 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/search_excerpt.xml b/docsrc/xmlsource/funcref/search_excerpt.xml
index b45c741..413f3c0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/second.xml b/docsrc/xmlsource/funcref/second.xml
index 5ebb1e9..c7dc82b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sequence_get_all.xml b/docsrc/xmlsource/funcref/sequence_get_all.xml
index 1935993..8d59624 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sequence_next.xml b/docsrc/xmlsource/funcref/sequence_next.xml
index fc4a80e8..320868a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sequence_remove.xml b/docsrc/xmlsource/funcref/sequence_remove.xml
index ddce1b8..2b940ad 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sequence_set.xml b/docsrc/xmlsource/funcref/sequence_set.xml
index 6f5f385..226c2c7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/serialize.xml b/docsrc/xmlsource/funcref/serialize.xml
index 5bbecc5..12e7599 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml b/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml
index bad9fb2..a02c555 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/serv_queue_top.xml b/docsrc/xmlsource/funcref/serv_queue_top.xml
index a2366a6..97d348e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/server_root.xml b/docsrc/xmlsource/funcref/server_root.xml
index 4e7b39b..5a45bdf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ses_connect.xml b/docsrc/xmlsource/funcref/ses_connect.xml
index 5262bf8..142d440 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ses_disconnect.xml b/docsrc/xmlsource/funcref/ses_disconnect.xml
index 2677459..cac6682 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ses_read_line.xml b/docsrc/xmlsource/funcref/ses_read_line.xml
index a9cf90b..5168842 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ses_write.xml b/docsrc/xmlsource/funcref/ses_write.xml
index 5f497ad..c8bbfc0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/set_identity_column.xml b/docsrc/xmlsource/funcref/set_identity_column.xml
index 0e5a546..27b3452 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/set_row_count.xml b/docsrc/xmlsource/funcref/set_row_count.xml
index e6c5079..9278392 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/set_user_id.xml b/docsrc/xmlsource/funcref/set_user_id.xml
index 593ae18..1cfd55d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sha1_digest.xml b/docsrc/xmlsource/funcref/sha1_digest.xml
new file mode 100644
index 0000000..f38c2be
--- /dev/null
+++ b/docsrc/xmlsource/funcref/sha1_digest.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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
+ -
+ -
+-->
+<refentry id="fn_sha1_digest">
+ <refmeta>
+ <refentrytitle>sha1_digest</refentrytitle>
+ <refmiscinfo>hash</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>sha1_digest</refname>
+ <refpurpose>returns string containing sha1 digest encoded in base64</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis id="fsyn_sha1_digest">
+ <funcprototype id="fproto_sha1_digest">
+ <funcdef><function>sha1_digest</function></funcdef>
+ <paramdef>in <parameter>str</parameter> varchar</paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1 id="desc_sha1_digest"><title>Description</title>
+ <para>Returns string containing sha1 digest encoded in base64. This function has an alias: xenc_sha1_digest ().</para>
+ </refsect1>
+ <refsect1 id="params_sha1_digest"><title>Parameters</title>
+ <refsect2><title><parameter>str</parameter></title>
+ <para>A <type>varchar</type> value.</para>
+ </refsect2>
+ </refsect1>
+ <refsect1 id="ret_sha1_digest"><title>Return Values</title>
+ <para><function>sha1_digest</function> returns a <type>varchar</type>
+ containing sha1 digest encoded in base64. </para>
+ </refsect1>
+ <refsect1 id="examples_sha1_digest"><title>Examples</title>
+ <example id="ex_sha1_digest_1"><title>Simple Example</title>
+ <para>Base64-encode a string</para>
+ <screen>SQL> select sha1_digest('demodemo');
+callret
+VARCHAR
+_______________________________________________________________________________
+
+5863d9e4cbdf522eaa62e0747fceb1c5b249ba13
+
+1 Rows. -- 25 msec.
+</screen>
+ </example>
+ </refsect1>
+ <refsect1 id="seealso_sha1_digest"><title>See Also</title>
+ <para><link linkend="fn_encode_base64"><function>encode_base64</function></link></para>
+ <para><link linkend="fn_md5"><function>md5</function></link></para>
+ <para><link linkend="fn_serialize"><function>serialize</function></link></para>
+ </refsect1>
+</refentry>
+
+
diff --git a/docsrc/xmlsource/funcref/sign.xml b/docsrc/xmlsource/funcref/sign.xml
index ebec22e..f4763fe 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/signal.xml b/docsrc/xmlsource/funcref/signal.xml
index 9a42cbd..aa7b1b2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sinv_create_inverse.xml b/docsrc/xmlsource/funcref/sinv_create_inverse.xml
index 22561f5..814d3ef 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml b/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml
index d4ae4b0..28b24ca 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sinv_drop_inverse.xml b/docsrc/xmlsource/funcref/sinv_drop_inverse.xml
index a703c0d..75a77e7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/smime_decrypt.xml b/docsrc/xmlsource/funcref/smime_decrypt.xml
index 731aca1..e88a369 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/smime_encrypt.xml b/docsrc/xmlsource/funcref/smime_encrypt.xml
index 62ee699..df98142 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/smime_sign.xml b/docsrc/xmlsource/funcref/smime_sign.xml
index eef4f0e..e0a7e2b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/smime_verify.xml b/docsrc/xmlsource/funcref/smime_verify.xml
index e38e6bc..725eb6f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/smtp_send.xml b/docsrc/xmlsource/funcref/smtp_send.xml
index d6c355c..8282a88 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_box_structure.xml b/docsrc/xmlsource/funcref/soap_box_structure.xml
index 0449691..a6619dc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_box_xml_entity.xml b/docsrc/xmlsource/funcref/soap_box_xml_entity.xml
index 6be3bd7..88d350c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_call.xml b/docsrc/xmlsource/funcref/soap_call.xml
index ce7bc64..1133c59 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_client.xml b/docsrc/xmlsource/funcref/soap_client.xml
index 4343b0f..4e56a31 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_current_url.xml b/docsrc/xmlsource/funcref/soap_current_url.xml
index 49c1eeb..7ad3dcf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_dt_define.xml b/docsrc/xmlsource/funcref/soap_dt_define.xml
index c53ef23..3c69c6f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_make_error.xml b/docsrc/xmlsource/funcref/soap_make_error.xml
index bc0e1ac..3f1f396 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_print_box.xml b/docsrc/xmlsource/funcref/soap_print_box.xml
index 32b6ef2..614be97 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_sdl.xml b/docsrc/xmlsource/funcref/soap_sdl.xml
index f2ef422..51c0366 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_server.xml b/docsrc/xmlsource/funcref/soap_server.xml
index df96448..def64ef 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_wsdl.xml b/docsrc/xmlsource/funcref/soap_wsdl.xml
index 8c896e7..d925433 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/soap_wsdl_import.xml b/docsrc/xmlsource/funcref/soap_wsdl_import.xml
index a83c0d6..a5a2db6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/space.xml b/docsrc/xmlsource/funcref/space.xml
index 8f5e23c..6f2d6f0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml b/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml
index 933e4b5..f2bae6d 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 RDF Views.</refpurpose>
+ <refpurpose>Returns a vector of names of tables that are used as sources for Linked Data 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 RDF Views. Application
+ <para>Returns a vector of names of tables that are used as sources for Linked Data 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 RDF Views and these views does not
+ <para>Note that if some SQL views are used as sources for Linked Data 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 ed45ca0..0860acd 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/split_decode.xml b/docsrc/xmlsource/funcref/split_decode.xml
index 3197276..64a5450 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/spotlight_metadata.xml b/docsrc/xmlsource/funcref/spotlight_metadata.xml
index cf9919a..caf74de 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sprintf.xml b/docsrc/xmlsource/funcref/sprintf.xml
index 9732025..3403049 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sprintf_inverse.xml b/docsrc/xmlsource/funcref/sprintf_inverse.xml
index 3f051d9..7318970 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sprintf_iri.xml b/docsrc/xmlsource/funcref/sprintf_iri.xml
index bb72f8a..a4a2670 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml b/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml
index e664868..e7d7928 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sprintf_or_null.xml b/docsrc/xmlsource/funcref/sprintf_or_null.xml
index 3b09f11..21a8f98 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_columns.xml b/docsrc/xmlsource/funcref/sql_columns.xml
index 56c3666..7d42a5b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_config_data_sources.xml b/docsrc/xmlsource/funcref/sql_config_data_sources.xml
index 024dea5..958b949 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_data_sources.xml b/docsrc/xmlsource/funcref/sql_data_sources.xml
index 7712d6b..a6a828f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_driver_connect.xml b/docsrc/xmlsource/funcref/sql_driver_connect.xml
index af1b07c..3f59003 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml b/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml
index d793476..004101a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml b/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml
index d2b66a0..e2a8ef8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_gettypeinfo.xml b/docsrc/xmlsource/funcref/sql_gettypeinfo.xml
index 4f50de8..06e1417 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_primary_keys.xml b/docsrc/xmlsource/funcref/sql_primary_keys.xml
index 0c74277..b0e1a6c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_procedures.xml b/docsrc/xmlsource/funcref/sql_procedures.xml
index 2c4b28c..b02d95c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml b/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml
index 231052c..1e56d28 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_special_columns.xml b/docsrc/xmlsource/funcref/sql_special_columns.xml
index f16eddb..c7844e4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_statistics.xml b/docsrc/xmlsource/funcref/sql_statistics.xml
index 2dee350..7add1e6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_tables.xml b/docsrc/xmlsource/funcref/sql_tables.xml
index 81240c1..3042011 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_transact.xml b/docsrc/xmlsource/funcref/sql_transact.xml
index b29684f..a4fce06 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_write_file_dsn.xml b/docsrc/xmlsource/funcref/sql_write_file_dsn.xml
index 3ad167a..319bf93 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml b/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml
index 225b160..317161d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sqrt.xml b/docsrc/xmlsource/funcref/sqrt.xml
index d1a3a0c..48a886c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/starts_with.xml b/docsrc/xmlsource/funcref/starts_with.xml
index 5be33a2..b79951b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/status.xml b/docsrc/xmlsource/funcref/status.xml
index 893393e..50eadb6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/stddev.xml b/docsrc/xmlsource/funcref/stddev.xml
index 012594e..c650437 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/stddev_pop.xml b/docsrc/xmlsource/funcref/stddev_pop.xml
index fa833f5..1df97c2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/stddev_samp.xml b/docsrc/xmlsource/funcref/stddev_samp.xml
index 27c954f..0a6f728 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/strcasestr.xml b/docsrc/xmlsource/funcref/strcasestr.xml
index 84c3a9d..eb09dce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/strchr.xml b/docsrc/xmlsource/funcref/strchr.xml
index 2694008..21c78a2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/strcontains.xml b/docsrc/xmlsource/funcref/strcontains.xml
index 541c235..77f0358 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/string_output.xml b/docsrc/xmlsource/funcref/string_output.xml
index b2caed4..8cbe029 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/string_output_flush.xml b/docsrc/xmlsource/funcref/string_output_flush.xml
index 368db75..b0178f7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/string_output_gz_compress.xml b/docsrc/xmlsource/funcref/string_output_gz_compress.xml
index 7daf753..83a1cde 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/string_output_string.xml b/docsrc/xmlsource/funcref/string_output_string.xml
index 7b29847..a9a1c48 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/string_to_file.xml b/docsrc/xmlsource/funcref/string_to_file.xml
index c377521..2017845 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/stringdate.xml b/docsrc/xmlsource/funcref/stringdate.xml
index a17e4c9..82298a4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/stringtime.xml b/docsrc/xmlsource/funcref/stringtime.xml
index c84933b..edd1e41 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/strrchr.xml b/docsrc/xmlsource/funcref/strrchr.xml
index ce11991..13e8519 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/strstr.xml b/docsrc/xmlsource/funcref/strstr.xml
index a54bca8..bc43bec 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sub_schedule.xml b/docsrc/xmlsource/funcref/sub_schedule.xml
index 7914e46..a1660d0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/subseq.xml b/docsrc/xmlsource/funcref/subseq.xml
index 150a5bc..c44eb78 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/substring.xml b/docsrc/xmlsource/funcref/substring.xml
index 443cdcb..39040bf 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sync_repl.xml b/docsrc/xmlsource/funcref/sync_repl.xml
index 4b496e3..780f69e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sys_db_stat.xml b/docsrc/xmlsource/funcref/sys_db_stat.xml
index fcbb6d0..d3eacb8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sys_lockdown.xml b/docsrc/xmlsource/funcref/sys_lockdown.xml
index c0be1f0..98372de 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sys_stat.xml b/docsrc/xmlsource/funcref/sys_stat.xml
index 472ff33..2bb5b6b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sys_stat_analyze.xml b/docsrc/xmlsource/funcref/sys_stat_analyze.xml
index 1d05717..255c83d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/sys_stat_histogram.xml b/docsrc/xmlsource/funcref/sys_stat_histogram.xml
index 87765c0..d5e84ce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/system.xml b/docsrc/xmlsource/funcref/system.xml
index 67f0f43..bb08375 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/table_drop_policy.xml b/docsrc/xmlsource/funcref/table_drop_policy.xml
index f8f036a..ef9a5cb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/table_set_policy.xml b/docsrc/xmlsource/funcref/table_set_policy.xml
index 035972d..07b7724 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml b/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml
index 1f605e1..92cf6fe 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml b/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml
index 3e961d7..d182988 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/template.sh b/docsrc/xmlsource/funcref/template.sh
index 7058b73..47dedb0 100755
--- a/docsrc/xmlsource/funcref/template.sh
+++ b/docsrc/xmlsource/funcref/template.sh
@@ -1,4 +1,4 @@
-# $Id: template.sh,v 1.4 2009/02/12 15:15:13 source Exp $
+# $Id$
# ----------------------------------------------------------------------
# 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-2006 OpenLink Software
+ 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
@@ -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 2009/02/12 15:15:13 source Exp $
+ $Id$
-->
<refentry id="${prefix}_${id}">
<refmeta>
diff --git a/docsrc/xmlsource/funcref/template.xml b/docsrc/xmlsource/funcref/template.xml
index fe54eff..014ff3f 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-2006 OpenLink Software
+ - 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
@@ -69,8 +69,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: template.xml,v 1.1.1.1 2006/04/11 17:56:15 source Exp $
- (C)Copyright 2005 OpenLink Software
+ $Id$
-->
<refentry id="fn_">
<refmeta>
diff --git a/docsrc/xmlsource/funcref/tidy_html.xml b/docsrc/xmlsource/funcref/tidy_html.xml
index 2958e0c..3ba3b7b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/tidy_list_errors.xml b/docsrc/xmlsource/funcref/tidy_list_errors.xml
index b6eecc6..8ed7c4c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/timezone.xml b/docsrc/xmlsource/funcref/timezone.xml
index 1e131f5..c982040 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/tmp_file_name.xml b/docsrc/xmlsource/funcref/tmp_file_name.xml
index 7eb929a..cb4e648 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/trace_off.xml b/docsrc/xmlsource/funcref/trace_off.xml
index 2f8503a..d1cde07 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/trace_on.xml b/docsrc/xmlsource/funcref/trace_on.xml
index 7fe41a0..1ba5cf9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/trace_status.xml b/docsrc/xmlsource/funcref/trace_status.xml
index 23fce75..3a3d2df 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/tree_md5.xml b/docsrc/xmlsource/funcref/tree_md5.xml
index 7ae0e9c..a47c49f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/trigonometric.xml b/docsrc/xmlsource/funcref/trigonometric.xml
index 99544ae..2daa8ca 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/trim.xml b/docsrc/xmlsource/funcref/trim.xml
index e0208a1..95b28bc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/txn_error.xml b/docsrc/xmlsource/funcref/txn_error.xml
index 62baff2..f6d3dba 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/txn_killall.xml b/docsrc/xmlsource/funcref/txn_killall.xml
index 5ea3a04..17c3c8a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/ucase.xml b/docsrc/xmlsource/funcref/ucase.xml
index cb227c2..9917090 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_delete_binding.xml b/docsrc/xmlsource/funcref/uddi_delete_binding.xml
index 2546d71..fd50a06 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_delete_business.xml b/docsrc/xmlsource/funcref/uddi_delete_business.xml
index ec1ffb5..b0dc68d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_delete_service.xml b/docsrc/xmlsource/funcref/uddi_delete_service.xml
index 041e734..3d568f7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_delete_tModel.xml b/docsrc/xmlsource/funcref/uddi_delete_tModel.xml
index 7efa3b1..9ddcdfa 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_discard_authToken.xml b/docsrc/xmlsource/funcref/uddi_discard_authToken.xml
index 495de1e..345d47b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_find_binding.xml b/docsrc/xmlsource/funcref/uddi_find_binding.xml
index a7f8669..6bcd260 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_find_business.xml b/docsrc/xmlsource/funcref/uddi_find_business.xml
index a7f0196..0ef992c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_find_service.xml b/docsrc/xmlsource/funcref/uddi_find_service.xml
index 7a36025..ca6bbb7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_find_tModel.xml b/docsrc/xmlsource/funcref/uddi_find_tModel.xml
index 7173fd8..4ecabed 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_authToken.xml b/docsrc/xmlsource/funcref/uddi_get_authToken.xml
index d054109..6cff87c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_bindingDetail.xml b/docsrc/xmlsource/funcref/uddi_get_bindingDetail.xml
index 931ff33..2f6e165 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_businessDetail.xml b/docsrc/xmlsource/funcref/uddi_get_businessDetail.xml
index a5917b1..10dc56e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_businessDetailExt.xml b/docsrc/xmlsource/funcref/uddi_get_businessDetailExt.xml
index e7665c0..52c9607 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_registeredInfo.xml b/docsrc/xmlsource/funcref/uddi_get_registeredInfo.xml
index a2c9a87..e7b1832 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_serviceDetail.xml b/docsrc/xmlsource/funcref/uddi_get_serviceDetail.xml
index 8364adc..1d8c7fc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_tModelDetail.xml b/docsrc/xmlsource/funcref/uddi_get_tModelDetail.xml
index b40a504..b947ace 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_save_binding.xml b/docsrc/xmlsource/funcref/uddi_save_binding.xml
index 533917f..4e57085 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_save_business.xml b/docsrc/xmlsource/funcref/uddi_save_business.xml
index b57feca..9345d3a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_save_service.xml b/docsrc/xmlsource/funcref/uddi_save_service.xml
index 006c7d0..93de445 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uddi_save_tModel.xml b/docsrc/xmlsource/funcref/uddi_save_tModel.xml
index a38f3eb..1700bcc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/udt_defines_field.xml b/docsrc/xmlsource/funcref/udt_defines_field.xml
index 76e9586..c3eb695 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/udt_get.xml b/docsrc/xmlsource/funcref/udt_get.xml
index 639ba19..f13109d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/udt_implements_method.xml b/docsrc/xmlsource/funcref/udt_implements_method.xml
index 19894a7..1206e5c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/udt_instance_of.xml b/docsrc/xmlsource/funcref/udt_instance_of.xml
index 956fdc0..b5291f5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/udt_set.xml b/docsrc/xmlsource/funcref/udt_set.xml
index 35bc3dc..bdbad5b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/unimport_clr.xml b/docsrc/xmlsource/funcref/unimport_clr.xml
index 6360a37..d066458 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/unimport_jar.xml b/docsrc/xmlsource/funcref/unimport_jar.xml
index b9d98ce..b0111cc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/updateXML.xml b/docsrc/xmlsource/funcref/updateXML.xml
index 1bed598..85bfc58 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/upper.xml b/docsrc/xmlsource/funcref/upper.xml
index 7e9f6d5..c6f6591 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/urlrewrite_create_regex_rule.xml b/docsrc/xmlsource/funcref/urlrewrite_create_regex_rule.xml
index 003157f..986a75f 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.2 2010/01/06 21:33:50 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2008 OpenLink Software
+ 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
@@ -46,6 +46,7 @@
<paramdef>in <parameter>accept_pattern</parameter> varchar</paramdef>
<paramdef>in <parameter>do_not_continue</parameter> integer</paramdef>
<paramdef>in <parameter>http_redirect_code</parameter> integer</paramdef>
+ <paramdef>in <parameter>http_header_lines</parameter> varchar</paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
@@ -94,6 +95,9 @@ Note that '*Accept*' will return the whole "Accept:" line whereas '*ac
<refsect2><title><parameter>http_redirect_code</parameter></title>
<para>NULL or the integer values 301, 302, 303, or 406, are currently allowed. If a 3xx redirect code is given, an HTTP redirect response will be sent back to client. If NULL is specified, the server will process the redirect internally.</para>
</refsect2>
+ <refsect2><title><parameter>http_header_lines</parameter></title>
+ <para>Additional header lines to be added to the return value.</para>
+ </refsect2>
</refsect1>
<refsect1 id="ret_urlrewrite_create_regex_rule"><title>Return Types</title>
<para>The return value is not specified.</para>
@@ -106,11 +110,11 @@ Note that '*Accept*' will return the whole "Accept:" line whereas '*ac
-->
<refsect1 id="examples_urlrewrite_create_regex_rule">
<title>Examples</title>
- <example id="ex_urlrewrite_create_regex_rule"><title></title>
+ <example id="ex_urlrewrite_create_regex_rule1"><title>Example 1</title>
<para></para>
- <screen><![CDATA[
+<programlisting><![CDATA[
DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
- 'demo_nw_rule2',
+ 'demo_nw_rule1',
1,
'(/[^#]*)',
vector('path'),
@@ -122,9 +126,26 @@ DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
0,
null
);
-
-]]>
-</screen>
+]]></programlisting>
+ </example>
+ <example id="ex_urlrewrite_create_regex_rule2"><title>Example 2</title>
+ <para></para>
+<programlisting><![CDATA[
+DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
+ 'demo_nw_rule2',
+ 1,
+ '^/~(.*)',
+ vector('uname'),
+ 1,
+ '/home/%s',
+ vector('uname'),
+ null,
+ null,
+ 2,
+ null,
+ 'MS-Author-Via: DAV'
+ );
+]]></programlisting>
</example>
</refsect1>
</refentry>
diff --git a/docsrc/xmlsource/funcref/user_change_password.xml b/docsrc/xmlsource/funcref/user_change_password.xml
index e4ee02d..7cea243 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_create.xml b/docsrc/xmlsource/funcref/user_create.xml
index 0cbc626..b6c4762 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_drop.xml b/docsrc/xmlsource/funcref/user_drop.xml
index 86ba496..25afc2a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_get_option.xml b/docsrc/xmlsource/funcref/user_get_option.xml
index 32f0d48..b094303 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_grant_role.xml b/docsrc/xmlsource/funcref/user_grant_role.xml
index 8284d6d..040ba87 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_key_load.xml b/docsrc/xmlsource/funcref/user_key_load.xml
index ed7cae9..1828f8c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_revoke_role.xml b/docsrc/xmlsource/funcref/user_revoke_role.xml
index cf157e6..3008d8f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_role_create.xml b/docsrc/xmlsource/funcref/user_role_create.xml
index 6de97fa..39123e8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_role_drop.xml b/docsrc/xmlsource/funcref/user_role_drop.xml
index 67e112b..f6c6f14 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_set_option.xml b/docsrc/xmlsource/funcref/user_set_option.xml
index 5f445b3..215becd 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_set_password.xml b/docsrc/xmlsource/funcref/user_set_password.xml
index 533c679..c5ba731 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/user_set_qualifier.xml b/docsrc/xmlsource/funcref/user_set_qualifier.xml
index 764cfb2..7ec1ce2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/username.xml b/docsrc/xmlsource/funcref/username.xml
index 67362df..2ddd629 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uudecode.xml b/docsrc/xmlsource/funcref/uudecode.xml
index 2732fd1..1a4ad15 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uuencode.xml b/docsrc/xmlsource/funcref/uuencode.xml
index 91f2232..05fdeca 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/uuvalidate.xml b/docsrc/xmlsource/funcref/uuvalidate.xml
index b74d1ee..515a346 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vacuum.xml b/docsrc/xmlsource/funcref/vacuum.xml
index ba57a64..9d56bec 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vad_check.xml b/docsrc/xmlsource/funcref/vad_check.xml
index e9ab9dd..4ab9524 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vad_check_installability.xml b/docsrc/xmlsource/funcref/vad_check_installability.xml
index f226a87..8a1b299 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vad_check_uninstallability.xml b/docsrc/xmlsource/funcref/vad_check_uninstallability.xml
index 628fbef..87ecc66 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vad_fail_check.xml b/docsrc/xmlsource/funcref/vad_fail_check.xml
index 03513ad..811f5b6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vad_install.xml b/docsrc/xmlsource/funcref/vad_install.xml
index cf80645..a3588c5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vad_load_file.xml b/docsrc/xmlsource/funcref/vad_load_file.xml
index a00b9a7..81962ac 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-2006 OpenLink Software
+ - 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
@@ -74,6 +74,7 @@
</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
new file mode 100644
index 0000000..1a86126
--- /dev/null
+++ b/docsrc/xmlsource/funcref/vad_load_sql_file.xml
@@ -0,0 +1,93 @@
+<?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 d759305..b1ef34a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vad_safe_exec.xml b/docsrc/xmlsource/funcref/vad_safe_exec.xml
index ca5cd54..cf57042 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vad_uninstall.xml b/docsrc/xmlsource/funcref/vad_uninstall.xml
index f2deb62..a72b64a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/var.xml b/docsrc/xmlsource/funcref/var.xml
index 8efb8fa..3d99dc0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/var_pop.xml b/docsrc/xmlsource/funcref/var_pop.xml
index 36179fe..1d317b0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/var_samp.xml b/docsrc/xmlsource/funcref/var_samp.xml
index 7da7a1d..b4d92fb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vd_remote_data_source.xml b/docsrc/xmlsource/funcref/vd_remote_data_source.xml
index dc9ede2..37d3fb5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vd_remote_proc_wrapper.xml b/docsrc/xmlsource/funcref/vd_remote_proc_wrapper.xml
index 2b089b0..59dec04 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vd_remote_table.xml b/docsrc/xmlsource/funcref/vd_remote_table.xml
index f335932..b6e4114 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vd_statistics.xml b/docsrc/xmlsource/funcref/vd_statistics.xml
index 769328a..088e579 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vdd_disconnect_data_source.xml b/docsrc/xmlsource/funcref/vdd_disconnect_data_source.xml
index b9b2273..f707980 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vdd_measure_rpc_time.xml b/docsrc/xmlsource/funcref/vdd_measure_rpc_time.xml
index 1783fca..286882e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vector.xml b/docsrc/xmlsource/funcref/vector.xml
index efe5fc0..2d5dd4c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vector_concat.xml b/docsrc/xmlsource/funcref/vector_concat.xml
index 8669442..2426c69 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vhost_define.xml b/docsrc/xmlsource/funcref/vhost_define.xml
index 26fcf17..fec9002 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vhost_remove.xml b/docsrc/xmlsource/funcref/vhost_remove.xml
index c3efa03..33f2c11 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/virtuoso_ini_path.xml b/docsrc/xmlsource/funcref/virtuoso_ini_path.xml
index e990016..1c9c2e6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vsp_calculate_digest.xml b/docsrc/xmlsource/funcref/vsp_calculate_digest.xml
index a904829..ccc7224 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vt_batch.xml b/docsrc/xmlsource/funcref/vt_batch.xml
index cead7aa..06773a5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vt_batch_d_id.xml b/docsrc/xmlsource/funcref/vt_batch_d_id.xml
index 87a2fa6..c35ce43 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vt_batch_feed.xml b/docsrc/xmlsource/funcref/vt_batch_feed.xml
index ab09be5..dba55f2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vt_batch_feed_offband.xml b/docsrc/xmlsource/funcref/vt_batch_feed_offband.xml
index 9132b4f..ec3fadb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vt_batch_update.xml b/docsrc/xmlsource/funcref/vt_batch_update.xml
index 6ee57c4..62a8731 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vt_create_text_index.xml b/docsrc/xmlsource/funcref/vt_create_text_index.xml
index 1783a01..aa30f5d 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-2006 OpenLink Software
+ - 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
@@ -43,6 +43,7 @@
<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>
@@ -161,6 +162,9 @@ 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 5066ecf..d654d46 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/vt_is_noise.xml b/docsrc/xmlsource/funcref/vt_is_noise.xml
index 1f69a17..e1441fc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/week.xml b/docsrc/xmlsource/funcref/week.xml
index c92400d..02356de 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/wsdl_import_udt.xml b/docsrc/xmlsource/funcref/wsdl_import_udt.xml
index fb54889..4db849e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/wst_cli.xml b/docsrc/xmlsource/funcref/wst_cli.xml
index 405225e..f32518d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/x509_certificate_verify.xml b/docsrc/xmlsource/funcref/x509_certificate_verify.xml
index 1305aca..372cf77 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/x509_from_csr.xml b/docsrc/xmlsource/funcref/x509_from_csr.xml
index d744b47..0c000a3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_SPKI_read.xml b/docsrc/xmlsource/funcref/xenc_SPKI_read.xml
index 1e4e8e1..dcddf06 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/xenc_X509_certificate_serialize.xml b/docsrc/xmlsource/funcref/xenc_X509_certificate_serialize.xml
index 6090e8a..fc1ea7c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_bn2dec.xml b/docsrc/xmlsource/funcref/xenc_bn2dec.xml
index d249a39..b5871a0 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/xenc_decrypt_soap.xml b/docsrc/xmlsource/funcref/xenc_decrypt_soap.xml
index d57bdd6..d765e1c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_delete_temp_keys.xml b/docsrc/xmlsource/funcref/xenc_delete_temp_keys.xml
index 2a14e76..cbdd7b4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_encrypt.xml b/docsrc/xmlsource/funcref/xenc_encrypt.xml
index be4dd7a..858cc34 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_get_key_algo.xml b/docsrc/xmlsource/funcref/xenc_get_key_algo.xml
index 9344ee9..07ee152 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_get_key_identifier.xml b/docsrc/xmlsource/funcref/xenc_get_key_identifier.xml
index a6e31d7..620402c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_3DES_read.xml b/docsrc/xmlsource/funcref/xenc_key_3DES_read.xml
index ecd9b47..e182e1b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_3des_create.xml b/docsrc/xmlsource/funcref/xenc_key_3des_create.xml
index bd3b28b..fe21332 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_3des_rand_create.xml b/docsrc/xmlsource/funcref/xenc_key_3des_rand_create.xml
index 6c2ba66..7e92739 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_DSA_read.xml b/docsrc/xmlsource/funcref/xenc_key_DSA_read.xml
index e1fb3fe..b45d057 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_RSA_read.xml b/docsrc/xmlsource/funcref/xenc_key_RSA_read.xml
index d010ebf..68425d9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_aes_create.xml b/docsrc/xmlsource/funcref/xenc_key_aes_create.xml
index b6d814c..75f4537 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_aes_rand_create.xml b/docsrc/xmlsource/funcref/xenc_key_aes_rand_create.xml
index 0e30483..3f4dffa 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_create_cert.xml b/docsrc/xmlsource/funcref/xenc_key_create_cert.xml
index a727e5b..a9cdad0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_dsa_create.xml b/docsrc/xmlsource/funcref/xenc_key_dsa_create.xml
index faf8ffc..0f471bb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_exists.xml b/docsrc/xmlsource/funcref/xenc_key_exists.xml
index e9d2a58..543c301 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_inst_create.xml b/docsrc/xmlsource/funcref/xenc_key_inst_create.xml
index e1c1d43..8d6bc45 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_remove.xml b/docsrc/xmlsource/funcref/xenc_key_remove.xml
index c998cd3..0550611 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_rsa_create.xml b/docsrc/xmlsource/funcref/xenc_key_rsa_create.xml
index 993304d..57bc63e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_serialize.xml b/docsrc/xmlsource/funcref/xenc_key_serialize.xml
index bcd0407..1e5c3d7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_pem_export.xml b/docsrc/xmlsource/funcref/xenc_pem_export.xml
index c86476c..a898462 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-2006 OpenLink Software
+ 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
@@ -67,7 +67,7 @@
</refsect1>
<refsect1 id="examples_xenc_pem_export">
<title>Examples</title>
- <example id="ex_xenc_pem_export"><title>Creating a certificate and exporting it in PEM format</title>
+ <example id="ex_xenc_pem_export_1"><title>Creating a certificate and exporting it in PEM format</title>
<para>The example below imports a client public key, then it creates a certificate and sign it with CA's private key and finally it exports the generated certificate in PEM format.</para>
<screen><![CDATA[
kname := xenc_SPKI_read (null, replace (get_keyword ('key', params), '\r\n', ''));
@@ -85,6 +85,22 @@
]]>
</screen>
</example>
+ <example id="ex_xenc_pem_export_2"><title>Export Web Server certificate for Virtuoso HTTPS endpoints</title>
+ <para>This example exports Web Server certificate generated for Virtuoso HTTPS Endpoint:</para>
+ <orderedlist>
+ <listitem><ulink url="http://ods.openlinksw.com/wiki/ODS/ODSSetupSSL#Configure%20an%20HTTPS%20Listener%20for%20handling%20HTTPS%20requests%20from%20HTTP%20user%20agents%20%28clients%29">Configure an HTTPS Listener for handling HTTPS requests from HTTP user agents (clients).</ulink></listitem>
+ <listitem>Suppose the generate certificate from the previous step has name "https_key_localhost"</listitem>
+ <listitem>To export the certificate, execute from iSQL:
+<programlisting><![CDATA[
+SQL> SELECT xenc_pem_export ('https_key_localhost');
+]]></programlisting>
+ <figure id="srv" float="1">
+ <title>iSQL Export Web Server Sertificate Output</title>
+ <graphic fileref="ui/export_srv_cert.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ </example>
</refsect1>
<refsect1 id="seealso_xenc_pem_export">
<title>See Also</title>
diff --git a/docsrc/xmlsource/funcref/xenc_pkcs12_export.xml b/docsrc/xmlsource/funcref/xenc_pkcs12_export.xml
index 77356a2..f4814f8 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/xenc_set_primary_key.xml b/docsrc/xmlsource/funcref/xenc_set_primary_key.xml
index b942a50..f3dbbaa 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_x509_csr_generate.xml b/docsrc/xmlsource/funcref/xenc_x509_csr_generate.xml
index c6f40fe..b1c21ce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xenc_x509_generate.xml b/docsrc/xmlsource/funcref/xenc_x509_generate.xml
index 3e338ab..5f385ec 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/xenc_x509_ss_generate.xml b/docsrc/xmlsource/funcref/xenc_x509_ss_generate.xml
index a597c4e..8ca9459 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-2006 OpenLink Software
+ 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.deleteMultipleFiles.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.deleteMultipleFiles.xml
index fea0a4d..9f823c9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.getServerCapabilities.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.getServerCapabilities.xml
index 159c7f4..d7f6cd5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.mailPasswordToUser.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.mailPasswordToUser.xml
index 05d8e1a..a5963f8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.registerUser.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.registerUser.xml
index 4859372..821ee0e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.saveMultipleFiles.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.saveMultipleFiles.xml
index d063ac4..bfe36c4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_auto.xml b/docsrc/xmlsource/funcref/xml_auto.xml
index 1fa55df..a7d21d3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_auto_dtd.xml b/docsrc/xmlsource/funcref/xml_auto_dtd.xml
index 6e1807d..4182ac3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_auto_schema.xml b/docsrc/xmlsource/funcref/xml_auto_schema.xml
index b229eca..4a419bf 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-2006 OpenLink Software
+ - 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
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 b003728..a8e91fc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_cut.xml b/docsrc/xmlsource/funcref/xml_cut.xml
index 9ee80e4..57c1493 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_doc_output_option.xml b/docsrc/xmlsource/funcref/xml_doc_output_option.xml
index f2f303e..e315f23 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_get_ns_prefix.xml b/docsrc/xmlsource/funcref/xml_get_ns_prefix.xml
index ddee5c5..4ea7a2d 100644
--- a/docsrc/xmlsource/funcref/xml_get_ns_prefix.xml
+++ b/docsrc/xmlsource/funcref/xml_get_ns_prefix.xml
@@ -31,23 +31,12 @@ Flags is a bit mask where 1 means to look in the connection, 2 in the global set
<para>bitmask of flags that permit some sorts of syntax errors in resource, use 0.</para>
</refsect2>
</refsect1>
-<!--
- <refsect1 id="ret___xml_get_ns_prefix"><title>Return Types</title>
- <para>The return value is not specified and may be changed in future versions.</para>
+ <refsect1 id="seealso__xml_get_ns_prefix"><title>See Also</title>
+ <para>
+ <link linkend="fn_xml_get_ns_uri"><function>xml_get_ns_uri</function></link>
+ <link linkend="fn_xml_ns_uname"><function>xml_ns_uname</function></link>
+ <link linkend="fn_xml_ns_iristr"><function>xml_ns_iristr</function></link>
+ <link linkend="fn_xml_nsexpand_iristr"><function>xml_nsexpand_iristr</function></link>
+ </para>
</refsect1>
- <refsect1 id="errors___xml_get_ns_prefix">
- <title>Errors</title>
- <para>This function can generate the following errors:</para>
- <errorcode></errorcode>
- </refsect1>
-
- <refsect1 id="examples___xml_get_ns_prefix">
- <title>Examples</title>
- <example id="ex___xml_get_ns_prefix"><title></title>
-<para>Sample Example 1</para>
-<screen><![CDATA[
-<para>Sample Example 2</para>
- </example>
- </refsect1>
--->
</refentry>
diff --git a/docsrc/xmlsource/funcref/xml_get_ns_uri.xml b/docsrc/xmlsource/funcref/xml_get_ns_uri.xml
index e19c451..02ed827 100644
--- a/docsrc/xmlsource/funcref/xml_get_ns_uri.xml
+++ b/docsrc/xmlsource/funcref/xml_get_ns_uri.xml
@@ -31,23 +31,12 @@ Flags is a bit mask where 1 means to look in the connection, 2 in the global set
<para></para>
</refsect2>
</refsect1>
-<!--
- <refsect1 id="ret___xml_get_ns_uri"><title>Return Types</title>
- <para>The return value is not specified and may be changed in future versions.</para>
+ <refsect1 id="seealso__xml_get_ns_uri"><title>See Also</title>
+ <para>
+ <link linkend="fn_xml_get_ns_prefix"><function>xml_get_ns_prefix</function></link>
+ <link linkend="fn_xml_ns_uname"><function>xml_ns_uname</function></link>
+ <link linkend="fn_xml_ns_iristr"><function>xml_ns_iristr</function></link>
+ <link linkend="fn_xml_nsexpand_iristr"><function>xml_nsexpand_iristr</function></link>
+ </para>
</refsect1>
- <refsect1 id="errors___xml_get_ns_uri">
- <title>Errors</title>
- <para>This function can generate the following errors:</para>
- <errorcode></errorcode>
- </refsect1>
-
- <refsect1 id="examples___xml_get_ns_uri">
- <title>Examples</title>
- <example id="ex___xml_get_ns_uri"><title></title>
-<para>Sample Example 1</para>
-<screen><![CDATA[
-<para>Sample Example 2</para>
- </example>
- </refsect1>
--->
</refentry>
diff --git a/docsrc/xmlsource/funcref/xml_load_mapping_schema_decl.xml b/docsrc/xmlsource/funcref/xml_load_mapping_schema_decl.xml
index 0b6d72d..2e8f5fe 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_load_schema_decl.xml b/docsrc/xmlsource/funcref/xml_load_schema_decl.xml
index ea18761..88f6c7e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_namespace_scope.xml b/docsrc/xmlsource/funcref/xml_namespace_scope.xml
index 583b1ef..47ddc22 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_ns_iristr.xml b/docsrc/xmlsource/funcref/xml_ns_iristr.xml
new file mode 100644
index 0000000..7477b85
--- /dev/null
+++ b/docsrc/xmlsource/funcref/xml_ns_iristr.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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
+ -
+ -
+-->
+<refentry id="fn___xml_ns_iristr">
+ <refmeta>
+ <refentrytitle>__xml_ns_iristr</refentrytitle>
+ <refmiscinfo>rdf</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>__xml_ns_iristr</refname>
+ <refpurpose>Returns an varchar with box flag set to BF_IRI.</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis id="fsyn___xml_ns_iristr">
+ <funcprototype id="fproto___xml_ns_iristr">
+ <funcdef>
+ <function>__xml_ns_iristr</function>
+ </funcdef>
+ <paramdef>in <parameter>str1</parameter> varchar</paramdef>
+ <paramdef>in <parameter>str2</parameter> varchar</paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1 id="desc___xml_ns_iristr">
+ <title>Description</title>
+ <para>This function is similar to the <link linkend="fn_xml_ns_uname"><function>xml_ns_uname</function></link> function,
+ and it returns an varchar with box flag set to BF_IRI.</para>
+ </refsect1>
+ <refsect1 id="params___xml_ns_iristr">
+ <title>Parameters</title>
+ <refsect2><title>str1</title>
+ <para>Namespace prefix</para>
+ </refsect2>
+ <refsect2><title>str2</title>
+ <para>Local part (varchar)</para>
+ </refsect2>
+ </refsect1>
+ <refsect1 id="examples__xml_ns_iristr"><title>Examples</title>
+ <example id="ex_xml_ns_iristr_1"><title>Simple Example</title>
+ <para>Base64-encode a string</para>
+<programlisting><![CDATA[
+SQL> SELECT __xml_ns_iristr ('foaf', 'knows');
+__xml_ns_iristr
+VARCHAR
+_______________________________________________________________________________
+
+http://xmlns.com/foaf/0.1/knows
+
+1 Rows. -- 1 msec.
+]]></programlisting>
+ </example>
+ </refsect1>
+ <refsect1 id="seealso__xml_ns_iristr"><title>See Also</title>
+ <para><link linkend="fn_xml_ns_uname"><function>xml_ns_uname</function></link></para>
+ <para><link linkend="fn_xml_nsexpand_iristr"><function>xml_nsexpand_iristr</function></link></para>
+ <para><link linkend="fn_xml_get_ns_prefix"><function>xml_get_ns_prefix</function></link></para>
+ <para><link linkend="fn_xml_get_ns_uri"><function>xml_get_ns_uri</function></link></para>
+ </refsect1>
+</refentry>
diff --git a/docsrc/xmlsource/funcref/xml_ns_uname.xml b/docsrc/xmlsource/funcref/xml_ns_uname.xml
new file mode 100644
index 0000000..ce5e471
--- /dev/null
+++ b/docsrc/xmlsource/funcref/xml_ns_uname.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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
+ -
+ -
+-->
+<refentry id="fn___xml_ns_uname">
+ <refmeta>
+ <refentrytitle>__xml_ns_uname</refentrytitle>
+ <refmiscinfo>rdf</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>__xml_ns_uname</refname>
+ <refpurpose>Returns an UNAME that is IRI --- concatenation of the expanded namespace IRI and the local part.</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis id="fsyn___xml_ns_uname">
+ <funcprototype id="fproto___xml_ns_uname">
+ <funcdef>
+ <function>__xml_ns_uname</function>
+ </funcdef>
+ <paramdef>in <parameter>str1</parameter> varchar</paramdef>
+ <paramdef>in <parameter>str2</parameter> varchar</paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1 id="desc___xml_ns_uname">
+ <title>Description</title>
+ <para>Returns an UNAME that is IRI -- concatenation of the expanded namespace IRI and the local part.</para>
+ </refsect1>
+ <refsect1 id="params___xml_ns_uname">
+ <title>Parameters</title>
+ <refsect2><title>str1</title>
+ <para>Namespace prefix.</para>
+ </refsect2>
+ <refsect2><title>str2</title>
+ <para>Local part (varchar).</para>
+ </refsect2>
+
+ </refsect1>
+ <refsect1 id="examples__xml_ns_uname"><title>Examples</title>
+ <example id="ex_xml_ns_uname_1"><title>Simple Example</title>
+ <para></para>
+<programlisting><![CDATA[
+SQL> SELECT __xml_ns_uname ('foaf', 'knows');
+__xml_ns_uname
+VARCHAR
+_______________________________________________________________________________
+
+http://xmlns.com/foaf/0.1/knows
+
+1 Rows. -- 0 msec.
+]]></programlisting>
+ </example>
+ </refsect1>
+ <refsect1 id="seealso__xml_ns_uname"><title>See Also</title>
+ <para><link linkend="fn_xml_ns_iristr"><function>xml_ns_iristr</function></link></para>
+ <para><link linkend="fn_xml_nsexpand_iristr"><function>xml_nsexpand_iristr</function></link></para>
+ <para><link linkend="fn_xml_get_ns_prefix"><function>xml_get_ns_prefix</function></link></para>
+ <para><link linkend="fn_xml_get_ns_uri"><function>xml_get_ns_uri</function></link></para>
+ </refsect1>
+</refentry>
diff --git a/docsrc/xmlsource/funcref/xml_nsexpand_iristr.xml b/docsrc/xmlsource/funcref/xml_nsexpand_iristr.xml
new file mode 100644
index 0000000..05aa005
--- /dev/null
+++ b/docsrc/xmlsource/funcref/xml_nsexpand_iristr.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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
+ -
+ -
+-->
+<refentry id="fn___xml_nsexpand_iristr">
+ <refmeta>
+ <refentrytitle>__xml_nsexpand_iristr</refentrytitle>
+ <refmiscinfo>rdf</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>__xml_nsexpand_iristr</refname>
+ <refpurpose>Checks if the string is QName and if it is so then replaces namespace prefix to the
+ full namespace IRI.</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis id="fsyn___xml_nsexpand_iristr">
+ <funcprototype id="fproto___xml_nsexpand_iristr">
+ <funcdef>
+ <function>__xml_nsexpand_iristr</function>
+ </funcdef>
+ <paramdef>in <parameter>str</parameter> varchar</paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1 id="desc___xml_nsexpand_iristr">
+ <title>Description</title>
+ <para>Checks if the string is QName and if it is so then replaces namespace prefix to the
+ full namespace IRI. Otherwise signals error if the argument is local IRI without a prefix.</para>
+ </refsect1>
+ <refsect1 id="params___xml_nsexpand_iristr">
+ <title>Parameters</title>
+ <refsect2><title>str</title>
+ <para>QName. For ex. if QName is "prefix:local", then conveniently is replaced "prefix:" with
+ the namespace IRI</para>
+ </refsect2>
+ </refsect1>
+ <refsect1 id="examples__xml_nsexpand_iristr"><title>Examples</title>
+ <example id="ex_xml_nsexpand_iristr_1"><title>Example with FOAF namespace prefix</title>
+ <para></para>
+<programlisting><![CDATA[
+SQL> SELECT __xml_nsexpand_iristr ('foaf:knows');
+__xml_nsexpand_iristr
+VARCHAR
+_______________________________________________________________________________
+
+http://xmlns.com/foaf/0.1/knows
+
+1 Rows. -- 0 msec.
+]]></programlisting>
+ </example>
+ <example id="ex_xml_nsexpand_iristr_2"><title>Example with no namespace prefix</title>
+ <para></para>
+<programlisting><![CDATA[
+SQL> SELECT __xml_nsexpand_iristr ('no-namespace-prefix-iri');
+
+*** Error 22023: [Virtuoso Driver][Virtuoso Server]SR649:
+No XML namespace prefix in string "no-namespace-prefix-iri"
+in
+__xml_nsexpand_iristr:(BIF),
+ __01 => 'no-namespace-prefix-iri',
+<Top Level>
+at line 5 of Top-Level:
+SELECT __xml_nsexpand_iristr ('no-namespace-prefix-iri')
+]]></programlisting>
+ </example>
+ <example id="ex_xml_nsexpand_iristr_3"><title>Example with namespace prefix "local"</title>
+ <para></para>
+<programlisting><![CDATA[
+SQL> SELECT __xml_nsexpand_iristr ('no-such-prefix:local');
+
+*** Error 22023: [Virtuoso Driver][Virtuoso Server]SR648:
+Unknown XML namespace prefix in IRI "no-such-prefix:local"
+in
+__xml_nsexpand_iristr:(BIF),
+ __01 => 'no-such-prefix:local',
+<Top Level>
+at line 6 of Top-Level:
+SELECT __xml_nsexpand_iristr ('no-such-prefix:local')
+]]></programlisting>
+ </example>
+ <example id="ex_xml_nsexpand_iristr_4"><title>Example with namespace prefix ""no-such-prefix""</title>
+ <para></para>
+<programlisting><![CDATA[
+SQL> SELECT __xml_ns_iristr ('no-such-prefix', 'knows');
+
+*** Error 22023: [Virtuoso Driver][Virtuoso Server]SR648: Unknown XML namespace prefix "no-such-prefix"
+in
+__xml_ns_iristr:(BIF),
+ __01 => 'no-such-prefix',
+ __02 => 'knows',
+<Top Level>
+at line 7 of Top-Level:
+SELECT __xml_ns_iristr ('no-such-prefix', 'knows')
+]]></programlisting>
+ </example>
+ </refsect1>
+ <refsect1 id="seealso__xml_nsexpand_iristr"><title>See Also</title>
+ <para><link linkend="fn_xml_ns_uname"><function>xml_ns_uname</function></link></para>
+ <para><link linkend="fn_xml_ns_iristr"><function>xml_ns_iristr</function></link></para>
+ <para><link linkend="fn_xml_get_ns_prefix"><function>xml_get_ns_prefix</function></link></para>
+ <para><link linkend="fn_xml_get_ns_uri"><function>xml_get_ns_uri</function></link></para>
+ </refsect1>
+</refentry>
diff --git a/docsrc/xmlsource/funcref/xml_path.xml b/docsrc/xmlsource/funcref/xml_path.xml
index 960951e..388c704 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_persistent.xml b/docsrc/xmlsource/funcref/xml_persistent.xml
index 2dfe5d6..c533117 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_remove_ns_by_prefix.xml b/docsrc/xmlsource/funcref/xml_remove_ns_by_prefix.xml
index 3c3956e..755f266 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_set_ns_decl.xml b/docsrc/xmlsource/funcref/xml_set_ns_decl.xml
index dad1be7..e1b715d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_template.xml b/docsrc/xmlsource/funcref/xml_template.xml
index 78dfb0d..31ca24c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_tree.xml b/docsrc/xmlsource/funcref/xml_tree.xml
index bb69639..6eb58a3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_tree_doc.xml b/docsrc/xmlsource/funcref/xml_tree_doc.xml
index 52998d0..040941b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_tree_doc_media_type.xml b/docsrc/xmlsource/funcref/xml_tree_doc_media_type.xml
index 49fd6ca..f27e9ba 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_uri_get.xml b/docsrc/xmlsource/funcref/xml_uri_get.xml
index d7223f9..51e837d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_uri_merge.xml b/docsrc/xmlsource/funcref/xml_uri_merge.xml
index 8374d3e..91eb656 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_validate_dtd.xml b/docsrc/xmlsource/funcref/xml_validate_dtd.xml
index df75a7f..7ca77a6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_validate_schema.xml b/docsrc/xmlsource/funcref/xml_validate_schema.xml
index 9bf302a..d28f609 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_view_dtd.xml b/docsrc/xmlsource/funcref/xml_view_dtd.xml
index 9068325..748132d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xml_view_schema.xml b/docsrc/xmlsource/funcref/xml_view_schema.xml
index 1bcde74..54fdaa1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xmlsql_update.xml b/docsrc/xmlsource/funcref/xmlsql_update.xml
index 40c7cfe..93cf062 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xmlupdate.xml b/docsrc/xmlsource/funcref/xmlupdate.xml
index 805443f..ccc6744 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/_row.xml b/docsrc/xmlsource/funcref/xo/_row.xml
index 1a2916e..ea08268 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/lh_get_handler.xml b/docsrc/xmlsource/funcref/xo/lh_get_handler.xml
index af56c39..0a8df4e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/lh_load_handler.xml b/docsrc/xmlsource/funcref/xo/lh_load_handler.xml
index 571e42b..66716d6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/make_oid.xml b/docsrc/xmlsource/funcref/xo/make_oid.xml
index 85e7620..914b1f5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/matches_like.xml b/docsrc/xmlsource/funcref/xo/matches_like.xml
index 33ad170..868042d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/new_mail.xml b/docsrc/xmlsource/funcref/xo/new_mail.xml
index f66df02..addfc40 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/new_news.xml b/docsrc/xmlsource/funcref/xo/new_news.xml
index fa71fb6..3f12952 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/oid_class_spec.xml b/docsrc/xmlsource/funcref/xo/oid_class_spec.xml
index 91062a8..4e9e2ac 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/openxml.xml b/docsrc/xmlsource/funcref/xo/openxml.xml
index 87ebc26..bbd002d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/row_column.xml b/docsrc/xmlsource/funcref/xo/row_column.xml
index 5b5e923..cd10892 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/row_deref.xml b/docsrc/xmlsource/funcref/xo/row_deref.xml
index c3d2d11..f59b5aa 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/row_identity.xml b/docsrc/xmlsource/funcref/xo/row_identity.xml
index 0fa9981..ed79d1b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/row_table.xml b/docsrc/xmlsource/funcref/xo/row_table.xml
index dffac5e..76fd1f3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/sqlfunctions_old_obsolete.xml b/docsrc/xmlsource/funcref/xo/sqlfunctions_old_obsolete.xml
index 246b46e..01cad36 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/vt_create_ftt.xml b/docsrc/xmlsource/funcref/xo/vt_create_ftt.xml
index c87082e..0b07934 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xo/xml_view_schema.xml b/docsrc/xmlsource/funcref/xo/xml_view_schema.xml
index 1de5da0..1d9e8a6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xpath_eval.xml b/docsrc/xmlsource/funcref/xpath_eval.xml
index 9f082c1..0946b40 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xper_cut.xml b/docsrc/xmlsource/funcref/xper_cut.xml
index 655e703..38b7d6e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xper_doc.xml b/docsrc/xmlsource/funcref/xper_doc.xml
index 76f84de..c5fa0e0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xper_locate_words.xml b/docsrc/xmlsource/funcref/xper_locate_words.xml
index 80dc570..f7b06d6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xper_navigation.xml b/docsrc/xmlsource/funcref/xper_navigation.xml
index 1ccab33..54cb5ce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xpf_extension.xml b/docsrc/xmlsource/funcref/xpf_extension.xml
index 669b7bd..679399d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xpf_extension_remove.xml b/docsrc/xmlsource/funcref/xpf_extension_remove.xml
index ec0e26b..357d857 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xquery_eval.xml b/docsrc/xmlsource/funcref/xquery_eval.xml
index 4b86908..c3236ac 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xslt.xml b/docsrc/xmlsource/funcref/xslt.xml
index 0deecdd..7f1dd60 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xslt_format_number.xml b/docsrc/xmlsource/funcref/xslt_format_number.xml
index f4b3415..be25db6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xslt_prof_enable.xml b/docsrc/xmlsource/funcref/xslt_prof_enable.xml
index 785f2c0..e9f2750 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xslt_sheet.xml b/docsrc/xmlsource/funcref/xslt_sheet.xml
index 3ebd3e9..d37e157 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xslt_stale.xml b/docsrc/xmlsource/funcref/xslt_stale.xml
index f6a7237..6b5be38 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xte_head.xml b/docsrc/xmlsource/funcref/xte_head.xml
index 119da83..fe9cfad 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xte_node.xml b/docsrc/xmlsource/funcref/xte_node.xml
index 8c71ed0..28518ee 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xte_node_from_nodebld.xml b/docsrc/xmlsource/funcref/xte_node_from_nodebld.xml
index 1c12f06..20ce640 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xte_nodebld_acc.xml b/docsrc/xmlsource/funcref/xte_nodebld_acc.xml
index 18518f5..2b0ed98 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xte_nodebld_final.xml b/docsrc/xmlsource/funcref/xte_nodebld_final.xml
index a1e8ed8..488a5af 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xte_nodebld_init.xml b/docsrc/xmlsource/funcref/xte_nodebld_init.xml
index 8e32cb5..ebf1e38 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/xtree_doc.xml b/docsrc/xmlsource/funcref/xtree_doc.xml
index dcdd410..55b0408 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/funcref/year.xml b/docsrc/xmlsource/funcref/year.xml
index 8536edc..5a7b172 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/functions.xml b/docsrc/xmlsource/functions.xml
index 6c736f8..2a4cc02 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-2006 OpenLink Software
+ - 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
@@ -151,7 +151,7 @@ built-in functions of the Virtuoso XPATH Processor. These can be used in XPATH,
&make_array; &make_string; &md5; &md5_init; &md5_update;
&md5_final; &mime_body; &mime_part; &mime_tree; &minute; &mod; &month;
&monthname; &msec_time; &mts_connect; &mts_get_timeout;
-&mts_set_timeout; &mts_status;
+&mts_set_timeout; &mts_status; &sha1_digest;
&name_part; &nntp_auth_get; &nntp_auth_post; &nntp_get; &nntp_post; &now;
@@ -167,18 +167,18 @@ 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_triples_to_rdf_xml_text; &rdf_triples_to_ttl; &rdf_64bit_upgrade; &rdf_view_sync_to_physical;
&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; &http_nt_triple; &http_ttl_triple;
+ &isref; &SAMPLE; &GROUP_CONCAT; &GROUP_DIGEST; &http_nt_triple; &http_ttl_triple;
&ann_phrase_class_add; &ann_phrase_class_del; &ap_build_match_list; &ap_add_phrases;
<!--
- Uncommented for Virtuoso 6 Release-->
-&iri_split;&xml_get_ns_prefix;&xml_get_ns_uri;
+&iri_split;&xml_get_ns_prefix;&xml_get_ns_uri;&xml_ns_uname;&xml_ns_iristr;&xml_nsexpand_iristr;
@@ -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_pack; &vad_safe_exec; &vad_uninstall;
+&vad_install; &vad_load_file; &vad_load_sql_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 c4afe59..ee81011 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/inprocess.xml b/docsrc/xmlsource/inprocess.xml
index 7f6fd23..3cfb362 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/installation.xml b/docsrc/xmlsource/installation.xml
index a57c8b8..9fbd149 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-2006 OpenLink Software
+ - 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
@@ -24,41 +24,115 @@
<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
+ <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>
-
-
+ </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
+ <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>
+ </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>
+ </simplelist>
+ </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>
+ </sect1>
+
<sect1 id="installwin32">
<title>Virtuoso for Windows</title>
<sect2 id="b4ustart">
@@ -68,7 +142,7 @@ section.
<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
+ 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>
@@ -107,113 +181,28 @@ section.
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>
- </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
+ 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>
+ <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
+<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>
@@ -226,15 +215,15 @@ for Windows NT/2000/XP.</para></note>
<tgroup cols="2">
<thead><row><entry>Port</entry><entry>Used by</entry></row></thead>
<tbody>
-<row>
+ <row>
<entry>1111</entry>
<entry>Default Virtuoso Server port</entry></row>
-<row>
+ <row>
<entry>8889</entry>
<entry>Default Virtuoso Visual Server Administration Interface HTTP port</entry></row>
- </tbody>
- </tgroup>
-</table>
+ </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
@@ -329,7 +318,7 @@ netstat -an | more
<graphic fileref="inst/v50pex8603.png" width="504" depth="386"/>
</figure>
</listitem>
- <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
@@ -339,7 +328,7 @@ a trial or full license file to be obtained online:</para>
<graphic fileref="inst/v50pex8604.png" width="504" depth="386"/>
</figure>
</listitem>
- <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">
@@ -347,7 +336,7 @@ a trial or full license file to be obtained online:</para>
<graphic fileref="inst/v50pex8605.png" width="976" depth="682"/>
</figure>
</listitem>
- <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
@@ -413,8 +402,8 @@ 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>
+ </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.
@@ -436,9 +425,9 @@ online. This Web based page can be used for general configuration and usage of t
<figure id="winpinst17" float="1">
<title>Virtuoso Server Welcome page</title>
<graphic fileref="ui/winpinst17.png"/>
- </figure>
- </listitem>
- </orderedlist>
+ </figure>
+ </listitem>
+ </orderedlist>
<para>The installation Virtuoso Universal Server is complete.</para>
</sect3>
<sect3 id="TwoTierConfigInst">
@@ -580,6 +569,8 @@ binaries and databases (defaults) for issues if install fails.</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>
+ <para><emphasis>oplmgr issue</emphasis></para>
+ <para>See <link linkend="oplmngrdlptl">Troubleshooting License Problems</link></para>
</sect3>
</sect2>
@@ -668,7 +659,7 @@ virtuoso-odbc-f +instance demo +service start
<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
+ <para>Ensure that the services applet from the control panel is closed while
issuing the above commands to prevent locking.</para>
</note>
</sect2>
@@ -713,7 +704,7 @@ virtuoso-odbc-f +instance demo +service start
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
+ <para>The <link linkend="VirtuosoDriverJDBC">JDBC Driver</link> section in
the Access Interfaces chapter.</para></tip>
</sect3>
@@ -806,9 +797,9 @@ isqlo <enter a valid ODBC Data Source Name></programlisting>
<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
+ <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-->
@@ -913,7 +904,7 @@ ready to commence the Virtuoso installation process. </para>
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
+ <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>
@@ -923,9 +914,9 @@ directory.</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
+<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
@@ -936,7 +927,7 @@ Checking for existing installations and/or instances of Virtuoso...
** 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
@@ -945,7 +936,7 @@ Checking for existing installations and/or instances of Virtuoso...
</listitem>
<listitem>
-<para>If you are upgrading a server then the installer will save copies of
+<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...
@@ -957,9 +948,9 @@ find: bin: No such file or directory
</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
+<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...
@@ -971,7 +962,7 @@ license file [./virtuoso.lic]:
</listitem>
<listitem>
-<para>Now the installer will continue to install files from the package. Every
+<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
@@ -988,23 +979,23 @@ vsp/vsp_auth.sql
</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
+<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
+** 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
+<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...
@@ -1023,15 +1014,15 @@ Please choose which Virtuoso server you wish to install:
</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
+<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:
+Suggested file locations:
/usr/local/lib
/usr/local/jdk1.3/jre/lib/i386/classic
/usr/local/jdk1.3/jre/lib/i386/server
@@ -1049,8 +1040,8 @@ the default (/usr/local/jdk1.3/jre/lib/i386/client):
</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
+<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
@@ -1059,7 +1050,7 @@ Enter to use the default (/home/openlink/virtuoso/mono)
</listitem>
<listitem>
-<para>Virtuoso now has enough information to configure its environment and
+<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
@@ -1080,9 +1071,9 @@ Setting up file initd_startup_demo.template
</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
+<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
@@ -1093,11 +1084,11 @@ SQL listener (default 1111):
</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
+<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
@@ -1106,7 +1097,7 @@ HTTP listener (default 8889):
</listitem>
<listitem>
-<para>Now you must supply a friendly name that you wish to identify
+<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>
@@ -1125,7 +1116,7 @@ Please enter a user name for default database Zero Configuration
</listitem>
<listitem>
-<para>Now we have all of the above details to supply again for the Demo Virtuoso
+<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
@@ -1143,29 +1134,29 @@ Please enter a user name for demonstration database Zero Configuration
</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
+<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 :
+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.
+<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 :
+Confirm Password :
Please wait while the passwords are changed:
@@ -1178,11 +1169,11 @@ Changing passwords for the Demo Universal Server
<programlisting><![CDATA[
Please enter a replacement for the Demonstration Database Server's
SQL Administrative (dba) account password (twice) :
-Confirm Password :
+Confirm Password :
Please enter a replacement for the Demonstration Database Server's
WebDAV Administrative (dav) account password (twice) :
-Confirm Password :
+Confirm Password :
Please wait while the passwords are changed:
done.
@@ -1190,22 +1181,22 @@ done.
</listitem>
<listitem>
-<para>The file owner and group is changed at the end of the installation. You
+<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:
+Setting owners:
]]></programlisting>
</listitem>
<listitem>
-<para>Finally the installer can start Virtuoso servers installed for you, but
+<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
+one via e-mail; in case of difficulties please contact
<Technical.Support at openlinksw.com>.
]]></programlisting>
</listitem>
@@ -1235,12 +1226,14 @@ $<Directory where Virtuoso is installed>/bin/virtuoso.log
<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>
+ <para><emphasis>oplmgr issue</emphasis></para>
+ <para>See <link linkend="oplmngrlfla">OpenLink License Management for Linux</link></para>
</sect3>
- </sect2>
+ </sect2>
<sect2 id="linautovirt"><title>Starting Virtuoso Automatically on Reboot</title>
- <para>Two files, named initd_startup.template and
+ <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
@@ -1285,9 +1278,9 @@ bash# cd /etc/rc5.d ; ln -s ../init.d/virtuoso S99virtuoso
<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
+ <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-->
@@ -1374,7 +1367,7 @@ ready to commence the Virtuoso installation process. </para>
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
+ <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>
@@ -1384,9 +1377,9 @@ directory.</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
+<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
@@ -1397,7 +1390,7 @@ Checking for existing installations and/or instances of Virtuoso...
** 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
@@ -1406,7 +1399,7 @@ Checking for existing installations and/or instances of Virtuoso...
</listitem>
<listitem>
-<para>If you are upgrading a server then the installer will save copies of
+<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...
@@ -1418,9 +1411,9 @@ find: bin: No such file or directory
</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
+<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...
@@ -1432,7 +1425,7 @@ license file [./virtuoso.lic]:
</listitem>
<listitem>
-<para>Now the installer will continue to install files from the package. Every
+<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
@@ -1449,23 +1442,23 @@ vsp/vsp_auth.sql
</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
+<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
+** 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
+<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...
@@ -1484,15 +1477,15 @@ Please choose which Virtuoso server you wish to install:
</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
+<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:
+Suggested file locations:
/usr/local/lib
/usr/local/jdk1.3/jre/lib/i386/classic
/usr/local/jdk1.3/jre/lib/i386/server
@@ -1510,8 +1503,8 @@ the default (/usr/local/jdk1.3/jre/lib/i386/client):
</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
+<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
@@ -1520,7 +1513,7 @@ Enter to use the default (/home/openlink/virtuoso/mono)
</listitem>
<listitem>
-<para>Virtuoso now has enough information to configure its environment and
+<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
@@ -1541,9 +1534,9 @@ Setting up file initd_startup_demo.template
</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
+<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
@@ -1554,11 +1547,11 @@ SQL listener (default 1111):
</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
+<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
@@ -1567,7 +1560,7 @@ HTTP listener (default 8889):
</listitem>
<listitem>
-<para>Now you must supply a friendly name that you wish to identify
+<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>
@@ -1586,7 +1579,7 @@ Please enter a user name for default database Zero Configuration
</listitem>
<listitem>
-<para>Now we have all of the above details to supply again for the Demo Virtuoso
+<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
@@ -1604,29 +1597,29 @@ Please enter a user name for demonstration database Zero Configuration
</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
+<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 :
+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.
+<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 :
+Confirm Password :
Please wait while the passwords are changed:
@@ -1639,11 +1632,11 @@ Changing passwords for the Demo Universal Server
<programlisting><![CDATA[
Please enter a replacement for the Demonstration Database Server's
SQL Administrative (dba) account password (twice) :
-Confirm Password :
+Confirm Password :
Please enter a replacement for the Demonstration Database Server's
WebDAV Administrative (dav) account password (twice) :
-Confirm Password :
+Confirm Password :
Please wait while the passwords are changed:
done.
@@ -1651,22 +1644,22 @@ done.
</listitem>
<listitem>
-<para>The file owner and group is changed at the end of the installation. You
+<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:
+Setting owners:
]]></programlisting>
</listitem>
<listitem>
-<para>Finally the installer can start Virtuoso servers installed for you, but
+<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
+one via e-mail; in case of difficulties please contact
<Technical.Support at openlinksw.com>.
]]></programlisting>
</listitem>
@@ -1696,12 +1689,14 @@ $<Directory where Virtuoso is installed>/bin/virtuoso.log
<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>
+ <para><emphasis>oplmgr issue</emphasis></para>
+ <para>See <link linkend="oplmngrlfla">OpenLink License Management for Linux</link></para>
</sect3>
- </sect2>
+ </sect2>
<sect2 id="unxautovirt"><title>Starting Virtuoso Automatically on Reboot</title>
- <para>Two files, named initd_startup.template and
+ <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
@@ -1832,6 +1827,8 @@ $<Directory where Virtuoso is installed>/bin/virtuoso.log
<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>
+ <para><emphasis>oplmgr issue</emphasis></para>
+ <para>See <link linkend="oplmngrlfla">OpenLink License Management for Linux</link></para>
</sect3>
</sect2>
<sect2 id="unixpersonainstallconfg">
@@ -1873,9 +1870,9 @@ page is presented:
<!--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
+ <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-->
@@ -1948,7 +1945,7 @@ page is presented:
<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>
@@ -2014,7 +2011,7 @@ page is presented:
<figure id="v50pe17" float="1"><title>Location of apple scripts</title>
<graphic fileref="mac/v50pe17.png" width="377" depth="438"/></figure>
- </sect2>
+ </sect2>
<sect2 id="macosxinstpost"><title>Post Installation</title>
<sect3 id="macosxinstpostsan">
@@ -2028,8 +2025,10 @@ 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)
+ <para>Check the .log file in oplmgr (License Manager) location: <code>/Library/Application Support/openlink/bin/</code>, 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>
+
<figure id="instmac" float="1">
<title>The .log file</title>
<graphic fileref="ui/instmac.png"/>
@@ -2039,10 +2038,18 @@ http://a_virtuoso_server.org:8890</programlisting>
<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>
+ <para><emphasis>oplmgr issue</emphasis></para>
+ <para>To stop, start, or reload (which updates licenses) use the following commands: </para>
+<programlisting><![CDATA[
+/Library/Application Support/openlink/bin/oplmgr +start | +stop | +reload
+]]></programlisting>
<figure id="instmac2" float="1">
<title>The .log file</title>
<graphic fileref="ui/instmac2.png"/>
</figure>
+ <tip><title>See Also:</title>
+ <para><link linkend="oplmgr">OpenLink License Management</link></para>
+ </tip>
</sect3>
</sect2>
@@ -2151,6 +2158,373 @@ http://a_virtuoso_server.org:8890</programlisting>
</sect1>
+
+<sect1 id="oplmgr">
+ <title>OpenLink License Management</title>
+ <sect2 id="oplmngrlf"><title>License Files</title>
+ <sect3 id="oplmngrlfla"><title>License Activation</title>
+ <sect4 id="oplmngrlfla"><title>Mac OS X</title>
+ <orderedlist>
+ <listitem>Launch <computeroutput>Terminal.app (/Applications/Utilities/)</computeroutput></listitem>
+ <listitem>Execute the command <computeroutput>cd "/Library/Application Support/openlink/bin/"</computeroutput></listitem>
+ <listitem>Execute the command <computeroutput>oplmgr +stop</computeroutput></listitem>
+ <listitem>Retrieve your new Virtuoso license file from an email or <link linkend="oplmngrlflb">ODS Briefcase</link>.</listitem>
+ <listitem>Replace the old license file with the new license file. (You may delete the old file, or safely retain it in this location by changing the <computeroutput>.lic</computeroutput> file extension to <computeroutput>.lic-old</computeroutput>.)</listitem>
+ <listitem>Execute the command <computeroutput>oplmgr +start</computeroutput></listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlfla"><title>Windows</title>
+ <orderedlist>
+ <listitem>Launch the <emphasis>Services</emphasis> Control Panel (may be in the <emphasis>Administrative Tools</emphasis> sub-folder).</listitem>
+ <listitem>Locate and select the <emphasis>OpenLink License Manager service</emphasis>.</listitem>
+ <listitem>Click the <emphasis>Stop</emphasis> icon.</listitem>
+ <listitem>Retrieve your new Virtuoso license file from an email or <link linkend="oplmngrlflb">ODS Briefcase</link>.</listitem>
+ <listitem>Replace the old license file with the new license file. (You may delete the old file, or safely retain it in this location by changing the <computeroutput>.lic</computeroutput> file extension to <computeroutput>.lic-old</computeroutput>.)</listitem>
+ <listitem>Go back to the <emphasis>Services</emphasis> Control Panel.</listitem>
+ <listitem>Locate and select the <emphasis>OpenLink License Manager</emphasis> service.</listitem>
+ <listitem>Click the <emphasis>Start</emphasis> icon.</listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlfla"><title>Unix-like OS (AIX, HP-UX, Linux, Solaris, etc.)</title>
+ <orderedlist>
+ <listitem>Open a Unix terminal.</listitem>
+ <listitem><computeroutput>cd</computeroutput> into the root of your Virtuoso installation.</listitem>
+ <listitem>Use one of the following commands to set Virtuoso-related environment variables. (Note that they do, and must, begin with dot-space-dot-slash.)
+ <itemizedlist>
+ <listitem><computeroutput>. ./virtuoso-enterprise.sh</computeroutput> - bash, bsh, ksh, and related shells</listitem>
+ <listitem><computeroutput>. ./virtuoso-enterprise.csh</computeroutput> - csh, tcsh, and related shells</listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>Execute the command: oplmgr +stop</listitem>
+ <listitem>Retrieve your new Virtuoso license file from an email or <link linkend="oplmngrlflb">ODS Briefcase</link>. Use binary-mode ftp to transfer the new license to the Unix box, if required.</listitem>
+ <listitem>Place the new license in the bin sub-directory of the Virtuoso installation.</listitem>
+ <listitem>Set and export an <computeroutput>OPL_LICENSE_DIR</computeroutput> environment variable that passes the path to the directory that contains your Virtuoso license file, e.g
+ <itemizedlist>
+ <listitem><computeroutput>export OPL_LICENSE_DIR="/opt/virtuoso/bin/"</computeroutput></listitem>
+ <listitem><computeroutput>OPL_LICENSE_DIR="/opt/virtuoso/bin/" ; export OPL_LICENSE_DIR</computeroutput></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>Execute the command: <computeroutput>oplmgr +start</computeroutput></listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlflb"><title>Retrieve OpenLink Licenses from Your <link linkend="oplmngrlflb">ODS Briefcase</link></title>
+ <para>OpenLink's registered users receive an automatic OpenLink Data Spaces (ODS) account on
+the My OpenLink home page. This account allows registered users to experience and explore OpenLink's
+Virtuoso Universal Cilent applications.It also provides a convenient storage mechanism for OpenLink
+commercial and evaluation license keys.
+ </para>
+ <para>This page shows you how to access licenses that reside in your <link linkend="oplmngrlflb">ODS Briefcase</link>. A second
+15 Day evaluation license is automatically copied to the Briefcase, when you download our software and
+receive your first 15 Day key. You may access the Briefcase by clicking on the link that appears in the
+email that contains the first license. Alternatively, you may identify the ODS url by logging into the
+OpenLink site.
+ </para>
+ <para>The following instructions will allow you to access your <link linkend="oplmngrlflb">ODS Briefcase</link> via the OpenLink
+Web site.
+ </para>
+ <orderedlist>
+ <listitem>Click the Login link that appears on the OpenLink Web page.
+ <figure id="rdfinsertwebdav1" float="1">
+ <title>ODS Briefcase</title>
+ <graphic fileref="ui/ODSA.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click the "Login Here" button that appears in the Registered Users box.
+ <figure id="rdfinsertwebdav1" float="1">
+ <title>ODS Briefcase</title>
+ <graphic fileref="ui/ODSB.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click the "Check my profile" link that appears in the Welcome box.
+ <figure id="rdfinsertwebdav1" float="1">
+ <title>ODS Briefcase</title>
+ <graphic fileref="ui/ODSC.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click the ODS Service URL that appears in the lower right hand corner of the My Details dialog.
+ <figure id="rdfinsertwebdav1" float="1">
+ <title>ODS Briefcase</title>
+ <graphic fileref="ui/ODS3.png"/>
+ </figure>
+ </listitem>
+ <listitem>Allow the My OpenLink Web page to load in a Web browser.
+ <figure id="rdfinsertwebdav1" float="1">
+ <title>ODS Briefcase</title>
+ <graphic fileref="ui/ODS4.png"/>
+ </figure>
+ </listitem>
+ <listitem>Login to your OpenLink Data Space using your OpenLink login.
+ <figure id="rdfinsertwebdav1" float="1">
+ <title>ODS Briefcase</title>
+ <graphic fileref="ui/ODS5.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click the Briefcase link that appears in the ODS menu bar at the top of the page.
+ <figure id="rdfinsertwebdav1" float="1">
+ <title>ODS Briefcase</title>
+ <graphic fileref="ui/ODS6.png"/>
+ </figure>
+ </listitem>
+ <listitem>Your license will appear as a Resource Item under the Briefcase Summary.
+ <figure id="rdfinsertwebdav1" float="1">
+ <title>ODS Briefcase</title>
+ <graphic fileref="ui/ODS7.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ <para>Click the license link to download your license. Provide your OpenLink username and
+password if prompted for a DAV login.
+ </para>
+ </sect4>
+ </sect3>
+ <sect3 id="oplmngrlflp"><title>License Preservation</title>
+ <para>Users may choose to preserve the existing license file when applying a new license file. This facilitates a rollback to the original file, if the replacement file is problematic.</para>
+ <sect4 id="oplmngrlflp"><title>Mac OS X</title>
+ <itemizedlist>
+ <listitem>Use StuffIt or a similar utility to store the file in a compressed archive.</listitem>
+ <listitem>Rename the file, e.g., from <computeroutput>virtuoso.lic</computeroutput> to <computeroutput>virtuoso.lic-old</computeroutput></listitem>
+ </itemizedlist>
+ </sect4>
+ <sect4 id="oplmngrlflp"><title>Windows</title>
+ <para>Use WinZip or a similar utility to copy your license file to a .zip archive.</para>
+ </sect4>
+ <sect4 id="oplmngrlflp"><title>Unix-like OS (AIX, HP-UX, Linux, Solaris, etc.)</title>
+ <para>Use tar or gzip to copy your license file into an archive. For example: <computeroutput>tar cvzf virtuoso-lic.tgz virtuoso.lic</computeroutput></para>
+ </sect4>
+ </sect3>
+ <sect3 id="oplmngrlflr"><title>License Removal</title>
+ <para>Users may choose to remove expired or deprecated license files altogether to ensure the uptake of a new license file.</para>
+ <sect4 id="oplmngrlflr"><title>Mac OS X</title>
+ <orderedlist>
+ <listitem>Shutdown your OpenLink License Manager</listitem>
+ <listitem>Click the Search icon.</listitem>
+ <listitem>Type your license name into the search box. For example: virtuoso.lic</listitem>
+ <listitem>Drag the license from the search results onto the trash icon.</listitem>
+ <listitem>Expand the Finder menu.</listitem>
+ <listitem>Click Empty Trash.</listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlflr"><title>Windows</title>
+ <orderedlist>
+ <listitem>Launch the <emphasis>Services</emphasis> Control Panel (may be in the <emphasis>Administrative Tools</emphasis> sub-folder).</listitem>
+ <listitem>Locate and select the <emphasis>OpenLink Virtuoso</emphasis> service.</listitem>
+ <listitem>Click the <emphasis>Stop</emphasis> icon.</listitem>
+ <listitem>Locate and select the <emphasis>OpenLink License Manager</emphasis> service.</listitem>
+ <listitem>Click the <emphasis>Stop</emphasis> icon.</listitem>
+ <listitem>Launch the Windows Search utility, from the Start menu.</listitem>
+ <listitem>Search for all files with the name <computeroutput>virtuoso.lic.</computeroutput></listitem>
+ <listitem>Drag all found licenses to the Recycle Bin.</listitem>
+ <listitem>Empty the Recycle Bin</listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlflr"><title>Unix-like OS (AIX, HP-UX, Linux, Solaris, etc.)</title>
+ <orderedlist>
+ <listitem>Login to the Unix or Linux operating system.</listitem>
+ <listitem>Use the find command to locate relevant license files, and check their permissions and ownership.
+<programlisting><![CDATA[
+bash-2.03$ find / -name virtuoso.lic -exec ls -l {} \;
+-rw-r--r-- 1 virtuoso other 645 Mar 11 08:06 /usr/virtuoso/bin/virtuoso.lic
+bash-2.03$
+]]></programlisting>
+ </listitem>
+ <listitem>Use the rm command to remove the license file(s).
+<programlisting><![CDATA[
+bash-2.03$ rm /usr/virtuoso/bin/virtuoso.lic
+]]></programlisting>
+ </listitem>
+ <listitem>
+ <para>If the file permissions and ownership require, you can use sudo - </para>
+<programlisting><![CDATA[
+bash-2.03$ sudo rm /usr/virtuoso/bin/virtuoso.lic
+Password:
+bash-2.03$ ls /usr/virtuoso/bin/virtuoso.lic
+bash-2.03$
+]]></programlisting>
+ <para> - or su to the appropriate user or group - </para>
+<programlisting><![CDATA[
+bash-2.03$ su virtuoso
+Password:
+bash-2.03$ rm /usr/virtuoso/bin/virtuoso.lic
+bash-2.03$ ls /usr/virtuoso/bin/virtuoso.lic
+bash-2.03$
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect4>
+ </sect3>
+ </sect2>
+ <sect2 id="oplmngrlm"><title>License Manager</title>
+ <sect3 id="oplmngrlmml"><title>Monitor License Consumption</title>
+ <para>OpenLink's License Manager technology provides a sophisticated and easy to use License
+statistics and monitoring facility. This page introduces you to that facility and provides alternative
+techniques for versions of the software that do not contain it.
+ </para>
+ <orderedlist>
+ <listitem>Launch the Virtuoso Web interface.</listitem>
+ <listitem>Click the <emphasis>Conductor</emphasis> link.</listitem>
+ <listitem>Login with your Virtuoso dba account.</listitem>
+ <listitem>Click the <emphasis>System Admin</emphasis> tab.</listitem>
+ <listitem>Locate the <emphasis>License</emphasis> section to review the terms of your Virtuoso license.</listitem>
+ <listitem>Locate the <emphasis>Clients</emphasis> section to review open connections that consume Virtuoso license points.</listitem>
+ </orderedlist>
+ </sect3>
+ <sect3 id="oplmngrlmsl"><title>Start the License Manager Process</title>
+ <sect4 id="oplmngrlmslm"><title>Mac OS X</title>
+ <orderedlist>
+ <listitem>Launch <computeroutput> Terminal.app (/Applications/Utilities/) </computeroutput></listitem>
+ <listitem>Execute the command <computeroutput>cd "/Library/Application Support/openlink/bin/"</computeroutput></listitem>
+ <listitem>Execute the command <computeroutput>oplmgr +start</computeroutput></listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlmslw"><title>Windows</title>
+ <orderedlist>
+ <listitem>Launch the <emphasis>Services</emphasis> Control Panel (may be in the <emphasis>Administrative Tools</emphasis> sub-folder).</listitem>
+ <listitem>Locate and select the <emphasis>OpenLink Virtuoso</emphasis> service.</listitem>
+ <listitem>Click the <emphasis>Start</emphasis> icon.</listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlmslu"><title>Unix-like OS (AIX, HP-UX, Linux, Solaris, etc.)</title>
+ <orderedlist>
+ <listitem>Open a Unix terminal.</listitem>
+ <listitem><computeroutput>cd</computeroutput> into the root of your Virtuoso installation.</listitem>
+ <listitem>Use one of the following commands to set Virtuoso-related environment variables. (Note that they do, and must, begin with dot-space-dot-slash.)
+ <itemizedlist>
+ <listitem><computeroutput>. ./virtuoso-enterprise.sh</computeroutput> - bash, bsh, ksh, and related shells</listitem>
+ <listitem><computeroutput>. ./virtuoso-enterprise.csh</computeroutput> - csh, tcsh, and related shells</listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>Execute the command: <computeroutput>oplmgr +start</computeroutput></listitem>
+ </orderedlist>
+ </sect4>
+ <para><emphasis>Note</emphasis>: OpenLink recommends that you create an <computeroutput>/etc/init.d/</computeroutput>
+script that sets the environment and runs <computeroutput>oplmgr +start</computeroutput> at boot time.
+ </para>
+ </sect3>
+ <sect3 id="oplmngrlmlp"><title>Stop the License Manager Process</title>
+ <sect4 id="oplmngrlmlpm"><title>Mac OS X</title>
+ <orderedlist>
+ <listitem>Launch <computeroutput> Terminal.app (/Applications/Utilities/) </computeroutput></listitem>
+ <listitem>Execute the command <computeroutput>cd "/Library/Application Support/openlink/bin/"</computeroutput></listitem>
+ <listitem>Execute the command <computeroutput>oplmgr +stop</computeroutput></listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlmlpw"><title>Windows</title>
+ <orderedlist>
+ <listitem>Launch the <emphasis>Services</emphasis> Control Panel (may be in the <emphasis>Administrative Tools</emphasis> sub-folder).</listitem>
+ <listitem>Locate and select the <emphasis>OpenLink License Manager service</emphasis>.</listitem>
+ <listitem>Click the <emphasis>Stop</emphasis> icon.</listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlmlpu"><title>Unix-like OS (AIX, HP-UX, Linux, Solaris, etc.)</title>
+ <orderedlist>
+ <listitem>Open a Unix terminal.</listitem>
+ <listitem><computeroutput>cd</computeroutput> into the root of your Virtuoso installation.</listitem>
+ <listitem>Use one of the following commands to set Virtuoso-related environment variables. (Note that they do, and must, begin with dot-space-dot-slash.)
+ <itemizedlist>
+ <listitem><computeroutput>. ./virtuoso-enterprise.sh</computeroutput> - bash, bsh, ksh, and related shells</listitem>
+ <listitem><computeroutput>. ./virtuoso-enterprise.csh</computeroutput> - csh, tcsh, and related shells</listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>Execute the command: oplmgr +stop</listitem>
+ </orderedlist>
+ </sect4>
+ </sect3>
+ <sect3 id="oplmngrlmrl"><title>Reinitialize the License Manager Process</title>
+ <sect4 id="oplmngrlmrlm"><title>Mac OS X</title>
+ <orderedlist>
+ <listitem>Launch <computeroutput> Terminal.app (/Applications/Utilities/) </computeroutput></listitem>
+ <listitem>Execute the command <computeroutput>cd "/Library/Application Support/openlink/bin/"</computeroutput></listitem>
+ <listitem>Execute the command <computeroutput>oplmgr +reload</computeroutput></listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlmrlw"><title>Windows</title>
+ <orderedlist>
+ <listitem>Launch the <emphasis>Services</emphasis> Control Panel (may be in the <emphasis>Administrative Tools</emphasis> sub-folder).</listitem>
+ <listitem>Locate and select the <emphasis>OpenLink License Manager service</emphasis>.</listitem>
+ <listitem>Click the <emphasis>Restart</emphasis> icon.</listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="oplmngrlmrlu"><title>Unix-like OS (AIX, HP-UX, Linux, Solaris, etc.)</title>
+ <orderedlist>
+ <listitem>Open a Unix terminal.</listitem>
+ <listitem><computeroutput>cd</computeroutput> into the root of your Virtuoso installation.</listitem>
+ <listitem>Use one of the following commands to set Virtuoso-related environment variables. (Note that they do, and must, begin with dot-space-dot-slash.)
+ <itemizedlist>
+ <listitem><computeroutput>. ./virtuoso-enterprise.sh</computeroutput> - bash, bsh, ksh, and related shells</listitem>
+ <listitem><computeroutput>. ./virtuoso-enterprise.csh</computeroutput> - csh, tcsh, and related shells</listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>Execute the command: oplmgr +reload</listitem>
+ </orderedlist>
+ </sect4>
+ </sect3>
+ <sect3 id="oplmngrlmau"><title>Additional Usage Notes</title>
+ <para>The license manager takes several command-line arguments, as revealed by its "usage" output (produced by any unrecognized argument) -- </para>
+<programlisting><![CDATA[
+
+ bash$ oplmgr --help
+ OpenLink License Manager
+ Version 1.2.2 as of Thu Feb 15 2007 (Release 6.0 cvsid 00084).
+ Compiled for Linux 2.4.20-46.9.legacysmp (i686-generic-linux-glibc23-32)
+ Copyright (C) OpenLink Software.
+
+ Usage:
+ oplmgr [-shrutp] [+start] [+stop] [+reload] [+user arg] [+chroot arg]
+ [+pidfile arg]
+ +start start the license manager
+ +stop stop the license manager
+ +reload force a configuration reload
+ +user run as the specified user
+ +chroot perform a chroot to the specified directory
+ +pidfile pid file to use for server operation
+
+]]></programlisting>
+ </sect3>
+ </sect2>
+ <sect2 id="oplmngrdlp"><title>Debugging License Problems</title>
+ <para>Virtuoso license problems are easy to debug. The following information provides a
+conceptual framework and troubleshooting tips suitable for all licensing problems.
+ </para>
+ <sect3 id="oplmngrdlpil"><title>Identifying License Problems</title>
+ <para>License problems occur when users attempt to apply them to products or when they hit a
+ceiling associated with concurrent usage. Most license errors are explicit and include text that
+states that a license is invalid, expired, or exceeded. Problems associated with performance or
+stability problems that do not produce license related errors are not likely to be caused by licenses.
+There is no scenario in which use of an evaluation key would contribute to limited functionality.
+OpenLink's products are fully functional regardless of the license key applied. The license key simply
+dictates the length of time for which a product may be used.
+ </para>
+ </sect3>
+ <sect3 id="oplmngrdlpsl"><title>Source of License Problems</title>
+ <para>Licenses problems appear under the following circumstances:</para>
+ <itemizedlist>
+ <listitem>A license file is ftp'd in ASCII.</listitem>
+ <listitem>The license covers a different OpenLink product.</listitem>
+ <listitem>The license covers a different OpenLink release.</listitem>
+ <listitem>A machine has more physical Processor cores than allotted for by the license.</listitem>
+ <listitem>The license can not be found.</listitem>
+ <listitem>The wrong license is being found.</listitem>
+ <listitem>You did not perform the appropriate steps to register the license.</listitem>
+ <listitem>The License Manager process needs to be restarted.</listitem>
+ <listitem>The license is inadequate for your level of concurrent activity</listitem>
+ </itemizedlist>
+ </sect3>
+ <sect3 id="oplmngrdlptl"><title>Troubleshooting License Problems</title>
+ <para>Use the following tips to resolve your licensing tips or supply OpenLink Technical Services with your findings:</para>
+ <itemizedlist>
+ <listitem>FTP all licenses (virtuoso.lic) in binary mode.</listitem>
+ <listitem>Review the terms of the email that contained the license.</listitem>
+ <listitem>Ensure that the license that you have received is for Virtuoso Universal Server and not a data access provider or driver.</listitem>
+ <listitem>Compare the Virtuoso version on your machine with the version covered by the license key.</listitem>
+ <listitem>Identify the number of physical Processor cores on the box that hosts the license and ensure those cores are covered by the license key.</listitem>
+ <listitem>Use OpenLink's licensing guidelines to ensure that the license is placed in the appropriate location on the target machine.</listitem>
+ <listitem>Use the host machine's search utilities to ensure that expired or deprecated license files are removed from the host machine and deleted from the trash.</listitem>
+ <listitem>Use OpenLink's licensing guidelines to ensure that you have performed the license application procedure using the correct steps in the appropriate order.</listitem>
+ <listitem>Use the host monitoring utilities to ensure that applicable processes have been restarted as detailed in OpenLink's licensing guidelines.</listitem>
+ </itemizedlist>
+ </sect3>
+ </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
@@ -2991,7 +3365,7 @@ on dereferenceable <link linkend="rdfiriidtype">IRIs</link>.</para>
<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.
+containing the familiar Northwind tables. It will also creates <link linkend="rdfviewsrdbms">Linked Data Views</link> 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
@@ -4308,7 +4682,7 @@ explore the RDF data by clicking on dereferenceable <link linkend="rdfiriidtype"
<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.
+containing the familiar Northwind tables. It will also creates <link linkend="rdfviewsrdbms">Linked Data Views</link> 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
@@ -4317,7 +4691,7 @@ Virtuoso configuration parameter is set to when the demo database VAD package is
</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>
+ <listitem>The Virtuoso <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.3/virtuoso/rdf_mappers_dav.vad">RDF Mappers VAD package</ulink>.</listitem>
</orderedlist>
</sect2>
<sect2 id="installcrwebcrserv">
@@ -4492,7 +4866,7 @@ launch a browser and display the IRIs from sparqlview as a list of hyperlinks.
<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
+<para>With the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.3/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>
@@ -4691,7 +5065,7 @@ access layer. In these examples a combination of Silverlight 3 and .NET RIA Serv
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
+the Linked Data 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">
@@ -4700,7 +5074,7 @@ for exploring the linked data.
<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.
+containing the familiar Northwind tables. It will also creates Linked Data 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
@@ -4709,7 +5083,7 @@ the URIQA DefaultHost Virtuoso configuration parameter is set to when the demo d
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>The Virtuoso <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.3/virtuoso/rdf_mappers_dav.vad">RDF Mappers VAD package</ulink>.</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>
@@ -5162,580 +5536,336 @@ the data in Virtuoso will be updated.
<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
+ <listitem>Run the Virtuoso 6 Unix ( MacOsX) installer to perform a default installation:
+<programlisting><![CDATA[
+$ tar xvf virtuoso-universal-server-6.1.tar
+x install.sh
+x universal-server.taz
+$ sh install.sh
-]]></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
+- Extracting Virtuoso Universal Server v6.1
+- Creating default environment settings
+
+- Creating default database settings
+Configuring: database
+Creating directory $VIRTUOSO_HOME/database/backup
+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.
+
+
+- Attempting to start browser
+
+Please start a browser manually and open the following URL to finalize
+the installation process:
+
+ http://cname:8890/install/
+
+
+Installation completed
+$
+]]></programlisting>
+ </listitem>
+ <listitem>Determine how many nodes you want to start the cluster with: 2, 3, 4, 5, 6, 7, 8 etc. <emphasis>Note</emphasis>: the number of the nodes should be >= 2</listitem>
+ <listitem>Setup Virtuoso environment and stop default database:
+<programlisting><![CDATA[
+$ . ./virtuoso-environment.sh
+$ virtuoso-stop.sh
+Shutting down Virtuoso instance in [database]
+$
]]></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:
+ </listitem>
+ <listitem>Optionally remove the default database such that is does not get started with the cluster:
<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
+rm -rf database
+]]></programlisting>
+ </listitem>
+ <listitem>Full list of supported options for the script <emphasis>"virtuoso-mkcluster.sh"</emphasis>:
+<programlisting><![CDATA[
+ -cluster-size Number of nodes in cluster
+ -cluster-node Node number in a cluster
+ -cluster-port Base portnumer for cluster
+ -cluster-ipc-port Base portnumer for cluster IPC
+ -cluster_size Size of the cluster
+ -virtuoso_home Virtuoso home path
+]]></programlisting>
+ </listitem>
+ <listitem>Run the virtuoso-mkcluster.sh script to create the cluster, note the default number of
+ nodes is 4, but this can be changed by setting the environment variable CLUSTER_SIZE to the
+ required number of nodes to be created before running the script:
+<programlisting><![CDATA[
+$ virtuoso-mkcluster.sh
+Configuring cluster node: 1/4
+
+Creating directory $VIRTUOSO_HOME/cluster_01
+Creating directory $VIRTUOSO_HOME/cluster_01/backup
+Creating directory $VIRTUOSO_HOME/cluster_01/logs
+Installing new virtuoso.ini in $VIRTUOSO_HOME/cluster_01
+Installing new php.ini in $VIRTUOSO_HOME/cluster_01
+Creating symlink to $VIRTUOSO_HOME/bin/virtuoso-iodbc-t
+Configuring cluster node: 2/4
+
+Creating directory $VIRTUOSO_HOME/cluster_02
+Creating directory $VIRTUOSO_HOME/cluster_02/backup
+Installing new virtuoso.ini in $VIRTUOSO_HOME/cluster_02
+Removing unneeded sections from virtuoso.ini
+Creating symlink to $VIRTUOSO_HOME/bin/virtuoso-iodbc-t
+Configuring cluster node: 3/4
+
+Creating directory $VIRTUOSO_HOME/cluster_03
+Creating directory $VIRTUOSO_HOME/cluster_03/backup
+Installing new virtuoso.ini in $VIRTUOSO_HOME/cluster_03
+Removing unneeded sections from virtuoso.ini
+Creating symlink to $VIRTUOSO_HOME/bin/virtuoso-iodbc-t
+Configuring cluster node: 4/4
+Creating directory $VIRTUOSO_HOME/cluster_04
+Creating directory $VIRTUOSO_HOME/cluster_04/backup
+Installing new virtuoso.ini in $VIRTUOSO_HOME/cluster_04
+Removing unneeded sections from virtuoso.ini
+Creating symlink to $VIRTUOSO_HOME/bin/virtuoso-iodbc-t
+$
]]></programlisting>
-</listitem>
+ </listitem>
+ <listitem>For each of the cluster_XX directories created edit the cluster.ini file and set the
+ HostXX parameter to the hostname:portno to be used by the cluster nodes for internal communication.
+<programlisting><![CDATA[
+$ more cluster_01/cluster.ini
+[Cluster]
+Threads = 20
+Master = Host1
+ThisHost = Host1
+ReqBatchSize = 10000
+BatchesPerRPC = 4
+BatchBufferBytes = 20000
+LocalOnly = 2
+MaxKeepAlivesMissed = 1000
+Host1 = hostname:22201
+Host2 = hostname:22202
+Host3 = hostname:22203
+Host4 = hostname:22204
+MaxHosts = 5
+$ more cluster_02/cluster.ini
+[Cluster]
+Threads = 20
+Master = Host1
+ThisHost = Host2
+ReqBatchSize = 10000
+BatchesPerRPC = 4
+BatchBufferBytes = 20000
+LocalOnly = 2
+MaxKeepAlivesMissed = 1000
+Host1 = hostname:22201
+Host2 = hostname:22202
+Host3 = hostname:22203
+Host4 = hostname:22204
+MaxHosts = 5
+$ more cluster_03/cluster.ini
+[Cluster]
+Threads = 20
+Master = Host1
+ThisHost = Host3
+ReqBatchSize = 10000
+BatchesPerRPC = 4
+BatchBufferBytes = 20000
+LocalOnly = 2
+MaxKeepAlivesMissed = 1000
+Host1 = hostname:22201
+Host2 = hostname:22202
+Host3 = hostname:22203
+Host4 = hostname:22204
+MaxHosts = 5
+$ more cluster_04/cluster.ini
+[Cluster]
+Threads = 20
+Master = Host1
+ThisHost = Host4
+ReqBatchSize = 10000
+BatchesPerRPC = 4
+BatchBufferBytes = 20000
+LocalOnly = 2
+MaxKeepAlivesMissed = 1000
+Host1 = hostname:22201
+Host2 = hostname:22202
+Host3 = hostname:22203
+Host4 = hostname:22204
+MaxHosts = 5
+$
+]]></programlisting>
+ </listitem>
+ <listitem>Start the cluster using the standard virtuoso-start.sh script which automatically detects
+ the number for nodes to be started:
+<programlisting><![CDATA[
+$ virtuoso-start.sh
+Starting Virtuoso instance in [cluster_01]
+Starting Virtuoso instance in [cluster_02]
+Starting Virtuoso instance in [cluster_03]
+Starting Virtuoso instance in [cluster_04]
+$
+]]></programlisting>
+ </listitem>
+ <listitem>The default SQL port of the master node is 12201, as indicated in the virtuoso.ini file
+ of the cluster_01 directory, and can then be used for connecting to the newly created cluster
+ and check its status to ensure all nodes are online:
+<programlisting><![CDATA[
+$ isql 12201
+Connected to OpenLink Virtuoso
+Driver: 06.01.3127 OpenLink Virtuoso ODBC Driver
+OpenLink Interactive SQL (Virtuoso), version 0.9849b.
+Type HELP; for help and EXIT; to exit.
+SQL> status ('cluster');
+REPORT
+VARCHAR
+_______________________________________________________________________________
+
+Cluster 4 nodes, 4 s. 1 m/s 0 KB/s 0% cpu 0% read 0% clw threads 1r 0w 0i buffers 2981 0 d 0 w 0 pfs
+
+1 Rows. -- 7 msec.
+SQL> cl_ping(1,500, 1000);
+
+Done. -- 7 msec.
+SQL> cl_ping(2,500, 1000);
+
+Done. -- 52 msec.
+SQL> cl_ping(3,500, 1000);
+
+Done. -- 60 msec.
+SQL> cl_ping(4,500, 1000);
+
+Done. -- 51 msec.
+SQL>
+]]></programlisting>
+ </listitem>
+ <listitem>To split the node across across physical machines for better performance and scalability,
+ simply perform a parallel Virtuoso installation on the additional physical machines and move the
+ cluster nodes required to the designated machine. Example, for the default 4 node cluster to be
+ split across two identical machines it would make sense to split 2 nodes across each machine,
+ thus you would move say the cluster_03 and cluster_04 directory nodes to the new machine (removing
+ them from the original). The cluster.ini file on each node would then need to be updated to set the
+ HostXX parameters to point to the new locations for nodes 03 and 04:
+<programlisting><![CDATA[
+Machine 1 (hostname1)
+
+$ more cluster_01/cluster.ini
+[Cluster]
+Threads = 20
+Master = Host1
+ThisHost = Host1
+ReqBatchSize = 10000
+BatchesPerRPC = 4
+BatchBufferBytes = 20000
+LocalOnly = 2
+MaxKeepAlivesMissed = 1000
+Host1 = hostname1:22201
+Host2 = hostname1:22202
+Host3 = hostname2:22203
+Host4 = hostname2:22204
+MaxHosts = 5
+$ more cluster_02/cluster.ini
+[Cluster]
+Threads = 20
+Master = Host1
+ThisHost = Host2
+ReqBatchSize = 10000
+BatchesPerRPC = 4
+BatchBufferBytes = 20000
+LocalOnly = 2
+MaxKeepAlivesMissed = 1000
+Host1 = hostname1:22201
+Host2 = hostname1:22202
+Host3 = hostname2:22203
+Host4 = hostname2:22204
+MaxHosts = 5
+$
+
+Machine 2 (hostname2)
+
+$ more cluster_03/cluster.ini
+[Cluster]
+Threads = 20
+Master = Host1
+ThisHost = Host3
+ReqBatchSize = 10000
+BatchesPerRPC = 4
+BatchBufferBytes = 20000
+LocalOnly = 2
+MaxKeepAlivesMissed = 1000
+Host1 = hostname1:22201
+Host2 = hostname1:22202
+Host3 = hostname2:22203
+Host4 = hostname2:22204
+MaxHosts = 5
+$ more cluster_04/cluster.ini
+[Cluster]
+Threads = 20
+Master = Host1
+ThisHost = Host4
+ReqBatchSize = 10000
+BatchesPerRPC = 4
+BatchBufferBytes = 20000
+LocalOnly = 2
+MaxKeepAlivesMissed = 1000
+Host1 = hostname1:22201
+Host2 = hostname1:22202
+Host3 = hostname2:22203
+Host4 = hostname2:22204
+MaxHosts = 5
+$
+]]></programlisting>
+ </listitem>
+ <listitem>The nodes can then be started on each machine, with 2 nodes being started on each in this
+ case to form the cluster:
+<programlisting><![CDATA[
+
+Machine 1 (hostname1)
+
+$ virtuoso-start.sh
+Starting Virtuoso instance in [cluster_01]
+Starting Virtuoso instance in [cluster_02]
+$
+
+Machine 2 (hostname2)
+
+$ virtuoso-start.sh
+Starting Virtuoso instance in [cluster_03]
+Starting Virtuoso instance in [cluster_04]
+$
+]]></programlisting>
+ </listitem>
+ <listitem>To stop the cluster use the standard virtuoso-stop.sh script which automatically detects the number for nodes to be stopped:
+<programlisting><![CDATA[
+$ virtuoso-stop.sh
+Stopping Virtuoso instance in [cluster_01]
+Stopping Virtuoso instance in [cluster_02]
+Stopping Virtuoso instance in [cluster_03]
+Stopping Virtuoso instance in [cluster_04]
+$
+]]></programlisting>
+ </listitem>
</orderedlist>
-<sect3 id="clusterstcnfbackuprestore">
+</sect2>
+<sect2 id="clusterstcnfbackuprestore">
<title>Backup and Restore</title>
<para><emphasis>Backup</emphasis></para>
<para>There are 2 ways to backup Virtuoso Cluster DB:</para>
@@ -5749,7 +5879,7 @@ backup_online ('dbp', 10000000, 0, 'backup');
<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'));
+cl_exec ('backup_online (''dbp'', 10000000, 0, vector (''backup''))');
]]></programlisting>
</listitem>
</orderedlist>
@@ -5760,9 +5890,8 @@ execute from the ..\bin folder the virtuoso-restore.sh:</para>
# . ./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>
+ <sect2 id="clusterstcnfconfig"><title>Cluster Configuration</title>
<orderedlist>
<listitem>Set "FAST_START=1" in the viruoso-start.sh file and then run:
<programlisting><![CDATA[
@@ -5795,11 +5924,49 @@ Cluster 4 nodes, 293 s. 0 m/s 0 KB/s 0% cpu 0% read 0% clw threads 1r 0w 0i bu
</listitem>
</orderedlist>
</sect2>
+ <sect2 id="clusterstcnftrsh"><title>Troubleshooting Tips</title>
+ <para>If an operation seems to hang, see the output of:</para>
+<programlisting><![CDATA[
+status ()
+]]></programlisting>
+ <para>Check for the presence of the following conditions:</para>
+<itemizedlist>
+ <listitem>The cluster line shows 0% CPU, no message traffic and an unchanging number of buffers
+wired, this is probably a bug. To reset, restart the cluster or the offending process if found.
+Restart is done by executing:
+<programlisting><![CDATA[
+raw_exit ();
+]]></programlisting>
+<para>over an SQL connection to the process in question.</para>
+ </listitem>
+ <listitem>The cluster line shows many threads waiting compared to total threads. If CPU is 0 and
+this does not change there could be a transaction that holds locks indefinitely. To clear, execute:
+<programlisting><![CDATA[
+txn_killall (1);
+]]></programlisting>
+<para>Do this at a node that has local threads waiting. This is seen in the Lock Status
+paragraph of status ('') when connected to the node in question.</para>
+ </listitem>
+ <listitem>The cluster line shows a changing number in the pfs field. The system is swapping
+and slowed down.</listitem>
+ <listitem>If the status () itself hangs, try another process of the cluster. See that there is
+no temporary atomic activity like a long checkpoint. If the situation persists there is a bug.
+The checkpoint can be seen by the presence of the <emphasis>checkpinmt_in_progress</emphasis> file
+in each server's working directory.</listitem>
+ <listitem>To check the integrity of database files, do:
+<programlisting><![CDATA[
+cl_exec ('backup ''/dev/null''');
+]]></programlisting>
+<para>If this returns, the databases are OK. If one is found to be corrupt the corresponding server exits.</para>
+</listitem>
+</itemizedlist>
+ </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>
+
+ </sect1>
</chapter>
diff --git a/docsrc/xmlsource/internetservices.xml b/docsrc/xmlsource/internetservices.xml
index 61412f4..0d491f8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/intl.xml b/docsrc/xmlsource/intl.xml
index 799d8f2..3ab74f4 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-2006 OpenLink Software
+ - 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
@@ -23,8 +23,7 @@
-
-->
<!--
- $Id: intl.xml,v 1.2 2008/02/06 23:09:33 source Exp $
- (C)Copyright 2005 OpenLink Software
+ $Id$
-->
<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 58cd07e..71a2e6c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/jsphosting.xml b/docsrc/xmlsource/jsphosting.xml
index 1c8261e..9d34e5c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/jvmapi.xml b/docsrc/xmlsource/jvmapi.xml
index f069668..e265cf5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/ldap.xml b/docsrc/xmlsource/ldap.xml
index 433398f..a9911c5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/mailsrv.xml b/docsrc/xmlsource/mailsrv.xml
index 0abea41..f283088 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/migrate27to30.xml b/docsrc/xmlsource/migrate27to30.xml
index 0f3a75d..94d928c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/mime.xml b/docsrc/xmlsource/mime.xml
index 11a3c1a..eeb4f02 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/odbcimplementation.xml b/docsrc/xmlsource/odbcimplementation.xml
index b00832b..b7e0925 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-2006 OpenLink Software
+ - 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
@@ -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-2009 OpenLink Software
+ * 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
diff --git a/docsrc/xmlsource/oledbimplementation.xml b/docsrc/xmlsource/oledbimplementation.xml
index 99242e6..355e214 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/overview.xml b/docsrc/xmlsource/overview.xml
index 5d77f0c..222675d 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-2006 OpenLink Software
+ - 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
@@ -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 RDF View of underlying SQL data), then all relational
+SQL federation feature (i.e., if the graph is an Linked Data 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" 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>
+ <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>
<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 RDF View graph and Quad Map.</listitem>
+ <listitem>Drop the Linked Data 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 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>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>
<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 RDF View from above in SPARQL endpoint without
+ <para>There are two ways of using the Linked Data View from above in SPARQL endpoint without
<emphasis>define input:storage</emphasis>:</para>
<orderedlist>
- <listitem>Create RDF View right in <emphasis>virtrdf:DefaultQuadStorage</emphasis> or add the
+ <listitem>Create Linked Data 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:
@@ -918,7 +918,7 @@ SPARQL ALTER QUAD STORAGE virtrdf:DefaultQuadStorage . . .
<para>Virtuoso supports graph-level security, as described <link linkend="rdfgraphsecurity">here</link>
but not subject-level or predicate-level. When exposing data that needs protected access, triples
should be confined to private name graphs which are protected by ACLs using WebID.</para>
- <para>Note, how you can use <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtAuthPolicyFOAFSSL">WebID to protect Virtuoso SPARQL endpoints</ulink>.</para>
+ <para>Note, how you can use <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSPARQLSecurityWebID">WebID to protect Virtuoso SPARQL endpoints</ulink>.</para>
<tip><title>See Also:</title>
<para><link linkend="rdfgraphsecurity">RDF Graphs Security</link></para>
</tip>
@@ -1181,34 +1181,85 @@ specific patch.
<title>How Can I define graph with virt:rdf_sponger option set to "on"?</title>
<para>Suppose we have the following scenario:</para>
<orderedlist>
- <listitem>Create Virtuoso user using Conductor.</listitem>
- <listitem>Create for the user a RDF Sink folder.</listitem>
- <listitem>In the properties of the RDF sink folder add the following
- <emphasis>virt:rdf_graph</emphasis> option:
+ <listitem>Create Virtuoso user using Conductor for ex. with name "john" and pwd 1.</listitem>
+ <listitem>Create for the user a RDF Sink folder for ex. with name "MySinkFolder" from type
+ "RDF Upload Folder" or use the <emphasis>rdf_sink</emphasis> folder created automatically
+ for your user.</listitem>
+ <listitem>In the properties page of the RDF sink folder add in the WebDAV section this
+ property <emphasis>virt:rdf_graph</emphasis> with value:
<programlisting><![CDATA[
-http://localhost:8080/DAV/home/dba/rdf_sink/
+http://host:port/DAV/home/<user-name>/<rdf-sink-folder>/
+
+-- So in our example it should be:
+http://localhost:8890/DAV/home/john/MySinkFolder/
]]></programlisting>
</listitem>
- <listitem>Set <emphasis>virt:rdf_sponger</emphasis> to "on".</listitem>
- <listitem>Upload RDF files to the RDF Sink folder.</listitem>
- <listitem>As result the RDF data should be stored in graph
- for ex. (depending on your folder name etc.):
+ <listitem>Add another property virt:rdf_sponger with value "on".
+ <figure id="sink1" float="1">
+ <title></title>
+ <graphic fileref="ui/sink1.png"/>
+ </figure>
+ </listitem>
+ <listitem>Upload RDF files to the RDF Sink folder "MySinkFolder", for ex. upload file with name
+ "data.rdf":
+ <figure id="sink2" float="1">
+ <title></title>
+ <graphic fileref="ui/sink2.png"/>
+ </figure>
+ </listitem>
+ <listitem>As result the RDF data should be stored in graph depending on your folder name etc.:
+<programlisting><![CDATA[
+http:///local.virt/DAV/home/<user-name>/<rdf-sink-folder>/<resource>
+
+-- So in our example it will be:
+http:///local.virt/DAV/home/john/MySinkFolder/data.rdf
+]]></programlisting>
+ <orderedlist>
+ <listitem>Go to http://host:port/sparql ; </listitem>
+ <listitem>Execute simple query to view the graph triples:
<programlisting><![CDATA[
-http://local.virt/DAV/home/wa_sink/rdf_sink/wa_address_agents.rdf
+SELECT *
+FROM <http://local.virt/DAV/home/john/MySinkFolder/data.rdf>
+WHERE
+ {
+ ?s ?p ?o
+ }
]]></programlisting>
+ <figure id="sink3" float="1">
+ <title></title>
+ <graphic fileref="ui/sink3.png"/>
+ </figure>
+ <figure id="sink4" float="1">
+ <title></title>
+ <graphic fileref="ui/sink4.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
</listitem>
- <listitem>In order to define any graph you want with the option from above, you should execute:
+ <listitem>In order to define any graph you want with the options from above, you should execute:
<programlisting><![CDATA[
-SQL>DAV_PROP_SET (davLocation, 'virt:rdf_graph', iri, _uid, _pwd);
+SQL> DAV_PROP_SET ('/DAV/home/<user-name>/<rdf-sink-folder>/', 'virt:rdf_graph', iri, <user-name>, <password>);
+
+-- So in our example it should be:
+SQL> DAV_PROP_SET ('/DAV/home/john/MySinkFolder/', 'virt:rdf_graph', 'http://mydata.com', 'john', '1');
]]></programlisting>
<itemizedlist mark="bullet">
- <listitem>Calling this function uses the given IRI as the graph IRI when sponging stuff
- put in the rdf_sink/ collection davLocation.</listitem>
+ <listitem>Note: calling this function uses the given IRI as the graph IRI when sponging
+ stuff put in <your-rdf-sink-folder>.</listitem>
</itemizedlist>
</listitem>
<listitem>Finally you should execute the following command to get the RDF data from the new graph:
<programlisting><![CDATA[
-SQL>SELECT DAV_PPROP_GET ('/DAV/home/dba/rdf_sink/', 'virt:rdf_graph','dba', 'dba');
+SQL> SELECT DAV_PROP_GET ('/DAV/home/<user-name>/<your-rdf-sink-folder>/', 'virt:rdf_graph',<user-name>, <password>);
+
+-- So in our example it should be:
+SQL> SELECT DAV_PROP_GET ('/DAV/home/john/MySinkFolder/', 'virt:rdf_graph','john', '1');
+
+Query result:
+DAV_PROP_GET
+http://localhost:8890/DAV/home/john/MySinkFolder/
+
+No. of rows in result: 1
]]></programlisting>
</listitem>
</orderedlist>
@@ -2541,7 +2592,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 Sponge 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 perform Network Resource Fetch of 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 +2885,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 RDF 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 Linked Data 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 +3119,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 RDF View and the source
+ <listitem>Note: it is useful only if data comers via an Linked Data View and the source
relational table uses this trick;</listitem>
</itemizedlist>
</listitem>
@@ -3139,7 +3190,7 @@ http://www.openlinksw.com/virtrdf-data-formats#sql-nvarchar-lang 20
<title>What SPARQL Endpoint Protection Methods can I use?</title>
<para>Virtuoso supports the following SPARQL Endpoint protection methods:</para>
<orderedlist>
- <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtAuthPolicyFOAFSSL">Secure SPARQL Endpoint Guide using WebID Protocol</ulink></listitem>
+ <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSPARQLSecurityWebID">Secure SPARQL Endpoint Guide using WebID Protocol</ulink></listitem>
<listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtOAuthSPARQL">Secure SPARQL Endpoint Guide via OAuth</ulink></listitem>
<listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSPARQLProtectSQLDigestAuthentication">Secure SPARQL Endpoint Guide via SQL Accounts -- usage path digest authentication</ulink></listitem>
</orderedlist>
diff --git a/docsrc/xmlsource/perfdiag.xml b/docsrc/xmlsource/perfdiag.xml
index 73ba448..72ef444 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/perl.xml b/docsrc/xmlsource/perl.xml
index 85588b4..5af3fa4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/php.xml b/docsrc/xmlsource/php.xml
index fc5011e..c6dd61a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/pldebugger.xml b/docsrc/xmlsource/pldebugger.xml
index 3cde2fd..aee34b8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/plugins.xml b/docsrc/xmlsource/plugins.xml
index 59a004d..c212fa0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/preface.xml b/docsrc/xmlsource/preface.xml
index 11e57f2..04843ec 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/ptune.xml b/docsrc/xmlsource/ptune.xml
index 504797b..d6fab40 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/python.xml b/docsrc/xmlsource/python.xml
index 9962b91..9922efc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/quicktours.xml b/docsrc/xmlsource/quicktours.xml
index a068510..ebbdc0f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/rdfandsparql.xml b/docsrc/xmlsource/rdfandsparql.xml
index a4b1319..4993e5a 100644
--- a/docsrc/xmlsource/rdfandsparql.xml
+++ b/docsrc/xmlsource/rdfandsparql.xml
@@ -17,7 +17,6 @@ This discusses storing RDF data as well as mapping existing relational data into
<tip><title>See Also:</title>
<itemizedlist mark="bullet">
<listitem><link linkend="virtodbcsparql">Virtuoso ODBC RDF extensions for SPASQL</link></listitem>
- <listitem><link linkend="sqlrefgeospatial">Geometry Data Types and Spatial Index Support</link></listitem>
</itemizedlist>
</tip>
@@ -200,7 +199,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 RDF View for a custom table with formats rdfdf:default or rdfdf:default-nullable
+<para>It could be helpful to be created an Linked Data 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>
@@ -593,6 +592,52 @@ WHERE {
}
ORDER BY ?title LIMIT 4 OFFSET 0
]]></programlisting>
+<para><emphasis>Example: Prevent Limits of Sorted LIMIT/OFFSET query</emphasis></para>
+<para>The DBpedia SPARQL endpoint is configured with the following INI setting:</para>
+<programlisting><![CDATA[
+MaxSortedTopRows = 40000
+]]></programlisting>
+<para>The setting above sets a threshold for sorted rows. Thus, when using basic
+ SPARQL queries that include OFFSET and LIMIT the following query will still exist
+ the hard limit set in the INI:</para>
+<programlisting><![CDATA[
+DEFINE sql:big-data-const 0
+SELECT DISTINCT ?p ?s
+FROM <http://dbpedia.org>
+WHERE
+ {
+ ?s ?p <http://dbpedia.org/resource/Germany>
+ }
+ORDER BY ASC(?p)
+OFFSET 40000
+LIMIT 1000
+]]></programlisting>
+<para>returns the following error on execution:</para>
+<programlisting><![CDATA[
+HttpException: 500 SPARQL Request Failed
+
+Virtuoso 22023 Error SR353: Sorted TOP clause specifies more then 41000 rows to sort.
+Only 40000 are allowed.
+Either decrease the offset and/or row count or use a scrollable cursor
+]]></programlisting>
+<para>To prevent the problem outlined above you can leverage the use of subqueries which make
+ better use of temporary storage associated with this kind of quest. An example would take the form:</para>
+<programlisting><![CDATA[
+SELECT ?p ?s
+WHERE
+ {
+ {
+ SELECT DISTINCT ?p ?s
+ FROM <http://dbpedia.org>
+ WHERE
+ {
+ ?s ?p <http://dbpedia.org/resource/Germany>
+ } ORDER BY ASC(?p)
+ }
+ }
+OFFSET 50000
+LIMIT 1000
+]]></programlisting>
<sect3 id="rdfsparqlandxquery"><title>SPARQL and XQuery Core Function Library</title>
<para>In the current implementation, the XQuery Core Function Library is not available from SPARQL.</para>
<para>As a temporary workaround, string parsing functions are made available, because they are widely used in W3C DAWG examples and the like. They are:</para>
@@ -1069,6 +1114,44 @@ 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:
@@ -1144,7 +1227,7 @@ to the Quad Store - a pre-requisite for the Virtuoso Sponger services to be func
allow the Sponger to populate and update the Quad Store. In Virtuoso release 5.0.7, there is a new "SPARQL_SPONGE" role
which can be assigned specifically to allow Sponger services to update the Quad Store but not
SPARQL users via the SPARQL endpoint.</para>
-<para>Restricting a user's access to specific graphs can be done using Virtuoso row-level security
+<para>Restricting a user's access to specific graphs can be done using Virtuoso Graph security
functionality, via one of the Virtuoso Data Access APIs: ODBC, JDBC, ADO.Net or PL code.</para>
<tip><title>See Also:</title>
@@ -1175,11 +1258,12 @@ 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>
-<itemizedlist>
+<orderedlist>
<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
@@ -1189,7 +1273,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>In the displayed form check the "Allow SQL/ODBC Logins" check-box.</listitem>
+ <listitem>Set "User type" to "SQL/ODBC Logins and WebDAV".</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">
@@ -1197,11 +1281,13 @@ 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>
-</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
+</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
account has no permissions to read the table. The user must have appropriate privileges on all tables included
-in an RDF View in order to be able to select on <emphasis>all</emphasis> graphs.</para>
+in an Linked Data View in order to be able to select on <emphasis>all</emphasis> graphs.</para>
+</sect4>
<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.
@@ -1234,12 +1320,13 @@ 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 mark="bullet">
+<itemizedlist>
<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>
- <listitem>https://<cname>/sparql and https://<cname>/sparql-ssl (WebID Protocol)</listitem>
+ <listitem>https://<cname>/sparql and https://<cname>/sparql-webid (WebID Protocol)</listitem>
</itemizedlist>
+<para>Note: sparql-ssl is alias of sparql-webid.</para>
<para>The Virtuoso Authentication Server offers a UI with options for managing:</para>
<itemizedlist mark="bullet">
<listitem>
@@ -1254,16 +1341,17 @@ yet secure authentication system that functions with existing browsers.</listite
</itemizedlist>
<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>
-<itemizedlist mark="bullet">
+ <para>The Authentication UI is accessible from the Conductor UI -> Linked Data -> Access Control -> SPARQL-WebID. Here is sample scenario:</para>
+ <sect5 id="sparqloauthendpointauthexample"><title>SPARQL-WebID Authentication Example</title>
+<orderedlist>
<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
local server values.</listitem>
<listitem>Log in as user "dba" or another user with DBA privileges.</listitem>
- <listitem>Go to Linked Data -> Access Controls -> SPARQL-SSL:
+ <listitem>Go to Linked Data -> Access Controls -> SPARQL-WebID:
<figure id="sparqlssl1" float="1">
- <title>SPARQL-SSL</title>
+ <title>SPARQL-WebID</title>
<graphic fileref="ui/auth1.png"/>
</figure>
</listitem>
@@ -1273,37 +1361,38 @@ http://id.myopenlink.net/dataspace/person/demo#this
]]></programlisting>
<para> and select "SPARQL Role" for ex. "Sponge".</para>
<figure id="sparqlssl2" float="1">
- <title>SPARQL-SSL</title>
+ <title>SPARQL-WebID</title>
<graphic fileref="ui/auth3.png"/>
</figure>
</listitem>
<listitem>Click the "Register" button.</listitem>
<listitem>As result the WebID Protocol ACLs will be created:
<figure id="sparqlssl3" float="1">
- <title>SPARQL-SSL</title>
+ <title>SPARQL-WebID</title>
<graphic fileref="ui/auth4.png"/>
</figure>
</listitem>
- <listitem>Go to the SPARQL+SSL endpoint https://<cname>:<port>/sparql-ssl</listitem>
+ <listitem>Go to the SPARQL-WebID endpoint https://<cname>:<port>/sparql-webid</listitem>
<listitem>Select the user's certificate from above:
<figure id="sparqlssl4" float="1">
- <title>SPARQL-SSL</title>
+ <title>SPARQL-WebID</title>
<graphic fileref="ui/auth5.png"/>
</figure>
</listitem>
<listitem>As result the SPARQL Query UI will be presented:
<figure id="sparqlssl5" float="1">
- <title>SPARQL-SSL</title>
+ <title>SPARQL-WebID</title>
<graphic fileref="ui/auth6.png"/>
</figure>
</listitem>
<listitem>Execute sample query and view the results:
<figure id="sparqlssl7" float="1">
- <title>SPARQL-SSL</title>
- <graphic fileref="ui/auth6.png"/>
+ <title>SPARQL-WebID</title>
+ <graphic fileref="ui/auth6a.png"/>
</figure>
</listitem>
-</itemizedlist>
+</orderedlist>
+ </sect5>
</sect4>
<sect4 id="sparqloauthendpoint"><title>SPARQL OAuth Endpoint</title>
<para>OAuth provides a secure data transmission level mechanism for your SPARQL endpoint.
@@ -1468,82 +1557,35 @@ links a Web ID to a public key, to create a global decentralized/distributed, an
authentication system that functions with existing browsers.</para>
<para>To use WebID Protocol, download and install the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.1/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink>
VAD package. Once installed, to access the WebID Protocol ACLs UI, go to
-URL http://cname:port/conductor -> Linked Data -> Access Controls -> SPARQL-SSL .</para>
+URL http://cname:port/conductor -> Linked Data -> Access Controls -> SPARQL-WebID .</para>
<figure id="sparqloauthendpoint1" float="1">
- <title>FOAFSSL</title>
+ <title>WebID</title>
<graphic fileref="ui/auth4.png"/>
</figure>
<para>
-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>
-<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
- local server values.</listitem>
- <listitem>Log in as user "dba" or another user with DBA privileges.</listitem>
- <listitem>Go to Linked Data -> Access Controls -> SPARQL-SSL:
- <figure id="sparqlssl1" float="1">
- <title>SPARQL-SSL</title>
- <graphic fileref="ui/auth1.png"/>
- </figure>
-</listitem>
- <listitem>Enter in the presented form Web ID for ex.:
-<programlisting><![CDATA[
-http://id.myopenlink.net/dataspace/person/demo#this
-]]></programlisting>
- <para> and select "SPARQL Role" for ex. "Sponge".</para>
- <figure id="sparqlssl2" float="1">
- <title>SPARQL-SSL</title>
- <graphic fileref="ui/auth3.png"/>
- </figure>
-</listitem>
- <listitem>Click the "Register" button.</listitem>
- <listitem>As result the WebID Protocol ACLs will be created:
- <figure id="sparqlssl3" float="1">
- <title>SPARQL-SSL</title>
- <graphic fileref="ui/auth4.png"/>
- </figure>
-</listitem>
- <listitem>Go to the SPARQL+SSL endpoint https://<cname>:<port>/sparql-ssl</listitem>
- <listitem>Select the user's certificate from above:
- <figure id="sparqlssl4" float="1">
- <title>SPARQL-SSL</title>
- <graphic fileref="ui/auth5.png"/>
- </figure>
-</listitem>
- <listitem>As result the SPARQL Query UI will be presented:
- <figure id="sparqlssl5" float="1">
- <title>SPARQL-SSL</title>
- <graphic fileref="ui/auth6.png"/>
- </figure>
-</listitem>
- <listitem>Execute sample query and view the results:
- <figure id="sparqlssl7" float="1">
- <title>SPARQL-SSL</title>
- <graphic fileref="ui/auth6.png"/>
- </figure>
- </listitem>
-</itemizedlist>
+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-WebID endpoint and viewing of the query results.
+The SPARQL-WebID endpoint URL is of the form https://cname:port/sparql-webid</para>
+<para>Note: SPARQL-SSL is alias of SPARQL-WebID.</para>
+<para>See <link linkend="sparqloauthendpointauthexample">sample example </link> how to configure a sample WebID Protocol ACL are outlined below:</para>
<tip><title>See Also:</title>
<para><link linkend="secureodbcx509foafsll">WebID Protocol ODBC Login</link></para>
</tip>
</sect4>
-<sect4 id="sparqloauthendpointfoafsslsparql"><title>Creating and Using a SPARQL-SSL based Endpoint</title>
+<sect4 id="sparqloauthendpointfoafsslsparql"><title>Creating and Using a SPARQL-WebID based Endpoint</title>
<para>The following section describes the basic steps for setting up an SSL protected and WebID
-based SPARQL Endpoint (SPARQL-SSL). The guide also covers the use of Virtuoso PL functions and
+based SPARQL Endpoint (SPARQL-WebID). The guide also covers the use of Virtuoso PL functions and
the Virtuoso Conductor for SPARQL endpoint creation and configuration. It also covers the use
-of cURL for exercising the newly generated SPARQL-SSL endpoint.
+of cURL for exercising the newly generated SPARQL-SSL endpoint. Note: SPARQL-SSL is alias of SPARQL-WebID.
</para>
<orderedlist>
<listitem><link linkend="vfoafsslst509issuer">Setup the CA issuer and https listener</link></listitem>
- <listitem>Define the /sparql-ssl endpoint on an HTTPS based listener (HTTPS service endpoint), for example using Virtuoso PL:
+ <listitem>To create the /sparql-webid endpoint, install the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.3/virtuoso/policy_manager_dav.vad">policy_manager.vad</ulink> manage or manually
+ define the /sparql-webid endpoint on an HTTPS based listener (HTTPS service endpoint), for example using Virtuoso PL:
<programlisting><![CDATA[
DB.DBA.VHOST_DEFINE (
lhost=>'127.0.0.1:443',
vhost=>'localhost',
- lpath=>'/sparql-ssl',
+ lpath=>'/sparql-webid',
ppath=>'/!sparql/',
is_dav=>1,
auth_fn=>'DB.DBA.FOAF_SSL_AUTH',
@@ -1562,7 +1604,7 @@ DB.DBA.VHOST_DEFINE (
);
]]></programlisting>
</listitem>
- <listitem><link linkend="sparqloauthendpointfoafssl">Setup the SPARQL-SSL endpoint and define
+ <listitem><link linkend="sparqloauthendpointfoafssl">Setup the SPARQL-WebID endpoint and define
ACLs</link> using the Virtuoso Conductor</listitem>
<listitem>Export your private key and its associated WebID based X.509 certificate from your
Firefox browser or System's Key Manager into PEM (PKCS12) file
@@ -1577,13 +1619,13 @@ openssl pkcs12 -in mykey.p12 -out mykey.pem -nodes
</listitem>
</orderedlist>
</listitem>
- <listitem>Test the SPARQL-SSL endpoint with cURL: (listening on default HTTPS 443 port):
+ <listitem>Test the SPARQL-WebID endpoint with cURL: (listening on default HTTPS 443 port):
<itemizedlist mark="bullet">
<listitem>Note: In this example we use the "-k / --insecure" option with cURL since we are going
to be using self-signed X.509 certificates signed by self-signed root CA.</listitem>
</itemizedlist>
<programlisting><![CDATA[
- curl -k -E mykey.pem "https://localhost/sparql-ssl?query=select+*+where+\{+%3Fx+%3Fy+%3Fz+.+\}+limit+10&format=text%2Fn3"
+ curl -k -E mykey.pem "https://localhost/sparql-webid?query=select+*+where+\{+%3Fx+%3Fy+%3Fz+.+\}+limit+10&format=text%2Fn3"
@prefix res: <http://www.w3.org/2005/sparql-results#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -1682,7 +1724,7 @@ http://cname:port/dataspace/person/username#this
<listitem>Click "Save"</listitem>
</orderedlist>
</listitem>
- <listitem>Test the SPARQL-SSL endpoint with http_client (listening on default HTTPS 443 port):
+ <listitem>Test the SPARQL-WebID endpoint with http_client (listening on default HTTPS 443 port):
<orderedlist>
<listitem>Log in at Virtuos ISQL with your user credentials:
<programlisting><![CDATA[
@@ -1696,7 +1738,7 @@ SQL>
</listitem>
<listitem>Execute:
<programlisting><![CDATA[
-SQL>select http_client ('https://localhost/sparql-ssl?query=select+*+where+{+%3Fx+%3Fy+%3Fz+.+}+limit+10&format=text%2Fn3', cert_file=>'d
+SQL>select http_client ('https://localhost/sparql-webid?query=select+*+where+{+%3Fx+%3Fy+%3Fz+.+}+limit+10&format=text%2Fn3', cert_file=>'d
b:cli_key', insecure=>1);
callret
VARCHAR
@@ -1757,7 +1799,7 @@ _:_ res:solution [
</sect4>
<sect4 id="sparqloauthendpointfoafsslsparqldisable"><title>Disable Default SPARQL Endpoint</title>
<sect5 id="sparqloauthendpointfoafsslsparqldisableisql"><title>Using iSQL:</title>
- <itemizedlist mark="bullet">
+ <orderedlist>
<listitem>To disable /sparql, execute:
<programlisting><![CDATA[
DB.DBA.VHOST_REMOVE (lpath=>'/sparql');
@@ -1768,10 +1810,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>
- </itemizedlist>
+ </orderedlist>
</sect5>
<sect5 id="sparqloauthendpointfoafsslsparqldisablecond"><title>Using Conductor UI:</title>
- <itemizedlist mark="bullet">
+ <orderedlist>
<listitem>Go to http://cname:port/conductor .</listitem>
<listitem>Enter user dba credentials.</listitem>
<listitem>Go to "Web Application Server" -> "Virtual Domains & Directories".
@@ -1805,7 +1847,7 @@ DB.DBA.VHOST_DEFINE (lpath=>'/sparql/', ppath => '/!sparql/', is_dav => 1, vsp_u
<graphic fileref="ui/s5.png"/>
</figure>
</listitem>
- </itemizedlist>
+ </orderedlist>
</sect5>
</sect4>
</sect3>
@@ -1963,7 +2005,7 @@ curl -F "query=SELECT DISTINCT ?Concept FROM <http://data.openlinksw.com/oplweb/
curl -F "query=SELECT DISTINCT ?Concept FROM <http://openlinksw.com/dataspace/organization/openlink> WHERE {?s a ?Concept} LIMIT 10" http://demo.openlinksw.com/sparql
]]></programlisting>
</sect4>
-<sect4 id="rdfsparqlendpointexamples3"><title>Example with curl and SPARQL-SSL endpoint</title>
+<sect4 id="rdfsparqlendpointexamples3"><title>Example with curl and SPARQL-WebID endpoint</title>
<programlisting><![CDATA[
$ curl -H "Accept: text/rdf+n3" --cert test.pem -k https://demo.openlinksw.com/dataspace/person/demo
Enter PEM pass phrase: *****
@@ -2411,7 +2453,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 (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>
+<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>
<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
@@ -2618,18 +2660,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 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.
+<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.
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>
-<itemizedlist mark="bullet" spacing="compact">
+<orderedlist>
<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>
-</itemizedlist>
+</orderedlist>
<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>
@@ -2713,7 +2755,7 @@ SQL>DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
null
);
]]></programlisting>
-<para>To configure the server to furnish the ontology underpinning the example Northwind RDF view, the procedure LOAD_NW_ONTOLOGY_FROM_DAV, listed
+<para>To configure the server to furnish the ontology underpinning the example Northwind Linked Data 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>
@@ -2783,7 +2825,7 @@ an RDF representation of the target. When transforming to RDF, the RDF format (R
or by content negotiation.
</para>
<para>
-When the rdf_mappers package is installed, Virtuoso reserves the path '/about/[id|html|data|rdf]/http/' for the RDF
+When the rdf_mappers_dav.vad package is installed, Virtuoso reserves the path '/about/[id|html|data|rdf]/http/' for the RDF
proxy service. In the current implementation, Virtuoso defines virtual directories for HTTP requests that
come to the port specified as 'ServerPort' in the '[HTTPServer]' section of Virtuoso configuration file
and refer to the above path string. So, if the Virtuoso installation on host example.com listens for HTTP
@@ -2791,19 +2833,19 @@ requests on port 8080, client applications should use the 'service endpoint' str
'http://example.com:8080/about/[id|html|data|rdf]/http/'.
</para>
<para>
-If the rdf_mappers VAD package is not installed, then the path '/proxy/rdf/' is used for the Sponger Proxy URI Service.
+If the rdf_mappers_dav.vad VAD package is not installed, then the path '/proxy/rdf/' is used for the Sponger Proxy URI Service.
</para>
<para>
The old pattern for the Sponger Proxy URI Service, '/proxy/', is now deprecated.
</para>
<para>
-<emphasis>Note:</emphasis> If you do not have the rdf_mappers package installed, in order for the Sponger Proxy URI Service to work correctly,
+<emphasis>Note:</emphasis> If you do not have the cartridges package installed, in order for the Sponger Proxy URI Service to work correctly,
you must grant the SPARQL_UPDATE role to user SPARQL and grant execute permission on procedure RDF_SPONGE_UP.
</para>
<para>
To enable SPARQL_UPDATE using the Conductor UI:
</para>
-<itemizedlist>
+<orderedlist>
<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>
@@ -2818,7 +2860,7 @@ To enable SPARQL_UPDATE using the Conductor UI:
<graphic fileref="ui/cn2.png"/>
</figure>
<listitem>Click the button "Update".</listitem>
-</itemizedlist>
+</orderedlist>
<para>
To grant execute permission on RDF_SPONGE_UP:
</para>
@@ -2953,10 +2995,11 @@ 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 RDF view of
+types. An attempt to "select everything" from Linked Data 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 RDF view.
+queries would work fine if the RDF data were held as physical quads in default storage, rather than
+synthesized through an Linked Data View.
</para>
<para>In addition, the SQL compiler catches typos efficiently, signalling an error if a table or column
@@ -2989,7 +3032,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
-RDF views. It also helps when a query tries to join two disjoint
+Linked Data 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
@@ -3013,7 +3056,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 RDF View. If an application relies on this trick then interoperable third-party SPARQL
+the Linked Data 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>
@@ -3946,7 +3989,7 @@ Timothy Berners-Lee TimBL
</itemizedlist>
</tip>
</sect3>
- <sect3 id="rdfsqlfromsparqlex1"><title>Example with sql: namespace prefix and bif:contains</title>
+ <sect3 id="rdfsqlfromsparqlex2"><title>Example with sql: namespace prefix and bif:contains</title>
<programlisting><![CDATA[
SQL>SPARQL
SELECT DISTINCT ?cityUri ?cityName (sql:BEST_LANGMATCH (?cityName, 'en, en-gb;q=0.8, fr;q=0.7, *;q=0.1', '')) as ?bestCityName
@@ -3976,7 +4019,7 @@ http://dbpedia.org/resource/West_Bromwich West Bromwich
]]></programlisting>
</sect3>
- <sect3 id="rdfsqlfromsparqlex2"><title>Example with bif: namespace prefix</title>
+ <sect3 id="rdfsqlfromsparqlex3"><title>Example with bif: namespace prefix</title>
<programlisting><![CDATA[
SQL>SPARQL
SELECT *
@@ -4075,7 +4118,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 RDF Views.
+will not search for subjects in Linked Data 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:
@@ -4169,21 +4212,23 @@ _______________________________________________________________________________
<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 <alice>.</para>
+ <para>The below produces all the IRI's that are the same as <http://dbpedia.org/resource/New_York>.</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 = <Alice>) .
+ OPTION ( TRANSITIVE, t_in (?x), t_out (?syn), t_distinct, t_min (0) )
+ FILTER (?x = <http://dbpedia.org/resource/New_York>) .
}
]]></programlisting>
<para>In this case, we provide a binding for ?x in the filter outside of the
@@ -4200,7 +4245,11 @@ 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) )
}
} .
@@ -4245,13 +4294,23 @@ 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>
@@ -4280,7 +4339,42 @@ 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) .
+ } 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) .
FILTER (?s= <http://www.w3.org/People/Berners-Lee/card#i>)
}
ORDER BY ?dist DESC 3
@@ -4300,8 +4394,16 @@ 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>)
}
@@ -4321,6 +4423,9 @@ 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
@@ -4449,8 +4554,12 @@ 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" )
@@ -4514,19 +4623,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>: 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-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-seealso (and synonym input:grab-follow-predicate)</code>: sets predicate
- that tells where to sponge more data about a subject;</listitem>
- <listitem><code>input:grab-limit</code>: how many resources can be sponged;</listitem>
+ 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>
<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 sponge;</listitem>
+ <listitem><code>input:grab-base</code>: base to resolve relative IRIs before passing to Sponger;</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 sponges;</listitem>
+ of all fetchings;</listitem>
<listitem><code>input:grab-loader</code>: a name of procedure that retrieve the resource via HTTP,
parse it and store it.</listitem>
</itemizedlist>
@@ -4536,12 +4645,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, sponge will retrieve
+ combination with input:grab-seealso. If present then for a given subject, Network Resource Fetch 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 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.
+ 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.
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>
@@ -4649,9 +4758,14 @@ session to the caller</title>
</itemizedlist>
</sect3>
<sect3 id="rdfsparqlimplementatioptragmassspfs"><title>Supported Special formats</title>
-<para>A special format "_JAVA_" is for SPARQL queries sent via JDBC.
- It changes only the output of ASK queries.
-</para>
+<para>A special format "_JAVA_" is for SPARQL queries sent via JDBC. It changes only the output of ASK queries.</para>
+<para>The "_JAVA_" and "_UDBC_" are aliases in Virtuoso Version 6.1.5. Till Virtuoso 6.1.5 the default
+ behaves as "TTL". For Virtuoso version 6.1.5 and higher it is ODBC/JDBC oriented e.g. "_UDBC_" is
+ the default format for ODBC/JDBC clients.</para>
+ <para><emphasis>Note</emphasis>: If you want to revert to old TTL behaviour, you should specify it explicitly via:</para>
+<programlisting><![CDATA[
+define output:format "TTL"
+]]></programlisting>
<para>Note: Pragmas output:valmode and output:format may conflict if used together, and if
they're not in conflict then output:valmode is redundant: the compiler knows for sure which
output:valmode-s are needed by various output:format-s.
@@ -4718,6 +4832,93 @@ 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>
@@ -5142,8 +5343,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 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.
+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.
</para>
<programlisting><![CDATA[
SQL> SPARQL DELETE FROM GRAPH <http://mygraph.com> { ?s ?p ?o } FROM <http://mygraph> WHERE { ?s ?p ?o };
@@ -5390,7 +5591,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>
-<itemizedlist mark="bullet">
+<orderedlist>
<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> .
@@ -5453,7 +5654,7 @@ http://www.openlinksw.com/dataspace/kidehen@openlinksw.com#this http://www.w3
3 Rows. -- 10 msec.
]]></programlisting>
</listitem>
-</itemizedlist>
+</orderedlist>
</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
@@ -6451,6 +6652,350 @@ __________________________________________________
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-WebID
+ <figure id="si1" float="1">
+ <title>Conductor SPARQL-WebID</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-WebID</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-WebID</title>
+ <graphic fileref="ui/si3.png"/>
+ </figure>
+ </listitem>
+ <listitem>Go to the SPARQL-WebID endpoint, https://<cname>:<port>/sparql-webid,
+ 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-WebID</title>
+ <graphic fileref="ui/si4.png"/>
+ </figure>
+ </listitem>
+ <listitem>The SPARQL Query UI will be displayed:
+ <figure id="si5" float="1">
+ <title>Conductor SPARQL-WebID</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-WebID</title>
+ <graphic fileref="ui/si6.png"/>
+ </figure>
+ <figure id="si7" float="1">
+ <title>Conductor SPARQL-WebID</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>
+ <sect4 id="rdfsparulexamples23"><title>Example usage of deleting Triple Patterns that are Not Scoped to a Named Graph</title>
+ <para>Presuming this triple exists in one or more graphs in the store:</para>
+<programlisting><![CDATA[
+{
+ <http://kingsley.idehen.net/dataspace/person/kidehen#this>
+ <http://xmlns.com/foaf/0.1/knows>
+ <http://id.myopenlink.net/dataspace/person/KingsleyUyiIdehen#this>
+}
+]]></programlisting>
+ <para>The SQL query below will delete that triple from all graphs in the store:</para>
+<programlisting><![CDATA[
+DELETE
+ FROM DB.DBA.RDF_QUAD
+ WHERE p = iri_to_id
+ ('http://xmlns.com/foaf/0.1/knows')
+ AND s = iri_to_id
+ ('http://kingsley.idehen.net/dataspace/person/kidehen#this')
+ AND o = iri_to_id
+ ('http://id.myopenlink.net/dataspace/person/KingsleyUyiIdehen#this')
+;
+]]></programlisting>
+ <para>According to
+ <ulink url="http://www.w3.org/TR/2010/WD-sparql11-update-20100126/#t414">SPARQL 1.1 Update</ulink>,
+ the FROM clause which scopes the query to a single graph is optional. Thus, the SQL query above can
+ be rewritten to the SPARQL query below, again deleting the matching triple from all graphs in the
+ store:
+ </para>
+<programlisting><![CDATA[
+DELETE
+ {
+ GRAPH ?g
+ {
+ <http://kingsley.idehen.net/dataspace/person/kidehen#this>
+ <http://xmlns.com/foaf/0.1/knows>
+ <http://id.myopenlink.net/dataspace/person/KingsleyUyiIdehen#this>
+ }
+ }
+WHERE
+ {
+ GRAPH ?g
+ {
+ <http://kingsley.idehen.net/dataspace/person/kidehen#this>
+ <http://xmlns.com/foaf/0.1/knows>
+ <http://id.myopenlink.net/dataspace/person/KingsleyUyiIdehen#this>
+ }
+ }
+]]></programlisting>
+ </sect4>
+ <sect4 id="rdfsparulexamples24"><title>Example usage of deleting triples containing blank nodes</title>
+ <para>There are two ways to delete a particular blank node:</para>
+ <orderedlist>
+ <listitem>To refer to it via some properties or:</listitem>
+ <listitem>To convert it to it's internal "serial number", a long integer, and back.</listitem>
+ </orderedlist>
+ <para>Assume the following sample scenario:</para>
+ <orderedlist>
+ <listitem>Clear the graph:
+<programlisting><![CDATA[
+SPARQL CLEAR GRAPH <http://sample/>;
+
+Done. -- 4 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Insert three blank nodes with two related triples each:
+<programlisting><![CDATA[
+SPARQL
+ INSERT IN GRAPH <http://sample/>
+ {
+ [] <p> <o1a> , <o1b> .
+ [] <p> <o2a> , <o2b> .
+ [] <p> <o3a> , <o3b>
+ }
+
+Done. -- 15 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Delete one pair of triples:
+<programlisting><![CDATA[
+SPARQL WITH <http://sample/>
+ DELETE { ?s ?p ?o }
+ WHERE
+ {
+ ?s ?p ?o ;
+ <p> <o1a> .
+ }
+
+Done. -- 7 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Ensure that we still have two bnodes, two triple per bnode:
+<programlisting><![CDATA[
+SPARQL
+ SELECT *
+ FROM <http://sample/>
+ WHERE
+ {
+ ?s ?p ?o
+ }
+s p o
+VARCHAR VARCHAR VARCHAR
+________________
+
+nodeID://b10006 p o3a
+nodeID://b10006 p o3b
+nodeID://b10007 p o2a
+nodeID://b10007 p o2b
+
+4 Rows. -- 4 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>
+<programlisting><![CDATA[
+]]></programlisting>
+ </listitem>
+ <listitem>Each bnode, as well as any "named" node, is identified internally as an integer:
+<programlisting><![CDATA[
+SPARQL
+ SELECT (<LONG::bif:iri_id_num>(?s)) AS ?s_num, ?p, ?o
+ FROM <http://sample/>
+ WHERE
+ {
+ ?s ?p ?o
+ };
+s_num p o
+INTEGER VARCHAR VARCHAR
+_____________________________
+
+4611686018427397910 p o3a
+4611686018427397910 p o3b
+4611686018427397911 p o2a
+4611686018427397911 p o2b
+
+4 Rows. -- 5 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>The integer can be converted back to internal identifier. Say, here we try to
+ delete a triple that does not exist (even if the ID integer is valid):
+<programlisting><![CDATA[
+SPARQL
+ DELETE FROM <http://sample/>
+ {
+ `bif:iri_id_from_num(4611686018427397911)` <p> <o3a>
+ };
+
+Done. -- 5 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Should have no effect, because the "46..11" IRI has <o2a> and <o2b>,
+ and was not requested <o3a>:
+<programlisting><![CDATA[
+SPARQL
+ SELECT *
+ FROM <http://sample/>
+ WHERE
+ {
+ ?s ?p ?o
+ };
+s p o
+VARCHAR VARCHAR VARCHAR
+________________
+
+nodeID://b10006 p o3a
+nodeID://b10006 p o3b
+nodeID://b10007 p o2a
+nodeID://b10007 p o2b
+
+4 Rows. -- 5 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Now let's try to delete a triple that does actually exist. Note the use of
+ backquotes to insert an expression into template:
+<programlisting><![CDATA[
+SPARQL
+ DELETE FROM <http://sample/>
+ {
+ `bif:iri_id_from_num(4611686018427397911)` <p> <o2a>
+ };
+
+Done. -- 4 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>So there's an effect:
+<programlisting><![CDATA[
+SPARQL
+ SELECT *
+ FROM <http://sample/>
+ WHERE
+ {
+ ?s ?p ?o
+ };
+s p o
+VARCHAR VARCHAR VARCHAR
+_________________
+
+nodeID://b10006 p o3a
+nodeID://b10006 p o3b
+nodeID://b10007 p o2b
+
+3 Rows. -- 2 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Now delete everything related to <code>nodeID://b10006</code> subject:
+<programlisting><![CDATA[
+SPARQL
+ WITH <http://sample/>
+ DELETE
+ {
+ ?s ?p ?o
+ }
+ WHERE
+ {
+ ?s ?p ?o .
+ FILTER (?s = bif:iri_id_from_num(4611686018427397910))
+ };
+
+Done. -- 18 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Three minus two gives one triple remaining:
+<programlisting><![CDATA[
+SQL> SPARQL
+ SELECT *
+ FROM <http://sample/>
+ WHERE
+ {
+ ?s ?p ?o
+ };
+s p o
+VARCHAR VARCHAR VARCHAR
+_________________
+
+nodeID://b10007 p o2b
+
+1 Rows. -- 4 msec.
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>Note</emphasis>: IDs of bnodes will vary from server to server and even from
+ run to run on the same server, so the application should identify bnodes by properties
+ before doing <code>bif:iri_id_XXX</code> tricks.
+ </para>
+ </sect4>
</sect3>
</sect2>
<sect2 id="sparqlbi"><title>Business Intelligence Extensions for SPARQL</title>
@@ -6458,7 +7003,7 @@ SQL>
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 RDF views.
+The extended features apply equally to querying physical quads or relational tables mapped through Linked Data 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
@@ -6508,7 +7053,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 RDF View) then +> should be used.</para>
+<para>If this property is set (for example by an Linked Data View) then +> should be used.</para>
<para><emphasis>Simple Example</emphasis></para>
<programlisting><![CDATA[
@@ -7200,7 +7745,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>
-<itemizedlist mark="bullet">
+<orderedlist>
<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>
@@ -7210,16 +7755,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>
-</itemizedlist>
+</orderedlist>
<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>
-<itemizedlist mark="bullet">
+<orderedlist>
<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>
-</itemizedlist>
+</orderedlist>
</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>
@@ -7335,17 +7880,18 @@ SELECT ?g ?s WHERE { ?s <p> ?o }
</sect2>
</sect1>
-<sect1 id="rdfviews"><title>Linked Data Views over RDBMS Data Source</title>
+<sect1 id="rdfviewsrdbms">
+ <title>Linked Data Views over RDBMS Data Source</title>
<para>
-RDF Views map relational data into RDF and allow customizing RDF representation of locally stored RDF data.
+Linked Data 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.
-RDF views are also suitable for declaring custom representation for RDF triples, e.g. property tables, where one row holds many single-valued properties.
+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.
</para>
<sect2 id="rdfviewsintro"><title>Introduction</title>
<para>
-The Virtuoso RDF Views meta schema is a built-in feature of Virtuoso's SPARQL to SQL translator.
+The Virtuoso Linked Data 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.
@@ -7410,7 +7956,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 RDF Views should offer the same flexibility with the graphs as SPARQL addressing physical triples.
+Virtuoso Linked Data 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.
@@ -7993,25 +8539,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 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.
+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.
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 RDF Views.
+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.
</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 RDF View</title>
-<para>RDF View can be created by two or more "sparql alter storage" statements. In each statement
+<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
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
-RDF View in question is exclusive for a graph then only the last quad map should be exclusive but
+Linked Data 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 RDF view is split in two parts: with quad map virtrdf:ecrmDemo1 and with
+where the Linked Data View is split in two parts: with quad map virtrdf:ecrmDemo1 and with
quad map virtrdf:ecrmDemo2:</para>
<programlisting><![CDATA[
SPARQL
@@ -8317,7 +8863,7 @@ WHERE (^{products_table.}^.FREETEXT_ID = ^{products.}^.FREETEXT_ID)
]]></programlisting>
</sect2>
-<sect2 id="rdfviewsrcur"><title>RDF views and recursive FK relationships</title>
+<sect2 id="rdfviewsrcur"><title>Linked Data 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
@@ -8339,7 +8885,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 RDF Views over Relational Data Sources</title>
+<sect1 id="rdfrdfviewgnr"><title>Automated Generation of Linked Data 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,
@@ -8452,11 +8998,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:
- <itemizedlist mark="bullet">
+ <orderedlist>
<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>
- </itemizedlist>
+ </orderedlist>
<figure id="rd14" float="1">
<title>Binding/MIME Types</title>
<graphic fileref="ui/rd14.png"/>
@@ -8513,10 +9059,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:
- <itemizedlist mark="bullet">
+ <orderedlist>
<listitem>Click "Browse"</listitem>
<listitem>Enter a WebDAV resource and click the "Select" button.</listitem>
-</itemizedlist>
+ </orderedlist>
<figure id="rd7" float="1">
<title>WebDAV resource</title>
<graphic fileref="ui/rd7.png"/>
@@ -8531,9 +9077,10 @@ 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 RDF 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 Linked Data View declarations and Linked Data publishing activities will have completed successfully.
<figure id="rd9" float="1">
- <title>RDF view declarations and Linked Data publishing activities Finish</title>
+ <title>Linked Data View declarations and Linked Data publishing activities Finish</title>
<graphic fileref="ui/rd9.png"/>
</figure>
</listitem>
@@ -8542,6 +9089,715 @@ system</listitem>
</sect2>
</sect1>
+<sect1 id="r2rml"><title>Virtuoso R2RML Support</title>
+ <sect2 id="r2rmlwhat"><title>What is R2RML?</title>
+ <para><ulink url="http://www.w3.org/TR/r2rml/">R2RML</ulink> is a language for expressing customized
+ mappings from relational databases to RDF data sets. Such mappings provide the ability to view existing
+ relational data in the RDF data model, expressed in a structure and target vocabulary of the mapping
+ author's choice.</para>
+ <para>R2RML mappings are themselves RDF graphs written in Turtle syntax.</para>
+ </sect2>
+ <sect2 id="r2rmlwhy"><title>Why use it?</title>
+ <para>As a W3C working draft, R2RML is becoming the generic standard adopted by most vendors of tools
+ mapping relational data to RDF, enabling the interoperability of R2RML scripts, whether created with
+ such tools or by hand.</para>
+ </sect2>
+ <sect2 id="r2rmlhow"><title>How do I use it with Virtuoso?</title>
+ <para>Virtuoso has its own previously-developed proprietary equivalent of R2RML called
+ <link linkend="rdfviewsrdbms">Linked Data Views</link>, which uses Virtuoso's
+ <ulink url="http://virtuoso.openlinksw.com/whitepapers/relational%20rdf%20views%20mapping.html">Meta Schema Mapping Language</ulink> to map relational data to RDF.</para>
+ <para>R2RML support is achieved by the inclusion of a simple translator which basically translates R2RML syntax to Virtuoso's own Linked Data Views syntax, which can then be executed to create the Linked Data Views themselves.</para>
+ <sect3 id="r2rmlhowinst"><title>Install R2RML VAD package</title>
+ <para>First you will need to ensure you have the R2RML VAD package
+ (<ulink url="http://opldownload.s3.amazonaws.com/uda/vad-packages/6.3/virtuoso/rdb2rdf_dav.vad">rdb2rdf_dav.vad</ulink>)
+ installed.
+ </para>
+ </sect3>
+ <sect3 id="r2rmlhowtest"><title>Test with simple test script (basic.sql)</title>
+ <para>Having installed the R2RML VAD package, to test R2RML functionality, the easiest way is by executing a basic.sql script via the command line isql tool:</para>
+<programlisting><![CDATA[
+
+CREATE TABLE "R2RML"."TEST"."PRODUCT"(
+ id integer primary key,
+ name VARCHAR(100)
+);
+
+INSERT SOFT "R2RML"."TEST"."PRODUCT" VALUES (1, 'Virtuoso');
+
+SPARQL CLEAR GRAPH <http://temp/product>;
+SPARQL CLEAR GRAPH <http://example.com/>;
+
+
+
+DB.DBA.TTLP ('
+ at prefix rr: <http://www.w3.org/ns/r2rml#> .
+ at prefix exa: <http://example.com/ns#> .
+ at prefix product: <http://example.com/product#> .
+
+<http://example.com/ns#TriplesMap1>
+ a rr:TriplesMap;
+
+ rr:logicalTable
+ [
+ rr:tableSchema "R2RML";
+ rr:tableOwner "TEST";
+ rr:tableName "PRODUCT"
+ ];
+
+ rr:subjectMap
+ [
+ rr:template "http://example.com/product/{id}";
+ rr:class exa:product;
+ rr:graph <http://example.com/>;
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate product:id;
+ rr:objectMap [ rr:column "id" ];
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate product:name;
+ rr:objectMap [ rr:column "name" ];
+ ];
+.
+', 'http://temp/product', 'http://temp/product' )
+;
+
+
+
+--select DB.DBA.R2RML_TEST ('http://temp/product');
+
+--DB.DBA.OVL_VALIDATE ('http://temp/product', 'http://www.w3.org/ns/r2rml#OVL');
+
+-- Running the validation in order to find error in name of R2RML description graph
+--DB.DBA.OVL_VALIDATE ('http://temp/product-nosuch', 'http://www.w3.org/ns/r2rml#OVL');
+
+-- Running the validation in order to find error in name of R2RML metadata graph
+--DB.DBA.OVL_VALIDATE ('http://temp/product', 'http://www.w3.org/ns/r2rml#OVL-nosuch');
+
+--select DB.DBA.R2RML_EXECUTE ('http://temp/product');
+
+exec ('sparql ' || DB.DBA.R2RML_MAKE_QM_FROM_G ('http://temp/product'));
+
+--sparql select distinct ?g where { graph ?g { ?s a ?t }};
+
+SPARQL
+SELECT * FROM <http://example.com/>
+WHERE {?s ?p ?o .};
+]]></programlisting>
+ <orderedlist>
+ <listitem>First, copy basic.sql into:
+<programlisting><![CDATA[
+<VIRTUOSO_INSTALL>/bin/
+]]></programlisting>
+ </listitem>
+ <listitem>Next, open Unix session or Windows Command Prompt and execute:
+<programlisting><![CDATA[
+
+cd <OPENLINK_INSTALL>/bin
+
+./isql (Unix)
+isql.exe (Windows)
+
+OpenLink Interactive SQL (Virtuoso), version 0.9849b.
+Type HELP; for help and EXIT; to exit.
+SQL>
+]]></programlisting>
+ </listitem>
+ <listitem>Then, within isql execute:
+<programlisting><![CDATA[
+SQL> load basic.sql;
+]]></programlisting>
+ </listitem>
+ <listitem>Execution should finish with a simple SPARQL query that will return Linked Data for
+ the test table created at the start of the script:
+<programlisting><![CDATA[
+s p o
+VARCHAR VARCHAR VARCHAR
+________________________________________________________________________________________________________________
+
+http://example.com/product/1 http://example.com/product#id 1
+http://example.com/product/1 http://example.com/product#name Virtuoso
+http://example.com/product/1 http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://example.com/ns#product
+3 Rows. -- 0 msec.
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>Note</emphasis>: Subsequent executions of basic.sql will return an error since the test table will already exist. However, the remainder of the script will execute fine.</para>
+ </sect3>
+ <sect3 id="r2rmlhowexam"><title>Examining basic.sql</title>
+ <orderedlist>
+ <listitem>We start by creating and populating the test table:
+<programlisting><![CDATA[
+CREATE TABLE "R2RML"."TEST"."PRODUCT"
+ (
+ id INTEGER PRIMARY KEY ,
+ name VARCHAR(100)
+ );
+
+INSERT SOFT "R2RML"."TEST"."PRODUCT"
+ VALUES
+ (
+ 1, 'Virtuoso'
+ );
+]]></programlisting>
+ </listitem>
+ <listitem>Next we clear any graphs (temporary or permanent) that are to be used during this process:
+<programlisting><![CDATA[
+SPARQL CLEAR GRAPH <http://temp/product> ;
+SPARQL CLEAR GRAPH <http://example.com/> ;
+]]></programlisting>
+ </listitem>
+ <listitem>Next we use the <link linkend="fn_ttlp"><function>DB.DBA.TTLP()</function></link>
+ procedure to insert the R2RML into a temporary graph, <http://temp/product>:
+<programlisting><![CDATA[
+DB.DBA.TTLP
+ (
+ ' @prefix rr: <http://www.w3.org/ns/r2rml#> .
+ @prefix exa: <http://example.com/ns#> .
+ @prefix product: <http://example.com/product#> .
+
+ <http://example.com/ns#TriplesMap1>
+ a rr:TriplesMap ;
+
+ rr:logicalTable
+ [
+ rr:tableSchema "R2RML" ;
+ rr:tableOwner "TEST" ;
+ rr:tableName "PRODUCT"
+ ];
+
+ rr:subjectMap
+ [
+ rr:template "http://example.com/product/{id}" ;
+ rr:class exa:product ;
+ rr:graph <http://example.com/>
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate product:id ;
+ rr:objectMap
+ [
+ rr:column "id"
+ ];
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate product:name ;
+ rr:objectMap
+ [
+ rr:column "name"
+ ];
+ ];
+ .
+ ',
+ 'http://temp/product',
+ 'http://temp/product'
+ );
+]]></programlisting>
+ </listitem>
+ <listitem>Next, there is a series of commented out lines that can be used for sanity checking:
+<programlisting><![CDATA[
+--SELECT DB.DBA.R2RML_TEST ('http://temp/product');
+
+--DB.DBA.OVL_VALIDATE ('http://temp/product', 'http://www.w3.org/ns/r2rml#OVL');
+
+-- Running the validation in order to find error in name of R2RML description graph
+--DB.DBA.OVL_VALIDATE ('http://temp/product-nosuch', 'http://www.w3.org/ns/r2rml#OVL');
+
+-- Running the validation in order to find error in name of R2RML metadata graph
+--DB.DBA.OVL_VALIDATE ('http://temp/product', 'http://www.w3.org/ns/r2rml#OVL-nosuch');
+
+--SELECT DB.DBA.R2RML_EXECUTE ('http://temp/product');
+]]></programlisting>
+ </listitem>
+ <listitem>Next, DB.DBA.R2RML_MAKE_QM_FROM_G() is used to perform the conversion from R2RML into
+ Virtuoso's own Linked Data Views script. The output is then prepended with the keyword 'SPARQL'
+ and a space, and executed using <link linkend="fn_exec"><function>exec()</function></link> :
+<programlisting><![CDATA[
+EXEC ('SPARQL ' || DB.DBA.R2RML_MAKE_QM_FROM_G ('http://temp/product'));
+]]></programlisting>
+ <para><emphasis>Note</emphasis>: The final triples are placed in the graph defined in the R2RML script itself (<http://example.com/>)</para>
+ <para>Alternatively, the destination graph can be specified as an optional second parameter of DB.DBA.R2RML_MAKE_QM_FROM_G():</para>
+<programlisting><![CDATA[
+DB.DBA.R2RML_MAKE_QM_FROM_G
+ (
+ (
+ IN g VARCHAR
+ [, IN target_graph VARCHAR := NULL]
+ )
+ )
+
+]]></programlisting>
+ </listitem>
+ <listitem>Finally, a simple SPARQL statement is executed to prove data is returned:
+<programlisting><![CDATA[
+SPARQL
+ SELECT *
+ FROM <http://example.com/>
+ WHERE {?s ?p ?o .};
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect3>
+ </sect2>
+ <sect2 id="r2rmlknlim"><title>Known Limitations</title>
+ <para><emphasis>rr:sqlQuery</emphasis> is not currently supported, due to limitations in
+ the optimizer used for Virtuoso's native implementation of Linked Data Views.</para>
+ </sect2>
+ <sect2 id="r2rmlgenlviewisql"><title>Generating an R2RML Linked Data View from ISQL</title>
+ <para>Using Virtuoso you can programmatically generate Linked Data Views atop Relational Data Sources,
+ using R2RML via the built-in function: <emphasis>R2RML_GENERATE_LINKED_VIEW</emphasis> function.
+ In order to use this function, you need to have the
+ <ulink url="http://opldownload.s3.amazonaws.com/uda/vad-packages/6.3/virtuoso/rdb2rdf_dav.vad">rdb2rdf_dav.vad</ulink>
+ package installed.
+ </para>
+<programlisting><![CDATA[
+R2RML_GENERATE_LINKED_VIEW
+ (
+ in source varchar,
+ in destination_graph varchar,
+ in graph_type int default 0,
+ in clear_source_graph int default 1
+ )
+]]></programlisting>
+ <para>Here is detailed description of the funcion's parameter:</para>
+ <itemizedlist mark="bullet">
+ <listitem><emphasis>source</emphasis>: The source R2RMLdocument URI. Acceptable schemes include: file:, dav:, http: and https:. These are also acceptable as source graph URI;</listitem>
+ <listitem><emphasis>destination graph</emphasis>: This is a default graph name (an IRI) applicable to either virtual or physical graph.</listitem>
+ <listitem><emphasis>graph_type</emphasis>: 0 - virtual; 1 - physical graph which sets the actual graph type;</listitem>
+ <listitem><emphasis>clear_source_graph</emphasis>: Determines if existing R2RML source graphs (those holding view declarations) are replaced as part of processing pipeline.</listitem>
+ </itemizedlist>
+ <para><emphasis>Note</emphasis>: The R2RML mapping script may have a triples like:</para>
+<programlisting><![CDATA[
+[] rr:graph <graph_name>
+]]></programlisting>
+ <para>and in this case they take precedence and virtual graph would be defined as in the R2RML.
+ If so, then if destination graph is specified as physical, all virtual graphs found in the
+ R2RML would go in the destination_graph.</para>
+ <sect3 id="r2rmlgenlviewisqlex"><title>Usage Example</title>
+ <orderedlist>
+ <listitem>Ensure the R2RML VAD package <ulink url="http://opldownload.s3.amazonaws.com/uda/vad-packages/6.3/virtuoso/rdb2rdf_dav.vad">rdb2rdf_dav.vad</ulink> is installed.</listitem>
+ <listitem>To clear out existing mappings execute:
+<programlisting><![CDATA[
+SQL> SELECT RDF_VIEW_DROP_STMT_BY_GRAPH ('http://example.com');
+VARCHAR
+_______________________________________________________________________________
+
+SPARQL drop silent quad map <http://demo.openlinksw.com/r2rmldemo.n3> .;
+
+
+1 Rows. -- 16 msec.
+
+SQL> SPARQL DROP SILENT QUAD MAP <http://demo.openlinksw.com/r2rmldemo.n3> ;
+
+STATE MESSAGE
+VARCHAR VARCHAR
+_______________________________________________________________________________
+
+00000 Quad map <http://demo.openlinksw.com/r2rmldemo.n3> is no longer used in storage <http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage
+>
+00000 Quad map <http://demo.openlinksw.com/r2rmldemo.n3> is deleted
+00000 Transaction committed, SPARQL compiler re-configured
+00000 2 RDF metadata manipulation operations done
+
+4 Rows. -- 406 msec.
+
+
+SQL> SPARQL CLEAR <http://demo.openlinksw.com/r2rmldemo.n3>;
+
+callret-0
+VARCHAR
+_______________________________________________________________________________
+
+Clear <http://demo.openlinksw.com/r2rmldemo.n3> -- done
+
+1 Rows. -- 15 msec.
+
+
+SQL> DROP TABLE "R2RML"."TEST"."PRODUCT" ;
+
+Done. -- 0 msec.
+
+SQL> CREATE TABLE "R2RML"."TEST"."PRODUCT"
+(
+ "id" INTEGER,
+ "name" VARCHAR(100),
+ PRIMARY KEY ("id")
+);
+Done. -- 16 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Insert sample data into a Table by executing:
+<programlisting><![CDATA[
+SQL> INSERT SOFT "R2RML"."TEST"."PRODUCT" VALUES(1, 'Virtuoso');
+Done. -- 0 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Locate or create your R2RML mapping document, for example: .n3 file with the following content:
+<programlisting><![CDATA[
+ at prefix rr: <http://www.w3.org/ns/r2rml#> .
+ at prefix exa: <http://example.com/ns#> .
+ at prefix product: <http://example.com/product#> .
+
+<http://example.com/ns#TriplesMap1>
+ a rr:TriplesMap;
+
+ rr:logicalTable
+ [
+ rr:tableSchema "R2RML";
+ rr:tableOwner "TEST";
+ rr:tableName "PRODUCT"
+ ];
+
+ rr:subjectMap
+ [
+ rr:template "http://example.com/product/{id}";
+ rr:class exa:product;
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate product:id;
+ rr:objectMap [ rr:column "id" ];
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate product:name;
+ rr:objectMap [ rr:column "name" ];
+ ];
+.
+]]></programlisting>
+ </listitem>
+ <listitem>Generate a Linked Data View from the R2RML document that applies to the sample data (created earlier) by executing the statement:
+<programlisting><![CDATA[
+SQL> DB.DBA.R2RML_GENERATE_LINKED_VIEW('http://demo.openlinksw.com/r2rmldemo.n3', 'http://example.com', 0);
+STATE MESSAGE
+VARCHAR VARCHAR
+_______________________________________________________________________________
+
+00000 IRI class <r2rml:virt02-8513ca7e0ce41d2e38f0c750fd552139> has been defined (inherited from rdfdf:sql-integer-uri-nullable)
+00000 Literal class <r2rml:virt02-daca9ceddea29d53dbbdb6bd0f3dee68> has been defined (inherited from rdfdf:sql-integer-literal-nullable)
+00000 Quad storage <http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage> is flagged as being edited
+00000 Quad map <http://demo.openlinksw.com/r2rmldemo.n3> has been created and added to the <http://www.openlinksw.com/schemas/virtrdf#DefaultQuadSt
+orage>
+00000 Quad map <sys:qm-1be5dbd931459cf9e2df2338428f418d> has been created and added to the <http://www.openlinksw.com/schemas/virtrdf#DefaultQuadSt
+orage>
+00000 Quad map <sys:qm-c5f81d7126efa3e7a93f7e903fd5fa93> has been created and added to the <http://www.openlinksw.com/schemas/virtrdf#DefaultQuadSt
+orage>
+00000 Quad map <sys:qm-25c4599111b9f07fbd8fc60ce0b42eaf> has been created and added to the <http://www.openlinksw.com/schemas/virtrdf#DefaultQuadSt
+orage>
+00000 Quad storage <http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage> is unflagged and can be edited by other transactions
+00000 Transaction committed, SPARQL compiler re-configured
+00000 9 RDF metadata manipulation operations done
+
+10 Rows. -- 1109 msec.
+SQL>
+]]></programlisting>
+ </listitem>
+ <listitem>Verify successful creation of the Linked Data View by executing the following SPARQL query via iSQL or Conductor interface:
+<programlisting><![CDATA[
+SQL> SPARQL
+SELECT *
+FROM <http://example.com>
+WHERE {?s ?p ?o} ;
+
+s p o
+VARCHAR VARCHAR VARCHAR
+_______________________________________________________________________________
+
+http://example.com/product/1 http://example.com/product#id 1
+http://example.com/product/1 http://example.com/product#name Virtuoso
+http://example.com/product/1 http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://example.com/ns#product
+
+3 Rows. -- 15 msec.
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect3>
+ </sect2>
+ <sect2 id="r2rmlcondwiz"><title>Virtuoso Conductor R2RML Import Wizard</title>
+ <para>The Virtuoso Conductor can be used for importing existing R2RML scripts into Virtuoso and generate the necessary RDF Linked Data Views for Virtuoso hosting and deployment.</para>
+ <sect3 id="r2rmlcondwizex"><title>Usage Example</title>
+ <orderedlist>
+ <listitem>Ensure the R2RML <ulink url="http://opldownload.s3.amazonaws.com/uda/vad-packages/6.3/virtuoso/rdb2rdf_dav.vad">rdb2rdf_dav.vad</ulink>
+ and latest Conductor <ulink url="http://opldownload.s3.amazonaws.com/uda/vad-packages/6.3/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink> VAD packages are installed.
+ </listitem>
+ <listitem>Create a test table with sample data:
+<programlisting><![CDATA[
+SQL> CREATE TABLE "R2RML"."TEST"."PRODUCT"
+(
+ "id" INTEGER,
+ "name" VARCHAR(100),
+ PRIMARY KEY ("id")
+);
+Done. -- 16 msec.
+SQL> INSERT SOFT "R2RML"."TEST"."PRODUCT" VALUES(1, 'Virtuoso');
+Done. -- 0 msec.
+SQL> INSERT SOFT "R2RML"."TEST"."PRODUCT" VALUES(2, 'UDA');
+Done. -- 0 msec.
+SQL>
+]]></programlisting>
+ </listitem>
+ <listitem>Grant select privileges on the "R2RML"."TEST"."PRODUCT" table to the SPARQL user to enable execution via SPARQL endpoint:
+<programlisting><![CDATA[
+SQL> GRANT SELECT ON R2RML.TEST.PRODUCT TO "SPARQL", "SPARQL_UPDATE"
+Done. -- 1 msec.
+]]></programlisting>
+ </listitem>
+ <listitem>Create the following R2RML mapping script for the "R2RML"."TEST"."PRODUCT" table:
+<programlisting><![CDATA[
+$ cat demo.n3
+ at prefix rr: <http://www.w3.org/ns/r2rml#> .
+ at prefix exa: <http://example.com/ns#> .
+ at prefix product: <http://example.com/product#> .
+
+<http://example.com/ns#TriplesMap1>
+ a rr:TriplesMap;
+
+ rr:logicalTable
+ [
+ rr:tableSchema "R2RML";
+ rr:tableOwner "TEST";
+ rr:tableName "PRODUCT"
+ ];
+
+ rr:subjectMap
+ [
+ rr:template "http://example.com/product/{id}";
+ rr:class exa:product;
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate product:id;
+ rr:objectMap [ rr:column "id" ];
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate product:name;
+ rr:objectMap [ rr:column "name" ];
+ ];
+.
+$
+]]></programlisting>
+ </listitem>
+ <listitem>Got to the Linked Data -> R2RML tab of the Virtuoso Conductor:
+ <figure id="VirtConductorR2RMLImport01" float="1">
+ <title>Conductor R2RML Import Wizard</title>
+ <graphic fileref="ui/VirtConductorR2RMLImport01.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select the Choose File button and select the R2RML file to load:
+ <figure id="VirtConductorR2RMLImport02" float="1">
+ <title>Conductor R2RML Import Wizard</title>
+ <graphic fileref="ui/VirtConductorR2RMLImport02.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select the Validate button to verify the R2RML mapping script:
+ <figure id="VirtConductorR2RMLImport03" float="1">
+ <title>Conductor R2RML Import Wizard</title>
+ <graphic fileref="ui/VirtConductorR2RMLImport03.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select the Generate button to generate the RDF Linked Data Views mappings for the R2RML mapping script:
+ <figure id="VirtConductorR2RMLImport04" float="1">
+ <title>Conductor R2RML Import Wizard</title>
+ <graphic fileref="ui/VirtConductorR2RMLImport04.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select the Execute button to create the RDF Linked Data Views mapping the the Quad Store:
+ <figure id="VirtConductorR2RMLImport05" float="1">
+ <title>Conductor R2RML Import Wizard</title>
+ <graphic fileref="ui/VirtConductorR2RMLImport05.png"/>
+ </figure>
+ </listitem>
+ <listitem>The RDF Linked Data View creation is complete and status is displayed:
+ <figure id="VirtConductorR2RMLImport06" float="1">
+ <title>Conductor R2RML Import Wizard</title>
+ <graphic fileref="ui/VirtConductorR2RMLImport06.png"/>
+ </figure>
+ </listitem>
+ <listitem>The Default Graph Name (transient) specified http://demo.openlinksw.com/r2rml# can
+ now be used to run a SPARQL query against the created Linked Data View. If the Generate
+ <link linkend="rdb2rdftriggers">RDB2RDF triggers</link> and Enable Data Syncs with Physical
+ Quad Store check boxes are selected the Physical Graph Name (persistent) specified
+ urn:demo.openlinksw.com/r2rml# can be used to run a SPARQL query against the materialized
+ triples in the Quad Store.
+ <figure id="VirtConductorR2RMLImport07" float="1">
+ <title>Conductor R2RML Import Wizard</title>
+ <graphic fileref="ui/VirtConductorR2RMLImport07.png"/>
+ </figure>
+ </listitem>
+ <listitem>The results set for the Linked Data View graph are displayed:
+ <figure id="VirtConductorR2RMLImport08" float="1">
+ <title>Conductor R2RML Import Wizard</title>
+ <graphic fileref="ui/VirtConductorR2RMLImport08.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ </sect3>
+ </sect2>
+ <sect2 id="r2rmlgentransperslviewrs"><title>Generate Transient and/or Persistent Linked Data Views atop Remote Relational Data Sources Using Conductor</title>
+ <para>This section describes how you can generate R2RML Scripts from Linked Data Views, using the Virtuoso Conductor ODBC or JDBC accessible.</para>
+ <orderedlist>
+ <listitem>Ensure you have installed Conductor <ulink url="http://opldownload.s3.amazonaws.com/uda/vad-packages/6.3/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink> VAD package with version 1.32.38 or higher.
+ </listitem>
+ <listitem>Go to http://<cname>[:<port>]/conductor.
+ </listitem>
+ <listitem>Enter dba credentials.
+ </listitem>
+ <listitem>Go to Linked Data -> Views:
+ <figure id="r0" float="1">
+ <title>Generating Transient and/or Persistent Linked Data Views</title>
+ <graphic fileref="ui/r0.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select Qualifier Demo:
+ <figure id="r00" float="1">
+ <title>Generating Transient and/or Persistent Linked Data Views</title>
+ <graphic fileref="ui/r00.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select table(s) by hatching the check-box to the left of the table name; for example, select the following tables from the Northwind DB: Categories, Customers, Employees, Order_Details, Orders, Products .
+ <figure id="r1g" float="1">
+ <title>Generating Transient and/or Persistent Linked Data Views</title>
+ <graphic fileref="ui/r1g.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click Generate via Wizard:
+ <figure id="r2g" float="1">
+ <title>Generating Transient and/or Persistent Linked Data Views</title>
+ <graphic fileref="ui/r2g.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click Prepare to Execute.</listitem>
+ <listitem>The R2RML script for the selected table(s) will be generated and displayed in the R2RML Graph text-area:
+ <figure id="r3g" float="1">
+ <title>Generating Transient and/or Persistent Linked Data Views</title>
+ <graphic fileref="ui/r3g.png"/>
+ </figure>
+ <figure id="r4g" float="1">
+ <title>Generating Transient and/or Persistent Linked Data Views</title>
+ <graphic fileref="ui/r4g.png"/>
+ </figure>
+ <figure id="r5g" float="1">
+ <title>Generating Transient and/or Persistent Linked Data Views</title>
+ <graphic fileref="ui/r5g.png"/>
+ </figure>
+ </listitem>
+ <listitem>As result the following R2RML script should be generated for the Northwind DB collection:
+<programlisting><![CDATA[
+ at prefix rr: <http://www.w3.org/ns/r2rml#> .
+ at prefix Demo: <http://demo.openlinksw.com/schemas/Demo/> .
+ at prefix demo-stat: <http://demo.openlinksw.com/Demo/stat#> .
+ at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+ at prefix void: <http://rdfs.org/ns/void#> .
+ at prefix scovo: <http://purl.org/NET/scovo#> .
+ at prefix aowl: <http://bblfish.net/work/atom-owl/2006-06-06/> .
+
+
+<#TriplesMapCategories> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Categories" ];
+rr:subjectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/categories/{CategoryID}"; rr:class Demo:Categories; ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:categoryid ] ; rr:objectMap [ rr:column "CategoryID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:categoryname ] ; rr:objectMap [ rr:column "CategoryName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:description ] ; rr:objectMap [ rr:column "Description" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:picture ] ; rr:objectMap [ rr:column "Picture" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:categories_of_products ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapProducts>; rr:joinCondition [ rr:child "CategoryID" ; rr:parent "CategoryID" ] ; ]; ] .
+
+<#TriplesMapCustomers> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Customers" ];
+rr:subjectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/customers/{CustomerID}"; rr:class Demo:Customers; ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:customerid ] ; rr:objectMap [ rr:column "CustomerID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:companyname ] ; rr:objectMap [ rr:column "CompanyName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:contactname ] ; rr:objectMap [ rr:column "ContactName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:contacttitle ] ; rr:objectMap [ rr:column "ContactTitle" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:address ] ; rr:objectMap [ rr:column "Address" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:city ] ; rr:objectMap [ rr:column "City" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:region ] ; rr:objectMap [ rr:column "Region" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:postalcode ] ; rr:objectMap [ rr:column "PostalCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:country ] ; rr:objectMap [ rr:column "Country" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:countrycode ] ; rr:objectMap [ rr:column "CountryCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:phone ] ; rr:objectMap [ rr:column "Phone" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:fax ] ; rr:objectMap [ rr:column "Fax" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:customers_of_orders ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrders>; rr:joinCondition [ rr:child "CustomerID" ; rr:parent "CustomerID" ] ; ]; ] .
+
+<#TriplesMapEmployees> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Employees" ];
+rr:subjectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/employees/{EmployeeID}"; rr:class Demo:Employees; ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:employeeid ] ; rr:objectMap [ rr:column "EmployeeID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:lastname ] ; rr:objectMap [ rr:column "LastName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:firstname ] ; rr:objectMap [ rr:column "FirstName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:title ] ; rr:objectMap [ rr:column "Title" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:titleofcourtesy ] ; rr:objectMap [ rr:column "TitleOfCourtesy" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:birthdate ] ; rr:objectMap [ rr:column "BirthDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:hiredate ] ; rr:objectMap [ rr:column "HireDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:address ] ; rr:objectMap [ rr:column "Address" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:city ] ; rr:objectMap [ rr:column "City" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:region ] ; rr:objectMap [ rr:column "Region" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:postalcode ] ; rr:objectMap [ rr:column "PostalCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:country ] ; rr:objectMap [ rr:column "Country" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:countrycode ] ; rr:objectMap [ rr:column "CountryCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:homephone ] ; rr:objectMap [ rr:column "HomePhone" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:extension ] ; rr:objectMap [ rr:column "Extension" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:photo ] ; rr:objectMap [ rr:column "Photo" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:notes ] ; rr:objectMap [ rr:column "Notes" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:reportsto ] ; rr:objectMap [ rr:column "ReportsTo" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:employees_of_orders ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrders>; rr:joinCondition [ rr:child "EmployeeID" ; rr:parent "EmployeeID" ] ; ]; ] .
+
+<#TriplesMapOrder_Details> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Order_Details" ];
+rr:subjectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/order_details/{OrderID}/{ProductID}"; rr:class Demo:Order_Details; ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:unitprice ] ; rr:objectMap [ rr:column "UnitPrice" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:quantity ] ; rr:objectMap [ rr:column "Quantity" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:discount ] ; rr:objectMap [ rr:column "Discount" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:order_details_has_orders ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/orders/{OrderID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:order_details_has_products ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/products/{ProductID}" ]; ] .
+
+<#TriplesMapOrders> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Orders" ];
+rr:subjectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/orders/{OrderID}"; rr:class Demo:Orders; ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orderid ] ; rr:objectMap [ rr:column "OrderID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orderdate ] ; rr:objectMap [ rr:column "OrderDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:requireddate ] ; rr:objectMap [ rr:column "RequiredDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shippeddate ] ; rr:objectMap [ rr:column "ShippedDate" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:freight ] ; rr:objectMap [ rr:column "Freight" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipname ] ; rr:objectMap [ rr:column "ShipName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipaddress ] ; rr:objectMap [ rr:column "ShipAddress" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipcity ] ; rr:objectMap [ rr:column "ShipCity" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipregion ] ; rr:objectMap [ rr:column "ShipRegion" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shippostalcode ] ; rr:objectMap [ rr:column "ShipPostalCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipcountry ] ; rr:objectMap [ rr:column "ShipCountry" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:shipcountrycode ] ; rr:objectMap [ rr:column "ShipCountryCode" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:rowguid ] ; rr:objectMap [ rr:column "ROWGUID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orders_has_customers ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/customers/{CustomerID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orders_has_employees ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/employees/{EmployeeID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orders_has_shippers ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/shippers/{ShipVia}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:orders_of_order_details ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrder_Details>; rr:joinCondition [ rr:child "OrderID" ; rr:parent "OrderID" ] ; ]; ] .
+
+<#TriplesMapProducts> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "Demo" ; rr:tableOwner "demo" ; rr:tableName "Products" ];
+rr:subjectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/products/{ProductID}"; rr:class Demo:Products; ];
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:productid ] ; rr:objectMap [ rr:column "ProductID" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:productname ] ; rr:objectMap [ rr:column "ProductName" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:quantityperunit ] ; rr:objectMap [ rr:column "QuantityPerUnit" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:unitprice ] ; rr:objectMap [ rr:column "UnitPrice" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:unitsinstock ] ; rr:objectMap [ rr:column "UnitsInStock" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:unitsonorder ] ; rr:objectMap [ rr:column "UnitsOnOrder" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:reorderlevel ] ; rr:objectMap [ rr:column "ReorderLevel" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:discontinued ] ; rr:objectMap [ rr:column "Discontinued" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:products_has_categories ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/categories/{CategoryID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:products_has_suppliers ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://demo.openlinksw.com/Demo/suppliers/{SupplierID}" ]; ] ;
+rr:predicateObjectMap [ rr:predicateMap [ rr:constant Demo:products_of_order_details ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMapOrder_Details>; rr:joinCondition [ rr:child "ProductID" ; rr:parent "ProductID" ] ; ]; ] .
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect2>
+
+</sect1>
+
&rdfviewssamples;
<sect1 id="rdfinsertmethods"><title>RDF Insert Methods in Virtuoso</title>
@@ -8641,7 +9897,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>
-<itemizedlist>
+<orderedlist>
<listitem>Enter for Default Graph URI:
<programlisting><![CDATA[
http://mygraph.com
@@ -8661,7 +9917,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>
-</itemizedlist>
+</orderedlist>
</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>
@@ -8814,7 +10070,7 @@ SPARQL insert in graph <http://mygraph.com>
]]></programlisting>
</listitem>
<listitem>Load from .rq file:
- <itemizedlist mark="bullet">
+ <orderedlist>
<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[
@@ -8850,7 +10106,7 @@ Load <http://localhost:8890/DAV/tmp/listall.rq> into graph <http://myNewGraph.co
1 Rows. -- 321 msec.
]]></programlisting>
</listitem>
- </itemizedlist>
+ </orderedlist>
</listitem>
<listitem>Load from Resource URL:
<programlisting><![CDATA[
@@ -8872,7 +10128,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>
-<itemizedlist>
+<orderedlist>
<listitem>Insert into graph http://BookStore.com 3 triples:
<programlisting><![CDATA[
SQL>SPARQL insert in graph <http://BookStore.com>
@@ -8950,7 +10206,7 @@ http://www.dajobe.org/foaf.rdf#i http://purl.org/dc/elements/1.1/da
2 Rows. -- 10 msec.
]]></programlisting>
</listitem>
-</itemizedlist>
+</orderedlist>
</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>
@@ -8990,7 +10246,7 @@ i.e. the content will be "test".
</listitem>
</itemizedlist>
<para>Now let's check what data was inserted in the Quad Store:</para>
-<itemizedlist>
+<orderedlist>
<listitem>Go to the sparql endpoint, i.e. for ex. to http://localhost:8890/sparql</listitem>
<listitem>Enter for Default Graph URI:
<programlisting><![CDATA[
@@ -9019,7 +10275,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>
-</itemizedlist>
+</orderedlist>
</sect2>
<sect2 id="rdfinsertmethodwebdav">
<title>Using WebDAV</title>
@@ -9027,7 +10283,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>
- <itemizedlist>
+ <orderedlist>
<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>
@@ -9087,7 +10343,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>
- </itemizedlist>
+ </orderedlist>
<para>Execute from ISQL or from the SPARQL endpoint the following query:</para>
<programlisting><![CDATA[
SELECT * FROM <http://localhost:8890/DAV/home/test2/mytest/>
@@ -9109,7 +10365,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>
- <itemizedlist>
+ <orderedlist>
<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
@@ -9131,20 +10387,21 @@ http://www.example/jose/foaf.rdf#juan http://xmlns.com/foaf/0.1/mbox
<graphic fileref="ui/uc3.png"/>
</figure>
</listitem>
- </itemizedlist>
+ </orderedlist>
</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>
- <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>
+ <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>
<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>
@@ -9158,23 +10415,26 @@ non-RDF but get RDF and this can go to the Quad Store)</para>
<graphic fileref="ui/rdfinsert1.png"/>
</figure>
</listitem>
- </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>
+ </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.
<figure id="rdfinsertwebdav2" float="1">
<title>Using Virtuoso Crawler</title>
<graphic fileref="ui/rdfinsert2.png"/>
</figure>
- <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>
+ </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:
<programlisting><![CDATA[
SELECT *
FROM <http://www.w3.org/People/Berners-Lee>
WHERE {?s ?p ?o}
]]></programlisting>
- <para>As result should be shown the following triples:</para>
+ </listitem>
+ <listitem>As result should be shown the following triples:
<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
@@ -9195,6 +10455,9 @@ 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[
@@ -9231,7 +10494,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 Sponge the 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 Fetch the Network 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[
@@ -9354,7 +10617,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 sponged structured data, the role "SPARQL_SPONGE" must be granted to the
+constituting the fetched Network Resource 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
@@ -9466,7 +10729,7 @@ into graph <http://www.openlinksw.com/> -- done</callret-0>
<graphic fileref="linked_data_gen_opts3.png"/>
</figure>
<para>
-Architecturally, the Sponger is comprised of a number of Cartridges two types of cartridges: Extractor
+Architecturally, the Sponger is comprised of a number of RDF Mappers two types of cartridges: Extractor
and Meta Cartridges. Extractor Cartridges focus on data extraction and transformation services while
the Meta Cartridges provide lookups and joins across other linked data spaces and Web 2.0 APIs. Both
cartridge types are themselves comprised of a data extractors and RDF Schema/Ontology Mapper
@@ -9573,7 +10836,7 @@ _______________________________________________________________________________
</orderedlist>
<para>
<tip>
- <title>See Also: <link linkend="virtuosospongerrdfmapperspackage">RDF Mapper Package content description.</link></title>
+ <title>See Also: <link linkend="virtuosospongerrdfmapperspackage">Cartridges Package content description.</link></title>
</tip>
</para>
</sect2>
@@ -9641,8 +10904,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 resources
- are loaded, i.e. "sponged", during query execution, even if some of the resources are not
+ 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
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
@@ -9711,7 +10974,7 @@ limit 10;
</itemizedlist>
</sect4>
<sect4 id="virtuosospongerusageprocessorex"><title>SPARQL Processor Usage Example</title>
- <para>Sponge can be performed directly from within the SPARQL processor.</para>
+ <para>Network Resource Fetch 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>
@@ -9722,7 +10985,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 sponged from page http://www.ivan-herman.net/foaf.html is loaded into the local
+ RDF data fetched 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
@@ -9737,15 +11000,15 @@ select * from <http://mygraph> where {?s ?p ?o}
<para>The Sponger's functionality is also exposed via an in-built REST style Web service. This web
service takes a target URL and either returns the content "as is" or tries to transform (by sponging)
to RDF. Thus, the proxy service can be used as a 'pipe' for RDF browsers to browse non-RDF sources.</para>
- <para>When the rdf_mappers package is installed, Virtuoso reserves the path '/about/[id|data|rdf|html]/http/' for
+ <para>When the cartridges package is installed, Virtuoso reserves the path '/about/[id|data|rdf|html]/http/' for
Sponger Proxy URI Service. For example, if a Virtuoso installation on host example.com listens for HTTP
requests on port 8080 then client applications should use a 'service endpoint' string equal to
-'http://example.com:8080/about/[id|data|rdf|html]/http/'. If the rdf_mappers package is not installed, then
+'http://example.com:8080/about/[id|data|rdf|html]/http/'. If the cartridges package is not installed, then
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 sponged data is available in the HTML
+music metadatabase, rendered as RDF or HTML respectively. (The Network Resource fetched 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>
@@ -9759,14 +11022,63 @@ rendering through the foaf:primaryTopic property.)</para>
RDF, as can be seen by executing:
</para>
<programlisting><![CDATA[
-curl -H "Accept: application/rdf+xml" http://linkeddata.uriburner.com/about/rdf/http://www.ivan-herman.net/foaf.html
+$ 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>
]]></programlisting>
<para>(linkeddata.uriburner.com hosts a public Virtuoso instance.) Though this example
- demonstrates the action of the /about/rdf/ service quite transparently, it is a basic and
+ demonstrates the action of the /about/id/entity/ 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 sponged RDF data.
+ proxy service to provide a more polished means to extract and view fetched 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>
@@ -9788,9 +11100,9 @@ curl -H "Accept: application/rdf+xml" http://linkeddata.uriburner.com/about/rdf/
<title>Launching ODE's RDF browser</title>
<graphic fileref="twitter_home.png"/>
</figure>
- <para>The RDF browser then displays RDF data sponged via the Crunchbase cartridge.</para>
+ <para>The RDF browser then displays RDF data fetched via the Crunchbase cartridge.</para>
<figure id="ODEBrowserRDF" float="1">
- <title>ODE RDF browser displaying sponged Crunchbase data</title>
+ <title>ODE RDF browser displaying Crunchbase network resource fetched data</title>
<graphic fileref="twitter_ode_rdf.png"/>
</figure>
<para>iSPARQL directs queries to the configured SPARQL endpoint. When targetting a Virtuoso
@@ -10382,10 +11694,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 sponged cache by
- some reason is left in some inconsistent state like shutdown during sponge, then 'clean' is required
+ 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
as it doesn't check cache state. <emphasis>Note</emphasis>: must be used with caution as other threads
- may be doing sponge at same time.</entry>
+ may be doing Network Resource Fetch at same time.</entry>
<entry></entry>
</row>
</tbody>
@@ -10481,8 +11793,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>
@@ -10567,7 +11879,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 sponge the data source URIs and
+references non-default graph URIs, the Sponger goes out (via HTTP) to Fetch the Network Resource 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
@@ -10614,17 +11926,18 @@ a later section.</para>
<sect3 id="virtuosospongercatrbundled">
<title>Cartridges Bundled with Virtuoso</title>
<sect4 id="virtuosospongercatrbundledrdfvad">
- <title>RDF Mappers VAD</title>
+ <title>Cartridges VAD</title>
<para>Virtuoso supplies a number of prewritten cartridges for extracting RDF data from a
-variety of popular Web resources and file types. The cartridges are bundled as part of the rdf_mappers
+variety of popular Web resources and file types. The cartridges are bundled as part of the rdf_mappers_dav
VAD (Virtuoso Application Distribution).</para>
- <para>To see which cartridges are available, look at the 'RDF Cartridges' screen in
-Conductor. This can be reached through the Linked Data -> Sponger -> Extractor Cartridges and Meta Cartridges menu items.</para>
+ <para>To see which cartridges are available, look at the 'Linked Data' screen in
+ Conductor. This can be reached through the Linked Data -> Sponger -> Extractor
+ Cartridges and Meta Cartridges menu items.</para>
<figure id="spong2" float="1">
<title>RDF Cartridges</title>
<graphic fileref="ui/spong2.png"/>
</figure>
- <para>To check which version of the rdf_mappers VAD is installed, or to upgrade it,
+ <para>To check which version of the cartridges VAD is installed, or to upgrade it,
refer to Conductor's 'VAD Packages' screen, reachable through the 'System Admin' > 'Packages'
menu items.</para>
<para>The latest VADs for the closed source releases of Virtuoso can be
@@ -10638,7 +11951,7 @@ the VOS Wiki.</para>
<sect4 id="virtuosospongercatrbundledexample">
<title>Example Source Code</title>
<para>For developers wanting example cartridge code, the most authoritative reference is
-the rdf_mappers VAD source code itself. This is included as part of the VOS distribution. After
+the cartridges VAD source code itself. This is included as part of the VOS distribution. After
downloading and unpacking the sources, the script used to create the cartridges, and the associated
stylesheets can be found in:</para>
<itemizedlist mark="bullet">
@@ -10650,9 +11963,9 @@ Virtuoso instance by inspecting the cartridge hook function used by a particular
easily identified from the 'Cartridge name' field of Conductor's 'RDF Cartridges' screen, after
selecting the cartridge of interest. The hook function code can be viewed from the 'Schema Objects'
screen under the 'Database' menu, by locating the function in the 'DB' > 'Procedures' folder.
-Stylesheets used by the cartridges are installed in the WebDAV folder DAV/VAD/rdf_mappers/xslt.
+Stylesheets used by the cartridges are installed in the WebDAV folder DAV/VAD/cartridges/xslt.
This can be explored using Conductor's WebDAV interface. The actual rdf_mappers.sql file installed
-with your system can also be found in the DAV/VAD/rdf_mappers folder.</para>
+with your system can also be found in the DAV/VAD/cartridges folder.</para>
</sect4>
</sect3>
<sect3 id="virtuosospongercatrbundledcusgtomcart">
@@ -10684,7 +11997,7 @@ filter.</para>
<para>GRDDL (Gleaning Resource Descriptions from Dialects of Languages) is mechanism for deriving
RDF data from XML documents and in particular XHTML pages. Document authors may associate transformation
algorithms, typically expressed in XSLT, with their documents to transform embedded metadata into RDF.</para>
- <para>The rdf_mappers VAD installs a number of GRDDL filters for transforming popular microformats
+ <para>The cartridges VAD installs a number of GRDDL filters for transforming popular microformats
(such as RDFa, eRDF or hCalendar) into RDF. The available filters can be viewed, or configured, in
Conductor's 'GRDDL Filters for XHTML' screen. Navigate to the 'RDF Cartridges' screen using the
'RDF' > 'RDF Cartridges' menu items, then SELECT the 'GRDDL Mappings' tab to display the 'GRDDL Filters
@@ -10701,7 +12014,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 sponged by creating new cartridges. While OpenLink is active in adding cartridges for new data sources,
+be fetched 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>
@@ -10739,7 +12052,7 @@ how you might do this:</para>
<programlisting><![CDATA[
if (xd is not null)
{
- -- Sponging successful. Load sponged data in Virtuoso quad store
+ -- Sponging successful. Load network resource data being fetched in the Virtuoso Quad Store:
DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
flag := 1;
}
@@ -10765,13 +12078,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 sponged RDF data into the quad store, cartridges typically
+ <para>Consequently, when loading network resource being fetched as 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 sponged RDF.</para>
+ <para>Here xd is an RDF/XML string holding the fetched 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>
@@ -10849,7 +12162,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 sponge all the
+the form http://musicbrainz.org/([^/]*)/([^.]*) and redirect to the cartridge to Fetch 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
@@ -10860,22 +12173,22 @@ webservice_uri := sprintf ('http://musicbrainz.org/ws/1/%s/%s?type=xml&inc=%U',
content := RDF_HTTP_URL_GET (webservice_uri, '', hdr, 'GET', 'Accept: */*');
xt := xtree_doc (content);
...
-xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/mbz2rdf.xsl', xt);
+xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_cartridges_path_') || 'xslt/mbz2rdf.xsl', xt);
...
xd := serialize_to_UTF8_xml (xd);
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
-HTTP GET.</para>
+Network Resource Fetch.</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.
Function serialize_to_UTF8_xml changes the character set of the in-memory XML document to UTF8.
Finally, RM_RDF_LOAD_RDFXML is a wrapper around RDF_LOAD_RDFXML which parses the content of an
RDF/XML string into a sequence of RDF triples and loads them into the quad store. XSLT stylesheets
-are usually held in the DAV/VAD/rdf_mappers/xslt folder of Virtuoso's WebDAV store.
-registry_get('rdf_mappers_path') returns the RDF Mappers VAD path, 'DAV/VAD/rdf_mappers', from the
+are usually held in the DAV/VAD/cartridges/xslt folder of Virtuoso's WebDAV store.
+registry_get('cartridges_path') returns the Cartridges VAD path, 'DAV/VAD/cartridges', from the
Virtuoso registry.</para>
<para><emphasis>Error Handling with Exit Handlers</emphasis></para>
<para>Virtuoso condition handlers determine the behaviour of a Virtuoso/PL procedure when a
@@ -10920,7 +12233,7 @@ 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/feed2sioc.xsl', xt,
+ registry_get ('_cartridges_path_') || 'xslt/feed2sioc.xsl', xt,
vector ('base', graph_iri, 'isDiscussion', is_disc));
xd := serialize_to_UTF8_xml (xd);
DB.DBA.RM_RDF_LOAD_RDFXML (xd, iri, graph_iri);
@@ -10954,7 +12267,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 sponged RDF data into a graph, you may want to delete any existing graph
+ <para>Before loading network resource fetched 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>
@@ -10980,7 +12293,7 @@ A typical call sequence would be:</para>
<programlisting><![CDATA[
xt := xtree_doc (content);
...
-xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/mbz2rdf.xsl', xt);
+xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_cartridges_path_') || 'xslt/mbz2rdf.xsl', xt);
]]></programlisting>
<para>Because of the wide variation in the data mapped by cartridges, it is not possible to present
a typical XSL stylesheet outline. The Examples section presented later includes detailed extracts from the
@@ -10996,7 +12309,7 @@ processor. The function RDF_MAPPER_XSLT (in xslt varchar, inout xt any, in param
the parameters vector directly to xslt().</para>
<programlisting><![CDATA[
xt := DB.DBA.RDF_MAPPER_XSLT (
-registry_get ('_rdf_mappers_path_') || 'xslt/crunchbase2rdf.xsl', xt,
+registry_get ('_cartridges_path_') || 'xslt/crunchbase2rdf.xsl', xt,
vector ('baseUri', coalesce (dest, graph_iri), 'base', base, 'suffix', suffix)
);
]]></programlisting>
@@ -11014,7 +12327,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 resource being sponged
+template which describes the relationship between the (usually) non-RDF source network resource being fetched
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
@@ -11074,9 +12387,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 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>
+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>
<programlisting><![CDATA[
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:proxyIRI', 'DB.DBA.RDF_SPONGE_PROXY_IRI');
]]></programlisting>
@@ -11096,7 +12409,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 data being sponged is one of text/plain, text/xml or text/html.
+the MIME type of the network resource data being fetched 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[
@@ -11137,7 +12450,7 @@ WHERE RM_HOOK = 'DB.DBA.RDF_LOAD_BIN_DOCUMENT';
<sect5 id="virtuosospongercreatecustcartrrgstit">
<title>Installing Stylesheets</title>
<para>Although you could place your cartridge stylesheet in any folder configured to be accessible
-by Virtuoso, the simplest option is to upload them to the DAV/VAD/rdf_mappers/xslt folder using the
+by Virtuoso, the simplest option is to upload them to the DAV/VAD/cartridges/xslt folder using the
WebDAV browser accessible from the Conductor UI.</para>
<figure id="spong6" float="1">
<title>WebDAV browser</title>
@@ -11403,7 +12716,7 @@ create procedure DB.DBA.RDF_LOAD_MBZ_1 (in graph_iri varchar, in new_origin_uri
uri := sprintf ('http://musicbrainz.org/ws/1/%s/%s?type=xml&inc=%U', kind, id, inc);
cnt := RDF_HTTP_URL_GET (uri, '', hdr, 'GET', 'Accept: */*');
xt := xtree_doc (cnt);
- xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/mbz2rdf.xsl', xt,
+ xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_cartridges_path_') || 'xslt/mbz2rdf.xsl', xt,
vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xd);
DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
@@ -11607,7 +12920,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 sponge feature.</para>
+to allow local repository update via Network Resource Fetch 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
@@ -11695,8 +13008,8 @@ single string or serialized array, generally can be used as mapper specific data
<listitem>-1 - no data is retrieved, stop looking for more data</listitem>
</itemizedlist>
</sect5>
-<sect5 id="virtuosospongerrdfmapperspackage"><title>RDF Mappers package content</title>
-<para>The Virtuoso supply as a rdf_mappers_dav VAD package a cartridge for extracting RDF data
+<sect5 id="virtuosospongerrdfmapperspackage"><title>Cartridges package content</title>
+<para>The Virtuoso supply as a <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.3/virtuoso/rdf_mappers_dav.vad">rdf_mappers_dav.vad</ulink> VAD package a cartridge for extracting RDF data
from certain popular Web resources and file types. It can be installed (if not already) using
VAD_INSTALL function, see the VAD chapter in documentation on how to do that.</para>
<para><emphasis>HTTP-in-RDF</emphasis></para>
@@ -11770,7 +13083,8 @@ needs Virtuoso unzip plugin to be configured on the server.</para>
Aperture framework (http://aperture.sourceforge.net/). This mapper needs Virtuoso with Java hosting
support, Aperture framework and MetaExtractor.class installed on the host system in order to work.</para>
<para>The Aperture framework & MetaExtractor.class must be installed on the system before to
-install the RDF mappers package. If the package is already installed, then to activate this mapper
+install the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.3/virtuoso/rdf_mappers_dav.vad">Cartridges VAD package</ulink>.
+If the package is already installed, then to activate this mapper
you can just re-install the VAD.</para>
<para><emphasis>Setting-up Virtuoso with Java hosting to run Aperture framework</emphasis></para>
<itemizedlist>
@@ -11781,7 +13095,7 @@ javavm in the name, for example virtuoso-javavm-t, rather than virtuoso-t).</lis
<listitem>Unpack the contents of the framework's lib directory into an 'aperture' subdirectory of the
Virtuoso working directory, i.e. of the directory containing the database and virtuoso.ini files.</listitem>
<listitem>Ensure the Virtuoso working directory includes a 'lib' subdirectory containing the file
-MetaExtractor.class. (At the current time MetaExtractor.class in not included in the rdf_mappers VAD.
+MetaExtractor.class. (At the current time MetaExtractor.class in not included in the cartridges VAD.
Please contact OpenLink Technical Support to obtain a copy.)</listitem>
<listitem>In the [Parameters] section of the virtuoso.ini configuration file:
<itemizedlist>
@@ -11804,7 +13118,7 @@ operating system), lib and aperture.</listitem>
</itemizedlist>
</listitem>
<listitem>Start the Virtuoso server with java hosting support</listitem>
-<listitem>Configure the cartridge either by installing the rdf_mappers VAD or, if the VAD is already
+<listitem>Configure the cartridge either by installing the cartridges VAD or, if the VAD is already
installed, by executing procedure DB.DBA.RDF_APERTURE_INIT.</listitem>
<listitem>During the VAD installation process, RDF_APERTURE_INIT() configures the Aperture cartridge. If
you look in the list of available cartridges under the RDF > Sponger tab in Conductor, you should see
@@ -11825,12 +13139,12 @@ SQL> SELECT APERTURE.DBA."MetaExtractor"().getMetaFromFile ('some_pdf_in_server_
]]></programlisting>
</listitem>
</itemizedlist>
-<para>You should now be able to sponge all document types supported by the Aperture framework, (using
+<para>You should now be able to Fetch all Network Resource 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 sponge all the MIME types Aperture is capable of handling, changed the MIME type pattern to
+To Fetch all the Network Resource 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>
@@ -11893,8 +13207,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 sponged data into the quad
-store.</para>
+which is called, for every document retrieved, after RDF_LOAD_RDFXML loads fetched 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
@@ -11916,7 +13230,7 @@ with this example can be found <link linkend="virtuosospongerfreeb">here</link>.
<para><ulink url="http://www.freebase.com/">Freebase</ulink> is an open community database of the world's information which serves facts
and statistics rather than articles. Its designers see this difference in emphasis from article-oriented
databases as beneficial for developers wanting to use Freebase facts in other websites and applications.</para>
- <para>Virtuoso includes a Freebase cartridge in the rdf_mappers VAD. The aim of the example cartridge presented here is to provide a lightweight
+ <para>Virtuoso includes a Freebase cartridge in the cartridges VAD. The aim of the example cartridge presented here is to provide a lightweight
meta-cartridge that is used to conditionally add triples to graphs generated by the Freebase cartridge,
if Freebase is describing a U.S. senator.</para>
<para><emphasis>New York Times Campaign Finance (NYTCF) API</emphasis></para>
@@ -11967,19 +13281,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 sponged from this page, select 'Linked Data Sources' from the browser's
+ <para>To view RDF data fetched 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 sponges
+ <para>Clicking on the 'Barack Obama' link under the 'Person' category displayed by ODE fetches
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 sponged information
+entity instance (identified by the above URI with the #this suffix) which holds network resource information being fetched
about the original entity.</para>
<para><emphasis>Using the Command Line</emphasis></para>
- <para>As an alternative to ODE, you can sponge from the command line with the command:</para>
+ <para>As an alternative to ODE, you can perform Network Resource Fetch 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>
@@ -12003,7 +13317,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 sponge URIs which match the pattern
+see that the Freebase cartridge is configured by default to perform Network Resource Fetch of 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>
@@ -12068,7 +13382,7 @@ create procedure DB.DBA.RDF_NYTCF_LOOKUP(
base_uri := sprintf ('http://rdf.freebase.com/ns/%U.%U', lang, k);
}
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/nytcf2rdf.xsl', xd,
+ xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_cartridges_path_') || 'xslt/nytcf2rdf.xsl', xd,
vector ('baseUri', base_uri));
xd := serialize_to_UTF8_xml (xt);
DB.DBA.RDF_LOAD_RDFXML (xd, '', graph_iri);
@@ -12242,8 +13556,8 @@ done:
<para><emphasis>NYTCF Meta-Cartridge Stylesheet</emphasis></para>
<para>The XSLT stylesheet, nyctf2rdf.xsl, used by the meta-cartridge to transform the base
Campaign Finance web service output to RDF is shown below. RDF_NYCTF_LOOKUP() assumes the stylesheet
-is located alongside the other stylesheets provided by the rdf_mappers VAD in the Virtuoso WebDAV
-folder DAV/VAD/rdf_mappers/xslt. You should create nyctf2rdf.xsl here from the following listing.
+is located alongside the other stylesheets provided by the cartridges VAD in the Virtuoso WebDAV
+folder DAV/VAD/cartridges/xslt. You should create nyctf2rdf.xsl here from the following listing.
The WebDAV Browser interface in Conductor provides the easiest means to upload the stylesheet.</para>
<programlisting><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
@@ -12361,7 +13675,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 sponge </listitem>
+ <listitem><emphasis>url</emphasis>: the URI to perform Network Resource Fetch</listitem>
<listitem><emphasis>options</emphasis>: an array usually typical sponger pragmas, for ex:
<programlisting><![CDATA[
vector ('get:soft', 'soft', 'refresh_free_text', 1);
@@ -12458,7 +13772,7 @@ uri := sprintf ('http://musicbrainz.org/ws/1/%s/%s?type=xml&inc=%U',
kind, id, inc);
cnt := RDF_HTTP_URL_GET (uri, '', hdr, 'GET', 'Accept: */*');
xt := xtree_doc (cnt);
-xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/mbz2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
+xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_cartridges_path_') || 'xslt/mbz2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
]]></programlisting>
<para><emphasis><link linkend="fn_http_request_header">http_request_header</link></emphasis></para>
<programlisting><![CDATA[
@@ -12525,7 +13839,7 @@ profile := cast (xpath_eval ('/html/head/@profile', xt) as varchar);
tmp := http_get (url);
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (
- registry_get ('_rdf_mappers_path_') || 'xslt/atom2rdf.xsl',
+ registry_get ('_cartridges_path_') || 'xslt/atom2rdf.xsl',
xd, vector ('baseUri', coalesce (dest, graph_iri)));
]]></programlisting>
</sect4>
@@ -12534,7 +13848,7 @@ xt := DB.DBA.RDF_MAPPER_XSLT (
<para><emphasis><link linkend="fn_serialize_to_UTF8_xml">serialize_to_UTF8_xml</link></emphasis></para>
<programlisting><![CDATA[
xt := DB.DBA.RDF_MAPPER_XSLT (
- registry_get ('_rdf_mappers_path_') || 'xslt/crunchbase2rdf.xsl',
+ registry_get ('_cartridges_path_') || 'xslt/crunchbase2rdf.xsl',
xt, vector ('baseUri', coalesce (dest, graph_iri), 'base', base,
'suffix', suffix));
xd := serialize_to_UTF8_xml (xt);
@@ -12548,7 +13862,7 @@ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
content := RDF_HTTP_URL_GET (uri, '', hdr, 'GET', 'Accept: */*');
xt := xtree_doc (content);
xd := DB.DBA.RDF_MAPPER_XSLT (
- registry_get ('_rdf_mappers_path_') || 'xslt/mbz2rdf.xsl',
+ registry_get ('_cartridges_path_') || 'xslt/mbz2rdf.xsl',
xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xd);
DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
@@ -12705,7 +14019,7 @@ create procedure DB.DBA.RDF_LOAD_MQL (in graph_iri varchar, in new_origin_uri va
xt := get_keyword ('ROOT', tree);
xt := DB.DBA.MQL_TREE_TO_XML (tree);
--dbg_obj_print (xt);
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/mql2rdf.xsl', xt,
+ xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_cartridges_path_') || 'xslt/mql2rdf.xsl', xt,
vector ('baseUri', coalesce (dest, graph_iri), 'wpUri', sa));
sa := '';
xd := serialize_to_UTF8_xml (xt);
@@ -12720,12 +14034,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.47 2011/10/26 00:21:16 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2008 OpenLink Software
+ - 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
@@ -13063,18 +14377,18 @@ Note this should be run periodically as the data grows to re-rank the IRIs.
s_rank()
]]></programlisting>
</listitem>
- <listitem>Sponge some data to load some RDF triples in the quad store. This can easily be done using
+ <listitem>Perform Network Resource Fetch of 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>Sponge data</title>
+ <title>Network Resource Fetch data</title>
<graphic fileref="ui/fb3.png"/>
</figure>
<figure id="fctinst4" float="1">
- <title>Sponge data</title>
+ <title>Network Resource Fetch data</title>
<graphic fileref="ui/fb4.png"/>
</figure>
</listitem>
@@ -13084,7 +14398,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 data sponged.
+ <listitem>Results of the following form should be returned for the network resource data being fetched.
<figure id="fctinst6" float="1">
<title>Faceted Browser Search Results</title>
<graphic fileref="ui/fb6.png"/>
@@ -13332,7 +14646,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 data sponged:
+ <listitem>Results of the following form should be returned for the network resource data being fetched.
<figure id="VirtFacetUsage2" float="1">
<title>Usage Statistics</title>
<graphic fileref="ui/fb25.png"/>
@@ -15309,11 +16623,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 RDF View</title>
+ <title>Example - URL Rewriting For the Northwind Linked Data 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 RDF View of SQL data is an RDF named graph (RDF data set) comprised of RDF Linked Data
+<para>An Linked Data 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
@@ -15956,7 +17270,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>
@@ -16129,8 +17443,7 @@ WHERE
T_MIN (0),
T_MAX (1)
)
- FILTER
- ( ?org = ?k ) .
+ FILTER ( ?org = ?k ) .
?syn foaf:knows ?f .
}
]]></programlisting>
@@ -16492,7 +17805,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 RDF views.
+This functionality applies to physically stored quads and not to virtual triples generated from relational data with Linked Data 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
@@ -16530,8 +17843,7 @@ 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.
@@ -16549,38 +17861,426 @@ 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>
-</sect2>
-<sect2 id="rdfsameas"><title>OWL sameAs Support</title>
-<para>
-Virtuoso has limited support for the OWL sameAs predicate.
-</para>
-<para>
-If sameAs traversal is enabled and a triple pattern with a given
-subject or object is being matched, all the synonyms of the S and O
-will be tried and results generated for all the tried bindings of S
-and O. The set of synonyms is generated at run time by following all
-owl:sameAs triples where the IRI in question is either the subject or
-the object. These are followed recursively from object to subject and
-subject to object until the complete transitive closure is generated.
-All sameAs triples from all the graphs applicable to instantiating
-the triple pattern at hand are considered.
-</para>
-<para>
-Thus for example:
-</para>
-<para>The inital SPARQL query:</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
-prefix foaf: <http://xmlns.com/foaf/0.1/>
-prefix owl: <http://www.w3.org/2002/07/owl#>
-prefix sioc: <http://rdfs.org/sioc/ns#>
-SELECT *
-from <http://myopenlink.net/dataspace>
-where
- {
- ?person a foaf:Person FILTER REGEX(?person ,"http://myopenlink.net/dataspace/person/kidehen#this").
- ?person foaf:name ?name .
- ?person owl:sameAs ?sameas .
+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>
+Virtuoso has limited support for the OWL sameAs predicate.
+</para>
+<para>
+If sameAs traversal is enabled and a triple pattern with a given
+subject or object is being matched, all the synonyms of the S and O
+will be tried and results generated for all the tried bindings of S
+and O. The set of synonyms is generated at run time by following all
+owl:sameAs triples where the IRI in question is either the subject or
+the object. These are followed recursively from object to subject and
+subject to object until the complete transitive closure is generated.
+All sameAs triples from all the graphs applicable to instantiating
+the triple pattern at hand are considered.
+</para>
+<para>
+Thus for example:
+</para>
+<para>The inital SPARQL query:</para>
+<programlisting><![CDATA[
+SQL>SPARQL
+prefix foaf: <http://xmlns.com/foaf/0.1/>
+prefix owl: <http://www.w3.org/2002/07/owl#>
+prefix sioc: <http://rdfs.org/sioc/ns#>
+SELECT *
+from <http://myopenlink.net/dataspace>
+where
+ {
+ ?person a foaf:Person FILTER REGEX(?person ,"http://myopenlink.net/dataspace/person/kidehen#this").
+ ?person foaf:name ?name .
+ ?person owl:sameAs ?sameas .
}
limit 10;
person name sameas
@@ -17556,1796 +19256,796 @@ WHERE
</sect2>
</sect1>
-<sect1 id="rdfsparqlgeospat"><title>RDF and Geometry</title>
-<para>A geometry may occur as an object of an RDF quad. The SQL MM functions can then
- be used for geospatial queries.
-</para>
+
+<sect1 id="rdfperformancetuning"><title>RDF Performance Tuning</title>
+<para>For RDF query performance, we have the following possible questions:</para>
+<itemizedlist mark="bullet" spacing="compact">
+<listitem>Is the Virtuoso process properly configured to handle big data sets?</listitem>
+<listitem>Is the graph always specified?</listitem>
+<listitem>Are public web service endpoints protected against bad queries?</listitem>
+<listitem>Are there patterns where only a predicate is given?</listitem>
+<listitem>Is there a bad query plan because of cost model error?</listitem>
+</itemizedlist>
+<sect2 id="rdfperfgeneral"><title>General</title>
+ <para>When running with large data sets, one should configure the Virtuoso process to use between 2/3
+ to 3/5 of system RAM and to stripe storage on all available disks.
+ See <link linkend="VIRTINI">NumberOfBuffers</link>,
+ <link linkend="VIRTINI">MaxDirtyBuffers</link>, and
+ <link linkend="VIRTINI">Striping</link> INI file parameters.
+ </para>
+<programlisting><![CDATA[
+; default installation
+NumberOfBuffers = 2000
+MaxDirtyBuffers = 1200
+]]></programlisting>
+ <para>Typical sizes for the <emphasis>NumberOfBuffers</emphasis> and
+ <emphasis>MaxDirtyBuffers</emphasis> (3/4 of NumberOfBuffers) parameters in the Virtuoso
+ configuration file (virtuoso.ini) for various memory sizes are as follows, with each buffer
+ consisting of 8K bytes:
+ </para>
+ <table><title>recommended NumberOfBUffers and MaxDirtyBuffers</title>
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>System RAM</entry>
+ <entry>NumberOfBuffers</entry>
+ <entry>MaxDirtyBuffers</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>2 GB</entry><entry>170000</entry><entry>130000</entry>
+ </row>
+ <row>
+ <entry>4 GB</entry><entry>340000</entry><entry>250000</entry>
+ </row>
+ <row>
+ <entry>8 GB</entry><entry>680000</entry><entry>500000</entry>
+ </row>
+ <row>
+ <entry>16 GB</entry><entry>1360000</entry><entry>1000000</entry>
+ </row>
+ <row>
+ <entry>32 GB</entry><entry>2720000</entry><entry>2000000</entry>
+ </row>
+ <row>
+ <entry>48 GB</entry><entry>4000000</entry><entry>3000000</entry>
+ </row>
+ <row>
+ <entry>64 GB</entry><entry>5450000</entry><entry>4000000</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </sect2>
+ <sect2 id="rdfperfrdfscheme"><title>RDF Index Scheme</title>
<para>
-For geometry functions, see the <link linkend="sqlrefgeospatial">SQL Geometry support section</link>.
-</para>
-<para>A geometry may occur as an object value in an RDF quad. In such a
-case, the bare geometry object is not used but instead a special RDF
-typed literal is made with the type virtrdf:Geometry. Such a literal
-is automatically indexed in an R tree index containing all distinct
-geometries occurring in any quad of any graph under any predicate.
-Normally, WGS84, SRID 4326 is the SRID of any such geometry.
+Starting with version 6.00.3126 the default RDF index scheme consists
+of 2 full indices over RDF quads plus 3 partial indices. This index
+scheme is generally adapted to all kinds of workloads, regardless of
+whether queries generally specify a graph.
</para>
-<para>In this section, the geo namespace prefix is used to mean <http://www.w3.org/2003/01/geo/wgs84_pos#>.
+
+<para>
+Alternate indexing schemes are possible but will not be generally needed.
+For upgrading old databases with a different index scheme see the corresponding documentation.
</para>
-<para>The preferred way of adding geometries to RDF graphs is with the ttlp and related functions
-which parse a text string in the Turtle syntax and insert the result in a graph.
-</para>
-<para>For example:</para>
-<programlisting><![CDATA[
-ttlp ('@prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
-<point> geo:geometry "point(1.2 22.4"^^virtrdf:Geometry .',
-'xxx', 'graph');
-]]></programlisting>
-<para>A typed literal whose text is a WKT representation of a geometry and whose type is virtrdf:geometry
-creates a geometry object and adds it to the R tree index of all RDF geometries.
-</para>
-<para>
-Geometries can be queried with geometry predicates, st_intersects, st_contains and st_within, as follows.
-As usual, the bif: namespace is used since these are SQL built-in functions.
-</para>
-<programlisting><![CDATA[
-SQL>
-SPARQL
-SELECT ?c COUNT (*)
-WHERE
- {
- ?m geo:geometry ?geo .
- ?m a ?c .
- FILTER (bif:st_intersects (?geo, bif:st_point (0, 52), 100))
- }
-GROUP BY ?c
-ORDER BY DESC 2;
-
-c callret-1
-VARCHAR VARCHAR
-____________________________________________________________
-http://linkedgeodata.org/vocabulary#node 2317684
-http://linkedgeodata.org/vocabulary#way 85315
-http://linkedgeodata.org/vocabulary#building 14257
-http://dbpedia.org/class/yago/Landmark108624891 9093
-http://linkedgeodata.org/vocabulary#wood 7155
-http://linkedgeodata.org/vocabulary#gate 7079
-http://www.w3.org/2002/07/owl#Thing 6788
-http://linkedgeodata.org/vocabulary#post_box 6144
-http://linkedgeodata.org/vocabulary#pub 5697
-http://dbpedia.org/ontology/Place 5670
-http://linkedgeodata.org/vocabulary#hedge 5391
-...
-]]></programlisting>
+
<para>
-This would return the classes of things within 100 km of 0, 52, which is near London.
+The index scheme consists of the following indices:
</para>
-<programlisting><![CDATA[
-SQL>
-SPARQL
-SELECT ?m (bif:st_distance (?geo, bif:st_point (0, 52)))
-WHERE
- {
- ?m geo:geometry ?geo .
- ?m a <http://dbpedia.org/ontology/City> .
- FILTER (bif:st_intersects (?geo, bif:st_point (0, 52), 30))
- }
-ORDER BY DESC 2
-LIMIT 20;
-m callret-1
-VARCHAR VARCHAR
-_______________________________________________________________________________
+<itemizedlist mark="bullet">
+ <listitem><emphasis>PSOG</emphasis> - primary key</listitem>
+ <listitem><emphasis>POGS</emphasis> - bitmap index for lookups on object value.</listitem>
+ <listitem><emphasis>SP</emphasis> - partial index for cases where only S is specified.</listitem>
+ <listitem><emphasis>OP</emphasis> - partial index for cases where only O is specified.</listitem>
+ <listitem><emphasis>GS</emphasis> - partial index for cases where only G is specified.</listitem>
+</itemizedlist>
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 39.13180985471543
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 39.13180985471543
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 39.13180985471543
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 39.13180985471543
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 37.36907252285992
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 34.49432513061792
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 33.7676326404143
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 33.24238654570499
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 32.60139660515003
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 32.60139660515003
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 32.17414911350438
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 31.45681319171456
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 31.17750625349044
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 31.115377038
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 31.115377038
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 30.56388658524301
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 29.89662974046085
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 29.85090625132639
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 29.82605254366244
-http://dbpedia.org/resource/Kingston%2C_Cambridgeshire 29.60102064794003
-
-20 Rows. -- 13600 msec.
-
-]]></programlisting>
-<para>This would be the cities within 20 km of 0, 52, ordered by increasing distance from this point.
-</para>
-<para>When SPARQL is called from SQL, the geometries can be bound to SQL
-variables as anything else returned from SPARQL. The <emphasis>st_</emphasis> functions
-can then be used for retrieving properties of these objects.
-</para>
- <tip><title>See Also</title>
- <para><link linkend="fn_st_point"><function>st_point</function></link></para>
- <para><link linkend="fn_st_x"><function>st_x</function></link></para>
- <para><link linkend="fn_st_y"><function>st_y</function></link></para>
- <para><link linkend="fn_st_distance"><function>st_distance</function></link></para>
- <para><link linkend="fn_st_srid"><function>st_srid</function></link></para>
- <para><link linkend="fn_st_setsrid"><function>st_setsrid</function></link></para>
- <para><link linkend="fn_st_astext"><function>st_astext</function></link></para>
- <para><link linkend="fn_st_geomfromtext"><function>st_geomfromtext</function></link></para>
- <para><link linkend="fn_st_contains"><function>st_contains</function></link></para>
- <para><link linkend="fn_st_intersects"><function>st_intersects</function></link></para>
- <para><link linkend="fn_st_within"><function>st_within</function></link></para>
- <para><link linkend="fn_isgeometry"><function>isgeometry</function></link></para>
- <para><link linkend="fn_geo_insert"><function>geo_insert</function></link></para>
- <para><link linkend="fn_geo_delete"><function>geo_delete</function></link></para>
- </tip>
- <sect2 id="rdfsparqlgeospatprog"><title>Programmatic Manipulation of Geometries in RDF</title>
-<para>The <link linkend="fn_ttlp"><function>ttlp</function></link> function is the preferred
-way of inserting geometries. The more are inserted at one time, the more efficient the operation is.
-This loader function will also deal with cluster message optimization.
-</para>
-<para>For deleting quads with geometries, normal
-<link linkend="rdfsparqlimplementationextent">SPARUL operations</link> apply.
-</para>
-<para>A geometry occurring in an RDF quad object is a member of the RDF box data type. This data type
-stands for a typed RDF literal. The type of all geometries is 256. This is mapped to a URI in
-the RDF_DATATYPE system table.
-</para>
-<para>A geometry does not occur directly in the object position of a quad. It is referenced by an id
-that is stored in the RDF typed literal box and references RO_ID of the RDF_OBJ system table.
-To translate a geometry into a RDF box that can be stored, do as in the example below:
+<para>
+This index scheme is created by the following statements:
</para>
+
<programlisting><![CDATA[
-INSERT INTO RDF_QUAD (g, s, p, o)
-VALUES (
- "g",
- "s",
- iri_to_id ('http://www.w3.org/2003/01/geo/wgs84_pos#geometry'),
- DB.DBA.rdf_geo_add (rdf_box (st_point (lng, lat), 256, 257, 0, 1)));
+create table DB.DBA.RDF_QUAD (
+ G IRI_ID_8,
+ S IRI_ID_8,
+ P IRI_ID_8,
+ O any,
+ primary key (P, S, O, G)
+ )
+alter index RDF_QUAD on DB.DBA.RDF_QUAD partition (S int (0hexffff00));
+
+create distinct no primary key ref bitmap index RDF_QUAD_SP on RDF_QUAD (S, P) partition (S int (0hexffff00));
+create bitmap index RDF_QUAD_POGS on RDF_QUAD (P, O, G, S) partition (O varchar (-1, 0hexffff));
+create distinct no primary key ref bitmap index RDF_QUAD_GS on RDF_QUAD (G, S) partition (S int (0hexffff00));
+create distinct no primary key ref index RDF_QUAD_OP on RDF_QUAD (O, P) partition (O varchar (-1, 0hexffff));
+;
]]></programlisting>
-<para>The DB.DBA.RDF_GEO_ADD function looks if an identical geometry already exists and if so assigns the
-existing id to it. If the geometry is new, it gets a new ID and is stored in the RDF literals
-table RDF_OBJ. At this time it is also automatically inserted into the RDF geometry index.
-</para>
-<para>In a cluster situation one should use the dpipe mechanism for inserting into RDF quad so as to
-get large numbers of inserts into a single message. This is essential for performance.
-</para>
- </sect2>
- <sect2 id="rdfsparqlgeospatcrg"><title>Creating Geometries From RDF Data</title>
-<para>Many data sets use the geo:lat and geo:long properties for describing a position.
-Virtuoso comes with a function for converting these properties into geometries. This operation
-reads through all graphs and for each subject with at least one geo:lat and geo:long, a point
-geometry is made for each distinct lat/long pair where lat and long are in the same graph. It
-should not happen in practice that a single subject has multiple lats or long within one graph.
-If this still happens, a geometry is made for each combination.
-The geometry is added to the subject with the lat and long as the value of the geo:geometry property.
-This is added to the same graph where the lat and long were.
+
+
+<para>
+The idea is to favor queries where the predicate is specified in
+triple patterns. The entire quad can be efficiently accessed when P
+and either or both S and O are known. This has the advantage of
+clustering data by the predicate which improves working set: A page
+read from disk will only have entries pertaining to the same
+predicate, chances of accessing other entries of the page are thus
+higher than if the page held values for arbitrary predicates. For
+less frequent cases where only S is known, as in describe, the
+distinct P's of the S are found in the SP index. These SP pairs are
+then used for accessing the PSOG index to get the O and G. For cases
+where only the G is known, as in dropping a graph, the distinct S's of
+the G are found in the GS index. The P's of the S are then found in
+the SP index. After this the whole quad is found in the PSOG index.
</para>
-<para>The SQL procedure DB.DBA.RDF_GEO_FILL () performs this operation. This is performed in parallel on
-multiple threads and is optimized for cluster execution. This is done without transaction logging
-and is not transactional. To make the result persistent, the operator should do an explicit checkpoint.
-This is done by executing:</para>
-<programlisting><![CDATA[
-SQL>cl_exec ('checkpoint');
-]]></programlisting>
-<para>on any process of a cluster or single server.
-Otherwise the result may be lost if the server terminates abnormally before an automatic checkpoint is made.
+
+<para>
+The SP, OP and GS indices do not store duplicates. If a S has many
+values of the P, there is only one entry. Extries are not deleted
+from SP, OP or GS. This does not lead to erroneous results since a
+full index, that is either POSG or PSOG is always consulted in order
+to know if a quad actually exists. For cases of updating data, most
+often a graph is entirely dropped and a substantially similar graph is
+inserted in its place. The SP, OP and GS indices get to stay relatively unaffected.
</para>
-<para>The DB.DBA.RDF_GEO_FILL procedure may in principle be called several times but it will read
-every lat and long in the database. This is inefficient if there are large numbers of geometries.
+
+<para>
+Still over time specially if there are frequent updates and values do not repeat between
+consecutive states the SP, OP and GS indices will get polluted which may affect performance.
+Dropping and recreating the index will then remedy the situation.
</para>
-<para>Application logic must generally be used for constructing geometries and adding these to RDF subjects.
-It is easiest for the application to construct a text representation of the geometries in TTL and to
-use the <link linkend="fn_ttlp"><function>ttlp</function></link> function for loading this.
+
+<para>
+For cases where this is not practical the index scheme should only have full indices, i.e.
+each key holds all columns of the primary key of the quad. This will be the case if the
+distinct no primary key ref options are not specified in the create index statement. In
+such cases all indices remain in strict sync across deletes.
</para>
- </sect2>
- <sect2 id="rdfsparqlgeospatusg"><title>Using Geometries With Existing Databases</title>
+
<para>
-The geometry feature is compatible with any Virtuoso 6 databases.
-Once geometries are used, the database should not be opened with a
-server older than the one used for first inserting geometries, older
-servers will consider the storage format a physical corruption.
+Many RDF workloads have bulk load and read intensive access patterns with few deletes.
+The default index scheme is optimized for these. With these situations this scheme offers
+significant space savings resulting in better working set. Typically this layout takes
+60-70% of the space of a layout with 4 full indices.
</para>
- </sect2>
- <sect2 id="rdfsparqlgeospatexmp"><title>GEO Spatial Examples</title>
- <sect3 id="rdfsparqlgeospatexmp1"><title>Example 1</title>
+ </sect2>
+ <sect2 id="rdfperfindexes"><title>Index Scheme Selection</title>
+ <para>The indexes in place on the RDF_QUAD table can greatly affect the performance of
+ SPARQL queries, as can be determined by running the STATISTICS command on the table as follows:
+ </para>
<programlisting><![CDATA[
-## Get All Stuff For Given Coordinates
-SQL>SPARQL
-SELECT ?c COUNT (*)
-WHERE
- {
- ?m geo:geometry ?geo .
- ?m a ?c .
- FILTER (bif:st_intersects (?geo, bif:st_point (0, 52), 100))
- }
-GROUP BY ?c
-ORDER BY desc 2;
-
-c callret-1
-VARCHAR VARCHAR
+SQL> STATISTICS DB.DBA.RDF_QUAD;
+Showing SQLStatistics of table(s) 'DB.DBA.RDF_QUAD'
+TABLE_QUALIFIER TABLE_OWNER TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY PAGES FILTER_CONDITION
+VARCHAR VARCHAR VARCHAR SMALLINT VARCHAR VARCHAR SMALLINT SMALLINT VARCHAR VARCHAR INTEGER INTEGER VARCHAR
_______________________________________________________________________________
-http://linkedgeodata.org/vocabulary#node 2317684
-http://linkedgeodata.org/vocabulary#way 85315
-http://linkedgeodata.org/vocabulary#building 14257
-http://dbpedia.org/class/yago/Landmark108624891 9093
-http://linkedgeodata.org/vocabulary#wood 7155
-....
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp2"><title>Example 2</title>
-<programlisting><![CDATA[
-## Get City Stuff Around Catholic Churches In Paris
-SQL>
-SPARQL
-SELECT ?m (bif:st_distance (?geo, bif:st_point (0, 52)))
-WHERE
- {
- ?m geo:geometry ?geo .
- ?m a <http://dbpedia.org/ontology/City> .
- FILTER (bif:st_intersects (?geo, bif:st_point (0, 52), 30))
- }
-ORDER BY DESC 2
-LIMIT 20;
-m callret-1
-VARCHAR VARCHAR
-_______________________________________________________________________________
+DB DBA RDF_QUAD NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL
+DB DBA RDF_QUAD 0 DB RDF_QUAD 3 1 P NULL NULL NULL NULL
+DB DBA RDF_QUAD 0 DB RDF_QUAD 3 2 S NULL NULL NULL NULL
+DB DBA RDF_QUAD 0 DB RDF_QUAD 3 3 O NULL NULL NULL NULL
+DB DBA RDF_QUAD 0 DB RDF_QUAD 3 4 G NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_GS 3 1 G NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_GS 3 2 S NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_OP 3 1 O NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_OP 3 2 P NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_POGS 3 1 P NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_POGS 3 2 O NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_POGS 3 3 G NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_POGS 3 4 S NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_SP 3 1 S NULL NULL NULL NULL
+DB DBA RDF_QUAD 1 DB RDF_QUAD_SP 3 2 P NULL NULL NULL NULL
-http://dbpedia.org/resource/Stansted_Mountfitchet 39.13180985471543
-http://dbpedia.org/resource/Stansted_Mountfitchet 39.13180985471543
-http://dbpedia.org/resource/Stansted_Mountfitchet 39.13180985471543
-http://dbpedia.org/resource/Stansted_Mountfitchet 39.13180985471543
-http://dbpedia.org/resource/Stansted_Mountfitchet 37.36907252285992
-http://dbpedia.org/resource/Stansted_Mountfitchet 34.49432513061792
-http://dbpedia.org/resource/Stansted_Mountfitchet 33.7676326404143
-http://dbpedia.org/resource/Stansted_Mountfitchet 33.24238654570499
-http://dbpedia.org/resource/Stansted_Mountfitchet 32.60139660515003
-http://dbpedia.org/resource/Stansted_Mountfitchet 32.60139660515003
-http://dbpedia.org/resource/Stansted_Mountfitchet 31.45681319171456
-http://dbpedia.org/resource/Stansted_Mountfitchet 31.115377038
-http://dbpedia.org/resource/Stansted_Mountfitchet 31.115377038
-http://dbpedia.org/resource/Stansted_Mountfitchet 30.56388658524301
-http://dbpedia.org/resource/Stansted_Mountfitchet 29.89662974046085
-http://dbpedia.org/resource/Stansted_Mountfitchet 29.85090625132639
-http://dbpedia.org/resource/Stansted_Mountfitchet 29.82605254366244
-http://dbpedia.org/resource/Stansted_Mountfitchet 29.60102064794003
-http://dbpedia.org/resource/Stansted_Mountfitchet 29.44147385851453
-http://dbpedia.org/resource/Stansted_Mountfitchet 29.421242437379
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp3"><title>Example 3</title>
+15 Rows. -- 24 msec.
+SQL>
+]]></programlisting>
+<para>With only one index (OGPS) created by default, if the graph is always given, as with one or more
+ <emphasis>FROM</emphasis> or <emphasis>FROM NAMED</emphasis> clauses, and there are no patterns where
+ only graph and predicate are given, then the default indices should be sufficient. If predicate and
+ graph are given but subject is not, then it is sometimes useful to add:</para>
<programlisting><![CDATA[
-## Get City Stuff Around Catholic Churches In Paris Extended
-SQL>
-SPARQL
-SELECT ?m (bif:st_distance (?geo, bif:st_point (0, 52)))
-WHERE
- {
- ?m geo:geometry ?geo .
- ?m a <http://dbpedia.org/ontology/City> .
- FILTER (bif:st_intersects (?geo, bif:st_point (0, 52), 100))
- }
-ORDER BY DESC 2
-LIMIT 20;
-m callret-1
-VARCHAR VARCHAR
-_______________________________________________________________________________
-
-http://dbpedia.org/resource/Weston-on-Trent 138.7082197019335
-http://dbpedia.org/resource/Weston-on-Trent 137.7213767969613
-http://dbpedia.org/resource/Weston-on-Trent 136.4597167847218
-http://dbpedia.org/resource/Weston-on-Trent 134.1807668663677
-http://dbpedia.org/resource/Weston-on-Trent 133.104337839536
-http://dbpedia.org/resource/Weston-on-Trent 133.104337839536
-http://dbpedia.org/resource/Nonington 132.7368236183588
-http://dbpedia.org/resource/Nonington 132.1339163200362
-http://dbpedia.org/resource/Nonington 132.1339163200362
-http://dbpedia.org/resource/Nonington 130.5478483560461
-http://dbpedia.org/resource/Nonington 130.1620410981843
-http://dbpedia.org/resource/Nonington 129.8549842943355
-http://dbpedia.org/resource/Nonington 129.6459280567849
-http://dbpedia.org/resource/Nonington 129.4504858595742
-http://dbpedia.org/resource/Nonington 129.2790713235814
-http://dbpedia.org/resource/Nonington 128.9081040147881
-http://dbpedia.org/resource/Nonington 128.8845164618929
-http://dbpedia.org/resource/Nonington 128.6676189617872
-http://dbpedia.org/resource/Nonington 128.2565253458452
-http://dbpedia.org/resource/Nonington 128.2551696344652
-
-20 Rows. -- 120 msec.
+CREATE BITMAP INDEX RDF_QUAD_PGOS
+ ON DB.DBA.RDF_QUAD (G, P, O, S)
+ PARTITION (O VARCHAR (-1, 0hexffff));
]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp4"><title>Example 4</title>
-<programlisting><![CDATA[
-## Text Or Geo
-SQL>
-SPARQL
-SELECT ?c COUNT (*)
-WHERE
- {
- ?m geo:geometry ?geo .
- ?m a ?c .
- FILTER (bif:st_intersects (?geo, bif:st_point (0, 52), 100) && REGEX (str (?c), "London") )
- }
-GROUP BY ?c
-ORDER BY DESC 2
-LIMIT 10;
-c callret-1
-____________________________________________________________________________
-
-http://dbpedia.org/class/yago/DistrictsOfLondon 861
-http://dbpedia.org/class/yago/GradeIListedBuildingsInLondon 199
-http://dbpedia.org/class/yago/MuseumsInLondon 107
-http://dbpedia.org/class/yago/ArtMuseumsAndGalleriesInLondon 92
-http://dbpedia.org/class/yago/GradeIIListedBuildingsInLondon 89
-http://dbpedia.org/class/yago/SportsVenuesInLondon 80
-http://dbpedia.org/class/yago/RoyalBuildingsInLondon 72
-http://dbpedia.org/class/yago/LondonOvergroundStations 69
-http://dbpedia.org/class/yago/NationalGovernmentBuildingsInLondon 69
-http://dbpedia.org/class/yago/SkyscrapersInLondon 60
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp5"><title>Example 5</title>
-<programlisting><![CDATA[
-## Example "Places Of Worship, Within 5 km Of Paris":
+<note><para>Note: If the server version is pre-5.0.7, leave out the partitioning clause.</para></note>
-## Describes places of worship, within 5 km of Paris,
-## that have cafes in close proximity(0.2 km).
-## The query requires V6 or higher.
-SQL>
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-DESCRIBE ?cafe ?church
-WHERE
- {
- ?church a lgv:place_of_worship .
- ?church geo:geometry ?churchgeo .
- ?church lgv:name ?churchname .
- ?cafe a lgv:cafe .
- ?cafe lgv:name ?cafename .
- ?cafe geo:geometry ?cafegeo .
- ?cafe geo:lat ?lat .
- ?cafe geo:long ?long .
- FILTER ( bif:st_intersects ( ?churchgeo, bif:st_point ( 2.3498, 48.853 ), 5 ) &&
- bif:st_intersects ( ?cafegeo, ?churchgeo, 0.2 ) )
- }
-LIMIT 10;
+<para>Making the PGOS index can help in some cases even if it is not readily apparent from the queries
+ that one is needed. This is so, for example, if the predicate by itself is selective, i.e. there is
+ a predicate that occurs in only a few triples.</para>
+<para>If the graph itself is not given in the queries, then the default index scheme will be unworkable.
+For this, the appropriate scheme is:</para>
- at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- at prefix ns1: <http://linkedgeodata.org/triplify/node/243360870#> .
- at prefix ns2: <http://linkedgeodata.org/vocabulary#> .
-ns1:id rdf:type ns2:place_of_worship ,
- ns2:node .
- at prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
-ns1:id geo:lat 48.8794 ;
- geo:long 2.3748 ;
- ns2:created_by "Potlatch 0.6c" ;
- ns2:name "Saint-Georges de la Villette" ;
- ns2:religion "christian" ,
- ns2:christian .
- at prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#> .
-ns1:id geo:geometry "POINT(2.3748 48.8794)"^^virtrdf:Geometry .
- at prefix ns5: <http://linkedgeodata.org/triplify/node/266632049#> .
-ns5:id rdf:type ns2:node ,
- ns2:cafe ;
- geo:lat 48.8518 ;
- geo:long 2.325 ;
- ns2:created_by "Potlatch 0.9a" ;
- ns2:name "Le Babylone" ;
- geo:geometry "POINT(2.325 48.8518)"^^virtrdf:Geometry .
-....
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp6"><title>Example 6</title>
<programlisting><![CDATA[
-## Count Geo
-SQL>
-SPARQL
-SELECT ?c COUNT (*)
-WHERE
- {
- ?s geo:geometry ?geo .
- FILTER (bif:st_intersects (?geo, bif:st_point (2.3498, 48.853), 5)) .
- ?s a ?c
- }
-GROUP BY ?c
-ORDER BY desc 2
-LIMIT 10;
+CREATE TABLE RDF_QUAD
+ (
+ G IRI_ID_8,
+ S IRI_ID_8,
+ P IRI_ID_8,
+ O ANY,
+ PRIMARY KEY (S, P, O, G)
+ )
+ALTER INDEX RDF_QUAD
+ ON RDF_QUAD
+ PARTITION (S INT (0hexffff00));
-c callret-1
-VARCHAR VARCHAR
-_______________________________________________________________________________
+CREATE BITMAP INDEX RDF_QUAD_OPGS
+ ON DB.DBA.RDF_QUAD (O, P, G, S)
+ PARTITION (O VARCHAR (-1, 0hexffff));
-http://linkedgeodata.org/vocabulary#node 37792
-http://dbpedia.org/class/yago/Landmark108624891 4003
-http://linkedgeodata.org/vocabulary#way 1688
-http://linkedgeodata.org/vocabulary#building 719
-http://linkedgeodata.org/vocabulary#station 257
-http://linkedgeodata.org/vocabulary#post_box 247
-http://www.w3.org/2002/07/owl#Thing 227
-http://linkedgeodata.org/vocabulary#park 208
-http://linkedgeodata.org/vocabulary#restaurant 198
-http://dbpedia.org/ontology/Place 192
+CREATE BITMAP INDEX RDF_QUAD_POGS
+ ON DB.DBA.RDF_QUAD (P, O, G, S)
+ PARTITION (O VARCHAR (-1, 0hexffff));
-10 Rows. -- 932 msec.
+CREATE BITMAP INDEX RDF_QUAD_GPOS
+ ON DB.DBA.RDF_QUAD (G, P, O, S)
+ PARTITION (O VARCHAR (-1, 0hexffff));
]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp7"><title>Example 7</title>
-<programlisting><![CDATA[
-## Get Stuff Around Notre Dame De Paris
-SQL>
-SPARQL
-SELECT ?c COUNT (*)
-WHERE
- {
- ?s a ?c .
- ?s geo:geometry ?geo .
- FILTER (bif:st_intersects (?geo, bif:st_point (2.3498, 48.853), 0.3))
- }
-GROUP BY ?c
-ORDER BY desc 2
-LIMIT 10;
-c callret-1
-VARCHAR VARCHAR
-_______________________________________________________________________________
+<note><para>Note: If the server version is pre-5.0.7, leave out the <emphasis>PARTITION</emphasis>
+clauses and the <emphasis>ALTER INDEX</emphasis> statement.</para></note>
-http://linkedgeodata.org/vocabulary#node 408
-http://dbpedia.org/class/yago/Landmark108624891 134
-http://linkedgeodata.org/vocabulary#way 17
-http://dbpedia.org/class/yago/RomanCatholicChurchesInParis 17
-http://dbpedia.org/class/yago/TallBuildingsAndStructuresInParis 13
-http://dbpedia.org/class/yago/CathedralsInFrance 13
-http://sw.opencyc.org/2008/06/10/concept/Mx4rvVigPpwpEbGdrcN5Y29ycA 13
-http://sw.opencyc.org/2008/06/10/concept/Mx4rjm5QanS6EdaAAACgyZzFrg 13
-http://sw.opencyc.org/2008/06/10/concept/Mx4rwQwtGpwpEbGdrcN5Y29ycA 13
-http://www.w3.org/2002/07/owl#Thing 10
+<para>Public web service endpoints are proven to be sources of especially bad queries. While local
+application develpers can obtain instructions from database administrator and use ISQL access to
+the database in order to tune execution plans, "external" clients do not know details of
+configuration and/or lacks appropriate skills. The most common problem is that public endpoints usually
+get requests that does not mention the required graph, because that queries were initially written for
+use with triple stores. If the web service provides access to a single graph (or to a short list of graphs)
+then it is strongly recommended to configure it by adding a row into
+<emphasis>DB.DBA.SYS_SPARQL_HOST</emphasis>:</para>
+<programlisting><![CDATA[
+CREATE TABLE "DB"."DBA"."SYS_SPARQL_HOST"
+(
+ "SH_HOST" VARCHAR, -- host pattern
+ "SH_GRAPH_URI" VARCHAR, -- default graph
+ "SH_USER_URI" VARCHAR, -- reserved for any use in applications
+ "SH_DEFINES" LONG VARCHAR, -- list of 'define xx:yy "zz" ' defines as a string
+ PRIMARY KEY ("SH_HOST")
+);
-10 Rows. -- 241 msec.
]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp8"><title>Example 8</title>
-<programlisting><![CDATA[
-## Things within 10 km proximity of place of worship
-SQL>
-SPARQL
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-SELECT ?c COUNT (*)
-WHERE
- {
- ?s a ?c .
- ?s a lgv:place_of_worship .
- ?s geo:geometry ?geo .
- FILTER (bif:st_intersects (?geo, bif:st_point (2.3498, 48.853), 10))
- }
-GROUP BY ?c
-ORDER BY desc 2
-LIMIT 10;
-
-c callret-1
-VARCHAR VARCHAR
-_______________________________________________________________________________
+<para>You can find detailed descriptions of the table columns <link linkend="rdfdefaultgraph">here</link>.</para>
+<para>The idea is that if the client specifies default graph in
+the request or uses named graphs and group graph patterns then he is probably smarter than average and
+will provide meaningful queries. If no graph names are specified then the query will benefit from
+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
+by that application and define <emphasis>input:storage</emphasis> in appropriate row of
+<emphasis>DB.DBA.SYS_SPARQL_HOST</emphasis>.</para>
+</sect2>
-http://linkedgeodata.org/vocabulary#place_of_worship 147
-http://linkedgeodata.org/vocabulary#node 146
-http://linkedgeodata.org/vocabulary#way 46
-http://linkedgeodata.org/vocabulary#building 36
-http://linkedgeodata.org/vocabulary#attraction 3
-http://linkedgeodata.org/vocabulary#church 1
+<sect2 id="rdfperfcost"><title>Erroneous Cost Estimates and Explicit Join Order</title>
+ <para>The selectivity of triple patterns is determined at query compile time from sampling the data.
+It is possible that misleading data is produced. To see if the cardinality guesses are generally valid,
+look at the query plan with <link linkend="fn_explain"><function>explain</function> ()</link>.</para>
+<para>Below is a sample from the LUBM qualification data set in the Virtuoso distribution.
+After running <emphasis>make test</emphasis> in <emphasis>binsrc/test/lubm</emphasis>, there is a
+loaded database with the data. Start a server in the same directory to see the data.</para>
-6 Rows. -- 120 msec.
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp9"><title>Example 9</title>
<programlisting><![CDATA[
-## Get Stuff Around Notre Dame De Paris with Names
-SQL>
-SPARQL
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-SELECT ?cn
-WHERE
- {
- ?s lgv:name ?cn .
- ?s geo:geometry ?geo .
- FILTER (bif:st_intersects (?geo, bif:st_point (2.3498, 48.853), 0.3))
- }
-LIMIT 20;
-cn
+SQL> EXPLAIN
+ ('SPARQL
+ PREFIX ub: <http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#>
+ SELECT *
+ FROM <lubm>
+ WHERE { ?x rdf:type ub:GraduateStudent }
+ ');
+
+REPORT
VARCHAR
_______________________________________________________________________________
-Parking Lagrange
-Maitre Albert B&B
-Le Grenier de Notre Dame
-Eglise Saint-Julien-le-Pauvre
-Eglise Saint Julien le Pauvre
-Polly Magoo
-Point 0 des Routes de France
-Square Jean XXIII
-....
-20 Rows. -- 140 msec.
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp10"><title>Example 10</title>
-<programlisting><![CDATA[
-## Get Churches With The Most Bars
-SQL>
-SPARQL
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-SELECT ?churchname ?cafename (bif:st_distance (?churchgeo, ?cafegeo))
-WHERE
- {
- ?church a lgv:place_of_worship .
- ?church geo:geometry ?churchgeo .
- ?church lgv:name ?churchname .
- ?cafe a lgv:cafe .
- ?cafe lgv:name ?cafename .
- ?cafe geo:geometry ?cafegeo .
- FILTER (bif:st_intersects (?churchgeo, bif:st_point (2.3498, 48.853), 5)
- && bif:st_intersects (?cafegeo, ?churchgeo, 0.2))
- }
-LIMIT 10;
+{
-churchname cafename callret-2
-VARCHAR VARCHAR VARCHAR
-_______________________________________________________________________________
+Precode:
+ 0: $25 "callret" := Call __BOX_FLAGS_TWEAK (<constant (lubm)>, <constant (1)>)
+ 5: $26 "lubm" := Call DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE ($25 "callret")
+ 12: $27 "callret" := Call __BOX_FLAGS_TWEAK (<constant (http://www.w3.org/1999/02/22-rdf-syntax-ns#type)>, <constant (1)>)
+ 17: $28 "-ns#type" := Call DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE ($27 "callret")
+ 24: $29 "callret" := Call __BOX_FLAGS_TWEAK (<constant (http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#GraduateStudent)>, <constant (1)>)
+ 29: $30 "owl#GraduateStudent" := Call DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE ($29 "callret")
+ 36: BReturn 0
+from DB.DBA.RDF_QUAD by RDF_QUAD_OGPS 1.9e+03 rows
+Key RDF_QUAD_OGPS ASC ($32 "s-3-1-t0.S")
+<col=415 O = $30 "owl#GraduateStudent"> , <col=412 G = $26 "lubm"> , <col=414 P = $28 "-ns#type">
+row specs: <col=415 O LIKE <constant (T)>>
+
+Current of: <$34 "<DB.DBA.RDF_QUAD s-3-1-t0>" spec 5>
-Eglise Saint-Julien-le-Pauvre Le Saint R+?-?gis 0.09759308692691648
-Eglise Saint-Germain des Pr+?-?s Caf+?-? de Flore 0.08774468391412803
-Eglise Saint-Germain des Pr+?-?s Les Deux Magots 0.05235923473923059
-Eglise Saint-Germain des Pr+?-?s Caf+?-? Mabillon 0.1712042770289815
-Eglise Saint-Germain-des-Pr+?-?s Caf+?-? de Flore 0.1466502865197912
-Eglise Saint-Germain-des-Pr+?-?s Les Deux Magots 0.1096767137079839
-Eglise Saint-Germain-des-Pr+?-?s Bar du march+?-? 0.1831441251868126
-Eglise Saint-Germain-des-Pr+?-?s Caf+?-? Mabillon 0.1174051745495528
-Synagogue La Chaise au Plafond 0.1038387283609551
-Synagogue Le Loir dans la Th+?-?i+?-?re 0.1632848322062273
+After code:
+ 0: $35 "x" := Call ID_TO_IRI ($32 "s-3-1-t0.S")
+ 5: BReturn 0
+Select ($35 "x", <$34 "<DB.DBA.RDF_QUAD s-3-1-t0>" spec 5>)
+}
-10 Rows. -- 511225 msec.
+22 Rows. -- 1 msec.
]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp11"><title>Example 11</title>
+<para>This finds the graduate student instances in the LUBM graph. First the query
+ converts the IRI literals to IDs. Then, using a match of OG on OGPS, it finds the
+ IRIs of the graduate students. Then, it converts the IRI ID to return to the string form.</para>
+<para>The cardinality estimate of 1.9e+03 rows is on the FROM line.</para>
+<para>Doing an EXPLAIN() on the queries will show the cardinality estimates. To drill down further, one can split the query into smaller chunks and see the estimates for these, up to doing it at the triple pattern level.
+To indicate a variable that is bound but whose value is not a literal known at compile time, one can use the parameter marker <emphasis>??</emphasis>.</para>
+
<programlisting><![CDATA[
-## Things around highly populated places
-SQL>
-SPARQL
-SELECT ?s ( sql:num_or_null (?o) ) COUNT (*)
-WHERE
- {
- ?s <http://dbpedia.org/ontology/populationTotal> ?o .
- FILTER ( sql:num_or_null (?o) > 6000000 ) .
- ?s geo:geometry ?geo .
- FILTER ( bif:st_intersects (?pt, ?geo,2) ) .
- ?xx geo:geometry ?pt
- }
-GROUP BY ?s ( sql:num_or_null (?o) )
-ORDER BY desc 3
-LIMIT 20;
+SQL> EXPLAIN
+ ('
+ SPARQL
+ DEFINE sql:table-option "order"
+ PREFIX ub: <http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#>
+ SELECT *
+ FROM <lubm>
+ WHERE { ?x rdf:type ?? }
+ ');
+]]></programlisting>
-s callret-1 callret-2
-VARCHAR VARCHAR VARCHAR
-_______________________________________________________________________________
+<para>This will not know the type but will know that a type will be
+provided. So instead of guessing 1900 matches, this will guess a
+smaller number, which is obviously less precise. Thus literals are generally better.</para>
+<para>In some cases, generally to work around an optimization error, one can specify an explicit
+ <emphasis>JOIN</emphasis> order. This is done with the <emphasis>sql:select-option "order"</emphasis>
+ clause in the SPARQL query prefix.</para>
-http://dbpedia.org/resource/London 7556900 312307
-http://dbpedia.org/resource/Toronto 8102163 115859
-http://dbpedia.org/resource/New_York_City 8363710 95629
-http://dbpedia.org/resource/The_Hague 6659300 84410
-http://dbpedia.org/resource/Tokyo 12790000 78618
-http://dbpedia.org/resource/Philadelphia 6385461 67115
-http://dbpedia.org/resource/Los_Angeles 17755322 64394
-http://dbpedia.org/resource/Bangkok 8160522 62519
-http://dbpedia.org/resource/Barcelona 2147483648 57635
-http://dbpedia.org/resource/Cairo 6758581 52738
-http://dbpedia.org/resource/Istanbul 12697164 50745
-http://dbpedia.org/resource/Seoul 10421782 43962
-http://dbpedia.org/resource/Beijing 17430000 35979
-http://dbpedia.org/resource/Purmerend 6659300 33508
-http://dbpedia.org/resource/Baghdad 6554126 33426
-http://dbpedia.org/resource/Bogot%C3%A1 6776009 30429
-http://dbpedia.org/resource/Mexico_City 8836045 30127
-http://dbpedia.org/resource/Jakarta 8500000 28944
-http://dbpedia.org/resource/Boston 7514759 27705
-http://dbpedia.org/resource/Baden-W%C3%BCrttemberg 10755000 25112
-
-20 Rows. -- 4296 msec.
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp12"><title>Example 12</title>
<programlisting><![CDATA[
-## Example "Places Of Worship, Within 5 km Of Paris":
-
-## Constructs a custom Linked Data Mesh (graph) about
-## places of worship, within 5 km of Paris, that have
-## cafes in close proximity(0.2 km).
+SQL> SELECT SPARQL_to_sql_text
+ ('
+ DEFINE sql:select-option "order"
+ PREFIX ub: <http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#>
+ SELECT *
+ FROM <lubm>
+ WHERE
+ {
+ ?x rdf:type ub:GraduateStudent .
+ ?x ub:takesCourse <http://www.Department0.University0.edu/GraduateCourse0>
+ }
+ ');
+]]></programlisting>
-## Note: we have distinct pin colors that identify
-## for places of worship distinct from cafes.
+<para>shows the SQL text with the order option at the end.</para>
+<para>If an estimate is radically wrong then this should be reported as a bug.</para>
+<para>If there is a FROM with a KEY on the next line and no column specs then this is a full table scan.
+ The more columns are specified the less rows will be passed to the next operation in the chain. In
+ the example above, there are three columns whose values are known before reading the table and
+ these columns are leading columns of the index in use so column specs are:</para>
+<programlisting><![CDATA[
+<col=415 O = $30 "owl#GraduateStudent"> ,
+<col=412 G = $26 "lubm"> ,
+<col=414 P = $28 "-ns#type">
+]]></programlisting>
+<note><para>Note: A KEY with only a row spec is a full table scan with the row spec applied as a filter.
+This is usually not good unless this is specifically intended.</para></note>
+<para>If queries are compiled to make full table scans when this is not specifically intended, this should be reported as a bug.
+The explain () output and the query text should be included in the report.</para>
+<para>Consider:</para>
-## The query requires V6 or higher.
-SQL>
-SPARQL
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-PREFIX rtb: <http://www.openlinksw.com/schemas/oat/rdftabs#>
-CONSTRUCT
- {
- ?cafe geo:geometry ?cafegeo ;
- rtb:useMarker '01' ;
- lgv:name ?cafename .
- ?church geo:geometry ?churchgeo ;
- rtb:useMarker '02' ;
- lgv:name ?churchname .
- }
-WHERE
- {
- ?church a lgv:place_of_worship .
- ?church geo:geometry ?churchgeo .
- ?church lgv:name ?churchname .
- ?cafe a lgv:cafe .
- ?cafe lgv:name ?cafename .
- ?cafe geo:geometry ?cafegeo .
- ?cafe geo:lat ?lat .
- ?cafe geo:long ?long .
- FILTER ( bif:st_intersects ( ?churchgeo, bif:st_point ( 2.3498, 48.853 ), 5 ) &&
- bif:st_intersects ( ?cafegeo, ?churchgeo, 0.2 ) )
- }
-LIMIT 10;
+<programlisting><![CDATA[
+SQL> EXPLAIN
+ ('
+ SPARQL
+ DEFINE sql:select-option "order, loop"
+ PREFIX ub: <http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#>
+ SELECT *
+ FROM <lubm>
+ WHERE
+ {
+ ?x ub:takesCourse ?c .
+ ?x rdf:type ub:GraduateStudent
+ }
+ ');
+]]></programlisting>
- at prefix ns0: <http://linkedgeodata.org/vocabulary#> .
- at prefix ns1: <http://linkedgeodata.org/triplify/node/237435716#> .
-ns1:id ns0:name "Chapelle du Val de Gr\u00C3\u00A2ce" .
- at prefix ns2: <http://www.openlinksw.com/schemas/oat/rdftabs#> .
-ns1:id ns2:useMarker "02" .
- at prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#> .
- at prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
-ns1:id geo:geometry "POINT(2.3418 48.8406)"^^virtrdf:Geometry .
- at prefix ns5: <http://linkedgeodata.org/triplify/node/218147750#> .
-ns5:id ns0:name "Synagogue" ;
- ns2:useMarker "02" ;
- geo:geometry "POINT(2.3593 48.857)"^^virtrdf:Geometry .
- at prefix ns6: <http://linkedgeodata.org/triplify/node/218145208#> .
-ns6:id ns0:name "Synagogue" ;
- ns2:useMarker "02" ;
- geo:geometry "POINT(2.3589 48.8567)"^^virtrdf:Geometry .
-...
+<para>One will see in the output that the first table access is to retrieve
+all in the LUBM graph which take some course and then later to check
+if this is a graduate student. This is obviously not the preferred
+order but the <emphasis>sql:select-option "order"</emphasis> forces the optimizer to join
+from left to right.</para>
+<para>It is very easy to end up with completely unworkable query plans in
+this manner but if the optimizer really is in error, then this is the
+only way of overriding its preferences. The effect of <emphasis>sql:select-option</emphasis> is pervasive, extending inside unions, optionals, subqueries etc within the statement.</para>
+<para>We note that if, in the above query, both the course taken by the
+student and the type of the student are given, the query compilation
+will be, at least for all non-cluster cases, an index intersection.
+This is not overridden by the sql:select-option clause since an index
+intersection is always a safe guess, regardless of the correctness of
+the cardinality guesses of the patterns involved.</para>
+ <sect3 id="rdfperfcosttransanalyze"><title>Translate and Analyze modes for analyzing sparql queries</title>
+ <para>Virtuoso Release 6.4 ISQL offers 2 new modes for analyzing sparql queries:</para>
+ <orderedlist>
+ <listitem>Translate a sparql query into the correspondent sql:
+<programlisting><![CDATA[
+SQL> SET SPARQL_TRANSLATE ON;
+SQL> SELECT * FROM <graph> WHERE {?S a ?O};
+SQL> SET SPARQL_TRANSLATE OFF;
]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp13"><title>Example 13</title>
+ </listitem>
+ <listitem>Analyze a given SQL query:
<programlisting><![CDATA[
-## Example "Places Of Worship, Within 5 km Of Paris":
-
-## Asks for places of worship, within 5 km of Paris,
-## that have cafes in close proximity(0.2 km).
-## The query requires V6 or higher.
-
-SQL>
-SPARQL
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-ASK
-WHERE
- {
- ?church a lgv:place_of_worship .
- ?church geo:geometry ?churchgeo .
- ?church lgv:name ?churchname .
- ?cafe a lgv:cafe .
- ?cafe lgv:name ?cafename .
- ?cafe geo:geometry ?cafegeo .
- ?cafe geo:lat ?lat .
- ?cafe geo:long ?long .
- FILTER ( bif:st_intersects ( ?churchgeo, bif:st_point ( 2.3498, 48.853 ), 5 ) &&
- bif:st_intersects ( ?cafegeo, ?churchgeo, 0.2 ) )
- };
-
-Done.
-
-true
+SQL> SET EXPLAIN ON;
+SQL> SELECT * FROM TABLE WHERE field = 'text';
+SQL> SET EXPLAIN OFF;
]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp14"><title>Example 14</title>
+ <itemizedlist mark="bullet">
+ <listitem><link linkend="fn_explain"><function>explain</function> ()</link> is much more
+ difficult to use since you cannot just cut and past a query as all quotes need to be
+ doubled inside the <code>explain (' ... ')</code>:
<programlisting><![CDATA[
-## Places of worship, within 5 km of Paris,
-## that have cafes in close proximity(0.2 km)
-SQL>
-SPARQL
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-SELECT DISTINCT ?cafe ?lat ?long ?cafename ?churchname
-(bif:round(bif:st_distance (?churchgeo, ?cafegeo)))
-WHERE
+SQL> explain('select * from table where field = ''text''');
+]]></programlisting>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </orderedlist>
+ <para>Here is simple example of how to combine the two options to get a full explain plan for a simple SPARQL query:</para>
+ <orderedlist>
+ <listitem>Assume the following query:
+<programlisting><![CDATA[
+SELECT *
+FROM <http://dbpedia.org>
+WHERE
{
- ?church a lgv:place_of_worship .
- ?church geo:geometry ?churchgeo .
- ?church lgv:name ?churchname .
- ?cafe a lgv:cafe .
- ?cafe lgv:name ?cafename .
- ?cafe geo:geometry ?cafegeo .
- ?cafe geo:lat ?lat.
- ?cafe geo:long ?long.
- FILTER ( bif:st_intersects (?churchgeo, bif:st_point (2.3498, 48.853), 5) &&
- bif:st_intersects (?cafegeo, ?churchgeo, 0.2) )
- }
-LIMIT 10;
+ ?s a ?o
+ }
+LIMIT 10
+]]></programlisting>
+ </listitem>
+ <listitem>Connect using the ISQL command line tool to your database and execute:
+<programlisting><![CDATA[
+SQL> SET BLOBS ON; -- in case output is very large
+SQL> SET SPARQL_TRANSLATE ON;
+SQL> SELECT * FROM <http://dbpedia.org> WHERE {?s a ?o} LIMIT 10;
+
+SPARQL_TO_SQL_TEXT
+VARCHAR
+_______________________________________________________________________________
-cafe lat long cafename churchname callret-5
-VARCHAR VARCHAR VARCHAR VARCHAR VARCHAR VARCHAR
-_______________________________________________________________________________________________________________________________________________________________
+SELECT TOP 10 __id2i ( "s_1_0-t0"."S" ) AS "s",
+ __ro2sq ( "s_1_0-t0"."O" ) AS "o"
+FROM DB.DBA.RDF_QUAD AS "s_1_0-t0"
+WHERE "s_1_0-t0"."G" = __i2idn ( __bft( 'http://dbpedia.org' , 1))
+ AND "s_1_0-t0"."P" = __i2idn ( __bft( 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' , 1))
+OPTION (QUIETCAST)
-http://linkedgeodata.org/triplify/node/321932192#id 48.8522 2.3484 Le Saint R+?-?gis Eglise Saint-Julien-le-Pauvre 0
-http://linkedgeodata.org/triplify/node/251699776#id 48.8541 2.3326 Caf+?-? de Flore Eglise Saint-Germain des Pr+?-?s 0
-http://linkedgeodata.org/triplify/node/251699775#id 48.854 2.3331 Les Deux Magots Eglise Saint-Germain des Pr+?-?s 0
-http://linkedgeodata.org/triplify/node/315769036#id 48.8533 2.3358 Caf+?-? Mabillon Eglise Saint-Germain des Pr+?-?s 0
-http://linkedgeodata.org/triplify/node/251699776#id 48.8541 2.3326 Caf+?-? de Flore Eglise Saint-Germain-des-Pr+?-?s 0
-http://linkedgeodata.org/triplify/node/251699775#id 48.854 2.3331 Les Deux Magots Eglise Saint-Germain-des-Pr+?-?s 0
-http://linkedgeodata.org/triplify/node/315769035#id 48.8539 2.3371 Bar du march+?-? Eglise Saint-Germain-des-Pr+?-?s 0
-http://linkedgeodata.org/triplify/node/315769036#id 48.8533 2.3358 Caf+?-? Mabillon Eglise Saint-Germain-des-Pr+?-?s 0
-http://linkedgeodata.org/triplify/node/251126326#id 48.8572 2.3577 La Chaise au Plafond Synagogue 0
-http://linkedgeodata.org/triplify/node/251043135#id 48.8562 2.361 Le Loir dans la Th+?-?i+?-?re Synagogue 0
+1 Rows. -- 1 msec.
-10 Rows. -- 120 msec.
+SQL> SET SPARQL_TRANSLATE OFF;
]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp15"><title>Example 15</title>
-<programlisting><![CDATA[
-## Stuff around Notre Dame de Paris
-SQL>
-SPARQL
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-SELECT ?s ?cn ?lat ?long
-WHERE
- {
- ?s lgv:name ?cn .
- ?s geo:geometry ?geo .
- ?s geo:lat ?lat.
- ?s geo:long ?long.
- FILTER ( bif:st_intersects (?geo, bif:st_point (2.3498, 48.853), 0.3) )
- }
-LIMIT 20;
+ </listitem>
+ <listitem>Use mouse to select the above query output and paste it after the <code>SET EXPLAIN ON;</code>
+ command. After pasting in the command, followed by the ENTER key:
+<programlisting><![CDATA[
+SQL> SET EXPLAIN ON;
+SQL> SELECT TOP 10 __id2i ( "s_1_0-t0"."S" ) AS "s", __ro2sq ( "s_1_0-t0"."O" ) AS "o"
+ FROM DB.DBA.RDF_QUAD AS "s_1_0-t0"
+ WHERE "s_1_0-t0"."G" = __i2idn ( __bft( 'http://dbpedia.org' , 1))
+ AND "s_1_0-t0"."P" = __i2idn ( __bft( 'http://www.w3.org/1999/02/22-rdf-syn tax-ns#type' , 1))
+ OPTION (QUIETCAST)
+;
-s cn lat long
-VARCHAR VARCHAR VARCHAR VARCHAR
-______________________________________________________________________________________________________________
+REPORT
+VARCHAR
+_______________________________________________________________________________
-http://linkedgeodata.org/triplify/node/237004656#id Parking Lagrange 48.8506 2.3487
-http://linkedgeodata.org/triplify/node/237003117#id Mus+?-?e de l'Assistance Publique H+?-¦pitaux de Paris 48.8507 2.3519
-http://linkedgeodata.org/triplify/way/23071565#id Jardin de la Rue de Bi+?-?vre 48.8504 2.3502
-http://linkedgeodata.org/triplify/node/251652818#id Maitre Albert B&B 48.8507 2.3496
-http://linkedgeodata.org/triplify/node/251373384#id Le Grenier de Notre Dame 48.8513 2.35
-http://linkedgeodata.org/triplify/node/205266764#id Eglise Saint-Julien-le-Pauvre 48.852 2.3471
-http://linkedgeodata.org/triplify/way/19741083#id Eglise Saint Julien le Pauvre 48.8521 2.3469
-http://linkedgeodata.org/triplify/node/251474112#id Polly Magoo 48.8526 2.3467
-http://linkedgeodata.org/triplify/node/251531803#id H+?-¦tel Esmerelda 48.8523 2.3468
-http://linkedgeodata.org/triplify/node/191031796#id Point 0 des Routes de France 48.8533 2.3489
-http://linkedgeodata.org/triplify/way/20444455#id Square Jean XXIII 48.8529 2.3511
-http://linkedgeodata.org/triplify/way/19740745#id Square Ren+?-? Viviani 48.8525 2.3476
-http://linkedgeodata.org/triplify/node/321932192#id Le Saint R+?-?gis 48.8522 2.3484
-http://linkedgeodata.org/triplify/node/27440965#id Notre-Dame de Paris 48.853 2.3499
-http://linkedgeodata.org/triplify/node/243461762#id Parking Notre-Dame 48.8537 2.3475
-http://linkedgeodata.org/triplify/way/21816758#id Notre-Dame de Paris 48.8531 2.349
-http://linkedgeodata.org/triplify/way/22972062#id La Seine 48.8538 2.3531
-http://linkedgeodata.org/triplify/way/25463927#id La Seine 48.8548 2.3518
-http://linkedgeodata.org/triplify/node/251128395#id H+?-¦tel Hospitel 48.854 2.3484
-http://linkedgeodata.org/triplify/way/14155323#id H+?-¦tel Dieu 48.8555 2.3485
-
-20 Rows. -- 167 msec.
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp16"><title>Example 16</title>
-<programlisting><![CDATA[
-## Stuff around Notre Dame de Paris
-SQL>
-SPARQL
-PREFIX lgv: <http://linkedgeodata.org/vocabulary#>
-DESCRIBE ?s
-WHERE
- {
- ?s lgv:name ?cn .
- ?s geo:geometry ?geo .
- ?s geo:lat ?lat.
- ?s geo:long ?long.
- FILTER (bif:st_intersects (?geo, bif:st_point (2.3498, 48.853), 0.3))
- }
-LIMIT 20;
+{
+from DB.DBA.RDF_QUAD by RDF_QUAD_POGS 4.5e+05 rows
+Key RDF_QUAD_POGS ASC ($22 "s_1_0-t0.S", $21 "s_1_0-t0.O")
+ inlined <col=556 P = #type >
+row specs: <col=554 G = #http://dbpedia.org >
+
+
+After code:
+ 0: $25 "s" := Call __id2i ($22 "s_1_0-t0.S")
+ 5: $26 "o" := Call __ro2sq ($21 "s_1_0-t0.O")
+ 10: BReturn 0
+Select (TOP 10 ) ($25 "s", $26 "o", <$24 "<DB.DBA.RDF_QUAD s_1_0-t0>" spec 5>)
+}
- at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- at prefix ns1: <http://linkedgeodata.org/triplify/node/27440966#> .
- at prefix ns2: <http://linkedgeodata.org/vocabulary#> .
-ns1:id rdf:type ns2:node ,
- ns2:police .
- at prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
-ns1:id geo:lat 48.8542 ;
- geo:long 2.3473 ;
- ns2:created_by "Potlatch 0.6a" ;
- ns2:name "Pr\u00C3\u00A9fecture de Police de Paris" ,
- "Pr\u00E9fecture de Police de Paris" .
- at prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#> .
-ns1:id geo:geometry "POINT(2.3473 48.8542)"^^virtrdf:Geometry .
- at prefix ns5: <http://linkedgeodata.org/triplify/node/27440965#> .
-ns5:id rdf:type ns2:node ,
- ns2:place_of_worship ;
- geo:lat 48.853 ;
- geo:long 2.3499 ;
- ns2:denomination "catholic" ;
- ns2:name "Notre-Dame de Paris" ;
- ns2:religion "christian" ,
- ns2:christian ;
- geo:geometry "POINT(2.3499 48.853)"^^virtrdf:Geometry .
-
-......
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp17"><title>Example 17</title>
-<programlisting><![CDATA[
-## Cities within 30 km proximity of London
-SQL>
-SPARQL
-SELECT ?m (bif:round(bif:st_distance (?geo, ?gm)))
-WHERE
- {
- <http://dbpedia.org/resource/London> geo:geometry ?gm .
- ?m geo:geometry ?geo .
- ?m a <http://dbpedia.org/ontology/City> .
- FILTER (bif:st_intersects (?geo, ?gm, 30))
- }
-ORDER BY DESC 2
-LIMIT 20;
-
-m callret-1
-VARCHAR VARCHAR
-____________________________________________________________
-
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Ebbsfleet_Valley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-http://dbpedia.org/resource/Bletchingley 30
-
-20 Rows. -- 727666 msec.
+13 Rows. -- 1 msec.
+SQL> SET EXPLAIN OFF;
]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp18"><title>Example 18</title>
+ </listitem>
+ </orderedlist>
+ </sect3>
+</sect2>
+<sect2 id="rdfperfgetallgraphs"><title>Get All Graphs</title>
+<para>In order to get all graphs URIs, one might use the Virtuoso
+<link linkend="fn_sparql_select_known_graphs"><function>DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS()</function></link>
+built-in function.</para>
+</sect2>
+<sect2 id="rdfrenamegraph"><title>Rename RDF Graph and RDF Graph Groups</title>
+ <para>A RDF Graph in the Virtuoso Quad Store can be renamed without copying each assertion from the old
+ graph to the new graph using a SQL statement, this being what the Conductor "rename" option does,
+ which is:</para>
+<programlisting><![CDATA[
+UPDATE DB.DBA.RDF_QUAD TABLE OPTION (index RDF_QUAD_GS)
+ SET g = iri_to_id ('new')
+ WHERE g = iri_to_id ('old', 0);
+]]></programlisting>
+ <para><emphasis>Note:</emphasis> this operation must be run in row-autocommit mode i.e.
+ log_enable (3), and then restore back to the default logging mode of 1.</para>
+ <para>For Virtuoso Graph Groups two tables need to be updated:</para>
<programlisting><![CDATA[
-## Motorways across England & Scotland from DBpedia
-SQL>
-SPARQL
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX dbpprop: <http://dbpedia.org/property/>
-PREFIX yago: <http://dbpedia.org/class/yago/>
-SELECT ?road ?services ?lat ?long
-WHERE
- {
- {
- ?services dbpprop:road ?road .
- ?road a yago:MotorwaysInEngland .
- ?services dbpprop:lat ?lat .
- ?services dbpprop:long ?long .
- }
- UNION
- {
- ?services dbpprop:road ?road .
- ?road a yago:MotorwaysInScotland .
- ?services dbpprop:lat ?lat .
- ?services dbpprop:long ?long .
- }
- }
-LIMIT 20;
-
-road services lat long
-VARCHAR VARCHAR VARCHAR VARCHAR
-______________________________________________________________________________________________________________________________________
-
-http://dbpedia.org/resource/M90_motorway http://dbpedia.org/resource/Kinross_services 56.209628 -3.439257
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Leicester_Forest_East_services 52.6192 -1.206
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Woodall_services 53.3152 -1.2813
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Tibshelf_services 53.13708 -1.33179
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/London_Gateway_services 51.631 -0.264
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Donington_Park_services 52.823651 -1.305887
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Watford_Gap_services 52.3069 -1.1226
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Newport_Pagnell_services 52.083066 -0.748508
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Trowell_services 52.963198 -1.265988
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Woolley_Edge_services 53.62259 -1.549422
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Toddington_services 51.9478 -0.502075
-http://dbpedia.org/resource/M1_motorway http://dbpedia.org/resource/Northampton_services 52.209201 -0.944799
-http://dbpedia.org/resource/M4_motorway http://dbpedia.org/resource/Chieveley_services 51.449 -1.3112
-http://dbpedia.org/resource/M4_motorway http://dbpedia.org/resource/Magor_services 51.58786 -2.83713
-http://dbpedia.org/resource/M4_motorway http://dbpedia.org/resource/Pont_Abraham_services 51.74712 -4.0655
-http://dbpedia.org/resource/M4_motorway http://dbpedia.org/resource/Swansea_services 51.678197 -3.994646
-http://dbpedia.org/resource/M4_motorway http://dbpedia.org/resource/Leigh_Delamere_services 51.511528 -2.159468
-http://dbpedia.org/resource/M4_motorway http://dbpedia.org/resource/Reading_services 51.424527 -1.035633
-http://dbpedia.org/resource/M4_motorway http://dbpedia.org/resource/Cardiff_West_services 51.50626 -3.30535
-http://dbpedia.org/resource/M4_motorway http://dbpedia.org/resource/Heston_services 51.48807 -0.39106
-
-20 Rows. -- 531 msec.
-
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp18"><title>Example 19</title>
-<programlisting><![CDATA[
-SELECT DISTINCT ?s (bif:round(?lat)) as ?lat (bif:round(?long)) as ?long
-WHERE
- {
- {
- SELECT ?g ?s WHERE
- {
- graph ?g {
- ?s geo:geometry ?geo }
- }
- LIMIT 100
- }
- graph ?g {
- ?s geo:lat ?lat .
- ?s geo:long ?long . }
- FILTER (datatype (?lat) in (xsd:integer, xsd:float, xsd:double)) .
- FILTER (datatype (?long) in (xsd:integer, xsd:float, xsd:double))
- }
-
-s lat long
-ANY ANY ANY
-________________________________________________________________________________________________
-http://dbpedia.org/resource/QUaD -90 -139
-http://dbpedia.org/resource/Amundsen-Scott_South_Pole_Station -90 -139
-http://dbpedia.org/resource/Amundsen-Scott_South_Pole_Station -90 0
-http://dbpedia.org/resource/Degree_Angular_Scale_Interferometer -90 -139
-http://dbpedia.org/resource/South_Pole_Telescope -90 -139
-http://dbpedia.org/resource/Arcminute_Cosmology_Bolometer_Array_Receiver -90 -139
-http://dbpedia.org/resource/Viper_telescope -90 -139
-http://dbpedia.org/resource/Mount_Weaver -87 -154
-http://dbpedia.org/resource/Axel_Heiberg_Glacier -85 -163
-http://dbpedia.org/resource/Mount_Ray -85 -171
-http://linkedgeodata.org/triplify/node/275487234#id -85 -142
-http://linkedgeodata.org/triplify/node/303732928#id -85 -142
-http://linkedgeodata.org/triplify/node/332036611#id -85 -85
-http://linkedgeodata.org/triplify/node/303732935#id -85 -143
-http://linkedgeodata.org/triplify/node/303732951#id -85 -144
-http://linkedgeodata.org/triplify/node/303732953#id -85 -144
-http://linkedgeodata.org/triplify/node/276208684#id -85 -166
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp19"><title>Example 19</title>
-<programlisting><![CDATA[
-## "Find things within 20km of New York City":
-
-SELECT DISTINCT ?resource ?label ?location
-WHERE
- {
- <http://dbpedia.org/resource/New_York_City>
- geo:geometry ?sourcegeo .
- ?resource geo:geometry ?location ;
- rdfs:label ?label .
- FILTER( bif:st_intersects( ?location, ?sourcegeo, 20 ) ) .
- FILTER( lang(?label) = "en" )
- }
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp20"><title>Example 20</title>
+UPDATE DB.DBA.RDF_GRAPH_GROUP_MEMBER
+ SET RGGM_GROUP_IID = iri_to_id ('new')
+ WHERE RGGM_GROUP_IID = iri_to_id (old)
+]]></programlisting>
+ <para>and</para>
<programlisting><![CDATA[
-## "Find Distance between New York City
-## and London, England":
-
-SELECT ( bif:st_distance( ?nyl,?ln ) )
- AS ?distanceBetweenNewYorkCityAndLondon
-WHERE
- {
- <http://dbpedia.org/resource/New_York_City>
- geo:geometry ?nyl .
- <http://dbpedia.org/resource/London>
- geo:geometry ?ln .
- }
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp21"><title>Example 21</title>
+UPDATE DB.DBA.RDF_GRAPH_GROUP
+ SET RGG_IID = iri_to_id ('new') , RGG_IRI = 'new'
+ WHERE RGG_IRI = 'old'
+]]></programlisting>
+</sect2>
+<sect2 id="rdfperfdumpandreloadgraphs"><title>Dump and Reload Graphs</title>
+In order to dump all graphs with extension exclude those graphs of a certain type by using a
+sparql ask query, you may use the following script sequence:
<programlisting><![CDATA[
-## "Find "All Educational Institutions
-## within 10km of Oxford, UK; ordered by
-## date of establishment":
+CREATE PROCEDURE dump_graphs
+ ( IN dir VARCHAR := 'dumps' ,
+ IN file_length_limit INTEGER := 1000000000
+ )
+{
+ DECLARE inx INT;
+ inx := 1;
+ SET ISOLATION = 'uncommitted';
+ FOR ( SELECT *
+ FROM ( SPARQL DEFINE input:storage ""
+ SELECT DISTINCT ?g { GRAPH ?g { ?s ?p ?o } .
+ FILTER ( ?g != virtrdf: )
+ }
+ ) AS sub OPTION ( LOOP )) DO
+ {
+ dump_one_graph ( "g",
+ sprintf ('%s/graph%06d_', dir, inx),
+ file_length_limit
+ );
+ inx := inx + 1;
+ }
+}
+;
-SELECT DISTINCT ?thing AS ?uri
- ?thingLabel AS ?name
- ?date AS ?established
- ?matchgeo AS ?location
-WHERE
- {
- <http://dbpedia.org/resource/Oxford>
- geo:geometry ?sourcegeo .
- ?resource geo:geometry ?matchgeo .
- FILTER( bif:st_intersects( ?matchgeo, ?sourcegeo, 5 ) ) .
- ?thing ?somelink ?resource ;
- <http://dbpedia.org/ontology/established> ?date ;
- rdfs:label ?thingLabel .
- FILTER( lang(?thingLabel) = "en" )
- }
-ORDER BY ASC( ?date )
-]]></programlisting>
- </sect3>
- <sect3 id="rdfsparqlgeospatexmp22"><title>Example 22</title>
-<programlisting><![CDATA[
-## "Find Historical cross section of events related
-## to Edinburgh and the surrounding area (within 30km)
-## during the 19th century":
-SELECT DISTINCT ?thing ?thingLabel
- ?dateMeaningLabel ?date ?matchgeo
-WHERE
- {
+CREATE PROCEDURE dump_one_graph
+ ( IN srcgraph VARCHAR ,
+ IN out_file VARCHAR ,
+ IN file_length_limit INTEGER := 1000000000
+ )
+{
+ DECLARE file_name varchar;
+ DECLARE env, ses any;
+ DECLARE ses_len,
+ max_ses_len,
+ file_len,
+ file_idx integer;
+ SET ISOLATION = 'uncommitted';
+ max_ses_len := 10000000;
+ file_len := 0;
+ file_idx := 1;
+ file_name := sprintf ('%s%06d.ttl', out_file, file_idx);
+ string_to_file ( file_name || '.graph',
+ srcgraph,
+ -2
+ );
+ string_to_file ( file_name,
+ sprintf ( '# Dump of graph <%s>, as of %s\n',
+ srcgraph,
+ CAST (NOW() AS VARCHAR)
+ ),
+ -2
+ );
+ env := vector (dict_new (16000), 0, '', '', '', 0, 0, 0, 0);
+ ses := string_output ();
+ FOR (SELECT * FROM ( SPARQL DEFINE input:storage ""
+ SELECT ?s ?p ?o { GRAPH `iri(?:srcgraph)` { ?s ?p ?o } }
+ ) AS sub OPTION (LOOP)) DO
{
- SELECT DISTINCT ?thing ?matchgeo
- WHERE
+ http_ttl_triple (env, "s", "p", "o", ses);
+ ses_len := length (ses);
+ IF (ses_len > max_ses_len)
{
- <http://dbpedia.org/resource/Edinburgh>
- geo:geometry ?sourcegeo .
- ?resource geo:geometry ?matchgeo .
- FILTER( bif:st_intersects (
- ?matchgeo, ?sourcegeo, 30 ) ) .
- ?thing ?somelink ?resource
+ file_len := file_len + ses_len;
+ IF (file_len > file_length_limit)
+ {
+ http (' .\n', ses);
+ string_to_file (file_name, ses, -1);
+ file_len := 0;
+ file_idx := file_idx + 1;
+ file_name := sprintf ('%s%06d.ttl', out_file, file_idx);
+ string_to_file ( file_name,
+ sprintf ( '# Dump of graph <%s>, as of %s (part %d)\n',
+ srcgraph,
+ CAST (NOW() AS VARCHAR),
+ file_idx),
+ -2
+ );
+ env := vector (dict_new (16000), 0, '', '', '', 0, 0, 0, 0);
+ }
+ ELSE
+ string_to_file (file_name, ses, -1);
+ ses := string_output ();
}
}
+ IF (LENGTH (ses))
{
- ?property rdf:type owl:DatatypeProperty ;
- rdfs:range xsd:date
- } .
- ?thing ?dateMeaning ?date .
- FILTER( ?dateMeaning IN ( ?property ) ) .
- FILTER( ?date >= xsd:gYear("1800")
- && ?date <= xsd:gYear("1900") )
- ?dateMeaning rdfs:label ?dateMeaningLabel .
- FILTER( lang(?dateMeaningLabel) = "en" ) .
- ?thing rdfs:label ?thingLabel .
- FILTER( lang(?thingLabel) = "en" )
- }
-ORDER BY ASC ( ?date )
+ http (' .\n', ses);
+ string_to_file (file_name, ses, -1);
+ }
+}
+;
+
+create procedure load_graphs (in dir varchar := 'dumps/')
+{
+ declare arr any;
+ declare g varchar;
+
+ arr := sys_dirlist (dir, 1);
+ log_enable (2, 1);
+ foreach (varchar f in arr) do
+ {
+ if (f like '*.ttl')
+ {
+ declare continue handler for sqlstate '*'
+ {
+ log_message (sprintf ('Error in %s', f));
+ };
+ g := file_to_string (dir || '/' || f || '.graph');
+ DB.DBA.TTLP_MT (file_open (dir || '/' || f), g, g, 255);
+ }
+ }
+ exec ('checkpoint');
+}
+;
]]></programlisting>
- </sect3>
- </sect2>
-</sect1>
+ <sect3 id="rdfperfdumpandreloadgraphsexamples"><title>Examples for Dump and Reload Graphs</title>
+SQL>dump_one_graph ('http://daas.openlinksw.com/data#', './bbc_data_', 1000000000);
+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>
+<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
+is made as fast as possible by grouping mappings by underlying tables so many
+properties from neighbor database columns can be extracted in one table scan.
+The size of the generated files is limited to 5MB. The dump process creates
+internal stored procedures; their texts are saved in file .dump_procedures.sql in
+the directory of dump files for debugging purposes.
+</para>
-<!--
-<sect1 id="rdfreplication"><title>RDF Replication</title>
-<para>
-Tables of RDF storage, such as DB.DBA.RDF_QUAD and DB.DBA.RDF_OBJ, can not be replicated in a usual way,
-because it's content is cached in memory in special ways and synchronized with values outside these tables,
-such as current values of special sequence objects.
-Moreover, same IRI may have different internal IRI_IDs on different boxes, because the assigned IDs vary if new IRIs appear in data in different order.
-Similarly, there will be different IDs of RDF literal, datatypes and languages, blocking any attempt of one-to-one replication between RDF storages.</para>
-<para>
-However, a special asynchronous RDF replication makes it possible to configure a "publisher" Virtuoso instance to keep the log of changes in some RDF graphs
-and subscribe some Virtuoso instances to replay all these changes.</para>
-<para>
-Configuration functions are quite straightforward.</para>
-<para>
-RDF graphs to replicate are all members of <http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group> graph group.
-That group can be filled in with graphs like any other graph group, but it is better to get the advantage of proper security check made by
+<para>Note that the dump directory must be included in the <code>DirsAllowed</code>
+parameter of the Virtuoso configuration file (e.g., <code>virtuoso.ini</code>), or the
+server will not be allowed to create nor access the dataset file(s).
</para>
-<funcprototype id="fproto_DB.DBA.RDF_REPL_GRAPH_INS">
- <funcdef>procedure <function>DB.DBA.RDF_REPL_GRAPH_INS</function></funcdef>
- <paramdef>in <parameter>memb_iri</parameter> varchar</paramdef>
-</funcprototype>
-<para>
-that inserts a graph to the group and</para>
-<funcprototype id="fproto_DB.DBA.RDF_REPL_GRAPH_DEL">
- <funcdef>procedure <function>DB.DBA.RDF_REPL_GRAPH_DEL</function></funcdef>
- <paramdef>in <parameter>memb_iri</parameter> varchar</paramdef>
-</funcprototype>
-<para>
-that removes a graph from the group.
-Only publicly readable graphs can be replicated, an error is signalled otherwise, and it is better to know about a security issue as early as possible.</para>
-<funcprototype id="fproto_DB.DBA.RDF_REPL_START">
- <funcdef>procedure <function>DB.DBA.RDF_REPL_START</function></funcdef>
- <paramdef>in <parameter>quiet</parameter> integer := 0</paramdef>
-</funcprototype>
-<para>
-starts the RDF replication at the publishing side.
-It creates replication "publication" named '__rdf_repl' and makes a log file '__rdf_repl.log' to record changes in replicated graphs.
-If the replication has been started before then an error is signalled; passing value 1 for parameter "quiet" elimintaes the error so the incorrect call has no effect at all.
-If the replication is enabled then the value of registry variable 'DB.DBA.RDF_REPL' indicates the moment of replication start.</para>
-<para>
-<function>DB.DBA.RDF_REPL_START</function>() performs a security check before starting the replication to check.</para>
-<funcprototype id="fproto_DB.DBA.RDF_REPL_STOP">
- <funcdef>procedure <function>DB.DBA.RDF_REPL_STOP</function></funcdef>
- <paramdef> in <parameter>quiet</parameter> integer := 0</paramdef>
-</funcprototype>
-<para>
-stops the RDF replication at the publishing side.
-It calls <function><link linkend="fn_repl_unpublish">repl_unpublish</link></function> but does not make empty reates replication "publication" named '__rdf_repl' and makes a log file '__rdf_repl.log' to record changes in replicated graphs.</para>
-<para>
-Replication is asynchronous and the order of insertion and removal operations at the subscriber's side may not match the order at the publisher.
-As a result, it is not recommended to make few subscriptions that writes changes of few publishers into one common graph.
-A client-side application can force the synchronuzation by calling</para>
-<funcprototype id="fproto_DB.DBA.RDF_REPL_SYNC">
- <funcdef>procedure <function>DB.DBA.RDF_REPL_SYNC</function></funcdef>
- <paramdef>in <parameter>publisher</parameter> varchar</paramdef>
- <paramdef>in <parameter>user</parameter> varchar</paramdef>
- <paramdef>in <parameter>pwd</parameter> varchar</paramdef>
-</funcprototype>
+
<para>
-that acts like <function><link linkend="fn_repl_sync">repl_sync</link></function> but for an RDF subscription.
-<function>DB.DBA.RDF_REPL_SYNC</function> will not only initial synchronisation but also wait for the end of subscription to guarantee that the total effect of INSERT and DELETE operations is correct even if these operations were made in an order that differs from the original one.</para>
-</sect1>
--->
-<sect1 id="rdfperformancetuning"><title>RDF Performance Tuning</title>
-<para>For RDF query performance, we have the following possible questions:</para>
-<itemizedlist mark="bullet" spacing="compact">
-<listitem>Is the Virtuoso process properly configured to handle big data sets?</listitem>
-<listitem>Is the graph always specified?</listitem>
-<listitem>Are public web service endpoints protected against bad queries?</listitem>
-<listitem>Are there patterns where only a predicate is given?</listitem>
-<listitem>Is there a bad query plan because of cost model error?</listitem>
+The <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtBulkRDFLoader">Virtuoso RDF bulk loader</ulink>
+scripts can then be used to load the dumped datasets for the RDFView graphs directly into
+a Virtuoso RDF QUAD store.
+</para>
+
+<sect3 id="rdfperfdumpandreloadgraphsn3params"><title>Parameters</title>
+<itemizedlist mark="bullet">
+ <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>
</itemizedlist>
-<sect2 id="rdfperfgeneral"><title>General</title>
- <para>When running with large data sets, one should configure the Virtuoso process to use between 2/3
- to 3/5 of system RAM and to stripe storage on all available disks.
- See <link linkend="VIRTINI">NumberOfBuffers</link>,
- <link linkend="VIRTINI">MaxDirtyBuffers</link>, and
- <link linkend="VIRTINI">Striping</link> INI file parameters.
- </para>
+</sect3>
+<sect3 id="rdfperfdumpandreloadgraphsn3code"><title>Procedure Code</title>
<programlisting><![CDATA[
-; default installation
-NumberOfBuffers = 2000
-MaxDirtyBuffers = 1200
-]]></programlisting>
- <para>Typical sizes for the <emphasis>NumberOfBuffers</emphasis> and
- <emphasis>MaxDirtyBuffers</emphasis> (3/4 of NumberOfBuffers) parameters in the Virtuoso
- configuration file (virtuoso.ini) for various memory sizes are as follows, with each buffer
- consisting of 8K bytes:
- </para>
- <table><title>recommended NumberOfBUffers and MaxDirtyBuffers</title>
- <tgroup cols="3">
- <thead>
- <row>
- <entry>System RAM</entry>
- <entry>NumberOfBuffers</entry>
- <entry>MaxDirtyBuffers</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>2 GB</entry><entry>170000</entry><entry>130000</entry>
- </row>
- <row>
- <entry>4 GB</entry><entry>340000</entry><entry>250000</entry>
- </row>
- <row>
- <entry>8 GB</entry><entry>680000</entry><entry>500000</entry>
- </row>
- <row>
- <entry>16 GB</entry><entry>1360000</entry><entry>1000000</entry>
- </row>
- <row>
- <entry>32 GB</entry><entry>2720000</entry><entry>2000000</entry>
- </row>
- <row>
- <entry>48 GB</entry><entry>4000000</entry><entry>3000000</entry>
- </row>
- <row>
- <entry>64 GB</entry><entry>5450000</entry><entry>4000000</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </sect2>
- <sect2 id="rdfperfrdfscheme"><title>RDF Index Scheme</title>
-<para>
-Starting with version 6.00.3126 the default RDF index scheme consists
-of 2 full indices over RDF quads plus 3 partial indices. This index
-scheme is generally adapted to all kinds of workloads, regardless of
-whether queries generally specify a graph.
-</para>
-
-<para>
-Alternate indexing schemes are possible but will not be generally needed.
-For upgrading old databases with a different index scheme see the corresponding documentation.
-</para>
-
-<para>
-The index scheme consists of the following indices:
-</para>
-
-<itemizedlist mark="bullet">
- <listitem><emphasis>PSOG</emphasis> - primary key</listitem>
- <listitem><emphasis>POGS</emphasis> - bitmap index for lookups on object value.</listitem>
- <listitem><emphasis>SP</emphasis> - partial index for cases where only S is specified.</listitem>
- <listitem><emphasis>OP</emphasis> - partial index for cases where only O is specified.</listitem>
- <listitem><emphasis>GS</emphasis> - partial index for cases where only G is specified.</listitem>
-</itemizedlist>
-
-<para>
-This index scheme is created by the following statements:
-</para>
-
-<programlisting><![CDATA[
-create table DB.DBA.RDF_QUAD (
- G IRI_ID_8,
- S IRI_ID_8,
- P IRI_ID_8,
- O any,
- primary key (P, S, O, G)
+CREATE PROCEDURE DB.DBA.RDF_QM_TREE_DUMP
+ ( in dest_dir VARCHAR,
+ in graph_iri VARCHAR := NULL,
+ in storage VARCHAR := NULL,
+ in root VARCHAR := NULL
)
-alter index RDF_QUAD on DB.DBA.RDF_QUAD partition (S int (0hexffff00));
-
-create distinct no primary key ref bitmap index RDF_QUAD_SP on RDF_QUAD (S, P) partition (S int (0hexffff00));
-create bitmap index RDF_QUAD_POGS on RDF_QUAD (P, O, G, S) partition (O varchar (-1, 0hexffff));
-create distinct no primary key ref bitmap index RDF_QUAD_GS on RDF_QUAD (G, S) partition (S int (0hexffff00));
-create distinct no primary key ref index RDF_QUAD_OP on RDF_QUAD (O, P) partition (O varchar (-1, 0hexffff));
+{
+ DECLARE all_qms,
+ grouped_qmvs,
+ launcher_text ANY;
+ DECLARE grp_ctr,
+ qm_ctr,
+ qm_count INTEGER;
+ DECLARE sql_file,
+ launcher_name VARCHAR;
+ IF (NOT (dest_dir LIKE '%/'))
+ dest_dir := dest_dir || '/';
+ sql_file := dest_dir || '.dump_procedures.sql';
+ IF (storage IS NULL)
+ storage := 'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage';
+ string_to_file (
+ sql_file,
+ '-- This file contains procedure created by DB.DBA.RDF_QM_TREE_DUMP() for storage '
+ || COALESCE (storage, 'NULL')
+ || ' and root quad map '
+ || COALESCE (root, 'NULL')
+ || '\n\n',
+ -2);
+ all_qms := dict_list_keys (DB.DBA.RDF_QM_CONTENT_OF_QM_TREE (graph_iri, storage, root), 2);
+ grouped_qmvs := DB.DBA.RDF_QM_GROUP_BY_SOURCE_TABLES (all_qms);
+ launcher_name := 'RDF_QM_TREE_DUMP_BATCH_' || md5 (serialize (graph_iri) || storage || serialize (root));
+ launcher_text := string_output ();
+ http ('CREATE PROCEDURE DB.DBA."' || launcher_name || '" (in dest_dir VARCHAR)\n{\n', launcher_text);
+ FOR (grp_ctr := length (grouped_qmvs); grp_ctr > 0; grp_ctr := grp_ctr-2)
+ {
+ DECLARE tables, qms, proc_text ANY;
+ DECLARE group_key, proc_name, dump_prefix, cmt VARCHAR;
+ tables := grouped_qmvs [grp_ctr-2];
+ qms := grouped_qmvs [grp_ctr-1];
+ qm_count := length (qms);
+ group_key := md5 (serialize (graph_iri) || storage || serialize (root) || serialize (tables));
+ proc_name := 'RDF_QM_TREE_DUMP_GRP_' || group_key;
+ proc_text := string_output ();
+ cmt := sprintf ('%d quad maps on join of', qm_count);
+ FOREACH (VARCHAR t IN tables) DO cmt := cmt || ' ' || t;
+ http (' -- ' || cmt || '\n', launcher_text);
+ http (' DB.DBA."' || proc_name || '" (dest_dir);\n', launcher_text);
+ http ('CREATE PROCEDURE DB.DBA."' || proc_name || '" (in dest_dir VARCHAR)\n', proc_text);
+ http ('{\n', proc_text);
+ http (' -- ' || cmt || '\n', proc_text);
+ http (' DECLARE ses, env ANY;\n', proc_text);
+ http (' DECLARE file_ctr, cmt_len INTEGER;\n', proc_text);
+ http (' file_ctr := 0;\n', proc_text);
+ http (' dbg_obj_princ (' || WS.WS.STR_SQL_APOS (cmt) || ', '', file '', file_ctr);\n', proc_text);
+ http (' ses := string_output ();\n', proc_text);
+ http (' http (' || WS.WS.STR_SQL_APOS ('#' || cmt || '\n') || ', ses);\n', proc_text);
+ http (' env := VECTOR (dict_new (16000), 0, '''', '''', '''', 0, 0, 0, 0);\n', proc_text);
+ http (' cmt_len := LENGTH (ses);\n', proc_text);
+ http (' FOR (SPARQL DEFINE input:storage <' || storage || '>\n', proc_text);
+ http (' SELECT ?s1, ?p1, ?o1\n', proc_text);
+ IF (graph_iri IS NOT NULL)
+ {
+ http (' WHERE { GRAPH <', proc_text); http_escape (graph_iri, 12, proc_text, 1, 1); http ('> {\n', proc_text);
+ }
+ ELSE
+ http (' WHERE { GRAPH ?g1 {\n', proc_text);
+ FOR (qm_ctr := 0; qm_ctr < qm_count; qm_ctr := qm_ctr + 1)
+ {
+ IF (qm_ctr > 0) http (' UNION\n', proc_text);
+ http (' { quad map <' || qms[qm_ctr] || '> { ?s1 ?p1 ?o1 } }\n', proc_text);
+ }
+ http (' } } ) DO {\n', proc_text);
+ http (' http_ttl_triple (env, "s1", "p1", "o1", ses);\n', proc_text);
+ http (' IF (LENGTH (ses) > 5000000)\n', proc_text);
+ http (' {\n', proc_text);
+ http (' http ('' .\\n'', ses);\n', proc_text);
+ http (' string_to_file (sprintf (''%s' || group_key || '_%05d.ttl'', dest_dir, file_ctr), ses, -2);\n', proc_text);
+ http (' file_ctr := file_ctr + 1;\n', proc_text);
+ http (' dbg_obj_princ (' || WS.WS.STR_SQL_APOS (cmt) || ', '', file '', file_ctr);\n', proc_text);
+ http (' ses := string_output ();\n', proc_text);
+ http (' http (' || WS.WS.STR_SQL_APOS ('#' || cmt || '\n') || ', ses);\n', proc_text);
+ http (' env := VECTOR (dict_new (16000), 0, '''', '''', '''', 0, 0, 0, 0);\n', proc_text);
+ http (' }\n', proc_text);
+ http (' }\n', proc_text);
+ http (' IF (LENGTH (ses) > cmt_len)\n', proc_text);
+ http (' {\n', proc_text);
+ http (' http ('' .\\n'', ses);\n', proc_text);
+ http (' string_to_file (sprintf (''%s' || group_key || '_%05d.ttl'', dest_dir, file_ctr), ses, -2);\n', proc_text);
+ http (' }\n', proc_text);
+ http ('}\n', proc_text);
+ proc_text := string_output_string (proc_text);
+ string_to_file (sql_file, proc_text || ';\n\n' , -1);
+ EXEC (proc_text);
+ }
+ http ('}\n', launcher_text);
+ launcher_text := string_output_string (launcher_text);
+ string_to_file (sql_file, launcher_text || ';\n\n' , -1);
+ EXEC (launcher_text);
+ CALL ('DB.DBA.' || launcher_name)(dest_dir);
+}
;
-]]></programlisting>
-
-
-<para>
-The idea is to favor queries where the predicate is specified in
-triple patterns. The entire quad can be efficiently accessed when P
-and either or both S and O are known. This has the advantage of
-clustering data by the predicate which improves working set: A page
-read from disk will only have entries pertaining to the same
-predicate, chances of accessing other entries of the page are thus
-higher than if the page held values for arbitrary predicates. For
-less frequent cases where only S is known, as in describe, the
-distinct P's of the S are found in the SP index. These SP pairs are
-then used for accessing the PSOG index to get the O and G. For cases
-where only the G is known, as in dropping a graph, the distinct S's of
-the G are found in the GS index. The P's of the S are then found in
-the SP index. After this the whole quad is found in the PSOG index.
-</para>
-
-<para>
-The SP, OP and GS indices do not store duplicates. If a S has many
-values of the P, there is only one entry. Extries are not deleted
-from SP, OP or GS. This does not lead to erroneous results since a
-full index, that is either POSG or PSOG is always consulted in order
-to know if a quad actually exists. For cases of updating data, most
-often a graph is entirely dropped and a substantially similar graph is
-inserted in its place. The SP, OP and GS indices get to stay relatively unaffected.
-</para>
-
-<para>
-Still over time specially if there are frequent updates and values do not repeat between
-consecutive states the SP, OP and GS indices will get polluted which may affect performance.
-Dropping and recreating the index will then remedy the situation.
-</para>
-
-<para>
-For cases where this is not practical the index scheme should only have full indices, i.e.
-each key holds all columns of the primary key of the quad. This will be the case if the
-distinct no primary key ref options are not specified in the create index statement. In
-such cases all indices remain in strict sync across deletes.
-</para>
-
-<para>
-Many RDF workloads have bulk load and read intensive access patterns with few deletes.
-The default index scheme is optimized for these. With these situations this scheme offers
-significant space savings resulting in better working set. Typically this layout takes
-60-70% of the space of a layout with 4 full indices.
-</para>
- </sect2>
- <sect2 id="rdfperfindexes"><title>Index Scheme Selection</title>
- <para>The indexes in place on the RDF_QUAD table can greatly affect the performance of
- SPARQL queries, as can be determined by running the STATISTICS command on the table as follows:
- </para>
-<programlisting><![CDATA[
-SQL> STATISTICS DB.DBA.RDF_QUAD;
-Showing SQLStatistics of table(s) 'DB.DBA.RDF_QUAD'
-TABLE_QUALIFIER TABLE_OWNER TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY PAGES FILTER_CONDITION
-VARCHAR VARCHAR VARCHAR SMALLINT VARCHAR VARCHAR SMALLINT SMALLINT VARCHAR VARCHAR INTEGER INTEGER VARCHAR
-_______________________________________________________________________________
-
-DB DBA RDF_QUAD NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL
-DB DBA RDF_QUAD 0 DB RDF_QUAD 3 1 P NULL NULL NULL NULL
-DB DBA RDF_QUAD 0 DB RDF_QUAD 3 2 S NULL NULL NULL NULL
-DB DBA RDF_QUAD 0 DB RDF_QUAD 3 3 O NULL NULL NULL NULL
-DB DBA RDF_QUAD 0 DB RDF_QUAD 3 4 G NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_GS 3 1 G NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_GS 3 2 S NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_OP 3 1 O NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_OP 3 2 P NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_POGS 3 1 P NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_POGS 3 2 O NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_POGS 3 3 G NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_POGS 3 4 S NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_SP 3 1 S NULL NULL NULL NULL
-DB DBA RDF_QUAD 1 DB RDF_QUAD_SP 3 2 P NULL NULL NULL NULL
-
-15 Rows. -- 24 msec.
-SQL>
-]]></programlisting>
-<para>With only one index (OGPS) created by default, if the graph is always given, as with one or more
- <emphasis>FROM</emphasis> or <emphasis>FROM NAMED</emphasis> clauses, and there are no patterns where
- only graph and predicate are given, then the default indices should be sufficient. If predicate and
- graph are given but subject is not, then it is sometimes useful to add:</para>
-<programlisting><![CDATA[
-CREATE BITMAP INDEX RDF_QUAD_PGOS
- ON DB.DBA.RDF_QUAD (G, P, O, S)
- PARTITION (O VARCHAR (-1, 0hexffff));
-]]></programlisting>
-
-<note><para>Note: If the server version is pre-5.0.7, leave out the partitioning clause.</para></note>
-
-<para>Making the PGOS index can help in some cases even if it is not readily apparent from the queries
- that one is needed. This is so, for example, if the predicate by itself is selective, i.e. there is
- a predicate that occurs in only a few triples.</para>
-<para>If the graph itself is not given in the queries, then the default index scheme will be unworkable.
-For this, the appropriate scheme is:</para>
-<programlisting><![CDATA[
-CREATE TABLE RDF_QUAD
- (
- G IRI_ID_8,
- S IRI_ID_8,
- P IRI_ID_8,
- O ANY,
- PRIMARY KEY (S, P, O, G)
- )
-ALTER INDEX RDF_QUAD
- ON RDF_QUAD
- PARTITION (S INT (0hexffff00));
-
-CREATE BITMAP INDEX RDF_QUAD_OPGS
- ON DB.DBA.RDF_QUAD (O, P, G, S)
- PARTITION (O VARCHAR (-1, 0hexffff));
-
-CREATE BITMAP INDEX RDF_QUAD_POGS
- ON DB.DBA.RDF_QUAD (P, O, G, S)
- PARTITION (O VARCHAR (-1, 0hexffff));
-
-CREATE BITMAP INDEX RDF_QUAD_GPOS
- ON DB.DBA.RDF_QUAD (G, P, O, S)
- PARTITION (O VARCHAR (-1, 0hexffff));
-]]></programlisting>
-
-<note><para>Note: If the server version is pre-5.0.7, leave out the <emphasis>PARTITION</emphasis>
-clauses and the <emphasis>ALTER INDEX</emphasis> statement.</para></note>
-
-<para>Public web service endpoints are proven to be sources of especially bad queries. While local
-application develpers can obtain instructions from database administrator and use ISQL access to
-the database in order to tune execution plans, "external" clients do not know details of
-configuration and/or lacks appropriate skills. The most common problem is that public endpoints usually
-get requests that does not mention the required graph, because that queries were initially written for
-use with triple stores. If the web service provides access to a single graph (or to a short list of graphs)
-then it is strongly recommended to configure it by adding a row into
-<emphasis>DB.DBA.SYS_SPARQL_HOST</emphasis>:</para>
-<programlisting><![CDATA[
-CREATE TABLE "DB"."DBA"."SYS_SPARQL_HOST"
-(
- "SH_HOST" VARCHAR, -- host pattern
- "SH_GRAPH_URI" VARCHAR, -- default graph
- "SH_USER_URI" VARCHAR, -- reserved for any use in applications
- "SH_DEFINES" LONG VARCHAR, -- list of 'define xx:yy "zz" ' defines as a string
- PRIMARY KEY ("SH_HOST")
-);
-
-]]></programlisting>
-<para>You can find detailed descriptions of the table columns <link linkend="rdfdefaultgraph">here</link>.</para>
-<para>The idea is that if the client specifies default graph in
-the request or uses named graphs and group graph patterns then he is probably smarter than average and
-will provide meaningful queries. If no graph names are specified then the query will benefit from
-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 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>
-
-<sect2 id="rdfperfcost"><title>Erroneous Cost Estimates and Explicit Join Order</title>
- <para>The selectivity of triple patterns is determined at query compile time from sampling the data.
-It is possible that misleading data is produced. To see if the cardinality guesses are generally valid,
-look at the query plan with <link linkend="fn_explain"><function>explain</function> ()</link>.</para>
-<para>Below is a sample from the LUBM qualification data set in the Virtuoso distribution.
-After running <emphasis>make test</emphasis> in <emphasis>binsrc/test/lubm</emphasis>, there is a
-loaded database with the data. Start a server in the same directory to see the data.</para>
-
-<programlisting><![CDATA[
-SQL> EXPLAIN
- ('SPARQL
- PREFIX ub: <http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#>
- SELECT *
- FROM <lubm>
- WHERE { ?x rdf:type ub:GraduateStudent }
- ');
-
-REPORT
-VARCHAR
-_______________________________________________________________________________
-
-{
-
-Precode:
- 0: $25 "callret" := Call __BOX_FLAGS_TWEAK (<constant (lubm)>, <constant (1)>)
- 5: $26 "lubm" := Call DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE ($25 "callret")
- 12: $27 "callret" := Call __BOX_FLAGS_TWEAK (<constant (http://www.w3.org/1999/02/22-rdf-syntax-ns#type)>, <constant (1)>)
- 17: $28 "-ns#type" := Call DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE ($27 "callret")
- 24: $29 "callret" := Call __BOX_FLAGS_TWEAK (<constant (http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#GraduateStudent)>, <constant (1)>)
- 29: $30 "owl#GraduateStudent" := Call DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE ($29 "callret")
- 36: BReturn 0
-from DB.DBA.RDF_QUAD by RDF_QUAD_OGPS 1.9e+03 rows
-Key RDF_QUAD_OGPS ASC ($32 "s-3-1-t0.S")
-<col=415 O = $30 "owl#GraduateStudent"> , <col=412 G = $26 "lubm"> , <col=414 P = $28 "-ns#type">
-row specs: <col=415 O LIKE <constant (T)>>
-
-Current of: <$34 "<DB.DBA.RDF_QUAD s-3-1-t0>" spec 5>
-
-After code:
- 0: $35 "x" := Call ID_TO_IRI ($32 "s-3-1-t0.S")
- 5: BReturn 0
-Select ($35 "x", <$34 "<DB.DBA.RDF_QUAD s-3-1-t0>" spec 5>)
-}
-
-22 Rows. -- 1 msec.
-]]></programlisting>
-<para>This finds the graduate student instances in the LUBM graph. First the query
- converts the IRI literals to IDs. Then, using a match of OG on OGPS, it finds the
- IRIs of the graduate students. Then, it converts the IRI ID to return to the string form.</para>
-<para>The cardinality estimate of 1.9e+03 rows is on the FROM line.</para>
-<para>Doing an EXPLAIN() on the queries will show the cardinality estimates. To drill down further, one can split the query into smaller chunks and see the estimates for these, up to doing it at the triple pattern level.
-To indicate a variable that is bound but whose value is not a literal known at compile time, one can use the parameter marker <emphasis>??</emphasis>.</para>
-
-<programlisting><![CDATA[
-SQL> EXPLAIN
- ('
- SPARQL
- DEFINE sql:table-option "order"
- PREFIX ub: <http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#>
- SELECT *
- FROM <lubm>
- WHERE { ?x rdf:type ?? }
- ');
-]]></programlisting>
-
-<para>This will not know the type but will know that a type will be
-provided. So instead of guessing 1900 matches, this will guess a
-smaller number, which is obviously less precise. Thus literals are generally better.</para>
-<para>In some cases, generally to work around an optimization error, one can specify an explicit
- <emphasis>JOIN</emphasis> order. This is done with the <emphasis>sql:select-option "order"</emphasis>
- clause in the SPARQL query prefix.</para>
-
-<programlisting><![CDATA[
-SQL> SELECT SPARQL_to_sql_text
- ('
- DEFINE sql:select-option "order"
- PREFIX ub: <http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#>
- SELECT *
- FROM <lubm>
- WHERE
- {
- ?x rdf:type ub:GraduateStudent .
- ?x ub:takesCourse <http://www.Department0.University0.edu/GraduateCourse0>
- }
- ');
-]]></programlisting>
-
-<para>shows the SQL text with the order option at the end.</para>
-<para>If an estimate is radically wrong then this should be reported as a bug.</para>
-<para>If there is a FROM with a KEY on the next line and no column specs then this is a full table scan.
- The more columns are specified the less rows will be passed to the next operation in the chain. In
- the example above, there are three columns whose values are known before reading the table and
- these columns are leading columns of the index in use so column specs are:</para>
-<programlisting><![CDATA[
-<col=415 O = $30 "owl#GraduateStudent"> ,
-<col=412 G = $26 "lubm"> ,
-<col=414 P = $28 "-ns#type">
-]]></programlisting>
-<note><para>Note: A KEY with only a row spec is a full table scan with the row spec applied as a filter.
-This is usually not good unless this is specifically intended.</para></note>
-<para>If queries are compiled to make full table scans when this is not specifically intended, this should be reported as a bug.
-The explain () output and the query text should be included in the report.</para>
-<para>Consider:</para>
-
-<programlisting><![CDATA[
-SQL> EXPLAIN
- ('
- SPARQL
- DEFINE sql:select-option "order, loop"
- PREFIX ub: <http://www.lehigh.edu/~zhp2/2004/0401/univ-bench.owl#>
- SELECT *
- FROM <lubm>
- WHERE
- {
- ?x ub:takesCourse ?c .
- ?x rdf:type ub:GraduateStudent
- }
- ');
-]]></programlisting>
-
-<para>One will see in the output that the first table access is to retrieve
-all in the LUBM graph which take some course and then later to check
-if this is a graduate student. This is obviously not the preferred
-order but the <emphasis>sql:select-option "order"</emphasis> forces the optimizer to join
-from left to right.</para>
-<para>It is very easy to end up with completely unworkable query plans in
-this manner but if the optimizer really is in error, then this is the
-only way of overriding its preferences. The effect of <emphasis>sql:select-option</emphasis> is pervasive, extending inside unions, optionals, subqueries etc within the statement.</para>
-<para>We note that if, in the above query, both the course taken by the
-student and the type of the student are given, the query compilation
-will be, at least for all non-cluster cases, an index intersection.
-This is not overridden by the sql:select-option clause since an index
-intersection is always a safe guess, regardless of the correctness of
-the cardinality guesses of the patterns involved.</para>
-</sect2>
-<sect2 id="rdfperfgetallgraphs"><title>Get All Graphs</title>
-<para>In order to get all graphs URIs, one might use the Virtuoso
-<link linkend="fn_sparql_select_known_graphs"><function>DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS()</function></link>
-built-in function.</para>
-</sect2>
-<sect2 id="rdfperfdumpandreloadgraphs"><title>Dump and Reload Graphs</title>
-In order to dump all graphs with extension exclude those graphs of a certain type by using a
-sparql ask query, you may use the following script sequence:
-<programlisting><![CDATA[
-CREATE PROCEDURE dump_graphs
- ( IN dir VARCHAR := 'dumps' ,
- IN file_length_limit INTEGER := 1000000000
- )
-{
- DECLARE inx INT;
- inx := 1;
- SET ISOLATION = 'uncommitted';
- FOR ( SELECT *
- FROM ( SPARQL DEFINE input:storage ""
- SELECT DISTINCT ?g { GRAPH ?g { ?s ?p ?o } .
- FILTER ( ?g != virtrdf: )
- }
- ) AS sub OPTION ( LOOP )) DO
- {
- dump_one_graph ( "g",
- sprintf ('%s/graph%06d_', dir, inx),
- file_length_limit
- );
- inx := inx + 1;
- }
-}
-;
-
-
-CREATE PROCEDURE dump_one_graph
- ( IN srcgraph VARCHAR ,
- IN out_file VARCHAR ,
- IN file_length_limit INTEGER := 1000000000
- )
-{
- DECLARE file_name varchar;
- DECLARE env, ses any;
- DECLARE ses_len,
- max_ses_len,
- file_len,
- file_idx integer;
- SET ISOLATION = 'uncommitted';
- max_ses_len := 10000000;
- file_len := 0;
- file_idx := 1;
- file_name := sprintf ('%s%06d.ttl', out_file, file_idx);
- string_to_file ( file_name || '.graph',
- srcgraph,
- -2
- );
- string_to_file ( file_name,
- sprintf ( '# Dump of graph <%s>, as of %s\n',
- srcgraph,
- CAST (NOW() AS VARCHAR)
- ),
- -2
- );
- env := vector (dict_new (16000), 0, '', '', '', 0, 0, 0, 0);
- ses := string_output ();
- FOR (SELECT * FROM ( SPARQL DEFINE input:storage ""
- SELECT ?s ?p ?o { GRAPH `iri(?:srcgraph)` { ?s ?p ?o } }
- ) AS sub OPTION (LOOP)) DO
- {
- http_ttl_triple (env, "s", "p", "o", ses);
- ses_len := length (ses);
- IF (ses_len > max_ses_len)
- {
- file_len := file_len + ses_len;
- IF (file_len > file_length_limit)
- {
- http (' .\n', ses);
- string_to_file (file_name, ses, -1);
- file_len := 0;
- file_idx := file_idx + 1;
- file_name := sprintf ('%s%06d.ttl', out_file, file_idx);
- string_to_file ( file_name,
- sprintf ( '# Dump of graph <%s>, as of %s (part %d)\n',
- srcgraph,
- CAST (NOW() AS VARCHAR),
- file_idx),
- -2
- );
- env := vector (dict_new (16000), 0, '', '', '', 0, 0, 0, 0);
- }
- ELSE
- string_to_file (file_name, ses, -1);
- ses := string_output ();
- }
- }
- IF (LENGTH (ses))
- {
- http (' .\n', ses);
- string_to_file (file_name, ses, -1);
- }
-}
-;
-
-create procedure load_graphs (in dir varchar := 'dumps/')
-{
- declare arr any;
- declare g varchar;
-
- arr := sys_dirlist (dir, 1);
- log_enable (2, 1);
- foreach (varchar f in arr) do
- {
- if (f like '*.ttl')
- {
- declare continue handler for sqlstate '*'
- {
- log_message (sprintf ('Error in %s', f));
- };
- g := file_to_string (dir || '/' || f || '.graph');
- DB.DBA.TTLP_MT (file_open (dir || '/' || f), g, g, 255);
- }
- }
- exec ('checkpoint');
-}
-;
-]]></programlisting>
- <sect3 id="rdfperfdumpandreloadgraphsexamples"><title>Examples for Dump and Reload Graphs</title>
-SQL>dump_one_graph ('http://daas.openlinksw.com/data#', './bbc_data_', 1000000000);
-SQL>dump_one_graph ('http://daas.openlinksw.com/data#', './bbc_data_');
- </sect3>
-</sect2>
-<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
-is made as fast as possible by grouping mappings by underlying tables so many
-properties from neighbor database columns can be extracted in one table scan.
-The size of the generated files is limited to 5MB. The dump process creates
-internal stored procedures; their texts are saved in file .dump_procedures.sql in
-the directory of dump files for debugging purposes.
-</para>
-
-<para>Note that the dump directory must be included in the <code>DirsAllowed</code>
-parameter of the Virtuoso configuration file (e.g., <code>virtuoso.ini</code>), or the
-server will not be allowed to create nor access the dataset file(s).
-</para>
-
-<para>
-The <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtBulkRDFLoader">Virtuoso RDF bulk loader</ulink>
-scripts can then be used to load the dumped datasets for the RDFView graphs directly into
-a Virtuoso RDF QUAD store.
-</para>
-
-<sect3 id="rdfperfdumpandreloadgraphsn3params"><title>Parameters</title>
-<itemizedlist mark="bullet">
- <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 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>
-<programlisting><![CDATA[
-CREATE PROCEDURE DB.DBA.RDF_QM_TREE_DUMP
- ( in dest_dir VARCHAR,
- in graph_iri VARCHAR := NULL,
- in storage VARCHAR := NULL,
- in root VARCHAR := NULL
- )
-{
- DECLARE all_qms,
- grouped_qmvs,
- launcher_text ANY;
- DECLARE grp_ctr,
- qm_ctr,
- qm_count INTEGER;
- DECLARE sql_file,
- launcher_name VARCHAR;
- IF (NOT (dest_dir LIKE '%/'))
- dest_dir := dest_dir || '/';
- sql_file := dest_dir || '.dump_procedures.sql';
- IF (storage IS NULL)
- storage := 'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage';
- string_to_file (
- sql_file,
- '-- This file contains procedure created by DB.DBA.RDF_QM_TREE_DUMP() for storage '
- || COALESCE (storage, 'NULL')
- || ' and root quad map '
- || COALESCE (root, 'NULL')
- || '\n\n',
- -2);
- all_qms := dict_list_keys (DB.DBA.RDF_QM_CONTENT_OF_QM_TREE (graph_iri, storage, root), 2);
- grouped_qmvs := DB.DBA.RDF_QM_GROUP_BY_SOURCE_TABLES (all_qms);
- launcher_name := 'RDF_QM_TREE_DUMP_BATCH_' || md5 (serialize (graph_iri) || storage || serialize (root));
- launcher_text := string_output ();
- http ('CREATE PROCEDURE DB.DBA."' || launcher_name || '" (in dest_dir VARCHAR)\n{\n', launcher_text);
- FOR (grp_ctr := length (grouped_qmvs); grp_ctr > 0; grp_ctr := grp_ctr-2)
- {
- DECLARE tables, qms, proc_text ANY;
- DECLARE group_key, proc_name, dump_prefix, cmt VARCHAR;
- tables := grouped_qmvs [grp_ctr-2];
- qms := grouped_qmvs [grp_ctr-1];
- qm_count := length (qms);
- group_key := md5 (serialize (graph_iri) || storage || serialize (root) || serialize (tables));
- proc_name := 'RDF_QM_TREE_DUMP_GRP_' || group_key;
- proc_text := string_output ();
- cmt := sprintf ('%d quad maps on join of', qm_count);
- FOREACH (VARCHAR t IN tables) DO cmt := cmt || ' ' || t;
- http (' -- ' || cmt || '\n', launcher_text);
- http (' DB.DBA."' || proc_name || '" (dest_dir);\n', launcher_text);
- http ('CREATE PROCEDURE DB.DBA."' || proc_name || '" (in dest_dir VARCHAR)\n', proc_text);
- http ('{\n', proc_text);
- http (' -- ' || cmt || '\n', proc_text);
- http (' DECLARE ses, env ANY;\n', proc_text);
- http (' DECLARE file_ctr, cmt_len INTEGER;\n', proc_text);
- http (' file_ctr := 0;\n', proc_text);
- http (' dbg_obj_princ (' || WS.WS.STR_SQL_APOS (cmt) || ', '', file '', file_ctr);\n', proc_text);
- http (' ses := string_output ();\n', proc_text);
- http (' http (' || WS.WS.STR_SQL_APOS ('#' || cmt || '\n') || ', ses);\n', proc_text);
- http (' env := VECTOR (dict_new (16000), 0, '''', '''', '''', 0, 0, 0, 0);\n', proc_text);
- http (' cmt_len := LENGTH (ses);\n', proc_text);
- http (' FOR (SPARQL DEFINE input:storage <' || storage || '>\n', proc_text);
- http (' SELECT ?s1, ?p1, ?o1\n', proc_text);
- IF (graph_iri IS NOT NULL)
- {
- http (' WHERE { GRAPH <', proc_text); http_escape (graph_iri, 12, proc_text, 1, 1); http ('> {\n', proc_text);
- }
- ELSE
- http (' WHERE { GRAPH ?g1 {\n', proc_text);
- FOR (qm_ctr := 0; qm_ctr < qm_count; qm_ctr := qm_ctr + 1)
- {
- IF (qm_ctr > 0) http (' UNION\n', proc_text);
- http (' { quad map <' || qms[qm_ctr] || '> { ?s1 ?p1 ?o1 } }\n', proc_text);
- }
- http (' } } ) DO {\n', proc_text);
- http (' http_ttl_triple (env, "s1", "p1", "o1", ses);\n', proc_text);
- http (' IF (LENGTH (ses) > 5000000)\n', proc_text);
- http (' {\n', proc_text);
- http (' http ('' .\\n'', ses);\n', proc_text);
- http (' string_to_file (sprintf (''%s' || group_key || '_%05d.ttl'', dest_dir, file_ctr), ses, -2);\n', proc_text);
- http (' file_ctr := file_ctr + 1;\n', proc_text);
- http (' dbg_obj_princ (' || WS.WS.STR_SQL_APOS (cmt) || ', '', file '', file_ctr);\n', proc_text);
- http (' ses := string_output ();\n', proc_text);
- http (' http (' || WS.WS.STR_SQL_APOS ('#' || cmt || '\n') || ', ses);\n', proc_text);
- http (' env := VECTOR (dict_new (16000), 0, '''', '''', '''', 0, 0, 0, 0);\n', proc_text);
- http (' }\n', proc_text);
- http (' }\n', proc_text);
- http (' IF (LENGTH (ses) > cmt_len)\n', proc_text);
- http (' {\n', proc_text);
- http (' http ('' .\\n'', ses);\n', proc_text);
- http (' string_to_file (sprintf (''%s' || group_key || '_%05d.ttl'', dest_dir, file_ctr), ses, -2);\n', proc_text);
- http (' }\n', proc_text);
- http ('}\n', proc_text);
- proc_text := string_output_string (proc_text);
- string_to_file (sql_file, proc_text || ';\n\n' , -1);
- EXEC (proc_text);
- }
- http ('}\n', launcher_text);
- launcher_text := string_output_string (launcher_text);
- string_to_file (sql_file, launcher_text || ';\n\n' , -1);
- EXEC (launcher_text);
- CALL ('DB.DBA.' || launcher_name)(dest_dir);
-}
-;
-
-CREATE FUNCTION DB.DBA.RDF_QM_CONTENT_OF_QM_TREE
- ( in graph_iri VARCHAR := NULL,
- in storage VARCHAR := NULL,
- in root VARCHAR := NULL,
- in dict ANY := NULL
- ) returns ANY
+CREATE FUNCTION DB.DBA.RDF_QM_CONTENT_OF_QM_TREE
+ ( in graph_iri VARCHAR := NULL,
+ in storage VARCHAR := NULL,
+ in root VARCHAR := NULL,
+ in dict ANY := NULL
+ ) returns ANY
{
DECLARE res, subqms any;
DECLARE graphiri varchar;
@@ -19390,5020 +20090,3146 @@ CREATE FUNCTION DB.DBA.RDF_QM_CONTENT_OF_QM_TREE
subqms := ((SELECT DB.DBA.VECTOR_AGG (sub."qmiri")
FROM (
SPARQL DEFINE input:storage ""
- SELECT DISTINCT (str(?qm)) as ?qmiri
- WHERE { GRAPH `iri(?:graphiri)` {
- `iri(?:root)` virtrdf:qmUserSubMaps ?lst .
- ?lst ?p ?qm .
- FILTER (0 = bif:strstr (str(?p), str(rdf:_)))
- } } ) AS sub ) );
- FOREACH (VARCHAR qmid IN subqms) DO
- DB.DBA.RDF_QM_CONTENT_OF_QM_TREE (graph_iri, storage, qmid, dict);
- RETURN dict;
-}
-;
-
-CREATE FUNCTION DB.DBA.RDF_QM_GROUP_BY_SOURCE_TABLES (in qms ANY) returns ANY
-{
- DECLARE res ANY;
- DECLARE ctr INTEGER;
- DECLARE graphiri VARCHAR;
- graphiri := DB.DBA.JSO_SYS_GRAPH();
- res := dict_new (LENGTH (qms) / 20);
- FOREACH (VARCHAR qmiri IN qms) DO
- {
- DECLARE tbls, acc ANY;
- tbls := ((SELECT DB.DBA.VECTOR_AGG (sub."tbl")
- FROM (SELECT subsub."tbl"
- FROM (
- SPARQL DEFINE input:storage ""
- SELECT DISTINCT ?tbl
- WHERE { GRAPH `iri(?:graphiri)` {
- { `iri(?:qmiri)` virtrdf:qmTableName ?tbl .
- } UNION {
- `iri(?:qmiri)` virtrdf:qmATables ?atbls .
- ?atbls ?p ?atbl .
- ?atbl virtrdf:qmvaTableName ?tbl
- } UNION {
- `iri(?:qmiri)` ?fldmap ?qmv .
- ?qmv virtrdf:qmvATables ?atbls .
- ?atbls ?p ?atbl .
- ?atbl virtrdf:qmvaTableName ?tbl .
- } } } ) subsub
- ORDER BY 1 ) AS sub ) );
- acc := dict_get (res, tbls);
- IF (acc IS NULL)
- vectorbld_init (acc);
- vectorbld_acc (acc, qmiri);
- dict_put (res, tbls, acc);
- }
- res := dict_to_vector (res, 2);
- FOR (ctr := LENGTH (res); ctr > 0; ctr := ctr-2)
- {
- DECLARE acc ANY;
- acc := aref_set_0 (res, ctr-1);
- vectorbld_final (acc);
- aset_zap_arg (res, ctr-1, acc);
- }
- RETURN res;
-}
-;
-
---test dbg_obj_princ (DB.DBA.RDF_QM_GROUP_BY_SOURCE_TABLES (dict_list_keys (DB.DBA.RDF_QM_CONTENT_OF_QM_TREE (null), 2)));
---test dbg_obj_princ (dict_list_keys (DB.DBA.RDF_QM_CONTENT_OF_QM_TREE (null), 2));
---test DB.DBA.RDF_QM_TREE_DUMP ('dump/demo', null, null, null);
---test DB.DBA.RDF_QM_TREE_DUMP ('dump/tpch', 'http://localhost:8600/tpch', null, null);
-]]></programlisting>
-</sect3>
-</sect2>
- <sect2 id="rdfperfloading"><title>Loading RDF</title>
- <para>There are many functions for loading RDF text, in RDF/XML and Turtle.</para>
- <para>For loading RDF/XML, the best way is to split the data to be loaded into
-multiple streams and load these in parallel using <link linkend="fn_rdf_load_rdfxml"><function>RDF_LOAD_RDFXML ()</function></link>.
-To avoid running out of rollback space for large files and in order to have multiple concurrent loads not
-interfere with each other, the row autocommit mode should be enabled.</para>
- <para>For example, </para>
-<programlisting><![CDATA[
-log_enable (2);
--- switch row-by-row autocommit on and logging off for this session
-DB.DBA.RDF_LOAD_RDFXML (file_to_string_output ('file.xml'), 'base_uri', 'target_graph');
--- more files here ...
-checkpoint;
-]]></programlisting>
-<para>Loading a file with text like the above with isql will load the data. Since the transaction
-logging is off, make a manual checkpoint at the end to ensure that data is persisted upon server
-restart since there is no roll forward log.</para>
-<para>If large amounts of data are to be loaded, run multiple such streams in parallel. One may have
-for example 6 streams for 4 cores. This means that if up to two threads wait for disk, there is still work
-for all cores.</para>
-<para>Having substantially more threads than processors or disks is not particularly useful.</para>
-<para>There exist multithreaded load functions which will load one file on multiple threads:
-<link linkend="rdfapidataimportttlpmt">the DB.DBA.TTLP_MT() function</link> and
-<link linkend="rdfapidataimportxmlttlpmt">the DB.DBA.RDF_LOAD_RDFXML_MT() function</link>. Experience
-shows that loading multiple files on one thread per file is better.</para>
-<para>For loading Turtle, some platforms may have a non-reentrant Turtle parser. This means that only
-one load may run at a time. One can try this by calling
-<link linkend="rdfapidataimport"><function>ttlp ()</function></link> from two sessions at the same time.
-If these do not execute concurrently, then the best way may be to try
-<link linkend="rdfapidataimport"><function>ttlp_mt</function></link> and see if this runs faster than
-a single threaded ttlp call.</para>
- <sect3 id="rdfperfloadingutility"><title>RDF Bulk Load Utility</title>
- <para>The RDF loader utility facilitates parallel bulk loading of multiple RDF files. The utility
- maintains a database table containing a list of files to load and the status of each file,
- whether not loaded, loaded or loaded with error. The table also records load start and
- end times.</para>
- <para>One must have a dba group login for using this and the virtuoso.ini file access
- control list must be set up so that the Virtuoso server can open the files to load.</para>
- <para>Files are added to the load list with the function <link linkend="fn_ld_dir"><function>ld_dir</function></link>:</para>
-<programlisting><![CDATA[
-ld_dir (in dir_path varchar, in file_mask varchar, in target_graph varchar);
-]]></programlisting>
- <para>The file mask is a SQL like pattern to match against the files in the directory.
- For example:</para>
-<programlisting><![CDATA[
-ld_dir ('/data8/2848260', '%.gz', 'http://bsbm.org');
-]]></programlisting>
- <para>would load the RDF in all files ending in .gz from the directory given as first parameter.
- The RDF would be loaded in the http://bsbm.org graph.</para>
- <para>If NULL is given for the graph, each file may go to a different graph specified in a
- separate file with the name of the RDF source file plus the extension .graph.</para>
- <para>A .graph file contains the target graph URI without any other content or whitespace.</para>
- <para>The layout of the load_list table is as follows:</para>
-<programlisting><![CDATA[
-create table DB.DBA.LOAD_LIST (
- ll_file varchar,
- ll_graph varchar,
- ll_state int default 0, -- 0 not started, 1 going, 2 done
- ll_started datetime,
- ll_done datetime,
- ll_host int,
- ll_work_time integer,
- ll_error varchar,
- primary key (ll_file))
-alter index LOAD_LIST on DB.DBA.LOAD_LIST partition (ll_file varchar)
-create index LL_STATE on DB.DBA.LOAD_LIST (ll_state, ll_file, ll_graph) partition (ll_state int)
-;
-]]></programlisting>
- <para>This table may be checked at any time during bulk load for the progress of the load.
- ll_state is 1 for files being loaded and 2 for files whose loading has finished.
- ll_error is NULL if the load finished without error, else it is the error message.</para>
- <para>In order to load data from the files in load_list, run as dba:</para>
-<programlisting><![CDATA[
-DB.DBA.rdf_loader_run ();
-]]></programlisting>
- <para>One may run several of these commands on parallel sessions for better throughput.</para>
- <para>On a cluster one can do:</para>
-<programlisting><![CDATA[
-cl_exec ('rdf_ld_srv ()');
-]]></programlisting>
- <para>This will start one rdf_loader_run on each node of the cluster. Note that in such a
- setting all the server processes must see the same files at the same path.</para>
- <para>On an isql session one may execute rdf_loader_run () & several times, forking a new
- isql for each such command, similarly to what a Unix shell does.</para>
- <para>Because this load is non-transactional and non-logged, one must do an explicit checkpoint
- after the load to guarantee a persistent state.</para>
- <para>On a single server do:</para>
-<programlisting><![CDATA[
-checkpoint;
-]]></programlisting>
- <para>On a cluster do:</para>
-<programlisting><![CDATA[
-cl_exec ('checkpoint');
-]]></programlisting>
- <para>The server(s) are online and can process queries and transactions while a bulk load
- is in progress. Periodic checkpoints may occur during the load but the state is guaranteed
- to be consistent only after running a checkpoint after all the bulk load threads
- have finished.</para>
- <para>A bulk load should not be forcibly stopped. To make a controlled stop, run:</para>
-<programlisting><![CDATA[
-rdf_load_stop ();
-]]></programlisting>
- <para>This will cause the files being loaded at the time to finish load but no new loads
- will start until explicitly started with <function>rdf_loader_run ()</function>.</para>
- <para>Specially note that on a cluster the database will be inconsistent if one server
- process does a checkpoint and another does not. Thus guaranteeing a checkpoint on all
- is necessary. This is easily done with an isql script with the following content:</para>
-<programlisting><![CDATA[
-ld_dir ('/data8/2848260', '%.gz', 'http://bsbm.org');
-
--- Record CPU time
-select getrusage ()[0] + getrusage ()[1];
-
-rdf_loader_run () &
-rdf_loader_run () &
-rdf_loader_run () &
-rdf_loader_run () &
-rdf_loader_run () &
-rdf_loader_run () &
-rdf_loader_run () &
-rdf_loader_run () &
-
-wait_for_children;
-checkpoint;
-
--- Record CPU time
-select getrusage ()[0] + getrusage ()[1];
-]]></programlisting>
- <para>For a cluster, the equivalent is:</para>
-<programlisting><![CDATA[
-ld_dir ('/data8/2848260', '%.gz', 'http://bsbm.org');
-
-cl_exec ('DB.DBA.RDF_LD_SRV (2)');
-
-cl_exec ('checkpoint');
-]]></programlisting>
- <para><function>rdf_loader_run ()</function> recognizes several file types, including .ttl, .nt, .xml, .rdf,
- .owl, .nq, .n4, and others. Internally the function uses
- <link linkend="fn_ttlp"><function>DB.DBA.ttlp()</function></link> or
- <link linkend="fn_rdf_load_rdfxml"><function>DB.DBA.rdf_load_rdfxml</function></link>,
- as appropriate.</para>
- <para>See <link linkend="rdfperfloadinglod">the next section</link> for detailed description
- of the <function>rdf_loader_run ()</function> function.</para>
- </sect3>
- <sect3 id="rdfperfloadinglod"><title>Loading LOD RDF data</title>
-<para>To load the rdf data to LOD instance, perform the following steps:
-</para>
-<itemizedlist mark="bullet">
- <listitem>Configure & start cluster</listitem>
- <listitem>Execute the file:
-<programlisting><![CDATA[
---
--- $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-2009 OpenLink Software
---
--- This project 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
---
---
-
-drop index RDF_QUAD_OGPS;
-checkpoint;
-create table R2 (G iri_id_8, S iri_id_8, P iri_id_8, O any, primary key (S, P, O, G))
-alter index R2 on R2 partition (S int (0hexffff00));
-
-log_enable (2);
-insert into R2 (G, S, P, O) SELECT G, S, P, O from rdf_quad;
-
-drop table RDF_QUAD;
-alter table r2 rename RDF_QUAD;
-checkpoint;
-create bitmap index RDF_QUAD_OPGS on RDF_QUAD (O, P, G, S) partition (O varchar (-1, 0hexffff));
-create bitmap index RDF_QUAD_POGS on RDF_QUAD (P, O, G, S) partition (O varchar (-1, 0hexffff));
-create bitmap index RDF_QUAD_GPOS on RDF_QUAD (G, P, O, S) partition (O varchar (-1, 0hexffff));
-
-checkpoint;
-]]></programlisting>
-</listitem>
- <listitem>Execute:
-<programlisting><![CDATA[
-SQL>cl_exec ('checkpoint);
-]]></programlisting>
-</listitem>
- <listitem>Execute ld_dir ('directory' , 'mask' , 'graph'), for ex:
-<programlisting><![CDATA[
-SQL>ld_dir ('/dbs/data', '*.gz', 'http://dbpedia.org');
-]]></programlisting>
-</listitem>
- <listitem>Execute on every node with separate client:
-<programlisting><![CDATA[
-SQL>rdf_loader_run();
-]]></programlisting>
-</listitem>
-</itemizedlist>
-</sect3>
-
-
- <sect3 id="rdfperfloadingunitpro"><title>Loading UniProt RDF data</title>
-<para>To load the uniprot data, create a function for example such as:</para>
-<programlisting><![CDATA[
-create function DB.DBA.UNIPROT_LOAD (in log_mode integer := 1)
-{
- DB.DBA.RDF_LOAD_RDFXML_MT (file_to_string_output('filename1'),'http://base_uri_1', 'destination_graph_1', log_mode, 3);
- DB.DBA.RDF_LOAD_RDFXML_MT (file_to_string_output('filename2'),'http://base_uri_2', 'destination_graph_2', log_mode, 3);
- ...
- DB.DBA.RDF_LOAD_RDFXML_MT (file_to_string_output('filename9'),'http://base_uri_9', 'destination_graph_9', log_mode, 3);
-}
-]]></programlisting>
-<para>If you are starting from blank database and you can drop it and re-create in case of error signaled, use it this way:</para>
-<programlisting><![CDATA[
-checkpoint;
-checkpoint_interval(6000);
-DB.DBA.UNIPROT_LOAD (0),
-checkpoint;
-checkpoint_interval(60);
-]]></programlisting>
-<para>If the database contains important data already and there's no way to stop it and backup before the load then use:</para>
-<programlisting><![CDATA[
-checkpoint;
-checkpoint_interval(6000);
-DB.DBA.UNIPROT_LOAD (),
-checkpoint;
-checkpoint_interval(60);
-]]></programlisting>
-<para>Note that the 'number of threads' parameter of DB.DBA.RDF_LOAD_RDFXML() mentions threads
-used to process data from file, an extra thread will read the text and parse it,
-so for 4 CPU cores there's no need in parameter value greater than 3. Three processing
-threads per one parsing tread is usually good ratio because parsing is usually three
-times faster than the rest of loading so CPU loading is well balanced.
-If for example you are using 2 x Quad Xeon, then you can choose between 8
-single-threaded parsers or 2 parsers with 3 processing threads each. With 4 cores you may simply load
-file after file with 3 processing threads. The most important performance tuning is to set the
-[Parameters] section of virtuoso configuration file:</para>
-<programlisting><![CDATA[
-NumberOfBuffers = 1000000
-MaxDirtyBuffers = 800000
-MaxCheckpointRemap = 1000000
-DefaultIsolation = 2
-]]></programlisting>
-<para>Note: these numbers are reasonable for 16 GB RAM Linux box. Usually when there are no such massive operations as loading huge database, you can set up the values as:</para>
-<programlisting><![CDATA[
-NumberOfBuffers = 1500000
-MaxDirtyBuffers = 1200000
-MaxCheckpointRemap = 1500000
-DefaultIsolation = 2
-]]></programlisting>
-<tip>
- <title>See Also:</title>
- <para><link linkend=""></link></para>
- <para><ulink url="http://www.openlinksw.com/dataspace/dav/wiki/Main/VirtConfigScale#Configuration%20Options">Virtuoso Configuration Options</ulink></para>
-</tip>
-<tip>
- <title>Tip:</title>
-<para>Thus after loading all data you may wish to shutdown, tweak and start server again.
-If you have ext2fs or ext3fs filesystem, then it's better to have enough free space on disk not to
-make it more than 80% full. When it's almost full it may allocate database file badly, resulting
-in measurable loss of disk access speed. That is not Virtuoso-specific fact, but a common hint
-for all database-like applications with random access to big files.</para>
-</tip>
-<para>Here is an example of using awk file for splitting big file smaller ones:</para>
-<programlisting><![CDATA[
-BEGIN {
- file_part=1000
- e_line = "</rdf:RDF>"
- cur=0
- cur_o=0
- file=0
- part=file_part
- }
- {
- res_file_i="res/"FILENAME
- line=$0
- s=$1
- res_file=res_file_i"_"file".rdf"
-
- if (index (s, "</rdf:Description>") == 1)
- {
- cur=cur+1
- part=part-1
- }
-
- if (part > 0)
- {
- print line >> res_file
- }
-
- if (part == 0)
- {
-# print "===================== " cur
- print line >> res_file
- print e_line >> res_file
- close (res_file)
- file=file+1
- part=file_part
- res_file=res_file_i"_"file".rdf"
- system ("cp beg.txt " res_file)
- }
- }
-END { }
-]]></programlisting>
- </sect3>
- <sect3 id="rdfperfloadingdbpedia"><title>Loading DBPedia RDF data</title>
-<para>You can use the following script as an example for loading DBPedia RDF data in Virtuoso:</para>
-<programlisting><![CDATA[
-#!/bin/sh
-
-PORT=$1
-USER=$2
-PASS=$3
-file=$4
-g=$5
-LOGF=`basename $0`.log
-
-if [ -z "$PORT" -o -z "$USER" -o -z "$PASS" -o -z "$file" -o -z "$g" ]
-then
- echo "Usage: `basename $0` [DSN] [user] [password] [ttl-file] [graph-iri]"
- exit
-fi
-
-if [ ! -f "$file" -a ! -d "$file" ]
-then
- echo "$file does not exists"
- exit 1
-fi
-
-mkdir READY 2>/dev/null
-rm -f $LOGF $LOGF.*
-
-echo "Starting..."
-echo "Logging into: $LOGF"
-
-DOSQL ()
-{
- isql $PORT $USER $PASS verbose=on banner=off prompt=off echo=ON errors=stdout exec="$1" > $LOGF
-}
-
-LOAD_FILE ()
-{
- f=$1
- g=$2
- echo "Loading $f (`cat $f | wc -l` lines) `date \"+%H:%M:%S\"`" | tee -a $LOG
-
- DOSQL "ttlp_mt (file_to_string_output ('$f'), '', '$g', 17); checkpoint;" > $LOGF
-
- if [ $? != 0 ]
- then
- echo "An error occurred, please check $LOGF"
- exit 1
- fi
-
- line_no=`grep Error $LOGF | awk '{ match ($0, /line [0-9]+/, x) ; match (x[0], /[0-9]+/, y); print y[0] }'`
- newf=$f.part
- inx=1
- while [ ! -z "$line_no" ]
- do
- cat $f | awk "BEGIN { i = 1 } { if (i==$line_no) { print \$0; exit; } i = i + 1 }" >> bad.nt
- line_no=`expr $line_no + 1`
- echo "Retrying from line $line_no"
- echo "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ." > tmp.nt
- cat $f | awk "BEGIN { i = 1 } { if (i>=$line_no) print \$0; i = i + 1 }" >> tmp.nt
- mv tmp.nt $newf
- f=$newf
- mv $LOGF $LOGF.$inx
- DOSQL "ttlp_mt (file_to_string_output ('$f'), '', '$g', 17); checkpoint;" > $LOGF
-
- if [ $? != 0 ]
- then
- echo "An error occurred, please check $LOGF"
- exit 1
- fi
- line_no=`grep Error $LOGF | awk '{ match ($0, /line [0-9]+/, x) ; match (x[0], /[0-9]+/, y); print y[0] }'`
- inx=`expr $inx + 1`
- done
- rm -f $newf 2>/dev/null
- echo "Loaded. "
-}
-
-echo "======================================="
-echo "Loading started."
-echo "======================================="
-
-if [ -f "$file" ]
-then
- LOAD_FILE $file $g
- mv $file READY 2>> /dev/null
-elif [ -d "$file" ]
-then
- for ff in `find $file -name '*.nt'`
- do
- LOAD_FILE $ff $g
- mv $ff READY 2>> /dev/null
- done
-else
- echo "The input is not file or directory"
-fi
-echo "======================================="
-echo "Final checkpoint."
-DOSQL "checkpoint;" > temp.res
-echo "======================================="
-echo "Check bad.nt file for skipped triples."
-echo "======================================="
-
-exit 0
-
-]]></programlisting>
- </sect3>
- <sect3 id="rdfperfloadingbio2rdf"><title>Loading Bio2RDF data</title>
-<para>The shell script below was used to import files in n3 notation into OpenLink Virtuoso RDF storage.</para>
-<para>When an syntax error it will cut content from next line and will retry. This was used on ubuntu linux to import bio2rdf and freebase dumps.</para>
-<para>Note it uses gawk, so it must be available on system where is tried. Also for recovery additional disk space is needed at max the size of original file.</para>
-<programlisting><![CDATA[
-#!/bin/bash
-
-PASS=$1
-f=$2
-g=$3
-
-# Usage
-if [ -z "$PASS" -o -z "$f" -o -z "$g" ]
-then
- echo "Usage: $0 [password] [ttl-file] [graph-iri]"
- exit
-fi
-
-if [ ! -f "$f" ]
-then
- echo "$f does not exists"
- exit
-fi
-
-# Your port here
-PORT=1111 #`inifile -f dbpedia.ini -s Parameters -k ServerPort`
-if test -z "$PORT"
-then
- echo "Cannot find INI and inifile command"
- exit
-fi
-
-# Initial run
-isql $PORT dba $PASS verbose=on banner=off prompt=off echo=ON errors=stdout exec="ttlp_mt (file_to_string_output ('$f'), '', '$g'); checkpoint;" > $0.log
-
-# If disconnect etc.
-if [ $? != 0 ]
-then
- echo "An error occurred, please check $0.log"
- exit
-fi
-
-# Check for error
-line_no=`grep Error $0.log | awk '{ match ($0, /line [0-9]+/, x) ; match (x[0], /[0-9]+/, y); print y[0] }'`
-newf=$f.part
-inx=1
-
-# Error recovery
-while [ ! -z "$line_no" ]
-do
- cat $f | awk "BEGIN { i = 0 } { if (i==$line_no) { print \$0; exit; } i = i + 1 }" >> bad.nt
- line_no=`expr $line_no + 1`
- echo "Retrying from line $line_no"
- cat $f | awk "BEGIN { i = 0 } { if (i>=$line_no) print \$0; i = i + 1 }" > tmp.nt
- mv tmp.nt $newf
- f=$newf
- mv $0.log $0.log.$inx
- # Run the recovered part
- isql $PORT dba $PASS verbose=on banner=off prompt=off echo=ON errors=stdout exec="ttlp_mt (file_to_string_output ('$f'), '', '$g'); checkpoint;" > $0.log
-
- if [ $? != 0 ]
- then
- echo "An error occurred, please check $0.log"
- exit
- fi
- line_no=`grep Error $0.log | awk '{ match ($0, /line [0-9]+/, x) ; match (x[0], /[0-9]+/, y); print y[0] }'`
- inx=`expr $inx + 1`
-done
-]]></programlisting>
-
- </sect3>
- </sect2>
- <sect2 id="rdfperfsparul"><title>Using SPARUL</title>
- <para>Since SPARUL updates are generally not meant to be transactional, it is
- best to run these in <link linkend="fn_log_enable"><function>log_enable (2)</function></link> mode,
- which commits every operation as it is done. This prevents one from running out of rollback space. Also for bulk updates, transaction logging can be turned off. If so, one should do a manual checkpoint after the operation to ensure persistence across server restart since there is no roll forward log.</para>
-<para>To have a roll forward log and row by row autocommit, one may use <link linkend="fn_log_enable"><function>log_enable (3)</function></link>. This will write constantly into the log which takes extra time. Having no logging and doing a checkpoint when the whole work is finished is faster.</para>
-<para>Many SPARUL operations can be run in parallel in this way. If they are independent with respect to their input and output, they can run in parallel and row by row autocommit will ensure they do not end up waiting for each others' locks.</para>
- </sect2>
- <sect2 id="rdfperfgeneraldbpedia"><title>DBpedia Benchmark</title>
-<para>We ran the DBpedia benchmark queries again with different configurations of Virtuoso.
-Comparing numbers given by different parties is a constant problem. In the case reported here,
-we loaded the full DBpedia 3, all languages, with about 198M triples, onto Virtuoso v5 and Virtuoso Cluster
-v6, all on the same 4 core 2GHz Xeon with 8G RAM. All databases were striped on 6 disks. The Cluster
-configuration was with 4 processes in the same box.
-We ran the queries in two variants:
-</para>
-<itemizedlist>
- <listitem>With graph specified in the SPARQL FROM clause, using the default indices.</listitem>
- <listitem>With no graph specified anywhere, using an alternate indexing scheme.</listitem>
-</itemizedlist>
-<para>The times below are for the sequence of 5 queries.
-As there is a query in the set that specifies no condition on S or O and only P,
-thus cannot be done with the default indices With Virtuoso v5. With Virtuoso Cluster v6 it can,
-because v6 is more space efficient. So we added the index:</para>
-<programlisting><![CDATA[
-create bitmap index rdf_quad_pogs on rdf_quad (p, o, g, s);
-]]></programlisting>
-<table>
-<tgroup cols="4">
-<thead>
-<row>
- <entry></entry>
- <entry>Virtuoso v5 with gspo, ogps, pogs</entry>
- <entry>Virtuoso Cluster v6 with gspo, ogps</entry>
- <entry>Virtuoso Cluster v6 with gspo, ogps, pogs</entry>
-</row>
-</thead>
-<tbody>
-<row><entry>cold</entry><entry>210 s</entry><entry>136 s</entry><entry>33.4 s</entry></row>
-<row><entry>warm</entry><entry>0.600 s</entry><entry>4.01 s</entry><entry>0.628 s</entry></row>
-</tbody>
-</tgroup>
-</table>
-<para>Now let us do it without a graph being specified. Note that alter index is valid for v6 or higher.
-For all platforms, we drop any existing indices, and:</para>
-<programlisting><![CDATA[
-create table r2 (g iri_id_8, s, iri_id_8, p iri_id_8, o any, primary key (s, p, o, g))
-alter index R2 on R2 partition (s int (0hexffff00));
-
-log_enable (2);
-insert into r2 (g, s, p, o) SELECT g, s, p, o from rdf_quad;
-
-drop table rdf_quad;
-alter table r2 rename RDF_QUAD;
-create bitmap index rdf_quad_opgs on rdf_quad (o, p, g, s) partition (o varchar (-1, 0hexffff));
-create bitmap index rdf_quad_pogs on rdf_quad (p, o, g, s) partition (o varchar (-1, 0hexffff));
-create bitmap index rdf_quad_gpos on rdf_quad (g, p, o, s) partition (o varchar (-1, 0hexffff));
-]]></programlisting>
-<para>The code is identical for v5 and v6, except that with v5 we use iri_id (32 bit) for
-the type, not iri_id_8 (64 bit). We note that we run out of IDs with v5 around a few billion
-triples, so with v6 we have double the ID length and still manage to be vastly more space efficient.</para>
-<para>With the above 4 indices, we can query the data pretty much in any combination without hitting
-a full scan of any index. We note that all indices that do not begin with s end with s as a bitmap.
-This takes about 60% of the space of a non-bitmap index for data such as DBpedia.</para>
-<para>If you intend to do completely arbitrary RDF queries in Virtuoso, then chances are
-you are best off with the above index scheme.</para>
-<table>
-<tgroup cols="3">
-<thead>
-<row>
- <entry></entry>
- <entry>Virtuoso v5 with gspo, ogps, pogs</entry>
- <entry>Virtuoso Cluster v6 with gspo, ogps, pogs</entry>
-</row>
-</thead>
-<tbody>
-<row><entry>warm</entry><entry>0.595 s</entry><entry>0.617 s</entry></row>
-</tbody>
-</tgroup>
-</table>
-<para>The cold times were about the same as above, so not reproduced.</para>
-<para>It is in the SPARQL spirit to specify a graph and for pretty much any application,
-there are entirely sensible ways of keeping the data in graphs and specifying which ones are
-concerned by queries. This is why Virtuoso is set up for this by default.</para>
-<para>On the other hand, for the open web scenario, dealing with an unknown large number of graphs,
-enumerating graphs is not possible and questions like which graph of which source asserts x become
-relevant. We have two distinct use cases which warrant different setups of the database, simple as that.</para>
-<para>The latter use case is not really within the SPARQL spec, so implementations may or may not
-support this.</para>
-<para>Once the indices are right, there is no difference between specifying a graph and not specifying a
-graph with the queries considered. With more complex queries, specifying a graph or set of graphs does
-allow some optimizations that cannot be done with no graph specified. For example, bitmap intersections
-are possible only when all leading key parts are given.</para>
-<para>The best warm cache time is with v5; the five queries run under 600 ms after the first go.
-This is noted to show that all-in-memory with a single thread of execution is hard to beat.</para>
-<para>Cluster v6 performs the same queries in 623 ms. What is gained in parallelism is lost in latency
-if all operations complete in microseconds. On the other hand, Cluster v6 leaves v5 in the dust in any
-situation that has less than 100% hit rate. This is due to actual benefit from parallelism if operations
-take longer than a few microseconds, such as in the case of disk reads. Cluster v6 has substantially
-better data layout on disk, as well as fewer pages to load for the same content.</para>
-<para>This makes it possible to run the queries without the pogs index on Cluster v6 even when v5 takes prohibitively long.</para>
-<para>The purpose is to have a lot of RAM and space-efficient data representation.</para>
-<para>For reference, the query texts specifying the graph are below. To run without specifying
-the graph, just drop the FROM <http://dbpedia.org> from each query. The returned row counts are
-indicated below each query's text.</para>
-<programlisting><![CDATA[
-SQL>SPARQL
-SELECT ?p ?o
-FROM <http://dbpedia.org>
-WHERE
- {
- <http://dbpedia.org/resource/Metropolitan_Museum_of_Art> ?p ?o .
- };
-
-p o
-VARCHAR VARCHAR
-_______________________________________________________________________________
-
-http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://umbel.org/umbel/ac/Artifact
-http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://dbpedia.org/class/yago/MuseumsInNewYorkCity
-http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://dbpedia.org/class/yago/ArtMuseumsAndGalleriesInTheUnitedStates
-http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://dbpedia.org/class/yago/Museum103800563
-..
--- 335 rows
-
-SQL>SPARQL
-PREFIX p: <http://dbpedia.org/property/>
-SELECT ?film1 ?actor1 ?film2 ?actor2
-FROM <http://dbpedia.org>
-WHERE
- {
- ?film1 p:starring <http://dbpedia.org/resource/Kevin_Bacon> .
- ?film1 p:starring ?actor1 .
- ?film2 p:starring ?actor1 .
- ?film2 p:starring ?actor2 .
-};
-
-film1 actor1 film2 ctor2
-VARCHAR VARCHAR VARCHAR ARCHAR
-http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon
-http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Meryl_Streep
-http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Joseph_Mazzello
-http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/David_Strathairn
-http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/John_C._Reilly
-...
--- 23910 rows
-
-SQL>SPARQL
-PREFIX p: <http://dbpedia.org/property/>
-SELECT ?artist ?artwork ?museum ?director
-FROM <http://dbpedia.org>
-WHERE
- {
- ?artwork p:artist ?artist .
- ?artwork p:museum ?museum .
- ?museum p:director ?director
- };
-
-artist artwork museum director
-VARCHAR VARCHAR VARCHAR VARCHAR
-_______________________________________________
-
-http://dbpedia.org/resource/Paul_C%C3%A9zanne http://dbpedia.org/resource/The_Basket_of_Apples http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
-http://dbpedia.org/resource/Paul_Signac http://dbpedia.org/resource/Neo-impressionism http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
-http://dbpedia.org/resource/Georges_Seurat http://dbpedia.org/resource/Neo-impressionism http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
-http://dbpedia.org/resource/Edward_Hopper http://dbpedia.org/resource/Nighthawks http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
-http://dbpedia.org/resource/Mary_Cassatt http://dbpedia.org/resource/The_Child%27s_Bath http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
-..
--- 303 rows
-
-SQL>SPARQL
-PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-SELECT ?s ?homepage
-FROM <http://dbpedia.org>
-WHERE
- {
- <http://dbpedia.org/resource/Berlin> geo:lat ?berlinLat .
- <http://dbpedia.org/resource/Berlin> geo:long ?berlinLong .
- ?s geo:lat ?lat .
- ?s geo:long ?long .
- ?s foaf:homepage ?homepage .
- FILTER (
- ?lat <= ?berlinLat + 0.03190235436 &&
- ?long >= ?berlinLong - 0.08679199218 &&
- ?lat >= ?berlinLat - 0.03190235436 &&
- ?long <= ?berlinLong + 0.08679199218) };
-
-s homepage
-VARCHAR VARCHAR
-_______________________________________________________________________________
-
-http://dbpedia.org/resource/Berlin_University_of_the_Arts http://www.udk-berlin.de/
-http://dbpedia.org/resource/Berlin_University_of_the_Arts http://www.udk-berlin.de/
-http://dbpedia.org/resource/Berlin_Zoological_Garden http://www.zoo-berlin.de/en.html
-http://dbpedia.org/resource/Federal_Ministry_of_the_Interior_%28Germany%29 http://www.bmi.bund.de
-http://dbpedia.org/resource/Neues_Schauspielhaus http://www.goya-berlin.com/
-http://dbpedia.org/resource/Bauhaus_Archive http://www.bauhaus.de/english/index.htm
-http://dbpedia.org/resource/Canisius-Kolleg_Berlin http://www.canisius-kolleg.de
-http://dbpedia.org/resource/Franz%C3%B6sisches_Gymnasium_Berlin http://www.fg-berlin.cidsnet.de
-..
--- 48 rows
-
-SQL>SPARQL
-PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX p: <http://dbpedia.org/property/>
-SELECT ?s ?a ?homepage
-FROM <http://dbpedia.org>
-WHERE
- {
- <http://dbpedia.org/resource/New_York_City> geo:lat ?nyLat .
- <http://dbpedia.org/resource/New_York_City> geo:long ?nyLong .
- ?s geo:lat ?lat .
- ?s geo:long ?long .
- ?s p:architect ?a .
- ?a foaf:homepage ?homepage .
- FILTER (
- ?lat <= ?nyLat + 0.3190235436 &&
- ?long >= ?nyLong - 0.8679199218 &&
- ?lat >= ?nyLat - 0.3190235436 &&
- ?long <= ?nyLong + 0.8679199218) };
-s a homepage
-VARCHAR VARCHAR VARCHAR
-_______________________________________________________________________________
-
-http://dbpedia.org/resource/GE_Building http://dbpedia.org/resource/Associated_Architects http://www.associated-architects.co.uk
-http://dbpedia.org/resource/Giants_Stadium http://dbpedia.org/resource/HNTB http://www.hntb.com/
-http://dbpedia.org/resource/Fort_Tryon_Park_and_the_Cloisters http://dbpedia.org/resource/Frederick_Law_Olmsted http://www.asla.org/land/061305/olmsted.html
-http://dbpedia.org/resource/Central_Park http://dbpedia.org/resource/Frederick_Law_Olmsted http://www.asla.org/land/061305/olmsted.html
-http://dbpedia.org/resource/Prospect_Park_%28Brooklyn%29 http://dbpedia.org/resource/Frederick_Law_Olmsted http://www.asla.org/land/061305/olmsted.html
-http://dbpedia.org/resource/Meadowlands_Stadium http://dbpedia.org/resource/360_Architecture http://oakland.athletics.mlb.com/oak/ballpark/new/faq.jsp
-http://dbpedia.org/resource/Citi_Field http://dbpedia.org/resource/HOK_Sport_Venue_Event http://www.hoksve.com/
-http://dbpedia.org/resource/Citigroup_Center http://dbpedia.org/resource/Hugh_Stubbins_Jr. http://www.klingstubbins.com
-http://dbpedia.org/resource/150_Greenwich_Street http://dbpedia.org/resource/Fumihiko_Maki http://www.pritzkerprize.com/maki2.htm
-http://dbpedia.org/resource/Freedom_Tower http://dbpedia.org/resource/David_Childs http://www.som.com/content.cfm/www_david_m_childs
-http://dbpedia.org/resource/7_World_Trade_Center http://dbpedia.org/resource/David_Childs http://www.som.com/content.cfm/www_david_m_childs
-http://dbpedia.org/resource/The_New_York_Times_Building http://dbpedia.org/resource/Renzo_Piano http://www.rpbw.com/
-http://dbpedia.org/resource/Trump_World_Tower http://dbpedia.org/resource/Costas_Kondylis http://www.kondylis.com
-
-13 Rows. -- 2183 msec.
-]]></programlisting>
- </sect2>
-<sect2 id="rdfstorebenchmarks"><title>RDF Store Benchmarks</title>
- <sect3 id="rdfstorebenchmarksintroduction"><title>Introduction</title>
- <para>In a particular RDF Store Benchmarks there is difference if the queries are
-executed with specified graph or with specified multiple graphs. As Virtuoso is quad store,
-not triple store with many tables, it runs queries inefficiently if graphs are specified
-and there are no additional indexes except pre-set GSPO and OGPS. Proper use of the FROM clause
-or adding indexes with graph column will contribute for better results.
- </para>
- </sect3>
- <sect3 id="rdfstorebenchmarksindexusage"><title>Using bitmap indexes</title>
- <para>If is known in advance for the current RDF Store Benchmarks that some
-users will not indicate specific graphs then should be done: </para>
- <itemizedlist>
- <listitem>either create indexes with graph in last position</listitem>
- <listitem>or load everything into single graph and specify it somewhere in querying application.</listitem>
- </itemizedlist>
- <para>Both methods do not require any changes in query texts</para>
-<itemizedlist mark="bullet">
- <listitem>For users using Virtuoso 5 is strongly recommended is the usage of additional bitmap indexes:
-<programlisting><![CDATA[
-SQL> create bitmap index RDF_QUAD_POGS on DB.DBA.RDF_QUAD (P,O,G,S);
-SQL> create bitmap index RDF_QUAD_PSOG on DB.DBA.RDF_QUAD (P,S,O,G);
-]]></programlisting>
-</listitem>
- <listitem>For users using Virtuoso 6 or higher, see the new layout <link linkend="rdfperfrdfscheme">here</link>.</listitem>
-</itemizedlist>
- <para>You can create other indexes as well. Bitmap indexes are preferable, but
-if O is the last column, then the index can not be bitmap, so it could be, for e.g.:</para>
-<programlisting><![CDATA[
-create index RDF_QUAD_PSGO on DB.DBA.RDF_QUAD (P, S, G, O);
-]]></programlisting>
- <para>but cannot be:</para>
-<programlisting><![CDATA[
-create bitmap index RDF_QUAD_PSGO on DB.DBA.RDF_QUAD (P, S, G, O);
-]]></programlisting>
- </sect3>
- </sect2>
- <sect2 id="fastapproxdiffandpatch"><title>Fast Approximate RDF Graph Diff and Patch</title>
-<para>Two algorithms described below resemble "unified diff" and "patch by unified diff"
-but they work on RDF graphs, not on plain texts.
-</para>
-<para>They work reasonably for graphs composed from CBDs (concise bounded descriptions) of
-some subjects, if these subjects are either "named" IRIs or can be identified by values of
-their inverse functional properties.
-</para>
-<para>Many sorts of commonly used graphs match these restrictions, including all graphs
-without blank nodes, most of FOAF files, graphs that can be "pretty-printed" in JSON, most
-of dumps of relational databases etc.
-</para>
-<para>The basic idea is as simple as zipper:
-</para>
-<itemizedlist mark="bullet">
- <listitem>Place one graph at the left and one to the right,</listitem>
- <listitem>Find a retainer box at the right and a matching pin at the left,</listitem>
- <listitem>Join them</listitem>
- <listitem>Pull the slider as long as possible.</listitem>
- <listitem>Repeat this while there are pins and boxes that can be matched and sliders that can be moved.</listitem>
-</itemizedlist>
-<para>An IRI in left graph <code>(say, G1)</code> matches to same IRI in right graph <code>(G2)</code>
-as pin to box. The same is true for literals too.
-</para>
-<para>Functional and inverse functional properties are teeth that form chains, algorithm "moves sliders" along these chains, incrementally connecting more and more nodes.
-</para>
-<para>If there is a match of this sort <code>(O1 in G1 matches O2 in G2)</code> and the matched nodes
-are values of same inverse functional property <code>P</code> (there are <code>{ S1 P O1 }</code> in
-<code>G1</code> and <code>{ S2 P O2 }</code> in <code>G2</code>) then we guess that <code>S1</code>
-matches <code>S2</code>.
-</para>
-<para>If <code>S1</code> in <code>G1</code> matches <code>S2</code> in <code>G2</code> and the matched
-nodes are subjects of same functional property <code>P</code> ( there are <code>{ S1 P N1 }</code> in
-<code>G1</code> and <code>{ S2 P N2 }</code> in <code>G2</code> ) then we guess that <code>N1</code>
-matches <code>N2</code>, now it's possible to try same interaction on triples where <code>N1</code> and
-<code>N2</code> are in subject position, that's how slides move. A typical example of a long zipper
-is closed list with matched heads.
-</para>
-<sect3 id="fastapproxdiffandpatchhow"><title>Make a Diff And Use It</title>
-<itemizedlist mark="bullet">
- <listitem>Using <link linkend="fn_rdf_graph_diff">DB.DBA.RDF_GRAPH_DIFF</link></listitem>
- <listitem>Using <link linkend="fn_rdf_suo_diff_ttl">DB.DBA.RDF_SUO_DIFF_TTL</link></listitem>
- <listitem>Using <link linkend="fn_rdf_suo_apply_patch">DB.DBA.RDF_SUO_APPLY_PATCH</link></listitem>
-</itemizedlist>
-</sect3>
-<sect3 id="fastapproxdiffandpatchclt"><title>Collect Functional And Inverse Functional Properties</title>
-<para>Lists of functional properties can be retrieved from an ontology graph by query like:</para>
-<programlisting><![CDATA[
-SPARQL define output:valmode "LONG"
-SELECT (<LONG::sql:VECTOR_AGG(?s))
-FROM <my-ontology-graph>
-WHERE
- {
- ?s a owl:functionalProperty
- }
-]]></programlisting>
-<para>Inverse functional properties could be retrieved by a similar query, but unfortunately the
- ontology may mention so called NULL values that can be property values for many subjects. Current
- implementation of diff and patch does not recognize NULL values so they can cause patch with
- "false alarm" errors. The workaround is to retrieve only properties that have no NULL values declared:
-</para>
-<programlisting><![CDATA[
-SPARQL define output:valmode "LONG"
-SELECT (<LONG::sql:VECTOR_AGG(?s))
-FROM <my-ontology-graph>
-WHERE
- {
- ?s a owl:inverseFunctionalProperty .
- OPTIONAL { ?s owl:nullIFPValue ?v }
- FILTER (!Bound(?v))
- }
-]]></programlisting>
-<para>If no ontology is available then appropriate predicates can be obtained from sample graphs using
- <link linkend="fn_rdf_graph_collect_fp_list">DB.DBA.RDF_GRAPH_COLLECT_FP_LIST</link>.
-</para>
-</sect3>
-<sect3 id="fastapproxdiffandpatchimpl"><title>Implementation-Specific Extensions of GUO Ontology</title>
-<para><emphasis>Note</emphasis>: This section contains implementation details that are needed only
-if you want to write your own patch or diff procedure, you don't have to worry about internals if
-you want to use existing procedures.
-</para>
-<para>Basic GUO ontology is not expressive enough to work with blank nodes, so some custom extensions $
-are needed.
-</para>
-<para>In the rest of the description:</para>
-<programlisting><![CDATA[
- at prefix guo: <http://webr3.org/owl/guo#>
-]]></programlisting>
-<para>is assumed.</para>
-<para>The diff contains one node of <code>rdf:type guo:diff</code>.
-</para>
-<para>For debugging purpose it has properties <code>guo:graph1</code> and <code>guo:graph2</code> that
-corespond to <code>gfrom</code> and <code>gto</code> arguments of <link linkend="fn_rdf_suo_diff_ttl">DB.DBA.RDF_SUO_DIFF_TTL</link>.
-</para>
-<para>The diff also contains zero or more nodes of <code>rdf:type guo:UpdateInstruction</code>. These
-nodes are as described in basic GUO ontology, but <code>guo:target_graph</code> is now optional,
-<code>guo:target_subject</code> can be a blank node and objects of predicates "inside" values of
-<code>guo:insert</code> and <code>guo:delete</code> can also be blank nodes. These blank nodes are
-"placeholders" for values, calculated according to the most important GUO extension - rule nodes.
-</para>
-<para>There are eight sorts of rule nodes, four for <code>gfrom</code> side of diff and four similar for
-<code>gto</code> side. Out of four sorts related to one side, two are for functional properties and
-two similar are for inverse functional properties. Thus <code>rdf:type-s</code> of these nodes are:
-</para>
-<programlisting><![CDATA[
-guo:from-rule-FP0,
-guo:from-rule-FP1,
-guo:from-rule-IFP0,
-guo:from-rule-IFP1
-]]></programlisting>
-<para>and
-</para>
-<programlisting><![CDATA[
-guo:to-rule-FP0,
-guo:to-rule-FP1,
-guo:to-rule-IFP ,
-guo:to-rule-IFP1 .
-]]></programlisting>
-<para>Each rule node has property <code>guo:order</code> that is an non-negative integer.
-</para>
-<para>These integers enumerate all <code>guo:from-rule-</code>... nodes, starting from zero.
-</para>
-<para>When patch procedure works, these rules are used in this order, the result of each rule
- is a blank node that either exists in the graph or just created.
-</para>
-<para>All results are remembered for use in the rest of the patch procedure.
-</para>
-<para>Similarly, other sequence of these integers enumerate all <code>guo:to-rule-</code>... nodes,
-also starting from zero.
-</para>
-<para>Consider a sequence of <code>guo:from-rule-</code>... nodes, because <code>guo:to-rule-</code>
-nodes have identical properties.
-</para>
-<para>A rule node can have zero or more values of <code>guo:dep</code> property, each value is a
-bnode that is rule node that should be calculated before the current one.
-</para>
-<para>Every rule has exactly one predicate <code>guo:path</code> that is a blank node. Each property
-of this blank node describes one possible "move of slider": predicate to follow is in predicate
-position and a node to start from is in object position. An IRI or a literal in object position is
-used as is, a blank node in object position should be of type <code>guo:from-rule-</code>... and
-have smaller <code>guo:order</code> so it refers to already calculated result bnode of some
-preceding rule.
-</para>
-<para>Rule of form:
-</para>
-<programlisting><![CDATA[
-R a guo:from-rule-IFP1 ;
- guo:path [ P1 O1 ; P2 O2 ; ... ; Pn On ] .
-]]></programlisting>
-<para>searches for a unique blank node <code>_:Rres</code> that is a common subject of triples:
-</para>
-<programlisting><![CDATA[
- _:Rres P1 O1
- _:Rres P2 O2
- . . .
- _:Rres Pn On
-]]></programlisting>
-<para>in the gfrom graph.
-</para>
-<para>If subjects differ in these triples or some triples are not found or the subject is not a
- blank node then an appropriate error is logged and rule fails, otherwise <code>_:Rres</code>
- is remembered as the result of the rule.
-</para>
-<para>Similarly, rule of form:
-</para>
-<programlisting><![CDATA[
-R a guo:from-rule-FP1 ;
- guo:path [ P1 O1 ; P2 O2 ; ... ; Pn On ] .
-]]></programlisting>
-<para>searches for a unique blank node <code>_:Rres</code> that is a common object of triples:
-</para>
-<programlisting><![CDATA[
- O1 P1 _:Rres
- O2 P2 _:Rres
- . . .
- On Pn _:Rres
-]]></programlisting>
-<para>in the gfrom graph.
-</para>
-<para>Rule of form:
-</para>
-<programlisting><![CDATA[
-R a guo:from-rule-IFP0 ;
- guo:path [ P1 O1 ; P2 O2 ; ... ; Pn On ] .
-]]></programlisting>
-<para>ensures that the <code>gfrom</code> graph does not contain any triple like:
-</para>
-<programlisting><![CDATA[
- _:Rres P1 O1
- _:Rres P2 O2
-]]></programlisting>
-<para>or
-</para>
-<programlisting><![CDATA[
-_:Rres Pn On
-]]></programlisting>
-<para>It is an error if something exists. If nothing found then the result of the rule is
- newly created unique blank node. That's how patch procedure creates new blank nodes when
- it inserts "totally new" data.
-</para>
-<para>Similarly, rule of form:
-</para>
-<programlisting><![CDATA[
-R a guo:from-rule-IFP0 ;
- guo:path [ P1 O1 ; P2 O2 ; ... ; Pn On ] .
-]]></programlisting>
-<para>ensures that the <code>gfrom</code> graph does not contain any triple like:
-</para>
-<programlisting><![CDATA[
-O1 P1 _:Rres
-O2 P2 _:Rres
-]]></programlisting>
-<para>or
-</para>
-<programlisting><![CDATA[
- On Pn _:Rres
-]]></programlisting>
-<para>Current version of patch procedure does not use rules <code>guo:to-rule-</code>... ,
-however they can be used by custom procedure of few sorts. First, these rules can be used to
-produce a "reversed diff". Next, these rules can be used to validate the result of the patch -
-if the patch can not be reverted then the result is "suspicious".
-</para>
-</sect3>
-</sect2>
- <sect2 id="rdb2rdftriggers"><title>RDB2RDF Triggers</title>
-<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 RDF Views. Next,
- algorithms that selects triples with non-constant graphs and predicates tend to produce enormous
- 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 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 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 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 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 RDF Views from default quad storage
- to virtrdf:SyncToQuads:
-</para>
-<programlisting><![CDATA[
-create procedure DB.DBA.RDB2RDF_COPY_ALL_RDF_VIEWS_TO_SYNC ()
-{
- for (sparql define input:storage ""
- select (bif:aref(bif:sprintf_inverse (str(?idx), bif:concat (str(rdf:_), "%d"), 0), 0)) ?qm
- from virtrdf:
- where { virtrdf:DefaultQuadStorage-UserMaps ?idx ?qm . ?qm a virtrdf:QuadMap }
- order by asc (bif:sprintf_inverse (bif:concat (str(rdf:_), "%d"), str (?idx), 1)) ) do
- exec (sprintf ('sparql alter quad storage virtrdf:SyncToQuads { create <%s> using storage virtrdf:DefaultQuadStorage }', "qm"));
-}
-;
-]]></programlisting>
-<para>When the virtrdf:SyncToQuads storage is fully prepared, two API functions can be used:
-</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 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 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>
- </listitem>
- <listitem><link linkend="fn_sparql_rdb2rdf_codegen">DB.DBA.SPARQL_RDB2RDF_CODEGEN</link>: The
- function creates an SQL text for a given table and an operation specified by an opcode.
- </listitem>
-</itemizedlist>
-<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
- quads from RDF_QUAD table, instead it will create records in a special table RDF_QUAD_DELETE_QUEUE
- as guesses what can be deleted. The AFTER trigger will re-check these guesses, delete related quads
- if needed and shorten the RDF_QUAD_DELETE_QUEUE.
-</para>
-<para>The extra activity of triggers on RDF_QUAD, RDF_OBJ, RDF_QUAD_DELETE_QUEUE and other tables
- and indexes of the storage of "physical" triples may cause deadlocks so the application should
- be carefully checked for proper support of deadlocks if they were very seldom before turning
- RDB2RDF triggers on. In some cases, the whole processing of RDB2RDF can be moved to a separate
- server and connected to the main workhorse server via replication.
-</para>
-<para>The following example functions create texts of all triggers, save them to files in for
- further studying and try to load them. That's probably quite bad scenario for a production
- database, because it's better to read procedures before loading them, especially if they're
- triggers, especially if some of them may contain errors.
-</para>
-<programlisting><![CDATA[
--- This creates one or two files with one or two triggers or other texts and try to load the
-generated sql texts.
-create procedure DB.DBA.RDB2RDF_EXEC_CODEGEN1_FOR_TABLE
-( in dump_prefix varchar,
- in tbl varchar,
- in dump_id any,
- in txt any )
-{
- declare fname varchar;
- declare stat, msg varchar;
- if (isinteger (dump_id))
- dump_id := cast (dump_id as varchar);
- if (__tag of vector = __tag (txt))
- {
- DB.DBA.RDB2RDF_EXEC_CODEGEN1_FOR_TABLE (dump_prefix, tbl, dump_id, txt[0]);
- DB.DBA.RDB2RDF_EXEC_CODEGEN1_FOR_TABLE (dump_prefix, tbl, dump_id || 'p' , txt[1]);
- return;
- }
- if (__tag of varchar <> __tag (txt))
- txt := string_output_string (txt);
- fname := sprintf ('%s_Rdb2Rdf.%s.%s.sql', dump_prefix, tbl, dump_id);
- string_to_file (fname, txt || '\n;\n', -2);
- if ('0' = dump_id)
- return;
- stat := '00000';
- msg := '';
- exec (txt, stat, msg);
- if ('00000' <> stat)
- {
- string_to_file (fname, '\n\n- - - - - 8< - - - - -\n\nError ' || stat || ' ' || msg, -1);
- if (not (subseq (msg, 0, 5) in ('SQ091')))
- signal (stat, msg);
- }
-}
-;
-
--- This creates and loads all triggers, init procedure and debug dump related to one table.
-create procedure DB.DBA.RDB2RDF_PREPARE_TABLE (in dump_prefix varchar, in tbl varchar)
-{
- declare ctr integer;
- for (ctr := 0; ctr <= 4; ctr := ctr+1 )
- DB.DBA.RDB2RDF_EXEC_CODEGEN1_FOR_TABLE (dump_prefix, tbl, ctr, sparql_rdb2rdf_codegen (tbl, ctr));
-}
-;
-
--- 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;
- tbl_list := sparql_rdb2rdf_list_tables (0);
- foreach (varchar tbl in tbl_list) do
- {
- DB.DBA.RDB2RDF_PREPARE_TABLE (dump_prefix, tbl);
- }
-}
-;
-]]></programlisting>
-<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 ();
-DB.DBA.RDB2RDF_PREPARE_ALL_TABLES (cast (now() as varchar));
-]]></programlisting>
-<para>This does not copy the initial state of RDB2RDF graphs to the physical storage, because this can
- be dangerous for existing RDF data and even if all procedures will work as expected then they may
- produce huge amounts of RDF data, run out of transaction log limits and thus require
- application-specific precautions. It is also possible to make initial loading by a SPARUL statements
- like:
-</para>
-<programlisting><![CDATA[
-SPARQL
-INSERT IN <snapshot-graph> { ?s ?p ?o }
-FROM <snapshot-htaph>
-WHERE
- { quad map <id-of-rdf-view>
- { ?s ?p ?o }
- };
-]]></programlisting>
-</sect2>
-</sect1>
-
-
-
-<sect1 id="rdfnativestorageproviders"><title>RDF Data Access Providers (Drivers)</title>
- <sect2 id="rdfnativestorageprovidersjena"><title>Virtuoso Jena Provider</title>
- <sect3 id="rdfnativestorageprovidersjenawhatis"><title>What is Jena</title>
- <para>Jena is an open source Semantic Web framework for Java. It provides an API to
-extract data from and write to RDF graphs. The graphs are represented as an abstract "model".
-A model can be sourced with data from files, databases, URIs or a combination of these. A Model
-can also be queried through SPARQL and updated through SPARUL.
- </para>
- </sect3>
- <sect3 id="rdfnativestorageprovidersjenawhatisv"><title>What is the Virtuoso Jena Provider</title>
- <para>The Virtuoso Jena RDF Data Provider is a fully operational Native Graph Model Storage
-Provider for the Jena Framework, enables Semantic Web applications written using the Jena RDF
-Frameworks to query the Virtuoso RDF Quad store directly. The Provider has been tested against
-the <ulink url="http://jena.sourceforge.net/">Jena 2.5.5</ulink> version currently available.
- </para>
- <figure id="rdfnativestorageprovidersjena1" float="1">
- <title>Virtuoso Jena RDF Data Provider</title>
- <graphic fileref="ui/VirtJenaProvider.png"/>
- </figure>
- </sect3>
- <sect3 id="rdfnativestorageprovidersjenasetup"><title>Setup</title>
- <sect4 id="rdfnativestorageprovidersjenareqfiles"><title>Required Files</title>
- <itemizedlist mark="bullet">
- <listitem>Virtuoso Jena Provider JAR file, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/virt_jena.jar">virt_jena.jar</ulink></listitem>
- <listitem>Virtuoso JDBC Driver 3 JAR file, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/virtjdbc3.jar">virtjdbc3.jar</ulink></listitem>
- <listitem>Virtuoso JDBC Driver 4 JAR file, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/virtjdbc4.jar">virtjdbc4.jar</ulink></listitem>
- <listitem>Jena Framework and associated classes, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/jenajars.zip">jenajars.zip</ulink></listitem>
- <listitem>Sample programs, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/virtjenasamples.zip">virtjenasamples.zip</ulink></listitem>
- </itemizedlist>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenacmsmpr"><title>Compiling Jena Sample Programs</title>
- <orderedlist>
- <listitem>Edit the sample programs VirtuosoSPARQLExampleX.java, where X = 1 to 9.
-Set the JDBC connection strings within to point to a valid Virtuoso Server instance of the form:
-<programlisting><![CDATA[
-"jdbc:virtuoso://localhost:1111/charset=UTF-8/log_enable=2"
-]]></programlisting>
- <itemizedlist>
- <listitem>charset=UTF-8 will be added by Jena provider, if it isn't in connection string.
-So now you don't need add "charset=UTF-8" to the connection string any more, it is done by Jena provider.
-
- </listitem>
- <listitem>log_enable=2: to use row auto commit
- </listitem>
- <listitem>use these settings to process large rdf data.
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>Ensure that full paths to <emphasis>jena.jar, arq.jar,</emphasis> and
-<emphasis>virtjdbc3.jar</emphasis> are included in the active CLASSPATH setting.
- </listitem>
- <listitem>Compile the Jena Sample applications using the following command:
-<programlisting><![CDATA[
-javac -cp "jena.jar:arq.jar:virtjdbc3.jar:virt_jena.jar:." VirtuosoSPARQLExample1.java
-VirtuosoSPARQLExample2.java VirtuosoSPARQLExample3.java VirtuosoSPARQLExample4.java
-VirtuosoSPARQLExample5.java VirtuosoSPARQLExample6.java VirtuosoSPARQLExample7.java
-VirtuosoSPARQLExample8.java VirtuosoSPARQLExample9.java
-]]></programlisting>
- </listitem>
- </orderedlist>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenatesting"><title>Testing</title>
- <para>Once the Provider classes and sample program have been successfully compiled,
-the Provider can be tested using the sample programs included. Ensure your active CLASSPATH
-includes full paths to all of the following files, before executing the example commands:
- </para>
- <itemizedlist mark="bullet">
- <listitem>icu4j_3_4.jar</listitem>
- <listitem>iri.jar</listitem>
- <listitem>xercesImpl.jar</listitem>
- <listitem>axis.jar</listitem>
- <listitem>commons-logging-1.1.1.jar</listitem>
- <listitem>jena.jar</listitem>
- <listitem>arq.jar</listitem>
- <listitem>virtjdbc3.jar</listitem>
- <listitem>virt_jena.jar</listitem>
- </itemizedlist>
- <orderedlist>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples1">VirtuosoSPARQLExample1</link> returns the contents of the RDF Quad store of the targeted Virtuoso instance, with the following command:
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample1
-]]></programlisting>
- </listitem>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples2">VirtuosoSPARQLExample2</link> reads in the contents of the following FOAF URIs --
-<programlisting><![CDATA[
-http://kidehen.idehen.net/dataspace/person/kidehen#this
-http://www.w3.org/People/Berners-Lee/card#i
-http://demo.openlinksw.com/dataspace/person/demo#this
-]]></programlisting>
- <para>-- and returns the RDF data stored, with the following command:</para>
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample2
-]]></programlisting>
- </listitem>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples3">VirtuosoSPARQLExample3</link> performs simple addition and deletion operation on
-the content of the triple store, with the following command:
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample3
-]]></programlisting>
- </listitem>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples4">VirtuosoSPARQLExample4</link> demonstrates the use of the <emphasis>graph.contains</emphasis> method for searching triples, with the following command:
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample4
-]]></programlisting>
-</listitem>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples5">VirtuosoSPARQLExample5</link> demonstrates the use of the <emphasis>graph.find</emphasis> method for searching triples, with the following command:
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample5
-]]></programlisting>
- </listitem>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples6">VirtuosoSPARQLExample6</link> demonstrates the use of the <emphasis>graph.getTransactionHandler</emphasis> method, with the following command:
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample6
-]]></programlisting>
- </listitem>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples7">VirtuosoSPARQLExample7</link> demonstrates the use of the graph.getBulkUpdateHandler method, with the following command:
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample7
-]]></programlisting>
- </listitem>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples8">VirtuosoSPARQLExample8</link> demonstrates how to insert triples into a graph, with the following command:
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample8
-]]></programlisting>
- </listitem>
- <listitem><link linkend="rdfnativestorageprovidersjenaexamples9">VirtuosoSPARQLExample9</link> demonstrates the use of the <emphasis>CONSTRUCT, DESCRIBE,</emphasis> and <emphasis>ASK</emphasis> SPARQL query forms, with the following command:
-<programlisting><![CDATA[
-java VirtuosoSPARQLExample9
-]]></programlisting>
- </listitem>
- </orderedlist>
- </sect4>
- </sect3>
- <sect3 id="rdfnativestorageprovidersjenaexamples"><title>Examples</title>
- <sect4 id="rdfnativestorageprovidersjenaexamples1"><title>VirtJenaSPARQLExample1</title>
-<programlisting><![CDATA[
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-
-import virtuoso.jena.driver.*;
-
-public class VirtuosoSPARQLExample1 {
-
- /**
- * Executes a SPARQL query against a virtuoso url and prints results.
- */
- public static void main(String[] args) {
-
- String url;
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
-
-/* STEP 1 */
- VirtGraph set = new VirtGraph (url, "dba", "dba");
-
-/* STEP 2 */
-
-
-/* STEP 3 */
-/* Select all data in virtuoso */
- Query sparql = QueryFactory.create("SELECT * WHERE { GRAPH ?graph { ?s ?p ?o } } limit 100");
-
-/* STEP 4 */
- VirtuosoQueryExecution vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
-
- ResultSet results = vqe.execSelect();
- while (results.hasNext()) {
- QuerySolution result = results.nextSolution();
- RDFNode graph = result.get("graph");
- RDFNode s = result.get("s");
- RDFNode p = result.get("p");
- RDFNode o = result.get("o");
- System.out.println(graph + " { " + s + " " + p + " " + o + " . }");
- }
- }
-}
-
-]]></programlisting>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenaexamples2"><title>VirtJenaSPARQLExample2</title>
-<programlisting><![CDATA[
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-
-import virtuoso.jena.driver.*;
-
-public class VirtuosoSPARQLExample2 {
-
- /**
- * Executes a SPARQL query against a virtuoso url and prints results.
- */
- public static void main(String[] args) {
-
- String url;
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
-
-/* STEP 1 */
- VirtGraph graph = new VirtGraph ("Example2", url, "dba", "dba");
-
-/* STEP 2 */
-/* Load data to Virtuoso */
- graph.clear ();
-
- System.out.print ("Begin read from 'http://www.w3.org/People/Berners-Lee/card#i' ");
- graph.read("http://www.w3.org/People/Berners-Lee/card#i", "RDF/XML");
- System.out.println ("\t\t\t Done.");
-
- System.out.print ("Begin read from 'http://demo.openlinksw.com/dataspace/person/demo#this' ");
- graph.read("http://demo.openlinksw.com/dataspace/person/demo#this", "RDF/XML");
- System.out.println ("\t Done.");
-
- System.out.print ("Begin read from 'http://kidehen.idehen.net/dataspace/person/kidehen#this' ");
- graph.read("http://kidehen.idehen.net/dataspace/person/kidehen#this", "RDF/XML");
- System.out.println ("\t Done.");
-
-
-/* STEP 3 */
-/* Select only from VirtGraph */
- Query sparql = QueryFactory.create("SELECT ?s ?p ?o WHERE { ?s ?p ?o }");
-
-/* STEP 4 */
- VirtuosoQueryExecution vqe = VirtuosoQueryExecutionFactory.create (sparql, graph);
-
- ResultSet results = vqe.execSelect();
- while (results.hasNext()) {
- QuerySolution result = results.nextSolution();
- RDFNode graph_name = result.get("graph");
- RDFNode s = result.get("s");
- RDFNode p = result.get("p");
- RDFNode o = result.get("o");
- System.out.println(graph_name + " { " + s + " " + p + " " + o + " . }");
- }
-
- System.out.println("graph.getCount() = " + graph.getCount());
- }
+ SELECT DISTINCT (str(?qm)) as ?qmiri
+ WHERE { GRAPH `iri(?:graphiri)` {
+ `iri(?:root)` virtrdf:qmUserSubMaps ?lst .
+ ?lst ?p ?qm .
+ FILTER (0 = bif:strstr (str(?p), str(rdf:_)))
+ } } ) AS sub ) );
+ FOREACH (VARCHAR qmid IN subqms) DO
+ DB.DBA.RDF_QM_CONTENT_OF_QM_TREE (graph_iri, storage, qmid, dict);
+ RETURN dict;
}
-]]></programlisting>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenaexamples3"><title>VirtJenaSPARQLExample3</title>
-<programlisting><![CDATA[
-import java.util.*;
-
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-
-import virtuoso.jena.driver.*;
+;
-public class VirtuosoSPARQLExample3
+CREATE FUNCTION DB.DBA.RDF_QM_GROUP_BY_SOURCE_TABLES (in qms ANY) returns ANY
{
- public static void main(String[] args)
- {
- String url;
-
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
-
- Node foo1 = Node.createURI("http://example.org/#foo1");
- Node bar1 = Node.createURI("http://example.org/#bar1");
- Node baz1 = Node.createURI("http://example.org/#baz1");
-
- Node foo2 = Node.createURI("http://example.org/#foo2");
- Node bar2 = Node.createURI("http://example.org/#bar2");
- Node baz2 = Node.createURI("http://example.org/#baz2");
-
- Node foo3 = Node.createURI("http://example.org/#foo3");
- Node bar3 = Node.createURI("http://example.org/#bar3");
- Node baz3 = Node.createURI("http://example.org/#baz3");
-
- List <Triple> triples = new ArrayList <Triple> ();
-
- VirtGraph graph = new VirtGraph ("Example3", url, "dba", "dba");
-
- graph.clear ();
-
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("Add 3 triples to graph <Example3>.");
-
- graph.add(new Triple(foo1, bar1, baz1));
- graph.add(new Triple(foo2, bar2, baz2));
- graph.add(new Triple(foo3, bar3, baz3));
-
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("graph.getCount() = " + graph.getCount());
-
- triples.add(new Triple(foo1, bar1, baz1));
- triples.add(new Triple(foo2, bar2, baz2));
-
- graph.isEmpty();
-
- System.out.println("Remove 2 triples from graph <Example3>");
- graph.remove(triples);
- System.out.println("graph.getCount() = " + graph.getCount());
- System.out.println("Please check result with isql tool.");
-
- /* EXPECTED RESULT:
-
-SQL> SPARQL
-SELECT ?s ?p ?o
-FROM <Example3>
-WHERE {?s ?p ?o};
-s p o
-VARCHAR VARCHAR VARCHAR
-_______________________________________________________________________________
-
-http://example.org/#foo3 http://example.org/#bar3 http://example.org/#baz3
-
-1 Rows. -- 26 msec.
-SQL>
-
-*/
-
- }
+ DECLARE res ANY;
+ DECLARE ctr INTEGER;
+ DECLARE graphiri VARCHAR;
+ graphiri := DB.DBA.JSO_SYS_GRAPH();
+ res := dict_new (LENGTH (qms) / 20);
+ FOREACH (VARCHAR qmiri IN qms) DO
+ {
+ DECLARE tbls, acc ANY;
+ tbls := ((SELECT DB.DBA.VECTOR_AGG (sub."tbl")
+ FROM (SELECT subsub."tbl"
+ FROM (
+ SPARQL DEFINE input:storage ""
+ SELECT DISTINCT ?tbl
+ WHERE { GRAPH `iri(?:graphiri)` {
+ { `iri(?:qmiri)` virtrdf:qmTableName ?tbl .
+ } UNION {
+ `iri(?:qmiri)` virtrdf:qmATables ?atbls .
+ ?atbls ?p ?atbl .
+ ?atbl virtrdf:qmvaTableName ?tbl
+ } UNION {
+ `iri(?:qmiri)` ?fldmap ?qmv .
+ ?qmv virtrdf:qmvATables ?atbls .
+ ?atbls ?p ?atbl .
+ ?atbl virtrdf:qmvaTableName ?tbl .
+ } } } ) subsub
+ ORDER BY 1 ) AS sub ) );
+ acc := dict_get (res, tbls);
+ IF (acc IS NULL)
+ vectorbld_init (acc);
+ vectorbld_acc (acc, qmiri);
+ dict_put (res, tbls, acc);
+ }
+ res := dict_to_vector (res, 2);
+ FOR (ctr := LENGTH (res); ctr > 0; ctr := ctr-2)
+ {
+ DECLARE acc ANY;
+ acc := aref_set_0 (res, ctr-1);
+ vectorbld_final (acc);
+ aset_zap_arg (res, ctr-1, acc);
+ }
+ RETURN res;
}
+;
+
+--test dbg_obj_princ (DB.DBA.RDF_QM_GROUP_BY_SOURCE_TABLES (dict_list_keys (DB.DBA.RDF_QM_CONTENT_OF_QM_TREE (null), 2)));
+--test dbg_obj_princ (dict_list_keys (DB.DBA.RDF_QM_CONTENT_OF_QM_TREE (null), 2));
+--test DB.DBA.RDF_QM_TREE_DUMP ('dump/demo', null, null, null);
+--test DB.DBA.RDF_QM_TREE_DUMP ('dump/tpch', 'http://localhost:8600/tpch', null, null);
]]></programlisting>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenaexamples4"><title>VirtJenaSPARQLExample4</title>
+</sect3>
+</sect2>
+ <sect2 id="rdfperfloading"><title>Loading RDF</title>
+ <para>There are many functions for loading RDF text, in RDF/XML and Turtle.</para>
+ <para>For loading RDF/XML, the best way is to split the data to be loaded into
+multiple streams and load these in parallel using <link linkend="fn_rdf_load_rdfxml"><function>RDF_LOAD_RDFXML ()</function></link>.
+To avoid running out of rollback space for large files and in order to have multiple concurrent loads not
+interfere with each other, the row autocommit mode should be enabled.</para>
+ <para>For example, </para>
<programlisting><![CDATA[
-import java.util.*;
-
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-
-import virtuoso.jena.driver.*;
-
-public class VirtuosoSPARQLExample4
-{
-
- public static void main(String[] args)
- {
- String url;
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
-
- Node foo1 = Node.createURI("http://example.org/#foo1");
- Node bar1 = Node.createURI("http://example.org/#bar1");
- Node baz1 = Node.createURI("http://example.org/#baz1");
-
- Node foo2 = Node.createURI("http://example.org/#foo2");
- Node bar2 = Node.createURI("http://example.org/#bar2");
- Node baz2 = Node.createURI("http://example.org/#baz2");
-
- Node foo3 = Node.createURI("http://example.org/#foo3");
- Node bar3 = Node.createURI("http://example.org/#bar3");
- Node baz3 = Node.createURI("http://example.org/#baz3");
-
- VirtGraph graph = new VirtGraph ("Example4", url, "dba", "dba");
-
- graph.clear ();
-
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
-
- System.out.println("Add 3 triples to graph <Example4>.");
-
- graph.add(new Triple(foo1, bar1, baz1));
- graph.add(new Triple(foo2, bar2, baz2));
- graph.add(new Triple(foo3, bar3, baz3));
-
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("graph.getCount() = " + graph.getCount());
-
- System.out.println ("graph.contains(new Triple(foo2, bar2, baz2) - " + graph.contains(new Triple(foo2, bar2, baz2)));
- System.out.println ("graph.contains(new Triple(foo2, bar2, baz3) - " + graph.contains(new Triple(foo2, bar2, baz3)));
-
- graph.clear ();
-
- }
-}
+log_enable (2);
+-- switch row-by-row autocommit on and logging off for this session
+DB.DBA.RDF_LOAD_RDFXML (file_to_string_output ('file.xml'), 'base_uri', 'target_graph');
+-- more files here ...
+checkpoint;
+]]></programlisting>
+<para>Loading a file with text like the above with isql will load the data. Since the transaction
+logging is off, make a manual checkpoint at the end to ensure that data is persisted upon server
+restart since there is no roll forward log.</para>
+<para>If large amounts of data are to be loaded, run multiple such streams in parallel. One may have
+for example 6 streams for 4 cores. This means that if up to two threads wait for disk, there is still work
+for all cores.</para>
+<para>Having substantially more threads than processors or disks is not particularly useful.</para>
+<para>There exist multithreaded load functions which will load one file on multiple threads:
+<link linkend="rdfapidataimportttlpmt">the DB.DBA.TTLP_MT() function</link> and
+<link linkend="rdfapidataimportxmlttlpmt">the DB.DBA.RDF_LOAD_RDFXML_MT() function</link>. Experience
+shows that loading multiple files on one thread per file is better.</para>
+<para>For loading Turtle, some platforms may have a non-reentrant Turtle parser. This means that only
+one load may run at a time. One can try this by calling
+<link linkend="rdfapidataimport"><function>ttlp ()</function></link> from two sessions at the same time.
+If these do not execute concurrently, then the best way may be to try
+<link linkend="rdfapidataimport"><function>ttlp_mt</function></link> and see if this runs faster than
+a single threaded ttlp call.</para>
+ <sect3 id="rdfperfloadingutility"><title>RDF Bulk Load Utility</title>
+ <para>The RDF loader utility facilitates parallel bulk loading of multiple RDF files. The utility
+ maintains a database table containing a list of files to load and the status of each file,
+ whether not loaded, loaded or loaded with error. The table also records load start and
+ end times.</para>
+ <para>One must have a dba group login for using this and the virtuoso.ini file access
+ control list must be set up so that the Virtuoso server can open the files to load.</para>
+ <para>Files are added to the load list with the function <link linkend="fn_ld_dir"><function>ld_dir</function></link>:</para>
+<programlisting><![CDATA[
+ld_dir (in dir_path varchar, in file_mask varchar, in target_graph varchar);
+]]></programlisting>
+ <para>The file mask is a SQL like pattern to match against the files in the directory.
+ For example:</para>
+<programlisting><![CDATA[
+ld_dir ('/data8/2848260', '%.gz', 'http://bsbm.org');
+]]></programlisting>
+ <para>would load the RDF in all files ending in .gz from the directory given as first parameter.
+ The RDF would be loaded in the http://bsbm.org graph.</para>
+ <para>If NULL is given for the graph, each file may go to a different graph specified in a
+ separate file with the name of the RDF source file plus the extension .graph.</para>
+ <para>A .graph file contains the target graph URI without any other content or whitespace.</para>
+ <para>The layout of the load_list table is as follows:</para>
+<programlisting><![CDATA[
+create table DB.DBA.LOAD_LIST (
+ ll_file varchar,
+ ll_graph varchar,
+ ll_state int default 0, -- 0 not started, 1 going, 2 done
+ ll_started datetime,
+ ll_done datetime,
+ ll_host int,
+ ll_work_time integer,
+ ll_error varchar,
+ primary key (ll_file))
+alter index LOAD_LIST on DB.DBA.LOAD_LIST partition (ll_file varchar)
+create index LL_STATE on DB.DBA.LOAD_LIST (ll_state, ll_file, ll_graph) partition (ll_state int)
+;
]]></programlisting>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenaexamples5"><title>VirtJenaSPARQLExample5</title>
+ <para>This table may be checked at any time during bulk load for the progress of the load.
+ ll_state is 1 for files being loaded and 2 for files whose loading has finished.
+ ll_error is NULL if the load finished without error, else it is the error message.</para>
+ <para>In order to load data from the files in load_list, run as dba:</para>
<programlisting><![CDATA[
-import java.util.*;
-
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-
-import virtuoso.jena.driver.*;
-
-public class VirtuosoSPARQLExample5
-{
-
- public static void main(String[] args)
- {
- String url;
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
-
- Node foo1 = Node.createURI("http://example.org/#foo1");
- Node bar1 = Node.createURI("http://example.org/#bar1");
- Node baz1 = Node.createURI("http://example.org/#baz1");
-
- Node foo2 = Node.createURI("http://example.org/#foo2");
- Node bar2 = Node.createURI("http://example.org/#bar2");
- Node baz2 = Node.createURI("http://example.org/#baz2");
-
- Node foo3 = Node.createURI("http://example.org/#foo3");
- Node bar3 = Node.createURI("http://example.org/#bar3");
- Node baz3 = Node.createURI("http://example.org/#baz3");
-
- VirtGraph graph = new VirtGraph ("Example5", url, "dba", "dba");
-
- graph.clear ();
-
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
-
- System.out.println("Add 3 triples to graph <Example5>.");
-
- graph.add(new Triple(foo1, bar1, baz1));
- graph.add(new Triple(foo2, bar2, baz2));
- graph.add(new Triple(foo3, bar3, baz3));
- graph.add(new Triple(foo1, bar2, baz2));
- graph.add(new Triple(foo1, bar3, baz3));
-
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("graph.getCount() = " + graph.getCount());
-
- ExtendedIterator iter = graph.find(foo1, Node.ANY, Node.ANY);
- System.out.println ("\ngraph.find(foo1, Node.ANY, Node.ANY) \nResult:");
- for ( ; iter.hasNext() ; )
- System.out.println ((Triple) iter.next());
-
- iter = graph.find(Node.ANY, Node.ANY, baz3);
- System.out.println ("\ngraph.find(Node.ANY, Node.ANY, baz3) \nResult:");
- for ( ; iter.hasNext() ; )
- System.out.println ((Triple) iter.next());
-
- iter = graph.find(foo1, Node.ANY, baz3);
- System.out.println ("\ngraph.find(foo1, Node.ANY, baz3) \nResult:");
- for ( ; iter.hasNext() ; )
- System.out.println ((Triple) iter.next());
-
- graph.clear ();
-
- }
-}
+DB.DBA.rdf_loader_run ();
+]]></programlisting>
+ <para>One may run several of these commands on parallel sessions for better throughput.</para>
+ <para>On a cluster one can do:</para>
+<programlisting><![CDATA[
+cl_exec ('rdf_ld_srv ()');
]]></programlisting>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenaexamples6"><title>VirtJenaSPARQLExample6</title>
+ <para>This will start one rdf_loader_run on each node of the cluster. Note that in such a
+ setting all the server processes must see the same files at the same path.</para>
+ <para>On an isql session one may execute rdf_loader_run () & several times, forking a new
+ isql for each such command, similarly to what a Unix shell does.</para>
+ <para>Because this load is non-transactional and non-logged, one must do an explicit checkpoint
+ after the load to guarantee a persistent state.</para>
+ <para>On a single server do:</para>
<programlisting><![CDATA[
-import java.util.*;
-
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-
-import virtuoso.jena.driver.*;
-
-public class VirtuosoSPARQLExample6
-{
-
- public static void main(String[] args)
- {
- String url;
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
-
- Node foo1 = Node.createURI("http://example.org/#foo1");
- Node bar1 = Node.createURI("http://example.org/#bar1");
- Node baz1 = Node.createURI("http://example.org/#baz1");
-
- Node foo2 = Node.createURI("http://example.org/#foo2");
- Node bar2 = Node.createURI("http://example.org/#bar2");
- Node baz2 = Node.createURI("http://example.org/#baz2");
-
- Node foo3 = Node.createURI("http://example.org/#foo3");
- Node bar3 = Node.createURI("http://example.org/#bar3");
- Node baz3 = Node.createURI("http://example.org/#baz3");
-
- VirtGraph graph = new VirtGraph ("Example6", url, "dba", "dba");
-
- graph.clear ();
-
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
-
- System.out.println("test Transaction Commit.");
- graph.getTransactionHandler().begin();
- System.out.println("begin Transaction.");
- System.out.println("Add 3 triples to graph <Example6>.");
-
- graph.add(new Triple(foo1, bar1, baz1));
- graph.add(new Triple(foo2, bar2, baz2));
- graph.add(new Triple(foo3, bar3, baz3));
-
- graph.getTransactionHandler().commit();
- System.out.println("commit Transaction.");
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("graph.getCount() = " + graph.getCount());
-
- ExtendedIterator iter = graph.find(Node.ANY, Node.ANY, Node.ANY);
- System.out.println ("\ngraph.find(Node.ANY, Node.ANY, Node.ANY) \nResult:");
- for ( ; iter.hasNext() ; )
- System.out.println ((Triple) iter.next());
+checkpoint;
+]]></programlisting>
+ <para>On a cluster do:</para>
+<programlisting><![CDATA[
+cl_exec ('checkpoint');
+]]></programlisting>
+ <para>The server(s) are online and can process queries and transactions while a bulk load
+ is in progress. Periodic checkpoints may occur during the load but the state is guaranteed
+ to be consistent only after running a checkpoint after all the bulk load threads
+ have finished.</para>
+ <para>A bulk load should not be forcibly stopped. To make a controlled stop, run:</para>
+<programlisting><![CDATA[
+rdf_load_stop ();
+]]></programlisting>
+ <para>This will cause the files being loaded at the time to finish load but no new loads
+ will start until explicitly started with <function>rdf_loader_run ()</function>.</para>
+ <para>Specially note that on a cluster the database will be inconsistent if one server
+ process does a checkpoint and another does not. Thus guaranteeing a checkpoint on all
+ is necessary. This is easily done with an isql script with the following content:</para>
+<programlisting><![CDATA[
+ld_dir ('/data8/2848260', '%.gz', 'http://bsbm.org');
- graph.clear ();
- System.out.println("\nCLEAR graph <Example6>");
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
+-- Record CPU time
+select getrusage ()[0] + getrusage ()[1];
- System.out.println("Add 1 triples to graph <Example6>.");
- graph.add(new Triple(foo1, bar1, baz1));
+rdf_loader_run () &
+rdf_loader_run () &
+rdf_loader_run () &
+rdf_loader_run () &
+rdf_loader_run () &
+rdf_loader_run () &
+rdf_loader_run () &
+rdf_loader_run () &
- System.out.println("test Transaction Abort.");
- graph.getTransactionHandler().begin();
- System.out.println("begin Transaction.");
- System.out.println("Add 2 triples to graph <Example6>.");
+wait_for_children;
+checkpoint;
- graph.add(new Triple(foo2, bar2, baz2));
- graph.add(new Triple(foo3, bar3, baz3));
+-- Record CPU time
+select getrusage ()[0] + getrusage ()[1];
+]]></programlisting>
+ <para>For a cluster, the equivalent is:</para>
+<programlisting><![CDATA[
+ld_dir ('/data8/2848260', '%.gz', 'http://bsbm.org');
- graph.getTransactionHandler().abort();
- System.out.println("abort Transaction.");
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("graph.getCount() = " + graph.getCount());
+cl_exec ('DB.DBA.RDF_LD_SRV (2)');
- iter = graph.find(Node.ANY, Node.ANY, Node.ANY);
- System.out.println ("\ngraph.find(Node.ANY, Node.ANY, Node.ANY) \nResult:");
- for ( ; iter.hasNext() ; )
- System.out.println ((Triple) iter.next());
+cl_exec ('checkpoint');
+]]></programlisting>
+ <para><function>rdf_loader_run ()</function> recognizes several file types, including .ttl, .nt, .xml, .rdf,
+ .owl, .nq, .n4, and others. Internally the function uses
+ <link linkend="fn_ttlp"><function>DB.DBA.ttlp()</function></link> or
+ <link linkend="fn_rdf_load_rdfxml"><function>DB.DBA.rdf_load_rdfxml</function></link>,
+ as appropriate.</para>
+ <para>See <link linkend="rdfperfloadinglod">the next section</link> for detailed description
+ of the <function>rdf_loader_run ()</function> function.</para>
+ </sect3>
+ <sect3 id="rdfperfloadinglod"><title>Loading LOD RDF data</title>
+<para>To load the rdf data to LOD instance, perform the following steps:
+</para>
+<itemizedlist mark="bullet">
+ <listitem>Configure & start cluster</listitem>
+ <listitem>Execute the file:
+<programlisting><![CDATA[
+--
+-- $Id$
+--
+-- Alternate RDF index scheme for cases where G unspecified
+--
+-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+-- project.
+--
+-- Copyright (C) 1998-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
+--
+--
- graph.clear ();
- System.out.println("\nCLEAR graph <Example6>");
+drop index RDF_QUAD_OGPS;
+checkpoint;
+create table R2 (G iri_id_8, S iri_id_8, P iri_id_8, O any, primary key (S, P, O, G))
+alter index R2 on R2 partition (S int (0hexffff00));
- }
-}
+log_enable (2);
+insert into R2 (G, S, P, O) SELECT G, S, P, O from rdf_quad;
+drop table RDF_QUAD;
+alter table r2 rename RDF_QUAD;
+checkpoint;
+create bitmap index RDF_QUAD_OPGS on RDF_QUAD (O, P, G, S) partition (O varchar (-1, 0hexffff));
+create bitmap index RDF_QUAD_POGS on RDF_QUAD (P, O, G, S) partition (O varchar (-1, 0hexffff));
+create bitmap index RDF_QUAD_GPOS on RDF_QUAD (G, P, O, S) partition (O varchar (-1, 0hexffff));
+checkpoint;
]]></programlisting>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenaexamples7"><title>VirtJenaSPARQLExample7</title>
+</listitem>
+ <listitem>Execute:
<programlisting><![CDATA[
-import java.util.*;
-
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
+SQL>cl_exec ('checkpoint);
+]]></programlisting>
+</listitem>
+ <listitem>Execute ld_dir ('directory' , 'mask' , 'graph'), for ex:
+<programlisting><![CDATA[
+SQL>ld_dir ('/dbs/data', '*.gz', 'http://dbpedia.org');
+]]></programlisting>
+</listitem>
+ <listitem>Execute on every node with separate client:
+<programlisting><![CDATA[
+SQL>rdf_loader_run();
+]]></programlisting>
+</listitem>
+</itemizedlist>
+</sect3>
-import virtuoso.jena.driver.*;
-public class VirtuosoSPARQLExample7
+ <sect3 id="rdfperfloadingunitpro"><title>Loading UniProt RDF data</title>
+<para>To load the uniprot data, create a function for example such as:</para>
+<programlisting><![CDATA[
+create function DB.DBA.UNIPROT_LOAD (in log_mode integer := 1)
{
+ DB.DBA.RDF_LOAD_RDFXML_MT (file_to_string_output('filename1'),'http://base_uri_1', 'destination_graph_1', log_mode, 3);
+ DB.DBA.RDF_LOAD_RDFXML_MT (file_to_string_output('filename2'),'http://base_uri_2', 'destination_graph_2', log_mode, 3);
+ ...
+ DB.DBA.RDF_LOAD_RDFXML_MT (file_to_string_output('filename9'),'http://base_uri_9', 'destination_graph_9', log_mode, 3);
+}
+]]></programlisting>
+<para>If you are starting from blank database and you can drop it and re-create in case of error signaled, use it this way:</para>
+<programlisting><![CDATA[
+checkpoint;
+checkpoint_interval(6000);
+DB.DBA.UNIPROT_LOAD (0),
+checkpoint;
+checkpoint_interval(60);
+]]></programlisting>
+<para>If the database contains important data already and there's no way to stop it and backup before the load then use:</para>
+<programlisting><![CDATA[
+checkpoint;
+checkpoint_interval(6000);
+DB.DBA.UNIPROT_LOAD (),
+checkpoint;
+checkpoint_interval(60);
+]]></programlisting>
+<para>Note that the 'number of threads' parameter of DB.DBA.RDF_LOAD_RDFXML() mentions threads
+used to process data from file, an extra thread will read the text and parse it,
+so for 4 CPU cores there's no need in parameter value greater than 3. Three processing
+threads per one parsing tread is usually good ratio because parsing is usually three
+times faster than the rest of loading so CPU loading is well balanced.
+If for example you are using 2 x Quad Xeon, then you can choose between 8
+single-threaded parsers or 2 parsers with 3 processing threads each. With 4 cores you may simply load
+file after file with 3 processing threads. The most important performance tuning is to set the
+[Parameters] section of virtuoso configuration file:</para>
+<programlisting><![CDATA[
+NumberOfBuffers = 1000000
+MaxDirtyBuffers = 800000
+MaxCheckpointRemap = 1000000
+DefaultIsolation = 2
+]]></programlisting>
+<para>Note: these numbers are reasonable for 16 GB RAM Linux box. Usually when there are no such massive operations as loading huge database, you can set up the values as:</para>
+<programlisting><![CDATA[
+NumberOfBuffers = 1500000
+MaxDirtyBuffers = 1200000
+MaxCheckpointRemap = 1500000
+DefaultIsolation = 2
+]]></programlisting>
+<tip>
+ <title>See Also:</title>
+ <para><link linkend=""></link></para>
+ <para><ulink url="http://www.openlinksw.com/dataspace/dav/wiki/Main/VirtConfigScale#Configuration%20Options">Virtuoso Configuration Options</ulink></para>
+</tip>
+<tip>
+ <title>Tip:</title>
+<para>Thus after loading all data you may wish to shutdown, tweak and start server again.
+If you have ext2fs or ext3fs filesystem, then it's better to have enough free space on disk not to
+make it more than 80% full. When it's almost full it may allocate database file badly, resulting
+in measurable loss of disk access speed. That is not Virtuoso-specific fact, but a common hint
+for all database-like applications with random access to big files.</para>
+</tip>
+<para>Here is an example of using awk file for splitting big file smaller ones:</para>
+<programlisting><![CDATA[
+BEGIN {
+ file_part=1000
+ e_line = "</rdf:RDF>"
+ cur=0
+ cur_o=0
+ file=0
+ part=file_part
+ }
+ {
+ res_file_i="res/"FILENAME
+ line=$0
+ s=$1
+ res_file=res_file_i"_"file".rdf"
- public static void main(String[] args)
- {
- String url;
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
-
- Node foo1 = Node.createURI("http://example.org/#foo1");
- Node bar1 = Node.createURI("http://example.org/#bar1");
- Node baz1 = Node.createURI("http://example.org/#baz1");
-
- Node foo2 = Node.createURI("http://example.org/#foo2");
- Node bar2 = Node.createURI("http://example.org/#bar2");
- Node baz2 = Node.createURI("http://example.org/#baz2");
-
- Node foo3 = Node.createURI("http://example.org/#foo3");
- Node bar3 = Node.createURI("http://example.org/#bar3");
- Node baz3 = Node.createURI("http://example.org/#baz3");
-
- List triples1 = new ArrayList();
- triples1.add(new Triple(foo1, bar1, baz1));
- triples1.add(new Triple(foo2, bar2, baz2));
- triples1.add(new Triple(foo3, bar3, baz3));
-
- List triples2 = new ArrayList();
- triples2.add(new Triple(foo1, bar1, baz1));
- triples2.add(new Triple(foo2, bar2, baz2));
-
- VirtGraph graph = new VirtGraph ("Example7", url, "dba", "dba");
+ if (index (s, "</rdf:Description>") == 1)
+ {
+ cur=cur+1
+ part=part-1
+ }
- graph.clear ();
+ if (part > 0)
+ {
+ print line >> res_file
+ }
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("Add List with 3 triples to graph <Example7> via BulkUpdateHandler.");
+ if (part == 0)
+ {
+# print "===================== " cur
+ print line >> res_file
+ print e_line >> res_file
+ close (res_file)
+ file=file+1
+ part=file_part
+ res_file=res_file_i"_"file".rdf"
+ system ("cp beg.txt " res_file)
+ }
+ }
+END { }
+]]></programlisting>
+ </sect3>
+ <sect3 id="rdfperfloadingdbpedia"><title>Loading DBPedia RDF data</title>
+<para>You can use the following script as an example for loading DBPedia RDF data in Virtuoso:</para>
+<programlisting><![CDATA[
+#!/bin/sh
- graph.getBulkUpdateHandler().add(triples1);
+PORT=$1
+USER=$2
+PASS=$3
+file=$4
+g=$5
+LOGF=`basename $0`.log
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("graph.getCount() = " + graph.getCount());
+if [ -z "$PORT" -o -z "$USER" -o -z "$PASS" -o -z "$file" -o -z "$g" ]
+then
+ echo "Usage: `basename $0` [DSN] [user] [password] [ttl-file] [graph-iri]"
+ exit
+fi
- ExtendedIterator iter = graph.find(Node.ANY, Node.ANY, Node.ANY);
- System.out.println ("\ngraph.find(Node.ANY, Node.ANY, Node.ANY) \nResult:");
- for ( ; iter.hasNext() ; )
- System.out.println ((Triple) iter.next());
+if [ ! -f "$file" -a ! -d "$file" ]
+then
+ echo "$file does not exists"
+ exit 1
+fi
+mkdir READY 2>/dev/null
+rm -f $LOGF $LOGF.*
- System.out.println("\n\nDelete List of 2 triples from graph <Example7> via BulkUpdateHandler.");
+echo "Starting..."
+echo "Logging into: $LOGF"
- graph.getBulkUpdateHandler().delete(triples2);
+DOSQL ()
+{
+ isql $PORT $USER $PASS verbose=on banner=off prompt=off echo=ON errors=stdout exec="$1" > $LOGF
+}
- System.out.println("graph.isEmpty() = " + graph.isEmpty());
- System.out.println("graph.getCount() = " + graph.getCount());
+LOAD_FILE ()
+{
+ f=$1
+ g=$2
+ echo "Loading $f (`cat $f | wc -l` lines) `date \"+%H:%M:%S\"`" | tee -a $LOG
- iter = graph.find(Node.ANY, Node.ANY, Node.ANY);
- System.out.println ("\ngraph.find(Node.ANY, Node.ANY, Node.ANY) \nResult:");
- for ( ; iter.hasNext() ; )
- System.out.println ((Triple) iter.next());
+ DOSQL "ttlp_mt (file_to_string_output ('$f'), '', '$g', 17); checkpoint;" > $LOGF
- graph.clear ();
- System.out.println("\nCLEAR graph <Example7>");
+ if [ $? != 0 ]
+ then
+ echo "An error occurred, please check $LOGF"
+ exit 1
+ fi
- }
-}
-]]></programlisting>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenaexamples8"><title>VirtJenaSPARQLExample8</title>
-<programlisting><![CDATA[
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.rdf.model.RDFNode;
+ line_no=`grep Error $LOGF | awk '{ match ($0, /line [0-9]+/, x) ; match (x[0], /[0-9]+/, y); print y[0] }'`
+ newf=$f.part
+ inx=1
+ while [ ! -z "$line_no" ]
+ do
+ cat $f | awk "BEGIN { i = 1 } { if (i==$line_no) { print \$0; exit; } i = i + 1 }" >> bad.nt
+ line_no=`expr $line_no + 1`
+ echo "Retrying from line $line_no"
+ echo "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ." > tmp.nt
+ cat $f | awk "BEGIN { i = 1 } { if (i>=$line_no) print \$0; i = i + 1 }" >> tmp.nt
+ mv tmp.nt $newf
+ f=$newf
+ mv $LOGF $LOGF.$inx
+ DOSQL "ttlp_mt (file_to_string_output ('$f'), '', '$g', 17); checkpoint;" > $LOGF
-import virtuoso.jena.driver.*;
+ if [ $? != 0 ]
+ then
+ echo "An error occurred, please check $LOGF"
+ exit 1
+ fi
+ line_no=`grep Error $LOGF | awk '{ match ($0, /line [0-9]+/, x) ; match (x[0], /[0-9]+/, y); print y[0] }'`
+ inx=`expr $inx + 1`
+ done
+ rm -f $newf 2>/dev/null
+ echo "Loaded. "
+}
-public class VirtuosoSPARQLExample8 {
+echo "======================================="
+echo "Loading started."
+echo "======================================="
- /**
- * Executes a SPARQL query against a virtuoso url and prints results.
- */
- public static void main(String[] args) {
+if [ -f "$file" ]
+then
+ LOAD_FILE $file $g
+ mv $file READY 2>> /dev/null
+elif [ -d "$file" ]
+then
+ for ff in `find $file -name '*.nt'`
+ do
+ LOAD_FILE $ff $g
+ mv $ff READY 2>> /dev/null
+ done
+else
+ echo "The input is not file or directory"
+fi
+echo "======================================="
+echo "Final checkpoint."
+DOSQL "checkpoint;" > temp.res
+echo "======================================="
+echo "Check bad.nt file for skipped triples."
+echo "======================================="
- String url;
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
+exit 0
-/* STEP 1 */
- VirtGraph set = new VirtGraph (url, "dba", "dba");
+]]></programlisting>
+ </sect3>
+ <sect3 id="rdfperfloadingbio2rdf"><title>Loading Bio2RDF data</title>
+<para>The shell script below was used to import files in n3 notation into OpenLink Virtuoso RDF storage.</para>
+<para>When an syntax error it will cut content from next line and will retry. This was used on ubuntu linux to import bio2rdf and freebase dumps.</para>
+<para>Note it uses gawk, so it must be available on system where is tried. Also for recovery additional disk space is needed at max the size of original file.</para>
+<programlisting><![CDATA[
+#!/bin/bash
-/* STEP 2 */
-System.out.println("\nexecute: CLEAR GRAPH <http://test1>");
- String str = "CLEAR GRAPH <http://test1>";
- VirtuosoUpdateRequest vur = VirtuosoUpdateFactory.create(str, set);
- vur.exec();
+PASS=$1
+f=$2
+g=$3
-System.out.println("\nexecute: INSERT INTO GRAPH <http://test1> { <aa> <bb> 'cc' . <aa1> <bb1> 123. }");
- str = "INSERT INTO GRAPH <http://test1> { <aa> <bb> 'cc' . <aa1> <bb1> 123. }";
- vur = VirtuosoUpdateFactory.create(str, set);
- vur.exec();
+# Usage
+if [ -z "$PASS" -o -z "$f" -o -z "$g" ]
+then
+ echo "Usage: $0 [password] [ttl-file] [graph-iri]"
+ exit
+fi
-/* STEP 3 */
-/* Select all data in virtuoso */
-System.out.println("\nexecute: SELECT * FROM <http://test1> WHERE { ?s ?p ?o }");
- Query sparql = QueryFactory.create("SELECT * FROM <http://test1> WHERE { ?s ?p ?o }");
+if [ ! -f "$f" ]
+then
+ echo "$f does not exists"
+ exit
+fi
-/* STEP 4 */
- VirtuosoQueryExecution vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+# Your port here
+PORT=1111 #`inifile -f dbpedia.ini -s Parameters -k ServerPort`
+if test -z "$PORT"
+then
+ echo "Cannot find INI and inifile command"
+ exit
+fi
- ResultSet results = vqe.execSelect();
- while (results.hasNext()) {
- QuerySolution rs = results.nextSolution();
- RDFNode s = rs.get("s");
- RDFNode p = rs.get("p");
- RDFNode o = rs.get("o");
- System.out.println(" { " + s + " " + p + " " + o + " . }");
- }
+# Initial run
+isql $PORT dba $PASS verbose=on banner=off prompt=off echo=ON errors=stdout exec="ttlp_mt (file_to_string_output ('$f'), '', '$g'); checkpoint;" > $0.log
+# If disconnect etc.
+if [ $? != 0 ]
+then
+ echo "An error occurred, please check $0.log"
+ exit
+fi
-System.out.println("\nexecute: DELETE FROM GRAPH <http://test1> { <aa> <bb> 'cc' }");
- str = "DELETE FROM GRAPH <http://test1> { <aa> <bb> 'cc' }";
- vur = VirtuosoUpdateFactory.create(str, set);
- vur.exec();
+# Check for error
+line_no=`grep Error $0.log | awk '{ match ($0, /line [0-9]+/, x) ; match (x[0], /[0-9]+/, y); print y[0] }'`
+newf=$f.part
+inx=1
-System.out.println("\nexecute: SELECT * FROM <http://test1> WHERE { ?s ?p ?o }");
- vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
- results = vqe.execSelect();
- while (results.hasNext()) {
- QuerySolution rs = results.nextSolution();
- RDFNode s = rs.get("s");
- RDFNode p = rs.get("p");
- RDFNode o = rs.get("o");
- System.out.println(" { " + s + " " + p + " " + o + " . }");
- }
+# Error recovery
+while [ ! -z "$line_no" ]
+do
+ cat $f | awk "BEGIN { i = 0 } { if (i==$line_no) { print \$0; exit; } i = i + 1 }" >> bad.nt
+ line_no=`expr $line_no + 1`
+ echo "Retrying from line $line_no"
+ cat $f | awk "BEGIN { i = 0 } { if (i>=$line_no) print \$0; i = i + 1 }" > tmp.nt
+ mv tmp.nt $newf
+ f=$newf
+ mv $0.log $0.log.$inx
+ # Run the recovered part
+ isql $PORT dba $PASS verbose=on banner=off prompt=off echo=ON errors=stdout exec="ttlp_mt (file_to_string_output ('$f'), '', '$g'); checkpoint;" > $0.log
+ if [ $? != 0 ]
+ then
+ echo "An error occurred, please check $0.log"
+ exit
+ fi
+ line_no=`grep Error $0.log | awk '{ match ($0, /line [0-9]+/, x) ; match (x[0], /[0-9]+/, y); print y[0] }'`
+ inx=`expr $inx + 1`
+done
+]]></programlisting>
-}
-}
+ </sect3>
+ </sect2>
+ <sect2 id="rdfperfsparul"><title>Using SPARUL</title>
+ <para>Since SPARUL updates are generally not meant to be transactional, it is
+ best to run these in <link linkend="fn_log_enable"><function>log_enable (2)</function></link> mode,
+ which commits every operation as it is done. This prevents one from running out of rollback space. Also for bulk updates, transaction logging can be turned off. If so, one should do a manual checkpoint after the operation to ensure persistence across server restart since there is no roll forward log.</para>
+<para>To have a roll forward log and row by row autocommit, one may use <link linkend="fn_log_enable"><function>log_enable (3)</function></link>. This will write constantly into the log which takes extra time. Having no logging and doing a checkpoint when the whole work is finished is faster.</para>
+<para>Many SPARUL operations can be run in parallel in this way. If they are independent with respect to their input and output, they can run in parallel and row by row autocommit will ensure they do not end up waiting for each others' locks.</para>
+ </sect2>
+ <sect2 id="rdfperfgeneraldbpedia"><title>DBpedia Benchmark</title>
+<para>We ran the DBpedia benchmark queries again with different configurations of Virtuoso.
+Comparing numbers given by different parties is a constant problem. In the case reported here,
+we loaded the full DBpedia 3, all languages, with about 198M triples, onto Virtuoso v5 and Virtuoso Cluster
+v6, all on the same 4 core 2GHz Xeon with 8G RAM. All databases were striped on 6 disks. The Cluster
+configuration was with 4 processes in the same box.
+We ran the queries in two variants:
+</para>
+<itemizedlist>
+ <listitem>With graph specified in the SPARQL FROM clause, using the default indices.</listitem>
+ <listitem>With no graph specified anywhere, using an alternate indexing scheme.</listitem>
+</itemizedlist>
+<para>The times below are for the sequence of 5 queries.
+As there is a query in the set that specifies no condition on S or O and only P,
+thus cannot be done with the default indices With Virtuoso v5. With Virtuoso Cluster v6 it can,
+because v6 is more space efficient. So we added the index:</para>
+<programlisting><![CDATA[
+create bitmap index rdf_quad_pogs on rdf_quad (p, o, g, s);
]]></programlisting>
- </sect4>
- <sect4 id="rdfnativestorageprovidersjenaexamples9"><title>VirtJenaSPARQLExample9</title>
+<table>
+<tgroup cols="4">
+<thead>
+<row>
+ <entry></entry>
+ <entry>Virtuoso v5 with gspo, ogps, pogs</entry>
+ <entry>Virtuoso Cluster v6 with gspo, ogps</entry>
+ <entry>Virtuoso Cluster v6 with gspo, ogps, pogs</entry>
+</row>
+</thead>
+<tbody>
+<row><entry>cold</entry><entry>210 s</entry><entry>136 s</entry><entry>33.4 s</entry></row>
+<row><entry>warm</entry><entry>0.600 s</entry><entry>4.01 s</entry><entry>0.628 s</entry></row>
+</tbody>
+</tgroup>
+</table>
+<para>Now let us do it without a graph being specified. Note that alter index is valid for v6 or higher.
+For all platforms, we drop any existing indices, and:</para>
<programlisting><![CDATA[
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.rdf.model.*;
-import java.util.Iterator;
-
-import virtuoso.jena.driver.*;
-
-public class VirtuosoSPARQLExample9 {
-
- /**
- * Executes a SPARQL query against a virtuoso url and prints results.
- */
- public static void main(String[] args) {
-
- String url;
- if(args.length == 0)
- url = "jdbc:virtuoso://localhost:1111";
- else
- url = args[0];
-
-/* STEP 1 */
- VirtGraph set = new VirtGraph (url, "dba", "dba");
+create table r2 (g iri_id_8, s, iri_id_8, p iri_id_8, o any, primary key (s, p, o, g))
+alter index R2 on R2 partition (s int (0hexffff00));
-/* STEP 2 */
- String str = "CLEAR GRAPH <http://test1>";
- VirtuosoUpdateRequest vur = VirtuosoUpdateFactory.create(str, set);
- vur.exec();
+log_enable (2);
+insert into r2 (g, s, p, o) SELECT g, s, p, o from rdf_quad;
- str = "INSERT INTO GRAPH <http://test1> { <http://aa> <http://bb> 'cc' . <http://aa1> <http://bb> 123. }";
- vur = VirtuosoUpdateFactory.create(str, set);
- vur.exec();
+drop table rdf_quad;
+alter table r2 rename RDF_QUAD;
+create bitmap index rdf_quad_opgs on rdf_quad (o, p, g, s) partition (o varchar (-1, 0hexffff));
+create bitmap index rdf_quad_pogs on rdf_quad (p, o, g, s) partition (o varchar (-1, 0hexffff));
+create bitmap index rdf_quad_gpos on rdf_quad (g, p, o, s) partition (o varchar (-1, 0hexffff));
+]]></programlisting>
+<para>The code is identical for v5 and v6, except that with v5 we use iri_id (32 bit) for
+the type, not iri_id_8 (64 bit). We note that we run out of IDs with v5 around a few billion
+triples, so with v6 we have double the ID length and still manage to be vastly more space efficient.</para>
+<para>With the above 4 indices, we can query the data pretty much in any combination without hitting
+a full scan of any index. We note that all indices that do not begin with s end with s as a bitmap.
+This takes about 60% of the space of a non-bitmap index for data such as DBpedia.</para>
+<para>If you intend to do completely arbitrary RDF queries in Virtuoso, then chances are
+you are best off with the above index scheme.</para>
+<table>
+<tgroup cols="3">
+<thead>
+<row>
+ <entry></entry>
+ <entry>Virtuoso v5 with gspo, ogps, pogs</entry>
+ <entry>Virtuoso Cluster v6 with gspo, ogps, pogs</entry>
+</row>
+</thead>
+<tbody>
+<row><entry>warm</entry><entry>0.595 s</entry><entry>0.617 s</entry></row>
+</tbody>
+</tgroup>
+</table>
+<para>The cold times were about the same as above, so not reproduced.</para>
+<para>It is in the SPARQL spirit to specify a graph and for pretty much any application,
+there are entirely sensible ways of keeping the data in graphs and specifying which ones are
+concerned by queries. This is why Virtuoso is set up for this by default.</para>
+<para>On the other hand, for the open web scenario, dealing with an unknown large number of graphs,
+enumerating graphs is not possible and questions like which graph of which source asserts x become
+relevant. We have two distinct use cases which warrant different setups of the database, simple as that.</para>
+<para>The latter use case is not really within the SPARQL spec, so implementations may or may not
+support this.</para>
+<para>Once the indices are right, there is no difference between specifying a graph and not specifying a
+graph with the queries considered. With more complex queries, specifying a graph or set of graphs does
+allow some optimizations that cannot be done with no graph specified. For example, bitmap intersections
+are possible only when all leading key parts are given.</para>
+<para>The best warm cache time is with v5; the five queries run under 600 ms after the first go.
+This is noted to show that all-in-memory with a single thread of execution is hard to beat.</para>
+<para>Cluster v6 performs the same queries in 623 ms. What is gained in parallelism is lost in latency
+if all operations complete in microseconds. On the other hand, Cluster v6 leaves v5 in the dust in any
+situation that has less than 100% hit rate. This is due to actual benefit from parallelism if operations
+take longer than a few microseconds, such as in the case of disk reads. Cluster v6 has substantially
+better data layout on disk, as well as fewer pages to load for the same content.</para>
+<para>This makes it possible to run the queries without the pogs index on Cluster v6 even when v5 takes prohibitively long.</para>
+<para>The purpose is to have a lot of RAM and space-efficient data representation.</para>
+<para>For reference, the query texts specifying the graph are below. To run without specifying
+the graph, just drop the FROM <http://dbpedia.org> from each query. The returned row counts are
+indicated below each query's text.</para>
+<programlisting><![CDATA[
+SQL>SPARQL
+SELECT ?p ?o
+FROM <http://dbpedia.org>
+WHERE
+ {
+ <http://dbpedia.org/resource/Metropolitan_Museum_of_Art> ?p ?o .
+ };
+p o
+VARCHAR VARCHAR
+_______________________________________________________________________________
-/* Select all data in virtuoso */
- Query sparql = QueryFactory.create("SELECT * FROM <http://test1> WHERE { ?s ?p ?o }");
- VirtuosoQueryExecution vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
- ResultSet results = vqe.execSelect();
- System.out.println("\nSELECT results:");
- while (results.hasNext()) {
- QuerySolution rs = results.nextSolution();
- RDFNode s = rs.get("s");
- RDFNode p = rs.get("p");
- RDFNode o = rs.get("o");
- System.out.println(" { " + s + " " + p + " " + o + " . }");
-}
+http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://umbel.org/umbel/ac/Artifact
+http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://dbpedia.org/class/yago/MuseumsInNewYorkCity
+http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://dbpedia.org/class/yago/ArtMuseumsAndGalleriesInTheUnitedStates
+http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://dbpedia.org/class/yago/Museum103800563
+..
+-- 335 rows
- sparql = QueryFactory.create("DESCRIBE <http://aa> FROM <http://test1>");
- vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+SQL>SPARQL
+PREFIX p: <http://dbpedia.org/property/>
+SELECT ?film1 ?actor1 ?film2 ?actor2
+FROM <http://dbpedia.org>
+WHERE
+ {
+ ?film1 p:starring <http://dbpedia.org/resource/Kevin_Bacon> .
+ ?film1 p:starring ?actor1 .
+ ?film2 p:starring ?actor1 .
+ ?film2 p:starring ?actor2 .
+};
- Model model = vqe.execDescribe();
- Graph g = model.getGraph();
- System.out.println("\nDESCRIBE results:");
- for (Iterator i = g.find(Node.ANY, Node.ANY, Node.ANY); i.hasNext();)
-{
- Triple t = (Triple)i.next();
- System.out.println(" { " + t.getSubject() + " " +
- t.getPredicate() + " " +
- t.getObject() + " . }");
- }
+film1 actor1 film2 ctor2
+VARCHAR VARCHAR VARCHAR ARCHAR
+http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon
+http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Meryl_Streep
+http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Joseph_Mazzello
+http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/David_Strathairn
+http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/Kevin_Bacon http://dbpedia.org/resource/The_River_Wild http://dbpedia.org/resource/John_C._Reilly
+...
+-- 23910 rows
+SQL>SPARQL
+PREFIX p: <http://dbpedia.org/property/>
+SELECT ?artist ?artwork ?museum ?director
+FROM <http://dbpedia.org>
+WHERE
+ {
+ ?artwork p:artist ?artist .
+ ?artwork p:museum ?museum .
+ ?museum p:director ?director
+ };
+artist artwork museum director
+VARCHAR VARCHAR VARCHAR VARCHAR
+_______________________________________________
- sparql = QueryFactory.create("CONSTRUCT { ?x <http://test> ?y } FROM <http://test1> WHERE { ?x <http://bb> ?y }");
- vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+http://dbpedia.org/resource/Paul_C%C3%A9zanne http://dbpedia.org/resource/The_Basket_of_Apples http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
+http://dbpedia.org/resource/Paul_Signac http://dbpedia.org/resource/Neo-impressionism http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
+http://dbpedia.org/resource/Georges_Seurat http://dbpedia.org/resource/Neo-impressionism http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
+http://dbpedia.org/resource/Edward_Hopper http://dbpedia.org/resource/Nighthawks http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
+http://dbpedia.org/resource/Mary_Cassatt http://dbpedia.org/resource/The_Child%27s_Bath http://dbpedia.org/resource/Art_Institute_of_Chicago James Cuno
+..
+-- 303 rows
- model = vqe.execConstruct();
- g = model.getGraph();
- System.out.println("\nCONSTRUCT results:");
- for (Iterator i = g.find(Node.ANY, Node.ANY, Node.ANY); i.hasNext();)
- {
- Triple t = (Triple)i.next();
- System.out.println(" { " + t.getSubject() + " " +
- t.getPredicate() + " " +
- t.getObject() + " . }");
- }
+SQL>SPARQL
+PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+SELECT ?s ?homepage
+FROM <http://dbpedia.org>
+WHERE
+ {
+ <http://dbpedia.org/resource/Berlin> geo:lat ?berlinLat .
+ <http://dbpedia.org/resource/Berlin> geo:long ?berlinLong .
+ ?s geo:lat ?lat .
+ ?s geo:long ?long .
+ ?s foaf:homepage ?homepage .
+ FILTER (
+ ?lat <= ?berlinLat + 0.03190235436 &&
+ ?long >= ?berlinLong - 0.08679199218 &&
+ ?lat >= ?berlinLat - 0.03190235436 &&
+ ?long <= ?berlinLong + 0.08679199218) };
+s homepage
+VARCHAR VARCHAR
+_______________________________________________________________________________
- sparql = QueryFactory.create("ASK FROM <http://test1> WHERE { <http://aa> <http://bb> ?y }");
- vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+http://dbpedia.org/resource/Berlin_University_of_the_Arts http://www.udk-berlin.de/
+http://dbpedia.org/resource/Berlin_University_of_the_Arts http://www.udk-berlin.de/
+http://dbpedia.org/resource/Berlin_Zoological_Garden http://www.zoo-berlin.de/en.html
+http://dbpedia.org/resource/Federal_Ministry_of_the_Interior_%28Germany%29 http://www.bmi.bund.de
+http://dbpedia.org/resource/Neues_Schauspielhaus http://www.goya-berlin.com/
+http://dbpedia.org/resource/Bauhaus_Archive http://www.bauhaus.de/english/index.htm
+http://dbpedia.org/resource/Canisius-Kolleg_Berlin http://www.canisius-kolleg.de
+http://dbpedia.org/resource/Franz%C3%B6sisches_Gymnasium_Berlin http://www.fg-berlin.cidsnet.de
+..
+-- 48 rows
- boolean res = vqe.execAsk();
- System.out.println("\nASK results: "+res);
+SQL>SPARQL
+PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX p: <http://dbpedia.org/property/>
+SELECT ?s ?a ?homepage
+FROM <http://dbpedia.org>
+WHERE
+ {
+ <http://dbpedia.org/resource/New_York_City> geo:lat ?nyLat .
+ <http://dbpedia.org/resource/New_York_City> geo:long ?nyLong .
+ ?s geo:lat ?lat .
+ ?s geo:long ?long .
+ ?s p:architect ?a .
+ ?a foaf:homepage ?homepage .
+ FILTER (
+ ?lat <= ?nyLat + 0.3190235436 &&
+ ?long >= ?nyLong - 0.8679199218 &&
+ ?lat >= ?nyLat - 0.3190235436 &&
+ ?long <= ?nyLong + 0.8679199218) };
+s a homepage
+VARCHAR VARCHAR VARCHAR
+_______________________________________________________________________________
+http://dbpedia.org/resource/GE_Building http://dbpedia.org/resource/Associated_Architects http://www.associated-architects.co.uk
+http://dbpedia.org/resource/Giants_Stadium http://dbpedia.org/resource/HNTB http://www.hntb.com/
+http://dbpedia.org/resource/Fort_Tryon_Park_and_the_Cloisters http://dbpedia.org/resource/Frederick_Law_Olmsted http://www.asla.org/land/061305/olmsted.html
+http://dbpedia.org/resource/Central_Park http://dbpedia.org/resource/Frederick_Law_Olmsted http://www.asla.org/land/061305/olmsted.html
+http://dbpedia.org/resource/Prospect_Park_%28Brooklyn%29 http://dbpedia.org/resource/Frederick_Law_Olmsted http://www.asla.org/land/061305/olmsted.html
+http://dbpedia.org/resource/Meadowlands_Stadium http://dbpedia.org/resource/360_Architecture http://oakland.athletics.mlb.com/oak/ballpark/new/faq.jsp
+http://dbpedia.org/resource/Citi_Field http://dbpedia.org/resource/HOK_Sport_Venue_Event http://www.hoksve.com/
+http://dbpedia.org/resource/Citigroup_Center http://dbpedia.org/resource/Hugh_Stubbins_Jr. http://www.klingstubbins.com
+http://dbpedia.org/resource/150_Greenwich_Street http://dbpedia.org/resource/Fumihiko_Maki http://www.pritzkerprize.com/maki2.htm
+http://dbpedia.org/resource/Freedom_Tower http://dbpedia.org/resource/David_Childs http://www.som.com/content.cfm/www_david_m_childs
+http://dbpedia.org/resource/7_World_Trade_Center http://dbpedia.org/resource/David_Childs http://www.som.com/content.cfm/www_david_m_childs
+http://dbpedia.org/resource/The_New_York_Times_Building http://dbpedia.org/resource/Renzo_Piano http://www.rpbw.com/
+http://dbpedia.org/resource/Trump_World_Tower http://dbpedia.org/resource/Costas_Kondylis http://www.kondylis.com
- }
-}
+13 Rows. -- 2183 msec.
+]]></programlisting>
+ </sect2>
+<sect2 id="rdfstorebenchmarks"><title>RDF Store Benchmarks</title>
+ <sect3 id="rdfstorebenchmarksintroduction"><title>Introduction</title>
+ <para>In a particular RDF Store Benchmarks there is difference if the queries are
+executed with specified graph or with specified multiple graphs. As Virtuoso is quad store,
+not triple store with many tables, it runs queries inefficiently if graphs are specified
+and there are no additional indexes except pre-set GSPO and OGPS. Proper use of the FROM clause
+or adding indexes with graph column will contribute for better results.
+ </para>
+ </sect3>
+ <sect3 id="rdfstorebenchmarksindexusage"><title>Using bitmap indexes</title>
+ <para>If is known in advance for the current RDF Store Benchmarks that some
+users will not indicate specific graphs then should be done: </para>
+ <itemizedlist>
+ <listitem>either create indexes with graph in last position</listitem>
+ <listitem>or load everything into single graph and specify it somewhere in querying application.</listitem>
+ </itemizedlist>
+ <para>Both methods do not require any changes in query texts</para>
+<itemizedlist mark="bullet">
+ <listitem>For users using Virtuoso 5 is strongly recommended is the usage of additional bitmap indexes:
+<programlisting><![CDATA[
+SQL> create bitmap index RDF_QUAD_POGS on DB.DBA.RDF_QUAD (P,O,G,S);
+SQL> create bitmap index RDF_QUAD_PSOG on DB.DBA.RDF_QUAD (P,S,O,G);
+]]></programlisting>
+</listitem>
+ <listitem>For users using Virtuoso 6 or higher, see the new layout <link linkend="rdfperfrdfscheme">here</link>.</listitem>
+</itemizedlist>
+ <para>You can create other indexes as well. Bitmap indexes are preferable, but
+if O is the last column, then the index can not be bitmap, so it could be, for e.g.:</para>
+<programlisting><![CDATA[
+create index RDF_QUAD_PSGO on DB.DBA.RDF_QUAD (P, S, G, O);
+]]></programlisting>
+ <para>but cannot be:</para>
+<programlisting><![CDATA[
+create bitmap index RDF_QUAD_PSGO on DB.DBA.RDF_QUAD (P, S, G, O);
+]]></programlisting>
+ </sect3>
+ </sect2>
+ <sect2 id="fastapproxdiffandpatch"><title>Fast Approximate RDF Graph Diff and Patch</title>
+<para>Two algorithms described below resemble "unified diff" and "patch by unified diff"
+but they work on RDF graphs, not on plain texts.
+</para>
+<para>They work reasonably for graphs composed from CBDs (concise bounded descriptions) of
+some subjects, if these subjects are either "named" IRIs or can be identified by values of
+their inverse functional properties.
+</para>
+<para>Many sorts of commonly used graphs match these restrictions, including all graphs
+without blank nodes, most of FOAF files, graphs that can be "pretty-printed" in JSON, most
+of dumps of relational databases etc.
+</para>
+<para>The basic idea is as simple as zipper:
+</para>
+<itemizedlist mark="bullet">
+ <listitem>Place one graph at the left and one to the right,</listitem>
+ <listitem>Find a retainer box at the right and a matching pin at the left,</listitem>
+ <listitem>Join them</listitem>
+ <listitem>Pull the slider as long as possible.</listitem>
+ <listitem>Repeat this while there are pins and boxes that can be matched and sliders that can be moved.</listitem>
+</itemizedlist>
+<para>An IRI in left graph <code>(say, G1)</code> matches to same IRI in right graph <code>(G2)</code>
+as pin to box. The same is true for literals too.
+</para>
+<para>Functional and inverse functional properties are teeth that form chains, algorithm "moves sliders" along these chains, incrementally connecting more and more nodes.
+</para>
+<para>If there is a match of this sort <code>(O1 in G1 matches O2 in G2)</code> and the matched nodes
+are values of same inverse functional property <code>P</code> (there are <code>{ S1 P O1 }</code> in
+<code>G1</code> and <code>{ S2 P O2 }</code> in <code>G2</code>) then we guess that <code>S1</code>
+matches <code>S2</code>.
+</para>
+<para>If <code>S1</code> in <code>G1</code> matches <code>S2</code> in <code>G2</code> and the matched
+nodes are subjects of same functional property <code>P</code> ( there are <code>{ S1 P N1 }</code> in
+<code>G1</code> and <code>{ S2 P N2 }</code> in <code>G2</code> ) then we guess that <code>N1</code>
+matches <code>N2</code>, now it's possible to try same interaction on triples where <code>N1</code> and
+<code>N2</code> are in subject position, that's how slides move. A typical example of a long zipper
+is closed list with matched heads.
+</para>
+<sect3 id="fastapproxdiffandpatchhow"><title>Make a Diff And Use It</title>
+<itemizedlist mark="bullet">
+ <listitem>Using <link linkend="fn_rdf_graph_diff">DB.DBA.RDF_GRAPH_DIFF</link></listitem>
+ <listitem>Using <link linkend="fn_rdf_suo_diff_ttl">DB.DBA.RDF_SUO_DIFF_TTL</link></listitem>
+ <listitem>Using <link linkend="fn_rdf_suo_apply_patch">DB.DBA.RDF_SUO_APPLY_PATCH</link></listitem>
+</itemizedlist>
+</sect3>
+<sect3 id="fastapproxdiffandpatchclt"><title>Collect Functional And Inverse Functional Properties</title>
+<para>Lists of functional properties can be retrieved from an ontology graph by query like:</para>
+<programlisting><![CDATA[
+SPARQL define output:valmode "LONG"
+SELECT (<LONG::sql:VECTOR_AGG(?s))
+FROM <my-ontology-graph>
+WHERE
+ {
+ ?s a owl:functionalProperty
+ }
]]></programlisting>
- </sect4>
- </sect3>
- <sect3 id="rdfnativestorageprovidersjenajavadoc"><title>Javadoc API Documentation</title>
- <para><ulink url="http://docs.openlinksw.com/jena/">Jena Provider Javadoc API Documentation</ulink> is available enabling the complete set of classes, interfaces and methods implemented for the provider to be viewed.
+<para>Inverse functional properties could be retrieved by a similar query, but unfortunately the
+ ontology may mention so called NULL values that can be property values for many subjects. Current
+ implementation of diff and patch does not recognize NULL values so they can cause patch with
+ "false alarm" errors. The workaround is to retrieve only properties that have no NULL values declared:
</para>
- </sect3>
-</sect2>
- <sect2 id="rdfnativestorageproviderssesame"><title>Virtuoso Sesame Provider</title>
- <sect3 id="rdfnativestorageproviderssesamewhatis"><title>What is Sesame</title>
- <para>Sesame is an open source Java framework for storing, querying and reasoning with RDF and RDF Schema. It can be used as a database for RDF and RDF Schema, or as a Java library for applications that need to work with RDF internally. For example, suppose you need to read a big RDF file, find the relevant information for your application, and use that information. Sesame provides you with the necessary tools to parse, interpret, query and store all this information, embedded in your own application if you want, or, if you prefer, in a separate database or even on a remote server. More generally: Sesame provides an application developer a toolbox that contains useful hammers screwdrivers etc. for doing 'Do-It-Yourself' with RDF.
- </para>
- </sect3>
- <sect3 id="rdfnativestorageproviderssesamewhatisvirtuososesameprovider"><title>What is the Virtuoso Sesame Provider</title>
- <para>The Virtuoso Sesame Provider is a fully operational Native Graph Model Storage Providers for the Sesame Framework, allowing users of Virtuoso to leverage the Sesame framework for modifying, querying, and reasoning with the Virtuoso quad store using the Java language. The Sesame Repository API offers a central access point for connecting to the Virtuoso quad store. Its purpose is to provides a java-friendly access point to Virtuoso. It offers various methods for querying and updating the data, while abstracting the details of the underlying machinery. The Provider has been tested against the <ulink url="http://sourceforge.net/project/showfiles.php?group_id=46509&package_id=168413">Sesame 2.1.2</ulink> version currently available.
- </para>
- <figure id="rdfnativestorageproviderssesame1" float="1">
- <title>Fig. 1 Sesame Component Stack</title>
- <graphic fileref="ui/VirtSesame2Provider.png"/>
- </figure>
- <para>If you need more information about how to set up your environment for working with the Sesame APIs, take a look at Chapter 4 of the Sesame User Guide, <ulink url="http://www.openrdf.org/doc/sesame2/users/RDF">Setting up to use the Sesame libraries</ulink>.
- </para>
- </sect3>
- <sect3 id="rdfnativestorageproviderssesamesetup"><title>Setup</title>
- <sect4 id="rdfnativestorageproviderssesamereqfiles"><title>Required Files</title>
- <para>This tutorial assumes you have Virtuoso server installed and that the database is accessible at "localhost:1111". In addition, you will need the latest version of the Virtuoso Sesame Provider, and Sesame 2 or greater installed.
- <para>You should download the Virtuoso Sesame 2 Provider JAR archive, Virtuoso JDBC Driver, Sesame Framework and associated classes and sample programs from our <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload">download page</ulink></para>
- </para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamecmppr"><title>Compiling Sesame Sample Program</title>
- <orderedlist>
- <listitem>Ensure that full paths to the following files are all included in the active CLASSPATH setting --
- <itemizedlist mark="bullet">
- <listitem>openrdf-sesame-2.1.2-onejar.jar</listitem>
- <listitem>slf4j-api-1.5.0.jar</listitem>
- <listitem>slf4j-jdk14-1.5.0.jar</listitem>
- <listitem>virtjdbc3.jar</listitem>
- <listitem>virt_sesame2.jar</listitem>
- </itemizedlist>
- </listitem>
- <listitem>Execute the following command:
<programlisting><![CDATA[
-javac VirtuosoTest.java
+SPARQL define output:valmode "LONG"
+SELECT (<LONG::sql:VECTOR_AGG(?s))
+FROM <my-ontology-graph>
+WHERE
+ {
+ ?s a owl:inverseFunctionalProperty .
+ OPTIONAL { ?s owl:nullIFPValue ?v }
+ FILTER (!Bound(?v))
+ }
]]></programlisting>
- <para>Note: to use utf-8 and to use row auto commit is recommended to add the following to the connect string:
- </para>
+<para>If no ontology is available then appropriate predicates can be obtained from sample graphs using
+ <link linkend="fn_rdf_graph_collect_fp_list">DB.DBA.RDF_GRAPH_COLLECT_FP_LIST</link>.
+</para>
+</sect3>
+<sect3 id="fastapproxdiffandpatchimpl"><title>Implementation-Specific Extensions of GUO Ontology</title>
+<para><emphasis>Note</emphasis>: This section contains implementation details that are needed only
+if you want to write your own patch or diff procedure, you don't have to worry about internals if
+you want to use existing procedures.
+</para>
+<para>Basic GUO ontology is not expressive enough to work with blank nodes, so some custom extensions $
+are needed.
+</para>
+<para>In the rest of the description:</para>
<programlisting><![CDATA[
-"/charset=UTF-8/log_enable=2"
--- i.e. in VirtuosoTest.java the line:
-Repository repository = new VirtuosoRepository("jdbc:virtuoso://" + sa[0] + ":" + sa[1], sa[2], sa[3]);
--- should become:
-Repository repository = new VirtuosoRepository("jdbc:virtuoso://" + sa[0] + ":" + sa[1]+ "/charset=UTF-8/log_enable=2", sa[2], sa[3]);
+ at prefix guo: <http://webr3.org/owl/guo#>
]]></programlisting>
- </listitem>
- </orderedlist>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesametesting"><title>Testing</title>
- <orderedlist>
- <listitem>Ensure that full paths to the following files are all included in the active CLASSPATH setting:
- <itemizedlist mark="bullet">
- <listitem>openrdf-sesame-2.1.2-onejar.jar</listitem>
- <listitem>slf4j-api-1.5.0.jar</listitem>
- <listitem>slf4j-jdk14-1.5.0.jar</listitem>
- <listitem>virtjdbc3.jar</listitem>
- <listitem>virt_sesame2.jar</listitem>
- <listitem>virtuoso_driver</listitem>
- </itemizedlist>
- </listitem>
- <listitem>Run the <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2Provider?att=VirtuosoTest.java">VirtuosoTest</ulink> program to test the Sesame 2 Provider with the following command:
+<para>is assumed.</para>
+<para>The diff contains one node of <code>rdf:type guo:diff</code>.
+</para>
+<para>For debugging purpose it has properties <code>guo:graph1</code> and <code>guo:graph2</code> that
+corespond to <code>gfrom</code> and <code>gto</code> arguments of <link linkend="fn_rdf_suo_diff_ttl">DB.DBA.RDF_SUO_DIFF_TTL</link>.
+</para>
+<para>The diff also contains zero or more nodes of <code>rdf:type guo:UpdateInstruction</code>. These
+nodes are as described in basic GUO ontology, but <code>guo:target_graph</code> is now optional,
+<code>guo:target_subject</code> can be a blank node and objects of predicates "inside" values of
+<code>guo:insert</code> and <code>guo:delete</code> can also be blank nodes. These blank nodes are
+"placeholders" for values, calculated according to the most important GUO extension - rule nodes.
+</para>
+<para>There are eight sorts of rule nodes, four for <code>gfrom</code> side of diff and four similar for
+<code>gto</code> side. Out of four sorts related to one side, two are for functional properties and
+two similar are for inverse functional properties. Thus <code>rdf:type-s</code> of these nodes are:
+</para>
<programlisting><![CDATA[
-java VirtuosoTest <hostname> <port> <uid> <pwd>
+guo:from-rule-FP0,
+guo:from-rule-FP1,
+guo:from-rule-IFP0,
+guo:from-rule-IFP1
]]></programlisting>
- </listitem>
- <listitem>The test run should look like this:
+<para>and
+</para>
<programlisting><![CDATA[
-$ java VirtuosoTest localhost 1111 dba dba
-
-== TEST 1: : Start
- Loading data from URL: http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com/foaf.rdf
-== TEST 1: : End
-PASSED: TEST 1
-
-== TEST 2: : Start
- Clearing triple store
-== TEST 2: : End
-PASSED: TEST 2
-
-== TEST 3: : Start
- Loading data from file: virtuoso_driver/data.nt
-== TEST 3: : End
-PASSED: TEST 3
-
-== TEST 4: : Start
- Loading UNICODE single triple
-== TEST 4: : End
-PASSED: TEST 4
-
-== TEST 5: : Start
- Loading single triple
-== TEST 5: : End
-PASSED: TEST 5
-
-== TEST 6: : Start
- Casted value type
-== TEST 6: : End
-PASSED: TEST 6
-
-== TEST 7: : Start
- Selecting property
-== TEST 7: : End
-PASSED: TEST 7
-
-== TEST 8: : Start
- Statement does not exists
-== TEST 8: : End
-PASSED: TEST 8
-
-== TEST 9: : Start
- Statement exists (by resultset size)
-== TEST 9: : End
-PASSED: TEST 9
-
-== TEST 10: : Start
- Statement exists (by hasStatement())
-== TEST 10: : End
-PASSED: TEST 10
-
-== TEST 11: : Start
- Retrieving namespaces
-== TEST 11: : End
-PASSED: TEST 11
-
-== TEST 12: : Start
- Retrieving statement (http://myopenlink.net/dataspace/person/kidehen http://myopenlink.net/foaf/name null)
-== TEST 12: : End
-PASSED: TEST 12
-
-== TEST 13: : Start
- Writing the statements to file: (/Users/hughwilliams/src/virtuoso-opensource/binsrc/sesame2/results.n3.txt)
-== TEST 13: : End
-PASSED: TEST 13
-
-== TEST 14: : Start
- Retrieving graph ids
-== TEST 14: : End
-PASSED: TEST 14
-
-== TEST 15: : Start
- Retrieving triple store size
-== TEST 15: : End
-PASSED: TEST 15
-
-== TEST 16: : Start
- Sending ask query
-== TEST 16: : End
-PASSED: TEST 16
-
-== TEST 17: : Start
- Sending construct query
-== TEST 17: : End
-PASSED: TEST 17
-
-== TEST 18: : Start
- Sending describe query
-== TEST 18: : End
-PASSED: TEST 18
-
-============================
-PASSED:18 FAILED:0
+guo:to-rule-FP0,
+guo:to-rule-FP1,
+guo:to-rule-IFP ,
+guo:to-rule-IFP1 .
+]]></programlisting>
+<para>Each rule node has property <code>guo:order</code> that is an non-negative integer.
+</para>
+<para>These integers enumerate all <code>guo:from-rule-</code>... nodes, starting from zero.
+</para>
+<para>When patch procedure works, these rules are used in this order, the result of each rule
+ is a blank node that either exists in the graph or just created.
+</para>
+<para>All results are remembered for use in the rest of the patch procedure.
+</para>
+<para>Similarly, other sequence of these integers enumerate all <code>guo:to-rule-</code>... nodes,
+also starting from zero.
+</para>
+<para>Consider a sequence of <code>guo:from-rule-</code>... nodes, because <code>guo:to-rule-</code>
+nodes have identical properties.
+</para>
+<para>A rule node can have zero or more values of <code>guo:dep</code> property, each value is a
+bnode that is rule node that should be calculated before the current one.
+</para>
+<para>Every rule has exactly one predicate <code>guo:path</code> that is a blank node. Each property
+of this blank node describes one possible "move of slider": predicate to follow is in predicate
+position and a node to start from is in object position. An IRI or a literal in object position is
+used as is, a blank node in object position should be of type <code>guo:from-rule-</code>... and
+have smaller <code>guo:order</code> so it refers to already calculated result bnode of some
+preceding rule.
+</para>
+<para>Rule of form:
+</para>
+<programlisting><![CDATA[
+R a guo:from-rule-IFP1 ;
+ guo:path [ P1 O1 ; P2 O2 ; ... ; Pn On ] .
]]></programlisting>
- </listitem>
- </orderedlist>
- </sect4>
- </sect3>
- <sect3 id="rdfnativestorageproviderssesamegettingstarted"><title>Getting Started</title>
- <para>This section covers the essentials for connecting to and manipulating data stored in a Virtuoso repository using the Sesame API. More information on the Sesame Framework, including extended examples on how to use the API, can be found in Chapter 8 of the Sesame User's guide,
-<ulink url="http://www.openrdf.org/doc/sesame2/2.1.2/users/ch08.html#d0e833">the RepositoryConnection API</ulink>.
- </para>
- <para>The interfaces for the Repository API can be found in packages virtuoso.sesame2.driver and org.openrdf.repository. Several implementations for these interface exist in the Virtuoso Provider download package. The
- <ulink url="http://www.openrdf.org/doc/sesame2/2.1.2/apidocs/">Javadoc reference for the Sesame API</ulink>
-is available online and can also be found in the doc directory of the download.
- </para>
- <sect4 id="rdfnativestorageproviderssesamegettingstartedcrrep"><title>Creating a VirtuosoRepositoryRDF object</title>
- <para>The first step to connecting to Virtuoso through the Sesame API is to create a Repository for it. The Repository object operates on (stacks of) Sail object(s) for storage and retrieval of RDF data.
- </para>
- <para>One of the simplest configurations is a repository that just stores RDF data in main memory without applying any inference or whatsoever. This is also by far the fastest type of repository that can be used. The following code creates and initialize a non-inferencing main-memory repository:
- </para>
+<para>searches for a unique blank node <code>_:Rres</code> that is a common subject of triples:
+</para>
<programlisting><![CDATA[
-import virtuoso.sesame2.driver.VirtuosoRepository;
-
-Repository myRepository = VirtuosoRepository("jdbc:virtuoso://localhost:1111”,”dba”,”dba”);
-
-myRepository.initialize();
+ _:Rres P1 O1
+ _:Rres P2 O2
+ . . .
+ _:Rres Pn On
]]></programlisting>
- <para>The constructor of the VirtuosoRepository class accepts the JDBC URL of the Virtuoso engine (the default port is 1111), the username and password of an authorized user. Following this example, the repository needs to be initialized to prepare the Sail(s) that it operates on, which includes operations such as restoring previously stored data, setting up connections to a relational database, etc.
- </para>
- <para>The repository that is created by the above code is volatile: its contents are lost when the object is garbage collected or when the program is shut down. This is fine for cases where, for example, the repository is used as a means for manipulating an RDF model in memory.
- </para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamegettingstartedrdfvirtcr"><title>Creating a Virtuoso Repository Connection</title>
- <para>Now that we have created a VirtuosoRepository object instance, we want to do something
- with it. This is achieved through the use of the VirtuosoRepositoryConnection class, which
- can be created by the VirtuosoRepository class.
- </para>
- <para>A VirtuosoRepositoryConnection represents - as the name suggests - a connection to the
- actual Virtuoso quad store. We can issue operations over this connection, and close it when
- we are done to make sure we are not keeping resources unnecessarily occupied.
- </para>
- <para>In the following sections, we will show some examples of basic operations using the Northwind dataset.
- </para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamegettingstartedrdfvirt"><title>Adding RDF to Virtuoso</title>
- <para>The Repository implements the Sesame Repository API offers various methods for adding data to a repository. Data can be added pro grammatically by specifying the location of a file that contains RDF data, and statements can be added individually or in collections.
- </para>
- <para>We perform operations on the repository by requesting a RepositoryConnection from the
- repository, which returns a VirtuosoRepositoryConnection object. On this
- VirtuosoRepositoryConnection object we can perform the various operations, such as query
- evaluation, getting, adding, or removing statements, etc.
- </para>
- <para>The following example code adds two files, one local and one located on the WWW, to a repository:
- </para>
+<para>in the gfrom graph.
+</para>
+<para>If subjects differ in these triples or some triples are not found or the subject is not a
+ blank node then an appropriate error is logged and rule fails, otherwise <code>_:Rres</code>
+ is remembered as the result of the rule.
+</para>
+<para>Similarly, rule of form:
+</para>
<programlisting><![CDATA[
-import org.openrdf.repository.RepositoryException;
-
-import org.openrdf.repository.Repository;
-
-import org.openrdf.repository.RepositoryConnection;
-
-import org.openrdf.rio.RDFFormat;
-
-import java.io.File;
-
-import java.net.URL;
-
-File file = new File("/path/to/example.rdf");
-
-String baseURI = "http://example.org/example/localRDF";
-
-?
-
-try {
-
- RepositoryConnection con = myRepository.getConnection();
-
- try {
-
- con.add(file, baseURI, RDFFormat.RDFXML);
-
- URL url = new URL("http://example.org/example/remoteRDF");
-
- con.add(url, url.toString(), RDFFormat.RDFXML);
-
- }
-
- finally {
-
- con.close();
-
- }
-
-}
-
-catch (RepositoryException rex) {
-
- // handle exception
-
-}
-
-catch (java.io.IOEXception e) {
-
- // handle io exception
-
- }
+R a guo:from-rule-FP1 ;
+ guo:path [ P1 O1 ; P2 O2 ; ... ; Pn On ] .
]]></programlisting>
- <para>More information on other available methods can be found in the javadoc
-reference of the RepositoryConnection interface.
- </para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamegettingstartedqr"><title>Querying Virtuoso</title>
- <para>The Repository API has a number of methods for creating and evaluating queries. Three types of queries are distinguished: tuple queries, graph queries and boolean queries. The query types differ in the type of results that they produce.
- </para>
- <para><emphasis>Select Query:</emphasis> The result of a select query is a set of tuples (or
- variable bindings), where each tuple represents a solution of a query. This type of query is
- commonly used to get specific values (URIs, blank nodes, literals) from the stored RDF data.
- The method QueryFactory.executeQuery() returns a Value [ ][ ] for sparql “SELECT” queries.
-The method QueryFactory.executeQuery() also calls the QueryFactory.setResult() which populates
-a set of tuples for SPARQL "SELECT" queries. The graph can be retrieved using
-QueryFactory.getBooleanResult().
- </para>
- <para><emphasis>Graph Query:</emphasis> The result of graph queries is an RDF graph (or set of statements). This type of query is very useful for extracting sub-graphs from the stored RDF data, which can then be queried further, serialized to an RDF document, etc. The method QueryFactory.executeQuery() calls the QueryFactory.setGraphResult() which populates a graph for SPARQL “DESCRIBE” and “CONSTRUCT” queries. The graph can be retrieved using QueryFactory.getGraphResult().
- </para>
- <para><emphasis>Boolean Query:</emphasis> The result of boolean queries is a simple boolean value, i.e. true of false. This type of query can be used to check if a repository contains specific information. The method QueryFactory.executeQuery() calls the QueryFactory.setBooleanResult() which sets a boolean value for sparql "ASK" queries. The value can be retrieved using QueryFactory.getBooleanResult().
- </para>
- <para>Note: Although Sesame 2 currently supports two query languages: SeRQL and SPARQL, the Virtuoso provider only supports the W3C SPARQL specification.
- </para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamegettingstartevq"><title>Evaluating a SELECT Query</title>
- <para>To evaluate a tuple query we simply do the following:
- </para>
+<para>searches for a unique blank node <code>_:Rres</code> that is a common object of triples:
+</para>
<programlisting><![CDATA[
-import java.util.List;
-
-import org.openrdf.OpenRDFException;
-
-import org.openrdf.repository.RepositoryConnection;
-
-import org.openrdf.query.TupleQuery;
-
-import org.openrdf.query.TupleQueryResult;
-
-import org.openrdf.query.BindingSet;
-
-import org.openrdf.query.QueryLanguage;
-
-?
-
-try {
-
- RepositoryConnection con = myRepository.getConnection();
-
- try {
-
- String queryString = "SELECT x, y FROM WHERE {x} p {y}";
-
- TupleQuery tupleQuery = con.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
-
- TupleQueryResult result = tupleQuery.evaluate();
-
- try {
-
- ? // do something with the result
-
- }
-
- finally {
-
- result.close();
-
- }
-
-}
-
- finally {
-
- con.close();
-
- }
-
-}
-
-catch (RepositoryException e) {
-
- // handle exception
-
-}
+ O1 P1 _:Rres
+ O2 P2 _:Rres
+ . . .
+ On Pn _:Rres
]]></programlisting>
- <para>This evaluates a SPARQL query and returns a TupleQueryResult, which consists of a sequence
- of BindingSet objects. Each BindingSet contains a set of pairs called Binding objects. A
- Binding object represents a name/value pair for each variable in the query's projection.
- </para>
- <para>We can use the TupleQueryResult to iterate over all results and get each individual result for x and y:
- </para>
+<para>in the gfrom graph.
+</para>
+<para>Rule of form:
+</para>
+<programlisting><![CDATA[
+R a guo:from-rule-IFP0 ;
+ guo:path [ P1 O1 ; P2 O2 ; ... ; Pn On ] .
+]]></programlisting>
+<para>ensures that the <code>gfrom</code> graph does not contain any triple like:
+</para>
+<programlisting><![CDATA[
+ _:Rres P1 O1
+ _:Rres P2 O2
+]]></programlisting>
+<para>or
+</para>
+<programlisting><![CDATA[
+_:Rres Pn On
+]]></programlisting>
+<para>It is an error if something exists. If nothing found then the result of the rule is
+ newly created unique blank node. That's how patch procedure creates new blank nodes when
+ it inserts "totally new" data.
+</para>
+<para>Similarly, rule of form:
+</para>
+<programlisting><![CDATA[
+R a guo:from-rule-IFP0 ;
+ guo:path [ P1 O1 ; P2 O2 ; ... ; Pn On ] .
+]]></programlisting>
+<para>ensures that the <code>gfrom</code> graph does not contain any triple like:
+</para>
+<programlisting><![CDATA[
+O1 P1 _:Rres
+O2 P2 _:Rres
+]]></programlisting>
+<para>or
+</para>
<programlisting><![CDATA[
-while (result.hasNext()) {
-
- BindingSet bindingSet = result.next();
-
- Value valueOfX = bindingSet.getValue("x");
-
- Value valueOfY = bindingSet.getValue("y");
-
- // do something interesting with the query variable values here?
-
-}
+ On Pn _:Rres
]]></programlisting>
- <para>As you can see, we retrieve values by name rather than by an index. The names used should be the names of variables as specified in your query. The TupleQueryResult.getBindingNames() method returns a list of binding names, in the order in which they were specified in the query. To process the bindings in each binding set in the order specified by the projection, you can do the following:
- </para>
+<para>Current version of patch procedure does not use rules <code>guo:to-rule-</code>... ,
+however they can be used by custom procedure of few sorts. First, these rules can be used to
+produce a "reversed diff". Next, these rules can be used to validate the result of the patch -
+if the patch can not be reverted then the result is "suspicious".
+</para>
+</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.
+ 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,
+ 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
+ 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
+ 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
+ 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.
+</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
+ in some other storage, e.g., virtrdf:DefaultQuadStorage and then added to virtrdf:SyncToQuads via:
+</para>
<programlisting><![CDATA[
-List bindingNames = result.getBindingNames();
-
-while (result.hasNext()) {
-
- BindingSet bindingSet = result.next();
-
- Value firstValue = bindingSet.getValue(bindingNames.get(0));
-
- Value secondValue = bindingSet.getValue(bindingNames.get(1));
-
- // do something interesting with the values here?
-
-}
+sparql alter quad storage virtrdf:SyncToQuads {
+ create <my_rdf_view> using storage virtrdf:DefaultQuadStorage };
]]></programlisting>
- <para>It is important to invoke the close() operation on the TupleQueryResult,
- after we are done with it. A TupleQueryResult evaluates lazily and keeps resources
- (such as connections to the underlying database) open. Closing the TupleQueryResult
- frees up these resources. Do not forget that iterating over a result may cause exceptions!
- The best way to make sure no connections are kept open unnecessarily is to invoke close()
- in the finally clause.
- </para>
- <para>An alternative to producing a TupleQueryResult is to supply an object that implements the
- TupleQueryResultHandler interface to the query's evaluate() method. The main difference is
- that when using a return object, the caller has control over when the next answer is retrieved,
- whereas with the use of a handler, the connection simply pushes answers to the handler object
- as soon as it has them available.
- </para>
- <para>As an example we will use SPARQLResultsXMLWriter, which is a TupleQueryResultHandler
-implementation that writes SPARQL Results XML documents to an output stream or to a writer:
- </para>
+<para>The following example procedure copies all user-defined Linked Data Views from default quad storage
+ to virtrdf:SyncToQuads:
+</para>
<programlisting><![CDATA[
-import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter;
-
-?
-
-FileOutputStream out = new FileOutputStream("/path/to/result.srx");
-
-try {
-
- SPARQLResultsXMLWriter sparqlWriter = new SPARQLResultsXMLWriter(out);
-
- RepositoryConnection con = myRepository.getConnection();
-
- try {
-
- String queryString = "SELECT * FROM WHERE {x} p {y}";
-
- TupleQuery tupleQuery = con.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
-
- tupleQuery.evaluate(sparqlWriter);
-
- }
-
- finally {
-
- con.close();
-
- }
-
-}
-
-finally {
-
- out.close();
-
+create procedure DB.DBA.RDB2RDF_COPY_ALL_RDF_VIEWS_TO_SYNC ()
+{
+ for (sparql define input:storage ""
+ select (bif:aref(bif:sprintf_inverse (str(?idx), bif:concat (str(rdf:_), "%d"), 0), 0)) ?qm
+ from virtrdf:
+ where { virtrdf:DefaultQuadStorage-UserMaps ?idx ?qm . ?qm a virtrdf:QuadMap }
+ order by asc (bif:sprintf_inverse (bif:concat (str(rdf:_), "%d"), str (?idx), 1)) ) do
+ exec (sprintf ('sparql alter quad storage virtrdf:SyncToQuads { create <%s> using storage virtrdf:DefaultQuadStorage }', "qm"));
}
+;
]]></programlisting>
- <para>You can just as easily supply your own application-specific implementation of TupleQueryResultHandler though.
- </para>
- <para>Lastly, an important warning: as soon as you are done with the RepositoryConnection
-object, you should close it. Notice that during processing of the TupleQueryResult object
- (for example, when iterating over its contents), the RepositoryConnection should still be
- open. We can invoke con.close() after we have finished with the result.
- </para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamegettingstartevcnq"><title>Evaluating a CONSTRUCT query</title>
- <para>The following code evaluates a graph query on a repository:
- </para>
+<para>When the virtrdf:SyncToQuads storage is fully prepared, two API functions can be used:
+</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
+ 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
+ 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>
+ </listitem>
+ <listitem><link linkend="fn_sparql_rdb2rdf_codegen">DB.DBA.SPARQL_RDB2RDF_CODEGEN</link>: The
+ 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
+ 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
+ quads from RDF_QUAD table, instead it will create records in a special table RDF_QUAD_DELETE_QUEUE
+ as guesses what can be deleted. The AFTER trigger will re-check these guesses, delete related quads
+ if needed and shorten the RDF_QUAD_DELETE_QUEUE.
+</para>
+<para>The extra activity of triggers on RDF_QUAD, RDF_OBJ, RDF_QUAD_DELETE_QUEUE and other tables
+ and indexes of the storage of "physical" triples may cause deadlocks so the application should
+ be carefully checked for proper support of deadlocks if they were very seldom before turning
+ RDB2RDF triggers on. In some cases, the whole processing of RDB2RDF can be moved to a separate
+ server and connected to the main workhorse server via replication.
+</para>
+<para>The following example functions create texts of all triggers, save them to files in for
+ further studying and try to load them. That's probably quite bad scenario for a production
+ database, because it's better to read procedures before loading them, especially if they're
+ triggers, especially if some of them may contain errors.
+</para>
<programlisting><![CDATA[
-import org.openrdf.query.GraphQueryResult;
+-- This creates one or two files with one or two triggers or other texts and try to load the
+generated sql texts.
+create procedure DB.DBA.RDB2RDF_EXEC_CODEGEN1_FOR_TABLE
+( in dump_prefix varchar,
+ in tbl varchar,
+ in dump_id any,
+ in txt any )
+{
+ declare fname varchar;
+ declare stat, msg varchar;
+ if (isinteger (dump_id))
+ dump_id := cast (dump_id as varchar);
+ if (__tag of vector = __tag (txt))
+ {
+ DB.DBA.RDB2RDF_EXEC_CODEGEN1_FOR_TABLE (dump_prefix, tbl, dump_id, txt[0]);
+ DB.DBA.RDB2RDF_EXEC_CODEGEN1_FOR_TABLE (dump_prefix, tbl, dump_id || 'p' , txt[1]);
+ return;
+ }
+ if (__tag of varchar <> __tag (txt))
+ txt := string_output_string (txt);
+ fname := sprintf ('%s_Rdb2Rdf.%s.%s.sql', dump_prefix, tbl, dump_id);
+ string_to_file (fname, txt || '\n;\n', -2);
+ if ('0' = dump_id)
+ return;
+ stat := '00000';
+ msg := '';
+ exec (txt, stat, msg);
+ if ('00000' <> stat)
+ {
+ string_to_file (fname, '\n\n- - - - - 8< - - - - -\n\nError ' || stat || ' ' || msg, -1);
+ if (not (subseq (msg, 0, 5) in ('SQ091')))
+ signal (stat, msg);
+ }
+}
+;
-GraphQueryResult graphResult = con.prepareGraphQuery(
+-- This creates and loads all triggers, init procedure and debug dump related to one table.
+create procedure DB.DBA.RDB2RDF_PREPARE_TABLE (in dump_prefix varchar, in tbl varchar)
+{
+ declare ctr integer;
+ for (ctr := 0; ctr <= 4; ctr := ctr+1 )
+ DB.DBA.RDB2RDF_EXEC_CODEGEN1_FOR_TABLE (dump_prefix, tbl, ctr, sparql_rdb2rdf_codegen (tbl, ctr));
+}
+;
- QueryLanguage.SPARQL, "CONSTRUCT * FROM {x} p {y}").evaluate();
+-- This creates and loads all triggers, init procedure and debug dump related to all tables used by and Linked Data View.
+create procedure DB.DBA.RDB2RDF_PREPARE_ALL_TABLES (in dump_prefix varchar)
+{
+ declare tbl_list any;
+ tbl_list := sparql_rdb2rdf_list_tables (0);
+ foreach (varchar tbl in tbl_list) do
+ {
+ DB.DBA.RDB2RDF_PREPARE_TABLE (dump_prefix, tbl);
+ }
+}
+;
]]></programlisting>
- <para> A GraphQueryResult is similar to TupleQueryResult in that is an object that
- iterates over the query results. However, for graph queries the query results are RDF
- statements, so a GraphQueryResult iterates over Statement objects:
- </para>
+<para>The following combination of calls prepares all triggers for all Linked Data Views of the default storage:
+</para>
<programlisting><![CDATA[
-while (graphResult.hasNext()) {
-
- Statement st = graphResult.next();
-
- // ? do something with the resulting statement here.
-
-
-}
+DB.DBA.RDB2RDF_COPY_ALL_RDF_VIEWS_TO_SYNC ();
+DB.DBA.RDB2RDF_PREPARE_ALL_TABLES (cast (now() as varchar));
]]></programlisting>
- <para>The TupleQueryResultHandler equivalent for graph queries is org.openrdf.rio.RDFHandler.
- Again, this is a generic interface, each object implementing it can process the reported RDF
- statements in any way it wants.
- </para>
- <para>All writers from Rio (such as the RDFXMLWriter, TurtleWriter, TriXWriter, etc.) implement
- the RDFHandler interface. This allows them to be used in combination with querying quite easily.
- In the following example, we use a TurtleWriter to write the result of a SPARQL graph query to
- standard output in Turtle format:
- </para>
+<para>This does not copy the initial state of RDB2RDF graphs to the physical storage, because this can
+ be dangerous for existing RDF data and even if all procedures will work as expected then they may
+ produce huge amounts of RDF data, run out of transaction log limits and thus require
+ application-specific precautions. It is also possible to make initial loading by a SPARUL statements
+ like:
+</para>
<programlisting><![CDATA[
-import org.openrdf.rio.turtle.TurtleWriter;
-
-?
-
-RepositoryConnection con = myRepository.getConnection();
-
-try {
-
- TurtleWriter turtleWriter = new TurtleWriter(System.out);
-
- con.prepareGraphQuery(QueryLanguage.SPARQL, "CONSTRUCT * FROM WHERE {x} p {y}").evaluate(turtleWriter);
+SPARQL
+INSERT IN <snapshot-graph> { ?s ?p ?o }
+FROM <snapshot-htaph>
+WHERE
+ { quad map <id-of-rdf-view>
+ { ?s ?p ?o }
+ };
+]]></programlisting>
+</sect2>
+</sect1>
- }
-finally {
- con.close();
+<sect1 id="rdfnativestorageproviders"><title>RDF Data Access Providers (Drivers)</title>
+ <sect2 id="rdfnativestorageprovidersjena"><title>Virtuoso Jena Provider</title>
+ <sect3 id="rdfnativestorageprovidersjenawhatis"><title>What is Jena</title>
+ <para>Jena is an open source Semantic Web framework for Java. It provides an API to
+extract data from and write to RDF graphs. The graphs are represented as an abstract "model".
+A model can be sourced with data from files, databases, URIs or a combination of these. A Model
+can also be queried through SPARQL and updated through SPARUL.
+ </para>
+ </sect3>
+ <sect3 id="rdfnativestorageprovidersjenawhatisv"><title>What is the Virtuoso Jena Provider</title>
+ <para>The Virtuoso Jena RDF Data Provider is a fully operational Native Graph Model Storage
+Provider for the Jena Framework, enables Semantic Web applications written using the Jena RDF
+Frameworks to query the Virtuoso RDF Quad store directly. The Provider has been tested against
+the <ulink url="http://jena.sourceforge.net/">Jena 2.5.5</ulink> version currently available.
+ </para>
+ <figure id="rdfnativestorageprovidersjena1" float="1">
+ <title>Virtuoso Jena RDF Data Provider</title>
+ <graphic fileref="ui/VirtJenaProvider.png"/>
+ </figure>
+ </sect3>
+ <sect3 id="rdfnativestorageprovidersjenasetup"><title>Setup</title>
+ <sect4 id="rdfnativestorageprovidersjenareqfiles"><title>Required Files</title>
+ <itemizedlist mark="bullet">
+ <listitem>Virtuoso Jena Provider JAR file, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/virt_jena.jar">virt_jena.jar</ulink></listitem>
+ <listitem>Virtuoso JDBC Driver 3 JAR file, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/virtjdbc3.jar">virtjdbc3.jar</ulink></listitem>
+ <listitem>Virtuoso JDBC Driver 4 JAR file, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/virtjdbc4.jar">virtjdbc4.jar</ulink></listitem>
+ <listitem>Jena Framework and associated classes, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/jenajars.zip">jenajars.zip</ulink></listitem>
+ <listitem>Sample programs, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload/virtjenasamples.zip">virtjenasamples.zip</ulink></listitem>
+ </itemizedlist>
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersjenacmsmpr"><title>Compiling Jena Sample Programs</title>
+ <orderedlist>
+ <listitem>Edit the sample programs VirtuosoSPARQLExampleX.java, where X = 1 to 9.
+Set the JDBC connection strings within to point to a valid Virtuoso Server instance of the form:
+<programlisting><![CDATA[
+"jdbc:virtuoso://localhost:1111/charset=UTF-8/log_enable=2"
+]]></programlisting>
+ <itemizedlist>
+ <listitem>charset=UTF-8 will be added by Jena provider, if it isn't in connection string.
+So now you don't need add "charset=UTF-8" to the connection string any more, it is done by Jena provider.
-}
+ </listitem>
+ <listitem>log_enable=2: to use row auto commit
+ </listitem>
+ <listitem>use these settings to process large rdf data.
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>Ensure that full paths to <emphasis>jena.jar, arq.jar,</emphasis> and
+<emphasis>virtjdbc3.jar</emphasis> are included in the active CLASSPATH setting.
+ </listitem>
+ <listitem>Compile the Jena Sample applications using the following command:
+<programlisting><![CDATA[
+javac -cp "jena.jar:arq.jar:virtjdbc3.jar:virt_jena.jar:." VirtuosoSPARQLExample1.java
+VirtuosoSPARQLExample2.java VirtuosoSPARQLExample3.java VirtuosoSPARQLExample4.java
+VirtuosoSPARQLExample5.java VirtuosoSPARQLExample6.java VirtuosoSPARQLExample7.java
+VirtuosoSPARQLExample8.java VirtuosoSPARQLExample9.java
]]></programlisting>
- <para>Again, note that as soon as we are done with the result of the query (either after iterating over the contents of the GraphQueryResult? or after invoking the RDFHandler), we invoke con.close() to close the connection and free resources.
- </para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamegettingstartevcnqapi"><title>Javadoc API Documentation</title>
- <para><ulink url="http://docs.openlinksw.com/sesame/">Sesame Provider Javadoc API Documentation</ulink> is available enabling the complete set of classes, interfaces and methods implemented for the provider to be viewed.</para>
+ </listitem>
+ </orderedlist>
</sect4>
- </sect3>
- <sect3 id="rdfnativestorageproviderssesamestpandtesting"><title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <sect4 id="rdfnativestorageproviderssesamestpandtestingwhat"><title>What</title>
-<para>Sesame is an open source Java framework for storing, querying and reasoning with RDF and RDF Schema. It can be used as a
-database for RDF and RDF Schema, or as a Java library for applications that need to work with RDF internally. The Sesame HTTP
-repository serves as a proxy for a RDF store hosted on a remote Sesame server, enabling the querying of the RDF store using
-the Sesame HTTP protocol.
-</para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamestpandtestingwhy"><title>Why</title>
-<para>The Sesame HTTP repository endpoint provides users with the greater flexibility for manipulating the RDF store via a common
-interface. Sesame provides you with the necessary tools to parse, interpret, query and store all this information, embedded
-in your own application if you want, or, if you prefer, in a separate database or even on a remote server.
-</para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamestpandtestinghow"><title>How</title>
-<para>To create a new Sesame HTTP repository, the Console needs to create such an RDF document and submit it to the SYSTEM
-repository. The Console uses so called repository configuration templates to accomplish this. Repository configuration templates
-are simple Turtle RDF files that describe a repository configuration, where some of the parameters are replaced with variables.
-The Console parses these templates and asks the user to supply values for the variables. The variables are then substituted with
-the specified values, which produces the required configuration data.
-</para>
- </sect4>
- <sect4 id="rdfnativestorageproviderssesamestpandtestingmain"><title>Setup and Testing</title>
-<para>This section details the steps required for configuring and testing a Virtuoso Sesame
-Repository, both using the HTTP and Console Sesame repositories.</para>
- <sect5 id="rdfnativestorageproviderssesamestpandtestingreq"><title>Requirements</title>
-<itemizedlist mark="bullet">
- <listitem><ulink url="http://www.openrdf.org/download.jsp">Sesame 2.3.1</ulink> or higher</listitem>
- <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2HttpRepository/virt_sesame2.jar">Virtuoso Sesame 2 Provider </ulink> (virt_sesame2.jar)</listitem>
- <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2HttpRepository/virtjdbc3.jar">Virtuoso JDBC Driver</ulink> (virtjdbc3.jar)</listitem>
- <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2HttpRepository/create.xsl">Sesame System Repository config file</ulink> (create.xsl)</listitem>
- <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2HttpRepository/create-virtuoso.xsl">Sesame Virtuoso Repository config file </ulink> (create-virtuoso.xsl)</listitem>
- <listitem><ulink url="http://tomcat.apache.org/download-60.cgi">Apache Tomcat</ulink> version 5 or 6</listitem>
-</itemizedlist>
- </sect5>
- <sect5 id="rdfnativestorageproviderssesamestpandtestinghttprep"><title>Setup Sesame HTTP Repository</title>
-<para>This section details the steps required for configuring and testing a Virtuoso HTTP Sesame Repository.</para>
-<orderedlist>
- <listitem>Install <ulink url="http://tomcat.apache.org/tomcat-6.0-doc/index.html">Apache Tomcat</ulink> web server</listitem>
- <listitem>From the Sesame 2.3.1 or higher "lib" directory copy the "openrdf-sesame.war" and "openrdf-worbbench.war" files to the
-tomcat "webapps" directory where they will automatically be deployed creating two new sub directories "openrdf-sesame" and
-"openrdf-workbench".</listitem>
- <listitem>Place the Virtuoso Sesame Provider "virt_sesame2.jar" and JDBC Driver "virtjdbc3.jar" into the Tomcat
-<code>~/webapps/openrdf-sesame/WEB-INF/lib/</code> and <code>~/webapps/openrdf-workbench/WEB-INF/lib/</code> directories for
-use by the Sesame HTTP Repository for accessing the Virtuoso RDF repository.</listitem>
- <listitem>Place the "create.xsl" and "create-virtuoso.xsl" files in the Tomcat
-<code>~/webapps/openrdf-workbench/transformations/</code> directory. Note "create.xsl" replaces the default provided with Sesame and contains the necessary entries required to reference the new "create-virtuoso.xsl" template file for Virtuoso repository configuration.</listitem>
- <listitem>The Sesame HTTP Repository will now be accessible on the URLs
+ <sect4 id="rdfnativestorageprovidersjenatesting"><title>Testing</title>
+ <para>Once the Provider classes and sample program have been successfully compiled,
+the Provider can be tested using the sample programs included. Ensure your active CLASSPATH
+includes full paths to all of the following files, before executing the example commands:
+ </para>
+ <itemizedlist mark="bullet">
+ <listitem>icu4j_3_4.jar</listitem>
+ <listitem>iri.jar</listitem>
+ <listitem>xercesImpl.jar</listitem>
+ <listitem>axis.jar</listitem>
+ <listitem>commons-logging-1.1.1.jar</listitem>
+ <listitem>jena.jar</listitem>
+ <listitem>arq.jar</listitem>
+ <listitem>virtjdbc3.jar</listitem>
+ <listitem>virt_jena.jar</listitem>
+ </itemizedlist>
+ <orderedlist>
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples1">VirtuosoSPARQLExample1</link> returns the contents of the RDF Quad store of the targeted Virtuoso instance, with the following command:
<programlisting><![CDATA[
-http://localhost:8080/openrdf-sesame
-http://localhost:8080/openrdf-workbench
+java VirtuosoSPARQLExample1
]]></programlisting>
-</listitem>
- <listitem>The Sesame OpenRDF Workbench is used for accessing the Sesame HTTP Repositories, loading
-"<ulink url="http://localhost:8080/openrdf-workbench">http://localhost:8080/openrdf-workbench</ulink>" will enable the
-default "SYSTEM" repository to be accessed.
- <figure id="ss1" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss1.png"/>
- </figure>
- </listitem>
- <listitem>Click on the "New Repository" link in the left frame to create a new Sesame Repository.
- <figure id="ss2" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss2.png"/>
- </figure>
- </listitem>
- <listitem>Select the "Virtuoso RDF Store" from the "Type" drop down list box presented.
- <figure id="ss3" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss3.png"/>
- </figure>
- </listitem>
- <listitem>Choose suitable repository "ID" and "Title" for the Virtuoso repository to be created and click "Next".
- <figure id="ss4" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss4.png"/>
- </figure>
- </listitem>
- <listitem>Fill in the connection parameters for the target Virtuoso sever the repository is to be created for and
-click the "create" button. The minimum required are the hostname, port number, username and password of the Virtuoso Server.
- <figure id="ss5" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss5.png"/>
- </figure>
- </listitem>
- <listitem>The new Virtuoso respository will be created and its summary page displayed.
- <figure id="ss6" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss6.png"/>
- </figure>
- </listitem>
- <listitem>Click on the "Namespaces" link in the left frame to obtain a list of the available namespaces in the Virtuoso repository.
- <figure id="ss7" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss7.png"/>
- </figure>
- </listitem>
- <listitem>Click on the "Context" link in the left frame to obtain a list of the available contexts in the Virtuoso repository.
- <figure id="ss8" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss8.png"/>
- </figure>
- </listitem>
- <listitem>Click on the "Types" link in the left frame to obtain a list of the available types in the Virtuoso repository.
- <figure id="ss9" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss9.png"/>
- </figure>
- </listitem>
- <listitem>Click on the "Query" link in the left frame, enter a suitable SPARQL query to execute against the Virtuoso repository
-and click the "execute" button.
- <figure id="ss10" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss10.png"/>
- </figure>
- </listitem>
- <listitem>The results of the SPARQL query are returned.
- <figure id="ss11" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss11.png"/>
- </figure>
- </listitem>
- <listitem>Click on the "Repositories" link in the left frame and the newly created Virtuoso repository entry is displayed along side
-the default SYSTEM repository.
- <figure id="ss12" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss12.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfnativestorageproviderssesamestpandtestingcons"><title>Setup Sesame Console Repository</title>
-<para>This section details the steps required for configuring and testing a Virtuoso Sesame Console Repository:</para>
-<orderedlist>
- <listitem>Extract Sesame 2.3.1 or higher archive to a location of choice and place the virt_sesame2.jar and virtjdbc3.jar
-files to the sesame 2.3.1 "lib" directory</listitem>
- <listitem>Start the <ulink url="http://www.openrdf.org/doc/sesame2/users/ch07.html#section-console-repository-creation">sesame console application</ulink> by running the "console.bat" script in the sesame "bin" directory and then "exit." the program
+ </listitem>
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples2">VirtuosoSPARQLExample2</link> reads in the contents of the following FOAF URIs --
<programlisting><![CDATA[
-$ sh console.sh
-SLF4J: Class path contains multiple SLF4J bindings.
-SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/logback-classic-0.9.18.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/slf4j-jdk14-1.5.10.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
-10:32:38.317 [main] DEBUG info.aduna.platform.PlatformFactory - os.name <http://os.name> <http://os.name> = mac os x
-10:32:38.351 [main] DEBUG info.aduna.platform.PlatformFactory - Detected Mac OS X platform
-Connected to default data directory
-Commands end with '.' at the end of a line
-Type 'help.' for help
-exit.
+http://kidehen.idehen.net/dataspace/person/kidehen#this
+http://www.w3.org/People/Berners-Lee/card#i
+http://demo.openlinksw.com/dataspace/person/demo#this
+]]></programlisting>
+ <para>-- and returns the RDF data stored, with the following command:</para>
+<programlisting><![CDATA[
+java VirtuosoSPARQLExample2
+]]></programlisting>
+ </listitem>
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples3">VirtuosoSPARQLExample3</link> performs simple addition and deletion operation on
+the content of the triple store, with the following command:
+<programlisting><![CDATA[
+java VirtuosoSPARQLExample3
]]></programlisting>
-</listitem>
- <listitem>This will create the necessary sesame application data directories as detailed in the sesame
-<ulink url="http://www.openrdf.org/doc/sesame2/2.3.1/users/userguide.html#chapter-datadir-config">data directory configuration</ulink> documentation.
+ </listitem>
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples4">VirtuosoSPARQLExample4</link> demonstrates the use of the <emphasis>graph.contains</emphasis> method for searching triples, with the following command:
<programlisting><![CDATA[
-Windows - C:\Documents and Settings\LocalService\Application Data\Aduna\
-Mac OS X - /Users/myuser/Library/Application Support/Aduna/
-Linux - $HOME/.aduna/
+java VirtuosoSPARQLExample4
]]></programlisting>
</listitem>
- <listitem>If you do not want to use the default sesame data directory location the Sesame console application can be started by
-specifying a custom data directory location with the "-d" option. Note in this case the directory "OpenRDF Sesame console" always
-has to be manually appended to the directory as Sesame assumes the data file will reside in a sub directory of this name.
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples5">VirtuosoSPARQLExample5</link> demonstrates the use of the <emphasis>graph.find</emphasis> method for searching triples, with the following command:
<programlisting><![CDATA[
-$ sh console.sh -d /Users/myuser/OpenRDF Sesame console
+java VirtuosoSPARQLExample5
]]></programlisting>
-</listitem>
- <listitem>Start the sesame console application with the required data directory location and create a Virtuoso repository as
-detailed in the steps below, the key parameters to be specified being the target Virtuoso server hostname, port number,
-username, password and a unique "Repository ID".
+ </listitem>
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples6">VirtuosoSPARQLExample6</link> demonstrates the use of the <emphasis>graph.getTransactionHandler</emphasis> method, with the following command:
<programlisting><![CDATA[
-$ sh console.sh
-SLF4J: Class path contains multiple SLF4J bindings.
-SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/logback-classic-0.9.18.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/slf4j-jdk14-1.5.10.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
-10:32:38.317 [main] DEBUG info.aduna.platform.PlatformFactory - os.name <http://os.name> <http://os.name> = mac os x
-10:32:38.351 [main] DEBUG info.aduna.platform.PlatformFactory - Detected Mac OS X platform
-Connected to default data directory
-Commands end with '.' at the end of a line
-Type 'help.' for help
-create virtuoso .
-Please specify values for the following variables:
-Host list [localhost:1111]:
-Username [dba]:
-Password [dba]:
-Default graph name [sesame:nil]:
-Enable using batch optimization (false|true) [false]:
-Use RoundRobin for connection (false|true) [false]:
-Buffer fetch size [200]:
-Inference RuleSet name [null]:
-Repository ID [virtuoso]: myvirt
-Repository title [Virtuoso repository]:
-Repository created
-show r .
-+----------
-|SYSTEM
-|myvirt ("Virtuoso repository")
-+----------
-open myvirt .
-Opened repository 'myvirt'
-myvirt> show n .
-+----------
-|bif bif:
-|dawgt http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#
-|dbpedia http://dbpedia.org/resource/
-|dbpprop http://dbpedia.org/property/
-|dc http://purl.org/dc/elements/1.1/
-|foaf http://xmlns.com/foaf/0.1/
-|geo http://www.w3.org/2003/01/geo/wgs84_pos#
-|go http://purl.org/obo/owl/GO#
-|math http://www.w3.org/2000/10/swap/math#
-|mesh http://purl.org/commons/record/mesh/
-|mf http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#
-|nci http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl#
-|obo http://www.geneontology.org/formats/oboInOwl#
-|owl http://www.w3.org/2002/07/owl#
-|protseq http://purl.org/science/protein/bysequence/
-|rdf http://www.w3.org/1999/02/22-rdf-syntax-ns#
-|rdfdf http://www.openlinksw.com/virtrdf-data-formats#
-|rdfs http://www.w3.org/2000/01/rdf-schema#
-|sc http://purl.org/science/owl/sciencecommons/
-|scovo http://purl.org/NET/scovo#
-|skos http://www.w3.org/2004/02/skos/core#
-|sql sql:
-|vcard http://www.w3.org/2001/vcard-rdf/3.0#
-|virtrdf http://www.openlinksw.com/schemas/virtrdf#
-|void http://rdfs.org/ns/void#
-|xf http://www.w3.org/2004/07/xpath-functions
-|xml http://www.w3.org/XML/1998/namespace
-|xsd http://www.w3.org/2001/XMLSchema#
-|xsl10 http://www.w3.org/XSL/Transform/1.0
-|xsl1999 http://www.w3.org/1999/XSL/Transform
-|xslwd http://www.w3.org/TR/WD-xsl
-|yago http://dbpedia.org/class/yago/
-+----------
-exit.
+java VirtuosoSPARQLExample6
]]></programlisting>
-</listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfnativestorageproviderssesamestpandtestinghttpcons"><title>Connection to Sesame HTTP repository from Console repository</title>
-<para>The Sesame Console repository can connect to a Sesame HTTP repository and vice-versa, enabling access to remote Sesame
-HTTP repositories from a local server.</para>
-<orderedlist>
- <listitem>The Sesame Console repository can connect to a Sesame HTTP repository and query it as if local using the "connect" command.
+ </listitem>
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples7">VirtuosoSPARQLExample7</link> demonstrates the use of the graph.getBulkUpdateHandler method, with the following command:
<programlisting><![CDATA[
-$ sh console.sh
-SLF4J: Class path contains multiple SLF4J bindings.
-SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/logback-classic-0.9.18.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/slf4j-jdk14-1.5.10.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
-10:32:38.317 [main] DEBUG info.aduna.platform.PlatformFactory - os.name <http://os.name> <http://os.name> = mac os x
-10:32:38.351 [main] DEBUG info.aduna.platform.PlatformFactory - Detected Mac OS X platform
-Connected to default data directory
-Commands end with '.' at the end of a line
-Type 'help.' for help
-> connect http://localhost:8080/openrdf-sesame.
-Connected to http://localhost:8080/openrdf-sesame
-> show r.
-+----------
-|SYSTEM ("System configuration repository")
-|VirtSesRep ("Virtuoso Sesame HTTP Repository")
-+----------
-> open VirtSesRep.
-Opened repository 'VirtSesRep'
-VirtSesRep> sparql select * from <http://localhost:8890/Northwind> where {?s ?p ?o} Limit 10.
-Evaluating query...
-+------------------------+------------------------+------------------------+
-| s | p | o |
-+------------------------+------------------------+------------------------+
-| <http://localhost:8890/Northwind/CustomerContact/ALFKI#this>| rdf:type | foaf:Person |
-| <http://localhost:8890/Northwind/CustomerContact/ALFKI#this>| rdf:type | northwind:CustomerContact|
-| <http://localhost:8890/Northwind/CustomerContact/ALFKI#this>| opl:isDescribedUsing | northwind: |
-| <http://localhost:8890/Northwind/CustomerContact/ANATR#this>| rdf:type | foaf:Person |
-| <http://localhost:8890/Northwind/CustomerContact/ANATR#this>| rdf:type | northwind:CustomerContact|
-| <http://localhost:8890/Northwind/CustomerContact/ANATR#this>| opl:isDescribedUsing | northwind: |
-| <http://localhost:8890/Northwind/CustomerContact/ANTON#this>| rdf:type | foaf:Person |
-| <http://localhost:8890/Northwind/CustomerContact/ANTON#this>| rdf:type | northwind:CustomerContact|
-| <http://localhost:8890/Northwind/CustomerContact/ANTON#this>| opl:isDescribedUsing | northwind: |
-| <http://localhost:8890/Northwind/CustomerContact/AROUT#this>| rdf:type | foaf:Person |
-+------------------------+------------------------+------------------------+
-10 result(s) (530 ms)
-VirtSesRep> show n.
-+----------
-|SearchResults http://www.zillow.com/static/xsd/SearchResults.xsd
-|UpdatedPropertyDetails http://www.zillow.com/static/xsd/UpdatedPropertyDetails.xsd
-|a http://www.w3.org/2005/Atom
-|aapi http://rdf.alchemyapi.com/rdf/v1/s/aapi-schema#
-|address http://schemas.talis.com/2005/address/schema#
-|admin http://webns.net/mvcb/
-|amz http://webservices.amazon.com/AWSECommerceService/2005-10-05
-|atom http://atomowl.org/ontologies/atomrdf#
-|audio http://purl.org/media/audio#
-|awol http://bblfish.net/work/atom-owl/2006-06-06/#
-|aws http://soap.amazon.com/
-|b3s http://b3s.openlinksw.com/
+java VirtuosoSPARQLExample7
+]]></programlisting>
+ </listitem>
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples8">VirtuosoSPARQLExample8</link> demonstrates how to insert triples into a graph, with the following command:
+<programlisting><![CDATA[
+java VirtuosoSPARQLExample8
+]]></programlisting>
+ </listitem>
+ <listitem><link linkend="rdfnativestorageprovidersjenaexamples9">VirtuosoSPARQLExample9</link> demonstrates the use of the <emphasis>CONSTRUCT, DESCRIBE,</emphasis> and <emphasis>ASK</emphasis> SPARQL query forms, with the following command:
+<programlisting><![CDATA[
+java VirtuosoSPARQLExample9
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect4>
+ </sect3>
+ <sect3 id="rdfnativestorageprovidersjenaexamples"><title>Examples</title>
+ <sect4 id="rdfnativestorageprovidersjenaexamples1"><title>VirtJenaSPARQLExample1</title>
+<programlisting><![CDATA[
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample1 {
+
+ /**
+ * Executes a SPARQL query against a virtuoso url and prints results.
+ */
+ public static void main(String[] args) {
+
+ String url;
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
+
+/* STEP 1 */
+ VirtGraph set = new VirtGraph (url, "dba", "dba");
+
+/* STEP 2 */
+
+
+/* STEP 3 */
+/* Select all data in virtuoso */
+ Query sparql = QueryFactory.create("SELECT * WHERE { GRAPH ?graph { ?s ?p ?o } } limit 100");
+
+/* STEP 4 */
+ VirtuosoQueryExecution vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+
+ ResultSet results = vqe.execSelect();
+ while (results.hasNext()) {
+ QuerySolution result = results.nextSolution();
+ RDFNode graph = result.get("graph");
+ RDFNode s = result.get("s");
+ RDFNode p = result.get("p");
+ RDFNode o = result.get("o");
+ System.out.println(graph + " { " + s + " " + p + " " + o + " . }");
+ }
+ }
+}
+
+]]></programlisting>
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersjenaexamples2"><title>VirtJenaSPARQLExample2</title>
+<programlisting><![CDATA[
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample2 {
+
+ /**
+ * Executes a SPARQL query against a virtuoso url and prints results.
+ */
+ public static void main(String[] args) {
+
+ String url;
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
+
+/* STEP 1 */
+ VirtGraph graph = new VirtGraph ("Example2", url, "dba", "dba");
+
+/* STEP 2 */
+/* Load data to Virtuoso */
+ graph.clear ();
+
+ System.out.print ("Begin read from 'http://www.w3.org/People/Berners-Lee/card#i' ");
+ graph.read("http://www.w3.org/People/Berners-Lee/card#i", "RDF/XML");
+ System.out.println ("\t\t\t Done.");
+
+ System.out.print ("Begin read from 'http://demo.openlinksw.com/dataspace/person/demo#this' ");
+ graph.read("http://demo.openlinksw.com/dataspace/person/demo#this", "RDF/XML");
+ System.out.println ("\t Done.");
+
+ System.out.print ("Begin read from 'http://kidehen.idehen.net/dataspace/person/kidehen#this' ");
+ graph.read("http://kidehen.idehen.net/dataspace/person/kidehen#this", "RDF/XML");
+ System.out.println ("\t Done.");
+
+
+/* STEP 3 */
+/* Select only from VirtGraph */
+ Query sparql = QueryFactory.create("SELECT ?s ?p ?o WHERE { ?s ?p ?o }");
+
+/* STEP 4 */
+ VirtuosoQueryExecution vqe = VirtuosoQueryExecutionFactory.create (sparql, graph);
+
+ ResultSet results = vqe.execSelect();
+ while (results.hasNext()) {
+ QuerySolution result = results.nextSolution();
+ RDFNode graph_name = result.get("graph");
+ RDFNode s = result.get("s");
+ RDFNode p = result.get("p");
+ RDFNode o = result.get("o");
+ System.out.println(graph_name + " { " + s + " " + p + " " + o + " . }");
+ }
+
+ System.out.println("graph.getCount() = " + graph.getCount());
+ }
+}
]]></programlisting>
-</listitem>
- <listitem>Conversely the Sesame HTTP repository can be configured to access the repository created by the Sesame console.
-To do this the location of the data directory for both needs to be reconfigured using the Java system property
-info.aduna.platform.appdata.basedir (does not include "OpenRDF Sesame console directory) to point to the same location.
-When you are using Tomcat as the servlet container then you can set this property using the JAVA_OPTS parameter.
-Note, if you are using Apache Tomcat as a Windows Service you should use the Windows Services configuration tool to
-set this property. Other users can either edit the Tomcat startup script or set the property some other way.
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersjenaexamples3"><title>VirtJenaSPARQLExample3</title>
<programlisting><![CDATA[
- * set JAVA_OPTS=-Dinfo.aduna.platform.appdata.basedir=\path\to\other\dir\ (on Windows)
- * export JAVA_OPTS='-Dinfo.aduna.platform.appdata.basedir=/path/to/other/dir/' (on Linux/UNIX/Mac OS X)
+import java.util.*;
+
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.Triple;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample3
+{
+ public static void main(String[] args)
+ {
+ String url;
+
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
+
+ Node foo1 = Node.createURI("http://example.org/#foo1");
+ Node bar1 = Node.createURI("http://example.org/#bar1");
+ Node baz1 = Node.createURI("http://example.org/#baz1");
+
+ Node foo2 = Node.createURI("http://example.org/#foo2");
+ Node bar2 = Node.createURI("http://example.org/#bar2");
+ Node baz2 = Node.createURI("http://example.org/#baz2");
+
+ Node foo3 = Node.createURI("http://example.org/#foo3");
+ Node bar3 = Node.createURI("http://example.org/#bar3");
+ Node baz3 = Node.createURI("http://example.org/#baz3");
+
+ List <Triple> triples = new ArrayList <Triple> ();
+
+ VirtGraph graph = new VirtGraph ("Example3", url, "dba", "dba");
+
+ graph.clear ();
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("Add 3 triples to graph <Example3>.");
+
+ graph.add(new Triple(foo1, bar1, baz1));
+ graph.add(new Triple(foo2, bar2, baz2));
+ graph.add(new Triple(foo3, bar3, baz3));
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("graph.getCount() = " + graph.getCount());
+
+ triples.add(new Triple(foo1, bar1, baz1));
+ triples.add(new Triple(foo2, bar2, baz2));
+
+ graph.isEmpty();
+
+ System.out.println("Remove 2 triples from graph <Example3>");
+ graph.remove(triples);
+ System.out.println("graph.getCount() = " + graph.getCount());
+ System.out.println("Please check result with isql tool.");
+
+ /* EXPECTED RESULT:
+
+SQL> SPARQL
+SELECT ?s ?p ?o
+FROM <Example3>
+WHERE {?s ?p ?o};
+s p o
+VARCHAR VARCHAR VARCHAR
+_______________________________________________________________________________
+
+http://example.org/#foo3 http://example.org/#bar3 http://example.org/#baz3
+
+1 Rows. -- 26 msec.
+SQL>
+
+*/
+
+ }
+}
]]></programlisting>
- <figure id="ss13" float="1">
- <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
- <graphic fileref="ui/ss13.png"/>
- </figure>
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersjenaexamples4"><title>VirtJenaSPARQLExample4</title>
+<programlisting><![CDATA[
+import java.util.*;
-</listitem>
-</orderedlist>
- </sect5>
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.Triple;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample4
+{
+
+ public static void main(String[] args)
+ {
+ String url;
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
+
+ Node foo1 = Node.createURI("http://example.org/#foo1");
+ Node bar1 = Node.createURI("http://example.org/#bar1");
+ Node baz1 = Node.createURI("http://example.org/#baz1");
+
+ Node foo2 = Node.createURI("http://example.org/#foo2");
+ Node bar2 = Node.createURI("http://example.org/#bar2");
+ Node baz2 = Node.createURI("http://example.org/#baz2");
+
+ Node foo3 = Node.createURI("http://example.org/#foo3");
+ Node bar3 = Node.createURI("http://example.org/#bar3");
+ Node baz3 = Node.createURI("http://example.org/#baz3");
+
+ VirtGraph graph = new VirtGraph ("Example4", url, "dba", "dba");
+
+ graph.clear ();
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+
+ System.out.println("Add 3 triples to graph <Example4>.");
+
+ graph.add(new Triple(foo1, bar1, baz1));
+ graph.add(new Triple(foo2, bar2, baz2));
+ graph.add(new Triple(foo3, bar3, baz3));
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("graph.getCount() = " + graph.getCount());
+
+ System.out.println ("graph.contains(new Triple(foo2, bar2, baz2) - " + graph.contains(new Triple(foo2, bar2, baz2)));
+ System.out.println ("graph.contains(new Triple(foo2, bar2, baz3) - " + graph.contains(new Triple(foo2, bar2, baz3)));
+
+ graph.clear ();
+
+ }
+}
+]]></programlisting>
</sect4>
- </sect3>
- <sect3 id="rdfnativestorageproviderssesamejavadoc"><title>Javadoc API Documentation</title>
- <para><ulink url="http://docs.openlinksw.com/sesame/">Sesame Provider Javadoc API Documentation</ulink>
-is available enabling the complete set of classes, interfaces and methods implemented for the provider to be viewed.
- </para>
- </sect3>
- </sect2>
- <sect2 id="rdfnativestorageproviderredland"><title>Virtuoso Redland Provider</title>
- <sect3 id="rdfnativestorageproviderredlandwhatis"><title>What is Redland</title>
- <para><ulink url="http://librdf.org/">Redland</ulink> is a set of free software 'C' libraries that
-provide support for the Resource Description Framework (RDF), providing modular, object based libraries
-and APIs for manipulating the RDF graph, triples, URIs and Literals. Redland includes several high-level
-language APIs providing RDF manipulation and storage and requires the
-<ulink url="http://librdf.org/raptor/">Raptor</ulink> RDF parser and <ulink url="http://librdf.org/rasqal/">Rasqal</ulink>
-RDF syntax and query library
-for its use.
- </para>
- </sect3>
- <sect3 id="rdfnativestorageproviderredlandwhatisv"><title>What is the Virtuoso Redland Provider</title>
- <para>The Virtuoso Redland RDF Provider is an implementation of the Storage API, Model and Query
-interfaces of the Redland framework for RDF. This provider enables the execution of queries via the
-Redland Rasqal query engine or via Virtuoso query engine directly against the Virtuoso Quad store.
-The Virtuoso Redland Provider uses ODBC as the data access mechanism for communicating the Virtuoso
-Quad Store and requires the Virtuoso ODBC Driver be installed on the Redland client and a suitable
-ODBC DSN be configured for connecting to the target Virtuoso Quad Store instance. The provider has
-been tested against the <ulink url="http://download.librdf.org/source/">Redland 1.0.8</ulink> version currently available for download.
- </para>
- <figure id="rdfnativestorageproviderredland1" float="1">
- <title>Redland Component Stack</title>
- <graphic fileref="ui/VirtRedLand.png"/>
- </figure>
- <para>As indicated in the above diagram the Virtuoso Provider can be used to execute RDF queries either
-directly against the Virtuoso graph storage module supporting the <ulink url="http://dbpedia.org/resource/SPARQL">SPARQL</ulink>,
-<ulink url="http://dbpedia.org/resource/SPARUL">SPARQL</ulink>SPARUL, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSArticleBISPARQL2">SPARQL-BI</ulink>
-query languages or via the Rasqal query engine built into Redland which supports the SPARQL query language.
-This is done by simply changing the syntax of the query using the "vsparql" rather then default "sparql"
-construct when executing a query as indicated in the sample queries below:
- </para>
+ <sect4 id="rdfnativestorageprovidersjenaexamples5"><title>VirtJenaSPARQLExample5</title>
<programlisting><![CDATA[
-rdfproc -r xml -t "user='dba',password='dba',dsn='Demo'" gr query sparql - "SELECT * WHERE { ?s ?p ?o }" ;; via Redland Rasqal engine
+import java.util.*;
+
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.Triple;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample5
+{
+
+ public static void main(String[] args)
+ {
+ String url;
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
+
+ Node foo1 = Node.createURI("http://example.org/#foo1");
+ Node bar1 = Node.createURI("http://example.org/#bar1");
+ Node baz1 = Node.createURI("http://example.org/#baz1");
+
+ Node foo2 = Node.createURI("http://example.org/#foo2");
+ Node bar2 = Node.createURI("http://example.org/#bar2");
+ Node baz2 = Node.createURI("http://example.org/#baz2");
+
+ Node foo3 = Node.createURI("http://example.org/#foo3");
+ Node bar3 = Node.createURI("http://example.org/#bar3");
+ Node baz3 = Node.createURI("http://example.org/#baz3");
+
+ VirtGraph graph = new VirtGraph ("Example5", url, "dba", "dba");
+
+ graph.clear ();
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+
+ System.out.println("Add 3 triples to graph <Example5>.");
+
+ graph.add(new Triple(foo1, bar1, baz1));
+ graph.add(new Triple(foo2, bar2, baz2));
+ graph.add(new Triple(foo3, bar3, baz3));
+ graph.add(new Triple(foo1, bar2, baz2));
+ graph.add(new Triple(foo1, bar3, baz3));
-rdfproc -r xml -t "user='dba',password='dba',dsn='Demo'" gr query vsparql - "SELECT * WHERE { ?s ?p ?o }" ;; direct to Virtuoso storage module
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("graph.getCount() = " + graph.getCount());
+
+ ExtendedIterator iter = graph.find(foo1, Node.ANY, Node.ANY);
+ System.out.println ("\ngraph.find(foo1, Node.ANY, Node.ANY) \nResult:");
+ for ( ; iter.hasNext() ; )
+ System.out.println ((Triple) iter.next());
+
+ iter = graph.find(Node.ANY, Node.ANY, baz3);
+ System.out.println ("\ngraph.find(Node.ANY, Node.ANY, baz3) \nResult:");
+ for ( ; iter.hasNext() ; )
+ System.out.println ((Triple) iter.next());
+
+ iter = graph.find(foo1, Node.ANY, baz3);
+ System.out.println ("\ngraph.find(foo1, Node.ANY, baz3) \nResult:");
+ for ( ; iter.hasNext() ; )
+ System.out.println ((Triple) iter.next());
+
+ graph.clear ();
+
+ }
+}
]]></programlisting>
- <para>The Virtuoso Provider uses the <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSSQL2RDF">SPASQL</ulink> query language for querying the remote Virtuoso QUAD store.
- </para>
- </sect3>
- <sect3 id="rdfnativestorageproviderredlandsetup"><title>Setup</title>
- <sect4 id="rdfnativestorageproviderredlandreqfiles"><title>Required Files</title>
- <para>The Virtuoso Redland Provider has been integrated into the Redland RDF Framework and submitted to
-the open source project to become part of the standard distribution available for
-<ulink url="http://librdf.org/INSTALL.html">download</ulink>. Until this
-submission has been accepted and committed into the available Redland release a tar ball created by
-OpenLink Software and a diff for application to a Redland 1.0.8 tree can be obtained from:
- </para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="ftp://download.openlinksw.com/support/vos/redland-vos-1.0.8.tar.gz"></ulink>Redland 1.0.8 tar ball with Virtuoso storage support</listitem>
- <listitem><ulink url="ftp://download.openlinksw.com/support/vos/redland-vos.diff">Redland 1.0.8 Diff file of changes made for Virtuoso storage support</ulink></listitem>
- </itemizedlist>
- </sect4>
- <sect4 id="rdfnativestorageprovidersredlandcmsmpr"><title>Compiling Redland with Virtuoso storage support</title>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://svn.librdf.org/">Download Redland</ulink>, extract and apply diff
-above or download the tar ball above with diff already applied and extract to a location of choice.</listitem>
- <listitem>The following additional configure options are available for enabling the Virtuoso
-storage support:
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersjenaexamples6"><title>VirtJenaSPARQLExample6</title>
<programlisting><![CDATA[
- --with-virtuoso(=yes|no) Enable Virtuoso RDF store (default=auto)
- --with-iodbc(=DIR) Select iODBC support
- DIR is the iODBC base install directory
- (default=/usr/local)
- --with-unixodbc(=DIR) Select UnixODBC support
- DIR is the UnixODBC base install directory
- (default=/usr/local)
- --with-datadirect(=DIR) Select DataDirect support
- DIR is the DataDirect base install directory
- (default=/usr/local)
- --with-odbc-inc=DIR Specify custom ODBC include directory
- (default=/usr/local/include)
- --with-odbc-lib=DIR Specify custom ODBC lib directory
- (default=/usr/local/lib)
+import java.util.*;
+
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.Triple;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample6
+{
+
+ public static void main(String[] args)
+ {
+ String url;
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
+
+ Node foo1 = Node.createURI("http://example.org/#foo1");
+ Node bar1 = Node.createURI("http://example.org/#bar1");
+ Node baz1 = Node.createURI("http://example.org/#baz1");
+
+ Node foo2 = Node.createURI("http://example.org/#foo2");
+ Node bar2 = Node.createURI("http://example.org/#bar2");
+ Node baz2 = Node.createURI("http://example.org/#baz2");
+
+ Node foo3 = Node.createURI("http://example.org/#foo3");
+ Node bar3 = Node.createURI("http://example.org/#bar3");
+ Node baz3 = Node.createURI("http://example.org/#baz3");
+
+ VirtGraph graph = new VirtGraph ("Example6", url, "dba", "dba");
+
+ graph.clear ();
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+
+ System.out.println("test Transaction Commit.");
+ graph.getTransactionHandler().begin();
+ System.out.println("begin Transaction.");
+ System.out.println("Add 3 triples to graph <Example6>.");
+
+ graph.add(new Triple(foo1, bar1, baz1));
+ graph.add(new Triple(foo2, bar2, baz2));
+ graph.add(new Triple(foo3, bar3, baz3));
+
+ graph.getTransactionHandler().commit();
+ System.out.println("commit Transaction.");
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("graph.getCount() = " + graph.getCount());
+
+ ExtendedIterator iter = graph.find(Node.ANY, Node.ANY, Node.ANY);
+ System.out.println ("\ngraph.find(Node.ANY, Node.ANY, Node.ANY) \nResult:");
+ for ( ; iter.hasNext() ; )
+ System.out.println ((Triple) iter.next());
+
+ graph.clear ();
+ System.out.println("\nCLEAR graph <Example6>");
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+
+ System.out.println("Add 1 triples to graph <Example6>.");
+ graph.add(new Triple(foo1, bar1, baz1));
+
+ System.out.println("test Transaction Abort.");
+ graph.getTransactionHandler().begin();
+ System.out.println("begin Transaction.");
+ System.out.println("Add 2 triples to graph <Example6>.");
+
+ graph.add(new Triple(foo2, bar2, baz2));
+ graph.add(new Triple(foo3, bar3, baz3));
+
+ graph.getTransactionHandler().abort();
+ System.out.println("abort Transaction.");
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("graph.getCount() = " + graph.getCount());
+
+ iter = graph.find(Node.ANY, Node.ANY, Node.ANY);
+ System.out.println ("\ngraph.find(Node.ANY, Node.ANY, Node.ANY) \nResult:");
+ for ( ; iter.hasNext() ; )
+ System.out.println ((Triple) iter.next());
+
+ graph.clear ();
+ System.out.println("\nCLEAR graph <Example6>");
+
+ }
+}
+
+
]]></programlisting>
- </listitem>
- <listitem>The "--with-virtuoso" option default to being auto enable if a valid ODBC Driver Manager
-(iODBC, UnixODBC? or DataDirect?) or include and lib directories for required ODBC header files and libraries
-are located with the suitable setting for one or more of the other ODBC related options above. Assuming
-iODBC is installed the following option can be used to enable Virtuoso storage support to be configured
-for compilation into your Redland build:
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersjenaexamples7"><title>VirtJenaSPARQLExample7</title>
<programlisting><![CDATA[
-./configure --with-iodbc=/usr/local/iODBC
+import java.util.*;
+
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.Triple;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample7
+{
+
+ public static void main(String[] args)
+ {
+ String url;
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
+
+ Node foo1 = Node.createURI("http://example.org/#foo1");
+ Node bar1 = Node.createURI("http://example.org/#bar1");
+ Node baz1 = Node.createURI("http://example.org/#baz1");
+
+ Node foo2 = Node.createURI("http://example.org/#foo2");
+ Node bar2 = Node.createURI("http://example.org/#bar2");
+ Node baz2 = Node.createURI("http://example.org/#baz2");
+
+ Node foo3 = Node.createURI("http://example.org/#foo3");
+ Node bar3 = Node.createURI("http://example.org/#bar3");
+ Node baz3 = Node.createURI("http://example.org/#baz3");
+
+ List triples1 = new ArrayList();
+ triples1.add(new Triple(foo1, bar1, baz1));
+ triples1.add(new Triple(foo2, bar2, baz2));
+ triples1.add(new Triple(foo3, bar3, baz3));
+
+ List triples2 = new ArrayList();
+ triples2.add(new Triple(foo1, bar1, baz1));
+ triples2.add(new Triple(foo2, bar2, baz2));
+
+ VirtGraph graph = new VirtGraph ("Example7", url, "dba", "dba");
+
+ graph.clear ();
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("Add List with 3 triples to graph <Example7> via BulkUpdateHandler.");
+
+ graph.getBulkUpdateHandler().add(triples1);
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("graph.getCount() = " + graph.getCount());
+
+ ExtendedIterator iter = graph.find(Node.ANY, Node.ANY, Node.ANY);
+ System.out.println ("\ngraph.find(Node.ANY, Node.ANY, Node.ANY) \nResult:");
+ for ( ; iter.hasNext() ; )
+ System.out.println ((Triple) iter.next());
+
+
+ System.out.println("\n\nDelete List of 2 triples from graph <Example7> via BulkUpdateHandler.");
+
+ graph.getBulkUpdateHandler().delete(triples2);
+
+ System.out.println("graph.isEmpty() = " + graph.isEmpty());
+ System.out.println("graph.getCount() = " + graph.getCount());
+
+ iter = graph.find(Node.ANY, Node.ANY, Node.ANY);
+ System.out.println ("\ngraph.find(Node.ANY, Node.ANY, Node.ANY) \nResult:");
+ for ( ; iter.hasNext() ; )
+ System.out.println ((Triple) iter.next());
+
+ graph.clear ();
+ System.out.println("\nCLEAR graph <Example7>");
+
+ }
+}
]]></programlisting>
- </listitem>
- <listitem>Run "make" to compile the Redland libraries and "sudo make install" to install in
-the default "/usr/local" location</listitem>
- <listitem>Test compilation with test utility utils/rdfproc:
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersjenaexamples8"><title>VirtJenaSPARQLExample8</title>
<programlisting><![CDATA[
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample8 {
+
+ /**
+ * Executes a SPARQL query against a virtuoso url and prints results.
+ */
+ public static void main(String[] args) {
+
+ String url;
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
-rdfproc test parse http://planetrdf.com/guide/rss.rdf
-rdfproc test print
-rdfproc test serialize ntriples
-]]></programlisting>
- <para>This test will use the default 'hashes' storage.</para>
- </listitem>
- <listitem>Ensure you have the Virtuoso ODBC Driver installed and a valid ODBC DSN called
-"Local Virtuoso" configured for your target Virtuoso Server</listitem>
- <listitem>Set the following environment variable:
-<programlisting><![CDATA[
-export RDFPROC_STORAGE_TYPE=virtuoso ;; Enable Virtuoso Storage
-export ODBCINI=<path_to_odbcini_directory>/odbc.ini ;; Enable ODBC DSN to be located
-export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH ;; May be required to enable Redland libraries to be located
+/* STEP 1 */
+ VirtGraph set = new VirtGraph (url, "dba", "dba");
+/* STEP 2 */
+System.out.println("\nexecute: CLEAR GRAPH <http://test1>");
+ String str = "CLEAR GRAPH <http://test1>";
+ VirtuosoUpdateRequest vur = VirtuosoUpdateFactory.create(str, set);
+ vur.exec();
+
+System.out.println("\nexecute: INSERT INTO GRAPH <http://test1> { <aa> <bb> 'cc' . <aa1> <bb1> 123. }");
+ str = "INSERT INTO GRAPH <http://test1> { <aa> <bb> 'cc' . <aa1> <bb1> 123. }";
+ vur = VirtuosoUpdateFactory.create(str, set);
+ vur.exec();
+
+/* STEP 3 */
+/* Select all data in virtuoso */
+System.out.println("\nexecute: SELECT * FROM <http://test1> WHERE { ?s ?p ?o }");
+ Query sparql = QueryFactory.create("SELECT * FROM <http://test1> WHERE { ?s ?p ?o }");
+
+/* STEP 4 */
+ VirtuosoQueryExecution vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+
+ ResultSet results = vqe.execSelect();
+ while (results.hasNext()) {
+ QuerySolution rs = results.nextSolution();
+ RDFNode s = rs.get("s");
+ RDFNode p = rs.get("p");
+ RDFNode o = rs.get("o");
+ System.out.println(" { " + s + " " + p + " " + o + " . }");
+ }
+
+
+System.out.println("\nexecute: DELETE FROM GRAPH <http://test1> { <aa> <bb> 'cc' }");
+ str = "DELETE FROM GRAPH <http://test1> { <aa> <bb> 'cc' }";
+ vur = VirtuosoUpdateFactory.create(str, set);
+ vur.exec();
+
+System.out.println("\nexecute: SELECT * FROM <http://test1> WHERE { ?s ?p ?o }");
+ vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+ results = vqe.execSelect();
+ while (results.hasNext()) {
+ QuerySolution rs = results.nextSolution();
+ RDFNode s = rs.get("s");
+ RDFNode p = rs.get("p");
+ RDFNode o = rs.get("o");
+ System.out.println(" { " + s + " " + p + " " + o + " . }");
+ }
+
+
+}
+}
]]></programlisting>
- </listitem>
- <listitem>Test Virtuoso storage with the provided test program utils/vtest:
-<programlisting><![CDATA[
-$ utils/vtest
- 1: Remove all triples in <http://red> context
-**PASSED**: removed context triples from the graph
- 2: Add triples to <http://red> context
-**PASSED**: add triple to context
- 3: Print all triples in <http://red> context
-[[
- {[aa], [bb], [cc]} with context [http://red]
- {[aa], [bb1], [cc]} with context [http://red]
- {[aa], [a2], "cc"} with context [http://red]
- {[aa], [a2], (cc)} with context [http://red]
- {[mm], [nn], "Some long literal with language at en"} with context [http://red]
- {[oo], [pp], "12345^^<http://www.w3.org/2001/XMLSchema#int>"} with context [http://red]
-]]
-**PASSED**:
- 4: Count of triples in <http://red> context
-**PASSED**: graph has 6 triples
- 5: Exec: ARC aa bb
-Matched node: [cc]
-**PASSED**:
- 6: Exec: ARCS aa cc
-Matched node: [bb] with context [http://red]
-Matched node: [bb1] with context [http://red]
-: matching nodes: 2
-**PASSED**:
- 7: Exec: ARCS-IN cc
-Matched arc: [bb] with context [http://red]
-Matched arc: [bb1] with context [http://red]
-**PASSED**: matching arcs: 2
- 8: Exec: ARCS-OUT aa
-Matched arc: [bb] with context [http://red]
-Matched arc: [bb1] with context [http://red]
-Matched arc: [a2] with context [http://red]
-Matched arc: [a2] with context [http://red]
-**PASSED**: matching arcs: 4
- 9: Exec: CONTAINS aa bb1 cc
-**PASSED**: the graph contains the triple
- 10: Exec: FIND aa - -
-Matched triple: {[aa], [bb], [cc]} with context [http://red]
-Matched triple: {[aa], [bb1], [cc]} with context [http://red]
-Matched triple: {[aa], [a2], "cc"} with context [http://red]
-Matched triple: {[aa], [a2], (cc)} with context [http://red]
-**PASSED**: matching triples: 4
- 11: Exec: HAS-ARC-IN cc bb
-**PASSED**: the graph contains the arc
- 12: Exec: HAS-ARC-OUT aa bb
-**PASSED**: the graph contains the arc
- 13: Exec: SOURCE aa cc
-Matched node: [aa]
-**PASSED**:
- 14: Exec: SOURCES bb cc
-Matched node: [aa] with context [http://red]
-: matching nodes: 1
-**PASSED**:
- 15: Exec: TARGET aa bb
-Matched node: [cc]
-**PASSED**:
- 16: Exec: TARGETS aa bb
-Matched node: [cc] with context [http://red]
-: matching nodes: 1
-**PASSED**:
- 17: Exec: REMOVE aa bb1 cc
-**PASSED**: removed triple from the graph
- 18: Exec: QUERY "CONSTRUCT {?s ?p ?o} FROM <http://red> WHERE {?s ?p ?o}"
-Matched triple: {[aa], [a2], "cc"}
-Matched triple: {[oo], [pp], "12345^^<http://www.w3.org/2001/XMLSchema#int>"}
-Matched triple: {[aa], [a2], (cc)}
-Matched triple: {[aa], [bb], [cc]}
-Matched triple: {[mm], [nn], "Some long literal with language at en"}
-**PASSED**: matching triples: 5
- 19: Exec1: QUERY_AS_BINDINGS "SELECT * WHERE {graph <http://red> { ?s ?p ?o }}"
-**: Formatting query result as 'xml':
-<?xml version="1.0" encoding="utf-8"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
- <head>
- <variable name="s"/>
- <variable name="p"/>
- <variable name="o"/>
- </head>
- <results>
- <result>
- <binding name="s"><uri>aa</uri></binding>
- <binding name="p"><uri>bb</uri></binding>
- <binding name="o"><uri>cc</uri></binding>
- </result>
- <result>
- <binding name="s"><uri>aa</uri></binding>
- <binding name="p"><uri>a2</uri></binding>
- <binding name="o"><literal>cc</literal></binding>
- </result>
- <result>
- <binding name="s"><uri>aa</uri></binding>
- <binding name="p"><uri>a2</uri></binding>
- <binding name="o"><bnode>cc</bnode></binding>
- </result>
- <result>
- <binding name="s"><uri>mm</uri></binding>
- <binding name="p"><uri>nn</uri></binding>
- <binding name="o"><literal>Some long literal with language at en</literal></binding>
- </result>
- <result>
- <binding name="s"><uri>oo</uri></binding>
- <binding name="p"><uri>pp</uri></binding>
- <binding name="o"><literal>12345^^<http://www.w3.org/2001/XMLSchema#int></literal></binding>
- </result>
- </results>
-</sparql>
-**PASSED**:
- 20: Exec2: QUERY_AS_BINDINGS "SELECT * WHERE {graph <http://red> { ?s ?p ?o }}"
-: Query returned bindings results:
-result: [s=[aa], p=[bb], o=[cc]]
-result: [s=[aa], p=[a2], o=cc]
-result: [s=[aa], p=[a2], o=(cc)]
-result: [s=[mm], p=[nn], o=Some long literal with language at en]
-result: [s=[oo], p=[pp], o=12345^^<http://www.w3.org/2001/XMLSchema#int>]
-: Query returned 5 results
-**PASSED**:
-=============================================
-PASSED: 20 FAILED: 0
-]]></programlisting>
- </listitem>
- </itemizedlist>
- </sect4>
- <sect4 id="rdfnativestorageprovidersredlandcp"><title>Connection Parameters</title>
- <para>The Virtuoso provider has the following connection parameters available fro use:</para>
- <itemizedlist mark="bullet">
- <listitem><emphasis>dsn</emphasis> - ODBC datasource name</listitem>
- <listitem><emphasis>user</emphasis> - user name of database server</listitem>
- <listitem><emphasis>password</emphasis> - password of database server</listitem>
- <listitem><emphasis>host</emphasis> - hostname:portno of the database server</listitem>
- <listitem><emphasis>charset</emphasis> - database charset to use</listitem>
- </itemizedlist>
- <para>NOTE: Take care exposing the password as for example, program arguments or environment
-variables. The rdfproc utility can help this by reading the password from standard input. Inside programs,
-one way to prevent storing the password in a string is to construct a Redland hash of the storage options
-such as via librdf hash_from_string and use librdf_new_storage_with_options to create a storage. The
-rdfproc utility source code demonstrates this.
- </para>
- <para>The storage name parameter given to the storage constructor librdf new_storage is used
-inside the virtuoso store to allow multiple stores inside one Virtuoso database instance as parameterized
-with the above options.
- </para>
- <para>This store always provides contexts; the boolean storage option contexts is not checked.</para>
- <para>Examples:</para>
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersjenaexamples9"><title>VirtJenaSPARQLExample9</title>
<programlisting><![CDATA[
- /* A new Virtuoso store */
- storage=librdf_new_storage(world, "virtuoso", "db1",
- "dsn='Local Virtuoso',user='demo',password='demo'");
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.graph.Triple;
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.Graph;
+import com.hp.hpl.jena.rdf.model.*;
+import java.util.Iterator;
+
+import virtuoso.jena.driver.*;
+
+public class VirtuosoSPARQLExample9 {
+
+ /**
+ * Executes a SPARQL query against a virtuoso url and prints results.
+ */
+ public static void main(String[] args) {
+
+ String url;
+ if(args.length == 0)
+ url = "jdbc:virtuoso://localhost:1111";
+ else
+ url = args[0];
+
+/* STEP 1 */
+ VirtGraph set = new VirtGraph (url, "dba", "dba");
+
+/* STEP 2 */
+ String str = "CLEAR GRAPH <http://test1>";
+ VirtuosoUpdateRequest vur = VirtuosoUpdateFactory.create(str, set);
+ vur.exec();
+
+ str = "INSERT INTO GRAPH <http://test1> { <http://aa> <http://bb> 'cc' . <http://aa1> <http://bb> 123. }";
+ vur = VirtuosoUpdateFactory.create(str, set);
+ vur.exec();
+
+
+/* Select all data in virtuoso */
+ Query sparql = QueryFactory.create("SELECT * FROM <http://test1> WHERE { ?s ?p ?o }");
+ VirtuosoQueryExecution vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+ ResultSet results = vqe.execSelect();
+ System.out.println("\nSELECT results:");
+ while (results.hasNext()) {
+ QuerySolution rs = results.nextSolution();
+ RDFNode s = rs.get("s");
+ RDFNode p = rs.get("p");
+ RDFNode o = rs.get("o");
+ System.out.println(" { " + s + " " + p + " " + o + " . }");
+}
- /* A different, existing Virtuoso store in the same database as above */
- storage=librdf_new_storage(world, "virtuoso", "db2",
- "dsn='Local Virtuoso',user='demo',password='demo'");
+ sparql = QueryFactory.create("DESCRIBE <http://aa> FROM <http://test1>");
+ vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
- /* An existing Virtuoso store on a different database server */
- storage=librdf_new_storage(world, "virtuoso", "http://red3",
- "dsn='Remote Virtuoso',user='demo',password='demo'");
+ Model model = vqe.execDescribe();
+ Graph g = model.getGraph();
+ System.out.println("\nDESCRIBE results:");
+ for (Iterator i = g.find(Node.ANY, Node.ANY, Node.ANY); i.hasNext();)
+{
+ Triple t = (Triple)i.next();
+ System.out.println(" { " + t.getSubject() + " " +
+ t.getPredicate() + " " +
+ t.getObject() + " . }");
+ }
- /* Opening with an options hash */
- options=librdf_new_hash(world, NULL);
- librdf_hash_from_string(options,
- "dsn='Local Virtuoso',user='demo'");
- librdf_hash_put_strings(options, "password", user_password);
- storage=librdf_new_storage_with_options(world, "virtuoso", "http://red3", options);
+
+
+ sparql = QueryFactory.create("CONSTRUCT { ?x <http://test> ?y } FROM <http://test1> WHERE { ?x <http://bb> ?y }");
+ vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+
+ model = vqe.execConstruct();
+ g = model.getGraph();
+ System.out.println("\nCONSTRUCT results:");
+ for (Iterator i = g.find(Node.ANY, Node.ANY, Node.ANY); i.hasNext();)
+ {
+ Triple t = (Triple)i.next();
+ System.out.println(" { " + t.getSubject() + " " +
+ t.getPredicate() + " " +
+ t.getObject() + " . }");
+ }
+
+
+ sparql = QueryFactory.create("ASK FROM <http://test1> WHERE { <http://aa> <http://bb> ?y }");
+ vqe = VirtuosoQueryExecutionFactory.create (sparql, set);
+
+ boolean res = vqe.execAsk();
+ System.out.println("\nASK results: "+res);
+
+
+ }
+}
]]></programlisting>
</sect4>
</sect3>
- <sect3 id="rdfnativestorageprovidersredlandref"><title>References</title>
+ <sect3 id="rdfnativestorageprovidersjenajavadoc"><title>Javadoc API Documentation</title>
+ <para><ulink url="http://docs.openlinksw.com/jena/">Jena Provider Javadoc API Documentation</ulink> is available enabling the complete set of classes, interfaces and methods implemented for the provider to be viewed.
+</para>
+ </sect3>
+</sect2>
+ <sect2 id="rdfnativestorageproviderssesame"><title>Virtuoso Sesame Provider</title>
+ <sect3 id="rdfnativestorageproviderssesamewhatis"><title>What is Sesame</title>
+ <para>Sesame is an open source Java framework for storing, querying and reasoning with RDF and RDF Schema. It can be used as a database for RDF and RDF Schema, or as a Java library for applications that need to work with RDF internally. For example, suppose you need to read a big RDF file, find the relevant information for your application, and use that information. Sesame provides you with the necessary tools to parse, interpret, query and store all this information, embedded in your own application if you want, or, if you prefer, in a separate database or even on a remote server. More generally: Sesame provides an application developer a toolbox that contains useful hammers screwdrivers etc. for doing 'Do-It-Yourself' with RDF.
+ </para>
+ </sect3>
+ <sect3 id="rdfnativestorageproviderssesamewhatisvirtuososesameprovider"><title>What is the Virtuoso Sesame Provider</title>
+ <para>The Virtuoso Sesame Provider is a fully operational Native Graph Model Storage Providers for the Sesame Framework, allowing users of Virtuoso to leverage the Sesame framework for modifying, querying, and reasoning with the Virtuoso quad store using the Java language. The Sesame Repository API offers a central access point for connecting to the Virtuoso quad store. Its purpose is to provides a java-friendly access point to Virtuoso. It offers various methods for querying and updating the data, while abstracting the details of the underlying machinery. The Provider has been tested against the <ulink url="http://sourceforge.net/project/showfiles.php?group_id=46509&package_id=168413">Sesame 2.1.2</ulink> version currently available.
+ </para>
+ <figure id="rdfnativestorageproviderssesame1" float="1">
+ <title>Fig. 1 Sesame Component Stack</title>
+ <graphic fileref="ui/VirtSesame2Provider.png"/>
+ </figure>
+ <para>If you need more information about how to set up your environment for working with the Sesame APIs, take a look at Chapter 4 of the Sesame User Guide, <ulink url="http://www.openrdf.org/doc/sesame2/users/RDF">Setting up to use the Sesame libraries</ulink>.
+ </para>
+ </sect3>
+ <sect3 id="rdfnativestorageproviderssesamesetup"><title>Setup</title>
+ <sect4 id="rdfnativestorageproviderssesamereqfiles"><title>Required Files</title>
+ <para>This tutorial assumes you have Virtuoso server installed and that the database is accessible at "localhost:1111". In addition, you will need the latest version of the Virtuoso Sesame Provider, and Sesame 2 or greater installed.
+ <para>You should download the Virtuoso Sesame 2 Provider JAR archive, Virtuoso JDBC Driver, Sesame Framework and associated classes and sample programs from our <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSDownload">download page</ulink></para>
+ </para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamecmppr"><title>Compiling Sesame Sample Program</title>
+ <orderedlist>
+ <listitem>Ensure that full paths to the following files are all included in the active CLASSPATH setting --
<itemizedlist mark="bullet">
- <listitem><ulink url="http://librdf.org/docs/api/redland-storage.html">RedLand Triple
- Store</ulink></listitem>
- <listitem><ulink url="http://librdf.org/docs/api/redland-storage-modules.html">RedLand
- Storage Modules</ulink></listitem>
+ <listitem>openrdf-sesame-2.1.2-onejar.jar</listitem>
+ <listitem>slf4j-api-1.5.0.jar</listitem>
+ <listitem>slf4j-jdk14-1.5.0.jar</listitem>
+ <listitem>virtjdbc3.jar</listitem>
+ <listitem>virt_sesame2.jar</listitem>
</itemizedlist>
- </sect3>
- </sect2>
-</sect1>
+ </listitem>
+ <listitem>Execute the following command:
+<programlisting><![CDATA[
+javac VirtuosoTest.java
+]]></programlisting>
+ <para>Note: to use utf-8 and to use row auto commit is recommended to add the following to the connect string:
+ </para>
+<programlisting><![CDATA[
+"/charset=UTF-8/log_enable=2"
+-- i.e. in VirtuosoTest.java the line:
+Repository repository = new VirtuosoRepository("jdbc:virtuoso://" + sa[0] + ":" + sa[1], sa[2], sa[3]);
+-- should become:
+Repository repository = new VirtuosoRepository("jdbc:virtuoso://" + sa[0] + ":" + sa[1]+ "/charset=UTF-8/log_enable=2", sa[2], sa[3]);
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesametesting"><title>Testing</title>
+ <orderedlist>
+ <listitem>Ensure that full paths to the following files are all included in the active CLASSPATH setting:
+ <itemizedlist mark="bullet">
+ <listitem>openrdf-sesame-2.1.2-onejar.jar</listitem>
+ <listitem>slf4j-api-1.5.0.jar</listitem>
+ <listitem>slf4j-jdk14-1.5.0.jar</listitem>
+ <listitem>virtjdbc3.jar</listitem>
+ <listitem>virt_sesame2.jar</listitem>
+ <listitem>virtuoso_driver</listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>Run the <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2Provider?att=VirtuosoTest.java">VirtuosoTest</ulink> program to test the Sesame 2 Provider with the following command:
+<programlisting><![CDATA[
+java VirtuosoTest <hostname> <port> <uid> <pwd>
+]]></programlisting>
+ </listitem>
+ <listitem>The test run should look like this:
+<programlisting><![CDATA[
+$ java VirtuosoTest localhost 1111 dba dba
-<sect1 id="rdfgraphreplication"><title>RDF Graph Replication</title>
-<para>The following section demonstrates how to replicate graphs from one Virtuoso
- instance to (an)other Virtuoso instance(s), using the RDF Replication Feature.</para>
-<para>Terms used in this section:</para>
-<itemizedlist mark="bullet">
- <listitem><emphasis>Host Virtuoso Instance</emphasis>, aka the publisher: the instance where we
- will insert RDF data into a Named Graph; then create a publication of this graph.</listitem>
- <listitem><emphasis>Destination Virtuoso Instance</emphasis>, aka the subscriber: the instance
- which will subscribe to the publication from the Host Virtuoso Instance.</listitem>
-</itemizedlist>
- <tip><title>See Also:</title>
- <para><link linkend="fn_rdf_repl_start"><function>DB.DBA.RDF_REPL_START()</function></link></para>
- <para><link linkend="fn_rdf_repl_graph_ins"><function>DB.DBA.RDF_REPL_GRAPH_INS()</function></link></para>
- <para><link linkend="fn_rdf_repl_graph_del"><function>DB.DBA.RDF_RDF_REPL_GRAPH_DEL()</function></link></para>
- </tip>
-<para>The basic outline:</para>
-<itemizedlist mark="bullet">
- <listitem>First, use the Virtuoso Conductor on a Host Virtuoso Instance to publish a named
- graph.</listitem>
- <listitem>Then, use the Virtuoso Conductor on a Destination Virtuoso Instance to subscribe
- to deltas from the published graph.</listitem>
- <listitem>Finally, see how a change in the publisher's graph will appear in the subscriber's
- graph.</listitem>
-</itemizedlist>
- <sect2 id="rdfgraphreplicationscenr"><title>Replication Scenarios</title>
- <figure id="topo_scenario" float="1">
- <title></title>
- <graphic fileref="ui/topo-scenario.png"/>
- </figure>
- <sect3 id="rdfgraphreplicationscenrint"><title>Introduction</title>
- <para>In this section we will examine a proposed setup for a back-end server called MASTER which
- publishes a number of graphs to a set of front-end machines called FARM-1 .. FARM-n and discuss
- a couple of common scenarios like adding an extra machine to the farm, or replacing a broken
- instance of MASTER.</para>
- <para>In this example we will assume each virtuoso instance running on its own machine, so they can
- use the same port numbers for both the main server (default 1111) as well as the http port
- (default 8890) as each machine has an unique IP addresses. In the example we use MASTER-IP and
- FARM-x-IP which should be replaced by either the real IP address or the DNS name of the machine
- in question.</para>
- <para>Since there will be a reverse-proxy service in front of the farm, all virtuoso instances
- should have the URIQA Default host set to the outside name for this service. In this example
- we will use http://test.example.com as the web service we are trying to setup.</para>
- </sect3>
- <sect3 id="rdfgraphreplicationscenrsup"><title>Setup</title>
- <sect4 id="rdfgraphreplicationscenrsupinstv"><title>Installing Virtuoso</title>
- <para>All machines in this setup should be installed with similar installation paths like:</para>
- <itemizedlist mark="bullet">
- <listitem>/opt/virtuoso</listitem>
- <listitem>/dbs/virtuoso</listitem>
- <listitem>/virtuoso</listitem>
- <listitem>...</listitem>
- </itemizedlist>
- <para>The partition should be big enough to have room for the Virtuoso binaries and libraries,
- the transaction logs, backups and, if you do not want to use the striping feature of Virtuoso,
- it will need to have room for the main database files as well.</para>
- <para>Here are the quick installation steps:</para>
- <orderedlist>
- <listitem>Login as root.</listitem>
- <listitem>Create local user called virtuoso using the chosen installation path as home
- direcotory.</listitem>
- <listitem>Login as virtuoso.</listitem>
- <listitem>Extract virtuoso-universal-server-6.1.tar in home directory.</listitem>
- <listitem>Run sh install.sh to install Virtuoso.</listitem>
- <listitem>Remove the file install.sh virtuoso-universal-server-6.1.tar virtuoso-server.taz if
- not otherwise needed.</listitem>
- <listitem>Run bin/virtuoso-stop.sh to shutdown this Virtuoso instance.</listitem>
- <listitem>Install virtuoso.lic for this system in $HOME/bin directory.</listitem>
- </orderedlist>
- <para>As the replication process needs to make an ODBC connection to the MASTER machine, all
- machines should have the following information in the $HOME/bin/odbc.ini:</para>
-<programlisting><![CDATA[
-[ODBC Data Sources]
-..
-MASTER_DSN = OpenLink Virtuoso
+== TEST 1: : Start
+ Loading data from URL: http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com/foaf.rdf
+== TEST 1: : End
+PASSED: TEST 1
-..
-[MASTER_DSN]
-Driver = OpenLink Virtuoso
-Address = MASTER_IP:1111
-]]></programlisting>
- </sect4>
- <sect4 id="rdfgraphreplicationscenrsupinstm"><title>Setting up MASTER</title>
- <para>The MASTER machine is the back-end server machine. Various applications feed SPARQL data
- into this machine it publishes a set of graphs using RDF Replication.</para>
- <para>The MASTER machine should ideally be equipped with multiple redundant disks in RAID-1
- or RAID-6 mode to minimize the risk that a single bad disk takes down the system. From a
- Virtuoso point of view we will use a combination of online backups combined with checkpoint
- audit trail to backup the content of the database in a safe way. The online backups, the
- checkpoint audit trail as well as the replication logs can also be copied to secondary
- storage using the rsync command and can be easily scripted as a cron job.</para>
- <para>Changes to database/virtuoso.ini:</para>
-<programlisting><![CDATA[
-...
-[Parameters]
-SchedulerInterval = 1 ; run the internal scheduler every minute
-CheckpointAuditTrail = 1 ; enable audit trail on transaction logs
-CheckpointInterval = 60 ; perform an automated checkpoint every 60 minutes
-...
-[URIQA]
-DefaultHost = test.example.com
-...
-[Replication]
-ServerName = MASTER
-ServerEnable = 1
-QueueMax = 5000000
-...
-]]></programlisting>
- <para>Once the MASTER is started using the bin/virtuoso-start.sh script we must enable RDF
- replication before we start add data to the graphs we wish to replicate, so every record is
- accounted for by the replication process. If there is existing data in the graphs to be
- published, then this data would need to be added to a subscriber manually since the
- replication process creates a delta set of changes since publishing was enabled.</para>
- <para>To enable publishing of the graph we use the isql program to connect to the MASTER
- instance:</para>
+== TEST 2: : Start
+ Clearing triple store
+== TEST 2: : End
+PASSED: TEST 2
+
+== TEST 3: : Start
+ Loading data from file: virtuoso_driver/data.nt
+== TEST 3: : End
+PASSED: TEST 3
+
+== TEST 4: : Start
+ Loading UNICODE single triple
+== TEST 4: : End
+PASSED: TEST 4
+
+== TEST 5: : Start
+ Loading single triple
+== TEST 5: : End
+PASSED: TEST 5
+
+== TEST 6: : Start
+ Casted value type
+== TEST 6: : End
+PASSED: TEST 6
+
+== TEST 7: : Start
+ Selecting property
+== TEST 7: : End
+PASSED: TEST 7
+
+== TEST 8: : Start
+ Statement does not exists
+== TEST 8: : End
+PASSED: TEST 8
+
+== TEST 9: : Start
+ Statement exists (by resultset size)
+== TEST 9: : End
+PASSED: TEST 9
+
+== TEST 10: : Start
+ Statement exists (by hasStatement())
+== TEST 10: : End
+PASSED: TEST 10
+
+== TEST 11: : Start
+ Retrieving namespaces
+== TEST 11: : End
+PASSED: TEST 11
+
+== TEST 12: : Start
+ Retrieving statement (http://myopenlink.net/dataspace/person/kidehen http://myopenlink.net/foaf/name null)
+== TEST 12: : End
+PASSED: TEST 12
+
+== TEST 13: : Start
+ Writing the statements to file: (/Users/hughwilliams/src/virtuoso-opensource/binsrc/sesame2/results.n3.txt)
+== TEST 13: : End
+PASSED: TEST 13
+
+== TEST 14: : Start
+ Retrieving graph ids
+== TEST 14: : End
+PASSED: TEST 14
+
+== TEST 15: : Start
+ Retrieving triple store size
+== TEST 15: : End
+PASSED: TEST 15
+
+== TEST 16: : Start
+ Sending ask query
+== TEST 16: : End
+PASSED: TEST 16
+
+== TEST 17: : Start
+ Sending construct query
+== TEST 17: : End
+PASSED: TEST 17
+
+== TEST 18: : Start
+ Sending describe query
+== TEST 18: : End
+PASSED: TEST 18
+
+============================
+PASSED:18 FAILED:0
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect4>
+ </sect3>
+ <sect3 id="rdfnativestorageproviderssesamegettingstarted"><title>Getting Started</title>
+ <para>This section covers the essentials for connecting to and manipulating data stored in a Virtuoso repository using the Sesame API. More information on the Sesame Framework, including extended examples on how to use the API, can be found in Chapter 8 of the Sesame User's guide,
+<ulink url="http://www.openrdf.org/doc/sesame2/2.1.2/users/ch08.html#d0e833">the RepositoryConnection API</ulink>.
+ </para>
+ <para>The interfaces for the Repository API can be found in packages virtuoso.sesame2.driver and org.openrdf.repository. Several implementations for these interface exist in the Virtuoso Provider download package. The
+ <ulink url="http://www.openrdf.org/doc/sesame2/2.1.2/apidocs/">Javadoc reference for the Sesame API</ulink>
+is available online and can also be found in the doc directory of the download.
+ </para>
+ <sect4 id="rdfnativestorageproviderssesamegettingstartedcrrep"><title>Creating a VirtuosoRepositoryRDF object</title>
+ <para>The first step to connecting to Virtuoso through the Sesame API is to create a Repository for it. The Repository object operates on (stacks of) Sail object(s) for storage and retrieval of RDF data.
+ </para>
+ <para>One of the simplest configurations is a repository that just stores RDF data in main memory without applying any inference or whatsoever. This is also by far the fastest type of repository that can be used. The following code creates and initialize a non-inferencing main-memory repository:
+ </para>
<programlisting><![CDATA[
-$ isql MASTER-IP:1111
-
--- and run the following commands:
+import virtuoso.sesame2.driver.VirtuosoRepository;
--- enable this instance as a publisher
-rdf_repl_start();
+Repository myRepository = VirtuosoRepository("jdbc:virtuoso://localhost:1111”,”dba”,”dba”);
--- add graphs to replication list
-rdf_repl_graph_ins('http://test.example.com');
-]]></programlisting>
- <para>Next we create a backup directory inside the database directory and setup the online
- backup, again using the isql program:</para>
+myRepository.initialize();
+]]></programlisting>
+ <para>The constructor of the VirtuosoRepository class accepts the JDBC URL of the Virtuoso engine (the default port is 1111), the username and password of an authorized user. Following this example, the repository needs to be initialized to prepare the Sail(s) that it operates on, which includes operations such as restoring previously stored data, setting up connections to a relational database, etc.
+ </para>
+ <para>The repository that is created by the above code is volatile: its contents are lost when the object is garbage collected or when the program is shut down. This is fine for cases where, for example, the repository is used as a means for manipulating an RDF model in memory.
+ </para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamegettingstartedrdfvirtcr"><title>Creating a Virtuoso Repository Connection</title>
+ <para>Now that we have created a VirtuosoRepository object instance, we want to do something
+ with it. This is achieved through the use of the VirtuosoRepositoryConnection class, which
+ can be created by the VirtuosoRepository class.
+ </para>
+ <para>A VirtuosoRepositoryConnection represents - as the name suggests - a connection to the
+ actual Virtuoso quad store. We can issue operations over this connection, and close it when
+ we are done to make sure we are not keeping resources unnecessarily occupied.
+ </para>
+ <para>In the following sections, we will show some examples of basic operations using the Northwind dataset.
+ </para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamegettingstartedrdfvirt"><title>Adding RDF to Virtuoso</title>
+ <para>The Repository implements the Sesame Repository API offers various methods for adding data to a repository. Data can be added pro grammatically by specifying the location of a file that contains RDF data, and statements can be added individually or in collections.
+ </para>
+ <para>We perform operations on the repository by requesting a RepositoryConnection from the
+ repository, which returns a VirtuosoRepositoryConnection object. On this
+ VirtuosoRepositoryConnection object we can perform the various operations, such as query
+ evaluation, getting, adding, or removing statements, etc.
+ </para>
+ <para>The following example code adds two files, one local and one located on the WWW, to a repository:
+ </para>
<programlisting><![CDATA[
-$ cd database
-$ mkdir backup
-$ isql MASTER_IP:1111
-
--- and run the following commands:
+import org.openrdf.repository.RepositoryException;
--- clear any previous context
-backup_context_clear();
+import org.openrdf.repository.Repository;
--- start the backup
-backup_online ('bkup-#', 1000000, 0, vector ('backup'));
+import org.openrdf.repository.RepositoryConnection;
-]]></programlisting>
- <para>The following files can now be backed up using rsync or similar tool to another machine:</para>
-<table><title>Files that can be backed up using rsync or similar tool to another machine</title>
-<tgroup cols="2">
-<thead><row>
-<entry>Files</entry><entry>Description</entry>
-</row></thead>
-<tbody>
-<row><entry>database/backup/*.bp</entry><entry> the incremental backup files</entry></row>
-<row><entry>database/virtuoso.trx</entry><entry> the main transaction log containing the most recent updates to the database that have not been checkpointed into the database</entry></row>
-<row><entry>database/virtuosoTIMESTAMP.trx</entry><entry>all the previous transaction logs which can be used to reconstruct the database</entry></row>
-<row><entry>database/__rdf_repl*.log</entry><entry>all the replication logs containing the changes to the published graph</entry></row>
-</tbody>
-</tgroup>
-</table>
- <para>NOTE: Since the database is constantly modified during operation, it is of NO use to
- backup the virtuoso.db using an rsync script unless the virtuoso instance was shutdown
- beforehand, or certain extra precautions are taken which we will explain later on.</para>
- </sect4>
- <sect4 id="rdfgraphreplicationscenrsupinstp"><title>Setup SPARE master</title>
- <para>The SPARE machine is a replica of the MASTER machine. This machine subscribes to the
- publication of the MASTER to keep an exact match of the RDF graphs, but also publishes
- this data without any initial subscribers.</para>
- <para>The SPARE machine should ideally be equipped similar to the MASTER machine, with multiple
- redundant disks in RAID-1 or RAID-6 mode to minimize the risk that a single bad disk takes down
- the system. From a Virtuoso point of view we will use a combination of online backups combined
- with checkpoint audit trail to backup the content of the database in a safe way. The online
- backups, the checkpoint audit trail as well as the replication logs can also be copied to
- secondary storage using the rsync command and can be easily scripted as a cron job.</para>
- <para>Changes to database/virtuoso.ini:</para>
-<programlisting><![CDATA[
-...
-[Parameters]
-SchedulerInterval = 1 ; run the internal scheduler every minute
-CheckpointAuditTrail = 1 ; enable audit trail on transaction logs
-CheckpointInterval = 60 ; perform an automated checkpoint every 60 minutes
-...
-[URIQA]
-DefaultHost = test.example.com
-...
-[Replication]
-ServerName = SPARE
-ServerEnable = 1
-QueueMax = 5000000
-...
-]]></programlisting>
- <para>We must enable RDF replication before we start add data to the graphs we wish to
- replicate, so every record is accounted for by the replication process. If there is
- existing data in the graphs to be published, then this data would need to be added
- to a subscriber manually since the replication process creates a delta set of changes
- since publishing was enabled.</para>
- <para>To enable publishing of the graph, as well as subscribing to the MASTER, we first start
- up this Virtuoso instance with bin/virtuoso-start.sh and then use the isql program to connect
- to the SPARE instance:</para>
-<programlisting><![CDATA[
-$ bin/virtuoso-start.sh
-$ isql SPARE-IP:1111
+import org.openrdf.rio.RDFFormat;
--- and run the following commands:
+import java.io.File;
--- enable this instance as a publisher
-rdf_repl_start();
+import java.net.URL;
--- add graphs to replication list
-rdf_repl_graph_ins('http://test.example.com');
+File file = new File("/path/to/example.rdf");
--- connect to master
-repl_server ('MASTER', 'MASTER_DSN');
+String baseURI = "http://example.org/example/localRDF";
--- start subscribing to __rdf_repl
-repl_subscribe ('MASTER', '__rdf_repl', 'dav', 'dav', 'dba', 'dba');
+?
--- start initial replication
-repl_sync_all ();
+try {
--- add subscription to scheduler
-DB.DBA.SUB_SCHEDULE ('MASTER', '__rdf_repl', 1);
-]]></programlisting>
- <para>Next we create a backup directory inside the database directory and setup the online backup,
- again using the isql program:</para>
-<programlisting><![CDATA[
-$ cd database
-$ mkdir backup
-$ isql SPARE_IP:1111
+ RepositoryConnection con = myRepository.getConnection();
---and run the following commands:
+ try {
--- clear any previous context
-backup_context_clear();
+ con.add(file, baseURI, RDFFormat.RDFXML);
--- start the backup
-backup_online ('bkup-#', 1000000, 0, vector ('backup'));
-]]></programlisting>
- <para>The following files can now be backed up using rsync or similar tool to another machine:</para>
-<table><title>Files that can be backed up using rsync or similar tool to another machine</title>
-<tgroup cols="2">
-<thead><row>
-<entry>Files</entry><entry>Description</entry>
-</row></thead>
-<tbody>
-<row><entry>database/backup/*.bp</entry><entry> the incremental backup files</entry></row>
-<row><entry>database/virtuoso.trx</entry><entry>the main transaction log containing the most recent updates to the database that have not been checkpointed into the database</entry></row>
-<row><entry>database/virtuosoTIMESTAMP.trx</entry><entry>all the previous transaction logs which can be used to reconstruct the database</entry></row>
-<row><entry>database/__rdf_repl*.log</entry><entry>all the replication logs containing the changes to the published graph</entry></row>
-</tbody>
-</tgroup>
-</table>
- <para>Note: Since the database is constantly modified during operation, it is of NO use to
- backup the virtuoso.db using an rsync script unless the virtuoso instance was shutdown
- beforehand, or certain extra precautions are taken which we will explain later on.</para>
- </sect4>
- <sect4 id="rdfgraphreplicationscenrsupinstpf"><title>Setup FARM-1</title>
- <para>The FARM-1 machine is the first front-end server machine. It subscribes to the publication
- of the MASTER instance to keep up-to-date.</para>
- <para>The FARM-1 machine can be run on simpler hardware than the MASTER instance.It does not
- require the same level of redundancy in terms of hard disks etc, as there are a number of
- these machines running in parallel each capable of returning results to the proxy. If one
- FARM machine dies, it can simply be taken from the reverse-proxy list, repaired or replaced
- with a fresh machine before it is added to the list of servers in the reverse proxy. As such
- it does not need to be backed up separately, although we could make a backup of this
- installation to quickly install the rest of the identical FARM boxes.</para>
- <para>Change the database/virtuoso.ini file:</para>
-<programlisting><![CDATA[
-...
-[Parameters]
-SchedulerInterval = 1 ; run the internal scheduler every minute
-CheckpointAuditTrail = 0 ; disable audit trail on transaction logs
-CheckpointInterval = 60 ; perform an automated checkpoint every 60 minutes
-...
-[URIQA]
-DefaultHost = test.example.com
-...
-[Replication]
-ServerName = FARM-1 ; each FARM machine needs to have a unique replication name
-ServerEnable = 1
-QueueMax = 5000000
-...
-]]></programlisting>
- <para>Next we start up the Virtuoso instance using the bin/virtuoso-start.sh command and
- use the isql program to subscribe to the MASTER:</para>
-<programlisting><![CDATA[
-$ bin/virtuoso-start.sh
-$ isql FARM-1-IP:1111
+ URL url = new URL("http://example.org/example/remoteRDF");
--- connect to master
-repl_server ('MASTER', 'MASTER_DSN');
+ con.add(url, url.toString(), RDFFormat.RDFXML);
--- start subscribing to __rdf_repl
-repl_subscribe ('MASTER', '__rdf_repl', 'dav', 'dav', 'dba', 'dba');
+ }
--- start initial replication
-repl_sync_all ();
+ finally {
--- add subscription to scheduler
-DB.DBA.SUB_SCHEDULE ('MASTER', '__rdf_repl', 1);
-]]></programlisting>
- <para>At this point we can shutdown this Virtuoso instance using the bin/virtuoso-stop.sh
- command and make a copy of the whole virtuoso installation as a blueprint to copy to
- another FARM-x machine.</para>
- </sect4>
- <sect4 id="rdfgraphreplicationscenrsupinstpfs"><title>Setup FARM-2 from scratch</title>
- <para>We can repeat the same steps we did for the FARM-1 machine, and just make sure we use
- FARM-2 as the replication name in the database/virtuoso.ini file and use FARM-2-IP:1111 as
- an argument to the isql program.</para>
- <para>Change bin/virtuoso.ini:</para>
-<programlisting><![CDATA[
-[Replication]
-ServerName = FARM-2
-]]></programlisting>
- </sect4>
- <sect4 id="rdfgraphreplicationscenrsupinstpfsi"><title>Setup FARM-3 using blueprint from FARM-1 installation</title>
- <para>Extract the tarred/zipped copy of the installation made at the end of the setup of FARM-1.</para>
- <para>Before starting up the instance, we only need to give this instance a unique name for
- replication:</para>
- <para>Change bin/virtuoso.ini:</para>
-<programlisting><![CDATA[
-[Replication]
-ServerName = FARM-3
-]]></programlisting>
- <para>Next we start up the Virtuoso instance using the bin/virtuoso-start.sh command and since
- the subscription records and schedule are already performed in the previous step, we just
- use the isql program to perform a sync against the MASTER:</para>
-<programlisting><![CDATA[
-$ bin/virtuoso-start.sh
-$ isql FARM-3-IP:1111
+ con.close();
--- change replication name
-DB.DBA.REPL_SERVER_RENAME ('FARM-1', 'FARM-3')
+ }
--- sync against master
-repl_sync_all();
-]]></programlisting>
- </sect4>
- <sect4 id="rdfgraphreplicationscenrsupinstpfsc"><title>Setup FARM-4 using clone of FARM-1</title>
- <para>If the system has been running for some time, it may not be practical to do a replication
- from start, so there is an alternative way to setup a new FARM-4 machine.</para>
- <para>We can either restore the blue-print backup we make at the end of FARM-1 installation,
- or we do a fresh installation of virtuoso on the FARM-4 machine.</para>
- <para>In both cases we shutdown the virtuoso instance and remove the database, as we are going
- to replace this.</para>
-<programlisting><![CDATA[
-$ bin/virtuoso-stop.sh
-$ cd database
-$ rm virtuoso.db virtuoso.trx virtuoso.log virtuoso.pxa
-]]></programlisting>
- <para>Change the database/virtuoso.ini file:</para>
-<programlisting><![CDATA[
-...
-[Parameters]
-SchedulerInterval = 1 ; run the internal scheduler every minute
-CheckpointAuditTrail = 0 ; disable audit trail on transaction logs
-CheckpointInterval = 60 ; perform an automated checkpoint every 60 minutes
-...
-[URIQA]
-DefaultHost = test.example.com
-...
-[Replication]
-ServerName = FARM-4 ; each FARM machine needs to have a unique replication name
-ServerEnable = 1
-QueueMax = 5000000
-...
-]]></programlisting>
- <para>Next we are going to temporarily disable checkpointing on FARM-1 machine so
- we can copy its database without risking corruption: </para>
-<programlisting><![CDATA[
-$ isql FARM-1-IP:1111
+}
--- disable automatic checkpointing
-checkpoint_interval (-1);
+catch (RepositoryException rex) {
--- and do an explicit checkpoint
-checkpoint;
-]]></programlisting>
- <para>It is now safe to copy the database across using the rsync command:</para>
-<programlisting><![CDATA[
-$ rsync -avz virtuoso at FARM-1-IP:/path/to/virtuoso/database/virtuoso.db database/virtuoso.db
-]]></programlisting>
- <para>Next we re-enable checkpoint interval on FARM-1:</para>
-<programlisting><![CDATA[
-$ isql FARM-1-IP:1111
+ // handle exception
--- re-enable checkpointing
-checkpoint_interval(60);
-]]></programlisting>
- <para>The last step is to start the database:</para>
-<programlisting><![CDATA[
-$ bin/virtuoso-start.sh
-$ isql FARM-4-IP:1111
+}
--- change replication name
-DB.DBA.REPL_SERVER_RENAME ('FARM-1', 'FARM-4')
+catch (java.io.IOEXception e) {
--- sync against master
-repl_sync_all();
-]]></programlisting>
- </sect4>
- </sect3>
- </sect2>
- <sect2 id="rdfgraphreplicationtopl"><title>Replication Topologies</title>
-<para>Typical replication topologies are Chains, Stars and Bi-directional. They can be achieved with
- Virtuoso, by repeating the "Publish" and/or "Subscribe" steps on each relevant node.</para>
- <sect3 id="rdfgraphreplicationtoplstar"><title>Star Replication Topology</title>
- <para>In a Star, there is one Publisher, and many Subscribers.</para>
- <figure id="star1" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/topo-star.png"/>
- </figure>
- <para>To set up a Star, follow the scenario:</para>
- <orderedlist>
- <listitem>Configure Instance #1 to Publish.</listitem>
- <listitem>Configure Instance #2 to Subscribe to #1.</listitem>
- <listitem>Repeat as necessary.</listitem>
- </orderedlist>
- <sect4 id="rdfgraphreplicationtoplstarex"><title>Star Replication Topology Example</title>
- <para>The following How-To walks you through setting up Virtuoso RDF Graph Replication in a Star Topology.</para>
- <sect5 id="rdfgraphreplicationtoplstarexpr"><title>Prerequisites</title>
- <sect6 id="rdfgraphreplicationtoplstarexprini"><title>Database INI Parameters</title>
- <para>Suppose there are 3 Virtuoso instances respectively with the following ini parameters values:</para>
- <orderedlist>
- <listitem>virtuoso1.ini:
-<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso1.db
-TransactionFile = virtuoso1.trx
-ErrorLogFile = virtuoso1.log
-...
-[Parameters]
-ServerPort = 1111
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8891
-...
-[URIQA]
-DefaultHost = localhost:8891
-...
-[Replication]
-ServerName = db1
-...
-
-]]></programlisting>
- </listitem>
- <listitem>virtuoso2.ini:
-<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso2.db
-TransactionFile = virtuoso2.trx
-ErrorLogFile = virtuoso2.log
-...
-[Parameters]
-ServerPort = 1112
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8892
-...
-[URIQA]
-DefaultHost = localhost:8892
-...
-[Replication]
-ServerName = db2
-...
-]]></programlisting>
- </listitem>
- <listitem>virtuoso3.ini:
-<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso3.db
-TransactionFile = virtuoso3.trx
-ErrorLogFile = virtuoso3.log
-...
-[Parameters]
-ServerPort = 1113
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8893
-...
-[URIQA]
-DefaultHost = localhost:8893
-...
-[Replication]
-ServerName = db3
-...
-]]></programlisting>
- </listitem>
- </orderedlist>
- </sect6>
- <sect6 id="rdfgraphreplicationtoplstarexprdsn"><title>Database DSNs</title>
- <para>Use the ODBC Administrator on your Virtuoso host (e.g., on Windows, Start menu -> Control Panel -> Administrative Tools -> Data Sources (ODBC); on Mac OS X, /Applications/Utilities/OpenLink ODBC Administrator.app) to create a System DSN for each of db1, db2, db3, with names db1, db2 and db3, respectively.</para>
- </sect6>
- <sect6 id="rdfgraphreplicationtoplstarexprcnd"><title>Install Conductor package</title>
- <para>On each of the 3 Virtuoso instances install the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.1/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink> package.</para>
- </sect6>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplstarexprph"><title>Create a Publication on the Host Virtuoso Instance db1</title>
- <orderedlist>
- <listitem>Go to Conductor -> Replication -> Transactional -> Publications
- <figure id="star2" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r6.png"/>
- </figure>
- </listitem>
- <listitem>Click Enable RDF Publishing</listitem>
- <listitem>A publication with the name RDF Publication should be created:
- <figure id="star3" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r7.png"/>
- </figure>
- </listitem>
- <listitem>Click the link which is the publication name.</listitem>
- <listitem>You will be shown the publication items page:
- <figure id="star4" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r8.png"/>
- </figure>
- </listitem>
- <listitem>Enter for Graph IRI:
-<programlisting><![CDATA[
-http://example.org
-]]></programlisting>
- <figure id="star5" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r9.png"/>
- </figure>
- </listitem>
- <listitem>Click Add New</listitem>
- <listitem>The item will be created and shown in the list of items for the currently viewed publication.
- <figure id="star6" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r10.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplstarexprih"><title>Insert Data into a Named Graph on the Host
- Virtuoso Instance</title>
- <para>There are several ways to insert data into a Virtuoso Named Graph. In this example, we
- will use the Virtuoso Conductor's Import RDF feature:</para>
-<orderedlist>
- <listitem>In the Virtuoso Conductor, go to Linked Data -> Quad Store Upload:
- <figure id="star7" float="1">
- <title>Replication Topology</title>
- <graphic fileref="ui/uc1.png"/>
- </figure>
- </listitem>
- <listitem>In the form:
- <itemizedlist mark="bullet">
- <listitem>Tick the box for Resource URL and enter your resource URL, for e.g.:
-<programlisting><![CDATA[
-http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this
-]]></programlisting>
- </listitem>
- <listitem>Enter for Named Graph IRI:
-<programlisting><![CDATA[
-http://example.org
-]]></programlisting>
-</listitem>
- </itemizedlist>
- <figure id="star8" float="1">
- <title>Replication Topology</title>
- <graphic fileref="ui/r2.png"/>
- </figure>
- </listitem>
- <listitem>Click Upload</listitem>
- <listitem>A successful upload will result in this message:
- <figure id="star9" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r3.png"/>
- </figure>
- </listitem>
- <listitem>Check the inserted triples by executing a query like the following against the SPARQL endpoint, http://cname:port/sparql:
-<programlisting><![CDATA[
-SELECT *
- FROM <http://example.org>
- WHERE { ?s ?p ?o }
-]]></programlisting>
- <figure id="star10" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r4.png"/>
- </figure>
- </listitem>
- <listitem>See how many triples have been inserted in your graph:
-<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
- WHERE { ?s ?p ?o }
-]]></programlisting>
- <figure id="star11" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r5.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplstarexprsp"><title>Subscribe to the Publication on the a
- Destination Virtuoso Instance db2, db3, etc.</title>
-<orderedlist>
- <listitem>Go to Conductor -> Replication -> Transactional -> Subscriptions
- <figure id="star12" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r11.png"/>
- </figure>
- </listitem>
- <listitem>Click New Subscription
- <figure id="star13" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r12.png"/>
- </figure>
- </listitem>
- <listitem>Specify a new Data Source Enter or selected target data source from the available connected Data Sources:
- <figure id="star14" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r13.png"/>
- </figure>
- <figure id="star15" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r13a.png"/>
- </figure>
- </listitem>
- <listitem>Click Publications list
- <figure id="star16" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r15.png"/>
- </figure>
- </listitem>
- <listitem>Select the RDF Publication and click List Items
- <figure id="star17" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r16.png"/>
- </figure>
- </listitem>
- <listitem>Click Subscribe</listitem>
- <listitem>The subscription will be created
- <figure id="star18" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r18.png"/>
- </figure>
- </listitem>
- <listitem>Click Sync</listitem>
- <listitem>Check the retrieved triples by executing the following query
-<programlisting><![CDATA[
-SELECT *
- FROM <http://example.org>
- WHERE {?s ?p ?o}
-]]></programlisting>
- <figure id="star19" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r19.png"/>
- </figure>
- </listitem>
- <listitem>See how many triples have been inserted into your graph by executing the following query:
-<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
- WHERE {?s ?p ?o}
-]]></programlisting>
- <figure id="star20" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r5.png"/>
- </figure>
- </listitem>
-</orderedlist>
-<para>These steps may be repeated for any number of Subscriber.</para>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplstarexprch"><title>Insert Triples into the Host Virtuoso
- Instance Graph and check availability at Destination Virtuoso Instance Graph</title>
-<orderedlist>
- <listitem>To check the starting count, on the Destination Virtuoso Instance SPARQL Endpoint, execute:
-<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
- WHERE { ?s ?p ?o }
-]]></programlisting>
- </listitem>
- <listitem>On the Host Virtuoso Instance go to Conductor -> Database -> Interactive SQL and execute the following statement:
-<programlisting><![CDATA[
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/Web_Services>
- } ;
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/Web_Clients>
- } ;
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/SPARQL>
- } ;
-]]></programlisting>
- <figure id="star21" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r22.png"/>
- </figure>
- <figure id="star22" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r23.png"/>
- </figure>
- </listitem>
- <listitem>To confirm that the triple count has increased by the number of inserted triples, execute the following on the Destination Virtuoso Instance SPARQL Endpoint:
-<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
- WHERE { ?s ?p ?o }
-]]></programlisting>
- <figure id="star23" float="1">
- <title>Star Replication Topology</title>
- <graphic fileref="ui/r24.png"/>
- </figure>
- </listitem>
- </orderedlist>
- </sect5>
- </sect4>
- </sect3>
- <sect3 id="rdfgraphreplicationtoplchain"><title>Chain Replication Topology</title>
- <para>In a Chain, there is one original Publisher, to which there is only one Subscriber. That
- Subscriber may also serve as a Publisher, again with only one Subscriber. The chain ends with
- a Subscriber which does not Publish.</para>
- <figure id="chain1" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/topo-chain.png"/>
- </figure>
- <para>To set up a Chain, follow the scenario:</para>
-<orderedlist>
- <listitem>Configure Instance #1 to Publish.</listitem>
- <listitem>Configure Instance #2 to Subscribe to #1.</listitem>
- <listitem>Configure Instance #2 to Publish.</listitem>
- <listitem>Configure Instance #3 to Subscribe to #2.</listitem>
- <listitem>Repeat as necessary.</listitem>
-</orderedlist>
- <sect4 id="rdfgraphreplicationtoplchainex"><title>Chain Replication Topology Example</title>
- <para>The following How-To walks you through setting up Virtuoso RDF Graph Replication in a
- Chain Topology.</para>
- <sect5 id="rdfgraphreplicationtoplchainexpr"><title>Prerequisites</title>
- <sect6 id="rdfgraphreplicationtoplchainexprini"><title>Database INI Parameters</title>
-<para>Suppose there are 3 Virtuoso instances respectively with the following ini parameters values:</para>
- <orderedlist>
- <listitem>virtuoso1.ini:
-<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso1.db
-TransactionFile = virtuoso1.trx
-ErrorLogFile = virtuoso1.log
-...
-[Parameters]
-ServerPort = 1111
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8891
-...
-[URIQA]
-DefaultHost = localhost:8891
-...
-[Replication]
-ServerName = db1
-...
+ // handle io exception
+ }
]]></programlisting>
- </listitem>
- <listitem>virtuoso2.ini:
-<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso2.db
-TransactionFile = virtuoso2.trx
-ErrorLogFile = virtuoso2.log
-...
-[Parameters]
-ServerPort = 1112
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8892
-...
-[URIQA]
-DefaultHost = localhost:8892
-...
-[Replication]
-ServerName = db2
-...
-]]></programlisting>
- </listitem>
- <listitem>virtuoso3.ini:
-<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso3.db
-TransactionFile = virtuoso3.trx
-ErrorLogFile = virtuoso3.log
-...
-[Parameters]
-ServerPort = 1113
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8893
-...
-[URIQA]
-DefaultHost = localhost:8893
-...
-[Replication]
-ServerName = db3
-...
-]]></programlisting>
- </listitem>
- </orderedlist>
- </sect6>
- <sect6 id="rdfgraphreplicationtoplchainexprdsn"><title>Database DSNs</title>
- <para>Use the ODBC Administrator on your Virtuoso host (e.g., on Windows, Start menu -> Control Panel -> Administrative Tools -> Data Sources (ODBC); on Mac OS X, /Applications/Utilities/OpenLink ODBC Administrator.app) to create a System DSN for each of db1, db2, db3, with names db1, db2 and db3, respectively.</para>
- </sect6>
- <sect6 id="rdfgraphreplicationtoplchainexprcnd"><title>Install Conductor package</title>
- <para>On each of the 3 Virtuoso instances install the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.1/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink> package.</para>
- </sect6>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplchainexpr"><title>Create Publication on db1</title>
-<orderedlist>
- <listitem>Go to http://localhost:8891/conductor and log in as dba</listitem>
- <listitem>Go to Conductor - > Replication - > Transactional - > Publications
- <figure id="chain2" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m1.png"/>
- </figure>
- </listitem>
- <listitem>Click <emphasis>Enable RDF Publishing</emphasis></listitem>
- <listitem>As result publication with the name <emphasis>RDF Publication</emphasis> should be created
- <figure id="chain3" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m2.png"/>
- </figure>
- </listitem>
- <listitem>Click the link which is the publication name. </listitem>
- <listitem>You will be shown the publication items page
- <figure id="chain4" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m3.png"/>
- </figure>
- </listitem>
- <listitem>Enter for Graph IRI:
-<programlisting><![CDATA[
-http://example.org
-]]></programlisting>
- <figure id="chain5" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m4.png"/>
- </figure>
- </listitem>
- <listitem>Click Add New</listitem>
- <listitem>The item will be created and shown in the list of items for the currently viewed publication.
- <figure id="chain6" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m5.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplchainexpr"><title>Create subscription from db2 to db1's Publication</title>
-<orderedlist>
- <listitem>Log in at http://localhost:8892/conductor</listitem>
- <listitem>Go to Replication - > Transactional - > Subscriptions
- <figure id="chain7" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m6.png"/>
- </figure>
- </listitem>
- <listitem>Click <emphasis>New Subscription</emphasis>
- <figure id="chain8" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m7.png"/>
- </figure>
- </listitem>
- <listitem>From the list of "Specify new data source" select Data Source db1
- <figure id="chain9" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m8.png"/>
- </figure>
- </listitem>
- <listitem>Enter for db1 dba user credentials
- <figure id="chain10" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m9.png"/>
- </figure>
- </listitem>
- <listitem>Click "Add Data Source"</listitem>
- <listitem>As result <emphasis>db1</emphasis> will be shown in the "Connected Data Sources" list.
- <figure id="chain11" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m10.png"/>
- </figure>
- </listitem>
- <listitem>Select <emphasis>db1</emphasis> the "Connected Data Sources" list and click "Publications list"
- <figure id="chain12" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m11.png"/>
- </figure>
- </listitem>
- <listitem>As result will be shown the list of available publications for the selected data source. Select the one with name "RDF Publication" and click "List Items".
- <figure id="chain13" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m12.png"/>
- </figure>
- </listitem>
- <listitem>As result will be shown the "Confirm subscription" page.
- <figure id="chain14" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m13.png"/>
- </figure>
- </listitem>
- <listitem>The sync interval by default is 10 minutes. For the testing purposes, we will change it to 1 minute.
- <figure id="chain15" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m14.png"/>
- </figure>
- </listitem>
- <listitem>Click "Subscribe"</listitem>
- <listitem>The subscription will be created.
- <figure id="chain16" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m15.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplchainexpr"><title>Create Publication on db2</title>
- <orderedlist>
- <listitem>Go to http://localhost:8892/conductor and log in as dba</listitem>
- <listitem>Go to Conductor - > Replication - > Transactional - > Publications
- <figure id="chain17" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m16.png"/>
- </figure>
- </listitem>
- <listitem>Click <emphasis>Enable RDF Publishing</emphasis></listitem>
- <listitem>As result publication with the name <emphasis>RDF Publication</emphasis> should be created
- <figure id="chain18" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m17.png"/>
- </figure>
- </listitem>
- <listitem>Click the link which is the publication name.</listitem>
- <listitem>You will be shown the publication items page
- <figure id="chain19" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m18.png"/>
- </figure>
- </listitem>
- <listitem>Enter for Graph IRI:
+ <para>More information on other available methods can be found in the javadoc
+reference of the RepositoryConnection interface.
+ </para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamegettingstartedqr"><title>Querying Virtuoso</title>
+ <para>The Repository API has a number of methods for creating and evaluating queries. Three types of queries are distinguished: tuple queries, graph queries and boolean queries. The query types differ in the type of results that they produce.
+ </para>
+ <para><emphasis>Select Query:</emphasis> The result of a select query is a set of tuples (or
+ variable bindings), where each tuple represents a solution of a query. This type of query is
+ commonly used to get specific values (URIs, blank nodes, literals) from the stored RDF data.
+ The method QueryFactory.executeQuery() returns a Value [ ][ ] for sparql “SELECT” queries.
+The method QueryFactory.executeQuery() also calls the QueryFactory.setResult() which populates
+a set of tuples for SPARQL "SELECT" queries. The graph can be retrieved using
+QueryFactory.getBooleanResult().
+ </para>
+ <para><emphasis>Graph Query:</emphasis> The result of graph queries is an RDF graph (or set of statements). This type of query is very useful for extracting sub-graphs from the stored RDF data, which can then be queried further, serialized to an RDF document, etc. The method QueryFactory.executeQuery() calls the QueryFactory.setGraphResult() which populates a graph for SPARQL “DESCRIBE” and “CONSTRUCT” queries. The graph can be retrieved using QueryFactory.getGraphResult().
+ </para>
+ <para><emphasis>Boolean Query:</emphasis> The result of boolean queries is a simple boolean value, i.e. true of false. This type of query can be used to check if a repository contains specific information. The method QueryFactory.executeQuery() calls the QueryFactory.setBooleanResult() which sets a boolean value for sparql "ASK" queries. The value can be retrieved using QueryFactory.getBooleanResult().
+ </para>
+ <para>Note: Although Sesame 2 currently supports two query languages: SeRQL and SPARQL, the Virtuoso provider only supports the W3C SPARQL specification.
+ </para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamegettingstartevq"><title>Evaluating a SELECT Query</title>
+ <para>To evaluate a tuple query we simply do the following:
+ </para>
<programlisting><![CDATA[
-http://example.org
+import java.util.List;
+
+import org.openrdf.OpenRDFException;
+
+import org.openrdf.repository.RepositoryConnection;
+
+import org.openrdf.query.TupleQuery;
+
+import org.openrdf.query.TupleQueryResult;
+
+import org.openrdf.query.BindingSet;
+
+import org.openrdf.query.QueryLanguage;
+
+?
+
+try {
+
+ RepositoryConnection con = myRepository.getConnection();
+
+ try {
+
+ String queryString = "SELECT x, y FROM WHERE {x} p {y}";
+
+ TupleQuery tupleQuery = con.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+
+ TupleQueryResult result = tupleQuery.evaluate();
+
+ try {
+
+ ? // do something with the result
+
+ }
+
+ finally {
+
+ result.close();
+
+ }
+
+}
+
+ finally {
+
+ con.close();
+
+ }
+
+}
+
+catch (RepositoryException e) {
+
+ // handle exception
+
+}
]]></programlisting>
- <figure id="chain20" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m19.png"/>
- </figure>
- </listitem>
- <listitem>Click Add New</listitem>
- <listitem>The item will be created and shown in the list of items for the currently viewed publication.
- <figure id="chain21" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m20.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplchainexpr"><title>Create subscription from db3 to db2's Publication</title>
- <orderedlist>
- <listitem>Log in at http://localhost:8893/conductor</listitem>
- <listitem>Go to Replication - > Transactional - > Subscriptions
- <figure id="chain22" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m21.png"/>
- </figure>
- </listitem>
- <listitem>Click <emphasis>New Subscription</emphasis>
- <figure id="chain23" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m22.png"/>
- </figure>
- </listitem>
- <listitem>From the list of "Specify new data source" select Data Source db2
- <figure id="chain24" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m23.png"/>
- </figure>
- </listitem>
- <listitem>Enter for db2 dba user credentials
- <figure id="chain25" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m24.png"/>
- </figure>
- </listitem>
- <listitem>Click "Add Data Source"
- <figure id="chain26" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m25.png"/>
- </figure>
- </listitem>
- <listitem>As result <emphasis>db2</emphasis> will be shown in the "Connected Data Sources" list. Select it and click "Publications list"
- <figure id="chain27" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m26.png"/>
- </figure>
- </listitem>
- <listitem>As result will be shown the list of available publications for the selected data source. Select the one with name "RDF Publication" and click "List Items".
- <figure id="chain28" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m27.png"/>
- </figure>
- </listitem>
- <listitem>As result will be shown the "Confirm subscription" page.
- <figure id="chain29" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m28.png"/>
- </figure>
- </listitem>
- <listitem>The sync interval by default is 10 minutes. For the testing purposes, we will change it to 1 minute.
- <figure id="chain30" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m29.png"/>
- </figure>
- </listitem>
- <listitem>Click "Subscribe"</listitem>
- <listitem>The subscription will be created.
- <figure id="chain31" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m30.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplchainind"><title>Insert Data into a Named Graph on the db1 Virtuoso Instance</title>
-<orderedlist>
- <listitem>Log in at http://localhost:8891/conductor</listitem>
- <listitem>Go to Linked Data -> Quad Store Upload:
- <figure id="chain32" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/uc1.png"/>
- </figure>
- </listitem>
- <listitem>In the shown form:
- <orderedlist>
- <listitem>Tick the box for <emphasis>Resource URL</emphasis> and enter your resource URL, e.g.:
+ <para>This evaluates a SPARQL query and returns a TupleQueryResult, which consists of a sequence
+ of BindingSet objects. Each BindingSet contains a set of pairs called Binding objects. A
+ Binding object represents a name/value pair for each variable in the query's projection.
+ </para>
+ <para>We can use the TupleQueryResult to iterate over all results and get each individual result for x and y:
+ </para>
<programlisting><![CDATA[
-http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this
+while (result.hasNext()) {
+
+ BindingSet bindingSet = result.next();
+
+ Value valueOfX = bindingSet.getValue("x");
+
+ Value valueOfY = bindingSet.getValue("y");
+
+ // do something interesting with the query variable values here?
+
+}
]]></programlisting>
- </listitem>
- <listitem>Enter for Named Graph IRI:
+ <para>As you can see, we retrieve values by name rather than by an index. The names used should be the names of variables as specified in your query. The TupleQueryResult.getBindingNames() method returns a list of binding names, in the order in which they were specified in the query. To process the bindings in each binding set in the order specified by the projection, you can do the following:
+ </para>
<programlisting><![CDATA[
-http://example.org
+List bindingNames = result.getBindingNames();
+
+while (result.hasNext()) {
+
+ BindingSet bindingSet = result.next();
+
+ Value firstValue = bindingSet.getValue(bindingNames.get(0));
+
+ Value secondValue = bindingSet.getValue(bindingNames.get(1));
+
+ // do something interesting with the values here?
+
+}
]]></programlisting>
- <figure id="chain33" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m32.png"/>
- </figure>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>Click Upload</listitem>
- <listitem>A successful upload will result in a shown message.
- <figure id="chain34" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m33.png"/>
- </figure>
- </listitem>
- <listitem>Check the count of the inserted triples by executing a query like the following against the SPARQL endpoint,
-http://localhost:8891/sparql:
+ <para>It is important to invoke the close() operation on the TupleQueryResult,
+ after we are done with it. A TupleQueryResult evaluates lazily and keeps resources
+ (such as connections to the underlying database) open. Closing the TupleQueryResult
+ frees up these resources. Do not forget that iterating over a result may cause exceptions!
+ The best way to make sure no connections are kept open unnecessarily is to invoke close()
+ in the finally clause.
+ </para>
+ <para>An alternative to producing a TupleQueryResult is to supply an object that implements the
+ TupleQueryResultHandler interface to the query's evaluate() method. The main difference is
+ that when using a return object, the caller has control over when the next answer is retrieved,
+ whereas with the use of a handler, the connection simply pushes answers to the handler object
+ as soon as it has them available.
+ </para>
+ <para>As an example we will use SPARQLResultsXMLWriter, which is a TupleQueryResultHandler
+implementation that writes SPARQL Results XML documents to an output stream or to a writer:
+ </para>
<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
+import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter;
+
+?
+
+FileOutputStream out = new FileOutputStream("/path/to/result.srx");
+
+try {
+
+ SPARQLResultsXMLWriter sparqlWriter = new SPARQLResultsXMLWriter(out);
+
+ RepositoryConnection con = myRepository.getConnection();
+
+ try {
+
+ String queryString = "SELECT * FROM WHERE {x} p {y}";
+
+ TupleQuery tupleQuery = con.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+
+ tupleQuery.evaluate(sparqlWriter);
+
+ }
+
+ finally {
+
+ con.close();
+
+ }
+
+}
+
+finally {
+
+ out.close();
+
+}
]]></programlisting>
- <figure id="chain35" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m34.png"/>
- </figure>
- </listitem>
- <listitem>Should return <emphasis>57</emphasis> as total.
- <figure id="chain36" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m35.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplchainexcdd"><title>Check data on the Destination instances db2 and db3</title>
-<orderedlist>
- <listitem>To check the starting count, on each of the Destination Virtuoso Instances db2 and db3 from SPARQL Endpoint execute:
+ <para>You can just as easily supply your own application-specific implementation of TupleQueryResultHandler though.
+ </para>
+ <para>Lastly, an important warning: as soon as you are done with the RepositoryConnection
+object, you should close it. Notice that during processing of the TupleQueryResult object
+ (for example, when iterating over its contents), the RepositoryConnection should still be
+ open. We can invoke con.close() after we have finished with the result.
+ </para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamegettingstartevcnq"><title>Evaluating a CONSTRUCT query</title>
+ <para>The following code evaluates a graph query on a repository:
+ </para>
<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
+import org.openrdf.query.GraphQueryResult;
+
+GraphQueryResult graphResult = con.prepareGraphQuery(
+
+ QueryLanguage.SPARQL, "CONSTRUCT * FROM {x} p {y}").evaluate();
]]></programlisting>
- </listitem>
- <listitem>Should return <emphasis>57</emphasis> as total.
- <figure id="chain37" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m35.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplchainexadd"><title>Add new data on db1</title>
-<orderedlist>
- <listitem>Disconnect db2 and db3.</listitem>
- <listitem>On the Host Virtuoso Instance db1 go to Conductor - > Database - > Interactive SQL enter the following statement:
+ <para> A GraphQueryResult is similar to TupleQueryResult in that is an object that
+ iterates over the query results. However, for graph queries the query results are RDF
+ statements, so a GraphQueryResult iterates over Statement objects:
+ </para>
<programlisting><![CDATA[
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/Web_Services>
- } ;
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/Web_Clients>
- } ;
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/SPARQL>
- } ;
+while (graphResult.hasNext()) {
+
+ Statement st = graphResult.next();
+
+ // ? do something with the resulting statement here.
+
+
+}
]]></programlisting>
- <figure id="chain38" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m36.png"/>
- </figure>
- </listitem>
- <listitem>Click "Execute"</listitem>
- <listitem>As result the triples will be inserted
- <figure id="chain39" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m36a.png"/>
- </figure>
- </listitem>
- <listitem>Check the count of the destination instance graph's triples by executing the following query like against the SPARQL endpoint,
-http://localhost:8891/sparql:
+ <para>The TupleQueryResultHandler equivalent for graph queries is org.openrdf.rio.RDFHandler.
+ Again, this is a generic interface, each object implementing it can process the reported RDF
+ statements in any way it wants.
+ </para>
+ <para>All writers from Rio (such as the RDFXMLWriter, TurtleWriter, TriXWriter, etc.) implement
+ the RDFHandler interface. This allows them to be used in combination with querying quite easily.
+ In the following example, we use a TurtleWriter to write the result of a SPARQL graph query to
+ standard output in Turtle format:
+ </para>
<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
-]]></programlisting>
- </listitem>
- <listitem>Should return <emphasis>60</emphasis> as total.
- <figure id="chain40" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m38.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplchainexchki"><title>Check data on the Destination instances db2 and db3</title>
- <orderedlist>
- <listitem>Start instances db2 and db3</listitem>
- <listitem>To confirm that the triple count has increased by the number of inserted triples, execute the following on the Destination Virtuoso Instance db2 and db3 SPARQL Endpoint:
-<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
+import org.openrdf.rio.turtle.TurtleWriter;
+
+?
+
+RepositoryConnection con = myRepository.getConnection();
+
+try {
+
+ TurtleWriter turtleWriter = new TurtleWriter(System.out);
+
+ con.prepareGraphQuery(QueryLanguage.SPARQL, "CONSTRUCT * FROM WHERE {x} p {y}").evaluate(turtleWriter);
+
+ }
+
+finally {
+
+ con.close();
+
+}
]]></programlisting>
- </listitem>
- <listitem>Should return <emphasis>60</emphasis> as total.
- <figure id="chain41" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/m38.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
+ <para>Again, note that as soon as we are done with the result of the query (either after iterating over the contents of the GraphQueryResult? or after invoking the RDFHandler), we invoke con.close() to close the connection and free resources.
+ </para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamegettingstartevcnqapi"><title>Javadoc API Documentation</title>
+ <para><ulink url="http://docs.openlinksw.com/sesame/">Sesame Provider Javadoc API Documentation</ulink> is available enabling the complete set of classes, interfaces and methods implemented for the provider to be viewed.</para>
</sect4>
</sect3>
- <sect3 id="rdfgraphreplicationtoplbid"><title>Bi-directional Replication Topology</title>
- <sect4 id="rdfgraphreplicationtoplbidex"><title>Bi-directional Replication Topology Example</title>
- <para>The following How-To walks you through setting up Virtuoso RDF Graph Replication in a
- Bi-directional Topology.</para>
-<programlisting><![CDATA[
-db1 <---- db2
-db1 ----> db2
-]]></programlisting>
- <sect5 id="rdfgraphreplicationtoplbidexpr"><title>Prerequisites</title>
- <sect6 id="rdfgraphreplicationtoplbidexprini"><title>Database INI Parameters</title>
-<para>Suppose there are 2 Virtuoso instances respectively with the following ini parameters values:</para>
- <orderedlist>
- <listitem>virtuoso1.ini:
-<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso1.db
-TransactionFile = virtuoso1.trx
-ErrorLogFile = virtuoso1.log
-...
-[Parameters]
-ServerPort = 1111
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8891
-...
-[URIQA]
-DefaultHost = localhost:8891
-...
-[Replication]
-ServerName = db1
-...
-
-]]></programlisting>
- </listitem>
- <listitem>virtuoso2.ini:
-<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso2.db
-TransactionFile = virtuoso2.trx
-ErrorLogFile = virtuoso2.log
-...
-[Parameters]
-ServerPort = 1112
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8892
-...
-[URIQA]
-DefaultHost = localhost:8892
-...
-[Replication]
-ServerName = db2
-...
-]]></programlisting>
- </listitem>
- </orderedlist>
- </sect6>
- <sect6 id="rdfgraphreplicationtoplbidexprdsn"><title>Database DSNs</title>
- <para>Use the ODBC Administrator on your Virtuoso host (e.g., on Windows, Start menu -> Control Panel -> Administrative Tools -> Data Sources (ODBC); on Mac OS X, /Applications/Utilities/OpenLink ODBC Administrator.app) to create a System DSN for db1 and db2 with names db1 and db2 respectively.</para>
- </sect6>
- <sect6 id="rdfgraphreplicationtoplbidexprcnd"><title>Install Conductor package</title>
- <para>On each of the 2 Virtuoso instances install the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.1/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink> package.</para>
- </sect6>
+ <sect3 id="rdfnativestorageproviderssesamestpandtesting"><title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <sect4 id="rdfnativestorageproviderssesamestpandtestingwhat"><title>What</title>
+<para>Sesame is an open source Java framework for storing, querying and reasoning with RDF and RDF Schema. It can be used as a
+database for RDF and RDF Schema, or as a Java library for applications that need to work with RDF internally. The Sesame HTTP
+repository serves as a proxy for a RDF store hosted on a remote Sesame server, enabling the querying of the RDF store using
+the Sesame HTTP protocol.
+</para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamestpandtestingwhy"><title>Why</title>
+<para>The Sesame HTTP repository endpoint provides users with the greater flexibility for manipulating the RDF store via a common
+interface. Sesame provides you with the necessary tools to parse, interpret, query and store all this information, embedded
+in your own application if you want, or, if you prefer, in a separate database or even on a remote server.
+</para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamestpandtestinghow"><title>How</title>
+<para>To create a new Sesame HTTP repository, the Console needs to create such an RDF document and submit it to the SYSTEM
+repository. The Console uses so called repository configuration templates to accomplish this. Repository configuration templates
+are simple Turtle RDF files that describe a repository configuration, where some of the parameters are replaced with variables.
+The Console parses these templates and asks the user to supply values for the variables. The variables are then substituted with
+the specified values, which produces the required configuration data.
+</para>
+ </sect4>
+ <sect4 id="rdfnativestorageproviderssesamestpandtestingmain"><title>Setup and Testing</title>
+<para>This section details the steps required for configuring and testing a Virtuoso Sesame
+Repository, both using the HTTP and Console Sesame repositories.</para>
+ <sect5 id="rdfnativestorageproviderssesamestpandtestingreq"><title>Requirements</title>
+<itemizedlist mark="bullet">
+ <listitem><ulink url="http://www.openrdf.org/download.jsp">Sesame 2.3.1</ulink> or higher</listitem>
+ <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2HttpRepository/virt_sesame2.jar">Virtuoso Sesame 2 Provider </ulink> (virt_sesame2.jar)</listitem>
+ <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2HttpRepository/virtjdbc3.jar">Virtuoso JDBC Driver</ulink> (virtjdbc3.jar)</listitem>
+ <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2HttpRepository/create.xsl">Sesame System Repository config file</ulink> (create.xsl)</listitem>
+ <listitem><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtSesame2HttpRepository/create-virtuoso.xsl">Sesame Virtuoso Repository config file </ulink> (create-virtuoso.xsl)</listitem>
+ <listitem><ulink url="http://tomcat.apache.org/download-60.cgi">Apache Tomcat</ulink> version 5 or 6</listitem>
+</itemizedlist>
</sect5>
-
- <sect5 id="rdfgraphreplicationtoplbidexprcph"><title>Create Publication on db2</title>
+ <sect5 id="rdfnativestorageproviderssesamestpandtestinghttprep"><title>Setup Sesame HTTP Repository</title>
+<para>This section details the steps required for configuring and testing a Virtuoso HTTP Sesame Repository.</para>
<orderedlist>
- <listitem>Go to http://localhost:8892/conductor and log in as dba</listitem>
- <listitem>Go to Conductor -> Replication -> Transactional -> Publications
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd1.png"/>
- </figure>
- </listitem>
- <listitem>Click <emphasis>Enable RDF Publishing</emphasis></listitem>
- <listitem>As result publication with the name <emphasis>RDF Publication</emphasis> should be created
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd2.png"/>
- </figure>
- </listitem>
- <listitem>Click the link which is the publication name.</listitem>
- <listitem>You will be shown the publication items page
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd3.png"/>
- </figure>
- </listitem>
- <listitem>Enter for Graph IRI:
+ <listitem>Install <ulink url="http://tomcat.apache.org/tomcat-6.0-doc/index.html">Apache Tomcat</ulink> web server</listitem>
+ <listitem>From the Sesame 2.3.1 or higher "lib" directory copy the "openrdf-sesame.war" and "openrdf-worbbench.war" files to the
+tomcat "webapps" directory where they will automatically be deployed creating two new sub directories "openrdf-sesame" and
+"openrdf-workbench".</listitem>
+ <listitem>Place the Virtuoso Sesame Provider "virt_sesame2.jar" and JDBC Driver "virtjdbc3.jar" into the Tomcat
+<code>~/webapps/openrdf-sesame/WEB-INF/lib/</code> and <code>~/webapps/openrdf-workbench/WEB-INF/lib/</code> directories for
+use by the Sesame HTTP Repository for accessing the Virtuoso RDF repository.</listitem>
+ <listitem>Place the "create.xsl" and "create-virtuoso.xsl" files in the Tomcat
+<code>~/webapps/openrdf-workbench/transformations/</code> directory. Note "create.xsl" replaces the default provided with Sesame and contains the necessary entries required to reference the new "create-virtuoso.xsl" template file for Virtuoso repository configuration.</listitem>
+ <listitem>The Sesame HTTP Repository will now be accessible on the URLs
<programlisting><![CDATA[
-http://example.org
+http://localhost:8080/openrdf-sesame
+http://localhost:8080/openrdf-workbench
]]></programlisting>
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd4.png"/>
- </figure>
</listitem>
- <listitem>Click Add New
- </listitem>
- <listitem>The item will be created and shown in the list of items for the currently viewed publication.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd5.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprcs"><title>Create subscription from db1 to db2's Publication</title>
-<orderedlist>
- <listitem>Log in at http://localhost:8891/conductor
- </listitem>
- <listitem>Go to Replication -> Transactional -> Subscriptions
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd6.png"/>
- </figure>
- </listitem>
- <listitem>Click <emphasis>New Subscription</emphasis>
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd7.png"/>
- </figure>
- </listitem>
- <listitem>From the list of "Specify new data source" select Data Source db2
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd8.png"/>
- </figure>
- </listitem>
- <listitem>Enter for db2 dba user credentials
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd9.png"/>
- </figure>
- </listitem>
- <listitem>Click "Add Data Source"
- </listitem>
- <listitem>As result <emphasis>db2</emphasis> will be shown in the "Connected Data Sources" list.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd10.png"/>
- </figure>
- </listitem>
- <listitem>Select <emphasis>db2</emphasis> the "Connected Data Sources" list and click "Publications list"
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd11.png"/>
- </figure>
- </listitem>
- <listitem>As result will be shown the list of available publications for the selected data source. Select the one with name "RDF Publication" and click "List Items".
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd12.png"/>
- </figure>
- </listitem>
- <listitem>As result will be shown the "Confirm subscription" page.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd13.png"/>
- </figure>
- </listitem>
- <listitem>The sync interval by default is 10 minutes. For the testing purposes, we will change it to 1 minute.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd14.png"/>
- </figure>
- </listitem>
- <listitem>Click "Subscribe"
- </listitem>
- <listitem>The subscription will be created.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd15.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprcpd"><title>Create Publication on db1</title>
-<orderedlist>
- <listitem>Go to http://localhost:8891/conductor and log in as dba
- </listitem>
- <listitem>Go to Conductor -> Replication -> Transactional -> Publications
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd16.png"/>
- </figure>
- </listitem>
- <listitem>Click <emphasis>Enable RDF Publishing</emphasis>
- </listitem>
- <listitem>As result publication with the name <emphasis>RDF Publication</emphasis> should be created
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd17.png"/>
- </figure>
- </listitem>
- <listitem>Click the link which is the publication name.
- </listitem>
- <listitem>You will be shown the publication items page
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd18.png"/>
- </figure>
- </listitem>
- <listitem>Enter for Graph IRI:
-<programlisting><![CDATA[
-http://example.org
-]]></programlisting>
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd19.png"/>
- </figure>
- </listitem>
- <listitem>Click Add New
- </listitem>
- <listitem>The item will be created and shown in the list of items for the currently viewed publication.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd20.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprcsh"><title>Create subscription from db2 to db1's Publication</title>
-<orderedlist>
- <listitem>Log in at http://localhost:8892/conductor
- </listitem>
- <listitem>Go to Replication -> Transactional -> Subscriptions
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd21.png"/>
- </figure>
- </listitem>
- <listitem>Click <emphasis>New Subscription</emphasis>
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd22.png"/>
- </figure>
- </listitem>
- <listitem>From the list of "Specify new data source" select Data Source db1
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd23.png"/>
- </figure>
- </listitem>
- <listitem>Enter for db1 dba user credentials
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd24.png"/>
+ <listitem>The Sesame OpenRDF Workbench is used for accessing the Sesame HTTP Repositories, loading
+"<ulink url="http://localhost:8080/openrdf-workbench">http://localhost:8080/openrdf-workbench</ulink>" will enable the
+default "SYSTEM" repository to be accessed.
+ <figure id="ss1" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss1.png"/>
</figure>
</listitem>
- <listitem>Click "Add Data Source"
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd25.png"/>
+ <listitem>Click on the "New Repository" link in the left frame to create a new Sesame Repository.
+ <figure id="ss2" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss2.png"/>
</figure>
</listitem>
- <listitem>As result <emphasis>db1</emphasis> will be shown in the "Connected Data Sources" list. Select it and click "Publications list"
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd26.png"/>
+ <listitem>Select the "Virtuoso RDF Store" from the "Type" drop down list box presented.
+ <figure id="ss3" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss3.png"/>
</figure>
</listitem>
- <listitem>As result will be shown the list of available publications for the selected data source. Select the one with name "RDF Publication" and click "List Items".
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd27.png"/>
+ <listitem>Choose suitable repository "ID" and "Title" for the Virtuoso repository to be created and click "Next".
+ <figure id="ss4" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss4.png"/>
</figure>
</listitem>
- <listitem>As result will be shown the "Confirm subscription" page.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd28.png"/>
+ <listitem>Fill in the connection parameters for the target Virtuoso sever the repository is to be created for and
+click the "create" button. The minimum required are the hostname, port number, username and password of the Virtuoso Server.
+ <figure id="ss5" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss5.png"/>
</figure>
</listitem>
- <listitem>The sync interval by default is 10 minutes. For the testing purposes, we will change it to 1 minute.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd29.png"/>
+ <listitem>The new Virtuoso respository will be created and its summary page displayed.
+ <figure id="ss6" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss6.png"/>
</figure>
</listitem>
- <listitem>Click "Subscribe"
- </listitem>
- <listitem>The subscription will be created.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd30.png"/>
+ <listitem>Click on the "Namespaces" link in the left frame to obtain a list of the available namespaces in the Virtuoso repository.
+ <figure id="ss7" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss7.png"/>
</figure>
</listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprinsh"><title>Insert Data into a Named Graph on the db2 Virtuoso Instance</title>
-<orderedlist>
- <listitem>Log in at http://localhost:8892/conductor
- </listitem>
- <listitem>Go to Linked Data -> Quad Store Upload:
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/uc1.png"/>
+ <listitem>Click on the "Context" link in the left frame to obtain a list of the available contexts in the Virtuoso repository.
+ <figure id="ss8" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss8.png"/>
</figure>
</listitem>
- <listitem>In the shown form:
- </listitem>
- <listitem>Tick the box for <emphasis>Resource URL</emphasis> and enter your resource URL, e.g.:
-<programlisting><![CDATA[
-http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this
-]]></programlisting>
- </listitem>
- <listitem>Enter for Named Graph IRI:
-<programlisting><![CDATA[
-http://example.org
-]]></programlisting>
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd32.png"/>
+ <listitem>Click on the "Types" link in the left frame to obtain a list of the available types in the Virtuoso repository.
+ <figure id="ss9" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss9.png"/>
</figure>
</listitem>
- <listitem>Click Upload
- </listitem>
- <listitem>A successful upload will result in a shown message.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/m33.png"/>
+ <listitem>Click on the "Query" link in the left frame, enter a suitable SPARQL query to execute against the Virtuoso repository
+and click the "execute" button.
+ <figure id="ss10" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss10.png"/>
</figure>
</listitem>
- <listitem>Check the count of the inserted triples by executing a query like the following against the SPARQL endpoint,
-http://localhost:8892/sparql:
-<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
-]]></programlisting>
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd34.png"/>
+ <listitem>The results of the SPARQL query are returned.
+ <figure id="ss11" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss11.png"/>
</figure>
</listitem>
- <listitem>Should return <emphasis>57</emphasis> as total.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd35.png"/>
+ <listitem>Click on the "Repositories" link in the left frame and the newly created Virtuoso repository entry is displayed along side
+the default SYSTEM repository.
+ <figure id="ss12" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss12.png"/>
</figure>
</listitem>
</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprcdin"><title>Check data on the Destination instance db1</title>
-<orderedlist>
- <listitem>To check the starting count, execute from db1's SPARQL Endpoint:
-<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
-]]></programlisting>
- </listitem>
- <listitem>Should return <emphasis>57</emphasis> as total.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd35.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprinsd"><title>Add new data on db2</title>
+ </sect5>
+ <sect5 id="rdfnativestorageproviderssesamestpandtestingcons"><title>Setup Sesame Console Repository</title>
+<para>This section details the steps required for configuring and testing a Virtuoso Sesame Console Repository:</para>
<orderedlist>
- <listitem>Disconnect db1.
- </listitem>
- <listitem>On the Host Virtuoso Instance db2 go to Conductor -> Database -> Interactive SQL enter the following statement:
-<programlisting><![CDATA[
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/Web_Services>
- } ;
-]]></programlisting>
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd36.png"/>
- </figure>
- </listitem>
- <listitem>Click "Execute"
- </listitem>
- <listitem>As result the triples will be inserted
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd37.png"/>
- </figure>
- </listitem>
- <listitem>Check the count of the destination instance graph's triples by executing the following query like against the SPARQL endpoint,
-http://localhost:8892/sparql:
+ <listitem>Extract Sesame 2.3.1 or higher archive to a location of choice and place the virt_sesame2.jar and virtjdbc3.jar
+files to the sesame 2.3.1 "lib" directory</listitem>
+ <listitem>Start the <ulink url="http://www.openrdf.org/doc/sesame2/users/ch07.html#section-console-repository-creation">sesame console application</ulink> by running the "console.bat" script in the sesame "bin" directory and then "exit." the program
<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
+$ sh console.sh
+SLF4J: Class path contains multiple SLF4J bindings.
+SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/logback-classic-0.9.18.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/slf4j-jdk14-1.5.10.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
+10:32:38.317 [main] DEBUG info.aduna.platform.PlatformFactory - os.name <http://os.name> <http://os.name> = mac os x
+10:32:38.351 [main] DEBUG info.aduna.platform.PlatformFactory - Detected Mac OS X platform
+Connected to default data directory
+Commands end with '.' at the end of a line
+Type 'help.' for help
+exit.
]]></programlisting>
- </listitem>
- <listitem>Should return <emphasis>58</emphasis> as total.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd38.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprcddi"><title>Check data on the Destination instance db1</title>
-<orderedlist>
- <listitem>Start instance db1
- </listitem>
- <listitem>To confirm that the triple count has increased by the number of inserted triples, execute the following statement on db1's SPARQL Endpoint:
+</listitem>
+ <listitem>This will create the necessary sesame application data directories as detailed in the sesame
+<ulink url="http://www.openrdf.org/doc/sesame2/2.3.1/users/userguide.html#chapter-datadir-config">data directory configuration</ulink> documentation.
<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
+Windows - C:\Documents and Settings\LocalService\Application Data\Aduna\
+Mac OS X - /Users/myuser/Library/Application Support/Aduna/
+Linux - $HOME/.aduna/
]]></programlisting>
- </listitem>
- <listitem>Should return <emphasis>58</emphasis> as total.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd38.png"/>
- </figure>
- </listitem>
-</orderedlist>
- </sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprinsah"><title>Add new data on db1</title>
-<orderedlist>
- <listitem>Disconnect db2.
</listitem>
- <listitem>On the Host Virtuoso Instance db1 go to Conductor -> Database -> Interactive SQL enter the following statement:
+ <listitem>If you do not want to use the default sesame data directory location the Sesame console application can be started by
+specifying a custom data directory location with the "-d" option. Note in this case the directory "OpenRDF Sesame console" always
+has to be manually appended to the directory as Sesame assumes the data file will reside in a sub directory of this name.
<programlisting><![CDATA[
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/Web_Clients>
- } ;
-SPARQL INSERT INTO GRAPH <http://example.org>
- {
- <http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com#this>
- <http://xmlns.com/foaf/0.1/interest>
- <http://dbpedia.org/resource/SPARQL>
- } ;
+$ sh console.sh -d /Users/myuser/OpenRDF Sesame console
]]></programlisting>
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd39.png"/>
- </figure>
-</listitem>
- <listitem>Click "Execute"
</listitem>
- <listitem>As result the triples will be inserted
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd40.png"/>
- </figure>
- </listitem>
- <listitem>Check the count of the destination instance graph's triples by executing the following query like against the SPARQL endpoint,
-http://localhost:8891/sparql:
+ <listitem>Start the sesame console application with the required data directory location and create a Virtuoso repository as
+detailed in the steps below, the key parameters to be specified being the target Virtuoso server hostname, port number,
+username, password and a unique "Repository ID".
<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
+$ sh console.sh
+SLF4J: Class path contains multiple SLF4J bindings.
+SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/logback-classic-0.9.18.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/slf4j-jdk14-1.5.10.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
+10:32:38.317 [main] DEBUG info.aduna.platform.PlatformFactory - os.name <http://os.name> <http://os.name> = mac os x
+10:32:38.351 [main] DEBUG info.aduna.platform.PlatformFactory - Detected Mac OS X platform
+Connected to default data directory
+Commands end with '.' at the end of a line
+Type 'help.' for help
+create virtuoso .
+Please specify values for the following variables:
+Host list [localhost:1111]:
+Username [dba]:
+Password [dba]:
+Default graph name [sesame:nil]:
+Enable using batch optimization (false|true) [false]:
+Use RoundRobin for connection (false|true) [false]:
+Buffer fetch size [200]:
+Inference RuleSet name [null]:
+Repository ID [virtuoso]: myvirt
+Repository title [Virtuoso repository]:
+Repository created
+show r .
++----------
+|SYSTEM
+|myvirt ("Virtuoso repository")
++----------
+open myvirt .
+Opened repository 'myvirt'
+myvirt> show n .
++----------
+|bif bif:
+|dawgt http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#
+|dbpedia http://dbpedia.org/resource/
+|dbpprop http://dbpedia.org/property/
+|dc http://purl.org/dc/elements/1.1/
+|foaf http://xmlns.com/foaf/0.1/
+|geo http://www.w3.org/2003/01/geo/wgs84_pos#
+|go http://purl.org/obo/owl/GO#
+|math http://www.w3.org/2000/10/swap/math#
+|mesh http://purl.org/commons/record/mesh/
+|mf http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#
+|nci http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl#
+|obo http://www.geneontology.org/formats/oboInOwl#
+|owl http://www.w3.org/2002/07/owl#
+|protseq http://purl.org/science/protein/bysequence/
+|rdf http://www.w3.org/1999/02/22-rdf-syntax-ns#
+|rdfdf http://www.openlinksw.com/virtrdf-data-formats#
+|rdfs http://www.w3.org/2000/01/rdf-schema#
+|sc http://purl.org/science/owl/sciencecommons/
+|scovo http://purl.org/NET/scovo#
+|skos http://www.w3.org/2004/02/skos/core#
+|sql sql:
+|vcard http://www.w3.org/2001/vcard-rdf/3.0#
+|virtrdf http://www.openlinksw.com/schemas/virtrdf#
+|void http://rdfs.org/ns/void#
+|xf http://www.w3.org/2004/07/xpath-functions
+|xml http://www.w3.org/XML/1998/namespace
+|xsd http://www.w3.org/2001/XMLSchema#
+|xsl10 http://www.w3.org/XSL/Transform/1.0
+|xsl1999 http://www.w3.org/1999/XSL/Transform
+|xslwd http://www.w3.org/TR/WD-xsl
+|yago http://dbpedia.org/class/yago/
++----------
+exit.
]]></programlisting>
</listitem>
- <listitem>Should return <emphasis>60</emphasis> as total.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd41.png"/>
- </figure>
- </listitem>
</orderedlist>
</sect5>
- <sect5 id="rdfgraphreplicationtoplbidexprcdadi"><title>Check data on the Destination instance db2</title>
+ <sect5 id="rdfnativestorageproviderssesamestpandtestinghttpcons"><title>Connection to Sesame HTTP repository from Console repository</title>
+<para>The Sesame Console repository can connect to a Sesame HTTP repository and vice-versa, enabling access to remote Sesame
+HTTP repositories from a local server.</para>
<orderedlist>
- <listitem>Start instance db2
+ <listitem>The Sesame Console repository can connect to a Sesame HTTP repository and query it as if local using the "connect" command.
+<programlisting><![CDATA[
+$ sh console.sh
+SLF4J: Class path contains multiple SLF4J bindings.
+SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/logback-classic-0.9.18.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: Found binding in [jar:file:/Users/myuser/openrdf-sesame-2.3.1/lib/slf4j-jdk14-1.5.10.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
+10:32:38.317 [main] DEBUG info.aduna.platform.PlatformFactory - os.name <http://os.name> <http://os.name> = mac os x
+10:32:38.351 [main] DEBUG info.aduna.platform.PlatformFactory - Detected Mac OS X platform
+Connected to default data directory
+Commands end with '.' at the end of a line
+Type 'help.' for help
+> connect http://localhost:8080/openrdf-sesame.
+Connected to http://localhost:8080/openrdf-sesame
+> show r.
++----------
+|SYSTEM ("System configuration repository")
+|VirtSesRep ("Virtuoso Sesame HTTP Repository")
++----------
+> open VirtSesRep.
+Opened repository 'VirtSesRep'
+VirtSesRep> sparql select * from <http://localhost:8890/Northwind> where {?s ?p ?o} Limit 10.
+Evaluating query...
++------------------------+------------------------+------------------------+
+| s | p | o |
++------------------------+------------------------+------------------------+
+| <http://localhost:8890/Northwind/CustomerContact/ALFKI#this>| rdf:type | foaf:Person |
+| <http://localhost:8890/Northwind/CustomerContact/ALFKI#this>| rdf:type | northwind:CustomerContact|
+| <http://localhost:8890/Northwind/CustomerContact/ALFKI#this>| opl:isDescribedUsing | northwind: |
+| <http://localhost:8890/Northwind/CustomerContact/ANATR#this>| rdf:type | foaf:Person |
+| <http://localhost:8890/Northwind/CustomerContact/ANATR#this>| rdf:type | northwind:CustomerContact|
+| <http://localhost:8890/Northwind/CustomerContact/ANATR#this>| opl:isDescribedUsing | northwind: |
+| <http://localhost:8890/Northwind/CustomerContact/ANTON#this>| rdf:type | foaf:Person |
+| <http://localhost:8890/Northwind/CustomerContact/ANTON#this>| rdf:type | northwind:CustomerContact|
+| <http://localhost:8890/Northwind/CustomerContact/ANTON#this>| opl:isDescribedUsing | northwind: |
+| <http://localhost:8890/Northwind/CustomerContact/AROUT#this>| rdf:type | foaf:Person |
++------------------------+------------------------+------------------------+
+10 result(s) (530 ms)
+VirtSesRep> show n.
++----------
+|SearchResults http://www.zillow.com/static/xsd/SearchResults.xsd
+|UpdatedPropertyDetails http://www.zillow.com/static/xsd/UpdatedPropertyDetails.xsd
+|a http://www.w3.org/2005/Atom
+|aapi http://rdf.alchemyapi.com/rdf/v1/s/aapi-schema#
+|address http://schemas.talis.com/2005/address/schema#
+|admin http://webns.net/mvcb/
+|amz http://webservices.amazon.com/AWSECommerceService/2005-10-05
+|atom http://atomowl.org/ontologies/atomrdf#
+|audio http://purl.org/media/audio#
+|awol http://bblfish.net/work/atom-owl/2006-06-06/#
+|aws http://soap.amazon.com/
+|b3s http://b3s.openlinksw.com/
+]]></programlisting>
</listitem>
- <listitem>To confirm that the triple count has increased by the number of inserted triples, execute the following statement on db2's SPARQL Endpoint:
+ <listitem>Conversely the Sesame HTTP repository can be configured to access the repository created by the Sesame console.
+To do this the location of the data directory for both needs to be reconfigured using the Java system property
+info.aduna.platform.appdata.basedir (does not include "OpenRDF Sesame console directory) to point to the same location.
+When you are using Tomcat as the servlet container then you can set this property using the JAVA_OPTS parameter.
+Note, if you are using Apache Tomcat as a Windows Service you should use the Windows Services configuration tool to
+set this property. Other users can either edit the Tomcat startup script or set the property some other way.
<programlisting><![CDATA[
-SELECT COUNT(*)
- FROM <http://example.org>
-WHERE { ?s ?p ?o }
+ * set JAVA_OPTS=-Dinfo.aduna.platform.appdata.basedir=\path\to\other\dir\ (on Windows)
+ * export JAVA_OPTS='-Dinfo.aduna.platform.appdata.basedir=/path/to/other/dir/' (on Linux/UNIX/Mac OS X)
]]></programlisting>
- </listitem>
- <listitem>Should return <emphasis>60</emphasis> as total.
- <figure id="bid1" float="1">
- <title>Bi-directional Replication Topology</title>
- <graphic fileref="ui/bd41.png"/>
+ <figure id="ss13" float="1">
+ <title>Virtuoso Sesame HTTP Repository Configuration and Usage</title>
+ <graphic fileref="ui/ss13.png"/>
</figure>
+
</listitem>
</orderedlist>
</sect5>
- </sect4>
+ </sect4>
+ </sect3>
+ <sect3 id="rdfnativestorageproviderssesamejavadoc"><title>Javadoc API Documentation</title>
+ <para><ulink url="http://docs.openlinksw.com/sesame/">Sesame Provider Javadoc API Documentation</ulink>
+is available enabling the complete set of classes, interfaces and methods implemented for the provider to be viewed.
+ </para>
</sect3>
</sect2>
- <sect2 id="rdfgraphreplicationsql"><title>Set up RDF Replication via procedure calls</title>
- <sect3 id="rdfgraphreplicationsqlex"><title>Example</title>
- <para>The following example shows how to use SQL procedures to set up Virtuoso RDF Graph Replication in a Chain Topology.</para>
- <figure id="chain1" float="1">
- <title>Chain Replication Topology</title>
- <graphic fileref="ui/topo-chain.png"/>
- </figure>
- <para>This can also be done <link linkend="rdfgraphreplicationtoplchainex">through the HTTP-based Virtuoso Conductor</link>.</para>
- <sect4 id="rdfgraphreplicationsqlexprx"><title>Prerequisites</title>
- <sect5 id="rdfgraphreplicationsqlexprxini"><title>Database INI Parameters</title>
- <para>Suppose there are 3 Virtuoso instances on the same machine.</para>
- <para>The first instance holds the master copy of the data and publishes its changes to all other instances that subscribe to this master.</para>
- <para>The second instance subscribes to the publication of the master copy, but also publishes all of these changes to any instance that subscribes to it.</para>
- <para>The third instance only subscribes to the publication of the second instance.</para>
- <para>Each of these 3 servers need unique ports and ServerName, DefaultHost for this replication scheme to work properly. Although not needed, this example also sets separate names for the database and related files. This results in the following ini parameters values (only changes are shown, the rest can remain default):</para>
- <orderedlist>
- <listitem>repl1/virtuoso.ini:
+ <sect2 id="rdfnativestorageproviderredland"><title>Virtuoso Redland Provider</title>
+ <sect3 id="rdfnativestorageproviderredlandwhatis"><title>What is Redland</title>
+ <para><ulink url="http://librdf.org/">Redland</ulink> is a set of free software 'C' libraries that
+provide support for the Resource Description Framework (RDF), providing modular, object based libraries
+and APIs for manipulating the RDF graph, triples, URIs and Literals. Redland includes several high-level
+language APIs providing RDF manipulation and storage and requires the
+<ulink url="http://librdf.org/raptor/">Raptor</ulink> RDF parser and <ulink url="http://librdf.org/rasqal/">Rasqal</ulink>
+RDF syntax and query library
+for its use.
+ </para>
+ </sect3>
+ <sect3 id="rdfnativestorageproviderredlandwhatisv"><title>What is the Virtuoso Redland Provider</title>
+ <para>The Virtuoso Redland RDF Provider is an implementation of the Storage API, Model and Query
+interfaces of the Redland framework for RDF. This provider enables the execution of queries via the
+Redland Rasqal query engine or via Virtuoso query engine directly against the Virtuoso Quad store.
+The Virtuoso Redland Provider uses ODBC as the data access mechanism for communicating the Virtuoso
+Quad Store and requires the Virtuoso ODBC Driver be installed on the Redland client and a suitable
+ODBC DSN be configured for connecting to the target Virtuoso Quad Store instance. The provider has
+been tested against the <ulink url="http://download.librdf.org/source/">Redland 1.0.8</ulink> version currently available for download.
+ </para>
+ <figure id="rdfnativestorageproviderredland1" float="1">
+ <title>Redland Component Stack</title>
+ <graphic fileref="ui/VirtRedLand.png"/>
+ </figure>
+ <para>As indicated in the above diagram the Virtuoso Provider can be used to execute RDF queries either
+directly against the Virtuoso graph storage module supporting the <ulink url="http://dbpedia.org/resource/SPARQL">SPARQL</ulink>,
+<ulink url="http://dbpedia.org/resource/SPARUL">SPARQL</ulink>SPARUL, <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSArticleBISPARQL2">SPARQL-BI</ulink>
+query languages or via the Rasqal query engine built into Redland which supports the SPARQL query language.
+This is done by simply changing the syntax of the query using the "vsparql" rather then default "sparql"
+construct when executing a query as indicated in the sample queries below:
+ </para>
+<programlisting><![CDATA[
+rdfproc -r xml -t "user='dba',password='dba',dsn='Demo'" gr query sparql - "SELECT * WHERE { ?s ?p ?o }" ;; via Redland Rasqal engine
+
+rdfproc -r xml -t "user='dba',password='dba',dsn='Demo'" gr query vsparql - "SELECT * WHERE { ?s ?p ?o }" ;; direct to Virtuoso storage module
+]]></programlisting>
+ <para>The Virtuoso Provider uses the <ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSSQL2RDF">SPASQL</ulink> query language for querying the remote Virtuoso QUAD store.
+ </para>
+ </sect3>
+ <sect3 id="rdfnativestorageproviderredlandsetup"><title>Setup</title>
+ <sect4 id="rdfnativestorageproviderredlandreqfiles"><title>Required Files</title>
+ <para>The Virtuoso Redland Provider has been integrated into the Redland RDF Framework and submitted to
+the open source project to become part of the standard distribution available for
+<ulink url="http://librdf.org/INSTALL.html">download</ulink>. Until this
+submission has been accepted and committed into the available Redland release a tar ball created by
+OpenLink Software and a diff for application to a Redland 1.0.8 tree can be obtained from:
+ </para>
+ <itemizedlist mark="bullet">
+ <listitem><ulink url="ftp://download.openlinksw.com/support/vos/redland-vos-1.0.8.tar.gz"></ulink>Redland 1.0.8 tar ball with Virtuoso storage support</listitem>
+ <listitem><ulink url="ftp://download.openlinksw.com/support/vos/redland-vos.diff">Redland 1.0.8 Diff file of changes made for Virtuoso storage support</ulink></listitem>
+ </itemizedlist>
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersredlandcmsmpr"><title>Compiling Redland with Virtuoso storage support</title>
+ <itemizedlist mark="bullet">
+ <listitem><ulink url="http://svn.librdf.org/">Download Redland</ulink>, extract and apply diff
+above or download the tar ball above with diff already applied and extract to a location of choice.</listitem>
+ <listitem>The following additional configure options are available for enabling the Virtuoso
+storage support:
+<programlisting><![CDATA[
+ --with-virtuoso(=yes|no) Enable Virtuoso RDF store (default=auto)
+ --with-iodbc(=DIR) Select iODBC support
+ DIR is the iODBC base install directory
+ (default=/usr/local)
+ --with-unixodbc(=DIR) Select UnixODBC support
+ DIR is the UnixODBC base install directory
+ (default=/usr/local)
+ --with-datadirect(=DIR) Select DataDirect support
+ DIR is the DataDirect base install directory
+ (default=/usr/local)
+ --with-odbc-inc=DIR Specify custom ODBC include directory
+ (default=/usr/local/include)
+ --with-odbc-lib=DIR Specify custom ODBC lib directory
+ (default=/usr/local/lib)
+]]></programlisting>
+ </listitem>
+ <listitem>The "--with-virtuoso" option default to being auto enable if a valid ODBC Driver Manager
+(iODBC, UnixODBC? or DataDirect?) or include and lib directories for required ODBC header files and libraries
+are located with the suitable setting for one or more of the other ODBC related options above. Assuming
+iODBC is installed the following option can be used to enable Virtuoso storage support to be configured
+for compilation into your Redland build:
<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso1.db
-TransactionFile = virtuoso1.trx
-ErrorLogFile = virtuoso1.log
-...
-[Parameters]
-ServerPort = 1111
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8891
-...
-[URIQA]
-DefaultHost = localhost:8891
-...
-[Replication]
-ServerName = db1-r
-...
+./configure --with-iodbc=/usr/local/iODBC
]]></programlisting>
</listitem>
- <listitem>repl2/virtuoso.ini:
+ <listitem>Run "make" to compile the Redland libraries and "sudo make install" to install in
+the default "/usr/local" location</listitem>
+ <listitem>Test compilation with test utility utils/rdfproc:
<programlisting><![CDATA[
-...
-[Database]
-DatabaseFile = virtuoso2.db
-TransactionFile = virtuoso2.trx
-ErrorLogFile = virtuoso2.log
-...
-[Parameters]
-ServerPort = 1112
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8892
-...
-[URIQA]
-DefaultHost = localhost:8892
-...
-[Replication]
-ServerName = db2-r
-...
+
+rdfproc test parse http://planetrdf.com/guide/rss.rdf
+rdfproc test print
+rdfproc test serialize ntriples
]]></programlisting>
+ <para>This test will use the default 'hashes' storage.</para>
</listitem>
- <listitem>repl3/virtuoso.ini:
+ <listitem>Ensure you have the Virtuoso ODBC Driver installed and a valid ODBC DSN called
+"Local Virtuoso" configured for your target Virtuoso Server</listitem>
+ <listitem>Set the following environment variable:
<programlisting><![CDATA[
+export RDFPROC_STORAGE_TYPE=virtuoso ;; Enable Virtuoso Storage
+export ODBCINI=<path_to_odbcini_directory>/odbc.ini ;; Enable ODBC DSN to be located
+export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH ;; May be required to enable Redland libraries to be located
-...
-[Database]
-DatabaseFile = virtuoso3.db
-TransactionFile = virtuoso3.trx
-ErrorLogFile = virtuoso3.log
-...
-[Parameters]
-ServerPort = 1113
-SchedulerInterval = 1
-...
-[HTTPServer]
-ServerPort = 8893
-...
-[URIQA]
-DefaultHost = localhost:8893
-...
-[Replication]
-ServerName = db3-r
-...
]]></programlisting>
</listitem>
- </orderedlist>
- </sect5>
-
- <sect5 id="rdfgraphreplicationsqlexprxdsn"><title>Database DSNs</title>
- <para>Use the ODBC Administrator on your Virtuoso host (e.g., on Windows, Start menu -> Control Panel -> Administrative Tools -> Data Sources (ODBC); on Mac OS X, /Applications/Utilities/OpenLink ODBC Administrator.app) to create a System DSN for each of db1, db2, db3, with names db1, db2 and db3, respectively.</para>
- </sect5>
- </sect4>
-
- <sect4 id="rdfgraphreplicationsqlcrb"><title>Configure Publishers and Subscribers</title>
-<orderedlist>
- <listitem>Run the databases by starting start.sh, which has the following content:
+ <listitem>Test Virtuoso storage with the provided test program utils/vtest:
<programlisting><![CDATA[
-cd repl1
-virtuoso -f &
-cd ../repl2
-virtuoso -f &
-cd ../repl3
-virtuoso -f &
-cd ..
+$ utils/vtest
+ 1: Remove all triples in <http://red> context
+**PASSED**: removed context triples from the graph
+ 2: Add triples to <http://red> context
+**PASSED**: add triple to context
+ 3: Print all triples in <http://red> context
+[[
+ {[aa], [bb], [cc]} with context [http://red]
+ {[aa], [bb1], [cc]} with context [http://red]
+ {[aa], [a2], "cc"} with context [http://red]
+ {[aa], [a2], (cc)} with context [http://red]
+ {[mm], [nn], "Some long literal with language at en"} with context [http://red]
+ {[oo], [pp], "12345^^<http://www.w3.org/2001/XMLSchema#int>"} with context [http://red]
+]]
+**PASSED**:
+ 4: Count of triples in <http://red> context
+**PASSED**: graph has 6 triples
+ 5: Exec: ARC aa bb
+Matched node: [cc]
+**PASSED**:
+ 6: Exec: ARCS aa cc
+Matched node: [bb] with context [http://red]
+Matched node: [bb1] with context [http://red]
+: matching nodes: 2
+**PASSED**:
+ 7: Exec: ARCS-IN cc
+Matched arc: [bb] with context [http://red]
+Matched arc: [bb1] with context [http://red]
+**PASSED**: matching arcs: 2
+ 8: Exec: ARCS-OUT aa
+Matched arc: [bb] with context [http://red]
+Matched arc: [bb1] with context [http://red]
+Matched arc: [a2] with context [http://red]
+Matched arc: [a2] with context [http://red]
+**PASSED**: matching arcs: 4
+ 9: Exec: CONTAINS aa bb1 cc
+**PASSED**: the graph contains the triple
+ 10: Exec: FIND aa - -
+Matched triple: {[aa], [bb], [cc]} with context [http://red]
+Matched triple: {[aa], [bb1], [cc]} with context [http://red]
+Matched triple: {[aa], [a2], "cc"} with context [http://red]
+Matched triple: {[aa], [a2], (cc)} with context [http://red]
+**PASSED**: matching triples: 4
+ 11: Exec: HAS-ARC-IN cc bb
+**PASSED**: the graph contains the arc
+ 12: Exec: HAS-ARC-OUT aa bb
+**PASSED**: the graph contains the arc
+ 13: Exec: SOURCE aa cc
+Matched node: [aa]
+**PASSED**:
+ 14: Exec: SOURCES bb cc
+Matched node: [aa] with context [http://red]
+: matching nodes: 1
+**PASSED**:
+ 15: Exec: TARGET aa bb
+Matched node: [cc]
+**PASSED**:
+ 16: Exec: TARGETS aa bb
+Matched node: [cc] with context [http://red]
+: matching nodes: 1
+**PASSED**:
+ 17: Exec: REMOVE aa bb1 cc
+**PASSED**: removed triple from the graph
+ 18: Exec: QUERY "CONSTRUCT {?s ?p ?o} FROM <http://red> WHERE {?s ?p ?o}"
+Matched triple: {[aa], [a2], "cc"}
+Matched triple: {[oo], [pp], "12345^^<http://www.w3.org/2001/XMLSchema#int>"}
+Matched triple: {[aa], [a2], (cc)}
+Matched triple: {[aa], [bb], [cc]}
+Matched triple: {[mm], [nn], "Some long literal with language at en"}
+**PASSED**: matching triples: 5
+ 19: Exec1: QUERY_AS_BINDINGS "SELECT * WHERE {graph <http://red> { ?s ?p ?o }}"
+**: Formatting query result as 'xml':
+<?xml version="1.0" encoding="utf-8"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+ <head>
+ <variable name="s"/>
+ <variable name="p"/>
+ <variable name="o"/>
+ </head>
+ <results>
+ <result>
+ <binding name="s"><uri>aa</uri></binding>
+ <binding name="p"><uri>bb</uri></binding>
+ <binding name="o"><uri>cc</uri></binding>
+ </result>
+ <result>
+ <binding name="s"><uri>aa</uri></binding>
+ <binding name="p"><uri>a2</uri></binding>
+ <binding name="o"><literal>cc</literal></binding>
+ </result>
+ <result>
+ <binding name="s"><uri>aa</uri></binding>
+ <binding name="p"><uri>a2</uri></binding>
+ <binding name="o"><bnode>cc</bnode></binding>
+ </result>
+ <result>
+ <binding name="s"><uri>mm</uri></binding>
+ <binding name="p"><uri>nn</uri></binding>
+ <binding name="o"><literal>Some long literal with language at en</literal></binding>
+ </result>
+ <result>
+ <binding name="s"><uri>oo</uri></binding>
+ <binding name="p"><uri>pp</uri></binding>
+ <binding name="o"><literal>12345^^<http://www.w3.org/2001/XMLSchema#int></literal></binding>
+ </result>
+ </results>
+</sparql>
+**PASSED**:
+ 20: Exec2: QUERY_AS_BINDINGS "SELECT * WHERE {graph <http://red> { ?s ?p ?o }}"
+: Query returned bindings results:
+result: [s=[aa], p=[bb], o=[cc]]
+result: [s=[aa], p=[a2], o=cc]
+result: [s=[aa], p=[a2], o=(cc)]
+result: [s=[mm], p=[nn], o=Some long literal with language at en]
+result: [s=[oo], p=[pp], o=12345^^<http://www.w3.org/2001/XMLSchema#int>]
+: Query returned 5 results
+**PASSED**:
+=============================================
+PASSED: 20 FAILED: 0
]]></programlisting>
</listitem>
- <listitem>Use the <emphasis>isql</emphasis> command to execute the following rep.sql file:
+ </itemizedlist>
+ </sect4>
+ <sect4 id="rdfnativestorageprovidersredlandcp"><title>Connection Parameters</title>
+ <para>The Virtuoso provider has the following connection parameters available fro use:</para>
+ <itemizedlist mark="bullet">
+ <listitem><emphasis>dsn</emphasis> - ODBC datasource name</listitem>
+ <listitem><emphasis>user</emphasis> - user name of database server</listitem>
+ <listitem><emphasis>password</emphasis> - password of database server</listitem>
+ <listitem><emphasis>host</emphasis> - hostname:portno of the database server</listitem>
+ <listitem><emphasis>charset</emphasis> - database charset to use</listitem>
+ </itemizedlist>
+ <para>NOTE: Take care exposing the password as for example, program arguments or environment
+variables. The rdfproc utility can help this by reading the password from standard input. Inside programs,
+one way to prevent storing the password in a string is to construct a Redland hash of the storage options
+such as via librdf hash_from_string and use librdf_new_storage_with_options to create a storage. The
+rdfproc utility source code demonstrates this.
+ </para>
+ <para>The storage name parameter given to the storage constructor librdf new_storage is used
+inside the virtuoso store to allow multiple stores inside one Virtuoso database instance as parameterized
+with the above options.
+ </para>
+ <para>This store always provides contexts; the boolean storage option contexts is not checked.</para>
+ <para>Examples:</para>
<programlisting><![CDATA[
---
--- connect to the first database which is only a publisher
---
-set DSN=localhost:1111;
-reconnect;
-
---
--- start publishing the graph http://test.org
----
-DB.DBA.RDF_REPL_START();
-DB.DBA.RDF_REPL_GRAPH_INS ('http://test.org');
-
-
-
---
--- connect to the second database in the chain, which is both a publisher and a subscriber
---
-set DSN=localhost:1112;
-reconnect;
-
---
--- start publishing the graph http://test.org
---
-DB.DBA.RDF_REPL_START();
-DB.DBA.RDF_REPL_GRAPH_INS ('http://test.org');
-
---
--- contact the first database
---
-repl_server ('db1-r', 'db1', 'localhost:1111');
-
---
--- subscribe to its RDF publication(s)
---
-repl_subscribe ('db1-r', '__rdf_repl', 'dav', 'dav', 'dba', 'dba');
-
---
--- bring the replication service online
---
-repl_sync_all();
-
---
--- and set scheduler to check every minute
---
-DB.DBA.SUB_SCHEDULE ('db1-r', '__rdf_repl', 1);
-
-
-
---
--- connect to the third database in the chain, which is only a subscriber
---
-set DSN=localhost:1113;
-reconnect;
-
---
--- uncomment next 2 commands if this database should also be a publisher
---
---DB.DBA.RDF_REPL_START();
---DB.DBA.RDF_REPL_GRAPH_INS ('http://test.org');
-
---
--- contact second database
---
-repl_server ('db2-r', 'db2', 'localhost:1112');
+ /* A new Virtuoso store */
+ storage=librdf_new_storage(world, "virtuoso", "db1",
+ "dsn='Local Virtuoso',user='demo',password='demo'");
---
--- subscribe to its RDF publication(s)
---
-repl_subscribe ('db2-r', '__rdf_repl', 'dav', 'dav', 'dba', 'dba');
+ /* A different, existing Virtuoso store in the same database as above */
+ storage=librdf_new_storage(world, "virtuoso", "db2",
+ "dsn='Local Virtuoso',user='demo',password='demo'");
---
--- bring the replication service online
---
-repl_sync_all();
+ /* An existing Virtuoso store on a different database server */
+ storage=librdf_new_storage(world, "virtuoso", "http://red3",
+ "dsn='Remote Virtuoso',user='demo',password='demo'");
---
--- and set schedule to check every minute
---
-DB.DBA.SUB_SCHEDULE ('db2-r', '__rdf_repl', 1);
+ /* Opening with an options hash */
+ options=librdf_new_hash(world, NULL);
+ librdf_hash_from_string(options,
+ "dsn='Local Virtuoso',user='demo'");
+ librdf_hash_put_strings(options, "password", user_password);
+ storage=librdf_new_storage_with_options(world, "virtuoso", "http://red3", options);
]]></programlisting>
-</listitem>
-</orderedlist>
- </sect4>
+ </sect4>
+ </sect3>
+ <sect3 id="rdfnativestorageprovidersredlandref"><title>References</title>
+ <itemizedlist mark="bullet">
+ <listitem><ulink url="http://librdf.org/docs/api/redland-storage.html">RedLand Triple
+ Store</ulink></listitem>
+ <listitem><ulink url="http://librdf.org/docs/api/redland-storage-modules.html">RedLand
+ Storage Modules</ulink></listitem>
+ </itemizedlist>
</sect3>
</sect2>
</sect1>
+
</chapter>
diff --git a/docsrc/xmlsource/rdfviewssamples.xml b/docsrc/xmlsource/rdfviewssamples.xml
index 6d31d00..95153fe 100644
--- a/docsrc/xmlsource/rdfviewssamples.xml
+++ b/docsrc/xmlsource/rdfviewssamples.xml
@@ -1,8 +1,18 @@
<sect1 id="rdfviewsenterpr"><title>Examples of Linked Data Views</title>
-<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>
+<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>
<programlisting><![CDATA[
use DB;
@@ -46,7 +56,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 RDF View to map to a unique
+in use, it is still possible to clone the Linked Data View to map to a unique
graph as soon as the application become "public" and requires
merging data from many installations.</para></note>
@@ -458,7 +468,9 @@ where (^{orders.}^.ShipCountry = ^{countries.}^.Name)
}.
;
]]></programlisting>
-<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>
+<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>
</sect2>
<sect2 id="rdfviewsenterprbsm">
<title>BSBM to RDF</title>
@@ -2448,7 +2460,7 @@ WHERE
</sect2>
<sect2 id="rdfviewsbusintmbr">
<title>Musicbrainz to RDF</title>
-<para>The following code creates the Musicbrainz RDF Views Deployment and Demo Scripts:</para>
+<para>The following code creates the Musicbrainz Linked Data 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;
@@ -3352,7 +3364,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>RDF View for ODS (the consolidated Graph)</emphasis></para>
+<para><emphasis>Linked Data View for ODS (the consolidated Graph)</emphasis></para>
<programlisting><![CDATA[
SPARQL drop quad map virtrdf:ODS_DS . ;
@@ -4876,5041 +4888,10 @@ 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 RDF views of Sybase 15 PUBS2 Sample Database --
+-- Setup script for Linked Data Views of Sybase 15 PUBS2 Sample Database --
DB..vd_remote_data_source ('syb15ma-pubs2', '', '<uid>','<pwd>');
@@ -12070,7 +7051,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-2007 OpenLink Software
+ - 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
@@ -12536,7 +7517,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 RDF views of Oracle 10 Human Resources Sample Database --
+-- Setup script for Linked Data 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";
@@ -13026,7 +8007,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 RDF views of Oracle 10 Human Resources Sample Database --
+-- Setup script for Linked Data 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";
@@ -13511,8 +8492,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.2 2011/09/09 14:09:19 source Exp $
--- Setup script for RDF view of portions of DB2 SAMPLE database included
+-- $Id$
+-- Setup script for Linked Data Views of portions of DB2 SAMPLE database included
-- in DB2 Express Edition v9.5
--
-- The script assumes external DB2 tables are linked into Virtuoso using
@@ -15167,7 +10148,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 RDF views of Ingres R3 Tutorial Sample Database --
+-- Setup script for Linked Data 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 e8c1c9f..202e180 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/rendezvous.xml b/docsrc/xmlsource/rendezvous.xml
index 50bfe4d..7c44ebe 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/repl.xml b/docsrc/xmlsource/repl.xml
index 32dc0b9..df52e4d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/rowlevelsecurity.xml b/docsrc/xmlsource/rowlevelsecurity.xml
index 710f35d..602ac20 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/rth.aspx.xml b/docsrc/xmlsource/rth.aspx.xml
index 8162dcc..89b6d8d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/ruby.xml b/docsrc/xmlsource/ruby.xml
index 91b4518..6dd0cb2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/runtimehosting.xml b/docsrc/xmlsource/runtimehosting.xml
index 1db522a..ae04893 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/sampleapps.xml b/docsrc/xmlsource/sampleapps.xml
index ee5221c..66fa9e8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/secureodbc.xml b/docsrc/xmlsource/secureodbc.xml
index eb01119..9d8c8d6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/server.xml b/docsrc/xmlsource/server.xml
index c99bd27..d569b45 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-2006 OpenLink Software
+ - 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
@@ -1618,6 +1618,17 @@ 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 44b1f49..986ef1f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/sqlinverse.xml b/docsrc/xmlsource/sqlinverse.xml
index 1d5a07f..902a706 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/sqloptimizer.xml b/docsrc/xmlsource/sqloptimizer.xml
index 81026db..27a3273 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/sqlprocedures.xml b/docsrc/xmlsource/sqlprocedures.xml
index ddb6000..8406afc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/sqlreference.xml b/docsrc/xmlsource/sqlreference.xml
index d1152fd..c000d5d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/support.xml b/docsrc/xmlsource/support.xml
index 92462df..8878b3c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/syncml.xml b/docsrc/xmlsource/syncml.xml
index b2cc431..043d164 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/systemtables.xml b/docsrc/xmlsource/systemtables.xml
index 07c4683..925d992 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/tpcc.xml b/docsrc/xmlsource/tpcc.xml
index f862681..d3be74f 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.1 2010/01/25 22:55:37 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2010 OpenLink Software
+ 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
@@ -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-2010 OpenLink Software
+-- 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
@@ -784,7 +784,7 @@ CREATE TABLE STOCK (
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2010 OpenLink Software
+-- 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
diff --git a/docsrc/xmlsource/uddi.xml b/docsrc/xmlsource/uddi.xml
index d74ff80..610d39f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/udt.xml b/docsrc/xmlsource/udt.xml
index ee25d53..4e8ba87 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/uriqa.xml b/docsrc/xmlsource/uriqa.xml
index e616f4a..ae1fe89 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/usermodel.xml b/docsrc/xmlsource/usermodel.xml
index e4c28d0..2c29e2e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vad.xml b/docsrc/xmlsource/vad.xml
index f1b22d0..535c3a1 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-2006 OpenLink Software
+ - 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
@@ -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) 2003 OpenLink Software" />
+ <prop name="Copyright" value="(C) 2012 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 46716dc..a9d3794 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-2006 OpenLink Software
+ - 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
@@ -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) 2003 OpenLink Software" />
+ <prop name="Copyright" value="(C) 2012 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 8a26707..a6a1d7b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vfoafssl.xml b/docsrc/xmlsource/vfoafssl.xml
index 1bd220f..c628862 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-2006 OpenLink Software
+ - 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
@@ -190,8 +190,8 @@ public data!
<sect2 id="vfoafsslacl"><title>WebID Protocol ACLs</title>
<para>You can <link linkend="sparqloauthendpointfoafssl">set WebID Protocol ACLs</link> from the Virtuoso Authentication Server UI. </para>
</sect2>
- <sect2 id="sparqloauthendpointfoafsslsparql"><title>SPARQL-SSL based Endpoint</title>
- <para>See details how to <link linkend="sparqloauthendpointfoafssl">create and use a SPARQL-SSL based Endpoint</link>.</para>
+ <sect2 id="sparqloauthendpointfoafsslsparql"><title>SPARQL-WebID based Endpoint</title>
+ <para>See details how to <link linkend="sparqloauthendpointfoafssl">create and use a SPARQL-WebID based Endpoint</link>.</para>
</sect2>
<sect2 id="vfoafsslcacondt"><title>CA Keys Import using Conductor</title>
<para>The Virtuoso Conductor allows easy import of user-level CA (Certificate Authority) Keys through
diff --git a/docsrc/xmlsource/virtclientref.xml b/docsrc/xmlsource/virtclientref.xml
index 4f748b5..1f9fb2d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/virtdocs.xml b/docsrc/xmlsource/virtdocs.xml
index e45caa8..2f17822 100644
--- a/docsrc/xmlsource/virtdocs.xml
+++ b/docsrc/xmlsource/virtdocs.xml
@@ -276,6 +276,7 @@
<!ENTITY md5_init SYSTEM "funcref/md5_init.xml">
<!ENTITY md5_update SYSTEM "funcref/md5_update.xml">
<!ENTITY md5_final SYSTEM "funcref/md5_final.xml">
+<!ENTITY sha1_digest SYSTEM "funcref/sha1_digest.xml">
<!ENTITY mime_body SYSTEM "funcref/mime_body.xml">
<!ENTITY mime_part SYSTEM "funcref/mime_part.xml">
<!ENTITY mime_tree SYSTEM "funcref/mime_tree.xml">
@@ -318,6 +319,8 @@
<!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">
@@ -347,12 +350,18 @@
<!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-->
<!ENTITY iri_split SYSTEM "funcref/iri_split.xml">
<!ENTITY xml_get_ns_prefix SYSTEM "funcref/xml_get_ns_prefix.xml">
<!ENTITY xml_get_ns_uri SYSTEM "funcref/xml_get_ns_uri.xml">
+<!ENTITY xml_ns_uname SYSTEM "funcref/xml_ns_uname.xml">
+<!ENTITY xml_ns_iristr SYSTEM "funcref/xml_ns_iristr.xml">
+<!ENTITY xml_nsexpand_iristr SYSTEM "funcref/xml_nsexpand_iristr.xml">
+
+
<!ENTITY sparql_eval SYSTEM "funcref/sparql_eval.xml">
<!ENTITY sparql_eval_to_array SYSTEM "funcref/sparql_eval_to_array.xml">
@@ -588,6 +597,7 @@
<!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 6139a03..01111a0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/voauth.xml b/docsrc/xmlsource/voauth.xml
index 856948b..8f5c7c5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vsmx.xml b/docsrc/xmlsource/vsmx.xml
index 43fb4d1..764638a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vsp.xml b/docsrc/xmlsource/vsp.xml
index e08e158..b158597 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vsptraining.xml b/docsrc/xmlsource/vsptraining.xml
index f2c8705..d3b6d43 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx.xml b/docsrc/xmlsource/vspx.xml
index 3572527..0f6321b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_button.xml b/docsrc/xmlsource/vspx_ref/vc_button.xml
index ac9a59a..b4306bd 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -373,12 +373,12 @@ placed into the resulting HTML with no changes.
<?xml version="1.0"?>
<!--
-
- - $Id: button__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -429,12 +429,12 @@ The form accepts two numbers and calculates their sum.
<?xml version="1.0"?>
<!--
-
- - $Id: button__2.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_calendar.xml b/docsrc/xmlsource/vspx_ref/vc_calendar.xml
index 5a26264..c470759 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_check_box.xml b/docsrc/xmlsource/vspx_ref/vc_check_box.xml
index 3fa9d9b..815cd0d 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_code_file.xml b/docsrc/xmlsource/vspx_ref/vc_code_file.xml
index 4312f54..f01a3bb 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_data_grid.xml b/docsrc/xmlsource/vspx_ref/vc_data_grid.xml
index c659ab6..d70069d 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_data_list.xml b/docsrc/xmlsource/vspx_ref/vc_data_list.xml
index 339f612..de9772a 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -350,12 +350,12 @@ with a option values their customer IDs.
<?xml version="1.0"?>
<!--
-
- - $Id: data_list__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_data_set.xml b/docsrc/xmlsource/vspx_ref/vc_data_set.xml
index 2448209..6db340c 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -370,12 +370,12 @@ Allows editing, addtion and removal of existing records.
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_data_source.xml b/docsrc/xmlsource/vspx_ref/vc_data_source.xml
index 78bccdd..952753a 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_error_summary.xml b/docsrc/xmlsource/vspx_ref/vc_error_summary.xml
index 397ed01..8225463 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_form.xml b/docsrc/xmlsource/vspx_ref/vc_form.xml
index 21fcf60..7f31fd9 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_include.xml b/docsrc/xmlsource/vspx_ref/vc_include.xml
index 701bd6e..8d4704b 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_label.xml b/docsrc/xmlsource/vspx_ref/vc_label.xml
index 08678b6..ea559a9 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_login.xml b/docsrc/xmlsource/vspx_ref/vc_login.xml
index 46564c3..4a43d39 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_login_form.xml b/docsrc/xmlsource/vspx_ref/vc_login_form.xml
index 84fecd6..c005fbb 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_page.xml b/docsrc/xmlsource/vspx_ref/vc_page.xml
index ef4fa17..8dabb87 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_radio_button.xml b/docsrc/xmlsource/vspx_ref/vc_radio_button.xml
index 563b774..9db3bec 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_radio_group.xml b/docsrc/xmlsource/vspx_ref/vc_radio_group.xml
index 45edd27..30a08a2 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_select_list.xml b/docsrc/xmlsource/vspx_ref/vc_select_list.xml
index 7150068..f357b89 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_tab.xml b/docsrc/xmlsource/vspx_ref/vc_tab.xml
index 7ff177a..e8ddf62 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_text.xml b/docsrc/xmlsource/vspx_ref/vc_text.xml
index c89e24a..5d1c377 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_tree.xml b/docsrc/xmlsource/vspx_ref/vc_tree.xml
index 9836d47..ff84f05 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_url.xml b/docsrc/xmlsource/vspx_ref/vc_url.xml
index 7f9d8f2..abb5c09 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_validator.xml b/docsrc/xmlsource/vspx_ref/vc_validator.xml
index 4d71a28..50dccb5 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_variable.xml b/docsrc/xmlsource/vspx_ref/vc_variable.xml
index 7e57f35..7913d9f 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_vscx.xml b/docsrc/xmlsource/vspx_ref/vc_vscx.xml
index 2aa9d0d..08796a5 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -197,12 +197,12 @@ as a child of outer page.
<?xml version="1.0"?>
<!--
-
- - $Id: vscx__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_button.xml b/docsrc/xmlsource/vspx_ref/vspx_button.xml
index 656eb84..8964a8b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_check_box.xml b/docsrc/xmlsource/vspx_ref/vspx_check_box.xml
index d2600e5..31667a2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml b/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml
index dedac92..0ff605d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_list.xml b/docsrc/xmlsource/vspx_ref/vspx_data_list.xml
index c02b163..3041d46 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_set.xml b/docsrc/xmlsource/vspx_ref/vspx_data_set.xml
index 9cf7d1e..215f632 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml b/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml
index 3aecac1..5abdbce 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_field.xml b/docsrc/xmlsource/vspx_ref/vspx_field.xml
index 84a1a61..8131d26 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_form.xml b/docsrc/xmlsource/vspx_ref/vspx_form.xml
index 5d45572..3928ba2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_include.xml b/docsrc/xmlsource/vspx_ref/vspx_include.xml
index 91f8770..224ddbd 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_label.xml b/docsrc/xmlsource/vspx_ref/vspx_label.xml
index 1fcc43f..3dd9b78 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_login.xml b/docsrc/xmlsource/vspx_ref/vspx_login.xml
index 24421ce..0e70fe8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_login_form.xml b/docsrc/xmlsource/vspx_ref/vspx_login_form.xml
index 2608644..3a7b9e6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_page.xml b/docsrc/xmlsource/vspx_ref/vspx_page.xml
index 67c7a8c..9c7abbe 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml b/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml
index 10a305c..53e90df 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_select_list.xml b/docsrc/xmlsource/vspx_ref/vspx_select_list.xml
index da9e07c..2d356e6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_tab.xml b/docsrc/xmlsource/vspx_ref/vspx_tab.xml
index 091814e..a590bc5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_template.xml b/docsrc/xmlsource/vspx_ref/vspx_template.xml
index dc0941f..21389c7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_text.xml b/docsrc/xmlsource/vspx_ref/vspx_text.xml
index d822ae6..e3ce27b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_textarea.xml b/docsrc/xmlsource/vspx_ref/vspx_textarea.xml
index 4bf0f4c..128a883 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_tree.xml b/docsrc/xmlsource/vspx_ref/vspx_tree.xml
index bcbf0de..905034e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_update_field.xml b/docsrc/xmlsource/vspx_ref/vspx_update_field.xml
index 9a7ec41..b978fb7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_url.xml b/docsrc/xmlsource/vspx_ref/vspx_url.xml
index bae0897..1d746c5 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_validator.xml b/docsrc/xmlsource/vspx_ref/vspx_validator.xml
index 1225397..8f4a939 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_variable.xml b/docsrc/xmlsource/vspx_ref/vspx_variable.xml
index 7912b31..b47ec07 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/vspxdoc.xml b/docsrc/xmlsource/vspxdoc.xml
index bf665ad..ecc7805 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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -615,12 +615,12 @@ placed into the resulting HTML with no changes.
<?xml version="1.0"?>
<!--
-
- - $Id: button__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -671,12 +671,12 @@ The form accepts two numbers and calculates their sum.
<?xml version="1.0"?>
<!--
-
- - $Id: button__2.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -978,12 +978,12 @@ constructor method vspx_calendar (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: calendar__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1341,12 +1341,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: check_box__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -1867,12 +1867,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: data_grid__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -2318,12 +2318,12 @@ with a option values their customer IDs.
<?xml version="1.0"?>
<!--
-
- - $Id: data_list__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -2631,12 +2631,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -2737,12 +2737,12 @@ Allows editing, addtion and removal of existing records.
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -3742,12 +3742,12 @@ create type vspx_form under vspx_control
<?xml version="1.0"?>
<!--
-
- - $Id: form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -4789,12 +4789,12 @@ overriding method vc_render () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: label__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -5369,12 +5369,12 @@ constructor method vspx_login (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: login__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -5611,12 +5611,12 @@ overriding method vc_render () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: login_form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -6148,12 +6148,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: page__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -6563,12 +6563,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: radio_button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -6782,12 +6782,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: radio_group__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -7429,12 +7429,12 @@ as
<?xml version="1.0"?>
<!--
-
- - $Id: tab__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -8095,12 +8095,12 @@ as
<?xml version="1.0"?>
<!--
-
- - $Id: text__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -8658,12 +8658,12 @@ constructor method vspx_tree (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: tree__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -8961,12 +8961,12 @@ constructor method vspx_url (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: url__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -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 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
@@ -9634,12 +9634,12 @@ as a child of outer page.
<?xml version="1.0"?>
<!--
-
- - $Id: vscx__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/web_acl.xml b/docsrc/xmlsource/web_acl.xml
index 158c909..efc940f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/webandxml.xml b/docsrc/xmlsource/webandxml.xml
index 060cdd8..d8919e6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/webappdevelopment.xml b/docsrc/xmlsource/webappdevelopment.xml
index 32f446d..8c491cd 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/webdav.xml b/docsrc/xmlsource/webdav.xml
index 89fd283..815438c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/webserver.xml b/docsrc/xmlsource/webserver.xml
index f5c14c0..5d27a6e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/webservices.xml b/docsrc/xmlsource/webservices.xml
index 5972b44..21316da 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/ws-rm.xml b/docsrc/xmlsource/ws-rm.xml
index ff0b0b2..3b74cf2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/ws-routing.xml b/docsrc/xmlsource/ws-routing.xml
index f20f1fc..1b9f7ed 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/ws-security.xml b/docsrc/xmlsource/ws-security.xml
index 264ffcc..49c97bb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/ws-trust.xml b/docsrc/xmlsource/ws-trust.xml
index 4cf5971..6e2f87c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/wsdl.xml b/docsrc/xmlsource/wsdl.xml
index 31b9147..04ff958 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xa.xml b/docsrc/xmlsource/xa.xml
index b68cbc4..ae7d92b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmla.xml b/docsrc/xmlsource/xmla.xml
index 705f4e6..d656148 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/_xpf_template.xml b/docsrc/xmlsource/xmlref/_xpf_template.xml
index 0403de5..f4efdb3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf__sql__column.xml b/docsrc/xmlsource/xmlref/xpf__sql__column.xml
index 72cc6ab..f45a0c0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_and.xml b/docsrc/xmlsource/xmlref/xpf_and.xml
index bd59d4c..0d20c83 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_append.xml b/docsrc/xmlsource/xmlref/xpf_append.xml
index 31c0685..58ccd98 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_assign.xml b/docsrc/xmlsource/xmlref/xpf_assign.xml
index 7025809..63b8db8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_avg.xml b/docsrc/xmlsource/xmlref/xpf_avg.xml
index 65a4b6d..867a412 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_boolean.xml b/docsrc/xmlsource/xmlref/xpf_boolean.xml
index 8a16027..8d5e48d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_ceiling.xml b/docsrc/xmlsource/xmlref/xpf_ceiling.xml
index bcd6e44..93e5aa8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_collection.xml b/docsrc/xmlsource/xmlref/xpf_collection.xml
index 9e99aae..ad0b327 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_concat.xml b/docsrc/xmlsource/xmlref/xpf_concat.xml
index ddf0689..2158752 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_contains.xml b/docsrc/xmlsource/xmlref/xpf_contains.xml
index a405d88..ca4eb96 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_count.xml b/docsrc/xmlsource/xmlref/xpf_count.xml
index bb5821c..16ccdc2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_create_attribute.xml b/docsrc/xmlsource/xmlref/xpf_create_attribute.xml
index 512c9e5..0816b3e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_create_comment.xml b/docsrc/xmlsource/xmlref/xpf_create_comment.xml
index 64be7a1..789b8a6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_create_element.xml b/docsrc/xmlsource/xmlref/xpf_create_element.xml
index b59ca82..6edc294 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_create_pi.xml b/docsrc/xmlsource/xmlref/xpf_create_pi.xml
index a56585e..8734e1d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_current.xml b/docsrc/xmlsource/xmlref/xpf_current.xml
index 77af5c4..431d70f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_deass.xml b/docsrc/xmlsource/xmlref/xpf_deass.xml
index 0403de5..f4efdb3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_distinct.xml b/docsrc/xmlsource/xmlref/xpf_distinct.xml
index 1960c6d..e9a58b6 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_doc.xml b/docsrc/xmlsource/xmlref/xpf_doc.xml
index bea3f9f..f2a0131 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_document.xml b/docsrc/xmlsource/xmlref/xpf_document.xml
index 48c7d6a..a302f18 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_document_literal.xml b/docsrc/xmlsource/xmlref/xpf_document_literal.xml
index 70c62eb..bbccfef 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_empty.xml b/docsrc/xmlsource/xmlref/xpf_empty.xml
index 3ad3fd0..3f2e0c8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_ends_with.xml b/docsrc/xmlsource/xmlref/xpf_ends_with.xml
index 073efdb..cd3983a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_every.xml b/docsrc/xmlsource/xmlref/xpf_every.xml
index c2678f4..3cb6765 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_except.xml b/docsrc/xmlsource/xmlref/xpf_except.xml
index bc35788..3d58468 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_false.xml b/docsrc/xmlsource/xmlref/xpf_false.xml
index bb9aa81..dc9a1ab 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_filter.xml b/docsrc/xmlsource/xmlref/xpf_filter.xml
index 06fc213..71472bb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_floor.xml b/docsrc/xmlsource/xmlref/xpf_floor.xml
index 373088f..dc2fce9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_for.xml b/docsrc/xmlsource/xmlref/xpf_for.xml
index eef5893..f84a258 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_format_number.xml b/docsrc/xmlsource/xmlref/xpf_format_number.xml
index e2ce92c..0ceaa38 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_function_available.xml b/docsrc/xmlsource/xmlref/xpf_function_available.xml
index e277ff6..321a471 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_generate_id.xml b/docsrc/xmlsource/xmlref/xpf_generate_id.xml
index ac23bcd..4fc91aa 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_id.xml b/docsrc/xmlsource/xmlref/xpf_id.xml
index 48fdce8..0338be1 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_if.xml b/docsrc/xmlsource/xmlref/xpf_if.xml
index 9a8e7e4..3fcc022 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_intersect.xml b/docsrc/xmlsource/xmlref/xpf_intersect.xml
index a748ebe..02eeae3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_is_after.xml b/docsrc/xmlsource/xmlref/xpf_is_after.xml
index 9c1c890..e78b907 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_is_before.xml b/docsrc/xmlsource/xmlref/xpf_is_before.xml
index fd103c5..ce4da8b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_iterate.xml b/docsrc/xmlsource/xmlref/xpf_iterate.xml
index 6c40532..35b6563 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml b/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml
index 883456e..77c43f7 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_key.xml b/docsrc/xmlsource/xmlref/xpf_key.xml
index 79178ec..ca75eeb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_lang.xml b/docsrc/xmlsource/xmlref/xpf_lang.xml
index ec18420..ecf4daa 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_last.xml b/docsrc/xmlsource/xmlref/xpf_last.xml
index 902f567..f18f4d4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_let.xml b/docsrc/xmlsource/xmlref/xpf_let.xml
index 81addbf..70f0270 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_list.xml b/docsrc/xmlsource/xmlref/xpf_list.xml
index fc267db..f578993 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_local_name.xml b/docsrc/xmlsource/xmlref/xpf_local_name.xml
index c065f3a..79efcf3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_max.xml b/docsrc/xmlsource/xmlref/xpf_max.xml
index 8a57bc7..ed71c12 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_min.xml b/docsrc/xmlsource/xmlref/xpf_min.xml
index 7163ea3..f690a28 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_name.xml b/docsrc/xmlsource/xmlref/xpf_name.xml
index e2cfc2c..0554e2d 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml b/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml
index 4cc087e..b67ea6a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_normalize_space.xml b/docsrc/xmlsource/xmlref/xpf_normalize_space.xml
index 2aef058..7d48f4f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_not.xml b/docsrc/xmlsource/xmlref/xpf_not.xml
index 9e04660..53ab01e 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_number.xml b/docsrc/xmlsource/xmlref/xpf_number.xml
index d63d455..0131a37 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_or.xml b/docsrc/xmlsource/xmlref/xpf_or.xml
index 80d9578..b0aac07 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_position.xml b/docsrc/xmlsource/xmlref/xpf_position.xml
index 20c3856..c26f508 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_processXQuery.xml b/docsrc/xmlsource/xmlref/xpf_processXQuery.xml
index fb312b0..3909c6f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_processXSLT.xml b/docsrc/xmlsource/xmlref/xpf_processXSLT.xml
index 983208e..60383d2 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_processXSQL.xml b/docsrc/xmlsource/xmlref/xpf_processXSQL.xml
index 99790b2..c3c2cc0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_progn.xml b/docsrc/xmlsource/xmlref/xpf_progn.xml
index 4da7a4a..48b1919 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_replace.xml b/docsrc/xmlsource/xmlref/xpf_replace.xml
index 6d1c8af..d1c49e0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_round.xml b/docsrc/xmlsource/xmlref/xpf_round.xml
index 1f62b6b..16a47b8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_round_number.xml b/docsrc/xmlsource/xmlref/xpf_round_number.xml
index 14f67ac..a2d46fb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_serialize.xml b/docsrc/xmlsource/xmlref/xpf_serialize.xml
index 714dfdf..9dffaf9 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_shallow.xml b/docsrc/xmlsource/xmlref/xpf_shallow.xml
index a367a6b..e7f7df0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_some.xml b/docsrc/xmlsource/xmlref/xpf_some.xml
index c36434c..b6c298c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_starts_with.xml b/docsrc/xmlsource/xmlref/xpf_starts_with.xml
index 81aadb9..b16dbf0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_string.xml b/docsrc/xmlsource/xmlref/xpf_string.xml
index ff683ed..a747ec3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_string_length.xml b/docsrc/xmlsource/xmlref/xpf_string_length.xml
index 6430790..1b875f0 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_substring.xml b/docsrc/xmlsource/xmlref/xpf_substring.xml
index fa7e1f5..42317a4 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_substring_after.xml b/docsrc/xmlsource/xmlref/xpf_substring_after.xml
index e943cab..4bcc928 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_substring_before.xml b/docsrc/xmlsource/xmlref/xpf_substring_before.xml
index df60e92..ddcc638 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_sum.xml b/docsrc/xmlsource/xmlref/xpf_sum.xml
index 8beb316..c79fa1c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_system_property.xml b/docsrc/xmlsource/xmlref/xpf_system_property.xml
index 5e64a69..61d678c 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_text_contains.xml b/docsrc/xmlsource/xmlref/xpf_text_contains.xml
index 0721c67..07e35e3 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_translate.xml b/docsrc/xmlsource/xmlref/xpf_translate.xml
index acf7f98..63635cc 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_true.xml b/docsrc/xmlsource/xmlref/xpf_true.xml
index 2bbab60..d1cf05b 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_tuple.xml b/docsrc/xmlsource/xmlref/xpf_tuple.xml
index 3e181c3..30d3494 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_union.xml b/docsrc/xmlsource/xmlref/xpf_union.xml
index da3b825..6e18056 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_unordered.xml b/docsrc/xmlsource/xmlref/xpf_unordered.xml
index 0130bda..aada128 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml b/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml
index e79ce80..a19188f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_urlify.xml b/docsrc/xmlsource/xmlref/xpf_urlify.xml
index af25373..6f14571 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlref/xpf_xmlview.xml b/docsrc/xmlsource/xmlref/xpf_xmlview.xml
index 7ef7763..a31108a 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlrpc.xml b/docsrc/xmlsource/xmlrpc.xml
index b6e658b..a9eda3f 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlschema.xml b/docsrc/xmlsource/xmlschema.xml
index 1bc4dd6..1ac6d36 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmltableview.xml b/docsrc/xmlsource/xmltableview.xml
index 163725c..eed7725 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmltemplates.xml b/docsrc/xmlsource/xmltemplates.xml
index 4a990c7..f040e75 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xmlview.xml b/docsrc/xmlsource/xmlview.xml
index db39ba0..e6551dd 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xpfs.xml b/docsrc/xmlsource/xpfs.xml
index 76d5efa..cb39a84 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xquery.xml b/docsrc/xmlsource/xquery.xml
index 32d7c62..0fe30eb 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xslttrans.xml b/docsrc/xmlsource/xslttrans.xml
index 9bbe8a8..13036e8 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/xsql.xml b/docsrc/xmlsource/xsql.xml
index e1d7358..7e78f01 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-2006 OpenLink Software
+ - 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
diff --git a/docsrc/xmlsource/yacsqlgrammar.xml b/docsrc/xmlsource/yacsqlgrammar.xml
index e796010..4ba09fa 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.1 2010/01/25 22:55:37 source Exp $
+ $Id$
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2010 OpenLink Software
+ 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
@@ -32,7 +32,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/Dk.h b/libsrc/Dk.h
index 2734876..7df6a6d 100644
--- a/libsrc/Dk.h
+++ b/libsrc/Dk.h
@@ -1,14 +1,14 @@
/*
* Dk.h
*
- * $Id: Dk.h,v 1.2 2009/04/09 17:39:31 source Exp $
+ * $Id$
*
* All configuration options
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkalloc.c b/libsrc/Dk/Dkalloc.c
index 9e10f64..2053782 100644
--- a/libsrc/Dk/Dkalloc.c
+++ b/libsrc/Dk/Dkalloc.c
@@ -1,14 +1,14 @@
/*
* Dkalloc.c
*
- * $Id: Dkalloc.c,v 1.9.2.1 2011/02/14 12:33:59 source Exp $
+ * $Id$
*
* Memory Allocation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkalloc.h b/libsrc/Dk/Dkalloc.h
index 19d9e66..a279d7e 100644
--- a/libsrc/Dk/Dkalloc.h
+++ b/libsrc/Dk/Dkalloc.h
@@ -1,14 +1,14 @@
/*
* Dkalloc.h
*
- * $Id: Dkalloc.h,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Memory Allocation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkbasket.c b/libsrc/Dk/Dkbasket.c
index 4744ca8..d4f4fd5 100644
--- a/libsrc/Dk/Dkbasket.c
+++ b/libsrc/Dk/Dkbasket.c
@@ -1,14 +1,14 @@
/*
* Dkbasket.c
*
- * $Id: Dkbasket.c,v 1.4.2.1 2009/04/15 15:35:41 source Exp $
+ * $Id$
*
* Baskets
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkbasket.h b/libsrc/Dk/Dkbasket.h
index 8c2eaf7..fe9dfc7 100644
--- a/libsrc/Dk/Dkbasket.h
+++ b/libsrc/Dk/Dkbasket.h
@@ -1,14 +1,14 @@
/*
* Dkbasket.c
*
- * $Id: Dkbasket.h,v 1.4.2.1 2009/04/15 15:35:41 source Exp $
+ * $Id$
*
* Baskets
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkbox.c b/libsrc/Dk/Dkbox.c
index e12ef00..29e39f3 100644
--- a/libsrc/Dk/Dkbox.c
+++ b/libsrc/Dk/Dkbox.c
@@ -1,7 +1,7 @@
/*
* Dkbox.c
*
- * $Id: Dkbox.c,v 1.22.2.9 2011/10/25 19:36:36 source Exp $
+ * $Id$
*
* Boxes
*
@@ -18,7 +18,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -803,6 +803,8 @@ 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);
@@ -1006,6 +1008,17 @@ 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*) DBG_NAME (dk_alloc_box) (DBG_ARGS 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
@@ -1140,6 +1153,10 @@ 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));
}
@@ -1191,6 +1208,10 @@ 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));
}
@@ -1275,6 +1296,10 @@ 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));
}
@@ -2015,6 +2040,7 @@ 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;
@@ -2419,6 +2445,14 @@ 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 90b5a94..ad19449 100644
--- a/libsrc/Dk/Dkbox.h
+++ b/libsrc/Dk/Dkbox.h
@@ -1,14 +1,14 @@
/*
* Dkbox.h
*
- * $Id: Dkbox.h,v 1.32.2.11 2011/10/25 19:36:36 source Exp $
+ * $Id$
*
* Boxes
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -307,7 +307,7 @@ ptr += 4
#define DV_NON_BOX 101
-#define FIRST_DV_DTP 180
+#define FIRST_DV_DTP 125
/* Data types */
@@ -663,6 +663,7 @@ 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
@@ -696,6 +697,7 @@ 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));
@@ -768,6 +770,7 @@ 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);
@@ -798,6 +801,7 @@ 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 d03c02f..cb31033 100644
--- a/libsrc/Dk/Dkconfig.h
+++ b/libsrc/Dk/Dkconfig.h
@@ -1,14 +1,14 @@
/*
* Dkconfig.h
*
- * $Id: Dkconfig.h,v 1.2.2.1 2009/10/14 20:13:10 source Exp $
+ * $Id$
*
* Configuration
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkconfig.w32 b/libsrc/Dk/Dkconfig.w32
index 0b16b13..55723cf 100644
--- a/libsrc/Dk/Dkconfig.w32
+++ b/libsrc/Dk/Dkconfig.w32
@@ -1,12 +1,12 @@
/*
- * $Id: Dkconfig.w32,v 1.6.2.2 2010/02/02 19:39:43 source Exp $
+ * $Id$
*
* Configuration Options for win32
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkconfig.w64 b/libsrc/Dk/Dkconfig.w64
index 712a1b1..02fa376 100644
--- a/libsrc/Dk/Dkconfig.w64
+++ b/libsrc/Dk/Dkconfig.w64
@@ -1,10 +1,10 @@
/*
- * $Id: Dkconfig.w64,v 1.5.2.2 2010/02/02 19:39:43 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkdevice.c b/libsrc/Dk/Dkdevice.c
index bbeb099..8e9cc10 100644
--- a/libsrc/Dk/Dkdevice.c
+++ b/libsrc/Dk/Dkdevice.c
@@ -1,14 +1,14 @@
/*
* Dkdevice.c
*
- * $Id: Dkdevice.c,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Devices
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkdevice.h b/libsrc/Dk/Dkdevice.h
index 0620a4f..1b4f340 100644
--- a/libsrc/Dk/Dkdevice.h
+++ b/libsrc/Dk/Dkdevice.h
@@ -1,14 +1,14 @@
/*
* Dkdevice.h
*
- * $Id: Dkdevice.h,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Devices
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkernel.c b/libsrc/Dk/Dkernel.c
index 8b9b7f2..c8dfbf7 100644
--- a/libsrc/Dk/Dkernel.c
+++ b/libsrc/Dk/Dkernel.c
@@ -1,14 +1,14 @@
/*
* Dkernel.c
*
- * $Id: Dkernel.c,v 1.25.2.14 2011/06/17 00:11:07 source Exp $
+ * $Id$
*
* RPC Kernel
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -157,6 +157,7 @@ dk_hash_t *pending_futures;
char *c_ssl_server_port;
char *c_ssl_server_cert;
char *c_ssl_server_key;
+char *c_ssl_server_extra_certs;
#endif
#endif /* GSTATE */
@@ -4331,6 +4332,24 @@ PrpcConnect2 (char *address, int sesclass, char *ssl_usage, char *pass, char *ca
SSL_set_verify_depth (ssl, -1);
SSL_CTX_set_session_id_context (ssl_ctx, (unsigned char *) &session_id_context, sizeof session_id_context);
}
+ else if (ca_list)
+ {
+ int session_id_context = 12;
+ if (SSL_CTX_load_verify_locations (ssl_ctx, ca_list, NULL) <= 0)
+ {
+ SSL_free (ssl);
+ SSL_CTX_free (ssl_ctx);
+ SESSTAT_CLR (session->dks_session, SST_OK);
+ SESSTAT_SET (session->dks_session, SST_BROKEN_CONNECTION);
+ return session;
+ }
+#if 0
+ SSL_set_verify (ssl, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, NULL);
+ SSL_set_verify_depth (ssl, -1);
+#endif
+ SSL_CTX_set_session_id_context (ssl_ctx, (unsigned char *) &session_id_context, sizeof session_id_context);
+ }
+
ssl_err = SSL_connect (ssl);
if (ssl_err != 1)
{
@@ -4644,19 +4663,13 @@ ssl_report_errors (char *client_ip)
int
cli_ssl_get_error_string (char *out_data, int out_data_len)
{
- 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;
- }
+ 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 : "?");
return 0;
}
@@ -4764,9 +4777,12 @@ 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
*
@@ -4844,52 +4860,52 @@ dk_ssl_free (void *old)
#endif
#if defined (_SSL) && !defined (NO_THREAD)
-int ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * cert_name, char * key_name);
+int ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * cert_name, char * key_name, char * extra);
-static void
+static int
ssl_server_key_setup ()
{
- 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))
+ if (!c_ssl_server_cert || !c_ssl_server_key)
{
- call_exit (-1);
+ log_error ("SSL: Server certificate and private key must both be specified");
+ return 0;
}
+ if (!ssl_server_set_certificate (ssl_server_ctx, c_ssl_server_cert, c_ssl_server_key, c_ssl_server_extra_certs))
+ return 0;
+
if (ssl_server_verify)
{
int i, session_id_context = 2, verify = SSL_VERIFY_NONE;
STACK_OF (X509_NAME) * skCAList = NULL;
- 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));
+ 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_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 (sk_X509_NAME_num (skCAList) == 0)
- log_warning ("ODBC X509 Client authentication requested but no CA known for verification");
+ if (ssl_server_verify != 3 && sk_X509_NAME_num (skCAList) == 0)
+ log_warning ("SSL: 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 ("ODBC Server Using X509 Client CA %s", ca_buf);
+ log_debug ("SSL: Using X509 client CA %s", ca_buf);
}
}
+
+ return 1;
}
#endif
@@ -4897,42 +4913,26 @@ 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_X509_strings ();
+ ERR_load_crypto_strings ();
#ifndef WIN32
- RAND_bytes (tmp, sizeof (tmp));
- RAND_add (tmp, sizeof (tmp), (double) (sizeof (tmp)));
+ {
+ unsigned char tmp[1024];
+ 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 ();
-#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
+ PKCS12_PBE_add (); /* stub */
+
#ifdef NO_THREAD
ssl_server_method = SSLv23_client_method ();
#else
@@ -4944,7 +4944,6 @@ ssl_server_init ()
ERR_print_errors_fp (stderr);
call_exit (-1);
}
-
}
@@ -5075,69 +5074,53 @@ int
ssl_client_use_pkcs12 (SSL * ssl, char *pkcs12file, char *passwd, char *ca)
{
int /*session_id_context = 2, */ i;
- FILE *fi = fopen (pkcs12file, "rb");
- PKCS12 *p12;
+ FILE *fi;
+ PKCS12 *p12 = NULL;
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))
- goto ssl_setup;
-
- if (!fi || NULL == (p12 = d2i_PKCS12_fp (fi, NULL)))
- {
- if (fi)
- fclose (fi);
- return 0;
- }
- if (!PKCS12_parse (p12, passwd, &pkey, &cert, &ca_list))
+ if (0 == PEM_parse (pkcs12file, passwd, &pkey, &cert, &ca_list))
{
- if (fi)
- fclose (fi);
- return 0;
+ 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;
+ }
}
- 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);
}
- if (!SSL_use_PrivateKey (ssl, pkey))
+ i = SSL_use_certificate (ssl, cert);
+ if (i)
+ i = SSL_use_PrivateKey (ssl, pkey);
+ if (i)
+ i = SSL_check_private_key (ssl);
+ if (i)
{
- X509_free (cert);
- EVP_PKEY_free (pkey);
- sk_X509_pop_free (ca_list, X509_free);
- return 0;
- }
- EVP_PKEY_free (pkey);
- if (!SSL_use_certificate (ssl, cert))
- {
- X509_free (cert);
- 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);
+ }
}
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);
- }
+ EVP_PKEY_free (pkey);
sk_X509_pop_free (ca_list, X509_free);
- return 1;
+ return i ? 1 : 0;
}
@@ -5365,18 +5348,20 @@ ssl_server_listen ()
dk_session_t *listening;
if (!c_ssl_server_port)
return;
- ssl_server_key_setup ();
+
+ if (!ssl_server_key_setup ())
+ goto failed;
+
listening = PrpcListen (c_ssl_server_port, SESCLASS_TCPIP);
if (!SESSTAT_ISSET (listening->dks_session, SST_LISTENING))
{
- log_error ("Failed ODBC Server SSL listen at %s.", c_ssl_server_port);
- call_exit (-1);
- };
+ failed:
+ log_error ("SSL: Failed listen at %s", c_ssl_server_port);
+ return;
+ }
ssl_server_port = tcpses_get_port (listening->dks_session);
- 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);
+
+ log_info ("SSL server online at %s", c_ssl_server_port);
#endif
}
diff --git a/libsrc/Dk/Dkernel.h b/libsrc/Dk/Dkernel.h
index 93ce380..d8950fb 100644
--- a/libsrc/Dk/Dkernel.h
+++ b/libsrc/Dk/Dkernel.h
@@ -1,14 +1,14 @@
/*
* Dkernel.h
*
- * $Id: Dkernel.h,v 1.19.2.3 2011/01/05 12:50:32 source Exp $
+ * $Id$
*
* RPC Kernel
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -750,6 +750,7 @@ 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);
@@ -757,10 +758,12 @@ 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 4718dac..c16dc0e 100644
--- a/libsrc/Dk/Dkhash.c
+++ b/libsrc/Dk/Dkhash.c
@@ -1,14 +1,14 @@
/*
* Dkhash.c
*
- * $Id: Dkhash.c,v 1.8 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Hash tables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -586,6 +586,48 @@ maphash3 (maphash3_func func, dk_hash_t * table, void *env)
HQ_CYCLE3 (0, 0, func, env);
}
+#define HQ_CYCLE_L(k, d) \
+ __k = (void *) k; \
+ __d = (void *) d; \
+ if (data_in_store) \
+ res[ctr++] = key_store; \
+ else \
+ data_in_store = 1; \
+ key_store = __k; \
+ data_store = __d;
+
+void **hash_list_keys (dk_hash_t * table)
+{
+ void **res = (void **)dk_alloc_box (sizeof (void *) * table->ht_count, DV_LONG_INT);
+ int ctr = 0;
+ void *key_store = NULL, *data_store = NULL, *__k, *__d;
+ int data_in_store = 0;
+ uint32 len = table->ht_actual_size;
+ uint32 inx;
+ uint32 init_count = table->ht_count;
+ /* int n_done =0; */
+ if (init_count == 0)
+ return res;
+ for (inx = 0; inx < len; inx++)
+ {
+ hash_elt_t *elt = &table->ht_elements[inx];
+ hash_elt_t *next_elt = elt->next;
+ if (HASH_EMPTY == next_elt)
+ continue;
+ HQ_CYCLE_L (elt->key, elt->data);
+ /* n_done++; if (n_done >= init_count) goto all_done; */
+ elt = next_elt;
+ while (elt)
+ {
+ next_elt = elt->next;
+ HQ_CYCLE_L (elt->key, elt->data);
+ /* n_done++; if (n_done >= init_count) goto all_done; */
+ elt = next_elt;
+ }
+ }
+ HQ_CYCLE_L (0, 0);
+ return res;
+}
void
maphash_no_remhash (maphash_func func, dk_hash_t * table)
diff --git a/libsrc/Dk/Dkhash.h b/libsrc/Dk/Dkhash.h
index d810291..3aab06a 100644
--- a/libsrc/Dk/Dkhash.h
+++ b/libsrc/Dk/Dkhash.h
@@ -1,14 +1,14 @@
/*
* Dkhash.h
*
- * $Id: Dkhash.h,v 1.11.2.1 2011/03/08 13:41:56 source Exp $
+ * $Id$
*
* Hash tables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -157,6 +157,7 @@ void hash_table_destroy (dk_hash_t * ht);
extern void *gethash (const void *key, dk_hash_t * ht);
extern void maphash (maphash_func func, dk_hash_t * table);
extern void maphash3 (maphash3_func func, dk_hash_t * table, void *env);
+extern void **hash_list_keys (dk_hash_t * table);
extern void maphash_no_remhash (maphash_func func, dk_hash_t * table);
extern void dk_hash_iterator (dk_hash_iterator_t * hit, dk_hash_t * ht);
extern int dk_hit_next (dk_hash_iterator_t * hit, void **key, void **data);
diff --git a/libsrc/Dk/Dkhash64.h b/libsrc/Dk/Dkhash64.h
index 70899ef..06b6039 100644
--- a/libsrc/Dk/Dkhash64.h
+++ b/libsrc/Dk/Dkhash64.h
@@ -1,14 +1,14 @@
/*
* Dkhash64.h
*
- * $Id: Dkhash64.h,v 1.4 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* int64 hashtable for 32 bit platforms
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -65,4 +65,8 @@
#define hash_table_free_64(ht) \
id_hash_free (ht)
-#endif /* DKHASH64_H */
+#define dk_hash_64_iterator_t id_hash_iterator_t
+#define dk_hash_64_iterator id_hash_iterator
+#define dk_hash_64_hit_next hit_next
+
+#endif
diff --git a/libsrc/Dk/Dkhashext.c b/libsrc/Dk/Dkhashext.c
index 3aa6551..a0577e3 100644
--- a/libsrc/Dk/Dkhashext.c
+++ b/libsrc/Dk/Dkhashext.c
@@ -1,14 +1,14 @@
/*
* Dkhashext.c
*
- * $Id: Dkhashext.c,v 1.17.2.2 2010/05/07 09:14:31 source Exp $
+ * $Id$
*
* Hashing
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkhashext.h b/libsrc/Dk/Dkhashext.h
index 6dcd0af..6718df7 100644
--- a/libsrc/Dk/Dkhashext.h
+++ b/libsrc/Dk/Dkhashext.h
@@ -1,12 +1,12 @@
/*
* hashext.h
*
- * $Id: Dkhashext.h,v 1.15.2.2 2011/04/21 13:09:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkhashext_t.c b/libsrc/Dk/Dkhashext_t.c
index 6baa2de..b20081b 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 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* RPC Kernel (single threaded, without server side support)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkhashext_template.c b/libsrc/Dk/Dkhashext_template.c
index 49fbef1..b17f620 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.2 2010/06/25 11:22:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dklongjmp.c b/libsrc/Dk/Dklongjmp.c
index 55b11e8..a286d17 100644
--- a/libsrc/Dk/Dklongjmp.c
+++ b/libsrc/Dk/Dklongjmp.c
@@ -1,12 +1,12 @@
/*
* Dklongjump.c
*
- * $Id: Dklongjmp.c,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkmarshal.c b/libsrc/Dk/Dkmarshal.c
index 0010c85..35bbe35 100644
--- a/libsrc/Dk/Dkmarshal.c
+++ b/libsrc/Dk/Dkmarshal.c
@@ -1,14 +1,14 @@
/*
* Dkmarshal.c
*
- * $Id: Dkmarshal.c,v 1.16.2.5 2011/01/25 14:32:56 source Exp $
+ * $Id$
*
* Marshalling on top of sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkmarshal.h b/libsrc/Dk/Dkmarshal.h
index 92438ec..144d7ee 100644
--- a/libsrc/Dk/Dkmarshal.h
+++ b/libsrc/Dk/Dkmarshal.h
@@ -1,14 +1,14 @@
/*
* nmarsh.h
*
- * $Id: Dkmarshal.h,v 1.5.2.1 2009/11/17 21:38:44 source Exp $
+ * $Id$
*
* Marshalling on top of sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkparam.h b/libsrc/Dk/Dkparam.h
index e24120c..2732420 100644
--- a/libsrc/Dk/Dkparam.h
+++ b/libsrc/Dk/Dkparam.h
@@ -1,14 +1,14 @@
/*
* Dkparam.h
*
- * $Id: Dkparam.h,v 1.4 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Global parameters
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkpool.c b/libsrc/Dk/Dkpool.c
index 55ed6b8..5d1548d 100644
--- a/libsrc/Dk/Dkpool.c
+++ b/libsrc/Dk/Dkpool.c
@@ -1,7 +1,7 @@
/*
* Dkpool.c
*
- * $Id: Dkpool.c,v 1.24.2.1 2009/09/22 09:32:30 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkpool.h b/libsrc/Dk/Dkpool.h
index 8ab1acf..b9d368f 100644
--- a/libsrc/Dk/Dkpool.h
+++ b/libsrc/Dk/Dkpool.h
@@ -1,7 +1,7 @@
/*
* Dkpool.h
*
- * $Id: Dkpool.h,v 1.20.2.1 2009/04/15 15:35:41 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
@@ -303,6 +303,10 @@ caddr_t *t_revlist_to_array (dk_set_t list);
int t_set_delete (dk_set_t * set, void *item);
dk_set_t t_set_copy (dk_set_t s);
#endif
+#define mp_set_nreverse(mp,s) dk_set_nreverse((s))
+#define t_set_nreverse(s) dk_set_nreverse((s))
+#define t_revlist_to_array_or_null(list) ((NULL != (list)) ? t_revlist_to_array ((list)) : NULL)
+
#ifdef MALLOC_DEBUG
void mp_check_tree (mem_pool_t * mp, box_t box);
diff --git a/libsrc/Dk/Dkresource.c b/libsrc/Dk/Dkresource.c
index 82048ad..0fb0ec5 100644
--- a/libsrc/Dk/Dkresource.c
+++ b/libsrc/Dk/Dkresource.c
@@ -1,14 +1,14 @@
/*
* Dkresource.c
*
- * $Id: Dkresource.c,v 1.3 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Resource management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkresource.h b/libsrc/Dk/Dkresource.h
index a8fe771..0a7357f 100644
--- a/libsrc/Dk/Dkresource.h
+++ b/libsrc/Dk/Dkresource.h
@@ -1,14 +1,14 @@
/*
* Dkresource.h
*
- * $Id: Dkresource.h,v 1.3 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Resource Management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkrusage.c b/libsrc/Dk/Dkrusage.c
index 2a9386f..38bde3c 100644
--- a/libsrc/Dk/Dkrusage.c
+++ b/libsrc/Dk/Dkrusage.c
@@ -1,14 +1,14 @@
/*
* Dkrusage.c
*
- * $Id: Dkrusage.c,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkses2.c b/libsrc/Dk/Dkses2.c
index e9d6d51..389eade 100644
--- a/libsrc/Dk/Dkses2.c
+++ b/libsrc/Dk/Dkses2.c
@@ -1,14 +1,14 @@
/*
* Dkses2.h
*
- * $Id: Dkses2.c,v 1.8.2.1 2009/06/14 18:35:42 source Exp $
+ * $Id$
*
* Upper layer sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksesinp.c b/libsrc/Dk/Dksesinp.c
index bab35c4..560e3f9 100644
--- a/libsrc/Dk/Dksesinp.c
+++ b/libsrc/Dk/Dksesinp.c
@@ -1,14 +1,14 @@
/*
* Dksesinp.c
*
- * $Id: Dksesinp.c,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* In-process sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksession.c b/libsrc/Dk/Dksession.c
index a6d97b9..a062a48 100644
--- a/libsrc/Dk/Dksession.c
+++ b/libsrc/Dk/Dksession.c
@@ -1,14 +1,14 @@
/*
* Dksession.c
*
- * $Id: Dksession.c,v 1.4 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksession.h b/libsrc/Dk/Dksession.h
index b0272cc..3ec75e0 100644
--- a/libsrc/Dk/Dksession.h
+++ b/libsrc/Dk/Dksession.h
@@ -1,14 +1,14 @@
/*
* Dksession.h
*
- * $Id: Dksession.h,v 1.8 2009/04/10 23:06:43 source Exp $
+ * $Id$
*
* Lower layer sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksesstr.c b/libsrc/Dk/Dksesstr.c
index f428f2b..f29822f 100644
--- a/libsrc/Dk/Dksesstr.c
+++ b/libsrc/Dk/Dksesstr.c
@@ -1,14 +1,14 @@
/*
* Dksesstr.c
*
- * $Id: Dksesstr.c,v 1.15.2.1 2011/04/21 13:09:46 source Exp $
+ * $Id$
*
* String sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1110,6 +1110,19 @@ 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);
@@ -1656,6 +1669,14 @@ 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 23495e6..c3259be 100644
--- a/libsrc/Dk/Dksesstr.h
+++ b/libsrc/Dk/Dksesstr.h
@@ -1,14 +1,14 @@
/*
* Dksesstr.h
*
- * $Id: Dksesstr.h,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* String sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksestcp.c b/libsrc/Dk/Dksestcp.c
index 6027eb7..09789c5 100644
--- a/libsrc/Dk/Dksestcp.c
+++ b/libsrc/Dk/Dksestcp.c
@@ -1,14 +1,14 @@
/*
* Dksestcp.c
*
- * $Id: Dksestcp.c,v 1.14.2.3 2011/09/09 13:30:40 source Exp $
+ * $Id$
*
* TCP/IP sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksestcp.h b/libsrc/Dk/Dksestcp.h
index feb66b3..94a7f77 100644
--- a/libsrc/Dk/Dksestcp.h
+++ b/libsrc/Dk/Dksestcp.h
@@ -1,14 +1,14 @@
/*
* Dksestcp.h
*
- * $Id: Dksestcp.h,v 1.3.2.1 2011/05/03 18:01:15 source Exp $
+ * $Id$
*
* TCP sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksestcpint.h b/libsrc/Dk/Dksestcpint.h
index e775dc7..c07f85d 100644
--- a/libsrc/Dk/Dksestcpint.h
+++ b/libsrc/Dk/Dksestcpint.h
@@ -1,14 +1,14 @@
/*
* Dksestcpint.h
*
- * $Id: Dksestcpint.h,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Internal of Dksestcp.h
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksets.c b/libsrc/Dk/Dksets.c
index b87e5ef..059d0cb 100644
--- a/libsrc/Dk/Dksets.c
+++ b/libsrc/Dk/Dksets.c
@@ -1,14 +1,14 @@
/*
* Dksets.c
*
- * $Id: Dksets.c,v 1.7.2.2 2010/12/06 10:37:13 source Exp $
+ * $Id$
*
* Sets
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksets.h b/libsrc/Dk/Dksets.h
index faf0011..f455594 100644
--- a/libsrc/Dk/Dksets.h
+++ b/libsrc/Dk/Dksets.h
@@ -1,14 +1,14 @@
/*
* Dksets.h
*
- * $Id: Dksets.h,v 1.7.2.2 2010/12/06 10:37:13 source Exp $
+ * $Id$
*
* Sets
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkstkern.c b/libsrc/Dk/Dkstkern.c
index e8dab00..129d330 100644
--- a/libsrc/Dk/Dkstkern.c
+++ b/libsrc/Dk/Dkstkern.c
@@ -1,14 +1,14 @@
/*
* Dkstkern.c
*
- * $Id: Dkstkern.c,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* RPC Kernel (single threaded, without server side support)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkstubs.c b/libsrc/Dk/Dkstubs.c
index 8b88703..a998fe0 100644
--- a/libsrc/Dk/Dkstubs.c
+++ b/libsrc/Dk/Dkstubs.c
@@ -1,14 +1,14 @@
/*
* Dkstubs.c
*
- * $Id: Dkstubs.c,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Systems specific code
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkstubs.h b/libsrc/Dk/Dkstubs.h
index cb5d39e..39f17a5 100644
--- a/libsrc/Dk/Dkstubs.h
+++ b/libsrc/Dk/Dkstubs.h
@@ -1,14 +1,14 @@
/*
* Dkstubs.h
*
- * $Id: Dkstubs.h,v 1.3 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Systems specific code
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dksystem.h b/libsrc/Dk/Dksystem.h
index 38da468..f7c9303 100644
--- a/libsrc/Dk/Dksystem.h
+++ b/libsrc/Dk/Dksystem.h
@@ -1,14 +1,14 @@
/*
* Dksystem.h
*
- * $Id: Dksystem.h,v 1.5 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* system common include files
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dktrace.h b/libsrc/Dk/Dktrace.h
index 61e221b..6d79b4b 100644
--- a/libsrc/Dk/Dktrace.h
+++ b/libsrc/Dk/Dktrace.h
@@ -1,14 +1,14 @@
/*
* Dktrace.h
*
- * $Id: Dktrace.h,v 1.3.2.1 2011/03/08 13:41:57 source Exp $
+ * $Id$
*
* Tracing & Debugging
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dktypes.h b/libsrc/Dk/Dktypes.h
index 18012c9..1aeea0e 100644
--- a/libsrc/Dk/Dktypes.h
+++ b/libsrc/Dk/Dktypes.h
@@ -1,14 +1,14 @@
/*
* Dktypes.c
*
- * $Id: Dktypes.h,v 1.5 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Global types
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkutil.c b/libsrc/Dk/Dkutil.c
index f662d22..2e2b855 100644
--- a/libsrc/Dk/Dkutil.c
+++ b/libsrc/Dk/Dkutil.c
@@ -1,14 +1,14 @@
/*
* Dkutil.c
*
- * $Id: Dkutil.c,v 1.3 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Helper functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -27,12 +27,34 @@
#include "Dk.h"
+#if defined(linux) || defined (__APPLE__)
+#include <execinfo.h>
+
+void
+print_trace (void)
+{
+#define N_FRAMES 100
+ void *array[N_FRAMES];
+ size_t size, i;
+ char **strings;
+
+ size = backtrace (array, N_FRAMES);
+ strings = backtrace_symbols (array, size);
+ for (i = 0; i < size; i++)
+ log_info ("%s\n", strings[i]);
+ free (strings);
+}
+#else
+void print_trace (void) { }
+#endif
+
int
gpf_notice (const char *file, int line, const char *text)
{
#ifdef DEBUG
FILE *core_reason;
#endif
+ print_trace ();
#if defined (PMN_LOG) && defined (NOT_DEFINED)
/* XXX - first resolve libutil conflicts */
if (text)
diff --git a/libsrc/Dk/Dkutil.h b/libsrc/Dk/Dkutil.h
index a972610..25a3378 100644
--- a/libsrc/Dk/Dkutil.h
+++ b/libsrc/Dk/Dkutil.h
@@ -1,14 +1,14 @@
/*
* Dkutil.h
*
- * $Id: Dkutil.h,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* Helper functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Dkword.h b/libsrc/Dk/Dkword.h
index 1877834..30803a2 100644
--- a/libsrc/Dk/Dkword.h
+++ b/libsrc/Dk/Dkword.h
@@ -1,12 +1,12 @@
/*
* Dkword.h
*
- * $Id: Dkword.h,v 1.2 2009/04/07 22:00:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/libsrc/Dk/Makefile.am b/libsrc/Dk/Makefile.am
index aef20a2..8b78c2a 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/Dk/Makefile.in b/libsrc/Dk/Makefile.in
index b6b0330..54bbf96 100644
--- a/libsrc/Dk/Makefile.in
+++ b/libsrc/Dk/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libdk1t_la_LIBADD =
am_libdk1t_la_OBJECTS = libdk1t_la-Dkalloc.lo libdk1t_la-Dkbasket.lo \
@@ -108,7 +105,6 @@ libdksrv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -211,7 +207,6 @@ 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@
@@ -295,7 +290,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -316,7 +310,6 @@ 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@
@@ -400,14 +393,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Dk/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/Dk/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Dk/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/Dk/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -425,7 +418,6 @@ $(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):
config.h: stamp-h1
@if test ! -f $@; then \
@@ -437,7 +429,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status libsrc/Dk/config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
@@ -506,304 +498,304 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libdk1t_la-Dkalloc.lo: Dkalloc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkalloc.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkalloc.Tpo -c -o libdk1t_la-Dkalloc.lo `test -f 'Dkalloc.c' || echo '$(srcdir)/'`Dkalloc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkalloc.Tpo $(DEPDIR)/libdk1t_la-Dkalloc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkalloc.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkalloc.Tpo -c -o libdk1t_la-Dkalloc.lo `test -f 'Dkalloc.c' || echo '$(srcdir)/'`Dkalloc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkalloc.Tpo $(DEPDIR)/libdk1t_la-Dkalloc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkalloc.c' object='libdk1t_la-Dkalloc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkalloc.lo `test -f 'Dkalloc.c' || echo '$(srcdir)/'`Dkalloc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkalloc.lo `test -f 'Dkalloc.c' || echo '$(srcdir)/'`Dkalloc.c
libdk1t_la-Dkbasket.lo: Dkbasket.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkbasket.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkbasket.Tpo -c -o libdk1t_la-Dkbasket.lo `test -f 'Dkbasket.c' || echo '$(srcdir)/'`Dkbasket.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkbasket.Tpo $(DEPDIR)/libdk1t_la-Dkbasket.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkbasket.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkbasket.Tpo -c -o libdk1t_la-Dkbasket.lo `test -f 'Dkbasket.c' || echo '$(srcdir)/'`Dkbasket.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkbasket.Tpo $(DEPDIR)/libdk1t_la-Dkbasket.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkbasket.c' object='libdk1t_la-Dkbasket.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkbasket.lo `test -f 'Dkbasket.c' || echo '$(srcdir)/'`Dkbasket.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkbasket.lo `test -f 'Dkbasket.c' || echo '$(srcdir)/'`Dkbasket.c
libdk1t_la-Dkbox.lo: Dkbox.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkbox.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkbox.Tpo -c -o libdk1t_la-Dkbox.lo `test -f 'Dkbox.c' || echo '$(srcdir)/'`Dkbox.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkbox.Tpo $(DEPDIR)/libdk1t_la-Dkbox.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkbox.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkbox.Tpo -c -o libdk1t_la-Dkbox.lo `test -f 'Dkbox.c' || echo '$(srcdir)/'`Dkbox.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkbox.Tpo $(DEPDIR)/libdk1t_la-Dkbox.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkbox.c' object='libdk1t_la-Dkbox.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkbox.lo `test -f 'Dkbox.c' || echo '$(srcdir)/'`Dkbox.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkbox.lo `test -f 'Dkbox.c' || echo '$(srcdir)/'`Dkbox.c
libdk1t_la-Dkdevice.lo: Dkdevice.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkdevice.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkdevice.Tpo -c -o libdk1t_la-Dkdevice.lo `test -f 'Dkdevice.c' || echo '$(srcdir)/'`Dkdevice.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkdevice.Tpo $(DEPDIR)/libdk1t_la-Dkdevice.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkdevice.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkdevice.Tpo -c -o libdk1t_la-Dkdevice.lo `test -f 'Dkdevice.c' || echo '$(srcdir)/'`Dkdevice.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkdevice.Tpo $(DEPDIR)/libdk1t_la-Dkdevice.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkdevice.c' object='libdk1t_la-Dkdevice.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkdevice.lo `test -f 'Dkdevice.c' || echo '$(srcdir)/'`Dkdevice.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkdevice.lo `test -f 'Dkdevice.c' || echo '$(srcdir)/'`Dkdevice.c
libdk1t_la-Dkhash.lo: Dkhash.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkhash.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkhash.Tpo -c -o libdk1t_la-Dkhash.lo `test -f 'Dkhash.c' || echo '$(srcdir)/'`Dkhash.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkhash.Tpo $(DEPDIR)/libdk1t_la-Dkhash.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkhash.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkhash.Tpo -c -o libdk1t_la-Dkhash.lo `test -f 'Dkhash.c' || echo '$(srcdir)/'`Dkhash.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkhash.Tpo $(DEPDIR)/libdk1t_la-Dkhash.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkhash.c' object='libdk1t_la-Dkhash.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkhash.lo `test -f 'Dkhash.c' || echo '$(srcdir)/'`Dkhash.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkhash.lo `test -f 'Dkhash.c' || echo '$(srcdir)/'`Dkhash.c
libdk1t_la-Dkhashext.lo: Dkhashext.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkhashext.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkhashext.Tpo -c -o libdk1t_la-Dkhashext.lo `test -f 'Dkhashext.c' || echo '$(srcdir)/'`Dkhashext.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkhashext.Tpo $(DEPDIR)/libdk1t_la-Dkhashext.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkhashext.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkhashext.Tpo -c -o libdk1t_la-Dkhashext.lo `test -f 'Dkhashext.c' || echo '$(srcdir)/'`Dkhashext.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkhashext.Tpo $(DEPDIR)/libdk1t_la-Dkhashext.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkhashext.c' object='libdk1t_la-Dkhashext.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkhashext.lo `test -f 'Dkhashext.c' || echo '$(srcdir)/'`Dkhashext.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkhashext.lo `test -f 'Dkhashext.c' || echo '$(srcdir)/'`Dkhashext.c
libdk1t_la-Dklongjmp.lo: Dklongjmp.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dklongjmp.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dklongjmp.Tpo -c -o libdk1t_la-Dklongjmp.lo `test -f 'Dklongjmp.c' || echo '$(srcdir)/'`Dklongjmp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dklongjmp.Tpo $(DEPDIR)/libdk1t_la-Dklongjmp.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dklongjmp.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dklongjmp.Tpo -c -o libdk1t_la-Dklongjmp.lo `test -f 'Dklongjmp.c' || echo '$(srcdir)/'`Dklongjmp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dklongjmp.Tpo $(DEPDIR)/libdk1t_la-Dklongjmp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dklongjmp.c' object='libdk1t_la-Dklongjmp.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dklongjmp.lo `test -f 'Dklongjmp.c' || echo '$(srcdir)/'`Dklongjmp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dklongjmp.lo `test -f 'Dklongjmp.c' || echo '$(srcdir)/'`Dklongjmp.c
libdk1t_la-Dkmarshal.lo: Dkmarshal.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkmarshal.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkmarshal.Tpo -c -o libdk1t_la-Dkmarshal.lo `test -f 'Dkmarshal.c' || echo '$(srcdir)/'`Dkmarshal.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkmarshal.Tpo $(DEPDIR)/libdk1t_la-Dkmarshal.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkmarshal.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkmarshal.Tpo -c -o libdk1t_la-Dkmarshal.lo `test -f 'Dkmarshal.c' || echo '$(srcdir)/'`Dkmarshal.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkmarshal.Tpo $(DEPDIR)/libdk1t_la-Dkmarshal.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkmarshal.c' object='libdk1t_la-Dkmarshal.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkmarshal.lo `test -f 'Dkmarshal.c' || echo '$(srcdir)/'`Dkmarshal.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkmarshal.lo `test -f 'Dkmarshal.c' || echo '$(srcdir)/'`Dkmarshal.c
libdk1t_la-Dkresource.lo: Dkresource.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkresource.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkresource.Tpo -c -o libdk1t_la-Dkresource.lo `test -f 'Dkresource.c' || echo '$(srcdir)/'`Dkresource.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkresource.Tpo $(DEPDIR)/libdk1t_la-Dkresource.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkresource.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkresource.Tpo -c -o libdk1t_la-Dkresource.lo `test -f 'Dkresource.c' || echo '$(srcdir)/'`Dkresource.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkresource.Tpo $(DEPDIR)/libdk1t_la-Dkresource.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkresource.c' object='libdk1t_la-Dkresource.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkresource.lo `test -f 'Dkresource.c' || echo '$(srcdir)/'`Dkresource.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkresource.lo `test -f 'Dkresource.c' || echo '$(srcdir)/'`Dkresource.c
libdk1t_la-Dkrusage.lo: Dkrusage.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkrusage.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkrusage.Tpo -c -o libdk1t_la-Dkrusage.lo `test -f 'Dkrusage.c' || echo '$(srcdir)/'`Dkrusage.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkrusage.Tpo $(DEPDIR)/libdk1t_la-Dkrusage.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkrusage.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkrusage.Tpo -c -o libdk1t_la-Dkrusage.lo `test -f 'Dkrusage.c' || echo '$(srcdir)/'`Dkrusage.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkrusage.Tpo $(DEPDIR)/libdk1t_la-Dkrusage.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkrusage.c' object='libdk1t_la-Dkrusage.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkrusage.lo `test -f 'Dkrusage.c' || echo '$(srcdir)/'`Dkrusage.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkrusage.lo `test -f 'Dkrusage.c' || echo '$(srcdir)/'`Dkrusage.c
libdk1t_la-Dkses2.lo: Dkses2.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkses2.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkses2.Tpo -c -o libdk1t_la-Dkses2.lo `test -f 'Dkses2.c' || echo '$(srcdir)/'`Dkses2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkses2.Tpo $(DEPDIR)/libdk1t_la-Dkses2.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkses2.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkses2.Tpo -c -o libdk1t_la-Dkses2.lo `test -f 'Dkses2.c' || echo '$(srcdir)/'`Dkses2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkses2.Tpo $(DEPDIR)/libdk1t_la-Dkses2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkses2.c' object='libdk1t_la-Dkses2.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkses2.lo `test -f 'Dkses2.c' || echo '$(srcdir)/'`Dkses2.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkses2.lo `test -f 'Dkses2.c' || echo '$(srcdir)/'`Dkses2.c
libdk1t_la-Dksesinp.lo: Dksesinp.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksesinp.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksesinp.Tpo -c -o libdk1t_la-Dksesinp.lo `test -f 'Dksesinp.c' || echo '$(srcdir)/'`Dksesinp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dksesinp.Tpo $(DEPDIR)/libdk1t_la-Dksesinp.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksesinp.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksesinp.Tpo -c -o libdk1t_la-Dksesinp.lo `test -f 'Dksesinp.c' || echo '$(srcdir)/'`Dksesinp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dksesinp.Tpo $(DEPDIR)/libdk1t_la-Dksesinp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksesinp.c' object='libdk1t_la-Dksesinp.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksesinp.lo `test -f 'Dksesinp.c' || echo '$(srcdir)/'`Dksesinp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksesinp.lo `test -f 'Dksesinp.c' || echo '$(srcdir)/'`Dksesinp.c
libdk1t_la-Dksession.lo: Dksession.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksession.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksession.Tpo -c -o libdk1t_la-Dksession.lo `test -f 'Dksession.c' || echo '$(srcdir)/'`Dksession.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dksession.Tpo $(DEPDIR)/libdk1t_la-Dksession.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksession.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksession.Tpo -c -o libdk1t_la-Dksession.lo `test -f 'Dksession.c' || echo '$(srcdir)/'`Dksession.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dksession.Tpo $(DEPDIR)/libdk1t_la-Dksession.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksession.c' object='libdk1t_la-Dksession.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksession.lo `test -f 'Dksession.c' || echo '$(srcdir)/'`Dksession.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksession.lo `test -f 'Dksession.c' || echo '$(srcdir)/'`Dksession.c
libdk1t_la-Dksesstr.lo: Dksesstr.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksesstr.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksesstr.Tpo -c -o libdk1t_la-Dksesstr.lo `test -f 'Dksesstr.c' || echo '$(srcdir)/'`Dksesstr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dksesstr.Tpo $(DEPDIR)/libdk1t_la-Dksesstr.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksesstr.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksesstr.Tpo -c -o libdk1t_la-Dksesstr.lo `test -f 'Dksesstr.c' || echo '$(srcdir)/'`Dksesstr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dksesstr.Tpo $(DEPDIR)/libdk1t_la-Dksesstr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksesstr.c' object='libdk1t_la-Dksesstr.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksesstr.lo `test -f 'Dksesstr.c' || echo '$(srcdir)/'`Dksesstr.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksesstr.lo `test -f 'Dksesstr.c' || echo '$(srcdir)/'`Dksesstr.c
libdk1t_la-Dksestcp.lo: Dksestcp.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksestcp.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksestcp.Tpo -c -o libdk1t_la-Dksestcp.lo `test -f 'Dksestcp.c' || echo '$(srcdir)/'`Dksestcp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dksestcp.Tpo $(DEPDIR)/libdk1t_la-Dksestcp.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksestcp.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksestcp.Tpo -c -o libdk1t_la-Dksestcp.lo `test -f 'Dksestcp.c' || echo '$(srcdir)/'`Dksestcp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dksestcp.Tpo $(DEPDIR)/libdk1t_la-Dksestcp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksestcp.c' object='libdk1t_la-Dksestcp.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksestcp.lo `test -f 'Dksestcp.c' || echo '$(srcdir)/'`Dksestcp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksestcp.lo `test -f 'Dksestcp.c' || echo '$(srcdir)/'`Dksestcp.c
libdk1t_la-Dksets.lo: Dksets.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksets.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksets.Tpo -c -o libdk1t_la-Dksets.lo `test -f 'Dksets.c' || echo '$(srcdir)/'`Dksets.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dksets.Tpo $(DEPDIR)/libdk1t_la-Dksets.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dksets.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dksets.Tpo -c -o libdk1t_la-Dksets.lo `test -f 'Dksets.c' || echo '$(srcdir)/'`Dksets.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dksets.Tpo $(DEPDIR)/libdk1t_la-Dksets.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksets.c' object='libdk1t_la-Dksets.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksets.lo `test -f 'Dksets.c' || echo '$(srcdir)/'`Dksets.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dksets.lo `test -f 'Dksets.c' || echo '$(srcdir)/'`Dksets.c
libdk1t_la-Dkpool.lo: Dkpool.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkpool.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkpool.Tpo -c -o libdk1t_la-Dkpool.lo `test -f 'Dkpool.c' || echo '$(srcdir)/'`Dkpool.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkpool.Tpo $(DEPDIR)/libdk1t_la-Dkpool.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkpool.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkpool.Tpo -c -o libdk1t_la-Dkpool.lo `test -f 'Dkpool.c' || echo '$(srcdir)/'`Dkpool.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkpool.Tpo $(DEPDIR)/libdk1t_la-Dkpool.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkpool.c' object='libdk1t_la-Dkpool.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkpool.lo `test -f 'Dkpool.c' || echo '$(srcdir)/'`Dkpool.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkpool.lo `test -f 'Dkpool.c' || echo '$(srcdir)/'`Dkpool.c
libdk1t_la-Dkutil.lo: Dkutil.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkutil.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkutil.Tpo -c -o libdk1t_la-Dkutil.lo `test -f 'Dkutil.c' || echo '$(srcdir)/'`Dkutil.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkutil.Tpo $(DEPDIR)/libdk1t_la-Dkutil.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkutil.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkutil.Tpo -c -o libdk1t_la-Dkutil.lo `test -f 'Dkutil.c' || echo '$(srcdir)/'`Dkutil.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkutil.Tpo $(DEPDIR)/libdk1t_la-Dkutil.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkutil.c' object='libdk1t_la-Dkutil.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkutil.lo `test -f 'Dkutil.c' || echo '$(srcdir)/'`Dkutil.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkutil.lo `test -f 'Dkutil.c' || echo '$(srcdir)/'`Dkutil.c
libdk1t_la-Dkstubs.lo: Dkstubs.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkstubs.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkstubs.Tpo -c -o libdk1t_la-Dkstubs.lo `test -f 'Dkstubs.c' || echo '$(srcdir)/'`Dkstubs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkstubs.Tpo $(DEPDIR)/libdk1t_la-Dkstubs.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkstubs.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkstubs.Tpo -c -o libdk1t_la-Dkstubs.lo `test -f 'Dkstubs.c' || echo '$(srcdir)/'`Dkstubs.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkstubs.Tpo $(DEPDIR)/libdk1t_la-Dkstubs.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkstubs.c' object='libdk1t_la-Dkstubs.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkstubs.lo `test -f 'Dkstubs.c' || echo '$(srcdir)/'`Dkstubs.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkstubs.lo `test -f 'Dkstubs.c' || echo '$(srcdir)/'`Dkstubs.c
libdk1t_la-Dkstkern.lo: Dkstkern.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkstkern.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkstkern.Tpo -c -o libdk1t_la-Dkstkern.lo `test -f 'Dkstkern.c' || echo '$(srcdir)/'`Dkstkern.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdk1t_la-Dkstkern.Tpo $(DEPDIR)/libdk1t_la-Dkstkern.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -MT libdk1t_la-Dkstkern.lo -MD -MP -MF $(DEPDIR)/libdk1t_la-Dkstkern.Tpo -c -o libdk1t_la-Dkstkern.lo `test -f 'Dkstkern.c' || echo '$(srcdir)/'`Dkstkern.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdk1t_la-Dkstkern.Tpo $(DEPDIR)/libdk1t_la-Dkstkern.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkstkern.c' object='libdk1t_la-Dkstkern.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkstkern.lo `test -f 'Dkstkern.c' || echo '$(srcdir)/'`Dkstkern.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdk1t_la_CFLAGS) $(CFLAGS) -c -o libdk1t_la-Dkstkern.lo `test -f 'Dkstkern.c' || echo '$(srcdir)/'`Dkstkern.c
libdksrv_la-Dkalloc.lo: Dkalloc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkalloc.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkalloc.Tpo -c -o libdksrv_la-Dkalloc.lo `test -f 'Dkalloc.c' || echo '$(srcdir)/'`Dkalloc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkalloc.Tpo $(DEPDIR)/libdksrv_la-Dkalloc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkalloc.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkalloc.Tpo -c -o libdksrv_la-Dkalloc.lo `test -f 'Dkalloc.c' || echo '$(srcdir)/'`Dkalloc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkalloc.Tpo $(DEPDIR)/libdksrv_la-Dkalloc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkalloc.c' object='libdksrv_la-Dkalloc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkalloc.lo `test -f 'Dkalloc.c' || echo '$(srcdir)/'`Dkalloc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkalloc.lo `test -f 'Dkalloc.c' || echo '$(srcdir)/'`Dkalloc.c
libdksrv_la-Dkbasket.lo: Dkbasket.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkbasket.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkbasket.Tpo -c -o libdksrv_la-Dkbasket.lo `test -f 'Dkbasket.c' || echo '$(srcdir)/'`Dkbasket.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkbasket.Tpo $(DEPDIR)/libdksrv_la-Dkbasket.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkbasket.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkbasket.Tpo -c -o libdksrv_la-Dkbasket.lo `test -f 'Dkbasket.c' || echo '$(srcdir)/'`Dkbasket.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkbasket.Tpo $(DEPDIR)/libdksrv_la-Dkbasket.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkbasket.c' object='libdksrv_la-Dkbasket.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkbasket.lo `test -f 'Dkbasket.c' || echo '$(srcdir)/'`Dkbasket.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkbasket.lo `test -f 'Dkbasket.c' || echo '$(srcdir)/'`Dkbasket.c
libdksrv_la-Dkbox.lo: Dkbox.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkbox.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkbox.Tpo -c -o libdksrv_la-Dkbox.lo `test -f 'Dkbox.c' || echo '$(srcdir)/'`Dkbox.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkbox.Tpo $(DEPDIR)/libdksrv_la-Dkbox.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkbox.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkbox.Tpo -c -o libdksrv_la-Dkbox.lo `test -f 'Dkbox.c' || echo '$(srcdir)/'`Dkbox.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkbox.Tpo $(DEPDIR)/libdksrv_la-Dkbox.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkbox.c' object='libdksrv_la-Dkbox.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkbox.lo `test -f 'Dkbox.c' || echo '$(srcdir)/'`Dkbox.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkbox.lo `test -f 'Dkbox.c' || echo '$(srcdir)/'`Dkbox.c
libdksrv_la-Dkdevice.lo: Dkdevice.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkdevice.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkdevice.Tpo -c -o libdksrv_la-Dkdevice.lo `test -f 'Dkdevice.c' || echo '$(srcdir)/'`Dkdevice.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkdevice.Tpo $(DEPDIR)/libdksrv_la-Dkdevice.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkdevice.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkdevice.Tpo -c -o libdksrv_la-Dkdevice.lo `test -f 'Dkdevice.c' || echo '$(srcdir)/'`Dkdevice.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkdevice.Tpo $(DEPDIR)/libdksrv_la-Dkdevice.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkdevice.c' object='libdksrv_la-Dkdevice.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkdevice.lo `test -f 'Dkdevice.c' || echo '$(srcdir)/'`Dkdevice.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkdevice.lo `test -f 'Dkdevice.c' || echo '$(srcdir)/'`Dkdevice.c
libdksrv_la-Dkhash.lo: Dkhash.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkhash.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkhash.Tpo -c -o libdksrv_la-Dkhash.lo `test -f 'Dkhash.c' || echo '$(srcdir)/'`Dkhash.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkhash.Tpo $(DEPDIR)/libdksrv_la-Dkhash.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkhash.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkhash.Tpo -c -o libdksrv_la-Dkhash.lo `test -f 'Dkhash.c' || echo '$(srcdir)/'`Dkhash.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkhash.Tpo $(DEPDIR)/libdksrv_la-Dkhash.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkhash.c' object='libdksrv_la-Dkhash.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkhash.lo `test -f 'Dkhash.c' || echo '$(srcdir)/'`Dkhash.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkhash.lo `test -f 'Dkhash.c' || echo '$(srcdir)/'`Dkhash.c
libdksrv_la-Dkhashext.lo: Dkhashext.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkhashext.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkhashext.Tpo -c -o libdksrv_la-Dkhashext.lo `test -f 'Dkhashext.c' || echo '$(srcdir)/'`Dkhashext.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkhashext.Tpo $(DEPDIR)/libdksrv_la-Dkhashext.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkhashext.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkhashext.Tpo -c -o libdksrv_la-Dkhashext.lo `test -f 'Dkhashext.c' || echo '$(srcdir)/'`Dkhashext.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkhashext.Tpo $(DEPDIR)/libdksrv_la-Dkhashext.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkhashext.c' object='libdksrv_la-Dkhashext.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkhashext.lo `test -f 'Dkhashext.c' || echo '$(srcdir)/'`Dkhashext.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkhashext.lo `test -f 'Dkhashext.c' || echo '$(srcdir)/'`Dkhashext.c
libdksrv_la-Dklongjmp.lo: Dklongjmp.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dklongjmp.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dklongjmp.Tpo -c -o libdksrv_la-Dklongjmp.lo `test -f 'Dklongjmp.c' || echo '$(srcdir)/'`Dklongjmp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dklongjmp.Tpo $(DEPDIR)/libdksrv_la-Dklongjmp.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dklongjmp.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dklongjmp.Tpo -c -o libdksrv_la-Dklongjmp.lo `test -f 'Dklongjmp.c' || echo '$(srcdir)/'`Dklongjmp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dklongjmp.Tpo $(DEPDIR)/libdksrv_la-Dklongjmp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dklongjmp.c' object='libdksrv_la-Dklongjmp.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dklongjmp.lo `test -f 'Dklongjmp.c' || echo '$(srcdir)/'`Dklongjmp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dklongjmp.lo `test -f 'Dklongjmp.c' || echo '$(srcdir)/'`Dklongjmp.c
libdksrv_la-Dkmarshal.lo: Dkmarshal.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkmarshal.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkmarshal.Tpo -c -o libdksrv_la-Dkmarshal.lo `test -f 'Dkmarshal.c' || echo '$(srcdir)/'`Dkmarshal.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkmarshal.Tpo $(DEPDIR)/libdksrv_la-Dkmarshal.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkmarshal.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkmarshal.Tpo -c -o libdksrv_la-Dkmarshal.lo `test -f 'Dkmarshal.c' || echo '$(srcdir)/'`Dkmarshal.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkmarshal.Tpo $(DEPDIR)/libdksrv_la-Dkmarshal.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkmarshal.c' object='libdksrv_la-Dkmarshal.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkmarshal.lo `test -f 'Dkmarshal.c' || echo '$(srcdir)/'`Dkmarshal.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkmarshal.lo `test -f 'Dkmarshal.c' || echo '$(srcdir)/'`Dkmarshal.c
libdksrv_la-Dkresource.lo: Dkresource.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkresource.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkresource.Tpo -c -o libdksrv_la-Dkresource.lo `test -f 'Dkresource.c' || echo '$(srcdir)/'`Dkresource.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkresource.Tpo $(DEPDIR)/libdksrv_la-Dkresource.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkresource.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkresource.Tpo -c -o libdksrv_la-Dkresource.lo `test -f 'Dkresource.c' || echo '$(srcdir)/'`Dkresource.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkresource.Tpo $(DEPDIR)/libdksrv_la-Dkresource.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkresource.c' object='libdksrv_la-Dkresource.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkresource.lo `test -f 'Dkresource.c' || echo '$(srcdir)/'`Dkresource.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkresource.lo `test -f 'Dkresource.c' || echo '$(srcdir)/'`Dkresource.c
libdksrv_la-Dkrusage.lo: Dkrusage.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkrusage.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkrusage.Tpo -c -o libdksrv_la-Dkrusage.lo `test -f 'Dkrusage.c' || echo '$(srcdir)/'`Dkrusage.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkrusage.Tpo $(DEPDIR)/libdksrv_la-Dkrusage.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkrusage.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkrusage.Tpo -c -o libdksrv_la-Dkrusage.lo `test -f 'Dkrusage.c' || echo '$(srcdir)/'`Dkrusage.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkrusage.Tpo $(DEPDIR)/libdksrv_la-Dkrusage.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkrusage.c' object='libdksrv_la-Dkrusage.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkrusage.lo `test -f 'Dkrusage.c' || echo '$(srcdir)/'`Dkrusage.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkrusage.lo `test -f 'Dkrusage.c' || echo '$(srcdir)/'`Dkrusage.c
libdksrv_la-Dkses2.lo: Dkses2.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkses2.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkses2.Tpo -c -o libdksrv_la-Dkses2.lo `test -f 'Dkses2.c' || echo '$(srcdir)/'`Dkses2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkses2.Tpo $(DEPDIR)/libdksrv_la-Dkses2.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkses2.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkses2.Tpo -c -o libdksrv_la-Dkses2.lo `test -f 'Dkses2.c' || echo '$(srcdir)/'`Dkses2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkses2.Tpo $(DEPDIR)/libdksrv_la-Dkses2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkses2.c' object='libdksrv_la-Dkses2.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkses2.lo `test -f 'Dkses2.c' || echo '$(srcdir)/'`Dkses2.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkses2.lo `test -f 'Dkses2.c' || echo '$(srcdir)/'`Dkses2.c
libdksrv_la-Dksesinp.lo: Dksesinp.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksesinp.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksesinp.Tpo -c -o libdksrv_la-Dksesinp.lo `test -f 'Dksesinp.c' || echo '$(srcdir)/'`Dksesinp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dksesinp.Tpo $(DEPDIR)/libdksrv_la-Dksesinp.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksesinp.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksesinp.Tpo -c -o libdksrv_la-Dksesinp.lo `test -f 'Dksesinp.c' || echo '$(srcdir)/'`Dksesinp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dksesinp.Tpo $(DEPDIR)/libdksrv_la-Dksesinp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksesinp.c' object='libdksrv_la-Dksesinp.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksesinp.lo `test -f 'Dksesinp.c' || echo '$(srcdir)/'`Dksesinp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksesinp.lo `test -f 'Dksesinp.c' || echo '$(srcdir)/'`Dksesinp.c
libdksrv_la-Dksession.lo: Dksession.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksession.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksession.Tpo -c -o libdksrv_la-Dksession.lo `test -f 'Dksession.c' || echo '$(srcdir)/'`Dksession.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dksession.Tpo $(DEPDIR)/libdksrv_la-Dksession.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksession.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksession.Tpo -c -o libdksrv_la-Dksession.lo `test -f 'Dksession.c' || echo '$(srcdir)/'`Dksession.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dksession.Tpo $(DEPDIR)/libdksrv_la-Dksession.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksession.c' object='libdksrv_la-Dksession.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksession.lo `test -f 'Dksession.c' || echo '$(srcdir)/'`Dksession.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksession.lo `test -f 'Dksession.c' || echo '$(srcdir)/'`Dksession.c
libdksrv_la-Dksesstr.lo: Dksesstr.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksesstr.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksesstr.Tpo -c -o libdksrv_la-Dksesstr.lo `test -f 'Dksesstr.c' || echo '$(srcdir)/'`Dksesstr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dksesstr.Tpo $(DEPDIR)/libdksrv_la-Dksesstr.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksesstr.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksesstr.Tpo -c -o libdksrv_la-Dksesstr.lo `test -f 'Dksesstr.c' || echo '$(srcdir)/'`Dksesstr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dksesstr.Tpo $(DEPDIR)/libdksrv_la-Dksesstr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksesstr.c' object='libdksrv_la-Dksesstr.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksesstr.lo `test -f 'Dksesstr.c' || echo '$(srcdir)/'`Dksesstr.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksesstr.lo `test -f 'Dksesstr.c' || echo '$(srcdir)/'`Dksesstr.c
libdksrv_la-Dksestcp.lo: Dksestcp.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksestcp.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksestcp.Tpo -c -o libdksrv_la-Dksestcp.lo `test -f 'Dksestcp.c' || echo '$(srcdir)/'`Dksestcp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dksestcp.Tpo $(DEPDIR)/libdksrv_la-Dksestcp.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksestcp.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksestcp.Tpo -c -o libdksrv_la-Dksestcp.lo `test -f 'Dksestcp.c' || echo '$(srcdir)/'`Dksestcp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dksestcp.Tpo $(DEPDIR)/libdksrv_la-Dksestcp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksestcp.c' object='libdksrv_la-Dksestcp.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksestcp.lo `test -f 'Dksestcp.c' || echo '$(srcdir)/'`Dksestcp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksestcp.lo `test -f 'Dksestcp.c' || echo '$(srcdir)/'`Dksestcp.c
libdksrv_la-Dksets.lo: Dksets.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksets.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksets.Tpo -c -o libdksrv_la-Dksets.lo `test -f 'Dksets.c' || echo '$(srcdir)/'`Dksets.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dksets.Tpo $(DEPDIR)/libdksrv_la-Dksets.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dksets.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dksets.Tpo -c -o libdksrv_la-Dksets.lo `test -f 'Dksets.c' || echo '$(srcdir)/'`Dksets.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dksets.Tpo $(DEPDIR)/libdksrv_la-Dksets.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dksets.c' object='libdksrv_la-Dksets.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksets.lo `test -f 'Dksets.c' || echo '$(srcdir)/'`Dksets.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dksets.lo `test -f 'Dksets.c' || echo '$(srcdir)/'`Dksets.c
libdksrv_la-Dkpool.lo: Dkpool.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkpool.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkpool.Tpo -c -o libdksrv_la-Dkpool.lo `test -f 'Dkpool.c' || echo '$(srcdir)/'`Dkpool.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkpool.Tpo $(DEPDIR)/libdksrv_la-Dkpool.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkpool.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkpool.Tpo -c -o libdksrv_la-Dkpool.lo `test -f 'Dkpool.c' || echo '$(srcdir)/'`Dkpool.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkpool.Tpo $(DEPDIR)/libdksrv_la-Dkpool.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkpool.c' object='libdksrv_la-Dkpool.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkpool.lo `test -f 'Dkpool.c' || echo '$(srcdir)/'`Dkpool.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkpool.lo `test -f 'Dkpool.c' || echo '$(srcdir)/'`Dkpool.c
libdksrv_la-Dkutil.lo: Dkutil.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkutil.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkutil.Tpo -c -o libdksrv_la-Dkutil.lo `test -f 'Dkutil.c' || echo '$(srcdir)/'`Dkutil.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkutil.Tpo $(DEPDIR)/libdksrv_la-Dkutil.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkutil.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkutil.Tpo -c -o libdksrv_la-Dkutil.lo `test -f 'Dkutil.c' || echo '$(srcdir)/'`Dkutil.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkutil.Tpo $(DEPDIR)/libdksrv_la-Dkutil.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkutil.c' object='libdksrv_la-Dkutil.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkutil.lo `test -f 'Dkutil.c' || echo '$(srcdir)/'`Dkutil.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkutil.lo `test -f 'Dkutil.c' || echo '$(srcdir)/'`Dkutil.c
libdksrv_la-Dkstubs.lo: Dkstubs.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkstubs.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkstubs.Tpo -c -o libdksrv_la-Dkstubs.lo `test -f 'Dkstubs.c' || echo '$(srcdir)/'`Dkstubs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkstubs.Tpo $(DEPDIR)/libdksrv_la-Dkstubs.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkstubs.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkstubs.Tpo -c -o libdksrv_la-Dkstubs.lo `test -f 'Dkstubs.c' || echo '$(srcdir)/'`Dkstubs.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkstubs.Tpo $(DEPDIR)/libdksrv_la-Dkstubs.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkstubs.c' object='libdksrv_la-Dkstubs.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkstubs.lo `test -f 'Dkstubs.c' || echo '$(srcdir)/'`Dkstubs.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkstubs.lo `test -f 'Dkstubs.c' || echo '$(srcdir)/'`Dkstubs.c
libdksrv_la-Dkernel.lo: Dkernel.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkernel.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkernel.Tpo -c -o libdksrv_la-Dkernel.lo `test -f 'Dkernel.c' || echo '$(srcdir)/'`Dkernel.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdksrv_la-Dkernel.Tpo $(DEPDIR)/libdksrv_la-Dkernel.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -MT libdksrv_la-Dkernel.lo -MD -MP -MF $(DEPDIR)/libdksrv_la-Dkernel.Tpo -c -o libdksrv_la-Dkernel.lo `test -f 'Dkernel.c' || echo '$(srcdir)/'`Dkernel.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdksrv_la-Dkernel.Tpo $(DEPDIR)/libdksrv_la-Dkernel.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Dkernel.c' object='libdksrv_la-Dkernel.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkernel.lo `test -f 'Dkernel.c' || echo '$(srcdir)/'`Dkernel.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdksrv_la_CFLAGS) $(CFLAGS) -c -o libdksrv_la-Dkernel.lo `test -f 'Dkernel.c' || echo '$(srcdir)/'`Dkernel.c
mostlyclean-libtool:
-rm -f *.lo
@@ -816,49 +808,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -879,17 +867,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -917,7 +901,6 @@ clean-generic:
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"
@@ -939,8 +922,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -949,28 +930,18 @@ install-data-am:
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
@@ -993,7 +964,7 @@ ps-am:
uninstall-am:
-.MAKE: all install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -1009,7 +980,6 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am
-
# 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/libsrc/Dk/config.h.in b/libsrc/Dk/config.h.in
index bd7e5c5..4f9ad8b 100644
--- a/libsrc/Dk/config.h.in
+++ b/libsrc/Dk/config.h.in
@@ -1,8 +1,5 @@
/* libsrc/Dk/config.h.in. Generated from configure.in by autoheader. */
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
/* tidy functions */
#undef BIF_TIDY
@@ -245,13 +242,13 @@
/* Define to 1 if you have the `strtok_r' function. */
#undef HAVE_STRTOK_R
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-/* Define to 1 if `st_blocks' is a member of `struct stat'. */
+/* Define to 1 if `st_blocks' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLOCKS
-/* Define to 1 if `st_rdev' is a member of `struct stat'. */
+/* Define to 1 if `st_rdev' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_RDEV
/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
@@ -460,15 +457,15 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Virtuoso/PL debugger */
#undef PLDBG
+/* Define to 1 if the C compiler supports function prototypes. */
+#undef PROTOTYPES
+
/* replication */
#undef REPLICATION_SUPPORT
@@ -478,6 +475,11 @@
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
+/* Define to 1 if the `setvbuf' function takes the buffering type as its
+ second argument and the buffer pointer as the third, as on System V before
+ release 3. */
+#undef SETVBUF_REVERSED
+
/* The size of `char', as computed by sizeof. */
#undef SIZEOF_CHAR
@@ -526,28 +528,6 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Enable extensions on AIX 3, Interix. */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them. */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris. */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop. */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
/* Define to 1 if you have uuid_t defined */
#undef UUID_T_DEFINED
@@ -569,22 +549,21 @@
/* readline */
#undef WITH_READLINE
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
#undef YYTEXT_POINTER
+/* Define to 1 if on AIX 3.
+ System headers sometimes define this.
+ We just want to avoid a redefinition error message. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+
/* POP3 and NNTP extension */
#undef _IMSG
@@ -621,6 +600,9 @@
# undef __CHAR_UNSIGNED__
#endif
+/* Define like PROTOTYPES; this can be used by system headers. */
+#undef __PROTOTYPES
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
diff --git a/libsrc/JDBCDriverType4/Makefile.am b/libsrc/JDBCDriverType4/Makefile.am
index 30cacf0..6239b2d 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/Makefile.in b/libsrc/JDBCDriverType4/Makefile.in
index 60f752f..e1ada70 100644
--- a/libsrc/JDBCDriverType4/Makefile.in
+++ b/libsrc/JDBCDriverType4/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -81,38 +78,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -200,7 +169,6 @@ 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@
@@ -284,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -305,7 +272,6 @@ 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@
@@ -347,14 +313,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -372,7 +338,6 @@ $(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
@@ -387,7 +352,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -404,7 +369,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -412,7 +377,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -438,16 +403,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -455,14 +420,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -474,43 +439,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -531,44 +492,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -598,7 +544,6 @@ clean-generic:
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"
@@ -618,8 +563,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -628,28 +571,18 @@ install-data-am: install-data-local
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -670,8 +603,8 @@ ps-am:
uninstall-am: uninstall-local
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -762,7 +695,6 @@ clean-local:
-rm -f testsuite*.jar
-rm -rf Documents/*
-rm -rf doc
-
# 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/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java b/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java
index 5f81ef6..19c473c 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* Implementation of the BaseMessage class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/MD5.java b/libsrc/JDBCDriverType4/openlink/util/MD5.java
index f24ce26..47f8796 100644
--- a/libsrc/JDBCDriverType4/openlink/util/MD5.java
+++ b/libsrc/JDBCDriverType4/openlink/util/MD5.java
@@ -86,7 +86,7 @@ class MD5State {
/**
* Implementation of RSA's MD5 hash generator
*
- * @version $Revision: 1.1.1.1.2.1 $
+ * @version $Revision$
* @author Santeri Paavolainen <sjpaavol at cc.helsinki.fi>
*/
diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java
index 94b0785..e42eb14 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* Implementation of the JDBC Blob class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java
index 5be8524..46b7c1f 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* Implementation of the JDBC Clob class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java
index 34e5d0b..77cb1e7 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.2 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* Implementation of the JDBC Clob class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java b/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java
index 1e2b069..d38d2fc 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* Implementation of the OPLMessage_x class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/Vector.java b/libsrc/JDBCDriverType4/openlink/util/Vector.java
index 5e2d1d0..314fc22 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java
index 10ef159..ccacc23 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java
index 7f86a7d..692300a 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java
index 9832c73..2e37002 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/messages_u.java b/libsrc/JDBCDriverType4/openlink/util/messages_u.java
index 9a71292..89dfdee 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.1 2010/02/02 23:03:58 source Exp $
+ * $Id$
*
* Error messages
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/test.bat b/libsrc/JDBCDriverType4/test.bat
index 26dd435..381fce3 100644
--- a/libsrc/JDBCDriverType4/test.bat
+++ b/libsrc/JDBCDriverType4/test.bat
@@ -1,10 +1,10 @@
rem
-rem $Id: test.bat,v 1.2.2.1 2009/07/01 10:30:28 source Exp $
+rem $Id$
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2009 OpenLink Software
+rem Copyright (C) 1998-2012 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 684a5ad..cf61815 100755
--- a/libsrc/JDBCDriverType4/test.sh
+++ b/libsrc/JDBCDriverType4/test.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test.sh,v 1.2.2.2 2009/07/14 20:15:00 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/test2.bat b/libsrc/JDBCDriverType4/test2.bat
index f188bc7..7ab8030 100644
--- a/libsrc/JDBCDriverType4/test2.bat
+++ b/libsrc/JDBCDriverType4/test2.bat
@@ -1,10 +1,10 @@
rem
-rem $Id: test2.bat,v 1.2.2.1 2009/07/01 10:30:28 source Exp $
+rem $Id$
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2009 OpenLink Software
+rem Copyright (C) 1998-2012 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 9632b17..627f10d 100755
--- a/libsrc/JDBCDriverType4/test2.sh
+++ b/libsrc/JDBCDriverType4/test2.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test2.sh,v 1.2.2.2 2009/07/14 20:15:00 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/test3.bat b/libsrc/JDBCDriverType4/test3.bat
index c44e7fc..08c2237 100644
--- a/libsrc/JDBCDriverType4/test3.bat
+++ b/libsrc/JDBCDriverType4/test3.bat
@@ -1,10 +1,10 @@
rem
-rem $Id: test3.bat,v 1.2.2.1 2009/07/01 10:30:29 source Exp $
+rem $Id$
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2009 OpenLink Software
+rem Copyright (C) 1998-2012 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 c564f9a..dd600b3 100755
--- a/libsrc/JDBCDriverType4/test3.sh
+++ b/libsrc/JDBCDriverType4/test3.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test3.sh,v 1.2.2.3 2009/07/14 20:15:00 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/test4.bat b/libsrc/JDBCDriverType4/test4.bat
index b121e91..44ebf9e 100644
--- a/libsrc/JDBCDriverType4/test4.bat
+++ b/libsrc/JDBCDriverType4/test4.bat
@@ -1,10 +1,10 @@
rem
-rem $Id: test4.bat,v 1.2.2.1 2009/07/01 10:30:29 source Exp $
+rem $Id$
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2009 OpenLink Software
+rem Copyright (C) 1998-2012 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 86935c1..27a8707 100755
--- a/libsrc/JDBCDriverType4/test4.sh
+++ b/libsrc/JDBCDriverType4/test4.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test4.sh,v 1.2.2.2 2009/07/14 20:15:00 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am
index 02070f1..f0eb6b7 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.in b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.in
index 673a579..8915f5c 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.in
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -291,14 +285,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_2.0/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_2.0/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_2.0/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_2.0/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -316,7 +310,6 @@ $(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
@@ -346,17 +339,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -385,7 +374,6 @@ clean-generic:
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"
@@ -404,8 +392,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -414,28 +400,18 @@ install-data-am:
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
@@ -483,7 +459,6 @@ testsuite2.jar: *.java
clean-local:
-rm -rf testsuite
-
# 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/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java
index 86e3883..f964ed9 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java
index c7378ca..d429814 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java
index 6ce7452..553c03b 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java
index 849f99a..e1e2f35 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java
index 5032f8f..f42d01b 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java
index 8462d2f..34198cb 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java
index 92a641a..5fb4636 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java
index 385df1c..2b412d8 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java
index 7d2a47a..c5a279e 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java
index a5fcaa1..e6ba210 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java
index a849c40..49d11c3 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java
index ba137ae..3a05265 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java
index 3e971de..41d345b 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java
index 32c15c9..4965ec3 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java
index f0826da..8f368cd 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java
index aaf23ef..ee7f2b4 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java
index 8aec913..5f7cd4e 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java
index 2904d4e..3ad2fa7 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java
index 08f0232..15f708a 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java
index 801867b..46758ca 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java
index b952360..6db1df8 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql b/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql
index 2c024da..eef0579 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 2006/08/16 07:58:14 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java
index 12d3e5a..819290e 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am
index 8d70271..08e563e 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.in b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.in
index 458b523..d1c0fb7 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.in
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -290,14 +284,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_3.0/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_3.0/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_3.0/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_3.0/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -315,7 +309,6 @@ $(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
@@ -345,17 +338,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -384,7 +373,6 @@ clean-generic:
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"
@@ -403,8 +391,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -413,28 +399,18 @@ install-data-am:
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
@@ -482,7 +458,6 @@ testsuite3.jar: *.java
clean-local:
-rm -rf testsuite
-
# 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/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java
index 7a1ab78..e9adff5 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java
index 62809b3..15b9225 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java
index c7fdfac..40daca4 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java
index a3b520d..d733522 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java
index dfa792e..8546adb 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java
index 8b4b7c1..dc1f916 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java
index b599294..b7a3c94 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java
index abcdbb0..b290b0b 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java
index a947179..dbfc250 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java
index 7d952e7..2022587 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java
index 0e16991..19f2079 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java
index 541d501..295db68 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java
index f6aa245..d33f3fe 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java
index 1758720..8be79e7 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java
index 91d97a0..5d4ca91 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java
index f688ace..f6715e4 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java
index d4514fe..5187087 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java
index 93e20ee..c068407 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java
index 978da8a..f22946f 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java
index cc72151..d7cd150 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java
index 08ce511..b700992 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java
index 0c6179c..13ce3e6 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java
index 9b75ca5..c9db19a 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java
index 9be4f3a..abf6d06 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am
index 35ef4b4..f7fe139 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.in b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.in
index 1cfceb0..1e28511 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.in
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -290,14 +284,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_4.0/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_4.0/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_4.0/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/testsuite_4.0/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -315,7 +309,6 @@ $(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
@@ -345,17 +338,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -384,7 +373,6 @@ clean-generic:
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"
@@ -403,8 +391,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -413,28 +399,18 @@ install-data-am:
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
@@ -482,7 +458,6 @@ testsuite4.jar: *.java
clean-local:
-rm -rf testsuite
-
# 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/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java
index 06d7837..2a6c81c 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java
index b1be52d..2abd077 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java
index 8b84538..27930d2 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java
index b10ccb2..83a7d50 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java
index 4213f99..c8dbf37 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java
index 955d1b9..c8dd605 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java
index a0506c0..48bb38a 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java
index 93f6cbc..5e2fbdb 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java
index 878c2f3..387f36f 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java
index a2edd2d..ed00a98 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java
index 4ac7874..4efb659 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java
index 83d1561..1881fc2 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java
index 8eabf0e..025e95b 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java
index 9430f2c..6b31425 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java
index 6fae219..b221739 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java
index 94e68e9..71f4e99 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java
index e35cbf0..448a7de 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java
index a5d5cbe..68d3903 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java
index 1399c17..6a7bc48 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java
index 7ded213..a5cf567 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java
index 658e975..aa0f56f 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java
index 6232d90..b8cda99 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java
index 515e016..1bda35d 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java
index 148bd34..606bfc0 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-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/Makefile.am b/libsrc/JDBCDriverType4/virtuoso/Makefile.am
index b7bd501..56a8462 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/Makefile.in b/libsrc/JDBCDriverType4/virtuoso/Makefile.in
index 55096fc..4a2fffe 100644
--- a/libsrc/JDBCDriverType4/virtuoso/Makefile.in
+++ b/libsrc/JDBCDriverType4/virtuoso/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -81,38 +78,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -200,7 +169,6 @@ 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@
@@ -284,7 +252,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -305,7 +272,6 @@ 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@
@@ -328,14 +294,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/virtuoso/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/virtuoso/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/virtuoso/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/virtuoso/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -353,7 +319,6 @@ $(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
@@ -368,7 +333,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -385,7 +350,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -393,7 +358,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -419,16 +384,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -436,14 +401,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -455,43 +420,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -512,44 +473,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -579,7 +525,6 @@ clean-generic:
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"
@@ -598,8 +543,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -608,28 +551,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -650,8 +583,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -667,7 +600,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
-
# 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/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java
index 6acab22..c76baf4 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java
index d3912e0..218c07e 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java
index 4c7142a..63d1fff 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java
index da56eae..9fad31d 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java
index 1486eb4..9c85a80 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java b/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java
index 6d6f818..7a99444 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java
index 8534b42..c81b726 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java
index f8738e7..e73b0d8 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.2 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java
index d660b70..211f6f5 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.2 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java
index 4c741d2..0c71a70 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.8 2010/01/15 12:22:15 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java
index 6b8ea88..b48e038 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.32 2011/08/21 12:44:02 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -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 = 59;
+ protected static final int minor = 61;
// Some variables
private String host = "localhost";
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java
index ef8be59..cb1816f 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am
index 4c1f724..29c61b5 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-2009 OpenLink Software
+# 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
@@ -404,9 +404,9 @@ outssl4/virtuoso/javax/%.java: ../../virtuoso/javax/%.java
# Cleanup
###########################################
clean-local:
- -$(RM) -f *.class version.h
- -$(RM) -rf outstd outssl
- -$(RM) -rf outstd1 outssl1
- -$(RM) -rf outstd2 outssl2
- -$(RM) -rf outstd3 outssl3
- -$(RM) -rf outstd4 outssl4
+ rm -f *.class version.h
+ rm -rf outstd outssl
+ rm -rf outstd1 outssl1
+ rm -rf outstd2 outssl2
+ rm -rf outstd3 outssl3
+ rm -rf outstd4 outssl4
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.in b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.in
index 4e5f6cb..f3fbd49 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.in
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -41,9 +40,8 @@
###########################################
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -73,7 +71,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,7 +161,6 @@ 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@
@@ -248,7 +244,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -269,7 +264,6 @@ 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@
@@ -451,14 +445,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -476,7 +470,6 @@ $(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
@@ -506,17 +499,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -544,7 +533,6 @@ clean-generic:
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"
@@ -563,8 +551,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -573,28 +559,18 @@ install-data-am:
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
@@ -818,13 +794,12 @@ outssl4/virtuoso/javax/%.java: ../../virtuoso/javax/%.java
# Cleanup
###########################################
clean-local:
- -$(RM) -f *.class version.h
- -$(RM) -rf outstd outssl
- -$(RM) -rf outstd1 outssl1
- -$(RM) -rf outstd2 outssl2
- -$(RM) -rf outstd3 outssl3
- -$(RM) -rf outstd4 outssl4
-
+ rm -f *.class version.h
+ rm -rf outstd outssl
+ rm -rf outstd1 outssl1
+ rm -rf outstd2 outssl2
+ rm -rf outstd3 outssl3
+ rm -rf outstd4 outssl4
# 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/libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java
index ca818eb..c4ee0bf 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.4 2011/08/21 12:44:02 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java
index 56f7b26..1eb416c 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.3 2011/08/17 17:46:30 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java
index b4da882..a8b3b3e 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.3 2009/09/18 16:12:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java
index 5058d7e..15b1e55 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java
index c5adcc1..297b3e6 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java
index de2c9ce..b47539d 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.2 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java
index af5b15a..344f4dc 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java
index 4008a67..9604417 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.4 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java
index f1a7fdf..cbb0905 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java
index 3a5eae1..3117070 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java
index ccc81b6..50986c5 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java
index 28ffd25..bee12a4 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.2 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java
index 4ce0ba9..89e4512 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.13 2011/10/28 21:37:06 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java
index 9ddc283..244c94d 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.6 2011/08/18 09:26:38 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java
index 48e1585..17254fc 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.2 2009/08/21 11:36:14 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java
index 1589c92..46a72dc 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.2 2009/08/21 11:36:14 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java
index 88813fd..6880a0a 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.4 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java
index 25646d0..13497c5 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java
index a95edea..b691fb3 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.3 2011/03/23 12:01:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java
index 14d4364..8e740c5 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java
index 87f6af1..d1a4ae2 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java
index 923e1a9..c452054 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java
index a6bff7f..0e9d5f5 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.2 2010/05/29 12:22:05 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java
index 5a3c981..19779dd 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java
index 86eb87f..cbdda24 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.3 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java
index 38e8e61..4c6f146 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.1 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java
index bfa6eb9..c901948 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.2 2009/08/20 20:13:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java
index 754237b..e42fc8d 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.7 2011/02/18 10:25:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java
index e5c8848..2a2cb7e 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.7 2011/03/23 12:01:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -340,7 +340,8 @@ 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_CLOSE);
+ args[1] = new Long(VirtuosoTypes.STAT_DROP);
// 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 054059f..f99bf8c 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.4 2010/07/09 14:22:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java
index 9eb369e..0bb13df 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.8 2010/11/22 11:27:19 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java
index 6ccdcc8..0883831 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.3 2009/08/21 11:36:14 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java
index 73439d7..450ce5b 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.3 2009/08/21 11:36:14 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -740,6 +740,20 @@ 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 dc1fd40..0c3ef5c 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.5 2010/11/22 11:27:19 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java
index aaf3694..eb3614b 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.1 2009/08/20 20:13:29 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java
index b591634..c7e56b9 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.4 2011/03/23 12:01:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java
index a242a14..77d9524 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.2 2009/09/17 14:26:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java
index 8515992..3f76238 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.2 2009/08/21 11:36:14 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java
index 0bc4a50..21be677 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.8 2010/03/04 12:18:04 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java
index 2d86c03..d3e9097 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.3 2009/09/17 14:26:37 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java
index f4bcebd..6668f3c 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.3 2009/11/05 19:49:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java
index 0b5b30e..aedab1e 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.5 2010/03/26 19:48:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java b/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java
index 85ffcd2..092a890 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.1 2009/08/20 20:13:29 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java b/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java
index 02dda3b..502c27f 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.1 2009/08/20 20:13:29 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Makefile.am b/libsrc/Makefile.am
index 3f61ce4..7f264ab 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/Makefile.in b/libsrc/Makefile.in
index ca8ebb9..f39a560 100644
--- a/libsrc/Makefile.in
+++ b/libsrc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -71,7 +69,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -84,38 +81,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
HEADERS = $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_LDFLAGS = @AM_LDFLAGS@
@@ -203,7 +172,6 @@ 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@
@@ -287,7 +255,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -308,7 +275,6 @@ 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@
@@ -328,14 +294,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -353,7 +319,6 @@ $(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
@@ -368,7 +333,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -385,7 +350,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -393,7 +358,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
+ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -419,16 +384,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -436,14 +401,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -455,43 +420,39 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -512,44 +473,29 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
- am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -579,7 +525,6 @@ clean-generic:
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"
@@ -598,8 +543,6 @@ dvi-am:
html: html-recursive
-html-am:
-
info: info-recursive
info-am:
@@ -608,28 +551,18 @@ install-data-am:
install-dvi: install-dvi-recursive
-install-dvi-am:
-
install-exec-am:
install-html: install-html-recursive
-install-html-am:
-
install-info: install-info-recursive
-install-info-am:
-
install-man:
install-pdf: install-pdf-recursive
-install-pdf-am:
-
install-ps: install-ps-recursive
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -650,8 +583,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -667,7 +600,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
-
# 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/libsrc/Thread/Dkthread.h b/libsrc/Thread/Dkthread.h
index 3b4c311..7a19141 100644
--- a/libsrc/Thread/Dkthread.h
+++ b/libsrc/Thread/Dkthread.h
@@ -1,14 +1,14 @@
/*
* Dkthread.h
*
- * $Id: Dkthread.h,v 1.7 2008/04/02 10:13:42 source Exp $
+ * $Id$
*
* Threads, Mutexes and Semaphores
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/Makefile.am b/libsrc/Thread/Makefile.am
index a08cb56..f55d2f9 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/Thread/Makefile.in b/libsrc/Thread/Makefile.in
index b94aeb8..153558b 100644
--- a/libsrc/Thread/Makefile.in
+++ b/libsrc/Thread/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libthrp_la_LIBADD =
am_libthrp_la_OBJECTS = libthrp_la-thread_queue.lo \
@@ -103,10 +100,9 @@ libthrs_la_OBJECTS = $(am_libthrs_la_OBJECTS)
libthrs_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libthrs_la_CFLAGS) \
$(CFLAGS) $(libthrs_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -211,7 +207,6 @@ 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@
@@ -295,7 +290,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -316,7 +310,6 @@ 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@
@@ -382,14 +375,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Thread/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/Thread/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Thread/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/Thread/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -407,7 +400,6 @@ $(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):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -451,150 +443,150 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libthrp_la-thread_queue.lo: thread_queue.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-thread_queue.lo -MD -MP -MF $(DEPDIR)/libthrp_la-thread_queue.Tpo -c -o libthrp_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_la-thread_queue.Tpo $(DEPDIR)/libthrp_la-thread_queue.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-thread_queue.lo -MD -MP -MF $(DEPDIR)/libthrp_la-thread_queue.Tpo -c -o libthrp_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_la-thread_queue.Tpo $(DEPDIR)/libthrp_la-thread_queue.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_queue.c' object='libthrp_la-thread_queue.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
libthrp_la-thread_attr.lo: thread_attr.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-thread_attr.lo -MD -MP -MF $(DEPDIR)/libthrp_la-thread_attr.Tpo -c -o libthrp_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_la-thread_attr.Tpo $(DEPDIR)/libthrp_la-thread_attr.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-thread_attr.lo -MD -MP -MF $(DEPDIR)/libthrp_la-thread_attr.Tpo -c -o libthrp_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_la-thread_attr.Tpo $(DEPDIR)/libthrp_la-thread_attr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_attr.c' object='libthrp_la-thread_attr.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
libthrp_la-timer_queue.lo: timer_queue.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-timer_queue.lo -MD -MP -MF $(DEPDIR)/libthrp_la-timer_queue.Tpo -c -o libthrp_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_la-timer_queue.Tpo $(DEPDIR)/libthrp_la-timer_queue.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-timer_queue.lo -MD -MP -MF $(DEPDIR)/libthrp_la-timer_queue.Tpo -c -o libthrp_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_la-timer_queue.Tpo $(DEPDIR)/libthrp_la-timer_queue.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='timer_queue.c' object='libthrp_la-timer_queue.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
libthrp_la-io_unix.lo: io_unix.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-io_unix.lo -MD -MP -MF $(DEPDIR)/libthrp_la-io_unix.Tpo -c -o libthrp_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_la-io_unix.Tpo $(DEPDIR)/libthrp_la-io_unix.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-io_unix.lo -MD -MP -MF $(DEPDIR)/libthrp_la-io_unix.Tpo -c -o libthrp_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_la-io_unix.Tpo $(DEPDIR)/libthrp_la-io_unix.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='io_unix.c' object='libthrp_la-io_unix.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
libthrp_la-thread_rwlock.lo: thread_rwlock.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-thread_rwlock.lo -MD -MP -MF $(DEPDIR)/libthrp_la-thread_rwlock.Tpo -c -o libthrp_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_la-thread_rwlock.Tpo $(DEPDIR)/libthrp_la-thread_rwlock.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-thread_rwlock.lo -MD -MP -MF $(DEPDIR)/libthrp_la-thread_rwlock.Tpo -c -o libthrp_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_la-thread_rwlock.Tpo $(DEPDIR)/libthrp_la-thread_rwlock.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_rwlock.c' object='libthrp_la-thread_rwlock.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
libthrp_la-sched_pthread.lo: sched_pthread.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-sched_pthread.lo -MD -MP -MF $(DEPDIR)/libthrp_la-sched_pthread.Tpo -c -o libthrp_la-sched_pthread.lo `test -f 'sched_pthread.c' || echo '$(srcdir)/'`sched_pthread.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_la-sched_pthread.Tpo $(DEPDIR)/libthrp_la-sched_pthread.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -MT libthrp_la-sched_pthread.lo -MD -MP -MF $(DEPDIR)/libthrp_la-sched_pthread.Tpo -c -o libthrp_la-sched_pthread.lo `test -f 'sched_pthread.c' || echo '$(srcdir)/'`sched_pthread.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_la-sched_pthread.Tpo $(DEPDIR)/libthrp_la-sched_pthread.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sched_pthread.c' object='libthrp_la-sched_pthread.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-sched_pthread.lo `test -f 'sched_pthread.c' || echo '$(srcdir)/'`sched_pthread.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_la_CFLAGS) $(CFLAGS) -c -o libthrp_la-sched_pthread.lo `test -f 'sched_pthread.c' || echo '$(srcdir)/'`sched_pthread.c
libthrp_gc_la-thread_queue.lo: thread_queue.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-thread_queue.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-thread_queue.Tpo -c -o libthrp_gc_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_gc_la-thread_queue.Tpo $(DEPDIR)/libthrp_gc_la-thread_queue.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-thread_queue.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-thread_queue.Tpo -c -o libthrp_gc_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_gc_la-thread_queue.Tpo $(DEPDIR)/libthrp_gc_la-thread_queue.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_queue.c' object='libthrp_gc_la-thread_queue.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
libthrp_gc_la-thread_attr.lo: thread_attr.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-thread_attr.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-thread_attr.Tpo -c -o libthrp_gc_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_gc_la-thread_attr.Tpo $(DEPDIR)/libthrp_gc_la-thread_attr.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-thread_attr.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-thread_attr.Tpo -c -o libthrp_gc_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_gc_la-thread_attr.Tpo $(DEPDIR)/libthrp_gc_la-thread_attr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_attr.c' object='libthrp_gc_la-thread_attr.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
libthrp_gc_la-timer_queue.lo: timer_queue.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-timer_queue.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-timer_queue.Tpo -c -o libthrp_gc_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_gc_la-timer_queue.Tpo $(DEPDIR)/libthrp_gc_la-timer_queue.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-timer_queue.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-timer_queue.Tpo -c -o libthrp_gc_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_gc_la-timer_queue.Tpo $(DEPDIR)/libthrp_gc_la-timer_queue.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='timer_queue.c' object='libthrp_gc_la-timer_queue.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
libthrp_gc_la-io_unix.lo: io_unix.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-io_unix.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-io_unix.Tpo -c -o libthrp_gc_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_gc_la-io_unix.Tpo $(DEPDIR)/libthrp_gc_la-io_unix.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-io_unix.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-io_unix.Tpo -c -o libthrp_gc_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_gc_la-io_unix.Tpo $(DEPDIR)/libthrp_gc_la-io_unix.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='io_unix.c' object='libthrp_gc_la-io_unix.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
libthrp_gc_la-thread_rwlock.lo: thread_rwlock.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-thread_rwlock.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-thread_rwlock.Tpo -c -o libthrp_gc_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_gc_la-thread_rwlock.Tpo $(DEPDIR)/libthrp_gc_la-thread_rwlock.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-thread_rwlock.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-thread_rwlock.Tpo -c -o libthrp_gc_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_gc_la-thread_rwlock.Tpo $(DEPDIR)/libthrp_gc_la-thread_rwlock.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_rwlock.c' object='libthrp_gc_la-thread_rwlock.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
libthrp_gc_la-sched_pthread_gc.lo: sched_pthread_gc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-sched_pthread_gc.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-sched_pthread_gc.Tpo -c -o libthrp_gc_la-sched_pthread_gc.lo `test -f 'sched_pthread_gc.c' || echo '$(srcdir)/'`sched_pthread_gc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrp_gc_la-sched_pthread_gc.Tpo $(DEPDIR)/libthrp_gc_la-sched_pthread_gc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -MT libthrp_gc_la-sched_pthread_gc.lo -MD -MP -MF $(DEPDIR)/libthrp_gc_la-sched_pthread_gc.Tpo -c -o libthrp_gc_la-sched_pthread_gc.lo `test -f 'sched_pthread_gc.c' || echo '$(srcdir)/'`sched_pthread_gc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrp_gc_la-sched_pthread_gc.Tpo $(DEPDIR)/libthrp_gc_la-sched_pthread_gc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sched_pthread_gc.c' object='libthrp_gc_la-sched_pthread_gc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-sched_pthread_gc.lo `test -f 'sched_pthread_gc.c' || echo '$(srcdir)/'`sched_pthread_gc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrp_gc_la_CFLAGS) $(CFLAGS) -c -o libthrp_gc_la-sched_pthread_gc.lo `test -f 'sched_pthread_gc.c' || echo '$(srcdir)/'`sched_pthread_gc.c
libthrs_la-thread_queue.lo: thread_queue.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-thread_queue.lo -MD -MP -MF $(DEPDIR)/libthrs_la-thread_queue.Tpo -c -o libthrs_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrs_la-thread_queue.Tpo $(DEPDIR)/libthrs_la-thread_queue.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-thread_queue.lo -MD -MP -MF $(DEPDIR)/libthrs_la-thread_queue.Tpo -c -o libthrs_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrs_la-thread_queue.Tpo $(DEPDIR)/libthrs_la-thread_queue.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_queue.c' object='libthrs_la-thread_queue.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-thread_queue.lo `test -f 'thread_queue.c' || echo '$(srcdir)/'`thread_queue.c
libthrs_la-thread_attr.lo: thread_attr.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-thread_attr.lo -MD -MP -MF $(DEPDIR)/libthrs_la-thread_attr.Tpo -c -o libthrs_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrs_la-thread_attr.Tpo $(DEPDIR)/libthrs_la-thread_attr.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-thread_attr.lo -MD -MP -MF $(DEPDIR)/libthrs_la-thread_attr.Tpo -c -o libthrs_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrs_la-thread_attr.Tpo $(DEPDIR)/libthrs_la-thread_attr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_attr.c' object='libthrs_la-thread_attr.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-thread_attr.lo `test -f 'thread_attr.c' || echo '$(srcdir)/'`thread_attr.c
libthrs_la-timer_queue.lo: timer_queue.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-timer_queue.lo -MD -MP -MF $(DEPDIR)/libthrs_la-timer_queue.Tpo -c -o libthrs_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrs_la-timer_queue.Tpo $(DEPDIR)/libthrs_la-timer_queue.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-timer_queue.lo -MD -MP -MF $(DEPDIR)/libthrs_la-timer_queue.Tpo -c -o libthrs_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrs_la-timer_queue.Tpo $(DEPDIR)/libthrs_la-timer_queue.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='timer_queue.c' object='libthrs_la-timer_queue.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-timer_queue.lo `test -f 'timer_queue.c' || echo '$(srcdir)/'`timer_queue.c
libthrs_la-io_unix.lo: io_unix.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-io_unix.lo -MD -MP -MF $(DEPDIR)/libthrs_la-io_unix.Tpo -c -o libthrs_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrs_la-io_unix.Tpo $(DEPDIR)/libthrs_la-io_unix.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-io_unix.lo -MD -MP -MF $(DEPDIR)/libthrs_la-io_unix.Tpo -c -o libthrs_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrs_la-io_unix.Tpo $(DEPDIR)/libthrs_la-io_unix.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='io_unix.c' object='libthrs_la-io_unix.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-io_unix.lo `test -f 'io_unix.c' || echo '$(srcdir)/'`io_unix.c
libthrs_la-thread_rwlock.lo: thread_rwlock.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-thread_rwlock.lo -MD -MP -MF $(DEPDIR)/libthrs_la-thread_rwlock.Tpo -c -o libthrs_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrs_la-thread_rwlock.Tpo $(DEPDIR)/libthrs_la-thread_rwlock.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-thread_rwlock.lo -MD -MP -MF $(DEPDIR)/libthrs_la-thread_rwlock.Tpo -c -o libthrs_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrs_la-thread_rwlock.Tpo $(DEPDIR)/libthrs_la-thread_rwlock.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread_rwlock.c' object='libthrs_la-thread_rwlock.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-thread_rwlock.lo `test -f 'thread_rwlock.c' || echo '$(srcdir)/'`thread_rwlock.c
libthrs_la-sched_single.lo: sched_single.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-sched_single.lo -MD -MP -MF $(DEPDIR)/libthrs_la-sched_single.Tpo -c -o libthrs_la-sched_single.lo `test -f 'sched_single.c' || echo '$(srcdir)/'`sched_single.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libthrs_la-sched_single.Tpo $(DEPDIR)/libthrs_la-sched_single.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -MT libthrs_la-sched_single.lo -MD -MP -MF $(DEPDIR)/libthrs_la-sched_single.Tpo -c -o libthrs_la-sched_single.lo `test -f 'sched_single.c' || echo '$(srcdir)/'`sched_single.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libthrs_la-sched_single.Tpo $(DEPDIR)/libthrs_la-sched_single.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sched_single.c' object='libthrs_la-sched_single.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-sched_single.lo `test -f 'sched_single.c' || echo '$(srcdir)/'`sched_single.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libthrs_la_CFLAGS) $(CFLAGS) -c -o libthrs_la-sched_single.lo `test -f 'sched_single.c' || echo '$(srcdir)/'`sched_single.c
mostlyclean-libtool:
-rm -f *.lo
@@ -607,49 +599,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -670,17 +658,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -708,7 +692,6 @@ clean-generic:
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"
@@ -730,8 +713,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -740,28 +721,18 @@ install-data-am:
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
@@ -799,7 +770,6 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
-
# 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/libsrc/Thread/fiber1_generic.c b/libsrc/Thread/fiber1_generic.c
index ff02eae..12ee425 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 2008/07/11 11:44:32 source Exp $
+ * $Id$
*
* _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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/fiber1_win32.c b/libsrc/Thread/fiber1_win32.c
index f27b1c2..c1242ec 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/fiber2_generic.c b/libsrc/Thread/fiber2_generic.c
index 5c76299..f3ae738 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* _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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/fiber_unix.c b/libsrc/Thread/fiber_unix.c
index 71b6e6a..d06a549 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Fiber Event Loop (Unix implementation)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/fiber_win32.c b/libsrc/Thread/fiber_win32.c
index 59b3d0f..9250020 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Fiber Event Loop (Win32 implementation)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/io_unix.c b/libsrc/Thread/io_unix.c
index d3a5eb4..5441c8f 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Unix specific I/O for fibers
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/mtest.c b/libsrc/Thread/mtest.c
index c627d02..7ea994b 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Fiber test program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/mtest1.c b/libsrc/Thread/mtest1.c
index e4f0caf..c5f12ba 100644
--- a/libsrc/Thread/mtest1.c
+++ b/libsrc/Thread/mtest1.c
@@ -1,14 +1,14 @@
/*
* mtest1.c
*
- * $Id: mtest1.c,v 1.2 2009/03/19 10:12:21 source Exp $
+ * $Id$
*
* Fiber test program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/mtest2.c b/libsrc/Thread/mtest2.c
index c9b4d34..a6e0549 100644
--- a/libsrc/Thread/mtest2.c
+++ b/libsrc/Thread/mtest2.c
@@ -1,14 +1,14 @@
/*
* mtest1.c
*
- * $Id: mtest2.c,v 1.2 2009/03/19 10:12:21 source Exp $
+ * $Id$
*
* Fiber test program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/sched_fiber.c b/libsrc/Thread/sched_fiber.c
index 6cf88ef..a1b85f9 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 2008/01/18 14:03:32 source Exp $
+ * $Id$
*
* Simulated threads, using fibers
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/sched_pthread.c b/libsrc/Thread/sched_pthread.c
index 84c4260..f65e393 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.4 2011/10/13 18:34:19 source Exp $
+ * $Id$
*
* Scheduler for pthreads
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -76,7 +76,7 @@ _pthread_call_failed (const char *file, int line, int error)
{
char msgbuf[200];
- snprintf (msgbuf, sizeof (msgbuf), "pthread operation failed (%d)", error);
+ snprintf (msgbuf, sizeof (msgbuf), "pthread operation failed (%d) %s", error, strerror (error));
#ifdef MTX_DEBUG
gpf_notice (file, line, msgbuf);
#else
@@ -883,6 +883,12 @@ 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_n_signalled = 0;
+ sem->sem_last_signalled = 0;
+#endif
thread_queue_init (&sem->sem_waiting);
return sem;
@@ -898,6 +904,9 @@ 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));
}
@@ -915,6 +924,7 @@ 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;
@@ -923,6 +933,22 @@ 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_n_signalled == sem->sem_last_signalled);
+ sem->sem_n_signalled --; /* this one is signalled */
+ sem->sem_last_signalled = sem->sem_n_signalled;
+ thr->thr_status = RUNNING;
+ thread_queue_remove (&sem->sem_waiting, thr);
+ if (sem->sem_n_signalled < 0) GPF_T1 ("The semaphore counter went wrong");
+#endif
}
pthread_mutex_unlock ((pthread_mutex_t*) sem->sem_handle);
@@ -988,6 +1014,7 @@ semaphore_leave (semaphore_t *sem)
sem->sem_entry_count++;
else
{
+#ifndef SEM_NO_ORDER
thr = thread_queue_from (&sem->sem_waiting);
if (thr)
{
@@ -998,6 +1025,16 @@ semaphore_leave (semaphore_t *sem)
}
else
sem->sem_entry_count++;
+#else
+ if (sem->sem_waiting.thq_count > sem->sem_n_signalled) /* we have a more waiting threads than already signalled */
+ {
+ _thread_num_wait--;
+ sem->sem_n_signalled ++; /* one thread will be released */
+ 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);
@@ -1425,6 +1462,7 @@ mutex_stat ()
#else
printf ("%s %p E: %ld W %ld wclk %ld \n", mtx->mtx_name ? mtx->mtx_name : "<?>", mtx,
mtx->mtx_enters, mtx->mtx_waits, mtx->mtx_wait_clocks);
+ mtx->mtx_enters = mtx->mtx_waits = mtx->mtx_wait_clocks = 0;;
#endif
}
END_DO_SET();
diff --git a/libsrc/Thread/sched_pthread_gc.c b/libsrc/Thread/sched_pthread_gc.c
index b04bb52..1580c0f 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Scheduler for pthreads
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/sched_single.c b/libsrc/Thread/sched_single.c
index cdb8c28..600c424 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 2008/07/11 11:44:32 source Exp $
+ * $Id$
*
* Stubs for NO_THREAD implementation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/sched_winthread.c b/libsrc/Thread/sched_winthread.c
index b22a32e..4573b41 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 2007/02/27 13:23:35 source Exp $
+ * $Id$
*
* Scheduler for Win32 threads
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -831,6 +831,7 @@ 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;
@@ -840,30 +841,43 @@ mutex_enter (dk_mutex_t *mtx)
int
-mutex_try_enter (dk_mutex_t *self)
+mutex_try_enter (dk_mutex_t *mtx)
{
#ifdef MTX_DEBUG
thread_t* thr = thread_current();
#endif
- if (self->mtx_type == MUTEX_TYPE_LONG)
+ if (mtx->mtx_type == MUTEX_TYPE_LONG)
{
- if (WaitForSingleObject (self->mtx_handle, 0) == WAIT_TIMEOUT)
+ if (WaitForSingleObject (mtx->mtx_handle, 0) == WAIT_TIMEOUT)
+ return 0;
+ }
+ else
+ {
+ if (!TryEnterCriticalSection (mtx->mtx_handle))
return 0;
}
- EnterCriticalSection(self->mtx_handle);
#ifdef MTX_DEBUG
- self->mtx_owner = thr;
+ assert (mtx->mtx_owner == NULL);
+ mtx->mtx_owner = thr;
+ mtx->mtx_entry_file = __FILE__;
+ mtx->mtx_entry_line = __LINE__;
#endif
return 1;
}
-void
-mutex_leave (dk_mutex_t *self)
+#ifdef MTX_DEBUG
+void mutex_leave_dbg (int line, char * file, dk_mutex_t *self)
+#else
+void mutex_leave (dk_mutex_t *self)
+#endif
{
#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);
@@ -936,4 +950,10 @@ 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 9723fe2..a1ff97e 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Scheduler for pthreads
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/thread_attr.c b/libsrc/Thread/thread_attr.c
index 17745cf..2829f01 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Manages thread local storage attributes
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/thread_int.h b/libsrc/Thread/thread_int.h
index aa8b751..c29d108 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.3 2011/10/13 18:34:19 source Exp $
+ * $Id$
*
* Thread internals
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -38,6 +38,13 @@
/*#include <Wi/statuslog.h>*/
#undef _THREAD_INT_HS
+#if defined (__APPLE__)
+#include <AvailabilityMacros.h>
+
+# if defined (MAC_OS_X_VERSION_10_7) && (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
@@ -178,6 +185,11 @@ struct semaphore_s
/* simulated threads */
int sem_entry_count;
thread_queue_t sem_waiting;
+#ifdef SEM_NO_ORDER
+ void * sem_cv; /* condition variable */
+ unsigned long sem_n_signalled;
+ unsigned long sem_last_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 eb291ed..c6c26c3 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Thread Queues
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/thread_rwlock.c b/libsrc/Thread/thread_rwlock.c
index 896e9ac..f6443f8 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Read-write locks implementation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/timer_queue.c b/libsrc/Thread/timer_queue.c
index 5fc579a..f1604f1 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Timers and Timer Queues
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/timer_queue.h b/libsrc/Thread/timer_queue.h
index d004996..d91f24e 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Timers and Timer Queues
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Thread/tvmac.h b/libsrc/Thread/tvmac.h
index 3419a8b..bfed31f 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Macros for time structure manipulation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Tidy/Makefile.am b/libsrc/Tidy/Makefile.am
index eb956b4..dee84a5 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-2010 OpenLink Software
+# 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
diff --git a/libsrc/Tidy/Makefile.in b/libsrc/Tidy/Makefile.in
index c2ade91..fe295cf 100644
--- a/libsrc/Tidy/Makefile.in
+++ b/libsrc/Tidy/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2010 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libtidy_la_LIBADD =
am_libtidy_la_OBJECTS = libtidy_la-attrs.lo libtidy_la-clean.lo \
@@ -84,10 +81,9 @@ libtidy_la_OBJECTS = $(am_libtidy_la_OBJECTS)
libtidy_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtidy_la_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -190,7 +186,6 @@ 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@
@@ -274,7 +269,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -295,7 +289,6 @@ 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@
@@ -331,14 +324,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Tidy/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/Tidy/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Tidy/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/Tidy/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -356,7 +349,6 @@ $(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):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -389,101 +381,101 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libtidy_la-attrs.lo: attrs.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-attrs.lo -MD -MP -MF $(DEPDIR)/libtidy_la-attrs.Tpo -c -o libtidy_la-attrs.lo `test -f 'attrs.c' || echo '$(srcdir)/'`attrs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-attrs.Tpo $(DEPDIR)/libtidy_la-attrs.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-attrs.lo -MD -MP -MF $(DEPDIR)/libtidy_la-attrs.Tpo -c -o libtidy_la-attrs.lo `test -f 'attrs.c' || echo '$(srcdir)/'`attrs.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-attrs.Tpo $(DEPDIR)/libtidy_la-attrs.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='attrs.c' object='libtidy_la-attrs.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-attrs.lo `test -f 'attrs.c' || echo '$(srcdir)/'`attrs.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-attrs.lo `test -f 'attrs.c' || echo '$(srcdir)/'`attrs.c
libtidy_la-clean.lo: clean.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-clean.lo -MD -MP -MF $(DEPDIR)/libtidy_la-clean.Tpo -c -o libtidy_la-clean.lo `test -f 'clean.c' || echo '$(srcdir)/'`clean.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-clean.Tpo $(DEPDIR)/libtidy_la-clean.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-clean.lo -MD -MP -MF $(DEPDIR)/libtidy_la-clean.Tpo -c -o libtidy_la-clean.lo `test -f 'clean.c' || echo '$(srcdir)/'`clean.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-clean.Tpo $(DEPDIR)/libtidy_la-clean.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clean.c' object='libtidy_la-clean.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-clean.lo `test -f 'clean.c' || echo '$(srcdir)/'`clean.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-clean.lo `test -f 'clean.c' || echo '$(srcdir)/'`clean.c
libtidy_la-config.lo: config.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-config.lo -MD -MP -MF $(DEPDIR)/libtidy_la-config.Tpo -c -o libtidy_la-config.lo `test -f 'config.c' || echo '$(srcdir)/'`config.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-config.Tpo $(DEPDIR)/libtidy_la-config.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-config.lo -MD -MP -MF $(DEPDIR)/libtidy_la-config.Tpo -c -o libtidy_la-config.lo `test -f 'config.c' || echo '$(srcdir)/'`config.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-config.Tpo $(DEPDIR)/libtidy_la-config.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='config.c' object='libtidy_la-config.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-config.lo `test -f 'config.c' || echo '$(srcdir)/'`config.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-config.lo `test -f 'config.c' || echo '$(srcdir)/'`config.c
libtidy_la-entities.lo: entities.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-entities.lo -MD -MP -MF $(DEPDIR)/libtidy_la-entities.Tpo -c -o libtidy_la-entities.lo `test -f 'entities.c' || echo '$(srcdir)/'`entities.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-entities.Tpo $(DEPDIR)/libtidy_la-entities.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-entities.lo -MD -MP -MF $(DEPDIR)/libtidy_la-entities.Tpo -c -o libtidy_la-entities.lo `test -f 'entities.c' || echo '$(srcdir)/'`entities.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-entities.Tpo $(DEPDIR)/libtidy_la-entities.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='entities.c' object='libtidy_la-entities.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-entities.lo `test -f 'entities.c' || echo '$(srcdir)/'`entities.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-entities.lo `test -f 'entities.c' || echo '$(srcdir)/'`entities.c
libtidy_la-istack.lo: istack.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-istack.lo -MD -MP -MF $(DEPDIR)/libtidy_la-istack.Tpo -c -o libtidy_la-istack.lo `test -f 'istack.c' || echo '$(srcdir)/'`istack.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-istack.Tpo $(DEPDIR)/libtidy_la-istack.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-istack.lo -MD -MP -MF $(DEPDIR)/libtidy_la-istack.Tpo -c -o libtidy_la-istack.lo `test -f 'istack.c' || echo '$(srcdir)/'`istack.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-istack.Tpo $(DEPDIR)/libtidy_la-istack.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='istack.c' object='libtidy_la-istack.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-istack.lo `test -f 'istack.c' || echo '$(srcdir)/'`istack.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-istack.lo `test -f 'istack.c' || echo '$(srcdir)/'`istack.c
libtidy_la-lexer.lo: lexer.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-lexer.lo -MD -MP -MF $(DEPDIR)/libtidy_la-lexer.Tpo -c -o libtidy_la-lexer.lo `test -f 'lexer.c' || echo '$(srcdir)/'`lexer.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-lexer.Tpo $(DEPDIR)/libtidy_la-lexer.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-lexer.lo -MD -MP -MF $(DEPDIR)/libtidy_la-lexer.Tpo -c -o libtidy_la-lexer.lo `test -f 'lexer.c' || echo '$(srcdir)/'`lexer.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-lexer.Tpo $(DEPDIR)/libtidy_la-lexer.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lexer.c' object='libtidy_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-lexer.lo `test -f 'lexer.c' || echo '$(srcdir)/'`lexer.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-lexer.lo `test -f 'lexer.c' || echo '$(srcdir)/'`lexer.c
libtidy_la-localize.lo: localize.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-localize.lo -MD -MP -MF $(DEPDIR)/libtidy_la-localize.Tpo -c -o libtidy_la-localize.lo `test -f 'localize.c' || echo '$(srcdir)/'`localize.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-localize.Tpo $(DEPDIR)/libtidy_la-localize.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-localize.lo -MD -MP -MF $(DEPDIR)/libtidy_la-localize.Tpo -c -o libtidy_la-localize.lo `test -f 'localize.c' || echo '$(srcdir)/'`localize.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-localize.Tpo $(DEPDIR)/libtidy_la-localize.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='localize.c' object='libtidy_la-localize.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-localize.lo `test -f 'localize.c' || echo '$(srcdir)/'`localize.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-localize.lo `test -f 'localize.c' || echo '$(srcdir)/'`localize.c
libtidy_la-parser.lo: parser.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-parser.lo -MD -MP -MF $(DEPDIR)/libtidy_la-parser.Tpo -c -o libtidy_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-parser.Tpo $(DEPDIR)/libtidy_la-parser.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-parser.lo -MD -MP -MF $(DEPDIR)/libtidy_la-parser.Tpo -c -o libtidy_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-parser.Tpo $(DEPDIR)/libtidy_la-parser.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parser.c' object='libtidy_la-parser.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
libtidy_la-pprint.lo: pprint.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-pprint.lo -MD -MP -MF $(DEPDIR)/libtidy_la-pprint.Tpo -c -o libtidy_la-pprint.lo `test -f 'pprint.c' || echo '$(srcdir)/'`pprint.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-pprint.Tpo $(DEPDIR)/libtidy_la-pprint.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-pprint.lo -MD -MP -MF $(DEPDIR)/libtidy_la-pprint.Tpo -c -o libtidy_la-pprint.lo `test -f 'pprint.c' || echo '$(srcdir)/'`pprint.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-pprint.Tpo $(DEPDIR)/libtidy_la-pprint.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pprint.c' object='libtidy_la-pprint.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-pprint.lo `test -f 'pprint.c' || echo '$(srcdir)/'`pprint.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-pprint.lo `test -f 'pprint.c' || echo '$(srcdir)/'`pprint.c
libtidy_la-tags.lo: tags.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-tags.lo -MD -MP -MF $(DEPDIR)/libtidy_la-tags.Tpo -c -o libtidy_la-tags.lo `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-tags.Tpo $(DEPDIR)/libtidy_la-tags.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-tags.lo -MD -MP -MF $(DEPDIR)/libtidy_la-tags.Tpo -c -o libtidy_la-tags.lo `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-tags.Tpo $(DEPDIR)/libtidy_la-tags.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tags.c' object='libtidy_la-tags.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-tags.lo `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-tags.lo `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
libtidy_la-tidy.lo: tidy.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-tidy.lo -MD -MP -MF $(DEPDIR)/libtidy_la-tidy.Tpo -c -o libtidy_la-tidy.lo `test -f 'tidy.c' || echo '$(srcdir)/'`tidy.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtidy_la-tidy.Tpo $(DEPDIR)/libtidy_la-tidy.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -MT libtidy_la-tidy.lo -MD -MP -MF $(DEPDIR)/libtidy_la-tidy.Tpo -c -o libtidy_la-tidy.lo `test -f 'tidy.c' || echo '$(srcdir)/'`tidy.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libtidy_la-tidy.Tpo $(DEPDIR)/libtidy_la-tidy.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tidy.c' object='libtidy_la-tidy.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-tidy.lo `test -f 'tidy.c' || echo '$(srcdir)/'`tidy.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtidy_la_CFLAGS) $(CFLAGS) -c -o libtidy_la-tidy.lo `test -f 'tidy.c' || echo '$(srcdir)/'`tidy.c
mostlyclean-libtool:
-rm -f *.lo
@@ -496,49 +488,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -559,17 +547,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -597,7 +581,6 @@ clean-generic:
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"
@@ -619,8 +602,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -629,28 +610,18 @@ install-data-am:
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
@@ -688,7 +659,6 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
-
# 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/libsrc/Tidy/attrs.c b/libsrc/Tidy/attrs.c
index ba1dfcf..8361609 100644
--- a/libsrc/Tidy/attrs.c
+++ b/libsrc/Tidy/attrs.c
@@ -1,5 +1,5 @@
/*
- * $Id: attrs.c,v 1.2.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* attrs.c -- recognize HTML attributes
*
diff --git a/libsrc/Tidy/clean.c b/libsrc/Tidy/clean.c
index 7a56e66..29c7036 100644
--- a/libsrc/Tidy/clean.c
+++ b/libsrc/Tidy/clean.c
@@ -1,5 +1,5 @@
/*
- * $Id: clean.c,v 1.2.2.2 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* clean.c -- clean up misuse of presentation markup
*
diff --git a/libsrc/Tidy/config.c b/libsrc/Tidy/config.c
index f6831e4..69de476 100644
--- a/libsrc/Tidy/config.c
+++ b/libsrc/Tidy/config.c
@@ -1,5 +1,5 @@
/*
- * $Id: config.c,v 1.2.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* config.c - read config file and manage config properties
*
diff --git a/libsrc/Tidy/entities.c b/libsrc/Tidy/entities.c
index 13d5688..e6e81c8 100644
--- a/libsrc/Tidy/entities.c
+++ b/libsrc/Tidy/entities.c
@@ -1,5 +1,5 @@
/*
- * $Id: entities.c,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* entities.c -- recognize HTML ISO entities
*
diff --git a/libsrc/Tidy/html.h b/libsrc/Tidy/html.h
index 9df7eb6..daa67d3 100644
--- a/libsrc/Tidy/html.h
+++ b/libsrc/Tidy/html.h
@@ -1,5 +1,5 @@
/*
- * $Id: html.h,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* html.h
*
diff --git a/libsrc/Tidy/istack.c b/libsrc/Tidy/istack.c
index 2b53602..d5bbfe9 100644
--- a/libsrc/Tidy/istack.c
+++ b/libsrc/Tidy/istack.c
@@ -1,5 +1,5 @@
/*
- * $Id: istack.c,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* ilstack.c - inline stack for compatibility with Mosaic
*
diff --git a/libsrc/Tidy/lexer.c b/libsrc/Tidy/lexer.c
index b3f8626..b95c2fe 100644
--- a/libsrc/Tidy/lexer.c
+++ b/libsrc/Tidy/lexer.c
@@ -1,5 +1,5 @@
/*
- * $Id: lexer.c,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* lexer.c - Lexer for html parser
*
@@ -191,7 +191,7 @@ Lexer *NewLexer(StreamIn *in)
Lexer *lexer;
lexer = (Lexer *)MemAlloc(sizeof(Lexer));
- ClearMemory (lexer, sizeof (Lexer *));
+ ClearMemory (lexer, sizeof (Lexer));
lexer->in = in;
lexer->lines = 1;
lexer->columns = 1;
@@ -483,7 +483,7 @@ Node *NewNode(void)
Node *node;
node = (Node *)MemAlloc(sizeof(Node));
- ClearMemory (node, sizeof (Node *));
+ ClearMemory (node, sizeof (Node));
node->type = TextNode;
return node;
}
diff --git a/libsrc/Tidy/localize.c b/libsrc/Tidy/localize.c
index 26b5ef4..32a68f5 100644
--- a/libsrc/Tidy/localize.c
+++ b/libsrc/Tidy/localize.c
@@ -1,5 +1,5 @@
/*
- * $Id: localize.c,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* localize.c
*
diff --git a/libsrc/Tidy/parser.c b/libsrc/Tidy/parser.c
index 1f88f37..7552928 100644
--- a/libsrc/Tidy/parser.c
+++ b/libsrc/Tidy/parser.c
@@ -1,5 +1,5 @@
/*
- * $Id: parser.c,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* parser.c - HTML Parser
*
diff --git a/libsrc/Tidy/platform.h b/libsrc/Tidy/platform.h
index 39eee74..a28fc8c 100644
--- a/libsrc/Tidy/platform.h
+++ b/libsrc/Tidy/platform.h
@@ -1,5 +1,5 @@
/*
- * $Id: platform.h,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* platform.h
*
diff --git a/libsrc/Tidy/pprint.c b/libsrc/Tidy/pprint.c
index bfa518f..051abd9 100644
--- a/libsrc/Tidy/pprint.c
+++ b/libsrc/Tidy/pprint.c
@@ -1,5 +1,5 @@
/*
- * $Id: pprint.c,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* pprint.c -- pretty print parse tree
*
diff --git a/libsrc/Tidy/tab2space.c b/libsrc/Tidy/tab2space.c
index 13055ba..5d333b8 100644
--- a/libsrc/Tidy/tab2space.c
+++ b/libsrc/Tidy/tab2space.c
@@ -1,5 +1,5 @@
/*
- * $Id: tab2space.c,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* tab2space.c
*
diff --git a/libsrc/Tidy/tags.c b/libsrc/Tidy/tags.c
index 1ab4aa6..660c6e5 100644
--- a/libsrc/Tidy/tags.c
+++ b/libsrc/Tidy/tags.c
@@ -1,5 +1,5 @@
/*
- * $Id: tags.c,v 1.1.1.1.2.1 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* tags.c -- recognize HTML tags
*
diff --git a/libsrc/Tidy/tidy.c b/libsrc/Tidy/tidy.c
index d8ee51a..7e3e101 100644
--- a/libsrc/Tidy/tidy.c
+++ b/libsrc/Tidy/tidy.c
@@ -1,5 +1,5 @@
/*
- * $Id: tidy.c,v 1.1.1.1.2.2 2010/01/25 23:14:14 source Exp $
+ * $Id$
*
* tidy.c - HTML parser and pretty printer
*
@@ -215,7 +215,7 @@ StreamIn *OpenInputBoxString(caddr_t html_input)
{
StreamIn *in;
in = (StreamIn *)MemAlloc(sizeof(StreamIn));
- ClearMemory(in, sizeof (StreamIn *));
+ ClearMemory(in, sizeof (StreamIn));
in->input.tio_data.lm_memblock = html_input;
in->input.tio_data.lm_length = box_length (html_input)-1;
in->input.tio_pos = 0;
diff --git a/libsrc/Wi/2pc.c b/libsrc/Wi/2pc.c
index 9967381..3f6e3ff 100644
--- a/libsrc/Wi/2pc.c
+++ b/libsrc/Wi/2pc.c
@@ -1,12 +1,12 @@
/*
* 2pc.c
*
- * $Id: 2pc.c,v 1.15.2.17 2010/10/05 09:39:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/2pc.h b/libsrc/Wi/2pc.h
index 4a07adf..f35a0ad 100644
--- a/libsrc/Wi/2pc.h
+++ b/libsrc/Wi/2pc.h
@@ -1,12 +1,12 @@
/*
* 2pc.h
*
- * $Id: 2pc.h,v 1.5.2.4 2010/03/04 16:39:40 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/2pc.sql b/libsrc/Wi/2pc.sql
index 53354f2..e59d906 100644
--- a/libsrc/Wi/2pc.sql
+++ b/libsrc/Wi/2pc.sql
@@ -1,10 +1,10 @@
--
--- $Id: 2pc.sql,v 1.3.2.2 2009/07/21 19:24:57 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/2pc_client.c b/libsrc/Wi/2pc_client.c
index 0a8a5ab..4bafbb7 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.1 2009/04/18 21:55:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/2pc_client.h b/libsrc/Wi/2pc_client.h
index 00ef622..eaa46fb 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.1 2009/04/18 21:55:09 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/CLI.h b/libsrc/Wi/CLI.h
index 7adb70a..2a36765 100644
--- a/libsrc/Wi/CLI.h
+++ b/libsrc/Wi/CLI.h
@@ -1,14 +1,14 @@
/*
* CLI.h
*
- * $Id: CLI.h,v 1.17.2.4 2011/07/14 19:14:14 source Exp $
+ * $Id$
*
* SQL client data structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -306,6 +306,8 @@ struct stmt_descriptor_s {
# define err_printf(a)
#endif
+#define cli_dbg_printf(a)
+
#define CON(c, cc) \
cli_connection_t *c = (cli_connection_t *) cc
@@ -437,8 +439,6 @@ void dbg_print_box (caddr_t object, FILE * out);
#endif
extern int isdts_mode;
-#define cli_dbg_printf(a)
-
/*
* Added prototypes for internal functions
diff --git a/libsrc/Wi/CLIcr.c b/libsrc/Wi/CLIcr.c
index 11834fb..cd37fa6 100644
--- a/libsrc/Wi/CLIcr.c
+++ b/libsrc/Wi/CLIcr.c
@@ -1,14 +1,14 @@
/*
* CLIcr.c
*
- * $Id: CLIcr.c,v 1.8 2006/07/17 13:28:25 source Exp $
+ * $Id$
*
* Client API, ODBC Extensions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/CLIodbc3.c b/libsrc/Wi/CLIodbc3.c
index 0376f9b..f345259 100644
--- a/libsrc/Wi/CLIodbc3.c
+++ b/libsrc/Wi/CLIodbc3.c
@@ -1,12 +1,12 @@
/*
* CLIodbc3.c
*
- * $Id: CLIodbc3.c,v 1.26.2.4 2011/03/04 14:46:59 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/CLIsql1.c b/libsrc/Wi/CLIsql1.c
index 3e1d77f..7280603 100644
--- a/libsrc/Wi/CLIsql1.c
+++ b/libsrc/Wi/CLIsql1.c
@@ -1,14 +1,14 @@
/*
* CLIsql1.c
*
- * $Id: CLIsql1.c,v 1.22.2.10 2011/06/06 08:02:03 source Exp $
+ * $Id$
*
* Client API
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -142,6 +142,8 @@ virtodbc__SQLAllocStmt (
#endif
NEW_VARZ (cli_stmt_t, stmt);
+ set_error (&con->con_error, NULL, NULL, NULL);
+
memset (opts, 0, sizeof (stmt_options_t));
*phstmt = (SQLHSTMT) stmt;
dk_set_push (&con->con_statements, (void *) stmt);
@@ -825,7 +827,7 @@ internal_sql_connect (
#ifdef _SSL
/* We need to ensure that SSL error stack is clear before peeking a error */
ERR_clear_error ();
-#if !defined (WIN32)
+#if 0 /*!defined (WIN32)*/
{
char *ssl_usage = con->con_encrypt;
if (ssl_usage && strlen (ssl_usage) > 0 && atoi (ssl_usage) == 0)
diff --git a/libsrc/Wi/CLIsql2.c b/libsrc/Wi/CLIsql2.c
index a78ba0f..7e81231 100644
--- a/libsrc/Wi/CLIsql2.c
+++ b/libsrc/Wi/CLIsql2.c
@@ -1,14 +1,14 @@
/*
* CLIsql2.c
*
- * $Id: CLIsql2.c,v 1.21.2.5 2011/03/02 12:24:08 source Exp $
+ * $Id$
*
* Client API, ODBC Extensions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2032,6 +2032,8 @@ virtodbc__SQLGetInfo (
int is_short = 0;
int is_ulen = 0;
+ cli_dbg_printf (("SQLGetInfo called.\n"));
+
switch (fInfoType)
{
case SQL_ACTIVE_CONNECTIONS:
diff --git a/libsrc/Wi/CLIsql3.c b/libsrc/Wi/CLIsql3.c
index c29a15b..e4b16a6 100644
--- a/libsrc/Wi/CLIsql3.c
+++ b/libsrc/Wi/CLIsql3.c
@@ -1,14 +1,14 @@
/*
* CLIsql3.c
*
- * $Id: CLIsql3.c,v 1.14.2.2 2010/07/06 14:24:06 source Exp $
+ * $Id$
*
* ODBC API - SQLDriverConnect & SQLConnect
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2008 OpenLink Software
+ * 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
@@ -420,7 +420,7 @@ ParseOptions (CfgData cfgdata[], TCHAR * s, int clean_up)
odbcini_usr = path;
cfg_init (&cfg_odbc_usr, odbcini_usr);
- cli_dbg_printf (("USING %s\n", iniFile));
+ cli_dbg_printf (("USING %s\n", odbcini_usr));
section_narrow = virt_wide_to_ansi (section);
@@ -596,6 +596,8 @@ virtodbc__SQLDriverConnect (SQLHDBC hdbc,
CON (con, hdbc);
CfgData cfgdata[sizeof (attrs) / sizeof (CfgRecord)];
+ cli_dbg_printf (("DriverConnect(%p, ..., %d) called.\n", hdbc, fDriverCompletion));
+
memset (cfgdata, 0, sizeof (cfgdata));
mutex_enter (con->con_environment->env_mtx);
diff --git a/libsrc/Wi/CLIsql3W.c b/libsrc/Wi/CLIsql3W.c
index 00f36dc..42d4ca3 100644
--- a/libsrc/Wi/CLIsql3W.c
+++ b/libsrc/Wi/CLIsql3W.c
@@ -1,14 +1,14 @@
/*
* CLIsql3.c
*
- * $Id: CLIsql3W.c,v 1.2 2006/06/22 21:05:22 source Exp $
+ * $Id$
*
* ODBC API - SQLDriverConnect & SQLConnect
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/CLIuti.c b/libsrc/Wi/CLIuti.c
index 0e02a1f..2567de4 100644
--- a/libsrc/Wi/CLIuti.c
+++ b/libsrc/Wi/CLIuti.c
@@ -1,14 +1,14 @@
/*
* CLIuti.c
*
- * $Id: CLIuti.c,v 1.35.2.5 2010/12/20 18:09:05 source Exp $
+ * $Id$
*
* Auxiliary functions for the ODBC driver
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -205,7 +205,7 @@ dv_to_sql_type (dtp_t dv, int cli_binary_timestamp)
return SQL_WVARCHAR;
case DV_ANY:
- return SQL_VARCHAR;
+ return SQL_LONGVARCHAR;
case DV_INT64:
return SQL_INTEGER;
diff --git a/libsrc/Wi/CLIw.c b/libsrc/Wi/CLIw.c
index 872d1fe..1e4b567 100644
--- a/libsrc/Wi/CLIw.c
+++ b/libsrc/Wi/CLIw.c
@@ -1,12 +1,12 @@
/*
* CLIw.c
*
- * $Id: CLIw.c,v 1.10 2009/04/10 11:33:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/Makefile.am b/libsrc/Wi/Makefile.am
index be65816..117fdde 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-2006 OpenLink Software
+# 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
@@ -61,7 +61,8 @@ 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
+ json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h \
+ sparqlwords.h
generated_code = \
@@ -79,6 +80,7 @@ generated_code = \
sparql_l.c \
sparql_p.c \
sparql_p.h \
+ sparqlwords.h \
sql3.c \
sql_code.c \
sql_code_1.c \
@@ -93,6 +95,7 @@ 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 \
@@ -132,6 +135,7 @@ C_FILES_SPARQL = \
sparql_rdb2rdf.c \
sparul2sql.c \
sql_code_sparql.c \
+ sql_code_sparql_init.c \
turtle_l.c \
turtle_p.c
@@ -208,6 +212,7 @@ 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 \
@@ -326,6 +331,7 @@ 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 \
@@ -532,7 +538,6 @@ SQL_FILES = \
$(srcdir)/system.sql \
$(srcdir)/system2.sql \
$(srcdir)/odbccat.sql \
- $(srcdir)/useraggr.sql \
$(srcdir)/vt_text.sql \
$(srcdir)/phrasematch.sql \
$(srcdir)/hosting.sql
@@ -611,6 +616,10 @@ 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 \
@@ -682,20 +691,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
+sqlwords.h: $(srcdir)/sqlwords.gperf Makefile.am
@${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
+sql3.c sql3.h: sql3.y Makefile.am
@$(GEN) $(YACC) -o sql3.c -vd $(srcdir)/sql3.y
-scn3.c: scn3.l sql3.c sqlwords.h
+scn3.c: scn3.l sql3.c sqlwords.h Makefile.am
@$(GEN) $(LEX) -o scn3.c $(srcdir)/scn3.l
-scn3split.c: scn3.l sql3.c sqlwords.h
+scn3split.c: scn3.l sql3.c sqlwords.h Makefile.am
@$(GEN) $(LEX) -o scn3split.c -Pscn3splityy $(srcdir)/scn3.l
$(top_srcdir)/binsrc/cached_resources/cached_resources.c:
@@ -707,38 +716,48 @@ 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
+xpathp.c xpathp.h : xpathp.y Makefile.am
@$(GEN) $(YACC) -o xpathp.c -vd -pxpyy $(srcdir)/xpathp.y
-xpathp_lex_props.c: list_lex_props.sh xpathp.y
+xpathp_lex_props.c: list_lex_props.sh xpathp.y Makefile.am
list_lex_props.sh xpathp.y xpathp_lex_props.c
-xpscn.c: xpscn.l xpathp.h
+xpscn.c: xpscn.l xpathp.h Makefile.am
@$(GEN) $(LEX) -o xpscn.c -Pxpyy $(srcdir)/xpscn.l
-sparql_p.c sparql_p.h: sparql_p.y
+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
@$(GEN) $(YACC) -o sparql_p.c -vd -psparyy $(srcdir)/sparql_p.y
-sparql_lex_props.c: list_lex_props.sh sparql_p.y
+sparql_lex_props.c: list_lex_props.sh sparql_p.y Makefile.am
list_lex_props.sh sparql_p.y sparql_lex_props.c
-sparql_l.c: sparql_l.l sparql_p.h
+sparql_l.c: sparql_l.l sparql_p.h Makefile.am
@$(GEN) $(LEX) -o sparql_l.c -Psparyy $(srcdir)/sparql_l.l
-nquad_p.c nquad_p.h: nquad_p.y
+nquad_p.c nquad_p.h: nquad_p.y Makefile.am
@$(GEN) $(YACC) -o nquad_p.c -vd -pnqyy $(srcdir)/nquad_p.y
-turtle_p.c turtle_p.h: turtle_p.y
+turtle_p.c turtle_p.h: turtle_p.y Makefile.am
@$(GEN) $(YACC) -o turtle_p.c -vd -pttlyy $(srcdir)/turtle_p.y
-turtle_lex_props.c: list_lex_props.sh turtle_p.y
+turtle_lex_props.c: list_lex_props.sh turtle_p.y Makefile.am
list_lex_props.sh turtle_p.y turtle_lex_props.c
-turtle_l.c: turtle_l.l turtle_p.h
+turtle_l.c: turtle_l.l turtle_p.h Makefile.am
@$(GEN) $(LEX) -o turtle_l.c -Pttlyy $(srcdir)/turtle_l.l
-AWK_FILES = $(srcdir)/sql_to_c.awk
+AWK_FILES = $(srcdir)/sql_to_c.awk Makefile.am
sql_code.c: $(SQL_FILES) $(AWK_FILES) Makefile.am
@${GEN} ${GAWK} \
@@ -827,7 +846,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)
+#sql_code_blog.c: $(SQL_FILES_BLOG) $(AWK_FILES) Makefile.am
# @${GEN} ${GAWK} -o sql_code_2pc.c -f $(srcdir)/sql_to_c.awk \
# -v init_name=_blog -v pl_stats=$(PLSTATS) $(SQL_FILES_BLOG)
@@ -839,6 +858,14 @@ 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 \
@@ -929,6 +956,7 @@ generated: \
sparql_l.c \
sparql_p.c \
sparql_p.h \
+ sparqlwords.h \
sql3.c \
sql_code.c \
sql_code_1.c \
@@ -989,5 +1017,6 @@ 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 4b42f2d..d90b72d 100644
--- a/libsrc/Wi/Makefile.in
+++ b/libsrc/Wi/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libwi_la_LIBADD =
am__libwi_la_SOURCES_DIST = aqueue.c arith.c auxfiles.c bif_audio.c \
@@ -88,16 +85,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_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_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 \
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 +115,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-turtle_l.lo \
- libwi_la-turtle_p.lo
+ libwi_la-sql_code_sparql.lo libwi_la-sql_code_sparql_init.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 +150,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_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_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_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 +201,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_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_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 \
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,6 +232,7 @@ 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
@@ -278,36 +276,38 @@ 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_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_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-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 \
@@ -342,10 +342,9 @@ libwic_la_OBJECTS = $(am_libwic_la_OBJECTS)
libwic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libwic_la_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -451,7 +450,6 @@ 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@
@@ -535,7 +533,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -556,7 +553,6 @@ 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@
@@ -584,7 +580,8 @@ 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
+ json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h \
+ sparqlwords.h
generated_code = \
json_l.c \
@@ -601,6 +598,7 @@ generated_code = \
sparql_l.c \
sparql_p.c \
sparql_p.h \
+ sparqlwords.h \
sql3.c \
sql_code.c \
sql_code_1.c \
@@ -615,6 +613,7 @@ 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 \
@@ -653,6 +652,7 @@ C_FILES_SPARQL = \
sparql_rdb2rdf.c \
sparul2sql.c \
sql_code_sparql.c \
+ sql_code_sparql_init.c \
turtle_l.c \
turtle_p.c
@@ -675,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_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_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 \
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 \
@@ -707,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_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_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 \
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 \
@@ -750,7 +750,6 @@ SQL_FILES = \
$(srcdir)/system.sql \
$(srcdir)/system2.sql \
$(srcdir)/odbccat.sql \
- $(srcdir)/useraggr.sql \
$(srcdir)/vt_text.sql \
$(srcdir)/phrasematch.sql \
$(srcdir)/hosting.sql
@@ -827,6 +826,10 @@ 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 \
@@ -890,7 +893,7 @@ SQL_FILES_WS = \
$(top_srcdir)/binsrc/vspx/vspx.xsd \
$(top_srcdir)/binsrc/vspx/vspx.xsl
-AWK_FILES = $(srcdir)/sql_to_c.awk
+AWK_FILES = $(srcdir)/sql_to_c.awk Makefile.am
#
# JSON
@@ -930,6 +933,7 @@ EXTRA_DIST = \
sql_code_cache_impl.c \
sql_to_c.awk \
sqlwords.gperf \
+ sparqlwords.gperf \
ssl.c \
string_tmpl.c
@@ -942,14 +946,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Wi/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/Wi/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Wi/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/Wi/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -967,7 +971,6 @@ $(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):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -1099,6 +1102,7 @@ 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@
@@ -1277,6 +1281,7 @@ 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@
@@ -1364,2621 +1369,2635 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libwi_la-aqueue.lo: aqueue.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-aqueue.lo -MD -MP -MF $(DEPDIR)/libwi_la-aqueue.Tpo -c -o libwi_la-aqueue.lo `test -f 'aqueue.c' || echo '$(srcdir)/'`aqueue.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-aqueue.Tpo $(DEPDIR)/libwi_la-aqueue.Plo
+ 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-aqueue.lo -MD -MP -MF $(DEPDIR)/libwi_la-aqueue.Tpo -c -o libwi_la-aqueue.lo `test -f 'aqueue.c' || echo '$(srcdir)/'`aqueue.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-aqueue.Tpo $(DEPDIR)/libwi_la-aqueue.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aqueue.c' object='libwi_la-aqueue.lo' libtool=yes @AMDEPBACKSLASH@
@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-aqueue.lo `test -f 'aqueue.c' || echo '$(srcdir)/'`aqueue.c
+ 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-aqueue.lo `test -f 'aqueue.c' || echo '$(srcdir)/'`aqueue.c
libwi_la-arith.lo: arith.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-arith.lo -MD -MP -MF $(DEPDIR)/libwi_la-arith.Tpo -c -o libwi_la-arith.lo `test -f 'arith.c' || echo '$(srcdir)/'`arith.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-arith.Tpo $(DEPDIR)/libwi_la-arith.Plo
+ 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-arith.lo -MD -MP -MF $(DEPDIR)/libwi_la-arith.Tpo -c -o libwi_la-arith.lo `test -f 'arith.c' || echo '$(srcdir)/'`arith.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-arith.Tpo $(DEPDIR)/libwi_la-arith.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arith.c' object='libwi_la-arith.lo' libtool=yes @AMDEPBACKSLASH@
@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-arith.lo `test -f 'arith.c' || echo '$(srcdir)/'`arith.c
+ 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-arith.lo `test -f 'arith.c' || echo '$(srcdir)/'`arith.c
libwi_la-auxfiles.lo: auxfiles.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-auxfiles.lo -MD -MP -MF $(DEPDIR)/libwi_la-auxfiles.Tpo -c -o libwi_la-auxfiles.lo `test -f 'auxfiles.c' || echo '$(srcdir)/'`auxfiles.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-auxfiles.Tpo $(DEPDIR)/libwi_la-auxfiles.Plo
+ 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-auxfiles.lo -MD -MP -MF $(DEPDIR)/libwi_la-auxfiles.Tpo -c -o libwi_la-auxfiles.lo `test -f 'auxfiles.c' || echo '$(srcdir)/'`auxfiles.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-auxfiles.Tpo $(DEPDIR)/libwi_la-auxfiles.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='auxfiles.c' object='libwi_la-auxfiles.lo' libtool=yes @AMDEPBACKSLASH@
@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-auxfiles.lo `test -f 'auxfiles.c' || echo '$(srcdir)/'`auxfiles.c
+ 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-auxfiles.lo `test -f 'auxfiles.c' || echo '$(srcdir)/'`auxfiles.c
libwi_la-bif_audio.lo: bif_audio.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-bif_audio.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_audio.Tpo -c -o libwi_la-bif_audio.lo `test -f 'bif_audio.c' || echo '$(srcdir)/'`bif_audio.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_audio.Tpo $(DEPDIR)/libwi_la-bif_audio.Plo
+ 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-bif_audio.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_audio.Tpo -c -o libwi_la-bif_audio.lo `test -f 'bif_audio.c' || echo '$(srcdir)/'`bif_audio.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_audio.Tpo $(DEPDIR)/libwi_la-bif_audio.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_audio.c' object='libwi_la-bif_audio.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_audio.lo `test -f 'bif_audio.c' || echo '$(srcdir)/'`bif_audio.c
+ 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-bif_audio.lo `test -f 'bif_audio.c' || echo '$(srcdir)/'`bif_audio.c
libwi_la-bif_crypto.lo: bif_crypto.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-bif_crypto.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_crypto.Tpo -c -o libwi_la-bif_crypto.lo `test -f 'bif_crypto.c' || echo '$(srcdir)/'`bif_crypto.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_crypto.Tpo $(DEPDIR)/libwi_la-bif_crypto.Plo
+ 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-bif_crypto.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_crypto.Tpo -c -o libwi_la-bif_crypto.lo `test -f 'bif_crypto.c' || echo '$(srcdir)/'`bif_crypto.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_crypto.Tpo $(DEPDIR)/libwi_la-bif_crypto.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_crypto.c' object='libwi_la-bif_crypto.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_crypto.lo `test -f 'bif_crypto.c' || echo '$(srcdir)/'`bif_crypto.c
+ 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-bif_crypto.lo `test -f 'bif_crypto.c' || echo '$(srcdir)/'`bif_crypto.c
libwi_la-bif_diff.lo: bif_diff.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-bif_diff.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_diff.Tpo -c -o libwi_la-bif_diff.lo `test -f 'bif_diff.c' || echo '$(srcdir)/'`bif_diff.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_diff.Tpo $(DEPDIR)/libwi_la-bif_diff.Plo
+ 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-bif_diff.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_diff.Tpo -c -o libwi_la-bif_diff.lo `test -f 'bif_diff.c' || echo '$(srcdir)/'`bif_diff.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_diff.Tpo $(DEPDIR)/libwi_la-bif_diff.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_diff.c' object='libwi_la-bif_diff.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_diff.lo `test -f 'bif_diff.c' || echo '$(srcdir)/'`bif_diff.c
+ 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-bif_diff.lo `test -f 'bif_diff.c' || echo '$(srcdir)/'`bif_diff.c
libwi_la-bif_intl.lo: bif_intl.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-bif_intl.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_intl.Tpo -c -o libwi_la-bif_intl.lo `test -f 'bif_intl.c' || echo '$(srcdir)/'`bif_intl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_intl.Tpo $(DEPDIR)/libwi_la-bif_intl.Plo
+ 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-bif_intl.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_intl.Tpo -c -o libwi_la-bif_intl.lo `test -f 'bif_intl.c' || echo '$(srcdir)/'`bif_intl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_intl.Tpo $(DEPDIR)/libwi_la-bif_intl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_intl.c' object='libwi_la-bif_intl.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_intl.lo `test -f 'bif_intl.c' || echo '$(srcdir)/'`bif_intl.c
+ 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-bif_intl.lo `test -f 'bif_intl.c' || echo '$(srcdir)/'`bif_intl.c
libwi_la-bif_json.lo: bif_json.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-bif_json.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_json.Tpo -c -o libwi_la-bif_json.lo `test -f 'bif_json.c' || echo '$(srcdir)/'`bif_json.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_json.Tpo $(DEPDIR)/libwi_la-bif_json.Plo
+ 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-bif_json.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_json.Tpo -c -o libwi_la-bif_json.lo `test -f 'bif_json.c' || echo '$(srcdir)/'`bif_json.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_json.Tpo $(DEPDIR)/libwi_la-bif_json.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_json.c' object='libwi_la-bif_json.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_json.lo `test -f 'bif_json.c' || echo '$(srcdir)/'`bif_json.c
+ 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-bif_json.lo `test -f 'bif_json.c' || echo '$(srcdir)/'`bif_json.c
libwi_la-bif_regexp.lo: bif_regexp.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-bif_regexp.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_regexp.Tpo -c -o libwi_la-bif_regexp.lo `test -f 'bif_regexp.c' || echo '$(srcdir)/'`bif_regexp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_regexp.Tpo $(DEPDIR)/libwi_la-bif_regexp.Plo
+ 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-bif_regexp.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_regexp.Tpo -c -o libwi_la-bif_regexp.lo `test -f 'bif_regexp.c' || echo '$(srcdir)/'`bif_regexp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_regexp.Tpo $(DEPDIR)/libwi_la-bif_regexp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_regexp.c' object='libwi_la-bif_regexp.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_regexp.lo `test -f 'bif_regexp.c' || echo '$(srcdir)/'`bif_regexp.c
+ 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-bif_regexp.lo `test -f 'bif_regexp.c' || echo '$(srcdir)/'`bif_regexp.c
libwi_la-bif_search_excerpt.lo: bif_search_excerpt.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-bif_search_excerpt.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_search_excerpt.Tpo -c -o libwi_la-bif_search_excerpt.lo `test -f 'bif_search_excerpt.c' || echo '$(srcdir)/'`bif_search_excerpt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_search_excerpt.Tpo $(DEPDIR)/libwi_la-bif_search_excerpt.Plo
+ 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-bif_search_excerpt.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_search_excerpt.Tpo -c -o libwi_la-bif_search_excerpt.lo `test -f 'bif_search_excerpt.c' || echo '$(srcdir)/'`bif_search_excerpt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_search_excerpt.Tpo $(DEPDIR)/libwi_la-bif_search_excerpt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_search_excerpt.c' object='libwi_la-bif_search_excerpt.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_search_excerpt.lo `test -f 'bif_search_excerpt.c' || echo '$(srcdir)/'`bif_search_excerpt.c
+ 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-bif_search_excerpt.lo `test -f 'bif_search_excerpt.c' || echo '$(srcdir)/'`bif_search_excerpt.c
libwi_la-bif_uuencode.lo: bif_uuencode.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-bif_uuencode.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_uuencode.Tpo -c -o libwi_la-bif_uuencode.lo `test -f 'bif_uuencode.c' || echo '$(srcdir)/'`bif_uuencode.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_uuencode.Tpo $(DEPDIR)/libwi_la-bif_uuencode.Plo
+ 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-bif_uuencode.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_uuencode.Tpo -c -o libwi_la-bif_uuencode.lo `test -f 'bif_uuencode.c' || echo '$(srcdir)/'`bif_uuencode.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_uuencode.Tpo $(DEPDIR)/libwi_la-bif_uuencode.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_uuencode.c' object='libwi_la-bif_uuencode.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_uuencode.lo `test -f 'bif_uuencode.c' || echo '$(srcdir)/'`bif_uuencode.c
+ 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-bif_uuencode.lo `test -f 'bif_uuencode.c' || echo '$(srcdir)/'`bif_uuencode.c
libwi_la-bitmap.lo: bitmap.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-bitmap.lo -MD -MP -MF $(DEPDIR)/libwi_la-bitmap.Tpo -c -o libwi_la-bitmap.lo `test -f 'bitmap.c' || echo '$(srcdir)/'`bitmap.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bitmap.Tpo $(DEPDIR)/libwi_la-bitmap.Plo
+ 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-bitmap.lo -MD -MP -MF $(DEPDIR)/libwi_la-bitmap.Tpo -c -o libwi_la-bitmap.lo `test -f 'bitmap.c' || echo '$(srcdir)/'`bitmap.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bitmap.Tpo $(DEPDIR)/libwi_la-bitmap.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bitmap.c' object='libwi_la-bitmap.lo' libtool=yes @AMDEPBACKSLASH@
@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-bitmap.lo `test -f 'bitmap.c' || echo '$(srcdir)/'`bitmap.c
+ 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-bitmap.lo `test -f 'bitmap.c' || echo '$(srcdir)/'`bitmap.c
libwi_la-blob.lo: blob.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-blob.lo -MD -MP -MF $(DEPDIR)/libwi_la-blob.Tpo -c -o libwi_la-blob.lo `test -f 'blob.c' || echo '$(srcdir)/'`blob.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-blob.Tpo $(DEPDIR)/libwi_la-blob.Plo
+ 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-blob.lo -MD -MP -MF $(DEPDIR)/libwi_la-blob.Tpo -c -o libwi_la-blob.lo `test -f 'blob.c' || echo '$(srcdir)/'`blob.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-blob.Tpo $(DEPDIR)/libwi_la-blob.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='blob.c' object='libwi_la-blob.lo' libtool=yes @AMDEPBACKSLASH@
@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-blob.lo `test -f 'blob.c' || echo '$(srcdir)/'`blob.c
+ 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-blob.lo `test -f 'blob.c' || echo '$(srcdir)/'`blob.c
libwi_la-blobio.lo: blobio.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-blobio.lo -MD -MP -MF $(DEPDIR)/libwi_la-blobio.Tpo -c -o libwi_la-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-blobio.Tpo $(DEPDIR)/libwi_la-blobio.Plo
+ 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-blobio.lo -MD -MP -MF $(DEPDIR)/libwi_la-blobio.Tpo -c -o libwi_la-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-blobio.Tpo $(DEPDIR)/libwi_la-blobio.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='blobio.c' object='libwi_la-blobio.lo' libtool=yes @AMDEPBACKSLASH@
@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-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
+ 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-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
libwi_la-cl_stubs.lo: cl_stubs.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-cl_stubs.lo -MD -MP -MF $(DEPDIR)/libwi_la-cl_stubs.Tpo -c -o libwi_la-cl_stubs.lo `test -f 'cl_stubs.c' || echo '$(srcdir)/'`cl_stubs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-cl_stubs.Tpo $(DEPDIR)/libwi_la-cl_stubs.Plo
+ 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-cl_stubs.lo -MD -MP -MF $(DEPDIR)/libwi_la-cl_stubs.Tpo -c -o libwi_la-cl_stubs.lo `test -f 'cl_stubs.c' || echo '$(srcdir)/'`cl_stubs.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-cl_stubs.Tpo $(DEPDIR)/libwi_la-cl_stubs.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cl_stubs.c' object='libwi_la-cl_stubs.lo' libtool=yes @AMDEPBACKSLASH@
@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-cl_stubs.lo `test -f 'cl_stubs.c' || echo '$(srcdir)/'`cl_stubs.c
+ 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-cl_stubs.lo `test -f 'cl_stubs.c' || echo '$(srcdir)/'`cl_stubs.c
libwi_la-datesupp.lo: datesupp.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-datesupp.lo -MD -MP -MF $(DEPDIR)/libwi_la-datesupp.Tpo -c -o libwi_la-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-datesupp.Tpo $(DEPDIR)/libwi_la-datesupp.Plo
+ 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-datesupp.lo -MD -MP -MF $(DEPDIR)/libwi_la-datesupp.Tpo -c -o libwi_la-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-datesupp.Tpo $(DEPDIR)/libwi_la-datesupp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='datesupp.c' object='libwi_la-datesupp.lo' libtool=yes @AMDEPBACKSLASH@
@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-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
+ 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-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
libwi_la-ddlrun.lo: ddlrun.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-ddlrun.lo -MD -MP -MF $(DEPDIR)/libwi_la-ddlrun.Tpo -c -o libwi_la-ddlrun.lo `test -f 'ddlrun.c' || echo '$(srcdir)/'`ddlrun.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-ddlrun.Tpo $(DEPDIR)/libwi_la-ddlrun.Plo
+ 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-ddlrun.lo -MD -MP -MF $(DEPDIR)/libwi_la-ddlrun.Tpo -c -o libwi_la-ddlrun.lo `test -f 'ddlrun.c' || echo '$(srcdir)/'`ddlrun.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-ddlrun.Tpo $(DEPDIR)/libwi_la-ddlrun.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddlrun.c' object='libwi_la-ddlrun.lo' libtool=yes @AMDEPBACKSLASH@
@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-ddlrun.lo `test -f 'ddlrun.c' || echo '$(srcdir)/'`ddlrun.c
+ 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-ddlrun.lo `test -f 'ddlrun.c' || echo '$(srcdir)/'`ddlrun.c
libwi_la-disk.lo: disk.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-disk.lo -MD -MP -MF $(DEPDIR)/libwi_la-disk.Tpo -c -o libwi_la-disk.lo `test -f 'disk.c' || echo '$(srcdir)/'`disk.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-disk.Tpo $(DEPDIR)/libwi_la-disk.Plo
+ 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-disk.lo -MD -MP -MF $(DEPDIR)/libwi_la-disk.Tpo -c -o libwi_la-disk.lo `test -f 'disk.c' || echo '$(srcdir)/'`disk.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-disk.Tpo $(DEPDIR)/libwi_la-disk.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='disk.c' object='libwi_la-disk.lo' libtool=yes @AMDEPBACKSLASH@
@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-disk.lo `test -f 'disk.c' || echo '$(srcdir)/'`disk.c
+ 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-disk.lo `test -f 'disk.c' || echo '$(srcdir)/'`disk.c
libwi_la-dks_esc.lo: dks_esc.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-dks_esc.lo -MD -MP -MF $(DEPDIR)/libwi_la-dks_esc.Tpo -c -o libwi_la-dks_esc.lo `test -f 'dks_esc.c' || echo '$(srcdir)/'`dks_esc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-dks_esc.Tpo $(DEPDIR)/libwi_la-dks_esc.Plo
+ 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-dks_esc.lo -MD -MP -MF $(DEPDIR)/libwi_la-dks_esc.Tpo -c -o libwi_la-dks_esc.lo `test -f 'dks_esc.c' || echo '$(srcdir)/'`dks_esc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-dks_esc.Tpo $(DEPDIR)/libwi_la-dks_esc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dks_esc.c' object='libwi_la-dks_esc.lo' libtool=yes @AMDEPBACKSLASH@
@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-dks_esc.lo `test -f 'dks_esc.c' || echo '$(srcdir)/'`dks_esc.c
+ 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-dks_esc.lo `test -f 'dks_esc.c' || echo '$(srcdir)/'`dks_esc.c
libwi_la-extent.lo: extent.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-extent.lo -MD -MP -MF $(DEPDIR)/libwi_la-extent.Tpo -c -o libwi_la-extent.lo `test -f 'extent.c' || echo '$(srcdir)/'`extent.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-extent.Tpo $(DEPDIR)/libwi_la-extent.Plo
+ 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-extent.lo -MD -MP -MF $(DEPDIR)/libwi_la-extent.Tpo -c -o libwi_la-extent.lo `test -f 'extent.c' || echo '$(srcdir)/'`extent.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-extent.Tpo $(DEPDIR)/libwi_la-extent.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='extent.c' object='libwi_la-extent.lo' libtool=yes @AMDEPBACKSLASH@
@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-extent.lo `test -f 'extent.c' || echo '$(srcdir)/'`extent.c
+ 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-extent.lo `test -f 'extent.c' || echo '$(srcdir)/'`extent.c
libwi_la-eqlcomp.lo: eqlcomp.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-eqlcomp.lo -MD -MP -MF $(DEPDIR)/libwi_la-eqlcomp.Tpo -c -o libwi_la-eqlcomp.lo `test -f 'eqlcomp.c' || echo '$(srcdir)/'`eqlcomp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-eqlcomp.Tpo $(DEPDIR)/libwi_la-eqlcomp.Plo
+ 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-eqlcomp.lo -MD -MP -MF $(DEPDIR)/libwi_la-eqlcomp.Tpo -c -o libwi_la-eqlcomp.lo `test -f 'eqlcomp.c' || echo '$(srcdir)/'`eqlcomp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-eqlcomp.Tpo $(DEPDIR)/libwi_la-eqlcomp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eqlcomp.c' object='libwi_la-eqlcomp.lo' libtool=yes @AMDEPBACKSLASH@
@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-eqlcomp.lo `test -f 'eqlcomp.c' || echo '$(srcdir)/'`eqlcomp.c
+ 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-eqlcomp.lo `test -f 'eqlcomp.c' || echo '$(srcdir)/'`eqlcomp.c
libwi_la-gate.lo: gate.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-gate.lo -MD -MP -MF $(DEPDIR)/libwi_la-gate.Tpo -c -o libwi_la-gate.lo `test -f 'gate.c' || echo '$(srcdir)/'`gate.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-gate.Tpo $(DEPDIR)/libwi_la-gate.Plo
+ 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-gate.lo -MD -MP -MF $(DEPDIR)/libwi_la-gate.Tpo -c -o libwi_la-gate.lo `test -f 'gate.c' || echo '$(srcdir)/'`gate.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-gate.Tpo $(DEPDIR)/libwi_la-gate.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gate.c' object='libwi_la-gate.lo' libtool=yes @AMDEPBACKSLASH@
@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-gate.lo `test -f 'gate.c' || echo '$(srcdir)/'`gate.c
+ 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-gate.lo `test -f 'gate.c' || echo '$(srcdir)/'`gate.c
libwi_la-hash.lo: hash.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-hash.lo -MD -MP -MF $(DEPDIR)/libwi_la-hash.Tpo -c -o libwi_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-hash.Tpo $(DEPDIR)/libwi_la-hash.Plo
+ 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-hash.lo -MD -MP -MF $(DEPDIR)/libwi_la-hash.Tpo -c -o libwi_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-hash.Tpo $(DEPDIR)/libwi_la-hash.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hash.c' object='libwi_la-hash.lo' libtool=yes @AMDEPBACKSLASH@
@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-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
+ 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-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
libwi_la-hosting.lo: hosting.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-hosting.lo -MD -MP -MF $(DEPDIR)/libwi_la-hosting.Tpo -c -o libwi_la-hosting.lo `test -f 'hosting.c' || echo '$(srcdir)/'`hosting.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-hosting.Tpo $(DEPDIR)/libwi_la-hosting.Plo
+ 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-hosting.lo -MD -MP -MF $(DEPDIR)/libwi_la-hosting.Tpo -c -o libwi_la-hosting.lo `test -f 'hosting.c' || echo '$(srcdir)/'`hosting.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-hosting.Tpo $(DEPDIR)/libwi_la-hosting.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosting.c' object='libwi_la-hosting.lo' libtool=yes @AMDEPBACKSLASH@
@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-hosting.lo `test -f 'hosting.c' || echo '$(srcdir)/'`hosting.c
+ 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-hosting.lo `test -f 'hosting.c' || echo '$(srcdir)/'`hosting.c
libwi_la-http.lo: http.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-http.lo -MD -MP -MF $(DEPDIR)/libwi_la-http.Tpo -c -o libwi_la-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-http.Tpo $(DEPDIR)/libwi_la-http.Plo
+ 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-http.lo -MD -MP -MF $(DEPDIR)/libwi_la-http.Tpo -c -o libwi_la-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-http.Tpo $(DEPDIR)/libwi_la-http.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='http.c' object='libwi_la-http.lo' libtool=yes @AMDEPBACKSLASH@
@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-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
+ 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-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
libwi_la-insert.lo: insert.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-insert.lo -MD -MP -MF $(DEPDIR)/libwi_la-insert.Tpo -c -o libwi_la-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-insert.Tpo $(DEPDIR)/libwi_la-insert.Plo
+ 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-insert.lo -MD -MP -MF $(DEPDIR)/libwi_la-insert.Tpo -c -o libwi_la-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-insert.Tpo $(DEPDIR)/libwi_la-insert.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='insert.c' object='libwi_la-insert.lo' libtool=yes @AMDEPBACKSLASH@
@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-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
+ 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-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
libwi_la-inxop.lo: inxop.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-inxop.lo -MD -MP -MF $(DEPDIR)/libwi_la-inxop.Tpo -c -o libwi_la-inxop.lo `test -f 'inxop.c' || echo '$(srcdir)/'`inxop.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-inxop.Tpo $(DEPDIR)/libwi_la-inxop.Plo
+ 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-inxop.lo -MD -MP -MF $(DEPDIR)/libwi_la-inxop.Tpo -c -o libwi_la-inxop.lo `test -f 'inxop.c' || echo '$(srcdir)/'`inxop.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-inxop.Tpo $(DEPDIR)/libwi_la-inxop.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='inxop.c' object='libwi_la-inxop.lo' libtool=yes @AMDEPBACKSLASH@
@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-inxop.lo `test -f 'inxop.c' || echo '$(srcdir)/'`inxop.c
+ 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-inxop.lo `test -f 'inxop.c' || echo '$(srcdir)/'`inxop.c
libwi_la-json_l.lo: json_l.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-json_l.lo -MD -MP -MF $(DEPDIR)/libwi_la-json_l.Tpo -c -o libwi_la-json_l.lo `test -f 'json_l.c' || echo '$(srcdir)/'`json_l.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-json_l.Tpo $(DEPDIR)/libwi_la-json_l.Plo
+ 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-json_l.lo -MD -MP -MF $(DEPDIR)/libwi_la-json_l.Tpo -c -o libwi_la-json_l.lo `test -f 'json_l.c' || echo '$(srcdir)/'`json_l.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-json_l.Tpo $(DEPDIR)/libwi_la-json_l.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='json_l.c' object='libwi_la-json_l.lo' libtool=yes @AMDEPBACKSLASH@
@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-json_l.lo `test -f 'json_l.c' || echo '$(srcdir)/'`json_l.c
+ 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-json_l.lo `test -f 'json_l.c' || echo '$(srcdir)/'`json_l.c
libwi_la-json_p.lo: json_p.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-json_p.lo -MD -MP -MF $(DEPDIR)/libwi_la-json_p.Tpo -c -o libwi_la-json_p.lo `test -f 'json_p.c' || echo '$(srcdir)/'`json_p.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-json_p.Tpo $(DEPDIR)/libwi_la-json_p.Plo
+ 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-json_p.lo -MD -MP -MF $(DEPDIR)/libwi_la-json_p.Tpo -c -o libwi_la-json_p.lo `test -f 'json_p.c' || echo '$(srcdir)/'`json_p.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-json_p.Tpo $(DEPDIR)/libwi_la-json_p.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='json_p.c' object='libwi_la-json_p.lo' libtool=yes @AMDEPBACKSLASH@
@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-json_p.lo `test -f 'json_p.c' || echo '$(srcdir)/'`json_p.c
+ 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-json_p.lo `test -f 'json_p.c' || echo '$(srcdir)/'`json_p.c
libwi_la-lisprdr.lo: lisprdr.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-lisprdr.lo -MD -MP -MF $(DEPDIR)/libwi_la-lisprdr.Tpo -c -o libwi_la-lisprdr.lo `test -f 'lisprdr.c' || echo '$(srcdir)/'`lisprdr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-lisprdr.Tpo $(DEPDIR)/libwi_la-lisprdr.Plo
+ 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-lisprdr.lo -MD -MP -MF $(DEPDIR)/libwi_la-lisprdr.Tpo -c -o libwi_la-lisprdr.lo `test -f 'lisprdr.c' || echo '$(srcdir)/'`lisprdr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-lisprdr.Tpo $(DEPDIR)/libwi_la-lisprdr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lisprdr.c' object='libwi_la-lisprdr.lo' libtool=yes @AMDEPBACKSLASH@
@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-lisprdr.lo `test -f 'lisprdr.c' || echo '$(srcdir)/'`lisprdr.c
+ 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-lisprdr.lo `test -f 'lisprdr.c' || echo '$(srcdir)/'`lisprdr.c
libwi_la-lock.lo: lock.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-lock.lo -MD -MP -MF $(DEPDIR)/libwi_la-lock.Tpo -c -o libwi_la-lock.lo `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-lock.Tpo $(DEPDIR)/libwi_la-lock.Plo
+ 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-lock.lo -MD -MP -MF $(DEPDIR)/libwi_la-lock.Tpo -c -o libwi_la-lock.lo `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-lock.Tpo $(DEPDIR)/libwi_la-lock.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lock.c' object='libwi_la-lock.lo' libtool=yes @AMDEPBACKSLASH@
@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-lock.lo `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
+ 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-lock.lo `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
libwi_la-log.lo: log.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-log.lo -MD -MP -MF $(DEPDIR)/libwi_la-log.Tpo -c -o libwi_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-log.Tpo $(DEPDIR)/libwi_la-log.Plo
+ 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-log.lo -MD -MP -MF $(DEPDIR)/libwi_la-log.Tpo -c -o libwi_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-log.Tpo $(DEPDIR)/libwi_la-log.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='log.c' object='libwi_la-log.lo' libtool=yes @AMDEPBACKSLASH@
@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-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
+ 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-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
libwi_la-map_schema.lo: map_schema.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-map_schema.lo -MD -MP -MF $(DEPDIR)/libwi_la-map_schema.Tpo -c -o libwi_la-map_schema.lo `test -f 'map_schema.c' || echo '$(srcdir)/'`map_schema.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-map_schema.Tpo $(DEPDIR)/libwi_la-map_schema.Plo
+ 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-map_schema.lo -MD -MP -MF $(DEPDIR)/libwi_la-map_schema.Tpo -c -o libwi_la-map_schema.lo `test -f 'map_schema.c' || echo '$(srcdir)/'`map_schema.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-map_schema.Tpo $(DEPDIR)/libwi_la-map_schema.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='map_schema.c' object='libwi_la-map_schema.lo' libtool=yes @AMDEPBACKSLASH@
@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-map_schema.lo `test -f 'map_schema.c' || echo '$(srcdir)/'`map_schema.c
+ 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-map_schema.lo `test -f 'map_schema.c' || echo '$(srcdir)/'`map_schema.c
libwi_la-meta.lo: meta.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-meta.lo -MD -MP -MF $(DEPDIR)/libwi_la-meta.Tpo -c -o libwi_la-meta.lo `test -f 'meta.c' || echo '$(srcdir)/'`meta.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-meta.Tpo $(DEPDIR)/libwi_la-meta.Plo
+ 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-meta.lo -MD -MP -MF $(DEPDIR)/libwi_la-meta.Tpo -c -o libwi_la-meta.lo `test -f 'meta.c' || echo '$(srcdir)/'`meta.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-meta.Tpo $(DEPDIR)/libwi_la-meta.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='meta.c' object='libwi_la-meta.lo' libtool=yes @AMDEPBACKSLASH@
@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-meta.lo `test -f 'meta.c' || echo '$(srcdir)/'`meta.c
+ 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-meta.lo `test -f 'meta.c' || echo '$(srcdir)/'`meta.c
libwi_la-mtwrite.lo: mtwrite.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-mtwrite.lo -MD -MP -MF $(DEPDIR)/libwi_la-mtwrite.Tpo -c -o libwi_la-mtwrite.lo `test -f 'mtwrite.c' || echo '$(srcdir)/'`mtwrite.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-mtwrite.Tpo $(DEPDIR)/libwi_la-mtwrite.Plo
+ 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-mtwrite.lo -MD -MP -MF $(DEPDIR)/libwi_la-mtwrite.Tpo -c -o libwi_la-mtwrite.lo `test -f 'mtwrite.c' || echo '$(srcdir)/'`mtwrite.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-mtwrite.Tpo $(DEPDIR)/libwi_la-mtwrite.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mtwrite.c' object='libwi_la-mtwrite.lo' libtool=yes @AMDEPBACKSLASH@
@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-mtwrite.lo `test -f 'mtwrite.c' || echo '$(srcdir)/'`mtwrite.c
+ 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-mtwrite.lo `test -f 'mtwrite.c' || echo '$(srcdir)/'`mtwrite.c
libwi_la-multibyte.lo: multibyte.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-multibyte.lo -MD -MP -MF $(DEPDIR)/libwi_la-multibyte.Tpo -c -o libwi_la-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-multibyte.Tpo $(DEPDIR)/libwi_la-multibyte.Plo
+ 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-multibyte.lo -MD -MP -MF $(DEPDIR)/libwi_la-multibyte.Tpo -c -o libwi_la-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-multibyte.Tpo $(DEPDIR)/libwi_la-multibyte.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='multibyte.c' object='libwi_la-multibyte.lo' libtool=yes @AMDEPBACKSLASH@
@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-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
+ 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-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
libwi_la-neodisk.lo: neodisk.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-neodisk.lo -MD -MP -MF $(DEPDIR)/libwi_la-neodisk.Tpo -c -o libwi_la-neodisk.lo `test -f 'neodisk.c' || echo '$(srcdir)/'`neodisk.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-neodisk.Tpo $(DEPDIR)/libwi_la-neodisk.Plo
+ 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-neodisk.lo -MD -MP -MF $(DEPDIR)/libwi_la-neodisk.Tpo -c -o libwi_la-neodisk.lo `test -f 'neodisk.c' || echo '$(srcdir)/'`neodisk.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-neodisk.Tpo $(DEPDIR)/libwi_la-neodisk.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='neodisk.c' object='libwi_la-neodisk.lo' libtool=yes @AMDEPBACKSLASH@
@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-neodisk.lo `test -f 'neodisk.c' || echo '$(srcdir)/'`neodisk.c
+ 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-neodisk.lo `test -f 'neodisk.c' || echo '$(srcdir)/'`neodisk.c
libwi_la-numeric.lo: numeric.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-numeric.lo -MD -MP -MF $(DEPDIR)/libwi_la-numeric.Tpo -c -o libwi_la-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-numeric.Tpo $(DEPDIR)/libwi_la-numeric.Plo
+ 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-numeric.lo -MD -MP -MF $(DEPDIR)/libwi_la-numeric.Tpo -c -o libwi_la-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-numeric.Tpo $(DEPDIR)/libwi_la-numeric.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='numeric.c' object='libwi_la-numeric.lo' libtool=yes @AMDEPBACKSLASH@
@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-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
+ 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-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
libwi_la-obackup.lo: obackup.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-obackup.lo -MD -MP -MF $(DEPDIR)/libwi_la-obackup.Tpo -c -o libwi_la-obackup.lo `test -f 'obackup.c' || echo '$(srcdir)/'`obackup.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-obackup.Tpo $(DEPDIR)/libwi_la-obackup.Plo
+ 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-obackup.lo -MD -MP -MF $(DEPDIR)/libwi_la-obackup.Tpo -c -o libwi_la-obackup.lo `test -f 'obackup.c' || echo '$(srcdir)/'`obackup.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-obackup.Tpo $(DEPDIR)/libwi_la-obackup.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obackup.c' object='libwi_la-obackup.lo' libtool=yes @AMDEPBACKSLASH@
@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-obackup.lo `test -f 'obackup.c' || echo '$(srcdir)/'`obackup.c
+ 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-obackup.lo `test -f 'obackup.c' || echo '$(srcdir)/'`obackup.c
libwi_la-page.lo: page.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-page.lo -MD -MP -MF $(DEPDIR)/libwi_la-page.Tpo -c -o libwi_la-page.lo `test -f 'page.c' || echo '$(srcdir)/'`page.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-page.Tpo $(DEPDIR)/libwi_la-page.Plo
+ 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-page.lo -MD -MP -MF $(DEPDIR)/libwi_la-page.Tpo -c -o libwi_la-page.lo `test -f 'page.c' || echo '$(srcdir)/'`page.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-page.Tpo $(DEPDIR)/libwi_la-page.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='page.c' object='libwi_la-page.lo' libtool=yes @AMDEPBACKSLASH@
@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-page.lo `test -f 'page.c' || echo '$(srcdir)/'`page.c
+ 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-page.lo `test -f 'page.c' || echo '$(srcdir)/'`page.c
libwi_la-plugin_loader.lo: plugin_loader.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-plugin_loader.lo -MD -MP -MF $(DEPDIR)/libwi_la-plugin_loader.Tpo -c -o libwi_la-plugin_loader.lo `test -f 'plugin_loader.c' || echo '$(srcdir)/'`plugin_loader.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-plugin_loader.Tpo $(DEPDIR)/libwi_la-plugin_loader.Plo
+ 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-plugin_loader.lo -MD -MP -MF $(DEPDIR)/libwi_la-plugin_loader.Tpo -c -o libwi_la-plugin_loader.lo `test -f 'plugin_loader.c' || echo '$(srcdir)/'`plugin_loader.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-plugin_loader.Tpo $(DEPDIR)/libwi_la-plugin_loader.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plugin_loader.c' object='libwi_la-plugin_loader.lo' libtool=yes @AMDEPBACKSLASH@
@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-plugin_loader.lo `test -f 'plugin_loader.c' || echo '$(srcdir)/'`plugin_loader.c
+ 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-plugin_loader.lo `test -f 'plugin_loader.c' || echo '$(srcdir)/'`plugin_loader.c
libwi_la-recovery.lo: recovery.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-recovery.lo -MD -MP -MF $(DEPDIR)/libwi_la-recovery.Tpo -c -o libwi_la-recovery.lo `test -f 'recovery.c' || echo '$(srcdir)/'`recovery.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-recovery.Tpo $(DEPDIR)/libwi_la-recovery.Plo
+ 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-recovery.lo -MD -MP -MF $(DEPDIR)/libwi_la-recovery.Tpo -c -o libwi_la-recovery.lo `test -f 'recovery.c' || echo '$(srcdir)/'`recovery.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-recovery.Tpo $(DEPDIR)/libwi_la-recovery.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='recovery.c' object='libwi_la-recovery.lo' libtool=yes @AMDEPBACKSLASH@
@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-recovery.lo `test -f 'recovery.c' || echo '$(srcdir)/'`recovery.c
+ 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-recovery.lo `test -f 'recovery.c' || echo '$(srcdir)/'`recovery.c
libwi_la-regist.lo: regist.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-regist.lo -MD -MP -MF $(DEPDIR)/libwi_la-regist.Tpo -c -o libwi_la-regist.lo `test -f 'regist.c' || echo '$(srcdir)/'`regist.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-regist.Tpo $(DEPDIR)/libwi_la-regist.Plo
+ 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-regist.lo -MD -MP -MF $(DEPDIR)/libwi_la-regist.Tpo -c -o libwi_la-regist.lo `test -f 'regist.c' || echo '$(srcdir)/'`regist.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-regist.Tpo $(DEPDIR)/libwi_la-regist.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regist.c' object='libwi_la-regist.lo' libtool=yes @AMDEPBACKSLASH@
@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-regist.lo `test -f 'regist.c' || echo '$(srcdir)/'`regist.c
+ 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-regist.lo `test -f 'regist.c' || echo '$(srcdir)/'`regist.c
libwi_la-rendezvous.lo: rendezvous.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-rendezvous.lo -MD -MP -MF $(DEPDIR)/libwi_la-rendezvous.Tpo -c -o libwi_la-rendezvous.lo `test -f 'rendezvous.c' || echo '$(srcdir)/'`rendezvous.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-rendezvous.Tpo $(DEPDIR)/libwi_la-rendezvous.Plo
+ 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-rendezvous.lo -MD -MP -MF $(DEPDIR)/libwi_la-rendezvous.Tpo -c -o libwi_la-rendezvous.lo `test -f 'rendezvous.c' || echo '$(srcdir)/'`rendezvous.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-rendezvous.Tpo $(DEPDIR)/libwi_la-rendezvous.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rendezvous.c' object='libwi_la-rendezvous.lo' libtool=yes @AMDEPBACKSLASH@
@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-rendezvous.lo `test -f 'rendezvous.c' || echo '$(srcdir)/'`rendezvous.c
+ 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-rendezvous.lo `test -f 'rendezvous.c' || echo '$(srcdir)/'`rendezvous.c
libwi_la-rltrx.lo: rltrx.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-rltrx.lo -MD -MP -MF $(DEPDIR)/libwi_la-rltrx.Tpo -c -o libwi_la-rltrx.lo `test -f 'rltrx.c' || echo '$(srcdir)/'`rltrx.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-rltrx.Tpo $(DEPDIR)/libwi_la-rltrx.Plo
+ 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-rltrx.lo -MD -MP -MF $(DEPDIR)/libwi_la-rltrx.Tpo -c -o libwi_la-rltrx.lo `test -f 'rltrx.c' || echo '$(srcdir)/'`rltrx.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-rltrx.Tpo $(DEPDIR)/libwi_la-rltrx.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rltrx.c' object='libwi_la-rltrx.lo' libtool=yes @AMDEPBACKSLASH@
@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-rltrx.lo `test -f 'rltrx.c' || echo '$(srcdir)/'`rltrx.c
+ 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-rltrx.lo `test -f 'rltrx.c' || echo '$(srcdir)/'`rltrx.c
libwi_la-row.lo: row.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-row.lo -MD -MP -MF $(DEPDIR)/libwi_la-row.Tpo -c -o libwi_la-row.lo `test -f 'row.c' || echo '$(srcdir)/'`row.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-row.Tpo $(DEPDIR)/libwi_la-row.Plo
+ 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-row.lo -MD -MP -MF $(DEPDIR)/libwi_la-row.Tpo -c -o libwi_la-row.lo `test -f 'row.c' || echo '$(srcdir)/'`row.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-row.Tpo $(DEPDIR)/libwi_la-row.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='row.c' object='libwi_la-row.lo' libtool=yes @AMDEPBACKSLASH@
@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-row.lo `test -f 'row.c' || echo '$(srcdir)/'`row.c
+ 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-row.lo `test -f 'row.c' || echo '$(srcdir)/'`row.c
libwi_la-schspace.lo: schspace.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-schspace.lo -MD -MP -MF $(DEPDIR)/libwi_la-schspace.Tpo -c -o libwi_la-schspace.lo `test -f 'schspace.c' || echo '$(srcdir)/'`schspace.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-schspace.Tpo $(DEPDIR)/libwi_la-schspace.Plo
+ 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-schspace.lo -MD -MP -MF $(DEPDIR)/libwi_la-schspace.Tpo -c -o libwi_la-schspace.lo `test -f 'schspace.c' || echo '$(srcdir)/'`schspace.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-schspace.Tpo $(DEPDIR)/libwi_la-schspace.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='schspace.c' object='libwi_la-schspace.lo' libtool=yes @AMDEPBACKSLASH@
@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-schspace.lo `test -f 'schspace.c' || echo '$(srcdir)/'`schspace.c
+ 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-schspace.lo `test -f 'schspace.c' || echo '$(srcdir)/'`schspace.c
libwi_la-scn3.lo: scn3.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-scn3.lo -MD -MP -MF $(DEPDIR)/libwi_la-scn3.Tpo -c -o libwi_la-scn3.lo `test -f 'scn3.c' || echo '$(srcdir)/'`scn3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-scn3.Tpo $(DEPDIR)/libwi_la-scn3.Plo
+ 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-scn3.lo -MD -MP -MF $(DEPDIR)/libwi_la-scn3.Tpo -c -o libwi_la-scn3.lo `test -f 'scn3.c' || echo '$(srcdir)/'`scn3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-scn3.Tpo $(DEPDIR)/libwi_la-scn3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='scn3.c' object='libwi_la-scn3.lo' libtool=yes @AMDEPBACKSLASH@
@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-scn3.lo `test -f 'scn3.c' || echo '$(srcdir)/'`scn3.c
+ 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-scn3.lo `test -f 'scn3.c' || echo '$(srcdir)/'`scn3.c
libwi_la-search.lo: search.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-search.lo -MD -MP -MF $(DEPDIR)/libwi_la-search.Tpo -c -o libwi_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-search.Tpo $(DEPDIR)/libwi_la-search.Plo
+ 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-search.lo -MD -MP -MF $(DEPDIR)/libwi_la-search.Tpo -c -o libwi_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-search.Tpo $(DEPDIR)/libwi_la-search.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='search.c' object='libwi_la-search.lo' libtool=yes @AMDEPBACKSLASH@
@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-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ 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-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
libwi_la-search_in.lo: search_in.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-search_in.lo -MD -MP -MF $(DEPDIR)/libwi_la-search_in.Tpo -c -o libwi_la-search_in.lo `test -f 'search_in.c' || echo '$(srcdir)/'`search_in.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-search_in.Tpo $(DEPDIR)/libwi_la-search_in.Plo
+ 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-search_in.lo -MD -MP -MF $(DEPDIR)/libwi_la-search_in.Tpo -c -o libwi_la-search_in.lo `test -f 'search_in.c' || echo '$(srcdir)/'`search_in.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-search_in.Tpo $(DEPDIR)/libwi_la-search_in.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='search_in.c' object='libwi_la-search_in.lo' libtool=yes @AMDEPBACKSLASH@
@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-search_in.lo `test -f 'search_in.c' || echo '$(srcdir)/'`search_in.c
+ 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-search_in.lo `test -f 'search_in.c' || echo '$(srcdir)/'`search_in.c
libwi_la-security.lo: security.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-security.lo -MD -MP -MF $(DEPDIR)/libwi_la-security.Tpo -c -o libwi_la-security.lo `test -f 'security.c' || echo '$(srcdir)/'`security.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-security.Tpo $(DEPDIR)/libwi_la-security.Plo
+ 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-security.lo -MD -MP -MF $(DEPDIR)/libwi_la-security.Tpo -c -o libwi_la-security.lo `test -f 'security.c' || echo '$(srcdir)/'`security.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-security.Tpo $(DEPDIR)/libwi_la-security.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='security.c' object='libwi_la-security.lo' libtool=yes @AMDEPBACKSLASH@
@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-security.lo `test -f 'security.c' || echo '$(srcdir)/'`security.c
+ 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-security.lo `test -f 'security.c' || echo '$(srcdir)/'`security.c
libwi_la-shcompo.lo: shcompo.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-shcompo.lo -MD -MP -MF $(DEPDIR)/libwi_la-shcompo.Tpo -c -o libwi_la-shcompo.lo `test -f 'shcompo.c' || echo '$(srcdir)/'`shcompo.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-shcompo.Tpo $(DEPDIR)/libwi_la-shcompo.Plo
+ 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-shcompo.lo -MD -MP -MF $(DEPDIR)/libwi_la-shcompo.Tpo -c -o libwi_la-shcompo.lo `test -f 'shcompo.c' || echo '$(srcdir)/'`shcompo.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-shcompo.Tpo $(DEPDIR)/libwi_la-shcompo.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shcompo.c' object='libwi_la-shcompo.lo' libtool=yes @AMDEPBACKSLASH@
@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-shcompo.lo `test -f 'shcompo.c' || echo '$(srcdir)/'`shcompo.c
+ 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-shcompo.lo `test -f 'shcompo.c' || echo '$(srcdir)/'`shcompo.c
libwi_la-sort.lo: sort.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-sort.lo -MD -MP -MF $(DEPDIR)/libwi_la-sort.Tpo -c -o libwi_la-sort.lo `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sort.Tpo $(DEPDIR)/libwi_la-sort.Plo
+ 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-sort.lo -MD -MP -MF $(DEPDIR)/libwi_la-sort.Tpo -c -o libwi_la-sort.lo `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sort.Tpo $(DEPDIR)/libwi_la-sort.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sort.c' object='libwi_la-sort.lo' libtool=yes @AMDEPBACKSLASH@
@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-sort.lo `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
+ 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-sort.lo `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
libwi_la-space.lo: space.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-space.lo -MD -MP -MF $(DEPDIR)/libwi_la-space.Tpo -c -o libwi_la-space.lo `test -f 'space.c' || echo '$(srcdir)/'`space.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-space.Tpo $(DEPDIR)/libwi_la-space.Plo
+ 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-space.lo -MD -MP -MF $(DEPDIR)/libwi_la-space.Tpo -c -o libwi_la-space.lo `test -f 'space.c' || echo '$(srcdir)/'`space.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-space.Tpo $(DEPDIR)/libwi_la-space.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='space.c' object='libwi_la-space.lo' libtool=yes @AMDEPBACKSLASH@
@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-space.lo `test -f 'space.c' || echo '$(srcdir)/'`space.c
+ 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-space.lo `test -f 'space.c' || echo '$(srcdir)/'`space.c
libwi_la-sql3.lo: sql3.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-sql3.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql3.Tpo -c -o libwi_la-sql3.lo `test -f 'sql3.c' || echo '$(srcdir)/'`sql3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql3.Tpo $(DEPDIR)/libwi_la-sql3.Plo
+ 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-sql3.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql3.Tpo -c -o libwi_la-sql3.lo `test -f 'sql3.c' || echo '$(srcdir)/'`sql3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql3.Tpo $(DEPDIR)/libwi_la-sql3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql3.c' object='libwi_la-sql3.lo' libtool=yes @AMDEPBACKSLASH@
@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-sql3.lo `test -f 'sql3.c' || echo '$(srcdir)/'`sql3.c
+ 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-sql3.lo `test -f 'sql3.c' || echo '$(srcdir)/'`sql3.c
libwi_la-sqlbif2.lo: sqlbif2.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-sqlbif2.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlbif2.Tpo -c -o libwi_la-sqlbif2.lo `test -f 'sqlbif2.c' || echo '$(srcdir)/'`sqlbif2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlbif2.Tpo $(DEPDIR)/libwi_la-sqlbif2.Plo
+ 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-sqlbif2.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlbif2.Tpo -c -o libwi_la-sqlbif2.lo `test -f 'sqlbif2.c' || echo '$(srcdir)/'`sqlbif2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlbif2.Tpo $(DEPDIR)/libwi_la-sqlbif2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlbif2.c' object='libwi_la-sqlbif2.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlbif2.lo `test -f 'sqlbif2.c' || echo '$(srcdir)/'`sqlbif2.c
+ 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-sqlbif2.lo `test -f 'sqlbif2.c' || echo '$(srcdir)/'`sqlbif2.c
libwi_la-sqlbif.lo: sqlbif.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-sqlbif.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlbif.Tpo -c -o libwi_la-sqlbif.lo `test -f 'sqlbif.c' || echo '$(srcdir)/'`sqlbif.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlbif.Tpo $(DEPDIR)/libwi_la-sqlbif.Plo
+ 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-sqlbif.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlbif.Tpo -c -o libwi_la-sqlbif.lo `test -f 'sqlbif.c' || echo '$(srcdir)/'`sqlbif.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlbif.Tpo $(DEPDIR)/libwi_la-sqlbif.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlbif.c' object='libwi_la-sqlbif.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlbif.lo `test -f 'sqlbif.c' || echo '$(srcdir)/'`sqlbif.c
+ 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-sqlbif.lo `test -f 'sqlbif.c' || echo '$(srcdir)/'`sqlbif.c
libwi_la-sql_code.lo: sql_code.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.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code.Tpo -c -o libwi_la-sql_code.lo `test -f 'sql_code.c' || echo '$(srcdir)/'`sql_code.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code.Tpo $(DEPDIR)/libwi_la-sql_code.Plo
+ 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.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code.Tpo -c -o libwi_la-sql_code.lo `test -f 'sql_code.c' || echo '$(srcdir)/'`sql_code.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code.Tpo $(DEPDIR)/libwi_la-sql_code.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code.c' object='libwi_la-sql_code.lo' libtool=yes @AMDEPBACKSLASH@
@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.lo `test -f 'sql_code.c' || echo '$(srcdir)/'`sql_code.c
+ 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.lo `test -f 'sql_code.c' || echo '$(srcdir)/'`sql_code.c
libwi_la-sql_code_1.lo: sql_code_1.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_1.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_1.Tpo -c -o libwi_la-sql_code_1.lo `test -f 'sql_code_1.c' || echo '$(srcdir)/'`sql_code_1.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_1.Tpo $(DEPDIR)/libwi_la-sql_code_1.Plo
+ 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_1.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_1.Tpo -c -o libwi_la-sql_code_1.lo `test -f 'sql_code_1.c' || echo '$(srcdir)/'`sql_code_1.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_1.Tpo $(DEPDIR)/libwi_la-sql_code_1.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_1.c' object='libwi_la-sql_code_1.lo' libtool=yes @AMDEPBACKSLASH@
@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_1.lo `test -f 'sql_code_1.c' || echo '$(srcdir)/'`sql_code_1.c
+ 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_1.lo `test -f 'sql_code_1.c' || echo '$(srcdir)/'`sql_code_1.c
libwi_la-sql_code_2pc.lo: sql_code_2pc.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_2pc.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_2pc.Tpo -c -o libwi_la-sql_code_2pc.lo `test -f 'sql_code_2pc.c' || echo '$(srcdir)/'`sql_code_2pc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_2pc.Tpo $(DEPDIR)/libwi_la-sql_code_2pc.Plo
+ 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_2pc.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_2pc.Tpo -c -o libwi_la-sql_code_2pc.lo `test -f 'sql_code_2pc.c' || echo '$(srcdir)/'`sql_code_2pc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_2pc.Tpo $(DEPDIR)/libwi_la-sql_code_2pc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_2pc.c' object='libwi_la-sql_code_2pc.lo' libtool=yes @AMDEPBACKSLASH@
@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_2pc.lo `test -f 'sql_code_2pc.c' || echo '$(srcdir)/'`sql_code_2pc.c
+ 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_2pc.lo `test -f 'sql_code_2pc.c' || echo '$(srcdir)/'`sql_code_2pc.c
libwi_la-sql_code_adm.lo: sql_code_adm.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_adm.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_adm.Tpo -c -o libwi_la-sql_code_adm.lo `test -f 'sql_code_adm.c' || echo '$(srcdir)/'`sql_code_adm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_adm.Tpo $(DEPDIR)/libwi_la-sql_code_adm.Plo
+ 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_adm.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_adm.Tpo -c -o libwi_la-sql_code_adm.lo `test -f 'sql_code_adm.c' || echo '$(srcdir)/'`sql_code_adm.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_adm.Tpo $(DEPDIR)/libwi_la-sql_code_adm.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_adm.c' object='libwi_la-sql_code_adm.lo' libtool=yes @AMDEPBACKSLASH@
@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_adm.lo `test -f 'sql_code_adm.c' || echo '$(srcdir)/'`sql_code_adm.c
+ 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_adm.lo `test -f 'sql_code_adm.c' || echo '$(srcdir)/'`sql_code_adm.c
libwi_la-sql_code_auto.lo: sql_code_auto.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_auto.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_auto.Tpo -c -o libwi_la-sql_code_auto.lo `test -f 'sql_code_auto.c' || echo '$(srcdir)/'`sql_code_auto.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_auto.Tpo $(DEPDIR)/libwi_la-sql_code_auto.Plo
+ 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_auto.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_auto.Tpo -c -o libwi_la-sql_code_auto.lo `test -f 'sql_code_auto.c' || echo '$(srcdir)/'`sql_code_auto.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_auto.Tpo $(DEPDIR)/libwi_la-sql_code_auto.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_auto.c' object='libwi_la-sql_code_auto.lo' libtool=yes @AMDEPBACKSLASH@
@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_auto.lo `test -f 'sql_code_auto.c' || echo '$(srcdir)/'`sql_code_auto.c
+ 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_auto.lo `test -f 'sql_code_auto.c' || echo '$(srcdir)/'`sql_code_auto.c
libwi_la-sql_code_blog.lo: sql_code_blog.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_blog.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_blog.Tpo -c -o libwi_la-sql_code_blog.lo `test -f 'sql_code_blog.c' || echo '$(srcdir)/'`sql_code_blog.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_blog.Tpo $(DEPDIR)/libwi_la-sql_code_blog.Plo
+ 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_blog.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_blog.Tpo -c -o libwi_la-sql_code_blog.lo `test -f 'sql_code_blog.c' || echo '$(srcdir)/'`sql_code_blog.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_blog.Tpo $(DEPDIR)/libwi_la-sql_code_blog.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_blog.c' object='libwi_la-sql_code_blog.lo' libtool=yes @AMDEPBACKSLASH@
@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_blog.lo `test -f 'sql_code_blog.c' || echo '$(srcdir)/'`sql_code_blog.c
+ 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_blog.lo `test -f 'sql_code_blog.c' || echo '$(srcdir)/'`sql_code_blog.c
libwi_la-sql_code_cache.lo: sql_code_cache.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_cache.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_cache.Tpo -c -o libwi_la-sql_code_cache.lo `test -f 'sql_code_cache.c' || echo '$(srcdir)/'`sql_code_cache.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_cache.Tpo $(DEPDIR)/libwi_la-sql_code_cache.Plo
+ 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_cache.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_cache.Tpo -c -o libwi_la-sql_code_cache.lo `test -f 'sql_code_cache.c' || echo '$(srcdir)/'`sql_code_cache.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_cache.Tpo $(DEPDIR)/libwi_la-sql_code_cache.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_cache.c' object='libwi_la-sql_code_cache.lo' libtool=yes @AMDEPBACKSLASH@
@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_cache.lo `test -f 'sql_code_cache.c' || echo '$(srcdir)/'`sql_code_cache.c
+ 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_cache.lo `test -f 'sql_code_cache.c' || echo '$(srcdir)/'`sql_code_cache.c
libwi_la-sql_code_dav.lo: sql_code_dav.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_dav.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_dav.Tpo -c -o libwi_la-sql_code_dav.lo `test -f 'sql_code_dav.c' || echo '$(srcdir)/'`sql_code_dav.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_dav.Tpo $(DEPDIR)/libwi_la-sql_code_dav.Plo
+ 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_dav.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_dav.Tpo -c -o libwi_la-sql_code_dav.lo `test -f 'sql_code_dav.c' || echo '$(srcdir)/'`sql_code_dav.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_dav.Tpo $(DEPDIR)/libwi_la-sql_code_dav.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_dav.c' object='libwi_la-sql_code_dav.lo' libtool=yes @AMDEPBACKSLASH@
@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_dav.lo `test -f 'sql_code_dav.c' || echo '$(srcdir)/'`sql_code_dav.c
+ 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_dav.lo `test -f 'sql_code_dav.c' || echo '$(srcdir)/'`sql_code_dav.c
libwi_la-sql_code_dbp.lo: sql_code_dbp.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_dbp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_dbp.Tpo -c -o libwi_la-sql_code_dbp.lo `test -f 'sql_code_dbp.c' || echo '$(srcdir)/'`sql_code_dbp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_dbp.Tpo $(DEPDIR)/libwi_la-sql_code_dbp.Plo
+ 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_dbp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_dbp.Tpo -c -o libwi_la-sql_code_dbp.lo `test -f 'sql_code_dbp.c' || echo '$(srcdir)/'`sql_code_dbp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_dbp.Tpo $(DEPDIR)/libwi_la-sql_code_dbp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_dbp.c' object='libwi_la-sql_code_dbp.lo' libtool=yes @AMDEPBACKSLASH@
@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_dbp.lo `test -f 'sql_code_dbp.c' || echo '$(srcdir)/'`sql_code_dbp.c
+ 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_dbp.lo `test -f 'sql_code_dbp.c' || echo '$(srcdir)/'`sql_code_dbp.c
libwi_la-sql_code_ddk.lo: sql_code_ddk.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_ddk.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_ddk.Tpo -c -o libwi_la-sql_code_ddk.lo `test -f 'sql_code_ddk.c' || echo '$(srcdir)/'`sql_code_ddk.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_ddk.Tpo $(DEPDIR)/libwi_la-sql_code_ddk.Plo
+ 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_ddk.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_ddk.Tpo -c -o libwi_la-sql_code_ddk.lo `test -f 'sql_code_ddk.c' || echo '$(srcdir)/'`sql_code_ddk.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_ddk.Tpo $(DEPDIR)/libwi_la-sql_code_ddk.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_ddk.c' object='libwi_la-sql_code_ddk.lo' libtool=yes @AMDEPBACKSLASH@
@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_ddk.lo `test -f 'sql_code_ddk.c' || echo '$(srcdir)/'`sql_code_ddk.c
+ 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_ddk.lo `test -f 'sql_code_ddk.c' || echo '$(srcdir)/'`sql_code_ddk.c
libwi_la-sql_code_imsg.lo: sql_code_imsg.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_imsg.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_imsg.Tpo -c -o libwi_la-sql_code_imsg.lo `test -f 'sql_code_imsg.c' || echo '$(srcdir)/'`sql_code_imsg.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_imsg.Tpo $(DEPDIR)/libwi_la-sql_code_imsg.Plo
+ 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_imsg.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_imsg.Tpo -c -o libwi_la-sql_code_imsg.lo `test -f 'sql_code_imsg.c' || echo '$(srcdir)/'`sql_code_imsg.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_imsg.Tpo $(DEPDIR)/libwi_la-sql_code_imsg.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_imsg.c' object='libwi_la-sql_code_imsg.lo' libtool=yes @AMDEPBACKSLASH@
@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_imsg.lo `test -f 'sql_code_imsg.c' || echo '$(srcdir)/'`sql_code_imsg.c
+ 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_imsg.lo `test -f 'sql_code_imsg.c' || echo '$(srcdir)/'`sql_code_imsg.c
libwi_la-sql_code_pldbg.lo: sql_code_pldbg.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_pldbg.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_pldbg.Tpo -c -o libwi_la-sql_code_pldbg.lo `test -f 'sql_code_pldbg.c' || echo '$(srcdir)/'`sql_code_pldbg.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_pldbg.Tpo $(DEPDIR)/libwi_la-sql_code_pldbg.Plo
+ 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_pldbg.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_pldbg.Tpo -c -o libwi_la-sql_code_pldbg.lo `test -f 'sql_code_pldbg.c' || echo '$(srcdir)/'`sql_code_pldbg.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_pldbg.Tpo $(DEPDIR)/libwi_la-sql_code_pldbg.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_pldbg.c' object='libwi_la-sql_code_pldbg.lo' libtool=yes @AMDEPBACKSLASH@
@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_pldbg.lo `test -f 'sql_code_pldbg.c' || echo '$(srcdir)/'`sql_code_pldbg.c
+ 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_pldbg.lo `test -f 'sql_code_pldbg.c' || echo '$(srcdir)/'`sql_code_pldbg.c
libwi_la-sql_code_repl.lo: sql_code_repl.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_repl.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_repl.Tpo -c -o libwi_la-sql_code_repl.lo `test -f 'sql_code_repl.c' || echo '$(srcdir)/'`sql_code_repl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_repl.Tpo $(DEPDIR)/libwi_la-sql_code_repl.Plo
+ 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_repl.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_repl.Tpo -c -o libwi_la-sql_code_repl.lo `test -f 'sql_code_repl.c' || echo '$(srcdir)/'`sql_code_repl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_repl.Tpo $(DEPDIR)/libwi_la-sql_code_repl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_repl.c' object='libwi_la-sql_code_repl.lo' libtool=yes @AMDEPBACKSLASH@
@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_repl.lo `test -f 'sql_code_repl.c' || echo '$(srcdir)/'`sql_code_repl.c
+ 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_repl.lo `test -f 'sql_code_repl.c' || echo '$(srcdir)/'`sql_code_repl.c
libwi_la-sql_code_sparql.lo: sql_code_sparql.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.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_sparql.Tpo -c -o libwi_la-sql_code_sparql.lo `test -f 'sql_code_sparql.c' || echo '$(srcdir)/'`sql_code_sparql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_sparql.Tpo $(DEPDIR)/libwi_la-sql_code_sparql.Plo
+ 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.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_sparql.Tpo -c -o libwi_la-sql_code_sparql.lo `test -f 'sql_code_sparql.c' || echo '$(srcdir)/'`sql_code_sparql.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_sparql.Tpo $(DEPDIR)/libwi_la-sql_code_sparql.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_sparql.c' object='libwi_la-sql_code_sparql.lo' libtool=yes @AMDEPBACKSLASH@
@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.lo `test -f 'sql_code_sparql.c' || echo '$(srcdir)/'`sql_code_sparql.c
+ 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.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@ mv -f $(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
- 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_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
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_sys.Tpo $(DEPDIR)/libwi_la-sql_code_sys.Plo
+ 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_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
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_sys.Tpo $(DEPDIR)/libwi_la-sql_code_sys.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_sys.c' object='libwi_la-sql_code_sys.lo' libtool=yes @AMDEPBACKSLASH@
@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_sys.lo `test -f 'sql_code_sys.c' || echo '$(srcdir)/'`sql_code_sys.c
+ 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_sys.lo `test -f 'sql_code_sys.c' || echo '$(srcdir)/'`sql_code_sys.c
libwi_la-sql_code_uddi.lo: sql_code_uddi.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_uddi.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_uddi.Tpo -c -o libwi_la-sql_code_uddi.lo `test -f 'sql_code_uddi.c' || echo '$(srcdir)/'`sql_code_uddi.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_uddi.Tpo $(DEPDIR)/libwi_la-sql_code_uddi.Plo
+ 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_uddi.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_uddi.Tpo -c -o libwi_la-sql_code_uddi.lo `test -f 'sql_code_uddi.c' || echo '$(srcdir)/'`sql_code_uddi.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_uddi.Tpo $(DEPDIR)/libwi_la-sql_code_uddi.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_uddi.c' object='libwi_la-sql_code_uddi.lo' libtool=yes @AMDEPBACKSLASH@
@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_uddi.lo `test -f 'sql_code_uddi.c' || echo '$(srcdir)/'`sql_code_uddi.c
+ 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_uddi.lo `test -f 'sql_code_uddi.c' || echo '$(srcdir)/'`sql_code_uddi.c
libwi_la-sql_code_vad.lo: sql_code_vad.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_vad.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_vad.Tpo -c -o libwi_la-sql_code_vad.lo `test -f 'sql_code_vad.c' || echo '$(srcdir)/'`sql_code_vad.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_vad.Tpo $(DEPDIR)/libwi_la-sql_code_vad.Plo
+ 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_vad.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_vad.Tpo -c -o libwi_la-sql_code_vad.lo `test -f 'sql_code_vad.c' || echo '$(srcdir)/'`sql_code_vad.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_vad.Tpo $(DEPDIR)/libwi_la-sql_code_vad.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_vad.c' object='libwi_la-sql_code_vad.lo' libtool=yes @AMDEPBACKSLASH@
@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_vad.lo `test -f 'sql_code_vad.c' || echo '$(srcdir)/'`sql_code_vad.c
+ 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_vad.lo `test -f 'sql_code_vad.c' || echo '$(srcdir)/'`sql_code_vad.c
libwi_la-sql_code_vdb.lo: sql_code_vdb.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_vdb.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_vdb.Tpo -c -o libwi_la-sql_code_vdb.lo `test -f 'sql_code_vdb.c' || echo '$(srcdir)/'`sql_code_vdb.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_vdb.Tpo $(DEPDIR)/libwi_la-sql_code_vdb.Plo
+ 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_vdb.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_vdb.Tpo -c -o libwi_la-sql_code_vdb.lo `test -f 'sql_code_vdb.c' || echo '$(srcdir)/'`sql_code_vdb.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_vdb.Tpo $(DEPDIR)/libwi_la-sql_code_vdb.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_vdb.c' object='libwi_la-sql_code_vdb.lo' libtool=yes @AMDEPBACKSLASH@
@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_vdb.lo `test -f 'sql_code_vdb.c' || echo '$(srcdir)/'`sql_code_vdb.c
+ 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_vdb.lo `test -f 'sql_code_vdb.c' || echo '$(srcdir)/'`sql_code_vdb.c
libwi_la-sql_code_ws.lo: sql_code_ws.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_ws.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_ws.Tpo -c -o libwi_la-sql_code_ws.lo `test -f 'sql_code_ws.c' || echo '$(srcdir)/'`sql_code_ws.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_ws.Tpo $(DEPDIR)/libwi_la-sql_code_ws.Plo
+ 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_ws.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_ws.Tpo -c -o libwi_la-sql_code_ws.lo `test -f 'sql_code_ws.c' || echo '$(srcdir)/'`sql_code_ws.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sql_code_ws.Tpo $(DEPDIR)/libwi_la-sql_code_ws.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_ws.c' object='libwi_la-sql_code_ws.lo' libtool=yes @AMDEPBACKSLASH@
@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_ws.lo `test -f 'sql_code_ws.c' || echo '$(srcdir)/'`sql_code_ws.c
+ 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_ws.lo `test -f 'sql_code_ws.c' || echo '$(srcdir)/'`sql_code_ws.c
libwi_la-sqlcomp2.lo: sqlcomp2.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-sqlcomp2.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlcomp2.Tpo -c -o libwi_la-sqlcomp2.lo `test -f 'sqlcomp2.c' || echo '$(srcdir)/'`sqlcomp2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlcomp2.Tpo $(DEPDIR)/libwi_la-sqlcomp2.Plo
+ 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-sqlcomp2.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlcomp2.Tpo -c -o libwi_la-sqlcomp2.lo `test -f 'sqlcomp2.c' || echo '$(srcdir)/'`sqlcomp2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlcomp2.Tpo $(DEPDIR)/libwi_la-sqlcomp2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlcomp2.c' object='libwi_la-sqlcomp2.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlcomp2.lo `test -f 'sqlcomp2.c' || echo '$(srcdir)/'`sqlcomp2.c
+ 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-sqlcomp2.lo `test -f 'sqlcomp2.c' || echo '$(srcdir)/'`sqlcomp2.c
libwi_la-sqlcomp.lo: sqlcomp.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-sqlcomp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlcomp.Tpo -c -o libwi_la-sqlcomp.lo `test -f 'sqlcomp.c' || echo '$(srcdir)/'`sqlcomp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlcomp.Tpo $(DEPDIR)/libwi_la-sqlcomp.Plo
+ 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-sqlcomp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlcomp.Tpo -c -o libwi_la-sqlcomp.lo `test -f 'sqlcomp.c' || echo '$(srcdir)/'`sqlcomp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlcomp.Tpo $(DEPDIR)/libwi_la-sqlcomp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlcomp.c' object='libwi_la-sqlcomp.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlcomp.lo `test -f 'sqlcomp.c' || echo '$(srcdir)/'`sqlcomp.c
+ 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-sqlcomp.lo `test -f 'sqlcomp.c' || echo '$(srcdir)/'`sqlcomp.c
libwi_la-sqlcost.lo: sqlcost.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-sqlcost.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlcost.Tpo -c -o libwi_la-sqlcost.lo `test -f 'sqlcost.c' || echo '$(srcdir)/'`sqlcost.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlcost.Tpo $(DEPDIR)/libwi_la-sqlcost.Plo
+ 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-sqlcost.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlcost.Tpo -c -o libwi_la-sqlcost.lo `test -f 'sqlcost.c' || echo '$(srcdir)/'`sqlcost.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlcost.Tpo $(DEPDIR)/libwi_la-sqlcost.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlcost.c' object='libwi_la-sqlcost.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlcost.lo `test -f 'sqlcost.c' || echo '$(srcdir)/'`sqlcost.c
+ 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-sqlcost.lo `test -f 'sqlcost.c' || echo '$(srcdir)/'`sqlcost.c
libwi_la-sqlcr.lo: sqlcr.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-sqlcr.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlcr.Tpo -c -o libwi_la-sqlcr.lo `test -f 'sqlcr.c' || echo '$(srcdir)/'`sqlcr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlcr.Tpo $(DEPDIR)/libwi_la-sqlcr.Plo
+ 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-sqlcr.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlcr.Tpo -c -o libwi_la-sqlcr.lo `test -f 'sqlcr.c' || echo '$(srcdir)/'`sqlcr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlcr.Tpo $(DEPDIR)/libwi_la-sqlcr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlcr.c' object='libwi_la-sqlcr.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlcr.lo `test -f 'sqlcr.c' || echo '$(srcdir)/'`sqlcr.c
+ 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-sqlcr.lo `test -f 'sqlcr.c' || echo '$(srcdir)/'`sqlcr.c
libwi_la-sqldf.lo: sqldf.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-sqldf.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqldf.Tpo -c -o libwi_la-sqldf.lo `test -f 'sqldf.c' || echo '$(srcdir)/'`sqldf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqldf.Tpo $(DEPDIR)/libwi_la-sqldf.Plo
+ 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-sqldf.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqldf.Tpo -c -o libwi_la-sqldf.lo `test -f 'sqldf.c' || echo '$(srcdir)/'`sqldf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqldf.Tpo $(DEPDIR)/libwi_la-sqldf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqldf.c' object='libwi_la-sqldf.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqldf.lo `test -f 'sqldf.c' || echo '$(srcdir)/'`sqldf.c
+ 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-sqldf.lo `test -f 'sqldf.c' || echo '$(srcdir)/'`sqldf.c
libwi_la-sqlexp.lo: sqlexp.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-sqlexp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlexp.Tpo -c -o libwi_la-sqlexp.lo `test -f 'sqlexp.c' || echo '$(srcdir)/'`sqlexp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlexp.Tpo $(DEPDIR)/libwi_la-sqlexp.Plo
+ 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-sqlexp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlexp.Tpo -c -o libwi_la-sqlexp.lo `test -f 'sqlexp.c' || echo '$(srcdir)/'`sqlexp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlexp.Tpo $(DEPDIR)/libwi_la-sqlexp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlexp.c' object='libwi_la-sqlexp.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlexp.lo `test -f 'sqlexp.c' || echo '$(srcdir)/'`sqlexp.c
+ 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-sqlexp.lo `test -f 'sqlexp.c' || echo '$(srcdir)/'`sqlexp.c
libwi_la-sqlgen.lo: sqlgen.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-sqlgen.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlgen.Tpo -c -o libwi_la-sqlgen.lo `test -f 'sqlgen.c' || echo '$(srcdir)/'`sqlgen.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlgen.Tpo $(DEPDIR)/libwi_la-sqlgen.Plo
+ 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-sqlgen.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlgen.Tpo -c -o libwi_la-sqlgen.lo `test -f 'sqlgen.c' || echo '$(srcdir)/'`sqlgen.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlgen.Tpo $(DEPDIR)/libwi_la-sqlgen.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlgen.c' object='libwi_la-sqlgen.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlgen.lo `test -f 'sqlgen.c' || echo '$(srcdir)/'`sqlgen.c
+ 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-sqlgen.lo `test -f 'sqlgen.c' || echo '$(srcdir)/'`sqlgen.c
libwi_la-sqlhash.lo: sqlhash.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-sqlhash.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlhash.Tpo -c -o libwi_la-sqlhash.lo `test -f 'sqlhash.c' || echo '$(srcdir)/'`sqlhash.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlhash.Tpo $(DEPDIR)/libwi_la-sqlhash.Plo
+ 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-sqlhash.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlhash.Tpo -c -o libwi_la-sqlhash.lo `test -f 'sqlhash.c' || echo '$(srcdir)/'`sqlhash.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlhash.Tpo $(DEPDIR)/libwi_la-sqlhash.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlhash.c' object='libwi_la-sqlhash.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlhash.lo `test -f 'sqlhash.c' || echo '$(srcdir)/'`sqlhash.c
+ 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-sqlhash.lo `test -f 'sqlhash.c' || echo '$(srcdir)/'`sqlhash.c
libwi_la-sqlintrp.lo: sqlintrp.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-sqlintrp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlintrp.Tpo -c -o libwi_la-sqlintrp.lo `test -f 'sqlintrp.c' || echo '$(srcdir)/'`sqlintrp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlintrp.Tpo $(DEPDIR)/libwi_la-sqlintrp.Plo
+ 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-sqlintrp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlintrp.Tpo -c -o libwi_la-sqlintrp.lo `test -f 'sqlintrp.c' || echo '$(srcdir)/'`sqlintrp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlintrp.Tpo $(DEPDIR)/libwi_la-sqlintrp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlintrp.c' object='libwi_la-sqlintrp.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlintrp.lo `test -f 'sqlintrp.c' || echo '$(srcdir)/'`sqlintrp.c
+ 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-sqlintrp.lo `test -f 'sqlintrp.c' || echo '$(srcdir)/'`sqlintrp.c
libwi_la-sqlinx.lo: sqlinx.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-sqlinx.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlinx.Tpo -c -o libwi_la-sqlinx.lo `test -f 'sqlinx.c' || echo '$(srcdir)/'`sqlinx.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlinx.Tpo $(DEPDIR)/libwi_la-sqlinx.Plo
+ 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-sqlinx.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlinx.Tpo -c -o libwi_la-sqlinx.lo `test -f 'sqlinx.c' || echo '$(srcdir)/'`sqlinx.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlinx.Tpo $(DEPDIR)/libwi_la-sqlinx.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlinx.c' object='libwi_la-sqlinx.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlinx.lo `test -f 'sqlinx.c' || echo '$(srcdir)/'`sqlinx.c
+ 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-sqlinx.lo `test -f 'sqlinx.c' || echo '$(srcdir)/'`sqlinx.c
libwi_la-sqloby.lo: sqloby.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-sqloby.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqloby.Tpo -c -o libwi_la-sqloby.lo `test -f 'sqloby.c' || echo '$(srcdir)/'`sqloby.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqloby.Tpo $(DEPDIR)/libwi_la-sqloby.Plo
+ 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-sqloby.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqloby.Tpo -c -o libwi_la-sqloby.lo `test -f 'sqloby.c' || echo '$(srcdir)/'`sqloby.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqloby.Tpo $(DEPDIR)/libwi_la-sqloby.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqloby.c' object='libwi_la-sqloby.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqloby.lo `test -f 'sqloby.c' || echo '$(srcdir)/'`sqloby.c
+ 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-sqloby.lo `test -f 'sqloby.c' || echo '$(srcdir)/'`sqloby.c
libwi_la-sqlo.lo: sqlo.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-sqlo.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlo.Tpo -c -o libwi_la-sqlo.lo `test -f 'sqlo.c' || echo '$(srcdir)/'`sqlo.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlo.Tpo $(DEPDIR)/libwi_la-sqlo.Plo
+ 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-sqlo.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlo.Tpo -c -o libwi_la-sqlo.lo `test -f 'sqlo.c' || echo '$(srcdir)/'`sqlo.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlo.Tpo $(DEPDIR)/libwi_la-sqlo.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlo.c' object='libwi_la-sqlo.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlo.lo `test -f 'sqlo.c' || echo '$(srcdir)/'`sqlo.c
+ 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-sqlo.lo `test -f 'sqlo.c' || echo '$(srcdir)/'`sqlo.c
libwi_la-sqlocr.lo: sqlocr.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-sqlocr.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlocr.Tpo -c -o libwi_la-sqlocr.lo `test -f 'sqlocr.c' || echo '$(srcdir)/'`sqlocr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlocr.Tpo $(DEPDIR)/libwi_la-sqlocr.Plo
+ 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-sqlocr.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlocr.Tpo -c -o libwi_la-sqlocr.lo `test -f 'sqlocr.c' || echo '$(srcdir)/'`sqlocr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlocr.Tpo $(DEPDIR)/libwi_la-sqlocr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlocr.c' object='libwi_la-sqlocr.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlocr.lo `test -f 'sqlocr.c' || echo '$(srcdir)/'`sqlocr.c
+ 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-sqlocr.lo `test -f 'sqlocr.c' || echo '$(srcdir)/'`sqlocr.c
libwi_la-sqloinv.lo: sqloinv.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-sqloinv.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqloinv.Tpo -c -o libwi_la-sqloinv.lo `test -f 'sqloinv.c' || echo '$(srcdir)/'`sqloinv.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqloinv.Tpo $(DEPDIR)/libwi_la-sqloinv.Plo
+ 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-sqloinv.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqloinv.Tpo -c -o libwi_la-sqloinv.lo `test -f 'sqloinv.c' || echo '$(srcdir)/'`sqloinv.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqloinv.Tpo $(DEPDIR)/libwi_la-sqloinv.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqloinv.c' object='libwi_la-sqloinv.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqloinv.lo `test -f 'sqloinv.c' || echo '$(srcdir)/'`sqloinv.c
+ 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-sqloinv.lo `test -f 'sqloinv.c' || echo '$(srcdir)/'`sqloinv.c
libwi_la-sqloinx.lo: sqloinx.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-sqloinx.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqloinx.Tpo -c -o libwi_la-sqloinx.lo `test -f 'sqloinx.c' || echo '$(srcdir)/'`sqloinx.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqloinx.Tpo $(DEPDIR)/libwi_la-sqloinx.Plo
+ 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-sqloinx.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqloinx.Tpo -c -o libwi_la-sqloinx.lo `test -f 'sqloinx.c' || echo '$(srcdir)/'`sqloinx.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqloinx.Tpo $(DEPDIR)/libwi_la-sqloinx.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqloinx.c' object='libwi_la-sqloinx.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqloinx.lo `test -f 'sqloinx.c' || echo '$(srcdir)/'`sqloinx.c
+ 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-sqloinx.lo `test -f 'sqloinx.c' || echo '$(srcdir)/'`sqloinx.c
libwi_la-sqloprt.lo: sqloprt.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-sqloprt.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqloprt.Tpo -c -o libwi_la-sqloprt.lo `test -f 'sqloprt.c' || echo '$(srcdir)/'`sqloprt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqloprt.Tpo $(DEPDIR)/libwi_la-sqloprt.Plo
+ 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-sqloprt.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqloprt.Tpo -c -o libwi_la-sqloprt.lo `test -f 'sqloprt.c' || echo '$(srcdir)/'`sqloprt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqloprt.Tpo $(DEPDIR)/libwi_la-sqloprt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqloprt.c' object='libwi_la-sqloprt.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqloprt.lo `test -f 'sqloprt.c' || echo '$(srcdir)/'`sqloprt.c
+ 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-sqloprt.lo `test -f 'sqloprt.c' || echo '$(srcdir)/'`sqloprt.c
libwi_la-sqlorder.lo: sqlorder.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-sqlorder.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlorder.Tpo -c -o libwi_la-sqlorder.lo `test -f 'sqlorder.c' || echo '$(srcdir)/'`sqlorder.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlorder.Tpo $(DEPDIR)/libwi_la-sqlorder.Plo
+ 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-sqlorder.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlorder.Tpo -c -o libwi_la-sqlorder.lo `test -f 'sqlorder.c' || echo '$(srcdir)/'`sqlorder.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlorder.Tpo $(DEPDIR)/libwi_la-sqlorder.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlorder.c' object='libwi_la-sqlorder.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlorder.lo `test -f 'sqlorder.c' || echo '$(srcdir)/'`sqlorder.c
+ 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-sqlorder.lo `test -f 'sqlorder.c' || echo '$(srcdir)/'`sqlorder.c
libwi_la-sqlovdb.lo: sqlovdb.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-sqlovdb.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlovdb.Tpo -c -o libwi_la-sqlovdb.lo `test -f 'sqlovdb.c' || echo '$(srcdir)/'`sqlovdb.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlovdb.Tpo $(DEPDIR)/libwi_la-sqlovdb.Plo
+ 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-sqlovdb.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlovdb.Tpo -c -o libwi_la-sqlovdb.lo `test -f 'sqlovdb.c' || echo '$(srcdir)/'`sqlovdb.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlovdb.Tpo $(DEPDIR)/libwi_la-sqlovdb.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlovdb.c' object='libwi_la-sqlovdb.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlovdb.lo `test -f 'sqlovdb.c' || echo '$(srcdir)/'`sqlovdb.c
+ 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-sqlovdb.lo `test -f 'sqlovdb.c' || echo '$(srcdir)/'`sqlovdb.c
libwi_la-sqlpfn.lo: sqlpfn.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-sqlpfn.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlpfn.Tpo -c -o libwi_la-sqlpfn.lo `test -f 'sqlpfn.c' || echo '$(srcdir)/'`sqlpfn.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlpfn.Tpo $(DEPDIR)/libwi_la-sqlpfn.Plo
+ 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-sqlpfn.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlpfn.Tpo -c -o libwi_la-sqlpfn.lo `test -f 'sqlpfn.c' || echo '$(srcdir)/'`sqlpfn.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlpfn.Tpo $(DEPDIR)/libwi_la-sqlpfn.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlpfn.c' object='libwi_la-sqlpfn.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlpfn.lo `test -f 'sqlpfn.c' || echo '$(srcdir)/'`sqlpfn.c
+ 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-sqlpfn.lo `test -f 'sqlpfn.c' || echo '$(srcdir)/'`sqlpfn.c
libwi_la-sqlprocc.lo: sqlprocc.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-sqlprocc.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlprocc.Tpo -c -o libwi_la-sqlprocc.lo `test -f 'sqlprocc.c' || echo '$(srcdir)/'`sqlprocc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlprocc.Tpo $(DEPDIR)/libwi_la-sqlprocc.Plo
+ 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-sqlprocc.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlprocc.Tpo -c -o libwi_la-sqlprocc.lo `test -f 'sqlprocc.c' || echo '$(srcdir)/'`sqlprocc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlprocc.Tpo $(DEPDIR)/libwi_la-sqlprocc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlprocc.c' object='libwi_la-sqlprocc.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlprocc.lo `test -f 'sqlprocc.c' || echo '$(srcdir)/'`sqlprocc.c
+ 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-sqlprocc.lo `test -f 'sqlprocc.c' || echo '$(srcdir)/'`sqlprocc.c
libwi_la-sqlprt.lo: sqlprt.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-sqlprt.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlprt.Tpo -c -o libwi_la-sqlprt.lo `test -f 'sqlprt.c' || echo '$(srcdir)/'`sqlprt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlprt.Tpo $(DEPDIR)/libwi_la-sqlprt.Plo
+ 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-sqlprt.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlprt.Tpo -c -o libwi_la-sqlprt.lo `test -f 'sqlprt.c' || echo '$(srcdir)/'`sqlprt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlprt.Tpo $(DEPDIR)/libwi_la-sqlprt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlprt.c' object='libwi_la-sqlprt.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlprt.lo `test -f 'sqlprt.c' || echo '$(srcdir)/'`sqlprt.c
+ 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-sqlprt.lo `test -f 'sqlprt.c' || echo '$(srcdir)/'`sqlprt.c
libwi_la-sqlrun.lo: sqlrun.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-sqlrun.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlrun.Tpo -c -o libwi_la-sqlrun.lo `test -f 'sqlrun.c' || echo '$(srcdir)/'`sqlrun.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlrun.Tpo $(DEPDIR)/libwi_la-sqlrun.Plo
+ 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-sqlrun.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlrun.Tpo -c -o libwi_la-sqlrun.lo `test -f 'sqlrun.c' || echo '$(srcdir)/'`sqlrun.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlrun.Tpo $(DEPDIR)/libwi_la-sqlrun.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlrun.c' object='libwi_la-sqlrun.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlrun.lo `test -f 'sqlrun.c' || echo '$(srcdir)/'`sqlrun.c
+ 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-sqlrun.lo `test -f 'sqlrun.c' || echo '$(srcdir)/'`sqlrun.c
libwi_la-sqlsrv.lo: sqlsrv.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-sqlsrv.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlsrv.Tpo -c -o libwi_la-sqlsrv.lo `test -f 'sqlsrv.c' || echo '$(srcdir)/'`sqlsrv.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlsrv.Tpo $(DEPDIR)/libwi_la-sqlsrv.Plo
+ 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-sqlsrv.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlsrv.Tpo -c -o libwi_la-sqlsrv.lo `test -f 'sqlsrv.c' || echo '$(srcdir)/'`sqlsrv.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlsrv.Tpo $(DEPDIR)/libwi_la-sqlsrv.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlsrv.c' object='libwi_la-sqlsrv.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlsrv.lo `test -f 'sqlsrv.c' || echo '$(srcdir)/'`sqlsrv.c
+ 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-sqlsrv.lo `test -f 'sqlsrv.c' || echo '$(srcdir)/'`sqlsrv.c
libwi_la-sqlstmts.lo: sqlstmts.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-sqlstmts.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlstmts.Tpo -c -o libwi_la-sqlstmts.lo `test -f 'sqlstmts.c' || echo '$(srcdir)/'`sqlstmts.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlstmts.Tpo $(DEPDIR)/libwi_la-sqlstmts.Plo
+ 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-sqlstmts.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlstmts.Tpo -c -o libwi_la-sqlstmts.lo `test -f 'sqlstmts.c' || echo '$(srcdir)/'`sqlstmts.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlstmts.Tpo $(DEPDIR)/libwi_la-sqlstmts.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlstmts.c' object='libwi_la-sqlstmts.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlstmts.lo `test -f 'sqlstmts.c' || echo '$(srcdir)/'`sqlstmts.c
+ 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-sqlstmts.lo `test -f 'sqlstmts.c' || echo '$(srcdir)/'`sqlstmts.c
libwi_la-sqltrig.lo: sqltrig.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-sqltrig.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqltrig.Tpo -c -o libwi_la-sqltrig.lo `test -f 'sqltrig.c' || echo '$(srcdir)/'`sqltrig.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqltrig.Tpo $(DEPDIR)/libwi_la-sqltrig.Plo
+ 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-sqltrig.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqltrig.Tpo -c -o libwi_la-sqltrig.lo `test -f 'sqltrig.c' || echo '$(srcdir)/'`sqltrig.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqltrig.Tpo $(DEPDIR)/libwi_la-sqltrig.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqltrig.c' object='libwi_la-sqltrig.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqltrig.lo `test -f 'sqltrig.c' || echo '$(srcdir)/'`sqltrig.c
+ 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-sqltrig.lo `test -f 'sqltrig.c' || echo '$(srcdir)/'`sqltrig.c
libwi_la-sqltype.lo: sqltype.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-sqltype.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqltype.Tpo -c -o libwi_la-sqltype.lo `test -f 'sqltype.c' || echo '$(srcdir)/'`sqltype.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqltype.Tpo $(DEPDIR)/libwi_la-sqltype.Plo
+ 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-sqltype.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqltype.Tpo -c -o libwi_la-sqltype.lo `test -f 'sqltype.c' || echo '$(srcdir)/'`sqltype.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqltype.Tpo $(DEPDIR)/libwi_la-sqltype.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqltype.c' object='libwi_la-sqltype.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqltype.lo `test -f 'sqltype.c' || echo '$(srcdir)/'`sqltype.c
+ 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-sqltype.lo `test -f 'sqltype.c' || echo '$(srcdir)/'`sqltype.c
libwi_la-sqlver.lo: sqlver.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-sqlver.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlver.Tpo -c -o libwi_la-sqlver.lo `test -f 'sqlver.c' || echo '$(srcdir)/'`sqlver.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlver.Tpo $(DEPDIR)/libwi_la-sqlver.Plo
+ 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-sqlver.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlver.Tpo -c -o libwi_la-sqlver.lo `test -f 'sqlver.c' || echo '$(srcdir)/'`sqlver.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlver.Tpo $(DEPDIR)/libwi_la-sqlver.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlver.c' object='libwi_la-sqlver.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlver.lo `test -f 'sqlver.c' || echo '$(srcdir)/'`sqlver.c
+ 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-sqlver.lo `test -f 'sqlver.c' || echo '$(srcdir)/'`sqlver.c
libwi_la-sqlview.lo: sqlview.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-sqlview.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlview.Tpo -c -o libwi_la-sqlview.lo `test -f 'sqlview.c' || echo '$(srcdir)/'`sqlview.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlview.Tpo $(DEPDIR)/libwi_la-sqlview.Plo
+ 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-sqlview.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlview.Tpo -c -o libwi_la-sqlview.lo `test -f 'sqlview.c' || echo '$(srcdir)/'`sqlview.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlview.Tpo $(DEPDIR)/libwi_la-sqlview.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlview.c' object='libwi_la-sqlview.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlview.lo `test -f 'sqlview.c' || echo '$(srcdir)/'`sqlview.c
+ 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-sqlview.lo `test -f 'sqlview.c' || echo '$(srcdir)/'`sqlview.c
libwi_la-srvcr.lo: srvcr.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-srvcr.lo -MD -MP -MF $(DEPDIR)/libwi_la-srvcr.Tpo -c -o libwi_la-srvcr.lo `test -f 'srvcr.c' || echo '$(srcdir)/'`srvcr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-srvcr.Tpo $(DEPDIR)/libwi_la-srvcr.Plo
+ 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-srvcr.lo -MD -MP -MF $(DEPDIR)/libwi_la-srvcr.Tpo -c -o libwi_la-srvcr.lo `test -f 'srvcr.c' || echo '$(srcdir)/'`srvcr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-srvcr.Tpo $(DEPDIR)/libwi_la-srvcr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srvcr.c' object='libwi_la-srvcr.lo' libtool=yes @AMDEPBACKSLASH@
@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-srvcr.lo `test -f 'srvcr.c' || echo '$(srcdir)/'`srvcr.c
+ 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-srvcr.lo `test -f 'srvcr.c' || echo '$(srcdir)/'`srvcr.c
libwi_la-srvmultibyte.lo: srvmultibyte.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-srvmultibyte.lo -MD -MP -MF $(DEPDIR)/libwi_la-srvmultibyte.Tpo -c -o libwi_la-srvmultibyte.lo `test -f 'srvmultibyte.c' || echo '$(srcdir)/'`srvmultibyte.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-srvmultibyte.Tpo $(DEPDIR)/libwi_la-srvmultibyte.Plo
+ 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-srvmultibyte.lo -MD -MP -MF $(DEPDIR)/libwi_la-srvmultibyte.Tpo -c -o libwi_la-srvmultibyte.lo `test -f 'srvmultibyte.c' || echo '$(srcdir)/'`srvmultibyte.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-srvmultibyte.Tpo $(DEPDIR)/libwi_la-srvmultibyte.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srvmultibyte.c' object='libwi_la-srvmultibyte.lo' libtool=yes @AMDEPBACKSLASH@
@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-srvmultibyte.lo `test -f 'srvmultibyte.c' || echo '$(srcdir)/'`srvmultibyte.c
+ 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-srvmultibyte.lo `test -f 'srvmultibyte.c' || echo '$(srcdir)/'`srvmultibyte.c
libwi_la-srvstat.lo: srvstat.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-srvstat.lo -MD -MP -MF $(DEPDIR)/libwi_la-srvstat.Tpo -c -o libwi_la-srvstat.lo `test -f 'srvstat.c' || echo '$(srcdir)/'`srvstat.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-srvstat.Tpo $(DEPDIR)/libwi_la-srvstat.Plo
+ 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-srvstat.lo -MD -MP -MF $(DEPDIR)/libwi_la-srvstat.Tpo -c -o libwi_la-srvstat.lo `test -f 'srvstat.c' || echo '$(srcdir)/'`srvstat.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-srvstat.Tpo $(DEPDIR)/libwi_la-srvstat.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srvstat.c' object='libwi_la-srvstat.lo' libtool=yes @AMDEPBACKSLASH@
@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-srvstat.lo `test -f 'srvstat.c' || echo '$(srcdir)/'`srvstat.c
+ 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-srvstat.lo `test -f 'srvstat.c' || echo '$(srcdir)/'`srvstat.c
libwi_la-string.lo: string.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-string.lo -MD -MP -MF $(DEPDIR)/libwi_la-string.Tpo -c -o libwi_la-string.lo `test -f 'string.c' || echo '$(srcdir)/'`string.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-string.Tpo $(DEPDIR)/libwi_la-string.Plo
+ 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-string.lo -MD -MP -MF $(DEPDIR)/libwi_la-string.Tpo -c -o libwi_la-string.lo `test -f 'string.c' || echo '$(srcdir)/'`string.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-string.Tpo $(DEPDIR)/libwi_la-string.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='string.c' object='libwi_la-string.lo' libtool=yes @AMDEPBACKSLASH@
@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-string.lo `test -f 'string.c' || echo '$(srcdir)/'`string.c
+ 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-string.lo `test -f 'string.c' || echo '$(srcdir)/'`string.c
libwi_la-trans.lo: trans.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-trans.lo -MD -MP -MF $(DEPDIR)/libwi_la-trans.Tpo -c -o libwi_la-trans.lo `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-trans.Tpo $(DEPDIR)/libwi_la-trans.Plo
+ 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-trans.lo -MD -MP -MF $(DEPDIR)/libwi_la-trans.Tpo -c -o libwi_la-trans.lo `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-trans.Tpo $(DEPDIR)/libwi_la-trans.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trans.c' object='libwi_la-trans.lo' libtool=yes @AMDEPBACKSLASH@
@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-trans.lo `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
+ 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-trans.lo `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
libwi_la-update.lo: update.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-update.lo -MD -MP -MF $(DEPDIR)/libwi_la-update.Tpo -c -o libwi_la-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-update.Tpo $(DEPDIR)/libwi_la-update.Plo
+ 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-update.lo -MD -MP -MF $(DEPDIR)/libwi_la-update.Tpo -c -o libwi_la-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-update.Tpo $(DEPDIR)/libwi_la-update.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='update.c' object='libwi_la-update.lo' libtool=yes @AMDEPBACKSLASH@
@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-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
+ 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-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
libwi_la-uuencode.lo: uuencode.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-uuencode.lo -MD -MP -MF $(DEPDIR)/libwi_la-uuencode.Tpo -c -o libwi_la-uuencode.lo `test -f 'uuencode.c' || echo '$(srcdir)/'`uuencode.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-uuencode.Tpo $(DEPDIR)/libwi_la-uuencode.Plo
+ 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-uuencode.lo -MD -MP -MF $(DEPDIR)/libwi_la-uuencode.Tpo -c -o libwi_la-uuencode.lo `test -f 'uuencode.c' || echo '$(srcdir)/'`uuencode.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-uuencode.Tpo $(DEPDIR)/libwi_la-uuencode.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uuencode.c' object='libwi_la-uuencode.lo' libtool=yes @AMDEPBACKSLASH@
@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-uuencode.lo `test -f 'uuencode.c' || echo '$(srcdir)/'`uuencode.c
+ 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-uuencode.lo `test -f 'uuencode.c' || echo '$(srcdir)/'`uuencode.c
libwi_la-wirpc.lo: wirpc.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-wirpc.lo -MD -MP -MF $(DEPDIR)/libwi_la-wirpc.Tpo -c -o libwi_la-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-wirpc.Tpo $(DEPDIR)/libwi_la-wirpc.Plo
+ 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-wirpc.lo -MD -MP -MF $(DEPDIR)/libwi_la-wirpc.Tpo -c -o libwi_la-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-wirpc.Tpo $(DEPDIR)/libwi_la-wirpc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wirpc.c' object='libwi_la-wirpc.lo' libtool=yes @AMDEPBACKSLASH@
@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-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
+ 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-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
libwi_la-wiservic.lo: wiservic.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-wiservic.lo -MD -MP -MF $(DEPDIR)/libwi_la-wiservic.Tpo -c -o libwi_la-wiservic.lo `test -f 'wiservic.c' || echo '$(srcdir)/'`wiservic.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-wiservic.Tpo $(DEPDIR)/libwi_la-wiservic.Plo
+ 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-wiservic.lo -MD -MP -MF $(DEPDIR)/libwi_la-wiservic.Tpo -c -o libwi_la-wiservic.lo `test -f 'wiservic.c' || echo '$(srcdir)/'`wiservic.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-wiservic.Tpo $(DEPDIR)/libwi_la-wiservic.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wiservic.c' object='libwi_la-wiservic.lo' libtool=yes @AMDEPBACKSLASH@
@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-wiservic.lo `test -f 'wiservic.c' || echo '$(srcdir)/'`wiservic.c
+ 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-wiservic.lo `test -f 'wiservic.c' || echo '$(srcdir)/'`wiservic.c
libwi_la-xpathp.lo: xpathp.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-xpathp.lo -MD -MP -MF $(DEPDIR)/libwi_la-xpathp.Tpo -c -o libwi_la-xpathp.lo `test -f 'xpathp.c' || echo '$(srcdir)/'`xpathp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xpathp.Tpo $(DEPDIR)/libwi_la-xpathp.Plo
+ 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-xpathp.lo -MD -MP -MF $(DEPDIR)/libwi_la-xpathp.Tpo -c -o libwi_la-xpathp.lo `test -f 'xpathp.c' || echo '$(srcdir)/'`xpathp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xpathp.Tpo $(DEPDIR)/libwi_la-xpathp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xpathp.c' object='libwi_la-xpathp.lo' libtool=yes @AMDEPBACKSLASH@
@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-xpathp.lo `test -f 'xpathp.c' || echo '$(srcdir)/'`xpathp.c
+ 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-xpathp.lo `test -f 'xpathp.c' || echo '$(srcdir)/'`xpathp.c
libwi_la-xpscn.lo: xpscn.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-xpscn.lo -MD -MP -MF $(DEPDIR)/libwi_la-xpscn.Tpo -c -o libwi_la-xpscn.lo `test -f 'xpscn.c' || echo '$(srcdir)/'`xpscn.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xpscn.Tpo $(DEPDIR)/libwi_la-xpscn.Plo
+ 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-xpscn.lo -MD -MP -MF $(DEPDIR)/libwi_la-xpscn.Tpo -c -o libwi_la-xpscn.lo `test -f 'xpscn.c' || echo '$(srcdir)/'`xpscn.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xpscn.Tpo $(DEPDIR)/libwi_la-xpscn.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xpscn.c' object='libwi_la-xpscn.lo' libtool=yes @AMDEPBACKSLASH@
@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-xpscn.lo `test -f 'xpscn.c' || echo '$(srcdir)/'`xpscn.c
+ 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-xpscn.lo `test -f 'xpscn.c' || echo '$(srcdir)/'`xpscn.c
libwi_la-jso.lo: jso.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-jso.lo -MD -MP -MF $(DEPDIR)/libwi_la-jso.Tpo -c -o libwi_la-jso.lo `test -f 'jso.c' || echo '$(srcdir)/'`jso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-jso.Tpo $(DEPDIR)/libwi_la-jso.Plo
+ 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-jso.lo -MD -MP -MF $(DEPDIR)/libwi_la-jso.Tpo -c -o libwi_la-jso.lo `test -f 'jso.c' || echo '$(srcdir)/'`jso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-jso.Tpo $(DEPDIR)/libwi_la-jso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='jso.c' object='libwi_la-jso.lo' libtool=yes @AMDEPBACKSLASH@
@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-jso.lo `test -f 'jso.c' || echo '$(srcdir)/'`jso.c
+ 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-jso.lo `test -f 'jso.c' || echo '$(srcdir)/'`jso.c
libwi_la-rdfbox.lo: rdfbox.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-rdfbox.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdfbox.Tpo -c -o libwi_la-rdfbox.lo `test -f 'rdfbox.c' || echo '$(srcdir)/'`rdfbox.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-rdfbox.Tpo $(DEPDIR)/libwi_la-rdfbox.Plo
+ 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-rdfbox.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdfbox.Tpo -c -o libwi_la-rdfbox.lo `test -f 'rdfbox.c' || echo '$(srcdir)/'`rdfbox.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-rdfbox.Tpo $(DEPDIR)/libwi_la-rdfbox.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdfbox.c' object='libwi_la-rdfbox.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdfbox.lo `test -f 'rdfbox.c' || echo '$(srcdir)/'`rdfbox.c
+ 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-rdfbox.lo `test -f 'rdfbox.c' || echo '$(srcdir)/'`rdfbox.c
libwi_la-rdf_core.lo: rdf_core.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-rdf_core.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdf_core.Tpo -c -o libwi_la-rdf_core.lo `test -f 'rdf_core.c' || echo '$(srcdir)/'`rdf_core.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-rdf_core.Tpo $(DEPDIR)/libwi_la-rdf_core.Plo
+ 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-rdf_core.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdf_core.Tpo -c -o libwi_la-rdf_core.lo `test -f 'rdf_core.c' || echo '$(srcdir)/'`rdf_core.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-rdf_core.Tpo $(DEPDIR)/libwi_la-rdf_core.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdf_core.c' object='libwi_la-rdf_core.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdf_core.lo `test -f 'rdf_core.c' || echo '$(srcdir)/'`rdf_core.c
+ 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-rdf_core.lo `test -f 'rdf_core.c' || echo '$(srcdir)/'`rdf_core.c
libwi_la-rdfinf.lo: rdfinf.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-rdfinf.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdfinf.Tpo -c -o libwi_la-rdfinf.lo `test -f 'rdfinf.c' || echo '$(srcdir)/'`rdfinf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-rdfinf.Tpo $(DEPDIR)/libwi_la-rdfinf.Plo
+ 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-rdfinf.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdfinf.Tpo -c -o libwi_la-rdfinf.lo `test -f 'rdfinf.c' || echo '$(srcdir)/'`rdfinf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-rdfinf.Tpo $(DEPDIR)/libwi_la-rdfinf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdfinf.c' object='libwi_la-rdfinf.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdfinf.lo `test -f 'rdfinf.c' || echo '$(srcdir)/'`rdfinf.c
+ 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-rdfinf.lo `test -f 'rdfinf.c' || echo '$(srcdir)/'`rdfinf.c
libwi_la-rdf_mapping_jso.lo: rdf_mapping_jso.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-rdf_mapping_jso.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdf_mapping_jso.Tpo -c -o libwi_la-rdf_mapping_jso.lo `test -f 'rdf_mapping_jso.c' || echo '$(srcdir)/'`rdf_mapping_jso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-rdf_mapping_jso.Tpo $(DEPDIR)/libwi_la-rdf_mapping_jso.Plo
+ 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-rdf_mapping_jso.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdf_mapping_jso.Tpo -c -o libwi_la-rdf_mapping_jso.lo `test -f 'rdf_mapping_jso.c' || echo '$(srcdir)/'`rdf_mapping_jso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-rdf_mapping_jso.Tpo $(DEPDIR)/libwi_la-rdf_mapping_jso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdf_mapping_jso.c' object='libwi_la-rdf_mapping_jso.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdf_mapping_jso.lo `test -f 'rdf_mapping_jso.c' || echo '$(srcdir)/'`rdf_mapping_jso.c
+ 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-rdf_mapping_jso.lo `test -f 'rdf_mapping_jso.c' || echo '$(srcdir)/'`rdf_mapping_jso.c
libwi_la-rdfxml_parser.lo: rdfxml_parser.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-rdfxml_parser.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdfxml_parser.Tpo -c -o libwi_la-rdfxml_parser.lo `test -f 'rdfxml_parser.c' || echo '$(srcdir)/'`rdfxml_parser.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-rdfxml_parser.Tpo $(DEPDIR)/libwi_la-rdfxml_parser.Plo
+ 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-rdfxml_parser.lo -MD -MP -MF $(DEPDIR)/libwi_la-rdfxml_parser.Tpo -c -o libwi_la-rdfxml_parser.lo `test -f 'rdfxml_parser.c' || echo '$(srcdir)/'`rdfxml_parser.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-rdfxml_parser.Tpo $(DEPDIR)/libwi_la-rdfxml_parser.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdfxml_parser.c' object='libwi_la-rdfxml_parser.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdfxml_parser.lo `test -f 'rdfxml_parser.c' || echo '$(srcdir)/'`rdfxml_parser.c
+ 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-rdfxml_parser.lo `test -f 'rdfxml_parser.c' || echo '$(srcdir)/'`rdfxml_parser.c
libwi_la-nquad_p.lo: nquad_p.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-nquad_p.lo -MD -MP -MF $(DEPDIR)/libwi_la-nquad_p.Tpo -c -o libwi_la-nquad_p.lo `test -f 'nquad_p.c' || echo '$(srcdir)/'`nquad_p.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-nquad_p.Tpo $(DEPDIR)/libwi_la-nquad_p.Plo
+ 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-nquad_p.lo -MD -MP -MF $(DEPDIR)/libwi_la-nquad_p.Tpo -c -o libwi_la-nquad_p.lo `test -f 'nquad_p.c' || echo '$(srcdir)/'`nquad_p.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-nquad_p.Tpo $(DEPDIR)/libwi_la-nquad_p.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nquad_p.c' object='libwi_la-nquad_p.lo' libtool=yes @AMDEPBACKSLASH@
@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-nquad_p.lo `test -f 'nquad_p.c' || echo '$(srcdir)/'`nquad_p.c
+ 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-nquad_p.lo `test -f 'nquad_p.c' || echo '$(srcdir)/'`nquad_p.c
libwi_la-sparql2sql.lo: sparql2sql.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-sparql2sql.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql2sql.Tpo -c -o libwi_la-sparql2sql.lo `test -f 'sparql2sql.c' || echo '$(srcdir)/'`sparql2sql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql2sql.Tpo $(DEPDIR)/libwi_la-sparql2sql.Plo
+ 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-sparql2sql.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql2sql.Tpo -c -o libwi_la-sparql2sql.lo `test -f 'sparql2sql.c' || echo '$(srcdir)/'`sparql2sql.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql2sql.Tpo $(DEPDIR)/libwi_la-sparql2sql.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql2sql.c' object='libwi_la-sparql2sql.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql2sql.lo `test -f 'sparql2sql.c' || echo '$(srcdir)/'`sparql2sql.c
+ 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-sparql2sql.lo `test -f 'sparql2sql.c' || echo '$(srcdir)/'`sparql2sql.c
libwi_la-sparql2sqltext.lo: sparql2sqltext.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-sparql2sqltext.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql2sqltext.Tpo -c -o libwi_la-sparql2sqltext.lo `test -f 'sparql2sqltext.c' || echo '$(srcdir)/'`sparql2sqltext.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql2sqltext.Tpo $(DEPDIR)/libwi_la-sparql2sqltext.Plo
+ 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-sparql2sqltext.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql2sqltext.Tpo -c -o libwi_la-sparql2sqltext.lo `test -f 'sparql2sqltext.c' || echo '$(srcdir)/'`sparql2sqltext.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql2sqltext.Tpo $(DEPDIR)/libwi_la-sparql2sqltext.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql2sqltext.c' object='libwi_la-sparql2sqltext.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql2sqltext.lo `test -f 'sparql2sqltext.c' || echo '$(srcdir)/'`sparql2sqltext.c
+ 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-sparql2sqltext.lo `test -f 'sparql2sqltext.c' || echo '$(srcdir)/'`sparql2sqltext.c
libwi_la-sparqld.lo: sparqld.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-sparqld.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparqld.Tpo -c -o libwi_la-sparqld.lo `test -f 'sparqld.c' || echo '$(srcdir)/'`sparqld.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparqld.Tpo $(DEPDIR)/libwi_la-sparqld.Plo
+ 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-sparqld.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparqld.Tpo -c -o libwi_la-sparqld.lo `test -f 'sparqld.c' || echo '$(srcdir)/'`sparqld.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparqld.Tpo $(DEPDIR)/libwi_la-sparqld.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparqld.c' object='libwi_la-sparqld.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparqld.lo `test -f 'sparqld.c' || echo '$(srcdir)/'`sparqld.c
+ 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-sparqld.lo `test -f 'sparqld.c' || echo '$(srcdir)/'`sparqld.c
libwi_la-sparql_core.lo: sparql_core.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-sparql_core.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_core.Tpo -c -o libwi_la-sparql_core.lo `test -f 'sparql_core.c' || echo '$(srcdir)/'`sparql_core.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql_core.Tpo $(DEPDIR)/libwi_la-sparql_core.Plo
+ 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-sparql_core.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_core.Tpo -c -o libwi_la-sparql_core.lo `test -f 'sparql_core.c' || echo '$(srcdir)/'`sparql_core.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql_core.Tpo $(DEPDIR)/libwi_la-sparql_core.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_core.c' object='libwi_la-sparql_core.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_core.lo `test -f 'sparql_core.c' || echo '$(srcdir)/'`sparql_core.c
+ 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-sparql_core.lo `test -f 'sparql_core.c' || echo '$(srcdir)/'`sparql_core.c
libwi_la-sparql_l.lo: sparql_l.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-sparql_l.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_l.Tpo -c -o libwi_la-sparql_l.lo `test -f 'sparql_l.c' || echo '$(srcdir)/'`sparql_l.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql_l.Tpo $(DEPDIR)/libwi_la-sparql_l.Plo
+ 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-sparql_l.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_l.Tpo -c -o libwi_la-sparql_l.lo `test -f 'sparql_l.c' || echo '$(srcdir)/'`sparql_l.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql_l.Tpo $(DEPDIR)/libwi_la-sparql_l.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_l.c' object='libwi_la-sparql_l.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_l.lo `test -f 'sparql_l.c' || echo '$(srcdir)/'`sparql_l.c
+ 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-sparql_l.lo `test -f 'sparql_l.c' || echo '$(srcdir)/'`sparql_l.c
libwi_la-sparql_p.lo: sparql_p.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-sparql_p.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_p.Tpo -c -o libwi_la-sparql_p.lo `test -f 'sparql_p.c' || echo '$(srcdir)/'`sparql_p.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql_p.Tpo $(DEPDIR)/libwi_la-sparql_p.Plo
+ 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-sparql_p.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_p.Tpo -c -o libwi_la-sparql_p.lo `test -f 'sparql_p.c' || echo '$(srcdir)/'`sparql_p.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql_p.Tpo $(DEPDIR)/libwi_la-sparql_p.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_p.c' object='libwi_la-sparql_p.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_p.lo `test -f 'sparql_p.c' || echo '$(srcdir)/'`sparql_p.c
+ 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-sparql_p.lo `test -f 'sparql_p.c' || echo '$(srcdir)/'`sparql_p.c
libwi_la-sparql_qm.lo: sparql_qm.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-sparql_qm.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_qm.Tpo -c -o libwi_la-sparql_qm.lo `test -f 'sparql_qm.c' || echo '$(srcdir)/'`sparql_qm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql_qm.Tpo $(DEPDIR)/libwi_la-sparql_qm.Plo
+ 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-sparql_qm.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_qm.Tpo -c -o libwi_la-sparql_qm.lo `test -f 'sparql_qm.c' || echo '$(srcdir)/'`sparql_qm.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql_qm.Tpo $(DEPDIR)/libwi_la-sparql_qm.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_qm.c' object='libwi_la-sparql_qm.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_qm.lo `test -f 'sparql_qm.c' || echo '$(srcdir)/'`sparql_qm.c
+ 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-sparql_qm.lo `test -f 'sparql_qm.c' || echo '$(srcdir)/'`sparql_qm.c
libwi_la-sparql_sff.lo: sparql_sff.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-sparql_sff.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_sff.Tpo -c -o libwi_la-sparql_sff.lo `test -f 'sparql_sff.c' || echo '$(srcdir)/'`sparql_sff.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql_sff.Tpo $(DEPDIR)/libwi_la-sparql_sff.Plo
+ 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-sparql_sff.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_sff.Tpo -c -o libwi_la-sparql_sff.lo `test -f 'sparql_sff.c' || echo '$(srcdir)/'`sparql_sff.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql_sff.Tpo $(DEPDIR)/libwi_la-sparql_sff.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_sff.c' object='libwi_la-sparql_sff.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_sff.lo `test -f 'sparql_sff.c' || echo '$(srcdir)/'`sparql_sff.c
+ 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-sparql_sff.lo `test -f 'sparql_sff.c' || echo '$(srcdir)/'`sparql_sff.c
libwi_la-sparql_tree.lo: sparql_tree.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-sparql_tree.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_tree.Tpo -c -o libwi_la-sparql_tree.lo `test -f 'sparql_tree.c' || echo '$(srcdir)/'`sparql_tree.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql_tree.Tpo $(DEPDIR)/libwi_la-sparql_tree.Plo
+ 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-sparql_tree.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_tree.Tpo -c -o libwi_la-sparql_tree.lo `test -f 'sparql_tree.c' || echo '$(srcdir)/'`sparql_tree.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql_tree.Tpo $(DEPDIR)/libwi_la-sparql_tree.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_tree.c' object='libwi_la-sparql_tree.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_tree.lo `test -f 'sparql_tree.c' || echo '$(srcdir)/'`sparql_tree.c
+ 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-sparql_tree.lo `test -f 'sparql_tree.c' || echo '$(srcdir)/'`sparql_tree.c
libwi_la-sparql_rdb2rdf.lo: sparql_rdb2rdf.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-sparql_rdb2rdf.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_rdb2rdf.Tpo -c -o libwi_la-sparql_rdb2rdf.lo `test -f 'sparql_rdb2rdf.c' || echo '$(srcdir)/'`sparql_rdb2rdf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparql_rdb2rdf.Tpo $(DEPDIR)/libwi_la-sparql_rdb2rdf.Plo
+ 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-sparql_rdb2rdf.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparql_rdb2rdf.Tpo -c -o libwi_la-sparql_rdb2rdf.lo `test -f 'sparql_rdb2rdf.c' || echo '$(srcdir)/'`sparql_rdb2rdf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparql_rdb2rdf.Tpo $(DEPDIR)/libwi_la-sparql_rdb2rdf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_rdb2rdf.c' object='libwi_la-sparql_rdb2rdf.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_rdb2rdf.lo `test -f 'sparql_rdb2rdf.c' || echo '$(srcdir)/'`sparql_rdb2rdf.c
+ 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-sparql_rdb2rdf.lo `test -f 'sparql_rdb2rdf.c' || echo '$(srcdir)/'`sparql_rdb2rdf.c
libwi_la-sparul2sql.lo: sparul2sql.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-sparul2sql.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparul2sql.Tpo -c -o libwi_la-sparul2sql.lo `test -f 'sparul2sql.c' || echo '$(srcdir)/'`sparul2sql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sparul2sql.Tpo $(DEPDIR)/libwi_la-sparul2sql.Plo
+ 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-sparul2sql.lo -MD -MP -MF $(DEPDIR)/libwi_la-sparul2sql.Tpo -c -o libwi_la-sparul2sql.lo `test -f 'sparul2sql.c' || echo '$(srcdir)/'`sparul2sql.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sparul2sql.Tpo $(DEPDIR)/libwi_la-sparul2sql.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparul2sql.c' object='libwi_la-sparul2sql.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparul2sql.lo `test -f 'sparul2sql.c' || echo '$(srcdir)/'`sparul2sql.c
+ 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-sparul2sql.lo `test -f 'sparul2sql.c' || echo '$(srcdir)/'`sparul2sql.c
libwi_la-turtle_l.lo: turtle_l.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-turtle_l.lo -MD -MP -MF $(DEPDIR)/libwi_la-turtle_l.Tpo -c -o libwi_la-turtle_l.lo `test -f 'turtle_l.c' || echo '$(srcdir)/'`turtle_l.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-turtle_l.Tpo $(DEPDIR)/libwi_la-turtle_l.Plo
+ 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-turtle_l.lo -MD -MP -MF $(DEPDIR)/libwi_la-turtle_l.Tpo -c -o libwi_la-turtle_l.lo `test -f 'turtle_l.c' || echo '$(srcdir)/'`turtle_l.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-turtle_l.Tpo $(DEPDIR)/libwi_la-turtle_l.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='turtle_l.c' object='libwi_la-turtle_l.lo' libtool=yes @AMDEPBACKSLASH@
@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-turtle_l.lo `test -f 'turtle_l.c' || echo '$(srcdir)/'`turtle_l.c
+ 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-turtle_l.lo `test -f 'turtle_l.c' || echo '$(srcdir)/'`turtle_l.c
libwi_la-turtle_p.lo: turtle_p.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-turtle_p.lo -MD -MP -MF $(DEPDIR)/libwi_la-turtle_p.Tpo -c -o libwi_la-turtle_p.lo `test -f 'turtle_p.c' || echo '$(srcdir)/'`turtle_p.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-turtle_p.Tpo $(DEPDIR)/libwi_la-turtle_p.Plo
+ 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-turtle_p.lo -MD -MP -MF $(DEPDIR)/libwi_la-turtle_p.Tpo -c -o libwi_la-turtle_p.lo `test -f 'turtle_p.c' || echo '$(srcdir)/'`turtle_p.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-turtle_p.Tpo $(DEPDIR)/libwi_la-turtle_p.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='turtle_p.c' object='libwi_la-turtle_p.lo' libtool=yes @AMDEPBACKSLASH@
@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-turtle_p.lo `test -f 'turtle_p.c' || echo '$(srcdir)/'`turtle_p.c
+ 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-turtle_p.lo `test -f 'turtle_p.c' || echo '$(srcdir)/'`turtle_p.c
libwi_la-pldebug.lo: pldebug.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-pldebug.lo -MD -MP -MF $(DEPDIR)/libwi_la-pldebug.Tpo -c -o libwi_la-pldebug.lo `test -f 'pldebug.c' || echo '$(srcdir)/'`pldebug.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-pldebug.Tpo $(DEPDIR)/libwi_la-pldebug.Plo
+ 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-pldebug.lo -MD -MP -MF $(DEPDIR)/libwi_la-pldebug.Tpo -c -o libwi_la-pldebug.lo `test -f 'pldebug.c' || echo '$(srcdir)/'`pldebug.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-pldebug.Tpo $(DEPDIR)/libwi_la-pldebug.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pldebug.c' object='libwi_la-pldebug.lo' libtool=yes @AMDEPBACKSLASH@
@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-pldebug.lo `test -f 'pldebug.c' || echo '$(srcdir)/'`pldebug.c
+ 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-pldebug.lo `test -f 'pldebug.c' || echo '$(srcdir)/'`pldebug.c
libwi_la-bif_date.lo: bif_date.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-bif_date.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_date.Tpo -c -o libwi_la-bif_date.lo `test -f 'bif_date.c' || echo '$(srcdir)/'`bif_date.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_date.Tpo $(DEPDIR)/libwi_la-bif_date.Plo
+ 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-bif_date.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_date.Tpo -c -o libwi_la-bif_date.lo `test -f 'bif_date.c' || echo '$(srcdir)/'`bif_date.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_date.Tpo $(DEPDIR)/libwi_la-bif_date.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_date.c' object='libwi_la-bif_date.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_date.lo `test -f 'bif_date.c' || echo '$(srcdir)/'`bif_date.c
+ 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-bif_date.lo `test -f 'bif_date.c' || echo '$(srcdir)/'`bif_date.c
libwi_la-bif_dav.lo: bif_dav.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-bif_dav.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_dav.Tpo -c -o libwi_la-bif_dav.lo `test -f 'bif_dav.c' || echo '$(srcdir)/'`bif_dav.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_dav.Tpo $(DEPDIR)/libwi_la-bif_dav.Plo
+ 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-bif_dav.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_dav.Tpo -c -o libwi_la-bif_dav.lo `test -f 'bif_dav.c' || echo '$(srcdir)/'`bif_dav.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_dav.Tpo $(DEPDIR)/libwi_la-bif_dav.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_dav.c' object='libwi_la-bif_dav.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_dav.lo `test -f 'bif_dav.c' || echo '$(srcdir)/'`bif_dav.c
+ 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-bif_dav.lo `test -f 'bif_dav.c' || echo '$(srcdir)/'`bif_dav.c
libwi_la-bif_explain.lo: bif_explain.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-bif_explain.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_explain.Tpo -c -o libwi_la-bif_explain.lo `test -f 'bif_explain.c' || echo '$(srcdir)/'`bif_explain.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_explain.Tpo $(DEPDIR)/libwi_la-bif_explain.Plo
+ 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-bif_explain.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_explain.Tpo -c -o libwi_la-bif_explain.lo `test -f 'bif_explain.c' || echo '$(srcdir)/'`bif_explain.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_explain.Tpo $(DEPDIR)/libwi_la-bif_explain.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_explain.c' object='libwi_la-bif_explain.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_explain.lo `test -f 'bif_explain.c' || echo '$(srcdir)/'`bif_explain.c
+ 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-bif_explain.lo `test -f 'bif_explain.c' || echo '$(srcdir)/'`bif_explain.c
libwi_la-bif_file.lo: bif_file.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-bif_file.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_file.Tpo -c -o libwi_la-bif_file.lo `test -f 'bif_file.c' || echo '$(srcdir)/'`bif_file.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_file.Tpo $(DEPDIR)/libwi_la-bif_file.Plo
+ 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-bif_file.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_file.Tpo -c -o libwi_la-bif_file.lo `test -f 'bif_file.c' || echo '$(srcdir)/'`bif_file.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_file.Tpo $(DEPDIR)/libwi_la-bif_file.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_file.c' object='libwi_la-bif_file.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_file.lo `test -f 'bif_file.c' || echo '$(srcdir)/'`bif_file.c
+ 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-bif_file.lo `test -f 'bif_file.c' || echo '$(srcdir)/'`bif_file.c
libwi_la-bif_phrasematch.lo: bif_phrasematch.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-bif_phrasematch.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_phrasematch.Tpo -c -o libwi_la-bif_phrasematch.lo `test -f 'bif_phrasematch.c' || echo '$(srcdir)/'`bif_phrasematch.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_phrasematch.Tpo $(DEPDIR)/libwi_la-bif_phrasematch.Plo
+ 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-bif_phrasematch.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_phrasematch.Tpo -c -o libwi_la-bif_phrasematch.lo `test -f 'bif_phrasematch.c' || echo '$(srcdir)/'`bif_phrasematch.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_phrasematch.Tpo $(DEPDIR)/libwi_la-bif_phrasematch.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_phrasematch.c' object='libwi_la-bif_phrasematch.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_phrasematch.lo `test -f 'bif_phrasematch.c' || echo '$(srcdir)/'`bif_phrasematch.c
+ 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-bif_phrasematch.lo `test -f 'bif_phrasematch.c' || echo '$(srcdir)/'`bif_phrasematch.c
libwi_la-bif_smtp.lo: bif_smtp.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-bif_smtp.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_smtp.Tpo -c -o libwi_la-bif_smtp.lo `test -f 'bif_smtp.c' || echo '$(srcdir)/'`bif_smtp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_smtp.Tpo $(DEPDIR)/libwi_la-bif_smtp.Plo
+ 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-bif_smtp.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_smtp.Tpo -c -o libwi_la-bif_smtp.lo `test -f 'bif_smtp.c' || echo '$(srcdir)/'`bif_smtp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_smtp.Tpo $(DEPDIR)/libwi_la-bif_smtp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_smtp.c' object='libwi_la-bif_smtp.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_smtp.lo `test -f 'bif_smtp.c' || echo '$(srcdir)/'`bif_smtp.c
+ 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-bif_smtp.lo `test -f 'bif_smtp.c' || echo '$(srcdir)/'`bif_smtp.c
libwi_la-bif_soap.lo: bif_soap.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-bif_soap.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_soap.Tpo -c -o libwi_la-bif_soap.lo `test -f 'bif_soap.c' || echo '$(srcdir)/'`bif_soap.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_soap.Tpo $(DEPDIR)/libwi_la-bif_soap.Plo
+ 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-bif_soap.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_soap.Tpo -c -o libwi_la-bif_soap.lo `test -f 'bif_soap.c' || echo '$(srcdir)/'`bif_soap.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_soap.Tpo $(DEPDIR)/libwi_la-bif_soap.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_soap.c' object='libwi_la-bif_soap.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_soap.lo `test -f 'bif_soap.c' || echo '$(srcdir)/'`bif_soap.c
+ 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-bif_soap.lo `test -f 'bif_soap.c' || echo '$(srcdir)/'`bif_soap.c
libwi_la-bif_text.lo: bif_text.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-bif_text.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_text.Tpo -c -o libwi_la-bif_text.lo `test -f 'bif_text.c' || echo '$(srcdir)/'`bif_text.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_text.Tpo $(DEPDIR)/libwi_la-bif_text.Plo
+ 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-bif_text.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_text.Tpo -c -o libwi_la-bif_text.lo `test -f 'bif_text.c' || echo '$(srcdir)/'`bif_text.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_text.Tpo $(DEPDIR)/libwi_la-bif_text.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_text.c' object='libwi_la-bif_text.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_text.lo `test -f 'bif_text.c' || echo '$(srcdir)/'`bif_text.c
+ 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-bif_text.lo `test -f 'bif_text.c' || echo '$(srcdir)/'`bif_text.c
libwi_la-bif_tidy.lo: bif_tidy.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-bif_tidy.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_tidy.Tpo -c -o libwi_la-bif_tidy.lo `test -f 'bif_tidy.c' || echo '$(srcdir)/'`bif_tidy.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_tidy.Tpo $(DEPDIR)/libwi_la-bif_tidy.Plo
+ 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-bif_tidy.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_tidy.Tpo -c -o libwi_la-bif_tidy.lo `test -f 'bif_tidy.c' || echo '$(srcdir)/'`bif_tidy.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_tidy.Tpo $(DEPDIR)/libwi_la-bif_tidy.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_tidy.c' object='libwi_la-bif_tidy.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_tidy.lo `test -f 'bif_tidy.c' || echo '$(srcdir)/'`bif_tidy.c
+ 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-bif_tidy.lo `test -f 'bif_tidy.c' || echo '$(srcdir)/'`bif_tidy.c
libwi_la-http_client.lo: http_client.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-http_client.lo -MD -MP -MF $(DEPDIR)/libwi_la-http_client.Tpo -c -o libwi_la-http_client.lo `test -f 'http_client.c' || echo '$(srcdir)/'`http_client.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-http_client.Tpo $(DEPDIR)/libwi_la-http_client.Plo
+ 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-http_client.lo -MD -MP -MF $(DEPDIR)/libwi_la-http_client.Tpo -c -o libwi_la-http_client.lo `test -f 'http_client.c' || echo '$(srcdir)/'`http_client.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-http_client.Tpo $(DEPDIR)/libwi_la-http_client.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='http_client.c' object='libwi_la-http_client.lo' libtool=yes @AMDEPBACKSLASH@
@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-http_client.lo `test -f 'http_client.c' || echo '$(srcdir)/'`http_client.c
+ 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-http_client.lo `test -f 'http_client.c' || echo '$(srcdir)/'`http_client.c
libwi_la-shuric.lo: shuric.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-shuric.lo -MD -MP -MF $(DEPDIR)/libwi_la-shuric.Tpo -c -o libwi_la-shuric.lo `test -f 'shuric.c' || echo '$(srcdir)/'`shuric.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-shuric.Tpo $(DEPDIR)/libwi_la-shuric.Plo
+ 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-shuric.lo -MD -MP -MF $(DEPDIR)/libwi_la-shuric.Tpo -c -o libwi_la-shuric.lo `test -f 'shuric.c' || echo '$(srcdir)/'`shuric.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-shuric.Tpo $(DEPDIR)/libwi_la-shuric.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shuric.c' object='libwi_la-shuric.lo' libtool=yes @AMDEPBACKSLASH@
@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-shuric.lo `test -f 'shuric.c' || echo '$(srcdir)/'`shuric.c
+ 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-shuric.lo `test -f 'shuric.c' || echo '$(srcdir)/'`shuric.c
libwi_la-subseq.lo: subseq.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-subseq.lo -MD -MP -MF $(DEPDIR)/libwi_la-subseq.Tpo -c -o libwi_la-subseq.lo `test -f 'subseq.c' || echo '$(srcdir)/'`subseq.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-subseq.Tpo $(DEPDIR)/libwi_la-subseq.Plo
+ 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-subseq.lo -MD -MP -MF $(DEPDIR)/libwi_la-subseq.Tpo -c -o libwi_la-subseq.lo `test -f 'subseq.c' || echo '$(srcdir)/'`subseq.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-subseq.Tpo $(DEPDIR)/libwi_la-subseq.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='subseq.c' object='libwi_la-subseq.lo' libtool=yes @AMDEPBACKSLASH@
@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-subseq.lo `test -f 'subseq.c' || echo '$(srcdir)/'`subseq.c
+ 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-subseq.lo `test -f 'subseq.c' || echo '$(srcdir)/'`subseq.c
libwi_la-text.lo: text.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-text.lo -MD -MP -MF $(DEPDIR)/libwi_la-text.Tpo -c -o libwi_la-text.lo `test -f 'text.c' || echo '$(srcdir)/'`text.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-text.Tpo $(DEPDIR)/libwi_la-text.Plo
+ 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-text.lo -MD -MP -MF $(DEPDIR)/libwi_la-text.Tpo -c -o libwi_la-text.lo `test -f 'text.c' || echo '$(srcdir)/'`text.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-text.Tpo $(DEPDIR)/libwi_la-text.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='text.c' object='libwi_la-text.lo' libtool=yes @AMDEPBACKSLASH@
@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-text.lo `test -f 'text.c' || echo '$(srcdir)/'`text.c
+ 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-text.lo `test -f 'text.c' || echo '$(srcdir)/'`text.c
libwi_la-uname_const_decl.lo: uname_const_decl.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-uname_const_decl.lo -MD -MP -MF $(DEPDIR)/libwi_la-uname_const_decl.Tpo -c -o libwi_la-uname_const_decl.lo `test -f 'uname_const_decl.c' || echo '$(srcdir)/'`uname_const_decl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-uname_const_decl.Tpo $(DEPDIR)/libwi_la-uname_const_decl.Plo
+ 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-uname_const_decl.lo -MD -MP -MF $(DEPDIR)/libwi_la-uname_const_decl.Tpo -c -o libwi_la-uname_const_decl.lo `test -f 'uname_const_decl.c' || echo '$(srcdir)/'`uname_const_decl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-uname_const_decl.Tpo $(DEPDIR)/libwi_la-uname_const_decl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uname_const_decl.c' object='libwi_la-uname_const_decl.lo' libtool=yes @AMDEPBACKSLASH@
@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-uname_const_decl.lo `test -f 'uname_const_decl.c' || echo '$(srcdir)/'`uname_const_decl.c
+ 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-uname_const_decl.lo `test -f 'uname_const_decl.c' || echo '$(srcdir)/'`uname_const_decl.c
libwi_la-xmlenc_algos.lo: xmlenc_algos.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-xmlenc_algos.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlenc_algos.Tpo -c -o libwi_la-xmlenc_algos.lo `test -f 'xmlenc_algos.c' || echo '$(srcdir)/'`xmlenc_algos.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xmlenc_algos.Tpo $(DEPDIR)/libwi_la-xmlenc_algos.Plo
+ 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-xmlenc_algos.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlenc_algos.Tpo -c -o libwi_la-xmlenc_algos.lo `test -f 'xmlenc_algos.c' || echo '$(srcdir)/'`xmlenc_algos.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xmlenc_algos.Tpo $(DEPDIR)/libwi_la-xmlenc_algos.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlenc_algos.c' object='libwi_la-xmlenc_algos.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlenc_algos.lo `test -f 'xmlenc_algos.c' || echo '$(srcdir)/'`xmlenc_algos.c
+ 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-xmlenc_algos.lo `test -f 'xmlenc_algos.c' || echo '$(srcdir)/'`xmlenc_algos.c
libwi_la-xmlenc.lo: xmlenc.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-xmlenc.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlenc.Tpo -c -o libwi_la-xmlenc.lo `test -f 'xmlenc.c' || echo '$(srcdir)/'`xmlenc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xmlenc.Tpo $(DEPDIR)/libwi_la-xmlenc.Plo
+ 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-xmlenc.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlenc.Tpo -c -o libwi_la-xmlenc.lo `test -f 'xmlenc.c' || echo '$(srcdir)/'`xmlenc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xmlenc.Tpo $(DEPDIR)/libwi_la-xmlenc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlenc.c' object='libwi_la-xmlenc.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlenc.lo `test -f 'xmlenc.c' || echo '$(srcdir)/'`xmlenc.c
+ 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-xmlenc.lo `test -f 'xmlenc.c' || echo '$(srcdir)/'`xmlenc.c
libwi_la-xmlenc-dec.lo: xmlenc-dec.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-xmlenc-dec.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlenc-dec.Tpo -c -o libwi_la-xmlenc-dec.lo `test -f 'xmlenc-dec.c' || echo '$(srcdir)/'`xmlenc-dec.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xmlenc-dec.Tpo $(DEPDIR)/libwi_la-xmlenc-dec.Plo
+ 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-xmlenc-dec.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlenc-dec.Tpo -c -o libwi_la-xmlenc-dec.lo `test -f 'xmlenc-dec.c' || echo '$(srcdir)/'`xmlenc-dec.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xmlenc-dec.Tpo $(DEPDIR)/libwi_la-xmlenc-dec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlenc-dec.c' object='libwi_la-xmlenc-dec.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlenc-dec.lo `test -f 'xmlenc-dec.c' || echo '$(srcdir)/'`xmlenc-dec.c
+ 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-xmlenc-dec.lo `test -f 'xmlenc-dec.c' || echo '$(srcdir)/'`xmlenc-dec.c
libwi_la-xmlschema.lo: xmlschema.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-xmlschema.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlschema.Tpo -c -o libwi_la-xmlschema.lo `test -f 'xmlschema.c' || echo '$(srcdir)/'`xmlschema.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xmlschema.Tpo $(DEPDIR)/libwi_la-xmlschema.Plo
+ 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-xmlschema.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlschema.Tpo -c -o libwi_la-xmlschema.lo `test -f 'xmlschema.c' || echo '$(srcdir)/'`xmlschema.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xmlschema.Tpo $(DEPDIR)/libwi_la-xmlschema.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlschema.c' object='libwi_la-xmlschema.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlschema.lo `test -f 'xmlschema.c' || echo '$(srcdir)/'`xmlschema.c
+ 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-xmlschema.lo `test -f 'xmlschema.c' || echo '$(srcdir)/'`xmlschema.c
libwi_la-xmlsearch.lo: xmlsearch.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-xmlsearch.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlsearch.Tpo -c -o libwi_la-xmlsearch.lo `test -f 'xmlsearch.c' || echo '$(srcdir)/'`xmlsearch.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xmlsearch.Tpo $(DEPDIR)/libwi_la-xmlsearch.Plo
+ 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-xmlsearch.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlsearch.Tpo -c -o libwi_la-xmlsearch.lo `test -f 'xmlsearch.c' || echo '$(srcdir)/'`xmlsearch.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xmlsearch.Tpo $(DEPDIR)/libwi_la-xmlsearch.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlsearch.c' object='libwi_la-xmlsearch.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlsearch.lo `test -f 'xmlsearch.c' || echo '$(srcdir)/'`xmlsearch.c
+ 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-xmlsearch.lo `test -f 'xmlsearch.c' || echo '$(srcdir)/'`xmlsearch.c
libwi_la-xmlsql.lo: xmlsql.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-xmlsql.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlsql.Tpo -c -o libwi_la-xmlsql.lo `test -f 'xmlsql.c' || echo '$(srcdir)/'`xmlsql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xmlsql.Tpo $(DEPDIR)/libwi_la-xmlsql.Plo
+ 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-xmlsql.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmlsql.Tpo -c -o libwi_la-xmlsql.lo `test -f 'xmlsql.c' || echo '$(srcdir)/'`xmlsql.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xmlsql.Tpo $(DEPDIR)/libwi_la-xmlsql.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlsql.c' object='libwi_la-xmlsql.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlsql.lo `test -f 'xmlsql.c' || echo '$(srcdir)/'`xmlsql.c
+ 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-xmlsql.lo `test -f 'xmlsql.c' || echo '$(srcdir)/'`xmlsql.c
libwi_la-xmllazy.lo: xmllazy.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-xmllazy.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmllazy.Tpo -c -o libwi_la-xmllazy.lo `test -f 'xmllazy.c' || echo '$(srcdir)/'`xmllazy.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xmllazy.Tpo $(DEPDIR)/libwi_la-xmllazy.Plo
+ 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-xmllazy.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmllazy.Tpo -c -o libwi_la-xmllazy.lo `test -f 'xmllazy.c' || echo '$(srcdir)/'`xmllazy.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xmllazy.Tpo $(DEPDIR)/libwi_la-xmllazy.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmllazy.c' object='libwi_la-xmllazy.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmllazy.lo `test -f 'xmllazy.c' || echo '$(srcdir)/'`xmllazy.c
+ 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-xmllazy.lo `test -f 'xmllazy.c' || echo '$(srcdir)/'`xmllazy.c
libwi_la-xmltree.lo: xmltree.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-xmltree.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmltree.Tpo -c -o libwi_la-xmltree.lo `test -f 'xmltree.c' || echo '$(srcdir)/'`xmltree.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xmltree.Tpo $(DEPDIR)/libwi_la-xmltree.Plo
+ 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-xmltree.lo -MD -MP -MF $(DEPDIR)/libwi_la-xmltree.Tpo -c -o libwi_la-xmltree.lo `test -f 'xmltree.c' || echo '$(srcdir)/'`xmltree.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xmltree.Tpo $(DEPDIR)/libwi_la-xmltree.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmltree.c' object='libwi_la-xmltree.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmltree.lo `test -f 'xmltree.c' || echo '$(srcdir)/'`xmltree.c
+ 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-xmltree.lo `test -f 'xmltree.c' || echo '$(srcdir)/'`xmltree.c
libwi_la-xpath.lo: xpath.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-xpath.lo -MD -MP -MF $(DEPDIR)/libwi_la-xpath.Tpo -c -o libwi_la-xpath.lo `test -f 'xpath.c' || echo '$(srcdir)/'`xpath.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xpath.Tpo $(DEPDIR)/libwi_la-xpath.Plo
+ 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-xpath.lo -MD -MP -MF $(DEPDIR)/libwi_la-xpath.Tpo -c -o libwi_la-xpath.lo `test -f 'xpath.c' || echo '$(srcdir)/'`xpath.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xpath.Tpo $(DEPDIR)/libwi_la-xpath.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xpath.c' object='libwi_la-xpath.lo' libtool=yes @AMDEPBACKSLASH@
@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-xpath.lo `test -f 'xpath.c' || echo '$(srcdir)/'`xpath.c
+ 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-xpath.lo `test -f 'xpath.c' || echo '$(srcdir)/'`xpath.c
libwi_la-xpf.lo: xpf.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-xpf.lo -MD -MP -MF $(DEPDIR)/libwi_la-xpf.Tpo -c -o libwi_la-xpf.lo `test -f 'xpf.c' || echo '$(srcdir)/'`xpf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xpf.Tpo $(DEPDIR)/libwi_la-xpf.Plo
+ 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-xpf.lo -MD -MP -MF $(DEPDIR)/libwi_la-xpf.Tpo -c -o libwi_la-xpf.lo `test -f 'xpf.c' || echo '$(srcdir)/'`xpf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xpf.Tpo $(DEPDIR)/libwi_la-xpf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xpf.c' object='libwi_la-xpf.lo' libtool=yes @AMDEPBACKSLASH@
@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-xpf.lo `test -f 'xpf.c' || echo '$(srcdir)/'`xpf.c
+ 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-xpf.lo `test -f 'xpf.c' || echo '$(srcdir)/'`xpf.c
libwi_la-xqf.lo: xqf.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-xqf.lo -MD -MP -MF $(DEPDIR)/libwi_la-xqf.Tpo -c -o libwi_la-xqf.lo `test -f 'xqf.c' || echo '$(srcdir)/'`xqf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xqf.Tpo $(DEPDIR)/libwi_la-xqf.Plo
+ 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-xqf.lo -MD -MP -MF $(DEPDIR)/libwi_la-xqf.Tpo -c -o libwi_la-xqf.lo `test -f 'xqf.c' || echo '$(srcdir)/'`xqf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xqf.Tpo $(DEPDIR)/libwi_la-xqf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xqf.c' object='libwi_la-xqf.lo' libtool=yes @AMDEPBACKSLASH@
@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-xqf.lo `test -f 'xqf.c' || echo '$(srcdir)/'`xqf.c
+ 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-xqf.lo `test -f 'xqf.c' || echo '$(srcdir)/'`xqf.c
libwi_la-xslt.lo: xslt.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-xslt.lo -MD -MP -MF $(DEPDIR)/libwi_la-xslt.Tpo -c -o libwi_la-xslt.lo `test -f 'xslt.c' || echo '$(srcdir)/'`xslt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xslt.Tpo $(DEPDIR)/libwi_la-xslt.Plo
+ 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-xslt.lo -MD -MP -MF $(DEPDIR)/libwi_la-xslt.Tpo -c -o libwi_la-xslt.lo `test -f 'xslt.c' || echo '$(srcdir)/'`xslt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xslt.Tpo $(DEPDIR)/libwi_la-xslt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xslt.c' object='libwi_la-xslt.lo' libtool=yes @AMDEPBACKSLASH@
@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-xslt.lo `test -f 'xslt.c' || echo '$(srcdir)/'`xslt.c
+ 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-xslt.lo `test -f 'xslt.c' || echo '$(srcdir)/'`xslt.c
libwi_la-xslt_fmt.lo: xslt_fmt.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-xslt_fmt.lo -MD -MP -MF $(DEPDIR)/libwi_la-xslt_fmt.Tpo -c -o libwi_la-xslt_fmt.lo `test -f 'xslt_fmt.c' || echo '$(srcdir)/'`xslt_fmt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xslt_fmt.Tpo $(DEPDIR)/libwi_la-xslt_fmt.Plo
+ 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-xslt_fmt.lo -MD -MP -MF $(DEPDIR)/libwi_la-xslt_fmt.Tpo -c -o libwi_la-xslt_fmt.lo `test -f 'xslt_fmt.c' || echo '$(srcdir)/'`xslt_fmt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xslt_fmt.Tpo $(DEPDIR)/libwi_la-xslt_fmt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xslt_fmt.c' object='libwi_la-xslt_fmt.lo' libtool=yes @AMDEPBACKSLASH@
@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-xslt_fmt.lo `test -f 'xslt_fmt.c' || echo '$(srcdir)/'`xslt_fmt.c
+ 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-xslt_fmt.lo `test -f 'xslt_fmt.c' || echo '$(srcdir)/'`xslt_fmt.c
libwi_la-xslt_opt.lo: xslt_opt.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-xslt_opt.lo -MD -MP -MF $(DEPDIR)/libwi_la-xslt_opt.Tpo -c -o libwi_la-xslt_opt.lo `test -f 'xslt_opt.c' || echo '$(srcdir)/'`xslt_opt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-xslt_opt.Tpo $(DEPDIR)/libwi_la-xslt_opt.Plo
+ 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-xslt_opt.lo -MD -MP -MF $(DEPDIR)/libwi_la-xslt_opt.Tpo -c -o libwi_la-xslt_opt.lo `test -f 'xslt_opt.c' || echo '$(srcdir)/'`xslt_opt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-xslt_opt.Tpo $(DEPDIR)/libwi_la-xslt_opt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xslt_opt.c' object='libwi_la-xslt_opt.lo' libtool=yes @AMDEPBACKSLASH@
@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-xslt_opt.lo `test -f 'xslt_opt.c' || echo '$(srcdir)/'`xslt_opt.c
+ 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-xslt_opt.lo `test -f 'xslt_opt.c' || echo '$(srcdir)/'`xslt_opt.c
libwi_la-bif_ldapcli.lo: bif_ldapcli.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-bif_ldapcli.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_ldapcli.Tpo -c -o libwi_la-bif_ldapcli.lo `test -f 'bif_ldapcli.c' || echo '$(srcdir)/'`bif_ldapcli.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_ldapcli.Tpo $(DEPDIR)/libwi_la-bif_ldapcli.Plo
+ 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-bif_ldapcli.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_ldapcli.Tpo -c -o libwi_la-bif_ldapcli.lo `test -f 'bif_ldapcli.c' || echo '$(srcdir)/'`bif_ldapcli.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_ldapcli.Tpo $(DEPDIR)/libwi_la-bif_ldapcli.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_ldapcli.c' object='libwi_la-bif_ldapcli.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_ldapcli.lo `test -f 'bif_ldapcli.c' || echo '$(srcdir)/'`bif_ldapcli.c
+ 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-bif_ldapcli.lo `test -f 'bif_ldapcli.c' || echo '$(srcdir)/'`bif_ldapcli.c
libwi_la-bif_kerberoscli.lo: bif_kerberoscli.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-bif_kerberoscli.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_kerberoscli.Tpo -c -o libwi_la-bif_kerberoscli.lo `test -f 'bif_kerberoscli.c' || echo '$(srcdir)/'`bif_kerberoscli.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_kerberoscli.Tpo $(DEPDIR)/libwi_la-bif_kerberoscli.Plo
+ 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-bif_kerberoscli.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_kerberoscli.Tpo -c -o libwi_la-bif_kerberoscli.lo `test -f 'bif_kerberoscli.c' || echo '$(srcdir)/'`bif_kerberoscli.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_kerberoscli.Tpo $(DEPDIR)/libwi_la-bif_kerberoscli.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_kerberoscli.c' object='libwi_la-bif_kerberoscli.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_kerberoscli.lo `test -f 'bif_kerberoscli.c' || echo '$(srcdir)/'`bif_kerberoscli.c
+ 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-bif_kerberoscli.lo `test -f 'bif_kerberoscli.c' || echo '$(srcdir)/'`bif_kerberoscli.c
libwi_la-bif_pop3.lo: bif_pop3.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-bif_pop3.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_pop3.Tpo -c -o libwi_la-bif_pop3.lo `test -f 'bif_pop3.c' || echo '$(srcdir)/'`bif_pop3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_pop3.Tpo $(DEPDIR)/libwi_la-bif_pop3.Plo
+ 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-bif_pop3.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_pop3.Tpo -c -o libwi_la-bif_pop3.lo `test -f 'bif_pop3.c' || echo '$(srcdir)/'`bif_pop3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_pop3.Tpo $(DEPDIR)/libwi_la-bif_pop3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_pop3.c' object='libwi_la-bif_pop3.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_pop3.lo `test -f 'bif_pop3.c' || echo '$(srcdir)/'`bif_pop3.c
+ 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-bif_pop3.lo `test -f 'bif_pop3.c' || echo '$(srcdir)/'`bif_pop3.c
libwi_la-bif_imap.lo: bif_imap.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-bif_imap.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_imap.Tpo -c -o libwi_la-bif_imap.lo `test -f 'bif_imap.c' || echo '$(srcdir)/'`bif_imap.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_imap.Tpo $(DEPDIR)/libwi_la-bif_imap.Plo
+ 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-bif_imap.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_imap.Tpo -c -o libwi_la-bif_imap.lo `test -f 'bif_imap.c' || echo '$(srcdir)/'`bif_imap.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_imap.Tpo $(DEPDIR)/libwi_la-bif_imap.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_imap.c' object='libwi_la-bif_imap.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_imap.lo `test -f 'bif_imap.c' || echo '$(srcdir)/'`bif_imap.c
+ 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-bif_imap.lo `test -f 'bif_imap.c' || echo '$(srcdir)/'`bif_imap.c
libwi_la-bif_nntp.lo: bif_nntp.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-bif_nntp.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_nntp.Tpo -c -o libwi_la-bif_nntp.lo `test -f 'bif_nntp.c' || echo '$(srcdir)/'`bif_nntp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_nntp.Tpo $(DEPDIR)/libwi_la-bif_nntp.Plo
+ 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-bif_nntp.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_nntp.Tpo -c -o libwi_la-bif_nntp.lo `test -f 'bif_nntp.c' || echo '$(srcdir)/'`bif_nntp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_nntp.Tpo $(DEPDIR)/libwi_la-bif_nntp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_nntp.c' object='libwi_la-bif_nntp.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_nntp.lo `test -f 'bif_nntp.c' || echo '$(srcdir)/'`bif_nntp.c
+ 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-bif_nntp.lo `test -f 'bif_nntp.c' || echo '$(srcdir)/'`bif_nntp.c
libwi_la-bif_xper.lo: bif_xper.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-bif_xper.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_xper.Tpo -c -o libwi_la-bif_xper.lo `test -f 'bif_xper.c' || echo '$(srcdir)/'`bif_xper.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_xper.Tpo $(DEPDIR)/libwi_la-bif_xper.Plo
+ 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-bif_xper.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_xper.Tpo -c -o libwi_la-bif_xper.lo `test -f 'bif_xper.c' || echo '$(srcdir)/'`bif_xper.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_xper.Tpo $(DEPDIR)/libwi_la-bif_xper.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_xper.c' object='libwi_la-bif_xper.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_xper.lo `test -f 'bif_xper.c' || echo '$(srcdir)/'`bif_xper.c
+ 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-bif_xper.lo `test -f 'bif_xper.c' || echo '$(srcdir)/'`bif_xper.c
libwi_la-2pc.lo: 2pc.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-2pc.lo -MD -MP -MF $(DEPDIR)/libwi_la-2pc.Tpo -c -o libwi_la-2pc.lo `test -f '2pc.c' || echo '$(srcdir)/'`2pc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-2pc.Tpo $(DEPDIR)/libwi_la-2pc.Plo
+ 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-2pc.lo -MD -MP -MF $(DEPDIR)/libwi_la-2pc.Tpo -c -o libwi_la-2pc.lo `test -f '2pc.c' || echo '$(srcdir)/'`2pc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-2pc.Tpo $(DEPDIR)/libwi_la-2pc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='2pc.c' object='libwi_la-2pc.lo' libtool=yes @AMDEPBACKSLASH@
@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-2pc.lo `test -f '2pc.c' || echo '$(srcdir)/'`2pc.c
+ 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-2pc.lo `test -f '2pc.c' || echo '$(srcdir)/'`2pc.c
libwi_la-bif_repl.lo: bif_repl.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-bif_repl.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_repl.Tpo -c -o libwi_la-bif_repl.lo `test -f 'bif_repl.c' || echo '$(srcdir)/'`bif_repl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_repl.Tpo $(DEPDIR)/libwi_la-bif_repl.Plo
+ 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-bif_repl.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_repl.Tpo -c -o libwi_la-bif_repl.lo `test -f 'bif_repl.c' || echo '$(srcdir)/'`bif_repl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_repl.Tpo $(DEPDIR)/libwi_la-bif_repl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_repl.c' object='libwi_la-bif_repl.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_repl.lo `test -f 'bif_repl.c' || echo '$(srcdir)/'`bif_repl.c
+ 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-bif_repl.lo `test -f 'bif_repl.c' || echo '$(srcdir)/'`bif_repl.c
libwi_la-bif_xml.lo: bif_xml.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-bif_xml.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_xml.Tpo -c -o libwi_la-bif_xml.lo `test -f 'bif_xml.c' || echo '$(srcdir)/'`bif_xml.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-bif_xml.Tpo $(DEPDIR)/libwi_la-bif_xml.Plo
+ 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-bif_xml.lo -MD -MP -MF $(DEPDIR)/libwi_la-bif_xml.Tpo -c -o libwi_la-bif_xml.lo `test -f 'bif_xml.c' || echo '$(srcdir)/'`bif_xml.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-bif_xml.Tpo $(DEPDIR)/libwi_la-bif_xml.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_xml.c' object='libwi_la-bif_xml.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_xml.lo `test -f 'bif_xml.c' || echo '$(srcdir)/'`bif_xml.c
+ 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-bif_xml.lo `test -f 'bif_xml.c' || echo '$(srcdir)/'`bif_xml.c
libwi_la-odbccat.lo: odbccat.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-odbccat.lo -MD -MP -MF $(DEPDIR)/libwi_la-odbccat.Tpo -c -o libwi_la-odbccat.lo `test -f 'odbccat.c' || echo '$(srcdir)/'`odbccat.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-odbccat.Tpo $(DEPDIR)/libwi_la-odbccat.Plo
+ 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-odbccat.lo -MD -MP -MF $(DEPDIR)/libwi_la-odbccat.Tpo -c -o libwi_la-odbccat.lo `test -f 'odbccat.c' || echo '$(srcdir)/'`odbccat.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-odbccat.Tpo $(DEPDIR)/libwi_la-odbccat.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='odbccat.c' object='libwi_la-odbccat.lo' libtool=yes @AMDEPBACKSLASH@
@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-odbccat.lo `test -f 'odbccat.c' || echo '$(srcdir)/'`odbccat.c
+ 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-odbccat.lo `test -f 'odbccat.c' || echo '$(srcdir)/'`odbccat.c
libwi_la-sqlrbuf.lo: sqlrbuf.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-sqlrbuf.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlrbuf.Tpo -c -o libwi_la-sqlrbuf.lo `test -f 'sqlrbuf.c' || echo '$(srcdir)/'`sqlrbuf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlrbuf.Tpo $(DEPDIR)/libwi_la-sqlrbuf.Plo
+ 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-sqlrbuf.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlrbuf.Tpo -c -o libwi_la-sqlrbuf.lo `test -f 'sqlrbuf.c' || echo '$(srcdir)/'`sqlrbuf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlrbuf.Tpo $(DEPDIR)/libwi_la-sqlrbuf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlrbuf.c' object='libwi_la-sqlrbuf.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlrbuf.lo `test -f 'sqlrbuf.c' || echo '$(srcdir)/'`sqlrbuf.c
+ 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-sqlrbuf.lo `test -f 'sqlrbuf.c' || echo '$(srcdir)/'`sqlrbuf.c
libwi_la-sqlrcomp.lo: sqlrcomp.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-sqlrcomp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlrcomp.Tpo -c -o libwi_la-sqlrcomp.lo `test -f 'sqlrcomp.c' || echo '$(srcdir)/'`sqlrcomp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlrcomp.Tpo $(DEPDIR)/libwi_la-sqlrcomp.Plo
+ 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-sqlrcomp.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlrcomp.Tpo -c -o libwi_la-sqlrcomp.lo `test -f 'sqlrcomp.c' || echo '$(srcdir)/'`sqlrcomp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlrcomp.Tpo $(DEPDIR)/libwi_la-sqlrcomp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlrcomp.c' object='libwi_la-sqlrcomp.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlrcomp.lo `test -f 'sqlrcomp.c' || echo '$(srcdir)/'`sqlrcomp.c
+ 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-sqlrcomp.lo `test -f 'sqlrcomp.c' || echo '$(srcdir)/'`sqlrcomp.c
libwi_la-sqlrrun.lo: sqlrrun.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-sqlrrun.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlrrun.Tpo -c -o libwi_la-sqlrrun.lo `test -f 'sqlrrun.c' || echo '$(srcdir)/'`sqlrrun.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sqlrrun.Tpo $(DEPDIR)/libwi_la-sqlrrun.Plo
+ 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-sqlrrun.lo -MD -MP -MF $(DEPDIR)/libwi_la-sqlrrun.Tpo -c -o libwi_la-sqlrrun.lo `test -f 'sqlrrun.c' || echo '$(srcdir)/'`sqlrrun.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-sqlrrun.Tpo $(DEPDIR)/libwi_la-sqlrrun.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlrrun.c' object='libwi_la-sqlrrun.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlrrun.lo `test -f 'sqlrrun.c' || echo '$(srcdir)/'`sqlrrun.c
+ 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-sqlrrun.lo `test -f 'sqlrrun.c' || echo '$(srcdir)/'`sqlrrun.c
libwi_la-wi_xid.lo: wi_xid.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-wi_xid.lo -MD -MP -MF $(DEPDIR)/libwi_la-wi_xid.Tpo -c -o libwi_la-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-wi_xid.Tpo $(DEPDIR)/libwi_la-wi_xid.Plo
+ 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-wi_xid.lo -MD -MP -MF $(DEPDIR)/libwi_la-wi_xid.Tpo -c -o libwi_la-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_la-wi_xid.Tpo $(DEPDIR)/libwi_la-wi_xid.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wi_xid.c' object='libwi_la-wi_xid.lo' libtool=yes @AMDEPBACKSLASH@
@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-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
+ 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-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
libwi_odbc_la-aqueue.lo: aqueue.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-aqueue.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-aqueue.Tpo -c -o libwi_odbc_la-aqueue.lo `test -f 'aqueue.c' || echo '$(srcdir)/'`aqueue.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-aqueue.Tpo $(DEPDIR)/libwi_odbc_la-aqueue.Plo
+ 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-aqueue.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-aqueue.Tpo -c -o libwi_odbc_la-aqueue.lo `test -f 'aqueue.c' || echo '$(srcdir)/'`aqueue.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-aqueue.Tpo $(DEPDIR)/libwi_odbc_la-aqueue.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aqueue.c' object='libwi_odbc_la-aqueue.lo' libtool=yes @AMDEPBACKSLASH@
@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-aqueue.lo `test -f 'aqueue.c' || echo '$(srcdir)/'`aqueue.c
+ 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-aqueue.lo `test -f 'aqueue.c' || echo '$(srcdir)/'`aqueue.c
libwi_odbc_la-arith.lo: arith.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-arith.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-arith.Tpo -c -o libwi_odbc_la-arith.lo `test -f 'arith.c' || echo '$(srcdir)/'`arith.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-arith.Tpo $(DEPDIR)/libwi_odbc_la-arith.Plo
+ 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-arith.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-arith.Tpo -c -o libwi_odbc_la-arith.lo `test -f 'arith.c' || echo '$(srcdir)/'`arith.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-arith.Tpo $(DEPDIR)/libwi_odbc_la-arith.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arith.c' object='libwi_odbc_la-arith.lo' libtool=yes @AMDEPBACKSLASH@
@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-arith.lo `test -f 'arith.c' || echo '$(srcdir)/'`arith.c
+ 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-arith.lo `test -f 'arith.c' || echo '$(srcdir)/'`arith.c
libwi_odbc_la-auxfiles.lo: auxfiles.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-auxfiles.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-auxfiles.Tpo -c -o libwi_odbc_la-auxfiles.lo `test -f 'auxfiles.c' || echo '$(srcdir)/'`auxfiles.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-auxfiles.Tpo $(DEPDIR)/libwi_odbc_la-auxfiles.Plo
+ 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-auxfiles.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-auxfiles.Tpo -c -o libwi_odbc_la-auxfiles.lo `test -f 'auxfiles.c' || echo '$(srcdir)/'`auxfiles.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-auxfiles.Tpo $(DEPDIR)/libwi_odbc_la-auxfiles.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='auxfiles.c' object='libwi_odbc_la-auxfiles.lo' libtool=yes @AMDEPBACKSLASH@
@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-auxfiles.lo `test -f 'auxfiles.c' || echo '$(srcdir)/'`auxfiles.c
+ 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-auxfiles.lo `test -f 'auxfiles.c' || echo '$(srcdir)/'`auxfiles.c
libwi_odbc_la-bif_audio.lo: bif_audio.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-bif_audio.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_audio.Tpo -c -o libwi_odbc_la-bif_audio.lo `test -f 'bif_audio.c' || echo '$(srcdir)/'`bif_audio.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_audio.Tpo $(DEPDIR)/libwi_odbc_la-bif_audio.Plo
+ 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-bif_audio.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_audio.Tpo -c -o libwi_odbc_la-bif_audio.lo `test -f 'bif_audio.c' || echo '$(srcdir)/'`bif_audio.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_audio.Tpo $(DEPDIR)/libwi_odbc_la-bif_audio.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_audio.c' object='libwi_odbc_la-bif_audio.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_audio.lo `test -f 'bif_audio.c' || echo '$(srcdir)/'`bif_audio.c
+ 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-bif_audio.lo `test -f 'bif_audio.c' || echo '$(srcdir)/'`bif_audio.c
libwi_odbc_la-bif_crypto.lo: bif_crypto.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-bif_crypto.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_crypto.Tpo -c -o libwi_odbc_la-bif_crypto.lo `test -f 'bif_crypto.c' || echo '$(srcdir)/'`bif_crypto.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_crypto.Tpo $(DEPDIR)/libwi_odbc_la-bif_crypto.Plo
+ 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-bif_crypto.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_crypto.Tpo -c -o libwi_odbc_la-bif_crypto.lo `test -f 'bif_crypto.c' || echo '$(srcdir)/'`bif_crypto.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_crypto.Tpo $(DEPDIR)/libwi_odbc_la-bif_crypto.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_crypto.c' object='libwi_odbc_la-bif_crypto.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_crypto.lo `test -f 'bif_crypto.c' || echo '$(srcdir)/'`bif_crypto.c
+ 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-bif_crypto.lo `test -f 'bif_crypto.c' || echo '$(srcdir)/'`bif_crypto.c
libwi_odbc_la-bif_diff.lo: bif_diff.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-bif_diff.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_diff.Tpo -c -o libwi_odbc_la-bif_diff.lo `test -f 'bif_diff.c' || echo '$(srcdir)/'`bif_diff.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_diff.Tpo $(DEPDIR)/libwi_odbc_la-bif_diff.Plo
+ 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-bif_diff.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_diff.Tpo -c -o libwi_odbc_la-bif_diff.lo `test -f 'bif_diff.c' || echo '$(srcdir)/'`bif_diff.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_diff.Tpo $(DEPDIR)/libwi_odbc_la-bif_diff.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_diff.c' object='libwi_odbc_la-bif_diff.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_diff.lo `test -f 'bif_diff.c' || echo '$(srcdir)/'`bif_diff.c
+ 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-bif_diff.lo `test -f 'bif_diff.c' || echo '$(srcdir)/'`bif_diff.c
libwi_odbc_la-bif_intl.lo: bif_intl.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-bif_intl.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_intl.Tpo -c -o libwi_odbc_la-bif_intl.lo `test -f 'bif_intl.c' || echo '$(srcdir)/'`bif_intl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_intl.Tpo $(DEPDIR)/libwi_odbc_la-bif_intl.Plo
+ 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-bif_intl.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_intl.Tpo -c -o libwi_odbc_la-bif_intl.lo `test -f 'bif_intl.c' || echo '$(srcdir)/'`bif_intl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_intl.Tpo $(DEPDIR)/libwi_odbc_la-bif_intl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_intl.c' object='libwi_odbc_la-bif_intl.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_intl.lo `test -f 'bif_intl.c' || echo '$(srcdir)/'`bif_intl.c
+ 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-bif_intl.lo `test -f 'bif_intl.c' || echo '$(srcdir)/'`bif_intl.c
libwi_odbc_la-bif_json.lo: bif_json.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-bif_json.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_json.Tpo -c -o libwi_odbc_la-bif_json.lo `test -f 'bif_json.c' || echo '$(srcdir)/'`bif_json.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_json.Tpo $(DEPDIR)/libwi_odbc_la-bif_json.Plo
+ 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-bif_json.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_json.Tpo -c -o libwi_odbc_la-bif_json.lo `test -f 'bif_json.c' || echo '$(srcdir)/'`bif_json.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_json.Tpo $(DEPDIR)/libwi_odbc_la-bif_json.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_json.c' object='libwi_odbc_la-bif_json.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_json.lo `test -f 'bif_json.c' || echo '$(srcdir)/'`bif_json.c
+ 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-bif_json.lo `test -f 'bif_json.c' || echo '$(srcdir)/'`bif_json.c
libwi_odbc_la-bif_regexp.lo: bif_regexp.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-bif_regexp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_regexp.Tpo -c -o libwi_odbc_la-bif_regexp.lo `test -f 'bif_regexp.c' || echo '$(srcdir)/'`bif_regexp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_regexp.Tpo $(DEPDIR)/libwi_odbc_la-bif_regexp.Plo
+ 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-bif_regexp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_regexp.Tpo -c -o libwi_odbc_la-bif_regexp.lo `test -f 'bif_regexp.c' || echo '$(srcdir)/'`bif_regexp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_regexp.Tpo $(DEPDIR)/libwi_odbc_la-bif_regexp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_regexp.c' object='libwi_odbc_la-bif_regexp.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_regexp.lo `test -f 'bif_regexp.c' || echo '$(srcdir)/'`bif_regexp.c
+ 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-bif_regexp.lo `test -f 'bif_regexp.c' || echo '$(srcdir)/'`bif_regexp.c
libwi_odbc_la-bif_search_excerpt.lo: bif_search_excerpt.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-bif_search_excerpt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_search_excerpt.Tpo -c -o libwi_odbc_la-bif_search_excerpt.lo `test -f 'bif_search_excerpt.c' || echo '$(srcdir)/'`bif_search_excerpt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_search_excerpt.Tpo $(DEPDIR)/libwi_odbc_la-bif_search_excerpt.Plo
+ 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-bif_search_excerpt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_search_excerpt.Tpo -c -o libwi_odbc_la-bif_search_excerpt.lo `test -f 'bif_search_excerpt.c' || echo '$(srcdir)/'`bif_search_excerpt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_search_excerpt.Tpo $(DEPDIR)/libwi_odbc_la-bif_search_excerpt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_search_excerpt.c' object='libwi_odbc_la-bif_search_excerpt.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_search_excerpt.lo `test -f 'bif_search_excerpt.c' || echo '$(srcdir)/'`bif_search_excerpt.c
+ 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-bif_search_excerpt.lo `test -f 'bif_search_excerpt.c' || echo '$(srcdir)/'`bif_search_excerpt.c
libwi_odbc_la-bif_uuencode.lo: bif_uuencode.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-bif_uuencode.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_uuencode.Tpo -c -o libwi_odbc_la-bif_uuencode.lo `test -f 'bif_uuencode.c' || echo '$(srcdir)/'`bif_uuencode.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_uuencode.Tpo $(DEPDIR)/libwi_odbc_la-bif_uuencode.Plo
+ 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-bif_uuencode.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_uuencode.Tpo -c -o libwi_odbc_la-bif_uuencode.lo `test -f 'bif_uuencode.c' || echo '$(srcdir)/'`bif_uuencode.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_uuencode.Tpo $(DEPDIR)/libwi_odbc_la-bif_uuencode.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_uuencode.c' object='libwi_odbc_la-bif_uuencode.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_uuencode.lo `test -f 'bif_uuencode.c' || echo '$(srcdir)/'`bif_uuencode.c
+ 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-bif_uuencode.lo `test -f 'bif_uuencode.c' || echo '$(srcdir)/'`bif_uuencode.c
libwi_odbc_la-bitmap.lo: bitmap.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-bitmap.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bitmap.Tpo -c -o libwi_odbc_la-bitmap.lo `test -f 'bitmap.c' || echo '$(srcdir)/'`bitmap.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bitmap.Tpo $(DEPDIR)/libwi_odbc_la-bitmap.Plo
+ 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-bitmap.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bitmap.Tpo -c -o libwi_odbc_la-bitmap.lo `test -f 'bitmap.c' || echo '$(srcdir)/'`bitmap.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bitmap.Tpo $(DEPDIR)/libwi_odbc_la-bitmap.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bitmap.c' object='libwi_odbc_la-bitmap.lo' libtool=yes @AMDEPBACKSLASH@
@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-bitmap.lo `test -f 'bitmap.c' || echo '$(srcdir)/'`bitmap.c
+ 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-bitmap.lo `test -f 'bitmap.c' || echo '$(srcdir)/'`bitmap.c
libwi_odbc_la-blob.lo: blob.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-blob.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-blob.Tpo -c -o libwi_odbc_la-blob.lo `test -f 'blob.c' || echo '$(srcdir)/'`blob.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-blob.Tpo $(DEPDIR)/libwi_odbc_la-blob.Plo
+ 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-blob.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-blob.Tpo -c -o libwi_odbc_la-blob.lo `test -f 'blob.c' || echo '$(srcdir)/'`blob.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-blob.Tpo $(DEPDIR)/libwi_odbc_la-blob.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='blob.c' object='libwi_odbc_la-blob.lo' libtool=yes @AMDEPBACKSLASH@
@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-blob.lo `test -f 'blob.c' || echo '$(srcdir)/'`blob.c
+ 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-blob.lo `test -f 'blob.c' || echo '$(srcdir)/'`blob.c
libwi_odbc_la-blobio.lo: blobio.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-blobio.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-blobio.Tpo -c -o libwi_odbc_la-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-blobio.Tpo $(DEPDIR)/libwi_odbc_la-blobio.Plo
+ 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-blobio.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-blobio.Tpo -c -o libwi_odbc_la-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-blobio.Tpo $(DEPDIR)/libwi_odbc_la-blobio.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='blobio.c' object='libwi_odbc_la-blobio.lo' libtool=yes @AMDEPBACKSLASH@
@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-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
+ 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-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
libwi_odbc_la-cl_stubs.lo: cl_stubs.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-cl_stubs.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-cl_stubs.Tpo -c -o libwi_odbc_la-cl_stubs.lo `test -f 'cl_stubs.c' || echo '$(srcdir)/'`cl_stubs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-cl_stubs.Tpo $(DEPDIR)/libwi_odbc_la-cl_stubs.Plo
+ 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-cl_stubs.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-cl_stubs.Tpo -c -o libwi_odbc_la-cl_stubs.lo `test -f 'cl_stubs.c' || echo '$(srcdir)/'`cl_stubs.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-cl_stubs.Tpo $(DEPDIR)/libwi_odbc_la-cl_stubs.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cl_stubs.c' object='libwi_odbc_la-cl_stubs.lo' libtool=yes @AMDEPBACKSLASH@
@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-cl_stubs.lo `test -f 'cl_stubs.c' || echo '$(srcdir)/'`cl_stubs.c
+ 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-cl_stubs.lo `test -f 'cl_stubs.c' || echo '$(srcdir)/'`cl_stubs.c
libwi_odbc_la-datesupp.lo: datesupp.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-datesupp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-datesupp.Tpo -c -o libwi_odbc_la-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-datesupp.Tpo $(DEPDIR)/libwi_odbc_la-datesupp.Plo
+ 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-datesupp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-datesupp.Tpo -c -o libwi_odbc_la-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-datesupp.Tpo $(DEPDIR)/libwi_odbc_la-datesupp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='datesupp.c' object='libwi_odbc_la-datesupp.lo' libtool=yes @AMDEPBACKSLASH@
@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-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
+ 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-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
libwi_odbc_la-ddlrun.lo: ddlrun.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-ddlrun.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-ddlrun.Tpo -c -o libwi_odbc_la-ddlrun.lo `test -f 'ddlrun.c' || echo '$(srcdir)/'`ddlrun.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-ddlrun.Tpo $(DEPDIR)/libwi_odbc_la-ddlrun.Plo
+ 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-ddlrun.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-ddlrun.Tpo -c -o libwi_odbc_la-ddlrun.lo `test -f 'ddlrun.c' || echo '$(srcdir)/'`ddlrun.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-ddlrun.Tpo $(DEPDIR)/libwi_odbc_la-ddlrun.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddlrun.c' object='libwi_odbc_la-ddlrun.lo' libtool=yes @AMDEPBACKSLASH@
@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-ddlrun.lo `test -f 'ddlrun.c' || echo '$(srcdir)/'`ddlrun.c
+ 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-ddlrun.lo `test -f 'ddlrun.c' || echo '$(srcdir)/'`ddlrun.c
libwi_odbc_la-disk.lo: disk.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-disk.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-disk.Tpo -c -o libwi_odbc_la-disk.lo `test -f 'disk.c' || echo '$(srcdir)/'`disk.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-disk.Tpo $(DEPDIR)/libwi_odbc_la-disk.Plo
+ 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-disk.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-disk.Tpo -c -o libwi_odbc_la-disk.lo `test -f 'disk.c' || echo '$(srcdir)/'`disk.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-disk.Tpo $(DEPDIR)/libwi_odbc_la-disk.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='disk.c' object='libwi_odbc_la-disk.lo' libtool=yes @AMDEPBACKSLASH@
@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-disk.lo `test -f 'disk.c' || echo '$(srcdir)/'`disk.c
+ 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-disk.lo `test -f 'disk.c' || echo '$(srcdir)/'`disk.c
libwi_odbc_la-dks_esc.lo: dks_esc.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-dks_esc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-dks_esc.Tpo -c -o libwi_odbc_la-dks_esc.lo `test -f 'dks_esc.c' || echo '$(srcdir)/'`dks_esc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-dks_esc.Tpo $(DEPDIR)/libwi_odbc_la-dks_esc.Plo
+ 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-dks_esc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-dks_esc.Tpo -c -o libwi_odbc_la-dks_esc.lo `test -f 'dks_esc.c' || echo '$(srcdir)/'`dks_esc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-dks_esc.Tpo $(DEPDIR)/libwi_odbc_la-dks_esc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dks_esc.c' object='libwi_odbc_la-dks_esc.lo' libtool=yes @AMDEPBACKSLASH@
@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-dks_esc.lo `test -f 'dks_esc.c' || echo '$(srcdir)/'`dks_esc.c
+ 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-dks_esc.lo `test -f 'dks_esc.c' || echo '$(srcdir)/'`dks_esc.c
libwi_odbc_la-extent.lo: extent.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-extent.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-extent.Tpo -c -o libwi_odbc_la-extent.lo `test -f 'extent.c' || echo '$(srcdir)/'`extent.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-extent.Tpo $(DEPDIR)/libwi_odbc_la-extent.Plo
+ 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-extent.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-extent.Tpo -c -o libwi_odbc_la-extent.lo `test -f 'extent.c' || echo '$(srcdir)/'`extent.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-extent.Tpo $(DEPDIR)/libwi_odbc_la-extent.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='extent.c' object='libwi_odbc_la-extent.lo' libtool=yes @AMDEPBACKSLASH@
@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-extent.lo `test -f 'extent.c' || echo '$(srcdir)/'`extent.c
+ 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-extent.lo `test -f 'extent.c' || echo '$(srcdir)/'`extent.c
libwi_odbc_la-eqlcomp.lo: eqlcomp.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-eqlcomp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-eqlcomp.Tpo -c -o libwi_odbc_la-eqlcomp.lo `test -f 'eqlcomp.c' || echo '$(srcdir)/'`eqlcomp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-eqlcomp.Tpo $(DEPDIR)/libwi_odbc_la-eqlcomp.Plo
+ 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-eqlcomp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-eqlcomp.Tpo -c -o libwi_odbc_la-eqlcomp.lo `test -f 'eqlcomp.c' || echo '$(srcdir)/'`eqlcomp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-eqlcomp.Tpo $(DEPDIR)/libwi_odbc_la-eqlcomp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eqlcomp.c' object='libwi_odbc_la-eqlcomp.lo' libtool=yes @AMDEPBACKSLASH@
@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-eqlcomp.lo `test -f 'eqlcomp.c' || echo '$(srcdir)/'`eqlcomp.c
+ 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-eqlcomp.lo `test -f 'eqlcomp.c' || echo '$(srcdir)/'`eqlcomp.c
libwi_odbc_la-gate.lo: gate.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-gate.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-gate.Tpo -c -o libwi_odbc_la-gate.lo `test -f 'gate.c' || echo '$(srcdir)/'`gate.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-gate.Tpo $(DEPDIR)/libwi_odbc_la-gate.Plo
+ 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-gate.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-gate.Tpo -c -o libwi_odbc_la-gate.lo `test -f 'gate.c' || echo '$(srcdir)/'`gate.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-gate.Tpo $(DEPDIR)/libwi_odbc_la-gate.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gate.c' object='libwi_odbc_la-gate.lo' libtool=yes @AMDEPBACKSLASH@
@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-gate.lo `test -f 'gate.c' || echo '$(srcdir)/'`gate.c
+ 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-gate.lo `test -f 'gate.c' || echo '$(srcdir)/'`gate.c
libwi_odbc_la-hash.lo: hash.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-hash.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-hash.Tpo -c -o libwi_odbc_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-hash.Tpo $(DEPDIR)/libwi_odbc_la-hash.Plo
+ 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-hash.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-hash.Tpo -c -o libwi_odbc_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-hash.Tpo $(DEPDIR)/libwi_odbc_la-hash.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hash.c' object='libwi_odbc_la-hash.lo' libtool=yes @AMDEPBACKSLASH@
@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-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
+ 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-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
libwi_odbc_la-hosting.lo: hosting.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-hosting.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-hosting.Tpo -c -o libwi_odbc_la-hosting.lo `test -f 'hosting.c' || echo '$(srcdir)/'`hosting.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-hosting.Tpo $(DEPDIR)/libwi_odbc_la-hosting.Plo
+ 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-hosting.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-hosting.Tpo -c -o libwi_odbc_la-hosting.lo `test -f 'hosting.c' || echo '$(srcdir)/'`hosting.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-hosting.Tpo $(DEPDIR)/libwi_odbc_la-hosting.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosting.c' object='libwi_odbc_la-hosting.lo' libtool=yes @AMDEPBACKSLASH@
@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-hosting.lo `test -f 'hosting.c' || echo '$(srcdir)/'`hosting.c
+ 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-hosting.lo `test -f 'hosting.c' || echo '$(srcdir)/'`hosting.c
libwi_odbc_la-http.lo: http.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-http.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-http.Tpo -c -o libwi_odbc_la-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-http.Tpo $(DEPDIR)/libwi_odbc_la-http.Plo
+ 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-http.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-http.Tpo -c -o libwi_odbc_la-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-http.Tpo $(DEPDIR)/libwi_odbc_la-http.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='http.c' object='libwi_odbc_la-http.lo' libtool=yes @AMDEPBACKSLASH@
@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-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
+ 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-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
libwi_odbc_la-insert.lo: insert.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-insert.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-insert.Tpo -c -o libwi_odbc_la-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-insert.Tpo $(DEPDIR)/libwi_odbc_la-insert.Plo
+ 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-insert.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-insert.Tpo -c -o libwi_odbc_la-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-insert.Tpo $(DEPDIR)/libwi_odbc_la-insert.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='insert.c' object='libwi_odbc_la-insert.lo' libtool=yes @AMDEPBACKSLASH@
@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-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
+ 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-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
libwi_odbc_la-inxop.lo: inxop.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-inxop.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-inxop.Tpo -c -o libwi_odbc_la-inxop.lo `test -f 'inxop.c' || echo '$(srcdir)/'`inxop.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-inxop.Tpo $(DEPDIR)/libwi_odbc_la-inxop.Plo
+ 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-inxop.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-inxop.Tpo -c -o libwi_odbc_la-inxop.lo `test -f 'inxop.c' || echo '$(srcdir)/'`inxop.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-inxop.Tpo $(DEPDIR)/libwi_odbc_la-inxop.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='inxop.c' object='libwi_odbc_la-inxop.lo' libtool=yes @AMDEPBACKSLASH@
@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-inxop.lo `test -f 'inxop.c' || echo '$(srcdir)/'`inxop.c
+ 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-inxop.lo `test -f 'inxop.c' || echo '$(srcdir)/'`inxop.c
libwi_odbc_la-json_l.lo: json_l.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-json_l.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-json_l.Tpo -c -o libwi_odbc_la-json_l.lo `test -f 'json_l.c' || echo '$(srcdir)/'`json_l.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-json_l.Tpo $(DEPDIR)/libwi_odbc_la-json_l.Plo
+ 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-json_l.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-json_l.Tpo -c -o libwi_odbc_la-json_l.lo `test -f 'json_l.c' || echo '$(srcdir)/'`json_l.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-json_l.Tpo $(DEPDIR)/libwi_odbc_la-json_l.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='json_l.c' object='libwi_odbc_la-json_l.lo' libtool=yes @AMDEPBACKSLASH@
@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-json_l.lo `test -f 'json_l.c' || echo '$(srcdir)/'`json_l.c
+ 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-json_l.lo `test -f 'json_l.c' || echo '$(srcdir)/'`json_l.c
libwi_odbc_la-json_p.lo: json_p.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-json_p.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-json_p.Tpo -c -o libwi_odbc_la-json_p.lo `test -f 'json_p.c' || echo '$(srcdir)/'`json_p.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-json_p.Tpo $(DEPDIR)/libwi_odbc_la-json_p.Plo
+ 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-json_p.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-json_p.Tpo -c -o libwi_odbc_la-json_p.lo `test -f 'json_p.c' || echo '$(srcdir)/'`json_p.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-json_p.Tpo $(DEPDIR)/libwi_odbc_la-json_p.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='json_p.c' object='libwi_odbc_la-json_p.lo' libtool=yes @AMDEPBACKSLASH@
@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-json_p.lo `test -f 'json_p.c' || echo '$(srcdir)/'`json_p.c
+ 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-json_p.lo `test -f 'json_p.c' || echo '$(srcdir)/'`json_p.c
libwi_odbc_la-lisprdr.lo: lisprdr.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-lisprdr.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-lisprdr.Tpo -c -o libwi_odbc_la-lisprdr.lo `test -f 'lisprdr.c' || echo '$(srcdir)/'`lisprdr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-lisprdr.Tpo $(DEPDIR)/libwi_odbc_la-lisprdr.Plo
+ 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-lisprdr.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-lisprdr.Tpo -c -o libwi_odbc_la-lisprdr.lo `test -f 'lisprdr.c' || echo '$(srcdir)/'`lisprdr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-lisprdr.Tpo $(DEPDIR)/libwi_odbc_la-lisprdr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lisprdr.c' object='libwi_odbc_la-lisprdr.lo' libtool=yes @AMDEPBACKSLASH@
@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-lisprdr.lo `test -f 'lisprdr.c' || echo '$(srcdir)/'`lisprdr.c
+ 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-lisprdr.lo `test -f 'lisprdr.c' || echo '$(srcdir)/'`lisprdr.c
libwi_odbc_la-lock.lo: lock.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-lock.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-lock.Tpo -c -o libwi_odbc_la-lock.lo `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-lock.Tpo $(DEPDIR)/libwi_odbc_la-lock.Plo
+ 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-lock.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-lock.Tpo -c -o libwi_odbc_la-lock.lo `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-lock.Tpo $(DEPDIR)/libwi_odbc_la-lock.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lock.c' object='libwi_odbc_la-lock.lo' libtool=yes @AMDEPBACKSLASH@
@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-lock.lo `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
+ 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-lock.lo `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
libwi_odbc_la-log.lo: log.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-log.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-log.Tpo -c -o libwi_odbc_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-log.Tpo $(DEPDIR)/libwi_odbc_la-log.Plo
+ 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-log.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-log.Tpo -c -o libwi_odbc_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-log.Tpo $(DEPDIR)/libwi_odbc_la-log.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='log.c' object='libwi_odbc_la-log.lo' libtool=yes @AMDEPBACKSLASH@
@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-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
+ 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-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
libwi_odbc_la-map_schema.lo: map_schema.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-map_schema.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-map_schema.Tpo -c -o libwi_odbc_la-map_schema.lo `test -f 'map_schema.c' || echo '$(srcdir)/'`map_schema.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-map_schema.Tpo $(DEPDIR)/libwi_odbc_la-map_schema.Plo
+ 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-map_schema.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-map_schema.Tpo -c -o libwi_odbc_la-map_schema.lo `test -f 'map_schema.c' || echo '$(srcdir)/'`map_schema.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-map_schema.Tpo $(DEPDIR)/libwi_odbc_la-map_schema.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='map_schema.c' object='libwi_odbc_la-map_schema.lo' libtool=yes @AMDEPBACKSLASH@
@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-map_schema.lo `test -f 'map_schema.c' || echo '$(srcdir)/'`map_schema.c
+ 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-map_schema.lo `test -f 'map_schema.c' || echo '$(srcdir)/'`map_schema.c
libwi_odbc_la-meta.lo: meta.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-meta.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-meta.Tpo -c -o libwi_odbc_la-meta.lo `test -f 'meta.c' || echo '$(srcdir)/'`meta.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-meta.Tpo $(DEPDIR)/libwi_odbc_la-meta.Plo
+ 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-meta.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-meta.Tpo -c -o libwi_odbc_la-meta.lo `test -f 'meta.c' || echo '$(srcdir)/'`meta.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-meta.Tpo $(DEPDIR)/libwi_odbc_la-meta.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='meta.c' object='libwi_odbc_la-meta.lo' libtool=yes @AMDEPBACKSLASH@
@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-meta.lo `test -f 'meta.c' || echo '$(srcdir)/'`meta.c
+ 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-meta.lo `test -f 'meta.c' || echo '$(srcdir)/'`meta.c
libwi_odbc_la-mtwrite.lo: mtwrite.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-mtwrite.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-mtwrite.Tpo -c -o libwi_odbc_la-mtwrite.lo `test -f 'mtwrite.c' || echo '$(srcdir)/'`mtwrite.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-mtwrite.Tpo $(DEPDIR)/libwi_odbc_la-mtwrite.Plo
+ 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-mtwrite.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-mtwrite.Tpo -c -o libwi_odbc_la-mtwrite.lo `test -f 'mtwrite.c' || echo '$(srcdir)/'`mtwrite.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-mtwrite.Tpo $(DEPDIR)/libwi_odbc_la-mtwrite.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mtwrite.c' object='libwi_odbc_la-mtwrite.lo' libtool=yes @AMDEPBACKSLASH@
@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-mtwrite.lo `test -f 'mtwrite.c' || echo '$(srcdir)/'`mtwrite.c
+ 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-mtwrite.lo `test -f 'mtwrite.c' || echo '$(srcdir)/'`mtwrite.c
libwi_odbc_la-multibyte.lo: multibyte.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-multibyte.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-multibyte.Tpo -c -o libwi_odbc_la-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-multibyte.Tpo $(DEPDIR)/libwi_odbc_la-multibyte.Plo
+ 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-multibyte.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-multibyte.Tpo -c -o libwi_odbc_la-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-multibyte.Tpo $(DEPDIR)/libwi_odbc_la-multibyte.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='multibyte.c' object='libwi_odbc_la-multibyte.lo' libtool=yes @AMDEPBACKSLASH@
@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-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
+ 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-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
libwi_odbc_la-neodisk.lo: neodisk.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-neodisk.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-neodisk.Tpo -c -o libwi_odbc_la-neodisk.lo `test -f 'neodisk.c' || echo '$(srcdir)/'`neodisk.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-neodisk.Tpo $(DEPDIR)/libwi_odbc_la-neodisk.Plo
+ 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-neodisk.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-neodisk.Tpo -c -o libwi_odbc_la-neodisk.lo `test -f 'neodisk.c' || echo '$(srcdir)/'`neodisk.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-neodisk.Tpo $(DEPDIR)/libwi_odbc_la-neodisk.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='neodisk.c' object='libwi_odbc_la-neodisk.lo' libtool=yes @AMDEPBACKSLASH@
@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-neodisk.lo `test -f 'neodisk.c' || echo '$(srcdir)/'`neodisk.c
+ 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-neodisk.lo `test -f 'neodisk.c' || echo '$(srcdir)/'`neodisk.c
libwi_odbc_la-numeric.lo: numeric.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-numeric.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-numeric.Tpo -c -o libwi_odbc_la-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-numeric.Tpo $(DEPDIR)/libwi_odbc_la-numeric.Plo
+ 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-numeric.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-numeric.Tpo -c -o libwi_odbc_la-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-numeric.Tpo $(DEPDIR)/libwi_odbc_la-numeric.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='numeric.c' object='libwi_odbc_la-numeric.lo' libtool=yes @AMDEPBACKSLASH@
@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-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
+ 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-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
libwi_odbc_la-obackup.lo: obackup.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-obackup.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-obackup.Tpo -c -o libwi_odbc_la-obackup.lo `test -f 'obackup.c' || echo '$(srcdir)/'`obackup.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-obackup.Tpo $(DEPDIR)/libwi_odbc_la-obackup.Plo
+ 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-obackup.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-obackup.Tpo -c -o libwi_odbc_la-obackup.lo `test -f 'obackup.c' || echo '$(srcdir)/'`obackup.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-obackup.Tpo $(DEPDIR)/libwi_odbc_la-obackup.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obackup.c' object='libwi_odbc_la-obackup.lo' libtool=yes @AMDEPBACKSLASH@
@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-obackup.lo `test -f 'obackup.c' || echo '$(srcdir)/'`obackup.c
+ 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-obackup.lo `test -f 'obackup.c' || echo '$(srcdir)/'`obackup.c
libwi_odbc_la-page.lo: page.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-page.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-page.Tpo -c -o libwi_odbc_la-page.lo `test -f 'page.c' || echo '$(srcdir)/'`page.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-page.Tpo $(DEPDIR)/libwi_odbc_la-page.Plo
+ 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-page.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-page.Tpo -c -o libwi_odbc_la-page.lo `test -f 'page.c' || echo '$(srcdir)/'`page.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-page.Tpo $(DEPDIR)/libwi_odbc_la-page.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='page.c' object='libwi_odbc_la-page.lo' libtool=yes @AMDEPBACKSLASH@
@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-page.lo `test -f 'page.c' || echo '$(srcdir)/'`page.c
+ 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-page.lo `test -f 'page.c' || echo '$(srcdir)/'`page.c
libwi_odbc_la-plugin_loader.lo: plugin_loader.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-plugin_loader.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-plugin_loader.Tpo -c -o libwi_odbc_la-plugin_loader.lo `test -f 'plugin_loader.c' || echo '$(srcdir)/'`plugin_loader.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-plugin_loader.Tpo $(DEPDIR)/libwi_odbc_la-plugin_loader.Plo
+ 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-plugin_loader.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-plugin_loader.Tpo -c -o libwi_odbc_la-plugin_loader.lo `test -f 'plugin_loader.c' || echo '$(srcdir)/'`plugin_loader.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-plugin_loader.Tpo $(DEPDIR)/libwi_odbc_la-plugin_loader.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plugin_loader.c' object='libwi_odbc_la-plugin_loader.lo' libtool=yes @AMDEPBACKSLASH@
@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-plugin_loader.lo `test -f 'plugin_loader.c' || echo '$(srcdir)/'`plugin_loader.c
+ 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-plugin_loader.lo `test -f 'plugin_loader.c' || echo '$(srcdir)/'`plugin_loader.c
libwi_odbc_la-recovery.lo: recovery.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-recovery.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-recovery.Tpo -c -o libwi_odbc_la-recovery.lo `test -f 'recovery.c' || echo '$(srcdir)/'`recovery.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-recovery.Tpo $(DEPDIR)/libwi_odbc_la-recovery.Plo
+ 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-recovery.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-recovery.Tpo -c -o libwi_odbc_la-recovery.lo `test -f 'recovery.c' || echo '$(srcdir)/'`recovery.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-recovery.Tpo $(DEPDIR)/libwi_odbc_la-recovery.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='recovery.c' object='libwi_odbc_la-recovery.lo' libtool=yes @AMDEPBACKSLASH@
@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-recovery.lo `test -f 'recovery.c' || echo '$(srcdir)/'`recovery.c
+ 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-recovery.lo `test -f 'recovery.c' || echo '$(srcdir)/'`recovery.c
libwi_odbc_la-regist.lo: regist.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-regist.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-regist.Tpo -c -o libwi_odbc_la-regist.lo `test -f 'regist.c' || echo '$(srcdir)/'`regist.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-regist.Tpo $(DEPDIR)/libwi_odbc_la-regist.Plo
+ 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-regist.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-regist.Tpo -c -o libwi_odbc_la-regist.lo `test -f 'regist.c' || echo '$(srcdir)/'`regist.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-regist.Tpo $(DEPDIR)/libwi_odbc_la-regist.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regist.c' object='libwi_odbc_la-regist.lo' libtool=yes @AMDEPBACKSLASH@
@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-regist.lo `test -f 'regist.c' || echo '$(srcdir)/'`regist.c
+ 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-regist.lo `test -f 'regist.c' || echo '$(srcdir)/'`regist.c
libwi_odbc_la-rendezvous.lo: rendezvous.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-rendezvous.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rendezvous.Tpo -c -o libwi_odbc_la-rendezvous.lo `test -f 'rendezvous.c' || echo '$(srcdir)/'`rendezvous.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-rendezvous.Tpo $(DEPDIR)/libwi_odbc_la-rendezvous.Plo
+ 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-rendezvous.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rendezvous.Tpo -c -o libwi_odbc_la-rendezvous.lo `test -f 'rendezvous.c' || echo '$(srcdir)/'`rendezvous.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-rendezvous.Tpo $(DEPDIR)/libwi_odbc_la-rendezvous.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rendezvous.c' object='libwi_odbc_la-rendezvous.lo' libtool=yes @AMDEPBACKSLASH@
@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-rendezvous.lo `test -f 'rendezvous.c' || echo '$(srcdir)/'`rendezvous.c
+ 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-rendezvous.lo `test -f 'rendezvous.c' || echo '$(srcdir)/'`rendezvous.c
libwi_odbc_la-rltrx.lo: rltrx.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-rltrx.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rltrx.Tpo -c -o libwi_odbc_la-rltrx.lo `test -f 'rltrx.c' || echo '$(srcdir)/'`rltrx.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-rltrx.Tpo $(DEPDIR)/libwi_odbc_la-rltrx.Plo
+ 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-rltrx.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rltrx.Tpo -c -o libwi_odbc_la-rltrx.lo `test -f 'rltrx.c' || echo '$(srcdir)/'`rltrx.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-rltrx.Tpo $(DEPDIR)/libwi_odbc_la-rltrx.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rltrx.c' object='libwi_odbc_la-rltrx.lo' libtool=yes @AMDEPBACKSLASH@
@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-rltrx.lo `test -f 'rltrx.c' || echo '$(srcdir)/'`rltrx.c
+ 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-rltrx.lo `test -f 'rltrx.c' || echo '$(srcdir)/'`rltrx.c
libwi_odbc_la-row.lo: row.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-row.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-row.Tpo -c -o libwi_odbc_la-row.lo `test -f 'row.c' || echo '$(srcdir)/'`row.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-row.Tpo $(DEPDIR)/libwi_odbc_la-row.Plo
+ 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-row.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-row.Tpo -c -o libwi_odbc_la-row.lo `test -f 'row.c' || echo '$(srcdir)/'`row.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-row.Tpo $(DEPDIR)/libwi_odbc_la-row.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='row.c' object='libwi_odbc_la-row.lo' libtool=yes @AMDEPBACKSLASH@
@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-row.lo `test -f 'row.c' || echo '$(srcdir)/'`row.c
+ 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-row.lo `test -f 'row.c' || echo '$(srcdir)/'`row.c
libwi_odbc_la-schspace.lo: schspace.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-schspace.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-schspace.Tpo -c -o libwi_odbc_la-schspace.lo `test -f 'schspace.c' || echo '$(srcdir)/'`schspace.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-schspace.Tpo $(DEPDIR)/libwi_odbc_la-schspace.Plo
+ 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-schspace.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-schspace.Tpo -c -o libwi_odbc_la-schspace.lo `test -f 'schspace.c' || echo '$(srcdir)/'`schspace.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-schspace.Tpo $(DEPDIR)/libwi_odbc_la-schspace.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='schspace.c' object='libwi_odbc_la-schspace.lo' libtool=yes @AMDEPBACKSLASH@
@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-schspace.lo `test -f 'schspace.c' || echo '$(srcdir)/'`schspace.c
+ 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-schspace.lo `test -f 'schspace.c' || echo '$(srcdir)/'`schspace.c
libwi_odbc_la-scn3.lo: scn3.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-scn3.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-scn3.Tpo -c -o libwi_odbc_la-scn3.lo `test -f 'scn3.c' || echo '$(srcdir)/'`scn3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-scn3.Tpo $(DEPDIR)/libwi_odbc_la-scn3.Plo
+ 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-scn3.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-scn3.Tpo -c -o libwi_odbc_la-scn3.lo `test -f 'scn3.c' || echo '$(srcdir)/'`scn3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-scn3.Tpo $(DEPDIR)/libwi_odbc_la-scn3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='scn3.c' object='libwi_odbc_la-scn3.lo' libtool=yes @AMDEPBACKSLASH@
@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-scn3.lo `test -f 'scn3.c' || echo '$(srcdir)/'`scn3.c
+ 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-scn3.lo `test -f 'scn3.c' || echo '$(srcdir)/'`scn3.c
libwi_odbc_la-search.lo: search.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-search.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-search.Tpo -c -o libwi_odbc_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-search.Tpo $(DEPDIR)/libwi_odbc_la-search.Plo
+ 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-search.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-search.Tpo -c -o libwi_odbc_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-search.Tpo $(DEPDIR)/libwi_odbc_la-search.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='search.c' object='libwi_odbc_la-search.lo' libtool=yes @AMDEPBACKSLASH@
@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-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ 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-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
libwi_odbc_la-search_in.lo: search_in.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-search_in.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-search_in.Tpo -c -o libwi_odbc_la-search_in.lo `test -f 'search_in.c' || echo '$(srcdir)/'`search_in.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-search_in.Tpo $(DEPDIR)/libwi_odbc_la-search_in.Plo
+ 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-search_in.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-search_in.Tpo -c -o libwi_odbc_la-search_in.lo `test -f 'search_in.c' || echo '$(srcdir)/'`search_in.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-search_in.Tpo $(DEPDIR)/libwi_odbc_la-search_in.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='search_in.c' object='libwi_odbc_la-search_in.lo' libtool=yes @AMDEPBACKSLASH@
@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-search_in.lo `test -f 'search_in.c' || echo '$(srcdir)/'`search_in.c
+ 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-search_in.lo `test -f 'search_in.c' || echo '$(srcdir)/'`search_in.c
libwi_odbc_la-security.lo: security.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-security.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-security.Tpo -c -o libwi_odbc_la-security.lo `test -f 'security.c' || echo '$(srcdir)/'`security.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-security.Tpo $(DEPDIR)/libwi_odbc_la-security.Plo
+ 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-security.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-security.Tpo -c -o libwi_odbc_la-security.lo `test -f 'security.c' || echo '$(srcdir)/'`security.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-security.Tpo $(DEPDIR)/libwi_odbc_la-security.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='security.c' object='libwi_odbc_la-security.lo' libtool=yes @AMDEPBACKSLASH@
@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-security.lo `test -f 'security.c' || echo '$(srcdir)/'`security.c
+ 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-security.lo `test -f 'security.c' || echo '$(srcdir)/'`security.c
libwi_odbc_la-shcompo.lo: shcompo.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-shcompo.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-shcompo.Tpo -c -o libwi_odbc_la-shcompo.lo `test -f 'shcompo.c' || echo '$(srcdir)/'`shcompo.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-shcompo.Tpo $(DEPDIR)/libwi_odbc_la-shcompo.Plo
+ 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-shcompo.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-shcompo.Tpo -c -o libwi_odbc_la-shcompo.lo `test -f 'shcompo.c' || echo '$(srcdir)/'`shcompo.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-shcompo.Tpo $(DEPDIR)/libwi_odbc_la-shcompo.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shcompo.c' object='libwi_odbc_la-shcompo.lo' libtool=yes @AMDEPBACKSLASH@
@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-shcompo.lo `test -f 'shcompo.c' || echo '$(srcdir)/'`shcompo.c
+ 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-shcompo.lo `test -f 'shcompo.c' || echo '$(srcdir)/'`shcompo.c
libwi_odbc_la-sort.lo: sort.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-sort.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sort.Tpo -c -o libwi_odbc_la-sort.lo `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sort.Tpo $(DEPDIR)/libwi_odbc_la-sort.Plo
+ 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-sort.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sort.Tpo -c -o libwi_odbc_la-sort.lo `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sort.Tpo $(DEPDIR)/libwi_odbc_la-sort.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sort.c' object='libwi_odbc_la-sort.lo' libtool=yes @AMDEPBACKSLASH@
@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-sort.lo `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
+ 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-sort.lo `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
libwi_odbc_la-space.lo: space.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-space.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-space.Tpo -c -o libwi_odbc_la-space.lo `test -f 'space.c' || echo '$(srcdir)/'`space.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-space.Tpo $(DEPDIR)/libwi_odbc_la-space.Plo
+ 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-space.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-space.Tpo -c -o libwi_odbc_la-space.lo `test -f 'space.c' || echo '$(srcdir)/'`space.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-space.Tpo $(DEPDIR)/libwi_odbc_la-space.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='space.c' object='libwi_odbc_la-space.lo' libtool=yes @AMDEPBACKSLASH@
@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-space.lo `test -f 'space.c' || echo '$(srcdir)/'`space.c
+ 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-space.lo `test -f 'space.c' || echo '$(srcdir)/'`space.c
libwi_odbc_la-sql3.lo: sql3.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-sql3.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql3.Tpo -c -o libwi_odbc_la-sql3.lo `test -f 'sql3.c' || echo '$(srcdir)/'`sql3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql3.Tpo $(DEPDIR)/libwi_odbc_la-sql3.Plo
+ 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-sql3.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql3.Tpo -c -o libwi_odbc_la-sql3.lo `test -f 'sql3.c' || echo '$(srcdir)/'`sql3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql3.Tpo $(DEPDIR)/libwi_odbc_la-sql3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql3.c' object='libwi_odbc_la-sql3.lo' libtool=yes @AMDEPBACKSLASH@
@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-sql3.lo `test -f 'sql3.c' || echo '$(srcdir)/'`sql3.c
+ 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-sql3.lo `test -f 'sql3.c' || echo '$(srcdir)/'`sql3.c
libwi_odbc_la-sqlbif2.lo: sqlbif2.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-sqlbif2.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlbif2.Tpo -c -o libwi_odbc_la-sqlbif2.lo `test -f 'sqlbif2.c' || echo '$(srcdir)/'`sqlbif2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlbif2.Tpo $(DEPDIR)/libwi_odbc_la-sqlbif2.Plo
+ 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-sqlbif2.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlbif2.Tpo -c -o libwi_odbc_la-sqlbif2.lo `test -f 'sqlbif2.c' || echo '$(srcdir)/'`sqlbif2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlbif2.Tpo $(DEPDIR)/libwi_odbc_la-sqlbif2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlbif2.c' object='libwi_odbc_la-sqlbif2.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlbif2.lo `test -f 'sqlbif2.c' || echo '$(srcdir)/'`sqlbif2.c
+ 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-sqlbif2.lo `test -f 'sqlbif2.c' || echo '$(srcdir)/'`sqlbif2.c
libwi_odbc_la-sqlbif.lo: sqlbif.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-sqlbif.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlbif.Tpo -c -o libwi_odbc_la-sqlbif.lo `test -f 'sqlbif.c' || echo '$(srcdir)/'`sqlbif.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlbif.Tpo $(DEPDIR)/libwi_odbc_la-sqlbif.Plo
+ 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-sqlbif.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlbif.Tpo -c -o libwi_odbc_la-sqlbif.lo `test -f 'sqlbif.c' || echo '$(srcdir)/'`sqlbif.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlbif.Tpo $(DEPDIR)/libwi_odbc_la-sqlbif.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlbif.c' object='libwi_odbc_la-sqlbif.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlbif.lo `test -f 'sqlbif.c' || echo '$(srcdir)/'`sqlbif.c
+ 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-sqlbif.lo `test -f 'sqlbif.c' || echo '$(srcdir)/'`sqlbif.c
libwi_odbc_la-sql_code.lo: sql_code.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.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code.Tpo -c -o libwi_odbc_la-sql_code.lo `test -f 'sql_code.c' || echo '$(srcdir)/'`sql_code.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code.Tpo $(DEPDIR)/libwi_odbc_la-sql_code.Plo
+ 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.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code.Tpo -c -o libwi_odbc_la-sql_code.lo `test -f 'sql_code.c' || echo '$(srcdir)/'`sql_code.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code.Tpo $(DEPDIR)/libwi_odbc_la-sql_code.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code.c' object='libwi_odbc_la-sql_code.lo' libtool=yes @AMDEPBACKSLASH@
@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.lo `test -f 'sql_code.c' || echo '$(srcdir)/'`sql_code.c
+ 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.lo `test -f 'sql_code.c' || echo '$(srcdir)/'`sql_code.c
libwi_odbc_la-sql_code_1.lo: sql_code_1.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_1.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_1.Tpo -c -o libwi_odbc_la-sql_code_1.lo `test -f 'sql_code_1.c' || echo '$(srcdir)/'`sql_code_1.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_1.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_1.Plo
+ 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_1.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_1.Tpo -c -o libwi_odbc_la-sql_code_1.lo `test -f 'sql_code_1.c' || echo '$(srcdir)/'`sql_code_1.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_1.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_1.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_1.c' object='libwi_odbc_la-sql_code_1.lo' libtool=yes @AMDEPBACKSLASH@
@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_1.lo `test -f 'sql_code_1.c' || echo '$(srcdir)/'`sql_code_1.c
+ 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_1.lo `test -f 'sql_code_1.c' || echo '$(srcdir)/'`sql_code_1.c
libwi_odbc_la-sql_code_2pc.lo: sql_code_2pc.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_2pc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_2pc.Tpo -c -o libwi_odbc_la-sql_code_2pc.lo `test -f 'sql_code_2pc.c' || echo '$(srcdir)/'`sql_code_2pc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_2pc.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_2pc.Plo
+ 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_2pc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_2pc.Tpo -c -o libwi_odbc_la-sql_code_2pc.lo `test -f 'sql_code_2pc.c' || echo '$(srcdir)/'`sql_code_2pc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_2pc.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_2pc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_2pc.c' object='libwi_odbc_la-sql_code_2pc.lo' libtool=yes @AMDEPBACKSLASH@
@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_2pc.lo `test -f 'sql_code_2pc.c' || echo '$(srcdir)/'`sql_code_2pc.c
+ 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_2pc.lo `test -f 'sql_code_2pc.c' || echo '$(srcdir)/'`sql_code_2pc.c
libwi_odbc_la-sql_code_adm.lo: sql_code_adm.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_adm.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_adm.Tpo -c -o libwi_odbc_la-sql_code_adm.lo `test -f 'sql_code_adm.c' || echo '$(srcdir)/'`sql_code_adm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_adm.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_adm.Plo
+ 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_adm.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_adm.Tpo -c -o libwi_odbc_la-sql_code_adm.lo `test -f 'sql_code_adm.c' || echo '$(srcdir)/'`sql_code_adm.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_adm.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_adm.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_adm.c' object='libwi_odbc_la-sql_code_adm.lo' libtool=yes @AMDEPBACKSLASH@
@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_adm.lo `test -f 'sql_code_adm.c' || echo '$(srcdir)/'`sql_code_adm.c
+ 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_adm.lo `test -f 'sql_code_adm.c' || echo '$(srcdir)/'`sql_code_adm.c
libwi_odbc_la-sql_code_auto.lo: sql_code_auto.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_auto.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_auto.Tpo -c -o libwi_odbc_la-sql_code_auto.lo `test -f 'sql_code_auto.c' || echo '$(srcdir)/'`sql_code_auto.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_auto.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_auto.Plo
+ 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_auto.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_auto.Tpo -c -o libwi_odbc_la-sql_code_auto.lo `test -f 'sql_code_auto.c' || echo '$(srcdir)/'`sql_code_auto.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_auto.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_auto.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_auto.c' object='libwi_odbc_la-sql_code_auto.lo' libtool=yes @AMDEPBACKSLASH@
@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_auto.lo `test -f 'sql_code_auto.c' || echo '$(srcdir)/'`sql_code_auto.c
+ 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_auto.lo `test -f 'sql_code_auto.c' || echo '$(srcdir)/'`sql_code_auto.c
libwi_odbc_la-sql_code_blog.lo: sql_code_blog.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_blog.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_blog.Tpo -c -o libwi_odbc_la-sql_code_blog.lo `test -f 'sql_code_blog.c' || echo '$(srcdir)/'`sql_code_blog.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_blog.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_blog.Plo
+ 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_blog.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_blog.Tpo -c -o libwi_odbc_la-sql_code_blog.lo `test -f 'sql_code_blog.c' || echo '$(srcdir)/'`sql_code_blog.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_blog.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_blog.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_blog.c' object='libwi_odbc_la-sql_code_blog.lo' libtool=yes @AMDEPBACKSLASH@
@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_blog.lo `test -f 'sql_code_blog.c' || echo '$(srcdir)/'`sql_code_blog.c
+ 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_blog.lo `test -f 'sql_code_blog.c' || echo '$(srcdir)/'`sql_code_blog.c
libwi_odbc_la-sql_code_cache.lo: sql_code_cache.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_cache.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_cache.Tpo -c -o libwi_odbc_la-sql_code_cache.lo `test -f 'sql_code_cache.c' || echo '$(srcdir)/'`sql_code_cache.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_cache.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_cache.Plo
+ 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_cache.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_cache.Tpo -c -o libwi_odbc_la-sql_code_cache.lo `test -f 'sql_code_cache.c' || echo '$(srcdir)/'`sql_code_cache.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_cache.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_cache.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_cache.c' object='libwi_odbc_la-sql_code_cache.lo' libtool=yes @AMDEPBACKSLASH@
@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_cache.lo `test -f 'sql_code_cache.c' || echo '$(srcdir)/'`sql_code_cache.c
+ 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_cache.lo `test -f 'sql_code_cache.c' || echo '$(srcdir)/'`sql_code_cache.c
libwi_odbc_la-sql_code_dav.lo: sql_code_dav.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_dav.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_dav.Tpo -c -o libwi_odbc_la-sql_code_dav.lo `test -f 'sql_code_dav.c' || echo '$(srcdir)/'`sql_code_dav.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_dav.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_dav.Plo
+ 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_dav.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_dav.Tpo -c -o libwi_odbc_la-sql_code_dav.lo `test -f 'sql_code_dav.c' || echo '$(srcdir)/'`sql_code_dav.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_dav.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_dav.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_dav.c' object='libwi_odbc_la-sql_code_dav.lo' libtool=yes @AMDEPBACKSLASH@
@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_dav.lo `test -f 'sql_code_dav.c' || echo '$(srcdir)/'`sql_code_dav.c
+ 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_dav.lo `test -f 'sql_code_dav.c' || echo '$(srcdir)/'`sql_code_dav.c
libwi_odbc_la-sql_code_dbp.lo: sql_code_dbp.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_dbp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_dbp.Tpo -c -o libwi_odbc_la-sql_code_dbp.lo `test -f 'sql_code_dbp.c' || echo '$(srcdir)/'`sql_code_dbp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_dbp.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_dbp.Plo
+ 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_dbp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_dbp.Tpo -c -o libwi_odbc_la-sql_code_dbp.lo `test -f 'sql_code_dbp.c' || echo '$(srcdir)/'`sql_code_dbp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_dbp.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_dbp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_dbp.c' object='libwi_odbc_la-sql_code_dbp.lo' libtool=yes @AMDEPBACKSLASH@
@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_dbp.lo `test -f 'sql_code_dbp.c' || echo '$(srcdir)/'`sql_code_dbp.c
+ 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_dbp.lo `test -f 'sql_code_dbp.c' || echo '$(srcdir)/'`sql_code_dbp.c
libwi_odbc_la-sql_code_ddk.lo: sql_code_ddk.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_ddk.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_ddk.Tpo -c -o libwi_odbc_la-sql_code_ddk.lo `test -f 'sql_code_ddk.c' || echo '$(srcdir)/'`sql_code_ddk.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_ddk.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_ddk.Plo
+ 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_ddk.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_ddk.Tpo -c -o libwi_odbc_la-sql_code_ddk.lo `test -f 'sql_code_ddk.c' || echo '$(srcdir)/'`sql_code_ddk.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_ddk.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_ddk.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_ddk.c' object='libwi_odbc_la-sql_code_ddk.lo' libtool=yes @AMDEPBACKSLASH@
@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_ddk.lo `test -f 'sql_code_ddk.c' || echo '$(srcdir)/'`sql_code_ddk.c
+ 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_ddk.lo `test -f 'sql_code_ddk.c' || echo '$(srcdir)/'`sql_code_ddk.c
libwi_odbc_la-sql_code_imsg.lo: sql_code_imsg.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_imsg.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_imsg.Tpo -c -o libwi_odbc_la-sql_code_imsg.lo `test -f 'sql_code_imsg.c' || echo '$(srcdir)/'`sql_code_imsg.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_imsg.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_imsg.Plo
+ 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_imsg.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_imsg.Tpo -c -o libwi_odbc_la-sql_code_imsg.lo `test -f 'sql_code_imsg.c' || echo '$(srcdir)/'`sql_code_imsg.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_imsg.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_imsg.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_imsg.c' object='libwi_odbc_la-sql_code_imsg.lo' libtool=yes @AMDEPBACKSLASH@
@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_imsg.lo `test -f 'sql_code_imsg.c' || echo '$(srcdir)/'`sql_code_imsg.c
+ 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_imsg.lo `test -f 'sql_code_imsg.c' || echo '$(srcdir)/'`sql_code_imsg.c
libwi_odbc_la-sql_code_pldbg.lo: sql_code_pldbg.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_pldbg.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_pldbg.Tpo -c -o libwi_odbc_la-sql_code_pldbg.lo `test -f 'sql_code_pldbg.c' || echo '$(srcdir)/'`sql_code_pldbg.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_pldbg.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_pldbg.Plo
+ 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_pldbg.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_pldbg.Tpo -c -o libwi_odbc_la-sql_code_pldbg.lo `test -f 'sql_code_pldbg.c' || echo '$(srcdir)/'`sql_code_pldbg.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_pldbg.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_pldbg.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_pldbg.c' object='libwi_odbc_la-sql_code_pldbg.lo' libtool=yes @AMDEPBACKSLASH@
@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_pldbg.lo `test -f 'sql_code_pldbg.c' || echo '$(srcdir)/'`sql_code_pldbg.c
+ 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_pldbg.lo `test -f 'sql_code_pldbg.c' || echo '$(srcdir)/'`sql_code_pldbg.c
libwi_odbc_la-sql_code_repl.lo: sql_code_repl.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_repl.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_repl.Tpo -c -o libwi_odbc_la-sql_code_repl.lo `test -f 'sql_code_repl.c' || echo '$(srcdir)/'`sql_code_repl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_repl.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_repl.Plo
+ 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_repl.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_repl.Tpo -c -o libwi_odbc_la-sql_code_repl.lo `test -f 'sql_code_repl.c' || echo '$(srcdir)/'`sql_code_repl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_repl.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_repl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_repl.c' object='libwi_odbc_la-sql_code_repl.lo' libtool=yes @AMDEPBACKSLASH@
@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_repl.lo `test -f 'sql_code_repl.c' || echo '$(srcdir)/'`sql_code_repl.c
+ 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_repl.lo `test -f 'sql_code_repl.c' || echo '$(srcdir)/'`sql_code_repl.c
libwi_odbc_la-sql_code_sparql.lo: sql_code_sparql.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.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_sparql.Tpo -c -o libwi_odbc_la-sql_code_sparql.lo `test -f 'sql_code_sparql.c' || echo '$(srcdir)/'`sql_code_sparql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_sparql.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_sparql.Plo
+ 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.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_sparql.Tpo -c -o libwi_odbc_la-sql_code_sparql.lo `test -f 'sql_code_sparql.c' || echo '$(srcdir)/'`sql_code_sparql.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_sparql.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_sparql.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_sparql.c' object='libwi_odbc_la-sql_code_sparql.lo' libtool=yes @AMDEPBACKSLASH@
@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.lo `test -f 'sql_code_sparql.c' || echo '$(srcdir)/'`sql_code_sparql.c
+ 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.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@ mv -f $(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
- 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_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
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_sys.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_sys.Plo
+ 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_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
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_sys.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_sys.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_sys.c' object='libwi_odbc_la-sql_code_sys.lo' libtool=yes @AMDEPBACKSLASH@
@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_sys.lo `test -f 'sql_code_sys.c' || echo '$(srcdir)/'`sql_code_sys.c
+ 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_sys.lo `test -f 'sql_code_sys.c' || echo '$(srcdir)/'`sql_code_sys.c
libwi_odbc_la-sql_code_uddi.lo: sql_code_uddi.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_uddi.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_uddi.Tpo -c -o libwi_odbc_la-sql_code_uddi.lo `test -f 'sql_code_uddi.c' || echo '$(srcdir)/'`sql_code_uddi.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_uddi.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_uddi.Plo
+ 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_uddi.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_uddi.Tpo -c -o libwi_odbc_la-sql_code_uddi.lo `test -f 'sql_code_uddi.c' || echo '$(srcdir)/'`sql_code_uddi.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_uddi.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_uddi.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_uddi.c' object='libwi_odbc_la-sql_code_uddi.lo' libtool=yes @AMDEPBACKSLASH@
@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_uddi.lo `test -f 'sql_code_uddi.c' || echo '$(srcdir)/'`sql_code_uddi.c
+ 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_uddi.lo `test -f 'sql_code_uddi.c' || echo '$(srcdir)/'`sql_code_uddi.c
libwi_odbc_la-sql_code_vad.lo: sql_code_vad.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_vad.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_vad.Tpo -c -o libwi_odbc_la-sql_code_vad.lo `test -f 'sql_code_vad.c' || echo '$(srcdir)/'`sql_code_vad.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_vad.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_vad.Plo
+ 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_vad.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_vad.Tpo -c -o libwi_odbc_la-sql_code_vad.lo `test -f 'sql_code_vad.c' || echo '$(srcdir)/'`sql_code_vad.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_vad.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_vad.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_vad.c' object='libwi_odbc_la-sql_code_vad.lo' libtool=yes @AMDEPBACKSLASH@
@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_vad.lo `test -f 'sql_code_vad.c' || echo '$(srcdir)/'`sql_code_vad.c
+ 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_vad.lo `test -f 'sql_code_vad.c' || echo '$(srcdir)/'`sql_code_vad.c
libwi_odbc_la-sql_code_vdb.lo: sql_code_vdb.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_vdb.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_vdb.Tpo -c -o libwi_odbc_la-sql_code_vdb.lo `test -f 'sql_code_vdb.c' || echo '$(srcdir)/'`sql_code_vdb.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_vdb.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_vdb.Plo
+ 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_vdb.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_vdb.Tpo -c -o libwi_odbc_la-sql_code_vdb.lo `test -f 'sql_code_vdb.c' || echo '$(srcdir)/'`sql_code_vdb.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_vdb.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_vdb.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_vdb.c' object='libwi_odbc_la-sql_code_vdb.lo' libtool=yes @AMDEPBACKSLASH@
@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_vdb.lo `test -f 'sql_code_vdb.c' || echo '$(srcdir)/'`sql_code_vdb.c
+ 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_vdb.lo `test -f 'sql_code_vdb.c' || echo '$(srcdir)/'`sql_code_vdb.c
libwi_odbc_la-sql_code_ws.lo: sql_code_ws.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_ws.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_ws.Tpo -c -o libwi_odbc_la-sql_code_ws.lo `test -f 'sql_code_ws.c' || echo '$(srcdir)/'`sql_code_ws.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_ws.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_ws.Plo
+ 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_ws.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_ws.Tpo -c -o libwi_odbc_la-sql_code_ws.lo `test -f 'sql_code_ws.c' || echo '$(srcdir)/'`sql_code_ws.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sql_code_ws.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_ws.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_ws.c' object='libwi_odbc_la-sql_code_ws.lo' libtool=yes @AMDEPBACKSLASH@
@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_ws.lo `test -f 'sql_code_ws.c' || echo '$(srcdir)/'`sql_code_ws.c
+ 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_ws.lo `test -f 'sql_code_ws.c' || echo '$(srcdir)/'`sql_code_ws.c
libwi_odbc_la-sqlcomp2.lo: sqlcomp2.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-sqlcomp2.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlcomp2.Tpo -c -o libwi_odbc_la-sqlcomp2.lo `test -f 'sqlcomp2.c' || echo '$(srcdir)/'`sqlcomp2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlcomp2.Tpo $(DEPDIR)/libwi_odbc_la-sqlcomp2.Plo
+ 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-sqlcomp2.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlcomp2.Tpo -c -o libwi_odbc_la-sqlcomp2.lo `test -f 'sqlcomp2.c' || echo '$(srcdir)/'`sqlcomp2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlcomp2.Tpo $(DEPDIR)/libwi_odbc_la-sqlcomp2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlcomp2.c' object='libwi_odbc_la-sqlcomp2.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlcomp2.lo `test -f 'sqlcomp2.c' || echo '$(srcdir)/'`sqlcomp2.c
+ 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-sqlcomp2.lo `test -f 'sqlcomp2.c' || echo '$(srcdir)/'`sqlcomp2.c
libwi_odbc_la-sqlcomp.lo: sqlcomp.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-sqlcomp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlcomp.Tpo -c -o libwi_odbc_la-sqlcomp.lo `test -f 'sqlcomp.c' || echo '$(srcdir)/'`sqlcomp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlcomp.Tpo $(DEPDIR)/libwi_odbc_la-sqlcomp.Plo
+ 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-sqlcomp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlcomp.Tpo -c -o libwi_odbc_la-sqlcomp.lo `test -f 'sqlcomp.c' || echo '$(srcdir)/'`sqlcomp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlcomp.Tpo $(DEPDIR)/libwi_odbc_la-sqlcomp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlcomp.c' object='libwi_odbc_la-sqlcomp.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlcomp.lo `test -f 'sqlcomp.c' || echo '$(srcdir)/'`sqlcomp.c
+ 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-sqlcomp.lo `test -f 'sqlcomp.c' || echo '$(srcdir)/'`sqlcomp.c
libwi_odbc_la-sqlcost.lo: sqlcost.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-sqlcost.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlcost.Tpo -c -o libwi_odbc_la-sqlcost.lo `test -f 'sqlcost.c' || echo '$(srcdir)/'`sqlcost.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlcost.Tpo $(DEPDIR)/libwi_odbc_la-sqlcost.Plo
+ 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-sqlcost.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlcost.Tpo -c -o libwi_odbc_la-sqlcost.lo `test -f 'sqlcost.c' || echo '$(srcdir)/'`sqlcost.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlcost.Tpo $(DEPDIR)/libwi_odbc_la-sqlcost.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlcost.c' object='libwi_odbc_la-sqlcost.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlcost.lo `test -f 'sqlcost.c' || echo '$(srcdir)/'`sqlcost.c
+ 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-sqlcost.lo `test -f 'sqlcost.c' || echo '$(srcdir)/'`sqlcost.c
libwi_odbc_la-sqlcr.lo: sqlcr.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-sqlcr.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlcr.Tpo -c -o libwi_odbc_la-sqlcr.lo `test -f 'sqlcr.c' || echo '$(srcdir)/'`sqlcr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlcr.Tpo $(DEPDIR)/libwi_odbc_la-sqlcr.Plo
+ 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-sqlcr.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlcr.Tpo -c -o libwi_odbc_la-sqlcr.lo `test -f 'sqlcr.c' || echo '$(srcdir)/'`sqlcr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlcr.Tpo $(DEPDIR)/libwi_odbc_la-sqlcr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlcr.c' object='libwi_odbc_la-sqlcr.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlcr.lo `test -f 'sqlcr.c' || echo '$(srcdir)/'`sqlcr.c
+ 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-sqlcr.lo `test -f 'sqlcr.c' || echo '$(srcdir)/'`sqlcr.c
libwi_odbc_la-sqldf.lo: sqldf.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-sqldf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqldf.Tpo -c -o libwi_odbc_la-sqldf.lo `test -f 'sqldf.c' || echo '$(srcdir)/'`sqldf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqldf.Tpo $(DEPDIR)/libwi_odbc_la-sqldf.Plo
+ 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-sqldf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqldf.Tpo -c -o libwi_odbc_la-sqldf.lo `test -f 'sqldf.c' || echo '$(srcdir)/'`sqldf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqldf.Tpo $(DEPDIR)/libwi_odbc_la-sqldf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqldf.c' object='libwi_odbc_la-sqldf.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqldf.lo `test -f 'sqldf.c' || echo '$(srcdir)/'`sqldf.c
+ 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-sqldf.lo `test -f 'sqldf.c' || echo '$(srcdir)/'`sqldf.c
libwi_odbc_la-sqlexp.lo: sqlexp.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-sqlexp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlexp.Tpo -c -o libwi_odbc_la-sqlexp.lo `test -f 'sqlexp.c' || echo '$(srcdir)/'`sqlexp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlexp.Tpo $(DEPDIR)/libwi_odbc_la-sqlexp.Plo
+ 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-sqlexp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlexp.Tpo -c -o libwi_odbc_la-sqlexp.lo `test -f 'sqlexp.c' || echo '$(srcdir)/'`sqlexp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlexp.Tpo $(DEPDIR)/libwi_odbc_la-sqlexp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlexp.c' object='libwi_odbc_la-sqlexp.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlexp.lo `test -f 'sqlexp.c' || echo '$(srcdir)/'`sqlexp.c
+ 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-sqlexp.lo `test -f 'sqlexp.c' || echo '$(srcdir)/'`sqlexp.c
libwi_odbc_la-sqlgen.lo: sqlgen.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-sqlgen.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlgen.Tpo -c -o libwi_odbc_la-sqlgen.lo `test -f 'sqlgen.c' || echo '$(srcdir)/'`sqlgen.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlgen.Tpo $(DEPDIR)/libwi_odbc_la-sqlgen.Plo
+ 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-sqlgen.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlgen.Tpo -c -o libwi_odbc_la-sqlgen.lo `test -f 'sqlgen.c' || echo '$(srcdir)/'`sqlgen.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlgen.Tpo $(DEPDIR)/libwi_odbc_la-sqlgen.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlgen.c' object='libwi_odbc_la-sqlgen.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlgen.lo `test -f 'sqlgen.c' || echo '$(srcdir)/'`sqlgen.c
+ 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-sqlgen.lo `test -f 'sqlgen.c' || echo '$(srcdir)/'`sqlgen.c
libwi_odbc_la-sqlhash.lo: sqlhash.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-sqlhash.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlhash.Tpo -c -o libwi_odbc_la-sqlhash.lo `test -f 'sqlhash.c' || echo '$(srcdir)/'`sqlhash.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlhash.Tpo $(DEPDIR)/libwi_odbc_la-sqlhash.Plo
+ 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-sqlhash.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlhash.Tpo -c -o libwi_odbc_la-sqlhash.lo `test -f 'sqlhash.c' || echo '$(srcdir)/'`sqlhash.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlhash.Tpo $(DEPDIR)/libwi_odbc_la-sqlhash.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlhash.c' object='libwi_odbc_la-sqlhash.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlhash.lo `test -f 'sqlhash.c' || echo '$(srcdir)/'`sqlhash.c
+ 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-sqlhash.lo `test -f 'sqlhash.c' || echo '$(srcdir)/'`sqlhash.c
libwi_odbc_la-sqlintrp.lo: sqlintrp.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-sqlintrp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlintrp.Tpo -c -o libwi_odbc_la-sqlintrp.lo `test -f 'sqlintrp.c' || echo '$(srcdir)/'`sqlintrp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlintrp.Tpo $(DEPDIR)/libwi_odbc_la-sqlintrp.Plo
+ 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-sqlintrp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlintrp.Tpo -c -o libwi_odbc_la-sqlintrp.lo `test -f 'sqlintrp.c' || echo '$(srcdir)/'`sqlintrp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlintrp.Tpo $(DEPDIR)/libwi_odbc_la-sqlintrp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlintrp.c' object='libwi_odbc_la-sqlintrp.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlintrp.lo `test -f 'sqlintrp.c' || echo '$(srcdir)/'`sqlintrp.c
+ 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-sqlintrp.lo `test -f 'sqlintrp.c' || echo '$(srcdir)/'`sqlintrp.c
libwi_odbc_la-sqlinx.lo: sqlinx.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-sqlinx.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlinx.Tpo -c -o libwi_odbc_la-sqlinx.lo `test -f 'sqlinx.c' || echo '$(srcdir)/'`sqlinx.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlinx.Tpo $(DEPDIR)/libwi_odbc_la-sqlinx.Plo
+ 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-sqlinx.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlinx.Tpo -c -o libwi_odbc_la-sqlinx.lo `test -f 'sqlinx.c' || echo '$(srcdir)/'`sqlinx.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlinx.Tpo $(DEPDIR)/libwi_odbc_la-sqlinx.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlinx.c' object='libwi_odbc_la-sqlinx.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlinx.lo `test -f 'sqlinx.c' || echo '$(srcdir)/'`sqlinx.c
+ 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-sqlinx.lo `test -f 'sqlinx.c' || echo '$(srcdir)/'`sqlinx.c
libwi_odbc_la-sqloby.lo: sqloby.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-sqloby.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqloby.Tpo -c -o libwi_odbc_la-sqloby.lo `test -f 'sqloby.c' || echo '$(srcdir)/'`sqloby.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqloby.Tpo $(DEPDIR)/libwi_odbc_la-sqloby.Plo
+ 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-sqloby.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqloby.Tpo -c -o libwi_odbc_la-sqloby.lo `test -f 'sqloby.c' || echo '$(srcdir)/'`sqloby.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqloby.Tpo $(DEPDIR)/libwi_odbc_la-sqloby.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqloby.c' object='libwi_odbc_la-sqloby.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqloby.lo `test -f 'sqloby.c' || echo '$(srcdir)/'`sqloby.c
+ 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-sqloby.lo `test -f 'sqloby.c' || echo '$(srcdir)/'`sqloby.c
libwi_odbc_la-sqlo.lo: sqlo.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-sqlo.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlo.Tpo -c -o libwi_odbc_la-sqlo.lo `test -f 'sqlo.c' || echo '$(srcdir)/'`sqlo.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlo.Tpo $(DEPDIR)/libwi_odbc_la-sqlo.Plo
+ 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-sqlo.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlo.Tpo -c -o libwi_odbc_la-sqlo.lo `test -f 'sqlo.c' || echo '$(srcdir)/'`sqlo.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlo.Tpo $(DEPDIR)/libwi_odbc_la-sqlo.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlo.c' object='libwi_odbc_la-sqlo.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlo.lo `test -f 'sqlo.c' || echo '$(srcdir)/'`sqlo.c
+ 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-sqlo.lo `test -f 'sqlo.c' || echo '$(srcdir)/'`sqlo.c
libwi_odbc_la-sqlocr.lo: sqlocr.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-sqlocr.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlocr.Tpo -c -o libwi_odbc_la-sqlocr.lo `test -f 'sqlocr.c' || echo '$(srcdir)/'`sqlocr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlocr.Tpo $(DEPDIR)/libwi_odbc_la-sqlocr.Plo
+ 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-sqlocr.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlocr.Tpo -c -o libwi_odbc_la-sqlocr.lo `test -f 'sqlocr.c' || echo '$(srcdir)/'`sqlocr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlocr.Tpo $(DEPDIR)/libwi_odbc_la-sqlocr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlocr.c' object='libwi_odbc_la-sqlocr.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlocr.lo `test -f 'sqlocr.c' || echo '$(srcdir)/'`sqlocr.c
+ 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-sqlocr.lo `test -f 'sqlocr.c' || echo '$(srcdir)/'`sqlocr.c
libwi_odbc_la-sqloinv.lo: sqloinv.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-sqloinv.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqloinv.Tpo -c -o libwi_odbc_la-sqloinv.lo `test -f 'sqloinv.c' || echo '$(srcdir)/'`sqloinv.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqloinv.Tpo $(DEPDIR)/libwi_odbc_la-sqloinv.Plo
+ 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-sqloinv.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqloinv.Tpo -c -o libwi_odbc_la-sqloinv.lo `test -f 'sqloinv.c' || echo '$(srcdir)/'`sqloinv.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqloinv.Tpo $(DEPDIR)/libwi_odbc_la-sqloinv.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqloinv.c' object='libwi_odbc_la-sqloinv.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqloinv.lo `test -f 'sqloinv.c' || echo '$(srcdir)/'`sqloinv.c
+ 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-sqloinv.lo `test -f 'sqloinv.c' || echo '$(srcdir)/'`sqloinv.c
libwi_odbc_la-sqloinx.lo: sqloinx.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-sqloinx.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqloinx.Tpo -c -o libwi_odbc_la-sqloinx.lo `test -f 'sqloinx.c' || echo '$(srcdir)/'`sqloinx.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqloinx.Tpo $(DEPDIR)/libwi_odbc_la-sqloinx.Plo
+ 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-sqloinx.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqloinx.Tpo -c -o libwi_odbc_la-sqloinx.lo `test -f 'sqloinx.c' || echo '$(srcdir)/'`sqloinx.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqloinx.Tpo $(DEPDIR)/libwi_odbc_la-sqloinx.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqloinx.c' object='libwi_odbc_la-sqloinx.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqloinx.lo `test -f 'sqloinx.c' || echo '$(srcdir)/'`sqloinx.c
+ 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-sqloinx.lo `test -f 'sqloinx.c' || echo '$(srcdir)/'`sqloinx.c
libwi_odbc_la-sqloprt.lo: sqloprt.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-sqloprt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqloprt.Tpo -c -o libwi_odbc_la-sqloprt.lo `test -f 'sqloprt.c' || echo '$(srcdir)/'`sqloprt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqloprt.Tpo $(DEPDIR)/libwi_odbc_la-sqloprt.Plo
+ 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-sqloprt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqloprt.Tpo -c -o libwi_odbc_la-sqloprt.lo `test -f 'sqloprt.c' || echo '$(srcdir)/'`sqloprt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqloprt.Tpo $(DEPDIR)/libwi_odbc_la-sqloprt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqloprt.c' object='libwi_odbc_la-sqloprt.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqloprt.lo `test -f 'sqloprt.c' || echo '$(srcdir)/'`sqloprt.c
+ 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-sqloprt.lo `test -f 'sqloprt.c' || echo '$(srcdir)/'`sqloprt.c
libwi_odbc_la-sqlorder.lo: sqlorder.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-sqlorder.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlorder.Tpo -c -o libwi_odbc_la-sqlorder.lo `test -f 'sqlorder.c' || echo '$(srcdir)/'`sqlorder.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlorder.Tpo $(DEPDIR)/libwi_odbc_la-sqlorder.Plo
+ 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-sqlorder.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlorder.Tpo -c -o libwi_odbc_la-sqlorder.lo `test -f 'sqlorder.c' || echo '$(srcdir)/'`sqlorder.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlorder.Tpo $(DEPDIR)/libwi_odbc_la-sqlorder.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlorder.c' object='libwi_odbc_la-sqlorder.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlorder.lo `test -f 'sqlorder.c' || echo '$(srcdir)/'`sqlorder.c
+ 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-sqlorder.lo `test -f 'sqlorder.c' || echo '$(srcdir)/'`sqlorder.c
libwi_odbc_la-sqlovdb.lo: sqlovdb.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-sqlovdb.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlovdb.Tpo -c -o libwi_odbc_la-sqlovdb.lo `test -f 'sqlovdb.c' || echo '$(srcdir)/'`sqlovdb.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlovdb.Tpo $(DEPDIR)/libwi_odbc_la-sqlovdb.Plo
+ 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-sqlovdb.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlovdb.Tpo -c -o libwi_odbc_la-sqlovdb.lo `test -f 'sqlovdb.c' || echo '$(srcdir)/'`sqlovdb.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlovdb.Tpo $(DEPDIR)/libwi_odbc_la-sqlovdb.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlovdb.c' object='libwi_odbc_la-sqlovdb.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlovdb.lo `test -f 'sqlovdb.c' || echo '$(srcdir)/'`sqlovdb.c
+ 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-sqlovdb.lo `test -f 'sqlovdb.c' || echo '$(srcdir)/'`sqlovdb.c
libwi_odbc_la-sqlpfn.lo: sqlpfn.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-sqlpfn.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlpfn.Tpo -c -o libwi_odbc_la-sqlpfn.lo `test -f 'sqlpfn.c' || echo '$(srcdir)/'`sqlpfn.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlpfn.Tpo $(DEPDIR)/libwi_odbc_la-sqlpfn.Plo
+ 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-sqlpfn.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlpfn.Tpo -c -o libwi_odbc_la-sqlpfn.lo `test -f 'sqlpfn.c' || echo '$(srcdir)/'`sqlpfn.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlpfn.Tpo $(DEPDIR)/libwi_odbc_la-sqlpfn.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlpfn.c' object='libwi_odbc_la-sqlpfn.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlpfn.lo `test -f 'sqlpfn.c' || echo '$(srcdir)/'`sqlpfn.c
+ 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-sqlpfn.lo `test -f 'sqlpfn.c' || echo '$(srcdir)/'`sqlpfn.c
libwi_odbc_la-sqlprocc.lo: sqlprocc.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-sqlprocc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlprocc.Tpo -c -o libwi_odbc_la-sqlprocc.lo `test -f 'sqlprocc.c' || echo '$(srcdir)/'`sqlprocc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlprocc.Tpo $(DEPDIR)/libwi_odbc_la-sqlprocc.Plo
+ 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-sqlprocc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlprocc.Tpo -c -o libwi_odbc_la-sqlprocc.lo `test -f 'sqlprocc.c' || echo '$(srcdir)/'`sqlprocc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlprocc.Tpo $(DEPDIR)/libwi_odbc_la-sqlprocc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlprocc.c' object='libwi_odbc_la-sqlprocc.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlprocc.lo `test -f 'sqlprocc.c' || echo '$(srcdir)/'`sqlprocc.c
+ 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-sqlprocc.lo `test -f 'sqlprocc.c' || echo '$(srcdir)/'`sqlprocc.c
libwi_odbc_la-sqlprt.lo: sqlprt.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-sqlprt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlprt.Tpo -c -o libwi_odbc_la-sqlprt.lo `test -f 'sqlprt.c' || echo '$(srcdir)/'`sqlprt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlprt.Tpo $(DEPDIR)/libwi_odbc_la-sqlprt.Plo
+ 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-sqlprt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlprt.Tpo -c -o libwi_odbc_la-sqlprt.lo `test -f 'sqlprt.c' || echo '$(srcdir)/'`sqlprt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlprt.Tpo $(DEPDIR)/libwi_odbc_la-sqlprt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlprt.c' object='libwi_odbc_la-sqlprt.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlprt.lo `test -f 'sqlprt.c' || echo '$(srcdir)/'`sqlprt.c
+ 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-sqlprt.lo `test -f 'sqlprt.c' || echo '$(srcdir)/'`sqlprt.c
libwi_odbc_la-sqlrun.lo: sqlrun.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-sqlrun.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlrun.Tpo -c -o libwi_odbc_la-sqlrun.lo `test -f 'sqlrun.c' || echo '$(srcdir)/'`sqlrun.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlrun.Tpo $(DEPDIR)/libwi_odbc_la-sqlrun.Plo
+ 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-sqlrun.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlrun.Tpo -c -o libwi_odbc_la-sqlrun.lo `test -f 'sqlrun.c' || echo '$(srcdir)/'`sqlrun.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlrun.Tpo $(DEPDIR)/libwi_odbc_la-sqlrun.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlrun.c' object='libwi_odbc_la-sqlrun.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlrun.lo `test -f 'sqlrun.c' || echo '$(srcdir)/'`sqlrun.c
+ 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-sqlrun.lo `test -f 'sqlrun.c' || echo '$(srcdir)/'`sqlrun.c
libwi_odbc_la-sqlsrv.lo: sqlsrv.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-sqlsrv.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlsrv.Tpo -c -o libwi_odbc_la-sqlsrv.lo `test -f 'sqlsrv.c' || echo '$(srcdir)/'`sqlsrv.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlsrv.Tpo $(DEPDIR)/libwi_odbc_la-sqlsrv.Plo
+ 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-sqlsrv.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlsrv.Tpo -c -o libwi_odbc_la-sqlsrv.lo `test -f 'sqlsrv.c' || echo '$(srcdir)/'`sqlsrv.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlsrv.Tpo $(DEPDIR)/libwi_odbc_la-sqlsrv.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlsrv.c' object='libwi_odbc_la-sqlsrv.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlsrv.lo `test -f 'sqlsrv.c' || echo '$(srcdir)/'`sqlsrv.c
+ 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-sqlsrv.lo `test -f 'sqlsrv.c' || echo '$(srcdir)/'`sqlsrv.c
libwi_odbc_la-sqlstmts.lo: sqlstmts.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-sqlstmts.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlstmts.Tpo -c -o libwi_odbc_la-sqlstmts.lo `test -f 'sqlstmts.c' || echo '$(srcdir)/'`sqlstmts.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlstmts.Tpo $(DEPDIR)/libwi_odbc_la-sqlstmts.Plo
+ 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-sqlstmts.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlstmts.Tpo -c -o libwi_odbc_la-sqlstmts.lo `test -f 'sqlstmts.c' || echo '$(srcdir)/'`sqlstmts.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlstmts.Tpo $(DEPDIR)/libwi_odbc_la-sqlstmts.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlstmts.c' object='libwi_odbc_la-sqlstmts.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlstmts.lo `test -f 'sqlstmts.c' || echo '$(srcdir)/'`sqlstmts.c
+ 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-sqlstmts.lo `test -f 'sqlstmts.c' || echo '$(srcdir)/'`sqlstmts.c
libwi_odbc_la-sqltrig.lo: sqltrig.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-sqltrig.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqltrig.Tpo -c -o libwi_odbc_la-sqltrig.lo `test -f 'sqltrig.c' || echo '$(srcdir)/'`sqltrig.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqltrig.Tpo $(DEPDIR)/libwi_odbc_la-sqltrig.Plo
+ 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-sqltrig.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqltrig.Tpo -c -o libwi_odbc_la-sqltrig.lo `test -f 'sqltrig.c' || echo '$(srcdir)/'`sqltrig.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqltrig.Tpo $(DEPDIR)/libwi_odbc_la-sqltrig.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqltrig.c' object='libwi_odbc_la-sqltrig.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqltrig.lo `test -f 'sqltrig.c' || echo '$(srcdir)/'`sqltrig.c
+ 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-sqltrig.lo `test -f 'sqltrig.c' || echo '$(srcdir)/'`sqltrig.c
libwi_odbc_la-sqltype.lo: sqltype.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-sqltype.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqltype.Tpo -c -o libwi_odbc_la-sqltype.lo `test -f 'sqltype.c' || echo '$(srcdir)/'`sqltype.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqltype.Tpo $(DEPDIR)/libwi_odbc_la-sqltype.Plo
+ 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-sqltype.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqltype.Tpo -c -o libwi_odbc_la-sqltype.lo `test -f 'sqltype.c' || echo '$(srcdir)/'`sqltype.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqltype.Tpo $(DEPDIR)/libwi_odbc_la-sqltype.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqltype.c' object='libwi_odbc_la-sqltype.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqltype.lo `test -f 'sqltype.c' || echo '$(srcdir)/'`sqltype.c
+ 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-sqltype.lo `test -f 'sqltype.c' || echo '$(srcdir)/'`sqltype.c
libwi_odbc_la-sqlver.lo: sqlver.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-sqlver.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlver.Tpo -c -o libwi_odbc_la-sqlver.lo `test -f 'sqlver.c' || echo '$(srcdir)/'`sqlver.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlver.Tpo $(DEPDIR)/libwi_odbc_la-sqlver.Plo
+ 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-sqlver.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlver.Tpo -c -o libwi_odbc_la-sqlver.lo `test -f 'sqlver.c' || echo '$(srcdir)/'`sqlver.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlver.Tpo $(DEPDIR)/libwi_odbc_la-sqlver.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlver.c' object='libwi_odbc_la-sqlver.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlver.lo `test -f 'sqlver.c' || echo '$(srcdir)/'`sqlver.c
+ 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-sqlver.lo `test -f 'sqlver.c' || echo '$(srcdir)/'`sqlver.c
libwi_odbc_la-sqlview.lo: sqlview.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-sqlview.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlview.Tpo -c -o libwi_odbc_la-sqlview.lo `test -f 'sqlview.c' || echo '$(srcdir)/'`sqlview.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlview.Tpo $(DEPDIR)/libwi_odbc_la-sqlview.Plo
+ 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-sqlview.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlview.Tpo -c -o libwi_odbc_la-sqlview.lo `test -f 'sqlview.c' || echo '$(srcdir)/'`sqlview.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlview.Tpo $(DEPDIR)/libwi_odbc_la-sqlview.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlview.c' object='libwi_odbc_la-sqlview.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlview.lo `test -f 'sqlview.c' || echo '$(srcdir)/'`sqlview.c
+ 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-sqlview.lo `test -f 'sqlview.c' || echo '$(srcdir)/'`sqlview.c
libwi_odbc_la-srvcr.lo: srvcr.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-srvcr.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-srvcr.Tpo -c -o libwi_odbc_la-srvcr.lo `test -f 'srvcr.c' || echo '$(srcdir)/'`srvcr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-srvcr.Tpo $(DEPDIR)/libwi_odbc_la-srvcr.Plo
+ 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-srvcr.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-srvcr.Tpo -c -o libwi_odbc_la-srvcr.lo `test -f 'srvcr.c' || echo '$(srcdir)/'`srvcr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-srvcr.Tpo $(DEPDIR)/libwi_odbc_la-srvcr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srvcr.c' object='libwi_odbc_la-srvcr.lo' libtool=yes @AMDEPBACKSLASH@
@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-srvcr.lo `test -f 'srvcr.c' || echo '$(srcdir)/'`srvcr.c
+ 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-srvcr.lo `test -f 'srvcr.c' || echo '$(srcdir)/'`srvcr.c
libwi_odbc_la-srvmultibyte.lo: srvmultibyte.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-srvmultibyte.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-srvmultibyte.Tpo -c -o libwi_odbc_la-srvmultibyte.lo `test -f 'srvmultibyte.c' || echo '$(srcdir)/'`srvmultibyte.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-srvmultibyte.Tpo $(DEPDIR)/libwi_odbc_la-srvmultibyte.Plo
+ 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-srvmultibyte.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-srvmultibyte.Tpo -c -o libwi_odbc_la-srvmultibyte.lo `test -f 'srvmultibyte.c' || echo '$(srcdir)/'`srvmultibyte.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-srvmultibyte.Tpo $(DEPDIR)/libwi_odbc_la-srvmultibyte.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srvmultibyte.c' object='libwi_odbc_la-srvmultibyte.lo' libtool=yes @AMDEPBACKSLASH@
@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-srvmultibyte.lo `test -f 'srvmultibyte.c' || echo '$(srcdir)/'`srvmultibyte.c
+ 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-srvmultibyte.lo `test -f 'srvmultibyte.c' || echo '$(srcdir)/'`srvmultibyte.c
libwi_odbc_la-srvstat.lo: srvstat.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-srvstat.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-srvstat.Tpo -c -o libwi_odbc_la-srvstat.lo `test -f 'srvstat.c' || echo '$(srcdir)/'`srvstat.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-srvstat.Tpo $(DEPDIR)/libwi_odbc_la-srvstat.Plo
+ 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-srvstat.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-srvstat.Tpo -c -o libwi_odbc_la-srvstat.lo `test -f 'srvstat.c' || echo '$(srcdir)/'`srvstat.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-srvstat.Tpo $(DEPDIR)/libwi_odbc_la-srvstat.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srvstat.c' object='libwi_odbc_la-srvstat.lo' libtool=yes @AMDEPBACKSLASH@
@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-srvstat.lo `test -f 'srvstat.c' || echo '$(srcdir)/'`srvstat.c
+ 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-srvstat.lo `test -f 'srvstat.c' || echo '$(srcdir)/'`srvstat.c
libwi_odbc_la-string.lo: string.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-string.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-string.Tpo -c -o libwi_odbc_la-string.lo `test -f 'string.c' || echo '$(srcdir)/'`string.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-string.Tpo $(DEPDIR)/libwi_odbc_la-string.Plo
+ 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-string.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-string.Tpo -c -o libwi_odbc_la-string.lo `test -f 'string.c' || echo '$(srcdir)/'`string.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-string.Tpo $(DEPDIR)/libwi_odbc_la-string.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='string.c' object='libwi_odbc_la-string.lo' libtool=yes @AMDEPBACKSLASH@
@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-string.lo `test -f 'string.c' || echo '$(srcdir)/'`string.c
+ 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-string.lo `test -f 'string.c' || echo '$(srcdir)/'`string.c
libwi_odbc_la-trans.lo: trans.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-trans.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-trans.Tpo -c -o libwi_odbc_la-trans.lo `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-trans.Tpo $(DEPDIR)/libwi_odbc_la-trans.Plo
+ 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-trans.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-trans.Tpo -c -o libwi_odbc_la-trans.lo `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-trans.Tpo $(DEPDIR)/libwi_odbc_la-trans.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trans.c' object='libwi_odbc_la-trans.lo' libtool=yes @AMDEPBACKSLASH@
@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-trans.lo `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
+ 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-trans.lo `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
libwi_odbc_la-update.lo: update.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-update.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-update.Tpo -c -o libwi_odbc_la-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-update.Tpo $(DEPDIR)/libwi_odbc_la-update.Plo
+ 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-update.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-update.Tpo -c -o libwi_odbc_la-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-update.Tpo $(DEPDIR)/libwi_odbc_la-update.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='update.c' object='libwi_odbc_la-update.lo' libtool=yes @AMDEPBACKSLASH@
@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-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
+ 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-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
libwi_odbc_la-uuencode.lo: uuencode.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-uuencode.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-uuencode.Tpo -c -o libwi_odbc_la-uuencode.lo `test -f 'uuencode.c' || echo '$(srcdir)/'`uuencode.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-uuencode.Tpo $(DEPDIR)/libwi_odbc_la-uuencode.Plo
+ 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-uuencode.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-uuencode.Tpo -c -o libwi_odbc_la-uuencode.lo `test -f 'uuencode.c' || echo '$(srcdir)/'`uuencode.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-uuencode.Tpo $(DEPDIR)/libwi_odbc_la-uuencode.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uuencode.c' object='libwi_odbc_la-uuencode.lo' libtool=yes @AMDEPBACKSLASH@
@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-uuencode.lo `test -f 'uuencode.c' || echo '$(srcdir)/'`uuencode.c
+ 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-uuencode.lo `test -f 'uuencode.c' || echo '$(srcdir)/'`uuencode.c
libwi_odbc_la-wirpc.lo: wirpc.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-wirpc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-wirpc.Tpo -c -o libwi_odbc_la-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-wirpc.Tpo $(DEPDIR)/libwi_odbc_la-wirpc.Plo
+ 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-wirpc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-wirpc.Tpo -c -o libwi_odbc_la-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-wirpc.Tpo $(DEPDIR)/libwi_odbc_la-wirpc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wirpc.c' object='libwi_odbc_la-wirpc.lo' libtool=yes @AMDEPBACKSLASH@
@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-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
+ 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-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
libwi_odbc_la-wiservic.lo: wiservic.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-wiservic.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-wiservic.Tpo -c -o libwi_odbc_la-wiservic.lo `test -f 'wiservic.c' || echo '$(srcdir)/'`wiservic.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-wiservic.Tpo $(DEPDIR)/libwi_odbc_la-wiservic.Plo
+ 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-wiservic.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-wiservic.Tpo -c -o libwi_odbc_la-wiservic.lo `test -f 'wiservic.c' || echo '$(srcdir)/'`wiservic.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-wiservic.Tpo $(DEPDIR)/libwi_odbc_la-wiservic.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wiservic.c' object='libwi_odbc_la-wiservic.lo' libtool=yes @AMDEPBACKSLASH@
@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-wiservic.lo `test -f 'wiservic.c' || echo '$(srcdir)/'`wiservic.c
+ 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-wiservic.lo `test -f 'wiservic.c' || echo '$(srcdir)/'`wiservic.c
libwi_odbc_la-xpathp.lo: xpathp.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-xpathp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xpathp.Tpo -c -o libwi_odbc_la-xpathp.lo `test -f 'xpathp.c' || echo '$(srcdir)/'`xpathp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xpathp.Tpo $(DEPDIR)/libwi_odbc_la-xpathp.Plo
+ 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-xpathp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xpathp.Tpo -c -o libwi_odbc_la-xpathp.lo `test -f 'xpathp.c' || echo '$(srcdir)/'`xpathp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xpathp.Tpo $(DEPDIR)/libwi_odbc_la-xpathp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xpathp.c' object='libwi_odbc_la-xpathp.lo' libtool=yes @AMDEPBACKSLASH@
@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-xpathp.lo `test -f 'xpathp.c' || echo '$(srcdir)/'`xpathp.c
+ 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-xpathp.lo `test -f 'xpathp.c' || echo '$(srcdir)/'`xpathp.c
libwi_odbc_la-xpscn.lo: xpscn.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-xpscn.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xpscn.Tpo -c -o libwi_odbc_la-xpscn.lo `test -f 'xpscn.c' || echo '$(srcdir)/'`xpscn.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xpscn.Tpo $(DEPDIR)/libwi_odbc_la-xpscn.Plo
+ 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-xpscn.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xpscn.Tpo -c -o libwi_odbc_la-xpscn.lo `test -f 'xpscn.c' || echo '$(srcdir)/'`xpscn.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xpscn.Tpo $(DEPDIR)/libwi_odbc_la-xpscn.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xpscn.c' object='libwi_odbc_la-xpscn.lo' libtool=yes @AMDEPBACKSLASH@
@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-xpscn.lo `test -f 'xpscn.c' || echo '$(srcdir)/'`xpscn.c
+ 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-xpscn.lo `test -f 'xpscn.c' || echo '$(srcdir)/'`xpscn.c
libwi_odbc_la-jso.lo: jso.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-jso.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-jso.Tpo -c -o libwi_odbc_la-jso.lo `test -f 'jso.c' || echo '$(srcdir)/'`jso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-jso.Tpo $(DEPDIR)/libwi_odbc_la-jso.Plo
+ 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-jso.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-jso.Tpo -c -o libwi_odbc_la-jso.lo `test -f 'jso.c' || echo '$(srcdir)/'`jso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-jso.Tpo $(DEPDIR)/libwi_odbc_la-jso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='jso.c' object='libwi_odbc_la-jso.lo' libtool=yes @AMDEPBACKSLASH@
@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-jso.lo `test -f 'jso.c' || echo '$(srcdir)/'`jso.c
+ 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-jso.lo `test -f 'jso.c' || echo '$(srcdir)/'`jso.c
libwi_odbc_la-rdfbox.lo: rdfbox.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-rdfbox.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdfbox.Tpo -c -o libwi_odbc_la-rdfbox.lo `test -f 'rdfbox.c' || echo '$(srcdir)/'`rdfbox.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-rdfbox.Tpo $(DEPDIR)/libwi_odbc_la-rdfbox.Plo
+ 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-rdfbox.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdfbox.Tpo -c -o libwi_odbc_la-rdfbox.lo `test -f 'rdfbox.c' || echo '$(srcdir)/'`rdfbox.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-rdfbox.Tpo $(DEPDIR)/libwi_odbc_la-rdfbox.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdfbox.c' object='libwi_odbc_la-rdfbox.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdfbox.lo `test -f 'rdfbox.c' || echo '$(srcdir)/'`rdfbox.c
+ 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-rdfbox.lo `test -f 'rdfbox.c' || echo '$(srcdir)/'`rdfbox.c
libwi_odbc_la-rdf_core.lo: rdf_core.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-rdf_core.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdf_core.Tpo -c -o libwi_odbc_la-rdf_core.lo `test -f 'rdf_core.c' || echo '$(srcdir)/'`rdf_core.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-rdf_core.Tpo $(DEPDIR)/libwi_odbc_la-rdf_core.Plo
+ 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-rdf_core.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdf_core.Tpo -c -o libwi_odbc_la-rdf_core.lo `test -f 'rdf_core.c' || echo '$(srcdir)/'`rdf_core.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-rdf_core.Tpo $(DEPDIR)/libwi_odbc_la-rdf_core.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdf_core.c' object='libwi_odbc_la-rdf_core.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdf_core.lo `test -f 'rdf_core.c' || echo '$(srcdir)/'`rdf_core.c
+ 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-rdf_core.lo `test -f 'rdf_core.c' || echo '$(srcdir)/'`rdf_core.c
libwi_odbc_la-rdfinf.lo: rdfinf.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-rdfinf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdfinf.Tpo -c -o libwi_odbc_la-rdfinf.lo `test -f 'rdfinf.c' || echo '$(srcdir)/'`rdfinf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-rdfinf.Tpo $(DEPDIR)/libwi_odbc_la-rdfinf.Plo
+ 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-rdfinf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdfinf.Tpo -c -o libwi_odbc_la-rdfinf.lo `test -f 'rdfinf.c' || echo '$(srcdir)/'`rdfinf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-rdfinf.Tpo $(DEPDIR)/libwi_odbc_la-rdfinf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdfinf.c' object='libwi_odbc_la-rdfinf.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdfinf.lo `test -f 'rdfinf.c' || echo '$(srcdir)/'`rdfinf.c
+ 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-rdfinf.lo `test -f 'rdfinf.c' || echo '$(srcdir)/'`rdfinf.c
libwi_odbc_la-rdf_mapping_jso.lo: rdf_mapping_jso.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-rdf_mapping_jso.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdf_mapping_jso.Tpo -c -o libwi_odbc_la-rdf_mapping_jso.lo `test -f 'rdf_mapping_jso.c' || echo '$(srcdir)/'`rdf_mapping_jso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-rdf_mapping_jso.Tpo $(DEPDIR)/libwi_odbc_la-rdf_mapping_jso.Plo
+ 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-rdf_mapping_jso.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdf_mapping_jso.Tpo -c -o libwi_odbc_la-rdf_mapping_jso.lo `test -f 'rdf_mapping_jso.c' || echo '$(srcdir)/'`rdf_mapping_jso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-rdf_mapping_jso.Tpo $(DEPDIR)/libwi_odbc_la-rdf_mapping_jso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdf_mapping_jso.c' object='libwi_odbc_la-rdf_mapping_jso.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdf_mapping_jso.lo `test -f 'rdf_mapping_jso.c' || echo '$(srcdir)/'`rdf_mapping_jso.c
+ 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-rdf_mapping_jso.lo `test -f 'rdf_mapping_jso.c' || echo '$(srcdir)/'`rdf_mapping_jso.c
libwi_odbc_la-rdfxml_parser.lo: rdfxml_parser.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-rdfxml_parser.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdfxml_parser.Tpo -c -o libwi_odbc_la-rdfxml_parser.lo `test -f 'rdfxml_parser.c' || echo '$(srcdir)/'`rdfxml_parser.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-rdfxml_parser.Tpo $(DEPDIR)/libwi_odbc_la-rdfxml_parser.Plo
+ 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-rdfxml_parser.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-rdfxml_parser.Tpo -c -o libwi_odbc_la-rdfxml_parser.lo `test -f 'rdfxml_parser.c' || echo '$(srcdir)/'`rdfxml_parser.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-rdfxml_parser.Tpo $(DEPDIR)/libwi_odbc_la-rdfxml_parser.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rdfxml_parser.c' object='libwi_odbc_la-rdfxml_parser.lo' libtool=yes @AMDEPBACKSLASH@
@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-rdfxml_parser.lo `test -f 'rdfxml_parser.c' || echo '$(srcdir)/'`rdfxml_parser.c
+ 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-rdfxml_parser.lo `test -f 'rdfxml_parser.c' || echo '$(srcdir)/'`rdfxml_parser.c
libwi_odbc_la-nquad_p.lo: nquad_p.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-nquad_p.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-nquad_p.Tpo -c -o libwi_odbc_la-nquad_p.lo `test -f 'nquad_p.c' || echo '$(srcdir)/'`nquad_p.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-nquad_p.Tpo $(DEPDIR)/libwi_odbc_la-nquad_p.Plo
+ 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-nquad_p.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-nquad_p.Tpo -c -o libwi_odbc_la-nquad_p.lo `test -f 'nquad_p.c' || echo '$(srcdir)/'`nquad_p.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-nquad_p.Tpo $(DEPDIR)/libwi_odbc_la-nquad_p.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nquad_p.c' object='libwi_odbc_la-nquad_p.lo' libtool=yes @AMDEPBACKSLASH@
@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-nquad_p.lo `test -f 'nquad_p.c' || echo '$(srcdir)/'`nquad_p.c
+ 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-nquad_p.lo `test -f 'nquad_p.c' || echo '$(srcdir)/'`nquad_p.c
libwi_odbc_la-sparql2sql.lo: sparql2sql.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-sparql2sql.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql2sql.Tpo -c -o libwi_odbc_la-sparql2sql.lo `test -f 'sparql2sql.c' || echo '$(srcdir)/'`sparql2sql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql2sql.Tpo $(DEPDIR)/libwi_odbc_la-sparql2sql.Plo
+ 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-sparql2sql.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql2sql.Tpo -c -o libwi_odbc_la-sparql2sql.lo `test -f 'sparql2sql.c' || echo '$(srcdir)/'`sparql2sql.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql2sql.Tpo $(DEPDIR)/libwi_odbc_la-sparql2sql.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql2sql.c' object='libwi_odbc_la-sparql2sql.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql2sql.lo `test -f 'sparql2sql.c' || echo '$(srcdir)/'`sparql2sql.c
+ 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-sparql2sql.lo `test -f 'sparql2sql.c' || echo '$(srcdir)/'`sparql2sql.c
libwi_odbc_la-sparql2sqltext.lo: sparql2sqltext.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-sparql2sqltext.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql2sqltext.Tpo -c -o libwi_odbc_la-sparql2sqltext.lo `test -f 'sparql2sqltext.c' || echo '$(srcdir)/'`sparql2sqltext.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql2sqltext.Tpo $(DEPDIR)/libwi_odbc_la-sparql2sqltext.Plo
+ 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-sparql2sqltext.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql2sqltext.Tpo -c -o libwi_odbc_la-sparql2sqltext.lo `test -f 'sparql2sqltext.c' || echo '$(srcdir)/'`sparql2sqltext.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql2sqltext.Tpo $(DEPDIR)/libwi_odbc_la-sparql2sqltext.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql2sqltext.c' object='libwi_odbc_la-sparql2sqltext.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql2sqltext.lo `test -f 'sparql2sqltext.c' || echo '$(srcdir)/'`sparql2sqltext.c
+ 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-sparql2sqltext.lo `test -f 'sparql2sqltext.c' || echo '$(srcdir)/'`sparql2sqltext.c
libwi_odbc_la-sparqld.lo: sparqld.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-sparqld.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparqld.Tpo -c -o libwi_odbc_la-sparqld.lo `test -f 'sparqld.c' || echo '$(srcdir)/'`sparqld.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparqld.Tpo $(DEPDIR)/libwi_odbc_la-sparqld.Plo
+ 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-sparqld.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparqld.Tpo -c -o libwi_odbc_la-sparqld.lo `test -f 'sparqld.c' || echo '$(srcdir)/'`sparqld.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparqld.Tpo $(DEPDIR)/libwi_odbc_la-sparqld.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparqld.c' object='libwi_odbc_la-sparqld.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparqld.lo `test -f 'sparqld.c' || echo '$(srcdir)/'`sparqld.c
+ 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-sparqld.lo `test -f 'sparqld.c' || echo '$(srcdir)/'`sparqld.c
libwi_odbc_la-sparql_core.lo: sparql_core.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-sparql_core.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_core.Tpo -c -o libwi_odbc_la-sparql_core.lo `test -f 'sparql_core.c' || echo '$(srcdir)/'`sparql_core.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql_core.Tpo $(DEPDIR)/libwi_odbc_la-sparql_core.Plo
+ 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-sparql_core.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_core.Tpo -c -o libwi_odbc_la-sparql_core.lo `test -f 'sparql_core.c' || echo '$(srcdir)/'`sparql_core.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql_core.Tpo $(DEPDIR)/libwi_odbc_la-sparql_core.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_core.c' object='libwi_odbc_la-sparql_core.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_core.lo `test -f 'sparql_core.c' || echo '$(srcdir)/'`sparql_core.c
+ 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-sparql_core.lo `test -f 'sparql_core.c' || echo '$(srcdir)/'`sparql_core.c
libwi_odbc_la-sparql_l.lo: sparql_l.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-sparql_l.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_l.Tpo -c -o libwi_odbc_la-sparql_l.lo `test -f 'sparql_l.c' || echo '$(srcdir)/'`sparql_l.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql_l.Tpo $(DEPDIR)/libwi_odbc_la-sparql_l.Plo
+ 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-sparql_l.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_l.Tpo -c -o libwi_odbc_la-sparql_l.lo `test -f 'sparql_l.c' || echo '$(srcdir)/'`sparql_l.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql_l.Tpo $(DEPDIR)/libwi_odbc_la-sparql_l.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_l.c' object='libwi_odbc_la-sparql_l.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_l.lo `test -f 'sparql_l.c' || echo '$(srcdir)/'`sparql_l.c
+ 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-sparql_l.lo `test -f 'sparql_l.c' || echo '$(srcdir)/'`sparql_l.c
libwi_odbc_la-sparql_p.lo: sparql_p.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-sparql_p.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_p.Tpo -c -o libwi_odbc_la-sparql_p.lo `test -f 'sparql_p.c' || echo '$(srcdir)/'`sparql_p.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql_p.Tpo $(DEPDIR)/libwi_odbc_la-sparql_p.Plo
+ 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-sparql_p.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_p.Tpo -c -o libwi_odbc_la-sparql_p.lo `test -f 'sparql_p.c' || echo '$(srcdir)/'`sparql_p.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql_p.Tpo $(DEPDIR)/libwi_odbc_la-sparql_p.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_p.c' object='libwi_odbc_la-sparql_p.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_p.lo `test -f 'sparql_p.c' || echo '$(srcdir)/'`sparql_p.c
+ 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-sparql_p.lo `test -f 'sparql_p.c' || echo '$(srcdir)/'`sparql_p.c
libwi_odbc_la-sparql_qm.lo: sparql_qm.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-sparql_qm.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_qm.Tpo -c -o libwi_odbc_la-sparql_qm.lo `test -f 'sparql_qm.c' || echo '$(srcdir)/'`sparql_qm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql_qm.Tpo $(DEPDIR)/libwi_odbc_la-sparql_qm.Plo
+ 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-sparql_qm.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_qm.Tpo -c -o libwi_odbc_la-sparql_qm.lo `test -f 'sparql_qm.c' || echo '$(srcdir)/'`sparql_qm.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql_qm.Tpo $(DEPDIR)/libwi_odbc_la-sparql_qm.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_qm.c' object='libwi_odbc_la-sparql_qm.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_qm.lo `test -f 'sparql_qm.c' || echo '$(srcdir)/'`sparql_qm.c
+ 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-sparql_qm.lo `test -f 'sparql_qm.c' || echo '$(srcdir)/'`sparql_qm.c
libwi_odbc_la-sparql_sff.lo: sparql_sff.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-sparql_sff.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_sff.Tpo -c -o libwi_odbc_la-sparql_sff.lo `test -f 'sparql_sff.c' || echo '$(srcdir)/'`sparql_sff.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql_sff.Tpo $(DEPDIR)/libwi_odbc_la-sparql_sff.Plo
+ 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-sparql_sff.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_sff.Tpo -c -o libwi_odbc_la-sparql_sff.lo `test -f 'sparql_sff.c' || echo '$(srcdir)/'`sparql_sff.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql_sff.Tpo $(DEPDIR)/libwi_odbc_la-sparql_sff.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_sff.c' object='libwi_odbc_la-sparql_sff.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_sff.lo `test -f 'sparql_sff.c' || echo '$(srcdir)/'`sparql_sff.c
+ 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-sparql_sff.lo `test -f 'sparql_sff.c' || echo '$(srcdir)/'`sparql_sff.c
libwi_odbc_la-sparql_tree.lo: sparql_tree.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-sparql_tree.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_tree.Tpo -c -o libwi_odbc_la-sparql_tree.lo `test -f 'sparql_tree.c' || echo '$(srcdir)/'`sparql_tree.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql_tree.Tpo $(DEPDIR)/libwi_odbc_la-sparql_tree.Plo
+ 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-sparql_tree.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_tree.Tpo -c -o libwi_odbc_la-sparql_tree.lo `test -f 'sparql_tree.c' || echo '$(srcdir)/'`sparql_tree.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql_tree.Tpo $(DEPDIR)/libwi_odbc_la-sparql_tree.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_tree.c' object='libwi_odbc_la-sparql_tree.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_tree.lo `test -f 'sparql_tree.c' || echo '$(srcdir)/'`sparql_tree.c
+ 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-sparql_tree.lo `test -f 'sparql_tree.c' || echo '$(srcdir)/'`sparql_tree.c
libwi_odbc_la-sparql_rdb2rdf.lo: sparql_rdb2rdf.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-sparql_rdb2rdf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_rdb2rdf.Tpo -c -o libwi_odbc_la-sparql_rdb2rdf.lo `test -f 'sparql_rdb2rdf.c' || echo '$(srcdir)/'`sparql_rdb2rdf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparql_rdb2rdf.Tpo $(DEPDIR)/libwi_odbc_la-sparql_rdb2rdf.Plo
+ 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-sparql_rdb2rdf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparql_rdb2rdf.Tpo -c -o libwi_odbc_la-sparql_rdb2rdf.lo `test -f 'sparql_rdb2rdf.c' || echo '$(srcdir)/'`sparql_rdb2rdf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparql_rdb2rdf.Tpo $(DEPDIR)/libwi_odbc_la-sparql_rdb2rdf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparql_rdb2rdf.c' object='libwi_odbc_la-sparql_rdb2rdf.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparql_rdb2rdf.lo `test -f 'sparql_rdb2rdf.c' || echo '$(srcdir)/'`sparql_rdb2rdf.c
+ 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-sparql_rdb2rdf.lo `test -f 'sparql_rdb2rdf.c' || echo '$(srcdir)/'`sparql_rdb2rdf.c
libwi_odbc_la-sparul2sql.lo: sparul2sql.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-sparul2sql.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparul2sql.Tpo -c -o libwi_odbc_la-sparul2sql.lo `test -f 'sparul2sql.c' || echo '$(srcdir)/'`sparul2sql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sparul2sql.Tpo $(DEPDIR)/libwi_odbc_la-sparul2sql.Plo
+ 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-sparul2sql.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sparul2sql.Tpo -c -o libwi_odbc_la-sparul2sql.lo `test -f 'sparul2sql.c' || echo '$(srcdir)/'`sparul2sql.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sparul2sql.Tpo $(DEPDIR)/libwi_odbc_la-sparul2sql.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sparul2sql.c' object='libwi_odbc_la-sparul2sql.lo' libtool=yes @AMDEPBACKSLASH@
@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-sparul2sql.lo `test -f 'sparul2sql.c' || echo '$(srcdir)/'`sparul2sql.c
+ 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-sparul2sql.lo `test -f 'sparul2sql.c' || echo '$(srcdir)/'`sparul2sql.c
libwi_odbc_la-turtle_l.lo: turtle_l.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-turtle_l.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-turtle_l.Tpo -c -o libwi_odbc_la-turtle_l.lo `test -f 'turtle_l.c' || echo '$(srcdir)/'`turtle_l.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-turtle_l.Tpo $(DEPDIR)/libwi_odbc_la-turtle_l.Plo
+ 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-turtle_l.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-turtle_l.Tpo -c -o libwi_odbc_la-turtle_l.lo `test -f 'turtle_l.c' || echo '$(srcdir)/'`turtle_l.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-turtle_l.Tpo $(DEPDIR)/libwi_odbc_la-turtle_l.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='turtle_l.c' object='libwi_odbc_la-turtle_l.lo' libtool=yes @AMDEPBACKSLASH@
@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-turtle_l.lo `test -f 'turtle_l.c' || echo '$(srcdir)/'`turtle_l.c
+ 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-turtle_l.lo `test -f 'turtle_l.c' || echo '$(srcdir)/'`turtle_l.c
libwi_odbc_la-turtle_p.lo: turtle_p.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-turtle_p.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-turtle_p.Tpo -c -o libwi_odbc_la-turtle_p.lo `test -f 'turtle_p.c' || echo '$(srcdir)/'`turtle_p.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-turtle_p.Tpo $(DEPDIR)/libwi_odbc_la-turtle_p.Plo
+ 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-turtle_p.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-turtle_p.Tpo -c -o libwi_odbc_la-turtle_p.lo `test -f 'turtle_p.c' || echo '$(srcdir)/'`turtle_p.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-turtle_p.Tpo $(DEPDIR)/libwi_odbc_la-turtle_p.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='turtle_p.c' object='libwi_odbc_la-turtle_p.lo' libtool=yes @AMDEPBACKSLASH@
@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-turtle_p.lo `test -f 'turtle_p.c' || echo '$(srcdir)/'`turtle_p.c
+ 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-turtle_p.lo `test -f 'turtle_p.c' || echo '$(srcdir)/'`turtle_p.c
libwi_odbc_la-pldebug.lo: pldebug.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-pldebug.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-pldebug.Tpo -c -o libwi_odbc_la-pldebug.lo `test -f 'pldebug.c' || echo '$(srcdir)/'`pldebug.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-pldebug.Tpo $(DEPDIR)/libwi_odbc_la-pldebug.Plo
+ 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-pldebug.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-pldebug.Tpo -c -o libwi_odbc_la-pldebug.lo `test -f 'pldebug.c' || echo '$(srcdir)/'`pldebug.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-pldebug.Tpo $(DEPDIR)/libwi_odbc_la-pldebug.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pldebug.c' object='libwi_odbc_la-pldebug.lo' libtool=yes @AMDEPBACKSLASH@
@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-pldebug.lo `test -f 'pldebug.c' || echo '$(srcdir)/'`pldebug.c
+ 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-pldebug.lo `test -f 'pldebug.c' || echo '$(srcdir)/'`pldebug.c
libwi_odbc_la-bif_date.lo: bif_date.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-bif_date.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_date.Tpo -c -o libwi_odbc_la-bif_date.lo `test -f 'bif_date.c' || echo '$(srcdir)/'`bif_date.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_date.Tpo $(DEPDIR)/libwi_odbc_la-bif_date.Plo
+ 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-bif_date.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_date.Tpo -c -o libwi_odbc_la-bif_date.lo `test -f 'bif_date.c' || echo '$(srcdir)/'`bif_date.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_date.Tpo $(DEPDIR)/libwi_odbc_la-bif_date.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_date.c' object='libwi_odbc_la-bif_date.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_date.lo `test -f 'bif_date.c' || echo '$(srcdir)/'`bif_date.c
+ 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-bif_date.lo `test -f 'bif_date.c' || echo '$(srcdir)/'`bif_date.c
libwi_odbc_la-bif_dav.lo: bif_dav.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-bif_dav.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_dav.Tpo -c -o libwi_odbc_la-bif_dav.lo `test -f 'bif_dav.c' || echo '$(srcdir)/'`bif_dav.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_dav.Tpo $(DEPDIR)/libwi_odbc_la-bif_dav.Plo
+ 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-bif_dav.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_dav.Tpo -c -o libwi_odbc_la-bif_dav.lo `test -f 'bif_dav.c' || echo '$(srcdir)/'`bif_dav.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_dav.Tpo $(DEPDIR)/libwi_odbc_la-bif_dav.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_dav.c' object='libwi_odbc_la-bif_dav.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_dav.lo `test -f 'bif_dav.c' || echo '$(srcdir)/'`bif_dav.c
+ 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-bif_dav.lo `test -f 'bif_dav.c' || echo '$(srcdir)/'`bif_dav.c
libwi_odbc_la-bif_explain.lo: bif_explain.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-bif_explain.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_explain.Tpo -c -o libwi_odbc_la-bif_explain.lo `test -f 'bif_explain.c' || echo '$(srcdir)/'`bif_explain.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_explain.Tpo $(DEPDIR)/libwi_odbc_la-bif_explain.Plo
+ 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-bif_explain.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_explain.Tpo -c -o libwi_odbc_la-bif_explain.lo `test -f 'bif_explain.c' || echo '$(srcdir)/'`bif_explain.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_explain.Tpo $(DEPDIR)/libwi_odbc_la-bif_explain.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_explain.c' object='libwi_odbc_la-bif_explain.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_explain.lo `test -f 'bif_explain.c' || echo '$(srcdir)/'`bif_explain.c
+ 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-bif_explain.lo `test -f 'bif_explain.c' || echo '$(srcdir)/'`bif_explain.c
libwi_odbc_la-bif_file.lo: bif_file.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-bif_file.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_file.Tpo -c -o libwi_odbc_la-bif_file.lo `test -f 'bif_file.c' || echo '$(srcdir)/'`bif_file.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_file.Tpo $(DEPDIR)/libwi_odbc_la-bif_file.Plo
+ 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-bif_file.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_file.Tpo -c -o libwi_odbc_la-bif_file.lo `test -f 'bif_file.c' || echo '$(srcdir)/'`bif_file.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_file.Tpo $(DEPDIR)/libwi_odbc_la-bif_file.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_file.c' object='libwi_odbc_la-bif_file.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_file.lo `test -f 'bif_file.c' || echo '$(srcdir)/'`bif_file.c
+ 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-bif_file.lo `test -f 'bif_file.c' || echo '$(srcdir)/'`bif_file.c
libwi_odbc_la-bif_phrasematch.lo: bif_phrasematch.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-bif_phrasematch.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_phrasematch.Tpo -c -o libwi_odbc_la-bif_phrasematch.lo `test -f 'bif_phrasematch.c' || echo '$(srcdir)/'`bif_phrasematch.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_phrasematch.Tpo $(DEPDIR)/libwi_odbc_la-bif_phrasematch.Plo
+ 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-bif_phrasematch.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_phrasematch.Tpo -c -o libwi_odbc_la-bif_phrasematch.lo `test -f 'bif_phrasematch.c' || echo '$(srcdir)/'`bif_phrasematch.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_phrasematch.Tpo $(DEPDIR)/libwi_odbc_la-bif_phrasematch.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_phrasematch.c' object='libwi_odbc_la-bif_phrasematch.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_phrasematch.lo `test -f 'bif_phrasematch.c' || echo '$(srcdir)/'`bif_phrasematch.c
+ 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-bif_phrasematch.lo `test -f 'bif_phrasematch.c' || echo '$(srcdir)/'`bif_phrasematch.c
libwi_odbc_la-bif_smtp.lo: bif_smtp.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-bif_smtp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_smtp.Tpo -c -o libwi_odbc_la-bif_smtp.lo `test -f 'bif_smtp.c' || echo '$(srcdir)/'`bif_smtp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_smtp.Tpo $(DEPDIR)/libwi_odbc_la-bif_smtp.Plo
+ 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-bif_smtp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_smtp.Tpo -c -o libwi_odbc_la-bif_smtp.lo `test -f 'bif_smtp.c' || echo '$(srcdir)/'`bif_smtp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_smtp.Tpo $(DEPDIR)/libwi_odbc_la-bif_smtp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_smtp.c' object='libwi_odbc_la-bif_smtp.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_smtp.lo `test -f 'bif_smtp.c' || echo '$(srcdir)/'`bif_smtp.c
+ 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-bif_smtp.lo `test -f 'bif_smtp.c' || echo '$(srcdir)/'`bif_smtp.c
libwi_odbc_la-bif_soap.lo: bif_soap.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-bif_soap.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_soap.Tpo -c -o libwi_odbc_la-bif_soap.lo `test -f 'bif_soap.c' || echo '$(srcdir)/'`bif_soap.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_soap.Tpo $(DEPDIR)/libwi_odbc_la-bif_soap.Plo
+ 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-bif_soap.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_soap.Tpo -c -o libwi_odbc_la-bif_soap.lo `test -f 'bif_soap.c' || echo '$(srcdir)/'`bif_soap.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_soap.Tpo $(DEPDIR)/libwi_odbc_la-bif_soap.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_soap.c' object='libwi_odbc_la-bif_soap.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_soap.lo `test -f 'bif_soap.c' || echo '$(srcdir)/'`bif_soap.c
+ 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-bif_soap.lo `test -f 'bif_soap.c' || echo '$(srcdir)/'`bif_soap.c
libwi_odbc_la-bif_text.lo: bif_text.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-bif_text.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_text.Tpo -c -o libwi_odbc_la-bif_text.lo `test -f 'bif_text.c' || echo '$(srcdir)/'`bif_text.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_text.Tpo $(DEPDIR)/libwi_odbc_la-bif_text.Plo
+ 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-bif_text.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_text.Tpo -c -o libwi_odbc_la-bif_text.lo `test -f 'bif_text.c' || echo '$(srcdir)/'`bif_text.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_text.Tpo $(DEPDIR)/libwi_odbc_la-bif_text.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_text.c' object='libwi_odbc_la-bif_text.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_text.lo `test -f 'bif_text.c' || echo '$(srcdir)/'`bif_text.c
+ 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-bif_text.lo `test -f 'bif_text.c' || echo '$(srcdir)/'`bif_text.c
libwi_odbc_la-bif_tidy.lo: bif_tidy.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-bif_tidy.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_tidy.Tpo -c -o libwi_odbc_la-bif_tidy.lo `test -f 'bif_tidy.c' || echo '$(srcdir)/'`bif_tidy.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_tidy.Tpo $(DEPDIR)/libwi_odbc_la-bif_tidy.Plo
+ 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-bif_tidy.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_tidy.Tpo -c -o libwi_odbc_la-bif_tidy.lo `test -f 'bif_tidy.c' || echo '$(srcdir)/'`bif_tidy.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_tidy.Tpo $(DEPDIR)/libwi_odbc_la-bif_tidy.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_tidy.c' object='libwi_odbc_la-bif_tidy.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_tidy.lo `test -f 'bif_tidy.c' || echo '$(srcdir)/'`bif_tidy.c
+ 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-bif_tidy.lo `test -f 'bif_tidy.c' || echo '$(srcdir)/'`bif_tidy.c
libwi_odbc_la-http_client.lo: http_client.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-http_client.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-http_client.Tpo -c -o libwi_odbc_la-http_client.lo `test -f 'http_client.c' || echo '$(srcdir)/'`http_client.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-http_client.Tpo $(DEPDIR)/libwi_odbc_la-http_client.Plo
+ 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-http_client.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-http_client.Tpo -c -o libwi_odbc_la-http_client.lo `test -f 'http_client.c' || echo '$(srcdir)/'`http_client.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-http_client.Tpo $(DEPDIR)/libwi_odbc_la-http_client.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='http_client.c' object='libwi_odbc_la-http_client.lo' libtool=yes @AMDEPBACKSLASH@
@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-http_client.lo `test -f 'http_client.c' || echo '$(srcdir)/'`http_client.c
+ 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-http_client.lo `test -f 'http_client.c' || echo '$(srcdir)/'`http_client.c
libwi_odbc_la-shuric.lo: shuric.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-shuric.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-shuric.Tpo -c -o libwi_odbc_la-shuric.lo `test -f 'shuric.c' || echo '$(srcdir)/'`shuric.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-shuric.Tpo $(DEPDIR)/libwi_odbc_la-shuric.Plo
+ 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-shuric.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-shuric.Tpo -c -o libwi_odbc_la-shuric.lo `test -f 'shuric.c' || echo '$(srcdir)/'`shuric.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-shuric.Tpo $(DEPDIR)/libwi_odbc_la-shuric.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shuric.c' object='libwi_odbc_la-shuric.lo' libtool=yes @AMDEPBACKSLASH@
@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-shuric.lo `test -f 'shuric.c' || echo '$(srcdir)/'`shuric.c
+ 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-shuric.lo `test -f 'shuric.c' || echo '$(srcdir)/'`shuric.c
libwi_odbc_la-subseq.lo: subseq.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-subseq.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-subseq.Tpo -c -o libwi_odbc_la-subseq.lo `test -f 'subseq.c' || echo '$(srcdir)/'`subseq.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-subseq.Tpo $(DEPDIR)/libwi_odbc_la-subseq.Plo
+ 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-subseq.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-subseq.Tpo -c -o libwi_odbc_la-subseq.lo `test -f 'subseq.c' || echo '$(srcdir)/'`subseq.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-subseq.Tpo $(DEPDIR)/libwi_odbc_la-subseq.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='subseq.c' object='libwi_odbc_la-subseq.lo' libtool=yes @AMDEPBACKSLASH@
@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-subseq.lo `test -f 'subseq.c' || echo '$(srcdir)/'`subseq.c
+ 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-subseq.lo `test -f 'subseq.c' || echo '$(srcdir)/'`subseq.c
libwi_odbc_la-text.lo: text.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-text.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-text.Tpo -c -o libwi_odbc_la-text.lo `test -f 'text.c' || echo '$(srcdir)/'`text.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-text.Tpo $(DEPDIR)/libwi_odbc_la-text.Plo
+ 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-text.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-text.Tpo -c -o libwi_odbc_la-text.lo `test -f 'text.c' || echo '$(srcdir)/'`text.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-text.Tpo $(DEPDIR)/libwi_odbc_la-text.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='text.c' object='libwi_odbc_la-text.lo' libtool=yes @AMDEPBACKSLASH@
@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-text.lo `test -f 'text.c' || echo '$(srcdir)/'`text.c
+ 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-text.lo `test -f 'text.c' || echo '$(srcdir)/'`text.c
libwi_odbc_la-uname_const_decl.lo: uname_const_decl.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-uname_const_decl.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-uname_const_decl.Tpo -c -o libwi_odbc_la-uname_const_decl.lo `test -f 'uname_const_decl.c' || echo '$(srcdir)/'`uname_const_decl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-uname_const_decl.Tpo $(DEPDIR)/libwi_odbc_la-uname_const_decl.Plo
+ 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-uname_const_decl.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-uname_const_decl.Tpo -c -o libwi_odbc_la-uname_const_decl.lo `test -f 'uname_const_decl.c' || echo '$(srcdir)/'`uname_const_decl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-uname_const_decl.Tpo $(DEPDIR)/libwi_odbc_la-uname_const_decl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uname_const_decl.c' object='libwi_odbc_la-uname_const_decl.lo' libtool=yes @AMDEPBACKSLASH@
@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-uname_const_decl.lo `test -f 'uname_const_decl.c' || echo '$(srcdir)/'`uname_const_decl.c
+ 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-uname_const_decl.lo `test -f 'uname_const_decl.c' || echo '$(srcdir)/'`uname_const_decl.c
libwi_odbc_la-xmlenc_algos.lo: xmlenc_algos.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-xmlenc_algos.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlenc_algos.Tpo -c -o libwi_odbc_la-xmlenc_algos.lo `test -f 'xmlenc_algos.c' || echo '$(srcdir)/'`xmlenc_algos.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xmlenc_algos.Tpo $(DEPDIR)/libwi_odbc_la-xmlenc_algos.Plo
+ 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-xmlenc_algos.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlenc_algos.Tpo -c -o libwi_odbc_la-xmlenc_algos.lo `test -f 'xmlenc_algos.c' || echo '$(srcdir)/'`xmlenc_algos.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xmlenc_algos.Tpo $(DEPDIR)/libwi_odbc_la-xmlenc_algos.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlenc_algos.c' object='libwi_odbc_la-xmlenc_algos.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlenc_algos.lo `test -f 'xmlenc_algos.c' || echo '$(srcdir)/'`xmlenc_algos.c
+ 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-xmlenc_algos.lo `test -f 'xmlenc_algos.c' || echo '$(srcdir)/'`xmlenc_algos.c
libwi_odbc_la-xmlenc.lo: xmlenc.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-xmlenc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlenc.Tpo -c -o libwi_odbc_la-xmlenc.lo `test -f 'xmlenc.c' || echo '$(srcdir)/'`xmlenc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xmlenc.Tpo $(DEPDIR)/libwi_odbc_la-xmlenc.Plo
+ 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-xmlenc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlenc.Tpo -c -o libwi_odbc_la-xmlenc.lo `test -f 'xmlenc.c' || echo '$(srcdir)/'`xmlenc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xmlenc.Tpo $(DEPDIR)/libwi_odbc_la-xmlenc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlenc.c' object='libwi_odbc_la-xmlenc.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlenc.lo `test -f 'xmlenc.c' || echo '$(srcdir)/'`xmlenc.c
+ 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-xmlenc.lo `test -f 'xmlenc.c' || echo '$(srcdir)/'`xmlenc.c
libwi_odbc_la-xmlenc-dec.lo: xmlenc-dec.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-xmlenc-dec.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlenc-dec.Tpo -c -o libwi_odbc_la-xmlenc-dec.lo `test -f 'xmlenc-dec.c' || echo '$(srcdir)/'`xmlenc-dec.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xmlenc-dec.Tpo $(DEPDIR)/libwi_odbc_la-xmlenc-dec.Plo
+ 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-xmlenc-dec.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlenc-dec.Tpo -c -o libwi_odbc_la-xmlenc-dec.lo `test -f 'xmlenc-dec.c' || echo '$(srcdir)/'`xmlenc-dec.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xmlenc-dec.Tpo $(DEPDIR)/libwi_odbc_la-xmlenc-dec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlenc-dec.c' object='libwi_odbc_la-xmlenc-dec.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlenc-dec.lo `test -f 'xmlenc-dec.c' || echo '$(srcdir)/'`xmlenc-dec.c
+ 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-xmlenc-dec.lo `test -f 'xmlenc-dec.c' || echo '$(srcdir)/'`xmlenc-dec.c
libwi_odbc_la-xmlschema.lo: xmlschema.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-xmlschema.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlschema.Tpo -c -o libwi_odbc_la-xmlschema.lo `test -f 'xmlschema.c' || echo '$(srcdir)/'`xmlschema.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xmlschema.Tpo $(DEPDIR)/libwi_odbc_la-xmlschema.Plo
+ 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-xmlschema.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlschema.Tpo -c -o libwi_odbc_la-xmlschema.lo `test -f 'xmlschema.c' || echo '$(srcdir)/'`xmlschema.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xmlschema.Tpo $(DEPDIR)/libwi_odbc_la-xmlschema.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlschema.c' object='libwi_odbc_la-xmlschema.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlschema.lo `test -f 'xmlschema.c' || echo '$(srcdir)/'`xmlschema.c
+ 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-xmlschema.lo `test -f 'xmlschema.c' || echo '$(srcdir)/'`xmlschema.c
libwi_odbc_la-xmlsearch.lo: xmlsearch.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-xmlsearch.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlsearch.Tpo -c -o libwi_odbc_la-xmlsearch.lo `test -f 'xmlsearch.c' || echo '$(srcdir)/'`xmlsearch.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xmlsearch.Tpo $(DEPDIR)/libwi_odbc_la-xmlsearch.Plo
+ 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-xmlsearch.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlsearch.Tpo -c -o libwi_odbc_la-xmlsearch.lo `test -f 'xmlsearch.c' || echo '$(srcdir)/'`xmlsearch.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xmlsearch.Tpo $(DEPDIR)/libwi_odbc_la-xmlsearch.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlsearch.c' object='libwi_odbc_la-xmlsearch.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlsearch.lo `test -f 'xmlsearch.c' || echo '$(srcdir)/'`xmlsearch.c
+ 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-xmlsearch.lo `test -f 'xmlsearch.c' || echo '$(srcdir)/'`xmlsearch.c
libwi_odbc_la-xmlsql.lo: xmlsql.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-xmlsql.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlsql.Tpo -c -o libwi_odbc_la-xmlsql.lo `test -f 'xmlsql.c' || echo '$(srcdir)/'`xmlsql.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xmlsql.Tpo $(DEPDIR)/libwi_odbc_la-xmlsql.Plo
+ 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-xmlsql.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmlsql.Tpo -c -o libwi_odbc_la-xmlsql.lo `test -f 'xmlsql.c' || echo '$(srcdir)/'`xmlsql.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xmlsql.Tpo $(DEPDIR)/libwi_odbc_la-xmlsql.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlsql.c' object='libwi_odbc_la-xmlsql.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmlsql.lo `test -f 'xmlsql.c' || echo '$(srcdir)/'`xmlsql.c
+ 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-xmlsql.lo `test -f 'xmlsql.c' || echo '$(srcdir)/'`xmlsql.c
libwi_odbc_la-xmllazy.lo: xmllazy.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-xmllazy.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmllazy.Tpo -c -o libwi_odbc_la-xmllazy.lo `test -f 'xmllazy.c' || echo '$(srcdir)/'`xmllazy.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xmllazy.Tpo $(DEPDIR)/libwi_odbc_la-xmllazy.Plo
+ 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-xmllazy.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmllazy.Tpo -c -o libwi_odbc_la-xmllazy.lo `test -f 'xmllazy.c' || echo '$(srcdir)/'`xmllazy.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xmllazy.Tpo $(DEPDIR)/libwi_odbc_la-xmllazy.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmllazy.c' object='libwi_odbc_la-xmllazy.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmllazy.lo `test -f 'xmllazy.c' || echo '$(srcdir)/'`xmllazy.c
+ 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-xmllazy.lo `test -f 'xmllazy.c' || echo '$(srcdir)/'`xmllazy.c
libwi_odbc_la-xmltree.lo: xmltree.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-xmltree.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmltree.Tpo -c -o libwi_odbc_la-xmltree.lo `test -f 'xmltree.c' || echo '$(srcdir)/'`xmltree.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xmltree.Tpo $(DEPDIR)/libwi_odbc_la-xmltree.Plo
+ 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-xmltree.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xmltree.Tpo -c -o libwi_odbc_la-xmltree.lo `test -f 'xmltree.c' || echo '$(srcdir)/'`xmltree.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xmltree.Tpo $(DEPDIR)/libwi_odbc_la-xmltree.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmltree.c' object='libwi_odbc_la-xmltree.lo' libtool=yes @AMDEPBACKSLASH@
@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-xmltree.lo `test -f 'xmltree.c' || echo '$(srcdir)/'`xmltree.c
+ 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-xmltree.lo `test -f 'xmltree.c' || echo '$(srcdir)/'`xmltree.c
libwi_odbc_la-xpath.lo: xpath.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-xpath.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xpath.Tpo -c -o libwi_odbc_la-xpath.lo `test -f 'xpath.c' || echo '$(srcdir)/'`xpath.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xpath.Tpo $(DEPDIR)/libwi_odbc_la-xpath.Plo
+ 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-xpath.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xpath.Tpo -c -o libwi_odbc_la-xpath.lo `test -f 'xpath.c' || echo '$(srcdir)/'`xpath.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xpath.Tpo $(DEPDIR)/libwi_odbc_la-xpath.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xpath.c' object='libwi_odbc_la-xpath.lo' libtool=yes @AMDEPBACKSLASH@
@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-xpath.lo `test -f 'xpath.c' || echo '$(srcdir)/'`xpath.c
+ 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-xpath.lo `test -f 'xpath.c' || echo '$(srcdir)/'`xpath.c
libwi_odbc_la-xpf.lo: xpf.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-xpf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xpf.Tpo -c -o libwi_odbc_la-xpf.lo `test -f 'xpf.c' || echo '$(srcdir)/'`xpf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xpf.Tpo $(DEPDIR)/libwi_odbc_la-xpf.Plo
+ 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-xpf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xpf.Tpo -c -o libwi_odbc_la-xpf.lo `test -f 'xpf.c' || echo '$(srcdir)/'`xpf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xpf.Tpo $(DEPDIR)/libwi_odbc_la-xpf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xpf.c' object='libwi_odbc_la-xpf.lo' libtool=yes @AMDEPBACKSLASH@
@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-xpf.lo `test -f 'xpf.c' || echo '$(srcdir)/'`xpf.c
+ 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-xpf.lo `test -f 'xpf.c' || echo '$(srcdir)/'`xpf.c
libwi_odbc_la-xqf.lo: xqf.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-xqf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xqf.Tpo -c -o libwi_odbc_la-xqf.lo `test -f 'xqf.c' || echo '$(srcdir)/'`xqf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xqf.Tpo $(DEPDIR)/libwi_odbc_la-xqf.Plo
+ 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-xqf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xqf.Tpo -c -o libwi_odbc_la-xqf.lo `test -f 'xqf.c' || echo '$(srcdir)/'`xqf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xqf.Tpo $(DEPDIR)/libwi_odbc_la-xqf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xqf.c' object='libwi_odbc_la-xqf.lo' libtool=yes @AMDEPBACKSLASH@
@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-xqf.lo `test -f 'xqf.c' || echo '$(srcdir)/'`xqf.c
+ 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-xqf.lo `test -f 'xqf.c' || echo '$(srcdir)/'`xqf.c
libwi_odbc_la-xslt.lo: xslt.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-xslt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xslt.Tpo -c -o libwi_odbc_la-xslt.lo `test -f 'xslt.c' || echo '$(srcdir)/'`xslt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xslt.Tpo $(DEPDIR)/libwi_odbc_la-xslt.Plo
+ 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-xslt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xslt.Tpo -c -o libwi_odbc_la-xslt.lo `test -f 'xslt.c' || echo '$(srcdir)/'`xslt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xslt.Tpo $(DEPDIR)/libwi_odbc_la-xslt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xslt.c' object='libwi_odbc_la-xslt.lo' libtool=yes @AMDEPBACKSLASH@
@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-xslt.lo `test -f 'xslt.c' || echo '$(srcdir)/'`xslt.c
+ 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-xslt.lo `test -f 'xslt.c' || echo '$(srcdir)/'`xslt.c
libwi_odbc_la-xslt_fmt.lo: xslt_fmt.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-xslt_fmt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xslt_fmt.Tpo -c -o libwi_odbc_la-xslt_fmt.lo `test -f 'xslt_fmt.c' || echo '$(srcdir)/'`xslt_fmt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xslt_fmt.Tpo $(DEPDIR)/libwi_odbc_la-xslt_fmt.Plo
+ 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-xslt_fmt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xslt_fmt.Tpo -c -o libwi_odbc_la-xslt_fmt.lo `test -f 'xslt_fmt.c' || echo '$(srcdir)/'`xslt_fmt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xslt_fmt.Tpo $(DEPDIR)/libwi_odbc_la-xslt_fmt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xslt_fmt.c' object='libwi_odbc_la-xslt_fmt.lo' libtool=yes @AMDEPBACKSLASH@
@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-xslt_fmt.lo `test -f 'xslt_fmt.c' || echo '$(srcdir)/'`xslt_fmt.c
+ 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-xslt_fmt.lo `test -f 'xslt_fmt.c' || echo '$(srcdir)/'`xslt_fmt.c
libwi_odbc_la-xslt_opt.lo: xslt_opt.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-xslt_opt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xslt_opt.Tpo -c -o libwi_odbc_la-xslt_opt.lo `test -f 'xslt_opt.c' || echo '$(srcdir)/'`xslt_opt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-xslt_opt.Tpo $(DEPDIR)/libwi_odbc_la-xslt_opt.Plo
+ 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-xslt_opt.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-xslt_opt.Tpo -c -o libwi_odbc_la-xslt_opt.lo `test -f 'xslt_opt.c' || echo '$(srcdir)/'`xslt_opt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-xslt_opt.Tpo $(DEPDIR)/libwi_odbc_la-xslt_opt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xslt_opt.c' object='libwi_odbc_la-xslt_opt.lo' libtool=yes @AMDEPBACKSLASH@
@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-xslt_opt.lo `test -f 'xslt_opt.c' || echo '$(srcdir)/'`xslt_opt.c
+ 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-xslt_opt.lo `test -f 'xslt_opt.c' || echo '$(srcdir)/'`xslt_opt.c
libwi_odbc_la-bif_ldapcli.lo: bif_ldapcli.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-bif_ldapcli.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_ldapcli.Tpo -c -o libwi_odbc_la-bif_ldapcli.lo `test -f 'bif_ldapcli.c' || echo '$(srcdir)/'`bif_ldapcli.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_ldapcli.Tpo $(DEPDIR)/libwi_odbc_la-bif_ldapcli.Plo
+ 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-bif_ldapcli.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_ldapcli.Tpo -c -o libwi_odbc_la-bif_ldapcli.lo `test -f 'bif_ldapcli.c' || echo '$(srcdir)/'`bif_ldapcli.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_ldapcli.Tpo $(DEPDIR)/libwi_odbc_la-bif_ldapcli.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_ldapcli.c' object='libwi_odbc_la-bif_ldapcli.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_ldapcli.lo `test -f 'bif_ldapcli.c' || echo '$(srcdir)/'`bif_ldapcli.c
+ 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-bif_ldapcli.lo `test -f 'bif_ldapcli.c' || echo '$(srcdir)/'`bif_ldapcli.c
libwi_odbc_la-bif_kerberoscli.lo: bif_kerberoscli.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-bif_kerberoscli.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_kerberoscli.Tpo -c -o libwi_odbc_la-bif_kerberoscli.lo `test -f 'bif_kerberoscli.c' || echo '$(srcdir)/'`bif_kerberoscli.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_kerberoscli.Tpo $(DEPDIR)/libwi_odbc_la-bif_kerberoscli.Plo
+ 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-bif_kerberoscli.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_kerberoscli.Tpo -c -o libwi_odbc_la-bif_kerberoscli.lo `test -f 'bif_kerberoscli.c' || echo '$(srcdir)/'`bif_kerberoscli.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_kerberoscli.Tpo $(DEPDIR)/libwi_odbc_la-bif_kerberoscli.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_kerberoscli.c' object='libwi_odbc_la-bif_kerberoscli.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_kerberoscli.lo `test -f 'bif_kerberoscli.c' || echo '$(srcdir)/'`bif_kerberoscli.c
+ 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-bif_kerberoscli.lo `test -f 'bif_kerberoscli.c' || echo '$(srcdir)/'`bif_kerberoscli.c
libwi_odbc_la-bif_pop3.lo: bif_pop3.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-bif_pop3.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_pop3.Tpo -c -o libwi_odbc_la-bif_pop3.lo `test -f 'bif_pop3.c' || echo '$(srcdir)/'`bif_pop3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_pop3.Tpo $(DEPDIR)/libwi_odbc_la-bif_pop3.Plo
+ 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-bif_pop3.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_pop3.Tpo -c -o libwi_odbc_la-bif_pop3.lo `test -f 'bif_pop3.c' || echo '$(srcdir)/'`bif_pop3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_pop3.Tpo $(DEPDIR)/libwi_odbc_la-bif_pop3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_pop3.c' object='libwi_odbc_la-bif_pop3.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_pop3.lo `test -f 'bif_pop3.c' || echo '$(srcdir)/'`bif_pop3.c
+ 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-bif_pop3.lo `test -f 'bif_pop3.c' || echo '$(srcdir)/'`bif_pop3.c
libwi_odbc_la-bif_imap.lo: bif_imap.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-bif_imap.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_imap.Tpo -c -o libwi_odbc_la-bif_imap.lo `test -f 'bif_imap.c' || echo '$(srcdir)/'`bif_imap.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_imap.Tpo $(DEPDIR)/libwi_odbc_la-bif_imap.Plo
+ 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-bif_imap.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_imap.Tpo -c -o libwi_odbc_la-bif_imap.lo `test -f 'bif_imap.c' || echo '$(srcdir)/'`bif_imap.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_imap.Tpo $(DEPDIR)/libwi_odbc_la-bif_imap.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_imap.c' object='libwi_odbc_la-bif_imap.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_imap.lo `test -f 'bif_imap.c' || echo '$(srcdir)/'`bif_imap.c
+ 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-bif_imap.lo `test -f 'bif_imap.c' || echo '$(srcdir)/'`bif_imap.c
libwi_odbc_la-bif_nntp.lo: bif_nntp.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-bif_nntp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_nntp.Tpo -c -o libwi_odbc_la-bif_nntp.lo `test -f 'bif_nntp.c' || echo '$(srcdir)/'`bif_nntp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_nntp.Tpo $(DEPDIR)/libwi_odbc_la-bif_nntp.Plo
+ 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-bif_nntp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_nntp.Tpo -c -o libwi_odbc_la-bif_nntp.lo `test -f 'bif_nntp.c' || echo '$(srcdir)/'`bif_nntp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_nntp.Tpo $(DEPDIR)/libwi_odbc_la-bif_nntp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_nntp.c' object='libwi_odbc_la-bif_nntp.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_nntp.lo `test -f 'bif_nntp.c' || echo '$(srcdir)/'`bif_nntp.c
+ 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-bif_nntp.lo `test -f 'bif_nntp.c' || echo '$(srcdir)/'`bif_nntp.c
libwi_odbc_la-bif_xper.lo: bif_xper.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-bif_xper.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_xper.Tpo -c -o libwi_odbc_la-bif_xper.lo `test -f 'bif_xper.c' || echo '$(srcdir)/'`bif_xper.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_xper.Tpo $(DEPDIR)/libwi_odbc_la-bif_xper.Plo
+ 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-bif_xper.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_xper.Tpo -c -o libwi_odbc_la-bif_xper.lo `test -f 'bif_xper.c' || echo '$(srcdir)/'`bif_xper.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_xper.Tpo $(DEPDIR)/libwi_odbc_la-bif_xper.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_xper.c' object='libwi_odbc_la-bif_xper.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_xper.lo `test -f 'bif_xper.c' || echo '$(srcdir)/'`bif_xper.c
+ 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-bif_xper.lo `test -f 'bif_xper.c' || echo '$(srcdir)/'`bif_xper.c
libwi_odbc_la-2pc.lo: 2pc.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-2pc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-2pc.Tpo -c -o libwi_odbc_la-2pc.lo `test -f '2pc.c' || echo '$(srcdir)/'`2pc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-2pc.Tpo $(DEPDIR)/libwi_odbc_la-2pc.Plo
+ 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-2pc.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-2pc.Tpo -c -o libwi_odbc_la-2pc.lo `test -f '2pc.c' || echo '$(srcdir)/'`2pc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-2pc.Tpo $(DEPDIR)/libwi_odbc_la-2pc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='2pc.c' object='libwi_odbc_la-2pc.lo' libtool=yes @AMDEPBACKSLASH@
@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-2pc.lo `test -f '2pc.c' || echo '$(srcdir)/'`2pc.c
+ 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-2pc.lo `test -f '2pc.c' || echo '$(srcdir)/'`2pc.c
libwi_odbc_la-bif_repl.lo: bif_repl.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-bif_repl.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_repl.Tpo -c -o libwi_odbc_la-bif_repl.lo `test -f 'bif_repl.c' || echo '$(srcdir)/'`bif_repl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_repl.Tpo $(DEPDIR)/libwi_odbc_la-bif_repl.Plo
+ 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-bif_repl.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_repl.Tpo -c -o libwi_odbc_la-bif_repl.lo `test -f 'bif_repl.c' || echo '$(srcdir)/'`bif_repl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_repl.Tpo $(DEPDIR)/libwi_odbc_la-bif_repl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_repl.c' object='libwi_odbc_la-bif_repl.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_repl.lo `test -f 'bif_repl.c' || echo '$(srcdir)/'`bif_repl.c
+ 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-bif_repl.lo `test -f 'bif_repl.c' || echo '$(srcdir)/'`bif_repl.c
libwi_odbc_la-bif_xml.lo: bif_xml.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-bif_xml.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_xml.Tpo -c -o libwi_odbc_la-bif_xml.lo `test -f 'bif_xml.c' || echo '$(srcdir)/'`bif_xml.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-bif_xml.Tpo $(DEPDIR)/libwi_odbc_la-bif_xml.Plo
+ 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-bif_xml.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-bif_xml.Tpo -c -o libwi_odbc_la-bif_xml.lo `test -f 'bif_xml.c' || echo '$(srcdir)/'`bif_xml.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-bif_xml.Tpo $(DEPDIR)/libwi_odbc_la-bif_xml.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bif_xml.c' object='libwi_odbc_la-bif_xml.lo' libtool=yes @AMDEPBACKSLASH@
@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-bif_xml.lo `test -f 'bif_xml.c' || echo '$(srcdir)/'`bif_xml.c
+ 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-bif_xml.lo `test -f 'bif_xml.c' || echo '$(srcdir)/'`bif_xml.c
libwi_odbc_la-odbccat.lo: odbccat.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-odbccat.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-odbccat.Tpo -c -o libwi_odbc_la-odbccat.lo `test -f 'odbccat.c' || echo '$(srcdir)/'`odbccat.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-odbccat.Tpo $(DEPDIR)/libwi_odbc_la-odbccat.Plo
+ 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-odbccat.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-odbccat.Tpo -c -o libwi_odbc_la-odbccat.lo `test -f 'odbccat.c' || echo '$(srcdir)/'`odbccat.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-odbccat.Tpo $(DEPDIR)/libwi_odbc_la-odbccat.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='odbccat.c' object='libwi_odbc_la-odbccat.lo' libtool=yes @AMDEPBACKSLASH@
@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-odbccat.lo `test -f 'odbccat.c' || echo '$(srcdir)/'`odbccat.c
+ 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-odbccat.lo `test -f 'odbccat.c' || echo '$(srcdir)/'`odbccat.c
libwi_odbc_la-sqlrbuf.lo: sqlrbuf.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-sqlrbuf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlrbuf.Tpo -c -o libwi_odbc_la-sqlrbuf.lo `test -f 'sqlrbuf.c' || echo '$(srcdir)/'`sqlrbuf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlrbuf.Tpo $(DEPDIR)/libwi_odbc_la-sqlrbuf.Plo
+ 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-sqlrbuf.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlrbuf.Tpo -c -o libwi_odbc_la-sqlrbuf.lo `test -f 'sqlrbuf.c' || echo '$(srcdir)/'`sqlrbuf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlrbuf.Tpo $(DEPDIR)/libwi_odbc_la-sqlrbuf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlrbuf.c' object='libwi_odbc_la-sqlrbuf.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlrbuf.lo `test -f 'sqlrbuf.c' || echo '$(srcdir)/'`sqlrbuf.c
+ 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-sqlrbuf.lo `test -f 'sqlrbuf.c' || echo '$(srcdir)/'`sqlrbuf.c
libwi_odbc_la-sqlrcomp.lo: sqlrcomp.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-sqlrcomp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlrcomp.Tpo -c -o libwi_odbc_la-sqlrcomp.lo `test -f 'sqlrcomp.c' || echo '$(srcdir)/'`sqlrcomp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlrcomp.Tpo $(DEPDIR)/libwi_odbc_la-sqlrcomp.Plo
+ 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-sqlrcomp.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlrcomp.Tpo -c -o libwi_odbc_la-sqlrcomp.lo `test -f 'sqlrcomp.c' || echo '$(srcdir)/'`sqlrcomp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlrcomp.Tpo $(DEPDIR)/libwi_odbc_la-sqlrcomp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlrcomp.c' object='libwi_odbc_la-sqlrcomp.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlrcomp.lo `test -f 'sqlrcomp.c' || echo '$(srcdir)/'`sqlrcomp.c
+ 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-sqlrcomp.lo `test -f 'sqlrcomp.c' || echo '$(srcdir)/'`sqlrcomp.c
libwi_odbc_la-sqlrrun.lo: sqlrrun.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-sqlrrun.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlrrun.Tpo -c -o libwi_odbc_la-sqlrrun.lo `test -f 'sqlrrun.c' || echo '$(srcdir)/'`sqlrrun.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sqlrrun.Tpo $(DEPDIR)/libwi_odbc_la-sqlrrun.Plo
+ 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-sqlrrun.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sqlrrun.Tpo -c -o libwi_odbc_la-sqlrrun.lo `test -f 'sqlrrun.c' || echo '$(srcdir)/'`sqlrrun.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-sqlrrun.Tpo $(DEPDIR)/libwi_odbc_la-sqlrrun.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sqlrrun.c' object='libwi_odbc_la-sqlrrun.lo' libtool=yes @AMDEPBACKSLASH@
@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-sqlrrun.lo `test -f 'sqlrrun.c' || echo '$(srcdir)/'`sqlrrun.c
+ 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-sqlrrun.lo `test -f 'sqlrrun.c' || echo '$(srcdir)/'`sqlrrun.c
libwi_odbc_la-wi_xid.lo: wi_xid.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-wi_xid.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-wi_xid.Tpo -c -o libwi_odbc_la-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-wi_xid.Tpo $(DEPDIR)/libwi_odbc_la-wi_xid.Plo
+ 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-wi_xid.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-wi_xid.Tpo -c -o libwi_odbc_la-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwi_odbc_la-wi_xid.Tpo $(DEPDIR)/libwi_odbc_la-wi_xid.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wi_xid.c' object='libwi_odbc_la-wi_xid.lo' libtool=yes @AMDEPBACKSLASH@
@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-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
+ 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-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
libwic_la-blobio.lo: blobio.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-blobio.lo -MD -MP -MF $(DEPDIR)/libwic_la-blobio.Tpo -c -o libwic_la-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-blobio.Tpo $(DEPDIR)/libwic_la-blobio.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-blobio.lo -MD -MP -MF $(DEPDIR)/libwic_la-blobio.Tpo -c -o libwic_la-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-blobio.Tpo $(DEPDIR)/libwic_la-blobio.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='blobio.c' object='libwic_la-blobio.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-blobio.lo `test -f 'blobio.c' || echo '$(srcdir)/'`blobio.c
libwic_la-CLIcr.lo: CLIcr.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIcr.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIcr.Tpo -c -o libwic_la-CLIcr.lo `test -f 'CLIcr.c' || echo '$(srcdir)/'`CLIcr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-CLIcr.Tpo $(DEPDIR)/libwic_la-CLIcr.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIcr.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIcr.Tpo -c -o libwic_la-CLIcr.lo `test -f 'CLIcr.c' || echo '$(srcdir)/'`CLIcr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-CLIcr.Tpo $(DEPDIR)/libwic_la-CLIcr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CLIcr.c' object='libwic_la-CLIcr.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIcr.lo `test -f 'CLIcr.c' || echo '$(srcdir)/'`CLIcr.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIcr.lo `test -f 'CLIcr.c' || echo '$(srcdir)/'`CLIcr.c
libwic_la-CLIodbc3.lo: CLIodbc3.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIodbc3.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIodbc3.Tpo -c -o libwic_la-CLIodbc3.lo `test -f 'CLIodbc3.c' || echo '$(srcdir)/'`CLIodbc3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-CLIodbc3.Tpo $(DEPDIR)/libwic_la-CLIodbc3.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIodbc3.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIodbc3.Tpo -c -o libwic_la-CLIodbc3.lo `test -f 'CLIodbc3.c' || echo '$(srcdir)/'`CLIodbc3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-CLIodbc3.Tpo $(DEPDIR)/libwic_la-CLIodbc3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CLIodbc3.c' object='libwic_la-CLIodbc3.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIodbc3.lo `test -f 'CLIodbc3.c' || echo '$(srcdir)/'`CLIodbc3.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIodbc3.lo `test -f 'CLIodbc3.c' || echo '$(srcdir)/'`CLIodbc3.c
libwic_la-CLIsql1.lo: CLIsql1.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIsql1.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIsql1.Tpo -c -o libwic_la-CLIsql1.lo `test -f 'CLIsql1.c' || echo '$(srcdir)/'`CLIsql1.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-CLIsql1.Tpo $(DEPDIR)/libwic_la-CLIsql1.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIsql1.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIsql1.Tpo -c -o libwic_la-CLIsql1.lo `test -f 'CLIsql1.c' || echo '$(srcdir)/'`CLIsql1.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-CLIsql1.Tpo $(DEPDIR)/libwic_la-CLIsql1.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CLIsql1.c' object='libwic_la-CLIsql1.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIsql1.lo `test -f 'CLIsql1.c' || echo '$(srcdir)/'`CLIsql1.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIsql1.lo `test -f 'CLIsql1.c' || echo '$(srcdir)/'`CLIsql1.c
libwic_la-CLIsql2.lo: CLIsql2.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIsql2.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIsql2.Tpo -c -o libwic_la-CLIsql2.lo `test -f 'CLIsql2.c' || echo '$(srcdir)/'`CLIsql2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-CLIsql2.Tpo $(DEPDIR)/libwic_la-CLIsql2.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIsql2.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIsql2.Tpo -c -o libwic_la-CLIsql2.lo `test -f 'CLIsql2.c' || echo '$(srcdir)/'`CLIsql2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-CLIsql2.Tpo $(DEPDIR)/libwic_la-CLIsql2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CLIsql2.c' object='libwic_la-CLIsql2.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIsql2.lo `test -f 'CLIsql2.c' || echo '$(srcdir)/'`CLIsql2.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIsql2.lo `test -f 'CLIsql2.c' || echo '$(srcdir)/'`CLIsql2.c
libwic_la-CLIsql3.lo: CLIsql3.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIsql3.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIsql3.Tpo -c -o libwic_la-CLIsql3.lo `test -f 'CLIsql3.c' || echo '$(srcdir)/'`CLIsql3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-CLIsql3.Tpo $(DEPDIR)/libwic_la-CLIsql3.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIsql3.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIsql3.Tpo -c -o libwic_la-CLIsql3.lo `test -f 'CLIsql3.c' || echo '$(srcdir)/'`CLIsql3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-CLIsql3.Tpo $(DEPDIR)/libwic_la-CLIsql3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CLIsql3.c' object='libwic_la-CLIsql3.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIsql3.lo `test -f 'CLIsql3.c' || echo '$(srcdir)/'`CLIsql3.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIsql3.lo `test -f 'CLIsql3.c' || echo '$(srcdir)/'`CLIsql3.c
libwic_la-CLIsql3W.lo: CLIsql3W.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIsql3W.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIsql3W.Tpo -c -o libwic_la-CLIsql3W.lo `test -f 'CLIsql3W.c' || echo '$(srcdir)/'`CLIsql3W.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-CLIsql3W.Tpo $(DEPDIR)/libwic_la-CLIsql3W.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIsql3W.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIsql3W.Tpo -c -o libwic_la-CLIsql3W.lo `test -f 'CLIsql3W.c' || echo '$(srcdir)/'`CLIsql3W.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-CLIsql3W.Tpo $(DEPDIR)/libwic_la-CLIsql3W.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CLIsql3W.c' object='libwic_la-CLIsql3W.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIsql3W.lo `test -f 'CLIsql3W.c' || echo '$(srcdir)/'`CLIsql3W.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIsql3W.lo `test -f 'CLIsql3W.c' || echo '$(srcdir)/'`CLIsql3W.c
libwic_la-CLIuti.lo: CLIuti.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIuti.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIuti.Tpo -c -o libwic_la-CLIuti.lo `test -f 'CLIuti.c' || echo '$(srcdir)/'`CLIuti.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-CLIuti.Tpo $(DEPDIR)/libwic_la-CLIuti.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIuti.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIuti.Tpo -c -o libwic_la-CLIuti.lo `test -f 'CLIuti.c' || echo '$(srcdir)/'`CLIuti.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-CLIuti.Tpo $(DEPDIR)/libwic_la-CLIuti.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CLIuti.c' object='libwic_la-CLIuti.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIuti.lo `test -f 'CLIuti.c' || echo '$(srcdir)/'`CLIuti.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIuti.lo `test -f 'CLIuti.c' || echo '$(srcdir)/'`CLIuti.c
libwic_la-CLIw.lo: CLIw.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIw.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIw.Tpo -c -o libwic_la-CLIw.lo `test -f 'CLIw.c' || echo '$(srcdir)/'`CLIw.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-CLIw.Tpo $(DEPDIR)/libwic_la-CLIw.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-CLIw.lo -MD -MP -MF $(DEPDIR)/libwic_la-CLIw.Tpo -c -o libwic_la-CLIw.lo `test -f 'CLIw.c' || echo '$(srcdir)/'`CLIw.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-CLIw.Tpo $(DEPDIR)/libwic_la-CLIw.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='CLIw.c' object='libwic_la-CLIw.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIw.lo `test -f 'CLIw.c' || echo '$(srcdir)/'`CLIw.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-CLIw.lo `test -f 'CLIw.c' || echo '$(srcdir)/'`CLIw.c
libwic_la-datesupp.lo: datesupp.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-datesupp.lo -MD -MP -MF $(DEPDIR)/libwic_la-datesupp.Tpo -c -o libwic_la-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-datesupp.Tpo $(DEPDIR)/libwic_la-datesupp.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-datesupp.lo -MD -MP -MF $(DEPDIR)/libwic_la-datesupp.Tpo -c -o libwic_la-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-datesupp.Tpo $(DEPDIR)/libwic_la-datesupp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='datesupp.c' object='libwic_la-datesupp.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-datesupp.lo `test -f 'datesupp.c' || echo '$(srcdir)/'`datesupp.c
libwic_la-multibyte.lo: multibyte.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-multibyte.lo -MD -MP -MF $(DEPDIR)/libwic_la-multibyte.Tpo -c -o libwic_la-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-multibyte.Tpo $(DEPDIR)/libwic_la-multibyte.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-multibyte.lo -MD -MP -MF $(DEPDIR)/libwic_la-multibyte.Tpo -c -o libwic_la-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-multibyte.Tpo $(DEPDIR)/libwic_la-multibyte.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='multibyte.c' object='libwic_la-multibyte.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-multibyte.lo `test -f 'multibyte.c' || echo '$(srcdir)/'`multibyte.c
libwic_la-numeric.lo: numeric.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-numeric.lo -MD -MP -MF $(DEPDIR)/libwic_la-numeric.Tpo -c -o libwic_la-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-numeric.Tpo $(DEPDIR)/libwic_la-numeric.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-numeric.lo -MD -MP -MF $(DEPDIR)/libwic_la-numeric.Tpo -c -o libwic_la-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-numeric.Tpo $(DEPDIR)/libwic_la-numeric.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='numeric.c' object='libwic_la-numeric.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-numeric.lo `test -f 'numeric.c' || echo '$(srcdir)/'`numeric.c
libwic_la-wirpc.lo: wirpc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-wirpc.lo -MD -MP -MF $(DEPDIR)/libwic_la-wirpc.Tpo -c -o libwic_la-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-wirpc.Tpo $(DEPDIR)/libwic_la-wirpc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-wirpc.lo -MD -MP -MF $(DEPDIR)/libwic_la-wirpc.Tpo -c -o libwic_la-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-wirpc.Tpo $(DEPDIR)/libwic_la-wirpc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wirpc.c' object='libwic_la-wirpc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-wirpc.lo `test -f 'wirpc.c' || echo '$(srcdir)/'`wirpc.c
libwic_la-wi_xid.lo: wi_xid.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-wi_xid.lo -MD -MP -MF $(DEPDIR)/libwic_la-wi_xid.Tpo -c -o libwic_la-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-wi_xid.Tpo $(DEPDIR)/libwic_la-wi_xid.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-wi_xid.lo -MD -MP -MF $(DEPDIR)/libwic_la-wi_xid.Tpo -c -o libwic_la-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-wi_xid.Tpo $(DEPDIR)/libwic_la-wi_xid.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wi_xid.c' object='libwic_la-wi_xid.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-wi_xid.lo `test -f 'wi_xid.c' || echo '$(srcdir)/'`wi_xid.c
libwic_la-pldbgcli.lo: pldbgcli.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-pldbgcli.lo -MD -MP -MF $(DEPDIR)/libwic_la-pldbgcli.Tpo -c -o libwic_la-pldbgcli.lo `test -f 'pldbgcli.c' || echo '$(srcdir)/'`pldbgcli.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwic_la-pldbgcli.Tpo $(DEPDIR)/libwic_la-pldbgcli.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -MT libwic_la-pldbgcli.lo -MD -MP -MF $(DEPDIR)/libwic_la-pldbgcli.Tpo -c -o libwic_la-pldbgcli.lo `test -f 'pldbgcli.c' || echo '$(srcdir)/'`pldbgcli.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwic_la-pldbgcli.Tpo $(DEPDIR)/libwic_la-pldbgcli.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pldbgcli.c' object='libwic_la-pldbgcli.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-pldbgcli.lo `test -f 'pldbgcli.c' || echo '$(srcdir)/'`pldbgcli.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwic_la_CFLAGS) $(CFLAGS) -c -o libwic_la-pldbgcli.lo `test -f 'pldbgcli.c' || echo '$(srcdir)/'`pldbgcli.c
mostlyclean-libtool:
-rm -f *.lo
@@ -3991,49 +4010,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -4054,17 +4069,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -4095,7 +4106,6 @@ clean-generic:
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"
@@ -4118,8 +4128,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -4128,28 +4136,18 @@ install-data-am:
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
@@ -4172,7 +4170,7 @@ ps-am:
uninstall-am:
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -4194,20 +4192,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
+sqlwords.h: $(srcdir)/sqlwords.gperf Makefile.am
@${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
+sql3.c sql3.h: sql3.y Makefile.am
@$(GEN) $(YACC) -o sql3.c -vd $(srcdir)/sql3.y
-scn3.c: scn3.l sql3.c sqlwords.h
+scn3.c: scn3.l sql3.c sqlwords.h Makefile.am
@$(GEN) $(LEX) -o scn3.c $(srcdir)/scn3.l
-scn3split.c: scn3.l sql3.c sqlwords.h
+scn3split.c: scn3.l sql3.c sqlwords.h Makefile.am
@$(GEN) $(LEX) -o scn3split.c -Pscn3splityy $(srcdir)/scn3.l
$(top_srcdir)/binsrc/cached_resources/cached_resources.c:
@@ -4219,34 +4217,44 @@ 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
+xpathp.c xpathp.h : xpathp.y Makefile.am
@$(GEN) $(YACC) -o xpathp.c -vd -pxpyy $(srcdir)/xpathp.y
-xpathp_lex_props.c: list_lex_props.sh xpathp.y
+xpathp_lex_props.c: list_lex_props.sh xpathp.y Makefile.am
list_lex_props.sh xpathp.y xpathp_lex_props.c
-xpscn.c: xpscn.l xpathp.h
+xpscn.c: xpscn.l xpathp.h Makefile.am
@$(GEN) $(LEX) -o xpscn.c -Pxpyy $(srcdir)/xpscn.l
-sparql_p.c sparql_p.h: sparql_p.y
+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
@$(GEN) $(YACC) -o sparql_p.c -vd -psparyy $(srcdir)/sparql_p.y
-sparql_lex_props.c: list_lex_props.sh sparql_p.y
+sparql_lex_props.c: list_lex_props.sh sparql_p.y Makefile.am
list_lex_props.sh sparql_p.y sparql_lex_props.c
-sparql_l.c: sparql_l.l sparql_p.h
+sparql_l.c: sparql_l.l sparql_p.h Makefile.am
@$(GEN) $(LEX) -o sparql_l.c -Psparyy $(srcdir)/sparql_l.l
-nquad_p.c nquad_p.h: nquad_p.y
+nquad_p.c nquad_p.h: nquad_p.y Makefile.am
@$(GEN) $(YACC) -o nquad_p.c -vd -pnqyy $(srcdir)/nquad_p.y
-turtle_p.c turtle_p.h: turtle_p.y
+turtle_p.c turtle_p.h: turtle_p.y Makefile.am
@$(GEN) $(YACC) -o turtle_p.c -vd -pttlyy $(srcdir)/turtle_p.y
-turtle_lex_props.c: list_lex_props.sh turtle_p.y
+turtle_lex_props.c: list_lex_props.sh turtle_p.y Makefile.am
list_lex_props.sh turtle_p.y turtle_lex_props.c
-turtle_l.c: turtle_l.l turtle_p.h
+turtle_l.c: turtle_l.l turtle_p.h Makefile.am
@$(GEN) $(LEX) -o turtle_l.c -Pttlyy $(srcdir)/turtle_l.l
sql_code.c: $(SQL_FILES) $(AWK_FILES) Makefile.am
@@ -4336,7 +4344,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)
+#sql_code_blog.c: $(SQL_FILES_BLOG) $(AWK_FILES) Makefile.am
# @${GEN} ${GAWK} -o sql_code_2pc.c -f $(srcdir)/sql_to_c.awk \
# -v init_name=_blog -v pl_stats=$(PLSTATS) $(SQL_FILES_BLOG)
@@ -4348,6 +4356,14 @@ 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 \
@@ -4431,6 +4447,7 @@ generated: \
sparql_l.c \
sparql_p.c \
sparql_p.h \
+ sparqlwords.h \
sql3.c \
sql_code.c \
sql_code_1.c \
@@ -4457,7 +4474,6 @@ generated: \
xpathp.c \
xpathp.h \
xpscn.c
-
# 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/libsrc/Wi/aqueue.c b/libsrc/Wi/aqueue.c
index b2bdba1..5f2d6d7 100644
--- a/libsrc/Wi/aqueue.c
+++ b/libsrc/Wi/aqueue.c
@@ -1,10 +1,10 @@
/*
- * $Id: aqueue.c,v 1.19.2.5 2010/02/27 22:21:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -108,7 +108,7 @@ aq_thread_func (aq_thread_t * aqt)
if (aq->aq_deleted && !aq->aq_n_threads)
{
mutex_leave (aq->aq_mtx);
- aq_free (aq);
+ dk_free_box (aq);
}
else
mutex_leave (aq->aq_mtx);
@@ -212,6 +212,7 @@ aqr_free (aq_request_t * aqr)
{
assert (AQR_DONE == aqr->aqr_state);
dk_free_tree (aqr->aqr_args);
+ dk_free_tree (aqr->aqr_value);
dk_free_tree (aqr->aqr_error);
dk_free ((caddr_t) aqr, sizeof (aq_request_t));
}
@@ -268,6 +269,8 @@ aq_wait (async_queue_t * aq, int req_no, caddr_t * err, int wait)
}
+int aq_wait_last_first = 1;
+
caddr_t
aq_wait_all (async_queue_t * aq, caddr_t * err_ret)
{
@@ -277,6 +280,24 @@ aq_wait_all (async_queue_t * aq, caddr_t * err_ret)
ptrlong req_no;
aq_request_t *aqr;
mutex_enter (aq->aq_mtx);
+ if (aq_wait_last_first && aq->aq_queue.bsk_data.longval)
+ {
+ aq_request_t * last = aq->aq_queue.bsk_prev->bsk_data.ptrval;
+ if (last && AQR_DONE != last->aqr_state)
+ {
+ int last_req = last->aqr_req_no;
+ mutex_leave (aq->aq_mtx);
+ v = aq_wait (aq, last_req, &err, 1);
+ dk_free_tree (v);
+ if (err_ret && err)
+ {
+ *err_ret = err;
+ return NULL;
+ }
+ dk_free_tree (err);
+ mutex_enter (aq->aq_mtx);
+ }
+ }
do
{
dk_hash_iterator (&hit, aq->aq_requests);
@@ -365,16 +386,16 @@ aq_free (async_queue_t * aq)
mutex_leave (aq->aq_mtx);
return 1;
}
- {
- dk_hash_iterator_t hit;
- aq_request_t *aqr;
- void *reqno;
- dk_hash_iterator (&hit, aq->aq_requests);
- while (dk_hit_next (&hit, &reqno, (void **) &aqr))
- aqr_free (aqr);
- }
- mutex_leave (aq->aq_mtx);
}
+ {
+ dk_hash_iterator_t hit;
+ aq_request_t *aqr;
+ void *reqno;
+ dk_hash_iterator (&hit, aq->aq_requests);
+ while (dk_hit_next (&hit, &reqno, (void **) &aqr))
+ aqr_free (aqr);
+ }
+ mutex_leave (aq->aq_mtx);
#ifdef MTX_DEBUG
aq->aq_requests->ht_required_mtx = NULL;
#endif
@@ -428,13 +449,14 @@ aq_sql_func (caddr_t * av, caddr_t * err_ret)
cli_qual (cli), CLI_OWNER (cli));
query_t *proc = full_name ? sch_proc_def (wi_inst.wi_schema, full_name) : NULL;
dk_free_box (av);
- dk_free_box (fn);
if (!proc)
{
- dk_free_tree ((caddr_t) params);
*err_ret = srv_make_new_error ("42001", "AQ...", "undefined procedure %.300s in aq_request()", full_name ? full_name : ((DV_STRING == DV_TYPE_OF (fn)) ? fn : "<no name>"));
+ dk_free_box (fn);
+ dk_free_tree ((caddr_t) params);
return NULL;
}
+ dk_free_box (fn);
if (proc->qr_to_recompile)
{
*err_ret = NULL;
diff --git a/libsrc/Wi/aqueue.h b/libsrc/Wi/aqueue.h
index 576d963..1c0d797 100644
--- a/libsrc/Wi/aqueue.h
+++ b/libsrc/Wi/aqueue.h
@@ -1,10 +1,10 @@
/*
- * $Id: aqueue.h,v 1.4.2.3 2010/01/28 01:14:04 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/arith.c b/libsrc/Wi/arith.c
index 9ef85c7..2fa263a 100644
--- a/libsrc/Wi/arith.c
+++ b/libsrc/Wi/arith.c
@@ -1,14 +1,14 @@
/*
* arith.c
*
- * $Id: arith.c,v 1.13.2.5 2011/05/17 21:14:47 source Exp $
+ * $Id$
*
* Arithmetic operators and comparisons.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -551,12 +551,20 @@ 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))
- return compare_wide_to_narrow ((wchar_t *) box1, n1, (unsigned char *) box2, n2);
+ {
+ 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))
{
- int res = compare_wide_to_narrow ((wchar_t *)box2, n2, (unsigned char *) box1, n1);
+ 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);
return (res == DVC_LESS ? DVC_GREATER :
(res == DVC_GREATER ? DVC_LESS : res));
}
@@ -768,10 +776,19 @@ cmp_boxes (ccaddr_t box1, ccaddr_t box2, collation_t *collation1, collation_t *c
}
if (IS_WIDE_STRING_DTP (dtp1) && IS_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))
+ {
+ 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))
{
- int res = compare_wide_to_narrow ((wchar_t *)box2, n2, (unsigned char *) box1, n1);
+ 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);
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 5ea19eb..9ff1ab9 100644
--- a/libsrc/Wi/arith.h
+++ b/libsrc/Wi/arith.h
@@ -1,12 +1,12 @@
/*
* arith.h
*
- * $Id: arith.h,v 1.4.2.2 2011/05/17 21:14:47 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/autoexec.sql b/libsrc/Wi/autoexec.sql
index eb43db6..450be8f 100644
--- a/libsrc/Wi/autoexec.sql
+++ b/libsrc/Wi/autoexec.sql
@@ -1,10 +1,10 @@
--
--- $Id: autoexec.sql,v 1.6.2.2 2010/01/31 20:36:37 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/auxfiles.c b/libsrc/Wi/auxfiles.c
index aa27404..2a94d1d 100644
--- a/libsrc/Wi/auxfiles.c
+++ b/libsrc/Wi/auxfiles.c
@@ -1,7 +1,7 @@
/*
* auxfiles.c
*
- * $Id: auxfiles.c,v 1.20.2.9 2011/09/12 20:08:51 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
@@ -39,6 +39,7 @@ char * http_port;
char * https_port;
char * https_cert;
char * https_key;
+char * https_extra;
int32 https_client_verify = 0;
int32 https_client_verify_depth = 0;
char * https_client_verify_file = NULL;
@@ -85,7 +86,7 @@ int n_oldest_flushable;
int null_bad_dtp;
int atomic_dive = 0;
int dive_pa_mode = PA_READ;
-int c_compress_mode = 0;
+int32 c_compress_mode = 0;
int default_txn_isolation = ISO_REPEATABLE;
int prefix_in_result_col_names;
int disk_no_mt_write;
diff --git a/libsrc/Wi/bif_audio.c b/libsrc/Wi/bif_audio.c
index cdd5c36..d198689 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.1 2010/03/08 12:02:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2007 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_audio_tags.h b/libsrc/Wi/bif_audio_tags.h
index 1473cd7..6fafc35 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 2009/04/09 13:22:11 source Exp $
+ * $Id$
*
* Tag definitions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 2007 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_crypto.c b/libsrc/Wi/bif_crypto.c
index 3764ba5..c759d11 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.5 2011/01/27 14:19:53 source Exp $
+ * $Id$
*
* Cryptography functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -529,9 +529,11 @@ 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 = bif_long_arg (qst, args, 1, "asn1_to_xml");
+ long length = BOX_ELEMENTS (args) > 1 ? bif_long_arg (qst, args, 1, "asn1_to_xml") : 0;
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;
@@ -1244,7 +1246,13 @@ 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)
{
@@ -1382,6 +1390,14 @@ 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))
{
@@ -1501,6 +1517,41 @@ 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)
@@ -1532,6 +1583,33 @@ 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");
@@ -1562,6 +1640,7 @@ 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 2fe342a..371a772 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.5 2011/09/23 15:20:37 source Exp $
+ * $Id$
*
* Bifs for date
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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*1000000 <= frac_microsec))
+ if ((0 > frac_microsec) || (60*60*24*(boxint)(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;
@@ -511,7 +511,9 @@ bif_date_add (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
int n = (int) bif_long_arg (qst, args, 1, "dateadd");
caddr_t dt = bif_date_arg (qst, args, 2, "dateadd");
TIMESTAMP_STRUCT ts;
+ int dt_type = DT_DT_TYPE (dt);
int year_or_month_tz_tweak = (((!strcmp ("year", part)) || (!strcmp ("month", part))) ? DT_TZ (dt) : 0);
+ DT_AUDIT_FIELDS (dt);
dt_to_GMTimestamp_struct (dt, &ts);
if (year_or_month_tz_tweak)
ts_add (&ts, year_or_month_tz_tweak, "minute");
@@ -521,6 +523,10 @@ bif_date_add (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
res = dk_alloc_box (DT_LENGTH, DV_DATETIME);
GMTimestamp_struct_to_dt (&ts, res);
DT_SET_TZ (res, DT_TZ (dt));
+ if (DT_TYPE_DATE == dt_type
+ && (0 == stricmp (part, "year") || 0 == stricmp (part, "month") || 0 == stricmp (part, "day")))
+ DT_SET_DT_TYPE (res, dt_type);
+ DT_AUDIT_FIELDS (dt);
return res;
}
@@ -531,14 +537,12 @@ 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"))
@@ -557,18 +561,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;
}
@@ -602,6 +606,7 @@ bif_timestampadd (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t dt = bif_date_arg (qst, args, 2, "timestampadd");
int saved_tz = DT_TZ (dt);
GMTIMESTAMP_STRUCT ts;
+ DT_AUDIT_FIELDS (dt);
dt_to_GMTimestamp_struct (dt, &ts);
ts_add (&ts, n, interval_odbc_to_text (part, "timestampadd"));
res = dk_alloc_box (DT_LENGTH, DV_DATETIME);
@@ -858,6 +863,12 @@ 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 fe05be7..6ff884b 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.4 2011/07/19 23:33:43 source Exp $
+ * $Id$
*
* DAV support
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -275,8 +275,6 @@ err_ret:
ws->ws_try_pipeline = 0;
- dk_free_tree ((box_t) ws->ws_path);
- ws->ws_path = NULL;
ws->ws_params = NULL;
dk_free_tree (content_transfer_encoding);
return err;
@@ -443,14 +441,10 @@ p_name_is_set:
log_dav(ws, 1);
- dk_free_tree ((box_t) ws->ws_path);
dk_free_tree ((box_t) ws->ws_params);
- /*XXX: freed in ws_request dk_free_tree (ws->ws_lines);*/
+ ws->ws_params = NULL;
strses_flush (ses);
dk_free_box ((box_t) ses);
- ws->ws_path = NULL;
-/*XXX: freed in ws_request ws->ws_lines = NULL;*/
- ws->ws_params = NULL;
return err;
}
diff --git a/libsrc/Wi/bif_diff.c b/libsrc/Wi/bif_diff.c
index 6441815..873b47e 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.1 2009/04/18 21:55:09 source Exp $
+ * $Id$
*
* Diff functionality
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_explain.c b/libsrc/Wi/bif_explain.c
index 5138e7f..f2f13da 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.14 2011/06/07 12:30:28 source Exp $
+ * $Id$
*
* Implements bif 'explain'
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -759,7 +759,7 @@ node_print (data_source_t * node)
{
remote_table_source_t *rts = (remote_table_source_t *) node;
char *szPtr = rts->rts_text;
- stmt_printf (("Remote %s ", rts->rts_is_outer ? "OUTER" : ""));
+ stmt_printf (("Remote (%s) %s ", rts->rts_rds->rds_dsn, rts->rts_is_outer ? "OUTER" : ""));
while (*szPtr)
{
int len = (int) strlen (szPtr);
@@ -793,7 +793,7 @@ node_print (data_source_t * node)
}
if (rts->rts_save_env)
{
- stmt_printf ((" save env: "));
+ stmt_printf (("\n save env: "));
ssl_array_print (rts->rts_save_env);
}
stmt_printf (("\n"));
diff --git a/libsrc/Wi/bif_file.c b/libsrc/Wi/bif_file.c
index b1eab12..0fc60df 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.37 2011/09/28 17:01:16 source Exp $
+ * $Id$
*
* Bifs for file I/O
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1340,77 +1340,111 @@ 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++)
{
- if ('/' == fname_tail[0])
- fname_tail[0] = '\\';
+ switch (fname_tail[0])
+ {
+ /* case '|': fname_tail[0] = ':'; break; */
+ case '/':
+ fname_tail[0] = '\\';
+ break;
+ }
}
- 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".
@@ -1865,7 +1899,7 @@ bif_virtuoso_ini_item_value (caddr_t * qst, caddr_t * err_ret, state_slot_t ** a
pszSection = bif_string_arg (qst, args, 0, "virtuoso_ini_item_value");
pszItemName = bif_string_arg (qst, args, 1, "virtuoso_ini_item_value");
- if (!_bif_pconfig || cfg_refresh (_bif_pconfig) != 0)
+ if (!_bif_pconfig || cfg_refresh (_bif_pconfig) < 0)
sqlr_new_error ("39000", "FA055", "Could not open %s ", f_config_file);
if (cfg_find (_bif_pconfig, pszSection, pszItemName) == 0)
@@ -6161,7 +6195,7 @@ signal_error:
}
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
#define fseeko64 fseeko
#define ftello64 ftello
#define fopen64 fopen
@@ -6597,6 +6631,85 @@ end:
return res;
}
+caddr_t
+bif_get_plaintext_row (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+{
+ dk_session_t * ses = (dk_session_t *) bif_strses_arg (qst, args, 0, "get_plaintext_row");
+ char buf_on_stack[4096];
+ char *buf = buf_on_stack;
+ int buf_size = sizeof (buf_on_stack);
+ char *buf_end = buf + buf_size;
+ char *buf_tail = buf;
+ char *read_begin, *eol = NULL;
+ caddr_t res = NULL;
+ int buf_is_allocated = 0;
+ int buf_add_len, new_buf_size;
+ char *new_buf;
+ char c;
+ CATCH_READ_FAIL (ses)
+ {
+/* First, full scan of buffered in hope that the whole line is in session buffer already */
+ read_begin = ses->dks_in_buffer + ses->dks_in_read;
+ eol = (char *)memchr (read_begin, '\n', ses->dks_in_fill - ses->dks_in_read);
+ if (NULL != eol)
+ {
+ res = box_dv_short_nchars (read_begin, eol - read_begin);
+ ses->dks_in_read = eol + 1 - ses->dks_in_buffer;
+ goto res_done; /* see below */
+ }
+/* Now we know that the '\n' is not in buffer so an extra copying is unavoidable */
+ buf_add_len = ses->dks_in_fill - ses->dks_in_read;
+add_portion_to_buf:
+ if (buf_tail + buf_add_len + 1 > buf_end)
+ {
+ new_buf_size = (buf_end + buf_add_len + 1 - buf) * 2;
+ new_buf = (char *)dk_alloc (new_buf_size);
+ memcpy (new_buf, buf, buf_tail - buf);
+ buf_end = new_buf + new_buf_size;
+ buf_tail = new_buf + (buf_tail - buf);
+ if (buf_is_allocated)
+ dk_free (buf, buf_size);
+ buf = new_buf;
+ buf_size = new_buf_size;
+ buf_is_allocated = 1;
+ }
+ memcpy (buf_tail, ses->dks_in_buffer + ses->dks_in_read, buf_add_len);
+ buf_tail += buf_add_len;
+ ses->dks_in_read += buf_add_len;
+ if (NULL != eol)
+ {
+ res = box_dv_short_nchars (buf, (buf_tail - 1) - buf); /* -1 because eol is not included into the result */
+ goto res_done; /* see below */
+ }
+ session_buffered_read (ses, &c, 1);
+ if ('\n' == c)
+ {
+ res = box_dv_short_nchars (buf, buf_tail - buf); /* eol is not in the buffer */
+ goto res_done; /* see below */
+ }
+ (buf_tail++)[0] = c;
+ read_begin = ses->dks_in_buffer + ses->dks_in_read;
+ eol = (char *)memchr (read_begin, '\n', ses->dks_in_fill - ses->dks_in_read);
+ if (NULL != eol)
+ {
+ buf_add_len = (eol + 1) - read_begin;
+ goto add_portion_to_buf; /* see above */
+ }
+ buf_add_len = ses->dks_in_fill - ses->dks_in_read;
+ goto add_portion_to_buf; /* see above */
+res_done: ;
+ }
+ FAILED
+ {
+ }
+ END_READ_FAIL (ses);
+ if (buf_is_allocated)
+ dk_free (buf, buf_size);
+ if (NULL == res)
+ return NEW_DB_NULL;
+ return res;
+}
+
void
bif_file_init (void)
{
@@ -6670,6 +6783,7 @@ bif_file_init (void)
bif_define_typed ("file_open", bif_file_open, &bt_any);
bif_define_typed ("gz_file_open", bif_gz_file_open, &bt_any);
bif_define_typed ("get_csv_row", bif_get_csv_row, &bt_any);
+ bif_define_typed ("get_plaintext_row", bif_get_plaintext_row, &bt_any);
bif_define_typed ("getenv", bif_getenv, &bt_varchar);
#ifdef HAVE_BIF_GPF
bif_define ("__gpf", bif_gpf);
diff --git a/libsrc/Wi/bif_gnw.c b/libsrc/Wi/bif_gnw.c
index 90b4a79..17e5c32 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* GNW specific extensions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_imap.c b/libsrc/Wi/bif_imap.c
index a5e8432..f7ac873 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.8 2011/01/28 13:32:49 source Exp $
+ * $Id$
*
* IMAP4 client function
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -70,6 +70,7 @@
} \
END_WRITE_FAIL (ses)
+
static int
is_ok (char *resp)
{
@@ -231,6 +232,7 @@ 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;
@@ -313,60 +315,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;
- ps = imap_next_word (ps);
- if (!ascii_strncasecmp ("LIST", ps, 4))
+ {
+ rc = dks_read_line (ses, resp, sizeof (resp));
+ while (strlen (resp) > 2 && strncmp ("3 OK", resp, 4))
+ {
+ ps = resp;
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;
- }
- }
+ 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;
+ }
+ }
FAILED
- {
- strcpy_ck (err_code, "IM010");
- strcpy_ck (err_text, "Failed reading output of FETCH command on remote IMAP server");
- goto error_end;
- }
+ {
+ strcpy_ck (err_code, "IM010");
+ strcpy_ck (err_text, "Failed reading output of LIST command on remote IMAP server");
+ goto error_end;
+ }
END_READ_FAIL (ses);
goto logout;
}
@@ -375,7 +377,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");
@@ -407,7 +409,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");
@@ -440,9 +442,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)
{
@@ -492,82 +494,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, 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, box_num (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);
}
}
@@ -594,7 +596,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)
{
@@ -616,7 +618,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, "");
@@ -634,7 +636,7 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
if (inx_mails > 0)
{
volatile int l, br;
- int start = 0;
+ int do_not_read, start = 0;
dtp_t type;
if (in)
l = BOX_ELEMENTS (in);
@@ -660,98 +662,116 @@ 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)
- {
- 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");
+ {
+ if (!do_not_read)
+ 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);
- }
- }
- 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))
+ 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;
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));
- }
- 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)));
- }
+ }
+ }
+ 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));
+ }
+ }
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 3a481de..f5e6cbe 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.8 2011/01/28 13:32:49 source Exp $
+ * $Id$
*
* Internationalization functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -29,6 +29,7 @@
#include <wchar.h>
#endif
#include <limits.h>
+#include "http.h" /* For WS_CHARSET */
#include "wi.h"
#include "libutil.h"
#include "sqlnode.h"
@@ -299,7 +300,7 @@ literal_as_utf8 (encoding_handler_t * enc, caddr_t literal, int len)
}
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)
+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)
{
wcharset_t *cs1, *cs2;
int bom_skip_offset = 0;
@@ -317,7 +318,18 @@ charset_recode_from_named_to_named (caddr_t narrow, const char *cs1_uppercase, c
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
@@ -430,7 +442,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 (narrow, cs1_uname, cs2_uname, &res_is_new, &err);
+ res = charset_recode_from_named_to_named ((query_instance_t *)qst, 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 320ea64..e20bcff 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_kerberoscli.c b/libsrc/Wi/bif_kerberoscli.c
index 79132fb..ec1f8ee 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_ldapcli.c b/libsrc/Wi/bif_ldapcli.c
index ea6f45d..5cd0e4c 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.3 2011/05/19 13:15:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_mts.c b/libsrc/Wi/bif_mts.c
index acba651..e1fb808 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_nntp.c b/libsrc/Wi/bif_nntp.c
index af020c0..1cfb9e7 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_phrasematch.c b/libsrc/Wi/bif_phrasematch.c
index 596a32d..ec747f0 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_pop3.c b/libsrc/Wi/bif_pop3.c
index 770cbf5..1b1991c 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.2 2010/08/02 11:20:51 source Exp $
+ * $Id$
*
* POP3 client function
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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,7 +93,8 @@ 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;
@@ -160,8 +161,9 @@ 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;
@@ -184,11 +186,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))
{
@@ -230,10 +232,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)
@@ -251,12 +253,11 @@ 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))
@@ -273,12 +274,13 @@ 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));
- SES_PRINT (msg, resp);
+ if (strncmp (end_msg, resp, sizeof (end_msg)))
+ 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;
}
}
@@ -287,22 +289,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;
}
@@ -310,15 +312,14 @@ 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");
}
}
@@ -342,7 +343,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;
@@ -351,7 +352,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");
@@ -362,7 +363,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");
@@ -377,7 +378,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)
{
@@ -402,7 +403,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");
@@ -411,7 +412,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;
}
@@ -423,18 +424,15 @@ 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;
@@ -448,8 +446,7 @@ 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 690b5f4..74bfa4c 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* Purify functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_regexp.c b/libsrc/Wi/bif_regexp.c
index f8ab5a1..323e76d 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.5 2009/08/19 07:29:52 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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,
- char *func, int strg_is_utf8_by_default, int *utf8, caddr_t *ret_to_free, caddr_t *err_ret)
+ const 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,46 +406,139 @@ 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
+ *Function Name: bif_regexp_parse / bif_regexp_parse_list
*
*Parameters: pattern - regular expression pattern,
* str - string to be parsed
* offset - offset from which parsing must be executed
- *Description: finds all substrings which match pattern in one iteration.
+ * 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.
*
- *Returns: vector of offset pairs:
+ *Returns if not a list:
+ * 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 (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+bif_regexp_parse_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, int parse_list, const char *fname)
{
int utf8_mode, utf8_mode2;
char *pattern = NULL;
char *str = NULL;
- int offset;
+ int offset, str_len;
pcre_info_t cd_info;
- int c_opts = 0, r_opts = 0;
+ int c_opts = 0, r_opts = 0, max_n_hits = 0x1000000 / sizeof (ptrlong);
caddr_t p_to_free = NULL, str_to_free = NULL;
- caddr_t ret_vec = NULL;
+ int offvect[NOFFSETS];
+ ptrlong *ret_vec = NULL;
+ dk_set_t ret_revlist = NULL;
utf8_mode = utf8_mode2 = 0;
- 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);
+ 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);
if (*err_ret) goto done;
utf8_mode2 = utf8_mode ? utf8_mode : 2;
- pattern = bif_regexp_str_arg (qst, args, 0, "regexp_parse", REGEXP_BF, &utf8_mode2, &p_to_free, err_ret);
+ pattern = bif_regexp_str_arg (qst, args, 0, fname, REGEXP_BF, &utf8_mode2, &p_to_free, err_ret);
if (*err_ret) goto done;
switch ((BOX_ELEMENTS (args)))
{
default:
- case 4: c_opts |= regexp_optchars_to_bits (bif_string_arg (qst, args, 3, "regexp_parse"));
+ 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 3: case 2: case 1: case 0: ;
}
@@ -453,43 +546,267 @@ bif_regexp_parse (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
goto done;
*err_ret = get_regexp_code (®exp_codes, pattern, &cd_info, c_opts);
- if (cd_info.code && !*err_ret)
- {
- 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;
+ if (*err_ret || !cd_info.code)
+ goto done;
- 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];
- }
- }
+ 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
+ {
+ 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);
}
done:
- if (*err_ret)
- dk_free_box (ret_vec);
dk_free_tree (p_to_free);
dk_free_tree (str_to_free);
- return *err_ret ? NULL : (ret_vec ? ret_vec : NEW_DB_NULL);
+ 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;
}
+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 not 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;
+}
+
+int32 c_match_limit_recursion = 150;
static caddr_t
get_regexp_code (safe_hash_t * rx_codes, const char *pattern,
@@ -539,6 +856,11 @@ get_regexp_code (safe_hash_t * rx_codes, const char *pattern,
}
else
*pcre_info = *pcre_info_ref;
+ if (pcre_info->code_x)
+ {
+ pcre_info->code_x->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
+ pcre_info->code_x->match_limit_recursion = c_match_limit_recursion;
+ }
RELEASE_OBJECT (rx_codes);
return NULL;
}
@@ -560,6 +882,8 @@ 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 9fb555e..9480704 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.2 2011/05/03 17:50:38 source Exp $
+ * $Id$
*
* Replication functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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 != SQL_NO_DATA_FOUND)
+ if (err && err != (caddr_t) 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 d35016e..e6a079a 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.1 2011/10/25 19:36:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2011 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_smtp.c b/libsrc/Wi/bif_smtp.c
index 1d42e3e..f52448b 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* SMTP client function
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_soap.c b/libsrc/Wi/bif_soap.c
index 5764d5a..77deb96 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.9 2010/11/15 10:13:33 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -3872,6 +3872,7 @@ ws_http_error_header (int code)
case 503: ret = "Service Unavailable"; break;
case 504: ret = "Gateway Timeout"; break;
case 505: ret = "HTTP Version Not Supported"; break;
+ case 509: ret = "Bandwidth Limit Exceeded"; break;
default:
code = 500;
ret = "Internal Server Error";
@@ -9586,6 +9587,17 @@ static int
soap_print_scalar_value (dtp_t proposed_type, caddr_t value, dk_session_t *ses, soap_ctx_t * ctx, caddr_t *err_ret)
{
/* int use_escapes = ctx->use_escapes;*/
+ if (DV_TYPE_OF (value) == DV_RDF)
+ {
+ rdf_box_t * rb = (rdf_box_t *) value;
+ query_instance_t * qi = (query_instance_t *) ctx->qst;
+ if (!qi && !rb->rb_is_complete)
+ SOAP_VALIDATE_ERROR (("22023", "SV093", "Can not serialize incomplete RDF box"));
+ if (!rb->rb_is_complete)
+ rb_complete (rb, qi->qi_trx, qi);
+ value = rb->rb_box;
+ goto cast_as_wide;
+ }
if (proposed_type == DV_SHORT_INT)
{
if (DV_TYPE_OF (value) == DV_LONG_INT || DV_TYPE_OF (value) == DV_SHORT_INT)
@@ -9751,6 +9763,7 @@ do_string:
else if (proposed_type != DV_TYPE_OF (value))
SOAP_VALIDATE_ERROR (("22023", "SV058", "Non expected type of PL value : (%d) expected (%d)",
DV_TYPE_OF (value), proposed_type));
+cast_as_wide:
wide = box_cast_to (NULL, value, DV_TYPE_OF (value), DV_WIDE,
NUMERIC_MAX_PRECISION, NUMERIC_MAX_SCALE, err_ret);
if (*err_ret)
diff --git a/libsrc/Wi/bif_text.c b/libsrc/Wi/bif_text.c
index fb07856..3c8abd8 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.15 2011/03/14 15:46:28 source Exp $
+ * $Id$
*
* Bifs for text index
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -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*\')\n"
+" in obd any, in _func any, in _lang varchar := \'*ini*\', in _enc varchar := \'*ini*\', in silent int := 0)\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) \n"
+" if (is_xml = 2 or silent) \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 cf7b660..a5b2236 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.2 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_tidy.c b/libsrc/Wi/bif_tidy.c
index aa09ec8..656e7b8 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.5 2011/05/03 17:51:11 source Exp $
+ * $Id$
*
* Build in Functions for tidying HTML pages
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_uuencode.c b/libsrc/Wi/bif_uuencode.c
index c62827a..400cf0b 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.2 2010/02/10 16:05:05 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bif_xml.c b/libsrc/Wi/bif_xml.c
index a2aa023..0683145 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.14 2011/08/26 10:58:39 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -630,8 +630,6 @@ 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);
@@ -647,7 +645,7 @@ xp_free (xparse_ctx_t * xp)
while (xn)
{
xp_node_t * next = xn->xn_parent;
-#ifdef MALLOC_DEBUG
+#ifdef XTREE_DEBUG
dk_check_tree ((caddr_t) xn->xn_attrs);
#endif
dk_free_tree ((caddr_t) xn->xn_attrs);
@@ -709,33 +707,8 @@ 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);
- 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. */
+ if (NULL != xp->xp_tf)
+ xp_free_rdf_parser_fields (xp);
}
@@ -3797,6 +3770,40 @@ DBG_NAME(box_cast_to_UTF8) (DBG_PARAMS caddr_t * qst, caddr_t data)
caddr_t
+box_cast_to_UTF8_xsd (caddr_t *qst, caddr_t data)
+{
+ char tmpbuf[50];
+ int buffill;
+ double boxdbl;
+ switch (DV_TYPE_OF (data))
+ {
+ case DV_SINGLE_FLOAT: boxdbl = (double)(unbox_float (data)); goto make_double; /* see below */
+ case DV_DOUBLE_FLOAT: boxdbl = unbox_double (data); goto make_double; /* see below */
+ default: return box_cast_to_UTF8 (qst, data);
+ }
+make_double:
+ buffill = sprintf (tmpbuf, "%lg", boxdbl);
+ if ((NULL == strchr (tmpbuf, '.')) && (NULL == strchr (tmpbuf, 'E')) && (NULL == strchr (tmpbuf, 'e')))
+ {
+ if (isalpha(tmpbuf[1+1]))
+ {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ double myNEGINF_d = -1.0/myZERO;
+ if (myPOSINF_d == boxdbl) return box_dv_short_string ("INF");
+ else if (myNEGINF_d == boxdbl) return box_dv_short_string ("-INF");
+ else return box_dv_short_string ("NAN");
+ }
+ else
+ {
+ strcpy (tmpbuf+buffill, ".0");
+ buffill += 2;
+ }
+ }
+ return box_dv_short_nchars (tmpbuf, buffill);
+}
+
+caddr_t
box_cast_to_UTF8_uname (caddr_t *qst, caddr_t raw_name)
{
switch (DV_TYPE_OF (raw_name))
@@ -3815,6 +3822,7 @@ box_cast_to_UTF8_uname (caddr_t *qst, caddr_t raw_name)
return NULL; /* never reached */
}
+
caddr_t
bif_xte_head (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
diff --git a/libsrc/Wi/bif_xper.c b/libsrc/Wi/bif_xper.c
index 3d71037..3b69e7b 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.6 2011/02/23 17:31:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -116,6 +116,7 @@ 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 */
@@ -1394,6 +1395,11 @@ 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
@@ -2509,38 +2515,21 @@ 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))
- {
- if (!strncasecmp (source_arg, "file://", 7 /* strlen(("file://") */ ))
+ { /* 01234567 */
+ if (!strncasecmp (source_arg, "file://", 7))
{
-#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);
- }
+ 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);
+ }
source_type = 'F';
iter = file_read;
iter_data = context.xpc_src_file;
@@ -4432,7 +4421,7 @@ xp_string_value_is_nonempty (xml_entity_t * xe)
namelen = (int) skip_string_length (&ptr);
ptr += namelen;
alen = (long) skip_string_length (&ptr);
- if (alen);
+ if (alen)
return 1;
ptr += alen;
}
@@ -4477,7 +4466,7 @@ xp_string_value_is_nonempty (xml_entity_t * xe)
namelen = (int) skip_string_length (&ptr);
ptr += namelen;
alen = (long) skip_string_length (&ptr);
- if (alen);
+ if (alen)
return 1;
ptr += alen;
}
diff --git a/libsrc/Wi/bif_xper.h b/libsrc/Wi/bif_xper.h
index 904b8f4..dad91f2 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.1 2009/04/18 21:55:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/bitmap.c b/libsrc/Wi/bitmap.c
index 9b87d5b..c4691a6 100644
--- a/libsrc/Wi/bitmap.c
+++ b/libsrc/Wi/bitmap.c
@@ -1,14 +1,14 @@
/*
* bitmap.c
*
- * $Id: bitmap.c,v 1.17.2.16 2011/04/07 21:16:12 source Exp $
+ * $Id$
*
* Bitmap Index
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -687,7 +687,8 @@ 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);
- if (is_single)
+ row = buf->bd_buffer + buf->bd_content_map->pm_entries[itc->itc_map_pos];
+ if (is_single && !IE_ISSET (row, IEF_DELETE))
{
GPF_T1 ("singleton bm not in use");
#if 0
@@ -728,12 +729,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)
+ || value < bm_start
+ || IE_ISSET (row, IEF_DELETE))
{
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);
@@ -1135,7 +1136,11 @@ 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)
- return BM_DEL_DONE; /* the bit was not found, no change */
+ {
+ if (0 == bm_len)
+ GPF_T1("leaving bm with singeleton entry");
+ 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 d842425..118ee12 100644
--- a/libsrc/Wi/bitmap.h
+++ b/libsrc/Wi/bitmap.h
@@ -1,10 +1,10 @@
/*
- * $Id: bitmap.h,v 1.9.2.3 2010/03/08 12:04:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/blob.c b/libsrc/Wi/blob.c
index 60c52ba..51ae2cb 100644
--- a/libsrc/Wi/blob.c
+++ b/libsrc/Wi/blob.c
@@ -1,14 +1,14 @@
/*
* blob.c
*
- * $Id: blob.c,v 1.16.2.8 2010/05/12 12:24:29 source Exp $
+ * $Id$
*
* BLOBS
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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) \
+#define bh_string_list(lt, bh, get_bytes, omit, blob_type) \
((box_tag (bh) == DV_BLOB_WIDE_HANDLE) ? \
- bh_string_list_w (lt, bh, get_bytes, omit) : \
- bh_string_list_n (lt, bh, get_bytes, omit))
+ bh_string_list_w (lt, bh, get_bytes, omit, blob_type) : \
+ bh_string_list_n (lt, bh, get_bytes, omit, blob_type))
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 get_bytes, int omit, long blob_type)
{
/* take current page at current place and make string of
n bytes from the place and return as string list */
@@ -2682,10 +2682,14 @@ 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);
}
- page_string = dk_alloc_box (bytes_on_page + 1, DV_LONG_STRING);
+ 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);
memcpy (page_string, buf->bd_buffer + DP_DATA + from_byte,
bytes_on_page);
- page_string[bytes_on_page] = 0;
+ if (!blob_type) /* BLOB_BIN */
+ page_string[bytes_on_page] = 0;
dk_set_push (&string_list, page_string);
}
bytes_filled += bytes_on_page;
@@ -3091,12 +3095,11 @@ 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)
+ int send_position, long blob_type)
{
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);
+ dk_set_t string_list = bh_string_list (/*NULL,*/ lt, (blob_handle_t *) bhp, get_bytes, 0, blob_type);
if (BH_DIRTYREAD == string_list)
{
@@ -3177,7 +3180,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);
+ bh_string_list (/*NULL,*/ lt, bh, (long) from, 1, 0);
}
}
}
@@ -3189,7 +3192,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);
+ bh_string_list (/*NULL,*/ lt, bh, (long) from, 1, 0);
}
else
{
@@ -3197,7 +3200,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);
+ string_list = bh_string_list (/*NULL,*/ lt, bh, (long)(to - from), 0, 0);
strings_ready:
bh->bh_current_page = bh->bh_page;
bh->bh_position = 0;
@@ -3294,7 +3297,7 @@ blob_to_string_isp (lock_trx_t * lt, caddr_t bhp)
}
string_list = bh_string_list (lt, bh,
- 10000000, 0); /* up to 10MB as varchar */
+ 10000000, 0, 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 c861f25..64a3ab9 100644
--- a/libsrc/Wi/blobio.c
+++ b/libsrc/Wi/blobio.c
@@ -1,7 +1,7 @@
/*
* blobio.c
*
- * $Id: blobio.c,v 1.8.2.5 2010/06/25 16:39:58 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
@@ -638,15 +638,6 @@ 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 c5dcc91..b771b50 100644
--- a/libsrc/Wi/blobio.h
+++ b/libsrc/Wi/blobio.h
@@ -1,12 +1,12 @@
/*
* blobio.h
*
- * $Id: blobio.h,v 1.13.2.3 2010/02/01 02:45:58 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -122,7 +122,6 @@ 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 eb55679..e524b56 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 2009/04/09 13:22:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/cl_stubs.c b/libsrc/Wi/cl_stubs.c
index 6e99aae..1760c85 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.5 2010/02/01 09:26:55 source Exp $
+ * $Id$
*
* Cluster stubs
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/clrdf23.sql b/libsrc/Wi/clrdf23.sql
index 942ed5c..d96b093 100644
--- a/libsrc/Wi/clrdf23.sql
+++ b/libsrc/Wi/clrdf23.sql
@@ -1,12 +1,12 @@
--
--- $Id: clrdf23.sql,v 1.1.2.1 2010/02/01 15:15:19 source Exp $
+-- $Id$
--
-- Migrate to 2+3 layout
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2010 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/cluster.h b/libsrc/Wi/cluster.h
index 5e9f2a4..8c7e3e2 100644
--- a/libsrc/Wi/cluster.h
+++ b/libsrc/Wi/cluster.h
@@ -1,12 +1,12 @@
/*
- * $Id: cluster.h,v 1.1.2.9 2011/07/20 00:01:06 source Exp $
+ * $Id$
*
* Cluster data structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/cov_report.xsl b/libsrc/Wi/cov_report.xsl
index 0bf3e6d..7e1cf37 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.1 2009/04/16 09:48:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/cov_time.xsl b/libsrc/Wi/cov_time.xsl
index 4559562..55a928f 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 2009/04/09 13:22:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/crsr.h b/libsrc/Wi/crsr.h
index 822aace..1983773 100644
--- a/libsrc/Wi/crsr.h
+++ b/libsrc/Wi/crsr.h
@@ -1,12 +1,12 @@
/*
* csrs.h
*
- * $Id: crsr.h,v 1.2.2.1 2009/04/18 21:55:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/crypt.c b/libsrc/Wi/crypt.c
index ffba5f8..27e935b 100644
--- a/libsrc/Wi/crypt.c
+++ b/libsrc/Wi/crypt.c
@@ -1,14 +1,14 @@
/*
* crypt.c
*
- * $Id: crypt.c,v 1.2.2.1 2009/04/18 21:55:11 source Exp $
+ * $Id$
*
* one-way crypting
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/date.h b/libsrc/Wi/date.h
index cd113b1..944813f 100644
--- a/libsrc/Wi/date.h
+++ b/libsrc/Wi/date.h
@@ -1,14 +1,14 @@
/*
* date.h
*
- * $Id: date.h,v 1.4.2.2 2011/05/10 12:18:50 source Exp $
+ * $Id$
*
* Date support
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -41,7 +41,11 @@ typedef unsigned char datetime_t[DT_LENGTH];
#define SIGNC(p, n) ((signed char *)p)[n]
#define _SIGNC(p) ((signed char)(p))
-#ifdef DEBUG
+#ifndef DEBUG
+#undef DATE_DEBUG
+#endif
+
+#ifdef DATE_DEBUG
extern void dt_audit_fields (char *dt);
#define DT_AUDIT_FIELDS(dt) dt_audit_fields(dt)
#else
@@ -141,6 +145,9 @@ extern void dt_audit_fields (char *dt);
(UC (dt, 8) = (_UC (_UC (UC (dt, 8) >> 3) << 3) | (_UC ((tz) >> 8) & 0x07)), \
UC (dt, 9) = _UC ((tz) & 0xFF))
+#define DT_SET_DT_TYPE_NOAUDIT(dt, type) do { \
+ UC (dt, 8) = _UC (_UC (UC (dt, 8) & 0x07) | _UC ((type) << 5)); } while (0)
+
#define DT_SET_DT_TYPE(dt, type) do { \
UC (dt, 8) = _UC (_UC (UC (dt, 8) & 0x07) | _UC ((type) << 5)); \
DT_AUDIT_FIELDS(dt); } while (0)
@@ -153,7 +160,7 @@ extern void dt_audit_fields (char *dt);
/* arbitrary day component of time-only DV_DATETIME */
#ifdef DEBUG
-#define DAY_ZERO 0xfffefd
+#define DAY_ZERO 0x7ffefd
#else
#define DAY_ZERO (1999 * 365)
#endif
diff --git a/libsrc/Wi/datesupp.c b/libsrc/Wi/datesupp.c
index 89a28f9..3108bca 100644
--- a/libsrc/Wi/datesupp.c
+++ b/libsrc/Wi/datesupp.c
@@ -1,14 +1,14 @@
/*
* datesupp.c
*
- * $Id: datesupp.c,v 1.16.2.6 2011/05/10 12:18:51 source Exp $
+ * $Id$
*
* Date support functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -613,7 +613,7 @@ GMTimestamp_struct_to_dt (GMTIMESTAMP_STRUCT * ts, char *dt)
DT_SET_SECOND (dt, ts->second);
DT_SET_FRACTION (dt, ts->fraction);
DT_SET_TZ (dt, 0);
- DT_SET_DT_TYPE (dt, DT_TYPE_DATETIME);
+ DT_SET_DT_TYPE_NOAUDIT (dt, DT_TYPE_DATETIME);
}
void
@@ -1350,6 +1350,7 @@ and MUST be assumed when reading the asctime format. */
GMTimestamp_struct_to_dt (ts, dt);
DT_SET_TZ (dt, tz_min);
}
+ DT_AUDIT_FIELDS (dt);
return 1;
}
@@ -1448,7 +1449,7 @@ dt_audit_fields (char *dt)
if (0 != f) GPF_T1 ("nonzero fraction in DT_TYPE_DATE dt_audit_fields()");
break;
case DT_TYPE_TIME:
- if (DAY_ZERO != d) GPF_T1 ("DAY_ZERO in DT_TYPE_TIME dt_audit_fields()");
+ if (DAY_ZERO != d) GPF_T1 ("non-DAY_ZERO in DT_TYPE_TIME dt_audit_fields()");
break;
default:
GPF_T1 ("Wrong DT_DT_TYPE in dt_audit_fields()");
diff --git a/libsrc/Wi/datesupp.h b/libsrc/Wi/datesupp.h
index f5a48d8..6355963 100644
--- a/libsrc/Wi/datesupp.h
+++ b/libsrc/Wi/datesupp.h
@@ -1,14 +1,14 @@
/*
* datesupp.c
*
- * $Id: datesupp.h,v 1.7.2.3 2011/05/10 12:18:51 source Exp $
+ * $Id$
*
* Date support functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/ddlrun.c b/libsrc/Wi/ddlrun.c
index 80fb403..4f97dbb 100644
--- a/libsrc/Wi/ddlrun.c
+++ b/libsrc/Wi/ddlrun.c
@@ -1,14 +1,14 @@
/*
* ddlrun.c
*
- * $Id: ddlrun.c,v 1.34.2.15 2011/08/26 10:57:37 source Exp $
+ * $Id$
*
* SQL DDL Functionality
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2749,17 +2749,15 @@ ddl_drop_index (caddr_t * qst, const char *table, const char *name, int log_to_t
else
log_text (qi->qi_trx, temp_tx);
}
- dk_free_box(szTheTableName);
- dk_free_box(szTheIndexName);
-
if (DO_LOG(LOG_DDL))
{
- user_t * usr = ((query_instance_t *)(qst))->qi_client->cli_user;
-
- if (table)
- log_info ("DDLC_6 %s Drop index %.*s (%.*s)", GET_USER,
- LOG_PRINT_STR_L, name, LOG_PRINT_STR_L, table);
+ client_connection_t * cli = qi->qi_client;
+ LOG_GET
+ log_info ("DDLC_6 %s %s %s Drop index %.*s (%.*s)", user, from, peer,
+ LOG_PRINT_STR_L, szTheIndexName, LOG_PRINT_STR_L, szTheTableName);
}
+ dk_free_box(szTheTableName);
+ dk_free_box(szTheIndexName);
}
@@ -2950,9 +2948,9 @@ ddl_index_def (query_instance_t * qi, caddr_t name, caddr_t table, caddr_t * col
atomic_mode (qi, 0, atomic); /* unlock */
if (DO_LOG(LOG_DDL))
{
- user_t * usr = ((query_instance_t *)(qi))->qi_client->cli_user;
- if (usr && GET_USER)
- log_info ("DDLC_5 %s Create index %*.s (%*.s)", GET_USER,
+ client_connection_t * cli = qi->qi_client;
+ LOG_GET
+ log_info ("DDLC_5 %s %s %s Create index %.*s (%.*s)", user, from, peer,
LOG_PRINT_STR_L, name, LOG_PRINT_STR_L, table);
}
@@ -3026,8 +3024,8 @@ ddl_rename_table_1 (query_instance_t * qi, char *old, char *new_name, caddr_t *e
new_tb = sch_name_to_table (wi_inst.wi_schema, new_name);
if (DO_LOG(LOG_DDL))
{
- user_t * usr = ((query_instance_t *)(qi))->qi_client->cli_user;
- log_info ("DDLC_7 %s Rename table %*.s (%*.s)", GET_USER,
+ LOG_GET
+ log_info ("DDLC_7 %s %s %s Rename table %.*s (%.*s)", user, from, peer,
LOG_PRINT_STR_L, old, LOG_PRINT_STR_L, new_name);
}
}
@@ -3263,9 +3261,10 @@ ddl_drop_table (query_instance_t * qi, char *name)
}
#endif
+
#ifdef BIF_XML
del_st = sql_compile_static ("DB.DBA.vt_clear_text_index (?)", cli, &err, SQLC_DEFAULT);
- if (del_st)
+ if (del_st && !sch_view_def (wi_inst.wi_schema, name))
{
AS_DBA (qi, err = qr_rec_exec (del_st, cli, NULL, qi, NULL, 1,
":0", name, QRP_STR));
diff --git a/libsrc/Wi/disk.c b/libsrc/Wi/disk.c
index c0aa335..1b3dffe 100644
--- a/libsrc/Wi/disk.c
+++ b/libsrc/Wi/disk.c
@@ -1,14 +1,14 @@
/*
* disk.c
*
- * $Id: disk.c,v 1.36.2.29 2011/10/13 14:39:34 source Exp $
+ * $Id$
*
* Managing buffer rings and paging to disk.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1861,6 +1861,9 @@ buf_disk_write (buffer_desc_t * buf, dp_addr_t phys_dp_to)
OFF_T rc;
OFF_T off;
dp_addr_t dest = (phys_dp_to ? phys_dp_to : buf->bd_physical_page);
+#ifdef VALGRIND
+ memset (c_buf, 0, sizeof (c_buf));
+#endif
#ifdef O_DIRECT
if (c_use_o_direct && !IS_IO_ALIGN (buf->bd_buffer))
GPF_T1 ("buf_disk_write (): The buffer is not io-aligned");
diff --git a/libsrc/Wi/dks_esc.c b/libsrc/Wi/dks_esc.c
index dc7f3b5..f3c1a5d 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.4 2010/07/08 13:21:23 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -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','@','O','@','@',
+ '@','@','@','@','@','@','@','@','@','@','@','O','R','O','@','R',
/* 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['Q'+1-'>'] = {
+dks_charclass_props_t dks_charclasses['R'+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,7 +106,8 @@ dks_charclass_props_t dks_charclasses['Q'+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} };
+/* 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 } };
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 4415526..292fbb3 100644
--- a/libsrc/Wi/eqlcomp.c
+++ b/libsrc/Wi/eqlcomp.c
@@ -1,14 +1,14 @@
/*
* eqlcomp.c
*
- * $Id: eqlcomp.c,v 1.16.2.14 2011/10/13 10:59:22 source Exp $
+ * $Id$
*
* SQL Query Node Constructors.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -393,6 +393,7 @@ qr_free (query_t * qr)
dk_free_tree (qr->qr_proc_ret_type);
dk_free_box (qr->qr_trig_table);
dk_free_box ((box_t) qr->qr_trig_upd_cols);
+ if (qr->qr_pn) qr->qr_pn->pn_query = NULL;
proc_name_free (qr->qr_pn);
}
dk_free_box ((caddr_t) qr->qr_proc_cost);
@@ -619,6 +620,7 @@ ssl_new_constant (comp_context_t * cc, caddr_t val)
DO_SET (state_const_slot_t *, ssl, &cc->cc_query->qr_state_map)
{
if (SSL_CONSTANT == ssl->ssl_type
+ && (DV_TYPE_OF (val) == DV_TYPE_OF (ssl->ssl_const_val)) /* This check is added due to bug 14773 */
&& box_equal (val, ssl->ssl_const_val))
return (state_slot_t *)ssl;
}
@@ -2455,7 +2457,7 @@ retry_dupe_check:
desc->cd_scale = box_num (6);
}
if (desc->cd_dtp == DV_ANY)
- prec = ROW_MAX_COL_BYTES;
+ prec = 0x7fffffff;
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 e40d9a7..c9bcdfc 100644
--- a/libsrc/Wi/eqlcomp.h
+++ b/libsrc/Wi/eqlcomp.h
@@ -1,12 +1,12 @@
/*
* eqlcomp.h
*
- * $Id: eqlcomp.h,v 1.8.2.4 2009/12/01 22:38:19 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -46,6 +46,7 @@ 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 ef137d2..643eac2 100644
--- a/libsrc/Wi/extent.c
+++ b/libsrc/Wi/extent.c
@@ -1,14 +1,14 @@
/*
* extent.c
*
- * $Id: extent.c,v 1.1.2.16 2011/07/20 00:01:06 source Exp $
+ * $Id$
*
* Disk extent management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/extent.h b/libsrc/Wi/extent.h
index 68576b3..ee2997e 100644
--- a/libsrc/Wi/extent.h
+++ b/libsrc/Wi/extent.h
@@ -1,12 +1,12 @@
/*
- * $Id: extent.h,v 1.1.2.5 2011/07/20 00:01:06 source Exp $
+ * $Id$
*
* Disk extents
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/ftp.sql b/libsrc/Wi/ftp.sql
index 140b414..fc9b77e 100644
--- a/libsrc/Wi/ftp.sql
+++ b/libsrc/Wi/ftp.sql
@@ -1,10 +1,10 @@
--
--- $Id: ftp.sql,v 1.7.2.2 2011/09/28 17:01:16 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/gate.c b/libsrc/Wi/gate.c
index 82ffa8b..7aeee5d 100644
--- a/libsrc/Wi/gate.c
+++ b/libsrc/Wi/gate.c
@@ -1,14 +1,14 @@
/*
* gate.c
*
- * $Id: gate.c,v 1.20.2.9 2011/06/10 22:45:37 source Exp $
+ * $Id$
*
* Hyperspace and gate.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/hash.c b/libsrc/Wi/hash.c
index b28a0e7..ab90369 100644
--- a/libsrc/Wi/hash.c
+++ b/libsrc/Wi/hash.c
@@ -1,14 +1,14 @@
/*
* hash.c
*
- * $Id: hash.c,v 1.19.2.19 2011/06/01 09:20:51 source Exp $
+ * $Id$
*
* Hash Index
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1081,9 +1081,10 @@ 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 ((caddr_t) (hash_row + h_off),
- h_len, value, box_length(value) - sizeof (wchar_t),
- ssl->ssl_sqt.sqt_collation))
+ 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 ) )
continue;
return DVC_LESS;
}
diff --git a/libsrc/Wi/hosting.c b/libsrc/Wi/hosting.c
index 049164a..2388e3e 100644
--- a/libsrc/Wi/hosting.c
+++ b/libsrc/Wi/hosting.c
@@ -1,14 +1,14 @@
/*
* hosting.c
*
- * $Id: hosting.c,v 1.11.2.2 2009/05/11 07:36:23 source Exp $
+ * $Id$
*
* hosting languages plugin type handler
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/hosting.h b/libsrc/Wi/hosting.h
index 0841353..c24087c 100644
--- a/libsrc/Wi/hosting.h
+++ b/libsrc/Wi/hosting.h
@@ -1,12 +1,12 @@
/*
* hosting.h
*
- * $Id: hosting.h,v 1.4.2.1 2009/04/18 21:55:11 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/hosting.sql b/libsrc/Wi/hosting.sql
index 03121b4..8cb943b 100644
--- a/libsrc/Wi/hosting.sql
+++ b/libsrc/Wi/hosting.sql
@@ -1,10 +1,10 @@
--
--- $Id: hosting.sql,v 1.7.2.3 2010/02/09 14:34:24 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/http.c b/libsrc/Wi/http.c
index ff58dd9..9963c2c 100644
--- a/libsrc/Wi/http.c
+++ b/libsrc/Wi/http.c
@@ -1,14 +1,14 @@
/*
* http.c
*
- * $Id: http.c,v 1.71.2.64 2011/10/13 13:28:18 source Exp $
+ * $Id$
*
* HTTP access to Virtuoso
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -70,6 +70,9 @@
#else
#include <dirent.h>
#endif
+#ifdef _SSL
+#include "util/sslengine.h"
+#endif
#define XML_VERSION "1.0"
@@ -82,6 +85,7 @@
char *http_methods[] = { "NONE", "GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", /* HTTP/1.1 */
"PROPFIND", "PROPPATCH", "COPY", "MOVE", "LOCK", "UNLOCK", "MKCOL", /* WebDAV */
"MGET", "MPUT", "MDELETE", /* URIQA */
+ "REPORT", /* CalDAV */
"TRACE", NULL };
resource_t *ws_dbcs;
basket_t ws_queue;
@@ -105,7 +109,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))
+#define MAINTENANCE (NULL != www_maintenance_page && (wi_inst.wi_is_checkpoint_pending || www_maintenance || cpt_is_global_lock ()))
caddr_t
temp_aspx_dir_get (void)
@@ -397,7 +401,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, caddr_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, ccaddr_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)
@@ -408,7 +412,7 @@ http_acl_match (caddr_t *alist, caddr_t name, caddr_t dst, int obj_id, int rw_fl
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, NULL, 0, LIKE_ARG_CHAR, LIKE_ARG_CHAR))
+ else if (dst != NULL && DVC_MATCH == cmp_like (dst, elm->ha_dest ? 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);
@@ -430,7 +434,10 @@ ws_check_acl (ws_connection_t * ws, acl_hit_t ** hit)
if (list)
{
- if (http_acl_match (list, ws->ws_client_ip, NULL, -1, -1, ACL_CHECK_HITS, hit, ws) > 0) /* 1:deny */
+ 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 */
rc = 0;
}
return rc;
@@ -1511,6 +1518,7 @@ ws_path_and_params (ws_connection_t * ws)
memcpy (new_params, ws->ws_params, box_length (ws->ws_params));
memcpy (new_params + box_length (ws->ws_params), params, box_length (params));
dk_free_box ((caddr_t)(ws->ws_params));
+ dk_free_box ((caddr_t) params);
ws->ws_params = (caddr_t *)(new_params);
}
}
@@ -1670,6 +1678,9 @@ ws_clear (ws_connection_t * ws, int error_cleanup)
dk_free_tree (ws->ws_store_in_cache);
ws->ws_store_in_cache = NULL;
ws->ws_proxy_request = 0;
+ IN_TXN;
+ ws->ws_limited = 0;
+ LEAVE_TXN;
http_set_default_options (ws);
#ifdef _SSL
ws->ws_ssl_ctx = NULL;
@@ -2046,19 +2057,21 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code)
if (0 != strncmp (code, "HTTP/1.1 2", 10) && 0 != strncmp (code, "HTTP/1.1 3", 10) && ws->ws_proto_no < 11)
ws->ws_try_pipeline = 0;
- snprintf (tmp, sizeof (tmp), "%.1000s\r\nServer: %.1000s\r\nConnection: %s\r\n",
- code,
- http_server_id_string,
- ws->ws_try_pipeline ? "Keep-Alive" : "close");
memset (&gzctx, 0, sizeof (strses_chunked_out_t));
CATCH_WRITE_FAIL (ws->ws_session)
{
+ snprintf (tmp, sizeof (tmp), "%.1000s\r\nServer: %.1000s\r\n", code, http_server_id_string);
SES_PRINT (ws->ws_session, tmp); /* server signature */
+ if (ws->ws_status_code != 101)
+ {
+ snprintf (tmp, sizeof (tmp), "Connection: %s\r\n", ws->ws_try_pipeline ? "Keep-Alive" : "close");
+ SES_PRINT (ws->ws_session, tmp);
+ }
/* fprintf (stdout, "\nREPLY-----\n%s", tmp); */
/* mime type */
- if (!ws->ws_header || (NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Content-Type:")))
+ if (ws->ws_status_code != 101 && (!ws->ws_header || (NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Content-Type:"))))
{
#ifdef BIF_XML
if (media_type)
@@ -2125,6 +2138,7 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code)
SES_PRINT (ws->ws_session, tmp);
}
+ if (ws->ws_status_code != 101)
SES_PRINT (ws->ws_session, "Accept-Ranges: bytes\r\n");
if (ws->ws_header) /* user-defined headers */
@@ -2140,7 +2154,7 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code)
snprintf (tmp, sizeof (tmp), "Transfer-Encoding: chunked\r\nContent-Encoding: gzip\r\n");
SES_PRINT (ws->ws_session, tmp);
}
- else if (!ws->ws_header || (NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Content-Length:"))) /* plain body */
+ else if (ws->ws_status_code != 101 && (!ws->ws_header || (NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Content-Length:")))) /* plain body */
{
snprintf (tmp, sizeof (tmp), "Content-Length: %ld\r\n", len);
SES_PRINT (ws->ws_session, tmp);
@@ -3030,6 +3044,7 @@ ws_auth_check (ws_connection_t * ws)
client_connection_t * cli = ws->ws_cli;
int rc = LTE_OK, retc = 0;
query_t * proc;
+ user_t * saved_user = NULL;
if (MAINTENANCE)
return 1;
@@ -3078,6 +3093,8 @@ ws_auth_check (ws_connection_t * ws)
lt_threads_set_inner (cli->cli_trx, 1);
LEAVE_TXN;
+ saved_user = cli->cli_user;
+ cli->cli_user = sec_name_to_user ("dba");
err = qr_quick_exec (http_auth_qr, cli, NULL, &lc, 2,
":0", auth_proc, QRP_STR,
":1", auth_realm, QRP_STR);
@@ -3100,6 +3117,7 @@ ws_auth_check (ws_connection_t * ws)
}
error_end:
+ cli->cli_user = saved_user;
if (err && err != (caddr_t)SQL_NO_DATA_FOUND)
{
/*log_info ("SQL ERROR in HTTP authentication : State=[%s] Message=[%s]", ERR_STATE(err), ERR_MESSAGE(err));*/
@@ -3740,11 +3758,10 @@ vsmx_start:
err = qr_quick_exec (http_call, ws->ws_cli, NULL, NULL, 4,
":0", p_name, QRP_STR,
- ":1", ws->ws_path, QRP_RAW,
+ ":1", box_copy_tree ((box_t) ws->ws_path), QRP_RAW,
":2", ws->ws_params, QRP_RAW,
":3", box_copy_tree ((box_t) ws->ws_lines), QRP_RAW);
- ws->ws_path = NULL;
ws->ws_params = NULL;
}
error_in_procedure:
@@ -3911,6 +3928,8 @@ do_file:
dk_free_tree ((caddr_t) err);
dk_free_tree ((box_t) ws->ws_lines);
ws->ws_lines = NULL;
+ dk_free_tree ((box_t) ws->ws_path);
+ ws->ws_path = NULL;
dk_free_box (soap_method);
}
@@ -4104,7 +4123,7 @@ ws_serve_connection (ws_connection_t * ws)
SSL * new_ssl = NULL;
if (NULL != tcpses_get_ssl (ses->dks_session))
- SSL_free ((SSL *) tcpses_get_ssl (ses->dks_session));
+ sslses_to_tcpses (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);
@@ -4614,7 +4633,7 @@ http_session_arg (caddr_t * qst, state_slot_t ** args, int nth,
query_instance_t * qi = (query_instance_t *) qst;
if (!qi->qi_client->cli_http_ses)
sqlr_new_error ("37000", "HT006", "http output function outside of http context and no stream specified: %s.", func);
- res = qi->qi_client->cli_http_ses;
+ res = qi->qi_client->cli_ws->ws_session;
}
return res;
}
@@ -5195,6 +5214,34 @@ again:
return NULL;
}
+int32 http_limited;
+
+caddr_t
+bif_http_limited (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+{
+ query_instance_t * qi = (query_instance_t *) qst;
+ ws_connection_t * ws;
+ volatile long limited = 0;
+
+ if (!qi->qi_client->cli_ws)
+ sqlr_new_error ("42000", "HT010", "This function is only allowed processing a HTTP request");
+ ws = qi->qi_client->cli_ws;
+ IN_TXN;
+ DO_SET (lock_trx_t *, lt, &all_trxs)
+ {
+ if ((lt->lt_threads > 0 || lt_has_locks (lt)) && lt->lt_client && lt->lt_client->cli_ws && lt->lt_client->cli_ws->ws_limited)
+ limited ++;
+ }
+ END_DO_SET ();
+ if (limited < http_limited)
+ ws->ws_limited = 1; /* must be set inside txn mtx */
+ LEAVE_TXN;
+
+ if (limited >= http_limited)
+ sqlr_new_error ("42000", "HTLIM", "The use of restricted HTTP threads is over the limit");
+ return box_num (limited);
+}
+
caddr_t
bif_http_header_get (caddr_t * qst, caddr_t * err_ret, state_slot_t **args)
{
@@ -5863,11 +5910,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"
-static char base64_vec[] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+char base64_vec[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+char base64url_vec[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_\0";
size_t
-encode_base64(char * input, char * output, size_t len)
+encode_base64_impl (char * input, char * output, size_t len, char * table)
{
unsigned char c;
int n = 0,
@@ -5895,7 +5942,7 @@ encode_base64(char * input, char * output, size_t len)
}
for (i = 3; i >= 0; i--)
- output[x++] = base64_vec[enc[i]];
+ output[x++] = table[enc[i]];
n = 1;
count += 4;
val = c;
@@ -5935,7 +5982,7 @@ encode_base64(char * input, char * output, size_t len)
if (n)
{
for (i = 3; i >= 0; i--)
- output[x++] = base64_vec[enc[i]];
+ output[x++] = table[enc[i]];
}
return x;
@@ -5966,6 +6013,30 @@ 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)
{
@@ -5975,7 +6046,7 @@ base64_store24(char ** d, char * c)
}
size_t
-decode_base64(char * src, char * end)
+decode_base64_impl (char * src, char * end, char * table)
{
char * start = src;
char c0, c[4], *p;
@@ -5986,8 +6057,8 @@ decode_base64(char * src, char * end)
while ((c0 = *src++) && src < end) {
if (c0=='=')
break; /* a = symbol is end padding */
- if ((p=strchr(base64_vec, c0))) {
- c[i++]=(char) (p-base64_vec);
+ if ((p=strchr(table, c0))) {
+ c[i++]=(char) (p-table);
if (i==4) {
base64_store24(&d, c);
i=0;
@@ -6028,6 +6099,26 @@ 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,
@@ -7308,7 +7399,7 @@ bif_http_flush (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
if (ws->ws_xslt_url)
sqlr_new_error ("42000", "HT071", "Direct output and http_xslt() not compatible");
- if (ws->ws_header &&
+ if (ws->ws_header && ws->ws_status_code != 101 &&
NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Content-Length:"))
sqlr_new_error ("42000", "HT072", "Direct output requires Content-Length specified by http_header()");
}
@@ -8067,6 +8158,8 @@ bif_http_map_table (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
}
map->hm_cors = ht;
}
+ else if (DV_STRINGP (opts[i]) && !stricmp (opts[i],"expiration_function"))
+ map->hm_expiration_fn = box_copy_tree (opts[i+1]);
}
map->hm_opts = (caddr_t *) box_copy_tree ((box_t) opts);
}
@@ -8136,31 +8229,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;
}
@@ -8181,22 +8274,25 @@ https_cert_verify_callback (int ok, void *_ctx)
}
int
-ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * cert_name, char * key_name)
+ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * cert_name, char * key_name, char * extra)
{
- char err_buf [1024];
+ char err_buf[1024];
+ EVP_PKEY *pkey;
+ X509 *x509;
+
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 ("The certificate & key stored in database cannot be accessed.");
+ log_error ("SSL: The certificate and private key stored in the database cannot be accessed");
return 0;
}
if (strcmp (cert_name, key_name))
{
- log_error ("The certificate & key stored in database must have same name");
+ log_error ("SSL: The certificate and private key stored in the database must have the same name");
return 0;
}
saved_user = cli->cli_user;
@@ -8206,42 +8302,91 @@ 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 ("Invalid stored key %s", key_name);
+ log_error ("SSL: The stored key '%s' is invalid", key_name);
return 0;
}
- if (SSL_CTX_use_certificate (ssl_ctx, k->xek_x509) <= 0)
+ x509 = k->xek_x509;
+ pkey = k->xek_evp_private_key;
+ }
+ else
+ {
+ if ((x509 = ssl_load_x509 (cert_name)) == NULL)
{
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- log_error ("Invalid X509 certificate file %s : %s", cert_name, err_buf);
+ log_error ("SSL: Unable to load certificate '%s': %s", cert_name, err_buf);
return 0;
}
- if (SSL_CTX_use_PrivateKey (ssl_ctx, k->xek_evp_private_key) <= 0)
+ if ((pkey = ssl_load_privkey (key_name, NULL)) == NULL)
{
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- log_error ("Invalid X509 private key file %s : %s", key_name, err_buf);
+ log_error ("SSL: Unable to load private key '%s': %s", key_name, err_buf);
return 0;
}
}
- else
+ 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 (extra)
{
- if (SSL_CTX_use_certificate_file (ssl_ctx, cert_name, SSL_FILETYPE_PEM) <= 0)
+ if (strstr (extra, "db:") == extra)
{
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- log_error ("Invalid X509 certificate file %s : %s", cert_name, err_buf);
- return 0;
+ client_connection_t * cli = GET_IMMEDIATE_CLIENT_OR_NULL;
+ char *tok_s = NULL, *tok;
+ caddr_t str = box_dv_short_string (extra + 3);
+ /* list of key from DB */
+ user_t * saved_user = cli->cli_user;
+ if (!cli->cli_user) cli->cli_user = sec_name_to_user ("dba");
+ tok = strtok_r (str, ",", &tok_s);
+ while (tok)
+ {
+ int r;
+ xenc_key_t * k;
+ k = xenc_get_key_by_name (tok, 1);
+ if (!k || !k->xek_x509)
+ {
+ log_error ("SSL: The stored key '%s' can not be used as extra chain certificate", tok);
+ break;
+ }
+ r = SSL_CTX_add_extra_chain_cert(ssl_ctx, k->xek_x509);
+ if (!r)
+ {
+ log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
+ break;
+ }
+ CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
+ tok = strtok_r (NULL, ",", &tok_s);
+ }
+ dk_free_box (str);
+ cli->cli_user = saved_user;
}
- if (SSL_CTX_use_PrivateKey_file (ssl_ctx, key_name, SSL_FILETYPE_PEM) <= 0)
+ else /* single file */
{
- 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 *x = NULL;
+ BIO *in;
+ if ((in = BIO_new_file (extra, "r")) != NULL)
+ {
+ while ((x = PEM_read_bio_X509 (in, NULL, NULL, NULL)))
+ {
+ int r;
+ r = SSL_CTX_add_extra_chain_cert(ssl_ctx, x);
+ if (!r)
+ {
+ log_error ("SSL: The certificate(s) from file '%s' can not be used as extra chain certificate(s)", extra);
+ X509_free (x);
+ break;
+ }
+ }
+ BIO_free (in);
+ }
}
}
- if (!SSL_CTX_check_private_key (ssl_ctx))
+ if (SSL_CTX_use_PrivateKey (ssl_ctx, pkey) <= 0)
{
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- log_error ("X509 Private key %s does not match the X509 certificate public key %s : %s",
- key_name, cert_name, err_buf);
+ log_error ("SSL: Unable to use private key '%s': %s", key_name, err_buf);
return 0;
}
return 1;
@@ -8250,15 +8395,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 *cert = NULL;
+ char *https_cvfile = NULL;
+ char *cert = NULL, *extra = 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 */
@@ -8271,22 +8416,28 @@ 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 */
+ 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_certificate") && DV_STRINGP (https_opts [i + 1])) /* ALIAS x509 cert */
cert = https_opts [i + 1];
- else if (!stricmp (https_opts [i], "https_key") && DV_STRINGP (https_opts [i + 1])) /* private key */
+ 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_private_key") && DV_STRINGP (https_opts [i + 1])) /* ALIAS 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]);
+ 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]);
+ else if (!stricmp (https_opts [i], "https_extra_chain_certificates") && DV_STRINGP (https_opts [i + 1])) /* private key */
+ extra = 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)
@@ -8296,6 +8447,9 @@ http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts)
goto err_exit;
}
+ if (!ssl_server_set_certificate (ssl_ctx, cert, skey, extra))
+ goto err_exit;
+
if (https_cvfile)
{
if (!SSL_CTX_load_verify_locations (ssl_ctx, https_cvfile, NULL))
@@ -8305,8 +8459,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) <= 0)
- goto err_exit;
if (https_client_verify > 0)
{
@@ -8321,29 +8473,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);
@@ -8877,6 +9029,8 @@ bif_http_map_get (caddr_t *qst, caddr_t * err_ret, state_slot_t **args)
res = box_num (map->hm_url_rewrite_keep_lpath);
else if (!strcmp (member, "noinherit"))
res = box_num (map->hm_no_inherit);
+ else if (!strcmp (member, "expiration_function"))
+ res = box_copy_tree ((box_t) map->hm_expiration_fn);
return res;
}
@@ -9928,10 +10082,12 @@ 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))
{
@@ -9940,6 +10096,24 @@ bif_http_on_message (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
conn[0] = NULL;
else
ses = NULL;
+ mutex_enter (thread_mtx);
+ if (ws && ses && ses == ws->ws_session)
+ {
+ ws->ws_session->dks_ws_status = DKS_WS_CACHED;
+ ws->ws_session->dks_n_threads++;
+ }
+ mutex_leave (thread_mtx);
+ }
+ 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)
@@ -10203,6 +10377,8 @@ 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);
@@ -10224,6 +10400,7 @@ http_init_part_one ()
bif_define("http_flush", bif_http_flush);
bif_define ("http_pending_req", bif_http_pending_req);
bif_define ("http_kill", bif_http_kill);
+ bif_define ("http_limited", bif_http_limited);
bif_define ("http_lock", bif_http_lock);
bif_define ("http_unlock", bif_http_unlock);
bif_define ("http_request_header", bif_http_request_header);
@@ -10429,6 +10606,8 @@ 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];
@@ -10440,20 +10619,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);
- call_exit(-1);
+ goto init_ssl_exit;
}
+ if (!ssl_server_set_certificate (ssl_ctx, https_cert, https_key, https_extra))
+ 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);
- call_exit(-1);
+ goto init_ssl_exit;
}
-
- if (ssl_server_set_certificate (ssl_ctx, https_cert, https_key) <= 0)
- {
- call_exit(-1);
}
if (https_client_verify > 0)
@@ -10472,7 +10651,7 @@ http_init_part_two ()
SSL_CTX_set_session_id_context(ssl_ctx, (unsigned char *)&session_id_context, sizeof session_id_context);
}
- if (NULL != https_client_verify_file)
+ if (https_client_verify_file)
{
int i;
STACK_OF(X509_NAME) *skCAList = SSL_load_client_CA_file (https_client_verify_file);
@@ -10480,45 +10659,44 @@ 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 ("SSL port is not valid port number");
- call_exit(-1);
+ log_error ("HTTPS: SSL port is invalid");
+ goto init_ssl_exit;
}
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 ("Failed setting the HTTPS listen address at %s.", https_port);
- call_exit (-1);
+ log_error ("HTTPS: Failed setting listen address at %s", https_port);
+ goto init_ssl_exit;
}
session_listen (ssl_listen->dks_session);
-
if (!SESSTAT_ISSET (ssl_listen->dks_session, SST_LISTENING))
{
- 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);
+ 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:
+ ;
}
#endif
@@ -10624,6 +10802,8 @@ http_init_part_two ()
#endif
http_threads_allocate (http_threads);
+ if (!http_limited)
+ http_limited = http_threads;
PrpcCheckIn (listening);
dks_housekeeping_session_count_change (1);
diff --git a/libsrc/Wi/http.h b/libsrc/Wi/http.h
index 91d59f7..393f6bc 100644
--- a/libsrc/Wi/http.h
+++ b/libsrc/Wi/http.h
@@ -1,14 +1,14 @@
/*
* http.h
*
- * $Id: http.h,v 1.22.2.17 2011/10/13 13:11:18 source Exp $
+ * $Id$
*
* Definitions for HTTP server
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -80,6 +80,7 @@ typedef struct ws_http_map_s
int hm_url_rewrite_keep_lpath;
id_hash_t * hm_cors;
int hm_cors_restricted;
+ caddr_t hm_expiration_fn;
} ws_http_map_t;
#endif
@@ -135,6 +136,7 @@ typedef struct ws_connection_s
SSL_CTX * ws_ssl_ctx;
#endif
char ws_options[HTTP_MAX_METHOD];
+ char ws_limited;
} ws_connection_t;
#define WS_CHARSET(ws, qst) \
@@ -221,6 +223,7 @@ extern char * http_port;
extern char * https_port;
extern char * https_cert;
extern char * https_key;
+extern char * https_extra;
extern int32 https_client_verify;
extern int32 https_client_verify_depth;
extern char * https_client_verify_file;
@@ -330,7 +333,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['Q'+1-'>'];
+extern dks_charclass_props_t dks_charclasses['R'+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,8 +353,15 @@ 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);
-size_t decode_base64(char * src, char * end);
-size_t encode_base64(char * input, char * output, size_t len);
+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)
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 84c95d3..504c1e8 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.3 2011/10/13 11:03:35 source Exp $
+-- $Id$
--
-- 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-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/http_client.c b/libsrc/Wi/http_client.c
index d9edc8c..0b4fcea 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.20 2011/04/29 11:56:19 source Exp $
+ * $Id$
*
* HTTP client for Virtuoso
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -423,7 +423,7 @@ http_cli_negotiate_socks4 (dk_session_t * ses, char * in_host, char * name, char
socksreq[8] = 0; /* no name */
if (name)
{
- strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 8);
+ strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 8 - 1);
socksreq[sizeof (socksreq) - 1] = 0;
packetsize = 9 + strlen ((char *) socksreq + 8);
}
@@ -1150,6 +1150,7 @@ 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)
{
@@ -1275,7 +1276,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)
+ if (!ctx->hcctx_resp_content_length && !ctx->hcctx_is_chunked && (!ctx->hcctx_close || ctx->hcctx_resp_content_len_recd))
return (HC_RET_OK);
if (ctx->hcctx_method == HC_METHOD_HEAD || ctx->hcctx_respcode == 304)
@@ -1957,7 +1958,7 @@ http_cli_std_handle_redir (http_cli_ctx * ctx, caddr_t parm, caddr_t ret_val, ca
ctx->hcctx_ssl_insecure = '\1';
RELEASE (ctx->hcctx_proxy.hcp_proxy);
}
- else
+ else if (!strnicmp (url, "http://", 7))
{
ctx->hcctx_pkcs12_file = NULL;
}
@@ -2155,6 +2156,7 @@ 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);
}
@@ -2188,6 +2190,7 @@ 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 9d15bca..df00f53 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.5 2010/06/25 16:41:24 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -188,6 +188,7 @@ 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 4fc439d..cbddd79 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 2009/01/19 09:02:33 source Exp $
+-- $Id$
--
-- INFORMATION schema support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/insert.c b/libsrc/Wi/insert.c
index f79472c..c32c133 100644
--- a/libsrc/Wi/insert.c
+++ b/libsrc/Wi/insert.c
@@ -1,14 +1,14 @@
/*
* insert.c
*
- * $Id: insert.c,v 1.19.2.11 2010/11/09 10:59:15 source Exp $
+ * $Id$
*
* Insert
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/inxop.c b/libsrc/Wi/inxop.c
index 85d5582..6f8e730 100644
--- a/libsrc/Wi/inxop.c
+++ b/libsrc/Wi/inxop.c
@@ -1,14 +1,14 @@
/*
* inxop.c
*
- * $Id: inxop.c,v 1.21.2.4 2010/08/26 18:03:48 source Exp $
+ * $Id$
*
* SQL query execution
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/iodbcinst.c b/libsrc/Wi/iodbcinst.c
index 476be70..4afd119 100644
--- a/libsrc/Wi/iodbcinst.c
+++ b/libsrc/Wi/iodbcinst.c
@@ -1,7 +1,7 @@
/*
* iodbcinst.c
*
- * $Id: iodbcinst.c,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/iodbcinst.h b/libsrc/Wi/iodbcinst.h
index faf39ad..c2798b2 100644
--- a/libsrc/Wi/iodbcinst.h
+++ b/libsrc/Wi/iodbcinst.h
@@ -1,13 +1,13 @@
/*
* iodbcinst.h
*
- * $Id: iodbcinst.h,v 1.4 2009/04/09 13:22:12 source Exp $
+ * $Id$
*
* iODBC Installer defines
*
* The iODBC driver manager.
*
- * Copyright (C) 1999 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 e1927c4..a70f832 100644
--- a/libsrc/Wi/jso.c
+++ b/libsrc/Wi/jso.c
@@ -1,12 +1,12 @@
/*
* jso.c
*
- * $Id: jso.c,v 1.21.2.2 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -231,6 +231,19 @@ 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;
@@ -1110,8 +1123,8 @@ bif_jso_dbg_dump_rtti (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
sec_check_dba ((query_instance_t *)qst, "jso_dbg_dump_rtti");
#ifdef DEBUG
rtti = ((jso_rtti_t *)((void *)bif_arg (qst, args, 0, "jso_dbg_dump_rtti")))->jrtti_loop;
- rtti_of_name = gethash (rtti->jrtti_inst_iri, jso_rttis_of_names);
- rtti_of_self = gethash (rtti->jrtti_self, jso_rttis_of_structs);
+ rtti_of_name = (jso_rtti_t *)gethash (rtti->jrtti_inst_iri, jso_rttis_of_names);
+ rtti_of_self = (jso_rtti_t *)gethash (rtti->jrtti_self, jso_rttis_of_structs);
res = box_sprintf (1000,
"DV_CUSTOM (rtti STATUS=%s(%d), %s, self %s, IRI=%.300s, CLASS=%.300s)",
jso_status_string (rtti->jrtti_status), rtti->jrtti_status,
@@ -1138,28 +1151,28 @@ jso_triple_add (caddr_t * qst, caddr_t jsubj, caddr_t jpred, caddr_t jobj)
new_jsubj = jsubj = box_cast_to_UTF8_uname (qst, jsubj);
new_jpred = jpred = box_cast_to_UTF8_uname (qst, jpred);
new_jobj = jobj = box_cast_to_UTF8_uname (qst, jobj);
- jso_single_subj = gethash (jsubj, jso_triple_subjs);
+ jso_single_subj = (dk_hash_t *)gethash (jsubj, jso_triple_subjs);
if (NULL == jso_single_subj)
{
jso_single_subj = hash_table_allocate (13);
sethash (new_jsubj, jso_triple_subjs, jso_single_subj);
new_jsubj = NULL;
}
- jso_single_pred = gethash (jpred, jso_triple_preds);
+ jso_single_pred = (dk_hash_t *)gethash (jpred, jso_triple_preds);
if (NULL == jso_single_pred)
{
jso_single_pred = hash_table_allocate (251);
sethash (new_jpred, jso_triple_preds, jso_single_pred);
new_jpred = NULL;
}
- jso_single_obj = gethash (jobj, jso_triple_objs);
+ jso_single_obj = (dk_hash_t *)gethash (jobj, jso_triple_objs);
if (NULL == jso_single_obj)
{
jso_single_obj = hash_table_allocate (13);
sethash (new_jobj, jso_triple_objs, jso_single_obj);
new_jobj = NULL;
}
- jso_objs = gethash (jpred, jso_single_subj);
+ jso_objs = (dk_set_t)gethash (jpred, jso_single_subj);
#ifdef DEBUG
if (jso_objs != gethash (jsubj, jso_single_pred))
GPF_T1 ("jso_triple_add(): gethash (jpred, gethash (jsubj, jso_triple_subjs)) != gethash (jsubj, gethash (jpred, jso_triple_preds))");
@@ -1173,7 +1186,7 @@ jso_triple_add (caddr_t * qst, caddr_t jsubj, caddr_t jpred, caddr_t jobj)
sethash (jpred, jso_single_subj, jso_objs);
sethash (jsubj, jso_single_pred, jso_objs);
}
- jso_subjs = gethash (jpred, jso_single_obj);
+ jso_subjs = (dk_set_t)gethash (jpred, jso_single_obj);
if (NULL == dk_set_member (jso_subjs, jsubj))
{
if (NULL == new_jsubj)
@@ -1188,6 +1201,105 @@ jso_triple_add (caddr_t * qst, caddr_t jsubj, caddr_t jpred, caddr_t jobj)
return 0;
}
+
+int
+jso_triples_del_impl (caddr_t jsubj, caddr_t jpred, caddr_t jobj)
+{
+ dk_hash_t *jso_single_subj = NULL;
+ dk_hash_t *jso_single_pred = NULL;
+ dk_hash_t *jso_single_obj = NULL;
+ dk_set_t jso_objs;
+ dk_set_t jso_subjs;
+ if (NULL != jsubj)
+ {
+ jso_single_subj = (dk_hash_t *)gethash (jsubj, jso_triple_subjs);
+ if (NULL == jso_single_subj)
+ return 0;
+ }
+ if (NULL != jpred)
+ {
+ jso_single_pred = (dk_hash_t *)gethash (jpred, jso_triple_preds);
+ if (NULL == jso_single_pred)
+ return 0;
+ }
+ if (NULL != jobj)
+ {
+ jso_single_obj = (dk_hash_t *)gethash (jobj, jso_triple_objs);
+ if (NULL == jso_single_obj)
+ return 0;
+ }
+ if ((NULL != jsubj) && (NULL != jpred) && (NULL != jobj))
+ {
+ jso_objs = (dk_set_t)gethash (jpred, jso_single_subj);
+ if (!dk_set_delete (&jso_objs, jobj))
+ return 0;
+ sethash (jpred, jso_single_subj, jso_objs);
+ sethash (jsubj, jso_single_pred, jso_objs);
+ jso_subjs = (dk_set_t)gethash (jpred, jso_single_obj);
+ dk_set_delete (&jso_objs, jobj);
+ sethash (jpred, jso_single_obj, jso_subjs);
+ return 1;
+ }
+ if ((NULL != jsubj) && (NULL != jpred))
+ {
+ int res = 0;
+ jso_objs = (dk_set_t)gethash (jpred, jso_single_subj);
+ if (NULL == jso_objs)
+ return 0;
+ remhash (jpred, jso_single_subj);
+ remhash (jsubj, jso_single_pred);
+ while (NULL != (jobj = (caddr_t)dk_set_pop (&jso_objs)))
+ {
+ jso_single_obj = (dk_hash_t *)gethash (jobj, jso_triple_objs);
+ jso_subjs = (dk_set_t)gethash (jpred, jso_single_obj);
+ dk_set_delete (&jso_objs, jobj);
+ sethash (jpred, jso_single_obj, jso_subjs);
+ res++;
+ }
+ return res;
+ }
+ if (((NULL != jsubj) || (NULL != jobj)) && (NULL == jpred))
+ {
+ int ctr, res = 0;
+ caddr_t *preds = (caddr_t *)hash_list_keys ((NULL != jsubj) ? jso_single_subj : jso_single_obj);
+ DO_BOX_FAST (caddr_t, p, ctr, preds)
+ {
+ res += jso_triples_del_impl (jsubj, p, jobj);
+ }
+ END_DO_BOX_FAST;
+ dk_free_box ((caddr_t)preds);
+ return res;
+ }
+ if (NULL != jpred)
+ {
+ int ctr, res = 0;
+ caddr_t *subjs = (caddr_t *)hash_list_keys (jso_single_pred);
+ DO_BOX_FAST (caddr_t, s, ctr, subjs)
+ {
+ res += jso_triples_del_impl (s, jpred, jobj);
+ }
+ END_DO_BOX_FAST;
+ dk_free_box ((caddr_t)subjs);
+ return res;
+ }
+ return -1; /* For combinations that are not yet supported */
+}
+
+caddr_t
+jso_triples_del (caddr_t * qst, caddr_t jsubj, caddr_t jpred, caddr_t jobj)
+{
+ int res;
+ caddr_t tmp_jsubj = ((NULL == jsubj) ? NULL : box_cast_to_UTF8_uname (qst, jsubj));
+ caddr_t tmp_jpred = ((NULL == jpred) ? NULL : box_cast_to_UTF8_uname (qst, jpred));
+ caddr_t tmp_jobj = ((NULL == jobj) ? NULL : box_cast_to_UTF8_uname (qst, jobj));
+ res = jso_triples_del_impl (tmp_jsubj, tmp_jpred, tmp_jobj);
+ dk_free_box (tmp_jsubj);
+ dk_free_box (tmp_jpred);
+ dk_free_box (tmp_jobj);
+ return ((0 > res) ? NEW_DB_NULL : box_num (res));
+}
+
+
caddr_t *
jso_triple_get_objs_impl (caddr_t * qst, caddr_t jsubj, caddr_t jpred, dk_hash_t *top_hash)
{
@@ -1196,14 +1308,14 @@ jso_triple_get_objs_impl (caddr_t * qst, caddr_t jsubj, caddr_t jpred, dk_hash_t
caddr_t *res;
int ctr, len;
jsubj = box_cast_to_UTF8_uname (qst, jsubj);
- jso_single_subj = gethash (jsubj, top_hash);
+ jso_single_subj = (dk_hash_t *)gethash (jsubj, top_hash);
if (NULL == jso_single_subj)
{
dk_free_box (jsubj);
return (caddr_t *)list (0);
}
jpred = box_cast_to_UTF8_uname (qst, jpred);
- jso_objs = gethash (jpred, jso_single_subj);
+ jso_objs = (dk_set_t)gethash (jpred, jso_single_subj);
if (NULL == jso_objs)
{
dk_free_box (jsubj);
@@ -1215,7 +1327,7 @@ jso_triple_get_objs_impl (caddr_t * qst, caddr_t jsubj, caddr_t jpred, dk_hash_t
ctr = 0;
while (NULL != jso_objs)
{
- res[ctr++] = box_copy (jso_objs->data);
+ res[ctr++] = box_copy ((caddr_t)(jso_objs->data));
jso_objs = jso_objs->next;
}
return res;
@@ -1244,6 +1356,15 @@ bif_jso_triple_add (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
}
caddr_t
+bif_jso_triples_del (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+{
+ caddr_t jsubj = bif_string_or_uname_or_wide_or_null_arg (qst, args, 0, "jso_triples_del");
+ caddr_t jpred = bif_string_or_uname_or_wide_or_null_arg (qst, args, 1, "jso_triples_del");
+ caddr_t jobj = bif_string_or_uname_or_wide_or_null_arg (qst, args, 2, "jso_triples_del");
+ return jso_triples_del (qst, jsubj, jpred, jobj);
+}
+
+caddr_t
bif_jso_triple_get_objs (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t jsubj = bif_string_or_wide_or_uname_arg (qst, args, 0, "jso_triple_get_objs");
@@ -1432,6 +1553,7 @@ void jso_init ()
bif_define ("jso_proplist", bif_jso_proplist);
bif_define ("jso_dbg_dump_rtti", bif_jso_dbg_dump_rtti);
bif_define ("jso_triple_add", bif_jso_triple_add);
+ bif_define ("jso_triples_del", bif_jso_triples_del);
bif_define ("jso_triple_get_objs", bif_jso_triple_get_objs);
bif_define ("jso_triple_get_subjs", bif_jso_triple_get_subjs);
bif_define ("jso_triple_list", bif_jso_triple_list);
diff --git a/libsrc/Wi/jso.h b/libsrc/Wi/jso.h
index 1020124..cd5b979 100644
--- a/libsrc/Wi/jso.h
+++ b/libsrc/Wi/jso.h
@@ -1,12 +1,12 @@
/*
* jso.h
*
- * $Id: jso.h,v 1.12.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -139,6 +139,7 @@ extern dk_hash_t *jso_rttis_of_structs; /*!< Similar to jso_rttis_of_names but k
/* Part 2. A small storage of triples that are not preset properties of objects. */
extern caddr_t jso_triple_add (caddr_t * qst, caddr_t jsubj, caddr_t jpred, caddr_t jobj);
+extern caddr_t jso_triples_del (caddr_t * qst, caddr_t jsubj, caddr_t jpred, caddr_t jobj);
extern caddr_t *jso_triple_get_objs (caddr_t * qst, caddr_t jsubj, caddr_t jpred);
extern caddr_t *jso_triple_get_subjs (caddr_t * qst, caddr_t jpred, caddr_t jobj);
diff --git a/libsrc/Wi/jso_reformat.awk b/libsrc/Wi/jso_reformat.awk
index 26b79fb..fec2ca2 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.1 2009/04/18 21:55:12 source Exp $
+# $Id$
#
# Embeds SQL code into a C file
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/libsrc/Wi/json.l b/libsrc/Wi/json.l
index 9302cd3..80ded00 100644
--- a/libsrc/Wi/json.l
+++ b/libsrc/Wi/json.l
@@ -1,10 +1,10 @@
/*
- * $Id: json.l,v 1.5.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -43,40 +43,54 @@ extern caddr_t spar_strliteral (struct sparp_s *sparp, const char *strg, int str
extern int json_line;
%}
-%x STRLIT
+%x JSON_SQ
+%x JSON_DQ
+JSON_SQ_PLAIN ([^\\''\r\n\t])
+JSON_DQ_PLAIN ([^\\""\r\n\t])
+JSON_ECHAR ([\\]([bfnrt\\""''/]|("u"{HEX}{HEX}{HEX}{HEX})))
+S_NL ((\r\n)|(\n\r)|\n|\r)
HEX ([0-9A-Fa-f])
%%
-<INITIAL>"{" { return OBJ_BEGIN; }
-<INITIAL>"}" { return OBJ_END; }
-<INITIAL>"[" { return ARR_BEGIN; }
-<INITIAL>"]" { return ARR_END; }
-<INITIAL>":" { return COLON; }
-<INITIAL>"," { return COMMA; }
-<INITIAL>"\""[^\\\"\n\r\t]* { yymore(); BEGIN(STRLIT); }
-
-<INITIAL>"\""[^\\\"\n\r\t]*"\"" {
- jsonyylval.box = t_box_dv_short_nchars (jsonyytext+1, strlen (jsonyytext)-2);
- return STRING;
- }
+<INITIAL>"{" { return JSON_OBJ_BEGIN; }
+<INITIAL>"}" { return JSON_OBJ_END; }
+<INITIAL>"[" { return JSON_ARR_BEGIN; }
+<INITIAL>"]" { return JSON_ARR_END; }
+<INITIAL>":" { return JSON_COLON; }
+<INITIAL>"," { return JSON_COMMA; }
+
+<INITIAL>['']({JSON_SQ_PLAIN}*)[''] { jsonyylval.box = t_box_dv_short_nchars (jsonyytext + 1, jsonyyleng - 2); return JSON_SQSTRING; }
+<INITIAL>[""]({JSON_DQ_PLAIN}*)[""] { jsonyylval.box = t_box_dv_short_nchars (jsonyytext + 1, jsonyyleng - 2); return JSON_DQSTRING; }
+
+<INITIAL>['']({JSON_SQ_PLAIN}*) { yymore(); BEGIN(JSON_SQ); }
+<INITIAL>[""]({JSON_DQ_PLAIN}*) { yymore(); BEGIN(JSON_DQ); }
-<STRLIT>[^\\\"\n\r\t]*"\"" {
+<JSON_SQ>({JSON_SQ_PLAIN}*)[''] {
BEGIN(INITIAL);
jsonyylval.box = spar_strliteral (NULL /* no sparp for JSON_LITERAL */, jsonyytext, 0, 1);
- return STRING;
+ return JSON_SQSTRING;
}
+<JSON_DQ>({JSON_DQ_PLAIN}*)[""] {
+ BEGIN(INITIAL);
+ jsonyylval.box = spar_strliteral (NULL /* no sparp for JSON_LITERAL */, jsonyytext, 0, 1);
+ return JSON_DQSTRING;
+ }
+
+<JSON_SQ>{JSON_SQ_PLAIN}+ { yymore (); }
+<JSON_DQ>{JSON_DQ_PLAIN}+ { yymore (); }
-<STRLIT>"\\"([\\\"bfnrt/]|(u{HEX}{HEX}{HEX}{HEX})) { yymore (); }
-<STRLIT>[^\\\"\n\r\t]* { yymore (); }
-<STRLIT>[\n\r] { jsonyyerror ("line break is not allowed in JSON strings"); }
-<STRLIT>"\t" { jsonyyerror ("tab character is not allowed in JSON strings"); }
-<STRLIT>"\\" { jsonyyerror ("invalid escaping sequence in a string"); }
+<JSON_SQ,JSON_DQ>{JSON_ECHAR} { yymore (); }
+<JSON_SQ,JSON_DQ>[\n\r] { jsonyyerror ("line break is not allowed in JSON strings"); }
+<JSON_SQ,JSON_DQ>"\t" { jsonyyerror ("tab character is not allowed in JSON strings"); }
+<JSON_SQ,JSON_DQ>"\\" { jsonyyerror ("invalid escaping sequence in a string"); }
-<INITIAL>true { return TRUE_L; }
-<INITIAL>false { return FALSE_L; }
-<INITIAL>null { return NULL_L; }
+<INITIAL>true { return JSON_TRUE_L; }
+<INITIAL>false { return JSON_FALSE_L; }
+<INITIAL>null { return JSON_NULL_L; }
+<INITIAL>[A-Za-z_]([A-Za-z0-9_]*) { jsonyylval.box = t_box_dv_short_nchars (jsonyytext, jsonyyleng);
+ return JSON_NAME; }
<INITIAL>"-"?(([1-9][0-9]*)|"0") {
caddr_t err = NULL;
@@ -87,7 +101,7 @@ HEX ([0-9A-Fa-f])
jsonyyerror ("bad integer constant");
}
jsonyylval.box = t_box_num_and_zero (n);
- return NUMBER;
+ return JSON_NUMBER;
}
<INITIAL>"-"?[0-9]+"."[0-9]* |
<INITIAL>"-"?"."[0-9]+ {
@@ -96,25 +110,25 @@ HEX ([0-9A-Fa-f])
if (NUMERIC_STS_SUCCESS == rc)
{
jsonyylval.box = (caddr_t) num;
- return NUMBER;
+ return JSON_NUMBER;
}
jsonyylval.box = t_box_double (atof (jsonyytext));
- return NUMBER;
+ return JSON_NUMBER;
}
<INITIAL>"-"?[0-9]+[eE][+-]?[0-9]+ |
<INITIAL>"-"?[0-9]+"."[0-9]+[eE][+-]?[0-9]+ |
<INITIAL>"-"?"."[0-9]+[eE][+-]?[0-9]+ {
jsonyylval.box = t_box_double (atof (jsonyytext));
- return NUMBER;
+ return JSON_NUMBER;
}
<INITIAL>[+-]?[0-9.eE+-]+ { jsonyyerror ("syntax error in number"); }
-<INITIAL>[ \r\t]+
-<INITIAL>"#"([^\n]*)[\n] { json_line++; }
-<INITIAL>[\n] { json_line++; }
-<INITIAL>. { jsonyyerror ("character outside string"); }
+<INITIAL>[ \t]+
+<INITIAL>"#"([^\r\n]*){S_NL} { json_line++; }
+<INITIAL>{S_NL} { json_line++; }
+<INITIAL>. { jsonyyerror ("invalid character"); }
%%
diff --git a/libsrc/Wi/json.y b/libsrc/Wi/json.y
index c279278..2ce4aa8 100644
--- a/libsrc/Wi/json.y
+++ b/libsrc/Wi/json.y
@@ -1,10 +1,10 @@
/*
- * $Id: json.y,v 1.9.2.2 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -39,31 +39,31 @@ int json_line;
%union {
caddr_t box;
caddr_t *list;
- dk_set_t set;
+ dk_set_t revlist;
}
-%token OBJ_BEGIN
-%token OBJ_END
-%token ARR_BEGIN
-%token ARR_END
-%token COLON
-%token COMMA
-
-%token <box> STRING
-%token <box> NUMBER
-%token <box> TRUE_L
-%token <box> FALSE_L
-%token <box> NULL_L
+%token JSON_OBJ_BEGIN
+%token JSON_OBJ_END
+%token JSON_ARR_BEGIN
+%token JSON_ARR_END
+%token JSON_COLON
+%token JSON_COMMA
+
+%token <box> JSON_NAME
+%token <box> JSON_SQSTRING
+%token <box> JSON_DQSTRING
+%token <box> JSON_NUMBER
+%token <box> JSON_TRUE_L
+%token <box> JSON_FALSE_L
+%token <box> JSON_NULL_L
%type <box> object
-%type <list> jsondoc
-%type <set> members
-%type <set> members_opt
-%type <set> pair
+%type <box> jsondoc
+%type <revlist> members
+%type <box> name_or_str
%type <box> value
%type <box> array
-%type <set> value_list
-%type <set> value_list_opt
+%type <revlist> value_list
%%
@@ -72,61 +72,50 @@ jsondoc
| array { json_tree = (caddr_t *) $1; }
;
-object : OBJ_BEGIN members_opt OBJ_END {
- $$ = (caddr_t)t_list_to_array (
- t_NCONC (
- /* header */
- t_CONS(t_alloc_box (0, DV_COMPOSITE),
- t_CONS (t_box_string ("structure"), NULL))
- ,
- $2
- )
- );
- }
+object
+ : JSON_OBJ_BEGIN JSON_OBJ_END { $$ = (caddr_t)t_list (2, t_alloc_box (0, DV_COMPOSITE), t_box_string ("structure")); }
+ | JSON_OBJ_BEGIN members JSON_OBJ_END { $$ = (caddr_t)t_revlist_to_array ($2); }
;
-members_opt
- : /* empty */ { $$ = NULL; }
- | members
- ;
-
-members : pair { $$ = $1; }
- | members COMMA pair { $$ = t_NCONC ($1, $3); }
- | members COMMA error { jsonyyerror ("pair of field name and value is expected after ','"); }
+members
+ : name_or_str JSON_COLON value {
+ dk_set_t res = NULL;
+ t_set_push (&res, t_alloc_box (0, DV_COMPOSITE));
+ t_set_push (&res, t_box_string ("structure"));
+ t_set_push (&res, $1);
+ t_set_push (&res, $3);
+ $$ = res; }
+ | members JSON_COMMA name_or_str JSON_COLON value {
+ $$ = $1; t_set_push (&($$), $3); t_set_push (&($$), $5); }
+ | members JSON_COMMA error { jsonyyerror ("pair of field name and value is expected after ','"); }
;
-pair
- : STRING COLON value {
- dk_set_t set = NULL;
- t_set_push (&set, $3);
- t_set_push (&set, $1);
- $$ = set; }
- | STRING COLON error { jsonyyerror ("value is expected after ':'"); }
- | STRING error { jsonyyerror ("colon is expected after field name"); }
+name_or_str
+ : JSON_NAME
+ | JSON_SQSTRING
+ | JSON_DQSTRING
;
-
array
- : ARR_BEGIN value_list_opt ARR_END { $$ = (caddr_t)t_list_to_array ($2);}
- ;
-
-value_list_opt
- : /* empty */ { $$ = NULL; }
- | value_list
+ : JSON_ARR_BEGIN JSON_ARR_END { $$ = (caddr_t)t_alloc_list (0);}
+ | JSON_ARR_BEGIN value_list JSON_ARR_END { $$ = (caddr_t)t_revlist_to_array ($2);}
;
value_list
- : value { $$ = t_CONS ($1, NULL); }
- | value_list COMMA value { $$ = t_NCONC ($1, t_CONS($3, NULL)); }
- | value_list COMMA error { jsonyyerror ("array member is expected after ','"); }
+ : value { $$ = NULL; t_set_push (&($$), $1); }
+ | value_list JSON_COMMA value { $$ = $1; t_set_push (&($$), $3); }
+ | value_list JSON_COMMA error { jsonyyerror ("array member is expected after ','"); }
;
-value : STRING { $$ = $1; }
- | NUMBER { $$ = $1; }
- | TRUE_L { $$ = t_box_num (1); }
- | FALSE_L { $$ = t_box_num (0); }
- | NULL_L { $$ = t_alloc_box (0, DV_DB_NULL); }
+value
+ : JSON_NAME { jsonyyerror ("name without quotes is misused as a value"); }
+ | JSON_SQSTRING { $$ = $1; }
+ | JSON_DQSTRING { $$ = $1; }
+ | JSON_NUMBER { $$ = $1; }
+ | JSON_TRUE_L { $$ = t_box_num (1); }
+ | JSON_FALSE_L { $$ = t_box_num (0); }
+ | JSON_NULL_L { $$ = t_alloc_box (0, DV_DB_NULL); }
| object { $$ = $1; }
| array { $$ = $1; }
;
diff --git a/libsrc/Wi/json_l.c b/libsrc/Wi/json_l.c
index 634160d..8a3f5ce 100644
--- a/libsrc/Wi/json_l.c
+++ b/libsrc/Wi/json_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 29
-#define YY_END_OF_BUFFER 30
+#define YY_NUM_RULES 34
+#define YY_END_OF_BUFFER 35
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -389,16 +389,17 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[72] =
+static yyconst flex_int16_t yy_accept[88] =
{ 0,
- 0, 0, 11, 11, 30, 28, 25, 27, 7, 28,
- 24, 6, 24, 24, 18, 18, 5, 24, 3, 4,
- 28, 28, 28, 1, 2, 11, 13, 12, 9, 14,
- 25, 7, 8, 0, 26, 24, 24, 18, 18, 20,
- 19, 24, 24, 18, 0, 0, 0, 11, 9, 10,
- 0, 24, 19, 24, 21, 0, 0, 0, 0, 24,
- 23, 24, 0, 17, 15, 0, 24, 22, 16, 0,
- 0
+ 0, 0, 0, 0, 0, 0, 35, 33, 30, 32,
+ 32, 10, 33, 9, 29, 6, 29, 29, 23, 23,
+ 5, 22, 22, 3, 4, 22, 22, 22, 1, 2,
+ 13, 17, 16, 11, 18, 14, 12, 30, 32, 10,
+ 8, 0, 31, 31, 9, 7, 29, 29, 23, 23,
+ 25, 24, 29, 29, 23, 22, 22, 22, 22, 22,
+ 13, 11, 15, 0, 14, 12, 31, 29, 24, 29,
+ 26, 22, 22, 22, 0, 29, 28, 29, 22, 21,
+ 19, 0, 29, 27, 20, 0, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -406,17 +407,17 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 5, 1, 6, 7, 1, 1, 1, 1, 1,
- 1, 1, 8, 9, 10, 11, 12, 13, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 15, 1, 1,
- 1, 1, 1, 1, 16, 16, 16, 16, 17, 16,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 18, 19, 20, 1, 1, 1, 21, 22, 16, 16,
-
- 23, 24, 1, 1, 1, 1, 1, 25, 1, 26,
- 1, 1, 1, 27, 28, 29, 30, 1, 1, 1,
- 1, 1, 31, 1, 32, 1, 1, 1, 1, 1,
+ 1, 5, 1, 6, 7, 1, 1, 1, 8, 1,
+ 1, 1, 9, 10, 11, 12, 13, 14, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 16, 1, 1,
+ 1, 1, 1, 1, 17, 17, 17, 17, 18, 17,
+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+ 20, 21, 22, 1, 19, 1, 23, 24, 17, 17,
+
+ 25, 26, 19, 19, 19, 19, 19, 27, 19, 28,
+ 19, 19, 19, 29, 30, 31, 32, 19, 19, 19,
+ 19, 19, 33, 1, 34, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -433,96 +434,118 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[33] =
+static yyconst flex_int32_t yy_meta[35] =
{ 0,
- 1, 2, 2, 2, 1, 3, 1, 4, 1, 4,
- 4, 3, 5, 5, 1, 6, 5, 1, 7, 1,
- 6, 8, 5, 8, 1, 3, 3, 1, 3, 3,
- 1, 1
+ 1, 2, 2, 2, 1, 3, 1, 3, 4, 1,
+ 4, 4, 3, 5, 5, 1, 6, 5, 7, 1,
+ 8, 1, 6, 9, 5, 9, 7, 10, 10, 7,
+ 10, 10, 1, 1
} ;
-static yyconst flex_int16_t yy_base[82] =
+static yyconst flex_int16_t yy_base[102] =
{ 0,
- 0, 0, 31, 49, 98, 189, 34, 189, 91, 93,
- 0, 189, 29, 31, 61, 33, 189, 0, 189, 189,
- 74, 63, 65, 189, 189, 83, 189, 189, 189, 56,
- 52, 77, 189, 79, 189, 0, 0, 0, 0, 41,
- 35, 0, 77, 0, 56, 55, 49, 71, 189, 189,
- 0, 93, 42, 47, 0, 48, 48, 47, 0, 49,
- 0, 109, 18, 189, 189, 0, 53, 0, 189, 0,
- 189, 132, 140, 148, 153, 158, 164, 168, 172, 176,
- 180
+ 0, 0, 33, 36, 43, 49, 132, 262, 54, 126,
+ 126, 120, 39, 115, 0, 262, 46, 48, 62, 51,
+ 262, 0, 79, 262, 262, 97, 87, 89, 262, 262,
+ 109, 262, 262, 262, 84, 109, 262, 67, 262, 107,
+ 262, 64, 108, 106, 98, 262, 0, 0, 0, 0,
+ 57, 64, 0, 96, 0, 0, 0, 76, 75, 69,
+ 92, 262, 262, 0, 83, 262, 262, 113, 67, 69,
+ 0, 56, 54, 25, 0, 81, 0, 130, 23, 0,
+ 0, 0, 84, 0, 0, 0, 262, 155, 165, 175,
+ 185, 195, 202, 203, 213, 221, 231, 237, 242, 247,
+
+ 252
} ;
-static yyconst flex_int16_t yy_def[82] =
+static yyconst flex_int16_t yy_def[102] =
{ 0,
- 71, 1, 72, 72, 71, 71, 71, 71, 73, 74,
- 75, 71, 75, 75, 71, 15, 71, 75, 71, 71,
- 71, 71, 71, 71, 71, 76, 71, 71, 71, 77,
- 71, 73, 71, 74, 71, 75, 14, 15, 16, 14,
- 14, 15, 71, 16, 71, 71, 71, 76, 71, 71,
- 78, 71, 41, 41, 54, 71, 71, 71, 79, 54,
- 60, 71, 71, 71, 71, 80, 60, 67, 71, 81,
- 0, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71
+ 87, 1, 88, 88, 89, 89, 87, 87, 87, 87,
+ 87, 90, 91, 92, 93, 87, 93, 93, 87, 19,
+ 87, 94, 94, 87, 87, 94, 94, 94, 87, 87,
+ 95, 87, 87, 87, 96, 97, 87, 87, 87, 90,
+ 87, 91, 87, 87, 92, 87, 93, 18, 19, 20,
+ 18, 18, 19, 87, 20, 94, 23, 94, 94, 94,
+ 95, 87, 87, 98, 97, 87, 87, 87, 52, 52,
+ 70, 94, 94, 94, 99, 70, 76, 87, 94, 94,
+ 94, 100, 76, 83, 94, 101, 0, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+ 87
} ;
-static yyconst flex_int16_t yy_nxt[222] =
+static yyconst flex_int16_t yy_nxt[297] =
{ 0,
- 6, 7, 8, 7, 7, 9, 10, 11, 12, 13,
- 14, 6, 15, 16, 17, 6, 18, 19, 6, 20,
- 6, 6, 18, 21, 6, 22, 6, 6, 23, 6,
- 24, 25, 27, 28, 28, 31, 29, 31, 31, 37,
- 69, 38, 39, 40, 40, 44, 44, 53, 53, 30,
- 27, 28, 28, 31, 29, 31, 31, 52, 62, 55,
- 55, 61, 61, 52, 62, 68, 68, 30, 36, 65,
- 36, 41, 64, 42, 42, 63, 49, 43, 58, 57,
- 56, 35, 33, 43, 54, 51, 54, 36, 49, 55,
- 55, 47, 46, 36, 45, 35, 33, 71, 71, 36,
-
- 60, 71, 60, 36, 71, 61, 61, 71, 71, 36,
- 71, 71, 71, 71, 71, 36, 67, 71, 67, 36,
- 71, 68, 68, 71, 71, 36, 71, 71, 71, 71,
- 71, 36, 26, 26, 26, 26, 26, 26, 26, 26,
- 32, 71, 32, 32, 32, 32, 71, 32, 34, 34,
- 34, 34, 34, 34, 34, 34, 36, 36, 48, 71,
- 48, 48, 48, 48, 71, 48, 50, 71, 71, 71,
- 50, 50, 59, 59, 71, 59, 66, 66, 71, 66,
- 70, 70, 71, 70, 50, 50, 71, 50, 5, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71
+ 8, 9, 10, 11, 9, 12, 13, 14, 15, 16,
+ 17, 18, 8, 19, 20, 21, 22, 23, 22, 24,
+ 8, 25, 22, 22, 23, 26, 22, 27, 22, 22,
+ 28, 22, 29, 30, 32, 33, 33, 32, 33, 33,
+ 34, 43, 44, 34, 32, 33, 33, 85, 37, 81,
+ 32, 33, 33, 35, 37, 38, 35, 48, 38, 49,
+ 50, 51, 51, 35, 55, 55, 43, 44, 38, 35,
+ 47, 38, 47, 52, 68, 53, 53, 69, 69, 54,
+ 80, 68, 71, 71, 78, 79, 54, 47, 66, 47,
+ 47, 78, 57, 57, 77, 77, 57, 84, 84, 62,
+
+ 74, 73, 72, 57, 70, 46, 70, 47, 67, 71,
+ 71, 67, 41, 47, 66, 64, 62, 60, 59, 58,
+ 47, 76, 46, 76, 47, 41, 77, 77, 39, 39,
+ 47, 87, 87, 87, 87, 87, 87, 47, 83, 87,
+ 83, 47, 87, 84, 84, 87, 87, 47, 87, 87,
+ 87, 87, 87, 87, 47, 31, 31, 31, 31, 31,
+ 31, 31, 31, 31, 31, 36, 36, 36, 36, 36,
+ 36, 36, 36, 36, 36, 40, 87, 40, 40, 40,
+ 40, 40, 87, 40, 40, 42, 42, 42, 42, 42,
+ 42, 42, 42, 42, 42, 45, 87, 45, 45, 45,
+
+ 45, 45, 87, 45, 45, 47, 47, 56, 56, 56,
+ 87, 56, 56, 61, 87, 61, 61, 61, 61, 61,
+ 87, 61, 61, 63, 87, 87, 87, 87, 63, 63,
+ 63, 65, 87, 65, 65, 65, 65, 65, 87, 65,
+ 65, 75, 75, 87, 87, 75, 82, 82, 87, 87,
+ 82, 86, 86, 87, 87, 86, 63, 63, 87, 87,
+ 63, 7, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87
+
} ;
-static yyconst flex_int16_t yy_chk[222] =
+static yyconst flex_int16_t yy_chk[297] =
{ 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, 3, 3, 3, 7, 3, 7, 7, 13,
- 63, 13, 13, 14, 14, 16, 16, 41, 41, 3,
- 4, 4, 4, 31, 4, 31, 31, 40, 53, 54,
- 54, 60, 60, 40, 53, 67, 67, 4, 15, 58,
- 15, 15, 57, 15, 15, 56, 48, 15, 47, 46,
- 45, 34, 32, 15, 43, 30, 43, 43, 26, 43,
- 43, 23, 22, 43, 21, 10, 9, 5, 0, 43,
-
- 52, 0, 52, 52, 0, 52, 52, 0, 0, 52,
- 0, 0, 0, 0, 0, 52, 62, 0, 62, 62,
- 0, 62, 62, 0, 0, 62, 0, 0, 0, 0,
- 0, 62, 72, 72, 72, 72, 72, 72, 72, 72,
- 73, 0, 73, 73, 73, 73, 0, 73, 74, 74,
- 74, 74, 74, 74, 74, 74, 75, 75, 76, 0,
- 76, 76, 76, 76, 0, 76, 77, 0, 0, 0,
- 77, 77, 78, 78, 0, 78, 79, 79, 0, 79,
- 80, 80, 0, 80, 81, 81, 0, 81, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71
+ 1, 1, 1, 1, 3, 3, 3, 4, 4, 4,
+ 3, 13, 13, 4, 5, 5, 5, 79, 5, 74,
+ 6, 6, 6, 3, 6, 9, 4, 17, 9, 17,
+ 17, 18, 18, 5, 20, 20, 42, 42, 38, 6,
+ 19, 38, 19, 19, 51, 19, 19, 52, 52, 19,
+ 73, 51, 70, 70, 69, 72, 19, 23, 65, 23,
+ 23, 69, 23, 23, 76, 76, 23, 83, 83, 61,
+
+ 60, 59, 58, 23, 54, 45, 54, 54, 44, 54,
+ 54, 43, 40, 54, 36, 35, 31, 28, 27, 26,
+ 54, 68, 14, 68, 68, 12, 68, 68, 11, 10,
+ 68, 7, 0, 0, 0, 0, 0, 68, 78, 0,
+ 78, 78, 0, 78, 78, 0, 0, 78, 0, 0,
+ 0, 0, 0, 0, 78, 88, 88, 88, 88, 88,
+ 88, 88, 88, 88, 88, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 90, 0, 90, 90, 90,
+ 90, 90, 0, 90, 90, 91, 91, 91, 91, 91,
+ 91, 91, 91, 91, 91, 92, 0, 92, 92, 92,
+
+ 92, 92, 0, 92, 92, 93, 93, 94, 94, 94,
+ 0, 94, 94, 95, 0, 95, 95, 95, 95, 95,
+ 0, 95, 95, 96, 0, 0, 0, 0, 96, 96,
+ 96, 97, 0, 97, 97, 97, 97, 97, 0, 97,
+ 97, 98, 98, 0, 0, 98, 99, 99, 0, 0,
+ 99, 100, 100, 0, 0, 100, 101, 101, 0, 0,
+ 101, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87
+
} ;
static yy_state_type yy_last_accepting_state;
@@ -543,12 +566,12 @@ static int yy_more_len = 0;
char *jsonyytext;
#line 1 "./json.l"
/*
- * $Id: json.l,v 1.5.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -582,10 +605,12 @@ struct sparp_s; /* forward */
extern caddr_t spar_strliteral (struct sparp_s *sparp, const char *strg, int strg_is_long, int is_json);
extern int json_line;
-#line 586 "json_l.c"
+
+#line 610 "json_l.c"
#define INITIAL 0
-#define STRLIT 1
+#define JSON_SQ 1
+#define JSON_DQ 2
#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
@@ -681,7 +706,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( jsonyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -763,10 +788,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 50 "./json.l"
+#line 55 "./json.l"
-#line 770 "json_l.c"
+#line 795 "json_l.c"
if ( !(yy_init) )
{
@@ -825,13 +850,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 >= 72 )
+ if ( yy_current_state >= 88 )
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 != 71 );
+ while ( yy_current_state != 87 );
yy_cp = (yy_last_accepting_cpos);
yy_current_state = (yy_last_accepting_state);
@@ -853,100 +878,127 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 52 "./json.l"
-{ return OBJ_BEGIN; }
+#line 57 "./json.l"
+{ return JSON_OBJ_BEGIN; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 53 "./json.l"
-{ return OBJ_END; }
+#line 58 "./json.l"
+{ return JSON_OBJ_END; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 54 "./json.l"
-{ return ARR_BEGIN; }
+#line 59 "./json.l"
+{ return JSON_ARR_BEGIN; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 55 "./json.l"
-{ return ARR_END; }
+#line 60 "./json.l"
+{ return JSON_ARR_END; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 56 "./json.l"
-{ return COLON; }
+#line 61 "./json.l"
+{ return JSON_COLON; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 57 "./json.l"
-{ return COMMA; }
+#line 62 "./json.l"
+{ return JSON_COMMA; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 58 "./json.l"
-{ yymore(); BEGIN(STRLIT); }
+#line 64 "./json.l"
+{ jsonyylval.box = t_box_dv_short_nchars (jsonyytext + 1, jsonyyleng - 2); return JSON_SQSTRING; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 60 "./json.l"
-{
- jsonyylval.box = t_box_dv_short_nchars (jsonyytext+1, strlen (jsonyytext)-2);
- return STRING;
- }
+#line 65 "./json.l"
+{ jsonyylval.box = t_box_dv_short_nchars (jsonyytext + 1, jsonyyleng - 2); return JSON_DQSTRING; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 65 "./json.l"
-{
- BEGIN(INITIAL);
- jsonyylval.box = spar_strliteral (NULL /* no sparp for JSON_LITERAL */, jsonyytext, 0, 1);
- return STRING;
- }
+#line 67 "./json.l"
+{ yymore(); BEGIN(JSON_SQ); }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 71 "./json.l"
-{ yymore (); }
+#line 68 "./json.l"
+{ yymore(); BEGIN(JSON_DQ); }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 72 "./json.l"
-{ yymore (); }
+#line 70 "./json.l"
+{
+ BEGIN(INITIAL);
+ jsonyylval.box = spar_strliteral (NULL /* no sparp for JSON_LITERAL */, jsonyytext, 0, 1);
+ return JSON_SQSTRING;
+ }
YY_BREAK
case 12:
-/* rule 12 can match eol */
YY_RULE_SETUP
-#line 73 "./json.l"
-{ jsonyyerror ("line break is not allowed in JSON strings"); }
+#line 75 "./json.l"
+{
+ BEGIN(INITIAL);
+ jsonyylval.box = spar_strliteral (NULL /* no sparp for JSON_LITERAL */, jsonyytext, 0, 1);
+ return JSON_DQSTRING;
+ }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 74 "./json.l"
-{ jsonyyerror ("tab character is not allowed in JSON strings"); }
+#line 81 "./json.l"
+{ yymore (); }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 75 "./json.l"
-{ jsonyyerror ("invalid escaping sequence in a string"); }
+#line 82 "./json.l"
+{ yymore (); }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 77 "./json.l"
-{ return TRUE_L; }
+#line 84 "./json.l"
+{ yymore (); }
YY_BREAK
case 16:
+/* rule 16 can match eol */
YY_RULE_SETUP
-#line 78 "./json.l"
-{ return FALSE_L; }
+#line 85 "./json.l"
+{ jsonyyerror ("line break is not allowed in JSON strings"); }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 79 "./json.l"
-{ return NULL_L; }
+#line 86 "./json.l"
+{ jsonyyerror ("tab character is not allowed in JSON strings"); }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 81 "./json.l"
+#line 87 "./json.l"
+{ jsonyyerror ("invalid escaping sequence in a string"); }
+ YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 89 "./json.l"
+{ return JSON_TRUE_L; }
+ YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 90 "./json.l"
+{ return JSON_FALSE_L; }
+ YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 91 "./json.l"
+{ return JSON_NULL_L; }
+ YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 92 "./json.l"
+{ jsonyylval.box = t_box_dv_short_nchars (jsonyytext, jsonyyleng);
+ return JSON_NAME; }
+ YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 95 "./json.l"
{
caddr_t err = NULL;
int64 n = safe_atoi (jsonyytext, &err);
@@ -956,73 +1008,74 @@ YY_RULE_SETUP
jsonyyerror ("bad integer constant");
}
jsonyylval.box = t_box_num_and_zero (n);
- return NUMBER;
+ return JSON_NUMBER;
}
YY_BREAK
-case 19:
-#line 93 "./json.l"
-case 20:
+case 24:
+#line 107 "./json.l"
+case 25:
YY_RULE_SETUP
-#line 93 "./json.l"
+#line 107 "./json.l"
{
numeric_t num = t_numeric_allocate ();
int rc = numeric_from_string (num, jsonyytext);
if (NUMERIC_STS_SUCCESS == rc)
{
jsonyylval.box = (caddr_t) num;
- return NUMBER;
+ return JSON_NUMBER;
}
jsonyylval.box = t_box_double (atof (jsonyytext));
- return NUMBER;
+ return JSON_NUMBER;
}
YY_BREAK
-case 21:
-#line 106 "./json.l"
-case 22:
-#line 107 "./json.l"
-case 23:
+case 26:
+#line 120 "./json.l"
+case 27:
+#line 121 "./json.l"
+case 28:
YY_RULE_SETUP
-#line 107 "./json.l"
+#line 121 "./json.l"
{
jsonyylval.box = t_box_double (atof (jsonyytext));
- return NUMBER;
+ return JSON_NUMBER;
}
YY_BREAK
-case 24:
+case 29:
YY_RULE_SETUP
-#line 112 "./json.l"
+#line 126 "./json.l"
{ jsonyyerror ("syntax error in number"); }
YY_BREAK
-case 25:
+case 30:
YY_RULE_SETUP
-#line 114 "./json.l"
+#line 128 "./json.l"
YY_BREAK
-case 26:
-/* rule 26 can match eol */
+case 31:
+/* rule 31 can match eol */
YY_RULE_SETUP
-#line 115 "./json.l"
+#line 129 "./json.l"
{ json_line++; }
YY_BREAK
-case 27:
-/* rule 27 can match eol */
+case 32:
+/* rule 32 can match eol */
YY_RULE_SETUP
-#line 116 "./json.l"
+#line 130 "./json.l"
{ json_line++; }
YY_BREAK
-case 28:
+case 33:
YY_RULE_SETUP
-#line 117 "./json.l"
-{ jsonyyerror ("character outside string"); }
+#line 131 "./json.l"
+{ jsonyyerror ("invalid character"); }
YY_BREAK
-case 29:
+case 34:
YY_RULE_SETUP
-#line 120 "./json.l"
+#line 134 "./json.l"
ECHO;
YY_BREAK
-#line 1024 "json_l.c"
+#line 1076 "json_l.c"
case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(STRLIT):
+case YY_STATE_EOF(JSON_SQ):
+case YY_STATE_EOF(JSON_DQ):
yyterminate();
case YY_END_OF_BUFFER:
@@ -1314,7 +1367,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 >= 72 )
+ if ( yy_current_state >= 88 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1342,11 +1395,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 >= 72 )
+ if ( yy_current_state >= 88 )
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 == 71);
+ yy_is_jam = (yy_current_state == 87);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -1979,7 +2032,7 @@ void jsonyyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 120 "./json.l"
+#line 134 "./json.l"
diff --git a/libsrc/Wi/json_p.c b/libsrc/Wi/json_p.c
index fe7c098..dabe3f6 100644
--- a/libsrc/Wi/json_p.c
+++ b/libsrc/Wi/json_p.c
@@ -74,31 +74,35 @@
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
- OBJ_BEGIN = 258,
- OBJ_END = 259,
- ARR_BEGIN = 260,
- ARR_END = 261,
- COLON = 262,
- COMMA = 263,
- STRING = 264,
- NUMBER = 265,
- TRUE_L = 266,
- FALSE_L = 267,
- NULL_L = 268
+ JSON_OBJ_BEGIN = 258,
+ JSON_OBJ_END = 259,
+ JSON_ARR_BEGIN = 260,
+ JSON_ARR_END = 261,
+ JSON_COLON = 262,
+ JSON_COMMA = 263,
+ JSON_NAME = 264,
+ JSON_SQSTRING = 265,
+ JSON_DQSTRING = 266,
+ JSON_NUMBER = 267,
+ JSON_TRUE_L = 268,
+ JSON_FALSE_L = 269,
+ JSON_NULL_L = 270
};
#endif
/* Tokens. */
-#define OBJ_BEGIN 258
-#define OBJ_END 259
-#define ARR_BEGIN 260
-#define ARR_END 261
-#define COLON 262
-#define COMMA 263
-#define STRING 264
-#define NUMBER 265
-#define TRUE_L 266
-#define FALSE_L 267
-#define NULL_L 268
+#define JSON_OBJ_BEGIN 258
+#define JSON_OBJ_END 259
+#define JSON_ARR_BEGIN 260
+#define JSON_ARR_END 261
+#define JSON_COLON 262
+#define JSON_COMMA 263
+#define JSON_NAME 264
+#define JSON_SQSTRING 265
+#define JSON_DQSTRING 266
+#define JSON_NUMBER 267
+#define JSON_TRUE_L 268
+#define JSON_FALSE_L 269
+#define JSON_NULL_L 270
@@ -144,10 +148,10 @@ typedef union YYSTYPE
{
caddr_t box;
caddr_t *list;
- dk_set_t set;
+ dk_set_t revlist;
}
-/* Line 187 of yacc.c. */
-#line 151 "json_p.c"
+/* Line 193 of yacc.c. */
+#line 155 "json_p.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -160,7 +164,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 164 "json_p.c"
+#line 168 "json_p.c"
#ifdef short
# undef short
@@ -210,7 +214,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -373,22 +377,22 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 20
+#define YYFINAL 24
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 39
+#define YYLAST 55
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 14
+#define YYNTOKENS 16
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 10
+#define YYNNTS 8
/* YYNRULES -- Number of rules. */
#define YYNRULES 25
/* YYNRULES -- Number of states. */
-#define YYNSTATES 33
+#define YYNSTATES 37
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 268
+#define YYMAXUTOK 270
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -422,7 +426,8 @@ static const yytype_uint8 yytranslate[] =
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15
};
#if YYDEBUG
@@ -430,29 +435,29 @@ static const yytype_uint8 yytranslate[] =
YYRHS. */
static const yytype_uint8 yyprhs[] =
{
- 0, 0, 3, 5, 7, 11, 12, 14, 16, 20,
- 24, 28, 32, 35, 39, 40, 42, 44, 48, 52,
- 54, 56, 58, 60, 62, 64
+ 0, 0, 3, 5, 7, 10, 14, 18, 24, 28,
+ 30, 32, 34, 37, 41, 43, 47, 51, 53, 55,
+ 57, 59, 61, 63, 65, 67
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 15, 0, -1, 16, -1, 20, -1, 3, 17, 4,
- -1, -1, 18, -1, 19, -1, 18, 8, 19, -1,
- 18, 8, 1, -1, 9, 7, 23, -1, 9, 7,
- 1, -1, 9, 1, -1, 5, 21, 6, -1, -1,
- 22, -1, 23, -1, 22, 8, 23, -1, 22, 8,
- 1, -1, 9, -1, 10, -1, 11, -1, 12, -1,
- 13, -1, 16, -1, 20, -1
+ 17, 0, -1, 18, -1, 21, -1, 3, 4, -1,
+ 3, 19, 4, -1, 20, 7, 23, -1, 19, 8,
+ 20, 7, 23, -1, 19, 8, 1, -1, 9, -1,
+ 10, -1, 11, -1, 5, 6, -1, 5, 22, 6,
+ -1, 23, -1, 22, 8, 23, -1, 22, 8, 1,
+ -1, 9, -1, 10, -1, 11, -1, 12, -1, 13,
+ -1, 14, -1, 15, -1, 18, -1, 21, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
- 0, 71, 71, 72, 75, 89, 90, 93, 94, 95,
- 99, 104, 105, 110, 114, 115, 119, 120, 121, 125,
- 126, 127, 128, 129, 130, 131
+ 0, 71, 71, 72, 76, 77, 81, 88, 90, 94,
+ 95, 96, 100, 101, 105, 106, 107, 112, 113, 114,
+ 115, 116, 117, 118, 119, 120
};
#endif
@@ -461,10 +466,11 @@ static const yytype_uint8 yyrline[] =
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
- "$end", "error", "$undefined", "OBJ_BEGIN", "OBJ_END", "ARR_BEGIN",
- "ARR_END", "COLON", "COMMA", "STRING", "NUMBER", "TRUE_L", "FALSE_L",
- "NULL_L", "$accept", "jsondoc", "object", "members_opt", "members",
- "pair", "array", "value_list_opt", "value_list", "value", 0
+ "$end", "error", "$undefined", "JSON_OBJ_BEGIN", "JSON_OBJ_END",
+ "JSON_ARR_BEGIN", "JSON_ARR_END", "JSON_COLON", "JSON_COMMA",
+ "JSON_NAME", "JSON_SQSTRING", "JSON_DQSTRING", "JSON_NUMBER",
+ "JSON_TRUE_L", "JSON_FALSE_L", "JSON_NULL_L", "$accept", "jsondoc",
+ "object", "members", "name_or_str", "array", "value_list", "value", 0
};
#endif
@@ -474,23 +480,23 @@ static const char *const yytname[] =
static const yytype_uint16 yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268
+ 265, 266, 267, 268, 269, 270
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 14, 15, 15, 16, 17, 17, 18, 18, 18,
- 19, 19, 19, 20, 21, 21, 22, 22, 22, 23,
+ 0, 16, 17, 17, 18, 18, 19, 19, 19, 20,
+ 20, 20, 21, 21, 22, 22, 22, 23, 23, 23,
23, 23, 23, 23, 23, 23
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
- 0, 2, 1, 1, 3, 0, 1, 1, 3, 3,
- 3, 3, 2, 3, 0, 1, 1, 3, 3, 1,
+ 0, 2, 1, 1, 2, 3, 3, 5, 3, 1,
+ 1, 1, 2, 3, 1, 3, 3, 1, 1, 1,
1, 1, 1, 1, 1, 1
};
@@ -499,33 +505,33 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 5, 14, 0, 2, 3, 0, 0, 6, 7,
- 19, 20, 21, 22, 23, 24, 25, 0, 15, 16,
- 1, 12, 0, 4, 0, 13, 0, 11, 10, 9,
- 8, 18, 17
+ 0, 0, 0, 0, 2, 3, 4, 9, 10, 11,
+ 0, 0, 12, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 0, 14, 1, 5, 0, 0, 13, 0,
+ 8, 0, 6, 16, 15, 0, 7
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int8 yydefgoto[] =
{
- -1, 3, 15, 7, 8, 9, 16, 17, 18, 19
+ -1, 3, 20, 10, 11, 21, 22, 23
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -7
+#define YYPACT_NINF -8
static const yytype_int8 yypact[] =
{
- 24, -4, 23, 3, -7, -7, 0, 14, 11, -7,
- -7, -7, -7, -7, -7, -7, -7, 25, 22, -7,
- -7, -7, -1, -7, 5, -7, 12, -7, -7, -7,
- -7, -7, -7
+ 26, 44, 12, 3, -8, -8, -8, -8, -8, -8,
+ -3, 0, -8, -8, -8, -8, -8, -8, -8, -8,
+ -8, -8, 39, -8, -8, -8, 32, 25, -8, -1,
+ -8, 9, -8, -8, -8, 25, -8
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -7, -7, 37, -7, -7, 15, 38, -7, -7, -6
+ -8, -8, 6, -8, -7, 20, -8, 17
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -535,28 +541,32 @@ static const yytype_int8 yypgoto[] =
#define YYTABLE_NINF -1
static const yytype_uint8 yytable[] =
{
- 27, 21, 1, 20, 2, 6, 29, 22, 10, 11,
- 12, 13, 14, 31, 6, 1, 28, 2, 23, 24,
- 32, 10, 11, 12, 13, 14, 1, 1, 2, 2,
- 26, 25, 10, 11, 12, 13, 14, 4, 5, 30
+ 33, 25, 1, 24, 2, 26, 4, 27, 13, 14,
+ 15, 16, 17, 18, 19, 1, 35, 2, 12, 31,
+ 5, 13, 14, 15, 16, 17, 18, 19, 1, 1,
+ 2, 2, 0, 30, 13, 14, 15, 16, 17, 18,
+ 19, 7, 8, 9, 32, 28, 34, 29, 6, 0,
+ 0, 0, 36, 7, 8, 9
};
-static const yytype_uint8 yycheck[] =
+static const yytype_int8 yycheck[] =
{
- 1, 1, 3, 0, 5, 9, 1, 7, 9, 10,
- 11, 12, 13, 1, 9, 3, 22, 5, 4, 8,
- 26, 9, 10, 11, 12, 13, 3, 3, 5, 5,
- 8, 6, 9, 10, 11, 12, 13, 0, 0, 24
+ 1, 4, 3, 0, 5, 8, 0, 7, 9, 10,
+ 11, 12, 13, 14, 15, 3, 7, 5, 6, 26,
+ 0, 9, 10, 11, 12, 13, 14, 15, 3, 3,
+ 5, 5, -1, 1, 9, 10, 11, 12, 13, 14,
+ 15, 9, 10, 11, 27, 6, 29, 8, 4, -1,
+ -1, -1, 35, 9, 10, 11
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 3, 5, 15, 16, 20, 9, 17, 18, 19,
- 9, 10, 11, 12, 13, 16, 20, 21, 22, 23,
- 0, 1, 7, 4, 8, 6, 8, 1, 23, 1,
- 19, 1, 23
+ 0, 3, 5, 17, 18, 21, 4, 9, 10, 11,
+ 19, 20, 6, 9, 10, 11, 12, 13, 14, 15,
+ 18, 21, 22, 23, 0, 4, 8, 7, 6, 8,
+ 1, 20, 23, 1, 23, 7, 23
};
#define yyerrok (yyerrstatus = 0)
@@ -630,7 +640,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -1381,122 +1391,110 @@ yyreduce:
break;
case 4:
-#line 75 "./json.y"
- {
- (yyval.box) = (caddr_t)t_list_to_array (
- t_NCONC (
- /* header */
- t_CONS(t_alloc_box (0, DV_COMPOSITE),
- t_CONS (t_box_string ("structure"), NULL))
- ,
- (yyvsp[(2) - (3)].set)
- )
- );
- }
+#line 76 "./json.y"
+ { (yyval.box) = (caddr_t)t_list (2, t_alloc_box (0, DV_COMPOSITE), t_box_string ("structure")); }
break;
case 5:
-#line 89 "./json.y"
- { (yyval.set) = NULL; }
- break;
-
- case 7:
-#line 93 "./json.y"
- { (yyval.set) = (yyvsp[(1) - (1)].set); }
- break;
-
- case 8:
-#line 94 "./json.y"
- { (yyval.set) = t_NCONC ((yyvsp[(1) - (3)].set), (yyvsp[(3) - (3)].set)); }
+#line 77 "./json.y"
+ { (yyval.box) = (caddr_t)t_revlist_to_array ((yyvsp[(2) - (3)].revlist)); }
break;
- case 9:
-#line 95 "./json.y"
- { jsonyyerror ("pair of field name and value is expected after ','"); }
+ case 6:
+#line 81 "./json.y"
+ {
+ dk_set_t res = NULL;
+ t_set_push (&res, t_alloc_box (0, DV_COMPOSITE));
+ t_set_push (&res, t_box_string ("structure"));
+ t_set_push (&res, (yyvsp[(1) - (3)].box));
+ t_set_push (&res, (yyvsp[(3) - (3)].box));
+ (yyval.revlist) = res; }
break;
- case 10:
-#line 99 "./json.y"
+ case 7:
+#line 88 "./json.y"
{
- dk_set_t set = NULL;
- t_set_push (&set, (yyvsp[(3) - (3)].box));
- t_set_push (&set, (yyvsp[(1) - (3)].box));
- (yyval.set) = set; }
+ (yyval.revlist) = (yyvsp[(1) - (5)].revlist); t_set_push (&((yyval.revlist)), (yyvsp[(3) - (5)].box)); t_set_push (&((yyval.revlist)), (yyvsp[(5) - (5)].box)); }
break;
- case 11:
-#line 104 "./json.y"
- { jsonyyerror ("value is expected after ':'"); }
+ case 8:
+#line 90 "./json.y"
+ { jsonyyerror ("pair of field name and value is expected after ','"); }
break;
case 12:
-#line 105 "./json.y"
- { jsonyyerror ("colon is expected after field name"); }
+#line 100 "./json.y"
+ { (yyval.box) = (caddr_t)t_alloc_list (0);}
break;
case 13:
-#line 110 "./json.y"
- { (yyval.box) = (caddr_t)t_list_to_array ((yyvsp[(2) - (3)].set));}
+#line 101 "./json.y"
+ { (yyval.box) = (caddr_t)t_revlist_to_array ((yyvsp[(2) - (3)].revlist));}
break;
case 14:
-#line 114 "./json.y"
- { (yyval.set) = NULL; }
+#line 105 "./json.y"
+ { (yyval.revlist) = NULL; t_set_push (&((yyval.revlist)), (yyvsp[(1) - (1)].box)); }
+ break;
+
+ case 15:
+#line 106 "./json.y"
+ { (yyval.revlist) = (yyvsp[(1) - (3)].revlist); t_set_push (&((yyval.revlist)), (yyvsp[(3) - (3)].box)); }
break;
case 16:
-#line 119 "./json.y"
- { (yyval.set) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
+#line 107 "./json.y"
+ { jsonyyerror ("array member is expected after ','"); }
break;
case 17:
-#line 120 "./json.y"
- { (yyval.set) = t_NCONC ((yyvsp[(1) - (3)].set), t_CONS((yyvsp[(3) - (3)].box), NULL)); }
+#line 112 "./json.y"
+ { jsonyyerror ("name without quotes is misused as a value"); }
break;
case 18:
-#line 121 "./json.y"
- { jsonyyerror ("array member is expected after ','"); }
+#line 113 "./json.y"
+ { (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 19:
-#line 125 "./json.y"
+#line 114 "./json.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 20:
-#line 126 "./json.y"
+#line 115 "./json.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 21:
-#line 127 "./json.y"
+#line 116 "./json.y"
{ (yyval.box) = t_box_num (1); }
break;
case 22:
-#line 128 "./json.y"
+#line 117 "./json.y"
{ (yyval.box) = t_box_num (0); }
break;
case 23:
-#line 129 "./json.y"
+#line 118 "./json.y"
{ (yyval.box) = t_alloc_box (0, DV_DB_NULL); }
break;
case 24:
-#line 130 "./json.y"
+#line 119 "./json.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 25:
-#line 131 "./json.y"
+#line 120 "./json.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
/* Line 1267 of yacc.c. */
-#line 1500 "json_p.c"
+#line 1498 "json_p.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1710,7 +1708,7 @@ yyreturn:
}
-#line 134 "./json.y"
+#line 123 "./json.y"
#define YY_INPUT(buf, res, max) \
diff --git a/libsrc/Wi/json_p.h b/libsrc/Wi/json_p.h
index f7edc3d..6c41a86 100644
--- a/libsrc/Wi/json_p.h
+++ b/libsrc/Wi/json_p.h
@@ -39,31 +39,35 @@
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
- OBJ_BEGIN = 258,
- OBJ_END = 259,
- ARR_BEGIN = 260,
- ARR_END = 261,
- COLON = 262,
- COMMA = 263,
- STRING = 264,
- NUMBER = 265,
- TRUE_L = 266,
- FALSE_L = 267,
- NULL_L = 268
+ JSON_OBJ_BEGIN = 258,
+ JSON_OBJ_END = 259,
+ JSON_ARR_BEGIN = 260,
+ JSON_ARR_END = 261,
+ JSON_COLON = 262,
+ JSON_COMMA = 263,
+ JSON_NAME = 264,
+ JSON_SQSTRING = 265,
+ JSON_DQSTRING = 266,
+ JSON_NUMBER = 267,
+ JSON_TRUE_L = 268,
+ JSON_FALSE_L = 269,
+ JSON_NULL_L = 270
};
#endif
/* Tokens. */
-#define OBJ_BEGIN 258
-#define OBJ_END 259
-#define ARR_BEGIN 260
-#define ARR_END 261
-#define COLON 262
-#define COMMA 263
-#define STRING 264
-#define NUMBER 265
-#define TRUE_L 266
-#define FALSE_L 267
-#define NULL_L 268
+#define JSON_OBJ_BEGIN 258
+#define JSON_OBJ_END 259
+#define JSON_ARR_BEGIN 260
+#define JSON_ARR_END 261
+#define JSON_COLON 262
+#define JSON_COMMA 263
+#define JSON_NAME 264
+#define JSON_SQSTRING 265
+#define JSON_DQSTRING 266
+#define JSON_NUMBER 267
+#define JSON_TRUE_L 268
+#define JSON_FALSE_L 269
+#define JSON_NULL_L 270
@@ -74,10 +78,10 @@ typedef union YYSTYPE
{
caddr_t box;
caddr_t *list;
- dk_set_t set;
+ dk_set_t revlist;
}
-/* Line 1489 of yacc.c. */
-#line 81 "json_p.h"
+/* Line 1529 of yacc.c. */
+#line 85 "json_p.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
diff --git a/libsrc/Wi/ksrvext.h b/libsrc/Wi/ksrvext.h
index bb9a25d..c16c9b6 100644
--- a/libsrc/Wi/ksrvext.h
+++ b/libsrc/Wi/ksrvext.h
@@ -1,14 +1,14 @@
/*
* ksrvext.h
*
- * $Id: ksrvext.h,v 1.9.2.6 2010/11/26 10:46:33 source Exp $
+ * $Id$
*
* Virtuoso Server Extension API
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/ksrvextphp.h b/libsrc/Wi/ksrvextphp.h
index d56c10a..4610843 100644
--- a/libsrc/Wi/ksrvextphp.h
+++ b/libsrc/Wi/ksrvextphp.h
@@ -1,10 +1,10 @@
/*
- * $Id: ksrvextphp.h,v 1.7.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/lisprdr.c b/libsrc/Wi/lisprdr.c
index 77f2984..b926e63 100644
--- a/libsrc/Wi/lisprdr.c
+++ b/libsrc/Wi/lisprdr.c
@@ -1,14 +1,14 @@
/*
* lisprdr.c
*
- * $Id: lisprdr.c,v 1.3.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* Reader for lisp expressions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/lisprdr.h b/libsrc/Wi/lisprdr.h
index d0dd4bd..3dabc56 100644
--- a/libsrc/Wi/lisprdr.h
+++ b/libsrc/Wi/lisprdr.h
@@ -1,14 +1,14 @@
/*
* lisprdr.h
*
- * $Id: lisprdr.h,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* Lisp Reader
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/list2.h b/libsrc/Wi/list2.h
index 06fccab..a6e44d0 100644
--- a/libsrc/Wi/list2.h
+++ b/libsrc/Wi/list2.h
@@ -1,14 +1,14 @@
/*
* list2.h
*
- * $Id: list2.h,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* Doubly linked list
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/list_lex_props.sh b/libsrc/Wi/list_lex_props.sh
index cbf458a..e4c8dd0 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.1 2009/04/18 21:55:12 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
diff --git a/libsrc/Wi/lock.c b/libsrc/Wi/lock.c
index 3497795..801a5d2 100644
--- a/libsrc/Wi/lock.c
+++ b/libsrc/Wi/lock.c
@@ -1,14 +1,14 @@
/*
* lock.c
*
- * $Id: lock.c,v 1.20.2.21 2011/04/20 15:12:41 source Exp $
+ * $Id$
*
* Locking concurrency control
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/log.c b/libsrc/Wi/log.c
index d989746..d3b079c 100644
--- a/libsrc/Wi/log.c
+++ b/libsrc/Wi/log.c
@@ -1,14 +1,14 @@
/*
* log.c
*
- * $Id: log.c,v 1.16.2.23 2011/10/13 11:09:41 source Exp $
+ * $Id$
*
* Transaction log write and recovery
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/log.h b/libsrc/Wi/log.h
index 20290a1..5e864ea 100644
--- a/libsrc/Wi/log.h
+++ b/libsrc/Wi/log.h
@@ -1,12 +1,12 @@
/*
* log.h
*
- * $Id: log.h,v 1.5.2.3 2010/05/12 12:24:29 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/ltrx.h b/libsrc/Wi/ltrx.h
index e98f94e..57e7731 100644
--- a/libsrc/Wi/ltrx.h
+++ b/libsrc/Wi/ltrx.h
@@ -1,14 +1,14 @@
/*
* ltrx.h
*
- * $Id: ltrx.h,v 1.14.2.10 2011/04/19 20:50:33 source Exp $
+ * $Id$
*
* Locking transaction structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/mail_cli.sql b/libsrc/Wi/mail_cli.sql
index a089f86..d76014a 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.2 2009/04/18 21:55:12 source Exp $
+-- $Id$
--
-- Virtuoso mail client function support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/map_schema.c b/libsrc/Wi/map_schema.c
index b018689..0f5d5f6 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.2 2010/02/18 10:57:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/map_schema.h b/libsrc/Wi/map_schema.h
index a92d4fe..a429258 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.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/meta.c b/libsrc/Wi/meta.c
index b44ef7d..97e3599 100644
--- a/libsrc/Wi/meta.c
+++ b/libsrc/Wi/meta.c
@@ -1,14 +1,14 @@
/*
* meta.c
*
- * $Id: meta.c,v 1.17.2.9 2011/05/02 08:24:32 source Exp $
+ * $Id$
*
* META
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/msdtc.h b/libsrc/Wi/msdtc.h
index 8ff848d..a46eceb 100644
--- a/libsrc/Wi/msdtc.h
+++ b/libsrc/Wi/msdtc.h
@@ -1,12 +1,12 @@
/*
* hosting.h
*
- * $Id: msdtc.h,v 1.3.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/mts.h b/libsrc/Wi/mts.h
index fa2c4e5..4f8596b 100644
--- a/libsrc/Wi/mts.h
+++ b/libsrc/Wi/mts.h
@@ -1,14 +1,14 @@
/*
* mts.h
*
- * $Id: mts.h,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* MTS related functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/mts_client.c b/libsrc/Wi/mts_client.c
index 9821d13..0c659ab 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.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/mts_client.h b/libsrc/Wi/mts_client.h
index 71327ea..88ea663 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.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/mts_com.cpp b/libsrc/Wi/mts_com.cpp
index 133ef97..f5fc898 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.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* MS DTC support
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/mts_com.h b/libsrc/Wi/mts_com.h
index 85df3fe..f3afee9 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.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/mtwrite.c b/libsrc/Wi/mtwrite.c
index d2c18bd..c1c9320 100644
--- a/libsrc/Wi/mtwrite.c
+++ b/libsrc/Wi/mtwrite.c
@@ -1,14 +1,14 @@
/*
* mtwrite.c
*
- * $Id: mtwrite.c,v 1.8.2.8 2010/03/08 12:04:12 source Exp $
+ * $Id$
*
* Manages buffer rings and paging to disk.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/mtx.cpp b/libsrc/Wi/mtx.cpp
index 6bdeb0d..9b1a880 100644
--- a/libsrc/Wi/mtx.cpp
+++ b/libsrc/Wi/mtx.cpp
@@ -1,14 +1,14 @@
/*
* mtx.cpp
*
- * $Id: mtx.cpp,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* MS DTC support
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/multibyte.c b/libsrc/Wi/multibyte.c
index 6dce82a..8f382ec 100644
--- a/libsrc/Wi/multibyte.c
+++ b/libsrc/Wi/multibyte.c
@@ -1,12 +1,12 @@
/*
* multibyte.c
*
- * $Id: multibyte.c,v 1.9.2.4 2010/01/12 12:19:47 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -261,7 +261,7 @@ box_read_long_wide_string (dk_session_t *session, dtp_t macro)
size_t
-wide_char_length_of_utf8_string (unsigned char *str, size_t utf8_length)
+wide_char_length_of_utf8_string (const unsigned char *str, size_t utf8_length)
{
virt_mbstate_t state;
memset (&state, 0, sizeof (virt_mbstate_t));
@@ -355,6 +355,20 @@ 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 b224e2c..14ba1f4 100644
--- a/libsrc/Wi/multibyte.h
+++ b/libsrc/Wi/multibyte.h
@@ -1,12 +1,12 @@
/*
* multibyte.h
*
- * $Id: multibyte.h,v 1.9.2.3 2010/01/12 12:19:47 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -28,6 +28,11 @@
#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];
@@ -47,6 +52,7 @@ 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);
@@ -69,7 +75,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 (unsigned char *str, size_t utf8_length);
+size_t wide_char_length_of_utf8_string (const 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);
@@ -95,6 +101,9 @@ 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 6b012ed..bd03a36 100644
--- a/libsrc/Wi/name.c
+++ b/libsrc/Wi/name.c
@@ -1,12 +1,12 @@
/*
* name.c
*
- * $Id: name.c,v 1.2.2.2 2010/02/18 10:57:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/neodisk.c b/libsrc/Wi/neodisk.c
index 1811e05..9391cac 100644
--- a/libsrc/Wi/neodisk.c
+++ b/libsrc/Wi/neodisk.c
@@ -1,14 +1,14 @@
/*
* neodisk.c
*
- * $Id: neodisk.c,v 1.19.2.23 2011/05/10 12:20:55 source Exp $
+ * $Id$
*
* Neodisk Checkpoint
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/nn_svr.sql b/libsrc/Wi/nn_svr.sql
index ebf7f0c..8f55e50 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.3 2011/09/28 17:01:16 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/nquad_p.c b/libsrc/Wi/nquad_p.c
index 69c5b1b..2532c73 100644
--- a/libsrc/Wi/nquad_p.c
+++ b/libsrc/Wi/nquad_p.c
@@ -103,24 +103,27 @@
_AT_of_L = 284,
_AT_prefix_L = 285,
_AT_this_L = 286,
- false_L = 287,
- true_L = 288,
- __TTL_PUNCT_END = 289,
- __TTL_NONPUNCT_START = 290,
- TURTLE_INTEGER = 291,
- TURTLE_DECIMAL = 292,
- TURTLE_DOUBLE = 293,
- TURTLE_STRING = 294,
- KEYWORD = 295,
- LANGTAG = 296,
- QNAME = 297,
- QNAME_NS = 298,
- VARIABLE = 299,
- BLANK_NODE_LABEL = 300,
- Q_IRI_REF = 301,
- _GARBAGE_BEFORE_DOT_WS = 302,
- TTL_RECOVERABLE_ERROR = 303,
- __NQUAD_NONPUNCT_END = 304
+ _MINUS_INF_L = 287,
+ INF_L = 288,
+ NaN_L = 289,
+ false_L = 290,
+ true_L = 291,
+ __TTL_PUNCT_END = 292,
+ __TTL_NONPUNCT_START = 293,
+ TURTLE_INTEGER = 294,
+ TURTLE_DECIMAL = 295,
+ TURTLE_DOUBLE = 296,
+ TURTLE_STRING = 297,
+ KEYWORD = 298,
+ LANGTAG = 299,
+ QNAME = 300,
+ QNAME_NS = 301,
+ VARIABLE = 302,
+ BLANK_NODE_LABEL = 303,
+ Q_IRI_REF = 304,
+ _GARBAGE_BEFORE_DOT_WS = 305,
+ TTL_RECOVERABLE_ERROR = 306,
+ __NQUAD_NONPUNCT_END = 307
};
#endif
/* Tokens. */
@@ -153,24 +156,27 @@
#define _AT_of_L 284
#define _AT_prefix_L 285
#define _AT_this_L 286
-#define false_L 287
-#define true_L 288
-#define __TTL_PUNCT_END 289
-#define __TTL_NONPUNCT_START 290
-#define TURTLE_INTEGER 291
-#define TURTLE_DECIMAL 292
-#define TURTLE_DOUBLE 293
-#define TURTLE_STRING 294
-#define KEYWORD 295
-#define LANGTAG 296
-#define QNAME 297
-#define QNAME_NS 298
-#define VARIABLE 299
-#define BLANK_NODE_LABEL 300
-#define Q_IRI_REF 301
-#define _GARBAGE_BEFORE_DOT_WS 302
-#define TTL_RECOVERABLE_ERROR 303
-#define __NQUAD_NONPUNCT_END 304
+#define _MINUS_INF_L 287
+#define INF_L 288
+#define NaN_L 289
+#define false_L 290
+#define true_L 291
+#define __TTL_PUNCT_END 292
+#define __TTL_NONPUNCT_START 293
+#define TURTLE_INTEGER 294
+#define TURTLE_DECIMAL 295
+#define TURTLE_DOUBLE 296
+#define TURTLE_STRING 297
+#define KEYWORD 298
+#define LANGTAG 299
+#define QNAME 300
+#define QNAME_NS 301
+#define VARIABLE 302
+#define BLANK_NODE_LABEL 303
+#define Q_IRI_REF 304
+#define _GARBAGE_BEFORE_DOT_WS 305
+#define TTL_RECOVERABLE_ERROR 306
+#define __NQUAD_NONPUNCT_END 307
@@ -247,8 +253,8 @@ typedef union YYSTYPE
ptrlong token_type;
void *nothing;
}
-/* Line 187 of yacc.c. */
-#line 252 "nquad_p.c"
+/* Line 193 of yacc.c. */
+#line 258 "nquad_p.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -261,7 +267,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 265 "nquad_p.c"
+#line 271 "nquad_p.c"
#ifdef short
# undef short
@@ -311,7 +317,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -476,20 +482,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 154
+#define YYLAST 160
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 50
+#define YYNTOKENS 53
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 19
/* YYNRULES -- Number of rules. */
-#define YYNRULES 75
+#define YYNRULES 78
/* YYNRULES -- Number of states. */
-#define YYNSTATES 111
+#define YYNSTATES 117
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 304
+#define YYMAXUTOK 307
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -527,7 +533,7 @@ static const yytype_uint8 yytranslate[] =
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
+ 45, 46, 47, 48, 49, 50, 51, 52
};
#if YYDEBUG
@@ -541,47 +547,47 @@ static const yytype_uint8 yyprhs[] =
79, 81, 83, 85, 87, 89, 91, 95, 99, 101,
103, 105, 107, 109, 111, 113, 116, 120, 121, 125,
126, 130, 131, 135, 138, 141, 144, 147, 150, 153,
- 157, 158, 164, 167, 172, 173, 179, 184, 185, 187,
- 189, 191, 193, 195, 197, 199
+ 156, 159, 162, 166, 167, 173, 176, 181, 182, 188,
+ 193, 194, 196, 198, 200, 202, 204, 206, 208
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 51, 0, -1, -1, 51, 52, -1, -1, 28, 53,
- 56, 54, -1, 25, 46, 54, -1, 30, 43, 46,
- 54, -1, 30, 7, 46, 54, -1, 55, 58, 60,
- 9, -1, 55, 58, 47, 9, -1, 55, 47, 9,
- -1, 47, 9, -1, 1, -1, -1, 9, -1, 68,
- -1, 44, -1, 67, -1, 59, -1, 48, -1, 57,
- -1, 56, 8, 57, -1, 42, -1, 24, -1, 26,
- -1, 27, -1, 29, -1, 31, -1, 68, -1, 44,
- -1, 24, -1, 19, -1, 21, -1, 14, -1, 45,
- -1, 27, 68, 29, -1, 27, 44, 29, -1, 22,
- -1, 33, -1, 32, -1, 36, -1, 37, -1, 38,
- -1, 39, -1, 39, 41, -1, 39, 6, 68, -1,
- -1, 68, 61, 66, -1, -1, 44, 62, 66, -1,
- -1, 67, 63, 66, -1, 33, 66, -1, 32, 66,
- -1, 36, 66, -1, 37, 66, -1, 38, 66, -1,
- 39, 66, -1, 39, 41, 66, -1, -1, 39, 6,
- 68, 64, 66, -1, 48, 66, -1, 39, 6, 48,
- 66, -1, -1, 48, 6, 68, 65, 66, -1, 48,
- 6, 48, 66, -1, -1, 68, -1, 48, -1, 47,
- -1, 45, -1, 14, -1, 46, -1, 42, -1, 43,
- -1
+ 54, 0, -1, -1, 54, 55, -1, -1, 28, 56,
+ 59, 57, -1, 25, 49, 57, -1, 30, 46, 49,
+ 57, -1, 30, 7, 49, 57, -1, 58, 61, 63,
+ 9, -1, 58, 61, 50, 9, -1, 58, 50, 9,
+ -1, 50, 9, -1, 1, -1, -1, 9, -1, 71,
+ -1, 47, -1, 70, -1, 62, -1, 51, -1, 60,
+ -1, 59, 8, 60, -1, 45, -1, 24, -1, 26,
+ -1, 27, -1, 29, -1, 31, -1, 71, -1, 47,
+ -1, 24, -1, 19, -1, 21, -1, 14, -1, 48,
+ -1, 27, 71, 29, -1, 27, 47, 29, -1, 22,
+ -1, 36, -1, 35, -1, 39, -1, 40, -1, 41,
+ -1, 42, -1, 42, 44, -1, 42, 6, 71, -1,
+ -1, 71, 64, 69, -1, -1, 47, 65, 69, -1,
+ -1, 70, 66, 69, -1, 36, 69, -1, 35, 69,
+ -1, 39, 69, -1, 40, 69, -1, 41, 69, -1,
+ 34, 69, -1, 33, 69, -1, 32, 69, -1, 42,
+ 69, -1, 42, 44, 69, -1, -1, 42, 6, 71,
+ 67, 69, -1, 51, 69, -1, 42, 6, 51, 69,
+ -1, -1, 51, 6, 71, 68, 69, -1, 51, 6,
+ 51, 69, -1, -1, 71, -1, 51, -1, 50, -1,
+ 48, -1, 14, -1, 49, -1, 45, -1, 46, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 149, 149, 151, 155, 155, 156, 157, 176, 179,
- 180, 181, 182, 183, 186, 188, 192, 195, 197, 199,
- 202, 207, 208, 212, 213, 214, 215, 216, 217, 221,
- 222, 223, 224, 225, 226, 230, 239, 240, 241, 245,
- 246, 247, 248, 249, 250, 251, 252, 258, 258, 264,
- 264, 269, 269, 274, 276, 278, 282, 286, 290, 294,
- 300, 300, 308, 309, 312, 312, 316, 320, 325, 332,
- 333, 338, 345, 349, 356, 364
+ 0, 152, 152, 154, 158, 158, 159, 160, 179, 182,
+ 183, 184, 185, 186, 189, 191, 195, 198, 200, 202,
+ 205, 210, 211, 215, 216, 217, 218, 219, 220, 224,
+ 225, 226, 227, 228, 229, 233, 242, 243, 244, 248,
+ 249, 250, 251, 252, 253, 254, 255, 261, 261, 267,
+ 267, 272, 272, 277, 279, 281, 285, 289, 293, 299,
+ 305, 311, 315, 321, 321, 329, 330, 333, 333, 337,
+ 341, 346, 353, 354, 359, 366, 370, 377, 385
};
#endif
@@ -595,15 +601,15 @@ static const char *const yytname[] =
"_LBRA_TOP_TRIG", "_LPAR", "_LSQBRA", "_LSQBRA_RSQBRA", "_RBRA", "_RPAR",
"_RSQBRA", "_SEMI", "_EQ", "_EQ_TOP_TRIG", "_EQ_GT", "_LT_EQ", "_BANG",
"_AT_a_L", "_AT_base_L", "_AT_has_L", "_AT_is_L", "_AT_keywords_L",
- "_AT_of_L", "_AT_prefix_L", "_AT_this_L", "false_L", "true_L",
- "__TTL_PUNCT_END", "__TTL_NONPUNCT_START", "TURTLE_INTEGER",
- "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
+ "_AT_of_L", "_AT_prefix_L", "_AT_this_L", "_MINUS_INF_L", "INF_L",
+ "NaN_L", "false_L", "true_L", "__TTL_PUNCT_END", "__TTL_NONPUNCT_START",
+ "TURTLE_INTEGER", "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
};
#endif
@@ -616,21 +622,22 @@ static const yytype_uint16 yytoknum[] =
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304
+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+ 305, 306, 307
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 50, 51, 51, 53, 52, 52, 52, 52, 52,
- 52, 52, 52, 52, 54, 54, 55, 55, 55, 55,
- 55, 56, 56, 57, 57, 57, 57, 57, 57, 58,
- 58, 58, 58, 58, 58, 58, 58, 58, 58, 59,
- 59, 59, 59, 59, 59, 59, 59, 61, 60, 62,
- 60, 63, 60, 60, 60, 60, 60, 60, 60, 60,
- 64, 60, 60, 60, 65, 60, 60, 66, 66, 66,
- 66, 67, 67, 68, 68, 68
+ 0, 53, 54, 54, 56, 55, 55, 55, 55, 55,
+ 55, 55, 55, 55, 57, 57, 58, 58, 58, 58,
+ 58, 59, 59, 60, 60, 60, 60, 60, 60, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 62,
+ 62, 62, 62, 62, 62, 62, 62, 64, 63, 65,
+ 63, 66, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 67, 63, 63, 63, 68, 63, 63,
+ 69, 69, 69, 69, 70, 70, 71, 71, 71
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -641,9 +648,9 @@ static const yytype_uint8 yyr2[] =
1, 1, 3, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 3, 3, 1, 1,
1, 1, 1, 1, 1, 2, 3, 0, 3, 0,
- 3, 0, 3, 2, 2, 2, 2, 2, 2, 3,
- 0, 5, 2, 4, 0, 5, 4, 0, 1, 1,
- 1, 1, 1, 1, 1, 1
+ 3, 0, 3, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 3, 0, 5, 2, 4, 0, 5, 4,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -651,51 +658,51 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 2, 0, 1, 13, 72, 0, 4, 0, 40, 39,
- 41, 42, 43, 44, 74, 75, 17, 71, 73, 0,
+ 2, 0, 1, 13, 75, 0, 4, 0, 40, 39,
+ 41, 42, 43, 44, 77, 78, 17, 74, 76, 0,
20, 3, 0, 19, 18, 16, 14, 0, 0, 0,
0, 45, 12, 34, 32, 33, 38, 31, 0, 30,
35, 0, 0, 29, 15, 6, 24, 25, 26, 27,
28, 23, 14, 21, 14, 14, 46, 0, 0, 11,
- 67, 67, 67, 67, 67, 67, 49, 0, 67, 0,
- 51, 47, 0, 5, 8, 7, 37, 36, 70, 69,
- 54, 68, 53, 55, 56, 57, 0, 67, 58, 67,
- 10, 0, 62, 9, 67, 67, 22, 67, 60, 59,
- 50, 67, 64, 52, 48, 63, 67, 66, 67, 61,
- 65
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 49,
+ 0, 70, 0, 51, 47, 0, 5, 8, 7, 37,
+ 36, 73, 72, 60, 71, 59, 58, 54, 53, 55,
+ 56, 57, 0, 70, 61, 70, 10, 0, 65, 9,
+ 70, 70, 22, 70, 63, 62, 50, 70, 67, 52,
+ 48, 66, 70, 69, 70, 64, 68
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int8 yydefgoto[] =
{
-1, 1, 21, 27, 45, 22, 52, 53, 42, 23,
- 69, 95, 89, 94, 106, 108, 80, 24, 81
+ 72, 101, 95, 100, 112, 114, 83, 24, 84
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -42
+#define YYPACT_NINF -58
static const yytype_int8 yypact[] =
{
- -42, 6, -42, -42, -42, -38, -42, -3, -42, -42,
- -42, -42, -42, 5, -42, -42, -42, -42, -42, 7,
- -42, -42, 107, -42, -42, -42, 9, -12, -23, -14,
- -33, -42, -42, -42, -42, -42, -42, -42, -41, -42,
- -42, 24, 72, -42, -42, -42, -42, -42, -42, -42,
- -42, -42, 18, -42, 9, 9, -42, 31, 32, -42,
- 50, 50, 50, 50, 50, 22, -42, 38, 29, 57,
- -42, -42, -12, -42, -42, -42, -42, -42, -42, -42,
- -42, -42, -42, -42, -42, -42, 36, 50, -42, 50,
- -42, 90, -42, -42, 50, 50, -42, 50, -42, -42,
- -42, 50, -42, -42, -42, -42, 50, -42, 50, -42,
- -42
+ -58, 26, -58, -58, -58, -37, -58, 6, -58, -58,
+ -58, -58, -58, -5, -58, -58, -58, -58, -58, 16,
+ -58, -58, 103, -58, -58, -58, 19, 102, -34, -16,
+ -29, -58, -58, -58, -58, -58, -58, -58, -15, -58,
+ -58, 44, 65, -58, -58, -58, -58, -58, -58, -58,
+ -58, -58, -6, -58, 19, 19, -58, 29, 30, -58,
+ -27, -27, -27, -27, -27, -27, -27, -27, 36, -58,
+ 51, 43, 54, -58, -58, 102, -58, -58, -58, -58,
+ -58, -58, -58, -58, -58, -58, -58, -58, -58, -58,
+ -58, -58, 89, -27, -58, -27, -58, 109, -58, -58,
+ -27, -27, -58, -27, -58, -58, -58, -27, -58, -58,
+ -58, -58, -27, -58, -27, -58, -58
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -42, -42, -42, -42, -30, -42, -42, -5, -42, -42,
- -42, -42, -42, -42, -42, -42, -6, 45, -1
+ -58, -58, -58, -58, -7, -58, -58, -40, -58, -58,
+ -58, -58, -58, -58, -58, -58, -57, 22, -1
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -705,60 +712,62 @@ static const yytype_int8 yypgoto[] =
#define YYTABLE_NINF -1
static const yytype_uint8 yytable[] =
{
- 25, 14, 15, 57, 28, 18, 2, 3, 26, 14,
- 15, 30, 46, 18, 47, 48, 32, 49, 44, 50,
- 4, 43, 73, 54, 74, 75, 72, 44, 86, 56,
- 51, 5, 55, 59, 6, 91, 7, 58, 8, 9,
- 29, 71, 10, 11, 12, 13, 31, 90, 14, 15,
- 16, 17, 18, 19, 20, 82, 83, 84, 85, 88,
- 76, 77, 92, 87, 14, 15, 93, 96, 18, 78,
- 79, 14, 15, 0, 0, 18, 78, 79, 14, 15,
- 0, 99, 18, 100, 97, 98, 4, 70, 103, 104,
- 102, 105, 14, 15, 0, 107, 18, 78, 79, 0,
- 109, 0, 110, 0, 60, 61, 0, 0, 62, 63,
- 64, 65, 0, 0, 14, 15, 66, 17, 18, 67,
- 68, 33, 0, 0, 0, 0, 34, 0, 35, 36,
- 0, 37, 14, 15, 38, 0, 18, 0, 101, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 14,
- 15, 39, 40, 18, 41
+ 25, 30, 75, 44, 85, 86, 87, 88, 89, 90,
+ 91, 94, 26, 28, 98, 54, 14, 15, 14, 15,
+ 18, 43, 18, 81, 82, 32, 2, 3, 44, 56,
+ 14, 15, 57, 55, 18, 102, 105, 58, 106, 31,
+ 4, 74, 92, 109, 110, 76, 111, 77, 78, 97,
+ 113, 5, 29, 59, 6, 115, 7, 116, 79, 80,
+ 96, 8, 9, 99, 73, 10, 11, 12, 13, 0,
+ 0, 14, 15, 16, 17, 18, 19, 20, 0, 4,
+ 93, 14, 15, 0, 0, 18, 81, 82, 14, 15,
+ 0, 104, 18, 81, 82, 0, 108, 60, 61, 62,
+ 63, 64, 0, 0, 65, 66, 67, 68, 0, 0,
+ 14, 15, 69, 17, 18, 70, 71, 33, 0, 0,
+ 0, 0, 34, 0, 35, 36, 46, 37, 47, 48,
+ 38, 49, 0, 50, 14, 15, 0, 0, 18, 0,
+ 103, 0, 0, 0, 0, 0, 0, 51, 14, 15,
+ 39, 40, 18, 41, 14, 15, 0, 0, 18, 0,
+ 107
};
static const yytype_int8 yycheck[] =
{
- 1, 42, 43, 44, 7, 46, 0, 1, 46, 42,
- 43, 6, 24, 46, 26, 27, 9, 29, 9, 31,
- 14, 22, 52, 46, 54, 55, 8, 9, 6, 30,
- 42, 25, 46, 9, 28, 6, 30, 38, 32, 33,
- 43, 42, 36, 37, 38, 39, 41, 9, 42, 43,
- 44, 45, 46, 47, 48, 61, 62, 63, 64, 65,
- 29, 29, 68, 41, 42, 43, 9, 72, 46, 47,
- 48, 42, 43, -1, -1, 46, 47, 48, 42, 43,
- -1, 87, 46, 89, 48, 86, 14, 42, 94, 95,
- 91, 97, 42, 43, -1, 101, 46, 47, 48, -1,
- 106, -1, 108, -1, 32, 33, -1, -1, 36, 37,
- 38, 39, -1, -1, 42, 43, 44, 45, 46, 47,
- 48, 14, -1, -1, -1, -1, 19, -1, 21, 22,
- -1, 24, 42, 43, 27, -1, 46, -1, 48, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 42,
- 43, 44, 45, 46, 47
+ 1, 6, 8, 9, 61, 62, 63, 64, 65, 66,
+ 67, 68, 49, 7, 71, 49, 45, 46, 45, 46,
+ 49, 22, 49, 50, 51, 9, 0, 1, 9, 30,
+ 45, 46, 47, 49, 49, 75, 93, 38, 95, 44,
+ 14, 42, 6, 100, 101, 52, 103, 54, 55, 6,
+ 107, 25, 46, 9, 28, 112, 30, 114, 29, 29,
+ 9, 35, 36, 9, 42, 39, 40, 41, 42, -1,
+ -1, 45, 46, 47, 48, 49, 50, 51, -1, 14,
+ 44, 45, 46, -1, -1, 49, 50, 51, 45, 46,
+ -1, 92, 49, 50, 51, -1, 97, 32, 33, 34,
+ 35, 36, -1, -1, 39, 40, 41, 42, -1, -1,
+ 45, 46, 47, 48, 49, 50, 51, 14, -1, -1,
+ -1, -1, 19, -1, 21, 22, 24, 24, 26, 27,
+ 27, 29, -1, 31, 45, 46, -1, -1, 49, -1,
+ 51, -1, -1, -1, -1, -1, -1, 45, 45, 46,
+ 47, 48, 49, 50, 45, 46, -1, -1, 49, -1,
+ 51
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 51, 0, 1, 14, 25, 28, 30, 32, 33,
- 36, 37, 38, 39, 42, 43, 44, 45, 46, 47,
- 48, 52, 55, 59, 67, 68, 46, 53, 7, 43,
- 6, 41, 9, 14, 19, 21, 22, 24, 27, 44,
- 45, 47, 58, 68, 9, 54, 24, 26, 27, 29,
- 31, 42, 56, 57, 46, 46, 68, 44, 68, 9,
- 32, 33, 36, 37, 38, 39, 44, 47, 48, 60,
- 67, 68, 8, 54, 54, 54, 29, 29, 47, 48,
- 66, 68, 66, 66, 66, 66, 6, 41, 66, 62,
- 9, 6, 66, 9, 63, 61, 57, 48, 68, 66,
- 66, 48, 68, 66, 66, 66, 64, 66, 65, 66,
- 66
+ 0, 54, 0, 1, 14, 25, 28, 30, 35, 36,
+ 39, 40, 41, 42, 45, 46, 47, 48, 49, 50,
+ 51, 55, 58, 62, 70, 71, 49, 56, 7, 46,
+ 6, 44, 9, 14, 19, 21, 22, 24, 27, 47,
+ 48, 50, 61, 71, 9, 57, 24, 26, 27, 29,
+ 31, 45, 59, 60, 49, 49, 71, 47, 71, 9,
+ 32, 33, 34, 35, 36, 39, 40, 41, 42, 47,
+ 50, 51, 63, 70, 71, 8, 57, 57, 57, 29,
+ 29, 50, 51, 69, 71, 69, 69, 69, 69, 69,
+ 69, 69, 6, 44, 69, 65, 9, 6, 69, 9,
+ 66, 64, 60, 51, 71, 69, 69, 51, 71, 69,
+ 69, 69, 67, 69, 68, 69, 69
};
#define yyerrok (yyerrstatus = 0)
@@ -832,7 +841,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -1586,21 +1595,21 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 155 "./nquad_p.y"
+#line 158 "./nquad_p.y"
{ ttlp_arg->ttlp_special_qnames = ~0; }
break;
case 6:
-#line 156 "./nquad_p.y"
+#line 159 "./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 157 "./nquad_p.y"
+#line 160 "./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, &((yyvsp[(2) - (4)].box)));
+ old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, (caddr_t)(&((yyvsp[(2) - (4)].box))));
else
{
ttlp_arg->ttlp_namespaces_prefix2iri = (id_hash_t *)box_dv_dict_hashtable (31);
@@ -1615,127 +1624,127 @@ yyreduce:
ttlyyerror_action ("Namespace prefix is re-used for a different namespace IRI");
}
else
- id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, &((yyvsp[(2) - (4)].box)), &((yyvsp[(3) - (4)].box))); }
+ id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, (caddr_t)(&((yyvsp[(2) - (4)].box))), (caddr_t)(&((yyvsp[(3) - (4)].box)))); }
break;
case 8:
-#line 176 "./nquad_p.y"
+#line 179 "./nquad_p.y"
{
dk_free_box (ttlp_arg->ttlp_default_ns_uri);
ttlp_arg->ttlp_default_ns_uri = (yyvsp[(3) - (4)].box); }
break;
case 13:
-#line 183 "./nquad_p.y"
+#line 186 "./nquad_p.y"
{ ttlyyerror_action ("Only a triple or a special clause (like prefix declaration) is allowed here"); }
break;
case 16:
-#line 192 "./nquad_p.y"
+#line 195 "./nquad_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 17:
-#line 195 "./nquad_p.y"
+#line 198 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
case 18:
-#line 197 "./nquad_p.y"
+#line 200 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
case 19:
-#line 199 "./nquad_p.y"
+#line 202 "./nquad_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 20:
-#line 202 "./nquad_p.y"
+#line 205 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = NULL; }
break;
case 21:
-#line 207 "./nquad_p.y"
+#line 210 "./nquad_p.y"
{ ttlp_arg->ttlp_special_qnames &= ~((yyvsp[(1) - (1)].token_type)); }
break;
case 22:
-#line 208 "./nquad_p.y"
+#line 211 "./nquad_p.y"
{ ttlp_arg->ttlp_special_qnames &= ~((yyvsp[(3) - (3)].token_type)); }
break;
case 23:
-#line 212 "./nquad_p.y"
+#line 215 "./nquad_p.y"
{ (yyval.token_type) = ttlp_bit_of_special_qname ((yyvsp[(1) - (1)].box)); }
break;
case 24:
-#line 213 "./nquad_p.y"
+#line 216 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_A; }
break;
case 25:
-#line 214 "./nquad_p.y"
+#line 217 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_HAS; }
break;
case 26:
-#line 215 "./nquad_p.y"
+#line 218 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_IS; }
break;
case 27:
-#line 216 "./nquad_p.y"
+#line 219 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_OF; }
break;
case 28:
-#line 217 "./nquad_p.y"
+#line 220 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_THIS; }
break;
case 29:
-#line 221 "./nquad_p.y"
+#line 224 "./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 222 "./nquad_p.y"
+#line 225 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = (yyvsp[(1) - (1)].box); }
break;
case 31:
-#line 223 "./nquad_p.y"
+#line 226 "./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 224 "./nquad_p.y"
+#line 227 "./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 225 "./nquad_p.y"
+#line 228 "./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 227 "./nquad_p.y"
+#line 230 "./nquad_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '[]') can not be used as a predicate");
dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = tf_bnode_iid (ttlp_arg->ttlp_tf, NULL); }
break;
case 35:
-#line 231 "./nquad_p.y"
+#line 234 "./nquad_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '_:...' label) can not be used as a predicate");
dk_free_tree (ttlp_arg->ttlp_pred_uri);
@@ -1747,29 +1756,29 @@ yyreduce:
break;
case 36:
-#line 239 "./nquad_p.y"
+#line 242 "./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 240 "./nquad_p.y"
+#line 243 "./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 241 "./nquad_p.y"
+#line 244 "./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 252 "./nquad_p.y"
+#line 255 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
case 47:
-#line 258 "./nquad_p.y"
+#line 261 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = ttlp_arg->ttlp_last_complete_uri;
@@ -1777,51 +1786,51 @@ yyreduce:
break;
case 48:
-#line 262 "./nquad_p.y"
+#line 265 "./nquad_p.y"
{
ttlp_triple_and_inf (ttlp_arg, ttlp_arg->ttlp_obj); }
break;
case 49:
-#line 264 "./nquad_p.y"
+#line 267 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (1)].box); }
break;
case 50:
-#line 267 "./nquad_p.y"
+#line 270 "./nquad_p.y"
{
ttlp_triple_and_inf (ttlp_arg, (yyvsp[(1) - (3)].box)); }
break;
case 51:
-#line 269 "./nquad_p.y"
+#line 272 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (1)].box); }
break;
case 52:
-#line 272 "./nquad_p.y"
+#line 275 "./nquad_p.y"
{
ttlp_triple_and_inf (ttlp_arg, (yyvsp[(1) - (3)].box)); }
break;
case 53:
-#line 274 "./nquad_p.y"
+#line 277 "./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 276 "./nquad_p.y"
+#line 279 "./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 278 "./nquad_p.y"
+#line 281 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (2)].box);
@@ -1829,7 +1838,7 @@ yyreduce:
break;
case 56:
-#line 282 "./nquad_p.y"
+#line 285 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (2)].box);
@@ -1837,7 +1846,7 @@ yyreduce:
break;
case 57:
-#line 286 "./nquad_p.y"
+#line 289 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (2)].box);
@@ -1845,15 +1854,45 @@ yyreduce:
break;
case 58:
-#line 290 "./nquad_p.y"
+#line 293 "./nquad_p.y"
+ {
+ double myZERO = 0.0;
+ double myNAN_d = 0.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myNAN_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ break;
+
+ case 59:
+#line 299 "./nquad_p.y"
+ {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myPOSINF_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ break;
+
+ case 60:
+#line 305 "./nquad_p.y"
+ {
+ double myZERO = 0.0;
+ double myNEGINF_d = -1.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myNEGINF_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ break;
+
+ case 61:
+#line 311 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (2)].box);
ttlp_triple_l_and_inf (ttlp_arg, (yyvsp[(1) - (2)].box), NULL, NULL); }
break;
- case 59:
-#line 294 "./nquad_p.y"
+ case 62:
+#line 315 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (3)].box);
@@ -1862,8 +1901,8 @@ yyreduce:
ttlp_triple_l_and_inf (ttlp_arg, (yyvsp[(1) - (3)].box), NULL, (yyvsp[(2) - (3)].box)); }
break;
- case 60:
-#line 300 "./nquad_p.y"
+ case 63:
+#line 321 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (3)].box);
@@ -1872,43 +1911,43 @@ yyreduce:
ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 61:
-#line 306 "./nquad_p.y"
+ case 64:
+#line 327 "./nquad_p.y"
{
ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, ttlp_arg->ttlp_obj_type, NULL); }
break;
- case 62:
-#line 308 "./nquad_p.y"
+ case 65:
+#line 329 "./nquad_p.y"
{ }
break;
- case 63:
-#line 309 "./nquad_p.y"
+ case 66:
+#line 330 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (4)].box); }
break;
- case 64:
-#line 312 "./nquad_p.y"
+ case 67:
+#line 333 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 65:
-#line 315 "./nquad_p.y"
+ case 68:
+#line 336 "./nquad_p.y"
{ }
break;
- case 66:
-#line 316 "./nquad_p.y"
+ case 69:
+#line 337 "./nquad_p.y"
{ }
break;
- case 67:
-#line 320 "./nquad_p.y"
+ case 70:
+#line 341 "./nquad_p.y"
{
triple_feed_t *tf = ttlp_arg->ttlp_tf;
if ((NULL == tf->tf_current_graph_uri) || strcmp (tf->tf_current_graph_uri, tf->tf_default_graph_uri))
@@ -1916,8 +1955,8 @@ yyreduce:
}
break;
- case 68:
-#line 325 "./nquad_p.y"
+ case 71:
+#line 346 "./nquad_p.y"
{
triple_feed_t *tf = ttlp_arg->ttlp_tf;
if ((NULL == tf->tf_current_graph_uri) || strcmp (tf->tf_current_graph_uri, ttlp_arg->ttlp_last_complete_uri))
@@ -1927,18 +1966,18 @@ yyreduce:
ttlp_arg->ttlp_last_complete_uri = NULL; } }
break;
- case 69:
-#line 332 "./nquad_p.y"
+ case 72:
+#line 353 "./nquad_p.y"
{ }
break;
- case 70:
-#line 333 "./nquad_p.y"
+ case 73:
+#line 354 "./nquad_p.y"
{ }
break;
- case 71:
-#line 339 "./nquad_p.y"
+ case 74:
+#line 360 "./nquad_p.y"
{
if (ttlp_arg->ttlp_formula_iid)
(yyval.box) = tf_formula_bnode_iid (ttlp_arg, (yyvsp[(1) - (1)].box));
@@ -1947,13 +1986,13 @@ yyreduce:
}
break;
- case 72:
-#line 345 "./nquad_p.y"
+ case 75:
+#line 366 "./nquad_p.y"
{ (yyval.box) = tf_bnode_iid (ttlp_arg->ttlp_tf, NULL); }
break;
- case 73:
-#line 350 "./nquad_p.y"
+ case 76:
+#line 371 "./nquad_p.y"
{
if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
@@ -1962,8 +2001,8 @@ yyreduce:
}
break;
- case 74:
-#line 357 "./nquad_p.y"
+ case 77:
+#line 378 "./nquad_p.y"
{
if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
@@ -1973,8 +2012,8 @@ yyreduce:
}
break;
- case 75:
-#line 365 "./nquad_p.y"
+ case 78:
+#line 386 "./nquad_p.y"
{
if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
@@ -1986,7 +2025,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 1990 "nquad_p.c"
+#line 2029 "nquad_p.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/libsrc/Wi/nquad_p.h b/libsrc/Wi/nquad_p.h
index f27791b..2552c8e 100644
--- a/libsrc/Wi/nquad_p.h
+++ b/libsrc/Wi/nquad_p.h
@@ -68,24 +68,27 @@
_AT_of_L = 284,
_AT_prefix_L = 285,
_AT_this_L = 286,
- false_L = 287,
- true_L = 288,
- __TTL_PUNCT_END = 289,
- __TTL_NONPUNCT_START = 290,
- TURTLE_INTEGER = 291,
- TURTLE_DECIMAL = 292,
- TURTLE_DOUBLE = 293,
- TURTLE_STRING = 294,
- KEYWORD = 295,
- LANGTAG = 296,
- QNAME = 297,
- QNAME_NS = 298,
- VARIABLE = 299,
- BLANK_NODE_LABEL = 300,
- Q_IRI_REF = 301,
- _GARBAGE_BEFORE_DOT_WS = 302,
- TTL_RECOVERABLE_ERROR = 303,
- __NQUAD_NONPUNCT_END = 304
+ _MINUS_INF_L = 287,
+ INF_L = 288,
+ NaN_L = 289,
+ false_L = 290,
+ true_L = 291,
+ __TTL_PUNCT_END = 292,
+ __TTL_NONPUNCT_START = 293,
+ TURTLE_INTEGER = 294,
+ TURTLE_DECIMAL = 295,
+ TURTLE_DOUBLE = 296,
+ TURTLE_STRING = 297,
+ KEYWORD = 298,
+ LANGTAG = 299,
+ QNAME = 300,
+ QNAME_NS = 301,
+ VARIABLE = 302,
+ BLANK_NODE_LABEL = 303,
+ Q_IRI_REF = 304,
+ _GARBAGE_BEFORE_DOT_WS = 305,
+ TTL_RECOVERABLE_ERROR = 306,
+ __NQUAD_NONPUNCT_END = 307
};
#endif
/* Tokens. */
@@ -118,24 +121,27 @@
#define _AT_of_L 284
#define _AT_prefix_L 285
#define _AT_this_L 286
-#define false_L 287
-#define true_L 288
-#define __TTL_PUNCT_END 289
-#define __TTL_NONPUNCT_START 290
-#define TURTLE_INTEGER 291
-#define TURTLE_DECIMAL 292
-#define TURTLE_DOUBLE 293
-#define TURTLE_STRING 294
-#define KEYWORD 295
-#define LANGTAG 296
-#define QNAME 297
-#define QNAME_NS 298
-#define VARIABLE 299
-#define BLANK_NODE_LABEL 300
-#define Q_IRI_REF 301
-#define _GARBAGE_BEFORE_DOT_WS 302
-#define TTL_RECOVERABLE_ERROR 303
-#define __NQUAD_NONPUNCT_END 304
+#define _MINUS_INF_L 287
+#define INF_L 288
+#define NaN_L 289
+#define false_L 290
+#define true_L 291
+#define __TTL_PUNCT_END 292
+#define __TTL_NONPUNCT_START 293
+#define TURTLE_INTEGER 294
+#define TURTLE_DECIMAL 295
+#define TURTLE_DOUBLE 296
+#define TURTLE_STRING 297
+#define KEYWORD 298
+#define LANGTAG 299
+#define QNAME 300
+#define QNAME_NS 301
+#define VARIABLE 302
+#define BLANK_NODE_LABEL 303
+#define Q_IRI_REF 304
+#define _GARBAGE_BEFORE_DOT_WS 305
+#define TTL_RECOVERABLE_ERROR 306
+#define __NQUAD_NONPUNCT_END 307
@@ -148,8 +154,8 @@ typedef union YYSTYPE
ptrlong token_type;
void *nothing;
}
-/* Line 1489 of yacc.c. */
-#line 153 "nquad_p.h"
+/* Line 1529 of yacc.c. */
+#line 159 "nquad_p.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
diff --git a/libsrc/Wi/nquad_p.y b/libsrc/Wi/nquad_p.y
index 26f115f..dd4933d 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.5 2011/04/26 12:16:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -111,6 +111,9 @@ extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
%token _AT_of_L /*:: PUNCT_TTL_LAST("@of") ::*/
%token _AT_prefix_L /*:: PUNCT_TTL_LAST("@prefix") ::*/
%token _AT_this_L /*:: PUNCT_TTL_LAST("@this") ::*/
+%token _MINUS_INF_L /*:: PUNCT_TTL_LAST("-INF") ::*/
+%token INF_L /*:: PUNCT_TTL_LAST("INF") ::*/
+%token NaN_L /*:: PUNCT_TTL_LAST("NaN") ::*/
%token false_L /*:: PUNCT_TTL_LAST("false") ::*/
%token true_L /*:: PUNCT_TTL_LAST("true") ::*/
@@ -157,7 +160,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, &($2));
+ old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, (caddr_t)(&($2)));
else
{
ttlp_arg->ttlp_namespaces_prefix2iri = (id_hash_t *)box_dv_dict_hashtable (31);
@@ -172,7 +175,7 @@ clause
ttlyyerror_action ("Namespace prefix is re-used for a different namespace IRI");
}
else
- id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, &($2), &($3)); }
+ id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, (caddr_t)(&($2)), (caddr_t)(&($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; }
@@ -287,6 +290,24 @@ object_with_ctx
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = $1;
ttlp_triple_l_and_inf (ttlp_arg, $1, uname_xmlschema_ns_uri_hash_double, NULL); }
+ | NaN_L ctx_opt {
+ double myZERO = 0.0;
+ double myNAN_d = 0.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myNAN_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ | INF_L ctx_opt {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myPOSINF_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ | _MINUS_INF_L ctx_opt {
+ double myZERO = 0.0;
+ double myNEGINF_d = -1.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myNEGINF_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
| TURTLE_STRING ctx_opt {
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = $1;
diff --git a/libsrc/Wi/numeric.c b/libsrc/Wi/numeric.c
index 30dff28..0e83e12 100644
--- a/libsrc/Wi/numeric.c
+++ b/libsrc/Wi/numeric.c
@@ -1,14 +1,14 @@
/*
* numeric.c
*
- * $Id: numeric.c,v 1.13.2.4 2011/01/28 13:31:34 source Exp $
+ * $Id$
*
* Implements numeric data type
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2180,6 +2180,53 @@ 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 f8d0a8e..5686dcb 100644
--- a/libsrc/Wi/numeric.h
+++ b/libsrc/Wi/numeric.h
@@ -1,14 +1,14 @@
/*
* numeric.h
*
- * $Id: numeric.h,v 1.5.2.4 2011/01/28 13:31:34 source Exp $
+ * $Id$
*
* Numeric data type
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -143,6 +143,7 @@ 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);
@@ -173,4 +174,8 @@ 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 3f66c1d..f9a0e7b 100644
--- a/libsrc/Wi/obackup.c
+++ b/libsrc/Wi/obackup.c
@@ -1,14 +1,14 @@
/*
* obackup.c
*
- * $Id: obackup.c,v 1.20.2.13 2010/09/17 23:10:41 source Exp $
+ * $Id$
*
* Online & Incremental Backup
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1097,8 +1097,8 @@ long ol_backup (const char* prefix, long pages, long timeout, caddr_t* backup_pa
fclose (obackup_trace);
obackup_trace = NULL;
}
+ log_info ("Backed up pages: [%ld]", ctx->octx_page_count - _pages);
#ifdef DEBUG
- log_info ("Backed up pages: [%ld]", ctx->octx_page_count);
log_info ("Log = %s", wi_inst.wi_master->dbs_log_name);
#endif
diff --git a/libsrc/Wi/odbccat.c b/libsrc/Wi/odbccat.c
index 6d6338b..8fd4edc 100644
--- a/libsrc/Wi/odbccat.c
+++ b/libsrc/Wi/odbccat.c
@@ -1,14 +1,14 @@
/*
* odbccat.c
*
- * $Id: odbccat.c,v 1.5.2.2 2009/05/18 10:42:50 source Exp $
+ * $Id$
*
* ODBC Catalogs
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/odbccat.sql b/libsrc/Wi/odbccat.sql
index 462b0b7..f10bcbc 100644
--- a/libsrc/Wi/odbccat.sql
+++ b/libsrc/Wi/odbccat.sql
@@ -1,10 +1,10 @@
--
--- $Id: odbccat.sql,v 1.2.2.2 2009/05/18 10:42:50 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/odbcinc.h b/libsrc/Wi/odbcinc.h
index f8864be..eeb87d4 100644
--- a/libsrc/Wi/odbcinc.h
+++ b/libsrc/Wi/odbcinc.h
@@ -1,14 +1,14 @@
/*
* odbcinc.h
*
- * $Id: odbcinc.h,v 1.6.2.5 2010/09/17 22:49:23 source Exp $
+ * $Id$
*
* Include the ODBC header, whichever appropriate
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -138,7 +138,8 @@ typedef void * SQLHANDLE;
strstr (rds_get_info (rds, SQL_DBMS_NAME), "S Q L S e r v e r") \
) && \
!(strstr (rds_get_info (rds, SQL_DBMS_NAME), "Microsoft") || \
- strstr (rds_get_info (rds, SQL_DBMS_NAME), "M i c r o s o f t") \
+ strstr (rds_get_info (rds, SQL_DBMS_NAME), "M i c r o s o f t") || \
+ strstr (rds_get_info (rds, SQL_DBMS_NAME), "MS SQL Server") \
) \
)
#define IS_VIRTUOSO_RDS(rds) (strstr (rds_get_info (rds, SQL_DBMS_NAME), "Virtuoso") != NULL)
diff --git a/libsrc/Wi/oledb.sql b/libsrc/Wi/oledb.sql
index c32c349..343ba40 100644
--- a/libsrc/Wi/oledb.sql
+++ b/libsrc/Wi/oledb.sql
@@ -1,14 +1,14 @@
--
-- oledb.sql
--
--- $Id: oledb.sql,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
+-- $Id$
--
-- VIRTOLEDB supporting procedures.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/openxml.sql b/libsrc/Wi/openxml.sql
index a1009a8..9998707 100644
--- a/libsrc/Wi/openxml.sql
+++ b/libsrc/Wi/openxml.sql
@@ -1,10 +1,10 @@
--
--- $Id: openxml.sql,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/page.c b/libsrc/Wi/page.c
index 95451d7..dff1481 100644
--- a/libsrc/Wi/page.c
+++ b/libsrc/Wi/page.c
@@ -1,12 +1,12 @@
/*
- * $Id: page.c,v 1.1.2.19 2011/10/18 12:45:50 source Exp $
+ * $Id$
*
* Page and Row Layout, Key Compression
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -913,6 +913,8 @@ 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))
@@ -950,10 +952,10 @@ pf_fill_registered (page_fill_t * pf, buffer_desc_t * buf, it_cursor_t * itc)
{
#ifdef NDEBUG
log_error ("Too many cursors: %ld on splitting page.", pf_count_registered (buf));
- itc_bust_this_trx (itc, buf, ITC_BUST_THROW);
-#else
- GPF_T1 ("too many cursors on splitting page.");
+ itc_bust_this_trx (itc, &buf, ITC_BUST_THROW);
#endif
+ /* should never return*/
+ GPF_T1 ("too many cursors on splitting page.");
}
}
pf->pf_cr_fill = cr_fill;
@@ -1730,7 +1732,7 @@ pf_rd_refit_1 (page_fill_t * pf, row_delta_t * rd, int recursive)
db_buf_t row = buf->bd_buffer + pm->pm_entries[rd->rd_map_pos];
dbe_key_t * key = rd->rd_key->key_versions[IE_KEY_VERSION (row)];
int inx, rc = 0;
- int space = row_space_after (buf, rd->rd_map_pos), avail, gap, space_needed = 0, space_before = space;
+ int space = row_space_after (buf, rd->rd_map_pos), avail, gap = 0, space_needed = 0, space_before = space;
if (!buf->bd_is_write || !buf->bd_is_dirty) GPF_T1 ("refit1 for non excl or non dirty buffer");
for (inx = 0; inx < rd->rd_n_values; inx++)
{
@@ -2435,6 +2437,9 @@ void
page_apply_s (it_cursor_t * itc, buffer_desc_t * buf, int n_delta, row_delta_t ** delta, int op)
{
page_apply_frame_t paf;
+#ifdef VALGRIND
+ memset (&paf, 0, sizeof (page_apply_frame_t));
+#endif
page_apply_1 (itc, buf, n_delta, delta, op, &paf);
}
diff --git a/libsrc/Wi/phrasematch.sql b/libsrc/Wi/phrasematch.sql
index 4f9426a..685357e 100644
--- a/libsrc/Wi/phrasematch.sql
+++ b/libsrc/Wi/phrasematch.sql
@@ -1,10 +1,10 @@
--
--- $Id: phrasematch.sql,v 1.5.2.2 2009/04/18 21:55:12 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/pldbgcli.c b/libsrc/Wi/pldbgcli.c
index b464f45..aa41687 100644
--- a/libsrc/Wi/pldbgcli.c
+++ b/libsrc/Wi/pldbgcli.c
@@ -1,14 +1,14 @@
/*
* pldbgcli.c
*
- * $Id: pldbgcli.c,v 1.3.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* PL debugger client API
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/pldebug.c b/libsrc/Wi/pldebug.c
index 079825e..515b8aa 100644
--- a/libsrc/Wi/pldebug.c
+++ b/libsrc/Wi/pldebug.c
@@ -1,14 +1,14 @@
/*
* pldebug.c
*
- * $Id: pldebug.c,v 1.5.2.2 2011/09/21 13:23:26 source Exp $
+ * $Id$
*
* PL Debugger
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -539,12 +539,15 @@ static query_t *
pldbg_get_qr (char * name)
{
int inx;
- query_t * qr;
+ query_t * qr = NULL;
+ const char * pname;
if (!name)
return NULL;
- qr = sch_proc_def (wi_inst.wi_schema, name);
+ pname = sch_full_proc_name (wi_inst.wi_schema, name, "DB", "DBA");
+ if (pname)
+ qr = sch_proc_def (wi_inst.wi_schema, pname);
if (!qr) /* triggers */
{
dbe_table_t *tb;
@@ -829,7 +832,7 @@ pldbg_cmd_execute (dk_session_t * ses, caddr_t * args)
}
case PDI_THRE: /* stopped threads */
{
- char conn_id[20];
+ char conn_id[30];
client_connection_t * cli;
IN_TXN;
DO_SET (lock_trx_t *, lt, &all_trxs)
@@ -847,7 +850,8 @@ pldbg_cmd_execute (dk_session_t * ses, caddr_t * args)
cli->cli_pldbg->pd_id = box_copy (c_ses->dks_peer_name);
else
{
- snprintf (conn_id, sizeof (conn_id), "INTERNAL:%lX", (unsigned long) (uptrlong) cli);
+ char * ct = cli && cli->cli_ws ? "HTTP" : "INTERNAL";
+ snprintf (conn_id, sizeof (conn_id), "%s:%lX", ct, (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 52e37cd..3e73f23 100644
--- a/libsrc/Wi/pldebug.h
+++ b/libsrc/Wi/pldebug.h
@@ -1,14 +1,14 @@
/*
* pldebug.h
*
- * $Id: pldebug.h,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* PL debugger structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/plugin_gate.c b/libsrc/Wi/plugin_gate.c
index 8f7ced6..d87df22 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.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/plugin_loader.c b/libsrc/Wi/plugin_loader.c
index 985e410..9a0a7d6 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.1 2009/04/18 21:55:12 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/pop3_svr.sql b/libsrc/Wi/pop3_svr.sql
index 0928cef..da80440 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.2 2011/09/28 17:01:16 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/rdf_core.c b/libsrc/Wi/rdf_core.c
index b114590..ea0c07e 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.48 2011/10/13 13:59:06 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -209,6 +209,9 @@ 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));
}
@@ -413,7 +416,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_dv_short_string (tf->tf_input_name);
+ inp_name_box = box_copy (tf->tf_boxed_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);
@@ -510,7 +513,7 @@ tf_new_base (triple_feed_t *tf, caddr_t new_base)
caddr_t
-bif_rdf_load_rdfxml (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, int mode_bits, const char *bifname)
{
caddr_t text_arg;
dtp_t dtp_of_text_arg;
@@ -524,18 +527,17 @@ bif_rdf_load_rdfxml (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, "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");
+ 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);
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 rdf_load_rdfxml() should be a vector of %d to %d names of stored procedures",
- COUNTOF__TRIPLE_FEED__REQUIRED, COUNTOF__TRIPLE_FEED__ALL );
+ "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 );
dtp_of_text_arg = DV_TYPE_OF (text_arg);
/*ns_2dict.xn2_size = 0;*/
do
@@ -556,12 +558,12 @@ bif_rdf_load_rdfxml (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 rdf_load_rdfxml() does not support loading from string session with persistent XML data");
+ "Function %.200s() does not support loading from string session with persistent XML data", bifname );
if (XE_XPACK_SERIALIZATION == ses_sort)
{
#if 1
sqlr_error ("42000",
- "Function rdf_load_rdfxml() does not support loading from string session with packed XML data");
+ "Function %.200s() does not support loading from string session with packed XML data", bifname );
#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);
@@ -577,18 +579,18 @@ bif_rdf_load_rdfxml (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
}
if (dtp_of_text_arg == DV_BLOB_XPER_HANDLE)
sqlr_error ("42000",
- "Function rdf_load_rdfxml() does not support loading from persistent XML objects");
+ "Function %.200s() does not support loading from persistent XML objects", bifname );
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 rdf_load_rdfxml() does not support loading from BLOBs with persistent XML data");
+ "Function %.200s() does not support loading from BLOBs with persistent XML data", bifname );
if (XE_XPACK_SERIALIZATION == blob_sort)
{
#if 1
sqlr_error ("42000",
- "Function rdf_load_rdfxml() does not support loading from BLOBs with packed XML data");
+ "Function %.200s() does not support loading from BLOBs with packed XML data", bifname );
#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);
@@ -598,7 +600,7 @@ bif_rdf_load_rdfxml (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 rdf_load_rdfxml() contains corrupted packed XML serialization data");
+ sqlr_error ("42000", "The BLOB passed to a function %.200s() contains corrupted packed XML serialization data", bifname);
goto tree_complete; /* see below */
#endif
}
@@ -606,8 +608,8 @@ bif_rdf_load_rdfxml (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
break;
}
sqlr_error ("42000",
- "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);
+ "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);
} while (0);
/* Now we have \c text ready to process */
@@ -619,13 +621,13 @@ bif_rdf_load_rdfxml (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
default:
/* case 9:
- dtd_config = bif_array_or_null_arg (qst, args, 8, "rdf_load_rdfxml");*/
+ dtd_config = bif_array_or_null_arg (qst, args, 8, bifname);*/
case 8:
- lh = lh_get_handler (bif_string_arg (qst, args, 7, "rdf_load_rdfxml"));
+ lh = lh_get_handler (bif_string_arg (qst, args, 7, bifname));
case 7:
- enc = bif_string_arg (qst, args, 6, "rdf_load_rdfxml");
+ enc = bif_string_arg (qst, args, 6, bifname);
case 6:
- base_uri = bif_string_or_uname_arg (qst, args, 5, "rdf_load_rdfxml");
+ base_uri = bif_string_or_uname_or_wide_or_null_arg (qst, args, 5, bifname);
case 5:
case 4:
case 3:
@@ -642,6 +644,27 @@ bif_rdf_load_rdfxml (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)
{
@@ -655,10 +678,46 @@ 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 (ttlp->ttlp_namespaces_prefix2iri);
+ dk_free_box ((caddr_t)(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)
@@ -670,8 +729,6 @@ 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));
}
@@ -797,6 +854,7 @@ 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;
@@ -866,25 +924,28 @@ 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);
- 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
+ do {
+ if (ttlp_arg[0].ttlp_in_trig_graph)
{
- dk_free_box (ns_pref);
- ttlyyerror_impl (ttlp_arg, qname, "Undefined namespace prefix");
+ 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; }
}
- }
+ 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;
@@ -986,7 +1047,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, const char *label)
+ttlp_triples_for_bnodes_debug (ttlp_t *ttlp_arg, caddr_t bnode_iid, int lineno, caddr_t label)
{
triple_feed_t *tf = ttlp_arg[0].ttlp_tf;
if (NULL != ttlp_arg->ttlp_base_uri)
@@ -1480,13 +1541,13 @@ lt_nic_rollback_hook (lock_trx_t * lt)
caddr_t
-nic_id_name (name_id_cache_t * nic, boxint id)
+DBG_NAME(nic_id_name) (DBG_PARAMS 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 ? box_copy ((caddr_t) (ptrlong)r) : NULL;
+ ret = r ? DBG_NAME (box_copy) (DBG_ARGS (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;
@@ -1623,9 +1684,8 @@ 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 iri_range_size
+#define IRI_RANGE_SZ 10000
extern dk_mutex_t * log_write_mtx;
@@ -2463,13 +2523,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");
@@ -3477,6 +3537,10 @@ 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 042a9e9..253146b 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.27 2011/10/13 12:14:27 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -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 ccaddr_t xsd_type_of_box (caddr_t arg);
+extern caddr_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. */
- 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_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 */
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,12 +197,18 @@ 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 (
@@ -242,11 +248,12 @@ 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, const char *label);
+extern void ttlp_triples_for_bnodes_debug (ttlp_t *ttlp_arg, caddr_t bnode_iid, int lineno, caddr_t 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 a7621f2..2144101 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.4 2010/09/17 22:49:23 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -50,6 +50,28 @@ JSO_CONST virtrdf SPART_QM_SOFT_EXCLUSIVE 0x0010 --!< The quad map is either exc
JSO_CONST virtrdf SPART_QS_NO_IMPLICIT_USER_QM 0x0001 --!< The quad storage disables user quad maps for triple patterns with unbound graph
JSO_CONST virtrdf SPART_QS_BLOCK_DEFAULT_QM 0x0002 --!< The quad storage disables the use of default quad map and signals an error if no other qm matches
+-- Flags that are responsible for various serialization features.
+-- Some features are labeled as "blocking", because if such a feature is required but flag is not set, an error is signaled.
+-- An occurrence of a non-blocking feature provides some hint to the optimizer of the SPARQL service endpoint; a blocking one alters semantics.
+JSO_CONST virtrdf SSG_SD_QUAD_MAP 0x0001 --!< Allows the use of QUAD MAP groups in the output
+JSO_CONST virtrdf SSG_SD_OPTION 0x0002 --!< Allows the use of OPTION keyword in the output
+JSO_CONST virtrdf SSG_SD_BREAKUP 0x0004 --!< Flags if BREAKUP hint options should be printed, this has no effect w/o SSG_SD_OPTION
+JSO_CONST virtrdf SSG_SD_PKSELFJOIN 0x0008 --!< Flags if PKSELFJOIN hint options should be printed, this has no effect w/o SSG_SD_OPTION
+JSO_CONST virtrdf SSG_SD_RVR 0x0010 --!< Flags if RVR hint options should be printed, this has no effect w/o SSG_SD_OPTION
+JSO_CONST virtrdf SSG_SD_IN 0x0020 --!< Allows the use of IN operator, non-blocking because can be replaced with '='
+JSO_CONST virtrdf SSG_SD_LIKE 0x0040 --!< Allows the use of LIKE operator, blocking
+JSO_CONST virtrdf SSG_SD_GLOBALS 0x0080 --!< Allows the use of global variables (with colon at the front of the name), blocking in most of cases
+JSO_CONST virtrdf SSG_SD_BI 0x0100 --!< Allows the use of SPARQL-BI extensions, blocking in most of cases
+JSO_CONST virtrdf SSG_SD_VIRTSPECIFIC 0x0200 --!< Allows the use of Virtuoso-specific features not listed above, say DEFINE, blocking in most of cases
+JSO_CONST virtrdf SSG_SD_VOS_509 0x03FF --!< Allows everything that is supported by Virtuoso Open Source 5.0.9
+JSO_CONST virtrdf SSG_SD_SERVICE 0x0400 --!< Allows the use of SERVICE extension, blocking
+JSO_CONST virtrdf SSG_SD_VOS_5_LATEST 0x0FFF --!< Allows everything that is supported by CVS head of Virtuoso Open Source 5.x.x
+JSO_CONST virtrdf SSG_SD_TRANSIT 0x1000 --!< Allows the use of transitivity extension, blocking
+JSO_CONST virtrdf SSG_SD_VOS_6 0x1FFF --!< Allows everything that is supported by Virtuoso Open Source 6.0.0
+JSO_CONST virtrdf SSG_SD_SPARQL11_DRAFT 0x2000 --!< Allows the use of SPARQL 1.1 aggregates, BINDINGS, new built-in functions, MINUS, EXISTS syntax
+JSO_CONST virtrdf SSG_SD_SPARQL11_MORE 0x4000 --!< Allows the use of SPARQL 1.1 BIND, path expressions, entilement
+
+
JSO_STRUCT_BEGIN rdf_val_range virtrdf ValRange --!< Description of set of possible values of a variable or a format or an pattern item
JSO_SCALAR rvrRestrictions BITMASK OPTIONAL --!< Natural restrictions on values stored at the field
JSO_SCALAR rvrDatatype ANY_URI OPTIONAL --!< Datatype of stored values, if fixed
@@ -78,6 +100,7 @@ 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
@@ -214,10 +237,19 @@ 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 f8993ad..e5577d5 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.4 2010/09/17 22:49:23 source Exp $ */
+/* $Id$ */
/* */
/* This file is part of the OpenLink Software Virtuoso Open-Source (VOS) */
/* project. */
/* */
-/* Copyright (C) 1998-2009 OpenLink Software */
+/* 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 */
@@ -24,6 +24,9 @@
#include "rdf_mapping_jso.h"
/* Flags listed below this line are for temporary use, they never appear in databases sho they may be changed. */
/* Flags of actions to be done in case of match of triple pattern to conditions of the quad map */
+/* Flags that are responsible for various serialization features. */
+/* Some features are labeled as "blocking", because if such a feature is required but flag is not set, an error is signaled. */
+/* An occurrence of a non-blocking feature provides some hint to the optimizer of the SPARQL service endpoint; a blocking one alters semantics. */
jso_class_descr_t jso__rdf_val_range_array = {
JSO_CAT_ARRAY, "array of struct rdf_val_range_s *",
@@ -79,6 +82,7 @@ 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 },
@@ -303,6 +307,31 @@ 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" ,
@@ -315,6 +344,7 @@ 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 } };
@@ -355,6 +385,23 @@ rdf_mapping_jso_init (void)
jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SPART_QM_SOFT_EXCLUSIVE", SPART_QM_SOFT_EXCLUSIVE);
jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SPART_QS_NO_IMPLICIT_USER_QM", SPART_QS_NO_IMPLICIT_USER_QM);
jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SPART_QS_BLOCK_DEFAULT_QM", SPART_QS_BLOCK_DEFAULT_QM);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_QUAD_MAP", SSG_SD_QUAD_MAP);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_OPTION", SSG_SD_OPTION);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_BREAKUP", SSG_SD_BREAKUP);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_PKSELFJOIN", SSG_SD_PKSELFJOIN);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_RVR", SSG_SD_RVR);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_IN", SSG_SD_IN);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_LIKE", SSG_SD_LIKE);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_GLOBALS", SSG_SD_GLOBALS);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_BI", SSG_SD_BI);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_VIRTSPECIFIC", SSG_SD_VIRTSPECIFIC);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_VOS_509", SSG_SD_VOS_509);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_SERVICE", SSG_SD_SERVICE);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_VOS_5_LATEST", SSG_SD_VOS_5_LATEST);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_TRANSIT", SSG_SD_TRANSIT);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_VOS_6", SSG_SD_VOS_6);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_SPARQL11_DRAFT", SSG_SD_SPARQL11_DRAFT);
+ jso_define_const( "http://www.openlinksw.com/schemas/virtrdf#SSG_SD_SPARQL11_MORE", SSG_SD_SPARQL11_MORE);
jso_define_class(&jso__rdf_val_range_array);
jso_define_class(&jso__rdf_val_range);
jso_define_class(&jso__qm_format_array);
@@ -369,6 +416,8 @@ 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 692bbbc..a4e42ab 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.4 2010/09/17 22:49:23 source Exp $ */
+/* $Id$ */
/* */
/* This file is part of the OpenLink Software Virtuoso Open-Source (VOS) */
/* project. */
/* */
-/* Copyright (C) 1998-2009 OpenLink Software */
+/* 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 */
@@ -49,6 +49,26 @@
#define SPART_QM_SOFT_EXCLUSIVE 0x0010 /*! The quad map is either exclusive or not, discretion is made by compiler */
#define SPART_QS_NO_IMPLICIT_USER_QM 0x0001 /*! The quad storage disables user quad maps for triple patterns with unbound graph */
#define SPART_QS_BLOCK_DEFAULT_QM 0x0002 /*! The quad storage disables the use of default quad map and signals an error if no other qm matches */
+/* Flags that are responsible for various serialization features. */
+/* Some features are labeled as "blocking", because if such a feature is required but flag is not set, an error is signaled. */
+/* An occurrence of a non-blocking feature provides some hint to the optimizer of the SPARQL service endpoint; a blocking one alters semantics. */
+#define SSG_SD_QUAD_MAP 0x0001 /*! Allows the use of QUAD MAP groups in the output */
+#define SSG_SD_OPTION 0x0002 /*! Allows the use of OPTION keyword in the output */
+#define SSG_SD_BREAKUP 0x0004 /*! Flags if BREAKUP hint options should be printed, this has no effect w/o SSG_SD_OPTION */
+#define SSG_SD_PKSELFJOIN 0x0008 /*! Flags if PKSELFJOIN hint options should be printed, this has no effect w/o SSG_SD_OPTION */
+#define SSG_SD_RVR 0x0010 /*! Flags if RVR hint options should be printed, this has no effect w/o SSG_SD_OPTION */
+#define SSG_SD_IN 0x0020 /*! Allows the use of IN operator, non-blocking because can be replaced with '=' */
+#define SSG_SD_LIKE 0x0040 /*! Allows the use of LIKE operator, blocking */
+#define SSG_SD_GLOBALS 0x0080 /*! Allows the use of global variables (with colon at the front of the name), blocking in most of cases */
+#define SSG_SD_BI 0x0100 /*! Allows the use of SPARQL-BI extensions, blocking in most of cases */
+#define SSG_SD_VIRTSPECIFIC 0x0200 /*! Allows the use of Virtuoso-specific features not listed above, say DEFINE, blocking in most of cases */
+#define SSG_SD_VOS_509 0x03FF /*! Allows everything that is supported by Virtuoso Open Source 5.0.9 */
+#define SSG_SD_SERVICE 0x0400 /*! Allows the use of SERVICE extension, blocking */
+#define SSG_SD_VOS_5_LATEST 0x0FFF /*! Allows everything that is supported by CVS head of Virtuoso Open Source 5.x.x */
+#define SSG_SD_TRANSIT 0x1000 /*! Allows the use of transitivity extension, blocking */
+#define SSG_SD_VOS_6 0x1FFF /*! Allows everything that is supported by Virtuoso Open Source 6.0.0 */
+#define SSG_SD_SPARQL11_DRAFT 0x2000 /*! Allows the use of SPARQL 1.1 aggregates, BINDINGS, new built-in functions, MINUS, EXISTS syntax */
+#define SSG_SD_SPARQL11_MORE 0x4000 /*! Allows the use of SPARQL 1.1 BIND, path expressions, entilement */
#define JSO_IRI_OF_rdf_val_range_array "http://www.openlinksw.com/schemas/virtrdf#array-of-ValRange"
typedef struct rdf_val_range_s * *rdf_val_range_array_t;
@@ -90,6 +110,7 @@ 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 */
@@ -224,6 +245,19 @@ 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;
@@ -234,6 +268,7 @@ 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 8db24a8..15aa1d6 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.4 2010/09/17 22:49:23 source Exp $ -->
+<!-- $Id$ -->
<!-- -->
<!-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -->
<!-- project. -->
<!-- -->
-<!-- Copyright (C) 1998-2009 OpenLink Software -->
+<!-- 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 -->
@@ -121,6 +121,77 @@
rdf:type virtrdf:CDefine ;
rdfs:comment "0x0002 -- The quad storage disables the use of default quad map and signals an error if no other qm matches" ;
.
+<!-- Flags that are responsible for various serialization features. -->
+<!-- Some features are labeled as "blocking", because if such a feature is required but flag is not set, an error is signaled. -->
+<!-- An occurrence of a non-blocking feature provides some hint to the optimizer of the SPARQL service endpoint; a blocking one alters semantics. -->
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_QUAD_MAP>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0001 -- Allows the use of QUAD MAP groups in the output" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_OPTION>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0002 -- Allows the use of OPTION keyword in the output" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_BREAKUP>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0004 -- Flags if BREAKUP hint options should be printed, this has no effect w/o SSG_SD_OPTION" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_PKSELFJOIN>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0008 -- Flags if PKSELFJOIN hint options should be printed, this has no effect w/o SSG_SD_OPTION" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_RVR>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0010 -- Flags if RVR hint options should be printed, this has no effect w/o SSG_SD_OPTION" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_IN>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0020 -- Allows the use of IN operator, non-blocking because can be replaced with '='" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_LIKE>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0040 -- Allows the use of LIKE operator, blocking" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_GLOBALS>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0080 -- Allows the use of global variables (with colon at the front of the name), blocking in most of cases" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_BI>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0100 -- Allows the use of SPARQL-BI extensions, blocking in most of cases" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_VIRTSPECIFIC>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0200 -- Allows the use of Virtuoso-specific features not listed above, say DEFINE, blocking in most of cases" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_VOS_509>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x03FF -- Allows everything that is supported by Virtuoso Open Source 5.0.9" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_SERVICE>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0400 -- Allows the use of SERVICE extension, blocking" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_VOS_5_LATEST>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x0FFF -- Allows everything that is supported by CVS head of Virtuoso Open Source 5.x.x" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_TRANSIT>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x1000 -- Allows the use of transitivity extension, blocking" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_VOS_6>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x1FFF -- Allows everything that is supported by Virtuoso Open Source 6.0.0" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_SPARQL11_DRAFT>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x2000 -- Allows the use of SPARQL 1.1 aggregates, BINDINGS, new built-in functions, MINUS, EXISTS syntax" ;
+ .
+ <http://www.openlinksw.com/schemas/virtrdf#SSG_SD_SPARQL11_MORE>
+ rdf:type virtrdf:CDefine ;
+ rdfs:comment "0x4000 -- Allows the use of SPARQL 1.1 BIND, path expressions, entilement" ;
+ .
<http://www.openlinksw.com/schemas/virtrdf#array-of-ValRange>
rdf:type rdfs:Class ;
.
@@ -287,6 +358,13 @@
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 ;
@@ -1023,6 +1101,43 @@
.
# 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 ;
.
@@ -1048,6 +1163,12 @@
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 274cbc3..1451639 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.4 2010/09/17 22:49:23 source Exp $ -->
+<!-- $Id$ -->
<!-- -->
<!-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -->
<!-- project. -->
<!-- -->
-<!-- Copyright (C) 1998-2009 OpenLink Software -->
+<!-- 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 -->
@@ -29,6 +29,9 @@
<!-- Flags that describe restrictions on possible values of the variable or the use of the var -->
<!-- Flags listed below this line are for temporary use, they never appear in databases sho they may be changed. -->
<!-- Flags of actions to be done in case of match of triple pattern to conditions of the quad map -->
+<!-- Flags that are responsible for various serialization features. -->
+<!-- Some features are labeled as "blocking", because if such a feature is required but flag is not set, an error is signaled. -->
+<!-- An occurrence of a non-blocking feature provides some hint to the optimizer of the SPARQL service endpoint; a blocking one alters semantics. -->
@prefix ns0: <http://www.openlinksw.com/schemas/virtrdf#> .
<http://example.com/jso-samples#ValRangeSample>
rdf_type ns0:ValRange ;
@@ -60,6 +63,7 @@
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
@@ -189,11 +193,20 @@
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 c3d8355..17e0338 100644
--- a/libsrc/Wi/rdf_net.sql
+++ b/libsrc/Wi/rdf_net.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdf_net.sql,v 1.1 2007/07/26 13:49:42 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/rdf_schema_objects.sql b/libsrc/Wi/rdf_schema_objects.sql
index 6fc3a78..9c2aed7 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.21 2011/10/21 12:03:58 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
-- RDF Schema objects, generator of RDF Views
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -40,7 +40,7 @@ create procedure rdf_view_tbl_opts (in tbls any, in cols any)
foreach (varchar t in tbls) do
{
declare col_cnt int;
- col_cnt := (select count(*) from TABLE_COLS where "TABLE" = t);
+ col_cnt := (select count(*) from TABLE_COLS where "TABLE" = t and "COLUMN" <> '_IDN');
res [inx * 2] := t;
if (isarray (cols[inx]) and length (cols[inx]) = 2 and isarray (cols[inx][1]) and length (cols[inx][1]) = col_cnt)
res [(inx * 2) + 1] := cols [inx];
@@ -49,7 +49,7 @@ create procedure rdf_view_tbl_opts (in tbls any, in cols any)
declare newcols, i any;
newcols := make_array (col_cnt, 'any');
i := 0;
- for select "COLUMN", COL_DTP from TABLE_COLS where "TABLE" = t order by COL_ID do
+ for select "COLUMN", COL_DTP from TABLE_COLS where "TABLE" = t and "COLUMN" <> '_IDN' order by COL_ID do
{
if (COL_DTP <> 131)
newcols [i] := vector (0, null);
@@ -96,7 +96,7 @@ create procedure rdf_view_tbl_pk_cols (inout tbls any, out pkcols any)
foreach (varchar c in tbls [i + 1]) do
{
cols[j] := (select vector (sc."COLUMN", sc."COL_DTP", sc."COL_SCALE", sc."COL_PREC")
- from DB.DBA.TABLE_COLS sc where upper (sc."COLUMN") = upper (c) and upper ("TABLE") = upper (tbls[i]));
+ from DB.DBA.TABLE_COLS sc where upper (sc."COLUMN") = upper (c) and upper ("TABLE") = upper (tbls[i]) and "COLUMN" <> '_IDN');
if (length (cols[j]) = 0)
signal ('22023', sprintf ('Non existing column %s for table %s', c, tbls[i]));
j := j + 1;
@@ -175,13 +175,11 @@ create procedure rdf_view_ns_get_1 (in cols any, inout dict any)
;
create procedure
-RDF_VIEW_DROP_STMT (in qualifier varchar)
+RDF_VIEW_DROP_STMT_BY_GRAPH (in gr 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:
{
@@ -195,6 +193,18 @@ RDF_VIEW_DROP_STMT (in qualifier 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;
@@ -239,7 +249,7 @@ RDF_VIEW_FROM_TBL (in qualifier varchar, in _tbls any, in gen_stat int := 0, in
vname := _tbls[xx]||'Count';
total_select := total_select || sprintf ('(cnt%d*cnt%d)+', xx*2, (xx*2)+1);
total_tb := total_tb ||
- sprintf ('\n (select count(*) cnt%d from "%I"."%I"."%I") tb%d, \n (select count(*)+1 as cnt%d from DB.DBA.TABLE_COLS where "TABLE" = ''%S'') tb%d,',
+ sprintf ('\n (select count(*) cnt%d from "%I"."%I"."%I") tb%d, \n (select count(*)+1 as cnt%d from DB.DBA.TABLE_COLS where "TABLE" = ''%S'' and "COLUMN" <> ''_IDN'') tb%d,',
xx*2, name_part (_tbls[xx], 0), name_part (_tbls[xx], 1), name_part (_tbls[xx], 2), xx*2, (xx*2)+1, _tbls[xx], (xx*2)+1);
if (not exists (select 1 from SYS_VIEWS where V_NAME = vname))
{
@@ -461,7 +471,7 @@ rdf_view_create_view (in nth int, in qualifier varchar, in _tbls any, in gen_sta
ret := ret || rdf_view_sp (6) || sprintf (' a %s ;\n', rdf_view_uri_curie (cols_arr[0]));
inx := 0;
- for select "COLUMN" from TABLE_COLS where "TABLE" = tbl order by COL_ID do
+ for select "COLUMN" from TABLE_COLS where "TABLE" = tbl and "COLUMN" <> '_IDN' order by COL_ID do
{
col_name := lower ("COLUMN");
if (cols_arr[1][inx][0] = 0 or cols_arr[1][inx][0] = 4)
@@ -490,7 +500,7 @@ rdf_view_create_view (in nth int, in qualifier varchar, in _tbls any, in gen_sta
ret := trim (ret, ';');
ret := ret || '.\n';
inx := 0;
- for select "COLUMN" from TABLE_COLS where "TABLE" = tbl order by COL_ID do
+ for select "COLUMN" from TABLE_COLS where "TABLE" = tbl and "COLUMN" <> '_IDN' order by COL_ID do
{
col_name := lower ("COLUMN");
if (isstring (cols_arr[1][inx][0]))
@@ -691,7 +701,7 @@ create procedure
rdf_view_dv_to_xsd_str_type (in _dv varchar)
{
if (_dv = 189 or _dv = 188 or _dv = 247) return 'int';
- else if (_dv = 182 or _dv = 125 or _dv = 131) return 'string';
+ else if (_dv = 182 or _dv = 125 or _dv = 131 or _dv = 132) return 'string';
else if (__tag of double precision = _dv) return 'numeric';
else if (__tag of real = _dv) return 'float';
else if (__tag of numeric = _dv) return 'numeric';
@@ -731,7 +741,7 @@ rdf_view_create_class (in decl varchar, in _tbl varchar, in _host varchar, in qu
qualifier, tbl_name_l, _host, qualifier, tbl_name_l, sk_str, pk_text);
cols_arr := get_keyword (_tbl, cols);
inx := 0;
- for select "COLUMN" as col from TABLE_COLS where "TABLE" = _tbl order by COL_ID do
+ for select "COLUMN" as col from TABLE_COLS where "TABLE" = _tbl and "COLUMN" <> '_IDN' order by COL_ID do
{
if (isstring (cols_arr[1][inx][0]))
{
@@ -834,7 +844,7 @@ RDF_OWL_FROM_TBL (in qual varchar, in _tbls any, in cols any := null)
cols_arr := get_keyword (tbl, cols);
if (length (cols_arr[0]))
http (sprintf ('%s:%s rdfs:subClassOf %s .\n', qual, cls, rdf_view_uri_curie (cols_arr[0])), ses);
- for select "COLUMN" as col, COL_DTP as dtp from TABLE_COLS where "TABLE" = tbl order by COL_ID do
+ for select "COLUMN" as col, COL_DTP as dtp from TABLE_COLS where "TABLE" = tbl and "COLUMN" <> '_IDN' order by COL_ID do
{
declare xsd, label varchar;
label := col;
@@ -1126,21 +1136,43 @@ RDF_VIEW_CHECK_SYNC_TB (in tb varchar)
;
create procedure
-RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0)
+RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0, in pgraph varchar := null)
{
- declare mask varchar;
- declare txt, tbls, err_ret any;
- declare stat, msg varchar;
+ 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)
+{
+ 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);
tbls := vector ();
err_ret := vector ();
- mask := sprintf ('http://%s/schemas/%s/qm-%%', virtuoso_ini_item_value ('URIQA','DefaultHost'), qualifier);
+ opt := vector ();
+ gr := vgraph;
+ if (length (pgraph))
+ opt := vector (gr, pgraph);
for select "o" from
(sparql define input:storage "" select ?o from virtrdf:
{
virtrdf:DefaultQuadStorage-UserMaps ?p ?o .
?o a virtrdf:QuadMap .
- filter (?o like ?:mask)
+ ?o virtrdf:qmGraphRange-rvrFixedValue `iri(?:gr)` .
}
order by asc (bif:sprintf_inverse (bif:concat (str(rdf:_), "%d"), str (?p), 1))) x do
{
@@ -1173,7 +1205,7 @@ RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0)
{
for (declare ctr int, ctr := 1; ctr <= 4; ctr := ctr + 1)
{
- txt := sparql_rdb2rdf_codegen (tb, ctr);
+ txt := sparql_rdb2rdf_codegen (tb, ctr, opt);
stat := '00000';
if (isvector (txt))
{
@@ -1203,6 +1235,141 @@ RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0)
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
+DB.DBA.R2RML_FROM_TBL (in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any := null, in qual_ns varchar := 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);
+ if (qual_ns is null)
+ qual_ns := sprintf ('http://%s/schemas/%s/', virtuoso_ini_item_value ('URIQA','DefaultHost'), qualifier);
+ sns := ns := sprintf ('@prefix rr: <http://www.w3.org/ns/r2rml#> .\n at prefix %s: <%s> .\n', qualifier, qual_ns);
+ 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' || DB.DBA.R2RML_CREATE_DATASET (inx, qualifier, qual_ns, _tbls, gen_stat, cols, pkcols, graph) || '';
+
+ return create_view_stmt;
+}
+;
+
+create procedure
+DB.DBA.R2RML_QUAL_NOTATION (in qualifier varchar, in qual_ns varchar, in loc varchar)
+{
+ if (sprintf ('%U', loc) = loc)
+ return concat (qualifier, ':', loc);
+ return sprintf ('<%s:%U>', qual_ns, loc);
+}
+;
+
+create procedure
+DB.DBA.R2RML_CREATE_DATASET (in nth int, in qualifier varchar, in qual_ns 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 ('/%U={%s}', pks[i][0], pks[i][0]);
+
+ if (graph is not null)
+ graph_def := sprintf ('rr:graph <%s> ', graph);
+ else
+ graph_def := '';
+ ret := ret || sprintf ('<#TriplesMap%U> 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];\n',
+ uriqa_str, qual, tbl_name_l, pk_text, DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, rdf_view_cls_name (tbl_name)), graph_def );
+
+ inx := 0;
+ for select "COLUMN", COL_DTP from TABLE_COLS where "TABLE" = tbl and "COLUMN" <> '_IDN' 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 ] ; rr:objectMap [ rr:column "%s" ]; ] ;\n',
+ DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, 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 ('/%U={%s}', FKCOLUMN_NAME, FKCOLUMN_NAME);
+ ret := ret || sprintf ('rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://%s/%s/%s%s" ]; ] ;\n',
+ DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, concat (tbl_name_l, '_has_', 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" ] ;', PKCOLUMN_NAME, FKCOLUMN_NAME);
+ pk_text := pk_text || sprintf ('/%U={%s}', FKCOLUMN_NAME, FKCOLUMN_NAME);
+ }
+ if (tbl <> fkt)
+ {
+ ret := ret || sprintf ('rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMap%U>; %s ]; ] ;\n',
+ DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, concat (tbl_name_l, '_of_', lower (name_part (fkt, 3)))),
+ name_part (fkt, 3), jc );
+ }
+ else
+ {
+ ret := ret || sprintf ('rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://%s/%s/%s%s" ]; ] ;\n',
+ DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, concat (tbl_name_l, '_has_', 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 f275c1c..8ffe92a 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.49 2011/10/13 11:00:23 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -21,6 +21,28 @@
--
--
+-- 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
@@ -93,7 +115,7 @@ create function DB.DBA.RDF_GRAB_SINGLE (in val any, inout grabbed any, inout env
'get:error-recovery', get_keyword_ucase ('get:error-recovery', env)
);
dict_put (grabbed, url, 1);
- call (get_keyword ('loader', env))(url, opts);
+ call (get_keyword ('loader', env))(url, opts, user);
commit work;
dict_put (grabbed, url, coalesce (final_dest, dest));
-- dbg_obj_princ ('DB.DBA.RDF_GRAB_SINGLE (', val, ',... , ', env, ') has loaded ', url);
@@ -419,10 +441,13 @@ create procedure DB.DBA.SPARQL_EVAL (in query varchar, in dflt_graph varchar, in
if (state <> '00000')
signal (state, msg);
-- dbg_obj_princ ('exec metas=', metas);
- exec_result_names (metas[0]);
- foreach (any row in rset) do
+ if (metas is not null)
{
- exec_result (row);
+ exec_result_names (metas[0]);
+ foreach (any row in rset) do
+ {
+ exec_result (row);
+ }
}
}
;
@@ -456,12 +481,26 @@ create index SYS_HTTP_SPONGE_EXPIRATION on DB.DBA.SYS_HTTP_SPONGE (HS_EXPIRATION
create index SYS_HTTP_SPONGE_FROM_IRI on DB.DBA.SYS_HTTP_SPONGE (HS_FROM_IRI, HS_PARSER) partition (HS_FROM_IRI varchar)
;
+create table DB.DBA.SYS_HTTP_SPONGE_REFRESH_DEFAULTS (
+ HSRD_DATA_SOURCE_URI_PATTERN varchar not null,
+ HSRD_DEFAULT_REFRESH_INTERVAL_SECS integer,
+ primary key (HSRD_DATA_SOURCE_URI_PATTERN)
+)
+;
+
--#IF VER=5
--!AFTER
alter table DB.DBA.SYS_HTTP_SPONGE add HS_FROM_IRI varchar
;
--#ENDIF
+create table RDF_WEBID_ACL_GROUPS (
+ AG_WEBID varchar,
+ AG_GROUP varchar,
+primary key (AG_WEBID, AG_GROUP)
+)
+;
+
create procedure DB.DBA.SYS_HTTP_SPONGE_GET_CACHE_PARAMS
(
in explicit_refresh any,
@@ -495,9 +534,11 @@ 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;
@@ -615,28 +656,39 @@ 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;
declare get_proxy varchar;
declare ret_dt_date, ret_dt_last_modified, ret_dt_expires, expiration, min_expiration datetime;
declare ret_304_not_modified integer;
- declare parser_rc, max_refresh int;
+ declare parser_rc, max_refresh, default_refresh int;
declare stat, msg varchar;
-- dbg_obj_princ ('DB.DBA.SYS_HTTP_SPONGE_UP (', local_iri, get_uri, options, ')');
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');
- if (max_refresh is not null)
+ max_refresh := atoi (coalesce (virtuoso_ini_item_value ('SPARQL', 'MaxCacheExpiration'), '-1'));
+ default_refresh := (select HSRD_DEFAULT_REFRESH_INTERVAL_SECS from DB.DBA.SYS_HTTP_SPONGE_REFRESH_DEFAULTS where regexp_match (HSRD_DATA_SOURCE_URI_PATTERN, local_iri) is not null);
+ if (default_refresh is not null)
+ {
+ if (default_refresh >= 0)
{
- max_refresh := atoi (max_refresh);
if (max_refresh >= 0)
+ explicit_refresh := __min (default_refresh, max_refresh);
+ else
+ explicit_refresh := default_refresh;
+ }
+ else if (max_refresh >= 0)
explicit_refresh := max_refresh;
}
+ else if (max_refresh >= 0)
+ explicit_refresh := max_refresh;
}
else if (isstring (explicit_refresh))
explicit_refresh := atoi (explicit_refresh);
@@ -667,7 +719,7 @@ create function DB.DBA.SYS_HTTP_SPONGE_UP (in local_iri varchar, in get_uri varc
case (isnull (old_origin_login)) when 0 then sprintf ('login "%.100s"', old_origin_login) else 'anonymous access' end ) );
-- dbg_obj_princ (' old_expiration=', old_expiration, ' old_exp_is_true=', old_exp_is_true, ' old_last_load=', old_last_load);
- -- dbg_obj_princ ('now()=', now(), ' explicit_refresh=', explicit_refresh);
+ -- dbg_obj_princ ('now()=', now(), ' explicit_refresh=', explicit_refresh, ' max_refresh=', max_refresh, ' default_refresh=', default_refresh, ' min_expiration=', min_expiration);
if (eraser is null)
{
-- dbg_obj_princ ('will start load w/o expiration check due to NULL eraser (dependant loading)');
@@ -727,8 +779,12 @@ 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.
@@ -742,7 +798,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: 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: ' || acc_hdr;
--|| '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);
{
@@ -797,7 +853,7 @@ perform_actual_load:
}
goto resp_received;
}
- if (eraser is not null)
+ if (eraser is not null and (get_soft <> 'add'))
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")',
@@ -864,7 +920,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)
+ if (eraser is not null and (get_soft <> 'add'))
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()');
@@ -940,17 +996,22 @@ 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)
+ if (eraser is not null and (get_soft <> 'add'))
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;
@@ -976,16 +1037,29 @@ 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);
+ ret_begin := subseq (ret_body, 0, 65535);
if (isstring_session (ret_begin))
ret_begin := string_output_string (ret_begin);
-- dbg_obj_princ ('DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE: ret_begin = ', ret_begin);
ret_html := xtree_doc (ret_begin, 2);
-- dbg_obj_princ ('DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE: ret_html = ', ret_html);
- if (xpath_eval ('/html|/xhtml', ret_html) is not null)
+ if (xpath_eval ('[xmlns:xh="http://www.w3.org/1999/xhtml"] /html|/xhtml|/xh:html|/xh:xhtml', ret_html) is not null)
+ {
+ if (xpath_eval ('[xmlns:grddl="http://www.w3.org/2003/g/data-view#"] /*/@grddl:transformation', ret_html) is not null)
+ return 'text/html'; -- GRDDL stylesheet is most authoritative
+ if (xpath_eval ('/*/head/@profile', ret_html) is not null)
+ return 'text/html'; -- GRDDL inline profile is authoritative, too
+ if (xpath_eval ('//*[exists(@itemscope) or exists(@itemprop) or exists(@itemid) or exists(@itemtype)]', ret_html) is not null)
+ return 'text/microdata+html'; -- Microdata are tested before RDFa because metadata with @rel may be wrongly recognised as RDFa
+ -- if (xpath_eval ('//*[exists(@rel) or exists(@rev) or exists(@typeof) or exists(@property) or exists(@about)]', ret_html) is not null)
+ if (xpath_eval ('//*[exists(@typeof) or exists(@about)]', ret_html) is not null)
+ return 'application/xhtml+xml';
return 'text/html';
+ }
if (xpath_eval ('[xmlns:rset="http://www.w3.org/2005/sparql-results#"] /rset:sparql', ret_html) is not null
or xpath_eval ('[xmlns:rset2="http://www.w3.org/2001/sw/DataAccess/rf1/result2"] /rset2:sparql', ret_html) is not null)
return 'application/sparql-results+xml';
@@ -1176,12 +1250,13 @@ 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, cset, base, first_stat, first_msg varchar;
+ declare dest, groupdest, get_soft, cset, base, first_stat, first_msg varchar;
declare rc any;
declare aq, ps any;
declare xd, xt any;
- declare saved_log_mode, only_rdfa integer;
+ declare saved_log_mode, only_rdfa, retr_count, rdf_fmt integer;
aq := null;
+ rdf_fmt := 0;
ps := virtuoso_ini_item_value ('SPARQL', 'PingService');
if (length (ps))
{
@@ -1189,11 +1264,16 @@ create procedure DB.DBA.RDF_LOAD_HTTP_RESPONSE (in graph_iri varchar, in new_ori
}
-- dbg_obj_princ ('DB.DBA.RDF_LOAD_HTTP_RESPONSE (', graph_iri, new_origin_uri, ret_content_type, ret_hdr, ret_body, options, req_hdr_arr, ')');
--!!!TBD: proper calculation of new_expiration, using data from HTTP header of the response
+ declare l any;
+ l := ret_body;
+ if (length (l) > 3 and l[0] = 0hexEF and l[1] = 0hexBB and l[2] = 0hexBF) -- remove BOM
+ ret_body := subseq (ret_body, 3);
ret_content_type := DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE (new_origin_uri, ret_content_type, ret_body);
-- dbg_obj_princ ('ret_content_type is ', ret_content_type);
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
@@ -1202,17 +1282,24 @@ 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)
-- DB.DBA.SPARUL_CLEAR (coalesce (dest, graph_iri), 1);
- whenever sqlstate '*' goto load_grddl;
+ declare exit handler for sqlstate '*'
+ {
+ if (registry_get ('__sparql_mappers_debug') = '1')
+ dbg_printf ('%s: SQL_MESSAGE: %s', current_proc_name(), __SQL_MESSAGE);
+ goto load_grddl;
+ };
--log_enable (2, 1);
xt := xtree_doc (ret_body);
-- we test for GRDDL inside RDF/XML, if so do it inside mappers, else it will fail because of dv:transformation attr
if (xpath_eval ('[ xmlns:dv="http://www.w3.org/2003/g/data-view#" ] /*[1]/@dv:transformation', xt) is not null)
goto load_grddl;
DB.DBA.RDF_LOAD_RDFXML (ret_body, base, coalesce (dest, graph_iri));
+ rdf_fmt := 1;
if (groupdest is not null)
DB.DBA.RDF_LOAD_RDFXML (ret_body, base, groupdest);
if (exists (select 1 from DB.DBA.SYS_RDF_MAPPERS where RM_TYPE = 'URL' and regexp_match (RM_PATTERN, new_origin_uri) and RM_ENABLED = 1))
@@ -1233,13 +1320,20 @@ create procedure DB.DBA.RDF_LOAD_HTTP_RESPONSE (in graph_iri varchar, in new_ori
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/n-triples') is not null or
strstr (ret_content_type, 'application/x-turtle') is not null )
{
- whenever sqlstate '*' goto load_grddl_after_error;
+ declare exit handler for sqlstate '*'
+ {
+ if (registry_get ('__sparql_mappers_debug') = '1')
+ dbg_printf ('%s: SQL_MESSAGE: %s', current_proc_name(), __SQL_MESSAGE);
+ goto load_grddl_after_error;
+ };
--log_enable (2, 1);
--if (dest is null)
-- DB.DBA.SPARUL_CLEAR (coalesce (dest, graph_iri), 1);
DB.DBA.TTLP (ret_body, base, coalesce (dest, graph_iri), 255);
+ rdf_fmt := 1;
if (groupdest is not null)
DB.DBA.TTLP (ret_body, base, groupdest);
if (exists (select 1 from DB.DBA.SYS_RDF_MAPPERS where RM_TYPE = 'URL' and regexp_match (RM_PATTERN, new_origin_uri) and RM_ENABLED = 1))
@@ -1251,13 +1345,37 @@ create procedure DB.DBA.RDF_LOAD_HTTP_RESPONSE (in graph_iri varchar, in new_ori
aq_request (aq, 'DB.DBA.RDF_SW_PING', vector (ps, new_origin_uri));
return 1;
}
- else if (only_rdfa = 1 and strstr (ret_content_type, 'text/html') is not null)
+ else if (strstr (ret_content_type, 'text/microdata+html') is not null)
{
- whenever sqlstate '*' goto load_grddl;
+ declare exit handler for sqlstate '*'
+ {
+ if (registry_get ('__sparql_mappers_debug') = '1')
+ dbg_printf ('%s: SQL_MESSAGE: %s', current_proc_name(), __SQL_MESSAGE);
+ goto load_grddl;
+ };
--log_enable (2, 1);
- DB.DBA.RDF_LOAD_RDFA (ret_body, base, coalesce (dest, graph_iri), 2);
+ DB.DBA.RDF_LOAD_XHTML_MICRODATA (ret_body, base, coalesce (dest, graph_iri));
+ rdf_fmt := 1;
if (groupdest is not null and groupdest <> coalesce (dest, graph_iri))
- DB.DBA.RDF_LOAD_RDFA (ret_body, base, groupdest, 2);
+ DB.DBA.RDF_LOAD_XHTML_MICRODATA (ret_body, base, groupdest);
+ --log_enable (saved_log_mode, 1);
+ if (aq is not null)
+ aq_request (aq, 'DB.DBA.RDF_SW_PING', vector (ps, new_origin_uri));
+ return 1;
+ }
+ else if ((only_rdfa = 1 and strstr (ret_content_type, 'text/html') is not null) or (strstr (ret_content_type, 'application/xhtml+xml') is not null))
+ {
+ declare exit handler for sqlstate '*'
+ {
+ if (registry_get ('__sparql_mappers_debug') = '1')
+ dbg_printf ('%s: SQL_MESSAGE: %s', current_proc_name(), __SQL_MESSAGE);
+ goto load_grddl;
+ };
+ --log_enable (2, 1);
+ DB.DBA.RDF_LOAD_RDFA (ret_body, base, coalesce (dest, graph_iri));
+ rdf_fmt := 1;
+ if (groupdest is not null and groupdest <> coalesce (dest, graph_iri))
+ DB.DBA.RDF_LOAD_RDFA (ret_body, base, groupdest);
--log_enable (saved_log_mode, 1);
if (aq is not null)
aq_request (aq, 'DB.DBA.RDF_SW_PING', vector (ps, new_origin_uri));
@@ -1271,6 +1389,20 @@ create procedure DB.DBA.RDF_LOAD_HTTP_RESPONSE (in graph_iri varchar, in new_ori
-- }
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
{
@@ -1331,7 +1463,7 @@ load_grddl:;
}
if (__tag(rc) = 193 or rc < 0 or rc > 0)
{
- if (__proc_exists ('DB.DBA.RDF_LOAD_POST_PROCESS')) -- optional step, by default skip
+ if (rc > 0 and __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;
@@ -1340,6 +1472,7 @@ 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);
@@ -1351,7 +1484,11 @@ load_grddl:;
-- DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, groupdest);
-- return 1;
-- }
- if (dest is null)
+
+ if (rdf_fmt) -- even cartridges didn't extracted anything more, the rdf is already loaded
+ return 1;
+
+ if ((dest is null) and (get_soft is null or (get_soft <> 'add')))
{
DB.DBA.SPARUL_CLEAR (graph_iri, 1, 0);
commit work;
@@ -1391,6 +1528,12 @@ 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;
}
;
@@ -1456,7 +1599,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 (', graph_iri, options, ')');
+ -- dbg_obj_princ ('DB.DBA.RDF_SPONGE_UP_1 (', graph_iri, options, ')');
graph_iri := cast (graph_iri as varchar);
--set_user_id ('dba', 1);
dest := get_keyword_ucase ('get:destination', options);
@@ -1474,7 +1617,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 (', graph_iri, options, ') set local_iri=', local_iri);
+ -- dbg_obj_princ ('DB.DBA.RDF_SPONGE_UP_1 (', 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)
@@ -1487,7 +1630,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 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_1 due to lack of read permission for user ', uid);
return null;
}
res_graph_iri := local_iri;
@@ -1496,18 +1639,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))
+ if (('replacing' = get_soft) or ('replace' = get_soft) or ('add' = get_soft))
{
-- dbg_obj_princ ('get:soft=replacing');
;
}
else
signal ('RDFZZ', sprintf (
- 'This version of Virtuoso supports only "soft" and "replacing" values of "define get:soft ...", not "%.500s"',
+ 'This version of Virtuoso supports only "soft", "replacing" and "add" 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 due to lack of sponge permission for user ', uid);
+ -- dbg_obj_princ (res_graph_iri, ' graph is not sponged by RDF_SPONGE_UP_1 due to lack of sponge permission for user ', uid);
return null;
}
-- if requested iri is immutable, do not try to get it at all
@@ -1569,7 +1712,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');
+ -- dbg_obj_princ (res_graph_iri, ' graph is ready, about to return from RDF_SPONGE_UP_1');
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 6a89f08..39fad65 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.8 2011/09/28 17:01:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
-- RDF Schema objects, generator of RDF Views
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/rdfbox.c b/libsrc/Wi/rdfbox.c
index cdd2041..476d652 100644
--- a/libsrc/Wi/rdfbox.c
+++ b/libsrc/Wi/rdfbox.c
@@ -1,10 +1,10 @@
/*
- * $Id: rdfbox.c,v 1.47.2.63 2011/10/14 12:47:29 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -34,6 +34,16 @@
#include "xslt_impl.h" /* For vector_sort_t */
#include "aqueue.h" /* For aq_allocate() in rdf replication */
+#define PRINT_ERR(err) \
+ if (err) \
+ { \
+ log_error ("Error compiling a server init statement : %s: %s -- %s:%d", \
+ ((caddr_t *) err)[QC_ERRNO], ((caddr_t *) err)[QC_ERROR_STRING], \
+ __FILE__, __LINE__); \
+ dk_free_tree (err); \
+ err = NULL; \
+ }
+
void
rb_complete_1 (rdf_box_t * rb, lock_trx_t * lt, void * /*actually query_instance_t * */ caller_qi_v, int is_local)
{
@@ -41,8 +51,9 @@ rb_complete_1 (rdf_box_t * rb, lock_trx_t * lt, void * /*actually query_instance
static query_t *rdf_box_qry_complete_text = NULL;
static query_t *rdf_box_qry_complete_xml_l;
static query_t *rdf_box_qry_complete_text_l;
+ query_t *qr;
query_instance_t *caller_qi = (query_instance_t *)caller_qi_v;
- caddr_t err;
+ caddr_t err = NULL;
local_cursor_t *lc;
dtp_t value_dtp = ((rb->rb_chksum_tail) ? (((rdf_bigbox_t *)rb)->rbb_box_dtp) : DV_TYPE_OF (rb->rb_box));
#ifdef DEBUG
@@ -56,7 +67,8 @@ rb_complete_1 (rdf_box_t * rb, lock_trx_t * lt, void * /*actually query_instance
16843009, \
RO_VAL \
from DB.DBA.RDF_OBJ table option (no cluster) where RO_ID = ?",
- bootstrap_cli, NULL, SQLC_DEFAULT );
+ bootstrap_cli, &err, SQLC_DEFAULT );
+ PRINT_ERR(err);
rdf_box_qry_complete_text_l = sql_compile_static ("select \
case (isnull (RO_LONG)) \
when 0 then case (bit_and (RO_FLAGS, 2)) when 2 then xml_tree_doc (__xml_deserialize_packed (RO_LONG)) else blob_to_string (RO_LONG) end \
@@ -64,13 +76,15 @@ rb_complete_1 (rdf_box_t * rb, lock_trx_t * lt, void * /*actually query_instance
RO_DT_AND_LANG, \
case (isnull (RO_LONG)) when 0 then RO_VAL else NULL end \
from DB.DBA.RDF_OBJ table option (no cluster) where RO_ID = ? ",
- bootstrap_cli, NULL, SQLC_DEFAULT );
+ bootstrap_cli, &err, SQLC_DEFAULT );
+ PRINT_ERR(err);
rdf_box_qry_complete_xml = sql_compile_static ("select \
xml_tree_doc (__xml_deserialize_packed (RO_LONG)), \
16843009, \
RO_VAL \
from DB.DBA.RDF_OBJ where RO_ID = ?",
- bootstrap_cli, NULL, SQLC_DEFAULT );
+ bootstrap_cli, &err, SQLC_DEFAULT );
+ PRINT_ERR(err);
rdf_box_qry_complete_text = sql_compile_static ("select \
case (isnull (RO_LONG)) \
when 0 then case (bit_and (RO_FLAGS, 2)) when 2 then xml_tree_doc (__xml_deserialize_packed (RO_LONG)) else blob_to_string (RO_LONG) end \
@@ -78,12 +92,15 @@ rb_complete_1 (rdf_box_t * rb, lock_trx_t * lt, void * /*actually query_instance
RO_DT_AND_LANG, \
case (isnull (RO_LONG)) when 0 then RO_VAL else NULL end \
from DB.DBA.RDF_OBJ where RO_ID = ?",
- bootstrap_cli, NULL, SQLC_DEFAULT );
+ bootstrap_cli, &err, SQLC_DEFAULT );
+ PRINT_ERR(err);
}
- err = qr_rec_exec (
- is_local ? (DV_XML_ENTITY == value_dtp ? rdf_box_qry_complete_xml_l : rdf_box_qry_complete_text_l)
- : (DV_XML_ENTITY == value_dtp ? rdf_box_qry_complete_xml : rdf_box_qry_complete_text),
- lt->lt_client, &lc, caller_qi, NULL, 1,
+ qr = is_local ? (DV_XML_ENTITY == value_dtp ? rdf_box_qry_complete_xml_l : rdf_box_qry_complete_text_l)
+ : (DV_XML_ENTITY == value_dtp ? rdf_box_qry_complete_xml : rdf_box_qry_complete_text);
+ if (!qr)
+ sqlr_new_error ("22023", "RDFXX", "RDF integrity issue, rdf box can not be completed");
+
+ err = qr_rec_exec (qr, lt->lt_client, &lc, caller_qi, NULL, 1,
":0", box_num(rb->rb_ro_id), QRP_RAW );
if (NULL != err)
{
@@ -215,12 +232,15 @@ 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 = box_copy_tree (chksum);
+ rbb->rbb_chksum = chksum; /* Not box_copy_tree (chksum) */
if (6 < BOX_ELEMENTS (args))
{
long dtp = bif_long_arg (qst, args, 6, "rdf_box");
if ((dtp &~0xFF) || ! (dtp & 0x80))
- sqlr_new_error ("22023", "SR556", "Invalid dtp %ld in call of rdf_box()", dtp);
+ {
+ dk_free_box ((caddr_t *)rbb);
+ sqlr_new_error ("22023", "SR556", "Invalid dtp %ld in call of rdf_box()", dtp);
+ }
rbb->rbb_box_dtp = (dtp_t)dtp;
}
else
@@ -836,7 +856,7 @@ rb_serialize (caddr_t x, dk_session_t * ses)
rb_ext_serialize (rb, ses);
return;
}
- if (!unbox_inline (rb->rb_box))
+ if (!unbox (rb->rb_box))
{
if (!rb->rb_is_complete)
{
@@ -1048,7 +1068,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 (dtp2 > DV_RDF)
+ if (dtp_canonical[dtp2] > DV_RDF) /* dtp_canonical because dv int64 is gt dv rdf but here it counts for dv long int */
return DVC_DTP_LESS;
if (RBS_SKIP_DTP & flags1)
{
@@ -1367,11 +1387,7 @@ 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)
{
@@ -1580,7 +1596,7 @@ bif_rdf_strsqlval (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
case DV_DB_NULL:
return NEW_DB_NULL;
default:
- res = box_cast_to_UTF8 (qst, val);
+ res = box_cast_to_UTF8_xsd (qst, val);
box_flags (res) = ((set_bf_iri & 0x2) ? BF_IRI : BF_UTF8);
return res;
}
@@ -1611,9 +1627,12 @@ 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);
+ caddr_t tmp_utf8_box = box_cast_to_UTF8_xsd (qst, val);
dks_esc_write (out, tmp_utf8_box, box_length (tmp_utf8_box) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_TTL_DQ);
dk_free_box (tmp_utf8_box);
break;
@@ -1812,11 +1831,15 @@ 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;
- caddr_t uri, ns, prefix, loc;
- ptrlong is_bnode;
- ptrlong is_iri;
+ 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 */
} ttl_iriref_t;
typedef struct ttl_iriref_items_s {
@@ -1836,7 +1859,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 - 9);
+ local_ret[0] = box_dv_short_nchars (iri + 9, iri_boxlen - 10);
is_bnode_ret[0] = 1;
return 1;
}
@@ -1898,6 +1921,57 @@ 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)
{
@@ -1959,7 +2033,7 @@ 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 (23*2,
+ tmp = (caddr_t *)list (25*2,
"text/rdf+n3" , "TTL" , /* 0 */
"text/rdf+ttl" , "TTL" , /* 1 */
"text/rdf+turtle" , "TTL" , /* 2 */
@@ -1982,7 +2056,9 @@ bif_http_sys_find_best_sparql_accept (caddr_t * qst, caddr_t * err_ret, state_sl
"text/plain" , "NT" , /* 19 */
"text/cxml+qrcode" , "CXML" , /* 20 */
"text/cxml" , "CXML" , /* 21 */
- "text/csv" , "CSV" /* 22 Increase count in this list() call when add more MIME types! */ );
+ "text/ntriples" , "NT" , /* 22 */
+ "text/csv" , "CSV" , /* 23 */
+ "text/tab-separated-values" , "TSV" /* 24 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_rset = tmp;
@@ -1991,37 +2067,43 @@ 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 (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! */ );
+ tmp = (caddr_t *)list (36*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/ntriples" , "NT" , /* 33 */
+ "text/csv" , "CSV" , /* 34 */
+ "text/tab-separated-values" , "TSV" /* 35 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;
@@ -2050,7 +2132,7 @@ typedef struct ttl_env_s {
} ttl_env_t;
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)
+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)
{
id_hash_iterator_t *ns2pref_hit = env->te_used_prefixes;
id_hash_t *ns2pref = ns2pref_hit->hit_hash;
@@ -2093,6 +2175,15 @@ ttl_http_write_prefix_if_needed (caddr_t *qst, dk_session_t *ses, ttl_env_t *env
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);
@@ -2172,30 +2263,31 @@ rdf_box_get_lang (query_instance_t * qi, unsigned short lang)
static void
http_ttl_or_nt_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)
- 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;
- }
- }
- else
+ switch (obj_dtp)
{
- if (DV_DATETIME != obj_dtp)
+ case DV_RDF:
+ {
+ 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)
+ 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;
return;
+ }
+ case DV_DATETIME:
switch (DT_DT_TYPE(obj))
{
- case DT_TYPE_DATE: dt_ret->uri = uname_xmlschema_ns_uri_hash_date; break;
- case DT_TYPE_TIME: dt_ret->uri = uname_xmlschema_ns_uri_hash_time; break;
- default : dt_ret->uri = uname_xmlschema_ns_uri_hash_dateTime; break;
+ case DT_TYPE_DATE: dt_ret->uri = uname_xmlschema_ns_uri_hash_date; return;
+ case DT_TYPE_TIME: dt_ret->uri = uname_xmlschema_ns_uri_hash_time; return;
+ default : dt_ret->uri = uname_xmlschema_ns_uri_hash_dateTime; return;
}
+ case DV_SINGLE_FLOAT: dt_ret->uri = uname_xmlschema_ns_uri_hash_float; return;
+ case DV_DOUBLE_FLOAT: dt_ret->uri = uname_xmlschema_ns_uri_hash_double; return;
+ default: ;
}
}
@@ -2287,22 +2379,80 @@ 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;
+ case DV_SINGLE_FLOAT:
+ {
+ char tmpbuf[50];
+ int buffill;
+ double boxdbl = (double)(unbox_float (obj_box_value));
+ buffill = sprintf (tmpbuf, "\"%lg", boxdbl);
+ if ((NULL == strchr (tmpbuf+1, '.')) && (NULL == strchr (tmpbuf+1, 'E')) && (NULL == strchr (tmpbuf+1, 'e')))
+ {
+ if (isalpha(tmpbuf[1+1]))
+ {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ double myNEGINF_d = -1.0/myZERO;
+ if (myPOSINF_d == boxdbl) buffill = sprintf (tmpbuf, "\"INF\"");
+ else if (myNEGINF_d == boxdbl) buffill = sprintf (tmpbuf, "\"-INF\"");
+ else buffill = sprintf (tmpbuf, "\"NAN\"");
+ }
+ else
+ {
+ strcpy (tmpbuf+buffill, ".0");
+ buffill += 2;
+ }
+ } /* .0123456789012 */
+ strcpy (tmpbuf+buffill, "\"^^xsd:float");
+ buffill += 12;
+ session_buffered_write (ses, tmpbuf, buffill);
+ break;
+ }
+ case DV_DOUBLE_FLOAT:
+ {
+ char tmpbuf[50];
+ int buffill;
+ double boxdbl = unbox_double (obj_box_value);
+ buffill = sprintf (tmpbuf, "%lg", boxdbl);
+ if ((NULL == strchr (tmpbuf, '.')) && (NULL == strchr (tmpbuf, 'E')) && (NULL == strchr (tmpbuf, 'e')))
+ {
+ if (isalpha(tmpbuf[1]))
+ {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ double myNEGINF_d = -1.0/myZERO;
+ if (myPOSINF_d == boxdbl) buffill = sprintf (tmpbuf, "\"INF\"^^xsd:double");
+ else if (myNEGINF_d == boxdbl) buffill = sprintf (tmpbuf, "\"-INF\"^^xsd:double");
+ else buffill = sprintf (tmpbuf, "\"NAN\"^^xsd:double");
+ }
+ else
+ {
+ strcpy (tmpbuf+buffill, ".0");
+ buffill += 2;
+ }
+ }
+ session_buffered_write (ses, tmpbuf, buffill);
+ break;
+ }
default:
{
- caddr_t tmp_utf8_box = box_cast_to_UTF8 ((caddr_t *)qi, obj_box_value);
- if (DV_RDF == obj_dtp)
+ caddr_t tmp_utf8_box = box_cast_to_UTF8 ((caddr_t *)qi, obj_box_value); /* not box_cast_to_UTF8_xsd(), because float and double are handled above and there are no other differences between xsd and sql so far */
+ int need_quotes = ((DV_RDF == obj_dtp) || (DV_BLOB_HANDLE == obj_dtp) || (DV_BLOB_WIDE_HANDLE == obj_dtp));
+ if (need_quotes)
session_buffered_write_char ('"', ses);
session_buffered_write (ses, tmp_utf8_box, box_length (tmp_utf8_box) - 1);
- if (DV_RDF == obj_dtp)
+ if (need_quotes)
session_buffered_write_char ('"', ses);
dk_free_box (tmp_utf8_box);
break;
@@ -2331,6 +2481,76 @@ 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;
@@ -2443,6 +2663,350 @@ 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_PTEXT);
+ 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_PTEXT);
+ 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_xsd ((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;
+ }
+ if (tii.p.loc && !tii.p.loc[0])
+ session_buffered_write (ses, "\n <!--", 9);
+ /* .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);
+ }
+ if (tii.p.loc && !tii.p.loc[0])
+ session_buffered_write (ses, "\n -->", 8);
+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. */
@@ -2522,6 +3086,11 @@ 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),
@@ -2531,34 +3100,30 @@ 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:
{
- 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);
+ caddr_t iri = xsd_type_of_box (obj_box_value);
+ caddr_t tmp_utf8_box = box_cast_to_UTF8_xsd ((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)
+ if ((DV_RDF != obj_dtp) && (DV_WIDE != obj_box_value_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;
}
}
@@ -2798,7 +3363,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;
- ccaddr_t type_uri = NULL, to_free = NULL;
+ caddr_t type_uri = NULL;
if (DV_RDF == obj_dtp)
{
rdf_box_t *rb = (rdf_box_t *)obj;
@@ -2808,9 +3373,7 @@ 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)
- {
- to_free = type_uri = rdf_type_twobyte_to_iri (rb->rb_type);
- }
+ type_uri = rdf_type_twobyte_to_iri (rb->rb_type);
}
else
{
@@ -2844,10 +3407,16 @@ 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));
- type_uri = uname_rdf_ns_uri_XMLLiteral;
+ if (NULL == type_uri)
+ type_uri = uname_rdf_ns_uri_XMLLiteral;
break;
}
case DV_DB_NULL:
@@ -2890,9 +3459,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
@@ -2984,7 +3553,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;
- ccaddr_t type_uri = NULL;
+ caddr_t type_uri = NULL;
if (DV_RDF == obj_dtp)
{
rdf_box_t *rb = (rdf_box_t *)obj;
@@ -3017,11 +3586,12 @@ 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.234567890.12345 */
- session_buffered_write (ses, "{ \"@literal\" : ", 15);
+ /* 0 1 */
+ /* 01.2345678.90123 */
+ session_buffered_write (ses, "{ \"@value\" : ", 13);
switch (obj_box_value_dtp)
{
case DV_DATETIME:
@@ -3045,10 +3615,16 @@ 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));
- type_uri = uname_rdf_ns_uri_XMLLiteral;
+ if (NULL == type_uri)
+ type_uri = uname_rdf_ns_uri_XMLLiteral;
break;
}
case DV_DB_NULL:
@@ -3089,11 +3665,12 @@ 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.3456789012.3456.78 */
- session_buffered_write (ses, " , \"@datatype\" : \"", 18);
+ /* 0 1 */
+ /* 012.345678.9012.34 */
+ session_buffered_write (ses, " , \"@type\" : \"", 14);
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);
}
@@ -3141,36 +3718,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.6789 */
- session_buffered_write (ses, " ] } ,\n ", 9);
+ { /* 012345.678901 */
+ session_buffered_write (ses, " ] } ,\n ", 11);
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.23.456.78 */
- session_buffered_write (ses, "{ \"@\": \"", 8);
+ /* 01.2345.678.90 */
+ session_buffered_write (ses, "{ \"@id\": \"", 10);
dks_esc_write (ses, subj_iri, box_length (subj_iri) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_JSWRITE_DQ);
- /* .01.23 */
- session_buffered_write (ses, "\",\n", 3);
+ /* .01.23456789 */
+ session_buffered_write (ses, "\",\n ", 9);
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.456789 */
- session_buffered_write (ses, " ] ,\n ", 9);
+ { /* 0123.45678901 */
+ session_buffered_write (ses, " ] ,\n ", 11);
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_char ('a', ses);
+ session_buffered_write (ses, "@type", 5);
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.23456789 */
- session_buffered_write (ses, " ,\n ", 9);
+ else /* 01.2345678901 */
+ session_buffered_write (ses, " ,\n ", 11);
if (obj_is_iri)
{
session_buffered_write_char ('\"', ses);
@@ -3485,6 +4062,13 @@ 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)))
@@ -3517,6 +4101,7 @@ 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
@@ -3530,6 +4115,7 @@ 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
@@ -3554,12 +4140,13 @@ literal_elt_printed:
}
default:
{
- ccaddr_t iri = xsd_type_of_box (val);
+ caddr_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>");
@@ -3665,7 +4252,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));
@@ -4103,6 +4690,12 @@ bif_rgs_ack_cbk (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
}
caddr_t
+bif_rdf_repl_uid (caddr_t *qst, caddr_t * err_ret, state_slot_t **args)
+{
+ return box_num (U_ID_RDF_REPL);
+}
+
+caddr_t
bif_rdf_graph_is_in_enabled_repl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
return box_num (0);
@@ -4195,7 +4788,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_input_name = NEW_DB_NULL;
+ tf->tf_boxed_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)
@@ -4262,7 +4855,6 @@ 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);
}
@@ -4581,10 +5173,16 @@ 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);
@@ -4620,6 +5218,7 @@ rdf_box_init ()
bif_define ("__rgs_ack", bif_rgs_ack);
bif_define ("__rgs_ack_cbk", bif_rgs_ack_cbk);
bif_set_uses_index (bif_rgs_ack_cbk );
+ bif_define_typed ("__rdf_repl_uid", bif_rdf_repl_uid, &bt_integer);
repl_pub_name = box_dv_short_string ("__rdf_repl");
text5arg = box_dv_short_string ("__rdf_repl_action (?, ?, ?, ?, ?)");
text6arg = box_dv_short_string ("__rdf_repl_action (?, ?, ?, ?, ?, ?)");
diff --git a/libsrc/Wi/rdfinf.c b/libsrc/Wi/rdfinf.c
index 752de8e..0e0a1ac 100644
--- a/libsrc/Wi/rdfinf.c
+++ b/libsrc/Wi/rdfinf.c
@@ -1,14 +1,14 @@
/*
* rdfinf.c
*
- * $Id: rdfinf.c,v 1.19.2.33 2011/10/13 14:06:54 source Exp $
+ * $Id$
*
* RDF Inference
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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 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) "
+ " 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) "
" 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 3db3344..8228cb7 100644
--- a/libsrc/Wi/rdfinf.h
+++ b/libsrc/Wi/rdfinf.h
@@ -1,10 +1,10 @@
/*
- * $Id: rdfinf.h,v 1.6.2.6 2011/01/10 20:49:47 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/rdflddir2.sql b/libsrc/Wi/rdflddir2.sql
index 462d536..efa2615 100644
--- a/libsrc/Wi/rdflddir2.sql
+++ b/libsrc/Wi/rdflddir2.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdflddir2.sql,v 1.1.2.8 2011/10/28 13:16:44 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2011 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/rdfxml_parser.c b/libsrc/Wi/rdfxml_parser.c
index 4afa507..3f20493 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.19 2011/05/16 09:04:22 source Exp $
+ * $Id$
*
* RDF/XML parser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -39,12 +39,184 @@ 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 { \
@@ -164,7 +336,7 @@ xp_rdfxml_locals_t *xp_push_rdf_locals (xparse_ctx_t *xp)
caddr_t
-xp_rdfxml_resolved_iid (xparse_ctx_t *xp, const char *avalue, int is_id_attr)
+xp_rdfxml_resolve_iri_avalue (xparse_ctx_t *xp, const char *avalue, int is_id_attr)
{
caddr_t err = NULL;
caddr_t local, res;
@@ -176,7 +348,12 @@ xp_rdfxml_resolved_iid (xparse_ctx_t *xp, const char *avalue, int is_id_attr)
}
else
local = box_dv_short_string (avalue);
- res = xml_uri_resolve_like_get (xp->xp_qi, &err, xp->xp_rdfxml_locals->xrl_base, local, "UTF-8");
+#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
dk_free_box (local);
if (NULL != err)
sqlr_resignal (err);
@@ -233,7 +410,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;
@@ -245,12 +422,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;
@@ -285,17 +462,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))
@@ -321,26 +498,56 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
return;
}
#endif
- 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);
+ 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);
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
{
@@ -348,7 +555,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;
@@ -373,8 +580,13 @@ 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");
- TF_CHANGE_BASE_AND_DEFAULT_GRAPH(xp->xp_tf,box_dv_short_string (avalue));
+ caddr_t local_base;
+ if ((NULL != inner->xrl_base) && ('\0' != inner->xrl_base))
+ local_base = xp_rdfxml_resolve_iri_avalue (xp, avalue, 0);
+ else
+ local_base = box_dv_short_string (avalue);
+ XRL_SET_INHERITABLE (inner, xrl_base, local_base, "Attribute 'xml:base' is used twice");
+ TF_CHANGE_BASE_AND_DEFAULT_GRAPH(xp->xp_tf, box_copy (local_base));
}
else if (0 != strcmp (tmp_local, "space"))
xmlparser_logprintf (xp->xp_parser, XCFG_WARNING, 200,
@@ -391,24 +603,24 @@ 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;
}
- inner_subj = xp_rdfxml_resolved_iid (xp, avalue, 0);
+ inner_subj = xp_rdfxml_resolve_iri_avalue (xp, avalue, 0);
XRL_SET_NONINHERITABLE (inner, xrl_subject, inner_subj, "Attribute 'rdf:about' conflicts with other attribute that set the subject");
inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST;
}
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;
}
- inner_subj = xp_rdfxml_resolved_iid (xp, avalue, 0);
+ inner_subj = xp_rdfxml_resolve_iri_avalue (xp, avalue, 0);
XRL_SET_NONINHERITABLE (inner, xrl_subject, inner_subj, "Attribute 'rdf:resource' conflicts with other attribute that set the subject");
inner->xrl_parsetype = XRL_PARSETYPE_EMPTYPROP;
}
@@ -416,7 +628,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;
}
@@ -427,31 +639,31 @@ 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);
+ caddr_t reif_subj = xp_rdfxml_resolve_iri_avalue (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");
}
else
{
- caddr_t inner_subj = xp_rdfxml_resolved_iid (xp, avalue, 1);
+ caddr_t inner_subj = xp_rdfxml_resolve_iri_avalue (xp, avalue, 1);
XRL_SET_NONINHERITABLE (inner, xrl_subject, inner_subj, "Attribute 'rdf:ID' conflicts with other attribute that set node ID");
inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST;
}
}
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' us used twice");
+ XRL_SET_NONINHERITABLE (inner, xrl_datatype, xp_rdfxml_resolve_iri_avalue (xp, avalue, 0), "Attribute 'rdf:datatype' is 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;
@@ -460,15 +672,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;
+ inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST | XRL_PARSETYPE_SET_EXPLICITLY;
}
else if (!strcmp (avalue, "Literal"))
{
- inner->xrl_parsetype = XRL_PARSETYPE_LITERAL;
+ inner->xrl_parsetype = XRL_PARSETYPE_LITERAL | XRL_PARSETYPE_SET_EXPLICITLY;
}
else if (!strcmp (avalue, "Collection"))
{
- inner->xrl_parsetype = XRL_PARSETYPE_COLLECTION;
+ inner->xrl_parsetype = XRL_PARSETYPE_COLLECTION | XRL_PARSETYPE_SET_EXPLICITLY;
return;
}
else
@@ -477,21 +689,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,
@@ -522,37 +734,34 @@ 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);
#ifdef RECOVER_RDF_VALUE
if (NULL != rdf_val)
{ /* This preserves semantics */
- caddr_t resolved_rdf_val = xp_rdfxml_resolved_iid (xp, rdf_val, 0);
+ caddr_t resolved_rdf_val = xp_rdfxml_resolve_iri_avalue (xp, rdf_val, 0);
xp_rdfxml_triple (xp, inner->xrl_subject, uname_rdf_ns_uri_value, resolved_rdf_val);
dk_free_box (resolved_rdf_val);
}
@@ -580,11 +789,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, NULL);
+ xp_rdfxml_triple_l (xp, inner->xrl_subject, aname, avalue, NULL, inner->xrl_language);
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)
@@ -605,12 +814,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;
@@ -623,7 +832,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)
@@ -640,15 +849,31 @@ 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)
- 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) && (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
{
- 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 (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);
+ }
}
}
if (0 != strses_length (xp->xp_strses))
@@ -666,12 +891,15 @@ 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)
+ if ((NULL == xp->xp_current->xn_children) && !(XRL_PARSETYPE_SET_EXPLICITLY & inner->xrl_parsetype))
{
obj = strses_string (xp->xp_strses);
strses_flush (xp->xp_strses);
+ lang_in_effect = inner->xrl_language;
}
else
{
@@ -685,12 +913,20 @@ 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, inner->xrl_parent->xrl_subject, inner->xrl_predicate, obj, inner->xrl_datatype, inner->xrl_language);
+ 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);
+ }
dk_free_tree (obj);
xp_pop_rdf_locals (xp);
return;
@@ -702,8 +938,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);
}
@@ -712,7 +948,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)
+ switch (xp->xp_rdfxml_locals->xrl_parsetype & (XRL_PARSETYPE_LITERAL | XRL_PARSETYPE_RES_OR_LIT))
{
case XRL_PARSETYPE_LITERAL:
session_buffered_write (xp->xp_strses, s, len);
@@ -747,7 +983,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)
+ switch (xp->xp_rdfxml_locals->xrl_parsetype & (XRL_PARSETYPE_LITERAL | XRL_PARSETYPE_RES_OR_LIT))
{
case XRL_PARSETYPE_LITERAL:
xp_entity (parser, refname, reflen, isparam, edef);
@@ -766,7 +1002,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)
+ switch (xp->xp_rdfxml_locals->xrl_parsetype & (XRL_PARSETYPE_LITERAL | XRL_PARSETYPE_TOP_LEVEL | XRL_PARSETYPE_RES_OR_LIT))
{
case XRL_PARSETYPE_LITERAL:
xp_pi (parser, target, data);
@@ -778,7 +1014,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_FATAL, 100, "Processing instruction found instead of XML element");
+ xmlparser_logprintf (xp->xp_parser, XCFG_WARNING, 100, "Processing instruction found instead of XML element");
break;
}
}
@@ -879,7 +1115,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);
@@ -1111,7 +1347,7 @@ next_token:
if (!lpar_found && strchr (tail, '('))
lpar_found = 1; /* 012345678901 */
if (!lpar_found && strncmp ("javascript:", attrvalue, 11))
- break;
+ break;
}
tail++;
}
@@ -1195,22 +1431,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)
{
@@ -1234,7 +1470,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)
{
@@ -1245,11 +1481,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))
{
@@ -1581,7 +1817,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;
@@ -1785,16 +2021,16 @@ xp_rdfa_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata)
}
}
if (NULL != avalues[RDFA_ATTR_ABOUT])
+ {
+ if (1 <= src_prio)
{
- 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() */
+ 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])
{
@@ -1804,80 +2040,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])
{
@@ -1890,8 +2126,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]);
}
@@ -1959,7 +2195,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");
@@ -2139,7 +2375,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;
@@ -2243,7 +2479,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);
@@ -2289,9 +2525,957 @@ 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));
+}
-/* Part 3. Common parser invocation routine */
+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) && (MDATA_IN_XMLLITERAL & inner_place_bits))
+ {
+ 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 */
void
rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
@@ -2317,14 +3501,18 @@ 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 (sizeof (xp_rdfxml_locals_t));
- memset (root_xrl, 0, sizeof (xp_rdfxml_locals_t));
+ root_xrl = (xp_rdfxml_locals_t *) dk_alloc_zero (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 ();
@@ -2353,11 +3541,26 @@ 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_ATTRIBUTES)
+ 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)
{
xp_rdfa_locals_t *root_xrdfal = xp_push_rdfa_locals (&context);
root_xrdfal->xrdfal_base = box_copy (base_uri);
- context.xp_tmp = dk_alloc_box_zero (sizeof (xp_tmp_t), DV_ARRAY_OF_POINTER);
+ context.xp_tmp = (xp_tmp_t *)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);
@@ -2385,10 +3588,11 @@ rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
}
tf = tf_alloc ();
tf->tf_qi = qi;
- tf->tf_default_graph_uri = graph_uri;
+ tf->tf_base_uri = box_copy (base_uri);
+ tf->tf_default_graph_uri = box_copy (graph_uri);
tf->tf_app_env = app_env;
tf->tf_creator = "rdf_load_rdfxml";
- tf->tf_input_name = source_name;
+ tf->tf_boxed_input_name = box_dv_short_string (source_name);
tf->tf_line_no_ptr = &(parser->curr_pos.line_num);
context.xp_tf = tf;
QR_RESET_CTX
@@ -2398,7 +3602,9 @@ 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;
+ rc = 0;
+ if (mode_bits & RDFXML_IN_MDATA)
+ mdata_process_pending_triples (&context);
tf_commit (tf);
}
QR_RESET_CODE
@@ -2454,3 +3660,47 @@ 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 ec87f77..26da742 100644
--- a/libsrc/Wi/recovery.c
+++ b/libsrc/Wi/recovery.c
@@ -1,14 +1,14 @@
/*
* recovery.c
*
- * $Id: recovery.c,v 1.12.2.10 2011/06/13 09:29:12 source Exp $
+ * $Id$
*
* Backup & Recovery procedures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/recovery.h b/libsrc/Wi/recovery.h
index 8a5ea44..bdd8466 100644
--- a/libsrc/Wi/recovery.h
+++ b/libsrc/Wi/recovery.h
@@ -1,10 +1,10 @@
/*
- * $Id: recovery.h,v 1.3.2.2 2009/04/18 21:55:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/regist.c b/libsrc/Wi/regist.c
index b050b52..a79184c 100644
--- a/libsrc/Wi/regist.c
+++ b/libsrc/Wi/regist.c
@@ -1,14 +1,14 @@
/*
* regist.c
*
- * $Id: regist.c,v 1.13.2.6 2010/05/12 12:24:29 source Exp $
+ * $Id$
*
* Database Registry
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/remote.h b/libsrc/Wi/remote.h
index b80e392..a4b3152 100644
--- a/libsrc/Wi/remote.h
+++ b/libsrc/Wi/remote.h
@@ -1,14 +1,14 @@
/*
* remote.h
*
- * $Id: remote.h,v 1.8.2.2 2009/06/08 14:27:18 source Exp $
+ * $Id$
*
* Virtuoso Remote Data Source Access
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/rendezvous.c b/libsrc/Wi/rendezvous.c
index 616adcd..2cfa774 100644
--- a/libsrc/Wi/rendezvous.c
+++ b/libsrc/Wi/rendezvous.c
@@ -1,14 +1,14 @@
/*
* rendezvous.c
*
- * $Id: rendezvous.c,v 1.5.2.3 2010/09/17 20:49:12 source Exp $
+ * $Id$
*
* Rendezvous registration for Virtuoso
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/rendezvous.h b/libsrc/Wi/rendezvous.h
index d536eff..01c4920 100644
--- a/libsrc/Wi/rendezvous.h
+++ b/libsrc/Wi/rendezvous.h
@@ -1,10 +1,10 @@
/*
- * $Id: rendezvous.h,v 1.2.2.1 2009/04/18 21:55:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/repl.h b/libsrc/Wi/repl.h
index d944e04..a4ecbae 100644
--- a/libsrc/Wi/repl.h
+++ b/libsrc/Wi/repl.h
@@ -1,12 +1,12 @@
/*
* repl.h
*
- * $Id: repl.h,v 1.3.2.2 2010/09/17 16:35:47 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/repl.sql b/libsrc/Wi/repl.sql
index 0aa5b40..ed38702 100644
--- a/libsrc/Wi/repl.sql
+++ b/libsrc/Wi/repl.sql
@@ -1,14 +1,14 @@
--
-- repl.sql
--
--- $Id: repl.sql,v 1.4.2.3 2011/09/12 20:04:31 source Exp $
+-- $Id$
--
-- TRX replication support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/replddk.sql b/libsrc/Wi/replddk.sql
index 56dd749..4b0d70b 100644
--- a/libsrc/Wi/replddk.sql
+++ b/libsrc/Wi/replddk.sql
@@ -1,14 +1,14 @@
--
-- replddk.sql
--
--- $Id: replddk.sql,v 1.2.2.1 2009/04/18 21:55:13 source Exp $
+-- $Id$
--
-- TRX replication support tables definition
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/replsr.h b/libsrc/Wi/replsr.h
index 85cdb12..1cc84bd 100644
--- a/libsrc/Wi/replsr.h
+++ b/libsrc/Wi/replsr.h
@@ -1,12 +1,12 @@
/*
* replsr.h
*
- * $Id: replsr.h,v 1.3.2.2 2010/02/18 21:37:27 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/rltrx.c b/libsrc/Wi/rltrx.c
index b541b34..867fd25 100644
--- a/libsrc/Wi/rltrx.c
+++ b/libsrc/Wi/rltrx.c
@@ -1,14 +1,14 @@
/*
* rltrx.c
*
- * $Id: rltrx.c,v 1.18.2.21 2011/10/19 15:14:10 source Exp $
+ * $Id$
*
* Locking concurrency control
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/row.c b/libsrc/Wi/row.c
index 458db37..0ebda06 100644
--- a/libsrc/Wi/row.c
+++ b/libsrc/Wi/row.c
@@ -1,14 +1,14 @@
/*
* row.c
*
- * $Id: row.c,v 1.18.2.11 2011/05/02 08:23:27 source Exp $
+ * $Id$
*
* Row Operations.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -313,10 +313,10 @@ page_box_col (it_cursor_t * itc, buffer_desc_t * buf, db_buf_t row, dbe_col_loc_
int len;
int64 ln;
caddr_t str;
- unsigned short vl1, vl2, offset;
+ unsigned short vl1 = 0, vl2 = 0, offset = 0;
row_ver_t rv = IE_ROW_VERSION (row);
dbe_key_t * row_key = buf->bd_tree->it_key->key_versions[IE_KEY_VERSION (row)];
- db_buf_t xx, xx2;
+ db_buf_t xx = NULL, xx2 = NULL;
dtp_t col_dtp;
if (row[cl->cl_null_flag[rv]] & cl->cl_null_mask[rv])
return (dk_alloc_box (0, DV_DB_NULL));
@@ -360,7 +360,7 @@ page_box_col (it_cursor_t * itc, buffer_desc_t * buf, db_buf_t row, dbe_col_loc_
VL;
str = dk_alloc_box ((int) len + vl2 + 1, DV_LONG_STRING);
memcpy (str, xx, len);
- memcpy (str + len, xx2, vl2);
+ if (vl2 > 0) memcpy (str + len, xx2, vl2);
str[len + vl2 - 1] += offset;
str[len + vl2] = 0;
return str;
@@ -394,7 +394,7 @@ page_box_col (it_cursor_t * itc, buffer_desc_t * buf, db_buf_t row, dbe_col_loc_
VL;
str = dk_alloc_box ((int) len + vl2, DV_BIN);
memcpy (str, xx, (int) len);
- memcpy (str + len, xx2, (int) vl2);
+ if (vl2 > 0) memcpy (str + len, xx2, (int) vl2);
return str;
}
@@ -550,7 +550,7 @@ page_mp_box_col (it_cursor_t * itc, mem_pool_t * mp, buffer_desc_t * buf, db_buf
VL;
str = mp_alloc_box (mp, (int) len + vl2 + 1, DV_LONG_STRING);
memcpy (str, xx, len);
- memcpy (str + len, xx2, vl2);
+ if (vl2 > 0) memcpy (str + len, xx2, vl2);
str[len + vl2 - 1] += offset;
str[len + vl2] = 0;
return str;
@@ -578,7 +578,7 @@ page_mp_box_col (it_cursor_t * itc, mem_pool_t * mp, buffer_desc_t * buf, db_buf
VL;
str = mp_alloc_box (mp, (int) len + vl2, DV_BIN);
memcpy (str, xx, (int) len);
- memcpy (str + len, xx2, (int) vl2);
+ if (vl2 > 0) memcpy (str + len, xx2, (int) vl2);
return str;
}
@@ -641,7 +641,7 @@ rd_alloc_box (row_delta_t * rd, int len, dtp_t dtp)
}
#define RD_IRI_BOX(val) \
- { if (rd->rd_temp_fill + 16 < rd->rd_temp_max) \
+ { if (rd && (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;}}
@@ -724,7 +724,7 @@ page_copy_col (buffer_desc_t * buf, db_buf_t row, dbe_col_loc_t * cl, row_delta_
VL;
str = rd_alloc_box (rd, (int) len + vl2, DV_BIN);
memcpy (str, xx, (int) len);
- memcpy (str + len, xx2, (int) vl2);
+ if (vl2 > 0) memcpy (str + len, xx2, (int) vl2);
str[len + vl2 - 1] += offset;
return str;
}
diff --git a/libsrc/Wi/schspace.c b/libsrc/Wi/schspace.c
index c99e7bf..19ce278 100644
--- a/libsrc/Wi/schspace.c
+++ b/libsrc/Wi/schspace.c
@@ -1,14 +1,14 @@
/*
* schspace.c
*
- * $Id: schspace.c,v 1.2.2.1 2009/04/18 21:55:13 source Exp $
+ * $Id$
*
* schema space resolution functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/schspace.h b/libsrc/Wi/schspace.h
index d50c88f..75ab6d0 100644
--- a/libsrc/Wi/schspace.h
+++ b/libsrc/Wi/schspace.h
@@ -1,12 +1,12 @@
/*
* schspace.h
*
- * $Id: schspace.h,v 1.2.2.1 2009/04/18 21:55:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/scn3.c b/libsrc/Wi/scn3.c
index 3a0a53f..953ffe0 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.8 2011/09/21 15:23:23 source Exp $
+ * $Id$
*
* SQL Scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2136,7 +2136,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t 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 5bcedcc..65a2786 100644
--- a/libsrc/Wi/scn3.l
+++ b/libsrc/Wi/scn3.l
@@ -1,14 +1,14 @@
/*
* scn3.l
*
- * $Id: scn3.l,v 1.21.2.8 2011/09/21 15:23:23 source Exp $
+ * $Id$
*
* SQL Scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/scn3split.c b/libsrc/Wi/scn3split.c
index 6b719df..1dcbace 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.8 2011/09/21 15:23:23 source Exp $
+ * $Id$
*
* SQL Scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2155,7 +2155,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t 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 0109f19..8c720f2 100644
--- a/libsrc/Wi/search.c
+++ b/libsrc/Wi/search.c
@@ -1,14 +1,14 @@
/*
* search.c
*
- * $Id: search.c,v 1.35.2.34 2011/06/20 14:15:43 source Exp $
+ * $Id$
*
* Search
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -36,6 +36,7 @@
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);
@@ -48,6 +49,7 @@ 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;
@@ -72,6 +74,18 @@ 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;
}
@@ -317,6 +331,9 @@ it_cursor_t *
dbg_itc_create (const char *file, int line, void * isp, lock_trx_t * trx)
{
it_cursor_t * itc = (it_cursor_t*) DBG_NAME (dk_alloc_box) (DBG_ARGS sizeof (it_cursor_t), DV_ITC);
+#ifdef VALGRIND
+ memset (itc, 0, sizeof (it_cursor_t));
+#endif
ITC_INIT (itc, isp, trx);
itc->itc_type = ITC_CURSOR;
itc->itc_is_allocated = 1;
@@ -327,6 +344,9 @@ it_cursor_t *
itc_create (void * isp, lock_trx_t * trx)
{
it_cursor_t * itc = (it_cursor_t*)dk_alloc_box (sizeof (it_cursor_t), DV_ITC);
+#ifdef VALGRIND
+ memset (itc, 0, sizeof (it_cursor_t));
+#endif
ITC_INIT (itc, isp, trx);
itc->itc_type = ITC_CURSOR;
itc->itc_is_allocated = 1;
@@ -979,9 +999,9 @@ itc_like_compare (it_cursor_t * itc, buffer_desc_t * buf, caddr_t pattern, searc
char temp[MAX_ROW_BYTES];
int res, st = LIKE_ARG_CHAR, pt = LIKE_ARG_CHAR;
dtp_t dtp2 = DV_TYPE_OF (pattern), dtp1;
- row_size_t len1, len3;
- unsigned short offset;
- db_buf_t dv1, dv3;
+ row_size_t len1 = 0, len3 = 0;
+ unsigned short offset = 0;
+ db_buf_t dv1 = NULL, dv3 = NULL;
collation_t *collation = spec->sp_collation;
dbe_col_loc_t * cl = &spec->sp_cl;
ROW_STR_COL (itc->itc_insert_key, buf, itc->itc_row_data, cl, dv1, len1, dv3, len3, offset);
diff --git a/libsrc/Wi/search_in.c b/libsrc/Wi/search_in.c
index c3eea52..59a68eb 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.5 2011/06/07 18:52:26 source Exp $
+ * $Id$
*
* Search
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/security.c b/libsrc/Wi/security.c
index 0eb00b4..8a70fcf 100644
--- a/libsrc/Wi/security.c
+++ b/libsrc/Wi/security.c
@@ -1,14 +1,14 @@
/*
* security.c
*
- * $Id: security.c,v 1.14.2.8 2010/11/11 15:53:45 source Exp $
+ * $Id$
*
* Security Checks
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/security.h b/libsrc/Wi/security.h
index 9a6b6e8..515c81b 100644
--- a/libsrc/Wi/security.h
+++ b/libsrc/Wi/security.h
@@ -1,12 +1,12 @@
/*
* security.h
*
- * $Id: security.h,v 1.6.2.4 2010/11/11 15:53:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/shcompo.c b/libsrc/Wi/shcompo.c
index a5ca4ea..c99a6d1 100644
--- a/libsrc/Wi/shcompo.c
+++ b/libsrc/Wi/shcompo.c
@@ -1,10 +1,10 @@
/*
- * $Id: shcompo.c,v 1.3.2.11 2011/09/14 15:38:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/shcompo.h b/libsrc/Wi/shcompo.h
index 961302e..96444e0 100644
--- a/libsrc/Wi/shcompo.h
+++ b/libsrc/Wi/shcompo.h
@@ -1,10 +1,10 @@
/*
- * $Id: shcompo.h,v 1.3.2.4 2011/09/14 15:38:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/shuric.c b/libsrc/Wi/shuric.c
index c423f00..0d778a0 100644
--- a/libsrc/Wi/shuric.c
+++ b/libsrc/Wi/shuric.c
@@ -1,10 +1,10 @@
/*
- * $Id: shuric.c,v 1.4.2.2 2010/02/10 16:03:28 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/shuric.h b/libsrc/Wi/shuric.h
index c81cca2..76696fa 100644
--- a/libsrc/Wi/shuric.h
+++ b/libsrc/Wi/shuric.h
@@ -1,10 +1,10 @@
/*
- * $Id: shuric.h,v 1.4.2.1 2009/04/18 21:55:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/simile.sql b/libsrc/Wi/simile.sql
index 9b2d824..b3b39f2 100644
--- a/libsrc/Wi/simile.sql
+++ b/libsrc/Wi/simile.sql
@@ -1,10 +1,10 @@
--
--- $Id: simile.sql,v 1.3 2008/11/19 11:24:53 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/snapshot_repl.sql b/libsrc/Wi/snapshot_repl.sql
index 9275fba..2309b2a 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.1 2009/04/18 21:55:13 source Exp $
+-- $Id$
--
-- SNP replication support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/soap.h b/libsrc/Wi/soap.h
index 52d6278..86ff9ae 100644
--- a/libsrc/Wi/soap.h
+++ b/libsrc/Wi/soap.h
@@ -1,10 +1,10 @@
/*
- * $Id: soap.h,v 1.5.2.1 2009/04/18 21:55:13 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/soap.sql b/libsrc/Wi/soap.sql
index 0d5e296..b9180b0 100644
--- a/libsrc/Wi/soap.sql
+++ b/libsrc/Wi/soap.sql
@@ -1,10 +1,10 @@
--
--- $Id: soap.sql,v 1.11.2.5 2011/09/28 17:01:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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-2011 OpenLink Software.</SPAN></DIV>
+<DIV class="foot"><SPAN class="foot">Virtuoso Universal Server <?=sys_stat('st_dbms_ver')?> - Copyright© 1998-2012 OpenLink Software.</SPAN></DIV>
</BODY>
</HTML>
<?vsp
diff --git a/libsrc/Wi/soap12_router.xsl b/libsrc/Wi/soap12_router.xsl
index b49100b..5986fe4 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 2009/04/09 13:22:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/soap_import_sch.xsl b/libsrc/Wi/soap_import_sch.xsl
index 255f8c4..f8c1f9b 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 2009/04/09 13:22:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/soap_sch.xsl b/libsrc/Wi/soap_sch.xsl
index 28e12b4..12b8ab3 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.1 2010/11/05 10:56:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/soap_xmlrpc.xsl b/libsrc/Wi/soap_xmlrpc.xsl
index f4e8e1c..1c54b37 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 2009/04/09 13:22:13 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/sort.c b/libsrc/Wi/sort.c
index ea5d304..18f4f82 100644
--- a/libsrc/Wi/sort.c
+++ b/libsrc/Wi/sort.c
@@ -1,14 +1,14 @@
/*
* sort.c
*
- * $Id: sort.c,v 1.14.2.8 2011/09/14 15:38:19 source Exp $
+ * $Id$
*
* SQL ORDER BY sort and DISTINCT
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/space.c b/libsrc/Wi/space.c
index 046f697..ea3ba4a 100644
--- a/libsrc/Wi/space.c
+++ b/libsrc/Wi/space.c
@@ -1,14 +1,14 @@
/*
* space.c
*
- * $Id: space.c,v 1.7.2.9 2011/05/10 18:37:35 source Exp $
+ * $Id$
*
* Delta spaces
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sparql.h b/libsrc/Wi/sparql.h
index c4753e4..4c55d52 100644
--- a/libsrc/Wi/sparql.h
+++ b/libsrc/Wi/sparql.h
@@ -1,10 +1,10 @@
/*
- * $Id: sparql.h,v 1.58.2.27 2011/06/11 16:41:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -38,18 +38,24 @@ extern "C" {
#ifdef DEBUG
#define SPARYYDEBUG
+#else
+#undef SPARQL_DEBUG
#endif
#ifdef SPARQL_DEBUG
#define spar_dbg_printf(x) printf x
+#define SPARQL_DBG_NAME(nm) dbg_##nm
+#define SPARQL_DBG_PARAMS const char *file, int line,
#else
#define spar_dbg_printf(x)
+#define SPARQL_DBG_NAME
+#define SPARQL_DBG_PARAMS
#endif
/*! 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
+#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_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,12 +75,77 @@ 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_BOP_EQ (ptrlong)1051 /*!< An equality that is not optimized into an equivalence class */
+
+#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 0x7Fffffff /* 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
struct spar_sqlgen_s;
struct spar_tree_s;
@@ -97,7 +168,6 @@ typedef struct spar_lexbmk_s {
ptrlong sparlb_offset;
} spar_lexbmk_t;
-
#if 0
typedef struct spar_query_s
{
@@ -120,7 +190,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;
@@ -139,8 +209,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_grab_consts */
- int rgc_intermediate; /*!< Automatically add all IRI constants/vars (except P) to spare_grab_consts */
+ 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 */
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 */
@@ -164,6 +234,7 @@ 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) */
@@ -172,16 +243,6 @@ 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
{
@@ -198,6 +259,7 @@ typedef struct sparp_env_s
caddr_t spare_output_dict_format_name; /*!< Overrides generic \c spare_output_format_name for "dictionary of triples" result sets, like CONSTRUCT and DESCRIBE */
caddr_t spare_output_route_name; /*!< Name of procedure that makes a decision re. method of writing SPARUL results (quad storage / DAV file / something else) */
caddr_t spare_output_storage_name; /*!< Name of quad_storage_t JSO object to control the use of quad mapping at SPARUL output side */
+ caddr_t spare_output_compose_report; /*!< Boxed non-NULL number that indicates wither a verbose report string should be created (value of 1) or just a number of changes (value of 0) */
caddr_t spare_output_maxrows; /*!< boxed maximum expected number of rows to return */
caddr_t spare_storage_name; /*!< Name of quad_storage_t JSO object to control the use of quad mapping at input side and maybe at SPARUL output side */
caddr_t spare_inference_name; /*!< Name of inference rule set to control the expansion of types */
@@ -225,6 +287,8 @@ 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 */
@@ -279,8 +343,9 @@ typedef struct sparp_s {
#ifdef XPYYDEBUG
int sparp_yydebug;
#endif
- caddr_t sparp_text;
+ ccaddr_t sparp_text;
int sparp_permitted_syntax; /*!< Bitmask of permitted syntax extensions, 0 for default */
+ int sparp_inner_permitted_syntax; /*!< The value of last define lang:dialect, it will be assigned to sparp_permitted_syntax for the subquery, -1 before set */
int sparp_unictr; /*!< Unique counter for objects */
/* Environment of yacc */
sparp_env_t * sparp_env;
@@ -291,7 +356,7 @@ typedef struct sparp_s {
int sparp_in_precode_expn; /*!< If nonzero (usually 1) then the parser reads precode-safe expression so it can not contain non-global variables, if bit 2 is set then even global variables are prohibited (like it is in INSERT DATA statement) */
int sparp_allow_aggregates_in_expn; /*!< The parser reads result-set expressions, GROUP BY, ORDER BY, or HAVING. Each bit is responsible for one level of nesting. */
int sparp_query_uses_aggregates; /*!< Nonzero if there is at least one aggregate in the whole source query, (not in the current SELECT!). This is solely for bypassing expanding top retvals for "plain SPARQL" queries, not for other logic of the compiler */
- int sparp_query_uses_sinvs; /*!< Nonzero if there is at least one SERVICE invocation in the whole source query, (not in the current SELECT!). This forces (re) composing of \c sinv.param_varnames and \c sinv.retval_varnames lists */
+ int sparp_query_uses_sinvs; /*!< Nonzero if there is at least one SERVICE invocation in the whole source query, (not in the current SELECT!). This forces (re) composing of \c sinv.param_varnames and \c sinv.rset_varnames lists */
int sparp_disable_big_const; /*!< INSERT DATA requires either an sql_comp_t for ssl or define sql:big-data-const 0. The define sets this value to 1 */
dk_set_t sparp_created_jsos; /*!< Get-keyword style list of created JS objects. Object IRIs are keys, types (as free-text const char *) are values. This is solely for early (and incomplete) detection of probable errors. */
/* Environment of lex */
@@ -308,10 +373,21 @@ 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 */
+ 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 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 */
@@ -320,9 +396,7 @@ typedef struct sparp_s {
caddr_t sparp_immortal_exec_uname; /*!< Cached value returned by spar_immortal_exec_uname(). Do not use directly, call spar_immortal_exec_uname() instead! */
caddr_t sparp_gs_app_callback; /*!< NULL or name of application-specific callback function */
caddr_t sparp_gs_app_uid; /*!< NULL or ID (supposedly app user ID) for application-specific callback */
-#ifdef DEBUG
int sparp_internal_error_runs_audit; /*!< Flags whether the sparp_internal_error has called audit so inner sparp_internal_error should not try to re-run audit or signal but should simply report */
-#endif
} sparp_t;
@@ -357,7 +431,10 @@ 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_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];
/* 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
@@ -448,7 +525,8 @@ typedef struct spar_tree_s
} bin_exp;
struct {
/* #define SPAR_BUILT_IN_CALL (ptrlong)1003 */
- ptrlong btype;
+ 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 */
SPART **args;
} builtin;
struct {
@@ -480,7 +558,7 @@ typedef struct spar_tree_s
caddr_t iri;
SPART *expn;
} graph;
- struct {
+ struct { /* Note that all first members of \c lit case should match to \c qname case */
/* #define SPAR_LIT (ptrlong)1009 */
caddr_t val;
caddr_t datatype;
@@ -500,13 +578,14 @@ typedef struct spar_tree_s
SPART **orig_retvals; /*!< Retvals as they were after expanding '*' and wrapping in MAX() */
SPART **expanded_orig_retvals; /*!< Retvals as they were after expanding '*' and wrapping in MAX() and adding vars to grab */
caddr_t retselid;
- SPART **sources;
- SPART *pattern;
- SPART **groupings;
- SPART *having;
- SPART **order;
- SPART *limit;
- SPART *offset;
+ SPART **sources; /*!< Ordered list of FROM, FROM NAMED, NOT FROM and NOT FROM NAMED clauses */
+ SPART *pattern; /*!< Top-level group pattern that comes from WHERE {...} clause */
+ SPART **groupings; /*!< NULL or array of grouping expressions */
+ SPART *having; /*!< NULL or HAVING expression */
+ SPART **order; /*!< NULL or array of column numbers or oby expressions */
+ SPART *limit; /*!< NULL or limit expression (boxed integer or a precode) */
+ SPART *offset; /*!< NULL or offset expression (boxed integer or a precode) */
+ SPART *binv; /*!< NULL or SPAR_BINDINGS_INV */
sparp_env_t *shared_spare; /*!< An environment that is shared among all clones of the tree */
} req_top;
struct {
@@ -588,10 +667,11 @@ typedef struct spar_tree_s
SPART **obys; /*!< Array of ORDER BY criteria */
SPART *lim; /*!< Boxed LIMIT value or an expression tree */
SPART *ofs; /*!< Boxed OFFSET value or an expression tree */
+ SPART *binv; /*!< NULL or SPAR_BINDINGS_INV */
} wm;
struct {
/* define SPAR_SERVICE_INV (ptrlong)1020 */
- ptrlong own_idx; /*!< Boxed serial of the sinv in the parser */
+ ptrlong own_idx; /*!< 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 */
@@ -604,10 +684,39 @@ typedef struct spar_tree_s
} sinv;
struct {
/* define SPAR_BINDINGS_INV (ptrlong)1021 */
- 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. */
+ ptrlong own_idx; /*!< 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. */
+ char *data_rows_mask; /*!< Characters, one per data row, indicating whether the row is in use (char '/') or not in use due to ban by some cell (char '0' + column index or '\x7f', whatever is less, for debugging) */
+ ptrlong *counters_of_unbound; /*!< Counters of unbound values in columns (rows not in use are excluded from counting). Cheating: This array is allocated as DV_STRING, not DV_ARRAY_OF_POINTER */
+ ptrlong rows_in_use; /*!< Count of rows still in use */
+ ptrlong rows_last_rvr; /*!< Count of rows in use when rvrs were refreshed last time */
} 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;
@@ -619,8 +728,18 @@ typedef unsigned char SPART_buf[sizeof (sparp_tree_t) + BOX_AUTO_OVERHEAD];
(ptr)->type = t; \
} while (0)
-extern sparp_t * sparp_query_parse (char * str, spar_query_env_t *sparqre, int rewrite_all);
-extern int sparyyparse (void *sparp);
+#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 int sparyyparse (sparp_t *sparp_arg);
+/*! 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);
@@ -645,9 +764,12 @@ extern void spart_dump (void *tree_arg, dk_session_t *ses, int indent, const cha
#define SPAR_LIT_OR_QNAME_VAL(tree) \
((DV_ARRAY_OF_POINTER != DV_TYPE_OF (tree)) ? ((caddr_t)(tree)) : \
((SPAR_LIT == (tree)->type) || (SPAR_QNAME == (tree)->type)/* || (SPAR_QNAME_NS == tree->type)*/) ? (tree)->_.lit.val : NULL )
+/* Cheating above: (tree)->_.lit.val is used both "as is" and as a replacement of (tree)->_.qname.val */
#define SPART_VARNAME_IS_GLOB(varname) (':' == (varname)[0])
#define SPART_VARNAME_IS_SPECIAL(varname) ('@' == (varname)[0])
+#define SPART_VARNAME_IS_BNODE(varname) (('_' == (varname)[0]) && ('_' == (varname)[1]))
+#define SPART_VARNAME_IS_PLAIN(varname) (!SPART_VARNAME_IS_GLOB((varname)) && !SPART_VARNAME_IS_SPECIAL((varname)) && (NULL == strchr ((varname), '>')))
#define SPART_IRI_IS_NAMED_BNODE(iri) (('_' == (iri)[0]) && (':' == (iri)[1]))
#define SPART_IS_DEFAULT_GRAPH_BLANK(g) ( \
@@ -663,6 +785,19 @@ 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)
@@ -714,17 +849,36 @@ extern caddr_t spar_mkid (sparp_t * sparp, const char *prefix);
extern void spar_change_sign (caddr_t *lit_ptr);
extern void sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t value);
+#ifdef SPARQL_DEBUG
+#define spar_selid_push(sparp) dbg_spar_selid_push (__FILE__, __LINE__, (sparp))
+#define spar_selid_push_reused(sparp,selid) dbg_spar_selid_push_reused (__FILE__, __LINE__, (sparp), (selid))
+#define spar_selid_pop(sparp) dbg_spar_selid_pop (__FILE__, __LINE__, (sparp))
+extern caddr_t dbg_spar_selid_push (const char *file, int line, sparp_t *sparp);
+extern caddr_t dbg_spar_selid_push_reused (const char *file, int line, sparp_t *sparp, caddr_t selid);
+extern caddr_t dbg_spar_selid_pop (const char *file, int line, sparp_t *sparp);
+#else
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);
+#endif
+
+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);
-/*! 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);
+#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);
/*! 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);
@@ -732,8 +886,14 @@ 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);
@@ -742,31 +902,46 @@ extern void spar_optimize_retvals_of_insert_or_delete (sparp_t *sparp, SPART *to
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);
+extern SPART *spar_make_wm (sparp_t *sparp, SPART *pattern, SPART **groupings, SPART *having, SPART **order, SPART *limit, SPART *offset, SPART *binv);
+/*! 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);
+extern SPART *spar_make_bindings_inv_with_fake_equivs (sparp_t *sparp, SPART **vars, SPART ***data_rows);
+extern SPART **spar_make_sources_like_top (sparp_t *sparp, ptrlong top_subtype);
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);
+ caddr_t retselid, SPART *pattern, SPART **groupings, SPART *having, SPART **order, SPART *limit, SPART *offset, SPART *binv);
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);
+extern SPART *spar_default_sparul_target (sparp_t *sparp, const char *clause_type, int may_return_null);
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 *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 *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_load_service_data (sparp_t *sparp, SPART *proxy_iri_precode, SPART *service_iri_precode, int silent);
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 f79ec22..0dedced 100644
--- a/libsrc/Wi/sparql.sql
+++ b/libsrc/Wi/sparql.sql
@@ -1,10 +1,10 @@
--
--- $Id: sparql.sql,v 1.205.2.113 2011/10/28 23:22:36 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -182,19 +182,19 @@ create table DB.DBA.RDF_QUAD_DELETE_QUEUE (
)
;
-create table DB.DBA.SYS_FAKE_0
+create table DB.DBA.SYS_IDONLY_EMPTY
(
ID integer not null primary key
)
;
-create table DB.DBA.SYS_FAKE_1
+create table DB.DBA.SYS_IDONLY_ONE
(
ID integer not null primary key
)
;
-insert soft DB.DBA.SYS_FAKE_1 (ID) values (0)
+insert soft DB.DBA.SYS_IDONLY_ONE (ID) values (0)
;
sequence_set ('RDF_URL_IID_NAMED', 1000000, 1)
@@ -369,13 +369,15 @@ create procedure DB.DBA.XML_LOAD_ALL_NS_DECLS ()
DB.DBA.XML_SET_NS_DECL ( 'rdfdf' , 'http://www.openlinksw.com/virtrdf-data-formats#' , 2);
DB.DBA.XML_SET_NS_DECL ( 'rdfs' , 'http://www.w3.org/2000/01/rdf-schema#' , 2);
DB.DBA.XML_SET_NS_DECL ( 'sc' , 'http://purl.org/science/owl/sciencecommons/' , 2);
+ DB.DBA.XML_SET_NS_DECL ( 'sd' , 'http://www.w3.org/ns/sparql-service-description#' , 2);
DB.DBA.XML_SET_NS_DECL ( 'sioc' , 'http://rdfs.org/sioc/ns#' , 2);
DB.DBA.XML_SET_NS_DECL ( 'skos' , 'http://www.w3.org/2004/02/skos/core#' , 2);
DB.DBA.XML_SET_NS_DECL ( 'sql' , 'sql:' , 2);
- DB.DBA.XML_SET_NS_DECL ( 'virtrdf' , 'http://www.openlinksw.com/schemas/virtrdf#' , 2);
- DB.DBA.XML_SET_NS_DECL ( 'virtcxml' , 'http://www.openlinksw.com/schemas/virtcxml#' , 2);
DB.DBA.XML_SET_NS_DECL ( 'vcard' , 'http://www.w3.org/2001/vcard-rdf/3.0#' , 2);
DB.DBA.XML_SET_NS_DECL ( 'vcard2006' , 'http://www.w3.org/2006/vcard/ns#' , 2);
+ DB.DBA.XML_SET_NS_DECL ( 'virtrdf' , 'http://www.openlinksw.com/schemas/virtrdf#' , 2);
+ DB.DBA.XML_SET_NS_DECL ( 'virtcxml' , 'http://www.openlinksw.com/schemas/virtcxml#' , 2);
+ DB.DBA.XML_SET_NS_DECL ( 'void' , 'http://rdfs.org/ns/void#' , 2);
DB.DBA.XML_SET_NS_DECL ( 'xf' , 'http://www.w3.org/2004/07/xpath-functions' , 2);
DB.DBA.XML_SET_NS_DECL ( 'xml' , 'http://www.w3.org/XML/1998/namespace' , 2);
DB.DBA.XML_SET_NS_DECL ( 'xsd' , 'http://www.w3.org/2001/XMLSchema#' , 2);
@@ -422,9 +424,9 @@ create procedure DB.DBA.RDF_REPL_START (in quiet integer := 0)
}
for (select RGGM_MEMBER_IID 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 not (bit_and (__rdf_graph_approx_perms (RGGM_MEMBER_IID, http_nobody_uid()), 1)) ) do
+ and not __rgs_ack_cbk (RGGM_MEMBER_IID, __rdf_repl_uid(), 1) ) do
{
- signal ('RDF99', 'RDF replication can not be enabled because it will violate security rules for public read access to graph <' || id_to_iri(RGGM_MEMBER_IID) || '>');
+ signal ('RDF99', 'RDF replication can not be enabled because it will violate security rules for read access to graph <' || id_to_iri(RGGM_MEMBER_IID) || '> by __rdf_repl account');
}
repl_publish ('__rdf_repl', '__rdf_repl.log');
repl_text ('__rdf_repl', '__rdf_repl_flush_queue()');
@@ -452,11 +454,7 @@ create procedure DB.DBA.RDF_REPL_GRAPH_INS (in memb_iri varchar)
declare memb_iid IRI_ID;
memb_iid := iri_to_id (memb_iri);
memb_iri := id_to_iri (memb_iid);
- if (memb_iri = DB.DBA.JSO_SYS_GRAPH())
- signal ('RDF99', 'Can not enable RDF replication of <' || memb_iri || '> (the system metadata graph)');
DB.DBA.RDF_GRAPH_GROUP_INS (UNAME'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group', memb_iri);
- if (not (bit_and (__rdf_graph_approx_perms (memb_iid, http_nobody_uid()), 1)))
- signal ('RDF99', 'Can not enable RDF replication of graph <' || memb_iri || '> because it is not readable by public');
}
;
@@ -567,21 +565,50 @@ create procedure DB.DBA.RDF_GLOBAL_RESET (in hard integer := 0)
__atomic (1);
iri_id_cache_flush ();
__rdf_obj_ft_rule_zap_all ();
+ dict_zap (__rdf_graph_group_dict(), 2);
+ dict_zap (__rdf_graph_group_of_privates_dict(), 2);
+ dict_zap (__rdf_graph_default_perms_of_user_dict(0), 2);
+ dict_zap (__rdf_graph_default_perms_of_user_dict(1), 2);
+ dict_zap (__rdf_graph_public_perms_dict(), 2);
for select RS_NAME from DB.DBA.SYS_RDF_SCHEMA do
rdf_inf_clear (RS_NAME);
delete from sys_rdf_schema;
delete from DB.DBA.RDF_QUAD;
delete from DB.DBA.RDF_OBJ_FT_RULES;
delete from DB.DBA.RDF_GRAPH_GROUP;
+ for (select __id2i(t.RGU_GRAPH_IID) as graph_iri from (select distinct RGU_GRAPH_IID from DB.DBA.RDF_GRAPH_USER) as t) do
+ {
+ if (graph_iri is not null)
+ {
+ jso_mark_affected (graph_iri);
+ log_text ('jso_mark_affected (?)', graph_iri);
+ }
+ }
+ for (select __id2i(t.RGGM_GROUP_IID) as group_iri from (select distinct RGGM_GROUP_IID from DB.DBA.RDF_GRAPH_GROUP_MEMBER) as t) do
+ {
+ jso_mark_affected (group_iri);
+ log_text ('jso_mark_affected (?)', group_iri);
+ }
+ for (select __id2i(RGGM_MEMBER_IID) as memb_iri from DB.DBA.RDF_GRAPH_GROUP_MEMBER where RGGM_GROUP_IID = __i2id ('http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs')) do
+ {
+ jso_mark_affected (memb_iri);
+ log_text ('jso_mark_affected (?)', memb_iri);
+ }
+ for (sparql define input:storage "" select distinct str (?qms) as ?qms_iri from virtrdf: where { ?qms a virtrdf:QuadStorage } ) do
+ {
+ jso_mark_affected ("qms_iri");
+ log_text ('jso_mark_affected (?)', "qms_iri");
+ }
+ jso_mark_affected ('http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs');
+ log_text ('jso_mark_affected (?)', 'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs');
+ jso_mark_affected ('http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage');
+ log_text ('jso_mark_affected (?)', 'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage');
+ jso_mark_affected ('http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap');
+ log_text ('jso_mark_affected (?)', 'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap');
delete from DB.DBA.RDF_GRAPH_GROUP_MEMBER;
delete from DB.DBA.RDF_GRAPH_USER;
delete from DB.DBA.RDF_LABEL;
delete from DB.DBA.RDF_GEO;
- dict_zap (__rdf_graph_group_dict(), 2);
- dict_zap (__rdf_graph_group_of_privates_dict(), 2);
- dict_zap (__rdf_graph_default_perms_of_user_dict(0), 2);
- dict_zap (__rdf_graph_default_perms_of_user_dict(1), 2);
- dict_zap (__rdf_graph_public_perms_dict(), 2);
commit work;
if (hard)
{
@@ -603,9 +630,9 @@ create procedure DB.DBA.RDF_GLOBAL_RESET (in hard integer := 0)
sequence_set ('RDF_RO_ID', 1, 0);
sequence_set ('RDF_DATATYPE_TWOBYTE', 258, 0);
sequence_set ('RDF_LANGUAGE_TWOBYTE', 258, 0);
- __atomic (0);
exec ('checkpoint');
raw_exit ();
+ __atomic (0);
}
sequence_set ('RDF_URL_IID_NAMED', 1000000, 1);
sequence_set ('RDF_URL_IID_BLANK', iri_id_num (min_bnode_iri_id ()), 1);
@@ -660,8 +687,8 @@ virtrdf:SyncToQuads-UserMaps
sequence_set ('RDF_RO_ID', 1001, 1);
iri_id_cache_flush ();
DB.DBA.SPARQL_RELOAD_QM_GRAPH ();
- __atomic (0);
exec ('checkpoint');
+ __atomic (0);
}
;
@@ -949,7 +976,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,6 +1329,7 @@ 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;
@@ -1329,6 +1357,7 @@ 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)))
@@ -1353,6 +1382,7 @@ 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);
}
;
@@ -1405,6 +1435,7 @@ 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;
@@ -1421,8 +1452,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;
@@ -1457,9 +1488,11 @@ 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;
@@ -1482,9 +1515,11 @@ 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;
@@ -1555,9 +1590,14 @@ 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)))
- return longobj;
- if (__tag of nvarchar = 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)
longobj := charset_recode (longobj, '_WIDE_', 'UTF-8');
else if (t in (126, 217))
longobj := cast (longobj as varchar);
@@ -1602,7 +1642,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');
@@ -1785,26 +1825,6 @@ 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);
@@ -2183,6 +2203,189 @@ 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
@@ -2273,11 +2476,16 @@ 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, 217, __tag of nvarchar)))
+ if (not (t in (__tag of varchar, 126, 133, 217, __tag of nvarchar, 226)))
{
goto o_val_done;
}
- if (__tag of nvarchar = t)
+ if (t = 133)
+ {
+ o_val := cast (o_val as nvarchar);
+ t := __tag (o_val);
+ }
+ if (__tag of nvarchar = t or t = 226)
o_val := charset_recode (o_val, '_WIDE_', 'UTF-8');
else if (t in (126, 217))
o_val := cast (o_val as varchar);
@@ -2612,12 +2820,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_LOAD_RDFXML()');
+ signal ('22023', 'Empty string is not a valid graph IRI in DB.DBA.RDF_VALIDATE_RDFXML()');
else if (graph is null)
{
graph := base;
if ((graph is null) or (graph = ''))
- signal ('22023', 'DB.DBA.RDF_LOAD_RDFXML() requires a valid IRI as a base argument if graph is not specified');
+ signal ('22023', 'DB.DBA.RDF_VALIDATE_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;
@@ -2668,12 +2876,65 @@ create procedure DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L (
iri_to_id (s_uri),
iri_to_id (p_uri),
DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (o_val,
- case (isstring (o_type)) when 0 then null else o_type end,
- case (isstring (o_lang)) when 0 then null else o_lang end) ),
+ 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 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;
@@ -2695,6 +2956,26 @@ 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);
@@ -2757,18 +3038,18 @@ create function DB.DBA.RDF_TTL2SQLHASH (in strg varchar, in base varchar, in gra
}
;
-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)
+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)
{
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()');
+ signal ('22023', 'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFXML() and the like');
else if (graph is null)
{
graph := base;
if ((graph is null) or (graph = ''))
- signal ('22023', 'DB.DBA.RDF_LOAD_RDFXML() requires a valid IRI as a base argument if graph is not specified');
+ signal ('22023', 'DB.DBA.RDF_LOAD_RDFXML() and similar functions require a valid IRI as a base argument if graph is not specified');
}
old_log_mode := null;
if (transactional = 0)
@@ -2781,13 +3062,13 @@ create procedure DB.DBA.RDF_LOAD_RDFXML (in strg varchar, in base varchar, in gr
old_log_mode := log_enable (log_enable, 1);
}
if (1 <> sys_stat ('cl_run_local_only'))
- return rdf_load_rdfxml_cl (strg, base, graph);
+ return DB.DBA.RDF_LOAD_RDFXML_CL (strg, base, graph, parse_mode);
app_env := vector (
null,
null,
__max (length (strg) / 100, 100000),
null );
- rdf_load_rdfxml (strg, 0,
+ rdf_load_rdfxml (strg, parse_mode,
graph,
vector (
'DB.DBA.TTLP_EV_NEW_GRAPH',
@@ -2805,6 +3086,14 @@ create procedure DB.DBA.RDF_LOAD_RDFXML (in strg varchar, in base varchar, in gr
}
;
+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;
@@ -2825,11 +3114,74 @@ 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 (in strg varchar, in base varchar, in graph varchar, inout dict any, in xml_parse_mode int := 0)
+{
+ 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',
+ '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 }}))
@@ -2887,49 +3239,20 @@ 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)
+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 )
{
- 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;
+ return DB.DBA.RDF_LOAD_RDFXML_IMPL (strg, base, graph, bit_or (2, bit_shift (xml_parse_mode, 8)), log_enable, transactional);
}
;
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 = '')
@@ -2987,6 +3310,13 @@ 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
@@ -3250,6 +3580,15 @@ 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)
{
@@ -3300,6 +3639,7 @@ 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)
@@ -3382,6 +3722,12 @@ print_o:
}
;
+create function DB.DBA.RDF_TRIPLES_TO_TTL_ENV (in tcount integer)
+{
+ return vector (dict_new (__min (tcount, 16000)), 0, '', '', '', 0, 0, 0, 0);
+}
+;
+
create procedure DB.DBA.RDF_TRIPLES_TO_TTL (inout triples any, inout ses any)
{
declare env any;
@@ -3393,7 +3739,7 @@ create procedure DB.DBA.RDF_TRIPLES_TO_TTL (inout triples any, inout ses any)
http ('# Empty TURTLE\n', ses);
return;
}
- env := vector (dict_new (__min (tcount, 16000)), 0, '', '', '', 0, 0, 0, 0);
+ env := DB.DBA.RDF_TRIPLES_TO_TTL_ENV (tcount);
{ whenever sqlstate '*' goto end_pred_sort;
rowvector_subj_sort (triples, 1, 1);
end_pred_sort: ;
@@ -3402,6 +3748,7 @@ 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);
@@ -3410,21 +3757,89 @@ end_subj_sort: ;
}
;
-create procedure DB.DBA.RDF_TRIPLES_TO_NT (inout triples any, inout ses any)
+create procedure DB.DBA.RDF_TRIPLES_TO_TRIG (inout triples any, inout ses any)
{
declare env any;
- declare tcount, tctr integer;
+ declare tcount, tctr, first_dflt_g_idx integer;
+ declare prev_g_iri varchar;
+ declare first_g_idx integer;
tcount := length (triples);
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_TTL:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
if (0 = tcount)
{
- http ('# Empty NT\n', ses);
+ http ('# Empty TriG\n', ses);
return;
}
- env := vector (0, 0, 0);
- for (tctr := 0; tctr < tcount; tctr := tctr + 1)
- {
- http_nt_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);
+ env := DB.DBA.RDF_TRIPLES_TO_TTL_ENV (tcount);
+ { 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;
+ declare tcount, tctr integer;
+ tcount := length (triples);
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_TTL:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
+ if (0 = tcount)
+ {
+ http ('# Empty NT\n', ses);
+ 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);
}
}
;
@@ -3505,218 +3920,37 @@ 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 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" '||
- 'xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">', ses);
+ 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);
}
+ { whenever sqlstate '*' goto end_subj_sort;
+ rowvector_subj_sort (triples, 0, 1);
+end_subj_sort: ;
+ }
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
- 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);
+ 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);
@@ -3752,6 +3986,7 @@ 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)
@@ -3780,7 +4015,8 @@ 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);
- http ('{ "@": [\n ', ses);
+ DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
+ http ('{ "@id": [\n ', ses);
status := 0;
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
@@ -3800,6 +4036,7 @@ 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;
@@ -3822,6 +4059,7 @@ 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]);
@@ -3834,6 +4072,28 @@ create procedure DB.DBA.RDF_TRIPLES_TO_CSV (inout triples any, inout ses any)
}
;
+create procedure DB.DBA.RDF_TRIPLES_TO_TSV (inout triples any, inout ses any)
+{
+ declare env any;
+ declare tcount, tctr, status integer;
+ http ('"subject","predicate","object"\n', ses);
+ tcount := length (triples);
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_TSV:'); 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]);
+ http ('\t', ses);
+ DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, triples[tctr][1]);
+ http ('\t', ses);
+ DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, triples[tctr][2]);
+ http ('\n', ses);
+ }
+}
+;
+
create procedure DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML (inout triples any, inout ses any)
{
declare env, prev_subj, nsdict, nslist any;
@@ -3853,6 +4113,7 @@ 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);
@@ -3873,7 +4134,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>', ses);
+</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>\n<ul>', ses);
env := vector (0, 0, 0, null);
rowvector_subj_sort (triples, 0, 1);
prev_subj := null;
@@ -3891,31 +4152,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</div>', ses);
- http ('\n<div about="[', ses);
+ http ('\n</ul></li>', ses);
+ http ('\n<li 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 (']">', ses);
+ http (']">\n<ul>', ses);
}
else if (isstring (split[0]))
{
http_escape (concat (split[0], ':', split[2]), 3, ses, 1, 1);
- http (']">', ses);
+ http (']">\n<ul>', 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 ('">', ses);
+ http ('">\n<ul>', 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<div property="' else '\n<div rel="' end, ses);
+ http (case (isvector (obj_iri_split)) when 0 then '\n<li property="' else '\n<li rel="' end, ses);
split := sparql_iri_split_rdfa_qname (pred, nsdict, 2);
if ('' = split[1])
{
@@ -4018,54 +4279,61 @@ 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 ('</div>', ses);
+ http ('</li>', ses);
}
}
if (prev_subj is not null)
- http ('\n</div>', ses);
+ http ('\n</ul></li></ul>', ses);
http ('\n</body></html>\n', ses);
}
;
-create procedure DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (inout triples any, inout ses any)
+create function DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT (in ul_or_tr varchar)
{
- declare env, prev_subj, prev_pred, nsdict, nslist any;
- declare ctr, len, tcount, tctr, status, obj_needs_br integer;
+ 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)
+{
+ 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;
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);
+ -- 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);
if (0 = tcount)
{
http ('<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Empty HTML Microdata document</title></head><body>
+<head><title>Empty HTML RDFa and Microdata document</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</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');
- 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);
- }
+ 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);
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);
+ 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);
env := vector (0, 0, 0, null);
rowvector_subj_sort (triples, 1, 1);
rowvector_subj_sort (triples, 0, 1);
@@ -4079,86 +4347,435 @@ Use "Save As" or "Send To" menu item of the browser; choose "HTML" file type, no
subj := triples[tctr][0];
pred := triples[tctr][1];
obj := triples[tctr][2];
- -- 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));
+ -- 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));
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);
+ 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);
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);
+ 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);
prev_pred := pred;
obj_needs_br := 0;
}
if (obj is null)
- signal ('RDFXX', 'DB.DBA.TRIPLES_TO_HTML_MICRODATA: object is NULL');
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_HTML_UL: object is NULL');
if (obj_needs_br)
http ('\n', ses);
else
obj_needs_br := 1;
- obj_iri_split := sparql_iri_split_rdfa_qname (obj, nsdict, 2);
- if (isvector (obj_iri_split))
+ 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);
+ 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);
}
else
{
declare sqlval any;
declare dt, lang, strval any;
- http (sprintf ('\n<span itemprop="%s"', replace (id_to_iri (pred), '"', '%22')), ses);
+ http ('\n <li 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)));
---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)));
+ 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);
---DT if (__tag of datetime = __tag (sqlval))
---DT {
---DT if (257 = rdf_box_type (obj))
---DT dt := __xsd_type (sqlval);
---DT }
+ 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 dt := __xsd_type (sqlval);
+ dt := __xsd_type (sqlval);
}
else
sqlval := obj;
---DT if (not (isinteger (dt)))
---DT {
---DT http (' datatype="', ses);
+ 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 ('</li>', ses);
+ }
+ }
+ if (prev_subj is not null)
+ http ('\n </ul></li></ul></li></ul>', ses);
+ http ('\n</body></html>\n', ses);
+}
+;
+
+
+create procedure DB.DBA.RDF_TRIPLES_TO_HTML_TR (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;
+ 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);
+ env := vector (0, 0, 0, null);
+ rowvector_subj_sort (triples, 1, 1);
+ rowvector_subj_sort (triples, 0, 1);
+ prev_subj := prev_pred := null;
+ 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_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));
+ if (prev_subj is null or (subj <> prev_subj))
+ {
+ declare trtd_ses any;
+ 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);
+ prev_subj := subj;
+ }
+ 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);
+ prev_pred := pred;
+ }
+ 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);
+ else
+ obj_needs_br := 1;
+ obj_iri_split := sparql_iri_split_rdfa_qname (obj, nsdict, 2);
+ if (isvector (obj_iri_split))
+ {
+ 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 (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)));
+--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 {
@@ -4217,6 +4834,7 @@ create procedure DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (inout triples any, inout
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)
@@ -4235,6 +4853,9 @@ create procedure DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (inout triples any, inout
declare subj_iri varchar;
if (prev_subj is not null)
http (' ] } },\n', ses);
+ if (isstring (subj))
+ subj_iri := subj;
+ else
subj_iri := id_to_iri (subj);
if (starts_with (subj_iri, 'nodeID://'))
subj_iri := '_:' || subseq (subj_iri, 9);
@@ -4246,7 +4867,7 @@ create procedure DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (inout triples any, inout
{
if (prev_pred is not null)
http (' ] ,', ses);
- http ('\n "', ses); http_escape (id_to_iri (pred), 14, ses, 1, 1); http ('" : [ ', ses);
+ http ('\n "', ses); http_escape (case when isstring (pred) then pred else id_to_iri (pred) end, 14, ses, 1, 1); http ('" : [ ', ses);
prev_pred := pred;
obj_needs_comma := 0;
}
@@ -4414,6 +5035,7 @@ 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)
{
@@ -4500,6 +5122,7 @@ 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'||
@@ -4561,7 +5184,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);
@@ -4621,7 +5244,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;
}
}
@@ -5000,7 +5623,7 @@ create procedure DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (inout _env any, in val a
if (t = __tag of IRI_ID)
val := id_to_iri (val);
http ('"', _env);
- http (replace (cast (val as varchar), '"', '"""'), _env);
+ http (replace (cast (val as varchar), '"', '""'), _env);
http ('"', _env);
}
;
@@ -5048,9 +5671,44 @@ from DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_C
order
;
-create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT (inout _env any)
+create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV_ACC (inout _env any, inout colvalues any, inout colnames any)
{
- _env := 0;
+ declare sol_id varchar;
+ declare col_ctr, col_count integer;
+ declare blank_ids any;
+ col_count := length (colnames);
+ if (185 <> __tag(_env))
+ {
+ _env := string_output ();
+ for (col_ctr := 0; col_ctr < col_count; col_ctr := col_ctr + 1)
+ {
+ if (col_ctr > 0)
+ http('\t', _env);
+ DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (_env, colnames[col_ctr]);
+ }
+ http ('\n', _env);
+ }
+ for (col_ctr := 0; col_ctr < col_count; col_ctr := col_ctr + 1)
+ {
+ declare val any;
+ val := colvalues[col_ctr];
+ if (col_ctr > 0)
+ http('\t', _env);
+ if (val is not null)
+ DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (_env, val);
+ }
+ http('\n', _env);
+}
+;
+
+create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV (in colvalues any, in colnames any) returns long varchar
+from DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN
+order
+;
+
+create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT (inout _env any)
+{
+ _env := 0;
}
;
@@ -5105,6 +5763,67 @@ from DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_
order
;
+create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (inout _env any)
+{
+ _env := vector (0, 0, string_output());
+}
+;
+
+create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_ACC (inout _env any, inout colvalues any, inout colnames any)
+{
+ declare col_ctr, col_count integer;
+ declare ses any;
+ declare rowid varchar;
+ declare blank_ids any;
+ if (__tag of vector <> __tag(_env))
+ DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (_env);
+ if (isinteger (_env[1]))
+ {
+ if (185 <> __tag(_env))
+ DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (_env);
+ _env[1] := colnames;
+ ses := aref_set_0 (_env, 2);
+ http ('BINDINGS', ses);
+ foreach (varchar colname in colnames) do { http (' ?' || colname, ses); }
+ http (' {', ses);
+ }
+ else
+ ses := aref_set_0 (_env, 2);
+ http ('\n (', ses);
+ foreach (any val in colvalues) do
+ {
+ if (val is null)
+ http ('\tUNDEF', ses);
+ else
+ {
+ http ('\t', ses);
+ http_nt_object (val, ses);
+ }
+ }
+ http ('\t)', ses);
+ aset_zap_arg (_env, 2, ses);
+}
+;
+
+create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_FIN (inout _env any) returns long varchar
+{
+ declare ses any;
+ if (__tag of vector <> __tag(_env))
+ DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (_env);
+ if (isinteger (_env[1]))
+ return 'BINDINGS ?EmptyResultSetStub { }';
+ ses := aref_set_0 (_env, 2);
+ if (not isinteger (_env[1]))
+ http ('\n}', ses);
+ return string_output_string (ses);
+}
+;
+
+create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS (in colvalues any, in colnames any) returns long varchar
+from DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_FIN
+order
+;
+
create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TTL (inout triples_dict any) returns long varchar
{
declare triples, ses any;
@@ -5120,6 +5839,21 @@ 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;
@@ -5180,6 +5914,36 @@ 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;
@@ -5225,6 +5989,21 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CSV (inout triples_dict any) re
}
;
+create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TSV (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_TSV (triples, ses);
+ return ses;
+}
+;
+
create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDFA_XHTML (inout triples_dict any) returns long varchar
{
declare triples, ses any;
@@ -5449,7 +6228,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;
@@ -5529,16 +6308,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 MAKE_OBJ_OF_SQLVAL_FT', o_orig, '=>', o_final);
+ -- dbg_obj_princ ('OBLOM', 'Bad O after DB.DBA.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 RDF_OBJ_OF_LONG', o_orig, '=>', o_final);
+ -- dbg_obj_princ ('OBLOM', 'Bad O after DB.DBA.RDF_OBJ_ADD', o_orig, '=>', o_final);
signal ('OBLOM', 'Bad O after DB.DBA.RDF_OBJ_ADD');
}
}
@@ -5568,8 +6347,8 @@ create procedure DB.DBA.RDF_DELETE_TRIPLES (in graph_iri any, in triples any, in
o_short := DB.DBA.RDF_OBJ_OF_LONG (triples[ctr][2]);
-- {
-- whenever sqlstate '*' goto strange_fail;
- delete from DB.DBA.RDF_QUAD
- where G = graph_iri and S = triples[ctr][0] and P = triples[ctr][1] and O = o_short;
+ delete from DB.DBA.RDF_QUAD
+ where G = graph_iri and S = triples[ctr][0] and P = triples[ctr][1] and O = o_short;
-- goto complete;
-- }
--strange_fail:
@@ -5616,9 +6395,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)
{
@@ -5627,23 +6406,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);
}
}
@@ -5703,8 +6482,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)
@@ -6000,44 +6779,60 @@ create procedure DB.DBA.RDF_REPL_DEL (inout rquads any)
--#IF VER=5
--!AFTER
--#ENDIF
-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
+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
{
- declare g any;
declare g_iid IRI_ID;
declare old_log_enable integer;
- 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))
+ declare txtreport varchar;
+ txtreport := '';
+ if (__tag of vector <> __tag (graph_iris))
+ graph_iris := vector (graph_iris);
+ foreach (any g_iri in graph_iris) do
{
- repl_text ('__rdf_repl', '__rdf_repl_flush_queue()');
- repl_text ('__rdf_repl', 'sparql define input:storage "" clear graph iri ( ?? )', g);
+ 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');
}
- 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)
+ foreach (any g_iri in graph_iris) do
{
- 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=%');
+ 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));
+ DB.DBA.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);
+ }
}
/*091202 commit work; */
log_enable (old_log_enable, 1);
if (compose_report)
- return sprintf ('Clear <%s> -- done', g);
- else
- return 1;
+ return txtreport;
+ 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) 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, in options any := null, in silent integer := 0) returns any
{
declare old_log_enable integer;
declare grab_params any;
@@ -6045,18 +6840,21 @@ 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); resignal; };
+ declare exit handler for sqlstate '*' { log_enable (old_log_enable, 1); if (silent) goto fail; resignal; };
grabbed := dict_new();
if (isiri_id (graph_iri))
graph_iri := id_to_iri (graph_iri);
- 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 );
+ 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 );
commit work;
res := DB.DBA.RDF_GRAB_SINGLE (resource, grabbed, grab_params);
commit work;
@@ -6075,10 +6873,46 @@ 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_LOAD_SERVICE_DATA (in service_iri any, in proxy_iri varchar, in uid integer, in log_mode integer, in compose_report integer, in options any := null, in silent integer := 0) returns any
+{
+ declare old_log_enable integer;
+ declare mdta, rows any;
+ declare stat, msg varchar;
+ __rgs_assert_cbk (service_iri, uid, 2, 'SPARUL LOAD SERVICE DATA');
+ -- dbg_obj_princ ('DB.DBA.SPARUL_LOAD_SERVICE_DATA (', service_iri, proxy_iri, uid, log_mode, compose_report, options, silent, ')');
+ old_log_enable := log_enable (log_mode, 1);
+ stat := '00000';
+ exec ('DB.DBA.SPARQL_SD_PROBE (?, ?, 0, 0)', stat, msg, vector (service_iri, proxy_iri), 10000, mdta, rows);
+ log_enable (old_log_enable, 1);
+ if (stat <> '00000')
+ {
+ if (not silent) signal (stat, msg);
+ if (compose_report)
+ return sprintf ('Load service <%s> data failed: %s: %s', service_iri, stat, msg);
+ else
+ return 0;
+ }
+ if (compose_report)
+ {
+ if (length (rows))
+ return sprintf ('Load service <%s> data -- done. %s', service_iri, rows[length(rows)-1][1]);
+ else
+ return sprintf ('Load service <%s> data -- nothing done', service_iri);
+ }
+ else
+ return 1;
}
;
-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
+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
{
declare g_iid IRI_ID;
declare old_log_enable integer;
@@ -6086,6 +6920,8 @@ create function DB.DBA.SPARUL_CREATE (in graph_iri any, in silent integer, in ui
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)
@@ -6128,63 +6964,85 @@ create function DB.DBA.SPARUL_CREATE (in graph_iri any, in silent integer, in ui
}
;
-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
+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
{
declare g_iid IRI_ID;
declare old_log_enable integer;
- __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))
+ 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
{
- repl_text ('__rdf_repl', '__rdf_repl_flush_queue()');
- repl_text ('__rdf_repl', 'sparql define input:storage "" drop graph iri ( ?? )', graph_iri);
+ 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');
}
- 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)))
+ foreach (any g_iri in graph_iris) do
{
- if (silent)
+ 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 (exists (select top 1 1 from DB.DBA.RDF_QUAD where G = iri_to_id (graph_iri)))
+ if (silent)
{
- DB.DBA.SPARUL_CLEAR (graph_iri, 0, uid);
- log_enable (old_log_enable, 1);
+ 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;
+ }
if (compose_report)
- return sprintf ('Drop silent graph <%s> -- graph has not been explicitly created before, triples were removed', graph_iri);
+ return sprintf ('Drop silent graph <%s> -- nothing to do', g_iri);
else
- return 2;
+ return 0;
}
- if (compose_report)
- return sprintf ('Drop silent graph <%s> -- nothing to do', graph_iri);
else
- return 0;
+ signal ('22023', 'SPARUL_DROP() failed: graph <' || g_iri || '> has not been explicitly created before');
}
- 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 (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);
+ 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)
- return sprintf ('Drop silent graph <%s> -- done', graph_iri);
- else
- return 1;
+ {
+ if (txtreport <> '')
+ txtreport := txtreport || '\n';
+ txtreport := txtreport || sprintf ('Drop graph <%s> -- done', g_iri);
+ }
}
- 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 sprintf ('Drop graph <%s> -- done', graph_iri);
- else
- return 1;
+ return txtreport;
+ return 1;
}
;
@@ -6215,38 +7073,277 @@ create function DB.DBA.SPARUL_RUN (in results any, in compose_report integer :=
}
;
-create procedure DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS (in return_iris integer := 1, in lim integer := 2000000000)
+-- SPARQL 1.1 BINDINGS
+
+--!AWK PUBLIC
+create procedure DB.DBA.SPARQL_BINDINGS_VIEW_IMP (in dta any)
{
- 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);
+ declare rcount, rctr integer;
+ declare BND any;
+ result_names (BND);
+ rcount := length (dta);
+ for (rctr := 0; rctr < rcount; rctr := rctr+1)
+ result (dta[rctr]);
+}
+;
+
+create procedure view DB.DBA.SPARQL_BINDINGS_VIEW as DB.DBA.SPARQL_BINDINGS_VIEW_IMP (dta) (BND any)
+;
+
+grant select on DB.DBA.SPARQL_BINDINGS_VIEW to public
+;
+
+-- 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
+{
+ 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);
+ }
+ }
}
- if (dict_size (specials) >= lim)
- goto done_all;
- for (select REC_GRAPH_IID from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH) do
+ if (compose_report)
{
- dict_put (specials, REC_GRAPH_IID, 2);
+ 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);
}
- len := dict_size (specials);
- if (len >= lim)
- goto done_all;
- last_iri_id := #i0;
+ else
+ return ins_count;
+}
+;
+
+
+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 (lim is null)
+ lim := 2000000000;
+ 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'))
-- {
@@ -6424,11 +7521,22 @@ 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 integer;
+ declare fld_ctr, fld_count integer;
declare triple_vec any;
- triple_vec := vector (0,0,0);
+ 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);
+ }
-- dbg_obj_princ ('opcodes[triple_ctr]=', opcodes[triple_ctr]);
- for (fld_ctr := 2; fld_ctr >= 0; fld_ctr := fld_ctr - 1)
+ for (fld_ctr := fld_count - 1; fld_ctr >= 0; fld_ctr := fld_ctr - 1)
{
declare op integer;
declare arg any;
@@ -6442,16 +7550,16 @@ create procedure DB.DBA.SPARQL_CONSTRUCT_ACC (inout _env any, in opcodes any, in
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');
+ 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 ((1 = fld_ctr) and (i like 'bnode://%'))
- signal ('RDF01', 'Bad variable value in CONSTRUCT: blank node can not be used as predicate');
+ 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)
+ 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),
@@ -6465,8 +7573,8 @@ create procedure DB.DBA.SPARQL_CONSTRUCT_ACC (inout _env any, in opcodes any, in
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');
+ 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)
@@ -6476,16 +7584,16 @@ create procedure DB.DBA.SPARQL_CONSTRUCT_ACC (inout _env any, in opcodes any, in
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');
+ 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 ((1 = fld_ctr) and (arg like 'bnode://%'))
- signal ('RDF01', 'Bad const value in CONSTRUCT: blank node can not be used as predicate');
+ 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)
+ 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),
@@ -6745,7 +7853,7 @@ create procedure DB.DBA.SPARQL_DESC_DICT (in subj_dict any, in consts any, in go
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);
+ -- dbg_obj_princ ('Procedure text: ', txt); string_to_file (fname || '.sql', txt || '\n;', -2);
saved_user := user;
set_user_id ('dba', 1);
exec (txt);
@@ -7175,18 +8283,18 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in cons
}
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);
- }
+ 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))
{
@@ -7638,22 +8746,457 @@ ret_or_next_iter:
}
;
+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)
+{
+ 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 gs_app_callback, gs_app_uid, inf_ruleset 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);
+ 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 (not isnumeric (c))
+ dict_put (obj_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)
+ 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);
+ if (__tag of integer = __tag (good_graphs))
+ graphs_listed := 0;
+ else
+ {
+ vectorbld_init (sorted_good_graphs);
+ foreach (any g in good_graphs) do
+ {
+ if (is_named_iri_id (g) 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 (is_named_iri_id (g))
+ vectorbld_acc (sorted_bad_graphs, g);
+ }
+ vectorbld_final (sorted_bad_graphs);
+ bad_g_count := length (sorted_bad_graphs);
+ vectorbld_init (phys_objects);
+ 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)
+ {
+ declare obj, phys_obj any;
+ obj := all_objs [obj_ctr];
+ if (not isnumeric (obj))
+ {
+ 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);
+ }
+ }
+ }
+ vectorbld_final (phys_objects);
+ goto describe_physical_objects;
+ }
+ -- 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)
+ {
+ declare obj, phys_obj, 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);
+ 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 (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);
+ }
+ }
+ maps := subseq (maps, 0, maps_len-1);
+ maps_len := maps_len - 1;
+ }
+ if (maps_len > 0)
+ all_objs [obj_ctr] := vector (obj, 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]);
+ }
+ vectorbld_final (phys_objects);
+ for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)
+ {
+ declare s_desc, obj, maps any;
+ declare map_ctr, maps_len integer;
+ declare fname varchar;
+ s_desc := all_objs [obj_ctr];
+ if (isinteger (s_desc))
+ goto end_of_s;
+ obj := 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)));
+ 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);
+ 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 (' 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);
+ http ('select ?g1 ?p1 ?s1 ?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 (' }\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 (' } ) 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);
+ 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);
+ if (graphs_listed)
+ http (' } }\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, ''')(', obj, obj_dict, next_iter_objs, res, sorted_good_graphs, ')');
+ call ('DB.DBA.' || fname)(obj, obj_dict, next_iter_objs, 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);
+ }
+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)
+ 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 (obj_ctr := phys_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_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
+ {
+ -- 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);
+ 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
+ {
+ if (position ("g2", sorted_good_graphs) and dict_get (obj_dict, "st2") is null)
+ dict_put (next_iter_objs, "st2", 1);
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ for (obj_ctr := phys_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)
+ {
+ declare obj any;
+ obj := phys_objects [obj_ctr];
+ for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where
+ 0 = position (G, sorted_bad_graphs) and
+ O = obj 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);
+ 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
+ {
+ if (0 = position ("g2", sorted_bad_graphs) and
+ dict_get (obj_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);
+ }
+ }
+ }
+ }
+ret_or_next_iter:
+ if (0 = dict_size (next_iter_objs))
+ {
+ -- dbg_obj_princ ('no new objs, 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);
+ 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)
+{
+ 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 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 (not isnumeric (c))
+ dict_put (obj_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)
+ 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);
+ if (__tag of integer = __tag (good_graphs))
+ graphs_listed := 0;
+ else
+ {
+ vectorbld_init (sorted_good_graphs);
+ foreach (any g in good_graphs) do
+ {
+ if (is_named_iri_id (g) 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 (isnamed_iri_id (g))
+ 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)
+ 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 (obj_ctr := all_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_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
+ {
+ -- 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);
+ 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
+ {
+ if (position ("g2", sorted_good_graphs) and dict_get (obj_dict, "st2") is null)
+ dict_put (next_iter_objs, "st2", 1);
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ for (obj_ctr := all_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)
+ {
+ declare obj any;
+ obj := all_objs [obj_ctr];
+ for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where
+ 0 = position (G, sorted_bad_graphs) and
+ O = obj 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);
+ 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
+ {
+ if (0 = position ("g2", sorted_bad_graphs) and
+ dict_get (obj_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);
+ }
+ }
+ }
+ }
+
+ret_or_next_iter:
+ if (0 = dict_size (next_iter_objs))
+ {
+ -- dbg_obj_princ ('no new objs, 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);
+ 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)
{
declare ctr, len integer;
- declare O any;
+ declare triples, O any;
declare S, P, O_DT, O_LANG varchar;
declare O_IS_IRI, dt_twobyte, lang_twobyte integer;
- dict := dict_list_keys (dict, destructive);
- result_names (S, P, O --, O_IS_IRI, O_DT, O_LANG
- );
- len := length (dict);
+ triples := dict_list_keys (dict, destructive);
+ DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
+ 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)));
+ len := length (triples);
for (ctr := 0; ctr < len; ctr := ctr+1)
{
- S := id_to_iri (dict[ctr][0]);
- P := id_to_iri (dict[ctr][1]);
- O := dict[ctr][2];
+ if (isiri_id (triples[ctr][0]))
+ S := id_to_iri (triples[ctr][0]);
+ else
+ S := triples[ctr][0];
+
+ if (isiri_id (triples[ctr][1]))
+ P := id_to_iri (triples[ctr][1]);
+ else
+ P := triples[ctr][1];
+ O := triples[ctr][2];
if (isiri_id (O))
{
result (S, P, id_to_iri (O) --, 1, NULL, NULL
@@ -7669,13 +9212,56 @@ 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
+ else if (S is not null and P is not null and O is not null)
result (S, P, O --, 0, __xsd_type (O, NULL), NULL
);
}
}
;
+--!AWK PUBLIC
+create procedure DB.DBA.RDF_DICT_OF_TRIPLES_TO_FOUR_COLS (in dict any, in destructive integer := 0)
+{
+ declare ctr, len integer;
+ declare triples, O any;
+ declare S, P, O_DT, O_LANG varchar;
+ declare O_IS_IRI, dt_twobyte, lang_twobyte integer;
+ triples := dict_list_keys (dict, destructive);
+ DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
+ 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', 182, 0, 2147483647, 1, 0, 0, 0, 0, 0, 0, 0), vector ('O_TYPE', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0)));
+ len := length (triples);
+ for (ctr := 0; ctr < len; ctr := ctr+1)
+ {
+ if (isiri_id (triples[ctr][0]))
+ S := id_to_iri (triples[ctr][0]);
+ else
+ S := triples[ctr][0];
+
+ if (isiri_id (triples[ctr][1]))
+ P := id_to_iri (triples[ctr][1]);
+ else
+ P := triples[ctr][1];
+ O := triples[ctr][2];
+ if (isiri_id (O))
+ {
+ result (S, P, id_to_iri (O), NULL);
+ }
+ else if (is_rdf_box (O))
+ {
+ dt_twobyte := rdf_box_type (O);
+ O_DT := case (dt_twobyte) when 257 then NULL else coalesce (
+ (select id_to_iri (RDT_IID) from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = dt_twobyte) ) end;
+ lang_twobyte := rdf_box_lang (O);
+ --O_LANG := case (lang_twobyte) when 257 then NULL else coalesce (
+ -- (select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = lang_twobyte) ) end;
+ result (S, P, O, coalesce (O_DT, ''));
+ }
+ else if (S is not null and P is not null and O is not null)
+ result (S, P, O, coalesce (__xsd_type (O, NULL), ''));
+ }
+}
+;
+
-----
-- Internal functions used in SQL generated by SPARQL compiler.
-- They will change frequently, do not try to use them in applications!
@@ -7884,312 +9470,6 @@ 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)
@@ -8199,8 +9479,13 @@ 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 like 'DB.DBA.SPARQL_DESC_DICT_QMV1_%') or
- (P_NAME like 'DB.DBA.SPARQL_DESC_DICT_CBD_QMV1_%') )
+ (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_%') ) )
for update) do
{
exec ('drop procedure DB.DBA."' || subseq (P_NAME, 7) || '"');
@@ -8288,7 +9573,7 @@ create function DB.DBA.JSO_VECTOR_TO_TTL (inout proplist any) returns any
p := proplist[ctr][1];
o := proplist[ctr][2];
if (obj = prev_obj)
- http (';\n ', ses);
+ http (' ;\n ', ses);
else
{
if (prev_obj is null)
@@ -8301,7 +9586,7 @@ create function DB.DBA.JSO_VECTOR_TO_TTL (inout proplist any) returns any
@prefix rdfdf: <http://www.openlinksw.com/virtrdf-data-formats#> .
', ses );
else
- http ('.\n', ses);
+ http (' .\n', ses);
prev_obj := obj;
DB.DBA.JSO_DUMP_FLD (obj, ses);
http ('\n ', ses);
@@ -8311,7 +9596,7 @@ create function DB.DBA.JSO_VECTOR_TO_TTL (inout proplist any) returns any
DB.DBA.JSO_DUMP_FLD (o, ses);
}
if (prev_obj is not null)
- http ('.\n', ses);
+ http (' .\n', ses);
return ses;
}
;
@@ -8718,7 +10003,7 @@ jso_load_failed:
;
-----
--- Internal routines for SPARQL quad map syntax extensions
+-- Internal routines for SPARQL macro library and quad map syntax extensions
create procedure DB.DBA.RDF_QM_CHANGE (in warninglist any)
{
@@ -8763,7 +10048,10 @@ create procedure DB.DBA.RDF_QM_CHANGE_OPT (in cmdlist any)
}
http (')', exectext);
STATE := '00000';
- warnings := exec (string_output_string (exectext), STATE, MESSAGE, arglist, md, rs);
+ 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;
-- dbg_obj_princ ('warnings = ', warnings);
if (__tag of vector = __tag (warnings))
{
@@ -8795,10 +10083,16 @@ 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);
+ {
+ jso_delete (deleted [ctr], deleted [ctr+1], 1);
+ log_text ('jso_delete (?,?,1)', deleted [ctr], deleted [ctr+1]);
+ }
len := length (affected);
for (ctr := 0; ctr < len; ctr := ctr + 1)
- jso_mark_affected (affected [ctr]);
+ {
+ jso_mark_affected (affected [ctr]);
+ log_text ('jso_mark_affected (?)', affected [ctr]);
+ }
return vector (vector ('00000', 'Transaction committed, SPARQL compiler re-configured'));
}
;
@@ -8886,13 +10180,6 @@ 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;
@@ -9095,6 +10382,8 @@ 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 {
@@ -9105,14 +10394,41 @@ create function DB.DBA.RDF_QM_DROP_MAPPING (in storage varchar, in mapname any)
{ ?st virtrdf:qsDefaultMap `iri(?:qmid)` }
} } ) do
{
- -- 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_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 || '>'));
}
DB.DBA.RDF_QM_GC_MAPPING_SUBTREE (qmid, 0);
- return vector (vector ('00000', 'Quad map <' || qmid || '> is deleted'));
+ 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;
}
else
{
+ if (not exists (sparql
+ define input:storage ""
+ select ?st where {
+ graph <http://www.openlinksw.com/schemas/virtrdf#> {
+ { ?st virtrdf:qsUserMaps ?subm .
+ ?subm ?p `iri(?:qmid)` }
+ union
+ { ?st virtrdf:qsDefaultMap `iri(?:qmid)` }
+ filter (?st = iri(?:storage))
+ } } ) )
+ {
+ if (silent)
+ return vector (vector ('00000', 'Quad map <' || qmid || '> is not used in storage <' || storage || '>, the DROP statement is ignored due to SILENT option'));
+ signal ('22023', 'Quad map <' || qmid || '> is not used in storage <' || storage || '>');
+ }
DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (storage, NULL, qmid);
DB.DBA.RDF_QM_GC_MAPPING_SUBTREE (qmid, 1);
return vector (vector ('00000', 'Quad map <' || qmid || '> is no longer used in storage <' || storage || '>'));
@@ -10155,7 +11471,13 @@ create function DB.DBA.RDF_QM_STORE_ATABLES (in qmvid varchar, in atablesid varc
pair := atables [atablectr];
alias := pair[0];
qtable := pair[1];
- inner_id := qmvid || '-atable-' || alias || '-' || qtable;
+ if (starts_with (qtable, '/*[sqlquery[*/'))
+ {
+ qtable := '(' || qtable || ')';
+ inner_id := qmvid || '-atable-' || alias || '-sql-query';
+ }
+ else
+ inner_id := qmvid || '-atable-' || alias || '-' || qtable;
sparql define input:storage ""
prefix rdfdf: <http://www.openlinksw.com/virtrdf-data-formats#>
delete from graph <http://www.openlinksw.com/schemas/virtrdf#> { ?s ?p ?o }
@@ -10288,6 +11610,7 @@ create function DB.DBA.RDF_QM_DEFINE_MAP_VALUE (in qmv any, in fldname varchar,
) */
declare atables, sqlcols, conds any;
declare ftextid varchar;
+ declare qry_metas any;
declare atablectr, atablecount integer;
declare colctr, colcount, fmtcolcount integer;
declare condctr, condcount integer;
@@ -10299,6 +11622,7 @@ create function DB.DBA.RDF_QM_DEFINE_MAP_VALUE (in qmv any, in fldname varchar,
sqlcols := qmv[2];
conds := qmv[3];
ftextid := qmv[4];
+ qry_metas := null;
atablecount := length (atables);
colcount := length (sqlcols);
condcount := length (conds);
@@ -10318,23 +11642,54 @@ create function DB.DBA.RDF_QM_DEFINE_MAP_VALUE (in qmv any, in fldname varchar,
for (colctr := 0; colctr < colcount; colctr := colctr + 1)
{
declare sqlcol any;
- declare final_tblname, final_colname varchar;
+ declare alias_msg_txt, final_tblname, final_colname varchar;
sqlcol := sqlcols [colctr];
- final_tblname := DB.DBA.SQLQNAME_NOTATION_TO_QNAME (sqlcol[0], 3);
final_colname := DB.DBA.SQLNAME_NOTATION_TO_NAME (sqlcol[2]);
- if (not exists (select top 1 1 from DB.DBA.TABLE_COLS where "TABLE" = final_tblname))
- {
- if (sqlcol[1] is not null)
- signal ('22023', 'No table ' || sqlcol[0] || ' (alias ' || sqlcol[1] || ') in database, please check spelling and character case');
- else
- signal ('22023', 'No table ' || sqlcol[0] || ' in database, please check spelling and character case');
+ if (sqlcol[1] is not null)
+ alias_msg_txt := ' (alias ' || sqlcol[1] || ')';
+ else
+ alias_msg_txt := ' (without alias)';
+ if (starts_with (sqlcol[0], '/*[sqlquery[*/'))
+ {
+ declare qry varchar;
+ declare qry_colcount, qry_colctr integer;
+ declare qry_mdata any;
+ qry := sqlcol[0];
+ if (qry_metas is null)
+ qry_metas := dict_new (5);
+ qry_mdata := dict_get (qry_metas, qry, null);
+ if (qry_mdata is null)
+ {
+ declare stat, msg varchar;
+ declare exec_metas any;
+ stat := '00000';
+ exec_metadata (sqlcol[0], stat, msg, exec_metas);
+ if (stat <> '00000')
+ signal ('22023', 'The compilation of SQLQUERY' || alias_msg_txt || ' results in Error ' || stat || ': ' || msg);
+ if (exec_metas[1] <> 1)
+ signal ('R2RML', 'Dangerous DML in SQLQUERY' || alias_msg_txt);
+ exec_metas := exec_metas[0];
+ qry_colcount := length (exec_metas);
+ qry_mdata := make_array (qry_colcount*2, 'any');
+ for (qry_colctr := 0; qry_colctr < qry_colcount; qry_colctr := qry_colctr + 1)
+ {
+ qry_mdata[qry_colctr*2] := exec_metas[qry_colctr][0];
+ qry_mdata[qry_colctr*2+1] := exec_metas[qry_colctr];
+ }
+ dict_put (qry_metas, qry, qry_mdata);
+ -- dbg_obj_princ ('DB.DBA.RDF_QM_DEFINE_MAP_VALUE(): storing metadata ', qry_mdata, ' for ', qry);
+ }
+ -- dbg_obj_princ ('DB.DBA.RDF_QM_DEFINE_MAP_VALUE(): final_colname = ', final_colname);
+ if (get_keyword (final_colname, qry_mdata) is null)
+ signal ('22023', 'The result of SQLQUERY' || alias_msg_txt || ' does not contain column ' || sqlcol[2] || ', please check spelling and character case');
}
- if (not exists (select top 1 1 from DB.DBA.TABLE_COLS where "TABLE" = final_tblname and "COLUMN" = final_colname))
+ else
{
- if (sqlcol[1] is not null)
- signal ('22023', 'No column ' || sqlcol[2] || ' in table ' || sqlcol[0] || ' (alias ' || sqlcol[1] || ') in database, please check spelling and character case');
- else
- signal ('22023', 'No column ' || sqlcol[2] || ' in table ' || sqlcol[0] || ' in database, please check spelling and character case');
+ final_tblname := DB.DBA.SQLQNAME_NOTATION_TO_QNAME (sqlcol[0], 3);
+ if (not exists (select top 1 1 from DB.DBA.TABLE_COLS where "TABLE" = final_tblname))
+ signal ('22023', 'No table ' || sqlcol[0] || alias_msg_txt || ' in database, please check spelling and character case');
+ if (not exists (select top 1 1 from DB.DBA.TABLE_COLS where "TABLE" = final_tblname and "COLUMN" = final_colname))
+ signal ('22023', 'No column ' || sqlcol[2] || ' in table ' || sqlcol[0] || alias_msg_txt || ' in database, please check spelling and character case');
}
if (tablename is null)
tablename := sqlcol[0];
@@ -10350,10 +11705,20 @@ create function DB.DBA.RDF_QM_DEFINE_MAP_VALUE (in qmv any, in fldname varchar,
declare coldtp, colnullable integer;
declare coltype varchar;
sqlcol := sqlcols [0];
- final_tblname := DB.DBA.SQLQNAME_NOTATION_TO_QNAME (sqlcol[0], 3);
final_colname := DB.DBA.SQLNAME_NOTATION_TO_NAME (sqlcol[2]);
- select COL_DTP, coalesce (COL_NULLABLE, 1) into coldtp, colnullable
- from DB.DBA.TABLE_COLS where "TABLE" = final_tblname and "COLUMN" = final_colname;
+ if (starts_with (sqlcol[0], '/*[sqlquery[*/'))
+ {
+ declare col_mdata any;
+ col_mdata := get_keyword (final_colname, dict_get (qry_metas, sqlcol[0], null));
+ coldtp := col_mdata[1];
+ colnullable := col_mdata[4];
+ }
+ else
+ {
+ final_tblname := DB.DBA.SQLQNAME_NOTATION_TO_QNAME (sqlcol[0], 3);
+ select COL_DTP, coalesce (COL_NULLABLE, 1) into coldtp, colnullable
+ from DB.DBA.TABLE_COLS where "TABLE" = final_tblname and "COLUMN" = final_colname;
+ }
coltype := case (coldtp)
when __tag of long varchar then 'longvarchar'
when __tag of timestamp then 'datetime' -- timestamp
@@ -10641,7 +12006,7 @@ create function DB.DBA.RDF_QM_DEFINE_MAPPING (in storage varchar,
qm_empty := NULL;
if (tablename is null)
{
- tablename := 'DB.DBA.SYS_FAKE_1';
+ tablename := 'DB.DBA.SYS_IDONLY_ONE';
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');
}
@@ -10951,13 +12316,14 @@ create procedure DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (in storage varchar,
declare ord integer;
id := itm[0];
ord := itm[2];
- if (iri_to_id (id, 0, 0) <> qmid)
+ if (iri_to_id (id) <> qmid)
{
sparql define input:storage ""
insert in graph <http://www.openlinksw.com/schemas/virtrdf#> {
`iri(?:lstiri)`
`iri(bif:sprintf("%s%d", str(rdf:_), ?:ctr))`
`iri(?:id)` . };
+ -- dbg_obj_princ ('DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE: reinsert ', itm, ' in rdf:_', ctr);
ctr := ctr + 1;
}
else
@@ -10989,6 +12355,186 @@ 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;
@@ -11154,8 +12700,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));
}
@@ -11459,7 +13005,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 rdf_load_rdfxml_cl (strg, base, graph);
+ return DB.DBA.RDF_LOAD_RDFXML_CL (strg, base, graph, 0);
if (__rdf_obj_ft_rule_count_in_graph (iri_to_id (graph)))
ro_id_dict := dict_new ();
else
@@ -12081,6 +13627,7 @@ create procedure DB.DBA.RDF_GRAPH_GROUP_CREATE_MEMONLY (in group_iri varchar, in
dict_put (__rdf_graph_id2iri_dict(), group_iid, __uname(group_iri));
dict_put (__rdf_graph_group_dict(), group_iid, vector ());
jso_mark_affected (group_iri);
+ log_text ('jso_mark_affected (?)', group_iri);
__rdf_cli_mark_qr_to_recompile ();
}
;
@@ -12115,12 +13662,16 @@ create procedure DB.DBA.RDF_GRAPH_GROUP_DROP_MEMONLY (in group_iri varchar, in g
dict_put (__rdf_graph_group_dict(), group_iid, vector ());
dict_remove (__rdf_graph_group_dict(), group_iid);
jso_mark_affected (group_iri);
+ log_text ('jso_mark_affected (?)', group_iri);
if (group_iri = 'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs')
{
declare privates any;
privates := dict_list_keys (__rdf_graph_group_of_privates_dict(), 2);
foreach (IRI_ID iid in privates) do
- jso_mark_affected (id_to_iri (iid));
+ {
+ jso_mark_affected (id_to_iri (iid));
+ log_text ('jso_mark_affected (?)', id_to_iri (iid));
+ }
}
__rdf_cli_mark_qr_to_recompile ();
}
@@ -12190,10 +13741,12 @@ create procedure DB.DBA.RDF_GRAPH_GROUP_INS_MEMONLY (in group_iri varchar, in gr
where RGGM_GROUP_IID = group_iid
order by RGGM_MEMBER_IID ) );
jso_mark_affected (group_iri);
+ log_text ('jso_mark_affected (?)', group_iri);
if (group_iri = 'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs')
{
dict_put (__rdf_graph_group_of_privates_dict(), memb_iid, 1);
jso_mark_affected (memb_iri);
+ log_text ('jso_mark_affected (?)', memb_iri);
}
}
;
@@ -12210,7 +13763,28 @@ create procedure DB.DBA.RDF_GRAPH_GROUP_INS (in group_iri varchar, in memb_iri v
if (not exists (select top 1 1 from DB.DBA.RDF_GRAPH_GROUP where RGG_IRI = group_iri))
signal ('RDF99', sprintf ('Graph group <%s> does not exist', group_iri));
if (group_iri = 'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs')
- DB.DBA.RDF_GRAPH_CHECK_VISIBILITY_CHANGE (memb_iri, #i8192);
+ {
+ DB.DBA.RDF_GRAPH_CHECK_VISIBILITY_CHANGE (memb_iri, #i8192);
+ if (isstring (registry_get ('DB.DBA.RDF_REPL'))
+ 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 = memb_iid)
+ and not exists (select RGU_PERMISSIONS from DB.DBA.RDF_GRAPH_USER
+ where RGU_GRAPH_IID = memb_iid and RGU_USER_ID = http_nobody_uid() and bit_and (RGU_PERMISSIONS, 1) )
+ and not exists (select RGU_PERMISSIONS from DB.DBA.RDF_GRAPH_USER
+ where RGU_GRAPH_IID = #i8192 and RGU_USER_ID = http_nobody_uid() and bit_and (RGU_PERMISSIONS, 1) )
+ and not exists (select RGU_PERMISSIONS from DB.DBA.RDF_GRAPH_USER
+ where RGU_GRAPH_IID = memb_iid and RGU_USER_ID = __rdf_repl_uid() and bit_and (RGU_PERMISSIONS, 1) )
+ and not exists (select RGU_PERMISSIONS from DB.DBA.RDF_GRAPH_USER
+ where RGU_GRAPH_IID = #i8192 and RGU_USER_ID = __rdf_repl_uid() and bit_and (RGU_PERMISSIONS, 1) ) )
+ signal ('RDF99', 'Can not add graph <' || memb_iri || '> to group of private graphs <' || group_iri || '>; either stop the RDF replication of this graph or grant an explicit read permission to __rdf_repl account');
+ }
+ else if (group_iri = 'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group')
+ {
+ if (memb_iri = DB.DBA.JSO_SYS_GRAPH())
+ signal ('RDF99', 'Graph group <' || group_iri || '> is for RDF replication; can not enable RDF replication of <' || memb_iri || '> (the system metadata graph)');
+ if (isstring (registry_get ('DB.DBA.RDF_REPL')) and not __rgs_ack_cbk (memb_iid, __rdf_repl_uid(), 1))
+ signal ('RDF99', 'Graph group <' || group_iri || '> is for RDF replication; can not enable RDF replication of graph <' || memb_iri || '> because it is not readable by __rdf_repl account');
+ }
insert soft DB.DBA.RDF_GRAPH_GROUP_MEMBER (RGGM_GROUP_IID, RGGM_MEMBER_IID)
values (group_iid, memb_iid);
commit work;
@@ -12231,10 +13805,12 @@ create procedure DB.DBA.RDF_GRAPH_GROUP_DEL_MEMONLY (in group_iri varchar, in gr
where RGGM_GROUP_IID = group_iid
order by RGGM_MEMBER_IID ) );
jso_mark_affected (group_iri);
+ log_text ('jso_mark_affected (?)', group_iri);
if (group_iri = 'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs')
{
dict_remove (__rdf_graph_group_of_privates_dict(), memb_iid);
jso_mark_affected (memb_iri);
+ log_text ('jso_mark_affected (?)', memb_iri);
}
}
;
@@ -12265,7 +13841,7 @@ create function DB.DBA.RDF_GRAPH_USER_PERMS_GET (in graph_iri varchar, in uid an
declare res integer;
graph_iid := iri_to_id (graph_iri);
if (isstring (uid))
- uid := ((select U_ID from DB.DBA.SYS_USERS where U_NAME = uid and (U_NAME='nobody' or (U_SQL_ENABLE and not U_ACCOUNT_DISABLED))));
+ uid := (select U_ID from DB.DBA.SYS_USERS where U_NAME = uid and (U_NAME='nobody' or U_SQL_ENABLE));
if (uid is null)
return 0;
if (uid = 0)
@@ -12384,7 +13960,10 @@ create procedure DB.DBA.RDF_DEFAULT_USER_PERMS_SET_MEMONLY (in uname varchar, in
if (uid = http_nobody_uid())
dict_put (__rdf_graph_public_perms_dict(), special_iid, perms);
foreach (varchar jso_key in affected_jso) do
- jso_mark_affected (jso_key);
+ {
+ jso_mark_affected (jso_key);
+ log_text ('jso_mark_affected (?)', jso_key);
+ }
}
;
@@ -12460,7 +14039,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)
@@ -12473,6 +14052,7 @@ create procedure DB.DBA.RDF_GRAPH_USER_PERMS_SET_MEMONLY (in graph_iri varchar,
else
__rdf_graph_specific_perms_of_user (graph_iid, uid, perms);
jso_mark_affected (graph_iri);
+ log_text ('jso_mark_affected (?)', graph_iri);
}
;
@@ -12503,11 +14083,12 @@ 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);
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) )
signal ('RDF99', 'Can not disable public read access to <' || id_to_iri (graph_iid) || '> while it is included in RDF replication and the replication is enabled');
+ jso_mark_affected (graph_iri);
+ log_text ('jso_mark_affected (?)', graph_iri);
}
else
{
@@ -12517,6 +14098,10 @@ create procedure DB.DBA.RDF_GRAPH_USER_PERMS_SET (in graph_iri varchar, in uname
15 );
if (bit_and (bit_not (perms), common_perms))
signal ('RDF99', sprintf ('Permissions of unauthenticated user are broader than new permissions of user "%s" on specific graph <%s>', uname, graph_iri));
+ if ((uname = '__rdf_repl') and 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) )
+ signal ('RDF99', 'Can not disable read access of __rdf_repl account to <' || id_to_iri (graph_iid) || '> while it is included in RDF replication and the replication is enabled');
}
if (not (exists (select top 1 1 from DB.DBA.RDF_GRAPH_USER where RGU_GRAPH_IID = #i0 and RGU_USER_ID = 0)))
DB.DBA.RDF_DEFAULT_USER_PERMS_SET ('dba', 1023);
@@ -12530,6 +14115,39 @@ 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);
+ log_text ('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;
@@ -12602,7 +14220,6 @@ 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;
@@ -12657,7 +14274,7 @@ create procedure DB.DBA.SPARQL_RELOAD_QM_GRAPH ()
{
declare ver varchar;
declare inx int;
- ver := '2011-09-01 0001v6g';
+ ver := '2012-05-17 0001v6g';
if (USER <> 'dba')
signal ('RDFXX', 'Only DBA can reload quad map metadata');
if (not exists (sparql define input:storage "" ask where {
@@ -12773,8 +14390,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_FAKE_0 to SPARQL_SELECT',
- 'grant select on DB.DBA.SYS_FAKE_1 to SPARQL_SELECT',
+ 'grant select on DB.DBA.SYS_IDONLY_EMPTY to SPARQL_SELECT',
+ 'grant select on DB.DBA.SYS_IDONLY_ONE 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',
@@ -12816,6 +14433,8 @@ 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',
@@ -12838,16 +14457,21 @@ 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',
'grant execute on DB.DBA.RDF_TRIPLES_TO_TALIS_JSON to SPARQL_SELECT',
'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_TSV 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',
@@ -12866,6 +14490,7 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_FIN to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC to SPARQL_SELECT',
+ 'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV_ACC to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_ACC to SPARQL_SELECT',
@@ -12880,6 +14505,7 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_MICRODATA to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_MICRODATA to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CSV to SPARQL_SELECT',
+ 'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TSV to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDFA_XHTML to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML_QRCODE to SPARQL_SELECT',
@@ -12888,12 +14514,20 @@ 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_LOAD to SPARQL_UPDATE',
+ 'grant execute on DB.DBA.SPARUL_COPY to SPARQL_UPDATE',
+ 'grant execute on SPARUL_LOAD_SERVICE_DATA to SPARQL_SPONGE',
'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_LOAD_SERVICE_DATA 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',
@@ -12904,6 +14538,10 @@ 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',
@@ -12925,9 +14563,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);
@@ -13017,7 +14655,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 RDF_QUAD))
+ if (not exists (select top 1 1 from DB.DBA.RDF_QUAD))
{
registry_set ('__rb_id_only_for_plain_ro_obj', '1');
return;
@@ -13027,7 +14665,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 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 DB.DBA.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');
@@ -13037,7 +14675,6 @@ 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')
@@ -13088,18 +14725,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 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));
+ 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));
if (c_main <> c_pogs)
log_message ('* Existing indexes are damaged, will try to recover...');
- c_op := (select count (1) from RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));
+ c_op := (select count (1) from DB.DBA.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);
@@ -13111,7 +14748,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 RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only) 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));
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.');
@@ -13132,9 +14769,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 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));
+ 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));
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.');
@@ -13147,11 +14784,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.');
@@ -13202,6 +14839,9 @@ 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')
@@ -13237,8 +14877,8 @@ create procedure DB.DBA.RDF_QUAD_FT_UPGRADE ()
final_qm_reload:
DB.DBA.SPARQL_RELOAD_QM_GRAPH ();
- 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');
+ --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');
return;
}
@@ -13331,19 +14971,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;
}
}
@@ -13410,7 +15050,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
@@ -13448,13 +15088,13 @@ create function rdfs_load_schema (in ri_name varchar, in gn varchar := null) ret
rules_count := rules_count + length (v);
}
jso_mark_affected (ri_name);
+ log_text ('jso_mark_affected (?)', ri_name);
-- if (not rules_count)
rdf_inf_dir (ri_name, null, null, 0);
return rules_count + 1;
}
;
-
create procedure rdf_schema_ld ()
{
if (1 <> sys_stat ('cl_run_local_only'))
@@ -13482,7 +15122,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);
}
@@ -13498,7 +15138,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
@@ -13621,18 +15261,18 @@ create procedure cl_inx_recov (in force int := 0)
{
declare old_mode, tries int;
if (force)
- cl_exec ('registry_remove (''__rb_id_only_for_plain_ro_obj'')');
+ DB.DBA.CL_EXEC ('registry_remove (''__rb_id_only_for_plain_ro_obj'')');
if (registry_get ('__rb_id_only_for_plain_ro_obj') = '1')
return;
- cl_exec ('checkpoint_interval (0)');
+ DB.DBA.CL_EXEC ('checkpoint_interval (0)');
log_message ('Automatic checkpoint is stopped, must enable manually once upgrade finished.');
- cl_exec ('__dbf_set (''cl_max_keep_alives_missed'', 10000)');
- cl_exec ('__dbf_set (''cl_non_logged_write_mode'', 1)');
- cl_exec ('checkpoint');
+ DB.DBA.CL_EXEC ('__dbf_set (''cl_max_keep_alives_missed'', 10000)');
+ DB.DBA.CL_EXEC ('__dbf_set (''cl_non_logged_write_mode'', 1)');
+ DB.DBA.CL_EXEC ('checkpoint');
old_mode := log_enable (2,1);
- cl_exec ('exec_from_daq (''cl_tmp_inx_recov_fill ()'')');
+ DB.DBA.CL_EXEC ('exec_from_daq (''cl_tmp_inx_recov_fill ()'')');
clear_retry:
- cl_exec ('exec_from_daq (''cl_inx_recov_clean ()'')');
+ DB.DBA.CL_EXEC ('exec_from_daq (''cl_inx_recov_clean ()'')');
if (
exists (select 1 from rdf_quad table option (index rdf_quad)) or
exists (select 1 from rdf_quad table option (index rdf_quad_pogs)) or
@@ -13643,15 +15283,15 @@ clear_retry:
if (tries > 100)
{
log_message ('Quad store can not be cleaned, data reloading is strictly recommended.');
- cl_exec ('raw_exit ()');
+ DB.DBA.CL_EXEC ('raw_exit ()');
}
log_message (sprintf ('Quad store is not fully cleaned, will try again [%d]', tries));
goto clear_retry;
}
- cl_exec ('exec_from_daq (''cl_inx_recov_fill_1 ()'')');
- cl_exec ('registry_set (''__rb_id_only_for_plain_ro_obj'', ''1'')');
+ DB.DBA.CL_EXEC ('exec_from_daq (''cl_inx_recov_fill_1 ()'')');
+ DB.DBA.CL_EXEC ('registry_set (''__rb_id_only_for_plain_ro_obj'', ''1'')');
if (not force)
- cl_exec ('checkpoint');
+ DB.DBA.CL_EXEC ('checkpoint');
log_message ('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)))
@@ -13662,7 +15302,7 @@ clear_retry:
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_enable (old_mode, 1);
- cl_exec ('__dbf_set (''cl_non_logged_write_mode'', 0)');
+ DB.DBA.CL_EXEC ('__dbf_set (''cl_non_logged_write_mode'', 0)');
log_message ('Update complete.');
if (force)
log_message ('Must do checkpoint to persist the db state.');
diff --git a/libsrc/Wi/sparql2sql.c b/libsrc/Wi/sparql2sql.c
index 8c44480..de036fa 100644
--- a/libsrc/Wi/sparql2sql.c
+++ b/libsrc/Wi/sparql2sql.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparql2sql.c,v 1.88.2.46 2011/07/19 23:27:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -90,7 +90,7 @@ sparp_gp_trav_list_subquery_retvals (sparp_t *sparp, SPART *curr, sparp_trav_sta
}
END_DO_BOX_FAST;
for (ctr = BOX_ELEMENTS_0 (options); 1 < ctr; ctr -= 2)
- {
+ {
ptrlong key = ((ptrlong)(options[ctr-2]));
SPART *val = options[ctr-1];
caddr_t name = NULL;
@@ -100,7 +100,7 @@ sparp_gp_trav_list_subquery_retvals (sparp_t *sparp, SPART *curr, sparp_trav_sta
case T_STEP_L: name = val->_.alias.aname; break;
}
if ((NULL != name) && !SPART_VARNAME_IS_GLOB(name) && (0 > dk_set_position_of_string (((dk_set_t *)(common_env))[0], name)))
- t_set_push ((dk_set_t *)(common_env), name);
+ t_set_push ((dk_set_t *)(common_env), name);
}
return 0;
}
@@ -224,7 +224,7 @@ sparp_expand_top_retvals (sparp_t *sparp, SPART *query, int safely_copy_all_vars
NULL );
if (0 == lnar.agg_found)
return;
- if (0 != BOX_ELEMENTS_0 (query->_.req_top.groupings))
+ if (NULL != query->_.req_top.groupings)
{
dk_set_t names_in_groupings = NULL;
sparp_gp_localtrav_treelist (sparp, query->_.req_top.groupings,
@@ -234,7 +234,7 @@ sparp_expand_top_retvals (sparp_t *sparp, SPART *query, int safely_copy_all_vars
NULL );
while (NULL != lnar.names)
{
- caddr_t varname = t_set_pop (&(lnar.names));
+ caddr_t varname = (caddr_t)t_set_pop (&(lnar.names));
if (0 > dk_set_position_of_string (names_in_groupings, varname))
spar_error (sparp, "Variable ?%.200s is used in the result set outside aggregate and not mentioned in GROUP BY clause", varname);
}
@@ -243,12 +243,12 @@ sparp_expand_top_retvals (sparp_t *sparp, SPART *query, int safely_copy_all_vars
t_set_push (&(env->spare_selids), retselid);
while (NULL != lnar.names)
{
- caddr_t varname = t_set_pop (&(lnar.names));
+ caddr_t varname = (caddr_t)t_set_pop (&(lnar.names));
SPART *var = spar_make_variable (sparp, varname);
t_set_push (&new_vars, var);
}
t_set_pop (&(env->spare_selids));
- query->_.req_top.groupings = (SPART **)t_revlist_to_array (new_vars);
+ query->_.req_top.groupings = (SPART **)t_revlist_to_array_or_null (new_vars);
return;
}
{
@@ -262,7 +262,7 @@ sparp_expand_top_retvals (sparp_t *sparp, SPART *query, int safely_copy_all_vars
t_set_push (&(env->spare_selids), retselid);
while (NULL != lnar.names)
{
- caddr_t varname = t_set_pop (&(lnar.names));
+ caddr_t varname = (caddr_t)t_set_pop (&(lnar.names));
SPART *var = spar_make_variable (sparp, varname);
t_set_push (&new_vars, var);
}
@@ -323,14 +323,16 @@ void
sparp_wpar_retvars_in_max (sparp_t *sparp, SPART *query)
{
SPART **retvals = query->_.req_top.retvals;
+ const char *formatter, *agg_formatter, *agg_meta;
caddr_t retvalmode_name, formatmode_name;
if ((0 == sparp->sparp_query_uses_aggregates) || (0 != BOX_ELEMENTS_0 (query->_.req_top.groupings)))
return;
retvalmode_name = query->_.req_top.retvalmode_name;
formatmode_name = query->_.req_top.formatmode_name;
+ ssg_find_formatter_by_name_and_subtype (formatmode_name, query->_.req_top.subtype, &formatter, &agg_formatter, &agg_meta);
if (((SELECT_L == query->_.req_top.subtype) ||
(DISTINCT_L == query->_.req_top.subtype) ) &&
- (NULL == formatmode_name) &&
+ (NULL == formatter) && (NULL == agg_formatter) &&
((NULL == retvalmode_name) ||
(SSG_VALMODE_SQLVAL == ssg_find_valmode_by_name (retvalmode_name)) ) )
return;
@@ -370,7 +372,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_grab);
+ rdf_grab_config_t *rgc = &(sparp->sparp_env->spare_src.ssrc_grab);
SPART *root = sparp->sparp_expr;
if (rgc->rgc_all)
spar_add_rgc_vars_and_consts_from_retvals (sparp, root->_.req_top.retvals);
@@ -383,7 +385,6 @@ 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,
@@ -580,6 +581,44 @@ sparp_gp_trav_cu_out_triples_1 (sparp_t *sparp, SPART *curr, sparp_trav_state_t
}
int
+sparp_gp_trav_cu_out_triples_1_merge_recvs (sparp_t *sparp, SPART *curr, sparp_trav_state_t *sts_this, void *common_env)
+{
+ int eq_ctr;
+ sparp_gp_trav_cu_out_triples_1 (sparp, curr, sts_this, common_env);
+ if (SPAR_GP != SPART_TYPE(curr))
+ return 0;
+ if (OPTIONAL_L == curr->_.gp.subtype)
+ return 0;
+ SPARP_FOREACH_GP_EQUIV (sparp, curr, eq_ctr, eq)
+ {
+ int ctr_r1;
+ DO_BOX_FAST_REV (ptrlong, recv1_idx, ctr_r1, eq->e_receiver_idxs)
+ {
+ int ctr_r2;
+ for (ctr_r2 = BOX_ELEMENTS (eq->e_receiver_idxs); --ctr_r2 > ctr_r1; /* no step */)
+ {
+ int recv2_idx = eq->e_receiver_idxs[ctr_r2];
+ SPART *recv_gp;
+ sparp_equiv_t *recv1_eq = SPARP_EQUIV(sparp,recv1_idx);
+ sparp_equiv_t *recv2_eq = SPARP_EQUIV(sparp,recv2_idx);
+ if (recv1_eq == recv2_eq)
+ spar_internal_error (sparp, "sparp_" "gp_trav_cu_out_triples_1_merge_recvs (): duplicate receiver");
+ recv_gp = recv1_eq->e_gp;
+ if (recv_gp != recv2_eq->e_gp)
+ spar_internal_error (sparp, "sparp_" "gp_trav_cu_out_triples_1_merge_recvs (): receivers in different gps");
+ if (UNION_L == recv_gp->_.gp.subtype)
+ return 0;
+ sparp_equiv_merge (sparp, recv1_eq, recv2_eq);
+ }
+ }
+ END_DO_BOX_FAST;
+ }
+ END_SPARP_FOREACH_GP_EQUIV;
+ return 0;
+}
+
+
+int
sparp_gp_trav_cu_out_triples_2 (sparp_t *sparp, SPART *curr, sparp_trav_state_t *sts_this, void *common_env)
{
if (SPAR_GP == SPART_TYPE(curr))
@@ -655,7 +694,7 @@ sparp_gp_trav_cu_in_retvals (sparp_t *sparp, SPART *curr, sparp_trav_state_t *st
curr->_.var.tabid = NULL;
eq = sparp_equiv_get (sparp, top_gp, curr, SPARP_EQUIV_INS_CLASS | SPARP_EQUIV_INS_VARIABLE | SPARP_EQUIV_ADD_CONST_READ);
curr->_.var.equiv_idx = eq->e_own_idx;
- curr->_.var.rvr.rvrRestrictions |= SPART_VARR_EXPORTED | (curr->_.var.rvr.rvrRestrictions & (SPART_VARR_GLOBAL | SPART_VARR_EXTERNAL));
+ curr->_.var.rvr.rvrRestrictions |= SPART_VARR_EXPORTED /* This is redundand: if these bits are set, why set them again: | (curr->_.var.rvr.rvrRestrictions & (SPART_VARR_GLOBAL | SPART_VARR_EXTERNAL))*/ ;
sparp_equiv_tighten (sparp, eq, &(curr->_.var.rvr), ~0);
return 0;
}
@@ -727,6 +766,7 @@ sparp_rotate_comparisons_by_rank (SPART *filt)
{
switch (SPART_TYPE (filt))
{
+ case SPAR_BOP_EQ: /* no break */
case BOP_EQ:
case BOP_NEQ:
case BOP_LT:
@@ -753,7 +793,7 @@ sparp_rotate_comparisons_by_rank (SPART *filt)
break;
}
case SPAR_BUILT_IN_CALL:
- if (SAMETERM_L == filt->_.builtin.btype)
+ if (SPAR_BIF_SAMETERM == filt->_.builtin.btype)
{
SPART *l = filt->_.builtin.args[0];
SPART *r = filt->_.builtin.args[1];
@@ -775,7 +815,7 @@ typedef struct so_BOP_OR_filter_ctx_s
{
sparp_t *bofc_sparp; /*!< parser/compiler context, to not pass an extra argument */
SPART *bofc_var_sample; /*!< Common optimizable variable in question */
- dk_set_t bofc_strings; /*!< Collected string values, they may be convert into sprintf format strings to tighten equiv of the common variable */
+ dk_set_t bofc_strings; /*!< Collected string values, they may be convert into sprintf format strings to tighten equiv of the common variable */
ptrlong bofc_not_optimizable; /*!< Teh filter is of complicated form or the variable is not common or global */
ptrlong bofc_can_be_iri; /*!< Flag if there's at least equality to a IRI */
ptrlong bofc_can_be_string; /*!< Flag if there's at least equality to a literal string */
@@ -817,7 +857,7 @@ sparp_optimize_BOP_OR_filter_walk_rexpn (SPART *rexpn, so_BOP_OR_filter_ctx_t *c
else
{
ctx->bofc_can_be_string++;
- dk_set_push (&(ctx->bofc_strings), lit_val);
+ dk_set_push (&(ctx->bofc_strings), lit_val);
}
return 0;
/* !!! TBD support for constant expressions here */
@@ -870,7 +910,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 spartlist (sparp, 3, SPAR_BUILT_IN_CALL, IN_L, res_IN_args);
+ return sparp_make_builtin_call (sparp, IN_L, res_IN_args);
}
SPART *
@@ -927,10 +967,10 @@ sparp_optimize_BOP_OR_filter_walk (SPART *filt, so_BOP_OR_filter_ctx_t *ctx)
}
return filt;
}
- if (SAMETERM_L != filt->_.builtin.btype)
+ if (SPAR_BIF_SAMETERM != filt->_.builtin.btype)
goto cannot_optimize; /* see below */
/* no break, try get optimization hints like it is BOP_EQ */
- case BOP_EQ: /* No break */
+ case BOP_EQ: /* No case for SPAR_BOP_EQ ! */
sparp_rotate_comparisons_by_rank (filt);
if (sparp_optimize_BOP_OR_filter_walk_lvar (filt->_.bin_exp.left, ctx))
goto cannot_optimize; /* see below */
@@ -972,10 +1012,10 @@ sparp_optimize_BOP_OR_filter (sparp_t *sparp, SPART *curr, SPART *filt)
if (0 == ctx.bofc_can_be_nonstringlit)
{
new_rvr.rvrRestrictions |= SPART_VARR_SPRINTFF;
- new_rvr.rvrSprintffCount = dk_set_length (ctx.bofc_strings);
- new_rvr.rvrSprintffs = (ccaddr_t *)t_alloc_box (new_rvr.rvrSprintffCount * sizeof(caddr_t), DV_ARRAY_OF_POINTER);
- for (sff_ctr = new_rvr.rvrSprintffCount; sff_ctr--; /* no step */)
- new_rvr.rvrSprintffs[sff_ctr] = sprintff_from_strg (dk_set_pop (&(ctx.bofc_strings)), 1);
+ new_rvr.rvrSprintffCount = dk_set_length (ctx.bofc_strings);
+ new_rvr.rvrSprintffs = (ccaddr_t *)t_alloc_box (new_rvr.rvrSprintffCount * sizeof(caddr_t), DV_ARRAY_OF_POINTER);
+ for (sff_ctr = new_rvr.rvrSprintffCount; sff_ctr--; /* no step */)
+ new_rvr.rvrSprintffs[sff_ctr] = sprintff_from_strg (dk_set_pop (&(ctx.bofc_strings)), 1);
}
else
{
@@ -1011,7 +1051,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 |= (tree_restr_bits & (
+ eq_l->e_rvr.rvrRestrictions |= SPART_VARR_NOT_NULL | (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 ) );
@@ -1048,8 +1088,14 @@ spar_var_eq_to_equiv (sparp_t *sparp, SPART *curr, sparp_equiv_t *eq_l, SPART *r
{
switch (r->_.builtin.btype)
{
- case STR_L: eq_l->e_rvr.rvrRestrictions |= SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL; break;
+ case SPAR_BIF_STR: 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;
}
@@ -1057,7 +1103,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;
+ return flags | SPART_VARR_NOT_NULL;
}
/* For an != in group \c curr between member of \c eq_l and expression \c r,
@@ -1117,7 +1163,7 @@ sparp_filter_to_equiv (sparp_t *sparp, SPART *curr, SPART *filt)
/* Now filters can be processed */
switch (SPART_TYPE (filt))
{
- case BOP_EQ:
+ case BOP_EQ: /* No case for SPAR_BOP_EQ ! Indeed, this is the main reason for introducing SPAR_BOP_EQ at all */
{
SPART *l = filt->_.bin_exp.left;
SPART *r = filt->_.bin_exp.right;
@@ -1149,7 +1195,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) ||
@@ -1160,7 +1206,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;
@@ -1182,7 +1228,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)) && (STR_L == r->_.builtin.btype))
+ if ((NULL != str_lval) && (SPAR_BUILT_IN_CALL == SPART_TYPE (r)) && (SPAR_BIF_STR == r->_.builtin.btype))
{
SPART *rarg1 = r->_.builtin.args[0];
if (SPAR_IS_BLANK_OR_VAR (rarg1))
@@ -1242,58 +1288,49 @@ 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 isIRI_L:
- case isURI_L:
+ case SPAR_BIF_ISIRI:
+ case SPAR_BIF_ISURI:
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 isBLANK_L:
+ case SPAR_BIF_ISBLANK:
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 isREF_L:
+ case SPAR_BIF_ISREF:
flags = SPART_VARR_IS_REF | SPART_VARR_NOT_NULL;
arg1_eq->e_rvr.rvrRestrictions |= flags;
arg1_eq->e_replaces_filter |= flags;
return 1;
- case isLITERAL_L:
+ case SPAR_BIF_ISLITERAL:
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 SAMETERM_L:
+ case SPAR_BIF_SAMETERM:
{
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;
}
@@ -1329,11 +1366,11 @@ select * where { graph <g1> { ?s1 ?p1 ?o1 . filter (?o1 = <const>) } optional {
sparp_gp_detach_filter (sparp, curr, fctr, NULL);
else
curr->_.gp.filters[fctr] = new_filt;
- continue;
+ continue;
}
ret = sparp_filter_to_equiv (sparp, curr, filt);
if (0 != ret)
- sparp_gp_detach_filter (sparp, curr, fctr, NULL);
+ sparp_gp_detach_filter (sparp, curr, fctr, NULL);
}
return 0;
}
@@ -1395,7 +1432,7 @@ sparp_create_eqs_for_dupe_locals (sparp_t *sparp, SPART *curr, dk_set_t *local_v
dk_set_t vars_to_propagate = NULL;
while (NULL != local_vars[0])
{
- var_name = dk_set_pop (local_vars);
+ var_name = (caddr_t)dk_set_pop (local_vars);
if (-1 != dk_set_position_of_string (local_vars[0], var_name))
{
sparp_equiv_get (sparp, curr, (SPART *)var_name, SPARP_EQUIV_INS_CLASS | SPARP_EQUIV_GET_NAMESAKES);
@@ -1499,7 +1536,7 @@ sparp_gp_add_chain_aliases (sparp_t *sparp, SPART *inner_var, sparp_equiv_t *inn
for (;;)
{
sparp_equiv_t *parent_eq;
- SPART *parent_gp = sts_iter[-1].sts_env;
+ SPART *parent_gp = (SPART *)(sts_iter[-1].sts_env);
if (NULL == parent_gp)
break;
parent_eq = sparp_equiv_get (sparp, parent_gp, inner_var, SPARP_EQUIV_GET_NAMESAKES | SPARP_EQUIV_INS_CLASS);
@@ -1577,7 +1614,7 @@ sparp_gp_trav_make_common_aliases_gp_in (sparp_t *sparp, SPART *curr, sparp_trav
{
for (outer_gp_sts = sparp->sparp_stss+1; outer_gp_sts < sts_this; outer_gp_sts++)
{
- SPART *outer_gp = outer_gp_sts->sts_env;
+ SPART *outer_gp = (SPART *)(outer_gp_sts->sts_env);
sparp_equiv_t *topmost_eq = sparp_equiv_get (sparp, outer_gp, (SPART *)vname, SPARP_EQUIV_GET_NAMESAKES);
if (NULL != topmost_eq)
{
@@ -1636,7 +1673,6 @@ sparp_gp_trav_remove_unused_aliases (sparp_t *sparp, SPART *curr, sparp_trav_sta
return SPAR_GPT_ENV_PUSH;
}
-
void
sparp_make_aliases (sparp_t *sparp)
{
@@ -1649,7 +1685,7 @@ sparp_make_aliases (sparp_t *sparp)
NULL, NULL, NULL,
NULL );
sparp_gp_trav (sparp, top_pattern, NULL,
- sparp_gp_trav_make_common_aliases_gp_in, sparp_gp_trav_cu_out_triples_1,
+ sparp_gp_trav_make_common_aliases_gp_in, sparp_gp_trav_cu_out_triples_1_merge_recvs,
NULL, NULL, sparp_gp_trav_make_aliases_expn_subq,
NULL );
sparp_gp_trav (sparp, top_pattern, NULL,
@@ -1665,6 +1701,7 @@ sparp_make_aliases (sparp_t *sparp)
sparp_equiv_t *
sparp_find_external_namesake_eq_of_varname (sparp_t *sparp, caddr_t varname, dk_set_t parent_gps)
{
+#if 0 /* code for old draft of SPARQL 1.1 */
if (NULL != sparp->sparp_env->spare_bindings_vars)
{
int ctr;
@@ -1676,6 +1713,7 @@ sparp_find_external_namesake_eq_of_varname (sparp_t *sparp, caddr_t varname, dk_
}
END_DO_BOX_FAST_REV;
}
+#endif
DO_SET (SPART *, parent, &parent_gps)
{
sparp_equiv_t *parent_eq = sparp_equiv_get (sparp, parent, (SPART *)varname, SPARP_EQUIV_GET_NAMESAKES);
@@ -1701,19 +1739,26 @@ int
sparp_gp_trav_label_external_vars_gp_in (sparp_t *sparp, SPART *curr, sparp_trav_state_t *sts_this, void *common_env)
{
int eqctr;
- dk_set_t parent_gps = (dk_set_t)common_env;
+ sparp_label_external_vars_env_t *sleve;
if (SPAR_GP != SPART_TYPE (curr))
return 0;
- if (SELECT_L == curr->_.gp.subtype)
- return SPAR_GPT_NODOWN;
- if ((NULL == parent_gps) && (NULL == sparp->sparp_env->spare_bindings_vars))
+ sleve = (sparp_label_external_vars_env_t *)common_env;
+ if ((NULL == sleve->parent_gps_for_table_subq) /* && (NULL == sparp->sparp_env->spare_bindings_vars) --- code for old draft of SPARQL 1.1 */)
return SPAR_GPT_ENV_PUSH;
+ if (SELECT_L == curr->_.gp.subtype)
+ {
+ sparp_t *sub_sparp = sparp_down_to_sub (sparp, curr);
+ sparp_label_external_vars_env_t tmp_sleve;
+ tmp_sleve.parent_gps_for_var_search = tmp_sleve.parent_gps_for_table_subq = sleve->parent_gps_for_table_subq;
+ sparp_label_external_vars (sub_sparp, &tmp_sleve);
+ sparp_up_from_sub (sparp, curr, sub_sparp);
+ }
SPARP_FOREACH_GP_EQUIV (sparp, curr, eqctr, eq)
{
int varnamectr;
DO_BOX_FAST_REV (caddr_t, varname, varnamectr, eq->e_varnames)
{
- sparp_equiv_t *external_namesake_eq = sparp_find_external_namesake_eq_of_varname (sparp, varname, parent_gps);
+ sparp_equiv_t *external_namesake_eq = sparp_find_external_namesake_eq_of_varname (sparp, varname, sleve->parent_gps_for_var_search);
if (NULL == external_namesake_eq)
continue;
eq->e_external_src_idx = external_namesake_eq->e_own_idx;
@@ -1726,13 +1771,15 @@ sparp_gp_trav_label_external_vars_gp_in (sparp_t *sparp, SPART *curr, sparp_trav
return SPAR_GPT_ENV_PUSH;
}
+/* This makes same labeling as \c sparp_gp_trav_label_external_vars_gp_in() but should be used for retvals.
+Note that it label retval vals whereas sparp_gp_trav_label_external_vars_gp_in() does not. */
int
sparp_gp_trav_label_external_vars_expn_in (sparp_t *sparp, SPART *curr, sparp_trav_state_t *sts_this, void *common_env)
{
if (SPAR_IS_BLANK_OR_VAR (curr))
{
- dk_set_t parent_gps = (dk_set_t)common_env;
- sparp_equiv_t *external_namesake_eq = sparp_find_external_namesake_eq_of_varname (sparp, curr->_.var.vname, parent_gps->next);
+ sparp_label_external_vars_env_t *sleve = (sparp_label_external_vars_env_t *)common_env;
+ sparp_equiv_t *external_namesake_eq = sparp_find_external_namesake_eq_of_varname (sparp, curr->_.var.vname, sleve->parent_gps_for_var_search);
if (NULL != external_namesake_eq)
{
sparp_equiv_t *eq = SPARP_EQUIV (sparp, curr->_.var.equiv_idx);
@@ -1747,37 +1794,38 @@ sparp_gp_trav_label_external_vars_expn_in (sparp_t *sparp, SPART *curr, sparp_tr
int
sparp_gp_trav_label_external_vars_expn_subq (sparp_t *sparp, SPART *curr, sparp_trav_state_t *sts_this, void *common_env)
{
- dk_set_t parent_gps = (dk_set_t)common_env;
+ sparp_label_external_vars_env_t *sleve = (sparp_label_external_vars_env_t *)common_env;
SPART *anc_gp = sts_this->sts_ancestor_gp;
sparp_t *sub_sparp = sparp_down_to_sub (sparp, curr);
- if ((NULL != anc_gp) || (NULL != sparp->sparp_env->spare_bindings_vars))
- {
- s_node_t tmp_env;
- tmp_env.data = anc_gp;
- tmp_env.next = parent_gps;
- sparp_label_external_vars (sub_sparp, &tmp_env);
- }
- sparp_label_external_vars (sub_sparp, parent_gps);
+ s_node_t tmp_stack;
+ sparp_label_external_vars_env_t tmp_sleve;
+ tmp_stack.data = anc_gp;
+ tmp_stack.next = sleve->parent_gps_for_var_search;
+ tmp_sleve.parent_gps_for_var_search = tmp_sleve.parent_gps_for_table_subq = &tmp_stack;
+ sparp_label_external_vars (sub_sparp, &tmp_sleve);
sparp_up_from_sub (sparp, curr, sub_sparp);
return 0;
}
void
-sparp_label_external_vars (sparp_t *sparp, dk_set_t parent_gps)
+sparp_label_external_vars (sparp_t *sparp, sparp_label_external_vars_env_t *sleve)
{
SPART *top = sparp->sparp_expr;
SPART *top_pattern = top->_.req_top.pattern;
- s_node_t tmp_env;
- tmp_env.data = top_pattern;
- tmp_env.next = parent_gps;
- sparp_trav_out_clauses (sparp, top, &tmp_env,
+ sparp_label_external_vars_env_t tmp_sleve;
+ if (NULL == sleve)
+ {
+ tmp_sleve.parent_gps_for_var_search = tmp_sleve.parent_gps_for_table_subq = NULL;
+ sleve = &tmp_sleve;
+ }
+ sparp_trav_out_clauses (sparp, top, sleve,
NULL, NULL,
- (((NULL != parent_gps) || (NULL != sparp->sparp_env->spare_bindings_vars)) ?
+ (((NULL != sleve->parent_gps_for_var_search) /*|| (NULL != sparp->sparp_env->spare_bindings_vars) --- code for old draft of SPARQL 1.1 */) ?
sparp_gp_trav_label_external_vars_expn_in : NULL ),
NULL,
sparp_gp_trav_label_external_vars_expn_subq,
NULL );
- sparp_gp_trav (sparp, top_pattern, parent_gps,
+ sparp_gp_trav (sparp, top_pattern, sleve,
sparp_gp_trav_label_external_vars_gp_in, NULL,
NULL, NULL, sparp_gp_trav_label_external_vars_expn_subq,
NULL );
@@ -2207,6 +2255,61 @@ void
sparp_eq_restr_from_connected (sparp_t *sparp)
{
/*sparp_env_t *env = sparp->sparp_env;*/
+ SPART *binv = sparp->sparp_expr->_.req_top.binv;
+ if (NULL != binv)
+ {
+ int varctr, varcount = BOX_ELEMENTS (binv->_.binv.vars);
+ SPART **retlist = sparp->sparp_expr->_.req_top.retvals;
+ for (varctr = varcount; varctr--; /* no step */)
+ {
+ SPART *var, *ret_expn = NULL;
+ int retctr, ret_expn_type;
+ sparp_equiv_t *var_eq;
+ if (binv->_.binv.counters_of_unbound[varctr])
+ continue;
+ var = binv->_.binv.vars[varctr];
+ var_eq = SPARP_EQUIV (sparp, var->_.var.equiv_idx);
+ for (retctr = BOX_ELEMENTS (retlist); retctr--; /* no step */)
+ {
+ SPART *candidate = retlist[retctr];
+ ret_expn_type = SPART_TYPE (candidate);
+ if (SPAR_VARIABLE == ret_expn_type)
+ {
+ if (strcmp (candidate->_.var.vname, var->_.var.vname))
+ continue;
+ ret_expn = candidate;
+ break;
+ }
+ if (SPAR_ALIAS == ret_expn_type)
+ {
+ if (strcmp (candidate->_.alias.aname, var->_.var.vname))
+ continue;
+ ret_expn = candidate->_.alias.arg;
+ ret_expn_type = SPART_TYPE (ret_expn);
+ break;
+ }
+ }
+ if (NULL == ret_expn)
+ {
+ if (sparp->sparp_env->spare_signal_void_variables)
+ spar_error (sparp, "Variable name '%.100s' is used in then BINDINGS clause but not in the query result set", var->_.var.vname);
+ var_eq->e_rvr.rvrRestrictions |= SPART_VARR_CONFLICT;
+ }
+ else
+ {
+ sparp_equiv_tighten (sparp, var_eq, &(var->_.var.rvr), ~0);
+ if (SPAR_VARIABLE == ret_expn_type)
+ {
+ sparp_equiv_t *ret_orig_eq = SPARP_EQUIV (sparp, ret_expn->_.var.equiv_idx);
+ sparp_equiv_tighten (sparp, var_eq, &(ret_orig_eq->e_rvr), ~(SPART_VARR_GLOBAL | SPART_VARR_EXTERNAL));
+ if (!(sparp_req_top_has_limofs (sparp->sparp_expr) && (NULL != sparp->sparp_expr->_.req_top.order)))
+ sparp_equiv_tighten (sparp, ret_orig_eq, &(var_eq->e_rvr), ~0);
+ }
+ }
+ }
+ spar_shorten_binv_dataset (sparp, binv);
+ spar_refresh_binv_var_rvrs (sparp, binv);
+ }
sparp_gp_trav (sparp, sparp->sparp_expr->_.req_top.pattern, NULL,
NULL, sparp_gp_trav_eq_restr_from_connected_subvalues_gp_out,
NULL, NULL, sparp_gp_trav_eq_restr_from_connected_subvalues_expn_subq,
@@ -2240,7 +2343,7 @@ sparp_gp_trav_eq_restr_to_vars_gp_in (sparp_t *sparp, SPART *curr, sparp_trav_st
if ((SPAR_VARIABLE != SPART_TYPE(var)) && (SPAR_BLANK_NODE_LABEL != SPART_TYPE(var)))
spar_internal_error (sparp, "Not a variable in equiv in sparp_gp_trav_eq_restr_to_vars()");
#endif
- sparp_rvr_tighten (sparp, &(var->_.var.rvr), &(eq->e_rvr), ~0);
+ sparp_rvr_tighten (sparp, &(var->_.var.rvr), &(eq->e_rvr), ~0 /* not (SPART_VARR_EXTERNAL | SPART_VARR_GLOBAL)*/);
var->_.var.equiv_idx = eq->e_own_idx;
}
} END_SPARP_FOREACH_GP_EQUIV;
@@ -2444,11 +2547,19 @@ sparp_equiv_audit_all (sparp_t *sparp, int flags)
continue;
if (eq->e_own_idx != eq_ctr)
spar_audit_error (sparp, "sparp_" "equiv_audot_all(): wrong own index, eq #%d for %s has e_own_idx %d", eq_ctr, eq->e_varnames[0], eq->e_own_idx);
- if (eq->e_nested_bindings != BOX_ELEMENTS_0 (eq->e_subvalue_idxs))
+ for (var_ctr = eq->e_var_count; var_ctr--; /*no step*/)
+ {
+ SPART *var = eq->e_vars [var_ctr];
+ if (var->_.var.equiv_idx != eq_ctr)
+ spar_audit_error (sparp, "sparp_" "equiv_audit_all(): var->_.var.equiv_idx != eq_ctr: eq #%d for %s, gp %s, var %s/%s/%s with equiv_idx %d", eq_ctr, eq->e_varnames[0], var->_.var.selid, var->_.var.tabid, var->_.var.vname, var->_.var.equiv_idx);
+ }
+ gp = eq->e_gp;
+ if (SPAR_GP != gp->type)
+ continue;
+ /*if (eq->e_nested_bindings != BOX_ELEMENTS_0 (eq->e_subvalue_idxs))
printf ("sparp_" "equiv_audit_all(): warning: strange: equiv %d (?%s): e_nested_bindings = %d, %d subvalues in list, e_optional_reads = %d\n",
(int)(eq->e_own_idx), eq->e_varnames[0],
- (int)(eq->e_nested_bindings), BOX_ELEMENTS_INT_0 (eq->e_subvalue_idxs), (int)(eq->e_optional_reads) );
- gp = eq->e_gp;
+ (int)(eq->e_nested_bindings), BOX_ELEMENTS_INT_0 (eq->e_subvalue_idxs), (int)(eq->e_optional_reads) );*/
sparp_equiv_audit_gp (sparp, gp, ((SPART_BAD_GP_SUBTYPE == gp->_.gp.subtype) ? 1 : 0), eq);
for (var_ctr = eq->e_var_count; var_ctr--; /*no step*/)
{
@@ -2611,6 +2722,204 @@ sparp_rewrite_basic (sparp_t *sparp)
/* PART 2. GRAPH PATTERN TERM REWRITING */
+void
+spar_invalidate_binv_dataset_row (sparp_t *sparp, SPART *binv, int rowno, int reason_col)
+{
+ int varctr;
+ unsigned mask_byte;
+ if ('/' != binv->_.binv.data_rows_mask[rowno])
+ spar_internal_error (sparp, "double invalidation of a binding");
+ mask_byte = (unsigned)'0' + (unsigned)reason_col;
+ if (0x7f < mask_byte)
+ mask_byte = 0x7f;
+ binv->_.binv.data_rows_mask[rowno] = mask_byte;
+ DO_BOX_FAST (ptrlong, counter_of_unbound, varctr, binv->_.binv.counters_of_unbound)
+ {
+ if (NULL != binv->_.binv.data_rows[rowno][varctr])
+ continue;
+ binv->_.binv.counters_of_unbound[varctr] = counter_of_unbound - 1;
+ }
+ END_DO_BOX_FAST;
+ binv->_.binv.rows_in_use--;
+}
+
+void
+spar_shorten_binv_dataset (sparp_t *sparp, SPART *binv)
+{
+ int varcount, rowcount, varctr, rowctr;
+ int *fmt_use_counters = NULL;
+ int max_sff_count = -1;
+ varcount = BOX_ELEMENTS (binv->_.binv.vars);
+ if (0 == binv->_.binv.rows_in_use)
+ return;
+ varcount = BOX_ELEMENTS (binv->_.binv.vars);
+ rowcount = BOX_ELEMENTS (binv->_.binv.data_rows);
+/* All loops by rows here must be in reverse order. */
+ for (varctr = varcount; varctr--; /* no step */)
+ {
+ SPART *var = binv->_.binv.vars[varctr];
+ sparp_equiv_t *eq = SPARP_EQUIV (sparp, var->_.var.equiv_idx);
+ if (var->_.var.rvr.rvrRestrictions & (SPART_VARR_CONFLICT | SPART_VARR_ALWAYS_NULL))
+ continue;
+ if (eq->e_rvr.rvrRestrictions & (SPART_VARR_CONFLICT | SPART_VARR_ALWAYS_NULL))
+ {
+ for (rowctr = rowcount; rowctr--; /* no step */)
+ {
+ if ('/' != binv->_.binv.data_rows_mask[rowctr])
+ continue;
+ if (NULL == binv->_.binv.data_rows[rowctr][varctr])
+ continue;
+ spar_invalidate_binv_dataset_row (sparp, binv, rowctr, varctr);
+ }
+ continue;
+ }
+ if ((eq->e_rvr.rvrRestrictions & SPART_VARR_SPRINTFF) && (eq->e_rvr.rvrSprintffCount > max_sff_count))
+ max_sff_count = eq->e_rvr.rvrSprintffCount;
+ }
+ if (0 <= max_sff_count)
+ fmt_use_counters = (int *)t_alloc (max_sff_count * sizeof (int));
+ for (varctr = varcount; varctr--; /* no step */)
+ {
+ SPART *var = binv->_.binv.vars[varctr];
+ sparp_equiv_t *eq = SPARP_EQUIV (sparp, var->_.var.equiv_idx);
+ int eq_has_sffs_bit = (eq->e_rvr.rvrRestrictions & SPART_VARR_SPRINTFF);
+ int eq_sff_count = eq->e_rvr.rvrSprintffCount;
+ if (!rvr_can_be_tightned (sparp, &(var->_.var.rvr), &(eq->e_rvr), 1))
+ continue;
+ if (eq->e_rvr.rvrSprintffCount)
+ memset (fmt_use_counters, 0, eq->e_rvr.rvrSprintffCount * sizeof (int));
+ for (rowctr = rowcount; rowctr--; /* no step */)
+ {
+ SPART *datum;
+ rdf_val_range_t tmp;
+ if ('/' != binv->_.binv.data_rows_mask[rowctr])
+ continue;
+ datum = binv->_.binv.data_rows[rowctr][varctr];
+ if (NULL == datum)
+ continue;
+ sparp_rvr_set_by_constant (sparp, &tmp, NULL, datum);
+ eq->e_rvr.rvrRestrictions &= ~SPART_VARR_SPRINTFF;
+ eq->e_rvr.rvrSprintffCount = 0;
+ sparp_rvr_tighten (sparp, &tmp, &(eq->e_rvr), ~0);
+ eq->e_rvr.rvrRestrictions |= eq_has_sffs_bit;
+ eq->e_rvr.rvrSprintffCount = eq_sff_count;
+ if (tmp.rvrRestrictions & SPART_VARR_CONFLICT)
+ {
+ spar_invalidate_binv_dataset_row (sparp, binv, rowctr, varctr);
+ continue;
+ }
+ if (eq_has_sffs_bit)
+ {
+ int sff_ctr;
+ int hit = 0;
+ caddr_t datum_val = SPAR_LIT_OR_QNAME_VAL (datum);
+ dtp_t datum_val_dtp = DV_TYPE_OF (datum_val);
+ if ((DV_STRING == datum_val_dtp) || (DV_UNAME == datum_val_dtp))
+ {
+ for (sff_ctr = eq->e_rvr.rvrSprintffCount; sff_ctr--; /* no step */)
+ {
+ if (!sprintff_like (datum_val, eq->e_rvr.rvrSprintffs[sff_ctr]))
+ continue;
+ fmt_use_counters[sff_ctr] += 1;
+ hit = 1;
+ }
+ }
+ if (!hit)
+ {
+ spar_invalidate_binv_dataset_row (sparp, binv, rowctr, varctr);
+ continue;
+ }
+ }
+ }
+ if (eq_has_sffs_bit && (0 == binv->_.binv.counters_of_unbound[varctr]))
+ {
+ int sff_ctr;
+ for (sff_ctr = eq->e_rvr.rvrSprintffCount; sff_ctr--; /* no step */)
+ {
+ if (0 != fmt_use_counters[sff_ctr])
+ continue;
+ if (sff_ctr < (eq->e_rvr.rvrSprintffCount-1))
+ eq->e_rvr.rvrSprintffs [sff_ctr] = eq->e_rvr.rvrSprintffs [eq->e_rvr.rvrSprintffCount-1];
+ eq->e_rvr.rvrSprintffCount -= 1;
+ }
+ if (0 == eq->e_rvr.rvrSprintffCount)
+ eq->e_rvr.rvrRestrictions |= SPART_VARR_CONFLICT;
+ if (eq->e_rvr.rvrSprintffCount != var->_.var.rvr.rvrSprintffCount)
+ {
+ sparp_rvr_tighten (sparp, &(var->_.var.rvr), &(eq->e_rvr), ~0);
+ var->_.var.rvr.rvrSprintffCount = eq->e_rvr.rvrSprintffCount;
+ var->_.var.rvr.rvrSprintffs = (ccaddr_t *)t_box_copy ((caddr_t)(eq->e_rvr.rvrSprintffs));
+ }
+ }
+ }
+}
+
+void
+spar_refresh_binv_var_rvrs (sparp_t *sparp, SPART *binv)
+{
+ int varcount, rowcount, varctr, rowctr;
+ if (binv->_.binv.rows_in_use == binv->_.binv.rows_last_rvr)
+ return;
+ binv->_.binv.rows_last_rvr = binv->_.binv.rows_in_use;
+ varcount = BOX_ELEMENTS (binv->_.binv.vars);
+ if (0 == binv->_.binv.rows_in_use)
+ {
+ for (varctr = varcount; varctr--; /* no step */)
+ binv->_.binv.vars[varctr]->_.var.rvr.rvrRestrictions |= SPART_VARR_CONFLICT;
+ return;
+ }
+ rowcount = BOX_ELEMENTS (binv->_.binv.data_rows);
+ if (1 == binv->_.binv.rows_in_use)
+ {
+ rowctr = strchr (binv->_.binv.data_rows_mask, '/') - binv->_.binv.data_rows_mask;
+ if (0 > rowctr)
+ spar_internal_error (sparp, "No used rows but nonzero counter of them");
+ for (varctr = varcount; varctr--; /* no step */)
+ {
+ SPART *var;
+ SPART *datum;
+ if (binv->_.binv.counters_of_unbound[varctr])
+ continue;
+ var = binv->_.binv.vars[varctr];
+ datum = binv->_.binv.data_rows[rowctr][varctr];
+ sparp_rvr_set_by_constant (sparp, &(var->_.var.rvr), NULL, datum);
+ }
+ return;
+ }
+ for (varctr = varcount; varctr--; /* no step */)
+ {
+ SPART *var;
+ int restr_set = SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_IS_BLANK | SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL;
+ if (binv->_.binv.counters_of_unbound[varctr])
+ continue;
+ var = binv->_.binv.vars[varctr];
+ for (rowctr = rowcount; rowctr--; /* no step */)
+ {
+ SPART *datum;
+ if ('/' != binv->_.binv.data_rows_mask[rowctr])
+ continue;
+ datum = binv->_.binv.data_rows[rowctr][varctr];
+ if (NULL == datum)
+ spar_internal_error (sparp, "NULL datum in BINDINGS col without expected unbounds");
+ switch (SPART_TYPE (datum))
+ {
+ case SPAR_QNAME:
+ restr_set &= ~SPART_VARR_IS_LIT;
+ /* 0123456789 */
+ if (!strncmp (datum->_.qname.val, "nodeID://", 9))
+ restr_set &= ~SPART_VARR_IS_IRI;
+ else
+ restr_set &= ~SPART_VARR_IS_BLANK;
+ break;
+ case SPAR_LIT:
+ restr_set &= ~(SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_IS_BLANK);
+ break;
+ }
+ }
+ var->_.var.rvr.rvrRestrictions |= restr_set;
+ }
+}
+
int
sparp_check_field_mapping_of_cvalue (sparp_t *sparp, SPART *cvalue, rdf_val_range_t *qmv_or_fmt_rvr, rdf_val_range_t *rvr)
{
@@ -2652,6 +2961,8 @@ 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;
@@ -2662,7 +2973,10 @@ sparp_check_mapping_of_sources (sparp_t *sparp, tc_context_t *tcc,
}
if (tcc->tcc_source_invalidation_masks[source_ctr])
continue;
- chk_res = sparp_check_field_mapping_of_cvalue (sparp, (SPART *)(source->_.graph.iri), qmv_or_fmt_rvr, rvr);
+ 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);
if (SSG_QM_NO_MATCH != chk_res)
{
if (chk_res < min_match)
@@ -3303,7 +3617,7 @@ sparp_refresh_triple_cases (sparp_t *sparp, SPART *triple)
sparp_jso_validate_format (sparp, field_valmode);
triple->_.triple.native_formats[field_ctr] = field_valmode;
if (SPAR_IS_BLANK_OR_VAR (field_expn))
- sparp_rvr_tighten (sparp, &(field_expn->_.var.rvr), &acc_rvr, ~0);
+ sparp_rvr_tighten (sparp, &(field_expn->_.var.rvr), &acc_rvr, ~(SPART_VARR_EXTERNAL | SPART_VARR_GLOBAL));
}
triple->_.triple.tc_list = new_cases;
}
@@ -3567,10 +3881,10 @@ sparp_set_options_selid_and_tabid (sparp_t *sparp, SPART **options, caddr_t new_
sparp_equiv_t *eq = SPARP_EQUIV (sparp, opt_expn->_.var.equiv_idx);
sparp_equiv_remove_var (sparp, eq, opt_expn);
}
- opt_expn->_.var.selid = t_box_copy (new_selid);
+ opt_expn->_.var.selid = /*t_box_copy*/ (new_selid);
}
if (NULL != opt_expn->_.var.tabid)
- opt_expn->_.var.tabid = t_box_copy (new_tabid);
+ opt_expn->_.var.tabid = /*t_box_copy*/ (new_tabid);
}
END_DO_BOX_FAST_REV;
}
@@ -3595,14 +3909,14 @@ sparp_set_triple_selid_and_tabid (sparp_t *sparp, SPART *triple, caddr_t new_sel
sparp_equiv_t *eq = SPARP_EQUIV (sparp, fld_expn->_.var.equiv_idx);
sparp_equiv_remove_var (sparp, eq, fld_expn);
}
- fld_expn->_.var.selid = t_box_copy (new_selid);
+ fld_expn->_.var.selid = /*t_box_copy*/ (new_selid);
}
- fld_expn->_.var.tabid = t_box_copy (new_tabid);
+ fld_expn->_.var.tabid = /*t_box_copy*/ (new_tabid);
}
if (NULL != triple->_.triple.options)
sparp_set_options_selid_and_tabid (sparp, triple->_.triple.options, new_selid, new_tabid);
- triple->_.triple.selid = t_box_copy (new_selid);
- triple->_.triple.tabid = t_box_copy (new_tabid);
+ triple->_.triple.selid = /*t_box_copy*/ (new_selid);
+ triple->_.triple.tabid = /*t_box_copy*/ (new_tabid);
}
@@ -3691,7 +4005,7 @@ sparp_expns_are_equal (sparp_t *sparp, SPART *one, SPART *two)
sparp_expn_lists_are_equal (sparp, one->_.funcall.argtrees, two->_.funcall.argtrees) );
case SPAR_GP:
return !strcmp (one->_.gp.selid, two->_.gp.selid); /*!!!TBD: this check is good enough for TPC-D Q16. Do we need more accurate check? */
- case BOP_EQ: case BOP_NEQ:
+ case BOP_EQ: case SPAR_BOP_EQ: case BOP_NEQ:
case BOP_AND: case BOP_OR:
case BOP_SAME: case BOP_NSAME:
return (
@@ -3804,7 +4118,7 @@ sparp_make_qm_cases (sparp_t *sparp, SPART *triple, SPART *parent_gp)
triple_case_t **one_tc = (triple_case_t **)t_list (1, tc);
mp_box_tag_modify (one_tc, DV_ARRAY_OF_LONG);
qm_case_triple->_.triple.tc_list = one_tc;
- qm_case_triple->_.triple.selid = t_box_copy (qm_selid);
+ qm_case_triple->_.triple.selid = /*t_box_copy*/ (qm_selid);
qm_case_triple->_.triple.tabid = qm_tabid;
for (field_ctr = SPART_TRIPLE_FIELDS_COUNT; field_ctr--; /*no step*/)
{
@@ -3818,9 +4132,9 @@ sparp_make_qm_cases (sparp_t *sparp, SPART *triple, SPART *parent_gp)
{
sparp_equiv_t *eq;
new_fld_expn = (SPART *)t_box_copy ((caddr_t)fld_expn);
- new_fld_expn->_.var.selid = t_box_copy (qm_selid);
- new_fld_expn->_.var.tabid = t_box_copy (qm_tabid);
- new_fld_expn->_.var.vname = t_box_copy (fld_expn->_.var.vname);
+ new_fld_expn->_.var.selid = /*t_box_copy*/ (qm_selid);
+ new_fld_expn->_.var.tabid = /*t_box_copy*/ (qm_tabid);
+ new_fld_expn->_.var.vname = /*t_box_copy*/ (fld_expn->_.var.vname);
new_fld_expn->_.var.equiv_idx = SPART_BAD_EQUIV_IDX;
sparp_rvr_copy (sparp, &(new_fld_expn->_.var.rvr), &(fld_expn->_.var.rvr));
eq = sparp_equiv_get (sparp, qm_case_gp, new_fld_expn, SPARP_EQUIV_INS_CLASS | SPARP_EQUIV_INS_VARIABLE | SPARP_EQUIV_ADD_GSPO_USE);
@@ -3834,7 +4148,7 @@ sparp_make_qm_cases (sparp_t *sparp, SPART *triple, SPART *parent_gp)
}
if (NULL != fld_tc_cuts)
sparp_rvr_add_red_cuts (sparp, &(eq->e_rvr), fld_tc_cuts, BOX_ELEMENTS (fld_tc_cuts));
- sparp_rvr_tighten (sparp, (&new_fld_expn->_.var.rvr), &(eq->e_rvr), ~0);
+ sparp_rvr_tighten (sparp, (&new_fld_expn->_.var.rvr), &(eq->e_rvr), ~0 /* not (SPART_VARR_EXTERNAL | SPART_VARR_GLOBAL)*/);
}
else
new_fld_expn = sparp_tree_full_copy (sparp, fld_expn, NULL);
@@ -3843,8 +4157,11 @@ sparp_make_qm_cases (sparp_t *sparp, SPART *triple, SPART *parent_gp)
sparp_jso_validate_format (sparp, native_fmt);
qm_case_triple->_.triple.native_formats[field_ctr] = native_fmt;
}
- if (NULL != qm_case_triple->_.triple.options)
- sparp_set_options_selid_and_tabid (sparp, qm_case_triple->_.triple.options, qm_selid, qm_tabid);
+ if (NULL != triple->_.triple.options)
+ {
+ qm_case_triple->_.triple.options = sparp_treelist_full_copy (sparp, triple->_.triple.options, parent_gp);
+ sparp_set_options_selid_and_tabid (sparp, qm_case_triple->_.triple.options, qm_selid, qm_tabid);
+ }
sparp_gp_attach_member (sparp, qm_case_gp, qm_case_triple, 0, NULL);
if (NULL != ft_cond_to_relocate)
sparp_gp_attach_filter (sparp, qm_case_gp, sparp_tree_full_copy (sparp, ft_cond_to_relocate, parent_gp), 0, NULL);
@@ -5323,12 +5640,14 @@ 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_grab.rgc_pview_mode) && (NULL == sparp->sparp_parent_sparp))
+ if ((sparp->sparp_env->spare_src.ssrc_grab.rgc_pview_mode) && (NULL == sparp->sparp_parent_sparp))
{
sparp_rewrite_grab (sparp);
return;
@@ -5409,6 +5728,19 @@ sparp_gp_trav_add_graph_perm_read_filters (sparp_t *sparp, SPART *curr, sparp_tr
return 0;
if (SELECT_L == curr->_.gp.subtype)
return 0;
+ if (sparp->sparp_query_uses_sinvs)
+ { /* Bug 14737 fix: No permission filters should be placed inside service invocations */
+ int sts_idx;
+ if (sparp->sparp_env->spare_storage_name == uname_virtrdf_ns_uri_DefaultServiceStorage)
+ return 0;
+ if (NULL != sparp_get_option (sparp, curr->_.gp.options, SPAR_SERVICE_INV))
+ return 0;
+ for (sts_idx = 0; NULL != sts_this[sts_idx].sts_ancestor_gp; sts_idx++)
+ {
+ if (NULL != sparp_get_option (sparp, sts_this[sts_idx].sts_ancestor_gp->_.gp.options, SPAR_SERVICE_INV))
+ return 0;
+ }
+ }
membcount = BOX_ELEMENTS_0 (curr->_.gp.members);
for (membctr = 0; membctr < membcount; membctr++)
{
@@ -5611,7 +5943,6 @@ 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,
@@ -5642,14 +5973,30 @@ sparp_rewrite_qm_optloop (sparp_t *sparp, int opt_ctr)
GPF_T1 ("sparp_" "rewrite_qm_optloop () for SQL_FUNCALL");
if (SPARP_MULTIPLE_OPTLOOPS == opt_ctr)
{
- int opt_ctr = 0;
- while (sparp_rewrite_qm_optloop (sparp, opt_ctr))
+ SPART *binv = sparp->sparp_expr->_.req_top.binv;
+ int old_bindings_len = ((NULL != binv) ? BOX_ELEMENTS (binv->_.binv.data_rows) : -1);
+ int optimization_loop_ctr = 0;
+ int optimization_loop_count = 10 + ((NULL != binv) ? 2 * BOX_ELEMENTS (binv->_.binv.vars) : 0);
+ while (sparp_rewrite_qm_optloop (sparp, optimization_loop_ctr))
{
- if (opt_ctr++ < 10)
+ if (0 < old_bindings_len)
+ { /* Shortening BINDINGS table can be arbitrarily long but it can't be infinite so optimization_loop_ctr is left intact */
+ int new_bindings_len = BOX_ELEMENTS (binv->_.binv.data_rows);
+ if (new_bindings_len < old_bindings_len)
+ {
+ old_bindings_len = new_bindings_len;
+ continue;
+ }
+ }
+ if (++optimization_loop_ctr < optimization_loop_count)
continue;
- spar_internal_error (sparp, "SPARQL optimizer performed 10 rounds of query rewriting, this looks like endless loop. Please rephrase the query.");
+#if 0
+ spar_internal_error (sparp, "SPARQL optimizer performed too many rounds of query rewriting, this looks like endless loop. Please rephrase the query.");
+#else
+ break; /* Now our public endpoints are protected with timeouts, we can try SQL garbage */
+#endif
}
- return opt_ctr;
+ return optimization_loop_ctr;
}
sparp_equiv_audit_all (sparp, 0);
sparp->sparp_rewrite_dirty = 0;
@@ -5846,8 +6193,8 @@ sparp_fill_sinv_varlists (sparp_t *sparp, SPART *root)
if (0 > dk_set_position_of_string (used_globals, param_var_name))
{
if (!sinv->_.sinv.in_list_implicit)
- spar_error (sparp, "SERVICE <%.200s> (...) declares IN ?%.200s variable but an IN variable should be used both inside and outside the SERVICE clause",
- sinv->_.sinv.endpoint, param_var_name );
+ spar_error (sparp, "SERVICE <%.200s> (...) declares IN ?%.200s variable but an IN variable should be used both inside and outside the SERVICE clause",
+ sinv->_.sinv.endpoint, param_var_name );
param_varnames_ptr[0] = t_list_remove_nth ((caddr_t)(param_varnames_ptr[0]), varctr);
}
}
@@ -5875,6 +6222,7 @@ sparp_fill_sinv_varlists (sparp_t *sparp, SPART *root)
SPARP_FOREACH_GP_EQUIV (sparp, gp, eqctr, eq)
{
int eq_varname_ctr;
+ caddr_t specimen_varname = NULL;
if (0 == BOX_ELEMENTS_0 (eq->e_receiver_idxs))
continue; /* The eq is used only internally, no need to return values */
DO_BOX_FAST_REV (caddr_t, eq_var_name, eq_varname_ctr, eq->e_varnames)
@@ -5885,9 +6233,17 @@ sparp_fill_sinv_varlists (sparp_t *sparp, SPART *root)
goto name_from_eq_is_found_in_params; /* see below */
}
END_DO_BOX_FAST_REV;
+ if (SPART_VARNAME_IS_GLOB (eq_var_name))
+ continue;
+ if (SPART_VARNAME_IS_SPECIAL (eq_var_name))
+ continue;
+ if (SPART_VARNAME_IS_BNODE (eq_var_name))
+ continue;
+ specimen_varname = eq_var_name;
}
END_DO_BOX_FAST_REV;
- t_set_push (&rset_varnames, eq->e_varnames[0]);
+ if (NULL != specimen_varname)
+ t_set_push (&rset_varnames, specimen_varname);
name_from_eq_is_found_in_params: ;
}
END_SPARP_FOREACH_GP_EQUIV;
@@ -5922,7 +6278,6 @@ sparp_tweak_order_of_iter (sparp_t *sparp, SPART **obys)
END_DO_BOX_FAST;
}
-
int
sparp_gp_trav_rewrite_qm_postopt (sparp_t *sparp, SPART *curr, sparp_trav_state_t *sts_this, void *common_env)
{
@@ -5935,6 +6290,146 @@ sparp_gp_trav_rewrite_qm_postopt (sparp_t *sparp, SPART *curr, sparp_trav_state_
return 0;
}
+int
+sparp_req_top_has_limofs (SPART *tree)
+{
+ if (SPAR_REQ_TOP != SPART_TYPE (tree))
+ return 0;
+ if ((DV_LONG_INT == DV_TYPE_OF (tree->_.req_top.limit)) && (DV_LONG_INT == DV_TYPE_OF (tree->_.req_top.offset)))
+ {
+ /*long lim = unbox ((caddr_t)(tree->_.req_top.limit));*/
+ long ofs = unbox ((caddr_t)(tree->_.req_top.offset));
+ if ((NULL == tree->_.req_top.limit) && (0 == ofs))
+ return 0;
+ return 1;
+ }
+ return 2;
+}
+
+SPART *
+sparp_limit_for_cutting_inner_limits (sparp_t *sparp, SPART *lim, SPART *ofs)
+{
+ if (NULL == lim)
+ return NULL;
+ if (NULL == ofs)
+ return lim;
+ if ((DV_LONG_INT == DV_TYPE_OF (lim)) && (DV_LONG_INT == DV_TYPE_OF (ofs)))
+ return (SPART *)t_box_num_nonull (unbox ((caddr_t)lim) + ((0 < unbox ((caddr_t)ofs)) ? unbox ((caddr_t)ofs) : 0));
+ return spartlist (sparp, 3, BOP_PLUS, lim,
+ spar_make_funcall (sparp, 0, "bif:__max_notnull", (SPART **)t_list (2, ofs, t_box_num_nonull (0))) );
+}
+
+SPART *
+sparp_cut_inner_limit_with_outer_limit (sparp_t *sparp, SPART *inner_limit, SPART *inner_offset, SPART *outer_limit)
+{
+ if (NULL == outer_limit)
+ return inner_limit;
+ if ((DV_LONG_INT == DV_TYPE_OF (outer_limit)) && (DV_LONG_INT == DV_TYPE_OF (inner_offset)) && (DV_LONG_INT == DV_TYPE_OF (inner_limit)))
+ {
+ boxint val = unbox ((caddr_t)outer_limit) + unbox ((caddr_t)inner_offset);
+ return (unbox ((caddr_t)inner_limit) < val) ? inner_limit : (SPART *)t_box_num_nonull (val);
+ }
+ return spar_make_funcall (sparp, 0, "bif:__min_notnull", (SPART **)t_list (3,
+ inner_limit,
+ spartlist (sparp, 3, BOP_PLUS, outer_limit,
+ spar_make_funcall (sparp, 0, "bif:__max_notnull", (SPART **)t_list (2, inner_offset, t_box_num_nonull (0))) ),
+ t_box_num_nonull (0) ) );
+}
+
+void
+spar_propagate_limit_as_option (sparp_t *sparp, SPART *tree, SPART *outer_limit)
+{
+ switch (SPART_TYPE (tree))
+ {
+ case SPAR_REQ_TOP:
+ tree->_.req_top.limit = sparp_cut_inner_limit_with_outer_limit (sparp, tree->_.req_top.limit, tree->_.req_top.offset, outer_limit);
+ if ((NULL != tree->_.req_top.limit) && (DISTINCT_L != tree->_.req_top.subtype) && (NULL == tree->_.req_top.groupings) && (NULL == tree->_.req_top.having))
+ spar_propagate_limit_as_option (sparp, tree->_.req_top.pattern,
+ sparp_limit_for_cutting_inner_limits (sparp, tree->_.req_top.limit, tree->_.req_top.offset) );
+ return;
+ case SPAR_GP:
+ {
+ int eq_ctr, filt_eq_mask;
+ if (NULL != tree->_.gp.options)
+ {
+ SPART *lim = sparp_get_option (sparp, tree->_.gp.options, LIMIT_L);
+ if (NULL != lim)
+ {
+ outer_limit = sparp_cut_inner_limit_with_outer_limit (sparp, lim, NULL, outer_limit);
+ if (NULL != outer_limit)
+ sparp_set_option (sparp, &(tree->_.gp.options), LIMIT_L, outer_limit, SPARP_SET_OPTION_REPLACING);
+ }
+ }
+ if (NULL == outer_limit)
+ return;
+ if (0 != BOX_ELEMENTS_0 (tree->_.gp.filters))
+ return;
+ filt_eq_mask = 0;
+ SPARP_FOREACH_GP_EQUIV (sparp, tree, eq_ctr, eq)
+ {
+ if (eq->e_replaces_filter) return;
+ }
+ END_SPARP_FOREACH_GP_EQUIV;
+ switch (tree->_.gp.subtype)
+ {
+ case SELECT_L:
+ spar_propagate_limit_as_option (sparp, tree->_.gp.subquery, outer_limit);
+ return;
+ case UNION_L:
+ {
+ int memb_ctr;
+ DO_BOX_FAST (SPART *, memb, memb_ctr, tree->_.gp.members)
+ {
+ spar_propagate_limit_as_option (sparp, memb, outer_limit);
+ }
+ END_DO_BOX_FAST;
+ if (NULL != outer_limit)
+ sparp_set_option (sparp, &(tree->_.gp.options), LIMIT_L, outer_limit, SPARP_SET_OPTION_REPLACING);
+ return;
+ }
+ case SERVICE_L:
+ if (NULL != outer_limit)
+ sparp_set_option (sparp, &(tree->_.gp.options), LIMIT_L, outer_limit, SPARP_SET_OPTION_REPLACING);
+ if (DV_LONG_INT != DV_TYPE_OF (outer_limit))
+ return;
+ /* no break */
+ case 0: case WHERE_L:
+ {
+ int memb_ctr, memb_count = BOX_ELEMENTS_0 (tree->_.gp.members);
+ int nonoptional_ctr = 0;
+ if (0 == memb_count)
+ return;
+ for (memb_ctr = 0; memb_ctr < memb_count; memb_ctr++)
+ {
+ SPART *memb = tree->_.gp.members[memb_ctr];
+ if ((SPAR_GP != SPART_TYPE (memb)) || (OPTIONAL_L != memb->_.gp.subtype))
+ nonoptional_ctr++;
+ }
+ if (1 == nonoptional_ctr)
+ {
+ for (memb_ctr = 0; memb_ctr < memb_count; memb_ctr++)
+ {
+ SPART *memb = tree->_.gp.members[memb_ctr];
+ spar_propagate_limit_as_option (sparp, memb, outer_limit);
+ }
+ }
+ if ((0 == tree->_.gp.subtype) && (NULL != outer_limit))
+ sparp_set_option (sparp, &(tree->_.gp.options), LIMIT_L, outer_limit, SPARP_SET_OPTION_REPLACING);
+ return;
+ }
+ }
+ return;
+ }
+ case SPAR_TRIPLE:
+ {
+ if (NULL == outer_limit)
+ return;
+ sparp_set_option (sparp, &(tree->_.triple.options), LIMIT_L, outer_limit, SPARP_SET_OPTION_REPLACING);
+ return;
+ }
+ }
+}
+
void
sparp_rewrite_qm_postopt (sparp_t *sparp)
{
@@ -5991,6 +6486,7 @@ retry_after_reducing_optionals:
spar_optimize_retvals_of_modify (sparp, root);
break;
}
+ spar_propagate_limit_as_option (sparp, root, NULL);
if (NULL != sparp->sparp_parent_sparp)
goto end_of_equiv_checks; /* see below */
equivs = sparp->sparp_sg->sg_equivs;
@@ -6063,7 +6559,7 @@ void
sparp_rewrite_grab (sparp_t *sparp)
{
sparp_env_t *env = sparp->sparp_env;
- rdf_grab_config_t *rgc = &(env->spare_grab);
+ rdf_grab_config_t *rgc = &(env->spare_src.ssrc_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 */
@@ -6103,14 +6599,14 @@ sparp_rewrite_grab (sparp_t *sparp)
sparp_of_seed->sparp_expr->_.req_top.subtype = SELECT_L;
sparp_of_seed->sparp_expr->_.req_top.retvals = grab_retvals;
sparp_of_seed->sparp_expr->_.req_top.retvalmode_name = t_box_string ("LONG");
- sparp_of_seed->sparp_expr->_.req_top.limit = (SPART *)t_box_num (SPARP_MAXLIMIT);
+ sparp_of_seed->sparp_expr->_.req_top.limit = NULL;
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_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;
+ 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;
/* 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);
@@ -6119,10 +6615,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_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;
+ 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;
/* 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 */
@@ -6327,11 +6823,8 @@ ssg_select_known_graphs_codegen (struct spar_sqlgen_s *ssg, struct spar_tree_s *
caddr_t formatmode_name = (caddr_t)(spart->_.codegen.args [argctr++]); /* #3 */
caddr_t retname = (caddr_t)(spart->_.codegen.args [argctr++]); /* #4 */
caddr_t retselid = (caddr_t)(spart->_.codegen.args [argctr++]); /* #5 */
- boxint lim = unbox ((caddr_t)(spart->_.codegen.args [argctr++])); /* #6 */
- boxint ofs = unbox ((caddr_t)(spart->_.codegen.args [argctr++])); /* #7 */
- int has_limofs = 0;
- char limofs_strg[40] = "";
- char limplusofs_strg[40] = "";
+ SPART *lim_expn = spart->_.codegen.args [argctr++]; /* #6 */
+ SPART *ofs_expn = spart->_.codegen.args [argctr++]; /* #7 */
SPART *tree = ssg->ssg_tree;
ptrlong subtype = tree->_.req_top.subtype;
const char *formatter, *agg_formatter, *agg_meta;
@@ -6343,14 +6836,6 @@ ssg_select_known_graphs_codegen (struct spar_sqlgen_s *ssg, struct spar_tree_s *
retvalmode = ssg_find_valmode_by_name (valmode_name);
if (((NULL != formatter) || (NULL != agg_formatter)) && (NULL != retvalmode) && (SSG_VALMODE_LONG != retvalmode))
spar_sqlprint_error ("'output:valmode' declaration conflicts with 'output:format'");
- if ((SPARP_MAXLIMIT != lim) || (0 != ofs))
- {
- has_limofs = 1;
- if (0 != ofs)
- snprintf (limofs_strg, sizeof (limofs_strg), " TOP " BOXINT_FMT ", " BOXINT_FMT, ofs, lim);
- else
- snprintf (limofs_strg, sizeof (limofs_strg), " TOP " BOXINT_FMT, lim);
- }
if (NULL == retvalmode)
retvalmode = ((NULL != formatter) ? SSG_VALMODE_LONG : SSG_VALMODE_SQLVAL);
if (NULL != formatter)
@@ -6386,9 +6871,8 @@ ssg_select_known_graphs_codegen (struct spar_sqlgen_s *ssg, struct spar_tree_s *
ssg_newline (0);
}
ssg_puts ("SELECT");
- if (has_limofs)
- ssg_puts (limofs_strg);
-
+ if ((NULL != lim_expn) || (NULL != ofs_expn))
+ ssg_print_limofs_expn (ssg, lim_expn, ofs_expn);
if (SSG_VALMODE_LONG != retvalmode)
ssg_puts (" __box_flags_tweak (");
ssg_prin_id_with_suffix (ssg, retselid, "~pview");
@@ -6405,8 +6889,11 @@ 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-ofs) >= lim) ? lim+ofs : SPARP_MAXLIMIT);
- ssg_puts (limplusofs_strg);
+ ssg_puts (".lim=");
+ if (NULL != lim_expn)
+ ssg_print_scalar_expn (ssg, spartlist (ssg->ssg_sparp, 3, BOP_PLUS, lim_expn, ofs_expn), SSG_VALMODE_SQLVAL, NULL_ASNAME);
+ else
+ ssg_puts ("NULL");
if ((NULL != formatter) || (NULL != agg_formatter))
{
ssg_puts (") AS ");
diff --git a/libsrc/Wi/sparql2sql.h b/libsrc/Wi/sparql2sql.h
index 5c793e6..0ea7e7f 100644
--- a/libsrc/Wi/sparql2sql.h
+++ b/libsrc/Wi/sparql2sql.h
@@ -1,10 +1,10 @@
/*
- * $Id: sparql2sql.h,v 1.55.2.24 2011/07/19 23:27:50 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -126,6 +126,10 @@ 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 .
@@ -257,9 +261,13 @@ Conflict in datatypes or fixed values results in SPART_VARR_CONFLICT to eliminat
Returns appropriate SPARP_EQUIV_MERGE_xxx */
extern int sparp_equiv_merge (sparp_t *sparp, sparp_equiv_t *primary, sparp_equiv_t *secondary);
-/* Returns whether two given fixedvalue trees are equal (same language and SQL value, no comparison for datatypes) */
+/*! Returns whether two given fixedvalue trees are equal (same language and SQL value, no comparison for datatypes) */
extern int sparp_fixedvalues_equal (sparp_t *sparp, SPART *first, SPART *second);
+/*! Returns 1 if tightening \c dest by \c add_on might give some effect, 0 if that is proven to be no-op.
+Nonzero \c assume_binv_var_and_eq means special policy for binding variable as \c dest an its equiv as \c add_on */
+extern int rvr_can_be_tightned (sparp_t *sparp, rdf_val_range_t *dest, rdf_val_range_t *add_on, int assume_binv_var_and_eq);
+
/*! Returns whether two given equivs have equal restriction by fixedvalue (and fixedtype).
If any of two are not restricted or they are restricted by two different values then the function returns zero */
extern int sparp_equivs_have_same_fixedvalue (sparp_t *sparp, sparp_equiv_t *first_eq, sparp_equiv_t *second_eq);
@@ -396,6 +404,15 @@ extern void sparp_rewrite_basic (sparp_t *sparp);
/* PART 2. GRAPH PATTERN TERM REWRITING */
+extern void spar_invalidate_binv_dataset_row (sparp_t *sparp, SPART *binv, int rowno, int reason_col);
+
+/*! Removes data rows from \c binv as soon as they conflict with equivs of variables in any single cell. As a side effect, unused sprintf formats are remvoed from equivs. */
+extern void spar_shorten_binv_dataset (sparp_t *sparp, SPART *binv);
+
+/*! Re-calculates common properties of \c binv variables by values in their data columns. Any UNBOUND in column disables the re-calculation. */
+extern void spar_refresh_binv_var_rvrs (sparp_t *sparp, SPART *binv);
+
+
extern SPART *sparp_find_gp_by_alias (sparp_t *sparp, caddr_t alias);
/*! Returns triple that contains the given variable \c var as a field.
@@ -414,6 +431,10 @@ If not \c find_exact_specimen then an upper-level retval can be returned instead
*/
extern SPART *sparp_find_origin_of_external_var (sparp_t *sparp, SPART *var, int find_exact_specimen);
+/*! This finds a position of a variable or an equivalent of that variable in the result-set array made by a sinv.
+If no suitable item found then -1 is returned */
+extern int sparp_find_sinv_rset_pos_of_varname (sparp_t *sparp, SPART *service_gp, caddr_t e_varname);
+
/*! This finds a variable or SPAR_ALIAS in \c retvals whose name is equal to \c varname, return the expression or, if \c return_alias, the whole SPAR_ALIAS */
extern SPART *sparp_find_subexpn_in_retlist (sparp_t *sparp, const char *varname, SPART **retvals, int return_alias);
@@ -426,6 +447,8 @@ extern qm_value_t *sparp_find_qmv_of_var_or_retval (sparp_t *sparp, SPART *var_t
extern SPART *sparp_find_gp_by_eq_idx (sparp_t *sparp, ptrlong eq_idx);
+extern int sparp_find_language_dialect_by_service (sparp_t *sparp, SPART *service_expn);
+
/*! This searches for storage by its name. NULL arg means default (or no storage if there's no default loaded), empty UNAME means no storage */
extern quad_storage_t *sparp_find_storage_by_name (ccaddr_t name);
@@ -499,10 +522,20 @@ extern SPART **sparp_treelist_full_clone (sparp_t *sparp, SPART **origs);
/*! This creates a full copy of \c orig subtree without cloning equivs.
Variables inside copy have unidirectional pointers to equivs until attached to other tree or same place in same tree. */
+#if 0
extern SPART *sparp_tree_full_copy (sparp_t *sparp, const SPART *orig, const SPART *parent_gp);
+#else
+#define sparp_tree_full_copy(sparp,orig,parent_gp) sparp_tree_full_copy_2(sparp,orig)
+extern SPART *sparp_tree_full_copy_2 (sparp_t *sparp, const SPART *orig);
+#endif
/*! This creates a copy of \c origs array and fills it with sparp_tree_full_copy of each member of the array. */
+#if 0
extern SPART **sparp_treelist_full_copy (sparp_t *sparp, SPART **origs, const SPART *parent_gp);
+#else
+#define sparp_treelist_full_copy(sparp,orig,parent_gp) sparp_treelist_full_copy_2(sparp,orig)
+extern SPART **sparp_treelist_full_copy_2 (sparp_t *sparp, SPART **origs);
+#endif
/*! This fills in \c acc with all distinct variable names found inside the tree, including subqueries.
Found variable names are pushed into \c acc that may be non-empty when the procedure is called */
@@ -613,7 +646,6 @@ extern SPART **sparp_make_qm_cases (sparp_t *sparp, SPART *triple, SPART *parent
/*! Creates a new graph pattern of specified \c subtype as if it is parsed ar \c srcline of source text. */
extern SPART *sparp_new_empty_gp (sparp_t *sparp, ptrlong subtype, ptrlong srcline);
-
/*! This turns \c gp into a union of zero cases and adjust VARR flags of variables to make them always-NULL */
extern void sparp_gp_produce_nothing (sparp_t *sparp, SPART *gp);
@@ -631,8 +663,14 @@ extern void sparp_make_common_eqs (sparp_t *sparp);
/*! Assigns table aliases to all variables in the expression */
extern void sparp_make_aliases (sparp_t *sparp);
+
+typedef struct sparp_label_external_vars_env_s {
+ dk_set_t parent_gps_for_var_search;
+ dk_set_t parent_gps_for_table_subq;
+} sparp_label_external_vars_env_t;
+
/*! Label variables as EXTERNAL. */
-extern void sparp_label_external_vars (sparp_t *sparp, dk_set_t parent_gps);
+extern void sparp_label_external_vars (sparp_t *sparp, sparp_label_external_vars_env_t *sleve);
/*! Visits all subtres and subqueries of \c tree and places all distinct names of global and external variables to \c set_set[0] */
extern void sparp_list_external_vars (sparp_t *sparp, SPART *tree, dk_set_t *set_ret);
@@ -666,6 +704,9 @@ A special value of SPARP_MULTIPLE_OPTLOOPS tells to run default sequence of few
extern int sparp_rewrite_qm_optloop (sparp_t *sparp, int opt_ctr);
#define SPARP_MULTIPLE_OPTLOOPS -20080327
+/*! Tries to propagate the \c outer_limit inside the \c tree */
+extern void spar_propagate_limit_as_option (sparp_t *sparp, SPART *tree, SPART *outer_limit);
+
/*! Finalization part of sparp_rewrite_qm(), including invocation of whole support of recursive sponge. */
extern void sparp_rewrite_qm_postopt (sparp_t *sparp);
@@ -684,6 +725,9 @@ extern SPART *sparp_get_option (sparp_t *sparp, SPART **options, ptrlong key);
extern SPART **sparp_get_options_of_tree (sparp_t *sparp, SPART *tree);
extern void sparp_validate_options_of_tree (sparp_t *sparp, SPART *tree, SPART **options);
+/*! Returns 0 of \c tree is not a req_top or has no LIMIT or OFFSET, 1 if LIMIT and/or OFFSET exist and what exist is plain integer, 2 if at lease one of LIMIT / OFFSET is an expression other than a constant integer */
+extern int sparp_req_top_has_limofs (SPART *tree);
+
/* PART 3. SQL OUTPUT GENERATOR */
struct spar_sqlgen_s;
@@ -732,6 +776,22 @@ 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)
@@ -742,6 +802,9 @@ extern void ssg_print_tmpl (struct spar_sqlgen_s *ssg, qm_format_t *qm_fmt, ccad
extern void sparp_check_tmpl (sparp_t *sparp, ccaddr_t tmpl, int qmv_known, dk_set_t *used_aliases);
extern caddr_t sparp_patch_tmpl (sparp_t *sparp, ccaddr_t tmpl, dk_set_t alias_replacements);
+extern int ssg_is_odbc_cli (void);
+extern int ssg_is_odbc_msaccess_cli (void);
+
/*! This searches for declaration of type by its name. NULL name result in NULL output, unknown name is an error */
extern ssg_valmode_t ssg_find_valmode_by_name (ccaddr_t name);
@@ -766,7 +829,7 @@ typedef struct spar_sqlgen_s
SPART *ssg_tree; /*!< Select tree to process, of type SPAR_REQ_TOP */
sparp_equiv_t **ssg_equivs; /*!< Shorthand for ssg_sparp->sparp_sg->sg_equivs */
ptrlong ssg_equiv_count; /*!< Shorthand for ssg_sparp->sparp_sg->sg_equiv_count */
- struct spar_sqlgen_s *ssg_parent_ssg; /*!< Ssg that prints outer subquery */
+ struct spar_sqlgen_s *ssg_parent_ssg; /*!< Ssg that prints outer subquery */
struct spar_sqlgen_s *ssg_nested_ssg; /*!< Ssg that prints some fragment for the current one, like a text of query to send to a remote service. This is used for GC on abort */
SPART * ssg_wrapping_gp; /*!< Gp of subtype SELECT_L or SERVICE_L that contains the current subquery */
SPART * ssg_wrapping_sinv; /*!< service invocation description of \c ssg_wrapping_p in case of SERVICE_L gp subtype */
@@ -775,11 +838,13 @@ typedef struct spar_sqlgen_s
/* SQL Codegen temporary values */
dk_session_t *ssg_out; /*!< Output for SQL text */
int ssg_where_l_printed; /*!< Flags what to print before a filter: " WHERE" if 0, " AND" otherwise */
- const char * ssg_where_l_text; /*!< Text to print when (0 == ssg_where_l_printed), usually " WHERE" */
+ const char * ssg_where_l_text; /*!< Text to print when (0 == ssg_where_l_printed), usually " WHERE" */
int ssg_indent; /*!< Number of whitespaces to indent. Actually, pairs of whitespaces, not singles */
int ssg_line_count; /*!< Number of lines of generated SQL code */
dk_set_t ssg_valid_ret_selids; /*!< stack of selids of GPs that can be safely used to generate SQL code for retvals (i.e. their selids are in current scope) */
dk_set_t ssg_valid_ret_tabids; /*!< stack like ssg_valid_ret_selids, but for tabids */
+ dk_set_t ssg_outer_valid_ret_selids; /*!< Initial content of \c ssg_valid_ret_selids. This content is passed to sub-ssgs that make non-scalar subqueries, because they do not access selids of neigbours but can access selids outside some surrounding scalar subquery */
+ dk_set_t ssg_outer_valid_ret_tabids; /*!< Initial content of \c ssg_valid_ret_tabids. */
int ssg_seealso_enabled; /*!< Flags if \c ssg_print_fld_var_restrictions_ex() (or the like) should generate calls of RDF_GRAB_SEEALSO; they should for "init" and "iter" of a pview, but not for "final" */
/* SPARQL-D Codegen temporary values */
const char * ssg_sd_service_name; /*!< Name of the destination endpoint that will receive the fragment that is printed ATM (for error reporting) */
@@ -809,6 +874,14 @@ void ssg_free_internals (spar_sqlgen_t *ssg);
#else
#define ssg_puts_with_comment(strg,cmt) session_buffered_write (ssg->ssg_out, strg " /* " cmt " */", strlen (strg " /* " cmt " */"))
#endif
+
+#define ssg_print_asname_tail(cmt,asname) do { \
+ if (NULL != (asname)) { \
+ ssg_puts_with_comment (" AS", cmt); \
+ ssg_putchar (' '); \
+ ssg_prin_id (ssg, (asname)); \
+ } } while (0);
+
#define ssg_putbuf(buf,bytes) session_buffered_write (ssg->ssg_out, (buf), (bytes))
#ifdef DEBUG
@@ -837,7 +910,15 @@ 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 ssg_qr_uses_jso (spar_sqlgen_t *ssg, ccaddr_t jso_inst, ccaddr_t jso_name);
+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_table (spar_sqlgen_t *ssg, const char *tbl);
extern ssg_valmode_t sparp_lit_native_valmode (SPART *tree);
@@ -851,11 +932,12 @@ extern void sparp_jso_validate_format (sparp_t *sparp, ssg_valmode_t fmt);
/*! Prints an SQL identifier. 'prin' instead of 'print' because it does not print whitespace or delim before the text */
extern void ssg_prin_id (spar_sqlgen_t *ssg, const char *name);
extern void ssg_prin_id_with_suffix (spar_sqlgen_t *ssg, const char *name, const char *suffix);
-#define SQL_ATOM_ASCII_ONLY 10
+#define SQL_ATOM_ASCII_ONLY 10
#define SQL_ATOM_NARROW_ONLY 11
#define SQL_ATOM_UTF8_ONLY 12
#define SQL_ATOM_NARROW_OR_WIDE 13
#define SQL_ATOM_UNAME_ALLOWED 14
+#define SQL_ATOM_ABORT_ON_CAST 15 /*!< Intentionally "bad" mode to get an error on any cast to string */
extern void ssg_print_box_as_sql_atom (spar_sqlgen_t *ssg, ccaddr_t box, int mode);
extern void ssg_print_literal_as_sql_atom (spar_sqlgen_t *ssg, ccaddr_t type, SPART *lit);
extern void ssg_print_literal_as_sqlval (spar_sqlgen_t *ssg, ccaddr_t type, SPART *lit);
@@ -875,18 +957,20 @@ extern void ssg_print_filter_expn (spar_sqlgen_t *ssg, SPART *tree);
extern void ssg_print_retval (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t vmode, const char *asname);
extern void ssg_print_qm_sql (spar_sqlgen_t *ssg, SPART *tree);
-#define SSG_RETVAL_USES_ALIAS 0x01 /*!< Return value can be printed in form 'expn AS alias' if alias name is not NULL */
-#define SSG_RETVAL_SUPPRESSED_ALIAS 0x02 /*!< Return value is not printed in form 'expn AS alias', only 'expn' but alias is known to subtree and let generate names like 'alias~0' */
-#define SSG_RETVAL_MUST_PRINT_SOMETHING 0x04 /*!< The function signals an error instead of returning failure and tries to relax SSG_RETVAL_FROM_GOOD_SELECTED to SSG_RETVAL_FROM_ANY_SELECTED as a last resort */
-#define SSG_RETVAL_CAN_PRINT_NULL 0x08 /*!< The function should print at least NULL but it can not return failure */
-#define SSG_RETVAL_FROM_GOOD_SELECTED 0x10 /*!< Use result-set columns from 'good' (non-optional) subqueries */
-#define SSG_RETVAL_FROM_ANY_SELECTED 0x20 /*!< Use result-set columns from any subqueries, including 'optional' that can make NULL */
-#define SSG_RETVAL_FROM_JOIN_MEMBER 0x40 /*!< The function can print expression like 'tablealias.colname' */
-#define SSG_RETVAL_FROM_FIRST_UNION_MEMBER 0x80
-#define SSG_RETVAL_TOPMOST 0x100
-#define SSG_RETVAL_NAME_INSTEAD_OF_TREE 0x200
-#define SSG_RETVAL_DIST_SER_LONG 0x400 /*!< Use DB.DBA.RDF_DIST_SER_LONG wrapper to let DISTINCT work with formatters. */
-#define SSG_RETVAL_OPTIONAL_MAKES_NULLABLE 0x800 /*!< Return value should be printed as nullable because it comes from, say, OPTIONAL sub-gp */
+/* These bitmasks begin with 0x10, not with 0x1, in order to not conflict with SSG_PRINT_UNION_xxx bits; ssg_print_union() can get a mix */
+#define SSG_RETVAL_USES_ALIAS 0x010 /*!< Return value can be printed in form 'expn AS alias' if alias name is not NULL */
+#define SSG_RETVAL_SUPPRESSED_ALIAS 0x020 /*!< Return value is not printed in form 'expn AS alias', only 'expn' but alias is known to subtree and let generate names like 'alias~0' */
+#define SSG_RETVAL_MUST_PRINT_SOMETHING 0x040 /*!< The function signals an error instead of returning failure and tries to relax SSG_RETVAL_FROM_GOOD_SELECTED to SSG_RETVAL_FROM_ANY_SELECTED as a last resort */
+#define SSG_RETVAL_CAN_PRINT_NULL 0x080 /*!< The function should print at least NULL but it can not return failure */
+#define SSG_RETVAL_FROM_GOOD_SELECTED 0x100 /*!< Use result-set columns from 'good' (non-optional) subqueries */
+#define SSG_RETVAL_FROM_ANY_SELECTED 0x200 /*!< Use result-set columns from any subqueries, including 'optional' that can make NULL */
+#define SSG_RETVAL_FROM_JOIN_MEMBER 0x400 /*!< The function can print expression like 'tablealias.colname' */
+#define SSG_RETVAL_FROM_FIRST_UNION_MEMBER 0x800
+#define SSG_RETVAL_TOPMOST 0x1000
+#define SSG_RETVAL_NAME_INSTEAD_OF_TREE 0x2000
+#define SSG_RETVAL_DIST_SER_LONG 0x4000 /*!< Use DB.DBA.RDF_DIST_SER_LONG wrapper to let DISTINCT work with formatters. */
+#define SSG_RETVAL_OPTIONAL_MAKES_NULLABLE 0x8000 /*!< Return value should be printed as nullable because it comes from, say, OPTIONAL sub-gp */
+#define SSG_RETVAL_STRICT_TYPES 0x10000 /*!< Every returned expression should either be accomplished with its (known) SQL type or be CAST-ed to the VARCHAR (esp., if it's ANY) */
/* descend = 0 -- at level, can descend. 1 -- at sublevel, can't descend, -1 -- at level, can't descend */
extern int ssg_print_equiv_retval_expn (spar_sqlgen_t *ssg, SPART *gp,
sparp_equiv_t *eq, int flags, ssg_valmode_t needed, const char *asname );
@@ -898,6 +982,8 @@ extern void ssg_print_fld_var_restrictions_ex (spar_sqlgen_t *ssg, quad_map_t *q
extern void ssg_print_fld_restrictions (spar_sqlgen_t *ssg, quad_map_t *qmap, qm_value_t *field, caddr_t tabid, SPART *triple, int fld_idx, int print_outer_filter);
extern void ssg_print_all_table_fld_restrictions (spar_sqlgen_t *ssg, quad_map_t *qm, caddr_t alias, SPART *triple, int enabled_field_bitmask, int print_outer_filter);
+extern void ssg_print_limofs_expn (spar_sqlgen_t *ssg, SPART *lim, SPART *ofs);
+
#define SSG_TABLE_SELECT_PASS 1
#define SSG_TABLE_WHERE_PASS 2
#define SSG_TABLE_PVIEW_PARAM_PASS 3
@@ -931,26 +1017,9 @@ extern void ssg_make_whole_sql_text (spar_sqlgen_t *ssg);
/* PART 4. SPARQL-D ("-DISTRIBUTED") GENERATOR */
-/* Flags that are responsible for various serialization features.
-Some features are labeled as "blocking", because if such a feature is required but flag is not set, an error is signaled.
-An occurrence of a non-blocking feature provides some hint to the optimizer of the SPARQL service endpoint; a blocking one alters semantics. */
-#define SSG_SD_QUAD_MAP 0x0001 /*!< Allows the use of QUAD MAP groups in the output */
-#define SSG_SD_OPTION 0x0002 /*!< Allows the use of OPTION keyword in the output */
-#define SSG_SD_BREAKUP 0x0004 /*!< Flags if BREAKUP hint options should be printed, this has no effect w/o SSG_SD_OPTION */
-#define SSG_SD_PKSELFJOIN 0x0008 /*!< Flags if PKSELFJOIN hint options should be printed, this has no effect w/o SSG_SD_OPTION */
-#define SSG_SD_RVR 0x0010 /*!< Flags if RVR hint options should be printed, this has no effect w/o SSG_SD_OPTION */
-#define SSG_SD_IN 0x0020 /*!< Allows the use of IN operator, non-blocking because can be replaced with '=' */
-#define SSG_SD_LIKE 0x0040 /*!< Allows the use of LIKE operator, blocking */
-#define SSG_SD_GLOBALS 0x0080 /*!< Allows the use of global variables (with colon at the front of the name), blocking in most of cases */
-#define SSG_SD_BI 0x0100 /*!< Allows the use of SPARQL-BI extensions, blocking in most of cases */
-#define SSG_SD_VIRTSPECIFIC 0x0200 /*!< Allows the use of Virtuoso-specific features not listed above, say DEFINE, blocking in most of cases */
-#define SSG_SD_VOS_509 0x03FF /*!< Allows everything that is supported by Virtuoso Open Source 5.0.9 */
-#define SSG_SD_SERVICE 0x0400 /*!< Allows the use of SERVICE extension, blocking */
-#define SSG_SD_VOS_5_LATEST 0x0FFF /*!< Allows everything that is supported by CVS had of Virtuoso Open Source 5.x.x */
-#define SSG_SD_TRANSIT 0x1000 /*!< Allows the use of transitivity extension, blocking */
-#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_VOS_CURRENT (SSG_SD_VOS_6 | SSG_SD_SPARQL11_DRAFT) /*!< Allows everything that is supported by current version of Virtuoso Open Source */
+#define SSG_SD_SPARQL11 (SSG_SD_SPARQL11_DRAFT | SSG_SD_SPARQL11_FULL) /*!< Allows the use of SPARQL 1.1 extensions, blocking in most of cases */
+#define SSG_SD_BI_OR_SPARQL11_DRAFT (SSG_SD_BI | SSG_SD_SPARQL11_DRAFT)
#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 1d8fff9..69badf7 100644
--- a/libsrc/Wi/sparql2sqltext.c
+++ b/libsrc/Wi/sparql2sqltext.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparql2sqltext.c,v 1.113.2.100 2011/09/27 09:42:14 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -36,6 +36,7 @@
#include "date.h" /* for DT_DT_TYPE */
#include "numeric.h"
#include "rdf_core.h" /* for IRI_TO_ID_WITH_CREATE */
+#include "xml_ecm.h"
#ifdef __cplusplus
extern "C" {
#endif
@@ -86,6 +87,7 @@ 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}^");
@@ -129,6 +131,7 @@ 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}^))");
@@ -229,6 +232,28 @@ ssg_find_valmode_by_name (ccaddr_t name)
return NULL; /* to keep compiler happy */
}
+int
+ssg_is_odbc_cli (void)
+{
+ client_connection_t * cli = sqlc_client ();
+ if (!cli || !cli->cli_session || cli->cli_ws || cli->cli_is_log)
+ return 0;
+ return 1;
+}
+
+int
+ssg_is_odbc_msaccess_cli (void)
+{
+ caddr_t *info;
+ client_connection_t * cli = sqlc_client ();
+ if (!cli || !cli->cli_session || cli->cli_ws || cli->cli_is_log)
+ return 0;
+ info = cli->cli_info;
+ if (NULL == info)
+ return 0;
+ return !strcmp (info[LGID_APP_NAME], "MSACCESS");
+}
+
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 )
@@ -309,6 +334,12 @@ 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)
{
@@ -349,6 +380,10 @@ ssg_find_formatter_by_name_and_subtype (ccaddr_t name, ptrlong subtype,
case ASK_L: ret_formatter[0] = "COUNT"; return;
default: return;
}
+ if (!strcmp (name, "_UDBC_"))
+ return;
+ if (!strcmp (name, "_MSACCESS_"))
+ return;
if (!strcmp (name, "ATOM;XML"))
switch (subtype)
{
@@ -385,6 +420,20 @@ 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_CSV"; return;
default: return;
}
+ if (!strcmp (name, "TSV"))
+ switch (subtype)
+ {
+ case SELECT_L: case COUNT_DISTINCT_L: case DISTINCT_L: ret_formatter[0] = "DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV"; return;
+ case CONSTRUCT_L: case DESCRIBE_L: ret_formatter[0] = "DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TSV"; return;
+ case ASK_L: ret_formatter[0] = "DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV"; return;
+ default: return;
+ }
+ if (!strcmp (name, "BINDINGS"))
+ switch (subtype)
+ {
+ case SELECT_L: case COUNT_DISTINCT_L: case DISTINCT_L: ret_formatter[0] = "DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS"; return;
+ default: return;
+ }
spar_error (NULL, "Unsupported format name '%.40s'", name);
/*
bad_ask:
@@ -413,23 +462,6 @@ 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;
@@ -619,7 +651,7 @@ ssg_print_tmpl_phrase (struct spar_sqlgen_s *ssg, qm_format_t *qm_fmt, const cha
else if (CMD_EQUAL("alias", 5))
{
if (NULL != alias)
- ssg_prin_id (ssg, alias);
+ ssg_prin_id (ssg, alias);
else if ('.' == tail[0])
tail++;
else
@@ -1511,7 +1543,7 @@ sparp_equiv_native_valmode (sparp_t *sparp, SPART *gp, sparp_equiv_t *eq)
if (eq->e_rvr.rvrRestrictions & (SPART_VARR_CONFLICT | SPART_VARR_ALWAYS_NULL))
return SSG_VALMODE_BOOL; /* A smallest possible type because the equiv is in conflict and no binding exists */
if (SPART_VARR_FIXED & eq->e_rvr.rvrRestrictions)
- return SSG_VALMODE_SQLVAL;
+ return SSG_VALMODE_SQLVAL;
if (SELECT_L == gp->_.gp.subtype)
{
caddr_t varname = eq->e_varnames[0];
@@ -1676,10 +1708,8 @@ sparp_expn_native_valmode (sparp_t *sparp, SPART *tree)
case SPAR_BUILT_IN_CALL:
switch (tree->_.builtin.btype)
{
- 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:
+ case IN_L: case LIKE_L: return SSG_VALMODE_BOOL;
+ case SPAR_BIF_COALESCE:
{
ssg_valmode_t union_valmode = sparp_expn_native_valmode (sparp, tree->_.builtin.args[0]);
int argctr;
@@ -1690,13 +1720,17 @@ sparp_expn_native_valmode (sparp_t *sparp, SPART *tree)
}
return union_valmode;
}
- case IF_L:
+ case SPAR_BIF_IF:
{
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: return SSG_VALMODE_SQLVAL;
+ default:
+ {
+ const sparp_bif_desc_t *sbd = sparp_bif_descs + tree->_.builtin.desc_ofs;
+ return sbd->sbd_ret_valmode;
+ }
}
case SPAR_FUNCALL:
return sparp_rettype_of_function (sparp, tree->_.funcall.qname, tree);
@@ -1835,9 +1869,9 @@ sparp_expn_native_valmode (sparp_t *sparp, SPART *tree)
}
if (SPART_BAD_EQUIV_IDX == tree->_.retval.equiv_idx)
{
- eq = sparp_equiv_get_ro (
- sparp->sparp_sg->sg_equivs, sparp->sparp_sg->sg_equiv_count, gp, tree,
- SPARP_EQUIV_GET_NAMESAKES | SPARP_EQUIV_GET_ASSERT );
+ eq = sparp_equiv_get_ro (
+ sparp->sparp_sg->sg_equivs, sparp->sparp_sg->sg_equiv_count, gp, tree,
+ SPARP_EQUIV_GET_NAMESAKES | SPARP_EQUIV_GET_ASSERT );
tree->_.retval.equiv_idx = eq->e_own_idx;
}
else
@@ -1867,7 +1901,18 @@ 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;
}
@@ -1942,7 +1987,7 @@ sparp_restr_bits_of_expn (sparp_t *sparp, SPART *tree)
(SPART_VARR_IS_LIT | SPART_VARR_LONG_EQ_SQL |
(sparp_restr_bits_of_expn (sparp, tree->_.bin_exp.left) &
SPART_VARR_NOT_NULL ) );
- case BOP_EQ: case BOP_NEQ: case BOP_LT: case BOP_LTE: case BOP_GT: case BOP_GTE:
+ case BOP_EQ: case SPAR_BOP_EQ: case BOP_NEQ: case BOP_LT: case BOP_LTE: case BOP_GT: case BOP_GTE:
/*case BOP_LIKE: Like is built-in in SPARQL, not a BOP! */
case BOP_SAME: case BOP_NSAME:
case BOP_AND: case BOP_OR:
@@ -1960,92 +2005,99 @@ 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:
- 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:
+ {
+ 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)
{
- 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))
+ 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;
+ }
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 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;
- }
+ }
+ 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:
return res_bits;
}
- default: return 0;
- }
+ }
case SPAR_FUNCALL:
{
caddr_t qname = tree->_.funcall.qname;
@@ -2062,6 +2114,7 @@ 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;
@@ -2202,25 +2255,55 @@ ssg_print_box_as_sql_atom (spar_sqlgen_t *ssg, ccaddr_t box, int mode)
sqlc_wide_string_literal (tmpbuf, buflen, &buffill, (wchar_t *) box);
break;
case DV_SINGLE_FLOAT:
- if (1.0 > ((2 - 1.41484755040568800000e+16) + 1.41484755040568800000e+16))
- spar_error (ssg->ssg_sparp, "Platform-specific error: this build of Virtuoso does not supports literals of type %s due to rounding errors in math functions", dv_type_title (dtp));
- buffill = sprintf (tmpbuf, "cast (%lg", (double)(unbox_float (box)));
- if ((NULL == strchr (tmpbuf, '.')) && (NULL == strchr (tmpbuf, 'E')) && (NULL == strchr (tmpbuf, 'e')))
- {
- strcpy (tmpbuf+buffill, ".0");
- buffill += 2;
- }
- strcpy (tmpbuf+buffill, " as float)");
- buffill += 10;
- break;
+ {
+ double boxdbl = (double)(unbox_float (box));
+ if (1.0 > ((2 - 1.41484755040568800000e+16) + 1.41484755040568800000e+16))
+ spar_error (ssg->ssg_sparp, "Platform-specific error: this build of Virtuoso does not supports literals of type %s due to rounding errors in math functions", dv_type_title (dtp));
+ buffill = sprintf (tmpbuf, "cast (%lg", boxdbl);
+ if ((NULL == strchr (tmpbuf+6, '.')) && (NULL == strchr (tmpbuf+6, 'E')) && (NULL == strchr (tmpbuf+6, 'e')))
+ {
+ if (isalpha(tmpbuf[6+1]))
+ {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ double myNEGINF_d = -1.0/myZERO;
+ if (myPOSINF_d == boxdbl) buffill = sprintf (tmpbuf, "cast ('Inf'");
+ else if (myNEGINF_d == boxdbl) buffill = sprintf (tmpbuf, "cast ('-Inf'");
+ else buffill = sprintf (tmpbuf, "cast ('nan'");
+ }
+ else
+ {
+ strcpy (tmpbuf+buffill, ".0");
+ buffill += 2;
+ }
+ } /* 01234567890 */
+ strcpy (tmpbuf+buffill, " as float)");
+ buffill += 10;
+ break;
+ }
case DV_DOUBLE_FLOAT:
- buffill = sprintf (tmpbuf, "%lg", unbox_double (box));
- if ((NULL == strchr (tmpbuf, '.')) && (NULL == strchr (tmpbuf, 'E')) && (NULL == strchr (tmpbuf, 'e')))
- {
- strcpy (tmpbuf+buffill, ".0");
- buffill += 2;
- }
- break;
+ {
+ double boxdbl = unbox_double (box);
+ buffill = sprintf (tmpbuf, "%lg", boxdbl);
+ if ((NULL == strchr (tmpbuf, '.')) && (NULL == strchr (tmpbuf, 'E')) && (NULL == strchr (tmpbuf, 'e')))
+ {
+ if (isalpha(tmpbuf[1]))
+ {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ double myNEGINF_d = -1.0/myZERO;
+ if (myPOSINF_d == boxdbl) buffill = sprintf (tmpbuf, "cast ('Inf' as double precision)");
+ else if (myNEGINF_d == boxdbl) buffill = sprintf (tmpbuf, "cast ('-Inf' as double precision)");
+ else buffill = sprintf (tmpbuf, "cast ('NaN' as double precision)");
+ }
+ else
+ {
+ strcpy (tmpbuf+buffill, ".0");
+ buffill += 2;
+ }
+ }
+ break;
+ }
case DV_NUMERIC:
{
numeric_t nbox = (numeric_t)box;
@@ -2291,7 +2374,7 @@ ssg_print_literal_as_sql_atom (spar_sqlgen_t *ssg, ccaddr_t type, SPART *lit)
#ifdef NDEBUG
ssg_puts (" __bft(");
#else
- ssg_puts (" /* QNAME as sql atom */ __box_flags_tweak (");
+ ssg_puts (" /* QNAME as sql atom */ __bft (");
#endif
ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_UTF8_ONLY);
ssg_puts (", 1)");
@@ -2339,7 +2422,7 @@ ssg_print_literal_as_sqlval (spar_sqlgen_t *ssg, ccaddr_t type, SPART *lit)
#ifdef NDEBUG
ssg_puts (" __bft(");
#else
- ssg_puts (" /* QName as sqlval */ __box_flags_tweak (");
+ ssg_puts (" /* QName as sqlval */ __bft (");
#endif
ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_UTF8_ONLY);
ssg_puts (", 1)");
@@ -2356,7 +2439,7 @@ ssg_print_literal_as_sqlval (spar_sqlgen_t *ssg, ccaddr_t type, SPART *lit)
#ifdef NDEBUG
ssg_puts (" __bft(");
#else
- ssg_puts (" /* UNAME as sqlval */ __box_flags_tweak (");
+ ssg_puts (" /* UNAME as sqlval */ __bft (");
#endif
ssg_print_box_as_sql_atom (ssg, (ccaddr_t)(lit), SQL_ATOM_UTF8_ONLY);
ssg_puts (", 1)");
@@ -2366,39 +2449,46 @@ ssg_print_literal_as_sqlval (spar_sqlgen_t *ssg, ccaddr_t type, SPART *lit)
value = (caddr_t)lit;
if (NULL == type)
type = dt;
+/*
if ((NULL != lang) && (NULL == type) && (DV_STRING == DV_TYPE_OF (value)))
{
ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_NARROW_OR_WIDE);
return;
}
+*/
+ if ((NULL == type) && (NULL == lang))
+ {
+ ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_NARROW_OR_WIDE);
+ return;
+ }
if ((NULL != type) && (NULL == lang))
{
- 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)))
+ 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)
{
ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_NARROW_OR_WIDE);
return;
}
+ }
#ifdef NDEBUG
- ssg_puts (" __ro2sq(DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS(");
+ ssg_puts (" __ro2sq(DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS(");
#else
- ssg_puts (" /* sqlval of typed literal */ __rdf_sqlval_of_obj (DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (");
+ ssg_puts (" /* sqlval of typed literal */ __ro2sq (DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (");
#endif
- ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_NARROW_OR_WIDE);
- ssg_putchar (',');
- if (NULL != type)
- ssg_print_box_as_sql_atom (ssg, type, SQL_ATOM_UNAME_ALLOWED);
- else
- ssg_puts (" NULL");
- ssg_putchar (',');
- if (NULL != lang)
- ssg_print_box_as_sql_atom (ssg, lang, SQL_ATOM_ASCII_ONLY);
- else
- ssg_puts (" NULL");
- ssg_puts ("))");
- return;
- }
ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_NARROW_OR_WIDE);
+ ssg_putchar (',');
+ if (NULL != type)
+ ssg_print_box_as_sql_atom (ssg, type, SQL_ATOM_UNAME_ALLOWED);
+ else
+ ssg_puts (" NULL");
+ ssg_putchar (',');
+ if (NULL != lang)
+ ssg_print_box_as_sql_atom (ssg, lang, SQL_ATOM_ASCII_ONLY);
+ else
+ ssg_puts (" NULL");
+ ssg_puts ("))");
}
void
@@ -2455,7 +2545,7 @@ ssg_print_literal_as_long (spar_sqlgen_t *ssg, SPART *lit)
ssg_putchar (')');
return;
}
- ssg_print_box_as_sql_atom (ssg, value, 0 /* intentionally bad mode to get an error on any cast to string */);
+ ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_ABORT_ON_CAST);
}
void
@@ -2985,7 +3075,7 @@ ssg_print_bop_bool_expn (spar_sqlgen_t *ssg, SPART *tree, const char *bool_op, c
}
/* There exists a special popular case for a filter for GRAPH `iri(my_expression)` { ... } where graph is made by mapping with a fixed graph.
Without the special optimization it becomes iri_to_id ('graph iri string from view declaration') = iri_to_id_nosignal (my_expression) */
- if ((BOP_EQ == ttype) &&
+ if (((BOP_EQ == ttype) || (SPAR_BOP_EQ == ttype)) &&
((SSG_VALMODE_SQLVAL == left_vmode) || (SSG_VALMODE_SQLVAL == right_vmode)) &&
((SSG_VALMODE_LONG == left_vmode) || (SSG_VALMODE_LONG == right_vmode)) )
{
@@ -3078,7 +3168,7 @@ vmodes_found:
if (NULL == split)
ssg_print_scalar_expn (ssg, right, min_mode, NULL_ASNAME);
else
- ssg_print_box_as_sql_atom (ssg, split[0], 0);
+ ssg_print_box_as_sql_atom (ssg, split[0], SQL_ATOM_ABORT_ON_CAST);
}
else
{
@@ -3088,7 +3178,7 @@ vmodes_found:
const char *asname;
if (colctr)
{
- if (BOP_EQ == ttype)
+ if ((BOP_EQ == ttype) || (SPAR_BOP_EQ == ttype))
ssg_puts (" and ");
else
ssg_puts (" or ");
@@ -3106,7 +3196,7 @@ vmodes_found:
if (NULL == split)
ssg_print_scalar_expn (ssg, right, min_mode, asname);
else
- ssg_print_box_as_sql_atom (ssg, split[prevcolctr], 0);
+ ssg_print_box_as_sql_atom (ssg, split[prevcolctr], SQL_ATOM_ABORT_ON_CAST);
ssg->ssg_indent --; ssg_putchar (')');
ssg_puts (" and ");
}
@@ -3117,7 +3207,7 @@ vmodes_found:
if (NULL == split)
ssg_print_scalar_expn (ssg, right, min_mode, asname);
else
- ssg_print_box_as_sql_atom (ssg, split[colctr], 0);
+ ssg_print_box_as_sql_atom (ssg, split[colctr], SQL_ATOM_ABORT_ON_CAST);
ssg->ssg_indent --; ssg_putchar (')');
}
}
@@ -3133,13 +3223,13 @@ vmodes_found:
if (NULL == split)
ssg_print_scalar_expn (ssg, right, min_mode, NULL_ASNAME);
else
- ssg_print_box_as_sql_atom (ssg, split[0], 0);
+ ssg_print_box_as_sql_atom (ssg, split[0], SQL_ATOM_ABORT_ON_CAST);
ssg->ssg_indent --; ssg_putchar (')');
}
else
{
int colctr;
- if (BOP_EQ == ttype)
+ if ((BOP_EQ == ttype) || (SPAR_BOP_EQ == ttype))
ssg_puts (" __and (");
else
ssg_puts (" __or (");
@@ -3162,7 +3252,7 @@ vmodes_found:
if (NULL == split)
ssg_print_scalar_expn (ssg, right, min_mode, asname);
else
- ssg_print_box_as_sql_atom (ssg, split[prevcolctr], 0);
+ ssg_print_box_as_sql_atom (ssg, split[prevcolctr], SQL_ATOM_ABORT_ON_CAST);
ssg->ssg_indent --; ssg_putchar (')');
ssg_puts (", ");
}
@@ -3174,7 +3264,7 @@ vmodes_found:
if (NULL == split)
ssg_print_scalar_expn (ssg, right, min_mode, asname);
else
- ssg_print_box_as_sql_atom (ssg, split[colctr], 0);
+ ssg_print_box_as_sql_atom (ssg, split[colctr], SQL_ATOM_ABORT_ON_CAST);
ssg->ssg_indent --; ssg_putchar (')');
}
ssg->ssg_indent --; ssg_putchar (')');
@@ -3367,30 +3457,20 @@ 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)
+ssg_print_builtin_expn (spar_sqlgen_t *ssg, SPART *tree, int top_filter_op, ssg_valmode_t needed, const char *asname)
{
- SPART *arg1 = tree->_.builtin.args[0];
- ssg_valmode_t arg1_native = sparp_expn_native_valmode (ssg->ssg_sparp, arg1);
+ 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);
int argctr;
ssg_valmode_t op_fmt = NULL;
int arg1_restr_bits;
- 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 && (
+ if ((SSG_VALMODE_BOOL == sbd->sbd_ret_valmode) && (
(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) ) )
{
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_BOOL, NULL_ASNAME);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_BOOL, asname);
return;
}
switch (tree->_.builtin.btype)
@@ -3402,12 +3482,12 @@ ssg_print_builtin_expn (spar_sqlgen_t *ssg, SPART *tree, int top_filter_op, ssg_
if (arg1_restr_bits & SPART_VARR_NOT_NULL)
{
ssg_puts_with_comment (" 1", "optimized BOUND");
- return;
+ goto print_asname;
}
if (arg1_restr_bits & (SPART_VARR_ALWAYS_NULL | SPART_VARR_CONFLICT))
{
ssg_puts_with_comment (" 0", "optimized BOUND");
- return;
+ goto print_asname;
}
if (top_filter_op)
{ ltext = " ("; rtext = " is not null)"; }
@@ -3431,9 +3511,9 @@ ssg_print_builtin_expn (spar_sqlgen_t *ssg, SPART *tree, int top_filter_op, ssg_
ssg_print_scalar_expn (ssg, arg1, arg1_native, NULL_ASNAME);
}
ssg_puts (rtext);
- return;
+ goto print_asname;
}
- case SAMETERM_L:
+ case SPAR_BIF_SAMETERM:
{
SPART *arg2 = tree->_.builtin.args[1];
SPART *expanded;
@@ -3443,13 +3523,13 @@ ssg_print_builtin_expn (spar_sqlgen_t *ssg, SPART *tree, int top_filter_op, ssg_
{
expanded = spartlist (ssg->ssg_sparp, 3, BOP_EQ, arg1, arg2);
ssg_print_bop_bool_expn (ssg, expanded, " = ", " equ (", top_filter_op, needed);
- return;
+ goto print_asname;
}
if ((arg1_restrs & SPART_VARR_IS_REF) || (arg2_restrs & SPART_VARR_IS_REF))
{
SPART *potential_literal = ((arg1_restrs & SPART_VARR_IS_REF) ? arg2 : arg1);
expanded = spartlist (ssg->ssg_sparp, 3, BOP_AND,
- spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isIRI_L, t_list (1, potential_literal)),
+ sparp_make_builtin_call (ssg->ssg_sparp, IRI_L, (SPART **)t_list (1, potential_literal)),
spartlist (ssg->ssg_sparp, 3, BOP_EQ, arg1, arg2) );
goto expanded_sameterm_ready; /* see below */
}
@@ -3458,54 +3538,56 @@ 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,
- 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)) ),
+ 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, BOP_AND,
spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- 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)) ) ),
+ 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)) ) ),
NULL ),
spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- 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)) ) ),
+ 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)) ) ),
NULL ) ) ),
spartlist (ssg->ssg_sparp, 3, BOP_OR,
spartlist (ssg->ssg_sparp, 3, BOP_EQ,
- 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)) ),
+ 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, BOP_AND,
spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- 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)) ) ),
+ 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)) ) ),
NULL ),
spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- 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)) ) ),
+ 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)) ) ),
NULL ) ) ) ) );
expanded_sameterm_ready:
ssg_print_bop_bool_expn (ssg, expanded, " AND ", " __and (", top_filter_op, needed);
- return;
+ goto print_asname;
}
case DATATYPE_L:
if (SSG_VALMODE_LONG != needed)
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, NULL_ASNAME);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, asname);
else
- ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_DATATYPE, NULL_ASNAME);
+ ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_DATATYPE, asname);
return;
case LIKE_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
{
- ssg_puts (" (cast ("); ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_SQLVAL, NULL_ASNAME);
- ssg_puts (" as varchar) like cast ("); ssg_print_scalar_expn (ssg, tree->_.builtin.args[1], SSG_VALMODE_SQLVAL, NULL_ASNAME);
- ssg_puts (" as varchar))");
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_BOOL, asname);
+ return;
}
- return;
- case COALESCE_L:
+ ssg_puts (" (cast ("); ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_SQLVAL, NULL_ASNAME);
+ ssg_puts (" as varchar) like cast ("); ssg_print_scalar_expn (ssg, tree->_.builtin.args[1], SSG_VALMODE_SQLVAL, NULL_ASNAME);
+ ssg_puts (" as varchar))");
+ goto print_asname;
+ case SPAR_BIF_COALESCE:
{
ssg_valmode_t union_valmode = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
+ if (IS_BOX_POINTER (union_valmode) && (1 != union_valmode->qmfColumnCount))
+ union_valmode = SSG_VALMODE_LONG;
if (union_valmode != needed)
ssg_print_valmoded_scalar_expn (ssg, tree, needed, union_valmode, NULL_ASNAME);
else
@@ -3519,32 +3601,39 @@ expanded_sameterm_ready:
}
ssg_putchar (')'); ssg->ssg_indent--;
}
+ goto print_asname;
+ }
+ case SPAR_BIF_IF:
+ {
+ const char *nested_asname = (IS_BOX_POINTER (asname) ? NULL_ASNAME : asname);
+ 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 (");
+ ssg_print_scalar_expn (ssg, tree->_.builtin.args[2], needed, nested_asname);
+ ssg_puts (") else (");
+ ssg_print_scalar_expn (ssg, tree->_.builtin.args[1], needed, nested_asname);
+ ssg_puts (") end"); ssg->ssg_indent--;
+ if (nested_asname != asname)
+ goto print_asname;
return;
}
- 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 (");
- ssg_print_scalar_expn (ssg, tree->_.builtin.args[2], needed, NULL_ASNAME);
- ssg_puts (") else (");
- ssg_print_scalar_expn (ssg, tree->_.builtin.args[1], needed, NULL_ASNAME);
- ssg_puts (") end"); ssg->ssg_indent--;
- return;
case IN_L:
if ((SSG_VALMODE_BOOL != needed) && (SSG_VALMODE_NUM != needed) && (SSG_VALMODE_SQLVAL != needed) && (SSG_VALMODE_LONG != needed))
{
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_BOOL, NULL_ASNAME);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_BOOL, asname);
return;
}
switch (BOX_ELEMENTS (tree->_.builtin.args))
{
- case 1: ssg_puts (/*top_filter_op ? " (1=2)" :*/ " 0"); return;
+ case 1:
+ ssg_puts (/*top_filter_op ? " (1=2)" :*/ " 0");
+ goto print_asname;
case 2:
if (SPAR_IS_LIT_OR_QNAME (tree->_.builtin.args[1]))
{
SPART *eq = spartlist (ssg->ssg_sparp, 3, BOP_EQ, arg1, tree->_.builtin.args[1]);
ssg_print_bop_bool_expn (ssg, eq, " = ", " equ (", top_filter_op, needed);
- return;
+ goto print_asname;
}
default: break;
}
@@ -3599,133 +3688,184 @@ IN_op_fnt_found:
{
switch (argctr)
{
- case 0: ssg_puts (top_filter_op ? " (" : " position ("); break;
- case 1: ssg_puts (top_filter_op ? " in (" : ", vector ("); break;
- default: ssg_puts (" ,");
+ case 0: ssg_puts (top_filter_op ? " (" : " ( one_of_these ("); break;
+ case 1: ssg_puts (top_filter_op ? " in (" : ", "); break;
+ default: ssg_puts (", ");
}
ssg_print_scalar_expn (ssg, argN, op_fmt, NULL_ASNAME);
}
END_DO_BOX_FAST;
ssg_puts ("))");
- return;
- case isBLANK_L:
+ goto print_asname;
+ case SPAR_BIF_ISBLANK:
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);
+ {
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_BOOL, asname);
+ return;
+ }
else
{
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 isBLANK");
- return;
+ goto print_asname;
}
if (IS_BOX_POINTER (arg1_native))
{
const char *tmpl = ((top_filter_op || (NULL == arg1_native->qmf01blankOfShortTmpl)) ?
arg1_native->qmfIsblankOfShortTmpl : arg1_native->qmf01blankOfShortTmpl );
- ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
+ 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);
}
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 );
+ NULL, NULL, arg1, NULL_ASNAME );
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
spar_sqlprint_error ("ssg_" "print_builtin_expn(): bad native type for isBLANK()");
+ goto print_asname;
}
- return;
+ goto print_asname;
case LANG_L:
if (SSG_VALMODE_SQLVAL != needed)
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_SQLVAL, NULL_ASNAME);
- else
{
- arg1_restr_bits = sparp_restr_bits_of_expn (ssg->ssg_sparp, arg1);
- if (arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_LONG_EQ_SQL | SPART_VARR_ALWAYS_NULL))
- {
- ssg_puts_with_comment (" NULL", "optimized LANG");
- return;
- }
- ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_LANGUAGE, NULL_ASNAME);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_SQLVAL, asname);
+ return;
+ }
+ arg1_restr_bits = sparp_restr_bits_of_expn (ssg->ssg_sparp, arg1);
+ if (arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_LONG_EQ_SQL | SPART_VARR_ALWAYS_NULL))
+ {
+ ssg_puts_with_comment (" NULL", "optimized LANG");
+ goto print_asname;
}
+ ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_LANGUAGE, asname);
return;
- case isURI_L:
- case isIRI_L:
+ case SPAR_BIF_ISURI:
+ case SPAR_BIF_ISIRI:
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;
+ goto print_asname;
}
- if (arg1_restr_bits & SPART_VARR_IS_REF & SPART_VARR_NOT_NULL)
+ if ((arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_NOT_NULL)) == (SPART_VARR_IS_REF | SPART_VARR_NOT_NULL))
{
ssg_puts_with_comment (" 1", "optimized isIRI");
- return;
+ goto print_asname;
}
if (IS_BOX_POINTER (arg1_native))
{
const char *tmpl = ((top_filter_op || (NULL == arg1_native->qmf01uriOfShortTmpl)) ?
arg1_native->qmfIsuriOfShortTmpl : arg1_native->qmf01uriOfShortTmpl );
- ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
+ 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);
}
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 );
+ NULL, NULL, arg1, NULL_ASNAME );
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 isREF_L:
+ goto print_asname;
+ case SPAR_BIF_ISREF:
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;
+ goto print_asname;
}
- if (arg1_restr_bits & SPART_VARR_IS_REF & SPART_VARR_NOT_NULL)
+ if ((arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_NOT_NULL)) == (SPART_VARR_IS_REF | SPART_VARR_NOT_NULL))
{
ssg_puts_with_comment (" 1", "optimized isREF");
- return;
+ goto print_asname;
}
if (IS_BOX_POINTER (arg1_native))
- ssg_print_tmpl (ssg, arg1_native, arg1_native->qmfIsrefOfShortTmpl, NULL, NULL, arg1, NULL_ASNAME);
+ {
+ 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);
+ }
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)
ssg_print_tmpl (ssg, arg1_native, " DB.DBA.RDF_IS_REF (^{tree}^)", NULL, NULL, arg1, NULL_ASNAME);
else
spar_sqlprint_error ("ssg_" "print_builtin_expn(): bad native type for isREF()");
- return;
- case isLITERAL_L:
+ goto print_asname;
+ case SPAR_BIF_ISLITERAL:
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;
+ goto print_asname;
}
- if (arg1_restr_bits & SPART_VARR_IS_LIT & SPART_VARR_NOT_NULL)
+ if ((arg1_restr_bits & (SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL)) == (SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL))
{
ssg_puts_with_comment (" 1", "optimized isLITERAL");
- return;
+ goto print_asname;
}
if (IS_BOX_POINTER (arg1_native))
- ssg_print_tmpl (ssg, arg1_native, arg1_native->qmfIslitOfShortTmpl, NULL, NULL, arg1, NULL_ASNAME);
+ {
+ 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);
+ }
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 );
+ NULL, NULL, arg1, NULL_ASNAME );
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;
+ goto print_asname;
+ 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");
+ goto print_asname;
+ }
+ 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()");
+ goto print_asname;
case IRI_L:
{
if (SSG_VALMODE_BOOL == arg1_native)
@@ -3737,10 +3877,11 @@ IN_op_fnt_found:
tmpl = needed->qmfShortOfUriTmpl;
else
{
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, NULL_ASNAME);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, asname);
return;
}
- ssg_print_tmpl (ssg, needed /* not arg1_native! */, tmpl, NULL, NULL, arg1, NULL_ASNAME);
+ ssg_print_tmpl (ssg, needed /* not arg1_native! */, tmpl, NULL, NULL, arg1, asname);
+ return;
}
else if (SSG_VALMODE_SQLVAL == needed)
{
@@ -3751,15 +3892,16 @@ IN_op_fnt_found:
tmpl = arg1_native->qmfStrsqlvalOfShortTmpl;
ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
ssg_puts (", 1)");
- return;
+ goto print_asname;
}
- else if ((SSG_VALMODE_LONG == arg1_native) || (SSG_VALMODE_SQLVAL == arg1_native) || (SSG_VALMODE_AUTO == arg1_native))
+ if ((SSG_VALMODE_LONG == arg1_native) || (SSG_VALMODE_SQLVAL == arg1_native) || (SSG_VALMODE_AUTO == arg1_native))
tmpl = " __rdf_strsqlval (^{tree}^, 2)"; /* SSG_VALMODE_AUTO is here as a fallback for a query optimized down to an empty select */
else if (SSG_VALMODE_BOOL == arg1_native)
tmpl = " __bft (case (^{tree}^) when 0 then 'false' else 'true' end, 1)";
else
spar_sqlprint_error ("ssg_" "print_builtin_expn(): bad native type for STR()");
ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
+ goto print_asname;
}
else if (SSG_VALMODE_LONG == needed)
{
@@ -3777,10 +3919,13 @@ IN_op_fnt_found:
else if (SSG_VALMODE_LANGUAGE == needed)
ssg_puts (" NULL");
else
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, NULL_ASNAME);
- return;
+ {
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, asname);
+ return;
+ }
+ goto print_asname;
}
- case STR_L:
+ case SPAR_BIF_STR:
{
if (SSG_VALMODE_SQLVAL == needed)
{
@@ -3800,38 +3945,64 @@ IN_op_fnt_found:
else if (SSG_VALMODE_LANGUAGE == needed)
ssg_puts (" NULL");
else
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_SQLVAL, NULL_ASNAME);
- return;
+ {
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_SQLVAL, asname);
+ return;
+ }
+ goto print_asname;
}
- 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:
+ case SPAR_BIF_LANGMATCHES:
arg1_restr_bits = sparp_restr_bits_of_expn (ssg->ssg_sparp, arg1);
if (arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_ALWAYS_NULL))
{
ssg_puts_with_comment (" 0", "optimized LANGMATCHES");
- return;
+ goto print_asname;
}
ssg_puts (" DB.DBA.RDF_LANGMATCHES (");
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);
ssg_putchar (')');
- return;
+ goto print_asname;
default:
- spar_sqlprint_error ("ssg_" "print_builtin_expn(): unsupported builtin");
- return;
+ {
+ 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 (')');
+ }
+ goto print_asname;
+ }
+print_asname:
+ if (IS_BOX_POINTER (asname))
+ {
+#ifdef NDEBUG
+ ssg_puts (" AS ");
+#else
+ ssg_puts (" AS /*builtin*/ ");
+#endif
+ ssg_prin_id (ssg, asname);
}
}
@@ -3869,8 +4040,8 @@ sparp_find_valmode_by_name_prefix (sparp_t *sparp, caddr_t name, ssg_valmode_t d
name_begin = name+1;
else
name_begin = name;
-/* 0 1 */
-/* 0123456789012345 */
+/* 0 1 */
+/* 0123456789012345 */
if (!strncmp (name_begin, "SQLVAL::" , 8)) return SSG_VALMODE_SQLVAL;
if (!strncmp (name_begin, "LONG::" , 6)) return SSG_VALMODE_LONG;
if (!strncmp (name_begin, "BOOL::" , 6)) return SSG_VALMODE_BOOL;
@@ -3907,6 +4078,8 @@ ssg_valmode_t
sparp_rettype_of_function (sparp_t *sparp, caddr_t name, SPART *tree)
{
ssg_valmode_t res = sparp_find_valmode_by_name_prefix (sparp, name, SSG_VALMODE_SQLVAL);
+ const char *xsd_name = NULL;
+ long /* not dtp_t */ ret_dtp;
if (SSG_VALMODE_SPECIAL == res)
{
if (!strcmp (name, "SPECIAL::sql:RDF_MAKE_GRAPH_IIDS_OF_QNAMES"))
@@ -3954,32 +4127,51 @@ sparp_rettype_of_function (sparp_t *sparp, caddr_t name, SPART *tree)
bif_type_t ** bt = (bif_type_t **) id_hash_get (name_to_bif_type, (char *) &iduqname);
if (NULL != bt)
{
- switch (bt[0]->bt_dtp)
- {
- case DV_DOUBLE_FLOAT:
- case DV_SINGLE_FLOAT:
- case DV_NUMERIC:
- case DV_LONG_INT:
- case DV_DATE:
- case DV_TIME:
- case DV_DATETIME: return SSG_VALMODE_NUM;
- default: return SSG_VALMODE_SQLVAL;
- }
+ ret_dtp = bt[0]->bt_dtp;
+ goto ret_dtp_found; /* see below */
}
}
- else if (!strncmp (name, XMLSCHEMA_NS_URI, XMLSCHEMA_NS_URI_LEN))
+ else if (!strncmp (name, XMLSCHEMA_NS_URI "#", XMLSCHEMA_NS_URI_LEN + 1))
+ xsd_name = name + XMLSCHEMA_NS_URI_LEN + 1;
+ else if (!strncmp (name, "xpath:" XMLSCHEMA_NS_URI "#:", 6 + XMLSCHEMA_NS_URI_LEN + 2))
+ xsd_name = name + 6 + XMLSCHEMA_NS_URI_LEN + 2;
+ if (NULL != xsd_name)
{
- const char *localpart = name + XMLSCHEMA_NS_URI_LEN;
- if (!strcmp (localpart, uname_xmlschema_ns_uri_hash_boolean + XMLSCHEMA_NS_URI_LEN)) return SSG_VALMODE_BOOL;
- if (!strcmp (localpart, uname_xmlschema_ns_uri_hash_date + XMLSCHEMA_NS_URI_LEN)) return SSG_VALMODE_LONG;
- if (!strcmp (localpart, uname_xmlschema_ns_uri_hash_dateTime + XMLSCHEMA_NS_URI_LEN)) return SSG_VALMODE_LONG;
- if (!strcmp (localpart, uname_xmlschema_ns_uri_hash_decimal + XMLSCHEMA_NS_URI_LEN)) return SSG_VALMODE_NUM;
- if (!strcmp (localpart, uname_xmlschema_ns_uri_hash_double + XMLSCHEMA_NS_URI_LEN)) return SSG_VALMODE_NUM;
- if (!strcmp (localpart, uname_xmlschema_ns_uri_hash_float + XMLSCHEMA_NS_URI_LEN)) return SSG_VALMODE_NUM;
- if (!strcmp (localpart, uname_xmlschema_ns_uri_hash_string + XMLSCHEMA_NS_URI_LEN)) return SSG_VALMODE_LONG;
- if (!strcmp (localpart, uname_xmlschema_ns_uri_hash_time + XMLSCHEMA_NS_URI_LEN)) return SSG_VALMODE_LONG;
+ if (!strcmp (xsd_name, "boolean" )) return SSG_VALMODE_BOOL;
+ if (!strcmp (xsd_name, "date" )) return SSG_VALMODE_NUM;
+ if (!strcmp (xsd_name, "dateTime" )) return SSG_VALMODE_NUM;
+ if (!strcmp (xsd_name, "decimal" )) return SSG_VALMODE_NUM;
+ if (!strcmp (xsd_name, "double" )) return SSG_VALMODE_NUM;
+ if (!strcmp (xsd_name, "float" )) return SSG_VALMODE_NUM;
+ if (!strcmp (xsd_name, "string" )) return SSG_VALMODE_LONG;
+ if (!strcmp (xsd_name, "time" )) return SSG_VALMODE_NUM;
+ }
+ if (!strncmp (name, "xpath:", 6))
+ {
+ char *colonized_funname = name + 6;
+ xpf_metadata_t ** metas_ptr = (xpf_metadata_t **)id_hash_get (xpf_metas, (caddr_t)(&colonized_funname));
+ if (NULL != metas_ptr)
+ {
+ ret_dtp = metas_ptr[0]->xpfm_res_dtp;
+ goto ret_dtp_found; /* see below */
+ }
}
return SSG_VALMODE_SQLVAL /* not "return res" */;
+
+ret_dtp_found:
+ switch (ret_dtp)
+ {
+ case DV_DOUBLE_FLOAT:
+ case DV_SINGLE_FLOAT:
+ case DV_NUMERIC:
+ case DV_LONG_INT:
+ case DV_DATE:
+ case DV_TIME:
+ case DV_DATETIME: return SSG_VALMODE_NUM;
+ case XPDV_BOOL: return SSG_VALMODE_BOOL;
+ default: break;
+ }
+ return SSG_VALMODE_SQLVAL;
}
@@ -4343,7 +4535,6 @@ ssg_print_valmoded_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t n
return;
}
}
-
if ((SPAR_RETVAL == SPART_TYPE (tree)) && tree->_.retval.optional_makes_nullable &&
/* checked above: IS_BOX_POINTER (native) && */ (native->qmfValRange.rvrRestrictions & SPART_VARR_NOT_NULL) )
{
@@ -4385,6 +4576,7 @@ 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;
}
@@ -4463,15 +4655,17 @@ 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 = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
+ needed = native = 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;
case BOP_OR: ssg_print_bop_bool_expn (ssg, tree, " OR " , " __or (" , 0, needed); goto print_asname;
+ case SPAR_BOP_EQ: /* no break */
case BOP_EQ: ssg_print_bop_bool_expn (ssg, tree, " = " , " equ (" , 0, needed); goto print_asname;
case BOP_NEQ: ssg_print_bop_bool_expn (ssg, tree, " <> " , " neq (" , 0, needed); goto print_asname;
case BOP_LT: ssg_print_bop_bool_expn (ssg, tree, " < " , " lt (" , 0, needed); goto print_asname;
@@ -4510,16 +4704,6 @@ 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);
@@ -4527,15 +4711,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 */
{
- ssg_valmode_t vmode;
- vmode = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
- if (vmode == needed)
+ if (NULL == native)
+ native = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
+ if (native == needed)
{
ssg_putchar (' ');
ssg_prin_id (ssg, tree->_.var.vname);
goto print_asname; /* see below */
}
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, vmode, asname);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, native, asname);
}
else
{
@@ -4554,20 +4738,19 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
gp = sparp_find_gp_by_alias (ssg->ssg_sparp, tree->_.var.selid);
if ((NULL == gp) && (SPART_VARR_EXPORTED & tree->_.var.rvr.rvrRestrictions))
gp = ssg->ssg_tree->_.req_top.pattern;
- if ((NULL != gp) && (gp != eq->e_gp))
+ if ((NULL != gp) && (gp != eq->e_gp) && (NULL == ssg->ssg_parent_ssg))
spar_internal_error (ssg->ssg_sparp, "ssg_ " "print_scalar_expn(): mismatch between old and new methods for gp");
#endif
gp = eq->e_gp;
#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:
{
- ssg_print_builtin_expn (ssg, tree, 0, needed);
- goto print_asname;
+ ssg_print_builtin_expn (ssg, tree, 0, needed, asname);
+ return;
}
case SPAR_CONV:
{
@@ -4584,7 +4767,8 @@ 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;
- ssg_valmode_t native = sparp_rettype_of_function (ssg->ssg_sparp, tree->_.funcall.qname, tree);
+ if (NULL == native)
+ 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);
@@ -4594,7 +4778,7 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
parser_desc = function_is_xqf_str_parser (tree->_.funcall.qname);
if (NULL != parser_desc)
{
- const char *cvtname;
+ const char *cvtname;
if ((NULL != parser_desc->p_sql_cast_type) && (1 == arg_count))
{
ssg_puts (" CAST (");
@@ -4750,7 +4934,8 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
}
if (SSG_VALMODE_NUM == needed)
{
- ssg_valmode_t native = sparp_lit_native_valmode (tree);
+ if (NULL == native)
+ native = sparp_lit_native_valmode (tree);
if (SSG_VALMODE_NUM == native)
ssg_print_literal_as_sqlval (ssg, NULL, tree);
else
@@ -4830,7 +5015,7 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
#ifdef NDEBUG
ssg_puts (" __bft (");
#else
- ssg_puts (" __box_flags_tweak (");
+ ssg_puts (" __bft (");
#endif
ssg_print_literal_as_sqlval (ssg, NULL, tree);
ssg_puts (", 1)");
@@ -4844,13 +5029,14 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
goto print_asname;
case SPAR_RETVAL:
{
- ssg_valmode_t vmode = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
- if (vmode != needed)
+ if (NULL == native)
+ native = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
+ if (native != needed)
{
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, vmode, asname);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, native, asname);
return;
}
- ssg_print_retval (ssg, tree, vmode, asname);
+ ssg_print_retval (ssg, tree, native, asname);
return;
}
case SPAR_QM_SQL_FUNCALL:
@@ -4877,7 +5063,9 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
}
goto print_asname;
}
- if ((SSG_VALMODE_SQLVAL != needed) && (SSG_VALMODE_LONG != needed) && (SSG_VALMODE_NUM != needed))
+ /*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))
{
ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, asname);
return;
@@ -4916,27 +5104,22 @@ print_asname:
}
void
-ssg_print_service_rset_item (spar_sqlgen_t *ssg, SPART *service_gp, caddr_t selid, caddr_t e_varname)
+ssg_print_sinv_rset_item (spar_sqlgen_t *ssg, caddr_t selid, int pos, caddr_t e_varname)
{
- int pos = -1;
char buf[50];
- SPART *sinv = sparp_get_option (ssg->ssg_sparp, service_gp->_.gp.options, SPAR_SERVICE_INV);
- DO_BOX_FAST_REV (caddr_t, vname, pos, sinv->_.sinv.rset_varnames)
- {
- if (!strcmp (e_varname, vname))
-break;
- }
- END_DO_BOX_FAST_REV;
- if (0 > pos)
- spar_internal_error (ssg->ssg_sparp, "ssg_" "print_service_rset_item(): service retval not in rset_varnames");
#ifdef NDEBUG
ssg_putchar (' ');
#else
ssg_puts (" /*sinv[*/ ");
#endif
- ssg_prin_id (ssg, selid);
- sprintf (buf, ".rset[%d] ", pos);
- ssg_puts (buf);
+ if (-1 == pos)
+ ssg_puts (" NULL ");
+ else
+ {
+ ssg_prin_id (ssg, selid);
+ sprintf (buf, ".rset[%d] ", pos);
+ ssg_puts (buf);
+ }
#ifndef NDEBUG
ssg_puts ("/*]sinv*/ ");
#endif
@@ -4966,10 +5149,11 @@ ssg_print_retval (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t vmode, const ch
goto print_asname; /* see below */
}
if (SERVICE_L == tree->_.retval.gp->_.gp.subtype)
- {
- ssg_print_service_rset_item (ssg, tree->_.retval.gp, tree->_.retval.selid, e_varname);
- goto print_asname; /* see below */
- }
+ {
+ int pos = sparp_find_sinv_rset_pos_of_varname (ssg->ssg_sparp, tree->_.retval.gp, e_varname);
+ ssg_print_sinv_rset_item (ssg, tree->_.retval.selid, pos, e_varname);
+ goto print_asname; /* see below */
+ }
}
if (IS_BOX_POINTER (vmode) && (1 < vmode->qmfColumnCount) && (IS_BOX_POINTER (asname) || (NULL == asname)))
{
@@ -5079,6 +5263,7 @@ ssg_print_filter_expn (spar_sqlgen_t *ssg, SPART *tree)
{
case BOP_AND: ssg_print_bop_bool_expn (ssg, tree, " AND " , " __and (" , 1, SSG_VALMODE_BOOL); return;
case BOP_OR: ssg_print_bop_bool_expn (ssg, tree, " OR " , " __or (" , 1, SSG_VALMODE_BOOL); return;
+ case SPAR_BOP_EQ: /* no break */
case BOP_EQ: ssg_print_bop_bool_expn (ssg, tree, " = " , " equ (" , 1, SSG_VALMODE_BOOL); return;
case BOP_NEQ: ssg_print_bop_bool_expn (ssg, tree, " <> " , " neq (" , 1, SSG_VALMODE_BOOL); return;
case BOP_LT: ssg_print_bop_cmp_expn (ssg, tree, " < " , " lt (" , 1, SSG_VALMODE_BOOL); return;
@@ -5096,7 +5281,7 @@ ssg_print_filter_expn (spar_sqlgen_t *ssg, SPART *tree)
return;
case SPAR_BUILT_IN_CALL:
{
- ssg_print_builtin_expn (ssg, tree, 1, SSG_VALMODE_BOOL);
+ ssg_print_builtin_expn (ssg, tree, 1, SSG_VALMODE_BOOL, NULL_ASNAME);
return;
}
default: break;
@@ -5276,12 +5461,14 @@ ssg_print_fld_lit_restrictions (spar_sqlgen_t *ssg, quad_map_t *qmap, qm_value_t
void
ssg_print_fld_uri_restrictions (spar_sqlgen_t *ssg, quad_map_t *qmap, qm_value_t *field, caddr_t tabid, caddr_t uri, SPART *triple, int fld_idx, int print_outer_filter)
{
-#ifndef NDEBUG
- SPART *fld_tree = triple->_.triple.tr_fields [fld_idx];
-#endif
SPART_buf rv_buf;
SPART *rv = NULL;
ptrlong field_restr = field->qmvFormat->qmfValRange.rvrRestrictions;
+#ifndef NDEBUG
+#if 0
+ SPART *fld_tree = triple->_.triple.tr_fields [fld_idx];
+#endif
+#endif
if (SPARP_FIXED_AND_NOT_NULL(field_restr) && (SPART_VARR_IS_REF & field_restr))
{
if (DVC_MATCH == cmp_boxes ((caddr_t)(field->qmvFormat->qmfValRange.rvrFixedValue), uri, NULL, NULL))
@@ -5368,13 +5555,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_grab.rgc_sa_preds) &&
+ if ((NULL != env->spare_src.ssrc_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_grab.rgc_sa_vars, fld_tree->_.var.vname)) ||
- (0 <= dk_set_position_of_string (env->spare_grab.rgc_vars, fld_tree->_.var.vname)) ) )
+ ((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)) ) )
{
/* 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.
@@ -5449,35 +5636,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,
- spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)BOUND_L, t_list (1, retval)),
+ sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)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,
- spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isBLANK_L, t_list (1, retval)),
+ sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISBLANK, (SPART **)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,
- spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isIRI_L, t_list (1, retval)),
+ sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISIRI, (SPART **)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,
- spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isREF_L, t_list (1, retval)),
+ sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISREF, (SPART **)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,
- spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isLITERAL_L, t_list (1, retval)),
+ sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISLITERAL, (SPART **)t_list (1, retval)),
SSG_VALMODE_BOOL, NULL_ASNAME);
}
/*!!! TBD: checks for type, lang */
@@ -5579,27 +5766,27 @@ ssg_print_equiv_retval_expn (spar_sqlgen_t *ssg, SPART *gp, sparp_equiv_t *eq, i
ssg_find_global_in_equiv (eq, &vartree, &varname);
if (NULL == varname)
spar_internal_error (NULL, "ssg_print_equiv_retval_expn(): no global varname in global equiv");
- if (NULL == native)
+ if (NULL == native)
{
if (NULL != vartree)
native = sparp_expn_native_valmode (ssg->ssg_sparp, vartree);
else
native = sparp_rettype_of_global_param (ssg->ssg_sparp, varname);
}
- if (needed == native)
- {
+ if (needed == native)
+ {
if (NULL != vartree)
- ssg_print_global_param (ssg, vartree, needed);
+ ssg_print_global_param (ssg, vartree, needed);
else
ssg_print_global_param_name (ssg, varname);
- goto write_assuffix;
- }
- else
- {
- ssg_print_valmoded_scalar_expn (ssg, vartree, needed, native, asname);
- return 1;
- }
+ goto write_assuffix;
}
+ else
+ {
+ ssg_print_valmoded_scalar_expn (ssg, vartree, needed, native, asname);
+ return 1;
+ }
+ }
if (SPART_VARR_EXTERNAL & eq->e_rvr.rvrRestrictions)
{
SPART *vartree;
@@ -5708,6 +5895,8 @@ ssg_print_equiv_retval_expn (spar_sqlgen_t *ssg, SPART *gp, sparp_equiv_t *eq, i
SPART_buf rv_buf;
SPART *rv;
SPART_AUTO (rv, rv_buf, SPAR_RETVAL);
+ if ((SERVICE_L == gp->_.gp.subtype) && (-1 == sparp_find_sinv_rset_pos_of_varname (ssg->ssg_sparp, gp, eq->e_varnames[0])))
+ goto try_write_null;
rv->_.retval.equiv_idx = eq->e_own_idx;
sparp_rvr_copy (ssg->ssg_sparp, &(rv->_.retval.rvr), &(eq->e_rvr));
rv->_.retval.selid = gp->_.gp.selid;
@@ -5718,7 +5907,7 @@ ssg_print_equiv_retval_expn (spar_sqlgen_t *ssg, SPART *gp, sparp_equiv_t *eq, i
if (SSG_VALMODE_AUTO == native)
{
if (native == needed)
- name_as_expn = rv->_.retval.vname;
+ name_as_expn = rv->_.retval.vname;
else if (rv->_.retval.rvr.rvrRestrictions & SPART_VARR_ALWAYS_NULL)
native = SSG_VALMODE_NUM;
}
@@ -5878,12 +6067,36 @@ 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 */;
- if ((eq->e_replaces_filter) && (0 == eq->e_gspo_uses) &&
+ /* 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) &&
((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");
@@ -5940,38 +6153,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 = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(isIRI_L), t_list (1, sample_var));
+ SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISIRI, (SPART **)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);
+ ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL, NULL_ASNAME);
}
else if (SPART_VARR_IS_BLANK & restrs_not_filtered_in_subqs)
{
- SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(isBLANK_L), t_list (1, sample_var));
+ SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISBLANK, (SPART **)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);
+ ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL, NULL_ASNAME);
}
else if (SPART_VARR_IS_REF & restrs_not_filtered_in_subqs)
{
- SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(isREF_L), t_list (1, sample_var));
+ SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISREF, (SPART **)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);
+ ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL, NULL_ASNAME);
}
else if (SPART_VARR_IS_LIT & restrs_not_filtered_in_subqs)
{
- SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(isLITERAL_L), t_list (1, sample_var));
+ SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISLITERAL, (SPART **)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);
+ ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL, NULL_ASNAME);
}
else if (SPART_VARR_NOT_NULL & restrs_not_filtered_in_subqs)
{
- SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(BOUND_L), t_list (1, sample_var));
+ SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)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);
+ ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL, NULL_ASNAME);
}
else if (SPART_VARR_ALWAYS_NULL & restrs_not_filtered_in_subqs)
{
SPART *not_builtin = spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(BOUND_L), t_list (1, sample_var)),
+ sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)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);
@@ -6087,7 +6300,7 @@ print_cross_equs:
if (!print_cross_join_conds)
{
if (!print_inner_filter_conds)
- return;
+ return;
goto print_sub_eq_sub; /* see below */
}
for (var_ctr = 0; var_ctr < eq->e_var_count; var_ctr++)
@@ -6336,7 +6549,7 @@ print_sub_eq_sub:
weak_eq_skipped++;
if (!retry_count)
continue;
- }
+ }
sub_native = sparp_equiv_native_valmode (ssg->ssg_sparp, sub_gp, sub_eq);
sub2_native = sparp_equiv_native_valmode (ssg->ssg_sparp, sub2_gp, sub2_eq);
common_native = ssg_largest_eq_valmode (sub_native, sub2_native);
@@ -6467,6 +6680,7 @@ ssg_print_retval_simple_expn (spar_sqlgen_t *ssg, SPART *gp, SPART *tree, ssg_va
{
case BOP_AND: ssg_print_retval_bop_calc_expn (ssg, gp, tree, " __and (" , ", ", ")" , 0, needed); goto print_asname;
case BOP_OR: ssg_print_retval_bop_calc_expn (ssg, gp, tree, " __or (" , ", ", ")" , 0, needed); goto print_asname;
+ case SPAR_BOP_EQ: /* no break */
case BOP_EQ: ssg_print_retval_bop_calc_expn (ssg, gp, tree, " equ (" , ", ", ")" , 0, needed); goto print_asname;
case BOP_NEQ: ssg_print_retval_bop_calc_expn (ssg, gp, tree, " neq (" , ", ", ")" , 0, needed); goto print_asname;
case BOP_LT: ssg_print_retval_bop_calc_expn (ssg, gp, tree, " lt (" , ", ", ")" , 1, needed); goto print_asname;
@@ -6511,10 +6725,10 @@ ssg_print_retval_simple_expn (spar_sqlgen_t *ssg, SPART *gp, SPART *tree, ssg_va
int bigtext, arg_ctr, arg_count = BOX_ELEMENTS (tree->_.funcall.argtrees);
xqf_str_parser_desc_t *parser_desc;
ssg_valmode_t native = sparp_rettype_of_function (ssg->ssg_sparp, tree->_.funcall.qname, tree);
- if (((SSG_VALMODE_SHORT_OR_LONG == needed) && (SSG_VALMODE_LONG == native)) ||
- ((SSG_VALMODE_NUM == needed) && (SSG_VALMODE_SQLVAL == native)) ||
- ((SSG_VALMODE_SQLVAL == needed) && (SSG_VALMODE_NUM == native)) ||
- ((SSG_VALMODE_LONG == needed) && (SSG_VALMODE_NUM == native)) )
+ if (((SSG_VALMODE_SHORT_OR_LONG == needed) && ((SSG_VALMODE_LONG == native) || (SSG_VALMODE_NUM == native) || (SSG_VALMODE_BOOL == native))) ||
+ ((SSG_VALMODE_NUM == needed) && ((SSG_VALMODE_SQLVAL == native) || (SSG_VALMODE_BOOL == native))) ||
+ ((SSG_VALMODE_SQLVAL == needed) && ((SSG_VALMODE_NUM == native) || (SSG_VALMODE_BOOL == native))) ||
+ ((SSG_VALMODE_LONG == needed) && ((SSG_VALMODE_NUM == native) || (SSG_VALMODE_BOOL == native))) )
needed = native;
else if (needed != native)
{
@@ -6649,6 +6863,74 @@ print_asname:
}
}
+const char *
+ssg_sqltype_of_restr (spar_sqlgen_t *ssg, ptrlong restr_bits)
+{
+ if (restr_bits & (SPART_VARR_CONFLICT | SPART_VARR_ALWAYS_NULL))
+ return "INTEGER";
+ if (restr_bits & SPART_VARR_IS_REF)
+ return "VARCHAR";
+ return NULL;
+}
+
+
+static const char *xsd2sql_names[] = {
+ "anyURI" , "VARCHAR" ,
+ "boolean" , "INTEGER" ,
+ "byte" , "INTEGER" ,
+ "char" , "VARCHAR" ,
+ "date" , "DATE" ,
+ "dateTime" , "DATETIME" ,
+ "decimal" , "DECIMAL" ,
+ "double" , "DOUBLE PRECISION" ,
+ "float" , "REAL" ,
+ "int" , "INTEGER" ,
+ "int16" , "INTEGER" ,
+ "int32" , "INTEGER" ,
+ "int64" , "INTEGER" ,
+ "integer" , "INTEGER" ,
+ "long" , "INTEGER" ,
+ "numeric" , "DECIMAL" ,
+ "string" , "VARCHAR" ,
+ "time" , "TIME" ,
+ "unsignedInt" , "INTEGER" ,
+ "unsignedInt32" , "INTEGER" ,
+ "unsignedInt64" , "INTEGER" ,
+ "unsignedLong" , "INTEGER" ,
+ "unsignedShort" , "INTEGER" };
+
+const char *
+ssg_sqltype_of_valmode (spar_sqlgen_t *ssg, ssg_valmode_t vmode)
+{
+ if (IS_BOX_POINTER (vmode))
+ {
+ const char *res;
+ ccaddr_t dt_iri = vmode->qmfValRange.rvrDatatype;
+ if (NULL != dt_iri)
+ {
+ if (!strncmp (dt_iri, uname_xmlschema_ns_uri_hash, strlen (uname_xmlschema_ns_uri_hash)))
+ {
+ int pos = ecm_find_name (dt_iri + strlen (uname_xmlschema_ns_uri_hash), xsd2sql_names, sizeof (xsd2sql_names)/(2*sizeof (caddr_t)), 2*sizeof (caddr_t));
+ if (0 <= pos)
+ return xsd2sql_names[2 * pos + 1];
+ }
+ }
+ if (NULL != vmode->qmfValRange.rvrLanguage)
+ return " VARCHAR"; /* Whitespace before VARCHAR is an intentional trick */
+ res = ssg_sqltype_of_restr (ssg, vmode->qmfValRange.rvrRestrictions);
+ if (NULL != res)
+ return res;
+ }
+ if (SSG_VALMODE_BOOL == vmode)
+ return "INTEGER";
+ if (SSG_VALMODE_NUM == vmode)
+ return "DECIMAL";
+ if (SSG_VALMODE_DATATYPE == vmode)
+ return " VARCHAR";
+ if (SSG_VALMODE_LANGUAGE == vmode)
+ return " VARCHAR";
+ return NULL;
+}
void
ssg_print_retval_expn (spar_sqlgen_t *ssg, SPART *gp, SPART *ret_column, int col_idx, int flags, SPART *auto_valmode_gp, ssg_valmode_t needed)
@@ -6658,6 +6940,7 @@ ssg_print_retval_expn (spar_sqlgen_t *ssg, SPART *gp, SPART *ret_column, int col
caddr_t var_name = NULL;
const char *asname = NULL_ASNAME;
sparp_equiv_t *eq;
+ char asname_buf[30];
if (flags & SSG_RETVAL_NAME_INSTEAD_OF_TREE)
asname = var_name = (caddr_t) ret_column;
else if (flags & (SSG_RETVAL_USES_ALIAS | SSG_RETVAL_SUPPRESSED_ALIAS))
@@ -6675,18 +6958,46 @@ ssg_print_retval_expn (spar_sqlgen_t *ssg, SPART *gp, SPART *ret_column, int col
(SPART **) t_list (1, ret_column) );
var_name = NULL;
}
+ if ((NULL_ASNAME == asname) && (NULL != var_name) && (flags & SSG_RETVAL_STRICT_TYPES))
+ asname = var_name;
+ else if ((NULL_ASNAME == asname) && (NULL == var_name) && (flags & (SSG_RETVAL_USES_ALIAS | SSG_RETVAL_STRICT_TYPES)))
+ {
+ snprintf (asname_buf, sizeof (asname_buf), "callret-%d", col_idx);
+ asname = asname_buf;
+ }
+ if (flags & SSG_RETVAL_STRICT_TYPES)
+ {
+ ssg_valmode_t ret_vmode = needed;
+ const char *sqltype;
+ if (!IS_BOX_POINTER (ret_vmode))
+ ret_vmode = sparp_expn_native_valmode (ssg->ssg_sparp, ret_column); /* This is a special case of value returned from SPARQL subquery where AUTO valmode is set. */
+ sqltype = ssg_sqltype_of_valmode (ssg, ret_vmode);
+ if (NULL == sqltype)
+ sqltype = ssg_sqltype_of_restr (ssg, sparp_restr_bits_of_expn (ssg->ssg_sparp, ret_column));
+ if ((NULL == sqltype) || (' ' == sqltype[0]))
+ {
+ ssg_puts (" CAST (");
+ ssg->ssg_indent++;
+ ssg_print_retval_simple_expn (ssg, gp, ret_column, needed, NULL);
+ ssg_puts (" AS VARCHAR)");
+ ssg->ssg_indent--;
+ ssg_print_asname_tail ("typed retexpn", asname);
+ }
+ else
+ {
+ ssg_print_retval_simple_expn (ssg, gp, ret_column, needed, NULL);
+ ssg_print_asname_tail ("typed retexpn", asname);
+ ssg_putchar (' ');
+ ssg_puts (sqltype);
+ }
+ return;
+ }
if (NULL == var_name)
{
if (SSG_VALMODE_AUTO == needed)
needed = sparp_expn_native_valmode (ssg->ssg_sparp, ret_column); /* This is a special case of value returned from SPARQL subquery where AUTO valmode is set. */
if (SSG_VALMODE_AUTO == needed)
spar_sqlprint_error ("ssg_" "print_retval_expn(): SSG_VALMODE_AUTO for not a variable and no way to find a type");
- if ((NULL_ASNAME == asname) && (flags & SSG_RETVAL_USES_ALIAS))
- {
- char buf[30];
- snprintf (buf, sizeof (buf), "callret-%d", col_idx);
- asname = buf;
- }
ssg_print_retval_simple_expn (ssg, gp, ret_column, needed, asname);
return;
}
@@ -6706,15 +7017,7 @@ ssg_print_retval_expn (spar_sqlgen_t *ssg, SPART *gp, SPART *ret_column, int col
#else
ssg_puts (" 1 /*fake*/");
#endif
- if (NULL != asname)
- {
-#ifdef NDEBUG
- ssg_puts (" AS ");
-#else
- ssg_puts (" AS /*retexpn*/ ");
-#endif
- ssg_prin_id (ssg, asname);
- }
+ ssg_print_asname_tail ("retexpn", asname);
return;
}
eq = sparp_equiv_get_ro (ssg->ssg_equivs, ssg->ssg_equiv_count, gp, (SPART *)var_name, eq_flags);
@@ -6787,6 +7090,7 @@ ssg_print_retval_list (spar_sqlgen_t *ssg, SPART *gp, SPART **retlist, int res_l
int memb_ctr, res_ctr;
dk_set_t saved_valid_ret_selids = ssg->ssg_valid_ret_selids;
dk_set_t saved_valid_ret_tabids = ssg->ssg_valid_ret_tabids;
+ /* Note that there's no such thing as saved_outer_valid_ret_selids/tabids */
if (0 == res_len)
{
if (SSG_VALMODE_SQLVAL == needed)
@@ -6807,15 +7111,20 @@ ssg_print_retval_list (spar_sqlgen_t *ssg, SPART *gp, SPART **retlist, int res_l
if ((NULL != retlist_restr_bits) && !(flags & SSG_RETVAL_USES_ALIAS))
spar_internal_error (ssg->ssg_sparp, "Inconsistent retval list: bits without aliases");
#endif
- DO_BOX_FAST_REV (SPART *, memb, memb_ctr, gp->_.gp.members)
+ if ((0 == gp->_.gp.subtype) || (WHERE_L == gp->_.gp.subtype) || (OPTIONAL_L == gp->_.gp.subtype))
{
- switch (memb->type)
+ DO_BOX_FAST_REV (SPART *, memb, memb_ctr, gp->_.gp.members)
{
- case SPAR_GP: t_set_push (&(ssg->ssg_valid_ret_selids), memb->_.gp.selid); break;
- case SPAR_TRIPLE: t_set_push (&(ssg->ssg_valid_ret_tabids), memb->_.triple.tabid); break;
+ switch (memb->type)
+ {
+ case SPAR_GP: t_set_push (&(ssg->ssg_valid_ret_selids), memb->_.gp.selid); break;
+ case SPAR_TRIPLE: t_set_push (&(ssg->ssg_valid_ret_tabids), memb->_.triple.tabid); break;
+ }
}
+ END_DO_BOX_FAST_REV;
}
- END_DO_BOX_FAST_REV;
+ else
+ t_set_push (&(ssg->ssg_valid_ret_selids), gp->_.gp.selid);
for (res_ctr = 0; res_ctr < res_len; res_ctr++)
{
SPART *ret_column = retlist[res_ctr];
@@ -6825,7 +7134,7 @@ ssg_print_retval_list (spar_sqlgen_t *ssg, SPART *gp, SPART **retlist, int res_l
ssg_newline (1);
}
ssg_print_retval_expn (ssg, gp, ret_column, res_ctr, flags, auto_valmode_gp, needed);
- if ((NULL != retlist_restr_bits) && (!(retlist_restr_bits[res_ctr] & SPART_VARR_IS_REF)))
+ if ((NULL != retlist_restr_bits) && (!(retlist_restr_bits[res_ctr] & SPART_VARR_IS_REF)) && (!(flags & SSG_RETVAL_STRICT_TYPES)))
ssg_puts (" ANY");
}
ssg->ssg_indent--;
@@ -6836,7 +7145,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 == (box_t)(1)) /* The filter has been disabled because it's printed already */
+ if (tree == (SPART *)(1)) /* The filter has been disabled because it's printed already */
return;
if (spar_filter_is_freetext (ssg->ssg_sparp, tree, NULL))
{
@@ -6941,12 +7250,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_named_graphs_listed)
- chk_graphs = ssg->ssg_sparp->sparp_env->spare_default_graphs;
+ if (ssg->ssg_sparp->sparp_env->spare_src.ssrc_named_graphs_listed)
+ chk_graphs = ssg->ssg_sparp->sparp_env->spare_src.ssrc_default_graphs;
else chk_graphs = NULL;
}
else
- chk_graphs = ssg->ssg_sparp->sparp_env->spare_named_graphs;
+ chk_graphs = ssg->ssg_sparp->sparp_env->spare_src.ssrc_named_graphs;
DO_SET (SPART *,src, &(chk_graphs))
{
if (!((SPART_GRAPH_NOT_FROM == src->_.graph.subtype) || (SPART_GRAPH_NOT_NAMED == src->_.graph.subtype)))
@@ -6992,6 +7301,7 @@ static void
ssg_print_fake_self_join_subexp (spar_sqlgen_t *ssg, SPART *gp, SPART ***tree_sets, int tree_set_count, int tree_count, int inside_breakup, int fld_restrictions_bitmask)
{
SPART *very_first_tree = tree_sets[0][0];
+ SPART *lim = sparp_get_option (ssg->ssg_sparp, very_first_tree->_.triple.options, LIMIT_L);
caddr_t tabid = very_first_tree->_.triple.tabid;
caddr_t sub_tabid = t_box_sprintf (100, "%s-int", tabid);
int save_where_l_printed;
@@ -7034,7 +7344,11 @@ ssg_print_fake_self_join_subexp (spar_sqlgen_t *ssg, SPART *gp, SPART ***tree_se
if (NULL != colcodes)
ssg_puts (", ");
else
- ssg_puts (" (SELECT ");
+ {
+ ssg_puts (" (SELECT ");
+ if (NULL != lim)
+ ssg_print_limofs_expn (ssg, lim, NULL);
+ }
ssg_print_tr_field_expn (ssg, qmv, sub_tabid, fmt, asname);
t_set_push (&colcodes, (caddr_t)colcode);
}
@@ -7050,7 +7364,11 @@ ssg_print_fake_self_join_subexp (spar_sqlgen_t *ssg, SPART *gp, SPART ***tree_se
if (NULL != colcodes)
ssg_puts (", ");
else
- ssg_puts (" (SELECT ");
+ {
+ ssg_puts (" (SELECT ");
+ if (NULL != lim)
+ ssg_print_limofs_expn (ssg, lim, NULL);
+ }
ssg_prin_id (ssg, val->_.var.vname);
}
}
@@ -7095,7 +7413,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_FAKE_1 AS ");
+ ssg_puts (" DB.DBA.SYS_IDONLY_ONE AS ");
ssg_prin_id (ssg, tabid);
t_set_push (&(ssg->ssg_valid_ret_tabids), tabid);
ssg->ssg_indent--;
@@ -7115,7 +7433,7 @@ no_extra_ft_tables: ;
}
DO_SET (caddr_t, alias, &(ata_aliases))
{
- caddr_t atable = ata_tables_tail->data;
+ caddr_t atable = (caddr_t)(ata_tables_tail->data);
caddr_t full_alias;
if (('\0' != alias[0]) && ('!' != alias[0]))
full_alias = t_box_sprintf (210, "%.100s~%.100s", sub_tabid, alias);
@@ -7181,7 +7499,7 @@ from_printed:
if (NULL == ft_pred)
{
ft_pred = filt;
- gp->_.gp.filters[ctr] = (box_t)(1);
+ gp->_.gp.filters[ctr] = (SPART *)((void *)(1));
}
else
spar_error (ssg->ssg_sparp, "Too many %.100s() special predicates for variable %.100s, can not build an SQL query",
@@ -7380,10 +7698,13 @@ ssg_print_subquery_table_exp (spar_sqlgen_t *ssg, SPART *wrapping_gp)
subq_ssg->ssg_sparp = sub_sparp;
subq_ssg->ssg_tree = sub_sparp->sparp_expr = wrapping_gp->_.gp.subquery;
subq_ssg->ssg_wrapping_gp = wrapping_gp;
- sub_sparp->sparp_parent_sparp = NULL; /* not a scalar subquery -- no searches in surrounding query */
+ sub_sparp->sparp_parent_sparp = ssg->ssg_sparp; /* not a scalar subquery -- no searches in surrounding query, EXCEPT deeper nesting: for table subquery C of scalar subquery B of query A, access to A can be important. For this exception, the value assigned is ssg->ssg_sparp, not NULL */
sub_sparp->sparp_env = wrapping_gp->_.gp.subquery->_.req_top.shared_spare;
subq_ssg->ssg_sources = subq_ssg->ssg_tree->_.req_top.sources;
subq_ssg->ssg_out = ssg->ssg_out;
+ /* For scalar subq, both ...outer_valid_ret... and ...valid_ret... of subq_ssg are set to ...valid_ret... of ssg, for table subq they are both set to ...outer_valid_ret... of ssg */
+ subq_ssg->ssg_outer_valid_ret_selids = subq_ssg->ssg_valid_ret_selids = ssg->ssg_outer_valid_ret_selids;
+ subq_ssg->ssg_outer_valid_ret_tabids = subq_ssg->ssg_valid_ret_tabids = ssg->ssg_outer_valid_ret_tabids;
subq_ssg->ssg_indent = ssg->ssg_indent;
if (NULL != ssg->ssg_sc)
subq_ssg->ssg_sc = ssg->ssg_sc;
@@ -7414,6 +7735,7 @@ ssg_prepare_sinv_template (spar_sqlgen_t *parent_ssg, SPART *sinv, SPART *gp, ca
wchar_t *qtext_posmap;
int posmap_itm_ctr;
int define_ctr, define_count, retctr;
+ SPART *limit_expn = sparp_get_option (parent_ssg->ssg_sparp, gp->_.gp.options, LIMIT_L);
t_NEW_VARZ (spar_sqlgen_t, ssg);
parent_ssg->ssg_nested_ssg = ssg;
ssg->ssg_parent_ssg = parent_ssg;
@@ -7484,6 +7806,8 @@ ssg_prepare_sinv_template (spar_sqlgen_t *parent_ssg, SPART *sinv, SPART *gp, ca
if (0 > expn_ctr)
goto failed_single_subq_optimization; /* see below */
}
+ if ((NULL != limit_expn) && (DV_LONG_INT == DV_TYPE_OF (limit_expn)) && (0 == sparp_req_top_has_limofs (single_subq)))
+ single_subq->_.req_top.limit = limit_expn;
ssg_sdprint_tree (ssg, single_subq);
goto query_text_is_composed; /* see below */
failed_single_subq_optimization: ;
@@ -7495,11 +7819,25 @@ failed_single_subq_optimization: ;
ssg_puts (retname);
}
END_DO_BOX_FAST;
+ if (0 == BOX_ELEMENTS_0 (sinv->_.sinv.rset_varnames))
+ {
+ caddr_t stub_varname = t_box_sprintf (100, "stubvar%d", ssg->ssg_sparp->sparp_unictr++);
+ if (SSG_SD_BI_OR_SPARQL11_DRAFT & ssg->ssg_sd_flags)
+ ssg_sdprint_tree (ssg, spartlist (ssg->ssg_sparp, 4, SPAR_ALIAS, (ptrlong)1, stub_varname, SSG_VALMODE_AUTO));
+ else
+ {
+ ssg_puts (" ?"); ssg_puts (stub_varname);
+ }
+ }
/*!!!TBD FROM clauses */
gp->_.gp.subtype = WHERE_L;
ssg_sdprint_tree (ssg, gp);
gp->_.gp.subtype = SERVICE_L;
-
+ if ((NULL != limit_expn) && (DV_LONG_INT == DV_TYPE_OF (limit_expn)))
+ {
+ ssg_puts (" LIMIT");
+ ssg_print_box_as_sql_atom (ssg, (caddr_t)limit_expn, SQL_ATOM_NARROW_ONLY);
+ }
query_text_is_composed:
qtext_template_ret[0] = t_strses_string (ssg->ssg_out);
posmap_itm_ctr = dk_set_length (ssg->ssg_param_pos_set);
@@ -7675,8 +8013,17 @@ try_parent_eq:
goto param_value_is_printed; /* see below */
}
param_value_cant_be_printed: ;
+#if 0
+/* The error is not always adequate because the parameter may come from only one branch of union in
+{ gp_a UNION gp_b } . service {...}
+expanded by optimizer into
+{ gp_a service {...} } UNION { gp_b service {...} }
+and in other branch there will by no equiv for the parameter. */
spar_error (sparp, "Unable to compose an SQL code to pass parameter ?%.200s to the service <%.200s>",
varname, sinv->_.sinv.endpoint );
+#else
+ ssg_puts (" NULL /* runaway "); ssg_puts (varname); ssg_puts (" after reorder */");
+#endif
param_value_is_printed: ;
}
END_DO_BOX_FAST;
@@ -7705,8 +8052,9 @@ ssg_print_scalar_subquery_exp (spar_sqlgen_t *ssg, SPART *sub_req_top, SPART *wr
sub_sparp->sparp_env = wrapping_gp->_.gp.subquery->_.req_top.shared_spare;
subq_ssg->ssg_sources = subq_ssg->ssg_tree->_.req_top.sources;
subq_ssg->ssg_out = ssg->ssg_out;
- subq_ssg->ssg_valid_ret_selids = ssg->ssg_valid_ret_selids;
- subq_ssg->ssg_valid_ret_tabids = ssg->ssg_valid_ret_tabids;
+ /* For scalar subq, both ...outer_valid_ret... and ...valid_ret... of subq_ssg are set to ...valid_ret... of ssg, for table subq they are both set to ...outer_valid_ret... of ssg */
+ subq_ssg->ssg_outer_valid_ret_selids = subq_ssg->ssg_valid_ret_selids = ssg->ssg_valid_ret_selids;
+ subq_ssg->ssg_outer_valid_ret_tabids = subq_ssg->ssg_valid_ret_tabids = ssg->ssg_valid_ret_tabids;
subq_ssg->ssg_indent = ssg->ssg_indent;
if ((SSG_VALMODE_LONG == needed) || (SSG_VALMODE_AUTO == needed))
sub_sparp->sparp_env->spare_output_valmode_name = t_box_dv_short_string ("LONG");
@@ -7742,7 +8090,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 top 1 1 as __fake_table_col_%d from DB.DBA.RDF_QUAD) as __fake_table_%d",
+ snprintf (buf, sizeof (buf), " (select 1 as __fake_table_col_%d) as __fake_table_%d",
ssg->ssg_sparp->sparp_unictr, ssg->ssg_sparp->sparp_unictr );
ssg->ssg_sparp->sparp_unictr++;
ssg_puts (buf);
@@ -7785,7 +8133,7 @@ ssg_print_table_exp (spar_sqlgen_t *ssg, SPART *gp, SPART **trees, int tree_coun
( SSG_RETVAL_FROM_FIRST_UNION_MEMBER | SSG_RETVAL_FROM_JOIN_MEMBER |
SSG_RETVAL_USES_ALIAS | SSG_RETVAL_NAME_INSTEAD_OF_TREE | SSG_RETVAL_MUST_PRINT_SOMETHING ),
SSG_VALMODE_AUTO );
- dk_free_box (retlist);
+ dk_free_box ((caddr_t)retlist);
ssg->ssg_indent--;
ssg_puts (") AS ");
ssg_prin_id (ssg, tree->_.gp.selid);
@@ -8131,6 +8479,7 @@ ssg_print_union (spar_sqlgen_t *ssg, SPART *gp, SPART **retlist, int head_flags,
int save_where_l_printed = 0;
const char *save_where_l_text = NULL;
ptrlong *retlist_restr_bits = NULL;
+ SPART *topn_expn_to_propagate = sparp_get_option (ssg->ssg_sparp, gp->_.gp.options, LIMIT_L);
if (UNION_L == gp->_.gp.subtype)
{
members = gp->_.gp.members;
@@ -8205,13 +8554,15 @@ breakup_group_complete:
if (memb_ctr > 0)
ssg_puts ("UNION ALL ");
ssg_puts ("SELECT");
+ if (NULL != topn_expn_to_propagate)
+ ssg_print_limofs_expn (ssg, topn_expn_to_propagate, NULL);
if (0 != breakup_shift)
{
ssg_print_breakup_in_union (ssg, gp, retlist, head_flags, curr_retval_flags,
((0 < memb_ctr) ? NULL : retlist_restr_bits), needed, memb_ctr, breakup_shift );
continue;
}
- ssg_print_retval_list (ssg, members[memb_ctr], retlist, BOX_ELEMENTS_INT (retlist), curr_retval_flags,
+ ssg_print_retval_list (ssg, member, retlist, BOX_ELEMENTS_INT (retlist), curr_retval_flags,
((0 < memb_ctr) ? NULL : retlist_restr_bits), gp, needed );
retval_list_complete:
@@ -8227,33 +8578,46 @@ retval_list_complete:
ssg_print_subquery_table_exp (ssg, member);
goto end_of_where_list; /* see below */
}
+ if (SERVICE_L == member->_.gp.subtype)
+ {
+ int save_where_l_printed;
+ const char *save_where_l_text;
+ ssg_print_sinv_table_exp (ssg, member, SSG_TABLE_SELECT_PASS);
+ save_where_l_printed = ssg->ssg_where_l_printed;
+ save_where_l_text = ssg->ssg_where_l_text;
+ ssg->ssg_where_l_printed = 0;
+ ssg->ssg_where_l_text = " WHERE";
+ ssg_print_sinv_table_exp (ssg, member, SSG_TABLE_PVIEW_PARAM_PASS);
+ ssg->ssg_where_l_printed = save_where_l_printed;
+ ssg->ssg_where_l_text = save_where_l_text;
+ goto end_of_where_list; /* see below */
+ }
itm_count = BOX_ELEMENTS (member->_.gp.members);
- if (0 < itm_count)
- first_itm = member->_.gp.members[0];
- else
+ if (0 == itm_count)
{
char buf[105]; /* potentially 100 chars long see sparp_clone_id etc. */
ssg_newline (0);
snprintf (buf, sizeof (buf), "stub-%s", member->_.gp.selid);
if (SSG_PRINT_UNION_NONEMPTY_STUB & head_flags)
- ssg_puts ("(SELECT TOP 1 1 AS __stub FROM DB.DBA.RDF_QUAD) AS ");
+ ssg_puts ("(SELECT 1 as __stub) AS ");
else
- ssg_puts ("(SELECT TOP 1 1 AS __stub FROM DB.DBA.RDF_QUAD WHERE 0) AS ");
+ ssg_puts ("(SELECT TOP 1 1 AS __stub FROM DB.DBA.SYS_IDONLY_EMPTY 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';
goto end_of_table_list; /* see below */
}
- if ((OPTIONAL_L == first_itm->_.gp.subtype) || (SERVICE_L == first_itm->_.gp.subtype))
+ first_itm = member->_.gp.members[0];
+ if ((SPAR_GP == SPART_TYPE(first_itm)) && ((OPTIONAL_L == first_itm->_.gp.subtype) || (SERVICE_L == first_itm->_.gp.subtype)))
{
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 TOP 1 1 AS __stub FROM DB.DBA.RDF_QUAD) AS ");
+ ssg_puts ("(SELECT 1 AS __stub) 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)
- ssg_puts (" LEFT OUTER JOIN");
+ ssg_puts (" LEFT OUTER JOIN");
else
ssg_puts (" INNER JOIN");
need_self_joins_in_where = 'N';
@@ -8397,7 +8761,7 @@ ssg_print_t_options_of_select (spar_sqlgen_t *ssg)
case T_NO_CYCLES_L: ssg_puts (" T_NO_CYCLES"); break;
case T_NO_ORDER_L: ssg_puts (" T_NO_ORDER"); break;
case T_SHORTEST_ONLY_L: ssg_puts (" T_SHORTEST_ONLY"); break;
- case T_FINAL_AS_L: spar_error (ssg->ssg_sparp, "Option T_FINAL_AS is not supported is SPARQL in this version of Virtuoso"); break;
+ case T_FINAL_AS_L: spar_error (ssg->ssg_sparp, "Option T_FINAL_AS is not supported in SPARQL in this version of Virtuoso"); break;
default: break;
}
}
@@ -8448,7 +8812,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 && strcmp (tree->_.req_top.formatmode_name, "_JAVA_"))
+ if ((NULL != tree->_.req_top.formatmode_name) && (strcmp (tree->_.req_top.formatmode_name, "_JAVA_") && strcmp (tree->_.req_top.formatmode_name, "_UDBC_") && strcmp (tree->_.req_top.formatmode_name, "_MSACCESS_")))
return 0;
retvalmode = ssg_find_valmode_by_name (tree->_.req_top.retvalmode_name);
if ((SSG_VALMODE_SQLVAL != retvalmode) && (NULL != retvalmode))
@@ -8481,34 +8845,47 @@ ssg_make_rb_complete_wrapped (spar_sqlgen_t *ssg)
t_set_push (&(ssg->ssg_valid_ret_selids), rbc_selid);
}
-void ssg_print_limofs_expn (spar_sqlgen_t *ssg)
+void
+ssg_print_limofs_expn (spar_sqlgen_t *ssg, SPART *lim, SPART *ofs)
{
- SPART *lim = ssg->ssg_tree->_.req_top.limit;
- SPART *ofs = ssg->ssg_tree->_.req_top.offset;
if ((DV_LONG_INT == DV_TYPE_OF (lim)) && (DV_LONG_INT == DV_TYPE_OF (ofs)))
{
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 (0 != ofs_num)
- snprintf (limofs_strg, sizeof (limofs_strg), " TOP %ld, %ld", ofs_num, lim_num);
- else
- snprintf (limofs_strg, sizeof (limofs_strg), " TOP %ld", lim_num);
- ssg_puts (limofs_strg);
+ {
+ snprintf (limofs_strg, sizeof (limofs_strg), " TOP %ld, %ld", ofs_num, ((NULL == lim) ? -1 : lim_num));
+ ssg_puts (limofs_strg);
+ }
+ else if (NULL != lim)
+ {
+ snprintf (limofs_strg, sizeof (limofs_strg), " TOP %ld", lim_num);
+ ssg_puts (limofs_strg);
+ }
return;
}
ssg_puts (" TOP (");
- if ((DV_LONG_INT != DV_TYPE_OF (ofs)) || (0 != unbox ((caddr_t)(ofs))))
+ if (NULL != ofs)
{
ssg_print_scalar_expn (ssg, ofs, SSG_VALMODE_SQLVAL, NULL_ASNAME);
ssg_puts (", ");
}
- ssg_print_scalar_expn (ssg, lim, SSG_VALMODE_SQLVAL, NULL_ASNAME);
+ if (NULL != lim)
+ ssg_print_scalar_expn (ssg, lim, SSG_VALMODE_SQLVAL, NULL_ASNAME);
+ else
+ ssg_puts ("-1");
ssg_puts (")");
}
+void
+ssg_print_limofs_expn_of_top (spar_sqlgen_t *ssg)
+{
+ SPART *lim = ssg->ssg_tree->_.req_top.limit;
+ SPART *ofs = ssg->ssg_tree->_.req_top.offset;
+ ssg_print_limofs_expn (ssg, lim, ofs);
+}
+
int
ssg_expn_is_not_int_const_but_printed_as_some_const (spar_sqlgen_t *ssg, SPART *expn)
{
@@ -8548,16 +8925,48 @@ ssg_print_tail_query_options (spar_sqlgen_t *ssg)
}
void
+ssg_print_bindings (spar_sqlgen_t *ssg, SPART ***rowset, ssg_valmode_t needed)
+{
+ int rowctr, colctr;
+ ssg_puts ("vector (");
+ ssg->ssg_indent += 1;
+ DO_BOX_FAST (SPART **, single_row, rowctr, rowset)
+ {
+ if (rowctr) ssg_putchar (',');
+ ssg_newline (0);
+ ssg_puts ("vector (");
+ ssg->ssg_indent += 1;
+ DO_BOX_FAST (SPART *, val, colctr, single_row)
+ {
+ if (colctr) ssg_putchar (',');
+ if (NULL == val)
+ ssg_puts (" NULL");
+ else
+ ssg_print_scalar_expn (ssg, val, needed, NULL_ASNAME);
+ }
+ END_DO_BOX_FAST;
+ ssg_puts (")");
+ ssg->ssg_indent -= 1;
+ }
+ END_DO_BOX_FAST;
+ ssg->ssg_indent -= 1;
+ ssg_puts (")");
+}
+
+void
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;
+ SPART **bindings_vars = ssg->ssg_sparp->sparp_env->spare_bindings_vars;
SPART **retvals;
const char *formatter, *agg_formatter, *agg_meta;
ssg_valmode_t retvalmode;
+ int top_union_head_flags = SSG_PRINT_UNION_NOFIRSTHEAD | SSG_PRINT_UNION_NONEMPTY_STUB;
int top_retval_flags =
SSG_RETVAL_TOPMOST |
SSG_RETVAL_FROM_JOIN_MEMBER |
@@ -8565,7 +8974,7 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
SSG_RETVAL_MUST_PRINT_SOMETHING |
SSG_RETVAL_CAN_PRINT_NULL |
SSG_RETVAL_USES_ALIAS ;
- ccaddr_t top_selid = tree->_.req_top.pattern->_.gp.selid;
+ caddr_t top_selid = tree->_.req_top.pattern->_.gp.selid;
retvals = tree->_.req_top.retvals;
if (NULL != ssg->ssg_sparp->sparp_env->spare_storage_name)
{
@@ -8587,15 +8996,7 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
retvalmode = ssg_find_valmode_by_name (tree->_.req_top.retvalmode_name);
if (((NULL != formatter) || (NULL != agg_formatter)) && (NULL != retvalmode) && (SSG_VALMODE_LONG != retvalmode))
spar_sqlprint_error ("'output:valmode' declaration conflicts with 'output:format'");
- if ((DV_LONG_INT == DV_TYPE_OF (tree->_.req_top.limit)) && (DV_LONG_INT == DV_TYPE_OF (tree->_.req_top.offset)))
- {
- long lim = unbox ((caddr_t)(tree->_.req_top.limit));
- long ofs = unbox ((caddr_t)(tree->_.req_top.offset));
- if ((SPARP_MAXLIMIT != lim) || (0 != ofs))
- has_limofs = 1;
- }
- else
- has_limofs = 2;
+ has_limofs = sparp_req_top_has_limofs (tree);
switch (subtype)
{
case SELECT_L:
@@ -8659,11 +9060,21 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
ssg->ssg_indent += 1;
ssg_newline (0);
}
+ if ((NULL != tree->_.req_top.formatmode_name) && !strcmp ("_MSACCESS_", tree->_.req_top.formatmode_name))
+ top_retval_flags |= SSG_RETVAL_STRICT_TYPES;
+ if (NULL != bindings_vars)
+ {
+ ssg_puts ("SELECT ");
+ ssg_print_retval_cols (ssg, tree, retvals, t_box_dv_short_string ("bnd1"), NULL, 0);
+ ssg_puts (" FROM (");
+ ssg->ssg_indent += 1;
+ ssg_newline (0);
+ }
ssg_puts ("SELECT");
if ((COUNT_DISTINCT_L == tree->_.req_top.subtype) || (DISTINCT_L == tree->_.req_top.subtype))
ssg_puts (" DISTINCT");
if (has_limofs)
- ssg_print_limofs_expn (ssg);
+ ssg_print_limofs_expn_of_top (ssg);
if ((NULL != ssg->ssg_wrapping_gp) && (NULL != ssg->ssg_wrapping_gp->_.gp.options))
ssg_print_t_options_of_select (ssg);
ssg_print_retval_list (ssg, tree->_.req_top.pattern,
@@ -8674,9 +9085,14 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
break;
case CONSTRUCT_L:
case DESCRIBE_L:
- 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 ((");
+ if ((NULL != tree->_.req_top.formatmode_name) && (!strcmp ("_JAVA_", tree->_.req_top.formatmode_name) || !strcmp ("_UDBC_", tree->_.req_top.formatmode_name) || !strcmp ("_MSACCESS_", tree->_.req_top.formatmode_name)))
+ {
+ if (!strcmp ("_MSACCESS_", tree->_.req_top.formatmode_name))
+ ssg_puts (" DB.DBA.RDF_DICT_OF_TRIPLES_TO_FOUR_COLS ((");
+ else
+ ssg_puts (" DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS ((");
+ three_cols_procedure = 1;
+ }
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);
@@ -8694,6 +9110,8 @@ 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 (");
@@ -8728,16 +9146,18 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
const char *fmname = tree->_.req_top.formatmode_name;
ssg_puts (" ) AS \"fmtaggret-");
if (NULL != fmname)
- ssg_puts (fmname);
+ ssg_puts (fmname);
ssg_puts ("\" LONG VARCHAR");
ssg->ssg_indent -= 1;
ssg_newline (0);
}
+ if (NULL != bindings_vars)
+ spar_sqlprint_error ("BINDINGS is not supported at top level for queries other than SELECT");
if (has_limofs)
{
ssg_newline (0);
ssg_puts ("FROM (SELECT");
- ssg_print_limofs_expn (ssg);
+ ssg_print_limofs_expn_of_top (ssg);
ssg_print_retval_list (ssg, tree->_.req_top.pattern,
retvals + 1, BOX_ELEMENTS (retvals) - 1,
top_retval_flags | SSG_RETVAL_USES_ALIAS, NULL, NULL, retvalmode );
@@ -8750,10 +9170,19 @@ 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);
- ssg_puts (".__ask_retval) AS \"fmtaggret-");
- if (NULL != fmname)
- ssg_puts (fmname);
- ssg_puts ("\" LONG VARCHAR \nFROM (");
+ if ((NULL == fmname && ssg_is_odbc_cli ()) ||
+ ((NULL != fmname) && (!strcmp ("_JAVA_", fmname) || !strcmp ("_UDBC_", fmname) || !strcmp ("_MSACCESS_", fmname))))
+ {
+ ssg_puts (".__ask_retval) AS __ask_retval INTEGER");
+ }
+ else
+ {
+ ssg_puts (".__ask_retval) AS \"fmtaggret-");
+ if (NULL != fmname)
+ ssg_puts (fmname);
+ ssg_puts ("\"");
+ }
+ ssg_puts (" LONG VARCHAR \nFROM (");
ssg->ssg_indent += 1;
}
ssg_puts ("SELECT TOP 1 1 AS __ask_retval");
@@ -8761,7 +9190,7 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
default: spar_sqlprint_error ("ssg_make_sql_query_text(): unsupported type of tree");
}
#if 0 /*!!! TBD */
- if (NULL != ssg->ssg_sparp->sparp_env->spare_bindings_vars)
+ if (NULL != bindings_vars)
{
dk_session_t *curr_ssg_out = ssg->ssg_out;
ssg->ssg_out = strses_allocate ();
@@ -8769,7 +9198,7 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
}
#endif
ssg_print_union (ssg, tree->_.req_top.pattern, retvals,
- SSG_PRINT_UNION_NOFIRSTHEAD | SSG_PRINT_UNION_NONEMPTY_STUB | SSG_RETVAL_MUST_PRINT_SOMETHING,
+ top_union_head_flags,
top_retval_flags, retvalmode );
if (0 < BOX_ELEMENTS_INT_0 (tree->_.req_top.groupings))
{
@@ -8806,7 +9235,7 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
}
END_DO_BOX_FAST;
if (gby_printed)
- ssg->ssg_indent--;
+ ssg->ssg_indent--;
}
if (NULL != tree->_.req_top.having)
{
@@ -8836,7 +9265,7 @@ The fix is to avoid printing constant expressions at all, with only exception fo
{
SPART *expn = oby_itm->_.oby.expn;
if (ssg_expn_is_not_int_const_but_printed_as_some_const (ssg, expn))
- continue;
+ continue;
if (oby_printed)
ssg_putchar (',');
else
@@ -8850,7 +9279,7 @@ The fix is to avoid printing constant expressions at all, with only exception fo
}
END_DO_BOX_FAST;
if (oby_printed)
- ssg->ssg_indent--;
+ ssg->ssg_indent--;
}
if (NULL != limofs_alias)
{
@@ -8859,6 +9288,36 @@ The fix is to avoid printing constant expressions at all, with only exception fo
ssg->ssg_indent -= 1;
}
ssg_print_tail_query_options (ssg);
+ if (NULL != bindings_vars)
+ {
+ int bndctr;
+ SPART ***bindings_rowset = ssg->ssg_sparp->sparp_env->spare_bindings_rowset;
+ ssg_puts (" ) AS ");
+ ssg_prin_id (ssg, t_box_dv_short_string ("bnd1"));
+ ssg->ssg_indent -= 1;
+ if (0 == BOX_ELEMENTS (bindings_rowset))
+ ssg_puts (" WHERE (1=0)");
+ else
+ {
+ ssg_newline (0);
+ ssg_puts (" JOIN DB.DBA.SPARQL_BINDINGS_VIEW as \"bnd2\" ON (");
+ ssg->ssg_indent += 1;
+ ssg_newline (0);
+ ssg_puts (" \"bnd2\".DTA = ");
+ ssg_print_bindings (ssg, bindings_rowset, retvalmode);
+ ssg_newline (0);
+ DO_BOX_FAST (SPART *, bndvar, bndctr, bindings_vars)
+ {
+ char buf[200];
+ snprintf (buf, sizeof (buf), " AND (\"bnd2\".BND[%d] IS NULL OR (\"bnd2\".BND[%d] = \"%.100s\"))", bndctr, bndctr, bndvar->_.var.vname);
+ ssg_puts (buf);
+ }
+ END_DO_BOX_FAST;
+ ssg_puts (")");
+ ssg->ssg_indent -= 1;
+ ssg_newline (0);
+ }
+ }
if ((COUNT_DISTINCT_L == subtype) || (NULL != formatter) || (NULL != agg_formatter) || (SSG_RETVAL_DIST_SER_LONG & top_retval_flags))
{
switch (tree->_.req_top.subtype)
@@ -8875,9 +9334,7 @@ The fix is to avoid printing constant expressions at all, with only exception fo
break;
}
}
- else if (((CONSTRUCT_L == subtype) || (DESCRIBE_L == subtype)) &&
- (NULL != tree->_.req_top.formatmode_name) &&
- !strcmp ("_JAVA_", tree->_.req_top.formatmode_name) )
+ else if (three_cols_procedure)
ssg_puts ("))");
}
diff --git a/libsrc/Wi/sparql_core.c b/libsrc/Wi/sparql_core.c
index b5ea9c2..89c6d53 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.57 2011/10/13 13:00:20 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -32,6 +32,7 @@
#include "numeric.h"
#include "rdf_core.h"
#include "security.h"
+#include "sqlbif.h" /* for bif_t and bif_find() */
#include "sqlcmps.h"
#include "sparql.h"
#include "sparql2sql.h"
@@ -87,11 +88,15 @@ 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_BINDINGS_INV: return sizeof (sample._.binv);
+ 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:
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_EQ: case SPAR_BOP_EQ: case BOP_NEQ: case BOP_LT: case BOP_LTE: case BOP_GT: case BOP_GTE:
case BOP_LIKE: return sizeof (sample._.bin_exp);
}
GPF_T;
@@ -109,18 +114,18 @@ spartlist_impl (sparp_t *sparp, ptrlong length, ptrlong type, ...)
if (SPAR_CODEGEN == type)
{
if (spart_count_specific_elems_by_type (type) > sizeof (caddr_t) * (length-1))
- {
- va_end (ap);
- spar_internal_error (sparp, "length mismatch in spartlist()");
- }
+ {
+ va_end (ap);
+ spar_internal_error (sparp, "length mismatch in spartlist()");
+ }
}
else
{
if (spart_count_specific_elems_by_type (type) != sizeof (caddr_t) * (length-1))
- {
- va_end (ap);
- spar_internal_error (sparp, "length mismatch in spartlist()");
- }
+ {
+ va_end (ap);
+ spar_internal_error (sparp, "length mismatch in spartlist()");
+ }
}
#endif
length += 1;
@@ -232,7 +237,7 @@ spar_dbg_string_of_triple_field (sparp_t *sparp, SPART *fld)
(uname_xmlschema_ns_uri_hash_double == fld->_.lit.datatype) )
{
if (DV_STRINGP (fld->_.lit.val))
- return t_box_sprintf (210, "%.200s", fld->_.lit.val);
+ return t_box_sprintf (210, "%.200s", fld->_.lit.val);
else
{
caddr_t err = NULL, ret, str;
@@ -501,59 +506,6 @@ 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)
{
@@ -578,9 +530,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 (NULL == cli) /* This means that the call is made inside the SQL compiler, can't re-enter. */
+ if (parse_sem && parse_sem->sem_entry_count) /* 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);
+ cached_qr_ptr[0] = sql_compile_static (pl_call_text, cli, &err, SQLC_STATIC_PRESERVES_TREE);
if (SQL_SUCCESS != err)
{
cached_qr_ptr[0] = NULL;
@@ -632,7 +584,6 @@ leave_and_ret:
}
return res;
}
-#endif
caddr_t
sparp_graph_sec_iri_to_id_nosignal (sparp_t *sparp, ccaddr_t qname)
@@ -792,6 +743,7 @@ 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;
@@ -812,7 +764,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),
@@ -841,7 +793,7 @@ void spar_change_sign (caddr_t *lit_ptr)
}
static const char *sparp_known_get_params[] = {
- "get:login", "get:method", "get:proxy", "get:query", "get:refresh", "get:soft", "get:uri", NULL };
+ "get:accept", "get:cartridge", "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 };
@@ -902,8 +854,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_default_graphs_locked = 1;
- sparp->sparp_env->spare_named_graphs_locked = 1;
+ sparp->sparp_env->spare_src.ssrc_default_graphs_locked = 1;
+ sparp->sparp_env->spare_src.ssrc_named_graphs_locked = 1;
return;
}
if (!strcmp (param, "input:default-graph-exclude"))
@@ -911,7 +863,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_default_graphs_locked = 1; here because NOT FROM can not be overridden */
+ /* No sparp->sparp_env->spare_src.ssrc_default_graphs_locked = 1; here because NOT FROM can not be overridden */
return;
}
if (!strcmp (param, "input:named-graph-uri"))
@@ -926,7 +878,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_default_graphs_locked = 1; here because NOT FROM can not be overridden */
+ /* No sparp->sparp_env->spare_src.ssrc_default_graphs_locked = 1; here because NOT FROM can not be overridden */
return;
}
if (!strcmp (param, "input:ifp"))
@@ -941,9 +893,35 @@ sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t v
}
if (!strcmp (param, "input:storage"))
{
+ quad_storage_t *old_storage = sparp->sparp_storage;
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);
+ if ((sparp->sparp_storage != old_storage)
+ && (NULL != sparp->sparp_env->spare_context_qms)
+ && ((SPART *)((ptrlong)_STAR) != sparp->sparp_env->spare_context_qms->data) )
+ spar_error (sparp, "Can't change quad storage via 'define %.30s' in subqueries inside QUAD MAP group patterns other than 'QUAD MAP * {...}'", param);
+ 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"))
@@ -960,12 +938,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_grab);
+ rdf_grab_config_t *rgc = &(sparp->sparp_env->spare_src.ssrc_grab);
const char *lock_pragma = NULL;
rgc->rgc_pview_mode = 1;
- if (sparp->sparp_env->spare_default_graphs_locked)
+ if (sparp->sparp_env->spare_src.ssrc_default_graphs_locked)
lock_pragma = "input:default-graph-uri";
- else if (sparp->sparp_env->spare_named_graphs_locked)
+ else if (sparp->sparp_env->spare_src.ssrc_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);
@@ -1060,7 +1038,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_common_sponge_options);
+ dk_set_t *opts_ptr = &(sparp->sparp_env->spare_src.ssrc_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));
@@ -1128,44 +1106,324 @@ sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t v
}
caddr_t
-spar_selid_push (sparp_t *sparp)
+SPARQL_DBG_NAME(spar_selid_push) (SPARQL_DBG_PARAMS sparp_t *sparp)
{
caddr_t selid = spar_mkid (sparp, "s");
t_set_push (&(sparp->sparp_env->spare_selids), selid );
- spar_dbg_printf (("spar_selid_push () pushes %s\n", selid));
+ spar_dbg_printf (("spar_selid_push () pushes %s at %s:%d\n", selid, file, line));
return selid;
}
caddr_t
-spar_selid_push_reused (sparp_t *sparp, caddr_t selid)
+SPARQL_DBG_NAME(spar_selid_push_reused) (SPARQL_DBG_PARAMS sparp_t *sparp, caddr_t selid)
{
t_set_push (&(sparp->sparp_env->spare_selids), selid );
- spar_dbg_printf (("spar_selid_push_reused () pushes %s\n", selid));
+ spar_dbg_printf (("spar_selid_push_reused () pushes %s at %s:%d\n", selid, file, line));
return selid;
}
-caddr_t spar_selid_pop (sparp_t *sparp)
+caddr_t
+SPARQL_DBG_NAME(spar_selid_pop) (SPARQL_DBG_PARAMS sparp_t *sparp)
{
- caddr_t selid = t_set_pop (&(sparp->sparp_env->spare_selids));
- spar_dbg_printf (("spar_selid_pop () pops %s\n", selid));
+ caddr_t selid = (caddr_t)t_set_pop (&(sparp->sparp_env->spare_selids));
+ spar_dbg_printf (("spar_selid_pop () pops %s at %s:%d\n", selid, file, line));
+ if (NULL == selid)
+ spar_internal_error (sparp, "spar_" "selid_pop(): weird state of the stack");
return selid;
}
-void spar_gp_init (sparp_t *sparp, ptrlong subtype)
+
+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)
{
sparp_env_t *env = sparp->sparp_env;
+ int gp_is_top = ((WHERE_L == subtype) || (CONSTRUCT_L == subtype));
spar_dbg_printf (("spar_gp_init (..., %ld)\n", (long)subtype));
- spar_selid_push (sparp);
+ 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 if (!gp_is_top)
+ 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);
t_set_push (&(env->spare_good_graph_varname_sets), env->spare_good_graph_varnames);
- if ((WHERE_L != subtype) && (CONSTRUCT_L != subtype))
+ if (!gp_is_top)
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)
{
@@ -1195,35 +1453,35 @@ SPART *
spar_gp_finalize (sparp_t *sparp, SPART **options)
{
sparp_env_t *env = sparp->sparp_env;
- caddr_t orig_selid = env->spare_selids->data;
+ caddr_t orig_selid = (caddr_t)(env->spare_selids->data);
dk_set_t membs;
int all_ctr, opt_ctr;
dk_set_t filts;
ptrlong subtype;
SPART *res;
- spar_dbg_printf (("spar_gp_finalize (..., %ld)\n", (long)subtype));
subtype = (ptrlong)(env->spare_context_gp_subtypes->data);
+ spar_dbg_printf (("spar_gp_finalize (..., %ld)\n", (long)subtype));
if (CONSTRUCT_L != subtype) /* CONSTRUCT_L did not push to spare_propvar_sets, using one that will be used in WHERE_L */
{
/* Create triple patterns for distinct '+>' propvars and OPTIONAL triple patterns for distinct '*>' propvars */
dk_set_t propvars = (dk_set_t) t_set_pop (&(env->spare_propvar_sets));
- DO_SET (spar_propvariable_t *, pv, &propvars)
- {
- if (_STAR_GT == pv->sparpv_op)
- spar_gp_init (sparp, OPTIONAL_L);
- 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),
- NULL, NULL, 0x0 );
- if (_STAR_GT == pv->sparpv_op)
+ DO_SET (spar_propvariable_t *, pv, &propvars)
{
- SPART *pv_gp;
- pv_gp = spar_gp_finalize (sparp, NULL);
- t_set_push (((dk_set_t *)(&(env->spare_acc_triples->data))) /* not &membs */, pv_gp);
+ if (_STAR_GT == pv->sparpv_op)
+ spar_gp_init (sparp, OPTIONAL_L);
+ spar_gp_add_triplelike (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),
+ NULL, NULL, 0x0 );
+ if (_STAR_GT == pv->sparpv_op)
+ {
+ SPART *pv_gp;
+ pv_gp = spar_gp_finalize (sparp, NULL);
+ t_set_push (((dk_set_t *)(&(env->spare_acc_triples->data))) /* not &membs */, pv_gp);
+ }
}
- }
- END_DO_SET();
+ END_DO_SET();
}
/* Pop the rest of the environment and adjust graph varnames */
membs = (dk_set_t) t_set_pop (&(env->spare_acc_triples));
@@ -1254,7 +1512,7 @@ check_optionals:
spar_gp_init (sparp, 0);
for (left_ctr = 0; left_ctr < all_ctr; left_ctr++)
{
- SPART *memb = t_set_pop (&membs);
+ SPART *memb = (SPART *)(t_set_pop (&membs));
if ((SPAR_TRIPLE == SPART_TYPE(memb)) && (memb->_.triple.ft_type))
{
DO_SET (SPART *, filt, &filts)
@@ -1263,15 +1521,15 @@ check_optionals:
continue;
t_set_delete (&filts, filt);
t_set_push (&left_ft_filts, filt);
- /* A cheat use of sparp_set_options_selid_and_tabid for funcall.argtrees isntead of smth.options, looks OK for freetext */
- sparp_set_options_selid_and_tabid (sparp, filt->_.funcall.argtrees, env->spare_selids->data, memb->_.triple.tabid);
+ /* A cheat use of sparp_set_options_selid_and_tabid for funcall.argtrees instead of smth.options, looks OK for freetext */
+ sparp_set_options_selid_and_tabid (sparp, filt->_.funcall.argtrees, (caddr_t)(env->spare_selids->data), NULL /* why memb->_.triple.tabid ? */);
break;
}
END_DO_SET()
}
t_set_push (&left_membs, memb);
}
- spar_gp_replace_selid (sparp, left_membs, orig_selid, env->spare_selids->data);
+ spar_gp_replace_selid (sparp, left_membs, orig_selid, (caddr_t)(env->spare_selids->data));
env->spare_acc_triples->data = left_membs; /* a revlist is set to a revlist, no reverse needed */
env->spare_acc_filters->data = left_ft_filts; /* same is true for filters, even if not so important */
left_group = spar_gp_finalize (sparp, NULL);
@@ -1291,7 +1549,8 @@ check_optionals:
NULL,
orig_selid,
NULL, (ptrlong)(0), (ptrlong)(0), options );
- spar_selid_pop (sparp);
+ if ((CONSTRUCT_L != subtype) && (WHERE_L != subtype)) /* CONSTRUCT_L did not push to stack of selids, using one that will be used in WHERE_L */
+ spar_selid_pop (sparp);
return res;
}
@@ -1346,8 +1605,8 @@ spar_filter_is_freetext (sparp_t *sparp, SPART *filt, SPART *base_triple)
if ((0 == BOX_ELEMENTS (filt->_.funcall.argtrees)) ||
(SPAR_VARIABLE != SPART_TYPE (filt->_.funcall.argtrees[0])) ||
strcmp (filt->_.funcall.argtrees[0]->_.var.vname, ft_var_name) )
- return 0;
-}
+ return 0;
+ }
return res;
}
@@ -1428,11 +1687,15 @@ spar_gp_add_filter (sparp_t *sparp, SPART *filt)
spar_error (sparp, "Invalid argument #%d for %s() special predicate", argctr+1);
spar_tree_is_var_with_forbidden_ft_name (sparp, arg_value, 1);
opt_value = (SPART *)t_box_copy_tree ((caddr_t)arg_value);
+#ifdef DEBUG
+ if (strcmp (opt_value->_.var.selid, triple_with_var_obj->_.triple.selid))
+ spar_internal_error (sparp, "spar_" "gp_add_filter(): weird mismatch between selids of opt_value and triple_with_var_obj");
+#endif
opt_value->_.var.tabid = triple_with_var_obj->_.triple.tabid;
opt_value->_.var.tr_idx = (ptrlong)args[argctr];
- 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) );
+ triple_with_var_obj->_.triple.options = t_spartlist_concat (
+ triple_with_var_obj->_.triple.options,
+ (SPART **)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);
@@ -1450,7 +1713,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_named_graphs : env->spare_default_graphs);
+ dk_set_t sources = (graph_is_named ? env->spare_src.ssrc_named_graphs : env->spare_src.ssrc_default_graphs);
caddr_t varname = NULL;
SPART *good_list_expn, *bad_list_expn, *filter;
if (NULL == sources)
@@ -1512,7 +1775,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_default_graphs))
+ DO_SET (SPART *, g, &(sparp->sparp_env->spare_src.ssrc_default_graphs))
{
ptrlong st = g->_.graph.subtype;
if ((st == from_subtype) || (st == from2_subtype))
@@ -1521,7 +1784,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_named_graphs))
+ DO_SET (SPART *, g, &(sparp->sparp_env->spare_src.ssrc_named_graphs))
{
ptrlong st = g->_.graph.subtype;
if ((st == from_subtype) || (st == from2_subtype))
@@ -1570,7 +1833,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 spartlist (sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)IN_L,
+ return sparp_make_builtin_call (sparp, IN_L,
(SPART **)t_list (2, needle_expn, lst_expn) );
#endif
}
@@ -1578,7 +1841,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 spartlist (sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)IN_L,
+ return sparp_make_builtin_call (sparp, IN_L,
(SPART **)t_list_to_array (single_graphs) );
}
@@ -1684,7 +1947,7 @@ in_local_set:
}
void
-spar_list_triple_vars_in_gp (sparp_t *sparp, SPART *tree, dk_set_t *all_varnames_ret)
+spar_list_triple_varnames_and_macropunames_in_tree (sparp_t *sparp, SPART *tree, dk_set_t *all_varnames_ret, dk_set_t *undiscovered_ret)
{
int ctr;
switch (SPART_TYPE (tree))
@@ -1695,14 +1958,17 @@ spar_list_triple_vars_in_gp (sparp_t *sparp, SPART *tree, dk_set_t *all_varnames
for (ctr = SPART_TRIPLE_FIELDS_COUNT; ctr--; /* no step */)
{
SPART *fld = tree->_.triple.tr_fields[ctr];
- if (SPAR_VARIABLE == SPART_TYPE (fld))
- t_set_push_new_string (all_varnames_ret, fld->_.var.vname);
+ 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;
+ }
}
break;
case SPAR_GP:
DO_BOX_FAST_REV (SPART *, memb, ctr, tree->_.gp.members)
{
- spar_list_triple_vars_in_gp (sparp, memb, all_varnames_ret);
+ spar_list_triple_varnames_and_macropunames_in_tree (sparp, memb, all_varnames_ret, undiscovered_ret);
}
END_DO_BOX_FAST_REV;
if (NULL != tree->_.gp.subquery)
@@ -1712,7 +1978,7 @@ spar_list_triple_vars_in_gp (sparp_t *sparp, SPART *tree, dk_set_t *all_varnames
{
DO_BOX_FAST_REV (SPART *, memb, ctr, retvals)
{
- spar_list_triple_vars_in_gp (sparp, memb, all_varnames_ret);
+ spar_list_triple_varnames_and_macropunames_in_tree (sparp, memb, all_varnames_ret, undiscovered_ret);
}
END_DO_BOX_FAST_REV;
}
@@ -1720,9 +1986,36 @@ spar_list_triple_vars_in_gp (sparp_t *sparp, SPART *tree, dk_set_t *all_varnames
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 *
spar_make_service_inv (sparp_t *sparp, caddr_t endpoint, dk_set_t all_options, ptrlong permitted_syntax, SPART **sources, caddr_t sinv_storage)
{
@@ -1731,8 +2024,6 @@ 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)
{
@@ -1747,45 +2038,46 @@ spar_make_service_inv (sparp_t *sparp, caddr_t endpoint, dk_set_t all_options, p
{
if (_STAR == (ptrlong)optvalue)
{
+ dk_set_t gp_subtypes_iter;
+ dk_set_t acc_triples_iter = sparp->sparp_env->spare_acc_triples;
in_list_implicit = 1;
- DO_SET (dk_set_t, members_before, &(sparp->sparp_env->spare_acc_triples))
+ for (gp_subtypes_iter = sparp->sparp_env->spare_context_gp_subtypes;
+ NULL != gp_subtypes_iter;
+ gp_subtypes_iter = gp_subtypes_iter->next, acc_triples_iter = acc_triples_iter->next )
{
+ dk_set_t members_before;
+ int gp_subtype = (ptrlong)(gp_subtypes_iter->data);
+ if (SELECT_L == gp_subtype)
+ break;
+ if (UNION_L == gp_subtype)
+ continue;
+ members_before = (dk_set_t)(acc_triples_iter->data);
DO_SET (SPART *, member, &members_before)
{
- spar_list_triple_vars_in_gp (sparp, member, ¶m_varnames);
+ 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");
}
END_DO_SET()
}
- END_DO_SET()
}
else
{
- DO_SET (SPART *, var, (dk_set_t *)(&optvalue))
- {
- caddr_t vname = var->_.var.vname;
- if (0 <= dk_set_position_of_string (param_varnames, vname))
- spar_error (sparp, "Duplicate IN variable name \"%.100s\" in OPTIONs of SERVICE invocation", vname);
- t_set_push (¶m_varnames, vname);
+ DO_SET (SPART *, var, (dk_set_t *)(&optvalue))
+ {
+ caddr_t vname = var->_.var.vname;
+ if (0 <= dk_set_position_of_string (param_varnames, vname))
+ spar_error (sparp, "Duplicate IN variable name \"%.100s\" in OPTIONs of SERVICE invocation", vname);
+ t_set_push (¶m_varnames, vname);
+ }
+ END_DO_SET()
}
- END_DO_SET()
- }
}
/*! 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,
- sparp->sparp_sg->sg_sinv_count,
+ (ptrlong)(0),
endpoint,
t_revlist_to_array (iri_params),
t_box_num (permitted_syntax),
@@ -1795,10 +2087,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)
{
@@ -1872,10 +2164,9 @@ spar_retvals_of_describe (sparp_t *sparp, SPART **retvals, SPART *limit_expn, SP
caddr_t storage_name_or_null;
const char *descr_name, *postproc_name = NULL;
int need_limofs_trick = (
- (DV_LONG_INT != DV_TYPE_OF (limit_expn)) ||
+ (NULL != limit_expn) ||
(DV_LONG_INT != DV_TYPE_OF (offset_expn)) ||
- (SPARP_MAXLIMIT != unbox ((caddr_t)(limit_expn))) ||
- (0 != unbox ((caddr_t)(offset_expn)) ) );
+ (0 != unbox ((caddr_t)(offset_expn))) );
/* Making lists of variables, blank nodes, fixed triples, triples with variables and blank nodes. */
for (retval_ctr = BOX_ELEMENTS_INT (retvals); retval_ctr--; /* no step */)
{
@@ -1927,7 +2218,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_default_graphs_listed || sparp->sparp_env->spare_named_graphs_listed)
+ if (sparp->sparp_env->spare_src.ssrc_default_graphs_listed || sparp->sparp_env->spare_src.ssrc_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);
@@ -1989,10 +2280,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_grab.rgc_vars), t_box_dv_uname_string (curr->_.var.vname));
+ t_set_push_new_string (&(sparp->sparp_env->spare_src.ssrc_grab.rgc_vars), t_box_dv_uname_string (curr->_.var.vname));
break;
case SPAR_QNAME:
- t_set_push_new_string (&(sparp->sparp_env->spare_grab.rgc_consts), curr->_.lit.val);
+ t_set_push_new_string (&(sparp->sparp_env->spare_src.ssrc_grab.rgc_consts), curr->_.lit.val);
break;
}
return 0;
@@ -2013,7 +2304,7 @@ spar_add_rgc_vars_and_consts_from_retvals (sparp_t *sparp, SPART **retvals)
}
SPART *
-spar_make_wm (sparp_t *sparp, SPART *pattern, SPART **groupings, SPART *having, SPART **order, SPART *limit, SPART *offset)
+spar_make_wm (sparp_t *sparp, SPART *pattern, SPART **groupings, SPART *having, SPART **order, SPART *limit, SPART *offset, SPART *binv)
{
if ((NULL != having) && (NULL == groupings))
spar_error (sparp, "HAVING clause should be preceded by a GROUP BY clause");
@@ -2021,7 +2312,7 @@ spar_make_wm (sparp_t *sparp, SPART *pattern, SPART **groupings, SPART *having,
limit = (SPART *)(limit->_.lit.val);
if ((DV_ARRAY_OF_POINTER == DV_TYPE_OF (offset)) && (SPAR_LIT == offset->type) && (DV_LONG_INT == DV_TYPE_OF (offset->_.lit.val)))
offset = (SPART *)(offset->_.lit.val);
- return spartlist (sparp, 7, SPAR_WHERE_MODIFS, pattern, groupings, having, order, limit, offset);
+ return spartlist (sparp, 8, SPAR_WHERE_MODIFS, pattern, groupings, having, order, limit, offset, binv);
}
int
@@ -2056,55 +2347,49 @@ spar_make_top_or_special_case_from_wm (sparp_t *sparp, ptrlong subtype, SPART **
SPART **order = wm->_.wm.obys;
SPART *limit = wm->_.wm.lim;
SPART *offset = wm->_.wm.ofs;
+ SPART *binv = wm->_.wm.binv;
+ if ((NULL == sparp->sparp_env->spare_output_format_name)
+ && (NULL == sparp->sparp_env->spare_parent_env)
+ && ssg_is_odbc_cli () )
+ {
+ if (ssg_is_odbc_msaccess_cli ())
+ sparp->sparp_env->spare_output_format_name = t_box_dv_short_string ("_MSACCESS_");
+ else
+ sparp->sparp_env->spare_output_format_name = t_box_dv_short_string ("_UDBC_");
+ }
#ifndef NDEBUG
if (SPAR_WHERE_MODIFS != SPART_TYPE (wm))
spar_internal_error (sparp, "Ill wm");
#endif
-#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;
+ 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);
}
-#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_named_graphs) break;
+ if (NULL != sparp->sparp_env->spare_src.ssrc_named_graphs) break;
if (!IS_BOX_POINTER (retvals)) break;
if (1 != BOX_ELEMENTS (retvals)) break;
if (0 != BOX_ELEMENTS_0 (groupings)) break;
if (0 != BOX_ELEMENTS_0 (order)) break;
+ if (NULL != binv) break;
if (0 != BOX_ELEMENTS_0 (pattern->_.gp.filters)) break;
if (1 != BOX_ELEMENTS (pattern->_.gp.members)) break;
if (0 != BOX_ELEMENTS_0 (pattern->_.gp.options)) break;
@@ -2154,108 +2439,77 @@ spar_make_top_or_special_case_from_wm (sparp_t *sparp, ptrlong subtype, SPART **
offset ); /* #7 */
} while (0);
/* The default is, of course, a plain query */
- return spar_make_top (sparp, subtype, retvals, retselid, pattern, groupings, having, order, limit, offset);
+ return spar_make_top (sparp, subtype, retvals, retselid, pattern, groupings, having, order, limit, offset, binv);
}
-void
-spar_alloc_fake_equivs_for_bindings_inv (sparp_t *sparp, SPART *binv)
+SPART *
+spar_make_bindings_inv_with_fake_equivs (sparp_t *sparp, SPART **vars, SPART ***data_rows)
{
+ int varcount = BOX_ELEMENTS (vars);
+ int rowcount = BOX_ELEMENTS (data_rows);
int varctr, rowctr;
- DO_BOX_FAST_REV (SPART *, var, varctr, binv->_.binv.vars)
- {
- sparp_equiv_t *eq;
- int restr_set = SPART_VARR_NOT_NULL | SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_IS_LIT;
- int restr_drop = 0;
- var->_.var.rvr.rvrRestrictions = SPART_VARR_CONFLICT;
- DO_BOX_FAST (SPART **, row, rowctr, binv->_.binv.data_rows)
+ char *data_rows_mask = (char *)t_alloc_box (rowcount+1, DV_STRING);
+ ptrlong *counters_of_unbound = (ptrlong *)t_alloc_box (varcount * sizeof (ptrlong), DV_STRING);
+ SPART *binv = spartlist (sparp, 8, SPAR_BINDINGS_INV, 0, vars, data_rows, data_rows_mask, counters_of_unbound, (ptrlong)rowcount, (ptrlong)0);
+ memset (data_rows_mask, '/', rowcount);
+ for (varctr = varcount; varctr--; /* no step */)
+ {
+ int counter_of_unbound = 0;
+ for (rowctr = rowcount; rowctr--; /* no step */)
{
- SPART *datum = row[varctr];
- if (NULL == datum)
- restr_drop |= SPART_VARR_NOT_NULL;
- else
- switch (SPART_TYPE (datum))
- {
- case SPAR_QNAME: restr_drop |= SPART_VARR_IS_LIT; break;
- case SPAR_LIT: restr_drop |= SPART_VARR_IS_REF | SPART_VARR_IS_IRI; break;
- }
+ if (NULL == data_rows[rowctr][varctr])
+ counter_of_unbound++;
}
- END_DO_BOX_FAST;
- if (rowctr)
- var->_.var.rvr.rvrRestrictions = restr_set & ~restr_drop;
- else
- var->_.var.rvr.rvrRestrictions = SPART_VARR_CONFLICT;
- if (1 == rowctr)
- {
- SPART *datum = binv->_.binv.data_rows[0][varctr];
- if (NULL == datum)
- var->_.var.rvr.rvrRestrictions = SPART_VARR_ALWAYS_NULL;
- else
- switch (SPART_TYPE (datum))
- {
- case SPAR_QNAME:
- var->_.var.rvr.rvrRestrictions |= SPART_VARR_FIXED;
- var->_.var.rvr.rvrFixedValue = datum->_.qname.val;
- break;
- case SPAR_LIT:
- if (DV_ARRAY_OF_POINTER == DV_TYPE_OF (datum))
- {
- if (NULL != datum->_.lit.language)
- break;
- if (NULL != datum->_.lit.datatype)
- break;
- var->_.var.rvr.rvrRestrictions |= SPART_VARR_FIXED;
- var->_.var.rvr.rvrFixedValue = datum->_.lit.val;
- break;
- }
- var->_.var.rvr.rvrRestrictions |= SPART_VARR_FIXED;
- var->_.var.rvr.rvrFixedValue = (ccaddr_t)datum;
- break;
- }
- }
- eq = sparp_equiv_alloc (sparp);
+ counters_of_unbound[varctr] = counter_of_unbound;
+ }
+ spar_refresh_binv_var_rvrs (sparp, binv);
+ for (varctr = 0; varctr < varcount; varctr++)
+ {
+ SPART *var = vars[varctr];
+ sparp_equiv_t *eq = sparp_equiv_alloc (sparp);
eq->e_varnames = (caddr_t *)t_list (1, var->_.var.vname);
eq->e_vars = (SPART **)t_list (1, var);
eq->e_var_count = 1;
eq->e_nested_bindings = 1; /* fake, to not reset rvr to conflict */
eq->e_gp = binv;
eq->e_const_reads = 1;
- sparp_equiv_tighten (sparp, eq, &(var->_.var.rvr), ~0);
+ sparp_rvr_copy (sparp, &(eq->e_rvr), &(var->_.var.rvr));
var->_.var.equiv_idx = eq->e_own_idx;
}
- END_DO_BOX_FAST_REV;
+ return binv;
}
-
SPART **
-spar_make_sources_like_top (sparp_t *sparp)
+spar_make_sources_like_top (sparp_t *sparp, ptrlong top_subtype)
{
sparp_env_t *env = sparp->sparp_env;
dk_set_t src = NULL;
SPART **sources;
- DO_SET(SPART *, g, &(env->spare_default_graphs))
+ DO_SET(SPART *, g, &(env->spare_src.ssrc_default_graphs))
{
t_set_push (&src, sparp_tree_full_copy (sparp, g, NULL));
}
END_DO_SET()
- DO_SET(SPART *, g, &(env->spare_named_graphs))
+ DO_SET(SPART *, g, &(env->spare_src.ssrc_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_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);
+ (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);
return sources;
}
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)
+ caddr_t retselid, SPART *pattern, SPART **groupings, SPART *having, SPART **order, SPART *limit, SPART *offset, SPART *binv)
{
sparp_env_t *env = sparp->sparp_env;
caddr_t final_output_format_name;
- SPART **sources = spar_make_sources_like_top (sparp);
+ SPART **sources = spar_make_sources_like_top (sparp, subtype);
switch (subtype)
{
case CONSTRUCT_L: case DESCRIBE_L:
@@ -2279,13 +2533,13 @@ spar_make_top (sparp_t *sparp, ptrlong subtype, SPART **retvals,
else
limit = spar_make_funcall (sparp, 0, "bif:__max", (SPART **)t_list (2, limit, t_box_num_nonull (hard_lim)));
}
- return spartlist (sparp, 17, SPAR_REQ_TOP, subtype,
+ return spartlist (sparp, 18, SPAR_REQ_TOP, subtype,
env->spare_output_valmode_name,
final_output_format_name,
t_box_copy (env->spare_storage_name),
retvals, NULL /* orig_retvals */, NULL /* expanded_orig_retvals */, retselid,
sources, pattern, groupings, having, order,
- limit, offset, env );
+ limit, offset, binv, env );
}
SPART *
@@ -2299,7 +2553,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_triple_or_special_filter (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, banned_tricks & 0x2);
+ triple = spar_gp_add_triplelike (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, banned_tricks | SPAR_ADD_TRIPLELIKE_NO_INV_UNION);
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 );
@@ -2312,14 +2566,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_triple_or_special_filter (sparp,
+ triple = spar_gp_add_triplelike (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 & 0x2 );
+ banned_tricks | SPAR_ADD_TRIPLELIKE_NO_INV_UNION );
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 );
@@ -2347,20 +2601,22 @@ spar_gp_add_transitive_triple (sparp_t *sparp, SPART *graph, SPART *subject, SPA
#endif
SPART *subselect_top, *where_gp, *wrapper_gp, *fields[4];
SPART *subj_var, *obj_var, **retvals;
- caddr_t subj_vname, obj_vname, retval_selid, gp_selid;
- int subj_is_plain_var, obj_is_plain_var, retvalctr, fld_ctr;
+ caddr_t subj_alias, obj_alias, subj_vname, obj_vname, retval_selid, gp_selid;
+ int subj_is_plain_var = 0, obj_is_plain_var = 0, retvalctr, fld_ctr;
int subj_stype = SPART_TYPE (subject);
int obj_stype = SPART_TYPE (object);
- if ((SPAR_VARIABLE != subj_stype) && (SPAR_QNAME != subj_stype))
+ if (SPAR_VARIABLE == subj_stype)
+ subj_is_plain_var = SPART_VARNAME_IS_PLAIN(subject->_.var.vname);
+ else if (SPAR_QNAME != subj_stype)
spar_error (sparp, "Subject of transitive triple pattern should be variable or QName, not literal or blank node");
- if ((SPAR_VARIABLE != obj_stype) && (SPAR_QNAME != obj_stype) && (SPAR_LIT != obj_stype))
+ if (SPAR_VARIABLE == obj_stype)
+ obj_is_plain_var = SPART_VARNAME_IS_PLAIN(object->_.var.vname);
+ else if ((SPAR_QNAME != obj_stype) && (SPAR_LIT != obj_stype))
spar_error (sparp, "Object of transitive triple pattern should be variable or QName or literal, not blank node");
- subj_is_plain_var = ((SPAR_VARIABLE == subj_stype) && (NULL == strchr (subject->_.var.vname, '>')));
- obj_is_plain_var = ((SPAR_VARIABLE == obj_stype) && (NULL == strchr (object->_.var.vname, '>')));
- subj_vname = (subj_is_plain_var ? subject->_.var.vname :
- t_box_sprintf (40, "trans-subj-%.20s", (caddr_t)(sparp->sparp_env->spare_selids->data)) );
- obj_vname = (obj_is_plain_var ? object->_.var.vname :
- t_box_sprintf (40, "trans-obj-%.20s", (caddr_t)(sparp->sparp_env->spare_selids->data)) );
+ subj_vname = t_box_sprintf (40, "trans-subj-%.20s", (caddr_t)(sparp->sparp_env->spare_selids->data));
+ obj_vname = t_box_sprintf (40, "trans-obj-%.20s", (caddr_t)(sparp->sparp_env->spare_selids->data));
+ subj_alias = subj_is_plain_var ? subject->_.var.vname : subj_vname;
+ obj_alias = obj_is_plain_var ? object->_.var.vname : obj_vname;
spar_gp_init (sparp, 0);
spar_env_push (sparp);
spar_selid_push (sparp);
@@ -2376,15 +2632,24 @@ spar_gp_add_transitive_triple (sparp_t *sparp, SPART *graph, SPART *subject, SPA
}
if (0 == retvalctr)
retvalctr = 1;
- retvals = (SPART **)t_alloc_box (retvalctr * sizeof (SPART *), DV_ARRAY_OF_POINTER);
+ retvals = (SPART **)t_alloc_list (retvalctr);
retval_selid = (caddr_t)(sparp->sparp_env->spare_selids->data);
retvalctr = 0;
for (fld_ctr = 0; fld_ctr < 4; fld_ctr++)
{
+ SPART *rval = NULL;
switch (SPART_TYPE (fields[fld_ctr]))
{
- case SPAR_BLANK_NODE_LABEL: retvals[retvalctr++] = spar_make_blank_node (sparp, fields[fld_ctr]->_.var.vname, 0); break;
- case SPAR_VARIABLE: retvals[retvalctr++] = spar_make_variable (sparp, fields[fld_ctr]->_.var.vname); break;
+ case SPAR_BLANK_NODE_LABEL: rval = spar_make_blank_node (sparp, fields[fld_ctr]->_.var.vname, 0); break;
+ case SPAR_VARIABLE: rval = spar_make_variable (sparp, fields[fld_ctr]->_.var.vname); break;
+ }
+ if (NULL != rval)
+ {
+ if ((1 == fld_ctr) && subj_is_plain_var)
+ rval = spartlist (sparp, 4, SPAR_ALIAS, rval, subj_alias, SSG_VALMODE_AUTO);
+ else if ((3 == fld_ctr) && obj_is_plain_var)
+ rval = spartlist (sparp, 4, SPAR_ALIAS, rval, obj_alias, SSG_VALMODE_AUTO);
+ retvals[retvalctr++] = rval;
}
}
if (0 == retvalctr)
@@ -2399,17 +2664,17 @@ 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_triple_or_special_filter (sparp, graph, subj_var, predicate, obj_var, qm_iri_or_pair, NULL, 0x1);
+ spar_gp_add_triplelike (sparp, graph, subj_var, predicate, obj_var, qm_iri_or_pair, NULL, banned_tricks | SPAR_ADD_TRIPLELIKE_NO_TRANSITIVE);
sparp_set_option (sparp, &options, T_IN_L,
- spartlist (sparp, 2, SPAR_LIST, t_list (1, spar_make_variable (sparp, subj_vname))),
+ spartlist (sparp, 2, SPAR_LIST, t_list (1, spar_make_variable (sparp, subj_alias))),
SPARP_SET_OPTION_REPLACING );
sparp_set_option (sparp, &options, T_OUT_L,
- spartlist (sparp, 2, SPAR_LIST, t_list (1, spar_make_variable (sparp, obj_vname))),
+ spartlist (sparp, 2, SPAR_LIST, t_list (1, spar_make_variable (sparp, obj_alias))),
SPARP_SET_OPTION_REPLACING );
where_gp = spar_gp_finalize (sparp, NULL);
subselect_top = spar_make_top (sparp, SELECT_L, retvals,
spar_selid_pop (sparp), where_gp,
- (SPART **)NULL, (SPART *)NULL, (SPART **)NULL, (SPART *)t_box_num (SPARP_MAXLIMIT), (SPART *)t_box_num_nonull (0));
+ (SPART **)NULL, (SPART *)NULL, (SPART **)NULL, (SPART *)NULL /* i.e., no limit */, (SPART *)t_box_num_nonull (0), NULL);
sparp_expand_top_retvals (sparp, subselect_top, 1 /* safely_copy_all_vars */);
spar_env_pop (sparp);
t_check_tree (options);
@@ -2417,12 +2682,12 @@ spar_gp_add_transitive_triple (sparp_t *sparp, SPART *graph, SPART *subject, SPA
spar_gp_add_member (sparp, wrapper_gp);
if (!subj_is_plain_var)
{
- SPART *eq = spartlist (sparp, 3, BOP_EQ, spar_make_variable (sparp, subj_vname), subject);
+ SPART *eq = spartlist (sparp, 3, BOP_EQ, spar_make_variable (sparp, subj_alias), subject);
spar_gp_add_filter (sparp, eq);
}
if (!obj_is_plain_var)
{
- SPART *eq = spartlist (sparp, 3, BOP_EQ, spar_make_variable (sparp, obj_vname), object);
+ SPART *eq = spartlist (sparp, 3, BOP_EQ, spar_make_variable (sparp, obj_alias), object);
spar_gp_add_filter (sparp, eq);
}
#ifdef DEBUG
@@ -2438,17 +2703,54 @@ spar_gp_add_transitive_triple (sparp_t *sparp, SPART *graph, SPART *subject, SPA
return wrapper_gp;
}
-static ptrlong usage_natural_restrictions[SPART_TRIPLE_FIELDS_COUNT] = {
+
+#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] = {
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_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)
+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)
{
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);
@@ -2458,7 +2760,15 @@ spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subje
object = (SPART *)t_box_copy_tree (env->spare_context_objects->data);
if (CONSTRUCT_L == SPARP_ENV_CONTEXT_GP_SUBTYPE(sparp))
{
- graph = spar_make_blank_node (sparp, spar_mkid (sparp, "_::default"), 2);
+ 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++;
+ }
goto plain_triple_in_ctor; /* see below */
}
#if 1
@@ -2520,11 +2830,11 @@ spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subje
if (NULL != options)
{
SPART *trans = sparp_get_option (sparp, options, TRANSITIVE_L);
- 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 != 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 != inf_ctx) && (SPAR_QNAME == SPART_TYPE (predicate)))
- {
+ {
caddr_t p_name = predicate->_.qname.val;
caddr_t *propprops = inf_ctx->ric_prop_props;
caddr_t *invlist = inf_ctx->ric_inverse_prop_pair_sortedalist;
@@ -2535,14 +2845,14 @@ spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subje
if (ECM_MEM_NOT_FOUND != pp_pos)
{
ptrlong flags = (ptrlong)(propprops[pp_pos * 2 + 1]);
- if ((1 & flags) && !(0x1 & banned_tricks))
+ if ((1 & flags) && !(SPAR_ADD_TRIPLELIKE_NO_TRANSITIVE & 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, 0x1 | 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 != invlist) && !(0x2 & banned_tricks))
+ if ((NULL != invlist) && !(SPAR_ADD_TRIPLELIKE_NO_INV_UNION & banned_tricks))
{
int invlistlen = BOX_ELEMENTS (invlist);
int inv_pos = ecm_find_name (p_name, invlist, invlistlen/2, 2 * sizeof (caddr_t));
@@ -2554,7 +2864,7 @@ spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subje
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, 0x2 | banned_tricks, inv_names);
+ 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);
}
}
}
@@ -2581,8 +2891,8 @@ spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subje
}
spar_gp_add_filter (sparp,
spar_make_funcall (sparp, 0, pname,
- (SPART **)t_list_concat ((caddr_t)t_list (2, subject, object), (caddr_t)options) ) );
- dk_free_tree (spec_pred_names);
+ t_spartlist_concat ((SPART **)t_list (2, subject, object), options) ) );
+ dk_free_tree (spec_pred_names);
return NULL;
}
dk_free_tree (spec_pred_names);
@@ -2597,8 +2907,8 @@ spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subje
graph = (SPART *)t_box_copy_tree (env->spare_context_graphs->data);
break;
}
- dflts = env->spare_default_graphs;
- if ((NULL == dflts) && (NULL != env->spare_named_graphs))
+ dflts = env->spare_src.ssrc_default_graphs;
+ if ((NULL == dflts) && (NULL != env->spare_src.ssrc_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;
@@ -2611,12 +2921,13 @@ spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subje
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);
- 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);
+ 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);
+ }
}
else /* Single FROM iriref without sponge options */
graph = sparp_tree_full_copy (sparp, single_dflt->_.graph.expn, NULL);
@@ -2625,12 +2936,49 @@ spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subje
}
else
graph = spar_make_blank_node (sparp, spar_mkid (sparp, "_::default"), 2);
- spar_gp_add_filters_for_graph (sparp, graph, 0, 0);
+ graph_can_bring_filters = 1;
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);
@@ -2661,33 +3009,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 |= usage_natural_restrictions[fctr];
+ fld->_.var.rvr.rvrRestrictions |= sparp_tr_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_grab.rgc_all) && (SPART_TRIPLE_PREDICATE_IDX != fctr))
+ if ((env->spare_src.ssrc_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_grab.rgc_vars), t_box_dv_uname_string (fld->_.var.vname));
+ t_set_push_new_string (&(env->spare_src.ssrc_grab.rgc_vars), t_box_dv_uname_string (fld->_.var.vname));
else if (SPAR_QNAME == ft)
- t_set_push_new_string (&(env->spare_grab.rgc_consts), fld->_.lit.val);
+ t_set_push_new_string (&(env->spare_src.ssrc_grab.rgc_consts), fld->_.lit.val);
}
- if ((NULL != env->spare_grab.rgc_sa_preds) &&
+ if ((NULL != env->spare_src.ssrc_grab.rgc_sa_preds) &&
(SPART_TRIPLE_SUBJECT_IDX == fctr) &&
(SPAR_VARIABLE == ft) &&
- !(env->spare_grab.rgc_all) )
+ !(env->spare_src.ssrc_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_grab.rgc_vars, obj->_.var.vname)) ) ||
+ (0 <= dk_set_position_of_string (env->spare_src.ssrc_grab.rgc_vars, obj->_.var.vname)) ) ||
((SPAR_QNAME == objt) &&
- (0 <= dk_set_position_of_string (env->spare_grab.rgc_consts, obj->_.lit.val)) ) )
+ (0 <= dk_set_position_of_string (env->spare_src.ssrc_grab.rgc_consts, obj->_.lit.val)) ) )
{
- t_set_push_new_string (&(env->spare_grab.rgc_sa_vars), t_box_dv_uname_string (fld->_.var.vname));
+ t_set_push_new_string (&(env->spare_src.ssrc_grab.rgc_sa_vars), t_box_dv_uname_string (fld->_.var.vname));
}
}
}
@@ -2739,11 +3087,18 @@ 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)(0), SPART_BAD_EQUIV_IDX, SPART_RVR_LIST_OF_NULLS );
+ (ptrlong)(SPART_VAR_OUTSIDE_TRIPLE), 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;
@@ -2755,7 +3110,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)0, SPART_BAD_EQUIV_IDX, SPART_RVR_LIST_OF_NULLS, (ptrlong)bracketed );
+ (ptrlong)SPART_VAR_OUTSIDE_TRIPLE, 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;
}
@@ -2844,7 +3199,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 = iri_expn->_.qname.val;
+ caddr_t iri = ((SPAR_QNAME == SPART_TYPE (iri_expn)) ? iri_expn->_.qname.val : NULL);
dk_set_t *set_ptr;
int *is_locked_ptr = NULL;
SPART *dupe_found = NULL;
@@ -2853,64 +3208,67 @@ sparp_make_and_push_new_graph_source (sparp_t *sparp, ptrlong subtype, SPART *ir
switch (subtype)
{
case SPART_GRAPH_FROM:
- spare->spare_default_graphs_listed++;
- is_locked_ptr = &(spare->spare_default_graphs_locked);
+ spare->spare_src.ssrc_default_graphs_listed++;
+ is_locked_ptr = &(spare->spare_src.ssrc_default_graphs_locked);
/* no break */
case SPART_GRAPH_NOT_FROM:
- set_ptr = &(spare->spare_default_graphs);
+ set_ptr = &(spare->spare_src.ssrc_default_graphs);
break;
case SPART_GRAPH_NAMED:
- spare->spare_named_graphs_listed++;
- is_locked_ptr = &(spare->spare_named_graphs_locked);
+ spare->spare_src.ssrc_named_graphs_listed++;
+ is_locked_ptr = &(spare->spare_src.ssrc_named_graphs_locked);
/* no break */
case SPART_GRAPH_NOT_NAMED:
- set_ptr = &(spare->spare_named_graphs);
+ set_ptr = &(spare->spare_src.ssrc_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;
}
- DO_SET (SPART *, c, set_ptr)
+ if (NULL != iri)
{
- if ((subtype < SPART_GRAPH_MIN_NEGATION) && (SPART_GRAPH_MIN_NEGATION < c->_.graph.subtype))
+ DO_SET (SPART *, c, set_ptr)
{
- if (is_locked_ptr && is_locked_ptr[0])
+ if (strcmp (c->_.graph.iri, iri))
+ continue;
+ if ((subtype < SPART_GRAPH_MIN_NEGATION) && (SPART_GRAPH_MIN_NEGATION < c->_.graph.subtype))
{
- 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 );
+ 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;
}
- 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, iri);
+ spar_error (sparp, "FROM %s <%.200s> clause violates security restrictions on allowed graph names", fty, ((NULL != iri) ? "..." : 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, iri);
+ spar_error (sparp, "NOT FROM%s <%.200s> clause can not have options, only FROM and FROM NAMED can", fty, ((NULL != iri) ? "..." : iri));
}
- if (rdf_graph_group_dict_htable->ht_count)
+ if ((NULL != iri) && rdf_graph_group_dict_htable->ht_count)
{
caddr_t iid = sparp_graph_sec_iri_to_id_nosignal (sparp, iri);
if (NULL != iid)
{
mutex_enter (rdf_graph_group_dict_htable->ht_mutex);
- group_members_ptr = (caddr_t **)id_hash_get (rdf_graph_group_dict_htable, (caddr_t)(&iid));
+ group_members_ptr = (caddr_t **)id_hash_get (rdf_graph_group_dict_htable, (caddr_t)(&iid));
mutex_leave (rdf_graph_group_dict_htable->ht_mutex);
}
dk_free_tree (iid);
@@ -2951,8 +3309,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_grab);
- dk_set_t *opts_ptr = &(sparp->sparp_env->spare_common_sponge_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);
SPART **mixed_options, **mixed_tail;
int common_count, ctr;
user_t *exec_user;
@@ -2972,14 +3330,14 @@ 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)
{
- caddr_t param = (caddr_t)(options[ctr]);
+ ccaddr_t param = (ccaddr_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 (0 < dk_set_position_of_string (opts_ptr[0], param))
+ if (NULL != dk_set_getptr_keyword (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)(param));
(mixed_tail++)[0] = (SPART *)t_full_box_copy_tree ((caddr_t)(options[ctr + 1]));
}
if (!IS_BOX_POINTER (sparp->sparp_env->spare_sql_refresh_free_text))
@@ -2998,13 +3356,28 @@ sparp_make_graph_precode (sparp_t *sparp, ptrlong subtype, SPART *iriref, SPART
}
SPART *
-spar_default_sparul_target (sparp_t *sparp, const char *clause_type)
+spar_default_sparul_target (sparp_t *sparp, const char *clause_type, int may_return_null)
{
- dk_set_t dflt_graphs = sparp->sparp_env->spare_default_graphs;
+ 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);
+ }
if ((NULL == dflt_graphs) || (((SPART *)(dflt_graphs->data))->_.graph.subtype > SPART_GRAPH_MIN_NEGATION))
- spar_error (sparp, "No %.200s and no default graph specified in the preamble", clause_type);
+ {
+ if (may_return_null)
+ return NULL;
+ 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))
- spar_error (sparp, "No %.200s and more than one default graph specified in the preamble", clause_type);
+ {
+ if (may_return_null)
+ return NULL;
+ 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);
@@ -3058,12 +3431,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 spartlist (sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)LIKE_L,
- t_list (2, strg,
+ return sparp_make_builtin_call (sparp, LIKE_L,
+ (SPART **)t_list (2, strg,
spartlist (sparp, 4, SPAR_LIT, like_tmpl, NULL, NULL) ) );
bad_regex:
- return spartlist (sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)REGEX_L, t_list (2, strg, regexpn));
+ return sparp_make_builtin_call (sparp, SPAR_BIF_REGEX, (SPART **)t_list (2, strg, regexpn));
}
void
@@ -3075,13 +3448,25 @@ 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",
@@ -3092,11 +3477,15 @@ 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_LOAD",
+ "SPARUL_ADD",
"SPARUL_CLEAR",
+ "SPARUL_COPY",
"SPARUL_CREATE",
"SPARUL_DROP",
+ "SPARUL_LOAD",
+ "SPARUL_MOVE",
"SPARUL_RUN",
"TTLP",
"TTLP_EV_GET_IID",
@@ -3202,7 +3591,14 @@ spar_make_funcall (sparp_t *sparp, int aggregate_mode, const char *funname, SPAR
if (!(sparp->sparp_allow_aggregates_in_expn & 1))
spar_error (sparp, "Aggregate function %.100s() is not allowed outside result-set expressions", funname);
aggr_checked:
- if (strncmp (funname, "bif:", 4))
+ if (!strncmp (funname, "bif:", 4))
+ {
+ caddr_t bifname = t_sqlp_box_id_upcase (funname+4);
+ bif_t descr = bif_find (bifname);
+ if (NULL == descr)
+ spar_error (sparp, "Unknown function %.100s()", funname);
+ }
+ else
{
xpf_metadata_t *metas = NULL;
caddr_t colonized_funname = spar_colonize_qname_uname (funname);
@@ -3236,24 +3632,195 @@ aggr_checked:
}
xpf_checked:
if (aggregate_mode)
- sparp->sparp_query_uses_aggregates++;
+ {
+ if (SPARP_DEFBODY & sparp->sparp_macro_mode)
+ sparp->sparp_current_macro->_.defmacro.aggregate_count++;
+ else
+ 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_DRAFT , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , 0 },
+ { "bnode" , SPAR_BIF_BNODE , '-' , SSG_SD_SPARQL11_DRAFT , 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_DRAFT , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , 0 },
+ { "coalesce" , SPAR_BIF_COALESCE , '-' , SSG_SD_SPARQL11_DRAFT , 0 , 0xFFF , NULL , { SSG_VALMODE_SQLVAL, NULL, NULL} , 0 },
+ { "concat" , SPAR_BIF_CONCAT , 'B' , SSG_SD_SPARQL11_DRAFT , 0 , 0xFFF , NULL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
+ { "contains" , SPAR_BIF_CONTAINS , 'B' , SSG_SD_SPARQL11_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 1 , 1 , SSG_VALMODE_LONG , { SSG_VALMODE_LONG, NULL, NULL} , SPART_VARR_IS_LIT },
+ { "md5" , SPAR_BIF_MD5 , 'B' , SSG_SD_SPARQL11_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 2 , 2 , SSG_VALMODE_LONG , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT },
+ { "strends" , SPAR_BIF_STRENDS , 'B' , SSG_SD_SPARQL11_DRAFT , 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_DRAFT , 2 , 2 , SSG_VALMODE_LONG , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT },
+ { "strlen" , SPAR_BIF_STRLEN , 'B' , SSG_SD_SPARQL11_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 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_DRAFT , 1 , 1 , SSG_VALMODE_LONG , { SSG_VALMODE_LONG, NULL, NULL} , SPART_VARR_IS_LIT },
+ { "uri" , SPAR_BIF_URI , '-' , SSG_SD_BI_OR_SPARQL11_DRAFT , 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_DRAFT , 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 *
-spar_make_sparul_mdw (sparp_t *sparp, ptrlong subtype, const char *opname, SPART *graph_precode, SPART *aux_op)
+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)
+{
+ 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 (11, graph_precode,
+ (SPART **)t_list (13, 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),
@@ -3261,38 +3828,112 @@ 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)) );
+ spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp), options_vector_call,
+ (SPART *)t_box_num_nonull (silent) ) );
else
- call = spar_make_funcall (sparp, 0, t_box_sprintf (30, "sql:SPARUL_%.15s", opname),
- (SPART **)t_list (5, graph_precode, aux_op, spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp)) );
+ call = spar_make_funcall (sparp, 0, t_box_sprintf (30, "sql:SPARUL_%.30s", 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) ) );
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)
+spar_make_sparul_clear (sparp_t *sparp, SPART *graph_precode, int silent)
{
- return spar_make_sparul_mdw (sparp, CLEAR_L, "CLEAR", graph_precode, (SPART *)t_box_num_nonull (0) /* i.e. not inside sponge */);
+ 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);
}
SPART *
-spar_make_sparul_load (sparp_t *sparp, SPART *graph_precode, SPART *src_precode)
+spar_make_sparul_load (sparp_t *sparp, SPART *graph_precode, SPART *src_precode, int silent)
{
- return spar_make_sparul_mdw (sparp, LOAD_L, "LOAD", graph_precode, src_precode);
+ return spar_make_sparul_mdw (sparp, LOAD_L, "LOAD", graph_precode, src_precode, silent);
+}
+
+SPART *
+spar_make_sparul_load_service_data (sparp_t *sparp, SPART *proxy_iri_precode, SPART *service_iri_precode, int silent)
+{
+ return spar_make_sparul_mdw (sparp, LOAD_L, "LOAD_SERVICE_DATA", proxy_iri_precode, service_iri_precode, silent);
}
SPART *
spar_make_sparul_create (sparp_t *sparp, SPART *graph_precode, int silent)
{
- return spar_make_sparul_mdw (sparp, CREATE_L, "CREATE", graph_precode, (SPART *)t_box_num_nonull (silent));
+ return spar_make_sparul_mdw (sparp, CREATE_L, "CREATE", graph_precode, NULL, silent);
}
SPART *
spar_make_sparul_drop (sparp_t *sparp, SPART *graph_precode, int silent)
{
- return spar_make_sparul_mdw (sparp, DROP_L, "DROP", graph_precode, (SPART *)t_box_num_nonull (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);
}
SPART *
@@ -3305,7 +3946,7 @@ spar_make_topmost_sparul_sql (sparp_t *sparp, SPART **actions)
SPART **action_sqls;
caddr_t volatile err = NULL;
int action_ctr, action_count = BOX_ELEMENTS (actions);
- if ((1 == action_count) && (spar_compose_report_flag (sparp)))
+ if ((1 == action_count) && unbox (spar_compose_report_flag (sparp)))
return actions[0]; /* No need to make grouping around single action. */
/* First of all, every tree for every action is compiled into string literal containing SQL text. */
action_sqls = (SPART **)t_alloc_box (action_count * sizeof (SPART *), DV_ARRAY_OF_POINTER);
@@ -3320,7 +3961,6 @@ 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
@@ -3333,19 +3973,18 @@ spar_make_topmost_sparul_sql (sparp_t *sparp, SPART **actions)
ssg.ssg_sparp = sparp;
ssg.ssg_tree = sparp->sparp_expr;
ssg.ssg_sources = ssg.ssg_tree->_.req_top.sources; /*!!!TBD merge with environment */
-
QR_RESET_CTX
- {
- ssg_make_sql_query_text (&ssg);
- }
+ {
+ ssg_make_sql_query_text (&ssg);
+ }
QR_RESET_CODE
- {
- du_thread_t * self = THREAD_CURRENT_THREAD;
- err = thr_get_error_code (self);
+ {
+ du_thread_t * self = THREAD_CURRENT_THREAD;
+ err = thr_get_error_code (self);
ssg_free_internals (&ssg);
- POP_QR_RESET;
- sqlr_resignal (err);
- }
+ POP_QR_RESET;
+ sqlr_resignal (err);
+ }
END_QR_RESET;
action_sql = t_strses_string (ssg.ssg_out);
ssg_free_internals (&ssg);
@@ -3370,8 +4009,8 @@ spar_make_fake_action_solution (sparp_t *sparp)
SPART * fake_gp;
spar_gp_init (sparp, WHERE_L);
fake_gp = spar_gp_finalize (sparp, NULL);
- return spartlist (sparp, 7, SPAR_WHERE_MODIFS,
- fake_gp, NULL, NULL, NULL, t_box_num(1), t_box_num(0) );
+ return spartlist (sparp, 8, SPAR_WHERE_MODIFS,
+ fake_gp, NULL, NULL, NULL, t_box_num(1), t_box_num(0), NULL );
}
id_hashed_key_t
@@ -3390,7 +4029,6 @@ spar_var_hash (caddr_t p_data)
return ((h1 ^ h2 ^ v->_.var.tr_idx) & ID_HASHED_KEY_MASK);
}
-
int
spar_var_cmp (caddr_t p_data1, caddr_t p_data2)
{
@@ -3402,7 +4040,7 @@ spar_var_cmp (caddr_t p_data1, caddr_t p_data2)
if (0 != res) return res;
res = strcmp (v1->_.var.vname, v2->_.var.vname);
if (0 != res) return res;
- return strcmp (v1->_.var.tabid, v2->_.var.tabid);
+ return strcmp ((NULL != v1->_.var.tabid) ? v1->_.var.tabid : "", (NULL != v2->_.var.tabid) ? v2->_.var.tabid : "");
}
caddr_t
@@ -3449,6 +4087,22 @@ 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)
{
@@ -3477,16 +4131,16 @@ static caddr_t boxed_8192_iid = NULL;
if (NULL != boxed_graph_iid)
{
mutex_enter (rdf_graph_group_of_privates_dict_htable->ht_mutex);
- if (NULL != id_hash_get (rdf_graph_group_of_privates_dict_htable, (caddr_t)(&(boxed_graph_iid))))
- {
- graph_is_private = 1;
- dflt_perms_of_user = rdf_graph_default_private_perms_of_user_dict_htable;
- dflt_other_perms_of_user = rdf_graph_default_world_perms_of_user_dict_htable;
- }
+ if (NULL != id_hash_get (rdf_graph_group_of_privates_dict_htable, (caddr_t)(&(boxed_graph_iid))))
+ {
+ graph_is_private = 1;
+ dflt_perms_of_user = rdf_graph_default_private_perms_of_user_dict_htable;
+ dflt_other_perms_of_user = rdf_graph_default_world_perms_of_user_dict_htable;
+ }
mutex_leave (rdf_graph_group_of_privates_dict_htable->ht_mutex);
/*!!! maybe TBD: add retrieval of permissions of specific user on specific graph */
mutex_enter (dflt_perms_of_user->ht_mutex);
- hit = (caddr_t *)id_hash_get (dflt_perms_of_user, (caddr_t)(&(boxed_graph_iid)));
+ hit = (caddr_t *)id_hash_get (dflt_perms_of_user, (caddr_t)(&(boxed_uid /* not boxed_graph_iid */)));
mutex_leave (dflt_perms_of_user->ht_mutex);
}
if (NULL != hit)
@@ -3662,7 +4316,7 @@ sparp_t * dbg_curr_sparp;
#endif
sparp_t *
-sparp_query_parse (char * str, spar_query_env_t *sparqre, int rewrite_all)
+sparp_query_parse (const char * str, spar_query_env_t *sparqre, int rewrite_all)
{
wcharset_t *query_charset = sparqre->sparqre_query_charset;
t_NEW_VAR (sparp_t, sparp);
@@ -3721,7 +4375,8 @@ sparp_query_parse (char * str, spar_query_env_t *sparqre, int rewrite_all)
return sparp; /* see below */
}
END_QR_RESET
- /*xt_check (sparp, sparp->sparp_expr);*/
+ if (NULL != sparp->sparp_macrolib_to_create && !sparp->sparp_macrolib_ignore_create)
+ sparp->sparp_expr = spar_make_create_macro_lib (sparp);
#ifndef NDEBUG
t_check_tree (sparp->sparp_expr);
#endif
@@ -3763,14 +4418,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_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);
+ /* 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);
ENV_SET_COPY (spare_common_sql_table_options);
ENV_SET_COPY (spare_sql_select_options);
ENV_SET_COPY (spare_global_var_names);
@@ -3798,19 +4453,21 @@ 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_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_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_common_sql_table_options);
/* no copy for spare_groupings */
ENV_COPY (spare_sql_select_options);
/* no copy for spare_context_qms */
ENV_COPY (spare_context_qms);
+#if 0 /* This check is replaced with check for context qms if define input:storage appear */
if ((NULL != env_copy->spare_context_qms) && ((SPART *)((ptrlong)_STAR) != env_copy->spare_context_qms->data))
spar_error (sparp, "Subqueries are not allowed inside QUAD MAP group patterns other than 'QUAD MAP * {...}'");
+#endif
ENV_COPY (spare_context_graphs); /* Do we need this??? */
/* no copy for spare_context_subjects */
/* no copy for spare_context_predicates */
@@ -3924,7 +4581,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 param_ctr = 0;
+ int ctr, param_ctr = 0;
spar_query_env_t sparqre;
sparp_t * sparp;
caddr_t str = bif_string_arg (qst, args, 0, "sparql_explain");
@@ -3941,6 +4598,11 @@ 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
{
@@ -4033,7 +4695,7 @@ bif_sparql_to_sql_text (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
sparqre.sparqre_param_ctr = ¶m_ctr;
sparqre.sparqre_qi = (query_instance_t *) qst;
if (NULL != uname)
- sparqre.sparqre_exec_user = sec_name_to_user (uname);
+ sparqre.sparqre_exec_user = sec_name_to_user (uname);
sparp = sparp_query_parse (str, &sparqre, 1);
if (NULL != sparqre.sparqre_catched_error)
{
@@ -4322,8 +4984,8 @@ bif_sparql_quad_maps_for_quad_impl (caddr_t * qst, caddr_t * err_ret, state_slot
POP_QR_RESET;
if (SQL_SUCCESS != sparqre.sparqre_catched_error) /* if err is SQL_SUCCESS will be done bellow as no jump will occur */
{
- ssg_free_internals (&ssg);
- MP_DONE ();
+ ssg_free_internals (&ssg);
+ MP_DONE ();
}
sqlr_resignal (sparqre.sparqre_catched_error);
}
@@ -4581,8 +5243,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_DEFAULT);
- id_to_iri_cached_qr = sql_compile_static (id_to_iri_text, bootstrap_cli, &err, SQLC_DEFAULT);
+ 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);
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
new file mode 100644
index 0000000..be7348a
--- /dev/null
+++ b/libsrc/Wi/sparql_init.sql
@@ -0,0 +1,367 @@
+--
+-- $Id$
+--
+-- 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);
+}
+;
+
+create procedure DB.DBA.RDF_INIT_SINGLE_SERVER ()
+{
+ if (1 <> sys_stat ('cl_run_local_only'))
+ return;
+ DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO ();
+}
+;
+
+DB.DBA.RDF_INIT_SINGLE_SERVER ()
+;
+
diff --git a/libsrc/Wi/sparql_io.sql b/libsrc/Wi/sparql_io.sql
index 5392cb0..7210c33 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.67 2011/10/28 13:14:20 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2011 OpenLink Software
+-- 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
@@ -243,13 +243,14 @@ create procedure DB.DBA.SPARQL_REXEC_INT (
in maxrows integer,
inout metas any,
inout bnode_dict any,
- in expected_var_list any := null
+ in expected_var_list any := null,
+ in options any := null
)
{
declare quest_pos integer;
declare req_uri, req_method, req_body, local_req_hdr, ret_body, ret_hdr any;
declare ret_content_type, ret_known_content_type, ret_format varchar;
- -- dbg_obj_princ ('DB.DBA.SPARQL_REXEC_INT (', res_mode, res_make_obj, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, ')');
+ -- dbg_obj_princ ('DB.DBA.SPARQL_REXEC_INT (', res_mode, res_make_obj, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, options, ')');
quest_pos := strchr (service, '?');
req_body := string_output();
if (quest_pos is not null)
@@ -274,9 +275,12 @@ create procedure DB.DBA.SPARQL_REXEC_INT (
http (sprintf ('&maxrows=%d', maxrows), req_body);
req_body := string_output_string (req_body);
local_req_hdr := 'Accept: application/sparql-results+xml, text/rdf+n3, text/rdf+ttl, text/rdf+turtle, text/turtle, application/turtle, application/x-turtle, application/rdf+xml, application/xml';
- if (length (req_body) + length (service) >= 1900)
+ req_method := coalesce (
+ get_keyword ('req_method', options, null),
+ (sparql define input:storage "" select ?mtd from virtrdf: where { `iri(?:service)` virtrdf:bestRequestMethod ?mtd }),
+ case when (length (req_body) + length (service) >= 1900) then 'POST' else 'GET' end );
+ if ('POST' = req_method)
{
- req_method := 'POST';
req_uri := service;
local_req_hdr := local_req_hdr || '\r\nContent-Type: application/x-www-form-urlencoded';
}
@@ -449,8 +453,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 (
@@ -532,11 +536,12 @@ create procedure DB.DBA.SPARQL_REXEC (
in named_graphs any,
in req_hdr any,
in maxrows integer,
- in bnode_dict any
+ in bnode_dict any,
+ in options any := null
)
{
declare metas any;
- DB.DBA.SPARQL_REXEC_INT (0, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict);
+ DB.DBA.SPARQL_REXEC_INT (0, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, options);
}
;
@@ -548,11 +553,12 @@ create function DB.DBA.SPARQL_REXEC_TO_ARRAY (
in req_hdr any,
in maxrows integer,
in bnode_dict any,
- in expected_var_list any := null
+ in expected_var_list any := null,
+ in options any := null
) returns any
{
declare metas any;
- return DB.DBA.SPARQL_REXEC_INT (1, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, expected_var_list);
+ return DB.DBA.SPARQL_REXEC_INT (1, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, expected_var_list, options);
}
;
@@ -564,11 +570,12 @@ create function DB.DBA.SPARQL_REXEC_TO_ARRAY_OF_OBJ (
in req_hdr any,
in maxrows integer,
in bnode_dict any,
- in expected_var_list any := null
+ in expected_var_list any := null,
+ in options any := null
) returns any
{
declare metas any;
- return DB.DBA.SPARQL_REXEC_INT (1, 1, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, expected_var_list);
+ return DB.DBA.SPARQL_REXEC_INT (1, 1, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, expected_var_list, options);
}
;
@@ -581,14 +588,272 @@ create procedure DB.DBA.SPARQL_REXEC_WITH_META (
in maxrows integer,
in bnode_dict any,
out metadata any,
- out resultset any
+ out resultset any,
+ in options any := null
)
{
- resultset := DB.DBA.SPARQL_REXEC_INT (1, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metadata, bnode_dict);
+ resultset := DB.DBA.SPARQL_REXEC_INT (1, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metadata, bnode_dict, options);
-- dbg_obj_princ ('DB.DBA.SPARQL_REXEC_WITH_META (): metadata = ', metadata, ' resultset = ', resultset);
}
;
+create procedure DB.DBA.SPARQL_SD_PROBE (in service_iri varchar, in proxy_iri varchar := null, in verbose integer := 0, in inside_resultset integer := 0)
+{
+ declare STAT, MSG varchar;
+ declare g_iri, lang_bits_hex varchar;
+ declare guess_bits, lang_bits, get_is_ok, post_is_ok integer;
+ if (not inside_resultset)
+ result_names (STAT, MSG);
+ lang_bits := 0;
+ g_iri := null;
+ get_is_ok := null;
+ post_is_ok := null;
+ if (isstring (registry_get ('URIQADefaultHost')) and strstr (service_iri, registry_get ('URIQADefaultHost')) is not null)
+ signal ('22023', 'Can not load own service description');
+ if (exists (sparql define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ ask { graph `iri (?:service_iri)` { { ?s a sd:Service } union { ?s sd:endpoint ?ep } } } ) )
+ {
+ result ('00000', 'The graph <' || service_iri || '> contains old service description data, the graph will be erased first');
+ sparql define input:storage "" clear graph iri (?:service_iri);
+ commit work;
+ }
+ if (proxy_iri is not null)
+ {
+ sparql load iri (?:proxy_iri);
+ if (not exists (sparql define input:storage "" ask where { graph `iri(?:proxy_iri)` { ?s ?p ?o }}))
+ signal ('22023', 'The resource <' || proxy_iri || '> exists but does not contain any RDF data');
+ if (not exists (sparql define input:storage ""
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ ask where { graph `iri(?:proxy_iri)` { ?s sd:endpoint ?o }}))
+ signal ('22023', 'The resource <' || proxy_iri || '> exists but does not contain service description data');
+ if (not exists (sparql define input:storage ""
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ ask where { graph `iri(?:proxy_iri)` { ?s sd:endpoint ?o }}))
+ {
+ result ('0000', 'The resource <' || proxy_iri || '> exists and describes some services but not the desired service <' || service_iri || '>');
+ goto g_done;
+ }
+ g_iri := proxy_iri;
+ goto g_done;
+ }
+ if (not (ends_with (service_iri, '-sd')))
+ {
+ declare sd_iri varchar;
+ sd_iri := service_iri || '-sd';
+ if (exists (sparql define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ ask { graph `iri (?:sd_iri)` { { ?s a sd:Service } union { ?s sd:endpoint ?ep } } }))
+ {
+ result ('00000', 'The graph <' || sd_iri || '> contains old service description data, the graph will be erased first');
+ sparql define input:storage "" clear graph iri (?:sd_iri);
+ commit work;
+ }
+ whenever sqlstate '*' goto no_sd;
+ result ('00000', 'Trying to load <' || sd_iri || '> as a standalone service description...');
+ sparql load iri (?:sd_iri);
+ if (not exists (sparql define input:storage "" ask where { graph `iri(?:sd_iri)` { ?s ?p ?o }}))
+ {
+ result ('00000', 'The resource <' || sd_iri || '> does not contain any RDF data, ignored');
+ goto no_sd;
+ }
+ if (not exists (sparql define input:storage ""
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ ask where { graph `iri(?:sd_iri)` { ?s sd:endpoint ?o }}))
+ {
+ result ('00000', 'The resource <' || sd_iri || '> exists but does not contain service description data, ignored');
+ goto no_sd;
+ }
+ g_iri := sd_iri;
+ result ('00000', 'The resource <' || sd_iri || '> contains service description data and is used as an authoritative source');
+ goto g_done;
+ }
+no_sd:
+ if (verbose)
+ result (__SQL_STATE, __SQL_MESSAGE);
+ {
+ whenever sqlstate '*' goto g_done;
+ result ('00000', 'Trying to load <' || service_iri || '> as self-description of the service...');
+ sparql load iri (?:service_iri);
+ if (not exists (sparql define input:storage "" ask where { graph `iri(?:service_iri)` { ?s ?p ?o }}))
+ {
+ result ('00000', 'The resource <' || service_iri || '> exists but does not contain any RDF data, ignored');
+ goto g_done;
+ }
+ if (not exists (sparql define input:storage ""
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ ask where { graph `iri(?:service_iri)` { ?s sd:endpoint ?o }}))
+ {
+ result ('00000', 'The resource <' || service_iri || '> exists but does not contain service description data, ignored');
+ goto g_done;
+ }
+ g_iri := service_iri;
+ goto g_done;
+ }
+ if (verbose)
+ result (__SQL_STATE, __SQL_MESSAGE);
+g_done:
+ if (g_iri is not null)
+ {
+ declare srv_iri varchar;
+ srv_iri := (sparql define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ select ?srv where { graph `iri(?:g_iri)` { ?srv sd:endpoint `iri (?:service_iri)` } }
+ order by desc (str (?srv)) limit 1 );
+ if (srv_iri is null)
+ signal ('22023', 'The resource <' || g_iri || '> is loaded but it does not contain metadata related to <' || service_iri || '> as a SPARQL web service endpoint');
+ for (sparql define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ select ?endpoint
+ where { graph `iri(?:g_iri)` { `iri(?:srv_iri)` sd:endpoint ?endpoint } } ) do
+ {
+ sparql
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ insert in virtrdf: { `iri(?:endpoint)` virtrdf:isEndpointOfService `iri(?:srv_iri)` };
+ DB.DBA.SECURITY_CL_EXEC_AND_LOG ('jso_triple_add (?,?,?)', vector ("endpoint", UNAME'http://www.openlinksw.com/schemas/virtrdf#isEndpointOfService', srv_iri));
+ result ('00000', 'The IRI <' || endpoint || '> is registered as an web service endpoint of SPARQL service <' || service_iri || '>');
+ }
+ declare feats any;
+ feats := vector (
+ 'QUAD_MAP' , 0hex0001,
+ 'OPTION' , 0hex0002,
+ 'BREAKUP' , 0hex0004,
+ 'PKSELFJOIN' , 0hex0008,
+ 'RVR' , 0hex0010,
+ 'IN' , 0hex0020,
+ 'LIKE' , 0hex0040,
+ 'GLOBALS' , 0hex0080,
+ 'BI' , 0hex0100,
+ 'VIRTSPECIFIC' , 0hex0200,
+ 'VOS_509' , 0hex03FF,
+ 'SERVICE' , 0hex0400,
+ 'VOS_5_LATEST' , 0hex0FFF,
+ 'TRANSIT' , 0hex1000,
+ 'VOS_6' , 0hex1FFF,
+ 'SPARQL11_DRAFT' , 0hex2000,
+ 'SPARQL11_FULL' , 0hex4000,
+ 'SPARQL11' , 0hex6000 );
+ for (sparql define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ select (bif:subseq (str(?le), bif:length (str(virtrdf:SSG_SD_)))) as ?feat
+ where { graph `iri (?:g_iri)` { { `iri(?:srv_iri)` sd:languageExtension ?le } union { `iri(?:service_iri)` sd:languageExtension ?le } } } ) do
+ {
+ declare bits integer;
+ bits := get_keyword ("feat", feats, 0);
+ lang_bits := bit_or (lang_bits, bits);
+ }
+ if (lang_bits = 0)
+ result ('00000', 'The service metadata does not contain enough data about language capabilities, they will be probed by sample requests');
+ else
+ result ('00000', sprintf ('The service metadata contains data about language capabilities: equivalent of define lang:dialect %d (hex %8x)', lang_bits, lang_bits));
+ for (sparql define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ select ?mtd
+ where { graph `iri (?:g_iri)` { `iri(?:srv_iri)` virtrdf:requestMethod ?mtd } } ) do
+ {
+ if ('POST' = mtd) post_is_ok := 1;
+ else if ('GET' = mtd) get_is_ok := 1;
+ }
+ }
+ if (get_is_ok is null and post_is_ok is null)
+ {
+ {
+ whenever sqlstate '*' goto bad_get_endpoint;
+ result ('00000', 'Trying to query <' || service_iri || '> as SPARQL web service endpoint, GET mode...');
+ DB.DBA.SPARQL_REXEC_TO_ARRAY (service_iri, 'select ?s where { ?s ?p ?o } limit 1', null, null, null, 1, null, null, vector ('req_method', 'GET'));
+ }
+ get_is_ok := 1;
+ goto get_done;
+bad_get_endpoint:
+ if (verbose)
+ result (__SQL_STATE, __SQL_MESSAGE);
+ get_is_ok := 0;
+get_done: ;
+ {
+ whenever sqlstate '*' goto bad_post_endpoint;
+ result ('00000', 'Trying to query <' || service_iri || '> as SPARQL web service endpoint, POST mode...');
+ DB.DBA.SPARQL_REXEC_TO_ARRAY (service_iri, 'select ?s where { ?s ?p ?o } limit 1', null, null, null, 1, null, null, vector ('req_method', 'POST'));
+ }
+ post_is_ok := 1;
+ goto post_done;
+bad_post_endpoint:
+ if (verbose)
+ result (__SQL_STATE, __SQL_MESSAGE);
+ post_is_ok := 0;
+post_done: ;
+ }
+ if (get_is_ok or post_is_ok)
+ {
+ declare req_method varchar;
+ req_method := case when (get_is_ok and post_is_ok) then null when (get_is_ok) then 'GET' when (post_is_ok) then 'POST' else null end;
+ sparql
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ delete from virtrdf: { `iri(?:service_iri)` virtrdf:bestRequestMethod ?o }
+ from virtrdf: where { `iri(?:service_iri)` virtrdf:bestRequestMethod ?o };
+ sparql
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ insert in virtrdf: { `iri(?:service_iri)` virtrdf:bestRequestMethod `(?:req_method)` };
+ commit work;
+ DB.DBA.SECURITY_CL_EXEC_AND_LOG ('jso_triples_del (?,?,null)', vector (service_iri, UNAME'http://www.openlinksw.com/schemas/virtrdf#bestRequestMethod'));
+ if (req_method is not null)
+ DB.DBA.SECURITY_CL_EXEC_AND_LOG ('jso_triple_add (?,?,?)', vector (service_iri, UNAME'http://www.openlinksw.com/schemas/virtrdf#bestRequestMethod', req_method));
+ }
+ else
+ signal ('22023', 'The service <' || service_iri || '> has no description and the site is not responding as a SPARQL endpoint');
+ if (lang_bits = 0)
+ {
+ declare feats any;
+ declare ctr, len integer;
+ feats := vector (
+ 'prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#> select ?s where { quad map virtrdf:DefaultQuadMap { ?s ?p ?o } } limit 1' , 0hex0001,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o OPTION (TABLE_OPTION "ORDER") } } limit 1' , 0hex0002,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o OPTION (BREAKUP) } } limit 1' , 0hex0004,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o OPTION (PKSELFJOIN) } } limit 1' , 0hex0008,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o OPTION (RVR) } } limit 1' , 0hex0010,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o . filter (?o in ( 1, 2, 3)) } } limit 1' , 0hex0020,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o . filter (?o like "%qaz%") } } limit 1' , 0hex0040,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?:oglobal } } limit 1' , 0hex0080,
+ 'select (str(?s) as ?str) where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o } } group by ?s limit 1' , 0hex0100,
+ 'define input:storage "" select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o } } limit 1' , 0hex0200,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o } . service <http://dbpedia.org/sparql> { ?s <no-such-p-qazxswedc> ?t } } limit 1' , 0hex0400,
+ 'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> <no-such-o-qazxswedc> OPTION (TRANSITIVE) } } limit 1' , 0hex1000,
+ 'select (strdt (group_concat (?o), datatype (max(?o)) as ?gc) where { graph <no-such-g-qazxswedc> { { ?s <no-such-p-qazxswedc> ?o } MINUS { ?s <no-such-p-qazxswedc> <no-such-o-qazxswedc> } } group by ?s having ?o > 1 } limit 1' , 0hex2000 );
+ len := length (feats);
+ for (ctr := 0; ctr < len; ctr := ctr + 2)
+ {
+ whenever sqlstate '*' goto no_such_feat;
+ result ('00000', sprintf ('Test query %d/%d: define lang:dialect %d (hex %08x)...', ctr/2, len/2, feats[ctr+1], feats[ctr+1]));
+ DB.DBA.SPARQL_REXEC_TO_ARRAY (service_iri, feats[ctr], null, null, null, 1, null);
+ lang_bits := bit_or (lang_bits, feats[ctr+1]);
+ result ('00000', sprintf ('Test query %d/%d has found support for define lang:dialect %d (hex %08x)', ctr/2, len/2, feats[ctr+1], feats[ctr+1]));
+ goto probe_done;
+no_such_feat:
+ if (verbose)
+ result (__SQL_STATE, __SQL_MESSAGE);
+probe_done:;
+ }
+ result ('00000', sprintf ('The endpoint <' || service_iri || '> has support for define lang:dialect %d (hex %08x)', lang_bits, lang_bits));
+ }
+ sparql define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ delete from virtrdf: { `iri(?:service_iri)` virtrdf:dialect ?lb } from virtrdf: { `iri(?:service_iri)` virtrdf:dialect ?lb };
+ lang_bits_hex := sprintf ('%08x', lang_bits);
+ sparql define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ prefix sd: <http://www.w3.org/ns/sparql-service-description#>
+ insert in virtrdf: { `iri(?:service_iri)` virtrdf:dialect ?:lang_bits_hex };
+ DB.DBA.SECURITY_CL_EXEC_AND_LOG ('jso_triples_del (?,?,null)', vector (service_iri, UNAME'http://www.openlinksw.com/schemas/virtrdf#dialect'));
+ DB.DBA.SECURITY_CL_EXEC_AND_LOG ('jso_triple_add (?,?,?)', vector (service_iri, UNAME'http://www.openlinksw.com/schemas/virtrdf#dialect', lang_bits_hex));
+}
+;
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)
{
@@ -813,7 +1078,7 @@ create procedure DB.DBA.SPARQL_RESULTS_XML_WRITE_ROW (inout ses any, in mdta any
if (__tag (sql_val) = __tag of varchar) -- UTF-8 value kept in a DV_STRING box
sql_val := charset_recode (sql_val, 'UTF-8', '_WIDE_');
if (is_xml_lit) http ('<![CDATA[', ses);
- http_value (sql_val, 0, ses);
+ http_value (__rdf_strsqlval (sql_val), 0, ses);
if (is_xml_lit) http (']]>', ses);
http ('</literal></binding>', ses);
}
@@ -941,7 +1206,7 @@ create procedure DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_ROW (inout ses any, in mdta
_val := __rdf_sqlval_of_obj (_val, 1);
if (__tag (_val) = __tag of varchar) -- UTF-8 value kept in a DV_STRING box
_val := charset_recode (_val, 'UTF-8', '_WIDE_');
- http_value (_val, 0, ses);
+ http_value (__rdf_strsqlval (_val), 0, ses);
}
http ('</res:value></res:binding>', ses);
}
@@ -1314,6 +1579,34 @@ create procedure DB.DBA.SPARQL_RESULTS_CSV_WRITE (inout ses any, inout metas any
}
;
+create procedure DB.DBA.SPARQL_RESULTS_TSV_WRITE (inout ses any, inout metas any, inout rset any)
+{
+ declare varctr, varcount, resctr, rescount integer;
+ varcount := length (metas[0]);
+ rescount := length (rset);
+ for (varctr := 0; varctr < varcount; varctr := varctr + 1)
+ {
+ if (varctr > 0)
+ http('\t', ses);
+ DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, metas[0][varctr][0]);
+ }
+ http ('\n', ses);
+ for (resctr := 0; resctr < rescount; resctr := resctr + 1)
+ {
+ for (varctr := 0; varctr < varcount; varctr := varctr + 1)
+ {
+ declare val any;
+ val := rset[resctr][varctr];
+ if (varctr > 0)
+ http('\t', ses);
+ if (val is not null)
+ DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, val);
+ }
+ http('\n', ses);
+ }
+}
+;
+
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
{
@@ -1358,7 +1651,7 @@ create function DB.DBA.SPARQL_RESULTS_WRITE (inout ses any, inout metas any, ino
http ('@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n at prefix rs: <http://www.w3.org/2005/sparql-results#> .\n', ses);
http (sprintf ('[] rdf:type rs:results ; rs:boolean %s .', case (length (rset)) when 0 then 'false' else 'true' end), ses);
}
- else if (ret_format = 'CSV')
+ else if (ret_format = 'CSV' or ret_format = 'TSV')
{
http (sprintf ('"bool"\n%d\n', case (length (rset)) when 0 then 0 else 1 end), ses);
}
@@ -1384,6 +1677,8 @@ 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'))
@@ -1394,6 +1689,16 @@ 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);
@@ -1411,6 +1716,8 @@ create function DB.DBA.SPARQL_RESULTS_WRITE (inout ses any, inout metas any, ino
DB.DBA.RDF_TRIPLES_TO_CXML (triples, ses, accept, add_http_headers, 1, status);
else if (ret_format = 'CSV')
DB.DBA.RDF_TRIPLES_TO_CSV (triples, ses);
+ else if (ret_format = 'TSV')
+ DB.DBA.RDF_TRIPLES_TO_TSV (triples, ses);
else if (ret_format = 'SOAP')
{
declare soap_ns, spt_ns varchar;
@@ -1552,6 +1859,12 @@ create function DB.DBA.SPARQL_RESULTS_WRITE (inout ses any, inout metas any, ino
DB.DBA.SPARQL_RESULTS_CSV_WRITE (ses, metas, rset);
goto body_complete;
}
+ if (ret_format = 'TSV')
+ {
+ ret_mime := 'text/tab-separated-values';
+ DB.DBA.SPARQL_RESULTS_TSV_WRITE (ses, metas, rset);
+ goto body_complete;
+ }
ret_mime := 'application/sparql-results+xml';
SPARQL_RSET_XML_WRITE_NS (ses);
SPARQL_RESULTS_XML_WRITE_HEAD (ses, metas);
@@ -1559,7 +1872,7 @@ create function DB.DBA.SPARQL_RESULTS_WRITE (inout ses any, inout metas any, ino
http ('\n</sparql>', ses);
body_complete:
- if (add_http_headers)
+ if (add_http_headers and strcasestr (http_header_get (), 'Content-Type:') is null)
http_header (coalesce (http_header_get (), '') || 'Content-Type: ' || ret_mime || '; charset=UTF-8\r\n');
return ret_mime;
}
@@ -1568,45 +1881,99 @@ body_complete:
-- CLIENT --
--select -- dbg_obj_princ (soap_client (url=>'http://neo:6666/SPARQL', operation=>'querySoap', target_namespace=>'urn:FIXME', soap_action =>'urn:FIXME:querySoap', parameters=> vector ('Command', soap_box_structure ('Statement' , 'select TEST from DB.DBA.SPARQL_TABLE3'), 'Properties', soap_box_structure ('PropertyList', 'None' )), style=>2));
+create procedure WS.WS.SPARQL_ENDPOINT_SVC_DESC ()
+{
+ declare ses any;
+ ses := string_output ();
+ http (' <div xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"\n', ses);
+ http (' xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"\n', ses);
+ http (' xmlns="http://www.w3.org/1999/xhtml"\n', ses);
+ http (' xmlns:sd="http://www.w3.org/ns/sparql-service-description#"\n', ses);
+ http (' xmlns:xsd="http://www.w3.org/2001/XMLSchema#"\n', ses);
+ http (' style="display:none">\n', ses);
+ http (' <div class="description" about="" typeof="sd:Service">\n', ses);
+ http (sprintf (' <div rel="sd:endpoint" resource="http://%{WSHost}s/sparql"/>\n', ses), ses);
+ http (' <div rel="sd:feature"\n', ses);
+ http (' resource="http://www.w3.org/ns/sparql-service-description#UnionDefaultGraph"/>\n', ses);
+ http (' <div rel="sd:feature"\n', ses);
+ http (' resource="http://www.w3.org/ns/sparql-service-description#DereferencesURIs"/>\n', ses);
+ http (' <div rel="sd:resultFormat" resource="http://www.w3.org/ns/formats/RDF_XML"/>\n', ses);
+ http (' <div rel="sd:resultFormat" resource="http://www.w3.org/ns/formats/Turtle"/>\n', ses);
+ http (' <div rel="sd:resultFormat"\n', ses);
+ http (' resource="http://www.w3.org/ns/formats/SPARQL_Results_CSV"/>\n', ses);
+ http (' <div rel="sd:resultFormat" resource="http://www.w3.org/ns/formats/N-Triples"/>\n', ses);
+ http (' <div rel="sd:resultFormat" resource="http://www.w3.org/ns/formats/N3"/>\n', ses);
+ http (' <div rel="sd:resultFormat"\n', ses);
+ http (' resource="http://www.w3.org/ns/formats/SPARQL_Results_JSON"/>\n', ses);
+ http (' <div rel="sd:resultFormat" resource="http://www.w3.org/ns/formats/RDFa"/>\n', ses);
+ http (' <div rel="sd:resultFormat"\n', ses);
+ http (' resource="http://www.w3.org/ns/formats/SPARQL_Results_XML"/>\n', ses);
+ http (' <div rel="sd:supportedLanguage"\n', ses);
+ http (' resource="http://www.w3.org/ns/sparql-service-description#SPARQL10Query"/>\n', ses);
+ http (sprintf (' <div rel="sd:url" resource="http://%{WSHost}s/sparql"/>\n', ses), ses);
+ http (' </div>\n', ses);
+ http (' </div>\n', ses);
+ return ses;
+}
+;
+
create procedure WS.WS.SPARQL_VHOST_RESET ()
{
+ declare gr varchar;
+ declare oopts any;
+ oopts := null;
if (not exists (select 1 from "DB"."DBA"."SYS_USERS" where U_NAME = 'SPARQL'))
{
DB.DBA.USER_CREATE ('SPARQL', uuid(), vector ('DISABLED', 1, 'LOGIN_QUALIFIER', 'SPARQL'));
DB.DBA.EXEC_STMT ('grant SPARQL_SELECT to "SPARQL"', 0);
}
- if (registry_get ('__SPARQL_VHOST_RESET') >= '20110703')
+ if (registry_get ('__SPARQL_VHOST_RESET') >= '20120519')
return;
DB.DBA.VHOST_REMOVE (lpath=>'/SPARQL');
+ DB.DBA.VHOST_REMOVE (lpath=>'/services/sparql-query');
+ oopts := (select deserialize (HP_OPTIONS) from HTTP_PATH
+ where HP_PPATH = '/!sparql/' and HP_LPATH = '/sparql' and HP_HOST = '*ini*' and HP_LISTEN_HOST = '*ini*');
+ if (oopts is null) oopts := vector ('noinherit', 1);
DB.DBA.VHOST_REMOVE (lpath=>'/sparql');
- DB.DBA.VHOST_REMOVE (lpath=>'/sparql-auth');
+ DB.DBA.VHOST_DEFINE (lpath=>'/sparql/', ppath => '/!sparql/', is_dav => 1, vsp_user => 'dba', opts => oopts);
+ oopts := (select deserialize (HP_OPTIONS) from HTTP_PATH
+ where HP_PPATH = '/!sparql-graph-crud/' and HP_LPATH = '/sparql-graph-crud' and HP_HOST = '*ini*' and HP_LISTEN_HOST = '*ini*');
+ if (oopts is null) oopts := vector ('noinherit', 1, 'exec_as_get', 1);
DB.DBA.VHOST_REMOVE (lpath=>'/sparql-graph-crud');
- DB.DBA.VHOST_REMOVE (lpath=>'/sparql-graph-crud-auth');
- DB.DBA.VHOST_REMOVE (lpath=>'/services/sparql-query');
- DB.DBA.VHOST_DEFINE (lpath=>'/sparql/', ppath => '/!sparql/', is_dav => 1, vsp_user => 'dba', opts => vector('noinherit', 1));
- DB.DBA.VHOST_DEFINE (lpath=>'/sparql-graph-crud/', ppath => '/!sparql-graph-crud/', is_dav => 1, vsp_user => 'dba', opts => vector('noinherit', 1, 'exec_as_get', 1));
+ DB.DBA.VHOST_DEFINE (lpath=>'/sparql-graph-crud/', ppath => '/!sparql-graph-crud/', is_dav => 1, vsp_user => 'dba', opts => oopts);
+ oopts := (select deserialize (HP_OPTIONS) from HTTP_PATH
+ where HP_PPATH = '/!sparql/' and HP_LPATH = '/sparql-auth' and HP_HOST = '*ini*' and HP_LISTEN_HOST = '*ini*');
+ if (oopts is null) oopts := vector ('noinherit', 1);
DB.DBA.VHOST_REMOVE (lpath=>'/sparql-auth');
DB.DBA.VHOST_DEFINE (lpath=>'/sparql-auth',
ppath => '/!sparql/',
is_dav => 1,
vsp_user => 'dba',
- opts => vector('noinherit', 1),
+ opts => oopts,
auth_fn=>'DB.DBA.HP_AUTH_SPARQL_USER',
realm=>'SPARQL',
sec=>'digest');
+ oopts := (select deserialize (HP_OPTIONS) from HTTP_PATH
+ where HP_PPATH = '/!sparql-graph-crud/' and HP_LPATH = '/sparql-graph-crud-auth' and HP_HOST = '*ini*' and HP_LISTEN_HOST = '*ini*');
+ if (oopts is null) oopts := vector ('noinherit', 1, 'exec_as_get', 1);
+ DB.DBA.VHOST_REMOVE (lpath=>'/sparql-graph-crud-auth');
DB.DBA.VHOST_DEFINE (lpath=>'/sparql-graph-crud-auth',
ppath => '/!sparql-graph-crud/',
is_dav => 1,
vsp_user => 'dba',
- opts => vector('noinherit', 1, 'exec_as_get', 1),
+ opts => oopts,
auth_fn=>'DB.DBA.HP_AUTH_SPARQL_USER',
realm=>'SPARQL',
sec=>'digest');
--DB.DBA.EXEC_STMT ('grant execute on DB.."querySoap" to "SPARQL", 0);
--VHOST_DEFINE (lpath=>'/services/sparql-query', ppath=>'/SOAP/', soap_user=>'SPARQL',
-- soap_opts => vector ('ServiceName', 'XMLAnalysis', 'elementFormDefault', 'qualified'));
- registry_set ('__SPARQL_VHOST_RESET', '20110703');
+ DB.DBA.VHOST_REMOVE (lpath=>'/sparql-sd');
+ DB.DBA.VHOST_DEFINE (lpath=>'/sparql-sd/', ppath => '/!sparql-sd/', is_dav => 1, vsp_user => 'dba', opts => vector('noinherit', 1));
+ gr := concat ('http://', registry_get ('URIQADefaultHost'), '/sparql');
+ DB.DBA.RDF_LOAD_RDFA (WS.WS.SPARQL_ENDPOINT_SVC_DESC (), gr, gr);
+ registry_set ('__SPARQL_VHOST_RESET', '20120519');
}
;
@@ -1933,14 +2300,18 @@ 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+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');
+ 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(\'TSV\',\'text/tab-separated-values\');\n');
+ http(' format.options[15] = new Option(\'TriG\',\'application/x-trig\');\n');
if (can_cxml)
{
- http(' format.options[12] = new Option(\'CXML (Pivot Collection)\',\'text/cxml\');\n');
+ http(' format.options[15] = new Option(\'CXML (Pivot Collection)\',\'text/cxml\');\n');
if (can_qrcode)
- http(' format.options[13] = new Option(\'CXML (Pivot Collection with QRcodes)\',\'text/cxml+qrcode\');\n');
+ http(' format.options[16] = new Option(\'CXML (Pivot Collection with QRcodes)\',\'text/cxml+qrcode\');\n');
}
http(' format.selectedIndex = 1;\n');
http(' last_format = 2;\n');
@@ -1958,8 +2329,9 @@ create procedure WS.WS.SPARQL_ENDPOINT_JAVASCRIPT (in can_cxml integer, in can_q
http(' format.options[7] = new Option(\'RDF/XML\',\'application/rdf+xml\');\n');
http(' format.options[8] = new Option(\'N-Triples\',\'text/plain\');\n');
http(' format.options[9] = new Option(\'CSV\',\'text/csv\');\n');
+ http(' format.options[10] = new Option(\'TSV\',\'text/tab-separated-values\');\n');
if (can_cxml)
- http(' format.options[10] = new Option(\'CXML (Pivot Collection)\',\'text/cxml\');\n');
+ http(' format.options[11] = new Option(\'CXML (Pivot Collection)\',\'text/cxml\');\n');
http(' format.selectedIndex = 1;\n');
http(' last_format = 1;\n');
http(' }\n');
@@ -2028,16 +2400,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);
@@ -2049,43 +2421,47 @@ 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', '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')
- );
+ 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 ('text/tab-separated-values' , 'TSV' ),
+ vector ('application/x-trig' , 'TriG' ) );
}
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');
+ http(' <option value="text/tab-separated-values">TSV</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');
}
}
;
@@ -2179,10 +2555,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');
@@ -2191,7 +2567,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');
}
;
@@ -2217,10 +2593,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');
@@ -2229,7 +2605,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');
}
;
@@ -2267,7 +2643,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)
@@ -2394,6 +2770,7 @@ create procedure WS.WS.SPARQL_ENDPOINT_GENERATE_FORM(
http(' </form>\n');
http(' </div>\n\n');
WS.WS.SPARQL_ENDPOINT_FOOTER();
+ http (WS.WS.SPARQL_ENDPOINT_SVC_DESC ());
http('</body>\n');
http('</html>\n');
@@ -2401,6 +2778,7 @@ 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)
@@ -2464,6 +2842,7 @@ 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)
@@ -2559,7 +2938,7 @@ create procedure WS.WS."/!sparql/" (inout path varchar, inout params any, inout
(((2 = paramcount) and ('Content' = params[0])) and soap_ver = 0) or
qtxt = 1)
{
- declare redir varchar;
+ declare redir, acc varchar;
redir := registry_get ('WS.WS.SPARQL_DEFAULT_REDIRECT');
if (isstring (redir))
{
@@ -2574,10 +2953,22 @@ create procedure WS.WS."/!sparql/" (inout path varchar, inout params any, inout
def_qry := 'SELECT * WHERE {?s ?p ?o}';
}
+ if (qtxt <> 1)
+ {
+ acc := DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (http_request_header_full (lines, 'Accept', '*/*'));
+ if (strstr (acc, '/rdf+xml') is not null or strstr (acc, 'text/n3') is not null or strstr (acc, 'text/turtle') is not null)
+ {
+ query := sprintf ('construct { ?s ?p ?o } from <http://%s/sparql> { ?s ?p ?o }', registry_get ('URIQADefaultHost'));
+ accept := acc;
+ goto execute_query;
+ }
+ }
+
WS.WS.SPARQL_ENDPOINT_GENERATE_FORM(params, ini_dflt_graph, def_qry, timeout, debug, save_mode, dav_refresh);
- return;
+ return;
}
+ execute_query:
qry_params := dict_new (7);
for (paramctr := 0; paramctr < paramcount; paramctr := paramctr + 2)
{
@@ -2994,9 +3385,10 @@ 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)
{
@@ -3062,12 +3454,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
);
@@ -3082,20 +3474,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
@@ -3349,36 +3741,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:
@@ -3442,6 +3834,24 @@ graph_processing:
}
DB.DBA.RDF_LOAD_RDFXML (res_file, full_graph_uri, full_graph_uri);
}
+ else if (res_content_type = 'text/microdata+html')
+ {
+ if (reqbegin like 'PUT%')
+ {
+ sparql clear graph ?:full_graph_uri;
+ commit work;
+ }
+ DB.DBA.RDF_LOAD_XHTML_MICRODATA (res_file, full_graph_uri /* base */, full_graph_uri /* dest graph */);
+ }
+ else if (res_content_type = 'application/xhtml+xml')
+ {
+ if (reqbegin like 'PUT%')
+ {
+ sparql clear graph ?:full_graph_uri;
+ commit work;
+ }
+ DB.DBA.RDF_LOAD_RDFA (res_file, full_graph_uri /* base */, full_graph_uri /* dest graph */);
+ }
else
signal ('22023', 'The PUT request for graph <' || full_graph_uri || '> is rejected: the submitted resource is of unsupported type ' || coalesce (res_content_type, ''));
if (graph_exists is null)
@@ -3602,7 +4012,9 @@ 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 ('text/plain' = mime)
+ else if ('application/x-trig' = mime)
+ DB.DBA.RDF_TRIPLES_TO_TRIG (triples, out_ses);
+ else if ('text/plain' = mime or 'text/ntriples' = 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))
DB.DBA.RDF_TRIPLES_TO_TALIS_JSON (triples, out_ses);
@@ -3612,7 +4024,7 @@ create procedure DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV (
DB.DBA.RDF_TRIPLES_TO_JSON_LD (triples, out_ses);
else if ('application/xhtml+xml' = mime)
DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML (triples, out_ses);
- else if ('text/html' = mime)
+ else if (('text/html' = mime) or ('text/microdata+html' = mime) or ('text/md+html' = mime))
DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (triples, out_ses);
else if ('application/microdata+json' = mime)
DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (triples, out_ses);
@@ -3676,6 +4088,7 @@ 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
@@ -3698,6 +4111,153 @@ DB.DBA.http_rq_file_handler (in content any, in params any, in lines any, inout
}
;
+create procedure DB.DBA.SPARQL_SD_TRIPLE (inout sd any, in s varchar, in p varchar, in o varchar)
+{
+ if (starts_with (s, '!')) s := __xml_nsexpand_iristr (subseq (s, 1)); else s := __box_flags_tweak (s, 1);
+ if (starts_with (p, '!')) p := __xml_nsexpand_iristr (subseq (p, 1)); else p := __box_flags_tweak (p, 1);
+ if (starts_with (o, '!')) o := __xml_nsexpand_iristr (subseq (o, 1)); else o := __box_flags_tweak (o, 1);
+ vectorbld_acc (sd, vector (s, p, o));
+}
+;
+
+create procedure DB.DBA.SPARQL_SD_TRIPLE_L (inout sd any, in s varchar, in p varchar, in o any)
+{
+ if (starts_with (s, '!')) s := __xml_nsexpand_iristr (subseq (s, 1)); else s := __box_flags_tweak (s, 1);
+ if (starts_with (p, '!')) p := __xml_nsexpand_iristr (subseq (p, 1)); else p := __box_flags_tweak (p, 1);
+ vectorbld_acc (sd, vector (s, p, o));
+}
+;
+
+create procedure DB.DBA.SPARQL_SD_COMPOSE (inout sd any, in host varchar, in complete integer)
+{
+ declare service_iri varchar;
+ service_iri := 'http://' || host || '/sparql-sd';
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!rdf:type', '!sd:Service');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:endpoint', 'http://' || host || '/sparql');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:endpoint', 'http://' || host || '/sparql-auth');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!virtrdf:graph-crud-endpoint', 'http://' || host || '/sparql-graph-crud');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!virtrdf:graph-crud-endpoint', 'http://' || host || '/sparql-graph-crud-auth');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:feature', '!sd:UnionDefaultGraph');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:feature', '!sd:RequiresDataset');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:feature', '!sd:EmptyGraphs');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:feature', '!sd:BasicFederatedQuery');
+-- Results:
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', 'http://www.w3.org/ns/formats/N3');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', 'http://www.w3.org/ns/formats/N-triples');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', 'http://www.w3.org/ns/formats/RDFa');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', 'http://www.w3.org/ns/formats/RDF_XML');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', 'http://www.w3.org/ns/formats/SPARQL_Results_XML');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', 'http://www.w3.org/ns/formats/SPARQL_Results_JSON');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', 'http://www.w3.org/ns/formats/SPARQL_Results_CSV');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', 'http://www.w3.org/ns/formats/Turtle');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_SPARQL_Results_HTML');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_SPARQL_Results_Spreadsheet');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_SPARQL_Results_Javascript');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_SPARQL_Results_CXML');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_SPARQL_Results_CXML_QR');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_RDF_JSON');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_XHTML_RDFa');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_ATOM_XML');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_ODATA_JSON');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_HTML_list');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_HTML_table');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_HTML_Microdata');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_Microdata_JSON');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_CSV');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_CXML');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Triples_CXML_QR');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:resultFormat', '!virtrdf:FileFormat_Quads_TriG');
+-- Inputs:
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', 'http://www.w3.org/ns/formats/N3');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', 'http://www.w3.org/ns/formats/N-triples');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', 'http://www.w3.org/ns/formats/RDFa');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', 'http://www.w3.org/ns/formats/RDF_XML');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', 'http://www.w3.org/ns/formats/SPARQL_Results_XML');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', 'http://www.w3.org/ns/formats/SPARQL_Results_JSON');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', 'http://www.w3.org/ns/formats/SPARQL_Results_CSV');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', 'http://www.w3.org/ns/formats/Turtle');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_SPARQL_Results_HTML');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_SPARQL_Results_Spreadsheet');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_SPARQL_Results_Javascript');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_SPARQL_Results_CXML');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_SPARQL_Results_CXML_QR');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_RDF_JSON');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_XHTML_RDFa');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_ATOM_XML');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_ODATA_JSON');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_HTML_list');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_HTML_table');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_HTML_Microdata');
+ -- DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_Microdata_JSON');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_CSV');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_CXML');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Triples_CXML_QR');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:inputFormat', '!virtrdf:FileFormat_Quads_TriG');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:supportedLanguage', '!sd:SPARQL10Query');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:supportedLanguage', '!sd:SPARQL11Query');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:supportedLanguage', '!sd:SPARQL11Update');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_QUAD_MAP');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_OPTION');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_BREAKUP');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_PKSELFJOIN');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_RVR');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_IN');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_LIKE');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_GLOBALS');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_BI');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_VIRTSPECIFIC');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_SERVICE');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_TRANSIT');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:languageExtension', '!virtrdf:SSG_SD_SPARQL11_DRAFT');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:propertyFeature', '!bif:contains');
+ if (complete)
+ { -- List of extension functions and aggregates --- TBD!
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:extensionFunction', '!bif:abs');
+ DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, '!sd:extensionAggregate', '!sql:STDDEV');
+ }
+}
+;
+
+create procedure WS.WS."/!sparql-sd/" (inout path varchar, inout params any, inout lines any)
+{
+ declare sd, ses any;
+ declare service_iri varchar;
+ declare host, accept, formatter varchar;
+ host := http_request_header (lines, 'Host', null, '');
+ accept := http_request_header (lines, 'Accept', null, '');
+ -- dbg_obj_princ ('WS.WS."/!sparql-sd/" (', path, params, lines, ')');
+ if ((2 < length (params)) or (params[0] <> 'Content'))
+ {
+ WS.WS."/!sparql/" (path, params, lines);
+ return;
+ }
+ vectorbld_init (sd);
+ if (host is not null and host <> '')
+ DB.DBA.SPARQL_SD_COMPOSE (sd, host, 1);
+ if (isstring (registry_get ('URIQADefaultHost')))
+ DB.DBA.SPARQL_SD_COMPOSE (sd, registry_get ('URIQADefaultHost'), 1);
+ vectorbld_final (sd);
+ ses := null;
+ if (strstr (accept, 'text/rdf+n3') is not null)
+ { http_header ('Content-Type: text/rdf+n3; charset=UTF-8\r\n'); DB.DBA.RDF_TRIPLES_TO_NT (sd, ses); }
+ else if (strstr (accept, 'text/rdf+ttl') is not null)
+ { http_header ('Content-Type: text/rdf+ttl; charset=UTF-8\r\n'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }
+ else if (strstr (accept, 'text/rdf+turtle') is not null)
+ { http_header ('Content-Type: text/rdf+turtle; charset=UTF-8\r\n'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }
+ else if (strstr (accept, 'text/turtle') is not null)
+ { http_header ('Content-Type: text/turtle; charset=UTF-8\r\n'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }
+ else if (strstr (accept, 'application/turtle') is not null)
+ { http_header ('Content-Type: application/turtle; charset=UTF-8\r\n'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }
+ else if (strstr (accept, 'application/turtle') is not null)
+ { http_header ('Content-Type: application/x-turtle; charset=UTF-8\r\n'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }
+ else
+ { http_header ('Content-Type: text/turtle; charset=UTF-8\r\n'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }
+}
+;
+
+registry_set ('/!sparql-sd/', 'no_vsp_recompile')
+;
+
create procedure DB.DBA.RDF_GRANT_SPARQL_IO ()
{
declare state, msg varchar;
@@ -3708,8 +4268,10 @@ create procedure DB.DBA.RDF_GRANT_SPARQL_IO ()
'grant execute on DB.DBA.SPARQL_REXEC_WITH_META to SPARQL_SELECT',
'grant execute on WS.WS."/!sparql/" to "SPARQL"',
'grant execute on WS.WS."/!sparql-graph-crud/" to "SPARQL"',
+ 'grant execute on WS.WS."/!sparql-sd/" to "SPARQL"',
'grant execute on DB.DBA.SPARQL_REFRESH_DYNARES_RESULTS to "SPARQL"',
'grant execute on DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV to SPARQL_UPDATE',
+ 'grant execute on DB.DBA.SPARQL_SD_PROBE to SPARQL_SPONGE',
'grant execute on DB.DBA.SPARQL_SINV_IMP to SPARQL_SPONGE',
'grant select on DB.DBA.SPARQL_SINV_2 to SPARQL_SPONGE' );
foreach (varchar cmd in cmds) do
diff --git a/libsrc/Wi/sparql_l.c b/libsrc/Wi/sparql_l.c
index 9a79dd9..d47288c 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 230
-#define YY_END_OF_BUFFER 231
+#define YY_NUM_RULES 103
+#define YY_END_OF_BUFFER 104
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -389,107 +389,45 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[895] =
+static yyconst flex_int16_t yy_accept[335] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 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
-
+ 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
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -500,1127 +438,376 @@ 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, 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
+ 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
} ;
-static yyconst flex_int32_t yy_meta[90] =
+static yyconst flex_int32_t yy_meta[64] =
{ 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, 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
+ 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
} ;
-static yyconst flex_int16_t yy_base[1005] =
+static yyconst flex_int16_t yy_base[459] =
{ 0,
- 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
+ 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
} ;
-static yyconst flex_int16_t yy_def[1005] =
+static yyconst flex_int16_t yy_def[459] =
{ 0,
- 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
+ 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
} ;
-static yyconst flex_int16_t yy_nxt[7721] =
+static yyconst flex_int16_t yy_nxt[2019] =
{ 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, 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,
+ 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,
+
28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
- 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
+ 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
} ;
-static yyconst flex_int16_t yy_chk[7721] =
+static yyconst flex_int16_t yy_chk[2019] =
{ 0,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
@@ -1628,849 +815,222 @@ static yyconst flex_int16_t yy_chk[7721] =
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, 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
+ 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
} ;
static yy_state_type yy_last_accepting_state;
@@ -2491,12 +1051,12 @@ static int yy_more_len = 0;
char *sparyytext;
#line 1 "./sparql_l.l"
/*
- * $Id: sparql_l.l,v 1.37.2.17 2011/06/11 16:41:47 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -2518,6 +1078,7 @@ char *sparyytext;
#include "sparql.h"
#include "sparql_p.h"
#include "numeric.h"
+#include "sparqlwords.h"
#define sparyyerror(strg) sparyyerror_impl(sparp, sparyytext, (strg))
@@ -2794,7 +1355,7 @@ static int sparscn_NUMBER_double (void *yylval, sparp_t *sparp)
/* Special unreacheable state to fill the first item of sparp->sparp_lexstates */
-#line 2798 "sparql_l.c"
+#line 1359 "sparql_l.c"
#define INITIAL 0
#define SPARQL 1
@@ -2904,7 +1465,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( sparyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -2986,12 +1547,12 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 373 "./sparql_l.l"
+#line 374 "./sparql_l.l"
/* Plain non-keyword punctuators */
-#line 2995 "sparql_l.c"
+#line 1556 "sparql_l.c"
if ( !(yy_init) )
{
@@ -3050,13 +1611,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 >= 895 )
+ if ( yy_current_state >= 335 )
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 != 894 );
+ while ( yy_current_state != 334 );
yy_cp = (yy_last_accepting_cpos);
yy_current_state = (yy_last_accepting_state);
@@ -3078,1251 +1639,618 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 377 "./sparql_l.l"
+#line 378 "./sparql_l.l"
{ return _AMP_AMP ; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 378 "./sparql_l.l"
+#line 379 "./sparql_l.l"
{ return _BACKQUOTE ; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 379 "./sparql_l.l"
+#line 380 "./sparql_l.l"
{ return _BANG ; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 380 "./sparql_l.l"
+#line 381 "./sparql_l.l"
{ return _BAR_BAR ; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 381 "./sparql_l.l"
+#line 382 "./sparql_l.l"
{ return _CARET_CARET ; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 382 "./sparql_l.l"
+#line 383 "./sparql_l.l"
{ return _COMMA ; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 383 "./sparql_l.l"
+#line 384 "./sparql_l.l"
{ return _DOT ; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 384 "./sparql_l.l"
+#line 385 "./sparql_l.l"
{ return _EQ ; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 385 "./sparql_l.l"
+#line 386 "./sparql_l.l"
{ return _GE ; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 386 "./sparql_l.l"
+#line 387 "./sparql_l.l"
{ return _GT ; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 387 "./sparql_l.l"
+#line 388 "./sparql_l.l"
{ return _LE ; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 388 "./sparql_l.l"
+#line 389 "./sparql_l.l"
{ return _LT ; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 389 "./sparql_l.l"
+#line 390 "./sparql_l.l"
{ sparyylval.token_type = sparp->sparp_lexdepth; return _MINUS ; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 390 "./sparql_l.l"
+#line 391 "./sparql_l.l"
{ return _NOT_EQ ; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 391 "./sparql_l.l"
+#line 392 "./sparql_l.l"
{ sparyylval.token_type = sparp->sparp_lexdepth; return _PLUS ; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 392 "./sparql_l.l"
+#line 393 "./sparql_l.l"
{ return _PLUS_GT ; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 393 "./sparql_l.l"
+#line 394 "./sparql_l.l"
{ return _SEMI ; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 394 "./sparql_l.l"
+#line 395 "./sparql_l.l"
{ return _SLASH ; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 395 "./sparql_l.l"
+#line 396 "./sparql_l.l"
{ return _STAR ; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 396 "./sparql_l.l"
+#line 397 "./sparql_l.l"
{ return _STAR_GT ; }
YY_BREAK
/* Keyword punctuators */
case 21:
YY_RULE_SETUP
-#line 400 "./sparql_l.l"
+#line 401 "./sparql_l.l"
{ return a_L ; }
YY_BREAK
+/* Grouping non-keyword punctuators */
case 22:
YY_RULE_SETUP
-#line 401 "./sparql_l.l"
-{ return ALTER_L ; }
+#line 405 "./sparql_l.l"
+TOKPAR_OPEN (_LPAR,')', GET_CURRENT_BEGIN)
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 402 "./sparql_l.l"
-{ return AS_L ; }
+#line 406 "./sparql_l.l"
+TOKPAR_CLOSE (_RPAR,')')
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 403 "./sparql_l.l"
-{ return ASC_L ; }
+#line 407 "./sparql_l.l"
+TOKPAR_OPEN (_LBRA,'}', GET_CURRENT_BEGIN)
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 404 "./sparql_l.l"
-{ return ASK_L ; }
+#line 408 "./sparql_l.l"
+TOKPAR_CLOSE (_RBRA,'}')
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 405 "./sparql_l.l"
-{ return AVG_L ; }
+#line 409 "./sparql_l.l"
+TOKPAR_OPEN (_LSQBRA,']', GET_CURRENT_BEGIN)
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 406 "./sparql_l.l"
-{ return BASE_L ; }
+#line 410 "./sparql_l.l"
+TOKPAR_CLOSE (_RSQBRA,']')
YY_BREAK
+/* Name lexems */
case 28:
YY_RULE_SETUP
-#line 407 "./sparql_l.l"
-{ return BINDINGS_L ; }
+#line 414 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 2);
+ return Q_IRI_REF;
+ }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 408 "./sparql_l.l"
-{ return BIJECTION_L ; }
+#line 419 "./sparql_l.l"
+{ TOKBOX_Q(0,QNAME,"qualified URI"); }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 409 "./sparql_l.l"
-{ return BOUND_L ; }
+#line 420 "./sparql_l.l"
+{ TOKBOX_Q(0,QNAME_NS,"namespace"); }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 410 "./sparql_l.l"
-{ return BY_L ; }
+#line 421 "./sparql_l.l"
+{ TOKBOX_Q(0,BLANK_NODE_LABEL,"blank node label"); }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 411 "./sparql_l.l"
-{ return CLASS_L ; }
+#line 423 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return QD_VARNAME;
+ }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 412 "./sparql_l.l"
-{ return CLEAR_L ; }
+#line 428 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return QD_COLON_PARAMNAME;
+ }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 413 "./sparql_l.l"
-{ return COALESCE_L ; }
+#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;
+ }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 414 "./sparql_l.l"
-{ return CONSTRUCT_L ; }
+#line 440 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return LANGTAG;
+ }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 415 "./sparql_l.l"
-{ BEGIN SPARQL_AFTER_COUNT; }
+#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;
+ } }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 416 "./sparql_l.l"
-{ return CREATE_L ; }
+#line 461 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_ALIASCOLNAME; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 417 "./sparql_l.l"
-{ return DATA_L ; }
+#line 462 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_QTABLENAME; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 418 "./sparql_l.l"
-{ return DATATYPE_L ; }
+#line 463 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_QTABLECOLNAME; }
YY_BREAK
+/* Numeric lexems */
case 40:
YY_RULE_SETUP
-#line 419 "./sparql_l.l"
-{ return DEFAULT_L ; }
+#line 467 "./sparql_l.l"
+{ return sparscn_NUMBER_int (yylval, sparp); }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 420 "./sparql_l.l"
-{ return DEFINE_L ; }
+#line 468 "./sparql_l.l"
+{ return sparscn_NUMBER_decimal (yylval, sparp); }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 421 "./sparql_l.l"
-{ return DELETE_L ; }
+#line 469 "./sparql_l.l"
+{ return sparscn_NUMBER_double (yylval, sparp); }
YY_BREAK
+/* String lexems */
case 43:
YY_RULE_SETUP
-#line 422 "./sparql_l.l"
-{ return DEREF_L ; }
+#line 473 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_short_nchars (sparyytext+1, sparyyleng - 2);
+ return SPARQL_STRING;
+ }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 423 "./sparql_l.l"
-{ return DESC_L ; }
+#line 478 "./sparql_l.l"
+{ yymore(); SET_INNER_BEGIN(SPARQL_SSSQ); BEGIN_INNER; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 424 "./sparql_l.l"
-{ return DESCRIBE_L ; }
+#line 479 "./sparql_l.l"
+{ yymore(); SET_INNER_BEGIN(SPARQL_DDDQ); BEGIN_INNER; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 425 "./sparql_l.l"
-{ return DISTINCT_L ; }
+#line 480 "./sparql_l.l"
+{ sparyylval.box = spar_strliteral (sparp, sparyytext, 1, 0); BEGIN_OUTER; return SPARQL_STRING; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 426 "./sparql_l.l"
-{ return DROP_L ; }
+#line 481 "./sparql_l.l"
+{ sparyylval.box = spar_strliteral (sparp, sparyytext, 1, 0); BEGIN_OUTER; return SPARQL_STRING; }
YY_BREAK
case 48:
+/* rule 48 can match eol */
YY_RULE_SETUP
-#line 427 "./sparql_l.l"
-{ return EXCLUSIVE_L ; }
+#line 482 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
YY_BREAK
case 49:
+/* rule 49 can match eol */
YY_RULE_SETUP
-#line 428 "./sparql_l.l"
-{ return EXISTS_L ; }
+#line 483 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 429 "./sparql_l.l"
-{ return false_L ; }
+#line 484 "./sparql_l.l"
+{ yymore(); }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 430 "./sparql_l.l"
-{ return FILTER_L ; }
+#line 485 "./sparql_l.l"
+{ yymore(); }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 431 "./sparql_l.l"
-{ return FROM_L ; }
+#line 486 "./sparql_l.l"
+{ sparyyerror ("Bad escape sequence in a long single-quoted string"); }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 432 "./sparql_l.l"
-{ return FUNCTION_L ; }
+#line 487 "./sparql_l.l"
+{ sparyyerror ("Bad escape sequence in a long double-quoted string"); }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 433 "./sparql_l.l"
-{ return GRAPH_L ; }
+#line 488 "./sparql_l.l"
+{ sparyyerror ("Bad character in a long single-quoted string"); }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 434 "./sparql_l.l"
-{ return GROUP_L ; }
+#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"); }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 435 "./sparql_l.l"
-{ return HAVING_L ; }
+#line 494 "./sparql_l.l"
+{ yymore(); SET_INNER_BEGIN(SPARQL_SQ); BEGIN_INNER; }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 436 "./sparql_l.l"
-{ return IF_L ; }
+#line 495 "./sparql_l.l"
+{ yymore(); SET_INNER_BEGIN(SPARQL_DQ); BEGIN_INNER; }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 437 "./sparql_l.l"
-{ return IFP_L ; }
+#line 496 "./sparql_l.l"
+{ sparyylval.box = spar_strliteral (sparp, sparyytext, 0, 0); BEGIN_OUTER; return SPARQL_STRING; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 438 "./sparql_l.l"
-{ return IN_L ; }
+#line 497 "./sparql_l.l"
+{ sparyylval.box = spar_strliteral (sparp, sparyytext, 0, 0); BEGIN_OUTER; return SPARQL_STRING; }
YY_BREAK
case 60:
+/* rule 60 can match eol */
YY_RULE_SETUP
-#line 439 "./sparql_l.l"
-{ return INDEX_L ; }
+#line 498 "./sparql_l.l"
+{ sparyyerror ("End-of-line in a short single-quoted string"); yymore(); }
YY_BREAK
case 61:
+/* rule 61 can match eol */
YY_RULE_SETUP
-#line 440 "./sparql_l.l"
-{ return INFERENCE_L ; }
+#line 499 "./sparql_l.l"
+{ sparyyerror ("End-of-line in a short double-quoted string"); yymore(); }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 441 "./sparql_l.l"
-{ return INSERT_L ; }
+#line 500 "./sparql_l.l"
+{ yymore(); }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 442 "./sparql_l.l"
-{ return INTO_L ; }
+#line 501 "./sparql_l.l"
+{ yymore(); }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 443 "./sparql_l.l"
-{ return IRI_L ; }
+#line 502 "./sparql_l.l"
+{ sparyyerror ("Bad escape sequence in a short single-quoted string"); }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 444 "./sparql_l.l"
-{ return isBLANK_L ; }
+#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"); }
YY_BREAK
+/* Whitespace after COUNT keyword */
case 66:
YY_RULE_SETUP
-#line 445 "./sparql_l.l"
-{ return isIRI_L ; }
+#line 509 "./sparql_l.l"
+{ BEGIN SPARQL; TOKPAR_OPEN (COUNT_LPAR, ')', GET_CURRENT_BEGIN) }
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 446 "./sparql_l.l"
-{ return isLITERAL_L ; }
+#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"); }
YY_BREAK
+/* Whitespace after IDENTIFIED keyword */
case 68:
YY_RULE_SETUP
-#line 447 "./sparql_l.l"
-{ return isREF_L ; }
+#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"); }
YY_BREAK
+/* SQL fragments */
case 69:
YY_RULE_SETUP
-#line 448 "./sparql_l.l"
-{ return isURI_L ; }
+#line 520 "./sparql_l.l"
+{ BEGIN SPARQL; TOKPAR_OPEN (_LBRA, '}', GET_CURRENT_BEGIN) }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 449 "./sparql_l.l"
-{ return LANG_L ; }
+#line 521 "./sparql_l.l"
+{ BEGIN SPARQL; TOKPAR_OPEN (_LPAR, ')', SPARQL_SQL_FRAGMENT) }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 450 "./sparql_l.l"
-{ return LANGMATCHES_L ; }
+#line 522 "./sparql_l.l"
+{ SET_INNER_BEGIN(SPARQL_SSSQ); BEGIN_INNER; }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 451 "./sparql_l.l"
-{ return LIKE_L ; }
+#line 523 "./sparql_l.l"
+{ SET_INNER_BEGIN(SPARQL_DDDQ); BEGIN_INNER; }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 452 "./sparql_l.l"
-{ return LIMIT_L ; }
+#line 524 "./sparql_l.l"
+{ SET_INNER_BEGIN(SPARQL_SQ); BEGIN_INNER; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 453 "./sparql_l.l"
-{ return LITERAL_L ; }
+#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"); }
YY_BREAK
case 75:
+/* rule 75 can match eol */
YY_RULE_SETUP
-#line 454 "./sparql_l.l"
-{ return LOAD_L ; }
+#line 528 "./sparql_l.l"
+{ yymore(); }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 455 "./sparql_l.l"
-{ return MAKE_L ; }
+#line 530 "./sparql_l.l"
+{ TOKPAR_FAKE_OPEN('}', SPARQL_SQL_FRAGMENT); yymore(); }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 456 "./sparql_l.l"
-{ return MAP_L ; }
+#line 531 "./sparql_l.l"
+{ TOKPAR_FAKE_CLOSE('}'); yymore(); }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 457 "./sparql_l.l"
-{ return MAX_L ; }
+#line 532 "./sparql_l.l"
+{ TOKPAR_FAKE_OPEN(')', SPARQL_SQL_FRAGMENT); yymore(); }
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 458 "./sparql_l.l"
-{ return MIN_L ; }
+#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();
+ }
YY_BREAK
case 80:
+/* rule 80 can match eol */
YY_RULE_SETUP
-#line 459 "./sparql_l.l"
-{ return MINUS_L ; }
+#line 544 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 460 "./sparql_l.l"
-{ return MODIFY_L ; }
+#line 545 "./sparql_l.l"
+{ sparyyerror ("Unterminated comment in SQL fragment after WHERE keyword"); }
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 461 "./sparql_l.l"
-{ return NAMED_L ; }
+#line 546 "./sparql_l.l"
+{ yymore(); }
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 462 "./sparql_l.l"
-{ return NIL_L ; }
+#line 547 "./sparql_l.l"
+{ BEGIN SPARQL_SQL_SQSTRING; yymore(); }
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 463 "./sparql_l.l"
-{ return NOT_L ; }
+#line 548 "./sparql_l.l"
+{ yymore(); }
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 464 "./sparql_l.l"
-{ return NOT_FROM_L ; }
+#line 549 "./sparql_l.l"
+{ sparyyerror ("Unterminated double-quoted identifier in SQL fragment after WHERE keyword"); }
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 465 "./sparql_l.l"
-{ return NULL_L ; }
+#line 551 "./sparql_l.l"
+{ BEGIN SPARQL_SQL_FRAGMENT; yymore(); }
YY_BREAK
case 87:
+/* rule 87 can match eol */
YY_RULE_SETUP
-#line 466 "./sparql_l.l"
-{ return OBJECT_L ; }
+#line 552 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
YY_BREAK
case 88:
+/* rule 88 can match eol */
YY_RULE_SETUP
-#line 467 "./sparql_l.l"
-{ return OF_L ; }
+#line 553 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 468 "./sparql_l.l"
-{ return OFFBAND_L ; }
+#line 554 "./sparql_l.l"
+{ yymore(); }
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 469 "./sparql_l.l"
-{ return OFFSET_L ; }
+#line 555 "./sparql_l.l"
+{ yymore(); }
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 687 "./sparql_l.l"
+#line 557 "./sparql_l.l"
{ sparyyerror ("Unterminated single-quoted string in SQL fragment after WHERE keyword"); }
YY_BREAK
/* Whitespace and comments */
-case 219:
-/* rule 219 can match eol */
+case 92:
+/* rule 92 can match eol */
YY_RULE_SETUP
-#line 691 "./sparql_l.l"
+#line 561 "./sparql_l.l"
{ sparp->sparp_lexlineno++; }
YY_BREAK
-case 220:
+case 93:
YY_RULE_SETUP
-#line 692 "./sparql_l.l"
+#line 562 "./sparql_l.l"
{ }
YY_BREAK
-case 221:
+case 94:
YY_RULE_SETUP
-#line 693 "./sparql_l.l"
+#line 563 "./sparql_l.l"
{ }
YY_BREAK
-case 222:
+case 95:
YY_RULE_SETUP
-#line 695 "./sparql_l.l"
+#line 565 "./sparql_l.l"
{ BEGIN (SPARQL_SQL_COMMENT); yymore(); }
YY_BREAK
case YY_STATE_EOF(SPARQL_SQL_FRAGMENT):
-#line 696 "./sparql_l.l"
+#line 566 "./sparql_l.l"
{ sparyyerror ("Unterminated SQL fragment after WHERE keyword"); }
YY_BREAK
-case 223:
+case 96:
YY_RULE_SETUP
-#line 698 "./sparql_l.l"
+#line 568 "./sparql_l.l"
{ sparyyerror ("Nested C style comments not supported"); }
YY_BREAK
-case 224:
+case 97:
YY_RULE_SETUP
-#line 699 "./sparql_l.l"
+#line 569 "./sparql_l.l"
{ BEGIN (SPARQL_SQL_FRAGMENT); yymore(); }
YY_BREAK
-case 225:
+case 98:
YY_RULE_SETUP
-#line 700 "./sparql_l.l"
+#line 570 "./sparql_l.l"
{ yymore(); }
YY_BREAK
/* Traps; these rules should be latest rules in the file. */
-case 226:
+case 99:
YY_RULE_SETUP
-#line 704 "./sparql_l.l"
+#line 574 "./sparql_l.l"
{ sparyyerror ("Only '(' and 'DISTINCT' are allowed after COUNT keyword in SPARQL expression"); }
YY_BREAK
-case 227:
+case 100:
YY_RULE_SETUP
-#line 705 "./sparql_l.l"
+#line 575 "./sparql_l.l"
{ sparyyerror ("Ill formed IDENTIFIED BY term"); }
YY_BREAK
-case 228:
+case 101:
YY_RULE_SETUP
-#line 706 "./sparql_l.l"
+#line 576 "./sparql_l.l"
{ sparyyerror ("Only '{', '(' and a string literal are allowed after WHERE or SQLQUERY keyword in SPARQL expression"); }
YY_BREAK
-case 229:
+case 102:
YY_RULE_SETUP
-#line 707 "./sparql_l.l"
+#line 577 "./sparql_l.l"
{ sparyyerror ("Invalid character in SPARQL expression"); }
YY_BREAK
-case 230:
+case 103:
YY_RULE_SETUP
-#line 709 "./sparql_l.l"
+#line 579 "./sparql_l.l"
ECHO;
YY_BREAK
-#line 4326 "sparql_l.c"
+#line 2254 "sparql_l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(SPARQL):
case YY_STATE_EOF(SPARQL_SQL_COMMENT):
@@ -4618,7 +2546,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 >= 895 )
+ if ( yy_current_state >= 335 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -4646,11 +2574,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 >= 895 )
+ if ( yy_current_state >= 335 )
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 == 894);
+ yy_is_jam = (yy_current_state == 334);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -5283,7 +3211,7 @@ void sparyyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 709 "./sparql_l.l"
+#line 579 "./sparql_l.l"
diff --git a/libsrc/Wi/sparql_l.l b/libsrc/Wi/sparql_l.l
index 9f34fe0..7291b47 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.17 2011/06/11 16:41:47 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -32,6 +32,7 @@
#include "sparql.h"
#include "sparql_p.h"
#include "numeric.h"
+#include "sparqlwords.h"
#define sparyyerror(strg) sparyyerror_impl(sparp, sparyytext, (strg))
@@ -398,135 +399,6 @@ 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 */
@@ -548,38 +420,21 @@ 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 QUEST_VARNAME;
+ return QD_VARNAME;
}
-<SPARQL>[$]{SPAR_VARNAME} {
+<SPARQL>[?$]":"{SPAR_PARAMNAME} {
sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
- return DOLLAR_VARNAME;
+ return QD_COLON_PARAMNAME;
}
-<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>"??" {
+<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 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;
+ return QD_COLON_PARAMNUM;
}
<SPARQL>"@"([a-zA-Z]+)(("-"([a-zA-Z0-9]+))*) {
@@ -587,7 +442,22 @@ SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQL
return LANGTAG;
}
-<SPARQL>{SPAR_PLAIN_SQLNAME} { sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_PLAIN_ID; }
+<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_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 601ab66..fc463da 100644
--- a/libsrc/Wi/sparql_p.c
+++ b/libsrc/Wi/sparql_p.c
@@ -102,159 +102,161 @@
_STAR = 283,
_STAR_GT = 284,
a_L = 285,
- 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,
- LANGMATCHES_L = 337,
- LIKE_L = 338,
- LIMIT_L = 339,
- LITERAL_L = 340,
- 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,
- SERVICE_L = 375,
- SILENT_L = 376,
- SOFT_L = 377,
- SQLQUERY_L = 378,
- STORAGE_L = 379,
- 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,
- T_END_FLAG_L = 388,
- T_EXISTS_L = 389,
- T_FINAL_AS_L = 390,
- T_IN_L = 391,
- T_MAX_L = 392,
- T_MIN_L = 393,
- T_OUT_L = 394,
- T_NO_CYCLES_L = 395,
- T_NO_ORDER_L = 396,
- T_SHORTEST_ONLY_L = 397,
- T_STEP_L = 398,
- 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
+ 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,
+ INF_L = 331,
+ INDEX_L = 332,
+ INFERENCE_L = 333,
+ INSERT_L = 334,
+ INTO_L = 335,
+ IRI_L = 336,
+ LANG_L = 337,
+ LIBRARY_L = 338,
+ LIKE_L = 339,
+ LIMIT_L = 340,
+ LITERAL_L = 341,
+ LOCAL_L = 342,
+ LOAD_L = 343,
+ MACRO_L = 344,
+ MAKE_L = 345,
+ MAP_L = 346,
+ MAX_L = 347,
+ MIN_L = 348,
+ MINUS_L = 349,
+ MODIFY_L = 350,
+ MOVE_L = 351,
+ NAMED_L = 352,
+ NAN_L = 353,
+ NIL_L = 354,
+ NOT_L = 355,
+ NULL_L = 356,
+ OBJECT_L = 357,
+ OF_L = 358,
+ OFFBAND_L = 359,
+ OFFSET_L = 360,
+ OPTIONAL_L = 361,
+ OPTION_L = 362,
+ ORDER_L = 363,
+ PREDICATE_L = 364,
+ PREFIX_L = 365,
+ QUAD_L = 366,
+ REDUCED_L = 367,
+ RETURNS_L = 368,
+ SAME_AS_L = 369,
+ SAME_AS_O_L = 370,
+ SAME_AS_P_L = 371,
+ SAME_AS_S_L = 372,
+ SAME_AS_S_O_L = 373,
+ SCORE_L = 374,
+ SCORE_LIMIT_L = 375,
+ SELECT_L = 376,
+ SERVICE_L = 377,
+ SILENT_L = 378,
+ SOFT_L = 379,
+ SQLQUERY_L = 380,
+ STORAGE_L = 381,
+ SUBCLASS_L = 382,
+ SUBJECT_L = 383,
+ SUM_L = 384,
+ TABLE_OPTION_L = 385,
+ TEXT_L = 386,
+ T_CYCLES_ONLY_L = 387,
+ T_DIRECTION_L = 388,
+ T_DISTINCT_L = 389,
+ T_END_FLAG_L = 390,
+ T_EXISTS_L = 391,
+ T_FINAL_AS_L = 392,
+ T_IN_L = 393,
+ T_MAX_L = 394,
+ T_MIN_L = 395,
+ T_OUT_L = 396,
+ T_NO_CYCLES_L = 397,
+ T_NO_ORDER_L = 398,
+ T_SHORTEST_ONLY_L = 399,
+ T_STEP_L = 400,
+ TO_L = 401,
+ TRANSITIVE_L = 402,
+ true_L = 403,
+ UNBOUND_L = 404,
+ UNDEF_L = 405,
+ UNION_L = 406,
+ USING_L = 407,
+ WHERE_L = 408,
+ WITH_L = 409,
+ XML_L = 410,
+ __SPAR_PUNCT_END = 411,
+ START_OF_SPARQL_TEXT = 412,
+ END_OF_SPARQL_TEXT = 413,
+ SPARUL_RUN_SUBTYPE = 414,
+ SPARUL_INSERT_DATA = 415,
+ SPARUL_DELETE_DATA = 416,
+ __SPAR_NONPUNCT_START = 417,
+ SPARQL_BIF = 418,
+ SPARQL_INTEGER = 419,
+ SPARQL_DECIMAL = 420,
+ SPARQL_DOUBLE = 421,
+ SPARQL_STRING = 422,
+ SPARQL_SQLTEXT = 423,
+ LANGTAG = 424,
+ QNAME = 425,
+ QNAME_NS = 426,
+ BLANK_NODE_LABEL = 427,
+ Q_IRI_REF = 428,
+ QD_VARNAME = 429,
+ QD_COLON_PARAMNAME = 430,
+ QD_COLON_PARAMNUM = 431,
+ SPARQL_PLAIN_ID = 432,
+ SPARQL_SQL_ALIASCOLNAME = 433,
+ SPARQL_SQL_QTABLENAME = 434,
+ SPARQL_SQL_QTABLECOLNAME = 435,
+ __SPAR_NONPUNCT_END = 436,
+ PRECODE_EXPN_PREC = 437,
+ _COLON = 438,
+ UMINUS = 439,
+ UPLUS = 440
};
#endif
/* Tokens. */
@@ -286,169 +288,168 @@
#define _STAR 283
#define _STAR_GT 284
#define a_L 285
-#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 LANGMATCHES_L 337
-#define LIKE_L 338
-#define LIMIT_L 339
-#define LITERAL_L 340
-#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
-#define SERVICE_L 375
-#define SILENT_L 376
-#define SOFT_L 377
-#define SQLQUERY_L 378
-#define STORAGE_L 379
-#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
-#define T_END_FLAG_L 388
-#define T_EXISTS_L 389
-#define T_FINAL_AS_L 390
-#define T_IN_L 391
-#define T_MAX_L 392
-#define T_MIN_L 393
-#define T_OUT_L 394
-#define T_NO_CYCLES_L 395
-#define T_NO_ORDER_L 396
-#define T_SHORTEST_ONLY_L 397
-#define T_STEP_L 398
-#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
+#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 INF_L 331
+#define INDEX_L 332
+#define INFERENCE_L 333
+#define INSERT_L 334
+#define INTO_L 335
+#define IRI_L 336
+#define LANG_L 337
+#define LIBRARY_L 338
+#define LIKE_L 339
+#define LIMIT_L 340
+#define LITERAL_L 341
+#define LOCAL_L 342
+#define LOAD_L 343
+#define MACRO_L 344
+#define MAKE_L 345
+#define MAP_L 346
+#define MAX_L 347
+#define MIN_L 348
+#define MINUS_L 349
+#define MODIFY_L 350
+#define MOVE_L 351
+#define NAMED_L 352
+#define NAN_L 353
+#define NIL_L 354
+#define NOT_L 355
+#define NULL_L 356
+#define OBJECT_L 357
+#define OF_L 358
+#define OFFBAND_L 359
+#define OFFSET_L 360
+#define OPTIONAL_L 361
+#define OPTION_L 362
+#define ORDER_L 363
+#define PREDICATE_L 364
+#define PREFIX_L 365
+#define QUAD_L 366
+#define REDUCED_L 367
+#define RETURNS_L 368
+#define SAME_AS_L 369
+#define SAME_AS_O_L 370
+#define SAME_AS_P_L 371
+#define SAME_AS_S_L 372
+#define SAME_AS_S_O_L 373
+#define SCORE_L 374
+#define SCORE_LIMIT_L 375
+#define SELECT_L 376
+#define SERVICE_L 377
+#define SILENT_L 378
+#define SOFT_L 379
+#define SQLQUERY_L 380
+#define STORAGE_L 381
+#define SUBCLASS_L 382
+#define SUBJECT_L 383
+#define SUM_L 384
+#define TABLE_OPTION_L 385
+#define TEXT_L 386
+#define T_CYCLES_ONLY_L 387
+#define T_DIRECTION_L 388
+#define T_DISTINCT_L 389
+#define T_END_FLAG_L 390
+#define T_EXISTS_L 391
+#define T_FINAL_AS_L 392
+#define T_IN_L 393
+#define T_MAX_L 394
+#define T_MIN_L 395
+#define T_OUT_L 396
+#define T_NO_CYCLES_L 397
+#define T_NO_ORDER_L 398
+#define T_SHORTEST_ONLY_L 399
+#define T_STEP_L 400
+#define TO_L 401
+#define TRANSITIVE_L 402
+#define true_L 403
+#define UNBOUND_L 404
+#define UNDEF_L 405
+#define UNION_L 406
+#define USING_L 407
+#define WHERE_L 408
+#define WITH_L 409
+#define XML_L 410
+#define __SPAR_PUNCT_END 411
+#define START_OF_SPARQL_TEXT 412
+#define END_OF_SPARQL_TEXT 413
+#define SPARUL_RUN_SUBTYPE 414
+#define SPARUL_INSERT_DATA 415
+#define SPARUL_DELETE_DATA 416
+#define __SPAR_NONPUNCT_START 417
+#define SPARQL_BIF 418
+#define SPARQL_INTEGER 419
+#define SPARQL_DECIMAL 420
+#define SPARQL_DOUBLE 421
+#define SPARQL_STRING 422
+#define SPARQL_SQLTEXT 423
+#define LANGTAG 424
+#define QNAME 425
+#define QNAME_NS 426
+#define BLANK_NODE_LABEL 427
+#define Q_IRI_REF 428
+#define QD_VARNAME 429
+#define QD_COLON_PARAMNAME 430
+#define QD_COLON_PARAMNUM 431
+#define SPARQL_PLAIN_ID 432
+#define SPARQL_SQL_ALIASCOLNAME 433
+#define SPARQL_SQL_QTABLENAME 434
+#define SPARQL_SQL_QTABLECOLNAME 435
+#define __SPAR_NONPUNCT_END 436
+#define PRECODE_EXPN_PREC 437
+#define _COLON 438
+#define UMINUS 439
+#define UPLUS 440
/* Copy the first part of user declarations. */
-#line 41 "./sparql_p.y"
+#line 44 "./sparql_p.y"
-
-#define YYPARSE_PARAM sparp_as_void
-#define YYLEX_PARAM YYPARSE_PARAM
#include "libutil.h"
#include "sqlnode.h"
#include "sqlparext.h"
@@ -457,12 +458,11 @@
#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))
+#define sparyyerror(sparp_arg, strg) sparyyerror_impl_1(sparp_arg, NULL, yystate, yyssa, yyssp, (strg))
#else
-#define sparyyerror(strg) sparyyerror_impl(sparp_arg, NULL, (strg))
+#define sparyyerror(sparp_arg, strg) sparyyerror_impl(sparp_arg, NULL, (strg))
#endif
#ifdef XPYYDEBUG
@@ -520,7 +520,7 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 97 "./sparql_p.y"
+#line 96 "./sparql_p.y"
{
caddr_t box;
caddr_t *boxes;
@@ -532,7 +532,7 @@ typedef union YYSTYPE
spar_lexbmk_t *bookmark;
void *nothing;
}
-/* Line 187 of yacc.c. */
+/* Line 193 of yacc.c. */
#line 537 "sparql_p.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -596,7 +596,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -761,20 +761,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 7
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 3778
+#define YYLAST 3621
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 184
+#define YYNTOKENS 186
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 271
+#define YYNNTS 317
/* YYNRULES -- Number of rules. */
-#define YYNRULES 619
+#define YYNRULES 705
/* YYNRULES -- Number of states. */
-#define YYNSTATES 1036
+#define YYNSTATES 1157
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 438
+#define YYMAXUTOK 440
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -825,7 +825,8 @@ 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, 183
+ 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
+ 185
};
#if YYDEBUG
@@ -833,323 +834,365 @@ static const yytype_uint8 yytranslate[] =
YYRHS. */
static const yytype_uint16 yyprhs[] =
{
- 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
+ 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, 259,
+ 260, 267, 269, 271, 272, 277, 278, 281, 285, 287,
+ 289, 291, 294, 297, 301, 303, 306, 309, 313, 314,
+ 315, 320, 322, 325, 328, 333, 334, 337, 338, 340,
+ 341, 347, 348, 353, 358, 365, 372, 373, 374, 379,
+ 381, 384, 388, 392, 394, 396, 398, 399, 400, 404,
+ 405, 406, 411, 413, 416, 421, 426, 429, 431, 433,
+ 435, 436, 438, 440, 441, 443, 446, 447, 449, 452,
+ 453, 455, 456, 457, 465, 467, 470, 472, 474, 475,
+ 477, 479, 482, 486, 488, 491, 493, 495, 497, 499,
+ 501, 503, 505, 509, 510, 519, 521, 525, 530, 534,
+ 536, 538, 540, 542, 544, 546, 547, 552, 555, 556,
+ 557, 558, 567, 568, 569, 576, 577, 581, 582, 588,
+ 593, 596, 599, 603, 606, 608, 611, 612, 617, 618,
+ 619, 620, 630, 631, 635, 637, 640, 643, 647, 650,
+ 653, 654, 659, 660, 662, 664, 667, 669, 673, 676,
+ 678, 682, 685, 686, 688, 690, 694, 695, 696, 704,
+ 705, 709, 710, 714, 716, 717, 719, 720, 724, 725,
+ 731, 735, 739, 741, 743, 747, 751, 755, 759, 761,
+ 764, 765, 766, 772, 774, 778, 780, 783, 786, 789,
+ 792, 795, 798, 801, 804, 806, 809, 811, 814, 816,
+ 819, 824, 827, 830, 832, 834, 839, 841, 848, 855,
+ 857, 862, 864, 866, 870, 872, 874, 876, 878, 880,
+ 882, 884, 886, 887, 892, 893, 898, 901, 903, 906,
+ 908, 911, 913, 915, 917, 919, 921, 924, 926, 928,
+ 930, 934, 936, 938, 940, 942, 944, 946, 948, 952,
+ 956, 958, 961, 965, 969, 974, 976, 978, 981, 984,
+ 987, 990, 992, 994, 997, 999, 1001, 1003, 1005, 1007,
+ 1009, 1012, 1015, 1017, 1019, 1021, 1023, 1024, 1029, 1033,
+ 1037, 1041, 1045, 1049, 1050, 1055, 1056, 1063, 1067, 1071,
+ 1075, 1079, 1083, 1087, 1091, 1095, 1098, 1101, 1104, 1107,
+ 1111, 1112, 1120, 1121, 1131, 1133, 1135, 1136, 1140, 1142,
+ 1144, 1146, 1148, 1150, 1152, 1155, 1160, 1165, 1170, 1175,
+ 1176, 1180, 1181, 1186, 1187, 1189, 1191, 1194, 1198, 1200,
+ 1204, 1208, 1211, 1212, 1214, 1216, 1219, 1223, 1225, 1229,
+ 1233, 1236, 1238, 1239, 1244, 1246, 1248, 1250, 1252, 1254,
+ 1256, 1259, 1263, 1265, 1267, 1269, 1271, 1273, 1275, 1277,
+ 1280, 1283, 1286, 1289, 1291, 1293, 1295, 1297, 1299, 1302,
+ 1304, 1307, 1309, 1311, 1313, 1315, 1317, 1319, 1321, 1323,
+ 1325, 1327, 1329, 1335, 1336, 1342, 1343, 1349, 1350, 1356,
+ 1357, 1363, 1364, 1373, 1377, 1381, 1388, 1394, 1403, 1408,
+ 1412, 1413, 1417, 1421, 1425, 1427, 1429, 1431, 1434, 1436,
+ 1439, 1440, 1443, 1444, 1449, 1451, 1453, 1454, 1456, 1458,
+ 1460, 1462, 1463, 1469, 1470, 1475, 1476, 1479, 1485, 1487,
+ 1489, 1491, 1493, 1494, 1499, 1501, 1503, 1505, 1507, 1509,
+ 1511, 1513, 1515, 1523, 1531, 1537, 1545, 1551, 1552, 1556,
+ 1561, 1563, 1567, 1570, 1573, 1576, 1578, 1580, 1583, 1585,
+ 1589, 1590, 1591, 1601, 1603, 1605, 1606, 1607, 1617, 1623,
+ 1629, 1636, 1640, 1645, 1646, 1647, 1655, 1661, 1662, 1671,
+ 1674, 1675, 1678, 1685, 1686, 1688, 1689, 1694, 1695, 1700,
+ 1702, 1706, 1708, 1711, 1713, 1716, 1720, 1722, 1723, 1728,
+ 1730, 1732, 1734, 1736, 1738, 1743, 1749, 1754, 1756, 1759,
+ 1763, 1765, 1766, 1771, 1772, 1778, 1785, 1793, 1794, 1800,
+ 1802, 1804, 1805, 1811, 1815, 1816, 1820, 1822, 1825, 1828,
+ 1831, 1834, 1835, 1836, 1843, 1845, 1846, 1851, 1852, 1856,
+ 1858, 1861, 1862, 1868, 1869, 1870, 1871, 1872, 1882, 1884,
+ 1885, 1888, 1889, 1892, 1898, 1901, 1902, 1905, 1908, 1910,
+ 1913, 1915, 1917, 1920, 1922, 1924, 1926, 1931, 1933, 1934,
+ 1936, 1938, 1941, 1945, 1948, 1951, 1953, 1954, 1958, 1963,
+ 1965, 1969, 1972, 1974, 1977, 1980, 1981, 1983, 1985, 1989,
+ 1991, 1995, 2001, 2005, 2006, 2008, 2010, 2014, 2018, 2020,
+ 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040, 2042,
+ 2047, 2048, 2050, 2052, 2056, 2058
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 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
+ 187, 0, -1, 157, 189, 198, 188, 158, -1, 157,
+ 189, 376, 158, -1, 157, 189, 403, 158, -1, 157,
+ 158, -1, 157, 189, 411, 502, -1, 1, -1, 218,
+ -1, 224, -1, 226, -1, 229, -1, 190, 195, 196,
+ 200, 400, -1, -1, 190, 191, -1, -1, 55, 192,
+ 170, 193, -1, 194, -1, 193, 9, 194, -1, 170,
+ -1, 173, -1, 167, -1, 164, -1, 343, -1, -1,
+ 39, 173, -1, 39, 1, -1, -1, 196, 197, -1,
+ 110, 171, 173, -1, 110, 171, -1, 110, 1, -1,
+ -1, -1, 46, 89, 83, 373, 199, 14, 200, 23,
+ -1, -1, 200, 201, -1, -1, 56, 373, 202, 203,
+ -1, -1, -1, 16, 210, 24, 204, 209, 205, 216,
+ -1, -1, -1, 208, 206, 209, 14, 207, 275, 23,
+ -1, 1, -1, 14, 213, 214, 215, 23, -1, 70,
+ 213, 14, 213, 214, 215, 23, -1, 54, 70, 14,
+ 213, 214, 215, 23, -1, -1, 87, 16, 212, 24,
+ -1, 87, 16, 211, 24, -1, -1, 212, -1, 211,
+ -1, 174, 9, 174, -1, 211, 9, 174, -1, 174,
+ -1, 212, 174, -1, 174, -1, 373, -1, 174, -1,
+ 30, -1, 373, -1, 174, -1, 367, -1, 21, 367,
+ -1, 19, 367, -1, 99, -1, 368, -1, 369, -1,
+ 373, -1, -1, 14, 217, 275, 23, -1, 348, -1,
+ 1, -1, -1, 220, 219, 221, 231, 243, 246, -1,
+ 121, -1, 121, 112, -1, 121, 62, -1, 121, 51,
+ -1, -1, 222, 223, -1, 28, -1, 338, -1, 337,
+ -1, -1, 47, 225, 300, 231, 243, 246, -1, -1,
+ 60, 227, 228, 231, 242, 246, -1, 28, -1, 333,
+ -1, -1, 36, 230, 231, 243, -1, -1, 231, 232,
+ -1, 233, 373, 236, -1, 234, -1, 235, -1, 68,
+ -1, 68, 97, -1, 100, 68, -1, 100, 68, 97,
+ -1, 152, -1, 152, 97, -1, 100, 152, -1, 100,
+ 152, 97, -1, -1, -1, 107, 16, 237, 238, -1,
+ 24, -1, 239, 24, -1, 170, 240, -1, 239, 9,
+ 170, 240, -1, -1, 241, 348, -1, -1, 243, -1,
+ -1, 153, 14, 244, 275, 23, -1, -1, 14, 245,
+ 275, 23, -1, 247, 251, 253, 262, -1, 247, 251,
+ 253, 259, 260, 262, -1, 247, 251, 253, 261, 258,
+ 262, -1, -1, -1, 71, 43, 248, 249, -1, 250,
+ -1, 249, 250, -1, 16, 348, 24, -1, 17, 348,
+ 25, -1, 354, -1, 355, -1, 342, -1, -1, -1,
+ 72, 252, 348, -1, -1, -1, 108, 43, 254, 255,
+ -1, 256, -1, 255, 256, -1, 257, 16, 348, 24,
+ -1, 257, 17, 348, 25, -1, 257, 164, -1, 354,
+ -1, 355, -1, 342, -1, -1, 35, -1, 59, -1,
+ -1, 259, -1, 85, 240, -1, -1, 261, -1, 105,
+ 240, -1, -1, 263, -1, -1, -1, 41, 264, 266,
+ 14, 265, 268, 23, -1, 267, -1, 266, 267, -1,
+ 174, -1, 343, -1, -1, 269, -1, 270, -1, 269,
+ 270, -1, 16, 271, 24, -1, 272, -1, 271, 272,
+ -1, 373, -1, 367, -1, 368, -1, 369, -1, 375,
+ -1, 149, -1, 150, -1, 275, 23, 319, -1, -1,
+ 220, 274, 221, 231, 243, 246, 23, 319, -1, 305,
+ -1, 305, 276, 275, -1, 305, 276, 10, 275, -1,
+ 174, 10, 275, -1, 279, -1, 277, -1, 286, -1,
+ 283, -1, 293, -1, 289, -1, -1, 106, 14, 278,
+ 273, -1, 106, 1, -1, -1, -1, -1, 111, 91,
+ 280, 370, 281, 14, 282, 273, -1, -1, -1, 70,
+ 336, 284, 14, 285, 273, -1, -1, 14, 287, 273,
+ -1, -1, 286, 151, 14, 288, 273, -1, 67, 16,
+ 348, 24, -1, 67, 354, -1, 67, 355, -1, 67,
+ 290, 291, -1, 94, 291, -1, 65, -1, 100, 65,
+ -1, -1, 292, 231, 243, 319, -1, -1, -1, -1,
+ 122, 499, 294, 297, 295, 231, 14, 296, 273, -1,
+ -1, 16, 298, 24, -1, 299, -1, 298, 299, -1,
+ 170, 193, -1, 55, 170, 193, -1, 75, 323, -1,
+ 75, 28, -1, -1, 14, 301, 302, 23, -1, -1,
+ 304, -1, 303, -1, 303, 10, -1, 310, -1, 303,
+ 10, 310, -1, 304, 310, -1, 307, -1, 303, 10,
+ 307, -1, 304, 307, -1, -1, 306, -1, 310, -1,
+ 310, 10, 305, -1, -1, -1, 70, 308, 336, 309,
+ 14, 306, 23, -1, -1, 332, 311, 314, -1, -1,
+ 326, 312, 313, -1, 357, -1, -1, 314, -1, -1,
+ 325, 315, 317, -1, -1, 314, 26, 325, 316, 317,
+ -1, 314, 26, 10, -1, 314, 26, 1, -1, 1,
+ -1, 318, -1, 317, 9, 318, -1, 317, 9, 26,
+ -1, 317, 9, 10, -1, 317, 9, 1, -1, 1,
+ -1, 331, 319, -1, -1, -1, 107, 16, 320, 321,
+ 24, -1, 322, -1, 321, 9, 322, -1, 74, -1,
+ 78, 177, -1, 78, 170, -1, 78, 173, -1, 78,
+ 167, -1, 104, 342, -1, 119, 342, -1, 120, 348,
+ -1, 130, 167, -1, 132, -1, 133, 164, -1, 134,
+ -1, 135, 164, -1, 136, -1, 137, 342, -1, 138,
+ 16, 323, 24, -1, 140, 348, -1, 139, 348, -1,
+ 142, -1, 143, -1, 141, 16, 323, 24, -1, 144,
+ -1, 145, 16, 342, 24, 34, 342, -1, 145, 16,
+ 167, 24, 34, 342, -1, 147, -1, 324, 16, 361,
+ 24, -1, 324, -1, 342, -1, 323, 9, 342, -1,
+ 114, -1, 115, -1, 116, -1, 117, -1, 118, -1,
+ 335, -1, 30, -1, 1, -1, -1, 17, 327, 314,
+ 329, -1, -1, 16, 328, 330, 24, -1, 16, 24,
+ -1, 25, -1, 26, 25, -1, 331, -1, 330, 331,
+ -1, 332, -1, 326, -1, 342, -1, 345, -1, 334,
+ -1, 333, 334, -1, 342, -1, 373, -1, 346, -1,
+ 16, 348, 24, -1, 342, -1, 373, -1, 346, -1,
+ 342, -1, 375, -1, 373, -1, 346, -1, 348, 9,
+ 348, -1, 337, 9, 348, -1, 348, -1, 338, 348,
+ -1, 340, 348, 24, -1, 340, 28, 24, -1, 340,
+ 62, 348, 24, -1, 341, -1, 50, -1, 38, 16,
+ -1, 93, 16, -1, 92, 16, -1, 129, 16, -1,
+ 174, -1, 343, -1, 342, 372, -1, 344, -1, 175,
+ -1, 176, -1, 373, -1, 368, -1, 367, -1, 21,
+ 367, -1, 19, 367, -1, 369, -1, 375, -1, 99,
+ -1, 346, -1, -1, 5, 347, 348, 5, -1, 348,
+ 34, 174, -1, 348, 7, 348, -1, 348, 4, 348,
+ -1, 348, 11, 348, -1, 348, 20, 348, -1, -1,
+ 348, 84, 349, 348, -1, -1, 348, 75, 350, 16,
+ 361, 24, -1, 348, 18, 348, -1, 348, 13, 348,
+ -1, 348, 15, 348, -1, 348, 12, 348, -1, 348,
+ 21, 348, -1, 348, 19, 348, -1, 348, 28, 348,
+ -1, 348, 27, 348, -1, 6, 348, -1, 100, 348,
+ -1, 21, 348, -1, 19, 348, -1, 16, 348, 24,
+ -1, -1, 16, 36, 351, 231, 243, 319, 24, -1,
+ -1, 16, 220, 352, 221, 231, 243, 246, 319, 24,
+ -1, 339, -1, 354, -1, -1, 373, 353, 359, -1,
+ 368, -1, 367, -1, 369, -1, 375, -1, 342, -1,
+ 357, -1, 163, 360, -1, 81, 16, 348, 24, -1,
+ 82, 16, 348, 24, -1, 53, 16, 348, 24, -1,
+ 42, 16, 342, 24, -1, -1, 373, 356, 360, -1,
+ -1, 89, 373, 358, 362, -1, -1, 360, -1, 99,
+ -1, 16, 24, -1, 16, 361, 24, -1, 348, -1,
+ 361, 9, 348, -1, 361, 9, 1, -1, 361, 1,
+ -1, -1, 363, -1, 99, -1, 16, 24, -1, 16,
+ 364, 24, -1, 365, -1, 364, 9, 365, -1, 364,
+ 9, 1, -1, 364, 1, -1, 348, -1, -1, 14,
+ 366, 275, 23, -1, 164, -1, 165, -1, 166, -1,
+ 76, -1, 98, -1, 167, -1, 167, 169, -1, 167,
+ 8, 373, -1, 148, -1, 66, -1, 373, -1, 28,
+ -1, 54, -1, 22, -1, 29, -1, 371, 173, -1,
+ 371, 170, -1, 371, 171, -1, 371, 1, -1, 173,
+ -1, 374, -1, 170, -1, 171, -1, 172, -1, 17,
+ 25, -1, 377, -1, 376, 377, -1, 379, -1, 381,
+ -1, 383, -1, 385, -1, 387, -1, 389, -1, 390,
+ -1, 391, -1, 392, -1, 393, -1, 378, -1, 63,
+ 402, 89, 83, 240, -1, -1, 79, 395, 380, 300,
+ 394, -1, -1, 79, 52, 395, 382, 300, -1, -1,
+ 57, 396, 384, 300, 394, -1, -1, 57, 52, 396,
+ 386, 300, -1, -1, 95, 399, 388, 57, 300, 79,
+ 300, 394, -1, 45, 402, 397, -1, 88, 402, 240,
+ -1, 88, 402, 240, 401, 500, 240, -1, 88, 402,
+ 122, 240, 52, -1, 88, 402, 122, 240, 52, 152,
+ 122, 240, -1, 46, 402, 501, 240, -1, 63, 402,
+ 397, -1, -1, 231, 243, 246, -1, 401, 500, 240,
+ -1, 68, 500, 240, -1, 32, -1, 54, -1, 97,
+ -1, 501, 240, -1, 54, -1, 500, 240, -1, -1,
+ 500, 240, -1, -1, 154, 500, 240, 236, -1, 75,
+ -1, 80, -1, -1, 123, -1, 404, -1, 406, -1,
+ 409, -1, -1, 57, 405, 300, 408, 394, -1, -1,
+ 79, 407, 300, 394, -1, -1, 79, 300, -1, 410,
+ 402, 398, 146, 398, -1, 48, -1, 96, -1, 31,
+ -1, 413, -1, -1, 411, 10, 412, 413, -1, 414,
+ -1, 422, -1, 426, -1, 415, -1, 416, -1, 417,
+ -1, 429, -1, 430, -1, 46, 425, 44, 499, 167,
+ 491, 418, -1, 46, 425, 44, 499, 152, 489, 418,
+ -1, 63, 402, 425, 44, 499, -1, 90, 81, 44,
+ 499, 127, 103, 499, -1, 90, 499, 127, 103, 499,
+ -1, -1, 107, 16, 24, -1, 107, 16, 419, 24,
+ -1, 420, -1, 419, 9, 420, -1, 53, 499, -1,
+ 82, 167, -1, 82, 498, -1, 40, -1, 58, -1,
+ 113, 421, -1, 167, -1, 421, 151, 167, -1, -1,
+ -1, 46, 111, 126, 499, 423, 432, 14, 424, 442,
+ -1, 81, -1, 86, -1, -1, -1, 33, 111, 126,
+ 499, 427, 432, 14, 428, 442, -1, 63, 402, 111,
+ 126, 499, -1, 63, 402, 111, 91, 499, -1, 63,
+ 402, 111, 91, 501, 499, -1, 63, 402, 499, -1,
+ 63, 402, 501, 499, -1, -1, -1, 432, 68, 179,
+ 34, 177, 433, 435, -1, 432, 68, 177, 34, 177,
+ -1, -1, 432, 68, 125, 483, 34, 177, 434, 435,
+ -1, 432, 482, -1, -1, 435, 436, -1, 131, 437,
+ 86, 497, 438, 439, -1, -1, 155, -1, -1, 103,
+ 16, 488, 24, -1, -1, 107, 16, 440, 24, -1,
+ 441, -1, 440, 9, 441, -1, 177, -1, 177, 167,
+ -1, 23, -1, 443, 23, -1, 443, 10, 23, -1,
+ 445, -1, -1, 443, 10, 444, 445, -1, 451, -1,
+ 431, -1, 430, -1, 446, -1, 447, -1, 37, 89,
+ 83, 499, -1, 61, 402, 89, 83, 499, -1, 61,
+ 402, 89, 83, -1, 23, -1, 449, 23, -1, 449,
+ 10, 23, -1, 451, -1, -1, 449, 10, 450, 451,
+ -1, -1, 46, 499, 34, 452, 454, -1, 46, 499,
+ 152, 126, 499, 484, -1, 46, 501, 499, 152, 126,
+ 499, 484, -1, -1, 459, 484, 14, 453, 448, -1,
+ 457, -1, 456, -1, -1, 459, 484, 14, 455, 448,
+ -1, 478, 477, 469, -1, -1, 478, 458, 463, -1,
+ 460, -1, 459, 460, -1, 70, 479, -1, 128, 479,
+ -1, 109, 479, -1, -1, -1, 102, 479, 461, 475,
+ 462, 476, -1, 465, -1, -1, 463, 26, 464, 465,
+ -1, -1, 477, 466, 467, -1, 1, -1, 469, 474,
+ -1, -1, 467, 9, 468, 469, 474, -1, -1, -1,
+ -1, -1, 478, 470, 475, 471, 476, 472, 480, 473,
+ 484, -1, 1, -1, -1, 34, 499, -1, -1, 53,
+ 373, -1, 53, 81, 16, 167, 24, -1, 53, 497,
+ -1, -1, 82, 167, -1, 82, 497, -1, 479, -1,
+ 17, 25, -1, 30, -1, 479, -1, 17, 25, -1,
+ 499, -1, 367, -1, 368, -1, 499, 16, 487, 24,
+ -1, 497, -1, -1, 481, -1, 482, -1, 481, 482,
+ -1, 153, 16, 168, -1, 153, 167, -1, 16, 168,
+ -1, 167, -1, -1, 107, 16, 24, -1, 107, 16,
+ 485, 24, -1, 486, -1, 485, 9, 486, -1, 124,
+ 64, -1, 64, -1, 108, 164, -1, 152, 177, -1,
+ -1, 488, -1, 497, -1, 488, 9, 497, -1, 490,
+ -1, 489, 9, 490, -1, 69, 179, 491, 113, 495,
+ -1, 16, 492, 24, -1, -1, 493, -1, 494, -1,
+ 493, 9, 494, -1, 496, 498, 495, -1, 498, -1,
+ 498, 100, 101, -1, 75, -1, 498, -1, 498, -1,
+ 178, -1, 180, -1, 177, -1, 131, -1, 155, -1,
+ 373, -1, 81, 16, 167, 24, -1, -1, 501, -1,
+ 70, -1, 70, 73, 43, -1, 158, -1, 10, 158,
+ -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 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
+ 0, 556, 556, 558, 561, 564, 567, 570, 576, 577,
+ 578, 579, 584, 588, 589, 593, 593, 603, 604, 608,
+ 609, 610, 611, 612, 616, 617, 621, 625, 626, 630,
+ 635, 636, 639, 641, 641, 650, 651, 657, 657, 673,
+ 675, 673, 681, 684, 681, 691, 696, 701, 706, 714,
+ 715, 716, 720, 721, 722, 726, 731, 738, 739, 746,
+ 747, 751, 752, 753, 758, 759, 760, 761, 762, 763,
+ 764, 765, 770, 770, 775, 776, 782, 782, 798, 799,
+ 800, 801, 805, 805, 810, 812, 813, 819, 819, 839,
+ 839, 855, 856, 860, 860, 871, 872, 880, 885, 889,
+ 895, 896, 897, 898, 902, 903, 904, 905, 909, 910,
+ 910, 915, 916, 920, 922, 927, 927, 933, 936, 940,
+ 940, 944, 944, 952, 953, 954, 958, 959, 959, 968,
+ 969, 974, 975, 976, 977, 978, 982, 983, 983, 992,
+ 993, 993, 1002, 1003, 1008, 1009, 1010, 1011, 1012, 1013,
+ 1017, 1018, 1019, 1023, 1024, 1028, 1032, 1033, 1037, 1041,
+ 1042, 1046, 1052, 1046, 1062, 1063, 1067, 1068, 1072, 1073,
+ 1077, 1078, 1082, 1089, 1090, 1094, 1095, 1096, 1097, 1098,
+ 1099, 1100, 1104, 1107, 1107, 1145, 1146, 1147, 1148, 1165,
+ 1166, 1167, 1168, 1169, 1170, 1174, 1174, 1175, 1179, 1180,
+ 1181, 1179, 1188, 1189, 1187, 1196, 1196, 1197, 1197, 1214,
+ 1215, 1216, 1217, 1222, 1228, 1229, 1233, 1233, 1254, 1265,
+ 1273, 1254, 1296, 1297, 1301, 1302, 1306, 1307, 1317, 1318,
+ 1322, 1322, 1342, 1343, 1344, 1345, 1349, 1350, 1351, 1355,
+ 1356, 1357, 1361, 1362, 1366, 1367, 1371, 1372, 1371, 1379,
+ 1379, 1381, 1381, 1383, 1387, 1388, 1394, 1394, 1397, 1396,
+ 1399, 1400, 1401, 1405, 1406, 1407, 1408, 1409, 1410, 1414,
+ 1419, 1420, 1420, 1428, 1429, 1433, 1434, 1439, 1441, 1442,
+ 1443, 1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452,
+ 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462,
+ 1463, 1464, 1468, 1469, 1473, 1474, 1475, 1476, 1477, 1481,
+ 1482, 1483, 1487, 1487, 1492, 1492, 1504, 1508, 1509, 1513,
+ 1517, 1530, 1531, 1535, 1536, 1540, 1541, 1545, 1546, 1547,
+ 1548, 1552, 1553, 1554, 1558, 1559, 1560, 1561, 1565, 1566,
+ 1570, 1571, 1575, 1576, 1577, 1581, 1585, 1586, 1587, 1588,
+ 1589, 1593, 1610, 1615, 1623, 1628, 1629, 1634, 1635, 1636,
+ 1637, 1638, 1639, 1640, 1641, 1642, 1646, 1646, 1668, 1669,
+ 1671, 1674, 1678, 1679, 1679, 1682, 1682, 1696, 1697, 1698,
+ 1699, 1700, 1704, 1708, 1710, 1711, 1713, 1715, 1718, 1741,
+ 1744, 1744, 1762, 1762, 1787, 1793, 1794, 1794, 1826, 1827,
+ 1828, 1829, 1830, 1831, 1835, 1852, 1854, 1856, 1858, 1863,
+ 1863, 1893, 1893, 1915, 1916, 1920, 1921, 1922, 1926, 1927,
+ 1928, 1929, 1933, 1934, 1938, 1939, 1940, 1944, 1945, 1946,
+ 1947, 1951, 1952, 1952, 1958, 1959, 1960, 1961, 1964, 1970,
+ 1971, 1972, 1976, 1977, 1981, 1982, 1983, 1987, 1988, 1992,
+ 1996, 2000, 2004, 2008, 2009, 2013, 2014, 2018, 2019, 2025,
+ 2026, 2033, 2034, 2035, 2036, 2037, 2038, 2039, 2040, 2041,
+ 2042, 2043, 2047, 2054, 2054, 2066, 2066, 2081, 2081, 2093,
+ 2093, 2109, 2109, 2120, 2126, 2128, 2133, 2135, 2140, 2145,
+ 2150, 2151, 2158, 2162, 2166, 2167, 2168, 2169, 2173, 2174,
+ 2178, 2179, 2183, 2184, 2191, 2192, 2196, 2197, 2205, 2206,
+ 2207, 2214, 2214, 2236, 2236, 2248, 2249, 2253, 2259, 2260,
+ 2261, 2267, 2268, 2268, 2274, 2275, 2276, 2282, 2283, 2284,
+ 2285, 2286, 2292, 2301, 2313, 2323, 2326, 2332, 2333, 2334,
+ 2338, 2342, 2349, 2351, 2353, 2355, 2357, 2359, 2365, 2366,
+ 2370, 2384, 2370, 2395, 2396, 2400, 2407, 2400, 2418, 2429,
+ 2435, 2444, 2450, 2459, 2460, 2460, 2465, 2468, 2468, 2474,
+ 2479, 2480, 2484, 2491, 2492, 2496, 2497, 2501, 2502, 2506,
+ 2510, 2517, 2518, 2522, 2523, 2524, 2528, 2529, 2529, 2536,
+ 2537, 2539, 2541, 2543, 2548, 2557, 2563, 2572, 2573, 2574,
+ 2578, 2579, 2579, 2587, 2586, 2589, 2596, 2604, 2603, 2613,
+ 2617, 2619, 2618, 2633, 2647, 2647, 2652, 2653, 2657, 2658,
+ 2659, 2660, 2661, 2660, 2669, 2670, 2670, 2676, 2676, 2681,
+ 2685, 2688, 2688, 2696, 2700, 2702, 2704, 2696, 2707, 2711,
+ 2712, 2716, 2717, 2718, 2719, 2723, 2724, 2725, 2729, 2730,
+ 2731, 2735, 2736, 2740, 2741, 2742, 2743, 2746, 2751, 2752,
+ 2756, 2757, 2761, 2762, 2766, 2767, 2771, 2772, 2773, 2777,
+ 2781, 2788, 2789, 2790, 2791, 2795, 2796, 2800, 2801, 2805,
+ 2806, 2810, 2816, 2820, 2821, 2825, 2826, 2830, 2836, 2837,
+ 2841, 2842, 2846, 2847, 2848, 2852, 2853, 2854, 2859, 2860,
+ 2865, 2866, 2870, 2871, 2875, 2876
};
#endif
@@ -1162,110 +1205,124 @@ 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", "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",
+ "_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",
"DROP_L", "EXCLUSIVE_L", "EXISTS_L", "false_L", "FILTER_L", "FROM_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",
+ "FUNCTION_L", "GRAPH_L", "GROUP_L", "HAVING_L", "IDENTIFIED_L", "IFP_L",
+ "IN_L", "INF_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", "NAN_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",
"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",
- "TRANSITIVE_L", "true_L", "UNBOUND_L", "UNION_L", "USING_L", "WHERE_L",
- "WITH_L", "__SPAR_PUNCT_END", "START_OF_SPARQL_TEXT",
+ "T_NO_CYCLES_L", "T_NO_ORDER_L", "T_SHORTEST_ONLY_L", "T_STEP_L", "TO_L",
+ "TRANSITIVE_L", "true_L", "UNBOUND_L", "UNDEF_L", "UNION_L", "USING_L",
+ "WHERE_L", "WITH_L", "XML_L", "__SPAR_PUNCT_END", "START_OF_SPARQL_TEXT",
"END_OF_SPARQL_TEXT", "SPARUL_RUN_SUBTYPE", "SPARUL_INSERT_DATA",
- "SPARUL_DELETE_DATA", "__SPAR_NONPUNCT_START", "TEXT_BL", "XML_BL",
+ "SPARUL_DELETE_DATA", "__SPAR_NONPUNCT_START", "SPARQL_BIF",
"SPARQL_INTEGER", "SPARQL_DECIMAL", "SPARQL_DOUBLE", "SPARQL_STRING",
"SPARQL_SQLTEXT", "LANGTAG", "QNAME", "QNAME_NS", "BLANK_NODE_LABEL",
- "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",
+ "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", "@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_precode_expn", "@15", "spar_where_clause_opt", "spar_where_clause",
+ "@16", "@17", "spar_solution_modifier", "spar_group_clause_opt", "@18",
+ "spar_group_expns", "spar_group_expn", "spar_having_clause_opt", "@19",
+ "spar_order_clause_opt", "@20", "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", "@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_bindings_clause_opt", "spar_bindings_clause", "@21", "@22",
+ "spar_bindings_vars", "spar_bindings_var", "spar_bindings_opt",
+ "spar_bindings", "spar_binding", "spar_bindvals", "spar_bindval",
+ "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", "@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_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_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", "@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_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_load_service_data", "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_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", "@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_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_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",
@@ -1304,142 +1361,160 @@ 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, 438
+ 435, 436, 437, 438, 439, 440
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint16 yyr1[] =
{
- 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
+ 0, 186, 187, 187, 187, 187, 187, 187, 188, 188,
+ 188, 188, 189, 190, 190, 192, 191, 193, 193, 194,
+ 194, 194, 194, 194, 195, 195, 195, 196, 196, 197,
+ 197, 197, 198, 199, 198, 200, 200, 202, 201, 204,
+ 205, 203, 206, 207, 203, 203, 208, 208, 208, 209,
+ 209, 209, 210, 210, 210, 211, 211, 212, 212, 213,
+ 213, 214, 214, 214, 215, 215, 215, 215, 215, 215,
+ 215, 215, 217, 216, 216, 216, 219, 218, 220, 220,
+ 220, 220, 222, 221, 223, 223, 223, 225, 224, 227,
+ 226, 228, 228, 230, 229, 231, 231, 232, 233, 233,
+ 234, 234, 234, 234, 235, 235, 235, 235, 236, 237,
+ 236, 238, 238, 239, 239, 241, 240, 242, 242, 244,
+ 243, 245, 243, 246, 246, 246, 247, 248, 247, 249,
+ 249, 250, 250, 250, 250, 250, 251, 252, 251, 253,
+ 254, 253, 255, 255, 256, 256, 256, 256, 256, 256,
+ 257, 257, 257, 258, 258, 259, 260, 260, 261, 262,
+ 262, 264, 265, 263, 266, 266, 267, 267, 268, 268,
+ 269, 269, 270, 271, 271, 272, 272, 272, 272, 272,
+ 272, 272, 273, 274, 273, 275, 275, 275, 275, 276,
+ 276, 276, 276, 276, 276, 278, 277, 277, 280, 281,
+ 282, 279, 284, 285, 283, 287, 286, 288, 286, 289,
+ 289, 289, 289, 289, 290, 290, 292, 291, 294, 295,
+ 296, 293, 297, 297, 298, 298, 299, 299, 299, 299,
+ 301, 300, 302, 302, 302, 302, 303, 303, 303, 304,
+ 304, 304, 305, 305, 306, 306, 308, 309, 307, 311,
+ 310, 312, 310, 310, 313, 313, 315, 314, 316, 314,
+ 314, 314, 314, 317, 317, 317, 317, 317, 317, 318,
+ 319, 320, 319, 321, 321, 322, 322, 322, 322, 322,
+ 322, 322, 322, 322, 322, 322, 322, 322, 322, 322,
+ 322, 322, 322, 322, 322, 322, 322, 322, 322, 322,
+ 322, 322, 323, 323, 324, 324, 324, 324, 324, 325,
+ 325, 325, 327, 326, 328, 326, 326, 329, 329, 330,
+ 330, 331, 331, 332, 332, 333, 333, 334, 334, 334,
+ 334, 335, 335, 335, 336, 336, 336, 336, 337, 337,
+ 338, 338, 339, 339, 339, 340, 341, 341, 341, 341,
+ 341, 342, 342, 342, 343, 344, 344, 345, 345, 345,
+ 345, 345, 345, 345, 345, 345, 347, 346, 348, 348,
+ 348, 348, 348, 349, 348, 350, 348, 348, 348, 348,
+ 348, 348, 348, 348, 348, 348, 348, 348, 348, 348,
+ 351, 348, 352, 348, 348, 348, 353, 348, 348, 348,
+ 348, 348, 348, 348, 354, 354, 354, 354, 354, 356,
+ 355, 358, 357, 359, 359, 360, 360, 360, 361, 361,
+ 361, 361, 362, 362, 363, 363, 363, 364, 364, 364,
+ 364, 365, 366, 365, 367, 367, 367, 367, 367, 368,
+ 368, 368, 369, 369, 370, 370, 370, 371, 371, 372,
+ 372, 372, 372, 373, 373, 374, 374, 375, 375, 376,
+ 376, 377, 377, 377, 377, 377, 377, 377, 377, 377,
+ 377, 377, 378, 380, 379, 382, 381, 384, 383, 386,
+ 385, 388, 387, 389, 390, 390, 391, 391, 392, 393,
+ 394, 394, 395, 396, 397, 397, 397, 397, 398, 398,
+ 399, 399, 400, 400, 401, 401, 402, 402, 403, 403,
+ 403, 405, 404, 407, 406, 408, 408, 409, 410, 410,
+ 410, 411, 412, 411, 413, 413, 413, 414, 414, 414,
+ 414, 414, 415, 415, 416, 417, 417, 418, 418, 418,
+ 419, 419, 420, 420, 420, 420, 420, 420, 421, 421,
+ 423, 424, 422, 425, 425, 427, 428, 426, 429, 430,
+ 430, 431, 431, 432, 433, 432, 432, 434, 432, 432,
+ 435, 435, 436, 437, 437, 438, 438, 439, 439, 440,
+ 440, 441, 441, 442, 442, 442, 443, 444, 443, 445,
+ 445, 445, 445, 445, 446, 447, 447, 448, 448, 448,
+ 449, 450, 449, 452, 451, 451, 451, 453, 451, 451,
+ 454, 455, 454, 456, 458, 457, 459, 459, 460, 460,
+ 460, 461, 462, 460, 463, 464, 463, 466, 465, 465,
+ 467, 468, 467, 470, 471, 472, 473, 469, 469, 474,
+ 474, 475, 475, 475, 475, 476, 476, 476, 477, 477,
+ 477, 478, 478, 479, 479, 479, 479, 479, 480, 480,
+ 481, 481, 482, 482, 483, 483, 484, 484, 484, 485,
+ 485, 486, 486, 486, 486, 487, 487, 488, 488, 489,
+ 489, 490, 491, 492, 492, 493, 493, 494, 495, 495,
+ 496, 496, 497, 497, 497, 498, 498, 498, 499, 499,
+ 500, 500, 501, 501, 502, 502
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
- 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
+ 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, 6, 0,
+ 6, 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,
+ 5, 0, 4, 4, 6, 6, 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, 0,
+ 1, 0, 0, 7, 1, 2, 1, 1, 0, 1,
+ 1, 2, 3, 1, 2, 1, 1, 1, 1, 1,
+ 1, 1, 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, 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, 1, 5, 0, 5, 0, 5, 0, 5, 0,
+ 5, 0, 8, 3, 3, 6, 5, 8, 4, 3,
+ 0, 3, 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
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1447,1166 +1522,1180 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 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,
- 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
+ 0, 7, 13, 0, 5, 32, 24, 1, 520, 0,
+ 506, 506, 518, 511, 506, 513, 506, 0, 700, 519,
+ 0, 0, 459, 471, 461, 462, 463, 464, 465, 466,
+ 467, 468, 469, 470, 0, 508, 509, 510, 506, 0,
+ 521, 524, 527, 528, 529, 525, 526, 530, 531, 0,
+ 15, 14, 27, 0, 507, 0, 553, 554, 0, 0,
+ 0, 0, 0, 700, 477, 0, 0, 0, 504, 505,
+ 473, 700, 0, 115, 0, 455, 456, 453, 698, 454,
+ 0, 702, 481, 115, 701, 93, 87, 89, 78, 0,
+ 8, 76, 9, 10, 11, 506, 0, 506, 0, 3,
+ 460, 4, 700, 522, 704, 6, 26, 25, 0, 35,
+ 0, 494, 495, 496, 483, 115, 0, 0, 115, 0,
+ 479, 115, 0, 230, 515, 0, 0, 489, 0, 475,
+ 0, 115, 95, 115, 484, 0, 0, 0, 0, 0,
+ 0, 501, 95, 0, 0, 81, 80, 79, 2, 82,
+ 0, 498, 0, 115, 705, 0, 0, 0, 28, 502,
+ 0, 555, 497, 33, 550, 488, 0, 0, 493, 490,
+ 232, 0, 95, 115, 0, 0, 0, 0, 490, 492,
+ 0, 514, 0, 700, 0, 0, 0, 0, 0, 0,
+ 0, 346, 0, 443, 437, 0, 0, 0, 0, 0,
+ 438, 0, 0, 442, 0, 434, 435, 436, 439, 457,
+ 351, 355, 356, 394, 0, 345, 402, 352, 354, 116,
+ 395, 403, 399, 398, 400, 396, 401, 0, 0, 0,
+ 703, 0, 0, 95, 366, 0, 91, 95, 92, 325,
+ 327, 329, 328, 95, 0, 700, 499, 0, 506, 523,
+ 22, 21, 19, 20, 16, 17, 23, 31, 30, 0,
+ 700, 36, 12, 563, 0, 563, 0, 0, 480, 478,
+ 314, 312, 0, 0, 246, 364, 0, 234, 233, 239,
+ 236, 251, 249, 323, 324, 365, 253, 359, 358, 362,
+ 357, 363, 516, 512, 472, 559, 0, 558, 534, 476,
+ 474, 121, 100, 0, 104, 0, 96, 0, 98, 99,
+ 126, 486, 115, 385, 390, 392, 0, 458, 388, 387,
+ 347, 0, 0, 0, 0, 411, 349, 348, 386, 350,
+ 0, 415, 404, 0, 440, 0, 0, 0, 447, 448,
+ 0, 353, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 375, 373, 413, 699, 0,
+ 536, 0, 94, 0, 0, 0, 117, 326, 0, 84,
+ 83, 86, 85, 340, 517, 0, 0, 29, 37, 115,
+ 0, 35, 0, 0, 537, 679, 683, 537, 316, 0,
+ 0, 361, 360, 0, 231, 235, 241, 238, 0, 0,
+ 560, 242, 101, 102, 106, 105, 119, 108, 0, 491,
+ 136, 0, 485, 95, 82, 389, 0, 0, 0, 0,
+ 422, 416, 418, 0, 441, 343, 0, 342, 452, 450,
+ 451, 449, 370, 369, 371, 380, 378, 379, 377, 382,
+ 372, 381, 384, 383, 368, 0, 0, 397, 414, 0,
+ 0, 126, 0, 330, 126, 118, 126, 0, 341, 0,
+ 18, 0, 108, 556, 0, 0, 569, 0, 551, 0,
+ 0, 0, 533, 690, 696, 697, 695, 0, 684, 685,
+ 0, 691, 532, 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, 127, 137, 139, 115, 0,
+ 95, 408, 407, 405, 406, 0, 424, 412, 423, 421,
+ 0, 417, 344, 0, 374, 535, 490, 88, 367, 90,
+ 77, 339, 338, 45, 0, 52, 0, 0, 38, 42,
+ 503, 0, 0, 0, 0, 0, 663, 34, 0, 0,
+ 680, 0, 682, 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, 0, 0, 0, 159, 487, 270, 0, 432,
+ 425, 431, 0, 427, 420, 419, 0, 482, 59, 0,
+ 60, 57, 0, 54, 53, 0, 0, 49, 0, 583,
+ 0, 0, 506, 506, 0, 0, 0, 0, 693, 694,
+ 654, 655, 591, 590, 557, 0, 586, 592, 593, 589,
+ 609, 666, 616, 614, 651, 657, 692, 653, 0, 665,
+ 0, 0, 0, 662, 552, 0, 538, 545, 0, 546,
+ 0, 0, 0, 540, 686, 687, 688, 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, 120, 0, 0, 0,
+ 128, 129, 135, 133, 134, 138, 140, 161, 115, 115,
+ 156, 153, 123, 160, 0, 0, 126, 242, 430, 0,
+ 426, 376, 62, 61, 0, 63, 0, 39, 0, 58,
+ 0, 0, 0, 0, 652, 0, 0, 0, 0, 0,
+ 618, 621, 620, 619, 587, 584, 0, 617, 0, 0,
+ 675, 664, 0, 566, 564, 681, 542, 543, 544, 548,
+ 547, 0, 539, 0, 0, 0, 269, 0, 183, 206,
+ 0, 0, 215, 212, 0, 0, 0, 242, 0, 222,
+ 187, 207, 111, 115, 110, 0, 0, 0, 130, 150,
+ 0, 155, 158, 159, 157, 159, 154, 271, 391, 270,
+ 0, 429, 428, 0, 0, 68, 64, 0, 65, 69,
+ 70, 71, 55, 49, 56, 0, 0, 0, 43, 0,
+ 603, 0, 0, 0, 0, 561, 0, 641, 585, 0,
+ 0, 607, 629, 0, 650, 615, 624, 627, 648, 0,
+ 676, 677, 567, 570, 0, 541, 689, 259, 267, 266,
+ 265, 264, 248, 82, 270, 209, 410, 203, 270, 196,
+ 445, 446, 199, 444, 0, 219, 242, 113, 0, 112,
+ 131, 132, 151, 152, 141, 142, 0, 149, 147, 148,
+ 166, 0, 164, 167, 124, 125, 0, 0, 433, 67,
+ 66, 46, 40, 0, 0, 0, 0, 242, 594, 0,
+ 0, 0, 596, 562, 0, 622, 588, 667, 672, 0,
+ 0, 0, 0, 669, 0, 649, 625, 0, 656, 0,
+ 570, 565, 549, 95, 182, 242, 217, 0, 0, 0,
+ 0, 0, 224, 95, 208, 115, 143, 0, 0, 146,
+ 162, 165, 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, 604, 610,
+ 666, 0, 666, 0, 595, 0, 642, 644, 645, 673,
+ 671, 674, 0, 668, 597, 608, 0, 600, 0, 638,
+ 628, 639, 633, 678, 568, 573, 571, 0, 204, 200,
+ 0, 229, 228, 302, 226, 223, 225, 0, 114, 0,
+ 0, 168, 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,
+ 605, 666, 0, 0, 623, 670, 601, 598, 626, 631,
+ 0, 630, 641, 574, 0, 126, 242, 227, 0, 220,
+ 144, 145, 0, 0, 169, 170, 0, 0, 0, 0,
+ 274, 0, 242, 611, 613, 606, 0, 646, 647, 599,
+ 0, 0, 640, 634, 0, 0, 201, 303, 242, 180,
+ 181, 0, 173, 176, 177, 178, 175, 179, 163, 171,
+ 290, 295, 0, 0, 300, 0, 0, 643, 602, 639,
+ 645, 575, 270, 221, 172, 174, 0, 0, 73, 612,
+ 632, 635, 0, 577, 184, 298, 297, 658, 0, 0,
+ 572, 636, 659, 660, 0, 0, 666, 661, 576, 581,
+ 0, 579, 637, 582, 0, 578, 580
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -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
+ -1, 3, 89, 5, 6, 51, 108, 254, 255, 52,
+ 109, 158, 20, 264, 159, 261, 461, 548, 813, 972,
+ 617, 897, 549, 733, 612, 613, 614, 609, 724, 807,
+ 1043, 1082, 90, 149, 768, 243, 244, 370, 92, 143,
+ 93, 144, 237, 94, 142, 180, 306, 307, 308, 309,
+ 514, 697, 784, 785, 134, 135, 454, 310, 512, 401,
+ 409, 410, 592, 700, 701, 517, 593, 595, 789, 874,
+ 875, 876, 795, 710, 793, 711, 712, 713, 790, 1021,
+ 881, 882, 1073, 1074, 1075, 1101, 1102, 769, 853, 770,
+ 582, 583, 777, 584, 778, 927, 1066, 585, 775, 925,
+ 586, 677, 866, 587, 681, 686, 687, 588, 779, 933,
+ 1098, 865, 931, 932, 124, 170, 276, 277, 278, 507,
+ 508, 279, 393, 571, 509, 399, 398, 502, 489, 570,
+ 764, 672, 673, 715, 886, 968, 969, 1012, 970, 490,
+ 281, 390, 389, 569, 484, 674, 282, 238, 239, 491,
+ 495, 371, 372, 213, 214, 215, 216, 217, 218, 284,
+ 285, 364, 422, 446, 445, 413, 414, 357, 220, 704,
+ 774, 221, 420, 447, 332, 423, 527, 528, 602, 603,
+ 717, 222, 223, 224, 862, 340, 341, 225, 79, 226,
+ 21, 22, 23, 24, 130, 25, 177, 26, 122, 27,
+ 167, 28, 140, 29, 30, 31, 32, 33, 181, 70,
+ 64, 127, 152, 82, 262, 71, 60, 34, 35, 65,
+ 36, 72, 172, 37, 38, 39, 155, 40, 41, 42,
+ 43, 44, 472, 662, 663, 760, 45, 265, 558, 61,
+ 46, 263, 551, 47, 632, 633, 380, 843, 920, 921,
+ 1006, 1064, 1133, 1140, 1150, 1151, 634, 635, 829, 636,
+ 637, 638, 995, 996, 1090, 639, 899, 914, 978, 1116,
+ 979, 640, 749, 641, 642, 827, 988, 835, 998, 836,
+ 917, 1000, 1091, 1001, 1062, 1120, 1137, 1146, 1061, 905,
+ 1054, 837, 643, 644, 1141, 1142, 466, 650, 748, 912,
+ 913, 839, 840, 384, 385, 387, 477, 478, 479, 665,
+ 480, 645, 646, 647, 153, 84, 105
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -942
+#define YYPACT_NINF -961
static const yytype_int16 yypact[] =
{
- 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
+ 54, -961, -62, 105, -961, 1108, 36, -961, -961, 86,
+ 24, 613, -961, 29, 24, 362, 24, 189, 187, -961,
+ 419, 479, -961, -961, -961, -961, -961, -961, -961, -961,
+ -961, -961, -961, -961, -3, -961, -961, -961, 24, 66,
+ -961, -961, -961, -961, -961, -961, -961, -961, -961, 37,
+ -961, -961, -961, 78, -961, 496, -961, -961, 181, 176,
+ 253, 293, 302, 253, -961, 410, 847, 163, -961, -961,
+ -961, 253, 410, 309, 257, -961, -961, -961, -961, -961,
+ 341, 405, -961, -961, -961, -961, -961, -961, 313, 282,
+ -961, -961, -961, -961, -961, 24, 29, 24, 362, -961,
+ -961, -961, 80, 335, -961, -961, -961, -961, 315, 389,
+ 239, -961, -961, -961, -961, -961, 478, 239, -961, 239,
+ -961, -961, 410, -961, 439, 452, 19, -961, 503, -961,
+ 410, -961, 394, -961, 163, 2839, 387, 239, 454, 528,
+ 519, -961, -961, 410, 337, -961, -961, -961, -961, -961,
+ 296, -961, 434, -961, -961, 622, 956, 22, -961, 13,
+ 567, -961, -961, -961, -961, -961, -75, 410, -961, 277,
+ 1981, 410, 394, -961, 310, 239, 239, 410, 277, -961,
+ 283, -961, 538, 253, 2839, 2428, 580, 2839, 2839, 595,
+ 599, -961, 620, -961, -961, 626, 647, 478, 650, 653,
+ -961, 2839, 657, -961, 88, -961, -961, -961, 45, -961,
+ -961, -961, -961, -961, 2480, -961, 56, -961, -961, 3512,
+ -961, -961, -961, -961, -961, -961, -961, 643, 553, 239,
+ -961, 410, 283, -961, -961, 2839, -961, -961, 246, -961,
+ 56, -961, -961, -961, 2663, 80, -961, 383, 24, -961,
+ -961, -961, -961, -961, 680, -961, -961, -961, 517, 478,
+ 253, -961, -961, -961, 692, -961, 639, 693, -961, -961,
+ 695, 580, 367, 367, -961, -961, 702, 706, 1981, -961,
+ -961, -961, -961, 56, -961, -961, -961, -961, -961, -961,
+ -961, -961, -961, -961, -961, -961, 239, -961, -961, -961,
+ -961, -961, 629, -9, 631, 716, -961, 478, -961, -961,
+ 678, 601, -961, 1663, -961, -961, 1887, -961, -961, -961,
+ -961, 286, 2839, 2839, 2839, -961, -961, -961, 1663, -961,
+ 2825, -961, -961, 478, -961, 734, 2839, 2875, -961, -961,
+ 47, -961, 2839, 2839, 2839, 2839, 2839, 2839, 2839, 2839,
+ 2839, 2839, 2839, 2839, 585, -961, -961, 88, -961, 660,
+ -961, 689, -961, 283, 2839, 2951, 283, -961, 283, -961,
+ -961, 762, 2839, 3037, -961, 433, 956, -961, -961, -961,
+ 81, -961, 114, 598, 61, -961, 134, 671, -961, 2287,
+ 173, -961, -961, 300, -961, 1981, -961, -961, 1436, 173,
+ -961, 2165, -961, 694, 703, -961, -961, 701, 767, -961,
+ 742, 699, -961, -961, -961, -961, 572, 3242, 3341, 3359,
+ 102, -961, 3512, 638, -961, -961, 3377, -961, -961, -961,
+ -961, -961, 1663, 2775, 2056, 894, 894, 894, 894, 360,
+ 2056, 360, -961, -961, -961, 801, 2839, -961, -961, 239,
+ 410, 678, 2532, -961, 678, -961, 678, 2839, 3512, 2839,
+ -961, 602, 701, -961, -16, 35, -961, 237, -961, 693,
+ 639, 807, -961, -961, -961, -961, -961, 800, 817, -961,
+ 418, -961, -961, -961, 2203, -961, -961, 651, -961, 594,
+ -961, -961, 56, -961, -961, -961, 56, -961, -961, -961,
+ -961, -961, -961, 802, 802, 819, 804, 476, -961, 820,
+ -961, -961, 2165, 815, -961, -961, -961, 725, -961, 283,
+ -961, -961, -961, -961, -961, 2643, -961, -961, -961, -961,
+ 1753, -961, -961, 2839, 1163, -961, 277, -961, -961, -961,
+ -961, 3512, 3512, -961, 619, 662, 768, 619, -961, -961,
+ -961, 2999, 49, 803, 806, 673, -961, -961, 2999, 731,
+ -961, 544, -961, 134, 418, -961, -961, -961, 159, -961,
+ 1937, 832, 276, 2165, -961, -961, 753, 300, -961, 317,
+ 756, 239, 2039, -961, -961, -961, 700, -961, -961, 2257,
+ 827, -961, 887, 2839, 812, 41, -961, 752, 283, -961,
+ -961, 3512, 714, -961, -961, 3512, 755, -961, -961, 82,
+ -961, 851, 837, 853, 691, 857, 859, 787, 850, -961,
+ 789, 310, 24, 24, 1532, 1532, 1532, 1532, -961, -961,
+ -961, -961, -961, -961, -961, 348, -961, -961, -961, -961,
+ -961, 543, -961, -961, -961, -961, -961, 865, 718, -961,
+ 854, 707, 712, -961, -961, 418, -961, -961, 239, -961,
+ 371, 723, 120, -961, -961, -961, 791, 1417, -961, -961,
+ -961, -961, 885, -961, 752, 2257, -961, 2073, 2839, -961,
+ 830, -961, -961, -961, -961, -961, -961, -961, -961, -961,
+ -961, -961, 2165, -961, 888, -961, -961, 62, 2839, 2839,
+ 887, -961, 56, -961, -961, 3512, -961, -961, -961, -961,
+ 794, 825, -961, -961, 898, 895, 678, 2165, -961, 1474,
+ -961, -961, -961, -961, 940, -961, 751, -961, 757, -961,
+ 619, 619, 914, 918, -961, 855, 38, 239, 845, 327,
+ -961, -961, -961, -961, 916, -961, 925, -961, 928, 1085,
+ 504, -961, 769, -961, -961, -961, -961, -961, -961, -961,
+ 797, 375, -961, 844, 1937, 1867, -961, 926, -961, -961,
+ 929, 3402, -961, -961, 88, 939, 283, 2073, 112, 938,
+ -961, -961, -961, -961, -961, 254, 3420, 3438, -961, 1153,
+ 591, -961, -961, 915, -961, 915, -961, -961, -961, 752,
+ 932, -961, -961, 367, 367, -961, -961, 934, -961, -961,
+ -961, -961, -961, 787, -961, 82, 82, 662, -961, 239,
+ -961, 836, 811, 889, 879, -961, 239, 920, -961, 3030,
+ 244, -961, -961, 946, -961, 949, -961, -961, -961, 952,
+ 968, -961, -961, -961, 816, -961, -961, 885, -961, -961,
+ -961, -961, -961, -961, 752, -961, -961, -961, 752, -961,
+ -961, -961, -961, -961, 28, -961, 2073, -961, 808, -961,
+ -961, -961, -961, -961, 611, -961, 44, 56, -961, -961,
+ -961, 52, -961, -961, -961, -961, 3474, 960, -961, -961,
+ -961, -961, -961, 940, 940, 271, 32, 2165, -961, 2217,
+ 239, 860, 239, -961, 408, -961, -961, -961, -961, 821,
+ 923, 813, 275, -961, 3128, -961, -961, 1133, -961, 504,
+ -961, 858, -961, -961, -961, 2073, -961, 974, 823, 73,
+ 956, 101, -961, -961, -961, -961, -961, 2839, 2839, -961,
+ -961, -961, -961, 573, 286, -961, -961, -961, -961, -961,
+ 286, 2839, 824, -961, 831, -961, 833, -961, 286, 982,
+ 2839, 2839, 983, -961, -961, -961, 984, -961, 331, -961,
+ 985, -961, 1651, 979, 980, -961, -961, 986, -961, -961,
+ 543, 1814, 903, 239, -961, 989, -961, -961, 931, -961,
+ -961, -961, 186, -961, -961, -961, 431, -961, 1085, -961,
+ 1005, 981, -961, -961, 858, 862, -961, 283, -961, -961,
+ 956, -961, 1009, 56, 680, -961, -961, 311, -961, 3463,
+ 3481, 1003, -961, -961, -961, -961, 56, 56, 3512, -961,
+ -961, -961, 56, 286, 3512, 3512, 286, 521, 3474, -961,
+ 2839, -961, -961, -961, 3512, -961, -961, -961, 1010, 1133,
+ -961, 903, 861, 574, -961, -961, 1004, -961, -961, -961,
+ 239, -961, 920, -961, 943, 678, 2073, 680, 286, -961,
+ -961, -961, 2465, 1007, 1003, -961, 345, 365, 1012, 715,
+ -961, 795, 2165, -961, -961, -961, 1013, -961, -961, -961,
+ 3169, 1133, -961, -961, 504, 1008, -961, 56, 2073, -961,
+ -961, 1558, -961, -961, -961, -961, -961, -961, -961, -961,
+ -961, -961, 999, 1000, -961, 1021, 3128, -961, -961, 981,
+ 931, 942, 752, -961, -961, -961, 286, 286, -961, -961,
+ -961, -961, 1032, 944, -961, 56, 56, 899, 504, 1038,
+ -961, -961, 899, -961, 381, 882, 903, -961, -961, 897,
+ 468, -961, -961, -961, 882, -961, -961
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -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
+ -961, -961, -961, -961, -961, -961, -961, -862, 690, -961,
+ -961, -961, -961, -961, 686, -961, -961, -961, -961, -961,
+ -961, -961, -961, 255, -961, 252, 258, -500, -311, -294,
+ -961, -961, -961, -961, 30, -397, -961, -961, -961, -961,
+ -961, -961, -961, -961, -961, -126, -961, -961, -961, -961,
+ 608, -961, -961, -961, -79, -961, -961, -231, -961, -961,
+ -444, -961, -961, -961, 376, -961, -961, -961, -961, -961,
+ 197, -961, -961, 372, -961, 377, -705, -961, -961, -961,
+ -961, 201, -961, -961, 18, -961, -11, -742, -961, -396,
+ -961, -961, -961, -961, -961, -961, -961, -961, -961, -961,
+ -961, -961, -961, -961, -961, 412, -961, -961, -961, -961,
+ -961, -961, -961, 164, 8, -961, -961, -961, -961, 505,
+ 421, -214, -961, -961, -137, -961, -961, -961, 226, -961,
+ -961, 334, 336, -663, -961, -961, 65, -641, -961, -372,
+ -365, -961, -961, -961, -961, -322, -363, -961, 870, -961,
+ 523, -961, -961, -961, -961, -961, -86, -147, -961, -961,
+ -124, -961, 1058, -961, -961, -961, -961, -961, -535, -548,
+ -961, -155, -961, -961, -351, -531, -961, -961, -961, 393,
+ -961, 243, 453, 128, -961, -961, -961, -17, -961, 696,
+ -961, 1095, -961, -961, -961, -961, -961, -961, -961, -961,
+ -961, -961, -961, -961, -961, -961, -961, -961, -132, 1050,
+ 1056, 1064, 876, -961, -961, 988, 11, -961, -961, -961,
+ -961, -961, -961, -961, -961, -961, -961, 969, -961, -961,
+ -961, -961, 738, -961, 366, -961, -961, -961, -961, -48,
+ -961, -961, -961, -961, 58, -961, 868, -961, -961, 215,
+ -961, -961, -961, -961, -961, -10, 588, -961, -961, 314,
+ -961, -961, 31, -961, -961, -871, -961, -961, -961, -961,
+ -961, -961, -961, 249, -619, -961, -961, -961, -961, 140,
+ -961, -961, -961, -960, -961, -961, -961, -961, 33, 87,
+ 39, 170, -855, -595, -961, -961, -801, -961, -909, -961,
+ 166, -961, 17, -961, 697, 704, -961, -961, 600, 507,
+ -961, -731, -341, -4, 16, -52, -961
};
/* 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 -435
+#define YYTABLE_NINF -501
static const yytype_int16 yytable[] =
{
- 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,
+ 78, 362, 606, 115, 141, 506, 448, 537, 118, 256,
+ 539, 766, 540, 80, 115, 286, 232, 520, 128, 841,
+ 241, 55, 747, 257, 483, 66, 486, 73, 683, 740,
+ 741, 742, 743, 280, 83, 859, 162, 269, 106, 165,
+ 293, 682, 168, 997, 981, 481, 300, 616, 428, 102,
+ 91, 555, 179, 333, 182, 1, 976, 703, 240, 403,
+ 937, 938, 1002, 48, 396, 648, 940, 485, 1014, 259,
+ 470, 1048, 820, 1050, 246, 49, 103, 266, 338, 121,
+ 132, 62, 707, 928, 283, 339, 782, 131, 884, 1084,
+ 885, 50, 267, 78, 294, 463, 4, 63, 115, 163,
+ 78, 1011, 78, 929, 330, 7, 161, 363, 150, 552,
+ 174, 366, 722, 164, 241, 166, 590, 368, 525, 483,
+ 78, 486, 296, 286, 934, 1015, 708, 242, 468, 761,
+ 169, 1119, 451, 228, 151, 455, 887, 456, 178, 564,
+ 860, 397, 1085, 404, 762, 175, 709, 54, 1067, 464,
+ 81, 233, 240, 290, 838, 101, 928, 78, 78, 78,
+ 667, 553, 566, 554, 234, 703, 861, 260, 471, 668,
+ 295, 297, 298, 987, 487, 268, 929, 676, 234, 292,
+ 325, 500, 464, 1008, 669, 299, 693, 331, 1003, 488,
+ 821, 924, 283, 258, 1002, 926, 670, 53, 930, 312,
+ 670, 526, 556, 488, 110, 483, 729, 486, 939, 473,
+ 107, 2, 78, 48, 334, 315, 649, 429, 430, 1118,
+ 431, 242, 481, 666, 104, 360, 880, 211, 212, 256,
+ 815, 816, 783, 412, 465, 416, 1002, 1152, 68, 361,
+ 286, 879, 378, 69, -500, 997, 286, 210, 211, 212,
+ 908, 234, 75, 76, 878, 77, 723, 81, 501, 375,
+ 557, 290, 235, 868, 116, 474, 493, 465, 907, 497,
+ 74, 930, 799, 136, 493, 493, 379, 667, 869, 78,
+ 728, 234, 75, 76, 992, 77, 668, 519, 597, 475,
+ 407, -95, 400, 259, 909, 975, 780, 301, 289, 993,
+ 462, 137, 117, 283, 492, 234, 488, 496, 908, 283,
+ 910, 476, 492, 492, 666, 283, 424, 186, 688, 758,
+ 160, 800, 1088, 81, 1096, 1069, 879, 128, 111, 75,
+ 76, 689, 77, 210, 211, 212, 1143, 119, 911, 878,
+ 1038, 1147, 234, 75, 76, -95, 77, 210, 211, 212,
+ 112, 302, 909, 235, 1068, 1039, 1123, 286, 744, 75,
+ 76, 747, 77, 1121, 145, 236, 81, 716, 910, 1110,
+ 63, 745, 290, 494, 1068, 146, 498, -95, 290, 302,
+ 81, 494, 494, 303, 290, 125, 838, 352, 353, 1111,
+ 919, 160, 1076, 113, 598, 1077, 911, 81, 283, 483,
+ 483, 486, 486, 838, 607, 1148, 289, 841, 160, 75,
+ 76, 303, 77, 287, 67, 657, 75, 76, 286, 77,
+ 210, 211, 212, 856, 123, 147, 283, 286, 658, -95,
+ -95, 133, 78, 659, 286, 304, 305, 68, 824, 596,
+ 148, 1056, 69, 194, 493, 535, 75, 76, 493, 77,
+ 210, 211, 212, 497, 1057, 85, 923, 660, 536, 1134,
+ 210, 211, 212, 304, 56, 200, 86, 290, 138, 57,
+ 75, 76, 209, 77, 210, 211, 212, 1154, 139, 87,
+ 75, 76, 492, 77, 283, 156, 492, 283, 661, 985,
+ 575, 496, 1155, 154, 59, 290, 283, 75, 76, 157,
+ 77, 977, 474, 283, 893, 894, 702, 75, 76, 1081,
+ 77, 210, 211, 212, 56, 391, 392, 289, 171, 57,
+ 286, 287, 286, 289, 10, 95, 475, 610, 111, 289,
+ 610, 205, 206, 207, 78, 173, 96, 286, 757, 474,
+ 88, 78, 97, 576, 126, 858, 577, 176, 476, 474,
+ 112, 494, -490, 290, 227, 494, 290, 229, 98, 684,
+ 498, 776, 286, 475, 78, 290, 81, 16, 656, 737,
+ 578, 230, 290, 475, 18, 684, 231, 691, 75, 76,
+ 245, 77, 579, 136, 657, 476, 628, 580, 629, 283,
+ 311, 283, 725, 113, 338, 476, 521, 658, 581, 973,
+ 974, 339, 659, 543, 78, 317, 283, 78, 78, 78,
+ 78, 320, 289, 624, 702, 321, 544, 736, 545, 567,
+ 568, 1095, 286, 288, 503, 504, 660, -150, -150, 791,
+ 792, 283, 287, 738, 739, 474, 322, 99, 287, 529,
+ 289, 78, 323, 883, 287, 625, 872, 530, 75, 76,
+ 746, 77, 626, 190, 756, 9, 546, 661, 290, 475,
+ 290, -262, 531, 324, 192, -262, 326, 358, 247, 327,
+ 873, 627, 547, 329, -262, 290, -262, -262, 283, 283,
+ 359, 476, 628, 684, 629, 248, 1115, 826, 1078, 376,
+ 377, 283, 195, 196, 56, 210, 211, 212, 289, 57,
+ 290, 289, 58, 877, 867, 474, 381, 811, 383, 386,
+ 289, 286, 17, 610, 610, 718, 395, 289, -262, 388,
+ 78, -262, 78, 719, 59, 394, 402, 287, 405, 475,
+ 406, 288, 78, 822, 883, 825, 54, 338, 720, 1113,
+ 1022, 1087, 286, 1023, 339, -262, 1024, 290, 290, 408,
+ 1025, 476, 628, 411, 629, 287, 529, -262, 425, 444,
+ 290, 863, -262, 449, 530, 880, 211, 212, 450, 678,
+ 286, 457, 684, -262, 204, -150, 1065, 469, 471, 721,
+ 283, 75, 76, 256, 77, 210, 211, 212, 877, 75,
+ 76, 510, 77, 608, 630, 190, 529, 1007, 725, 725,
+ 511, 630, 78, 289, 530, 289, 192, 1017, 513, 78,
+ 515, 283, 78, 287, 516, 898, 287, 533, 679, 1114,
+ 289, 518, 903, 561, 562, 287, 563, 574, 572, 573,
+ 589, 591, 287, 594, 195, 196, 611, 651, 615, 283,
+ 652, 653, 288, 1013, 655, 289, 675, 690, 288, 290,
+ 696, 694, 810, 680, 288, 706, 1018, 684, 1026, 714,
+ 726, 727, 728, 256, 1027, 729, 291, 630, 630, 630,
+ 630, 730, 1032, 731, 732, 734, 811, 811, 735, 111,
+ 290, 750, 78, 78, 753, 78, 751, 986, 752, 754,
+ 759, 763, 289, 289, 765, 772, 982, 78, 984, 709,
+ 78, 112, 781, 698, 699, 289, -501, -501, 290, -501,
+ 708, 286, -501, 349, 797, 351, 204, 81, 287, 798,
+ 287, 352, 353, 75, 76, 812, 77, 286, 56, 190,
+ 817, 814, 818, 57, 823, 287, 125, 288, 819, 828,
+ 192, 830, 831, 286, 113, 846, 842, 1013, 844, 852,
+ 1013, 1079, 854, 857, 864, 888, 707, 891, 126, 803,
+ 287, 804, 900, 901, 78, 288, 78, 808, 195, 196,
+ 174, 915, 902, 904, 291, 916, 918, 919, 935, 1051,
+ 283, 78, 1097, 922, 971, 989, 983, 990, 1009, 1005,
+ 991, 1029, 630, 1010, 289, 1030, 283, 1031, 1033, 1036,
+ 1037, 1040, 1045, 1046, 631, 1052, 193, 287, 287, 1047,
+ 746, 631, 283, 1053, 1059, 1060, 194, 1063, 1068, 1072,
+ 287, 810, 810, 288, 1083, 289, 288, 1089, 1086, 1094,
+ 1108, 1122, 78, 1126, 1127, 288, 1112, 1117, 200, 805,
+ 1135, 1136, 288, 78, 1128, 1132, 889, 890, 1138, 290,
+ 204, 1139, 465, 289, 1145, 1106, 1092, 75, 76, 1149,
+ 77, 210, 211, 212, 1153, 290, 460, 467, 892, 895,
+ 550, 936, 630, 78, 78, 896, 788, 631, 631, 631,
+ 631, 290, 941, 796, 1106, 291, 832, 794, 203, 499,
+ 1125, 291, 1109, 773, 695, 1016, 767, 291, 847, 78,
+ 685, 851, 833, 1080, 205, 206, 207, 208, 367, 287,
+ 75, 76, 802, 77, 806, 834, 100, 129, 120, 114,
+ 250, 374, 183, 251, 249, 482, 252, 845, 288, 253,
+ 288, 211, 212, 382, 999, 1004, 808, 808, 1058, 8,
+ 287, 9, 630, 906, 1156, 288, 654, 1129, 980, 1093,
+ 618, 1049, 1130, 10, 11, 1144, 12, 630, 1055, 1131,
+ 630, 194, 755, 664, 0, 13, 160, 560, 287, 0,
+ 288, 14, 0, 559, 0, 345, 346, 809, 347, 0,
+ 291, 348, 349, 200, 351, 0, 0, 15, 872, 0,
+ 352, 353, 0, 219, 289, 190, 16, 0, 17, 0,
+ 1105, 0, 631, 18, 19, 0, 192, 0, 291, 194,
+ 289, 0, 873, 0, 160, 0, 474, 288, 288, 0,
+ 0, 0, 0, 0, 630, 0, 289, 0, 0, 1105,
+ 288, 200, 0, 0, 195, 196, 0, 0, -501, 0,
+ 475, 630, 313, 316, 0, 318, 319, -501, 0, 205,
+ 206, 207, 208, 0, 0, 75, 76, 0, 77, 328,
+ 0, 0, 476, 628, 474, 629, 291, 0, 0, 291,
+ 0, 0, 337, 499, 0, 0, 0, 0, 291, 0,
+ 0, 0, 631, 0, 0, 291, 0, 0, 475, 0,
+ 0, 0, 630, 365, 0, 0, 0, 205, 206, 207,
+ 208, 0, 373, 75, 76, 0, 77, 0, 0, 287,
+ 476, 628, 0, 629, 0, 1103, 204, 0, 0, 288,
+ 0, 0, 0, 75, 76, 287, 77, 210, 211, 212,
+ 0, 0, 0, 630, 630, 0, 0, 0, 0, 0,
+ 0, 287, 0, 0, 1103, 0, 809, 809, 0, 0,
+ 288, 0, 631, 0, 0, 0, 0, 0, 0, 630,
+ 0, 0, 0, 0, 0, 0, 0, 631, 0, 0,
+ 631, 291, 0, 291, 0, 0, 0, 0, 288, 0,
+ 417, 418, 419, 0, 0, 0, 0, 0, 291, 0,
+ 0, 0, 0, 0, 426, 0, 0, 0, 0, 0,
+ 432, 433, 434, 435, 436, 437, 438, 439, 440, 441,
+ 442, 443, 0, 291, 0, 0, 0, 0, 0, 0,
+ 0, 0, 452, 0, 0, 0, 0, -261, 0, 0,
+ 458, -261, 0, 0, 631, 0, 0, 487, 0, 0,
+ -261, 234, -261, -261, 0, 0, -254, 0, 0, 0,
+ -254, 631, 0, 0, 0, 0, 0, 0, 0, -254,
+ 291, 291, 0, 0, 0, 0, 488, 0, 0, 0,
+ 0, 0, 0, 291, 0, 801, 0, 0, 0, 0,
+ 184, 0, 0, 0, -261, 0, 0, -261, 599, 0,
+ 185, 186, 0, 187, 0, 188, 0, 0, 0, 0,
+ 0, 0, 631, -254, 534, 0, -254, 0, 0, 0,
+ 0, -261, 189, 0, 0, 541, 190, 542, 0, 288,
+ 0, 0, 0, -261, 191, 1104, 0, 192, -261, 0,
+ -254, 0, 0, 0, 0, 288, 0, 0, 0, -261,
+ 193, 0, -254, 631, 631, 0, 0, -254, 0, 0,
+ 194, 288, 0, 0, 1104, 195, 196, 0, -254, 0,
+ 0, 0, 291, 197, 0, 0, 198, 199, 0, 631,
+ 0, 0, 200, 0, 201, 186, 0, 0, 0, 0,
+ 0, 0, 1124, 601, 0, 0, 0, 0, 605, 0,
+ 0, 0, 0, 291, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 202, 0, 0, 75, 76, 194, 77,
+ 210, 211, 212, 160, 0, 0, 0, 0, 0, 0,
+ 0, 291, 203, 0, 193, 0, 0, 0, 0, 0,
+ 200, 0, 0, 0, 194, 0, 0, 204, 205, 206,
+ 207, 208, 0, 0, 75, 76, 209, 77, 210, 211,
+ 212, 705, 1041, 0, 0, 0, 200, 184, 0, 0,
+ 0, 0, 0, 474, 0, 1042, 0, 185, 186, 0,
+ 187, 0, 188, 0, 344, 345, 346, 0, 347, 0,
+ 0, 348, 349, 350, 351, 0, 0, 475, 0, 189,
+ 352, 353, 0, 190, 0, 0, 205, 206, 207, 208,
+ 0, 191, 75, 76, 192, 77, 203, 1099, 1100, 476,
+ 628, 0, 629, 0, 0, 0, 0, 193, 0, 0,
+ 0, 0, 205, 206, 207, 208, 0, 194, 75, 76,
+ 209, 77, 195, 196, 0, 0, 771, 0, 355, 0,
+ 197, 0, 0, 198, 199, 0, 0, 356, 0, 200,
+ 0, 201, 0, 0, 604, 0, 786, 787, 0, 184,
+ 0, 0, 291, 0, 0, 0, 0, 0, 1107, 185,
+ 186, 0, 187, 0, 188, 0, 0, 601, 291, 0,
+ 202, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 189, 0, 0, 291, 190, 0, 1107, 0, 203,
+ 0, 0, 0, 191, 0, 0, 192, 0, 0, 0,
+ 0, 0, 0, 0, 204, 205, 206, 207, 208, 193,
+ 0, 75, 76, 209, 77, 210, 211, 212, 0, 194,
+ 0, 833, 0, 0, 195, 196, 0, 0, 0, 0,
+ 0, 0, 197, 0, 834, 198, 199, 0, 0, 0,
+ 0, 200, 0, 201, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 848, 0,
+ 0, 0, 234, 0, 0, 0, 0, 849, 0, 0,
+ 0, 0, 202, 270, 271, 0, 272, 0, 273, 0,
+ 194, 342, 0, 850, 343, 160, 0, 0, 344, 345,
+ 346, 203, 347, 0, 0, 348, 349, 350, 351, 0,
+ 0, 415, 200, 0, 352, 353, 204, 205, 206, 207,
+ 208, 354, 0, 75, 76, 209, 77, 210, 211, 212,
+ 0, 0, 0, 193, 0, 0, 0, 0, 671, 0,
+ 0, 0, 234, 194, 0, 474, 0, 0, 0, 0,
+ 0, 0, 0, 270, 271, 0, 272, 0, 273, 0,
+ 0, 0, 355, 0, 0, 200, 275, 0, 0, 475,
+ 0, 356, 0, 0, 0, 0, 0, 0, 205, 206,
+ 207, 208, 0, 0, 75, 76, 234, 77, 0, 0,
+ 0, 476, 628, 0, 629, 1019, 1020, 270, 271, 0,
+ 272, 0, 273, 193, 0, 0, 0, 0, 0, 1028,
+ 0, 0, 0, 194, 0, 203, 0, 0, 1034, 1035,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 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,
+ 1044, 205, 206, 207, 208, 200, 275, 75, 76, 209,
+ 77, 210, 211, 212, 234, 0, 0, 193, 0, 692,
+ 0, 274, 0, 0, 0, 270, 271, 194, 272, 0,
+ 273, 0, 0, 0, 0, 0, 0, -501, 345, 346,
+ 197, 347, 0, 0, 348, 349, -501, 351, 234, 200,
+ 275, 0, 0, 352, 353, 203, 0, 0, 0, 270,
+ 271, 0, 272, 0, 273, 0, 0, 0, 0, 0,
+ 0, 205, 206, 207, 208, 193, 0, 75, 76, 209,
+ 77, 210, 211, 212, 0, 194, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 197, 203,
+ 0, 355, 0, 0, 0, 0, 0, 200, 275, 193,
+ 356, 0, 0, 0, 0, 205, 206, 207, 208, 194,
+ 0, 75, 76, 209, 77, 210, 211, 212, 0, 0,
+ 0, 0, 197, 0, 0, 0, 0, 0, 0, 0,
+ 234, 200, 275, 0, 0, 0, 0, 0, 0, 0,
+ 0, 270, 271, 0, 272, 0, 273, 203, 0, 0,
+ 0, 0, 0, 0, 88, 0, 0, 0, 0, 0,
+ 0, 0, 0, 205, 206, 207, 208, 0, 234, 75,
+ 76, 209, 77, 505, 211, 212, 0, 0, 0, 270,
+ 271, 203, 272, 0, 273, 0, 0, 565, 0, 0,
+ 0, 193, 0, 0, 618, 0, 0, 205, 206, 207,
+ 208, 194, 0, 75, 76, 209, 77, 505, 211, 212,
+ 0, 0, 0, 0, 197, 0, 0, 0, 0, 0,
+ 0, 0, 234, 200, 275, 0, 0, 0, 0, 193,
+ 0, 0, 0, 270, 271, 0, 272, 0, 273, 194,
+ 0, 0, 0, 0, 0, 0, 0, 624, 0, 0,
+ 0, 0, 234, 194, 0, 0, 0, 0, 160, 0,
+ 0, 200, 275, 270, 271, 0, 272, 0, 273, 0,
+ 0, 0, 0, 203, 0, 200, 0, 0, 0, 625,
+ 0, 0, 0, 193, 0, 0, 626, 0, 0, 205,
+ 206, 207, 208, 194, 0, 75, 76, 209, 77, 505,
+ 211, 212, 0, 0, 0, 627, 197, 0, 474, 0,
+ 0, 203, 0, 193, 0, 200, 275, 0, 0, 0,
+ 0, 0, 0, 194, 0, 0, 0, 205, 206, 207,
+ 208, 0, 475, 75, 76, 209, 77, 210, 211, 212,
+ 0, 205, 206, 207, 208, 200, 275, 75, 76, 0,
+ 77, 0, 0, 0, 476, 628, 0, 629, 0, 0,
+ 0, 0, 0, 0, 0, 203, 0, 0, 0, 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, 205, 206, 207, 208, 0, 0, 75, 76, 209,
+ 77, 210, 211, 212, 184, 203, 0, 0, 0, 0,
+ 0, 0, 0, 0, 185, 186, 0, 187, 0, 188,
+ 0, 205, 206, 207, 208, 0, 0, 75, 76, 209,
+ 77, 210, 211, 212, 314, 0, 189, 0, 0, 0,
+ 190, 0, 0, 0, 0, 0, 0, 0, 191, 0,
+ 0, 192, 186, 0, 0, 0, 184, 0, 0, 0,
+ 0, 0, 0, 0, 193, 0, 185, 186, 0, 187,
+ 0, 188, 0, 0, 194, 0, 0, 0, 335, 195,
+ 196, 0, 0, 0, 0, 0, 0, 197, 189, 0,
+ 198, 199, 190, 0, 0, 0, 200, 0, 201, 0,
+ 191, 193, 0, 192, 0, 0, 342, 538, 0, 343,
+ 0, 194, 336, 344, 345, 346, 193, 347, 0, 88,
+ 348, 349, 350, 351, 0, 0, 194, 202, 0, 352,
+ 353, 195, 196, 200, 0, 0, 354, 0, 0, 197,
+ 0, 0, 198, 199, 0, 0, 203, 0, 200, 0,
+ 201, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 204, 205, 206, 207, 208, 0, 0, 75, 76,
+ 209, 77, 210, 211, 212, 0, 0, 355, 0, 202,
+ 0, 0, 0, 203, 1099, 1100, 356, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 203, 205,
+ 206, 207, 208, 0, 0, 75, 76, 209, 77, 0,
+ 0, 0, 0, 204, 205, 206, 207, 208, 0, 184,
+ 75, 76, 209, 77, 210, 211, 212, 599, 0, 185,
+ 186, 0, 187, 0, 188, 0, 0, 600, 0, 184,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 185,
+ 186, 189, 187, 0, 188, 190, 0, 0, 0, 0,
+ 0, 369, 0, 191, 0, 0, 192, 0, 0, 0,
+ 0, 189, 0, 0, 0, 190, 0, 0, 0, 193,
+ 0, 0, 0, 191, 0, 0, 192, 0, 0, 194,
+ 0, 0, 0, 0, 195, 196, 0, 0, 0, 193,
+ 0, 0, 197, 0, 0, 198, 199, 0, 0, 194,
+ 0, 200, 0, 201, 195, 196, 0, 0, 0, 0,
+ 0, 0, 197, 0, 0, 198, 199, 0, 0, 0,
+ 0, 200, 0, 201, 0, 0, 0, 0, 0, 0,
+ 0, 0, 202, 0, 0, 0, 0, 0, 0, 342,
+ 0, 0, 0, 0, 0, 0, 344, 345, 346, 0,
+ 347, 203, 202, 348, 349, 350, 351, 0, 0, 0,
+ 0, 0, 352, 353, 0, 0, 204, 205, 206, 207,
+ 208, 203, 0, 75, 76, 209, 77, 210, 211, 212,
+ 0, 0, 0, 0, 0, 0, 204, 205, 206, 207,
+ 208, 184, 0, 75, 76, 209, 77, 210, 211, 212,
+ 0, 185, 186, 0, 187, 184, 188, 0, 0, 421,
+ 355, 0, 0, 0, 0, 185, 186, 0, 187, 356,
+ 188, 0, 0, 189, 0, 0, 0, 190, 0, 0,
+ 0, 0, 0, 0, 0, 191, 0, 189, 192, 342,
+ 0, 190, 343, 0, 0, 0, 344, 345, 346, 191,
+ 347, 193, 192, 348, 349, 350, 351, 0, 0, 427,
+ 0, 194, 352, 353, 0, 193, 195, 196, 0, 354,
+ 0, 0, 0, 0, 197, 194, 0, 198, 199, 0,
+ 195, 196, 0, 200, 0, 201, 0, 0, 197, 0,
+ 0, 198, 199, 0, 0, 0, 0, 200, 0, 201,
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
+ 355, 0, 0, 0, 202, 342, 0, 0, 343, 356,
+ 0, 0, 344, 345, 346, 0, 347, 0, 202, 348,
+ 349, 350, 351, 203, 0, 453, 0, 0, 352, 353,
+ 0, 0, 0, 0, 0, 354, 0, 203, 204, 205,
+ 206, 207, 208, 0, 0, 75, 76, 209, 77, 210,
+ 211, 212, 204, 205, 206, 207, 208, 0, 0, 75,
+ 76, 209, 77, 210, 211, 212, 618, 0, 0, 0,
+ 0, 0, 619, 0, 0, 0, 355, 0, 0, 0,
+ 0, 0, 0, 0, 0, 356, 620, 0, 0, 0,
+ 0, 342, 0, 0, 343, 621, 459, 618, 344, 345,
+ 346, 0, 347, 0, 0, 348, 349, 350, 351, 0,
+ 622, 0, 623, 0, 352, 353, 0, 620, 0, 624,
+ 0, 354, 0, 0, 0, 194, 621, 0, 0, 0,
+ 160, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 622, 0, 623, 0, 0, 0, 200, 0, 0,
+ 624, 625, 0, 0, 0, 0, 194, 0, 626, 0,
+ 0, 160, 355, 0, 0, 0, 0, 0, 0, 0,
+ 0, 356, 0, 0, 0, 0, 0, 627, 200, 0,
+ 474, 0, 625, 0, 0, 0, 0, 0, 0, 626,
+ 0, 0, 0, 0, 0, 618, 0, 0, 0, 0,
+ 0, 994, 0, 0, 475, 0, 0, 0, 627, 0,
+ 0, 474, 0, 205, 206, 207, 208, 0, 0, 75,
+ 76, 0, 77, 0, 621, 0, 476, 628, 0, 629,
+ 0, 0, 0, 0, 0, 475, 618, 0, 0, 0,
+ 0, 0, 0, 0, 205, 206, 207, 208, 624, 0,
+ 75, 76, 0, 77, 194, 0, 0, 476, 628, 160,
+ 629, 0, 0, 0, 0, 621, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 200, 0, 0, 0,
+ 625, 0, 0, 0, 0, 0, 0, 626, 0, 624,
+ 0, 0, 0, 0, 0, 194, 342, 0, 0, 343,
+ 160, 0, 0, 344, 345, 346, 627, 347, 0, 474,
+ 348, 349, 350, 351, 0, 0, 522, 200, 0, 352,
+ 353, 625, 0, 0, 0, 0, 354, 0, 626, 0,
+ 0, 0, 0, 475, 0, 0, 0, 0, 0, 0,
+ 0, 0, 205, 206, 207, 208, 0, 627, 75, 76,
+ 474, 77, 0, 0, 0, 476, 628, 0, 629, 0,
+ 0, 0, 0, 0, 0, 0, 0, 355, 0, 0,
+ 0, 0, 0, 0, 475, 0, 356, 0, 0, 0,
+ 0, 0, 0, 205, 206, 207, 208, 0, 0, 75,
+ 76, 0, 77, 0, 0, 342, 476, 628, 343, 629,
+ 0, 0, 344, 345, 346, 0, 347, 0, 0, 348,
+ 349, 350, 351, 342, 0, 523, 343, 0, 352, 353,
+ 344, 345, 346, 0, 347, 354, 0, 348, 349, 350,
+ 351, 342, 0, 524, 343, 0, 352, 353, 344, 345,
+ 346, 0, 347, 354, 0, 348, 349, 350, 351, 0,
+ 0, 532, 0, 0, 352, 353, 342, 0, 0, 343,
+ 0, 354, 0, 344, 345, 346, 355, 347, 0, 0,
+ 348, 349, 350, 351, 342, 356, 855, 343, 0, 352,
+ 353, 344, 345, 346, 355, 347, 354, 0, 348, 349,
+ 350, 351, 342, 356, 870, 343, 0, 352, 353, 344,
+ 345, 346, 355, 347, 354, 0, 348, 349, 350, 351,
+ 0, 356, 0, 871, 0, 352, 353, 342, 0, 0,
+ 343, 0, 354, 0, 344, 345, 346, 355, 347, 0,
+ 0, 348, 349, 350, 351, 342, 356, 1070, 343, 0,
+ 352, 353, 344, 345, 346, 355, 347, 354, 0, 348,
+ 349, 350, 351, 0, 356, 0, 1071, 0, 352, 353,
+ 0, 0, 0, 355, 0, 354, 342, 0, 0, 343,
+ 0, 0, 356, 344, 345, 346, 0, 347, 0, 0,
+ 348, 349, 350, 351, 0, 0, 0, 0, 355, 352,
+ 353, 0, 0, 0, 0, 0, 354, 356, 942, 0,
+ 0, 0, 943, 0, 0, 0, 355, 0, 0, 0,
+ 0, 0, 0, 0, 0, 356, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 944, 0,
+ 0, 0, 0, 0, 0, 0, 0, 355, 945, 946,
+ 947, 948, 949, 950, 951, 0, 356, 0, 0, 0,
+ 0, 0, 0, 0, 952, 0, 953, 954, 955, 956,
+ 957, 958, 959, 960, 961, 962, 963, 964, 965, 966,
+ 0, 967
};
static const yytype_int16 yycheck[] =
{
- 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,
+ 17, 232, 533, 55, 83, 401, 357, 451, 60, 156,
+ 454, 674, 456, 17, 66, 170, 142, 414, 66, 750,
+ 144, 10, 641, 1, 389, 14, 389, 16, 576, 624,
+ 625, 626, 627, 170, 18, 777, 115, 169, 1, 118,
+ 172, 576, 121, 914, 899, 386, 178, 547, 1, 38,
+ 20, 16, 131, 8, 133, 1, 24, 592, 144, 68,
+ 16, 17, 917, 5, 278, 16, 14, 389, 930, 56,
+ 9, 980, 34, 982, 153, 39, 10, 152, 22, 63,
+ 72, 52, 41, 55, 170, 29, 24, 71, 793, 1049,
+ 795, 55, 167, 110, 173, 14, 158, 68, 150, 116,
+ 117, 28, 119, 75, 16, 0, 110, 233, 97, 125,
+ 91, 237, 30, 117, 238, 119, 512, 243, 16, 484,
+ 137, 484, 174, 278, 866, 24, 85, 144, 14, 9,
+ 122, 1091, 363, 137, 54, 366, 799, 368, 130, 480,
+ 28, 278, 1051, 152, 24, 126, 105, 123, 1010, 68,
+ 70, 143, 238, 170, 749, 158, 55, 174, 175, 176,
+ 1, 177, 484, 179, 5, 700, 54, 154, 107, 10,
+ 174, 175, 176, 904, 1, 167, 75, 573, 5, 171,
+ 197, 395, 68, 925, 25, 177, 582, 99, 919, 30,
+ 152, 854, 278, 171, 1049, 858, 568, 111, 170, 183,
+ 572, 99, 167, 30, 126, 570, 174, 570, 164, 75,
+ 173, 157, 229, 155, 169, 185, 167, 170, 171, 1090,
+ 173, 238, 563, 564, 158, 229, 174, 175, 176, 376,
+ 730, 731, 170, 312, 153, 321, 1091, 1146, 75, 231,
+ 395, 789, 259, 80, 57, 1116, 401, 174, 175, 176,
+ 64, 5, 170, 171, 789, 173, 174, 70, 395, 248,
+ 23, 278, 16, 9, 83, 131, 390, 153, 24, 393,
+ 81, 170, 716, 16, 398, 399, 260, 1, 24, 296,
+ 9, 5, 170, 171, 9, 173, 10, 413, 519, 155,
+ 307, 14, 296, 56, 108, 24, 692, 14, 170, 24,
+ 379, 44, 126, 389, 390, 5, 30, 393, 64, 395,
+ 124, 177, 398, 399, 655, 401, 333, 17, 1, 660,
+ 81, 717, 1053, 70, 1066, 14, 874, 375, 32, 170,
+ 171, 14, 173, 174, 175, 176, 1137, 44, 152, 874,
+ 9, 1142, 5, 170, 171, 68, 173, 174, 175, 176,
+ 54, 68, 108, 16, 9, 24, 1098, 512, 10, 170,
+ 171, 980, 173, 1094, 51, 28, 70, 598, 124, 24,
+ 68, 23, 389, 390, 9, 62, 393, 100, 395, 68,
+ 70, 398, 399, 100, 401, 89, 981, 27, 28, 24,
+ 9, 81, 1033, 97, 520, 1036, 152, 70, 484, 764,
+ 765, 764, 765, 998, 536, 24, 278, 1138, 81, 170,
+ 171, 100, 173, 170, 52, 40, 170, 171, 573, 173,
+ 174, 175, 176, 774, 14, 112, 512, 582, 53, 152,
+ 153, 122, 449, 58, 589, 152, 153, 75, 111, 518,
+ 158, 10, 80, 76, 568, 449, 170, 171, 572, 173,
+ 174, 175, 176, 577, 23, 36, 853, 82, 450, 1122,
+ 174, 175, 176, 152, 81, 98, 47, 484, 127, 86,
+ 170, 171, 172, 173, 174, 175, 176, 9, 73, 60,
+ 170, 171, 568, 173, 570, 170, 572, 573, 113, 81,
+ 14, 577, 24, 158, 111, 512, 582, 170, 171, 110,
+ 173, 897, 131, 589, 815, 816, 592, 170, 171, 1040,
+ 173, 174, 175, 176, 81, 272, 273, 389, 79, 86,
+ 675, 278, 677, 395, 45, 46, 155, 544, 32, 401,
+ 547, 164, 165, 166, 551, 83, 57, 692, 167, 131,
+ 121, 558, 63, 67, 111, 776, 70, 44, 177, 131,
+ 54, 568, 158, 570, 167, 572, 573, 103, 79, 576,
+ 577, 687, 717, 155, 581, 582, 70, 88, 24, 621,
+ 94, 43, 589, 155, 95, 592, 57, 581, 170, 171,
+ 146, 173, 106, 16, 40, 177, 178, 111, 180, 675,
+ 52, 677, 609, 97, 22, 177, 24, 53, 122, 893,
+ 894, 29, 58, 1, 621, 25, 692, 624, 625, 626,
+ 627, 16, 484, 70, 700, 16, 14, 621, 16, 25,
+ 26, 1065, 777, 170, 398, 399, 82, 16, 17, 708,
+ 709, 717, 389, 622, 623, 131, 16, 158, 395, 1,
+ 512, 658, 16, 790, 401, 102, 35, 9, 170, 171,
+ 107, 173, 109, 42, 658, 33, 54, 113, 675, 155,
+ 677, 10, 24, 16, 53, 14, 16, 24, 46, 16,
+ 59, 128, 70, 16, 23, 692, 25, 26, 764, 765,
+ 127, 177, 178, 700, 180, 63, 1082, 739, 167, 9,
+ 173, 777, 81, 82, 81, 174, 175, 176, 570, 86,
+ 717, 573, 89, 789, 783, 131, 14, 724, 69, 16,
+ 582, 866, 90, 730, 731, 1, 10, 589, 67, 24,
+ 737, 70, 739, 9, 111, 23, 97, 484, 97, 155,
+ 14, 278, 749, 737, 881, 739, 123, 22, 24, 24,
+ 167, 167, 897, 170, 29, 94, 173, 764, 765, 71,
+ 177, 177, 178, 152, 180, 512, 1, 106, 24, 174,
+ 777, 778, 111, 103, 9, 174, 175, 176, 79, 16,
+ 925, 9, 789, 122, 163, 164, 1007, 179, 107, 24,
+ 866, 170, 171, 930, 173, 174, 175, 176, 874, 170,
+ 171, 97, 173, 174, 551, 42, 1, 923, 815, 816,
+ 97, 558, 819, 675, 9, 677, 53, 933, 107, 826,
+ 43, 897, 829, 570, 72, 819, 573, 16, 65, 24,
+ 692, 122, 826, 16, 24, 582, 9, 23, 26, 10,
+ 10, 16, 589, 108, 81, 82, 174, 34, 70, 925,
+ 34, 168, 389, 929, 113, 717, 14, 91, 395, 866,
+ 23, 151, 724, 100, 401, 43, 935, 874, 944, 107,
+ 9, 24, 9, 1010, 950, 174, 170, 624, 625, 626,
+ 627, 14, 958, 14, 87, 25, 893, 894, 89, 32,
+ 897, 16, 899, 900, 177, 902, 168, 904, 34, 177,
+ 167, 100, 764, 765, 9, 65, 900, 914, 902, 105,
+ 917, 54, 14, 16, 17, 777, 12, 13, 925, 15,
+ 85, 1066, 18, 19, 16, 21, 163, 70, 675, 24,
+ 677, 27, 28, 170, 171, 174, 173, 1082, 81, 42,
+ 16, 174, 14, 86, 89, 692, 89, 484, 83, 23,
+ 53, 16, 14, 1098, 97, 101, 177, 1033, 151, 23,
+ 1036, 1037, 23, 14, 16, 23, 41, 23, 111, 19,
+ 717, 21, 126, 152, 981, 512, 983, 724, 81, 82,
+ 91, 25, 83, 53, 278, 26, 24, 9, 170, 983,
+ 1066, 998, 1068, 167, 24, 164, 126, 64, 14, 131,
+ 177, 167, 749, 170, 866, 164, 1082, 164, 16, 16,
+ 16, 16, 23, 23, 551, 16, 66, 764, 765, 23,
+ 107, 558, 1098, 82, 9, 34, 76, 155, 9, 16,
+ 777, 893, 894, 570, 14, 897, 573, 23, 167, 86,
+ 23, 23, 1049, 34, 34, 582, 24, 24, 98, 99,
+ 1126, 1127, 589, 1060, 23, 103, 803, 804, 16, 1066,
+ 163, 107, 153, 925, 16, 1072, 1060, 170, 171, 177,
+ 173, 174, 175, 176, 167, 1082, 376, 381, 813, 817,
+ 462, 874, 829, 1090, 1091, 817, 700, 624, 625, 626,
+ 627, 1098, 881, 711, 1101, 389, 1, 710, 148, 393,
+ 1101, 395, 1074, 681, 589, 931, 675, 401, 764, 1116,
+ 577, 765, 17, 1038, 164, 165, 166, 167, 238, 866,
+ 170, 171, 719, 173, 174, 30, 21, 67, 62, 55,
+ 164, 245, 134, 167, 155, 387, 170, 761, 675, 173,
+ 677, 175, 176, 265, 1, 920, 893, 894, 998, 31,
+ 897, 33, 899, 829, 1154, 692, 558, 1116, 899, 1062,
+ 17, 981, 1119, 45, 46, 1138, 48, 914, 992, 1120,
+ 917, 76, 655, 563, -1, 57, 81, 470, 925, -1,
+ 717, 63, -1, 469, -1, 12, 13, 724, 15, -1,
+ 484, 18, 19, 98, 21, -1, -1, 79, 35, -1,
+ 27, 28, -1, 135, 1066, 42, 88, -1, 90, -1,
+ 1072, -1, 749, 95, 96, -1, 53, -1, 512, 76,
+ 1082, -1, 59, -1, 81, -1, 131, 764, 765, -1,
+ -1, -1, -1, -1, 981, -1, 1098, -1, -1, 1101,
+ 777, 98, -1, -1, 81, 82, -1, -1, 75, -1,
+ 155, 998, 184, 185, -1, 187, 188, 84, -1, 164,
+ 165, 166, 167, -1, -1, 170, 171, -1, 173, 201,
+ -1, -1, 177, 178, 131, 180, 570, -1, -1, 573,
+ -1, -1, 214, 577, -1, -1, -1, -1, 582, -1,
+ -1, -1, 829, -1, -1, 589, -1, -1, 155, -1,
+ -1, -1, 1049, 235, -1, -1, -1, 164, 165, 166,
+ 167, -1, 244, 170, 171, -1, 173, -1, -1, 1066,
+ 177, 178, -1, 180, -1, 1072, 163, -1, -1, 866,
+ -1, -1, -1, 170, 171, 1082, 173, 174, 175, 176,
+ -1, -1, -1, 1090, 1091, -1, -1, -1, -1, -1,
+ -1, 1098, -1, -1, 1101, -1, 893, 894, -1, -1,
+ 897, -1, 899, -1, -1, -1, -1, -1, -1, 1116,
+ -1, -1, -1, -1, -1, -1, -1, 914, -1, -1,
+ 917, 675, -1, 677, -1, -1, -1, -1, 925, -1,
+ 322, 323, 324, -1, -1, -1, -1, -1, 692, -1,
+ -1, -1, -1, -1, 336, -1, -1, -1, -1, -1,
+ 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+ 352, 353, -1, 717, -1, -1, -1, -1, -1, -1,
+ -1, -1, 364, -1, -1, -1, -1, 10, -1, -1,
+ 372, 14, -1, -1, 981, -1, -1, 1, -1, -1,
+ 23, 5, 25, 26, -1, -1, 10, -1, -1, -1,
+ 14, 998, -1, -1, -1, -1, -1, -1, -1, 23,
+ 764, 765, -1, -1, -1, -1, 30, -1, -1, -1,
+ -1, -1, -1, 777, -1, 1, -1, -1, -1, -1,
+ 6, -1, -1, -1, 67, -1, -1, 70, 14, -1,
+ 16, 17, -1, 19, -1, 21, -1, -1, -1, -1,
+ -1, -1, 1049, 67, 446, -1, 70, -1, -1, -1,
+ -1, 94, 38, -1, -1, 457, 42, 459, -1, 1066,
+ -1, -1, -1, 106, 50, 1072, -1, 53, 111, -1,
+ 94, -1, -1, -1, -1, 1082, -1, -1, -1, 122,
+ 66, -1, 106, 1090, 1091, -1, -1, 111, -1, -1,
+ 76, 1098, -1, -1, 1101, 81, 82, -1, 122, -1,
+ -1, -1, 866, 89, -1, -1, 92, 93, -1, 1116,
+ -1, -1, 98, -1, 100, 17, -1, -1, -1, -1,
+ -1, -1, 24, 525, -1, -1, -1, -1, 530, -1,
+ -1, -1, -1, 897, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 129, -1, -1, 170, 171, 76, 173,
+ 174, 175, 176, 81, -1, -1, -1, -1, -1, -1,
+ -1, 925, 148, -1, 66, -1, -1, -1, -1, -1,
+ 98, -1, -1, -1, 76, -1, -1, 163, 164, 165,
+ 166, 167, -1, -1, 170, 171, 172, 173, 174, 175,
+ 176, 593, 1, -1, -1, -1, 98, 6, -1, -1,
+ -1, -1, -1, 131, -1, 14, -1, 16, 17, -1,
+ 19, -1, 21, -1, 11, 12, 13, -1, 15, -1,
+ -1, 18, 19, 20, 21, -1, -1, 155, -1, 38,
+ 27, 28, -1, 42, -1, -1, 164, 165, 166, 167,
+ -1, 50, 170, 171, 53, 173, 148, 149, 150, 177,
+ 178, -1, 180, -1, -1, -1, -1, 66, -1, -1,
+ -1, -1, 164, 165, 166, 167, -1, 76, 170, 171,
+ 172, 173, 81, 82, -1, -1, 678, -1, 75, -1,
+ 89, -1, -1, 92, 93, -1, -1, 84, -1, 98,
+ -1, 100, -1, -1, 1, -1, 698, 699, -1, 6,
+ -1, -1, 1066, -1, -1, -1, -1, -1, 1072, 16,
+ 17, -1, 19, -1, 21, -1, -1, 719, 1082, -1,
+ 129, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 38, -1, -1, 1098, 42, -1, 1101, -1, 148,
+ -1, -1, -1, 50, -1, -1, 53, -1, -1, -1,
+ -1, -1, -1, -1, 163, 164, 165, 166, 167, 66,
+ -1, 170, 171, 172, 173, 174, 175, 176, -1, 76,
+ -1, 17, -1, -1, 81, 82, -1, -1, -1, -1,
+ -1, -1, 89, -1, 30, 92, 93, -1, -1, -1,
+ -1, 98, -1, 100, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 1, -1,
+ -1, -1, 5, -1, -1, -1, -1, 10, -1, -1,
+ -1, -1, 129, 16, 17, -1, 19, -1, 21, -1,
+ 76, 4, -1, 26, 7, 81, -1, -1, 11, 12,
+ 13, 148, 15, -1, -1, 18, 19, 20, 21, -1,
+ -1, 24, 98, -1, 27, 28, 163, 164, 165, 166,
+ 167, 34, -1, 170, 171, 172, 173, 174, 175, 176,
+ -1, -1, -1, 66, -1, -1, -1, -1, 1, -1,
+ -1, -1, 5, 76, -1, 131, -1, -1, -1, -1,
+ -1, -1, -1, 16, 17, -1, 19, -1, 21, -1,
+ -1, -1, 75, -1, -1, 98, 99, -1, -1, 155,
+ -1, 84, -1, -1, -1, -1, -1, -1, 164, 165,
+ 166, 167, -1, -1, 170, 171, 5, 173, -1, -1,
+ -1, 177, 178, -1, 180, 937, 938, 16, 17, -1,
+ 19, -1, 21, 66, -1, -1, -1, -1, -1, 951,
+ -1, -1, -1, 76, -1, 148, -1, -1, 960, 961,
-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,
+ 972, 164, 165, 166, 167, 98, 99, 170, 171, 172,
+ 173, 174, 175, 176, 5, -1, -1, 66, -1, 10,
+ -1, 70, -1, -1, -1, 16, 17, 76, 19, -1,
+ 21, -1, -1, -1, -1, -1, -1, 11, 12, 13,
+ 89, 15, -1, -1, 18, 19, 20, 21, 5, 98,
+ 99, -1, -1, 27, 28, 148, -1, -1, -1, 16,
+ 17, -1, 19, -1, 21, -1, -1, -1, -1, -1,
+ -1, 164, 165, 166, 167, 66, -1, 170, 171, 172,
+ 173, 174, 175, 176, -1, 76, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 89, 148,
+ -1, 75, -1, -1, -1, -1, -1, 98, 99, 66,
+ 84, -1, -1, -1, -1, 164, 165, 166, 167, 76,
+ -1, 170, 171, 172, 173, 174, 175, 176, -1, -1,
+ -1, -1, 89, -1, -1, -1, -1, -1, -1, -1,
+ 5, 98, 99, -1, -1, -1, -1, -1, -1, -1,
+ -1, 16, 17, -1, 19, -1, 21, 148, -1, -1,
+ -1, -1, -1, -1, 121, -1, -1, -1, -1, -1,
+ -1, -1, -1, 164, 165, 166, 167, -1, 5, 170,
+ 171, 172, 173, 174, 175, 176, -1, -1, -1, 16,
+ 17, 148, 19, -1, 21, -1, -1, 24, -1, -1,
+ -1, 66, -1, -1, 17, -1, -1, 164, 165, 166,
+ 167, 76, -1, 170, 171, 172, 173, 174, 175, 176,
+ -1, -1, -1, -1, 89, -1, -1, -1, -1, -1,
+ -1, -1, 5, 98, 99, -1, -1, -1, -1, 66,
+ -1, -1, -1, 16, 17, -1, 19, -1, 21, 76,
+ -1, -1, -1, -1, -1, -1, -1, 70, -1, -1,
+ -1, -1, 5, 76, -1, -1, -1, -1, 81, -1,
+ -1, 98, 99, 16, 17, -1, 19, -1, 21, -1,
+ -1, -1, -1, 148, -1, 98, -1, -1, -1, 102,
+ -1, -1, -1, 66, -1, -1, 109, -1, -1, 164,
+ 165, 166, 167, 76, -1, 170, 171, 172, 173, 174,
+ 175, 176, -1, -1, -1, 128, 89, -1, 131, -1,
+ -1, 148, -1, 66, -1, 98, 99, -1, -1, -1,
+ -1, -1, -1, 76, -1, -1, -1, 164, 165, 166,
+ 167, -1, 155, 170, 171, 172, 173, 174, 175, 176,
+ -1, 164, 165, 166, 167, 98, 99, 170, 171, -1,
+ 173, -1, -1, -1, 177, 178, -1, 180, -1, -1,
+ -1, -1, -1, -1, -1, 148, -1, -1, -1, -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, 164, 165, 166, 167, -1, -1, 170, 171, 172,
+ 173, 174, 175, 176, 6, 148, -1, -1, -1, -1,
+ -1, -1, -1, -1, 16, 17, -1, 19, -1, 21,
+ -1, 164, 165, 166, 167, -1, -1, 170, 171, 172,
+ 173, 174, 175, 176, 36, -1, 38, -1, -1, -1,
+ 42, -1, -1, -1, -1, -1, -1, -1, 50, -1,
+ -1, 53, 17, -1, -1, -1, 6, -1, -1, -1,
+ -1, -1, -1, -1, 66, -1, 16, 17, -1, 19,
+ -1, 21, -1, -1, 76, -1, -1, -1, 28, 81,
+ 82, -1, -1, -1, -1, -1, -1, 89, 38, -1,
+ 92, 93, 42, -1, -1, -1, 98, -1, 100, -1,
+ 50, 66, -1, 53, -1, -1, 4, 5, -1, 7,
+ -1, 76, 62, 11, 12, 13, 66, 15, -1, 121,
+ 18, 19, 20, 21, -1, -1, 76, 129, -1, 27,
+ 28, 81, 82, 98, -1, -1, 34, -1, -1, 89,
+ -1, -1, 92, 93, -1, -1, 148, -1, 98, -1,
+ 100, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 163, 164, 165, 166, 167, -1, -1, 170, 171,
+ 172, 173, 174, 175, 176, -1, -1, 75, -1, 129,
+ -1, -1, -1, 148, 149, 150, 84, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 148, 164,
+ 165, 166, 167, -1, -1, 170, 171, 172, 173, -1,
+ -1, -1, -1, 163, 164, 165, 166, 167, -1, 6,
+ 170, 171, 172, 173, 174, 175, 176, 14, -1, 16,
+ 17, -1, 19, -1, 21, -1, -1, 24, -1, 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,
+ 17, 38, 19, -1, 21, 42, -1, -1, -1, -1,
+ -1, 28, -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, 76,
+ -1, -1, -1, -1, 81, 82, -1, -1, -1, 66,
+ -1, -1, 89, -1, -1, 92, 93, -1, -1, 76,
+ -1, 98, -1, 100, 81, 82, -1, -1, -1, -1,
+ -1, -1, 89, -1, -1, 92, 93, -1, -1, -1,
+ -1, 98, -1, 100, -1, -1, -1, -1, -1, -1,
+ -1, -1, 129, -1, -1, -1, -1, -1, -1, 4,
+ -1, -1, -1, -1, -1, -1, 11, 12, 13, -1,
+ 15, 148, 129, 18, 19, 20, 21, -1, -1, -1,
+ -1, -1, 27, 28, -1, -1, 163, 164, 165, 166,
+ 167, 148, -1, 170, 171, 172, 173, 174, 175, 176,
+ -1, -1, -1, -1, -1, -1, 163, 164, 165, 166,
+ 167, 6, -1, 170, 171, 172, 173, 174, 175, 176,
+ -1, 16, 17, -1, 19, 6, 21, -1, -1, 24,
+ 75, -1, -1, -1, -1, 16, 17, -1, 19, 84,
+ 21, -1, -1, 38, -1, -1, -1, 42, -1, -1,
+ -1, -1, -1, -1, -1, 50, -1, 38, 53, 4,
+ -1, 42, 7, -1, -1, -1, 11, 12, 13, 50,
+ 15, 66, 53, 18, 19, 20, 21, -1, -1, 24,
+ -1, 76, 27, 28, -1, 66, 81, 82, -1, 34,
+ -1, -1, -1, -1, 89, 76, -1, 92, 93, -1,
+ 81, 82, -1, 98, -1, 100, -1, -1, 89, -1,
+ -1, 92, 93, -1, -1, -1, -1, 98, -1, 100,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -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
+ 75, -1, -1, -1, 129, 4, -1, -1, 7, 84,
+ -1, -1, 11, 12, 13, -1, 15, -1, 129, 18,
+ 19, 20, 21, 148, -1, 24, -1, -1, 27, 28,
+ -1, -1, -1, -1, -1, 34, -1, 148, 163, 164,
+ 165, 166, 167, -1, -1, 170, 171, 172, 173, 174,
+ 175, 176, 163, 164, 165, 166, 167, -1, -1, 170,
+ 171, 172, 173, 174, 175, 176, 17, -1, -1, -1,
+ -1, -1, 23, -1, -1, -1, 75, -1, -1, -1,
+ -1, -1, -1, -1, -1, 84, 37, -1, -1, -1,
+ -1, 4, -1, -1, 7, 46, 9, 17, 11, 12,
+ 13, -1, 15, -1, -1, 18, 19, 20, 21, -1,
+ 61, -1, 63, -1, 27, 28, -1, 37, -1, 70,
+ -1, 34, -1, -1, -1, 76, 46, -1, -1, -1,
+ 81, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 61, -1, 63, -1, -1, -1, 98, -1, -1,
+ 70, 102, -1, -1, -1, -1, 76, -1, 109, -1,
+ -1, 81, 75, -1, -1, -1, -1, -1, -1, -1,
+ -1, 84, -1, -1, -1, -1, -1, 128, 98, -1,
+ 131, -1, 102, -1, -1, -1, -1, -1, -1, 109,
+ -1, -1, -1, -1, -1, 17, -1, -1, -1, -1,
+ -1, 23, -1, -1, 155, -1, -1, -1, 128, -1,
+ -1, 131, -1, 164, 165, 166, 167, -1, -1, 170,
+ 171, -1, 173, -1, 46, -1, 177, 178, -1, 180,
+ -1, -1, -1, -1, -1, 155, 17, -1, -1, -1,
+ -1, -1, -1, -1, 164, 165, 166, 167, 70, -1,
+ 170, 171, -1, 173, 76, -1, -1, 177, 178, 81,
+ 180, -1, -1, -1, -1, 46, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 98, -1, -1, -1,
+ 102, -1, -1, -1, -1, -1, -1, 109, -1, 70,
+ -1, -1, -1, -1, -1, 76, 4, -1, -1, 7,
+ 81, -1, -1, 11, 12, 13, 128, 15, -1, 131,
+ 18, 19, 20, 21, -1, -1, 24, 98, -1, 27,
+ 28, 102, -1, -1, -1, -1, 34, -1, 109, -1,
+ -1, -1, -1, 155, -1, -1, -1, -1, -1, -1,
+ -1, -1, 164, 165, 166, 167, -1, 128, 170, 171,
+ 131, 173, -1, -1, -1, 177, 178, -1, 180, -1,
+ -1, -1, -1, -1, -1, -1, -1, 75, -1, -1,
+ -1, -1, -1, -1, 155, -1, 84, -1, -1, -1,
+ -1, -1, -1, 164, 165, 166, 167, -1, -1, 170,
+ 171, -1, 173, -1, -1, 4, 177, 178, 7, 180,
+ -1, -1, 11, 12, 13, -1, 15, -1, -1, 18,
+ 19, 20, 21, 4, -1, 24, 7, -1, 27, 28,
+ 11, 12, 13, -1, 15, 34, -1, 18, 19, 20,
+ 21, 4, -1, 24, 7, -1, 27, 28, 11, 12,
+ 13, -1, 15, 34, -1, 18, 19, 20, 21, -1,
+ -1, 24, -1, -1, 27, 28, 4, -1, -1, 7,
+ -1, 34, -1, 11, 12, 13, 75, 15, -1, -1,
+ 18, 19, 20, 21, 4, 84, 24, 7, -1, 27,
+ 28, 11, 12, 13, 75, 15, 34, -1, 18, 19,
+ 20, 21, 4, 84, 24, 7, -1, 27, 28, 11,
+ 12, 13, 75, 15, 34, -1, 18, 19, 20, 21,
+ -1, 84, -1, 25, -1, 27, 28, 4, -1, -1,
+ 7, -1, 34, -1, 11, 12, 13, 75, 15, -1,
+ -1, 18, 19, 20, 21, 4, 84, 24, 7, -1,
+ 27, 28, 11, 12, 13, 75, 15, 34, -1, 18,
+ 19, 20, 21, -1, 84, -1, 25, -1, 27, 28,
+ -1, -1, -1, 75, -1, 34, 4, -1, -1, 7,
+ -1, -1, 84, 11, 12, 13, -1, 15, -1, -1,
+ 18, 19, 20, 21, -1, -1, -1, -1, 75, 27,
+ 28, -1, -1, -1, -1, -1, 34, 84, 74, -1,
+ -1, -1, 78, -1, -1, -1, 75, -1, -1, -1,
+ -1, -1, -1, -1, -1, 84, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 104, -1,
+ -1, -1, -1, -1, -1, -1, -1, 75, 114, 115,
+ 116, 117, 118, 119, 120, -1, 84, -1, -1, -1,
+ -1, -1, -1, -1, 130, -1, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ -1, 147
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint16 yystos[] =
{
- 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
+ 0, 1, 157, 187, 158, 189, 190, 0, 31, 33,
+ 45, 46, 48, 57, 63, 79, 88, 90, 95, 96,
+ 198, 376, 377, 378, 379, 381, 383, 385, 387, 389,
+ 390, 391, 392, 393, 403, 404, 406, 409, 410, 411,
+ 413, 414, 415, 416, 417, 422, 426, 429, 430, 39,
+ 55, 191, 195, 111, 123, 402, 81, 86, 89, 111,
+ 402, 425, 52, 68, 396, 405, 402, 52, 75, 80,
+ 395, 401, 407, 402, 81, 170, 171, 173, 373, 374,
+ 499, 70, 399, 500, 501, 36, 47, 60, 121, 188,
+ 218, 220, 224, 226, 229, 46, 57, 63, 79, 158,
+ 377, 158, 402, 10, 158, 502, 1, 173, 192, 196,
+ 126, 32, 54, 97, 397, 501, 83, 126, 501, 44,
+ 396, 500, 384, 14, 300, 89, 111, 397, 425, 395,
+ 380, 500, 300, 122, 240, 241, 16, 44, 127, 73,
+ 388, 240, 230, 225, 227, 51, 62, 112, 158, 219,
+ 402, 54, 398, 500, 158, 412, 170, 110, 197, 200,
+ 81, 499, 240, 373, 499, 240, 499, 386, 240, 300,
+ 301, 79, 408, 83, 91, 126, 44, 382, 300, 240,
+ 231, 394, 240, 401, 6, 16, 17, 19, 21, 38,
+ 42, 50, 53, 66, 76, 81, 82, 89, 92, 93,
+ 98, 100, 129, 148, 163, 164, 165, 166, 167, 172,
+ 174, 175, 176, 339, 340, 341, 342, 343, 344, 348,
+ 354, 357, 367, 368, 369, 373, 375, 167, 499, 103,
+ 43, 57, 231, 300, 5, 16, 28, 228, 333, 334,
+ 342, 346, 373, 221, 222, 146, 240, 46, 63, 413,
+ 164, 167, 170, 173, 193, 194, 343, 1, 171, 56,
+ 154, 201, 400, 427, 199, 423, 152, 167, 300, 394,
+ 16, 17, 19, 21, 70, 99, 302, 303, 304, 307,
+ 310, 326, 332, 342, 345, 346, 357, 367, 368, 369,
+ 373, 375, 300, 394, 240, 499, 501, 499, 499, 300,
+ 394, 14, 68, 100, 152, 153, 232, 233, 234, 235,
+ 243, 52, 500, 348, 36, 220, 348, 25, 348, 348,
+ 16, 16, 16, 16, 16, 373, 16, 16, 348, 16,
+ 16, 99, 360, 8, 169, 28, 62, 348, 22, 29,
+ 371, 372, 4, 7, 11, 12, 13, 15, 18, 19,
+ 20, 21, 27, 28, 34, 75, 84, 353, 24, 127,
+ 499, 300, 243, 231, 347, 348, 231, 334, 231, 28,
+ 223, 337, 338, 348, 398, 402, 9, 173, 373, 500,
+ 432, 14, 432, 69, 489, 490, 16, 491, 24, 328,
+ 327, 367, 367, 308, 23, 10, 307, 310, 312, 311,
+ 499, 245, 97, 68, 152, 97, 14, 373, 71, 246,
+ 247, 152, 240, 351, 352, 24, 342, 348, 348, 348,
+ 358, 24, 348, 361, 373, 24, 348, 24, 1, 170,
+ 171, 173, 348, 348, 348, 348, 348, 348, 348, 348,
+ 348, 348, 348, 348, 174, 350, 349, 359, 360, 103,
+ 79, 243, 348, 24, 242, 243, 243, 9, 348, 9,
+ 194, 202, 240, 14, 68, 153, 482, 200, 14, 179,
+ 9, 107, 418, 75, 131, 155, 177, 492, 493, 494,
+ 496, 498, 418, 326, 330, 331, 332, 1, 30, 314,
+ 325, 335, 342, 346, 373, 336, 342, 346, 373, 375,
+ 307, 310, 313, 314, 314, 174, 275, 305, 306, 310,
+ 97, 97, 244, 107, 236, 43, 72, 251, 122, 231,
+ 221, 24, 24, 24, 24, 16, 99, 362, 363, 1,
+ 9, 24, 24, 16, 348, 499, 300, 246, 5, 246,
+ 246, 348, 348, 1, 14, 16, 54, 70, 203, 208,
+ 236, 428, 125, 177, 179, 16, 167, 23, 424, 491,
+ 490, 16, 24, 9, 498, 24, 331, 25, 26, 329,
+ 315, 309, 26, 10, 23, 14, 67, 70, 94, 106,
+ 111, 122, 276, 277, 279, 283, 286, 289, 293, 10,
+ 275, 16, 248, 252, 108, 253, 240, 243, 231, 14,
+ 24, 348, 364, 365, 1, 348, 361, 394, 174, 213,
+ 373, 174, 210, 211, 212, 70, 213, 206, 17, 23,
+ 37, 46, 61, 63, 70, 102, 109, 128, 178, 180,
+ 367, 368, 430, 431, 442, 443, 445, 446, 447, 451,
+ 457, 459, 460, 478, 479, 497, 498, 499, 16, 167,
+ 483, 34, 34, 168, 442, 113, 24, 40, 53, 58,
+ 82, 113, 419, 420, 494, 495, 498, 1, 10, 25,
+ 325, 1, 317, 318, 331, 14, 275, 287, 16, 65,
+ 100, 290, 354, 355, 373, 336, 291, 292, 1, 14,
+ 91, 499, 10, 275, 151, 305, 23, 237, 16, 17,
+ 249, 250, 342, 354, 355, 348, 43, 41, 85, 105,
+ 259, 261, 262, 263, 107, 319, 243, 366, 1, 9,
+ 24, 24, 30, 174, 214, 373, 9, 24, 9, 174,
+ 14, 14, 87, 209, 25, 89, 499, 501, 402, 402,
+ 479, 479, 479, 479, 10, 23, 107, 460, 484, 458,
+ 16, 168, 34, 177, 177, 495, 499, 167, 498, 167,
+ 421, 9, 24, 100, 316, 9, 319, 306, 220, 273,
+ 275, 348, 65, 291, 356, 284, 231, 278, 280, 294,
+ 275, 14, 24, 170, 238, 239, 348, 348, 250, 254,
+ 264, 240, 240, 260, 261, 258, 259, 16, 24, 246,
+ 275, 1, 365, 19, 21, 99, 174, 215, 367, 368,
+ 369, 373, 174, 204, 174, 213, 213, 16, 14, 83,
+ 34, 152, 499, 89, 111, 499, 501, 461, 23, 444,
+ 16, 14, 1, 17, 30, 463, 465, 477, 479, 487,
+ 488, 497, 177, 433, 151, 420, 101, 317, 1, 10,
+ 26, 318, 23, 274, 23, 24, 360, 14, 243, 273,
+ 28, 54, 370, 373, 16, 297, 288, 240, 9, 24,
+ 24, 25, 35, 59, 255, 256, 257, 342, 354, 355,
+ 174, 266, 267, 343, 262, 262, 320, 319, 23, 367,
+ 367, 23, 209, 214, 214, 211, 212, 207, 499, 452,
+ 126, 152, 83, 499, 53, 475, 445, 24, 64, 108,
+ 124, 152, 485, 486, 453, 25, 26, 466, 24, 9,
+ 434, 435, 167, 221, 319, 285, 319, 281, 55, 75,
+ 170, 298, 299, 295, 273, 170, 256, 16, 17, 164,
+ 14, 267, 74, 78, 104, 114, 115, 116, 117, 118,
+ 119, 120, 130, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 145, 147, 321, 322,
+ 324, 24, 205, 215, 215, 24, 24, 275, 454, 456,
+ 459, 478, 499, 126, 499, 81, 373, 497, 462, 164,
+ 64, 177, 9, 24, 23, 448, 449, 451, 464, 1,
+ 467, 469, 478, 497, 435, 131, 436, 231, 273, 14,
+ 170, 28, 323, 342, 193, 24, 299, 231, 240, 348,
+ 348, 265, 167, 170, 173, 177, 342, 342, 348, 167,
+ 164, 164, 342, 16, 348, 348, 16, 16, 9, 24,
+ 16, 1, 14, 216, 348, 23, 23, 23, 484, 477,
+ 484, 499, 16, 82, 476, 486, 10, 23, 465, 9,
+ 34, 474, 470, 155, 437, 243, 282, 193, 9, 14,
+ 24, 25, 16, 268, 269, 270, 323, 323, 167, 342,
+ 322, 361, 217, 14, 469, 484, 167, 167, 497, 23,
+ 450, 468, 499, 475, 86, 246, 273, 342, 296, 149,
+ 150, 271, 272, 367, 368, 369, 373, 375, 23, 270,
+ 24, 24, 24, 24, 24, 275, 455, 24, 451, 469,
+ 471, 497, 23, 273, 24, 272, 34, 34, 23, 448,
+ 474, 476, 103, 438, 319, 342, 342, 472, 16, 107,
+ 439, 480, 481, 482, 488, 16, 473, 482, 24, 177,
+ 440, 441, 484, 167, 9, 24, 441
};
#define yyerrok (yyerrstatus = 0)
@@ -2639,7 +2728,7 @@ do \
} \
else \
{ \
- yyerror (YY_("syntax error: cannot back up")); \
+ yyerror (sparp_arg, YY_("syntax error: cannot back up")); \
YYERROR; \
} \
while (YYID (0))
@@ -2680,7 +2769,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -2696,7 +2785,7 @@ while (YYID (0))
#ifdef YYLEX_PARAM
# define YYLEX yylex (&yylval, YYLEX_PARAM)
#else
-# define YYLEX yylex (&yylval)
+# define YYLEX yylex (&yylval, sparp_arg)
#endif
/* Enable debugging if requested. */
@@ -2719,7 +2808,7 @@ do { \
{ \
YYFPRINTF (stderr, "%s ", Title); \
yy_symbol_print (stderr, \
- Type, Value); \
+ Type, Value, sparp_arg); \
YYFPRINTF (stderr, "\n"); \
} \
} while (YYID (0))
@@ -2733,17 +2822,19 @@ do { \
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, sparp_t * sparp_arg)
#else
static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, sparp_arg)
FILE *yyoutput;
int yytype;
YYSTYPE const * const yyvaluep;
+ sparp_t * sparp_arg;
#endif
{
if (!yyvaluep)
return;
+ YYUSE (sparp_arg);
# ifdef YYPRINT
if (yytype < YYNTOKENS)
YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
@@ -2765,13 +2856,14 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, sparp_t * sparp_arg)
#else
static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
+yy_symbol_print (yyoutput, yytype, yyvaluep, sparp_arg)
FILE *yyoutput;
int yytype;
YYSTYPE const * const yyvaluep;
+ sparp_t * sparp_arg;
#endif
{
if (yytype < YYNTOKENS)
@@ -2779,7 +2871,7 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
else
YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+ yy_symbol_value_print (yyoutput, yytype, yyvaluep, sparp_arg);
YYFPRINTF (yyoutput, ")");
}
@@ -2819,12 +2911,13 @@ do { \
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, sparp_t * sparp_arg)
#else
static void
-yy_reduce_print (yyvsp, yyrule)
+yy_reduce_print (yyvsp, yyrule, sparp_arg)
YYSTYPE *yyvsp;
int yyrule;
+ sparp_t * sparp_arg;
#endif
{
int yynrhs = yyr2[yyrule];
@@ -2838,7 +2931,7 @@ yy_reduce_print (yyvsp, yyrule)
fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
- );
+ , sparp_arg);
fprintf (stderr, "\n");
}
}
@@ -2846,7 +2939,7 @@ yy_reduce_print (yyvsp, yyrule)
# define YY_REDUCE_PRINT(Rule) \
do { \
if (yydebug) \
- yy_reduce_print (yyvsp, Rule); \
+ yy_reduce_print (yyvsp, Rule, sparp_arg); \
} while (YYID (0))
/* Nonzero means print parse trace. It is left uninitialized so that
@@ -3097,16 +3190,18 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, sparp_t * sparp_arg)
#else
static void
-yydestruct (yymsg, yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep, sparp_arg)
const char *yymsg;
int yytype;
YYSTYPE *yyvaluep;
+ sparp_t * sparp_arg;
#endif
{
YYUSE (yyvaluep);
+ YYUSE (sparp_arg);
if (!yymsg)
yymsg = "Deleting";
@@ -3131,7 +3226,7 @@ int yyparse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
+int yyparse (sparp_t * sparp_arg);
#else
int yyparse ();
#endif
@@ -3160,11 +3255,11 @@ yyparse (YYPARSE_PARAM)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
int
-yyparse (void)
+yyparse (sparp_t * sparp_arg)
#else
int
-yyparse ()
-
+yyparse (sparp_arg)
+ sparp_t * sparp_arg;
#endif
#endif
{
@@ -3421,53 +3516,60 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 525 "./sparql_p.y"
- { sparp_arg->sparp_expr = (yyval.tree) = (yyvsp[(3) - (4)].tree); }
+#line 557 "./sparql_p.y"
+ { sparp_arg->sparp_expr = (yyval.tree) = (yyvsp[(4) - (5)].tree); }
break;
case 3:
-#line 526 "./sparql_p.y"
+#line 558 "./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 529 "./sparql_p.y"
+#line 561 "./sparql_p.y"
{
sparp_arg->sparp_expr = (yyval.tree) = spar_make_topmost_sparul_sql (sparp_arg,
- (SPART **)t_list (0) ); }
+ (SPART **)t_list (1, (yyvsp[(3) - (4)].tree)) ); }
break;
case 5:
-#line 532 "./sparql_p.y"
+#line 564 "./sparql_p.y"
{
- (yyval.tree) = spar_make_topmost_qm_sql (sparp_arg);
- sparp_arg->sparp_expr = (yyval.tree); }
+ sparp_arg->sparp_expr = (yyval.tree) = spar_make_topmost_sparul_sql (sparp_arg,
+ (SPART **)t_list (0) ); }
break;
case 6:
-#line 535 "./sparql_p.y"
- { sparyyerror ("(internal SPARQL processing error) SPARQL mark expected"); }
+#line 567 "./sparql_p.y"
+ {
+ (yyval.tree) = spar_make_topmost_qm_sql (sparp_arg);
+ sparp_arg->sparp_expr = (yyval.tree); }
break;
- case 12:
-#line 552 "./sparql_p.y"
- { ; }
+ case 7:
+#line 570 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "(internal SPARQL processing error) SPARQL mark expected"); }
break;
case 13:
-#line 553 "./sparql_p.y"
+#line 588 "./sparql_p.y"
{ ; }
break;
case 14:
-#line 557 "./sparql_p.y"
- { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_VIRTSPECIFIC, "DEFINE"); }
+#line 589 "./sparql_p.y"
+ { ; }
break;
case 15:
-#line 558 "./sparql_p.y"
+#line 593 "./sparql_p.y"
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_VIRTSPECIFIC, "DEFINE"); }
+ break;
+
+ case 16:
+#line 594 "./sparql_p.y"
{
dk_set_t vals = (yyvsp[(4) - (4)].backstack);
while (NULL != vals) {
@@ -3476,634 +3578,863 @@ yyreduce:
} }
break;
- case 16:
-#line 567 "./sparql_p.y"
- { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
- break;
-
case 17:
-#line 568 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
+#line 603 "./sparql_p.y"
+ { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 18:
-#line 572 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, QNAME, (yyvsp[(1) - (1)].box)); }
+#line 604 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
case 19:
-#line 573 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, Q_IRI_REF, (yyvsp[(1) - (1)].box)); }
+#line 608 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, (ptrlong)QNAME, (yyvsp[(1) - (1)].box)); }
break;
case 20:
-#line 574 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, SPARQL_STRING, (yyvsp[(1) - (1)].box)); }
+#line 609 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, (ptrlong)Q_IRI_REF, (yyvsp[(1) - (1)].box)); }
break;
case 21:
-#line 575 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, SPARQL_INTEGER, (yyvsp[(1) - (1)].box)); }
+#line 610 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, (ptrlong)SPARQL_STRING, (yyvsp[(1) - (1)].box)); }
break;
case 22:
-#line 576 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, SPAR_VARIABLE, (caddr_t)(yyvsp[(1) - (1)].tree)); }
+#line 611 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, (ptrlong)SPARQL_INTEGER, (yyvsp[(1) - (1)].box)); }
break;
case 23:
-#line 580 "./sparql_p.y"
- { ; }
+#line 612 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, (ptrlong)SPAR_VARIABLE, (caddr_t)(yyvsp[(1) - (1)].tree)); }
break;
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); }
+#line 616 "./sparql_p.y"
+ { ; }
break;
case 25:
-#line 585 "./sparql_p.y"
- { sparyyerror ("Missing <iri-string> after BASE keyword"); }
+#line 617 "./sparql_p.y"
+ {
+ if (NULL != sparp_env()->spare_base_uri)
+ sparyyerror (sparp_arg, "Only one base declaration is allowed");
+ sparp_env()->spare_base_uri = (yyvsp[(2) - (2)].box); }
break;
case 26:
-#line 589 "./sparql_p.y"
- { ; }
+#line 621 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Missing <iri-string> after BASE keyword"); }
break;
case 27:
-#line 590 "./sparql_p.y"
+#line 625 "./sparql_p.y"
{ ; }
break;
case 28:
-#line 594 "./sparql_p.y"
+#line 626 "./sparql_p.y"
+ { ; }
+ break;
+
+ case 29:
+#line 630 "./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");
+ sparyyerror (sparp_arg, "Prefixes 'sql:' and 'bif:' are reserved for SQL names");
t_set_push (&(sparp_env()->spare_namespace_prefixes), sparp_expand_q_iri_ref (sparp_arg, (yyvsp[(3) - (3)].box)));
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 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"); }
+#line 635 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Missing <namespace-iri-string> in PREFIX declaration"); }
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;
-
- 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 */); }
+#line 636 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Missing namespace prefix after PREFIX keyword"); }
break;
case 33:
-#line 621 "./sparql_p.y"
- { (yyval.token_type) = SELECT_L; }
- break;
-
- case 34:
-#line 622 "./sparql_p.y"
- { (yyval.token_type) = SELECT_L; }
+#line 641 "./sparql_p.y"
+ {
+ if (sparp_arg->sparp_macro_def_count)
+ sparyyerror (sparp_arg, "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; }
break;
case 35:
-#line 623 "./sparql_p.y"
- { (yyval.token_type) = DISTINCT_L; }
+#line 650 "./sparql_p.y"
+ { ; }
break;
case 36:
-#line 624 "./sparql_p.y"
- { (yyval.token_type) = COUNT_DISTINCT_L; }
+#line 651 "./sparql_p.y"
+ { ; }
break;
case 37:
-#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; }
+#line 657 "./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); }
break;
case 38:
-#line 629 "./sparql_p.y"
- { sparp_arg->sparp_rset_lexdepth_plus_1 = (yyvsp[(1) - (2)].token_type); (yyval.trees) = (yyvsp[(2) - (2)].trees); }
+#line 665 "./sparql_p.y"
+ {
+ sparp_defmacro_finalize (sparp_arg, (yyvsp[(4) - (4)].tree));
+ sparp_arg->sparp_macro_mode = 0;
+ spar_selid_pop (sparp_arg);
+ }
break;
case 39:
-#line 633 "./sparql_p.y"
- { (yyval.trees) = (SPART **) _STAR; }
+#line 673 "./sparql_p.y"
+ {
+ sparp_arg->sparp_current_macro->_.defmacro.paramnames = t_revlist_to_array ((yyvsp[(2) - (3)].backstack)); }
break;
case 40:
-#line 635 "./sparql_p.y"
- { (yyval.trees) = (SPART **) t_revlist_to_array ((yyvsp[(1) - (1)].backstack)); }
+#line 675 "./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; }
break;
case 41:
-#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)); }
+#line 680 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(7) - (7)].tree); }
break;
case 42:
-#line 642 "./sparql_p.y"
+#line 681 "./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); }
+ SPART *curr = sparp_arg->sparp_current_macro;
+ sparp_make_defmacro_paramnames_from_template (sparp_arg, curr); }
break;
case 43:
-#line 646 "./sparql_p.y"
+#line 684 "./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); }
+ 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); }
break;
case 44:
-#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); }
+#line 690 "./sparql_p.y"
+ { (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
break;
case 45:
-#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 */); }
+#line 691 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "List of arguments or template is expected after macro name"); }
break;
case 46:
-#line 676 "./sparql_p.y"
- { (yyval.trees) = (SPART **) _STAR; }
+#line 696 "./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; }
break;
case 47:
-#line 677 "./sparql_p.y"
- { (yyval.trees) = (SPART **) t_list_to_array ((yyvsp[(1) - (1)].backstack)); }
+#line 701 "./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; }
break;
case 48:
-#line 681 "./sparql_p.y"
+#line 706 "./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); }
+ 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; }
break;
case 49:
-#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) ); }
+#line 714 "./sparql_p.y"
+ { (yyval.backstack) = NULL; }
break;
case 50:
-#line 692 "./sparql_p.y"
- { }
+#line 715 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(3) - (4)].backstack); }
break;
case 51:
-#line 693 "./sparql_p.y"
- { }
+#line 716 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(3) - (4)].backstack); }
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;
-
- case 53:
-#line 706 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_FROM; }
- break;
-
- case 54:
-#line 707 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NAMED; }
+#line 720 "./sparql_p.y"
+ { (yyval.backstack) = NULL; }
break;
case 55:
-#line 708 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NOT_FROM; }
+#line 726 "./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)); }
break;
case 56:
-#line 709 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NOT_NAMED; }
+#line 731 "./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)); }
break;
case 57:
-#line 710 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NOT_FROM; }
+#line 738 "./sparql_p.y"
+ { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].box)); }
break;
case 58:
-#line 711 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NOT_NAMED; }
+#line 739 "./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)); }
break;
case 59:
-#line 715 "./sparql_p.y"
- { (yyval.trees) = NULL; }
- break;
-
- case 60:
-#line 716 "./sparql_p.y"
- { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_OPTION, "OPTION () sponge configuration"); }
+#line 746 "./sparql_p.y"
+ { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
break;
case 61:
-#line 717 "./sparql_p.y"
- { (yyval.trees) = (yyvsp[(4) - (4)].trees); }
+#line 751 "./sparql_p.y"
+ { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
break;
case 62:
-#line 721 "./sparql_p.y"
- { (yyval.trees) = (SPART **)t_list (0); }
- break;
-
- case 63:
-#line 722 "./sparql_p.y"
- { (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(1) - (2)].backstack)); }
+#line 752 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_type); }
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;
-
- 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)); }
+#line 758 "./sparql_p.y"
+ { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
break;
case 66:
-#line 733 "./sparql_p.y"
- { sparp_arg->sparp_in_precode_expn = 1; }
+#line 760 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 67:
-#line 735 "./sparql_p.y"
- { sparp_arg->sparp_in_precode_expn = 0; (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+#line 761 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(2) - (2)].tree); spar_change_sign (&((yyvsp[(2) - (2)].tree)->_.lit.val)); }
break;
case 68:
-#line 739 "./sparql_p.y"
- {
- sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
- spar_gp_init (sparp_arg, WHERE_L); }
- break;
-
- case 69:
-#line 742 "./sparql_p.y"
- {;}
- break;
-
- 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"
- {;}
+#line 762 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_box_dv_uname_string ("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"); }
break;
case 72:
-#line 750 "./sparql_p.y"
+#line 770 "./sparql_p.y"
{
- sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
- spar_gp_init (sparp_arg, WHERE_L); }
+ SPART *curr = sparp_arg->sparp_current_macro;
+ curr->_.defmacro.subtype = 0;
+ spar_gp_init (sparp_arg, DEFMACRO_L); }
break;
case 73:
-#line 753 "./sparql_p.y"
- {;}
- break;
-
- case 74:
-#line 757 "./sparql_p.y"
- {;}
+#line 774 "./sparql_p.y"
+ { (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
break;
case 75:
-#line 761 "./sparql_p.y"
- { (yyval.tree) = NULL; }
+#line 776 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Graph group pattern or expression is expected as the body of the macro"); }
break;
case 76:
-#line 762 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+#line 782 "./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;
case 77:
-#line 766 "./sparql_p.y"
+#line 787 "./sparql_p.y"
{
- if (NULL != sparp_arg->sparp_env->spare_bindings_vars)
- sparyyerror ("Only one BINDINGS clause per query is allowed");
- spar_selid_push (sparp_arg); }
+ 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 78:
-#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)); }
+#line 798 "./sparql_p.y"
+ { (yyval.token_type) = SELECT_L; }
break;
case 79:
-#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)); }
+#line 799 "./sparql_p.y"
+ { (yyval.token_type) = SELECT_L; }
break;
case 80:
-#line 782 "./sparql_p.y"
- { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box))); }
+#line 800 "./sparql_p.y"
+ { (yyval.token_type) = DISTINCT_L; }
break;
case 81:
-#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))); }
+#line 801 "./sparql_p.y"
+ { (yyval.token_type) = COUNT_DISTINCT_L; }
break;
case 82:
-#line 787 "./sparql_p.y"
- { ; }
+#line 805 "./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 83:
-#line 788 "./sparql_p.y"
- { ; }
+#line 806 "./sparql_p.y"
+ { sparp_arg->sparp_rset_lexdepth_plus_1 = (yyvsp[(1) - (2)].token_type); (yyval.trees) = (yyvsp[(2) - (2)].trees); }
break;
case 84:
-#line 789 "./sparql_p.y"
- { sparyyerror ("Global variable can not be used in the header of BINDINGS"); }
+#line 810 "./sparql_p.y"
+ { (yyval.trees) = (SPART **) _STAR; }
break;
case 85:
-#line 793 "./sparql_p.y"
- { (yyval.backstack) = NULL; }
+#line 812 "./sparql_p.y"
+ { (yyval.trees) = (SPART **) t_revlist_to_array ((yyvsp[(1) - (1)].backstack)); }
break;
case 86:
-#line 794 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
+#line 813 "./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 87:
-#line 798 "./sparql_p.y"
- { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)); }
+#line 819 "./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 799 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].trees)); }
+#line 823 "./sparql_p.y"
+ {
+ const char *fmt_mode_name;
+ const char *formatter, *agg_formatter, *agg_mdata;
+ 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, CONSTRUCT_L, NULL,
+ retselid, wm );
+ fmt_mode_name = (yyval.tree)->_.req_top.formatmode_name;
+ ssg_find_formatter_by_name_and_subtype (fmt_mode_name, CONSTRUCT_L, &formatter, &agg_formatter, &agg_mdata);
+ spar_compose_retvals_of_construct (sparp_arg, (yyval.tree), (yyvsp[(3) - (6)].tree), formatter, agg_formatter, agg_mdata); }
break;
case 89:
-#line 803 "./sparql_p.y"
+#line 839 "./sparql_p.y"
{
- (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"); }
+ 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 810 "./sparql_p.y"
- {(yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
+#line 843 "./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, DESCRIBE_L, (yyvsp[(3) - (6)].trees),
+ retselid, wm );
+ if (((SPART **)_STAR == (yyvsp[(3) - (6)].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 811 "./sparql_p.y"
- {(yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
+#line 855 "./sparql_p.y"
+ { (yyval.trees) = (SPART **) _STAR; }
+ break;
+
+ case 92:
+#line 856 "./sparql_p.y"
+ { (yyval.trees) = (SPART **) t_list_to_array ((yyvsp[(1) - (1)].backstack)); }
+ break;
+
+ case 93:
+#line 860 "./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 864 "./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), NULL ); }
+ break;
+
+ case 95:
+#line 871 "./sparql_p.y"
+ { }
+ break;
+
+ case 96:
+#line 872 "./sparql_p.y"
+ { }
break;
case 97:
-#line 820 "./sparql_p.y"
- {(yyval.tree) = NULL; }
+#line 880 "./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 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)); }
+#line 885 "./sparql_p.y"
+ {
+ if (NULL != sparp_arg->sparp_env->spare_src.ssrc_graph_set_by_with)
+ sparyyerror (sparp_arg, "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 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)); }
+#line 889 "./sparql_p.y"
+ {
+ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11_DRAFT, "USING keyword");
+ (yyval.token_type) = (yyvsp[(1) - (1)].token_type); }
break;
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)); }
+#line 895 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_FROM; }
break;
case 101:
-#line 831 "./sparql_p.y"
- { (yyval.backstack) = NULL; }
+#line 896 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NAMED; }
break;
case 102:
-#line 832 "./sparql_p.y"
+#line 897 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NOT_FROM; }
+ break;
+
+ case 103:
+#line 898 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NOT_NAMED; }
+ break;
+
+ case 104:
+#line 902 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_FROM; }
+ break;
+
+ case 105:
+#line 903 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NAMED; }
+ break;
+
+ case 106:
+#line 904 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NOT_FROM; }
+ break;
+
+ case 107:
+#line 905 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NOT_NAMED; }
+ break;
+
+ case 108:
+#line 909 "./sparql_p.y"
+ { (yyval.trees) = NULL; }
+ break;
+
+ case 109:
+#line 910 "./sparql_p.y"
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_OPTION, "OPTION () sponge configuration"); }
+ break;
+
+ case 110:
+#line 911 "./sparql_p.y"
+ { (yyval.trees) = (yyvsp[(4) - (4)].trees); }
+ break;
+
+ case 111:
+#line 915 "./sparql_p.y"
+ { (yyval.trees) = (SPART **)t_list (0); }
+ break;
+
+ case 112:
+#line 916 "./sparql_p.y"
+ { (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(1) - (2)].backstack)); }
+ break;
+
+ case 113:
+#line 920 "./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 922 "./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 927 "./sparql_p.y"
+ { sparp_arg->sparp_in_precode_expn = 1; }
+ break;
+
+ case 116:
+#line 929 "./sparql_p.y"
+ { sparp_arg->sparp_in_precode_expn = 0; (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+ break;
+
+ case 117:
+#line 933 "./sparql_p.y"
+ {
+ sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
+ spar_gp_init (sparp_arg, WHERE_L); }
+ break;
+
+ case 118:
+#line 936 "./sparql_p.y"
+ {;}
+ break;
+
+ case 119:
+#line 940 "./sparql_p.y"
+ {
+ sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
+ spar_gp_init (sparp_arg, WHERE_L); }
+ break;
+
+ case 120:
+#line 943 "./sparql_p.y"
+ {;}
+ break;
+
+ case 121:
+#line 944 "./sparql_p.y"
+ {
+ sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
+ spar_gp_init (sparp_arg, WHERE_L); }
+ break;
+
+ case 122:
+#line 947 "./sparql_p.y"
+ {;}
+ break;
+
+ case 123:
+#line 952 "./sparql_p.y"
+ { (yyval.tree) = spar_make_wm (sparp_arg, NULL, (yyvsp[(1) - (4)].trees), (yyvsp[(2) - (4)].tree), (yyvsp[(3) - (4)].trees), NULL, (SPART *)t_box_num (0), (yyvsp[(4) - (4)].tree)); }
+ break;
+
+ case 124:
+#line 953 "./sparql_p.y"
+ { (yyval.tree) = spar_make_wm (sparp_arg, NULL, (yyvsp[(1) - (6)].trees), (yyvsp[(2) - (6)].tree), (yyvsp[(3) - (6)].trees), (yyvsp[(4) - (6)].tree), (yyvsp[(5) - (6)].tree), (yyvsp[(6) - (6)].tree)); }
+ break;
+
+ case 125:
+#line 954 "./sparql_p.y"
+ { (yyval.tree) = spar_make_wm (sparp_arg, NULL, (yyvsp[(1) - (6)].trees), (yyvsp[(2) - (6)].tree), (yyvsp[(3) - (6)].trees), (yyvsp[(5) - (6)].tree), (yyvsp[(4) - (6)].tree), (yyvsp[(6) - (6)].tree)); }
+ break;
+
+ case 126:
+#line 958 "./sparql_p.y"
+ { (yyval.trees) = NULL; }
+ break;
+
+ case 127:
+#line 959 "./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 103:
-#line 835 "./sparql_p.y"
+ case 128:
+#line 962 "./sparql_p.y"
{
- spar_selid_pop (sparp_arg); (yyval.backstack) = (yyvsp[(4) - (4)].backstack);
+ spar_selid_pop (sparp_arg); (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(4) - (4)].backstack));
sparp_arg->sparp_allow_aggregates_in_expn &= ~1; }
break;
- case 104:
-#line 841 "./sparql_p.y"
+ case 129:
+#line 968 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 105:
-#line 842 "./sparql_p.y"
+ case 130:
+#line 969 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 106:
-#line 847 "./sparql_p.y"
+ case 131:
+#line 974 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
- case 107:
-#line 848 "./sparql_p.y"
+ case 132:
+#line 975 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
- case 111:
-#line 855 "./sparql_p.y"
+ case 136:
+#line 982 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 112:
-#line 856 "./sparql_p.y"
+ case 137:
+#line 983 "./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 113:
-#line 859 "./sparql_p.y"
+ case 138:
+#line 986 "./sparql_p.y"
{
spar_selid_pop (sparp_arg); (yyval.tree) = (yyvsp[(3) - (3)].tree);
sparp_arg->sparp_allow_aggregates_in_expn &= ~1; }
break;
- case 114:
-#line 865 "./sparql_p.y"
- { (yyval.backstack) = NULL; }
+ case 139:
+#line 992 "./sparql_p.y"
+ { (yyval.trees) = NULL; }
break;
- case 115:
-#line 866 "./sparql_p.y"
+ case 140:
+#line 993 "./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 116:
-#line 869 "./sparql_p.y"
+ case 141:
+#line 996 "./sparql_p.y"
{
- spar_selid_pop (sparp_arg); (yyval.backstack) = (yyvsp[(4) - (4)].backstack);
+ spar_selid_pop (sparp_arg); (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(4) - (4)].backstack));
sparp_arg->sparp_allow_aggregates_in_expn &= ~1; }
break;
- case 117:
-#line 875 "./sparql_p.y"
+ case 142:
+#line 1002 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 118:
-#line 876 "./sparql_p.y"
+ case 143:
+#line 1003 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 119:
-#line 881 "./sparql_p.y"
+ case 144:
+#line 1008 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)(yyvsp[(1) - (4)].token_type), (yyvsp[(3) - (4)].tree)); }
break;
- case 120:
-#line 882 "./sparql_p.y"
+ case 145:
+#line 1009 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)(yyvsp[(1) - (4)].token_type), (yyvsp[(3) - (4)].tree)); }
break;
- case 121:
-#line 883 "./sparql_p.y"
+ case 146:
+#line 1010 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)(yyvsp[(1) - (2)].token_type), (yyvsp[(2) - (2)].box)); }
break;
- case 122:
-#line 884 "./sparql_p.y"
+ case 147:
+#line 1011 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)ASC_L, (yyvsp[(1) - (1)].tree)); }
break;
- case 123:
-#line 885 "./sparql_p.y"
+ case 148:
+#line 1012 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)ASC_L, (yyvsp[(1) - (1)].tree)); }
break;
- case 124:
-#line 886 "./sparql_p.y"
+ case 149:
+#line 1013 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)ASC_L, (yyvsp[(1) - (1)].tree)); }
break;
- case 125:
-#line 890 "./sparql_p.y"
+ case 150:
+#line 1017 "./sparql_p.y"
{ (yyval.token_type) = ASC_L; }
break;
- case 126:
-#line 891 "./sparql_p.y"
+ case 151:
+#line 1018 "./sparql_p.y"
{ (yyval.token_type) = ASC_L; }
break;
- case 127:
-#line 892 "./sparql_p.y"
+ case 152:
+#line 1019 "./sparql_p.y"
{ (yyval.token_type) = DESC_L; }
break;
- case 128:
-#line 896 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_box_num (SPARP_MAXLIMIT); }
+ case 153:
+#line 1023 "./sparql_p.y"
+ { (yyval.tree) = NULL; }
break;
- case 130:
-#line 901 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+ case 155:
+#line 1028 "./sparql_p.y"
+ { (yyval.tree) = ((NULL != (yyvsp[(2) - (2)].tree)) ? (yyvsp[(2) - (2)].tree) : (SPART *)(t_box_num_nonull (0))); }
break;
- case 131:
-#line 905 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_box_num (0); }
+ case 156:
+#line 1032 "./sparql_p.y"
+ { (yyval.tree) = NULL; }
break;
- case 133:
-#line 910 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+ case 158:
+#line 1037 "./sparql_p.y"
+ { (yyval.tree) = ((NULL != (yyvsp[(2) - (2)].tree)) ? (yyvsp[(2) - (2)].tree) : ((SPART *)t_box_num_nonull (0))); }
+ break;
+
+ case 159:
+#line 1041 "./sparql_p.y"
+ { (yyval.tree) = NULL; }
+ break;
+
+ case 161:
+#line 1046 "./sparql_p.y"
+ {
+ if (NULL != sparp_arg->sparp_env->spare_bindings_vars)
+ sparyyerror (sparp_arg, "Only one BINDINGS clause per query is allowed");
+ if (sparp_arg->sparp_macro_mode)
+ sparyyerror (sparp_arg, "BINDINGS can not be used inside macro");
+ spar_selid_push (sparp_arg); }
+ break;
+
+ case 162:
+#line 1052 "./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 134:
-#line 914 "./sparql_p.y"
+ case 163:
+#line 1055 "./sparql_p.y"
+ {
+ sparp_arg->sparp_env->spare_bindings_rowset = (SPART ***)t_revlist_to_array ((yyvsp[(6) - (7)].backstack));
+ (yyval.tree) = spar_make_bindings_inv_with_fake_equivs (sparp_arg,
+ sparp_arg->sparp_env->spare_bindings_vars, sparp_arg->sparp_env->spare_bindings_rowset); }
+ break;
+
+ case 164:
+#line 1062 "./sparql_p.y"
+ { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box))); }
+ break;
+
+ case 165:
+#line 1063 "./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 166:
+#line 1067 "./sparql_p.y"
+ { ; }
+ break;
+
+ case 167:
+#line 1068 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Global variable can not be used in the header of BINDINGS"); }
+ break;
+
+ case 168:
+#line 1072 "./sparql_p.y"
+ { (yyval.backstack) = NULL; }
+ break;
+
+ case 170:
+#line 1077 "./sparql_p.y"
+ { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)); }
+ break;
+
+ case 171:
+#line 1078 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].trees)); }
+ break;
+
+ case 172:
+#line 1082 "./sparql_p.y"
+ {
+ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(2) - (3)].backstack));
+ if (BOX_ELEMENTS ((yyval.trees)) != BOX_ELEMENTS (sparp_arg->sparp_env->spare_bindings_vars))
+ sparyyerror (sparp_arg, "Number of values in a binding does not match number of variables to bind"); }
+ break;
+
+ case 173:
+#line 1089 "./sparql_p.y"
+ {(yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
+ break;
+
+ case 174:
+#line 1090 "./sparql_p.y"
+ {(yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
+ break;
+
+ case 180:
+#line 1099 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "UNBOUND in BINDINGS is deprecated, use UNDEF instead"); (yyval.tree) = NULL; }
+ break;
+
+ case 181:
+#line 1100 "./sparql_p.y"
+ {(yyval.tree) = NULL; }
+ break;
+
+ case 182:
+#line 1104 "./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 135:
-#line 917 "./sparql_p.y"
+ case 183:
+#line 1107 "./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. */
@@ -4111,14 +4442,14 @@ yyreduce:
if (SERVICE_L == (yyval.token_type))
spar_gp_init (sparp_arg, SELECT_L);
spar_env_push (sparp_arg);
- spar_selid_push (sparp_arg);
+ 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;
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
break;
- case 136:
-#line 930 "./sparql_p.y"
+ case 184:
+#line 1120 "./sparql_p.y"
{
SPART *subselect_top;
SPART *where_gp;
@@ -4143,175 +4474,199 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
break;
- case 137:
-#line 955 "./sparql_p.y"
+ case 185:
+#line 1145 "./sparql_p.y"
{ }
break;
- case 138:
-#line 956 "./sparql_p.y"
+ case 186:
+#line 1146 "./sparql_p.y"
{ }
break;
- case 139:
-#line 957 "./sparql_p.y"
+ case 187:
+#line 1147 "./sparql_p.y"
{ }
break;
- case 140:
-#line 961 "./sparql_p.y"
+ case 188:
+#line 1148 "./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 (sparp_arg, "Ill formed triple pattern or macro pattern variable outside a macro body"); }
+ break;
+
+ case 189:
+#line 1165 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 141:
-#line 962 "./sparql_p.y"
+ case 190:
+#line 1166 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 142:
-#line 963 "./sparql_p.y"
+ case 191:
+#line 1167 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 143:
-#line 964 "./sparql_p.y"
+ case 192:
+#line 1168 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 144:
-#line 965 "./sparql_p.y"
+ case 193:
+#line 1169 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 145:
-#line 966 "./sparql_p.y"
+ case 194:
+#line 1170 "./sparql_p.y"
{ spar_gp_add_filter (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 146:
-#line 970 "./sparql_p.y"
+ case 195:
+#line 1174 "./sparql_p.y"
{ spar_gp_init (sparp_arg, OPTIONAL_L); }
break;
- case 147:
-#line 970 "./sparql_p.y"
+ case 196:
+#line 1174 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(4) - (4)].tree); }
break;
- case 148:
-#line 971 "./sparql_p.y"
- { sparyyerror ("Missing '{' after OPTIONAL keyword"); }
+ case 197:
+#line 1175 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Missing '{' after OPTIONAL keyword"); }
break;
- case 149:
-#line 975 "./sparql_p.y"
+ case 198:
+#line 1179 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_QUAD_MAP, "QUAD MAP { ... } group pattern"); }
break;
- case 150:
-#line 976 "./sparql_p.y"
+ case 199:
+#line 1180 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_qms), (yyvsp[(4) - (4)].tree)); }
break;
- case 151:
-#line 977 "./sparql_p.y"
+ case 200:
+#line 1181 "./sparql_p.y"
{
spar_gp_init (sparp_arg, 0); }
break;
- case 152:
-#line 979 "./sparql_p.y"
+ case 201:
+#line 1183 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_qms)); (yyval.tree) = (yyvsp[(8) - (8)].tree); }
break;
- case 153:
-#line 984 "./sparql_p.y"
+ case 202:
+#line 1188 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_graphs), (yyvsp[(2) - (2)].tree)); }
break;
- case 154:
-#line 985 "./sparql_p.y"
+ case 203:
+#line 1189 "./sparql_p.y"
{
spar_gp_init (sparp_arg, 0);
spar_gp_add_filters_for_named_graph (sparp_arg); }
break;
- case 155:
-#line 988 "./sparql_p.y"
+ case 204:
+#line 1192 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_graphs)); (yyval.tree) = (yyvsp[(6) - (6)].tree); }
break;
- case 156:
-#line 992 "./sparql_p.y"
+ case 205:
+#line 1196 "./sparql_p.y"
{ spar_gp_init (sparp_arg, 0); }
break;
- case 157:
-#line 992 "./sparql_p.y"
+ case 206:
+#line 1196 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
- case 158:
-#line 993 "./sparql_p.y"
+ case 207:
+#line 1197 "./sparql_p.y"
{
- sparp_env()->spare_good_graph_varnames = sparp_env()->spare_good_graph_bmk;
- spar_gp_init (sparp_arg, UNION_L);
- spar_gp_add_member (sparp_arg, (yyvsp[(1) - (3)].tree));
+ sparp_env()->spare_good_graph_varnames = sparp_env()->spare_good_graph_bmk;
+ if (UNION_L != (yyvsp[(1) - (3)].tree)->_.gp.subtype) {
+ spar_gp_init (sparp_arg, UNION_L);
+ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (3)].tree)); }
spar_gp_init (sparp_arg, 0); }
break;
- case 159:
-#line 998 "./sparql_p.y"
+ case 208:
+#line 1203 "./sparql_p.y"
{
- spar_gp_add_member (sparp_arg, (yyvsp[(5) - (5)].tree));
- (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
+ if (UNION_L != (yyvsp[(1) - (5)].tree)->_.gp.subtype) {
+ spar_gp_add_member (sparp_arg, (yyvsp[(5) - (5)].tree));
+ (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
+ else {
+ (yyval.tree)->_.gp.members = (SPART **)t_list_concat_tail ((caddr_t)((yyval.tree)->_.gp.members), 1, (yyvsp[(5) - (5)].tree));
+ (yyval.tree) = (yyvsp[(1) - (5)].tree); }
+ }
break;
- case 160:
-#line 1004 "./sparql_p.y"
+ case 209:
+#line 1214 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(3) - (4)].tree); }
break;
- case 161:
-#line 1005 "./sparql_p.y"
+ case 210:
+#line 1215 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 162:
-#line 1006 "./sparql_p.y"
+ case 211:
+#line 1216 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 163:
-#line 1007 "./sparql_p.y"
- { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
+ case 212:
+#line 1217 "./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 164:
-#line 1012 "./sparql_p.y"
- { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
+ case 213:
+#line 1222 "./sparql_p.y"
+ { /*... | 'MINUS' 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 165:
-#line 1018 "./sparql_p.y"
+ case 214:
+#line 1228 "./sparql_p.y"
{ (yyval.token_type) = 1; }
break;
- case 166:
-#line 1019 "./sparql_p.y"
+ case 215:
+#line 1229 "./sparql_p.y"
{ (yyval.token_type) = 0; }
break;
- case 167:
-#line 1023 "./sparql_p.y"
+ case 216:
+#line 1233 "./sparql_p.y"
{
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "SPARQL 1.1 FILTER EXISTS / FILTER NOT EXISTS test");
+ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11_DRAFT, "SPARQL 1.1 FILTER EXISTS / FILTER NOT EXISTS test");
spar_gp_init (sparp_arg, SELECT_L);
spar_env_push (sparp_arg);
spar_selid_push (sparp_arg);
@@ -4319,54 +4674,68 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn <<= 1; }
break;
- case 168:
-#line 1032 "./sparql_p.y"
+ case 217:
+#line 1242 "./sparql_p.y"
{
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) );
+ where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0), NULL );
spar_env_pop (sparp_arg);
(yyval.tree) = spar_gp_finalize_with_subquery (sparp_arg, (yyvsp[(4) - (4)].trees), subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
break;
- case 169:
-#line 1044 "./sparql_p.y"
+ case 218:
+#line 1254 "./sparql_p.y"
{
+ caddr_t sinv_storage_uri;
sparp_arg->sparp_query_uses_sinvs++;
- (yyval.token_type) = sparp_arg->sparp_permitted_syntax;
- sparp_arg->sparp_permitted_syntax = SSG_SD_GLOBALS; /*!!! TBD config */
+ sinv_storage_uri = uname_virtrdf_ns_uri_DefaultServiceStorage; /*!!! TBD config */
+ /* if config is added above then tweak the check in sparp_gp_trav_add_graph_perm_read_filters and in SPAR_REQ_TOP case of ssg_sdprint_tree() */
+ (yyval.boxes) = t_list (5, t_box_num(sparp_arg->sparp_permitted_syntax), sparp_arg->sparp_env->spare_storage_name, sparp_arg->sparp_storage, (ptrlong)(sparp_arg->sparp_storage_is_set), sinv_storage_uri);
+ sparp_arg->sparp_inner_permitted_syntax = -1;
+ sparp_arg->sparp_env->spare_storage_name = sinv_storage_uri;
+ sparp_arg->sparp_storage = sparp_find_storage_by_name (sinv_storage_uri);
+ sparp_arg->sparp_storage_is_set = 1;
}
break;
- case 170:
-#line 1049 "./sparql_p.y"
+ case 219:
+#line 1265 "./sparql_p.y"
{
(yyval.box) = t_alloc (sizeof (sparp_sources_t));
+ if (-1 == sparp_arg->sparp_inner_permitted_syntax)
+ sparp_arg->sparp_permitted_syntax = SSG_SD_GLOBALS | sparp_find_language_dialect_by_service (sparp_arg, (SPART *)(yyvsp[(2) - (4)].box));
+ else
+ sparp_arg->sparp_permitted_syntax = SSG_SD_GLOBALS | sparp_arg->sparp_inner_permitted_syntax;
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 171:
-#line 1053 "./sparql_p.y"
+ case 220:
+#line 1273 "./sparql_p.y"
{
+ caddr_t sinv_storage_uri = (yyvsp[(3) - (7)].boxes)[4];
SPART **sources;
- caddr_t sinv_storage_uri = uname_virtrdf_ns_uri_DefaultServiceStorage /*!!! TBD config */;
SPART *sinv;
- if ((NULL == sparp_arg->sparp_env->spare_default_graphs) && (NULL == sparp_arg->sparp_env->spare_named_graphs))
+ if ((NULL == sparp_arg->sparp_env->spare_src.ssrc_default_graphs) && (NULL == sparp_arg->sparp_env->spare_src.ssrc_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);
+ sources = spar_make_sources_like_top (sparp_arg, SELECT_L);
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 172:
-#line 1063 "./sparql_p.y"
+ case 221:
+#line 1284 "./sparql_p.y"
{
- sparp_arg->sparp_permitted_syntax = (yyvsp[(3) - (9)].token_type);
+ sparp_arg->sparp_permitted_syntax = unbox((yyvsp[(3) - (9)].boxes)[0]);
+ sparp_arg->sparp_env->spare_storage_name = (yyvsp[(3) - (9)].boxes)[1];
+ sparp_arg->sparp_storage = (quad_storage_t *)((yyvsp[(3) - (9)].boxes)[2]);
+ sparp_arg->sparp_storage_is_set = (ptrlong)((yyvsp[(3) - (9)].boxes)[3]);
(yyvsp[(9) - (9)].tree)->_.gp.options = (SPART **)t_list_concat_tail (
(caddr_t)((yyvsp[(9) - (9)].tree)->_.gp.options), 2,
SPAR_SERVICE_INV, t_set_pop (&(sparp_env()->spare_context_sinvs)) );
@@ -4374,256 +4743,308 @@ yyreduce:
(yyval.tree) = (yyvsp[(9) - (9)].tree); }
break;
- case 173:
-#line 1072 "./sparql_p.y"
+ case 222:
+#line 1296 "./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 174:
-#line 1073 "./sparql_p.y"
+ case 223:
+#line 1297 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
- case 175:
-#line 1077 "./sparql_p.y"
+ case 224:
+#line 1301 "./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 176:
-#line 1078 "./sparql_p.y"
+ case 225:
+#line 1302 "./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 177:
-#line 1082 "./sparql_p.y"
+ case 226:
+#line 1306 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (yyvsp[(1) - (2)].box), (yyvsp[(2) - (2)].backstack)); }
break;
- case 178:
-#line 1083 "./sparql_p.y"
+ case 227:
+#line 1307 "./sparql_p.y"
{
caddr_t defname = (yyvsp[(2) - (3)].box);
dk_set_t defvals = (yyvsp[(3) - (3)].backstack);
if (!strcmp (defname, "lang:dialect"))
{
if ((NULL == defvals) || (NULL != defvals->next) || (SPARQL_INTEGER != ((ptrlong *)(defvals->data))[0]))
- sparyyerror ("define lang:dialect needs an integer");
- sparp_arg->sparp_permitted_syntax = unbox (((caddr_t *)(defvals->data))[1]) | SSG_SD_GLOBALS;
+ sparyyerror (sparp_arg, "define lang:dialect needs an integer");
+ sparp_arg->sparp_inner_permitted_syntax = unbox (((caddr_t *)(defvals->data))[1]) | SSG_SD_GLOBALS;
}
(yyval.trees) = (SPART **)t_list (2, (SPART *)((ptrlong)DEFINE_L), t_list (2, defname, t_revlist_to_array(defvals))); }
break;
- case 179:
-#line 1093 "./sparql_p.y"
+ case 228:
+#line 1317 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (SPART *)((ptrlong)IN_L), (yyvsp[(2) - (2)].backstack)); }
break;
- case 180:
-#line 1094 "./sparql_p.y"
+ case 229:
+#line 1318 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (SPART *)((ptrlong)IN_L), (SPART *)((ptrlong)_STAR)); }
break;
- case 181:
-#line 1098 "./sparql_p.y"
+ case 230:
+#line 1322 "./sparql_p.y"
{ spar_gp_init (sparp_arg, CONSTRUCT_L); }
break;
- case 182:
-#line 1099 "./sparql_p.y"
- { (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
+ case 231:
+#line 1323 "./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 183:
-#line 1103 "./sparql_p.y"
+ case 232:
+#line 1342 "./sparql_p.y"
{ }
break;
- case 184:
-#line 1104 "./sparql_p.y"
+ case 233:
+#line 1343 "./sparql_p.y"
{ }
break;
- case 185:
-#line 1105 "./sparql_p.y"
+ case 234:
+#line 1344 "./sparql_p.y"
{ }
break;
- case 186:
-#line 1109 "./sparql_p.y"
+ case 235:
+#line 1345 "./sparql_p.y"
{ }
break;
- case 187:
-#line 1110 "./sparql_p.y"
+ case 236:
+#line 1349 "./sparql_p.y"
{ }
break;
- case 188:
-#line 1114 "./sparql_p.y"
+ case 237:
+#line 1350 "./sparql_p.y"
{ }
break;
- case 189:
-#line 1115 "./sparql_p.y"
+ case 238:
+#line 1351 "./sparql_p.y"
{ }
break;
- case 190:
-#line 1119 "./sparql_p.y"
+ case 239:
+#line 1355 "./sparql_p.y"
{ }
break;
- case 191:
-#line 1120 "./sparql_p.y"
+ case 240:
+#line 1356 "./sparql_p.y"
{ }
break;
- case 192:
-#line 1124 "./sparql_p.y"
+ case 241:
+#line 1357 "./sparql_p.y"
+ { }
+ break;
+
+ case 242:
+#line 1361 "./sparql_p.y"
+ { }
+ break;
+
+ case 243:
+#line 1362 "./sparql_p.y"
+ { }
+ break;
+
+ case 244:
+#line 1366 "./sparql_p.y"
+ { }
+ break;
+
+ case 245:
+#line 1367 "./sparql_p.y"
+ { }
+ break;
+
+ case 246:
+#line 1371 "./sparql_p.y"
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11_DRAFT, "SPARQL 1.1 quad constructor template"); }
+ break;
+
+ case 247:
+#line 1372 "./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 1375 "./sparql_p.y"
+ { t_set_pop (&(sparp_env()->spare_context_graphs)); }
+ break;
+
+ case 249:
+#line 1379 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_subjects), (yyvsp[(1) - (1)].tree)); }
break;
- case 193:
-#line 1125 "./sparql_p.y"
+ case 250:
+#line 1380 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_subjects)); (yyval.nothing) = (yyvsp[(3) - (3)].nothing); }
break;
- case 194:
-#line 1126 "./sparql_p.y"
+ case 251:
+#line 1381 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_subjects), (yyvsp[(1) - (1)].tree)); }
break;
- case 195:
-#line 1127 "./sparql_p.y"
+ case 252:
+#line 1382 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_subjects)); }
break;
- case 196:
-#line 1131 "./sparql_p.y"
- { }
+ case 253:
+#line 1383 "./sparql_p.y"
+ { spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 197:
-#line 1132 "./sparql_p.y"
+ case 254:
+#line 1387 "./sparql_p.y"
{ }
break;
- case 198:
-#line 1133 "./sparql_p.y"
+ case 255:
+#line 1388 "./sparql_p.y"
{ }
break;
- case 199:
-#line 1134 "./sparql_p.y"
- { sparyyerror ("Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }
- break;
-
- case 200:
-#line 1138 "./sparql_p.y"
+ case 256:
+#line 1394 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_predicates), (yyvsp[(1) - (1)].tree)); }
break;
- case 201:
-#line 1139 "./sparql_p.y"
+ case 257:
+#line 1395 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_predicates)); }
break;
- case 202:
-#line 1141 "./sparql_p.y"
+ case 258:
+#line 1397 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_predicates), (yyvsp[(3) - (3)].tree)); }
break;
- case 203:
-#line 1142 "./sparql_p.y"
+ case 259:
+#line 1398 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_predicates)); }
break;
- case 204:
-#line 1143 "./sparql_p.y"
- { sparyyerror ("Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }
+ case 260:
+#line 1399 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }
break;
- case 205:
-#line 1144 "./sparql_p.y"
- { sparyyerror ("Predicate expected after semicolon"); }
+ case 261:
+#line 1400 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Predicate expected after semicolon"); }
break;
- case 206:
-#line 1145 "./sparql_p.y"
- { sparyyerror ("Predicate expected"); }
+ case 262:
+#line 1401 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Predicate expected"); }
break;
- case 207:
-#line 1149 "./sparql_p.y"
+ case 263:
+#line 1405 "./sparql_p.y"
{ }
break;
- case 208:
-#line 1150 "./sparql_p.y"
+ case 264:
+#line 1406 "./sparql_p.y"
{ }
break;
- case 209:
-#line 1151 "./sparql_p.y"
- { sparyyerror ("Semicolon immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
+ case 265:
+#line 1407 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Semicolon immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
break;
- case 210:
-#line 1152 "./sparql_p.y"
- { sparyyerror ("Dot immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
+ case 266:
+#line 1408 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Dot immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
break;
- case 211:
-#line 1153 "./sparql_p.y"
- { sparyyerror ("Object expected after comma"); }
+ case 267:
+#line 1409 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Object expected after comma"); }
break;
- case 212:
-#line 1154 "./sparql_p.y"
- { sparyyerror ("Object expected"); }
+ case 268:
+#line 1410 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Object expected"); }
break;
- case 213:
-#line 1158 "./sparql_p.y"
+ case 269:
+#line 1414 "./sparql_p.y"
{
- spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL, NULL, (yyvsp[(1) - (2)].tree), NULL, (yyvsp[(2) - (2)].trees), 0x0); }
+ spar_gp_add_triplelike (sparp_arg, NULL, NULL, NULL, (yyvsp[(1) - (2)].tree), NULL, (yyvsp[(2) - (2)].trees), 0x0); }
break;
- case 214:
-#line 1163 "./sparql_p.y"
+ case 270:
+#line 1419 "./sparql_p.y"
{ (yyval.trees) = NULL; }
break;
- case 215:
-#line 1164 "./sparql_p.y"
+ case 271:
+#line 1420 "./sparql_p.y"
{
if (CONSTRUCT_L == SPARP_ENV_CONTEXT_GP_SUBTYPE(sparp_arg))
- sparyyerror ("Triple options are not allowed in contructor template");
+ sparyyerror (sparp_arg, "Triple options are not allowed in constructor template");
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_OPTION, "OPTION () triple matching configuration"); }
break;
- case 216:
-#line 1168 "./sparql_p.y"
+ case 272:
+#line 1424 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(4) - (5)].backstack)); }
break;
- case 217:
-#line 1172 "./sparql_p.y"
+ case 273:
+#line 1428 "./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 218:
-#line 1173 "./sparql_p.y"
+ case 274:
+#line 1429 "./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 219:
-#line 1177 "./sparql_p.y"
+ case 275:
+#line 1433 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)IFP_L, (ptrlong)1); }
break;
- case 220:
-#line 1178 "./sparql_p.y"
+ case 276:
+#line 1434 "./sparql_p.y"
{
if (strcasecmp ((yyvsp[(2) - (2)].box), "none"))
(yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, (yyvsp[(2) - (2)].box));
@@ -4631,202 +5052,202 @@ yyreduce:
(yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, (ptrlong)1); }
break;
- case 221:
-#line 1183 "./sparql_p.y"
+ case 277:
+#line 1439 "./sparql_p.y"
{
(yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, sparp_expand_qname_prefix (sparp_arg, (yyvsp[(2) - (2)].box))); }
break;
- case 222:
-#line 1185 "./sparql_p.y"
+ case 278:
+#line 1441 "./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 223:
-#line 1186 "./sparql_p.y"
+ case 279:
+#line 1442 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, (yyvsp[(2) - (2)].box)); }
break;
- case 224:
-#line 1187 "./sparql_p.y"
+ case 280:
+#line 1443 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)OFFBAND_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 225:
-#line 1188 "./sparql_p.y"
+ case 281:
+#line 1444 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)SCORE_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 226:
-#line 1189 "./sparql_p.y"
+ case 282:
+#line 1445 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)SCORE_LIMIT_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 227:
-#line 1190 "./sparql_p.y"
+ case 283:
+#line 1446 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)TABLE_OPTION_L, (yyvsp[(2) - (2)].box)); }
break;
- case 228:
-#line 1191 "./sparql_p.y"
+ case 284:
+#line 1447 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_CYCLES_ONLY_L, (ptrlong)1); }
break;
- case 229:
-#line 1192 "./sparql_p.y"
+ case 285:
+#line 1448 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_DIRECTION_L, (yyvsp[(2) - (2)].box)); }
break;
- case 230:
-#line 1193 "./sparql_p.y"
+ case 286:
+#line 1449 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_DISTINCT_L, (ptrlong)1); }
break;
- case 231:
-#line 1194 "./sparql_p.y"
+ case 287:
+#line 1450 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_END_FLAG_L, (yyvsp[(2) - (2)].box)); }
break;
- case 232:
-#line 1195 "./sparql_p.y"
+ case 288:
+#line 1451 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_EXISTS_L, (ptrlong)1); }
break;
- case 233:
-#line 1196 "./sparql_p.y"
+ case 289:
+#line 1452 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_FINAL_AS_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 234:
-#line 1197 "./sparql_p.y"
+ case 290:
+#line 1453 "./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 235:
-#line 1198 "./sparql_p.y"
+ case 291:
+#line 1454 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_MIN_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 236:
-#line 1199 "./sparql_p.y"
+ case 292:
+#line 1455 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_MAX_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 237:
-#line 1200 "./sparql_p.y"
+ case 293:
+#line 1456 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_NO_CYCLES_L, (ptrlong)1); }
break;
- case 238:
-#line 1201 "./sparql_p.y"
+ case 294:
+#line 1457 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_NO_ORDER_L, (ptrlong)1); }
break;
- case 239:
-#line 1202 "./sparql_p.y"
+ case 295:
+#line 1458 "./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 240:
-#line 1203 "./sparql_p.y"
+ case 296:
+#line 1459 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_SHORTEST_ONLY_L, (ptrlong)1); }
break;
- case 241:
-#line 1204 "./sparql_p.y"
+ case 297:
+#line 1460 "./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 242:
-#line 1205 "./sparql_p.y"
+ case 298:
+#line 1461 "./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 243:
-#line 1206 "./sparql_p.y"
+ case 299:
+#line 1462 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)TRANSITIVE_L, (ptrlong)1); }
break;
- case 244:
-#line 1207 "./sparql_p.y"
+ case 300:
+#line 1463 "./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 245:
-#line 1208 "./sparql_p.y"
+ case 301:
+#line 1464 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (yyvsp[(1) - (1)].token_type), (ptrlong)1); }
break;
- case 246:
-#line 1212 "./sparql_p.y"
+ case 302:
+#line 1468 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 247:
-#line 1213 "./sparql_p.y"
+ case 303:
+#line 1469 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 248:
-#line 1217 "./sparql_p.y"
+ case 304:
+#line 1473 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_L; }
break;
- case 249:
-#line 1218 "./sparql_p.y"
+ case 305:
+#line 1474 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_O_L; }
break;
- case 250:
-#line 1219 "./sparql_p.y"
+ case 306:
+#line 1475 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_P_L; }
break;
- case 251:
-#line 1220 "./sparql_p.y"
+ case 307:
+#line 1476 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_S_L; }
break;
- case 252:
-#line 1221 "./sparql_p.y"
+ case 308:
+#line 1477 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_S_O_L; }
break;
- case 254:
-#line 1226 "./sparql_p.y"
+ case 310:
+#line 1482 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_type); }
break;
- case 255:
-#line 1227 "./sparql_p.y"
- { sparyyerror ("Predicate expected (i.e., variable or IRI ref or a backquoted expn or 'a' keyword)"); }
+ case 311:
+#line 1483 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Predicate expected (i.e., variable or IRI ref or a backquoted expn or 'a' keyword)"); }
break;
- case 256:
-#line 1231 "./sparql_p.y"
+ case 312:
+#line 1487 "./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 257:
-#line 1234 "./sparql_p.y"
+ case 313:
+#line 1490 "./sparql_p.y"
{
(yyval.tree) = t_set_pop (&(sparp_env()->spare_context_subjects)); }
break;
- case 258:
-#line 1236 "./sparql_p.y"
+ case 314:
+#line 1492 "./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 259:
-#line 1240 "./sparql_p.y"
+ case 315:
+#line 1496 "./sparql_p.y"
{
- spar_gp_add_triple_or_special_filter (sparp_arg,
+ spar_gp_add_triplelike (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),
@@ -4835,221 +5256,207 @@ yyreduce:
(yyval.tree) = t_set_pop (&(sparp_env()->spare_context_subjects)); }
break;
- case 260:
-#line 1248 "./sparql_p.y"
+ case 316:
+#line 1504 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_nil); }
break;
- case 261:
-#line 1252 "./sparql_p.y"
+ case 317:
+#line 1508 "./sparql_p.y"
{}
break;
- case 262:
-#line 1253 "./sparql_p.y"
+ case 318:
+#line 1509 "./sparql_p.y"
{}
break;
- case 263:
-#line 1257 "./sparql_p.y"
+ case 319:
+#line 1513 "./sparql_p.y"
{
- spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL,
+ spar_gp_add_triplelike (sparp_arg, NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_first),
(yyvsp[(1) - (1)].tree), NULL, NULL, 0x0 ); }
break;
- case 264:
-#line 1261 "./sparql_p.y"
+ case 320:
+#line 1517 "./sparql_p.y"
{
SPART *bn = spar_make_blank_node (sparp_arg, spar_mkid (sparp_arg, "_:cons"), 1);
- spar_gp_add_triple_or_special_filter (sparp_arg,
+ spar_gp_add_triplelike (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_triple_or_special_filter (sparp_arg, NULL, NULL,
+ spar_gp_add_triplelike (sparp_arg, NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_first),
(yyvsp[(2) - (2)].tree), NULL, NULL, 0x0 ); }
break;
- case 269:
-#line 1284 "./sparql_p.y"
+ case 325:
+#line 1540 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 270:
-#line 1285 "./sparql_p.y"
+ case 326:
+#line 1541 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 274:
-#line 1292 "./sparql_p.y"
+ case 330:
+#line 1548 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
- case 282:
-#line 1309 "./sparql_p.y"
+ case 338:
+#line 1565 "./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 283:
-#line 1310 "./sparql_p.y"
+ case 339:
+#line 1566 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 284:
-#line 1314 "./sparql_p.y"
+ case 340:
+#line 1570 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 285:
-#line 1315 "./sparql_p.y"
+ case 341:
+#line 1571 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 286:
-#line 1319 "./sparql_p.y"
+ case 342:
+#line 1575 "./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 287:
-#line 1320 "./sparql_p.y"
+ case 343:
+#line 1576 "./sparql_p.y"
{ (yyval.tree) = spar_make_funcall (sparp_arg, 1, (yyvsp[(1) - (3)].box), (SPART **)t_list (1, (ptrlong)1)); }
break;
- case 288:
-#line 1321 "./sparql_p.y"
+ case 344:
+#line 1577 "./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 289:
-#line 1325 "./sparql_p.y"
+ case 345:
+#line 1581 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "aggregate function call"); (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 290:
-#line 1329 "./sparql_p.y"
+ case 346:
+#line 1585 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:COUNT"); }
break;
- case 291:
-#line 1330 "./sparql_p.y"
+ case 347:
+#line 1586 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:AVG"); }
break;
- case 292:
-#line 1331 "./sparql_p.y"
+ case 348:
+#line 1587 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:MIN"); }
break;
- case 293:
-#line 1332 "./sparql_p.y"
+ case 349:
+#line 1588 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:MAX"); }
break;
- case 294:
-#line 1333 "./sparql_p.y"
+ case 350:
+#line 1589 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:SUM"); }
break;
- case 295:
-#line 1337 "./sparql_p.y"
- { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
- break;
-
- case 296:
-#line 1338 "./sparql_p.y"
- { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
+ case 351:
+#line 1593 "./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 297:
-#line 1339 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ case 352:
+#line 1610 "./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); }
break;
- 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]) ); }
+ case 353:
+#line 1615 "./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]) ); }
break;
- case 299:
-#line 1344 "./sparql_p.y"
+ case 354:
+#line 1623 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_GLOBALS, "global variable"); (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
- case 300:
-#line 1349 "./sparql_p.y"
- { (yyval.tree) = spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
- break;
-
- case 301:
-#line 1350 "./sparql_p.y"
- { (yyval.tree) = spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
- break;
-
- case 302:
-#line 1351 "./sparql_p.y"
+ case 355:
+#line 1628 "./sparql_p.y"
{ (yyval.tree) = spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
break;
- case 303:
-#line 1352 "./sparql_p.y"
+ case 356:
+#line 1629 "./sparql_p.y"
{ (yyval.tree) = spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
break;
- case 304:
-#line 1357 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 305:
-#line 1358 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 306:
-#line 1359 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 307:
-#line 1360 "./sparql_p.y"
+ case 360:
+#line 1637 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 308:
-#line 1361 "./sparql_p.y"
+ case 361:
+#line 1638 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); spar_change_sign (&((yyvsp[(2) - (2)].tree)->_.lit.val)); }
break;
- case 309:
-#line 1362 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 310:
-#line 1363 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 311:
-#line 1364 "./sparql_p.y"
+ case 364:
+#line 1641 "./sparql_p.y"
{ (yyval.tree) = (SPART *)t_box_dv_uname_string ("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"); }
break;
- case 313:
-#line 1369 "./sparql_p.y"
+ case 366:
+#line 1646 "./sparql_p.y"
{
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "backquoted expression");
+ dk_set_t gp_st = sparp_env()->spare_context_gp_subtypes;
if (2 & sparp_arg->sparp_in_precode_expn)
- spar_error (sparp_arg, "Backquoted expressions are not allowed in constant clauses"); }
+ 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"); }
break;
- case 314:
-#line 1373 "./sparql_p.y"
+ case 367:
+#line 1653 "./sparql_p.y"
{
- dk_set_t gp_st = sparp_env()->spare_context_gp_subtypes;
- if ((NULL == gp_st) || (CONSTRUCT_L == (ptrlong)(gp_st->data)))
+ if ((-1 == (yyvsp[(2) - (4)].token_type)) || (CONSTRUCT_L == (yyvsp[(2) - (4)].token_type)))
(yyval.tree) = (yyvsp[(3) - (4)].tree); /* redundant backquotes in retlist or backquotes to bypass syntax limitation in CONSTRUCT gp */
else
{
@@ -5062,60 +5469,55 @@ yyreduce:
}
break;
- 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 316:
-#line 1390 "./sparql_p.y"
+ case 368:
+#line 1668 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_ALIAS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].box), SSG_VALMODE_AUTO); }
break;
- case 317:
-#line 1391 "./sparql_p.y"
+ case 369:
+#line 1669 "./sparql_p.y"
{ /* [44] ConditionalOrExpn ::= ConditionalAndExpn ( '||' ConditionalAndExpn )* */
SPAR_BIN_OP ((yyval.tree), BOP_OR, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 318:
-#line 1393 "./sparql_p.y"
+ case 370:
+#line 1671 "./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 319:
-#line 1396 "./sparql_p.y"
+ case 371:
+#line 1674 "./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 320:
-#line 1400 "./sparql_p.y"
+ case 372:
+#line 1678 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_NEQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 321:
-#line 1401 "./sparql_p.y"
+ case 373:
+#line 1679 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_LIKE, "LIKE operator"); }
break;
- case 322:
-#line 1402 "./sparql_p.y"
+ case 374:
+#line 1680 "./sparql_p.y"
{ /* Virtuoso-specific extension of [47] */
- (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)LIKE_L, t_list (2, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree))); }
+ (yyval.tree) = sparp_make_builtin_call (sparp_arg, LIKE_L, (SPART **)t_list (2, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree))); }
break;
- case 323:
-#line 1404 "./sparql_p.y"
+ case 375:
+#line 1682 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_IN, "IN operator"); }
break;
- case 324:
-#line 1405 "./sparql_p.y"
+ case 376:
+#line 1683 "./sparql_p.y"
{ /* Virtuoso-specific extension of [47] */
dk_set_t args = (yyvsp[(5) - (6)].backstack);
if (1 == dk_set_length (args))
@@ -5125,80 +5527,80 @@ yyreduce:
else
{
t_set_push (&args, (yyvsp[(1) - (6)].tree));
- (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 */ );
+ (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 */ );
}
}
break;
- case 325:
-#line 1418 "./sparql_p.y"
+ case 377:
+#line 1696 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_LT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 326:
-#line 1419 "./sparql_p.y"
+ case 378:
+#line 1697 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_LT, (yyvsp[(3) - (3)].tree), (yyvsp[(1) - (3)].tree)); }
break;
- case 327:
-#line 1420 "./sparql_p.y"
+ case 379:
+#line 1698 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_LTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 328:
-#line 1421 "./sparql_p.y"
+ case 380:
+#line 1699 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_LTE, (yyvsp[(3) - (3)].tree), (yyvsp[(1) - (3)].tree)); }
break;
- case 329:
-#line 1422 "./sparql_p.y"
+ case 381:
+#line 1700 "./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 \")\"");
+ sparyyerror (sparp_arg, "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 330:
-#line 1426 "./sparql_p.y"
+ case 382:
+#line 1704 "./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 \")\"");
+ sparyyerror (sparp_arg, "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 331:
-#line 1430 "./sparql_p.y"
+ case 383:
+#line 1708 "./sparql_p.y"
{ /* [50] MultiplicativeExpn ::= UnaryExpn ( ('*'|'/') UnaryExpn )* */
SPAR_BIN_OP ((yyval.tree), BOP_TIMES, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 332:
-#line 1432 "./sparql_p.y"
+ case 384:
+#line 1710 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_DIV, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 333:
-#line 1433 "./sparql_p.y"
+ case 385:
+#line 1711 "./sparql_p.y"
{ /* [51]* UnaryExpn ::= ('!'|'NOT'|'+'|'-')? PrimaryExpn */
SPAR_BIN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree), NULL); }
break;
- case 334:
-#line 1435 "./sparql_p.y"
+ case 386:
+#line 1713 "./sparql_p.y"
{
SPAR_BIN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree), NULL); }
break;
- case 335:
-#line 1437 "./sparql_p.y"
+ case 387:
+#line 1715 "./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 336:
-#line 1440 "./sparql_p.y"
+ case 388:
+#line 1718 "./sparql_p.y"
{
caddr_t *val_ptr = NULL;
if (DV_ARRAY_OF_POINTER == DV_TYPE_OF ((yyvsp[(2) - (2)].tree))) {
@@ -5224,13 +5626,13 @@ yyreduce:
(yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 337:
-#line 1463 "./sparql_p.y"
+ case 389:
+#line 1741 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
- case 338:
-#line 1466 "./sparql_p.y"
+ case 390:
+#line 1744 "./sparql_p.y"
{
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "scalar ASK subquery");
spar_gp_init (sparp_arg, SELECT_L);
@@ -5240,33 +5642,33 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn <<= 1; }
break;
- case 339:
-#line 1475 "./sparql_p.y"
+ case 391:
+#line 1753 "./sparql_p.y"
{
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) );
+ where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0), NULL );
spar_env_pop (sparp_arg);
- (yyval.tree) = spar_gp_finalize_with_subquery (sparp_arg, (yyvsp[(7) - (7)].trees), subselect_top);
+ (yyval.tree) = spar_gp_finalize_with_subquery (sparp_arg, (yyvsp[(6) - (7)].trees), subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
break;
- case 340:
-#line 1484 "./sparql_p.y"
+ case 392:
+#line 1762 "./sparql_p.y"
{
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "scalar subquery");
spar_gp_init (sparp_arg, SELECT_L);
spar_env_push (sparp_arg);
- spar_selid_push (sparp_arg);
+ 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;
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
break;
- case 341:
-#line 1494 "./sparql_p.y"
+ case 393:
+#line 1772 "./sparql_p.y"
{
SPART *subselect_top;
SPART *where_gp;
@@ -5280,354 +5682,426 @@ 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[(9) - (9)].trees), subselect_top);
+ (yyval.tree) = spar_gp_finalize_with_subquery (sparp_arg, (yyvsp[(8) - (9)].trees), subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
break;
- case 342:
-#line 1509 "./sparql_p.y"
+ case 394:
+#line 1787 "./sparql_p.y"
{
(yyval.tree) = (yyvsp[(1) - (1)].tree);
if (sparp_arg->sparp_in_precode_expn)
- sparyyerror ("Aggregates are not allowed in 'precode' expressions that should be calculated before the result-set of the query");
+ sparyyerror (sparp_arg, "Aggregates are not allowed in 'precode' expressions that should be calculated before the result-set of the query");
if (!(sparp_arg->sparp_allow_aggregates_in_expn & 1))
- sparyyerror ("Aggregates are allowed only in result sets"); }
+ sparyyerror (sparp_arg, "Aggregates are allowed only in result sets"); }
break;
- case 344:
-#line 1516 "./sparql_p.y"
- { /* [55] IRIrefOrFunction ::= IRIref ArgList? */
- if (NULL == (yyvsp[(2) - (2)].backstack))
- (yyval.tree) = (yyvsp[(1) - (2)].tree);
+ case 396:
+#line 1794 "./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 (sparp_arg, "The macro is recursively used in its own definition");
+ sparp_arg->sparp_macro_mode |= SPARP_CALLARG;
+ } }
+ break;
+
+ case 397:
+#line 1806 "./sparql_p.y"
+ {
+ if (NULL == (yyvsp[(3) - (3)].backstack))
+ (yyval.tree) = (yyvsp[(1) - (3)].tree);
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;
+ 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
+ {
spar_verify_funcall_security (sparp_arg, fname, args);
(yyval.tree) = spar_make_funcall (sparp_arg, 0, fname, args);
- } }
+ } } }
break;
- case 345:
-#line 1526 "./sparql_p.y"
+ case 398:
+#line 1826 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((yyvsp[(1) - (1)].tree)); }
break;
- case 346:
-#line 1527 "./sparql_p.y"
+ case 399:
+#line 1827 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((yyvsp[(1) - (1)].tree)); }
break;
- case 347:
-#line 1528 "./sparql_p.y"
+ case 400:
+#line 1828 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((yyvsp[(1) - (1)].tree)); }
break;
- 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 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 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))); }
+ case 404:
+#line 1835 "./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); }
break;
- 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))); }
+ case 405:
+#line 1853 "./sparql_p.y"
+ { (yyval.tree) = sparp_make_builtin_call (sparp_arg, IRI_L, (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- 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))); }
+ case 406:
+#line 1855 "./sparql_p.y"
+ { (yyval.tree) = sparp_make_builtin_call (sparp_arg, LANG_L, (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- 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))); }
+ case 407:
+#line 1857 "./sparql_p.y"
+ { (yyval.tree) = sparp_make_builtin_call (sparp_arg, DATATYPE_L, (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- 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))); }
+ case 408:
+#line 1859 "./sparql_p.y"
+ { (yyval.tree) = sparp_make_builtin_call (sparp_arg, BOUND_L, (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- 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))); }
+ case 409:
+#line 1863 "./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 (sparp_arg, "The macro is recursively used in its own definition");
+ sparp_arg->sparp_macro_mode |= SPARP_CALLARG;
+ } }
break;
- 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))); }
+ case 410:
+#line 1875 "./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);
+ } }
break;
- 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))); }
+ case 411:
+#line 1893 "./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 (sparp_arg, "Undefined macro IRI");
+ if ((SPARP_DEFBODY & sparp_arg->sparp_macro_mode) && (sparp_arg->sparp_current_macro == mdef))
+ sparyyerror (sparp_arg, "The macro is recursively used in its own definition");
+ (yyval.token_type) = sparp_arg->sparp_macro_mode;
+ sparp_arg->sparp_macro_mode |= SPARP_CALLARG; }
break;
- case 361:
-#line 1556 "./sparql_p.y"
- { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "IRI (built-in call)"); }
+ case 412:
+#line 1904 "./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++;
+ }
break;
- 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))); }
+ case 413:
+#line 1915 "./sparql_p.y"
+ { (yyval.backstack) = NULL; }
break;
- case 363:
-#line 1560 "./sparql_p.y"
- { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "isREF (built-in call)"); }
+ case 415:
+#line 1920 "./sparql_p.y"
+ { (yyval.backstack) = (dk_set_t)NIL_L; }
break;
- 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))); }
+ case 416:
+#line 1921 "./sparql_p.y"
+ { (yyval.backstack) = (dk_set_t)NIL_L; }
break;
- 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))); }
+ case 417:
+#line 1922 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
- 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))); }
+ case 418:
+#line 1926 "./sparql_p.y"
+ { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- 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)); }
+ case 419:
+#line 1927 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- 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))); }
+ case 420:
+#line 1928 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Argument expected after comma"); }
break;
- 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); }
+ case 421:
+#line 1929 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Comma or ')' expected after function argument"); }
break;
- case 370:
-#line 1587 "./sparql_p.y"
+ case 422:
+#line 1933 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 371:
-#line 1588 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
- break;
-
- case 372:
-#line 1592 "./sparql_p.y"
+ case 424:
+#line 1938 "./sparql_p.y"
{ (yyval.backstack) = (dk_set_t)NIL_L; }
break;
- case 373:
-#line 1593 "./sparql_p.y"
+ case 425:
+#line 1939 "./sparql_p.y"
{ (yyval.backstack) = (dk_set_t)NIL_L; }
break;
- case 374:
-#line 1594 "./sparql_p.y"
+ case 426:
+#line 1940 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
- case 375:
-#line 1598 "./sparql_p.y"
+ case 427:
+#line 1944 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 376:
-#line 1599 "./sparql_p.y"
+ case 428:
+#line 1945 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 377:
-#line 1600 "./sparql_p.y"
- { sparyyerror ("Argument expected after comma"); }
+ case 429:
+#line 1946 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Macro argument (an expression or a group pattern) expected after comma"); }
break;
- case 378:
-#line 1601 "./sparql_p.y"
- { sparyyerror ("Comma or ')' expected after function argument"); }
+ case 430:
+#line 1947 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Comma or ')' expected after macro argument"); }
break;
- case 379:
-#line 1605 "./sparql_p.y"
+ case 432:
+#line 1952 "./sparql_p.y"
+ {
+ spar_gp_init (sparp_arg, SPAR_MACROPU); }
+ break;
+
+ case 433:
+#line 1954 "./sparql_p.y"
+ { (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
+ break;
+
+ case 434:
+#line 1958 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_integer, NULL); }
break;
- case 380:
-#line 1606 "./sparql_p.y"
+ case 435:
+#line 1959 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_decimal, NULL); }
break;
- case 381:
-#line 1607 "./sparql_p.y"
+ case 436:
+#line 1960 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_double, NULL); }
break;
- case 382:
-#line 1611 "./sparql_p.y"
+ case 437:
+#line 1961 "./sparql_p.y"
+ { double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, t_box_double (myPOSINF_d), uname_xmlschema_ns_uri_hash_double, NULL); }
+ break;
+
+ case 438:
+#line 1964 "./sparql_p.y"
+ { double myZERO = 0.0;
+ double myNAN_d = 0.0/myZERO;
+ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, t_box_double (myNAN_d), uname_xmlschema_ns_uri_hash_double, NULL); }
+ break;
+
+ case 439:
+#line 1970 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (1)].box), NULL, NULL); }
break;
- case 383:
-#line 1612 "./sparql_p.y"
+ case 440:
+#line 1971 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (2)].box), NULL, (yyvsp[(2) - (2)].box)); }
break;
- case 384:
-#line 1613 "./sparql_p.y"
+ case 441:
+#line 1972 "./sparql_p.y"
{ (yyval.tree) = spar_make_typed_literal (sparp_arg, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].tree)->_.lit.val, NULL); }
break;
- case 385:
-#line 1617 "./sparql_p.y"
+ case 442:
+#line 1976 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (ptrlong)1, uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
- case 386:
-#line 1618 "./sparql_p.y"
+ case 443:
+#line 1977 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (ptrlong)0, uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
- case 387:
-#line 1622 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 388:
-#line 1623 "./sparql_p.y"
+ case 445:
+#line 1982 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((ptrlong)_STAR); }
break;
- case 389:
-#line 1624 "./sparql_p.y"
+ case 446:
+#line 1983 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((ptrlong)DEFAULT_L); }
break;
- case 390:
-#line 1628 "./sparql_p.y"
+ case 447:
+#line 1987 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "\"variable+>property\""); (yyval.token_type) = _PLUS_GT; }
break;
- case 391:
-#line 1629 "./sparql_p.y"
+ case 448:
+#line 1988 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "\"variable*>property\""); (yyval.token_type) = _STAR_GT; }
break;
- case 392:
-#line 1633 "./sparql_p.y"
+ case 449:
+#line 1992 "./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 393:
-#line 1637 "./sparql_p.y"
+ case 450:
+#line 1996 "./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 394:
-#line 1641 "./sparql_p.y"
+ case 451:
+#line 2000 "./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 395:
-#line 1645 "./sparql_p.y"
- { sparyyerror ("IRI reference expected after *> or +> operator"); }
+ case 452:
+#line 2004 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "IRI reference expected after *> or +> operator"); }
break;
- case 396:
-#line 1649 "./sparql_p.y"
+ case 453:
+#line 2008 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_q_iri_ref (sparp_arg, (yyvsp[(1) - (1)].box))); }
break;
- case 397:
-#line 1650 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 398:
-#line 1654 "./sparql_p.y"
+ case 455:
+#line 2013 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_qname_prefix (sparp_arg, (yyvsp[(1) - (1)].box))); }
break;
- case 399:
-#line 1655 "./sparql_p.y"
+ case 456:
+#line 2014 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME/*_NS*/, sparp_expand_qname_prefix (sparp_arg, (yyvsp[(1) - (1)].box))); }
break;
- case 400:
-#line 1659 "./sparql_p.y"
+ case 457:
+#line 2018 "./sparql_p.y"
{ (yyval.tree) = spar_make_blank_node (sparp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
- case 401:
-#line 1660 "./sparql_p.y"
+ case 458:
+#line 2019 "./sparql_p.y"
{ (yyval.tree) = spar_make_blank_node (sparp_arg, spar_mkid (sparp_arg, "_:anon"), 1); }
break;
- case 402:
-#line 1666 "./sparql_p.y"
+ case 459:
+#line 2025 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 403:
-#line 1667 "./sparql_p.y"
+ case 460:
+#line 2026 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 413:
-#line 1688 "./sparql_p.y"
+ case 472:
+#line 2047 "./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 473:
+#line 2054 "./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 414:
-#line 1691 "./sparql_p.y"
+ case 474:
+#line 2057 "./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 415:
-#line 1700 "./sparql_p.y"
+ case 475:
+#line 2066 "./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 416:
-#line 1704 "./sparql_p.y"
+ case 476:
+#line 2070 "./sparql_p.y"
{
SPART *fake = spar_make_fake_action_solution (sparp_arg);
sparp_arg->sparp_in_precode_expn = 0;
@@ -5636,31 +6110,31 @@ yyreduce:
spar_compose_retvals_of_insert_or_delete (sparp_arg, (yyval.tree), (yyvsp[(3) - (5)].tree), (yyvsp[(5) - (5)].tree)); }
break;
- case 417:
-#line 1715 "./sparql_p.y"
+ case 477:
+#line 2081 "./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 418:
-#line 1718 "./sparql_p.y"
+ case 478:
+#line 2084 "./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 419:
-#line 1727 "./sparql_p.y"
+ case 479:
+#line 2093 "./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 420:
-#line 1731 "./sparql_p.y"
+ case 480:
+#line 2097 "./sparql_p.y"
{
SPART *fake = spar_make_fake_action_solution (sparp_arg);
sparp_arg->sparp_in_precode_expn = 0;
@@ -5669,126 +6143,243 @@ yyreduce:
spar_compose_retvals_of_insert_or_delete (sparp_arg, (yyval.tree), (yyvsp[(3) - (5)].tree), (yyvsp[(5) - (5)].tree)); }
break;
- case 421:
-#line 1743 "./sparql_p.y"
+ case 481:
+#line 2109 "./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 422:
-#line 1747 "./sparql_p.y"
+ case 482:
+#line 2113 "./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 423:
-#line 1754 "./sparql_p.y"
- { (yyval.tree) = spar_make_sparul_clear (sparp_arg, (yyvsp[(2) - (2)].tree)); }
+ case 483:
+#line 2120 "./sparql_p.y"
+ {
+ (yyval.tree) = spar_make_sparul_clear (sparp_arg, (yyvsp[(3) - (3)].tree), (yyvsp[(2) - (3)].token_type) /* yes, $2 after $3 */); }
break;
- case 424:
-#line 1759 "./sparql_p.y"
+ case 484:
+#line 2126 "./sparql_p.y"
{
- (yyval.tree) = spar_make_sparul_load (sparp_arg, (yyvsp[(2) - (2)].tree), (yyvsp[(2) - (2)].tree)); }
+ (yyval.tree) = spar_make_sparul_load (sparp_arg, (yyvsp[(3) - (3)].tree), (yyvsp[(3) - (3)].tree), (yyvsp[(2) - (3)].token_type)); }
break;
- case 425:
-#line 1761 "./sparql_p.y"
+ case 485:
+#line 2128 "./sparql_p.y"
{
- (yyval.tree) = spar_make_sparul_load (sparp_arg, (yyvsp[(5) - (5)].tree), (yyvsp[(2) - (5)].tree) /* yes, $2 after $3 */); }
+ (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)); }
break;
- case 426:
-#line 1766 "./sparql_p.y"
+ case 486:
+#line 2133 "./sparql_p.y"
+ {
+ (yyval.tree) = spar_make_sparul_load_service_data (sparp_arg, (yyvsp[(4) - (5)].tree), (SPART *)t_NEW_DB_NULL, (yyvsp[(2) - (5)].token_type)); }
+ break;
+
+ case 487:
+#line 2135 "./sparql_p.y"
+ {
+ (yyval.tree) = spar_make_sparul_load_service_data (sparp_arg, (yyvsp[(4) - (8)].tree), (yyvsp[(8) - (8)].tree), (yyvsp[(2) - (8)].token_type)); }
+ break;
+
+ case 488:
+#line 2140 "./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 427:
-#line 1771 "./sparql_p.y"
+ case 489:
+#line 2145 "./sparql_p.y"
{
- (yyval.tree) = spar_make_sparul_drop (sparp_arg, (yyvsp[(4) - (4)].tree), (yyvsp[(2) - (4)].token_type) /* yes, $2 after $4 */); }
+ (yyval.tree) = spar_make_sparul_drop (sparp_arg, (yyvsp[(3) - (3)].tree), (yyvsp[(2) - (3)].token_type) /* yes, $2 after $3 */); }
break;
- case 428:
-#line 1776 "./sparql_p.y"
+ case 490:
+#line 2150 "./sparql_p.y"
{ (yyval.tree) = spar_make_fake_action_solution (sparp_arg); }
break;
- case 429:
-#line 1777 "./sparql_p.y"
+ case 491:
+#line 2151 "./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; }
+ (yyval.tree) = (yyvsp[(3) - (3)].tree);
+ (yyvsp[(3) - (3)].tree)->_.wm.where_gp = where_gp; }
break;
- case 430:
-#line 1784 "./sparql_p.y"
- { (yyval.tree) = spar_default_sparul_target (sparp_arg, "INTO GRAPH IDENTIFIED BY clause"); }
+ case 492:
+#line 2158 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
- case 431:
-#line 1785 "./sparql_p.y"
+ case 493:
+#line 2162 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
- case 432:
-#line 1789 "./sparql_p.y"
- { (yyval.tree) = spar_default_sparul_target (sparp_arg, "FROM GRAPH IDENTIFIED BY clause"); }
+ case 494:
+#line 2166 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)ALL_L; }
break;
- case 433:
-#line 1790 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(3) - (3)].tree); }
+ case 495:
+#line 2167 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)DEFAULT_L; }
break;
- case 434:
-#line 1794 "./sparql_p.y"
- { (yyval.tree) = spar_default_sparul_target (sparp_arg, "GRAPH IDENTIFIED BY clause"); }
+ case 496:
+#line 2168 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)NAMED_L; }
break;
- case 435:
-#line 1795 "./sparql_p.y"
+ case 497:
+#line 2169 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 436:
-#line 1799 "./sparql_p.y"
+ case 498:
+#line 2173 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)DEFAULT_L; }
+ break;
+
+ case 499:
+#line 2174 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+ break;
+
+ case 500:
+#line 2178 "./sparql_p.y"
+ { (yyval.tree) = spar_default_sparul_target (sparp_arg, "GRAPH IDENTIFIED BY clause", 0); }
+ break;
+
+ case 501:
+#line 2179 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+ break;
+
+ case 502:
+#line 2183 "./sparql_p.y"
{}
break;
- case 437:
-#line 1800 "./sparql_p.y"
+ case 503:
+#line 2184 "./sparql_p.y"
+ {
+ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11_DRAFT, "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 504:
+#line 2191 "./sparql_p.y"
{}
break;
- case 438:
-#line 1804 "./sparql_p.y"
+ case 505:
+#line 2192 "./sparql_p.y"
+ {}
+ break;
+
+ case 506:
+#line 2196 "./sparql_p.y"
{ (yyval.token_type) = 0; }
break;
- case 439:
-#line 1805 "./sparql_p.y"
+ case 507:
+#line 2197 "./sparql_p.y"
{ (yyval.token_type) = 1; }
break;
- case 441:
-#line 1812 "./sparql_p.y"
+ case 511:
+#line 2214 "./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 512:
+#line 2219 "./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 513:
+#line 2236 "./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); }
+ break;
+
+ case 514:
+#line 2241 "./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)); }
+ break;
+
+ case 515:
+#line 2248 "./sparql_p.y"
+ { (yyval.tree) = NULL; }
+ break;
+
+ case 516:
+#line 2249 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+ break;
+
+ case 517:
+#line 2253 "./sparql_p.y"
+ {
+ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11_DRAFT, "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 */); }
+ break;
+
+ case 518:
+#line 2259 "./sparql_p.y"
+ { (yyval.token_type) = COPY_L; }
+ break;
+
+ case 519:
+#line 2260 "./sparql_p.y"
+ { (yyval.token_type) = MOVE_L; }
+ break;
+
+ case 520:
+#line 2261 "./sparql_p.y"
+ { (yyval.token_type) = ADD_L; }
+ break;
+
+ case 522:
+#line 2268 "./sparql_p.y"
{
sparp_env()->spare_qm_default_table = NULL; }
break;
- case 443:
-#line 1818 "./sparql_p.y"
+ case 524:
+#line 2274 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
break;
- case 451:
-#line 1836 "./sparql_p.y"
+ case 532:
+#line 2292 "./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",
@@ -5797,12 +6388,11 @@ 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) );
- sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ (SPART **)t_list (3, (yyvsp[(4) - (7)].box), (yyvsp[(5) - (7)].box), (yyvsp[(6) - (7)].tree)), (yyvsp[(7) - (7)].trees) ); }
break;
- case 452:
-#line 1846 "./sparql_p.y"
+ case 533:
+#line 2301 "./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",
@@ -5811,118 +6401,114 @@ 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) );
- sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ (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) ); }
break;
- case 453:
-#line 1859 "./sparql_p.y"
+ case 534:
+#line 2313 "./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_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ sparp_jso_push_deleted (sparp_arg, uname_virtrdf_ns_uri_QuadMapFormat , (yyvsp[(5) - (5)].box)); }
break;
- case 454:
-#line 1870 "./sparql_p.y"
+ case 535:
+#line 2323 "./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 );
- sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ (SPART **)t_list (2, (yyvsp[(4) - (7)].box), (yyvsp[(7) - (7)].box)), NULL ); }
break;
- case 455:
-#line 1874 "./sparql_p.y"
+ case 536:
+#line 2326 "./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 );
- sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ (SPART **)t_list (2, (yyvsp[(2) - (5)].box), (yyvsp[(5) - (5)].box)), NULL ); }
break;
- case 456:
-#line 1881 "./sparql_p.y"
+ case 537:
+#line 2332 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (0); }
break;
- case 457:
-#line 1882 "./sparql_p.y"
+ case 538:
+#line 2333 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (0); }
break;
- case 458:
-#line 1883 "./sparql_p.y"
+ case 539:
+#line 2334 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
- case 459:
-#line 1887 "./sparql_p.y"
+ case 540:
+#line 2338 "./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 460:
-#line 1891 "./sparql_p.y"
+ case 541:
+#line 2342 "./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 461:
-#line 1898 "./sparql_p.y"
+ case 542:
+#line 2349 "./sparql_p.y"
{ /*... ( 'DATATYPE' QmIRIrefConst ) */
- (yyval.trees) = t_list (2, t_box_dv_uname_string ("DATATYPE"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
+ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("DATATYPE"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
break;
- case 462:
-#line 1900 "./sparql_p.y"
+ case 543:
+#line 2351 "./sparql_p.y"
{ /*... | ( 'LANG' STRING ) */
- (yyval.trees) = t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
+ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
break;
- case 463:
-#line 1902 "./sparql_p.y"
+ case 544:
+#line 2353 "./sparql_p.y"
{ /*... | ( 'LANG' STRING ) */
- (yyval.trees) = t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
+ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
break;
- case 464:
-#line 1904 "./sparql_p.y"
+ case 545:
+#line 2355 "./sparql_p.y"
{ /*... | 'BIJECTION' */
- (yyval.trees) = t_list (2, t_box_dv_uname_string ("BIJECTION"), (ptrlong)1); }
+ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("BIJECTION"), (ptrlong)1); }
break;
- case 465:
-#line 1906 "./sparql_p.y"
+ case 546:
+#line 2357 "./sparql_p.y"
{ /*... | 'DEREF' */
- (yyval.trees) = t_list (2, t_box_dv_uname_string ("DEREF"), (ptrlong)1); }
+ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("DEREF"), (ptrlong)1); }
break;
- case 466:
-#line 1908 "./sparql_p.y"
+ case 547:
+#line 2359 "./sparql_p.y"
{ /*... | 'RETURNS' STRING ('UNION' STRING)* */
- (yyval.trees) = t_list (2, t_box_dv_uname_string ("RETURNS"),
+ (yyval.trees) = (SPART **)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 467:
-#line 1914 "./sparql_p.y"
+ case 548:
+#line 2365 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].box)); }
break;
- case 468:
-#line 1915 "./sparql_p.y"
+ case 549:
+#line 2366 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].box)); }
break;
- case 469:
-#line 1919 "./sparql_p.y"
+ case 550:
+#line 2370 "./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))
@@ -5938,14 +6524,14 @@ yyreduce:
sparp_jso_push_affected (sparp_arg, (yyvsp[(4) - (4)].box)); }
break;
- case 470:
-#line 1933 "./sparql_p.y"
+ case 551:
+#line 2384 "./sparql_p.y"
{
spar_qm_push_bookmark (sparp_arg); }
break;
- case 471:
-#line 1935 "./sparql_p.y"
+ case 552:
+#line 2386 "./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",
@@ -5954,18 +6540,18 @@ yyreduce:
sparp_env()->spare_storage_name = NULL; }
break;
- case 472:
-#line 1944 "./sparql_p.y"
+ case 553:
+#line 2395 "./sparql_p.y"
{ (yyval.token_type) = IRI_L; }
break;
- case 473:
-#line 1945 "./sparql_p.y"
+ case 554:
+#line 2396 "./sparql_p.y"
{ (yyval.token_type) = LITERAL_L; }
break;
- case 474:
-#line 1949 "./sparql_p.y"
+ case 555:
+#line 2400 "./sparql_p.y"
{
sparp_env()->spare_storage_name = (yyvsp[(4) - (4)].box);
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
@@ -5974,14 +6560,14 @@ yyreduce:
sparp_jso_push_affected (sparp_arg, (yyvsp[(4) - (4)].box)); }
break;
- case 475:
-#line 1956 "./sparql_p.y"
+ case 556:
+#line 2407 "./sparql_p.y"
{
spar_qm_push_bookmark (sparp_arg); }
break;
- case 476:
-#line 1958 "./sparql_p.y"
+ case 557:
+#line 2409 "./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",
@@ -5990,8 +6576,8 @@ yyreduce:
sparp_env()->spare_storage_name = NULL; }
break;
- case 477:
-#line 1967 "./sparql_p.y"
+ case 558:
+#line 2418 "./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));
@@ -6002,258 +6588,300 @@ yyreduce:
sparp_jso_push_affected (sparp_arg, (yyvsp[(5) - (5)].box)); }
break;
- case 478:
-#line 1978 "./sparql_p.y"
+ case 559:
+#line 2429 "./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, uname_virtrdf_ns_uri_QuadStorage); }
+ if (NULL != sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
break;
- case 479:
-#line 1984 "./sparql_p.y"
+ case 560:
+#line 2435 "./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, uname_virtrdf_ns_uri_QuadStorage); }
+ if (NULL != sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
break;
- case 480:
-#line 1993 "./sparql_p.y"
+ case 561:
+#line 2444 "./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, uname_virtrdf_ns_uri_QuadStorage); }
+ if (NULL != sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
break;
- case 481:
-#line 1999 "./sparql_p.y"
+ case 562:
+#line 2450 "./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, uname_virtrdf_ns_uri_QuadStorage); }
+ if (NULL != sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
break;
- case 482:
-#line 2008 "./sparql_p.y"
+ case 563:
+#line 2459 "./sparql_p.y"
{}
break;
- case 483:
-#line 2009 "./sparql_p.y"
+ case 564:
+#line 2460 "./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 484:
-#line 2012 "./sparql_p.y"
+ case 565:
+#line 2463 "./sparql_p.y"
{
sparp_env()->spare_qm_current_table_alias = NULL; }
break;
- case 485:
-#line 2014 "./sparql_p.y"
+ case 566:
+#line 2465 "./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 486:
-#line 2017 "./sparql_p.y"
+ case 567:
+#line 2468 "./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));
+ caddr_t qry = t_box_sprintf (100 + strlen((yyvsp[(4) - (6)].box)), "/*[sqlquery[*/ %s\n/*]sqlquery]*/", (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 487:
-#line 2021 "./sparql_p.y"
+ case 568:
+#line 2472 "./sparql_p.y"
{
sparp_env()->spare_qm_current_table_alias = NULL; }
break;
- case 488:
-#line 2023 "./sparql_p.y"
+ case 569:
+#line 2474 "./sparql_p.y"
{ /*... | QmCondition */
spar_qm_add_table_filter (sparp_arg, (yyvsp[(2) - (2)].box)); }
break;
- case 489:
-#line 2028 "./sparql_p.y"
+ case 570:
+#line 2479 "./sparql_p.y"
{}
break;
- case 491:
-#line 2033 "./sparql_p.y"
+ case 572:
+#line 2484 "./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 492:
-#line 2040 "./sparql_p.y"
+ case 573:
+#line 2491 "./sparql_p.y"
{ (yyval.box) = NULL; }
break;
- case 493:
-#line 2041 "./sparql_p.y"
- { (yyval.box) = (yyvsp[(1) - (1)].box); }
+ case 574:
+#line 2492 "./sparql_p.y"
+ { (yyval.box) = (caddr_t)((ptrlong)(XML_L)); }
break;
- case 494:
-#line 2045 "./sparql_p.y"
+ case 575:
+#line 2496 "./sparql_p.y"
{ (yyval.trees) = NULL; }
break;
- case 495:
-#line 2046 "./sparql_p.y"
+ case 576:
+#line 2497 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
- case 496:
-#line 2050 "./sparql_p.y"
+ case 577:
+#line 2501 "./sparql_p.y"
{ (yyval.trees) = NULL; }
break;
- case 497:
-#line 2051 "./sparql_p.y"
+ case 578:
+#line 2502 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
- case 498:
-#line 2055 "./sparql_p.y"
+ case 579:
+#line 2506 "./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 499:
-#line 2059 "./sparql_p.y"
+ case 580:
+#line 2510 "./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 500:
-#line 2066 "./sparql_p.y"
+ case 581:
+#line 2517 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ((yyvsp[(1) - (1)].box)), NULL); }
break;
- case 501:
-#line 2067 "./sparql_p.y"
+ case 582:
+#line 2518 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ((yyvsp[(1) - (2)].box)), (yyvsp[(2) - (2)].box)); }
break;
- case 502:
-#line 2071 "./sparql_p.y"
+ case 583:
+#line 2522 "./sparql_p.y"
{}
break;
- case 503:
-#line 2072 "./sparql_p.y"
+ case 584:
+#line 2523 "./sparql_p.y"
{}
break;
- case 504:
-#line 2073 "./sparql_p.y"
+ case 585:
+#line 2524 "./sparql_p.y"
{}
break;
- case 505:
-#line 2077 "./sparql_p.y"
+ case 586:
+#line 2528 "./sparql_p.y"
{}
break;
- case 506:
-#line 2078 "./sparql_p.y"
+ case 587:
+#line 2529 "./sparql_p.y"
{
spar_qm_clean_locals (sparp_arg);
sparp_env()->spare_qm_default_table = NULL; }
break;
- case 507:
-#line 2081 "./sparql_p.y"
+ case 588:
+#line 2532 "./sparql_p.y"
{}
break;
- case 509:
-#line 2086 "./sparql_p.y"
+ case 590:
+#line 2537 "./sparql_p.y"
+ {
+ t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
+ break;
+
+ case 591:
+#line 2539 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
break;
- case 510:
-#line 2088 "./sparql_p.y"
+ case 592:
+#line 2541 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
break;
- case 511:
-#line 2093 "./sparql_p.y"
+ case 593:
+#line 2543 "./sparql_p.y"
+ {
+ t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
+ break;
+
+ case 594:
+#line 2548 "./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); }
+ break;
+
+ case 595:
+#line 2557 "./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); }
+ break;
+
+ case 596:
+#line 2563 "./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); }
+ break;
+
+ case 597:
+#line 2572 "./sparql_p.y"
{}
break;
- case 512:
-#line 2094 "./sparql_p.y"
+ case 598:
+#line 2573 "./sparql_p.y"
{}
break;
- case 513:
-#line 2095 "./sparql_p.y"
+ case 599:
+#line 2574 "./sparql_p.y"
{}
break;
- case 515:
-#line 2100 "./sparql_p.y"
+ case 601:
+#line 2579 "./sparql_p.y"
{
spar_qm_clean_locals (sparp_arg);
sparp_env()->spare_qm_default_table = NULL; }
break;
- case 517:
-#line 2108 "./sparql_p.y"
+ case 603:
+#line 2587 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, CREATE_L, (SPART *)((yyvsp[(2) - (3)].box)), 1); }
break;
- case 518:
-#line 2109 "./sparql_p.y"
+ case 604:
+#line 2588 "./sparql_p.y"
{;}
break;
- case 519:
-#line 2111 "./sparql_p.y"
+ case 605:
+#line 2590 "./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)),
- (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))) ) ); }
+ t_spartlist_concat ((yyvsp[(6) - (6)].trees), (SPART **)t_list (2, t_box_dv_uname_string ("ID"), (yyvsp[(2) - (6)].box))) ) ); }
break;
- case 520:
-#line 2118 "./sparql_p.y"
+ case 606:
+#line 2597 "./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)),
- (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))) ) ); }
+ t_spartlist_concat ((yyvsp[(7) - (7)].trees), (SPART **)t_list (2, t_box_dv_uname_string ("GRAPH"), (yyvsp[(3) - (7)].box))) ) ); }
break;
- case 521:
-#line 2125 "./sparql_p.y"
+ case 607:
+#line 2604 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_qm_make_empty_mapping (sparp_arg, NULL, (yyvsp[(2) - (3)].trees)) );
@@ -6263,19 +6891,19 @@ yyreduce:
spar_qm_push_bookmark (sparp_arg); }
break;
- case 522:
-#line 2132 "./sparql_p.y"
+ case 608:
+#line 2611 "./sparql_p.y"
{
spar_qm_pop_bookmark (sparp_arg); }
break;
- case 524:
-#line 2138 "./sparql_p.y"
+ case 610:
+#line 2617 "./sparql_p.y"
{;}
break;
- case 525:
-#line 2140 "./sparql_p.y"
+ case 611:
+#line 2619 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_qm_make_empty_mapping (sparp_arg,
@@ -6287,14 +6915,14 @@ yyreduce:
spar_qm_push_bookmark (sparp_arg); }
break;
- case 526:
-#line 2149 "./sparql_p.y"
+ case 612:
+#line 2628 "./sparql_p.y"
{
spar_qm_pop_bookmark (sparp_arg); }
break;
- case 527:
-#line 2154 "./sparql_p.y"
+ case 613:
+#line 2633 "./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)),
@@ -6308,484 +6936,444 @@ yyreduce:
(yyvsp[(3) - (3)].trees) ) ); }
break;
- case 528:
-#line 2168 "./sparql_p.y"
+ case 614:
+#line 2647 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, SUBJECT_L, (yyvsp[(1) - (1)].tree), 0); }
break;
- case 529:
-#line 2169 "./sparql_p.y"
+ case 615:
+#line 2648 "./sparql_p.y"
{}
break;
- case 532:
-#line 2178 "./sparql_p.y"
+ case 618:
+#line 2657 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, GRAPH_L, (yyvsp[(2) - (2)].tree), 0); }
break;
- case 533:
-#line 2179 "./sparql_p.y"
+ case 619:
+#line 2658 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, SUBJECT_L, (yyvsp[(2) - (2)].tree), 0); }
break;
- case 534:
-#line 2180 "./sparql_p.y"
+ case 620:
+#line 2659 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, PREDICATE_L, (yyvsp[(2) - (2)].tree), 0); }
break;
- case 535:
-#line 2181 "./sparql_p.y"
+ case 621:
+#line 2660 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, OBJECT_L, (yyvsp[(2) - (2)].tree), 0); }
break;
- case 536:
-#line 2182 "./sparql_p.y"
+ case 622:
+#line 2661 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, DATATYPE_L, (SPART *)((yyvsp[(4) - (4)].tree)), 0); }
break;
- case 537:
-#line 2184 "./sparql_p.y"
+ case 623:
+#line 2663 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, LANG_L, (SPART *)((yyvsp[(6) - (6)].tree)), 0); }
break;
- case 538:
-#line 2190 "./sparql_p.y"
+ case 624:
+#line 2669 "./sparql_p.y"
{}
break;
- case 539:
-#line 2191 "./sparql_p.y"
+ case 625:
+#line 2670 "./sparql_p.y"
{
spar_qm_pop_key (sparp_arg, PREDICATE_L); }
break;
- case 541:
-#line 2197 "./sparql_p.y"
+ case 627:
+#line 2676 "./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 542:
-#line 2201 "./sparql_p.y"
+ case 628:
+#line 2680 "./sparql_p.y"
{}
break;
- case 543:
-#line 2202 "./sparql_p.y"
- { sparyyerror ("Description of predicate field is expected here"); }
+ case 629:
+#line 2681 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Description of predicate field is expected here"); }
break;
- case 544:
-#line 2206 "./sparql_p.y"
+ case 630:
+#line 2685 "./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 545:
-#line 2209 "./sparql_p.y"
+ case 631:
+#line 2688 "./sparql_p.y"
{
spar_qm_pop_key (sparp_arg, OBJECT_L); }
break;
- case 546:
-#line 2211 "./sparql_p.y"
+ case 632:
+#line 2690 "./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 547:
-#line 2217 "./sparql_p.y"
+ case 633:
+#line 2696 "./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 548:
-#line 2221 "./sparql_p.y"
+ case 634:
+#line 2700 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, DATATYPE_L, (SPART *)((yyvsp[(3) - (3)].tree)), 0); }
break;
- case 549:
-#line 2223 "./sparql_p.y"
+ case 635:
+#line 2702 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, LANG_L, (SPART *)((yyvsp[(5) - (5)].tree)), 0); }
break;
- case 550:
-#line 2225 "./sparql_p.y"
+ case 636:
+#line 2704 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, WHERE_L, (SPART *)t_revlist_to_array ((yyvsp[(7) - (7)].backstack)), 0); }
break;
- case 551:
-#line 2227 "./sparql_p.y"
+ case 637:
+#line 2706 "./sparql_p.y"
{ (yyval.trees) = (yyvsp[(9) - (9)].trees); }
break;
- case 552:
-#line 2228 "./sparql_p.y"
- { sparyyerror ("Description of object field is expected here"); }
+ case 638:
+#line 2707 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Description of object field is expected here"); }
break;
- case 553:
-#line 2232 "./sparql_p.y"
+ case 639:
+#line 2711 "./sparql_p.y"
{ (yyval.box) = NULL; }
break;
- case 554:
-#line 2233 "./sparql_p.y"
+ case 640:
+#line 2712 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 555:
-#line 2237 "./sparql_p.y"
+ case 641:
+#line 2716 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 556:
-#line 2238 "./sparql_p.y"
+ case 642:
+#line 2717 "./sparql_p.y"
{ (yyval.tree) = (SPART *)(yyvsp[(2) - (2)].tree)->_.lit.val; }
break;
- case 557:
-#line 2239 "./sparql_p.y"
- { sparyyerror ("Datatype of object field should be either constant IRI or table field, not template IRI (string)"); }
+ case 643:
+#line 2718 "./sparql_p.y"
+ { sparyyerror (sparp_arg, "Datatype of object field should be either constant IRI or table field, not template IRI (string)"); }
break;
- case 558:
-#line 2240 "./sparql_p.y"
+ case 644:
+#line 2719 "./sparql_p.y"
{ (yyval.tree) = spar_make_qm_col_desc (sparp_arg, (yyvsp[(2) - (2)].tree)); }
break;
- case 559:
-#line 2244 "./sparql_p.y"
+ case 645:
+#line 2723 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 560:
-#line 2245 "./sparql_p.y"
+ case 646:
+#line 2724 "./sparql_p.y"
{ (yyval.tree) = (SPART *)(yyvsp[(2) - (2)].box); }
break;
- case 561:
-#line 2246 "./sparql_p.y"
+ case 647:
+#line 2725 "./sparql_p.y"
{ (yyval.tree) = spar_make_qm_col_desc (sparp_arg, (yyvsp[(2) - (2)].tree)); }
break;
- case 562:
-#line 2250 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 563:
-#line 2251 "./sparql_p.y"
+ case 649:
+#line 2730 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 564:
-#line 2252 "./sparql_p.y"
+ case 650:
+#line 2731 "./sparql_p.y"
{ (yyval.tree) = (SPART *)uname_rdf_ns_uri_type; }
break;
- case 565:
-#line 2256 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
- break;
-
- case 566:
-#line 2257 "./sparql_p.y"
+ case 652:
+#line 2736 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 567:
-#line 2261 "./sparql_p.y"
+ case 653:
+#line 2740 "./sparql_p.y"
{ (yyval.tree) = (SPART *)(yyvsp[(1) - (1)].box); }
break;
- 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;
-
- case 570:
-#line 2265 "./sparql_p.y"
+ case 656:
+#line 2744 "./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 571:
-#line 2267 "./sparql_p.y"
+ case 657:
+#line 2746 "./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 572:
-#line 2272 "./sparql_p.y"
+ case 658:
+#line 2751 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 573:
-#line 2273 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
- break;
-
- case 574:
-#line 2277 "./sparql_p.y"
+ case 660:
+#line 2756 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].box)); }
break;
- case 575:
-#line 2278 "./sparql_p.y"
+ case 661:
+#line 2757 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].box)); }
break;
- case 576:
-#line 2282 "./sparql_p.y"
+ case 662:
+#line 2761 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(3) - (3)].box); }
break;
- case 577:
-#line 2283 "./sparql_p.y"
+ case 663:
+#line 2762 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 578:
-#line 2287 "./sparql_p.y"
+ case 664:
+#line 2766 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 579:
-#line 2288 "./sparql_p.y"
+ case 665:
+#line 2767 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 580:
-#line 2292 "./sparql_p.y"
+ case 666:
+#line 2771 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (0); }
break;
- case 581:
-#line 2293 "./sparql_p.y"
+ case 667:
+#line 2772 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (0); }
break;
- case 582:
-#line 2294 "./sparql_p.y"
+ case 668:
+#line 2773 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
- case 583:
-#line 2298 "./sparql_p.y"
+ case 669:
+#line 2777 "./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 584:
-#line 2302 "./sparql_p.y"
+ case 670:
+#line 2781 "./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 585:
-#line 2309 "./sparql_p.y"
+ case 671:
+#line 2788 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("SOFT_EXCLUSIVE"), (ptrlong)1); }
break;
- case 586:
-#line 2310 "./sparql_p.y"
+ case 672:
+#line 2789 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("EXCLUSIVE"), (ptrlong)1); }
break;
- case 587:
-#line 2311 "./sparql_p.y"
+ case 673:
+#line 2790 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("ORDER"), (yyvsp[(2) - (2)].box)); }
break;
- case 588:
-#line 2312 "./sparql_p.y"
+ case 674:
+#line 2791 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("USING"), (yyvsp[(2) - (2)].box)); }
break;
- case 589:
-#line 2316 "./sparql_p.y"
+ case 675:
+#line 2795 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 590:
-#line 2317 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
- break;
-
- case 591:
-#line 2321 "./sparql_p.y"
+ case 677:
+#line 2800 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 592:
-#line 2322 "./sparql_p.y"
+ case 678:
+#line 2801 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 593:
-#line 2326 "./sparql_p.y"
+ case 679:
+#line 2805 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 594:
-#line 2327 "./sparql_p.y"
+ case 680:
+#line 2806 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 595:
-#line 2331 "./sparql_p.y"
+ case 681:
+#line 2810 "./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 596:
-#line 2337 "./sparql_p.y"
+ case 682:
+#line 2816 "./sparql_p.y"
{ (yyval.tree) = spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ((yyvsp[(2) - (3)].backstack))); }
break;
- case 597:
-#line 2341 "./sparql_p.y"
+ case 683:
+#line 2820 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 598:
-#line 2342 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
- break;
-
- case 599:
-#line 2346 "./sparql_p.y"
+ case 685:
+#line 2825 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 600:
-#line 2347 "./sparql_p.y"
+ case 686:
+#line 2826 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 601:
-#line 2351 "./sparql_p.y"
+ case 687:
+#line 2830 "./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 602:
-#line 2357 "./sparql_p.y"
+ case 688:
+#line 2836 "./sparql_p.y"
{ (yyval.boxes) = t_list (2, (yyvsp[(1) - (1)].box), (ptrlong)0); }
break;
- case 603:
-#line 2358 "./sparql_p.y"
+ case 689:
+#line 2837 "./sparql_p.y"
{ (yyval.boxes) = t_list (2, (yyvsp[(1) - (3)].box), (ptrlong)1); }
break;
- case 604:
-#line 2362 "./sparql_p.y"
+ case 690:
+#line 2841 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("in"); }
break;
- case 605:
-#line 2363 "./sparql_p.y"
+ case 691:
+#line 2842 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ((yyvsp[(1) - (1)].box)); }
break;
- case 606:
-#line 2367 "./sparql_p.y"
+ case 692:
+#line 2846 "./sparql_p.y"
{ (yyval.tree) = sparp_make_qm_sqlcol (sparp_arg, SPARQL_PLAIN_ID, (yyvsp[(1) - (1)].box)); }
break;
- case 607:
-#line 2368 "./sparql_p.y"
+ case 693:
+#line 2847 "./sparql_p.y"
{ (yyval.tree) = sparp_make_qm_sqlcol (sparp_arg, SPARQL_SQL_ALIASCOLNAME, (yyvsp[(1) - (1)].box)); }
break;
- case 608:
-#line 2369 "./sparql_p.y"
+ case 694:
+#line 2848 "./sparql_p.y"
{ (yyval.tree) = sparp_make_qm_sqlcol (sparp_arg, SPARQL_SQL_QTABLECOLNAME, (yyvsp[(1) - (1)].box)); }
break;
- case 609:
-#line 2373 "./sparql_p.y"
- { (yyval.box) = (yyvsp[(1) - (1)].box); }
- break;
-
- case 610:
-#line 2374 "./sparql_p.y"
- { (yyval.box) = (yyvsp[(1) - (1)].box); }
+ case 696:
+#line 2853 "./sparql_p.y"
+ { (yyval.box) = t_box_dv_short_string ("TEXT"); }
break;
- case 611:
-#line 2375 "./sparql_p.y"
- { (yyval.box) = (yyvsp[(1) - (1)].box); }
+ case 697:
+#line 2854 "./sparql_p.y"
+ { (yyval.box) = t_box_dv_short_string ("XML"); }
break;
- case 612:
-#line 2380 "./sparql_p.y"
+ case 698:
+#line 2859 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(1) - (1)].tree)->_.lit.val; }
break;
- case 613:
-#line 2381 "./sparql_p.y"
+ case 699:
+#line 2860 "./sparql_p.y"
{
(yyval.box) = spar_make_iri_from_template (sparp_arg, (yyvsp[(3) - (4)].box)); }
break;
- case 614:
-#line 2386 "./sparql_p.y"
+ case 700:
+#line 2865 "./sparql_p.y"
{}
break;
- case 615:
-#line 2387 "./sparql_p.y"
+ case 701:
+#line 2866 "./sparql_p.y"
{}
break;
- case 616:
-#line 2391 "./sparql_p.y"
+ case 702:
+#line 2870 "./sparql_p.y"
{}
break;
- case 617:
-#line 2392 "./sparql_p.y"
+ case 703:
+#line 2871 "./sparql_p.y"
{}
break;
- case 618:
-#line 2396 "./sparql_p.y"
+ case 704:
+#line 2875 "./sparql_p.y"
{}
break;
- case 619:
-#line 2397 "./sparql_p.y"
+ case 705:
+#line 2876 "./sparql_p.y"
{}
break;
/* Line 1267 of yacc.c. */
-#line 6789 "sparql_p.c"
+#line 7377 "sparql_p.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -6821,7 +7409,7 @@ yyerrlab:
{
++yynerrs;
#if ! YYERROR_VERBOSE
- yyerror (YY_("syntax error"));
+ yyerror (sparp_arg, YY_("syntax error"));
#else
{
YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
@@ -6845,11 +7433,11 @@ yyerrlab:
if (0 < yysize && yysize <= yymsg_alloc)
{
(void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
+ yyerror (sparp_arg, yymsg);
}
else
{
- yyerror (YY_("syntax error"));
+ yyerror (sparp_arg, YY_("syntax error"));
if (yysize != 0)
goto yyexhaustedlab;
}
@@ -6873,7 +7461,7 @@ yyerrlab:
else
{
yydestruct ("Error: discarding",
- yytoken, &yylval);
+ yytoken, &yylval, sparp_arg);
yychar = YYEMPTY;
}
}
@@ -6929,7 +7517,7 @@ yyerrlab1:
yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
+ yystos[yystate], yyvsp, sparp_arg);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -6967,7 +7555,7 @@ yyabortlab:
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
yyexhaustedlab:
- yyerror (YY_("memory exhausted"));
+ yyerror (sparp_arg, YY_("memory exhausted"));
yyresult = 2;
/* Fall through. */
#endif
@@ -6975,7 +7563,7 @@ yyexhaustedlab:
yyreturn:
if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
+ yytoken, &yylval, sparp_arg);
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -6983,7 +7571,7 @@ yyreturn:
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[*yyssp], yyvsp, sparp_arg);
YYPOPSTACK (1);
}
#ifndef yyoverflow
diff --git a/libsrc/Wi/sparql_p.h b/libsrc/Wi/sparql_p.h
index 4c909ec..10019ec 100644
--- a/libsrc/Wi/sparql_p.h
+++ b/libsrc/Wi/sparql_p.h
@@ -67,159 +67,161 @@
_STAR = 283,
_STAR_GT = 284,
a_L = 285,
- 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,
- LANGMATCHES_L = 337,
- LIKE_L = 338,
- LIMIT_L = 339,
- LITERAL_L = 340,
- 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,
- SERVICE_L = 375,
- SILENT_L = 376,
- SOFT_L = 377,
- SQLQUERY_L = 378,
- STORAGE_L = 379,
- 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,
- T_END_FLAG_L = 388,
- T_EXISTS_L = 389,
- T_FINAL_AS_L = 390,
- T_IN_L = 391,
- T_MAX_L = 392,
- T_MIN_L = 393,
- T_OUT_L = 394,
- T_NO_CYCLES_L = 395,
- T_NO_ORDER_L = 396,
- T_SHORTEST_ONLY_L = 397,
- T_STEP_L = 398,
- 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
+ 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,
+ INF_L = 331,
+ INDEX_L = 332,
+ INFERENCE_L = 333,
+ INSERT_L = 334,
+ INTO_L = 335,
+ IRI_L = 336,
+ LANG_L = 337,
+ LIBRARY_L = 338,
+ LIKE_L = 339,
+ LIMIT_L = 340,
+ LITERAL_L = 341,
+ LOCAL_L = 342,
+ LOAD_L = 343,
+ MACRO_L = 344,
+ MAKE_L = 345,
+ MAP_L = 346,
+ MAX_L = 347,
+ MIN_L = 348,
+ MINUS_L = 349,
+ MODIFY_L = 350,
+ MOVE_L = 351,
+ NAMED_L = 352,
+ NAN_L = 353,
+ NIL_L = 354,
+ NOT_L = 355,
+ NULL_L = 356,
+ OBJECT_L = 357,
+ OF_L = 358,
+ OFFBAND_L = 359,
+ OFFSET_L = 360,
+ OPTIONAL_L = 361,
+ OPTION_L = 362,
+ ORDER_L = 363,
+ PREDICATE_L = 364,
+ PREFIX_L = 365,
+ QUAD_L = 366,
+ REDUCED_L = 367,
+ RETURNS_L = 368,
+ SAME_AS_L = 369,
+ SAME_AS_O_L = 370,
+ SAME_AS_P_L = 371,
+ SAME_AS_S_L = 372,
+ SAME_AS_S_O_L = 373,
+ SCORE_L = 374,
+ SCORE_LIMIT_L = 375,
+ SELECT_L = 376,
+ SERVICE_L = 377,
+ SILENT_L = 378,
+ SOFT_L = 379,
+ SQLQUERY_L = 380,
+ STORAGE_L = 381,
+ SUBCLASS_L = 382,
+ SUBJECT_L = 383,
+ SUM_L = 384,
+ TABLE_OPTION_L = 385,
+ TEXT_L = 386,
+ T_CYCLES_ONLY_L = 387,
+ T_DIRECTION_L = 388,
+ T_DISTINCT_L = 389,
+ T_END_FLAG_L = 390,
+ T_EXISTS_L = 391,
+ T_FINAL_AS_L = 392,
+ T_IN_L = 393,
+ T_MAX_L = 394,
+ T_MIN_L = 395,
+ T_OUT_L = 396,
+ T_NO_CYCLES_L = 397,
+ T_NO_ORDER_L = 398,
+ T_SHORTEST_ONLY_L = 399,
+ T_STEP_L = 400,
+ TO_L = 401,
+ TRANSITIVE_L = 402,
+ true_L = 403,
+ UNBOUND_L = 404,
+ UNDEF_L = 405,
+ UNION_L = 406,
+ USING_L = 407,
+ WHERE_L = 408,
+ WITH_L = 409,
+ XML_L = 410,
+ __SPAR_PUNCT_END = 411,
+ START_OF_SPARQL_TEXT = 412,
+ END_OF_SPARQL_TEXT = 413,
+ SPARUL_RUN_SUBTYPE = 414,
+ SPARUL_INSERT_DATA = 415,
+ SPARUL_DELETE_DATA = 416,
+ __SPAR_NONPUNCT_START = 417,
+ SPARQL_BIF = 418,
+ SPARQL_INTEGER = 419,
+ SPARQL_DECIMAL = 420,
+ SPARQL_DOUBLE = 421,
+ SPARQL_STRING = 422,
+ SPARQL_SQLTEXT = 423,
+ LANGTAG = 424,
+ QNAME = 425,
+ QNAME_NS = 426,
+ BLANK_NODE_LABEL = 427,
+ Q_IRI_REF = 428,
+ QD_VARNAME = 429,
+ QD_COLON_PARAMNAME = 430,
+ QD_COLON_PARAMNUM = 431,
+ SPARQL_PLAIN_ID = 432,
+ SPARQL_SQL_ALIASCOLNAME = 433,
+ SPARQL_SQL_QTABLENAME = 434,
+ SPARQL_SQL_QTABLECOLNAME = 435,
+ __SPAR_NONPUNCT_END = 436,
+ PRECODE_EXPN_PREC = 437,
+ _COLON = 438,
+ UMINUS = 439,
+ UPLUS = 440
};
#endif
/* Tokens. */
@@ -251,166 +253,168 @@
#define _STAR 283
#define _STAR_GT 284
#define a_L 285
-#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 LANGMATCHES_L 337
-#define LIKE_L 338
-#define LIMIT_L 339
-#define LITERAL_L 340
-#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
-#define SERVICE_L 375
-#define SILENT_L 376
-#define SOFT_L 377
-#define SQLQUERY_L 378
-#define STORAGE_L 379
-#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
-#define T_END_FLAG_L 388
-#define T_EXISTS_L 389
-#define T_FINAL_AS_L 390
-#define T_IN_L 391
-#define T_MAX_L 392
-#define T_MIN_L 393
-#define T_OUT_L 394
-#define T_NO_CYCLES_L 395
-#define T_NO_ORDER_L 396
-#define T_SHORTEST_ONLY_L 397
-#define T_STEP_L 398
-#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
+#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 INF_L 331
+#define INDEX_L 332
+#define INFERENCE_L 333
+#define INSERT_L 334
+#define INTO_L 335
+#define IRI_L 336
+#define LANG_L 337
+#define LIBRARY_L 338
+#define LIKE_L 339
+#define LIMIT_L 340
+#define LITERAL_L 341
+#define LOCAL_L 342
+#define LOAD_L 343
+#define MACRO_L 344
+#define MAKE_L 345
+#define MAP_L 346
+#define MAX_L 347
+#define MIN_L 348
+#define MINUS_L 349
+#define MODIFY_L 350
+#define MOVE_L 351
+#define NAMED_L 352
+#define NAN_L 353
+#define NIL_L 354
+#define NOT_L 355
+#define NULL_L 356
+#define OBJECT_L 357
+#define OF_L 358
+#define OFFBAND_L 359
+#define OFFSET_L 360
+#define OPTIONAL_L 361
+#define OPTION_L 362
+#define ORDER_L 363
+#define PREDICATE_L 364
+#define PREFIX_L 365
+#define QUAD_L 366
+#define REDUCED_L 367
+#define RETURNS_L 368
+#define SAME_AS_L 369
+#define SAME_AS_O_L 370
+#define SAME_AS_P_L 371
+#define SAME_AS_S_L 372
+#define SAME_AS_S_O_L 373
+#define SCORE_L 374
+#define SCORE_LIMIT_L 375
+#define SELECT_L 376
+#define SERVICE_L 377
+#define SILENT_L 378
+#define SOFT_L 379
+#define SQLQUERY_L 380
+#define STORAGE_L 381
+#define SUBCLASS_L 382
+#define SUBJECT_L 383
+#define SUM_L 384
+#define TABLE_OPTION_L 385
+#define TEXT_L 386
+#define T_CYCLES_ONLY_L 387
+#define T_DIRECTION_L 388
+#define T_DISTINCT_L 389
+#define T_END_FLAG_L 390
+#define T_EXISTS_L 391
+#define T_FINAL_AS_L 392
+#define T_IN_L 393
+#define T_MAX_L 394
+#define T_MIN_L 395
+#define T_OUT_L 396
+#define T_NO_CYCLES_L 397
+#define T_NO_ORDER_L 398
+#define T_SHORTEST_ONLY_L 399
+#define T_STEP_L 400
+#define TO_L 401
+#define TRANSITIVE_L 402
+#define true_L 403
+#define UNBOUND_L 404
+#define UNDEF_L 405
+#define UNION_L 406
+#define USING_L 407
+#define WHERE_L 408
+#define WITH_L 409
+#define XML_L 410
+#define __SPAR_PUNCT_END 411
+#define START_OF_SPARQL_TEXT 412
+#define END_OF_SPARQL_TEXT 413
+#define SPARUL_RUN_SUBTYPE 414
+#define SPARUL_INSERT_DATA 415
+#define SPARUL_DELETE_DATA 416
+#define __SPAR_NONPUNCT_START 417
+#define SPARQL_BIF 418
+#define SPARQL_INTEGER 419
+#define SPARQL_DECIMAL 420
+#define SPARQL_DOUBLE 421
+#define SPARQL_STRING 422
+#define SPARQL_SQLTEXT 423
+#define LANGTAG 424
+#define QNAME 425
+#define QNAME_NS 426
+#define BLANK_NODE_LABEL 427
+#define Q_IRI_REF 428
+#define QD_VARNAME 429
+#define QD_COLON_PARAMNAME 430
+#define QD_COLON_PARAMNUM 431
+#define SPARQL_PLAIN_ID 432
+#define SPARQL_SQL_ALIASCOLNAME 433
+#define SPARQL_SQL_QTABLENAME 434
+#define SPARQL_SQL_QTABLECOLNAME 435
+#define __SPAR_NONPUNCT_END 436
+#define PRECODE_EXPN_PREC 437
+#define _COLON 438
+#define UMINUS 439
+#define UPLUS 440
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 97 "./sparql_p.y"
+#line 96 "./sparql_p.y"
{
caddr_t box;
caddr_t *boxes;
@@ -422,8 +426,8 @@ typedef union YYSTYPE
spar_lexbmk_t *bookmark;
void *nothing;
}
-/* Line 1489 of yacc.c. */
-#line 427 "sparql_p.h"
+/* Line 1529 of yacc.c. */
+#line 431 "sparql_p.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
diff --git a/libsrc/Wi/sparql_p.y b/libsrc/Wi/sparql_p.y
index ae3a34c..9a515c5 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.29 2011/07/19 23:27:51 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -37,11 +37,11 @@ One tab before end of single-line BNF comment.
Whitespaces in all other places, including two whitespaces after "::=" in BNF comments */
%pure_parser
+%parse-param {sparp_t * sparp_arg}
+%lex-param {sparp_t * sparp_arg}
+%expect 7
%{
-
-#define YYPARSE_PARAM sparp_as_void
-#define YYLEX_PARAM YYPARSE_PARAM
#include "libutil.h"
#include "sqlnode.h"
#include "sqlparext.h"
@@ -50,12 +50,11 @@ Whitespaces in all other places, including two whitespaces after "::=" in BNF co
#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))
+#define sparyyerror(sparp_arg, strg) sparyyerror_impl_1(sparp_arg, NULL, yystate, yyssa, yyssp, (strg))
#else
-#define sparyyerror(strg) sparyyerror_impl(sparp_arg, NULL, (strg))
+#define sparyyerror(sparp_arg, strg) sparyyerror_impl(sparp_arg, NULL, (strg))
#endif
#ifdef XPYYDEBUG
@@ -136,10 +135,13 @@ 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") ::*/
@@ -149,18 +151,21 @@ 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") ::*/
@@ -173,35 +178,33 @@ 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 INF_L /*:: PUNCT_SPAR_LAST("INF") ::*/
%token INDEX_L /*:: PUNCT_SPAR_LAST("INDEX") ::*/
%token INFERENCE_L /*:: PUNCT_SPAR_LAST("INFERENCE") ::*/
%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 LANGMATCHES_L /*:: PUNCT_SPAR_LAST("LANGMATCHES") ::*/
+%token LIBRARY_L /*:: PUNCT_SPAR_LAST("LIBRARY") ::*/
%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 NAN_L /*:: PUNCT_SPAR_LAST("NAN") ::*/
%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") ::*/
@@ -213,7 +216,6 @@ 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") ::*/
@@ -221,7 +223,6 @@ 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") ::*/
@@ -230,11 +231,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") ::*/
@@ -249,13 +250,16 @@ 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") ::*/
+%token UNDEF_L /*:: PUNCT_SPAR_LAST("UNDEF") ::*/
%token UNION_L /*:: PUNCT_SPAR_LAST("UNION") ::*/
%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 ::*/
@@ -266,8 +270,9 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token __SPAR_NONPUNCT_START /* Delimiting value for syntax highlighting */
-%token <box> TEXT_BL /*:: PUNCT_SPAR_LAST("TEXT") ::*/
-%token <box> XML_BL /*:: PUNCT_SPAR_LAST("XML") ::*/
+/* 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> SPARQL_INTEGER /*:: LITERAL("%d"), SPAR, LAST("1234") ::*/
%token <box> SPARQL_DECIMAL /*:: LITERAL("%d"), SPAR, LAST("1234.56") ::*/
@@ -282,12 +287,9 @@ 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> 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> 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> SPARQL_PLAIN_ID /*:: LITERAL("%s"), SPAR, LAST("q"), LAST("a1"), LAST("_ABYZabyz0189") ::*/
%token <box> SPARQL_SQL_ALIASCOLNAME /*:: LITERAL("%s"), SPAR, LAST("ALIAS.COL") ::*/
@@ -307,6 +309,16 @@ 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
@@ -318,28 +330,20 @@ 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
%type <tree> spar_precode_expn
+%type <nothing> spar_where_clause_opt
%type <nothing> spar_where_clause
-%type <nothing> spar_wherebindings_clause_opt
-%type <nothing> spar_wherebindings_clause
-%type <tree> spar_bindings_clause_opt
-%type <tree> spar_bindings_clause
-%type <backstack> spar_bindings_vars
-%type <box> spar_bindings_var
-%type <backstack> spar_bindings_opt
-%type <backstack> spar_bindings
-%type <trees> spar_binding
-%type <backstack> spar_bindvals
-%type <tree> spar_bindval
%type <tree> spar_solution_modifier
-%type <backstack> spar_group_clause_opt
+%type <trees> spar_group_clause_opt
%type <backstack> spar_group_expns
%type <tree> spar_group_expn
%type <tree> spar_having_clause_opt
-%type <backstack> spar_order_clause_opt
+%type <trees> spar_order_clause_opt
%type <backstack> spar_order_conditions
%type <tree> spar_order_condition
%type <token_type> spar_asc_or_desc_opt
@@ -347,6 +351,15 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <tree> spar_limit_clause
%type <tree> spar_offset_clause_opt
%type <tree> spar_offset_clause
+%type <tree> spar_bindings_clause_opt
+%type <tree> spar_bindings_clause
+%type <backstack> spar_bindings_vars
+%type <box> spar_bindings_var
+%type <backstack> spar_bindings_opt
+%type <backstack> spar_bindings
+%type <trees> spar_binding
+%type <backstack> spar_bindvals
+%type <tree> spar_bindval
%type <tree> spar_group_gp
%type <nothing> spar_gp
%type <nothing> spar_gp_not_triples
@@ -362,9 +375,11 @@ 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
-%type <nothing> spar_triples_opt
+%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_triples
+%type <nothing> spar_quads1
%type <nothing> spar_triples1
%type <nothing> spar_props_opt
%type <nothing> spar_props
@@ -394,13 +409,17 @@ 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
@@ -411,8 +430,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_actions
-%type <tree> spar_sparul_action
+%type <backstack> spar_sparul_action_or_drop_macro_libs
+%type <tree> spar_sparul_action_or_drop_macro_lib
%type <tree> spar_sparul_insert
%type <tree> spar_sparul_insertdata
%type <tree> spar_sparul_delete
@@ -420,11 +439,22 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <tree> spar_sparul_modify
%type <tree> spar_sparul_clear
%type <tree> spar_sparul_load
+%type <tree> spar_sparul_load_service_data
%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_opt
-%type <tree> spar_from_graph_precode_opt
+%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_graph_precode_opt
%type <nothing> spar_in_or_into
%type <token_type> spar_silent_opt
@@ -445,6 +475,8 @@ 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
@@ -499,6 +531,7 @@ 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
@@ -516,23 +549,25 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%%
/* TOP-LEVEL begin */
-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 {
+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 {
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) ); }
| START_OF_SPARQL_TEXT spar_prolog spar_qm_stmts spar_opt_dot_and_end {
$$ = spar_make_topmost_qm_sql (sparp_arg);
sparp_arg->sparp_expr = $$; }
- | error { sparyyerror ("(internal SPARQL processing error) SPARQL mark expected"); }
+ | error { sparyyerror (sparp_arg, "(internal SPARQL processing error) SPARQL mark expected"); }
;
/* PART 1. Standard SPARQL as described by W3C, with Virtuoso extensions for expressions. */
@@ -544,8 +579,9 @@ spar_query_body /* [1] QueryBody ::= SelectQuery | ConstructQuery | DescribeQ
| spar_ask_query
;
-spar_prolog /* [2]* Prolog ::= Define* BaseDecl? PrefixDecl* */
- : spar_defines_opt spar_base_decl_opt spar_prefix_decls_opt
+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_defines_opt /* ::= Define* */
@@ -569,20 +605,20 @@ spar_define_val_commalist
;
spar_define_val /* [Virt] DefValue := QNAME | Q_IRI_REF | String */
- : 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); }
+ : 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); }
;
spar_base_decl_opt /* [3] BaseDecl ::= 'BASE' Q_IRI_REF */
: /* empty */ { ; }
| BASE_L Q_IRI_REF {
if (NULL != sparp_env()->spare_base_uri)
- sparyyerror ("Only one base declaration is allowed");
+ sparyyerror (sparp_arg, "Only one base declaration is allowed");
sparp_env()->spare_base_uri = $2; }
- | BASE_L error { sparyyerror ("Missing <iri-string> after BASE keyword"); }
+ | BASE_L error { sparyyerror (sparp_arg, "Missing <iri-string> after BASE keyword"); }
;
spar_prefix_decls_opt /* ::= PrefixDecl* */
@@ -593,13 +629,154 @@ spar_prefix_decls_opt /* ::= PrefixDecl* */
spar_prefix_decl /* [4] PrefixDecl ::= 'PREFIX' QNAME_NS Q_IRI_REF */
: PREFIX_L QNAME_NS Q_IRI_REF {
if ((!strcmp ("sql:", $2) && strcmp ("sql:", $3)) || (!strcmp ("bif:", $2) && strcmp ("bif:", $3)))
- sparyyerror ("Prefixes 'sql:' and 'bif:' are reserved for SQL names");
+ sparyyerror (sparp_arg, "Prefixes 'sql:' and 'bif:' are reserved for SQL names");
t_set_push (&(sparp_env()->spare_namespace_prefixes), sparp_expand_q_iri_ref (sparp_arg, $3));
t_set_push (&(sparp_env()->spare_namespace_prefixes), t_box_dv_short_nchars ($2, box_length ($2)-2)); }
- | PREFIX_L QNAME_NS { sparyyerror ("Missing <namespace-iri-string> in PREFIX declaration"); }
- | PREFIX_L error { sparyyerror ("Missing namespace prefix after PREFIX keyword"); }
+ | PREFIX_L QNAME_NS { sparyyerror (sparp_arg, "Missing <namespace-iri-string> in PREFIX declaration"); }
+ | PREFIX_L error { sparyyerror (sparp_arg, "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 (sparp_arg, "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 (sparp_arg, "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 (sparp_arg, "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 {
@@ -632,7 +809,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); }
@@ -643,7 +820,8 @@ spar_construct_query /* [6] ConstructQuery ::= 'CONSTRUCT' ConstructTemplate D
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_dataset_clauses_opt
- spar_wherebindings_clause spar_solution_modifier spar_bindings_clause_opt {
+ spar_where_clause spar_solution_modifier {
+ const char *fmt_mode_name;
const char *formatter, *agg_formatter, *agg_mdata;
SPART *where_gp = spar_gp_finalize (sparp_arg, NULL);
SPART *wm = $6;
@@ -651,7 +829,8 @@ spar_construct_query /* [6] ConstructQuery ::= 'CONSTRUCT' ConstructTemplate D
wm->_.wm.where_gp = where_gp;
$$ = spar_make_top_or_special_case_from_wm (sparp_arg, CONSTRUCT_L, NULL,
retselid, wm );
- ssg_find_formatter_by_name_and_subtype ($$->_.req_top.formatmode_name, CONSTRUCT_L, &formatter, &agg_formatter, &agg_mdata);
+ fmt_mode_name = $$->_.req_top.formatmode_name;
+ ssg_find_formatter_by_name_and_subtype (fmt_mode_name, CONSTRUCT_L, &formatter, &agg_formatter, &agg_mdata);
spar_compose_retvals_of_construct (sparp_arg, $$, $3, formatter, agg_formatter, agg_mdata); }
;
@@ -661,7 +840,7 @@ spar_describe_query /* [7]* DescribeQuery ::= 'DESCRIBE' ( ( Var | IRIref | Ba
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_describe_rset spar_dataset_clauses_opt
- spar_wherebindings_clause_opt spar_solution_modifier spar_bindings_clause_opt {
+ spar_where_clause_opt spar_solution_modifier {
SPART * where_gp = spar_gp_finalize (sparp_arg, NULL);
SPART *wm = $6;
caddr_t retselid = spar_selid_pop (sparp_arg);
@@ -682,10 +861,10 @@ spar_ask_query /* [8] AskQuery ::= 'ASK' DatasetClause* WhereClause */
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_dataset_clauses_opt
- spar_wherebindings_clause {
+ spar_where_clause {
SPART * where_gp = spar_gp_finalize (sparp_arg, NULL);
$$ = 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) ); }
+ where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0), NULL ); }
;
spar_dataset_clauses_opt
@@ -694,8 +873,8 @@ spar_dataset_clauses_opt
;
spar_dataset_clause /* [9]* DatasetClause ::= | */
- /*... ( 'FROM' ( DefaultGraphClause | NamedGraphClause ) SpongeOptionList? ) */
- /*... | ( 'NOT' 'FROM' ( DefaultGraphClause | NamedGraphClause ) ) */
+ /*... ( ( 'FROM' | 'USING' ) ( DefaultGraphClause | NamedGraphClause ) SpongeOptionList? ) */
+ /*... | ( 'NOT' 'FROM' | 'USING' ) ( DefaultGraphClause | NamedGraphClause ) ) */
/* [10] DefaultGraphClause ::= SourceSelector */
/* [11] NamedGraphClause ::= 'NAMED' SourceSelector */
: spar_dataset_clause_subtype spar_iriref spar_sponge_optionlist_opt {
@@ -703,12 +882,27 @@ 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 (sparp_arg, "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_DRAFT, "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; }
- | NOT_FROM_L { $$ = SPART_GRAPH_NOT_FROM; }
- | NOT_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; }
;
spar_sponge_optionlist_opt /* [Virt] SpongeOptionList ::= 'OPTION' '(' ( SpongeOption ( ',' SpongeOption )* )? ')' */
@@ -731,100 +925,33 @@ 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
+ spar_expn %prec PRECODE_EXPN_PREC
{ sparp_arg->sparp_in_precode_expn = 0; $$ = $2; }
;
-spar_wherebindings_clause_opt /* ::= (WhereClause BindingsClause?)? */
+spar_where_clause_opt
: /* nothing */ {
sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
spar_gp_init (sparp_arg, WHERE_L); }
- | spar_wherebindings_clause {;}
+ | spar_where_clause {;}
;
spar_where_clause /* [13*] WhereClause ::= 'WHERE'? GroupGraphPattern */
: WHERE_L _LBRA {
sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
spar_gp_init (sparp_arg, WHERE_L); }
- spar_gp _RBRA spar_bindings_clause_opt {;}
+ spar_gp _RBRA {;}
| _LBRA {
sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
spar_gp_init (sparp_arg, WHERE_L); }
spar_gp _RBRA {;}
;
-spar_wherebindings_clause /* [13*] WhereBindingsClause ::= 'WHERE'? GroupGraphPattern BindingsClause? */
- : spar_where_clause spar_bindings_clause_opt {;}
- ;
-
-spar_bindings_clause_opt
- : /* nothing */ { $$ = NULL; }
- | 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");
- spar_selid_push (sparp_arg); }
- spar_bindings_vars _LBRA {
- spar_selid_pop (sparp_arg);
- sparp_arg->sparp_env->spare_bindings_vars = (SPART **)t_revlist_to_array ($3); }
- spar_bindings_opt _RBRA {
- sparp_arg->sparp_env->spare_bindings_rowset = (SPART ***)t_revlist_to_array ($6);
- $$ = 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, $$); }
- ;
-
-spar_bindings_vars
- : spar_bindings_var { $$ = NULL; t_set_push (&($$), spar_make_variable (sparp_arg, $1)); }
- | spar_bindings_vars spar_bindings_var { $$ = $1; t_set_push (&($$), spar_make_variable (sparp_arg, $2)); }
- ;
-
-spar_bindings_var /* [Sparql1.1*] BindingsVar ::= VAR1 | VAR2 | GlobalVar */
- : 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 { $$ = $1; }
- ;
-
-spar_bindings
- : spar_binding { $$ = NULL; t_set_push (&($$), $1); }
- | spar_bindings spar_binding { $$ = $1; t_set_push (&($$), $2); }
- ;
-
-spar_binding /* [Sparql1.1] Binding ::= '(' ( IRIref | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | 'UNBOUND' )+ ')' */
- : _LPAR spar_bindvals _RPAR {
- $$ = 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"); }
- ;
-
-spar_bindvals
- : spar_bindval {$$ = NULL; t_set_push (&($$), $1); }
- | spar_bindvals spar_bindval {$$ = $1; t_set_push (&($$), $2); }
- ;
-
-spar_bindval
- : spar_iriref
- | spar_numeric_literal
- | spar_rdf_literal
- | spar_boolean_literal
- | spar_blank_node
- | UNBOUND_L {$$ = NULL; }
- ;
-
-spar_solution_modifier /* [14]* SolutionModifier ::= GroupClause? HavingClause? OrderClause? */
+spar_solution_modifier /* [14]* SolutionModifier ::= GroupClause? HavingClause? OrderClause? BindingsClause? */
/*... ((LimitClause OffsetClause?) | (OffsetClause LimitClause?))? */
- : spar_group_clause_opt spar_having_clause_opt spar_order_clause_opt { $$ = spar_make_wm (sparp_arg, NULL, (SPART **)t_revlist_to_array ($1), $2, (SPART **)t_revlist_to_array ($3), (SPART *)t_box_num (SPARP_MAXLIMIT), (SPART *)t_box_num (0)); }
- | spar_group_clause_opt spar_having_clause_opt spar_order_clause_opt spar_limit_clause spar_offset_clause_opt { $$ = spar_make_wm (sparp_arg, NULL, (SPART **)t_revlist_to_array ($1), $2, (SPART **)t_revlist_to_array ($3), $4, $5); }
- | spar_group_clause_opt spar_having_clause_opt spar_order_clause_opt spar_offset_clause spar_limit_clause_opt { $$ = spar_make_wm (sparp_arg, NULL, (SPART **)t_revlist_to_array ($1), $2, (SPART **)t_revlist_to_array ($3), $5, $4); }
+ : spar_group_clause_opt spar_having_clause_opt spar_order_clause_opt spar_bindings_clause_opt { $$ = spar_make_wm (sparp_arg, NULL, $1, $2, $3, NULL, (SPART *)t_box_num (0), $4); }
+ | spar_group_clause_opt spar_having_clause_opt spar_order_clause_opt spar_limit_clause spar_offset_clause_opt spar_bindings_clause_opt { $$ = spar_make_wm (sparp_arg, NULL, $1, $2, $3, $4, $5, $6); }
+ | spar_group_clause_opt spar_having_clause_opt spar_order_clause_opt spar_offset_clause spar_limit_clause_opt spar_bindings_clause_opt { $$ = spar_make_wm (sparp_arg, NULL, $1, $2, $3, $5, $4, $6); }
;
spar_group_clause_opt /* [Virt] GroupClause ::= 'GROUP' 'BY' GroupExpn+ */
@@ -833,7 +960,7 @@ spar_group_clause_opt /* [Virt] GroupClause ::= 'GROUP' 'BY' GroupExpn+ */
spar_selid_push_reused (sparp_arg, sparp_arg->sparp_env->spare_top_retval_selid);
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
spar_group_expns {
- spar_selid_pop (sparp_arg); $$ = $4;
+ spar_selid_pop (sparp_arg); $$ = (SPART **)t_revlist_to_array ($4);
sparp_arg->sparp_allow_aggregates_in_expn &= ~1; }
;
@@ -867,7 +994,7 @@ spar_order_clause_opt /* [15] OrderClause ::= 'ORDER' 'BY' OrderCondition+ */
spar_selid_push_reused (sparp_arg, sparp_arg->sparp_env->spare_top_retval_selid);
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
spar_order_conditions {
- spar_selid_pop (sparp_arg); $$ = $4;
+ spar_selid_pop (sparp_arg); $$ = (SPART **)t_revlist_to_array ($4);
sparp_arg->sparp_allow_aggregates_in_expn &= ~1; }
;
@@ -893,21 +1020,84 @@ spar_asc_or_desc_opt /* ::= ( 'ASC' | 'DESC' )? */
;
spar_limit_clause_opt /* [17] LimitClause ::= 'LIMIT' INTEGER */
- : /* empty */ { $$ = (SPART *)t_box_num (SPARP_MAXLIMIT); }
+ : /* empty */ { $$ = NULL; }
| spar_limit_clause
;
spar_limit_clause /* [17*] LimitClause ::= 'LIMIT' PrecodeExpn */
- : LIMIT_L spar_precode_expn { $$ = $2; }
+ : LIMIT_L spar_precode_expn { $$ = ((NULL != $2) ? $2 : (SPART *)(t_box_num_nonull (0))); }
;
spar_offset_clause_opt /* [18] OffsetClause ::= 'OFFSET' INTEGER */
- : /* empty */ { $$ = (SPART *)t_box_num (0); }
+ : /* empty */ { $$ = NULL; }
| spar_offset_clause
;
spar_offset_clause /* [18*] OffsetClause ::= 'OFFSET' PrecodeExpn */
- : OFFSET_L spar_precode_expn { $$ = $2; }
+ : OFFSET_L spar_precode_expn { $$ = ((NULL != $2) ? $2 : ((SPART *)t_box_num_nonull (0))); }
+ ;
+
+spar_bindings_clause_opt
+ : /* nothing */ { $$ = NULL; }
+ | spar_bindings_clause
+ ;
+
+spar_bindings_clause /* [Sparql1.1*] BindingsClause ::= 'BINDINGS' BindingsVar+ '{' Binding* '}' */
+ : BINDINGS_L {
+ if (NULL != sparp_arg->sparp_env->spare_bindings_vars)
+ sparyyerror (sparp_arg, "Only one BINDINGS clause per query is allowed");
+ if (sparp_arg->sparp_macro_mode)
+ sparyyerror (sparp_arg, "BINDINGS can not be used inside macro");
+ spar_selid_push (sparp_arg); }
+ spar_bindings_vars _LBRA {
+ spar_selid_pop (sparp_arg);
+ sparp_arg->sparp_env->spare_bindings_vars = (SPART **)t_revlist_to_array ($3); }
+ spar_bindings_opt _RBRA {
+ sparp_arg->sparp_env->spare_bindings_rowset = (SPART ***)t_revlist_to_array ($6);
+ $$ = spar_make_bindings_inv_with_fake_equivs (sparp_arg,
+ sparp_arg->sparp_env->spare_bindings_vars, sparp_arg->sparp_env->spare_bindings_rowset); }
+ ;
+
+spar_bindings_vars
+ : spar_bindings_var { $$ = NULL; t_set_push (&($$), spar_make_variable (sparp_arg, $1)); }
+ | spar_bindings_vars spar_bindings_var { $$ = $1; t_set_push (&($$), spar_make_variable (sparp_arg, $2)); }
+ ;
+
+spar_bindings_var /* [Sparql1.1*] BindingsVar ::= VAR1 | VAR2 | GlobalVar */
+ : QD_VARNAME { ; }
+ | spar_global_var { sparyyerror (sparp_arg, "Global variable can not be used in the header of BINDINGS"); }
+ ;
+
+spar_bindings_opt
+ : /* nothing */ { $$ = NULL; }
+ | spar_bindings
+ ;
+
+spar_bindings
+ : spar_binding { $$ = NULL; t_set_push (&($$), $1); }
+ | spar_bindings spar_binding { $$ = $1; t_set_push (&($$), $2); }
+ ;
+
+spar_binding /* [Sparql1.1] Binding ::= '(' ( IRIref | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | 'UNBOUND' )+ ')' */
+ : _LPAR spar_bindvals _RPAR {
+ $$ = (SPART **)t_revlist_to_array ($2);
+ if (BOX_ELEMENTS ($$) != BOX_ELEMENTS (sparp_arg->sparp_env->spare_bindings_vars))
+ sparyyerror (sparp_arg, "Number of values in a binding does not match number of variables to bind"); }
+ ;
+
+spar_bindvals
+ : spar_bindval {$$ = NULL; t_set_push (&($$), $1); }
+ | spar_bindvals spar_bindval {$$ = $1; t_set_push (&($$), $2); }
+ ;
+
+spar_bindval
+ : spar_iriref
+ | spar_numeric_literal
+ | spar_rdf_literal
+ | spar_boolean_literal
+ | spar_blank_node
+ | UNBOUND_L { sparyyerror (sparp_arg, "UNBOUND in BINDINGS is deprecated, use UNDEF instead"); $$ = NULL; }
+ | UNDEF_L {$$ = NULL; }
;
spar_group_gp /* [19]* GroupGraphPattern ::= '{' ( GraphPattern | SelectQuery | ServiceReq ) '}' */
@@ -921,7 +1111,7 @@ spar_group_gp /* [19]* GroupGraphPattern ::= '{' ( GraphPattern | SelectQuery
if (SERVICE_L == $<token_type>$)
spar_gp_init (sparp_arg, SELECT_L);
spar_env_push (sparp_arg);
- spar_selid_push (sparp_arg);
+ 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;
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
@@ -955,6 +1145,20 @@ 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 (sparp_arg, "Ill formed triple pattern or macro pattern variable outside a macro body"); }
;
spar_gp_not_triples /* [21]* GraphPatternNotTriples ::= */
@@ -968,7 +1172,7 @@ spar_gp_not_triples /* [21]* GraphPatternNotTriples ::= */
spar_optional_gp /* [22] OptionalGraphPattern ::= 'OPTIONAL' GroupGraphPattern */
: OPTIONAL_L _LBRA { spar_gp_init (sparp_arg, OPTIONAL_L); } spar_group_gp { $$ = $4; }
- | OPTIONAL_L error { sparyyerror ("Missing '{' after OPTIONAL keyword"); }
+ | OPTIONAL_L error { sparyyerror (sparp_arg, "Missing '{' after OPTIONAL keyword"); }
;
spar_quad_map_gp /* [Virt] QuadMapGraphPattern ::= 'QUAD' 'MAP' ( IRIref | '*' ) GroupGraphPattern */
@@ -991,25 +1195,31 @@ spar_graph_gp /* [23] GraphGraphPattern ::= 'GRAPH' VarOrBlankNodeOrIRIref Gr
spar_group_or_union_gp /* [24] GroupOrUnionGraphPattern ::= GroupGraphPattern ( 'UNION' GroupGraphPattern )* */
: _LBRA { spar_gp_init (sparp_arg, 0); } spar_group_gp { $$ = $3; }
| spar_group_or_union_gp UNION_L _LBRA {
- sparp_env()->spare_good_graph_varnames = sparp_env()->spare_good_graph_bmk;
- spar_gp_init (sparp_arg, UNION_L);
- spar_gp_add_member (sparp_arg, $1);
+ sparp_env()->spare_good_graph_varnames = sparp_env()->spare_good_graph_bmk;
+ if (UNION_L != $1->_.gp.subtype) {
+ spar_gp_init (sparp_arg, UNION_L);
+ spar_gp_add_member (sparp_arg, $1); }
spar_gp_init (sparp_arg, 0); }
spar_group_gp {
- spar_gp_add_member (sparp_arg, $5);
- $$ = spar_gp_finalize (sparp_arg, NULL); }
+ if (UNION_L != $1->_.gp.subtype) {
+ spar_gp_add_member (sparp_arg, $5);
+ $$ = spar_gp_finalize (sparp_arg, NULL); }
+ else {
+ $$->_.gp.members = (SPART **)t_list_concat_tail ((caddr_t)($$->_.gp.members), 1, $5);
+ $$ = $1; }
+ }
;
spar_constraint /* [25]* Constraint ::= 'FILTER' ( ( '(' Expn ')' ) | BuiltInCall | FunctionCall ) */
: 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 { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
+ | MINUS_L spar_constraint_exists_int { /*... | 'MINUS' 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); }
;
@@ -1021,20 +1231,20 @@ spar_exists_or_not_exists
spar_constraint_exists_int
: {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "SPARQL 1.1 FILTER EXISTS / FILTER NOT EXISTS test");
+ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11_DRAFT, "SPARQL 1.1 FILTER EXISTS / FILTER NOT EXISTS test");
spar_gp_init (sparp_arg, SELECT_L);
spar_env_push (sparp_arg);
spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL);
sparp_arg->sparp_allow_aggregates_in_expn <<= 1; }
spar_dataset_clauses_opt
- spar_wherebindings_clause
+ spar_where_clause
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) );
+ where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0), NULL );
spar_env_pop (sparp_arg);
$$ = spar_gp_finalize_with_subquery (sparp_arg, $4, subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
@@ -1042,26 +1252,40 @@ spar_constraint_exists_int
spar_service_req /* [Virt] ServiceRequest ::= 'SERVICE' IRIref ServiceOptionList? GroupGraphPattern */
: SERVICE_L spar_qm_iriref_const_expn {
+ caddr_t sinv_storage_uri;
sparp_arg->sparp_query_uses_sinvs++;
- $<token_type>$ = sparp_arg->sparp_permitted_syntax;
- sparp_arg->sparp_permitted_syntax = SSG_SD_GLOBALS; /*!!! TBD config */
+ sinv_storage_uri = uname_virtrdf_ns_uri_DefaultServiceStorage; /*!!! TBD config */
+ /* if config is added above then tweak the check in sparp_gp_trav_add_graph_perm_read_filters and in SPAR_REQ_TOP case of ssg_sdprint_tree() */
+ $<boxes>$ = t_list (5, t_box_num(sparp_arg->sparp_permitted_syntax), sparp_arg->sparp_env->spare_storage_name, sparp_arg->sparp_storage, (ptrlong)(sparp_arg->sparp_storage_is_set), sinv_storage_uri);
+ sparp_arg->sparp_inner_permitted_syntax = -1;
+ sparp_arg->sparp_env->spare_storage_name = sinv_storage_uri;
+ sparp_arg->sparp_storage = sparp_find_storage_by_name (sinv_storage_uri);
+ sparp_arg->sparp_storage_is_set = 1;
}
spar_service_options_list_opt {
$<box>$ = t_alloc (sizeof (sparp_sources_t));
+ if (-1 == sparp_arg->sparp_inner_permitted_syntax)
+ sparp_arg->sparp_permitted_syntax = SSG_SD_GLOBALS | sparp_find_language_dialect_by_service (sparp_arg, (SPART *)$2);
+ else
+ sparp_arg->sparp_permitted_syntax = SSG_SD_GLOBALS | sparp_arg->sparp_inner_permitted_syntax;
memcpy ($<box>$, &(sparp_arg->sparp_env->spare_src), sizeof (sparp_sources_t));
memset (&(sparp_arg->sparp_env->spare_src), 0, sizeof (sparp_sources_t)); }
spar_dataset_clauses_opt _LBRA {
+ caddr_t sinv_storage_uri = $<boxes>3[4];
SPART **sources;
- caddr_t sinv_storage_uri = uname_virtrdf_ns_uri_DefaultServiceStorage /*!!! TBD config */;
SPART *sinv;
- if ((NULL == sparp_arg->sparp_env->spare_default_graphs) && (NULL == sparp_arg->sparp_env->spare_named_graphs))
+ if ((NULL == sparp_arg->sparp_env->spare_src.ssrc_default_graphs) && (NULL == sparp_arg->sparp_env->spare_src.ssrc_named_graphs))
memcpy (&(sparp_arg->sparp_env->spare_src), $<box>5, sizeof (sparp_sources_t));
- sources = spar_make_sources_like_top (sparp_arg);
+ sources = spar_make_sources_like_top (sparp_arg, SELECT_L);
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 {
- sparp_arg->sparp_permitted_syntax = $<token_type>3;
+ sparp_arg->sparp_permitted_syntax = unbox($<boxes>3[0]);
+ sparp_arg->sparp_env->spare_storage_name = $<boxes>3[1];
+ sparp_arg->sparp_storage = (quad_storage_t *)($<boxes>3[2]);
+ sparp_arg->sparp_storage_is_set = (ptrlong)($<boxes>3[3]);
$9->_.gp.options = (SPART **)t_list_concat_tail (
(caddr_t)($9->_.gp.options), 2,
SPAR_SERVICE_INV, t_set_pop (&(sparp_env()->spare_context_sinvs)) );
@@ -1086,28 +1310,51 @@ spar_service_option
if (!strcmp (defname, "lang:dialect"))
{
if ((NULL == defvals) || (NULL != defvals->next) || (SPARQL_INTEGER != ((ptrlong *)(defvals->data))[0]))
- sparyyerror ("define lang:dialect needs an integer");
- sparp_arg->sparp_permitted_syntax = unbox (((caddr_t *)(defvals->data))[1]) | SSG_SD_GLOBALS;
+ sparyyerror (sparp_arg, "define lang:dialect needs an integer");
+ sparp_arg->sparp_inner_permitted_syntax = unbox (((caddr_t *)(defvals->data))[1]) | SSG_SD_GLOBALS;
}
$$ = (SPART **)t_list (2, (SPART *)((ptrlong)DEFINE_L), t_list (2, defname, t_revlist_to_array(defvals))); }
| IN_L spar_triple_option_var_commalist { $$ = (SPART **)t_list (2, (SPART *)((ptrlong)IN_L), $2); }
| IN_L _STAR { $$ = (SPART **)t_list (2, (SPART *)((ptrlong)IN_L), (SPART *)((ptrlong)_STAR)); }
;
-spar_ctor_template /* [26]* ConstructTemplate ::= '{' ConstructTriples '}' */
+spar_ctor_template /* [26]* ConstructTemplate ::= '{' ( ConstructQuads+ '.'? ) '}' */
: _LBRA { spar_gp_init (sparp_arg, CONSTRUCT_L); }
- spar_ctor_triples_opt _RBRA { $$ = spar_gp_finalize (sparp_arg, NULL); }
+ 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 /* [27] ConstructTriples ::= ( Triples1 ( '.' ConstructTriples )? )? */
+spar_ctor_triples_or_quads_opt /* [27]* ConstructQuads ::= (Triples1 ( '.' ConstructQuads )? ) | Quads1 ( '.'? ConstructQuads )? */
: /* empty */ { }
- | spar_ctor_triples { }
- | spar_ctor_triples _DOT { }
+ | spar_ctor_triples_or_quads_quads { }
+ | spar_ctor_triples_or_quads_triples { }
+ | spar_ctor_triples_or_quads_triples _DOT { }
;
-spar_ctor_triples /* ::= Triples1 ( '.' Triples1 )* */
+spar_ctor_triples_or_quads_triples
: spar_triples1 { }
- | spar_ctor_triples _DOT 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_triples_opt /* ::= Triples? */
@@ -1120,18 +1367,27 @@ spar_triples /* [28] Triples ::= Triples1 ( '.' Triples? )? */
| spar_triples1 _DOT spar_triples_opt { }
;
-spar_triples1 /* [29] Triples1 ::= VarOrTerm PropertyListNotEmpty | TriplesNode PropertyList */
+spar_quads1 /* [Virt] Quads1 ::= GRAPH VarOrTerm PropertyListNotEmpty | TriplesNode PropertyList | MacroCall */
+ : GRAPH_L { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11_DRAFT, "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_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 (sparp_arg, "Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }*/
;
spar_props /* [31] PropertyListNotEmpty ::= Verb ObjectList ( ';' PropertyList )? */
@@ -1140,30 +1396,30 @@ spar_props /* [31] PropertyListNotEmpty ::= Verb ObjectList ( ';' PropertyLis
| spar_props _SEMI
spar_verb { t_set_push (&(sparp_env()->spare_context_predicates), $3); }
spar_objects { t_set_pop (&(sparp_env()->spare_context_predicates)); }
- | spar_props _SEMI _DOT { sparyyerror ("Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }
- | spar_props _SEMI error { sparyyerror ("Predicate expected after semicolon"); }
- | error { sparyyerror ("Predicate expected"); }
+ | spar_props _SEMI _DOT { sparyyerror (sparp_arg, "Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }
+ | spar_props _SEMI error { sparyyerror (sparp_arg, "Predicate expected after semicolon"); }
+ | error { sparyyerror (sparp_arg, "Predicate expected"); }
;
spar_objects /* [32]* ObjectList ::= ObjGraphNode ( ',' ObjectList )? */
: spar_ograph_node { }
| spar_objects _COMMA spar_ograph_node { }
- | spar_objects _COMMA _SEMI { sparyyerror ("Semicolon immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
- | spar_objects _COMMA _DOT { sparyyerror ("Dot immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
- | spar_objects _COMMA error { sparyyerror ("Object expected after comma"); }
- | error { sparyyerror ("Object expected"); }
+ | spar_objects _COMMA _SEMI { sparyyerror (sparp_arg, "Semicolon immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
+ | spar_objects _COMMA _DOT { sparyyerror (sparp_arg, "Dot immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
+ | spar_objects _COMMA error { sparyyerror (sparp_arg, "Object expected after comma"); }
+ | error { sparyyerror (sparp_arg, "Object expected"); }
;
spar_ograph_node /* [Virt] ObjGraphNode ::= GraphNode TripleOptions? */
: spar_graph_node spar_triple_optionlist_opt {
- spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL, NULL, $1, NULL, $2, 0x0); }
+ spar_gp_add_triplelike (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 contructor template");
+ sparyyerror (sparp_arg, "Triple options are not allowed in constructor template");
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_OPTION, "OPTION () triple matching configuration"); }
spar_triple_option_commalist _RPAR { $$ = (SPART **)t_revlist_to_array ($4); }
;
@@ -1224,7 +1480,7 @@ spar_same_as_option
spar_verb /* [33] Verb ::= VarOrBlankNodeOrIRIref | 'a' */
: spar_var_or_iriref_or_backquoted
| a_L { $$ = spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_type); }
- | error { sparyyerror ("Predicate expected (i.e., variable or IRI ref or a backquoted expn or 'a' keyword)"); }
+ | error { sparyyerror (sparp_arg, "Predicate expected (i.e., variable or IRI ref or a backquoted expn or 'a' keyword)"); }
;
spar_triples_node /* [34] TriplesNode ::= Collection | BlankNodePropertyList */
@@ -1238,7 +1494,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_triple_or_special_filter (sparp_arg,
+ spar_gp_add_triplelike (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),
@@ -1255,17 +1511,17 @@ spar_triples_opt_semi_rsqbra /* ::= ';'? ']' */
spar_cons_collection
: spar_graph_node {
- spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL,
+ spar_gp_add_triplelike (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_triple_or_special_filter (sparp_arg,
+ spar_gp_add_triplelike (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_triple_or_special_filter (sparp_arg, NULL, NULL,
+ spar_gp_add_triplelike (sparp_arg, NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_first),
$2, NULL, NULL, 0x0 ); }
;
@@ -1311,8 +1567,8 @@ spar_retcol_commalist /* ::= ( Expn ( ',' Expn )+ ) */
;
spar_retcols /* ::= ( Expn+ ) */
- : spar_expn { $$ = NULL; t_set_push (&($$), $1); }
- | spar_retcols spar_expn { $$ = $1; t_set_push (&($$), $2); }
+ : spar_expn %prec _COMMA { $$ = NULL; t_set_push (&($$), $1); }
+ | spar_retcols spar_expn %prec _COMMA { $$ = $1; t_set_push (&($$), $2); }
;
spar_ret_agg_call /* [Virt] RetAggCall ::= AggName '(', ( '*' | ( 'DISTINCT'? Var ) ) ')' */
@@ -1334,10 +1590,33 @@ spar_agg_name_int
;
spar_var /* [41]* Var ::= VAR1 | VAR2 | GlobalVar | ( Var ( '+>' | '*>' ) IRIref ) */
- : 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]) ); }
+ : 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]) ); }
;
spar_global_var /* [Virt] GlobalVar ::= QUEST_COLON_PARAMNAME | DOLLAR_COLON_PARAMNAME */
@@ -1346,33 +1625,33 @@ spar_global_var /* [Virt] GlobalVar ::= QUEST_COLON_PARAMNAME | DOLLAR_COLON_
spar_global_var_int
/*... | QUEST_COLON_PARAMNUM | DOLLAR_COLON_PARAMNUM */
- : 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); }
+ : QD_COLON_PARAMNAME { $$ = spar_make_variable (sparp_arg, $1); }
+ | QD_COLON_PARAMNUM { $$ = spar_make_variable (sparp_arg, $1); }
;
spar_graph_term /* [42]* GraphTerm ::= IRIref | RDFLiteral | ( '-' | '+' )? NumericLiteral */
/*... | BooleanLiteral | BlankNode | NIL | Backquoted */
- : spar_iriref { $$ = $1; }
- | spar_rdf_literal { $$ = $1; }
- | spar_numeric_literal { $$ = $1; }
+ : spar_iriref
+ | spar_rdf_literal
+ | spar_numeric_literal
| _PLUS spar_numeric_literal { $$ = $2; }
| _MINUS spar_numeric_literal { $$ = $2; spar_change_sign (&($2->_.lit.val)); }
- | spar_boolean_literal { $$ = $1; }
- | spar_blank_node { $$ = $1; }
+ | spar_boolean_literal
+ | spar_blank_node
| 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 {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "backquoted expression");
+ dk_set_t gp_st = sparp_env()->spare_context_gp_subtypes;
if (2 & sparp_arg->sparp_in_precode_expn)
- spar_error (sparp_arg, "Backquoted expressions are not allowed in constant clauses"); }
+ 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_expn _BACKQUOTE {
- dk_set_t gp_st = sparp_env()->spare_context_gp_subtypes;
- if ((NULL == gp_st) || (CONSTRUCT_L == (ptrlong)(gp_st->data)))
+ if ((-1 == $<token_type>2) || (CONSTRUCT_L == $<token_type>2))
$$ = $3; /* redundant backquotes in retlist or backquotes to bypass syntax limitation in CONSTRUCT gp */
else
{
@@ -1386,8 +1665,7 @@ spar_backquoted /* [Virt] Backquoted ::= '`' Expn '`' */
;
spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
- : 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 AS_L QD_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 )* */
@@ -1400,7 +1678,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] */
- $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)LIKE_L, t_list (2, $1, $4)); }
+ $$ = sparp_make_builtin_call (sparp_arg, LIKE_L, (SPART **)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;
@@ -1411,8 +1689,8 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
else
{
t_set_push (&args, $1);
- $$ = 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 */ );
+ $$ = 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 */ );
}
}
| spar_expn _LT spar_expn { SPAR_BIN_OP ($$, BOP_LT, $1, $3); }
@@ -1421,11 +1699,11 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
| spar_expn _GE spar_expn { SPAR_BIN_OP ($$, BOP_LTE, $3, $1); }
| spar_expn _PLUS spar_expn { /* [49] AdditiveExpn ::= MultiplicativeExpn ( ('+'|'-') MultiplicativeExpn )* */
if (sparp_arg->sparp_rset_lexdepth_plus_1 == $2 + 1)
- sparyyerror ("Ambiguous (unary or binary) plus operator in result list, please add \"(\" and \")\"");
+ sparyyerror (sparp_arg, "Ambiguous (unary or binary) plus operator in result list, please add \"(\" and \")\"");
SPAR_BIN_OP ($$, BOP_PLUS, $1, $3); }
| spar_expn _MINUS spar_expn {
if (sparp_arg->sparp_rset_lexdepth_plus_1 == $2 + 1)
- sparyyerror ("Ambiguous (unary or binary) minus operator in result list, please add \"(\" and \")\"");
+ sparyyerror (sparp_arg, "Ambiguous (unary or binary) minus operator in result list, please add \"(\" and \")\"");
SPAR_BIN_OP ($$, BOP_MINUS, $1, $3); }
| spar_expn _STAR spar_expn { /* [50] MultiplicativeExpn ::= UnaryExpn ( ('*'|'/') UnaryExpn )* */
SPAR_BIN_OP ($$, BOP_TIMES, $1, $3); }
@@ -1461,7 +1739,7 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
else
$$ = $2; }
| _LPAR spar_expn _RPAR { $$ = $2; } /* [58] PrimaryExpn ::= */
- /*... BracketedExpn | BuiltInCall | IRIrefOrFunction */
+ /*... BracketedExpn | BuiltInCall | IRIrefOrFunctionOrMacro */
/*... | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | Var */
| _LPAR ASK_L {
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "scalar ASK subquery");
@@ -1471,27 +1749,27 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL);
sparp_arg->sparp_allow_aggregates_in_expn <<= 1; }
spar_dataset_clauses_opt
- spar_wherebindings_clause
- _RPAR spar_triple_optionlist_opt {
+ spar_where_clause
+ spar_triple_optionlist_opt _RPAR {
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) );
+ where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0), NULL );
spar_env_pop (sparp_arg);
- $$ = spar_gp_finalize_with_subquery (sparp_arg, $7, subselect_top);
+ $$ = spar_gp_finalize_with_subquery (sparp_arg, $6, 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");
spar_gp_init (sparp_arg, SELECT_L);
spar_env_push (sparp_arg);
- spar_selid_push (sparp_arg);
+ 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;
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
spar_select_rset spar_dataset_clauses_opt
spar_where_clause spar_solution_modifier
- _RPAR spar_triple_optionlist_opt {
+ spar_triple_optionlist_opt _RPAR {
SPART *subselect_top;
SPART *where_gp;
SPART *wm = $7;
@@ -1504,91 +1782,141 @@ 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, $9, subselect_top);
+ $$ = spar_gp_finalize_with_subquery (sparp_arg, $8, subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
| spar_ret_agg_call {
$$ = $1;
if (sparp_arg->sparp_in_precode_expn)
- sparyyerror ("Aggregates are not allowed in 'precode' expressions that should be calculated before the result-set of the query");
+ sparyyerror (sparp_arg, "Aggregates are not allowed in 'precode' expressions that should be calculated before the result-set of the query");
if (!(sparp_arg->sparp_allow_aggregates_in_expn & 1))
- sparyyerror ("Aggregates are allowed only in result sets"); }
+ sparyyerror (sparp_arg, "Aggregates are allowed only in result sets"); }
| spar_built_in_call
- | spar_iriref spar_arg_list_opt { /* [55] IRIrefOrFunction ::= IRIref ArgList? */
- if (NULL == $2)
+ | 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 (sparp_arg, "The macro is recursively used in its own definition");
+ sparp_arg->sparp_macro_mode |= SPARP_CALLARG;
+ } }
+ spar_arg_list_opt {
+ if (NULL == $3)
$$ = $1;
else
{
- SPART **args = (SPART **)(((dk_set_t)NIL_L == $2) ? NULL : t_revlist_to_array ($2));
+ SPART **args = (SPART **)(((dk_set_t)NIL_L == $3) ? NULL : t_revlist_to_array ($3));
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 ::= */
- : STR_L _LPAR spar_expn _RPAR /*... ( 'STR' '(' Expn ')' ) */
- { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)STR_L, t_list (1, $3)); }
+ : 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)); }
| LANG_L _LPAR spar_expn _RPAR /*... | ( 'LANG' '(' Expn ')' ) */
- { $$ = 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)); }
+ { $$ = sparp_make_builtin_call (sparp_arg, LANG_L, (SPART **)t_list (1, $3)); }
| DATATYPE_L _LPAR spar_expn _RPAR /*... | ( 'DATATYPE' '(' Expn ')' ) */
- { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)DATATYPE_L, t_list (1, $3)); }
+ { $$ = sparp_make_builtin_call (sparp_arg, DATATYPE_L, (SPART **)t_list (1, $3)); }
| BOUND_L _LPAR spar_var _RPAR /*... | ( 'BOUND' '(' Var ')' ) */
- { $$ = 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)); }
+ { $$ = sparp_make_builtin_call (sparp_arg, BOUND_L, (SPART **)t_list (1, $3)); }
;
spar_function_call /* [54] FunctionCall ::= IRIref ArgList */
- : spar_iriref spar_arg_list {
- SPART **args = (SPART **)(((dk_set_t)NIL_L == $2) ? NULL : t_revlist_to_array ($2));
+ : 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 (sparp_arg, "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));
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 (sparp_arg, "Undefined macro IRI");
+ if ((SPARP_DEFBODY & sparp_arg->sparp_macro_mode) && (sparp_arg->sparp_current_macro == mdef))
+ sparyyerror (sparp_arg, "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 { $$ = $1; }
+ | spar_arg_list
;
-spar_arg_list /* [56]* ArgList ::= ( NIL | '(' Expns ')' ) */
+spar_arg_list /* [56]* ArgList ::= '(' Expns? ')' */
: NIL_L { $$ = (dk_set_t)NIL_L; }
| _LPAR _RPAR { $$ = (dk_set_t)NIL_L; }
| _LPAR spar_expns _RPAR { $$ = $2; }
@@ -1597,14 +1925,45 @@ spar_arg_list /* [56]* ArgList ::= ( NIL | '(' Expns ')' ) */
spar_expns /* [Virt] Expns ::= Expn ( ',' Expn )* */
: spar_expn { $$ = NULL; t_set_push (&($$), $1); }
| spar_expns _COMMA spar_expn { $$ = $1; t_set_push (&($$), $3); }
- | spar_expns _COMMA error { sparyyerror ("Argument expected after comma"); }
- | spar_expns error { sparyyerror ("Comma or ')' expected after function argument"); }
+ | spar_expns _COMMA error { sparyyerror (sparp_arg, "Argument expected after comma"); }
+ | spar_expns error { sparyyerror (sparp_arg, "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 (sparp_arg, "Macro argument (an expression or a group pattern) expected after comma"); }
+ | spar_expn_or_ggps error { sparyyerror (sparp_arg, "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); }
| SPARQL_DOUBLE { $$ = spartlist (sparp_arg, 4, SPAR_LIT, $1, uname_xmlschema_ns_uri_hash_double, NULL); }
+ | INF_L { double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ $$ = spartlist (sparp_arg, 4, SPAR_LIT, t_box_double (myPOSINF_d), uname_xmlschema_ns_uri_hash_double, NULL); }
+ | NAN_L { double myZERO = 0.0;
+ double myNAN_d = 0.0/myZERO;
+ $$ = spartlist (sparp_arg, 4, SPAR_LIT, t_box_double (myNAN_d), uname_xmlschema_ns_uri_hash_double, NULL); }
;
spar_rdf_literal /* [60] RDFLiteral ::= String ( LANGTAG | ( '^^' IRIref ) )? */
@@ -1619,7 +1978,7 @@ spar_boolean_literal /* [61] BooleanLiteral ::= 'true' | 'false' */
;
spar_iriref_or_star_or_default
- : spar_iriref { $$ = $1; }
+ : spar_iriref
| _STAR { $$ = (SPART *)((ptrlong)_STAR); }
| DEFAULT_L { $$ = (SPART *)((ptrlong)DEFAULT_L); }
;
@@ -1642,12 +2001,12 @@ spar_arrow_iriref
$$ = (SPART **) t_list ( 4, $1,
spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_qname_prefix (sparp_arg, $2)),
QNAME_NS, $2); }
- | spar_arrow error { sparyyerror ("IRI reference expected after *> or +> operator"); }
+ | spar_arrow error { sparyyerror (sparp_arg, "IRI reference expected after *> or +> operator"); }
;
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 { $$ = $1; }
+ | spar_qname
;
spar_qname /* [64] QName ::= QNAME | QNAME_NS */
@@ -1662,13 +2021,13 @@ spar_blank_node /* [65]* BlankNode ::= BLANK_NODE_LABEL | ( '[' ']' ) */
/* PART 1a. SPARUL */
-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_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_action /* [DML] SparulAction ::= */
- /*... CreateAction | DropAction | LoadAction */
+spar_sparul_action_or_drop_macro_lib /* [DML*] SparulAction ::= */
+ /*... CreateAction | DropAction | LoadAction | LoadServiceData */
/*... | InsertAction | InsertDataAction | DeleteAction | DeleteDataAction */
/*... | ModifyAction | ClearAction */
: spar_sparul_insert
@@ -1678,14 +2037,21 @@ spar_sparul_action /* [DML] SparulAction ::= */
| spar_sparul_modify
| spar_sparul_clear
| spar_sparul_load
+ | spar_sparul_load_service_data
| 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_opt {
+ : INSERT_L spar_in_graph_precode {
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 {
@@ -1695,9 +2061,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_opt {
+ /*... 'INSERT' 'DATA' ( ( ( 'IN' | 'INTO ) 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? PrecodeExpn )? */
+ /*... ConstructTemplate */
+ : INSERT_L DATA_L spar_in_graph_precode {
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; }
@@ -1712,7 +2078,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_opt {
+ : DELETE_L spar_from_graph_precode {
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 {
@@ -1722,9 +2088,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_opt {
+ /*... 'DELETE' 'DATA' ( ( 'FROM' 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? PrecodeExpn */
+ /*... ConstructTemplate */
+ : DELETE_L DATA_L spar_from_graph_precode {
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; }
@@ -1737,7 +2103,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 {
@@ -1750,16 +2116,24 @@ spar_sparul_modify /* [DML]* ModifyAction ::= */
spar_compose_retvals_of_modify (sparp_arg, $$, $2, $5, $7); }
;
-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_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_load /* [DML]* LoadAction ::= 'LOAD' PrecodeExpn */
+spar_sparul_load /* [DML]* LoadAction ::= 'LOAD' 'SILENT'? PrecodeExpn */
/*... ( ( 'IN' | 'INTO' ) 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn )? */
- : 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 */); }
+ : 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); }
+ ;
+
+spar_sparul_load_service_data /* [DML]* LoadServiceDataAction ::= 'LOAD' 'SILENT'? 'SERVICE' PrecodeExpn 'DATA' ('USING' 'SERVICE' PrecodeExpn) */
+ : LOAD_L spar_silent_opt SERVICE_L spar_precode_expn DATA_L {
+ $$ = spar_make_sparul_load_service_data (sparp_arg, $4, (SPART *)t_NEW_DB_NULL, $2); }
+ | LOAD_L spar_silent_opt SERVICE_L spar_precode_expn DATA_L USING_L SERVICE_L spar_precode_expn {
+ $$ = spar_make_sparul_load_service_data (sparp_arg, $4, $8, $2); }
;
spar_sparul_create /* [DML]* CreateAction ::= 'CREATE' 'SILENT'? 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn */
@@ -1767,34 +2141,52 @@ 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'? '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_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_action_solution
: /* empty */ { $$ = spar_make_fake_action_solution (sparp_arg); }
- | spar_dataset_clauses_opt spar_wherebindings_clause spar_solution_modifier spar_bindings_clause_opt {
+ | spar_dataset_clauses_opt spar_where_clause spar_solution_modifier {
SPART *where_gp = spar_gp_finalize (sparp_arg, NULL);
$$ = $3;
$3->_.wm.where_gp = where_gp; }
;
-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_in_graph_precode
+ : spar_in_or_into spar_graph_identified_by_opt spar_precode_expn { $$ = $3; }
;
-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_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_default_or_graph_precode
+ : DEFAULT_L { $$ = (SPART *)DEFAULT_L; }
+ | spar_graph_identified_by_opt spar_precode_expn { $$ = $2; }
;
spar_graph_precode_opt
- : /* empty */ { $$ = spar_default_sparul_target (sparp_arg, "GRAPH IDENTIFIED BY clause"); }
+ : /* empty */ { $$ = spar_default_sparul_target (sparp_arg, "GRAPH IDENTIFIED BY clause", 0); }
| 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_DRAFT, "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 {}
@@ -1805,6 +2197,70 @@ 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_DRAFT, "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)* */
@@ -1841,8 +2297,7 @@ 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 );
- sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ (SPART **)t_list (3, $4, $5, $6), $7 ); }
| 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",
@@ -1851,8 +2306,7 @@ 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 );
- sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ (SPART **)t_list (2, $4, spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ($6))), $7 ); }
;
spar_qm_drop_iol_class /* [Virt] QmDropIRIorLiteralClass ::= 'DROP' 'SILENT'? ( 'IRI' | 'LITERAL' ) 'CLASS' QmIRIrefConst */
@@ -1862,19 +2316,16 @@ 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_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ sparp_jso_push_deleted (sparp_arg, uname_virtrdf_ns_uri_QuadMapFormat , $5); }
;
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 );
- sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ (SPART **)t_list (2, $4, $7), NULL ); }
| 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 );
- sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
+ (SPART **)t_list (2, $2, $5), NULL ); }
;
spar_qm_iol_class_optionlist_opt /* [Virt] QmIRIorLiteralClassOptions ::= 'OPTION' '(' QmIRIorLiteralClassOption (',' QmIRIorLiteralClassOption)* ')' */
@@ -1896,17 +2347,17 @@ spar_qm_iol_class_option_commalist
spar_qm_iol_class_option /* [Virt] QmIRIorLiteralClassOption ::= */
: DATATYPE_L spar_qm_iriref_const_expn { /*... ( 'DATATYPE' QmIRIrefConst ) */
- $$ = t_list (2, t_box_dv_uname_string ("DATATYPE"), t_box_dv_uname_string ($2)); }
+ $$ = (SPART **)t_list (2, t_box_dv_uname_string ("DATATYPE"), t_box_dv_uname_string ($2)); }
| LANG_L SPARQL_STRING { /*... | ( 'LANG' STRING ) */
- $$ = t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ($2)); }
+ $$ = (SPART **)t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ($2)); }
| LANG_L spar_qm_sql_id { /*... | ( 'LANG' STRING ) */
- $$ = t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ($2)); }
+ $$ = (SPART **)t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ($2)); }
| BIJECTION_L { /*... | 'BIJECTION' */
- $$ = t_list (2, t_box_dv_uname_string ("BIJECTION"), (ptrlong)1); }
+ $$ = (SPART **)t_list (2, t_box_dv_uname_string ("BIJECTION"), (ptrlong)1); }
| DEREF_L { /*... | 'DEREF' */
- $$ = t_list (2, t_box_dv_uname_string ("DEREF"), (ptrlong)1); }
+ $$ = (SPART **)t_list (2, t_box_dv_uname_string ("DEREF"), (ptrlong)1); }
| RETURNS_L spar_qm_sprintff_list { /*... | 'RETURNS' STRING ('UNION' STRING)* */
- $$ = t_list (2, t_box_dv_uname_string ("RETURNS"),
+ $$ = (SPART **)t_list (2, t_box_dv_uname_string ("RETURNS"),
spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ($2)) ); }
;
@@ -1979,14 +2430,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, uname_virtrdf_ns_uri_QuadStorage); }
+ if (NULL != sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
| 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, uname_virtrdf_ns_uri_QuadStorage); }
+ if (NULL != sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
;
spar_qm_drop_mapping /* [Virt] QmDrop ::= 'DROP' 'SLIENT'? ('GRAPH' ('IDENTIFIED' 'BY')?)? QmIRIrefConst */
@@ -1994,14 +2445,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, uname_virtrdf_ns_uri_QuadStorage); }
+ if (NULL != sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
| 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, uname_virtrdf_ns_uri_QuadStorage); }
+ if (NULL != sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
;
spar_qm_from_where_list_opt /* [Virt] QmSourceDecl ::= */
@@ -2015,7 +2466,7 @@ spar_qm_from_where_list_opt /* [Virt] QmSourceDecl ::= */
spar_qm_add_aliased_alias (sparp_arg, $3, $5);
sparp_env()->spare_qm_current_table_alias = $5; }
| spar_qm_from_where_list_opt FROM_L SQLQUERY_L spar_qm_sqlquery AS_L SPARQL_PLAIN_ID { /*... | ( 'FROM' 'SQLQUERY' QmSqlQuery 'AS' PLAIN_ID QmTextLiteral* ) */
- caddr_t qry = t_box_sprintf (100 + strlen($4), "/*???*/ %s", $4);
+ caddr_t qry = t_box_sprintf (100 + strlen($4), "/*[sqlquery[*/ %s\n/*]sqlquery]*/", $4);
spar_qm_add_aliased_table_or_sqlquery (sparp_arg, qry, $6);
sparp_env()->spare_qm_current_table_alias = $6; }
spar_qm_text_literal_list_opt {
@@ -2030,7 +2481,7 @@ spar_qm_text_literal_list_opt
;
spar_qm_text_literal_decl /* [Virt] QmTextLiteral ::= 'TEXT' 'XML'? 'LITERAL' QmSqlCol ( 'OF' QmSqlCol )? QmTextLiteralOptions? */
- : TEXT_BL spar_xml_opt LITERAL_L spar_qm_sqlcol spar_of_sqlcol_opt spar_qm_text_literal_options_opt {
+ : TEXT_L 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 ); }
@@ -2038,7 +2489,7 @@ spar_qm_text_literal_decl /* [Virt] QmTextLiteral ::= 'TEXT' 'XML'? 'LITERAL'
spar_xml_opt
: /* empty */ { $$ = NULL; }
- | XML_BL { $$ = $1; }
+ | XML_L { $$ = (caddr_t)((ptrlong)(XML_L)); }
;
spar_of_sqlcol_opt
@@ -2081,12 +2532,40 @@ spar_qm_map_top_dotlist /* ::= QmMapTopOp ( '.' QmMapTopOp )* */
spar_qm_map_top_op {}
;
-spar_qm_map_top_op /* [Virt] QmMapTopOp ::= QmMapOp | QmDropQuadMap | QmDrop */
+spar_qm_map_top_op /* [Virt] QmMapTopOp ::= QmMapOp | QmDropQuadMap | QmDrop | QmAttachMacroLib | QmDetachMacroLib */
: 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 )* '.'? '}' */
@@ -2113,14 +2592,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),
- (SPART **)t_list_concat ((caddr_t)$6, (caddr_t)t_list (2, t_box_dv_uname_string ("ID"), $2)) ) ); }
+ t_spartlist_concat ($6, (SPART **)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),
- (SPART **)t_list_concat ((caddr_t)$7, (caddr_t)t_list (2, t_box_dv_uname_string ("GRAPH"), $3)) ) ); }
+ t_spartlist_concat ($7, (SPART **)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),
@@ -2199,7 +2678,7 @@ spar_qm_prop /* [Virt] QmProp ::= QmVerb QmObjField ( ',' QmObjField )* */
((NULL != $1) ? ((SPART *)($1)) : spar_qm_get_local (sparp_arg, PREDICATE_L, 1)),
0 ); }
spar_qm_obj_field_commalist {}
- | error { sparyyerror ("Description of predicate field is expected here"); }
+ | error { sparyyerror (sparp_arg, "Description of predicate field is expected here"); }
;
spar_qm_obj_field_commalist /* ::= QmObjField QmIdSuffix? ( ',' QmObjField QmIdSuffix? )* */
@@ -2225,7 +2704,7 @@ spar_qm_obj_field /* [Virt] QmObjField ::= QmFieldOrBlank QmCondition* QmOptio
spar_qm_where_list_opt {
spar_qm_push_local (sparp_arg, WHERE_L, (SPART *)t_revlist_to_array ($7), 0); }
spar_qm_options_opt { $$ = $9; }
- | error { sparyyerror ("Description of object field is expected here"); }
+ | error { sparyyerror (sparp_arg, "Description of object field is expected here"); }
;
spar_qm_as_id_opt /* [Virt] QmIdSuffix ::= 'AS' QmIRIrefConst */
@@ -2236,7 +2715,7 @@ spar_qm_as_id_opt /* [Virt] QmIdSuffix ::= 'AS' QmIRIrefConst */
spar_qm_obj_datatype_opt
: /* empty */ { $$ = NULL; }
| DATATYPE_L spar_iriref { $$ = (SPART *)$2->_.lit.val; }
- | DATATYPE_L IRI_L _LPAR SPARQL_STRING _RPAR { sparyyerror ("Datatype of object field should be either constant IRI or table field, not template IRI (string)"); }
+ | DATATYPE_L IRI_L _LPAR SPARQL_STRING _RPAR { sparyyerror (sparp_arg, "Datatype of object field should be either constant IRI or table field, not template IRI (string)"); }
| DATATYPE_L spar_qm_sqlcol { $$ = spar_make_qm_col_desc (sparp_arg, $2); }
;
@@ -2247,20 +2726,20 @@ spar_qm_obj_language_opt
;
spar_qm_verb /* [Virt] QmVerb ::= QmField | ( '[' ']' ) | 'a' */
- : spar_qm_field { $$ = $1; }
+ : spar_qm_field
| _LSQBRA _RSQBRA { $$ = NULL; }
| a_L { $$ = (SPART *)uname_rdf_ns_uri_type; }
;
spar_qm_field_or_blank /* [Virt] QmFieldOrBlank ::= QmField | ( '[' ']' ) */
- : spar_qm_field { $$ = $1; }
+ : spar_qm_field
| _LSQBRA _RSQBRA { $$ = NULL; }
;
spar_qm_field /* [Virt] QmField ::= */
: spar_qm_iriref_const_expn { $$ = (SPART *)$1; } /* see case below */
- | spar_numeric_literal { $$ = $1; } /*... NumericLiteral */
- | spar_rdf_literal { $$ = $1; } /*... | RdfLiteral */
+ | spar_numeric_literal /*... NumericLiteral */
+ | spar_rdf_literal /*... | 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)); }
@@ -2270,7 +2749,7 @@ spar_qm_field /* [Virt] QmField ::= */
spar_qm_where_list_opt
: /* empty */ { $$ = NULL; }
- | spar_qm_where_list { $$ = $1; }
+ | spar_qm_where_list
;
spar_qm_where_list
@@ -2314,7 +2793,7 @@ spar_qm_option /* [Virt] QmOption ::= ( 'SOFT'? 'EXCLUSIVE' ) | ( 'ORDER' INT
spar_qm_sqlcol_commalist_opt /* ::= ( QmSqlCol ( ',' QmSqlCol )* )? */
: /* empty */ { $$ = NULL; }
- | spar_qm_sqlcol_commalist { $$ = $1; }
+ | spar_qm_sqlcol_commalist
;
spar_qm_sqlcol_commalist /* ::= QmSqlCol ( ',' QmSqlCol )* */
@@ -2339,7 +2818,7 @@ spar_qm_sqlfunc_arglist /* [Virt] QmSqlfuncArglist ::= '(' ( QmSqlfuncArg ( ',
spar_qm_sqlfunc_arg_commalist_opt /* ::= ( QmSqlfuncArg ( ',' QmSqlfuncArg )* )? */
: /* empty */ { $$ = NULL; }
- | spar_qm_sqlfunc_arg_commalist { $$ = $1; }
+ | spar_qm_sqlfunc_arg_commalist
;
spar_qm_sqlfunc_arg_commalist /* ::= QmSqlfuncArg ( ',' QmSqlfuncArg )* */
@@ -2370,10 +2849,10 @@ spar_qm_sqlcol /* [Virt] QmSqlCol ::= QmSqlId | spar_qm_sql_id */
;
spar_qm_sql_id /* [Virt] QmSqlId ::= PLAIN_ID | 'TEXT' | 'XML' */
- : SPARQL_PLAIN_ID { $$ = $1; }
- | TEXT_BL { $$ = $1; }
- | XML_BL { $$ = $1; }
- /*| a_L { $$ = t_box_dv_short_string ("a"); }*/
+ : 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"); }*/
;
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 efee178..5bd954d 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.3 2011/06/11 16:41:47 source Exp $
+ * $Id$
*
* Quad map description language extension for SPARQL
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sparql_rdb2rdf.c b/libsrc/Wi/sparql_rdb2rdf.c
index ca70c8f..0e553bc 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.3 2011/06/07 18:53:07 source Exp $
+ * $Id$
*
* 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-2010 OpenLink Software
+ * 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
@@ -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 */
+ 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 */
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,6 +94,8 @@ 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 */
@@ -181,6 +183,21 @@ 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)
{
@@ -388,15 +405,26 @@ 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 = 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))
+ 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)
{
+ 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++)
{
@@ -409,6 +437,11 @@ 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);
@@ -819,6 +852,8 @@ 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;
@@ -1059,7 +1094,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, rro->rro_aliases_of_main_table->data, 0, ssg);
+ rdb2rdf_qm_codegen (rrc, rro, table_name, opcode, subopcode, prefix, (ccaddr_t)(rro->rro_aliases_of_main_table->data), 0, ssg);
break;
case RDB2RDF_CODEGEN_INITIAL_SUB_MULTI:
if (!single_use_of_single_main)
@@ -1237,7 +1272,7 @@ next_qm: ;
}
caddr_t
-bif_sparql_rdb2rdf_impl (caddr_t * qst, caddr_t table_name, int opcode, int rule_id_seed, int only_list_tables)
+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)
{
caddr_t storage_name = uname_virtrdf_ns_uri_SyncToQuads;
quad_storage_t *storage = sparp_find_storage_by_name (storage_name);
@@ -1256,6 +1291,41 @@ bif_sparql_rdb2rdf_impl (caddr_t * qst, caddr_t table_name, int opcode, int rule
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);
@@ -1327,17 +1397,20 @@ bif_sparql_rdb2rdf_impl (caddr_t * qst, caddr_t table_name, int opcode, int rule
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);
- int rule_id_seed = (3 <= BOX_ELEMENTS (args)) ?
- bif_long_arg (qst, args, 2, "sparql_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") :
(adler32_of_buffer ((unsigned char *)table_name, box_length (table_name)-1) ^ opcode);
- return bif_sparql_rdb2rdf_impl (qst, table_name, opcode, rule_id_seed, 0);
+ return bif_sparql_rdb2rdf_impl (qst, table_name, opcode, graph_xlat, 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, 0 /*fake*/, 1);
+ return bif_sparql_rdb2rdf_impl (qst, NULL, opcode, NULL, 0 /*fake*/, 1);
}
diff --git a/libsrc/Wi/sparql_sff.c b/libsrc/Wi/sparql_sff.c
index fb03b9e..c0cf1f2 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.6 2011/07/19 23:34:42 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sparql_tree.c b/libsrc/Wi/sparql_tree.c
index 3b97333..fc397ad 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.23 2011/05/23 13:44:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -21,6 +21,7 @@
*
*/
+#include "sparql.h"
#include "sparql2sql.h"
#include "sqlparext.h"
#include "arith.h"
@@ -52,6 +53,51 @@ 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
@@ -69,8 +115,8 @@ sparp_gp_trav_int (sparp_t *sparp, SPART *tree,
int sub_gp_count = 0, sub_expn_count = 0, ctr;
int tree_cat = 0;
int in_rescan = 0;
- sparp_trav_state_t *save_sts_this = BADBEEF_BOX; /* To keep gcc 4.0 happy */
- SPART *save_ancestor_gp = BADBEEF_BOX; /* To keep gcc 4.0 happy */
+ sparp_trav_state_t *save_sts_this = (sparp_trav_state_t *)(BADBEEF_BOX); /* To keep gcc 4.0 happy */
+ SPART *save_ancestor_gp = (SPART *)(BADBEEF_BOX); /* To keep gcc 4.0 happy */
int retcode = 0;
if (THR_IS_STACK_OVERFLOW (THREAD_CURRENT_THREAD, &sub_gps, 1000))
@@ -113,7 +159,7 @@ scan_for_children:
{
tree_cat = 1;
sub_expns = tree->_.builtin.args;
- sub_expn_count = BOX_ELEMENTS (sub_expns);
+ sub_expn_count = BOX_ELEMENTS_0 (sub_expns);
break;
}
case SPAR_FUNCALL:
@@ -147,7 +193,7 @@ scan_for_children:
sub_expn_count = BOX_ELEMENTS (sub_expns);
break;
}
- case BOP_EQ: case BOP_NEQ:
+ case BOP_EQ: case SPAR_BOP_EQ: case BOP_NEQ:
case BOP_LT: case BOP_LTE: case BOP_GT: case BOP_GTE:
/*case BOP_LIKE: Like is built-in in SPARQL, not a BOP! BTW, 'IN' is also BOP */
case BOP_SAME: case BOP_NSAME:
@@ -321,6 +367,7 @@ sparp_trav_out_clauses_int (sparp_t *sparp, SPART *req_top,
lists[1] = req_top->_.req_top.retvals;
lists[2] = req_top->_.req_top.groupings;
lists[3] = req_top->_.req_top.order;
+ sts_this->sts_parent = sts_this->sts_ancestor_gp = req_top->_.req_top.pattern;
for (list_ctr = 0; list_ctr <= 4; list_ctr++)
{
SPART **list = ((4 == list_ctr) ? &(req_top->_.req_top.having) : lists [list_ctr]);
@@ -497,6 +544,503 @@ 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 SPAR_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 *
@@ -537,6 +1081,31 @@ sparp_equiv_alloc (sparp_t *sparp)
return res;
}
+void
+sparp_equiv_dbg_gp_print (sparp_t *sparp, SPART *tree)
+{
+ int eq_ctr, eq_count;
+ eq_count = tree->_.gp.equiv_count;
+ SPARP_FOREACH_GP_EQUIV(sparp,tree,eq_ctr,eq)
+ {
+ int varname_count, varname_ctr;
+ spar_dbg_printf ((" ( %d subv (%d bindings), %d recv, %d gspo, %d const, %d opt, %d subq:",
+ BOX_ELEMENTS_INT_0(eq->e_subvalue_idxs), (int)(eq->e_nested_bindings), BOX_ELEMENTS_INT_0(eq->e_receiver_idxs),
+ (int)(eq->e_gspo_uses), (int)(eq->e_const_reads), (int)(eq->e_optional_reads), (int)(eq->e_subquery_uses) ));
+ varname_count = BOX_ELEMENTS (eq->e_varnames);
+ for (varname_ctr = 0; varname_ctr < varname_count; varname_ctr++)
+ {
+ spar_dbg_printf ((" %s", eq->e_varnames[varname_ctr]));
+ }
+ if (SPART_BAD_EQUIV_IDX != eq->e_external_src_idx)
+ {
+ spar_dbg_printf (("; parent #%d", (int)(eq->e_external_src_idx)));
+ }
+ spar_dbg_printf ((")"));
+ } END_SPARP_FOREACH_GP_EQUIV;
+ spar_dbg_printf (("\n"));
+}
+
sparp_equiv_t *
sparp_equiv_get (sparp_t *sparp, SPART *haystack_gp, SPART *needle_var, int flags)
{
@@ -568,9 +1137,10 @@ sparp_equiv_get (sparp_t *sparp, SPART *haystack_gp, SPART *needle_var, int flag
}
if ((flags & SPARP_EQUIV_INS_VARIABLE) && strcmp (needle_var->_.var.selid, haystack_gp->_.gp.selid))
{
+/* this masqeraded an error:
if (needle_var->_.var.selid == uname_nil)
needle_var->_.var.selid = haystack_gp->_.gp.selid;
- else
+ else */
spar_internal_error (sparp, "sparp_" "equiv_get() with SPARP_EQUIV_INS_VARIABLE and wrong selid");
}
#endif
@@ -607,6 +1177,8 @@ sparp_equiv_get (sparp_t *sparp, SPART *haystack_gp, SPART *needle_var, int flag
goto retnull;
curr_eq = sparp_equiv_alloc (sparp);
curr_eq->e_gp = haystack_gp;
+ if (SPAR_GP != haystack_gp->type)
+ spar_internal_error (sparp, "sparp_" "equiv_get() with non-gp haystack");
if (BOX_ELEMENTS_INT_0 (eq_idxs) == eqcount)
{
size_t new_size = ((NULL == eq_idxs) ? 4 * sizeof (ptrlong) : 2 * box_length (eq_idxs));
@@ -642,7 +1214,7 @@ sparp_equiv_get (sparp_t *sparp, SPART *haystack_gp, SPART *needle_var, int flag
curr_eq->e_optional_reads++;
}
#ifdef SPARQL_DEBUG
- sparp_dbg_gp_print (sparp, haystack_gp);
+ sparp_equiv_dbg_gp_print (sparp, haystack_gp);
#endif
return curr_eq;
@@ -653,7 +1225,7 @@ namesake_found:
curr_eq->e_subquery_uses++;
if (SPARP_EQUIV_ADD_OPTIONAL_READ & flags)
curr_eq->e_optional_reads++;
- return curr_eq;
+ return curr_eq;
}
curr_vars = curr_eq->e_vars;
varcount = curr_eq->e_var_count;
@@ -681,7 +1253,7 @@ namesake_found:
needle_var->_.var.equiv_idx = curr_eq->e_own_idx;
curr_eq->e_var_count = varcount;
#ifdef SPARQL_DEBUG
- sparp_dbg_gp_print (sparp, haystack_gp);
+ sparp_equiv_dbg_gp_print (sparp, haystack_gp);
#endif
return curr_eq;
@@ -1132,10 +1704,12 @@ sparp_equiv_merge (sparp_t *sparp, sparp_equiv_t *pri, sparp_equiv_t *sec)
}
}
#endif
+#if 0 /* I can't recall why did I add these restrictions, probably to cut the amount of testing. Now they're preventing from a bugfixing, but related situations are still not tested entirely */
if ((pri->e_rvr.rvrRestrictions & SPART_VARR_EXPORTED) && (sec->e_rvr.rvrRestrictions & SPART_VARR_EXPORTED))
return SPARP_EQUIV_MERGE_ROLLBACK;
if ((0 != pri->e_subquery_uses) || (0 != sec->e_subquery_uses))
return SPARP_EQUIV_MERGE_ROLLBACK;
+#endif
ret = sparp_equiv_restrict_by_constant (sparp, pri, sec->e_rvr.rvrDatatype, (SPART *)(sec->e_rvr.rvrFixedValue));
if (SPARP_EQUIV_MERGE_ROLLBACK == ret)
return ret;
@@ -1154,6 +1728,7 @@ 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;
@@ -1207,7 +1782,8 @@ rvr_string_fixedvalue (rdf_val_range_t *rvr)
return NULL;
}
-int sparp_fixedvalues_equal (sparp_t *sparp, SPART *first, SPART *second)
+int
+sparp_fixedvalues_equal (sparp_t *sparp, SPART *first, SPART *second)
{
caddr_t first_val, first_language = NULL;
caddr_t second_val, second_language = NULL;
@@ -1239,6 +1815,52 @@ int sparp_fixedvalues_equal (sparp_t *sparp, SPART *first, SPART *second)
}
int
+rvr_can_be_tightned (sparp_t *sparp, rdf_val_range_t *dest, rdf_val_range_t *add_on, int assume_binv_var_and_eq)
+{
+ if (dest->rvrRestrictions & SPART_VARR_CONFLICT)
+ return 0; /* Can't be tighened --- it's conflict already, no matter how many reasons do we have for that */
+ if (add_on->rvrRestrictions & ~(dest->rvrRestrictions) &
+ ( SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_IS_BLANK | SPART_VARR_IRI_CALC | SPART_VARR_IS_LIT |
+ SPART_VARR_TYPED | SPART_VARR_FIXED | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL | SPART_VARR_ALWAYS_NULL ) )
+ return 1;
+ if ((add_on->rvrRestrictions & SPART_VARR_TYPED) && strcmp (dest->rvrDatatype, add_on->rvrDatatype))
+ return 1; /* Both are typed (if add_on is typed and dest is not then flag diff woud return 1 before), different types would tighten to the conflict */
+ if ( strcmp (
+ ((NULL == dest->rvrLanguage) ? "" : dest->rvrLanguage),
+ ((NULL == add_on->rvrLanguage) ? "" : add_on->rvrLanguage) ) )
+ return 1; /* different languages would tighten to the conflict */
+ if ((add_on->rvrRestrictions & SPART_VARR_FIXED) && !sparp_fixedvalues_equal (sparp, (SPART *)(dest->rvrFixedValue), (SPART *)(add_on->rvrFixedValue)))
+ return 1; /* different fixed values would tighten to the conflict */
+ if (add_on->rvrRestrictions & SPART_VARR_IRI_CALC)
+ {
+ if (assume_binv_var_and_eq)
+ {
+ if (add_on->rvrSprintffCount < dest->rvrSprintffCount)
+ return 1;
+ }
+ else
+ {
+ if ((add_on->rvrSprintffCount != dest->rvrSprintffCount) || memcmp (add_on->rvrSprintffs, dest->rvrSprintffs, add_on->rvrSprintffCount * sizeof (ccaddr_t)))
+ return 1;
+ }
+ }
+ if (add_on->rvrRedCutCount)
+ {
+ if (assume_binv_var_and_eq)
+ {
+ if (add_on->rvrRedCutCount > dest->rvrRedCutCount)
+ return 1;
+ }
+ else
+ {
+ if ((add_on->rvrRedCutCount != dest->rvrRedCutCount) || memcmp (add_on->rvrRedCuts, dest->rvrRedCuts, add_on->rvrRedCutCount * sizeof (ccaddr_t)))
+ return 1;
+ }
+ }
+ return 0;
+}
+
+int
sparp_equivs_have_same_fixedvalue (sparp_t *sparp, sparp_equiv_t *first_eq, sparp_equiv_t *second_eq)
{
if (!(SPART_VARR_FIXED & first_eq->e_rvr.rvrRestrictions))
@@ -1252,7 +1874,6 @@ sparp_equivs_have_same_fixedvalue (sparp_t *sparp, sparp_equiv_t *first_eq, spar
return sparp_fixedvalues_equal (sparp, (SPART *)(first_eq->e_rvr.rvrFixedValue), (SPART *)(second_eq->e_rvr.rvrFixedValue));
}
-
void
sparp_rvr_add_iri_classes (sparp_t *sparp, rdf_val_range_t *rvr, ccaddr_t *add_classes, ptrlong add_count)
{
@@ -1317,12 +1938,12 @@ next_ctr:
{
if (old == addon_superclasses [cmpctr]) /* A superclass is already here */
{
- dk_free_tree (addon_superclasses);
+ dk_free_tree ((caddr_t)addon_superclasses);
goto skip_addon; /* see below */
}
}
}
- dk_free_tree (addon_superclasses);
+ dk_free_tree ((caddr_t)addon_superclasses);
addon_subclasses = jso_triple_get_subjs ((caddr_t *)(sparp->sparp_sparqre->sparqre_qi), (caddr_t) uname_virtrdf_ns_uri_isSubclassOf, (caddr_t) addon);
cmpcount = BOX_ELEMENTS (addon_subclasses);
for (ctr = 0; ctr < len; ctr++)
@@ -1338,7 +1959,7 @@ next_ctr:
}
}
}
- dk_free_tree (addon_subclasses);
+ dk_free_tree ((caddr_t)addon_subclasses);
rvr->rvrIriClasses [len++] = addon;
skip_addon: ;
}
@@ -1392,12 +2013,12 @@ next_isectctr:
{
if (isect_classes [isectctr] == old_superclasses [cmpctr]) /* Found in isect */
{
- dk_free_tree (old_superclasses);
+ dk_free_tree ((caddr_t)old_superclasses);
goto test_next_old; /* see below */
}
}
}
- dk_free_tree (old_superclasses);
+ dk_free_tree ((caddr_t)old_superclasses);
/* At this point we know that \c old is out of intersection. Let's remove it. */
if (ctr < (len-1))
rvr->rvrIriClasses [ctr] = rvr->rvrIriClasses [len - 1];
@@ -1437,7 +2058,7 @@ next_isectctr:
}
test_next_subclass: ;
}
- dk_free_tree (old_subclasses);
+ dk_free_tree ((caddr_t)old_subclasses);
test_next_old: ;
}
rvr->rvrIriClassCount = len;
@@ -1607,11 +2228,21 @@ sparp_rvr_set_by_constant (sparp_t *sparp, rdf_val_range_t *dest, ccaddr_t datat
#endif
dest->rvrFixedValue = value->_.lit.val;
dest->rvrRestrictions |= (SPART_VARR_IS_REF | SPART_VARR_FIXED | SPART_VARR_NOT_NULL);
+ /* 0123456789 */
+ if (!strncmp (value->_.lit.val, "nodeID://", 9))
+ dest->rvrRestrictions |= SPART_VARR_IS_BLANK;
+ else
+ dest->rvrRestrictions |= SPART_VARR_IS_IRI;
}
else if (DV_UNAME == DV_TYPE_OF (value))
{
dest->rvrFixedValue = (ccaddr_t)value;
dest->rvrRestrictions |= (SPART_VARR_IS_REF | SPART_VARR_FIXED | SPART_VARR_NOT_NULL);
+ /* 0123456789 */
+ if (!strncmp ((ccaddr_t)value, "nodeID://", 9))
+ dest->rvrRestrictions |= SPART_VARR_IS_BLANK;
+ else
+ dest->rvrRestrictions |= SPART_VARR_IS_IRI;
}
else
{
@@ -2200,17 +2831,34 @@ sparp_gp_detach_member_int (sparp_t *sparp, SPART *parent_gp, int member_idx, dk
for (var_ctr = eq->e_var_count; var_ctr--; /* no step */) /* The order is important due to sparp_equiv_remove_var() */
{
SPART *var = eq->e_vars[var_ctr];
+ if (NULL == var->_.var.tabid)
+ continue;
if (strcmp (var->_.var.tabid, memb->_.triple.tabid))
continue;
sparp_equiv_remove_var (sparp, eq, var);
if (NULL != touched_equivs_set_ptr)
t_set_pushnew (touched_equivs_set_ptr, eq);
- if (NULL != var->_.var.tabid)
- eq->e_gspo_uses--;
- var->_.var.selid = uname_nil;
+ eq->e_gspo_uses--;
+ /* this masqeraded an error: var->_.var.selid = uname_nil; */
}
}
END_SPARP_FOREACH_GP_EQUIV;
+#ifdef DEBUG
+ {
+ SPART **opts = memb->_.triple.options;
+ int optctr;
+ for (optctr = BOX_ELEMENTS (opts)-1; 0 < optctr; optctr -= 2)
+ {
+ SPART *var = opts[optctr];
+ if (SPAR_VARIABLE == SPART_TYPE (var))
+ {
+ sparp_equiv_t *eq = sparp_equiv_get (sparp, parent_gp, var, 0);
+ if (NULL != eq)
+ spar_internal_error (sparp, "sparp_" "gp_detach_member_int (): option var is not removed from equiv");
+ }
+ }
+ }
+#endif
}
}
return memb;
@@ -2242,7 +2890,7 @@ sparp_treelist_full_clone_int (sparp_t *sparp, SPART **origs, SPART *parent_gp);
SPART *
sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
{
- int filt_ctr, memb_ctr, eq_ctr, arg_ctr, fld_ctr, eq_idx, cloned_eq_idx;
+ int eq_ctr, arg_ctr, fld_ctr, eq_idx, cloned_eq_idx;
SPART *tgt;
switch (SPART_TYPE (orig))
{
@@ -2269,17 +2917,23 @@ sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
break;
if (0 > var_pos)
spar_internal_error (sparp, "sparp_" "tree_full_clone_int(): orig var is not in its eq");
+#if 0
if (var_pos >= BOX_ELEMENTS (cloned_eq->e_vars))
spar_internal_error (sparp, "sparp_" "tree_full_clone_int(): mismatch of lengths of buffers for variables in orig and clone equivs");
if (NULL != cloned_eq->e_vars [var_pos])
spar_internal_error (sparp, "sparp_" "tree_full_clone_int(): cloned variable overwrites an var in cloned equiv");
+ cloned_eq->e_vars [var_pos] = tgt;
+ if (cloned_eq->e_var_count <= var_pos)
+ cloned_eq->e_var_count = var_pos + 1;
+#else
+ if (BOX_ELEMENTS (cloned_eq->e_vars) <= cloned_eq->e_var_count)
+ spar_internal_error (sparp, "sparp_" "tree_full_clone_int(): mismatch of lengths of buffer for variables in clone equiv and the number of variables");
+ cloned_eq->e_vars [cloned_eq->e_var_count++] = tgt;
+#endif
if (NULL != orig->_.var.tabid)
cloned_eq->e_gspo_uses += 1;
else
cloned_eq->e_const_reads += 1;
- cloned_eq->e_vars [var_pos] = tgt;
- if (cloned_eq->e_var_count <= var_pos)
- cloned_eq->e_var_count = var_pos + 1;
}
else
{
@@ -2287,10 +2941,14 @@ sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
if (NULL != cloned_eq)
spar_internal_error (sparp, "sparp_" "tree_full_clone_int(): cloned variable is in equiv, original is not");
}
+#ifdef DEBUG
+ if (strcmp (orig->_.var.selid, parent_gp->_.gp.selid))
+ spar_internal_error (sparp, "sparp_" "tree_full_clone_int(): orig var is not from parent gp");
+#endif
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:
@@ -2329,20 +2987,8 @@ sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
}
}
if (NULL != orig->_.gp.filters)
- {
- tgt->_.gp.filters = (SPART **)t_box_copy ((caddr_t)(orig->_.gp.filters));
- DO_BOX_FAST_REV (SPART *, filt, filt_ctr, orig->_.gp.filters)
- {
- tgt->_.gp.filters [filt_ctr] = sparp_tree_full_clone_int (sparp, filt, orig);
- }
- END_DO_BOX_FAST_REV;
- }
- tgt->_.gp.members = (SPART **)t_box_copy ((caddr_t)(orig->_.gp.members));
- DO_BOX_FAST_REV (SPART *, memb, memb_ctr, orig->_.gp.members)
- {
- tgt->_.gp.members [memb_ctr] = sparp_tree_full_clone_int (sparp, memb, orig);
- }
- END_DO_BOX_FAST_REV;
+ tgt->_.gp.filters = sparp_treelist_full_clone_int (sparp, orig->_.gp.filters, orig);
+ tgt->_.gp.members = sparp_treelist_full_clone_int (sparp, orig->_.gp.members, orig);
if (NULL != orig->_.gp.subquery)
tgt->_.gp.subquery = sparp_tree_full_clone_int (sparp, orig->_.gp.subquery, orig);
if (NULL != orig->_.gp.options)
@@ -2390,7 +3036,12 @@ sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
}
END_DO_BOX_FAST_REV;
}
+#if 0 /* old clone, with preserved positions of variables */
cloned_eq->e_var_count = eq->e_var_count;
+#else
+ if (cloned_eq->e_var_count > eq->e_var_count)
+ spar_internal_error (sparp, "sparp_" "tree_full_clone_int(): mismatching number of cloned variables");
+#endif
cloned_eq->e_gspo_uses = eq->e_gspo_uses;
cloned_eq->e_nested_bindings = eq->e_nested_bindings;
cloned_eq->e_const_reads = eq->e_const_reads;
@@ -2436,7 +3087,7 @@ sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
tgt->_.req_top.order = sparp_treelist_full_clone_int (sparp, orig->_.req_top.order, orig_pattern);
return tgt;
}
- case BOP_EQ: case BOP_NEQ:
+ case BOP_EQ: case SPAR_BOP_EQ: case BOP_NEQ:
case BOP_LT: case BOP_LTE: case BOP_GT: case BOP_GTE:
/*case BOP_LIKE: Like is built-in in SPARQL, not a BOP! */
case BOP_SAME: case BOP_NSAME:
@@ -2453,7 +3104,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)
{
@@ -2471,6 +3122,28 @@ 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_SERVICE_INV:
+ tgt = (SPART *)t_box_copy ((caddr_t) orig);
+ tgt->_.sinv.own_idx = 0; /* will be set by spar_add_service_inv_to_sg() below */
+ /* endpoint, iri_params, syntax, storage_iri, in_list_implicit are not copied --- no need so far */
+ 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 = sparp_treelist_full_copy (sparp, orig->_.sinv.defines, parent_gp);
+ spar_add_service_inv_to_sg (sparp, tgt);
+ 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. */
}
@@ -2525,13 +3198,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 fld_ctr, eq_idx;
+ int defctr, defcount, fld_ctr, eq_idx;
SPART *tgt;
switch (SPART_TYPE (orig))
{
case SPAR_ALIAS:
tgt = (SPART *)t_box_copy ((caddr_t) orig);
- tgt->_.alias.aname = t_box_copy (orig->_.alias.aname);
+ 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.arg = sparp_tree_full_copy (sparp, orig->_.alias.arg, parent_gp);
return tgt;
case SPAR_BLANK_NODE_LABEL: case SPAR_VARIABLE:
@@ -2548,7 +3221,9 @@ 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);
@@ -2588,7 +3263,7 @@ sparp_tree_full_copy (sparp_t *sparp, const SPART *orig, const SPART *parent_gp)
tgt->_.req_top.limit = sparp_tree_full_copy (sparp, orig->_.req_top.limit, parent_gp);
tgt->_.req_top.offset = sparp_tree_full_copy (sparp, orig->_.req_top.offset, parent_gp);
return tgt;
- case BOP_EQ: case BOP_NEQ:
+ case BOP_EQ: case SPAR_BOP_EQ: case BOP_NEQ:
case BOP_LT: case BOP_LTE: case BOP_GT: case BOP_GTE:
/*case BOP_LIKE: Like is built-in in SPARQL, not a BOP! */
case BOP_SAME: case BOP_NSAME:
@@ -2609,6 +3284,34 @@ 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. */
}
@@ -2689,22 +3392,22 @@ sparp_gp_attach_member_int (sparp_t *sparp, SPART *parent_gp, SPART *memb, dk_se
if (SPAR_TRIPLE != SPART_TYPE (memb))
spar_internal_error (sparp, "sparp_" "gp_attach_member(): type of memb is neither SPAR_GP nor SPAR_TRIPLE");
#endif
+ memb->_.triple.selid = /*t_box_copy*/ (parent_gp->_.gp.selid);
for (fld_ctr = SPART_TRIPLE_FIELDS_COUNT; fld_ctr--; /*no step*/)
{
SPART *field = memb->_.triple.tr_fields [fld_ctr];
if (SPAR_IS_BLANK_OR_VAR(field))
{
sparp_equiv_t *parent_eq;
- field->_.var.selid = t_box_copy (parent_gp->_.gp.selid);
+ field->_.var.selid = memb->_.triple.selid;
parent_eq = sparp_equiv_get (sparp, parent_gp, field, SPARP_EQUIV_INS_VARIABLE | SPARP_EQUIV_INS_CLASS | SPARP_EQUIV_ADD_GSPO_USE);
}
}
if (NULL != memb->_.triple.options)
{
- sparp_set_options_selid_and_tabid (sparp, memb->_.triple.options, parent_gp->_.gp.selid, memb->_.triple.tabid);
+ sparp_set_options_selid_and_tabid (sparp, memb->_.triple.options, memb->_.triple.selid, memb->_.triple.tabid);
sparp_gp_trav_cu_in_options (sparp, parent_gp, memb, memb->_.triple.options, NULL);
}
- memb->_.triple.selid = t_box_copy (parent_gp->_.gp.selid);
}
}
@@ -3082,11 +3785,7 @@ sparp_find_triple_of_var_or_retval (sparp_t *sparp, SPART *gp, SPART *var, int n
return NULL;
if (NULL == gp)
{
-#if 0
- gp = sparp_find_gp_by_alias_int (sparp, sparp->sparp_expr->_.req_top.pattern, var->_.var.selid);
-#else
gp = sparp_find_gp_by_alias (sparp, var->_.var.selid);
-#endif
if (NULL == gp)
return NULL;
}
@@ -3207,6 +3906,23 @@ SPART *sparp_find_gp_by_eq_idx (sparp_t *sparp, ptrlong eq_idx)
return NULL;
}
+int
+sparp_find_language_dialect_by_service (sparp_t *sparp, SPART *service_expn)
+{
+ caddr_t service_iri = SPAR_LIT_OR_QNAME_VAL (service_expn);
+ caddr_t *lang_strs;
+ int res;
+ if ((DV_STRING != DV_TYPE_OF (service_iri)) && (DV_UNAME != DV_TYPE_OF (service_iri)))
+ return 0;
+ lang_strs = jso_triple_get_objs ((caddr_t *)(sparp->sparp_sparqre->sparqre_qi), service_iri, uname_virtrdf_ns_uri_dialect);
+ if (1 != BOX_ELEMENTS_0 (lang_strs))
+ return 0;
+ if (1 != sscanf (lang_strs[0], "%08x", &res))
+ return 0;
+ if (0 > res)
+ return 0;
+ return res;
+}
quad_storage_t *
sparp_find_storage_by_name (ccaddr_t name)
@@ -3262,7 +3978,7 @@ sparp_find_origin_of_external_var (sparp_t *sparp, SPART *var, int find_exact_sp
}
if (SPAR_BINDINGS_INV == esrc->e_gp->type) /* An external variable may come from bindings invocation instead of a GP. Binding var is the only choice then. */
return esrc->e_vars[0];
- if (UNION_L == esrc->e_gp->type) /* No one specimen from (one branch of) union can reliably represent all cases a union can produce. */
+ if (UNION_L == esrc->e_gp->_.gp.subtype) /* No one specimen from (one branch of) union can reliably represent all cases a union can produce. */
{
esub_res_eq = esrc;
esub_res_gp = esrc->e_gp;
@@ -3312,16 +4028,17 @@ sparp_find_origin_of_external_var (sparp_t *sparp, SPART *var, int find_exact_sp
if (NULL != esub_res)
{
if (find_exact_specimen)
- return esub_res;
+ return esub_res;
goto make_rv; /* see below */
}
DO_BOX_FAST (ptrlong, subeq_idx, subv_ctr, esrc->e_subvalue_idxs)
{
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;
+ if (esub_eq == eq) /* Are we back to the starting point of the search? No good, ignoring. */
+ continue;
esub_res_eq = esub_eq;
esub_res_gp = esub_gp;
goto make_rv; /* see below */
@@ -3330,6 +4047,7 @@ 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));
@@ -3338,6 +4056,38 @@ make_rv:
return rv;
}
+int
+sparp_find_sinv_rset_pos_of_varname (sparp_t *sparp, SPART *service_gp, caddr_t e_varname)
+{
+ int pos;
+ sparp_equiv_t *e_eq;
+ SPART *sinv = sparp_get_option (sparp, service_gp->_.gp.options, SPAR_SERVICE_INV);
+/* An optimistic search first: */
+ DO_BOX_FAST_REV (caddr_t, ret_vname, pos, sinv->_.sinv.rset_varnames)
+ {
+ if (!strcmp (e_varname, ret_vname))
+ return pos;
+ }
+ END_DO_BOX_FAST_REV;
+/* In order to avoid bug 14730, now it's time to check for appropriate synonyms */
+ e_eq = sparp_equiv_get (sparp, service_gp, (SPART *)e_varname, SPARP_EQUIV_GET_NAMESAKES);
+ if (NULL != e_eq)
+ {
+ int vnamectr;
+ DO_BOX_FAST_REV (caddr_t, e_eq_varname, vnamectr, e_eq->e_varnames)
+ {
+ DO_BOX_FAST_REV (caddr_t, ret_vname, pos, sinv->_.sinv.rset_varnames)
+ {
+ if (!strcmp (e_eq_varname, ret_vname))
+ return pos;
+ }
+ END_DO_BOX_FAST_REV;
+ }
+ END_DO_BOX_FAST_REV;
+ }
+ return -1;
+}
+
SPART *
sparp_find_subexpn_in_retlist (sparp_t *sparp, ccaddr_t varname, SPART **retvals, int return_alias)
{
@@ -3664,6 +4414,7 @@ spart_dump_opname (ptrlong opname, int is_op)
case BOP_OR: return "boolean operation 'OR'";
case BOP_NOT: return "boolean operation 'NOT'";
case BOP_EQ: return "boolean operation '='";
+ case SPAR_BOP_EQ: return "special equality";
case BOP_NEQ: return "boolean operation '!='";
case BOP_LT: return "boolean operation '<'";
case BOP_LTE: return "boolean operation '<='";
@@ -3685,10 +4436,11 @@ 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";
@@ -3696,18 +4448,12 @@ 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";
@@ -3717,12 +4463,10 @@ 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 SERVICE_L: return "SERVICE gp";
case SUBJECT_L: return "SUBJECT";
case true_L: return "true boolean";
case UNION_L: return "UNION gp";
@@ -4007,7 +4751,10 @@ spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, in
{
sprintf (buf, "BUILT-IN CALL:");
SES_PRINT (ses, buf);
- spart_dump_long ((void *)(tree->_.builtin.btype), ses, -1);
+ 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 (tree->_.builtin.args, ses, indent+2, "ARGUMENT", -2);
break;
}
@@ -4091,10 +4838,11 @@ spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, in
spart_dump (tree->_.req_top.sources, ses, indent+2, "SOURCES", -2);
spart_dump (tree->_.req_top.pattern, ses, indent+2, "PATTERN", -1);
spart_dump (tree->_.req_top.groupings, ses, indent+2, "GROUPINGS", -2);
- spart_dump (tree->_.req_top.having, ses, indent+2, "HAVING", -2);
+ spart_dump (tree->_.req_top.having, ses, indent+2, "HAVING", -1);
spart_dump (tree->_.req_top.order, ses, indent+2, "ORDER", -2);
spart_dump ((void *)(tree->_.req_top.limit), ses, indent+2, "LIMIT", -1);
spart_dump ((void *)(tree->_.req_top.offset), ses, indent+2, "OFFSET", -1);
+ spart_dump (tree->_.req_top.binv, ses, indent+2, "BINDINGS", -1);
break;
}
case SPAR_VARIABLE:
@@ -4129,15 +4877,13 @@ spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, in
sprintf (buf, " ft predicate %d", (int)(tree->_.triple.ft_type));
SES_PRINT (ses, buf);
}
- if (NULL != tree->_.triple.options)
- spart_dump (tree->_.triple.options, ses, indent+2, "OPTIONS", -2);
+ spart_dump (tree->_.triple.options, ses, indent+2, "OPTIONS", -2);
spart_dump (tree->_.triple.tr_graph, ses, indent+2, "GRAPH", -1);
spart_dump (tree->_.triple.tr_subject, ses, indent+2, "SUBJECT", -1);
spart_dump (tree->_.triple.tr_predicate, ses, indent+2, "PREDICATE", -1);
spart_dump (tree->_.triple.tr_object, ses, indent+2, "OBJECT", -1);
spart_dump (tree->_.triple.selid, ses, indent+2, "SELECT ID", 0);
spart_dump (tree->_.triple.tabid, ses, indent+2, "TABLE ID", 0);
- spart_dump (tree->_.triple.options, ses, indent+2, "OPTIONS", -2);
break;
}
case SPAR_SERVICE_INV:
@@ -4152,7 +4898,25 @@ spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, in
spart_dump (tree->_.sinv.defines, ses, indent+2, "DEFINES", -2);
break;
}
- case BOP_EQ: case BOP_NEQ:
+ case SPAR_BINDINGS_INV:
+ {
+ /*int varctr, varcount = BOX_ELEMENTS (tree->_.binv.vars);*/
+ int rowctr, rowcount = BOX_ELEMENTS (tree->_.binv.data_rows);
+ sprintf (buf, "BINDINGS INV (own idx %ld):", (long)(tree->_.binv.own_idx));
+ SES_PRINT (ses, buf);
+ spart_dump (tree->_.binv.vars, ses, indent+2, "VARS", -2);
+ for (rowctr = 0; rowctr < rowcount; rowctr = ((rowctr < 4) || (rowctr >= rowcount - 4)) ? (rowctr + 1) : (rowcount - 4))
+ {
+ char rowtitle[100];
+ unsigned int rowmask = tree->_.binv.data_rows_mask[rowctr] - '/';
+ sprintf (rowtitle, "ROW %d/%d (%s%s)", rowctr, rowcount,
+ (rowmask ? "disabled via " : "enabled"),
+ (rowmask ? tree->_.binv.vars[rowmask-1]->_.var.vname : "") );
+ spart_dump (tree->_.binv.data_rows[rowctr], ses, indent+2, rowtitle, -2);
+ }
+ break;
+ }
+ case BOP_EQ: case SPAR_BOP_EQ: case BOP_NEQ:
case BOP_LT: case BOP_LTE: case BOP_GT: case BOP_GTE:
/*case BOP_LIKE: Like is built-in in SPARQL, not a BOP! */
case BOP_SAME: case BOP_NSAME:
@@ -4190,7 +4954,8 @@ spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, in
default: GPF_T;
}
SES_PRINT (ses, buf);
- spart_dump (tree->_.graph.iri, ses, indent+2, "IRI", 0);
+ if (NULL != tree->_.graph.iri)
+ 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;
@@ -4209,6 +4974,38 @@ 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));
@@ -4331,32 +5128,6 @@ printed:
session_buffered_write_char ('\n', ses);
}
-
-void
-sparp_dbg_gp_print (sparp_t *sparp, SPART *tree)
-{
- int eq_ctr, eq_count;
- eq_count = tree->_.gp.equiv_count;
- SPARP_FOREACH_GP_EQUIV(sparp,tree,eq_ctr,eq)
- {
- int varname_count, varname_ctr;
- spar_dbg_printf ((" ( %d subv (%d bindings), %d recv, %d gspo, %d const, %d opt, %d subq:",
- BOX_ELEMENTS_INT_0(eq->e_subvalue_idxs), (int)(eq->e_nested_bindings), BOX_ELEMENTS_INT_0(eq->e_receiver_idxs),
- (int)(eq->e_gspo_uses), (int)(eq->e_const_reads), (int)(eq->e_optional_reads), (int)(eq->e_subquery_uses) ));
- varname_count = BOX_ELEMENTS (eq->e_varnames);
- for (varname_ctr = 0; varname_ctr < varname_count; varname_ctr++)
- {
- spar_dbg_printf ((" %s", eq->e_varnames[varname_ctr]));
- }
- if (SPART_BAD_EQUIV_IDX != eq->e_external_src_idx)
- {
- spar_dbg_printf (("; parent #%d", eq->e_external_src_idx));
- }
- spar_dbg_printf ((")"));
- } END_SPARP_FOREACH_GP_EQUIV;
- spar_dbg_printf (("\n"));
-}
-
int sparp_valmode_is_correct (ssg_valmode_t fmt)
{
jso_rtti_t *rtti;
diff --git a/libsrc/Wi/sparqld.c b/libsrc/Wi/sparqld.c
index 059508b..4ff7996 100644
--- a/libsrc/Wi/sparqld.c
+++ b/libsrc/Wi/sparqld.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparqld.c,v 1.8.2.21 2011/07/19 23:38:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -141,7 +141,7 @@ void ssg_sdprint_tree_list (spar_sqlgen_t *ssg, SPART **trees, char delim)
}
const char *
-ssg_sd_opname (ptrlong opname, int is_op)
+ssg_sd_opname (sparp_t *sparp, ptrlong opname, int is_op)
{
if (is_op)
@@ -150,6 +150,7 @@ ssg_sd_opname (ptrlong opname, int is_op)
case BOP_AND: return "&&";
case BOP_OR: return "||";
case BOP_NOT: return "!";
+ case SPAR_BOP_EQ: spar_internal_error (sparp, "special assignment can not be rendered in SPARQL text");
case BOP_EQ: return "=";
case BOP_NEQ: return "!=";
case BOP_LT: return "<";
@@ -172,7 +173,6 @@ 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";
@@ -183,15 +183,9 @@ 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"; */
@@ -203,12 +197,9 @@ 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";
@@ -289,9 +280,9 @@ ssg_sdprin_varname (spar_sqlgen_t *ssg, ccaddr_t vname)
if (':' == vname[0])
{
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);
+ 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, '_') || strchr (vname, '"') || strchr (vname, ':')) && !(SSG_SD_BI & ssg->ssg_sd_flags))
+ else if ((/* strchr (vname, '_') || --- Bug 14613 */ 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);
@@ -449,16 +440,27 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
{
case SPAR_ALIAS:
{
+ int old_parens = ((SSG_SD_VIRTSPECIFIC & ssg->ssg_sd_flags) && !(SSG_SD_SPARQL11_DRAFT & ssg->ssg_sd_flags));
+ if (!(SSG_SD_BI_OR_SPARQL11_DRAFT & ssg->ssg_sd_flags))
+ {
+ ssg_sdprint_tree (ssg, tree->_.alias.arg);
+ return;
+ }
ssg_putchar (' ');
ssg_puts (" (");
ssg->ssg_indent++;
ssg_sdprint_tree (ssg, tree->_.alias.arg);
- ssg_puts (")");
- ssg->ssg_indent--;
- if (SSG_SD_BI & ssg->ssg_sd_flags)
+ if (old_parens)
{
- ssg_puts (" AS ?");
- ssg_puts (tree->_.alias.aname);
+ ssg_puts (")");
+ ssg->ssg_indent--;
+ }
+ ssg_puts (" AS ?");
+ ssg_puts (tree->_.alias.aname);
+ if (!old_parens)
+ {
+ ssg_puts (")");
+ ssg->ssg_indent--;
}
return;
}
@@ -505,7 +507,7 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
{
int argctr, argcount;
ssg_puts (" ((");
- ssg->ssg_indent +=2;
+ ssg->ssg_indent += 2;
argcount = BOX_ELEMENTS (tree->_.builtin.args);
for (argctr = 1; argctr < argcount; argctr++)
{
@@ -519,24 +521,39 @@ 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_putchar ('(');
+ ssg->ssg_indent++;
+ ssg_sdprint_tree_list (ssg, tree->_.builtin.args, ',');
+ ssg_putchar (')');
+ ssg->ssg_indent--;
+ return;
+ }
}
- ssg_puts (ssg_sd_opname (tree->_.builtin.btype, 0));
- ssg_putchar ('(');
- ssg->ssg_indent++;
- ssg_sdprint_tree_list (ssg, tree->_.builtin.args, ',');
- ssg_putchar (')');
- ssg->ssg_indent--;
- return;
}
case SPAR_FUNCALL:
{
caddr_t fname = tree->_.funcall.qname;
- ssg_putchar (' ');
+ ssg_putchar (' '); /* 01234567890123 */
+ if (!strncmp (fname, "SPECIAL::bif:", 13))
+ {
+static const char *sparql11aggregates[] = { "AVG", "COUNT", "GROUP_CONCAT", "MAX", "MIN", "SAMPLE", "SUM" };
+ if (ECM_MEM_NOT_FOUND != ecm_find_name (fname+13, sparql11aggregates, sizeof (sparql11aggregates)/sizeof (char *), sizeof (char *)))
+ {
+ if (!(SSG_SD_BI_OR_SPARQL11_DRAFT & ssg->ssg_sd_flags))
+ spar_error (ssg->ssg_sparp, "%.100s does not support %s aggregate function so SPARQL query can not be composed", ssg->ssg_sd_service_name, fname+13);
+ ssg_puts (fname+13);
+ goto fname_printed; /* see below */
+ }
+ }
if (!strncmp (fname, "xpath:", 6))
{
char *colon = strrchr (fname + 6, ':');
if (NULL == colon)
- fname = t_box_dv_short_string (fname + 6);
+ fname = t_box_dv_short_string (fname + 6);
else
{
colon[0] = '\0';
@@ -545,11 +562,12 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
}
}
ssg_sdprin_qname (ssg, (SPART *)(fname));
- ssg_putchar ('(');
- ssg->ssg_indent++;
- ssg_sdprint_tree_list (ssg, tree->_.funcall.argtrees, ',');
- ssg_putchar (')');
- ssg->ssg_indent--;
+fname_printed:
+ ssg_putchar ('(');
+ ssg->ssg_indent++;
+ ssg_sdprint_tree_list (ssg, tree->_.funcall.argtrees, ',');
+ ssg_putchar (')');
+ ssg->ssg_indent--;
return;
}
case SPAR_GP:
@@ -579,23 +597,23 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
spar_error (ssg->ssg_sparp, "%.100s does not support SPARQL-BI extensions (like nested SELECT) so SPARQL query can not be composed", ssg->ssg_sd_service_name);
if (NULL == ssg->ssg_sd_outer_gps->data)
{
- ssg_puts (" (");
+ ssg_puts (" (");
ssg->ssg_indent++;
}
else
{
- ssg_puts (" {");
+ ssg_puts (" { ");
ssg->ssg_indent += 2;
}
ssg_sdprint_tree (ssg, tree->_.gp.subquery);
if (NULL == ssg->ssg_sd_outer_gps->data)
{
- ssg_puts (" )");
+ ssg_puts (" )");
ssg->ssg_indent--;
}
else
{
- ssg_puts (" }");
+ ssg_puts (" }");
ssg->ssg_indent -= 2;
}
return;
@@ -613,8 +631,8 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
}
END_DO_BOX_FAST;
return;
- case OPTIONAL_L: ssg_puts (" OPTIONAL "); break;
- case WHERE_L: ssg_puts (" WHERE "); break;
+ case OPTIONAL_L: ssg_puts (" OPTIONAL"); break;
+ case WHERE_L: ssg_puts (" WHERE"); break;
case SERVICE_L:
{
SPART *sinv = sparp_get_option (ssg->ssg_sparp, tree->_.gp.options, SPAR_SERVICE_INV);
@@ -744,7 +762,7 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
int from_count = 0;
ssg->ssg_sd_single_from = NULL;
ssg->ssg_sd_graph_gp_nesting = 0;
- if (NULL != tree->_.req_top.storage_name)
+ if ((NULL != tree->_.req_top.storage_name) && (tree->_.req_top.storage_name != uname_virtrdf_ns_uri_DefaultServiceStorage))
{
if (!(SSG_SD_VIRTSPECIFIC & ssg->ssg_sd_flags))
spar_error (ssg->ssg_sparp, "%.100s does not support Virtuoso-specific extensions (like define input:storage) so SPARQL query can not be composed", ssg->ssg_sd_service_name);
@@ -761,7 +779,7 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
DO_BOX_FAST (SPART *, arg, retctr, tree->_.req_top.retvals)
{
ptrlong arg_type = SPART_TYPE (arg);
- if (0 != ctr)
+ if (0 != retctr)
ssg_newline (0);
while ((SPAR_ALIAS == arg_type) && !((SSG_SD_BI & ssg->ssg_sd_flags)))
{
@@ -785,6 +803,16 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
}
}
END_DO_BOX_FAST;
+ if ((ASK_L != tree->_.req_top.subtype) && (0 == BOX_ELEMENTS_0 (tree->_.req_top.retvals)))
+ {
+ caddr_t stub_varname = t_box_sprintf (100, "stubvar%d", ssg->ssg_sparp->sparp_unictr++);
+ if (SSG_SD_BI_OR_SPARQL11_DRAFT & ssg->ssg_sd_flags)
+ ssg_sdprint_tree (ssg, spartlist (ssg->ssg_sparp, 4, SPAR_ALIAS, (ptrlong)1, stub_varname, SSG_VALMODE_AUTO));
+ else
+ {
+ ssg_puts (" ?"); ssg_puts (stub_varname);
+ }
+ }
for (srcctr = 0; srcctr < srccount; srcctr++)
{
SPART *src = tree->_.req_top.sources[srcctr];
@@ -803,8 +831,6 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
{
SPART *lim = tree->_.req_top.limit;
SPART *ofs = tree->_.req_top.offset;
- int has_lim = ((NULL != lim) && ((DV_LONG_INT != DV_TYPE_OF (lim)) || (SPARP_MAXLIMIT != unbox ((caddr_t)(lim)))));
- int has_ofs = ((NULL != ofs) && ((DV_LONG_INT != DV_TYPE_OF (ofs)) || (0 != unbox ((caddr_t)(ofs)))));
if (0 != BOX_ELEMENTS_0 (tree->_.req_top.groupings))
{
ssg_newline (0);
@@ -817,26 +843,27 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
ssg_puts ("HAVING ");
ssg_sdprint_tree (ssg, tree->_.req_top.having);
}
- if (0 != BOX_ELEMENTS_0 (tree->_.req_top.order) && ((SELECT_L == tree->_.req_top.subtype) || (DISTINCT_L == tree->_.req_top.subtype) || has_lim || has_ofs))
+ if (0 != BOX_ELEMENTS_0 (tree->_.req_top.order)
+ && ((SELECT_L == tree->_.req_top.subtype) || (DISTINCT_L == tree->_.req_top.subtype) || (NULL != lim) || (NULL != ofs)) )
{
ssg_newline (0);
ssg_puts ("ORDER BY ");
ssg_sdprint_tree_list (ssg, tree->_.req_top.order, ' ');
}
- if (has_lim)
+ if (NULL != lim)
{
if ((DV_LONG_INT != DV_TYPE_OF (lim)) && !(SSG_SD_BI & ssg->ssg_sd_flags))
spar_error (ssg->ssg_sparp, "%.100s does not support SPARQL-BI extensions (like expression in LIMIT clause) so SPARQL query can not be composed", ssg->ssg_sd_service_name);
ssg_newline (0);
- ssg_puts ("LIMIT ");
+ ssg_puts ("LIMIT");
ssg_sdprint_tree (ssg, lim);
}
- if (has_ofs)
+ if (NULL != ofs)
{
if ((DV_LONG_INT != DV_TYPE_OF (ofs)) && !(SSG_SD_BI & ssg->ssg_sd_flags))
spar_error (ssg->ssg_sparp, "%.100s does not support SPARQL-BI extensions (like expression in OFFSET clause) so SPARQL query can not be composed", ssg->ssg_sd_service_name);
ssg_newline (0);
- ssg_puts ("OFFSET ");
+ ssg_puts ("OFFSET");
ssg_sdprint_tree (ssg, ofs);
}
}
@@ -958,7 +985,7 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
ssg_puts (" ,");
ssg_newline (0);
}
- ssg_sdprint_tree (ssg, tree->_.triple.tr_object);
+ ssg_sdprint_tree (ssg, tree->_.triple.tr_object);
option_count = BOX_ELEMENTS_0 (tree->_.triple.options);
if (0 != option_count)
{
@@ -970,8 +997,8 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
{
if (ssg->ssg_sd_forgotten_dot)
{
- ssg_puts (" .");
- ssg->ssg_indent -= 4;
+ ssg_puts (" .");
+ ssg->ssg_indent -= 4;
ssg->ssg_sd_forgotten_dot = 0;
}
if (place_qm)
@@ -1008,7 +1035,7 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
ssg->ssg_indent--;
}
ssg_putchar (' ');
- ssg_puts (ssg_sd_opname (tree_type, 1));
+ ssg_puts (ssg_sd_opname (ssg->ssg_sparp, tree_type, 1));
ssg_putchar (' ');
if (SPART_TYPE (tree->_.bin_exp.right) < 1000)
{
@@ -1047,6 +1074,8 @@ 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
new file mode 100644
index 0000000..2202438
--- /dev/null
+++ b/libsrc/Wi/sparqlwords.gperf
@@ -0,0 +1,198 @@
+/*
+ * $Id$
+ *
+ * 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
+"INF", INF_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
+"NAN", NAN_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
+"UNDEF", UNDEF_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
new file mode 100644
index 0000000..354d13a
--- /dev/null
+++ b/libsrc/Wi/sparqlwords.h
@@ -0,0 +1,651 @@
+/* ANSI-C code produced by gperf version 3.0.3 */
+/* 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 172
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 15
+#define MIN_HASH_VALUE 166
+#define MAX_HASH_VALUE 1259
+/* maximum key range = 1094, 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[] =
+ {
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 140,
+ 7, 1260, 211, 242, 49, 1260, 89, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 240, 138, 58, 168, 41,
+ 223, 157, 141, 74, 49, 40, 135, 198, 174, 230,
+ 8, 78, 147, 168, 165, 233, 111, 27, 0, 13,
+ 23, 1260, 1260, 1260, 1260, 129, 1260, 240, 138, 58,
+ 168, 41, 223, 157, 141, 74, 49, 40, 135, 198,
+ 174, 230, 8, 78, 147, 168, 165, 233, 111, 27,
+ 0, 13, 23, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260, 1260,
+ 1260, 1260, 1260, 1260, 1260, 1260
+ };
+ register int hval = (int)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 42 "sparqlwords.gperf"
+ {"BY", BY_L , 0},
+#line 174 "sparqlwords.gperf"
+ {"TZ", SPARQL_BIF , SPAR_BIF_TZ},
+#line 129 "sparqlwords.gperf"
+ {"PREFIX", PREFIX_L , 0},
+#line 98 "sparqlwords.gperf"
+ {"LIKE", LIKE_L , 0},
+#line 195 "sparqlwords.gperf"
+ {"WHERE", WHERE_L , 0},
+#line 45 "sparqlwords.gperf"
+ {"CEIL", SPARQL_BIF , SPAR_BIF_CEIL},
+#line 50 "sparqlwords.gperf"
+ {"COPY", COPY_L , 0},
+#line 79 "sparqlwords.gperf"
+ {"IFP", IFP_L , 0},
+#line 132 "sparqlwords.gperf"
+ {"REGEX", SPARQL_BIF , SPAR_BIF_REGEX},
+#line 87 "sparqlwords.gperf"
+ {"IRI", IRI_L , 0},
+#line 169 "sparqlwords.gperf"
+ {"TEXT", TEXT_L , 0},
+#line 196 "sparqlwords.gperf"
+ {"WITH", WITH_L , 0},
+#line 83 "sparqlwords.gperf"
+ {"INDEX", INDEX_L , 0},
+#line 81 "sparqlwords.gperf"
+ {"IN", IN_L , 0},
+#line 55 "sparqlwords.gperf"
+ {"DAY", SPARQL_BIF , SPAR_BIF_DAY},
+#line 61 "sparqlwords.gperf"
+ {"DESC", DESC_L , 0},
+#line 106 "sparqlwords.gperf"
+ {"MAX", MAX_L , 0},
+#line 198 "sparqlwords.gperf"
+ {"YEAR", SPARQL_BIF , SPAR_BIF_YEAR},
+#line 68 "sparqlwords.gperf"
+ {"EXISTS", EXISTS_L , 0},
+#line 67 "sparqlwords.gperf"
+ {"EXCLUSIVE", EXCLUSIVE_L , 0},
+#line 105 "sparqlwords.gperf"
+ {"MAP", MAP_L , 0},
+#line 52 "sparqlwords.gperf"
+ {"CREATE", CREATE_L , 0},
+#line 118 "sparqlwords.gperf"
+ {"NOW", SPARQL_BIF , SPAR_BIF_NOW},
+#line 89 "sparqlwords.gperf"
+ {"ISIRI", SPARQL_BIF , SPAR_BIF_ISIRI},
+#line 197 "sparqlwords.gperf"
+ {"XML", XML_L , 0},
+#line 175 "sparqlwords.gperf"
+ {"T_CYCLES_ONLY", T_CYCLES_ONLY_L , 0},
+#line 34 "sparqlwords.gperf"
+ {"ASK", ASK_L , 0},
+#line 182 "sparqlwords.gperf"
+ {"T_MAX", T_MAX_L , 0},
+#line 188 "sparqlwords.gperf"
+ {"T_STEP", T_STEP_L , 0},
+#line 147 "sparqlwords.gperf"
+ {"SERVICE", SERVICE_L , 0},
+#line 96 "sparqlwords.gperf"
+ {"LCASE", SPARQL_BIF , SPAR_BIF_LCASE},
+#line 116 "sparqlwords.gperf"
+ {"NIL", NIL_L , 0},
+#line 78 "sparqlwords.gperf"
+ {"IF", SPARQL_BIF , SPAR_BIF_IF},
+#line 104 "sparqlwords.gperf"
+ {"MAKE", MAKE_L , 0},
+#line 134 "sparqlwords.gperf"
+ {"REPLACE", SPARQL_BIF , SPAR_BIF_REPLACE},
+#line 126 "sparqlwords.gperf"
+ {"OR", _BAR_BAR , 0},
+#line 33 "sparqlwords.gperf"
+ {"ASC", ASC_L , 0},
+#line 193 "sparqlwords.gperf"
+ {"URI", SPARQL_BIF , SPAR_BIF_URI},
+#line 44 "sparqlwords.gperf"
+ {"CLEAR", CLEAR_L , 0},
+#line 137 "sparqlwords.gperf"
+ {"SCORE", SCORE_L , 0},
+#line 181 "sparqlwords.gperf"
+ {"T_IN", T_IN_L , 0},
+#line 76 "sparqlwords.gperf"
+ {"GROUP", GROUP_L , 0},
+#line 59 "sparqlwords.gperf"
+ {"DELETE", DELETE_L , 0},
+#line 65 "sparqlwords.gperf"
+ {"DROP", DROP_L , 0},
+#line 128 "sparqlwords.gperf"
+ {"PREDICATE", PREDICATE_L , 0},
+#line 146 "sparqlwords.gperf"
+ {"SELECT", SELECT_L , 0},
+#line 39 "sparqlwords.gperf"
+ {"BIJECTION", BIJECTION_L , 0},
+#line 32 "sparqlwords.gperf"
+ {"AS", AS_L , 0},
+#line 63 "sparqlwords.gperf"
+ {"DETACH", DETACH_L , 0},
+#line 113 "sparqlwords.gperf"
+ {"MOVE", MOVE_L , 0},
+#line 173 "sparqlwords.gperf"
+ {"TRUE", true_L , 0},
+#line 37 "sparqlwords.gperf"
+ {"BASE", BASE_L , 0},
+#line 189 "sparqlwords.gperf"
+ {"UCASE", SPARQL_BIF , SPAR_BIF_UCASE},
+#line 97 "sparqlwords.gperf"
+ {"LIBRARY", LIBRARY_L , 0},
+#line 108 "sparqlwords.gperf"
+ {"MIN", MIN_L , 0},
+#line 70 "sparqlwords.gperf"
+ {"FILTER", FILTER_L , 0},
+#line 171 "sparqlwords.gperf"
+ {"TO", TO_L , 0},
+#line 93 "sparqlwords.gperf"
+ {"ISURI", SPARQL_BIF , SPAR_BIF_ISURI},
+#line 40 "sparqlwords.gperf"
+ {"BNODE", SPARQL_BIF , SPAR_BIF_BNODE},
+#line 158 "sparqlwords.gperf"
+ {"STR", SPARQL_BIF , SPAR_BIF_STR},
+#line 120 "sparqlwords.gperf"
+ {"OBJECT", OBJECT_L , 0},
+#line 86 "sparqlwords.gperf"
+ {"INTO", INTO_L , 0},
+#line 29 "sparqlwords.gperf"
+ {"ALL", ALL_L , 0},
+#line 57 "sparqlwords.gperf"
+ {"DEFINE", DEFINE_L , 0},
+#line 66 "sparqlwords.gperf"
+ {"ENCODE_FOR_URI", SPARQL_BIF , SPAR_BIF_ENCODE_FOR_URI},
+#line 36 "sparqlwords.gperf"
+ {"AVG", AVG_L , 0},
+#line 46 "sparqlwords.gperf"
+ {"COALESCE", SPARQL_BIF , SPAR_BIF_COALESCE},
+#line 121 "sparqlwords.gperf"
+ {"OF", OF_L , 0},
+#line 119 "sparqlwords.gperf"
+ {"NULL", NULL_L , 0},
+#line 170 "sparqlwords.gperf"
+ {"TIMEZONE", SPARQL_BIF , SPAR_BIF_TIMEZONE},
+#line 69 "sparqlwords.gperf"
+ {"FALSE", false_L , 0},
+#line 148 "sparqlwords.gperf"
+ {"SHA1", SPARQL_BIF , SPAR_BIF_SHA1},
+#line 82 "sparqlwords.gperf"
+ {"INF", INF_L , 0},
+#line 101 "sparqlwords.gperf"
+ {"LOCAL", LOCAL_L , 0},
+#line 162 "sparqlwords.gperf"
+ {"STRLEN", SPARQL_BIF , SPAR_BIF_STRLEN},
+#line 152 "sparqlwords.gperf"
+ {"SHA512", SPARQL_BIF , SPAR_BIF_SHA512},
+#line 88 "sparqlwords.gperf"
+ {"ISBLANK", SPARQL_BIF , SPAR_BIF_ISBLANK},
+#line 94 "sparqlwords.gperf"
+ {"LANG", LANG_L , 0},
+#line 62 "sparqlwords.gperf"
+ {"DESCRIBE", DESCRIBE_L , 0},
+#line 64 "sparqlwords.gperf"
+ {"DISTINCT", DISTINCT_L , 0},
+#line 27 "sparqlwords.gperf"
+ {"ABS", SPARQL_BIF , SPAR_BIF_ABS},
+#line 153 "sparqlwords.gperf"
+ {"SILENT", SILENT_L , 0},
+#line 130 "sparqlwords.gperf"
+ {"QUAD", QUAD_L , 0},
+#line 131 "sparqlwords.gperf"
+ {"RAND", SPARQL_BIF , SPAR_BIF_RAND},
+#line 85 "sparqlwords.gperf"
+ {"INSERT", INSERT_L , 0},
+#line 155 "sparqlwords.gperf"
+ {"SOURCE", GRAPH_L , 0},
+#line 117 "sparqlwords.gperf"
+ {"NOT", NOT_L , 0},
+#line 99 "sparqlwords.gperf"
+ {"LIMIT", LIMIT_L , 0},
+#line 28 "sparqlwords.gperf"
+ {"ADD", ADD_L , 0},
+#line 179 "sparqlwords.gperf"
+ {"T_EXISTS", T_EXISTS_L , 0},
+#line 31 "sparqlwords.gperf"
+ {"AND", _AMP_AMP , 0},
+#line 133 "sparqlwords.gperf"
+ {"REDUCED", REDUCED_L , 0},
+#line 115 "sparqlwords.gperf"
+ {"NAN", NAN_L , 0},
+#line 149 "sparqlwords.gperf"
+ {"SHA224", SPARQL_BIF , SPAR_BIF_SHA224},
+#line 43 "sparqlwords.gperf"
+ {"CLASS", CLASS_L , 0},
+#line 35 "sparqlwords.gperf"
+ {"ATTACH", ATTACH_L , 0},
+#line 102 "sparqlwords.gperf"
+ {"LOAD", LOAD_L , 0},
+#line 156 "sparqlwords.gperf"
+ {"SQLQUERY", SQLQUERY_L , 0},
+#line 145 "sparqlwords.gperf"
+ {"SECONDS", SPARQL_BIF , SPAR_BIF_SECONDS},
+#line 109 "sparqlwords.gperf"
+ {"MINUS", MINUS_L , 0},
+#line 185 "sparqlwords.gperf"
+ {"T_NO_CYCLES", T_NO_CYCLES_L , 0},
+#line 154 "sparqlwords.gperf"
+ {"SOFT", SOFT_L , 0},
+#line 38 "sparqlwords.gperf"
+ {"BINDINGS", BINDINGS_L , 0},
+#line 194 "sparqlwords.gperf"
+ {"USING", USING_L , 0},
+#line 54 "sparqlwords.gperf"
+ {"DATATYPE", DATATYPE_L , 0},
+#line 100 "sparqlwords.gperf"
+ {"LITERAL", LITERAL_L , 0},
+#line 167 "sparqlwords.gperf"
+ {"SUM", SUM_L , 0},
+#line 72 "sparqlwords.gperf"
+ {"FROM", FROM_L , 0},
+#line 60 "sparqlwords.gperf"
+ {"DEREF", DEREF_L , 0},
+#line 138 "sparqlwords.gperf"
+ {"SCORE_LIMIT", SCORE_LIMIT_L , 0},
+#line 125 "sparqlwords.gperf"
+ {"OPTION", OPTION_L , 0},
+#line 159 "sparqlwords.gperf"
+ {"STRDT", SPARQL_BIF , SPAR_BIF_STRDT},
+#line 53 "sparqlwords.gperf"
+ {"DATA", DATA_L , 0},
+#line 91 "sparqlwords.gperf"
+ {"ISNUMERIC", SPARQL_BIF , SPAR_BIF_ISNUMERIC},
+#line 77 "sparqlwords.gperf"
+ {"HAVING", HAVING_L , 0},
+#line 75 "sparqlwords.gperf"
+ {"GRAPH", GRAPH_L , 0},
+#line 90 "sparqlwords.gperf"
+ {"ISLITERAL", SPARQL_BIF , SPAR_BIF_ISLITERAL},
+#line 192 "sparqlwords.gperf"
+ {"UNION", UNION_L , 0},
+#line 111 "sparqlwords.gperf"
+ {"MODIFY", MODIFY_L , 0},
+#line 30 "sparqlwords.gperf"
+ {"ALTER", ALTER_L , 0},
+#line 92 "sparqlwords.gperf"
+ {"ISREF", SPARQL_BIF , SPAR_BIF_ISREF},
+#line 84 "sparqlwords.gperf"
+ {"INFERENCE", INFERENCE_L , 0},
+#line 135 "sparqlwords.gperf"
+ {"RETURNS", RETURNS_L , 0},
+#line 127 "sparqlwords.gperf"
+ {"ORDER", ORDER_L , 0},
+#line 183 "sparqlwords.gperf"
+ {"T_MIN", T_MIN_L , 0},
+#line 150 "sparqlwords.gperf"
+ {"SHA256", SPARQL_BIF , SPAR_BIF_SHA256},
+#line 80 "sparqlwords.gperf"
+ {"IDENTIFIED", IDENTIFIED_L , 0},
+#line 176 "sparqlwords.gperf"
+ {"T_DIRECTION", T_DIRECTION_L , 0},
+#line 107 "sparqlwords.gperf"
+ {"MD5", SPARQL_BIF , SPAR_BIF_MD5},
+#line 151 "sparqlwords.gperf"
+ {"SHA384", SPARQL_BIF , SPAR_BIF_SHA384},
+#line 51 "sparqlwords.gperf"
+ {"COUNT", COUNT_L , 0},
+#line 166 "sparqlwords.gperf"
+ {"SUBSTR", SPARQL_BIF , SPAR_BIF_SUBSTR},
+#line 184 "sparqlwords.gperf"
+ {"T_OUT", T_OUT_L , 0},
+#line 47 "sparqlwords.gperf"
+ {"CONCAT", SPARQL_BIF , SPAR_BIF_CONCAT},
+#line 177 "sparqlwords.gperf"
+ {"T_DISTINCT", T_DISTINCT_L , 0},
+#line 187 "sparqlwords.gperf"
+ {"T_SHORTEST_ONLY", T_SHORTEST_ONLY_L , 0},
+#line 71 "sparqlwords.gperf"
+ {"FLOOR", SPARQL_BIF , SPAR_BIF_FLOOR},
+#line 123 "sparqlwords.gperf"
+ {"OFFSET", OFFSET_L , 0},
+#line 112 "sparqlwords.gperf"
+ {"MONTH", SPARQL_BIF , SPAR_BIF_MONTH},
+#line 157 "sparqlwords.gperf"
+ {"STORAGE", STORAGE_L , 0},
+#line 178 "sparqlwords.gperf"
+ {"T_END_FLAG", T_END_FLAG_L , 0},
+#line 186 "sparqlwords.gperf"
+ {"T_NO_ORDER", T_NO_ORDER_L , 0},
+#line 165 "sparqlwords.gperf"
+ {"SUBJECT", SUBJECT_L , 0},
+#line 141 "sparqlwords.gperf"
+ {"SAME_AS_P", SAME_AS_P_L , 0},
+#line 172 "sparqlwords.gperf"
+ {"TRANSITIVE", TRANSITIVE_L , 0},
+#line 41 "sparqlwords.gperf"
+ {"BOUND", BOUND_L , 0},
+#line 74 "sparqlwords.gperf"
+ {"HOURS", SPARQL_BIF , SPAR_BIF_HOURS},
+#line 136 "sparqlwords.gperf"
+ {"ROUND", SPARQL_BIF , SPAR_BIF_ROUND},
+#line 114 "sparqlwords.gperf"
+ {"NAMED", NAMED_L , 0},
+#line 110 "sparqlwords.gperf"
+ {"MINUTES", SPARQL_BIF , SPAR_BIF_MINUTES},
+#line 103 "sparqlwords.gperf"
+ {"MACRO", MACRO_L , 0},
+#line 163 "sparqlwords.gperf"
+ {"STRSTARTS", SPARQL_BIF , SPAR_BIF_STRSTARTS},
+#line 160 "sparqlwords.gperf"
+ {"STRENDS", SPARQL_BIF , SPAR_BIF_STRENDS},
+#line 168 "sparqlwords.gperf"
+ {"TABLE_OPTION", TABLE_OPTION_L , 0},
+#line 56 "sparqlwords.gperf"
+ {"DEFAULT", DEFAULT_L , 0},
+#line 180 "sparqlwords.gperf"
+ {"T_FINAL_AS", T_FINAL_AS_L , 0},
+#line 124 "sparqlwords.gperf"
+ {"OPTIONAL", OPTIONAL_L , 0},
+#line 164 "sparqlwords.gperf"
+ {"SUBCLASS", SUBCLASS_L , 0},
+#line 191 "sparqlwords.gperf"
+ {"UNDEF", UNDEF_L , 0},
+#line 48 "sparqlwords.gperf"
+ {"CONSTRUCT", CONSTRUCT_L , 0},
+#line 161 "sparqlwords.gperf"
+ {"STRLANG", SPARQL_BIF , SPAR_BIF_STRLANG},
+#line 49 "sparqlwords.gperf"
+ {"CONTAINS", SPARQL_BIF , SPAR_BIF_CONTAINS},
+#line 58 "sparqlwords.gperf"
+ {"DEFMACRO", DEFMACRO_L , 0},
+#line 139 "sparqlwords.gperf"
+ {"SAME_AS", SAME_AS_L , 0},
+#line 142 "sparqlwords.gperf"
+ {"SAME_AS_S", SAME_AS_S_L , 0},
+#line 95 "sparqlwords.gperf"
+ {"LANGMATCHES", SPARQL_BIF , SPAR_BIF_LANGMATCHES},
+#line 190 "sparqlwords.gperf"
+ {"UNBOUND", UNBOUND_L , 0},
+#line 144 "sparqlwords.gperf"
+ {"SAMETERM", SPARQL_BIF , SPAR_BIF_SAMETERM},
+#line 140 "sparqlwords.gperf"
+ {"SAME_AS_O", SAME_AS_O_L , 0},
+#line 143 "sparqlwords.gperf"
+ {"SAME_AS_S_O", SAME_AS_S_O_L , 0},
+#line 73 "sparqlwords.gperf"
+ {"FUNCTION", FUNCTION_L , 0},
+#line 122 "sparqlwords.gperf"
+ {"OFFBAND", OFFBAND_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, -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, -1, -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, 3, -1, 4, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 5, 6, -1, -1, 7, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 8, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 9, -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, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 11, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 12, -1, -1, 13, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 14, -1, 15,
+ -1, 16, -1, -1, -1, 17, -1, -1, -1, -1,
+ -1, -1, -1, -1, 18, -1, 19, 20, 21, -1,
+ -1, 22, -1, -1, -1, -1, -1, -1, -1, 23,
+ -1, 24, -1, -1, -1, -1, -1, 25, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 26, -1, -1, -1, -1, -1, 27, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 28, -1, 29,
+ 30, 31, 32, 33, -1, 34, 35, 36, -1, -1,
+ -1, 37, -1, 38, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 39, -1, -1, 40, -1, -1, -1,
+ -1, -1, -1, -1, -1, 41, 42, 43, -1, -1,
+ 44, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 45, -1, -1, 46, -1, 47, 48,
+ -1, -1, -1, -1, 49, -1, -1, -1, -1, -1,
+ 50, 51, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 52, -1,
+ 53, -1, -1, 54, -1, -1, 55, 56, 57, 58,
+ 59, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 60, 61, 62, -1,
+ -1, -1, -1, 63, -1, -1, -1, -1, 64, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 65, -1,
+ -1, -1, -1, -1, -1, -1, 66, -1, 67, -1,
+ -1, 68, -1, 69, -1, 70, -1, -1, -1, -1,
+ -1, -1, -1, 71, -1, -1, -1, 72, 73, -1,
+ -1, 74, 75, -1, -1, -1, -1, 76, -1, -1,
+ 77, 78, -1, -1, -1, 79, -1, 80, -1, -1,
+ -1, -1, 81, 82, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 83, 84, -1, 85, 86, -1, -1,
+ -1, -1, 87, -1, -1, -1, -1, 88, -1, -1,
+ 89, -1, -1, 90, -1, -1, -1, 91, -1, -1,
+ -1, -1, -1, -1, -1, 92, -1, -1, -1, -1,
+ -1, -1, -1, 93, 94, 95, -1, 96, -1, -1,
+ -1, -1, 97, -1, 98, -1, -1, 99, -1, 100,
+ 101, -1, -1, 102, 103, 104, -1, -1, 105, -1,
+ 106, -1, 107, -1, -1, -1, -1, 108, 109, -1,
+ -1, -1, -1, 110, -1, 111, -1, 112, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 113, 114,
+ -1, 115, -1, 116, 117, -1, -1, -1, 118, 119,
+ 120, -1, 121, 122, 123, 124, 125, -1, -1, 126,
+ -1, -1, 127, 128, -1, 129, 130, 131, -1, 132,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 133, -1, -1, -1, -1, -1, 134,
+ -1, -1, -1, -1, -1, 135, -1, 136, 137, 138,
+ -1, -1, 139, 140, -1, -1, -1, -1, -1, -1,
+ -1, 141, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 142, -1, -1,
+ 143, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 144, -1, -1, -1,
+ -1, -1, 145, -1, -1, 146, -1, -1, -1, -1,
+ -1, 147, -1, 148, 149, -1, -1, -1, -1, -1,
+ -1, 150, -1, -1, -1, -1, -1, -1, -1, 151,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 152, -1, -1,
+ 153, -1, 154, -1, 155, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 156, -1, 157, -1,
+ -1, -1, -1, -1, -1, -1, 158, -1, -1, -1,
+ -1, -1, -1, -1, 159, -1, -1, -1, -1, -1,
+ -1, 160, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 161, -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, 163, -1,
+ 164, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 165, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 166, -1, -1, 167, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 168, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 170, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 171
+ };
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_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 887df78..8e987a7 100644
--- a/libsrc/Wi/sparul2sql.c
+++ b/libsrc/Wi/sparul2sql.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparul2sql.c,v 1.20.2.15 2011/09/12 21:05:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -46,7 +46,7 @@ extern "C" {
(DV_LONG_INT != DV_TYPE_OF (top->_.req_top.offset)) || \
(DV_LONG_INT != DV_TYPE_OF (top->_.req_top.limit)) || \
(0 != unbox ((caddr_t)(top->_.req_top.offset))) || \
- ((SPARP_MAXLIMIT != unbox ((caddr_t)(top->_.req_top.limit))) && \
+ ((NULL != top->_.req_top.limit) && \
((1 != unbox ((caddr_t)(top->_.req_top.limit))) || \
(0 != BOX_ELEMENTS (top->_.req_top.pattern->_.gp.members)) ) ) )
@@ -56,8 +56,24 @@ extern "C" {
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) && !strcmp (fmtname, "_JAVA_")) ? 0 : 1);
+ sparp_env_t *spare = sparp->sparp_env;
+ const char *fmtname;
+ caddr_t res;
+ if (NULL != spare->spare_output_compose_report)
+ return spare->spare_output_compose_report;
+ fmtname = spare->spare_output_format_name; /* Report is always a result-set, so no spare_output_XXX_format name */
+ if ((NULL == spare->spare_output_format_name)
+ && (NULL == sparp->sparp_env->spare_parent_env)
+ && ssg_is_odbc_cli () )
+ {
+ if (ssg_is_odbc_msaccess_cli ())
+ fmtname = spare->spare_output_format_name = t_box_dv_short_string ("_MSACCESS_");
+ else
+ fmtname = spare->spare_output_format_name = t_box_dv_short_string ("_UDBC_");
+ }
+ res = t_box_num_nonull (((NULL != fmtname) && (!strcmp (fmtname, "_JAVA_") || !strcmp (fmtname, "_UDBC_") || !strcmp (fmtname, "_MSACCESS_"))) ? 0 : 1);
+ spare->spare_output_compose_report = res;
+ return res;
}
extern int sparp_ctor_fields_are_disjoin_with_where_fields (sparp_t *sparp, SPART **ctor_fields, SPART **where_fields);
@@ -97,14 +113,14 @@ sparp_ctor_fields_are_disjoin_with_where_fields (sparp_t *sparp, SPART **ctor_fi
sparp_equiv_t *src_equiv = sparp_equiv_get_ro (top_eqs, top_eq_count,
top_gp, ctor_fld, SPARP_EQUIV_GET_NAMESAKES );
if (NULL != src_equiv) /* src_equiv may be NULL in subqueries */
- sparp_rvr_tighten (sparp, &rvr, &(src_equiv->e_rvr), ~1);
+ sparp_rvr_tighten (sparp, &rvr, &(src_equiv->e_rvr), ~0);
break;
}
case SPAR_LIT: case SPAR_QNAME:
{
rdf_val_range_t tmp;
sparp_rvr_set_by_constant (sparp, &tmp, NULL, ctor_fld);
- sparp_rvr_tighten (sparp, &rvr, &tmp, ~1);
+ sparp_rvr_tighten (sparp, &rvr, &tmp, ~0);
break;
}
default: break;
@@ -114,13 +130,13 @@ sparp_ctor_fields_are_disjoin_with_where_fields (sparp_t *sparp, SPART **ctor_fi
switch (where_fld_type)
{
case SPAR_BLANK_NODE_LABEL: case SPAR_VARIABLE:
- sparp_rvr_tighten (sparp, &rvr, &(where_fld->_.var.rvr), ~1);
+ sparp_rvr_tighten (sparp, &rvr, &(where_fld->_.var.rvr), ~0);
break;
case SPAR_LIT: case SPAR_QNAME:
{
rdf_val_range_t tmp;
sparp_rvr_set_by_constant (sparp, &tmp, NULL, where_fld);
- sparp_rvr_tighten (sparp, &rvr, &tmp, ~1);
+ sparp_rvr_tighten (sparp, &rvr, &tmp, ~0);
break;
}
default: break;
@@ -145,19 +161,19 @@ sparp_gp_trav_find_isect_with_ctor (sparp_t *sparp, SPART *curr, sparp_trav_stat
switch (curr->_.gp.subtype)
{
case SELECT_L:
- {
+ {
#if 1 /*!!! TBD: implement rewriting of ctor fields so that a field that correspond to an alias of subquery's retval is replaced with the expression of the alias. Then use the branch that is currently not in use */
- return SPAR_GPT_COMPLETED;
-#else
- int isect_res;
- sparp_t *sub_sparp = sparp_down_to_sub (sparp, curr);
- isect_res = sparp_ctor_fields_are_disjoin_with_data_gathering (sub_sparp, (SPART **)common_env, curr->_.gp.subquery, 1);
- sparp_up_from_sub (sparp, curr, sub_sparp);
- if (CTOR_MAY_INTERSECTS_WHERE == isect_res)
return SPAR_GPT_COMPLETED;
- return SPAR_GPT_NODOWN;
+#else
+ int isect_res;
+ sparp_t *sub_sparp = sparp_down_to_sub (sparp, curr);
+ isect_res = sparp_ctor_fields_are_disjoin_with_data_gathering (sub_sparp, (SPART **)common_env, curr->_.gp.subquery, 1);
+ sparp_up_from_sub (sparp, curr, sub_sparp);
+ if (CTOR_MAY_INTERSECTS_WHERE == isect_res)
+ return SPAR_GPT_COMPLETED;
+ return SPAR_GPT_NODOWN;
#endif
- }
+ }
case SERVICE_L:
return 0; /* remote triples can not interfere with local data manipulations. This may change in the future if SERVICE group ctor template is added in SPARUL */
}
@@ -202,12 +218,14 @@ 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 */
+ 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 */
}
ctor_var_enumerator_t;
@@ -277,15 +295,26 @@ 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];
- 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 *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++)
{
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:
@@ -302,21 +331,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:
- args [(fld_ctr-1)*2] = (caddr_t)((ptrlong)CTOR_OPCODE_BNODE);
- args [(fld_ctr-1)*2 + 1] = box_num (var_ctr);
+ opcode_arg_ptr[0] = CTOR_OPCODE_BNODE;
+ val_arg_ptr[0] = 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);
- args[(fld_ctr-1)*2 + 1] = val;
+ val_arg_ptr[0] = 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");
}
@@ -340,15 +369,26 @@ 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 = (SPART **)t_list (6, NULL, NULL, NULL, NULL, NULL, NULL);
+ 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_call = spar_make_funcall (sparp, 0, ((NULL == formatter) ? "LONG::bif:vector" : "bif:vector"), tvector_args);
- for (fld_ctr = 1; fld_ctr < SPART_TRIPLE_FIELDS_COUNT; fld_ctr++)
+#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++)
{
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:
@@ -359,8 +399,8 @@ bnode_found_or_added_for_big_ssl:
break;
}
var_ctr = spar_cve_find_or_add_variable (sparp, cve, fld);
- 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);
+ opcode_arg_ptr[0] = t_box_num_nonull (CTOR_OPCODE_VARIABLE);
+ val_arg_ptr[0] = (SPART *)t_box_num_nonull (var_ctr);
triple_is_const = 0;
break;
case SPAR_BLANK_NODE_LABEL:
@@ -377,19 +417,19 @@ bnode_found_or_added_for_big_ssl:
t_set_push (&bnodes_acc, fld);
var_ctr = bnode_count++;
bnode_found_or_added:
- 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);
+ opcode_arg_ptr[0] = t_box_num_nonull (CTOR_OPCODE_BNODE);
+ val_arg_ptr[0] = (SPART *)t_box_num_nonull (var_ctr);
triple_is_const = 0;
break;
case SPAR_LIT: case SPAR_QNAME:
- tvector_args [(fld_ctr-1)*2] = (SPART *)t_box_num_nonull (CTOR_OPCODE_CONST_OR_EXPN);
- tvector_args [(fld_ctr-1)*2 + 1] = fld;
+ opcode_arg_ptr[0] = t_box_num_nonull (CTOR_OPCODE_CONST_OR_EXPN);
+ val_arg_ptr[0] = 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);
- tvector_args [(fld_ctr-1)*2] = (SPART *)t_box_num_nonull (CTOR_OPCODE_CONST_OR_EXPN);
- tvector_args [(fld_ctr-1)*2 + 1] = fld;
+ opcode_arg_ptr[0] = t_box_num_nonull (CTOR_OPCODE_CONST_OR_EXPN);
+ val_arg_ptr[0] = fld;
if (cve->cve_total_vars_count != old_total_vars_count)
triple_is_const = 0;
}
@@ -442,8 +482,16 @@ 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\"");
@@ -453,6 +501,8 @@ 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 );
@@ -461,13 +511,17 @@ 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))
- 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;
+ 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;
}
int
@@ -498,11 +552,18 @@ 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;
@@ -518,6 +579,8 @@ 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;
@@ -526,7 +589,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 (top_subtype_is_insert ? "INSERT" : "DELETE"),
+ t_box_dv_short_string ((NULL != multigraph) ? (top_subtype_is_insert ? "INSERT_QUAD" : "DELETE_QUAD") : (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),
@@ -537,7 +600,9 @@ spar_compose_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top, SPART *gra
}
else
{
- top_fname = top_subtype_is_insert ? "sql:SPARQL_INSERT_DICT_CONTENT" : "sql:SPARQL_DELETE_DICT_CONTENT";
+ 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") );
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) ) );
@@ -548,10 +613,36 @@ 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))
{
@@ -577,6 +668,8 @@ 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;
@@ -589,7 +682,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 ("MODIFY"),
+ t_box_dv_short_string (g_may_vary ? "MODIFY" : "MODIFY_QUAD"),
((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),
@@ -597,7 +690,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, "sql:SPARQL_MODIFY_BY_DICT_CONTENTS",
+ rv[0] = spar_make_funcall (sparp, 0, (g_may_vary ? "sql:SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS" : "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) ) );
}
@@ -614,7 +707,7 @@ spar_emulate_ctor_field (sparp_t *sparp, SPART *opcode, SPART *oparg, SPART **va
{
if (NULL == bnode_emulation)
#ifdef DEBUG
- bnode_emulation = box_copy_tree (spartlist (sparp, 7 + (sizeof (rdf_val_range_t) / sizeof (caddr_t)), SPAR_BLANK_NODE_LABEL,
+ bnode_emulation = (SPART *)box_copy_tree ((caddr_t)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));
@@ -708,11 +801,13 @@ 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];
@@ -778,8 +873,10 @@ 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];
@@ -787,6 +884,7 @@ 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);
@@ -794,7 +892,6 @@ 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;
@@ -865,8 +962,10 @@ 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 985eed9..86c28cf 100644
--- a/libsrc/Wi/sql3.c
+++ b/libsrc/Wi/sql3.c
@@ -794,7 +794,7 @@
/* Copy the first part of user declarations. */
-#line 57 "./sql3.y"
+#line 30 "./sql3.y"
#include "libutil.h"
@@ -852,7 +852,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 95 "./sql3.y"
+#line 68 "./sql3.y"
{
long intval;
char *strval;
@@ -862,7 +862,7 @@ typedef union YYSTYPE
long subtok;
sqlp_join_t join;
}
-/* Line 187 of yacc.c. */
+/* Line 193 of yacc.c. */
#line 867 "sql3.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -926,7 +926,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -1089,18 +1089,18 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 339
+#define YYFINAL 337
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 22182
+#define YYLAST 22097
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 374
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 401
+#define YYNNTS 402
/* YYNRULES -- Number of rules. */
#define YYNRULES 1270
/* YYNRULES -- Number of states. */
-#define YYNSTATES 2462
+#define YYNSTATES 2459
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -1203,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, 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,
+ 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,
1061, 1063, 1065, 1067, 1069, 1071, 1073, 1075, 1077, 1079,
- 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,
+ 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,
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,
@@ -1315,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, 705, -1, 420, -1, 421, -1,
- 419, -1, 758, -1, 759, -1, 760, -1, 761, -1,
+ 378, -1, 424, -1, 706, -1, 420, -1, 421, -1,
+ 419, -1, 759, -1, 760, -1, 761, -1, 762, -1,
379, -1, 414, -1, 378, 379, -1, 378, 414, -1,
- 383, -1, 407, -1, 774, -1, 410, -1, 408, -1,
+ 383, -1, 407, -1, 775, -1, 410, -1, 408, -1,
415, -1, 429, -1, 431, -1, 439, -1, 440, -1,
- 438, -1, 441, -1, 442, -1, 443, -1, 711, -1,
- 713, -1, 754, -1, 770, -1, 3, -1, 24, -1,
+ 438, -1, 441, -1, 442, -1, 443, -1, 712, -1,
+ 714, -1, 755, -1, 771, -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,
@@ -1339,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, 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,
+ 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,
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, 599, 427, 387, 392, -1, -1, 394,
- 398, -1, 92, 201, 598, -1, 305, 123, 7, -1,
+ 46, -1, 181, 600, 427, 387, 392, -1, -1, 394,
+ 398, -1, 92, 201, 599, -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, 598, -1, 311, 599, -1, 393, -1,
- 318, 123, 610, -1, 126, 368, 552, 369, -1, 201,
+ 396, -1, 137, 599, -1, 311, 600, -1, 393, -1,
+ 318, 123, 611, -1, 126, 368, 553, 369, -1, 201,
185, 399, -1, 194, -1, 368, 4, 370, 4, 369,
-1, 368, 4, 370, 4, 370, 4, 369, -1, 208,
- 599, -1, 401, 176, 165, 368, 403, 369, 406, -1,
+ 600, -1, 401, 176, 165, 368, 403, 369, 406, -1,
401, 147, 165, 368, 402, 369, 393, -1, 401, 126,
- 368, 552, 369, -1, 401, 194, 368, 402, 369, -1,
+ 368, 553, 369, -1, 401, 194, 368, 402, 369, -1,
401, 153, 406, 368, 403, 369, -1, -1, 129, 380,
- -1, 610, -1, 402, 370, 610, -1, 610, 455, -1,
- 403, 370, 610, 455, -1, 210, -1, 194, -1, 206,
+ -1, 611, -1, 402, 370, 611, -1, 611, 455, -1,
+ 403, 370, 611, 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, 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,
+ 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,
234, -1, -1, 124, -1, 182, -1, 129, 380, 417,
- -1, 400, -1, 230, 192, 599, 416, 418, -1, 131,
+ -1, 400, -1, 230, 192, 600, 416, 418, -1, 131,
301, 185, 4, -1, 142, 301, 185, 4, -1, 519,
- -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,
+ -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,
153, 123, 184, 368, 453, 369, -1, 153, 123, 132,
- 368, 453, 369, -1, -1, 155, 552, -1, -1, 96,
+ 368, 453, 369, -1, -1, 155, 553, -1, -1, 96,
195, -1, 96, 301, 3, -1, 96, 301, 3, 3,
- -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,
+ -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,
20, 23, 22, -1, 20, 23, 21, -1, 20, 23,
- 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,
+ 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,
5, -1, 6, -1, 7, -1, 9, -1, 18, -1,
- 8, -1, 169, -1, 93, 171, 606, -1, 93, 171,
+ 8, -1, 169, -1, 93, 171, 607, -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,
@@ -1564,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, 599, 493, -1, 599, 101, 380,
- 493, -1, 599, 380, 493, -1, 380, -1, 380, 371,
+ 371, 371, 380, -1, 600, 493, -1, 600, 101, 380,
+ 493, -1, 600, 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,
@@ -1581,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, 605, -1, 125, -1, 211,
+ -1, 219, -1, 220, -1, 606, -1, 125, -1, 211,
-1, 211, 368, 7, 369, -1, 125, 368, 7, 369,
- -1, 204, -1, 204, 372, 7, 373, -1, 608, 607,
- -1, 606, -1, 708, -1, 605, -1, 125, -1, 211,
+ -1, 204, -1, 204, 372, 7, 373, -1, 609, 608,
+ -1, 607, -1, 709, -1, 606, -1, 125, -1, 211,
-1, 211, 368, 7, 369, -1, 125, 368, 7, 369,
- -1, 708, -1, 214, 708, -1, 214, 116, -1, 214,
+ -1, 709, -1, 214, 709, -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,
- 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,
+ 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,
243, -1, 81, 62, -1, 82, 156, -1, 82, 243,
- -1, 82, 62, -1, 634, -1, 633, 370, 634, -1,
- 3, 108, 598, -1, 78, -1, 75, -1, 80, -1,
+ -1, 82, 62, -1, 635, -1, 634, 370, 635, -1,
+ 3, 108, 599, -1, 78, -1, 75, -1, 80, -1,
73, -1, 79, -1, 74, -1, 76, -1, -1, 83,
- 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,
+ 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,
510, -1, 513, -1, 486, -1, 481, -1, 482, -1,
479, -1, 483, -1, 497, -1, 498, -1, 480, -1,
- 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,
+ 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,
370, 380, -1, 106, 148, -1, 258, 4, -1, 258,
- 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,
+ 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,
335, -1, 337, 334, -1, 338, -1, 187, 380, 107,
- 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,
+ 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,
-1, 237, 171, -1, 161, -1, 195, 427, -1, 138,
- -1, -1, 239, 682, -1, 683, -1, 682, 370, 683,
+ -1, -1, 239, 683, -1, 684, -1, 683, 370, 684,
-1, 240, 101, 380, -1, 295, 101, 380, -1, 142,
- 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,
+ 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,
-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, 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,
+ -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,
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, 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, 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, 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,
- 608, 723, 724, 570, 719, 720, -1, -1, 181, 86,
+ 609, 724, 725, 571, 720, 721, -1, -1, 181, 86,
27, 390, -1, 181, 86, 106, 27, -1, -1, 137,
- 598, -1, -1, 726, -1, 727, -1, 726, 727, -1,
- 25, -1, 106, 25, -1, 87, 289, 608, -1, 87,
+ 599, -1, -1, 727, -1, 728, -1, 727, 728, -1,
+ 25, -1, 106, 25, -1, 87, 289, 609, -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,
- 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,
+ 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,
-1, 35, 101, 31, 35, 101, 32, -1, -1, 89,
- 602, -1, -1, 739, -1, 740, -1, 739, 740, -1,
- 166, 742, -1, 66, 37, 38, -1, 66, 37, 39,
+ 603, -1, -1, 740, -1, 741, -1, 740, 741, -1,
+ 166, 743, -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, 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,
+ 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,
325, 107, 330, -1, -1, 201, 326, -1, 131, 327,
- 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,
+ 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,
-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, 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
+ 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
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 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
+ 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
};
#endif
@@ -1992,12 +1992,12 @@ static const char *const yytname[] =
"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_spec", "query_no_from_spec",
+ "non_final_query_spec", "query_opt_from_spec", "query_spec",
"breakup_term", "breakup_list", "selection", "non_final_table_exp",
- "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_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",
"opt_group_by_clause", "opt_having_clause", "opt_lock_mode",
"search_condition", "predicate", "scalar_exp_predicate",
"comparison_predicate", "between_predicate", "like_predicate",
@@ -2139,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, 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,
+ 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,
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, 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,
+ 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, 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, 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,
+ 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,
568, 568, 568, 568, 568, 568, 568, 568, 568, 568,
- 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
+ 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
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -2272,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, 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, 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, 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, 3, 3,
- 5, 1, 2, 1, 2, 4, 7, 2, 1, 3,
+ 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, 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,
@@ -2392,592 +2392,590 @@ 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, 441,
+ 845, 0, 196, 0, 0, 0, 0, 0, 0, 439,
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, 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
+ 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
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -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
+ -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
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -2133
+#define YYPACT_NINF -2149
static const yytype_int16 yypact[] =
{
- 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
+ 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
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -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
+ -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
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -2987,1666 +2985,1626 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -1228
static const yytype_int16 yytable[] =
{
- 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,
+ 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, 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, 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,
- 1266, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1291, 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, 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, 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, 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, 850, 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, 853, 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,
- 0, 0, 0, 0, 0, 0, 0, 1480, 0, 0,
+ 1506, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 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,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1551, 0, 0, 0, 0, 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, 0, 0,
- 0, 0, 0, 0, 0, 1555, 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, 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, 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, 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, 1729, 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,
- 1733, 0, 0, 0, 1330, 0, 0, 0, 0, 0,
+ 0, 0, 0, 562, 0, 0, 0, 1740, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 1752, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1756, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 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,
+ 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, 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, 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, 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, 1, 0, 0, 0, 0, 0, 1380,
+ 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, 0, 0, 0, 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,
+ 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, 0,
+ 0, 0, 0, 0, 0, 0, 0, 2178, 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, 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 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, 0,
- 0, 0, 0, 555, 555, 0, 0, 0, 0, 2074,
- 4, 5, 198, 7, 8, 9, 10, 11, 12, 13,
+ 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,
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, 2131, 2132, 0, 0, 0, 93, 0, 0,
- 0, 0, 0, 0, 0, 0, 2142, 2144, 0, 0,
+ 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,
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, 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, 100, 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, 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, 0, 2209, 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, 0, 0, 0, 0, 484, 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, 93, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 93, 0, 0, 0, 0, 0, 941, 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, 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, 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, 545, 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, 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,
+ 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, 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, 852, 0, 0, 0, 0, 4, 5,
- 198, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 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,
- 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, 544, 0, 0,
- 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
+ 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, 721,
+ 0, 0, 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, 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, 544, 0, 0, 0, 0, 0, 106,
+ 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, 93,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 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,
+ 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, 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,
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,
+ 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,
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, 100, 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, 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,
+ 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 2358, 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,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 563, 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, 0, 0, 1998,
+ 0, 480, 0, 2360, 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,
- 100, 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,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 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,
- 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, 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, 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, 805, 806, 807,
+ 808, 0, 93, 0, 0, 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, 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,
- 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, 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, 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,
- 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, 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, 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, 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, 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, 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, 1996, 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, 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,
+ 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, 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, 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, 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, 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,
+ 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 1101, 4, 5, 198, 7,
+ 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,
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, 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, 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, 821, 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 845, 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, 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, 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, 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, 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,
+ 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,
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,
+ 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, 0, 0, 0, 0, 0, 0, 1990, 1991, 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, 371, 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, 1994, 0, 0, 0, 0, 0,
- 0, 0, 0, 372, 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, 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, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
+ 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, 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, 369, 67, 68, 0, 0,
+ 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, 477, 478, 370, 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, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
+ 0, 0, 1987, 1988, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 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, 2358, 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, 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, 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,
+ 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,
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,
- 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 477, 478, 370,
+ 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,
0, 0, 0, 0, 0, 0, 0, 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, 369, 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, 79, 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, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 583, 4, 5, 198, 7,
+ 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, 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, 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, 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, 0, 0, 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, 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, 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, 0, 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, 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, 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, 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, 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,
+ 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,
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,
- 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 820, 0, 0, 0, 477, 478, 370,
+ 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,
- 1288, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 821, 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, 371, 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, 372, 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, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 822, 4, 5, 198, 7,
+ 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, 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, 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, 0, 0, 0, 0, 0, 0, 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, 1285, 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, 371, 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, 1365, 0, 0, 0, 0, 0, 0, 372, 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, 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, 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, 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, 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,
+ 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,
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,
- 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 477, 478, 370,
+ 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,
- 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, 371, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 369, 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, 1362, 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, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
+ 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,
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, 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, 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, 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 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, 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, 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,
+ 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,
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,
- 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,
+ 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,
+ 0, 0, 0, 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, 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, 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, 372, 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, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
+ 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, 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, 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, 65, 367, 67, 68, 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, 0, 0, 0, 0, 821, 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, 371, 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, 372, 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, 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, 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, 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,
- 822, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+ 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,
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,
+ 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, 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, 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, 82, 83, 84, 85, 0, 86, 87, 88, 0,
- 89, 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,
- 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, 0, 0, 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, 100, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 101, 0, 0, 102, 0, 0, 103,
+ 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 120, 4, 5, 198, 7,
+ 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,
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, 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, 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, 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, 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, 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, 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, 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, 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,
+ 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,
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,
- 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,
+ 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,
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, 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, 372, 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, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
+ 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,
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, 369, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 367, 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, 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, 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, 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, 372, 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, 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, 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, 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, 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,
+ 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,
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,
- 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 477, 478, 370,
+ 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,
0, 0, 0, 0, 0, 0, 0, 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,
- 2313, 0, 0, 0, 0, 0, 371, 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, 372, 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, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
+ 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,
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, 369, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 367, 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, 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, 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, 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, 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, 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, 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, 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, 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,
+ 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,
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,
- 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 370,
+ 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,
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, 371, 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, 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, 370, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 583, 4, 5, 198, 7,
+ 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, 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, 369, 67, 68, 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, 370, 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, 2226, 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, 371, 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, 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, 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, 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, 296, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 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,
+ 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, 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, 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,
+ 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,
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,
- 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,
+ 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, 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, 371, 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, 372, 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, 2361, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 2358, 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, 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, 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, 359, 360, 361, 362,
- 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
- 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
+ 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, 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, 369, 67, 68, 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, 370, 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, 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, 0, 0, 0, 372, 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, 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, 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, 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,
- 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 376, 377, 378, 379, 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, 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,
+ 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,
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,
- 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 370,
+ 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, 0,
0, 0, 0, 0, 0, 0, 0, 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, 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, 372, 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, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 371, 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,
+ 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,
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,
+ 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,
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, 65, 367, 67, 68, 0, 0,
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, 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, 294, 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, 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, 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, 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, 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, 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,
- 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, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1248, 4, 5, 198, 7,
+ 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,
+ 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, 0, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 1, 0,
+ 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, 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, 294, 0,
+ 0, 0, 0, 79, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 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,
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, 0, 0, 0, 0, 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, 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,
- 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,
+ 1, 0, 0, 0, 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,
+ 1245, 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,
+ 59, 60, 61, 62, 63, 64, 0, 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, 79, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 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,
- 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, 0, 0, 0, 0, 0,
0, 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, 579, 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, 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, 93,
+ 0, 0, 0, 968, 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, 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, 93, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 972, 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, 100, 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, 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, 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, 1691, 4, 5,
- 198, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 0, 0, 0, 0, 0, 0, 0, 0, 309, 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, 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,
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,
- 0, 0, 0, 0, 0, 802, 803, 804, 805, 0,
- 0, 0, 0, 806, 807, 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, 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, 808, 809, 810, 811, 0, 93, 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, 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, 0, 0, 813, 814, 0, 0,
- 0, 0, 1, 0, 0, 0, 0, 0, 0, 106,
+ 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, 4, 5, 198, 7, 8, 9, 10,
+ 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, 1687, 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,
@@ -4655,526 +4613,526 @@ static const yytype_int16 yytable[] =
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, 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, 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, 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, 0, 0, 0, 0, 0,
- 1190, 803, 804, 1191, 0, 0, 0, 0, 806, 807,
+ 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, 0, 0, 0, 0, 0,
0, 0, 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, 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, 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, 810, 811, 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,
+ 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,
+ 0, 0, 0, 0, 0, 0, 65, 66, 67, 68,
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, 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,
+ 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,
0, 0, 0, 0, 0, 0, 0, 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, 1187, 800, 801, 1188, 0,
+ 0, 0, 0, 803, 804, 0, 0, 0, 0, 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, 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,
+ 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, 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, 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, 93, 0,
+ 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, 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,
+ 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, 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,
+ 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,
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, 266, 267, 0, 0, 0, 0, 65, 66, 67,
+ 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,
- 313, 0, 0, 0, 0, 100, 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, 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, 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, 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, 321, 0, 0,
- 0, 0, 0, 314, 4, 5, 198, 7, 8, 9,
+ 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,
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, 315, 316, 0, 0,
+ 59, 60, 61, 62, 63, 64, 265, 266, 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,
+ 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, 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, 323, 0, 0, 4,
- 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
+ 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,
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, 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,
+ 64, 313, 314, 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,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
+ 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,
0, 0, 0, 0, 0, 0, 0, 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, 1090, 1091, 0, 0,
- 0, 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, 112, 113, 114, 115,
- 116, 117, 118, 119, 4, 5, 198, 7, 8, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 321, 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,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 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, 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,
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, 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, 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, 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, 289, 113, 114, 115, 116, 117, 118, 119, 4,
- 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
+ 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, 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, 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, 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,
- 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,
+ 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, 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, 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,
0, 0, 0, 0, 0, 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,
- 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,
+ 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, 288, 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, 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, 1,
+ 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, 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, 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, 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, 1970,
+ 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,
+ 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, 93, 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,
- 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, 100, 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,
+ 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, 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,
- 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, 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, 0, 0, 0, 0, 0, 0, 100,
+ 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, 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, 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, 0, 100, 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, 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,
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, 100,
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,
+ 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, 1, 0, 0, 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, 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,
- 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, 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, 93, 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, 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, 100, 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, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 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, 93, 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, 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, 1,
- 544, 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,
+ 0, 0, 0, 0, 0, 368, 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, 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, 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,
+ 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, 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, 100, 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, 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, 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, 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, 93,
+ 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, 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,
+ 0, 100, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1, 541, 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,
+ 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, 40, 41, 42, 43, 44, 45, 46, 47,
+ 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, 0, 65, 66, 67, 68, 1, 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, 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, 100, 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,
+ 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, 93, 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,
- 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, 93, 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, 100, 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,
+ 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, 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, 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, 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,
+ 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,
- 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, 1750, 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, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 93, 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, 100, 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, 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, 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, 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,
+ 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,
+ 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,
+ 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,
@@ -5182,424 +5140,493 @@ static const yytype_int16 yytable[] =
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, 1390, 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, 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, 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, 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, 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,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 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,
+ 288, 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,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -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,
- 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, 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, 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,
-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, -1, -1,
- -1, -1, -1, -1, 1077, -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, 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, 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, 371, -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, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 1240, -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, -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,
+ 1335, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1338, -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, -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,
+ 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, 1497, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -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, -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, 1568, -1, -1, -1, 1572, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 1594, -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, -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,
+ 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, 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, -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, 1657, 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,
+ 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, 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, -1, -1, -1, -1,
+ -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, -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, -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, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 2072, -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, -1, -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, -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, -1, 2234,
-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, 371, -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, 1906, 1907, -1, -1, -1, -1, 1912,
+ -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,
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,
@@ -5607,193 +5634,191 @@ static const yytype_int16 yycheck[] =
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,
+ 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,
- 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, 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, 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, 2075, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 371, -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, 2108, -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, 2138, -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, 272, -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, -1, -1,
+ 3, -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,
+ 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, 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,
+ -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, -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, -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,
+ 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,
- 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,
+ 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, -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, 325,
+ -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,
+ -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, -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,
+ 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,
-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, 112, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 371, -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,
+ -1, -1, -1, -1, -1, -1, -1, 224, -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,
+ 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, -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, 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, 25, 26, 27, 28, 29,
+ -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,
@@ -5801,147 +5826,68 @@ static const yytype_int16 yycheck[] =
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, -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, 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, -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, -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, -1, 267, 268, 269, 270, -1, 272, -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,
-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, -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, 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, 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,
- -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, 28, 29, 30, 31, 32,
+ 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, -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,
+ 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,
- -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,
+ 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, -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,
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,
+ 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,
@@ -5983,27 +5929,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, 96, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 112,
+ 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, -1, -1, -1, -1, -1, -1, 150, 151, -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, -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, -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,
@@ -6017,28 +5963,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, -1, -1,
+ -1, -1, -1, -1, 92, 93, 94, 95, 96, -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, 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, -1, 154, -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, -1, 266, -1,
- -1, -1, -1, -1, 272, -1, 274, 275, -1, 277,
+ -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, 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,
@@ -6087,19 +6033,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, 106, -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, -1, 133, -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, -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, 253, -1, -1, -1, -1,
@@ -6107,7 +6053,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, -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,
@@ -6156,16 +6102,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, 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, 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, -1, -1,
- -1, 189, -1, -1, -1, -1, -1, -1, 196, -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,
@@ -6182,7 +6128,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, 20, -1, -1,
+ 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,
@@ -6192,14 +6138,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, 184, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -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,
@@ -6217,7 +6163,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, -1, 368, 24, 25, 26, 27,
+ 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, 53, 54, 55, 56, 57,
@@ -6228,22 +6174,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, -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, -1, -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, -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, -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, 280, -1, 282, 283, -1, -1, -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,
@@ -6261,9 +6207,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, 140, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -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,
@@ -6274,10 +6220,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, -1, -1, -1, 250, -1, -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,
+ -1, 274, 275, -1, 277, 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,
@@ -6294,11 +6240,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, 106, -1,
- -1, -1, 110, 111, 112, -1, -1, -1, -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, 144, -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, -1, -1, -1, -1, -1,
@@ -6319,8 +6265,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, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 14, -1, -1, 17, -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,
@@ -6329,33 +6275,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, 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,
- 183, -1, -1, 186, 187, -1, -1, -1, -1, -1,
- -1, -1, 195, -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, -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, 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,
- 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, -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, 316, -1, -1, 319, -1, -1, 322,
+ -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, 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, 53, 54, 55, 56, 57,
@@ -6364,32 +6310,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, 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, 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, -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, -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, -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, 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, 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, 20, -1, -1,
+ 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,
@@ -6399,7 +6345,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, -1,
+ -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,
@@ -6424,7 +6370,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, -1, 368, 24, 25, 26, 27,
+ 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, 53, 54, 55, 56, 57,
@@ -6458,7 +6404,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, 367,
+ 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,
@@ -6473,7 +6419,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,
- 163, -1, -1, -1, -1, -1, 169, -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,
@@ -6493,7 +6439,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, -1, 368, 24, 25, 26, 27,
+ 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, 53, 54, 55, 56, 57,
@@ -6507,7 +6453,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, -1, -1, -1, -1, -1,
+ -1, -1, -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,
@@ -6536,26 +6482,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, -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, 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, 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, 241, -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, -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, 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,
@@ -6578,7 +6524,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, -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,
@@ -6590,7 +6536,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, -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,
@@ -6608,7 +6554,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, -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,
@@ -6651,7 +6597,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, -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, -1, -1, -1, 253, -1, -1, -1, -1,
@@ -6698,146 +6644,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, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -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,
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, 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, 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, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -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, 186, 272, -1, 274, 275, -1, -1,
- -1, -1, -1, -1, 282, 283, -1, -1, -1, -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, -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, 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,
+ 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,
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,
+ 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, -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, 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, -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, -1, -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, 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,
- -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,
- 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,
+ 3, -1, -1, -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,
+ 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,
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, 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, 186, -1, -1, -1, -1, -1, -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, -1, -1, -1, -1, 305, -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, 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, 272,
+ -1, -1, -1, 276, -1, -1, -1, -1, -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, -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, 272, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 368, -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, -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, 3, -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, 368, 24, 25,
+ -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,
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,
@@ -6845,31 +6791,34 @@ 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,
- -1, -1, -1, -1, -1, 211, 212, 213, 214, -1,
- -1, -1, -1, 219, 220, -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, 305, -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, 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, 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, 312, 313, -1, -1,
- -1, -1, 3, -1, -1, -1, -1, -1, -1, 325,
+ -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, 24, 25, 26, 27, 28, 29, 30,
+ 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,
@@ -6898,79 +6847,92 @@ 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, -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, 3, -1,
+ 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, 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,
+ 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,
-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, 25, 26, 27, 28, 29,
+ -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,
+ -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,
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,
+ 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, 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,
+ -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,
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,
+ 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,
- 115, -1, -1, -1, -1, 305, -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, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -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, 17, -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,
@@ -6980,76 +6942,63 @@ 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, -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, -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,
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,
+ -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,
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, -1, -1, -1,
+ 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,
-1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 319,
+ 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, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -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,
- 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- 335, 336, 337, 338, 24, 25, 26, 27, 28, 29,
+ -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, -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, -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, 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, -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, 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, -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,
@@ -7058,314 +7007,377 @@ 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, 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,
+ 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, 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, 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,
- 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,
+ 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, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, 3,
+ -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,
- 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, 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, 305, 130,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 319, -1, -1, -1, -1, -1, 325, 326,
+ -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, 272, -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, 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, -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,
+ -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, 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,
- 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, 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, -1, -1, -1, -1, -1, -1, 305,
+ -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, 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, 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, 305, -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, 325, 326, 327, 328, 329, 330, 331, 332,
- 333, 334, 335, 336, 337, 338, -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, 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, -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,
+ -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, 3, -1, -1, -1, -1, -1, 92, 93, 94,
+ 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, 3, -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,
- 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, 266, -1, 92, 93, 94, 95, 272, -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,
+ -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,
- 305, -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, -1, -1, -1, -1, -1, -1,
+ 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, 3,
-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, 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, 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, 305, -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, 325, 326, 327, 328, 329, 330, 331,
- 332, 333, 334, 335, 336, 337, 338, -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, 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, 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, 3,
- 319, -1, -1, -1, -1, -1, 325, 326, 327, 328,
+ -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, 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,
+ -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, 272, 92,
- 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 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, 305, -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, 325, 326, 327, 328, 329, 330, 331, 332, 333,
- 334, 335, 336, 337, 338, -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, 272, -1, 176, -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, 305, -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, 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, 305, -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, 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, -1, -1,
- -1, -1, -1, -1, 92, 93, 94, 95, 3, -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, 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,
+ -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, 272, -1, -1, -1, -1, -1,
+ 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,
+ 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,
- 112, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 305, -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, -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, 305, -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, 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, -1, -1, -1, 305, -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, 325, 326, 327, 328,
+ 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
-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, 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, 26, 27, 28, 29, 30,
+ -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,
@@ -7373,37 +7385,6 @@ static const yytype_int16 yycheck[] =
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,
- 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,
@@ -7421,14 +7402,13 @@ 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, -1, -1, -1, -1, -1, 272, -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, 305,
+ -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, 325,
- 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
- 336, 337, 338
+ -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
@@ -7452,236 +7432,235 @@ 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, 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
+ 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
};
#define yyerrok (yyerrstatus = 0)
@@ -7755,7 +7734,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -8496,564 +8475,564 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 677 "./sql3.y"
+#line 651 "./sql3.y"
{ }
break;
case 3:
-#line 678 "./sql3.y"
+#line 652 "./sql3.y"
{ }
break;
case 4:
-#line 681 "./sql3.y"
+#line 655 "./sql3.y"
{ parse_tree = (yyvsp[(1) - (1)].tree); }
break;
case 5:
-#line 688 "./sql3.y"
+#line 662 "./sql3.y"
{ (yyval.tree) = t_listst (2, SCHEMA_ELEMENT_LIST,
t_list_to_array ((yyvsp[(1) - (1)].list))); }
break;
case 6:
-#line 690 "./sql3.y"
+#line 664 "./sql3.y"
{ (yyval.tree) = t_listst (2, SCHEMA_ELEMENT_LIST, t_list (1, (yyvsp[(1) - (1)].tree))); }
break;
case 7:
-#line 691 "./sql3.y"
+#line 665 "./sql3.y"
{ (yyval.tree) = t_listst (2, SCHEMA_ELEMENT_LIST, t_list (1, (yyvsp[(1) - (1)].tree))); }
break;
case 8:
-#line 692 "./sql3.y"
+#line 666 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 9:
-#line 693 "./sql3.y"
+#line 667 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 10:
-#line 694 "./sql3.y"
+#line 668 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 11:
-#line 695 "./sql3.y"
+#line 669 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 12:
-#line 696 "./sql3.y"
+#line 670 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 13:
-#line 697 "./sql3.y"
+#line 671 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 14:
-#line 698 "./sql3.y"
+#line 672 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 15:
-#line 714 "./sql3.y"
+#line 688 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 16:
-#line 715 "./sql3.y"
+#line 689 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 17:
-#line 716 "./sql3.y"
+#line 690 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 18:
-#line 717 "./sql3.y"
+#line 691 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 37:
-#line 744 "./sql3.y"
+#line 718 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 38:
-#line 745 "./sql3.y"
+#line 719 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 39:
-#line 746 "./sql3.y"
+#line 720 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 40:
-#line 747 "./sql3.y"
+#line 721 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 41:
-#line 748 "./sql3.y"
+#line 722 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 42:
-#line 749 "./sql3.y"
+#line 723 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 43:
-#line 750 "./sql3.y"
+#line 724 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 44:
-#line 751 "./sql3.y"
+#line 725 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 45:
-#line 752 "./sql3.y"
+#line 726 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 46:
-#line 753 "./sql3.y"
+#line 727 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 47:
-#line 754 "./sql3.y"
+#line 728 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 48:
-#line 755 "./sql3.y"
+#line 729 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 49:
-#line 756 "./sql3.y"
+#line 730 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 50:
-#line 757 "./sql3.y"
+#line 731 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 51:
-#line 758 "./sql3.y"
+#line 732 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 52:
-#line 759 "./sql3.y"
+#line 733 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 53:
-#line 760 "./sql3.y"
+#line 734 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 54:
-#line 761 "./sql3.y"
+#line 735 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 55:
-#line 762 "./sql3.y"
+#line 736 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 56:
-#line 763 "./sql3.y"
+#line 737 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 57:
-#line 764 "./sql3.y"
+#line 738 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 58:
-#line 765 "./sql3.y"
+#line 739 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 59:
-#line 766 "./sql3.y"
+#line 740 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 60:
-#line 767 "./sql3.y"
+#line 741 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 61:
-#line 768 "./sql3.y"
+#line 742 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 62:
-#line 769 "./sql3.y"
+#line 743 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 63:
-#line 770 "./sql3.y"
+#line 744 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 64:
-#line 771 "./sql3.y"
+#line 745 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 65:
-#line 772 "./sql3.y"
+#line 746 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 66:
-#line 773 "./sql3.y"
+#line 747 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 67:
-#line 774 "./sql3.y"
+#line 748 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 68:
-#line 775 "./sql3.y"
+#line 749 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 69:
-#line 776 "./sql3.y"
+#line 750 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 70:
-#line 777 "./sql3.y"
+#line 751 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 71:
-#line 778 "./sql3.y"
+#line 752 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 72:
-#line 779 "./sql3.y"
+#line 753 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 73:
-#line 780 "./sql3.y"
+#line 754 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 74:
-#line 781 "./sql3.y"
+#line 755 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 75:
-#line 782 "./sql3.y"
+#line 756 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 76:
-#line 783 "./sql3.y"
+#line 757 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 77:
-#line 784 "./sql3.y"
+#line 758 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 78:
-#line 785 "./sql3.y"
+#line 759 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 79:
-#line 786 "./sql3.y"
+#line 760 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 80:
-#line 787 "./sql3.y"
+#line 761 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 81:
-#line 788 "./sql3.y"
+#line 762 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 82:
-#line 789 "./sql3.y"
+#line 763 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 83:
-#line 790 "./sql3.y"
+#line 764 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 84:
-#line 791 "./sql3.y"
+#line 765 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 85:
-#line 792 "./sql3.y"
+#line 766 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 86:
-#line 793 "./sql3.y"
+#line 767 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 87:
-#line 794 "./sql3.y"
+#line 768 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 88:
-#line 795 "./sql3.y"
+#line 769 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 89:
-#line 796 "./sql3.y"
+#line 770 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 90:
-#line 797 "./sql3.y"
+#line 771 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 91:
-#line 798 "./sql3.y"
+#line 772 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 92:
-#line 799 "./sql3.y"
+#line 773 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 93:
-#line 800 "./sql3.y"
+#line 774 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 94:
-#line 801 "./sql3.y"
+#line 775 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 95:
-#line 802 "./sql3.y"
+#line 776 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 96:
-#line 803 "./sql3.y"
+#line 777 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 97:
-#line 804 "./sql3.y"
+#line 778 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 98:
-#line 805 "./sql3.y"
+#line 779 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 99:
-#line 806 "./sql3.y"
+#line 780 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 100:
-#line 807 "./sql3.y"
+#line 781 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 101:
-#line 808 "./sql3.y"
+#line 782 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 102:
-#line 809 "./sql3.y"
+#line 783 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 103:
-#line 810 "./sql3.y"
+#line 784 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 104:
-#line 811 "./sql3.y"
+#line 785 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 105:
-#line 812 "./sql3.y"
+#line 786 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 106:
-#line 813 "./sql3.y"
+#line 787 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 107:
-#line 814 "./sql3.y"
+#line 788 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 108:
-#line 815 "./sql3.y"
+#line 789 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 109:
-#line 816 "./sql3.y"
+#line 790 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 110:
-#line 817 "./sql3.y"
+#line 791 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 111:
-#line 818 "./sql3.y"
+#line 792 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 112:
-#line 819 "./sql3.y"
+#line 793 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 113:
-#line 820 "./sql3.y"
+#line 794 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 114:
-#line 821 "./sql3.y"
+#line 795 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 115:
-#line 822 "./sql3.y"
+#line 796 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 116:
-#line 823 "./sql3.y"
+#line 797 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("__tag"); }
break;
case 117:
-#line 824 "./sql3.y"
+#line 798 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 118:
-#line 825 "./sql3.y"
+#line 799 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 119:
-#line 829 "./sql3.y"
+#line 803 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 120:
-#line 830 "./sql3.y"
+#line 804 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 121:
-#line 831 "./sql3.y"
+#line 805 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 122:
-#line 835 "./sql3.y"
+#line 809 "./sql3.y"
{ (yyval.intval) = T_ROW; }
break;
case 123:
-#line 836 "./sql3.y"
+#line 810 "./sql3.y"
{ (yyval.intval) = T_COLUMN; }
break;
case 124:
-#line 837 "./sql3.y"
+#line 811 "./sql3.y"
{ (yyval.intval) = T_DISTINCT_COLUMNS; }
break;
case 125:
-#line 843 "./sql3.y"
+#line 817 "./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 846 "./sql3.y"
+#line 820 "./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 852 "./sql3.y"
+#line 826 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 130:
-#line 857 "./sql3.y"
+#line 831 "./sql3.y"
{ (yyval.list) = t_CONS (NULL, t_CONS ((yyvsp[(1) - (1)].tree), NULL)); }
break;
case 131:
-#line 862 "./sql3.y"
+#line 836 "./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 866 "./sql3.y"
+#line 840 "./sql3.y"
{ (yyval.tree) = t_listst (2, 0, 0); }
break;
case 133:
-#line 867 "./sql3.y"
+#line 841 "./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));
@@ -9061,7 +9040,7 @@ yyreduce:
break;
case 134:
-#line 872 "./sql3.y"
+#line 846 "./sql3.y"
{
caddr_t *l = (caddr_t *)(yyvsp[(1) - (2)].tree);
caddr_t *ll = (caddr_t *)(yyvsp[(2) - (2)].tree);
@@ -9072,72 +9051,72 @@ yyreduce:
break;
case 135:
-#line 882 "./sql3.y"
+#line 856 "./sql3.y"
{ (yyval.tree) = t_listst (2, 0, (ptrlong) (yyvsp[(3) - (3)].intval)); }
break;
case 136:
-#line 883 "./sql3.y"
+#line 857 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 137:
-#line 887 "./sql3.y"
+#line 861 "./sql3.y"
{ (yyval.tree) = t_listst (2, (ptrlong) 1, (ptrlong) (yyvsp[(3) - (3)].intval)); }
break;
case 138:
-#line 891 "./sql3.y"
+#line 865 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 139:
-#line 892 "./sql3.y"
+#line 866 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 140:
-#line 896 "./sql3.y"
+#line 870 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 141:
-#line 897 "./sql3.y"
+#line 871 "./sql3.y"
{ (yyval.intval) = 2; }
break;
case 142:
-#line 898 "./sql3.y"
+#line 872 "./sql3.y"
{ (yyval.intval) = 3; }
break;
case 143:
-#line 902 "./sql3.y"
+#line 876 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 144:
-#line 903 "./sql3.y"
+#line 877 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 145:
-#line 904 "./sql3.y"
+#line 878 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 146:
-#line 905 "./sql3.y"
+#line 879 "./sql3.y"
{ (yyval.intval) = 2; }
break;
case 147:
-#line 906 "./sql3.y"
+#line 880 "./sql3.y"
{ (yyval.intval) = 3; }
break;
case 148:
-#line 911 "./sql3.y"
+#line 885 "./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));
@@ -9145,107 +9124,107 @@ yyreduce:
break;
case 149:
-#line 918 "./sql3.y"
+#line 892 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 150:
-#line 919 "./sql3.y"
+#line 893 "./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 923 "./sql3.y"
+#line 897 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_ID_START, (yyvsp[(3) - (3)].box)); }
break;
case 152:
-#line 924 "./sql3.y"
+#line 898 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_ID_INCREMENT_BY, (yyvsp[(3) - (3)].box)); }
break;
case 153:
-#line 936 "./sql3.y"
+#line 910 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_COMPRESS, (ptrlong)CC_NONE); }
break;
case 154:
-#line 937 "./sql3.y"
+#line 911 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_COMPRESS, (ptrlong)CC_OFFSET); }
break;
case 155:
-#line 938 "./sql3.y"
+#line 912 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_COMPRESS, (ptrlong)CC_PREFIX); }
break;
case 156:
-#line 943 "./sql3.y"
+#line 917 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 157:
-#line 944 "./sql3.y"
+#line 918 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 158:
-#line 948 "./sql3.y"
+#line 922 "./sql3.y"
{ (yyval.tree) = (ST *) COL_NOT_NULL; }
break;
case 159:
-#line 949 "./sql3.y"
+#line 923 "./sql3.y"
{ (yyval.tree) = (ST *) NULL; }
break;
case 160:
-#line 950 "./sql3.y"
+#line 924 "./sql3.y"
{ (yyval.tree) = (ST *) CO_IDENTITY; }
break;
case 161:
-#line 951 "./sql3.y"
+#line 925 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_IDENTITY, t_list_to_array ((yyvsp[(3) - (4)].list))); }
break;
case 162:
-#line 952 "./sql3.y"
+#line 926 "./sql3.y"
{ (yyval.tree) = t_listst (5, INDEX_DEF, NULL, NULL, NULL, (ST *) 0); }
break;
case 163:
-#line 953 "./sql3.y"
+#line 927 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 164:
-#line 954 "./sql3.y"
+#line 928 "./sql3.y"
{ (yyval.tree) = t_listst (2, COL_DEFAULT, (yyvsp[(2) - (2)].box)); }
break;
case 165:
-#line 955 "./sql3.y"
+#line 929 "./sql3.y"
{ (yyval.tree) = t_listst (2, COL_COLLATE, (yyvsp[(2) - (2)].strval)); }
break;
case 166:
-#line 956 "./sql3.y"
+#line 930 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 167:
-#line 957 "./sql3.y"
+#line 931 "./sql3.y"
{ (yyval.tree) = t_listst (2, COL_XML_ID, (yyvsp[(3) - (3)].strval)); }
break;
case 168:
-#line 959 "./sql3.y"
+#line 933 "./sql3.y"
{ (yyval.tree) = t_listst (3, CHECK_CONSTR, (yyvsp[(3) - (4)].tree), NULL); }
break;
case 169:
-#line 961 "./sql3.y"
+#line 935 "./sql3.y"
{
ST * check;
BIN_OP (check, BOP_NULL,
@@ -9257,44 +9236,44 @@ yyreduce:
break;
case 170:
-#line 969 "./sql3.y"
+#line 943 "./sql3.y"
{ (yyval.tree) = t_listst (5, UNIQUE_DEF, NULL, NULL, NULL,
(ST *) t_list (1, t_box_string ("unique"))); }
break;
case 171:
-#line 974 "./sql3.y"
+#line 948 "./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 975 "./sql3.y"
+#line 949 "./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 981 "./sql3.y"
+#line 955 "./sql3.y"
{ (yyval.tree) = t_listst (2, TABLE_UNDER, t_list (1, (yyvsp[(2) - (2)].strval))); }
break;
case 174:
-#line 983 "./sql3.y"
+#line 957 "./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 986 "./sql3.y"
+#line 960 "./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 988 "./sql3.y"
+#line 962 "./sql3.y"
{ (yyval.tree) = t_listst (3, CHECK_CONSTR, (yyvsp[(4) - (5)].tree), (yyvsp[(1) - (5)].box)); }
break;
case 177:
-#line 990 "./sql3.y"
+#line 964 "./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))),
@@ -9302,173 +9281,173 @@ yyreduce:
break;
case 178:
-#line 994 "./sql3.y"
+#line 968 "./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 998 "./sql3.y"
+#line 972 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 180:
-#line 999 "./sql3.y"
+#line 973 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 181:
-#line 1003 "./sql3.y"
+#line 977 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].strval), NULL); }
break;
case 182:
-#line 1004 "./sql3.y"
+#line 978 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].strval), NULL)); }
break;
case 183:
-#line 1008 "./sql3.y"
+#line 982 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (2)].strval), NULL); }
break;
case 184:
-#line 1009 "./sql3.y"
+#line 983 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (4)].list), t_CONS ((yyvsp[(3) - (4)].strval), NULL)); }
break;
case 185:
-#line 1013 "./sql3.y"
+#line 987 "./sql3.y"
{ (yyval.box) = t_box_string ("clustered"); }
break;
case 186:
-#line 1014 "./sql3.y"
+#line 988 "./sql3.y"
{ (yyval.box) = t_box_string ("unique"); }
break;
case 187:
-#line 1015 "./sql3.y"
+#line 989 "./sql3.y"
{ (yyval.box) = t_box_string ("object_id"); }
break;
case 188:
-#line 1016 "./sql3.y"
+#line 990 "./sql3.y"
{ (yyval.box) = t_box_string ("bitmap"); }
break;
case 189:
-#line 1017 "./sql3.y"
+#line 991 "./sql3.y"
{ (yyval.box) = t_box_string ("distinct"); }
break;
case 190:
-#line 1018 "./sql3.y"
+#line 992 "./sql3.y"
{ (yyval.box) = t_box_string ("column"); }
break;
case 191:
-#line 1019 "./sql3.y"
+#line 993 "./sql3.y"
{ (yyval.box) = t_box_string ("not_null"); }
break;
case 192:
-#line 1020 "./sql3.y"
+#line 994 "./sql3.y"
{ (yyval.box) = t_box_string ("no_pk"); }
break;
case 193:
-#line 1021 "./sql3.y"
+#line 995 "./sql3.y"
{ (yyval.box) = t_box_string ("no_fill"); }
break;
case 194:
-#line 1025 "./sql3.y"
+#line 999 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 195:
-#line 1026 "./sql3.y"
+#line 1000 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].box), NULL)); }
break;
case 196:
-#line 1030 "./sql3.y"
+#line 1004 "./sql3.y"
{ (yyval.tree) = (ST *) 0; }
break;
case 197:
-#line 1031 "./sql3.y"
+#line 1005 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 198:
-#line 1037 "./sql3.y"
+#line 1011 "./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 1040 "./sql3.y"
+#line 1014 "./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 1045 "./sql3.y"
+#line 1019 "./sql3.y"
{ (yyval.tree) = t_listst (3, INDEX_DROP, (yyvsp[(3) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
case 201:
-#line 1049 "./sql3.y"
+#line 1023 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 202:
-#line 1050 "./sql3.y"
+#line 1024 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].strval); }
break;
case 203:
-#line 1054 "./sql3.y"
+#line 1028 "./sql3.y"
{ (yyval.tree) = t_listst (2, TABLE_DROP, (yyvsp[(3) - (3)].strval)); }
break;
case 204:
-#line 1055 "./sql3.y"
+#line 1029 "./sql3.y"
{ (yyval.tree) = t_listst (2, TABLE_DROP, (yyvsp[(3) - (3)].strval)); }
break;
case 205:
-#line 1059 "./sql3.y"
+#line 1033 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 206:
-#line 1060 "./sql3.y"
+#line 1034 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 207:
-#line 1064 "./sql3.y"
+#line 1038 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].list), NULL); }
break;
case 208:
-#line 1065 "./sql3.y"
+#line 1039 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].list), NULL)); }
break;
case 209:
-#line 1069 "./sql3.y"
+#line 1043 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].strval), NULL); }
break;
case 210:
-#line 1070 "./sql3.y"
+#line 1044 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].strval), NULL)); }
break;
case 211:
-#line 1075 "./sql3.y"
+#line 1049 "./sql3.y"
{
dk_set_t ret = NULL, col_defs_list = (yyvsp[(6) - (6)].list);
DO_SET (dk_set_t, col_def, &col_defs_list)
@@ -9481,7 +9460,7 @@ yyreduce:
break;
case 212:
-#line 1085 "./sql3.y"
+#line 1059 "./sql3.y"
{
dk_set_t ret = NULL, col_ref_list = (yyvsp[(6) - (6)].list);
DO_SET (caddr_t, col_ref, &col_ref_list)
@@ -9494,61 +9473,61 @@ yyreduce:
break;
case 213:
-#line 1095 "./sql3.y"
+#line 1069 "./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 1102 "./sql3.y"
+#line 1076 "./sql3.y"
{ (yyval.tree) = t_listst (3, TABLE_RENAME, (yyvsp[(3) - (5)].strval), (yyvsp[(5) - (5)].strval)); }
break;
case 215:
-#line 1107 "./sql3.y"
+#line 1081 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
case 216:
-#line 1108 "./sql3.y"
+#line 1082 "./sql3.y"
{ (yyval.subtok) = 2; }
break;
case 217:
-#line 1109 "./sql3.y"
+#line 1083 "./sql3.y"
{ (yyval.subtok) = 3; }
break;
case 218:
-#line 1113 "./sql3.y"
+#line 1087 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 219:
-#line 1114 "./sql3.y"
+#line 1088 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 220:
-#line 1115 "./sql3.y"
+#line 1089 "./sql3.y"
{ (yyval.intval) = 2; }
break;
case 221:
-#line 1120 "./sql3.y"
+#line 1094 "./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 1123 "./sql3.y"
+#line 1097 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 223:
-#line 1128 "./sql3.y"
+#line 1102 "./sql3.y"
{ ST * c = (yyvsp[(5) - (5)].tree);
if (INDEX_DEF == c->type)
c->type = 0;
@@ -9565,93 +9544,93 @@ yyreduce:
break;
case 224:
-#line 1145 "./sql3.y"
+#line 1119 "./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 1152 "./sql3.y"
+#line 1126 "./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 228:
-#line 1164 "./sql3.y"
+ case 227:
+#line 1138 "./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 229:
-#line 1168 "./sql3.y"
+ case 228:
+#line 1142 "./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 230:
-#line 1174 "./sql3.y"
+ case 229:
+#line 1148 "./sql3.y"
{ sqlp_in_view ((yyvsp[(3) - (3)].strval)); }
break;
- case 231:
-#line 1176 "./sql3.y"
+ case 230:
+#line 1150 "./sql3.y"
{ (yyval.tree) = (yyvsp[(5) - (5)].tree); (yyval.tree)->_.view_def.name = (yyvsp[(3) - (5)].strval); }
break;
- case 232:
-#line 1178 "./sql3.y"
+ case 231:
+#line 1152 "./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 233:
-#line 1185 "./sql3.y"
+ case 232:
+#line 1159 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 234:
-#line 1186 "./sql3.y"
+ case 233:
+#line 1160 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 235:
-#line 1190 "./sql3.y"
+ case 234:
+#line 1164 "./sql3.y"
{ (yyval.tree) = t_listst (0); }
break;
- case 236:
-#line 1191 "./sql3.y"
+ case 235:
+#line 1165 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
- case 237:
-#line 1195 "./sql3.y"
+ case 236:
+#line 1169 "./sql3.y"
{ (yyval.tree) = (ST *) 0; }
break;
- case 238:
-#line 1196 "./sql3.y"
+ case 237:
+#line 1170 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
- case 239:
-#line 1201 "./sql3.y"
+ case 238:
+#line 1175 "./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"
+ case 239:
+#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))); }
break;
- case 241:
-#line 1205 "./sql3.y"
+ case 240:
+#line 1179 "./sql3.y"
{ (yyval.tree) = t_listst (4, GRANT_STMT,
t_list (1,
t_listst (3, NULL, GR_EXECUTE, NULL)),
@@ -9659,8 +9638,8 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (7)].list))); }
break;
- case 242:
-#line 1211 "./sql3.y"
+ case 241:
+#line 1185 "./sql3.y"
{ (yyval.tree) = t_listst (4, GRANT_STMT,
t_list (1,
t_listst (3, NULL, GR_REXECUTE, NULL)),
@@ -9668,8 +9647,8 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 243:
-#line 1217 "./sql3.y"
+ case 242:
+#line 1191 "./sql3.y"
{ (yyval.tree) = t_listst (4, GRANT_STMT,
t_list (1,
t_listst (3, NULL, GR_UDT_UNDER, NULL)),
@@ -9677,28 +9656,28 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (7)].list))); }
break;
- case 244:
-#line 1224 "./sql3.y"
+ case 243:
+#line 1198 "./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 245:
-#line 1228 "./sql3.y"
+ case 244:
+#line 1202 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 246:
-#line 1229 "./sql3.y"
+ case 245:
+#line 1203 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 247:
-#line 1238 "./sql3.y"
+ case 246:
+#line 1212 "./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 248:
-#line 1241 "./sql3.y"
+ case 247:
+#line 1215 "./sql3.y"
{ (yyval.tree) = t_listst (4, REVOKE_STMT,
t_list (1,
t_listst (3, NULL, GR_EXECUTE, NULL)),
@@ -9706,8 +9685,8 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 249:
-#line 1247 "./sql3.y"
+ case 248:
+#line 1221 "./sql3.y"
{ (yyval.tree) = t_listst (4, REVOKE_STMT,
t_list (1,
t_listst (3, NULL, GR_UDT_UNDER, NULL)),
@@ -9715,8 +9694,8 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 250:
-#line 1253 "./sql3.y"
+ case 249:
+#line 1227 "./sql3.y"
{ (yyval.tree) = t_listst (4, REVOKE_STMT,
t_list (1,
t_listst (3, NULL, GR_REXECUTE, NULL)),
@@ -9724,23 +9703,23 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 251:
-#line 1259 "./sql3.y"
+ case 250:
+#line 1233 "./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 252:
-#line 1263 "./sql3.y"
+ case 251:
+#line 1237 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 253:
-#line 1264 "./sql3.y"
+ case 252:
+#line 1238 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 254:
-#line 1269 "./sql3.y"
+ case 253:
+#line 1243 "./sql3.y"
{
(yyval.box) = t_listbox (5,
t_list (3, NULL, GR_SELECT, NULL),
@@ -9755,8 +9734,8 @@ yyreduce:
}
break;
- case 255:
-#line 1282 "./sql3.y"
+ case 254:
+#line 1256 "./sql3.y"
{
(yyval.box) = t_listbox (6,
t_list (3, NULL, GR_SELECT, NULL),
@@ -9771,131 +9750,131 @@ yyreduce:
}
break;
- case 256:
-#line 1294 "./sql3.y"
+ case 255:
+#line 1268 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(1) - (1)].list)); }
break;
- case 257:
-#line 1298 "./sql3.y"
+ case 256:
+#line 1272 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 258:
-#line 1300 "./sql3.y"
+ case 257:
+#line 1274 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 259:
-#line 1305 "./sql3.y"
+ case 258:
+#line 1279 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_SELECT, (yyvsp[(2) - (2)].tree)); }
break;
- case 260:
-#line 1306 "./sql3.y"
+ case 259:
+#line 1280 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_INSERT, NULL); }
break;
- case 261:
-#line 1307 "./sql3.y"
+ case 260:
+#line 1281 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_DELETE, NULL); }
break;
- case 262:
-#line 1309 "./sql3.y"
+ case 261:
+#line 1283 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_UPDATE, (yyvsp[(2) - (2)].tree)); }
break;
- case 263:
-#line 1311 "./sql3.y"
+ case 262:
+#line 1285 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_REFERENCES, (yyvsp[(2) - (2)].tree)); }
break;
- case 264:
-#line 1316 "./sql3.y"
+ case 263:
+#line 1290 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
- case 265:
-#line 1318 "./sql3.y"
+ case 264:
+#line 1292 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
- case 266:
-#line 1322 "./sql3.y"
+ case 265:
+#line 1296 "./sql3.y"
{ (yyval.box) = (caddr_t) U_ID_PUBLIC; }
break;
- case 268:
-#line 1328 "./sql3.y"
+ case 267:
+#line 1302 "./sql3.y"
{ (yyval.tree) = t_listst (3, SET_PASS_STMT, (yyvsp[(3) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
- case 269:
-#line 1332 "./sql3.y"
+ case 268:
+#line 1306 "./sql3.y"
{ (yyval.tree) = t_listst (2, CREATE_USER_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 270:
-#line 1333 "./sql3.y"
+ case 269:
+#line 1307 "./sql3.y"
{ (yyval.tree) = t_listst (2, CREATE_ROLE_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 271:
-#line 1337 "./sql3.y"
+ case 270:
+#line 1311 "./sql3.y"
{ (yyval.tree) = t_listst (2, DELETE_USER_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 272:
-#line 1338 "./sql3.y"
+ case 271:
+#line 1312 "./sql3.y"
{ (yyval.tree) = t_listst (3, DELETE_USER_STMT, (yyvsp[(3) - (4)].box), t_box_num (1)); }
break;
- case 273:
-#line 1339 "./sql3.y"
+ case 272:
+#line 1313 "./sql3.y"
{ (yyval.tree) = t_listst (2, DELETE_USER_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 274:
-#line 1340 "./sql3.y"
+ case 273:
+#line 1314 "./sql3.y"
{ (yyval.tree) = t_listst (3, DELETE_USER_STMT, (yyvsp[(3) - (4)].box), t_box_num (1)); }
break;
- case 275:
-#line 1341 "./sql3.y"
+ case 274:
+#line 1315 "./sql3.y"
{ (yyval.tree) = t_listst (2, DROP_ROLE_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 276:
-#line 1346 "./sql3.y"
+ case 275:
+#line 1320 "./sql3.y"
{ (yyval.tree) = t_listst (3, SET_GROUP_STMT, (yyvsp[(4) - (5)].box), (yyvsp[(5) - (5)].box)); }
break;
- case 277:
-#line 1351 "./sql3.y"
+ case 276:
+#line 1325 "./sql3.y"
{ (yyval.tree) = t_listst (3, ADD_GROUP_STMT, (yyvsp[(4) - (5)].box), (yyvsp[(5) - (5)].box)); }
break;
- case 278:
-#line 1356 "./sql3.y"
+ case 277:
+#line 1330 "./sql3.y"
{ (yyval.tree) = t_listst (3, DELETE_GROUP_STMT, (yyvsp[(4) - (5)].box), (yyvsp[(5) - (5)].box)); }
break;
- case 279:
-#line 1361 "./sql3.y"
+ case 278:
+#line 1335 "./sql3.y"
{ (yyval.tree) = (ST *) t_alloc_box (0, DV_DB_NULL); }
break;
- case 280:
-#line 1363 "./sql3.y"
+ case 279:
+#line 1337 "./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 281:
-#line 1371 "./sql3.y"
+ case 280:
+#line 1345 "./sql3.y"
{
caddr_t *l = (caddr_t *) (yyvsp[(8) - (10)].tree);
(yyval.tree) = t_listst (3, CALL_STMT,
@@ -9904,209 +9883,209 @@ yyreduce:
}
break;
- case 282:
-#line 1380 "./sql3.y"
+ case 281:
+#line 1354 "./sql3.y"
{ (yyval.box) = t_alloc_box (0, DV_DB_NULL); }
break;
- case 283:
-#line 1381 "./sql3.y"
+ case 282:
+#line 1355 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].strval); }
break;
- case 284:
-#line 1386 "./sql3.y"
+ case 283:
+#line 1360 "./sql3.y"
{ (yyval.tree) = t_listst (2, t_alloc_box (0, DV_DB_NULL),
t_alloc_box (0, DV_DB_NULL));
}
break;
- case 285:
-#line 1390 "./sql3.y"
+ case 284:
+#line 1364 "./sql3.y"
{ (yyval.tree) = t_listst (2, (yyvsp[(2) - (4)].tree), (yyvsp[(4) - (4)].tree)); }
break;
- case 286:
-#line 1394 "./sql3.y"
+ case 285:
+#line 1368 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("DB.DBA.vd_attach_view"); }
break;
- case 287:
-#line 1395 "./sql3.y"
+ case 286:
+#line 1369 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("DB.DBA.vd_attach_view_no_select"); }
break;
- case 288:
-#line 1399 "./sql3.y"
+ case 287:
+#line 1373 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 289:
-#line 1401 "./sql3.y"
+ case 288:
+#line 1375 "./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 290:
-#line 1408 "./sql3.y"
+ case 289:
+#line 1382 "./sql3.y"
{ (yyval.intval) = _SQL_CURSOR_STATIC; }
break;
- case 291:
-#line 1409 "./sql3.y"
+ case 290:
+#line 1383 "./sql3.y"
{ (yyval.intval) = _SQL_CURSOR_DYNAMIC; }
break;
- case 292:
-#line 1410 "./sql3.y"
+ case 291:
+#line 1384 "./sql3.y"
{ (yyval.intval) = _SQL_CURSOR_KEYSET_DRIVEN; }
break;
- case 293:
-#line 1416 "./sql3.y"
+ case 292:
+#line 1390 "./sql3.y"
{
(yyval.tree) = t_listst (5, CURSOR_DEF, (yyvsp[(2) - (5)].box), (yyvsp[(5) - (5)].tree), _SQL_CURSOR_FORWARD_ONLY, NULL);
}
break;
- case 294:
-#line 1420 "./sql3.y"
+ case 293:
+#line 1394 "./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 295:
-#line 1426 "./sql3.y"
+ case 294:
+#line 1400 "./sql3.y"
{ (yyval.box) = NULL; }
break;
- case 296:
-#line 1427 "./sql3.y"
+ case 295:
+#line 1401 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(3) - (3)].list)); }
break;
- case 297:
-#line 1431 "./sql3.y"
+ case 296:
+#line 1405 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 298:
-#line 1433 "./sql3.y"
+ case 297:
+#line 1407 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 299:
-#line 1438 "./sql3.y"
+ case 298:
+#line 1412 "./sql3.y"
{ (yyval.tree) = t_listst (3, ORDER_BY, (caddr_t) (yyvsp[(1) - (2)].tree), (ptrlong) (yyvsp[(2) - (2)].subtok)); }
break;
- case 300:
-#line 1440 "./sql3.y"
+ case 299:
+#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)); }
break;
- case 301:
-#line 1444 "./sql3.y"
+ case 300:
+#line 1418 "./sql3.y"
{ (yyval.subtok) = ORDER_ASC; }
break;
- case 302:
-#line 1445 "./sql3.y"
+ case 301:
+#line 1419 "./sql3.y"
{ (yyval.subtok) = ORDER_ASC; }
break;
- case 303:
-#line 1446 "./sql3.y"
+ case 302:
+#line 1420 "./sql3.y"
{ (yyval.subtok) = ORDER_DESC; }
break;
- case 304:
-#line 1452 "./sql3.y"
+ case 303:
+#line 1426 "./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 305:
-#line 1459 "./sql3.y"
+ case 304:
+#line 1433 "./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 306:
-#line 1466 "./sql3.y"
+ case 305:
+#line 1440 "./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 307:
-#line 1472 "./sql3.y"
+ case 306:
+#line 1446 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
- case 308:
-#line 1473 "./sql3.y"
+ case 307:
+#line 1447 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 309:
-#line 1477 "./sql3.y"
+ case 308:
+#line 1451 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
- case 310:
-#line 1478 "./sql3.y"
+ case 309:
+#line 1452 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 311:
-#line 1483 "./sql3.y"
+ case 310:
+#line 1457 "./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 312:
-#line 1487 "./sql3.y"
+ case 311:
+#line 1461 "./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 313:
-#line 1493 "./sql3.y"
+ case 312:
+#line 1467 "./sql3.y"
{ (yyval.box) = t_box_num (0); }
break;
- case 314:
-#line 1494 "./sql3.y"
+ case 313:
+#line 1468 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
- case 315:
-#line 1499 "./sql3.y"
+ case 314:
+#line 1473 "./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 316:
-#line 1505 "./sql3.y"
+ case 315:
+#line 1479 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 317:
-#line 1506 "./sql3.y"
+ case 316:
+#line 1480 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 318:
-#line 1511 "./sql3.y"
+ case 317:
+#line 1485 "./sql3.y"
{
if ((yyvsp[(4) - (4)].subtok))
(yyval.tree) = t_listst (3, CALL_STMT,
@@ -10118,8 +10097,8 @@ yyreduce:
t_list (1, (yyvsp[(3) - (4)].strval))); }
break;
- case 319:
-#line 1524 "./sql3.y"
+ case 318:
+#line 1498 "./sql3.y"
{
/* if (!stricmp ($2, "TEXT"))
{*/
@@ -10131,289 +10110,289 @@ yyreduce:
}
break;
- case 320:
-#line 1536 "./sql3.y"
+ case 319:
+#line 1510 "./sql3.y"
{ (yyval.box) = t_box_num(0); }
break;
- case 321:
-#line 1537 "./sql3.y"
+ case 320:
+#line 1511 "./sql3.y"
{ (yyval.box) = t_box_num(1); }
break;
- case 322:
-#line 1541 "./sql3.y"
+ case 321:
+#line 1515 "./sql3.y"
{ (yyval.box) = NULL; }
break;
- case 323:
-#line 1542 "./sql3.y"
+ case 322:
+#line 1516 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(2) - (3)].strval)); }
break;
- case 324:
-#line 1547 "./sql3.y"
+ case 323:
+#line 1521 "./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 325:
-#line 1555 "./sql3.y"
+ case 324:
+#line 1529 "./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 326:
-#line 1562 "./sql3.y"
+ case 325:
+#line 1536 "./sql3.y"
{ (yyval.box) = t_box_num (0); }
break;
- case 327:
-#line 1563 "./sql3.y"
+ case 326:
+#line 1537 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
- case 328:
-#line 1567 "./sql3.y"
+ case 327:
+#line 1541 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
- case 329:
-#line 1568 "./sql3.y"
+ case 328:
+#line 1542 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(3) - (3)].strval)); }
break;
- case 330:
-#line 1572 "./sql3.y"
+ case 329:
+#line 1546 "./sql3.y"
{ (yyval.tree) = (ST*) t_NULLCONST; }
break;
- case 331:
-#line 1573 "./sql3.y"
+ case 330:
+#line 1547 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(4) - (5)].list)); }
break;
- case 332:
-#line 1577 "./sql3.y"
+ case 331:
+#line 1551 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
- case 333:
-#line 1578 "./sql3.y"
+ case 332:
+#line 1552 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 334:
-#line 1582 "./sql3.y"
+ case 333:
+#line 1556 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
- case 335:
-#line 1583 "./sql3.y"
+ case 334:
+#line 1557 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 336:
-#line 1587 "./sql3.y"
+ case 335:
+#line 1561 "./sql3.y"
{ (yyval.box) = t_box_num (0); }
break;
- case 337:
-#line 1588 "./sql3.y"
+ case 336:
+#line 1562 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
- case 348:
-#line 1606 "./sql3.y"
+ case 346:
+#line 1580 "./sql3.y"
{ (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
- case 366:
-#line 1628 "./sql3.y"
+ case 364:
+#line 1602 "./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 367:
-#line 1634 "./sql3.y"
+ case 365:
+#line 1608 "./sql3.y"
{ (yyval.tree) = t_listst (2, CLOSE_STMT, (yyvsp[(2) - (2)].box)); }
break;
- case 368:
-#line 1639 "./sql3.y"
+ case 366:
+#line 1613 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("__commit"), t_list (0)); }
break;
- case 369:
-#line 1645 "./sql3.y"
+ case 367:
+#line 1619 "./sql3.y"
{ (yyval.tree) = t_listst (4, DELETE_POS, (yyvsp[(7) - (8)].box), (yyvsp[(3) - (8)].strval), (yyvsp[(8) - (8)].tree)); }
break;
- case 370:
-#line 1650 "./sql3.y"
+ case 368:
+#line 1624 "./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 371:
-#line 1657 "./sql3.y"
+ case 369:
+#line 1631 "./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 372:
-#line 1659 "./sql3.y"
+ case 370:
+#line 1633 "./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 373:
-#line 1664 "./sql3.y"
+ case 371:
+#line 1638 "./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 374:
-#line 1671 "./sql3.y"
+ case 372:
+#line 1645 "./sql3.y"
{ (yyval.subtok) = INS_NORMAL; }
break;
- case 375:
-#line 1672 "./sql3.y"
+ case 373:
+#line 1646 "./sql3.y"
{ (yyval.subtok) = INS_REPLACING; }
break;
- case 376:
-#line 1673 "./sql3.y"
+ case 374:
+#line 1647 "./sql3.y"
{ (yyval.subtok) = INS_SOFT; }
break;
- case 377:
-#line 1678 "./sql3.y"
+ case 375:
+#line 1652 "./sql3.y"
{ (yyval.box) = NULL;}
break;
- case 378:
-#line 1679 "./sql3.y"
+ case 376:
+#line 1653 "./sql3.y"
{(yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 379:
-#line 1685 "./sql3.y"
+ case 377:
+#line 1659 "./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 380:
-#line 1690 "./sql3.y"
+ case 378:
+#line 1664 "./sql3.y"
{ (yyval.tree) = t_listst (2, INSERT_VALUES, sqlp_wrapper_sqlxml((ST**)t_list_to_array ((yyvsp[(3) - (4)].list)))); }
break;
- case 382:
-#line 1695 "./sql3.y"
+ case 380:
+#line 1669 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 383:
-#line 1697 "./sql3.y"
+ case 381:
+#line 1671 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 385:
-#line 1707 "./sql3.y"
+ case 383:
+#line 1681 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_ORDER, t_CONS (1, NULL)); }
break;
- case 386:
-#line 1708 "./sql3.y"
+ case 384:
+#line 1682 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_ANY_ORDER, t_CONS (1, NULL)); }
break;
- case 387:
-#line 1709 "./sql3.y"
+ case 385:
+#line 1683 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_SPARQL, t_CONS (1, NULL)); }
break;
- case 388:
-#line 1710 "./sql3.y"
+ case 386:
+#line 1684 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_SAME_AS, t_CONS (1, NULL)); }
break;
- case 389:
-#line 1711 "./sql3.y"
+ case 387:
+#line 1685 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_ARRAY, t_CONS (1, NULL)); }
break;
- case 390:
-#line 1712 "./sql3.y"
+ case 388:
+#line 1686 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_JOIN, t_CONS (OPT_HASH, NULL)); }
break;
- case 391:
-#line 1713 "./sql3.y"
+ case 389:
+#line 1687 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_JOIN, t_CONS (OPT_INTERSECT, NULL)); }
break;
- case 392:
-#line 1714 "./sql3.y"
+ case 390:
+#line 1688 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_JOIN, t_CONS (OPT_LOOP, NULL)); }
break;
- case 393:
-#line 1715 "./sql3.y"
+ case 391:
+#line 1689 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_SUBQ_LOOP, t_CONS (SUBQ_LOOP, NULL)); }
break;
- case 394:
-#line 1716 "./sql3.y"
+ case 392:
+#line 1690 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_SUBQ_LOOP, t_CONS (SUBQ_NO_LOOP, NULL)); }
break;
- case 395:
-#line 1717 "./sql3.y"
+ case 393:
+#line 1691 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INDEX, t_CONS ((yyvsp[(2) - (2)].box), NULL)); }
break;
- case 396:
-#line 1718 "./sql3.y"
+ case 394:
+#line 1692 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INDEX, t_CONS (t_box_string ("PRIMARY KEY"), NULL)); }
break;
- case 397:
-#line 1719 "./sql3.y"
+ case 395:
+#line 1693 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INDEX, t_CONS (t_box_string ("TEXT KEY"), NULL)); }
break;
- case 398:
-#line 1720 "./sql3.y"
+ case 396:
+#line 1694 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INDEX_ONLY, t_CONS (t_box_num (1), NULL)); }
break;
- case 399:
-#line 1721 "./sql3.y"
+ case 397:
+#line 1695 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_RDF_INFERENCE, t_CONS ((yyvsp[(2) - (2)].box), NULL)); }
break;
- case 400:
-#line 1722 "./sql3.y"
+ case 398:
+#line 1696 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_NO_CLUSTER, t_CONS (1, NULL)); }
break;
- case 401:
-#line 1723 "./sql3.y"
+ case 399:
+#line 1697 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INTO, t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
- case 402:
-#line 1724 "./sql3.y"
+ case 400:
+#line 1698 "./sql3.y"
{
if (!stricmp ((yyvsp[(1) - (2)].box), "vacuum"))
(yyval.list) = t_CONS (OPT_VACUUM, t_CONS ((yyvsp[(2) - (2)].box), NULL));
@@ -10424,88 +10403,88 @@ yyreduce:
}
break;
- case 403:
-#line 1735 "./sql3.y"
+ case 401:
+#line 1709 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
- case 404:
-#line 1736 "./sql3.y"
+ case 402:
+#line 1710 "./sql3.y"
{ (yyval.list) = NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
- case 405:
-#line 1740 "./sql3.y"
+ case 403:
+#line 1714 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 406:
-#line 1741 "./sql3.y"
+ case 404:
+#line 1715 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(3) - (4)].list)); }
break;
- case 407:
-#line 1745 "./sql3.y"
+ case 405:
+#line 1719 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 408:
-#line 1746 "./sql3.y"
+ case 406:
+#line 1720 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(4) - (5)].list)); }
break;
- case 409:
-#line 1750 "./sql3.y"
+ case 407:
+#line 1724 "./sql3.y"
{ (yyval.tree) = (ST *) EXCLUSIVE_OPT; }
break;
- case 410:
-#line 1751 "./sql3.y"
+ case 408:
+#line 1725 "./sql3.y"
{ (yyval.tree) = t_listst (2, PREFETCH_OPT, (yyvsp[(2) - (2)].box)); }
break;
- case 411:
-#line 1755 "./sql3.y"
+ case 409:
+#line 1729 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 412:
-#line 1757 "./sql3.y"
+ case 410:
+#line 1731 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 413:
-#line 1761 "./sql3.y"
+ case 411:
+#line 1735 "./sql3.y"
{ (yyval.box) = NULL; }
break;
- case 414:
-#line 1762 "./sql3.y"
+ case 412:
+#line 1736 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(2) - (3)].list)); }
break;
- case 415:
-#line 1767 "./sql3.y"
+ case 413:
+#line 1741 "./sql3.y"
{ (yyval.tree) = t_listst (4, OPEN_STMT, (yyvsp[(2) - (3)].box), (yyvsp[(3) - (3)].box), NULL); }
break;
- case 416:
-#line 1772 "./sql3.y"
+ case 414:
+#line 1746 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("__rollback"), t_list (0)); }
break;
- case 417:
-#line 1777 "./sql3.y"
+ case 415:
+#line 1751 "./sql3.y"
{ (yyval.box) = NULL; }
break;
- case 418:
-#line 1778 "./sql3.y"
+ case 416:
+#line 1752 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 419:
-#line 1784 "./sql3.y"
+ case 417:
+#line 1758 "./sql3.y"
{ char *tmp_cr = "temp_cr";
ST *qspec = t_listst (5,
SELECT_STMT,
@@ -10529,191 +10508,191 @@ yyreduce:
}
break;
- case 420:
-#line 1811 "./sql3.y"
+ case 418:
+#line 1785 "./sql3.y"
{ (yyval.list) = t_CONS (sqlp_col_num ((yyvsp[(1) - (1)].box)), NULL); }
break;
- case 421:
-#line 1812 "./sql3.y"
+ case 419:
+#line 1786 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS (sqlp_col_num ((yyvsp[(3) - (3)].box)), NULL)); }
break;
- case 422:
-#line 1816 "./sql3.y"
+ case 420:
+#line 1790 "./sql3.y"
{ (yyval.box) = t_listbox (1, sqlp_col_num ((yyvsp[(1) - (1)].box))); }
break;
- case 423:
-#line 1817 "./sql3.y"
+ case 421:
+#line 1791 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(2) - (3)].list)); }
break;
- case 424:
-#line 1822 "./sql3.y"
+ case 422:
+#line 1796 "./sql3.y"
{ global_trans->_.trans.min = (yyvsp[(3) - (4)].tree); }
break;
- case 425:
-#line 1823 "./sql3.y"
+ case 423:
+#line 1797 "./sql3.y"
{ global_trans->_.trans.max = (yyvsp[(3) - (4)].tree); }
break;
- case 426:
-#line 1824 "./sql3.y"
+ case 424:
+#line 1798 "./sql3.y"
{ global_trans->_.trans.distinct = 1; }
break;
- case 427:
-#line 1825 "./sql3.y"
+ case 425:
+#line 1799 "./sql3.y"
{ global_trans->_.trans.exists = 1; }
break;
- case 428:
-#line 1826 "./sql3.y"
+ case 426:
+#line 1800 "./sql3.y"
{ global_trans->_.trans.no_cycles = 1; }
break;
- case 429:
-#line 1827 "./sql3.y"
+ case 427:
+#line 1801 "./sql3.y"
{ global_trans->_.trans.cycles_only = 1; }
break;
- case 430:
-#line 1828 "./sql3.y"
+ case 428:
+#line 1802 "./sql3.y"
{ global_trans->_.trans.no_order = 1; }
break;
- case 431:
-#line 1829 "./sql3.y"
+ case 429:
+#line 1803 "./sql3.y"
{ global_trans->_.trans.shortest_only = 1; }
break;
- case 432:
-#line 1830 "./sql3.y"
+ case 430:
+#line 1804 "./sql3.y"
{ global_trans->_.trans.in = (ptrlong*) (yyvsp[(2) - (2)].box); }
break;
- case 433:
-#line 1831 "./sql3.y"
+ case 431:
+#line 1805 "./sql3.y"
{ global_trans->_.trans.out = (ptrlong*) (yyvsp[(2) - (2)].box); }
break;
- case 434:
-#line 1832 "./sql3.y"
+ case 432:
+#line 1806 "./sql3.y"
{ global_trans->_.trans.end_flag = (ptrlong)sqlp_col_num ((yyvsp[(2) - (2)].box)); }
break;
- case 435:
-#line 1833 "./sql3.y"
+ case 433:
+#line 1807 "./sql3.y"
{ global_trans->_.trans.final_as = (yyvsp[(2) - (2)].box); }
break;
- case 436:
-#line 1834 "./sql3.y"
+ case 434:
+#line 1808 "./sql3.y"
{ global_trans->_.trans.direction = unbox ((yyvsp[(2) - (2)].box)); }
break;
- case 439:
-#line 1844 "./sql3.y"
+ case 437:
+#line 1818 "./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 440:
-#line 1845 "./sql3.y"
+ case 438:
+#line 1819 "./sql3.y"
{ (yyval.tree) = global_trans; global_trans = NULL; }
break;
- case 441:
-#line 1850 "./sql3.y"
+ case 439:
+#line 1824 "./sql3.y"
{ (yyval.intval) = 0; }
break;
- case 442:
-#line 1851 "./sql3.y"
+ case 440:
+#line 1825 "./sql3.y"
{ (yyval.intval) = 0; }
break;
- case 443:
-#line 1852 "./sql3.y"
+ case 441:
+#line 1826 "./sql3.y"
{ (yyval.intval) = 1; }
break;
- case 444:
-#line 1863 "./sql3.y"
+ case 442:
+#line 1837 "./sql3.y"
{ (yyval.intval) = 0; }
break;
- case 445:
-#line 1864 "./sql3.y"
+ case 443:
+#line 1838 "./sql3.y"
{ (yyval.intval) = 1; }
break;
- case 446:
-#line 1869 "./sql3.y"
+ case 444:
+#line 1843 "./sql3.y"
{ (yyval.tree) = (ST*) (ptrlong) (yyvsp[(1) - (1)].intval); }
break;
- case 447:
-#line 1871 "./sql3.y"
+ case 445:
+#line 1845 "./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 448:
-#line 1873 "./sql3.y"
+ case 446:
+#line 1847 "./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 449:
-#line 1875 "./sql3.y"
+ case 447:
+#line 1849 "./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 450:
-#line 1877 "./sql3.y"
+ case 448:
+#line 1851 "./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 451:
-#line 1878 "./sql3.y"
+ case 449:
+#line 1852 "./sql3.y"
{ (yyval.tree) = t_listst (7, SELECT_TOP, NULL, NULL, NULL, NULL, NULL, (yyvsp[(1) - (1)].tree));}
break;
- case 452:
-#line 1880 "./sql3.y"
+ case 450:
+#line 1854 "./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 453:
-#line 1886 "./sql3.y"
+ case 451:
+#line 1860 "./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 454:
-#line 1893 "./sql3.y"
+ case 452:
+#line 1867 "./sql3.y"
{ (yyval.list) = NULL; }
break;
- case 455:
-#line 1894 "./sql3.y"
+ case 453:
+#line 1868 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
- case 456:
-#line 1896 "./sql3.y"
+ case 454:
+#line 1870 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
- case 457:
-#line 1900 "./sql3.y"
+ case 455:
+#line 1874 "./sql3.y"
{ (yyval.box) = t_listbox (2, (yyvsp[(1) - (3)].strval), sqlp_wrapper_sqlxml_assign((ST*)(yyvsp[(3) - (3)].tree))); }
break;
- case 458:
-#line 1905 "./sql3.y"
+ case 456:
+#line 1879 "./sql3.y"
{
ST **asg = (ST **) t_list_to_array ((yyvsp[(4) - (6)].list));
ST **cols = asg_col_list (asg);
@@ -10725,192 +10704,196 @@ yyreduce:
}
break;
- case 459:
-#line 1917 "./sql3.y"
+ case 457:
+#line 1891 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 460:
-#line 1918 "./sql3.y"
+ case 458:
+#line 1892 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 464:
-#line 1929 "./sql3.y"
+ case 462:
+#line 1903 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 466:
-#line 1936 "./sql3.y"
+ case 464:
+#line 1910 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 467:
-#line 1937 "./sql3.y"
+ case 465:
+#line 1911 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 469:
-#line 1943 "./sql3.y"
+ case 467:
+#line 1917 "./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 470:
-#line 1945 "./sql3.y"
+ case 468:
+#line 1919 "./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 471:
-#line 1947 "./sql3.y"
+ case 469:
+#line 1921 "./sql3.y"
{ (yyval.tree) = t_listst (4, INTERSECT_ST, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree), (yyvsp[(3) - (4)].tree)); }
break;
- case 472:
-#line 1949 "./sql3.y"
+ case 470:
+#line 1923 "./sql3.y"
{ (yyval.tree) = t_listst (4, INTERSECT_ALL_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
- case 473:
-#line 1951 "./sql3.y"
+ case 471:
+#line 1925 "./sql3.y"
{ (yyval.tree) = t_listst (4, EXCEPT_ST, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree), (yyvsp[(3) - (4)].tree)); }
break;
- case 474:
-#line 1953 "./sql3.y"
+ case 472:
+#line 1927 "./sql3.y"
{ (yyval.tree) = t_listst (4, EXCEPT_ALL_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
- case 478:
-#line 1963 "./sql3.y"
+ case 476:
+#line 1937 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 480:
-#line 1969 "./sql3.y"
+ case 478:
+#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 481:
-#line 1971 "./sql3.y"
+ case 479:
+#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 482:
-#line 1973 "./sql3.y"
+ case 480:
+#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 483:
-#line 1975 "./sql3.y"
+ case 481:
+#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 484:
-#line 1977 "./sql3.y"
+ case 482:
+#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 485:
-#line 1979 "./sql3.y"
+ case 483:
+#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 487:
-#line 1984 "./sql3.y"
+ case 485:
+#line 1958 "./sql3.y"
{ (yyval.tree) = sqlp_embedded_xpath ((yyvsp[(2) - (2)].box)); }
break;
- case 489:
-#line 1989 "./sql3.y"
+ case 487:
+#line 1963 "./sql3.y"
{ (yyval.tree) = sqlp_inline_order_by ((yyvsp[(2) - (4)].tree), (ST **) (yyvsp[(4) - (4)].box)); }
break;
- case 490:
-#line 1990 "./sql3.y"
+ case 488:
+#line 1964 "./sql3.y"
{ (yyval.tree) = sqlp_embedded_xpath ((yyvsp[(2) - (2)].box)); }
break;
- case 491:
-#line 1994 "./sql3.y"
+ case 489:
+#line 1968 "./sql3.y"
{ (yyval.tree) = sqlp_inline_order_by ((yyvsp[(3) - (5)].tree), (ST **) (yyvsp[(5) - (5)].box)); }
break;
- case 492:
-#line 1998 "./sql3.y"
+ case 490:
+#line 1972 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
- case 493:
-#line 1999 "./sql3.y"
+ case 491:
+#line 1973 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
- case 494:
-#line 2003 "./sql3.y"
+ case 492:
+#line 1977 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 495:
-#line 2005 "./sql3.y"
+ case 493:
+#line 1979 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(4) - (5)].list)); }
break;
- case 496:
-#line 2010 "./sql3.y"
+ case 494:
+#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)); }
break;
- case 497:
-#line 2018 "./sql3.y"
- { (yyval.tree) = t_listst (5, SELECT_STMT, (yyvsp[(2) - (4)].tree),
+ case 495:
+#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),
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 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);
+ case 496:
+#line 2004 "./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 499:
-#line 2034 "./sql3.y"
+ case 497:
+#line 2020 "./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 500:
-#line 2035 "./sql3.y"
+ case 498:
+#line 2021 "./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 501:
-#line 2041 "./sql3.y"
+ case 499:
+#line 2027 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].list), NULL);}
break;
- case 502:
-#line 2042 "./sql3.y"
+ case 500:
+#line 2028 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].list), NULL)); }
break;
- case 503:
-#line 2046 "./sql3.y"
+ case 501:
+#line 2032 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
- case 504:
-#line 2047 "./sql3.y"
+ case 502:
+#line 2033 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array (t_CONS (t_list (1, SELECT_BREAKUP), (yyvsp[(2) - (2)].list))); }
break;
- case 505:
-#line 2052 "./sql3.y"
+ case 503:
+#line 2038 "./sql3.y"
{
ST ** group_by = 0;
if ((yyvsp[(3) - (4)].tree))
@@ -10920,8 +10903,13 @@ yyreduce:
}
break;
+ case 504:
+#line 2048 "./sql3.y"
+ { (yyval.tree) = NULL; }
+ break;
+
case 506:
-#line 2064 "./sql3.y"
+#line 2055 "./sql3.y"
{
ST ** group_by = 0;
if ((yyvsp[(3) - (7)].tree))
@@ -10932,161 +10920,161 @@ yyreduce:
break;
case 507:
-#line 2074 "./sql3.y"
+#line 2065 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (2)].list)); }
break;
case 508:
-#line 2078 "./sql3.y"
+#line 2069 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 509:
-#line 2080 "./sql3.y"
+#line 2071 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 510:
-#line 2085 "./sql3.y"
+#line 2076 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 511:
-#line 2086 "./sql3.y"
+#line 2077 "./sql3.y"
{ (yyval.list) =t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 512:
-#line 2092 "./sql3.y"
+#line 2083 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 513:
-#line 2097 "./sql3.y"
+#line 2088 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (0); }
break;
case 514:
-#line 2098 "./sql3.y"
+#line 2089 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 515:
-#line 2103 "./sql3.y"
+#line 2094 "./sql3.y"
{ (yyval.box) = t_listbox (3, TABLE_REF,(yyvsp[(1) - (1)].strval), (caddr_t) NULL); }
break;
case 516:
-#line 2105 "./sql3.y"
+#line 2096 "./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 2109 "./sql3.y"
+#line 2100 "./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 2113 "./sql3.y"
+#line 2104 "./sql3.y"
{ (yyval.box) = t_listbox (3, TABLE_REF,(yyvsp[(1) - (1)].tree), (caddr_t) NULL); }
break;
case 519:
-#line 2115 "./sql3.y"
+#line 2106 "./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 2121 "./sql3.y"
+#line 2112 "./sql3.y"
{ (yyval.box) = t_listbox (3, TABLE_REF,(yyvsp[(1) - (1)].strval), (caddr_t) NULL); }
break;
case 521:
-#line 2123 "./sql3.y"
+#line 2114 "./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 2127 "./sql3.y"
+#line 2118 "./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 2130 "./sql3.y"
+#line 2121 "./sql3.y"
{ (yyval.box) = (caddr_t) (yyvsp[(2) - (3)].tree); }
break;
case 524:
-#line 2134 "./sql3.y"
+#line 2125 "./sql3.y"
{ (yyval.subtok) = J_INNER; }
break;
case 525:
-#line 2135 "./sql3.y"
+#line 2126 "./sql3.y"
{ (yyval.subtok) = OJ_LEFT; }
break;
case 526:
-#line 2136 "./sql3.y"
+#line 2127 "./sql3.y"
{ (yyval.subtok) = OJ_RIGHT; }
break;
case 527:
-#line 2138 "./sql3.y"
+#line 2129 "./sql3.y"
{ (yyval.subtok) = OJ_FULL; }
break;
case 528:
-#line 2139 "./sql3.y"
+#line 2130 "./sql3.y"
{ (yyval.subtok) = J_INNER; }
break;
case 529:
-#line 2140 "./sql3.y"
+#line 2131 "./sql3.y"
{ (yyval.subtok) = J_CROSS; }
break;
case 532:
-#line 2150 "./sql3.y"
+#line 2141 "./sql3.y"
{ (yyval.join).type = (yyvsp[(2) - (2)].subtok);
(yyval.join).natural = 1;
}
break;
case 533:
-#line 2154 "./sql3.y"
+#line 2145 "./sql3.y"
{ (yyval.join).type = (yyvsp[(1) - (1)].subtok);
(yyval.join).natural = 0;
}
break;
case 534:
-#line 2160 "./sql3.y"
+#line 2151 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 535:
-#line 2161 "./sql3.y"
+#line 2152 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 536:
-#line 2162 "./sql3.y"
+#line 2153 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 537:
-#line 2167 "./sql3.y"
+#line 2158 "./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));
@@ -11094,39 +11082,39 @@ yyreduce:
break;
case 538:
-#line 2174 "./sql3.y"
+#line 2165 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 539:
-#line 2175 "./sql3.y"
+#line 2166 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 540:
-#line 2177 "./sql3.y"
+#line 2168 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, JC_USING, t_list_to_array ((yyvsp[(3) - (4)].list))); }
break;
case 541:
-#line 2181 "./sql3.y"
+#line 2172 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 542:
-#line 2185 "./sql3.y"
+#line 2176 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 543:
-#line 2187 "./sql3.y"
+#line 2178 "./sql3.y"
{
(yyval.tree) = (ST*) t_list_to_array(t_CONS (t_list_to_array ((yyvsp[(3) - (3)].list)), NULL));
}
break;
case 544:
-#line 2191 "./sql3.y"
+#line 2182 "./sql3.y"
{
dk_set_t group_by_full = 0;
dk_set_t first_group_by_key = (dk_set_t)(yyvsp[(5) - (6)].list);
@@ -11141,7 +11129,7 @@ yyreduce:
break;
case 545:
-#line 2203 "./sql3.y"
+#line 2194 "./sql3.y"
{
ST ** etalon = (ST**) t_list_to_array ((yyvsp[(5) - (6)].list));
dk_set_t group_by_full = 0;
@@ -11168,57 +11156,57 @@ yyreduce:
break;
case 546:
-#line 2237 "./sql3.y"
+#line 2228 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 547:
-#line 2238 "./sql3.y"
+#line 2229 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 548:
-#line 2242 "./sql3.y"
+#line 2233 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
case 549:
-#line 2243 "./sql3.y"
+#line 2234 "./sql3.y"
{ (yyval.subtok) = PL_EXCLUSIVE; }
break;
case 550:
-#line 2244 "./sql3.y"
+#line 2235 "./sql3.y"
{ (yyval.subtok) = sqlp_xml_select_flags ((yyvsp[(3) - (3)].box), NULL); }
break;
case 551:
-#line 2245 "./sql3.y"
+#line 2236 "./sql3.y"
{ (yyval.subtok) = sqlp_xml_select_flags ((yyvsp[(3) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
case 552:
-#line 2252 "./sql3.y"
+#line 2243 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_OR, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 553:
-#line 2254 "./sql3.y"
+#line 2245 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_AND, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 554:
-#line 2256 "./sql3.y"
+#line 2247 "./sql3.y"
{ UN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree)) }
break;
case 555:
-#line 2257 "./sql3.y"
+#line 2248 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 565:
-#line 2274 "./sql3.y"
+#line 2265 "./sql3.y"
{
ST *eq_op;
BIN_OP (eq_op, BOP_EQ, (ST *) t_box_num_and_zero (0), (yyvsp[(1) - (1)].tree));
@@ -11227,7 +11215,7 @@ yyreduce:
break;
case 566:
-#line 2283 "./sql3.y"
+#line 2274 "./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)
{
@@ -11239,7 +11227,7 @@ yyreduce:
break;
case 567:
-#line 2306 "./sql3.y"
+#line 2297 "./sql3.y"
{ ST *copy = (ST *) t_box_copy_tree ((caddr_t) (yyvsp[(1) - (6)].tree));
ST *low_test;
ST *high_test;
@@ -11250,7 +11238,7 @@ yyreduce:
break;
case 568:
-#line 2314 "./sql3.y"
+#line 2305 "./sql3.y"
{ ST *copy = (ST *) t_box_copy_tree ((caddr_t) (yyvsp[(1) - (5)].tree));
ST *low_test;
ST *high_test;
@@ -11261,7 +11249,7 @@ yyreduce:
break;
case 569:
-#line 2325 "./sql3.y"
+#line 2316 "./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);
@@ -11270,7 +11258,7 @@ yyreduce:
break;
case 570:
-#line 2331 "./sql3.y"
+#line 2322 "./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);
@@ -11278,12 +11266,12 @@ yyreduce:
break;
case 571:
-#line 2338 "./sql3.y"
+#line 2329 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 572:
-#line 2340 "./sql3.y"
+#line 2331 "./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");
@@ -11292,7 +11280,7 @@ yyreduce:
break;
case 573:
-#line 2346 "./sql3.y"
+#line 2337 "./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");
@@ -11301,7 +11289,7 @@ yyreduce:
break;
case 574:
-#line 2355 "./sql3.y"
+#line 2346 "./sql3.y"
{ ST *tmp;
BIN_OP (tmp, BOP_NULL, (yyvsp[(1) - (4)].tree), NULL);
NEGATE ((yyval.tree), tmp);
@@ -11309,12 +11297,12 @@ yyreduce:
break;
case 575:
-#line 2359 "./sql3.y"
+#line 2350 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_NULL, (yyvsp[(1) - (3)].tree), NULL); }
break;
case 576:
-#line 2364 "./sql3.y"
+#line 2355 "./sql3.y"
{
ST *in = NULL;
in = SUBQ_PRED (SOME_PRED, (yyvsp[(1) - (4)].tree), sqlp_wpar_nonselect ((yyvsp[(4) - (4)].tree)), BOP_EQ, NULL);
@@ -11323,45 +11311,45 @@ yyreduce:
break;
case 577:
-#line 2370 "./sql3.y"
+#line 2361 "./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 2373 "./sql3.y"
+#line 2364 "./sql3.y"
{ (yyval.tree) = sqlp_in_exp ((yyvsp[(1) - (6)].tree), (yyvsp[(5) - (6)].list), 1);
}
break;
case 579:
-#line 2376 "./sql3.y"
+#line 2367 "./sql3.y"
{ (yyval.tree) = sqlp_in_exp ((yyvsp[(1) - (5)].tree), (yyvsp[(4) - (5)].list), 0);
}
break;
case 580:
-#line 2389 "./sql3.y"
+#line 2380 "./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 2393 "./sql3.y"
+#line 2384 "./sql3.y"
{ (yyval.intval) = SOME_PRED; }
break;
case 582:
-#line 2394 "./sql3.y"
+#line 2385 "./sql3.y"
{ (yyval.intval) = ALL_PRED; }
break;
case 583:
-#line 2395 "./sql3.y"
+#line 2386 "./sql3.y"
{ (yyval.intval) = SOME_PRED; }
break;
case 584:
-#line 2400 "./sql3.y"
+#line 2391 "./sql3.y"
{
/* exists (select * ..) becomes exists (select 1 ...) */
ST * ext_subq = (yyvsp[(2) - (2)].tree);
@@ -11371,92 +11359,92 @@ yyreduce:
break;
case 585:
-#line 2409 "./sql3.y"
+#line 2400 "./sql3.y"
{ (yyval.tree) = (ST *) t_list (2, SCALAR_SUBQ, sqlp_add_top_1 ((yyvsp[(1) - (1)].tree))); }
break;
case 586:
-#line 2420 "./sql3.y"
+#line 2405 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 587:
-#line 2421 "./sql3.y"
+#line 2406 "./sql3.y"
{ (yyval.tree) = (yyvsp[(3) - (4)].tree); }
break;
case 588:
-#line 2426 "./sql3.y"
+#line 2411 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_MINUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 589:
-#line 2427 "./sql3.y"
+#line 2412 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_PLUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 590:
-#line 2428 "./sql3.y"
+#line 2413 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_TIMES, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 591:
-#line 2429 "./sql3.y"
+#line 2414 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_DIV, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 592:
-#line 2430 "./sql3.y"
+#line 2415 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 593:
-#line 2431 "./sql3.y"
+#line 2416 "./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 2435 "./sql3.y"
+#line 2420 "./sql3.y"
{ (yyval.tree) = (sql_tree_t *) (yyvsp[(1) - (1)].tree); }
break;
case 599:
-#line 2441 "./sql3.y"
+#line 2426 "./sql3.y"
{ (yyval.tree) = (sql_tree_t *) (yyvsp[(1) - (1)].box); }
break;
case 602:
-#line 2458 "./sql3.y"
+#line 2429 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 603:
-#line 2460 "./sql3.y"
+#line 2431 "./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 2478 "./sql3.y"
+#line 2449 "./sql3.y"
{ (yyval.tree) = (sql_tree_t *) (yyvsp[(1) - (1)].box); }
break;
case 619:
-#line 2495 "./sql3.y"
+#line 2452 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 620:
-#line 2497 "./sql3.y"
+#line 2454 "./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 2516 "./sql3.y"
+#line 2473 "./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)),
@@ -11465,17 +11453,17 @@ yyreduce:
break;
case 634:
-#line 2524 "./sql3.y"
+#line 2481 "./sql3.y"
{ (yyval.strval) = NULL; }
break;
case 635:
-#line 2525 "./sql3.y"
+#line 2482 "./sql3.y"
{ (yyval.strval) = (yyvsp[(2) - (2)].strval); }
break;
case 636:
-#line 2530 "./sql3.y"
+#line 2487 "./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) ) );
@@ -11483,169 +11471,169 @@ yyreduce:
break;
case 637:
-#line 2543 "./sql3.y"
+#line 2500 "./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 2545 "./sql3.y"
+#line 2502 "./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 2547 "./sql3.y"
+#line 2504 "./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 2552 "./sql3.y"
+#line 2509 "./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 2554 "./sql3.y"
+#line 2511 "./sql3.y"
{ (yyval.tree) = t_listst (5, BOP_AS, (yyvsp[(1) - (3)].tree), NULL, (yyvsp[(3) - (3)].box), NULL); }
break;
case 642:
-#line 2556 "./sql3.y"
+#line 2513 "./sql3.y"
{ (yyval.tree) = t_listst (5, BOP_AS, (yyvsp[(1) - (2)].tree), NULL, (yyvsp[(2) - (2)].box), NULL); }
break;
case 643:
-#line 2558 "./sql3.y"
+#line 2515 "./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 2560 "./sql3.y"
+#line 2517 "./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 2562 "./sql3.y"
+#line 2519 "./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 2567 "./sql3.y"
+#line 2524 "./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 2574 "./sql3.y"
+#line 2531 "./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 2579 "./sql3.y"
+#line 2536 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 651:
-#line 2587 "./sql3.y"
+#line 2544 "./sql3.y"
{ (yyval.box) = sqlp_proc_name (NULL, 0, NULL, 0, NULL, (yyvsp[(1) - (1)].box)); }
break;
case 652:
-#line 2588 "./sql3.y"
+#line 2545 "./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 2589 "./sql3.y"
+#line 2546 "./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 2590 "./sql3.y"
+#line 2547 "./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 2591 "./sql3.y"
+#line 2548 "./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 2592 "./sql3.y"
+#line 2549 "./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 2593 "./sql3.y"
+#line 2550 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("left"); }
break;
case 658:
-#line 2594 "./sql3.y"
+#line 2551 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("right"); }
break;
case 659:
-#line 2595 "./sql3.y"
+#line 2552 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("log"); }
break;
case 660:
-#line 2600 "./sql3.y"
+#line 2557 "./sql3.y"
{ (yyval.list) = t_CONS (t_list (3, KWD_PARAM, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].tree)), NULL);}
break;
case 661:
-#line 2601 "./sql3.y"
+#line 2558 "./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 2606 "./sql3.y"
+#line 2563 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 663:
-#line 2607 "./sql3.y"
+#line 2564 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 664:
-#line 2608 "./sql3.y"
+#line 2565 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL));}
break;
case 665:
-#line 2612 "./sql3.y"
+#line 2569 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 666:
-#line 2613 "./sql3.y"
+#line 2570 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 667:
-#line 2614 "./sql3.y"
+#line 2571 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 668:
-#line 2615 "./sql3.y"
+#line 2572 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 669:
-#line 2617 "./sql3.y"
+#line 2574 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 670:
-#line 2618 "./sql3.y"
+#line 2575 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 671:
-#line 2623 "./sql3.y"
+#line 2580 "./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);
@@ -11660,7 +11648,7 @@ yyreduce:
break;
case 672:
-#line 2635 "./sql3.y"
+#line 2592 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ((yyvsp[(1) - (8)].subtok) == SQL_FN_TIMESTAMPADD ? "timestampadd" : "timestampdiff"),
@@ -11669,7 +11657,7 @@ yyreduce:
break;
case 673:
-#line 2641 "./sql3.y"
+#line 2598 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("__extract"),
@@ -11678,27 +11666,27 @@ yyreduce:
break;
case 674:
-#line 2647 "./sql3.y"
+#line 2604 "./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 2649 "./sql3.y"
+#line 2606 "./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 2651 "./sql3.y"
+#line 2608 "./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 2653 "./sql3.y"
+#line 2610 "./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 2655 "./sql3.y"
+#line 2612 "./sql3.y"
{
if (stricmp ((yyvsp[(2) - (8)].box), "POSITION"))
yyerror ("syntax error");
@@ -11708,29 +11696,29 @@ yyreduce:
break;
case 679:
-#line 2662 "./sql3.y"
+#line 2619 "./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 2664 "./sql3.y"
+#line 2621 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, (yyvsp[(2) - (3)].box), t_list_to_array (NULL)); }
break;
case 681:
-#line 2666 "./sql3.y"
+#line 2623 "./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 2669 "./sql3.y"
+#line 2626 "./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 2672 "./sql3.y"
+#line 2629 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ((yyvsp[(2) - (10)].subtok) == SQL_FN_TIMESTAMPADD ? "timestampadd" : "timestampdiff"),
@@ -11739,7 +11727,7 @@ yyreduce:
break;
case 684:
-#line 2678 "./sql3.y"
+#line 2635 "./sql3.y"
{
caddr_t data_type = sqlc_convert_odbc_to_sql_type ((yyvsp[(6) - (8)].box));
if (!data_type)
@@ -11751,7 +11739,7 @@ yyreduce:
break;
case 685:
-#line 2687 "./sql3.y"
+#line 2644 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("__extract"),
@@ -11760,48 +11748,48 @@ yyreduce:
break;
case 686:
-#line 2693 "./sql3.y"
+#line 2650 "./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 2696 "./sql3.y"
+#line 2653 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curdate"), t_list (0));
}
break;
case 688:
-#line 2700 "./sql3.y"
+#line 2657 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curtime"), t_list (0));
}
break;
case 689:
-#line 2704 "./sql3.y"
+#line 2661 "./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 2708 "./sql3.y"
+#line 2665 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curdatetime"), t_list (0));
}
break;
case 691:
-#line 2712 "./sql3.y"
+#line 2669 "./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 2716 "./sql3.y"
+#line 2673 "./sql3.y"
{
caddr_t bit = t_box_num (0);
caddr_t bit_index = t_box_num (0);
@@ -11810,17 +11798,17 @@ yyreduce:
break;
case 693:
-#line 2726 "./sql3.y"
+#line 2683 "./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 2728 "./sql3.y"
+#line 2685 "./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 2748 "./sql3.y"
+#line 2705 "./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)));
@@ -11828,127 +11816,127 @@ yyreduce:
break;
case 696:
-#line 2753 "./sql3.y"
+#line 2710 "./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 2758 "./sql3.y"
+#line 2715 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 698:
-#line 2759 "./sql3.y"
+#line 2716 "./sql3.y"
{ t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 699:
-#line 2763 "./sql3.y"
+#line 2720 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 700:
-#line 2764 "./sql3.y"
+#line 2721 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 701:
-#line 2765 "./sql3.y"
+#line 2722 "./sql3.y"
{ t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 702:
-#line 2766 "./sql3.y"
+#line 2723 "./sql3.y"
{ t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 705:
-#line 2772 "./sql3.y"
+#line 2729 "./sql3.y"
{ (yyval.box) = t_listbox (3, CALL_STMT,
t_sqlp_box_id_upcase ("get_user"), t_list (0)); }
break;
case 707:
-#line 2778 "./sql3.y"
+#line 2735 "./sql3.y"
{ (yyval.box) = (caddr_t) (yyvsp[(1) - (1)].tree); }
break;
case 708:
-#line 2783 "./sql3.y"
+#line 2740 "./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 2789 "./sql3.y"
+#line 2746 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, SEARCHED_CASE, t_list_to_array ((yyvsp[(2) - (3)].list))); }
break;
case 710:
-#line 2793 "./sql3.y"
+#line 2750 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 711:
-#line 2794 "./sql3.y"
+#line 2751 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 712:
-#line 2798 "./sql3.y"
+#line 2755 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 713:
-#line 2799 "./sql3.y"
+#line 2756 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 714:
-#line 2804 "./sql3.y"
+#line 2761 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(2) - (4)].tree), t_CONS ((yyvsp[(4) - (4)].tree), NULL)); }
break;
case 715:
-#line 2806 "./sql3.y"
+#line 2763 "./sql3.y"
{ (yyval.list) = t_CONS ( t_list (2, QUOTE, NULL), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 716:
-#line 2811 "./sql3.y"
+#line 2768 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(2) - (4)].tree), t_CONS ((yyvsp[(4) - (4)].tree), NULL)); }
break;
case 717:
-#line 2813 "./sql3.y"
+#line 2770 "./sql3.y"
{ (yyval.list) = t_CONS ( t_list (2, QUOTE, NULL), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 718:
-#line 2818 "./sql3.y"
+#line 2775 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, COALESCE_EXP, t_list_to_array ((yyvsp[(3) - (4)].list))); }
break;
case 719:
-#line 2823 "./sql3.y"
+#line 2780 "./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 2831 "./sql3.y"
+#line 2788 "./sql3.y"
{ (yyval.box) = t_listbox (3, PARAM_WITH_IND, (yyvsp[(1) - (2)].box), (yyvsp[(2) - (2)].box)); }
break;
case 722:
-#line 2833 "./sql3.y"
+#line 2790 "./sql3.y"
{ (yyval.box) = t_listbox (3, PARAM_WITH_IND, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].box)); }
break;
case 723:
-#line 2838 "./sql3.y"
+#line 2795 "./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);
@@ -11956,57 +11944,57 @@ yyreduce:
break;
case 724:
-#line 2843 "./sql3.y"
+#line 2800 "./sql3.y"
{ FN_REF ((yyval.tree), (yyvsp[(1) - (5)].subtok), 1, (yyvsp[(4) - (5)].tree)) }
break;
case 725:
-#line 2844 "./sql3.y"
+#line 2801 "./sql3.y"
{ FN_REF ((yyval.tree), (yyvsp[(1) - (5)].subtok), 0, (yyvsp[(4) - (5)].tree)) }
break;
case 726:
-#line 2845 "./sql3.y"
+#line 2802 "./sql3.y"
{ FN_REF ((yyval.tree), (yyvsp[(1) - (4)].subtok), 0, (yyvsp[(3) - (4)].tree)) }
break;
case 734:
-#line 2856 "./sql3.y"
+#line 2813 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
case 735:
-#line 2857 "./sql3.y"
+#line 2814 "./sql3.y"
{ (yyval.box) = ((caddr_t *)(yyvsp[(3) - (3)].tree))[0]; }
break;
case 736:
-#line 2858 "./sql3.y"
+#line 2815 "./sql3.y"
{ (yyval.box) = (caddr_t) DV_XML_ENTITY; }
break;
case 737:
-#line 2859 "./sql3.y"
+#line 2816 "./sql3.y"
{ (yyval.box) = (caddr_t) DV_RDF; }
break;
case 738:
-#line 2860 "./sql3.y"
+#line 2817 "./sql3.y"
{ (yyval.box) = (caddr_t) DV_ARRAY_OF_POINTER; }
break;
case 743:
-#line 2868 "./sql3.y"
+#line 2825 "./sql3.y"
{ (yyval.box) = t_box_num_and_zero (-1 * unbox ((yyvsp[(2) - (2)].box))); }
break;
case 744:
-#line 2869 "./sql3.y"
+#line 2826 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 746:
-#line 2872 "./sql3.y"
+#line 2829 "./sql3.y"
{
switch (DV_TYPE_OF ((yyvsp[(2) - (2)].box)))
{
@@ -12023,343 +12011,343 @@ yyreduce:
break;
case 747:
-#line 2885 "./sql3.y"
+#line 2842 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 749:
-#line 2887 "./sql3.y"
+#line 2844 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
case 750:
-#line 2899 "./sql3.y"
+#line 2850 "./sql3.y"
{ (yyval.strval) = sqlp_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box), 1); }
break;
case 751:
-#line 2900 "./sql3.y"
+#line 2851 "./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 2901 "./sql3.y"
+#line 2852 "./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 2902 "./sql3.y"
+#line 2853 "./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 2906 "./sql3.y"
+#line 2857 "./sql3.y"
{ (yyval.strval) = sqlp_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box), 0); }
break;
case 755:
-#line 2907 "./sql3.y"
+#line 2858 "./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 2908 "./sql3.y"
+#line 2859 "./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 2909 "./sql3.y"
+#line 2860 "./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 2913 "./sql3.y"
+#line 2864 "./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 2914 "./sql3.y"
+#line 2865 "./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 2915 "./sql3.y"
+#line 2866 "./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 2916 "./sql3.y"
+#line 2867 "./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 2920 "./sql3.y"
+#line 2871 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box)); }
break;
case 763:
-#line 2921 "./sql3.y"
+#line 2872 "./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 2922 "./sql3.y"
+#line 2873 "./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 2923 "./sql3.y"
+#line 2874 "./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 2928 "./sql3.y"
+#line 2879 "./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 2930 "./sql3.y"
+#line 2881 "./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 2934 "./sql3.y"
+#line 2885 "./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 2942 "./sql3.y"
+#line 2893 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, NULL, (yyvsp[(1) - (1)].box));
}
break;
case 770:
-#line 2945 "./sql3.y"
+#line 2896 "./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 2948 "./sql3.y"
+#line 2899 "./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 2951 "./sql3.y"
+#line 2902 "./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 2954 "./sql3.y"
+#line 2905 "./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 2957 "./sql3.y"
+#line 2908 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, (long) 0, STAR);
}
break;
case 775:
-#line 2960 "./sql3.y"
+#line 2911 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref (NULL, 0, NULL, 0, (yyvsp[(1) - (3)].box)), STAR);
}
break;
case 776:
-#line 2963 "./sql3.y"
+#line 2914 "./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 2966 "./sql3.y"
+#line 2917 "./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 2969 "./sql3.y"
+#line 2920 "./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 2976 "./sql3.y"
+#line 2927 "./sql3.y"
{ (yyval.tree) = sqlp_numeric (0, 0);
}
break;
case 780:
-#line 2979 "./sql3.y"
+#line 2930 "./sql3.y"
{ (yyval.tree) = sqlp_numeric ((yyvsp[(3) - (4)].box), 0);
}
break;
case 781:
-#line 2982 "./sql3.y"
+#line 2933 "./sql3.y"
{ (yyval.tree) = sqlp_numeric ((yyvsp[(3) - (6)].box), (yyvsp[(5) - (6)].box));
}
break;
case 782:
-#line 2985 "./sql3.y"
+#line 2936 "./sql3.y"
{ (yyval.tree) = sqlp_numeric (0, 0);
}
break;
case 783:
-#line 2988 "./sql3.y"
+#line 2939 "./sql3.y"
{ (yyval.tree) = sqlp_numeric ((yyvsp[(3) - (4)].box), 0);
}
break;
case 784:
-#line 2991 "./sql3.y"
+#line 2942 "./sql3.y"
{ (yyval.tree) = sqlp_numeric ((yyvsp[(3) - (6)].box), (yyvsp[(5) - (6)].box));
}
break;
case 785:
-#line 2994 "./sql3.y"
+#line 2945 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_INT, (long) 0);
}
break;
case 786:
-#line 2997 "./sql3.y"
+#line 2948 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_SHORT_INT, (long) 0);
}
break;
case 787:
-#line 3000 "./sql3.y"
+#line 2951 "./sql3.y"
{ (yyval.tree) = t_listst (3, (ptrlong) DV_INT64, t_box_num (19), t_box_num (0));
}
break;
case 788:
-#line 3003 "./sql3.y"
+#line 2954 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DOUBLE_FLOAT, (long) 0);
}
break;
case 789:
-#line 3006 "./sql3.y"
+#line 2957 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DOUBLE_FLOAT, (long) 0);
}
break;
case 790:
-#line 3009 "./sql3.y"
+#line 2960 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_SINGLE_FLOAT, (long) 0);
}
break;
case 791:
-#line 3012 "./sql3.y"
+#line 2963 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DOUBLE_FLOAT, (long) 0);
}
break;
case 792:
-#line 3015 "./sql3.y"
+#line 2966 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BLOB, t_box_num (0x7fffffff));
}
break;
case 793:
-#line 3018 "./sql3.y"
+#line 2969 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BLOB_BIN, t_box_num (0x7fffffff));
}
break;
case 794:
-#line 3021 "./sql3.y"
+#line 2972 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BIN, (long) 0);
}
break;
case 795:
-#line 3024 "./sql3.y"
+#line 2975 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BIN, (yyvsp[(3) - (4)].box));
}
break;
case 796:
-#line 3027 "./sql3.y"
+#line 2978 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BIN, (yyvsp[(3) - (4)].box));
}
break;
case 797:
-#line 3030 "./sql3.y"
+#line 2981 "./sql3.y"
{ (yyval.tree) = t_listst (3, (long) DV_TIMESTAMP, (long) 10, (long) 6);
}
break;
case 798:
-#line 3033 "./sql3.y"
+#line 2984 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DATETIME, (long) 19);
}
break;
case 799:
-#line 3036 "./sql3.y"
+#line 2987 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_TIME, (long) 8);
}
break;
case 800:
-#line 3039 "./sql3.y"
+#line 2990 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DATE, (long) 10);
}
break;
case 801:
-#line 3042 "./sql3.y"
+#line 2993 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_WIDE, (long) 1);
}
break;
case 802:
-#line 3045 "./sql3.y"
+#line 2996 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_WIDE, (yyvsp[(3) - (4)].box));
}
break;
case 803:
-#line 3048 "./sql3.y"
+#line 2999 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_WIDE, (long) 0);
}
break;
case 804:
-#line 3051 "./sql3.y"
+#line 3002 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_WIDE, (yyvsp[(3) - (4)].box));
}
break;
case 805:
-#line 3054 "./sql3.y"
+#line 3005 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BLOB_WIDE, t_box_num (0x7fffffff));
}
break;
case 806:
-#line 3057 "./sql3.y"
+#line 3008 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_ANY, (long) 0); }
break;
case 807:
-#line 3059 "./sql3.y"
+#line 3010 "./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);
@@ -12367,100 +12355,100 @@ yyreduce:
break;
case 808:
-#line 3064 "./sql3.y"
+#line 3015 "./sql3.y"
{ (yyval.tree) = t_listst (2, (ptrlong) DV_IRI_ID, (yyvsp[(3) - (4)].box));
}
break;
case 809:
-#line 3067 "./sql3.y"
+#line 3018 "./sql3.y"
{ (yyval.tree) = t_listst (2, (ptrlong) DV_IRI_ID, (ptrlong)12); /* #i+10digits */
}
break;
case 810:
-#line 3070 "./sql3.y"
+#line 3021 "./sql3.y"
{ (yyval.tree) = t_listst (2, (ptrlong) DV_IRI_ID_8, (ptrlong)22); /* #i+20digits */
}
break;
case 812:
-#line 3077 "./sql3.y"
+#line 3028 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (long) 1);
}
break;
case 813:
-#line 3080 "./sql3.y"
+#line 3031 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (long) 0);
}
break;
case 814:
-#line 3083 "./sql3.y"
+#line 3034 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (yyvsp[(3) - (4)].box));
}
break;
case 815:
-#line 3086 "./sql3.y"
+#line 3037 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (yyvsp[(3) - (4)].box));
}
break;
case 816:
-#line 3091 "./sql3.y"
+#line 3042 "./sql3.y"
{ (yyval.box) = t_box_num (0x7fffffff); }
break;
case 817:
-#line 3092 "./sql3.y"
+#line 3043 "./sql3.y"
{ (yyval.box) = (yyvsp[(3) - (4)].box); }
break;
case 818:
-#line 3097 "./sql3.y"
+#line 3048 "./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 3100 "./sql3.y"
+#line 3051 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 820:
-#line 3101 "./sql3.y"
+#line 3052 "./sql3.y"
{ (yyval.tree) = t_listst (4, (long) DV_OBJECT, 0, 0, (yyvsp[(1) - (1)].strval)); }
break;
case 822:
-#line 3107 "./sql3.y"
+#line 3058 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (long) 1);
}
break;
case 823:
-#line 3110 "./sql3.y"
+#line 3061 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (long) 0);
}
break;
case 824:
-#line 3113 "./sql3.y"
+#line 3064 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (yyvsp[(3) - (4)].box));
}
break;
case 825:
-#line 3116 "./sql3.y"
+#line 3067 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (yyvsp[(3) - (4)].box));
}
break;
case 826:
-#line 3119 "./sql3.y"
+#line 3070 "./sql3.y"
{
if (!CASEMODESTRCMP ((yyvsp[(1) - (1)].strval), xmltype_class_name))
{
@@ -12473,7 +12461,7 @@ yyreduce:
break;
case 827:
-#line 3129 "./sql3.y"
+#line 3080 "./sql3.y"
{
if (!CASEMODESTRCMP ((yyvsp[(2) - (2)].strval), xmltype_class_name))
{
@@ -12486,21 +12474,21 @@ yyreduce:
break;
case 828:
-#line 3139 "./sql3.y"
+#line 3090 "./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 3143 "./sql3.y"
+#line 3094 "./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 3150 "./sql3.y"
+#line 3101 "./sql3.y"
{
if (strchr ((yyvsp[(1) - (1)].box), '.'))
yy_new_error ("Dots not allowed inside column names", "37000", "SQ137");
@@ -12510,7 +12498,7 @@ yyreduce:
break;
case 831:
-#line 3158 "./sql3.y"
+#line 3109 "./sql3.y"
{
assert_ms_compat("Qualified column names are allowed only in MS-compatibility mode.");
(yyval.strval) = (yyvsp[(7) - (7)].box);
@@ -12518,97 +12506,97 @@ yyreduce:
break;
case 832:
-#line 3165 "./sql3.y"
+#line 3116 "./sql3.y"
{ (yyval.strval) = (yyvsp[(1) - (1)].box); }
break;
case 833:
-#line 3169 "./sql3.y"
+#line 3120 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 834:
-#line 3173 "./sql3.y"
+#line 3124 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 835:
-#line 3174 "./sql3.y"
+#line 3125 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 836:
-#line 3184 "./sql3.y"
+#line 3129 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 837:
-#line 3188 "./sql3.y"
+#line 3133 "./sql3.y"
{ (yyval.tree) = (ST *) 0; }
break;
case 838:
-#line 3189 "./sql3.y"
+#line 3134 "./sql3.y"
{ (yyval.tree) = (ST *) (yyvsp[(1) - (1)].box); }
break;
case 839:
-#line 3193 "./sql3.y"
+#line 3138 "./sql3.y"
{ (yyval.tree) = (ST *) 0; }
break;
case 840:
-#line 3194 "./sql3.y"
+#line 3139 "./sql3.y"
{ (yyval.tree) = (ST *) (yyvsp[(2) - (2)].box); }
break;
case 841:
-#line 3199 "./sql3.y"
+#line 3144 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_SHUTDOWN, (yyvsp[(2) - (2)].tree), NULL, NULL); }
break;
case 842:
-#line 3201 "./sql3.y"
+#line 3146 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_CHECKPOINT, (yyvsp[(2) - (2)].tree), NULL, NULL); }
break;
case 843:
-#line 3203 "./sql3.y"
+#line 3148 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_CHECKPOINT, (yyvsp[(2) - (3)].box), (yyvsp[(3) - (3)].box), NULL); }
break;
case 844:
-#line 3205 "./sql3.y"
+#line 3150 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_BACKUP, (yyvsp[(2) - (2)].box), NULL, NULL); }
break;
case 845:
-#line 3207 "./sql3.y"
+#line 3152 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_CHECK, NULL, NULL, NULL); }
break;
case 846:
-#line 3209 "./sql3.y"
+#line 3154 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_SYNC_REPL, (yyvsp[(3) - (4)].tree), (yyvsp[(4) - (4)].tree), NULL); }
break;
case 847:
-#line 3211 "./sql3.y"
+#line 3156 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_DISC_REPL, (yyvsp[(3) - (3)].tree), NULL, NULL); }
break;
case 848:
-#line 3213 "./sql3.y"
+#line 3158 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_LOG_ON, NULL, NULL, NULL); }
break;
case 849:
-#line 3215 "./sql3.y"
+#line 3160 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_LOG_OFF, NULL, NULL, NULL); }
break;
case 857:
-#line 3248 "./sql3.y"
+#line 3193 "./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) );
@@ -12616,247 +12604,247 @@ yyreduce:
break;
case 858:
-#line 3255 "./sql3.y"
+#line 3200 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 859:
-#line 3256 "./sql3.y"
+#line 3201 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].strval); }
break;
case 860:
-#line 3260 "./sql3.y"
+#line 3205 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 861:
-#line 3261 "./sql3.y"
+#line 3206 "./sql3.y"
{ (yyval.box) = (caddr_t)1; }
break;
case 862:
-#line 3267 "./sql3.y"
+#line 3212 "./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 3270 "./sql3.y"
+#line 3215 "./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 3275 "./sql3.y"
+#line 3220 "./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 3283 "./sql3.y"
+#line 3228 "./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 3288 "./sql3.y"
+#line 3233 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (2)].tree), NULL); }
break;
case 867:
-#line 3290 "./sql3.y"
+#line 3235 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(2) - (3)].tree), NULL)); }
break;
case 868:
-#line 3295 "./sql3.y"
+#line 3240 "./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 3301 "./sql3.y"
+#line 3246 "./sql3.y"
{ (yyval.subtok) = FUNCTION; }
break;
case 870:
-#line 3302 "./sql3.y"
+#line 3247 "./sql3.y"
{ (yyval.subtok) = PROCEDURE; }
break;
case 871:
-#line 3306 "./sql3.y"
+#line 3251 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 872:
-#line 3307 "./sql3.y"
+#line 3252 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 873:
-#line 3311 "./sql3.y"
+#line 3256 "./sql3.y"
{ (yyval.box) = (caddr_t) t_list (0); }
break;
case 874:
-#line 3312 "./sql3.y"
+#line 3257 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(2) - (3)].list)); }
break;
case 875:
-#line 3317 "./sql3.y"
+#line 3262 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 876:
-#line 3319 "./sql3.y"
+#line 3264 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 877:
-#line 3324 "./sql3.y"
+#line 3269 "./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 3326 "./sql3.y"
+#line 3271 "./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 3328 "./sql3.y"
+#line 3273 "./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 3332 "./sql3.y"
+#line 3277 "./sql3.y"
{ (yyval.subtok) = IN_MODE; }
break;
case 881:
-#line 3333 "./sql3.y"
+#line 3278 "./sql3.y"
{ (yyval.subtok) = OUT_MODE; }
break;
case 882:
-#line 3334 "./sql3.y"
+#line 3279 "./sql3.y"
{ (yyval.subtok) = INOUT_MODE; }
break;
case 883:
-#line 3338 "./sql3.y"
+#line 3283 "./sql3.y"
{ (yyval.subtok) = IN_MODE; }
break;
case 885:
-#line 3343 "./sql3.y"
+#line 3288 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
case 886:
-#line 3344 "./sql3.y"
+#line 3289 "./sql3.y"
{ (yyval.subtok) = SOAP_MSG_IN; }
break;
case 887:
-#line 3345 "./sql3.y"
+#line 3290 "./sql3.y"
{ (yyval.subtok) = SOAP_MSG_OUT; }
break;
case 888:
-#line 3346 "./sql3.y"
+#line 3291 "./sql3.y"
{ (yyval.subtok) = SOAP_MSG_INOUT; }
break;
case 889:
-#line 3347 "./sql3.y"
+#line 3292 "./sql3.y"
{ (yyval.subtok) = SOAP_MMSG_IN; }
break;
case 890:
-#line 3348 "./sql3.y"
+#line 3293 "./sql3.y"
{ (yyval.subtok) = SOAP_MMSG_OUT; }
break;
case 891:
-#line 3349 "./sql3.y"
+#line 3294 "./sql3.y"
{ (yyval.subtok) = SOAP_MMSG_INOUT; }
break;
case 892:
-#line 3353 "./sql3.y"
+#line 3298 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 893:
-#line 3354 "./sql3.y"
+#line 3299 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 894:
-#line 3358 "./sql3.y"
+#line 3303 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (3)].box), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 895:
-#line 3362 "./sql3.y"
+#line 3307 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 896:
-#line 3363 "./sql3.y"
+#line 3308 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_HEADER; }
break;
case 897:
-#line 3364 "./sql3.y"
+#line 3309 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_FAULT; }
break;
case 898:
-#line 3365 "./sql3.y"
+#line 3310 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_LITERAL; }
break;
case 899:
-#line 3366 "./sql3.y"
+#line 3311 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_XML; }
break;
case 900:
-#line 3367 "./sql3.y"
+#line 3312 "./sql3.y"
{ (yyval.intval) = (SOAP_MSG_LITERALW|SOAP_MSG_LITERAL); }
break;
case 901:
-#line 3368 "./sql3.y"
+#line 3313 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_HTTP; }
break;
case 902:
-#line 3372 "./sql3.y"
+#line 3317 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 903:
-#line 3374 "./sql3.y"
+#line 3319 "./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 3375 "./sql3.y"
+#line 3320 "./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 3379 "./sql3.y"
+#line 3324 "./sql3.y"
{ (yyval.box) = t_box_float ((float) unbox ((yyvsp[(1) - (1)].box))); }
break;
case 906:
-#line 3380 "./sql3.y"
+#line 3325 "./sql3.y"
{ double d;
switch (DV_TYPE_OF ((yyvsp[(1) - (1)].box)))
{
@@ -12868,32 +12856,32 @@ yyreduce:
break;
case 907:
-#line 3391 "./sql3.y"
+#line 3336 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 908:
-#line 3392 "./sql3.y"
+#line 3337 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 909:
-#line 3396 "./sql3.y"
+#line 3341 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, PROC_COST, t_list_to_array ((yyvsp[(3) - (4)].list))); }
break;
case 922:
-#line 3413 "./sql3.y"
+#line 3358 "./sql3.y"
{ (yyval.tree) = t_listst (1, NULL_STMT); }
break;
case 923:
-#line 3417 "./sql3.y"
+#line 3362 "./sql3.y"
{ BR_PUSH }
break;
case 924:
-#line 3418 "./sql3.y"
+#line 3363 "./sql3.y"
{ (yyval.tree) = t_listst (5, COMPOUND_STMT,
t_list_to_array ((yyvsp[(3) - (4)].list)),
t_box_num (BR_GET),
@@ -12903,37 +12891,37 @@ yyreduce:
break;
case 925:
-#line 3427 "./sql3.y"
+#line 3372 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 926:
-#line 3428 "./sql3.y"
+#line 3373 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 929:
-#line 3434 "./sql3.y"
+#line 3379 "./sql3.y"
{ BR_PUSH }
break;
case 930:
-#line 3434 "./sql3.y"
+#line 3379 "./sql3.y"
{ (yyval.tree) = BR_CSTM ((yyvsp[(2) - (2)].tree)); BR_POP }
break;
case 933:
-#line 3440 "./sql3.y"
+#line 3385 "./sql3.y"
{ (yyval.tree) = t_listst (3, LABELED_STMT, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].tree)); }
break;
case 934:
-#line 3441 "./sql3.y"
+#line 3386 "./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 3442 "./sql3.y"
+#line 3387 "./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))),
@@ -12945,7 +12933,7 @@ yyreduce:
break;
case 936:
-#line 3450 "./sql3.y"
+#line 3395 "./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))),
@@ -12957,7 +12945,7 @@ yyreduce:
break;
case 937:
-#line 3458 "./sql3.y"
+#line 3403 "./sql3.y"
{
ST *qry = (yyvsp[(2) - (3)].tree);
ST *scalar_qry = (yyval.tree) = (ST *) t_list (2, SCALAR_SUBQ, sqlp_add_top_1 (qry));
@@ -12965,27 +12953,27 @@ yyreduce:
break;
case 939:
-#line 3466 "./sql3.y"
+#line 3411 "./sql3.y"
{ BR_PUSH }
break;
case 940:
-#line 3466 "./sql3.y"
+#line 3411 "./sql3.y"
{ (yyval.tree) = BR_CSTM ((yyvsp[(2) - (3)].tree)); BR_POP }
break;
case 941:
-#line 3467 "./sql3.y"
+#line 3412 "./sql3.y"
{ BR_PUSH }
break;
case 942:
-#line 3467 "./sql3.y"
+#line 3412 "./sql3.y"
{ (yyval.tree) = BR_CSTM ((yyvsp[(2) - (2)].tree)); BR_POP }
break;
case 946:
-#line 3478 "./sql3.y"
+#line 3423 "./sql3.y"
{
ST **temp = (ST **) t_list_to_array ((yyvsp[(2) - (3)].list));
(yyval.tree) = t_listst (2, VARIABLE_DECL,
@@ -12994,126 +12982,126 @@ yyreduce:
break;
case 947:
-#line 3487 "./sql3.y"
+#line 3432 "./sql3.y"
{ (yyval.list) = t_CONS (t_list (3, COL_DOTTED, NULL, (yyvsp[(1) - (1)].box)), NULL); }
break;
case 948:
-#line 3489 "./sql3.y"
+#line 3434 "./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 3493 "./sql3.y"
+#line 3438 "./sql3.y"
{ (yyval.box) = (caddr_t) SQL_NO_DATA_FOUND; }
break;
case 950:
-#line 3494 "./sql3.y"
+#line 3439 "./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 3496 "./sql3.y"
+#line 3441 "./sql3.y"
{
(yyval.box) = t_listbox (2, (yyvsp[(3) - (3)].box), sqlp_handler_star_pos ((yyvsp[(3) - (3)].box)));
}
break;
case 952:
-#line 3499 "./sql3.y"
+#line 3444 "./sql3.y"
{ (yyval.box) = (caddr_t) SQL_SQLEXCEPTION; }
break;
case 953:
-#line 3500 "./sql3.y"
+#line 3445 "./sql3.y"
{ (yyval.box) = t_listbox (2, t_box_string ("01*"), 2); }
break;
case 960:
-#line 3510 "./sql3.y"
+#line 3455 "./sql3.y"
{ (yyval.tree) = sqlp_resignal (NULL); }
break;
case 961:
-#line 3511 "./sql3.y"
+#line 3456 "./sql3.y"
{ (yyval.tree) = sqlp_resignal ((yyvsp[(2) - (2)].tree)); }
break;
case 968:
-#line 3522 "./sql3.y"
+#line 3467 "./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 3524 "./sql3.y"
+#line 3469 "./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 3526 "./sql3.y"
+#line 3471 "./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 3528 "./sql3.y"
+#line 3473 "./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 3532 "./sql3.y"
+#line 3477 "./sql3.y"
{ (yyval.intval) = HANDT_CONTINUE; }
break;
case 973:
-#line 3533 "./sql3.y"
+#line 3478 "./sql3.y"
{ (yyval.intval) = HANDT_EXIT; }
break;
case 974:
-#line 3537 "./sql3.y"
+#line 3482 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 975:
-#line 3538 "./sql3.y"
+#line 3483 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 980:
-#line 3546 "./sql3.y"
+#line 3491 "./sql3.y"
{ (yyval.tree) = sqlp_resignal (NULL); }
break;
case 981:
-#line 3547 "./sql3.y"
+#line 3492 "./sql3.y"
{ (yyval.tree) = sqlp_resignal ((yyvsp[(2) - (3)].tree)); }
break;
case 988:
-#line 3557 "./sql3.y"
+#line 3502 "./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 3559 "./sql3.y"
+#line 3504 "./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 3566 "./sql3.y"
+#line 3511 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(2) - (3)].tree), NULL); }
break;
case 991:
-#line 3567 "./sql3.y"
+#line 3512 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (4)].list), t_CONS ((yyvsp[(3) - (4)].tree), NULL)); }
break;
case 994:
-#line 3602 "./sql3.y"
+#line 3547 "./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));
@@ -13121,231 +13109,231 @@ yyreduce:
break;
case 995:
-#line 3609 "./sql3.y"
+#line 3554 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 996:
-#line 3610 "./sql3.y"
+#line 3555 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 997:
-#line 3615 "./sql3.y"
+#line 3560 "./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 3616 "./sql3.y"
+#line 3561 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 999:
-#line 3617 "./sql3.y"
+#line 3562 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 1000:
-#line 3621 "./sql3.y"
+#line 3566 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(2) - (2)].box)); }
break;
case 1001:
-#line 3622 "./sql3.y"
+#line 3567 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(2) - (2)].box)); }
break;
case 1002:
-#line 3623 "./sql3.y"
+#line 3568 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(1) - (2)].box)); }
break;
case 1003:
-#line 3624 "./sql3.y"
+#line 3569 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(1) - (1)].box)); }
break;
case 1004:
-#line 3629 "./sql3.y"
+#line 3574 "./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 3632 "./sql3.y"
+#line 3577 "./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 3635 "./sql3.y"
+#line 3580 "./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 3638 "./sql3.y"
+#line 3583 "./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 3643 "./sql3.y"
+#line 3588 "./sql3.y"
{ (yyval.tree) = t_listst (2, GOTO_STMT, (yyvsp[(2) - (2)].box)); }
break;
case 1009:
-#line 3644 "./sql3.y"
+#line 3589 "./sql3.y"
{ (yyval.tree) = t_listst (2, GOTO_STMT, (yyvsp[(3) - (3)].box)); }
break;
case 1010:
-#line 3648 "./sql3.y"
+#line 3593 "./sql3.y"
{ (yyval.tree) = t_listst (2, RETURN_STMT, sqlp_wrapper_sqlxml_assign((ST*)(yyvsp[(2) - (2)].tree))); }
break;
case 1011:
-#line 3649 "./sql3.y"
+#line 3594 "./sql3.y"
{ (yyval.tree) = t_listst (2, RETURN_STMT, NULL); }
break;
case 1012:
-#line 3654 "./sql3.y"
+#line 3599 "./sql3.y"
{ (yyval.tree) = t_listst (3, WHILE_STMT, (yyvsp[(3) - (5)].tree), (yyvsp[(5) - (5)].tree)); }
break;
case 1017:
-#line 3665 "./sql3.y"
+#line 3610 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 1018:
-#line 3666 "./sql3.y"
+#line 3611 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1019:
-#line 3667 "./sql3.y"
+#line 3612 "./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 3677 "./sql3.y"
+#line 3622 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 1024:
-#line 3678 "./sql3.y"
+#line 3623 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1025:
-#line 3679 "./sql3.y"
+#line 3624 "./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 3683 "./sql3.y"
+#line 3628 "./sql3.y"
{ NEGATE ((yyval.tree), t_listst (3, BOP_EQ, t_box_num_and_zero (0), t_box_num (1))); }
break;
case 1027:
-#line 3684 "./sql3.y"
+#line 3629 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 1028:
-#line 3689 "./sql3.y"
+#line 3634 "./sql3.y"
{ (yyval.tree) = sqlp_for_statement ((yyvsp[(2) - (4)].tree), (yyvsp[(4) - (4)].tree)); }
break;
case 1029:
-#line 3691 "./sql3.y"
+#line 3636 "./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 3693 "./sql3.y"
+#line 3638 "./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 3699 "./sql3.y"
+#line 3644 "./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 3703 "./sql3.y"
+#line 3648 "./sql3.y"
{ (yyval.box) = 0; }
break;
case 1033:
-#line 3704 "./sql3.y"
+#line 3649 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1035:
-#line 3712 "./sql3.y"
+#line 3657 "./sql3.y"
{ (yyval.subtok) = TRIG_BEFORE; }
break;
case 1036:
-#line 3713 "./sql3.y"
+#line 3658 "./sql3.y"
{ (yyval.subtok) = TRIG_AFTER; }
break;
case 1037:
-#line 3714 "./sql3.y"
+#line 3659 "./sql3.y"
{ (yyval.subtok) = TRIG_INSTEAD; }
break;
case 1038:
-#line 3718 "./sql3.y"
+#line 3663 "./sql3.y"
{ (yyval.box) = (caddr_t) TRIG_INSERT; }
break;
case 1039:
-#line 3719 "./sql3.y"
+#line 3664 "./sql3.y"
{ (yyval.box) = (caddr_t) (yyvsp[(2) - (2)].tree); }
break;
case 1040:
-#line 3721 "./sql3.y"
+#line 3666 "./sql3.y"
{ (yyval.box) = (caddr_t) TRIG_DELETE; }
break;
case 1041:
-#line 3725 "./sql3.y"
+#line 3670 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1042:
-#line 3726 "./sql3.y"
+#line 3671 "./sql3.y"
{ (yyval.box) = (caddr_t) t_list_to_array ((yyvsp[(2) - (2)].list)); }
break;
case 1043:
-#line 3730 "./sql3.y"
+#line 3675 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1044:
-#line 3731 "./sql3.y"
+#line 3676 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1045:
-#line 3735 "./sql3.y"
+#line 3680 "./sql3.y"
{ (yyval.tree) = t_listst (2, OLD_ALIAS, (yyvsp[(3) - (3)].box)); }
break;
case 1046:
-#line 3736 "./sql3.y"
+#line 3681 "./sql3.y"
{ (yyval.tree) = t_listst (2, NEW_ALIAS, (yyvsp[(3) - (3)].box)); }
break;
case 1047:
-#line 3741 "./sql3.y"
+#line 3686 "./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))));
@@ -13353,7 +13341,7 @@ yyreduce:
break;
case 1048:
-#line 3750 "./sql3.y"
+#line 3695 "./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));
@@ -13361,7 +13349,7 @@ yyreduce:
break;
case 1049:
-#line 3755 "./sql3.y"
+#line 3700 "./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))));
@@ -13369,7 +13357,7 @@ yyreduce:
break;
case 1050:
-#line 3760 "./sql3.y"
+#line 3705 "./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));
@@ -13377,17 +13365,17 @@ yyreduce:
break;
case 1051:
-#line 3774 "./sql3.y"
+#line 3719 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1052:
-#line 3775 "./sql3.y"
+#line 3720 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1053:
-#line 3779 "./sql3.y"
+#line 3724 "./sql3.y"
{
if ((yyvsp[(1) - (1)].tree)->_.col_ref.name == STAR)
yyerror ("No stars allowed inside XML view definition");
@@ -13398,62 +13386,62 @@ yyreduce:
break;
case 1054:
-#line 3786 "./sql3.y"
+#line 3731 "./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 3787 "./sql3.y"
+#line 3732 "./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 3800 "./sql3.y"
+#line 3745 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1057:
-#line 3801 "./sql3.y"
+#line 3746 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1058:
-#line 3806 "./sql3.y"
+#line 3751 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 1059:
-#line 3810 "./sql3.y"
+#line 3755 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1060:
-#line 3811 "./sql3.y"
+#line 3756 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(4) - (5)].list)); }
break;
case 1061:
-#line 3817 "./sql3.y"
+#line 3762 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1062:
-#line 3818 "./sql3.y"
+#line 3763 "./sql3.y"
{ (yyval.tree) = (yyvsp[(3) - (4)].tree); }
break;
case 1063:
-#line 3823 "./sql3.y"
+#line 3768 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
case 1064:
-#line 3824 "./sql3.y"
+#line 3769 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
case 1065:
-#line 3830 "./sql3.y"
+#line 3775 "./sql3.y"
{
/*mapping schema*/
(yyval.tree) = (ST*) t_list (12,
@@ -13473,94 +13461,94 @@ yyreduce:
break;
case 1066:
-#line 3849 "./sql3.y"
+#line 3794 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1067:
-#line 3850 "./sql3.y"
+#line 3795 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 1068:
-#line 3855 "./sql3.y"
+#line 3800 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 1069:
-#line 3856 "./sql3.y"
+#line 3801 "./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 3866 "./sql3.y"
+#line 3811 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1071:
-#line 3867 "./sql3.y"
+#line 3812 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1072:
-#line 3871 "./sql3.y"
+#line 3816 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1073:
-#line 3872 "./sql3.y"
+#line 3817 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
case 1074:
-#line 3876 "./sql3.y"
+#line 3821 "./sql3.y"
{ (yyval.box) = t_box_num (0); }
break;
case 1075:
-#line 3877 "./sql3.y"
+#line 3822 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1076:
-#line 3893 "./sql3.y"
+#line 3838 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(0), t_box_string("")); }
break;
case 1077:
-#line 3894 "./sql3.y"
+#line 3839 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(1), t_box_string("")); }
break;
case 1078:
-#line 3895 "./sql3.y"
+#line 3840 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(2), t_box_string("")); }
break;
case 1079:
-#line 3896 "./sql3.y"
+#line 3841 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(3), (yyvsp[(2) - (2)].box)); }
break;
case 1080:
-#line 3897 "./sql3.y"
+#line 3842 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(5), t_box_string("")); }
break;
case 1081:
-#line 3898 "./sql3.y"
+#line 3843 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(6), (yyvsp[(2) - (2)].box)); }
break;
case 1082:
-#line 3902 "./sql3.y"
+#line 3847 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1083:
-#line 3904 "./sql3.y"
+#line 3849 "./sql3.y"
{
if (stricmp ((yyvsp[(3) - (7)].box), "OWNER") && stricmp ((yyvsp[(3) - (7)].box), "NAME"))
yyerror ("syntax error at WebDAV OWNER keyword");
@@ -13569,7 +13557,7 @@ yyreduce:
break;
case 1086:
-#line 3919 "./sql3.y"
+#line 3864 "./sql3.y"
{
if ((yyvsp[(2) - (3)].subtok) != BOP_EQ)
yyerror ("'=' expected");
@@ -13578,38 +13566,38 @@ yyreduce:
break;
case 1087:
-#line 3930 "./sql3.y"
+#line 3875 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1088:
-#line 3932 "./sql3.y"
+#line 3877 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 1089:
-#line 3937 "./sql3.y"
+#line 3882 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 1090:
-#line 3939 "./sql3.y"
+#line 3884 "./sql3.y"
{ (yyval.list) = (yyvsp[(2) - (3)].list); }
break;
case 1091:
-#line 3945 "./sql3.y"
+#line 3890 "./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 3952 "./sql3.y"
+#line 3897 "./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 3973 "./sql3.y"
+#line 3918 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("concat"),
@@ -13618,72 +13606,72 @@ yyreduce:
break;
case 1094:
-#line 3982 "./sql3.y"
+#line 3927 "./sql3.y"
{ (yyval.strval) = sqlp_type_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box), 1); }
break;
case 1095:
-#line 3983 "./sql3.y"
+#line 3928 "./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 3984 "./sql3.y"
+#line 3929 "./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 3985 "./sql3.y"
+#line 3930 "./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 3989 "./sql3.y"
+#line 3934 "./sql3.y"
{ (yyval.strval) = sqlp_type_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box), 0); }
break;
case 1099:
-#line 3990 "./sql3.y"
+#line 3935 "./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 3991 "./sql3.y"
+#line 3936 "./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 3992 "./sql3.y"
+#line 3937 "./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 3996 "./sql3.y"
+#line 3941 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box)); }
break;
case 1103:
-#line 3997 "./sql3.y"
+#line 3942 "./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 3998 "./sql3.y"
+#line 3943 "./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 3999 "./sql3.y"
+#line 3944 "./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 4003 "./sql3.y"
+#line 3948 "./sql3.y"
{ sqlp_udt_current_type = (yyvsp[(3) - (5)].strval); }
break;
case 1107:
-#line 4005 "./sql3.y"
+#line 3950 "./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));
@@ -13693,19 +13681,19 @@ yyreduce:
break;
case 1108:
-#line 4015 "./sql3.y"
+#line 3960 "./sql3.y"
{
(yyval.tree) = t_listst (3, UDT_DROP, (yyvsp[(3) - (4)].strval), (ptrlong) (yyvsp[(4) - (4)].intval));
}
break;
case 1109:
-#line 4021 "./sql3.y"
+#line 3966 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1110:
-#line 4023 "./sql3.y"
+#line 3968 "./sql3.y"
{
(yyval.tree) = t_listst (3, UDT_EXT,
(ptrlong) (yyvsp[(2) - (5)].intval), (yyvsp[(5) - (5)].box));
@@ -13714,7 +13702,7 @@ yyreduce:
break;
case 1111:
-#line 4029 "./sql3.y"
+#line 3974 "./sql3.y"
{
(yyval.tree) = t_listst (3, UDT_EXT,
(ptrlong) (yyvsp[(5) - (5)].intval), (yyvsp[(3) - (5)].box));
@@ -13723,7 +13711,7 @@ yyreduce:
break;
case 1112:
-#line 4035 "./sql3.y"
+#line 3980 "./sql3.y"
{
(yyval.tree) = t_listst (3, UDT_EXT,
(ptrlong) (yyvsp[(2) - (2)].intval), NULL);
@@ -13732,264 +13720,264 @@ yyreduce:
break;
case 1113:
-#line 4043 "./sql3.y"
+#line 3988 "./sql3.y"
{ (yyval.strval) = NULL; }
break;
case 1114:
-#line 4044 "./sql3.y"
+#line 3989 "./sql3.y"
{ (yyval.strval) = (yyvsp[(2) - (2)].strval); }
break;
case 1115:
-#line 4048 "./sql3.y"
+#line 3993 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1116:
-#line 4049 "./sql3.y"
+#line 3994 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 1117:
-#line 4053 "./sql3.y"
+#line 3998 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 1118:
-#line 4058 "./sql3.y"
+#line 4003 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1119:
-#line 4059 "./sql3.y"
+#line 4004 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1120:
-#line 4063 "./sql3.y"
+#line 4008 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1121:
-#line 4064 "./sql3.y"
+#line 4009 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, (yyvsp[(3) - (3)].box), NULL); }
break;
case 1122:
-#line 4065 "./sql3.y"
+#line 4010 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, (yyvsp[(3) - (6)].box), (yyvsp[(6) - (6)].box)); }
break;
case 1123:
-#line 4066 "./sql3.y"
+#line 4011 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, NULL, (yyvsp[(3) - (3)].box)); }
break;
case 1124:
-#line 4070 "./sql3.y"
+#line 4015 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1125:
-#line 4071 "./sql3.y"
+#line 4016 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_SOAP, NULL, (yyvsp[(2) - (2)].box)); }
break;
case 1126:
-#line 4072 "./sql3.y"
+#line 4017 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_SOAP, (yyvsp[(2) - (2)].box), NULL); }
break;
case 1127:
-#line 4073 "./sql3.y"
+#line 4018 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_SOAP, (yyvsp[(2) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
case 1128:
-#line 4074 "./sql3.y"
+#line 4019 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_SOAP, (yyvsp[(4) - (4)].box), (yyvsp[(2) - (4)].box)); }
break;
case 1129:
-#line 4078 "./sql3.y"
+#line 4023 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1130:
-#line 4079 "./sql3.y"
+#line 4024 "./sql3.y"
{ (yyval.tree) = (ST *) (yyvsp[(3) - (3)].box); }
break;
case 1131:
-#line 4084 "./sql3.y"
+#line 4029 "./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 4090 "./sql3.y"
+#line 4035 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1133:
-#line 4091 "./sql3.y"
+#line 4036 "./sql3.y"
{ (yyval.tree) = (yyvsp[(4) - (4)].tree); }
break;
case 1134:
-#line 4092 "./sql3.y"
+#line 4037 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1135:
-#line 4096 "./sql3.y"
+#line 4041 "./sql3.y"
{ (yyval.box) = t_alloc_box (0, DV_DB_NULL); }
break;
case 1136:
-#line 4097 "./sql3.y"
+#line 4042 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1137:
-#line 4101 "./sql3.y"
+#line 4046 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1138:
-#line 4102 "./sql3.y"
+#line 4047 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 1139:
-#line 4106 "./sql3.y"
+#line 4051 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1140:
-#line 4107 "./sql3.y"
+#line 4052 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 1141:
-#line 4111 "./sql3.y"
+#line 4056 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_FINAL, 1); }
break;
case 1142:
-#line 4112 "./sql3.y"
+#line 4057 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_FINAL, 0); }
break;
case 1143:
-#line 4113 "./sql3.y"
+#line 4058 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_REF, (yyvsp[(3) - (3)].tree)); }
break;
case 1144:
-#line 4114 "./sql3.y"
+#line 4059 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_REF, (yyvsp[(4) - (5)].list)); }
break;
case 1145:
-#line 4115 "./sql3.y"
+#line 4060 "./sql3.y"
{ (yyval.tree) = t_listst (1, UDT_REF); }
break;
case 1146:
-#line 4116 "./sql3.y"
+#line 4061 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_REFCAST, 0, (yyvsp[(8) - (8)].box)); }
break;
case 1147:
-#line 4117 "./sql3.y"
+#line 4062 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_REFCAST, 1, (yyvsp[(8) - (8)].box)); }
break;
case 1148:
-#line 4118 "./sql3.y"
+#line 4063 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_REFCAST, 0); }
break;
case 1149:
-#line 4119 "./sql3.y"
+#line 4064 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_REFCAST, 1); }
break;
case 1150:
-#line 4120 "./sql3.y"
+#line 4065 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_UNRESTRICTED, 1); }
break;
case 1151:
-#line 4121 "./sql3.y"
+#line 4066 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_SOAP, (yyvsp[(2) - (2)].box)); }
break;
case 1152:
-#line 4125 "./sql3.y"
+#line 4070 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1153:
-#line 4126 "./sql3.y"
+#line 4071 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 1154:
-#line 4130 "./sql3.y"
+#line 4075 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1155:
-#line 4131 "./sql3.y"
+#line 4076 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1156:
-#line 4135 "./sql3.y"
+#line 4080 "./sql3.y"
{ (yyval.intval) = UDT_METHOD_INSTANCE; }
break;
case 1157:
-#line 4136 "./sql3.y"
+#line 4081 "./sql3.y"
{ (yyval.intval) = UDT_METHOD_STATIC; }
break;
case 1158:
-#line 4137 "./sql3.y"
+#line 4082 "./sql3.y"
{ (yyval.intval) = UDT_METHOD_INSTANCE; }
break;
case 1159:
-#line 4141 "./sql3.y"
+#line 4086 "./sql3.y"
{ (yyval.box) = (caddr_t) t_list (0); }
break;
case 1160:
-#line 4142 "./sql3.y"
+#line 4087 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(2) - (3)].list)); }
break;
case 1161:
-#line 4147 "./sql3.y"
+#line 4092 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1162:
-#line 4149 "./sql3.y"
+#line 4094 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1163:
-#line 4154 "./sql3.y"
+#line 4099 "./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 4159 "./sql3.y"
+#line 4104 "./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));
@@ -13997,7 +13985,7 @@ yyreduce:
break;
case 1165:
-#line 4164 "./sql3.y"
+#line 4109 "./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));
@@ -14005,7 +13993,7 @@ yyreduce:
break;
case 1166:
-#line 4172 "./sql3.y"
+#line 4117 "./sql3.y"
{
(yyval.tree) = t_listst (5, UDT_METHOD_DEF,
0, (yyvsp[(1) - (3)].tree), (ptrlong) (yyvsp[(2) - (3)].intval), (yyvsp[(3) - (3)].tree));
@@ -14013,7 +14001,7 @@ yyreduce:
break;
case 1167:
-#line 4177 "./sql3.y"
+#line 4122 "./sql3.y"
{
(yyval.tree) = t_listst (5, UDT_METHOD_DEF,
1, (yyvsp[(2) - (2)].tree), NULL, NULL);
@@ -14021,54 +14009,54 @@ yyreduce:
break;
case 1168:
-#line 4184 "./sql3.y"
+#line 4129 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 1169:
-#line 4185 "./sql3.y"
+#line 4130 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 1170:
-#line 4186 "./sql3.y"
+#line 4131 "./sql3.y"
{ (yyval.intval) = 2; }
break;
case 1171:
-#line 4187 "./sql3.y"
+#line 4132 "./sql3.y"
{ (yyval.intval) = 3; }
break;
case 1172:
-#line 4191 "./sql3.y"
+#line 4136 "./sql3.y"
{ (yyval.strval) = NULL; }
break;
case 1173:
-#line 4192 "./sql3.y"
+#line 4137 "./sql3.y"
{ (yyval.strval) = (yyvsp[(2) - (2)].strval); }
break;
case 1174:
-#line 4196 "./sql3.y"
+#line 4141 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1175:
-#line 4197 "./sql3.y"
+#line 4142 "./sql3.y"
{ (yyval.tree) = (ST *)t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 1176:
-#line 4202 "./sql3.y"
+#line 4147 "./sql3.y"
{
(yyval.list) = ((yyvsp[(1) - (1)].tree) != NULL ? t_CONS ((yyvsp[(1) - (1)].tree), NULL) : NULL);
}
break;
case 1177:
-#line 4206 "./sql3.y"
+#line 4151 "./sql3.y"
{
if ((yyvsp[(2) - (2)].tree) != NULL)
(yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL));
@@ -14076,156 +14064,156 @@ yyreduce:
break;
case 1178:
-#line 4213 "./sql3.y"
+#line 4158 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, (ptrlong) (yyvsp[(2) - (2)].intval), NULL, NULL); }
break;
case 1179:
-#line 4214 "./sql3.y"
+#line 4159 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1180:
-#line 4215 "./sql3.y"
+#line 4160 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1181:
-#line 4216 "./sql3.y"
+#line 4161 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1182:
-#line 4217 "./sql3.y"
+#line 4162 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1183:
-#line 4218 "./sql3.y"
+#line 4163 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1184:
-#line 4219 "./sql3.y"
+#line 4164 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1185:
-#line 4220 "./sql3.y"
+#line 4165 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1186:
-#line 4221 "./sql3.y"
+#line 4166 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1187:
-#line 4222 "./sql3.y"
+#line 4167 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1188:
-#line 4223 "./sql3.y"
+#line 4168 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1189:
-#line 4224 "./sql3.y"
+#line 4169 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, (yyvsp[(3) - (3)].box), NULL); }
break;
case 1190:
-#line 4225 "./sql3.y"
+#line 4170 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_VAR_EXT, UDT_LANG_NONE, (yyvsp[(4) - (4)].box), NULL); }
break;
case 1191:
-#line 4226 "./sql3.y"
+#line 4171 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, NULL, (yyvsp[(3) - (3)].box)); }
break;
case 1192:
-#line 4230 "./sql3.y"
+#line 4175 "./sql3.y"
{ yyerror ("Language ADA not supported"); }
break;
case 1193:
-#line 4231 "./sql3.y"
+#line 4176 "./sql3.y"
{ (yyval.intval) = UDT_LANG_C; }
break;
case 1194:
-#line 4232 "./sql3.y"
+#line 4177 "./sql3.y"
{ yyerror ("Language COBOL not supported"); }
break;
case 1195:
-#line 4233 "./sql3.y"
+#line 4178 "./sql3.y"
{ yyerror ("Language FORTRAN not supported"); }
break;
case 1196:
-#line 4234 "./sql3.y"
+#line 4179 "./sql3.y"
{ yyerror ("Language MUMPS not supported"); }
break;
case 1197:
-#line 4235 "./sql3.y"
+#line 4180 "./sql3.y"
{ yyerror ("Language PASCAL not supported"); }
break;
case 1198:
-#line 4236 "./sql3.y"
+#line 4181 "./sql3.y"
{ yyerror ("Language PLI not supported"); }
break;
case 1199:
-#line 4237 "./sql3.y"
+#line 4182 "./sql3.y"
{ (yyval.intval) = UDT_LANG_JAVA; }
break;
case 1200:
-#line 4238 "./sql3.y"
+#line 4183 "./sql3.y"
{ (yyval.intval) = UDT_LANG_CLR; }
break;
case 1202:
-#line 4243 "./sql3.y"
+#line 4188 "./sql3.y"
{ (yyval.intval) = UDT_LANG_SQL; }
break;
case 1203:
-#line 4247 "./sql3.y"
+#line 4192 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1204:
-#line 4248 "./sql3.y"
+#line 4193 "./sql3.y"
{ (yyval.tree) = (ST *) (yyvsp[(2) - (2)].strval); }
break;
case 1205:
-#line 4254 "./sql3.y"
+#line 4199 "./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 4259 "./sql3.y"
+#line 4204 "./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 4266 "./sql3.y"
+#line 4211 "./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 4271 "./sql3.y"
+#line 4216 "./sql3.y"
{
dk_set_t set = NULL;
t_set_push (&set, (yyvsp[(1) - (7)].box));
@@ -14237,7 +14225,7 @@ yyreduce:
break;
case 1209:
-#line 4280 "./sql3.y"
+#line 4225 "./sql3.y"
{
dk_set_t set = NULL;
t_set_push (&set, (yyvsp[(1) - (6)].box));
@@ -14249,12 +14237,12 @@ yyreduce:
break;
case 1210:
-#line 4288 "./sql3.y"
+#line 4233 "./sql3.y"
{ (yyval.list) = t_NCONC (t_CONS ((yyvsp[(1) - (3)].box), NULL), (yyvsp[(3) - (3)].list)); }
break;
case 1211:
-#line 4293 "./sql3.y"
+#line 4238 "./sql3.y"
{
dk_set_t set = NULL;
t_set_push (&set, (yyvsp[(1) - (9)].box));
@@ -14267,7 +14255,7 @@ yyreduce:
break;
case 1212:
-#line 4303 "./sql3.y"
+#line 4248 "./sql3.y"
{
dk_set_t set = NULL;
t_set_push (&set, (yyvsp[(1) - (8)].box));
@@ -14280,137 +14268,137 @@ yyreduce:
break;
case 1213:
-#line 4312 "./sql3.y"
+#line 4257 "./sql3.y"
{ (yyval.list) = t_NCONC (t_CONS ((yyvsp[(1) - (3)].box), NULL), (yyvsp[(3) - (3)].list)); }
break;
case 1214:
-#line 4317 "./sql3.y"
+#line 4262 "./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 4319 "./sql3.y"
+#line 4264 "./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 4321 "./sql3.y"
+#line 4266 "./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 4323 "./sql3.y"
+#line 4268 "./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 4328 "./sql3.y"
+#line 4273 "./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 4330 "./sql3.y"
+#line 4275 "./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 4332 "./sql3.y"
+#line 4277 "./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 4334 "./sql3.y"
+#line 4279 "./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 4340 "./sql3.y"
+#line 4285 "./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 4345 "./sql3.y"
+#line 4290 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, (yyvsp[(3) - (3)].box), t_list (1, (yyvsp[(1) - (3)].tree))); }
break;
case 1225:
-#line 4347 "./sql3.y"
+#line 4292 "./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 4349 "./sql3.y"
+#line 4294 "./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 4353 "./sql3.y"
+#line 4298 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 1228:
-#line 4354 "./sql3.y"
+#line 4299 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 1229:
-#line 4359 "./sql3.y"
+#line 4304 "./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 4363 "./sql3.y"
+#line 4308 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_ALTER, (yyvsp[(3) - (4)].strval), (yyvsp[(4) - (4)].tree)); }
break;
case 1231:
-#line 4367 "./sql3.y"
+#line 4312 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_MEMBER_ADD, (yyvsp[(3) - (3)].tree)); }
break;
case 1232:
-#line 4368 "./sql3.y"
+#line 4313 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_MEMBER_DROP, (yyvsp[(3) - (4)].box), (ptrlong) (yyvsp[(4) - (4)].intval)); }
break;
case 1233:
-#line 4369 "./sql3.y"
+#line 4314 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_METHOD_ADD, (yyvsp[(2) - (2)].tree)); }
break;
case 1234:
-#line 4370 "./sql3.y"
+#line 4315 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_METHOD_DROP, (yyvsp[(2) - (3)].tree), (ptrlong) (yyvsp[(3) - (3)].intval)); }
break;
case 1235:
-#line 4374 "./sql3.y"
+#line 4319 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1236:
-#line 4375 "./sql3.y"
+#line 4320 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
case 1237:
-#line 4376 "./sql3.y"
+#line 4321 "./sql3.y"
{ (yyval.box) = t_box_num (2); }
break;
case 1238:
-#line 4380 "./sql3.y"
+#line 4325 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1239:
-#line 4381 "./sql3.y"
+#line 4326 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
case 1240:
-#line 4386 "./sql3.y"
+#line 4331 "./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)));
@@ -14418,7 +14406,7 @@ yyreduce:
break;
case 1241:
-#line 4394 "./sql3.y"
+#line 4339 "./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)));
@@ -14426,7 +14414,7 @@ yyreduce:
break;
case 1242:
-#line 4402 "./sql3.y"
+#line 4347 "./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)));
@@ -14434,7 +14422,7 @@ yyreduce:
break;
case 1243:
-#line 4410 "./sql3.y"
+#line 4355 "./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)));
@@ -14442,143 +14430,143 @@ yyreduce:
break;
case 1244:
-#line 4421 "./sql3.y"
+#line 4366 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_INT, t_box_num (0xffff), NULL); }
break;
case 1245:
-#line 4422 "./sql3.y"
+#line 4367 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_INT, (yyvsp[(3) - (4)].box), NULL); }
break;
case 1246:
-#line 4423 "./sql3.y"
+#line 4368 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_INT, t_box_num (0xffff), NULL); }
break;
case 1247:
-#line 4424 "./sql3.y"
+#line 4369 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_INT, (yyvsp[(3) - (4)].box), NULL); }
break;
case 1248:
-#line 4425 "./sql3.y"
+#line 4370 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_WORD, NULL, t_box_num (0xffff)); }
break;
case 1249:
-#line 4426 "./sql3.y"
+#line 4371 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_WORD, (yyvsp[(3) - (6)].box), (yyvsp[(5) - (6)].box)); }
break;
case 1250:
-#line 4427 "./sql3.y"
+#line 4372 "./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 4432 "./sql3.y"
+#line 4377 "./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 4436 "./sql3.y"
+#line 4381 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 1253:
-#line 4437 "./sql3.y"
+#line 4382 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 1254:
-#line 4441 "./sql3.y"
+#line 4386 "./sql3.y"
{ (yyval.box) = t_listbox (2, (yyvsp[(2) - (5)].box), (yyvsp[(4) - (5)].box)); }
break;
case 1255:
-#line 4445 "./sql3.y"
+#line 4390 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 1256:
-#line 4446 "./sql3.y"
+#line 4391 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 1257:
-#line 4451 "./sql3.y"
+#line 4396 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, t_list_to_array ((yyvsp[(3) - (4)].list)), NULL); }
break;
case 1258:
-#line 4452 "./sql3.y"
+#line 4397 "./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 4457 "./sql3.y"
+#line 4402 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1260:
-#line 4458 "./sql3.y"
+#line 4403 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1261:
-#line 4462 "./sql3.y"
+#line 4407 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1262:
-#line 4463 "./sql3.y"
+#line 4408 "./sql3.y"
{ (yyval.box) = (caddr_t) 1;}
break;
case 1263:
-#line 4468 "./sql3.y"
+#line 4413 "./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 4472 "./sql3.y"
+#line 4417 "./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 4473 "./sql3.y"
+#line 4418 "./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 4477 "./sql3.y"
+#line 4422 "./sql3.y"
{ (yyval.list) = NULL;}
break;
case 1267:
-#line 4478 "./sql3.y"
+#line 4423 "./sql3.y"
{ (yyval.list) = (yyvsp[(2) - (3)].list); }
break;
case 1268:
-#line 4481 "./sql3.y"
+#line 4426 "./sql3.y"
{ (yyval.box) = t_sym_string ("__ALL"); }
break;
case 1269:
-#line 4482 "./sql3.y"
+#line 4427 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1270:
-#line 4488 "./sql3.y"
+#line 4433 "./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 1267 of yacc.c. */
-#line 14582 "sql3.c"
+#line 14570 "sql3.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/libsrc/Wi/sql3.h b/libsrc/Wi/sql3.h
index 053f5fb..dda1065 100644
--- a/libsrc/Wi/sql3.h
+++ b/libsrc/Wi/sql3.h
@@ -768,7 +768,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 95 "./sql3.y"
+#line 68 "./sql3.y"
{
long intval;
char *strval;
@@ -778,7 +778,7 @@ typedef union YYSTYPE
long subtok;
sqlp_join_t join;
}
-/* Line 1489 of yacc.c. */
+/* Line 1529 of yacc.c. */
#line 783 "sql3.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/libsrc/Wi/sql3.y b/libsrc/Wi/sql3.y
index ecb63a3..5062c93 100644
--- a/libsrc/Wi/sql3.y
+++ b/libsrc/Wi/sql3.y
@@ -1,14 +1,14 @@
/*
* sql3.y
*
- * $Id: sql3.y,v 1.29.2.11 2011/06/09 17:26:41 source Exp $
+ * $Id$
*
* SQL Parser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -25,34 +25,7 @@
*
*/
-/*
- 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.
- */
+%expect 18
%{
@@ -138,8 +111,9 @@
%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
@@ -151,6 +125,7 @@
%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
@@ -470,7 +445,6 @@
%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
@@ -1156,7 +1130,7 @@ drop_xml_schema
view_query_spec
: query_exp
- | query_no_from_spec
+ /*| query_no_from_spec*/
;
view_def_select_and_opt
@@ -1595,7 +1569,7 @@ sql
manipulative_statement
: query_or_sparql_exp
- | query_no_from_spec
+ /*| query_no_from_spec*/
| update_statement_positioned
| update_statement_searched
| insert_statement
@@ -1688,7 +1662,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
+ | query_spec /* FROM is mandatory here */
;
insert_atom_commalist
@@ -1985,7 +1959,7 @@ non_final_query_term
;
sqlonly_query_term
- : query_spec
+ : query_opt_from_spec
| '(' query_or_sparql_exp ')' opt_order_by_clause { $$ = sqlp_inline_order_by ($2, (ST **) $4); }
| XPATH STRING { $$ = sqlp_embedded_xpath ($2); }
;
@@ -2013,6 +1987,18 @@ 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,
@@ -2020,14 +2006,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
@@ -2058,6 +2044,11 @@ 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
@@ -2411,12 +2402,6 @@ 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; }
;
@@ -2441,20 +2426,6 @@ 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);
@@ -2478,20 +2449,6 @@ 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);
@@ -2888,12 +2845,6 @@ signed_literal
;
/* miscellaneous */
-/*** pmn
-opt_prefix
- : identifier { $$ = $1; }
-/ * | { $$ = NULL; } * /
- ;
-*/
q_table_name
: identifier { $$ = sqlp_table_name (NULL, 0, NULL, 0, $1, 1); }
@@ -3174,12 +3125,6 @@ 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 ba81b97..fe4e50f 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.1 2009/04/18 21:55:15 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sql_code.c b/libsrc/Wi/sql_code.c
index 4ab1af0..1544300 100644
--- a/libsrc/Wi/sql_code.c
+++ b/libsrc/Wi/sql_code.c
@@ -1024,20 +1024,22 @@ static const char *proc26 =
"COL_CHECK,\n"
"deserialize (COL_DEFAULT),\n"
"COL_NTH,\n"
-"COL_NULLABLE from DB.DBA.SYS_COLS\n"
+"COL_NULLABLE,\n"
+"COL_OPTIONS\n"
+"from DB.DBA.SYS_COLS\n"
"where concat (\'\', \"TABLE\") = tb order by COL_ID;\n"
"whenever not found goto done;\n"
"open cr;\n"
"while (1)\n"
"{\n"
-"declare _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 any;\n"
-"fetch cr into _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10;\n"
+"declare _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 any;\n"
+"fetch cr into _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11;\n"
"_col1 := new_col_id (0);\n"
"_col2 := tname;\n"
"insert into DB.DBA.SYS_COLS\n"
"(COL_ID, \"TABLE\", \"COLUMN\", COL_DTP, COL_PREC, COL_SCALE, COL_CHECK, COL_DEFAULT,\n"
-"COL_NTH, COL_NULLABLE)\n"
-"values (_col1, _col2, _col3, _col4, _col5, _col6, _col7, serialize (_col8), _col9, _col10);\n"
+"COL_NTH, COL_NULLABLE, COL_OPTIONS)\n"
+"values (_col1, _col2, _col3, _col4, _col5, _col6, _col7, serialize (_col8), _col9, _col10, _col11);\n"
"}\n"
"done:\n"
"close cr;\n"
@@ -1062,7 +1064,7 @@ static const char *proc26 =
"--src system.sql:1014\n";
static const char *proc27 =
-"#line 1081 \"[executable]/system.sql\"\n"
+"#line 1083 \"[executable]/system.sql\"\n"
" create procedure ddl_pk_change_final (in tb varchar, in cols any)\n"
"{\n"
"declare st, msg, tname, tname_esc, tb_esc varchar;\n"
@@ -1080,10 +1082,10 @@ static const char *proc27 =
"commit work;\n"
"\n"
"}\n"
-"--src system.sql:1079\n";
+"--src system.sql:1081\n";
static const char *proc28 =
-"#line 1102 \"[executable]/system.sql\"\n"
+"#line 1104 \"[executable]/system.sql\"\n"
" create procedure ddl_pk_modify_check (in tb varchar, in cols any)\n"
"{\n"
"declare inx integer;\n"
@@ -1104,10 +1106,10 @@ static const char *proc28 =
"inx := inx + 1;\n"
"}\n"
"}\n"
-"--src system.sql:1100\n";
+"--src system.sql:1102\n";
static const char *proc29 =
-"#line 1126 \"[executable]/system.sql\"\n"
+"#line 1128 \"[executable]/system.sql\"\n"
" create procedure ddl_pk_is_changed (in tb varchar, in cols any) returns integer\n"
"{\n"
"declare inx integer;\n"
@@ -1136,10 +1138,10 @@ static const char *proc29 =
"else\n"
"return 0;\n"
"}\n"
-"--src system.sql:1124\n";
+"--src system.sql:1126\n";
static const char *proc30 =
-"#line 1158 \"[executable]/system.sql\"\n"
+"#line 1160 \"[executable]/system.sql\"\n"
" create procedure ddl_pk_modify (in tb varchar, in cols any)\n"
"{\n"
"\n"
@@ -1180,10 +1182,10 @@ static const char *proc30 =
"commit work;\n"
"__atomic (0);\n"
"}\n"
-"--src system.sql:1156\n";
+"--src system.sql:1158\n";
static const char *proc31 =
-"#line 1200 \"[executable]/system.sql\"\n"
+"#line 1202 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.fk_check_input_values (in mod integer)\n"
"{\n"
"declare ret, ret1 any;\n"
@@ -1206,12 +1208,12 @@ static const char *proc31 =
"signal (\'22023\', \'function fk_check_input_values expect -1, 0 or 1 as first parameter\', \'SR293\');\n"
"return ret;\n"
"}\n"
-"--src system.sql:1198\n";
+"--src system.sql:1200\n";
static const char *other1 =
"DB.DBA.fk_check_input_values (-1)\n";
static const char *proc32 =
-"#line 1228 \"[executable]/system.sql\"\n"
+"#line 1230 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.ddl_check_constraint (in pk_table varchar, in decl any)\n"
"{\n"
"declare inx, n_pc, n_pkc integer;\n"
@@ -1297,10 +1299,10 @@ static const char *proc32 =
"inx := inx + 1;\n"
"}\n"
"}\n"
-"--src system.sql:1226\n";
+"--src system.sql:1228\n";
static const char *proc33 =
-"#line 1316 \"[executable]/system.sql\"\n"
+"#line 1318 \"[executable]/system.sql\"\n"
"create procedure ddl_fk_modify (in tb varchar, in op integer, in decl any)\n"
"{\n"
"declare pkt varchar;\n"
@@ -1394,10 +1396,10 @@ static const char *proc33 =
"else\n"
"signal (\'42S11\', \'To modify a foreign key first drop the old and then add the new\', \'SR300\');\n"
"}\n"
-"--src system.sql:1314\n";
+"--src system.sql:1316\n";
static const char *proc34 =
-"#line 1412 \"[executable]/system.sql\"\n"
+"#line 1414 \"[executable]/system.sql\"\n"
" create procedure ddl_alter_constr (in tb varchar, in op integer, in decl any)\n"
"{\n"
"declare type integer;\n"
@@ -1450,10 +1452,10 @@ static const char *proc34 =
"if (not sys_stat (\'st_lite_mode\'))\n"
"__REPL_DDL_FK_MODIFY_PROPAGATE (tb, op, decl, orig_pkt);\n"
"}\n"
-"--src system.sql:1410\n";
+"--src system.sql:1412\n";
static const char *proc35 =
-"#line 1466 \"[executable]/system.sql\"\n"
+"#line 1468 \"[executable]/system.sql\"\n"
"create procedure ddl_unq_modify (in tb varchar, in op integer, in decl any)\n"
"{\n"
"declare nconstr, txt, cols_txt, stat, msg varchar;\n"
@@ -1529,10 +1531,10 @@ static const char *proc35 =
"else\n"
"signal (\'37000\', \'To modify a unique constraint first drop the old and then add the new\', \'SR302\');\n"
"}\n"
-"--src system.sql:1464\n";
+"--src system.sql:1466\n";
static const char *proc36 =
-"#line 1543 \"[executable]/system.sql\"\n"
+"#line 1545 \"[executable]/system.sql\"\n"
"create procedure ddl_check_modify (in tb varchar, in op integer, in decl any)\n"
"{\n"
"declare constr_name varchar;\n"
@@ -1599,10 +1601,10 @@ static const char *proc36 =
"}\n"
"__ddl_read_constraints (tb);\n"
"}\n"
-"--src system.sql:1541\n";
+"--src system.sql:1543\n";
static const char *proc37 =
-"#line 1611 \"[executable]/system.sql\"\n"
+"#line 1613 \"[executable]/system.sql\"\n"
"create procedure __HTTP_XSLT (inout _XML any, inout DOC_URI varchar, inout XSLT_URI varchar, inout PARAMS any, inout MEDIATYPE varchar, inout ENC varchar)\n"
"{\n"
"declare result any;\n"
@@ -1620,10 +1622,10 @@ static const char *proc37 =
"ENC := xml_tree_doc_encoding (result);\n"
"http_value (result);\n"
"}\n"
-"--src system.sql:1609\n";
+"--src system.sql:1611\n";
static const char *proc38 =
-"#line 1632 \"[executable]/system.sql\"\n"
+"#line 1634 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.ddl_fk_rules (in pktb varchar, in drop_tb varchar, in drop_col varchar)\n"
"{\n"
"declare stmt, set_cl, whe_cl, updst, delst, thetb, pkcols, pkvars, trig_pref, skip_on_this varchar;\n"
@@ -1832,10 +1834,10 @@ static const char *proc38 =
"DB.DBA.execstr (stmt);\n"
"}\n"
"}\n"
-"--src system.sql:1630\n";
+"--src system.sql:1632\n";
static const char *proc39 =
-"#line 1843 \"[executable]/system.sql\"\n"
+"#line 1845 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.ddl_pk_check_input (in pktb varchar, in drop_tb varchar, in drop_col varchar)\n"
"{\n"
"declare uniq, trig_pref, vars, whe, uwhe, stmt, ins, upd, fktb, skip_on_this, pku varchar;\n"
@@ -1949,10 +1951,10 @@ static const char *proc39 =
"DB.DBA.execstr (stmt);\n"
"}\n"
"}\n"
-"--src system.sql:1841\n";
+"--src system.sql:1843\n";
static const char *proc40 =
-"#line 1959 \"[executable]/system.sql\"\n"
+"#line 1961 \"[executable]/system.sql\"\n"
"create procedure execstr1 (in str varchar)\n"
"{\n"
"declare st, msg varchar;\n"
@@ -1966,10 +1968,10 @@ static const char *proc40 =
"signal (st, msg);\n"
"}\n"
"}\n"
-"--src system.sql:1957\n";
+"--src system.sql:1959\n";
static const char *proc41 =
-"#line 1977 \"[executable]/system.sql\"\n"
+"#line 1979 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.ddl_fk_check_input (in fktb varchar, in to_drop integer)\n"
"{\n"
"declare uniq, trig_pref, vars, whe, uwhe, stmt, ins, upd, pktb, nself, uself varchar;\n"
@@ -2053,10 +2055,10 @@ static const char *proc41 =
"name_part (fktb, 0), name_part (fktb, 1), name_part (fktb,2)), upd, \'\\n}\\n\');\n"
"DB.DBA.execstr1 (stmt);\n"
"}\n"
-"--src system.sql:1975\n";
+"--src system.sql:1977\n";
static const char *proc42 =
-"#line 2090 \"[executable]/system.sql\"\n"
+"#line 2092 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.col_check (in tb varchar, in col varchar)\n"
"{\n"
"if (not isstring (tb) or not isstring (col))\n"
@@ -2073,10 +2075,10 @@ static const char *proc42 =
"close c;\n"
"signal (\'42S22\', sprintf (\'The column \"%s\" is not defined in the given table\', col), \'SR084\');\n"
"}\n"
-"--src system.sql:2088\n";
+"--src system.sql:2090\n";
static const char *proc43 =
-"#line 2108 \"[executable]/system.sql\"\n"
+"#line 2110 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.col_of_type (in tb varchar, in col varchar, in type_needed int)\n"
"{\n"
"if (not isstring (tb) or not isstring (col))\n"
@@ -2094,7 +2096,7 @@ static const char *proc43 =
"close c;\n"
"return ret;\n"
"}\n"
-"--src system.sql:2106\n";
+"--src system.sql:2108\n";
static const char *other2 =
"charset_define (\'MIK\', N\'\\x1\\x2\\x3\\x4\\x5\\x6\\x7\\x8\\x9\\xA\\xB\\xC\\xD\\xE\\xF\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1A\\x1B\\x1C\\x1D\\x1E\\x1F\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2A\\x2B\\x2C\\x2D\\x2E\\x2F\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3A\\x3B\\x3C\\x3D\\x3E\\x3F\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4A\\x4B\\x4C\\x4D\\x4E\\x4F\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5A\\x5B\\x5C\\x5D\\x5E\\x5F\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x6A\\x6B\\x6C\\x6D\\x6E\\x6F\\x70\\x71\\x72\\x73\\x74\\x75\\x76\\x77\\x78\\x79\\x7A\\x7B\\x7C\\x7D\\x7E\\x7F\\x410\\x411\\x412\\x413\\x414\\x415\\x416\\x417\\x418\\x419\\x41A\\x41B\\x41C\\x41D\\x41E\\x41F\\x420\\x421\\x422\\x423\\x424\\x425\\x426\\x427\\x428\\x429\\x42A\\x42B\\x42C\\x42D\\x42E\\x42F\\x430\\x431\\x432\\x433\\x434\\x435\\x436\\x437\\x438\\x439\\x43A\\x43B\\x43C\\x43D\\x43E\\x43F\\x440\\x441\\x442\\x443\\x444\\x445\\x446\\x447\\x448\\x449\\x44A\\x44B\\x44C\\x44D\\x44E\\x44F\\x2514\\x2534\\x252C\\x251C\\x2500\\x253C\\x2563\\x2551\\x255A\\x2554\\x2569\\x2566\\x2560\\x2550\\x256C\\x2510\\x2591\\x2592\\x2593\\x2502\\x2524\\x2116\\xA7\\x2557\\x255D\\x2518\\x250C\\x2588\\x2584\\x258C\\x2590\\x2580\\x3B1\\x3B2\\x393\\x3C0\\x3A3\\x3C3\\x3BC\\x3C4\\x3A6\\x398\\x3A9\\x3B4\\x221E\\x2205\\x2208\\x2229\\x2261\\xB1\\x2265\\x2264\\x2320\\x2321\\xF7\\x2248\\xB0\\x2219\\xB7\\x221A\\x207F\\xB2\\x25A0\\xA0\', vector (\'999\', \'CP999\'))\n";
@@ -2167,7 +2169,7 @@ static const char *other35 =
static const char *other36 =
"charset_define (\'MAC-UKRAINIAN\', N\'\\x1\\x2\\x3\\x4\\x5\\x6\\x7\\x8\\x9\\xA\\xB\\xC\\xD\\xE\\xF\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1A\\x1B\\x1C\\x1D\\x1E\\x1F\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2A\\x2B\\x2C\\x2D\\x2E\\x2F\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3A\\x3B\\x3C\\x3D\\x3E\\x3F\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4A\\x4B\\x4C\\x4D\\x4E\\x4F\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5A\\x5B\\x5C\\x5D\\x5E\\x5F\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x6A\\x6B\\x6C\\x6D\\x6E\\x6F\\x70\\x71\\x72\\x73\\x74\\x75\\x76\\x77\\x78\\x79\\x7A\\x7B\\x7C\\x7D\\x7E\\x7F\\x410\\x411\\x412\\x413\\x414\\x415\\x416\\x417\\x418\\x419\\x41A\\x41B\\x41C\\x41D\\x41E\\x41F\\x420\\x421\\x422\\x423\\x424\\x425\\x426\\x427\\x428\\x429\\x42A\\x42B\\x42C\\x42D\\x42E\\x42F\\x2020\\xB0\\x490\\xA3\\xA7\\x2022\\xB6\\x406\\xAE\\xA9\\x2122\\x402\\x452\\x2260\\x403\\x453\\x221E\\xB1\\x2264\\x2265\\x456\\xB5\\x491\\x408\\x404\\x454\\x407\\x457\\x409\\x459\\x40A\\x45A\\x458\\x405\\xAC\\x221A\\x192\\x2248\\x2206\\xAB\\xBB\\x2026\\xA0\\x40B\\x45B\\x40C\\x45C\\x455\\x2013\\x2014\\x201C\\x201D\\x2018\\x2019\\xF7\\x201E\\x40E\\x45E\\x40F\\x45F\\x2116\\x401\\x451\\x44F\\x430\\x431\\x432\\x433\\x434\\x435\\x436\\x437\\x438\\x439\\x43A\\x43B\\x43C\\x43D\\x43E\\x43F\\x440\\x441\\x442\\x443\\x444\\x445\\x446\\x447\\x448\\x449\\x44A\\x44B\\x44C\\x44D\\x44E\\xA4\', NULL)\n";
static const char *proc44 =
-"#line 2258 \"[executable]/system.sql\"\n"
+"#line 2260 \"[executable]/system.sql\"\n"
"create procedure\n"
"scheduler_init ()\n"
"{\n"
@@ -2176,12 +2178,12 @@ static const char *proc44 =
"else\n"
"registry_set (\'__scheduler_do_now__\', \'0\');\n"
"}\n"
-"--src system.sql:2256\n";
+"--src system.sql:2258\n";
static const char *other37 =
"scheduler_init ()\n";
static const char *proc45 =
-"#line 2272 \"[executable]/system.sql\"\n"
+"#line 2274 \"[executable]/system.sql\"\n"
" create procedure SYS_GENERATE_ALL_OPS (in col_name varchar, in col_dtp integer := 193)\n"
"{\n"
"declare func, args varchar;\n"
@@ -2209,10 +2211,10 @@ static const char *proc45 =
"col_name,\n"
"col_name);\n"
"}\n"
-"--src system.sql:2270\n";
+"--src system.sql:2272\n";
static const char *proc46 =
-"#line 2303 \"[executable]/system.sql\"\n"
+"#line 2305 \"[executable]/system.sql\"\n"
" create procedure SYS_GENERATE_ALL_VARS (in col_name varchar, in rate varchar:=null, in n_dist_rate varchar:=null )\n"
"{\n"
"if (rate is null)\n"
@@ -2231,7 +2233,7 @@ static const char *proc46 =
"}\n"
"}\n"
"}\n"
-"--src system.sql:2301\n";
+"--src system.sql:2303\n";
static const char *tbl2 =
"create table SYS_STAT_VDB_MAPPERS (\n"
@@ -2264,7 +2266,7 @@ static const char *other39 =
"\'%VIRTUOSO%\',\n"
"\'%\')\n";
static const char *proc47 =
-"#line 2357 \"[executable]/system.sql\"\n"
+"#line 2359 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.__ORACLE_SYS_COL_STAT (in DSN varchar, in RT_NAME varchar, in RT_REMOTE_NAME varchar)\n"
"returns ANY\n"
"{\n"
@@ -2292,10 +2294,10 @@ static const char *proc47 =
"}\n"
"return NULL;\n"
"}\n"
-"--src system.sql:2355\n";
+"--src system.sql:2357\n";
static const char *proc48 =
-"#line 2386 \"[executable]/system.sql\"\n"
+"#line 2388 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.__VIRTUOSO_SYS_COL_STAT (in DSN varchar, in RT_NAME varchar, in RT_REMOTE_NAME varchar)\n"
"returns ANY\n"
"{\n"
@@ -2326,7 +2328,7 @@ static const char *proc48 =
"}\n"
"return NULL;\n"
"}\n"
-"--src system.sql:2384\n";
+"--src system.sql:2386\n";
static const char *other40 =
" insert soft SYS_STAT_VDB_MAPPERS\n"
@@ -2340,7 +2342,7 @@ static const char *other40 =
"\'%INFORMIX%\',\n"
"\'%\')\n";
static const char *proc49 =
-"#line 2432 \"[executable]/system.sql\"\n"
+"#line 2434 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.__INFORMIX_SYS_COL_STAT (in DSN varchar, in RT_NAME varchar, in RT_REMOTE_NAME varchar)\n"
"{\n"
"declare _meta, _res any;\n"
@@ -2423,10 +2425,10 @@ static const char *proc49 =
"}\n"
"return null;\n"
"}\n"
-"--src system.sql:2430\n";
+"--src system.sql:2432\n";
static const char *proc50 =
-"#line 2516 \"[executable]/system.sql\"\n"
+"#line 2518 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.__DB2_SYS_COL_STAT (in DSN varchar, in RT_NAME varchar, in RT_REMOTE_NAME varchar)\n"
"returns ANY\n"
"{\n"
@@ -2454,7 +2456,7 @@ static const char *proc50 =
"}\n"
"return NULL;\n"
"}\n"
-"--src system.sql:2514\n";
+"--src system.sql:2516\n";
static const char *other41 =
" insert soft SYS_STAT_VDB_MAPPERS\n"
@@ -2468,7 +2470,7 @@ static const char *other41 =
"\'%DB2%\',\n"
"\'%\')\n";
static const char *proc51 =
-"#line 2558 \"[executable]/system.sql\"\n"
+"#line 2560 \"[executable]/system.sql\"\n"
"create procedure SYS_STAT_VDB_SYNC ()\n"
"{\n"
"declare _ds_conn_str any;\n"
@@ -2486,10 +2488,10 @@ static const char *proc51 =
"}\n"
"}\n"
"}\n"
-"--src system.sql:2556\n";
+"--src system.sql:2558\n";
static const char *proc52 =
-"#line 2579 \"[executable]/system.sql\"\n"
+"#line 2581 \"[executable]/system.sql\"\n"
" create procedure SYS_STAT_ANALYZE_VDB (\n"
"in _ds_dsn varchar,\n"
"in _rt_remote_name varchar,\n"
@@ -2611,10 +2613,10 @@ static const char *proc52 =
"\n"
"return 0;\n"
"}\n"
-"--src system.sql:2577\n";
+"--src system.sql:2579\n";
static const char *proc53 =
-"#line 2704 \"[executable]/system.sql\"\n"
+"#line 2706 \"[executable]/system.sql\"\n"
" create procedure SYS_STAT_ANALYZE (in tb_name varchar, in pcnt integer:=5, in ignore_vdb integer:=1)\n"
"{\n"
"declare stmt, proc_name varchar;\n"
@@ -2819,10 +2821,10 @@ static const char *proc53 =
"exec (sprintf (\'%s ()\', proc_name), NULL, NULL);\n"
"exec (sprintf (\'drop procedure %s\', proc_name), NULL, NULL);\n"
"}\n"
-"--src system.sql:2702\n";
+"--src system.sql:2704\n";
static const char *proc54 =
-"#line 2912 \"[executable]/system.sql\"\n"
+"#line 2914 \"[executable]/system.sql\"\n"
" create procedure SYS_DB_STAT (in pcnt integer:=null, in ignore_vdb integer:=1)\n"
"{\n"
"declare cnt integer;\n"
@@ -2840,10 +2842,10 @@ static const char *proc54 =
"}\n"
"return cnt;\n"
"}\n"
-"--src system.sql:2910\n";
+"--src system.sql:2912\n";
static const char *proc55 =
-"#line 2932 \"[executable]/system.sql\"\n"
+"#line 2934 \"[executable]/system.sql\"\n"
" create procedure SYS_STAT_HISTOGRAM (in tb_name varchar, in col_name varchar,\n"
"in n_buckets integer, in prec integer := 1)\n"
"{\n"
@@ -2925,7 +2927,7 @@ static const char *proc55 =
"if (is_analyzed = 0)\n"
"DB..SYS_STAT_ANALYZE (tb_name, prec);\n"
"}\n"
-"--src system.sql:2930\n";
+"--src system.sql:2932\n";
static const char *tbl3 =
"create table\n"
@@ -2938,7 +2940,7 @@ static const char *tbl3 =
"alter index SYS_SOAP_DATATYPES on DB.DBA.SYS_SOAP_DATATYPES partition cluster replicated\n";
static const char *proc56 =
-"#line 3049 \"[executable]/system.sql\"\n"
+"#line 3051 \"[executable]/system.sql\"\n"
"create procedure\n"
"soap_dt_define (in name varchar, in sch varchar, in udt_name varchar := null)\n"
"{\n"
@@ -2991,10 +2993,10 @@ static const char *proc56 =
"__soap_dt_define (name, xt, xte, is_elem, udt_name);\n"
"return name;\n"
"}\n"
-"--src system.sql:3047\n";
+"--src system.sql:3049\n";
static const char *proc57 =
-"#line 3106 \"[executable]/system.sql\"\n"
+"#line 3108 \"[executable]/system.sql\"\n"
" create procedure SET_IDENTITY_COLUMN (in tbl_name varchar, in col_name varchar, in num integer)\n"
"{\n"
"if (not exists (select 1 from DB.DBA.SYS_COLS where \"TABLE\" = tbl_name and \"COLUMN\" = col_name))\n"
@@ -3007,10 +3009,10 @@ static const char *proc57 =
"return sequence_set (concat (name_part (tbl_name, 0, \'DB\'), \'.\',\n"
"name_part (tbl_name, 1, user), \'.\', tbl_name, \'.\', col_name), num, 0);\n"
"}\n"
-"--src system.sql:3104\n";
+"--src system.sql:3106\n";
static const char *proc58 =
-"#line 3121 \"[executable]/system.sql\"\n"
+"#line 3123 \"[executable]/system.sql\"\n"
" create procedure GET_IDENTITY_COLUMN (in tbl_name varchar, in col_name varchar, in no_check int := 0)\n"
"{\n"
"if (no_check = 0 and not exists (select 1 from DB.DBA.SYS_COLS where \"TABLE\" = tbl_name and \"COLUMN\" = col_name))\n"
@@ -3023,12 +3025,12 @@ static const char *proc58 =
"return sequence_set (concat (name_part (tbl_name, 0, \'DB\'), \'.\',\n"
"name_part (tbl_name, 1, user), \'.\', tbl_name, \'.\', col_name), 0, 2);\n"
"}\n"
-"--src system.sql:3119\n";
+"--src system.sql:3121\n";
static const char *other42 =
"xml_add_system_path(\'file://system/\')\n";
static const char *proc59 =
-"#line 3139 \"[executable]/system.sql\"\n"
+"#line 3141 \"[executable]/system.sql\"\n"
"create procedure\n"
"DAV_USER_SET_PASSWORD (in name varchar, in passwd varchar)\n"
"{\n"
@@ -3044,10 +3046,10 @@ static const char *proc59 =
"\n"
"\n"
"}\n"
-"--src system.sql:3137\n";
+"--src system.sql:3139\n";
static const char *proc60 =
-"#line 3157 \"[executable]/system.sql\"\n"
+"#line 3159 \"[executable]/system.sql\"\n"
" create procedure DB.DBA.HTTP_CLIENT (\n"
"in url varchar,\n"
"in uid varchar := null,\n"
@@ -3075,10 +3077,10 @@ static const char *proc60 =
"}\n"
"return http_client_internal (url, uid, pwd, http_method, http_headers, body, cert_file, cert_pwd, null, timeout, proxy, ca_certs, insecure, n_redirects);\n"
"}\n"
-"--src system.sql:3155\n";
+"--src system.sql:3157\n";
static const char *proc61 =
-"#line 3187 \"[executable]/system.sql\"\n"
+"#line 3189 \"[executable]/system.sql\"\n"
" create procedure DB.DBA.HTTP_CLIENT_EXT (\n"
"in url varchar,\n"
"in uid varchar := null,\n"
@@ -3107,10 +3109,10 @@ static const char *proc61 =
"}\n"
"return http_client_internal (url, uid, pwd, http_method, http_headers, body, cert_file, cert_pwd, headers, timeout, proxy, ca_certs, insecure, n_redirects);\n"
"}\n"
-"--src system.sql:3185\n";
+"--src system.sql:3187\n";
static const char *proc62 =
-"#line 3219 \"[executable]/system.sql\"\n"
+"#line 3221 \"[executable]/system.sql\"\n"
" create procedure SQL_PROCEDURE_COLUMNSW (\n"
"in qual varchar,\n"
"in owner varchar,\n"
@@ -3198,10 +3200,10 @@ static const char *proc62 =
"}\n"
"}\n"
"}\n"
-"--src system.sql:3217\n";
+"--src system.sql:3219\n";
static const char *proc63 =
-"#line 3310 \"[executable]/system.sql\"\n"
+"#line 3312 \"[executable]/system.sql\"\n"
"create procedure\n"
"DB.DBA.__XML_TEMPLATE (in path any, in params any, in lines any, in enc any := null)\n"
"{\n"
@@ -3252,10 +3254,10 @@ static const char *proc63 =
"}\n"
"__pop_user_id ();\n"
"}\n"
-"--src system.sql:3308\n";
+"--src system.sql:3310\n";
static const char *proc64 =
-"#line 3543 \"[executable]/system.sql\"\n"
+"#line 3545 \"[executable]/system.sql\"\n"
" create procedure\n"
"DB.DBA.XQ_TEMPLATE (inout q varchar, inout ctx varchar, inout ses any, inout map_schema any)\n"
"{\n"
@@ -3285,10 +3287,10 @@ static const char *proc64 =
"i := i + 1;\n"
"}\n"
"}\n"
-"--src system.sql:3541\n";
+"--src system.sql:3543\n";
static const char *proc65 =
-"#line 3575 \"[executable]/system.sql\"\n"
+"#line 3577 \"[executable]/system.sql\"\n"
" create procedure\n"
"DB.DBA.SQLX_OR_SPARQL_TEMPLATE (inout q varchar, inout params any, inout ses any, inout q_type any)\n"
"{\n"
@@ -3338,7 +3340,7 @@ static const char *proc65 =
"params := 0;\n"
"return;\n"
"}\n"
-"--src system.sql:3573\n";
+"--src system.sql:3575\n";
static const char *other43 =
"xslt_sheet (\'__xml_template_default\', xml_tree_doc (xml_tree(\n"
@@ -3375,7 +3377,7 @@ static const char *other43 =
"</xsl:stylesheet>\'))\n"
")\n";
static const char *proc66 =
-"#line 3665 \"[executable]/system.sql\"\n"
+"#line 3667 \"[executable]/system.sql\"\n"
"create procedure\n"
"cov_store (in f varchar, in add_line integer := 0)\n"
"{\n"
@@ -3431,10 +3433,10 @@ static const char *proc66 =
"http (\'</pl_stats>\', ses);\n"
"string_to_file (f, ses, -2);\n"
"}\n"
-"--src system.sql:3663\n";
+"--src system.sql:3665\n";
static const char *proc67 =
-"#line 3723 \"[executable]/system.sql\"\n"
+"#line 3725 \"[executable]/system.sql\"\n"
"create procedure\n"
"cov_load (in f varchar)\n"
"{\n"
@@ -3490,10 +3492,10 @@ static const char *proc67 =
"i := i + 1;\n"
"}\n"
"}\n"
-"--src system.sql:3721\n";
+"--src system.sql:3723\n";
static const char *proc68 =
-"#line 3781 \"[executable]/system.sql\"\n"
+"#line 3783 \"[executable]/system.sql\"\n"
"create procedure\n"
"cov_report (in f varchar, in odir varchar)\n"
"{\n"
@@ -3538,10 +3540,10 @@ static const char *proc68 =
"http_value (r, null, s);\n"
"string_to_file (concat(odir,\'profile\',\'.prof\'), s, -2);\n"
"}\n"
-"--src system.sql:3779\n";
+"--src system.sql:3781\n";
static const char *proc69 =
-"#line 3829 \"[executable]/system.sql\"\n"
+"#line 3831 \"[executable]/system.sql\"\n"
"create procedure\n"
"vd_remote_proc_wrapper (in _dsn varchar, in pro varchar, in dest varchar, in meta any, out state varchar, out msg varchar, in make_rset integer := 0, in descr varchar := \'\')\n"
"{\n"
@@ -3688,12 +3690,12 @@ static const char *proc69 =
"state := \'00000\';\n"
"exec (stmt1, state, msg);\n"
"}\n"
-"--src system.sql:3827\n";
+"--src system.sql:3829\n";
static const char *other44 =
"update SYS_COLS set COL_PREC = 2147483647 where COL_DTP = 125 and COL_PREC < 2147483647\n";
static const char *proc70 =
-"#line 3981 \"[executable]/system.sql\"\n"
+"#line 3983 \"[executable]/system.sql\"\n"
"create procedure EXEC_STMT (in stmt_text varchar, in mode integer)\n"
"{\n"
"declare state, msg varchar;\n"
@@ -3704,10 +3706,10 @@ static const char *proc70 =
"\n"
"exec (stmt_text, state, msg, vector (), 100, meta, res);\n"
"}\n"
-"--src system.sql:3979\n";
+"--src system.sql:3981\n";
static const char *proc71 =
-"#line 3993 \"[executable]/system.sql\"\n"
+"#line 3995 \"[executable]/system.sql\"\n"
"create procedure EXEC_AS (in stmt_text varchar, in uname varchar, in mode integer := 0)\n"
"{\n"
"declare state, msg varchar;\n"
@@ -3720,10 +3722,10 @@ static const char *proc71 =
"\n"
"exec (stmt_text, state, msg, vector (), 100, meta, res);\n"
"}\n"
-"--src system.sql:3991\n";
+"--src system.sql:3993\n";
static const char *proc72 =
-"#line 4009 \"[executable]/system.sql\"\n"
+"#line 4011 \"[executable]/system.sql\"\n"
" create procedure RSTMTEXEC (in dsn varchar, in stmt varchar, in max_rows integer := 0, in params_array any := null)\n"
"{\n"
"declare stmt_compilation, cursor_handle, curr_row any;\n"
@@ -3751,10 +3753,10 @@ static const char *proc72 =
"done:\n"
"rclose (cursor_handle);\n"
"}\n"
-"--src system.sql:4007\n";
+"--src system.sql:4009\n";
static const char *proc73 =
-"#line 4039 \"[executable]/system.sql\"\n"
+"#line 4041 \"[executable]/system.sql\"\n"
"create procedure FTI_MAKE_SEARCH_STRING_INNER (in exp varchar, inout words any)\n"
"{\n"
"declare exp1 varchar;\n"
@@ -3839,16 +3841,16 @@ static const char *proc73 =
"end_parse:\n"
"return exp1;\n"
"}\n"
-"--src system.sql:4037\n";
+"--src system.sql:4039\n";
static const char *proc74 =
-"#line 4125 \"[executable]/system.sql\"\n"
+"#line 4127 \"[executable]/system.sql\"\n"
"create procedure FTI_MAKE_SEARCH_STRING (in exp varchar)\n"
"{\n"
"declare words any;\n"
"return FTI_MAKE_SEARCH_STRING_INNER (exp, words);\n"
"}\n"
-"--src system.sql:4123\n";
+"--src system.sql:4125\n";
static const char *tbl4 =
"create table DB.DBA.CLR_VAC (\n"
@@ -3866,13 +3868,13 @@ static const char *tbl4 =
static const char *other45 =
" exec_quiet (\'create type __ANY as (__any any)\')\n";
static const char *proc75 =
-"#line 4151 \"[executable]/system.sql\"\n"
+"#line 4153 \"[executable]/system.sql\"\n"
"create procedure exec_quiet (in expn varchar)\n"
"{\n"
"declare sta, msg varchar;\n"
"exec (expn, sta, msg);\n"
"}\n"
-"--src system.sql:4149\n";
+"--src system.sql:4151\n";
static const char *other46 =
"exec_quiet (\'create type __ANY as (__any any)\')\n";
@@ -4228,19 +4230,19 @@ static const char *other76 =
"}\n";
static const char *proc76 =
-"#line 4551 \"[executable]/system.sql\"\n"
+"#line 4553 \"[executable]/system.sql\"\n"
" create function createXML (in _src any, in _schema varchar := null, in _validated integer := 0, in _wellformed integer := 0) returns XMLType\n"
"{\n"
"declare _res XMLType;\n"
"_res := XMLType (_src, _schema, _validated, _wellformed);\n"
"return _res;\n"
"}\n"
-"--src system.sql:4549\n";
+"--src system.sql:4551\n";
static const char *other77 =
"grant execute on XMLType to public\n";
static const char *proc77 =
-"#line 4563 \"[executable]/system.sql\"\n"
+"#line 4565 \"[executable]/system.sql\"\n"
" create procedure DB.DBA.SYS_CREATE_XML_SCHEMA (in _txt varchar)\n"
"{\n"
"declare _log varchar;\n"
@@ -4265,10 +4267,10 @@ static const char *proc77 =
"insert into SYS_CACHED_RESOURCES (CRES_URI, CRES_CONTENT)\n"
"values (_cres_uri, _txt);\n"
"}\n"
-"--src system.sql:4561\n";
+"--src system.sql:4563\n";
static const char *proc78 =
-"#line 4590 \"[executable]/system.sql\"\n"
+"#line 4592 \"[executable]/system.sql\"\n"
" create procedure DB.DBA.XML_COLUMN_SCHEMA_VALIDATE (\n"
"in _table varchar, in _column varchar, in _xml any,\n"
"in _xsd_uri varchar, in _top_name varchar, in _dtd_cfg varchar)\n"
@@ -4287,10 +4289,10 @@ static const char *proc78 =
"\n"
"return null;\n"
"}\n"
-"--src system.sql:4588\n";
+"--src system.sql:4590\n";
static const char *proc79 =
-"#line 4611 \"[executable]/system.sql\"\n"
+"#line 4613 \"[executable]/system.sql\"\n"
" create function SYS_TREE_OF_ARRAYS_CONTAINS (in _haystack any, in _needle any)\n"
"{\n"
"declare _ctr integer;\n"
@@ -4307,10 +4309,10 @@ static const char *proc79 =
"}\n"
"return 0;\n"
"}\n"
-"--src system.sql:4609\n";
+"--src system.sql:4611\n";
static const char *proc80 =
-"#line 4630 \"[executable]/system.sql\"\n"
+"#line 4632 \"[executable]/system.sql\"\n"
" create procedure DB.DBA.SYS_DROP_XML_SCHEMA (in _target_ns varchar)\n"
"{\n"
"declare _log varchar;\n"
@@ -4326,10 +4328,10 @@ static const char *proc80 =
"signal (\'XSD01\', sprintf (\'Can not DROP XML SCHEMA \"%s\" because the schema is in use in constraint of table %s\', _target_ns, C_TABLE));\n"
"delete from SYS_CACHED_RESOURCES where CRES_URI =_cres_uri;\n"
"}\n"
-"--src system.sql:4628\n";
+"--src system.sql:4630\n";
static const char *proc81 =
-"#line 4648 \"[executable]/system.sql\"\n"
+"#line 4650 \"[executable]/system.sql\"\n"
" create procedure REGEXP_LIKE (in source_string any, in pattern any, in match_parameter integer := null)\n"
"returns integer\n"
"{\n"
@@ -4346,109 +4348,88 @@ static const char *proc81 =
"}\n"
"return either (isnull (regexp_match (pattern, source_string)), 0, 1);\n"
"}\n"
-"--src system.sql:4646\n";
+"--src system.sql:4648\n";
static const char *proc82 =
-"#line 4668 \"[executable]/system.sql\"\n"
+"#line 4670 \"[executable]/system.sql\"\n"
" create procedure REGEXP_REPLACE (in source_string any, in pattern any,\n"
"in replace_string varchar := \'\', in position integer := 1,\n"
-"in occurrence any := 1, in match_parameter integer := null)\n"
+"in occurrence integer := 0, in match_parameter varchar := null)\n"
"{\n"
+"declare hit_list any;\n"
+"declare res, res_cs varchar;\n"
"if (source_string is null or pattern is null or replace_string is null)\n"
"return source_string;\n"
+"if (match_parameter is null)\n"
+"match_parameter := \'\';\n"
+"if (iswidestring (source_string) or iswidestring (pattern) or iswidestring (replace_string))\n"
+"{\n"
+"if (iswidestring (source_string))\n"
+"source_string := charset_recode (source_string, \'_WIDE_\', \'UTF-8\');\n"
"else\n"
"{\n"
-"if ((not isstring (source_string)) and (not iswidestring (source_string)))\n"
+"if (isstring (source_string))\n"
+"source_string := charset_recode (source_string, null, \'UTF-8\');\n"
+"else\n"
"source_string := cast (source_string as varchar);\n"
-"if ((not isstring (pattern)) and (not iswidestring (pattern)))\n"
-"pattern := cast (pattern as varchar);\n"
-"if ((not isstring (replace_string)) and (not iswidestring (replace_string)))\n"
-"replace_string := cast (replace_string as varchar);\n"
"}\n"
-"\n"
-"if (match_parameter is not null)\n"
-"signal (\'22023\', \'match_parameter not supported yet\', \'SR372\');\n"
-"declare cur_pos, copied_up_to, nth integer;\n"
-"declare ret any;\n"
-"\n"
-"ret := either (iswidestring (source_string), N\'\', \'\');\n"
-"cur_pos := position - 1;\n"
-"copied_up_to := position - 1;\n"
-"nth := 1;\n"
-"\n"
-"while (cur_pos < length (source_string))\n"
-"{\n"
-"declare exprs any;\n"
-"\n"
-"exprs := regexp_parse (pattern, source_string, cur_pos);\n"
-"\n"
-"if (not isarray (exprs))\n"
-"goto done;\n"
-"\n"
-"declare start_inx, end_inx integer;\n"
-"start_inx := exprs[0];\n"
-"end_inx := exprs[1];\n"
-"\n"
-"if (occurrence is null or occurrence = nth)\n"
-"{\n"
-"if (start_inx > copied_up_to)\n"
-"ret := concat (ret, subseq (source_string, copied_up_to, start_inx));\n"
-"\n"
-"if (length (exprs) > 2)\n"
-"{\n"
-"declare expr_inx integer;\n"
-"declare replace_str any;\n"
-"declare replace_string_tmp any;\n"
-"replace_string_tmp := replace_string;\n"
-"expr_inx := 1;\n"
-"\n"
-"while (expr_inx * 2 < length (exprs))\n"
+"if (iswidestring (pattern))\n"
+"pattern := charset_recode (pattern, \'_WIDE_\', \'UTF-8\');\n"
+"else\n"
"{\n"
-"declare replace_str_found varchar;\n"
-"\n"
-"if (exprs[expr_inx * 2] >= 0 and exprs[expr_inx * 2 + 1] >= 0)\n"
-"replace_str_found := subseq (source_string, exprs[expr_inx * 2], exprs [expr_inx * 2 + 1]);\n"
+"if (isstring (pattern))\n"
+"pattern := charset_recode (pattern, null, \'UTF-8\');\n"
"else\n"
-"replace_str_found := either (iswidestring (source_string), N\'\', \'\');\n"
-"\n"
-"replace_str := sprintf (\'\\\\%d\', expr_inx);\n"
-"if (iswidestring (source_string))\n"
-"replace_str := cast (replace_str as nvarchar);\n"
-"replace_string_tmp := replace (replace_string_tmp, replace_str,\n"
-"replace_str_found);\n"
-"expr_inx := expr_inx + 1;\n"
+"pattern := cast (pattern as varchar);\n"
"}\n"
-"while (expr_inx < 10)\n"
+"if (iswidestring (replace_string))\n"
+"replace_string := charset_recode (replace_string, \'_WIDE_\', \'UTF-8\');\n"
+"else\n"
"{\n"
-"replace_str := sprintf (\'\\\\%d\', expr_inx);\n"
-"if (iswidestring (source_string))\n"
-"replace_str := cast (replace_str as nvarchar);\n"
-"replace_string_tmp := replace (replace_string_tmp, replace_str,\n"
-"either (iswidestring (source_string), N\'\', \'\'));\n"
-"expr_inx := expr_inx + 1;\n"
+"if (isstring (replace_string))\n"
+"replace_string := charset_recode (replace_string, null, \'UTF-8\');\n"
+"else\n"
+"replace_string := cast (replace_string as varchar);\n"
"}\n"
-"ret := concat (ret, replace_string_tmp);\n"
+"if (strchr (match_parameter, \'u\') is null and strchr (match_parameter, \'U\') is null)\n"
+"match_parameter := match_parameter || \'u\';\n"
+"res_cs := \'_WIDE_\';\n"
"}\n"
"else\n"
-"ret := concat (ret, replace_string);\n"
-"copied_up_to := end_inx;\n"
-"if (occurrence is not null)\n"
-"goto done;\n"
+"{\n"
+"if (not isstring (source_string)) source_string := cast (source_string as varchar);\n"
+"if (not isstring (pattern)) pattern := cast (pattern as varchar);\n"
+"if (not isstring (replace_string)) replace_string := cast (replace_string as varchar);\n"
+"res_cs := \'\';\n"
"}\n"
-"\n"
-"nth := nth + 1;\n"
-"cur_pos := end_inx;\n"
+"if (0 = length (source_string))\n"
+"return subseq (source_string, 0, 0);\n"
+"if (occurrence is null)\n"
+"occurrence := 0;\n"
+"if (regexp_parse (pattern, \'\', 0, match_parameter) is not null)\n"
+"signal (\'22023\', \'The REGEXP_REPLACE() function can not search for a pattern that can be found even in an empty string\');\n"
+"if (0 = occurrence)\n"
+"{\n"
+"hit_list := regexp_parse_list (pattern, source_string, position-1, match_parameter, 2097152);\n"
+"if (0 = length (hit_list))\n"
+"return source_string;\n"
"}\n"
-"done:\n"
-"if (copied_up_to < length (source_string))\n"
-"ret := concat (ret, subseq (source_string, copied_up_to, length (source_string)));\n"
-"\n"
-"return ret;\n"
+"else\n"
+"{\n"
+"hit_list := regexp_parse_list (pattern, source_string, position-1, match_parameter, occurrence);\n"
+"if (length (hit_list) < occurrence)\n"
+"return source_string;\n"
+"hit_list := vector (hit_list[occurrence-1]);\n"
+"}\n"
+"res := regexp_replace_hits_with_template (source_string, replace_string, hit_list, 0);\n"
+"if (res_cs = \'_WIDE_\')\n"
+"return charset_recode (res, \'UTF-8\', \'_WIDE_\');\n"
+"return res;\n"
"}\n"
-"--src system.sql:4666\n";
+"--src system.sql:4668\n";
static const char *proc83 =
-"#line 4767 \"[executable]/system.sql\"\n"
+"#line 4748 \"[executable]/system.sql\"\n"
" create procedure REGEXP_INSTR (in source_string varchar, in pattern varchar,\n"
"in start_position integer := 1, in occurrence integer := 1, in return_option integer := 0,\n"
"in match_parameter integer := null)\n"
@@ -4502,10 +4483,10 @@ static const char *proc83 =
"\n"
"return null;\n"
"}\n"
-"--src system.sql:4765\n";
+"--src system.sql:4746\n";
static const char *proc84 =
-"#line 4823 \"[executable]/system.sql\"\n"
+"#line 4804 \"[executable]/system.sql\"\n"
" create procedure HTTP_REQUESTED_URL ()\n"
"{\n"
"declare hf, pat, proto, meth, so, eo, lines any;\n"
@@ -4521,20 +4502,20 @@ static const char *proc84 =
"hf := rfc1808_parse_uri (pat);\n"
"return WS.WS.EXPAND_URL(soap_current_url (), hf[2]);\n"
"}\n"
-"--src system.sql:4821\n";
+"--src system.sql:4802\n";
static const char *proc85 =
-"#line 4841 \"[executable]/system.sql\"\n"
+"#line 4822 \"[executable]/system.sql\"\n"
" create procedure HTTP_URL_HANDLER ()\n"
"{\n"
"if (not is_http_ctx())\n"
"signal (\'22023\', \'http_url_handler function outside of http context\', \'HT068\');\n"
"return WS.WS.EXPAND_URL(soap_current_url (), http_path());\n"
"}\n"
-"--src system.sql:4839\n";
+"--src system.sql:4820\n";
static const char *proc86 =
-"#line 4851 \"[executable]/system.sql\"\n"
+"#line 4832 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.SCHEDULER_NOTIFY ()\n"
"{\n"
"declare arr, err_text, current_rec, mime_parts, hdrs, hostname any;\n"
@@ -4598,10 +4579,10 @@ static const char *proc86 =
"smtp_send (null, current_rec, current_rec, concat (hdrs, DB.DBA.MIME_BODY (mime_parts)));\n"
"}\n"
"}\n"
-"--src system.sql:4849\n";
+"--src system.sql:4830\n";
static const char *proc87 =
-"#line 4917 \"[executable]/system.sql\"\n"
+"#line 4898 \"[executable]/system.sql\"\n"
"create procedure\n"
"SYS_CHECK_OLD_BLOG ()\n"
"{\n"
@@ -4618,12 +4599,12 @@ static const char *proc87 =
"log_message (\'Detected old blog instance. Please update it with latest blog.vad\');\n"
"}\n"
"}\n"
-"--src system.sql:4915\n";
+"--src system.sql:4896\n";
static const char *other78 =
"SYS_CHECK_OLD_BLOG ()\n";
static const char *proc88 =
-"#line 4940 \"[executable]/system.sql\"\n"
+"#line 4921 \"[executable]/system.sql\"\n"
" create procedure\n"
"HTTP_GET_HOST ()\n"
"{\n"
@@ -4641,28 +4622,28 @@ static const char *proc88 =
"ret := sys_stat (\'st_host_name\')||\':\'||server_http_port ();\n"
"return ret;\n"
"}\n"
-"--src system.sql:4938\n";
+"--src system.sql:4919\n";
static const char *proc89 =
-"#line 4960 \"[executable]/system.sql\"\n"
+"#line 4941 \"[executable]/system.sql\"\n"
" create procedure\n"
"date_rfc1123 (in dt datetime)\n"
"{\n"
"return soap_print_box (dt, \'\', 1);\n"
"}\n"
-"--src system.sql:4958\n";
+"--src system.sql:4939\n";
static const char *proc90 =
-"#line 4968 \"[executable]/system.sql\"\n"
+"#line 4949 \"[executable]/system.sql\"\n"
" create procedure\n"
"date_iso8601 (in dt datetime)\n"
"{\n"
"return soap_print_box (dt, \'\', 0);\n"
"}\n"
-"--src system.sql:4966\n";
+"--src system.sql:4947\n";
static const char *proc91 =
-"#line 4975 \"[executable]/system.sql\"\n"
+"#line 4956 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.INSTALLER_VAD (in _pak_name varchar)\n"
"{\n"
"declare state, msg, m_dta, res any;\n"
@@ -4697,10 +4678,10 @@ static const char *proc91 =
"string_to_file (\'../vad/install.res\', out_message, -2);\n"
"return;\n"
"}\n"
-"--src system.sql:4973\n";
+"--src system.sql:4954\n";
static const char *proc92 =
-"#line 5011 \"[executable]/system.sql\"\n"
+"#line 4992 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.VACUUM (in table_name varchar := \'%\', in index_name varchar := \'%\')\n"
"{\n"
"declare stmt, stat, msg varchar;\n"
@@ -4723,10 +4704,10 @@ static const char *proc92 =
"}\n"
"}\n"
"}\n"
-"--src system.sql:5009\n";
+"--src system.sql:4990\n";
static const char *proc93 =
-"#line 5037 \"[executable]/system.sql\"\n"
+"#line 5018 \"[executable]/system.sql\"\n"
"create procedure tc_result (in n varchar, in is_cl int := 0)\n"
"{\n"
"declare r int;\n"
@@ -4741,10 +4722,10 @@ static const char *proc93 =
"return;\n"
"result (r, n);\n"
"}\n"
-"--src system.sql:5035\n";
+"--src system.sql:5016\n";
static const char *proc94 =
-"#line 5053 \"[executable]/system.sql\"\n"
+"#line 5034 \"[executable]/system.sql\"\n"
"create procedure tc_stat (in is_cl int := 0)\n"
"{\n"
"declare cond varchar (60);\n"
@@ -4845,10 +4826,10 @@ static const char *proc94 =
"tc_result (\'tc_cl_kill_1pc\', is_cl);\n"
"tc_result (\'tc_cl_kill_2pc\', is_cl);\n"
"}\n"
-"--src system.sql:5051\n";
+"--src system.sql:5032\n";
static const char *proc95 =
-"#line 5155 \"[executable]/system.sql\"\n"
+"#line 5136 \"[executable]/system.sql\"\n"
"create procedure cl_exec_srv (in str varchar, in params any)\n"
"{\n"
"declare st, msg varchar;\n"
@@ -4856,10 +4837,10 @@ static const char *proc95 =
"exec (str, st, msg, params);\n"
"if (st <> \'00000\') signal (st, msg);\n"
"}\n"
-"--src system.sql:5153\n";
+"--src system.sql:5134\n";
static const char *proc96 =
-"#line 5165 \"[executable]/system.sql\"\n"
+"#line 5146 \"[executable]/system.sql\"\n"
"create procedure daq_results (in daq any)\n"
"{\n"
"declare r any;\n"
@@ -4878,10 +4859,10 @@ static const char *proc96 =
"}\n"
"}\n"
"}\n"
-"--src system.sql:5163\n";
+"--src system.sql:5144\n";
static const char *proc97 =
-"#line 5186 \"[executable]/system.sql\"\n"
+"#line 5167 \"[executable]/system.sql\"\n"
"create procedure cl_all_hosts ()\n"
"{\n"
"declare map, inx, hosts any;\n"
@@ -4894,10 +4875,10 @@ static const char *proc97 =
"}\n"
"return hosts;\n"
"}\n"
-"--src system.sql:5184\n";
+"--src system.sql:5165\n";
static const char *proc98 =
-"#line 5200 \"[executable]/system.sql\"\n"
+"#line 5181 \"[executable]/system.sql\"\n"
"create procedure cl_exec (in str varchar, in params any := null, in txn int := 0, in hosts any := null, in delay float := null, in best_effort int := 0,\n"
"in control int := 0, in as_read int := 0)\n"
"{\n"
@@ -4937,20 +4918,20 @@ static const char *proc98 =
"daq_call (d, \'__ALL\', hosts, \'DB.DBA.CL_EXEC_SRV\', vector (str, params), flags);\n"
"daq_results (d);\n"
"}\n"
-"--src system.sql:5198\n";
+"--src system.sql:5179\n";
static const char *proc99 =
-"#line 5241 \"[executable]/system.sql\"\n"
+"#line 5222 \"[executable]/system.sql\"\n"
"create procedure CL_STAT_SRV (in x varchar, in k varchar, in fl varchar)\n"
"{\n"
"if (k is not null)\n"
"return key_stat (x, k, fl);\n"
"return sys_stat (x);\n"
"}\n"
-"--src system.sql:5239\n";
+"--src system.sql:5220\n";
static const char *proc100 =
-"#line 5250 \"[executable]/system.sql\"\n"
+"#line 5231 \"[executable]/system.sql\"\n"
"create procedure daq_next_or_error (in daq any)\n"
"{\n"
"declare r, err any;\n"
@@ -4967,10 +4948,10 @@ static const char *proc100 =
"\n"
"return r[2][1];\n"
"}\n"
-"--src system.sql:5248\n";
+"--src system.sql:5229\n";
static const char *proc101 =
-"#line 5268 \"[executable]/system.sql\"\n"
+"#line 5249 \"[executable]/system.sql\"\n"
"create procedure cl_sys_stat (in x varchar, in k varchar := null, in fl varchar := null)\n"
"{\n"
"declare daq, r any;\n"
@@ -4997,38 +4978,38 @@ static const char *proc101 =
"}\n"
"return s;\n"
"}\n"
-"--src system.sql:5266\n";
+"--src system.sql:5247\n";
static const char *proc102 =
-"#line 5296 \"[executable]/system.sql\"\n"
+"#line 5277 \"[executable]/system.sql\"\n"
"create procedure IF_CLUSTER (in str varchar)\n"
"{\n"
"if (sys_stat (\'cl_run_local_only\') <> 2) return;\n"
"str := trim (str, \';\');\n"
"exec (str);\n"
"}\n"
-"--src system.sql:5294\n";
+"--src system.sql:5275\n";
static const char *proc103 =
-"#line 5304 \"[executable]/system.sql\"\n"
+"#line 5285 \"[executable]/system.sql\"\n"
"create procedure IF_NO_CLUSTER (in str varchar)\n"
"{\n"
"if (sys_stat (\'cl_run_local_only\') = 2) return;\n"
"str := trim (str, \';\');\n"
"exec (str);\n"
"}\n"
-"--src system.sql:5302\n";
+"--src system.sql:5283\n";
static const char *proc104 =
-"#line 5313 \"[executable]/system.sql\"\n"
+"#line 5294 \"[executable]/system.sql\"\n"
"create procedure CL_START_SRV ()\n"
"{\n"
"return sys_stat (\'db_exists\');\n"
"}\n"
-"--src system.sql:5311\n";
+"--src system.sql:5292\n";
static const char *proc105 =
-"#line 5319 \"[executable]/system.sql\"\n"
+"#line 5300 \"[executable]/system.sql\"\n"
"create procedure cl_init_seqs ()\n"
"{\n"
"\n"
@@ -5050,10 +5031,10 @@ static const char *proc105 =
"}\n"
"commit work;\n"
"}\n"
-"--src system.sql:5317\n";
+"--src system.sql:5298\n";
static const char *proc106 =
-"#line 5343 \"[executable]/system.sql\"\n"
+"#line 5324 \"[executable]/system.sql\"\n"
"create procedure cl_reset_seqs ()\n"
"{\n"
"\n"
@@ -5070,10 +5051,10 @@ static const char *proc106 =
"}\n"
"rdf_seq_init_srv ();\n"
"}\n"
-"--src system.sql:5341\n";
+"--src system.sql:5322\n";
static const char *proc107 =
-"#line 5361 \"[executable]/system.sql\"\n"
+"#line 5342 \"[executable]/system.sql\"\n"
"create procedure cl_new_db ()\n"
"{\n"
"cl_init_seqs ();\n"
@@ -5086,10 +5067,10 @@ static const char *proc107 =
"WS.WS.SYS_DAV_INIT ();\n"
"cl_exec (\'checkpoint\');\n"
"}\n"
-"--src system.sql:5359\n";
+"--src system.sql:5340\n";
static const char *proc108 =
-"#line 5376 \"[executable]/system.sql\"\n"
+"#line 5357 \"[executable]/system.sql\"\n"
"create procedure cl_node_started ()\n"
"{\n"
"if (sys_stat (\'cl_run_local_only\') = 1)\n"
@@ -5111,10 +5092,10 @@ static const char *proc108 =
"}\n"
"}\n"
"}\n"
-"--src system.sql:5374\n";
+"--src system.sql:5355\n";
static const char *proc109 =
-"#line 5400 \"[executable]/system.sql\"\n"
+"#line 5381 \"[executable]/system.sql\"\n"
"create procedure ddl_ren_k_new_name (in kn varchar, in o varchar, in n varchar)\n"
"{\n"
"if (name_part (kn, 2) = name_part (o, 2))\n"
@@ -5122,19 +5103,19 @@ static const char *proc109 =
"else\n"
"return kn;\n"
"}\n"
-"--src system.sql:5398\n";
+"--src system.sql:5379\n";
static const char *proc110 =
-"#line 5410 \"[executable]/system.sql\"\n"
+"#line 5391 \"[executable]/system.sql\"\n"
"create procedure DB.DBA.DDL_TABLE_RENAMED (in o varchar, in n varchar)\n"
"{\n"
"__ddl_table_renamed (o, n);\n"
"log_text (\'__ddl_table_renamed (?, ?)\', o, n);\n"
"}\n"
-"--src system.sql:5408\n";
+"--src system.sql:5389\n";
static const char *proc111 =
-"#line 5418 \"[executable]/system.sql\"\n"
+"#line 5399 \"[executable]/system.sql\"\n"
"create procedure rename_table (in n varchar, in o varchar)\n"
"{\n"
"if (exists (select 1 from SYS_KEYS where KEY_TABLE = n)) {\n"
@@ -5165,10 +5146,10 @@ static const char *proc111 =
"where PART_TABLE = o;\n"
"cl_exec (\'DB.DBA.ddl_table_renamed (?, ?)\', vector (o, n), txn => 1);\n"
"}\n"
-"--src system.sql:5416\n";
+"--src system.sql:5397\n";
static const char *proc112 =
-"#line 5451 \"[executable]/system.sql\"\n"
+"#line 5432 \"[executable]/system.sql\"\n"
"create procedure VT_GET_CLUSTER (in tablename varchar, in k varchar)\n"
"{\n"
"declare ret any;\n"
@@ -5180,10 +5161,10 @@ static const char *proc112 =
"return \'\';\n"
"return \' cluster \' || ret;\n"
"}\n"
-"--src system.sql:5449\n";
+"--src system.sql:5430\n";
static const char *proc113 =
-"#line 5464 \"[executable]/system.sql\"\n"
+"#line 5445 \"[executable]/system.sql\"\n"
"create procedure VT_GET_CLUSTER_COL_OPTS (in tablename varchar, in k varchar, in col varchar)\n"
"{\n"
"declare opts, ret any;\n"
@@ -5216,10 +5197,10 @@ static const char *proc113 =
"}\n"
"return ret;\n"
"}\n"
-"--src system.sql:5462\n";
+"--src system.sql:5443\n";
static const char *proc114 =
-"#line 5498 \"[executable]/system.sql\"\n"
+"#line 5479 \"[executable]/system.sql\"\n"
"create procedure\n"
"DB.DBA.SYS_SQL_VECTOR_PRINT (in in_vector any)\n"
"{\n"
@@ -5242,16 +5223,20 @@ static const char *proc114 =
"}\n"
"return (res);\n"
"}\n"
-"--src system.sql:5496\n";
+"--src system.sql:5477\n";
static const char *proc115 =
-"#line 5522 \"[executable]/system.sql\"\n"
+"#line 5503 \"[executable]/system.sql\"\n"
"create procedure\n"
"DB.DBA.SYS_SQL_VAL_PRINT (in v any)\n"
"{\n"
"\n"
-"if (isstring (v))\n"
+"if (isstring (v) or __tag (v) = 183 or __tag (v) = 127)\n"
"return sprintf (\'\\\'%S\\\'\', replace (v, \'\\\\\', \'\\\\\\\\\'));\n"
+"else if (iswidestring (v))\n"
+"return sprintf (\'\\\'%S\\\'\', replace (charset_recode (v, \'_WIDE_\', \'UTF-8\'), \'\\\\\', \'\\\\\\\\\'));\n"
+"else if (__tag (v) = 230)\n"
+"return sprintf (\'\\\'%S\\\'\', replace (serialize_to_UTF8_xml (v), \'\\\\\', \'\\\\\\\\\'));\n"
"else if (v is null)\n"
"return \'NULL\';\n"
"else if (isinteger (v))\n"
@@ -5264,13 +5249,19 @@ static const char *proc115 =
"{\n"
"return concat (\'vector (\',SYS_SQL_VECTOR_PRINT (v),\')\');\n"
"}\n"
+"else if (__tag (v) = 255)\n"
+"return \'<tag 255>\';\n"
+"else if (__tag (v) = 211)\n"
+"{\n"
+"return sprintf (\'stringdate (%s)\', SYS_SQL_VAL_PRINT (datestring (v)));\n"
+"}\n"
"else\n"
"signal (\'22023\', sprintf(\'Unsupported type %d\', __tag (v)));\n"
"}\n"
-"--src system.sql:5520\n";
+"--src system.sql:5501\n";
static const char *proc116 =
-"#line 5548 \"[executable]/system.sql\"\n"
+"#line 5539 \"[executable]/system.sql\"\n"
"create procedure view_from_tbl (in _dir varchar, in _tbls any)\n"
"{\n"
"declare create_class_stmt, create_view_stmt, prefix, ns, uriqa_str, ret any;\n"
@@ -5304,10 +5295,10 @@ static const char *proc116 =
"\n"
"return ret;\n"
"}\n"
-"--src system.sql:5546\n";
+"--src system.sql:5537\n";
static const char *proc117 =
-"#line 5584 \"[executable]/system.sql\"\n"
+"#line 5575 \"[executable]/system.sql\"\n"
"create procedure view_create_view (in _tbls any, in _dir varchar)\n"
"{\n"
"declare ret, qual, qual_l, tbl_name, tbl_name_l, pks, pk_text, uriqa_str any;\n"
@@ -5395,30 +5386,30 @@ static const char *proc117 =
"return ret;\n"
"\n"
"}\n"
-"--src system.sql:5582\n";
+"--src system.sql:5573\n";
static const char *proc118 =
-"#line 5673 \"[executable]/system.sql\"\n"
+"#line 5664 \"[executable]/system.sql\"\n"
"create procedure view_dv_to_printf_str_type (in _dv varchar)\n"
"{\n"
"if (_dv = 189 or _dv = 188) return \'%d\';\n"
"if (_dv = 182) return \'%U\';\n"
"signal (\'XXXXX\', sprintf (\'Unknown DV %i in view_dv_to_printf_str_type\', _dv));\n"
"}\n"
-"--src system.sql:5671\n";
+"--src system.sql:5662\n";
static const char *proc119 =
-"#line 5681 \"[executable]/system.sql\"\n"
+"#line 5672 \"[executable]/system.sql\"\n"
"create procedure view_dv_to_sql_str_type (in _dv varchar)\n"
"{\n"
"if (_dv = 189 or _dv = 188) return \'integer\';\n"
"if (_dv = 182) return \'varchar\';\n"
"signal (\'XXXXX\', sprintf (\'Unknown DV %i\', _dv));\n"
"}\n"
-"--src system.sql:5679\n";
+"--src system.sql:5670\n";
static const char *proc120 =
-"#line 5689 \"[executable]/system.sql\"\n"
+"#line 5680 \"[executable]/system.sql\"\n"
"create procedure view_create_class (in _tbl varchar, in _host varchar, in _f varchar)\n"
"{\n"
"declare ret, qual, tbl_name, tbl_name_l, pks, pk_text, sk_len any;\n"
@@ -5450,26 +5441,26 @@ static const char *proc120 =
"\n"
"return ret;\n"
"}\n"
-"--src system.sql:5687\n";
+"--src system.sql:5678\n";
static const char *proc121 =
-"#line 5722 \"[executable]/system.sql\"\n"
+"#line 5713 \"[executable]/system.sql\"\n"
"create procedure view_get_primary_key (in _tbl varchar)\n"
"{\n"
"return DB.DBA.REPL_PK_COLS (_tbl);\n"
"}\n"
-"--src system.sql:5720\n";
+"--src system.sql:5711\n";
static const char *proc122 =
-"#line 5728 \"[executable]/system.sql\"\n"
+"#line 5719 \"[executable]/system.sql\"\n"
"create procedure view_get_pk (in _tbl varchar)\n"
"{\n"
"return DB.DBA.REPL_PK_COLS (_tbl)[0][0];\n"
"}\n"
-"--src system.sql:5726\n";
+"--src system.sql:5717\n";
static const char *proc123 =
-"#line 5734 \"[executable]/system.sql\"\n"
+"#line 5725 \"[executable]/system.sql\"\n"
"create procedure view_get_where_from_foreign_key (in _tbls varchar, in _suff varchar)\n"
"{\n"
"declare ret, tbl any;\n"
@@ -5496,10 +5487,10 @@ static const char *proc123 =
"\n"
"return ret;\n"
"}\n"
-"--src system.sql:5732\n";
+"--src system.sql:5723\n";
static const char *proc124 =
-"#line 5765 \"[executable]/system.sql\"\n"
+"#line 5756 \"[executable]/system.sql\"\n"
"create procedure text_est_text (in tb varchar)\n"
"{\n"
"declare temp, ic, tc varchar;\n"
@@ -5532,10 +5523,10 @@ static const char *proc124 =
"nf:\n"
"signal (\'22023\', \'The table has no text index.\');\n"
"}\n"
-"--src system.sql:5763\n";
+"--src system.sql:5754\n";
static const char *proc125 =
-"#line 5802 \"[executable]/system.sql\"\n"
+"#line 5793 \"[executable]/system.sql\"\n"
"create procedure CL_RANGE_WORDS_SRV (in l varchar, in h varchar, in mask varchar, in tb varchar)\n"
"{\n"
"declare md, res, msg, st any;\n"
@@ -5545,10 +5536,10 @@ static const char *proc125 =
"if (st <> \'00000\') signal (st, msg);\n"
"return res;\n"
"}\n"
-"--src system.sql:5800\n";
+"--src system.sql:5791\n";
static const char *proc126 =
-"#line 5813 \"[executable]/system.sql\"\n"
+"#line 5804 \"[executable]/system.sql\"\n"
"create procedure cl_range_words (in tb varchar, in l varchar, in h varchar, in mask varchar)\n"
"{\n"
"declare daq, r, d any;\n"
@@ -5569,7 +5560,7 @@ static const char *proc126 =
"}\n"
"return dict_list_keys (d, 2);\n"
"}\n"
-"--src system.sql:5811\n";
+"--src system.sql:5802\n";
static const char *tbl5 =
"create table SYS_HTTP_CLIENT_CACHE (\n"
@@ -5599,17 +5590,17 @@ static const char *view0 =
static const char *other79 =
"grant select on DB.DBA.TABLE_COLS to public\n";
static const char *proc127 =
-"#line 5863 \"[executable]/system.sql\"\n"
+"#line 5854 \"[executable]/system.sql\"\n"
"create procedure csv_load_file (in f varchar, in _from int := 0, in _to int := null, in tb varchar := null, in log_mode int := 2, in opts any := null)\n"
"{\n"
"declare s any;\n"
"s := file_open (f);\n"
"return csv_load (s, _from, _to, tb, log_mode, opts);\n"
"}\n"
-"--src system.sql:5861\n";
+"--src system.sql:5852\n";
static const char *proc128 =
-"#line 5871 \"[executable]/system.sql\"\n"
+"#line 5862 \"[executable]/system.sql\"\n"
"create procedure csv_load (in s any, in _from int := 0, in _to int := null, in tb varchar := null, in log_mode int := 2, in opts any := null)\n"
"{\n"
"declare r, log_ses any;\n"
@@ -5678,10 +5669,10 @@ static const char *proc128 =
"return vector (nrows, log_ses);\n"
"return nrows;\n"
"}\n"
-"--src system.sql:5869\n";
+"--src system.sql:5860\n";
static const char *proc129 =
-"#line 5941 \"[executable]/system.sql\"\n"
+"#line 5932 \"[executable]/system.sql\"\n"
"create procedure csv_parse (in s any, in cb varchar, inout cbd any, in _from int := 0, in _to int := null, in opts any := null)\n"
"{\n"
"declare r any;\n"
@@ -5709,10 +5700,10 @@ static const char *proc129 =
"end_loop:;\n"
"return inx;\n"
"}\n"
-"--src system.sql:5939\n";
+"--src system.sql:5930\n";
static const char *proc130 =
-"#line 5970 \"[executable]/system.sql\"\n"
+"#line 5961 \"[executable]/system.sql\"\n"
"create procedure csv_ins_stmt (in tb varchar, out num_cols int)\n"
"{\n"
"declare ss any;\n"
@@ -5749,10 +5740,10 @@ static const char *proc130 =
"num_cols := length (cols);\n"
"return string_output_string (ss);\n"
"}\n"
-"--src system.sql:5968\n";
+"--src system.sql:5959\n";
static const char *proc131 =
-"#line 6008 \"[executable]/system.sql\"\n"
+"#line 5999 \"[executable]/system.sql\"\n"
"create procedure csv_file_header_check (in f any, in num_to_check int := 10)\n"
"{\n"
"declare h, r, s, i any;\n"
@@ -5768,10 +5759,10 @@ static const char *proc131 =
"}\n"
"return h;\n"
"}\n"
-"--src system.sql:6006\n";
+"--src system.sql:5997\n";
static const char *proc132 =
-"#line 6025 \"[executable]/system.sql\"\n"
+"#line 6016 \"[executable]/system.sql\"\n"
"create procedure csv_table_def (in f varchar)\n"
"{\n"
"declare head any;\n"
@@ -5795,10 +5786,10 @@ static const char *proc132 =
"http (\')\', ss);\n"
"return string_output_string (ss);\n"
"}\n"
-"--src system.sql:6023\n";
+"--src system.sql:6014\n";
static const char *proc133 =
-"#line 6050 \"[executable]/system.sql\"\n"
+"#line 6041 \"[executable]/system.sql\"\n"
"create procedure csv_cols_def (in f varchar)\n"
"{\n"
"declare head any;\n"
@@ -5818,7 +5809,7 @@ static const char *proc133 =
"}\n"
"return vec;\n"
"}\n"
-"--src system.sql:6048\n";
+"--src system.sql:6039\n";
/* system2.sql */
@@ -7361,972 +7352,9 @@ static const char *proc168 =
"}\n"
"--src odbccat.sql:693\n";
-/* 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 =
+static const char *proc169 =
"#line 28 \"[executable]/vt_text.sql\"\n"
"create procedure DB.DBA.execstmt (in stmt varchar, out stat varchar, out msg varchar)\n"
"{\n"
@@ -8340,7 +7368,7 @@ static const char *proc218 =
"}\n"
"--src vt_text.sql:26\n";
-static const char *proc219 =
+static const char *proc170 =
"#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"
@@ -8729,7 +7757,7 @@ static const char *proc219 =
"}\n"
"--src vt_text.sql:38\n";
-static const char *proc220 =
+static const char *proc171 =
"#line 428 \"[executable]/vt_text.sql\"\n"
"create procedure DB.DBA.vt_drop_ftt (in tb varchar, in dbcol varchar)\n"
"{\n"
@@ -8780,11 +7808,11 @@ static const char *proc220 =
"}\n"
"--src vt_text.sql:426\n";
-static const char *other167 =
+static const char *other133 =
"grant execute on DB.DBA.vt_create_text_index to public\n";
/* phrasematch.sql */
-static const char *proc221 =
+static const char *proc172 =
"#line 24 \"[executable]/phrasematch.sql\"\n"
"create procedure AP_EXEC_NO_ERROR (in expr varchar)\n"
"{\n"
@@ -8921,7 +7949,7 @@ static const char *trig5 =
"}\n"
"--src phrasematch.sql:179\n";
-static const char *proc222 =
+static const char *proc173 =
"#line 187 \"[executable]/phrasematch.sql\"\n"
"create procedure DB.DBA.ANN_BOOT()\n"
"{\n"
@@ -8937,7 +7965,7 @@ static const char *proc222 =
"}\n"
"--src phrasematch.sql:185\n";
-static const char *proc223 =
+static const char *proc174 =
"#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"
@@ -9017,7 +8045,7 @@ static const char *proc223 =
"}\n"
"--src phrasematch.sql:199\n";
-static const char *proc224 =
+static const char *proc175 =
"#line 279 \"[executable]/phrasematch.sql\"\n"
"create function ANN_GETID (in what varchar )\n"
"{\n"
@@ -9053,7 +8081,7 @@ static const char *proc224 =
"}\n"
"--src phrasematch.sql:277\n";
-static const char *proc225 =
+static const char *proc176 =
"#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"
@@ -9076,7 +8104,7 @@ static const char *proc225 =
"}\n"
"--src phrasematch.sql:312\n";
-static const char *proc226 =
+static const char *proc177 =
"#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"
@@ -9086,7 +8114,7 @@ static const char *proc226 =
"}\n"
"--src phrasematch.sql:333\n";
-static const char *proc227 =
+static const char *proc178 =
"#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"
@@ -9109,7 +8137,7 @@ static const char *proc227 =
"}\n"
"--src phrasematch.sql:342\n";
-static const char *proc228 =
+static const char *proc179 =
"#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"
@@ -9139,7 +8167,7 @@ static const char *proc228 =
"}\n"
"--src phrasematch.sql:364\n";
-static const char *proc229 =
+static const char *proc180 =
"#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"
@@ -9149,7 +8177,7 @@ static const char *proc229 =
"}\n"
"--src phrasematch.sql:392\n";
-static const char *proc230 =
+static const char *proc181 =
"#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"
@@ -9173,7 +8201,7 @@ static const char *proc230 =
"}\n"
"--src phrasematch.sql:401\n";
-static const char *proc231 =
+static const char *proc182 =
"#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"
@@ -9185,7 +8213,7 @@ static const char *proc231 =
"}\n"
"--src phrasematch.sql:424\n";
-static const char *proc232 =
+static const char *proc183 =
"#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"
@@ -9201,7 +8229,7 @@ static const char *proc232 =
"}\n"
"--src phrasematch.sql:435\n";
-static const char *proc233 =
+static const char *proc184 =
"#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"
@@ -9225,7 +8253,7 @@ static const char *proc233 =
"}\n"
"--src phrasematch.sql:450\n";
-static const char *proc234 =
+static const char *proc185 =
"#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"
@@ -9275,7 +8303,7 @@ static const char *proc234 =
"}\n"
"--src phrasematch.sql:473\n";
-static const char *proc235 =
+static const char *proc186 =
"#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"
@@ -9358,7 +8386,7 @@ static const char *proc235 =
"}\n"
"--src phrasematch.sql:522\n";
-static const char *proc236 =
+static const char *proc187 =
"#line 605 \"[executable]/phrasematch.sql\"\n"
"create procedure DB.DBA.ANN_ZAP ()\n"
"{\n"
@@ -9387,11 +8415,11 @@ static const char *proc236 =
"}\n"
"--src phrasematch.sql:603\n";
-static const char *other168 =
+static const char *other134 =
"AP_EXEC_NO_ERROR (\'DB.DBA.ANN_BOOT()\')\n";
/* hosting.sql */
-static const char *proc237 =
+static const char *proc188 =
"#line 23 \"[executable]/hosting.sql\"\n"
"create procedure WS.WS.GET_CGI_VARS_VECTOR (inout lines any) returns ANY\n"
"{\n"
@@ -9833,102 +8861,16 @@ 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", proc218);
- DEFINE_PROC ("DB.DBA.vt_create_ftt", proc219);
- DEFINE_PROC ("DB.DBA.vt_drop_ftt", proc220);
- ddl_ensure_table ("do this always", other167);
+ 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);
/* phrasematch.sql */
- DEFINE_PROC ("AP_EXEC_NO_ERROR", proc221);
+ DEFINE_PROC ("AP_EXEC_NO_ERROR", proc172);
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);
@@ -9941,26 +8883,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", 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);
+ 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);
/* hosting.sql */
- DEFINE_PROC ("WS.WS.GET_CGI_VARS_VECTOR", proc237);
+ DEFINE_PROC ("WS.WS.GET_CGI_VARS_VECTOR", proc188);
}
diff --git a/libsrc/Wi/sql_code_adm.c b/libsrc/Wi/sql_code_adm.c
index 025cf0f..76bc373 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-2011 OpenLink Software.</P></TD></TR>\');\n"
+"http(\' - Copyright© 1998-2012 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 45c0677..d78a013 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.1 2009/04/18 21:55:15 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sql_code_cache_impl.c b/libsrc/Wi/sql_code_cache_impl.c
index 5f271a8..70ff2b6 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.1 2009/04/18 21:55:15 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sql_code_dav.c b/libsrc/Wi/sql_code_dav.c
index 5608fe5..5afc945 100644
--- a/libsrc/Wi/sql_code_dav.c
+++ b/libsrc/Wi/sql_code_dav.c
@@ -10,6 +10,59 @@ 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"
@@ -25,7 +78,7 @@ static const char *proc0 =
"--src dav.sql:24\n";
static const char *proc1 =
-"#line 42 \"[executable]/dav.sql\"\n"
+"#line 95 \"[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"
@@ -38,16 +91,13 @@ 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"
@@ -72,7 +122,6 @@ 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"
@@ -118,6 +167,17 @@ 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"
@@ -132,10 +192,10 @@ static const char *proc1 =
"}\n"
"http (\'</D:multistatus>\\n\');\n"
"}\n"
-"--src dav.sql:40\n";
+"--src dav.sql:93\n";
static const char *proc2 =
-"#line 153 \"[executable]/dav.sql\"\n"
+"#line 213 \"[executable]/dav.sql\"\n"
"create function WS.WS.PROPFIND_RESPONSE (in lpath varchar,\n"
"in ppath varchar,\n"
"in depth integer,\n"
@@ -148,7 +208,6 @@ static const char *proc2 =
"declare dirlist any;\n"
"declare add_not_found, _this_col integer;\n"
"\n"
-"\n"
"all_prop := 0;\n"
"add_not_found := 1;\n"
"\n"
@@ -244,10 +303,10 @@ static const char *proc2 =
"}\n"
"return 0;\n"
"}\n"
-"--src dav.sql:151\n";
+"--src dav.sql:211\n";
static const char *proc3 =
-"#line 264 \"[executable]/dav.sql\"\n"
+"#line 323 \"[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"
@@ -311,17 +370,18 @@ 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 \'%/\')\n"
+"if (st = \'C\' and href not like \'%/\' and href not like \'%.ics\' and href not like \'%.vcf\')\n"
"href := href || \'/\';\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"
-"href,\n"
-"null, \'UTF-8\' ) );\n"
-"http (\'</D:href>\\n\');\n"
+"parent_col := DAV_SEARCH_ID (href, \'P\');\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 (sprintf (\'<D:href>%V</D:href>\\n\', charset_recode (href, \'UTF-8\', \'_WIDE_\')));\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
"http (\'<D:propstat>\\n\');\n"
"http (\'<D:prop>\\n\');\n"
"ix := 0;\n"
@@ -352,7 +412,7 @@ static const char *proc3 =
"}\n"
"else if (prop = \':getcontenttype\')\n"
"{\n"
-"http (concat(\'<D:getcontenttype>\', mime_type, \'</D:getcontenttype>\\n\'));\n"
+"http (concat(\'<lp0:getcontenttype>\', mime_type, \'</lp0:getcontenttype>\\n\'));\n"
"found_sprop := 1;\n"
"}\n"
"else if (prop = \':getcontentlength\' and st = \'R\')\n"
@@ -360,10 +420,131 @@ 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 (sprintf (\'<C:calendar-home-set xmlns:C=\"urn:ietf:params:xml:ns:caldav\"><D:href>%V</D:href></C:calendar-home-set>\\n\', charset_recode (lpath, \'UTF-8\', \'_WIDE_\')));\n"
+"found_sprop := 1;\n"
+"}\n"
+"else if (prop = \'urn:ietf:params:xml:ns:carddav:addressbook-home-set\')\n"
+"{\n"
+"http (sprintf (\'<C:addressbook-home-set xmlns:C=\"urn:ietf:params:xml:ns:carddav\"><D:href>%V</D:href></C:addressbook-home-set>\\n\', charset_recode (lpath, \'UTF-8\', \'_WIDE_\')));\n"
+"found_sprop := 1;\n"
+"}\n"
+"else if (prop = \':principal-URL\')\n"
+"{\n"
+"http (sprintf (\'<D:principal-URL><D:href>%V</D:href></D:principal-URL>\\n\', charset_recode (lpath, \'UTF-8\', \'_WIDE_\')));\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"
@@ -455,7 +636,7 @@ static const char *proc3 =
"found_cprop := 0;\n"
"prop_raw_val := DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, st, prop1, 0), null);\n"
"if (strchr (prop1, \':\') is not null)\n"
-"goto skip1; \n"
+"goto skip1;\n"
"if (prop_raw_val is not null)\n"
"{\n"
"prop_val := deserialize (prop_raw_val);\n"
@@ -511,7 +692,7 @@ static const char *proc3 =
"prop_raw_val := prp[1];\n"
"prop_val := deserialize (prop_raw_val);\n"
"if (strchr (prop1, \':\') is not null)\n"
-"goto skip2; \n"
+"goto skip2;\n"
"if (isarray (prop_val))\n"
"{\n"
"prop_val := xml_tree_doc (prop_val);\n"
@@ -527,7 +708,7 @@ static const char *proc3 =
"http (concat (\'<V:\',prop1,\'><![CDATA[\', prop_raw_val ,\']]></V:\', prop1,\'>\\n\'));\n"
"else\n"
"http (concat (\'<V:\',prop1,\'/>\\n\'));\n"
-"skip2: \n"
+"skip2:\n"
"prop_idx := prop_idx + 1;\n"
"}\n"
"}\n"
@@ -551,10 +732,10 @@ static const char *proc3 =
"goto next_response;\n"
"\n"
"}\n"
-"--src dav.sql:262\n";
+"--src dav.sql:321\n";
static const char *proc4 =
-"#line 569 \"[executable]/dav.sql\"\n"
+"#line 750 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PROPNAMES (in _body varchar)\n"
"{\n"
"declare prop, propname, allprop, tree, tmp, ret any;\n"
@@ -602,96 +783,133 @@ static const char *proc4 =
"\n"
"return ret;\n"
"}\n"
-"--src dav.sql:567\n";
+"--src dav.sql:748\n";
static const char *proc5 =
-"#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"
+"#line 799 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.CALENDAR_NAMES (in _body varchar)\n"
"{\n"
-"declare _name, _lmask, _prop, _ltype, _lscope, _lown, _ltoken, _tp, _pname varchar;\n"
-"declare _id, _ltimeout, _sc integer;\n"
-"declare c cursor for select COL_NAME, COL_ID from WS.WS.SYS_DAV_COL where COL_ID = DAV_HIDE_ERROR_OR_DET (DAV_SEARCH_PATH (_lmask, \'C\'), null, null);\n"
-"declare r cursor for select RES_NAME, RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _lmask;\n"
-"declare p cursor for select PROP_NAME from WS.WS.SYS_DAV_PROP where PROP_TYPE = _tp and PROP_PARENT_ID = _id;\n"
-"\n"
-"\n"
-"_name := \'\';\n"
-"\n"
-"_prop := aref (prop, 0);\n"
-"if (_prop <> \'propname\')\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"
-"http_request_status (\'HTTP/1.1 501 Not Implemented\');\n"
-"return;\n"
-"}\n"
-"_lmask := http_physical_path ();\n"
-"if (st = \'C\' and aref (_lmask, length (_lmask) - 1) <> ascii (\'/\'))\n"
-"_lmask := concat (_lmask, \'/\');\n"
-"\n"
-"whenever not found goto nf;\n"
-"if (st = \'C\')\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"
-"_tp := \'C\';\n"
-"open c (prefetch 1);\n"
-"fetch c into _name, _id;\n"
-"close c;\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"
-"{\n"
-"_tp := \'R\';\n"
-"open r (prefetch 1);\n"
-"fetch r into _name, _id;\n"
-"close r;\n"
+"ret := vector_concat (ret, vector (name));\n"
"}\n"
-"nf:\n"
-"\n"
-"http_request_status (\'HTTP/1.1 207 Multi-Status\');\n"
-"http_header (\'Content-type: text/xml\\r\\n\');\n"
-"http (\'<?xml version=\"1.0\"?>\\n\');\n"
-"http (\'<D:multistatus xmlns:D=\"DAV:\" xmlns:V=\"http://www.openlinksw.com/virtuoso/webdav/1.0/\">\\n\');\n"
-"http (\'<D:response xmlns:lp0=\"DAV:\" xmlns:i0=\"DAV:\">\\n\');\n"
-"http (\'<D:href>\'); http_dav_url (lpath); http (\'</D:href>\\n\');\n"
-"http (\'<D:propstat>\\n\');\n"
-"http (\'<D:prop>\\n\');\n"
-"if (_prop = \'propname\')\n"
+"}\n"
+"return ret;\n"
+"}\n"
+"--src dav.sql:797\n";
+
+static const char *proc6 =
+"#line 843 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.ADDRESSBOOK_NAMES (in _body varchar)\n"
"{\n"
-"if (st = \'R\')\n"
-"http (\'<D:getcontenttype/>\\n<lp0:getcontentlength/>\\n<lp0:getetag/>\\n\');\n"
-"http (\'<lp0:creationdate/>\\n<lp0:getlastmodified/>\\n\');\n"
-"http (\'<D:lockdiscovery/>\\n<D:supportedlock/>\\n<D:resourcetype/>\\n\');\n"
-"whenever not found goto nfp;\n"
-"open p (prefetch 1);\n"
-"while (1)\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"
-"fetch p into _pname;\n"
-"_sc := strrchr (_pname, \':\');\n"
-"if (_sc is not null)\n"
-"_pname := subseq (_pname, _sc + 1, length(_pname));\n"
-"http (concat (\'<V:\', cast (_pname as varchar),\'/>\\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"
-"nfp:\n"
-"close p;\n"
"}\n"
-"http (\'</D:prop>\\n\');\n"
-"http (\'<D:status>HTTP/1.1 200 OK</D:status>\');\n"
-"http (\'</D:propstat>\\n\');\n"
-"http (\'</D:response>\\n\');\n"
-"http (\'</D:multistatus>\\n\');\n"
+"return ret;\n"
"}\n"
-"--src dav.sql:616\n";
+"--src dav.sql:841\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"
+static const char *proc7 =
+"#line 888 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.REPORT (in path varchar, inout params varchar, in lines varchar)\n"
"{\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"
-"\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"
@@ -705,3236 +923,2854 @@ static const char *proc6 =
"}\n"
"_u_id := null;\n"
"_g_id := null;\n"
-"rc := DAV_AUTHENTICATE_HTTP (id, st, \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
-"\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"
-"return;\n"
-"rc := string_output ();\n"
-"_ses := aref_set_0 (params, 1);\n"
-"_body := string_output_string (_ses);\n"
-"\n"
-"xtree := xml_tree (_body, 0);\n"
-"if (not isarray (xtree))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 400 Bad Request\');\n"
-"return (0);\n"
-"}\n"
-"xte_nodebld_init (acc);\n"
-"\n"
-"if (WS.WS.ISLOCKED (vector_concat (vector (\'\'), path), lines, _u_id))\n"
+"if ((rc = -12) or (rc = -13))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 423 Locked\');\n"
+"http_request_status (\'HTTP/1.1 403 Forbidden\');\n"
"return;\n"
"}\n"
-"\n"
-"http_request_status (\'HTTP/1.1 207 Multi-Status\');\n"
-"http (\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\\n\', rc);\n"
-"http (\'<D:multistatus xmlns:D=\"DAV:\">\\n\', rc);\n"
-"http (\'<D:response>\\n\', rc);\n"
-"http (\'<D:propstat>\\n\', rc);\n"
-"\n"
-"declare xtd, prop_set any;\n"
-"declare i, l integer;\n"
-"\n"
-"xtd := xml_tree_doc (xtree);\n"
-"\n"
-"\n"
-"prop_set := xpath_eval(\'//set/prop/*\',xtd,0);\n"
-"\n"
-"\n"
-"\n"
-"l := length (prop_set);\n"
-"if (l > 0)\n"
-"{\n"
-"i := 0;\n"
-"while (i < l)\n"
-"{\n"
-"declare pa, pn, pns, pv, ps, _prop_name any;\n"
-"pa := prop_set[i];\n"
-"\n"
-"pn := cast (xpath_eval (\'local-name(.)\', pa) as varchar);\n"
-"_prop_name := pn;\n"
-"pns := cast(xpath_eval (\'namespace-uri(.)\', pa) as varchar);\n"
-"\n"
-"ps := string_output ();\n"
-"http_value (pa, null, ps);\n"
-"pv := xml_tree (string_output_string (ps));\n"
-"\n"
-"if (length (pns) > 0)\n"
-"pn := concat (pns, \':\', pn);\n"
-"\n"
-"xte_nodebld_acc (acc, xte_node (xte_head (pn)));\n"
-"\n"
-"if (pns = \'http://www.openlinksw.com/virtuoso/webdav/1.0/\'\n"
-"and _prop_name in (\'virtpermissions\', \'virtowneruid\', \'virtownergid\'))\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 tmp, tmp_id any;\n"
-"tmp := cast (xpath_eval (\'string()\', pa) as varchar);\n"
-"if (_prop_name = \'virtpermissions\')\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 ((tmp like \'__1%\' or tmp like \'_____1%\' or tmp like \'________1%\') and _u_id <> http_dav_uid ())\n"
-"goto skip_perm_update;\n"
-"\n"
-"\n"
-"if (regexp_match (DB.DBA.DAV_REGEXP_PATTERN_FOR_PERM (), tmp) is null)\n"
-"goto skip_perm_update;\n"
-"\n"
-"if (st = \'R\')\n"
-"update WS.WS.SYS_DAV_RES set RES_PERMS = tmp where RES_ID = id;\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"
-"update WS.WS.SYS_DAV_COL set COL_PERMS = tmp where COL_ID = id;\n"
-"\n"
-"skip_perm_update:;\n"
-"}\n"
-"else if (_prop_name = \'virtowneruid\')\n"
+"_props := WS.WS.PROPNAMES (_body);\n"
+"if (isarray (_props) and length (_props) = 1 and (aref (_props, 0) = \'propname\'))\n"
"{\n"
-"tmp_id := (select U_ID from DB.DBA.SYS_USERS where U_NAME = tmp);\n"
-"if (st = \'R\')\n"
-"update WS.WS.SYS_DAV_RES set RES_OWNER = tmp_id where RES_ID = id;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_GROUP = tmp_id where COL_ID = id;\n"
+"WS.WS.CUSTOM_PROP (_lpath, _props, _depth, st);\n"
+"return;\n"
"}\n"
-"else if (_prop_name = \'virtownergid\')\n"
+"http_request_status (\'HTTP/1.1 207 Multi-Status\');\n"
+"if (is_calendar = 1)\n"
"{\n"
-"tmp_id := (select U_ID from DB.DBA.SYS_USERS where U_NAME = tmp);\n"
-"if (st = \'R\')\n"
-"update WS.WS.SYS_DAV_RES set RES_GROUP = tmp_id where RES_ID = id;\n"
-"else\n"
-"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\n"
-"where PROP_NAME = pn and PROP_TYPE = st and PROP_PARENT_ID = id))\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"
-"_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"
-"values (_pid, pn, st, id, serialize(pv[1]));\n"
-"}\n"
-"else\n"
+"if (-13 = WS.WS.REPORT_RESPONSE (cast(prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id))\n"
"{\n"
-"update WS.WS.SYS_DAV_PROP set PROP_VALUE = serialize(pv[1])\n"
-"where PROP_PARENT_ID = id and PROP_TYPE = st and PROP_NAME = pn;\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"
-"i := i + 1;\n"
"}\n"
+"http (\'</D:multistatus>\\n\');\n"
"}\n"
-"\n"
-"prop_set := xpath_eval(\'//remove/prop/*\',xtd,0);\n"
-"\n"
-"l := length (prop_set);\n"
-"if (l > 0)\n"
+"else if (is_addressbook = 1)\n"
"{\n"
-"i := 0;\n"
-"while (i < l)\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"
-"declare pa, pn, pns any;\n"
-"pa := prop_set[i];\n"
-"\n"
-"pn := cast (xpath_eval (\'local-name(.)\', pa) as varchar);\n"
-"pns := cast(xpath_eval (\'namespace-uri(.)\', pa) as varchar);\n"
-"\n"
-"\n"
-"if (length (pns) > 0)\n"
-"pn := concat (pns, \':\', pn);\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"
-"xte_nodebld_acc (acc, xte_node (xte_head (pn)));\n"
-"delete from WS.WS.SYS_DAV_PROP\n"
-"where PROP_PARENT_ID = id and PROP_TYPE = st and PROP_NAME = pn;\n"
-"i := i + 1;\n"
+"http_rewrite ();\n"
+"WS.WS.GET_DAV_AUTH (lines, 0, 1, uname, upwd, _u_id, _g_id, _perms);\n"
+"return;\n"
"}\n"
"}\n"
-"acc := xte_nodebld_final (acc);\n"
-"_proprc := xte_node_from_nodebld (xte_head (\'DAV::prop\'), acc);\n"
-"\n"
-"http_value (xml_tree_doc (_proprc), null, rc);\n"
-"http (\'<D:status>HTTP/1.1 200 OK</D:status>\\n\', rc);\n"
-"http (\'</D:propstat>\\n\', rc);\n"
-"http (\'</D:response>\\n\', rc);\n"
-"http (\'</D:multistatus>\\n\', rc);\n"
-"http_header (\'Content-Type: text/xml\\r\\n\');\n"
-"http (string_output_string (rc));\n"
+"http (\'</D:multistatus>\\n\');\n"
"}\n"
-"--src dav.sql:689\n";
-
-static const char *proc7 =
-"#line 867 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.FINDPARAM (inout params varchar, in pkey varchar)\n"
+"else\n"
"{\n"
-"declare ret any;\n"
-"declare i, l integer;\n"
-"if (pkey is null)\n"
-"return \'\';\n"
-"i := 0; l := length (params);\n"
-"pkey := rtrim (pkey,\': \');\n"
-"while (i < l)\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"
-"ret := http_request_header (vector (params[i]), pkey, NULL, NULL);\n"
-"if (ret is not null)\n"
-"return ret;\n"
-"i := i + 1;\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"
-"return \'\';\n"
"}\n"
-"--src dav.sql:865\n";
+"--src dav.sql:886\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"
+"#line 1043 \"[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 _parent_name varchar;\n"
-"declare _col_id, rc integer;\n"
-"declare _perms varchar;\n"
-"declare _col_parent_id integer;\n"
-"declare uname, upwd varchar;\n"
-"declare _u_id, _g_id integer;\n"
-"declare ses, ses_str any;\n"
-"\n"
-"\n"
-"_col_parent_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'P\'));\n"
-"_col_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
-"_u_id := null;\n"
-"_g_id := null;\n"
-"if (_col_parent_id is not null)\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"
-"\n"
-"rc := DAV_AUTHENTICATE_HTTP (_col_parent_id, \'C\', \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
-"\n"
-"if (rc < 0)\n"
-"return;\n"
-"}\n"
-"ses := aref_set_0 (params, 1);\n"
-"ses_str := string_output_string (ses);\n"
-"if (length (ses_str) > 0)\n"
+"if (ms_date)\n"
"{\n"
-"\n"
-"http_request_status (\'HTTP/1.1 415 Unsupported Media Type\');\n"
-"return;\n"
+"propnames := vector (\':getlastmodified\', \':creationdate\',\n"
+"\':lastaccessed\', \':getcontentlength\', \':resourcetype\', \':supportedlock\');\n"
+"add_not_found := 0;\n"
"}\n"
-"rc := DAV_COL_CREATE_INT (\'/\' || DAV_CONCAT_PATH (path, \'/\'), _perms, null, null, null, null, 1, 0, 1, _u_id, _g_id);\n"
-"\n"
-"if ((not isinteger (rc)) or (rc > 0))\n"
-"{\n"
-"commit work;\n"
-"\n"
-"http_request_status (\'HTTP/1.1 201 Created\');\n"
-"return;\n"
+"else\n"
+"propnames := vector (\':getlastmodified\', \':getcontentlength\', \':resourcetype\');\n"
"}\n"
-"if (rc = -24)\n"
-"return;\n"
-"if (rc = -25)\n"
+"else if (aref (propnames, 0) = \'allprop\')\n"
"{\n"
-"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
-"return;\n"
+"propnames := vector (\':getlastmodified\', \':creationdate\', \':getetag\', \':getcontenttype\',\n"
+"\':getcontentlength\', \':resourcetype\', \':lockdiscovery\', \':supportedlock\');\n"
+"all_prop := 1;\n"
"}\n"
-"if (rc = -8)\n"
+"dirlist := DAV_DIR_LIST_INT (ppath, -1, \'%\', null, null, u_id);\n"
+"if (isinteger (dirlist))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 423 Locked\');\n"
-"return;\n"
-"}\n"
-"if ((rc = -12) or (rc = -13))\n"
+"if (dirlist = -13)\n"
"{\n"
-"http_request_status (\'HTTP/1.1 403 Forbidden\');\n"
-"return;\n"
+"if (u_id > 0)\n"
+"dirlist := vector ();\n"
+"else\n"
+"return dirlist;\n"
"}\n"
-"http_request_status (\'HTTP/1.1 405 Method Not Allowed\');\n"
+"else\n"
+"dirlist := vector ();\n"
"}\n"
-"--src dav.sql:884\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"
-"declare depth integer;\n"
-"declare parent_id integer;\n"
-"declare det, cname varchar;\n"
-"inx := 0;\n"
-"depth := length (path);\n"
-"whenever not found goto not_found;\n"
-"while (inx < depth)\n"
+"if (length (dirlist) = 0)\n"
"{\n"
-"cname := aref (path, inx);\n"
-"select COL_ID, COL_DET into parent_id, det from WS.WS.SYS_DAV_COL where COL_NAME = cname and COL_PARENT = parent_id;\n"
-"if (det is not NULL)\n"
-"signal (\'37000\', sprintf (\'WS.WS.FINDCOL() is used to access special DAV collection of type \"%s\"\', det));\n"
-"col := parent_id;\n"
-"inx := inx + 1;\n"
+"return -1;\n"
"}\n"
-"not_found:\n"
-"return inx;\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:946\n";
+"--src dav.sql:1041\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"
+static const char *proc9 =
+"#line 1101 \"[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 depth integer;\n"
-"declare col integer;\n"
-"declare name varchar;\n"
-"declare rc integer;\n"
-"declare res_inx integer;\n"
-"declare id integer;\n"
-"\n"
-"rc := 0;\n"
-"res_inx := length (path);\n"
-"col := 0;\n"
-"name := aref (path, res_inx - 1);\n"
-"if (res_inx < 1) rc := 0;\n"
-"depth := WS.WS.FINDCOL (path, col);\n"
-"if (depth = res_inx)\n"
-"return 0;\n"
-"if (depth < res_inx - 1)\n"
-"return -1;\n"
+"declare _name, _lmask, _prop, _ltype, _lscope, _lown, _ltoken, _tp, _pname varchar;\n"
+"declare _id, _ltimeout, _sc integer;\n"
+"declare c cursor for select COL_NAME, COL_ID from WS.WS.SYS_DAV_COL where COL_ID = DAV_HIDE_ERROR_OR_DET (DAV_SEARCH_PATH (_lmask, \'C\'), null, null);\n"
+"declare r cursor for select RES_NAME, RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _lmask;\n"
+"declare p cursor for select PROP_NAME from WS.WS.SYS_DAV_PROP where PROP_TYPE = _tp and PROP_PARENT_ID = _id;\n"
"\n"
-"whenever not found goto not_found;\n"
-"select RES_ID into id from WS.WS.SYS_DAV_RES where RES_NAME = name and RES_COL = col;\n"
"\n"
-"if (id is null)\n"
-"return 0;\n"
+"_name := \'\';\n"
"\n"
-"if (id > 0)\n"
+"_prop := aref (prop, 0);\n"
+"if (_prop <> \'propname\')\n"
"{\n"
-"rc := 1;\n"
-"_col := col;\n"
-"_name := name;\n"
-"}\n"
-"not_found:\n"
-"return rc;\n"
+"http_request_status (\'HTTP/1.1 501 Not Implemented\');\n"
+"return;\n"
"}\n"
-"--src dav.sql:970\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"
-"declare name, if_token varchar;\n"
-"declare icol integer;\n"
-"declare cname varchar;\n"
-"declare c_cur cursor for select COL_ID, COL_NAME from WS.WS.SYS_DAV_COL where COL_PARENT = id;\n"
-"declare r_cur cursor for select RES_ID, RES_NAME from WS.WS.SYS_DAV_RES where RES_COL = id;\n"
-"select count (COL_ID) into col from WS.WS.SYS_DAV_COL where COL_PARENT = id;\n"
-"select count (RES_ID) into res from WS.WS.SYS_DAV_RES where RES_COL = id;\n"
-"if_token := WS.WS.FINDPARAM (lines, \'If:\');\n"
-"if (isnull (if_token))\n"
-"if_token := \'\';\n"
-"if (res > 0)\n"
-"{\n"
-"whenever not found goto del_res_end;\n"
-"open r_cur;\n"
-"while (1)\n"
-"{\n"
-"fetch r_cur into r_id, name;\n"
-"select count (LOCK_TOKEN) into n_locks from WS.WS.SYS_DAV_LOCK where\n"
-"LOCK_PARENT_TYPE = \'R\' and LOCK_PARENT_ID = r_id and isnull (strstr (if_token, LOCK_TOKEN));\n"
-"if (n_locks > 0)\n"
+"_lmask := http_physical_path ();\n"
+"if (st = \'C\' and aref (_lmask, length (_lmask) - 1) <> ascii (\'/\'))\n"
+"_lmask := concat (_lmask, \'/\');\n"
+"\n"
+"whenever not found goto nf;\n"
+"if (st = \'C\')\n"
"{\n"
-"http_header (\'Content-type: text/xml; charset=\"utf-8\"\\r\\n\');\n"
-"http (concat (\n"
-"\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\',\n"
-"\'<d:multistatus xmlns:d=\"DAV:\">\',\n"
-"\'<d:response>\',\n"
-"\'<d:href>\')); http_dav_url (name); http(concat (\'</d:href>\',\n"
-"\'<d:status>HTTP/1.1 423 Locked</d:status>\',\n"
-"\'</d:response>\',\n"
-"\'</d:multistatus>\'\n"
-"));\n"
-"return 1;\n"
-"}\n"
-"delete from WS.WS.SYS_DAV_RES where RES_ID = r_id;\n"
-"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'R\' and LOCK_PARENT_ID = r_id;\n"
+"_tp := \'C\';\n"
+"open c (prefetch 1);\n"
+"fetch c into _name, _id;\n"
+"close c;\n"
"}\n"
-"del_res_end:\n"
-"close r_cur;\n"
+"else\n"
+"{\n"
+"_tp := \'R\';\n"
+"open r (prefetch 1);\n"
+"fetch r into _name, _id;\n"
+"close r;\n"
"}\n"
+"nf:\n"
"\n"
-"if (col > 0)\n"
+"http_request_status (\'HTTP/1.1 207 Multi-Status\');\n"
+"http_header (\'Content-type: text/xml\\r\\n\');\n"
+"http (\'<?xml version=\"1.0\"?>\\n\');\n"
+"http (\'<D:multistatus xmlns:D=\"DAV:\" xmlns:V=\"http://www.openlinksw.com/virtuoso/webdav/1.0/\">\\n\');\n"
+"http (\'<D:response xmlns:lp0=\"DAV:\" xmlns:i0=\"DAV:\">\\n\');\n"
+"\n"
+"http (sprintf (\'<D:href>%V</D:href>\\n\', charset_recode (lpath, \'UTF-8\', \'_WIDE_\')));\n"
+"http (\'<D:propstat>\\n\');\n"
+"http (\'<D:prop>\\n\');\n"
+"if (_prop = \'propname\')\n"
"{\n"
-"whenever not found goto del_col_end;\n"
-"open c_cur;\n"
+"if (st = \'R\')\n"
+"http (\'<D:getcontenttype/>\\n<lp0:getcontentlength/>\\n<lp0:getetag/>\\n\');\n"
+"http (\'<lp0:creationdate/>\\n<lp0:getlastmodified/>\\n\');\n"
+"http (\'<D:lockdiscovery/>\\n<D:supportedlock/>\\n<D:resourcetype/>\\n\');\n"
+"whenever not found goto nfp;\n"
+"open p (prefetch 1);\n"
"while (1)\n"
"{\n"
-"fetch c_cur into icol, cname;\n"
-"select count (LOCK_TOKEN) into n_locks from WS.WS.SYS_DAV_LOCK where\n"
-"LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = icol and isnull (strstr (if_token, LOCK_TOKEN));\n"
-"if (n_locks > 0)\n"
-"{\n"
-"http_header (\'Content-type: text/xml; charset=\"utf-8\"\\r\\n\');\n"
-"http (concat (\n"
-"\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\',\n"
-"\'<d:multistatus xmlns:d=\"DAV:\">\',\n"
-"\'<d:response>\',\n"
-"\'<d:href>\')); http_dav_url (cname); http(concat (\'</d:href>\',\n"
-"\'<d:status>HTTP/1.1 423 Locked</d:status>\',\n"
-"\'</d:response>\',\n"
-"\'</d:multistatus>\'\n"
-"));\n"
-"return 1;\n"
-"}\n"
-"rc := WS.WS.DELCHILDREN (icol, lines);\n"
-"if (rc > 0)\n"
-"{\n"
-"return 1;\n"
-"}\n"
-"delete from WS.WS.SYS_DAV_COL where COL_PARENT = id and COL_NAME = cname;\n"
-"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = icol;\n"
+"fetch p into _pname;\n"
+"_sc := strrchr (_pname, \':\');\n"
+"if (_sc is not null)\n"
+"_pname := subseq (_pname, _sc + 1, length(_pname));\n"
+"http (concat (\'<V:\', cast (_pname as varchar),\'/>\\n\'));\n"
"}\n"
-"del_col_end:\n"
-"close c_cur;\n"
+"nfp:\n"
+"close p;\n"
"}\n"
-"return 0;\n"
+"http (\'</D:prop>\\n\');\n"
+"http (\'<D:status>HTTP/1.1 200 OK</D:status>\');\n"
+"http (\'</D:propstat>\\n\');\n"
+"http (\'</D:response>\\n\');\n"
+"http (\'</D:multistatus>\\n\');\n"
"}\n"
-"--src dav.sql:1008\n";
+"--src dav.sql:1099\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"
+static const char *proc10 =
+"#line 1175 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.PROPPATCH (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"declare depth,len integer;\n"
-"declare src_id any;\n"
-"declare uname, upwd, _perms varchar;\n"
-"declare rc, err integer;\n"
-"declare res integer;\n"
-"declare u_id, g_id integer;\n"
-"declare p_comm, msg, stat,st varchar;\n"
-"uname := null;\n"
-"upwd := null;\n"
-"u_id := null;\n"
-"g_id := null;\n"
+"declare _u_id, _g_id, _slen, _len, _ix, id, _pid, _ix1, is_calendar, is_addressbook 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"
-"set isolation = \'serializable\';\n"
-"if ((length(path) > 1) and (\'\' = path[length(path)-1]))\n"
-"{\n"
-"st := \'C\';\n"
-"src_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
-"}\n"
-"else\n"
+"is_addressbook := 0;\n"
+"is_calendar := 0;\n"
+"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
+"if (id is not null)\n"
"{\n"
-"src_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
-"if (src_id is not null)\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"
-"path := vector_concat (path, vector (\'\'));\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"
-"src_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'R\'));\n"
-"}\n"
-"}\n"
-"\n"
-"if (src_id is null)\n"
+"else\n"
"{\n"
"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
"return;\n"
"}\n"
-"rc := DAV_AUTHENTICATE_HTTP (src_id, st, \'11_\', 1, lines, uname, upwd, u_id, g_id, _perms);\n"
+"}\n"
+"_u_id := null;\n"
+"_g_id := null;\n"
+"rc := DAV_AUTHENTICATE_HTTP (id, st, \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
"\n"
"if (rc < 0)\n"
-"{\n"
"return;\n"
-"}\n"
-"\n"
-"rc := DAV_DELETE_INT (DAV_CONCAT_PATH (\'/\', path), 1, null, null, 0);\n"
+"rc := string_output ();\n"
+"_ses := aref_set_0 (params, 1);\n"
+"_body := string_output_string (_ses);\n"
"\n"
-"if (rc >= 0)\n"
+"xtree := xml_tree (_body, 0);\n"
+"if (not isarray (xtree))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 204 No Content\');\n"
-"return;\n"
+"http_request_status (\'HTTP/1.1 400 Bad Request\');\n"
+"return (0);\n"
"}\n"
-"if (rc = -8)\n"
+"xte_nodebld_init (acc);\n"
+"\n"
+"if (WS.WS.ISLOCKED (vector_concat (vector (\'\'), path), lines, _u_id))\n"
"{\n"
"http_request_status (\'HTTP/1.1 423 Locked\');\n"
"return;\n"
"}\n"
-"http_request_status (\'HTTP/1.1 500 Internal Server Error\');\n"
-"return;\n"
-"}\n"
-"--src dav.sql:1090\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"
-"depth := WS.WS.FINDCOL (path, col);\n"
-"len := length (path);\n"
-"if (depth = len)\n"
-"return 1;\n"
+"\n"
+"http_request_status (\'HTTP/1.1 207 Multi-Status\');\n"
+"http (\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\\n\', rc);\n"
+"http (\'<D:multistatus xmlns:D=\"DAV:\">\\n\', rc);\n"
+"http (\'<D:response>\\n\', rc);\n"
+"http (\'<D:propstat>\\n\', rc);\n"
+"\n"
+"declare xtd, prop_set any;\n"
+"declare i, l integer;\n"
+"\n"
+"xtd := xml_tree_doc (xtree);\n"
+"\n"
+"\n"
+"prop_set := xpath_eval(\'//set/prop/*\',xtd,0);\n"
+"l := length (prop_set);\n"
+"if (l > 0)\n"
+"{\n"
+"i := 0;\n"
+"while (i < l)\n"
+"{\n"
+"declare pa, pn, pns, pv, ps, _prop_name any;\n"
+"pa := prop_set[i];\n"
+"\n"
+"pn := cast (xpath_eval (\'local-name(.)\', pa) as varchar);\n"
+"_prop_name := pn;\n"
+"pns := cast(xpath_eval (\'namespace-uri(.)\', pa) as varchar);\n"
+"\n"
+"ps := string_output ();\n"
+"http_value (pa, null, ps);\n"
+"pv := xml_tree (string_output_string (ps));\n"
+"\n"
+"if (length (pns) > 0)\n"
+"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"
+"and _prop_name in (\'virtpermissions\', \'virtowneruid\', \'virtownergid\'))\n"
+"{\n"
+"declare tmp, tmp_id any;\n"
+"tmp := cast (xpath_eval (\'string()\', pa) as varchar);\n"
+"if (_prop_name = \'virtpermissions\')\n"
+"{\n"
+"\n"
+"if ((tmp like \'__1%\' or tmp like \'_____1%\' or tmp like \'________1%\') and _u_id <> http_dav_uid ())\n"
+"goto skip_perm_update;\n"
+"\n"
+"\n"
+"if (regexp_match (DB.DBA.DAV_REGEXP_PATTERN_FOR_PERM (), tmp) is null)\n"
+"goto skip_perm_update;\n"
+"\n"
+"if (st = \'R\')\n"
+"update WS.WS.SYS_DAV_RES set RES_PERMS = tmp where RES_ID = id;\n"
"else\n"
-"return 0;\n"
+"update WS.WS.SYS_DAV_COL set COL_PERMS = tmp where COL_ID = id;\n"
+"\n"
+"skip_perm_update:;\n"
"}\n"
-"--src dav.sql:1156\n";
-
-static const char *proc14 =
-"#line 1172 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.ISRES (in path varchar)\n"
+"else if (_prop_name = \'virtowneruid\')\n"
"{\n"
-"declare col, rc integer;\n"
-"declare name varchar;\n"
-"rc := WS.WS.FINDRES (path, col, name);\n"
-"if (rc < 0)\n"
-"rc := 0;\n"
-"return (rc);\n"
+"tmp_id := (select U_ID from DB.DBA.SYS_USERS where U_NAME = tmp);\n"
+"if (st = \'R\')\n"
+"update WS.WS.SYS_DAV_RES set RES_OWNER = tmp_id where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_GROUP = tmp_id where COL_ID = id;\n"
"}\n"
-"--src dav.sql:1170\n";
-
-static const char *proc15 =
-"#line 1184 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.ETAG (in name varchar, in col integer)\n"
+"else if (_prop_name = \'virtownergid\')\n"
"{\n"
-"declare etag, full_path varchar;\n"
-"declare mtime datetime;\n"
-"declare msize integer;\n"
-"declare id integer;\n"
-"etag := sprintf (\'%d-%s-%d\',rnd(1000),cast (now() as varchar), rnd (1000));\n"
-"whenever not found goto etag_err;\n"
-"select RES_ID, RES_MOD_TIME, length (RES_CONTENT), RES_FULL_PATH into\n"
-"id, mtime, msize, full_path from WS.WS.SYS_DAV_RES where RES_NAME = name and RES_COL = col;\n"
-"etag := sprintf (\'%d-%s-%d-%s-%s\', id, cast (mtime as varchar), msize, name, full_path);\n"
-"etag_err:\n"
-"etag := md5 (etag);\n"
-"return etag;\n"
+"tmp_id := (select U_ID from DB.DBA.SYS_USERS where U_NAME = tmp);\n"
+"if (st = \'R\')\n"
+"update WS.WS.SYS_DAV_RES set RES_GROUP = tmp_id where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_GROUP = tmp_id where COL_ID = id;\n"
"}\n"
-"--src dav.sql:1182\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"
+"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"
"{\n"
-"\n"
-"WS.WS.GET (path, params, lines);\n"
-"return;\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"
+"values (_pid, pn, st, id, serialize(pv[1]));\n"
"}\n"
-"--src dav.sql:1200\n";
-
-static const char *proc17 =
-"#line 1211 \"[executable]/dav.sql\"\n"
-"create procedure DAV_SET_HTTP_REQUEST_STATUS (in rc integer)\n"
+"else\n"
"{\n"
-"if (rc = -1) { http_request_status (\'HTTP/1.1 409 Invalid path\'); return; }\n"
-"if (rc = -2) { http_request_status (\'HTTP/1.1 409 Conflict: the destination (path) is not valid\'); return; }\n"
-"if (rc = -3) { http_request_status (\'HTTP/1.1 412 Precondition Failed: overwrite flag is not set and destination exists\'); return; }\n"
-"if (rc = -8) { http_request_status (\'HTTP/1.1 423 Locked\'); return; }\n"
-"if (rc = -12) { http_request_status (\'HTTP/1.1 403 Forbidden: authentication has failed\'); return; }\n"
-"if (rc = -13) { http_request_status (\'HTTP/1.1 403 Forbidden: insufficient user permissions\'); return; }\n"
-"if (rc = -25) { http_request_status (\'HTTP/1.1 409 Conflict: can not create collection if a resource with same name exists\'); return; }\n"
-"if (rc = -26) { http_request_status (\'HTTP/1.1 409 Conflict: can not create resource if a collection with same name exists\'); return; }\n"
-"if (rc = -24) return;\n"
-"if (rc = -28) { http_request_status (\'HTTP/1.1 599 Internal server error\'); return; }\n"
-"if (rc = -29) { http_request_status (\'HTTP/1.1 599 Internal server error\'); return; }\n"
-"if (rc = -41) { http_request_status (\'HTTP/1.1 507 Insufficient storage\'); return; }\n"
-"http_request_status (\'HTTP/1.1 405 Method Not Allowed\');\n"
-"return;\n"
+"update WS.WS.SYS_DAV_PROP set PROP_VALUE = serialize(pv[1])\n"
+"where PROP_PARENT_ID = id and PROP_TYPE = st and PROP_NAME = pn;\n"
"}\n"
-"--src dav.sql:1209\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"
+"i := i + 1;\n"
+"}\n"
+"}\n"
+"\n"
+"prop_set := xpath_eval(\'//remove/prop/*\',xtd,0);\n"
+"\n"
+"l := length (prop_set);\n"
+"if (l > 0)\n"
"{\n"
-"declare _col_parent_id integer;\n"
-"declare id integer;\n"
-"declare content varchar;\n"
-"declare content_type varchar;\n"
-"declare rc, err, inc, end_inc, inc_col, inc_id integer;\n"
-"declare _col integer;\n"
-"declare _name varchar;\n"
-"declare _cont_len integer;\n"
-"declare temp varchar;\n"
-"declare full_path, _perms, _vsp, uname, upwd varchar;\n"
-"declare _u_id, _g_id, _is_xper, is_sparql integer;\n"
-"declare p_name, p_text, p_comm, stat, msg, p_inc, p_root, inc_name, inc_cont, str, location, inh varchar;\n"
-"declare ses any;\n"
+"i := 0;\n"
+"while (i < l)\n"
+"{\n"
+"declare pa, pn, pns any;\n"
+"pa := prop_set[i];\n"
"\n"
+"pn := cast (xpath_eval (\'local-name(.)\', pa) as varchar);\n"
+"pns := cast(xpath_eval (\'namespace-uri(.)\', pa) as varchar);\n"
"\n"
-"ses := aref_set_0 (params, 1);\n"
"\n"
-"whenever sqlstate \'*\' goto error_ret;\n"
+"if (length (pns) > 0)\n"
+"pn := concat (pns, \':\', pn);\n"
"\n"
+"xte_nodebld_acc (acc, xte_node (xte_head (pn)));\n"
+"delete from WS.WS.SYS_DAV_PROP\n"
+"where PROP_PARENT_ID = id and PROP_TYPE = st and PROP_NAME = pn;\n"
+"i := i + 1;\n"
+"}\n"
+"}\n"
+"acc := xte_nodebld_final (acc);\n"
+"_proprc := xte_node_from_nodebld (xte_head (\'DAV::prop\'), acc);\n"
"\n"
+"http_value (xml_tree_doc (_proprc), null, rc);\n"
+"http (\'<D:status>HTTP/1.1 200 OK</D:status>\\n\', rc);\n"
+"http (\'</D:propstat>\\n\', rc);\n"
+"http (\'</D:response>\\n\', rc);\n"
+"http (\'</D:multistatus>\\n\', rc);\n"
+"http_header (\'Content-Type: text/xml\\r\\n\');\n"
+"http (string_output_string (rc));\n"
+"}\n"
+"--src dav.sql:1173\n";
+
+static const char *proc11 =
+"#line 1361 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.FINDPARAM (inout params varchar, in pkey varchar)\n"
+"{\n"
+"declare ret any;\n"
+"declare i, l integer;\n"
+"if (pkey is null)\n"
+"return \'\';\n"
+"i := 0; l := length (params);\n"
+"pkey := rtrim (pkey,\': \');\n"
+"while (i < l)\n"
+"{\n"
+"ret := http_request_header (vector (params[i]), pkey, NULL, NULL);\n"
+"if (ret is not null)\n"
+"return ret;\n"
+"i := i + 1;\n"
+"}\n"
+"return \'\';\n"
+"}\n"
+"--src dav.sql:1359\n";
+
+static const char *proc12 =
+"#line 1380 \"[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"
+"declare _col_id, rc integer;\n"
+"declare _perms varchar;\n"
+"declare _col_parent_id integer;\n"
+"declare uname, upwd varchar;\n"
+"declare _u_id, _g_id integer;\n"
+"declare ses, ses_str any;\n"
"\n"
"\n"
-"WS.WS.IS_REDIRECT_REF (path, lines, location);\n"
-"path := WS.WS.FIXPATH (path);\n"
-"full_path := DAV_CONCAT_PATH (\'/\', path);\n"
-"_vsp := aref (path, length (path) - 1);\n"
+"_col_parent_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'P\'));\n"
+"_col_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
"_u_id := null;\n"
"_g_id := null;\n"
-"is_sparql := 0;\n"
-"_col_parent_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'P\'));\n"
"if (_col_parent_id is not null)\n"
"{\n"
"\n"
"rc := DAV_AUTHENTICATE_HTTP (_col_parent_id, \'C\', \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
"\n"
"if (rc < 0)\n"
-"goto error_ret;\n"
+"return;\n"
"}\n"
-"else\n"
+"ses := aref_set_0 (params, 1);\n"
+"ses_str := string_output_string (ses);\n"
+"if (length (ses_str) > 0)\n"
"{\n"
-"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
+"\n"
+"http_request_status (\'HTTP/1.1 415 Unsupported Media Type\');\n"
"return;\n"
"}\n"
-"if (WS.WS.ISLOCKED (vector_concat (vector (\'\'), path), lines, _u_id))\n"
+"rc := DAV_COL_CREATE_INT (\'/\' || DAV_CONCAT_PATH (path, \'/\'), _perms, null, null, null, null, 1, 0, 1, _u_id, _g_id);\n"
+"\n"
+"if ((not isinteger (rc)) or (rc > 0))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 423 Locked\');\n"
+"commit work;\n"
+"\n"
+"http_request_status (\'HTTP/1.1 201 Created\');\n"
"return;\n"
"}\n"
-"content_type := WS.WS.FINDPARAM (lines, \'Content-Type:\');\n"
-"if (content_type = \'\')\n"
-"content_type := http_mime_type (full_path);\n"
-"temp := WS.WS.FINDPARAM (lines, \'Content-Length:\');\n"
-"_cont_len := atoi (temp);\n"
-"if ((full_path like \'%.vsp\' or full_path like \'%.vspx\') and _cont_len > 0)\n"
+"if (rc = -24)\n"
+"return;\n"
+"if (rc = -25)\n"
"{\n"
-"content_type := \'text/html\';\n"
+"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
+"return;\n"
"}\n"
-"\n"
-"\n"
-"if (content_type = \'application/sparql-query\')\n"
+"if (rc = -8)\n"
"{\n"
-"WS.WS.SPARQL_QUERY_POST (full_path, ses, uname);\n"
-"is_sparql := 1;\n"
+"http_request_status (\'HTTP/1.1 423 Locked\');\n"
+"return;\n"
"}\n"
-"\n"
-"rc := -28;\n"
-"rc := DAV_RES_UPLOAD_STRSES_INT (\n"
-"full_path, ses, content_type, _perms,\n"
-"uname, null, uname, upwd, 0,\n"
-"now(), now(), null,\n"
-"_u_id, _g_id, 0 );\n"
-"\n"
-"if ((not isinteger (rc)) or (rc > 0))\n"
+"if ((rc = -12) or (rc = -13))\n"
"{\n"
-"commit work;\n"
-"http_request_status (\'HTTP/1.1 201 Created\');\n"
-"if (is_sparql = 1)\n"
-"http_header (\'MS-Author-Via: SPARQL\\r\\n\');\n"
-"else\n"
-"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
-"\'<HTML><HEAD>\',\n"
-"\'<TITLE>201 Created</TITLE>\',\n"
-"\'</HEAD><BODY>\', \'<H1>Created</H1>\',\n"
-"\'Resource \', sprintf (\'%V\', full_path),\' has been created.</BODY></HTML>\'));\n"
+"http_request_status (\'HTTP/1.1 403 Forbidden\');\n"
"return;\n"
"}\n"
-"error_ret:\n"
-"\n"
-"\n"
-"if (__SQL_STATE = \'40001\')\n"
-"{\n"
-"rollback work;\n"
-"\n"
-"\n"
-"\n"
-"}\n"
-"\n"
-"http_body_read ();\n"
-"DAV_SET_HTTP_REQUEST_STATUS (rc);\n"
-"}\n"
-"--src dav.sql:1231\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"
-"return (ascii(c) - ascii(\'0\'));\n"
-"if (c >= \'a\' and c <= \'f\')\n"
-"return (10 + ascii(c) - ascii(\'a\'));\n"
-"if (c >= \'A\' and c <= \'F\')\n"
-"return (10 + ascii(c) - ascii(\'A\'));\n"
-"return 0;\n"
+"http_request_status (\'HTTP/1.1 405 Method Not Allowed\');\n"
"}\n"
-"--src dav.sql:1335\n";
+"--src dav.sql:1378\n";
-static const char *proc20 =
-"#line 1349 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.STR_TO_URI (in str varchar)\n"
+static const char *proc13 =
+"#line 1442 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.FINDCOL (in path any, out col integer)\n"
"{\n"
-"declare tmp varchar;\n"
-"declare inx, inx1, len integer;\n"
-"declare escapes varchar;\n"
-"declare c char;\n"
-"escapes := \';?:@&=+ \"#%<>\';\n"
-"len := length (str);\n"
-"if (len = 0)\n"
-"return \'\';\n"
+"declare inx integer;\n"
+"declare depth integer;\n"
+"declare parent_id integer;\n"
+"declare det, cname varchar;\n"
"inx := 0;\n"
-"inx1 := 0;\n"
-"tmp := repeat (\' \', len * 3);\n"
-"\n"
-"while (inx < len)\n"
-"{\n"
-"c := chr (aref (str, inx));\n"
-"if (not isnull (strchr (escapes, c)))\n"
+"depth := length (path);\n"
+"whenever not found goto not_found;\n"
+"while (inx < depth)\n"
"{\n"
-"aset (tmp, inx1, ascii(\'%\'));\n"
-"aset (tmp, inx1 + 1, WS.WS.HEX_DIGIT (ascii(c) / 16));\n"
-"aset (tmp, inx1 + 2, WS.WS.HEX_DIGIT (mod (ascii(c), 16)));\n"
-"inx1 := inx1 + 2;\n"
-"}\n"
-"else\n"
-"aset (tmp, inx1, ascii(c));\n"
-"inx1 := inx1 + 1;\n"
+"cname := aref (path, inx);\n"
+"select COL_ID, COL_DET into parent_id, det from WS.WS.SYS_DAV_COL where COL_NAME = cname and COL_PARENT = parent_id;\n"
+"if (det is not NULL)\n"
+"signal (\'37000\', sprintf (\'WS.WS.FINDCOL() is used to access special DAV collection of type \"%s\"\', det));\n"
+"col := parent_id;\n"
"inx := inx + 1;\n"
"}\n"
-"return trim(tmp);\n"
+"not_found:\n"
+"return inx;\n"
"}\n"
-"--src dav.sql:1347\n";
+"--src dav.sql:1440\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"
+static const char *proc14 =
+"#line 1466 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.FINDRES (in path varchar,out _col integer, out _name varchar)\n"
"{\n"
-"declare inx, len, pos, inx1 integer;\n"
+"declare depth integer;\n"
+"declare col integer;\n"
"declare name varchar;\n"
-"declare c, cd1, cd2 char;\n"
-"declare nelem integer;\n"
-"declare temp varchar;\n"
-"declare nslash integer;\n"
-"declare lastslash integer;\n"
-"declare new_path varchar;\n"
-"\n"
-"name_len := 0;\n"
-"nslash := 0;\n"
-"nelem := elem;\n"
-"if (host <> \'\')\n"
-"nelem := nelem + 2;\n"
-"temp := path;\n"
-"name := \'\';\n"
-"len := length (path);\n"
-"inx := 0;\n"
-"inx1 := 0;\n"
-"lastslash := 0;\n"
-"new_path := repeat (\' \', len);\n"
-"while (inx < len)\n"
-"{\n"
-"c := chr (aref (path, inx));\n"
-"aset (new_path, inx1, ascii(c));\n"
-"if (c = \'%\')\n"
-"{\n"
-"cd1 := chr(aref (path, inx + 1));\n"
-"cd2 := chr(aref (path, inx + 2));\n"
-"aset (new_path, inx1, (WS.WS.HEX_TO_DEC (cd1) * 16) + WS.WS.HEX_TO_DEC (cd2));\n"
-"inx := inx + 2;\n"
-"}\n"
-"if (c = \'/\')\n"
-"{\n"
-"nslash := nslash + 1;\n"
-"lastslash := inx;\n"
-"}\n"
-"inx := inx + 1;\n"
-"inx1 := inx1 + 1;\n"
-"}\n"
-"\n"
-"temp := trim(new_path);\n"
-"\n"
+"declare rc integer;\n"
+"declare res_inx integer;\n"
+"declare id integer;\n"
"\n"
-"if (nelem <= nslash)\n"
-"nslash := nelem;\n"
-"else\n"
-"return name;\n"
+"rc := 0;\n"
+"res_inx := length (path);\n"
+"col := 0;\n"
+"name := aref (path, res_inx - 1);\n"
+"if (res_inx < 1) rc := 0;\n"
+"depth := WS.WS.FINDCOL (path, col);\n"
+"if (depth = res_inx)\n"
+"return 0;\n"
+"if (depth < res_inx - 1)\n"
+"return -1;\n"
"\n"
-"while (nslash > 0)\n"
-"{\n"
-"pos := strchr (temp , \'/\');\n"
-"temp := substring (temp, pos+2, len);\n"
-"nslash := nslash - 1;\n"
-"}\n"
-"pos := strchr (temp, \'/\');\n"
+"whenever not found goto not_found;\n"
+"select RES_ID into id from WS.WS.SYS_DAV_RES where RES_NAME = name and RES_COL = col;\n"
"\n"
-"if (isnull(pos))\n"
-"pos := length (temp);\n"
+"if (id is null)\n"
+"return 0;\n"
"\n"
-"if ( pos > 0 )\n"
+"if (id > 0)\n"
"{\n"
-"name := substring (temp, 1, pos);\n"
-"name_len := length (name);\n"
+"rc := 1;\n"
+"_col := col;\n"
+"_name := name;\n"
"}\n"
-"return name;\n"
+"not_found:\n"
+"return rc;\n"
"}\n"
-"--src dav.sql:1380\n";
+"--src dav.sql:1464\n";
-static const char *proc22 =
-"#line 1453 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.IS_ACTIVE_CONTENT (in f varchar)\n"
+static const char *proc15 =
+"#line 1504 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.DELCHILDREN (in id integer, in lines varchar)\n"
"{\n"
-"declare dot integer;\n"
-"declare ext varchar;\n"
-"\n"
-"dot := strrchr (f, \'.\');\n"
-"if (dot is null)\n"
-"return 0;\n"
-"ext := lower (substring (f, dot + 2, length (f)));\n"
-"if (ext in (\'vsp\', \'vspx\')\n"
-"or __proc_exists (concat (\'__http_handler_\' , ext), 2)\n"
-"or __proc_exists (concat (\'WS.WS.__http_handler_\' , ext), 1))\n"
-"return 1;\n"
-"return 0;\n"
-"}\n"
-"--src dav.sql:1451\n";
-
-static const char *proc23 =
-"#line 1470 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.GET_DAV_DEFAULT_PAGE (inout path any)\n"
+"declare col, res, r_id, n_locks, rc integer;\n"
+"declare name, if_token varchar;\n"
+"declare icol integer;\n"
+"declare cname varchar;\n"
+"declare c_cur cursor for select COL_ID, COL_NAME from WS.WS.SYS_DAV_COL where COL_PARENT = id;\n"
+"declare r_cur cursor for select RES_ID, RES_NAME from WS.WS.SYS_DAV_RES where RES_COL = id;\n"
+"select count (COL_ID) into col from WS.WS.SYS_DAV_COL where COL_PARENT = id;\n"
+"select count (RES_ID) into res from WS.WS.SYS_DAV_RES where RES_COL = id;\n"
+"if_token := WS.WS.FINDPARAM (lines, \'If:\');\n"
+"if (isnull (if_token))\n"
+"if_token := \'\';\n"
+"if (res > 0)\n"
"{\n"
-"declare _list, path1 any;\n"
-"declare _all varchar;\n"
-"declare idx, len, line integer;\n"
-"\n"
-"_all := http_map_get (\'default_page\');\n"
-"if (not isstring (_all))\n"
-"goto brws_check;\n"
-"_list := split_and_decode (_all, 0, \'\\0\\0;\');\n"
-"idx := 0;\n"
-"len := length (_list);\n"
-"\n"
-"while (idx < len)\n"
+"whenever not found goto del_res_end;\n"
+"open r_cur;\n"
+"while (1)\n"
"{\n"
-"line := trim (_list[idx]);\n"
-"path1 := vector_concat (path, vector (line));\n"
-"if (DAV_HIDE_ERROR (DAV_SEARCH_ID (DAV_CONCAT_PATH (vector (\'/\'), path1), \'R\')) is not null)\n"
+"fetch r_cur into r_id, name;\n"
+"select count (LOCK_TOKEN) into n_locks from WS.WS.SYS_DAV_LOCK where\n"
+"LOCK_PARENT_TYPE = \'R\' and LOCK_PARENT_ID = r_id and isnull (strstr (if_token, LOCK_TOKEN));\n"
+"if (n_locks > 0)\n"
"{\n"
-"path := path1;\n"
-"\n"
-"return line;\n"
+"http_header (\'Content-type: text/xml; charset=\"utf-8\"\\r\\n\');\n"
+"http (concat (\n"
+"\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\',\n"
+"\'<d:multistatus xmlns:d=\"DAV:\">\',\n"
+"\'<d:response>\',\n"
+"\'<d:href>\')); http_dav_url (name); http(concat (\'</d:href>\',\n"
+"\'<d:status>HTTP/1.1 423 Locked</d:status>\',\n"
+"\'</d:response>\',\n"
+"\'</d:multistatus>\'\n"
+"));\n"
+"return 1;\n"
"}\n"
-"idx := idx + 1;\n"
+"delete from WS.WS.SYS_DAV_RES where RES_ID = r_id;\n"
+"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'R\' and LOCK_PARENT_ID = r_id;\n"
+"}\n"
+"del_res_end:\n"
+"close r_cur;\n"
"}\n"
-"brws_check:\n"
-"if (0 = http_map_get (\'browseable\'))\n"
-"{\n"
-"declare dp any;\n"
-"if (not isstring (_all))\n"
-"dp := \'\';\n"
-"else\n"
-"dp := sprintf (\'Default page (%s) of folder \', _all);\n"
"\n"
-"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
-"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
-"\'<HTML><HEAD>\',\n"
-"\'<TITLE>404 Not Found</TITLE>\',\n"
-"\'</HEAD><BODY>\', \'<H1>Not Found</H1>\',\n"
-"sprintf (\'%V\', dp),\n"
-"sprintf (\'%V\', http_path ()), \' not found.</BODY></HTML>\'));\n"
-"return null;\n"
-"}\n"
-"\n"
-"return \'\';\n"
-"}\n"
-"--src dav.sql:1468\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"
-"\n"
-"dav_chunked_quota := atoi (\n"
-"coalesce (\n"
-"virtuoso_ini_item_value (\'HTTPServer\', \'DAVChunkedQuota\'),\n"
-"\'1000000\'));\n"
-"if (dav_chunked_quota < 1)\n"
-"dav_chunked_quota := 1000000;\n"
-"return dav_chunked_quota;\n"
-"}\n"
-"--src dav.sql:1517\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"
+"if (col > 0)\n"
"{\n"
-"declare col_depth, path_len integer;\n"
-"declare content long varchar;\n"
-"declare content_type varchar;\n"
-"declare fake_content any;\n"
-"declare rc, err integer;\n"
-"declare _col integer;\n"
-"declare _name, uname, upwd varchar;\n"
-"declare _cont_len integer;\n"
-"declare full_path varchar;\n"
-"declare parent_path varchar;\n"
-"declare cont_type 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"
-"declare _res_id , _col_id, is_admin_owned_res integer;\n"
-"declare def_page varchar;\n"
-"declare asmx_path, auth_opts, webid_check, webid_check_rc any;\n"
-"\n"
-"\n"
-"if (WS.WS.DAV_CHECK_ASMX (path, asmx_path))\n"
-"path := asmx_path;\n"
-"def_page := \'\';\n"
-"\n"
-"full_path := http_physical_path ();\n"
-"if (full_path = \'\')\n"
-"full_path := \'/\';\n"
-"full_path := WS.WS.DAV_REMOVE_ASMX (full_path);\n"
-"\n"
-"\n"
-"\n"
-"again:\n"
-"_col_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (DAV_CONCAT_PATH (DAV_CONCAT_PATH (\'/\', full_path), \'/\'), \'C\'));\n"
-"_res_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (DAV_CONCAT_PATH (\'/\', full_path), \'R\'));\n"
-"exec_safety_level := 0;\n"
-"\n"
-"if (_res_id is null and _col_id is null)\n"
+"whenever not found goto del_col_end;\n"
+"open c_cur;\n"
+"while (1)\n"
"{\n"
-"declare procname varchar;\n"
-"\n"
-"procname := sprintf (\'%s.%s.%s\',\n"
-"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path);\n"
-"\n"
-"if ( __proc_exists (procname) and\n"
-"(cast (registry_get (full_path) as varchar) = \'no_vsp_recompile\') and\n"
-"(http_map_get (\'noinherit\') = 1))\n"
+"fetch c_cur into icol, cname;\n"
+"select count (LOCK_TOKEN) into n_locks from WS.WS.SYS_DAV_LOCK where\n"
+"LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = icol and isnull (strstr (if_token, LOCK_TOKEN));\n"
+"if (n_locks > 0)\n"
"{\n"
-"commit work;\n"
-"__set_user_id (http_map_get (\'vsp_uid\'));\n"
-"call (procname)(path, params, lines);\n"
-"__pop_user_id ();\n"
-"return;\n"
-"}\n"
-"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
-"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
-"\'<HTML><HEAD>\',\n"
-"\'<TITLE>404 Not Found</TITLE>\',\n"
-"\'</HEAD><BODY>\', \'<H1>Not Found</H1>\',\n"
-"\'Resource \', sprintf (\'%V\', http_path ()), \' not found.</BODY></HTML>\'));\n"
-"return;\n"
+"http_header (\'Content-type: text/xml; charset=\"utf-8\"\\r\\n\');\n"
+"http (concat (\n"
+"\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\',\n"
+"\'<d:multistatus xmlns:d=\"DAV:\">\',\n"
+"\'<d:response>\',\n"
+"\'<d:href>\')); http_dav_url (cname); http(concat (\'</d:href>\',\n"
+"\'<d:status>HTTP/1.1 423 Locked</d:status>\',\n"
+"\'</d:response>\',\n"
+"\'</d:multistatus>\'\n"
+"));\n"
+"return 1;\n"
"}\n"
-"\n"
-"if (_col_id is not null)\n"
-"{\n"
-"declare fpath any;\n"
-"if (http_path () not like \'%/\')\n"
+"rc := WS.WS.DELCHILDREN (icol, lines);\n"
+"if (rc > 0)\n"
"{\n"
-"declare url_pars varchar;\n"
-"url_pars := http_request_get (\'QUERY_STRING\');\n"
-"if (length (url_pars))\n"
-"url_pars := \'?\' || url_pars;\n"
-"http_request_status (\'HTTP/1.1 301 Moved Permanently\');\n"
-"http_header (sprintf (\'Location: %s/%s\\r\\n\', http_path (), url_pars));\n"
-"return (0);\n"
+"return 1;\n"
"}\n"
-"def_page := WS.WS.GET_DAV_DEFAULT_PAGE (path);\n"
-"if (def_page is null)\n"
-"return;\n"
-"if (def_page <> \'\')\n"
-"{\n"
-"declare new_path varchar;\n"
-"new_path := DAV_CONCAT_PATH (http_path (), def_page);\n"
-"full_path := DAV_CONCAT_PATH (full_path, def_page);\n"
-"http_internal_redirect (new_path);\n"
-"goto again;\n"
+"delete from WS.WS.SYS_DAV_COL where COL_PARENT = id and COL_NAME = cname;\n"
+"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = icol;\n"
"}\n"
+"del_col_end:\n"
+"close c_cur;\n"
"}\n"
-"\n"
-"if (not (http_map_get (\'executable\')\n"
-"\n"
-"))\n"
+"return 0;\n"
+"}\n"
+"--src dav.sql:1502\n";
+
+static const char *proc16 =
+"#line 1586 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.\"DELETE\" (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"declare tgt_type, perms varchar;\n"
-"declare tgt_id, gid integer;\n"
-"\n"
+"declare depth,len integer;\n"
+"declare src_id any;\n"
+"declare uname, upwd, _perms varchar;\n"
+"declare rc, err integer;\n"
+"declare res integer;\n"
+"declare u_id, g_id integer;\n"
+"declare p_comm, msg, stat,st varchar;\n"
"uname := null;\n"
"upwd := null;\n"
-"uid := null;\n"
-"if (_col_id is not null)\n"
+"u_id := null;\n"
+"g_id := null;\n"
+"\n"
+"set isolation = \'serializable\';\n"
+"if ((length(path) > 1) and (\'\' = path[length(path)-1]))\n"
"{\n"
-"tgt_type := \'C\';\n"
-"tgt_id := _col_id;\n"
+"st := \'C\';\n"
+"src_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
"}\n"
"else\n"
"{\n"
-"tgt_type := \'R\';\n"
-"tgt_id := _res_id;\n"
-"}\n"
-"rc := DAV_AUTHENTICATE_HTTP (tgt_id, tgt_type, \'1__\', 1, lines, uname, upwd, uid, gid, perms);\n"
-"if ((rc < 0) and (rc <> -1))\n"
+"src_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
+"if (src_id is not null)\n"
"{\n"
-"if (-24 = rc)\n"
-"return 0;\n"
-"http_rewrite (0);\n"
-"http_request_status (\'HTTP/1.1 403 Prohibited\');\n"
-"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
-"\'<HTML><HEAD>\',\n"
-"\'<TITLE>403 Prohibited</TITLE>\',\n"
-"\'</HEAD><BODY>\', \'<H1>Prohibited</H1> \',\n"
-"\'You are not permitted to view the content of this location: \',\n"
-"sprintf (\'%V\', http_path ()), \'.</BODY></HTML>\'));\n"
-"return 0;\n"
+"st := \'C\';\n"
+"path := vector_concat (path, vector (\'\'));\n"
"}\n"
-"if (_col_id is null and (rc >= 0))\n"
+"else\n"
"{\n"
-"if (uid = http_nobody_uid () and gid = http_nogroup_gid ()) \n"
-"uid := null;\n"
-"rc := DAV_AUTHENTICATE_HTTP (tgt_id, tgt_type, \'1_1\', 0, lines, uname, upwd, uid, gid, perms);\n"
-"if (rc >= 0)\n"
-"exec_safety_level := 1;\n"
+"st := \'R\';\n"
+"src_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'R\'));\n"
"}\n"
"}\n"
"\n"
-"http_rewrite (0);\n"
-"\n"
-"\n"
-"auth_opts := http_map_get (\'auth_opts\');\n"
-"if (isvector (auth_opts) and mod (length (auth_opts), 2) = 0)\n"
-"webid_check := atoi (get_keyword (\'webid_check\', auth_opts, \'0\'));\n"
-"else\n"
-"webid_check := 0;\n"
-"webid_check_rc := 1; \n"
-"if (is_https_ctx () and webid_check and http_map_get (\'executable\'))\n"
-"{\n"
-"declare gid, perms, _check_id, _check_type any;\n"
-"uid := null;\n"
-"if (isinteger (_res_id)) \n"
-"{ \n"
-"_check_id := _res_id; \n"
-"_check_type := \'R\';\n"
-"} \n"
-"else \n"
-"{ \n"
-"_check_id := _col_id; \n"
-"_check_type := \'C\';\n"
-"} \n"
-"webid_check_rc := DAV_AUTHENTICATE_HTTP (_check_id, _check_type, \'1__\', 1, lines, uname, upwd, uid, gid, perms);\n"
-"if ((webid_check_rc < 0) and (webid_check_rc <> -1))\n"
-"return 0;\n"
-"} \n"
-"\n"
-"http_rewrite (0);\n"
-"\n"
-"if (_col_id is not null and http_path () not like \'%/\')\n"
+"if (src_id is null)\n"
"{\n"
-"http_request_status (\'HTTP/1.1 301 Moved Permanently\');\n"
-"http_header (sprintf (\'Location: %s/\\r\\n\', http_path ()));\n"
-"return (0);\n"
-"};\n"
+"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
+"return;\n"
+"}\n"
+"rc := DAV_AUTHENTICATE_HTTP (src_id, st, \'11_\', 1, lines, uname, upwd, u_id, g_id, _perms);\n"
"\n"
-"declare location varchar;\n"
-"if (WS.WS.IS_REDIRECT_REF (path, lines, location))\n"
+"if (rc < 0)\n"
"{\n"
-"declare host1 varchar;\n"
-"http_request_status (\'HTTP/1.1 302 Found\');\n"
-"host1 := http_request_header (lines, \'Host\', NULL, NULL);\n"
-"if (host1 is not null and location not like \'%://%\')\n"
-"host1 := concat (\'http://\', host1);\n"
-"else\n"
-"host1 := \'\';\n"
-"http_header (sprintf (\'Location: %s%s\\r\\n\', host1, location));\n"
-"return (0);\n"
+"return;\n"
"}\n"
"\n"
-"http_request_status (\'HTTP/1.1 200 OK\');\n"
+"rc := DAV_DELETE_INT (DAV_CONCAT_PATH (\'/\', path), 1, null, null, 0);\n"
"\n"
-"client_etag := WS.WS.FINDPARAM (lines, \'If-None-Match:\');\n"
-"if (_col_id is not null)\n"
-"{\n"
-"declare dir_ret any;\n"
-"if (0 = http_map_get (\'browseable\'))\n"
+"if (rc >= 0)\n"
"{\n"
-"http_rewrite (0);\n"
-"http_request_status (\'HTTP/1.1 403 Prohibited\');\n"
-"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
-"\'<HTML><HEAD>\',\n"
-"\'<TITLE>403 Prohibited</TITLE>\',\n"
-"\'</HEAD><BODY>\', \'<H1>Prohibited</H1> \',\n"
-"\'You are not permitted to view the directory index in this location: \',\n"
-"sprintf (\'%V\', http_path ()), \'.</BODY></HTML>\'));\n"
+"http_request_status (\'HTTP/1.1 204 No Content\');\n"
"return;\n"
"}\n"
-"dir_ret := WS.WS.DAV_DIR_LIST (full_path, http_path(), _col_id, uname, upwd, uid);\n"
-"if (DAV_HIDE_ERROR (dir_ret))\n"
+"if (rc = -8)\n"
"{\n"
-"http_rewrite (0);\n"
-"http_request_status (\'HTTP/1.1 500 Internal Server Error or Misconfiguration\');\n"
-"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
-"\'<HTML><HEAD>\',\n"
-"\'<TITLE>500 Internal Server Error or Misconfiguration</TITLE>\',\n"
-"\'</HEAD><BODY>\', \'<H1>Internal Server Error or Misconfiguration</H1> \',\n"
-"\'Failed to return the directory index in this location: \',\n"
-"sprintf (\'%V\', http_path ()), \'<BR>\', DAV_PERROR (dir_ret), \'</BODY></HTML>\'));\n"
+"http_request_status (\'HTTP/1.1 423 Locked\');\n"
"return;\n"
"}\n"
+"http_request_status (\'HTTP/1.1 500 Internal Server Error\');\n"
"return;\n"
"}\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"is_admin_owned_res := 0; rc := 0;\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"if (isinteger (_res_id))\n"
+"--src dav.sql:1584\n";
+
+static const char *proc17 =
+"#line 1652 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.ISCOL (in path varchar)\n"
"{\n"
-"for select RES_OWNER, RES_COL, RES_NAME, RES_TYPE\n"
-"from WS.WS.SYS_DAV_RES where RES_ID = _res_id do\n"
+"declare depth, len, col integer;\n"
+"depth := WS.WS.FINDCOL (path, col);\n"
+"len := length (path);\n"
+"if (depth = len)\n"
+"return 1;\n"
+"else\n"
+"return 0;\n"
+"}\n"
+"--src dav.sql:1650\n";
+
+static const char *proc18 =
+"#line 1666 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.ISRES (in path varchar)\n"
"{\n"
-"_col := RES_COL;\n"
-"_name := RES_NAME;\n"
-"resource_owner := RES_OWNER;\n"
-"cont_type := RES_TYPE;\n"
-"if (resource_owner = http_dav_uid ())\n"
-"is_admin_owned_res := 1;\n"
+"declare col, rc integer;\n"
+"declare name varchar;\n"
+"rc := WS.WS.FINDRES (path, col, name);\n"
+"if (rc < 0)\n"
+"rc := 0;\n"
+"return (rc);\n"
"}\n"
+"--src dav.sql:1664\n";
+
+static const char *proc19 =
+"#line 1678 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.ETAG (in name varchar, in col integer)\n"
+"{\n"
+"declare etag, full_path varchar;\n"
+"declare mtime datetime;\n"
+"declare msize integer;\n"
+"declare id integer;\n"
+"etag := sprintf (\'%d-%s-%d\',rnd(1000),cast (now() as varchar), rnd (1000));\n"
+"whenever not found goto etag_err;\n"
+"select RES_ID, RES_MOD_TIME, length (RES_CONTENT), RES_FULL_PATH into\n"
+"id, mtime, msize, full_path from WS.WS.SYS_DAV_RES where RES_NAME = name and RES_COL = col;\n"
+"etag := sprintf (\'%d-%s-%d-%s-%s\', id, cast (mtime as varchar), msize, name, full_path);\n"
+"etag_err:\n"
+"etag := md5 (etag);\n"
+"return etag;\n"
"}\n"
+"--src dav.sql:1676\n";
+
+static const char *proc20 =
+"#line 1696 \"[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:1694\n";
+
+static const char *proc21 =
+"#line 1705 \"[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"
+"if (rc = -2) { http_request_status (\'HTTP/1.1 409 Conflict: the destination (path) is not valid\'); return; }\n"
+"if (rc = -3) { http_request_status (\'HTTP/1.1 412 Precondition Failed: overwrite flag is not set and destination exists\'); return; }\n"
+"if (rc = -8) { http_request_status (\'HTTP/1.1 423 Locked\'); return; }\n"
+"if (rc = -12) { http_request_status (\'HTTP/1.1 403 Forbidden: authentication has failed\'); return; }\n"
+"if (rc = -13) { http_request_status (\'HTTP/1.1 403 Forbidden: insufficient user permissions\'); return; }\n"
+"if (rc = -25) { http_request_status (\'HTTP/1.1 409 Conflict: can not create collection if a resource with same name exists\'); return; }\n"
+"if (rc = -26) { http_request_status (\'HTTP/1.1 409 Conflict: can not create resource if a collection with same name exists\'); return; }\n"
+"if (rc = -24) return;\n"
+"if (rc = -28) { http_request_status (\'HTTP/1.1 599 Internal server error\'); return; }\n"
+"if (rc = -29) { http_request_status (\'HTTP/1.1 599 Internal server error\'); return; }\n"
+"if (rc = -41) { http_request_status (\'HTTP/1.1 507 Insufficient storage\'); return; }\n"
+"http_request_status (\'HTTP/1.1 405 Method Not Allowed\');\n"
+"return;\n"
+"}\n"
+"--src dav.sql:1703\n";
+
+static const char *proc22 =
+"#line 1727 \"[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"
+"declare id integer;\n"
+"declare content varchar;\n"
+"declare content_type varchar;\n"
+"declare rc, err, inc, end_inc, inc_col, inc_id integer;\n"
+"declare _col integer;\n"
+"declare _name varchar;\n"
+"declare _cont_len integer;\n"
+"declare temp varchar;\n"
+"declare full_path, _perms, _vsp, uname, upwd varchar;\n"
+"declare _u_id, _g_id, _is_xper, is_sparql integer;\n"
+"declare p_name, p_text, p_comm, stat, msg, p_inc, p_root, inc_name, inc_cont, str, location, inh varchar;\n"
+"declare ses any;\n"
"\n"
+"ses := aref_set_0 (params, 1);\n"
"\n"
-"\n"
-"\n"
-"\n"
-"if ((http_map_get (\'executable\') and webid_check_rc >= 0) or (exec_safety_level and is_admin_owned_res))\n"
-"exec_safety_level := 2;\n"
-"\n"
-"\n"
-"\n"
-"if (http_map_get (\'executable\'))\n"
-"connection_set (\'DAVUserID\', resource_owner);\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
+"whenever sqlstate \'*\' goto error_ret;\n"
"\n"
"\n"
"\n"
"\n"
-"if ((exec_safety_level > 1) and full_path like \'%.vsp\')\n"
-"{\n"
-"declare incstat any;\n"
-"if (__proc_exists (sprintf (\'%s.%s.%s\',\n"
-"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path)) and\n"
-"not WS.WS.DAV_VSP_INCLUDES_CHANGED (full_path, http_map_get (\'vsp_proc_owner\')))\n"
+"WS.WS.IS_REDIRECT_REF (path, lines, location);\n"
+"path := WS.WS.FIXPATH (path);\n"
+"full_path := DAV_CONCAT_PATH (\'/\', path);\n"
+"_vsp := aref (path, length (path) - 1);\n"
+"_u_id := null;\n"
+"_g_id := null;\n"
+"is_sparql := 0;\n"
+"_col_parent_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'P\'));\n"
+"if (_col_parent_id is not null)\n"
"{\n"
-"p_comm := sprintf (\'call \"%s\".\"%s\".\"%s\" (?, ?, ?)\',\n"
-"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path);\n"
-"stat := \'00000\';\n"
-"msg := \'\';\n"
-"commit work;\n"
-"__set_user_id (http_map_get (\'vsp_uid\'));\n"
-"err := exec (p_comm, stat, msg, vector (path, params, lines));\n"
-"__pop_user_id ();\n"
"\n"
-"if (stat = \'00000\')\n"
-"return;\n"
-"goto exec_err;\n"
+"rc := DAV_AUTHENTICATE_HTTP (_col_parent_id, \'C\', \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
"\n"
+"if (rc < 0)\n"
+"goto error_ret;\n"
"}\n"
-"select blob_to_string (RES_CONTENT), RES_FULL_PATH into resource_content, full_path\n"
-"from WS.WS.SYS_DAV_RES where RES_NAME = _name and RES_COL = _col;\n"
-"p_comm := sprintf (\n"
-"\'create procedure \"%s\".\"%s\".\"%s\" (in path varchar, in params varchar, in lines varchar) { ?>\',\n"
-"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path);\n"
-"str := string_output ();\n"
-"http (p_comm, str);\n"
-"incstat := vector ();\n"
-"WS.WS.EXPAND_INCLUDES (full_path, str, 0, 1, resource_content, incstat);\n"
-"http (\'<?vsp }\', str);\n"
-"str := string_output_string (str);\n"
-"\n"
-"stat := \'00000\';\n"
-"msg := \'\';\n"
-"__set_user_id (http_map_get (\'vsp_uid\'));\n"
-"exec (str, stat, msg);\n"
-"commit work;\n"
-"if (stat = \'00000\')\n"
+"else\n"
"{\n"
-"stat := \'00000\';\n"
-"msg := \'\';\n"
-"p_comm := sprintf (\'call \"%s\".\"%s\".\"%s\" (?, ?, ?)\',\n"
-"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path);\n"
-"exec (p_comm, stat, msg, vector (path, params, lines));\n"
+"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
+"return;\n"
"}\n"
-"__pop_user_id ();\n"
-"\n"
-"if (stat <> \'00000\')\n"
+"if (WS.WS.ISLOCKED (vector_concat (vector (\'\'), path), lines, _u_id))\n"
"{\n"
-"exec_err:\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"
-"http_value (msg);\n"
-"http (\'</b></p>\');\n"
-"http (\'</body></html>\');\n"
-"}\n"
-"else\n"
-"registry_set (concat (\'__depend_\', http_map_get (\'vsp_proc_owner\'), \'_\', full_path), serialize(incstat));\n"
+"http_request_status (\'HTTP/1.1 423 Locked\');\n"
"return;\n"
"}\n"
-"else if ((exec_safety_level > 1) and full_path like \'%.vspx\')\n"
+"content_type := WS.WS.FINDPARAM (lines, \'Content-Type:\');\n"
+"if (content_type = \'\')\n"
+"content_type := http_mime_type (full_path);\n"
+"temp := WS.WS.FINDPARAM (lines, \'Content-Length:\');\n"
+"_cont_len := atoi (temp);\n"
+"if ((full_path like \'%.vsp\' or full_path like \'%.vspx\') and _cont_len > 0)\n"
"{\n"
-"\n"
-"DB.DBA.vspx_dispatch (full_path, path, params, lines);\n"
+"content_type := \'text/html\';\n"
"}\n"
-"else\n"
-"{\n"
-"declare _server_etag, _xslt_sheet, _document_q, _xml_t varchar;\n"
-"declare fext, hdl_mode varchar;\n"
-"declare dot integer;\n"
-"declare xml_mime_type varchar;\n"
"\n"
"\n"
-"set isolation=\'repeatable\';\n"
-"whenever not found goto err_end;\n"
-"content := string_output (http_strses_memory_size ());\n"
-"rc := DAV_RES_CONTENT_INT (_res_id, content, cont_type, 1, 0);\n"
+"if (content_type = \'application/sparql-query\')\n"
+"{\n"
+"WS.WS.SPARQL_QUERY_POST (full_path, ses, uname);\n"
+"is_sparql := 1;\n"
+"}\n"
"\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
+"rc := -28;\n"
+"rc := DAV_RES_UPLOAD_STRSES_INT (\n"
+"full_path, ses, content_type, _perms,\n"
+"uname, null, uname, upwd, 0,\n"
+"now(), now(), null,\n"
+"_u_id, _g_id, 0 );\n"
+"\n"
+"if ((not isinteger (rc)) or (rc > 0))\n"
"{\n"
-"http_rewrite (0);\n"
-"http_request_status (\'HTTP/1.1 500 Internal server error\');\n"
+"commit work;\n"
+"http_request_status (\'HTTP/1.1 201 Created\');\n"
+"if (is_sparql = 1)\n"
+"http_header (\'MS-Author-Via: SPARQL\\r\\n\');\n"
+"else\n"
"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
"\'<HTML><HEAD>\',\n"
-"\'<TITLE>500 Internal server error</TITLE>\',\n"
-"\'</HEAD><BODY>\', \'<H1>Internal server error</H1> \',\n"
-"\'Server is unable to compose the text of the resource in this location: \',\n"
-"sprintf (\'%V\', http_path ()), \'.</BODY></HTML>\'));\n"
+"\'<TITLE>201 Created</TITLE>\',\n"
+"\'</HEAD><BODY>\', \'<H1>Created</H1>\',\n"
+"\'Resource \', sprintf (\'%V\', full_path),\' has been created.</BODY></HTML>\'));\n"
"return;\n"
"}\n"
+"error_ret:\n"
"\n"
-"_name := path [length(path)-1];\n"
"\n"
-"dot := strrchr (_name, \'.\');\n"
-"if (dot is not null)\n"
+"if (__SQL_STATE = \'40001\')\n"
"{\n"
-"declare is_exist integer;\n"
-"is_exist := 0;\n"
-"fext := ws_get_ftext (_name, dot);\n"
-"if (__proc_exists (fext, 2))\n"
-"is_exist := 1;\n"
-"else\n"
-"{\n"
-"fext := concat (\'WS.WS.\', fext);\n"
-"if (__proc_exists (fext, 1))\n"
-"is_exist := 1;\n"
-"}\n"
+"rollback work;\n"
+"\n"
"\n"
-"if (is_exist and exec_safety_level > 0)\n"
-"{\n"
"\n"
-"declare stream_params any;\n"
-"fext := cast (fext as varchar);\n"
-"hdl_mode := concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', full_path);\n"
-"__set_user_id (http_map_get (\'vsp_uid\'));\n"
-"stream_params := __http_stream_params ();\n"
-"commit work;\n"
-"http (call (fext) (string_output_string (content), stream_params, lines, hdl_mode));\n"
-"if (isarray (hdl_mode) and length (hdl_mode) > 1)\n"
-"{\n"
-"if (hdl_mode[0] <> \'\' and isstring (hdl_mode[0]))\n"
-"http_request_status (hdl_mode[0]);\n"
-"if (hdl_mode[1] <> \'\' and isstring (hdl_mode[1]))\n"
-"http_header (hdl_mode[1]);\n"
-"}\n"
-"return;\n"
-"}\n"
"}\n"
-"_xml_t := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-template\', 0), \'\');\n"
-"xml_mime_type := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-sql-mime-type\', 0), \'text/xml\');\n"
"\n"
-"if (cont_type = \'text/xml\' and\n"
-"(http_map_get (\'xml_templates\') or _xml_t = \'execute\')\n"
-"and (exec_safety_level > 1))\n"
+"http_body_read ();\n"
+"DAV_SET_HTTP_REQUEST_STATUS (rc);\n"
+"}\n"
+"--src dav.sql:1725\n";
+
+static const char *proc23 =
+"#line 1830 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.HEX_TO_DEC (in c char)\n"
"{\n"
-"declare new_params, _enc any;\n"
-"declare _base_url varchar;\n"
-"_base_url := concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', full_path);\n"
-"new_params := vector_concat (params, vector (\'template\', string_output_string (content),\n"
-"\'__base_url\', _base_url, \'contenttype\', xml_mime_type));\n"
-"_enc := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-sql-encoding\', 0));\n"
-"DB.DBA.__XML_TEMPLATE (path, new_params, lines, _enc);\n"
-"return;\n"
+"if (c >= \'0\' and c <= \'9\')\n"
+"return (ascii(c) - ascii(\'0\'));\n"
+"if (c >= \'a\' and c <= \'f\')\n"
+"return (10 + ascii(c) - ascii(\'a\'));\n"
+"if (c >= \'A\' and c <= \'F\')\n"
+"return (10 + ascii(c) - ascii(\'A\'));\n"
+"return 0;\n"
"}\n"
-"\n"
-"server_etag := WS.WS.ETAG (_name, _col);\n"
-"\n"
-"_document_q := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-sql\', 0), \'\');\n"
-"_xslt_sheet := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-stylesheet\', 0), \'\');\n"
-"\n"
-"if (_document_q <> \'\' or _xslt_sheet <> \'\')\n"
-"cont_type := \'sql/xml\';\n"
-"\n"
-"if (cont_type <> \'\' and cont_type <> \'sql/xml\')\n"
+"--src dav.sql:1828\n";
+
+static const char *proc24 =
+"#line 1842 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.STR_TO_URI (in str varchar)\n"
"{\n"
-"if (cont_type <> \'xml/view\' and cont_type <> \'xml/persistent-view\')\n"
+"declare tmp varchar;\n"
+"declare inx, inx1, len integer;\n"
+"declare escapes varchar;\n"
+"declare c char;\n"
+"escapes := \';?:@&=+ \"#%<>\';\n"
+"len := length (str);\n"
+"if (len = 0)\n"
+"return \'\';\n"
+"inx := 0;\n"
+"inx1 := 0;\n"
+"tmp := repeat (\' \', len * 3);\n"
+"\n"
+"while (inx < len)\n"
"{\n"
-"declare hdr_str any;\n"
-"hdr_str := http_header_get ();\n"
-"hdr_str := hdr_str || \'ETag: \"\' || server_etag || \'\"\\r\\n\';\n"
-"if (strcasestr (hdr_str, \'Content-Type:\') is null)\n"
-"hdr_str := hdr_str || \'Content-Type: \' || cont_type || \'\\r\\n\';\n"
-"if (isinteger (_res_id) and \n"
-"exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:aci_meta_n3\' and PROP_TYPE = \'R\' and PROP_PARENT_ID = _res_id))\n"
+"c := chr (aref (str, inx));\n"
+"if (not isnull (strchr (escapes, c)))\n"
"{\n"
-"hdr_str := hdr_str || sprintf (\'Link: <%s://%s%s,acl>; rel=\"http://www.w3.org/ns/auth/acl#\"; title=\"Access Control File\"\\r\\n\', \n"
-"case when is_https_ctx () then \'https\' else \'http\' end,\n"
-"http_request_header (lines, \'Host\', NULL, NULL), http_path ()); \n"
-"}\n"
-"http_header (hdr_str);\n"
+"aset (tmp, inx1, ascii(\'%\'));\n"
+"aset (tmp, inx1 + 1, WS.WS.HEX_DIGIT (ascii(c) / 16));\n"
+"aset (tmp, inx1 + 2, WS.WS.HEX_DIGIT (mod (ascii(c), 16)));\n"
+"inx1 := inx1 + 2;\n"
"}\n"
"else\n"
-"http_header (concat (\'Content-Type: text/xml\\r\\nETag: \"\',server_etag,\'\"\\r\\n\'));\n"
+"aset (tmp, inx1, ascii(c));\n"
+"inx1 := inx1 + 1;\n"
+"inx := inx + 1;\n"
"}\n"
-"\n"
-"\n"
-"\n"
-"_server_etag := server_etag;\n"
-"server_etag := concat (\'\"\', server_etag, \'\"\');\n"
-"\n"
-"if (client_etag <> server_etag)\n"
+"return trim(tmp);\n"
+"}\n"
+"--src dav.sql:1840\n";
+
+static const char *proc25 =
+"#line 1875 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.PATHREF (in path varchar, in elem integer, in host varchar, out name_len integer)\n"
"{\n"
-"http_request_status (\'HTTP/1.1 200 OK\');\n"
-"xpr := get_keyword (\'XPATH\', params, \'/*\');\n"
-"if (cont_type = \'xml/view\')\n"
+"declare inx, len, pos, inx1 integer;\n"
+"declare name varchar;\n"
+"declare c, cd1, cd2 char;\n"
+"declare nelem integer;\n"
+"declare temp varchar;\n"
+"declare nslash integer;\n"
+"declare lastslash integer;\n"
+"declare new_path varchar;\n"
+"\n"
+"name_len := 0;\n"
+"nslash := 0;\n"
+"nelem := elem;\n"
+"if (host <> \'\')\n"
+"nelem := nelem + 2;\n"
+"temp := path;\n"
+"name := \'\';\n"
+"len := length (path);\n"
+"inx := 0;\n"
+"inx1 := 0;\n"
+"lastslash := 0;\n"
+"new_path := repeat (\' \', len);\n"
+"while (inx < len)\n"
"{\n"
-"declare ondemand_data varchar;\n"
-"declare view_name varchar;\n"
-"declare meta_mode integer;\n"
-"declare meta_data varchar;\n"
-"declare delim1, delim2 integer;\n"
-"declare zero integer;\n"
-"ondemand_data := string_output_string (content);\n"
-"delim1 := locate(\'{view_name}\\n\',ondemand_data);\n"
-"delim2 := locate(\'{meta_mode}\\n\',ondemand_data);\n"
-"if(delim1 >= delim2 or delim2 = 0)\n"
+"c := chr (aref (path, inx));\n"
+"aset (new_path, inx1, ascii(c));\n"
+"if (c = \'%\')\n"
"{\n"
-"view_name := ondemand_data;\n"
-"meta_mode := 0;\n"
-"meta_data := \'\';\n"
-"} else {\n"
-"view_name := substring(ondemand_data, 1, delim1-1);\n"
-"delim1 := delim1 + length(\'{view_name}\\n\');\n"
-"meta_mode := cast(substring(ondemand_data, delim1, delim2-delim1) as integer);\n"
-"delim2 := delim2 + length(\'{meta_mode}\\n\');\n"
-"meta_data := substring(ondemand_data, delim2, length(ondemand_data)+1-delim2);\n"
+"cd1 := chr(aref (path, inx + 1));\n"
+"cd2 := chr(aref (path, inx + 2));\n"
+"aset (new_path, inx1, (WS.WS.HEX_TO_DEC (cd1) * 16) + WS.WS.HEX_TO_DEC (cd2));\n"
+"inx := inx + 2;\n"
"}\n"
-"if (xpr = \'\')\n"
+"if (c = \'/\')\n"
"{\n"
-"http (\'Error: XPATH param is empty\');\n"
-"return;\n"
+"nslash := nslash + 1;\n"
+"lastslash := inx;\n"
+"}\n"
+"inx := inx + 1;\n"
+"inx1 := inx1 + 1;\n"
"}\n"
-"sxtag := get_keyword (\'set_tag\', params, view_name);\n"
-"maxres := atoi (get_keyword (\'maxresults\', params, \'100\'));\n"
-"rxtag := get_keyword (\'result_tag\', params, \'\');\n"
-"if (rxtag <> \'\')\n"
-"rxtag := concat (\'__tag \"\', rxtag, \'\"\');\n"
-"p_comm := concat (\'XPATH [__http __view \"\', view_name, \'\" \', rxtag, \'] \', xpr);\n"
-"stat := \'00000\';\n"
-"msg := \'\';\n"
-"zero := 0;\n"
-"WS.WS.XML_VIEW_HEADER (view_name, sxtag, full_path, meta_mode, meta_data, zero);\n"
-"\n"
-"\n"
"\n"
+"temp := trim(new_path);\n"
"\n"
"\n"
-"err := exec (p_comm, stat, msg, vector (), maxres);\n"
-"http (concat (\'</\', sxtag, \'>\\n\'));\n"
-"if (stat = \'00000\')\n"
-"return;\n"
+"if (nelem <= nslash)\n"
+"nslash := nelem;\n"
"else\n"
+"return name;\n"
+"\n"
+"while (nslash > 0)\n"
"{\n"
-"http_header (concat (\'Content-Type: text/html\\r\\n\'));\n"
-"http (concat (\'SQL Error: \', stat, \' \', msg));\n"
-"return;\n"
-"}\n"
+"pos := strchr (temp , \'/\');\n"
+"temp := substring (temp, pos+2, len);\n"
+"nslash := nslash - 1;\n"
"}\n"
-"else if ((cont_type = \'text/xml\' or cont_type = \'xml/persistent-view\' or (cont_type = \'sql/xml\' and length (content) > 0)) and xpr <> \'/*\')\n"
-"{\n"
-"declare c_xml cursor for select t from WS.WS.SYS_DAV_RES where xpath_contains (RES_CONTENT, xpr, t)\n"
-"and RES_NAME = _name and RES_COL = _col;\n"
-"declare ht varchar;\n"
-"sxtag := get_keyword (\'set_tag\', params, \'document\');\n"
-"rxtag := get_keyword (\'result_tag\', params, \'\');\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\"?>\\n\', current_charset()));\n"
-"http (concat (\'<\', sxtag, \'>\\n\'));\n"
-"whenever not found goto end_xml;\n"
-"open c_xml;\n"
-"while (1)\n"
+"pos := strchr (temp, \'/\');\n"
+"\n"
+"if (isnull(pos))\n"
+"pos := length (temp);\n"
+"\n"
+"if ( pos > 0 )\n"
"{\n"
-"fetch c_xml into ht;\n"
-"if (rxtag <> \'\')\n"
-"http (concat (\'<\', rxtag, \'>\\n\'));\n"
-"http_value (ht);\n"
-"if (rxtag <> \'\')\n"
-"http (concat (\'</\', rxtag, \'>\\n\'));\n"
+"name := substring (temp, 1, pos);\n"
+"name_len := length (name);\n"
"}\n"
-"end_xml:\n"
-"close c_xml;\n"
-"http (concat (\'</\', sxtag, \'>\\n\'));\n"
+"return name;\n"
"}\n"
-"else if (cont_type = \'application/sparql-query\')\n"
+"--src dav.sql:1873\n";
+
+static const char *proc26 =
+"#line 1946 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.IS_ACTIVE_CONTENT (in f varchar)\n"
"{\n"
-"WS.WS.SPARQL_QUERY_GET (content, path, lines);\n"
+"declare dot integer;\n"
+"declare ext varchar;\n"
+"\n"
+"dot := strrchr (f, \'.\');\n"
+"if (dot is null)\n"
+"return 0;\n"
+"ext := lower (substring (f, dot + 2, length (f)));\n"
+"if (ext in (\'vsp\', \'vspx\')\n"
+"or __proc_exists (concat (\'__http_handler_\' , ext), 2)\n"
+"or __proc_exists (concat (\'WS.WS.__http_handler_\' , ext), 1))\n"
+"return 1;\n"
+"return 0;\n"
"}\n"
-"else if (not isnull (content))\n"
-"{\n"
-"if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xper\', 0)) is not null)\n"
+"--src dav.sql:1944\n";
+
+static const char *proc27 =
+"#line 1963 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.GET_DAV_DEFAULT_PAGE (inout path any)\n"
"{\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()));\n"
-"http_value (xper_cut (xml_persistent (content)));\n"
-"}\n"
-"else\n"
-"{\n"
-"\n"
+"declare _list, path1 any;\n"
+"declare _all varchar;\n"
+"declare idx, len, line integer;\n"
"\n"
-"declare _http_ranges_header any;\n"
-"_http_ranges_header := http_sys_parse_ranges_header (length (content));\n"
+"_all := http_map_get (\'default_page\');\n"
+"if (not isstring (_all))\n"
+"goto brws_check;\n"
+"_list := split_and_decode (_all, 0, \'\\0\\0;\');\n"
+"idx := 0;\n"
+"len := length (_list);\n"
"\n"
-"if (isinteger (_http_ranges_header))\n"
+"while (idx < len)\n"
"{\n"
-"return;\n"
-"}\n"
-"else if (_http_ranges_header is not null)\n"
+"line := trim (_list[idx]);\n"
+"path1 := vector_concat (path, vector (line));\n"
+"if (DAV_HIDE_ERROR (DAV_SEARCH_ID (DAV_CONCAT_PATH (vector (\'/\'), path1), \'R\')) is not null)\n"
"{\n"
-"declare _http_if_range varchar;\n"
-"_http_if_range := http_request_header (lines, \'If-Range\', null, \'\');\n"
-"if (length (_http_if_range) > 0 and _http_if_range <> server_etag)\n"
-"_http_ranges_header := NULL;\n"
-"if (length (_http_ranges_header) > 2)\n"
+"path := path1;\n"
+"\n"
+"return line;\n"
+"}\n"
+"idx := idx + 1;\n"
+"}\n"
+"brws_check:\n"
+"if (0 = http_map_get (\'browseable\'))\n"
"{\n"
-"_http_ranges_header := NULL;\n"
+"declare dp any;\n"
+"if (not isstring (_all))\n"
+"dp := \'\';\n"
+"else\n"
+"dp := sprintf (\'Default page (%s) of folder \', _all);\n"
+"\n"
+"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
+"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
+"\'<HTML><HEAD>\',\n"
+"\'<TITLE>404 Not Found</TITLE>\',\n"
+"\'</HEAD><BODY>\', \'<H1>Not Found</H1>\',\n"
+"sprintf (\'%V\', dp),\n"
+"sprintf (\'%V\', http_path ()), \' not found.</BODY></HTML>\'));\n"
+"return null;\n"
"}\n"
+"\n"
+"return \'\';\n"
"}\n"
-"if (_http_ranges_header is not null)\n"
+"--src dav.sql:1961\n";
+
+static const char *proc28 =
+"#line 2012 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.GET_DAV_CHUNKED_QUOTA () returns integer\n"
"{\n"
-"http_header (concat (coalesce (http_header_get (), \'\'), sprintf (\n"
-"\'Content-Length: %ld\\r\\nContent-Range: bytes %ld-%ld/%ld\\r\\n\',\n"
-"_http_ranges_header[1] - _http_ranges_header[0] + 1,\n"
-"_http_ranges_header[0],\n"
-"_http_ranges_header[1],\n"
-"length (content))));\n"
-"http_request_status (\'HTTP/1.1 206 Partial content\');\n"
+"declare dav_chunked_quota integer;\n"
"\n"
-"declare _left, _to_get, _start integer;\n"
-"declare _chunk, _ses any;\n"
-"_left := _http_ranges_header[1] - _http_ranges_header[0] + 1;\n"
-"_start := _http_ranges_header[0];\n"
-"_ses := http_flush (2);\n"
+"dav_chunked_quota := atoi (\n"
+"coalesce (\n"
+"virtuoso_ini_item_value (\'HTTPServer\', \'DAVChunkedQuota\'),\n"
+"\'1000000\'));\n"
+"if (dav_chunked_quota < 1)\n"
+"dav_chunked_quota := 1000000;\n"
+"return dav_chunked_quota;\n"
+"}\n"
+"--src dav.sql:2010\n";
+
+static const char *proc29 =
+"#line 2028 \"[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"
+"declare content long varchar;\n"
+"declare content_type varchar;\n"
+"declare fake_content any;\n"
+"declare rc, err integer;\n"
+"declare _col integer;\n"
+"declare _name, uname, upwd varchar;\n"
+"declare _cont_len integer;\n"
+"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 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"
+"declare _res_id , _col_id, is_admin_owned_res integer;\n"
+"declare def_page varchar;\n"
+"declare asmx_path, auth_opts, webid_check, webid_check_rc any;\n"
"\n"
-"declare exit handler for sqlstate \'*\' { rollback work; return; };\n"
"\n"
-"while (_left > 0)\n"
+"if (WS.WS.DAV_CHECK_ASMX (path, asmx_path))\n"
+"path := asmx_path;\n"
+"def_page := \'\';\n"
+"\n"
+"full_path := http_physical_path ();\n"
+"if (full_path = \'\')\n"
+"full_path := \'/\';\n"
+"full_path := WS.WS.DAV_REMOVE_ASMX (full_path);\n"
+"\n"
+"\n"
+"\n"
+"again:\n"
+"_col_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (DAV_CONCAT_PATH (DAV_CONCAT_PATH (\'/\', full_path), \'/\'), \'C\'));\n"
+"_res_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (DAV_CONCAT_PATH (\'/\', full_path), \'R\'));\n"
+"exec_safety_level := 0;\n"
+"\n"
+"if (_res_id is null and _col_id is null)\n"
"{\n"
-"_to_get := _left;\n"
-"if (_to_get > 65536)\n"
-"_to_get := 65536;\n"
-"_chunk := subseq (content, _start, _start + _to_get);\n"
-"if (__tag (_chunk) = 185)\n"
-"_chunk := string_output_string (_chunk);\n"
-"ses_write (_chunk, _ses);\n"
-"_left := _left - _to_get;\n"
-"_start := _start + _to_get;\n"
-"}\n"
-"}\n"
-"else\n"
+"declare procname varchar;\n"
+"\n"
+"procname := sprintf (\'%s.%s.%s\',\n"
+"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path);\n"
+"\n"
+"if ( __proc_exists (procname) and\n"
+"(cast (registry_get (full_path) as varchar) = \'no_vsp_recompile\') and\n"
+"(http_map_get (\'noinherit\') = 1))\n"
"{\n"
-"if (length (content) > WS.WS.GET_DAV_CHUNKED_QUOTA ())\n"
-"http_flush (1);\n"
-"http (content);\n"
+"commit work;\n"
+"__set_user_id (http_map_get (\'vsp_uid\'));\n"
+"call (procname)(path, params, lines);\n"
+"__pop_user_id ();\n"
+"return;\n"
"}\n"
+"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
+"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
+"\'<HTML><HEAD>\',\n"
+"\'<TITLE>404 Not Found</TITLE>\',\n"
+"\'</HEAD><BODY>\', \'<H1>Not Found</H1>\',\n"
+"\'Resource \', sprintf (\'%V\', http_path ()), \' not found.</BODY></HTML>\'));\n"
+"return;\n"
"}\n"
-"if (cont_type = \'sql/xml\')\n"
+"\n"
+"if (_col_id is not null)\n"
"{\n"
-"declare _root, _doc_ses, _comments varchar;\n"
-"if (length (content) = 0)\n"
+"declare fpath any;\n"
+"if (http_path () not like \'%/\')\n"
"{\n"
-"declare _dtd, _sch, _enc varchar;\n"
-"_root := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
-"PROP_NAME = \'xml-sql-root\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'\');\n"
-"_dtd := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
-"PROP_NAME = \'xml-sql-dtd\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'\');\n"
-"_sch := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
-"PROP_NAME = \'xml-sql-schema\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'\');\n"
-"_comments := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
-"PROP_NAME = \'xml-sql-description\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'\');\n"
-"_enc := (select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
-"PROP_NAME = \'xml-sql-encoding\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id);\n"
-"_doc_ses := null;\n"
-"http_rewrite ();\n"
-"WS.WS.XMLSQL_TO_STRSES (_document_q, _root, _sch, _dtd, _comments, _doc_ses, _enc);\n"
-"}\n"
-"if (_xslt_sheet <> \'\')\n"
-"http_xslt (_xslt_sheet);\n"
-"else if (length (content) = 0)\n"
-"http_header (http_header_get () || sprintf (\'Cache-Control: no-cache, must-revalidate\\r\\nPragma: no-cache\\r\\nExpires: %s\\r\\nContent-Type: %s\\r\\n\', soap_print_box (now (), \'\', 1), xml_mime_type));\n"
-"else\n"
-"http_header (http_header_get () || sprintf (\'Content-Type: %s\\r\\nETag: \"%s\"\\r\\n\', xml_mime_type, _server_etag));\n"
-"}\n"
-"}\n"
-"}\n"
-"else\n"
-"http_request_status (\'HTTP/1.1 304 Not Modified\');\n"
+"declare url_pars varchar;\n"
+"url_pars := http_request_get (\'QUERY_STRING\');\n"
+"if (length (url_pars))\n"
+"url_pars := \'?\' || url_pars;\n"
+"http_request_status (\'HTTP/1.1 301 Moved Permanently\');\n"
+"http_header (sprintf (\'Location: %s/%s\\r\\n\', http_path (), url_pars));\n"
+"return (0);\n"
"}\n"
-"err_end:\n"
+"def_page := WS.WS.GET_DAV_DEFAULT_PAGE (path);\n"
+"if (def_page is null)\n"
"return;\n"
-"}\n"
-"--src dav.sql:1533\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"
-"_content_type := http_request_header (lines, \'Content-Type\', null, \'\');\n"
-"if (_content_type = \'application/vnd.syncml+wbxml\' or\n"
-"_content_type = \'application/vnd.syncml+xml\')\n"
+"if (def_page <> \'\')\n"
"{\n"
-"if (__proc_exists (\'DB.DBA.SYNCML\'))\n"
-"DB.DBA.SYNCML (path, params, lines);\n"
-"else\n"
-"signal (\'37000\', \'The SyncML server is not available\');\n"
+"declare new_path varchar;\n"
+"new_path := DAV_CONCAT_PATH (http_path (), def_page);\n"
+"full_path := DAV_CONCAT_PATH (full_path, def_page);\n"
+"http_internal_redirect (new_path);\n"
+"goto again;\n"
"}\n"
-"else if (_content_type = \'application/sparql-query\')\n"
+"}\n"
+"\n"
+"if (not (http_map_get (\'executable\')\n"
+"\n"
+"))\n"
"{\n"
-"WS.WS.PUT (path, params, lines);\n"
+"declare tgt_type, perms varchar;\n"
+"declare tgt_id, gid integer;\n"
+"\n"
+"uname := null;\n"
+"upwd := null;\n"
+"uid := null;\n"
+"if (_col_id is not null)\n"
+"{\n"
+"tgt_type := \'C\';\n"
+"tgt_id := _col_id;\n"
"}\n"
"else\n"
"{\n"
-"WS.WS.GET (path, params, lines);\n"
-"}\n"
+"tgt_type := \'R\';\n"
+"tgt_id := _res_id;\n"
"}\n"
-"--src dav.sql:2186\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"
+"rc := DAV_AUTHENTICATE_HTTP (tgt_id, tgt_type, \'1__\', 1, lines, uname, upwd, uid, gid, perms);\n"
+"if ((rc < 0) and (rc <> -1))\n"
"{\n"
-"declare def_gr, full_qr, qr, cname any;\n"
-"declare stat, msg, meta, data any;\n"
-"ses := http_body_read ();\n"
-"qr := string_output_string (ses);\n"
-"cname := virtuoso_ini_item_value (\'URIQA\', \'DefaultHost\');\n"
-"if (cname is null)\n"
-"{\n"
-"declare tmp any;\n"
-"tmp := sys_stat (\'st_host_name\');\n"
-"if (server_http_port () <> \'80\')\n"
-"tmp := tmp || \':\'|| server_http_port ();\n"
-"cname := tmp;\n"
+"if (-24 = rc)\n"
+"return 0;\n"
+"http_rewrite (0);\n"
+"http_request_status (\'HTTP/1.1 403 Prohibited\');\n"
+"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
+"\'<HTML><HEAD>\',\n"
+"\'<TITLE>403 Prohibited</TITLE>\',\n"
+"\'</HEAD><BODY>\', \'<H1>Prohibited</H1> \',\n"
+"\'You are not permitted to view the content of this location: \',\n"
+"sprintf (\'%V\', http_path ()), \'.</BODY></HTML>\'));\n"
+"return 0;\n"
"}\n"
-"def_gr := sprintf (\'http://%s%U\', cname, path);\n"
-"if (lower (qr) not like \'construct %\' and lower (qr) not like \'describe %\')\n"
-"full_qr := sprintf (\'SPARQL define input:default-graph-uri <%s> \', def_gr);\n"
-"else\n"
-"full_qr := \'SPARQL \';\n"
-"full_qr := full_qr || qr;\n"
-"stat := \'00000\';\n"
-"if (exists (select 1 from DB.DBA.SYS_USERS where U_NAME = uname and U_SQL_ENABLE = 1))\n"
-"set_user_id (uname);\n"
-"exec (full_qr, stat, msg, vector (), 0, meta, data);\n"
-"if (stat <> \'00000\')\n"
-"signal (stat, msg);\n"
-"if (length (data) > 0 and length (data[0]) and __tag (data[0][0]) = 214)\n"
+"if (_col_id is null and (rc >= 0))\n"
"{\n"
-"declare dict, triples any;\n"
-"dict := data[0][0];\n"
-"ses := string_output ();\n"
-"triples := dict_list_keys (dict, 1);\n"
-"DB.DBA.RDF_TRIPLES_TO_TTL (triples, ses);\n"
-"ses := string_output_string (ses);\n"
-"DB.DBA.TTLP (ses, \'\', def_gr);\n"
-"}\n"
-"ses := sprintf (\'CONSTRUCT { ?s ?p ?o } FROM <%s> WHERE { ?s ?p ?o }\', def_gr);\n"
+"if (uid = http_nobody_uid () and gid = http_nogroup_gid ())\n"
+"uid := null;\n"
+"rc := DAV_AUTHENTICATE_HTTP (tgt_id, tgt_type, \'1_1\', 0, lines, uname, upwd, uid, gid, perms);\n"
+"if (rc >= 0)\n"
+"exec_safety_level := 1;\n"
"}\n"
-"--src dav.sql:2209\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:2250\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"
-"declare id, p_id, rc any;\n"
-"declare col, res, timeout, owner integer;\n"
-"declare st, name, uname, upwd, _perms varchar;\n"
-"declare new_token, u_token varchar;\n"
-"declare owner_name varchar;\n"
-"declare ltype, scope char;\n"
-"declare _u_id, _g_id integer;\n"
-"declare tmp, dpth varchar;\n"
-"declare hdr, location varchar;\n"
-"declare ses any;\n"
"\n"
-"declare _iftoken, locktype varchar;\n"
-"locktype := null;\n"
-"_iftoken := WS.WS.FINDPARAM (lines, \'If:\');\n"
+"http_rewrite (0);\n"
"\n"
-"ses := aref_set_0 (params, 1);\n"
-"WS.WS.IS_REDIRECT_REF (path, lines, location);\n"
-"path := WS.WS.FIXPATH (path);\n"
"\n"
-"p_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'P\'));\n"
-"if (p_id is null)\n"
+"auth_opts := http_map_get (\'auth_opts\');\n"
+"if (isvector (auth_opts) and mod (length (auth_opts), 2) = 0)\n"
+"webid_check := atoi (get_keyword (\'webid_check\', auth_opts, \'0\'));\n"
+"else\n"
+"webid_check := 0;\n"
+"webid_check_rc := 1;\n"
+"if (is_https_ctx () and webid_check and http_map_get (\'executable\'))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
-"return;\n"
+"declare gid, perms, _check_id, _check_type any;\n"
+"uid := null;\n"
+"if (isinteger (_res_id))\n"
+"{\n"
+"_check_id := _res_id;\n"
+"_check_type := \'R\';\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"
"else\n"
"{\n"
-"st := \'R\';\n"
-"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'R\'));\n"
+"_check_id := _col_id;\n"
+"_check_type := \'C\';\n"
+"}\n"
+"webid_check_rc := DAV_AUTHENTICATE_HTTP (_check_id, _check_type, \'1__\', 1, lines, uname, upwd, uid, gid, perms);\n"
+"if ((webid_check_rc < 0) and (webid_check_rc <> -1))\n"
+"return 0;\n"
"}\n"
-"_u_id := null;\n"
-"_g_id := null;\n"
-"if (id is null)\n"
-"rc := DAV_AUTHENTICATE_HTTP (p_id, \'C\', \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
-"else\n"
-"rc := DAV_AUTHENTICATE_HTTP (id, st, \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
"\n"
-"if (rc < 0)\n"
-"return;\n"
-"set isolation = \'serializable\';\n"
-"if (st = \'R\')\n"
-"dpth := \'0\';\n"
-"else\n"
-"dpth := \'infinity\';\n"
+"http_rewrite (0);\n"
"\n"
-"tmp := string_output_string (ses);\n"
-"owner_name := \'\';\n"
-"scope := \'X\';\n"
-"if (tmp is not null and tmp <> \'\')\n"
+"if (_col_id is not null and http_path () not like \'%/\')\n"
"{\n"
-"declare xses, xses2, xtree any;\n"
-"xtree := xml_tree (tmp, 0);\n"
-"if (isarray (xtree))\n"
+"http_request_status (\'HTTP/1.1 301 Moved Permanently\');\n"
+"http_header (sprintf (\'Location: %s/\\r\\n\', http_path ()));\n"
+"return (0);\n"
+"};\n"
+"\n"
+"declare location varchar;\n"
+"if (WS.WS.IS_REDIRECT_REF (path, lines, location))\n"
"{\n"
-"xtree := xml_tree_doc (xtree);\n"
-"xses := string_output ();\n"
-"http_value (xpath_eval (\'/lockinfo/owner\' , xtree, 1), null, xses);\n"
-"owner_name := string_output_string (xses);\n"
-"if (owner_name = \'\')\n"
-"owner_name := \'\';\n"
-"xses2 := string_output ();\n"
-"http_value (xpath_eval (\'/lockinfo/lockscope\' , xtree, 1), null, xses2);\n"
-"xses2 := string_output_string (xses2);\n"
-"if (strstr (xses2, \'exclusive\') is not null)\n"
-"scope := \'X\';\n"
+"declare host1 varchar;\n"
+"http_request_status (\'HTTP/1.1 302 Found\');\n"
+"host1 := http_request_header (lines, \'Host\', NULL, NULL);\n"
+"if (host1 is not null and location not like \'%://%\')\n"
+"host1 := concat (\'http://\', host1);\n"
"else\n"
-"scope := \'S\';\n"
-"}\n"
+"host1 := \'\';\n"
+"http_header (sprintf (\'Location: %s%s\\r\\n\', host1, location));\n"
+"return (0);\n"
"}\n"
-"tmp := WS.WS.FINDPARAM (lines, \'Timeout:\');\n"
-"declare tima any;\n"
-"tima := split_and_decode (tmp, 0, \'\\0\\0-\');\n"
"\n"
-"if (length(tima) > 1 and lower(tima[0]) = \'second\')\n"
-"timeout := atoi (tima[1]);\n"
-"else\n"
-"timeout := 0;\n"
-"path := DAV_CONCAT_PATH (\'/\', path);\n"
-"rc := DAV_LOCK_INT (path, id, st, locktype, scope, null, owner_name, _iftoken, dpth, timeout, null, null, _u_id);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
+"http_request_status (\'HTTP/1.1 200 OK\');\n"
+"\n"
+"client_etag := WS.WS.FINDPARAM (lines, \'If-None-Match:\');\n"
+"if (_col_id is not null)\n"
"{\n"
-"if (rc = -8)\n"
+"declare dir_ret any;\n"
+"if (0 = http_map_get (\'browseable\'))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 423 Locked\');\n"
+"http_rewrite (0);\n"
+"http_request_status (\'HTTP/1.1 403 Prohibited\');\n"
+"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
+"\'<HTML><HEAD>\',\n"
+"\'<TITLE>403 Prohibited</TITLE>\',\n"
+"\'</HEAD><BODY>\', \'<H1>Prohibited</H1> \',\n"
+"\'You are not permitted to view the directory index in this location: \',\n"
+"sprintf (\'%V\', http_path ()), \'.</BODY></HTML>\'));\n"
"return;\n"
"}\n"
-"http_request_status (\'HTTP/1.1 424 Failed Dependency: \' || DAV_PERROR (rc));\n"
+"dir_ret := WS.WS.DAV_DIR_LIST (full_path, http_path(), _col_id, uname, upwd, uid);\n"
+"if (DAV_HIDE_ERROR (dir_ret))\n"
+"{\n"
+"http_rewrite (0);\n"
+"http_request_status (\'HTTP/1.1 500 Internal Server Error or Misconfiguration\');\n"
+"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
+"\'<HTML><HEAD>\',\n"
+"\'<TITLE>500 Internal Server Error or Misconfiguration</TITLE>\',\n"
+"\'</HEAD><BODY>\', \'<H1>Internal Server Error or Misconfiguration</H1> \',\n"
+"\'Failed to return the directory index in this location: \',\n"
+"sprintf (\'%V\', http_path ()), \'<BR>\', DAV_PERROR (dir_ret), \'</BODY></HTML>\'));\n"
"return;\n"
"}\n"
-"http_request_status (\'HTTP/1.1 200 OK\');\n"
-"hdr := concat ( \'Lock-Token: <opaquelocktoken:\', rc ,\'>\\r\\n\',\n"
-"\'Content-type: text/xml; charset=\"utf-8\"\\r\\n\',\n"
-"\'Keep-Alive: timeout=15, max=100\\r\\n\');\n"
-"http_header (hdr);\n"
-"http (concat (\'<?xml version=\"1.0\" encoding=\"utf-8\"?>\',\n"
-"\'<D:prop xmlns:D=\"DAV:\">\',\n"
-"\'<D:lockdiscovery>\',\n"
-"\'<D:activelock>\',\n"
-"\'<D:locktype><D:write/></D:locktype>\',\n"
-"\'<D:lockscope>\')); if (scope = \'X\') http (\'<D:exclusive/>\'); else http (\'<D:shared/>\');\n"
-"http (sprintf (\'</D:lockscope><D:depth>%s</D:depth>\', dpth));\n"
-"http (owner_name);\n"
-"http (concat (\'<D:timeout>Second-\',\n"
-"cast (timeout as varchar),\'</D:timeout>\',\n"
-"\'<D:locktoken>\',\n"
-"\'<D:href>\', \'opaquelocktoken:\', rc, \'</D:href>\',\n"
-"\'</D:locktoken>\',\n"
-"\'</D:activelock>\',\n"
-"\'</D:lockdiscovery>\',\n"
-"\'</D:prop>\'));\n"
+"return;\n"
"}\n"
-"--src dav.sql:2261\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"
-"declare st char;\n"
-"declare rc, id, col, _left, _right integer;\n"
-"declare _u_id, _g_id integer;\n"
-"declare l_cur cursor for select LOCK_TOKEN from WS.WS.SYS_DAV_LOCK\n"
-"where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = st and LOCK_TOKEN = token;\n"
"\n"
-"WS.WS.IS_REDIRECT_REF (path, lines, location);\n"
-"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
-"if (id is not null)\n"
-"st := \'C\';\n"
-"else\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"is_admin_owned_res := 0; rc := 0;\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"if (isinteger (_res_id))\n"
"{\n"
-"st := \'R\';\n"
-"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'R\'));\n"
-"if (id is null)\n"
+"for select RES_OWNER, RES_COL, RES_NAME, RES_TYPE\n"
+"from WS.WS.SYS_DAV_RES where RES_ID = _res_id do\n"
"{\n"
-"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
-"return;\n"
+"_col := RES_COL;\n"
+"_name := RES_NAME;\n"
+"resource_owner := RES_OWNER;\n"
+"cont_type := RES_TYPE;\n"
+"if (resource_owner = http_dav_uid ())\n"
+"is_admin_owned_res := 1;\n"
"}\n"
"}\n"
-"_u_id := null;\n"
-"_g_id := null;\n"
-"rc := DAV_AUTHENTICATE_HTTP (id, st, \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
"\n"
-"if (rc < 0)\n"
-"return;\n"
-"token := WS.WS.FINDPARAM (lines, \'Lock-Token:\');\n"
-"if (token = \'\')\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"if ((http_map_get (\'executable\') and webid_check_rc >= 0) or (exec_safety_level and is_admin_owned_res))\n"
+"exec_safety_level := 2;\n"
+"\n"
+"\n"
+"\n"
+"if (http_map_get (\'executable\'))\n"
+"connection_set (\'DAVUserID\', resource_owner);\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"if ((exec_safety_level > 1) and full_path like \'%.vsp\')\n"
"{\n"
-"http_request_status (\'HTTP/1.1 400 Bad Request\');\n"
+"declare incstat any;\n"
+"if (__proc_exists (sprintf (\'%s.%s.%s\',\n"
+"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path)) and\n"
+"not WS.WS.DAV_VSP_INCLUDES_CHANGED (full_path, http_map_get (\'vsp_proc_owner\')))\n"
+"{\n"
+"p_comm := sprintf (\'call \"%s\".\"%s\".\"%s\" (?, ?, ?)\',\n"
+"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path);\n"
+"stat := \'00000\';\n"
+"msg := \'\';\n"
+"commit work;\n"
+"__set_user_id (http_map_get (\'vsp_uid\'));\n"
+"err := exec (p_comm, stat, msg, vector (path, params, lines));\n"
+"__pop_user_id ();\n"
+"\n"
+"if (stat = \'00000\')\n"
"return;\n"
+"goto exec_err;\n"
+"\n"
"}\n"
-"rc := DAV_UNLOCK_INT (id, st, token, null, null, _u_id);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"{\n"
-"if (rc = -27)\n"
+"select blob_to_string (RES_CONTENT), RES_FULL_PATH into resource_content, full_path\n"
+"from WS.WS.SYS_DAV_RES where RES_NAME = _name and RES_COL = _col;\n"
+"p_comm := sprintf (\n"
+"\'create procedure \"%s\".\"%s\".\"%s\" (in path varchar, in params varchar, in lines varchar) { ?>\',\n"
+"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path);\n"
+"str := string_output ();\n"
+"http (p_comm, str);\n"
+"incstat := vector ();\n"
+"WS.WS.EXPAND_INCLUDES (full_path, str, 0, 1, resource_content, incstat);\n"
+"http (\'<?vsp }\', str);\n"
+"str := string_output_string (str);\n"
+"\n"
+"stat := \'00000\';\n"
+"msg := \'\';\n"
+"__set_user_id (http_map_get (\'vsp_uid\'));\n"
+"exec (str, stat, msg);\n"
+"commit work;\n"
+"if (stat = \'00000\')\n"
"{\n"
-"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
-"return;\n"
+"stat := \'00000\';\n"
+"msg := \'\';\n"
+"p_comm := sprintf (\'call \"%s\".\"%s\".\"%s\" (?, ?, ?)\',\n"
+"http_map_get (\'vsp_qual\'), http_map_get (\'vsp_proc_owner\'), full_path);\n"
+"exec (p_comm, stat, msg, vector (path, params, lines));\n"
"}\n"
-"http_request_status (\'HTTP/1.1 424 Failed Dependency: \' || DAV_PERROR (rc));\n"
-"return;\n"
+"__pop_user_id ();\n"
+"\n"
+"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"
+"http_value (msg);\n"
+"http (\'</b></p>\');\n"
+"http (\'</body></html>\');\n"
"}\n"
-"http_request_status (\'HTTP/1.1 204 No Content\');\n"
+"else\n"
+"registry_set (concat (\'__depend_\', http_map_get (\'vsp_proc_owner\'), \'_\', full_path), serialize(incstat));\n"
"return;\n"
"}\n"
-"--src dav.sql:2380\n";
-
-static const char *proc31 =
-"#line 2435 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.OPLOCKTOKEN ()\n"
+"else if ((exec_safety_level > 1) and full_path like \'%.vspx\')\n"
"{\n"
"\n"
-"return lower (uuid());\n"
-"\n"
-"\n"
+"DB.DBA.vspx_dispatch (full_path, path, params, lines);\n"
+"}\n"
+"else\n"
+"{\n"
+"declare _server_etag, _xslt_sheet, _document_q, _xml_t varchar;\n"
+"declare fext, hdl_mode varchar;\n"
+"declare dot integer;\n"
+"declare xml_mime_type varchar;\n"
"\n"
"\n"
+"set isolation=\'repeatable\';\n"
+"whenever not found goto err_end;\n"
+"content := string_output (http_strses_memory_size ());\n"
+"rc := DAV_RES_CONTENT_INT (_res_id, content, cont_type, 1, 0);\n"
"\n"
-"}\n"
-"--src dav.sql:2433\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"
-"declare inx, len integer;\n"
-"inx := 0;\n"
-"if (__tag (path) <> 193)\n"
-"return NULL;\n"
-"len := length (path) - 1;\n"
-"if (len < 1)\n"
-"return NULL;\n"
-"tmp := make_array (len, \'any\');\n"
-"while (inx < len)\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
"{\n"
-"aset (tmp, inx, aref (path,inx));\n"
-"inx := inx + 1;\n"
-"}\n"
-"return tmp;\n"
+"http_rewrite (0);\n"
+"http_request_status (\'HTTP/1.1 500 Internal server error\');\n"
+"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
+"\'<HTML><HEAD>\',\n"
+"\'<TITLE>500 Internal server error</TITLE>\',\n"
+"\'</HEAD><BODY>\', \'<H1>Internal server error</H1> \',\n"
+"\'Server is unable to compose the text of the resource in this location: \',\n"
+"sprintf (\'%V\', http_path ()), \'.</BODY></HTML>\'));\n"
+"return;\n"
"}\n"
-"--src dav.sql:2445\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"
+"_name := path [length(path)-1];\n"
+"\n"
+"dot := strrchr (_name, \'.\');\n"
+"if (dot is not null)\n"
"{\n"
-"declare arr, res any;\n"
-"declare inx, len integer;\n"
-"arr := split_and_decode (path, 0, \'%\\0/\');\n"
-"if (isstring (host) and length (host) > 1)\n"
-"inx := 3;\n"
+"declare is_exist integer;\n"
+"is_exist := 0;\n"
+"fext := ws_get_ftext (_name, dot);\n"
+"if (__proc_exists (fext, 2))\n"
+"is_exist := 1;\n"
"else\n"
-"inx := 0;\n"
-"res := vector (); len := length (arr);\n"
-"while (inx < len)\n"
"{\n"
-"if (length (arr[inx]) > 0)\n"
-"res := vector_concat (res, vector (arr[inx]));\n"
-"inx := inx + 1;\n"
-"}\n"
-"return res;\n"
+"fext := concat (\'WS.WS.\', fext);\n"
+"if (__proc_exists (fext, 1))\n"
+"is_exist := 1;\n"
"}\n"
-"--src dav.sql:2465\n";
-
-static const char *proc34 =
-"#line 2487 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.HREF_TO_PATH_ARRAY (in path varchar)\n"
+"\n"
+"if (is_exist and exec_safety_level > 0)\n"
"{\n"
-"declare arr, res any;\n"
-"declare inx, len integer;\n"
-"arr := split_and_decode (path, 0, \'%\\0/\');\n"
-"if (length (arr) < 1)\n"
-"return arr;\n"
-"if (arr[0] = \'\')\n"
-"inx := 1;\n"
-"else if ((length (arr) > 2) and (arr[0][length (arr[0])-1] = 58) and (arr[1] = \'\') and (arr[2] <> \'\'))\n"
-"inx := 3;\n"
-"else\n"
-"inx := 1;\n"
-"res := vector (\'\');\n"
-"len := length (arr);\n"
-"while (inx < len)\n"
+"\n"
+"declare stream_params any;\n"
+"fext := cast (fext as varchar);\n"
+"hdl_mode := concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', full_path);\n"
+"__set_user_id (http_map_get (\'vsp_uid\'));\n"
+"stream_params := __http_stream_params ();\n"
+"commit work;\n"
+"http (call (fext) (string_output_string (content), stream_params, lines, hdl_mode));\n"
+"if (isarray (hdl_mode) and length (hdl_mode) > 1)\n"
"{\n"
-"if ((inx = len-1) or (length (arr[inx]) > 0))\n"
-"res := vector_concat (res, vector (arr[inx]));\n"
-"inx := inx + 1;\n"
+"if (hdl_mode[0] <> \'\' and isstring (hdl_mode[0]))\n"
+"http_request_status (hdl_mode[0]);\n"
+"if (hdl_mode[1] <> \'\' and isstring (hdl_mode[1]))\n"
+"http_header (hdl_mode[1]);\n"
"}\n"
-"return res;\n"
+"return;\n"
"}\n"
-"--src dav.sql:2485\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"
+"_xml_t := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-template\', 0), \'\');\n"
+"xml_mime_type := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-sql-mime-type\', 0), \'text/xml\');\n"
+"\n"
+"if (cont_type = \'text/xml\' and\n"
+"(http_map_get (\'xml_templates\') or _xml_t = \'execute\')\n"
+"and (exec_safety_level > 1))\n"
"{\n"
-"declare inx, col, res, id, name_len, depth, cols integer;\n"
-"declare name varchar;\n"
-"declare rc char;\n"
+"declare new_params, _enc any;\n"
+"declare _base_url varchar;\n"
+"_base_url := concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', full_path);\n"
+"new_params := vector_concat (params, vector (\'template\', string_output_string (content),\n"
+"\'__base_url\', _base_url, \'contenttype\', xml_mime_type));\n"
+"_enc := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-sql-encoding\', 0));\n"
+"DB.DBA.__XML_TEMPLATE (path, new_params, lines, _enc);\n"
+"return;\n"
+"}\n"
"\n"
-"rc := \'\';\n"
-"depth := 0;\n"
-"inx := 1;\n"
-"name := \'*\';\n"
-"col := 0;\n"
-"rcol := 0;\n"
-"rname := \'\';\n"
-"cols := 0;\n"
+"server_etag := WS.WS.ETAG (_name, _col);\n"
"\n"
-"while (name <> \'\')\n"
+"_document_q := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-sql\', 0), \'\');\n"
+"_xslt_sheet := DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xml-stylesheet\', 0), \'\');\n"
+"\n"
+"if (_document_q <> \'\' or _xslt_sheet <> \'\')\n"
+"cont_type := \'sql/xml\';\n"
+"\n"
+"if (cont_type <> \'\' and cont_type <> \'sql/xml\')\n"
"{\n"
-"name := WS.WS.PATHREF (path,inx,host,name_len);\n"
-"if (name <> \'\')\n"
+"if (cont_type <> \'xml/view\' and cont_type <> \'xml/persistent-view\')\n"
"{\n"
-"cols := cols + 1;\n"
-"if (rc = \'\' or rc = \'C\')\n"
+"declare hdr_str any;\n"
+"hdr_str := http_header_get ();\n"
+"hdr_str := hdr_str || \'ETag: \"\' || server_etag || \'\"\\r\\n\';\n"
+"if (strcasestr (hdr_str, \'Content-Type:\') is null)\n"
+"hdr_str := hdr_str || \'Content-Type: \' || cont_type || \'\\r\\n\';\n"
+"if (isinteger (_res_id) and\n"
+"exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:aci_meta_n3\' and PROP_TYPE = \'R\' and PROP_PARENT_ID = _res_id))\n"
"{\n"
-"rname := name;\n"
-"whenever not found goto no_more_col;\n"
-"select COL_ID into col from WS.WS.SYS_DAV_COL where COL_PARENT = col and COL_NAME = name;\n"
-"rcol := col;\n"
-"depth := depth + 1;\n"
-"rc := \'C\';\n"
-"}\n"
-"}\n"
-"inx := inx + 1;\n"
+"hdr_str := hdr_str || sprintf (\'Link: <%s://%s%s,acl>; rel=\"http://www.w3.org/ns/auth/acl#\"; title=\"Access Control File\"\\r\\n\',\n"
+"case when is_https_ctx () then \'https\' else \'http\' end,\n"
+"http_request_header (lines, \'Host\', NULL, NULL), http_path ());\n"
"}\n"
-"no_more_col:\n"
-"while (name <> \'\')\n"
-"{\n"
-"name := WS.WS.PATHREF (path,inx,host,name_len);\n"
-"if (name <> \'\')\n"
-"{\n"
-"if (rc = \'\' or rc = \'C\')\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"
-"rname := name;\n"
-"whenever not found goto no_res;\n"
-"select RES_ID into res from WS.WS.SYS_DAV_RES where RES_COL = col and RES_NAME = name;\n"
-"rcol := col;\n"
-"rc := \'R\';\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"
-"cols := cols + 1;\n"
+"http_header (hdr_str);\n"
"}\n"
-"inx := inx + 1;\n"
+"else\n"
+"http_header (concat (\'Content-Type: text/xml\\r\\nETag: \"\',server_etag,\'\"\\r\\n\'));\n"
"}\n"
-"no_res:\n"
-"if (rc = \'C\' and cols - 1 = depth)\n"
-"rc := \'N\';\n"
-"else if (rc = \'C\' and cols - 1 > depth )\n"
-"rc := \'E\';\n"
"\n"
-"return rc;\n"
-"}\n"
-"--src dav.sql:2511\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:2573\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:2579\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"
-"declare _host varchar;\n"
-"declare _overwrite char;\n"
-"declare _inx, _name_len, _res integer;\n"
-"declare _len integer;\n"
-"declare id, par_id, _src_id integer;\n"
-"declare cont varchar;\n"
-"declare uname, upwd, type, newname, _perms varchar;\n"
-"declare dstis char;\n"
-"declare _u_id, _g_id integer;\n"
-"declare col,res,depth,rc,inx integer;\n"
-"declare name, target_path, location varchar;\n"
-"declare src_id, dst_id, dst_ura, dst_host, _dst_parent any;\n"
-"uname := null;\n"
-"upwd := null;\n"
-"_u_id := null;\n"
-"_g_id := null;\n"
"\n"
-"set isolation = \'serializable\';\n"
-"WS.WS.IS_REDIRECT_REF (path, lines, location);\n"
-"_dst_name := WS.WS.FINDPARAM (lines, \'Destination:\');\n"
-"_dst_name := WS.WS.FIXPATH (_dst_name);\n"
-"_host := WS.WS.FINDPARAM (lines, \'Host:\');\n"
-"_overwrite := WS.WS.FINDPARAM (lines, \'Overwrite:\');\n"
-"dst_ura := rfc1808_parse_uri (_dst_name);\n"
-"dst_host := dst_ura[1];\n"
-"dst_host := split_and_decode (dst_host, 0, \'%\');\n"
"\n"
-"src_id := DAV_HIDE_ERROR (DAV_SEARCH_SOME_ID (vector_concat (vector(\'\'), path), st));\n"
-"if (src_id is null)\n"
+"_server_etag := server_etag;\n"
+"server_etag := concat (\'\"\', server_etag, \'\"\');\n"
+"\n"
+"if (client_etag <> server_etag)\n"
"{\n"
-"src_id := DAV_HIDE_ERROR (DAV_SEARCH_SOME_ID (vector_concat (vector(\'\'), path, vector(\'\')), st));\n"
-"if (src_id is not null)\n"
+"http_request_status (\'HTTP/1.1 200 OK\');\n"
+"xpr := get_keyword (\'XPATH\', params, \'/*\');\n"
+"if (cont_type = \'xml/view\')\n"
"{\n"
-"path := vector_concat (path, vector(\'\'));\n"
-"}\n"
-"}\n"
-"if (src_id is null)\n"
+"declare ondemand_data varchar;\n"
+"declare view_name varchar;\n"
+"declare meta_mode integer;\n"
+"declare meta_data varchar;\n"
+"declare delim1, delim2 integer;\n"
+"declare zero integer;\n"
+"ondemand_data := string_output_string (content);\n"
+"delim1 := locate(\'{view_name}\\n\',ondemand_data);\n"
+"delim2 := locate(\'{meta_mode}\\n\',ondemand_data);\n"
+"if(delim1 >= delim2 or delim2 = 0)\n"
"{\n"
-"\n"
-"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
-"return;\n"
+"view_name := ondemand_data;\n"
+"meta_mode := 0;\n"
+"meta_data := \'\';\n"
+"} else {\n"
+"view_name := substring(ondemand_data, 1, delim1-1);\n"
+"delim1 := delim1 + length(\'{view_name}\\n\');\n"
+"meta_mode := cast(substring(ondemand_data, delim1, delim2-delim1) as integer);\n"
+"delim2 := delim2 + length(\'{meta_mode}\\n\');\n"
+"meta_data := substring(ondemand_data, delim2, length(ondemand_data)+1-delim2);\n"
"}\n"
-"rc := DAV_AUTHENTICATE_HTTP (src_id, st, case (is_copy) when 1 then \'1__\' else \'11_\' end, 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
-"\n"
-"if (rc < 0)\n"
+"if (xpr = \'\')\n"
"{\n"
+"http (\'Error: XPATH param is empty\');\n"
"return;\n"
"}\n"
+"sxtag := get_keyword (\'set_tag\', params, view_name);\n"
+"maxres := atoi (get_keyword (\'maxresults\', params, \'100\'));\n"
+"rxtag := get_keyword (\'result_tag\', params, \'\');\n"
+"if (rxtag <> \'\')\n"
+"rxtag := concat (\'__tag \"\', rxtag, \'\"\');\n"
+"p_comm := concat (\'XPATH [__http __view \"\', view_name, \'\" \', rxtag, \'] \', xpr);\n"
+"stat := \'00000\';\n"
+"msg := \'\';\n"
+"zero := 0;\n"
+"WS.WS.XML_VIEW_HEADER (view_name, sxtag, full_path, meta_mode, meta_data, zero);\n"
"\n"
-"if (WS.WS.ISLOCKED (vector_concat (vector (\'\'), path), lines, _u_id))\n"
-"{\n"
-"http_request_status (\'HTTP/1.1 423 Locked\');\n"
-"return;\n"
-"}\n"
"\n"
-"target_path := WS.WS.HREF_TO_PATH_ARRAY (_dst_name);\n"
"\n"
"\n"
-"if (_host <> \'\' and dst_host <> \'\'\n"
-"and _dst_name <> \'\'\n"
-"and lower (substring (_dst_name, 1, 7)) = \'http://\'\n"
-"and lower (dst_host) <> lower (_host))\n"
-"{\n"
-"if (is_copy)\n"
-"{\n"
"\n"
-"log_message (sprintf (\'Copy a WebDAV resource from %s to %s\', _host, _dst_name));\n"
-"WS.WS.COPY_TO_OTHER (path, params, lines, _dst_name);\n"
-"}\n"
+"err := exec (p_comm, stat, msg, vector (), maxres);\n"
+"http (concat (\'</\', sxtag, \'>\\n\'));\n"
+"if (stat = \'00000\')\n"
+"return;\n"
"else\n"
"{\n"
-"\n"
-"log_message (sprintf (\'Moving a WebDAV resource from %s to %s\', _host, _dst_name));\n"
-"if (1 = WS.WS.COPY_TO_OTHER (path, params, lines, _dst_name))\n"
-"{\n"
-"rc := DAV_DELETE_INT (DAV_CONCAT_PATH (\'/\', path), 0, uname, upwd, 0);\n"
-"if (rc <> 1)\n"
-"{\n"
-"rollback work;\n"
-"return rc;\n"
-"}\n"
-"}\n"
-"}\n"
+"http_header (concat (\'Content-Type: text/html\\r\\n\'));\n"
+"http (concat (\'SQL Error: \', stat, \' \', msg));\n"
"return;\n"
"}\n"
-"\n"
-"if (WS.WS.ISLOCKED (target_path, lines, _u_id))\n"
-"{\n"
-"http_request_status (\'HTTP/1.1 423 Locked\');\n"
-"return;\n"
"}\n"
-"\n"
-"if (\'C\' = st)\n"
-"{\n"
-"if (target_path[length (target_path) - 1] = \'\')\n"
-"_dst_parent := DAV_HIDE_ERROR (DAV_SEARCH_ID (target_path, \'P\'));\n"
-"else\n"
+"else if ((cont_type = \'text/xml\' or cont_type = \'xml/persistent-view\' or (cont_type = \'sql/xml\' and length (content) > 0)) and xpr <> \'/*\')\n"
"{\n"
-"declare tgt_res any;\n"
-"tgt_res := DAV_SEARCH_ID (target_path, \'R\');\n"
-"if (DAV_HIDE_ERROR (tgt_res) is not null)\n"
+"declare c_xml cursor for select t from WS.WS.SYS_DAV_RES where xpath_contains (RES_CONTENT, xpr, t)\n"
+"and RES_NAME = _name and RES_COL = _col;\n"
+"declare ht varchar;\n"
+"sxtag := get_keyword (\'set_tag\', params, \'document\');\n"
+"rxtag := get_keyword (\'result_tag\', params, \'\');\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\"?>\\n\', current_charset()));\n"
+"http (concat (\'<\', sxtag, \'>\\n\'));\n"
+"whenever not found goto end_xml;\n"
+"open c_xml;\n"
+"while (1)\n"
"{\n"
-"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
-"return;\n"
-"}\n"
-"target_path := vector_concat (target_path, vector (\'\'));\n"
-"_dst_parent := DAV_HIDE_ERROR (DAV_SEARCH_ID (target_path, \'P\'));\n"
+"fetch c_xml into ht;\n"
+"if (rxtag <> \'\')\n"
+"http (concat (\'<\', rxtag, \'>\\n\'));\n"
+"http_value (ht);\n"
+"if (rxtag <> \'\')\n"
+"http (concat (\'</\', rxtag, \'>\\n\'));\n"
"}\n"
+"end_xml:\n"
+"close c_xml;\n"
+"http (concat (\'</\', sxtag, \'>\\n\'));\n"
"}\n"
-"else\n"
+"else if (cont_type = \'application/sparql-query\')\n"
"{\n"
-"_dst_parent := DAV_HIDE_ERROR (DAV_SEARCH_ID (target_path, \'P\'));\n"
+"WS.WS.SPARQL_QUERY_GET (content, path, lines);\n"
"}\n"
-"if (_dst_parent is null)\n"
+"else if (not isnull (content))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
-"return;\n"
-"}\n"
-"rc := DAV_AUTHENTICATE_HTTP (_dst_parent, \'C\', \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
-"\n"
-"if (rc < 0)\n"
-"return;\n"
-"if (is_copy)\n"
+"if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, \'R\', \'xper\', 0)) is not null)\n"
"{\n"
-"rc := DAV_COPY_INT (DAV_CONCAT_PATH (\'/\', path), DAV_CONCAT_PATH (\'/\', target_path), case (_overwrite) when \'T\' then 1 else 0 end, _perms, uname, null, uname, upwd, 0, 0);\n"
-"\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()));\n"
+"http_value (xper_cut (xml_persistent (content)));\n"
"}\n"
"else\n"
"{\n"
-"rc := DAV_MOVE_INT (DAV_CONCAT_PATH (\'/\', path), DAV_CONCAT_PATH (\'/\', target_path), case (_overwrite) when \'T\' then 1 else 0 end, uname, upwd, 0, 0);\n"
"\n"
-"}\n"
-"if (DAV_HIDE_ERROR (rc, null) is not null)\n"
+"\n"
+"declare _http_ranges_header any;\n"
+"_http_ranges_header := http_sys_parse_ranges_header (length (content));\n"
+"\n"
+"if (isinteger (_http_ranges_header))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 204 No Content\');\n"
"return;\n"
"}\n"
-"if (rc = 0) { http_request_status (\'HTTP/1.1 207 Multi-Status\'); return; }\n"
-"if (rc = -2) { http_request_status (\'HTTP/1.1 409 Conflict\'); return; }\n"
-"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:2585\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"
+"else if (_http_ranges_header is not null)\n"
"{\n"
-"declare name, token, if_token varchar;\n"
-"declare col, id, rc, len, owner integer;\n"
-"declare type, scope char;\n"
-"declare l_cur cursor for select LOCK_SCOPE, LOCK_OWNER, LOCK_TOKEN from WS.WS.SYS_DAV_LOCK\n"
-"where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type;\n"
-"\n"
-"if (exists (select 1 from WS.WS.SYS_DAV_LOCK where datediff (\'second\', LOCK_TIME, now()) > LOCK_TIMEOUT))\n"
+"declare _http_if_range varchar;\n"
+"_http_if_range := http_request_header (lines, \'If-Range\', null, \'\');\n"
+"if (length (_http_if_range) > 0 and _http_if_range <> server_etag)\n"
+"_http_ranges_header := NULL;\n"
+"if (length (_http_ranges_header) > 2)\n"
"{\n"
-"delete from WS.WS.SYS_DAV_LOCK where datediff (\'second\', LOCK_TIME, now()) > LOCK_TIMEOUT;\n"
-"\n"
+"_http_ranges_header := NULL;\n"
"}\n"
-"rc := 0;\n"
-"if (path is null)\n"
+"}\n"
+"if (_http_ranges_header is not null)\n"
"{\n"
+"http_header (concat (coalesce (http_header_get (), \'\'), sprintf (\n"
+"\'Content-Length: %ld\\r\\nContent-Range: bytes %ld-%ld/%ld\\r\\n\',\n"
+"_http_ranges_header[1] - _http_ranges_header[0] + 1,\n"
+"_http_ranges_header[0],\n"
+"_http_ranges_header[1],\n"
+"length (content))));\n"
+"http_request_status (\'HTTP/1.1 206 Partial content\');\n"
"\n"
-"return 0;\n"
-"}\n"
-"len := length (path);\n"
-"if_token := WS.WS.FINDPARAM (lines, \'If:\');\n"
-"if (isnull (if_token))\n"
-"if_token := \'\';\n"
-"id := DAV_HIDE_ERROR (DAV_SEARCH_SOME_ID (path, type), null);\n"
+"declare _left, _to_get, _start integer;\n"
+"declare _chunk, _ses any;\n"
+"_left := _http_ranges_header[1] - _http_ranges_header[0] + 1;\n"
+"_start := _http_ranges_header[0];\n"
+"_ses := http_flush (2);\n"
"\n"
-"if (id is null)\n"
-"return 0;\n"
-"if (len > 1)\n"
+"declare exit handler for sqlstate \'*\' { rollback work; return; };\n"
+"\n"
+"while (_left > 0)\n"
"{\n"
-"rc := WS.WS.ISLOCKED (WS.WS.PARENT_PATH (path), lines, _u_id);\n"
-"if (rc > 0)\n"
-"return rc;\n"
+"_to_get := _left;\n"
+"if (_to_get > 65536)\n"
+"_to_get := 65536;\n"
+"_chunk := subseq (content, _start, _start + _to_get);\n"
+"if (__tag (_chunk) = 185)\n"
+"_chunk := string_output_string (_chunk);\n"
+"ses_write (_chunk, _ses);\n"
+"_left := _left - _to_get;\n"
+"_start := _start + _to_get;\n"
"}\n"
-"if (isarray (id))\n"
-"{\n"
-"rc := call (cast (id[0] as varchar) || \'_DAV_IS_LOCKED\') (id, type, if_token);\n"
-"return rc;\n"
"}\n"
-"whenever not found goto not_locked;\n"
-"open l_cur (prefetch 1);\n"
-"fetch l_cur into scope, owner, token;\n"
-"if (scope = \'X\')\n"
-"rc := 2;\n"
"else\n"
-"rc := 1;\n"
-"if (not isnull (strstr (if_token, token)))\n"
-"rc := 0;\n"
-"not_locked:\n"
-"\n"
-"close l_cur;\n"
-"return rc;\n"
+"{\n"
+"if (length (content) > WS.WS.GET_DAV_CHUNKED_QUOTA ())\n"
+"http_flush (1);\n"
+"http (content);\n"
"}\n"
-"--src dav.sql:2734\n";
-
-static const char *proc40 =
-"#line 2790 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.CHECK_AUTH (in lines any)\n"
+"}\n"
+"if (cont_type = \'sql/xml\')\n"
"{\n"
-"declare _u_group, _u_id integer;\n"
-"declare _perms varchar;\n"
-"_u_id := WS.WS.GET_AUTH (lines, _u_group, _perms);\n"
-"return _u_id;\n"
+"declare _root, _doc_ses, _comments varchar;\n"
+"if (length (content) = 0)\n"
+"{\n"
+"declare _dtd, _sch, _enc varchar;\n"
+"_root := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
+"PROP_NAME = \'xml-sql-root\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'\');\n"
+"_dtd := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
+"PROP_NAME = \'xml-sql-dtd\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'\');\n"
+"_sch := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
+"PROP_NAME = \'xml-sql-schema\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'\');\n"
+"_comments := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
+"PROP_NAME = \'xml-sql-description\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'\');\n"
+"_enc := (select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
+"PROP_NAME = \'xml-sql-encoding\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id);\n"
+"_doc_ses := null;\n"
+"http_rewrite ();\n"
+"WS.WS.XMLSQL_TO_STRSES (_document_q, _root, _sch, _dtd, _comments, _doc_ses, _enc);\n"
+"}\n"
+"if (_xslt_sheet <> \'\')\n"
+"http_xslt (_xslt_sheet);\n"
+"else if (length (content) = 0)\n"
+"http_header (http_header_get () || sprintf (\'Cache-Control: no-cache, must-revalidate\\r\\nPragma: no-cache\\r\\nExpires: %s\\r\\nContent-Type: %s\\r\\n\', soap_print_box (now (), \'\', 1), xml_mime_type));\n"
+"else\n"
+"http_header (http_header_get () || sprintf (\'Content-Type: %s\\r\\nETag: \"%s\"\\r\\n\', xml_mime_type, _server_etag));\n"
+"}\n"
+"}\n"
+"}\n"
+"else\n"
+"http_request_status (\'HTTP/1.1 304 Not Modified\');\n"
+"}\n"
+"err_end:\n"
+"return;\n"
"}\n"
-"--src dav.sql:2788\n";
+"--src dav.sql:2026\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"
+static const char *proc30 =
+"#line 2690 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.POST (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"declare _u_id integer;\n"
-"if (\'\' <> WS.WS.FINDPARAM (lines, \'Authorization:\') and db.dba.vsp_auth_vec (lines) <> 0)\n"
+"declare _content_type any;\n"
+"_content_type := http_request_header (lines, \'Content-Type\', null, \'\');\n"
+"if (_content_type = \'application/vnd.syncml+wbxml\' or\n"
+"_content_type = \'application/vnd.syncml+xml\')\n"
"{\n"
-"_u_id := WS.WS.GET_AUTH (lines, _u_group, _perms);\n"
+"if (__proc_exists (\'DB.DBA.SYNCML\'))\n"
+"DB.DBA.SYNCML (path, params, lines);\n"
+"else\n"
+"signal (\'37000\', \'The SyncML server is not available\');\n"
+"}\n"
+"else if (_content_type = \'application/sparql-query\')\n"
+"{\n"
+"WS.WS.PUT (path, params, lines);\n"
"}\n"
"else\n"
"{\n"
-"_u_id := http_nobody_uid ();\n"
-"_u_group := http_nogroup_gid ();\n"
-"_perms := \'110110110-\' || \'-\';\n"
-"connection_set (\'DAVUserID\', _u_id);\n"
-"connection_set (\'DAVBillingUserID\', _u_id);\n"
-"connection_set (\'DAVGroupID\', _u_group);\n"
+"WS.WS.GET (path, params, lines);\n"
"}\n"
-"return _u_id;\n"
"}\n"
-"--src dav.sql:2798\n";
+"--src dav.sql:2688\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"
+static const char *proc31 =
+"#line 2713 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.SPARQL_QUERY_POST (in path varchar, inout ses varchar, in uname varchar)\n"
"{\n"
-"declare auth any;\n"
-"declare _user varchar;\n"
-"declare our_auth_vec varchar;\n"
-"declare _method, rc integer;\n"
-"\n"
-"_u_name := null;\n"
-"_u_password := null;\n"
-"_uid := null;\n"
-"_gid := null;\n"
-"_perms := null;\n"
-"\n"
-"auth := db.dba.vsp_auth_vec (lines);\n"
-"\n"
-"if (0 = auth)\n"
+"declare def_gr, full_qr, qr, cname any;\n"
+"declare stat, msg, meta, data any;\n"
+"ses := http_body_read ();\n"
+"qr := string_output_string (ses);\n"
+"cname := virtuoso_ini_item_value (\'URIQA\', \'DefaultHost\');\n"
+"if (cname is null)\n"
"{\n"
-"goto request_auth;\n"
+"declare tmp any;\n"
+"tmp := sys_stat (\'st_host_name\');\n"
+"if (server_http_port () <> \'80\')\n"
+"tmp := tmp || \':\'|| server_http_port ();\n"
+"cname := tmp;\n"
"}\n"
-"\n"
-"_user := get_keyword (\'username\', auth);\n"
-"\n"
-"if (_user = \'\' or isnull (_user))\n"
+"def_gr := sprintf (\'http://%s%U\', cname, path);\n"
+"if (lower (qr) not like \'construct %\' and lower (qr) not like \'describe %\')\n"
+"full_qr := sprintf (\'SPARQL define input:default-graph-uri <%s> \', def_gr);\n"
+"else\n"
+"full_qr := \'SPARQL \';\n"
+"full_qr := full_qr || qr;\n"
+"stat := \'00000\';\n"
+"if (exists (select 1 from DB.DBA.SYS_USERS where U_NAME = uname and U_SQL_ENABLE = 1))\n"
+"set_user_id (uname);\n"
+"exec (full_qr, stat, msg, vector (), 0, meta, data);\n"
+"if (stat <> \'00000\')\n"
+"signal (stat, msg);\n"
+"if (length (data) > 0 and length (data[0]) and __tag (data[0][0]) = 214)\n"
"{\n"
-"_user := null;\n"
-"goto request_auth;\n"
+"declare dict, triples any;\n"
+"dict := data[0][0];\n"
+"ses := string_output ();\n"
+"triples := dict_list_keys (dict, 1);\n"
+"DB.DBA.RDF_TRIPLES_TO_TTL (triples, ses);\n"
+"ses := string_output_string (ses);\n"
+"DB.DBA.TTLP (ses, \'\', def_gr);\n"
"}\n"
+"ses := sprintf (\'CONSTRUCT { ?s ?p ?o } FROM <%s> WHERE { ?s ?p ?o }\', def_gr);\n"
+"}\n"
+"--src dav.sql:2711\n";
+
+static const char *proc32 =
+"#line 2754 \"[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:2752\n";
+
+static const char *proc33 =
+"#line 2765 \"[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"
+"declare id, p_id, rc any;\n"
+"declare col, res, timeout, owner integer;\n"
+"declare st, name, uname, upwd, _perms varchar;\n"
+"declare new_token, u_token varchar;\n"
+"declare owner_name varchar;\n"
+"declare ltype, scope char;\n"
+"declare _u_id, _g_id integer;\n"
+"declare tmp, dpth varchar;\n"
+"declare hdr, location varchar;\n"
+"declare ses any;\n"
"\n"
-"allow_anon := 0;\n"
-"whenever not found goto request_auth;\n"
-"\n"
-"set isolation=\'committed\';\n"
-"select U_NAME, U_PWD, U_GROUP, U_ID, U_METHODS, U_DEF_PERMS\n"
-"into _u_name, _u_password, _gid, _uid, _method, _perms from WS.WS.SYS_DAV_USER\n"
-"where U_NAME = _user and U_ACCOUNT_DISABLED = 0 and U_PWD is not null with (prefetch 1);\n"
-"\n"
-"\n"
+"declare _iftoken, locktype varchar;\n"
+"locktype := null;\n"
+"_iftoken := WS.WS.FINDPARAM (lines, \'If:\');\n"
"\n"
-"rc := -1;\n"
+"ses := aref_set_0 (params, 1);\n"
+"WS.WS.IS_REDIRECT_REF (path, lines, location);\n"
+"path := WS.WS.FIXPATH (path);\n"
"\n"
-"if (sys_stat (\'dbev_enable\') and __proc_exists (\'DB.DBA.DBEV_DAV_LOGIN\'))\n"
+"p_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'P\'));\n"
+"if (p_id is null)\n"
"{\n"
-"rc := DB.DBA.DBEV_DAV_LOGIN (_user, _u_password, auth);\n"
+"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
+"return;\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"
"else\n"
"{\n"
-"rc := DB.DBA.LDAP_LOGIN (_user, _u_password, auth);\n"
+"st := \'R\';\n"
+"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'R\'));\n"
"}\n"
+"_u_id := null;\n"
+"_g_id := null;\n"
+"if (id is null)\n"
+"rc := DAV_AUTHENTICATE_HTTP (p_id, \'C\', \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
+"else\n"
+"rc := DAV_AUTHENTICATE_HTTP (id, st, \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
"\n"
-"if (rc = 0)\n"
-"goto request_auth;\n"
-"if (rc = 1)\n"
-"goto authenticated;\n"
-"\n"
-"\n"
-"if (_u_password is null)\n"
-"goto request_auth;\n"
-"\n"
-"if (not db.dba.vsp_auth_verify_pass (auth, _u_name,\n"
-"coalesce(get_keyword (\'realm\', auth), \'\'),\n"
-"coalesce(get_keyword (\'uri\', auth), \'\'),\n"
-"coalesce(get_keyword (\'nonce\', auth), \'\'),\n"
-"coalesce(get_keyword (\'nc\', auth),\'\'),\n"
-"coalesce(get_keyword (\'cnonce\', auth), \'\'),\n"
-"coalesce(get_keyword (\'qop\', auth), \'\'),\n"
-"_u_password))\n"
-"goto request_auth;\n"
+"if (rc < 0)\n"
+"return;\n"
+"set isolation = \'serializable\';\n"
+"if (st = \'R\')\n"
+"dpth := \'0\';\n"
+"else\n"
+"dpth := \'infinity\';\n"
"\n"
-"authenticated:\n"
+"tmp := string_output_string (ses);\n"
+"owner_name := \'\';\n"
+"scope := \'X\';\n"
+"if (tmp is not null and tmp <> \'\')\n"
"{\n"
-"\n"
-"update WS.WS.SYS_DAV_USER set U_LOGIN_TIME = now () where U_NAME = _user\n"
-"and U_LOGIN_TIME < dateadd (\'minute\', -2, now ());\n"
-"connection_set (\'DAVUserID\', _uid);\n"
-"connection_set (\'DAVBillingUserID\', _uid);\n"
-"connection_set (\'DAVGroupID\', _gid);\n"
-"\n"
-"commit work;\n"
-"set isolation=\'repeatable\';\n"
-"return _uid;\n"
-"}\n"
-"\n"
-"request_auth:\n"
-"_u_name := null;\n"
-"_u_password := null;\n"
-"_uid := null;\n"
-"_gid := null;\n"
-"_perms := null;\n"
-"if (allow_anon)\n"
+"declare xses, xses2, xtree any;\n"
+"xtree := xml_tree (tmp, 0);\n"
+"if (isarray (xtree))\n"
"{\n"
-"_uid := http_nobody_uid ();\n"
-"_gid := http_nogroup_gid ();\n"
-"connection_set (\'DAVUserID\', _uid);\n"
-"connection_set (\'DAVBillingUserID\', _uid);\n"
-"connection_set (\'DAVGroupID\', _gid);\n"
-"_perms := \'110110110RR\';\n"
-"return 0;\n"
+"xtree := xml_tree_doc (xtree);\n"
+"xses := string_output ();\n"
+"http_value (xpath_eval (\'/lockinfo/owner\' , xtree, 1), null, xses);\n"
+"owner_name := string_output_string (xses);\n"
+"if (owner_name = \'\')\n"
+"owner_name := \'\';\n"
+"xses2 := string_output ();\n"
+"http_value (xpath_eval (\'/lockinfo/lockscope\' , xtree, 1), null, xses2);\n"
+"xses2 := string_output_string (xses2);\n"
+"if (strstr (xses2, \'exclusive\') is not null)\n"
+"scope := \'X\';\n"
+"else\n"
+"scope := \'S\';\n"
"}\n"
-"if (not can_write_http)\n"
-"return -12;\n"
-"db.dba.vsp_auth_get (\'DAV\', \'/DAV\',\n"
-"md5 (datestring(now())),\n"
-"md5 (\'opaakki\'),\n"
-"\'false\', lines, 1);\n"
-"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
-"\'<HTML><HEAD>\',\n"
-"\'<TITLE>401 Unauthorized</TITLE>\',\n"
-"\'</HEAD><BODY><H1>Unauthorized</H1>\',\n"
-"\'Access to page is forbidden.</BODY></HTML>\'));\n"
-"return -24;\n"
"}\n"
-"--src dav.sql:2818\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"
-"inx := 0;\n"
-"if (length (perm) <> 3 or length (mask) <> 3)\n"
-"return 0;\n"
+"tmp := WS.WS.FINDPARAM (lines, \'Timeout:\');\n"
+"declare tima any;\n"
+"tima := split_and_decode (tmp, 0, \'\\0\\0-\');\n"
"\n"
-"while (inx < 3)\n"
+"if (length(tima) > 1 and lower(tima[0]) = \'second\')\n"
+"timeout := atoi (tima[1]);\n"
+"else\n"
+"timeout := 0;\n"
+"path := DAV_CONCAT_PATH (\'/\', path);\n"
+"rc := DAV_LOCK_INT (path, id, st, locktype, scope, null, owner_name, _iftoken, dpth, timeout, null, null, _u_id);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
"{\n"
-"if (aref (mask, inx) = ascii(\'1\') and aref (perm, inx) <> ascii(\'1\'))\n"
+"if (rc = -8)\n"
"{\n"
-"return 0;\n"
+"http_request_status (\'HTTP/1.1 423 Locked\');\n"
+"return;\n"
"}\n"
-"inx := inx + 1;\n"
+"http_request_status (\'HTTP/1.1 424 Failed Dependency: \' || DAV_PERROR (rc));\n"
+"return;\n"
"}\n"
-"return 1;\n"
+"http_request_status (\'HTTP/1.1 200 OK\');\n"
+"hdr := concat ( \'Lock-Token: <opaquelocktoken:\', rc ,\'>\\r\\n\',\n"
+"\'Content-type: text/xml; charset=\"utf-8\"\\r\\n\',\n"
+"\'Keep-Alive: timeout=15, max=100\\r\\n\');\n"
+"http_header (hdr);\n"
+"http (concat (\'<?xml version=\"1.0\" encoding=\"utf-8\"?>\',\n"
+"\'<D:prop xmlns:D=\"DAV:\">\',\n"
+"\'<D:lockdiscovery>\',\n"
+"\'<D:activelock>\',\n"
+"\'<D:locktype><D:write/></D:locktype>\',\n"
+"\'<D:lockscope>\')); if (scope = \'X\') http (\'<D:exclusive/>\'); else http (\'<D:shared/>\');\n"
+"http (sprintf (\'</D:lockscope><D:depth>%s</D:depth>\', dpth));\n"
+"http (owner_name);\n"
+"http (concat (\'<D:timeout>Second-\',\n"
+"cast (timeout as varchar),\'</D:timeout>\',\n"
+"\'<D:locktoken>\',\n"
+"\'<D:href>\', \'opaquelocktoken:\', rc, \'</D:href>\',\n"
+"\'</D:locktoken>\',\n"
+"\'</D:activelock>\',\n"
+"\'</D:lockdiscovery>\',\n"
+"\'</D:prop>\'));\n"
"}\n"
-"--src dav.sql:2932\n";
+"--src dav.sql:2763\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"
-"declare _perms varchar;\n"
-"declare name varchar;\n"
-"declare col integer;\n"
-"declare temp varchar;\n"
-"declare rc integer;\n"
-"rc := 0;\n"
-"_perms := \'000000000\';\n"
-"if (_u_id > 0 and _u_id is not null)\n"
+static const char *proc34 =
+"#line 2884 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.\"UNLOCK\" (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"g_id := connection_get (\'DAVGroupID\');\n"
-"}\n"
+"declare uname, upwd, _perms, token, name, cur_token, location varchar;\n"
+"declare st char;\n"
+"declare rc, id, col, _left, _right integer;\n"
+"declare _u_id, _g_id integer;\n"
+"declare l_cur cursor for select LOCK_TOKEN from WS.WS.SYS_DAV_LOCK\n"
+"where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = st and LOCK_TOKEN = token;\n"
"\n"
-"if (_u_id = http_dav_uid () and action not like \'__1\')\n"
+"WS.WS.IS_REDIRECT_REF (path, lines, location);\n"
+"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
+"if (id is not null)\n"
+"st := \'C\';\n"
+"else\n"
"{\n"
-"connection_set (\'DAVQuota\', -1);\n"
-"return 1;\n"
-"}\n"
-"if (WS.WS.ISCOL (path))\n"
+"st := \'R\';\n"
+"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'R\'));\n"
+"if (id is null)\n"
"{\n"
-"WS.WS.FINDCOL (path, col);\n"
-"select COL_OWNER, COL_GROUP, COL_PERMS into _user, _group, _perms from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
+"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
+"return;\n"
"}\n"
-"else if (WS.WS.ISRES (path))\n"
+"}\n"
+"_u_id := null;\n"
+"_g_id := null;\n"
+"rc := DAV_AUTHENTICATE_HTTP (id, st, \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
+"\n"
+"if (rc < 0)\n"
+"return;\n"
+"token := WS.WS.FINDPARAM (lines, \'Lock-Token:\');\n"
+"if (token = \'\')\n"
"{\n"
-"WS.WS.FINDRES (path, col, name);\n"
-"select RES_OWNER, RES_GROUP, RES_PERMS into _user, _group, _perms\n"
-"from WS.WS.SYS_DAV_RES where RES_COL = col and RES_NAME = name;\n"
+"http_request_status (\'HTTP/1.1 400 Bad Request\');\n"
+"return;\n"
"}\n"
-"else if (not WS.WS.ISCOL(path) and not WS.WS.ISRES (path) and WS.WS.ISCOL (WS.WS.PARENT_PATH (path)))\n"
+"rc := DAV_UNLOCK_INT (id, st, token, null, null, _u_id);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"{\n"
+"if (rc = -27)\n"
"{\n"
-"if (is_http_ctx())\n"
"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
-"return 0;\n"
+"return;\n"
"}\n"
-"if (_perms is null)\n"
-"return 0;\n"
-"if (_u_id = _user)\n"
-"{\n"
-"temp := substring (cast (_perms as varchar), 1, 3);\n"
-"rc := WS.WS.PERM_COMP (temp, action);\n"
+"http_request_status (\'HTTP/1.1 424 Failed Dependency: \' || DAV_PERROR (rc));\n"
+"return;\n"
"}\n"
-"if (_group = g_id and rc = 0)\n"
-"{\n"
-"temp := substring (cast (_perms as varchar), 4, 3);\n"
-"rc := WS.WS.PERM_COMP (temp, action);\n"
+"http_request_status (\'HTTP/1.1 204 No Content\');\n"
+"return;\n"
"}\n"
-"if (rc = 0)\n"
+"--src dav.sql:2882\n";
+
+static const char *proc35 =
+"#line 2937 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.OPLOCKTOKEN ()\n"
"{\n"
-"temp := substring (cast (_perms as varchar), 7, 3);\n"
-"rc := WS.WS.PERM_COMP (temp, action);\n"
-"}\n"
"\n"
-"if (rc = 0)\n"
-"{\n"
-"temp := substring (cast (_perms as varchar), 4, 3);\n"
-"rc := WS.WS.PERM_COMP (temp, action);\n"
-"if (rc > 0 and exists (select 1 from WS.WS.SYS_DAV_USER_GROUP where UG_UID = _u_id and UG_GID = _group))\n"
-"{\n"
-"rc := 1;\n"
-"}\n"
-"else\n"
-"rc := 0;\n"
+"return lower (uuid());\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
"}\n"
-"if (rc = 0 and is_http_ctx ())\n"
+"--src dav.sql:2935\n";
+
+static const char *proc36 =
+"#line 2949 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.PARENT_PATH (in path varchar)\n"
"{\n"
-"http_request_status (\'HTTP/1.1 403 Forbidden\');\n"
-"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
-"\'<HTML><HEAD>\',\n"
-"\'<TITLE>403 Forbidden</TITLE>\',\n"
-"\'</HEAD><BODY><H1>Forbidden</H1>\',\n"
-"\'Resource is forbidden.</BODY></HTML>\'));\n"
+"declare tmp any;\n"
+"declare inx, len integer;\n"
+"inx := 0;\n"
+"if (__tag (path) <> 193)\n"
+"return NULL;\n"
+"len := length (path) - 1;\n"
+"if (len < 1)\n"
+"return NULL;\n"
+"tmp := make_array (len, \'any\');\n"
+"while (inx < len)\n"
+"{\n"
+"aset (tmp, inx, aref (path,inx));\n"
+"inx := inx + 1;\n"
"}\n"
-"return rc;\n"
+"return tmp;\n"
"}\n"
-"--src dav.sql:2952\n";
+"--src dav.sql:2947\n";
-static const char *proc45 =
-"#line 3033 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.ISPUBLIC (in path varchar, in ask varchar)\n"
+static const char *proc37 =
+"#line 2969 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.HREF_TO_ARRAY (in path varchar,in host varchar)\n"
"{\n"
-"declare perms, name, given varchar;\n"
-"declare res, col integer;\n"
-"whenever not found goto nf;\n"
-"if (WS.WS.ISCOL (path))\n"
+"declare arr, res any;\n"
+"declare inx, len integer;\n"
+"arr := split_and_decode (path, 0, \'%\\0/\');\n"
+"if (isstring (host) and length (host) > 1)\n"
+"inx := 3;\n"
+"else\n"
+"inx := 0;\n"
+"res := vector (); len := length (arr);\n"
+"while (inx < len)\n"
"{\n"
-"WS.WS.FINDCOL (path, col);\n"
-"select COL_PERMS into perms from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
+"if (length (arr[inx]) > 0)\n"
+"res := vector_concat (res, vector (arr[inx]));\n"
+"inx := inx + 1;\n"
"}\n"
-"else if (WS.WS.ISRES (path))\n"
-"{\n"
-"WS.WS.FINDRES (path, col, name);\n"
-"select RES_PERMS into perms from WS.WS.SYS_DAV_RES where RES_NAME = name and RES_COL = col;\n"
+"return res;\n"
"}\n"
+"--src dav.sql:2967\n";
+
+static const char *proc38 =
+"#line 2989 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.HREF_TO_PATH_ARRAY (in path varchar)\n"
+"{\n"
+"declare arr, res any;\n"
+"declare inx, len integer;\n"
+"arr := split_and_decode (path, 0, \'%\\0/\');\n"
+"if (length (arr) < 1)\n"
+"return arr;\n"
+"if (arr[0] = \'\')\n"
+"inx := 1;\n"
+"else if ((length (arr) > 2) and (arr[0][length (arr[0])-1] = 58) and (arr[1] = \'\') and (arr[2] <> \'\'))\n"
+"inx := 3;\n"
"else\n"
-"return 0;\n"
-"if (perms is null)\n"
-"return 0;\n"
-"given := substring (cast (perms as varchar), 7, 3);\n"
-"return WS.WS.PERM_COMP (given, ask);\n"
-"nf:\n"
-"return 0;\n"
+"inx := 1;\n"
+"res := vector (\'\');\n"
+"len := length (arr);\n"
+"while (inx < len)\n"
+"{\n"
+"if ((inx = len-1) or (length (arr[inx]) > 0))\n"
+"res := vector_concat (res, vector (arr[inx]));\n"
+"inx := inx + 1;\n"
+"}\n"
+"return res;\n"
"}\n"
-"--src dav.sql:3031\n";
+"--src dav.sql:2987\n";
-static const char *proc46 =
-"#line 3059 \"[executable]/dav.sql\"\n"
-"create procedure\n"
-"WS.WS.DAV_VSP_DEF_REMOVE (in path varchar)\n"
+static const char *proc39 =
+"#line 3015 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.DSTIS (in path varchar, in host varchar, out rcol integer, out rname varchar)\n"
"{\n"
-"if (path like \'%.vsp\')\n"
+"declare inx, col, res, id, name_len, depth, cols integer;\n"
+"declare name varchar;\n"
+"declare rc char;\n"
+"\n"
+"rc := \'\';\n"
+"depth := 0;\n"
+"inx := 1;\n"
+"name := \'*\';\n"
+"col := 0;\n"
+"rcol := 0;\n"
+"rname := \'\';\n"
+"cols := 0;\n"
+"\n"
+"while (name <> \'\')\n"
"{\n"
-"declare stat, msg varchar;\n"
-"stat := \'00000\'; msg := \'\';\n"
-"for select P_NAME from DB.DBA.SYS_PROCEDURES where P_NAME like concat (\'%.%.\', path)\n"
-"do\n"
+"name := WS.WS.PATHREF (path,inx,host,name_len);\n"
+"if (name <> \'\')\n"
"{\n"
-"exec (sprintf (\'drop procedure \"%s\"\', P_NAME), stat, msg);\n"
+"cols := cols + 1;\n"
+"if (rc = \'\' or rc = \'C\')\n"
+"{\n"
+"rname := name;\n"
+"whenever not found goto no_more_col;\n"
+"select COL_ID into col from WS.WS.SYS_DAV_COL where COL_PARENT = col and COL_NAME = name;\n"
+"rcol := col;\n"
+"depth := depth + 1;\n"
+"rc := \'C\';\n"
"}\n"
"}\n"
+"inx := inx + 1;\n"
"}\n"
-"--src dav.sql:3057\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"
+"no_more_col:\n"
+"while (name <> \'\')\n"
"{\n"
-"declare l integer;\n"
-"l := length (perms);\n"
-"if (l < 11)\n"
-"perms := perms || subseq (\'000000000--\', l);\n"
-"if (isinteger (ch))\n"
-"perms [pos] := ch;\n"
-"else\n"
-"perms[pos] := ch[0];\n"
-"return perms;\n"
+"name := WS.WS.PATHREF (path,inx,host,name_len);\n"
+"if (name <> \'\')\n"
+"{\n"
+"if (rc = \'\' or rc = \'C\')\n"
+"{\n"
+"rname := name;\n"
+"whenever not found goto no_res;\n"
+"select RES_ID into res from WS.WS.SYS_DAV_RES where RES_COL = col and RES_NAME = name;\n"
+"rcol := col;\n"
+"rc := \'R\';\n"
+"}\n"
+"cols := cols + 1;\n"
+"}\n"
+"inx := inx + 1;\n"
+"}\n"
+"no_res:\n"
+"if (rc = \'C\' and cols - 1 = depth)\n"
+"rc := \'N\';\n"
+"else if (rc = \'C\' and cols - 1 > depth )\n"
+"rc := \'E\';\n"
+"\n"
+"return rc;\n"
"}\n"
-"--src dav.sql:3073\n";
+"--src dav.sql:3013\n";
-static const char *proc48 =
-"#line 3089 \"[executable]/dav.sql\"\n"
-"create procedure DAV_PERMS_FIX (inout perms varchar, in full_perms varchar)\n"
+static const char *proc40 =
+"#line 3077 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.MOVE (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"declare l integer;\n"
-"l := length (perms);\n"
-"if (l < 11)\n"
-"perms := perms || subseq (full_perms, l);\n"
-"if (ascii(\'-\') = perms [9])\n"
-"perms[9] := full_perms[9];\n"
-"if (ascii(\'-\') = perms [10])\n"
-"perms[10] := full_perms[10];\n"
+"WS.WS.COPY_OR_MOVE (path, params, lines, 0);\n"
"}\n"
-"--src dav.sql:3087\n";
+"--src dav.sql:3075\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"
+static const char *proc41 =
+"#line 3083 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.COPY (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"declare l integer;\n"
-"l := length (perms);\n"
-"if (l < 11)\n"
-"perms := perms || subseq (parent_perms, l);\n"
-"if ((ascii(\'-\') = perms [9]) or (force_parent and (ascii(\'T\') <> parent_perms [9])))\n"
-"perms[9] := parent_perms[9];\n"
-"if ((ascii(\'-\') = perms [10]) or (force_parent and (ascii(\'M\') <> parent_perms [10])))\n"
-"perms[10] := parent_perms[10];\n"
+"WS.WS.COPY_OR_MOVE (path, params, lines, 1);\n"
"}\n"
-"--src dav.sql:3100\n";
+"--src dav.sql:3081\n";
-static const char *trig0 =
-"#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"
+static const char *proc42 =
+"#line 3089 \"[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 full_path, name, _pflags, _rflags, _inh varchar;\n"
-"declare parent_col, col, res integer;\n"
-"\n"
-"\n"
-"\n"
-"\n"
+"declare _src_name, st, _dst_name varchar;\n"
+"declare _host varchar;\n"
+"declare _overwrite char;\n"
+"declare _inx, _name_len, _res integer;\n"
+"declare _len integer;\n"
+"declare id, par_id, _src_id integer;\n"
+"declare cont varchar;\n"
+"declare uname, upwd, type, newname, _perms varchar;\n"
+"declare dstis char;\n"
+"declare _u_id, _g_id integer;\n"
+"declare col,res,depth,rc,inx integer;\n"
+"declare name, target_path, location varchar;\n"
+"declare src_id, dst_id, dst_ura, dst_host, _dst_parent any;\n"
+"uname := null;\n"
+"upwd := null;\n"
+"_u_id := null;\n"
+"_g_id := null;\n"
"\n"
+"set isolation = \'serializable\';\n"
+"WS.WS.IS_REDIRECT_REF (path, lines, location);\n"
+"_dst_name := WS.WS.FINDPARAM (lines, \'Destination:\');\n"
+"_dst_name := WS.WS.FIXPATH (_dst_name);\n"
+"_host := WS.WS.FINDPARAM (lines, \'Host:\');\n"
+"_overwrite := WS.WS.FINDPARAM (lines, \'Overwrite:\');\n"
+"dst_ura := rfc1808_parse_uri (_dst_name);\n"
+"dst_host := dst_ura[1];\n"
+"dst_host := split_and_decode (dst_host, 0, \'%\');\n"
"\n"
+"src_id := DAV_HIDE_ERROR (DAV_SEARCH_SOME_ID (vector_concat (vector(\'\'), path), st));\n"
+"if (src_id is null)\n"
+"{\n"
+"src_id := DAV_HIDE_ERROR (DAV_SEARCH_SOME_ID (vector_concat (vector(\'\'), path, vector(\'\')), st));\n"
+"if (src_id is not null)\n"
+"{\n"
+"path := vector_concat (path, vector(\'\'));\n"
+"}\n"
+"}\n"
+"if (src_id is null)\n"
+"{\n"
"\n"
+"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
+"return;\n"
+"}\n"
+"rc := DAV_AUTHENTICATE_HTTP (src_id, st, case (is_copy) when 1 then \'1__\' else \'11_\' end, 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
"\n"
-"col := N.RES_COL;\n"
-"res := N.RES_ID;\n"
-"_rflags := N.RES_PERMS;\n"
-"full_path := concat (\'/\', N.RES_NAME);\n"
-"select COL_PERMS, COL_INHERIT into _pflags, _inh from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
-"if (_inh = \'R\' or _inh = \'M\')\n"
-"_rflags := _pflags;\n"
-"DAV_PERMS_FIX (_pflags, \'000000000TM\');\n"
-"DAV_PERMS_INHERIT (_rflags, _pflags);\n"
-"whenever not found goto not_found;\n"
-"while (1)\n"
+"if (rc < 0)\n"
"{\n"
-"select COL_NAME, COL_PARENT into name, parent_col from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
-"col := parent_col;\n"
-"full_path := concat (\'/\', name, full_path);\n"
+"return;\n"
"}\n"
-"not_found:\n"
-"DAV_SPACE_QUOTA_RES_INSERT (full_path, length (N.RES_CONTENT));\n"
-"set triggers off;\n"
"\n"
-"if (_rflags <> N.RES_PERMS)\n"
+"if (WS.WS.ISLOCKED (vector_concat (vector (\'\'), path), lines, _u_id))\n"
"{\n"
-"update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path, RES_PERMS = _rflags where RES_ID = res;\n"
-"N.RES_PERMS := _rflags;\n"
+"http_request_status (\'HTTP/1.1 423 Locked\');\n"
+"return;\n"
"}\n"
-"else\n"
-"update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path where RES_ID = res;\n"
"\n"
+"target_path := WS.WS.HREF_TO_PATH_ARRAY (_dst_name);\n"
"\n"
-"N.RES_FULL_PATH := full_path;\n"
"\n"
-"declare pub varchar;\n"
-"declare uname, gname varchar;\n"
-"uname := \'\'; gname := \'\';\n"
-"pub := WS.WS.ISPUBL (full_path);\n"
-"if (isstring (pub))\n"
+"if (_host <> \'\' and dst_host <> \'\'\n"
+"and _dst_name <> \'\'\n"
+"and lower (substring (_dst_name, 1, 7)) = \'http://\'\n"
+"and lower (dst_host) <> lower (_host))\n"
+"{\n"
+"if (is_copy)\n"
"{\n"
"\n"
-"whenever not found goto nfu;\n"
-"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.RES_OWNER;\n"
-"nfu:;\n"
-"whenever not found goto nfg;\n"
-"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.RES_GROUP;\n"
-"nfg:;\n"
-"repl_text (pub, \'\"DB.DBA.DAV_RES_I\" (?, ?, ?, ?, ?, ?, ?)\', full_path, N.RES_CR_TIME,\n"
-"uname, gname, N.RES_PERMS, N.RES_TYPE, WS.WS.BODY_ARR (N.RES_CONTENT, null));\n"
+"log_message (sprintf (\'Copy a WebDAV resource from %s to %s\', _host, _dst_name));\n"
+"WS.WS.COPY_TO_OTHER (path, params, lines, _dst_name);\n"
"}\n"
-"\n"
-"if (N.RES_TYPE = \'text/xsl\')\n"
-"xslt_stale (concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', N.RES_FULL_PATH));\n"
-"\n"
-"}\n"
-"--src dav.sql:3114\n";
-
-static const char *trig1 =
-"#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"
+"else\n"
"{\n"
-"declare _pflags, _rflags, _inh varchar;\n"
-"declare col integer;\n"
"\n"
-"_rflags := N.RES_PERMS;\n"
-"if ((O.RES_COL <> N.RES_COL) or (O.RES_PERMS <> N.RES_PERMS))\n"
+"log_message (sprintf (\'Moving a WebDAV resource from %s to %s\', _host, _dst_name));\n"
+"if (1 = WS.WS.COPY_TO_OTHER (path, params, lines, _dst_name))\n"
"{\n"
-"col := N.RES_COL;\n"
-"select COL_PERMS, COL_INHERIT into _pflags, _inh from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
-"if (_inh = \'M\' or _inh = \'R\')\n"
-"_rflags := _pflags;\n"
-"DAV_PERMS_FIX (_pflags, \'000000000TM\');\n"
-"DAV_PERMS_INHERIT (_rflags, _pflags, neq (O.RES_COL, N.RES_COL));\n"
-"}\n"
-"if (_rflags <> N.RES_PERMS)\n"
+"rc := DAV_DELETE_INT (DAV_CONCAT_PATH (\'/\', path), 0, uname, upwd, 0);\n"
+"if (rc <> 1)\n"
"{\n"
-"set triggers off;\n"
-"\n"
-"update WS.WS.SYS_DAV_RES set RES_PERMS = _rflags where RES_ID = N.RES_ID;\n"
-"N.RES_PERMS := _rflags;\n"
+"rollback work;\n"
+"return rc;\n"
"}\n"
-"\n"
"}\n"
-"--src dav.sql:3180\n";
-
-static const char *trig2 =
-"#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"
-"declare parent_col, col, res integer;\n"
-"declare str, cont varchar;\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"col := N.RES_COL;\n"
-"res := N.RES_ID;\n"
-"full_path := concat (\'/\', N.RES_NAME);\n"
-"whenever not found goto not_found;\n"
-"while (1)\n"
-"{\n"
-"select COL_NAME, COL_PARENT into name, parent_col from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
-"col := parent_col;\n"
-"full_path := concat (\'/\', name, full_path);\n"
"}\n"
-"not_found:\n"
-"set triggers off;\n"
-"DAV_SPACE_QUOTA_RES_UPDATE (O.RES_FULL_PATH, length (O.RES_CONTENT), full_path, length (N.RES_CONTENT));\n"
-"\n"
-"if (O.RES_FULL_PATH <> full_path)\n"
-"{\n"
-"update WS.WS.VFS_URL set VU_ETAG = \'\' where VU_RES_ID = O.RES_ID;\n"
+"return;\n"
"}\n"
"\n"
-"WS.WS.DAV_VSP_DEF_REMOVE (O.RES_FULL_PATH);\n"
-"\n"
-"update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path where RES_ID = res;\n"
-"N.RES_FULL_PATH := full_path;\n"
-"\n"
-"\n"
-"\n"
-"declare pub, pub1 varchar;\n"
-"declare uname, gname varchar;\n"
-"uname := \'\'; gname := \'\';\n"
-"pub := WS.WS.ISPUBL (O.RES_FULL_PATH);\n"
-"pub1 := WS.WS.ISPUBL (full_path);\n"
-"if (isstring (pub))\n"
+"if (WS.WS.ISLOCKED (target_path, lines, _u_id))\n"
"{\n"
-"\n"
-"repl_text (pub, \'\"DB.DBA.DAV_RES_D\" (?)\', O.RES_FULL_PATH);\n"
+"http_request_status (\'HTTP/1.1 423 Locked\');\n"
+"return;\n"
"}\n"
"\n"
-"if (isstring (pub1))\n"
+"if (\'C\' = st)\n"
"{\n"
-"\n"
-"whenever not found goto nfu;\n"
-"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.RES_OWNER;\n"
-"nfu:;\n"
-"whenever not found goto nfg;\n"
-"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.RES_GROUP;\n"
-"nfg:;\n"
-"repl_text (pub1, \'\"DB.DBA.DAV_RES_I\" (?, ?, ?, ?, ?, ?, ?)\', full_path, N.RES_MOD_TIME,\n"
-"uname, gname, N.RES_PERMS, N.RES_TYPE, WS.WS.BODY_ARR (N.RES_CONTENT, null));\n"
+"if (target_path[length (target_path) - 1] = \'\')\n"
+"_dst_parent := DAV_HIDE_ERROR (DAV_SEARCH_ID (target_path, \'P\'));\n"
+"else\n"
+"{\n"
+"declare tgt_res any;\n"
+"tgt_res := DAV_SEARCH_ID (target_path, \'R\');\n"
+"if (DAV_HIDE_ERROR (tgt_res) is not null)\n"
+"{\n"
+"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
+"return;\n"
"}\n"
-"\n"
-"if (N.RES_TYPE = \'text/xsl\')\n"
-"xslt_stale (concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', N.RES_FULL_PATH));\n"
-"\n"
+"target_path := vector_concat (target_path, vector (\'\'));\n"
+"_dst_parent := DAV_HIDE_ERROR (DAV_SEARCH_ID (target_path, \'P\'));\n"
"}\n"
-"--src dav.sql:3206\n";
-
-static const char *trig3 =
-"#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"
-"declare old_col_path, new_col_path varchar;\n"
-"declare res, col integer;\n"
-"\n"
-"col := N.COL_PARENT;\n"
-"res := N.COL_ID;\n"
-"full_path := concat (\'/\', N.COL_NAME,\'/\');\n"
-"_cflags := N.COL_PERMS;\n"
-"_pflags := coalesce ((select COL_PERMS from WS.WS.SYS_DAV_COL where COL_ID = col), \'000000000TM\');\n"
-"if ((O.COL_PARENT <> N.COL_PARENT) or (O.COL_PERMS <> N.COL_PERMS))\n"
+"}\n"
+"else\n"
"{\n"
-"DAV_PERMS_FIX (_pflags, \'000000000TM\');\n"
-"DAV_PERMS_INHERIT (_cflags, _pflags);\n"
+"_dst_parent := DAV_HIDE_ERROR (DAV_SEARCH_ID (target_path, \'P\'));\n"
"}\n"
-"whenever not found goto not_found;\n"
-"while (1)\n"
+"if (_dst_parent is null)\n"
"{\n"
-"select COL_NAME, COL_PARENT into name, col from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
-"full_path := concat (\'/\', name, full_path);\n"
+"http_request_status (\'HTTP/1.1 409 Conflict\');\n"
+"return;\n"
"}\n"
-"not_found:\n"
-"set triggers off;\n"
-"if (_cflags <> N.COL_PERMS)\n"
+"rc := DAV_AUTHENTICATE_HTTP (_dst_parent, \'C\', \'11_\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
+"\n"
+"if (rc < 0)\n"
+"return;\n"
+"if (is_copy)\n"
"{\n"
+"rc := DAV_COPY_INT (DAV_CONCAT_PATH (\'/\', path), DAV_CONCAT_PATH (\'/\', target_path), case (_overwrite) when \'T\' then 1 else 0 end, _perms, uname, null, uname, upwd, 0, 0);\n"
"\n"
-"update WS.WS.SYS_DAV_COL set COL_PERMS = _cflags where COL_ID = res;\n"
-"N.COL_PERMS := _cflags;\n"
"}\n"
-"old_col_path := concat (WS.WS.COL_PATH (O.COL_PARENT), O.COL_NAME, \'/\');\n"
-"new_col_path := WS.WS.COL_PATH (N.COL_ID);\n"
-"if (old_col_path <> new_col_path)\n"
+"else\n"
"{\n"
+"rc := DAV_MOVE_INT (DAV_CONCAT_PATH (\'/\', path), DAV_CONCAT_PATH (\'/\', target_path), case (_overwrite) when \'T\' then 1 else 0 end, uname, upwd, 0, 0);\n"
"\n"
-"for\n"
-"select SUBCOL_ID, SUBCOL_FULL_PATH as old_subcol_path, SUBCOL_DET\n"
-"from DAV_PLAIN_SUBMOUNTS\n"
-"where root_id = O.COL_ID and root_path = old_col_path and recursive=1 and subcol_auth_uid = http_dav_uid()\n"
-"and not (SUBCOL_DET like \'%Filter\')\n"
-"do\n"
-"{\n"
-"declare new_subcol_path varchar;\n"
-"new_subcol_path := new_col_path || subseq (old_subcol_path, length (old_col_path));\n"
-"for\n"
-"select CF_ID from WS.WS.SYS_DAV_CATFILTER\n"
-"where (\n"
-"(\"LEFT\" (old_subcol_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) and\n"
-"(\"LEFT\" (new_subcol_path, length (CF_SEARCH_PATH)) <> CF_SEARCH_PATH) )\n"
-"do\n"
-"{\n"
-"delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_CF_ID = CF_ID and CFD_DET_SUBCOL_ID = SUBCOL_ID;\n"
"}\n"
-"for\n"
-"select CF_ID from WS.WS.SYS_DAV_CATFILTER\n"
-"where (\n"
-"(\"LEFT\" (old_subcol_path, length (CF_SEARCH_PATH)) <> CF_SEARCH_PATH) and\n"
-"(\"LEFT\" (new_subcol_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) )\n"
-"do\n"
+"if (DAV_HIDE_ERROR (rc, null) is not null)\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET) values (CF_ID, SUBCOL_ID, SUBCOL_DET);\n"
-"}\n"
+"http_request_status (\'HTTP/1.1 204 No Content\');\n"
+"return;\n"
"}\n"
+"if (rc = 0) { http_request_status (\'HTTP/1.1 207 Multi-Status\'); return; }\n"
+"if (rc = -2) { http_request_status (\'HTTP/1.1 409 Conflict\'); return; }\n"
+"if (rc = -3) { http_request_status (\'HTTP/1.1 412 Precondition Failed\'); return; }\n"
+"DAV_SET_HTTP_REQUEST_STATUS (rc);\n"
"}\n"
-"if (\n"
-"(N.COL_DET is not null or O.COL_DET is not null) and\n"
-"not (N.COL_DET is not null and O.COL_DET is not null and (N.COL_DET = O.COL_DET) and (N.COL_ID = O.COL_ID) and (N.COL_PARENT = O.COL_PARENT)))\n"
+"--src dav.sql:3087\n";
+
+static const char *proc43 =
+"#line 3238 \"[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"
+"declare col, id, rc, len, owner integer;\n"
+"declare type, scope char;\n"
+"declare l_cur cursor for select LOCK_SCOPE, LOCK_OWNER, LOCK_TOKEN from WS.WS.SYS_DAV_LOCK\n"
+"where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type;\n"
"\n"
-"delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_DET_SUBCOL_ID = O.COL_ID;\n"
-"if (N.COL_DET is not null and not (N.COL_DET like \'%Filter\'))\n"
-"{\n"
-"for select CF_ID from WS.WS.SYS_DAV_CATFILTER where \"LEFT\" (new_col_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH do\n"
+"if (exists (select 1 from WS.WS.SYS_DAV_LOCK where datediff (\'second\', LOCK_TIME, now()) > LOCK_TIMEOUT))\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET)\n"
-"values (CF_ID, N.COL_ID, N.COL_DET);\n"
-"}\n"
-"}\n"
-"}\n"
-"\n"
-"declare repl varchar;\n"
-"repl := null;\n"
-"declare pub, pub1 varchar;\n"
-"declare uname, gname varchar;\n"
+"delete from WS.WS.SYS_DAV_LOCK where datediff (\'second\', LOCK_TIME, now()) > LOCK_TIMEOUT;\n"
"\n"
-"uname := \'\'; gname := \'\';\n"
-"pub := WS.WS.ISPUBL (old_col_path);\n"
-"pub1 := WS.WS.ISPUBL (new_col_path);\n"
-"if (isstring (pub1))\n"
-"{\n"
-"whenever not found goto nfu;\n"
-"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.COL_OWNER;\n"
-"nfu:;\n"
-"whenever not found goto nfg;\n"
-"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.COL_GROUP;\n"
-"nfg:;\n"
"}\n"
-"if ((not isstring (pub) and isstring (pub1)) or (isstring (pub) and isstring (pub1) and pub <> pub1))\n"
+"rc := 0;\n"
+"if (path is null)\n"
"{\n"
"\n"
-"repl_text (pub1, \'\"DB.DBA.DAV_COL_I\" (?, ?, ?, ?, ?, ?)\',\n"
-"N.COL_NAME, new_col_path, N.COL_CR_TIME, uname, gname,\n"
-"N.COL_PERMS );\n"
-"repl := pub1;\n"
+"return 0;\n"
"}\n"
-"if (isstring (pub) and isstring (pub1) and pub = pub1)\n"
-"{\n"
+"len := length (path);\n"
+"if_token := WS.WS.FINDPARAM (lines, \'If:\');\n"
+"if (isnull (if_token))\n"
+"if_token := \'\';\n"
+"id := DAV_HIDE_ERROR (DAV_SEARCH_SOME_ID (path, type), null);\n"
"\n"
-"repl_text (pub1, \'\"DB.DBA.DAV_COL_U\" (?, ?, ?, ?, ?, ?)\',\n"
-"old_col_path, new_col_path, N.COL_CR_TIME, uname, gname,\n"
-"N.COL_PERMS );\n"
+"if (id is null)\n"
+"return 0;\n"
+"if (len > 1)\n"
+"{\n"
+"rc := WS.WS.ISLOCKED (WS.WS.PARENT_PATH (path), lines, _u_id);\n"
+"if (rc > 0)\n"
+"return rc;\n"
"}\n"
-"if ((not isstring (pub1) and isstring (pub)) or (isstring (pub) and isstring (pub1) and pub <> pub1))\n"
+"if (isarray (id))\n"
"{\n"
-"\n"
-"repl_text (pub, \'\"DB.DBA.DAV_COL_D\" (?, 1)\', old_col_path);\n"
+"rc := call (cast (id[0] as varchar) || \'_DAV_IS_LOCKED\') (id, type, if_token);\n"
+"return rc;\n"
"}\n"
-"\n"
-"WS.WS.UPDCHILD (res, full_path, _pflags, repl);\n"
-"set triggers on;\n"
-"if (ascii(\'R\') = _pflags[9])\n"
-"update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, \'T\', 9)\n"
-"where (RES_FULL_PATH between full_path and DAV_COL_PATH_BOUNDARY (full_path))\n"
-"and RES_PERMS[9] = ascii (\'N\');\n"
-"else\n"
-"update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, _pflags[9], 9)\n"
-"where RES_COL = res and (case (lt (length (RES_PERMS), 10)) when 1 then 0 else RES_PERMS[9] end) <> _pflags[9];\n"
-"if (ascii(\'R\') = _pflags[10])\n"
-"update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, \'M\', 10)\n"
-"where (RES_FULL_PATH between full_path and DAV_COL_PATH_BOUNDARY (full_path))\n"
-"and RES_PERMS[10] = ascii (\'N\');\n"
+"whenever not found goto not_locked;\n"
+"open l_cur (prefetch 1);\n"
+"fetch l_cur into scope, owner, token;\n"
+"if (scope = \'X\')\n"
+"rc := 2;\n"
"else\n"
-"update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, _pflags[10], 10)\n"
-"where RES_COL = res and (case (lt (length (RES_PERMS), 11)) when 1 then 0 else RES_PERMS[10] end) <> _pflags[10];\n"
+"rc := 1;\n"
+"if (not isnull (strstr (if_token, token)))\n"
+"rc := 0;\n"
+"not_locked:\n"
"\n"
+"close l_cur;\n"
+"return rc;\n"
"}\n"
-"--src dav.sql:3277\n";
+"--src dav.sql:3236\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"
+static const char *proc44 =
+"#line 3292 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.CHECK_AUTH (in lines any)\n"
"{\n"
-"declare name, new_path, str varchar;\n"
-"declare id integer;\n"
-"declare c_cur cursor for select COL_ID, COL_NAME, COL_MOD_TIME, COL_PERMS, COL_OWNER, COL_GROUP\n"
-"from WS.WS.SYS_DAV_COL where COL_PARENT = col;\n"
+"declare _u_group, _u_id integer;\n"
+"declare _perms varchar;\n"
+"_u_id := WS.WS.GET_AUTH (lines, _u_group, _perms);\n"
+"return _u_id;\n"
+"}\n"
+"--src dav.sql:3290\n";
+
+static const char *proc45 =
+"#line 3302 \"[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"
+"if (\'\' <> WS.WS.FINDPARAM (lines, \'Authorization:\') and db.dba.vsp_auth_vec (lines) <> 0)\n"
+"{\n"
+"_u_id := WS.WS.GET_AUTH (lines, _u_group, _perms);\n"
+"}\n"
+"else\n"
+"{\n"
+"_u_id := http_nobody_uid ();\n"
+"_u_group := http_nogroup_gid ();\n"
+"_perms := \'110110110-\' || \'-\';\n"
+"connection_set (\'DAVUserID\', _u_id);\n"
+"connection_set (\'DAVBillingUserID\', _u_id);\n"
+"connection_set (\'DAVGroupID\', _u_group);\n"
+"}\n"
+"return _u_id;\n"
+"}\n"
+"--src dav.sql:3300\n";
+
+static const char *proc46 =
+"#line 3322 \"[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"
+"declare auth any;\n"
+"declare _user varchar;\n"
+"declare our_auth_vec varchar;\n"
+"declare _method, rc integer;\n"
"\n"
-"for select RES_ID, RES_NAME, RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = col do\n"
+"_u_name := null;\n"
+"_u_password := null;\n"
+"_uid := null;\n"
+"_gid := null;\n"
+"_perms := null;\n"
+"\n"
+"auth := db.dba.vsp_auth_vec (lines);\n"
+"\n"
+"if (0 = auth)\n"
"{\n"
+"goto request_auth;\n"
+"}\n"
"\n"
-"update WS.WS.VFS_URL set VU_ETAG = \'\' where VU_RES_ID = RES_ID;\n"
+"_user := get_keyword (\'username\', auth);\n"
"\n"
-"if (RES_NAME like \'%.vsp\')\n"
-"WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH);\n"
+"if (_user = \'\' or isnull (_user))\n"
+"{\n"
+"_user := null;\n"
+"goto request_auth;\n"
"}\n"
"\n"
-"update WS.WS.SYS_DAV_RES set RES_FULL_PATH = concat (root_path, RES_NAME) where RES_COL = col and ((RES_FULL_PATH <> concat (root_path, RES_NAME)) or RES_FULL_PATH is null);\n"
-"if (ascii (\'R\') = _pflags[9])\n"
-"update WS.WS.SYS_DAV_COL set COL_PERMS = DAV_PERMS_SET_CHAR (COL_PERMS, \'R\', 9)\n"
-"where COL_PARENT = col and ascii (\'R\') <> COL_PERMS[9];\n"
-"if (ascii (\'R\') = _pflags[10])\n"
-"update WS.WS.SYS_DAV_COL set COL_PERMS = DAV_PERMS_SET_CHAR (COL_PERMS, \'R\', 10)\n"
-"where COL_PARENT = col and ascii (\'R\') <> COL_PERMS[10];\n"
+"allow_anon := 0;\n"
+"whenever not found goto request_auth;\n"
"\n"
+"set isolation=\'committed\';\n"
+"select U_NAME, U_PWD, U_GROUP, U_ID, U_METHODS, U_DEF_PERMS\n"
+"into _u_name, _u_password, _gid, _uid, _method, _perms from WS.WS.SYS_DAV_USER\n"
+"where U_NAME = _user and U_ACCOUNT_DISABLED = 0 and U_PWD is not null with (prefetch 1);\n"
"\n"
-"declare _grp, _uid integer;\n"
-"declare cperms varchar;\n"
-"declare ctime datetime;\n"
-"declare uname, gname varchar;\n"
-"declare rn, rt, rc, rp varchar;\n"
-"declare ro, rg integer;\n"
-"declare rmt datetime;\n"
-"declare chr cursor for select RES_NAME, RES_TYPE, RES_CONTENT, RES_PERMS,\n"
-"RES_OWNER, RES_GROUP, RES_MOD_TIME from WS.WS.SYS_DAV_RES\n"
-"where RES_COL = col;\n"
-"if (repl is not null)\n"
+"\n"
+"\n"
+"rc := -1;\n"
+"\n"
+"if (sys_stat (\'dbev_enable\') and __proc_exists (\'DB.DBA.DBEV_DAV_LOGIN\'))\n"
"{\n"
-"whenever not found goto er;\n"
-"open chr;\n"
-"while (1)\n"
+"rc := DB.DBA.DBEV_DAV_LOGIN (_user, _u_password, auth);\n"
+"}\n"
+"else\n"
"{\n"
-"fetch chr into rn, rt, rc, rp, ro, rg, rmt;\n"
-"whenever not found goto nfu;\n"
-"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = ro;\n"
-"nfu:;\n"
-"whenever not found goto nfg;\n"
-"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = rg;\n"
-"nfg:;\n"
-"repl_text (repl, \'\"DB.DBA.DAV_RES_I\" (?, ?, ?, ?, ?, ?, ?)\', concat (root_path, rn),\n"
-"rmt, uname, gname, rp, rt, WS.WS.BODY_ARR (rc, null));\n"
+"rc := DB.DBA.LDAP_LOGIN (_user, _u_password, auth);\n"
"}\n"
-"er:\n"
-"close chr;\n"
"\n"
-"}\n"
+"if (rc = 0)\n"
+"goto request_auth;\n"
+"if (rc = 1)\n"
+"goto authenticated;\n"
"\n"
-"whenever not found goto not_col;\n"
-"open c_cur;\n"
-"while (1)\n"
-"{\n"
-"fetch c_cur into id, name, ctime, cperms, _uid, _grp;\n"
-"new_path := concat (root_path, name, \'/\');\n"
"\n"
-"if (repl is not null)\n"
+"if (_u_password is null)\n"
+"goto request_auth;\n"
+"\n"
+"if (not db.dba.vsp_auth_verify_pass (auth, _u_name,\n"
+"coalesce(get_keyword (\'realm\', auth), \'\'),\n"
+"coalesce(get_keyword (\'uri\', auth), \'\'),\n"
+"coalesce(get_keyword (\'nonce\', auth), \'\'),\n"
+"coalesce(get_keyword (\'nc\', auth),\'\'),\n"
+"coalesce(get_keyword (\'cnonce\', auth), \'\'),\n"
+"coalesce(get_keyword (\'qop\', auth), \'\'),\n"
+"_u_password))\n"
+"goto request_auth;\n"
+"\n"
+"authenticated:\n"
"{\n"
-"whenever not found goto nfu1;\n"
-"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = _uid;\n"
-"nfu1:;\n"
-"whenever not found goto nfg1;\n"
-"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = _grp;\n"
-"nfg1:;\n"
-"repl_text (repl, \'\"DB.DBA.DAV_COL_I\" (?, ?, ?, ?, ?, ?)\',\n"
-"name, new_path, ctime, uname, gname,\n"
-"cperms );\n"
+"\n"
+"update WS.WS.SYS_DAV_USER set U_LOGIN_TIME = now () where U_NAME = _user\n"
+"and U_LOGIN_TIME < dateadd (\'minute\', -2, now ());\n"
+"connection_set (\'DAVUserID\', _uid);\n"
+"connection_set (\'DAVBillingUserID\', _uid);\n"
+"connection_set (\'DAVGroupID\', _gid);\n"
+"\n"
+"commit work;\n"
+"set isolation=\'repeatable\';\n"
+"return _uid;\n"
"}\n"
"\n"
-"WS.WS.UPDCHILD (id, new_path, _pflags, repl);\n"
+"request_auth:\n"
+"_u_name := null;\n"
+"_u_password := null;\n"
+"_uid := null;\n"
+"_gid := null;\n"
+"_perms := null;\n"
+"if (allow_anon)\n"
+"{\n"
+"_uid := http_nobody_uid ();\n"
+"_gid := http_nogroup_gid ();\n"
+"connection_set (\'DAVUserID\', _uid);\n"
+"connection_set (\'DAVBillingUserID\', _uid);\n"
+"connection_set (\'DAVGroupID\', _gid);\n"
+"_perms := \'110110110RR\';\n"
+"return 0;\n"
"}\n"
-"not_col:\n"
-"close c_cur;\n"
+"if (not can_write_http)\n"
+"return -12;\n"
+"db.dba.vsp_auth_get (\'DAV\', \'/DAV\',\n"
+"md5 (datestring(now())),\n"
+"md5 (\'opaakki\'),\n"
+"\'false\', lines, 1);\n"
+"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
+"\'<HTML><HEAD>\',\n"
+"\'<TITLE>401 Unauthorized</TITLE>\',\n"
+"\'</HEAD><BODY><H1>Unauthorized</H1>\',\n"
+"\'Access to page is forbidden.</BODY></HTML>\'));\n"
+"return -24;\n"
"}\n"
-"--src dav.sql:3415\n";
+"--src dav.sql:3320\n";
-static const char *trig4 =
-"#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"
+static const char *proc47 =
+"#line 3436 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.PERM_COMP (in perm varchar, in mask varchar)\n"
"{\n"
-"declare _pflags, _cflags, col_path, _inh varchar;\n"
-"declare _col, _p_col integer;\n"
+"declare inx integer;\n"
+"inx := 0;\n"
+"if (length (perm) <> 3 or length (mask) <> 3)\n"
+"return 0;\n"
"\n"
-"_col := N.COL_ID;\n"
-"_p_col := N.COL_PARENT;\n"
-"col_path := WS.WS.COL_PATH (N.COL_ID);\n"
-"set triggers off;\n"
-"_cflags := N.COL_PERMS;\n"
-"_pflags := \'000000000NN\';\n"
-"_inh := \'N\';\n"
-"for select COL_PERMS, COL_INHERIT from WS.WS.SYS_DAV_COL where COL_ID = _p_col do\n"
-"{\n"
-"_pflags := COL_PERMS;\n"
-"_inh := COL_INHERIT;\n"
-"}\n"
-"if (_inh = \'R\')\n"
-"_cflags := _pflags;\n"
-"DAV_PERMS_FIX (_cflags, _pflags);\n"
-"if (_cflags <> N.COL_PERMS)\n"
-"update WS.WS.SYS_DAV_COL set COL_PERMS = _cflags where COL_ID = _col;\n"
-"if (N.COL_DET is not null and not (N.COL_DET like \'%Filter\'))\n"
+"while (inx < 3)\n"
"{\n"
-"for select CF_ID from WS.WS.SYS_DAV_CATFILTER where \"LEFT\" (col_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH do\n"
+"if (aref (mask, inx) = ascii(\'1\') and aref (perm, inx) <> ascii(\'1\'))\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET)\n"
-"values (CF_ID, _col, N.COL_DET);\n"
+"return 0;\n"
"}\n"
+"inx := inx + 1;\n"
"}\n"
-"\n"
-"declare pub varchar;\n"
-"declare uname, gname varchar;\n"
-"uname := \'\'; gname := \'\';\n"
-"pub := WS.WS.ISPUBL (col_path);\n"
-"if (isstring (pub))\n"
+"return 1;\n"
+"}\n"
+"--src dav.sql:3434\n";
+
+static const char *proc48 =
+"#line 3456 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.CHECKPERM ( in path varchar, in _u_id integer, in action varchar)\n"
"{\n"
-"\n"
-"whenever not found goto nfu;\n"
-"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.COL_OWNER;\n"
-"nfu:;\n"
-"whenever not found goto nfg;\n"
-"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.COL_GROUP;\n"
-"nfg:;\n"
-"repl_text (pub, \'\"DB.DBA.DAV_COL_I\" (?, ?, ?, ?, ?, ?)\',\n"
-"N.COL_NAME, col_path, N.COL_CR_TIME, uname, gname, N.COL_PERMS );\n"
+"declare g_id, _user, _group integer;\n"
+"declare _perms varchar;\n"
+"declare name varchar;\n"
+"declare col integer;\n"
+"declare temp varchar;\n"
+"declare rc integer;\n"
+"rc := 0;\n"
+"_perms := \'000000000\';\n"
+"if (_u_id > 0 and _u_id is not null)\n"
+"{\n"
+"g_id := connection_get (\'DAVGroupID\');\n"
"}\n"
"\n"
-"\n"
-"}\n"
-"--src dav.sql:3498\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"
-"declare incst, dep any;\n"
-"dep := null;\n"
-"incst := registry_get (concat (\'__depend_\', own, \'_\', full_path));\n"
-"if (isstring (incst))\n"
-"dep := deserialize (incst);\n"
-"if (isarray (dep))\n"
+"if (_u_id = http_dav_uid () and action not like \'__1\')\n"
"{\n"
-"declare i, l integer;\n"
-"declare mt datetime;\n"
-"l := length (dep); i := 0;\n"
-"if (mod (l, 2))\n"
+"connection_set (\'DAVQuota\', -1);\n"
"return 1;\n"
-"while (i < l)\n"
+"}\n"
+"if (WS.WS.ISCOL (path))\n"
"{\n"
-"if (not exists (select 1 from WS.WS.SYS_DAV_RES\n"
-"where RES_FULL_PATH = dep [i] and RES_MOD_TIME = stringdate(dep [i+1])))\n"
-"return 1;\n"
-"i := i + 2;\n"
+"WS.WS.FINDCOL (path, col);\n"
+"select COL_OWNER, COL_GROUP, COL_PERMS into _user, _group, _perms from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
"}\n"
+"else if (WS.WS.ISRES (path))\n"
+"{\n"
+"WS.WS.FINDRES (path, col, name);\n"
+"select RES_OWNER, RES_GROUP, RES_PERMS into _user, _group, _perms\n"
+"from WS.WS.SYS_DAV_RES where RES_COL = col and RES_NAME = name;\n"
"}\n"
+"else if (not WS.WS.ISCOL(path) and not WS.WS.ISRES (path) and WS.WS.ISCOL (WS.WS.PARENT_PATH (path)))\n"
+"{\n"
+"if (is_http_ctx())\n"
+"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
"return 0;\n"
"}\n"
-"--src dav.sql:3550\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"
+"if (_perms is null)\n"
+"return 0;\n"
+"if (_u_id = _user)\n"
"{\n"
-"declare curr_file, new_file_name, name, _perms varchar;\n"
-"declare include_inx, end_tag_inx, _u_id, _grp integer;\n"
-"declare apath any;\n"
-"declare rc, col integer;\n"
-"declare modt datetime;\n"
-"\n"
-"end_tag_inx := 0;\n"
-"if (ct = 0)\n"
+"temp := substring (cast (_perms as varchar), 1, 3);\n"
+"rc := WS.WS.PERM_COMP (temp, action);\n"
+"}\n"
+"if (_group = g_id and rc = 0)\n"
"{\n"
-"apath := WS.WS.HREF_TO_ARRAY (path, \'\');\n"
-"rc := WS.WS.FINDRES (apath, col, name);\n"
+"temp := substring (cast (_perms as varchar), 4, 3);\n"
+"rc := WS.WS.PERM_COMP (temp, action);\n"
"}\n"
-"else\n"
+"if (rc = 0)\n"
"{\n"
-"rc := 1;\n"
+"temp := substring (cast (_perms as varchar), 7, 3);\n"
+"rc := WS.WS.PERM_COMP (temp, action);\n"
"}\n"
"\n"
-"if (rc < 0 and 0 <> file_stat (http_root () || path))\n"
+"if (rc = 0)\n"
+"{\n"
+"temp := substring (cast (_perms as varchar), 4, 3);\n"
+"rc := WS.WS.PERM_COMP (temp, action);\n"
+"if (rc > 0 and exists (select 1 from WS.WS.SYS_DAV_USER_GROUP where UG_UID = _u_id and UG_GID = _group))\n"
"{\n"
-"content := file_to_string (http_root () || path);\n"
-"ct := 1;\n"
"rc := 1;\n"
"}\n"
-"\n"
-"if (isarray (rc))\n"
-"signal (\'37000\', sprintf (\'The included resource \"%s\" is a special \"%s\" resource, not a plain DAV one\', path, rc[0]), \'DA010\');\n"
-"if (rc < 0)\n"
-"signal (\'37000\', sprintf (\'The included resource \"%s\" does not exist\', path), \'DA009\');\n"
"else\n"
+"rc := 0;\n"
+"}\n"
+"if (rc = 0 and is_http_ctx ())\n"
"{\n"
-"if (ct = 0)\n"
-"{\n"
-"declare exit handler for not found\n"
+"http_request_status (\'HTTP/1.1 403 Forbidden\');\n"
+"http ( concat (\'<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\',\n"
+"\'<HTML><HEAD>\',\n"
+"\'<TITLE>403 Forbidden</TITLE>\',\n"
+"\'</HEAD><BODY><H1>Forbidden</H1>\',\n"
+"\'Resource is forbidden.</BODY></HTML>\'));\n"
+"}\n"
+"return rc;\n"
+"}\n"
+"--src dav.sql:3454\n";
+
+static const char *proc49 =
+"#line 3535 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.ISPUBLIC (in path varchar, in ask varchar)\n"
"{\n"
-"signal (\'22023\', sprintf (\'The included resource \"%s\" does not exist\', path), \'DA009\');\n"
-"};\n"
-"select blob_to_string (RES_CONTENT), RES_OWNER, RES_GROUP, RES_PERMS, RES_MOD_TIME\n"
-"into curr_file, _u_id, _grp, _perms, modt from WS.WS.SYS_DAV_RES\n"
-"where RES_NAME = name and RES_COL = col;\n"
-"if (not http_map_get (\'executable\'))\n"
+"declare perms, name, given varchar;\n"
+"declare res, col integer;\n"
+"whenever not found goto nf;\n"
+"if (WS.WS.ISCOL (path))\n"
"{\n"
-"if (_u_id <> http_dav_uid () or _perms like \'____1%\' or _perms like \'_______1%\')\n"
-"signal (\'37000\', \'Includes can be owned only by admin & cannot be writable for others\', \'DA001\');\n"
+"WS.WS.FINDCOL (path, col);\n"
+"select COL_PERMS into perms from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
"}\n"
-"if (st is not null and isarray (st))\n"
-"st := vector_concat (st, vector (path, datestring(modt)));\n"
+"else if (WS.WS.ISRES (path))\n"
+"{\n"
+"WS.WS.FINDRES (path, col, name);\n"
+"select RES_PERMS into perms from WS.WS.SYS_DAV_RES where RES_NAME = name and RES_COL = col;\n"
"}\n"
"else\n"
-"curr_file := content;\n"
+"return 0;\n"
+"if (perms is null)\n"
+"return 0;\n"
+"given := substring (cast (perms as varchar), 7, 3);\n"
+"return WS.WS.PERM_COMP (given, ask);\n"
+"nf:\n"
+"return 0;\n"
"}\n"
-"\n"
-"include_inx := strcasestr (curr_file, \'<?include\');\n"
-"while (include_inx is not null)\n"
+"--src dav.sql:3533\n";
+
+static const char *proc50 =
+"#line 3561 \"[executable]/dav.sql\"\n"
+"create procedure\n"
+"WS.WS.DAV_VSP_DEF_REMOVE (in path varchar)\n"
"{\n"
-"if (level > 20)\n"
-"signal ( \'37000\', sprintf (\'Max nesting level (20) reached when processing %s\', path), \'DA002\');\n"
-"end_tag_inx := strstr (subseq (curr_file, include_inx, length (curr_file)), \'?>\');\n"
-"if (end_tag_inx is null)\n"
-"signal ( \'37000\', sprintf (\'Unterminated include tag at offset %d in %s\', include_inx, path), \'DA003\');\n"
-"end_tag_inx := end_tag_inx + include_inx;\n"
-"if (end_tag_inx - include_inx - 9 <= 0)\n"
-"signal ( \'37000\',\n"
-"sprintf (\'An include tag at offset %d with no name or VSP end tag before an include tag in %s \',\n"
-"include_inx, path), \'DA004\');\n"
-"if (include_inx > 0)\n"
-"http (subseq (curr_file, 0, include_inx), stream);\n"
-"new_file_name := trim (subseq (curr_file, include_inx + 9, end_tag_inx));\n"
-"if (aref (new_file_name, 0) <> ascii( \'/\'))\n"
+"if (path like \'%.vsp\')\n"
"{\n"
-"\n"
-"new_file_name := WS.WS.EXPAND_URL (path, new_file_name);\n"
+"declare stat, msg varchar;\n"
+"stat := \'00000\'; msg := \'\';\n"
+"for select P_NAME from DB.DBA.SYS_PROCEDURES where P_NAME like concat (\'%.%.\', path)\n"
+"do\n"
+"{\n"
+"exec (sprintf (\'drop procedure \"%s\"\', P_NAME), stat, msg);\n"
"}\n"
-"WS.WS.EXPAND_INCLUDES (new_file_name, stream, level + 1, 0, \'\', st);\n"
-"if (end_tag_inx + 2 <= length (curr_file))\n"
-"curr_file := subseq (curr_file, end_tag_inx + 2, length (curr_file));\n"
-"include_inx := strcasestr (curr_file, \'<?include\');\n"
"}\n"
-"if (length (curr_file) > 0)\n"
-"http (curr_file, stream);\n"
"}\n"
-"--src dav.sql:3578\n";
+"--src dav.sql:3559\n";
-static const char *trig5 =
-"#line 3665 \"[executable]/dav.sql\"\n"
-"create trigger SYS_DAV_RES_FULL_PATH_D after delete on WS.WS.SYS_DAV_RES\n"
+static const char *proc51 =
+"#line 3577 \"[executable]/dav.sql\"\n"
+"create function DAV_PERMS_SET_CHAR (in perms varchar, in ch any, in pos integer) returns varchar\n"
"{\n"
-"set triggers off;\n"
-"\n"
-"DAV_SPACE_QUOTA_RES_DELETE (RES_FULL_PATH, length (RES_CONTENT));\n"
-"\n"
-"\n"
-"WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH);\n"
-"if (RES_TYPE = \'xml/persistent-view\')\n"
-"delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = RES_FULL_PATH;\n"
-"\n"
-"declare pub varchar;\n"
-"pub := WS.WS.ISPUBL (RES_FULL_PATH);\n"
-"if (isstring (pub))\n"
+"declare l integer;\n"
+"l := length (perms);\n"
+"if (l < 11)\n"
+"perms := perms || subseq (\'000000000--\', l);\n"
+"if (isinteger (ch))\n"
+"perms [pos] := ch;\n"
+"else\n"
+"perms[pos] := ch[0];\n"
+"return perms;\n"
+"}\n"
+"--src dav.sql:3575\n";
+
+static const char *proc52 =
+"#line 3591 \"[executable]/dav.sql\"\n"
+"create procedure DAV_PERMS_FIX (inout perms varchar, in full_perms varchar)\n"
"{\n"
-"\n"
-"repl_text (pub, \'\"DB.DBA.DAV_RES_D\" (?)\', RES_FULL_PATH);\n"
+"declare l integer;\n"
+"l := length (perms);\n"
+"if (l < 11)\n"
+"perms := perms || subseq (full_perms, l);\n"
+"if (ascii(\'-\') = perms [9])\n"
+"perms[9] := full_perms[9];\n"
+"if (ascii(\'-\') = perms [10])\n"
+"perms[10] := full_perms[10];\n"
"}\n"
-"\n"
-"\n"
-"update WS.WS.VFS_URL set VU_ETAG = \'\' where VU_RES_ID = RES_ID;\n"
-"if (RES_TYPE = \'text/xsl\')\n"
-"xslt_stale (concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', RES_FULL_PATH));\n"
-"\n"
-"delete from WS.WS.SYS_DAV_PROP where PROP_TYPE = \'R\' and PROP_PARENT_ID = RES_ID;\n"
-"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'R\' and LOCK_PARENT_ID = RES_ID;\n"
-"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = RES_ID;\n"
-"\n"
+"--src dav.sql:3589\n";
+
+static const char *proc53 =
+"#line 3604 \"[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"
+"l := length (perms);\n"
+"if (l < 11)\n"
+"perms := perms || subseq (parent_perms, l);\n"
+"if ((ascii(\'-\') = perms [9]) or (force_parent and (ascii(\'T\') <> parent_perms [9])))\n"
+"perms[9] := parent_perms[9];\n"
+"if ((ascii(\'-\') = perms [10]) or (force_parent and (ascii(\'M\') <> parent_perms [10])))\n"
+"perms[10] := parent_perms[10];\n"
"}\n"
-"--src dav.sql:3663\n";
+"--src dav.sql:3602\n";
-static const char *trig6 =
-"#line 3696 \"[executable]/dav.sql\"\n"
-"create trigger SYS_DAV_COL_D before delete on WS.WS.SYS_DAV_COL order 100\n"
+static const char *trig0 =
+"#line 3618 \"[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 pub, col_path varchar;\n"
-"col_path := WS.WS.COL_PATH (COL_ID);\n"
+"declare full_path, name, _pflags, _rflags, _inh varchar;\n"
+"declare parent_col, col, res integer;\n"
"\n"
-"delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_DET_SUBCOL_ID = COL_ID;\n"
"\n"
-"pub := WS.WS.ISPUBL (col_path);\n"
-"if (isstring (pub))\n"
-"{\n"
"\n"
-"repl_text (pub, \'\"DB.DBA.DAV_COL_D\" (?, 0)\', col_path);\n"
-"}\n"
"\n"
-"delete from WS.WS.SYS_DAV_PROP where PROP_TYPE = \'C\' and PROP_PARENT_ID = COL_ID;\n"
-"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = COL_ID;\n"
"\n"
-"}\n"
-"--src dav.sql:3694\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"
-"in top_tag varchar,\n"
-"in path varchar,\n"
-"in meta_mode integer,\n"
-"in meta_data varchar,\n"
-"inout http_body any\n"
-")\n"
-"{\n"
-"if (meta_mode = 0)\n"
-"{\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
-"http (concat (\'<\',top_tag,\'>\\n\'), http_body);\n"
-"return;\n"
-"}\n"
-"if (meta_mode = 1)\n"
-"{\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
-"http (concat (\'<!DOCTYPE \', top_tag, \' [\\n\'), http_body);\n"
-"http (xml_view_dtd (view_name, top_tag), http_body);\n"
-"http (concat (meta_data, \'] >\\n\'), http_body);\n"
-"http (concat (\'<\',top_tag,\'>\\n\'), http_body);\n"
-"return;\n"
-"}\n"
-"if (meta_mode = 2)\n"
-"{\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
-"http (concat (\'<!DOCTYPE \', top_tag, \' SYSTEM \"\', path, \'.dtd\">\'), http_body);\n"
-"http (concat (\'<\',top_tag,\'>\\n\'), http_body);\n"
-"return;\n"
-"}\n"
-"if (meta_mode = 3)\n"
-"{\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
-"http (concat (\'<!DOCTYPE \', top_tag, \' \', meta_data, \'>\'), http_body);\n"
-"http (concat (\'<\',top_tag,\'>\\n\'), http_body);\n"
-"return;\n"
-"}\n"
-"if (meta_mode = 4)\n"
+"\n"
+"\n"
+"\n"
+"col := N.RES_COL;\n"
+"res := N.RES_ID;\n"
+"_rflags := N.RES_PERMS;\n"
+"full_path := concat (\'/\', N.RES_NAME);\n"
+"select COL_PERMS, COL_INHERIT into _pflags, _inh from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
+"if (_inh = \'R\' or _inh = \'M\')\n"
+"_rflags := _pflags;\n"
+"DAV_PERMS_FIX (_pflags, \'000000000TM\');\n"
+"DAV_PERMS_INHERIT (_rflags, _pflags);\n"
+"whenever not found goto not_found;\n"
+"while (1)\n"
"{\n"
-"signal (\'22023\', \'Unsupported type of metadata\', \'DA005\');\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
-"http (concat (\'<\',top_tag,\' xmlns=\"\', path, \'.xsd\" \',meta_data, \'>\\n\'), http_body);\n"
-"return;\n"
+"select COL_NAME, COL_PARENT into name, parent_col from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
+"col := parent_col;\n"
+"full_path := concat (\'/\', name, full_path);\n"
"}\n"
-"if (meta_mode = 5)\n"
+"not_found:\n"
+"DAV_SPACE_QUOTA_RES_INSERT (full_path, length (N.RES_CONTENT));\n"
+"set triggers off;\n"
+"\n"
+"if (_rflags <> N.RES_PERMS)\n"
"{\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
-"http (concat (\'<\',top_tag,\' xmlns=\"\', path, \'.xsd\" \', meta_data, \'>\\n\'), http_body);\n"
-"return;\n"
+"update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path, RES_PERMS = _rflags where RES_ID = res;\n"
+"N.RES_PERMS := _rflags;\n"
"}\n"
-"if (meta_mode = 6)\n"
+"else\n"
+"update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path where RES_ID = res;\n"
+"\n"
+"\n"
+"N.RES_FULL_PATH := full_path;\n"
+"\n"
+"declare pub varchar;\n"
+"declare uname, gname varchar;\n"
+"uname := \'\'; gname := \'\';\n"
+"pub := WS.WS.ISPUBL (full_path);\n"
+"if (isstring (pub))\n"
"{\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
-"http (concat (\'<\',top_tag ,\' \' , meta_data, \'>\\n\'), http_body);\n"
-"return;\n"
+"\n"
+"whenever not found goto nfu;\n"
+"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.RES_OWNER;\n"
+"nfu:;\n"
+"whenever not found goto nfg;\n"
+"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.RES_GROUP;\n"
+"nfg:;\n"
+"repl_text (pub, \'\"DB.DBA.DAV_RES_I\" (?, ?, ?, ?, ?, ?, ?)\', full_path, N.RES_CR_TIME,\n"
+"uname, gname, N.RES_PERMS, N.RES_TYPE, WS.WS.BODY_ARR (N.RES_CONTENT, null));\n"
"}\n"
-"signal (\'22023\', \'Unsupported type of metadata\', \'DA006\');\n"
+"\n"
+"if (N.RES_TYPE = \'text/xsl\')\n"
+"xslt_stale (concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', N.RES_FULL_PATH));\n"
+"\n"
"}\n"
-"--src dav.sql:3716\n";
+"--src dav.sql:3616\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"
-"in top_tag varchar,\n"
-"in meta_mode integer,\n"
-"in meta_data varchar,\n"
-"inout http_body any,\n"
-"inout meta_path_suffix varchar,\n"
-"inout mime_type varchar\n"
-")\n"
+static const char *trig1 =
+"#line 3684 \"[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"
-"if (meta_mode = 2)\n"
+"declare _pflags, _rflags, _inh varchar;\n"
+"declare col integer;\n"
+"\n"
+"_rflags := N.RES_PERMS;\n"
+"if ((O.RES_COL <> N.RES_COL) or (O.RES_PERMS <> N.RES_PERMS))\n"
"{\n"
-"http (xml_view_dtd (view_name, top_tag), http_body);\n"
-"http (meta_data, http_body);\n"
-"meta_path_suffix := \'.dtd\';\n"
-"mime_type := \'xml/dtd\';\n"
-"return;\n"
+"col := N.RES_COL;\n"
+"select COL_PERMS, COL_INHERIT into _pflags, _inh from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
+"if (_inh = \'M\' or _inh = \'R\')\n"
+"_rflags := _pflags;\n"
+"DAV_PERMS_FIX (_pflags, \'000000000TM\');\n"
+"DAV_PERMS_INHERIT (_rflags, _pflags, neq (O.RES_COL, N.RES_COL));\n"
"}\n"
-"if (meta_mode = 5)\n"
+"if (_rflags <> N.RES_PERMS)\n"
"{\n"
-"http (xml_view_schema (view_name, top_tag), http_body);\n"
-"meta_path_suffix := \'.xsd\';\n"
-"mime_type := \'xml/schema\';\n"
-"return;\n"
-"}\n"
-"meta_path_suffix := \'\';\n"
-"mime_type := \'\';\n"
+"set triggers off;\n"
+"\n"
+"update WS.WS.SYS_DAV_RES set RES_PERMS = _rflags where RES_ID = N.RES_ID;\n"
+"N.RES_PERMS := _rflags;\n"
"}\n"
-"--src dav.sql:3779\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"
-"declare _pf varchar;\n"
-"declare _procprefix varchar;\n"
-"_procprefix := concat (name_part (_view, 0), \'.\', name_part (_view, 1), \'.\');\n"
-"_body := string_output ();\n"
-"WS.WS.XML_VIEW_HEADER(_view, name_part (_view, 2), path, meta_mode, meta_data, _body);\n"
-"_pf := concat (_procprefix, \'http_view_\', name_part (_view, 2));\n"
-"call (_pf) (_body);\n"
-"http (concat (\'</\', name_part (_view, 2), \'>\'), _body);\n"
-"_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"
"}\n"
-"--src dav.sql:3810\n";
+"--src dav.sql:3682\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"
-"declare tmp, newp varchar;\n"
-"declare ret any;\n"
-"len := length (path);\n"
-"if (__tag (path) = 193)\n"
-"{\n"
-"inx := 0;\n"
-"tmp := \'\';\n"
-"cp := aref (path, len - 1);\n"
-"while (inx < length (cp))\n"
-"{\n"
-"if (aref (cp, inx) > 159 and aref (cp, inx) < 192)\n"
-"tmp := concat (tmp, \'_\');\n"
-"else if (aref (cp, inx) = ascii (\'?\'))\n"
-"tmp := concat (tmp, \'_\');\n"
-"else\n"
-"tmp := concat (tmp, chr (aref (cp, inx)));\n"
-"inx := inx + 1;\n"
-"}\n"
-"ret := path;\n"
-"aset (ret, len - 1, tmp);\n"
-"}\n"
-"else if (isstring (path))\n"
-"{\n"
-"inx := 0;\n"
-"tmp := \'\';\n"
-"cp := path;\n"
-"if (strstr (cp, \'http://\') = 0)\n"
+static const char *trig2 =
+"#line 3710 \"[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 pp, lp varchar;\n"
-"pp := coalesce (http_map_get (\'mounted\'), \'/DAV/\');\n"
-"lp := coalesce (http_map_get (\'domain\'), \'/DAV\');\n"
-"newp := subseq (cp, strstr (cp, \'://\') + 3, length (cp));\n"
-"sl := strchr (newp, \'/\');\n"
-"newp := subseq (newp, strchr (newp, \'/\'), length (newp));\n"
+"declare full_path, name varchar;\n"
+"declare parent_col, col, res integer;\n"
+"declare str, cont varchar;\n"
"\n"
"\n"
"\n"
@@ -3942,7438 +3778,8125 @@ static const char *proc56 =
"\n"
"\n"
"\n"
-"if (strstr (newp, lp) is not null)\n"
-"{\n"
-"newp := substring (newp, length (lp) + 1, length (newp));\n"
"\n"
-"if (aref (newp, 0) <> ascii (\'/\'))\n"
-"newp := concat (\'/\', newp);\n"
"\n"
-"if (aref (pp, length (pp) - 1) = ascii (\'/\'))\n"
-"pp := substring (pp, 1, length (pp) - 1);\n"
-"newp := concat (pp, newp);\n"
+"\n"
+"col := N.RES_COL;\n"
+"res := N.RES_ID;\n"
+"full_path := concat (\'/\', N.RES_NAME);\n"
+"whenever not found goto not_found;\n"
+"while (1)\n"
+"{\n"
+"select COL_NAME, COL_PARENT into name, parent_col from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
+"col := parent_col;\n"
+"full_path := concat (\'/\', name, full_path);\n"
"}\n"
-"else\n"
+"not_found:\n"
+"set triggers off;\n"
+"DAV_SPACE_QUOTA_RES_UPDATE (O.RES_FULL_PATH, length (O.RES_CONTENT), full_path, length (N.RES_CONTENT));\n"
+"\n"
+"if (O.RES_FULL_PATH <> full_path)\n"
"{\n"
-"newp := concat (\'/DAV\', subseq (newp, strchr (subseq (newp, 1,length (newp)), \'/\') + 1,\n"
-"length (newp)));\n"
+"update WS.WS.VFS_URL set VU_ETAG = \'\' where VU_RES_ID = O.RES_ID;\n"
"}\n"
-"cp := concat (subseq (cp, 0, sl + 7), newp);\n"
+"\n"
+"WS.WS.DAV_VSP_DEF_REMOVE (O.RES_FULL_PATH);\n"
+"\n"
+"update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path where RES_ID = res;\n"
+"N.RES_FULL_PATH := full_path;\n"
+"\n"
+"\n"
+"\n"
+"declare pub, pub1 varchar;\n"
+"declare uname, gname varchar;\n"
+"uname := \'\'; gname := \'\';\n"
+"pub := WS.WS.ISPUBL (O.RES_FULL_PATH);\n"
+"pub1 := WS.WS.ISPUBL (full_path);\n"
+"if (isstring (pub))\n"
+"{\n"
+"\n"
+"repl_text (pub, \'\"DB.DBA.DAV_RES_D\" (?)\', O.RES_FULL_PATH);\n"
"}\n"
-"while (inx < length (cp))\n"
+"\n"
+"if (isstring (pub1))\n"
"{\n"
-"if (aref (cp, inx) > 159 and aref (cp, inx) < 192)\n"
-"tmp := concat (tmp, \'_\');\n"
-"else if (aref (cp, inx) = ascii (\'?\'))\n"
-"tmp := concat (tmp, \'_\');\n"
-"else\n"
-"tmp := concat (tmp, chr (aref (cp, inx)));\n"
-"inx := inx + 1;\n"
-"}\n"
-"ret := tmp;\n"
+"\n"
+"whenever not found goto nfu;\n"
+"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.RES_OWNER;\n"
+"nfu:;\n"
+"whenever not found goto nfg;\n"
+"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.RES_GROUP;\n"
+"nfg:;\n"
+"repl_text (pub1, \'\"DB.DBA.DAV_RES_I\" (?, ?, ?, ?, ?, ?, ?)\', full_path, N.RES_MOD_TIME,\n"
+"uname, gname, N.RES_PERMS, N.RES_TYPE, WS.WS.BODY_ARR (N.RES_CONTENT, null));\n"
"}\n"
-"else\n"
-"ret := \'\';\n"
-"return ret;\n"
+"\n"
+"if (N.RES_TYPE = \'text/xsl\')\n"
+"xslt_stale (concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', N.RES_FULL_PATH));\n"
+"\n"
"}\n"
-"--src dav.sql:3826\n";
+"--src dav.sql:3708\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"
-"declare _ix, _len integer;\n"
-"_srv := repl_this_server ();\n"
-"if (__tag (__path) = 193)\n"
+static const char *trig3 =
+"#line 3781 \"[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"
-"_ix := 0;\n"
-"_len := length (__path);\n"
-"_path := \'/\';\n"
-"while (_ix < _len)\n"
+"declare full_path, name, _pflags, _cflags varchar;\n"
+"declare old_col_path, new_col_path varchar;\n"
+"declare res, col integer;\n"
+"\n"
+"col := N.COL_PARENT;\n"
+"res := N.COL_ID;\n"
+"full_path := concat (\'/\', N.COL_NAME,\'/\');\n"
+"_cflags := N.COL_PERMS;\n"
+"_pflags := coalesce ((select COL_PERMS from WS.WS.SYS_DAV_COL where COL_ID = col), \'000000000TM\');\n"
+"if ((O.COL_PARENT <> N.COL_PARENT) or (O.COL_PERMS <> N.COL_PERMS))\n"
"{\n"
-"_path := concat ( _path, aref (__path, _ix), \'/\');\n"
-"_ix := _ix + 1;\n"
+"DAV_PERMS_FIX (_pflags, \'000000000TM\');\n"
+"DAV_PERMS_INHERIT (_cflags, _pflags);\n"
"}\n"
+"whenever not found goto not_found;\n"
+"while (1)\n"
+"{\n"
+"select COL_NAME, COL_PARENT into name, col from WS.WS.SYS_DAV_COL where COL_ID = col;\n"
+"full_path := concat (\'/\', name, full_path);\n"
"}\n"
-"else if (isstring (__path))\n"
-"_path := __path;\n"
-"else\n"
+"not_found:\n"
+"set triggers off;\n"
+"if (_cflags <> N.COL_PERMS)\n"
"{\n"
-"signal (\'22023\', \'Function ISPUBL needs string or array as argument.\', \'DA007\');\n"
-"return NULL;\n"
+"\n"
+"update WS.WS.SYS_DAV_COL set COL_PERMS = _cflags where COL_ID = res;\n"
+"N.COL_PERMS := _cflags;\n"
"}\n"
-"for select TI_ITEM, TI_ACCT from DB.DBA.SYS_TP_ITEM where TI_SERVER = _srv and TI_TYPE = 1 do\n"
+"old_col_path := concat (WS.WS.COL_PATH (O.COL_PARENT), O.COL_NAME, \'/\');\n"
+"new_col_path := WS.WS.COL_PATH (N.COL_ID);\n"
+"if (old_col_path <> new_col_path)\n"
"{\n"
-"if (TI_ITEM is not null and length (TI_ITEM) > 0)\n"
+"\n"
+"for\n"
+"select SUBCOL_ID, SUBCOL_FULL_PATH as old_subcol_path, SUBCOL_DET\n"
+"from DAV_PLAIN_SUBMOUNTS\n"
+"where root_id = O.COL_ID and root_path = old_col_path and recursive=1 and subcol_auth_uid = http_dav_uid()\n"
+"and not (SUBCOL_DET like \'%Filter\')\n"
+"do\n"
"{\n"
-"if (aref (TI_ITEM, length (TI_ITEM) - 1) <> ascii (\'/\'))\n"
+"declare new_subcol_path varchar;\n"
+"new_subcol_path := new_col_path || subseq (old_subcol_path, length (old_col_path));\n"
+"for\n"
+"select CF_ID from WS.WS.SYS_DAV_CATFILTER\n"
+"where (\n"
+"(\"LEFT\" (old_subcol_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) and\n"
+"(\"LEFT\" (new_subcol_path, length (CF_SEARCH_PATH)) <> CF_SEARCH_PATH) )\n"
+"do\n"
"{\n"
-"if (_path between (TI_ITEM || \'/\') and DAV_COL_PATH_BOUNDARY (TI_ITEM || \'/\'))\n"
-"return TI_ACCT;\n"
+"delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_CF_ID = CF_ID and CFD_DET_SUBCOL_ID = SUBCOL_ID;\n"
"}\n"
-"else\n"
+"for\n"
+"select CF_ID from WS.WS.SYS_DAV_CATFILTER\n"
+"where (\n"
+"(\"LEFT\" (old_subcol_path, length (CF_SEARCH_PATH)) <> CF_SEARCH_PATH) and\n"
+"(\"LEFT\" (new_subcol_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) )\n"
+"do\n"
"{\n"
-"if (_path between TI_ITEM and DAV_COL_PATH_BOUNDARY (TI_ITEM))\n"
-"return TI_ACCT;\n"
-"}\n"
+"insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET) values (CF_ID, SUBCOL_ID, SUBCOL_DET);\n"
"}\n"
"}\n"
-"return NULL;\n"
"}\n"
-"--src dav.sql:3907\n";
-
-static const char *proc58 =
-"#line 3952 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.BODY_ARR (inout __ses any, in __pcs integer)\n"
+"if (\n"
+"(N.COL_DET is not null or O.COL_DET is not null) and\n"
+"not (N.COL_DET is not null and O.COL_DET is not null and (N.COL_DET = O.COL_DET) and (N.COL_ID = O.COL_ID) and (N.COL_PARENT = O.COL_PARENT)))\n"
"{\n"
-"declare _res, _ses any;\n"
-"declare _str varchar;\n"
-"declare _len, _from, _pcs integer;\n"
-"\n"
-"if (__pcs is null)\n"
-"_pcs := 1000000;\n"
-"else\n"
-"_pcs := __pcs;\n"
-"\n"
-"_res := null;\n"
-"_from := 1;\n"
"\n"
-"if (__tag (__ses) = 126 or __tag (__ses) = 133)\n"
+"delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_DET_SUBCOL_ID = O.COL_ID;\n"
+"if (N.COL_DET is not null and not (N.COL_DET like \'%Filter\'))\n"
"{\n"
-"_ses := string_output ();\n"
-"http (__ses, _ses);\n"
-"_len := length (_ses);\n"
-"while (_from < _len)\n"
+"for select CF_ID from WS.WS.SYS_DAV_CATFILTER where \"LEFT\" (new_col_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH do\n"
"{\n"
-"_str := substring (_ses, _from, _pcs);\n"
-"if (_res is null)\n"
-"_res := vector (_str);\n"
-"else\n"
-"_res := vector_concat (_res, vector (_str));\n"
-"_from := _from + _pcs;\n"
-"}\n"
+"insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET)\n"
+"values (CF_ID, N.COL_ID, N.COL_DET);\n"
"}\n"
-"else if (isstring (__ses) or __tag (__ses) = 185)\n"
-"{\n"
-"_len := length (__ses);\n"
-"while (_from < _len)\n"
-"{\n"
-"_str := substring (__ses, _from, _pcs);\n"
-"if (_res is null)\n"
-"_res := vector (_str);\n"
-"else\n"
-"_res := vector_concat (_res, vector (_str));\n"
-"_from := _from + _pcs;\n"
"}\n"
"}\n"
-"else\n"
+"\n"
+"declare repl varchar;\n"
+"repl := null;\n"
+"declare pub, pub1 varchar;\n"
+"declare uname, gname varchar;\n"
+"\n"
+"uname := \'\'; gname := \'\';\n"
+"pub := WS.WS.ISPUBL (old_col_path);\n"
+"pub1 := WS.WS.ISPUBL (new_col_path);\n"
+"if (isstring (pub1))\n"
"{\n"
-"_ses := \'\';\n"
+"whenever not found goto nfu;\n"
+"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.COL_OWNER;\n"
+"nfu:;\n"
+"whenever not found goto nfg;\n"
+"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.COL_GROUP;\n"
+"nfg:;\n"
"}\n"
+"if ((not isstring (pub) and isstring (pub1)) or (isstring (pub) and isstring (pub1) and pub <> pub1))\n"
+"{\n"
"\n"
-"return _res;\n"
+"repl_text (pub1, \'\"DB.DBA.DAV_COL_I\" (?, ?, ?, ?, ?, ?)\',\n"
+"N.COL_NAME, new_col_path, N.COL_CR_TIME, uname, gname,\n"
+"N.COL_PERMS );\n"
+"repl := pub1;\n"
"}\n"
-"--src dav.sql:3950\n";
-
-static const char *proc59 =
-"#line 4007 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.XML_AUTO_SCHED (in _path varchar)\n"
+"if (isstring (pub) and isstring (pub1) and pub = pub1)\n"
"{\n"
-"declare _stmt, ses, _root, _sch, _dtd, _dtd_body, _comments varchar;\n"
-"declare _res_id integer;\n"
-"_res_id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _path), 0);\n"
-"if (_res_id < 1)\n"
-"return;\n"
-"_stmt := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xml-sql\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'\');\n"
-"_root := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xml-sql-root\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'document\');\n"
-"_sch := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xml-sql-schema\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'\');\n"
-"_dtd := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xml-sql-dtd\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'\');\n"
-"_comments := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
-"PROP_NAME = \'xml-sql-description\'\n"
-"and PROP_TYPE = \'R\'\n"
-"and PROP_PARENT_ID = _res_id), \'\');\n"
-"if (_stmt = \'\')\n"
-"return;\n"
-"ses := string_output (http_strses_memory_size ());\n"
-"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"
+"repl_text (pub1, \'\"DB.DBA.DAV_COL_U\" (?, ?, ?, ?, ?, ?)\',\n"
+"old_col_path, new_col_path, N.COL_CR_TIME, uname, gname,\n"
+"N.COL_PERMS );\n"
"}\n"
-"--src dav.sql:4005\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"
-"inout __u_id integer,\n"
-"inout __grp integer,\n"
-"inout __perms varchar)\n"
+"if ((not isstring (pub1) and isstring (pub)) or (isstring (pub) and isstring (pub1) and pub <> pub1))\n"
"{\n"
-"declare auth any;\n"
-"declare _access, _perms varchar;\n"
-"declare _u_id, _grp integer;\n"
"\n"
-"_u_id := http_nobody_uid ();\n"
-"_grp := http_nogroup_gid ();\n"
-"_perms := \'110110110\';\n"
+"repl_text (pub, \'\"DB.DBA.DAV_COL_D\" (?, 1)\', old_col_path);\n"
+"}\n"
"\n"
-"if (upper (__access) = \'R\')\n"
-"_access := \'100\';\n"
-"else if ( upper (__access) = \'RW\')\n"
-"_access := \'110\';\n"
+"WS.WS.UPDCHILD (res, full_path, _pflags, repl);\n"
+"set triggers on;\n"
+"if (ascii(\'R\') = _pflags[9])\n"
+"update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, \'T\', 9)\n"
+"where (RES_FULL_PATH between full_path and DAV_COL_PATH_BOUNDARY (full_path))\n"
+"and RES_PERMS[9] = ascii (\'N\');\n"
"else\n"
-"_access := \'100\';\n"
-"\n"
-"auth := DB.DBA.vsp_auth_vec (lines);\n"
+"update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, _pflags[9], 9)\n"
+"where RES_COL = res and (case (lt (length (RES_PERMS), 10)) when 1 then 0 else RES_PERMS[9] end) <> _pflags[9];\n"
+"if (ascii(\'R\') = _pflags[10])\n"
+"update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, \'M\', 10)\n"
+"where (RES_FULL_PATH between full_path and DAV_COL_PATH_BOUNDARY (full_path))\n"
+"and RES_PERMS[10] = ascii (\'N\');\n"
+"else\n"
+"update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, _pflags[10], 10)\n"
+"where RES_COL = res and (case (lt (length (RES_PERMS), 11)) when 1 then 0 else RES_PERMS[10] end) <> _pflags[10];\n"
"\n"
-"if (not WS.WS.ISPUBLIC (path, _access) or auth <> 0)\n"
-"{\n"
-"_u_id := WS.WS.CHECK_AUTH (lines);\n"
-"if (_u_id = http_nobody_uid ())\n"
-"return _u_id;\n"
-"if (not WS.WS.CHECKPERM (path, _u_id, _access))\n"
-"return 0;\n"
"}\n"
-"\n"
-"if (_u_id <> 0)\n"
-"select U_DEF_PERMS, U_GROUP into _perms, _grp from WS.WS.SYS_DAV_USER where U_ID = _u_id;\n"
-"\n"
-"if (__u_id is not null)\n"
-"__u_id := _u_id;\n"
-"if (__grp is not null)\n"
-"__grp := _grp;\n"
-"if (__u_id is not null)\n"
-"__perms := _perms;\n"
-"\n"
-"return (1);\n"
-"}\n"
-"--src dav.sql:4037\n";
+"--src dav.sql:3779\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"
-"descr := \'Bad Gateway\';\n"
-"if (hdr is null or __tag (hdr) <> 193)\n"
-"return (502);\n"
-"if (length (hdr) < 1)\n"
-"return (502);\n"
-"line := aref (hdr, 0);\n"
-"if (length (line) < 12)\n"
-"return (502);\n"
-"code := substring (line, strstr (line, \'HTTP/1.\') + 9, length (line));\n"
-"while ((length (code) > 0) and (aref (code, 0) < ascii (\'0\') or aref (code, 0) > ascii (\'9\')))\n"
-"code := substring (code, 2, length (code) - 1);\n"
-"if (length (code) < 3)\n"
-"return (502);\n"
-"if (length (code) > 3)\n"
+static const char *proc54 =
+"#line 3919 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.UPDCHILD (in col integer, in root_path varchar, in _pflags varchar, in repl varchar)\n"
"{\n"
-"descr := substring (code, 4, length (code) - 3);\n"
-"descr := replace (descr, chr(10), \'\');\n"
-"descr := replace (descr, chr(13), \'\');\n"
-"}\n"
-"code := substring (code, 1, 3);\n"
-"return atoi (code);\n"
-"}\n"
-"--src dav.sql:4084\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"
-"in __dst_name varchar)\n"
+"declare name, new_path, str varchar;\n"
+"declare id integer;\n"
+"declare c_cur cursor for select COL_ID, COL_NAME, COL_MOD_TIME, COL_PERMS, COL_OWNER, COL_GROUP\n"
+"from WS.WS.SYS_DAV_COL where COL_PARENT = col;\n"
+"\n"
+"for select RES_ID, RES_NAME, RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = col do\n"
"{\n"
-"declare _s_path, _ovr, _depth varchar;\n"
-"declare _resp any;\n"
-"declare _content, _thdr, _thost, _auth, _resp_cli, _dst_name varchar;\n"
-"declare _len, _sl, _code integer;\n"
-"declare _u_id, _grp, _perms any;\n"
"\n"
-"_dst_name := WS.WS.FINDPARAM (lines, \'Destination:\');\n"
-"WS.WS.DAV_LOGIN (path, lines, \'R\', _u_id, _grp, _perms);\n"
+"update WS.WS.VFS_URL set VU_ETAG = \'\' where VU_RES_ID = RES_ID;\n"
"\n"
-"_s_path := http_path ();\n"
-"_ovr := WS.WS.FINDPARAM (lines, \'Overwrite:\');\n"
-"if (_ovr = \'\')\n"
-"_ovr := \'T\';\n"
-"_depth := WS.WS.FINDPARAM (lines, \'Depth:\');\n"
-"if (_depth = \'\')\n"
-"_depth := \'infinity\';\n"
-"_auth := WS.WS.FINDPARAM (lines, \'Authorization:\');\n"
+"if (RES_NAME like \'%.vsp\')\n"
+"WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH);\n"
+"}\n"
"\n"
-"_thost := substring (_dst_name, 8, length (_dst_name) - 8);\n"
-"_sl := strchr (_thost, \'/\');\n"
-"if (_sl)\n"
-"_thost := substring (_thost, 1, _sl);\n"
+"update WS.WS.SYS_DAV_RES set RES_FULL_PATH = concat (root_path, RES_NAME) where RES_COL = col and ((RES_FULL_PATH <> concat (root_path, RES_NAME)) or RES_FULL_PATH is null);\n"
+"if (ascii (\'R\') = _pflags[9])\n"
+"update WS.WS.SYS_DAV_COL set COL_PERMS = DAV_PERMS_SET_CHAR (COL_PERMS, \'R\', 9)\n"
+"where COL_PARENT = col and ascii (\'R\') <> COL_PERMS[9];\n"
+"if (ascii (\'R\') = _pflags[10])\n"
+"update WS.WS.SYS_DAV_COL set COL_PERMS = DAV_PERMS_SET_CHAR (COL_PERMS, \'R\', 10)\n"
+"where COL_PARENT = col and ascii (\'R\') <> COL_PERMS[10];\n"
"\n"
-"if (_auth <> \'\')\n"
-"_thdr := concat (\'Host: \', _thost, \'\\r\\n\',\n"
-"\'Overwrite: \', _ovr, \'\\r\\n\',\n"
-"\'Authorization: \', _auth, \'\\r\\n\',\n"
-"\'Depth: \', _depth);\n"
-"else\n"
-"_thdr := concat (\'Host: \', _thost, \'\\r\\n\',\n"
-"\'Overwrite: \', _ovr, \'\\r\\n\',\n"
-"\'Depth: \', _depth);\n"
"\n"
-"if (WS.WS.ISRES (path))\n"
+"declare _grp, _uid integer;\n"
+"declare cperms varchar;\n"
+"declare ctime datetime;\n"
+"declare uname, gname varchar;\n"
+"declare rn, rt, rc, rp varchar;\n"
+"declare ro, rg integer;\n"
+"declare rmt datetime;\n"
+"declare chr cursor for select RES_NAME, RES_TYPE, RES_CONTENT, RES_PERMS,\n"
+"RES_OWNER, RES_GROUP, RES_MOD_TIME from WS.WS.SYS_DAV_RES\n"
+"where RES_COL = col;\n"
+"if (repl is not null)\n"
"{\n"
+"whenever not found goto er;\n"
+"open chr;\n"
+"while (1)\n"
+"{\n"
+"fetch chr into rn, rt, rc, rp, ro, rg, rmt;\n"
+"whenever not found goto nfu;\n"
+"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = ro;\n"
+"nfu:;\n"
+"whenever not found goto nfg;\n"
+"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = rg;\n"
+"nfg:;\n"
+"repl_text (repl, \'\"DB.DBA.DAV_RES_I\" (?, ?, ?, ?, ?, ?, ?)\', concat (root_path, rn),\n"
+"rmt, uname, gname, rp, rt, WS.WS.BODY_ARR (rc, null));\n"
+"}\n"
+"er:\n"
+"close chr;\n"
"\n"
-"select blob_to_string (RES_CONTENT), length (RES_CONTENT)\n"
-"into _content, _len from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _s_path;\n"
-"commit work;\n"
-"http_get (_dst_name, _resp, \'PUT\', _thdr, _content);\n"
-"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
-"http_request_status (sprintf (\'HTTP/1.1 %d %s\', _code, _resp_cli));\n"
-"\n"
-"if (_code > 199 and _code < 299)\n"
-"return 1;\n"
-"else\n"
-"return 0;\n"
"}\n"
-"else if (WS.WS.ISCOL (path))\n"
-"{\n"
"\n"
-"commit work;\n"
-"http_get (_dst_name, _resp, \'HEAD\', _thdr);\n"
-"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
-"if (_code <> 200)\n"
+"whenever not found goto not_col;\n"
+"open c_cur;\n"
+"while (1)\n"
"{\n"
-"commit work;\n"
-"http_get (_dst_name, _resp, \'MKCOL\', _thdr);\n"
-"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
-"if (_code < 200 or _code > 299)\n"
+"fetch c_cur into id, name, ctime, cperms, _uid, _grp;\n"
+"new_path := concat (root_path, name, \'/\');\n"
+"\n"
+"if (repl is not null)\n"
"{\n"
-"http_request_status (sprintf (\'HTTP/1.1 %d %s\', _code, _resp_cli));\n"
-"return 0;\n"
-"}\n"
+"whenever not found goto nfu1;\n"
+"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = _uid;\n"
+"nfu1:;\n"
+"whenever not found goto nfg1;\n"
+"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = _grp;\n"
+"nfg1:;\n"
+"repl_text (repl, \'\"DB.DBA.DAV_COL_I\" (?, ?, ?, ?, ?, ?)\',\n"
+"name, new_path, ctime, uname, gname,\n"
+"cperms );\n"
"}\n"
-"for select SUBCOL_FULL_PATH\n"
-"from DAV_PLAIN_SUBCOLS\n"
-"where root_id = NULL and root_path = concat (_s_path, \'/\') and recursive = 1 and subcol_auth_uid = null and subcol_auth_pwd = null\n"
-"order by SUBCOL_ID\n"
-"do\n"
-"{\n"
-"commit work;\n"
-"http_get (concat (\'http://\', _thost, SUBCOL_FULL_PATH), _resp, \'HEAD\', _thdr);\n"
-"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
-"if (_code <> 200)\n"
-"{\n"
-"http_get (concat (\'http://\', _thost, SUBCOL_FULL_PATH), _resp, \'MKCOL\', _thdr);\n"
-"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
-"if (_code < 200 or _code > 299)\n"
-"{\n"
-"http_request_status (sprintf (\'HTTP/1.1 %d %s\', _code, _resp_cli));\n"
-"return 0;\n"
+"\n"
+"WS.WS.UPDCHILD (id, new_path, _pflags, repl);\n"
"}\n"
+"not_col:\n"
+"close c_cur;\n"
"}\n"
+"--src dav.sql:3917\n";
+
+static const char *trig4 =
+"#line 4002 \"[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"
+"declare _col, _p_col integer;\n"
"\n"
+"_col := N.COL_ID;\n"
+"_p_col := N.COL_PARENT;\n"
+"col_path := WS.WS.COL_PATH (N.COL_ID);\n"
+"set triggers off;\n"
+"_cflags := N.COL_PERMS;\n"
+"_pflags := \'000000000NN\';\n"
+"_inh := \'N\';\n"
+"for select COL_PERMS, COL_INHERIT from WS.WS.SYS_DAV_COL where COL_ID = _p_col do\n"
+"{\n"
+"_pflags := COL_PERMS;\n"
+"_inh := COL_INHERIT;\n"
"}\n"
-"for select RES_FULL_PATH as res_path, blob_to_string (RES_CONTENT) as content\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where RES_FULL_PATH like concat (_s_path, \'/%\')\n"
-"order by RES_ID\n"
-"do\n"
+"if (_inh = \'R\')\n"
+"_cflags := _pflags;\n"
+"DAV_PERMS_FIX (_cflags, _pflags);\n"
+"if (_cflags <> N.COL_PERMS)\n"
+"update WS.WS.SYS_DAV_COL set COL_PERMS = _cflags where COL_ID = _col;\n"
+"if (N.COL_DET is not null and not (N.COL_DET like \'%Filter\'))\n"
"{\n"
-"commit work;\n"
-"http_get (concat (\'http://\', _thost, res_path), _resp, \'PUT\', _thdr, content);\n"
-"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
-"if (_code < 200 or _code > 299)\n"
+"for select CF_ID from WS.WS.SYS_DAV_CATFILTER where \"LEFT\" (col_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH do\n"
"{\n"
-"http_request_status (sprintf (\'HTTP/1.1 %d %s\', _code, _resp_cli));\n"
-"return 0;\n"
-"}\n"
-"\n"
+"insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET)\n"
+"values (CF_ID, _col, N.COL_DET);\n"
"}\n"
"}\n"
-"else\n"
+"\n"
+"declare pub varchar;\n"
+"declare uname, gname varchar;\n"
+"uname := \'\'; gname := \'\';\n"
+"pub := WS.WS.ISPUBL (col_path);\n"
+"if (isstring (pub))\n"
"{\n"
-"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
-"return 0;\n"
+"\n"
+"whenever not found goto nfu;\n"
+"select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.COL_OWNER;\n"
+"nfu:;\n"
+"whenever not found goto nfg;\n"
+"select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.COL_GROUP;\n"
+"nfg:;\n"
+"repl_text (pub, \'\"DB.DBA.DAV_COL_I\" (?, ?, ?, ?, ?, ?)\',\n"
+"N.COL_NAME, col_path, N.COL_CR_TIME, uname, gname, N.COL_PERMS );\n"
"}\n"
-"return 1;\n"
+"\n"
+"\n"
"}\n"
-"--src dav.sql:4112\n";
+"--src dav.sql:4000\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"
+static const char *proc55 =
+"#line 4054 \"[executable]/dav.sql\"\n"
+"create procedure\n"
+"WS.WS.DAV_VSP_INCLUDES_CHANGED (in full_path varchar, in own varchar)\n"
"{\n"
-"declare _perms varchar;\n"
-"declare g_id, _user, _group, rc integer;\n"
-"if (_u_id = http_dav_uid ())\n"
-"return 1;\n"
-"rc := 0;\n"
-"g_id := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = _u_id), 0);\n"
-"whenever not found goto exit_p;\n"
-"select RES_OWNER, RES_GROUP, RES_PERMS into _user, _group, _perms\n"
-"from WS.WS.SYS_DAV_RES where RES_ID = doc_id;\n"
-"_perms := coalesce (_perms, \'000000000\');\n"
-"if (_u_id = _user)\n"
-"rc := WS.WS.PERM_COMP (substring (cast (_perms as varchar), 1, 3), \'100\');\n"
-"if (_group = g_id and rc = 0)\n"
-"rc := WS.WS.PERM_COMP (substring (cast (_perms as varchar), 4, 3), \'100\');\n"
-"if (rc = 0)\n"
-"rc := WS.WS.PERM_COMP (substring (cast (_perms as varchar), 7, 3), \'100\');\n"
-"exit_p:;\n"
-"return rc;\n"
-"}\n"
-"--src dav.sql:4229\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"
+"declare incst, dep any;\n"
+"dep := null;\n"
+"incst := registry_get (concat (\'__depend_\', own, \'_\', full_path));\n"
+"if (isstring (incst))\n"
+"dep := deserialize (incst);\n"
+"if (isarray (dep))\n"
"{\n"
-"declare fpath, fpath1, _ref, lpath, ppath varchar;\n"
-"declare rc integer;\n"
-"rc := 0;\n"
-"set isolation=\'committed\';\n"
-"location := http_path ();\n"
-"declare cr cursor for select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_RES, WS.WS.SYS_DAV_PROP where\n"
-"RES_FULL_PATH = fpath1\n"
-"and PROP_PARENT_ID = RES_ID and\n"
-"PROP_NAME = \'redirectref\' and PROP_TYPE = \'R\' option (order);\n"
-"fpath := http_physical_path (); fpath1 := rtrim (fpath, \'/\');\n"
-"whenever not found goto nfp;\n"
-"open cr (prefetch 1);\n"
-"fetch cr into _ref;\n"
-"if (not isstring (_ref))\n"
-"goto nfp;\n"
-"lpath := http_path ();\n"
-"location := WS.WS.EXPAND_URL (lpath, _ref);\n"
-"ppath := WS.WS.EXPAND_URL (fpath, _ref);\n"
-"path := WS.WS.HREF_TO_ARRAY (ppath, \'\');\n"
-"rc := 1;\n"
-"nfp:\n"
-"close cr;\n"
-"set isolation=\'repeatable\';\n"
-"return rc;\n"
+"declare i, l integer;\n"
+"declare mt datetime;\n"
+"l := length (dep); i := 0;\n"
+"if (mod (l, 2))\n"
+"return 1;\n"
+"while (i < l)\n"
+"{\n"
+"if (not exists (select 1 from WS.WS.SYS_DAV_RES\n"
+"where RES_FULL_PATH = dep [i] and RES_MOD_TIME = stringdate(dep [i+1])))\n"
+"return 1;\n"
+"i := i + 2;\n"
"}\n"
-"--src dav.sql:4252\n";
+"}\n"
+"return 0;\n"
+"}\n"
+"--src dav.sql:4052\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"
-"declare _name varchar;\n"
-"declare _res_len, flen, mult, have_sheet integer;\n"
-"declare _dir_len, _dir_ctr integer;\n"
-"\n"
-"fsize := vector (\'b\',\'K\',\'M\',\'G\',\'T\');\n"
-"_xml := string_output ();\n"
-"have_sheet := 0;\n"
-"\n"
-"\n"
-"_dir := DAV_DIR_LIST_INT (full_path, 0, \'%\', auth_uname, auth_pwd, auth_uid);\n"
-"\n"
-"if (isinteger (_dir))\n"
-"return _dir;\n"
-"_dir_len := length (_dir);\n"
-"http (\'<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\', _xml);\n"
-"http (sprintf (\'<PATH dir_name=\"%V\" physical_dir_name=\"%V\">\', cast (logical_root_path as varchar), cast (full_path as varchar)), _xml);\n"
-"http (\'<DIRS>\', _xml);\n"
-"\n"
-"http (\'<SUBDIR modify=\"\" name=\"..\" />\\n\', _xml);\n"
-"_dir_ctr := 0;\n"
-"while (_dir_ctr < _dir_len)\n"
+static const char *proc56 =
+"#line 4082 \"[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"
-"declare _col any;\n"
-"_col := _dir [_dir_ctr];\n"
+"declare curr_file, new_file_name, name, _perms varchar;\n"
+"declare include_inx, end_tag_inx, _u_id, _grp integer;\n"
+"declare apath any;\n"
+"declare rc, col integer;\n"
+"declare modt datetime;\n"
"\n"
-"if (_col [1] = \'C\')\n"
+"end_tag_inx := 0;\n"
+"if (ct = 0)\n"
"{\n"
-"_name := _col[0];\n"
-"_name := subseq (_name, 0, length (_name)-1);\n"
-"_name := subseq (_name, strrchr (_name, \'/\') + 1);\n"
-"http (sprintf (\'<SUBDIR modify=\"%s\" name=\"\',\n"
-"soap_print_box (_col[3], \'\', 2)), _xml );\n"
-"http_value (charset_recode (_name, null, \'UTF-8\'), null, _xml );\n"
-"http (\'\" />\\n\', _xml );\n"
+"apath := WS.WS.HREF_TO_ARRAY (path, \'\');\n"
+"rc := WS.WS.FINDRES (apath, col, name);\n"
"}\n"
-"_dir_ctr := _dir_ctr + 1;\n"
+"else\n"
+"{\n"
+"rc := 1;\n"
"}\n"
-"http (\'</DIRS><FILES>\', _xml);\n"
-"_dir_ctr := 0;\n"
-"while (_dir_ctr < _dir_len)\n"
+"\n"
+"if (rc < 0 and 0 <> file_stat (http_root () || path))\n"
"{\n"
-"declare _res any;\n"
-"_res := _dir [_dir_ctr];\n"
+"content := file_to_string (http_root () || path);\n"
+"ct := 1;\n"
+"rc := 1;\n"
+"}\n"
"\n"
-"if (_res [1] = \'R\')\n"
+"if (isarray (rc))\n"
+"signal (\'37000\', sprintf (\'The included resource \"%s\" is a special \"%s\" resource, not a plain DAV one\', path, rc[0]), \'DA010\');\n"
+"if (rc < 0)\n"
+"signal (\'37000\', sprintf (\'The included resource \"%s\" does not exist\', path), \'DA009\');\n"
+"else\n"
"{\n"
-"_name := _res[0];\n"
-"_name := subseq (_name, strrchr (_name, \'/\') + 1);\n"
-"_res_len := _res[2];\n"
-"flen := _res_len;\n"
-"mult := 0;\n"
-"if (lower (_name) = \'folder.xsl\')\n"
-"have_sheet := 1;\n"
-"while ((flen / 1000) > 1)\n"
+"if (ct = 0)\n"
"{\n"
-"mult := mult + 1;\n"
-"flen := flen / 1000;\n"
+"declare exit handler for not found\n"
+"{\n"
+"signal (\'22023\', sprintf (\'The included resource \"%s\" does not exist\', path), \'DA009\');\n"
+"};\n"
+"select blob_to_string (RES_CONTENT), RES_OWNER, RES_GROUP, RES_PERMS, RES_MOD_TIME\n"
+"into curr_file, _u_id, _grp, _perms, modt from WS.WS.SYS_DAV_RES\n"
+"where RES_NAME = name and RES_COL = col;\n"
+"if (not http_map_get (\'executable\'))\n"
+"{\n"
+"if (_u_id <> http_dav_uid () or _perms like \'____1%\' or _perms like \'_______1%\')\n"
+"signal (\'37000\', \'Includes can be owned only by admin & cannot be writable for others\', \'DA001\');\n"
"}\n"
-"http (sprintf (\'<FILE modify=\"%s\" rs=\"%i\" hs=\"%d %s\" name=\"\',\n"
-"soap_print_box (_res[3], \'\', 2), _res_len, flen, aref (fsize, mult)), _xml);\n"
-"http_value (charset_recode (_name, null, \'UTF-8\'), null, _xml );\n"
-"http (\'\" />\\n\', _xml);\n"
+"if (st is not null and isarray (st))\n"
+"st := vector_concat (st, vector (path, datestring(modt)));\n"
"}\n"
-"_dir_ctr := _dir_ctr + 1;\n"
+"else\n"
+"curr_file := content;\n"
"}\n"
-"http (\'</FILES></PATH>\', _xml);\n"
"\n"
+"include_inx := strcasestr (curr_file, \'<?include\');\n"
+"while (include_inx is not null)\n"
+"{\n"
+"if (level > 20)\n"
+"signal ( \'37000\', sprintf (\'Max nesting level (20) reached when processing %s\', path), \'DA002\');\n"
+"end_tag_inx := strstr (subseq (curr_file, include_inx, length (curr_file)), \'?>\');\n"
+"if (end_tag_inx is null)\n"
+"signal ( \'37000\', sprintf (\'Unterminated include tag at offset %d in %s\', include_inx, path), \'DA003\');\n"
+"end_tag_inx := end_tag_inx + include_inx;\n"
+"if (end_tag_inx - include_inx - 9 <= 0)\n"
+"signal ( \'37000\',\n"
+"sprintf (\'An include tag at offset %d with no name or VSP end tag before an include tag in %s \',\n"
+"include_inx, path), \'DA004\');\n"
+"if (include_inx > 0)\n"
+"http (subseq (curr_file, 0, include_inx), stream);\n"
+"new_file_name := trim (subseq (curr_file, include_inx + 9, end_tag_inx));\n"
+"if (aref (new_file_name, 0) <> ascii( \'/\'))\n"
+"{\n"
"\n"
-"_xml := xtree_doc (_xml);\n"
+"new_file_name := WS.WS.EXPAND_URL (path, new_file_name);\n"
+"}\n"
+"WS.WS.EXPAND_INCLUDES (new_file_name, stream, level + 1, 0, \'\', st);\n"
+"if (end_tag_inx + 2 <= length (curr_file))\n"
+"curr_file := subseq (curr_file, end_tag_inx + 2, length (curr_file));\n"
+"include_inx := strcasestr (curr_file, \'<?include\');\n"
+"}\n"
+"if (length (curr_file) > 0)\n"
+"http (curr_file, stream);\n"
+"}\n"
+"--src dav.sql:4080\n";
+
+static const char *trig5 =
+"#line 4167 \"[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"
"\n"
-"_b_opt := NULL;\n"
+"DAV_SPACE_QUOTA_RES_DELETE (RES_FULL_PATH, length (RES_CONTENT));\n"
"\n"
-"if (exists (select 1 from DB.DBA.HTTP_PATH\n"
-"where HP_LPATH = http_map_get (\'domain\') and HP_PPATH = http_map_get (\'mounted\')))\n"
-"select deserialize(HP_OPTIONS) into _b_opt from DB.DBA.HTTP_PATH\n"
-"where HP_LPATH = http_map_get (\'domain\') and HP_PPATH = http_map_get (\'mounted\');\n"
"\n"
-"if (_b_opt is not NULL)\n"
-"_b_opt := get_keyword (\'browse_sheet\', _b_opt, \'\');\n"
+"WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH);\n"
+"if (RES_TYPE = \'xml/persistent-view\')\n"
+"delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = RES_FULL_PATH;\n"
"\n"
-"if (have_sheet)\n"
-"{\n"
-"select blob_to_string (RES_CONTENT) into _xml_sheet from WS.WS.SYS_DAV_RES\n"
-"where RES_NAME = \'folder.xsl\' and RES_COL = col;\n"
-"xslt_sheet (\'http://local.virt/custom_dir_output\', xtree_doc (_xml_sheet));\n"
-"_html := cast (xslt (\'http://local.virt/custom_dir_output\', _xml) as varchar);\n"
-"}\n"
-"else if (_b_opt <> \'\')\n"
+"declare pub varchar;\n"
+"pub := WS.WS.ISPUBL (RES_FULL_PATH);\n"
+"if (isstring (pub))\n"
"{\n"
-"select blob_to_string (RES_CONTENT) into _xml_sheet from WS.WS.SYS_DAV_RES\n"
-"where RES_FULL_PATH = _b_opt;\n"
-"xslt_sheet (\'http://local.virt/custom_dir_output\', xml_tree_doc (_xml_sheet));\n"
-"_html := cast (xslt (\'http://local.virt/custom_dir_output\', _xml) as varchar);\n"
+"\n"
+"repl_text (pub, \'\"DB.DBA.DAV_RES_D\" (?)\', RES_FULL_PATH);\n"
"}\n"
-"else\n"
-"_html := cast (xslt (\'http://local.virt/dir_output\', _xml) as varchar);\n"
"\n"
-"http (_html);\n"
"\n"
-"return 0;\n"
+"update WS.WS.VFS_URL set VU_ETAG = \'\' where VU_RES_ID = RES_ID;\n"
+"if (RES_TYPE = \'text/xsl\')\n"
+"xslt_stale (concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', RES_FULL_PATH));\n"
+"\n"
+"delete from WS.WS.SYS_DAV_PROP where PROP_TYPE = \'R\' and PROP_PARENT_ID = RES_ID;\n"
+"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'R\' and LOCK_PARENT_ID = RES_ID;\n"
+"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = RES_ID;\n"
+"\n"
"}\n"
-"--src dav.sql:4282\n";
+"--src dav.sql:4165\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"
+static const char *trig6 =
+"#line 4198 \"[executable]/dav.sql\"\n"
+"create trigger SYS_DAV_COL_D before delete on WS.WS.SYS_DAV_COL order 100\n"
"{\n"
-"declare temp varchar;\n"
-"temp := http_path (path);\n"
+"declare pub, col_path varchar;\n"
+"col_path := WS.WS.COL_PATH (COL_ID);\n"
"\n"
-"if ((strstr (temp, \'.asmx\') is not null) and __proc_exists (\'WS.WS.__http_handler_aspx\', 1))\n"
-"{\n"
-"declare ret any;\n"
-"declare idx integer;\n"
-"idx := 0;\n"
-"ret := vector ();\n"
-"while (idx < length (path))\n"
-"{\n"
-"ret := vector_concat (ret, vector (path[idx]));\n"
-"if (strstr (path[idx], \'.asmx\') is not null)\n"
+"delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_DET_SUBCOL_ID = COL_ID;\n"
+"\n"
+"pub := WS.WS.ISPUBL (col_path);\n"
+"if (isstring (pub))\n"
"{\n"
-"patched_path := ret;\n"
-"return 1;\n"
+"\n"
+"repl_text (pub, \'\"DB.DBA.DAV_COL_D\" (?, 0)\', col_path);\n"
"}\n"
-"idx := idx + 1;\n"
+"\n"
+"delete from WS.WS.SYS_DAV_PROP where PROP_TYPE = \'C\' and PROP_PARENT_ID = COL_ID;\n"
+"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = COL_ID;\n"
+"\n"
"}\n"
+"--src dav.sql:4196\n";
+
+static const char *proc57 =
+"#line 4220 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.XML_VIEW_HEADER\n"
+"(\n"
+"in view_name varchar,\n"
+"in top_tag varchar,\n"
+"in path varchar,\n"
+"in meta_mode integer,\n"
+"in meta_data varchar,\n"
+"inout http_body any\n"
+")\n"
+"{\n"
+"if (meta_mode = 0)\n"
+"{\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
+"http (concat (\'<\',top_tag,\'>\\n\'), http_body);\n"
+"return;\n"
"}\n"
-"patched_path := path;\n"
-"return 0;\n"
+"if (meta_mode = 1)\n"
+"{\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
+"http (concat (\'<!DOCTYPE \', top_tag, \' [\\n\'), http_body);\n"
+"http (xml_view_dtd (view_name, top_tag), http_body);\n"
+"http (concat (meta_data, \'] >\\n\'), http_body);\n"
+"http (concat (\'<\',top_tag,\'>\\n\'), http_body);\n"
+"return;\n"
+"}\n"
+"if (meta_mode = 2)\n"
+"{\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
+"http (concat (\'<!DOCTYPE \', top_tag, \' SYSTEM \"\', path, \'.dtd\">\'), http_body);\n"
+"http (concat (\'<\',top_tag,\'>\\n\'), http_body);\n"
+"return;\n"
+"}\n"
+"if (meta_mode = 3)\n"
+"{\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
+"http (concat (\'<!DOCTYPE \', top_tag, \' \', meta_data, \'>\'), http_body);\n"
+"http (concat (\'<\',top_tag,\'>\\n\'), http_body);\n"
+"return;\n"
+"}\n"
+"if (meta_mode = 4)\n"
+"{\n"
+"signal (\'22023\', \'Unsupported type of metadata\', \'DA005\');\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
+"http (concat (\'<\',top_tag,\' xmlns=\"\', path, \'.xsd\" \',meta_data, \'>\\n\'), http_body);\n"
+"return;\n"
+"}\n"
+"if (meta_mode = 5)\n"
+"{\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
+"http (concat (\'<\',top_tag,\' xmlns=\"\', path, \'.xsd\" \', meta_data, \'>\\n\'), http_body);\n"
+"return;\n"
+"}\n"
+"if (meta_mode = 6)\n"
+"{\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', current_charset()), http_body);\n"
+"http (concat (\'<\',top_tag ,\' \' , meta_data, \'>\\n\'), http_body);\n"
+"return;\n"
+"}\n"
+"signal (\'22023\', \'Unsupported type of metadata\', \'DA006\');\n"
"}\n"
-"--src dav.sql:4408\n";
+"--src dav.sql:4218\n";
-static const char *proc67 =
-"#line 4439 \"[executable]/dav.sql\"\n"
-"create procedure\n"
-"WS.WS.DAV_REMOVE_ASMX (in path any)\n"
+static const char *proc58 =
+"#line 4283 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.XML_VIEW_EXTERNAL_META\n"
+"(\n"
+"in view_name varchar,\n"
+"in top_tag varchar,\n"
+"in meta_mode integer,\n"
+"in meta_data varchar,\n"
+"inout http_body any,\n"
+"inout meta_path_suffix varchar,\n"
+"inout mime_type varchar\n"
+")\n"
"{\n"
-"if ((strstr (path, \'.asmx\') is not null) and __proc_exists (\'WS.WS.__http_handler_aspx\', 1))\n"
+"if (meta_mode = 2)\n"
"{\n"
-"declare ret any;\n"
-"ret := \"LEFT\" (path, strstr (path, \'.asmx\') + 5);\n"
-"return ret;\n"
+"http (xml_view_dtd (view_name, top_tag), http_body);\n"
+"http (meta_data, http_body);\n"
+"meta_path_suffix := \'.dtd\';\n"
+"mime_type := \'xml/dtd\';\n"
+"return;\n"
"}\n"
-"else\n"
-"return path;\n"
+"if (meta_mode = 5)\n"
+"{\n"
+"http (xml_view_schema (view_name, top_tag), http_body);\n"
+"meta_path_suffix := \'.xsd\';\n"
+"mime_type := \'xml/schema\';\n"
+"return;\n"
+"}\n"
+"meta_path_suffix := \'\';\n"
+"mime_type := \'\';\n"
"}\n"
-"--src dav.sql:4437\n";
+"--src dav.sql:4281\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"
-"in _sch varchar,\n"
-"in _dtd varchar,\n"
-"in _comments varchar,\n"
-"inout ses any,\n"
-"in enc varchar := null )\n"
+static const char *proc59 =
+"#line 4314 \"[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"
-"\n"
-"if (length (_sch))\n"
-"_dtd := \'\';\n"
-"\n"
-"\n"
-"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', coalesce (enc, current_charset())), ses);\n"
-"\n"
-"if (_comments <> \'\')\n"
-"http (replace (sprintf (\'<!\\-\\- %s \\-\\->\\n\', _comments), \'\\-\', \'-\'), ses);\n"
-"\n"
-"\n"
-"if (_dtd <> \'\' and _root <> \'\')\n"
+"declare _body any;\n"
+"declare _pf varchar;\n"
+"declare _procprefix varchar;\n"
+"_procprefix := concat (name_part (_view, 0), \'.\', name_part (_view, 1), \'.\');\n"
+"_body := string_output ();\n"
+"WS.WS.XML_VIEW_HEADER(_view, name_part (_view, 2), path, meta_mode, meta_data, _body);\n"
+"_pf := concat (_procprefix, \'http_view_\', name_part (_view, 2));\n"
+"call (_pf) (_body);\n"
+"http (concat (\'</\', name_part (_view, 2), \'>\'), _body);\n"
+"_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:4312\n";
+
+static const char *proc60 =
+"#line 4330 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.FIXPATH (in path any)\n"
"{\n"
-"if (_dtd = \'on\')\n"
-"http (concat (\'<!DOCTYPE \' , _root, \' [\', xml_auto_dtd (_q, _root), \']>\\n\'), ses);\n"
+"declare inx, len, cp, sl integer;\n"
+"declare tmp, newp varchar;\n"
+"declare ret any;\n"
+"len := length (path);\n"
+"if (__tag (path) = 193)\n"
+"{\n"
+"inx := 0;\n"
+"tmp := \'\';\n"
+"cp := aref (path, len - 1);\n"
+"while (inx < length (cp))\n"
+"{\n"
+"if (aref (cp, inx) > 159 and aref (cp, inx) < 192)\n"
+"tmp := concat (tmp, \'_\');\n"
+"else if (aref (cp, inx) = ascii (\'?\'))\n"
+"tmp := concat (tmp, \'_\');\n"
"else\n"
-"http (concat (\'<!DOCTYPE \' , _root, \' SYSTEM \'\'\', _dtd, \'\'\'>\\n\'), ses);\n"
+"tmp := concat (tmp, chr (aref (cp, inx)));\n"
+"inx := inx + 1;\n"
+"}\n"
+"ret := path;\n"
+"aset (ret, len - 1, tmp);\n"
"}\n"
+"else if (isstring (path))\n"
+"{\n"
+"inx := 0;\n"
+"tmp := \'\';\n"
+"cp := path;\n"
+"if (strstr (cp, \'http://\') = 0)\n"
+"{\n"
+"declare pp, lp varchar;\n"
+"pp := coalesce (http_map_get (\'mounted\'), \'/DAV/\');\n"
+"lp := coalesce (http_map_get (\'domain\'), \'/DAV\');\n"
+"newp := subseq (cp, strstr (cp, \'://\') + 3, length (cp));\n"
+"sl := strchr (newp, \'/\');\n"
+"newp := subseq (newp, strchr (newp, \'/\'), length (newp));\n"
"\n"
"\n"
-"if (_root <> \'\' and _sch = \'\')\n"
-"http (concat (\'<\', _root, \'>\\n\'), ses);\n"
-"else if (_root <> \'\' and _sch <> \'\')\n"
-"http (concat (\'<\', _root,\n"
-"\' xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"\',\n"
-"_sch, \'\">\\n\'), ses);\n"
"\n"
"\n"
-"xml_auto (_q, vector (), ses);\n"
"\n"
"\n"
-"if (_root <> \'\')\n"
-"http (concat(\'</\', _root, \'>\\n\'), ses);\n"
"\n"
-"return;\n"
+"if (strstr (newp, lp) is not null)\n"
+"{\n"
+"newp := substring (newp, length (lp) + 1, length (newp));\n"
+"\n"
+"if (aref (newp, 0) <> ascii (\'/\'))\n"
+"newp := concat (\'/\', newp);\n"
+"\n"
+"if (aref (pp, length (pp) - 1) = ascii (\'/\'))\n"
+"pp := substring (pp, 1, length (pp) - 1);\n"
+"newp := concat (pp, newp);\n"
"}\n"
-"--src dav.sql:4452\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"
+"else\n"
"{\n"
-"http_header (\'Content-Type: message/http\\r\\n\');\n"
-"http_flush (1); \n"
-"foreach (varchar l in lines) do\n"
+"newp := concat (\'/DAV\', subseq (newp, strchr (subseq (newp, 1,length (newp)), \'/\') + 1,\n"
+"length (newp)));\n"
+"}\n"
+"cp := concat (subseq (cp, 0, sl + 7), newp);\n"
+"}\n"
+"while (inx < length (cp))\n"
"{\n"
-"http (l);\n"
+"if (aref (cp, inx) > 159 and aref (cp, inx) < 192)\n"
+"tmp := concat (tmp, \'_\');\n"
+"else if (aref (cp, inx) = ascii (\'?\'))\n"
+"tmp := concat (tmp, \'_\');\n"
+"else\n"
+"tmp := concat (tmp, chr (aref (cp, inx)));\n"
+"inx := inx + 1;\n"
"}\n"
+"ret := tmp;\n"
"}\n"
-"--src dav.sql:4499\n";
-
-/* dav_api.sql */
+"else\n"
+"ret := \'\';\n"
+"return ret;\n"
+"}\n"
+"--src dav.sql:4328\n";
-static const char *proc70 =
-"#line 51 \"[executable]/dav_api.sql\"\n"
-"create function DAV_PERROR (in x any)\n"
+static const char *proc61 =
+"#line 4411 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.ISPUBL (in __path varchar)\n"
"{\n"
-"declare errlist any;\n"
-"if (not isinteger (x))\n"
-"return NULL;\n"
-"if (x >= 0)\n"
+"declare _srv, _path varchar;\n"
+"declare _ix, _len integer;\n"
+"_srv := repl_this_server ();\n"
+"if (__tag (__path) = 193)\n"
+"{\n"
+"_ix := 0;\n"
+"_len := length (__path);\n"
+"_path := \'/\';\n"
+"while (_ix < _len)\n"
+"{\n"
+"_path := concat ( _path, aref (__path, _ix), \'/\');\n"
+"_ix := _ix + 1;\n"
+"}\n"
+"}\n"
+"else if (isstring (__path))\n"
+"_path := __path;\n"
+"else\n"
+"{\n"
+"signal (\'22023\', \'Function ISPUBL needs string or array as argument.\', \'DA007\');\n"
"return NULL;\n"
-"if (x < -43)\n"
-"return sprintf (\'(%d) Unspecified error\', x);\n"
-"errlist := vector (\n"
-"\'(-01) The path (target of operation) is not valid\',\n"
-"\'(-02) The destination (path) is not valid\',\n"
-"\'(-03) Overwrite flag is not set and destination exists\',\n"
-"\'(-04) The target is resource, but source is collection (in copy move operations)\',\n"
-"\'(-05) Permissions are not valid\',\n"
-"\'(-06) uid is not valid\',\n"
-"\'(-07) gid is not valid\',\n"
-"\'(-08) Target is locked\',\n"
-"\'(-09) Destination is locked\',\n"
-"\'(-10) Property name is reserved (protected or private)\',\n"
-"\'(-11) Property does not exist\',\n"
-"\'(-12) Authentication failed\',\n"
-"\'(-13) Operation is forbidden (the authenticated user do not have a permissions for the action)\',\n"
-"\'(-14) the target type is not valid\',\n"
-"\'(-15) The umask is not valid\',\n"
-"\'(-16) The property already exists\',\n"
-"\'(-17) Invalid property value\',\n"
-"\'(-18) no such user\',\n"
-"\'(-19) no home directory\',\n"
-"\'(-20) The operation is not supported by a DET\',\n"
-"\'(-21) DET can not restore the full DAV path by id\',\n"
-"\'(-22) Corrupted id\',\n"
-"\'(-23) The id does not correspond to any resource that exists now\',\n"
-"\'(-24) Authentication failed and requested\',\n"
-"\'(-25) Can not create collection if a resource with same name exists\',\n"
-"\'(-26) Can not create resource if a collection with same name exists\',\n"
-"\'(-27) Target is not locked\',\n"
-"\'(-28) Unqualified error\',\n"
-"\'(-29) Transaction deadlock at the end of resource upload, after reading from session\',\n"
-"\'(-30) The target is nested into source\',\n"
-"\'(-31) Built-in system account can not be changed\',\n"
-"\'(-32) Property that can control execution of SQL statements can be changed only by SQL-enabled user\',\n"
-"\'(-33) The DET resource or collection ID is rejected, the operation supports only plain DAV\',\n"
-"\'(-34) The path (target of operation) is not valid: no parent collection exists\',\n"
-"\'(-35) Failed dependency on lock operation\',\n"
-"\'(-36) Appropriate property virt:Versioning-* has not been set\',\n"
-"\'(-37) Operation is not supported for resource of this type\',\n"
-"\'(-38) Semantics is violated\',\n"
-"\'(-39) Recursive operation on CatFilter is impossible\',\n"
-"\'(-40) The path (target of operation) does not match naming convention that is used by DET\',\n"
-"\'(-41) The size of DAV collection subtree is out of quota\',\n"
-"\'(-42) The resource is unavailable because resource owner is disabled\',\n"
-"\'(-43) Access to a home DAV collection of a disabled account is blocked\'\n"
-");\n"
-"return errlist [-(x+1)];\n"
"}\n"
-"--src dav_api.sql:49\n";
-
-static const char *proc71 =
-"#line 110 \"[executable]/dav_api.sql\"\n"
-"create procedure\n"
-"DAV_ADD_USER_INT (in uid varchar,\n"
-"in pwd varchar,\n"
-"in gid any,\n"
-"in perms varchar,\n"
-"in disable integer,\n"
-"in home varchar,\n"
-"in full_name varchar,\n"
-"in email varchar)\n"
+"for select TI_ITEM, TI_ACCT from DB.DBA.SYS_TP_ITEM where TI_SERVER = _srv and TI_TYPE = 1 do\n"
"{\n"
-"declare id, gd, rc integer;\n"
-"if (not exists (select 1 from WS.WS.SYS_DAV_USER where U_NAME = uid))\n"
+"if (TI_ITEM is not null and length (TI_ITEM) > 0)\n"
"{\n"
-"USER_CREATE (uid, pwd, vector (\'SQL_ENABLE\', 0, \'DAV_ENABLE\', 1, \'PRIMARY_GROUP\', gid,\n"
-"\'HOME\', home, \'E-MAIL\', email, \'FULL_NAME\', full_name, \'PERMISSIONS\', perms, \'DISABLED\', disable));\n"
-"}\n"
-"else\n"
+"if (aref (TI_ITEM, length (TI_ITEM) - 1) <> ascii (\'/\'))\n"
"{\n"
-"id := coalesce ((select U_ID from WS.WS.SYS_DAV_USER where U_NAME = uid), NULL);\n"
-"if (id < 100)\n"
-"return -31;\n"
-"if (isstring (gid))\n"
-"gd := coalesce ((select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid), NULL);\n"
-"else if (isinteger (gid) and exists (select 1 from WS.WS.SYS_DAV_GROUP where G_ID = gid))\n"
-"gd := gid;\n"
+"if (_path between (TI_ITEM || \'/\') and DAV_COL_PATH_BOUNDARY (TI_ITEM || \'/\'))\n"
+"return TI_ACCT;\n"
+"}\n"
"else\n"
-"gd := NULL;\n"
-"if (gid = http_nogroup_gid ())\n"
-"return -31;\n"
-"\n"
-"if (id is not null)\n"
"{\n"
-"update WS.WS.SYS_DAV_USER set\n"
-"U_GROUP = gd,\n"
-"U_DEF_PERMS = perms,\n"
-"U_FULL_NAME = full_name,\n"
-"U_PWD = pwd_magic_calc (uid, pwd),\n"
-"U_E_MAIL = email,\n"
-"U_ACCOUNT_DISABLED = disable,\n"
-"U_HOME = home\n"
-"where\n"
-"U_NAME = uid;\n"
+"if (_path between TI_ITEM and DAV_COL_PATH_BOUNDARY (TI_ITEM))\n"
+"return TI_ACCT;\n"
"}\n"
"}\n"
-"return id;\n"
"}\n"
-"--src dav_api.sql:108\n";
+"return NULL;\n"
+"}\n"
+"--src dav.sql:4409\n";
-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"
-"in perms varchar, in disable integer,\n"
-"in home varchar, in full_name varchar, in email varchar,\n"
-"in auth_uname varchar := NULL,\n"
-"in auth_pwd varchar := NULL\n"
-")\n"
+static const char *proc62 =
+"#line 4454 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.BODY_ARR (inout __ses any, in __pcs integer)\n"
"{\n"
-"declare rc, make_dir integer;\n"
-"\n"
-"if (DAV_CHECK_AUTH (auth_uname, auth_pwd, 1) < 0)\n"
-"return -12;\n"
-"\n"
-"make_dir := 0;\n"
+"declare _res, _ses any;\n"
+"declare _str varchar;\n"
+"declare _len, _from, _pcs integer;\n"
"\n"
-"if (not exists (select 1 from WS.WS.SYS_DAV_USER where U_NAME = uid))\n"
-"make_dir := 1;\n"
+"if (__pcs is null)\n"
+"_pcs := 1000000;\n"
+"else\n"
+"_pcs := __pcs;\n"
"\n"
-"rc := DAV_ADD_USER_INT (uid, pwd, gid, perms, disable, home, full_name, email);\n"
-"if (rc < 0)\n"
-"return rc;\n"
+"_res := null;\n"
+"_from := 1;\n"
"\n"
-"if (make_dir)\n"
-"{\n"
-"if (isstring (home))\n"
+"if (__tag (__ses) = 126 or __tag (__ses) = 133)\n"
"{\n"
-"if (0 > (rc := DAV_COL_CREATE (home, perms, uid, gid, auth_uname, auth_pwd)))\n"
+"_ses := string_output ();\n"
+"http (__ses, _ses);\n"
+"_len := length (_ses);\n"
+"while (_from < _len)\n"
"{\n"
-"rollback work;\n"
-"return rc;\n"
+"_str := substring (_ses, _from, _pcs);\n"
+"if (_res is null)\n"
+"_res := vector (_str);\n"
+"else\n"
+"_res := vector_concat (_res, vector (_str));\n"
+"_from := _from + _pcs;\n"
"}\n"
"}\n"
+"else if (isstring (__ses) or __tag (__ses) = 185)\n"
+"{\n"
+"_len := length (__ses);\n"
+"while (_from < _len)\n"
+"{\n"
+"_str := substring (__ses, _from, _pcs);\n"
+"if (_res is null)\n"
+"_res := vector (_str);\n"
+"else\n"
+"_res := vector_concat (_res, vector (_str));\n"
+"_from := _from + _pcs;\n"
"}\n"
-"return rc;\n"
"}\n"
-"--src dav_api.sql:157\n";
-
-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"
+"else\n"
"{\n"
-"declare known_u_id integer;\n"
-"if (DAV_CHECK_AUTH (auth_uname, auth_pwd, 1) < 0)\n"
-"return -12;\n"
-"known_u_id := coalesce ((select U_ID from WS.WS.SYS_DAV_USER where U_NAME = uid), NULL);\n"
-"if (known_u_id < 100)\n"
-"return -31;\n"
-"\n"
-"delete from WS.WS.SYS_DAV_TAG where DT_U_ID = known_u_id;\n"
-"delete from WS.WS.SYS_DAV_USER where U_NAME = uid;\n"
-"return 0;\n"
-"}\n"
-"--src dav_api.sql:195\n";
-
-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"
+"_ses := \'\';\n"
"}\n"
-"--src dav_api.sql:212\n";
-
-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"
+"return _res;\n"
"}\n"
-"--src dav_api.sql:217\n";
+"--src dav.sql:4452\n";
-static const char *proc76 =
-"#line 225 \"[executable]/dav_api.sql\"\n"
-" create function\n"
-"DAV_PERM_D2U (in perms varchar)\n"
-"{\n"
-"declare res any;\n"
-"declare i int;\n"
-"res := perms;\n"
-"if (regexp_match (DAV_REGEXP_PATTERN_FOR_PERM (), res) is null)\n"
-"signal (\'22023\', \'Not valid permissions string\');\n"
-"res := \'rwxrwxrwx\' || upper (subseq (perms, 9));\n"
-"while (i < 9)\n"
+static const char *proc63 =
+"#line 4509 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.XML_AUTO_SCHED (in _path varchar)\n"
"{\n"
-"if (perms[i] = ascii(\'0\'))\n"
-"aset (res, i, ascii (\'-\'));\n"
-"i := i + 1;\n"
-"}\n"
-"return lower(res);\n"
+"declare _stmt, ses, _root, _sch, _dtd, _dtd_body, _comments varchar;\n"
+"declare _res_id integer;\n"
+"_res_id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _path), 0);\n"
+"if (_res_id < 1)\n"
+"return;\n"
+"_stmt := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xml-sql\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'\');\n"
+"_root := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xml-sql-root\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'document\');\n"
+"_sch := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xml-sql-schema\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'\');\n"
+"_dtd := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xml-sql-dtd\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'\');\n"
+"_comments := coalesce ((select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_PROP where\n"
+"PROP_NAME = \'xml-sql-description\'\n"
+"and PROP_TYPE = \'R\'\n"
+"and PROP_PARENT_ID = _res_id), \'\');\n"
+"if (_stmt = \'\')\n"
+"return;\n"
+"ses := string_output (http_strses_memory_size ());\n"
+"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_api.sql:223\n";
+"--src dav.sql:4507\n";
-static const char *proc77 =
-"#line 245 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_PERM_U2D (in perms varchar)\n"
+static const char *proc64 =
+"#line 4541 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.DAV_LOGIN (in path any,\n"
+"in lines any,\n"
+"in __access varchar,\n"
+"inout __u_id integer,\n"
+"inout __grp integer,\n"
+"inout __perms varchar)\n"
"{\n"
-"declare res any;\n"
-"declare i int;\n"
-"res := perms;\n"
-"if (regexp_match (DAV_REGEXP_PATTERN_FOR_PERM (), res) is not null)\n"
-"return perms;\n"
-"res := perms;\n"
-"if (regexp_match (DAV_REGEXP_PATTERN_FOR_UNIX_PERM (), res) is null)\n"
-"signal (\'22023\', \'Not valid permissions string\');\n"
-"res := \'000000000\' || upper (subseq (perms, 9));\n"
-"while (i < 9)\n"
-"{\n"
-"if (perms[i] <> ascii(\'-\'))\n"
-"aset (res, i, ascii (\'1\'));\n"
-"i := i + 1;\n"
-"}\n"
-"return res;\n"
-"}\n"
-"--src dav_api.sql:243\n";
-
-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"
-"{\n"
-"declare pwd varchar;\n"
-"declare uid integer;\n"
-"whenever not found goto nf;\n"
+"declare auth any;\n"
+"declare _access, _perms varchar;\n"
+"declare _u_id, _grp integer;\n"
"\n"
-"if (adm)\n"
-"select U_PWD, U_ID into pwd, uid from WS.WS.SYS_DAV_USER where U_ID = http_dav_uid () and U_NAME = auth_uname;\n"
+"_u_id := http_nobody_uid ();\n"
+"_grp := http_nogroup_gid ();\n"
+"_perms := \'110110110\';\n"
+"\n"
+"if (upper (__access) = \'R\')\n"
+"_access := \'100\';\n"
+"else if ( upper (__access) = \'RW\')\n"
+"_access := \'110\';\n"
"else\n"
-"select U_PWD, U_ID into pwd, uid from WS.WS.SYS_DAV_USER where U_NAME = auth_uname;\n"
+"_access := \'100\';\n"
"\n"
+"auth := DB.DBA.vsp_auth_vec (lines);\n"
"\n"
-"if (isstring (pwd))\n"
+"if (not WS.WS.ISPUBLIC (path, _access) or auth <> 0)\n"
"{\n"
-"if ((pwd[0] = 0 and pwd_magic_calc (auth_uname, auth_pwd) = pwd) or (pwd[0] <> 0 and pwd = auth_pwd))\n"
-"return uid;\n"
+"_u_id := WS.WS.CHECK_AUTH (lines);\n"
+"if (_u_id = http_nobody_uid ())\n"
+"return _u_id;\n"
+"if (not WS.WS.CHECKPERM (path, _u_id, _access))\n"
+"return 0;\n"
"}\n"
"\n"
-"nf:\n"
-"\n"
-"if (auth_uname is null)\n"
-"{\n"
+"if (_u_id <> 0)\n"
+"select U_DEF_PERMS, U_GROUP into _perms, _grp from WS.WS.SYS_DAV_USER where U_ID = _u_id;\n"
"\n"
-"return 1;\n"
-"}\n"
-"if (ftp_anonymous_check (auth_uname))\n"
-"return 1;\n"
+"if (__u_id is not null)\n"
+"__u_id := _u_id;\n"
+"if (__grp is not null)\n"
+"__grp := _grp;\n"
+"if (__u_id is not null)\n"
+"__perms := _perms;\n"
"\n"
-"return -12;\n"
+"return (1);\n"
"}\n"
-"--src dav_api.sql:265\n";
+"--src dav.sql:4539\n";
-static const char *proc79 =
-"#line 301 \"[executable]/dav_api.sql\"\n"
-" create function\n"
-"DAV_HOME_DIR (in uid varchar) returns any\n"
+static const char *proc65 =
+"#line 4588 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.HTTP_RESP (in hdr any, out descr varchar)\n"
"{\n"
-"declare res any;\n"
-"whenever not found goto er;\n"
-"select U_HOME into res from WS.WS.SYS_DAV_USER where U_NAME = uid;\n"
-"return coalesce (res, -19);\n"
-"er:\n"
-"return -18;\n"
+"declare line, code varchar;\n"
+"descr := \'Bad Gateway\';\n"
+"if (hdr is null or __tag (hdr) <> 193)\n"
+"return (502);\n"
+"if (length (hdr) < 1)\n"
+"return (502);\n"
+"line := aref (hdr, 0);\n"
+"if (length (line) < 12)\n"
+"return (502);\n"
+"code := substring (line, strstr (line, \'HTTP/1.\') + 9, length (line));\n"
+"while ((length (code) > 0) and (aref (code, 0) < ascii (\'0\') or aref (code, 0) > ascii (\'9\')))\n"
+"code := substring (code, 2, length (code) - 1);\n"
+"if (length (code) < 3)\n"
+"return (502);\n"
+"if (length (code) > 3)\n"
+"{\n"
+"descr := substring (code, 4, length (code) - 3);\n"
+"descr := replace (descr, chr(10), \'\');\n"
+"descr := replace (descr, chr(13), \'\');\n"
"}\n"
-"--src dav_api.sql:299\n";
+"code := substring (code, 1, 3);\n"
+"return atoi (code);\n"
+"}\n"
+"--src dav.sql:4586\n";
-static const char *proc80 =
-"#line 313 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_HOME_DIR_CREATE (in uid varchar) returns any\n"
+static const char *proc66 =
+"#line 4616 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.COPY_TO_OTHER (in path varchar,\n"
+"inout params varchar,\n"
+"in lines varchar,\n"
+"in __dst_name varchar)\n"
"{\n"
-"declare exit handler for sqlstate \'*\' { return -1; };\n"
+"declare _s_path, _ovr, _depth varchar;\n"
+"declare _resp any;\n"
+"declare _content, _thdr, _thost, _auth, _resp_cli, _dst_name varchar;\n"
+"declare _len, _sl, _code integer;\n"
+"declare _u_id, _grp, _perms any;\n"
"\n"
-"declare rc, c_id integr;\n"
-"declare host, path varchar;\n"
+"_dst_name := WS.WS.FINDPARAM (lines, \'Destination:\');\n"
+"WS.WS.DAV_LOGIN (path, lines, \'R\', _u_id, _grp, _perms);\n"
"\n"
-"for (select U_ID, U_GROUP, U_DEF_PERMS, U_HOME from SYS_USERS where U_NAME = uid) do {\n"
-"path := \'/DAV/home/\';\n"
-"rc := DAV_MAKE_DIR (path, http_dav_uid (), http_admin_gid (), \'110100100R\');\n"
-"if (isnull (DAV_HIDE_ERROR (rc)))\n"
-"goto _end;\n"
-"path := path || uid || \'/\';\n"
-"rc := DAV_MAKE_DIR (path, U_ID, U_GROUP, U_DEF_PERMS);\n"
-"if (isnull (DAV_HIDE_ERROR (rc)))\n"
-"goto _end;\n"
-"path := path || \'rdf_sink/\';\n"
-"rc := DAV_MAKE_DIR (path, U_ID, U_GROUP, U_DEF_PERMS);\n"
-"if (isnull (DAV_HIDE_ERROR (rc)))\n"
-"goto _end;\n"
+"_s_path := http_path ();\n"
+"_ovr := WS.WS.FINDPARAM (lines, \'Overwrite:\');\n"
+"if (_ovr = \'\')\n"
+"_ovr := \'T\';\n"
+"_depth := WS.WS.FINDPARAM (lines, \'Depth:\');\n"
+"if (_depth = \'\')\n"
+"_depth := \'infinity\';\n"
+"_auth := WS.WS.FINDPARAM (lines, \'Authorization:\');\n"
"\n"
-"host := virtuoso_ini_item_value (\'URIQA\', \'DefaultHost\');\n"
-"if (host is null) {\n"
-"host := sys_stat (\'st_host_name\');\n"
-"if (server_http_port () <> \'80\')\n"
-"host := host ||\':\'|| server_http_port ();\n"
+"_thost := substring (_dst_name, 8, length (_dst_name) - 8);\n"
+"_sl := strchr (_thost, \'/\');\n"
+"if (_sl)\n"
+"_thost := substring (_thost, 1, _sl);\n"
+"\n"
+"if (_auth <> \'\')\n"
+"_thdr := concat (\'Host: \', _thost, \'\\r\\n\',\n"
+"\'Overwrite: \', _ovr, \'\\r\\n\',\n"
+"\'Authorization: \', _auth, \'\\r\\n\',\n"
+"\'Depth: \', _depth);\n"
+"else\n"
+"_thdr := concat (\'Host: \', _thost, \'\\r\\n\',\n"
+"\'Overwrite: \', _ovr, \'\\r\\n\',\n"
+"\'Depth: \', _depth);\n"
+"\n"
+"if (WS.WS.ISRES (path))\n"
+"{\n"
+"\n"
+"select blob_to_string (RES_CONTENT), length (RES_CONTENT)\n"
+"into _content, _len from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _s_path;\n"
+"commit work;\n"
+"http_get (_dst_name, _resp, \'PUT\', _thdr, _content);\n"
+"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
+"http_request_status (sprintf (\'HTTP/1.1 %d %s\', _code, _resp_cli));\n"
+"\n"
+"if (_code > 199 and _code < 299)\n"
+"return 1;\n"
+"else\n"
+"return 0;\n"
"}\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"
-"if (isnull (DAV_HIDE_ERROR (rc)))\n"
-"goto _end;\n"
+"else if (WS.WS.ISCOL (path))\n"
+"{\n"
+"\n"
+"commit work;\n"
+"http_get (_dst_name, _resp, \'HEAD\', _thdr);\n"
+"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
+"if (_code <> 200)\n"
+"{\n"
+"commit work;\n"
+"http_get (_dst_name, _resp, \'MKCOL\', _thdr);\n"
+"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
+"if (_code < 200 or _code > 299)\n"
+"{\n"
+"http_request_status (sprintf (\'HTTP/1.1 %d %s\', _code, _resp_cli));\n"
+"return 0;\n"
"}\n"
-"_end:;\n"
-"return rc;\n"
"}\n"
-"--src dav_api.sql:311\n";
-
-static const char *proc81 =
-"#line 353 \"[executable]/dav_api.sql\"\n"
-"create procedure\n"
-"DAV_ADD_GROUP_INT (in gid varchar)\n"
+"for select SUBCOL_FULL_PATH\n"
+"from DAV_PLAIN_SUBCOLS\n"
+"where root_id = NULL and root_path = concat (_s_path, \'/\') and recursive = 1 and subcol_auth_uid = null and subcol_auth_pwd = null\n"
+"order by SUBCOL_ID\n"
+"do\n"
"{\n"
-"declare gd integer;\n"
-"gd := coalesce ((select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid), 0);\n"
-"if (not gd)\n"
+"commit work;\n"
+"http_get (concat (\'http://\', _thost, SUBCOL_FULL_PATH), _resp, \'HEAD\', _thdr);\n"
+"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
+"if (_code <> 200)\n"
"{\n"
-"gd := USER_ROLE_CREATE (gid, 1);\n"
+"http_get (concat (\'http://\', _thost, SUBCOL_FULL_PATH), _resp, \'MKCOL\', _thdr);\n"
+"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
+"if (_code < 200 or _code > 299)\n"
+"{\n"
+"http_request_status (sprintf (\'HTTP/1.1 %d %s\', _code, _resp_cli));\n"
+"return 0;\n"
"}\n"
-"return gd;\n"
"}\n"
-"--src dav_api.sql:351\n";
-
-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"
+"\n"
+"}\n"
+"for select RES_FULL_PATH as res_path, blob_to_string (RES_CONTENT) as content\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where RES_FULL_PATH like concat (_s_path, \'/%\')\n"
+"order by RES_ID\n"
+"do\n"
"{\n"
-"if (DAV_CHECK_AUTH (auth_uname, auth_pwd, 1) < 0)\n"
-"return -12;\n"
-"return DAV_ADD_GROUP_INT (gid);\n"
+"commit work;\n"
+"http_get (concat (\'http://\', _thost, res_path), _resp, \'PUT\', _thdr, content);\n"
+"_code := WS.WS.HTTP_RESP (_resp, _resp_cli);\n"
+"if (_code < 200 or _code > 299)\n"
+"{\n"
+"http_request_status (sprintf (\'HTTP/1.1 %d %s\', _code, _resp_cli));\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:365\n";
-
-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"
+"\n"
+"}\n"
+"}\n"
+"else\n"
"{\n"
-"declare known_g_id integer;\n"
-"if (DAV_CHECK_AUTH (auth_uname, auth_pwd, 1) < 0)\n"
-"return -12;\n"
-"known_g_id := coalesce ((select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid), NULL);\n"
-"if (known_g_id < 100)\n"
-"return -31;\n"
-"delete from WS.WS.SYS_DAV_GROUP where G_NAME = gid;\n"
+"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:375\n";
+"return 1;\n"
+"}\n"
+"--src dav.sql:4614\n";
-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"
+static const char *proc67 =
+"#line 4733 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.CHECK_READ_ACCESS (in _u_id integer, in doc_id integer)\n"
"{\n"
-"declare auth_uid integer;\n"
-"auth_uid := DAV_CHECK_AUTH (auth_uname, auth_pwd, 0);\n"
-"if (auth_uid < 0)\n"
-"return -12;\n"
-"\n"
-"return DAV_DIR_LIST_INT (path, recursive, \'%\', auth_uname, auth_pwd, auth_uid);\n"
+"declare _perms varchar;\n"
+"declare g_id, _user, _group, rc integer;\n"
+"if (_u_id = http_dav_uid ())\n"
+"return 1;\n"
+"rc := 0;\n"
+"g_id := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = _u_id), 0);\n"
+"whenever not found goto exit_p;\n"
+"select RES_OWNER, RES_GROUP, RES_PERMS into _user, _group, _perms\n"
+"from WS.WS.SYS_DAV_RES where RES_ID = doc_id;\n"
+"_perms := coalesce (_perms, \'000000000\');\n"
+"if (_u_id = _user)\n"
+"rc := WS.WS.PERM_COMP (substring (cast (_perms as varchar), 1, 3), \'100\');\n"
+"if (_group = g_id and rc = 0)\n"
+"rc := WS.WS.PERM_COMP (substring (cast (_perms as varchar), 4, 3), \'100\');\n"
+"if (rc = 0)\n"
+"rc := WS.WS.PERM_COMP (substring (cast (_perms as varchar), 7, 3), \'100\');\n"
+"exit_p:;\n"
+"return rc;\n"
"}\n"
-"--src dav_api.sql:391\n";
+"--src dav.sql:4731\n";
-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"
+static const char *proc68 =
+"#line 4756 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.IS_REDIRECT_REF (inout path any, in lines any, inout location varchar)\n"
"{\n"
-"declare auth_uid integer;\n"
-"declare compilation any;\n"
-"\n"
-"auth_uid := DAV_CHECK_AUTH (auth_uname, auth_pwd, 0);\n"
-"if (auth_uid < 0)\n"
-"return -12;\n"
-"compilation := vector (\'\', filter, \'DAV\', DAV_FC_PRINT_WHERE (filter, auth_uid));\n"
-"\n"
-"return DAV_DIR_FILTER_INT (path, recursive, compilation, auth_uname, auth_pwd, auth_uid);\n"
+"declare fpath, fpath1, _ref, lpath, ppath varchar;\n"
+"declare rc integer;\n"
+"rc := 0;\n"
+"set isolation=\'committed\';\n"
+"location := http_path ();\n"
+"declare cr cursor for select blob_to_string (PROP_VALUE) from WS.WS.SYS_DAV_RES, WS.WS.SYS_DAV_PROP where\n"
+"RES_FULL_PATH = fpath1\n"
+"and PROP_PARENT_ID = RES_ID and\n"
+"PROP_NAME = \'redirectref\' and PROP_TYPE = \'R\' option (order);\n"
+"fpath := http_physical_path (); fpath1 := rtrim (fpath, \'/\');\n"
+"whenever not found goto nfp;\n"
+"open cr (prefetch 1);\n"
+"fetch cr into _ref;\n"
+"if (not isstring (_ref))\n"
+"goto nfp;\n"
+"lpath := http_path ();\n"
+"location := WS.WS.EXPAND_URL (lpath, _ref);\n"
+"ppath := WS.WS.EXPAND_URL (fpath, _ref);\n"
+"path := WS.WS.HREF_TO_ARRAY (ppath, \'\');\n"
+"rc := 1;\n"
+"nfp:\n"
+"close cr;\n"
+"set isolation=\'repeatable\';\n"
+"return rc;\n"
"}\n"
-"--src dav_api.sql:404\n";
+"--src dav.sql:4754\n";
-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"
+static const char *proc69 =
+"#line 4786 \"[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"
-"st := upper (st);\n"
-"if (isinteger (id))\n"
+"declare _dir, _xml, _modify, fsize, _html, _b_opt, _xml_sheet any;\n"
+"declare _name varchar;\n"
+"declare _res_len, flen, mult, have_sheet integer;\n"
+"declare _dir_len, _dir_ctr integer;\n"
+"\n"
+"fsize := vector (\'b\',\'K\',\'M\',\'G\',\'T\');\n"
+"_xml := string_output ();\n"
+"have_sheet := 0;\n"
+"\n"
+"\n"
+"_dir := DAV_DIR_LIST_INT (full_path, 0, \'%\', auth_uname, auth_pwd, auth_uid);\n"
+"\n"
+"if (isinteger (_dir))\n"
+"return _dir;\n"
+"_dir_len := length (_dir);\n"
+"http (\'<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\', _xml);\n"
+"http (sprintf (\'<PATH dir_name=\"%V\" physical_dir_name=\"%V\">\', cast (logical_root_path as varchar), cast (full_path as varchar)), _xml);\n"
+"http (\'<DIRS>\', _xml);\n"
+"\n"
+"http (\'<SUBDIR modify=\"\" name=\"..\" />\\n\', _xml);\n"
+"_dir_ctr := 0;\n"
+"while (_dir_ctr < _dir_len)\n"
"{\n"
-"if (\'R\' = st)\n"
-"return coalesce ((select RES_COL from WS.WS.SYS_DAV_RES where RES_ID = id), -1);\n"
-"if (\'C\' = st)\n"
-"return coalesce ((select COL_PARENT from WS.WS.SYS_DAV_COL where COL_ID = id), -1);\n"
-"return -14;\n"
+"declare _col any;\n"
+"_col := _dir [_dir_ctr];\n"
+"\n"
+"if (_col [1] = \'C\')\n"
+"{\n"
+"_name := _col[0];\n"
+"_name := subseq (_name, 0, length (_name)-1);\n"
+"_name := subseq (_name, strrchr (_name, \'/\') + 1);\n"
+"http (sprintf (\'<SUBDIR modify=\"%s\" name=\"\',\n"
+"soap_print_box (_col[3], \'\', 2)), _xml );\n"
+"http_value (charset_recode (_name, null, \'UTF-8\'), null, _xml );\n"
+"http (\'\" />\\n\', _xml );\n"
"}\n"
-"return call (cast (id[0] as varchar) || \'_DAV_GET_PARENT\') (id, st, path);\n"
+"_dir_ctr := _dir_ctr + 1;\n"
"}\n"
-"--src dav_api.sql:420\n";
-
-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"
+"http (\'</DIRS><FILES>\', _xml);\n"
+"_dir_ctr := 0;\n"
+"while (_dir_ctr < _dir_len)\n"
"{\n"
-"declare rc integer;\n"
+"declare _res any;\n"
+"_res := _dir [_dir_ctr];\n"
"\n"
-"rc := DAV_AUTHENTICATE (did, st, \'1__\', auth_uname, auth_pwd, auth_uid);\n"
-"if (rc < 0)\n"
+"if (_res [1] = \'R\')\n"
"{\n"
-"declare auth_parent any;\n"
-"auth_parent := DAV_GET_PARENT (did, st, path);\n"
-"rc := DAV_AUTHENTICATE (auth_parent, \'C\', \'1__\', auth_uname, auth_pwd, auth_uid);\n"
-"if (rc < 0)\n"
+"_name := _res[0];\n"
+"_name := subseq (_name, strrchr (_name, \'/\') + 1);\n"
+"_res_len := _res[2];\n"
+"flen := _res_len;\n"
+"mult := 0;\n"
+"if (lower (_name) = \'folder.xsl\')\n"
+"have_sheet := 1;\n"
+"while ((flen / 1000) > 1)\n"
"{\n"
-"\n"
-"return rc;\n"
+"mult := mult + 1;\n"
+"flen := flen / 1000;\n"
"}\n"
+"http (sprintf (\'<FILE modify=\"%s\" rs=\"%i\" hs=\"%d %s\" name=\"\',\n"
+"soap_print_box (_res[3], \'\', 2), _res_len, flen, aref (fsize, mult)), _xml);\n"
+"http_value (charset_recode (_name, null, \'UTF-8\'), null, _xml );\n"
+"http (\'\" />\\n\', _xml);\n"
"}\n"
-"if (auth_uid is null)\n"
-"auth_uid := rc;\n"
-"if (isarray (did))\n"
-"{\n"
-"if (\'R\' = st)\n"
-"return call (cast (did[0] as varchar) || \'_DAV_DIR_SINGLE\') (did, st, path, auth_uid);\n"
-"else\n"
-"return call (cast (did[0] as varchar) || \'_DAV_DIR_LIST\') (did, vector (\'\'), path, \'%\', -1, auth_uid);\n"
+"_dir_ctr := _dir_ctr + 1;\n"
"}\n"
-"if (\'R\' = st)\n"
+"http (\'</FILES></PATH>\', _xml);\n"
+"\n"
+"\n"
+"_xml := xtree_doc (_xml);\n"
+"\n"
+"_b_opt := NULL;\n"
+"\n"
+"if (exists (select 1 from DB.DBA.HTTP_PATH\n"
+"where HP_LPATH = http_map_get (\'domain\') and HP_PPATH = http_map_get (\'mounted\')))\n"
+"select deserialize(HP_OPTIONS) into _b_opt from DB.DBA.HTTP_PATH\n"
+"where HP_LPATH = http_map_get (\'domain\') and HP_PPATH = http_map_get (\'mounted\');\n"
+"\n"
+"if (_b_opt is not NULL)\n"
+"_b_opt := get_keyword (\'browse_sheet\', _b_opt, \'\');\n"
+"\n"
+"if (have_sheet)\n"
"{\n"
-"return coalesce ((select vector (RES_FULL_PATH, \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
-"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME )\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where\n"
-"RES_ID = did ));\n"
+"select blob_to_string (RES_CONTENT) into _xml_sheet from WS.WS.SYS_DAV_RES\n"
+"where RES_NAME = \'folder.xsl\' and RES_COL = col;\n"
+"xslt_sheet (\'http://local.virt/custom_dir_output\', xtree_doc (_xml_sheet));\n"
+"_html := cast (xslt (\'http://local.virt/custom_dir_output\', _xml) as varchar);\n"
"}\n"
-"else\n"
+"else if (_b_opt <> \'\')\n"
"{\n"
-"return coalesce ((select vector (WS.WS.COL_PATH (COL_ID), \'C\', 0, COL_MOD_TIME,\n"
-"COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', COL_NAME)\n"
-"from WS.WS.SYS_DAV_COL\n"
-"where COL_ID = did ));\n"
+"select blob_to_string (RES_CONTENT) into _xml_sheet from WS.WS.SYS_DAV_RES\n"
+"where RES_FULL_PATH = _b_opt;\n"
+"xslt_sheet (\'http://local.virt/custom_dir_output\', xml_tree_doc (_xml_sheet));\n"
+"_html := cast (xslt (\'http://local.virt/custom_dir_output\', _xml) as varchar);\n"
"}\n"
+"else\n"
+"_html := cast (xslt (\'http://local.virt/dir_output\', _xml) as varchar);\n"
+"\n"
+"http (_html);\n"
+"\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:437\n";
+"--src dav.sql:4784\n";
-static const char *proc88 =
-"#line 484 \"[executable]/dav_api.sql\"\n"
+static const char *proc70 =
+"#line 4912 \"[executable]/dav.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"
+"WS.WS.DAV_CHECK_ASMX (in path any, out patched_path any) returns integer\n"
"{\n"
-"declare rc, t, id, l integer;\n"
-"declare path_string, st, det varchar;\n"
-"declare did, detcol_id, detcol_path, det_subpath, res any;\n"
-"\n"
+"declare temp varchar;\n"
+"temp := http_path (path);\n"
"\n"
-"path_string := path;\n"
-"did := DAV_SEARCH_SOME_ID_OR_DET (path, st, det, detcol_id, detcol_path, det_subpath);\n"
-"if (DAV_HIDE_ERROR (did) is null)\n"
-"return did;\n"
-"rc := DAV_AUTHENTICATE (did, st, \'1__\', auth_uname, auth_pwd, auth_uid);\n"
-"if (rc < 0)\n"
+"if ((strstr (temp, \'.asmx\') is not null) and __proc_exists (\'WS.WS.__http_handler_aspx\', 1))\n"
"{\n"
-"if (rec_depth = -1)\n"
+"declare ret any;\n"
+"declare idx integer;\n"
+"idx := 0;\n"
+"ret := vector ();\n"
+"while (idx < length (path))\n"
"{\n"
-"declare auth_parent any;\n"
-"auth_parent := DAV_GET_PARENT (did, st, path);\n"
-"rc := DAV_AUTHENTICATE (auth_parent, \'C\', \'1__\', auth_uname, auth_pwd, auth_uid);\n"
-"}\n"
-"if (rc < 0)\n"
+"ret := vector_concat (ret, vector (path[idx]));\n"
+"if (strstr (path[idx], \'.asmx\') is not null)\n"
"{\n"
-"\n"
-"return rc;\n"
+"patched_path := ret;\n"
+"return 1;\n"
"}\n"
+"idx := idx + 1;\n"
"}\n"
-"if (auth_uid is null)\n"
-"auth_uid := rc;\n"
-"if (isarray (did))\n"
-"{\n"
-"if ((\'R\' = st) or (rec_depth = -1))\n"
-"res := vector (call (cast (did[0] as varchar) || \'_DAV_DIR_SINGLE\') (did, st, path, auth_uid));\n"
-"else\n"
-"res := call (cast (det as varchar) || \'_DAV_DIR_LIST\') (detcol_id, det_subpath, detcol_path, name_mask, rec_depth, auth_uid);\n"
-"return res;\n"
-"}\n"
-"vectorbld_init (res);\n"
-"if (\'R\' = st)\n"
-"{\n"
-"for select vector (RES_FULL_PATH, \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
-"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME ) as i\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where\n"
-"RES_NAME like name_mask and RES_FULL_PATH = DAV_CONCAT_PATH (path, null) do\n"
-"{\n"
-"vectorbld_acc (res, i);\n"
"}\n"
+"patched_path := path;\n"
+"return 0;\n"
"}\n"
-"else if (rec_depth = -1)\n"
+"--src dav.sql:4910\n";
+
+static const char *proc71 =
+"#line 4941 \"[executable]/dav.sql\"\n"
+"create procedure\n"
+"WS.WS.DAV_REMOVE_ASMX (in path any)\n"
"{\n"
-"for select vector (WS.WS.COL_PATH (COL_ID), \'C\', 0, COL_MOD_TIME,\n"
-"COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', COL_NAME) as i\n"
-"from WS.WS.SYS_DAV_COL\n"
-"where\n"
-"COL_ID = did do\n"
+"if ((strstr (path, \'.asmx\') is not null) and __proc_exists (\'WS.WS.__http_handler_aspx\', 1))\n"
"{\n"
-"vectorbld_acc (res, i);\n"
+"declare ret any;\n"
+"ret := \"LEFT\" (path, strstr (path, \'.asmx\') + 5);\n"
+"return ret;\n"
"}\n"
+"else\n"
+"return path;\n"
"}\n"
-"else if (rec_depth > 0)\n"
+"--src dav.sql:4939\n";
+
+static const char *proc72 =
+"#line 4956 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.XMLSQL_TO_STRSES (\n"
+"in _q varchar,\n"
+"in _root varchar,\n"
+"in _sch varchar,\n"
+"in _dtd varchar,\n"
+"in _comments varchar,\n"
+"inout ses any,\n"
+"in enc varchar := null )\n"
"{\n"
-"for select SUBCOL_FULL_PATH, SUBCOL_ID, SUBCOL_NAME, SUBCOL_PARENT, SUBCOL_DET\n"
-"from DB.DBA.DAV_PLAIN_SUBCOLS\n"
-"where (root_id = did) and (root_path = path_string) and recursive = rec_depth and subcol_auth_uid = auth_uid and subcol_auth_pwd = auth_pwd\n"
"\n"
-"do for select COL_MOD_TIME,\n"
-"COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME from WS.WS.SYS_DAV_COL\n"
-"where\n"
-"COL_PARENT = SUBCOL_PARENT and COL_NAME = SUBCOL_NAME\n"
-"do\n"
-"{\n"
-"vectorbld_acc (res, vector (SUBCOL_FULL_PATH, \'C\', 0, COL_MOD_TIME,\n"
-"SUBCOL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', SUBCOL_NAME) );\n"
-"if (SUBCOL_DET is not NULL)\n"
-"vectorbld_concat_acc (res, call (SUBCOL_DET || \'_DAV_DIR_LIST\') (SUBCOL_ID, vector (\'\'), SUBCOL_FULL_PATH, name_mask, rec_depth, auth_uid));\n"
-"for select vector (\n"
+"if (length (_sch))\n"
+"_dtd := \'\';\n"
"\n"
-"RES_FULL_PATH, \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
"\n"
-"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME) as i\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where\n"
-"RES_NAME like name_mask and RES_COL = SUBCOL_ID\n"
-"do\n"
-"{\n"
-"vectorbld_acc (res, i);\n"
-"}\n"
-"}\n"
-"}\n"
-"else if (det is null)\n"
-"{\n"
+"http (sprintf (\'<?xml version=\"1.0\" encoding=\"%s\" ?>\\n\', coalesce (enc, current_charset())), ses);\n"
"\n"
-"for select vector (RES_FULL_PATH, \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
-"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME) as i\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where\n"
+"if (_comments <> \'\')\n"
+"http (replace (sprintf (\'<!\\-\\- %s \\-\\->\\n\', _comments), \'\\-\', \'-\'), ses);\n"
"\n"
-"RES_NAME like name_mask and RES_COL = did do\n"
-"{\n"
-"vectorbld_acc (res, i);\n"
-"}\n"
-"for select vector (WS.WS.COL_PATH (COL_ID), \'C\', 0, COL_MOD_TIME,\n"
-"COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', COL_NAME) as i\n"
-"from WS.WS.SYS_DAV_COL\n"
-"where\n"
"\n"
-"COL_PARENT = did do\n"
+"if (_dtd <> \'\' and _root <> \'\')\n"
"{\n"
-"vectorbld_acc (res, i);\n"
-"}\n"
-"}\n"
+"if (_dtd = \'on\')\n"
+"http (concat (\'<!DOCTYPE \' , _root, \' [\', xml_auto_dtd (_q, _root), \']>\\n\'), ses);\n"
"else\n"
-"{\n"
-"vectorbld_concat_acc (res, call (cast (det as varchar) || \'_DAV_DIR_LIST\') (did, vector (\'\'), path, name_mask, rec_depth, auth_uid));\n"
-"}\n"
-"vectorbld_final (res);\n"
-"return res;\n"
+"http (concat (\'<!DOCTYPE \' , _root, \' SYSTEM \'\'\', _dtd, \'\'\'>\\n\'), ses);\n"
"}\n"
-"--src dav_api.sql:482\n";
-
-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"
-"{\n"
-"declare rc, t, id, uid, gid, l integer;\n"
-"declare path_string, st, det, qry_text varchar;\n"
-"declare did, detcol_id, detcol_path, det_subpath, res any;\n"
"\n"
-"declare execstate, execmessage, execmeta, execrows any;\n"
-"declare davcond varchar;\n"
-"davcond := get_keyword (\'DAV\', compilation);\n"
-"if (davcond is null)\n"
-"{\n"
-"davcond := DAV_FC_PRINT_WHERE (get_keyword (\'\', compilation), auth_uid);\n"
-"compilation := vector_concat (compilation, vector (\'DAV\', davcond));\n"
-"}\n"
-"execstate := \'00000\';\n"
-"vectorbld_init (res);\n"
-"path_string := path;\n"
-"did := DAV_SEARCH_SOME_ID_OR_DET (path, st, det, detcol_id, detcol_path, det_subpath);\n"
-"if (isarray (did))\n"
-"{\n"
-"if (auth_uid is null)\n"
-"uid := call (cast (did[0] as varchar) || \'_DAV_AUTHENTICATE\') (did, st, \'1__\', auth_uname, auth_pwd, uid);\n"
-"else\n"
-"uid := auth_uid;\n"
-"if (uid < 0)\n"
-"{\n"
"\n"
-"return res;\n"
-"}\n"
-"if (\'R\' = st)\n"
-"res := vector (call (cast (did[0] as varchar) || \'_DAV_DIR_SINGLE\') (did, st, path, uid));\n"
-"else\n"
-"res := call (cast (det as varchar) || \'_DAV_DIR_FILTER\') (detcol_id, det_subpath, detcol_path, compilation, rec_depth, uid);\n"
-"return res;\n"
-"}\n"
-"if (did < 0)\n"
-"{\n"
-"return did;\n"
-"}\n"
-"if (\'R\' = st or det is null)\n"
-"{\n"
-"if (auth_uid is null)\n"
-"uid := DAV_AUTHENTICATE (did, st, \'1__\', auth_uname, auth_pwd, uid);\n"
-"else\n"
-"uid := auth_uid;\n"
-"if (uid < 0)\n"
-"{\n"
+"if (_root <> \'\' and _sch = \'\')\n"
+"http (concat (\'<\', _root, \'>\\n\'), ses);\n"
+"else if (_root <> \'\' and _sch <> \'\')\n"
+"http (concat (\'<\', _root,\n"
+"\' xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"\',\n"
+"_sch, \'\">\\n\'), ses);\n"
"\n"
-"return res;\n"
-"}\n"
-"gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = uid), 0);\n"
-"}\n"
"\n"
-"if (\'R\' = st)\n"
-"{\n"
-"qry_text := \'\n"
-"select _top.RES_FULL_PATH, \'\'R\'\', length (_top.RES_CONTENT), _top.RES_MOD_TIME,\n"
-"_top.RES_ID, _top.RES_PERMS, _top.RES_GROUP, _top.RES_OWNER, _top.RES_CR_TIME, _top.RES_TYPE, _top.RES_NAME\n"
-"from WS.WS.SYS_DAV_RES as _top \' || davcond || \' and\n"
-"(_top.RES_FULL_PATH = DAV_CONCAT_PATH (?, null)) and\n"
-"case (\n"
-"DAV_CHECK_PERM (_top.RES_PERMS, \'\'1__\'\', ?, ?, _top.RES_GROUP, _top.RES_OWNER) )\n"
-"when 0 then WS.WS.ACL_IS_GRANTED (_top.RES_ACL, ?, DAV_REQ_CHARS_TO_BITMASK (\'\'1__\'\'))\n"
-"else 1 end\';\n"
+"xml_auto (_q, vector (), ses);\n"
"\n"
-"exec (qry_text, execstate, execmessage,\n"
-"vector (path, uid, gid, uid),\n"
-"100000000, execmeta, execrows );\n"
"\n"
-"if (\'00000\' <> execstate)\n"
-"signal (execstate, execmessage || \' in \' || qry_text);\n"
-"vectorbld_concat_acc (res, execrows);\n"
-"}\n"
-"else if (rec_depth = -1)\n"
-"{\n"
-"for select vector (WS.WS.COL_PATH (COL_ID), \'C\', 0, COL_MOD_TIME,\n"
-"COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', COL_NAME) as i\n"
-"from WS.WS.SYS_DAV_COL\n"
-"where\n"
+"if (_root <> \'\')\n"
+"http (concat(\'</\', _root, \'>\\n\'), ses);\n"
"\n"
-"COL_ID = did do\n"
-"{\n"
-"vectorbld_acc (res, i);\n"
-"}\n"
+"return;\n"
"}\n"
-"else if (rec_depth > 0)\n"
+"--src dav.sql:4954\n";
+
+static const char *proc73 =
+"#line 5003 \"[executable]/dav.sql\"\n"
+"create procedure WS.WS.\"TRACE\" (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"qry_text := \'\n"
-"select _top.RES_FULL_PATH, \'\'R\'\', length (_top.RES_CONTENT), _top.RES_MOD_TIME,\n"
-"_top.RES_ID, _top.RES_PERMS, _top.RES_GROUP, _top.RES_OWNER, _top.RES_CR_TIME, _top.RES_TYPE, _top.RES_NAME\n"
-"from WS.WS.SYS_DAV_RES as _top \' || davcond || \' and (_top.RES_FULL_PATH between ? and ?) and\n"
-"case (\n"
-"DAV_CHECK_PERM (_top.RES_PERMS, \'\'1__\'\', ?, ?, _top.RES_GROUP, _top.RES_OWNER) )\n"
-"when 0 then WS.WS.ACL_IS_GRANTED (_top.RES_ACL, ?, DAV_REQ_CHARS_TO_BITMASK (\'\'1__\'\'))\n"
-"else 1 end\';\n"
-"\n"
-"exec (qry_text,\n"
-"execstate, execmessage,\n"
-"vector (path_string, DAV_COL_PATH_BOUNDARY (path_string), uid, gid, uid), 100000000, execmeta, execrows );\n"
-"\n"
-"if (\'00000\' <> execstate)\n"
-"signal (execstate, execmessage || \' in \' || qry_text);\n"
-"vectorbld_concat_acc (res, execrows);\n"
-"\n"
-"for select SUBCOL_FULL_PATH, SUBCOL_ID, SUBCOL_DET\n"
-"from DB.DBA.DAV_PLAIN_SUBCOLS\n"
-"where SUBCOL_DET is not null and (not (SUBCOL_DET like \'%Filter\')) and recursive = rec_depth and (root_id = did) and (root_path = path_string) and subcol_auth_uid = null and subcol_auth_pwd = null\n"
-"do\n"
+"http_header (\'Content-Type: message/http\\r\\n\');\n"
+"http_flush (1);\n"
+"foreach (varchar l in lines) do\n"
"{\n"
-"vectorbld_concat_acc (res, call (SUBCOL_DET || \'_DAV_DIR_FILTER\') (SUBCOL_ID, vector (\'\'), SUBCOL_FULL_PATH, compilation, rec_depth, auth_uid));\n"
-"}\n"
+"http (l);\n"
"}\n"
-"else if (det is null)\n"
-"{\n"
-"qry_text := \'\n"
-"select _top.RES_FULL_PATH, \'\'R\'\', length (_top.RES_CONTENT), _top.RES_MOD_TIME,\n"
-"_top.RES_ID, _top.RES_PERMS, _top.RES_GROUP, _top.RES_OWNER, _top.RES_CR_TIME, _top.RES_TYPE, _top.RES_NAME\n"
-"from WS.WS.SYS_DAV_RES as _top \' || davcond || \' and (RES_COL = ?) and\n"
-"case (\n"
-"DAV_CHECK_PERM (_top.RES_PERMS, \'\'1__\'\', ?, ?, _top.RES_GROUP, _top.RES_OWNER) )\n"
-"when 0 then WS.WS.ACL_IS_GRANTED (_top.RES_ACL, ?, DAV_REQ_CHARS_TO_BITMASK (\'\'1__\'\'))\n"
-"else 1 end\';\n"
-"\n"
-"exec (qry_text, execstate, execmessage,\n"
-"vector (did, uid, gid, uid),\n"
-"100000000, execmeta, execrows );\n"
-"\n"
-"if (\'00000\' <> execstate)\n"
-"signal (execstate, execmessage || \' in \' || qry_text);\n"
-"vectorbld_concat_acc (res, execrows);\n"
"}\n"
-"else\n"
+"--src dav.sql:5001\n";
+
+/* dav_api.sql */
+
+static const char *proc74 =
+"#line 51 \"[executable]/dav_api.sql\"\n"
+"create function DAV_PERROR (in x any)\n"
"{\n"
-"if (auth_uid is null)\n"
-"uid := call (cast (did[0] as varchar) || \'_DAV_AUTHENTICATE\') (did, st, \'1__\', auth_uname, auth_pwd, uid);\n"
-"else\n"
-"uid := auth_uid;\n"
-"if (uid < 0)\n"
-"{\n"
-"\n"
-"return res;\n"
-"}\n"
-"vectorbld_concat_acc (res, call (cast (det as varchar) || \'_DAV_DIR_FILTER\') (did, vector (\'\'), path, compilation, rec_depth, uid));\n"
-"}\n"
-"vectorbld_final (res);\n"
-"return res;\n"
+"declare errlist any;\n"
+"if (not isinteger (x))\n"
+"return NULL;\n"
+"if (x >= 0)\n"
+"return NULL;\n"
+"if (x < -43)\n"
+"return sprintf (\'(%d) Unspecified error\', x);\n"
+"errlist := vector (\n"
+"\'(-01) The path (target of operation) is not valid\',\n"
+"\'(-02) The destination (path) is not valid\',\n"
+"\'(-03) Overwrite flag is not set and destination exists\',\n"
+"\'(-04) The target is resource, but source is collection (in copy move operations)\',\n"
+"\'(-05) Permissions are not valid\',\n"
+"\'(-06) uid is not valid\',\n"
+"\'(-07) gid is not valid\',\n"
+"\'(-08) Target is locked\',\n"
+"\'(-09) Destination is locked\',\n"
+"\'(-10) Property name is reserved (protected or private)\',\n"
+"\'(-11) Property does not exist\',\n"
+"\'(-12) Authentication failed\',\n"
+"\'(-13) Operation is forbidden (the authenticated user do not have a permissions for the action)\',\n"
+"\'(-14) the target type is not valid\',\n"
+"\'(-15) The umask is not valid\',\n"
+"\'(-16) The property already exists\',\n"
+"\'(-17) Invalid property value\',\n"
+"\'(-18) no such user\',\n"
+"\'(-19) no home directory\',\n"
+"\'(-20) The operation is not supported by a DET\',\n"
+"\'(-21) DET can not restore the full DAV path by id\',\n"
+"\'(-22) Corrupted id\',\n"
+"\'(-23) The id does not correspond to any resource that exists now\',\n"
+"\'(-24) Authentication failed and requested\',\n"
+"\'(-25) Can not create collection if a resource with same name exists\',\n"
+"\'(-26) Can not create resource if a collection with same name exists\',\n"
+"\'(-27) Target is not locked\',\n"
+"\'(-28) Unqualified error\',\n"
+"\'(-29) Transaction deadlock at the end of resource upload, after reading from session\',\n"
+"\'(-30) The target is nested into source\',\n"
+"\'(-31) Built-in system account can not be changed\',\n"
+"\'(-32) Property that can control execution of SQL statements can be changed only by SQL-enabled user\',\n"
+"\'(-33) The DET resource or collection ID is rejected, the operation supports only plain DAV\',\n"
+"\'(-34) The path (target of operation) is not valid: no parent collection exists\',\n"
+"\'(-35) Failed dependency on lock operation\',\n"
+"\'(-36) Appropriate property virt:Versioning-* has not been set\',\n"
+"\'(-37) Operation is not supported for resource of this type\',\n"
+"\'(-38) Semantics is violated\',\n"
+"\'(-39) Recursive operation on CatFilter is impossible\',\n"
+"\'(-40) The path (target of operation) does not match naming convention that is used by DET\',\n"
+"\'(-41) The size of DAV collection subtree is out of quota\',\n"
+"\'(-42) The resource is unavailable because resource owner is disabled\',\n"
+"\'(-43) Access to a home DAV collection of a disabled account is blocked\'\n"
+");\n"
+"return errlist [-(x+1)];\n"
"}\n"
-"--src dav_api.sql:604\n";
+"--src dav_api.sql:49\n";
-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"
+static const char *proc75 =
+"#line 110 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_ADD_USER_INT (in uid varchar,\n"
+"in pwd varchar,\n"
+"in gid any,\n"
+"in perms varchar,\n"
+"in disable integer,\n"
+"in home varchar,\n"
+"in full_name varchar,\n"
+"in email varchar)\n"
"{\n"
-"declare res varchar;\n"
-"what := upper (what);\n"
-"if (isarray(id) and not isstring(id))\n"
-"return call (cast (id[0] as varchar) || \'_DAV_SEARCH_PATH\') (id, what);\n"
-"if (id <= 0)\n"
+"declare id, gd, rc integer;\n"
+"if (not exists (select 1 from WS.WS.SYS_DAV_USER where U_NAME = uid))\n"
"{\n"
-"if (id = 0)\n"
-"return \'/\';\n"
-"return -22;\n"
+"USER_CREATE (uid, pwd, vector (\'SQL_ENABLE\', 0, \'DAV_ENABLE\', 1, \'PRIMARY_GROUP\', gid,\n"
+"\'HOME\', home, \'E-MAIL\', email, \'FULL_NAME\', full_name, \'PERMISSIONS\', perms, \'DISABLED\', disable));\n"
"}\n"
-"whenever not found goto en;\n"
-"if (what = \'C\')\n"
+"else\n"
"{\n"
-"res := WS.WS.COL_PATH (id);\n"
-"if (res = \'/\')\n"
-"return -23;\n"
-"return res;\n"
-"}\n"
-"else if (what = \'R\')\n"
+"id := coalesce ((select U_ID from WS.WS.SYS_DAV_USER where U_NAME = uid), NULL);\n"
+"if (id < 100)\n"
+"return -31;\n"
+"if (isstring (gid))\n"
+"gd := coalesce ((select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid), NULL);\n"
+"else if (isinteger (gid) and exists (select 1 from WS.WS.SYS_DAV_GROUP where G_ID = gid))\n"
+"gd := gid;\n"
+"else\n"
+"gd := NULL;\n"
+"if (gid = http_nogroup_gid ())\n"
+"return -31;\n"
+"\n"
+"if (id is not null)\n"
"{\n"
-"select RES_FULL_PATH into res from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
-"return res;\n"
+"update WS.WS.SYS_DAV_USER set\n"
+"U_GROUP = gd,\n"
+"U_DEF_PERMS = perms,\n"
+"U_FULL_NAME = full_name,\n"
+"U_PWD = pwd_magic_calc (uid, pwd),\n"
+"U_E_MAIL = email,\n"
+"U_ACCOUNT_DISABLED = disable,\n"
+"U_HOME = home\n"
+"where\n"
+"U_NAME = uid;\n"
"}\n"
-"else\n"
-"return -14;\n"
-"en:\n"
-"return -23;\n"
"}\n"
-"--src dav_api.sql:756\n";
+"return id;\n"
+"}\n"
+"--src dav_api.sql:108\n";
-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"
-"{\n"
-"declare id integer;\n"
-"declare par any;\n"
-"id := -1;\n"
-"what := upper (what);\n"
-"\n"
-"if (isstring (path))\n"
+static const char *proc76 =
+"#line 159 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_ADD_USER (in uid varchar, in pwd varchar, in gid varchar,\n"
+"in perms varchar, in disable integer,\n"
+"in home varchar, in full_name varchar, in email varchar,\n"
+"in auth_uname varchar := NULL,\n"
+"in auth_pwd varchar := NULL\n"
+")\n"
"{\n"
+"declare rc, make_dir integer;\n"
"\n"
-"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"if (DAV_CHECK_AUTH (auth_uname, auth_pwd, 1) < 0)\n"
+"return -12;\n"
"\n"
-"}\n"
-"else\n"
-"{\n"
+"make_dir := 0;\n"
"\n"
-"par := path;\n"
-"}\n"
-"if (length (par) = 0)\n"
-"{\n"
+"if (not exists (select 1 from WS.WS.SYS_DAV_USER where U_NAME = uid))\n"
+"make_dir := 1;\n"
"\n"
-"return -1;\n"
-"}\n"
-"if (aref (par, 0) <> \'\')\n"
-"{\n"
+"rc := DAV_ADD_USER_INT (uid, pwd, gid, perms, disable, home, full_name, email);\n"
+"if (rc < 0)\n"
+"return rc;\n"
"\n"
-"return -1;\n"
-"}\n"
-"if (what = \'P\')\n"
-"{\n"
-"if (par [length (par) - 1] = \'\')\n"
-"{\n"
-"if (2 = length (par))\n"
-"return -1;\n"
-"if (3 = length (par))\n"
-"return 0;\n"
-"par := vector_concat (subseq (par, 0, length (par) - 2), vector (\'\'));\n"
-"}\n"
-"else\n"
+"if (make_dir)\n"
"{\n"
-"if (2 = length (par))\n"
-"return 0;\n"
-"par := vector_concat (subseq (par, 0, length (par) - 1), vector (\'\'));\n"
-"}\n"
-"path := null;\n"
-"what := \'C\';\n"
-"}\n"
-"\n"
-"if (what = \'R\')\n"
+"if (isstring (home))\n"
"{\n"
-"if (aref (par, length (par) - 1) = \'\')\n"
+"if (0 > (rc := DAV_COL_CREATE (home, perms, uid, gid, auth_uname, auth_pwd)))\n"
"{\n"
-"\n"
-"return -1;\n"
+"rollback work;\n"
+"return rc;\n"
"}\n"
-"if (not isstring (path))\n"
-"path := DAV_CONCAT_PATH (par, null);\n"
-"id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1);\n"
"}\n"
-"else if (what = \'C\')\n"
-"{\n"
-"if (aref (par, length (par) - 1) <> \'\')\n"
-"{\n"
-"\n"
-"return -1;\n"
"}\n"
-"if (not isstring (path))\n"
-"path := DAV_CONCAT_PATH (par, null);\n"
-"\n"
-"id := -1;\n"
+"return rc;\n"
"}\n"
-"else\n"
+"--src dav_api.sql:157\n";
+
+static const char *proc77 =
+"#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"
"{\n"
+"declare known_u_id integer;\n"
+"if (DAV_CHECK_AUTH (auth_uname, auth_pwd, 1) < 0)\n"
+"return -12;\n"
+"known_u_id := coalesce ((select U_ID from WS.WS.SYS_DAV_USER where U_NAME = uid), NULL);\n"
+"if (known_u_id < 100)\n"
+"return -31;\n"
"\n"
-"return -14;\n"
+"delete from WS.WS.SYS_DAV_TAG where DT_U_ID = known_u_id;\n"
+"delete from WS.WS.SYS_DAV_USER where U_NAME = uid;\n"
+"return 0;\n"
"}\n"
-"\n"
-"if (id = -1)\n"
-"{\n"
-"declare det_ret, detcol_id, detcol_path_parts, unreached_path_parts any;\n"
-"return DAV_SEARCH_ID_OR_DET (par, what, det_ret, detcol_id, detcol_path_parts, unreached_path_parts);\n"
+"--src dav_api.sql:195\n";
+
+static const char *proc78 =
+"#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"
-"return id;\n"
+"--src dav_api.sql:212\n";
+
+static const char *proc79 =
+"#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:791\n";
+"--src dav_api.sql:217\n";
-static const char *proc92 =
-"#line 881 \"[executable]/dav_api.sql\"\n"
+static const char *proc80 =
+"#line 225 \"[executable]/dav_api.sql\"\n"
" create function\n"
-"DAV_SEARCH_SOME_ID (in path any, out what char (1)) returns any\n"
+"DAV_PERM_D2U (in perms varchar)\n"
"{\n"
-"declare id integer;\n"
-"declare par any;\n"
-"id := -1;\n"
-"\n"
-"if (isstring (path))\n"
-"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"else\n"
-"par := path;\n"
-"if (aref (par, 0) <> \'\')\n"
+"declare res any;\n"
+"declare i int;\n"
+"res := perms;\n"
+"if (regexp_match (DAV_REGEXP_PATTERN_FOR_PERM (), res) is null)\n"
+"signal (\'22023\', \'Not valid permissions string\');\n"
+"res := \'rwxrwxrwx\' || upper (subseq (perms, 9));\n"
+"while (i < 9)\n"
"{\n"
-"\n"
-"return -1;\n"
+"if (perms[i] = ascii(\'0\'))\n"
+"aset (res, i, ascii (\'-\'));\n"
+"i := i + 1;\n"
"}\n"
-"if (aref (par, length (par) - 1) <> \'\')\n"
+"return lower(res);\n"
+"}\n"
+"--src dav_api.sql:223\n";
+
+static const char *proc81 =
+"#line 245 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_PERM_U2D (in perms varchar)\n"
"{\n"
-"what := \'R\';\n"
-"if (not isstring (path))\n"
-"path := DAV_CONCAT_PATH (par, null);\n"
-"id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1);\n"
+"declare res any;\n"
+"declare i int;\n"
+"res := perms;\n"
+"if (regexp_match (DAV_REGEXP_PATTERN_FOR_PERM (), res) is not null)\n"
+"return perms;\n"
+"res := perms;\n"
+"if (regexp_match (DAV_REGEXP_PATTERN_FOR_UNIX_PERM (), res) is null)\n"
+"signal (\'22023\', \'Not valid permissions string\');\n"
+"res := \'000000000\' || upper (subseq (perms, 9));\n"
+"while (i < 9)\n"
+"{\n"
+"if (perms[i] <> ascii(\'-\'))\n"
+"aset (res, i, ascii (\'1\'));\n"
+"i := i + 1;\n"
+"}\n"
+"return res;\n"
"}\n"
+"--src dav_api.sql:243\n";
+
+static const char *proc82 =
+"#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"
+"{\n"
+"declare pwd varchar;\n"
+"declare uid integer;\n"
+"whenever not found goto nf;\n"
+"\n"
+"if (adm)\n"
+"select U_PWD, U_ID into pwd, uid from WS.WS.SYS_DAV_USER where U_ID = http_dav_uid () and U_NAME = auth_uname;\n"
"else\n"
+"select U_PWD, U_ID into pwd, uid from WS.WS.SYS_DAV_USER where U_NAME = auth_uname;\n"
+"\n"
+"\n"
+"if (isstring (pwd))\n"
"{\n"
-"what := \'C\';\n"
-"if (not isstring (path))\n"
-"path := DAV_CONCAT_PATH (par, null);\n"
-"id := DAV_SEARCH_ID (path, \'C\');\n"
+"if ((pwd[0] = 0 and pwd_magic_calc (auth_uname, auth_pwd) = pwd) or (pwd[0] <> 0 and pwd = auth_pwd))\n"
+"return uid;\n"
"}\n"
"\n"
-"if (id = -1)\n"
+"nf:\n"
+"\n"
+"if (auth_uname is null)\n"
"{\n"
-"declare det_ret, detcol_id, detcol_path_parts, unreached_path_parts any;\n"
-"return DAV_SEARCH_ID_OR_DET (par, what, det_ret, detcol_id, detcol_path_parts, unreached_path_parts);\n"
-"}\n"
-"return id;\n"
+"\n"
+"return 1;\n"
"}\n"
-"--src dav_api.sql:879\n";
-
-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"
-"{\n"
-"if (not (isinteger (res)))\n"
-"return res;\n"
-"if (res >= 0)\n"
-"return res;\n"
-"return dflt;\n"
+"if (ftp_anonymous_check (auth_uname))\n"
+"return 1;\n"
+"\n"
+"return -12;\n"
"}\n"
-"--src dav_api.sql:920\n";
+"--src dav_api.sql:265\n";
-static const char *proc94 =
-"#line 935 \"[executable]/dav_api.sql\"\n"
+static const char *proc83 =
+"#line 301 \"[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"
+"DAV_HOME_DIR (in uid varchar) returns any\n"
"{\n"
-"if (not (isinteger (res)))\n"
-"return dflt_det;\n"
-"if (res >= 0)\n"
-"return res;\n"
-"return dflt_err;\n"
+"declare res any;\n"
+"whenever not found goto er;\n"
+"select U_HOME into res from WS.WS.SYS_DAV_USER where U_NAME = uid;\n"
+"return coalesce (res, -19);\n"
+"er:\n"
+"return -18;\n"
"}\n"
-"--src dav_api.sql:933\n";
+"--src dav_api.sql:299\n";
-static const char *proc95 =
-"#line 948 \"[executable]/dav_api.sql\"\n"
-" create function DAV_CONCAT_PATH (in parts1 any, in parts2 any)\n"
-"{\n"
-"declare strg1, strg2 varchar;\n"
-"declare len, ctr integer;\n"
-"if (parts1 is null)\n"
-"strg1 := \'\';\n"
-"else if (isstring (parts1))\n"
-"strg1 := parts1;\n"
-"else\n"
-"{\n"
-"len := length (parts1);\n"
-"if (len = 0)\n"
-"strg1 := \'\';\n"
-"else\n"
-"{\n"
-"strg1 := parts1 [0];\n"
-"ctr := 1;\n"
-"while (ctr < len)\n"
+static const char *proc84 =
+"#line 313 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_HOME_DIR_CREATE (in uid varchar) returns any\n"
"{\n"
-"strg1 := strg1 || \'/\' || parts1 [ctr];\n"
-"ctr := ctr + 1;\n"
+"declare exit handler for sqlstate \'*\' { return -1; };\n"
+"\n"
+"declare rc, c_id integr;\n"
+"declare host, path varchar;\n"
+"\n"
+"for (select U_ID, U_GROUP, U_DEF_PERMS, U_HOME from SYS_USERS where U_NAME = uid) do {\n"
+"path := \'/DAV/home/\';\n"
+"rc := DAV_MAKE_DIR (path, http_dav_uid (), http_admin_gid (), \'110100100R\');\n"
+"if (isnull (DAV_HIDE_ERROR (rc)))\n"
+"goto _end;\n"
+"path := path || uid || \'/\';\n"
+"rc := DAV_MAKE_DIR (path, U_ID, U_GROUP, U_DEF_PERMS);\n"
+"if (isnull (DAV_HIDE_ERROR (rc)))\n"
+"goto _end;\n"
+"path := path || \'rdf_sink/\';\n"
+"rc := DAV_MAKE_DIR (path, U_ID, U_GROUP, U_DEF_PERMS);\n"
+"if (isnull (DAV_HIDE_ERROR (rc)))\n"
+"goto _end;\n"
+"\n"
+"host := virtuoso_ini_item_value (\'URIQA\', \'DefaultHost\');\n"
+"if (host is null) {\n"
+"host := sys_stat (\'st_host_name\');\n"
+"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"
+"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"
+"if (isnull (DAV_HIDE_ERROR (rc)))\n"
+"goto _end;\n"
"}\n"
+"_end:;\n"
+"return rc;\n"
"}\n"
-"if (parts2 is null)\n"
-"strg2 := \'\';\n"
-"else if (isstring (parts2))\n"
-"strg2 := parts2;\n"
-"else\n"
-"{\n"
-"len := length (parts2);\n"
-"if (len = 0)\n"
-"strg2 := \'\';\n"
-"else\n"
+"--src dav_api.sql:311\n";
+
+static const char *proc85 =
+"#line 353 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_ADD_GROUP_INT (in gid varchar)\n"
"{\n"
-"strg2 := parts2 [0];\n"
-"ctr := 1;\n"
-"while (ctr < len)\n"
+"declare gd integer;\n"
+"gd := coalesce ((select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid), 0);\n"
+"if (not gd)\n"
"{\n"
-"strg2 := strg2 || \'/\' || parts2 [ctr];\n"
-"ctr := ctr + 1;\n"
-"}\n"
-"}\n"
+"gd := USER_ROLE_CREATE (gid, 1);\n"
"}\n"
-"if (strg1 = \'\')\n"
-"return strg2;\n"
-"if (strg2 = \'\')\n"
-"return strg1;\n"
-"if (strg1 [length(strg1) - 1] = 47)\n"
-"if (strg2 [0] = 47)\n"
-"return strg1 || subseq (strg2, 1);\n"
-"else\n"
-"return strg1 || strg2;\n"
-"else\n"
-"if (strg2 [0] = 47)\n"
-"return strg1 || strg2;\n"
-"else\n"
-"return strg1 || \'/\' || strg2;\n"
+"return gd;\n"
"}\n"
-"--src dav_api.sql:946\n";
+"--src dav_api.sql:351\n";
-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"
+static const char *proc86 =
+"#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"
"{\n"
-"if (isstring (path))\n"
-"path := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"else\n"
-"path := path;\n"
-"if (length (path) < 2)\n"
-"goto bad_path_arg;\n"
-"if (aref (path, 0) <> \'\')\n"
-"goto bad_path_arg;\n"
-"if (path [length (path) - 1] = \'\')\n"
-"what := \'C\';\n"
-"else\n"
-"what := \'R\';\n"
-"return DAV_SEARCH_ID_OR_DET (path, what, det_ret, detcol_id, detcol_path_parts, unreached_path_parts);\n"
-"\n"
-"bad_path_arg:\n"
-"detcol_id := null;\n"
-"detcol_path_parts := null;\n"
-"unreached_path_parts := null;\n"
-"return -1;\n"
+"if (DAV_CHECK_AUTH (auth_uname, auth_pwd, 1) < 0)\n"
+"return -12;\n"
+"return DAV_ADD_GROUP_INT (gid);\n"
"}\n"
-"--src dav_api.sql:1008\n";
+"--src dav_api.sql:365\n";
-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"
+static const char *proc87 =
+"#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"
"{\n"
-"declare id integer;\n"
-"declare par, left_par, right_par any;\n"
-"declare cname, det varchar;\n"
-"declare inx, depth, cur_id, parent_id integer;\n"
-"id := -1;\n"
-"what := upper (what);\n"
+"declare known_g_id integer;\n"
+"if (DAV_CHECK_AUTH (auth_uname, auth_pwd, 1) < 0)\n"
+"return -12;\n"
+"known_g_id := coalesce ((select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid), NULL);\n"
+"if (known_g_id < 100)\n"
+"return -31;\n"
+"delete from WS.WS.SYS_DAV_GROUP where G_NAME = gid;\n"
+"return 0;\n"
+"}\n"
+"--src dav_api.sql:375\n";
+
+static const char *proc88 =
+"#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"
+"{\n"
+"declare auth_uid integer;\n"
+"auth_uid := DAV_CHECK_AUTH (auth_uname, auth_pwd, 0);\n"
+"if (auth_uid < 0)\n"
+"return -12;\n"
"\n"
-"if (isstring (path))\n"
-"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"else\n"
-"par := path;\n"
-"if (length (par) < 2)\n"
-"goto bad_path_arg;\n"
-"if (aref (par, 0) <> \'\')\n"
-"goto bad_path_arg;\n"
-"if (what = \'P\')\n"
+"return DAV_DIR_LIST_INT (path, recursive, \'%\', auth_uname, auth_pwd, auth_uid);\n"
+"}\n"
+"--src dav_api.sql:391\n";
+
+static const char *proc89 =
+"#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"
"{\n"
-"if (par [length (par) - 1] = \'\')\n"
+"declare auth_uid integer;\n"
+"declare compilation any;\n"
+"\n"
+"auth_uid := DAV_CHECK_AUTH (auth_uname, auth_pwd, 0);\n"
+"if (auth_uid < 0)\n"
+"return -12;\n"
+"compilation := vector (\'\', filter, \'DAV\', DAV_FC_PRINT_WHERE (filter, auth_uid));\n"
+"\n"
+"return DAV_DIR_FILTER_INT (path, recursive, compilation, auth_uname, auth_pwd, auth_uid);\n"
+"}\n"
+"--src dav_api.sql:404\n";
+
+static const char *proc90 =
+"#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"
"{\n"
-"if (2 = length (par))\n"
-"goto bad_path_arg;\n"
-"if (3 = length (par))\n"
+"st := upper (st);\n"
+"if (isinteger (id))\n"
"{\n"
-"detcol_id := null;\n"
-"detcol_path_parts := null;\n"
-"unreached_path_parts := null;\n"
-"return 0;\n"
+"if (\'R\' = st)\n"
+"return coalesce ((select RES_COL from WS.WS.SYS_DAV_RES where RES_ID = id), -1);\n"
+"if (\'C\' = st)\n"
+"return coalesce ((select COL_PARENT from WS.WS.SYS_DAV_COL where COL_ID = id), -1);\n"
+"return -14;\n"
"}\n"
-"par := vector_concat (subseq (par, 0, length (par) - 2), vector (\'\'));\n"
+"return call (cast (id[0] as varchar) || \'_DAV_GET_PARENT\') (id, st, path);\n"
"}\n"
-"else\n"
+"--src dav_api.sql:420\n";
+
+static const char *proc91 =
+"#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"
"{\n"
-"if (2 = length (par))\n"
+"declare rc integer;\n"
+"\n"
+"rc := DAV_AUTHENTICATE (did, st, \'1__\', auth_uname, auth_pwd, auth_uid);\n"
+"if (rc < 0)\n"
"{\n"
-"detcol_id := null;\n"
-"detcol_path_parts := null;\n"
-"unreached_path_parts := null;\n"
-"return 0;\n"
-"}\n"
-"par := vector_concat (subseq (par, 0, length (par) - 1), vector (\'\'));\n"
+"declare auth_parent any;\n"
+"auth_parent := DAV_GET_PARENT (did, st, path);\n"
+"rc := DAV_AUTHENTICATE (auth_parent, \'C\', \'1__\', auth_uname, auth_pwd, auth_uid);\n"
+"if (rc < 0)\n"
+"{\n"
+"\n"
+"return rc;\n"
"}\n"
-"path := null;\n"
-"what := \'C\';\n"
"}\n"
-"if (what = \'R\')\n"
+"if (auth_uid is null)\n"
+"auth_uid := rc;\n"
+"if (isarray (did))\n"
"{\n"
-"if (aref (par, length (par) - 1) = \'\')\n"
-"goto bad_path_arg;\n"
-"if (not isstring (path))\n"
-"path := DAV_CONCAT_PATH (par, null);\n"
-"id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1);\n"
-"if (id > 0)\n"
-"goto found_plain_id;\n"
+"if (\'R\' = st)\n"
+"return call (cast (did[0] as varchar) || \'_DAV_DIR_SINGLE\') (did, st, path, auth_uid);\n"
+"else\n"
+"return call (cast (did[0] as varchar) || \'_DAV_DIR_LIST\') (did, vector (\'\'), path, \'%\', -1, auth_uid);\n"
"}\n"
-"else if (what = \'C\')\n"
+"if (\'R\' = st)\n"
"{\n"
-"if (aref (par, length (par) - 1) <> \'\')\n"
-"goto bad_path_arg;\n"
-"goto descending_col_search;\n"
+"return coalesce ((select vector (RES_FULL_PATH, \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
+"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME )\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where\n"
+"RES_ID = did ));\n"
"}\n"
"else\n"
-"return -14;\n"
-"\n"
-"descending_col_search:\n"
-"inx := 1;\n"
-"cur_id := 0;\n"
-"parent_id := 0;\n"
-"depth := length (par) - 1;\n"
-"\n"
-"whenever not found goto not_found;\n"
-"while (inx < depth)\n"
-"{\n"
-"cname := aref (par, inx);\n"
-"\n"
-"select COL_ID, COL_DET into cur_id, det from WS.WS.SYS_DAV_COL where COL_NAME = cname and COL_PARENT = parent_id;\n"
-"if (det is not NULL)\n"
-"{\n"
-"det_ret := det;\n"
-"detcol_id := cur_id;\n"
-"detcol_path_parts := subseq (par, 0, inx + 1);\n"
-"par := subseq (par, inx + 1);\n"
-"unreached_path_parts := par;\n"
-"if ((what = \'C\') and (inx = depth - 1))\n"
-"return cur_id;\n"
-"return call (cast (det as varchar) || \'_DAV_SEARCH_ID\') (cur_id, par, what);\n"
-"}\n"
-"parent_id := cur_id;\n"
-"inx := inx + 1;\n"
-"}\n"
-"if (what = \'R\')\n"
"{\n"
-"return -1;\n"
+"return coalesce ((select vector (WS.WS.COL_PATH (COL_ID), \'C\', 0, COL_MOD_TIME,\n"
+"COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', COL_NAME)\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where COL_ID = did ));\n"
"}\n"
-"id := cur_id;\n"
-"goto found_plain_id;\n"
-"\n"
-"found_plain_id:\n"
-"det_ret := NULL;\n"
-"detcol_id := NULL;\n"
-"detcol_path_parts := null;\n"
-"unreached_path_parts := null;\n"
-"return id;\n"
-"\n"
-"not_found:\n"
-"\n"
-"det_ret := NULL;\n"
-"detcol_id := null;\n"
-"detcol_path_parts := null;\n"
-"unreached_path_parts := null;\n"
-"return -1;\n"
-"\n"
-"bad_path_arg:\n"
-"\n"
-"det_ret := NULL;\n"
-"detcol_id := null;\n"
-"detcol_path_parts := null;\n"
-"unreached_path_parts := null;\n"
-"return -1;\n"
"}\n"
-"--src dav_api.sql:1033\n";
+"--src dav_api.sql:437\n";
-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"
+static const char *proc92 =
+"#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"
"{\n"
-"\n"
-"if (uid is null)\n"
-"_uid := http_nobody_uid();\n"
-"else if (isinteger (uid))\n"
-"_uid := uid;\n"
-"else\n"
-"_uid := coalesce (\n"
-"(select U_ID from WS.WS.SYS_DAV_USER where U_NAME = uid),\n"
-"case (uid) when \'anonymous\' then http_nobody_uid () else -12 end);\n"
-"\n"
-"if (gid is null)\n"
-"_gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = _uid), http_nogroup_gid ());\n"
-"else if (isinteger (gid))\n"
-"_gid := gid;\n"
-"else\n"
-"_gid := coalesce (\n"
-"(select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid),\n"
-"(select U_GROUP from WS.WS.SYS_DAV_USER where U_NAME = gid),\n"
-"-12 );\n"
-"\n"
+"declare rc, t, id, l integer;\n"
+"declare path_string, st, det varchar;\n"
+"declare did, detcol_id, detcol_path, det_subpath, res any;\n"
"\n"
"\n"
-"}\n"
-"--src dav_api.sql:1158\n";
-
-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"
-"declare pid, npid, res integer;\n"
-"declare scope varchar;\n"
-"type := upper (type);\n"
-"if (type <> \'C\' and type <> \'R\')\n"
-"return -14;\n"
-"if (exists (select 1 from WS.WS.SYS_DAV_LOCK where datediff (\'second\', LOCK_TIME, now()) > LOCK_TIMEOUT))\n"
+"path_string := path;\n"
+"did := DAV_SEARCH_SOME_ID_OR_DET (path, st, det, detcol_id, detcol_path, det_subpath);\n"
+"if (DAV_HIDE_ERROR (did) is null)\n"
+"return did;\n"
+"rc := DAV_AUTHENTICATE (did, st, \'1__\', auth_uname, auth_pwd, auth_uid);\n"
+"if (rc < 0)\n"
"{\n"
-"delete from WS.WS.SYS_DAV_LOCK where datediff (\'second\', LOCK_TIME, now()) > LOCK_TIMEOUT;\n"
-"\n"
-"}\n"
-"if (isarray (id))\n"
+"if (rec_depth = -1)\n"
"{\n"
-"return call (cast (id[0] as varchar) || \'_DAV_IS_LOCKED\') (id, type, owned_tokens);\n"
+"declare auth_parent any;\n"
+"auth_parent := DAV_GET_PARENT (did, st, path);\n"
+"rc := DAV_AUTHENTICATE (auth_parent, \'C\', \'1__\', auth_uname, auth_pwd, auth_uid);\n"
"}\n"
-"if (id <= 0)\n"
-"return -1;\n"
-"\n"
-"if (not exists (select 1 from WS.WS.SYS_DAV_LOCK))\n"
+"if (rc < 0)\n"
"{\n"
"\n"
-"return 0;\n"
+"return rc;\n"
"}\n"
-"\n"
-"whenever not found goto nf_target_lock;\n"
-"select case (LOCK_SCOPE) when \'X\' then 2 else 1 end into res from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = type and LOCK_PARENT_ID = id and strstr (owned_tokens, LOCK_TOKEN) is null;\n"
-"return res;\n"
-"\n"
-"nf_target_lock:\n"
-"\n"
-"\n"
-"if (not exists (select 1 from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and strstr (owned_tokens, LOCK_TOKEN) is null))\n"
-"{\n"
-"\n"
-"return 0;\n"
-"}\n"
-"\n"
-"if (type = \'R\')\n"
-"pid := coalesce ((select RES_COL from WS.WS.SYS_DAV_RES where RES_ID = id), -1);\n"
-"else if (type = \'C\')\n"
-"pid := coalesce ((select COL_PARENT from WS.WS.SYS_DAV_COL where COL_ID = id), -1);\n"
-"\n"
-"if (pid < 0)\n"
-"return -1;\n"
-"\n"
-"next_parent:\n"
-"\n"
-"whenever not found goto nf_parent_lock;\n"
-"select case (LOCK_SCOPE) when \'X\' then 2 else 1 end into res from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = pid and strstr (owned_tokens, LOCK_TOKEN) is null;\n"
-"id := pid;\n"
-"type := \'C\';\n"
-"return res;\n"
-"\n"
-"nf_parent_lock:\n"
-"whenever not found goto nf_parent;\n"
-"select COL_PARENT into npid from WS.WS.SYS_DAV_COL where COL_ID = pid;\n"
-"pid := npid;\n"
-"goto next_parent;\n"
-"nf_parent:\n"
-"\n"
-"return 0;\n"
"}\n"
-"--src dav_api.sql:1187\n";
-
-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"
+"if (auth_uid is null)\n"
+"auth_uid := rc;\n"
+"if (isarray (did))\n"
"{\n"
-"declare res integer;\n"
-"if (isstring (owned_tokens))\n"
-"res := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if ((\'R\' = st) or (rec_depth = -1))\n"
+"res := vector (call (cast (did[0] as varchar) || \'_DAV_DIR_SINGLE\') (did, st, path, auth_uid));\n"
"else\n"
-"res := DAV_IS_LOCKED_INT (id, type);\n"
-"if (res > 0)\n"
-"return -8;\n"
+"res := call (cast (det as varchar) || \'_DAV_DIR_LIST\') (detcol_id, det_subpath, detcol_path, name_mask, rec_depth, auth_uid);\n"
"return res;\n"
"}\n"
-"--src dav_api.sql:1254\n";
-
-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"
+"vectorbld_init (res);\n"
+"if (\'R\' = st)\n"
"{\n"
-"return DAV_LIST_LOCKS_INT (id, type);\n"
+"for select vector (RES_FULL_PATH, \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
+"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME ) as i\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where\n"
+"RES_NAME like name_mask and RES_FULL_PATH = DAV_CONCAT_PATH (path, null) do\n"
+"{\n"
+"vectorbld_acc (res, i);\n"
"}\n"
-"--src dav_api.sql:1268\n";
-
-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"
+"else if (rec_depth = -1)\n"
"{\n"
-"declare res any;\n"
-"type := upper (type);\n"
+"for select vector (WS.WS.COL_PATH (COL_ID), \'C\', 0, COL_MOD_TIME,\n"
+"COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', COL_NAME) as i\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where\n"
+"COL_ID = did do\n"
+"{\n"
+"vectorbld_acc (res, i);\n"
+"}\n"
+"}\n"
+"else if (rec_depth > 0)\n"
+"{\n"
+"for select SUBCOL_FULL_PATH, SUBCOL_ID, SUBCOL_NAME, SUBCOL_PARENT, SUBCOL_DET\n"
+"from DB.DBA.DAV_PLAIN_SUBCOLS\n"
+"where (root_id = did) and (root_path = path_string) and recursive = rec_depth and subcol_auth_uid = auth_uid and subcol_auth_pwd = auth_pwd\n"
"\n"
-"if (type <> \'C\' and type <> \'R\')\n"
-"return -14;\n"
-"if (isarray (id))\n"
+"do for select COL_MOD_TIME,\n"
+"COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME from WS.WS.SYS_DAV_COL\n"
+"where\n"
+"COL_PARENT = SUBCOL_PARENT and COL_NAME = SUBCOL_NAME\n"
+"do\n"
"{\n"
-"return call (cast (id[0] as varchar) || \'_DAV_LIST_LOCKS\') (id, type, 0);\n"
+"vectorbld_acc (res, vector (SUBCOL_FULL_PATH, \'C\', 0, COL_MOD_TIME,\n"
+"SUBCOL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', SUBCOL_NAME) );\n"
+"if (SUBCOL_DET is not NULL)\n"
+"vectorbld_concat_acc (res, call (SUBCOL_DET || \'_DAV_DIR_LIST\') (SUBCOL_ID, vector (\'\'), SUBCOL_FULL_PATH, name_mask, rec_depth, auth_uid));\n"
+"for select vector (\n"
+"\n"
+"RES_FULL_PATH, \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
+"\n"
+"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME) as i\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where\n"
+"RES_NAME like name_mask and RES_COL = SUBCOL_ID\n"
+"do\n"
+"{\n"
+"vectorbld_acc (res, i);\n"
"}\n"
-"if (id <= 0)\n"
-"return -1;\n"
-"res := vector ();\n"
-"for select LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO\n"
-"from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type do {\n"
-"res := vector_concat (res, vector (vector (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)));\n"
"}\n"
-"return res;\n"
"}\n"
-"--src dav_api.sql:1274\n";
-
-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"
+"else if (det is null)\n"
"{\n"
-"declare id any;\n"
-"declare st char (1);\n"
"\n"
-"id := null;\n"
-"st := null;\n"
-"return DAV_LOCK_INT (path, id, st, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, auth_pwd, NULL);\n"
+"for select vector (RES_FULL_PATH, \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
+"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME) as i\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where\n"
+"\n"
+"RES_NAME like name_mask and RES_COL = did do\n"
+"{\n"
+"vectorbld_acc (res, i);\n"
+"}\n"
+"for select vector (WS.WS.COL_PATH (COL_ID), \'C\', 0, COL_MOD_TIME,\n"
+"COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', COL_NAME) as i\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where\n"
+"\n"
+"COL_PARENT = did do\n"
+"{\n"
+"vectorbld_acc (res, i);\n"
+"}\n"
+"}\n"
+"else\n"
+"{\n"
+"vectorbld_concat_acc (res, call (cast (det as varchar) || \'_DAV_DIR_LIST\') (did, vector (\'\'), path, name_mask, rec_depth, auth_uid));\n"
"}\n"
-"--src dav_api.sql:1296\n";
+"vectorbld_final (res);\n"
+"return res;\n"
+"}\n"
+"--src dav_api.sql:482\n";
-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"
+static const char *proc93 =
+"#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"
"{\n"
-"declare p_id any;\n"
-"declare rc, id_is_bad integer;\n"
-"declare u_token, old_scope, p_st varchar;\n"
+"declare rc, t, id, uid, gid, l integer;\n"
+"declare path_string, st, det, qry_text varchar;\n"
+"declare did, detcol_id, detcol_path, det_subpath, res any;\n"
"\n"
-"p_id := DAV_SEARCH_ID (path, \'P\');\n"
-"if (DAV_HIDE_ERROR (p_id) is null)\n"
-"return case p_id when -1 then -34 else p_id end;\n"
-"if (id is null)\n"
-"id := DAV_SEARCH_SOME_ID (path, st);\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
+"declare execstate, execmessage, execmeta, execrows any;\n"
+"declare davcond varchar;\n"
+"davcond := get_keyword (\'DAV\', compilation);\n"
+"if (davcond is null)\n"
"{\n"
-"if (id <> -1)\n"
-"return -1;\n"
-"if (\"RIGHT\" (path, 1) = \'/\')\n"
-"return -1;\n"
-"st := \'R\';\n"
-"id_is_bad := 1;\n"
+"davcond := DAV_FC_PRINT_WHERE (get_keyword (\'\', compilation), auth_uid);\n"
+"compilation := vector_concat (compilation, vector (\'DAV\', davcond));\n"
"}\n"
-"else\n"
-"id_is_bad := 0;\n"
-"if (id_is_bad)\n"
-"rc := DAV_AUTHENTICATE (p_id, \'C\', \'11_\', auth_uname, auth_pwd, auth_uid);\n"
-"else\n"
-"rc := DAV_AUTHENTICATE (id, st, \'11_\', auth_uname, auth_pwd, auth_uid);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
+"execstate := \'00000\';\n"
+"vectorbld_init (res);\n"
+"path_string := path;\n"
+"did := DAV_SEARCH_SOME_ID_OR_DET (path, st, det, detcol_id, detcol_path, det_subpath);\n"
+"if (isarray (did))\n"
+"{\n"
"if (auth_uid is null)\n"
-"auth_uid := rc;\n"
-"if (owned_tokens is null)\n"
-"owned_tokens := \'\';\n"
-"if (token is null)\n"
-"token := \'\';\n"
-"if (owner_name is null)\n"
-"owner_name := \'\';\n"
-"if (depth is null)\n"
+"uid := call (cast (did[0] as varchar) || \'_DAV_AUTHENTICATE\') (did, st, \'1__\', auth_uname, auth_pwd, uid);\n"
+"else\n"
+"uid := auth_uid;\n"
+"if (uid < 0)\n"
"{\n"
-"if (st = \'R\')\n"
-"depth := \'0\';\n"
+"\n"
+"return res;\n"
+"}\n"
+"if (\'R\' = st)\n"
+"res := vector (call (cast (did[0] as varchar) || \'_DAV_DIR_SINGLE\') (did, st, path, uid));\n"
"else\n"
-"depth := \'infinity\';\n"
+"res := call (cast (det as varchar) || \'_DAV_DIR_FILTER\') (detcol_id, det_subpath, detcol_path, compilation, rec_depth, uid);\n"
+"return res;\n"
"}\n"
-"if (timeout_sec is null or timeout_sec = 0)\n"
-"timeout_sec := 604800;\n"
-"set isolation = \'serializable\';\n"
-"p_st := \'C\';\n"
-"rc := DAV_IS_LOCKED_INT (p_id, p_st, owned_tokens);\n"
-"if (0 <> rc)\n"
+"if (did < 0)\n"
"{\n"
-"if (rc < 0)\n"
-"return rc;\n"
-"return -8;\n"
+"return did;\n"
"}\n"
-"if (st = \'C\')\n"
+"if (\'R\' = st or det is null)\n"
"{\n"
-"for select LOCK_TOKEN as _ctoken from WS.WS.SYS_DAV_LOCK\n"
-"where\n"
-"LOCK_PARENT_TYPE = \'C\' and\n"
-"isnull (strstr (owned_tokens, LOCK_TOKEN)) and\n"
-"((id = LOCK_PARENT_ID) or DAV_COL_IS_ANCESTOR_OF (id, LOCK_PARENT_ID))\n"
-"do\n"
+"if (auth_uid is null)\n"
+"uid := DAV_AUTHENTICATE (did, st, \'1__\', auth_uname, auth_pwd, uid);\n"
+"else\n"
+"uid := auth_uid;\n"
+"if (uid < 0)\n"
"{\n"
-"return -8;\n"
+"\n"
+"return res;\n"
"}\n"
+"gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = uid), 0);\n"
"}\n"
"\n"
-"u_token := \'\';\n"
-"if (owned_tokens <> \'\')\n"
+"if (\'R\' = st)\n"
"{\n"
-"declare tleft, tright integer;\n"
-"declare tmp varchar;\n"
-"if (isnull(strstr(owned_tokens, \'(<opaquelocktoken:\')))\n"
-"goto failed_parsing;\n"
-"tleft := strchr (owned_tokens, \':\');\n"
-"\n"
-"if (tleft is null)\n"
-"goto failed_parsing;\n"
-"tright := strchr (substring (owned_tokens, tleft + 1, length (owned_tokens)), \'>\');\n"
-"if (tright is null)\n"
-"goto failed_parsing;\n"
-"tright := tleft + tright;\n"
-"tmp := substring (owned_tokens, tleft + 2, tright - tleft - 1);\n"
-"u_token := trim(tmp);\n"
-"}\n"
-"failed_parsing:\n"
-"if (u_token = \'\')\n"
-"u_token := token;\n"
+"qry_text := \'\n"
+"select _top.RES_FULL_PATH, \'\'R\'\', length (_top.RES_CONTENT), _top.RES_MOD_TIME,\n"
+"_top.RES_ID, _top.RES_PERMS, _top.RES_GROUP, _top.RES_OWNER, _top.RES_CR_TIME, _top.RES_TYPE, _top.RES_NAME\n"
+"from WS.WS.SYS_DAV_RES as _top \' || davcond || \' and\n"
+"(_top.RES_FULL_PATH = DAV_CONCAT_PATH (?, null)) and\n"
+"case (\n"
+"DAV_CHECK_PERM (_top.RES_PERMS, \'\'1__\'\', ?, ?, _top.RES_GROUP, _top.RES_OWNER) )\n"
+"when 0 then WS.WS.ACL_IS_GRANTED (_top.RES_ACL, ?, DAV_REQ_CHARS_TO_BITMASK (\'\'1__\'\'))\n"
+"else 1 end\';\n"
"\n"
+"exec (qry_text, execstate, execmessage,\n"
+"vector (path, uid, gid, uid),\n"
+"100000000, execmeta, execrows );\n"
"\n"
-"if (isarray (id))\n"
-"{\n"
-"token := u_token;\n"
-"rc := call (cast (id[0] as varchar) || \'_DAV_LOCK\') (path, id, st, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid);\n"
-"return rc;\n"
+"if (\'00000\' <> execstate)\n"
+"signal (execstate, execmessage || \' in \' || qry_text);\n"
+"vectorbld_concat_acc (res, execrows);\n"
"}\n"
-"if (id_is_bad)\n"
+"else if (rec_depth = -1)\n"
"{\n"
-"declare parent_det, new_res_name varchar;\n"
-"parent_det := DAV_PROP_GET_INT (p_id, \'C\', \':virtdet\', 0);\n"
-"if (parent_det is not null)\n"
+"for select vector (WS.WS.COL_PATH (COL_ID), \'C\', 0, COL_MOD_TIME,\n"
+"COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, \'dav/unix-directory\', COL_NAME) as i\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where\n"
+"\n"
+"COL_ID = did do\n"
"{\n"
-"token := u_token;\n"
-"rc := call (parent_det || \'_DAV_LOCK\') (path, id, st, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid);\n"
-"return rc;\n"
+"vectorbld_acc (res, i);\n"
"}\n"
-"new_res_name := subseq (path, strrchr (path, \'/\') + 1);\n"
-"if (exists (select top 1 1 from WS.WS.SYS_DAV_COL where COL_PARENT = p_id and COL_NAME = new_res_name))\n"
-"return -26;\n"
-"id := WS.WS.GETID (\'R\');\n"
-"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_CR_TIME, RES_MOD_TIME, RES_OWNER, RES_PERMS, RES_GROUP)\n"
-"values (id, new_res_name, p_id, now (), now (), auth_uid, \'110000000NN\', http_nogroup_gid() );\n"
-"old_scope := \'\';\n"
"}\n"
-"else\n"
-"old_scope := coalesce ((select LOCK_SCOPE from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = st and LOCK_PARENT_ID = id), \'\');\n"
+"else if (rec_depth > 0)\n"
+"{\n"
+"qry_text := \'\n"
+"select _top.RES_FULL_PATH, \'\'R\'\', length (_top.RES_CONTENT), _top.RES_MOD_TIME,\n"
+"_top.RES_ID, _top.RES_PERMS, _top.RES_GROUP, _top.RES_OWNER, _top.RES_CR_TIME, _top.RES_TYPE, _top.RES_NAME\n"
+"from WS.WS.SYS_DAV_RES as _top \' || davcond || \' and (_top.RES_FULL_PATH between ? and ?) and\n"
+"case (\n"
+"DAV_CHECK_PERM (_top.RES_PERMS, \'\'1__\'\', ?, ?, _top.RES_GROUP, _top.RES_OWNER) )\n"
+"when 0 then WS.WS.ACL_IS_GRANTED (_top.RES_ACL, ?, DAV_REQ_CHARS_TO_BITMASK (\'\'1__\'\'))\n"
+"else 1 end\';\n"
"\n"
-"if ((old_scope = \'S\' or old_scope = \'X\') and u_token <> \'\')\n"
+"exec (qry_text,\n"
+"execstate, execmessage,\n"
+"vector (path_string, DAV_COL_PATH_BOUNDARY (path_string), uid, gid, uid), 100000000, execmeta, execrows );\n"
+"\n"
+"if (\'00000\' <> execstate)\n"
+"signal (execstate, execmessage || \' in \' || qry_text);\n"
+"vectorbld_concat_acc (res, execrows);\n"
+"\n"
+"for select SUBCOL_FULL_PATH, SUBCOL_ID, SUBCOL_DET\n"
+"from DB.DBA.DAV_PLAIN_SUBCOLS\n"
+"where SUBCOL_DET is not null and (not (SUBCOL_DET like \'%Filter\')) and recursive = rec_depth and (root_id = did) and (root_path = path_string) and subcol_auth_uid = null and subcol_auth_pwd = null\n"
+"do\n"
+"{\n"
+"vectorbld_concat_acc (res, call (SUBCOL_DET || \'_DAV_DIR_FILTER\') (SUBCOL_ID, vector (\'\'), SUBCOL_FULL_PATH, compilation, rec_depth, auth_uid));\n"
+"}\n"
+"}\n"
+"else if (det is null)\n"
"{\n"
+"qry_text := \'\n"
+"select _top.RES_FULL_PATH, \'\'R\'\', length (_top.RES_CONTENT), _top.RES_MOD_TIME,\n"
+"_top.RES_ID, _top.RES_PERMS, _top.RES_GROUP, _top.RES_OWNER, _top.RES_CR_TIME, _top.RES_TYPE, _top.RES_NAME\n"
+"from WS.WS.SYS_DAV_RES as _top \' || davcond || \' and (RES_COL = ?) and\n"
+"case (\n"
+"DAV_CHECK_PERM (_top.RES_PERMS, \'\'1__\'\', ?, ?, _top.RES_GROUP, _top.RES_OWNER) )\n"
+"when 0 then WS.WS.ACL_IS_GRANTED (_top.RES_ACL, ?, DAV_REQ_CHARS_TO_BITMASK (\'\'1__\'\'))\n"
+"else 1 end\';\n"
"\n"
-"declare c cursor for select LOCK_OWNER_INFO from WS.WS.SYS_DAV_LOCK where LOCK_TOKEN = u_token and LOCK_PARENT_TYPE = st and LOCK_PARENT_ID = id for update;\n"
-"declare old_owner_name varchar;\n"
-"whenever not found goto nothing_to_refresh;\n"
-"open c;\n"
-"fetch c into old_owner_name;\n"
-"if (owner_name = \'\')\n"
-"owner_name := old_owner_name;\n"
-"scope := old_scope;\n"
-"update WS.WS.SYS_DAV_LOCK set LOCK_TIME = now (), LOCK_TIMEOUT = timeout_sec, LOCK_OWNER_INFO = owner_name where current of c;\n"
-"close c;\n"
-"return u_token;\n"
-"nothing_to_refresh:\n"
-"close c;\n"
-"return -35;\n"
+"exec (qry_text, execstate, execmessage,\n"
+"vector (did, uid, gid, uid),\n"
+"100000000, execmeta, execrows );\n"
+"\n"
+"if (\'00000\' <> execstate)\n"
+"signal (execstate, execmessage || \' in \' || qry_text);\n"
+"vectorbld_concat_acc (res, execrows);\n"
"}\n"
-"if ((old_scope = \'\') or (old_scope = \'S\' and scope = \'S\'))\n"
+"else\n"
"{\n"
-"if (token = \'\')\n"
-"token := WS.WS.OPLOCKTOKEN();\n"
+"if (auth_uid is null)\n"
+"uid := call (cast (did[0] as varchar) || \'_DAV_AUTHENTICATE\') (did, st, \'1__\', auth_uname, auth_pwd, uid);\n"
"else\n"
+"uid := auth_uid;\n"
+"if (uid < 0)\n"
"{\n"
-"if (exists (select top 1 1 from WS.WS.SYS_DAV_LOCK where LOCK_TOKEN = token and (LOCK_PARENT_TYPE <> st or LOCK_PARENT_ID <> id)))\n"
-"return -35;\n"
-"}\n"
"\n"
-"insert into WS.WS.SYS_DAV_LOCK (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_PARENT_TYPE,\n"
-"LOCK_PARENT_ID, LOCK_TIME, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)\n"
-"values (locktype, scope, token, st, id, now(), timeout_sec, auth_uid, owner_name);\n"
-"return token;\n"
+"return res;\n"
"}\n"
-"if (old_scope = \'X\' or (old_scope = \'S\' and scope = \'X\'))\n"
-"return -8;\n"
-"return -35;\n"
+"vectorbld_concat_acc (res, call (cast (det as varchar) || \'_DAV_DIR_FILTER\') (did, vector (\'\'), path, compilation, rec_depth, uid));\n"
"}\n"
-"--src dav_api.sql:1307\n";
-
-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"
-"declare id any;\n"
-"declare st char (1);\n"
-"id := DAV_SEARCH_SOME_ID (path, st);\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
-"return -1;\n"
-"return DAV_UNLOCK_INT (id, st, token, auth_uname, auth_pwd, null);\n"
+"vectorbld_final (res);\n"
+"return res;\n"
"}\n"
-"--src dav_api.sql:1463\n";
+"--src dav_api.sql:604\n";
-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"
+static const char *proc94 =
+"#line 758 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_SEARCH_PATH (in id any, in what char (1)) returns any\n"
"{\n"
-"declare rc, _left, _right integer;\n"
-"declare cur_token varchar;\n"
-"declare l_cur cursor for select LOCK_TOKEN from WS.WS.SYS_DAV_LOCK\n"
-"where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = st and LOCK_TOKEN = token;\n"
-"\n"
-"auth_uid := DAV_AUTHENTICATE (id, st, \'11_\', auth_uname, auth_pwd, auth_uid);\n"
-"if (auth_uid < 0)\n"
-"return auth_uid;\n"
-"\n"
-"\n"
-"_left := strstr(token,\'opaquelocktoken:\');\n"
-"if (_left is not null)\n"
+"declare res varchar;\n"
+"what := upper (what);\n"
+"if (isarray(id) and not isstring(id))\n"
+"return call (cast (id[0] as varchar) || \'_DAV_SEARCH_PATH\') (id, what);\n"
+"if (id <= 0)\n"
"{\n"
-"_left := _left + 15;\n"
-"_right := strrchr(token,\'>\');\n"
-"if (_left < _right)\n"
-"token := trim (substring (token, _left + 2, _right - _left - 1));\n"
+"if (id = 0)\n"
+"return \'/\';\n"
+"return -22;\n"
"}\n"
-"if (isarray (id))\n"
+"whenever not found goto en;\n"
+"if (what = \'C\')\n"
"{\n"
-"rc := call (cast (id[0] as varchar) || \'_DAV_UNLOCK\')(id, st, token, auth_uid);\n"
-"return rc;\n"
-"}\n"
-"whenever not found goto not_locked_t;\n"
-"open l_cur (exclusive, prefetch 1);\n"
-"fetch l_cur into cur_token;\n"
-"delete from WS.WS.SYS_DAV_LOCK where current of l_cur;\n"
-"close l_cur;\n"
-"return token;\n"
-"\n"
-"not_locked_t:\n"
-"close l_cur;\n"
-"return -27;\n"
+"res := WS.WS.COL_PATH (id);\n"
+"if (res = \'/\')\n"
+"return -23;\n"
+"return res;\n"
"}\n"
-"--src dav_api.sql:1475\n";
-
-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"
+"else if (what = \'R\')\n"
"{\n"
-"return 4 * equ (req[0], 49) + 2 * equ (req[1], 49) + equ (req[2], 49);\n"
+"select RES_FULL_PATH into res from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
+"return res;\n"
+"}\n"
+"else\n"
+"return -14;\n"
+"en:\n"
+"return -23;\n"
"}\n"
-"--src dav_api.sql:1514\n";
+"--src dav_api.sql:756\n";
-static const char *proc108 =
-"#line 1525 \"[executable]/dav_api.sql\"\n"
+static const char *proc95 =
+"#line 793 \"[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"
+"DAV_SEARCH_ID (in path any, in what char (1)) returns any\n"
"{\n"
-"declare oid, ogid, puid, pgid integer;\n"
-"declare opwd, pperms varchar;\n"
-"declare pacl varbinary;\n"
+"declare id integer;\n"
+"declare par any;\n"
+"id := -1;\n"
"what := upper (what);\n"
"\n"
-"if (length (req) <> 3)\n"
-"return -15;\n"
-"\n"
-"if (a_uid is null)\n"
-"a_uid := DAV_CHECK_AUTH (a_uname, a_pwd, 0);\n"
-"\n"
-"if (a_uid < 0)\n"
+"if (isstring (path))\n"
"{\n"
-"if (DAV_AUTHENTICATE_SSL_CONDITION ())\n"
-"goto _check_ssl;\n"
"\n"
-"return a_uid;\n"
-"}\n"
+"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
"\n"
-"if (a_uid = 1)\n"
-"{\n"
-"oid := http_nobody_uid ();\n"
-"ogid := http_nogroup_gid ();\n"
"}\n"
"else\n"
"{\n"
-"if (a_uid = http_dav_uid())\n"
-"return a_uid;\n"
"\n"
-"oid := a_uid;\n"
-"if (a_uid = http_nobody_uid ())\n"
-"{\n"
-"ogid := http_nogroup_gid ();\n"
+"par := path;\n"
"}\n"
-"else\n"
+"if (length (par) = 0)\n"
"{\n"
-"select U_GROUP into ogid from WS.WS.SYS_DAV_USER where U_ID = a_uid;\n"
-"}\n"
+"\n"
+"return -1;\n"
"}\n"
-"if (isarray (id))\n"
+"if (aref (par, 0) <> \'\')\n"
"{\n"
-"declare detcol_id integer;\n"
"\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"
+"return -1;\n"
+"}\n"
+"if (what = \'P\')\n"
"{\n"
-"if (not WS.WS.ACL_IS_GRANTED (pacl, oid, 4))\n"
+"if (par [length (par) - 1] = \'\')\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"
-"{\n"
-"select RES_OWNER, RES_GROUP, RES_PERMS, RES_ACL into puid, pgid, pperms, pacl from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
-"set isolation=\'committed\';\n"
-"if (puid <> http_nobody_uid() and\n"
-"exists (select top 1 1 from SYS_USERS where U_ID = puid and U_ACCOUNT_DISABLED = 1))\n"
-"{\n"
-"return -42;\n"
-"}\n"
-"set isolation=\'serializable\';\n"
-"}\n"
-"else if (what = \'C\')\n"
-"{\n"
-"select COL_OWNER, COL_GROUP, COL_PERMS, COL_ACL into puid, pgid, pperms, pacl from WS.WS.SYS_DAV_COL where COL_ID = id;\n"
+"if (2 = length (par))\n"
+"return -1;\n"
+"if (3 = length (par))\n"
+"return 0;\n"
+"par := vector_concat (subseq (par, 0, length (par) - 2), vector (\'\'));\n"
"}\n"
"else\n"
"{\n"
-"return -14;\n"
+"if (2 = length (par))\n"
+"return 0;\n"
+"par := vector_concat (subseq (par, 0, length (par) - 1), vector (\'\'));\n"
"}\n"
-"if (DAV_CHECK_PERM (pperms, req, oid, ogid, pgid, puid))\n"
-"{\n"
-"\n"
-"return a_uid;\n"
+"path := null;\n"
+"what := \'C\';\n"
"}\n"
-"if (WS.WS.ACL_IS_GRANTED (pacl, oid, DAV_REQ_CHARS_TO_BITMASK (req)))\n"
-"{\n"
"\n"
-"return a_uid;\n"
-"}\n"
-"if (DAV_AUTHENTICATE_SSL_CONDITION ())\n"
+"if (what = \'R\')\n"
+"{\n"
+"if (aref (par, length (par) - 1) = \'\')\n"
"{\n"
-"_check_ssl:\n"
-"declare _perms, a_gid any;\n"
-"\n"
-"if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms))\n"
-"return a_uid;\n"
-"}\n"
-"\n"
-"\n"
-"return -13;\n"
-"\n"
-"nf_col_or_res:\n"
"\n"
"return -1;\n"
"}\n"
-"--src dav_api.sql:1523\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"
+"if (not isstring (path))\n"
+"path := DAV_CONCAT_PATH (par, null);\n"
+"id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1);\n"
+"if ((id <> -1) and (connection_get (\'dav_store\') is null))\n"
"{\n"
-"declare rc integer;\n"
-"declare puid, pgid integer;\n"
-"declare u_password, pperms, resName, resPath varchar;\n"
-"declare allow_anon integer;\n"
-"declare pacl varbinary;\n"
-"\n"
-"what := upper (what);\n"
-"\n"
+"declare det, detcol_id any;\n"
"\n"
-"if (length (req) <> 3)\n"
-"return -15;\n"
-"\n"
-"if (isarray (id))\n"
+"detcol_id := DAV_PROP_GET_INT (id, what, \'virt:DETCOL_ID\', 0);\n"
+"if (DAV_HIDE_ERROR (detcol_id) is not null)\n"
"{\n"
-"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 >= 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"
+"det := cast (coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = detcol_id), \'\') as varchar);\n"
+"if ((det <> \'\') and __proc_exists (\'DB.DBA.\' || det || \'_DAV_MAKE_ID\'))\n"
+"return call (cast (det as varchar) || \'_DAV_MAKE_ID\') (detcol_id, id, \'R\');\n"
"}\n"
-"if (id is null)\n"
-"{\n"
-"pperms := \'000000000?\';\n"
-"allow_anon := 0;\n"
"}\n"
-"else\n"
-"{\n"
-"declare anon_flags varchar;\n"
-"whenever not found goto nf_col_or_res;\n"
-"if (what = \'R\')\n"
-"{\n"
-"select RES_NAME, RES_FULL_PATH, RES_OWNER, RES_GROUP, RES_PERMS, RES_ACL into resName, resPath, puid, pgid, pperms, pacl from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
"}\n"
"else if (what = \'C\')\n"
"{\n"
-"select COL_OWNER, COL_GROUP, COL_PERMS, COL_ACL into puid, pgid, pperms, pacl from WS.WS.SYS_DAV_COL where COL_ID = id;\n"
+"if (aref (par, length (par) - 1) <> \'\')\n"
+"{\n"
+"\n"
+"return -1;\n"
+"}\n"
+"if (not isstring (path))\n"
+"path := DAV_CONCAT_PATH (par, null);\n"
+"\n"
+"id := -1;\n"
"}\n"
"else\n"
"{\n"
+"\n"
"return -14;\n"
"}\n"
-"anon_flags := substring (cast (pperms as varchar), 7, 3);\n"
-"allow_anon := WS.WS.PERM_COMP (anon_flags, req);\n"
-"}\n"
"\n"
-"if (a_uid is null)\n"
-"{\n"
-"if ((not allow_anon) or (\'\' <> WS.WS.FINDPARAM (a_lines, \'Authorization:\')))\n"
-"{\n"
-"rc := WS.WS.GET_DAV_AUTH (a_lines, allow_anon, can_write_http, a_uname, u_password, a_uid, a_gid, _perms);\n"
-"if (rc < 0)\n"
+"if (id = -1)\n"
"{\n"
-"if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms))\n"
-"return a_uid;\n"
-"\n"
-"return rc; \n"
-"}\n"
+"declare det_ret, detcol_id, detcol_path_parts, unreached_path_parts any;\n"
+"return DAV_SEARCH_ID_OR_DET (par, what, det_ret, detcol_id, detcol_path_parts, unreached_path_parts);\n"
"}\n"
+"return id;\n"
"}\n"
-"if (isinteger (a_uid))\n"
+"--src dav_api.sql:791\n";
+
+static const char *proc96 =
+"#line 893 \"[executable]/dav_api.sql\"\n"
+" create function\n"
+"DAV_SEARCH_SOME_ID (in path any, out what char (1)) returns any\n"
"{\n"
-"if (a_uid < 0)\n"
-"return a_uid;\n"
+"declare id integer;\n"
+"declare par any;\n"
+"id := -1;\n"
"\n"
-"if (a_uid = 1)\n"
+"if (isstring (path))\n"
+"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"else\n"
+"par := path;\n"
+"if (aref (par, 0) <> \'\')\n"
"{\n"
-"a_uid := http_nobody_uid ();\n"
-"a_gid := http_nogroup_gid ();\n"
+"\n"
+"return -1;\n"
"}\n"
-"else if (a_uid = http_dav_uid())\n"
+"if (aref (par, length (par) - 1) <> \'\')\n"
"{\n"
-"return a_uid;\n"
-"}\n"
+"what := \'R\';\n"
+"if (not isstring (path))\n"
+"path := DAV_CONCAT_PATH (par, null);\n"
+"id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1);\n"
"}\n"
"else\n"
"{\n"
-"a_uid := http_nobody_uid ();\n"
-"a_gid := http_nogroup_gid ();\n"
-"_perms := \'110110110--\';\n"
-"}\n"
-"set isolation=\'committed\';\n"
-"if (\'R\' = what and\n"
-"puid <> http_nobody_uid() and\n"
-"exists (select top 1 1 from SYS_USERS where U_ID = puid and U_ACCOUNT_DISABLED = 1 ))\n"
-"{\n"
-"return -42;\n"
+"what := \'C\';\n"
+"if (not isstring (path))\n"
+"path := DAV_CONCAT_PATH (par, null);\n"
+"id := DAV_SEARCH_ID (path, \'C\');\n"
"}\n"
-"set isolation=\'serializable\';\n"
-"if (DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
-"{\n"
"\n"
-"return a_uid;\n"
-"}\n"
-"if (WS.WS.ACL_IS_GRANTED (pacl, a_uid, DAV_REQ_CHARS_TO_BITMASK (req)))\n"
+"if (id = -1)\n"
"{\n"
-"\n"
-"return a_uid;\n"
+"declare det_ret, detcol_id, detcol_path_parts, unreached_path_parts any;\n"
+"return DAV_SEARCH_ID_OR_DET (par, what, det_ret, detcol_id, detcol_path_parts, unreached_path_parts);\n"
"}\n"
-"\n"
-"\n"
-"return -13;\n"
-"\n"
-"nf_col_or_res:\n"
-"\n"
-"return -1;\n"
+"return id;\n"
"}\n"
-"--src dav_api.sql:1628\n";
+"--src dav_api.sql:891\n";
-static const char *proc110 =
-"#line 1743 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_AUTHENTICATE_SSL_ITEM (\n"
-"inout id any,\n"
-"inout what char(1),\n"
-"inout path varchar) returns integer\n"
-"{\n"
-"declare pos integer;\n"
-"\n"
-"if (isnull (path))\n"
-"path := DAV_SEARCH_PATH (id, what);\n"
-"\n"
-"if (isstring (path) and path like \'%,acl\')\n"
+static const char *proc97 =
+"#line 934 \"[executable]/dav_api.sql\"\n"
+" create function\n"
+"DAV_HIDE_ERROR (in res any, in dflt any := null) returns any\n"
"{\n"
-"path := regexp_replace (path, \',acl\\x24\', \'\');\n"
-"pos := strrchr (path, \'/\');\n"
-"if (not isnull (pos))\n"
-"what := \'C\';\n"
-"id := DAV_SEARCH_ID (path, what);\n"
-"}\n"
+"if (not (isinteger (res)))\n"
+"return res;\n"
+"if (res >= 0)\n"
+"return res;\n"
+"return dflt;\n"
"}\n"
-"--src dav_api.sql:1741\n";
+"--src dav_api.sql:932\n";
-static const char *proc111 =
-"#line 1765 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_AUTHENTICATE_SSL_CONDITION () returns integer\n"
+static const char *proc98 =
+"#line 947 \"[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"
"{\n"
-"if (is_https_ctx () and (__proc_exists (\'SIOC.DBA.get_graph\') is not null))\n"
-"return 1;\n"
-"\n"
-"return 0;\n"
+"if (not (isinteger (res)))\n"
+"return dflt_det;\n"
+"if (res >= 0)\n"
+"return res;\n"
+"return dflt_err;\n"
"}\n"
-"--src dav_api.sql:1763\n";
+"--src dav_api.sql:945\n";
-static const char *proc112 =
-"#line 1775 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_AUTHENTICATE_SSL_WEBID ()\n"
-"{\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"
-"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"
+static const char *proc99 =
+"#line 960 \"[executable]/dav_api.sql\"\n"
+" create function DAV_CONCAT_PATH (in parts1 any, in parts2 any)\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"
+"declare strg1, strg2 varchar;\n"
+"declare len, ctr integer;\n"
+"if (parts1 is null)\n"
+"strg1 := \'\';\n"
+"else if (isstring (parts1))\n"
+"strg1 := parts1;\n"
+"else\n"
"{\n"
-"info := get_certificate_info (9);\n"
-"foreach (any _row in data) do\n"
+"len := length (parts1);\n"
+"if (len = 0)\n"
+"strg1 := \'\';\n"
+"else\n"
"{\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"
+"strg1 := parts1 [0];\n"
+"ctr := 1;\n"
+"while (ctr < len)\n"
"{\n"
-"retIRI := foafIRI;\n"
-"goto _break;\n"
-"}\n"
-"}\n"
+"strg1 := strg1 || \'/\' || parts1 [ctr];\n"
+"ctr := ctr + 1;\n"
"}\n"
"}\n"
-"_break:;\n"
-"SPARQL clear graph ?:foafGraph;\n"
"}\n"
-"_exit:\n"
-"return retIRI;\n"
+"if (parts2 is null)\n"
+"strg2 := \'\';\n"
+"else if (isstring (parts2))\n"
+"strg2 := parts2;\n"
+"else\n"
+"{\n"
+"len := length (parts2);\n"
+"if (len = 0)\n"
+"strg2 := \'\';\n"
+"else\n"
+"{\n"
+"strg2 := parts2 [0];\n"
+"ctr := 1;\n"
+"while (ctr < len)\n"
+"{\n"
+"strg2 := strg2 || \'/\' || parts2 [ctr];\n"
+"ctr := ctr + 1;\n"
+"}\n"
+"}\n"
+"}\n"
+"if (strg1 = \'\')\n"
+"return strg2;\n"
+"if (strg2 = \'\')\n"
+"return strg1;\n"
+"if (strg1 [length(strg1) - 1] = 47)\n"
+"if (strg2 [0] = 47)\n"
+"return strg1 || subseq (strg2, 1);\n"
+"else\n"
+"return strg1 || strg2;\n"
+"else\n"
+"if (strg2 [0] = 47)\n"
+"return strg1 || strg2;\n"
+"else\n"
+"return strg1 || \'/\' || strg2;\n"
"}\n"
-"--src dav_api.sql:1773\n";
+"--src dav_api.sql:958\n";
-static const char *proc113 =
-"#line 1863 \"[executable]/dav_api.sql\"\n"
+static const char *proc100 =
+"#line 1022 \"[executable]/dav_api.sql\"\n"
"create function\n"
-"DAV_AUTHENTICATE_SSL (\n"
-"in id any,\n"
-"in what char(1),\n"
-"in path varchar,\n"
-"in req varchar,\n"
-"inout a_uid integer,\n"
-"inout a_gid integer,\n"
-"inout _perms varchar) returns integer\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"
"{\n"
-"declare rc, M, N, L, I integer;\n"
-"declare graph, grpGraph, foafIRI, reqMode, realMode, IRIs any;\n"
-"declare tmp, T, V, S, st, msg, meta, row, rows any;\n"
-"\n"
-"rc := 0;\n"
-"req := replace (req, \'_\', \'0\');\n"
-"reqMode := vector (req[0]-48, req[1]-48, req[2]-48);\n"
-"realMode := vector (0, 0, 0);\n"
-"IRIs := vector (vector(), vector(), vector());\n"
-"DAV_AUTHENTICATE_SSL_ITEM (id, what, path);\n"
-"if (not DAV_AUTHENTICATE_SSL_CONDITION ())\n"
-"goto _exit;\n"
+"if (isstring (path))\n"
+"path := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"else\n"
+"path := path;\n"
+"if (length (path) < 2)\n"
+"goto bad_path_arg;\n"
+"if (aref (path, 0) <> \'\')\n"
+"goto bad_path_arg;\n"
+"if (path [length (path) - 1] = \'\')\n"
+"what := \'C\';\n"
+"else\n"
+"what := \'R\';\n"
+"return DAV_SEARCH_ID_OR_DET (path, what, det_ret, detcol_id, detcol_path_parts, unreached_path_parts);\n"
"\n"
-"set_user_id (\'dba\');\n"
-"foafIRI := null;\n"
-"tmp := \'/\';\n"
-"V := vector ();\n"
-"T := split_and_decode (trim (path, \'/\'), 0, \'\\0\\0/\');\n"
-"for (N := 0; N < length (T)-1; N := N + 1)\n"
-"{\n"
-"tmp := tmp || T[N] || \'/\';\n"
-"V := vector_concat (vector (tmp), V);\n"
+"bad_path_arg:\n"
+"detcol_id := null;\n"
+"detcol_path_parts := null;\n"
+"unreached_path_parts := null;\n"
+"return -1;\n"
"}\n"
-"V := vector_concat (vector (path), V);\n"
-"grpGraph := SIOC.DBA.get_graph () || \'/private/%\';\n"
-"for (N := 0; N < length (V); N := N + 1)\n"
-"{\n"
-"if (N <> 0)\n"
+"--src dav_api.sql:1020\n";
+
+static const char *proc101 =
+"#line 1047 \"[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"
"{\n"
-"what := \'C\';\n"
-"id := DAV_SEARCH_ID (V[N], what);\n"
-"}\n"
-"if (isinteger (id) and exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = id and PROP_TYPE = what and PROP_NAME = \'virt:aci_meta_n3\'))\n"
+"declare id integer;\n"
+"declare par, left_par, right_par any;\n"
+"declare cname, det varchar;\n"
+"declare inx, depth, cur_id, parent_id integer;\n"
+"id := -1;\n"
+"what := upper (what);\n"
+"\n"
+"if (isstring (path))\n"
+"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"else\n"
+"par := path;\n"
+"if (length (par) < 2)\n"
+"goto bad_path_arg;\n"
+"if (aref (par, 0) <> \'\')\n"
+"goto bad_path_arg;\n"
+"if (what = \'P\')\n"
"{\n"
-"tmp := null;\n"
-"if (isnull (foafIRI))\n"
-"foafIRI := DAV_AUTHENTICATE_SSL_WEBID ();\n"
-"if (isnull (foafIRI))\n"
-"goto _exit;\n"
-"graph := WS.WS.DAV_IRI (V[N]);\n"
-"for (\n"
-"sparql\n"
-"define input:storage \"\"\n"
-"prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
-"prefix foaf: <http://xmlns.com/foaf/0.1/>\n"
-"prefix acl: <http://www.w3.org/ns/auth/acl#>\n"
-"select ?p1 ?p2 ?p3 ?mode\n"
-"where {\n"
+"if (par [length (par) - 1] = \'\')\n"
"{\n"
-"graph `iri(?:graph)`\n"
+"if (2 = length (par))\n"
+"goto bad_path_arg;\n"
+"if (3 = length (par))\n"
"{\n"
-"?rule rdf:type acl:Authorization ;\n"
-"acl:accessTo `iri(?:graph)` ;\n"
-"acl:mode ?mode ;\n"
-"acl:agent `iri(?:foafIRI)` ;\n"
-"acl:agent ?p1 .\n"
+"detcol_id := null;\n"
+"detcol_path_parts := null;\n"
+"unreached_path_parts := null;\n"
+"return 0;\n"
"}\n"
+"par := vector_concat (subseq (par, 0, length (par) - 2), vector (\'\'));\n"
"}\n"
-"union\n"
+"else\n"
"{\n"
-"graph `iri(?:graph)`\n"
+"if (2 = length (par))\n"
"{\n"
-"?rule rdf:type acl:Authorization ;\n"
-"acl:accessTo `iri(?:graph)` ;\n"
-"acl:mode ?mode ;\n"
-"acl:agentClass foaf:Agent ;\n"
-"acl:agentClass ?p2 .\n"
+"detcol_id := null;\n"
+"detcol_path_parts := null;\n"
+"unreached_path_parts := null;\n"
+"return 0;\n"
"}\n"
+"par := vector_concat (subseq (par, 0, length (par) - 1), vector (\'\'));\n"
"}\n"
-"union\n"
+"path := null;\n"
+"what := \'C\';\n"
+"}\n"
+"if (what = \'R\')\n"
"{\n"
-"graph `iri(?:graph)`\n"
+"if (aref (par, length (par) - 1) = \'\')\n"
+"goto bad_path_arg;\n"
+"if (not isstring (path))\n"
+"path := DAV_CONCAT_PATH (par, null);\n"
+"id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1);\n"
+"if ((id <> -1) and (connection_get (\'dav_store\') is null))\n"
"{\n"
-"?rule rdf:type acl:Authorization ;\n"
-"acl:accessTo `iri(?:graph)` ;\n"
-"acl:mode ?mode ;\n"
-"acl:agentClass ?p3 .\n"
-"}\n"
-"graph ?g\n"
+"detcol_id := cast (DAV_PROP_GET_INT (id, what, \'virt:DETCOL_ID\', 0) as integer);\n"
+"if (DAV_HIDE_ERROR (detcol_id) is not null)\n"
"{\n"
-"?p3 rdf:type foaf:Group ;\n"
-"foaf:member `iri(?:foafIRI)` .\n"
-"filter (?g like (?:grpGraph)) .\n"
+"det_ret := cast (coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = detcol_id), \'\') as varchar);\n"
+"if ((det_ret <> \'\') and __proc_exists (\'DB.DBA.\' || det_ret || \'_DAV_MAKE_ID\'))\n"
+"{\n"
+"declare detcol_par any;\n"
+"\n"
+"detcol_par := split_and_decode (DAV_SEARCH_PATH (detcol_id, \'C\'), 0, \'\\0\\0/\');\n"
+"inx := length (detcol_par)-2;\n"
+"detcol_path_parts := subseq (par, 0, inx + 1);\n"
+"par := subseq (par, inx + 1);\n"
+"unreached_path_parts := par;\n"
+"return call (cast (det_ret as varchar) || \'_DAV_MAKE_ID\') (detcol_id, id, \'R\');\n"
"}\n"
"}\n"
"}\n"
-"order by ?p3 ?p2 ?p1 ?mode) do\n"
-"{\n"
-"if (not isnull (\"p1\"))\n"
-"I := 0;\n"
-"else if (not isnull (\"p2\"))\n"
-"I := 1;\n"
-"else if (not isnull (\"p3\"))\n"
-"I := 2;\n"
-"else\n"
-"goto _skip;\n"
+"if (id > 0)\n"
+"goto found_plain_id;\n"
"\n"
-"if (tmp <> coalesce (\"p1\", coalesce (\"p2\", \"p3\")))\n"
-"{\n"
-"tmp := coalesce (\"p1\", coalesce (\"p2\", \"p3\"));\n"
-"for (M := 0; M < length (IRIs[I]); M := M + 1)\n"
-"{\n"
-"if (tmp = IRIs[I][M])\n"
-"goto _skip;\n"
"}\n"
+"else if (what = \'C\')\n"
+"{\n"
+"if (aref (par, length (par) - 1) <> \'\')\n"
+"goto bad_path_arg;\n"
+"goto descending_col_search;\n"
"}\n"
+"else\n"
+"return -14;\n"
"\n"
-"if (\"mode\" like \'%#Read\')\n"
-"realMode[0] := 1;\n"
-"else if (\"mode\" like \'%#Write\')\n"
-"realMode[1] := 1;\n"
-"else if (\"mode\" like \'%#Execute\')\n"
-"realMode[2] := 1;\n"
+"descending_col_search:\n"
+"inx := 1;\n"
+"cur_id := 0;\n"
+"parent_id := 0;\n"
+"depth := length (par) - 1;\n"
"\n"
-"if ((reqMode[0] <= realMode[0]) and (reqMode[1] <= realMode[1]) and (reqMode[2] <= realMode[2]))\n"
+"whenever not found goto not_found;\n"
+"while (inx < depth)\n"
"{\n"
-"a_uid := http_nobody_uid ();\n"
-"a_gid := http_nogroup_gid ();\n"
-"rc := 1;\n"
-"goto _exit;\n"
-"}\n"
-"IRIs[I] := vector_concat (IRIs[I], vector (tmp));\n"
+"cname := aref (par, inx);\n"
"\n"
-"_skip:;\n"
+"select COL_ID, COL_DET into cur_id, det from WS.WS.SYS_DAV_COL where COL_NAME = cname and COL_PARENT = parent_id;\n"
+"if ((det is not NULL) and (connection_get (\'dav_store\') is null))\n"
+"{\n"
+"det_ret := det;\n"
+"detcol_id := cur_id;\n"
+"detcol_path_parts := subseq (par, 0, inx + 1);\n"
+"par := subseq (par, inx + 1);\n"
+"unreached_path_parts := par;\n"
+"if ((what = \'C\') and (inx = depth - 1))\n"
+"return cur_id;\n"
+"return call (cast (det as varchar) || \'_DAV_SEARCH_ID\') (cur_id, par, what);\n"
"}\n"
+"parent_id := cur_id;\n"
+"inx := inx + 1;\n"
"}\n"
+"if (what = \'R\')\n"
+"{\n"
+"return -1;\n"
"}\n"
+"id := cur_id;\n"
+"goto found_plain_id;\n"
"\n"
-"_exit:;\n"
-"_perms := replace (sprintf (\'%d%d%d\', realMode[0], realMode[1], realMode[2]), \'0\', \'_\');\n"
+"found_plain_id:\n"
+"det_ret := NULL;\n"
+"detcol_id := NULL;\n"
+"detcol_path_parts := null;\n"
+"unreached_path_parts := null;\n"
+"return id;\n"
"\n"
-"return rc;\n"
-"}\n"
-"--src dav_api.sql:1861\n";
-
-static const char *proc114 =
-"#line 2010 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_COL_CREATE (\n"
-"in path varchar,\n"
-"in permissions varchar := \'110100000RR\',\n"
-"in uid varchar := \'dav\',\n"
-"in gid varchar := \'administrators\',\n"
-"in auth_uid varchar := NULL,\n"
-"in auth_pwd varchar := NULL)\n"
-"{\n"
-"return DAV_COL_CREATE_INT (\n"
-"path, permissions, uid, gid, auth_uid, auth_pwd, 1, 1, 1, null, null);\n"
+"not_found:\n"
+"\n"
+"det_ret := NULL;\n"
+"detcol_id := null;\n"
+"detcol_path_parts := null;\n"
+"unreached_path_parts := null;\n"
+"return -1;\n"
+"\n"
+"bad_path_arg:\n"
+"\n"
+"det_ret := NULL;\n"
+"detcol_id := null;\n"
+"detcol_path_parts := null;\n"
+"unreached_path_parts := null;\n"
+"return -1;\n"
"}\n"
-"--src dav_api.sql:2008\n";
+"--src dav_api.sql:1045\n";
-static const char *proc115 =
-"#line 2025 \"[executable]/dav_api.sql\"\n"
+static const char *proc102 =
+"#line 1192 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
-"DAV_COL_CREATE_INT (\n"
-"in path varchar,\n"
-"in permissions varchar,\n"
-"in uid varchar,\n"
-"in gid varchar,\n"
-"in auth_uname varchar,\n"
-"in auth_pwd varchar,\n"
-"in return_error_if_already_exists integer,\n"
-"in extern integer,\n"
-"in check_locks any,\n"
-"in ouid integer := null,\n"
-"in ogid integer := null )\n"
+"DAV_OWNER_ID (in uid any, in gid any, out _uid integer, out _gid integer)\n"
"{\n"
-"declare pid, puid, pgid, rc integer;\n"
-"declare pperms, name, det varchar;\n"
-"declare par any;\n"
"\n"
-"rc := 0;\n"
-"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"if (uid is null)\n"
+"_uid := http_nobody_uid();\n"
+"else if (isinteger (uid))\n"
+"_uid := uid;\n"
+"else\n"
+"_uid := coalesce (\n"
+"(select U_ID from WS.WS.SYS_DAV_USER where U_NAME = uid),\n"
+"case (uid) when \'anonymous\' then http_nobody_uid () else -12 end);\n"
"\n"
-"if (aref (par, 0) <> \'\' or aref (par, length (par) - 1) <> \'\')\n"
-"return -1;\n"
+"if (gid is null)\n"
+"_gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = _uid), http_nogroup_gid ());\n"
+"else if (isinteger (gid))\n"
+"_gid := gid;\n"
+"else\n"
+"_gid := coalesce (\n"
+"(select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid),\n"
+"(select U_GROUP from WS.WS.SYS_DAV_USER where U_NAME = gid),\n"
+"-12 );\n"
"\n"
-"if (DAV_HIDE_ERROR ((pid := DAV_SEARCH_ID (path, \'P\'))) is null)\n"
-"return pid;\n"
"\n"
-"if (extern and 0 > (rc := DAV_AUTHENTICATE (pid, \'C\', \'11_\', auth_uname, auth_pwd)))\n"
-"{\n"
"\n"
-"return rc;\n"
"}\n"
-"if (DAV_HIDE_ERROR (DAV_SEARCH_ID (subseq (par, 0, length (par) - 1), \'R\')) is not null)\n"
+"--src dav_api.sql:1190\n";
+
+static const char *proc103 =
+"#line 1221 \"[executable]/dav_api.sql\"\n"
+"create procedure DAV_IS_LOCKED_INT (inout id any, inout type char, in owned_tokens varchar := \'\')\n"
"{\n"
-"\n"
-"return -25;\n"
-"}\n"
-"if ((0 = return_error_if_already_exists) and (rc := DAV_HIDE_ERROR (DAV_SEARCH_ID (path, \'C\'))) is not null)\n"
+"declare pid, npid, res integer;\n"
+"declare scope varchar;\n"
+"type := upper (type);\n"
+"if (type <> \'C\' and type <> \'R\')\n"
+"return -14;\n"
+"if (exists (select 1 from WS.WS.SYS_DAV_LOCK where datediff (\'second\', LOCK_TIME, now()) > LOCK_TIMEOUT))\n"
"{\n"
+"delete from WS.WS.SYS_DAV_LOCK where datediff (\'second\', LOCK_TIME, now()) > LOCK_TIMEOUT;\n"
"\n"
-"return rc;\n"
"}\n"
-"if (check_locks and 0 <> (rc := DAV_IS_LOCKED (pid , \'C\', check_locks)))\n"
+"if (isarray (id))\n"
"{\n"
-"\n"
-"return rc;\n"
+"return call (cast (id[0] as varchar) || \'_DAV_IS_LOCKED\') (id, type, owned_tokens);\n"
"}\n"
+"if (id <= 0)\n"
+"return -1;\n"
"\n"
-"if (isarray (pid))\n"
-"det := pid[0];\n"
-"else if (pid > 0)\n"
-"det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=pid), NULL);\n"
-"else\n"
-"det := null;\n"
-"if (det is not null)\n"
-"{\n"
-"declare auth_uid integer;\n"
-"declare detcol_id integer;\n"
-"declare detcol_path, unreached_path any;\n"
-"if (extern)\n"
+"if (not exists (select 1 from WS.WS.SYS_DAV_LOCK))\n"
"{\n"
-"auth_uid := DAV_AUTHENTICATE (pid, \'C\', \'11_\', auth_uname, auth_pwd);\n"
-"if (0 > auth_uid)\n"
-"return auth_uid;\n"
-"}\n"
-"else\n"
-"auth_uid := http_nobody_uid ();\n"
-"DAV_SEARCH_ID_OR_DET (par, \'C\', det, detcol_id, detcol_path, unreached_path);\n"
-"return call (cast (det as varchar) || \'_DAV_COL_CREATE\') (detcol_id, unreached_path, permissions, ouid, ogid, auth_uid);\n"
+"\n"
+"return 0;\n"
"}\n"
-"name := aref (par, length (par) - 2);\n"
-"rc := WS.WS.GETID (\'C\');\n"
-"if (ouid is null)\n"
-"DAV_OWNER_ID (uid, gid, ouid, ogid);\n"
"\n"
-"declare exit handler for sqlstate \'*\' { rc := -3; };\n"
-"{\n"
+"whenever not found goto nf_target_lock;\n"
+"select case (LOCK_SCOPE) when \'X\' then 2 else 1 end into res from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = type and LOCK_PARENT_ID = id and strstr (owned_tokens, LOCK_TOKEN) is null;\n"
+"return res;\n"
"\n"
-"insert soft WS.WS.SYS_DAV_COL (COL_ID, COL_NAME, COL_PARENT,\n"
-"COL_OWNER, COL_GROUP, COL_PERMS,\n"
-"COL_CR_TIME, COL_MOD_TIME)\n"
-"values (rc, name, pid, ouid, ogid, permissions, now(), now ());\n"
-"if (not row_count())\n"
-"rc := -3;\n"
-"}\n"
-"return rc;\n"
-"}\n"
-"--src dav_api.sql:2023\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"
-"from WS.WS.SYS_DAV_RES,\n"
-"WS.WS.SYS_DAV_PROP\n"
-"where RES_FULL_PATH = path\n"
-"and PROP_PARENT_ID = RES_ID\n"
-"and PROP_NAME = \'redirectref\'\n"
-"and PROP_TYPE = \'R\') do\n"
+"nf_target_lock:\n"
+"\n"
+"\n"
+"if (not exists (select 1 from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and strstr (owned_tokens, LOCK_TOKEN) is null))\n"
"{\n"
-"path := redirectRef;\n"
-"return 1;\n"
+"\n"
+"return 0;\n"
"}\n"
"\n"
+"if (type = \'R\')\n"
+"pid := coalesce ((select RES_COL from WS.WS.SYS_DAV_RES where RES_ID = id), -1);\n"
+"else if (type = \'C\')\n"
+"pid := coalesce ((select COL_PARENT from WS.WS.SYS_DAV_COL where COL_ID = id), -1);\n"
+"\n"
+"if (pid < 0)\n"
+"return -1;\n"
+"\n"
+"next_parent:\n"
+"\n"
+"whenever not found goto nf_parent_lock;\n"
+"select case (LOCK_SCOPE) when \'X\' then 2 else 1 end into res from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = pid and strstr (owned_tokens, LOCK_TOKEN) is null;\n"
+"id := pid;\n"
+"type := \'C\';\n"
+"return res;\n"
+"\n"
+"nf_parent_lock:\n"
+"whenever not found goto nf_parent;\n"
+"select COL_PARENT into npid from WS.WS.SYS_DAV_COL where COL_ID = pid;\n"
+"pid := npid;\n"
+"goto next_parent;\n"
+"nf_parent:\n"
+"\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:2113\n";
+"--src dav_api.sql:1219\n";
-static const char *proc117 =
-"#line 2135 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_RES_UPLOAD (\n"
-"in path varchar,\n"
-"in content any,\n"
-"in type varchar := \'\',\n"
-"in permissions varchar := \'110100000RR\',\n"
-"in uid varchar := \'dav\',\n"
-"in gid varchar := \'administrators\',\n"
-"in auth_uid varchar := null, in auth_pwd varchar := null, in check_locks any := 1)\n"
+static const char *proc104 =
+"#line 1288 \"[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"
-"if (not (isstring (check_locks)))\n"
-"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"
+"declare res integer;\n"
+"if (isstring (owned_tokens))\n"
+"res := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"else\n"
+"res := DAV_IS_LOCKED_INT (id, type);\n"
+"if (res > 0)\n"
+"return -8;\n"
+"return res;\n"
"}\n"
-"--src dav_api.sql:2133\n";
+"--src dav_api.sql:1286\n";
-static const char *proc118 =
-"#line 2152 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_RES_UPLOAD_STRSES (\n"
-"in path varchar,\n"
-"inout content any,\n"
-"in type varchar := \'\',\n"
-"in permissions varchar := \'110100000RR\',\n"
-"in uid varchar := \'dav\',\n"
-"in gid varchar := \'administrators\',\n"
-"in auth_uid varchar := null, in auth_pwd varchar := null, in check_locks any := 1)\n"
+static const char *proc105 =
+"#line 1302 \"[executable]/dav_api.sql\"\n"
+" create function DAV_LIST_LOCKS (in id any, in type char) returns any\n"
"{\n"
-"if (not (isstring (check_locks)))\n"
-"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"
+"return DAV_LIST_LOCKS_INT (id, type);\n"
"}\n"
-"--src dav_api.sql:2150\n";
+"--src dav_api.sql:1300\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"
-"inout content any,\n"
-"in type varchar := \'\',\n"
-"in permissions varchar := \'110100000RR\',\n"
-"in uid any := \'dav\',\n"
-"in gid any := \'administrators\',\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null,\n"
-"in extern integer := 1,\n"
-"in cr_time datetime := null,\n"
-"in mod_time datetime := null,\n"
-"in _rowguid varchar := null,\n"
-"in ouid integer := null,\n"
-"in ogid integer := null,\n"
-"in check_locks any := 1\n"
-")\n"
+static const char *proc106 =
+"#line 1308 \"[executable]/dav_api.sql\"\n"
+"create function DAV_LIST_LOCKS_INT (in id any, in type char) returns any\n"
"{\n"
-"declare rc, old_log_mode, new_log_mode any;\n"
-"old_log_mode := log_enable (null);\n"
+"declare res any;\n"
+"type := upper (type);\n"
"\n"
-"new_log_mode := bit_and (old_log_mode, 1);\n"
-"old_log_mode := log_enable (bit_or (new_log_mode, 4), 1);\n"
-"rc := DAV_RES_UPLOAD_STRSES_INT_INNER (path, content, type, permissions, uid, gid, auth_uname, auth_pwd, extern, cr_time, mod_time, _rowguid, ouid, ogid, check_locks);\n"
-"log_enable (bit_or (old_log_mode, 4), 1);\n"
-"return rc;\n"
+"if (type <> \'C\' and type <> \'R\')\n"
+"return -14;\n"
+"if (isarray (id))\n"
+"{\n"
+"return call (cast (id[0] as varchar) || \'_DAV_LIST_LOCKS\') (id, type, 0);\n"
"}\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";
+"if (id <= 0)\n"
+"return -1;\n"
+"res := vector ();\n"
+"for select LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO\n"
+"from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type do {\n"
+"res := vector_concat (res, vector (vector (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)));\n"
+"}\n"
+"return res;\n"
+"}\n"
+"--src dav_api.sql:1306\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"
-"inout content any,\n"
-"in type varchar := \'\',\n"
-"in permissions varchar := \'110100000RR\',\n"
-"in uid any := \'dav\',\n"
-"in gid any := \'administrators\',\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null,\n"
-"in extern integer := 1,\n"
-"in cr_time datetime := null,\n"
-"in mod_time datetime := null,\n"
-"in _rowguid varchar := null,\n"
-"in ouid integer := null,\n"
-"in ogid integer := null,\n"
-"in check_locks any := 1\n"
-")\n"
-"{\n"
-"declare auth_uid, pid, puid, pgid, rc, id integer;\n"
-"declare pperms, name varchar;\n"
-"declare par any;\n"
-"declare op char;\n"
-"declare det varchar;\n"
-"declare detcol_id, _is_xper_res, fake integer;\n"
-"declare detcol_path, unreached_path any;\n"
-"declare res_cr cursor for select RES_ID+1 from WS.WS.SYS_DAV_RES where RES_ID = id for update;\n"
-"declare auto_version varchar;\n"
-"declare locked int;\n"
-"\n"
-"\n"
-"if (IS_REDIRECT_REF (path))\n"
+static const char *proc107 =
+"#line 1330 \"[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"
+"declare id any;\n"
+"declare st char (1);\n"
"\n"
-" ;\n"
+"id := null;\n"
+"st := null;\n"
+"return DAV_LOCK_INT (path, id, st, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid, auth_pwd, NULL);\n"
"}\n"
-"locked := 0;\n"
-"op := \'i\';\n"
-"rc := 0;\n"
-"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"\n"
-"if (aref (par, 0) <> \'\' or aref (par, length (par) - 1) = \'\')\n"
+"--src dav_api.sql:1328\n";
+
+static const char *proc108 =
+"#line 1341 \"[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"
+"declare p_id any;\n"
+"declare rc, id_is_bad integer;\n"
+"declare u_token, old_scope, p_st varchar;\n"
"\n"
-"return -1;\n"
-"}\n"
-"if (ouid is null)\n"
-"DAV_OWNER_ID (uid, gid, ouid, ogid);\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"id := DAV_SEARCH_ID (path, \'R\');\n"
-"\n"
-"if (isarray (id))\n"
-"{\n"
-"if (extern)\n"
+"p_id := DAV_SEARCH_ID (path, \'P\');\n"
+"if (DAV_HIDE_ERROR (p_id) is null)\n"
+"return case p_id when -1 then -34 else p_id end;\n"
+"if (id is null)\n"
+"id := DAV_SEARCH_SOME_ID (path, st);\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
"{\n"
-"\n"
-"auth_uid := DAV_AUTHENTICATE (id, \'R\', \'11_\', auth_uname, auth_pwd);\n"
-"if ((auth_uid < 0) and (auth_uid <> -1))\n"
-"return auth_uid;\n"
+"if (id <> -1)\n"
+"return -1;\n"
+"if (\"RIGHT\" (path, 1) = \'/\')\n"
+"return -1;\n"
+"st := \'R\';\n"
+"id_is_bad := 1;\n"
"}\n"
"else\n"
-"auth_uid := ouid;\n"
-"if (check_locks)\n"
-"{\n"
-"rc := DAV_IS_LOCKED (id , \'R\', check_locks);\n"
-"if (0 <> rc)\n"
+"id_is_bad := 0;\n"
+"if (id_is_bad)\n"
+"rc := DAV_AUTHENTICATE (p_id, \'C\', \'11_\', auth_uname, auth_pwd, auth_uid);\n"
+"else\n"
+"rc := DAV_AUTHENTICATE (id, st, \'11_\', auth_uname, auth_pwd, auth_uid);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
"return rc;\n"
+"if (auth_uid is null)\n"
+"auth_uid := rc;\n"
+"if (owned_tokens is null)\n"
+"owned_tokens := \'\';\n"
+"if (token is null)\n"
+"token := \'\';\n"
+"if (owner_name is null)\n"
+"owner_name := \'\';\n"
+"if (depth is null)\n"
+"{\n"
+"if (st = \'R\')\n"
+"depth := \'0\';\n"
+"else\n"
+"depth := \'infinity\';\n"
"}\n"
-"DAV_SEARCH_ID_OR_DET (par, \'R\', det, detcol_id, detcol_path, unreached_path);\n"
-"rc := call (cast (det as varchar) || \'_DAV_RES_UPLOAD\') (detcol_id, unreached_path, content, type, permissions, ouid, ogid, auth_uid);\n"
-"\n"
+"if (timeout_sec is null or timeout_sec = 0)\n"
+"timeout_sec := 604800;\n"
+"set isolation = \'serializable\';\n"
+"p_st := \'C\';\n"
+"rc := DAV_IS_LOCKED_INT (p_id, p_st, owned_tokens);\n"
+"if (0 <> rc)\n"
+"{\n"
+"if (rc < 0)\n"
"return rc;\n"
+"return -8;\n"
"}\n"
-"if (0 > id)\n"
+"if (st = \'C\')\n"
"{\n"
-"pid := DAV_SEARCH_ID (path, \'P\');\n"
-"if (isarray (pid))\n"
-"det := pid[0];\n"
-"else if (pid > 0)\n"
-"det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=pid), NULL);\n"
-"else\n"
+"for select LOCK_TOKEN as _ctoken from WS.WS.SYS_DAV_LOCK\n"
+"where\n"
+"LOCK_PARENT_TYPE = \'C\' and\n"
+"isnull (strstr (owned_tokens, LOCK_TOKEN)) and\n"
+"((id = LOCK_PARENT_ID) or DAV_COL_IS_ANCESTOR_OF (id, LOCK_PARENT_ID))\n"
+"do\n"
"{\n"
-"\n"
-"return pid;\n"
+"return -8;\n"
+"}\n"
"}\n"
-"if (extern)\n"
-"{\n"
"\n"
-"auth_uid := DAV_AUTHENTICATE (pid, \'C\', \'11_\', auth_uname, auth_pwd);\n"
-"if (auth_uid < 0)\n"
+"u_token := \'\';\n"
+"if (owned_tokens <> \'\')\n"
"{\n"
+"declare tleft, tright integer;\n"
+"declare tmp varchar;\n"
+"if (isnull(strstr(owned_tokens, \'(<opaquelocktoken:\')))\n"
+"goto failed_parsing;\n"
+"tleft := strchr (owned_tokens, \':\');\n"
"\n"
-"return auth_uid;\n"
-"}\n"
+"if (tleft is null)\n"
+"goto failed_parsing;\n"
+"tright := strchr (substring (owned_tokens, tleft + 1, length (owned_tokens)), \'>\');\n"
+"if (tright is null)\n"
+"goto failed_parsing;\n"
+"tright := tleft + tright;\n"
+"tmp := substring (owned_tokens, tleft + 2, tright - tleft - 1);\n"
+"u_token := trim(tmp);\n"
"}\n"
-"else\n"
-"auth_uid := ouid;\n"
-"if (check_locks)\n"
+"failed_parsing:\n"
+"if (u_token = \'\')\n"
+"u_token := token;\n"
+"\n"
+"\n"
+"if (isarray (id))\n"
"{\n"
-"rc := DAV_IS_LOCKED (pid , \'C\', check_locks);\n"
-"if (0 <> rc)\n"
+"token := u_token;\n"
+"rc := call (cast (id[0] as varchar) || \'_DAV_LOCK\') (path, id, st, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid);\n"
"return rc;\n"
"}\n"
-"set isolation=\'committed\';\n"
-"if ( auth_uid <> http_nobody_uid() and\n"
-"(http_dav_uid () <> coalesce (connection_get (\'DAVBillingUserID\'), -12)) and\n"
-"exists (select top 1 1 from SYS_USERS\n"
-"where U_ID = auth_uid and U_ACCOUNT_DISABLED = 1 ) )\n"
-"return -42;\n"
-"set isolation=\'serializable\';\n"
-"if (det is not null)\n"
+"if (id_is_bad)\n"
"{\n"
-"DAV_SEARCH_ID_OR_DET (par, \'R\', det, detcol_id, detcol_path, unreached_path);\n"
-"rc := call (cast (det as varchar) || \'_DAV_RES_UPLOAD\') (detcol_id, unreached_path, content, type, permissions, ouid, ogid, auth_uid);\n"
-"\n"
+"declare parent_det, new_res_name varchar;\n"
+"parent_det := DAV_PROP_GET_INT (p_id, \'C\', \':virtdet\', 0);\n"
+"if (parent_det is not null)\n"
+"{\n"
+"token := u_token;\n"
+"rc := call (parent_det || \'_DAV_LOCK\') (path, id, st, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, auth_uid);\n"
"return rc;\n"
"}\n"
-"name := aref (par, length (par) - 1);\n"
-"rc := WS.WS.GETID (\'R\');\n"
-"op := \'i\';\n"
-"if (cr_time is null)\n"
-"cr_time := now();\n"
+"new_res_name := subseq (path, strrchr (path, \'/\') + 1);\n"
+"if (exists (select top 1 1 from WS.WS.SYS_DAV_COL where COL_PARENT = p_id and COL_NAME = new_res_name))\n"
+"return -26;\n"
+"id := WS.WS.GETID (\'R\');\n"
+"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_CR_TIME, RES_MOD_TIME, RES_OWNER, RES_PERMS, RES_GROUP)\n"
+"values (id, new_res_name, p_id, now (), now (), auth_uid, \'110000000NN\', http_nogroup_gid() );\n"
+"old_scope := \'\';\n"
"}\n"
"else\n"
-"{\n"
-"open res_cr (exclusive, prefetch 1);\n"
-"fetch res_cr into fake;\n"
-"if (extern)\n"
-"{\n"
+"old_scope := coalesce ((select LOCK_SCOPE from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = st and LOCK_PARENT_ID = id), \'\');\n"
"\n"
-"auth_uid := DAV_AUTHENTICATE (id, \'R\', \'11_\', auth_uname, auth_pwd);\n"
-"if (auth_uid < 0)\n"
+"if ((old_scope = \'S\' or old_scope = \'X\') and u_token <> \'\')\n"
"{\n"
"\n"
-"return auth_uid;\n"
-"}\n"
+"declare c cursor for select LOCK_OWNER_INFO from WS.WS.SYS_DAV_LOCK where LOCK_TOKEN = u_token and LOCK_PARENT_TYPE = st and LOCK_PARENT_ID = id for update;\n"
+"declare old_owner_name varchar;\n"
+"whenever not found goto nothing_to_refresh;\n"
+"open c;\n"
+"fetch c into old_owner_name;\n"
+"if (owner_name = \'\')\n"
+"owner_name := old_owner_name;\n"
+"scope := old_scope;\n"
+"update WS.WS.SYS_DAV_LOCK set LOCK_TIME = now (), LOCK_TIMEOUT = timeout_sec, LOCK_OWNER_INFO = owner_name where current of c;\n"
+"close c;\n"
+"return u_token;\n"
+"nothing_to_refresh:\n"
+"close c;\n"
+"return -35;\n"
"}\n"
-"else\n"
-"auth_uid := ouid;\n"
-"auto_version := DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT(DAV_SEARCH_ID (path, \'R\'), \'R\', \'DAV:auto-version\', 0));\n"
-"if (check_locks)\n"
+"if ((old_scope = \'\') or (old_scope = \'S\' and scope = \'S\'))\n"
"{\n"
-"rc := DAV_IS_LOCKED (id , \'R\', check_locks);\n"
-"if (rc < 0)\n"
-"locked := 1;\n"
+"if (token = \'\')\n"
+"token := WS.WS.OPLOCKTOKEN();\n"
"else\n"
-"locked := 0;\n"
-"if (auto_version is not null)\n"
"{\n"
-"declare vanilla_rc int;\n"
-"vanilla_rc := DAV_IS_LOCKED (id , \'R\', 1);\n"
-"if (vanilla_rc < 0)\n"
-"locked := 1;\n"
-"if (vanilla_rc = -8 and (auto_version = \'DAV:checkout-unlocked-checkin\'))\n"
-"rc := 0;\n"
-"else if (vanilla_rc = -8 and (auto_version = \'DAV:locked-checkout\'))\n"
-"rc := 0;\n"
+"if (exists (select top 1 1 from WS.WS.SYS_DAV_LOCK where LOCK_TOKEN = token and (LOCK_PARENT_TYPE <> st or LOCK_PARENT_ID <> id)))\n"
+"return -35;\n"
"}\n"
-"if (0 <> rc)\n"
-"{\n"
"\n"
-"return rc;\n"
+"insert into WS.WS.SYS_DAV_LOCK (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_PARENT_TYPE,\n"
+"LOCK_PARENT_ID, LOCK_TIME, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)\n"
+"values (locktype, scope, token, st, id, now(), timeout_sec, auth_uid, owner_name);\n"
+"return token;\n"
"}\n"
+"if (old_scope = \'X\' or (old_scope = \'S\' and scope = \'X\'))\n"
+"return -8;\n"
+"return -35;\n"
"}\n"
-"rc := id;\n"
-"op := \'u\';\n"
-"if (cr_time is null or _rowguid is null)\n"
+"--src dav_api.sql:1339\n";
+
+static const char *proc109 =
+"#line 1497 \"[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"
-"declare _cr_time datetime;\n"
-"declare __rowguid varchar;\n"
-"select RES_CR_TIME, ROWGUID into _cr_time, __rowguid\n"
-"from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
-"if (cr_time is null)\n"
-"cr_time := _cr_time;\n"
-"if (_rowguid is null)\n"
-"_rowguid := __rowguid;\n"
-"}\n"
+"declare id any;\n"
+"declare st char (1);\n"
+"id := DAV_SEARCH_SOME_ID (path, st);\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
+"return -1;\n"
+"return DAV_UNLOCK_INT (id, st, token, auth_uname, auth_pwd, null);\n"
"}\n"
-"if (DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (par, vector (\'\')), \'C\')) is not null)\n"
+"--src dav_api.sql:1495\n";
+
+static const char *proc110 =
+"#line 1509 \"[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"
+"declare rc, _left, _right integer;\n"
+"declare cur_token varchar;\n"
+"declare l_cur cursor for select LOCK_TOKEN from WS.WS.SYS_DAV_LOCK\n"
+"where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = st and LOCK_TOKEN = token;\n"
"\n"
-"return -26;\n"
-"}\n"
-"if (mod_time is null)\n"
-"mod_time := now();\n"
-"if (type = \'\')\n"
-"type := http_mime_type (path);\n"
+"auth_uid := DAV_AUTHENTICATE (id, st, \'11_\', auth_uname, auth_pwd, auth_uid);\n"
+"if (auth_uid < 0)\n"
+"return auth_uid;\n"
"\n"
"\n"
-"if (type = \'text/xml\'\n"
-"and exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = pid and PROP_TYPE = \'C\'\n"
-"and PROP_NAME = \'xper\'))\n"
+"_left := strstr(token,\'opaquelocktoken:\');\n"
+"if (_left is not null)\n"
"{\n"
-"insert soft WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE)\n"
-"values (WS.WS.GETID (\'P\'), \'xper\', \'R\', id, \'\');\n"
-"_is_xper_res := 1;\n"
+"_left := _left + 15;\n"
+"_right := strrchr(token,\'>\');\n"
+"if (_left < _right)\n"
+"token := trim (substring (token, _left + 2, _right - _left - 1));\n"
"}\n"
-"else if (rc <> 0)\n"
+"if (isarray (id))\n"
"{\n"
-"delete from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xper\' and PROP_TYPE = \'R\' and PROP_PARENT_ID = id;\n"
-"_is_xper_res := 0;\n"
+"rc := call (cast (id[0] as varchar) || \'_DAV_UNLOCK\')(id, st, token, auth_uid);\n"
+"return rc;\n"
"}\n"
+"whenever not found goto not_locked_t;\n"
+"open l_cur (exclusive, prefetch 1);\n"
+"fetch l_cur into cur_token;\n"
+"delete from WS.WS.SYS_DAV_LOCK where current of l_cur;\n"
+"close l_cur;\n"
+"return token;\n"
"\n"
+"not_locked_t:\n"
+"close l_cur;\n"
+"return -27;\n"
+"}\n"
+"--src dav_api.sql:1507\n";
+
+static const char *proc111 =
+"#line 1548 \"[executable]/dav_api.sql\"\n"
+" create function\n"
+"DAV_REQ_CHARS_TO_BITMASK (in req varchar) returns integer\n"
+"{\n"
+"return 4 * equ (req[0], 49) + 2 * equ (req[1], 49) + equ (req[2], 49);\n"
+"}\n"
+"--src dav_api.sql:1546\n";
+
+static const char *proc112 =
+"#line 1556 \"[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 opwd, pperms varchar;\n"
+"declare pacl varbinary;\n"
"\n"
-"whenever sqlstate \'*\' goto unhappy_upload;\n"
+"what := upper (what);\n"
"\n"
-"if (op = \'i\')\n"
+"if (length (req) <> 3)\n"
+"return -15;\n"
+"\n"
+"if (a_uid is null)\n"
+"a_uid := DAV_CHECK_AUTH (a_uname, a_pwd, 0);\n"
+"\n"
+"if (a_uid < 0)\n"
"{\n"
+"if (DAV_AUTHENTICATE_SSL_CONDITION ())\n"
+"goto _check_ssl;\n"
"\n"
-"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL,\n"
-"RES_OWNER, RES_GROUP, RES_PERMS,\n"
-"RES_CR_TIME, RES_MOD_TIME,\n"
-"RES_TYPE, RES_CONTENT, ROWGUID)\n"
-"values (rc, name, pid, ouid, ogid, permissions, cr_time, mod_time, type, content, _rowguid);\n"
-"if (_is_xper_res)\n"
-"update WS.WS.SYS_DAV_RES set RES_CONTENT = xml_persistent (RES_CONTENT) where RES_ID = id;\n"
+"return a_uid;\n"
+"}\n"
+"\n"
+"if (a_uid = 1)\n"
+"{\n"
+"oid := http_nobody_uid ();\n"
+"ogid := http_nogroup_gid ();\n"
"}\n"
"else\n"
"{\n"
-"if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, \'R\', \'DAV:checked-in\', 0)) is not null)\n"
+"if (a_uid = http_dav_uid())\n"
+"return a_uid;\n"
+"\n"
+"oid := a_uid;\n"
+"if (a_uid = http_nobody_uid ())\n"
"{\n"
-"if (auto_version = \'DAV:checkout-checkin\')\n"
+"ogid := http_nogroup_gid ();\n"
+"}\n"
+"else\n"
"{\n"
-" ;\n"
+"select U_GROUP into ogid from WS.WS.SYS_DAV_USER where U_ID = a_uid;\n"
"}\n"
-"else if ( (locked and (auto_version = \'DAV:checkout-unlocked-checkin\')) or\n"
-"(auto_version = \'DAV:checkout\') or\n"
-"(locked and (auto_version = \'DAV:locked-checkout\')) )\n"
-"return \"Versioning_CHECKOUT_INT\" (id, content, type, permissions, ouid, ogid);\n"
-"else if (locked or\n"
-"(auto_version is null) or\n"
-"((auto_version <> \'DAV:checkout-unlocked-checkin\') and\n"
-"(auto_version <> \'DAV:checkout-checkin\')))\n"
-"return -38;\n"
"}\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"
"\n"
-"if (sys_stat (\'cl_run_local_only\') = 1)\n"
+"return rc;\n"
+"}\n"
+"whenever not found goto nf_col_or_res;\n"
+"if (what = \'R\')\n"
"{\n"
-"update WS.WS.SYS_DAV_RES\n"
-"set RES_OWNER = ouid,\n"
-"RES_GROUP = ogid,\n"
-"RES_PERMS = permissions,\n"
-"RES_CR_TIME = cr_time,\n"
-"RES_MOD_TIME = mod_time,\n"
-"RES_TYPE = type,\n"
-"RES_CONTENT = content,\n"
-"ROWGUID = _rowguid\n"
-"where current of res_cr;\n"
+"select RES_OWNER, RES_GROUP, RES_PERMS, RES_ACL into puid, pgid, pperms, pacl from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
+"set isolation=\'committed\';\n"
+"if (puid <> http_nobody_uid() and\n"
+"exists (select top 1 1 from SYS_USERS where U_ID = puid and U_ACCOUNT_DISABLED = 1))\n"
+"{\n"
+"return -42;\n"
+"}\n"
+"set isolation=\'serializable\';\n"
+"}\n"
+"else if (what = \'C\')\n"
+"{\n"
+"select COL_OWNER, COL_GROUP, COL_PERMS, COL_ACL into puid, pgid, pperms, pacl from WS.WS.SYS_DAV_COL where COL_ID = id;\n"
"}\n"
"else\n"
"{\n"
-"update WS.WS.SYS_DAV_RES\n"
-"set RES_OWNER = ouid,\n"
-"RES_GROUP = ogid,\n"
-"RES_PERMS = permissions,\n"
-"RES_CR_TIME = cr_time,\n"
-"RES_MOD_TIME = mod_time,\n"
-"RES_TYPE = type,\n"
-"RES_CONTENT = content,\n"
-"ROWGUID = _rowguid\n"
-"where RES_ID = id;\n"
+"return -14;\n"
"}\n"
-"if (_is_xper_res)\n"
-"update WS.WS.SYS_DAV_RES set RES_CONTENT = xml_persistent (RES_CONTENT) where current of res_cr;\n"
+"if (DAV_CHECK_PERM (pperms, req, oid, ogid, pgid, puid))\n"
+"{\n"
+"\n"
+"return a_uid;\n"
+"}\n"
+"if (WS.WS.ACL_IS_GRANTED (pacl, oid, DAV_REQ_CHARS_TO_BITMASK (req)))\n"
+"{\n"
+"\n"
+"return a_uid;\n"
+"}\n"
+"if (DAV_AUTHENTICATE_SSL_CONDITION ())\n"
+"{\n"
+"_check_ssl:\n"
+"declare _perms, a_gid any;\n"
+"\n"
+"if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms))\n"
+"return a_uid;\n"
"}\n"
"\n"
"\n"
+"return -13;\n"
"\n"
-"declare c_id, depth integer;\n"
-"declare rdf_graph any;\n"
-"declare _col_p_id, _inherit any;\n"
+"nf_col_or_res:\n"
"\n"
+"return -1;\n"
+"}\n"
+"--src dav_api.sql:1554\n";
+
+static const char *proc113 =
+"#line 1655 \"[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"
+"declare rc integer;\n"
+"declare puid, pgid integer;\n"
+"declare u_password, pperms, resName, resPath varchar;\n"
+"declare allow_anon integer;\n"
+"declare pacl varbinary;\n"
"\n"
-"RDF_SINK_DELETE (path);\n"
+"what := upper (what);\n"
"\n"
"\n"
-"c_id := (select RES_COL from WS.WS.SYS_DAV_RES where RES_ID = rc);\n"
+"if (length (req) <> 3)\n"
+"return -15;\n"
"\n"
-"rdf_graph := null; \n"
-"depth := 0; \n"
+"if (isarray (id))\n"
"{\n"
-"whenever not found goto rdfg_found;\n"
-"look_again: \n"
-"select COL_PARENT, COL_INHERIT into _col_p_id, _inherit from WS.WS.SYS_DAV_COL where COL_ID = c_id;\n"
-"rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_graph\');\n"
-"if ((_inherit = \'R\' or (depth = 1 and _inherit = \'M\') or depth = 0) and length (rdf_graph))\n"
-"goto rdfg_found;\n"
-"c_id := _col_p_id;\n"
-"depth := depth + 1;\n"
-"rdf_graph := null;\n"
-"goto look_again;\n"
+"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"
+"\n"
+"return rc;\n"
"}\n"
-"rdfg_found:; \n"
-"if (not DB.DBA.is_empty_or_null (rdf_graph))\n"
+"if (id is null)\n"
"{\n"
-"declare aq any;\n"
-"insert soft RDF_SINK_QUEUE (RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_STATE, RSQ_TYPE, RSQ_UID, RSQ_GID) values (path, rc, c_id, rdf_graph, 0, type, ouid, ogid);\n"
-"set_user_id (user);\n"
-"aq := async_queue (1);\n"
-"aq_request (aq, \'DB.DBA.RDF_SINK_AQ_RUN\', vector ());\n"
-"}\n"
-"return rc;\n"
-"\n"
-"unhappy_upload:\n"
-"if (__SQL_STATE = \'HT507\')\n"
-"return -41;\n"
-"if (__SQL_STATE = \'HT508\')\n"
-"return -42;\n"
-"if (__SQL_STATE = \'HT509\')\n"
-"return -43;\n"
-"return -29;\n"
+"pperms := \'000000000?\';\n"
+"allow_anon := 0;\n"
"}\n"
-"--src dav_api.sql:2202\n";
-
-static const char *proc121 =
-"#line 2523 \"[executable]/dav_api.sql\"\n"
-"create procedure RDF_SINK_AQ_GET ()\n"
+"else\n"
"{\n"
-"declare arr any;\n"
-"set isolation = \'serializable\';\n"
-"arr := (select vector_agg (vector (RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_TYPE, RSQ_UID, RSQ_GID)) from (select top 10 RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_TYPE, RSQ_UID, RSQ_GID \n"
-"from RDF_SINK_QUEUE where RSQ_STATE = 0 order by RSQ_TS for update) x);\n"
-"foreach (any x in arr) do\n"
+"declare anon_flags varchar;\n"
+"whenever not found goto nf_col_or_res;\n"
+"if (what = \'R\')\n"
"{\n"
-"update RDF_SINK_QUEUE set RSQ_STATE = 1 where RSQ_ID = x[1];\n"
-"}\n"
-"commit work;\n"
-"return arr;\n"
+"select RES_NAME, RES_FULL_PATH, RES_OWNER, RES_GROUP, RES_PERMS, RES_ACL into resName, resPath, puid, pgid, pperms, pacl from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
"}\n"
-"--src dav_api.sql:2521\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"
-"if (exists (select 1 from RDF_SINK_QUEUE where RSQ_STATE = 1))\n"
-"return;\n"
-"aq := async_queue (10);\n"
-"for (;;)\n"
-"{\n"
-"arr := RDF_SINK_AQ_GET ();\n"
-"if (not length (arr))\n"
-"return;\n"
-"foreach (any x in arr) do\n"
+"else if (what = \'C\')\n"
"{\n"
-"aq_request (aq, \'DB.DBA.RDF_SINK_FUNC\', vector (x[0], x[1], x[2], x[3], x[4], x[5], x[6]));\n"
+"select COL_OWNER, COL_GROUP, COL_PERMS, COL_ACL into puid, pgid, pperms, pacl from WS.WS.SYS_DAV_COL where COL_ID = id;\n"
"}\n"
-"aq_wait_all (aq);\n"
-"delete from RDF_SINK_QUEUE where RSQ_STATE = 2;\n"
-"commit work;\n"
+"else\n"
+"{\n"
+"return -14;\n"
"}\n"
+"anon_flags := substring (cast (pperms as varchar), 7, 3);\n"
+"allow_anon := WS.WS.PERM_COMP (anon_flags, req);\n"
"}\n"
-"--src dav_api.sql:2536\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"
-"declare rdf_graph_resource_id, rdf_graph_resource_name, rdf_graph_resource_path, host, content any;\n"
-"declare exit handler for sqlstate \'*\'\n"
-"{\n"
-"goto _bad_content;\n"
-"};\n"
-"\n"
-"\n"
-"content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = rc);\n"
-"rdf_sponger := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_sponger\'), \'on\');\n"
-"rdf_cartridges := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_cartridges\'), \'\');\n"
-"rdf_metaCartridges := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_metaCartridges\'), \'\');\n"
"\n"
-"if (RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges))\n"
+"if (a_uid is null)\n"
"{\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"
+"if ((not allow_anon) or (\'\' <> WS.WS.FINDPARAM (a_lines, \'Authorization:\')))\n"
"{\n"
-"\n"
-"host := virtuoso_ini_item_value (\'URIQA\', \'DefaultHost\');\n"
-"if (host is null)\n"
+"rc := WS.WS.GET_DAV_AUTH (a_lines, allow_anon, can_write_http, a_uname, u_password, a_uid, a_gid, _perms);\n"
+"if (rc < 0)\n"
"{\n"
-"host := sys_stat (\'st_host_name\');\n"
-"if (server_http_port () <> \'80\')\n"
-"host := host ||\':\'|| server_http_port ();\n"
+"if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms))\n"
+"{\n"
+"http_rewrite ();\n"
+"return a_uid;\n"
"}\n"
-"rdf_graph_resource_id := WS.WS.GETID (\'R\');\n"
-"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_OWNER, RES_GROUP, RES_PERMS, RES_CR_TIME, RES_MOD_TIME, RES_TYPE, RES_CONTENT)\n"
-"values (rdf_graph_resource_id, rdf_graph_resource_name, c_id, ouid, ogid, \'111101101NN\', now (), now (), \'text/xml\', \'\');\n"
-"DB.DBA.DAV_PROP_SET_INT (rdf_graph_resource_path, \'redirectref\', sprintf (\'http://%s/sparql?default-graph-uri=%U&query=%U&format=%U\', host, rdf_graph, \n"
-"\'CONSTRUCT { ?s ?p ?o} WHERE {?s ?p ?o}\', \'text/xml\'), null, null, 0, 0, 1);\n"
+"\n"
+"return rc;\n"
"}\n"
"}\n"
-"_bad_content:;\n"
-"update RDF_SINK_QUEUE set RSQ_STATE = 2 where RSQ_ID = rc;\n"
-"commit work;\n"
"}\n"
-"--src dav_api.sql:2558\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"
-"in type varchar,\n"
-"in rdf_graph varchar,\n"
-"in rdf_sponger varchar,\n"
-"in rdf_cartridges varchar,\n"
-"in rdf_metaCartridges varchar)\n"
+"if (isinteger (a_uid))\n"
"{\n"
-"declare rdf_iri, rdf_graph2 varchar;\n"
-"declare content any;\n"
-"\n"
-"if (length (_content) = 0)\n"
-"return 0; \n"
-"\n"
-"\n"
-"declare exit handler for sqlstate \'*\' {\n"
-"return 0;\n"
-"};\n"
+"if (a_uid < 0)\n"
+"return a_uid;\n"
"\n"
-"if (path like \'%.zip\')\n"
-"{\n"
-"declare lst, tmp_file, zip_graph any;\n"
-"tmp_file := tmp_file_name ();\n"
-"declare exit handler for sqlstate \'*\' {\n"
-"file_delete (tmp_file, 1);\n"
-"return 0;\n"
-"};\n"
-"zip_graph := \'http://local.virt\' || path;\n"
-"string_to_file (tmp_file, _content, -2);\n"
-"lst := unzip_list (tmp_file);\n"
-"foreach (any x in lst) do\n"
+"if (a_uid = 1)\n"
"{\n"
-"declare fname, item_graph, ss any;\n"
-"ss := string_output ();\n"
-"fname := x[0];\n"
-"content := unzip_file (tmp_file, fname);\n"
-"http_dav_url (fname, null, ss);\n"
-"fname := string_output_string (ss);\n"
-"item_graph := \'http://local.virt\' || path || \'/\' || fname;\n"
-"RDF_SINK_UPLOAD (concat (path, \'/\', fname), content, DAV_GUESS_MIME_TYPE_BY_NAME (fname), rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);\n"
-"SPARQL insert in graph ?:zip_graph { ?s ?p ?o } where { graph `iri(?:item_graph)` { ?s ?p ?o } };\n"
-"SPARQL clear graph ?:item_graph;\n"
-"} \n"
-"file_delete (tmp_file, 1);\n"
-"return 1;\n"
+"a_uid := http_nobody_uid ();\n"
+"a_gid := http_nogroup_gid ();\n"
"}\n"
-"\n"
-"content := _content; \n"
-"if (path like \'%.gz\' and length (_content) > 2)\n"
-"{\n"
-"declare magic, html_start varchar;\n"
-"magic := subseq (_content, 0, 2);\n"
-"html_start := null;\n"
-"if (magic[0] = 0hex1f and magic[1] = 0hex8b) \n"
+"else if (a_uid = http_dav_uid())\n"
"{\n"
-"content := gzip_uncompress (cast (_content as varchar));\n"
-"path := regexp_replace (path, \'\\.gz\\x24\', \'\');\n"
-"type := DAV_GUESS_MIME_TYPE (path, content, html_start); \n"
+"return a_uid;\n"
"}\n"
"}\n"
-"\n"
-"rdf_iri := WS.WS.DAV_IRI (path);\n"
-"rdf_graph2 := \'http://local.virt\' || path;\n"
-"if (\n"
-"strstr (type, \'application/rdf+xml\') is not null or\n"
-"strstr (type, \'application/foaf+xml\') is not null\n"
-")\n"
-"{\n"
+"else\n"
"{\n"
-"declare exit handler for sqlstate \'*\'\n"
+"a_uid := http_nobody_uid ();\n"
+"a_gid := http_nogroup_gid ();\n"
+"_perms := \'110110110--\';\n"
+"}\n"
+"set isolation=\'committed\';\n"
+"if (\'R\' = what and\n"
+"puid <> http_nobody_uid() and\n"
+"exists (select top 1 1 from SYS_USERS where U_ID = puid and U_ACCOUNT_DISABLED = 1 ))\n"
"{\n"
-"goto _grddl;\n"
-"};\n"
-"if (rdf_sponger = \'on\')\n"
+"return -42;\n"
+"}\n"
+"set isolation=\'serializable\';\n"
+"if (DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
"{\n"
-"declare xt any;\n"
"\n"
-"xt := xtree_doc (content);\n"
-"if (xpath_eval (\'[ xmlns:dv=\"http://www.w3.org/2003/g/data-view#\" ] /*[1]/@dv:transformation\', xt) is not null)\n"
-"goto _grddl;\n"
+"return a_uid;\n"
"}\n"
-"DB.DBA.RDF_LOAD_RDFXML (blob_to_string (content), rdf_graph2, rdf_graph2);\n"
+"if (WS.WS.ACL_IS_GRANTED (pacl, a_uid, DAV_REQ_CHARS_TO_BITMASK (req)))\n"
+"{\n"
+"\n"
+"return a_uid;\n"
"}\n"
-"goto _exit;\n"
+"\n"
+"\n"
+"return -13;\n"
+"\n"
+"nf_col_or_res:\n"
+"\n"
+"return -1;\n"
"}\n"
-"if (\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"
-"strstr (type, \'application/rdf+turtle\') is not null or\n"
-"strstr (type, \'application/turtle\') is not null or\n"
-"strstr (type, \'application/x-turtle\') is not null\n"
-")\n"
-"{\n"
+"--src dav_api.sql:1653\n";
+
+static const char *proc114 =
+"#line 1771 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_AUTHENTICATE_SSL_ITEM (\n"
+"inout id any,\n"
+"inout what char(1),\n"
+"inout path varchar) returns integer\n"
"{\n"
-"declare exit handler for sqlstate \'*\'\n"
+"declare pos integer;\n"
+"\n"
+"if (isnull (path))\n"
+"path := DAV_SEARCH_PATH (id, what);\n"
+"\n"
+"if (isstring (path) and path like \'%,acl\')\n"
"{\n"
-"goto _grddl;\n"
-"};\n"
-"DB.DBA.TTLP (blob_to_string (content), rdf_graph2, rdf_graph2);\n"
+"path := regexp_replace (path, \',acl\\x24\', \'\');\n"
+"pos := strrchr (path, \'/\');\n"
+"if (not isnull (pos))\n"
+"what := \'C\';\n"
+"id := DAV_SEARCH_ID (path, what);\n"
"}\n"
-"goto _exit;\n"
"}\n"
+"--src dav_api.sql:1769\n";
+
+static const char *proc115 =
+"#line 1793 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_AUTHENTICATE_SSL_CONDITION () returns integer\n"
+"{\n"
+"if (is_https_ctx () and (__proc_exists (\'SIOC.DBA.get_graph\') is not null))\n"
+"return 1;\n"
"\n"
-"_grddl:;\n"
-"if (rdf_sponger = \'on\')\n"
+"return 0;\n"
+"}\n"
+"--src dav_api.sql:1791\n";
+
+static const char *proc116 =
+"#line 1805 \"[executable]/dav_api.sql\"\n"
+"create function DAV_WEBID_QR (in gr varchar, in uri varchar)\n"
"{\n"
-"declare rc, rcMeta integer;\n"
-"declare ret_body varchar;\n"
-"declare exit handler for sqlstate \'*\'\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"
-"goto _exit;\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:1803\n";
+
+static const char *proc117 =
+"#line 1826 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_AUTHENTICATE_SSL_WEBID ()\n"
+"{\n"
+"declare webid varchar;\n"
+"declare cert, dummy, vtype any;\n"
"\n"
-"ret_body := cast (content as varchar);\n"
+"webid := null;\n"
+"if (__proc_exists (\'DB.DBA.WEBID_AUTH_GEN_2\') is not null)\n"
+"{\n"
+"cert := client_attr (\'client_certificate\');\n"
+"dummy := null;\n"
"\n"
-"rc := RDF_SINK_UPLOAD_CARTRIDGES (ret_body, type, \'select RM_ID, RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_OPTIONS from DB.DBA.SYS_RDF_MAPPERS where RM_ENABLED = 1 order by RM_ID\', rdf_iri, rdf_graph2, rdf_cartridges);\n"
"\n"
-"rcMeta := RDF_SINK_UPLOAD_CARTRIDGES (ret_body, type, \'select MC_ID, MC_PATTERN, MC_TYPE, MC_HOOK, MC_KEY, MC_OPTIONS from DB.DBA.RDF_META_CARTRIDGES where MC_ENABLED = 1 order by MC_SEQ, MC_ID\', rdf_iri, rdf_graph2, rdf_metaCartridges);\n"
-"if (rc or rcMeta)\n"
-"goto _exit;\n"
-"}\n"
-"return 0;\n"
"\n"
-"_exit:\n"
-"SPARQL insert in graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };\n"
-"return 1;\n"
+"DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 0, webid, dummy, 0, vtype);\n"
"}\n"
-"--src dav_api.sql:2601\n";
+"return webid;\n"
+"}\n"
+"--src dav_api.sql:1824\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"
-"in S varchar,\n"
-"in rdf_iri varchar,\n"
-"in rdf_graph varchar,\n"
-"in rdf_cartridges varchar)\n"
+static const char *proc118 =
+"#line 1846 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_AUTHENTICATE_SSL (\n"
+"in id any,\n"
+"in what char(1),\n"
+"in path varchar,\n"
+"in req varchar,\n"
+"inout a_uid integer,\n"
+"inout a_gid integer,\n"
+"inout _perms varchar) returns integer\n"
"{\n"
-"declare cnt, hasSelection integer;\n"
-"declare cname, pname varchar;\n"
-"declare cartridges, aq, ps any;\n"
-"declare xrc, val_match any;\n"
-"declare st, msg, meta, rows, opts any;\n"
+"declare rc, M, N, L, I integer;\n"
+"declare graph, grpGraph, foafIRI, reqMode, realMode, IRIs any;\n"
+"declare tmp, T, V, S, st, msg, meta, row, rows any;\n"
"\n"
-"st := \'00000\';\n"
-"exec (S, st, msg, vector (), vector (\'use_cache\', 1), meta, rows);\n"
-"if (\'00000\' <> st)\n"
-"return 0;\n"
+"rc := 0;\n"
+"req := replace (req, \'_\', \'0\');\n"
+"reqMode := vector (req[0]-48, req[1]-48, req[2]-48);\n"
+"realMode := vector (0, 0, 0);\n"
+"IRIs := vector (vector(), vector(), vector());\n"
+"DAV_AUTHENTICATE_SSL_ITEM (id, what, path);\n"
+"if (not DAV_AUTHENTICATE_SSL_CONDITION ())\n"
+"goto _exit;\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"
+"set_user_id (\'dba\');\n"
+"foafIRI := null;\n"
+"tmp := \'/\';\n"
+"V := vector ();\n"
+"T := split_and_decode (trim (path, \'/\'), 0, \'\\0\\0/\');\n"
+"for (N := 0; N < length (T)-1; N := N + 1)\n"
"{\n"
-"cname := cast (row[0] as varchar);\n"
-"if (hasSelection)\n"
+"tmp := tmp || T[N] || \'/\';\n"
+"V := vector_concat (vector (tmp), V);\n"
+"}\n"
+"V := vector_concat (vector (path), V);\n"
+"grpGraph := SIOC.DBA.get_graph () || \'/private/%\';\n"
+"for (N := 0; N < length (V); N := N + 1)\n"
"{\n"
-"if (position (cname, cartridges))\n"
-"goto _try;\n"
-"\n"
-"goto _try_next;\n"
+"if (N <> 0)\n"
+"{\n"
+"what := \'C\';\n"
+"id := DAV_SEARCH_ID (V[N], what);\n"
"}\n"
-"\n"
-"_try:\n"
-"val_match := case when (row[2] = \'MIME\') then type else rdf_graph end;\n"
-"if (isstring (val_match) and regexp_match (row[1], val_match) is not null)\n"
+"if (isinteger (id) and exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = id and PROP_TYPE = what and PROP_NAME = \'virt:aci_meta_n3\'))\n"
"{\n"
-"pname := row[3];\n"
-"if (__proc_exists (pname) is null)\n"
-"goto _try_next;\n"
-"\n"
-"declare exit handler for sqlstate \'*\'\n"
+"tmp := null;\n"
+"if (isnull (foafIRI))\n"
"{\n"
-"goto _try_next;\n"
-"};\n"
-"opts := vector_concat (vector (), row[5]);\n"
-"xrc := call (pname) (rdf_graph, rdf_iri, null, content, aq, ps, row[4], opts);\n"
-"\n"
-"\n"
-"if (not hasSelection and (__tag (xrc) = 193 or xrc < 0 or xrc > 0))\n"
-"return 1;\n"
+"foafIRI := DB.DBA.DAV_AUTHENTICATE_SSL_WEBID ();\n"
+"if (isnull (foafIRI))\n"
+"goto _exit;\n"
"}\n"
-"_try_next:;\n"
+"graph := WS.WS.DAV_IRI (V[N]);\n"
+"for (\n"
+"sparql\n"
+"define input:storage \"\"\n"
+"prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
+"prefix foaf: <http://xmlns.com/foaf/0.1/>\n"
+"prefix acl: <http://www.w3.org/ns/auth/acl#>\n"
+"select ?p1 ?p2 ?p3 ?mode\n"
+"where {\n"
+"{\n"
+"graph `iri(?:graph)`\n"
+"{\n"
+"?rule rdf:type acl:Authorization ;\n"
+"acl:accessTo `iri(?:graph)` ;\n"
+"acl:mode ?mode ;\n"
+"acl:agent `iri(?:foafIRI)` ;\n"
+"acl:agent ?p1 .\n"
"}\n"
-"return 1;\n"
"}\n"
-"--src dav_api.sql:2732\n";
-
-static const char *proc126 =
-"#line 2793 \"[executable]/dav_api.sql\"\n"
-"create procedure RDF_SINK_DELETE (\n"
-"in path any)\n"
+"union\n"
"{\n"
-"declare c_id, _col_p_id, _inherit, depth integer;\n"
-"declare rdf_graph, rdf_graph2 any;\n"
+"graph `iri(?:graph)`\n"
+"{\n"
+"?rule rdf:type acl:Authorization ;\n"
+"acl:accessTo `iri(?:graph)` ;\n"
+"acl:mode ?mode ;\n"
+"acl:agentClass foaf:Agent ;\n"
+"acl:agentClass ?p2 .\n"
+"}\n"
+"}\n"
+"union\n"
+"{\n"
+"graph `iri(?:graph)`\n"
+"{\n"
+"?rule rdf:type acl:Authorization ;\n"
+"acl:accessTo `iri(?:graph)` ;\n"
+"acl:mode ?mode ;\n"
+"acl:agentClass ?p3 .\n"
+"}\n"
+"graph ?g\n"
+"{\n"
+"?p3 rdf:type foaf:Group ;\n"
+"foaf:member `iri(?:foafIRI)` .\n"
+"filter (?g like (?:grpGraph)) .\n"
+"}\n"
+"}\n"
+"}\n"
+"order by ?p3 ?p2 ?p1 ?mode) do\n"
+"{\n"
+"if (not isnull (\"p1\"))\n"
+"I := 0;\n"
+"else if (not isnull (\"p2\"))\n"
+"I := 1;\n"
+"else if (not isnull (\"p3\"))\n"
+"I := 2;\n"
+"else\n"
+"goto _skip;\n"
"\n"
-"c_id := DB.DBA.DAV_SEARCH_ID (subseq (path, 0, strrchr (path, \'/\') + 1), \'C\');\n"
-"if (not isinteger (c_id) or (c_id < 0))\n"
-"return;\n"
+"if (tmp <> coalesce (\"p1\", coalesce (\"p2\", \"p3\")))\n"
+"{\n"
+"tmp := coalesce (\"p1\", coalesce (\"p2\", \"p3\"));\n"
+"for (M := 0; M < length (IRIs[I]); M := M + 1)\n"
+"{\n"
+"if (tmp = IRIs[I][M])\n"
+"goto _skip;\n"
+"}\n"
+"}\n"
+"\n"
+"if (\"mode\" like \'%#Read\')\n"
+"realMode[0] := 1;\n"
+"else if (\"mode\" like \'%#Write\')\n"
+"realMode[1] := 1;\n"
+"else if (\"mode\" like \'%#Execute\')\n"
+"realMode[2] := 1;\n"
"\n"
-"rdf_graph := null; \n"
-"depth := 0; \n"
+"if ((reqMode[0] <= realMode[0]) and (reqMode[1] <= realMode[1]) and (reqMode[2] <= realMode[2]))\n"
"{\n"
-"whenever not found goto rdfg_found;\n"
-"look_again: \n"
-"select COL_PARENT, COL_INHERIT into _col_p_id, _inherit from WS.WS.SYS_DAV_COL where COL_ID = c_id;\n"
-"rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_graph\');\n"
-"if ((_inherit = \'R\' or (depth = 1 and _inherit = \'M\') or depth = 0) and length (rdf_graph))\n"
-"goto rdfg_found;\n"
-"c_id := _col_p_id;\n"
-"depth := depth + 1;\n"
-"rdf_graph := null;\n"
-"goto look_again;\n"
+"a_uid := http_nobody_uid ();\n"
+"a_gid := http_nogroup_gid ();\n"
+"rc := 1;\n"
+"goto _exit;\n"
"}\n"
-"rdfg_found:; \n"
+"IRIs[I] := vector_concat (IRIs[I], vector (tmp));\n"
"\n"
-"if (DB.DBA.is_empty_or_null (rdf_graph))\n"
-"return;\n"
+"_skip:;\n"
+"}\n"
+"}\n"
+"}\n"
"\n"
-"if (path like \'%.gz\')\n"
-"path := regexp_replace (path, \'\\.gz\\x24\', \'\');\n"
-"rdf_graph2 := \'http://local.virt\' || path;\n"
-"SPARQL delete from graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };\n"
-"SPARQL clear graph ?:rdf_graph2;\n"
+"_exit:;\n"
+"_perms := replace (sprintf (\'%d%d%d\', realMode[0], realMode[1], realMode[2]), \'0\', \'_\');\n"
+"\n"
+"return rc;\n"
"}\n"
-"--src dav_api.sql:2791\n";
+"--src dav_api.sql:1844\n";
-static const char *proc127 =
-"#line 2831 \"[executable]/dav_api.sql\"\n"
+static const char *proc119 =
+"#line 1995 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
-"DAV_DELETE (\n"
+"DAV_COL_CREATE (\n"
"in path varchar,\n"
-"in silent integer := 0,\n"
-"in auth_uname varchar,\n"
-"in auth_pwd varchar\n"
-")\n"
+"in permissions varchar := \'110100000RR\',\n"
+"in uid varchar := \'dav\',\n"
+"in gid varchar := \'administrators\',\n"
+"in auth_uid varchar := NULL,\n"
+"in auth_pwd varchar := NULL)\n"
"{\n"
-"return DAV_DELETE_INT (path, silent, auth_uname, auth_pwd);\n"
+"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:2829\n";
+"--src dav_api.sql:1993\n";
-static const char *proc128 =
-"#line 2843 \"[executable]/dav_api.sql\"\n"
+static const char *proc120 =
+"#line 2009 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
-"DAV_DELETE_INT (\n"
+"DAV_COL_CREATE_INT (\n"
"in path varchar,\n"
-"in silent integer := 0,\n"
+"in permissions varchar,\n"
+"in uid varchar,\n"
+"in gid varchar,\n"
"in auth_uname varchar,\n"
"in auth_pwd varchar,\n"
-"in extern integer := 1,\n"
-"in check_locks any := 1 )\n"
+"in return_error_if_already_exists integer,\n"
+"in extern integer,\n"
+"in check_locks any,\n"
+"in ouid integer := null,\n"
+"in ogid integer := null )\n"
"{\n"
-"declare id, rc integer;\n"
-"declare ty char;\n"
-"declare auth_uid integer;\n"
+"declare pid, puid, pgid, rc integer;\n"
+"declare pperms, name, det varchar;\n"
"declare par any;\n"
-"whenever sqlstate \'HT508\' goto disabled_owner;\n"
-"whenever sqlstate \'HT509\' goto disabled_home;\n"
"\n"
+"rc := 0;\n"
"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"if (aref (par, 0) <> \'\')\n"
+"\n"
+"if (aref (par, 0) <> \'\' or aref (par, length (par) - 1) <> \'\')\n"
"return -1;\n"
-"if (aref (par, length (par) - 1) = \'\')\n"
-"ty := \'C\';\n"
-"else\n"
-"ty := \'R\';\n"
-"id := DAV_SEARCH_ID (par, ty);\n"
-"if (isinteger (id) and (0 > id))\n"
-"return (case when silent then 1 else id end);\n"
"\n"
-"if (extern)\n"
+"if (DAV_HIDE_ERROR ((pid := DAV_SEARCH_ID (path, \'P\'))) is null)\n"
+"return pid;\n"
+"\n"
+"if (extern and 0 > (rc := DAV_AUTHENTICATE (pid, \'C\', \'11_\', auth_uname, auth_pwd)))\n"
"{\n"
-"auth_uid := DAV_AUTHENTICATE (id, ty, \'11_\', auth_uname, auth_pwd);\n"
-"if (auth_uid < 0)\n"
-"return (case when silent then 1 else auth_uid end);\n"
-"}\n"
-"else\n"
-"auth_uid := http_nobody_uid ();\n"
-"if (check_locks and (0 <> (rc := DAV_IS_LOCKED (id, ty, check_locks))))\n"
-"return rc;\n"
"\n"
-"if (isarray (id))\n"
-"{\n"
-"declare det varchar;\n"
-"declare detcol_id, detcol_path, unreached_path any;\n"
-"DAV_SEARCH_ID_OR_DET (par, ty, det, detcol_id, detcol_path, unreached_path);\n"
-"return call (cast (det as varchar) || \'_DAV_DELETE\') (detcol_id, unreached_path, ty, silent, auth_uid);\n"
+"return rc;\n"
"}\n"
-"\n"
-"if (ty = \'R\')\n"
+"if (DAV_HIDE_ERROR (DAV_SEARCH_ID (subseq (par, 0, length (par) - 1), \'R\')) is not null)\n"
"{\n"
-"delete from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
-"RDF_SINK_DELETE (path);\n"
+"\n"
+"return -25;\n"
"}\n"
-"else if (ty = \'C\')\n"
-"{\n"
-"declare rrc integer;\n"
-"for select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = id do\n"
-"{\n"
-"rrc := DAV_DELETE_INT (RES_FULL_PATH, silent, auth_uname, auth_pwd, extern);\n"
-"if (rrc <> 1)\n"
+"if ((0 = return_error_if_already_exists) and (rc := DAV_HIDE_ERROR (DAV_SEARCH_ID (path, \'C\'))) is not null)\n"
"{\n"
-"rollback work;\n"
-"return rrc;\n"
+"\n"
+"return rc;\n"
"}\n"
+"if (check_locks and 0 <> (rc := DAV_IS_LOCKED (pid , \'C\', check_locks)))\n"
+"{\n"
+"\n"
+"return rc;\n"
"}\n"
-"for select COL_ID from WS.WS.SYS_DAV_COL where COL_PARENT = id do\n"
+"\n"
+"if (isarray (pid))\n"
+"det := pid[0];\n"
+"else if ((pid > 0) and (connection_get (\'dav_store\') is null))\n"
+"det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=pid), NULL);\n"
+"else\n"
+"det := null;\n"
+"if (det is not null)\n"
"{\n"
-"rrc := DAV_DELETE_INT (WS.WS.COL_PATH(COL_ID), silent, auth_uname, auth_pwd, extern);\n"
-"if (rrc <> 1)\n"
+"declare auth_uid integer;\n"
+"declare detcol_id integer;\n"
+"declare detcol_path, unreached_path any;\n"
+"if (extern)\n"
"{\n"
-"rollback work;\n"
-"return rrc;\n"
-"}\n"
+"auth_uid := DAV_AUTHENTICATE (pid, \'C\', \'11_\', auth_uname, auth_pwd);\n"
+"if (0 > auth_uid)\n"
+"return auth_uid;\n"
"}\n"
-"delete from WS.WS.SYS_DAV_COL where COL_ID = id;\n"
+"else\n"
+"auth_uid := http_nobody_uid ();\n"
+"DAV_SEARCH_ID_OR_DET (par, \'C\', det, detcol_id, detcol_path, unreached_path);\n"
+"return call (cast (det as varchar) || \'_DAV_COL_CREATE\') (detcol_id, unreached_path, permissions, ouid, ogid, auth_uid);\n"
"}\n"
-"else if (not silent)\n"
-"return -1;\n"
-"return 1;\n"
+"name := aref (par, length (par) - 2);\n"
+"rc := WS.WS.GETID (\'C\');\n"
+"if (ouid is null)\n"
+"DAV_OWNER_ID (uid, gid, ouid, ogid);\n"
"\n"
-"disabled_owner:\n"
-"return -42;\n"
-"disabled_home:\n"
-"return -43;\n"
-"}\n"
-"--src dav_api.sql:2841\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"
+"declare exit handler for sqlstate \'*\' { rc := -3; };\n"
"{\n"
-"whenever sqlstate \'42001\' goto unsupported;\n"
-"return call (cast (id[0] as varchar) || \'_DAV_TAG_LIST\')(id, st, uid_list);\n"
-"unsupported:\n"
-"return -20;\n"
+"\n"
+"insert soft WS.WS.SYS_DAV_COL (COL_ID, COL_NAME, COL_PARENT,\n"
+"COL_OWNER, COL_GROUP, COL_PERMS,\n"
+"COL_CR_TIME, COL_MOD_TIME)\n"
+"values (rc, name, pid, ouid, ogid, permissions, now(), now ());\n"
+"if (not row_count())\n"
+"rc := -3;\n"
"}\n"
-"if (\'R\' <> st)\n"
-"return vector ();\n"
-"if (uid_list is null)\n"
-"return (select VECTOR_AGG (vector (DT_U_ID, DT_TAGS)) from Ws.WS.SYS_DAV_TAG where DT_RES_ID = id);\n"
-"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"
+"return rc;\n"
"}\n"
-"--src dav_api.sql:2927\n";
+"--src dav_api.sql:2007\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"
-"return -18;\n"
-"if (\'R\' <> st)\n"
-"return -14;\n"
-"if (exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = uid))\n"
+static const char *proc121 =
+"#line 2099 \"[executable]/dav_api.sql\"\n"
+"create procedure DB.DBA.IS_REDIRECT_REF (inout path any)\n"
"{\n"
-"update WS.WS.SYS_DAV_TAG set DT_TAGS = tags where DT_RES_ID = id and DT_U_ID = uid;\n"
-"}\n"
-"else\n"
+"for (select blob_to_string (PROP_VALUE) redirectRef\n"
+"from WS.WS.SYS_DAV_RES,\n"
+"WS.WS.SYS_DAV_PROP\n"
+"where RES_FULL_PATH = path\n"
+"and PROP_PARENT_ID = RES_ID\n"
+"and PROP_NAME = \'redirectref\'\n"
+"and PROP_TYPE = \'R\') do\n"
"{\n"
-"insert into WS.WS.SYS_DAV_TAG (DT_RES_ID, DT_U_ID, DT_FT_ID, DT_TAGS)\n"
-"values (id, uid, WS.WS.GETID (\'T\'), tags);\n"
+"path := redirectRef;\n"
+"return 1;\n"
"}\n"
+"\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:2945\n";
+"--src dav_api.sql:2097\n";
-static const char *proc131 =
-"#line 2968 \"[executable]/dav_api.sql\"\n"
+static const char *proc122 =
+"#line 2119 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
-"DAV_COPY (in path varchar,\n"
-"in destination varchar,\n"
-"in overwrite integer := 0,\n"
+"DAV_RES_UPLOAD (\n"
+"in path varchar,\n"
+"in content any,\n"
+"in type varchar := \'\',\n"
"in permissions varchar := \'110100000RR\',\n"
"in uid varchar := \'dav\',\n"
"in gid varchar := \'administrators\',\n"
-"in auth_uname varchar,\n"
-"in auth_pwd varchar)\n"
+"in auth_uid varchar := null, in auth_pwd varchar := null, in check_locks any := 1)\n"
"{\n"
-"return DAV_COPY_INT (path, destination, overwrite, permissions, uid, gid, auth_uname, auth_pwd, 1);\n"
+"if (not (isstring (check_locks)))\n"
+"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:2966\n";
+"--src dav_api.sql:2117\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"
-"in overwrite integer := 0,\n"
+static const char *proc123 =
+"#line 2136 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_RES_UPLOAD_STRSES (\n"
+"in path varchar,\n"
+"inout content any,\n"
+"in type varchar := \'\',\n"
"in permissions varchar := \'110100000RR\',\n"
"in uid varchar := \'dav\',\n"
"in gid varchar := \'administrators\',\n"
-"in auth_uname varchar,\n"
-"in auth_pwd varchar,\n"
+"in auth_uid varchar := null, in auth_pwd varchar := null, in check_locks any := 1)\n"
+"{\n"
+"if (not (isstring (check_locks)))\n"
+"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:2134\n";
+
+static const char *proc124 =
+"#line 2152 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_RES_UPLOAD_STRSES_INT (\n"
+"in path varchar,\n"
+"inout content any,\n"
+"in type varchar := \'\',\n"
+"in permissions varchar := \'110100000RR\',\n"
+"in uid any := \'dav\',\n"
+"in gid any := \'administrators\',\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null,\n"
"in extern integer := 1,\n"
-"in check_locks any := 1,\n"
+"in cr_time datetime := null,\n"
+"in mod_time datetime := null,\n"
+"in _rowguid varchar := null,\n"
"in ouid integer := null,\n"
-"in ogid integer := null )\n"
+"in ogid integer := null,\n"
+"in check_locks any := 1\n"
+")\n"
"{\n"
-"declare id, d_id, dp_id, rc integer;\n"
-"declare auth_uid integer;\n"
-"declare st, dp_det char;\n"
-"declare sar, dar, prop_list, tag_list any;\n"
-"whenever sqlstate \'HT507\' goto insufficient_storage;\n"
-"whenever sqlstate \'HT508\' goto disabled_owner;\n"
-"whenever sqlstate \'HT509\' goto disabled_home;\n"
+"declare rc, old_log_mode, new_log_mode any;\n"
+"old_log_mode := log_enable (null);\n"
"\n"
-"if (IS_REDIRECT_REF(path))\n"
+"new_log_mode := bit_and (old_log_mode, 1);\n"
+"old_log_mode := log_enable (bit_or (new_log_mode, 4), 1);\n"
+"rc := DAV_RES_UPLOAD_STRSES_INT_INNER (path, content, type, permissions, uid, gid, auth_uname, auth_pwd, extern, cr_time, mod_time, _rowguid, ouid, ogid, check_locks);\n"
+"log_enable (bit_or (old_log_mode, 4), 1);\n"
+"return rc;\n"
+"}\n"
+"--src dav_api.sql:2150\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 2187 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_RES_UPLOAD_STRSES_INT_INNER (\n"
+"in path varchar,\n"
+"inout content any,\n"
+"in type varchar := \'\',\n"
+"in permissions varchar := \'110100000RR\',\n"
+"in uid any := \'dav\',\n"
+"in gid any := \'administrators\',\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null,\n"
+"in extern integer := 1,\n"
+"in cr_time datetime := null,\n"
+"in mod_time datetime := null,\n"
+"in _rowguid varchar := null,\n"
+"in ouid integer := null,\n"
+"in ogid integer := null,\n"
+"in check_locks any := 1\n"
+")\n"
+"{\n"
+"declare auth_uid, pid, puid, pgid, rc, id integer;\n"
+"declare pperms, name varchar;\n"
+"declare par any;\n"
+"declare op char;\n"
+"declare det varchar;\n"
+"declare detcol_id, _is_xper_res, fake integer;\n"
+"declare detcol_path, unreached_path any;\n"
+"declare res_cr cursor for select RES_ID+1 from WS.WS.SYS_DAV_RES where RES_ID = id for update;\n"
+"declare auto_version varchar;\n"
+"declare locked int;\n"
+"\n"
+"\n"
+"if (IS_REDIRECT_REF (path))\n"
"{\n"
"\n"
" ;\n"
"}\n"
+"locked := 0;\n"
+"op := \'i\';\n"
+"rc := 0;\n"
+"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
"\n"
-"sar := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"dar := split_and_decode (destination, 0, \'\\0\\0/\');\n"
-"\n"
+"if (aref (par, 0) <> \'\' or aref (par, length (par) - 1) = \'\')\n"
+"{\n"
"\n"
-"if (aref (sar, 0) <> \'\')\n"
"return -1;\n"
-"if (aref (sar, length (sar) - 1) = \'\')\n"
-"st := \'C\';\n"
-"else\n"
-"st := \'R\';\n"
-"\n"
-"if (aref (dar, 0) <> \'\')\n"
-"return -2;\n"
-"if (aref (dar, length (dar) - 1) = \'\')\n"
-"{\n"
-"if (st = \'R\')\n"
-"{\n"
-"destination := concat (destination, sar[length (sar)-1]);\n"
-"dar := split_and_decode (destination, 0, \'\\0\\0/\');\n"
"}\n"
-"}\n"
-"else\n"
-"{\n"
-"if (st = \'C\')\n"
-"return -4;\n"
-"}\n"
-"id := DAV_SEARCH_ID (sar, st);\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
-"return id;\n"
+"if (ouid is null)\n"
+"DAV_OWNER_ID (uid, gid, ouid, ogid);\n"
"\n"
-"dp_id := DAV_SEARCH_ID (dar, \'P\');\n"
-"d_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (dar, st));\n"
-"if (d_id is null)\n"
-"{\n"
-"if (DAV_HIDE_ERROR (dp_id) is null)\n"
-"return -2;\n"
-"}\n"
-"else\n"
-"{\n"
-"dp_id := DAV_SEARCH_ID (dar, \'P\');\n"
-"}\n"
-"if (d_id is not null and not overwrite)\n"
-"return -3;\n"
"\n"
-"if (d_id is not null and id = d_id)\n"
-"return -2;\n"
"\n"
"\n"
-"if (ouid is null)\n"
-"DAV_OWNER_ID (uid, gid, ouid, ogid);\n"
"\n"
"\n"
-"if (extern)\n"
+"id := DAV_SEARCH_ID (path, \'R\');\n"
+"\n"
+"if (isarray (id))\n"
"{\n"
-"if (0 > (auth_uid := DAV_AUTHENTICATE (id, st, \'1__\', auth_uname, auth_pwd)))\n"
-"return auth_uid;\n"
-"if (d_id is not null)\n"
+"if (extern)\n"
"{\n"
-"if (0 > (auth_uid := DAV_AUTHENTICATE (d_id, st, \'11_\', auth_uname, auth_pwd)))\n"
-"return auth_uid;\n"
-"}\n"
-"if (0 > (auth_uid := DAV_AUTHENTICATE (dp_id, \'C\', \'11_\', auth_uname, auth_pwd)))\n"
+"\n"
+"auth_uid := DAV_AUTHENTICATE (id, \'R\', \'11_\', auth_uname, auth_pwd);\n"
+"if ((auth_uid < 0) and (auth_uid <> -1))\n"
"return auth_uid;\n"
"}\n"
"else\n"
"auth_uid := ouid;\n"
-"\n"
-"if ((\'C\' = st) and DAV_HIDE_ERROR (DAV_SEARCH_ID (subseq (dar, 0, length (dar) - 1), \'R\')) is not null)\n"
+"if (check_locks)\n"
"{\n"
+"rc := DAV_IS_LOCKED (id , \'R\', check_locks);\n"
+"if (0 <> rc)\n"
+"return rc;\n"
+"}\n"
+"DAV_SEARCH_ID_OR_DET (par, \'R\', det, detcol_id, detcol_path, unreached_path);\n"
+"rc := call (cast (det as varchar) || \'_DAV_RES_UPLOAD\') (detcol_id, unreached_path, content, type, permissions, ouid, ogid, auth_uid);\n"
"\n"
-"return -25;\n"
+"return rc;\n"
"}\n"
-"if ((\'R\' = st) and DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (dar, vector (\'\')), \'C\')) is not null)\n"
+"if (0 > id)\n"
+"{\n"
+"pid := DAV_SEARCH_ID (path, \'P\');\n"
+"if (isarray (pid))\n"
+"det := pid[0];\n"
+"else if (pid > 0)\n"
+"det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=pid and connection_get (\'dav_store\') is null), NULL);\n"
+"else\n"
"{\n"
"\n"
-"return -26;\n"
+"return pid;\n"
"}\n"
-"if ((\'C\' = st) and destination between path and DAV_COL_PATH_BOUNDARY (path))\n"
-"return -30;\n"
-"\n"
-"declare auto_version varchar;\n"
-"if (st = \'R\')\n"
-"auto_version := DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT(d_id, \'R\', \'DAV:auto-version\', 0));\n"
-"else\n"
-"auto_version := NULL;\n"
-"if (check_locks)\n"
+"if (extern)\n"
"{\n"
-"if (auto_version <> \'DAV:locked-checkout\')\n"
+"\n"
+"auth_uid := DAV_AUTHENTICATE (pid, \'C\', \'11_\', auth_uname, auth_pwd);\n"
+"if (auth_uid < 0)\n"
"{\n"
-"if (0 <> (rc := DAV_IS_LOCKED (id , st, check_locks)))\n"
-"return rc;\n"
-"if (d_id is null)\n"
-"rc := DAV_IS_LOCKED (dp_id , \'C\', check_locks);\n"
-"else\n"
-"rc := DAV_IS_LOCKED (d_id , st, check_locks);\n"
-"if (0 <> rc)\n"
-"return (case when rc = -8 then -9 else rc end);\n"
+"\n"
+"return auth_uid;\n"
+"}\n"
"}\n"
"else\n"
+"auth_uid := ouid;\n"
+"if (check_locks)\n"
"{\n"
-"rc := DAV_IS_LOCKED (d_id , st, check_locks);\n"
-"if (rc = -8)\n"
-"{\n"
-"rc := DAV_CHECKOUT_INT (d_id, null, null, 0);\n"
-"if (rc < 0)\n"
+"rc := DAV_IS_LOCKED (pid , \'C\', check_locks);\n"
+"if (0 <> rc)\n"
"return rc;\n"
"}\n"
-"else if (0 <> rc)\n"
+"set isolation=\'committed\';\n"
+"if ( auth_uid <> http_nobody_uid() and\n"
+"(http_dav_uid () <> coalesce (connection_get (\'DAVBillingUserID\'), -12)) and\n"
+"exists (select top 1 1 from SYS_USERS\n"
+"where U_ID = auth_uid and U_ACCOUNT_DISABLED = 1 ) )\n"
+"return -42;\n"
+"set isolation=\'serializable\';\n"
+"if (det is not null)\n"
+"{\n"
+"DAV_SEARCH_ID_OR_DET (par, \'R\', det, detcol_id, detcol_path, unreached_path);\n"
+"rc := call (cast (det as varchar) || \'_DAV_RES_UPLOAD\') (detcol_id, unreached_path, content, type, permissions, ouid, ogid, auth_uid);\n"
+"\n"
"return rc;\n"
"}\n"
+"name := aref (par, length (par) - 1);\n"
+"rc := WS.WS.GETID (\'R\');\n"
+"op := \'i\';\n"
+"if (cr_time is null)\n"
+"cr_time := now();\n"
"}\n"
-"\n"
-"if (isarray (dp_id))\n"
-"dp_det := dp_id[0];\n"
"else\n"
-"dp_det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=dp_id), NULL);\n"
-"if (dp_det is not null)\n"
-"{\n"
-"declare detcol_id integer;\n"
-"declare detcol_path, unreached_path any;\n"
-"DAV_SEARCH_ID_OR_DET (dar, st, dp_det, detcol_id, detcol_path, unreached_path);\n"
-"return call (cast (dp_det as varchar) || \'_DAV_RES_UPLOAD_COPY\') (detcol_id, unreached_path, id, st, overwrite, permissions, ouid, ogid, auth_uid);\n"
-"}\n"
-"\n"
-"if (st = \'R\')\n"
-"{\n"
-"declare newid integer;\n"
-"if (d_id is not null)\n"
"{\n"
-"if (isarray (id))\n"
+"open res_cr (exclusive, prefetch 1);\n"
+"fetch res_cr into fake;\n"
+"if (extern)\n"
"{\n"
-"declare rt varchar;\n"
-"declare rcnt any;\n"
-"rcnt := string_output ();\n"
-"rc := call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, rcnt, rt, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"update WS.WS.SYS_DAV_RES set RES_CONTENT = rcnt, RES_TYPE = rt, RES_OWNER = ouid,\n"
-"RES_GROUP = ogid, RES_PERMS = permissions, RES_MOD_TIME = now ()\n"
-"where RES_ID = d_id;\n"
-"}\n"
-"else\n"
-"for select RES_TYPE as rt, RES_CONTENT as rcnt from WS.WS.SYS_DAV_RES where RES_ID = id do\n"
+"\n"
+"auth_uid := DAV_AUTHENTICATE (id, \'R\', \'11_\', auth_uname, auth_pwd);\n"
+"if (auth_uid < 0)\n"
"{\n"
-"update WS.WS.SYS_DAV_RES set RES_CONTENT = rcnt, RES_TYPE = rt, RES_OWNER = ouid,\n"
-"RES_GROUP = ogid, RES_PERMS = permissions, RES_MOD_TIME = now ()\n"
-"where RES_ID = d_id;\n"
+"\n"
+"return auth_uid;\n"
"}\n"
-"newid := d_id;\n"
"}\n"
"else\n"
+"auth_uid := ouid;\n"
+"auto_version := DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT(DAV_SEARCH_ID (path, \'R\'), \'R\', \'DAV:auto-version\', 0));\n"
+"if (check_locks)\n"
"{\n"
-"declare rname varchar;\n"
-"rname := aref (dar, length (dar)-1);\n"
-"if (rname = \'\')\n"
-"return -2;\n"
-"newid := WS.WS.GETID (\'R\');\n"
-"if (isarray (id))\n"
-"{\n"
-"declare rt varchar;\n"
-"declare rcnt any;\n"
-"rcnt := string_output ();\n"
-"rc := call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, rcnt, rt, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_FULL_PATH,\n"
-"RES_OWNER, RES_GROUP, RES_PERMS,\n"
-"RES_CR_TIME, RES_MOD_TIME,\n"
-"RES_TYPE, RES_CONTENT)\n"
-"values (newid, rname, dp_id, destination, ouid, ogid, permissions, now(), now (), rt, rcnt);\n"
-"}\n"
+"rc := DAV_IS_LOCKED (id , \'R\', check_locks);\n"
+"if (rc < 0)\n"
+"locked := 1;\n"
"else\n"
-"for select RES_TYPE as rt, RES_CONTENT as rcnt, RES_NAME as mname from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = id do\n"
+"locked := 0;\n"
+"if (auto_version is not null)\n"
"{\n"
-"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_FULL_PATH,\n"
-"RES_OWNER, RES_GROUP, RES_PERMS,\n"
-"RES_CR_TIME, RES_MOD_TIME,\n"
-"RES_TYPE, RES_CONTENT)\n"
-"values (newid, rname, dp_id, destination, ouid, ogid, permissions, now(), now (), rt, rcnt);\n"
+"declare vanilla_rc int;\n"
+"vanilla_rc := DAV_IS_LOCKED (id , \'R\', 1);\n"
+"if (vanilla_rc < 0)\n"
+"locked := 1;\n"
+"if (vanilla_rc = -8 and (auto_version = \'DAV:checkout-unlocked-checkin\'))\n"
+"rc := 0;\n"
+"else if (vanilla_rc = -8 and (auto_version = \'DAV:locked-checkout\'))\n"
+"rc := 0;\n"
"}\n"
+"if (0 <> rc)\n"
+"{\n"
+"\n"
+"return rc;\n"
"}\n"
-"prop_list := DAV_HIDE_ERROR (DAV_PROP_LIST_INT (id, \'R\', \'%\', 0, auth_uname, auth_pwd), vector ());\n"
-"foreach (any prop in prop_list) do {\n"
-"DAV_PROP_SET_INT (destination, prop[0], prop[1], null, null, 0, 0, 0, auth_uid);\n"
"}\n"
-"tag_list := DAV_HIDE_ERROR (DAV_TAG_LIST (id, st, NULL), vector ());\n"
-"foreach (any tagpair in tag_list) do {\n"
-"DAV_TAG_SET (newid, \'R\', tagpair[0], tagpair[1]);\n"
+"rc := id;\n"
+"op := \'u\';\n"
+"if (cr_time is null or _rowguid is null)\n"
+"{\n"
+"declare _cr_time datetime;\n"
+"declare __rowguid varchar;\n"
+"select RES_CR_TIME, ROWGUID into _cr_time, __rowguid\n"
+"from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
+"if (cr_time is null)\n"
+"cr_time := _cr_time;\n"
+"if (_rowguid is null)\n"
+"_rowguid := __rowguid;\n"
"}\n"
"}\n"
-"else if (st = \'C\')\n"
+"if (DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (par, vector (\'\')), \'C\')) is not null)\n"
"{\n"
-"declare cname varchar;\n"
-"declare newid integer;\n"
-"cname := aref (dar, length (dar)-1);\n"
-"if (cname <> \'\')\n"
-"return -2;\n"
-"cname := aref (dar, length (dar)-2);\n"
-"if (cname = \'\')\n"
-"return -2;\n"
-"if (isarray (id) and (id[0] like \'%CatFilter\'))\n"
-"return -39;\n"
-"if (d_id is not null)\n"
+"\n"
+"return -26;\n"
+"}\n"
+"if (mod_time is null)\n"
+"mod_time := now();\n"
+"if (type = \'\')\n"
+"type := http_mime_type (path);\n"
+"\n"
+"\n"
+"if (type = \'text/xml\'\n"
+"and exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = pid and PROP_TYPE = \'C\'\n"
+"and PROP_NAME = \'xper\'))\n"
"{\n"
-"declare rrc integer;\n"
-"rrc := DAV_DELETE_INT (destination, 0, auth_uname, auth_pwd, 0);\n"
-"if (rrc <> 1)\n"
+"insert soft WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE)\n"
+"values (WS.WS.GETID (\'P\'), \'xper\', \'R\', id, \'\');\n"
+"_is_xper_res := 1;\n"
+"}\n"
+"else if (rc <> 0)\n"
"{\n"
-"rollback work;\n"
-"return rrc;\n"
+"delete from WS.WS.SYS_DAV_PROP where PROP_NAME = \'xper\' and PROP_TYPE = \'R\' and PROP_PARENT_ID = id;\n"
+"_is_xper_res := 0;\n"
"}\n"
-"}\n"
-"newid := DAV_COL_CREATE_INT (destination, permissions, uid, gid, auth_uname, auth_pwd, 0, 0, 0, ouid, ogid);\n"
-"if (DAV_HIDE_ERROR (newid) is null)\n"
+"\n"
+"\n"
+"whenever sqlstate \'*\' goto unhappy_upload;\n"
+"\n"
+"if (op = \'i\')\n"
"{\n"
-"rollback work;\n"
-"return newid;\n"
-"}\n"
-"prop_list := DAV_HIDE_ERROR (DAV_PROP_LIST_INT (id, \'C\', \'%\', 0, auth_uname, auth_pwd), vector ());\n"
-"foreach (any prop in prop_list) do {\n"
-"DAV_PROP_SET_INT (destination, prop[0], prop[1], null, null, 0, 0, 0, auth_uid);\n"
-"}\n"
-"DAV_COPY_SUBTREE (id , newid, sar, destination, 1, ouid, ogid, auth_uname, auth_pwd, auth_uid);\n"
-"}\n"
-"return 1;\n"
"\n"
-"insufficient_storage:\n"
-"return -41;\n"
-"disabled_owner:\n"
-"return -42;\n"
-"disabled_home:\n"
-"return -43;\n"
+"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL,\n"
+"RES_OWNER, RES_GROUP, RES_PERMS,\n"
+"RES_CR_TIME, RES_MOD_TIME,\n"
+"RES_TYPE, RES_CONTENT, ROWGUID)\n"
+"values (rc, name, pid, ouid, ogid, permissions, cr_time, mod_time, type, content, _rowguid);\n"
+"if (_is_xper_res)\n"
+"update WS.WS.SYS_DAV_RES set RES_CONTENT = xml_persistent (RES_CONTENT) where RES_ID = id;\n"
"}\n"
-"--src dav_api.sql:2981\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"
-"in auth_uname varchar, in auth_pwd varchar, in auth_uid integer ) returns any\n"
+"else\n"
"{\n"
-"declare dirlist, ret, rc any;\n"
-"\n"
-"vectorbld_init (ret);\n"
-"dirlist := DAV_DIR_LIST_INT (DAV_CONCAT_PATH (\'/\', sar), 0, \'%\', NULL, NULL, auth_uid);\n"
-"foreach (any res in dirlist) do\n"
+"if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, \'R\', \'DAV:checked-in\', 0)) is not null)\n"
"{\n"
-"if (\'R\' = res[1])\n"
+"if (auto_version = \'DAV:checkout-checkin\')\n"
"{\n"
-"declare target_path varchar;\n"
-"target_path := DAV_CONCAT_PATH (dar, res[10]);\n"
-"rc := DAV_AUTHENTICATE (res[4], \'R\', \'1__\', auth_uname, auth_pwd, auth_uid);\n"
-"\n"
-"\n"
-"if (rc >= 0)\n"
-"rc := DAV_COPY_INT (res[0], target_path, overwrite, res[5], res[7], res[6], auth_uname, auth_pwd, 0, 1, ouid, ogid );\n"
-"vectorbld_acc (ret, vector (res[0], target_path, rc));\n"
+" ;\n"
"}\n"
+"else if ( (locked and (auto_version = \'DAV:checkout-unlocked-checkin\')) or\n"
+"(auto_version = \'DAV:checkout\') or\n"
+"(locked and (auto_version = \'DAV:locked-checkout\')) )\n"
+"return \"Versioning_CHECKOUT_INT\" (id, content, type, permissions, ouid, ogid);\n"
+"else if (locked or\n"
+"(auto_version is null) or\n"
+"((auto_version <> \'DAV:checkout-unlocked-checkin\') and\n"
+"(auto_version <> \'DAV:checkout-checkin\')))\n"
+"return -38;\n"
"}\n"
-"foreach (any res in dirlist) do\n"
+"\n"
+"if (sys_stat (\'cl_run_local_only\') = 1)\n"
"{\n"
-"if (\'C\' = res[1])\n"
+"update WS.WS.SYS_DAV_RES\n"
+"set RES_OWNER = ouid,\n"
+"RES_GROUP = ogid,\n"
+"RES_PERMS = permissions,\n"
+"RES_CR_TIME = cr_time,\n"
+"RES_MOD_TIME = mod_time,\n"
+"RES_TYPE = type,\n"
+"RES_CONTENT = content,\n"
+"ROWGUID = _rowguid\n"
+"where current of res_cr;\n"
+"}\n"
+"else\n"
"{\n"
-"declare target_path varchar;\n"
-"target_path := DAV_CONCAT_PATH (dar, res[10]) || \'/\';\n"
-"rc := DAV_AUTHENTICATE (res[4], \'C\', \'1__\', auth_uname, auth_pwd, auth_uid);\n"
-"if (rc >= 0)\n"
+"update WS.WS.SYS_DAV_RES\n"
+"set RES_OWNER = ouid,\n"
+"RES_GROUP = ogid,\n"
+"RES_PERMS = permissions,\n"
+"RES_CR_TIME = cr_time,\n"
+"RES_MOD_TIME = mod_time,\n"
+"RES_TYPE = type,\n"
+"RES_CONTENT = content,\n"
+"ROWGUID = _rowguid\n"
+"where RES_ID = id;\n"
+"}\n"
+"if (_is_xper_res)\n"
+"update WS.WS.SYS_DAV_RES set RES_CONTENT = xml_persistent (RES_CONTENT) where current of res_cr;\n"
+"}\n"
+"\n"
+"\n"
+"\n"
+"declare c_id, depth integer;\n"
+"declare rdf_graph any;\n"
+"declare _col_p_id, _inherit any;\n"
+"\n"
+"\n"
+"RDF_SINK_DELETE (path);\n"
+"\n"
+"\n"
+"c_id := (select RES_COL from WS.WS.SYS_DAV_RES where RES_ID = rc);\n"
+"\n"
+"rdf_graph := null;\n"
+"depth := 0;\n"
"{\n"
-"declare new_tgt_id integer;\n"
-"if (isarray (res[4]) and (res[4][0] like \'%CatFilter\'))\n"
+"whenever not found goto rdfg_found;\n"
+"look_again:\n"
+"select COL_PARENT, COL_INHERIT into _col_p_id, _inherit from WS.WS.SYS_DAV_COL where COL_ID = c_id;\n"
+"rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_graph\');\n"
+"if ((_inherit = \'R\' or (depth = 1 and _inherit = \'M\') or depth = 0) and length (rdf_graph))\n"
+"goto rdfg_found;\n"
+"c_id := _col_p_id;\n"
+"depth := depth + 1;\n"
+"rdf_graph := null;\n"
+"goto look_again;\n"
+"}\n"
+"rdfg_found:;\n"
+"if (not DB.DBA.is_empty_or_null (rdf_graph))\n"
"{\n"
-"vectorbld_acc (ret, vector (res[0], target_path, -39));\n"
-"goto item_done; /* see below */\n"
+"declare aq any;\n"
+"insert soft RDF_SINK_QUEUE (RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_STATE, RSQ_TYPE, RSQ_UID, RSQ_GID) values (path, rc, c_id, rdf_graph, 0, type, ouid, ogid);\n"
+"set_user_id (user);\n"
+"aq := async_queue (1);\n"
+"aq_request (aq, \'DB.DBA.RDF_SINK_AQ_RUN\', vector ());\n"
"}\n"
+"return rc;\n"
"\n"
-"new_tgt_id := DAV_COL_CREATE_INT (target_path, res[5], res[7], res[6], auth_uname, auth_pwd, 0, 0, 0, ouid, ogid );\n"
-"vectorbld_acc (ret, vector (res[0], target_path, new_tgt_id));\n"
-"if (DAV_HIDE_ERROR (new_tgt_id) is not null)\n"
+"unhappy_upload:\n"
+"if (__SQL_STATE = \'HT507\')\n"
+"return -41;\n"
+"if (__SQL_STATE = \'HT508\')\n"
+"return -42;\n"
+"if (__SQL_STATE = \'HT509\')\n"
+"return -43;\n"
+"return -29;\n"
+"}\n"
+"--src dav_api.sql:2185\n";
+
+static const char *proc126 =
+"#line 2506 \"[executable]/dav_api.sql\"\n"
+"create procedure RDF_SINK_AQ_GET ()\n"
"{\n"
-"declare prop_list any;\n"
-"prop_list := DAV_HIDE_ERROR (DAV_PROP_LIST_INT (res[4], \'C\', \'%\', 0, auth_uname, auth_pwd), vector ());\n"
-"foreach (any prop in prop_list) do\n"
+"declare arr any;\n"
+"set isolation = \'serializable\';\n"
+"arr := (select vector_agg (vector (RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_TYPE, RSQ_UID, RSQ_GID)) from (select top 10 RSQ_PATH, RSQ_ID, RSQ_C_ID, RSQ_GRAPH, RSQ_TYPE, RSQ_UID, RSQ_GID\n"
+"from RDF_SINK_QUEUE where RSQ_STATE = 0 order by RSQ_TS for update) x);\n"
+"foreach (any x in arr) do\n"
"{\n"
-"DAV_PROP_SET_RAW (new_tgt_id, \'C\', prop[0], prop[1], 0, auth_uid);\n"
-"}\n"
+"update RDF_SINK_QUEUE set RSQ_STATE = 1 where RSQ_ID = x[1];\n"
"}\n"
-"rc := DAV_COPY_SUBTREE (res[4], new_tgt_id, res[0], target_path, overwrite, ouid, ogid, auth_uname, auth_pwd, auth_uid);\n"
-"vectorbld_concat_acc (ret, rc);\n"
-"item_done:;\n"
+"commit work;\n"
+"return arr;\n"
"}\n"
+"--src dav_api.sql:2504\n";
+
+static const char *proc127 =
+"#line 2521 \"[executable]/dav_api.sql\"\n"
+"create procedure DB.DBA.RDF_SINK_AQ_RUN ()\n"
+"{\n"
+"declare aq, arr any;\n"
+"if (exists (select 1 from RDF_SINK_QUEUE where RSQ_STATE = 1))\n"
+"return;\n"
+"aq := async_queue (10);\n"
+"for (;;)\n"
+"{\n"
+"arr := RDF_SINK_AQ_GET ();\n"
+"if (not length (arr))\n"
+"return;\n"
+"foreach (any x in arr) do\n"
+"{\n"
+"aq_request (aq, \'DB.DBA.RDF_SINK_FUNC\', vector (x[0], x[1], x[2], x[3], x[4], x[5], x[6]));\n"
"}\n"
+"aq_wait_all (aq);\n"
+"delete from RDF_SINK_QUEUE where RSQ_STATE = 2;\n"
+"commit work;\n"
"}\n"
-"vectorbld_final (ret);\n"
-"return ret;\n"
"}\n"
-"--src dav_api.sql:3247\n";
+"--src dav_api.sql:2519\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"
-"in overwrite integer := 0,\n"
-"in auth_uname varchar,\n"
-"in auth_pwd varchar)\n"
+static const char *proc128 =
+"#line 2543 \"[executable]/dav_api.sql\"\n"
+"create procedure DAV_RDF_RES_NAME (in rdf_graph varchar)\n"
"{\n"
-"return DAV_MOVE_INT (path, destination, overwrite, auth_uname, auth_pwd, 1);\n"
+"return replace ( replace ( replace ( replace ( replace ( replace ( replace (rdf_graph, \'/\', \'_\'), \'\\\\\', \'_\'), \':\', \'_\'), \'+\', \'_\'), \'\\\"\', \'_\'), \'[\', \'_\'), \']\', \'_\') || \'.RDF\';\n"
"}\n"
-"--src dav_api.sql:3310\n";
+"--src dav_api.sql:2541\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"
-"in overwrite integer := 0,\n"
-"in auth_uname varchar,\n"
-"in auth_pwd varchar,\n"
-"in extern integer := 1,\n"
-"in check_locks any := 1 )\n"
+static const char *proc129 =
+"#line 2549 \"[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 id, d_id, dp_id, rc integer;\n"
-"declare auth_uid integer;\n"
-"declare st, dp_det char;\n"
-"declare sar, dar, prop_list any;\n"
-"whenever sqlstate \'HT507\' goto insufficient_storage;\n"
-"whenever sqlstate \'HT508\' goto disabled_owner;\n"
-"whenever sqlstate \'HT509\' goto disabled_home;\n"
-"\n"
+"declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;\n"
+"declare rdf_graph_resource_id, rdf_graph_resource_name, rdf_graph_resource_path, host, content any;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"goto _bad_content;\n"
+"};\n"
"\n"
-"sar := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"dar := split_and_decode (destination, 0, \'\\0\\0/\');\n"
"\n"
-"if (aref (sar, 0) <> \'\')\n"
-"return -1;\n"
-"if (aref (sar, length (sar) - 1) = \'\')\n"
-"st := \'C\';\n"
-"else\n"
-"st := \'R\';\n"
+"content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = rc);\n"
+"rdf_sponger := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_sponger\'), \'on\');\n"
+"rdf_cartridges := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_cartridges\'), \'\');\n"
+"rdf_metaCartridges := coalesce((select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_metaCartridges\'), \'\');\n"
"\n"
-"if (aref (dar, 0) <> \'\')\n"
-"return -2;\n"
-"if (aref (dar, length (dar) - 1) = \'\')\n"
+"if (RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges))\n"
"{\n"
-"if (st = \'R\')\n"
+"rdf_graph_resource_name := DAV_RDF_RES_NAME (rdf_graph);\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"
"{\n"
-"destination := concat (destination, sar[length (sar)-1]);\n"
-"dar := split_and_decode (destination, 0, \'\\0\\0/\');\n"
+"\n"
+"host := virtuoso_ini_item_value (\'URIQA\', \'DefaultHost\');\n"
+"if (host is null)\n"
+"{\n"
+"host := sys_stat (\'st_host_name\');\n"
+"if (server_http_port () <> \'80\')\n"
+"host := host ||\':\'|| server_http_port ();\n"
"}\n"
+"rdf_graph_resource_id := WS.WS.GETID (\'R\');\n"
+"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_OWNER, RES_GROUP, RES_PERMS, RES_CR_TIME, RES_MOD_TIME, RES_TYPE, RES_CONTENT)\n"
+"values (rdf_graph_resource_id, rdf_graph_resource_name, c_id, ouid, ogid, \'111101101NN\', now (), now (), \'text/xml\', \'\');\n"
+"DB.DBA.DAV_PROP_SET_INT (rdf_graph_resource_path, \'redirectref\', sprintf (\'http://%s/sparql?default-graph-uri=%U&query=%U&format=%U\', host, rdf_graph,\n"
+"\'CONSTRUCT { ?s ?p ?o} WHERE {?s ?p ?o}\', \'text/xml\'), null, null, 0, 0, 1);\n"
"}\n"
-"else\n"
-"{\n"
-"if (st = \'C\')\n"
-"return -4;\n"
"}\n"
-"\n"
-"id := DAV_SEARCH_ID (sar, st);\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
-"return id;\n"
-"\n"
-"dp_id := DAV_SEARCH_ID (dar, \'P\');\n"
-"d_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (dar, st));\n"
-"if (d_id is null)\n"
-"{\n"
-"if (DAV_HIDE_ERROR (dp_id) is null)\n"
-"return -2;\n"
+"_bad_content:;\n"
+"update RDF_SINK_QUEUE set RSQ_STATE = 2 where RSQ_ID = rc;\n"
+"commit work;\n"
"}\n"
-"else\n"
+"--src dav_api.sql:2547\n";
+
+static const char *proc130 =
+"#line 2592 \"[executable]/dav_api.sql\"\n"
+"create procedure RDF_SINK_UPLOAD (\n"
+"in path varchar,\n"
+"inout _content any,\n"
+"in type varchar,\n"
+"in rdf_graph varchar,\n"
+"in rdf_sponger varchar,\n"
+"in rdf_cartridges varchar,\n"
+"in rdf_metaCartridges varchar)\n"
"{\n"
-"dp_id := DAV_SEARCH_ID (dar, \'P\');\n"
-"}\n"
-"if (d_id is not null and not overwrite)\n"
-"return -3;\n"
+"declare rdf_iri, rdf_graph2 varchar;\n"
+"declare content any;\n"
"\n"
-"if (d_id is not null and id = d_id)\n"
-"return -2;\n"
+"if (length (_content) = 0)\n"
+"return 0;\n"
"\n"
"\n"
-"if (extern)\n"
+"declare exit handler for sqlstate \'*\' {\n"
+"return 0;\n"
+"};\n"
+"\n"
+"if (path like \'%.zip\')\n"
"{\n"
-"if (0 > (auth_uid := DAV_AUTHENTICATE (id, st, \'11_\', auth_uname, auth_pwd)))\n"
-"return auth_uid;\n"
-"if (d_id is not null)\n"
+"declare lst, tmp_file, zip_graph any;\n"
+"tmp_file := tmp_file_name ();\n"
+"declare exit handler for sqlstate \'*\' {\n"
+"file_delete (tmp_file, 1);\n"
+"return 0;\n"
+"};\n"
+"zip_graph := \'http://local.virt\' || path;\n"
+"string_to_file (tmp_file, _content, -2);\n"
+"lst := unzip_list (tmp_file);\n"
+"foreach (any x in lst) do\n"
"{\n"
-"if (0 > (auth_uid := DAV_AUTHENTICATE (d_id, st, \'11_\', auth_uname, auth_pwd)))\n"
-"return auth_uid;\n"
+"declare fname, item_graph, ss any;\n"
+"ss := string_output ();\n"
+"fname := x[0];\n"
+"content := unzip_file (tmp_file, fname);\n"
+"http_dav_url (fname, null, ss);\n"
+"fname := string_output_string (ss);\n"
+"item_graph := \'http://local.virt\' || path || \'/\' || fname;\n"
+"RDF_SINK_UPLOAD (concat (path, \'/\', fname), content, DAV_GUESS_MIME_TYPE_BY_NAME (fname), rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);\n"
+"SPARQL insert in graph ?:zip_graph { ?s ?p ?o } where { graph `iri(?:item_graph)` { ?s ?p ?o } };\n"
+"SPARQL clear graph ?:item_graph;\n"
"}\n"
-"if (0 > (auth_uid := DAV_AUTHENTICATE (dp_id, \'C\', \'11_\', auth_uname, auth_pwd)))\n"
-"return auth_uid;\n"
+"file_delete (tmp_file, 1);\n"
+"return 1;\n"
"}\n"
-"else\n"
-"auth_uid := http_nobody_uid ();\n"
"\n"
-"if ((\'C\' = st) and DAV_HIDE_ERROR (DAV_SEARCH_ID (subseq (dar, 0, length (dar) - 1), \'R\')) is not null)\n"
-"{\n"
-"\n"
-"return -25;\n"
-"}\n"
-"if ((\'R\' = st) and (0 = overwrite) and DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (dar, vector (\'\')), \'C\')) is not null)\n"
+"content := _content;\n"
+"if (path like \'%.gz\' and length (_content) > 2)\n"
"{\n"
-"\n"
-"return -26;\n"
-"}\n"
-"if ((\'C\' = st) and destination between path and DAV_COL_PATH_BOUNDARY (path))\n"
-"return -30;\n"
-"if (check_locks)\n"
+"declare magic, html_start varchar;\n"
+"magic := subseq (_content, 0, 2);\n"
+"html_start := null;\n"
+"if (magic[0] = 0hex1f and magic[1] = 0hex8b)\n"
"{\n"
-"if (0 <> (rc := DAV_IS_LOCKED (id , st, check_locks)))\n"
-"return rc;\n"
-"if (d_id is null)\n"
-"rc := DAV_IS_LOCKED (dp_id , \'C\', check_locks);\n"
-"else\n"
-"rc := DAV_IS_LOCKED (d_id , st, check_locks);\n"
-"if (0 <> rc)\n"
-"return (case when rc = -8 then -9 else rc end);\n"
+"content := gzip_uncompress (cast (_content as varchar));\n"
+"path := regexp_replace (path, \'\\.gz\\x24\', \'\');\n"
+"type := DAV_GUESS_MIME_TYPE (path, content, html_start);\n"
"}\n"
-"\n"
-"if (isarray (dp_id))\n"
-"dp_det := dp_id[0];\n"
-"else\n"
-"dp_det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=dp_id), NULL);\n"
-"if (dp_det is not null)\n"
-"{\n"
-"declare detcol_id integer;\n"
-"declare detcol_path, unreached_path any;\n"
-"DAV_SEARCH_ID_OR_DET (dar, st, dp_det, detcol_id, detcol_path, unreached_path);\n"
-"return call (cast (dp_det as varchar) || \'_DAV_RES_UPLOAD_MOVE\') (detcol_id, unreached_path, id, st, overwrite, auth_uid);\n"
"}\n"
"\n"
-"if (st = \'R\')\n"
-"{\n"
-"\n"
-"if (d_id is not null)\n"
+"rdf_iri := WS.WS.DAV_IRI (path);\n"
+"rdf_graph2 := \'http://local.virt\' || path;\n"
+"if (\n"
+"strstr (type, \'application/rdf+xml\') is not null or\n"
+"strstr (type, \'application/foaf+xml\') is not null\n"
+")\n"
"{\n"
-"\n"
-"if (isarray (id))\n"
"{\n"
-"declare rt varchar;\n"
-"declare rcnt any;\n"
-"declare dirsingle any;\n"
-"dirsingle := call (cast (id[0] as varchar) || \'_DAV_DIR_SINGLE\') (id, \'R\', path, auth_uid);\n"
-"if (isinteger (dirsingle))\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"signal (\'.....\', sprintf (\'DAV_DIR_SINGLE failed during DAV_MOVE\'));\n"
-"return -100;\n"
-"}\n"
-"rcnt := string_output ();\n"
-"rc := call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, rcnt, rt, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"update WS.WS.SYS_DAV_RES set RES_CONTENT = rcnt, RES_TYPE = rt, RES_OWNER = dirsingle[7],\n"
-"RES_GROUP = dirsingle[6], RES_PERMS = dirsingle[5], RES_MOD_TIME = now ()\n"
-"where RES_ID = d_id;\n"
-"rc := DAV_DELETE_INT (path, 1, null, null, 0);\n"
-"if (rc < 0)\n"
-"return rc;\n"
-"}\n"
-"else\n"
+"goto _grddl;\n"
+"};\n"
+"if (rdf_sponger = \'on\')\n"
"{\n"
-"declare pid integer;\n"
-"declare rname, rtype varchar;\n"
-"select RES_COL, RES_NAME, RES_TYPE into pid, rname, rtype from WS.WS.SYS_DAV_RES where RES_ID = d_id;\n"
-"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = d_id;\n"
-"delete from WS.WS.SYS_DAV_RES where RES_ID = d_id;\n"
-"update WS.WS.SYS_DAV_RES set RES_COL = dp_id, RES_NAME = rname,\n"
-"RES_MOD_TIME = now () where RES_ID = id;\n"
-"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE=\'R\' and LOCK_PARENT_ID=id;\n"
-"update WS.WS.SYS_DAV_LOCK set LOCK_PARENT_ID = id where LOCK_PARENT_TYPE=\'R\' and LOCK_PARENT_ID=d_id;\n"
+"declare xt any;\n"
"\n"
+"xt := xtree_doc (content);\n"
+"if (xpath_eval (\'[ xmlns:dv=\"http://www.w3.org/2003/g/data-view#\" ] /*[1]/@dv:transformation\', xt) is not null)\n"
+"goto _grddl;\n"
"}\n"
+"DB.DBA.RDF_LOAD_RDFXML (blob_to_string (content), rdf_graph2, rdf_graph2);\n"
"}\n"
-"else\n"
+"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"
+"strstr (type, \'application/rdf+turtle\') is not null or\n"
+"strstr (type, \'application/turtle\') is not null or\n"
+"strstr (type, \'application/x-turtle\') is not null\n"
+")\n"
"{\n"
-"declare rname varchar;\n"
-"rname := aref (dar, length (dar)-1);\n"
-"if (rname = \'\')\n"
-"return -3;\n"
-"if (isarray (id))\n"
"{\n"
-"declare rt varchar;\n"
-"declare rcnt any;\n"
-"declare newid integer;\n"
-"declare dirsingle any;\n"
-"newid := WS.WS.GETID (\'R\');\n"
-"dirsingle := call (cast (id[0] as varchar) || \'_DAV_DIR_SINGLE\') (id, \'R\', path, auth_uid);\n"
-"if (isinteger (dirsingle))\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"signal (\'.....\', sprintf (\'DAV_DIR_SINGLE failed during DAV_MOVE\'));\n"
-"return -100;\n"
+"goto _grddl;\n"
+"};\n"
+"DB.DBA.TTLP (blob_to_string (content), rdf_graph2, rdf_graph2);\n"
"}\n"
-"rcnt := string_output ();\n"
-"rc := call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, rcnt, rt, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_FULL_PATH,\n"
-"RES_OWNER, RES_GROUP, RES_PERMS,\n"
-"RES_CR_TIME, RES_MOD_TIME,\n"
-"RES_TYPE, RES_CONTENT)\n"
-"values (newid, rname, dp_id, destination, dirsingle[7], dirsingle[6], dirsingle[5], now(), now (), rt, rcnt);\n"
-"rc := DAV_DELETE_INT (path, 1, null, null, 0);\n"
-"if (rc < 0)\n"
-"return rc;\n"
+"goto _exit;\n"
"}\n"
-"else\n"
-"update WS.WS.SYS_DAV_RES set RES_COL = dp_id, RES_NAME = rname,\n"
-"RES_MOD_TIME = now () where RES_ID = id;\n"
"\n"
-"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE=\'R\' and LOCK_PARENT_ID=id;\n"
-"}\n"
-"prop_list := DAV_HIDE_ERROR (DAV_PROP_LIST_INT (id, st, \'%\', 0, auth_uname, auth_pwd), vector ());\n"
-"foreach (any prop in prop_list) do\n"
+"_grddl:;\n"
+"if (rdf_sponger = \'on\')\n"
+"{\n"
+"declare rc, rcMeta integer;\n"
+"declare ret_body varchar;\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
+"goto _exit;\n"
+"};\n"
"\n"
-"if (prop[0] not in (\'DAV:checked-in\', \'DAV:checked-out\', \'DAV:version-history\'))\n"
-"DAV_PROP_SET_INT (destination, prop[0], prop[1], null, null, 0, 0, 0, auth_uid);\n"
+"ret_body := cast (content as varchar);\n"
+"\n"
+"rc := RDF_SINK_UPLOAD_CARTRIDGES (ret_body, type, \'select RM_ID, RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_OPTIONS from DB.DBA.SYS_RDF_MAPPERS where RM_ENABLED = 1 order by RM_ID\', rdf_iri, rdf_graph2, rdf_cartridges);\n"
+"\n"
+"rcMeta := RDF_SINK_UPLOAD_CARTRIDGES (ret_body, type, \'select MC_ID, MC_PATTERN, MC_TYPE, MC_HOOK, MC_KEY, MC_OPTIONS from DB.DBA.RDF_META_CARTRIDGES where MC_ENABLED = 1 order by MC_SEQ, MC_ID\', rdf_iri, rdf_graph2, rdf_metaCartridges);\n"
+"if (rc or rcMeta)\n"
+"goto _exit;\n"
"}\n"
+"return 0;\n"
+"\n"
+"_exit:\n"
+"SPARQL insert in graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };\n"
+"return 1;\n"
"}\n"
-"else if (st = \'C\')\n"
-"{\n"
-"declare rname varchar;\n"
-"rname := aref (dar, length (dar)-1);\n"
-"if (rname <> \'\')\n"
-"return -3;\n"
-"rname := aref (dar, length (dar)-2);\n"
-"if (rname = \'\')\n"
-"return -3;\n"
-"if (d_id is not null)\n"
-"{\n"
-"declare rrc integer;\n"
-"rrc := DAV_DELETE_INT (destination, 0, auth_uname, auth_pwd, 0);\n"
-"if (rrc <> 1)\n"
+"--src dav_api.sql:2590\n";
+
+static const char *proc131 =
+"#line 2725 \"[executable]/dav_api.sql\"\n"
+"create procedure RDF_SINK_UPLOAD_CARTRIDGES (\n"
+"inout content any,\n"
+"inout type varchar,\n"
+"in S varchar,\n"
+"in rdf_iri varchar,\n"
+"in rdf_graph varchar,\n"
+"in rdf_cartridges varchar)\n"
"{\n"
-"rollback work;\n"
-"return rrc;\n"
-"}\n"
-"}\n"
-"if (not exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = id))\n"
+"declare cnt, hasSelection integer;\n"
+"declare cname, pname varchar;\n"
+"declare cartridges, aq, ps any;\n"
+"declare xrc, val_match any;\n"
+"declare st, msg, meta, rows, opts any;\n"
+"\n"
+"st := \'00000\';\n"
+"exec (S, st, msg, vector (), vector (\'use_cache\', 1), meta, rows);\n"
+"if (\'00000\' <> st)\n"
+"return 0;\n"
+"\n"
+"cartridges := split_and_decode (rdf_cartridges, 0, \'\\0\\0,\');\n"
+"ps := null;\n"
+"aq := null;\n"
+"foreach (any row in rows) do\n"
"{\n"
-"rollback work;\n"
-"return -2;\n"
+"cname := cast (row[0] as varchar);\n"
+"if (position (cname, cartridges))\n"
+"goto _try;\n"
+"\n"
+"goto _try_next;\n"
+"\n"
+"_try:\n"
+"val_match := case when (row[2] = \'MIME\') then type else rdf_graph end;\n"
+"if (isstring (val_match) and regexp_match (row[1], val_match) is not null)\n"
+"{\n"
+"pname := row[3];\n"
+"if (__proc_exists (pname) is null)\n"
+"goto _try_next;\n"
+"\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"goto _try_next;\n"
+"};\n"
+"opts := vector_concat (vector (), row[5]);\n"
+"xrc := call (pname) (rdf_graph, rdf_iri, null, content, aq, ps, row[4], opts);\n"
+"\n"
+"\n"
+"if (not hasSelection and (__tag (xrc) = 193 or xrc < 0 or xrc > 0))\n"
+"return 1;\n"
"}\n"
-"update WS.WS.SYS_DAV_COL set COL_NAME = rname, COL_PARENT = dp_id, COL_MOD_TIME = now ()\n"
-"where COL_ID = id;\n"
-"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE=\'C\' and LOCK_PARENT_ID=id;\n"
-"if (d_id is not null)\n"
-"update WS.WS.SYS_DAV_LOCK set LOCK_PARENT_ID = id where LOCK_PARENT_TYPE=\'C\' and LOCK_PARENT_ID=d_id;\n"
+"_try_next:;\n"
"}\n"
"return 1;\n"
-"\n"
-"insufficient_storage:\n"
-"return -41;\n"
-"disabled_owner:\n"
-"return -42;\n"
-"disabled_home:\n"
-"return -43;\n"
"}\n"
-"--src dav_api.sql:3322\n";
+"--src dav_api.sql:2723\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"
+static const char *proc132 =
+"#line 2780 \"[executable]/dav_api.sql\"\n"
+"create procedure RDF_SINK_DELETE (\n"
+"in path any)\n"
"{\n"
-"if (isarray (id))\n"
+"declare c_id, _col_p_id, _inherit, depth integer;\n"
+"declare rdf_graph, rdf_graph2 any;\n"
+"\n"
+"c_id := DB.DBA.DAV_SEARCH_ID (subseq (path, 0, strrchr (path, \'/\') + 1), \'C\');\n"
+"if (not isinteger (c_id) or (c_id < 0))\n"
+"return;\n"
+"\n"
+"rdf_graph := null;\n"
+"depth := 0;\n"
"{\n"
-"declare diritm any;\n"
-"diritm := DAV_DIR_SINGLE_INT (id, st, \'\', null, null, http_dav_uid ());\n"
-"if (DAV_HIDE_ERROR (diritm) is null)\n"
-"return diritm;\n"
-"return diritm [7];\n"
+"whenever not found goto rdfg_found;\n"
+"look_again:\n"
+"select COL_PARENT, COL_INHERIT into _col_p_id, _inherit from WS.WS.SYS_DAV_COL where COL_ID = c_id;\n"
+"rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = c_id and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_graph\');\n"
+"if ((_inherit = \'R\' or (depth = 1 and _inherit = \'M\') or depth = 0) and length (rdf_graph))\n"
+"goto rdfg_found;\n"
+"c_id := _col_p_id;\n"
+"depth := depth + 1;\n"
+"rdf_graph := null;\n"
+"goto look_again;\n"
"}\n"
-"if (\'C\' = st)\n"
-"return coalesce ((select COL_OWNER from WS.WS.SYS_DAV_COL where COL_ID = id), -1);\n"
-"if (\'R\' = st)\n"
-"return coalesce ((select RES_OWNER from WS.WS.SYS_DAV_RES where RES_ID = id), -1);\n"
-"return -14;\n"
+"rdfg_found:;\n"
+"\n"
+"if (DB.DBA.is_empty_or_null (rdf_graph))\n"
+"return;\n"
+"\n"
+"if (path like \'%.gz\')\n"
+"path := regexp_replace (path, \'\\.gz\\x24\', \'\');\n"
+"rdf_graph2 := \'http://local.virt\' || path;\n"
+"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:3569\n";
+"--src dav_api.sql:2778\n";
-static const char *proc137 =
-"#line 3591 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_PREPARE_PROP_WRITE (\n"
+static const char *proc133 =
+"#line 2818 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_DELETE (\n"
"in path varchar,\n"
-"out id any,\n"
-"out st varchar,\n"
-"in propname varchar,\n"
+"in silent integer := 0,\n"
+"in auth_uname varchar,\n"
+"in auth_pwd varchar\n"
+")\n"
+"{\n"
+"return DAV_DELETE_INT (path, silent, auth_uname, auth_pwd);\n"
+"}\n"
+"--src dav_api.sql:2816\n";
+
+static const char *proc134 =
+"#line 2830 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_DELETE_INT (\n"
+"in path varchar,\n"
+"in silent integer := 0,\n"
"in auth_uname varchar,\n"
"in auth_pwd varchar,\n"
-"inout auth_uid integer,\n"
-"in extern integer,\n"
-"out auto_version varchar,\n"
-"inout check_locks any,\n"
-"out locked integer) returns integer\n"
+"in extern integer := 1,\n"
+"in check_locks any := 1 )\n"
"{\n"
-"declare rc integer;\n"
-"if ((path <> \'\') and (path[length(path)-1] = 47))\n"
-"st := \'C\';\n"
+"declare id, rc integer;\n"
+"declare ty char;\n"
+"declare auth_uid integer;\n"
+"declare par any;\n"
+"whenever sqlstate \'HT508\' goto disabled_owner;\n"
+"whenever sqlstate \'HT509\' goto disabled_home;\n"
+"\n"
+"par := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"if (aref (par, 0) <> \'\')\n"
+"return -1;\n"
+"if (aref (par, length (par) - 1) = \'\')\n"
+"ty := \'C\';\n"
"else\n"
-"st := \'R\';\n"
-"id := DAV_SEARCH_ID (path, st);\n"
+"ty := \'R\';\n"
+"id := DAV_SEARCH_ID (par, ty);\n"
+"if (isinteger (id) and (0 > id))\n"
+"return (case when silent then 1 else id end);\n"
"\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
-"{\n"
-"return id;\n"
-"}\n"
"if (extern)\n"
"{\n"
-"auth_uid := DAV_AUTHENTICATE (id, st, \'11_\', auth_uname, auth_pwd);\n"
-"if (auth_uid >= 0)\n"
-"goto auth_uid_ok;\n"
-"if ((auth_uid = -13) and (propname = \':virtprivatetags\'))\n"
-"{\n"
-"auth_uid := DAV_AUTHENTICATE (id, st, \'1__\', auth_uname, auth_pwd);\n"
-"if (auth_uid >= 0)\n"
-"goto auth_uid_ok;\n"
+"auth_uid := DAV_AUTHENTICATE (id, ty, \'11_\', auth_uname, auth_pwd);\n"
+"if (auth_uid < 0)\n"
+"return (case when silent then 1 else auth_uid end);\n"
"}\n"
-"if ((auth_uid = -13) and (propname in (\':virtpermissions\', \':virtowneruid\', \':virtownergid\', \':virtacl\')))\n"
+"else\n"
+"auth_uid := http_nobody_uid ();\n"
+"if (check_locks and (0 <> (rc := DAV_IS_LOCKED (id, ty, check_locks))))\n"
+"return rc;\n"
+"\n"
+"if (isarray (id))\n"
"{\n"
-"auth_uid := DAV_AUTHENTICATE (id, st, \'___\', auth_uname, auth_pwd);\n"
-"if (auth_uid >= 0)\n"
-"goto auth_uid_ok;\n"
-"}\n"
-"return auth_uid;\n"
+"declare det varchar;\n"
+"declare detcol_id, detcol_path, unreached_path any;\n"
+"DAV_SEARCH_ID_OR_DET (par, ty, det, detcol_id, detcol_path, unreached_path);\n"
+"return call (cast (det as varchar) || \'_DAV_DELETE\') (detcol_id, unreached_path, ty, silent, auth_uid);\n"
"}\n"
-"else if (auth_uid is null)\n"
-"auth_uid := coalesce ((select U_ID from WS.WS.SYS_DAV_USER where U_NAME = auth_uname), http_nobody_uid());\n"
"\n"
-"auth_uid_ok:\n"
-"auto_version := DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT(DAV_SEARCH_ID (path, \'R\'), \'R\', \'DAV:auto-version\', 0));\n"
-"if (check_locks)\n"
+"if (ty = \'R\')\n"
"{\n"
-"rc := DAV_IS_LOCKED (id , st, check_locks);\n"
-"if (rc < 0)\n"
-"locked := 1;\n"
-"else\n"
-"locked := 0;\n"
-"if (rc = -8 and (auto_version = \'DAV:checkout-unlocked-checkin\'))\n"
-"rc := 0;\n"
-"else if (rc = -8 and (auto_version = \'DAV:locked-checkout\'))\n"
-"rc := 0;\n"
-"if (0 <> rc)\n"
-"return rc;\n"
+"delete from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
+"RDF_SINK_DELETE (path);\n"
"}\n"
-"if (\n"
-"((propname like \'xml-stylesheet%\') or (propname like \'xml-sql%\')) and\n"
-"((auth_uid <> 0) and (auth_uid <> http_dav_uid())) )\n"
+"else if (ty = \'C\')\n"
"{\n"
-"set isolation=\'committed\';\n"
-"if (not exists (\n"
-"select top 1 1 from DB.DBA.SYS_USERS\n"
-"where U_ID = auth_uid and U_DAV_ENABLE and U_SQL_ENABLE\n"
-"and not U_ACCOUNT_DISABLED ) )\n"
-"return -32;\n"
-"if (DAV_GET_OWNER (id, st) <> auth_uid)\n"
-"return -32;\n"
+"declare rrc integer;\n"
+"declare det varchar;\n"
+"\n"
+"det := cast ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=id) as varchar);\n"
+"if (det in (\'S3\', \'GDrive\', \'Dropbox\', \'SkyDrive\', \'Box\', \'WebDAV\'))\n"
+"connection_set (\'dav_store\', 1);\n"
+"\n"
+"for select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = id do\n"
+"{\n"
+"rrc := DAV_DELETE_INT (RES_FULL_PATH, silent, auth_uname, auth_pwd, extern);\n"
+"if (rrc <> 1)\n"
+"{\n"
+"rollback work;\n"
+"return rrc;\n"
"}\n"
-"return 0;\n"
"}\n"
-"--src dav_api.sql:3589\n";
-
-static const char *proc138 =
-"#line 3673 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_PROP_SET (\n"
-"in path varchar,\n"
-"in propname varchar,\n"
-"in propvalue any,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null,\n"
-"in overwrite integer := 0 )\n"
+"for select COL_ID from WS.WS.SYS_DAV_COL where COL_PARENT = id do\n"
"{\n"
-"return DAV_PROP_SET_INT (path, propname, propvalue, auth_uname, auth_pwd, 1, 1, overwrite);\n"
+"rrc := DAV_DELETE_INT (WS.WS.COL_PATH(COL_ID), silent, auth_uname, auth_pwd, extern);\n"
+"if (rrc <> 1)\n"
+"{\n"
+"rollback work;\n"
+"return rrc;\n"
+"}\n"
+"}\n"
+"delete from WS.WS.SYS_DAV_COL where COL_ID = id;\n"
+"}\n"
+"else if (not silent)\n"
+"return -1;\n"
+"return 1;\n"
+"\n"
+"disabled_owner:\n"
+"return -42;\n"
+"disabled_home:\n"
+"return -43;\n"
"}\n"
-"--src dav_api.sql:3671\n";
+"--src dav_api.sql:2828\n";
-static const char *proc139 =
-"#line 3686 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_PROP_SET_INT (\n"
-"in path varchar,\n"
-"in propname varchar,\n"
-"in propvalue any,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null,\n"
-"in extern integer := 1,\n"
-"in check_locks any := 1,\n"
-"in overwrite integer := 0,\n"
-"in auth_uid integer := null ) returns integer\n"
+static const char *proc135 =
+"#line 2922 \"[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"
-"declare id, rc, pid integer;\n"
-"declare st, det varchar;\n"
-"declare resv any;\n"
-"declare locked integer;\n"
-"declare auto_version varchar;\n"
-"\n"
-"rc := DAV_PREPARE_PROP_WRITE (path, id, st, propname, auth_uname, auth_pwd, auth_uid, extern, auto_version, check_locks, locked);\n"
-"\n"
-"if (rc < 0)\n"
-"return rc;\n"
"if (isarray (id))\n"
"{\n"
-"pid := call (cast (id[0] as varchar) || \'_DAV_PROP_SET\') (id, st, propname, propvalue, overwrite, auth_uid);\n"
-"return pid;\n"
-"}\n"
-"return DAV_PROP_SET_RAW (id, st, propname, propvalue, overwrite, auth_uid, locked, auto_version);\n"
+"whenever sqlstate \'42001\' goto unsupported;\n"
+"return call (cast (id[0] as varchar) || \'_DAV_TAG_LIST\')(id, st, uid_list);\n"
+"unsupported:\n"
+"return -20;\n"
"}\n"
-"--src dav_api.sql:3684\n";
-
-static const char *proc140 =
-"#line 3718 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_PROP_SET_RAW (\n"
-"inout id integer,\n"
-"in st char(0),\n"
-"inout propname varchar,\n"
-"inout propvalue any,\n"
-"in overwrite integer,\n"
-"in auth_uid integer,\n"
-"in locked int:=0,\n"
-"in auto_version varchar:=NULL\n"
-") returns integer\n"
-"{\n"
-"declare rc, old_log_mode, new_log_mode any;\n"
-"old_log_mode := log_enable (null);\n"
-"\n"
-"new_log_mode := bit_and (old_log_mode, 1);\n"
-"old_log_mode := log_enable (bit_or (new_log_mode, 4), 1);\n"
-"rc := DAV_PROP_SET_RAW_INNER (id, st, propname, propvalue, overwrite, auth_uid, locked, auto_version);\n"
-"log_enable (bit_or (old_log_mode, 4), 1);\n"
-"return rc;\n"
+"if (\'R\' <> st)\n"
+"return vector ();\n"
+"if (uid_list is null)\n"
+"return (select VECTOR_AGG (vector (DT_U_ID, DT_TAGS)) from Ws.WS.SYS_DAV_TAG where DT_RES_ID = id);\n"
+"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:3716\n";
+"--src dav_api.sql:2920\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"
-"in st char(0),\n"
-"inout propname varchar,\n"
-"inout propvalue any,\n"
-"in overwrite integer,\n"
-"in auth_uid integer,\n"
-"in locked int:=0,\n"
-"in auto_version varchar:=NULL\n"
-") returns integer\n"
-"{\n"
-"declare pid integer;\n"
-"declare resv any;\n"
-"declare can_patch_access integer;\n"
-"if (58 = propname[0])\n"
+static const char *proc136 =
+"#line 2940 \"[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 (\':getlastmodified\' = propname)\n"
+"if (not exists (select 1 from WS.WS.SYS_DAV_USER where U_ID = uid))\n"
+"return -18;\n"
+"if (\'R\' <> st)\n"
+"return -14;\n"
+"if (exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = uid))\n"
"{\n"
-"if (\'R\' = st)\n"
-"update WS.WS.SYS_DAV_RES set RES_MOD_TIME = propvalue where RES_ID = id;\n"
+"update WS.WS.SYS_DAV_TAG set DT_TAGS = tags where DT_RES_ID = id and DT_U_ID = uid;\n"
+"}\n"
"else\n"
-"update WS.WS.SYS_DAV_COL set COL_MOD_TIME = propvalue where COL_ID = id;\n"
+"{\n"
+"insert into WS.WS.SYS_DAV_TAG (DT_RES_ID, DT_U_ID, DT_FT_ID, DT_TAGS)\n"
+"values (id, uid, WS.WS.GETID (\'T\'), tags);\n"
+"}\n"
"return 0;\n"
"}\n"
-"if (\':creationdate\' = propname)\n"
+"--src dav_api.sql:2938\n";
+
+static const char *proc137 =
+"#line 2961 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_COPY (in path varchar,\n"
+"in destination varchar,\n"
+"in overwrite integer := 0,\n"
+"in permissions varchar := \'110100000RR\',\n"
+"in uid varchar := \'dav\',\n"
+"in gid varchar := \'administrators\',\n"
+"in auth_uname varchar,\n"
+"in auth_pwd varchar)\n"
"{\n"
-"if (\'R\' = st)\n"
-"update WS.WS.SYS_DAV_RES set RES_CR_TIME = propvalue where RES_ID = id;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_CR_TIME = propvalue where COL_ID = id;\n"
-"return 0;\n"
+"return DAV_COPY_INT (path, destination, overwrite, permissions, uid, gid, auth_uname, auth_pwd, 1);\n"
"}\n"
-"if (\':getcontenttype\' = propname)\n"
+"--src dav_api.sql:2959\n";
+
+static const char *proc138 =
+"#line 2976 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_COPY_INT (in path varchar,\n"
+"in destination varchar,\n"
+"in overwrite integer := 0,\n"
+"in permissions varchar := \'110100000RR\',\n"
+"in uid varchar := \'dav\',\n"
+"in gid varchar := \'administrators\',\n"
+"in auth_uname varchar,\n"
+"in auth_pwd varchar,\n"
+"in extern integer := 1,\n"
+"in check_locks any := 1,\n"
+"in ouid integer := null,\n"
+"in ogid integer := null )\n"
"{\n"
-"if (\'R\' = st)\n"
-"update WS.WS.SYS_DAV_RES set RES_TYPE = propvalue where RES_ID = id;\n"
-"else\n"
-"return -10;\n"
-"return 0;\n"
+"declare id, d_id, dp_id, rc integer;\n"
+"declare auth_uid integer;\n"
+"declare st, dp_det char;\n"
+"declare sar, dar, prop_list, tag_list any;\n"
+"whenever sqlstate \'HT507\' goto insufficient_storage;\n"
+"whenever sqlstate \'HT508\' goto disabled_owner;\n"
+"whenever sqlstate \'HT509\' goto disabled_home;\n"
+"\n"
+"if (IS_REDIRECT_REF(path))\n"
+"{\n"
+"\n"
+" ;\n"
"}\n"
-"if (auth_uid = http_dav_uid())\n"
-"can_patch_access := 2;\n"
"\n"
+"sar := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"dar := split_and_decode (destination, 0, \'\\0\\0/\');\n"
"\n"
+"\n"
+"if (aref (sar, 0) <> \'\')\n"
+"return -1;\n"
+"if (aref (sar, length (sar) - 1) = \'\')\n"
+"st := \'C\';\n"
"else\n"
-"if (\'R\' = st)\n"
-"can_patch_access := coalesce ((select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = id and RES_OWNER = auth_uid), 0);\n"
-"else\n"
-"can_patch_access := coalesce ((select top 1 1 from WS.WS.SYS_DAV_COL where COL_ID = id and COL_OWNER = auth_uid), 0);\n"
-"if (\':virtowneruid\' = propname)\n"
+"st := \'R\';\n"
+"\n"
+"if (aref (dar, 0) <> \'\')\n"
+"return -2;\n"
+"if (aref (dar, length (dar) - 1) = \'\')\n"
"{\n"
-"if (0 >= can_patch_access)\n"
-"return -13;\n"
-"if (not exists (select top 1 1 from WS.WS.SYS_DAV_USER where U_ID = propvalue))\n"
-"propvalue := 0;\n"
-"if (\'R\' = st)\n"
-"update WS.WS.SYS_DAV_RES set RES_OWNER = propvalue where RES_ID = id;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_OWNER = propvalue where COL_ID = id;\n"
-"return 0;\n"
-"}\n"
-"if (\':virtownergid\' = propname)\n"
+"if (st = \'R\')\n"
"{\n"
-"if (0 >= can_patch_access)\n"
-"return -13;\n"
-"if (not exists (select top 1 1 from WS.WS.SYS_DAV_GROUP where G_ID = propvalue))\n"
-"propvalue := 0;\n"
-"if (\'R\' = st)\n"
-"update WS.WS.SYS_DAV_RES set RES_GROUP = propvalue where RES_ID = id;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_GROUP = propvalue where COL_ID = id;\n"
-"return 0;\n"
+"destination := concat (destination, sar[length (sar)-1]);\n"
+"dar := split_and_decode (destination, 0, \'\\0\\0/\');\n"
"}\n"
-"if (\':virtpermissions\' = propname)\n"
-"{\n"
-"if (0 >= can_patch_access)\n"
-"return -13;\n"
-"if (regexp_match (DAV_REGEXP_PATTERN_FOR_PERM (), propvalue) is null)\n"
-"return -17;\n"
-"if (\'R\' = st)\n"
-"update WS.WS.SYS_DAV_RES set RES_PERMS = propvalue where RES_ID = id;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_PERMS = propvalue where COL_ID = id;\n"
-"return 0;\n"
"}\n"
-"if (\':virtacl\' = propname)\n"
-"{\n"
-"if (0 >= can_patch_access)\n"
-"return -13;\n"
-"if (\'R\' = st)\n"
-"update WS.WS.SYS_DAV_RES set RES_ACL = propvalue where RES_ID = id;\n"
"else\n"
-"update WS.WS.SYS_DAV_COL set COL_ACL = propvalue where COL_ID = id;\n"
-"return 0;\n"
-"}\n"
-"if (\':virtdet\' = propname)\n"
"{\n"
-"if (1 >= can_patch_access)\n"
-"return -13;\n"
-"if (\'R\' = st)\n"
-"return -10;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_DET = propvalue where COL_ID = id;\n"
-"return 0;\n"
+"if (st = \'C\')\n"
+"return -4;\n"
"}\n"
-"if (\':virtdetmount\' = propname)\n"
+"id := DAV_SEARCH_ID (sar, st);\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
+"return id;\n"
+"\n"
+"dp_id := DAV_SEARCH_ID (dar, \'P\');\n"
+"d_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (dar, st));\n"
+"if (d_id is null)\n"
"{\n"
-"if (1 >= can_patch_access)\n"
-"return -13;\n"
-"if (\'R\' = st)\n"
-"return -10;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_DET = propvalue where COL_ID = id;\n"
-"return 0;\n"
+"if (DAV_HIDE_ERROR (dp_id) is null)\n"
+"return -2;\n"
"}\n"
-"if (\':virtdetmountable\' = propname)\n"
+"else\n"
"{\n"
-"return -10;\n"
+"dp_id := DAV_SEARCH_ID (dar, \'P\');\n"
"}\n"
-"if (\':virtprivatetags\' = propname)\n"
+"if (d_id is not null and not overwrite)\n"
+"return -3;\n"
+"\n"
+"if (d_id is not null and id = d_id)\n"
+"return -2;\n"
+"\n"
+"\n"
+"if (ouid is null)\n"
+"DAV_OWNER_ID (uid, gid, ouid, ogid);\n"
+"\n"
+"\n"
+"if (extern)\n"
"{\n"
-"if (\'R\' <> st)\n"
-"return -14;\n"
-"if (auth_uid = http_nobody_uid())\n"
-"return -16;\n"
-"if (exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid))\n"
+"if (0 > (auth_uid := DAV_AUTHENTICATE (id, st, \'1__\', auth_uname, auth_pwd)))\n"
+"return auth_uid;\n"
+"if (d_id is not null)\n"
"{\n"
-"if (not overwrite)\n"
-"return -16;\n"
-"update WS.WS.SYS_DAV_TAG set DT_TAGS = propvalue where DT_RES_ID = id and DT_U_ID = auth_uid;\n"
+"if (0 > (auth_uid := DAV_AUTHENTICATE (d_id, st, \'11_\', auth_uname, auth_pwd)))\n"
+"return auth_uid;\n"
+"}\n"
+"if (0 > (auth_uid := DAV_AUTHENTICATE (dp_id, \'C\', \'11_\', auth_uname, auth_pwd)))\n"
+"return auth_uid;\n"
"}\n"
"else\n"
+"auth_uid := ouid;\n"
+"\n"
+"if ((\'C\' = st) and DAV_HIDE_ERROR (DAV_SEARCH_ID (subseq (dar, 0, length (dar) - 1), \'R\')) is not null)\n"
"{\n"
-"insert into WS.WS.SYS_DAV_TAG (DT_RES_ID, DT_U_ID, DT_FT_ID, DT_TAGS)\n"
-"values (id, auth_uid, WS.WS.GETID (\'T\'), propvalue);\n"
+"\n"
+"return -25;\n"
"}\n"
-"return 0;\n"
+"if ((\'R\' = st) and DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (dar, vector (\'\')), \'C\')) is not null)\n"
+"{\n"
+"\n"
+"return -26;\n"
"}\n"
-"if (\':virtpublictags\' = propname)\n"
+"if ((\'C\' = st) and destination between path and DAV_COL_PATH_BOUNDARY (path))\n"
+"return -30;\n"
+"\n"
+"declare auto_version varchar;\n"
+"if (st = \'R\')\n"
+"auto_version := DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT(d_id, \'R\', \'DAV:auto-version\', 0));\n"
+"else\n"
+"auto_version := NULL;\n"
+"if (check_locks)\n"
"{\n"
-"if (\'R\' <> st)\n"
-"return -14;\n"
-"if (exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid()))\n"
+"if (auto_version <> \'DAV:locked-checkout\')\n"
"{\n"
-"if (not overwrite)\n"
-"return -16;\n"
-"update WS.WS.SYS_DAV_TAG set DT_TAGS = propvalue where DT_RES_ID = id and DT_U_ID = http_nobody_uid();\n"
+"if (0 <> (rc := DAV_IS_LOCKED (id , st, check_locks)))\n"
+"return rc;\n"
+"if (d_id is null)\n"
+"rc := DAV_IS_LOCKED (dp_id , \'C\', check_locks);\n"
+"else\n"
+"rc := DAV_IS_LOCKED (d_id , st, check_locks);\n"
+"if (0 <> rc)\n"
+"return (case when rc = -8 then -9 else rc end);\n"
"}\n"
"else\n"
"{\n"
-"insert into WS.WS.SYS_DAV_TAG (DT_RES_ID, DT_U_ID, DT_FT_ID, DT_TAGS)\n"
-"values (id, http_nobody_uid(), WS.WS.GETID (\'T\'), propvalue);\n"
+"rc := DAV_IS_LOCKED (d_id , st, check_locks);\n"
+"if (rc = -8)\n"
+"{\n"
+"rc := DAV_CHECKOUT_INT (d_id, null, null, 0);\n"
+"if (rc < 0)\n"
+"return rc;\n"
"}\n"
-"return 0;\n"
+"else if (0 <> rc)\n"
+"return rc;\n"
"}\n"
-"return -16;\n"
"}\n"
"\n"
-"if ((not overwrite) and exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id and PROP_TYPE = st))\n"
-"return -16;\n"
-"\n"
-"resv := vector (\'creationdate\',\'y\',\'getcontentlength\',\'y\',\'getcontenttype\',\'y\',\'getetag\',\'y\',\'getlastmodified\',\'y\',\'lockdiscovery\',\'y\',\'resourcetype\',\'y\',\'activelock\',\'y\',\'supportedlock\',\'y\');\n"
-"\n"
-"if (not isstring (propname) or \'y\' = get_keyword (propname, resv, \'n\'))\n"
-"return -10;\n"
-"\n"
-"if (__tag (propvalue) = 193)\n"
-"propvalue := serialize (propvalue);\n"
-"else if (not isstring (propvalue))\n"
-"return -17;\n"
-"\n"
-"pid := WS.WS.GETID (\'P\');\n"
+"if (isarray (dp_id))\n"
+"dp_det := dp_id[0];\n"
+"else\n"
+"dp_det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=dp_id), NULL);\n"
+"if (dp_det is not null)\n"
+"{\n"
+"declare detcol_id integer;\n"
+"declare detcol_path, unreached_path any;\n"
+"DAV_SEARCH_ID_OR_DET (dar, st, dp_det, detcol_id, detcol_path, unreached_path);\n"
+"return call (cast (dp_det as varchar) || \'_DAV_RES_UPLOAD_COPY\') (detcol_id, unreached_path, id, st, overwrite, permissions, ouid, ogid, auth_uid);\n"
+"}\n"
"\n"
-"if ((propname not like \'DAV:%\')\n"
-"and (propname not like \'virt:%\')\n"
-"and (propname[0] <> 58))\n"
+"if (st = \'R\')\n"
"{\n"
-"if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, \'R\', \'DAV:checked-in\', 0)) is not null)\n"
+"declare newid integer;\n"
+"if (d_id is not null)\n"
"{\n"
-"\n"
-"return -38;\n"
+"if (isarray (id))\n"
+"{\n"
+"declare rt varchar;\n"
+"declare rcnt any;\n"
+"rcnt := string_output ();\n"
+"rc := call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, rcnt, rt, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"update WS.WS.SYS_DAV_RES set RES_CONTENT = rcnt, RES_TYPE = rt, RES_OWNER = ouid,\n"
+"RES_GROUP = ogid, RES_PERMS = permissions, RES_MOD_TIME = now ()\n"
+"where RES_ID = d_id;\n"
"}\n"
-"if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, \'R\', \'DAV:checked-out\', 0)) is not null)\n"
+"else\n"
+"for select RES_TYPE as rt, RES_CONTENT as rcnt from WS.WS.SYS_DAV_RES where RES_ID = id do\n"
"{\n"
-"if ((locked and (auto_version = \'DAV:checkout-unlocked-checkin\')) or\n"
-"(auto_version = \'DAV:checkout\') or\n"
-"(locked and (auto_version = \'DAV:locked-checkout\')))\n"
+"update WS.WS.SYS_DAV_RES set RES_CONTENT = rcnt, RES_TYPE = rt, RES_OWNER = ouid,\n"
+"RES_GROUP = ogid, RES_PERMS = permissions, RES_MOD_TIME = now ()\n"
+"where RES_ID = d_id;\n"
+"}\n"
+"newid := d_id;\n"
+"}\n"
+"else\n"
"{\n"
-"declare _res int;\n"
-"_res := DAV_CHECKOUT_INT (id, null, null, 0);\n"
-"if (_res < 0)\n"
-"return _res;\n"
+"declare rname varchar;\n"
+"rname := aref (dar, length (dar)-1);\n"
+"if (rname = \'\')\n"
+"return -2;\n"
+"newid := WS.WS.GETID (\'R\');\n"
+"if (isarray (id))\n"
+"{\n"
+"declare rt varchar;\n"
+"declare rcnt any;\n"
+"rcnt := string_output ();\n"
+"rc := call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, rcnt, rt, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_FULL_PATH,\n"
+"RES_OWNER, RES_GROUP, RES_PERMS,\n"
+"RES_CR_TIME, RES_MOD_TIME,\n"
+"RES_TYPE, RES_CONTENT)\n"
+"values (newid, rname, dp_id, destination, ouid, ogid, permissions, now(), now (), rt, rcnt);\n"
+"}\n"
+"else\n"
+"for select RES_TYPE as rt, RES_CONTENT as rcnt, RES_NAME as mname from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = id do\n"
+"{\n"
+"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_FULL_PATH,\n"
+"RES_OWNER, RES_GROUP, RES_PERMS,\n"
+"RES_CR_TIME, RES_MOD_TIME,\n"
+"RES_TYPE, RES_CONTENT)\n"
+"values (newid, rname, dp_id, destination, ouid, ogid, permissions, now(), now (), rt, rcnt);\n"
"}\n"
"}\n"
+"prop_list := DAV_HIDE_ERROR (DAV_PROP_LIST_INT (id, \'R\', \'%\', 0, auth_uname, auth_pwd), vector ());\n"
+"foreach (any prop in prop_list) do {\n"
+"DAV_PROP_SET_INT (destination, prop[0], prop[1], null, null, 0, 0, 0, auth_uid);\n"
"}\n"
-"update WS.WS.SYS_DAV_PROP set PROP_VALUE = propvalue where PROP_NAME = propname\n"
-"and PROP_PARENT_ID = id and PROP_TYPE = st;\n"
-"if (row_count() = 0)\n"
+"tag_list := DAV_HIDE_ERROR (DAV_TAG_LIST (id, st, NULL), vector ());\n"
+"foreach (any tagpair in tag_list) do {\n"
+"DAV_TAG_SET (newid, \'R\', tagpair[0], tagpair[1]);\n"
+"}\n"
+"}\n"
+"else if (st = \'C\')\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_VALUE, PROP_PARENT_ID, PROP_TYPE)\n"
-"values (pid, propname, propvalue, id, st);\n"
+"declare cname varchar;\n"
+"declare newid integer;\n"
+"cname := aref (dar, length (dar)-1);\n"
+"if (cname <> \'\')\n"
+"return -2;\n"
+"cname := aref (dar, length (dar)-2);\n"
+"if (cname = \'\')\n"
+"return -2;\n"
+"if (isarray (id) and (id[0] like \'%CatFilter\'))\n"
+"return -39;\n"
+"if (d_id is not null)\n"
+"{\n"
+"declare rrc integer;\n"
+"rrc := DAV_DELETE_INT (destination, 0, auth_uname, auth_pwd, 0);\n"
+"if (rrc <> 1)\n"
+"{\n"
+"rollback work;\n"
+"return rrc;\n"
"}\n"
-"return pid;\n"
"}\n"
-"--src dav_api.sql:3739\n";
-
-static const char *proc142 =
-"#line 3950 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_PROP_REMOVE (\n"
-"in path varchar,\n"
-"in propname varchar,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null)\n"
+"newid := DAV_COL_CREATE_INT (destination, permissions, uid, gid, auth_uname, auth_pwd, 0, 0, 0, ouid, ogid);\n"
+"if (DAV_HIDE_ERROR (newid) is null)\n"
"{\n"
-"return DAV_PROP_REMOVE_INT (path, propname, auth_uname, auth_pwd);\n"
+"rollback work;\n"
+"return newid;\n"
+"}\n"
+"prop_list := DAV_HIDE_ERROR (DAV_PROP_LIST_INT (id, \'C\', \'%\', 0, auth_uname, auth_pwd), vector ());\n"
+"foreach (any prop in prop_list) do {\n"
+"DAV_PROP_SET_INT (destination, prop[0], prop[1], null, null, 0, 0, 0, auth_uid);\n"
+"}\n"
+"DAV_COPY_SUBTREE (id , newid, sar, destination, 1, ouid, ogid, auth_uname, auth_pwd, auth_uid);\n"
+"}\n"
+"return 1;\n"
+"\n"
+"insufficient_storage:\n"
+"return -41;\n"
+"disabled_owner:\n"
+"return -42;\n"
+"disabled_home:\n"
+"return -43;\n"
"}\n"
-"--src dav_api.sql:3948\n";
+"--src dav_api.sql:2974\n";
-static const char *proc143 =
-"#line 3962 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_PROP_REMOVE_INT (\n"
-"in path varchar,\n"
-"in propname varchar,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null,\n"
-"in extern integer := 1,\n"
-"in check_locks any := 1,\n"
-"in ignore_if_missing integer := 0,\n"
-"in auth_uid integer := null ) returns integer\n"
+static const char *proc139 =
+"#line 3242 \"[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"
+"in auth_uname varchar, in auth_pwd varchar, in auth_uid integer ) returns any\n"
"{\n"
-"declare id, rc, pid integer;\n"
-"declare st, det varchar;\n"
-"declare resv any;\n"
-"declare locked int;\n"
-"declare auto_version varchar;\n"
-"\n"
-"rc := DAV_PREPARE_PROP_WRITE (path, id, st, propname, auth_uname, auth_pwd, auth_uid, extern, auto_version, check_locks, locked);\n"
+"declare dirlist, ret, rc any;\n"
"\n"
-"if (rc < 0)\n"
-"return rc;\n"
-"if (isarray (id))\n"
+"vectorbld_init (ret);\n"
+"dirlist := DAV_DIR_LIST_INT (DAV_CONCAT_PATH (\'/\', sar), 0, \'%\', NULL, NULL, auth_uid);\n"
+"foreach (any res in dirlist) do\n"
"{\n"
-"pid := call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\') (id, st, propname, ignore_if_missing, auth_uid);\n"
-"return pid;\n"
+"if (\'R\' = res[1])\n"
+"{\n"
+"declare target_path varchar;\n"
+"target_path := DAV_CONCAT_PATH (dar, res[10]);\n"
+"rc := DAV_AUTHENTICATE (res[4], \'R\', \'1__\', auth_uname, auth_pwd, auth_uid);\n"
+"\n"
+"\n"
+"if (rc >= 0)\n"
+"rc := DAV_COPY_INT (res[0], target_path, overwrite, res[5], res[7], res[6], auth_uname, auth_pwd, 0, 1, ouid, ogid );\n"
+"vectorbld_acc (ret, vector (res[0], target_path, rc));\n"
"}\n"
-"return DAV_PROP_REMOVE_RAW (id, st, propname, ignore_if_missing, auth_uid, locked, auto_version);\n"
"}\n"
-"--src dav_api.sql:3960\n";
-
-static const char *proc144 =
-"#line 3993 \"[executable]/dav_api.sql\"\n"
-"create function\n"
-"DAV_PROP_REMOVE_RAW (\n"
-"inout id integer,\n"
-"in st char(0),\n"
-"inout propname varchar,\n"
-"in ignore_if_missing integer,\n"
-"in auth_uid integer,\n"
-"in locked int:=0,\n"
-"in auto_version varchar:=NULL\n"
-") returns integer\n"
+"foreach (any res in dirlist) do\n"
"{\n"
-"declare pid integer;\n"
-"declare resv any;\n"
-"declare can_patch_access integer;\n"
-"if (58 = propname[0])\n"
+"if (\'C\' = res[1])\n"
"{\n"
-"if (propname in (\':getlastmodified\', \':creationdate\', \':getcontenttype\', \':virtowneruid\', \':virtownergid\', \':virtpermissions\', \':virtdetmountable\'))\n"
-"return -10;\n"
-"if (auth_uid = http_dav_uid())\n"
-"can_patch_access := 2;\n"
-"\n"
-"\n"
-"else\n"
-"if (\'R\' = st)\n"
-"can_patch_access := coalesce ((select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = id and RES_OWNER = auth_uid), 0);\n"
-"else\n"
-"can_patch_access := coalesce ((select top 1 1 from WS.WS.SYS_DAV_COL where COL_ID = id and COL_OWNER = auth_uid), 0);\n"
-"if (\':virtacl\' = propname)\n"
+"declare target_path varchar;\n"
+"target_path := DAV_CONCAT_PATH (dar, res[10]) || \'/\';\n"
+"rc := DAV_AUTHENTICATE (res[4], \'C\', \'1__\', auth_uname, auth_pwd, auth_uid);\n"
+"if (rc >= 0)\n"
"{\n"
-"if (0 >= can_patch_access)\n"
-"return -13;\n"
-"if (\'R\' = st)\n"
-"update WS.WS.SYS_DAV_RES set RES_ACL = NULL where RES_ID = id;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_ACL = NULL where COL_ID = id;\n"
-"return 0;\n"
-"}\n"
-"if (\':virtdet\' = propname)\n"
+"declare new_tgt_id integer;\n"
+"if (isarray (res[4]) and (res[4][0] like \'%CatFilter\'))\n"
"{\n"
-"if (1 >= can_patch_access)\n"
-"return -13;\n"
-"if (\'R\' = st)\n"
-"return -10;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_DET = NULL where COL_ID = id;\n"
-"return 0;\n"
+"vectorbld_acc (ret, vector (res[0], target_path, -39));\n"
+"goto item_done; /* see below */\n"
"}\n"
-"if (\':virtdetmount\' = propname)\n"
+"\n"
+"new_tgt_id := DAV_COL_CREATE_INT (target_path, res[5], res[7], res[6], auth_uname, auth_pwd, 0, 0, 0, ouid, ogid );\n"
+"vectorbld_acc (ret, vector (res[0], target_path, new_tgt_id));\n"
+"if (DAV_HIDE_ERROR (new_tgt_id) is not null)\n"
"{\n"
-"if (1 >= can_patch_access)\n"
-"return -13;\n"
-"if (\'R\' = st)\n"
-"return -10;\n"
-"else\n"
-"update WS.WS.SYS_DAV_COL set COL_DET = NULL where COL_ID = id;\n"
-"return 0;\n"
-"}\n"
-"if (\':virtprivatetags\' = propname)\n"
+"declare prop_list any;\n"
+"prop_list := DAV_HIDE_ERROR (DAV_PROP_LIST_INT (res[4], \'C\', \'%\', 0, auth_uname, auth_pwd), vector ());\n"
+"foreach (any prop in prop_list) do\n"
"{\n"
-"if ((\'R\' <> st) or (auth_uid = http_nobody_uid()) or (not exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid)))\n"
-"goto nosuchprop;\n"
-"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid;\n"
-"return 0;\n"
+"DAV_PROP_SET_RAW (new_tgt_id, \'C\', prop[0], prop[1], 0, auth_uid);\n"
"}\n"
-"if (\':virtpublictags\' = propname)\n"
-"{\n"
-"if ((\'R\' <> st) or (not exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid())))\n"
-"goto nosuchprop;\n"
-"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid();\n"
-"return 0;\n"
"}\n"
-"return -16;\n"
+"rc := DAV_COPY_SUBTREE (res[4], new_tgt_id, res[0], target_path, overwrite, ouid, ogid, auth_uname, auth_pwd, auth_uid);\n"
+"vectorbld_concat_acc (ret, rc);\n"
+"item_done:;\n"
"}\n"
-"\n"
-"if (not exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id\n"
-"and PROP_TYPE = st))\n"
-"{\n"
-"goto nosuchprop;\n"
"}\n"
-"delete from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id and PROP_TYPE = st;\n"
-"return 0;\n"
-"nosuchprop:\n"
-"if (ignore_if_missing)\n"
-"return 0;\n"
-"else\n"
-"return -11;\n"
"}\n"
-"--src dav_api.sql:3991\n";
+"vectorbld_final (ret);\n"
+"return ret;\n"
+"}\n"
+"--src dav_api.sql:3240\n";
-static const char *proc145 =
-"#line 4084 \"[executable]/dav_api.sql\"\n"
+static const char *proc140 =
+"#line 3305 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
-"DAV_PROP_GET (\n"
-"in path varchar,\n"
-"in propname varchar,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null) returns any\n"
+"DAV_MOVE (in path varchar,\n"
+"in destination varchar,\n"
+"in overwrite integer := 0,\n"
+"in auth_uname varchar,\n"
+"in auth_pwd varchar)\n"
"{\n"
-"declare st varchar;\n"
-"if ((path <> \'\') and (path[length(path)-1] = 47))\n"
-"st := \'C\';\n"
-"else\n"
-"st := \'R\';\n"
-"return DAV_PROP_GET_INT (DAV_SEARCH_ID (path, st), st, propname, 1, auth_uname, auth_pwd);\n"
+"return DAV_MOVE_INT (path, destination, overwrite, auth_uname, auth_pwd, 1);\n"
"}\n"
-"--src dav_api.sql:4082\n";
+"--src dav_api.sql:3303\n";
-static const char *proc146 =
-"#line 4101 \"[executable]/dav_api.sql\"\n"
+static const char *proc141 =
+"#line 3317 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
-"DAV_PROP_GET_INT (\n"
-"in id any,\n"
-"in what char(0),\n"
-"in propname varchar,\n"
+"DAV_MOVE_INT (in path varchar,\n"
+"in destination varchar,\n"
+"in overwrite integer := 0,\n"
+"in auth_uname varchar,\n"
+"in auth_pwd varchar,\n"
"in extern integer := 1,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null,\n"
-"in auth_uid integer := null ) returns any\n"
+"in check_locks any := 1 )\n"
"{\n"
-"declare rc integer;\n"
-"declare ret any;\n"
+"declare id, d_id, dp_id, rc integer;\n"
+"declare auth_uid integer;\n"
+"declare st, dp_det char;\n"
+"declare sar, dar, prop_list any;\n"
+"whenever sqlstate \'HT507\' goto insufficient_storage;\n"
+"whenever sqlstate \'HT508\' goto disabled_owner;\n"
+"whenever sqlstate \'HT509\' goto disabled_home;\n"
"\n"
-"if (propname is null)\n"
-"return -11;\n"
-"if (not (isstring (propname)))\n"
-"propname := cast (propname as varchar);\n"
-"if (\'\' = propname)\n"
-"return -11;\n"
-"if (extern)\n"
-"{\n"
-"auth_uid := DAV_AUTHENTICATE (id, what, \'1__\', auth_uname, auth_pwd);\n"
-"if (auth_uid < 0)\n"
-"return auth_uid;\n"
-"}\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
+"\n"
+"sar := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"dar := split_and_decode (destination, 0, \'\\0\\0/\');\n"
+"\n"
+"if (aref (sar, 0) <> \'\')\n"
"return -1;\n"
-"if (propname[0] = 58)\n"
+"if (aref (sar, length (sar) - 1) = \'\')\n"
+"st := \'C\';\n"
+"else\n"
+"st := \'R\';\n"
+"\n"
+"if (aref (dar, 0) <> \'\')\n"
+"return -2;\n"
+"if (aref (dar, length (dar) - 1) = \'\')\n"
"{\n"
-"declare idx integer;\n"
-"idx := get_keyword (propname,\n"
-"vector (\n"
-"\':getlastmodified\', 3,\n"
-"\':creationdate\', 8,\n"
-"\':lastaccessed\', 3,\n"
-"\':getetag\', -1,\n"
-"\':getcontenttype\', 9,\n"
-"\':getcontentlength\', 2,\n"
-"\':resourcetype\', -1,\n"
-"\':virtowneruid\', 7,\n"
-"\':virtownergid\', 6,\n"
-"\':virtpermissions\', 5,\n"
-"\':virtacl\', -1,\n"
-"\':virtdet\', -1,\n"
-"\':virtdetmount\', -1,\n"
-"\':virtdetmountable\', -1,\n"
-"\':virtpublictags\', -1,\n"
-"\':virtprivatetags\', -1,\n"
-"\':virttags\', -1 ) );\n"
-"if (idx is null)\n"
-"return -11;\n"
-"if (idx >= 0)\n"
+"if (st = \'R\')\n"
"{\n"
-"declare dirsingle any;\n"
-"dirsingle := DAV_DIR_SINGLE_INT (id, what, \'fake\', auth_uname, auth_pwd, auth_uid);\n"
-"if (isarray (dirsingle))\n"
-"return dirsingle[idx];\n"
-"return -1;\n"
+"destination := concat (destination, sar[length (sar)-1]);\n"
+"dar := split_and_decode (destination, 0, \'\\0\\0/\');\n"
"}\n"
-"if (\':getetag\' = propname)\n"
-"{\n"
-"if (\'R\' = what)\n"
-"{\n"
-"if (isarray (id))\n"
-"{\n"
-"declare dirsingle any;\n"
-"declare path varchar;\n"
-"path := DAV_SEARCH_PATH (id, \'R\');\n"
-"dirsingle := call (cast (id[0] as varchar) || \'_DAV_DIR_SINGLE\') (id, \'R\', path, auth_uid);\n"
-"return sprintf (\'%s-%s-%d-%s\', cast (id[1] as varchar), replace (cast (dirsingle[3] as varchar), \' \', \'T\'), dirsingle[2], md5 (path));\n"
"}\n"
"else\n"
"{\n"
-"declare name varchar;\n"
-"declare col_id integer;\n"
-"select RES_NAME, RES_COL into name, col_id from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
-"return WS.WS.ETAG (name, col_id);\n"
+"if (st = \'C\')\n"
+"return -4;\n"
"}\n"
+"\n"
+"id := DAV_SEARCH_ID (sar, st);\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
+"return id;\n"
+"\n"
+"dp_id := DAV_SEARCH_ID (dar, \'P\');\n"
+"d_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (dar, st));\n"
+"if (d_id is null)\n"
+"{\n"
+"if (DAV_HIDE_ERROR (dp_id) is null)\n"
+"return -2;\n"
"}\n"
"else\n"
-"return null;\n"
-"}\n"
-"if (\':resourcetype\' = propname)\n"
"{\n"
-"if (what = \'C\')\n"
-"return xtree_doc (\'<D:collection/>\');\n"
-"else\n"
-"return null;\n"
+"dp_id := DAV_SEARCH_ID (dar, \'P\');\n"
"}\n"
-"if (\':virtacl\' = propname)\n"
+"if (d_id is not null and not overwrite)\n"
+"return -3;\n"
+"\n"
+"if (d_id is not null and id = d_id)\n"
+"return -2;\n"
+"\n"
+"\n"
+"if (extern)\n"
"{\n"
-"if (isarray (id))\n"
+"if (0 > (auth_uid := DAV_AUTHENTICATE (id, st, \'11_\', auth_uname, auth_pwd)))\n"
+"return auth_uid;\n"
+"if (d_id is not null)\n"
"{\n"
-"return coalesce ((select COL_ACL from WS.WS.SYS_DAV_COL where COL_ID = id[1]));\n"
+"if (0 > (auth_uid := DAV_AUTHENTICATE (d_id, st, \'11_\', auth_uname, auth_pwd)))\n"
+"return auth_uid;\n"
+"}\n"
+"if (0 > (auth_uid := DAV_AUTHENTICATE (dp_id, \'C\', \'11_\', auth_uname, auth_pwd)))\n"
+"return auth_uid;\n"
"}\n"
"else\n"
+"auth_uid := http_nobody_uid ();\n"
+"\n"
+"if ((\'C\' = st) and DAV_HIDE_ERROR (DAV_SEARCH_ID (subseq (dar, 0, length (dar) - 1), \'R\')) is not null)\n"
"{\n"
-"if (\'R\' = what)\n"
-"return coalesce ((select RES_ACL from WS.WS.SYS_DAV_RES where RES_ID = id));\n"
-"else\n"
-"return coalesce ((select COL_ACL from WS.WS.SYS_DAV_COL where COL_ID = id));\n"
-"}\n"
+"\n"
+"return -25;\n"
"}\n"
-"if (\':virtdet\' = propname)\n"
-"{\n"
-"if (isarray (id))\n"
+"if ((\'R\' = st) and (0 = overwrite) and DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (dar, vector (\'\')), \'C\')) is not null)\n"
"{\n"
-"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
-"return coalesce (DAV_HIDE_ERROR (ret), id[0]);\n"
+"\n"
+"return -26;\n"
"}\n"
-"else\n"
+"if ((\'C\' = st) and destination between path and DAV_COL_PATH_BOUNDARY (path))\n"
+"return -30;\n"
+"if (check_locks)\n"
"{\n"
-"if (\'R\' = what)\n"
-"return null;\n"
+"if (0 <> (rc := DAV_IS_LOCKED (id , st, check_locks)))\n"
+"return rc;\n"
+"if (d_id is null)\n"
+"rc := DAV_IS_LOCKED (dp_id , \'C\', check_locks);\n"
"else\n"
-"return coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = id));\n"
+"rc := DAV_IS_LOCKED (d_id , st, check_locks);\n"
+"if (0 <> rc)\n"
+"return (case when rc = -8 then -9 else rc end);\n"
"}\n"
+"\n"
+"if (isarray (dp_id))\n"
+"dp_det := dp_id[0];\n"
+"else\n"
+"dp_det := coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=dp_id), NULL);\n"
+"if (dp_det is not null)\n"
+"{\n"
+"declare detcol_id integer;\n"
+"declare detcol_path, unreached_path any;\n"
+"DAV_SEARCH_ID_OR_DET (dar, st, dp_det, detcol_id, detcol_path, unreached_path);\n"
+"return call (cast (dp_det as varchar) || \'_DAV_RES_UPLOAD_MOVE\') (detcol_id, unreached_path, id, st, overwrite, auth_uid);\n"
"}\n"
-"if (\':virtdetmount\' = propname)\n"
+"\n"
+"if (st = \'R\')\n"
+"{\n"
+"\n"
+"if (d_id is not null)\n"
"{\n"
+"\n"
"if (isarray (id))\n"
"{\n"
-"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
-"return DAV_HIDE_ERROR (ret);\n"
+"declare rt varchar;\n"
+"declare rcnt any;\n"
+"declare dirsingle any;\n"
+"dirsingle := call (cast (id[0] as varchar) || \'_DAV_DIR_SINGLE\') (id, \'R\', path, auth_uid);\n"
+"if (isinteger (dirsingle))\n"
+"{\n"
+"signal (\'.....\', sprintf (\'DAV_DIR_SINGLE failed during DAV_MOVE\'));\n"
+"return -100;\n"
+"}\n"
+"rcnt := string_output ();\n"
+"rc := call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, rcnt, rt, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"update WS.WS.SYS_DAV_RES set RES_CONTENT = rcnt, RES_TYPE = rt, RES_OWNER = dirsingle[7],\n"
+"RES_GROUP = dirsingle[6], RES_PERMS = dirsingle[5], RES_MOD_TIME = now ()\n"
+"where RES_ID = d_id;\n"
+"rc := DAV_DELETE_INT (path, 1, null, null, 0);\n"
+"if (rc < 0)\n"
+"return rc;\n"
"}\n"
"else\n"
"{\n"
-"if (\'R\' = what)\n"
-"return null;\n"
-"else\n"
-"return coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = id));\n"
+"declare pid integer;\n"
+"declare rname, rtype varchar;\n"
+"select RES_COL, RES_NAME, RES_TYPE into pid, rname, rtype from WS.WS.SYS_DAV_RES where RES_ID = d_id;\n"
+"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = d_id;\n"
+"delete from WS.WS.SYS_DAV_RES where RES_ID = d_id;\n"
+"update WS.WS.SYS_DAV_RES set RES_COL = dp_id, RES_NAME = rname,\n"
+"RES_MOD_TIME = now () where RES_ID = id;\n"
+"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE=\'R\' and LOCK_PARENT_ID=id;\n"
+"update WS.WS.SYS_DAV_LOCK set LOCK_PARENT_ID = id where LOCK_PARENT_TYPE=\'R\' and LOCK_PARENT_ID=d_id;\n"
+"\n"
"}\n"
"}\n"
-"if (\':virtdetmountable\' = propname)\n"
+"else\n"
"{\n"
+"declare rname varchar;\n"
+"rname := aref (dar, length (dar)-1);\n"
+"if (rname = \'\')\n"
+"return -3;\n"
"if (isarray (id))\n"
"{\n"
-"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
-"return DAV_HIDE_ERROR (ret);\n"
-"}\n"
-"else\n"
+"declare rt varchar;\n"
+"declare rcnt any;\n"
+"declare newid integer;\n"
+"declare dirsingle any;\n"
+"newid := WS.WS.GETID (\'R\');\n"
+"dirsingle := call (cast (id[0] as varchar) || \'_DAV_DIR_SINGLE\') (id, \'R\', path, auth_uid);\n"
+"if (isinteger (dirsingle))\n"
"{\n"
-"if (\'R\' = what)\n"
-"return null;\n"
-"else\n"
-"return \'T\';\n"
+"signal (\'.....\', sprintf (\'DAV_DIR_SINGLE failed during DAV_MOVE\'));\n"
+"return -100;\n"
"}\n"
+"rcnt := string_output ();\n"
+"rc := call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, rcnt, rt, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"insert into WS.WS.SYS_DAV_RES (RES_ID, RES_NAME, RES_COL, RES_FULL_PATH,\n"
+"RES_OWNER, RES_GROUP, RES_PERMS,\n"
+"RES_CR_TIME, RES_MOD_TIME,\n"
+"RES_TYPE, RES_CONTENT)\n"
+"values (newid, rname, dp_id, destination, dirsingle[7], dirsingle[6], dirsingle[5], now(), now (), rt, rcnt);\n"
+"rc := DAV_DELETE_INT (path, 1, null, null, 0);\n"
+"if (rc < 0)\n"
+"return rc;\n"
"}\n"
-"if (isarray (id))\n"
-"{\n"
-"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
-"return ret;\n"
+"else\n"
+"update WS.WS.SYS_DAV_RES set RES_COL = dp_id, RES_NAME = rname,\n"
+"RES_MOD_TIME = now () where RES_ID = id;\n"
+"\n"
+"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE=\'R\' and LOCK_PARENT_ID=id;\n"
"}\n"
-"if (\':virtprivatetags\' = propname)\n"
+"prop_list := DAV_HIDE_ERROR (DAV_PROP_LIST_INT (id, st, \'%\', 0, auth_uname, auth_pwd), vector ());\n"
+"foreach (any prop in prop_list) do\n"
"{\n"
-"if ((\'R\' <> what) or (auth_uid = http_nobody_uid()))\n"
-"return null;\n"
-"return coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid));\n"
+"\n"
+"if (prop[0] not in (\'DAV:checked-in\', \'DAV:checked-out\', \'DAV:version-history\'))\n"
+"DAV_PROP_SET_INT (destination, prop[0], prop[1], null, null, 0, 0, 0, auth_uid);\n"
"}\n"
-"if (\':virtpublictags\' = propname)\n"
-"{\n"
-"if (\'R\' <> what)\n"
-"return null;\n"
-"return coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid()));\n"
"}\n"
-"if (\':virttags\' = propname)\n"
+"else if (st = \'C\')\n"
"{\n"
-"if (\'R\' <> what)\n"
-"return null;\n"
-"if (auth_uid = http_nobody_uid())\n"
+"declare rname varchar;\n"
+"rname := aref (dar, length (dar)-1);\n"
+"if (rname <> \'\')\n"
+"return -3;\n"
+"rname := aref (dar, length (dar)-2);\n"
+"if (rname = \'\')\n"
+"return -3;\n"
+"if (d_id is not null)\n"
"{\n"
-"return coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid()));\n"
+"declare rrc integer;\n"
+"rrc := DAV_DELETE_INT (destination, 0, auth_uname, auth_pwd, 0);\n"
+"if (rrc <> 1)\n"
+"{\n"
+"rollback work;\n"
+"return rrc;\n"
"}\n"
-"else\n"
+"}\n"
+"if (not exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = id))\n"
"{\n"
-"declare pub, priv varchar;\n"
-"pub := coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid()), \'\');\n"
-"priv := coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid), \'\');\n"
-"if (pub = \'\')\n"
-"return priv;\n"
-"if (priv = \'\')\n"
-"return pub;\n"
-"return pub || \', \' || priv;\n"
+"rollback work;\n"
+"return -2;\n"
"}\n"
+"update WS.WS.SYS_DAV_COL set COL_NAME = rname, COL_PARENT = dp_id, COL_MOD_TIME = now ()\n"
+"where COL_ID = id;\n"
+"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE=\'C\' and LOCK_PARENT_ID=id;\n"
+"if (d_id is not null)\n"
+"update WS.WS.SYS_DAV_LOCK set LOCK_PARENT_ID = id where LOCK_PARENT_TYPE=\'C\' and LOCK_PARENT_ID=d_id;\n"
"}\n"
+"return 1;\n"
+"\n"
+"insufficient_storage:\n"
+"return -41;\n"
+"disabled_owner:\n"
+"return -42;\n"
+"disabled_home:\n"
+"return -43;\n"
"}\n"
-"if (isarray (id))\n"
+"--src dav_api.sql:3315\n";
+
+static const char *proc142 =
+"#line 3564 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_GET_OWNER (in id any, in st char(1)) returns integer\n"
"{\n"
-"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
-"return ret;\n"
-"}\n"
-"if (id < 0)\n"
+"if (isarray (id))\n"
"{\n"
-"return id;\n"
+"declare diritm any;\n"
+"diritm := DAV_DIR_SINGLE_INT (id, st, \'\', null, null, http_dav_uid ());\n"
+"if (DAV_HIDE_ERROR (diritm) is null)\n"
+"return diritm;\n"
+"return diritm [7];\n"
"}\n"
-"whenever not found goto no_prop;\n"
-"select blob_to_string (PROP_VALUE) into ret from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id and PROP_TYPE = what;\n"
-"return ret;\n"
-"\n"
-"no_prop:\n"
-"return -11;\n"
+"if (\'C\' = st)\n"
+"return coalesce ((select COL_OWNER from WS.WS.SYS_DAV_COL where COL_ID = id), -1);\n"
+"if (\'R\' = st)\n"
+"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:4099\n";
+"--src dav_api.sql:3562\n";
-static const char *proc147 =
-"#line 4307 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_PROP_LIST (\n"
+static const char *proc143 =
+"#line 3584 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_PREPARE_PROP_WRITE (\n"
"in path varchar,\n"
-"in propmask varchar,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null)\n"
+"out id any,\n"
+"out st varchar,\n"
+"in propname varchar,\n"
+"in auth_uname varchar,\n"
+"in auth_pwd varchar,\n"
+"inout auth_uid integer,\n"
+"in extern integer,\n"
+"out auto_version varchar,\n"
+"inout check_locks any,\n"
+"out locked integer) returns integer\n"
"{\n"
-"declare st varchar;\n"
+"declare rc integer;\n"
"if ((path <> \'\') and (path[length(path)-1] = 47))\n"
"st := \'C\';\n"
"else\n"
"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:4305\n";
-
-static const char *proc148 =
-"#line 4323 \"[executable]/dav_api.sql\"\n"
-"create procedure\n"
-"DAV_PROP_LIST_INT (\n"
-"in id any,\n"
-"in what char(0),\n"
-"in propmask varchar,\n"
-"in extern integer := 1,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null)\n"
-"{\n"
-"declare auth_uid, rc integer;\n"
-"declare ret any;\n"
+"id := DAV_SEARCH_ID (path, st);\n"
"\n"
-"if (extern)\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
"{\n"
-"auth_uid := DAV_AUTHENTICATE (id, what, \'1__\', auth_uname, auth_pwd);\n"
-"if (auth_uid < 0)\n"
-"return auth_uid;\n"
+"return id;\n"
"}\n"
-"\n"
-"\n"
-"\n"
-"if (isarray (id))\n"
-"{\n"
-"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_LIST\') (id, what, propmask, auth_uid);\n"
-"return ret;\n"
-"}\n"
-"if (id < 0)\n"
-"{\n"
-"return id;\n"
-"}\n"
-"ret := vector ();\n"
-"for select PROP_NAME, PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_NAME like propmask and PROP_PARENT_ID = id and PROP_TYPE = what do {\n"
-"ret := vector_concat (ret, vector (vector (PROP_NAME, blob_to_string (PROP_VALUE))));\n"
-"}\n"
-"return ret;\n"
-"}\n"
-"--src dav_api.sql:4321\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"
+"if (extern)\n"
"{\n"
-"declare pat any;\n"
-"declare col, len, inx, t_col integer;\n"
-"\n"
-"pat := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"\n"
-"if (length (pat) < 3)\n"
-"return NULL;\n"
-"\n"
-"if (pat[1] <> \'DAV\' or pat[0] <> \'\')\n"
-"signal (\'22023\', \'Not valid path string\');\n"
-"\n"
-"len := length (pat) - 1;\n"
-"inx := 2;\n"
-"t_col := 1;\n"
-"whenever not found goto nf;\n"
-"while (inx < len)\n"
+"auth_uid := DAV_AUTHENTICATE (id, st, \'11_\', auth_uname, auth_pwd);\n"
+"if (auth_uid >= 0)\n"
+"goto auth_uid_ok;\n"
+"if ((auth_uid = -13) and (propname = \':virtprivatetags\'))\n"
"{\n"
-"select COL_ID into col from WS.WS.SYS_DAV_COL where COL_PARENT = t_col and COL_NAME = pat[inx];\n"
-"t_col := col;\n"
-"inx := inx + 1;\n"
+"auth_uid := DAV_AUTHENTICATE (id, st, \'1__\', auth_uname, auth_pwd);\n"
+"if (auth_uid >= 0)\n"
+"goto auth_uid_ok;\n"
"}\n"
-"nf:\n"
-"while (inx < len)\n"
+"if ((auth_uid = -13) and (propname in (\':virtpermissions\', \':virtowneruid\', \':virtownergid\', \':virtacl\')))\n"
"{\n"
-"col := WS.WS.GETID (\'C\');\n"
-"insert into WS.WS.SYS_DAV_COL\n"
-"(COL_ID, COL_NAME, COL_PARENT, COL_CR_TIME, COL_MOD_TIME, COL_OWNER, COL_GROUP, COL_PERMS)\n"
-"values (col, pat[inx], t_col, now (), now (), own, grp, perms);\n"
-"inx := inx + 1;\n"
-"t_col := col;\n"
+"auth_uid := DAV_AUTHENTICATE (id, st, \'___\', auth_uname, auth_pwd);\n"
+"if (auth_uid >= 0)\n"
+"goto auth_uid_ok;\n"
"}\n"
-"return col;\n"
+"return auth_uid;\n"
"}\n"
-"--src dav_api.sql:4360\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"
-"declare up, gp, pp varchar;\n"
-"\n"
-"pp := substring (perm, 7, 3);\n"
-"if (pp like req)\n"
-"return 1;\n"
-"up := substring (perm, 1, 3);\n"
-"if (up like req and ((oid = puid) or (oid = 2)))\n"
-"return 1;\n"
-"gp := substring (perm, 4, 3);\n"
-"if (gp like req and ((ogid = pgid) or (exists (select top 1 1 from WS.WS.SYS_DAV_USER_GROUP where UG_UID = oid and UG_GID = pgid))))\n"
-"return 1;\n"
+"else if (auth_uid is null)\n"
+"auth_uid := coalesce ((select U_ID from WS.WS.SYS_DAV_USER where U_NAME = auth_uname), http_nobody_uid());\n"
"\n"
-"return 0;\n"
-"}\n"
-"--src dav_api.sql:4398\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"
+"auth_uid_ok:\n"
+"auto_version := DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT(DAV_SEARCH_ID (path, \'R\'), \'R\', \'DAV:auto-version\', 0));\n"
+"if (check_locks)\n"
"{\n"
-"declare rc int;\n"
-"declare pwd1 any;\n"
+"rc := DAV_IS_LOCKED (id , st, check_locks);\n"
+"if (rc < 0)\n"
+"locked := 1;\n"
+"else\n"
+"locked := 0;\n"
+"if (rc = -8 and (auto_version = \'DAV:checkout-unlocked-checkin\'))\n"
"rc := 0;\n"
-"if (pwd is null)\n"
-"{\n"
-"rc := coalesce ((select 1 from WS.WS.SYS_DAV_USER where U_NAME = uname), 0);\n"
+"else if (rc = -8 and (auto_version = \'DAV:locked-checkout\'))\n"
+"rc := 0;\n"
+"if (0 <> rc)\n"
+"return rc;\n"
"}\n"
-"else\n"
+"if (\n"
+"((propname like \'xml-stylesheet%\') or (propname like \'xml-sql%\')) and\n"
+"((auth_uid <> 0) and (auth_uid <> http_dav_uid())) )\n"
"{\n"
-"whenever not found goto nf;\n"
-"select U_PWD into pwd1 from WS.WS.SYS_DAV_USER where U_NAME = uname with (prefetch 1);\n"
-"if ((pwd1[0] = 0 and pwd_magic_calc (uname, pwd) = pwd1) or (pwd1[0] <> 0 and pwd1 = pwd))\n"
-"rc := 1;\n"
-"nf:;\n"
+"set isolation=\'committed\';\n"
+"if (not exists (\n"
+"select top 1 1 from DB.DBA.SYS_USERS\n"
+"where U_ID = auth_uid and U_DAV_ENABLE and U_SQL_ENABLE\n"
+"and not U_ACCOUNT_DISABLED ) )\n"
+"return -32;\n"
+"if (DAV_GET_OWNER (id, st) <> auth_uid)\n"
+"return -32;\n"
"}\n"
-"return rc;\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:4419\n";
+"--src dav_api.sql:3582\n";
-static const char *proc152 =
-"#line 4444 \"[executable]/dav_api.sql\"\n"
+static const char *proc144 =
+"#line 3666 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
-"DAV_RES_CONTENT (\n"
+"DAV_PROP_SET (\n"
"in path varchar,\n"
-"inout content any,\n"
-"out type varchar,\n"
-"in auth_uname varchar := null, in auth_pwd varchar := null)\n"
+"in propname varchar,\n"
+"in propvalue any,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null,\n"
+"in overwrite integer := 0 )\n"
"{\n"
-"return DAV_RES_CONTENT_INT (DAV_SEARCH_ID (path, \'R\'), content, type, 0, 1, auth_uname, auth_pwd);\n"
+"return DAV_PROP_SET_INT (path, propname, propvalue, auth_uname, auth_pwd, 1, 1, overwrite);\n"
"}\n"
-"--src dav_api.sql:4442\n";
+"--src dav_api.sql:3664\n";
-static const char *proc153 =
-"#line 4457 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_RES_CONTENT_STRSES (\n"
+static const char *proc145 =
+"#line 3679 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_PROP_SET_INT (\n"
"in path varchar,\n"
-"inout content any,\n"
-"out type varchar,\n"
-"in auth_uname varchar := null, in auth_pwd varchar := null)\n"
-"{\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:4455\n";
-
-static const char *proc154 =
-"#line 4468 \"[executable]/dav_api.sql\"\n"
-"create procedure\n"
-"DAV_RES_CONTENT_INT (\n"
-"in id any,\n"
-"inout content any,\n"
-"out type varchar,\n"
-"in content_mode integer,\n"
+"in propname varchar,\n"
+"in propvalue any,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null,\n"
"in extern integer := 1,\n"
-"in auth_uname varchar := null, in auth_pwd varchar := null )\n"
-"{\n"
-"declare auth_uid, rc integer;\n"
-"declare pperms, name varchar;\n"
-"declare par, cont any;\n"
-"declare det varchar;\n"
-"declare detcol_id integer;\n"
-"declare detcol_path, unreached_path any;\n"
-"\n"
-"if (extern)\n"
+"in check_locks any := 1,\n"
+"in overwrite integer := 0,\n"
+"in auth_uid integer := null ) returns integer\n"
"{\n"
-"auth_uid := DAV_AUTHENTICATE (id, \'R\', \'1__\', auth_uname, auth_pwd);\n"
-"if (auth_uid < 0)\n"
-"return auth_uid;\n"
-"}\n"
-"else\n"
-"auth_uid := null;\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
-"return id;\n"
+"declare id, rc, pid integer;\n"
+"declare st, det varchar;\n"
+"declare resv any;\n"
+"declare locked integer;\n"
+"declare auto_version varchar;\n"
"\n"
+"rc := DAV_PREPARE_PROP_WRITE (path, id, st, propname, auth_uname, auth_pwd, auth_uid, extern, auto_version, check_locks, locked);\n"
"\n"
+"if (rc < 0)\n"
+"return rc;\n"
"if (isarray (id))\n"
"{\n"
-"return call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, content, type, content_mode);\n"
-"}\n"
-"rc := id;\n"
-"if ((content_mode = 0) or (content_mode = 2))\n"
-"select RES_CONTENT, RES_TYPE into content, type from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
-"else if (content_mode = 1)\n"
-"{\n"
-"select RES_CONTENT, RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
-"\n"
-"if (cont is not null)\n"
-"http (cont, content);\n"
-"}\n"
-"else if (content_mode = 3)\n"
-"{\n"
-"select http (RES_CONTENT), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
-"\n"
+"pid := call (cast (id[0] as varchar) || \'_DAV_PROP_SET\') (id, st, propname, propvalue, overwrite, auth_uid);\n"
+"return pid;\n"
"}\n"
-"return rc;\n"
+"return DAV_PROP_SET_RAW (id, st, propname, propvalue, overwrite, auth_uid, locked, auto_version);\n"
"}\n"
-"--src dav_api.sql:4466\n";
+"--src dav_api.sql:3677\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"
+static const char *proc146 =
+"#line 3710 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_PROP_SET_RAW (\n"
+"inout id integer,\n"
+"in st char(0),\n"
+"inout propname varchar,\n"
+"inout propvalue any,\n"
+"in overwrite integer,\n"
+"in auth_uid integer,\n"
+"in locked int:=0,\n"
+"in auto_version varchar:=NULL\n"
+") returns integer\n"
"{\n"
-"declare p_id integer;\n"
-"if (a_id = 0)\n"
-"return 1;\n"
-"again:\n"
+"declare rc, old_log_mode, new_log_mode any;\n"
+"old_log_mode := log_enable (null);\n"
"\n"
-"select COL_PARENT into p_id from WS.WS.SYS_DAV_COL where COL_ID = d_id and COL_PARENT < COL_ID;\n"
-"if (p_id = a_id)\n"
-"return 1;\n"
-"if (p_id = 0)\n"
-"return 0;\n"
-"d_id := p_id;\n"
-"goto again;\n"
+"new_log_mode := bit_and (old_log_mode, 1);\n"
+"old_log_mode := log_enable (bit_or (new_log_mode, 4), 1);\n"
+"rc := DAV_PROP_SET_RAW_INNER (id, st, propname, propvalue, overwrite, auth_uid, locked, auto_version);\n"
+"log_enable (bit_or (old_log_mode, 4), 1);\n"
+"return rc;\n"
"}\n"
-"--src dav_api.sql:4517\n";
+"--src dav_api.sql:3708\n";
-static const char *proc156 =
-"#line 4536 \"[executable]/dav_api.sql\"\n"
-"create function DAV_COL_PATH_BOUNDARY (in path varchar) returns varchar\n"
+static const char *proc147 =
+"#line 3733 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_PROP_SET_RAW_INNER (\n"
+"inout id integer,\n"
+"in st char(0),\n"
+"inout propname varchar,\n"
+"inout propvalue any,\n"
+"in overwrite integer,\n"
+"in auth_uid integer,\n"
+"in locked int:=0,\n"
+"in auto_version varchar:=NULL\n"
+") returns integer\n"
"{\n"
-"declare res varchar;\n"
-"declare len integer;\n"
-"res := path;\n"
-"len := length (res);\n"
-"if ((len = 0) or (res[len-1] <> 47))\n"
-"signal (\'.....\', sprintf (\'Bad path in DAV_COL_PATH_BOUNDARY: %s\', path));\n"
-"res := res || \'\\377\\377\\377\\377\';\n"
-"return res;\n"
+"declare pid integer;\n"
+"declare resv any;\n"
+"declare can_patch_access integer;\n"
+"if (58 = propname[0])\n"
+"{\n"
+"if (\':getlastmodified\' = propname)\n"
+"{\n"
+"if (\'R\' = st)\n"
+"update WS.WS.SYS_DAV_RES set RES_MOD_TIME = propvalue where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_MOD_TIME = propvalue where COL_ID = id;\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:4534\n";
-
-static const char *trig7 =
-"#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"
+"if (\':creationdate\' = propname)\n"
"{\n"
-"declare aciContent, oldPath, newPath, update_acl any;\n"
-"\n"
-"if (connection_get (\'dav_acl_sync\') = 1)\n"
-"return;\n"
-"\n"
-"if ((O.COL_NAME = N.COL_NAME) and (O.COL_PARENT = N.COL_PARENT))\n"
-"return;\n"
-"\n"
-"aciContent := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = N.COL_ID and PROP_TYPE = \'C\' and PROP_NAME = \'virt:aci_meta_n3\');\n"
-"if (aciContent is null)\n"
-"return;\n"
-"\n"
-"oldPath := WS.WS.COL_PATH (O.COL_PARENT) || O.COL_NAME || \'/\';\n"
-"newPath := WS.WS.COL_PATH (N.COL_PARENT) || N.COL_NAME || \'/\';\n"
-"update_acl := 1;\n"
-"\n"
-"WS.WS.WAC_DELETE (oldPath, update_acl);\n"
-"WS.WS.WAC_INSERT (newPath, aciContent, N.COL_OWNER, N.COL_GROUP, update_acl);\n"
+"if (\'R\' = st)\n"
+"update WS.WS.SYS_DAV_RES set RES_CR_TIME = propvalue where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_CR_TIME = propvalue where COL_ID = id;\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:4549\n";
-
-static const char *trig8 =
-"#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"
+"if (\':getcontenttype\' = propname)\n"
"{\n"
-"declare update_acl integer;\n"
-"declare path varchar;\n"
-"\n"
-"if (connection_get (\'dav_acl_sync\') = 1)\n"
-"return;\n"
+"if (\'R\' = st)\n"
+"update WS.WS.SYS_DAV_RES set RES_TYPE = propvalue where RES_ID = id;\n"
+"else\n"
+"return -10;\n"
+"return 0;\n"
+"}\n"
+"if (auth_uid = http_dav_uid())\n"
+"can_patch_access := 2;\n"
"\n"
-"path := WS.WS.COL_PATH (O.COL_ID);\n"
-"update_acl := 1;\n"
"\n"
-"WS.WS.WAC_DELETE (path, update_acl);\n"
+"else\n"
+"if (\'R\' = st)\n"
+"can_patch_access := coalesce ((select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = id and RES_OWNER = auth_uid), 0);\n"
+"else\n"
+"can_patch_access := coalesce ((select top 1 1 from WS.WS.SYS_DAV_COL where COL_ID = id and COL_OWNER = auth_uid), 0);\n"
+"if (\':virtowneruid\' = propname)\n"
+"{\n"
+"if (0 >= can_patch_access)\n"
+"return -13;\n"
+"if (not exists (select top 1 1 from WS.WS.SYS_DAV_USER where U_ID = propvalue))\n"
+"propvalue := 0;\n"
+"if (\'R\' = st)\n"
+"update WS.WS.SYS_DAV_RES set RES_OWNER = propvalue where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_OWNER = propvalue where COL_ID = id;\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:4572\n";
-
-static const char *trig9 =
-"#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"
+"if (\':virtownergid\' = propname)\n"
"{\n"
-"declare aciContent, oldPath, newPath, update_acl any;\n"
-"\n"
-"if (connection_get (\'dav_acl_sync\') = 1)\n"
-"return;\n"
-"if (N.RES_NAME like \'%,acl\')\n"
+"if (0 >= can_patch_access)\n"
+"return -13;\n"
+"if (not exists (select top 1 1 from WS.WS.SYS_DAV_GROUP where G_ID = propvalue))\n"
+"propvalue := 0;\n"
+"if (\'R\' = st)\n"
+"update WS.WS.SYS_DAV_RES set RES_GROUP = propvalue where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_GROUP = propvalue where COL_ID = id;\n"
+"return 0;\n"
+"}\n"
+"if (\':virtpermissions\' = propname)\n"
"{\n"
-"declare rid int;\n"
-"oldPath := WS.WS.COL_PATH (O.RES_COL) || O.RES_NAME;\n"
-"newPath := WS.WS.COL_PATH (N.RES_COL) || N.RES_NAME;\n"
-"oldPath := regexp_replace (oldPath, \',acl\\x24\', \'\');\n"
-"newPath := regexp_replace (newPath, \',acl\\x24\', \'\');\n"
-"aciContent := N.RES_CONTENT;\n"
-"rid := (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = oldPath);\n"
-"set triggers off;\n"
-"update WS.WS.SYS_DAV_PROP set PROP_VALUE = N.RES_CONTENT where PROP_TYPE = \'R\' and PROP_NAME = \'virt:aci_meta_n3\' and PROP_PARENT_ID = rid;\n"
-"set triggers on;\n"
-"update_acl := 0;\n"
+"if (0 >= can_patch_access)\n"
+"return -13;\n"
+"if (regexp_match (DAV_REGEXP_PATTERN_FOR_PERM (), propvalue) is null)\n"
+"return -17;\n"
+"if (\'R\' = st)\n"
+"update WS.WS.SYS_DAV_RES set RES_PERMS = propvalue where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_PERMS = propvalue where COL_ID = id;\n"
+"return 0;\n"
+"}\n"
+"if (\':virtacl\' = propname)\n"
+"{\n"
+"if (0 >= can_patch_access)\n"
+"return -13;\n"
+"if (\'R\' = st)\n"
+"update WS.WS.SYS_DAV_RES set RES_ACL = propvalue where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_ACL = propvalue where COL_ID = id;\n"
+"return 0;\n"
"}\n"
+"if (\':virtdet\' = propname)\n"
+"{\n"
+"if (1 >= can_patch_access)\n"
+"return -13;\n"
+"if (\'R\' = st)\n"
+"return -10;\n"
"else\n"
+"update WS.WS.SYS_DAV_COL set COL_DET = propvalue where COL_ID = id;\n"
+"return 0;\n"
+"}\n"
+"if (\':virtdetmount\' = propname)\n"
"{\n"
-"if ((O.RES_NAME = N.RES_NAME) and (O.RES_COL = N.RES_COL))\n"
-"return;\n"
-"aciContent := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = N.RES_ID and PROP_TYPE = \'R\' and PROP_NAME = \'virt:aci_meta_n3\');\n"
-"if (aciContent is null)\n"
-"return;\n"
-"oldPath := WS.WS.COL_PATH (O.RES_COL) || O.RES_NAME;\n"
-"newPath := WS.WS.COL_PATH (N.RES_COL) || N.RES_NAME;\n"
-"update_acl := 1;\n"
+"if (1 >= can_patch_access)\n"
+"return -13;\n"
+"if (\'R\' = st)\n"
+"return -10;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_DET = propvalue where COL_ID = id;\n"
+"return 0;\n"
"}\n"
-"WS.WS.WAC_DELETE (oldPath, update_acl);\n"
-"WS.WS.WAC_INSERT (newPath, aciContent, N.RES_OWNER, N.RES_GROUP, update_acl);\n"
+"if (\':virtdetmountable\' = propname)\n"
+"{\n"
+"return -10;\n"
"}\n"
-"--src dav_api.sql:4587\n";
-
-static const char *trig10 =
-"#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"
+"if (\':virtprivatetags\' = propname)\n"
"{\n"
-"declare update_acl int;\n"
-"declare path varchar;\n"
-"if (connection_get (\'dav_acl_sync\') = 1)\n"
-"return;\n"
-"if (O.RES_NAME like \'%,acl\')\n"
+"if (\'R\' <> st)\n"
+"return -14;\n"
+"if (auth_uid = http_nobody_uid())\n"
+"return -16;\n"
+"if (exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid))\n"
"{\n"
-"update_acl := 0;\n"
-"path := regexp_replace (O.RES_FULL_PATH, \',acl\\x24\', \'\');\n"
+"if (not overwrite)\n"
+"return -16;\n"
+"update WS.WS.SYS_DAV_TAG set DT_TAGS = propvalue where DT_RES_ID = id and DT_U_ID = auth_uid;\n"
"}\n"
"else\n"
"{\n"
-"path := O.RES_FULL_PATH;\n"
-"update_acl := 1;\n"
+"insert into WS.WS.SYS_DAV_TAG (DT_RES_ID, DT_U_ID, DT_FT_ID, DT_TAGS)\n"
+"values (id, auth_uid, WS.WS.GETID (\'T\'), propvalue);\n"
"}\n"
-"WS.WS.WAC_DELETE (path, update_acl);\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:4623\n";
-
-static const char *trig11 =
-"#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"
+"if (\':virtpublictags\' = propname)\n"
"{\n"
-"if (N.PROP_NAME <> \'virt:aci_meta_n3\')\n"
-"return;\n"
-"\n"
-"declare _path, _owner, _group any;\n"
-"declare exit handler for not found { return; };\n"
-"\n"
-"if (N.PROP_TYPE = \'R\')\n"
+"if (\'R\' <> st)\n"
+"return -14;\n"
+"if (exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid()))\n"
"{\n"
-"select RES_FULL_PATH, RES_OWNER, RES_GROUP\n"
-"into _path, _owner, _group\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = N.PROP_PARENT_ID;\n"
-"} else {\n"
-"select DAV_SEARCH_PATH (COL_ID, N.PROP_TYPE), COL_OWNER, COL_GROUP\n"
-"into _path, _owner, _group\n"
-"from WS.WS.SYS_DAV_COL\n"
-"where COL_ID = N.PROP_PARENT_ID;\n"
-"}\n"
-"WS.WS.WAC_INSERT (_path, N.PROP_VALUE, _owner, _group, 1);\n"
+"if (not overwrite)\n"
+"return -16;\n"
+"update WS.WS.SYS_DAV_TAG set DT_TAGS = propvalue where DT_RES_ID = id and DT_U_ID = http_nobody_uid();\n"
"}\n"
-"--src dav_api.sql:4643\n";
-
-static const char *trig12 =
-"#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"
-"return;\n"
-"\n"
-"declare _path, _owner, _group any;\n"
-"declare exit handler for not found { return; };\n"
-"\n"
-"if (N.PROP_TYPE = \'R\')\n"
+"else\n"
"{\n"
-"select RES_FULL_PATH, RES_OWNER, RES_GROUP\n"
-"into _path, _owner, _group\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = N.PROP_PARENT_ID;\n"
-"} else {\n"
-"select DAV_SEARCH_PATH (COL_ID, N.PROP_TYPE), COL_OWNER, COL_GROUP\n"
-"into _path, _owner, _group\n"
-"from WS.WS.SYS_DAV_COL\n"
-"where COL_ID = N.PROP_PARENT_ID;\n"
+"insert into WS.WS.SYS_DAV_TAG (DT_RES_ID, DT_U_ID, DT_FT_ID, DT_TAGS)\n"
+"values (id, http_nobody_uid(), WS.WS.GETID (\'T\'), propvalue);\n"
"}\n"
-"WS.WS.WAC_DELETE (_path, 1);\n"
-"WS.WS.WAC_INSERT (_path, N.PROP_VALUE, _owner, _group, 1);\n"
+"return 0;\n"
+"}\n"
+"return -16;\n"
"}\n"
-"--src dav_api.sql:4667\n";
-
-static const char *trig13 =
-"#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"
-"return;\n"
"\n"
-"declare _path any;\n"
-"declare exit handler for not found { return; };\n"
+"if ((not overwrite) and exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id and PROP_TYPE = st))\n"
+"return -16;\n"
"\n"
-"if (O.PROP_TYPE = \'R\')\n"
-"{\n"
-"select RES_FULL_PATH\n"
-"into _path\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = O.PROP_PARENT_ID;\n"
-"} else {\n"
-"select DAV_SEARCH_PATH (COL_ID, O.PROP_TYPE)\n"
-"into _path\n"
-"from WS.WS.SYS_DAV_COL\n"
-"where COL_ID = O.PROP_PARENT_ID;\n"
-"}\n"
-"WS.WS.WAC_DELETE (_path, 1);\n"
-"}\n"
-"--src dav_api.sql:4692\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"
-"in uid integer,\n"
-"in gid integer,\n"
-"in update_acl integer)\n"
-"{\n"
+"resv := vector (\'creationdate\',\'y\',\'getcontentlength\',\'y\',\'getcontenttype\',\'y\',\'getetag\',\'y\',\'getlastmodified\',\'y\',\'lockdiscovery\',\'y\',\'resourcetype\',\'y\',\'activelock\',\'y\',\'supportedlock\',\'y\');\n"
"\n"
-"declare graph varchar;\n"
+"if (not isstring (propname) or \'y\' = get_keyword (propname, resv, \'n\'))\n"
+"return -10;\n"
"\n"
-"graph := WS.WS.DAV_IRI (path);\n"
-"aciContent := cast (blob_to_string (aciContent) as varchar);\n"
-"if (update_acl)\n"
-"{\n"
-"connection_set (\'dav_acl_sync\', 1);\n"
-"DAV_RES_UPLOAD_STRSES_INT (rtrim (path, \'/\') || \',acl\', aciContent, \'text/n3\', \'110100000RR\', uid, gid, null, null, 0);\n"
-"connection_set (\'dav_acl_sync\', null);\n"
-"}\n"
-"DB.DBA.TTLP (aciContent, graph, graph);\n"
-"}\n"
-"--src dav_api.sql:4716\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"
-"{\n"
+"if (__tag (propvalue) = 193)\n"
+"propvalue := serialize (propvalue);\n"
+"else if (not isstring (propvalue))\n"
+"return -17;\n"
"\n"
-"declare graph, st, msg varchar;\n"
+"pid := WS.WS.GETID (\'P\');\n"
"\n"
-"graph := WS.WS.DAV_IRI (path);\n"
-"if (update_acl)\n"
+"if ((propname not like \'DAV:%\')\n"
+"and (propname not like \'virt:%\')\n"
+"and (propname[0] <> 58))\n"
"{\n"
-"connection_set (\'dav_acl_sync\', 1);\n"
-"DAV_DELETE_INT (rtrim (path, \'/\') || \',acl\', 1, null, null, 0, 0);\n"
-"connection_set (\'dav_acl_sync\', null);\n"
-"}\n"
-"SPARQL clear graph ?:graph;\n"
-"}\n"
-"--src dav_api.sql:4738\n";
-
-static const char *proc159 =
-"#line 4758 \"[executable]/dav_api.sql\"\n"
-"create procedure WS.WS.DAV_IRI (\n"
-"in path varchar)\n"
+"if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, \'R\', \'DAV:checked-in\', 0)) is not null)\n"
"{\n"
-"declare S, host any;\n"
-"\n"
-"S := string_output ();\n"
-"http_dav_url (path, null, S);\n"
-"S := string_output_string (S);\n"
"\n"
-"host := virtuoso_ini_item_value (\'URIQA\', \'DefaultHost\');\n"
-"if (host is null)\n"
+"return -38;\n"
+"}\n"
+"if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, \'R\', \'DAV:checked-out\', 0)) is not null)\n"
"{\n"
-"host := sys_stat (\'st_host_name\');\n"
-"if (server_http_port () <> \'80\')\n"
-"host := host ||\':\'|| server_http_port ();\n"
+"if ((locked and (auto_version = \'DAV:checkout-unlocked-checkin\')) or\n"
+"(auto_version = \'DAV:checkout\') or\n"
+"(locked and (auto_version = \'DAV:locked-checkout\')))\n"
+"{\n"
+"declare _res int;\n"
+"_res := DAV_CHECKOUT_INT (id, null, null, 0);\n"
+"if (_res < 0)\n"
+"return _res;\n"
"}\n"
-"\n"
-"return sprintf (\'http://%s%s\', host, S);\n"
"}\n"
-"--src dav_api.sql:4756\n";
-
-static const char *trig14 =
-"#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"
-"declare aAcl, aParentAcl any;\n"
-"\n"
-"\n"
-"aAcl := WS.WS.ACL_PARSE(NC.COL_ACL, \'01\', 0);\n"
-"foreach (any acl in aAcl) do\n"
+"}\n"
+"update WS.WS.SYS_DAV_PROP set PROP_VALUE = propvalue where PROP_NAME = propname\n"
+"and PROP_PARENT_ID = id and PROP_TYPE = st;\n"
+"if (row_count() = 0)\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)\n"
-"values (either(equ(acl[1],0), \'R\', \'G\'), NC.COL_ID, \'C\', acl[0]);\n"
+"insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_VALUE, PROP_PARENT_ID, PROP_TYPE)\n"
+"values (pid, propname, propvalue, id, st);\n"
"}\n"
-"\n"
-"aParentAcl := (select WS.WS.ACL_PARSE (COL_ACL, \'123\', 0) from WS.WS.SYS_DAV_COL c where c.COL_ID = NC.COL_PARENT);\n"
-"if (isnull(aParentAcl))\n"
-"return;\n"
-"\n"
-"aAcl := WS.WS.ACL_PARSE(NC.COL_ACL, \'012\', 0);\n"
-"set triggers off;\n"
-"update WS.WS.SYS_DAV_COL\n"
-"set COL_ACL = WS.WS.ACL_COMPOSE (vector_concat (aAcl, WS.WS.ACL_MAKE_INHERITED(aParentAcl)))\n"
-"where COL_ID = NC.COL_ID;\n"
-"\n"
+"return pid;\n"
"}\n"
-"--src dav_api.sql:4778\n";
+"--src dav_api.sql:3731\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"
+static const char *proc148 =
+"#line 3942 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_PROP_REMOVE (\n"
+"in path varchar,\n"
+"in propname varchar,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null)\n"
"{\n"
-"if ((grantee = acl[0]) and (flag = either(equ(acl[1],0), \'R\', \'G\')))\n"
-"return 1;\n"
-"}\n"
-"return 0;\n"
+"return DAV_PROP_REMOVE_INT (path, propname, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:4804\n";
+"--src dav_api.sql:3940\n";
-static const char *trig15 =
-"#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"
+static const char *proc149 =
+"#line 3954 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_PROP_REMOVE_INT (\n"
+"in path varchar,\n"
+"in propname varchar,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null,\n"
+"in extern integer := 1,\n"
+"in check_locks any := 1,\n"
+"in ignore_if_missing integer := 0,\n"
+"in auth_uid integer := null ) returns integer\n"
"{\n"
-"declare aAcl, aLog any;\n"
-"\n"
+"declare id, rc, pid integer;\n"
+"declare st, det varchar;\n"
+"declare resv any;\n"
+"declare locked int;\n"
+"declare auto_version varchar;\n"
"\n"
-"aAcl := WS.WS.ACL_PARSE (O.COL_ACL, \'01\', 0);\n"
-"delete\n"
-"from WS.WS.SYS_DAV_ACL_INVERSE\n"
-"where AI_PARENT_ID = O.COL_ID\n"
-"and AI_PARENT_TYPE = \'C\'\n"
-"and not WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (aAcl, AI_GRANTEE_ID, AI_FLAG);\n"
+"rc := DAV_PREPARE_PROP_WRITE (path, id, st, propname, auth_uname, auth_pwd, auth_uid, extern, auto_version, check_locks, locked);\n"
"\n"
-"aAcl := WS.WS.ACL_PARSE (N.COL_ACL, \'01\', 0);\n"
-"foreach (any acl in aAcl) do\n"
+"if (rc < 0)\n"
+"return rc;\n"
+"if (isarray (id))\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)\n"
-"values (either (equ (acl[1], 0), \'R\', \'G\'), N.COL_ID, \'C\', acl[0]);\n"
+"pid := call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\') (id, st, propname, ignore_if_missing, auth_uid);\n"
+"return pid;\n"
"}\n"
-"\n"
-"declare exit handler for sqlstate \'*\'\n"
-"{\n"
-"log_enable (aLog, 1);\n"
-"resignal;\n"
-"};\n"
-"\n"
-"set triggers off;\n"
-"\n"
-"aLog := log_enable (0, 1);\n"
-"WS.WS.ACL_UPDATE (N.COL_ID, WS.WS.ACL_PARSE (N.COL_ACL, \'123\', 0));\n"
-"log_enable (aLog, 1);\n"
-"log_text (\'WS.WS.ACL_UPDATE (?, ?)\', N.COL_ID, WS.WS.ACL_PARSE (N.COL_ACL, \'123\', 0));\n"
+"return DAV_PROP_REMOVE_RAW (id, st, propname, ignore_if_missing, auth_uid, locked, auto_version);\n"
"}\n"
-"--src dav_api.sql:4815\n";
+"--src dav_api.sql:3952\n";
-static const char *trig16 =
-"#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"
+static const char *proc150 =
+"#line 3985 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_PROP_REMOVE_RAW (\n"
+"inout id integer,\n"
+"in st char(0),\n"
+"inout propname varchar,\n"
+"in ignore_if_missing integer,\n"
+"in auth_uid integer,\n"
+"in locked int:=0,\n"
+"in auto_version varchar:=NULL\n"
+") returns integer\n"
"{\n"
-"\n"
-"delete\n"
-"from WS.WS.SYS_DAV_ACL_INVERSE\n"
-"where AI_PARENT_TYPE = \'C\'\n"
-"and AI_PARENT_ID = O.COL_ID;\n"
-"\n"
-"}\n"
-"--src dav_api.sql:4849\n";
-
-static const char *trig17 =
-"#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"
+"declare pid integer;\n"
+"declare resv any;\n"
+"declare can_patch_access integer;\n"
+"if (58 = propname[0])\n"
"{\n"
-"declare aAcl any;\n"
-"declare aParentAcl varbinary;\n"
+"if (propname in (\':getlastmodified\', \':creationdate\', \':getcontenttype\', \':virtowneruid\', \':virtownergid\', \':virtpermissions\', \':virtdetmountable\'))\n"
+"return -10;\n"
+"if (auth_uid = http_dav_uid())\n"
+"can_patch_access := 2;\n"
"\n"
"\n"
-"aAcl := WS.WS.ACL_PARSE (N.RES_ACL, \'0\', 0);\n"
-"foreach (any acl in aAcl) do\n"
+"else\n"
+"if (\'R\' = st)\n"
+"can_patch_access := coalesce ((select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = id and RES_OWNER = auth_uid), 0);\n"
+"else\n"
+"can_patch_access := coalesce ((select top 1 1 from WS.WS.SYS_DAV_COL where COL_ID = id and COL_OWNER = auth_uid), 0);\n"
+"if (\':virtacl\' = propname)\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)\n"
-"values (either(equ(acl[1],0), \'R\', \'G\'), N.RES_ID, \'R\', acl[0]);\n"
+"if (0 >= can_patch_access)\n"
+"return -13;\n"
+"if (\'R\' = st)\n"
+"update WS.WS.SYS_DAV_RES set RES_ACL = NULL where RES_ID = id;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_ACL = NULL where COL_ID = id;\n"
+"return 0;\n"
"}\n"
-"\n"
-"aParentAcl := (select WS.WS.ACL_PARSE (COL_ACL, \'123\', 0) from WS.WS.SYS_DAV_COL where COL_ID = N.RES_COL);\n"
-"if (not isnull(aParentAcl))\n"
+"if (\':virtdet\' = propname)\n"
"{\n"
-"set triggers off;\n"
-"update WS.WS.SYS_DAV_RES\n"
-"set RES_ACL = WS.WS.ACL_COMPOSE (vector_concat(aAcl, WS.WS.ACL_MAKE_INHERITED(aParentAcl)))\n"
-"where RES_ID = N.RES_ID;\n"
+"if (1 >= can_patch_access)\n"
+"return -13;\n"
+"if (\'R\' = st)\n"
+"return -10;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_DET = NULL where COL_ID = id;\n"
+"return 0;\n"
"}\n"
-"\n"
+"if (\':virtdetmount\' = propname)\n"
+"{\n"
+"if (1 >= can_patch_access)\n"
+"return -13;\n"
+"if (\'R\' = st)\n"
+"return -10;\n"
+"else\n"
+"update WS.WS.SYS_DAV_COL set COL_DET = NULL where COL_ID = id;\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:4862\n";
-
-static const char *trig18 =
-"#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"
+"if (\':virtprivatetags\' = propname)\n"
"{\n"
-"declare aAcl any;\n"
-"\n"
-"\n"
-"aAcl := WS.WS.ACL_PARSE (O.RES_ACL, \'0\', 0);\n"
-"delete\n"
-"from WS.WS.SYS_DAV_ACL_INVERSE\n"
-"where AI_PARENT_ID = O.RES_ID\n"
-"and AI_PARENT_TYPE = \'R\'\n"
-"and not WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (aAcl, AI_GRANTEE_ID, AI_FLAG);\n"
-"\n"
-"aAcl := WS.WS.ACL_PARSE (N.RES_ACL, \'0\', 0);\n"
-"foreach (any acl in aAcl) do\n"
+"if ((\'R\' <> st) or (auth_uid = http_nobody_uid()) or (not exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid)))\n"
+"goto nosuchprop;\n"
+"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid;\n"
+"return 0;\n"
+"}\n"
+"if (\':virtpublictags\' = propname)\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)\n"
-"values (either (equ (acl[1],0), \'R\', \'G\'), N.RES_ID, \'R\', acl[0]);\n"
+"if ((\'R\' <> st) or (not exists (select 1 from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid())))\n"
+"goto nosuchprop;\n"
+"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid();\n"
+"return 0;\n"
+"}\n"
+"return -16;\n"
"}\n"
"\n"
+"if (not exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id\n"
+"and PROP_TYPE = st))\n"
+"{\n"
+"goto nosuchprop;\n"
+"}\n"
+"delete from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id and PROP_TYPE = st;\n"
+"return 0;\n"
+"nosuchprop:\n"
+"if (ignore_if_missing)\n"
+"return 0;\n"
+"else\n"
+"return -11;\n"
"}\n"
-"--src dav_api.sql:4887\n";
+"--src dav_api.sql:3983\n";
-static const char *trig19 =
-"#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"
+static const char *proc151 =
+"#line 4076 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_PROP_GET (\n"
+"in path varchar,\n"
+"in propname varchar,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null) returns any\n"
"{\n"
-"\n"
-"delete\n"
-"from WS.WS.SYS_DAV_ACL_INVERSE\n"
-"where AI_PARENT_TYPE = \'R\'\n"
-"and AI_PARENT_ID = O.RES_ID;\n"
-"\n"
+"declare st varchar;\n"
+"if ((path <> \'\') and (path[length(path)-1] = 47))\n"
+"st := \'C\';\n"
+"else\n"
+"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:4909\n";
+"--src dav_api.sql:4074\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"
+static const char *proc152 =
+"#line 4093 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_PROP_GET_INT (\n"
+"in id any,\n"
+"in what char(0),\n"
+"in propname varchar,\n"
+"in extern integer := 1,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null,\n"
+"in auth_uid integer := null ) returns any\n"
"{\n"
-"declare nAcl any;\n"
-"\n"
+"declare rc integer;\n"
+"declare ret any;\n"
"\n"
-"WS.WS.ACL_MAKE_INHERITED (parentAcl);\n"
-"for select RES_ID as resID, RES_ACL as aAcl from WS.WS.SYS_DAV_RES where RES_COL = id do\n"
-"{\n"
-"nAcl := WS.WS.ACL_COMPOSE (vector_concat (WS.WS.ACL_PARSE (aAcl, \'0\', 0), parentAcl));\n"
-"if (not ((nAcl = aAcl) or (isnull (nAcl) and isnull (aAcl))))\n"
+"if (propname is null)\n"
+"return -11;\n"
+"if (not (isstring (propname)))\n"
+"propname := cast (propname as varchar);\n"
+"if (\'\' = propname)\n"
+"return -11;\n"
+"if (extern)\n"
"{\n"
-"update WS.WS.SYS_DAV_RES\n"
-"set RES_ACL = nAcl\n"
-"where RES_ID = resID;\n"
-"}\n"
+"auth_uid := DAV_AUTHENTICATE (id, what, \'1__\', auth_uname, auth_pwd);\n"
+"if (auth_uid < 0)\n"
+"return auth_uid;\n"
"}\n"
-"for select COL_ID as colID, COL_ACL as aAcl from WS.WS.SYS_DAV_COL where COL_PARENT = id do\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
+"return -1;\n"
+"if (propname[0] = 58)\n"
"{\n"
-"nAcl := WS.WS.ACL_COMPOSE (vector_concat (WS.WS.ACL_PARSE (aAcl, \'012\', 0), parentAcl));\n"
-"if (not ((nAcl = aAcl) or (isnull (nAcl) and isnull (aAcl))))\n"
+"declare idx integer;\n"
+"idx := get_keyword (propname,\n"
+"vector (\n"
+"\':getlastmodified\', 3,\n"
+"\':creationdate\', 8,\n"
+"\':lastaccessed\', 3,\n"
+"\':getetag\', -1,\n"
+"\':getcontenttype\', 9,\n"
+"\':getcontentlength\', 2,\n"
+"\':resourcetype\', -1,\n"
+"\':virtowneruid\', 7,\n"
+"\':virtownergid\', 6,\n"
+"\':virtpermissions\', 5,\n"
+"\':virtacl\', -1,\n"
+"\':virtdet\', -1,\n"
+"\':virtdetmount\', -1,\n"
+"\':virtdetmountable\', -1,\n"
+"\':virtpublictags\', -1,\n"
+"\':virtprivatetags\', -1,\n"
+"\':virttags\', -1 ) );\n"
+"if (idx is null)\n"
+"return -11;\n"
+"if (idx >= 0)\n"
"{\n"
-"update WS.WS.SYS_DAV_COL\n"
-"set COL_ACL = nAcl\n"
-"where COL_ID = colID;\n"
-"WS.WS.ACL_UPDATE(colID, WS.WS.ACL_PARSE (nAcl, \'123\', 0));\n"
-"}\n"
-"}\n"
+"declare dirsingle any;\n"
+"dirsingle := DAV_DIR_SINGLE_INT (id, what, \'fake\', auth_uname, auth_pwd, auth_uid);\n"
+"if (isarray (dirsingle))\n"
+"return dirsingle[idx];\n"
+"return -1;\n"
"}\n"
-"--src dav_api.sql:4920\n";
-
-static const char *proc162 =
-"#line 4952 \"[executable]/dav_api.sql\"\n"
-"create procedure WS.WS.ACL_MAKE_INHERITED (\n"
-"inout aAcl any)\n"
+"if (\':getetag\' = propname)\n"
"{\n"
-"declare tmp any;\n"
-"declare N integer;\n"
-"\n"
-"for (N := 0; N < length (aAcl); N := N + 1)\n"
+"if (\'R\' = what)\n"
"{\n"
-"tmp := aAcl[N];\n"
-"aset (tmp, 2, 3);\n"
-"aset (aAcl, N, tmp);\n"
-"}\n"
-"return aAcl;\n"
-"}\n"
-"--src dav_api.sql:4950\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"
+"if (isarray (id))\n"
"{\n"
-"declare N integer;\n"
-"declare aResult varchar;\n"
-"\n"
-"aResult := \'\';\n"
-"vb := cast(vb as varchar);\n"
-"for (N := 0; N < length (vb); N := N + 1)\n"
+"declare dirsingle any;\n"
+"declare path varchar;\n"
+"path := DAV_SEARCH_PATH (id, \'R\');\n"
+"dirsingle := call (cast (id[0] as varchar) || \'_DAV_DIR_SINGLE\') (id, \'R\', path, auth_uid);\n"
+"return sprintf (\'%s-%s-%d-%s\', cast (id[1] as varchar), replace (cast (dirsingle[3] as varchar), \' \', \'T\'), dirsingle[2], md5 (path));\n"
+"}\n"
+"else\n"
"{\n"
-"aResult := aResult || cast (vb[N] as varchar) || \', \';\n"
+"declare name varchar;\n"
+"declare col_id integer;\n"
+"select RES_NAME, RES_COL into name, col_id from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
+"return WS.WS.ETAG (name, col_id);\n"
"}\n"
-"return aResult;\n"
"}\n"
-"--src dav_api.sql:4967\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"
+"else\n"
+"return null;\n"
+"}\n"
+"if (\':resourcetype\' = propname)\n"
"{\n"
-"declare N integer;\n"
-"declare aResult varchar;\n"
-"\n"
-"aResult:=repeat(\'\\0\',4);\n"
-"\n"
-"N := bit_shift(I,-24);\n"
-"if(N)\n"
-"aset(aResult, 0, N);\n"
-"\n"
-"N := bit_shift(bit_shift(I, 8),-24);\n"
-"if(N)\n"
-"aset(aResult,1,N);\n"
-"\n"
-"N := bit_shift(bit_shift(I,16),-24);\n"
-"if(N)\n"
-"aset(aResult,2,N);\n"
-"\n"
-"N := bit_shift(bit_shift(I, 24),-24);\n"
-"if(N)\n"
-"aset(aResult,3,N);\n"
-"\n"
-"return cast(aResult as varbinary);\n"
+"if (what = \'C\')\n"
+"return xtree_doc (\'<D:collection/>\');\n"
+"else\n"
+"return null;\n"
"}\n"
-"--src dav_api.sql:4985\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"
+"if (\':virtacl\' = propname)\n"
"{\n"
-"declare vc varchar;\n"
+"if (isarray (id))\n"
+"{\n"
+"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
+"if (isinteger (ret) and (ret = -20))\n"
+"return coalesce ((select COL_ACL from WS.WS.SYS_DAV_COL where COL_ID = id[1]));\n"
"\n"
-"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"
+"return ret;\n"
"}\n"
-"--src dav_api.sql:5014\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"
+"else\n"
"{\n"
-"return WS.WS.ACL_DESERIALIZE_INT(cast(substring(cast(acl as varchar), 1, 4) as varbinary));\n"
+"if (\'R\' = what)\n"
+"return coalesce ((select RES_ACL from WS.WS.SYS_DAV_RES where RES_ID = id));\n"
+"else\n"
+"return coalesce ((select COL_ACL from WS.WS.SYS_DAV_COL where COL_ID = id));\n"
"}\n"
-"--src dav_api.sql:5025\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"
+"if (\':virtdet\' = propname)\n"
+"{\n"
+"if (isarray (id))\n"
"{\n"
-"return WS.WS.ACL_DESERIALIZE_INT(cast(substring(cast(acl as varchar), 5, 4) as varbinary));\n"
+"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
+"return coalesce (DAV_HIDE_ERROR (ret), id[0]);\n"
"}\n"
-"--src dav_api.sql:5033\n";
-
-static const char *proc168 =
-"#line 5046 \"[executable]/dav_api.sql\"\n"
-"create procedure WS.WS.ACL_CREATE() returns varbinary\n"
+"else\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"
+"if (\'R\' = what)\n"
+"return null;\n"
+"else\n"
+"return coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = id));\n"
"}\n"
-"--src dav_api.sql:5044\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"
+"if (\':virtdetmount\' = propname)\n"
"{\n"
-"declare iAclLength, iAceSize integer;\n"
-"\n"
-"\n"
-"if (internal_type_name(internal_type(acl)) <> \'VARBINARY\')\n"
+"if (isarray (id))\n"
"{\n"
-"\n"
-"return 0;\n"
+"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
+"return DAV_HIDE_ERROR (ret);\n"
"}\n"
-"\n"
-"iAclLength := WS.WS.ACL_GET_ACLLENGTH(acl);\n"
-"if (iAclLength <> length(acl))\n"
+"else\n"
"{\n"
-"\n"
-"return 0;\n"
+"if (\'R\' = what)\n"
+"return null;\n"
+"else\n"
+"return coalesce ((select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = id));\n"
"}\n"
-"\n"
-"iAceSize := WS.WS.ACL_GET_ACESIZE(acl);\n"
-"if ((iAceSize*8 + 8) <> length(acl))\n"
-"{\n"
-"\n"
-"return 0;\n"
"}\n"
-"\n"
-"return 1;\n"
-"}\n"
-"--src dav_api.sql:5056\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"
-"declare aAcl any;\n"
-"\n"
-"aAcl := WS.WS.ACL_PARSE(acl);\n"
-"\n"
-"bFound := 0;\n"
-"for (N := 0; N < length (aAcl); N := N + 1)\n"
-"{\n"
-"if ((aAcl[N][0] = uid) and (aAcl[N][2] = inheritance))\n"
+"if (\':virtdetmountable\' = propname)\n"
"{\n"
-"if (aAcl[N][1] = is_grant)\n"
+"if (isarray (id))\n"
"{\n"
-"aset(aAcl, N, vector(aAcl[N][0], aAcl[N][1], aAcl[N][2], bitmask));\n"
-"bFound := 1;\n"
+"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
+"return DAV_HIDE_ERROR (ret);\n"
"}\n"
"else\n"
"{\n"
-"aset(aAcl, N, vector(aAcl[N][0], aAcl[N][1], aAcl[N][2], bit_and(aAcl[N][3], bit_not(bitmask))));\n"
-"}\n"
-"}\n"
+"if (\'R\' = what)\n"
+"return null;\n"
+"else\n"
+"return \'T\';\n"
"}\n"
-"\n"
-"if (not bFound)\n"
-"aAcl := vector_concat(aAcl, vector(vector(uid, is_grant, inheritance, bitmask)));\n"
-"\n"
-"acl := WS.WS.ACL_COMPOSE(aAcl);\n"
-"\n"
-"return acl;\n"
"}\n"
-"--src dav_api.sql:5091\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"
-"declare aAcl any;\n"
-"\n"
-"aAcl := WS.WS.ACL_PARSE(acl);\n"
-"for (N := 0; N < length(aAcl); N := N + 1)\n"
-"{\n"
-"if ((aAcl[N][0] = uid) and (aAcl[N][2] = inheritance))\n"
-"{\n"
-"if (aAcl[N][1])\n"
+"if (isarray (id))\n"
"{\n"
-"aset(aAcl, N, vector(aAcl[N][0], aAcl[N][1], aAcl[N][2], bit_and(aAcl[N][3], bit_not(bitmask))));\n"
+"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
+"return ret;\n"
"}\n"
-"else\n"
+"if (\':virtprivatetags\' = propname)\n"
"{\n"
-"aset(aAcl, N, vector(aAcl[N][0], aAcl[N][1], aAcl[N][2], bit_and(aAcl[N][3], bitmask)));\n"
-"}\n"
-"}\n"
-"}\n"
-"acl := WS.WS.ACL_COMPOSE(aAcl);\n"
-"\n"
-"return acl;\n"
+"if ((\'R\' <> what) or (auth_uid = http_nobody_uid()))\n"
+"return null;\n"
+"return coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid));\n"
"}\n"
-"--src dav_api.sql:5131\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"
-"declare aAcl any;\n"
-"declare ids any;\n"
-"declare or_acc integer;\n"
-"\n"
-"if (isnull(acl))\n"
-"return 0;\n"
-"\n"
-"aAcl := WS.WS.ACL_PARSE(acl);\n"
-"if (length(aAcl) = 0)\n"
-"return 0;\n"
-"ids := (select vector_concat (vector (uid), VECTOR_AGG (GI_SUB)) from DB.DBA.SYS_ROLE_GRANTS where GI_SUPER = uid);\n"
-"\n"
-"or_acc := 0;\n"
-"N := 0;\n"
-"lenAcl := length(aAcl);\n"
-"for (N := 0; N < lenAcl; N := N + 1)\n"
-"{\n"
-"if (position (aAcl[N][0], ids))\n"
+"if (\':virtpublictags\' = propname)\n"
"{\n"
-"declare anded integer;\n"
-"anded := bit_and (aAcl[N][3], bitmask);\n"
-"if (anded <> 0)\n"
+"if (\'R\' <> what)\n"
+"return null;\n"
+"return coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid()));\n"
+"}\n"
+"if (\':virttags\' = propname)\n"
"{\n"
-"if (aAcl[N][1])\n"
+"if (\'R\' <> what)\n"
+"return null;\n"
+"if (auth_uid = http_nobody_uid())\n"
"{\n"
-"or_acc := bit_or (or_acc, anded);\n"
+"return coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid()));\n"
"}\n"
"else\n"
-"return 0;\n"
+"{\n"
+"declare pub, priv varchar;\n"
+"pub := coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = http_nobody_uid()), \'\');\n"
+"priv := coalesce ((select DT_TAGS from WS.WS.SYS_DAV_TAG where DT_RES_ID = id and DT_U_ID = auth_uid), \'\');\n"
+"if (pub = \'\')\n"
+"return priv;\n"
+"if (priv = \'\')\n"
+"return pub;\n"
+"return pub || \', \' || priv;\n"
"}\n"
"}\n"
"}\n"
-"if (or_acc = bitmask)\n"
-"return or_acc;\n"
-"return 0;\n"
+"if (isarray (id))\n"
+"{\n"
+"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
+"return ret;\n"
"}\n"
-"--src dav_api.sql:5162\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"
+"if (id < 0)\n"
"{\n"
-"return;\n"
+"return id;\n"
+"}\n"
+"whenever not found goto no_prop;\n"
+"select blob_to_string (PROP_VALUE) into ret from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id and PROP_TYPE = what;\n"
+"return ret;\n"
+"\n"
+"no_prop:\n"
+"return -11;\n"
"}\n"
-"--src dav_api.sql:5208\n";
+"--src dav_api.sql:4091\n";
-static const char *proc174 =
-"#line 5221 \"[executable]/dav_api.sql\"\n"
-"create procedure WS.WS.ACL_OWNER(in acl varbinary) returns integer\n"
+static const char *proc153 =
+"#line 4303 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_PROP_LIST (\n"
+"in path varchar,\n"
+"in propmask varchar,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null)\n"
"{\n"
-"return;\n"
+"declare st varchar;\n"
+"if ((path <> \'\') and (path[length(path)-1] = 47))\n"
+"st := \'C\';\n"
+"else\n"
+"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:5219\n";
+"--src dav_api.sql:4301\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"
-"in error integer := 1) returns any\n"
+static const char *proc154 =
+"#line 4319 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_PROP_LIST_INT (\n"
+"in id any,\n"
+"in what char(0),\n"
+"in propmask varchar,\n"
+"in extern integer := 1,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null)\n"
"{\n"
-"declare sAcl varchar;\n"
-"declare N, I, T, aclSize integer;\n"
-"declare aAcl any;\n"
-"\n"
-"if (acl is null)\n"
-"return vector ();\n"
-"if (internal_type_name(internal_type(acl)) = \'BLOB_HANDLE\')\n"
-"acl := cast(blob_to_string(acl) as varbinary);\n"
-"else if (internal_type_name(internal_type(acl)) = \'VARCHAR\')\n"
-"acl := cast (acl as varbinary);\n"
+"declare auth_uid, rc integer;\n"
+"declare ret any;\n"
"\n"
-"if (not WS.WS.ACL_IS_VALID (acl))\n"
+"if (extern)\n"
"{\n"
-"if (error)\n"
-"signal(\'ACL01\', \'Bad ACL object\');\n"
-"return vector ();\n"
+"auth_uid := DAV_AUTHENTICATE (id, what, \'1__\', auth_uname, auth_pwd);\n"
+"if (auth_uid < 0)\n"
+"return auth_uid;\n"
"}\n"
"\n"
-"aclSize := WS.WS.ACL_GET_ACESIZE (acl);\n"
-"sAcl := cast(acl as varchar);\n"
"\n"
-"vectorbld_init (aAcl);\n"
-"for (N := 1; N <= aclSize; N := N + 1)\n"
-"{\n"
-"T := WS.WS.ACL_DESERIALIZE_INT(cast (substring(sAcl, 8*N+5, 4) as varbinary));\n"
-"I := abs(bit_and(bit_shift(T, -29), 3));\n"
-"if (not isnull(strchr(inheritance, cast(I as varchar))))\n"
-"vectorbld_acc (aAcl, vector (WS.WS.ACL_DESERIALIZE_INT (cast (substring (sAcl, 8*N+1, 4) as varbinary)),\n"
-"abs(bit_shift(T, -31)),\n"
-"I,\n"
-"abs (bit_and (T, 536870911))));\n"
-"}\n"
-"vectorbld_final (aAcl);\n"
-"return aAcl;\n"
-"}\n"
-"--src dav_api.sql:5230\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"
-"declare sAcl varchar;\n"
-"declare bAcl varbinary;\n"
-"declare N, I, J integer;\n"
"\n"
-"sAcl := \'\';\n"
-"for (I := 1; I < 4; I := I + 1)\n"
-"{\n"
-"for (J := 0; J < 2; J := J + 1)\n"
+"if (isarray (id))\n"
"{\n"
-"foreach (any acl in aAcl) do\n"
+"ret := call (cast (id[0] as varchar) || \'_DAV_PROP_LIST\') (id, what, propmask, auth_uid);\n"
+"return ret;\n"
+"}\n"
+"if (id < 0)\n"
"{\n"
-"if ((acl[1]=J) and ((acl[2]=I) or ((acl[2]=0) and (I=1))) and acl[3])\n"
-"sAcl := concat(sAcl,\n"
-"cast(WS.WS.ACL_SERIALIZE_INT(acl[0]) as varchar),\n"
-"cast(WS.WS.ACL_SERIALIZE_INT(bit_shift(acl[1],31)+bit_shift(acl[2],29)+acl[3]) as varchar));\n"
+"return id;\n"
"}\n"
+"ret := vector ();\n"
+"for select PROP_NAME, PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_NAME like propmask and PROP_PARENT_ID = id and PROP_TYPE = what do {\n"
+"ret := vector_concat (ret, vector (vector (PROP_NAME, blob_to_string (PROP_VALUE))));\n"
"}\n"
+"return ret;\n"
"}\n"
+"--src dav_api.sql:4317\n";
+
+static const char *proc155 =
+"#line 4358 \"[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"
+"declare pat any;\n"
+"declare col, len, inx, t_col integer;\n"
"\n"
-"bAcl := cast(concat(cast(WS.WS.ACL_SERIALIZE_INT(length(sAcl)+8) as varchar),\n"
-"cast(WS.WS.ACL_SERIALIZE_INT(length(sAcl)/8) as varchar),\n"
-"sAcl) as varbinary);\n"
+"pat := split_and_decode (path, 0, \'\\0\\0/\');\n"
"\n"
-"return bAcl;\n"
-"}\n"
-"--src dav_api.sql:5277\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"
+"if (length (pat) < 3)\n"
+"return NULL;\n"
+"\n"
+"if (pat[1] <> \'DAV\' or pat[0] <> \'\')\n"
+"signal (\'22023\', \'Not valid path string\');\n"
+"\n"
+"len := length (pat) - 1;\n"
+"inx := 2;\n"
+"t_col := 1;\n"
+"whenever not found goto nf;\n"
+"while (inx < len)\n"
"{\n"
-"if (val is null) return null;\n"
-"whenever sqlstate \'*\' goto ret_null;\n"
-"return cast (val as integer);\n"
-"ret_null:\n"
-"return null;\n"
+"select COL_ID into col from WS.WS.SYS_DAV_COL where COL_PARENT = t_col and COL_NAME = pat[inx];\n"
+"t_col := col;\n"
+"inx := inx + 1;\n"
"}\n"
-"--src dav_api.sql:5311\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"
+"nf:\n"
+"while (inx < len)\n"
"{\n"
-"if (val is null) return null;\n"
-"whenever sqlstate \'*\' goto ret_null;\n"
-"return cast (val as datetime);\n"
-"ret_null:\n"
-"return null;\n"
+"col := WS.WS.GETID (\'C\');\n"
+"insert into WS.WS.SYS_DAV_COL\n"
+"(COL_ID, COL_NAME, COL_PARENT, COL_CR_TIME, COL_MOD_TIME, COL_OWNER, COL_GROUP, COL_PERMS)\n"
+"values (col, pat[inx], t_col, now (), now (), own, grp, perms);\n"
+"inx := inx + 1;\n"
+"t_col := col;\n"
+"}\n"
+"return col;\n"
"}\n"
-"--src dav_api.sql:5321\n";
+"--src dav_api.sql:4356\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"
+static const char *proc156 =
+"#line 4396 \"[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"
-"if (val is null) return null;\n"
-"whenever sqlstate \'*\' goto ret_null;\n"
-"return cast (val as varchar);\n"
-"ret_null:\n"
-"return null;\n"
+"declare up, gp, pp varchar;\n"
+"\n"
+"pp := substring (perm, 7, 3);\n"
+"if (pp like req)\n"
+"return 1;\n"
+"up := substring (perm, 1, 3);\n"
+"if (up like req and ((oid = puid) or (oid = 2)))\n"
+"return 1;\n"
+"gp := substring (perm, 4, 3);\n"
+"if (gp like req and ((ogid = pgid) or (exists (select top 1 1 from WS.WS.SYS_DAV_USER_GROUP where UG_UID = oid and UG_GID = pgid))))\n"
+"return 1;\n"
+"\n"
+"return 0;\n"
"}\n"
-"--src dav_api.sql:5331\n";
+"--src dav_api.sql:4394\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"
+static const char *proc157 =
+"#line 4417 \"[executable]/dav_api.sql\"\n"
+" create procedure DAV_CHECK_USER (in uname varchar, in pwd any := null)\n"
"{\n"
-"if (val is null) return null;\n"
-"whenever sqlstate \'*\' goto ret_null;\n"
-"return cast (val as integer);\n"
-"ret_null:\n"
-"return null;\n"
+"declare rc int;\n"
+"declare pwd1 any;\n"
+"rc := 0;\n"
+"if (pwd is null)\n"
+"{\n"
+"rc := coalesce ((select 1 from WS.WS.SYS_DAV_USER where U_NAME = uname), 0);\n"
+"}\n"
+"else\n"
+"{\n"
+"whenever not found goto nf;\n"
+"select U_PWD into pwd1 from WS.WS.SYS_DAV_USER where U_NAME = uname with (prefetch 1);\n"
+"if ((pwd1[0] = 0 and pwd_magic_calc (uname, pwd) = pwd1) or (pwd1[0] <> 0 and pwd1 = pwd))\n"
+"rc := 1;\n"
+"nf:;\n"
+"}\n"
+"return rc;\n"
"}\n"
-"--src dav_api.sql:5341\n";
+"--src dav_api.sql:4415\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"
+static const char *proc158 =
+"#line 4440 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_RES_CONTENT (\n"
+"in path varchar,\n"
+"inout content any,\n"
+"out type varchar,\n"
+"in auth_uname varchar := null, in auth_pwd varchar := null)\n"
"{\n"
-"if (val is null) return null;\n"
-"whenever sqlstate \'*\' goto ret_null;\n"
-"return cast (val as datetime);\n"
-"ret_null:\n"
-"return null;\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:5351\n";
+"--src dav_api.sql:4438\n";
-static const char *proc182 =
-"#line 5363 \"[executable]/dav_api.sql\"\n"
-"create function DAV_FC_CONST_AS_SQL (inout val any)\n"
+static const char *proc159 =
+"#line 4453 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_RES_CONTENT_STRSES (\n"
+"in path varchar,\n"
+"inout content any,\n"
+"out type varchar,\n"
+"in auth_uname varchar := null, in auth_pwd varchar := null)\n"
"{\n"
-"if (193 = __tag (val))\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:4451\n";
+
+static const char *proc160 =
+"#line 4464 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_RES_CONTENT_INT (\n"
+"in id any,\n"
+"inout content any,\n"
+"out type varchar,\n"
+"in content_mode integer,\n"
+"in extern integer := 1,\n"
+"in auth_uname varchar := null, in auth_pwd varchar := null )\n"
"{\n"
-"declare res varchar;\n"
-"res := \'\';\n"
-"foreach (any item in val) do\n"
-"res := concat (res, \', \', DAV_FC_CONST_AS_SQL(item));\n"
-"return subseq (res, 2);\n"
+"declare auth_uid, rc integer;\n"
+"declare pperms, name varchar;\n"
+"declare par, cont any;\n"
+"declare det varchar;\n"
+"declare detcol_id integer;\n"
+"declare detcol_path, unreached_path any;\n"
+"\n"
+"if (extern)\n"
+"{\n"
+"auth_uid := DAV_AUTHENTICATE (id, \'R\', \'1__\', auth_uname, auth_pwd);\n"
+"if (auth_uid < 0)\n"
+"return auth_uid;\n"
"}\n"
-"if (182 = __tag (val))\n"
-"return replace (WS.WS.STR_SQL_APOS (val), \'^{\', \'\\\\136{\');\n"
-"if (189 = __tag (val))\n"
-"return sprintf (\'%d\', val);\n"
-"if (211 = __tag (val))\n"
-"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"
+"else\n"
+"auth_uid := null;\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
+"return id;\n"
+"\n"
+"\n"
+"if (isarray (id))\n"
+"{\n"
+"return call (cast (id[0] as varchar) || \'_DAV_RES_CONTENT\') (id, content, type, content_mode);\n"
"}\n"
-"--src dav_api.sql:5361\n";
-
-static const char *proc183 =
-"#line 5389 \"[executable]/dav_api.sql\"\n"
-"create procedure DAV_FC_PRED_METAS (inout pred_metas any)\n"
+"rc := id;\n"
+"if ((content_mode = 0) or (content_mode = 2))\n"
+"select RES_CONTENT, RES_TYPE into content, type from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
+"else if (content_mode = 1)\n"
"{\n"
-"pred_metas := vector (\n"
-"\'RES_ID\', vector (\'SYS_DAV_RES\' , 0, \'integer\' , \'RES_ID\' ),\n"
-"\'RES_ID_SERIALIZED\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'serialize (RES_ID)\' ),\n"
-"\'RES_NAME\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'RES_NAME\' ),\n"
-"\'RES_FULL_PATH\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'RES_FULL_PATH\' ),\n"
-"\'RES_TYPE\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'RES_TYPE\' ),\n"
-"\'RES_OWNER_ID\', vector (\'SYS_DAV_RES\' , 0, \'integer\' , \'RES_OWNER\' ),\n"
-"\'RES_OWNER_NAME\', vector (\'SYS_DAV_USER\' , 0, \'varchar\' , \'U_NAME\' ),\n"
-"\'RES_GROUP_ID\', vector (\'SYS_DAV_RES\' , 0, \'integer\' , \'RES_GROUP\' ),\n"
-"\'RES_GROUP_NAME\', vector (\'SYS_DAV_GROUP\' , 0, \'varchar\' , \'G_NAME\' ),\n"
-"\'RES_COL_FULL_PATH\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'subseq (RES_FULL_PATH, 0, 1 + strrchr (RES_FULL_PATH, \'\'/\'\'))\' ),\n"
-"\'RES_COL_NAME\', vector (\'SYS_DAV_COL\' , 0, \'varchar\' , \'COL_NAME\' ),\n"
+"select RES_CONTENT, RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
"\n"
-"\'RES_CR_TIME\', vector (\'SYS_DAV_RES\' , 0, \'datetime\' , \'RES_CR_TIME\' ),\n"
-"\'RES_MOD_TIME\', vector (\'SYS_DAV_RES\' , 0, \'datetime\' , \'RES_MOD_TIME\'),\n"
-"\'RES_PERMS\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'RES_PERMS\' ),\n"
-"\'RES_CONTENT\', vector (\'SYS_DAV_RES\' , 0, \'text\' , \'RES_CONTENT\' ),\n"
-"\'PROP_NAME\', vector (\'SYS_DAV_PROP\' , 0, \'varchar\' , \'PROP_NAME\' ),\n"
-"\'PROP_VALUE\', vector (\'SYS_DAV_PROP\' , 1, \'text\' , \'PROP_VALUE\' ),\n"
-"\'RES_TAGS\', vector (\'all-tags\' , 0, \'varchar\' , \'DT_TAGS\' ),\n"
-"\'RES_PUBLIC_TAGS\', vector (\'public-tags\' , 0, \'text-tag\' , \'DT_TAGS\' ),\n"
-"\'RES_PRIVATE_TAGS\', vector (\'private-tags\' , 0, \'text-tag\' , \'DT_TAGS\' ),\n"
-"\'RDF_PROP\', vector (\'SYS_DAV_PROP\' , 1, \'varchar\' , NULL ),\n"
-"\'RDF_VALUE\', vector (\'SYS_DAV_PROP\' , 2, \'XML\' , NULL ),\n"
-"\'RDF_OBJ_VALUE\', vector (\'SYS_DAV_PROP\' , 3, \'XML\' , NULL )\n"
-");\n"
+"if (cont is not null)\n"
+"http (cont, content);\n"
"}\n"
-"--src dav_api.sql:5387\n";
-
-static const char *proc184 =
-"#line 5427 \"[executable]/dav_api.sql\"\n"
-"create procedure DAV_FC_CMP_METAS (inout cmp_metas any)\n"
+"else if (content_mode = 3)\n"
"{\n"
-"cmp_metas := vector (\n"
-"\'<\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ < ^{pattern}^)\' , \'[sql-lt (^{value}^, ^{pattern}^)]\'),\n"
-"\'>\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ > ^{pattern}^)\' , \'[sql-gt (^{value}^, ^{pattern}^)]\'),\n"
-"\'<=\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ <= ^{pattern}^)\' , \'[sql-le (^{value}^, ^{pattern}^)]\'),\n"
-"\'>=\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ >= ^{pattern}^)\' , \'[sql-ge (^{value}^, ^{pattern}^)]\'),\n"
-"\'=\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ = ^{pattern}^)\' , \'[sql-equ (^{value}^, ^{pattern}^)]\'),\n"
-"\'<>\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ <> ^{pattern}^)\' , \'[sql-neq (^{value}^, ^{pattern}^)]\'),\n"
-"\'!=\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ <> ^{pattern}^)\' , \'[sql-neq (^{value}^, ^{pattern}^)]\'),\n"
-"\'between\', vector (\'vector\', \'sortable\' , NULL, \'(^{value}^ between ^{pattern0}^ and ^{pattern1}^)\' , \'[sql-ge(^{value}^, ^{pattern0}^)][sql-le (^{value}^, ^{pattern0}^)]\' ),\n"
-"\'in\', vector (\'vector\', \'sortable\' , NULL, \'(^{value}^ in (^{pattern}^))\' , NULL ),\n"
-"\'member_of\', vector (\'vector\', \'sortable\' , NULL, \'(^{value}^ in (^{pattern}^))\' , NULL ),\n"
-"\'like\', vector (\'scalar\', \'varchar\' , NULL, \'(^{value}^ like ^{pattern}^)\' , \'[^{value}^ like ^{pattern}^]\'),\n"
-"\'regexp_match\', vector (\'scalar\', \'varchar\' , NULL, \'(regexp_match (^{pattern}^, ^{value}^) is not null)\' , NULL ),\n"
-"\'is_substring_of\', vector (\'scalar\', \'varchar\' , NULL, \'(strstr (^{pattern}^, ^{value}^) is not null)\' ,\'[contains (^{pattern}^, ^{value}^)]\'),\n"
-"\'contains_substring\', vector (\'scalar\', \'varchar\' , NULL, \'(strstr (^{value}^, ^{pattern}^) is not null)\' ,\'[contains (^{value}^, ^{pattern}^)]\'),\n"
-"\'not_contains_substring\', vector (\'scalar\', \'varchar\' , NULL, \'(strstr (^{value}^, ^{pattern}^) is null)\' ,\'[not (contains (^{value}^, ^{pattern}^)]\' ),\n"
-"\'starts_with\', vector (\'scalar\', \'varchar\' , NULL, \'(^{value}^ between ^{pattern}^ and (^{pattern}^ || \'\'\\\\377\\\\377\\\\377\\\\377\'\'))\' , \'[starts-with (^{value}^, ^{pattern}^)]\'),\n"
-"\'not_starts_with\', vector (\'scalar\', \'varchar\' , NULL, \'(not (^{value}^ between ^{pattern}^ and (^{pattern}^ || \'\'\\\\377\\\\377\\\\377\\\\377\'\')))\' , \'[not (starts-with (^{value}^, ^{pattern}^))]\' ),\n"
-"\'ends_with\', vector (\'scalar\', \'varchar\' , NULL, \'(case (sign (length (^{value}^) - length (^{pattern}^))) when -1 then 0 else equ (subseq (^{value}^, length (^{value}^) - length (^{pattern}^)), ^{pattern}^) end)\' , \'[ends-with (^{value}^, ^{pattern}^)]\'),\n"
-"\'not_ends_with\', vector (\'scalar\', \'varchar\' , NULL, \'(case (sign (length (^{value}^) - length (^{pattern}^))) when -1 then 1 else neq (subseq (^{value}^, length (^{value}^) - length (^{pattern}^)), ^{pattern}^) end)\' , \'[not (ends-with (^{value}^, ^{pattern}^))]\'),\n"
-"\'is_null\', vector (\'no\' , \'any\' , NULL, \'(^{value}^ is null)\' , null ),\n"
-"\'is_not_null\', vector (\'no\' , \'any\' , NULL, \'(^{value}^ is not null)\' , null ),\n"
-"\'contains_tags\', vector (\'scalar\', \'varchar\' , NULL, NULL, NULL ),\n"
-"\'may_contain_tags\', vector (\'scalar\', \'varchar\' , NULL, NULL, NULL ),\n"
-"\'contains_text\', vector (\'scalar\', \'text\' , NULL, NULL, \'[text-contains (^{value}^, ^{pattern}^)]\' ),\n"
-"\'may_contain_text\', vector (\'scalar\', \'text\' , NULL, NULL, \'[text-contains (^{value}^, ^{pattern}^)]\' ),\n"
+"select http (RES_CONTENT), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id;\n"
"\n"
-"\'xcontains\', vector (\'scalar\', \'XML\' , NULL, NULL, \'[^{pattern}^]\' )\n"
-");\n"
"}\n"
-"--src dav_api.sql:5425\n";
+"return rc;\n"
+"}\n"
+"--src dav_api.sql:4462\n";
-static const char *proc185 =
-"#line 5461 \"[executable]/dav_api.sql\"\n"
-"create procedure DAV_FC_TABLE_METAS (inout table_metas any)\n"
+static const char *proc161 =
+"#line 4515 \"[executable]/dav_api.sql\"\n"
+"create function DAV_COL_IS_ANCESTOR_OF (in a_id integer, in d_id integer) returns integer\n"
"{\n"
-"table_metas := vector (\n"
-"\'SYS_DAV_RES\' , vector ( \'\' ,\n"
-"\'\' ,\n"
-"\'RES_CONTENT\' , \'RES_CONTENT\' , \'[__quiet] /\' ),\n"
-"\'SYS_DAV_COL\' , vector ( \'\\n inner join WS.WS.SYS_DAV_COL as ^{alias}^ on ((^{alias}^.COL_ID = _top.RES_COL)^{andpredicates}^)\' ,\n"
-"\'\\n exists (select 1 from WS.WS.SYS_DAV_COL as ^{alias}^ where (^{alias}^.COL_ID = _top.RES_COL)^{andpredicates}^)\' ,\n"
-"NULL , NULL , NULL ),\n"
-"\'SYS_DAV_USER\' , vector ( \'\\n left outer join WS.WS.SYS_DAV_USER as ^{alias}^ on ((^{alias}^.U_ID = _top.RES_OWNER)^{andpredicates}^)\' ,\n"
-"\'\\n exists (select 1 from WS.WS.SYS_DAV_USER as ^{alias}^ where (^{alias}^.U_ID = _top.RES_OWNER)^{andpredicates}^)\' ,\n"
-"NULL , NULL , NULL ),\n"
-"\'SYS_DAV_GROUP\' , vector ( \'\\n left outer join WS.WS.SYS_DAV_GROUP as ^{alias}^ on ((^{alias}^.G_ID = _top.RES_GROUP)^{andpredicates}^)\' ,\n"
-"\'\\n exists (select 1 from WS.WS.SYS_DAV_GROUP as ^{alias}^ where (^{alias}^.G_ID = _top.RES_GROUP)^{andpredicates}^)\' ,\n"
-"NULL , NULL , NULL ),\n"
-"\'SYS_DAV_PROP\' , vector ( \'\\n inner join WS.WS.SYS_DAV_PROP as ^{alias}^ on ((^{alias}^.PROP_PARENT_ID = _top.RES_ID) and (^{alias}^.PROP_TYPE = \'\'R\'\')^{andpredicates}^)\' ,\n"
-"\'\\n exists (select 1 from WS.WS.SYS_DAV_PROP as ^{alias}^ where (^{alias}^.PROP_PARENT_ID = _top.RES_ID) and (^{alias}^.PROP_TYPE = \'\'R\'\')^{andpredicates}^)\' ,\n"
-"\'PROP_VALUE\' , \'PROP_VALUE\' , \'[__quiet __davprop xmlns:virt=\"virt\"] .\' ),\n"
-"\'public-tags\' , vector ( \'\\n inner join WS.WS.SYS_DAV_TAG as ^{alias}^ on ((^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = http_nobody_uid())^{andpredicates}^)\' ,\n"
-"\'\\n exists (select 1 from WS.WS.SYS_DAV_TAG as ^{alias}^ where (^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = http_nobody_uid())^{andpredicates}^)\' ,\n"
-"\'DT_TAGS\' , \'DT_TAGS\' , NULL ),\n"
-"\'private-tags\' , vector ( \'\\n inner join WS.WS.SYS_DAV_TAG as ^{alias}^ on ((^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = ^{uid}^)^{andpredicates}^)\' ,\n"
-"\'\\n exists (select 1 from WS.WS.SYS_DAV_TAG as ^{alias}^ where (^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = ^{uid}^)^{andpredicates}^)\' ,\n"
-"\'DT_TAGS\' , \'DT_TAGS\' , NULL ),\n"
-"\'all-tags\' , vector ( \'\\n inner join WS.WS.SYS_DAV_TAG as ^{alias}^ on ((^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = http_nobody_uid() or ^{alias}^.DT_U_ID = ^{uid}^)^{andpredicates}^)\' ,\n"
-"\'\\n exists (select 1 from WS.WS.SYS_DAV_TAG as ^{alias}^ where (^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = http_nobody_uid() or ^{alias}^.DT_U_ID = ^{uid}^)^{andpredicates}^)\' ,\n"
-"\'DT_TAGS\' , \'DT_TAGS\' , NULL )\n"
-");\n"
+"declare p_id integer;\n"
+"if (a_id = 0)\n"
+"return 1;\n"
+"again:\n"
+"\n"
+"select COL_PARENT into p_id from WS.WS.SYS_DAV_COL where COL_ID = d_id and COL_PARENT < COL_ID;\n"
+"if (p_id = a_id)\n"
+"return 1;\n"
+"if (p_id = 0)\n"
+"return 0;\n"
+"d_id := p_id;\n"
+"goto again;\n"
"}\n"
-"--src dav_api.sql:5459\n";
+"--src dav_api.sql:4513\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"
+static const char *proc162 =
+"#line 4532 \"[executable]/dav_api.sql\"\n"
+"create function DAV_COL_PATH_BOUNDARY (in path varchar) returns varchar\n"
"{\n"
-"declare pred_meta any;\n"
-"declare cmp_meta, pattern_sample, cuts any;\n"
-"declare var_expn, cmp_type, pattern_type, cond_format varchar;\n"
"declare res varchar;\n"
-"pred_meta := get_keyword (pred[0], pred_metas);\n"
-"cmp_meta := get_keyword (pred[1], cmp_metas);\n"
-"cond_format := cmp_meta [3 + nonsql];\n"
-"if (cond_format is null)\n"
-"signal (\'.....\', \'Internal error in DAV_DIR_FILTER: DAV_FC_PRINT_COMPARISON on non-comparison predicate\');\n"
-"cmp_type := cmp_meta[1];\n"
-"pattern_sample := pred[2];\n"
-"if (\'scalar\' = cmp_meta[0])\n"
-"{\n"
-"if (not (__tag (pattern_sample) in (182, 189, 211)))\n"
-"goto bad_pattern_datatype;\n"
+"declare len integer;\n"
+"res := path;\n"
+"len := length (res);\n"
+"if ((len = 0) or (res[len-1] <> 47))\n"
+"signal (\'.....\', sprintf (\'Bad path in DAV_COL_PATH_BOUNDARY: %s\', path));\n"
+"res := res || \'\\377\\377\\377\\377\';\n"
+"return res;\n"
"}\n"
-"else if (\'vector\' = cmp_meta[0])\n"
-"{\n"
-"if (193 <> __tag (pattern_sample))\n"
-"goto bad_pattern_datatype;\n"
-"if (0 = length (pattern_sample))\n"
-"goto empty_array_pattern;\n"
-"pattern_sample := pattern_sample[0];\n"
-"if (not (__tag (pattern_sample) in (182, 189, 211)))\n"
-"goto bad_pattern_datatype;\n"
-"foreach (any itm in pred[2]) do\n"
+"--src dav_api.sql:4530\n";
+
+static const char *trig7 =
+"#line 4547 \"[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"
-"if (__tag (itm) <> __tag(pred[2][0]))\n"
-"goto mixed_array_pattern;\n"
-"}\n"
+"declare aciContent, oldPath, newPath, update_acl any;\n"
+"\n"
+"if (connection_get (\'dav_acl_sync\') = 1)\n"
+"return;\n"
+"\n"
+"if ((O.COL_NAME = N.COL_NAME) and (O.COL_PARENT = N.COL_PARENT))\n"
+"return;\n"
+"\n"
+"aciContent := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = N.COL_ID and PROP_TYPE = \'C\' and PROP_NAME = \'virt:aci_meta_n3\');\n"
+"if (aciContent is null)\n"
+"return;\n"
+"\n"
+"oldPath := WS.WS.COL_PATH (O.COL_PARENT) || O.COL_NAME || \'/\';\n"
+"newPath := WS.WS.COL_PATH (N.COL_PARENT) || N.COL_NAME || \'/\';\n"
+"update_acl := 1;\n"
+"\n"
+"WS.WS.WAC_DELETE (oldPath, update_acl);\n"
+"WS.WS.WAC_INSERT (newPath, aciContent, N.COL_OWNER, N.COL_GROUP, update_acl);\n"
"}\n"
-"else if (\'no\' = cmp_meta[0])\n"
+"--src dav_api.sql:4545\n";
+
+static const char *trig8 =
+"#line 4570 \"[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"
-"pattern_sample := \'\';\n"
+"declare update_acl integer;\n"
+"declare path varchar;\n"
+"\n"
+"if (connection_get (\'dav_acl_sync\') = 1)\n"
+"return;\n"
+"\n"
+"path := WS.WS.COL_PATH (O.COL_ID);\n"
+"update_acl := 1;\n"
+"\n"
+"WS.WS.WAC_DELETE (path, update_acl);\n"
"}\n"
-"else signal (\'.....\', \'Internal error in DAV_DIR_FILTER: DAV_FC_CMP_META forms bad sort of match pattern\');\n"
-"if (isstring (pattern_sample))\n"
-"pattern_type := \'varchar\';\n"
-"else if (isinteger (pattern_sample))\n"
-"pattern_type := \'integer\';\n"
-"else if (211 = __tag (pattern_sample))\n"
-"pattern_type := \'datetime\';\n"
-"else\n"
-"goto bad_pattern_datatype;\n"
-"if (\'sortable\' = cmp_type)\n"
+"--src dav_api.sql:4568\n";
+
+static const char *trig9 =
+"#line 4585 \"[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"
"\n"
+"if (connection_get (\'dav_acl_sync\') = 1)\n"
+"return;\n"
"\n"
-"cmp_type := pattern_type;\n"
-"}\n"
-"else if (\'any\' = cmp_type)\n"
+"if (N.RES_NAME like \'%,acl\')\n"
"{\n"
-"pattern_type := pred_meta[2];\n"
+"declare rid int;\n"
+"oldPath := WS.WS.COL_PATH (O.RES_COL) || O.RES_NAME;\n"
+"newPath := WS.WS.COL_PATH (N.RES_COL) || N.RES_NAME;\n"
+"oldPath := regexp_replace (oldPath, \',acl\\x24\', \'\');\n"
+"newPath := regexp_replace (newPath, \',acl\\x24\', \'\');\n"
+"aciContent := N.RES_CONTENT;\n"
+"rid := (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = oldPath);\n"
+"set triggers off;\n"
+"update WS.WS.SYS_DAV_PROP set PROP_VALUE = N.RES_CONTENT where PROP_TYPE = \'R\' and PROP_NAME = \'virt:aci_meta_n3\' and PROP_PARENT_ID = rid;\n"
+"set triggers on;\n"
+"update_acl := 0;\n"
"}\n"
-"else if (\n"
-"(1 = nonsql) and\n"
-"(\'varchar\' = pattern_type) and\n"
-"((\'text\' = cmp_type) or (\'XML\' = cmp_type)) )\n"
+"else\n"
"{\n"
-"pattern_type := pred_meta[2];\n"
+"if ((O.RES_NAME = N.RES_NAME) and (O.RES_COL = N.RES_COL))\n"
+"return;\n"
+"\n"
+"aciContent := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = N.RES_ID and PROP_TYPE = \'R\' and PROP_NAME = \'virt:aci_meta_n3\');\n"
+"if (aciContent is null)\n"
+"return;\n"
+"\n"
+"oldPath := WS.WS.COL_PATH (O.RES_COL) || O.RES_NAME;\n"
+"newPath := WS.WS.COL_PATH (N.RES_COL) || N.RES_NAME;\n"
+"update_acl := 1;\n"
"}\n"
-"else if (pattern_type <> cmp_type)\n"
-"goto bad_pattern_datatype;\n"
-"if (pred_meta[2] = pattern_type)\n"
-"{\n"
-"var_expn := varname;\n"
+"WS.WS.WAC_DELETE (oldPath, update_acl);\n"
+"WS.WS.WAC_INSERT (newPath, aciContent, N.RES_OWNER, N.RES_GROUP, update_acl);\n"
"}\n"
-"else if (1 = nonsql)\n"
+"--src dav_api.sql:4583\n";
+
+static const char *trig10 =
+"#line 4624 \"[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"
-"if ((\'text\' = cmp_meta) or (\'XML\' = cmp_meta))\n"
-"var_expn := varname;\n"
-"else if (\'varchar\' = pattern_type)\n"
-"var_expn := sprintf (\'string (%s)\', varname);\n"
-"else if (\'integer\' = pattern_type)\n"
-"var_expn := sprintf (\'number (%s)\', varname);\n"
-"else if (\'datetime\' = pattern_type)\n"
-"var_expn := sprintf (\'dateTime (%s, 1)\', varname);\n"
-"else\n"
-"goto type_mismatch;\n"
+"declare update_acl int;\n"
+"declare path varchar;\n"
+"\n"
+"if (connection_get (\'dav_acl_sync\') = 1)\n"
+"return;\n"
+"\n"
+"if (O.RES_NAME like \'%,acl\')\n"
+"{\n"
+"update_acl := 0;\n"
+"path := regexp_replace (O.RES_FULL_PATH, \',acl\\x24\', \'\');\n"
"}\n"
"else\n"
"{\n"
-"if (\'varchar\' = pred_meta[2])\n"
-"var_expn := sprintf (\'DB.DBA.DAV_CAST_STRING_TO_%s (%s)\', upper (cmp_type), varname);\n"
-"else if (\'text\' = pred_meta[2])\n"
-"var_expn := sprintf (\'DB.DBA.DAV_CAST_TEXT_TO_%s (%s)\', upper (cmp_type), varname);\n"
-"else\n"
-"goto type_mismatch;\n"
+"path := O.RES_FULL_PATH;\n"
+"update_acl := 1;\n"
"}\n"
-"if ((\'like\' = pred[1]) and (\'%\' = pred[2]))\n"
-"return null;\n"
-"if ((\'starts_with\' = pred[1]) and (\'\' = pred[2]))\n"
-"return null;\n"
-"if ((\'ends_with\' = pred[1]) and (\'\' = pred[2]))\n"
-"return null;\n"
-"res := \'\';\n"
-"cuts := split_and_decode (cond_format, 0, \'\\0\\0^\');\n"
-"foreach (varchar cut in cuts) do\n"
-"{\n"
-"if (cut = \'\' or (cut[0] <> \'{\'[0]))\n"
-"res := res || cut;\n"
-"else if (cut = \'{value}\')\n"
-"res := res || var_expn;\n"
-"else if (cut = \'{pattern}\')\n"
-"res := res || DAV_FC_CONST_AS_SQL (pred[2]);\n"
-"else if (cut = \'{pattern0}\')\n"
-"{\n"
-"res := res || DAV_FC_CONST_AS_SQL (pred[2][0]);\n"
+"WS.WS.WAC_DELETE (path, update_acl);\n"
"}\n"
-"else if (cut = \'{pattern1}\')\n"
+"--src dav_api.sql:4622\n";
+
+static const char *trig11 =
+"#line 4646 \"[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 (length (pred[2]) < 2)\n"
-"goto tooshort_array_pattern;\n"
-"res := res || DAV_FC_CONST_AS_SQL (pred[2][1]);\n"
-"}\n"
-"else signal (\'.....\', \'Internal error in DAV_DIR_FILTER: DAV_FC_CMP_META forms bad formatting pattern\');\n"
-"}\n"
-"return res;\n"
+"if (N.PROP_NAME <> \'virt:aci_meta_n3\')\n"
+"return;\n"
"\n"
-"bad_pattern_datatype:\n"
-"signal (\'.....\', sprintf (\'Bad data type (%d) of pattern value in predicate \'\'%s\'\' (operation \'\'%s\'\') in filter of DAV_DIR_FILTER, \', __tag (pattern_sample), pred[0], pred[1]));\n"
-"empty_array_pattern:\n"
-"signal (\'.....\', sprintf (\'The pattern is an empty vector in predicate \'\'%s\'\' (operation \'\'%s\'\') in filter of DAV_DIR_FILTER, \', pred[0], pred[1]));\n"
-"tooshort_array_pattern:\n"
-"signal (\'.....\', sprintf (\'The pattern vector is too short in predicate \'\'%s\'\' (operation \'\'%s\'\') in filter of DAV_DIR_FILTER, \', pred[0], pred[1]));\n"
-"mixed_array_pattern:\n"
-"signal (\'.....\', sprintf (\'All items of the pattern vector must have same datatype in predicate \'\'%s\'\' (operation \'\'%s\'\') in filter of DAV_DIR_FILTER, \', pred[0], pred[1]));\n"
-"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"
+"declare _path, _owner, _group any;\n"
+"declare exit handler for not found { return; };\n"
+"\n"
+"if (N.PROP_TYPE = \'R\')\n"
+"{\n"
+"select RES_FULL_PATH, RES_OWNER, RES_GROUP\n"
+"into _path, _owner, _group\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = N.PROP_PARENT_ID;\n"
+"} else {\n"
+"select DAV_SEARCH_PATH (COL_ID, N.PROP_TYPE), COL_OWNER, COL_GROUP\n"
+"into _path, _owner, _group\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where COL_ID = N.PROP_PARENT_ID;\n"
"}\n"
-"--src dav_api.sql:5491\n";
+"WS.WS.WAC_INSERT (_path, N.PROP_VALUE, _owner, _group, 1);\n"
+"}\n"
+"--src dav_api.sql:4644\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"
+static const char *trig12 =
+"#line 4670 \"[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"
-"declare pred_metas, cmp_metas, table_metas any;\n"
-"declare used_tables any;\n"
+"if (N.PROP_NAME <> \'virt:aci_meta_n3\')\n"
+"return;\n"
"\n"
-"DAV_FC_PRED_METAS (pred_metas);\n"
-"DAV_FC_CMP_METAS (cmp_metas);\n"
-"DAV_FC_TABLE_METAS (table_metas);\n"
-"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"
+"declare _path, _owner, _group any;\n"
+"declare exit handler for not found { return; };\n"
+"\n"
+"if (N.PROP_TYPE = \'R\')\n"
+"{\n"
+"select RES_FULL_PATH, RES_OWNER, RES_GROUP\n"
+"into _path, _owner, _group\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = N.PROP_PARENT_ID;\n"
+"} else {\n"
+"select DAV_SEARCH_PATH (COL_ID, N.PROP_TYPE), COL_OWNER, COL_GROUP\n"
+"into _path, _owner, _group\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where COL_ID = N.PROP_PARENT_ID;\n"
+"}\n"
+"WS.WS.WAC_DELETE (_path, 1);\n"
+"WS.WS.WAC_INSERT (_path, N.PROP_VALUE, _owner, _group, 1);\n"
"}\n"
-"--src dav_api.sql:5626\n";
+"--src dav_api.sql:4668\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"
+static const char *trig13 =
+"#line 4695 \"[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"
+"return;\n"
"\n"
+"declare _path any;\n"
+"declare exit handler for not found { return; };\n"
"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"declare pred_count, pred_idx, need_and, need_top_and integer;\n"
-"declare table_count, table_idx, fixed_used_tables, first_ft_table_idx integer;\n"
-"declare table_of_pred, ses any;\n"
-"declare res_strg varchar;\n"
-"pred_count := length (filter);\n"
-"fixed_used_tables := length (used_tables);\n"
-"if ((0 = pred_count) and (2 = fixed_used_tables))\n"
-"return \'\\nwhere\\n(1=1)\\n\';\n"
-"\n"
-"table_of_pred := make_array (pred_count, \'any\');\n"
-"pred_idx := 0;\n"
-"while (pred_idx < pred_count)\n"
-"{\n"
-"declare pred, pred_meta, cmp_meta any;\n"
-"declare pred_table_key, optext, cmp_text, ftc_text, xc_text varchar;\n"
-"declare join_with_prop_name, used_table_pos integer;\n"
-"pred := filter[pred_idx];\n"
-"pred_meta := get_keyword (pred[0], pred_metas);\n"
-"if (pred_meta is null)\n"
+"if (O.PROP_TYPE = \'R\')\n"
"{\n"
-"signal (\'.....\', sprintf (\'Invalid predicate type \'\'%s\'\' in filter of DAV_DIR_FILTER\', cast (pred[0] as varchar)));\n"
+"select RES_FULL_PATH\n"
+"into _path\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = O.PROP_PARENT_ID;\n"
+"} else {\n"
+"select DAV_SEARCH_PATH (COL_ID, O.PROP_TYPE)\n"
+"into _path\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where COL_ID = O.PROP_PARENT_ID;\n"
"}\n"
-"if (length (pred) <> 3 + pred_meta[1])\n"
-"signal (\'.....\', sprintf (\'Predicate with type \'\'%s\'\' should be a vector of length %d in filter of DAV_DIR_FILTER\', pred[0], (3 + pred_meta[1])));\n"
-"cmp_meta := get_keyword (pred[1], cmp_metas);\n"
-"if (cmp_meta is null)\n"
-"signal (\'.....\', sprintf (\'Invalid operation name \'\'%s\'\' in filter of DAV_DIR_FILTER\', pred[1]));\n"
-"join_with_prop_name := 0;\n"
-"if ((\'PROP_VALUE\' = pred[0]) or (\'RDF_PROP\' = pred[0]) or (\'RDF_VALUE\' = pred[0]) or (\'RDF_OBJ_VALUE\' = pred[0]))\n"
+"WS.WS.WAC_DELETE (_path, 1);\n"
+"}\n"
+"--src dav_api.sql:4693\n";
+
+static const char *proc163 =
+"#line 4719 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.WAC_INSERT (\n"
+"in path varchar,\n"
+"in aciContent any,\n"
+"in uid integer,\n"
+"in gid integer,\n"
+"in update_acl integer)\n"
"{\n"
-"if (get_keyword (pred_meta[0], used_tables) is null)\n"
-"join_with_prop_name := 1;\n"
-"else\n"
+"\n"
+"declare what, graph, permissions varchar;\n"
+"\n"
+"graph := WS.WS.WAC_GRAPH (path);\n"
+"aciContent := cast (blob_to_string (aciContent) as varchar);\n"
+"if (update_acl)\n"
"{\n"
-"filter := vector_concat (filter, vector (vector (\'PROP_NAME\', \'=\', pred[3])));\n"
-"table_of_pred := vector_concat (table_of_pred, vector (null));\n"
-"pred_count := pred_count + 1;\n"
+"connection_set (\'dav_acl_sync\', 1);\n"
+"what := case when (path[length (path)-1] <> ascii(\'/\')) then \'R\' else \'C\' end;\n"
+"permissions := DB.DBA.DAV_PROP_GET_INT (DB.DBA.DAV_SEARCH_ID (path, what), what, \':virtpermissions\', 0, null, null, http_dav_uid ());\n"
+"DAV_RES_UPLOAD_STRSES_INT (rtrim (path, \'/\') || \',acl\', aciContent, \'text/n3\', permissions, uid, gid, null, null, 0);\n"
+"connection_set (\'dav_acl_sync\', null);\n"
"}\n"
+"DB.DBA.TTLP (aciContent, graph, graph);\n"
"}\n"
-"if (join_with_prop_name)\n"
+"--src dav_api.sql:4717\n";
+
+static const char *proc164 =
+"#line 4743 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.WAC_DELETE (\n"
+"in path varchar,\n"
+"in update_acl integer)\n"
"{\n"
-"if (not isstring (pred[3]))\n"
-"signal (\'.....\', sprintf (\'The DAV property name in predicate of type \'\'%s\'\' is not a string in filter of DAV_DIR_FILTER\', pred[0]));\n"
-"pred_table_key := concat (pred_meta[0], \', PROP_NAME=\', pred[3]);\n"
+"\n"
+"declare graph, st, msg varchar;\n"
+"\n"
+"graph := WS.WS.WAC_GRAPH (path);\n"
+"if (update_acl)\n"
+"{\n"
+"connection_set (\'dav_acl_sync\', 1);\n"
+"DAV_DELETE_INT (rtrim (path, \'/\') || \',acl\', 1, null, null, 0, 0);\n"
+"connection_set (\'dav_acl_sync\', null);\n"
"}\n"
-"else\n"
-"pred_table_key := pred_meta[0];\n"
-"used_table_pos := position (pred_table_key, used_tables, 1, 2);\n"
-"if (0 = used_table_pos)\n"
+"set_user_id (\'dba\');\n"
+"delete from DB.DBA.RDF_QUAD where G = iri_to_id (graph);\n"
+"}\n"
+"--src dav_api.sql:4741\n";
+
+static const char *proc165 =
+"#line 4762 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.WAC_GRAPH (\n"
+"in path varchar)\n"
"{\n"
-"declare cmp_checks any;\n"
-"declare new_alias varchar;\n"
-"used_table_pos := length (used_tables) + 1;\n"
-"new_alias := sprintf (\'_sub%d\', pred_idx);\n"
-"if (join_with_prop_name)\n"
-"cmp_checks := sprintf (\'(%s.PROP_NAME = %s)\', new_alias, WS.WS.STR_SQL_APOS (pred[3]));\n"
-"else\n"
-"cmp_checks := null;\n"
-"used_tables := vector_concat (used_tables, vector (pred_table_key, vector (pred_meta[0], new_alias, cmp_checks, vector (), vector (), vector ())));\n"
+"return rtrim (WS.WS.DAV_IRI (path), \'/\') || \'/\';\n"
"}\n"
-"table_of_pred [pred_idx] := used_table_pos;\n"
-"cmp_text := null;\n"
-"ftc_text := null;\n"
-"xc_text := null;\n"
-"if (pred_meta[3] = \'\')\n"
+"--src dav_api.sql:4760\n";
+
+static const char *proc166 =
+"#line 4769 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.DAV_IRI (\n"
+"in path varchar)\n"
"{\n"
-"if ((\'may_contain_text\' = pred[1]) or (\'may_contain_tags\' = pred[1]))\n"
+"declare S, host any;\n"
+"\n"
+"S := string_output ();\n"
+"http_dav_url (path, null, S);\n"
+"S := string_output_string (S);\n"
+"\n"
+"host := virtuoso_ini_item_value (\'URIQA\', \'DefaultHost\');\n"
+"if (host is null)\n"
"{\n"
-" ;\n"
+"host := sys_stat (\'st_host_name\');\n"
+"if (server_http_port () <> \'80\')\n"
+"host := host ||\':\'|| server_http_port ();\n"
"}\n"
-"else if (\'is_null\' = pred[1])\n"
+"return sprintf (\'http://%s%s\', host, S);\n"
+"}\n"
+"--src dav_api.sql:4767\n";
+
+static const char *trig14 =
+"#line 4790 \"[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"
-" ;\n"
+"declare N, colID, parentID integer;\n"
+"declare aAcl, aParentAcl any;\n"
+"\n"
+"\n"
+"aAcl := WS.WS.ACL_PARSE (NC.COL_ACL, \'01\', 0);\n"
+"foreach (any acl in aAcl) do\n"
+"{\n"
+"insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)\n"
+"values (either(equ(acl[1],0), \'R\', \'G\'), NC.COL_ID, \'C\', acl[0]);\n"
"}\n"
-"else\n"
-"return \'1=2\';\n"
+"\n"
+"aParentAcl := (select WS.WS.ACL_PARSE (COL_ACL, \'123\', 0) from WS.WS.SYS_DAV_COL c where c.COL_ID = NC.COL_PARENT);\n"
+"if (isnull(aParentAcl))\n"
+"return;\n"
+"\n"
+"aAcl := WS.WS.ACL_PARSE (NC.COL_ACL, \'012\', 0);\n"
+"set triggers off;\n"
+"update WS.WS.SYS_DAV_COL\n"
+"set COL_ACL = WS.WS.ACL_COMPOSE (vector_concat (aAcl, WS.WS.ACL_MAKE_INHERITED(aParentAcl)))\n"
+"where COL_ID = NC.COL_ID;\n"
+"\n"
"}\n"
-"else\n"
-"if (pred_meta[3] is not null and cmp_meta[3] is not null)\n"
+"--src dav_api.sql:4788\n";
+
+static const char *proc167 =
+"#line 4816 \"[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"
-"declare varname varchar;\n"
-"if (strchr (pred_meta[3], \'(\') is not null)\n"
-"varname := pred_meta[3];\n"
-"else\n"
+"foreach (any acl in aAcl) do\n"
"{\n"
-"varname := concat (used_tables[used_table_pos][1], \'.\', pred_meta[3]);\n"
+"if ((grantee = acl[0]) and (flag = either(equ(acl[1],0), \'R\', \'G\')))\n"
+"return 1;\n"
"}\n"
-"cmp_text := DAV_FC_PRINT_COMPARISON (pred, pred_metas, cmp_metas, varname, 0);\n"
+"return 0;\n"
"}\n"
-"else if (\'RDF_PROP\' = pred[0])\n"
+"--src dav_api.sql:4814\n";
+
+static const char *trig15 =
+"#line 4827 \"[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"
-"optext := DAV_FC_PRINT_COMPARISON (pred, pred_metas, cmp_metas, \'name(.)\', 1);\n"
-"if (optext is null)\n"
-"xc_text := \'[virt:rdf/virt:top-res[virt:prop]]\';\n"
-"else\n"
-"xc_text := \'[virt:rdf/virt:top-res/virt:prop/*[1]\' || optext || \']\';\n"
+"declare aAcl, aLog any;\n"
+"\n"
+"\n"
+"aAcl := WS.WS.ACL_PARSE (O.COL_ACL, \'01\', 0);\n"
+"delete\n"
+"from WS.WS.SYS_DAV_ACL_INVERSE\n"
+"where AI_PARENT_ID = O.COL_ID\n"
+"and AI_PARENT_TYPE = \'C\'\n"
+"and not WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (aAcl, AI_GRANTEE_ID, AI_FLAG);\n"
+"\n"
+"aAcl := WS.WS.ACL_PARSE (N.COL_ACL, \'01\', 0);\n"
+"foreach (any acl in aAcl) do\n"
+"{\n"
+"insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)\n"
+"values (either (equ (acl[1], 0), \'R\', \'G\'), N.COL_ID, \'C\', acl[0]);\n"
"}\n"
-"else if (\'RDF_VALUE\' = pred[0])\n"
+"\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"optext := DAV_FC_PRINT_COMPARISON (pred, pred_metas, cmp_metas, \'.\', 1);\n"
-"if (optext is null)\n"
-"xc_text := sprintf (\'[virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]][virt:value]]\', pred[4]);\n"
-"else\n"
-"xc_text := sprintf (\'[virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]]/virt:value%s]\', pred[4], optext);\n"
+"log_enable (aLog, 1);\n"
+"resignal;\n"
+"};\n"
+"\n"
+"set triggers off;\n"
+"\n"
+"aLog := log_enable (0, 1);\n"
+"WS.WS.ACL_UPDATE (N.COL_ID, WS.WS.ACL_PARSE (N.COL_ACL, \'123\', 0));\n"
+"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"
-"else if (\'RDF_OBJ_VALUE\' = pred[0])\n"
+"--src dav_api.sql:4825\n";
+
+static const char *trig16 =
+"#line 4861 \"[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"
-"optext := DAV_FC_PRINT_COMPARISON (pred, pred_metas, cmp_metas, \'.\', 1);\n"
-"if (optext is null)\n"
-"xc_text := sprintf (\'[virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]]/virt:res/virt:prop[*[1][self::(!%s!)]][virt:value]]\', pred[4], pred[5]);\n"
-"else\n"
-"xc_text := sprintf (\'[virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]]/virt:res/virt:prop[*[1][self::(!%s!)]]/virt:value%s]\', pred[4], pred[5], optext);\n"
+"\n"
+"delete\n"
+"from WS.WS.SYS_DAV_ACL_INVERSE\n"
+"where AI_PARENT_TYPE = \'C\'\n"
+"and AI_PARENT_ID = O.COL_ID;\n"
+"\n"
"}\n"
-"else if ((\'contains_text\' = pred[1]) or (\'may_contain_text\' = pred[1]))\n"
+"--src dav_api.sql:4859\n";
+
+static const char *trig17 =
+"#line 4874 \"[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"
-"if (not (isstring (pred[2])))\n"
-"signal (\'.....\', sprintf (\'Free text pattern in predicate of type \'\'%s\'\' is not a string in filter of DAV_DIR_FILTER\', pred[0]));\n"
-"ftc_text := \'(\' || pred[2] || \')\';\n"
+"declare aAcl any;\n"
+"declare aParentAcl varbinary;\n"
+"\n"
+"\n"
+"aAcl := WS.WS.ACL_PARSE (N.RES_ACL, \'0\', 0);\n"
+"foreach (any acl in aAcl) do\n"
+"{\n"
+"insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)\n"
+"values (either(equ(acl[1],0), \'R\', \'G\'), N.RES_ID, \'R\', acl[0]);\n"
"}\n"
-"else if ((\'contains_tags\' = pred[1]) or (\'may_contain_tags\' = pred[1]))\n"
+"\n"
+"aParentAcl := (select WS.WS.ACL_PARSE (COL_ACL, \'123\', 0) from WS.WS.SYS_DAV_COL where COL_ID = N.RES_COL);\n"
+"if (not isnull(aParentAcl))\n"
"{\n"
-"if (not (isstring (pred[2])))\n"
-"signal (\'.....\', sprintf (\'String of tags in predicate of type \'\'%s\'\' is not a string in filter of DAV_DIR_FILTER\', pred[0]));\n"
-"ftc_text := \'(\"\' || replace (WS.WS.DAV_TAG_NORMALIZE (pred[2]), \' \', \'\" and \"\') || \'\")\';\n"
-"if (\'RES_TAGS\' = pred[0])\n"
-"ftc_text := \'((\"UID^{uid}^\" or \"UID^{nobodyuid}^\") and \' || ftc_text || \')\';\n"
-"else if (\'RES_PUBLIC_TAGS\' = pred[0])\n"
-"ftc_text := \'(\"UID^{nobodyuid}^\" and \' || ftc_text || \')\';\n"
-"else if (\'RES_PRIVATE_TAGS\' = pred[0])\n"
-"ftc_text := \'(\"UID^{uid}^\" and \' || ftc_text || \')\';\n"
+"set triggers off;\n"
+"update WS.WS.SYS_DAV_RES\n"
+"set RES_ACL = WS.WS.ACL_COMPOSE (vector_concat(aAcl, WS.WS.ACL_MAKE_INHERITED(aParentAcl)))\n"
+"where RES_ID = N.RES_ID;\n"
"}\n"
-"else if (\'xcontains\' = pred[1])\n"
+"\n"
+"}\n"
+"--src dav_api.sql:4872\n";
+
+static const char *trig18 =
+"#line 4899 \"[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"
-"if (not (isstring (pred[2])))\n"
-"signal (\'.....\', sprintf (\'Free text pattern in predicate of type \'\'%s\'\' is not a string in filter of DAV_DIR_FILTER\', pred[0]));\n"
+"declare aAcl any;\n"
"\n"
"\n"
-"xc_text := \'[\' || pred[2] || \']\';\n"
-"}\n"
-"else\n"
-"signal (\'.....\', \'Internal error in DAV_DIR_FILTER: no condition text generated for a predicate\');\n"
-"if (cmp_text is not null and (0 = position (cmp_text, used_tables[used_table_pos][3])))\n"
-"used_tables[used_table_pos][3] := vector_concat (used_tables[used_table_pos][3], vector (cmp_text));\n"
-"if (ftc_text is not null and (0 = position (ftc_text, used_tables[used_table_pos][4])))\n"
-"used_tables[used_table_pos][4] := vector_concat (used_tables[used_table_pos][4], vector (ftc_text));\n"
-"if (xc_text is not null and (0 = position (xc_text, used_tables[used_table_pos][5])))\n"
-"used_tables[used_table_pos][5] := vector_concat (used_tables[used_table_pos][5], vector (xc_text));\n"
-"pred_idx := pred_idx + 1;\n"
+"aAcl := WS.WS.ACL_PARSE (O.RES_ACL, \'0\', 0);\n"
+"delete\n"
+"from WS.WS.SYS_DAV_ACL_INVERSE\n"
+"where AI_PARENT_ID = O.RES_ID\n"
+"and AI_PARENT_TYPE = \'R\'\n"
+"and not WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (aAcl, AI_GRANTEE_ID, AI_FLAG);\n"
+"\n"
+"aAcl := WS.WS.ACL_PARSE (N.RES_ACL, \'0\', 0);\n"
+"foreach (any acl in aAcl) do\n"
+"{\n"
+"insert replacing WS.WS.SYS_DAV_ACL_INVERSE (AI_FLAG, AI_PARENT_ID, AI_PARENT_TYPE, AI_GRANTEE_ID)\n"
+"values (either (equ (acl[1],0), \'R\', \'G\'), N.RES_ID, \'R\', acl[0]);\n"
"}\n"
-"if ((2 = length (used_tables)) and\n"
-"(0 = length (used_tables[1][3])) and\n"
-"(0 = length (used_tables[1][4])) and\n"
-"(0 = length (used_tables[1][5])) )\n"
-"return \'\\nwhere\\n(1=1)\\n\';\n"
"\n"
-"ses := string_output();\n"
-"table_count := length (used_tables);\n"
-"first_ft_table_idx := null;\n"
-"for (table_idx := 1; (table_idx < table_count) and first_ft_table_idx is null ; table_idx := table_idx + 2)\n"
+"}\n"
+"--src dav_api.sql:4897\n";
+
+static const char *trig19 =
+"#line 4921 \"[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"
-"declare tbl any;\n"
-"tbl := used_tables [table_idx];\n"
-"if ((length (tbl[4]) > 0) or (length (tbl[5]) > 0))\n"
-"first_ft_table_idx := table_idx;\n"
+"\n"
+"delete\n"
+"from WS.WS.SYS_DAV_ACL_INVERSE\n"
+"where AI_PARENT_TYPE = \'R\'\n"
+"and AI_PARENT_ID = O.RES_ID;\n"
+"\n"
"}\n"
-"for (table_idx := 1; table_idx < table_count; table_idx := table_idx + 2)\n"
+"--src dav_api.sql:4919\n";
+
+static const char *proc168 =
+"#line 4932 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_UPDATE (in id integer, in parentAcl any)\n"
"{\n"
-"declare tbl, new_tbl any;\n"
-"declare has_ft, has_xc integer;\n"
-"tbl := used_tables [table_idx];\n"
-"has_ft := length (tbl[4]);\n"
-"has_xc := length (tbl[5]);\n"
-"if ((has_ft and has_xc) or\n"
-"((table_idx > first_ft_table_idx) and\n"
-"(table_idx < fixed_used_tables) and\n"
-"(has_ft or has_xc) ) )\n"
+"declare nAcl any;\n"
+"\n"
+"\n"
+"WS.WS.ACL_MAKE_INHERITED (parentAcl);\n"
+"for select RES_ID as resID, RES_ACL as aAcl from WS.WS.SYS_DAV_RES where RES_COL = id do\n"
"{\n"
-"declare cmp_checks any;\n"
-"declare new_alias varchar;\n"
-"new_alias := sprintf (\'%s_%d\', tbl[1], table_idx);\n"
-"if (tbl[2] like \'(%.PROP_NAME = %)\')\n"
-"cmp_checks := sprintf (\'(%s.PROP_NAME = %s.PROP_NAME)\', new_alias, tbl[1]);\n"
-"else\n"
-"cmp_checks := null;\n"
-"new_tbl := vector (tbl[0], new_alias, cmp_checks, vector (), vector (), vector ());\n"
-"if ((table_idx > first_ft_table_idx) and\n"
-"(table_idx < fixed_used_tables) and\n"
-"(has_ft or has_xc) )\n"
+"nAcl := WS.WS.ACL_COMPOSE (vector_concat (WS.WS.ACL_PARSE (aAcl, \'0\', 0), parentAcl));\n"
+"if (not ((nAcl = aAcl) or (isnull (nAcl) and isnull (aAcl))))\n"
"{\n"
-"new_tbl[4] := tbl[4];\n"
-"new_tbl[5] := tbl[5];\n"
-"tbl[4] := null;\n"
-"tbl[5] := null;\n"
+"update WS.WS.SYS_DAV_RES\n"
+"set RES_ACL = nAcl\n"
+"where RES_ID = resID;\n"
"}\n"
-"else if (has_xc)\n"
-"{\n"
-"new_tbl[5] := tbl[5];\n"
-"tbl[5] := null;\n"
"}\n"
-"else if (has_ft)\n"
+"for select COL_ID as colID, COL_ACL as aAcl from WS.WS.SYS_DAV_COL where COL_PARENT = id do\n"
"{\n"
-"new_tbl[4] := tbl[4];\n"
-"tbl[4] := null;\n"
+"nAcl := WS.WS.ACL_COMPOSE (vector_concat (WS.WS.ACL_PARSE (aAcl, \'012\', 0), parentAcl));\n"
+"if (not ((nAcl = aAcl) or (isnull (nAcl) and isnull (aAcl))))\n"
+"{\n"
+"update WS.WS.SYS_DAV_COL\n"
+"set COL_ACL = nAcl\n"
+"where COL_ID = colID;\n"
+"WS.WS.ACL_UPDATE(colID, WS.WS.ACL_PARSE (nAcl, \'123\', 0));\n"
"}\n"
-"else\n"
-"signal (\'.....\', \'Internal error in DAV_DIR_FILTER: cannot handle a combination of free-text and xcontain predicates\');\n"
-"used_tables := vector_concat (used_tables,\n"
-"vector (used_tables [table_idx-1], new_tbl) );\n"
-"table_count := table_count + 2;\n"
"}\n"
"}\n"
-"if (first_ft_table_idx is null)\n"
-"first_ft_table_idx := table_count;\n"
-"\n"
-"for (table_idx := fixed_used_tables + 1; table_idx < table_count ; table_idx := table_idx + 2)\n"
+"--src dav_api.sql:4930\n";
+
+static const char *proc169 =
+"#line 4962 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_MAKE_INHERITED (\n"
+"inout aAcl any)\n"
"{\n"
-"declare tbl, tbl_meta any;\n"
+"declare tmp any;\n"
+"declare N integer;\n"
"\n"
-"tbl := used_tables [table_idx];\n"
-"tbl_meta := get_keyword (tbl[0], table_metas);\n"
-"if (tbl_meta is null)\n"
-"signal (\'.....\', sprintf (\'Internal error in DAV_DIR_FILTER: bad table %s\', tbl[0]));\n"
-"if ((table_idx <= first_ft_table_idx) or ((length (tbl[4]) = 0) and (length (tbl[5]) = 0)))\n"
+"for (N := 0; N < length (aAcl); N := N + 1)\n"
"{\n"
-"declare andpredicates, join_code varchar;\n"
-"if (length (tbl[2]) > 0)\n"
-"andpredicates := \' AND \' || tbl[2];\n"
-"else\n"
-"andpredicates := \'\';\n"
-"join_code := replace (replace (tbl_meta[0], \'^{alias}^\', tbl[1]), \'^{andpredicates}^\', andpredicates);\n"
-"http (join_code, ses);\n"
+"tmp := aAcl[N];\n"
+"aset (tmp, 2, 3);\n"
+"aset (aAcl, N, tmp);\n"
"}\n"
+"return aAcl;\n"
"}\n"
-"http (\'\\nwhere\\n\', ses);\n"
-"need_top_and := 0;\n"
-"for (table_idx := 1; table_idx < table_count ; table_idx := table_idx + 2)\n"
+"--src dav_api.sql:4960\n";
+
+static const char *proc170 =
+"#line 4979 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_DBG (\n"
+"in vb varbinary) returns varchar\n"
"{\n"
-"declare tbl, tbl_meta, subses any;\n"
-"declare subses_strg varchar;\n"
+"declare N integer;\n"
+"declare aResult varchar;\n"
"\n"
-"tbl := used_tables [table_idx];\n"
-"tbl_meta := get_keyword (tbl[0], table_metas);\n"
-"subses := string_output ();\n"
-"need_and := 0;\n"
-"if (length (tbl[4]) > 0)\n"
-"{\n"
-"declare ft_field, varname, ft_pattern varchar;\n"
-"declare need_ft_and integer;\n"
-"ft_field := tbl_meta[2];\n"
-"if (ft_field is null)\n"
-"signal (\'.....\', sprintf (\'Internal error in DAV_DIR_FILTER: bad table %s for free text search\', tbl[0]));\n"
-"varname := concat (tbl[1], \'.\', ft_field);\n"
-"need_ft_and := 0;\n"
-"ft_pattern := \'\';\n"
-"foreach (varchar ft_term in tbl[4]) do\n"
+"aResult := \'\';\n"
+"vb := cast(vb as varchar);\n"
+"for (N := 0; N < length (vb); N := N + 1)\n"
"{\n"
-"if (need_ft_and)\n"
-"ft_pattern := ft_pattern || \' and \';\n"
-"else\n"
-"need_ft_and := 1;\n"
-"ft_pattern := ft_pattern || ft_term;\n"
+"aResult := aResult || cast (vb[N] as varchar) || \', \';\n"
"}\n"
-"if (need_and)\n"
-"http (\' and\\n \', subses);\n"
-"else\n"
-"need_and := 1;\n"
-"http (sprintf (\'contains (%s, \', varname), subses);\n"
-"http (WS.WS.STR_SQL_APOS (ft_pattern), subses);\n"
-"http (\')\', subses);\n"
+"return aResult;\n"
"}\n"
-"if (length (tbl[5]) > 0)\n"
-"{\n"
-"declare ft_field, varname, ft_pattern varchar;\n"
-"ft_field := tbl_meta[3];\n"
-"if (ft_field is null)\n"
-"signal (\'.....\', sprintf (\'Internal error in DAV_DIR_FILTER: bad table %s for xcontains search\', tbl[0]));\n"
-"varname := concat (tbl[1], \'.\', ft_field);\n"
-"ft_pattern := tbl_meta[4];\n"
-"if (length (tbl[5]) = 1)\n"
+"--src dav_api.sql:4977\n";
+
+static const char *proc171 =
+"#line 4997 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_SERIALIZE_INT(in I integer) returns varbinary\n"
"{\n"
-"ft_pattern := ft_pattern || tbl[5][0];\n"
+"declare N integer;\n"
+"declare aResult varchar;\n"
+"\n"
+"aResult := repeat(\'\\0\', 4);\n"
+"\n"
+"N := bit_shift (I,-24);\n"
+"if (N)\n"
+"aset (aResult, 0, N);\n"
+"\n"
+"N := bit_shift (bit_shift (I, 8),-24);\n"
+"if (N)\n"
+"aset (aResult, 1, N);\n"
+"\n"
+"N := bit_shift(bit_shift (I,16),-24);\n"
+"if (N)\n"
+"aset (aResult, 2, N);\n"
+"\n"
+"N := bit_shift(bit_shift (I, 24),-24);\n"
+"if (N)\n"
+"aset (aResult, 3, N);\n"
+"\n"
+"return cast (aResult as varbinary);\n"
"}\n"
-"else\n"
-"{\n"
-"foreach (varchar ft_term in tbl[5]) do\n"
+"--src dav_api.sql:4995\n";
+
+static const char *proc172 =
+"#line 5026 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_DESERIALIZE_INT(in vb varbinary) returns integer\n"
"{\n"
-"ft_pattern := ft_pattern || ft_term;\n"
+"declare vc varchar;\n"
+"\n"
+"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:5024\n";
+
+static const char *proc173 =
+"#line 5037 \"[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"
-"if (need_and)\n"
-"http (\' and\\n \', subses);\n"
-"else\n"
-"need_and := 1;\n"
-"http (sprintf (\'xcontains (%s, \', varname), subses);\n"
-"http (WS.WS.STR_SQL_APOS (ft_pattern), subses);\n"
-"http (\')\', subses);\n"
+"--src dav_api.sql:5035\n";
+
+static const char *proc174 =
+"#line 5045 \"[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"
-"foreach (varchar cond in tbl[3]) do\n"
+"--src dav_api.sql:5043\n";
+
+static const char *proc175 =
+"#line 5056 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_CREATE() returns varbinary\n"
"{\n"
-"if (need_and)\n"
-"http (\' and\\n \', subses);\n"
-"else\n"
-"need_and := 1;\n"
-"http (cond, subses);\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"
-"subses_strg := string_output_string (subses);\n"
-"if (subses_strg <> \'\')\n"
+"--src dav_api.sql:5054\n";
+
+static const char *proc176 =
+"#line 5068 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_IS_VALID (in acl varbinary) returns integer\n"
"{\n"
-"if (need_top_and)\n"
-"http (\' and\\n \', ses);\n"
-"else\n"
-"need_top_and := 1;\n"
-"if ((table_idx <= first_ft_table_idx) or ((length (tbl[4]) = 0) and (length (tbl[5]) = 0)))\n"
-"http (subses_strg, ses);\n"
-"else\n"
+"declare iAclLength, iAceSize integer;\n"
+"\n"
+"\n"
+"if (internal_type_name(internal_type(acl)) <> \'VARBINARY\')\n"
"{\n"
-"declare exists_code varchar;\n"
-"exists_code := replace (replace (tbl_meta[1], \'^{alias}^\', tbl[1]), \'^{andpredicates}^\', \' and\\n \' || subses_strg);\n"
-"http (exists_code, ses);\n"
-"}\n"
+"\n"
+"return 0;\n"
"}\n"
+"\n"
+"iAclLength := WS.WS.ACL_GET_ACLLENGTH(acl);\n"
+"if (iAclLength <> length(acl))\n"
+"{\n"
+"\n"
+"return 0;\n"
"}\n"
-"if (not need_top_and)\n"
-"http (\'(1=1) \', ses);\n"
-"res_strg := string_output_string (ses);\n"
-"res_strg := replace (res_strg, \'^{uid}^\', cast (param_uid as varchar));\n"
-"res_strg := replace (res_strg, \'^{nobodyuid}^\', cast (http_nobody_uid() as varchar));\n"
-"return res_strg;\n"
-"}\n"
-"--src dav_api.sql:5639\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"
-"mode := lower (mode);\n"
-"if (exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_URI = schema_uri))\n"
+"\n"
+"iAceSize := WS.WS.ACL_GET_ACESIZE(acl);\n"
+"if ((iAceSize*8 + 8) <> length(acl))\n"
"{\n"
-"if (\'into\' = mode)\n"
-"signal (\'23000\', sprintf (\'Uniqueness violation: RDF schema \'\'%s\'\' is already registered\', schema_uri));\n"
-"else if (\'replacing\' = mode)\n"
-"insert replacing WS.WS.SYS_RDF_SCHEMAS (RS_URI, RS_LOCATION, RS_LOCAL_ADDONS, RS_DEPRECATED)\n"
-"values (schema_uri, location, local_addon, 0);\n"
-"else if (\'soft\' = mode)\n"
-"update WS.WS.SYS_RDF_SCHEMAS set RS_LOCAL_ADDONS = local_addon, RS_DEPRECATED = 0 where RS_URI = schema_uri and RS_LOCAL_ADDONS is null;\n"
+"\n"
+"return 0;\n"
"}\n"
-"else\n"
-"insert replacing WS.WS.SYS_RDF_SCHEMAS (RS_URI, RS_LOCATION, RS_LOCAL_ADDONS, RS_DEPRECATED)\n"
-"values (schema_uri, location, local_addon, 0);\n"
-"DAV_GET_RDF_SCHEMA_N3 (schema_uri);\n"
+"\n"
+"return 1;\n"
"}\n"
-"--src dav_api.sql:5983\n";
+"--src dav_api.sql:5066\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"
+static const char *proc177 =
+"#line 5103 \"[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"
-"if (classname is null)\n"
+"declare N, bFound integer;\n"
+"declare aAcl any;\n"
+"\n"
+"aAcl := WS.WS.ACL_PARSE (acl);\n"
+"\n"
+"bFound := 0;\n"
+"for (N := 0; N < length (aAcl); N := N + 1)\n"
"{\n"
-"return xpath_eval (\'\n"
-"let (\"excl\",\n"
-"distinct (\n"
-"for (\"dom\",\n"
-"/N3\n"
-"[@N3P=\"http://www.openlinksw.com/schemas/virtrdf#domain\"],\n"
-"string (\\044dom/@N3S) ) ),\n"
-"/N3\n"
-"[@N3P=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#type\"]\n"
-"[@N3O=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#Property\"]\n"
-"[not (@N3S = \\044excl)]\n"
-"/@N3S )\',\n"
-"schema_n3, 1 );\n"
-"}\n"
-"return xpath_eval (\'\n"
-"let (\"incl\",\n"
-"distinct (\n"
-"for (\"dom\",\n"
-"/N3\n"
-"[@N3P=\"http://www.openlinksw.com/schemas/virtrdf#domain\"]\n"
-"[@N3O=\\044classname],\n"
-"string (\\044dom/@N3S) ) ),\n"
-"/N3\n"
-"[@N3P=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#type\"]\n"
-"[@N3O=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#Property\"]\n"
-"[@N3S=\\044incl]\n"
-"/@N3S )\',\n"
-"schema_n3, 1, vector (\'classname\', classname) );\n"
-"}\n"
-"--src dav_api.sql:6006\n";
-
-static const char *proc191 =
-"#line 6044 \"[executable]/dav_api.sql\"\n"
-"create procedure\n"
-"DAV_CROP_URI_TO_CATNAME (in uri varchar)\n"
+"if ((aAcl[N][0] = uid) and (aAcl[N][2] = inheritance))\n"
"{\n"
-"declare res varchar;\n"
-"declare slash integer;\n"
-"uri := replace (uri, \'#\', \'/\');\n"
-"again:\n"
-"if (uri like \'%/\')\n"
+"if (aAcl[N][1] = is_grant)\n"
"{\n"
-"uri := subseq (uri, 0, length (uri) - 1);\n"
-"goto again;\n"
+"aset (aAcl, N, vector (aAcl[N][0], aAcl[N][1], aAcl[N][2], bitmask));\n"
+"bFound := 1;\n"
"}\n"
-"if (uri like \'http://%\')\n"
+"else\n"
"{\n"
-"uri := subseq (uri, 7);\n"
-"goto again;\n"
+"aset (aAcl, N, vector (aAcl[N][0], aAcl[N][1], aAcl[N][2], bit_and(aAcl[N][3], bit_not(bitmask))));\n"
"}\n"
-"slash := strrchr (uri, \'/\');\n"
-"if (slash is not null)\n"
-"return subseq (uri, slash + 1);\n"
-"return uri;\n"
"}\n"
-"--src dav_api.sql:6042\n";
+"}\n"
+"\n"
+"if (not bFound)\n"
+"aAcl := vector_concat(aAcl, vector(vector(uid, is_grant, inheritance, bitmask)));\n"
+"\n"
+"acl := WS.WS.ACL_COMPOSE(aAcl);\n"
+"\n"
+"return acl;\n"
+"}\n"
+"--src dav_api.sql:5101\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"
+static const char *proc178 =
+"#line 5143 \"[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"
-"for (select RS_LOCATION, RS_LOCAL_ADDONS, RS_PRECOMPILED from WS.WS.SYS_RDF_SCHEMAS where RS_URI = schema_uri) do\n"
+"declare N integer;\n"
+"declare aAcl any;\n"
+"\n"
+"aAcl := WS.WS.ACL_PARSE (acl);\n"
+"for (N := 0; N < length(aAcl); N := N + 1)\n"
"{\n"
-"declare std_schema, local_addon, mix any;\n"
-"declare schema_catname varchar;\n"
-"declare prop_list, prop_catnames, prop_catnames_hash any;\n"
-"if (RS_PRECOMPILED is not null)\n"
-"return RS_PRECOMPILED;\n"
-"if (RS_LOCATION is null)\n"
-"std_schema := NULL;\n"
-"else\n"
+"if ((aAcl[N][0] = uid) and (aAcl[N][2] = inheritance))\n"
"{\n"
-"std_schema := xtree_doc (XML_URI_GET_AND_CACHE (RS_LOCATION), 0, RS_LOCATION);\n"
-"std_schema := xslt (\'http://local.virt/rdfxml2n3xml\', std_schema);\n"
+"if (aAcl[N][1])\n"
+"{\n"
+"aset(aAcl, N, vector(aAcl[N][0], aAcl[N][1], aAcl[N][2], bit_and(aAcl[N][3], bit_not(bitmask))));\n"
"}\n"
-"if (RS_LOCAL_ADDONS is null)\n"
-"local_addon := NULL;\n"
"else\n"
"{\n"
-"local_addon := xtree_doc (XML_URI_GET (\'\', RS_LOCAL_ADDONS), 0, RS_LOCAL_ADDONS);\n"
-"local_addon := xslt (\'http://local.virt/rdfxml2n3xml\', local_addon);\n"
+"aset(aAcl, N, vector(aAcl[N][0], aAcl[N][1], aAcl[N][2], bit_and(aAcl[N][3], bitmask)));\n"
"}\n"
-"mix := DAV_RDF_MERGE (std_schema, local_addon, null, -1);\n"
-"\n"
+"}\n"
+"}\n"
+"acl := WS.WS.ACL_COMPOSE(aAcl);\n"
"\n"
-"schema_catname := xpath_eval (\'/N3[@N3S=\\044schema-uri][@N3P=\"http://www.openlinksw.com/schemas/virtrdf#catName\"]\', mix, 1, vector (UNAME\'schema-uri\', schema_uri));\n"
-"if (schema_catname is not null)\n"
-"{\n"
-"schema_catname := replace (replace (cast (schema_catname as varchar), \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
-"if (not exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_CATNAME = schema_catname and RS_URI <> schema_uri))\n"
-"goto schema_catname_complete;\n"
+"return acl;\n"
"}\n"
-"schema_catname := xpath_eval (\'/N3[@N3S=\\044schema-uri][@N3P=\"http://www.w3.org/2000/01/rdf-schema#label\"]\', mix, 1, vector (UNAME\'schema-uri\', schema_uri));\n"
-"if (schema_catname is not null)\n"
+"--src dav_api.sql:5141\n";
+
+static const char *proc179 =
+"#line 5174 \"[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"
-"schema_catname := replace (replace (cast (schema_catname as varchar), \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
-"if (not exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_CATNAME = schema_catname and RS_URI <> schema_uri))\n"
-"goto schema_catname_complete;\n"
-"}\n"
-"schema_catname := DAV_CROP_URI_TO_CATNAME (schema_uri);\n"
-"schema_catname := replace (schema_catname, \'/\', \'-\' || \'-\');\n"
-"if (not exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_CATNAME = schema_catname and RS_URI <> schema_uri))\n"
-"goto schema_catname_complete;\n"
-"schema_catname := replace (replace (schema_uri, \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
-"while (exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_CATNAME = schema_catname and RS_URI <> schema_uri))\n"
-"schema_catname := sprintf (\'%s--%d\', (replace (schema_uri, \'#\', \'/\') , \'/\', \'-\' || \'-\'), 10000 + rnd (90000));\n"
+"declare N, lenAcl integer;\n"
+"declare aAcl any;\n"
+"declare ids any;\n"
+"declare or_acc integer;\n"
"\n"
-"schema_catname_complete:\n"
+"if (isnull(acl))\n"
+"return 0;\n"
"\n"
-"vectorbld_init (prop_catnames);\n"
-"prop_catnames_hash := dict_new ();\n"
-"prop_list := DAV_RDF_SCHEMA_N3_LIST_PROPERTIES (mix, NULL);\n"
-"foreach (varchar propname in prop_list) do\n"
+"aAcl := WS.WS.ACL_PARSE (acl);\n"
+"if (length(aAcl) = 0)\n"
+"return 0;\n"
+"ids := (select vector_concat (vector (uid), VECTOR_AGG (GI_SUB)) from DB.DBA.SYS_ROLE_GRANTS where GI_SUPER = uid);\n"
+"\n"
+"or_acc := 0;\n"
+"N := 0;\n"
+"lenAcl := length(aAcl);\n"
+"for (N := 0; N < lenAcl; N := N + 1)\n"
"{\n"
-"declare catname varchar;\n"
-"declare catid integer;\n"
-"catname := xpath_eval (\'/N3[@N3S=\\044propname][@N3P=\"http://www.openlinksw.com/schemas/virtrdf#catName\"]\', mix, 1, vector (UNAME\'propname\', propname));\n"
-"propname := cast (propname as varchar);\n"
-"if (catname is not null)\n"
+"if (position (aAcl[N][0], ids))\n"
"{\n"
-"catname := replace (replace (cast (catname as varchar), \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
-"if (0 = dict_get (prop_catnames_hash, catname, 0))\n"
-"goto prop_catname_complete;\n"
-"}\n"
-"catname := DAV_CROP_URI_TO_CATNAME (propname);\n"
-"catname := replace (catname, \'/\', \'-\' || \'-\');\n"
-"if (0 = dict_get (prop_catnames_hash, catname, 0))\n"
-"goto prop_catname_complete;\n"
-"catname := replace (replace (propname, \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
-"while (dict_get (prop_catnames_hash, catname, 0))\n"
-"catname := sprintf (\'%s--%d\', replace (replace (propname, \'#\', \'/\') , \'/\', \'-\' || \'-\'), 10000 + rnd (90000));\n"
-"\n"
-"prop_catname_complete:\n"
-"catid := coalesce ((select RPN_CATID from WS.WS.SYS_RDF_PROP_NAME where RPN_URI = propname));\n"
-"if (catid is null)\n"
+"declare anded integer;\n"
+"anded := bit_and (aAcl[N][3], bitmask);\n"
+"if (anded <> 0)\n"
"{\n"
-"catid := WS.WS.GETID (\'RPN\');\n"
-"insert into WS.WS.SYS_RDF_PROP_NAME (RPN_URI, RPN_CATID) values (propname, catid);\n"
+"if (aAcl[N][1])\n"
+"{\n"
+"or_acc := bit_or (or_acc, anded);\n"
"}\n"
-"vectorbld_acc (prop_catnames, propname, catname, catid, 0, 0, 0);\n"
-"dict_put (prop_catnames_hash, catname, catid);\n"
+"else\n"
+"return 0;\n"
"}\n"
-"vectorbld_final (prop_catnames);\n"
-"update WS.WS.SYS_RDF_SCHEMAS\n"
-"set\n"
-"RS_PRECOMPILED = mix,\n"
-"RS_COMPILATION_DATE = now (),\n"
-"RS_CATNAME = schema_catname,\n"
-"RS_PROP_CATNAMES = serialize (prop_catnames)\n"
-"where RS_URI = schema_uri;\n"
-"return mix;\n"
"}\n"
-"\n"
-"return xtree_doc (\'<stub/>\');\n"
"}\n"
-"--src dav_api.sql:6068\n";
+"if (or_acc = bitmask)\n"
+"return or_acc;\n"
+"return 0;\n"
+"}\n"
+"--src dav_api.sql:5172\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"
-"update WS.WS.SYS_RDF_SCHEMAS set RS_DEPRECATED = 1 where RS_URI = schema_uri;\n"
-"if (exists (select top 1 1 from WS.WS.SYS_MIME_RDFS where MR_RDF_URI = schema_uri))\n"
+static const char *proc180 =
+"#line 5220 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_SET_OWNER(inout acl varbinary, in uid integer)\n"
"{\n"
-"update WS.WS.SYS_MIME_RDFS set MR_DEPRECATED = 1 where MR_RDF_URI = schema_uri;\n"
"return;\n"
"}\n"
-"\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:6168\n";
+"--src dav_api.sql:5218\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"
-"\n"
-"\n"
-"mode := lower (mode);\n"
-"if (exists (select top 1 1 from WS.WS.SYS_MIME_TYPES where MT_IDENT = m_ident))\n"
+static const char *proc181 =
+"#line 5231 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_OWNER(in acl varbinary) returns integer\n"
"{\n"
-"if (\'into\' = mode)\n"
-"signal (\'23000\', sprintf (\'Uniqueness violation: MIME type \'\'%s\'\' is already registered\', m_ident));\n"
-"else if (\'replacing\' = mode)\n"
-"insert replacing WS.WS.SYS_MIME_TYPES (MT_IDENT, MT_DESCRIPTION, MT_DEFAULT_EXT, MT_BADMAGIC_IDENT)\n"
-"values (m_ident, descr, dflt_ext, badmagic);\n"
-"else if (\'soft\' = mode)\n"
"return;\n"
"}\n"
-"else\n"
-"insert replacing WS.WS.SYS_MIME_TYPES (MT_IDENT, MT_DESCRIPTION, MT_DEFAULT_EXT, MT_BADMAGIC_IDENT)\n"
-"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:6182\n";
+"--src dav_api.sql:5229\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"
+static const char *proc182 =
+"#line 5242 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_PARSE (\n"
+"in acl varbinary,\n"
+"in inheritance varchar := \'0123\',\n"
+"in error integer := 1) returns any\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:6205\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"
+"declare sAcl varchar;\n"
+"declare N, I, T, aclSize integer;\n"
+"declare aAcl any;\n"
+"\n"
+"if (acl is null)\n"
+"return vector ();\n"
+"\n"
+"if (internal_type_name(internal_type(acl)) = \'BLOB_HANDLE\')\n"
+"acl := cast (blob_to_string (acl) as varbinary);\n"
+"else if (internal_type_name(internal_type(acl)) = \'VARCHAR\')\n"
+"acl := cast (acl as varbinary);\n"
+"\n"
+"if (not WS.WS.ACL_IS_VALID (acl))\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"
+"if (error)\n"
+"signal(\'ACL01\', \'Bad ACL object\');\n"
+"return vector ();\n"
"}\n"
-"--src dav_api.sql:6213\n";
-
-static const char *proc197 =
-"#line 6223 \"[executable]/dav_api.sql\"\n"
-" create function\n"
-"DAV_RDF_PROP_SET (\n"
-"in path varchar,\n"
-"in single_schema varchar,\n"
-"in rdf any,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null) returns integer\n"
+"\n"
+"aclSize := WS.WS.ACL_GET_ACESIZE (acl);\n"
+"sAcl := cast (acl as varchar);\n"
+"\n"
+"vectorbld_init (aAcl);\n"
+"for (N := 1; N <= aclSize; N := N + 1)\n"
"{\n"
-"return DAV_RDF_PROP_SET_INT (path, single_schema, rdf, auth_uname, auth_pwd);\n"
+"T := WS.WS.ACL_DESERIALIZE_INT (cast (substring (sAcl, 8*N+5, 4) as varbinary));\n"
+"I := abs (bit_and (bit_shift (T, -29), 3));\n"
+"if (not isnull (strchr (inheritance, cast (I as varchar))))\n"
+"vectorbld_acc (aAcl, vector (WS.WS.ACL_DESERIALIZE_INT (cast (substring (sAcl, 8*N+1, 4) as varbinary)),\n"
+"abs(bit_shift (T, -31)),\n"
+"I,\n"
+"abs (bit_and (T, 536870911))));\n"
"}\n"
-"--src dav_api.sql:6221\n";
-
-static const char *proc198 =
-"#line 6237 \"[executable]/dav_api.sql\"\n"
-" create procedure\n"
-"DAV_RDF_PROP_GET (\n"
-"in path varchar,\n"
-"in single_schema varchar,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null) returns any\n"
-"{\n"
-"declare st varchar;\n"
-"if ((path <> \'\') and (path[length(path)-1] = 47))\n"
-"st := \'C\';\n"
-"else\n"
-"st := \'R\';\n"
-"return DAV_RDF_PROP_GET_INT (DAV_SEARCH_ID (path, st), st, single_schema, 1, auth_uname, auth_pwd);\n"
+"vectorbld_final (aAcl);\n"
+"return aAcl;\n"
"}\n"
-"--src dav_api.sql:6235\n";
+"--src dav_api.sql:5240\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"
+static const char *proc183 =
+"#line 5290 \"[executable]/dav_api.sql\"\n"
+"create procedure WS.WS.ACL_COMPOSE (\n"
+"in aAcl vector) returns varbinary\n"
"{\n"
+"declare sAcl varchar;\n"
+"declare bAcl varbinary;\n"
+"declare N, I, J integer;\n"
"\n"
-"declare top_props, top_acc, top_head, top_tag any;\n"
-"declare firsttime_use integer;\n"
-"declare isdupe varchar;\n"
-"top_props := dict_get (n3_subj_dict, main_res, 0);\n"
-"xte_nodebld_init (top_acc);\n"
-"firsttime_use := position (main_res, firsttime_subj_list);\n"
-"if (firsttime_use > 0)\n"
-"{\n"
-"firsttime_subj_list [firsttime_use-1] := \'\';\n"
-"isdupe := null;\n"
-"}\n"
-"else\n"
-"isdupe := \'Y\';\n"
-"if (mode = 2)\n"
-"top_tag := UNAME\'virt:top-res\';\n"
-"else\n"
-"top_tag := UNAME\'virt:res\';\n"
-"if (main_res like N\'nodeID://%\')\n"
-"{\n"
-"top_head := xte_head (top_tag, UNAME\'N3S\', main_res, UNAME\'N3DUPE\', isdupe);\n"
-"}\n"
-"else\n"
-"{\n"
-"top_head := xte_head (top_tag, UNAME\'N3DUPE\', isdupe);\n"
-"xte_nodebld_acc (top_acc, xte_node (xte_head (main_res)));\n"
-"}\n"
-"if (not (isinteger (top_props)))\n"
-"{\n"
-"if (isinteger (top_props[0]))\n"
+"sAcl := \'\';\n"
+"for (I := 1; I < 4; I := I + 1)\n"
"{\n"
-"vectorbld_final (top_props);\n"
-"dict_put (n3_subj_dict, main_res, top_props);\n"
-"}\n"
-"foreach (any n3 in top_props) do\n"
+"for (J := 0; J < 2; J := J + 1)\n"
"{\n"
-"declare obj_res nvarchar;\n"
-"declare obj_subtree any;\n"
-"obj_res := xpath_eval (\'@N3O\', n3);\n"
-"if (obj_res is null)\n"
+"foreach (any acl in aAcl) do\n"
"{\n"
-"obj_subtree := xte_node (\n"
-"xte_head ( UNAME\'virt:value\',\n"
-"UNAME\'N3DT\', xpath_eval (\'@N3DT\', n3),\n"
-"UNAME\'xml:lang\', xpath_eval (\'@xml:lang\', n3)),\n"
-"xpath_eval (\'node()\', n3) );\n"
+"if ((acl[1]=J) and ((acl[2]=I) or ((acl[2]=0) and (I=1))) and acl[3])\n"
+"sAcl := concat(sAcl,\n"
+"cast(WS.WS.ACL_SERIALIZE_INT(acl[0]) as varchar),\n"
+"cast(WS.WS.ACL_SERIALIZE_INT(bit_shift(acl[1],31)+bit_shift(acl[2],29)+acl[3]) as varchar));\n"
"}\n"
-"else if (not (obj_res like N\'nodeID://%\'))\n"
-"obj_subtree := xte_node (xte_head (UNAME\'virt:res\'), xte_node (xte_head (obj_res)));\n"
-"else if (mode > 0)\n"
-"obj_subtree := DAV_RDF_PREPROCESS_RDFXML_SUB (n3_subj_dict, obj_res, 0, firsttime_subj_list);\n"
-"else\n"
-"obj_subtree := xte_node (xte_head (UNAME\'virt:res\', UNAME\'N3S\', obj_res));\n"
-"xte_nodebld_acc (top_acc,\n"
-"xte_node (\n"
-"xte_head (UNAME\'virt:prop\', UNAME\'N3ID\', xpath_eval(\'@N3ID\', n3)),\n"
-"xte_node (xte_head (xpath_eval (\'@N3P\', n3))),\n"
-"obj_subtree ) );\n"
"}\n"
"}\n"
-"xte_nodebld_final (top_acc, top_head);\n"
-"return top_acc;\n"
+"\n"
+"bAcl := cast(concat(cast(WS.WS.ACL_SERIALIZE_INT(length(sAcl)+8) as varchar),\n"
+"cast(WS.WS.ACL_SERIALIZE_INT(length(sAcl)/8) as varchar),\n"
+"sAcl) as varbinary);\n"
+"\n"
+"return bAcl;\n"
"}\n"
-"--src dav_api.sql:6252\n";
+"--src dav_api.sql:5288\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"
+static const char *proc184 =
+"#line 5324 \"[executable]/dav_api.sql\"\n"
+"create function DAV_CAST_STRING_TO_INTEGER (in val varchar) returns integer\n"
"{\n"
-"declare n3xml, n3_list, n3_subj_dict, rdf_acc, subj_list, firsttime_subj_list any;\n"
-"declare tmp varchar;\n"
-"if (already_n3)\n"
-"n3xml := rdfxml;\n"
-"else\n"
-"n3xml := xslt (\'http://local.virt/rdfxml2n3xml\', rdfxml);\n"
-"n3_subj_dict := dict_new ();\n"
-"n3_list := xpath_eval (\'/N3\', n3xml, 0);\n"
-"foreach (any n3 in n3_list) do\n"
+"if (val is null) return null;\n"
+"whenever sqlstate \'*\' goto ret_null;\n"
+"return cast (val as integer);\n"
+"ret_null:\n"
+"return null;\n"
+"}\n"
+"--src dav_api.sql:5322\n";
+
+static const char *proc185 =
+"#line 5334 \"[executable]/dav_api.sql\"\n"
+"create function DAV_CAST_STRING_TO_DATETIME (in val varchar) returns datetime\n"
"{\n"
-"declare pred_acc any;\n"
-"declare subj varchar;\n"
-"subj := xpath_eval (\'@N3S\', n3);\n"
-"pred_acc := dict_get (n3_subj_dict, subj, 0);\n"
-"if (isinteger (pred_acc))\n"
-"vectorbld_init (pred_acc);\n"
-"vectorbld_acc (pred_acc, n3);\n"
-"dict_put (n3_subj_dict, subj, pred_acc);\n"
+"if (val is null) return null;\n"
+"whenever sqlstate \'*\' goto ret_null;\n"
+"return cast (val as datetime);\n"
+"ret_null:\n"
+"return null;\n"
"}\n"
-"subj_list := dict_list_keys (n3_subj_dict, 0);\n"
-"firsttime_subj_list := subj_list;\n"
-"xte_nodebld_init (rdf_acc);\n"
-"xte_nodebld_acc (rdf_acc, DAV_RDF_PREPROCESS_RDFXML_SUB (n3_subj_dict, main_res, 2, firsttime_subj_list));\n"
-"\n"
-"foreach (nvarchar subj in subj_list) do\n"
+"--src dav_api.sql:5332\n";
+
+static const char *proc186 =
+"#line 5344 \"[executable]/dav_api.sql\"\n"
+"create function DAV_CAST_TEXT_TO_VARCHAR (in val varchar) returns varchar\n"
"{\n"
-"if ((subj <> main_res) and not (subj like N\'nodeID://%\'))\n"
+"if (val is null) return null;\n"
+"whenever sqlstate \'*\' goto ret_null;\n"
+"return cast (val as varchar);\n"
+"ret_null:\n"
+"return null;\n"
+"}\n"
+"--src dav_api.sql:5342\n";
+
+static const char *proc187 =
+"#line 5354 \"[executable]/dav_api.sql\"\n"
+"create function DAV_CAST_TEXT_TO_INTEGER (in val varchar) returns integer\n"
"{\n"
-"xte_nodebld_acc (rdf_acc, DAV_RDF_PREPROCESS_RDFXML_SUB (n3_subj_dict, subj, 1, firsttime_subj_list));\n"
+"if (val is null) return null;\n"
+"whenever sqlstate \'*\' goto ret_null;\n"
+"return cast (val as integer);\n"
+"ret_null:\n"
+"return null;\n"
"}\n"
+"--src dav_api.sql:5352\n";
+
+static const char *proc188 =
+"#line 5364 \"[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"
+"whenever sqlstate \'*\' goto ret_null;\n"
+"return cast (val as datetime);\n"
+"ret_null:\n"
+"return null;\n"
"}\n"
-"\n"
-"foreach (nvarchar subj in subj_list) do\n"
+"--src dav_api.sql:5362\n";
+
+static const char *proc189 =
+"#line 5374 \"[executable]/dav_api.sql\"\n"
+"create function DAV_FC_CONST_AS_SQL (inout val any)\n"
"{\n"
-"declare subj_props any;\n"
-"subj_props := dict_get (n3_subj_dict, subj, 0);\n"
-"if (isinteger (subj_props[0]))\n"
-"xte_nodebld_acc (rdf_acc, DAV_RDF_PREPROCESS_RDFXML_SUB (n3_subj_dict, subj, 0, firsttime_subj_list));\n"
+"if (193 = __tag (val))\n"
+"{\n"
+"declare res varchar;\n"
+"res := \'\';\n"
+"foreach (any item in val) do\n"
+"res := concat (res, \', \', DAV_FC_CONST_AS_SQL(item));\n"
+"return subseq (res, 2);\n"
"}\n"
-"xte_nodebld_final (rdf_acc, xte_head (UNAME\'virt:rdf\'));\n"
-"return rdf_acc;\n"
+"if (182 = __tag (val))\n"
+"return replace (WS.WS.STR_SQL_APOS (val), \'^{\', \'\\\\136{\');\n"
+"if (189 = __tag (val))\n"
+"return sprintf (\'%d\', val);\n"
+"if (211 = __tag (val))\n"
+"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:6321\n";
+"--src dav_api.sql:5372\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"
-"in single_schema varchar,\n"
-"in rdf any,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null,\n"
-"in extern integer := 1,\n"
-"in check_locks any := 1,\n"
-"in overwrite integer := 0,\n"
-"in auth_uid integer := null\n"
-") returns integer\n"
+static const char *proc190 =
+"#line 5400 \"[executable]/dav_api.sql\"\n"
+"create procedure DAV_FC_PRED_METAS (inout pred_metas any)\n"
"{\n"
-"declare n3xml, davtree any;\n"
-"declare top_subj nvarchar;\n"
-"if (single_schema is null)\n"
-"return -20;\n"
-"n3xml := xslt (\'http://local.virt/rdfxml2n3xml\', rdf);\n"
-"top_subj := null;\n"
-"if (xpath_eval (\'/N3[@N3S=\\044path]\', n3xml, 1, vector (UNAME\'path\', path)) is null)\n"
-"top_subj := coalesce (xpath_eval (\'/N3[1]/@N3S\', n3xml), cast (path as nvarchar));\n"
-"else\n"
-"top_subj := cast (path as nvarchar);\n"
-"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"
+"pred_metas := vector (\n"
+"\'RES_ID\', vector (\'SYS_DAV_RES\' , 0, \'integer\' , \'RES_ID\' ),\n"
+"\'RES_ID_SERIALIZED\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'serialize (RES_ID)\' ),\n"
+"\'RES_NAME\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'RES_NAME\' ),\n"
+"\'RES_FULL_PATH\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'RES_FULL_PATH\' ),\n"
+"\'RES_TYPE\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'RES_TYPE\' ),\n"
+"\'RES_OWNER_ID\', vector (\'SYS_DAV_RES\' , 0, \'integer\' , \'RES_OWNER\' ),\n"
+"\'RES_OWNER_NAME\', vector (\'SYS_DAV_USER\' , 0, \'varchar\' , \'U_NAME\' ),\n"
+"\'RES_GROUP_ID\', vector (\'SYS_DAV_RES\' , 0, \'integer\' , \'RES_GROUP\' ),\n"
+"\'RES_GROUP_NAME\', vector (\'SYS_DAV_GROUP\' , 0, \'varchar\' , \'G_NAME\' ),\n"
+"\'RES_COL_FULL_PATH\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'subseq (RES_FULL_PATH, 0, 1 + strrchr (RES_FULL_PATH, \'\'/\'\'))\' ),\n"
+"\'RES_COL_NAME\', vector (\'SYS_DAV_COL\' , 0, \'varchar\' , \'COL_NAME\' ),\n"
+"\n"
+"\'RES_CR_TIME\', vector (\'SYS_DAV_RES\' , 0, \'datetime\' , \'RES_CR_TIME\' ),\n"
+"\'RES_MOD_TIME\', vector (\'SYS_DAV_RES\' , 0, \'datetime\' , \'RES_MOD_TIME\'),\n"
+"\'RES_PERMS\', vector (\'SYS_DAV_RES\' , 0, \'varchar\' , \'RES_PERMS\' ),\n"
+"\'RES_CONTENT\', vector (\'SYS_DAV_RES\' , 0, \'text\' , \'RES_CONTENT\' ),\n"
+"\'PROP_NAME\', vector (\'SYS_DAV_PROP\' , 0, \'varchar\' , \'PROP_NAME\' ),\n"
+"\'PROP_VALUE\', vector (\'SYS_DAV_PROP\' , 1, \'text\' , \'PROP_VALUE\' ),\n"
+"\'RES_TAGS\', vector (\'all-tags\' , 0, \'varchar\' , \'DT_TAGS\' ),\n"
+"\'RES_PUBLIC_TAGS\', vector (\'public-tags\' , 0, \'text-tag\' , \'DT_TAGS\' ),\n"
+"\'RES_PRIVATE_TAGS\', vector (\'private-tags\' , 0, \'text-tag\' , \'DT_TAGS\' ),\n"
+"\'RDF_PROP\', vector (\'SYS_DAV_PROP\' , 1, \'varchar\' , NULL ),\n"
+"\'RDF_VALUE\', vector (\'SYS_DAV_PROP\' , 2, \'XML\' , NULL ),\n"
+"\'RDF_OBJ_VALUE\', vector (\'SYS_DAV_PROP\' , 3, \'XML\' , NULL )\n"
+");\n"
"}\n"
-"--src dav_api.sql:6369\n";
+"--src dav_api.sql:5398\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"
-"in what char(0),\n"
-"in single_schema varchar,\n"
-"in extern integer := 1,\n"
-"in auth_uname varchar := null,\n"
-"in auth_pwd varchar := null,\n"
-"in auth_uid integer := null ) returns any\n"
+static const char *proc191 =
+"#line 5438 \"[executable]/dav_api.sql\"\n"
+"create procedure DAV_FC_CMP_METAS (inout cmp_metas any)\n"
"{\n"
-"declare davtree any;\n"
-"davtree := DAV_PROP_GET_INT (id, what, single_schema, extern, auth_uname, auth_pwd, auth_uid);\n"
-"if (isinteger (davtree))\n"
-"return davtree;\n"
-"if (isentity (davtree))\n"
-"return davtree;\n"
-"davtree := xml_tree_doc (deserialize (davtree));\n"
-"return davtree;\n"
+"cmp_metas := vector (\n"
+"\'<\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ < ^{pattern}^)\' , \'[sql-lt (^{value}^, ^{pattern}^)]\'),\n"
+"\'>\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ > ^{pattern}^)\' , \'[sql-gt (^{value}^, ^{pattern}^)]\'),\n"
+"\'<=\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ <= ^{pattern}^)\' , \'[sql-le (^{value}^, ^{pattern}^)]\'),\n"
+"\'>=\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ >= ^{pattern}^)\' , \'[sql-ge (^{value}^, ^{pattern}^)]\'),\n"
+"\'=\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ = ^{pattern}^)\' , \'[sql-equ (^{value}^, ^{pattern}^)]\'),\n"
+"\'<>\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ <> ^{pattern}^)\' , \'[sql-neq (^{value}^, ^{pattern}^)]\'),\n"
+"\'!=\', vector (\'scalar\', \'sortable\' , NULL, \'(^{value}^ <> ^{pattern}^)\' , \'[sql-neq (^{value}^, ^{pattern}^)]\'),\n"
+"\'between\', vector (\'vector\', \'sortable\' , NULL, \'(^{value}^ between ^{pattern0}^ and ^{pattern1}^)\' , \'[sql-ge(^{value}^, ^{pattern0}^)][sql-le (^{value}^, ^{pattern0}^)]\' ),\n"
+"\'in\', vector (\'vector\', \'sortable\' , NULL, \'(^{value}^ in (^{pattern}^))\' , NULL ),\n"
+"\'member_of\', vector (\'vector\', \'sortable\' , NULL, \'(^{value}^ in (^{pattern}^))\' , NULL ),\n"
+"\'like\', vector (\'scalar\', \'varchar\' , NULL, \'(^{value}^ like ^{pattern}^)\' , \'[^{value}^ like ^{pattern}^]\'),\n"
+"\'regexp_match\', vector (\'scalar\', \'varchar\' , NULL, \'(regexp_match (^{pattern}^, ^{value}^) is not null)\' , NULL ),\n"
+"\'is_substring_of\', vector (\'scalar\', \'varchar\' , NULL, \'(strstr (^{pattern}^, ^{value}^) is not null)\' ,\'[contains (^{pattern}^, ^{value}^)]\'),\n"
+"\'contains_substring\', vector (\'scalar\', \'varchar\' , NULL, \'(strstr (^{value}^, ^{pattern}^) is not null)\' ,\'[contains (^{value}^, ^{pattern}^)]\'),\n"
+"\'not_contains_substring\', vector (\'scalar\', \'varchar\' , NULL, \'(strstr (^{value}^, ^{pattern}^) is null)\' ,\'[not (contains (^{value}^, ^{pattern}^)]\' ),\n"
+"\'starts_with\', vector (\'scalar\', \'varchar\' , NULL, \'(^{value}^ between ^{pattern}^ and (^{pattern}^ || \'\'\\\\377\\\\377\\\\377\\\\377\'\'))\' , \'[starts-with (^{value}^, ^{pattern}^)]\'),\n"
+"\'not_starts_with\', vector (\'scalar\', \'varchar\' , NULL, \'(not (^{value}^ between ^{pattern}^ and (^{pattern}^ || \'\'\\\\377\\\\377\\\\377\\\\377\'\')))\' , \'[not (starts-with (^{value}^, ^{pattern}^))]\' ),\n"
+"\'ends_with\', vector (\'scalar\', \'varchar\' , NULL, \'(case (sign (length (^{value}^) - length (^{pattern}^))) when -1 then 0 else equ (subseq (^{value}^, length (^{value}^) - length (^{pattern}^)), ^{pattern}^) end)\' , \'[ends-with (^{value}^, ^{pattern}^)]\'),\n"
+"\'not_ends_with\', vector (\'scalar\', \'varchar\' , NULL, \'(case (sign (length (^{value}^) - length (^{pattern}^))) when -1 then 1 else neq (subseq (^{value}^, length (^{value}^) - length (^{pattern}^)), ^{pattern}^) end)\' , \'[not (ends-with (^{value}^, ^{pattern}^))]\'),\n"
+"\'is_null\', vector (\'no\' , \'any\' , NULL, \'(^{value}^ is null)\' , null ),\n"
+"\'is_not_null\', vector (\'no\' , \'any\' , NULL, \'(^{value}^ is not null)\' , null ),\n"
+"\'contains_tags\', vector (\'scalar\', \'varchar\' , NULL, NULL, NULL ),\n"
+"\'may_contain_tags\', vector (\'scalar\', \'varchar\' , NULL, NULL, NULL ),\n"
+"\'contains_text\', vector (\'scalar\', \'text\' , NULL, NULL, \'[text-contains (^{value}^, ^{pattern}^)]\' ),\n"
+"\'may_contain_text\', vector (\'scalar\', \'text\' , NULL, NULL, \'[text-contains (^{value}^, ^{pattern}^)]\' ),\n"
+"\n"
+"\'xcontains\', vector (\'scalar\', \'XML\' , NULL, NULL, \'[^{pattern}^]\' )\n"
+");\n"
"}\n"
-"--src dav_api.sql:6398\n";
+"--src dav_api.sql:5436\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"
-"in sch_n3 any,\n"
-"in wipe_old_lists integer\n"
-") returns any\n"
-"{\n"
-"declare n3_tmp_list, new_dict, card_dict, merge_acc any;\n"
-"if (old_n3 is null)\n"
-"return patch_n3;\n"
-"if (patch_n3 is null)\n"
-"return old_n3;\n"
-"card_dict := dict_new ();\n"
-"if (sch_n3 is not null)\n"
-"{\n"
-"n3_tmp_list := xpath_eval (\'/N3[@N3P=\"http://local.virt/rdf#cardinality\"]\', sch_n3, 0);\n"
-"foreach (any n3 in n3_tmp_list) do\n"
-"dict_put (card_dict, xpath_eval (\'@N3S\', n3), cast (n3 as varchar));\n"
-"}\n"
-"new_dict := dict_new ();\n"
-"n3_tmp_list := xpath_eval (\'/N3\', patch_n3, 0);\n"
-"foreach (any n3 in n3_tmp_list) do\n"
+static const char *proc192 =
+"#line 5472 \"[executable]/dav_api.sql\"\n"
+"create procedure DAV_FC_TABLE_METAS (inout table_metas any)\n"
"{\n"
-"declare dkey, dacc any;\n"
-"dkey := xpath_eval (\'vector (string (@N3S), string (@N3P), string(@xml:lang))\', n3);\n"
-"dacc := dict_get (new_dict, dkey);\n"
-"if (dacc is null)\n"
-"vectorbld_init (dacc);\n"
-"vectorbld_acc (dacc, n3);\n"
-"dict_put (new_dict, dkey, dacc);\n"
+"table_metas := vector (\n"
+"\'SYS_DAV_RES\' , vector ( \'\' ,\n"
+"\'\' ,\n"
+"\'RES_CONTENT\' , \'RES_CONTENT\' , \'[__quiet] /\' ),\n"
+"\'SYS_DAV_COL\' , vector ( \'\\n inner join WS.WS.SYS_DAV_COL as ^{alias}^ on ((^{alias}^.COL_ID = _top.RES_COL)^{andpredicates}^)\' ,\n"
+"\'\\n exists (select 1 from WS.WS.SYS_DAV_COL as ^{alias}^ where (^{alias}^.COL_ID = _top.RES_COL)^{andpredicates}^)\' ,\n"
+"NULL , NULL , NULL ),\n"
+"\'SYS_DAV_USER\' , vector ( \'\\n left outer join WS.WS.SYS_DAV_USER as ^{alias}^ on ((^{alias}^.U_ID = _top.RES_OWNER)^{andpredicates}^)\' ,\n"
+"\'\\n exists (select 1 from WS.WS.SYS_DAV_USER as ^{alias}^ where (^{alias}^.U_ID = _top.RES_OWNER)^{andpredicates}^)\' ,\n"
+"NULL , NULL , NULL ),\n"
+"\'SYS_DAV_GROUP\' , vector ( \'\\n left outer join WS.WS.SYS_DAV_GROUP as ^{alias}^ on ((^{alias}^.G_ID = _top.RES_GROUP)^{andpredicates}^)\' ,\n"
+"\'\\n exists (select 1 from WS.WS.SYS_DAV_GROUP as ^{alias}^ where (^{alias}^.G_ID = _top.RES_GROUP)^{andpredicates}^)\' ,\n"
+"NULL , NULL , NULL ),\n"
+"\'SYS_DAV_PROP\' , vector ( \'\\n inner join WS.WS.SYS_DAV_PROP as ^{alias}^ on ((^{alias}^.PROP_PARENT_ID = _top.RES_ID) and (^{alias}^.PROP_TYPE = \'\'R\'\')^{andpredicates}^)\' ,\n"
+"\'\\n exists (select 1 from WS.WS.SYS_DAV_PROP as ^{alias}^ where (^{alias}^.PROP_PARENT_ID = _top.RES_ID) and (^{alias}^.PROP_TYPE = \'\'R\'\')^{andpredicates}^)\' ,\n"
+"\'PROP_VALUE\' , \'PROP_VALUE\' , \'[__quiet __davprop xmlns:virt=\"virt\"] .\' ),\n"
+"\'public-tags\' , vector ( \'\\n inner join WS.WS.SYS_DAV_TAG as ^{alias}^ on ((^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = http_nobody_uid())^{andpredicates}^)\' ,\n"
+"\'\\n exists (select 1 from WS.WS.SYS_DAV_TAG as ^{alias}^ where (^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = http_nobody_uid())^{andpredicates}^)\' ,\n"
+"\'DT_TAGS\' , \'DT_TAGS\' , NULL ),\n"
+"\'private-tags\' , vector ( \'\\n inner join WS.WS.SYS_DAV_TAG as ^{alias}^ on ((^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = ^{uid}^)^{andpredicates}^)\' ,\n"
+"\'\\n exists (select 1 from WS.WS.SYS_DAV_TAG as ^{alias}^ where (^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = ^{uid}^)^{andpredicates}^)\' ,\n"
+"\'DT_TAGS\' , \'DT_TAGS\' , NULL ),\n"
+"\'all-tags\' , vector ( \'\\n inner join WS.WS.SYS_DAV_TAG as ^{alias}^ on ((^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = http_nobody_uid() or ^{alias}^.DT_U_ID = ^{uid}^)^{andpredicates}^)\' ,\n"
+"\'\\n exists (select 1 from WS.WS.SYS_DAV_TAG as ^{alias}^ where (^{alias}^.DT_RES_ID = _top.RES_ID) and (^{alias}^.DT_U_ID = http_nobody_uid() or ^{alias}^.DT_U_ID = ^{uid}^)^{andpredicates}^)\' ,\n"
+"\'DT_TAGS\' , \'DT_TAGS\' , NULL )\n"
+");\n"
"}\n"
-"xte_nodebld_init (merge_acc);\n"
-"n3_tmp_list := xpath_eval (\'/N3\', old_n3, 0);\n"
-"foreach (any n3 in n3_tmp_list) do\n"
+"--src dav_api.sql:5470\n";
+
+static const char *proc193 =
+"#line 5504 \"[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, card nvarchar;\n"
-"declare dkey, new_set any;\n"
-"declare stale, is_single integer;\n"
-"dkey := xpath_eval (\'vector (string (@N3S), string (@N3P), string(@xml:lang))\', n3);\n"
-"pred := xpath_eval (\'string (@N3P)\', n3);\n"
-"card := dict_get (card_dict, pred);\n"
-"new_set := dict_get (new_dict, dkey);\n"
-"stale := 0;\n"
-"if (N\'single\' = card)\n"
-"is_single := 1;\n"
-"else if (N\'list\' = card)\n"
-"is_single := 0;\n"
-"else\n"
-"is_single := xpath_eval (\'not (exists (@N3O))\', n3);\n"
-"if (is_single)\n"
+"declare pred_meta any;\n"
+"declare cmp_meta, pattern_sample, cuts any;\n"
+"declare var_expn, cmp_type, pattern_type, cond_format varchar;\n"
+"declare res varchar;\n"
+"pred_meta := get_keyword (pred[0], pred_metas);\n"
+"cmp_meta := get_keyword (pred[1], cmp_metas);\n"
+"cond_format := cmp_meta [3 + nonsql];\n"
+"if (cond_format is null)\n"
+"signal (\'.....\', \'Internal error in DAV_DIR_FILTER: DAV_FC_PRINT_COMPARISON on non-comparison predicate\');\n"
+"cmp_type := cmp_meta[1];\n"
+"pattern_sample := pred[2];\n"
+"if (\'scalar\' = cmp_meta[0])\n"
"{\n"
-"if (new_set is not null)\n"
-"stale := 10;\n"
+"if (not (__tag (pattern_sample) in (182, 189, 211)))\n"
+"goto bad_pattern_datatype;\n"
"}\n"
-"else\n"
-"{\n"
-"if (wipe_old_lists > 0)\n"
-"stale := 11;\n"
-"else if (new_set is not null)\n"
-"{\n"
-"if (wipe_old_lists = 0)\n"
-"stale := 12;\n"
-"else\n"
+"else if (\'vector\' = cmp_meta[0])\n"
"{\n"
-"declare ctr integer;\n"
-"for (ctr := new_set[0]; (ctr > 0) and not stale; ctr := ctr - 1)\n"
+"if (193 <> __tag (pattern_sample))\n"
+"goto bad_pattern_datatype;\n"
+"if (0 = length (pattern_sample))\n"
+"goto empty_array_pattern;\n"
+"pattern_sample := pattern_sample[0];\n"
+"if (not (__tag (pattern_sample) in (182, 189, 211)))\n"
+"goto bad_pattern_datatype;\n"
+"foreach (any itm in pred[2]) do\n"
"{\n"
-"if (xpath_eval (\'deep-equal (., \\044old)\', new_set[ctr], 1, vector (\'old\', n3)))\n"
-"stale := 13;\n"
-"}\n"
+"if (__tag (itm) <> __tag(pred[2][0]))\n"
+"goto mixed_array_pattern;\n"
"}\n"
"}\n"
+"else if (\'no\' = cmp_meta[0])\n"
+"{\n"
+"pattern_sample := \'\';\n"
"}\n"
+"else signal (\'.....\', \'Internal error in DAV_DIR_FILTER: DAV_FC_CMP_META forms bad sort of match pattern\');\n"
+"if (isstring (pattern_sample))\n"
+"pattern_type := \'varchar\';\n"
+"else if (isinteger (pattern_sample))\n"
+"pattern_type := \'integer\';\n"
+"else if (211 = __tag (pattern_sample))\n"
+"pattern_type := \'datetime\';\n"
+"else\n"
+"goto bad_pattern_datatype;\n"
+"if (\'sortable\' = cmp_type)\n"
+"{\n"
"\n"
-"if (not stale)\n"
-"xte_nodebld_acc (merge_acc, n3);\n"
+"\n"
+"cmp_type := pattern_type;\n"
"}\n"
-"n3_tmp_list := xpath_eval (\'/N3\', patch_n3, 0);\n"
-"foreach (any n3 in n3_tmp_list) do\n"
+"else if (\'any\' = cmp_type)\n"
"{\n"
-"xte_nodebld_acc (merge_acc, n3);\n"
+"pattern_type := pred_meta[2];\n"
"}\n"
-"xte_nodebld_final (merge_acc, xte_head (UNAME\' root\'));\n"
-"return xml_tree_doc (merge_acc);\n"
+"else if (\n"
+"(1 = nonsql) and\n"
+"(\'varchar\' = pattern_type) and\n"
+"((\'text\' = cmp_type) or (\'XML\' = cmp_type)) )\n"
+"{\n"
+"pattern_type := pred_meta[2];\n"
"}\n"
-"--src dav_api.sql:6420\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"
-") returns any\n"
+"else if (pattern_type <> cmp_type)\n"
+"goto bad_pattern_datatype;\n"
+"if (pred_meta[2] = pattern_type)\n"
"{\n"
-"declare n3_tmp_list, sub_dict, res_acc any;\n"
-"sub_dict := dict_new ();\n"
-"n3_tmp_list := xpath_eval (\'/N3\', sub_n3, 0);\n"
-"foreach (any n3 in n3_tmp_list) do\n"
+"var_expn := varname;\n"
+"}\n"
+"else if (1 = nonsql)\n"
"{\n"
-"declare dkey, dacc any;\n"
-"dkey := xpath_eval (\'vector (string (@N3S), string (@N3P), string (@N3O), string(@xml:lang))\', n3);\n"
-"dacc := dict_get (sub_dict, dkey);\n"
-"if (dacc is null)\n"
-"vectorbld_init (dacc);\n"
-"vectorbld_acc (dacc, xpath_eval(\'node()[1]\', n3));\n"
-"dict_put (sub_dict, dkey, dacc);\n"
+"if ((\'text\' = cmp_meta) or (\'XML\' = cmp_meta))\n"
+"var_expn := varname;\n"
+"else if (\'varchar\' = pattern_type)\n"
+"var_expn := sprintf (\'string (%s)\', varname);\n"
+"else if (\'integer\' = pattern_type)\n"
+"var_expn := sprintf (\'number (%s)\', varname);\n"
+"else if (\'datetime\' = pattern_type)\n"
+"var_expn := sprintf (\'dateTime (%s, 1)\', varname);\n"
+"else\n"
+"goto type_mismatch;\n"
"}\n"
-"xte_nodebld_init (res_acc);\n"
-"n3_tmp_list := xpath_eval (\'/N3\', old_n3, 0);\n"
-"foreach (any n3 in n3_tmp_list) do\n"
+"else\n"
"{\n"
-"declare pred, card nvarchar;\n"
-"declare dkey, sub_set any;\n"
-"declare stale integer;\n"
-"dkey := xpath_eval (\'vector (string (@N3S), string (@N3P), string (@N3O), string(@xml:lang))\', n3);\n"
-"sub_set := dict_get (sub_dict, dkey);\n"
-"stale := 0;\n"
-"if (sub_set is not null)\n"
+"if (\'varchar\' = pred_meta[2])\n"
+"var_expn := sprintf (\'DB.DBA.DAV_CAST_STRING_TO_%s (%s)\', upper (cmp_type), varname);\n"
+"else if (\'text\' = pred_meta[2])\n"
+"var_expn := sprintf (\'DB.DBA.DAV_CAST_TEXT_TO_%s (%s)\', upper (cmp_type), varname);\n"
+"else\n"
+"goto type_mismatch;\n"
+"}\n"
+"if ((\'like\' = pred[1]) and (\'%\' = pred[2]))\n"
+"return null;\n"
+"if ((\'starts_with\' = pred[1]) and (\'\' = pred[2]))\n"
+"return null;\n"
+"if ((\'ends_with\' = pred[1]) and (\'\' = pred[2]))\n"
+"return null;\n"
+"res := \'\';\n"
+"cuts := split_and_decode (cond_format, 0, \'\\0\\0^\');\n"
+"foreach (varchar cut in cuts) do\n"
"{\n"
-"declare obj_val any;\n"
-"declare ctr integer;\n"
-"obj_val := xpath_eval(\'node()[1]\', n3);\n"
-"for (ctr := sub_set[0]; (ctr > 0) and not stale; ctr := ctr - 1)\n"
+"if (cut = \'\' or (cut[0] <> \'{\'[0]))\n"
+"res := res || cut;\n"
+"else if (cut = \'{value}\')\n"
+"res := res || var_expn;\n"
+"else if (cut = \'{pattern}\')\n"
+"res := res || DAV_FC_CONST_AS_SQL (pred[2]);\n"
+"else if (cut = \'{pattern0}\')\n"
"{\n"
-"if (xpath_eval (\'deep-equal (., \\044old)\', sub_set[ctr], 1, vector (\'old\', obj_val)))\n"
-"stale := 13;\n"
+"res := res || DAV_FC_CONST_AS_SQL (pred[2][0]);\n"
"}\n"
+"else if (cut = \'{pattern1}\')\n"
+"{\n"
+"if (length (pred[2]) < 2)\n"
+"goto tooshort_array_pattern;\n"
+"res := res || DAV_FC_CONST_AS_SQL (pred[2][1]);\n"
"}\n"
-"\n"
-"if (not stale)\n"
-"xte_nodebld_acc (res_acc, n3);\n"
+"else signal (\'.....\', \'Internal error in DAV_DIR_FILTER: DAV_FC_CMP_META forms bad formatting pattern\');\n"
"}\n"
-"xte_nodebld_final (res_acc, xte_head (UNAME\' root\'));\n"
-"return xml_tree_doc (res_acc);\n"
+"return res;\n"
+"\n"
+"bad_pattern_datatype:\n"
+"signal (\'.....\', sprintf (\'Bad data type (%d) of pattern value in predicate \'\'%s\'\' (operation \'\'%s\'\') in filter of DAV_DIR_FILTER, \', __tag (pattern_sample), pred[0], pred[1]));\n"
+"empty_array_pattern:\n"
+"signal (\'.....\', sprintf (\'The pattern is an empty vector in predicate \'\'%s\'\' (operation \'\'%s\'\') in filter of DAV_DIR_FILTER, \', pred[0], pred[1]));\n"
+"tooshort_array_pattern:\n"
+"signal (\'.....\', sprintf (\'The pattern vector is too short in predicate \'\'%s\'\' (operation \'\'%s\'\') in filter of DAV_DIR_FILTER, \', pred[0], pred[1]));\n"
+"mixed_array_pattern:\n"
+"signal (\'.....\', sprintf (\'All items of the pattern vector must have same datatype in predicate \'\'%s\'\' (operation \'\'%s\'\') in filter of DAV_DIR_FILTER, \', pred[0], pred[1]));\n"
+"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:6508\n";
+"--src dav_api.sql:5502\n";
-static const char *trig20 =
-"#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"
+static const char *proc194 =
+"#line 5639 \"[executable]/dav_api.sql\"\n"
+"create function DAV_FC_PRINT_WHERE (inout filter any, in param_uid integer) returns varchar\n"
"{\n"
-"whenever sqlstate \'*\' goto no_op;\n"
-"\n"
-"if (length (NEWR.RES_PERMS) < 11)\n"
-"goto no_op;\n"
-"if (not (NEWR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\'))))\n"
-"goto no_op;\n"
-"DAV_EXTRACT_AND_SAVE_RDF_INT (NEWR.RES_ID, NEWR.RES_NAME, NEWR.RES_TYPE, NEWR.RES_CONTENT);\n"
-"no_op:\n"
+"declare pred_metas, cmp_metas, table_metas any;\n"
+"declare used_tables any;\n"
"\n"
-" ;\n"
+"DAV_FC_PRED_METAS (pred_metas);\n"
+"DAV_FC_CMP_METAS (cmp_metas);\n"
+"DAV_FC_TABLE_METAS (table_metas);\n"
+"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:6557\n";
+"--src dav_api.sql:5637\n";
-static const char *trig21 =
-"#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"
+static const char *proc195 =
+"#line 5652 \"[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"
-"if (length (NEWR.RES_PERMS) < 11)\n"
-"goto no_op;\n"
-"if (not (NEWR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\'))))\n"
-"goto no_op;\n"
-"if ((OLDR.RES_ID <> NEWR.RES_ID) or (OLDR.RES_TYPE <> NEWR.RES_TYPE))\n"
-"goto ignore_old_res_perms;\n"
-"if ((OLDR.RES_NAME <> NEWR.RES_NAME) and (DAV_GUESS_MIME_TYPE_BY_NAME (OLDR.RES_NAME) <> DAV_GUESS_MIME_TYPE_BY_NAME (NEWR.RES_NAME)))\n"
-"goto ignore_old_res_perms;\n"
-"if ((length (OLDR.RES_PERMS) >= 11) and (OLDR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\'))))\n"
-"goto no_op;\n"
-"ignore_old_res_perms:\n"
-"whenever sqlstate \'*\' goto no_op;\n"
-"DAV_EXTRACT_AND_SAVE_RDF_INT (NEWR.RES_ID, NEWR.RES_NAME, NEWR.RES_TYPE, NEWR.RES_CONTENT);\n"
-"no_op:\n"
"\n"
-" ;\n"
-"}\n"
-"--src dav_api.sql:6572\n";
-
-static const char *trig22 =
-"#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"
-"if (length (NEWR.RES_PERMS) < 11)\n"
-"goto no_op;\n"
-"if (not (NEWR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\'))))\n"
-"goto no_op;\n"
-"if ((OLDR.RES_ID <> NEWR.RES_ID) or (OLDR.RES_TYPE <> NEWR.RES_TYPE))\n"
-"goto no_op;\n"
-"if ((OLDR.RES_NAME <> NEWR.RES_NAME) and (DAV_GUESS_MIME_TYPE_BY_NAME (OLDR.RES_NAME) <> DAV_GUESS_MIME_TYPE_BY_NAME (NEWR.RES_NAME)))\n"
-"goto no_op;\n"
-"if (not ((length (OLDR.RES_PERMS) >= 11) and (OLDR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\')))))\n"
-"goto no_op;\n"
-"whenever sqlstate \'*\' goto no_op;\n"
-"DAV_EXTRACT_AND_SAVE_RDF_INT (NEWR.RES_ID, NEWR.RES_NAME, NEWR.RES_TYPE, NEWR.RES_CONTENT);\n"
-"no_op:\n"
"\n"
-" ;\n"
-"}\n"
-"--src dav_api.sql:6594\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"
-"declare rescontent any;\n"
"\n"
-"select RES_NAME, RES_TYPE, RES_CONTENT into resname, restype, rescontent from WS.WS.SYS_DAV_RES where RES_ID = resid;\n"
-"DAV_EXTRACT_AND_SAVE_RDF_INT (resid, resname, restype, rescontent);\n"
"\n"
-"}\n"
-"--src dav_api.sql:6615\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"
-"return \'http://www.openlinksw.com/schemas/WSDL#\';\n"
-"if (mime_type = \'application/doap+rdf\')\n"
-"return \'http://www.openlinksw.com/schemas/doap#\';\n"
-"if (mime_type = \'application/foaf+xml\')\n"
-"return \'http://xmlns.com/foaf/0.1/\';\n"
"\n"
+"declare pred_count, pred_idx, need_and, need_top_and integer;\n"
+"declare table_count, table_idx, fixed_used_tables, first_ft_table_idx integer;\n"
+"declare table_of_pred, ses any;\n"
+"declare res_strg varchar;\n"
+"pred_count := length (filter);\n"
+"fixed_used_tables := length (used_tables);\n"
+"if ((0 = pred_count) and (2 = fixed_used_tables))\n"
+"return \'\\nwhere\\n(1=1)\\n\';\n"
"\n"
-"if (mime_type = \'application/google-base+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/google-base#\';\n"
-"if (mime_type = \'application/license\')\n"
-"return \'http://www.openlinksw.com/schemas/OplLic#\';\n"
-"if (mime_type = \'application/mods+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/MODS#\';\n"
-"if (mime_type = \'application/msexcel\')\n"
-"return \'http://www.openlinksw.com/schemas/Office#\';\n"
-"if (mime_type = \'application/mspowerpoint\')\n"
-"return \'http://www.openlinksw.com/schemas/Office#\';\n"
-"if (mime_type = \'application/msproject\')\n"
-"return \'http://www.openlinksw.com/schemas/Office#\';\n"
-"if (mime_type = \'application/msword\')\n"
-"return \'http://www.openlinksw.com/schemas/Office#\';\n"
-"if (mime_type = \'application/msword+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/Office#\';\n"
-"if (mime_type = \'application/opml+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/OPML#\';\n"
-"if (mime_type = \'application/pdf\')\n"
-"return \'http://www.openlinksw.com/schemas/Office#\';\n"
-"if (mime_type = \'application/rdf+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/RDF#\';\n"
-"if (mime_type = \'application/rss+xml\')\n"
-"return \'http://purl.org/rss/1.0/\';\n"
-"if (mime_type = \'application/wsdl+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/WSDL#\';\n"
-"if (mime_type = \'application/x-openlink-image\')\n"
-"return \'http://www.openlinksw.com/schemas/Image#\';\n"
-"if (mime_type = \'application/x-openlink-photo\')\n"
-"return \'http://www.openlinksw.com/schemas/Photo#\';\n"
-"if (mime_type = \'application/x-openlinksw-vad\')\n"
-"return \'http://www.openlinksw.com/schemas/VAD#\';\n"
-"if (mime_type = \'application/x-openlinksw-vsp\')\n"
-"return \'http://www.openlinksw.com/schemas/VSPX#\';\n"
-"if (mime_type = \'application/x-openlinksw-vspx+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/VSPX#\';\n"
-"if (mime_type = \'application/xbel+xml\')\n"
-"return \'http://www.python.org/topics/xml/xbel/\';\n"
-"if (mime_type = \'application/xbrl+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/xbrl#\';\n"
-"if (mime_type = \'application/xddl+xml\')\n"
-"return \'http://www.openlinksw.com/schemas/XDDL#\';\n"
-"if (mime_type = \'application/zip\')\n"
-"return \'http://www.openlinksw.com/schemas/Archive#\';\n"
-"if (mime_type = \'text/directory\')\n"
-"return \'http://www.w3.org/2001/vcard-rdf/3.0#\';\n"
-"if (mime_type = \'text/eml\')\n"
-"return \'http://www.openlinksw.com/schemas/Email#\';\n"
-"if (mime_type = \'text/html\')\n"
-"return \'http://www.openlinksw.com/schemas/XHTML#\';\n"
-"if (mime_type = \'text/wiki\')\n"
-"return \'http://www.openlinksw.com/schemas/Wiki#\';\n"
-"}\n"
-"--src dav_api.sql:6626\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"
+"table_of_pred := make_array (pred_count, \'any\');\n"
+"pred_idx := 0;\n"
+"while (pred_idx < pred_count)\n"
"{\n"
-"declare rescontent any;\n"
-"rescontent := subseq (_rescontent, 0, 10000000-1);\n"
-"if ((length (_rescontent) < 262144) or (registry_get (\'DAV_EXTRACT_RDF_ASYNC\') <> \'1\'))\n"
+"declare pred, pred_meta, cmp_meta any;\n"
+"declare pred_table_key, optext, cmp_text, ftc_text, xc_text varchar;\n"
+"declare join_with_prop_name, used_table_pos integer;\n"
+"pred := filter[pred_idx];\n"
+"pred_meta := get_keyword (pred[0], pred_metas);\n"
+"if (pred_meta is null)\n"
"{\n"
-"DAV_EXTRACT_AND_SAVE_RDF_INT2 (resid, resname, restype, rescontent);\n"
-"} \n"
-"else \n"
+"signal (\'.....\', sprintf (\'Invalid predicate type \'\'%s\'\' in filter of DAV_DIR_FILTER\', cast (pred[0] as varchar)));\n"
+"}\n"
+"if (length (pred) <> 3 + pred_meta[1])\n"
+"signal (\'.....\', sprintf (\'Predicate with type \'\'%s\'\' should be a vector of length %d in filter of DAV_DIR_FILTER\', pred[0], (3 + pred_meta[1])));\n"
+"cmp_meta := get_keyword (pred[1], cmp_metas);\n"
+"if (cmp_meta is null)\n"
+"signal (\'.....\', sprintf (\'Invalid operation name \'\'%s\'\' in filter of DAV_DIR_FILTER\', pred[1]));\n"
+"join_with_prop_name := 0;\n"
+"if ((\'PROP_VALUE\' = pred[0]) or (\'RDF_PROP\' = pred[0]) or (\'RDF_VALUE\' = pred[0]) or (\'RDF_OBJ_VALUE\' = pred[0]))\n"
"{\n"
-"declare aq any;\n"
-"aq := async_queue (1);\n"
-"if (not isstring (rescontent))\n"
-"rescontent := cast (rescontent as varchar);\n"
-"aq_request (aq, \'DB.DBA.DAV_EXTRACT_AND_SAVE_RDF_INT2\', vector (resid, resname, restype, rescontent));\n"
+"if (get_keyword (pred_meta[0], used_tables) is null)\n"
+"join_with_prop_name := 1;\n"
+"else\n"
+"{\n"
+"filter := vector_concat (filter, vector (vector (\'PROP_NAME\', \'=\', pred[3])));\n"
+"table_of_pred := vector_concat (table_of_pred, vector (null));\n"
+"pred_count := pred_count + 1;\n"
"}\n"
"}\n"
-"--src dav_api.sql:6692\n";
+"if (join_with_prop_name)\n"
+"{\n"
+"if (not isstring (pred[3]))\n"
+"signal (\'.....\', sprintf (\'The DAV property name in predicate of type \'\'%s\'\' is not a string in filter of DAV_DIR_FILTER\', pred[0]));\n"
+"pred_table_key := concat (pred_meta[0], \', PROP_NAME=\', pred[3]);\n"
+"}\n"
+"else\n"
+"pred_table_key := pred_meta[0];\n"
+"used_table_pos := position (pred_table_key, used_tables, 1, 2);\n"
+"if (0 = used_table_pos)\n"
+"{\n"
+"declare cmp_checks any;\n"
+"declare new_alias varchar;\n"
+"used_table_pos := length (used_tables) + 1;\n"
+"new_alias := sprintf (\'_sub%d\', pred_idx);\n"
+"if (join_with_prop_name)\n"
+"cmp_checks := sprintf (\'(%s.PROP_NAME = %s)\', new_alias, WS.WS.STR_SQL_APOS (pred[3]));\n"
+"else\n"
+"cmp_checks := null;\n"
+"used_tables := vector_concat (used_tables, vector (pred_table_key, vector (pred_meta[0], new_alias, cmp_checks, vector (), vector (), vector ())));\n"
+"}\n"
+"table_of_pred [pred_idx] := used_table_pos;\n"
+"cmp_text := null;\n"
+"ftc_text := null;\n"
+"xc_text := null;\n"
+"if (pred_meta[3] = \'\')\n"
+"{\n"
+"if ((\'may_contain_text\' = pred[1]) or (\'may_contain_tags\' = pred[1]))\n"
+"{\n"
+" ;\n"
+"}\n"
+"else if (\'is_null\' = pred[1])\n"
+"{\n"
+" ;\n"
+"}\n"
+"else\n"
+"return \'1=2\';\n"
+"}\n"
+"else\n"
+"if (pred_meta[3] is not null and cmp_meta[3] is not null)\n"
+"{\n"
+"declare varname varchar;\n"
+"if (strchr (pred_meta[3], \'(\') is not null)\n"
+"varname := pred_meta[3];\n"
+"else\n"
+"{\n"
+"varname := concat (used_tables[used_table_pos][1], \'.\', pred_meta[3]);\n"
+"}\n"
+"cmp_text := DAV_FC_PRINT_COMPARISON (pred, pred_metas, cmp_metas, varname, 0);\n"
+"}\n"
+"else if (\'RDF_PROP\' = pred[0])\n"
+"{\n"
+"optext := DAV_FC_PRINT_COMPARISON (pred, pred_metas, cmp_metas, \'name(.)\', 1);\n"
+"if (optext is null)\n"
+"xc_text := \'[virt:rdf/virt:top-res[virt:prop]]\';\n"
+"else\n"
+"xc_text := \'[virt:rdf/virt:top-res/virt:prop/*[1]\' || optext || \']\';\n"
+"}\n"
+"else if (\'RDF_VALUE\' = pred[0])\n"
+"{\n"
+"optext := DAV_FC_PRINT_COMPARISON (pred, pred_metas, cmp_metas, \'.\', 1);\n"
+"if (optext is null)\n"
+"xc_text := sprintf (\'[virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]][virt:value]]\', pred[4]);\n"
+"else\n"
+"xc_text := sprintf (\'[virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]]/virt:value%s]\', pred[4], optext);\n"
+"}\n"
+"else if (\'RDF_OBJ_VALUE\' = pred[0])\n"
+"{\n"
+"optext := DAV_FC_PRINT_COMPARISON (pred, pred_metas, cmp_metas, \'.\', 1);\n"
+"if (optext is null)\n"
+"xc_text := sprintf (\'[virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]]/virt:res/virt:prop[*[1][self::(!%s!)]][virt:value]]\', pred[4], pred[5]);\n"
+"else\n"
+"xc_text := sprintf (\'[virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]]/virt:res/virt:prop[*[1][self::(!%s!)]]/virt:value%s]\', pred[4], pred[5], optext);\n"
+"}\n"
+"else if ((\'contains_text\' = pred[1]) or (\'may_contain_text\' = pred[1]))\n"
+"{\n"
+"if (not (isstring (pred[2])))\n"
+"signal (\'.....\', sprintf (\'Free text pattern in predicate of type \'\'%s\'\' is not a string in filter of DAV_DIR_FILTER\', pred[0]));\n"
+"ftc_text := \'(\' || pred[2] || \')\';\n"
+"}\n"
+"else if ((\'contains_tags\' = pred[1]) or (\'may_contain_tags\' = pred[1]))\n"
+"{\n"
+"if (not (isstring (pred[2])))\n"
+"signal (\'.....\', sprintf (\'String of tags in predicate of type \'\'%s\'\' is not a string in filter of DAV_DIR_FILTER\', pred[0]));\n"
+"ftc_text := \'(\"\' || replace (WS.WS.DAV_TAG_NORMALIZE (pred[2]), \' \', \'\" and \"\') || \'\")\';\n"
+"if (\'RES_TAGS\' = pred[0])\n"
+"ftc_text := \'((\"UID^{uid}^\" or \"UID^{nobodyuid}^\") and \' || ftc_text || \')\';\n"
+"else if (\'RES_PUBLIC_TAGS\' = pred[0])\n"
+"ftc_text := \'(\"UID^{nobodyuid}^\" and \' || ftc_text || \')\';\n"
+"else if (\'RES_PRIVATE_TAGS\' = pred[0])\n"
+"ftc_text := \'(\"UID^{uid}^\" and \' || ftc_text || \')\';\n"
+"}\n"
+"else if (\'xcontains\' = pred[1])\n"
+"{\n"
+"if (not (isstring (pred[2])))\n"
+"signal (\'.....\', sprintf (\'Free text pattern in predicate of type \'\'%s\'\' is not a string in filter of DAV_DIR_FILTER\', pred[0]));\n"
+"\n"
+"\n"
+"xc_text := \'[\' || pred[2] || \']\';\n"
+"}\n"
+"else\n"
+"signal (\'.....\', \'Internal error in DAV_DIR_FILTER: no condition text generated for a predicate\');\n"
+"if (cmp_text is not null and (0 = position (cmp_text, used_tables[used_table_pos][3])))\n"
+"used_tables[used_table_pos][3] := vector_concat (used_tables[used_table_pos][3], vector (cmp_text));\n"
+"if (ftc_text is not null and (0 = position (ftc_text, used_tables[used_table_pos][4])))\n"
+"used_tables[used_table_pos][4] := vector_concat (used_tables[used_table_pos][4], vector (ftc_text));\n"
+"if (xc_text is not null and (0 = position (xc_text, used_tables[used_table_pos][5])))\n"
+"used_tables[used_table_pos][5] := vector_concat (used_tables[used_table_pos][5], vector (xc_text));\n"
+"pred_idx := pred_idx + 1;\n"
+"}\n"
+"if ((2 = length (used_tables)) and\n"
+"(0 = length (used_tables[1][3])) and\n"
+"(0 = length (used_tables[1][4])) and\n"
+"(0 = length (used_tables[1][5])) )\n"
+"return \'\\nwhere\\n(1=1)\\n\';\n"
+"\n"
+"ses := string_output();\n"
+"table_count := length (used_tables);\n"
+"first_ft_table_idx := null;\n"
+"for (table_idx := 1; (table_idx < table_count) and first_ft_table_idx is null ; table_idx := table_idx + 2)\n"
+"{\n"
+"declare tbl any;\n"
+"tbl := used_tables [table_idx];\n"
+"if ((length (tbl[4]) > 0) or (length (tbl[5]) > 0))\n"
+"first_ft_table_idx := table_idx;\n"
+"}\n"
+"for (table_idx := 1; table_idx < table_count; table_idx := table_idx + 2)\n"
+"{\n"
+"declare tbl, new_tbl any;\n"
+"declare has_ft, has_xc integer;\n"
+"tbl := used_tables [table_idx];\n"
+"has_ft := length (tbl[4]);\n"
+"has_xc := length (tbl[5]);\n"
+"if ((has_ft and has_xc) or\n"
+"((table_idx > first_ft_table_idx) and\n"
+"(table_idx < fixed_used_tables) and\n"
+"(has_ft or has_xc) ) )\n"
+"{\n"
+"declare cmp_checks any;\n"
+"declare new_alias varchar;\n"
+"new_alias := sprintf (\'%s_%d\', tbl[1], table_idx);\n"
+"if (tbl[2] like \'(%.PROP_NAME = %)\')\n"
+"cmp_checks := sprintf (\'(%s.PROP_NAME = %s.PROP_NAME)\', new_alias, tbl[1]);\n"
+"else\n"
+"cmp_checks := null;\n"
+"new_tbl := vector (tbl[0], new_alias, cmp_checks, vector (), vector (), vector ());\n"
+"if ((table_idx > first_ft_table_idx) and\n"
+"(table_idx < fixed_used_tables) and\n"
+"(has_ft or has_xc) )\n"
+"{\n"
+"new_tbl[4] := tbl[4];\n"
+"new_tbl[5] := tbl[5];\n"
+"tbl[4] := null;\n"
+"tbl[5] := null;\n"
+"}\n"
+"else if (has_xc)\n"
+"{\n"
+"new_tbl[5] := tbl[5];\n"
+"tbl[5] := null;\n"
+"}\n"
+"else if (has_ft)\n"
+"{\n"
+"new_tbl[4] := tbl[4];\n"
+"tbl[4] := null;\n"
+"}\n"
+"else\n"
+"signal (\'.....\', \'Internal error in DAV_DIR_FILTER: cannot handle a combination of free-text and xcontain predicates\');\n"
+"used_tables := vector_concat (used_tables,\n"
+"vector (used_tables [table_idx-1], new_tbl) );\n"
+"table_count := table_count + 2;\n"
+"}\n"
+"}\n"
+"if (first_ft_table_idx is null)\n"
+"first_ft_table_idx := table_count;\n"
+"\n"
+"for (table_idx := fixed_used_tables + 1; table_idx < table_count ; table_idx := table_idx + 2)\n"
+"{\n"
+"declare tbl, tbl_meta any;\n"
+"\n"
+"tbl := used_tables [table_idx];\n"
+"tbl_meta := get_keyword (tbl[0], table_metas);\n"
+"if (tbl_meta is null)\n"
+"signal (\'.....\', sprintf (\'Internal error in DAV_DIR_FILTER: bad table %s\', tbl[0]));\n"
+"if ((table_idx <= first_ft_table_idx) or ((length (tbl[4]) = 0) and (length (tbl[5]) = 0)))\n"
+"{\n"
+"declare andpredicates, join_code varchar;\n"
+"if (length (tbl[2]) > 0)\n"
+"andpredicates := \' AND \' || tbl[2];\n"
+"else\n"
+"andpredicates := \'\';\n"
+"join_code := replace (replace (tbl_meta[0], \'^{alias}^\', tbl[1]), \'^{andpredicates}^\', andpredicates);\n"
+"http (join_code, ses);\n"
+"}\n"
+"}\n"
+"http (\'\\nwhere\\n\', ses);\n"
+"need_top_and := 0;\n"
+"for (table_idx := 1; table_idx < table_count ; table_idx := table_idx + 2)\n"
+"{\n"
+"declare tbl, tbl_meta, subses any;\n"
+"declare subses_strg varchar;\n"
+"\n"
+"tbl := used_tables [table_idx];\n"
+"tbl_meta := get_keyword (tbl[0], table_metas);\n"
+"subses := string_output ();\n"
+"need_and := 0;\n"
+"if (length (tbl[4]) > 0)\n"
+"{\n"
+"declare ft_field, varname, ft_pattern varchar;\n"
+"declare need_ft_and integer;\n"
+"ft_field := tbl_meta[2];\n"
+"if (ft_field is null)\n"
+"signal (\'.....\', sprintf (\'Internal error in DAV_DIR_FILTER: bad table %s for free text search\', tbl[0]));\n"
+"varname := concat (tbl[1], \'.\', ft_field);\n"
+"need_ft_and := 0;\n"
+"ft_pattern := \'\';\n"
+"foreach (varchar ft_term in tbl[4]) do\n"
+"{\n"
+"if (need_ft_and)\n"
+"ft_pattern := ft_pattern || \' and \';\n"
+"else\n"
+"need_ft_and := 1;\n"
+"ft_pattern := ft_pattern || ft_term;\n"
+"}\n"
+"if (need_and)\n"
+"http (\' and\\n \', subses);\n"
+"else\n"
+"need_and := 1;\n"
+"http (sprintf (\'contains (%s, \', varname), subses);\n"
+"http (WS.WS.STR_SQL_APOS (ft_pattern), subses);\n"
+"http (\')\', subses);\n"
+"}\n"
+"if (length (tbl[5]) > 0)\n"
+"{\n"
+"declare ft_field, varname, ft_pattern varchar;\n"
+"ft_field := tbl_meta[3];\n"
+"if (ft_field is null)\n"
+"signal (\'.....\', sprintf (\'Internal error in DAV_DIR_FILTER: bad table %s for xcontains search\', tbl[0]));\n"
+"varname := concat (tbl[1], \'.\', ft_field);\n"
+"ft_pattern := tbl_meta[4];\n"
+"if (length (tbl[5]) = 1)\n"
+"{\n"
+"ft_pattern := ft_pattern || tbl[5][0];\n"
+"}\n"
+"else\n"
+"{\n"
+"foreach (varchar ft_term in tbl[5]) do\n"
+"{\n"
+"ft_pattern := ft_pattern || ft_term;\n"
+"}\n"
+"}\n"
+"if (need_and)\n"
+"http (\' and\\n \', subses);\n"
+"else\n"
+"need_and := 1;\n"
+"http (sprintf (\'xcontains (%s, \', varname), subses);\n"
+"http (WS.WS.STR_SQL_APOS (ft_pattern), subses);\n"
+"http (\')\', subses);\n"
+"}\n"
+"foreach (varchar cond in tbl[3]) do\n"
+"{\n"
+"if (need_and)\n"
+"http (\' and\\n \', subses);\n"
+"else\n"
+"need_and := 1;\n"
+"http (cond, subses);\n"
+"}\n"
+"subses_strg := string_output_string (subses);\n"
+"if (subses_strg <> \'\')\n"
+"{\n"
+"if (need_top_and)\n"
+"http (\' and\\n \', ses);\n"
+"else\n"
+"need_top_and := 1;\n"
+"if ((table_idx <= first_ft_table_idx) or ((length (tbl[4]) = 0) and (length (tbl[5]) = 0)))\n"
+"http (subses_strg, ses);\n"
+"else\n"
+"{\n"
+"declare exists_code varchar;\n"
+"exists_code := replace (replace (tbl_meta[1], \'^{alias}^\', tbl[1]), \'^{andpredicates}^\', \' and\\n \' || subses_strg);\n"
+"http (exists_code, ses);\n"
+"}\n"
+"}\n"
+"}\n"
+"if (not need_top_and)\n"
+"http (\'(1=1) \', ses);\n"
+"res_strg := string_output_string (ses);\n"
+"res_strg := replace (res_strg, \'^{uid}^\', cast (param_uid as varchar));\n"
+"res_strg := replace (res_strg, \'^{nobodyuid}^\', cast (http_nobody_uid() as varchar));\n"
+"return res_strg;\n"
+"}\n"
+"--src dav_api.sql:5650\n";
+
+static const char *proc196 =
+"#line 5996 \"[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"
+"mode := lower (mode);\n"
+"if (exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_URI = schema_uri))\n"
+"{\n"
+"if (\'into\' = mode)\n"
+"signal (\'23000\', sprintf (\'Uniqueness violation: RDF schema \'\'%s\'\' is already registered\', schema_uri));\n"
+"else if (\'replacing\' = mode)\n"
+"insert replacing WS.WS.SYS_RDF_SCHEMAS (RS_URI, RS_LOCATION, RS_LOCAL_ADDONS, RS_DEPRECATED)\n"
+"values (schema_uri, location, local_addon, 0);\n"
+"else if (\'soft\' = mode)\n"
+"update WS.WS.SYS_RDF_SCHEMAS set RS_LOCAL_ADDONS = local_addon, RS_DEPRECATED = 0 where RS_URI = schema_uri and RS_LOCAL_ADDONS is null;\n"
+"}\n"
+"else\n"
+"insert replacing WS.WS.SYS_RDF_SCHEMAS (RS_URI, RS_LOCATION, RS_LOCAL_ADDONS, RS_DEPRECATED)\n"
+"values (schema_uri, location, local_addon, 0);\n"
+"DAV_GET_RDF_SCHEMA_N3 (schema_uri);\n"
+"}\n"
+"--src dav_api.sql:5994\n";
+
+static const char *proc197 =
+"#line 6019 \"[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"
+"{\n"
+"return xpath_eval (\'\n"
+"let (\"excl\",\n"
+"distinct (\n"
+"for (\"dom\",\n"
+"/N3\n"
+"[@N3P=\"http://www.openlinksw.com/schemas/virtrdf#domain\"],\n"
+"string (\\044dom/@N3S) ) ),\n"
+"/N3\n"
+"[@N3P=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#type\"]\n"
+"[@N3O=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#Property\"]\n"
+"[not (@N3S = \\044excl)]\n"
+"/@N3S )\',\n"
+"schema_n3, 1 );\n"
+"}\n"
+"return xpath_eval (\'\n"
+"let (\"incl\",\n"
+"distinct (\n"
+"for (\"dom\",\n"
+"/N3\n"
+"[@N3P=\"http://www.openlinksw.com/schemas/virtrdf#domain\"]\n"
+"[@N3O=\\044classname],\n"
+"string (\\044dom/@N3S) ) ),\n"
+"/N3\n"
+"[@N3P=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#type\"]\n"
+"[@N3O=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#Property\"]\n"
+"[@N3S=\\044incl]\n"
+"/@N3S )\',\n"
+"schema_n3, 1, vector (\'classname\', classname) );\n"
+"}\n"
+"--src dav_api.sql:6017\n";
+
+static const char *proc198 =
+"#line 6055 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_CROP_URI_TO_CATNAME (in uri varchar)\n"
+"{\n"
+"declare res varchar;\n"
+"declare slash integer;\n"
+"uri := replace (uri, \'#\', \'/\');\n"
+"again:\n"
+"if (uri like \'%/\')\n"
+"{\n"
+"uri := subseq (uri, 0, length (uri) - 1);\n"
+"goto again;\n"
+"}\n"
+"if (uri like \'http://%\')\n"
+"{\n"
+"uri := subseq (uri, 7);\n"
+"goto again;\n"
+"}\n"
+"slash := strrchr (uri, \'/\');\n"
+"if (slash is not null)\n"
+"return subseq (uri, slash + 1);\n"
+"return uri;\n"
+"}\n"
+"--src dav_api.sql:6053\n";
+
+static const char *proc199 =
+"#line 6081 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_GET_RDF_SCHEMA_N3 (in schema_uri varchar)\n"
+"{\n"
+"for (select RS_LOCATION, RS_LOCAL_ADDONS, RS_PRECOMPILED from WS.WS.SYS_RDF_SCHEMAS where RS_URI = schema_uri) do\n"
+"{\n"
+"declare std_schema, local_addon, mix any;\n"
+"declare schema_catname varchar;\n"
+"declare prop_list, prop_catnames, prop_catnames_hash any;\n"
+"if (RS_PRECOMPILED is not null)\n"
+"return RS_PRECOMPILED;\n"
+"if (RS_LOCATION is null)\n"
+"std_schema := NULL;\n"
+"else\n"
+"{\n"
+"std_schema := xtree_doc (XML_URI_GET_AND_CACHE (RS_LOCATION), 0, RS_LOCATION);\n"
+"std_schema := xslt (\'http://local.virt/rdfxml2n3xml\', std_schema);\n"
+"}\n"
+"if (RS_LOCAL_ADDONS is null)\n"
+"local_addon := NULL;\n"
+"else\n"
+"{\n"
+"local_addon := xtree_doc (XML_URI_GET (\'\', RS_LOCAL_ADDONS), 0, RS_LOCAL_ADDONS);\n"
+"local_addon := xslt (\'http://local.virt/rdfxml2n3xml\', local_addon);\n"
+"}\n"
+"mix := DAV_RDF_MERGE (std_schema, local_addon, null, -1);\n"
+"\n"
+"\n"
+"schema_catname := xpath_eval (\'/N3[@N3S=\\044schema-uri][@N3P=\"http://www.openlinksw.com/schemas/virtrdf#catName\"]\', mix, 1, vector (UNAME\'schema-uri\', schema_uri));\n"
+"if (schema_catname is not null)\n"
+"{\n"
+"schema_catname := replace (replace (cast (schema_catname as varchar), \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
+"if (not exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_CATNAME = schema_catname and RS_URI <> schema_uri))\n"
+"goto schema_catname_complete;\n"
+"}\n"
+"schema_catname := xpath_eval (\'/N3[@N3S=\\044schema-uri][@N3P=\"http://www.w3.org/2000/01/rdf-schema#label\"]\', mix, 1, vector (UNAME\'schema-uri\', schema_uri));\n"
+"if (schema_catname is not null)\n"
+"{\n"
+"schema_catname := replace (replace (cast (schema_catname as varchar), \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
+"if (not exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_CATNAME = schema_catname and RS_URI <> schema_uri))\n"
+"goto schema_catname_complete;\n"
+"}\n"
+"schema_catname := DAV_CROP_URI_TO_CATNAME (schema_uri);\n"
+"schema_catname := replace (schema_catname, \'/\', \'-\' || \'-\');\n"
+"if (not exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_CATNAME = schema_catname and RS_URI <> schema_uri))\n"
+"goto schema_catname_complete;\n"
+"schema_catname := replace (replace (schema_uri, \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
+"while (exists (select top 1 1 from WS.WS.SYS_RDF_SCHEMAS where RS_CATNAME = schema_catname and RS_URI <> schema_uri))\n"
+"schema_catname := sprintf (\'%s--%d\', (replace (schema_uri, \'#\', \'/\') , \'/\', \'-\' || \'-\'), 10000 + rnd (90000));\n"
+"\n"
+"schema_catname_complete:\n"
+"\n"
+"vectorbld_init (prop_catnames);\n"
+"prop_catnames_hash := dict_new ();\n"
+"prop_list := DAV_RDF_SCHEMA_N3_LIST_PROPERTIES (mix, NULL);\n"
+"foreach (varchar propname in prop_list) do\n"
+"{\n"
+"declare catname varchar;\n"
+"declare catid integer;\n"
+"catname := xpath_eval (\'/N3[@N3S=\\044propname][@N3P=\"http://www.openlinksw.com/schemas/virtrdf#catName\"]\', mix, 1, vector (UNAME\'propname\', propname));\n"
+"propname := cast (propname as varchar);\n"
+"if (catname is not null)\n"
+"{\n"
+"catname := replace (replace (cast (catname as varchar), \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
+"if (0 = dict_get (prop_catnames_hash, catname, 0))\n"
+"goto prop_catname_complete;\n"
+"}\n"
+"catname := DAV_CROP_URI_TO_CATNAME (propname);\n"
+"catname := replace (catname, \'/\', \'-\' || \'-\');\n"
+"if (0 = dict_get (prop_catnames_hash, catname, 0))\n"
+"goto prop_catname_complete;\n"
+"catname := replace (replace (propname, \'#\', \'/\') , \'/\', \'-\' || \'-\');\n"
+"while (dict_get (prop_catnames_hash, catname, 0))\n"
+"catname := sprintf (\'%s--%d\', replace (replace (propname, \'#\', \'/\') , \'/\', \'-\' || \'-\'), 10000 + rnd (90000));\n"
+"\n"
+"prop_catname_complete:\n"
+"catid := coalesce ((select RPN_CATID from WS.WS.SYS_RDF_PROP_NAME where RPN_URI = propname));\n"
+"if (catid is null)\n"
+"{\n"
+"catid := WS.WS.GETID (\'RPN\');\n"
+"insert into WS.WS.SYS_RDF_PROP_NAME (RPN_URI, RPN_CATID) values (propname, catid);\n"
+"}\n"
+"vectorbld_acc (prop_catnames, propname, catname, catid, 0, 0, 0);\n"
+"dict_put (prop_catnames_hash, catname, catid);\n"
+"}\n"
+"vectorbld_final (prop_catnames);\n"
+"update WS.WS.SYS_RDF_SCHEMAS\n"
+"set\n"
+"RS_PRECOMPILED = mix,\n"
+"RS_COMPILATION_DATE = now (),\n"
+"RS_CATNAME = schema_catname,\n"
+"RS_PROP_CATNAMES = serialize (prop_catnames)\n"
+"where RS_URI = schema_uri;\n"
+"return mix;\n"
+"}\n"
+"\n"
+"return xtree_doc (\'<stub/>\');\n"
+"}\n"
+"--src dav_api.sql:6079\n";
+
+static const char *proc200 =
+"#line 6181 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_DEPRECATE_RDF_SCHEMA (in schema_uri varchar)\n"
+"{\n"
+"update WS.WS.SYS_RDF_SCHEMAS set RS_DEPRECATED = 1 where RS_URI = schema_uri;\n"
+"if (exists (select top 1 1 from WS.WS.SYS_MIME_RDFS where MR_RDF_URI = schema_uri))\n"
+"{\n"
+"update WS.WS.SYS_MIME_RDFS set MR_DEPRECATED = 1 where MR_RDF_URI = schema_uri;\n"
+"return;\n"
+"}\n"
+"\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:6179\n";
+
+static const char *proc201 =
+"#line 6195 \"[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"
+"\n"
+"\n"
+"mode := lower (mode);\n"
+"if (exists (select top 1 1 from WS.WS.SYS_MIME_TYPES where MT_IDENT = m_ident))\n"
+"{\n"
+"if (\'into\' = mode)\n"
+"signal (\'23000\', sprintf (\'Uniqueness violation: MIME type \'\'%s\'\' is already registered\', m_ident));\n"
+"else if (\'replacing\' = mode)\n"
+"insert replacing WS.WS.SYS_MIME_TYPES (MT_IDENT, MT_DESCRIPTION, MT_DEFAULT_EXT, MT_BADMAGIC_IDENT)\n"
+"values (m_ident, descr, dflt_ext, badmagic);\n"
+"else if (\'soft\' = mode)\n"
+"return;\n"
+"}\n"
+"else\n"
+"insert replacing WS.WS.SYS_MIME_TYPES (MT_IDENT, MT_DESCRIPTION, MT_DEFAULT_EXT, MT_BADMAGIC_IDENT)\n"
+"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:6193\n";
+
+static const char *proc202 =
+"#line 6218 \"[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:6216\n";
+
+static const char *proc203 =
+"#line 6226 \"[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:6224\n";
+
+static const char *proc204 =
+"#line 6234 \"[executable]/dav_api.sql\"\n"
+" create function\n"
+"DAV_RDF_PROP_SET (\n"
+"in path varchar,\n"
+"in single_schema varchar,\n"
+"in rdf any,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null) returns integer\n"
+"{\n"
+"return DAV_RDF_PROP_SET_INT (path, single_schema, rdf, auth_uname, auth_pwd);\n"
+"}\n"
+"--src dav_api.sql:6232\n";
+
+static const char *proc205 =
+"#line 6248 \"[executable]/dav_api.sql\"\n"
+" create procedure\n"
+"DAV_RDF_PROP_GET (\n"
+"in path varchar,\n"
+"in single_schema varchar,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null) returns any\n"
+"{\n"
+"declare st varchar;\n"
+"if ((path <> \'\') and (path[length(path)-1] = 47))\n"
+"st := \'C\';\n"
+"else\n"
+"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:6246\n";
+
+static const char *proc206 =
+"#line 6265 \"[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"
+"\n"
+"declare top_props, top_acc, top_head, top_tag any;\n"
+"declare firsttime_use integer;\n"
+"declare isdupe varchar;\n"
+"top_props := dict_get (n3_subj_dict, main_res, 0);\n"
+"xte_nodebld_init (top_acc);\n"
+"firsttime_use := position (main_res, firsttime_subj_list);\n"
+"if (firsttime_use > 0)\n"
+"{\n"
+"firsttime_subj_list [firsttime_use-1] := \'\';\n"
+"isdupe := null;\n"
+"}\n"
+"else\n"
+"isdupe := \'Y\';\n"
+"if (mode = 2)\n"
+"top_tag := UNAME\'virt:top-res\';\n"
+"else\n"
+"top_tag := UNAME\'virt:res\';\n"
+"if (main_res like N\'nodeID://%\')\n"
+"{\n"
+"top_head := xte_head (top_tag, UNAME\'N3S\', main_res, UNAME\'N3DUPE\', isdupe);\n"
+"}\n"
+"else\n"
+"{\n"
+"top_head := xte_head (top_tag, UNAME\'N3DUPE\', isdupe);\n"
+"xte_nodebld_acc (top_acc, xte_node (xte_head (main_res)));\n"
+"}\n"
+"if (not (isinteger (top_props)))\n"
+"{\n"
+"if (isinteger (top_props[0]))\n"
+"{\n"
+"vectorbld_final (top_props);\n"
+"dict_put (n3_subj_dict, main_res, top_props);\n"
+"}\n"
+"foreach (any n3 in top_props) do\n"
+"{\n"
+"declare obj_res nvarchar;\n"
+"declare obj_subtree any;\n"
+"obj_res := xpath_eval (\'@N3O\', n3);\n"
+"if (obj_res is null)\n"
+"{\n"
+"obj_subtree := xte_node (\n"
+"xte_head ( UNAME\'virt:value\',\n"
+"UNAME\'N3DT\', xpath_eval (\'@N3DT\', n3),\n"
+"UNAME\'xml:lang\', xpath_eval (\'@xml:lang\', n3)),\n"
+"xpath_eval (\'node()\', n3) );\n"
+"}\n"
+"else if (not (obj_res like N\'nodeID://%\'))\n"
+"obj_subtree := xte_node (xte_head (UNAME\'virt:res\'), xte_node (xte_head (obj_res)));\n"
+"else if (mode > 0)\n"
+"obj_subtree := DAV_RDF_PREPROCESS_RDFXML_SUB (n3_subj_dict, obj_res, 0, firsttime_subj_list);\n"
+"else\n"
+"obj_subtree := xte_node (xte_head (UNAME\'virt:res\', UNAME\'N3S\', obj_res));\n"
+"xte_nodebld_acc (top_acc,\n"
+"xte_node (\n"
+"xte_head (UNAME\'virt:prop\', UNAME\'N3ID\', xpath_eval(\'@N3ID\', n3)),\n"
+"xte_node (xte_head (xpath_eval (\'@N3P\', n3))),\n"
+"obj_subtree ) );\n"
+"}\n"
+"}\n"
+"xte_nodebld_final (top_acc, top_head);\n"
+"return top_acc;\n"
+"}\n"
+"--src dav_api.sql:6263\n";
+
+static const char *proc207 =
+"#line 6334 \"[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"
+"declare n3xml, n3_list, n3_subj_dict, rdf_acc, subj_list, firsttime_subj_list any;\n"
+"declare tmp varchar;\n"
+"if (already_n3)\n"
+"n3xml := rdfxml;\n"
+"else\n"
+"n3xml := xslt (\'http://local.virt/rdfxml2n3xml\', rdfxml);\n"
+"n3_subj_dict := dict_new ();\n"
+"n3_list := xpath_eval (\'/N3\', n3xml, 0);\n"
+"foreach (any n3 in n3_list) do\n"
+"{\n"
+"declare pred_acc any;\n"
+"declare subj varchar;\n"
+"subj := xpath_eval (\'@N3S\', n3);\n"
+"pred_acc := dict_get (n3_subj_dict, subj, 0);\n"
+"if (isinteger (pred_acc))\n"
+"vectorbld_init (pred_acc);\n"
+"vectorbld_acc (pred_acc, n3);\n"
+"dict_put (n3_subj_dict, subj, pred_acc);\n"
+"}\n"
+"subj_list := dict_list_keys (n3_subj_dict, 0);\n"
+"firsttime_subj_list := subj_list;\n"
+"xte_nodebld_init (rdf_acc);\n"
+"xte_nodebld_acc (rdf_acc, DAV_RDF_PREPROCESS_RDFXML_SUB (n3_subj_dict, main_res, 2, firsttime_subj_list));\n"
+"\n"
+"foreach (nvarchar subj in subj_list) do\n"
+"{\n"
+"if ((subj <> main_res) and not (subj like N\'nodeID://%\'))\n"
+"{\n"
+"xte_nodebld_acc (rdf_acc, DAV_RDF_PREPROCESS_RDFXML_SUB (n3_subj_dict, subj, 1, firsttime_subj_list));\n"
+"}\n"
+"}\n"
+"\n"
+"foreach (nvarchar subj in subj_list) do\n"
+"{\n"
+"declare subj_props any;\n"
+"subj_props := dict_get (n3_subj_dict, subj, 0);\n"
+"if (isinteger (subj_props[0]))\n"
+"xte_nodebld_acc (rdf_acc, DAV_RDF_PREPROCESS_RDFXML_SUB (n3_subj_dict, subj, 0, firsttime_subj_list));\n"
+"}\n"
+"xte_nodebld_final (rdf_acc, xte_head (UNAME\'virt:rdf\'));\n"
+"return rdf_acc;\n"
+"}\n"
+"--src dav_api.sql:6332\n";
+
+static const char *proc208 =
+"#line 6382 \"[executable]/dav_api.sql\"\n"
+"create function\n"
+"DAV_RDF_PROP_SET_INT (\n"
+"in path varchar,\n"
+"in single_schema varchar,\n"
+"in rdf any,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null,\n"
+"in extern integer := 1,\n"
+"in check_locks any := 1,\n"
+"in overwrite integer := 0,\n"
+"in auth_uid integer := null\n"
+") returns integer\n"
+"{\n"
+"declare n3xml, davtree any;\n"
+"declare top_subj nvarchar;\n"
+"if (single_schema is null)\n"
+"return -20;\n"
+"n3xml := xslt (\'http://local.virt/rdfxml2n3xml\', rdf);\n"
+"top_subj := null;\n"
+"if (xpath_eval (\'/N3[@N3S=\\044path]\', n3xml, 1, vector (UNAME\'path\', path)) is null)\n"
+"top_subj := coalesce (xpath_eval (\'/N3[1]/@N3S\', n3xml), cast (path as nvarchar));\n"
+"else\n"
+"top_subj := cast (path as nvarchar);\n"
+"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:6380\n";
+
+static const char *proc209 =
+"#line 6411 \"[executable]/dav_api.sql\"\n"
+"create procedure\n"
+"DAV_RDF_PROP_GET_INT (\n"
+"in id any,\n"
+"in what char(0),\n"
+"in single_schema varchar,\n"
+"in extern integer := 1,\n"
+"in auth_uname varchar := null,\n"
+"in auth_pwd varchar := null,\n"
+"in auth_uid integer := null ) returns any\n"
+"{\n"
+"declare davtree any;\n"
+"davtree := DAV_PROP_GET_INT (id, what, single_schema, extern, auth_uname, auth_pwd, auth_uid);\n"
+"if (isinteger (davtree))\n"
+"return davtree;\n"
+"if (isentity (davtree))\n"
+"return davtree;\n"
+"davtree := xml_tree_doc (deserialize (davtree));\n"
+"return davtree;\n"
+"}\n"
+"--src dav_api.sql:6409\n";
+
+static const char *proc210 =
+"#line 6433 \"[executable]/dav_api.sql\"\n"
+"create function DAV_RDF_MERGE (\n"
+"in old_n3 any,\n"
+"in patch_n3 any,\n"
+"in sch_n3 any,\n"
+"in wipe_old_lists integer\n"
+") returns any\n"
+"{\n"
+"declare n3_tmp_list, new_dict, card_dict, merge_acc any;\n"
+"if (old_n3 is null)\n"
+"return patch_n3;\n"
+"if (patch_n3 is null)\n"
+"return old_n3;\n"
+"card_dict := dict_new ();\n"
+"if (sch_n3 is not null)\n"
+"{\n"
+"n3_tmp_list := xpath_eval (\'/N3[@N3P=\"http://local.virt/rdf#cardinality\"]\', sch_n3, 0);\n"
+"foreach (any n3 in n3_tmp_list) do\n"
+"dict_put (card_dict, xpath_eval (\'@N3S\', n3), cast (n3 as varchar));\n"
+"}\n"
+"new_dict := dict_new ();\n"
+"n3_tmp_list := xpath_eval (\'/N3\', patch_n3, 0);\n"
+"foreach (any n3 in n3_tmp_list) do\n"
+"{\n"
+"declare dkey, dacc any;\n"
+"dkey := xpath_eval (\'vector (string (@N3S), string (@N3P), string(@xml:lang))\', n3);\n"
+"dacc := dict_get (new_dict, dkey);\n"
+"if (dacc is null)\n"
+"vectorbld_init (dacc);\n"
+"vectorbld_acc (dacc, n3);\n"
+"dict_put (new_dict, dkey, dacc);\n"
+"}\n"
+"xte_nodebld_init (merge_acc);\n"
+"n3_tmp_list := xpath_eval (\'/N3\', old_n3, 0);\n"
+"foreach (any n3 in n3_tmp_list) do\n"
+"{\n"
+"declare pred, card nvarchar;\n"
+"declare dkey, new_set any;\n"
+"declare stale, is_single integer;\n"
+"dkey := xpath_eval (\'vector (string (@N3S), string (@N3P), string(@xml:lang))\', n3);\n"
+"pred := xpath_eval (\'string (@N3P)\', n3);\n"
+"card := dict_get (card_dict, pred);\n"
+"new_set := dict_get (new_dict, dkey);\n"
+"stale := 0;\n"
+"if (N\'single\' = card)\n"
+"is_single := 1;\n"
+"else if (N\'list\' = card)\n"
+"is_single := 0;\n"
+"else\n"
+"is_single := xpath_eval (\'not (exists (@N3O))\', n3);\n"
+"if (is_single)\n"
+"{\n"
+"if (new_set is not null)\n"
+"stale := 10;\n"
+"}\n"
+"else\n"
+"{\n"
+"if (wipe_old_lists > 0)\n"
+"stale := 11;\n"
+"else if (new_set is not null)\n"
+"{\n"
+"if (wipe_old_lists = 0)\n"
+"stale := 12;\n"
+"else\n"
+"{\n"
+"declare ctr integer;\n"
+"for (ctr := new_set[0]; (ctr > 0) and not stale; ctr := ctr - 1)\n"
+"{\n"
+"if (xpath_eval (\'deep-equal (., \\044old)\', new_set[ctr], 1, vector (\'old\', n3)))\n"
+"stale := 13;\n"
+"}\n"
+"}\n"
+"}\n"
+"}\n"
+"\n"
+"if (not stale)\n"
+"xte_nodebld_acc (merge_acc, n3);\n"
+"}\n"
+"n3_tmp_list := xpath_eval (\'/N3\', patch_n3, 0);\n"
+"foreach (any n3 in n3_tmp_list) do\n"
+"{\n"
+"xte_nodebld_acc (merge_acc, n3);\n"
+"}\n"
+"xte_nodebld_final (merge_acc, xte_head (UNAME\' root\'));\n"
+"return xml_tree_doc (merge_acc);\n"
+"}\n"
+"--src dav_api.sql:6431\n";
+
+static const char *proc211 =
+"#line 6521 \"[executable]/dav_api.sql\"\n"
+"create function DAV_RDF_SUBTRACT (\n"
+"in old_n3 any,\n"
+"in sub_n3 any\n"
+") returns any\n"
+"{\n"
+"declare n3_tmp_list, sub_dict, res_acc any;\n"
+"sub_dict := dict_new ();\n"
+"n3_tmp_list := xpath_eval (\'/N3\', sub_n3, 0);\n"
+"foreach (any n3 in n3_tmp_list) do\n"
+"{\n"
+"declare dkey, dacc any;\n"
+"dkey := xpath_eval (\'vector (string (@N3S), string (@N3P), string (@N3O), string(@xml:lang))\', n3);\n"
+"dacc := dict_get (sub_dict, dkey);\n"
+"if (dacc is null)\n"
+"vectorbld_init (dacc);\n"
+"vectorbld_acc (dacc, xpath_eval(\'node()[1]\', n3));\n"
+"dict_put (sub_dict, dkey, dacc);\n"
+"}\n"
+"xte_nodebld_init (res_acc);\n"
+"n3_tmp_list := xpath_eval (\'/N3\', old_n3, 0);\n"
+"foreach (any n3 in n3_tmp_list) do\n"
+"{\n"
+"declare pred, card nvarchar;\n"
+"declare dkey, sub_set any;\n"
+"declare stale integer;\n"
+"dkey := xpath_eval (\'vector (string (@N3S), string (@N3P), string (@N3O), string(@xml:lang))\', n3);\n"
+"sub_set := dict_get (sub_dict, dkey);\n"
+"stale := 0;\n"
+"if (sub_set is not null)\n"
+"{\n"
+"declare obj_val any;\n"
+"declare ctr integer;\n"
+"obj_val := xpath_eval(\'node()[1]\', n3);\n"
+"for (ctr := sub_set[0]; (ctr > 0) and not stale; ctr := ctr - 1)\n"
+"{\n"
+"if (xpath_eval (\'deep-equal (., \\044old)\', sub_set[ctr], 1, vector (\'old\', obj_val)))\n"
+"stale := 13;\n"
+"}\n"
+"}\n"
+"\n"
+"if (not stale)\n"
+"xte_nodebld_acc (res_acc, n3);\n"
+"}\n"
+"xte_nodebld_final (res_acc, xte_head (UNAME\' root\'));\n"
+"return xml_tree_doc (res_acc);\n"
+"}\n"
+"--src dav_api.sql:6519\n";
-static const char *proc208 =
-"#line 6714 \"[executable]/dav_api.sql\"\n"
+static const char *trig20 =
+"#line 6570 \"[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"
+"\n"
+"if (length (NEWR.RES_PERMS) < 11)\n"
+"goto no_op;\n"
+"if (not (NEWR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\'))))\n"
+"goto no_op;\n"
+"DAV_EXTRACT_AND_SAVE_RDF_INT (NEWR.RES_ID, NEWR.RES_NAME, NEWR.RES_TYPE, NEWR.RES_CONTENT);\n"
+"no_op:\n"
+"\n"
+" ;\n"
+"}\n"
+"--src dav_api.sql:6568\n";
+
+static const char *trig21 =
+"#line 6585 \"[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"
+"if (length (NEWR.RES_PERMS) < 11)\n"
+"goto no_op;\n"
+"if (not (NEWR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\'))))\n"
+"goto no_op;\n"
+"if ((OLDR.RES_ID <> NEWR.RES_ID) or (OLDR.RES_TYPE <> NEWR.RES_TYPE))\n"
+"goto ignore_old_res_perms;\n"
+"if ((OLDR.RES_NAME <> NEWR.RES_NAME) and (DAV_GUESS_MIME_TYPE_BY_NAME (OLDR.RES_NAME) <> DAV_GUESS_MIME_TYPE_BY_NAME (NEWR.RES_NAME)))\n"
+"goto ignore_old_res_perms;\n"
+"if ((length (OLDR.RES_PERMS) >= 11) and (OLDR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\'))))\n"
+"goto no_op;\n"
+"ignore_old_res_perms:\n"
+"whenever sqlstate \'*\' goto no_op;\n"
+"DAV_EXTRACT_AND_SAVE_RDF_INT (NEWR.RES_ID, NEWR.RES_NAME, NEWR.RES_TYPE, NEWR.RES_CONTENT);\n"
+"no_op:\n"
+"\n"
+" ;\n"
+"}\n"
+"--src dav_api.sql:6583\n";
+
+static const char *trig22 =
+"#line 6607 \"[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"
+"if (length (NEWR.RES_PERMS) < 11)\n"
+"goto no_op;\n"
+"if (not (NEWR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\'))))\n"
+"goto no_op;\n"
+"if ((OLDR.RES_ID <> NEWR.RES_ID) or (OLDR.RES_TYPE <> NEWR.RES_TYPE))\n"
+"goto no_op;\n"
+"if ((OLDR.RES_NAME <> NEWR.RES_NAME) and (DAV_GUESS_MIME_TYPE_BY_NAME (OLDR.RES_NAME) <> DAV_GUESS_MIME_TYPE_BY_NAME (NEWR.RES_NAME)))\n"
+"goto no_op;\n"
+"if (not ((length (OLDR.RES_PERMS) >= 11) and (OLDR.RES_PERMS[10] in (ascii (\'R\'), ascii (\'M\')))))\n"
+"goto no_op;\n"
+"whenever sqlstate \'*\' goto no_op;\n"
+"DAV_EXTRACT_AND_SAVE_RDF_INT (NEWR.RES_ID, NEWR.RES_NAME, NEWR.RES_TYPE, NEWR.RES_CONTENT);\n"
+"no_op:\n"
+"\n"
+" ;\n"
+"}\n"
+"--src dav_api.sql:6605\n";
+
+static const char *proc212 =
+"#line 6628 \"[executable]/dav_api.sql\"\n"
+"create procedure DAV_EXTRACT_AND_SAVE_RDF (in resid integer)\n"
+"{\n"
+"declare resname, restype varchar;\n"
+"declare rescontent any;\n"
+"\n"
+"select RES_NAME, RES_TYPE, RES_CONTENT into resname, restype, rescontent from WS.WS.SYS_DAV_RES where RES_ID = resid;\n"
+"DAV_EXTRACT_AND_SAVE_RDF_INT (resid, resname, restype, rescontent);\n"
+"\n"
+"}\n"
+"--src dav_api.sql:6626\n";
+
+static const char *proc213 =
+"#line 6639 \"[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"
+"return \'http://www.openlinksw.com/schemas/WSDL#\';\n"
+"if (mime_type = \'application/doap+rdf\')\n"
+"return \'http://www.openlinksw.com/schemas/doap#\';\n"
+"if (mime_type = \'application/foaf+xml\')\n"
+"return \'http://xmlns.com/foaf/0.1/\';\n"
+"\n"
+"\n"
+"if (mime_type = \'application/google-base+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/google-base#\';\n"
+"if (mime_type = \'application/license\')\n"
+"return \'http://www.openlinksw.com/schemas/OplLic#\';\n"
+"if (mime_type = \'application/mods+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/MODS#\';\n"
+"if (mime_type = \'application/msexcel\')\n"
+"return \'http://www.openlinksw.com/schemas/Office#\';\n"
+"if (mime_type = \'application/mspowerpoint\')\n"
+"return \'http://www.openlinksw.com/schemas/Office#\';\n"
+"if (mime_type = \'application/msproject\')\n"
+"return \'http://www.openlinksw.com/schemas/Office#\';\n"
+"if (mime_type = \'application/msword\')\n"
+"return \'http://www.openlinksw.com/schemas/Office#\';\n"
+"if (mime_type = \'application/msword+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/Office#\';\n"
+"if (mime_type = \'application/opml+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/OPML#\';\n"
+"if (mime_type = \'application/pdf\')\n"
+"return \'http://www.openlinksw.com/schemas/Office#\';\n"
+"if (mime_type = \'application/rdf+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/RDF#\';\n"
+"if (mime_type = \'application/rss+xml\')\n"
+"return \'http://purl.org/rss/1.0/\';\n"
+"if (mime_type = \'application/wsdl+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/WSDL#\';\n"
+"if (mime_type = \'application/x-openlink-image\')\n"
+"return \'http://www.openlinksw.com/schemas/Image#\';\n"
+"if (mime_type = \'application/x-openlink-photo\')\n"
+"return \'http://www.openlinksw.com/schemas/Photo#\';\n"
+"if (mime_type = \'application/x-openlinksw-vad\')\n"
+"return \'http://www.openlinksw.com/schemas/VAD#\';\n"
+"if (mime_type = \'application/x-openlinksw-vsp\')\n"
+"return \'http://www.openlinksw.com/schemas/VSPX#\';\n"
+"if (mime_type = \'application/x-openlinksw-vspx+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/VSPX#\';\n"
+"if (mime_type = \'application/xbel+xml\')\n"
+"return \'http://www.python.org/topics/xml/xbel/\';\n"
+"if (mime_type = \'application/xbrl+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/xbrl#\';\n"
+"if (mime_type = \'application/xddl+xml\')\n"
+"return \'http://www.openlinksw.com/schemas/XDDL#\';\n"
+"if (mime_type = \'application/zip\')\n"
+"return \'http://www.openlinksw.com/schemas/Archive#\';\n"
+"if (mime_type = \'text/directory\')\n"
+"return \'http://www.w3.org/2001/vcard-rdf/3.0#\';\n"
+"if (mime_type = \'text/eml\')\n"
+"return \'http://www.openlinksw.com/schemas/Email#\';\n"
+"if (mime_type = \'text/html\')\n"
+"return \'http://www.openlinksw.com/schemas/XHTML#\';\n"
+"if (mime_type = \'text/wiki\')\n"
+"return \'http://www.openlinksw.com/schemas/Wiki#\';\n"
+"}\n"
+"--src dav_api.sql:6637\n";
+
+static const char *proc214 =
+"#line 6705 \"[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"
+"rescontent := subseq (_rescontent, 0, 10000000-1);\n"
+"if ((length (_rescontent) < 262144) or (registry_get (\'DAV_EXTRACT_RDF_ASYNC\') <> \'1\'))\n"
+"{\n"
+"DAV_EXTRACT_AND_SAVE_RDF_INT2 (resid, resname, restype, rescontent);\n"
+"}\n"
+"else\n"
+"{\n"
+"declare aq any;\n"
+"aq := async_queue (1);\n"
+"if (not isstring (rescontent))\n"
+"rescontent := cast (rescontent as varchar);\n"
+"aq_request (aq, \'DB.DBA.DAV_EXTRACT_AND_SAVE_RDF_INT2\', vector (resid, resname, restype, rescontent));\n"
+"}\n"
+"}\n"
+"--src dav_api.sql:6703\n";
+
+static const char *proc215 =
+"#line 6725 \"[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"
@@ -11452,27 +11975,27 @@ static const char *proc208 =
"\n"
" ;\n"
"}\n"
-"--src dav_api.sql:6712\n";
+"--src dav_api.sql:6723\n";
-static const char *proc209 =
-"#line 6794 \"[executable]/dav_api.sql\"\n"
+static const char *proc216 =
+"#line 6805 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_HOME_DIR_UPDATE ()\n"
"{\n"
"if (isstring (registry_get (\'DAV_HOME_DIR_UPDATE\')))\n"
"return;\n"
-"for (select U_NAME from SYS_USERS where U_DAV_ENABLE = 1 and U_IS_ROLE = 0 and U_NAME <> \'nobody\') do\n"
+"for (select U_NAME from SYS_USERS where U_DAV_ENABLE = 1 and U_IS_ROLE = 0 and U_NAME <> \'nobody\' and U_NAME <> \'__rdf_repl\') do\n"
"DAV_HOME_DIR_CREATE (U_NAME);\n"
"registry_set (\'DAV_HOME_DIR_UPDATE\', \'done\');\n"
"}\n"
-"--src dav_api.sql:6792\n";
+"--src dav_api.sql:6803\n";
static const char *other0 =
" DAV_HOME_DIR_UPDATE ()\n";
/* dav_meta.sql */
-static const char *proc210 =
+static const char *proc217 =
"#line 23 \"[executable]/dav_meta.sql\"\n"
"create function DAV_GUESS_MIME_TYPE_BY_NAME (in orig_res_name varchar) returns varchar\n"
"{\n"
@@ -11585,7 +12108,7 @@ static const char *proc210 =
"}\n"
"--src dav_meta.sql:21\n";
-static const char *proc211 =
+static const char *proc218 =
"#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"
@@ -11716,7 +12239,7 @@ static const char *proc211 =
"}\n"
"--src dav_meta.sql:132\n";
-static const char *proc212 =
+static const char *proc219 =
"#line 263 \"[executable]/dav_meta.sql\"\n"
"create procedure file_space_fmt (in d integer) returns varchar\n"
"{\n"
@@ -11738,7 +12261,7 @@ static const char *proc212 =
"}\n"
"--src dav_meta.sql:261\n";
-static const char *proc213 =
+static const char *proc220 =
"#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"
@@ -11765,7 +12288,7 @@ static const char *proc213 =
"}\n"
"--src dav_meta.sql:281\n";
-static const char *proc214 =
+static const char *proc221 =
"#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"
@@ -11805,7 +12328,7 @@ static const char *proc214 =
"}\n"
"--src dav_meta.sql:306\n";
-static const char *proc215 =
+static const char *proc222 =
"#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"
@@ -11813,7 +12336,7 @@ static const char *proc215 =
"}\n"
"--src dav_meta.sql:344\n";
-static const char *proc216 =
+static const char *proc223 =
"#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"
@@ -11821,7 +12344,7 @@ static const char *proc216 =
"}\n"
"--src dav_meta.sql:350\n";
-static const char *proc217 =
+static const char *proc224 =
"#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"
@@ -11829,7 +12352,7 @@ static const char *proc217 =
"}\n"
"--src dav_meta.sql:356\n";
-static const char *proc218 =
+static const char *proc225 =
"#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"
@@ -11837,7 +12360,7 @@ static const char *proc218 =
"}\n"
"--src dav_meta.sql:362\n";
-static const char *proc219 =
+static const char *proc226 =
"#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"
@@ -11845,7 +12368,7 @@ static const char *proc219 =
"}\n"
"--src dav_meta.sql:367\n";
-static const char *proc220 =
+static const char *proc227 =
"#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"
@@ -11853,7 +12376,7 @@ static const char *proc220 =
"}\n"
"--src dav_meta.sql:372\n";
-static const char *proc221 =
+static const char *proc228 =
"#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"
@@ -11861,7 +12384,7 @@ static const char *proc221 =
"}\n"
"--src dav_meta.sql:377\n";
-static const char *proc222 =
+static const char *proc229 =
"#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"
@@ -11869,7 +12392,7 @@ static const char *proc222 =
"}\n"
"--src dav_meta.sql:382\n";
-static const char *proc223 =
+static const char *proc230 =
"#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"
@@ -11908,7 +12431,7 @@ static const char *proc223 =
"}\n"
"--src dav_meta.sql:388\n";
-static const char *proc224 =
+static const char *proc231 =
"#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"
@@ -11946,7 +12469,7 @@ static const char *proc224 =
"}\n"
"--src dav_meta.sql:425\n";
-static const char *proc225 =
+static const char *proc232 =
"#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"
@@ -11956,7 +12479,7 @@ static const char *proc225 =
"}\n"
"--src dav_meta.sql:461\n";
-static const char *proc226 =
+static const char *proc233 =
"#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"
@@ -11964,7 +12487,7 @@ static const char *proc226 =
"}\n"
"--src dav_meta.sql:469\n";
-static const char *proc227 =
+static const char *proc234 =
"#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"
@@ -11972,7 +12495,7 @@ static const char *proc227 =
"}\n"
"--src dav_meta.sql:475\n";
-static const char *proc228 =
+static const char *proc235 =
"#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"
@@ -11980,7 +12503,7 @@ static const char *proc228 =
"}\n"
"--src dav_meta.sql:481\n";
-static const char *proc229 =
+static const char *proc236 =
"#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"
@@ -11988,7 +12511,7 @@ static const char *proc229 =
"}\n"
"--src dav_meta.sql:487\n";
-static const char *proc230 =
+static const char *proc237 =
"#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"
@@ -11996,7 +12519,7 @@ static const char *proc230 =
"}\n"
"--src dav_meta.sql:493\n";
-static const char *proc231 =
+static const char *proc238 =
"#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"
@@ -12004,7 +12527,7 @@ static const char *proc231 =
"}\n"
"--src dav_meta.sql:499\n";
-static const char *proc232 =
+static const char *proc239 =
"#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"
@@ -12035,7 +12558,7 @@ static const char *proc232 =
"}\n"
"--src dav_meta.sql:505\n";
-static const char *proc233 =
+static const char *proc240 =
"#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"
@@ -12048,7 +12571,7 @@ static const char *proc233 =
"}\n"
"--src dav_meta.sql:535\n";
-static const char *proc234 =
+static const char *proc241 =
"#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"
@@ -12061,7 +12584,7 @@ static const char *proc234 =
"}\n"
"--src dav_meta.sql:546\n";
-static const char *proc235 =
+static const char *proc242 =
"#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"
@@ -12074,7 +12597,7 @@ static const char *proc235 =
"}\n"
"--src dav_meta.sql:557\n";
-static const char *proc236 =
+static const char *proc243 =
"#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"
@@ -12087,7 +12610,7 @@ static const char *proc236 =
"}\n"
"--src dav_meta.sql:569\n";
-static const char *proc237 =
+static const char *proc244 =
"#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"
@@ -12100,7 +12623,7 @@ static const char *proc237 =
"}\n"
"--src dav_meta.sql:581\n";
-static const char *proc238 =
+static const char *proc245 =
"#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"
@@ -12113,7 +12636,7 @@ static const char *proc238 =
"}\n"
"--src dav_meta.sql:593\n";
-static const char *proc239 =
+static const char *proc246 =
"#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"
@@ -12132,7 +12655,7 @@ static const char *proc239 =
"}\n"
"--src dav_meta.sql:605\n";
-static const char *proc240 =
+static const char *proc247 =
"#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"
@@ -12152,7 +12675,7 @@ static const char *proc240 =
"}\n"
"--src dav_meta.sql:622\n";
-static const char *proc241 =
+static const char *proc248 =
"#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"
@@ -12176,7 +12699,7 @@ static const char *proc241 =
"}\n"
"--src dav_meta.sql:640\n";
-static const char *proc242 =
+static const char *proc249 =
"#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"
@@ -12192,7 +12715,7 @@ static const char *proc242 =
"}\n"
"--src dav_meta.sql:662\n";
-static const char *proc243 =
+static const char *proc250 =
"#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"
@@ -12200,7 +12723,7 @@ static const char *proc243 =
"}\n"
"--src dav_meta.sql:676\n";
-static const char *proc244 =
+static const char *proc251 =
"#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"
@@ -12208,7 +12731,7 @@ static const char *proc244 =
"}\n"
"--src dav_meta.sql:682\n";
-static const char *proc245 =
+static const char *proc252 =
"#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"
@@ -12216,7 +12739,7 @@ static const char *proc245 =
"}\n"
"--src dav_meta.sql:688\n";
-static const char *proc246 =
+static const char *proc253 =
"#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"
@@ -12224,7 +12747,7 @@ static const char *proc246 =
"}\n"
"--src dav_meta.sql:694\n";
-static const char *proc247 =
+static const char *proc254 =
"#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"
@@ -12232,7 +12755,7 @@ static const char *proc247 =
"}\n"
"--src dav_meta.sql:700\n";
-static const char *proc248 =
+static const char *proc255 =
"#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"
@@ -12240,7 +12763,7 @@ static const char *proc248 =
"}\n"
"--src dav_meta.sql:706\n";
-static const char *proc249 =
+static const char *proc256 =
"#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"
@@ -12248,7 +12771,7 @@ static const char *proc249 =
"}\n"
"--src dav_meta.sql:712\n";
-static const char *proc250 =
+static const char *proc257 =
"#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"
@@ -12256,7 +12779,7 @@ static const char *proc250 =
"}\n"
"--src dav_meta.sql:718\n";
-static const char *proc251 =
+static const char *proc258 =
"#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"
@@ -12264,7 +12787,7 @@ static const char *proc251 =
"}\n"
"--src dav_meta.sql:724\n";
-static const char *proc252 =
+static const char *proc259 =
"#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"
@@ -12272,7 +12795,7 @@ static const char *proc252 =
"}\n"
"--src dav_meta.sql:730\n";
-static const char *proc253 =
+static const char *proc260 =
"#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"
@@ -12280,7 +12803,7 @@ static const char *proc253 =
"}\n"
"--src dav_meta.sql:736\n";
-static const char *proc254 =
+static const char *proc261 =
"#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"
@@ -12288,7 +12811,7 @@ static const char *proc254 =
"}\n"
"--src dav_meta.sql:742\n";
-static const char *proc255 =
+static const char *proc262 =
"#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"
@@ -12296,7 +12819,7 @@ static const char *proc255 =
"}\n"
"--src dav_meta.sql:748\n";
-static const char *proc256 =
+static const char *proc263 =
"#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"
@@ -12304,7 +12827,7 @@ static const char *proc256 =
"}\n"
"--src dav_meta.sql:754\n";
-static const char *proc257 =
+static const char *proc264 =
"#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"
@@ -12312,7 +12835,7 @@ static const char *proc257 =
"}\n"
"--src dav_meta.sql:760\n";
-static const char *proc258 =
+static const char *proc265 =
"#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"
@@ -12322,7 +12845,7 @@ static const char *proc258 =
"}\n"
"--src dav_meta.sql:766\n";
-static const char *proc259 =
+static const char *proc266 =
"#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"
@@ -12332,7 +12855,7 @@ static const char *proc259 =
"}\n"
"--src dav_meta.sql:774\n";
-static const char *proc260 =
+static const char *proc267 =
"#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"
@@ -12342,7 +12865,7 @@ static const char *proc260 =
"}\n"
"--src dav_meta.sql:782\n";
-static const char *proc261 =
+static const char *proc268 =
"#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"
@@ -12352,7 +12875,7 @@ static const char *proc261 =
"}\n"
"--src dav_meta.sql:790\n";
-static const char *proc262 =
+static const char *proc269 =
"#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"
@@ -12405,7 +12928,7 @@ static const char *proc262 =
"}\n"
"--src dav_meta.sql:799\n";
-static const char *proc263 =
+static const char *proc270 =
"#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"
@@ -12446,7 +12969,7 @@ static const char *proc263 =
"}\n"
"--src dav_meta.sql:851\n";
-static const char *proc264 =
+static const char *proc271 =
"#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"
@@ -12485,7 +13008,7 @@ static const char *proc264 =
"}\n"
"--src dav_meta.sql:890\n";
-static const char *proc265 =
+static const char *proc272 =
"#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"
@@ -12512,7 +13035,7 @@ static const char *proc265 =
"}\n"
"--src dav_meta.sql:927\n";
-static const char *proc266 =
+static const char *proc273 =
"#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"
@@ -12531,7 +13054,7 @@ static const char *proc266 =
"}\n"
"--src dav_meta.sql:952\n";
-static const char *proc267 =
+static const char *proc274 =
"#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"
@@ -12545,7 +13068,7 @@ static const char *proc267 =
"}\n"
"--src dav_meta.sql:969\n";
-static const char *proc268 =
+static const char *proc275 =
"#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"
@@ -12559,7 +13082,7 @@ static const char *proc268 =
"}\n"
"--src dav_meta.sql:981\n";
-static const char *proc269 =
+static const char *proc276 =
"#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"
@@ -12623,7 +13146,7 @@ static const char *proc269 =
"}\n"
"--src dav_meta.sql:993\n";
-static const char *proc270 =
+static const char *proc277 =
"#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"
@@ -12655,7 +13178,7 @@ static const char *proc270 =
"}\n"
"--src dav_meta.sql:1056\n";
-static const char *proc271 =
+static const char *proc278 =
"#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"
@@ -12709,7 +13232,7 @@ static const char *proc271 =
"}\n"
"--src dav_meta.sql:1087\n";
-static const char *proc272 =
+static const char *proc279 =
"#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"
@@ -12732,7 +13255,7 @@ static const char *proc272 =
"}\n"
"--src dav_meta.sql:1139\n";
-static const char *proc273 =
+static const char *proc280 =
"#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"
@@ -12760,7 +13283,7 @@ static const char *proc273 =
"}\n"
"--src dav_meta.sql:1160\n";
-static const char *proc274 =
+static const char *proc281 =
"#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"
@@ -12787,7 +13310,7 @@ static const char *proc274 =
"}\n"
"--src dav_meta.sql:1187\n";
-static const char *proc275 =
+static const char *proc282 =
"#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"
@@ -12811,7 +13334,7 @@ static const char *proc275 =
"}\n"
"--src dav_meta.sql:1213\n";
-static const char *proc276 =
+static const char *proc283 =
"#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"
@@ -12832,7 +13355,7 @@ static const char *proc276 =
"}\n"
"--src dav_meta.sql:1235\n";
-static const char *proc277 =
+static const char *proc284 =
"#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"
@@ -12851,7 +13374,7 @@ static const char *proc277 =
"}\n"
"--src dav_meta.sql:1254\n";
-static const char *proc278 =
+static const char *proc285 =
"#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"
@@ -12872,7 +13395,7 @@ static const char *proc278 =
"}\n"
"--src dav_meta.sql:1271\n";
-static const char *proc279 =
+static const char *proc286 =
"#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"
@@ -12893,7 +13416,7 @@ static const char *proc279 =
"}\n"
"--src dav_meta.sql:1290\n";
-static const char *proc280 =
+static const char *proc287 =
"#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"
@@ -13067,7 +13590,7 @@ static const char *proc280 =
"}\n"
"--src dav_meta.sql:1309\n";
-static const char *proc281 =
+static const char *proc288 =
"#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"
@@ -13109,7 +13632,7 @@ static const char *proc281 =
"}\n"
"--src dav_meta.sql:1481\n";
-static const char *proc282 =
+static const char *proc289 =
"#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"
@@ -13177,7 +13700,7 @@ static const char *proc282 =
"}\n"
"--src dav_meta.sql:1521\n";
-static const char *proc283 =
+static const char *proc290 =
"#line 1591 \"[executable]/dav_meta.sql\"\n"
"create function IMC_TO_XML (in _src varchar)\n"
"{\n"
@@ -13358,7 +13881,7 @@ static const char *proc283 =
"}\n"
"--src dav_meta.sql:1589\n";
-static const char *proc284 =
+static const char *proc291 =
"#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"
@@ -13485,7 +14008,7 @@ static const char *proc284 =
"}\n"
"--src dav_meta.sql:1769\n";
-static const char *proc285 =
+static const char *proc292 =
"#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"
@@ -13532,7 +14055,7 @@ static const char *proc285 =
"}\n"
"--src dav_meta.sql:1895\n";
-static const char *proc286 =
+static const char *proc293 =
"#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"
@@ -13636,7 +14159,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 *proc287 =
+static const char *proc294 =
"#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"
@@ -13730,7 +14253,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 *proc288 =
+static const char *proc295 =
"#line 2157 \"[executable]/dav_meta.sql\"\n"
"create function DB.DBA.BPEL_SPLIT_LIST (in strg varchar)\n"
"{\n"
@@ -13761,7 +14284,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 *proc289 =
+static const char *proc296 =
"#line 2189 \"[executable]/dav_meta.sql\"\n"
"create function DAV_EXTRACT_SPOTLIGHT (in resname varchar, inout rescontent any) returns any\n"
"{\n"
@@ -13801,7 +14324,7 @@ static const char *proc289 =
"}\n"
"--src dav_meta.sql:2187\n";
-static const char *proc290 =
+static const char *proc297 =
"#line 2228 \"[executable]/dav_meta.sql\"\n"
"create function DAV_CONVERT_SPOTLIGHT_TO_VIRTUOSO (in sp_data any) returns any\n"
"{\n"
@@ -13847,7 +14370,7 @@ static const char *proc290 =
"}\n"
"--src dav_meta.sql:2226\n";
-static const char *proc291 =
+static const char *proc298 =
"#line 2273 \"[executable]/dav_meta.sql\"\n"
"create procedure DAV_SPOTLIGHT_ADD (inout res any, in name varchar, inout val any)\n"
"{\n"
@@ -13859,7 +14382,7 @@ static const char *proc291 =
"}\n"
"--src dav_meta.sql:2271\n";
-static const char *proc292 =
+static const char *proc299 =
"#line 2284 \"[executable]/dav_meta.sql\"\n"
" create procedure DB.DBA.XML_UNIX_DATE_TO_ISO (in unixdt integer)\n"
"{\n"
@@ -13877,7 +14400,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 *proc293 =
+static const char *proc300 =
"#line 2302 \"[executable]/dav_meta.sql\"\n"
"create procedure DAV_EXTRACT_META_AS_RDF_XML (in resname varchar, in rescontent any := null)\n"
"{\n"
@@ -13931,7 +14454,7 @@ static const char *proc293 =
/* dav_acct.sql */
-static const char *proc294 =
+static const char *proc301 =
"#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"
@@ -13971,7 +14494,7 @@ static const char *proc294 =
"}\n"
"--src dav_acct.sql:21\n";
-static const char *proc295 =
+static const char *proc302 =
"#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"
@@ -14062,7 +14585,7 @@ static const char *proc295 =
"}\n"
"--src dav_acct.sql:59\n";
-static const char *proc296 =
+static const char *proc303 =
"#line 150 \"[executable]/dav_acct.sql\"\n"
"create function DAV_DEL_SPACE_QUOTA (in _home_path varchar) returns integer\n"
"{\n"
@@ -14081,7 +14604,7 @@ static const char *proc296 =
"}\n"
"--src dav_acct.sql:148\n";
-static const char *proc297 =
+static const char *proc304 =
"#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"
@@ -14116,7 +14639,7 @@ static const char *proc297 =
"}\n"
"--src dav_acct.sql:165\n";
-static const char *proc298 =
+static const char *proc305 =
"#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"
@@ -14133,7 +14656,7 @@ static const char *proc298 =
"signal (\'HT500\', sprintf (\'DAV integrity violation: ancestor collection %s not found for resource %s\', home_path, res_path));\n"
"if (not isinteger (home_col_id))\n"
"signal (\'HT500\', sprintf (\'DAV integrity violation: collection %s is a DET subcollection, can not use DAV quotas for %s\', home_path, res_path));\n"
-"owner_u_id := coalesce ((select COL_OWNER from WS.WS.SYS_DAV_COL where COL_ID = home_col_id), http_hobody_uid());\n"
+"owner_u_id := coalesce ((select COL_OWNER from WS.WS.SYS_DAV_COL where COL_ID = home_col_id), http_nobody_uid());\n"
"u_descr := coalesce ((select \'owner \"\' || U_NAME || \'\"\' from SYS_USERS where U_ID = owner_u_id), sprintf (\'owner #%d\', owner_u_id));\n"
"}\n"
"rollback work;\n"
@@ -14144,7 +14667,7 @@ static const char *proc298 =
"}\n"
"--src dav_acct.sql:198\n";
-static const char *proc299 =
+static const char *proc306 =
"#line 226 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_OWNER_DISABLED_SIGNAL (in res_path varchar, in _u_id integer)\n"
"{\n"
@@ -14163,7 +14686,7 @@ static const char *proc299 =
"}\n"
"--src dav_acct.sql:224\n";
-static const char *proc300 =
+static const char *proc307 =
"#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"
@@ -14180,7 +14703,7 @@ static const char *proc300 =
"}\n"
"--src dav_acct.sql:241\n";
-static const char *proc301 =
+static const char *proc308 =
"#line 258 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_SPACE_QUOTA_RES_INSERT (in newr_path varchar, in newr_len integer)\n"
"{\n"
@@ -14217,7 +14740,7 @@ static const char *proc301 =
"}\n"
"--src dav_acct.sql:256\n";
-static const char *proc302 =
+static const char *proc309 =
"#line 293 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_SPACE_QUOTA_RES_DELETE (in oldr_path varchar, in oldr_len integer)\n"
"{\n"
@@ -14260,7 +14783,7 @@ static const char *proc302 =
"}\n"
"--src dav_acct.sql:291\n";
-static const char *proc303 =
+static const char *proc310 =
"#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"
@@ -14358,7 +14881,7 @@ static const char *proc303 =
/* dav_rdf_quad.sql */
-static const char *proc304 =
+static const char *proc311 =
"#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"
@@ -14366,7 +14889,7 @@ static const char *proc304 =
"}\n"
"--src dav_rdf_quad.sql:21\n";
-static const char *proc305 =
+static const char *proc312 =
"#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"
@@ -14378,7 +14901,7 @@ static const char *proc305 =
"}\n"
"--src dav_rdf_quad.sql:27\n";
-static const char *proc306 =
+static const char *proc313 =
"#line 39 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_AUTO_REPLICATE_TO_RDF_QUAD ()\n"
"{\n"
@@ -14392,7 +14915,7 @@ static const char *proc306 =
"}\n"
"--src dav_rdf_quad.sql:37\n";
-static const char *proc307 =
+static const char *proc314 =
"#line 51 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_REPLICATE_ALL_TO_RDF_QUAD (in enable integer)\n"
"{\n"
@@ -14402,9 +14925,9 @@ static const char *proc307 =
"if (uriqa_default_host is null or uriqa_default_host = \'\')\n"
"signal (\'OBLOM\', \'No uriqa_default_host!\');\n"
"if (virtuoso_ini_item_value (\'URIQA\', \'DynamicLocal\') = \'1\')\n"
-"new_dav_graph := \'local:/DAV\';\n"
+"new_dav_graph := \'local:/DAV/\';\n"
"else\n"
-"new_dav_graph := sprintf (\'http://%s/DAV\', uriqa_default_host);\n"
+"new_dav_graph := sprintf (\'http://%s/DAV/\', uriqa_default_host);\n"
"exec (\'checkpoint\');\n"
"__atomic (1);\n"
"DB.DBA.RDF_DELETE_ENTIRE_GRAPH (new_dav_graph, 1);\n"
@@ -14459,7 +14982,7 @@ static const char *proc307 =
"}\n"
"--src dav_rdf_quad.sql:49\n";
-static const char *proc308 =
+static const char *proc315 =
"#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"
@@ -14535,7 +15058,7 @@ static const char *proc308 =
"}\n"
"--src dav_rdf_quad.sql:114\n";
-static const char *proc309 =
+static const char *proc316 =
"#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"
@@ -14563,7 +15086,7 @@ static const char *proc309 =
"}\n"
"--src dav_rdf_quad.sql:188\n";
-static const char *proc310 =
+static const char *proc317 =
"#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"
@@ -14605,7 +15128,7 @@ static const char *proc310 =
"}\n"
"--src dav_rdf_quad.sql:214\n";
-static const char *proc311 =
+static const char *proc318 =
"#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"
@@ -14647,7 +15170,7 @@ static const char *proc311 =
"}\n"
"--src dav_rdf_quad.sql:254\n";
-static const char *proc312 =
+static const char *proc319 =
"#line 296 \"[executable]/dav_rdf_quad.sql\"\n"
"create function DB.DBA.DAV_MAKE_USER_IRI (in userid integer)\n"
"{\n"
@@ -14670,7 +15193,7 @@ static const char *proc312 =
"}\n"
"--src dav_rdf_quad.sql:294\n";
-static const char *proc313 =
+static const char *proc320 =
"#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"
@@ -14704,7 +15227,7 @@ static const char *proc313 =
"}\n"
"--src dav_rdf_quad.sql:315\n";
-static const char *proc314 =
+static const char *proc321 =
"#line 349 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_REPLICATE_COL_TO_RDF_QUAD (in col_id2 integer)\n"
"{\n"
@@ -15005,7 +15528,7 @@ static const char *trig32 =
"}\n"
"--src dav_rdf_quad.sql:625\n";
-static const char *proc315 =
+static const char *proc322 =
"#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"
@@ -15161,7 +15684,7 @@ static const char *trig34 =
/* vfs.sql */
-static const char *proc316 =
+static const char *proc323 =
"#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"
@@ -15191,7 +15714,7 @@ static const char *proc316 =
"}\n"
"--src vfs.sql:29\n";
-static const char *proc317 =
+static const char *proc324 =
"#line 59 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_HTTP_RESP_CODE (inout _resp any)\n"
"{\n"
@@ -15203,7 +15726,7 @@ static const char *proc317 =
"}\n"
"--src vfs.sql:57\n";
-static const char *proc318 =
+static const char *proc325 =
"#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"
@@ -15216,7 +15739,7 @@ static const char *proc318 =
"}\n"
"--src vfs.sql:67\n";
-static const char *proc319 =
+static const char *proc326 =
"#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"
@@ -15231,7 +15754,7 @@ static const char *proc319 =
"}\n"
"--src vfs.sql:78\n";
-static const char *proc320 =
+static const char *proc327 =
"#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"
@@ -15465,7 +15988,7 @@ static const char *proc320 =
"}\n"
"--src vfs.sql:91\n";
-static const char *proc321 =
+static const char *proc328 =
"#line 326 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DELETE_LOCAL_COPY (in _host varchar, in _url varchar, in _root varchar)\n"
"{\n"
@@ -15474,7 +15997,7 @@ static const char *proc321 =
"}\n"
"--src vfs.sql:324\n";
-static const char *proc322 =
+static const char *proc329 =
"#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"
@@ -15487,7 +16010,7 @@ static const char *proc322 =
"}\n"
"--src vfs.sql:331\n";
-static const char *proc323 =
+static const char *proc330 =
"#line 344 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_STATUS_GET (in _tgt varchar, in _root varchar)\n"
"{\n"
@@ -15499,7 +16022,7 @@ static const char *proc323 =
"}\n"
"--src vfs.sql:342\n";
-static const char *proc324 =
+static const char *proc331 =
"#line 354 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_STATUS_SET (in _tgt varchar, in _root varchar, in _stat varchar)\n"
"{\n"
@@ -15507,7 +16030,7 @@ static const char *proc324 =
"}\n"
"--src vfs.sql:352\n";
-static const char *proc325 =
+static const char *proc332 =
"#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"
@@ -15539,7 +16062,7 @@ static const char *proc325 =
"}\n"
"--src vfs.sql:359\n";
-static const char *proc326 =
+static const char *proc333 =
"#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"
@@ -15688,7 +16211,7 @@ static const char *proc326 =
"}\n"
"--src vfs.sql:394\n";
-static const char *proc327 =
+static const char *proc334 =
"#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"
@@ -15710,7 +16233,7 @@ static const char *proc327 =
"}\n"
"--src vfs.sql:541\n";
-static const char *proc328 =
+static const char *proc335 =
"#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"
@@ -15824,7 +16347,7 @@ static const char *proc328 =
"}\n"
"--src vfs.sql:561\n";
-static const char *proc329 =
+static const char *proc336 =
"#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"
@@ -15905,7 +16428,7 @@ static const char *proc329 =
"}\n"
"--src vfs.sql:674\n";
-static const char *proc330 =
+static const char *proc337 =
"#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"
@@ -15970,7 +16493,7 @@ static const char *proc330 =
"}\n"
"--src vfs.sql:754\n";
-static const char *proc331 =
+static const char *proc338 =
"#line 819 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.MAKE_URL (in _host varchar, in _url varchar)\n"
"{\n"
@@ -15985,7 +16508,7 @@ static const char *proc331 =
"}\n"
"--src vfs.sql:817\n";
-static const char *proc332 =
+static const char *proc339 =
"#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"
@@ -16041,7 +16564,7 @@ static const char *proc332 =
"}\n"
"--src vfs.sql:831\n";
-static const char *proc333 =
+static const char *proc340 =
"#line 888 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.EXPAND_URL_OLD (in _url varchar, in _c_url varchar)\n"
"{\n"
@@ -16103,7 +16626,7 @@ static const char *proc333 =
"}\n"
"--src vfs.sql:886\n";
-static const char *proc334 =
+static const char *proc341 =
"#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"
@@ -16138,7 +16661,7 @@ static const char *proc334 =
"}\n"
"--src vfs.sql:947\n";
-static const char *proc335 =
+static const char *proc342 =
"#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"
@@ -16205,7 +16728,7 @@ static const char *proc335 =
"}\n"
"--src vfs.sql:981\n";
-static const char *proc336 =
+static const char *proc343 =
"#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"
@@ -16238,7 +16761,7 @@ static const char *proc336 =
"}\n"
"--src vfs.sql:1047\n";
-static const char *proc337 =
+static const char *proc344 =
"#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"
@@ -16337,7 +16860,7 @@ static const char *proc337 =
"}\n"
"--src vfs.sql:1079\n";
-static const char *proc338 =
+static const char *proc345 =
"#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"
@@ -16413,7 +16936,7 @@ static const char *proc338 =
"}\n"
"--src vfs.sql:1177\n";
-static const char *proc339 =
+static const char *proc346 =
"#line 1255 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.FIND_KEYWORD (inout params varchar, in _pkey varchar)\n"
"{\n"
@@ -16453,7 +16976,7 @@ static const char *proc339 =
"}\n"
"--src vfs.sql:1253\n";
-static const char *proc340 =
+static const char *proc347 =
"#line 1295 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.GET_HREF_IN_ARRAY (in _content varchar, in _d_imgs varchar)\n"
"{\n"
@@ -16549,7 +17072,7 @@ static const char *proc340 =
"}\n"
"--src vfs.sql:1293\n";
-static const char *proc341 =
+static const char *proc348 =
"#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"
@@ -16658,7 +17181,7 @@ static const char *proc341 =
"}\n"
"--src vfs.sql:1388\n";
-static const char *proc342 =
+static const char *proc349 =
"#line 1498 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_HEAD (inout _url varchar)\n"
"{\n"
@@ -16678,7 +17201,7 @@ static const char *proc342 =
"}\n"
"--src vfs.sql:1496\n";
-static const char *proc343 =
+static const char *proc350 =
"#line 1517 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_MKCOL (inout _url varchar)\n"
"{\n"
@@ -16698,7 +17221,7 @@ static const char *proc343 =
"}\n"
"--src vfs.sql:1515\n";
-static const char *proc344 =
+static const char *proc351 =
"#line 1536 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_PUT (inout _url varchar,in _content varchar)\n"
"{\n"
@@ -16716,7 +17239,7 @@ static const char *proc344 =
"}\n"
"--src vfs.sql:1534\n";
-static const char *proc345 =
+static const char *proc352 =
"#line 1553 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_PROP (inout _url varchar, in _d_imgs varchar, in _auth varchar)\n"
"{\n"
@@ -16740,7 +17263,7 @@ static const char *proc345 =
"}\n"
"--src vfs.sql:1551\n";
-static const char *proc346 =
+static const char *proc353 =
"#line 1577 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.GET_HREF_FROM_XML (in _content varchar, in _d_imgs varchar)\n"
"{\n"
@@ -16846,7 +17369,7 @@ static const char *proc346 =
"}\n"
"--src vfs.sql:1575\n";
-static const char *proc347 =
+static const char *proc354 =
"#line 1682 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.ISEMPTY (in x any)\n"
"{\n"
@@ -16861,7 +17384,7 @@ static const char *proc347 =
"}\n"
"--src vfs.sql:1680\n";
-static const char *proc348 =
+static const char *proc355 =
"#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"
@@ -16882,7 +17405,7 @@ static const char *proc348 =
"}\n"
"--src vfs.sql:1702\n";
-static const char *proc349 =
+static const char *proc356 =
"#line 1723 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_RECOVER_QUEUE_STAT (in host varchar, in coll varchar)\n"
"{\n"
@@ -16906,7 +17429,7 @@ static const char *proc349 =
"}\n"
"--src vfs.sql:1721\n";
-static const char *proc350 =
+static const char *proc357 =
"#line 1750 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_MAKE_ENTRY (\n"
"in url varchar,\n"
@@ -16931,7 +17454,7 @@ static const char *proc350 =
"}\n"
"--src vfs.sql:1748\n";
-static const char *proc351 =
+static const char *proc358 =
"#line 1773 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_GO (in url varchar)\n"
"{\n"
@@ -16941,7 +17464,7 @@ static const char *proc351 =
"}\n"
"--src vfs.sql:1771\n";
-static const char *proc352 =
+static const char *proc359 =
"#line 1782 \"[executable]/vfs.sql\"\n"
"create procedure\n"
"WS.WS.VFS_URI_COMPOSE (in res any)\n"
@@ -16980,7 +17503,7 @@ static const char *proc352 =
"}\n"
"--src vfs.sql:1780\n";
-static const char *proc353 =
+static const char *proc360 =
"#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"
@@ -17094,7 +17617,7 @@ static const char *proc353 =
"}\n"
"--src vfs.sql:1818\n";
-static const char *proc354 =
+static const char *proc361 =
"#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"
@@ -17109,7 +17632,7 @@ static const char *proc354 =
"}\n"
"--src vfs.sql:1932\n";
-static const char *proc355 =
+static const char *proc362 =
"#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"
@@ -17166,7 +17689,7 @@ static const char *proc355 =
"}\n"
"--src vfs.sql:1946\n";
-static const char *proc356 =
+static const char *proc363 =
"#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"
@@ -17190,7 +17713,7 @@ static const char *proc356 =
"}\n"
"--src vfs.sql:2001\n";
-static const char *proc357 =
+static const char *proc364 =
"#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"
@@ -17262,7 +17785,7 @@ static const char *proc357 =
"}\n"
"--src vfs.sql:2023\n";
-static const char *proc358 =
+static const char *proc365 =
"#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"
@@ -17301,7 +17824,7 @@ static const char *proc358 =
"}\n"
"if (url_ck like \'%.rdf\' or _c_type = \'application/rdf+xml\')\n"
"{\n"
-"DB.DBA.RDF_LOAD_RDFXML (_content, base, graph, 3);\n"
+"DB.DBA.RDF_LOAD_RDFXML (_content, base, graph, 0, 3);\n"
"}\n"
"else if (url_ck like \'%.n3\' or url_ck like \'%.ttl\' or url_ck like \'%.nt\' or _c_type = \'text/n3\' or _c_type = \'text/rdf+n3\')\n"
"{\n"
@@ -17341,7 +17864,7 @@ static const char *proc358 =
"}\n"
"--src vfs.sql:2093\n";
-static const char *proc359 =
+static const char *proc366 =
"#line 2172 \"[executable]/vfs.sql\"\n"
"create procedure VFS_ROBOTS_PARSE (in txt varchar, in ua varchar, out delay_sec float)\n"
"{\n"
@@ -17398,7 +17921,7 @@ static const char *proc359 =
"}\n"
"--src vfs.sql:2170\n";
-static const char *proc360 =
+static const char *proc367 =
"#line 2227 \"[executable]/vfs.sql\"\n"
"create procedure VFS_ROBOTS_GET (in _host varchar, in _root varchar, inout site_delay_sec float)\n"
"{\n"
@@ -17430,12 +17953,12 @@ static const char *xsl7[]= {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
" -\n"
-" - $Id: davxml2rdfxml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -17551,12 +18074,12 @@ static const char *xsl8[]= {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
" -\n"
-" - $Id: davxml2n3xml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -17648,12 +18171,12 @@ static const char *xsl9[]= {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
" -\n"
-" - $Id: rdfxml2n3xml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -17898,12 +18421,12 @@ static const char *xsl10[]= {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
" -\n"
-" - $Id: n3xml2uriqahtml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -17997,7 +18520,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 *proc361 =
+static const char *proc368 =
"#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"
@@ -18039,7 +18562,7 @@ static const char *proc361 =
"}\n"
"--src uriqa.sql:42\n";
-static const char *proc362 =
+static const char *proc369 =
"#line 84 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.URIQA_LOAD_FROM_INI ()\n"
"{\n"
@@ -18092,7 +18615,7 @@ static const char *proc362 =
static const char *other9 =
"WS.WS.URIQA_LOAD_FROM_INI ()\n";
-static const char *proc363 =
+static const char *proc370 =
"#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"
@@ -18132,7 +18655,7 @@ static const char *proc363 =
"}\n"
"--src uriqa.sql:134\n";
-static const char *proc364 =
+static const char *proc371 =
"#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"
@@ -18192,7 +18715,7 @@ static const char *proc364 =
"}\n"
"--src uriqa.sql:172\n";
-static const char *proc365 =
+static const char *proc372 =
"#line 232 \"[executable]/uriqa.sql\"\n"
"create function WS.WS.URIQA_N3_DIR_LIST (inout split any, in a_uid integer)\n"
"{\n"
@@ -18231,7 +18754,7 @@ static const char *proc365 =
"}\n"
"--src uriqa.sql:230\n";
-static const char *proc366 =
+static const char *proc373 =
"#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"
@@ -18323,7 +18846,7 @@ static const char *proc366 =
"}\n"
"--src uriqa.sql:267\n";
-static const char *proc367 =
+static const char *proc374 =
"#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"
@@ -18535,7 +19058,7 @@ static const char *proc367 =
"}\n"
"--src uriqa.sql:357\n";
-static const char *proc368 =
+static const char *proc375 =
"#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"
@@ -18605,7 +19128,7 @@ static const char *proc368 =
"}\n"
"--src uriqa.sql:567\n";
-static const char *proc369 =
+static const char *proc376 =
"#line 637 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.URIQA_STATUS (in err_ret any, in signal_errors integer)\n"
"{\n"
@@ -18632,7 +19155,7 @@ static const char *proc369 =
"}\n"
"--src uriqa.sql:635\n";
-static const char *proc370 =
+static const char *proc377 =
"#line 665 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.\"MPUT\" (inout path varchar, inout params varchar, inout lines varchar)\n"
"{\n"
@@ -18650,7 +19173,7 @@ static const char *proc370 =
"}\n"
"--src uriqa.sql:663\n";
-static const char *proc371 =
+static const char *proc378 =
"#line 681 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.\"MGET\" (inout path varchar, inout params any, inout lines any)\n"
"{\n"
@@ -18670,7 +19193,7 @@ static const char *proc371 =
"}\n"
"--src uriqa.sql:679\n";
-static const char *proc372 =
+static const char *proc379 =
"#line 699 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.\"MDELETE\" (inout path varchar, inout params any, inout lines any)\n"
"{\n"
@@ -18688,7 +19211,7 @@ static const char *proc372 =
"}\n"
"--src uriqa.sql:697\n";
-static const char *proc373 =
+static const char *proc380 =
"#line 715 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.\"/!URIQA/\" (inout path varchar, inout params any, inout lines any)\n"
"{\n"
@@ -18733,7 +19256,7 @@ static const char *proc373 =
"}\n"
"--src uriqa.sql:713\n";
-static const char *proc374 =
+static const char *proc381 =
"#line 758 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.URIQA_VHOST_RESET()\n"
"{\n"
@@ -18749,7 +19272,7 @@ static const char *proc374 =
/* DET_CatFilter.sql */
-static const char *proc375 =
+static const char *proc382 =
"#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"
@@ -18795,7 +19318,7 @@ static const char *proc375 =
"}\n"
"--src DET_CatFilter.sql:30\n";
-static const char *proc376 =
+static const char *proc383 =
"#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"
@@ -18813,7 +19336,7 @@ static const char *proc376 =
"}\n"
"--src DET_CatFilter.sql:75\n";
-static const char *proc377 =
+static const char *proc384 =
"#line 94 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_ENCODE_CATVALUE\" (in val varchar) returns varchar\n"
"{\n"
@@ -18851,7 +19374,7 @@ static const char *proc377 =
"}\n"
"--src DET_CatFilter.sql:92\n";
-static const char *proc378 =
+static const char *proc385 =
"#line 131 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DECODE_CATVALUE\" (in catval varchar, out crop integer)\n"
"{\n"
@@ -18888,7 +19411,7 @@ static const char *proc378 =
"}\n"
"--src DET_CatFilter.sql:129\n";
-static const char *proc379 =
+static const char *proc386 =
"#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"
@@ -18943,7 +19466,7 @@ static const char *proc379 =
"}\n"
"--src DET_CatFilter.sql:165\n";
-static const char *proc380 =
+static const char *proc387 =
"#line 221 \"[executable]/DET_CatFilter.sql\"\n"
"create procedure \"CatFilter_ACC_FILTER_DATA\" (inout filter any, inout filter_data any)\n"
"{\n"
@@ -18967,7 +19490,7 @@ static const char *proc380 =
"}\n"
"--src DET_CatFilter.sql:219\n";
-static const char *proc381 =
+static const char *proc388 =
"#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"
@@ -19060,7 +19583,7 @@ static const char *proc381 =
"}\n"
"--src DET_CatFilter.sql:242\n";
-static const char *proc382 =
+static const char *proc389 =
"#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"
@@ -19113,7 +19636,7 @@ static const char *proc382 =
"}\n"
"--src DET_CatFilter.sql:334\n";
-static const char *proc383 =
+static const char *proc390 =
"#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"
@@ -19136,7 +19659,7 @@ static const char *proc383 =
"}\n"
"--src DET_CatFilter.sql:386\n";
-static const char *proc384 =
+static const char *proc391 =
"#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"
@@ -19145,7 +19668,7 @@ static const char *proc384 =
"}\n"
"--src DET_CatFilter.sql:408\n";
-static const char *proc385 =
+static const char *proc392 =
"#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"
@@ -19154,7 +19677,7 @@ static const char *proc385 =
"}\n"
"--src DET_CatFilter.sql:416\n";
-static const char *proc386 =
+static const char *proc393 =
"#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"
@@ -19163,7 +19686,7 @@ static const char *proc386 =
"}\n"
"--src DET_CatFilter.sql:424\n";
-static const char *proc387 =
+static const char *proc394 =
"#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"
@@ -19215,7 +19738,7 @@ static const char *proc387 =
"}\n"
"--src DET_CatFilter.sql:432\n";
-static const char *proc388 =
+static const char *proc395 =
"#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"
@@ -19244,7 +19767,7 @@ static const char *proc388 =
"}\n"
"--src DET_CatFilter.sql:483\n";
-static const char *proc389 =
+static const char *proc396 =
"#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"
@@ -19296,7 +19819,7 @@ static const char *proc389 =
"}\n"
"--src DET_CatFilter.sql:510\n";
-static const char *proc390 =
+static const char *proc397 =
"#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"
@@ -19310,7 +19833,7 @@ static const char *proc390 =
"}\n"
"--src DET_CatFilter.sql:560\n";
-static const char *proc391 =
+static const char *proc398 =
"#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"
@@ -19326,7 +19849,7 @@ static const char *proc391 =
"}\n"
"--src DET_CatFilter.sql:573\n";
-static const char *proc392 =
+static const char *proc399 =
"#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"
@@ -19346,7 +19869,7 @@ static const char *proc392 =
"}\n"
"--src DET_CatFilter.sql:588\n";
-static const char *proc393 =
+static const char *proc400 =
"#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"
@@ -19364,7 +19887,7 @@ static const char *proc393 =
"}\n"
"--src DET_CatFilter.sql:607\n";
-static const char *proc394 =
+static const char *proc401 =
"#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"
@@ -19461,7 +19984,7 @@ static const char *proc394 =
"}\n"
"--src DET_CatFilter.sql:624\n";
-static const char *proc395 =
+static const char *proc402 =
"#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"
@@ -19469,7 +19992,7 @@ static const char *proc395 =
"}\n"
"--src DET_CatFilter.sql:720\n";
-static const char *proc396 =
+static const char *proc403 =
"#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"
@@ -19498,66 +20021,256 @@ static const char *proc396 =
"}\n"
"return vector();\n"
"}\n"
-"--src DET_CatFilter.sql:726\n";
+"--src DET_CatFilter.sql:726\n";
+
+static const char *proc404 =
+"#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"
+"declare filter_length, p0_id, p1_id, p2_id, p3_id, p4_id, res0_id, res1_id, res2_id, res3_id, res4_id, res_last_id, res_id_max integer;\n"
+"declare plast_id integer;\n"
+"declare p0_val, p1_val, p2_val, p3_val, p4_val, v_last, v_max varchar;\n"
+"declare auth_gid integer;\n"
+"declare acl_bits, hit_ids any;\n"
+"declare c_last1 cursor for select DRI_CATVALUE from WS.WS.SYS_DAV_RDF_INVERSE\n"
+"where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = plast_id and (v_max is null or DRI_CATVALUE > v_max) and\n"
+"exists (select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = DRI_RES_ID and case (DAV_CHECK_PERM (RES_PERMS, \'1__\', auth_uid, auth_gid, RES_GROUP, RES_OWNER)) when 0 then WS.WS.ACL_IS_GRANTED (RES_ACL, auth_uid, acl_bits) else 1 end);\n"
+"declare c_last2 cursor for select DRI_RES_ID, DRI_CATVALUE from WS.WS.SYS_DAV_RDF_INVERSE\n"
+"where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = plast_id and (v_max is null or DRI_CATVALUE > v_max) and\n"
+"exists (select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = DRI_RES_ID and case (DAV_CHECK_PERM (RES_PERMS, \'1__\', auth_uid, auth_gid, RES_GROUP, RES_OWNER)) when 0 then WS.WS.ACL_IS_GRANTED (RES_ACL, auth_uid, acl_bits) else 1 end);\n"
+"declare c0 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p0_id and DRI_CATVALUE = p0_val and DRI_RES_ID >= res_id_max;\n"
+"declare c1 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p1_id and DRI_CATVALUE = p1_val and DRI_RES_ID >= res_id_max;\n"
+"declare c2 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p2_id and DRI_CATVALUE = p2_val and DRI_RES_ID >= res_id_max;\n"
+"declare c3 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p3_id and DRI_CATVALUE = p3_val and DRI_RES_ID >= res_id_max;\n"
+"declare c4 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p4_id and DRI_CATVALUE = p4_val and DRI_RES_ID >= res_id_max;\n"
+"\n"
+"filter_length := length (filter_data);\n"
+"plast_id := filter_data [filter_length - 1];\n"
+"res_id_max := 0;\n"
+"v_max := null;\n"
+"auth_gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = auth_uid), 0);\n"
+"acl_bits := DAV_REQ_CHARS_TO_BITMASK (\'1__\');\n"
+"\n"
+"if (filter_length = 2)\n"
+"{\n"
+"whenever not found goto nf_c_last1;\n"
+"\n"
+"open c_last1 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"fetch c_last1 into v_last;\n"
+"\n"
+"if (v_max is null or (v_last > v_max))\n"
+"{\n"
+"v_max := v_last;\n"
+"dict_put (distval_dict, v_last, 1);\n"
+"}\n"
+"}\n"
+"nf_c_last1:\n"
+"close c_last1;\n"
+"return;\n"
+"}\n"
+"\n"
+"res0_id := 0;\n"
+"res1_id := 0;\n"
+"res2_id := 0;\n"
+"res3_id := 0;\n"
+"res4_id := 0;\n"
+"hit_ids := dict_new ();\n"
+"\n"
+"p0_id := filter_data [1];\n"
+"p0_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [2]);\n"
+"if (filter_length = 6)\n"
+"{\n"
+"whenever not found goto get_distincts_0;\n"
+"open c0 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"while (res0_id <= res_id_max)\n"
+"fetch c0 into res0_id;\n"
+"res_id_max := res0_id;\n"
+"\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
+"}\n"
+"}\n"
+"\n"
+"p1_id := filter_data [4+1];\n"
+"p1_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [4+2]);\n"
+"if (filter_length = 10)\n"
+"{\n"
+"whenever not found goto get_distincts_1;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max))\n"
+"{\n"
+"\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
+"}\n"
+"else\n"
+"res_id_max := res_id_max + 1;\n"
+"\n"
+"}\n"
+"}\n"
+"\n"
+"p2_id := filter_data [8+1];\n"
+"p2_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [8+2]);\n"
+"if (filter_length = 14)\n"
+"{\n"
+"whenever not found goto get_distincts_2;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"\n"
+"\n"
+"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
+"\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max))\n"
+"{\n"
+"\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
+"}\n"
+"}\n"
+"}\n"
+"\n"
+"p3_id := filter_data [12+1];\n"
+"p3_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [12+2]);\n"
+"if (filter_length = 18)\n"
+"{\n"
+"whenever not found goto get_distincts_3;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"open c3 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
+"if (res3_id > res_id_max) res_id_max := res3_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max))\n"
+"{\n"
+"\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
+"}\n"
+"}\n"
+"}\n"
+"\n"
+"p4_id := filter_data [16+1];\n"
+"p4_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [16+2]);\n"
+"if (filter_length = 22)\n"
+"{\n"
+"whenever not found goto get_distincts_4;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"open c3 (prefetch 1);\n"
+"open c4 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
+"if (res3_id > res_id_max) res_id_max := res3_id;\n"
+"while (res4_id < res_id_max) fetch c4 into res4_id;\n"
+"if (res4_id > res_id_max) res_id_max := res4_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max) and (res4_id = res_id_max))\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
+"}\n"
+"}\n"
+"\n"
+"get_distincts_4:\n"
+"\n"
+"close c4;\n"
+"get_distincts_3:\n"
+"\n"
+"close c3;\n"
+"get_distincts_2:\n"
+"\n"
+"close c2;\n"
+"get_distincts_1:\n"
+"\n"
+"close c1;\n"
+"get_distincts_0:\n"
+"\n"
+"close c0;\n"
+"\n"
+"\n"
+"whenever not found goto nf_c_last2;\n"
+"open c_last2 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"fetch c_last2 into res_last_id, v_last;\n"
+"if (v_max is null or (v_last > v_max))\n"
+"{\n"
+"\n"
+"if (dict_get (hit_ids, res_last_id, 0))\n"
+"{\n"
+"\n"
+"v_max := v_last;\n"
+"dict_put (distval_dict, v_last, 1);\n"
+"}\n"
+"}\n"
+"}\n"
+"nf_c_last2:\n"
+"close c_last2;\n"
+"}\n"
+"--src DET_CatFilter.sql:756\n";
-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"
+static const char *proc405 =
+"#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"
-"declare filter_length, p0_id, p1_id, p2_id, p3_id, p4_id, res0_id, res1_id, res2_id, res3_id, res4_id, res_last_id, res_id_max integer;\n"
-"declare plast_id integer;\n"
-"declare p0_val, p1_val, p2_val, p3_val, p4_val, v_last, v_max varchar;\n"
+"declare filter_length, p0_id, p1_id, p2_id, p3_id, p4_id, res0_id, res1_id, res2_id, res3_id, res4_id, res_id_max integer;\n"
+"declare acc any;\n"
+"declare p0_val, p1_val, p2_val, p3_val, p4_val varchar;\n"
+"declare acl_bits any;\n"
"declare auth_gid integer;\n"
-"declare acl_bits, hit_ids any;\n"
-"declare c_last1 cursor for select DRI_CATVALUE from WS.WS.SYS_DAV_RDF_INVERSE\n"
-"where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = plast_id and (v_max is null or DRI_CATVALUE > v_max) and\n"
-"exists (select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = DRI_RES_ID and case (DAV_CHECK_PERM (RES_PERMS, \'1__\', auth_uid, auth_gid, RES_GROUP, RES_OWNER)) when 0 then WS.WS.ACL_IS_GRANTED (RES_ACL, auth_uid, acl_bits) else 1 end);\n"
-"declare c_last2 cursor for select DRI_RES_ID, DRI_CATVALUE from WS.WS.SYS_DAV_RDF_INVERSE\n"
-"where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = plast_id and (v_max is null or DRI_CATVALUE > v_max) and\n"
+"declare c0 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p0_id and DRI_CATVALUE = p0_val and DRI_RES_ID >= res_id_max and\n"
"exists (select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = DRI_RES_ID and case (DAV_CHECK_PERM (RES_PERMS, \'1__\', auth_uid, auth_gid, RES_GROUP, RES_OWNER)) when 0 then WS.WS.ACL_IS_GRANTED (RES_ACL, auth_uid, acl_bits) else 1 end);\n"
-"declare c0 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p0_id and DRI_CATVALUE = p0_val and DRI_RES_ID >= res_id_max;\n"
"declare c1 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p1_id and DRI_CATVALUE = p1_val and DRI_RES_ID >= res_id_max;\n"
"declare c2 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p2_id and DRI_CATVALUE = p2_val and DRI_RES_ID >= res_id_max;\n"
"declare c3 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p3_id and DRI_CATVALUE = p3_val and DRI_RES_ID >= res_id_max;\n"
"declare c4 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p4_id and DRI_CATVALUE = p4_val and DRI_RES_ID >= res_id_max;\n"
"\n"
"filter_length := length (filter_data);\n"
-"plast_id := filter_data [filter_length - 1];\n"
+"vectorbld_init (acc);\n"
+"\n"
+"res0_id := -1;\n"
+"res1_id := -1;\n"
+"res2_id := -1;\n"
+"res3_id := -1;\n"
+"res4_id := -1;\n"
"res_id_max := 0;\n"
-"v_max := null;\n"
+"\n"
"auth_gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = auth_uid), 0);\n"
"acl_bits := DAV_REQ_CHARS_TO_BITMASK (\'1__\');\n"
"\n"
-"if (filter_length = 2)\n"
-"{\n"
-"whenever not found goto nf_c_last1;\n"
-"\n"
-"open c_last1 (prefetch 1);\n"
-"while (1)\n"
-"{\n"
-"fetch c_last1 into v_last;\n"
-"\n"
-"if (v_max is null or (v_last > v_max))\n"
-"{\n"
-"v_max := v_last;\n"
-"dict_put (distval_dict, v_last, 1);\n"
-"}\n"
-"}\n"
-"nf_c_last1:\n"
-"close c_last1;\n"
-"return;\n"
-"}\n"
-"\n"
-"res0_id := 0;\n"
-"res1_id := 0;\n"
-"res2_id := 0;\n"
-"res3_id := 0;\n"
-"res4_id := 0;\n"
-"hit_ids := dict_new ();\n"
-"\n"
"p0_id := filter_data [1];\n"
"p0_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [2]);\n"
-"if (filter_length = 6)\n"
+"if (filter_length = 4)\n"
"{\n"
"whenever not found goto get_distincts_0;\n"
"open c0 (prefetch 1);\n"
@@ -19567,37 +20280,35 @@ static const char *proc397 =
"fetch c0 into res0_id;\n"
"res_id_max := res0_id;\n"
"\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
+"vectorbld_acc (acc, res0_id);\n"
"}\n"
"}\n"
"\n"
"p1_id := filter_data [4+1];\n"
"p1_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [4+2]);\n"
-"if (filter_length = 10)\n"
+"if (filter_length = 8)\n"
"{\n"
"whenever not found goto get_distincts_1;\n"
"open c0 (prefetch 1);\n"
"open c1 (prefetch 1);\n"
"while (1)\n"
"{\n"
-"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
"if ((res0_id = res_id_max) and (res1_id = res_id_max))\n"
"{\n"
"\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
-"}\n"
-"else\n"
+"vectorbld_acc (acc, res0_id);\n"
"res_id_max := res_id_max + 1;\n"
-"\n"
+"}\n"
"}\n"
"}\n"
"\n"
"p2_id := filter_data [8+1];\n"
"p2_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [8+2]);\n"
-"if (filter_length = 14)\n"
+"if (filter_length = 12)\n"
"{\n"
"whenever not found goto get_distincts_2;\n"
"open c0 (prefetch 1);\n"
@@ -19605,28 +20316,24 @@ static const char *proc397 =
"open c2 (prefetch 1);\n"
"while (1)\n"
"{\n"
-"\n"
-"\n"
-"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
-"\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"\n"
"if (res1_id > res_id_max) res_id_max := res1_id;\n"
"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"\n"
"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max))\n"
"{\n"
"\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
+"vectorbld_acc (acc, res0_id);\n"
+"res_id_max := res_id_max + 1;\n"
"}\n"
"}\n"
"}\n"
"\n"
"p3_id := filter_data [12+1];\n"
"p3_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [12+2]);\n"
-"if (filter_length = 18)\n"
+"if (filter_length = 16)\n"
"{\n"
"whenever not found goto get_distincts_3;\n"
"open c0 (prefetch 1);\n"
@@ -19635,25 +20342,26 @@ static const char *proc397 =
"open c3 (prefetch 1);\n"
"while (1)\n"
"{\n"
-"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
"if (res1_id > res_id_max) res_id_max := res1_id;\n"
"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
"if (res2_id > res_id_max) res_id_max := res2_id;\n"
"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
"if (res3_id > res_id_max) res_id_max := res3_id;\n"
+"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max))\n"
"{\n"
"\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
+"vectorbld_acc (acc, res0_id);\n"
+"res_id_max := res_id_max + 1;\n"
"}\n"
"}\n"
"}\n"
"\n"
"p4_id := filter_data [16+1];\n"
"p4_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [16+2]);\n"
-"if (filter_length = 22)\n"
+"if (filter_length = 20)\n"
"{\n"
"whenever not found goto get_distincts_4;\n"
"open c0 (prefetch 1);\n"
@@ -19663,8 +20371,6 @@ static const char *proc397 =
"open c4 (prefetch 1);\n"
"while (1)\n"
"{\n"
-"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
"if (res1_id > res_id_max) res_id_max := res1_id;\n"
"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
@@ -19673,3075 +20379,3659 @@ static const char *proc397 =
"if (res3_id > res_id_max) res_id_max := res3_id;\n"
"while (res4_id < res_id_max) fetch c4 into res4_id;\n"
"if (res4_id > res_id_max) res_id_max := res4_id;\n"
+"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max) and (res4_id = res_id_max))\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
+"{\n"
+"\n"
+"vectorbld_acc (acc, res0_id);\n"
+"res_id_max := res_id_max + 1;\n"
+"}\n"
"}\n"
"}\n"
"\n"
"get_distincts_4:\n"
-"\n"
"close c4;\n"
"get_distincts_3:\n"
-"\n"
"close c3;\n"
"get_distincts_2:\n"
-"\n"
"close c2;\n"
"get_distincts_1:\n"
-"\n"
"close c1;\n"
"get_distincts_0:\n"
-"\n"
"close c0;\n"
"\n"
+"finalize:\n"
+"vectorbld_final (acc);\n"
"\n"
-"whenever not found goto nf_c_last2;\n"
-"open c_last2 (prefetch 1);\n"
-"while (1)\n"
+"return acc;\n"
+"}\n"
+"--src DET_CatFilter.sql:971\n";
+
+static const char *proc406 =
+"#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"
+"\n"
+"foreach (any val in vals) do\n"
+"{\n"
+"\n"
+"dict_put (dict, \"CatFilter_ENCODE_CATVALUE\" (cast (val as varchar)), 1);\n"
+"}\n"
+"return 1;\n"
+"}\n"
+"--src DET_CatFilter.sql:1139\n";
+
+static const char *proc407 =
+"#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"
+"declare prop_catnames, filter, res any;\n"
+"\n"
+"declare len, ctr integer;\n"
+"declare execstate, execmessage varchar;\n"
+"declare execmeta, execrows any;\n"
+"declare qry_ft, qry_where, qry_text varchar;\n"
+"\n"
+"declare pred_metas, cmp_metas, table_metas any;\n"
+"declare used_tables any;\n"
+"declare dict any;\n"
+"declare auth_gid integer;\n"
+"\n"
+"\n"
+"dict := dict_new ();\n"
+"\n"
+"if ((length (get_keyword (\'\', rfc_list_cond)) = 0) and (length (filter_data) > 0) and (length (filter_data) <= 22))\n"
+"{\n"
+"\"CatFilter_GET_RDF_INVERSE_HITS_DISTVALS\" (cfc_id, filter_data, dict, auth_uid);\n"
+"goto plain_resources_passed;\n"
+"}\n"
+"\n"
+"len := length (filter_data);\n"
+"vectorbld_init (filter);\n"
+"\"CatFilter_ACC_FILTER_DATA\" (filter, filter_data);\n"
+"vectorbld_concat_acc (filter, get_keyword (\'\', rfc_list_cond));\n"
+"vectorbld_final (filter);\n"
+"\n"
+"\n"
+"DAV_FC_PRED_METAS (pred_metas);\n"
+"DAV_FC_CMP_METAS (cmp_metas);\n"
+"DAV_FC_TABLE_METAS (table_metas);\n"
+"qry_ft := sprintf (\'virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]]/virt:value\', filter_data [len-2]);\n"
+"used_tables := vector (\n"
+"\'SYS_DAV_RES\', vector (\'SYS_DAV_RES\', \'_top\', null, vector(), vector(), vector()),\n"
+"\'SYS_DAV_PROP, PROP_NAME=http://local.virt/DAV-RDF\', vector (\'SYS_DAV_PROP\', \'_rdf\', \'(_rdf.PROP_NAME = \'\'http://local.virt/DAV-RDF\'\')\', vector(), vector(), vector(\'[\' || qry_ft || \']\'))\n"
+");\n"
+"qry_where := DAV_FC_PRINT_WHERE_INT (filter, pred_metas, cmp_metas, table_metas, used_tables,\n"
+"coalesce ((select COL_OWNER from WS.WS.SYS_DAV_COL where COL_ID = detcol_id), -1) );\n"
+"\n"
+"auth_gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = auth_uid), 0);\n"
+"\n"
+"\n"
+"qry_text := \'\n"
+"select count ( \"CatFilter_LIST_PROP_DISTVALS_AUX\" (?, _top.RES_FULL_PATH,\n"
+"xpath_eval (\'\'[xmlns:virt=\"virt\"] /\' || qry_ft ||\'\'\',\n"
+"xml_tree_doc (deserialize (cast (_rdf.PROP_VALUE as varchar))),\n"
+"0 ) ) )\n"
+"from WS.WS.SYS_DAV_RES as _top\n"
+"\' || qry_where || \' and\n"
+"(_top.RES_FULL_PATH between \' || WS.WS.STR_SQL_APOS (rfc_spath) || \' and \' || WS.WS.STR_SQL_APOS (DAV_COL_PATH_BOUNDARY (rfc_spath)) || \') and\n"
+"case (DAV_CHECK_PERM (_top.RES_PERMS, \'\'1__\'\', ?, ?, _top.RES_GROUP, _top.RES_OWNER)) when 0 then WS.WS.ACL_IS_GRANTED (_top.RES_ACL, ?, DAV_REQ_CHARS_TO_BITMASK (\'\'1__\'\')) else 1 end\n"
+"\';\n"
+"\n"
+"exec (qry_text,\n"
+"execstate, execmessage, vector (dict, auth_uid, auth_gid, auth_uid), 1, execmeta, execrows );\n"
+"\n"
+"\n"
+"plain_resources_passed:\n"
+"for\n"
+"select CFD_DET_SUBCOL_ID, CFD_DET from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_CF_ID = cfc_id\n"
+"do\n"
+"{\n"
+"if (exists (select top 1 1 from SYS_PROCEDURES where P_NAME = fix_identifier_case(\'DB.DBA.\') || CFD_DET || \'_CF_LIST_PROP_DISTVALS\'))\n"
+"call (CFD_DET || \'_CF_LIST_PROP_DISTVALS\') (CFD_DET_SUBCOL_ID, cfc_id, rfc_spath, rfc_list_cond, schema_uri, filter_data, dict, auth_uid);\n"
+"}\n"
+"return dict_list_keys (dict, 1);\n"
+"}\n"
+"--src DET_CatFilter.sql:1151\n";
+
+static const char *proc408 =
+"#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"
+"declare cfc_id integer;\n"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_del_action any;\n"
+"declare davpath, prev_raw_name, schema_uri, subcol_perms varchar;\n"
+"declare depth integer;\n"
+"declare res, resources, itm, reps, filter_data any;\n"
+"declare ctr, itm_ctr, itm_count, prev_is_patched, set_readonly integer;\n"
+"declare filter any;\n"
+"\n"
+"vectorbld_init (res);\n"
+"filter_data := null;\n"
+"if (0 > \"CatFilter_GET_CONDITION\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"{\n"
+"\n"
+"goto final_res;\n"
+"}\n"
+"subcol_perms := coalesce ((select COL_PERMS from WS.WS.SYS_DAV_COL where COL_ID = detcol_id), \'000000000N\');\n"
+"subcol_perms[2] := 48; subcol_perms[5] := 48; subcol_perms[8] := 48;\n"
+"if (1 < length(path_parts))\n"
+"{\n"
+"if (\"CatFilter_PATH_PARTS_TO_FILTER\" (path_parts, schema_uri, filter_data) < 0)\n"
+"{\n"
+"\n"
+"goto final_res;\n"
+"}\n"
+"}\n"
+"else\n"
+"filter_data := null;\n"
+"set_readonly := 0;\n"
+"if (length (rfc_del_action) < length (rfc_list_cond))\n"
+"{\n"
+"\n"
+"set_readonly := 1;\n"
+"}\n"
+"else\n"
+"if (-1 = recursive)\n"
+"{\n"
+"if ((2 = length(path_parts)) or (mod (length (filter_data), 4) = 2))\n"
+"set_readonly := 1;\n"
+"}\n"
+"else\n"
"{\n"
-"fetch c_last2 into res_last_id, v_last;\n"
-"if (v_max is null or (v_last > v_max))\n"
+"if ((1 = length(path_parts)) or (mod (length (filter_data), 4) = 0))\n"
+"set_readonly := 1;\n"
+"}\n"
+"if (set_readonly)\n"
"{\n"
+"subcol_perms[1] := 48; subcol_perms[4] := 48; subcol_perms[7] := 48;\n"
+"}\n"
+"depth := length(path_parts);\n"
"\n"
-"if (dict_get (hit_ids, res_last_id, 0))\n"
+"if (1 = length(path_parts))\n"
"{\n"
+"declare schemas any;\n"
"\n"
-"v_max := v_last;\n"
-"dict_put (distval_dict, v_last, 1);\n"
-"}\n"
+"if (\'\' <> path_parts[0])\n"
+"{\n"
+"\n"
+"return vector();\n"
"}\n"
+"schemas := \"CatFilter_LIST_SCHEMAS\" (rfc_spath, rfc_list_cond, auth_uid);\n"
+"foreach (any sch in schemas) do\n"
+"{\n"
+"declare subcol_fullpath varchar;\n"
+"subcol_fullpath := DAV_CONCAT_PATH (detcol_path, sch[1] || \'/\');\n"
+"vectorbld_acc (res,\n"
+"vector (subcol_fullpath, \'C\', 0, now (),\n"
+"vector (UNAME\'CatFilter\', detcol_id, null, sch[0], null),\n"
+"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', sch[1]) );\n"
+"if (recursive > 0)\n"
+"vectorbld_concat_acc (res,\n"
+"\"CatFilter_DAV_DIR_LIST\" (detcol_id,\n"
+"vector_concat (subseq (path_parts, 0, length (path_parts) - 1), vector (sch[1], \'\')),\n"
+"detcol_path,\n"
+"name_mask, recursive, auth_uid ) );\n"
"}\n"
-"nf_c_last2:\n"
-"close c_last2;\n"
+"goto final_res;\n"
"}\n"
-"--src DET_CatFilter.sql:756\n";
-
-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"
+"if (\"CatFilter_PATH_PARTS_TO_FILTER\" (path_parts, schema_uri, filter_data) < 0)\n"
"{\n"
-"declare filter_length, p0_id, p1_id, p2_id, p3_id, p4_id, res0_id, res1_id, res2_id, res3_id, res4_id, res_id_max integer;\n"
-"declare acc any;\n"
-"declare p0_val, p1_val, p2_val, p3_val, p4_val varchar;\n"
-"declare acl_bits any;\n"
-"declare auth_gid integer;\n"
-"declare c0 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p0_id and DRI_CATVALUE = p0_val and DRI_RES_ID >= res_id_max and\n"
-"exists (select top 1 1 from WS.WS.SYS_DAV_RES where RES_ID = DRI_RES_ID and case (DAV_CHECK_PERM (RES_PERMS, \'1__\', auth_uid, auth_gid, RES_GROUP, RES_OWNER)) when 0 then WS.WS.ACL_IS_GRANTED (RES_ACL, auth_uid, acl_bits) else 1 end);\n"
-"declare c1 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p1_id and DRI_CATVALUE = p1_val and DRI_RES_ID >= res_id_max;\n"
-"declare c2 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p2_id and DRI_CATVALUE = p2_val and DRI_RES_ID >= res_id_max;\n"
-"declare c3 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p3_id and DRI_CATVALUE = p3_val and DRI_RES_ID >= res_id_max;\n"
-"declare c4 cursor for select DRI_RES_ID from WS.WS.SYS_DAV_RDF_INVERSE where DRI_CATF_ID = cfc_id and DRI_PROP_CATID = p4_id and DRI_CATVALUE = p4_val and DRI_RES_ID >= res_id_max;\n"
-"\n"
-"filter_length := length (filter_data);\n"
-"vectorbld_init (acc);\n"
"\n"
-"res0_id := -1;\n"
-"res1_id := -1;\n"
-"res2_id := -1;\n"
-"res3_id := -1;\n"
-"res4_id := -1;\n"
-"res_id_max := 0;\n"
+"goto final_res;\n"
+"}\n"
"\n"
-"auth_gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = auth_uid), 0);\n"
-"acl_bits := DAV_REQ_CHARS_TO_BITMASK (\'1__\');\n"
"\n"
-"p0_id := filter_data [1];\n"
-"p0_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [2]);\n"
-"if (filter_length = 4)\n"
+"if (mod (length (filter_data), 4) = 2)\n"
"{\n"
-"whenever not found goto get_distincts_0;\n"
-"open c0 (prefetch 1);\n"
-"while (1)\n"
+"declare distvals any;\n"
+"\n"
+"distvals := \"CatFilter_LIST_PROP_DISTVALS\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, schema_uri, filter_data, auth_uid);\n"
+"if (-1 = recursive)\n"
"{\n"
-"while (res0_id <= res_id_max)\n"
-"fetch c0 into res0_id;\n"
-"res_id_max := res0_id;\n"
"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"}\n"
-"}\n"
"\n"
-"p1_id := filter_data [4+1];\n"
-"p1_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [4+2]);\n"
-"if (filter_length = 8)\n"
+"return vector (\n"
+"vector (DAV_CONCAT_PATH (detcol_path, path_parts), \'C\', 0, now (),\n"
+"vector (UNAME\'CatFilter\', detcol_id, null, schema_uri, filter_data),\n"
+"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', path_parts [depth - 2] ) );\n"
+"}\n"
+"foreach (varchar val in distvals) do\n"
"{\n"
-"whenever not found goto get_distincts_1;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"while (1)\n"
+"declare subcol_fullpath varchar;\n"
+"subcol_fullpath := DAV_CONCAT_PATH ( DAV_CONCAT_PATH (detcol_path, path_parts), val || \'/\');\n"
+"vectorbld_acc (res,\n"
+"vector (subcol_fullpath, \'C\', 0, now (),\n"
+"vector (UNAME\'CatFilter\', detcol_id, null, schema_uri, vector_concat (filter_data, vector (val))),\n"
+"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', val) );\n"
+"if (recursive > 0)\n"
+"vectorbld_concat_acc (res,\n"
+"\"CatFilter_DAV_DIR_LIST\" (detcol_id,\n"
+"vector_concat (subseq (path_parts, 0, length (path_parts) - 1), vector (val, \'\')),\n"
+"detcol_path,\n"
+"name_mask, recursive, auth_uid ) );\n"
+"}\n"
+"goto final_res;\n"
+"}\n"
+"else if (length (filter_data) <= 16)\n"
"{\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max))\n"
+"declare sch_props any;\n"
+"\n"
+"sch_props := \"CatFilter_LIST_SCHEMA_PROPS\" (rfc_spath, rfc_list_cond, schema_uri, filter_data, auth_uid);\n"
+"if (-1 = recursive)\n"
"{\n"
"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"res_id_max := res_id_max + 1;\n"
+"\n"
+"return vector (\n"
+"vector (DAV_CONCAT_PATH (detcol_path, path_parts), \'C\', 0, now (),\n"
+"vector (UNAME\'CatFilter\', detcol_id, null, schema_uri, filter_data),\n"
+"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', path_parts [depth - 2] ) );\n"
"}\n"
+"\n"
+"\n"
+"\n"
+"if (length (filter_data) >= 4)\n"
+"recursive := 0;\n"
+"foreach (any prop in sch_props) do\n"
+"{\n"
+"declare subcol_fullpath varchar;\n"
+"subcol_fullpath := DAV_CONCAT_PATH (DAV_CONCAT_PATH (detcol_path, path_parts), prop[1] || \'/\');\n"
+"vectorbld_acc (res,\n"
+"vector (subcol_fullpath, \'C\', 0, now (),\n"
+"vector (UNAME\'CatFilter\', detcol_id, null, prop[0], null),\n"
+"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', prop[1]) );\n"
+"if (recursive > 0)\n"
+"vectorbld_concat_acc (res,\n"
+"\"CatFilter_DAV_DIR_LIST\" (detcol_id,\n"
+"vector_concat (subseq (path_parts, 0, length (path_parts) - 1), vector (prop[1], \'\')),\n"
+"detcol_path,\n"
+"name_mask, recursive, auth_uid ) );\n"
"}\n"
"}\n"
"\n"
-"p2_id := filter_data [8+1];\n"
-"p2_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [8+2]);\n"
-"if (filter_length = 12)\n"
-"{\n"
-"whenever not found goto get_distincts_2;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"while (1)\n"
-"{\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max))\n"
+"if (0 = length (filter_data))\n"
"{\n"
"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"res_id_max := res_id_max + 1;\n"
-"}\n"
-"}\n"
+"goto final_res;\n"
"}\n"
"\n"
-"p3_id := filter_data [12+1];\n"
-"p3_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [12+2]);\n"
-"if (filter_length = 16)\n"
-"{\n"
-"whenever not found goto get_distincts_3;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"open c3 (prefetch 1);\n"
-"while (1)\n"
+"if ((length (get_keyword (\'\', rfc_list_cond)) = 0) and (length (filter_data) > 0) and (length (filter_data) <= 20))\n"
"{\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
-"if (res3_id > res_id_max) res_id_max := res3_id;\n"
-"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max))\n"
+"declare res_ids, res_dir_single any;\n"
+"res_ids := \"CatFilter_GET_RDF_INVERSE_HITS_RES_IDS\" (cfc_id, filter_data, auth_uid);\n"
+"\n"
+"itm_count := length (res_ids);\n"
+"vectorbld_init (resources);\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
"{\n"
+"declare r_id integer;\n"
+"r_id := res_ids [itm_ctr];\n"
+"res_dir_single := coalesce ((\n"
+"select\n"
"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"res_id_max := res_id_max + 1;\n"
+"vector (DAV_CONCAT_PATH (detcol_path, RES_NAME), \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
+"\n"
+"r_id, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME )\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = r_id ) );\n"
+"if (res_dir_single is not null)\n"
+"vectorbld_acc (resources, res_dir_single);\n"
"}\n"
+"for select CFD_DET_SUBCOL_ID, CFD_DET from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_CF_ID = cfc_id do\n"
+"{\n"
+"declare det_res_ids any;\n"
+"if (exists (select top 1 1 from SYS_PROCEDURES where P_NAME = fix_identifier_case(\'DB.DBA.\') || CFD_DET || \'_CF_GET_RDF_HITS\'))\n"
+"{\n"
+"det_res_ids := call (CFD_DET || \'_CF_GET_RDF_HITS\') (CFD_DET_SUBCOL_ID, cfc_id, rfc_spath, rfc_list_cond, schema_uri, filter_data, detcol_path, 1, auth_uid);\n"
+"vectorbld_concat_acc (resources, det_res_ids);\n"
"}\n"
"}\n"
-"\n"
-"p4_id := filter_data [16+1];\n"
-"p4_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [16+2]);\n"
-"if (filter_length = 20)\n"
-"{\n"
-"whenever not found goto get_distincts_4;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"open c3 (prefetch 1);\n"
-"open c4 (prefetch 1);\n"
-"while (1)\n"
+"vectorbld_final (resources);\n"
+"}\n"
+"else\n"
"{\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
-"if (res3_id > res_id_max) res_id_max := res3_id;\n"
-"while (res4_id < res_id_max) fetch c4 into res4_id;\n"
-"if (res4_id > res_id_max) res_id_max := res4_id;\n"
-"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max) and (res4_id = res_id_max))\n"
+"vectorbld_init (filter);\n"
+"\"CatFilter_ACC_FILTER_DATA\" (filter, filter_data);\n"
+"vectorbld_concat_acc (filter, get_keyword (\'\', rfc_list_cond));\n"
+"\n"
+"if (\'%\' <> name_mask)\n"
"{\n"
"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"res_id_max := res_id_max + 1;\n"
+"vectorbld_acc (filter, vector (\'RES_NAME\', \'like\', name_mask));\n"
+"}\n"
+"vectorbld_final (filter);\n"
+"filter := vector (\'\', filter);\n"
+"resources := DAV_DIR_FILTER_INT (rfc_spath, 1, filter, null, null, auth_uid);\n"
"}\n"
+"reps := dict_new ();\n"
+"itm_count := length (resources);\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
+"{\n"
+"declare rname varchar;\n"
+"declare orig_id any;\n"
+"itm := resources [itm_ctr];\n"
+"rname := itm [10];\n"
+"orig_id := itm[4];\n"
+"if (isarray (orig_id) or regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', rname, 0))\n"
+"resources [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
+"dict_put (reps, rname, dict_get (reps, rname, 0) + 1);\n"
"}\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
+"{\n"
+"declare rname varchar;\n"
+"declare orig_id integer;\n"
+"itm := resources [itm_ctr];\n"
+"rname := itm [10];\n"
+"orig_id := itm[4];\n"
+"resources[itm_ctr][4] := vector (UNAME\'CatFilter\', detcol_id, orig_id);\n"
+"if (dict_get (reps, rname, 0) > 1)\n"
+"resources [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
+"resources[itm_ctr][0] := DAV_CONCAT_PATH (DAV_CONCAT_PATH (detcol_path, path_parts), rname);\n"
"}\n"
+"vectorbld_concat_acc (res, resources);\n"
"\n"
-"get_distincts_4:\n"
-"close c4;\n"
-"get_distincts_3:\n"
-"close c3;\n"
-"get_distincts_2:\n"
-"close c2;\n"
-"get_distincts_1:\n"
-"close c1;\n"
-"get_distincts_0:\n"
-"close c0;\n"
"\n"
-"finalize:\n"
-"vectorbld_final (acc);\n"
+"final_res:\n"
+"vectorbld_final (res);\n"
"\n"
-"return acc;\n"
+"\n"
+"return res;\n"
"}\n"
-"--src DET_CatFilter.sql:971\n";
+"--src DET_CatFilter.sql:1222\n";
-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"
+static const char *proc409 =
+"#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"
+"declare cfc_id integer;\n"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_del_action any;\n"
+"declare davpath, prev_raw_name varchar;\n"
+"declare res, itm, reps any;\n"
+"declare itm_ctr, itm_count, prev_is_patched integer;\n"
"\n"
-"foreach (any val in vals) do\n"
+"if (0 > \"CatFilter_GET_CONDITION\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
"{\n"
"\n"
-"dict_put (dict, \"CatFilter_ENCODE_CATVALUE\" (cast (val as varchar)), 1);\n"
+"return vector();\n"
"}\n"
-"return 1;\n"
+"if (0 = length (get_keyword (\'\', compilation)))\n"
+"res := DAV_DIR_FILTER_INT (rfc_spath, 1, rfc_list_cond, null, null, auth_uid);\n"
+"else\n"
+"{\n"
+"declare tmp_cond any;\n"
+"tmp_cond := vector (\'\',\n"
+"vector_concat (\n"
+"get_keyword (\'\', compilation),\n"
+"get_keyword (\'\', rfc_list_cond) ) );\n"
+"res := DAV_DIR_FILTER_INT (rfc_spath, 1, tmp_cond, null, null, auth_uid);\n"
"}\n"
-"--src DET_CatFilter.sql:1139\n";
-
-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"
+"reps := dict_new ();\n"
+"itm_count := length (res);\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
"{\n"
-"declare prop_catnames, filter, res any;\n"
-"\n"
-"declare len, ctr integer;\n"
-"declare execstate, execmessage varchar;\n"
-"declare execmeta, execrows any;\n"
-"declare qry_ft, qry_where, qry_text varchar;\n"
-"\n"
-"declare pred_metas, cmp_metas, table_metas any;\n"
-"declare used_tables any;\n"
-"declare dict any;\n"
-"declare auth_gid integer;\n"
-"\n"
-"\n"
-"dict := dict_new ();\n"
-"\n"
-"if ((length (get_keyword (\'\', rfc_list_cond)) = 0) and (length (filter_data) > 0) and (length (filter_data) <= 22))\n"
+"declare rname varchar;\n"
+"declare orig_id integer;\n"
+"itm := res [itm_ctr];\n"
+"rname := itm [10];\n"
+"orig_id := itm[4];\n"
+"if (isarray (orig_id) or regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', rname, 0))\n"
+"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
+"dict_put (reps, rname, dict_get (reps, rname, 0) + 1);\n"
+"}\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
"{\n"
-"\"CatFilter_GET_RDF_INVERSE_HITS_DISTVALS\" (cfc_id, filter_data, dict, auth_uid);\n"
-"goto plain_resources_passed;\n"
+"declare rname varchar;\n"
+"declare orig_id integer;\n"
+"itm := res [itm_ctr];\n"
+"rname := itm [10];\n"
+"orig_id := itm[4];\n"
+"res[itm_ctr][4] := vector (UNAME\'CatFilter\', detcol_id, orig_id);\n"
+"if (dict_get (reps, rname, 0) > 1)\n"
+"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
+"res[itm_ctr][0] := DAV_CONCAT_PATH (DAV_CONCAT_PATH (detcol_path, path_parts), rname);\n"
"}\n"
+"return res;\n"
+"}\n"
+"--src DET_CatFilter.sql:1467\n";
+
+static const char *proc410 =
+"#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"
+"declare cfc_id integer;\n"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_del_action any;\n"
+"declare orig_id, filter_data any;\n"
"\n"
-"len := length (filter_data);\n"
-"vectorbld_init (filter);\n"
-"\"CatFilter_ACC_FILTER_DATA\" (filter, filter_data);\n"
-"vectorbld_concat_acc (filter, get_keyword (\'\', rfc_list_cond));\n"
-"vectorbld_final (filter);\n"
-"\n"
-"\n"
-"DAV_FC_PRED_METAS (pred_metas);\n"
-"DAV_FC_CMP_METAS (cmp_metas);\n"
-"DAV_FC_TABLE_METAS (table_metas);\n"
-"qry_ft := sprintf (\'virt:rdf/virt:top-res/virt:prop[*[1][self::(!%s!)]]/virt:value\', filter_data [len-2]);\n"
-"used_tables := vector (\n"
-"\'SYS_DAV_RES\', vector (\'SYS_DAV_RES\', \'_top\', null, vector(), vector(), vector()),\n"
-"\'SYS_DAV_PROP, PROP_NAME=http://local.virt/DAV-RDF\', vector (\'SYS_DAV_PROP\', \'_rdf\', \'(_rdf.PROP_NAME = \'\'http://local.virt/DAV-RDF\'\')\', vector(), vector(), vector(\'[\' || qry_ft || \']\'))\n"
-");\n"
-"qry_where := DAV_FC_PRINT_WHERE_INT (filter, pred_metas, cmp_metas, table_metas, used_tables,\n"
-"coalesce ((select COL_OWNER from WS.WS.SYS_DAV_COL where COL_ID = detcol_id), -1) );\n"
-"\n"
-"auth_gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = auth_uid), 0);\n"
-"\n"
-"\n"
-"qry_text := \'\n"
-"select count ( \"CatFilter_LIST_PROP_DISTVALS_AUX\" (?, _top.RES_FULL_PATH,\n"
-"xpath_eval (\'\'[xmlns:virt=\"virt\"] /\' || qry_ft ||\'\'\',\n"
-"xml_tree_doc (deserialize (cast (_rdf.PROP_VALUE as varchar))),\n"
-"0 ) ) )\n"
-"from WS.WS.SYS_DAV_RES as _top\n"
-"\' || qry_where || \' and\n"
-"(_top.RES_FULL_PATH between \' || WS.WS.STR_SQL_APOS (rfc_spath) || \' and \' || WS.WS.STR_SQL_APOS (DAV_COL_PATH_BOUNDARY (rfc_spath)) || \') and\n"
-"case (DAV_CHECK_PERM (_top.RES_PERMS, \'\'1__\'\', ?, ?, _top.RES_GROUP, _top.RES_OWNER)) when 0 then WS.WS.ACL_IS_GRANTED (_top.RES_ACL, ?, DAV_REQ_CHARS_TO_BITMASK (\'\'1__\'\')) else 1 end\n"
-"\';\n"
-"\n"
-"exec (qry_text,\n"
-"execstate, execmessage, vector (dict, auth_uid, auth_gid, auth_uid), 1, execmeta, execrows );\n"
+"rfc_spath := null;\n"
+"orig_id := \"CatFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action, filter_data);\n"
+"return orig_id;\n"
+"}\n"
+"--src DET_CatFilter.sql:1522\n";
+
+static const char *proc411 =
+"#line 1538 \"[executable]/DET_CatFilter.sql\"\n"
+"create function \"CatFilter_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
+"{\n"
"\n"
+"if (\'R\' = what)\n"
+"return coalesce ((select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_ID = id[2]), null);\n"
+"if (\'C\' = what)\n"
+"{\n"
+"declare res varchar;\n"
+"res := DAV_SEARCH_PATH (id[1], \'C\');\n"
+"if (id[3] is not null)\n"
+"{\n"
"\n"
-"plain_resources_passed:\n"
-"for\n"
-"select CFD_DET_SUBCOL_ID, CFD_DET from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_CF_ID = cfc_id\n"
-"do\n"
+" ;\n"
+"}\n"
+"if (id[4] is not null)\n"
"{\n"
-"if (exists (select top 1 1 from SYS_PROCEDURES where P_NAME = fix_identifier_case(\'DB.DBA.\') || CFD_DET || \'_CF_LIST_PROP_DISTVALS\'))\n"
-"call (CFD_DET || \'_CF_LIST_PROP_DISTVALS\') (CFD_DET_SUBCOL_ID, cfc_id, rfc_spath, rfc_list_cond, schema_uri, filter_data, dict, auth_uid);\n"
+"\n"
+" ;\n"
"}\n"
-"return dict_list_keys (dict, 1);\n"
+"return res;\n"
"}\n"
-"--src DET_CatFilter.sql:1151\n";
+"\n"
+"return -14;\n"
+"}\n"
+"--src DET_CatFilter.sql:1536\n";
-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"
+static const char *proc412 =
+"#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"
"declare cfc_id integer;\n"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_del_action any;\n"
-"declare davpath, prev_raw_name, schema_uri, subcol_perms varchar;\n"
-"declare depth integer;\n"
-"declare res, resources, itm, reps, filter_data any;\n"
-"declare ctr, itm_ctr, itm_count, prev_is_patched, set_readonly integer;\n"
-"declare filter any;\n"
+"declare rfc_spath, schema_uri varchar;\n"
+"declare rfc_list_cond, rfc_del_action, filter_data, fit_cond any;\n"
+"declare rc integer;\n"
"\n"
-"vectorbld_init (res);\n"
-"filter_data := null;\n"
"if (0 > \"CatFilter_GET_CONDITION\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
"{\n"
"\n"
-"goto final_res;\n"
+"return -2;\n"
+"}\n"
+"if (length (rfc_del_action) < length (rfc_list_cond))\n"
+"{\n"
+"\n"
+"return -13;\n"
+"}\n"
+"rc := \"CatFilter_PATH_PARTS_TO_FILTER\" (path_parts, schema_uri, filter_data);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"rc := \"CatFilter_FILTER_TO_CONDITION\" (schema_uri, filter_data, fit_cond);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"fit_cond := vector (\'\', vector_concat (fit_cond, get_keyword (\'\', rfc_list_cond)));\n"
+"if (\'R\' <> what)\n"
+"return -2;\n"
+"if (\'\' = path_parts [length (path_parts) - 1])\n"
+"return -2;\n"
+"if (isinteger (source_id) and\n"
+"exists (select 1 from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = source_id and RES_NAME = path_parts [length (path_parts) - 1] and (RES_FULL_PATH between rfc_spath and DAV_COL_PATH_BOUNDARY (rfc_spath)) ) )\n"
+"{\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, fit_cond, auth_uid);\n"
+"}\n"
+"else\n"
+"{\n"
+"declare new_full_path varchar;\n"
+"new_full_path := DAV_CONCAT_PATH (rfc_spath, path_parts [length (path_parts) - 1]);\n"
+"rc := DAV_COPY_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, permissions,\n"
+"coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = uid), \'\'),\n"
+"coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = gid), \'\'),\n"
+"null, null, 0);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
+"if (DAV_HIDE_ERROR (source_id) is null)\n"
+"return source_id;\n"
+"if (not (isinteger (source_id)))\n"
+"return -13;\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, fit_cond, auth_uid);\n"
"}\n"
-"subcol_perms := coalesce ((select COL_PERMS from WS.WS.SYS_DAV_COL where COL_ID = detcol_id), \'000000000N\');\n"
-"subcol_perms[2] := 48; subcol_perms[5] := 48; subcol_perms[8] := 48;\n"
-"if (1 < length(path_parts))\n"
+"return 1;\n"
+"}\n"
+"--src DET_CatFilter.sql:1563\n";
+
+static const char *proc413 =
+"#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"
-"if (\"CatFilter_PATH_PARTS_TO_FILTER\" (path_parts, schema_uri, filter_data) < 0)\n"
+"declare cfc_id integer;\n"
+"declare rfc_spath, schema_uri varchar;\n"
+"declare rfc_list_cond, rfc_del_action, filter_data, fit_cond any;\n"
+"declare rc integer;\n"
+"\n"
+"if (0 > \"CatFilter_GET_CONDITION\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
"{\n"
"\n"
-"goto final_res;\n"
-"}\n"
+"return -2;\n"
"}\n"
-"else\n"
-"filter_data := null;\n"
-"set_readonly := 0;\n"
"if (length (rfc_del_action) < length (rfc_list_cond))\n"
"{\n"
"\n"
-"set_readonly := 1;\n"
+"return -13;\n"
"}\n"
-"else\n"
-"if (-1 = recursive)\n"
+"rc := \"CatFilter_PATH_PARTS_TO_FILTER\" (path_parts, schema_uri, filter_data);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"rc := \"CatFilter_FILTER_TO_CONDITION\" (schema_uri, filter_data, fit_cond);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"fit_cond := vector (\'\', vector_concat (fit_cond, get_keyword (\'\', rfc_list_cond)));\n"
+"if (\'R\' <> what)\n"
+"return -2;\n"
+"if (\'\' = path_parts [length (path_parts) - 1])\n"
+"return -2;\n"
+"if (isinteger (source_id) and\n"
+"exists (select 1 from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = source_id and RES_NAME = path_parts [length (path_parts) - 1] and (RES_FULL_PATH between rfc_spath and DAV_COL_PATH_BOUNDARY (rfc_spath))))\n"
"{\n"
-"if ((2 = length(path_parts)) or (mod (length (filter_data), 4) = 2))\n"
-"set_readonly := 1;\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, fit_cond, auth_uid);\n"
"}\n"
"else\n"
"{\n"
-"if ((1 = length(path_parts)) or (mod (length (filter_data), 4) = 0))\n"
-"set_readonly := 1;\n"
+"declare new_full_path varchar;\n"
+"new_full_path := DAV_CONCAT_PATH (rfc_spath, path_parts [length (path_parts) - 1]);\n"
+"rc := DAV_MOVE_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, null, null, 0, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
+"if (DAV_HIDE_ERROR (source_id) is null)\n"
+"return source_id;\n"
+"if (not (isinteger (source_id)))\n"
+"return -13;\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, fit_cond, auth_uid);\n"
"}\n"
-"if (set_readonly)\n"
-"{\n"
-"subcol_perms[1] := 48; subcol_perms[4] := 48; subcol_perms[7] := 48;\n"
+"return 1;\n"
"}\n"
-"depth := length(path_parts);\n"
-"\n"
-"if (1 = length(path_parts))\n"
-"{\n"
-"declare schemas any;\n"
-"\n"
-"if (\'\' <> path_parts[0])\n"
+"--src DET_CatFilter.sql:1619\n";
+
+static const char *proc414 =
+"#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"
"\n"
-"return vector();\n"
-"}\n"
-"schemas := \"CatFilter_LIST_SCHEMAS\" (rfc_spath, rfc_list_cond, auth_uid);\n"
-"foreach (any sch in schemas) do\n"
-"{\n"
-"declare subcol_fullpath varchar;\n"
-"subcol_fullpath := DAV_CONCAT_PATH (detcol_path, sch[1] || \'/\');\n"
-"vectorbld_acc (res,\n"
-"vector (subcol_fullpath, \'C\', 0, now (),\n"
-"vector (UNAME\'CatFilter\', detcol_id, null, sch[0], null),\n"
-"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', sch[1]) );\n"
-"if (recursive > 0)\n"
-"vectorbld_concat_acc (res,\n"
-"\"CatFilter_DAV_DIR_LIST\" (detcol_id,\n"
-"vector_concat (subseq (path_parts, 0, length (path_parts) - 1), vector (sch[1], \'\')),\n"
-"detcol_path,\n"
-"name_mask, recursive, auth_uid ) );\n"
-"}\n"
-"goto final_res;\n"
+"declare cont any;\n"
+"if ((content_mode = 0) or (content_mode = 2))\n"
+"select RES_CONTENT, RES_TYPE into content, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
+"else if (content_mode = 1)\n"
+"select http (RES_CONTENT, content), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
+"else if (content_mode = 3)\n"
+"select http (RES_CONTENT), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
+"return id[2];\n"
"}\n"
-"if (\"CatFilter_PATH_PARTS_TO_FILTER\" (path_parts, schema_uri, filter_data) < 0)\n"
+"--src DET_CatFilter.sql:1672\n";
+
+static const char *proc415 =
+"#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"
"\n"
-"goto final_res;\n"
+"return -20;\n"
"}\n"
-"\n"
-"\n"
-"if (mod (length (filter_data), 4) = 2)\n"
-"{\n"
-"declare distvals any;\n"
-"\n"
-"distvals := \"CatFilter_LIST_PROP_DISTVALS\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, schema_uri, filter_data, auth_uid);\n"
-"if (-1 = recursive)\n"
+"--src DET_CatFilter.sql:1687\n";
+
+static const char *proc416 =
+"#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"
+"declare rc, u_token, new_token varchar;\n"
"\n"
-"\n"
-"return vector (\n"
-"vector (DAV_CONCAT_PATH (detcol_path, path_parts), \'C\', 0, now (),\n"
-"vector (UNAME\'CatFilter\', detcol_id, null, schema_uri, filter_data),\n"
-"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', path_parts [depth - 2] ) );\n"
-"}\n"
-"foreach (varchar val in distvals) do\n"
-"{\n"
-"declare subcol_fullpath varchar;\n"
-"subcol_fullpath := DAV_CONCAT_PATH ( DAV_CONCAT_PATH (detcol_path, path_parts), val || \'/\');\n"
-"vectorbld_acc (res,\n"
-"vector (subcol_fullpath, \'C\', 0, now (),\n"
-"vector (UNAME\'CatFilter\', detcol_id, null, schema_uri, vector_concat (filter_data, vector (val))),\n"
-"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', val) );\n"
-"if (recursive > 0)\n"
-"vectorbld_concat_acc (res,\n"
-"\"CatFilter_DAV_DIR_LIST\" (detcol_id,\n"
-"vector_concat (subseq (path_parts, 0, length (path_parts) - 1), vector (val, \'\')),\n"
-"detcol_path,\n"
-"name_mask, recursive, auth_uid ) );\n"
-"}\n"
-"goto final_res;\n"
+"if (\'R\' <> type)\n"
+"return -20;\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
+"return -20;\n"
+"if (isarray (id))\n"
+"return DAV_LOCK_INT (path, id[2], type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, null, null, auth_uid);\n"
+"return -20;\n"
"}\n"
-"else if (length (filter_data) <= 16)\n"
+"--src DET_CatFilter.sql:1695\n";
+
+static const char *proc417 =
+"#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"
-"declare sch_props any;\n"
"\n"
-"sch_props := \"CatFilter_LIST_SCHEMA_PROPS\" (rfc_spath, rfc_list_cond, schema_uri, filter_data, auth_uid);\n"
-"if (-1 = recursive)\n"
+"if (isarray (id))\n"
+"id := id [2];\n"
+"return DAV_UNLOCK_INT (id, type, token, null, null, auth_uid);\n"
+"}\n"
+"--src DET_CatFilter.sql:1710\n";
+
+static const char *proc418 =
+"#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"
+"declare rc integer;\n"
+"declare orig_id any;\n"
+"declare orig_type char(1);\n"
"\n"
-"\n"
-"return vector (\n"
-"vector (DAV_CONCAT_PATH (detcol_path, path_parts), \'C\', 0, now (),\n"
-"vector (UNAME\'CatFilter\', detcol_id, null, schema_uri, filter_data),\n"
-"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', path_parts [depth - 2] ) );\n"
+"orig_id := id;\n"
+"id := orig_id[2];\n"
+"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if (rc <> 0)\n"
+"return rc;\n"
+"id := orig_id[1];\n"
+"orig_type := type;\n"
+"type := \'C\';\n"
+"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if (rc <> 0)\n"
+"return rc;\n"
+"id := orig_id;\n"
+"type := orig_type;\n"
+"return 0;\n"
"}\n"
-"\n"
-"\n"
-"\n"
-"if (length (filter_data) >= 4)\n"
-"recursive := 0;\n"
-"foreach (any prop in sch_props) do\n"
+"--src DET_CatFilter.sql:1720\n";
+
+static const char *proc419 =
+"#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"
-"declare subcol_fullpath varchar;\n"
-"subcol_fullpath := DAV_CONCAT_PATH (DAV_CONCAT_PATH (detcol_path, path_parts), prop[1] || \'/\');\n"
-"vectorbld_acc (res,\n"
-"vector (subcol_fullpath, \'C\', 0, now (),\n"
-"vector (UNAME\'CatFilter\', detcol_id, null, prop[0], null),\n"
-"subcol_perms, 0, auth_uid, now (), \'dav/unix-directory\', prop[1]) );\n"
-"if (recursive > 0)\n"
-"vectorbld_concat_acc (res,\n"
-"\"CatFilter_DAV_DIR_LIST\" (detcol_id,\n"
-"vector_concat (subseq (path_parts, 0, length (path_parts) - 1), vector (prop[1], \'\')),\n"
-"detcol_path,\n"
-"name_mask, recursive, auth_uid ) );\n"
+"declare res any;\n"
+"\n"
+"id := id[2];\n"
+"if (isarray (id))\n"
+"return call (cast (id[0] as varchar) || \'_DAV_LIST_LOCKS\') (id, type, recursive);\n"
+"res := vector();\n"
+"for select LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO\n"
+"from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type do {\n"
+"res := vector_concat (res, vector (vector (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)));\n"
"}\n"
+"return res;\n"
"}\n"
-"\n"
-"if (0 = length (filter_data))\n"
+"--src DET_CatFilter.sql:1744\n";
+
+static const char *proc420 =
+"#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"
+"declare cfid, rc, ctr integer;\n"
+"declare colname varchar;\n"
+"declare compilation, del_act any;\n"
+"compilation := vector (\'\', filter);\n"
+"rc := DAV_DIR_FILTER_INT (search_path, 1, compilation, auth_uname, auth_upwd, auth_uid);\n"
+"if (isinteger (rc))\n"
+"return rc;\n"
+"if (not isinteger (col))\n"
+"return -20;\n"
+"colname := DAV_SEARCH_PATH (col, \'C\');\n"
+"if (not (isstring (colname)))\n"
+"return -23;\n"
+"rc := DAV_SEARCH_ID (search_path, \'C\');\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"if (search_path <> DAV_SEARCH_PATH (rc, \'C\'))\n"
+"return -2;\n"
+"if (search_path between colname and (colname || \'\\255\\255\\255\\255\'))\n"
+"return -28;\n"
+"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-SearchPath\', search_path, null, null, 0, 1, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-ListCond\', \"ResFilter_ENCODE_FILTER\" (compilation), null, null, 0, 1, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"del_act := \"ResFilter_MAKE_DEL_ACTION_FROM_CONDITION\" (compilation);\n"
"\n"
-"goto final_res;\n"
-"}\n"
+"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-DelAction\', \"ResFilter_ENCODE_FILTER\" (del_act), null, null, 0, 1, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
"\n"
-"if ((length (get_keyword (\'\', rfc_list_cond)) = 0) and (length (filter_data) > 0) and (length (filter_data) <= 20))\n"
+"cfid := coalesce ((select CF_ID from WS.WS.SYS_DAV_CATFILTER where CF_SEARCH_PATH = search_path));\n"
+"if (cfid is null)\n"
"{\n"
-"declare res_ids, res_dir_single any;\n"
-"res_ids := \"CatFilter_GET_RDF_INVERSE_HITS_RES_IDS\" (cfc_id, filter_data, auth_uid);\n"
-"\n"
-"itm_count := length (res_ids);\n"
-"vectorbld_init (resources);\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
+"declare search_path_z varchar;\n"
+"cfid := WS.WS.GETID (\'CF\');\n"
+"insert into WS.WS.SYS_DAV_CATFILTER (CF_ID, CF_SEARCH_PATH) values (cfid, search_path);\n"
+"search_path_z := search_path || \'\\255\\255\\255\\255\';\n"
+"for (select p.PROP_VALUE, p.PROP_PARENT_ID\n"
+"from WS.WS.SYS_DAV_RES r join WS.WS.SYS_DAV_PROP p on (r.RES_ID = p.PROP_PARENT_ID)\n"
+"where (r.RES_FULL_PATH between search_path and search_path_z) and (p.PROP_NAME = \'http://local.virt/DAV-RDF\') and (p.PROP_TYPE = \'R\')) do\n"
"{\n"
-"declare r_id integer;\n"
-"r_id := res_ids [itm_ctr];\n"
-"res_dir_single := coalesce ((\n"
-"select\n"
-"\n"
-"vector (DAV_CONCAT_PATH (detcol_path, RES_NAME), \'R\', length (RES_CONTENT), RES_MOD_TIME,\n"
-"\n"
-"r_id, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME )\n"
-"from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = r_id ) );\n"
-"if (res_dir_single is not null)\n"
-"vectorbld_acc (resources, res_dir_single);\n"
+"\"CatFilter_FEED_DAV_RDF_INVERSE\" (PROP_VALUE, PROP_PARENT_ID, 0, cfid);\n"
+"ctr := ctr + 1;\n"
+"if (mod (ctr, 1000) = 0)\n"
+"commit work;\n"
"}\n"
-"for select CFD_DET_SUBCOL_ID, CFD_DET from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_CF_ID = cfc_id do\n"
+"commit work;\n"
+"for (select COL_ID, COL_DET, WS.WS.COL_PATH (COL_ID) as _c_path from WS.WS.SYS_DAV_COL where COL_DET is not null and not (COL_DET like \'%Filter\')) do\n"
"{\n"
-"declare det_res_ids any;\n"
-"if (exists (select top 1 1 from SYS_PROCEDURES where P_NAME = fix_identifier_case(\'DB.DBA.\') || CFD_DET || \'_CF_GET_RDF_HITS\'))\n"
+"if (\"LEFT\" (_c_path, length (search_path)) = search_path)\n"
"{\n"
-"det_res_ids := call (CFD_DET || \'_CF_GET_RDF_HITS\') (CFD_DET_SUBCOL_ID, cfc_id, rfc_spath, rfc_list_cond, schema_uri, filter_data, detcol_path, 1, auth_uid);\n"
-"vectorbld_concat_acc (resources, det_res_ids);\n"
+"insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET)\n"
+"values (cfid, COL_ID, COL_DET);\n"
"}\n"
"}\n"
-"vectorbld_final (resources);\n"
"}\n"
-"else\n"
-"{\n"
-"vectorbld_init (filter);\n"
-"\"CatFilter_ACC_FILTER_DATA\" (filter, filter_data);\n"
-"vectorbld_concat_acc (filter, get_keyword (\'\', rfc_list_cond));\n"
-"\n"
-"if (\'%\' <> name_mask)\n"
-"{\n"
"\n"
-"vectorbld_acc (filter, vector (\'RES_NAME\', \'like\', name_mask));\n"
-"}\n"
-"vectorbld_final (filter);\n"
-"filter := vector (\'\', filter);\n"
-"resources := DAV_DIR_FILTER_INT (rfc_spath, 1, filter, null, null, auth_uid);\n"
-"}\n"
-"reps := dict_new ();\n"
-"itm_count := length (resources);\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
-"{\n"
-"declare rname varchar;\n"
-"declare orig_id any;\n"
-"itm := resources [itm_ctr];\n"
-"rname := itm [10];\n"
-"orig_id := itm[4];\n"
-"if (isarray (orig_id) or regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', rname, 0))\n"
-"resources [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
-"dict_put (reps, rname, dict_get (reps, rname, 0) + 1);\n"
-"}\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
-"{\n"
-"declare rname varchar;\n"
-"declare orig_id integer;\n"
-"itm := resources [itm_ctr];\n"
-"rname := itm [10];\n"
-"orig_id := itm[4];\n"
-"resources[itm_ctr][4] := vector (UNAME\'CatFilter\', detcol_id, orig_id);\n"
-"if (dict_get (reps, rname, 0) > 1)\n"
-"resources [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
-"resources[itm_ctr][0] := DAV_CONCAT_PATH (DAV_CONCAT_PATH (detcol_path, path_parts), rname);\n"
-"}\n"
-"vectorbld_concat_acc (res, resources);\n"
"\n"
"\n"
-"final_res:\n"
-"vectorbld_final (res);\n"
"\n"
+"rc := DAV_PROP_SET_INT (colname, \'virt:CatFilter-ID\', cast (cfid as varchar), null, null, 0, 1, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"update WS.WS.SYS_DAV_COL set COL_DET=\'CatFilter\' where COL_ID=col;\n"
"\n"
-"return res;\n"
+"return 0;\n"
"}\n"
-"--src DET_CatFilter.sql:1222\n";
+"--src DET_CatFilter.sql:1761\n";
-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"
-"declare cfc_id integer;\n"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_del_action any;\n"
-"declare davpath, prev_raw_name varchar;\n"
-"declare res, itm, reps any;\n"
-"declare itm_ctr, itm_count, prev_is_patched integer;\n"
-"\n"
-"if (0 > \"CatFilter_GET_CONDITION\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
+static const char *proc421 =
+"#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"
+"declare resfullpath, path_head, pv varchar;\n"
+"declare doc any;\n"
+"declare triplets any;\n"
"\n"
-"return vector();\n"
-"}\n"
-"if (0 = length (get_keyword (\'\', compilation)))\n"
-"res := DAV_DIR_FILTER_INT (rfc_spath, 1, rfc_list_cond, null, null, auth_uid);\n"
+"if (126 = __tag (propval))\n"
+"pv := blob_to_string (propval);\n"
"else\n"
"{\n"
-"declare tmp_cond any;\n"
-"tmp_cond := vector (\'\',\n"
-"vector_concat (\n"
-"get_keyword (\'\', compilation),\n"
-"get_keyword (\'\', rfc_list_cond) ) );\n"
-"res := DAV_DIR_FILTER_INT (rfc_spath, 1, tmp_cond, null, null, auth_uid);\n"
-"}\n"
-"reps := dict_new ();\n"
-"itm_count := length (res);\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
-"{\n"
-"declare rname varchar;\n"
-"declare orig_id integer;\n"
-"itm := res [itm_ctr];\n"
-"rname := itm [10];\n"
-"orig_id := itm[4];\n"
-"if (isarray (orig_id) or regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', rname, 0))\n"
-"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
-"dict_put (reps, rname, dict_get (reps, rname, 0) + 1);\n"
+"if ((not isstring (propval)) or (propval = \'\'))\n"
+"return;\n"
+"pv := propval;\n"
"}\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
+"if (193 <> pv[0])\n"
+"return;\n"
+"doc := null;\n"
+"if (cfid is not null)\n"
"{\n"
-"declare rname varchar;\n"
-"declare orig_id integer;\n"
-"itm := res [itm_ctr];\n"
-"rname := itm [10];\n"
-"orig_id := itm[4];\n"
-"res[itm_ctr][4] := vector (UNAME\'CatFilter\', detcol_id, orig_id);\n"
-"if (dict_get (reps, rname, 0) > 1)\n"
-"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
-"res[itm_ctr][0] := DAV_CONCAT_PATH (DAV_CONCAT_PATH (detcol_path, path_parts), rname);\n"
-"}\n"
-"return res;\n"
+"path_head := \'/\';\n"
+"goto cfid_found;\n"
"}\n"
-"--src DET_CatFilter.sql:1467\n";
-
-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"
+"else\n"
"{\n"
-"declare cfc_id integer;\n"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_del_action any;\n"
-"declare orig_id, filter_data any;\n"
-"\n"
-"rfc_spath := null;\n"
-"orig_id := \"CatFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action, filter_data);\n"
-"return orig_id;\n"
+"resfullpath := coalesce ((select r.RES_FULL_PATH from WS.WS.SYS_DAV_RES r where r.RES_ID = propparent));\n"
+"if (resfullpath is null)\n"
+"return;\n"
+"path_head := subseq (resfullpath, 0, strrchr (resfullpath, \'/\'));\n"
"}\n"
-"--src DET_CatFilter.sql:1522\n";
-
-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"
-"\n"
-"if (\'R\' = what)\n"
-"return coalesce ((select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_ID = id[2]), null);\n"
-"if (\'C\' = what)\n"
-"{\n"
-"declare res varchar;\n"
-"res := DAV_SEARCH_PATH (id[1], \'C\');\n"
-"if (id[3] is not null)\n"
-"{\n"
"\n"
-" ;\n"
-"}\n"
-"if (id[4] is not null)\n"
+"next_cfid:\n"
+"while (1)\n"
"{\n"
-"\n"
-" ;\n"
-"}\n"
-"return res;\n"
-"}\n"
-"\n"
-"return -14;\n"
+"if (length (path_head) <= 1)\n"
+"return;\n"
+"cfid := coalesce ((select CF_ID from WS.WS.SYS_DAV_CATFILTER where CF_SEARCH_PATH = (path_head || \'/\')));\n"
+"path_head := subseq (path_head, 0, strrchr (path_head, \'/\'));\n"
+"if (cfid is not null)\n"
+"goto cfid_found;\n"
"}\n"
-"--src DET_CatFilter.sql:1536\n";
-
-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"
-"declare cfc_id integer;\n"
-"declare rfc_spath, schema_uri varchar;\n"
-"declare rfc_list_cond, rfc_del_action, filter_data, fit_cond any;\n"
-"declare rc integer;\n"
"\n"
-"if (0 > \"CatFilter_GET_CONDITION\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"cfid_found:\n"
+"if (doc is null)\n"
"{\n"
-"\n"
-"return -2;\n"
+"doc := deserialize (pv);\n"
+"if (0 = length (doc))\n"
+"return;\n"
+"doc := xml_tree_doc (doc);\n"
"}\n"
-"if (length (rfc_del_action) < length (rfc_list_cond))\n"
-"{\n"
"\n"
-"return -13;\n"
-"}\n"
-"rc := \"CatFilter_PATH_PARTS_TO_FILTER\" (path_parts, schema_uri, filter_data);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"rc := \"CatFilter_FILTER_TO_CONDITION\" (schema_uri, filter_data, fit_cond);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"fit_cond := vector (\'\', vector_concat (fit_cond, get_keyword (\'\', rfc_list_cond)));\n"
-"if (\'R\' <> what)\n"
-"return -2;\n"
-"if (\'\' = path_parts [length (path_parts) - 1])\n"
-"return -2;\n"
-"if (isinteger (source_id) and\n"
-"exists (select 1 from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = source_id and RES_NAME = path_parts [length (path_parts) - 1] and (RES_FULL_PATH between rfc_spath and DAV_COL_PATH_BOUNDARY (rfc_spath)) ) )\n"
+"triplets := xpath_eval (\'[xmlns:virt=\"virt\"] /virt:rdf/virt:top-res/virt:prop[virt:value]\', doc, 0);\n"
+"foreach (any prop in triplets) do\n"
+"{\n"
+"declare propname varchar;\n"
+"declare prop_catid integer;\n"
+"propname := cast (xpath_eval (\'name(*[1])\', prop) as varchar);\n"
+"prop_catid := coalesce ((select RPN_CATID from WS.WS.SYS_RDF_PROP_NAME where RPN_URI = propname));\n"
+"if (prop_catid is null)\n"
"{\n"
-"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, fit_cond, auth_uid);\n"
+"prop_catid := WS.WS.GETID (\'RPN\');\n"
+"\n"
+"insert into WS.WS.SYS_RDF_PROP_NAME (RPN_URI, RPN_CATID) values (propname, prop_catid);\n"
"}\n"
+"if (is_del)\n"
+"delete from WS.WS.SYS_DAV_RDF_INVERSE\n"
+"where\n"
+"(DRI_CATF_ID = cfid) and (DRI_PROP_CATID = prop_catid) and\n"
+"(DRI_CATVALUE = \"CatFilter_ENCODE_CATVALUE\" (cast (xpath_eval (\'[xmlns:virt=\"virt\"] virt:value\', prop) as varchar))) and\n"
+"(DRI_RES_ID = propparent);\n"
"else\n"
-"{\n"
-"declare new_full_path varchar;\n"
-"new_full_path := DAV_CONCAT_PATH (rfc_spath, path_parts [length (path_parts) - 1]);\n"
-"rc := DAV_COPY_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, permissions,\n"
-"coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = uid), \'\'),\n"
-"coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = gid), \'\'),\n"
-"null, null, 0);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
-"if (DAV_HIDE_ERROR (source_id) is null)\n"
-"return source_id;\n"
-"if (not (isinteger (source_id)))\n"
-"return -13;\n"
-"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, fit_cond, auth_uid);\n"
+"insert soft WS.WS.SYS_DAV_RDF_INVERSE (DRI_CATF_ID, DRI_PROP_CATID, DRI_CATVALUE, DRI_RES_ID)\n"
+"values (\n"
+"cfid,\n"
+"prop_catid,\n"
+"\"CatFilter_ENCODE_CATVALUE\" (cast (xpath_eval (\'[xmlns:virt=\"virt\"] virt:value\', prop) as varchar)),\n"
+"propparent );\n"
"}\n"
-"return 1;\n"
+"goto next_cfid;\n"
"}\n"
-"--src DET_CatFilter.sql:1563\n";
+"--src DET_CatFilter.sql:1834\n";
-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"
+static const char *trig35 =
+"#line 1918 \"[executable]/DET_CatFilter.sql\"\n"
+"create trigger SYS_DAV_PROP_VALUE_RDF_I after insert on WS.WS.SYS_DAV_PROP order 10 referencing new as NP\n"
"{\n"
-"declare cfc_id integer;\n"
-"declare rfc_spath, schema_uri varchar;\n"
-"declare rfc_list_cond, rfc_del_action, filter_data, fit_cond any;\n"
-"declare rc integer;\n"
-"\n"
-"if (0 > \"CatFilter_GET_CONDITION\" (detcol_id, cfc_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"if (NP.PROP_NAME <> \'http://local.virt/DAV-RDF\')\n"
+"return;\n"
+"if (NP.PROP_TYPE <> \'R\')\n"
+"return;\n"
+"\"CatFilter_FEED_DAV_RDF_INVERSE\" (NP.PROP_VALUE, NP.PROP_PARENT_ID);\n"
+"}\n"
+"--src DET_CatFilter.sql:1916\n";
+
+static const char *trig36 =
+"#line 1929 \"[executable]/DET_CatFilter.sql\"\n"
+"create trigger SYS_DAV_PROP_VALUE_RDF_D before delete on WS.WS.SYS_DAV_PROP order 10 referencing old as OP\n"
"{\n"
-"\n"
-"return -2;\n"
+"declare pv varchar;\n"
+"declare doc any;\n"
+"if (OP.PROP_NAME <> \'http://local.virt/DAV-RDF\')\n"
+"return;\n"
+"if (OP.PROP_TYPE <> \'R\')\n"
+"return;\n"
+"\"CatFilter_FEED_DAV_RDF_INVERSE\" (OP.PROP_VALUE, OP.PROP_PARENT_ID, 1);\n"
"}\n"
-"if (length (rfc_del_action) < length (rfc_list_cond))\n"
+"--src DET_CatFilter.sql:1927\n";
+
+static const char *trig37 =
+"#line 1942 \"[executable]/DET_CatFilter.sql\"\n"
+"create trigger SYS_DAV_PROP_VALUE_RDF_U after update on WS.WS.SYS_DAV_PROP order 10 referencing old as OP, new as NP\n"
"{\n"
+"declare pv varchar;\n"
+"declare doc any;\n"
+"if (OP.PROP_NAME <> \'http://local.virt/DAV-RDF\')\n"
+"goto register_new_propvals;\n"
+"if (OP.PROP_TYPE <> \'R\')\n"
+"goto register_new_propvals;\n"
+"\"CatFilter_FEED_DAV_RDF_INVERSE\" (OP.PROP_VALUE, OP.PROP_PARENT_ID, 1);\n"
"\n"
-"return -13;\n"
+"register_new_propvals:\n"
+"if (NP.PROP_NAME <> \'http://local.virt/DAV-RDF\')\n"
+"return;\n"
+"if (NP.PROP_TYPE <> \'R\')\n"
+"return;\n"
+"\"CatFilter_FEED_DAV_RDF_INVERSE\" (NP.PROP_VALUE, NP.PROP_PARENT_ID);\n"
"}\n"
-"rc := \"CatFilter_PATH_PARTS_TO_FILTER\" (path_parts, schema_uri, filter_data);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"rc := \"CatFilter_FILTER_TO_CONDITION\" (schema_uri, filter_data, fit_cond);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"fit_cond := vector (\'\', vector_concat (fit_cond, get_keyword (\'\', rfc_list_cond)));\n"
-"if (\'R\' <> what)\n"
-"return -2;\n"
-"if (\'\' = path_parts [length (path_parts) - 1])\n"
-"return -2;\n"
-"if (isinteger (source_id) and\n"
-"exists (select 1 from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = source_id and RES_NAME = path_parts [length (path_parts) - 1] and (RES_FULL_PATH between rfc_spath and DAV_COL_PATH_BOUNDARY (rfc_spath))))\n"
+"--src DET_CatFilter.sql:1940\n";
+
+static const char *proc422 =
+"#line 1962 \"[executable]/DET_CatFilter.sql\"\n"
+"create procedure \"CatFilter_INIT_SYS_DAV_RDF_INVERSE\" (in run_if_once integer)\n"
"{\n"
-"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, fit_cond, auth_uid);\n"
+"declare ctr integer;\n"
+"set isolation = \'committed\';\n"
+"if (run_if_once)\n"
+"{\n"
+"if (0 <> sequence_next(\'CatFilter_INIT_SYS_DAV_RDF_INVERSE\'))\n"
+"return;\n"
"}\n"
"else\n"
"{\n"
-"declare new_full_path varchar;\n"
-"new_full_path := DAV_CONCAT_PATH (rfc_spath, path_parts [length (path_parts) - 1]);\n"
-"rc := DAV_MOVE_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, null, null, 0, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
-"if (DAV_HIDE_ERROR (source_id) is null)\n"
-"return source_id;\n"
-"if (not (isinteger (source_id)))\n"
-"return -13;\n"
-"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, fit_cond, auth_uid);\n"
+"\n"
+"update WS.WS.SYS_RDF_SCHEMAS set RS_PRECOMPILED = null, RS_PROP_CATNAMES = null;\n"
+"commit work;\n"
+"delete from WS.WS.SYS_DAV_RDF_INVERSE;\n"
"}\n"
-"return 1;\n"
+"commit work;\n"
+"for (select PROP_VALUE, PROP_PARENT_ID from WS.WS.SYS_DAV_PROP where PROP_NAME = \'http://local.virt/DAV-RDF\' and PROP_TYPE = \'R\') do\n"
+"{\n"
+"\"CatFilter_FEED_DAV_RDF_INVERSE\" (PROP_VALUE, PROP_PARENT_ID);\n"
+"ctr := ctr + 1;\n"
+"if (mod (ctr, 1000) = 0)\n"
+"commit work;\n"
"}\n"
-"--src DET_CatFilter.sql:1619\n";
+"}\n"
+"--src DET_CatFilter.sql:1960\n";
-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"
+/* DET_HostFs.sql */
+
+static const char *tbl2 =
+"create table WS.WS.HOSTFS_COL\n"
+"(\n"
+"COL_ID integer not null primary key,\n"
+"COL_FULL_PATH varchar not null,\n"
+"COL_PARENT_ID integer,\n"
+"COL_CR_TIME datetime,\n"
+"COL_MOD_TIME datetime,\n"
+"COL_SCAN_TIME datetime,\n"
+"COL_NEXT_SCAN_TIME datetime,\n"
+"COL_NAME varchar not null\n"
+")\n"
+"create index HOSTFS_COL_PARENT_ID on WS.WS.HOSTFS_COL (COL_PARENT_ID)\n"
+"create index HOSTFS_COL_FULL_PATH on WS.WS.HOSTFS_COL (COL_FULL_PATH)\n"
+"create index HOSTFS_COL_NEXT_SCAN_TIME on WS.WS.HOSTFS_COL (COL_NEXT_SCAN_TIME)\n";
+
+static const char *alter0 =
+"alter table WS.WS.HOSTFS_COL add COL_NAME varchar not null\n";
+
+static const char *tbl3 =
+"create table WS.WS.HOSTFS_RES\n"
+"(\n"
+"RES_ID integer not null primary key,\n"
+"RES_NAME varchar (256),\n"
+"RES_COL integer,\n"
+"RES_TYPE varchar,\n"
+"RES_FT_MODE char (1),\n"
+"RES_LENGTH integer,\n"
+"RES_CR_TIME datetime,\n"
+"RES_MOD_TIME datetime,\n"
+"RES_SCAN_TIME datetime,\n"
+"RES_NEXT_SCAN_TIME datetime,\n"
+"RES_PERMS char (11)\n"
+")\n"
+"create index HOSTFS_RES_COL on WS.WS.HOSTFS_RES (RES_COL, RES_NAME)\n"
+"create index HOSTFS_RES_NEXT_SCAN_TIME on WS.WS.HOSTFS_RES (RES_NEXT_SCAN_TIME)\n";
+
+static const char *tbl4 =
+"create table WS.WS.HOSTFS_RES_CACHE\n"
+"(\n"
+"RESC_ID integer not null primary key,\n"
+"RESC_MOD_SCAN_TIME datetime,\n"
+"RESC_DATA long varchar,\n"
+"RESC_TOPCOL_ID integer not null\n"
+")\n"
+"create index HOSTFS_RES_CACHE_TOPCOL_ID on WS.WS.HOSTFS_RES_CACHE (RESC_TOPCOL_ID)\n";
+
+static const char *alter1 =
+"alter table WS.WS.HOSTFS_RES_CACHE add RESC_TOPCOL_ID integer not null\n";
+
+static const char *tbl5 =
+"create table WS.WS.HOSTFS_RES_META\n"
+"(\n"
+"RESM_ID integer not null primary key,\n"
+"RESM_DATA long XML,\n"
+"RESM_TOPCOL_ID integer not null\n"
+")\n"
+"create index HOSTFS_RES_META_TOPCOL_ID on WS.WS.HOSTFS_RES_META (RESM_TOPCOL_ID)\n";
+
+static const char *alter2 =
+"alter table WS.WS.HOSTFS_RES_META add RESM_TOPCOL_ID integer not null\n";
+
+static const char *tbl6 =
+"create table WS.WS.HOSTFS_RDF_INVERSE\n"
+"(\n"
+"HRI_TOPCOL_ID integer not null,\n"
+"HRI_PROP_CATID integer not null,\n"
+"HRI_CATVALUE varchar not null,\n"
+"HRI_RES_ID integer not null,\n"
+"primary key (HRI_TOPCOL_ID, HRI_PROP_CATID, HRI_CATVALUE, HRI_RES_ID)\n"
+")\n";
+
+static const char *proc423 =
+"#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"
+"declare resfullpath, path_head, pv varchar;\n"
+"declare triplets any;\n"
+"triplets := xpath_eval (\'[xmlns:virt=\"virt\"] /virt:rdf/virt:top-res/virt:prop[virt:value]\', propval, 0);\n"
+"foreach (any prop in triplets) do\n"
+"{\n"
+"declare propname varchar;\n"
+"declare prop_catid integer;\n"
+"propname := cast (xpath_eval (\'name(*[1])\', prop) as varchar);\n"
+"prop_catid := coalesce ((select RPN_CATID from WS.WS.SYS_RDF_PROP_NAME where RPN_URI = propname));\n"
+"if (prop_catid is null)\n"
"{\n"
+"prop_catid := WS.WS.GETID (\'RPN\');\n"
"\n"
-"declare cont any;\n"
-"if ((content_mode = 0) or (content_mode = 2))\n"
-"select RES_CONTENT, RES_TYPE into content, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
-"else if (content_mode = 1)\n"
-"select http (RES_CONTENT, content), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
-"else if (content_mode = 3)\n"
-"select http (RES_CONTENT), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
-"return id[2];\n"
+"insert into WS.WS.SYS_RDF_PROP_NAME (RPN_URI, RPN_CATID) values (propname, prop_catid);\n"
+"}\n"
+"if (is_del)\n"
+"delete from WS.WS.HOSTFS_RDF_INVERSE\n"
+"where\n"
+"(HRI_TOPCOL_ID = topcol_id) and (HRI_PROP_CATID = prop_catid) and\n"
+"(HRI_CATVALUE = \"CatFilter_ENCODE_CATVALUE\" (cast (xpath_eval (\'[xmlns:virt=\"virt\"] virt:value\', prop) as varchar))) and\n"
+"(HRI_RES_ID = r_id);\n"
+"else\n"
+"insert soft WS.WS.HOSTFS_RDF_INVERSE (HRI_TOPCOL_ID, HRI_PROP_CATID, HRI_CATVALUE, HRI_RES_ID)\n"
+"values (\n"
+"topcol_id,\n"
+"prop_catid,\n"
+"\"CatFilter_ENCODE_CATVALUE\" (cast (xpath_eval (\'[xmlns:virt=\"virt\"] virt:value\', prop) as varchar)),\n"
+"r_id );\n"
"}\n"
-"--src DET_CatFilter.sql:1672\n";
+"}\n"
+"--src DET_HostFs.sql:96\n";
-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"
+static const char *trig38 =
+"#line 133 \"[executable]/DET_HostFs.sql\"\n"
+"create trigger HOSTFS_RES_META_I after insert on WS.WS.HOSTFS_RES_META referencing new as NP\n"
"{\n"
-"\n"
-"return -20;\n"
+"if (NP.RESM_DATA is not null)\n"
+"WS.WS.HOSTFS_FEED_RDF_INVERSE (NP.RESM_DATA, NP.RESM_ID, 0, NP.RESM_TOPCOL_ID);\n"
"}\n"
-"--src DET_CatFilter.sql:1687\n";
+"--src DET_HostFs.sql:131\n";
-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"
+static const char *trig39 =
+"#line 141 \"[executable]/DET_HostFs.sql\"\n"
+"create trigger HOSTFS_RES_META_D before delete on WS.WS.HOSTFS_RES_META referencing old as OP\n"
"{\n"
-"declare rc, u_token, new_token varchar;\n"
-"\n"
-"if (\'R\' <> type)\n"
-"return -20;\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
-"return -20;\n"
-"if (isarray (id))\n"
-"return DAV_LOCK_INT (path, id[2], type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, null, null, auth_uid);\n"
-"return -20;\n"
+"if (OP.RESM_DATA is not null)\n"
+"WS.WS.HOSTFS_FEED_RDF_INVERSE (OP.RESM_DATA, OP.RESM_ID, 1, OP.RESM_TOPCOL_ID);\n"
"}\n"
-"--src DET_CatFilter.sql:1695\n";
+"--src DET_HostFs.sql:139\n";
-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"
+static const char *trig40 =
+"#line 149 \"[executable]/DET_HostFs.sql\"\n"
+"create trigger HOSTFS_RES_META_U after update on WS.WS.HOSTFS_RES_META referencing old as OP, new as NP\n"
"{\n"
-"\n"
-"if (isarray (id))\n"
-"id := id [2];\n"
-"return DAV_UNLOCK_INT (id, type, token, null, null, auth_uid);\n"
+"if (OP.RESM_DATA is not null)\n"
+"WS.WS.HOSTFS_FEED_RDF_INVERSE (OP.RESM_DATA, OP.RESM_ID, 1, OP.RESM_TOPCOL_ID);\n"
+"if (NP.RESM_DATA is not null)\n"
+"WS.WS.HOSTFS_FEED_RDF_INVERSE (NP.RESM_DATA, NP.RESM_ID, 0, NP.RESM_TOPCOL_ID);\n"
"}\n"
-"--src DET_CatFilter.sql:1710\n";
+"--src DET_HostFs.sql:147\n";
-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"
+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 *proc424 =
+"#line 171 \"[executable]/DET_HostFs.sql\"\n"
+"create function WS.WS.HOSTFS_RES_TOPCOL_ID (in r_id integer) returns integer\n"
"{\n"
-"declare rc integer;\n"
-"declare orig_id any;\n"
-"declare orig_type char(1);\n"
-"\n"
-"orig_id := id;\n"
-"id := orig_id[2];\n"
-"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
-"if (rc <> 0)\n"
-"return rc;\n"
-"id := orig_id[1];\n"
-"orig_type := type;\n"
-"type := \'C\';\n"
-"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
-"if (rc <> 0)\n"
-"return rc;\n"
-"id := orig_id;\n"
-"type := orig_type;\n"
+"declare res, parent integer;\n"
+"whenever not found goto nf;\n"
+"res := parent := (select RES_COL from WS.WS.HOSTFS_RES where RES_ID = r_id);\n"
+"while (parent is not null)\n"
+"{\n"
+"res := parent;\n"
+"parent := (select COL_PARENT_ID from WS.WS.HOSTFS_COL where COL_ID = res);\n"
+"}\n"
+"return res;\n"
+"nf:\n"
"return 0;\n"
"}\n"
-"--src DET_CatFilter.sql:1720\n";
+"--src DET_HostFs.sql:169\n";
-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"
+static const char *proc425 =
+"#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"
-"declare res any;\n"
+"declare resttype varchar;\n"
+"declare old_prop_id integer;\n"
+"declare html_start, full_xml any;\n"
+"declare old_n3, addon_n3 any;\n"
"\n"
-"id := id[2];\n"
-"if (isarray (id))\n"
-"return call (cast (id[0] as varchar) || \'_DAV_LIST_LOCKS\') (id, type, recursive);\n"
-"res := vector();\n"
-"for select LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO\n"
-"from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type do {\n"
-"res := vector_concat (res, vector (vector (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)));\n"
-"}\n"
-"return res;\n"
+"html_start := null;\n"
+"full_xml := null;\n"
+"\n"
+"restype := DAV_GUESS_MIME_TYPE (resname, rescontent, html_start);\n"
+"\n"
+"if (restype is null)\n"
+"return;\n"
+"addon_n3 := call (\'DAV_EXTRACT_RDF_\' || restype)(resname, rescontent, html_start);\n"
+"\n"
+"if (addon_n3 is null)\n"
+"return;\n"
+"insert replacing WS.WS.HOSTFS_RES_META (RESM_ID, RESM_DATA, RESM_TOPCOL_ID)\n"
+"values\n"
+"(resid, xml_tree_doc (DAV_RDF_PREPROCESS_RDFXML (addon_n3, N\'http://local.virt/this\', 1)), topcol_id);\n"
+"return;\n"
+"\n"
+"no_op:\n"
+" ;\n"
"}\n"
-"--src DET_CatFilter.sql:1744\n";
+"--src DET_HostFs.sql:185\n";
-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"
+static const char *proc426 =
+"#line 215 \"[executable]/DET_HostFs.sql\"\n"
+"create procedure WS.WS.HOSTFS_TEST_RDF (in d_id integer)\n"
"{\n"
-"declare cfid, rc, ctr integer;\n"
-"declare colname varchar;\n"
-"declare compilation, del_act any;\n"
-"compilation := vector (\'\', filter);\n"
-"rc := DAV_DIR_FILTER_INT (search_path, 1, compilation, auth_uname, auth_upwd, auth_uid);\n"
-"if (isinteger (rc))\n"
-"return rc;\n"
-"if (not isinteger (col))\n"
-"return -20;\n"
-"colname := DAV_SEARCH_PATH (col, \'C\');\n"
-"if (not (isstring (colname)))\n"
-"return -23;\n"
-"rc := DAV_SEARCH_ID (search_path, \'C\');\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"if (search_path <> DAV_SEARCH_PATH (rc, \'C\'))\n"
-"return -2;\n"
-"if (search_path between colname and (colname || \'\\255\\255\\255\\255\'))\n"
-"return -28;\n"
-"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-SearchPath\', search_path, null, null, 0, 1, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-ListCond\', \"ResFilter_ENCODE_FILTER\" (compilation), null, null, 0, 1, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"del_act := \"ResFilter_MAKE_DEL_ACTION_FROM_CONDITION\" (compilation);\n"
"\n"
-"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-DelAction\', \"ResFilter_ENCODE_FILTER\" (del_act), null, null, 0, 1, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
+"for select RES_COL, RES_NAME, RES_TYPE, RES_FT_MODE from WS.WS.HOSTFS_RES where RES_ID = d_id do\n"
+"{\n"
"\n"
-"cfid := coalesce ((select CF_ID from WS.WS.SYS_DAV_CATFILTER where CF_SEARCH_PATH = search_path));\n"
-"if (cfid is null)\n"
+"if (\'N\' = RES_FT_MODE)\n"
"{\n"
-"declare search_path_z varchar;\n"
-"cfid := WS.WS.GETID (\'CF\');\n"
-"insert into WS.WS.SYS_DAV_CATFILTER (CF_ID, CF_SEARCH_PATH) values (cfid, search_path);\n"
-"search_path_z := search_path || \'\\255\\255\\255\\255\';\n"
-"for (select p.PROP_VALUE, p.PROP_PARENT_ID\n"
-"from WS.WS.SYS_DAV_RES r join WS.WS.SYS_DAV_PROP p on (r.RES_ID = p.PROP_PARENT_ID)\n"
-"where (r.RES_FULL_PATH between search_path and search_path_z) and (p.PROP_NAME = \'http://local.virt/DAV-RDF\') and (p.PROP_TYPE = \'R\')) do\n"
+"return 1;\n"
+"}\n"
+"else if ((\'T\' = RES_FT_MODE) or (\'X\' = RES_FT_MODE))\n"
"{\n"
-"\"CatFilter_FEED_DAV_RDF_INVERSE\" (PROP_VALUE, PROP_PARENT_ID, 0, cfid);\n"
-"ctr := ctr + 1;\n"
-"if (mod (ctr, 1000) = 0)\n"
-"commit work;\n"
+"for select RESC_DATA, RESC_TOPCOL_ID from WS.WS.HOSTFS_RES_CACHE where RESC_ID = d_id do\n"
+"{\n"
+"WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (d_id, RES_NAME, RES_TYPE, RESC_DATA, RESC_TOPCOL_ID);\n"
"}\n"
-"commit work;\n"
-"for (select COL_ID, COL_DET, WS.WS.COL_PATH (COL_ID) as _c_path from WS.WS.SYS_DAV_COL where COL_DET is not null and not (COL_DET like \'%Filter\')) do\n"
+"return 1;\n"
+"}\n"
+"else if ((\'t\' = RES_FT_MODE) or (\'x\' = RES_FT_MODE))\n"
"{\n"
-"if (\"LEFT\" (_c_path, length (search_path)) = search_path)\n"
+"for select COL_FULL_PATH from WS.WS.HOSTFS_COL where COL_ID = RES_COL do\n"
"{\n"
-"insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET)\n"
-"values (cfid, COL_ID, COL_DET);\n"
+"declare ses any;\n"
+"\n"
+"ses := file_to_string_output (COL_FULL_PATH || RES_NAME);\n"
+"WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (d_id, RES_NAME, RES_TYPE, ses, WS.WS.HOSTFS_RES_TOPCOL_ID (d_id));\n"
"}\n"
+"return 1;\n"
"}\n"
"}\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"rc := DAV_PROP_SET_INT (colname, \'virt:CatFilter-ID\', cast (cfid as varchar), null, null, 0, 1, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"update WS.WS.SYS_DAV_COL set COL_DET=\'CatFilter\' where COL_ID=col;\n"
-"\n"
"return 0;\n"
"}\n"
-"--src DET_CatFilter.sql:1761\n";
+"--src DET_HostFs.sql:213\n";
-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"
+static const char *proc427 =
+"#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"
"{\n"
-"declare resfullpath, path_head, pv varchar;\n"
-"declare doc any;\n"
-"declare triplets any;\n"
"\n"
-"if (126 = __tag (propval))\n"
-"pv := blob_to_string (propval);\n"
-"else\n"
-"{\n"
-"if ((not isstring (propval)) or (propval = \'\'))\n"
-"return;\n"
-"pv := propval;\n"
-"}\n"
-"if (193 <> pv[0])\n"
-"return;\n"
-"doc := null;\n"
-"if (cfid is not null)\n"
-"{\n"
-"path_head := \'/\';\n"
-"goto cfid_found;\n"
-"}\n"
-"else\n"
+"whenever sqlstate \'*\' goto done;\n"
+"for select RES_COL, RES_NAME, RES_TYPE, RES_FT_MODE from WS.WS.HOSTFS_RES where RES_ID = d_id do\n"
"{\n"
-"resfullpath := coalesce ((select r.RES_FULL_PATH from WS.WS.SYS_DAV_RES r where r.RES_ID = propparent));\n"
-"if (resfullpath is null)\n"
-"return;\n"
-"path_head := subseq (resfullpath, 0, strrchr (resfullpath, \'/\'));\n"
-"}\n"
"\n"
-"next_cfid:\n"
-"while (1)\n"
+"if (\'N\' = RES_FT_MODE)\n"
"{\n"
-"if (length (path_head) <= 1)\n"
-"return;\n"
-"cfid := coalesce ((select CF_ID from WS.WS.SYS_DAV_CATFILTER where CF_SEARCH_PATH = (path_head || \'/\')));\n"
-"path_head := subseq (path_head, 0, strrchr (path_head, \'/\'));\n"
-"if (cfid is not null)\n"
-"goto cfid_found;\n"
+"vt_batch_feed (vtb, RES_NAME, 0, 0);\n"
+"return 1;\n"
"}\n"
-"\n"
-"cfid_found:\n"
-"if (doc is null)\n"
+"else if ((\'T\' = RES_FT_MODE) or (\'X\' = RES_FT_MODE))\n"
"{\n"
-"doc := deserialize (pv);\n"
-"if (0 = length (doc))\n"
-"return;\n"
-"doc := xml_tree_doc (doc);\n"
+"for select RESC_DATA, RESC_TOPCOL_ID from WS.WS.HOSTFS_RES_CACHE where RESC_ID = d_id do\n"
+"{\n"
+"vt_batch_feed (vtb, RESC_DATA, 0, case (RES_FT_MODE) when \'X\' then 2 else 0 end);\n"
+"WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (d_id, RES_NAME, RES_TYPE, RESC_DATA, RESC_TOPCOL_ID);\n"
"}\n"
-"\n"
-"triplets := xpath_eval (\'[xmlns:virt=\"virt\"] /virt:rdf/virt:top-res/virt:prop[virt:value]\', doc, 0);\n"
-"foreach (any prop in triplets) do\n"
+"return 1;\n"
+"}\n"
+"else if ((\'t\' = RES_FT_MODE) or (\'x\' = RES_FT_MODE))\n"
"{\n"
-"declare propname varchar;\n"
-"declare prop_catid integer;\n"
-"propname := cast (xpath_eval (\'name(*[1])\', prop) as varchar);\n"
-"prop_catid := coalesce ((select RPN_CATID from WS.WS.SYS_RDF_PROP_NAME where RPN_URI = propname));\n"
-"if (prop_catid is null)\n"
+"for select COL_FULL_PATH from WS.WS.HOSTFS_COL where COL_ID = RES_COL do\n"
"{\n"
-"prop_catid := WS.WS.GETID (\'RPN\');\n"
+"declare ses any;\n"
"\n"
-"insert into WS.WS.SYS_RDF_PROP_NAME (RPN_URI, RPN_CATID) values (propname, prop_catid);\n"
+"ses := file_to_string_output (COL_FULL_PATH || RES_NAME);\n"
+"vt_batch_feed (vtb, ses, 0, case (RES_FT_MODE) when \'x\' then 2 else 0 end);\n"
+"WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (d_id, RES_NAME, RES_TYPE, ses, WS.WS.HOSTFS_RES_TOPCOL_ID (d_id));\n"
"}\n"
-"if (is_del)\n"
-"delete from WS.WS.SYS_DAV_RDF_INVERSE\n"
-"where\n"
-"(DRI_CATF_ID = cfid) and (DRI_PROP_CATID = prop_catid) and\n"
-"(DRI_CATVALUE = \"CatFilter_ENCODE_CATVALUE\" (cast (xpath_eval (\'[xmlns:virt=\"virt\"] virt:value\', prop) as varchar))) and\n"
-"(DRI_RES_ID = propparent);\n"
-"else\n"
-"insert soft WS.WS.SYS_DAV_RDF_INVERSE (DRI_CATF_ID, DRI_PROP_CATID, DRI_CATVALUE, DRI_RES_ID)\n"
-"values (\n"
-"cfid,\n"
-"prop_catid,\n"
-"\"CatFilter_ENCODE_CATVALUE\" (cast (xpath_eval (\'[xmlns:virt=\"virt\"] virt:value\', prop) as varchar)),\n"
-"propparent );\n"
+"return 1;\n"
"}\n"
-"goto next_cfid;\n"
"}\n"
-"--src DET_CatFilter.sql:1834\n";
-
-static const char *trig35 =
-"#line 1918 \"[executable]/DET_CatFilter.sql\"\n"
-"create trigger SYS_DAV_PROP_VALUE_RDF_I after insert on WS.WS.SYS_DAV_PROP order 10 referencing new as NP\n"
-"{\n"
-"if (NP.PROP_NAME <> \'http://local.virt/DAV-RDF\')\n"
-"return;\n"
-"if (NP.PROP_TYPE <> \'R\')\n"
-"return;\n"
-"\"CatFilter_FEED_DAV_RDF_INVERSE\" (NP.PROP_VALUE, NP.PROP_PARENT_ID);\n"
+"done:\n"
+"\n"
+"return 1;\n"
"}\n"
-"--src DET_CatFilter.sql:1916\n";
+"--src DET_HostFs.sql:247\n";
-static const char *trig36 =
-"#line 1929 \"[executable]/DET_CatFilter.sql\"\n"
-"create trigger SYS_DAV_PROP_VALUE_RDF_D before delete on WS.WS.SYS_DAV_PROP order 10 referencing old as OP\n"
+static const char *proc428 =
+"#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"
"{\n"
-"declare pv varchar;\n"
-"declare doc any;\n"
-"if (OP.PROP_NAME <> \'http://local.virt/DAV-RDF\')\n"
-"return;\n"
-"if (OP.PROP_TYPE <> \'R\')\n"
-"return;\n"
-"\"CatFilter_FEED_DAV_RDF_INVERSE\" (OP.PROP_VALUE, OP.PROP_PARENT_ID, 1);\n"
+"whenever sqlstate \'*\' goto done;\n"
+"for select RES_COL, RES_NAME, RES_TYPE, RES_FT_MODE from WS.WS.HOSTFS_RES where RES_ID = d_id do\n"
+"{\n"
+"if (\'N\' = RES_FT_MODE)\n"
+"{\n"
+"vt_batch_feed (vtb, RES_NAME, 1, 0);\n"
+"return 1;\n"
"}\n"
-"--src DET_CatFilter.sql:1927\n";
-
-static const char *trig37 =
-"#line 1942 \"[executable]/DET_CatFilter.sql\"\n"
-"create trigger SYS_DAV_PROP_VALUE_RDF_U after update on WS.WS.SYS_DAV_PROP order 10 referencing old as OP, new as NP\n"
+"else if ((\'T\' = RES_FT_MODE) or (\'X\' = RES_FT_MODE))\n"
"{\n"
-"declare pv varchar;\n"
-"declare doc any;\n"
-"if (OP.PROP_NAME <> \'http://local.virt/DAV-RDF\')\n"
-"goto register_new_propvals;\n"
-"if (OP.PROP_TYPE <> \'R\')\n"
-"goto register_new_propvals;\n"
-"\"CatFilter_FEED_DAV_RDF_INVERSE\" (OP.PROP_VALUE, OP.PROP_PARENT_ID, 1);\n"
-"\n"
-"register_new_propvals:\n"
-"if (NP.PROP_NAME <> \'http://local.virt/DAV-RDF\')\n"
-"return;\n"
-"if (NP.PROP_TYPE <> \'R\')\n"
-"return;\n"
-"\"CatFilter_FEED_DAV_RDF_INVERSE\" (NP.PROP_VALUE, NP.PROP_PARENT_ID);\n"
+"for select RESC_DATA from WS.WS.HOSTFS_RES_CACHE where RESC_ID = d_id do\n"
+"vt_batch_feed (vtb, RESC_DATA, 1, case (RES_FT_MODE) when \'X\' then 2 else 0 end);\n"
+"return 1;\n"
"}\n"
-"--src DET_CatFilter.sql:1940\n";
+"}\n"
+"done:\n"
+"return 1;\n"
+"}\n"
+"--src DET_HostFs.sql:288\n";
-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"
+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 *proc429 =
+"#line 325 \"[executable]/DET_HostFs.sql\"\n"
+"create function\n"
+"WS.WS.HOSTFS_FIND_COL (in full_path varchar) returns integer\n"
"{\n"
-"declare ctr integer;\n"
-"set isolation = \'committed\';\n"
-"if (run_if_once)\n"
+"declare slash_pos, parent, len, res integer;\n"
+"declare parent_path, cname, tmp varchar;\n"
+"declare cr_time datetime;\n"
+"len := length (full_path);\n"
+"if ((len > 0) and full_path[len-1] = 47)\n"
+"full_path := subseq (full_path, 0, len-1);\n"
+"whenever not found goto not_found;\n"
+"select COL_ID into res from WS.WS.HOSTFS_COL where COL_FULL_PATH = full_path || \'/\';\n"
+"return res;\n"
+"not_found:\n"
+"slash_pos := strrchr (full_path, \'/\');\n"
+"if (slash_pos is null)\n"
"{\n"
-"if (0 <> sequence_next(\'CatFilter_INIT_SYS_DAV_RDF_INVERSE\'))\n"
-"return;\n"
+"parent := null;\n"
+"cname := full_path;\n"
"}\n"
"else\n"
"{\n"
-"\n"
-"update WS.WS.SYS_RDF_SCHEMAS set RS_PRECOMPILED = null, RS_PROP_CATNAMES = null;\n"
-"commit work;\n"
-"delete from WS.WS.SYS_DAV_RDF_INVERSE;\n"
-"}\n"
-"commit work;\n"
-"for (select PROP_VALUE, PROP_PARENT_ID from WS.WS.SYS_DAV_PROP where PROP_NAME = \'http://local.virt/DAV-RDF\' and PROP_TYPE = \'R\') do\n"
-"{\n"
-"\"CatFilter_FEED_DAV_RDF_INVERSE\" (PROP_VALUE, PROP_PARENT_ID);\n"
-"ctr := ctr + 1;\n"
-"if (mod (ctr, 1000) = 0)\n"
-"commit work;\n"
+"parent := WS.WS.HOSTFS_FIND_COL (subseq (full_path, 0, slash_pos));\n"
+"cname := subseq (full_path, slash_pos + 1);\n"
"}\n"
+"tmp := file_stat (full_path);\n"
+"if (isstring (tmp))\n"
+"cr_time := cast (tmp as datetime);\n"
+"else\n"
+"cr_time := null;\n"
+"res := sequence_next (\'WS.WS.HOSTFS_COL_ID\') + 1;\n"
+"insert into WS.WS.HOSTFS_COL\n"
+"(COL_ID , COL_FULL_PATH , COL_PARENT_ID , COL_CR_TIME , COL_MOD_TIME , COL_SCAN_TIME , COL_NEXT_SCAN_TIME , COL_NAME )\n"
+"values\n"
+"(res , full_path || \'/\' , parent , cr_time , cr_time , NULL , now () , cname );\n"
+"return res;\n"
"}\n"
-"--src DET_CatFilter.sql:1960\n";
-
-/* DET_HostFs.sql */
-
-static const char *tbl2 =
-"create table WS.WS.HOSTFS_COL\n"
-"(\n"
-"COL_ID integer not null primary key,\n"
-"COL_FULL_PATH varchar not null,\n"
-"COL_PARENT_ID integer,\n"
-"COL_CR_TIME datetime,\n"
-"COL_MOD_TIME datetime,\n"
-"COL_SCAN_TIME datetime,\n"
-"COL_NEXT_SCAN_TIME datetime,\n"
-"COL_NAME varchar not null\n"
-")\n"
-"create index HOSTFS_COL_PARENT_ID on WS.WS.HOSTFS_COL (COL_PARENT_ID)\n"
-"create index HOSTFS_COL_FULL_PATH on WS.WS.HOSTFS_COL (COL_FULL_PATH)\n"
-"create index HOSTFS_COL_NEXT_SCAN_TIME on WS.WS.HOSTFS_COL (COL_NEXT_SCAN_TIME)\n";
-
-static const char *alter0 =
-"alter table WS.WS.HOSTFS_COL add COL_NAME varchar not null\n";
-
-static const char *tbl3 =
-"create table WS.WS.HOSTFS_RES\n"
-"(\n"
-"RES_ID integer not null primary key,\n"
-"RES_NAME varchar (256),\n"
-"RES_COL integer,\n"
-"RES_TYPE varchar,\n"
-"RES_FT_MODE char (1),\n"
-"RES_LENGTH integer,\n"
-"RES_CR_TIME datetime,\n"
-"RES_MOD_TIME datetime,\n"
-"RES_SCAN_TIME datetime,\n"
-"RES_NEXT_SCAN_TIME datetime,\n"
-"RES_PERMS char (11)\n"
-")\n"
-"create index HOSTFS_RES_COL on WS.WS.HOSTFS_RES (RES_COL, RES_NAME)\n"
-"create index HOSTFS_RES_NEXT_SCAN_TIME on WS.WS.HOSTFS_RES (RES_NEXT_SCAN_TIME)\n";
-
-static const char *tbl4 =
-"create table WS.WS.HOSTFS_RES_CACHE\n"
-"(\n"
-"RESC_ID integer not null primary key,\n"
-"RESC_MOD_SCAN_TIME datetime,\n"
-"RESC_DATA long varchar,\n"
-"RESC_TOPCOL_ID integer not null\n"
-")\n"
-"create index HOSTFS_RES_CACHE_TOPCOL_ID on WS.WS.HOSTFS_RES_CACHE (RESC_TOPCOL_ID)\n";
-
-static const char *alter1 =
-"alter table WS.WS.HOSTFS_RES_CACHE add RESC_TOPCOL_ID integer not null\n";
-
-static const char *tbl5 =
-"create table WS.WS.HOSTFS_RES_META\n"
-"(\n"
-"RESM_ID integer not null primary key,\n"
-"RESM_DATA long XML,\n"
-"RESM_TOPCOL_ID integer not null\n"
-")\n"
-"create index HOSTFS_RES_META_TOPCOL_ID on WS.WS.HOSTFS_RES_META (RESM_TOPCOL_ID)\n";
-
-static const char *alter2 =
-"alter table WS.WS.HOSTFS_RES_META add RESM_TOPCOL_ID integer not null\n";
+"--src DET_HostFs.sql:323\n";
-static const char *tbl6 =
-"create table WS.WS.HOSTFS_RDF_INVERSE\n"
-"(\n"
-"HRI_TOPCOL_ID integer not null,\n"
-"HRI_PROP_CATID integer not null,\n"
-"HRI_CATVALUE varchar not null,\n"
-"HRI_RES_ID integer not null,\n"
-"primary key (HRI_TOPCOL_ID, HRI_PROP_CATID, HRI_CATVALUE, HRI_RES_ID)\n"
-")\n";
+static const char *proc430 =
+"#line 363 \"[executable]/DET_HostFs.sql\"\n"
+"create procedure\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (in full_path varchar)\n"
+"{\n"
+"declare len integer;\n"
+"len := length (full_path);\n"
+"if ((len > 0) and full_path[len-1] = 47)\n"
+"full_path := subseq (full_path, 0, len-1);\n"
+"for select COL_ID from WS.WS.HOSTFS_COL where COL_FULL_PATH between full_path || \'/\' and full_path || \'0\' do\n"
+"{\n"
+"for select RES_ID from WS.WS.HOSTFS_RES where RES_COL = COL_ID do\n"
+"{\n"
+"delete from WS.WS.HOSTFS_RES_META where RESM_ID = RES_ID;\n"
+"delete from WS.WS.HOSTFS_RES_CACHE where RESC_ID = RES_ID;\n"
+"}\n"
+"delete from WS.WS.HOSTFS_RES where RES_COL = COL_ID;\n"
+"}\n"
+"delete from WS.WS.HOSTFS_COL where COL_FULL_PATH between full_path || \'/\' and full_path || \'0\';\n"
+"}\n"
+"--src DET_HostFs.sql:361\n";
-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"
+static const char *proc431 =
+"#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"
"{\n"
-"declare resfullpath, path_head, pv varchar;\n"
-"declare triplets any;\n"
-"triplets := xpath_eval (\'[xmlns:virt=\"virt\"] /virt:rdf/virt:top-res/virt:prop[virt:value]\', propval, 0);\n"
-"foreach (any prop in triplets) do\n"
+"declare len, slash_pos integer;\n"
+"declare r_id integer;\n"
+"len := length (full_path);\n"
+"if ((len = 0) or (full_path[len-1] = 47))\n"
+"return;\n"
+"slash_pos := strrchr (full_path, \'/\');\n"
+"if (c_id is null)\n"
"{\n"
-"declare propname varchar;\n"
-"declare prop_catid integer;\n"
-"propname := cast (xpath_eval (\'name(*[1])\', prop) as varchar);\n"
-"prop_catid := coalesce ((select RPN_CATID from WS.WS.SYS_RDF_PROP_NAME where RPN_URI = propname));\n"
-"if (prop_catid is null)\n"
+"if (slash_pos is null)\n"
+"c_id := WS.WS.HOSTFS_FIND_COL (\'\');\n"
+"else\n"
+"c_id := WS.WS.HOSTFS_FIND_COL (subseq (full_path, 0, slash_pos));\n"
+"}\n"
+"r_id := coalesce ((select RES_ID from WS.WS.HOSTFS_RES where RES_NAME = subseq (full_path, slash_pos + 1) and RES_COL = c_id));\n"
+"if (r_id is null)\n"
"{\n"
-"prop_catid := WS.WS.GETID (\'RPN\');\n"
+"r_id := sequence_next (\'WS.WS.HOSTFS_RES_ID\') + 1;\n"
+"insert into WS.WS.HOSTFS_RES\n"
+"(RES_ID , RES_NAME, RES_COL, RES_TYPE, RES_FT_MODE, RES_LENGTH, RES_CR_TIME, RES_MOD_TIME, RES_SCAN_TIME, RES_NEXT_SCAN_TIME, RES_PERMS)\n"
+"values\n"
+"(r_id , subseq (full_path, slash_pos + 1), c_id, mimetype, ft_mode, flen, cr_time, mod_time, now(), null, null);\n"
"\n"
-"insert into WS.WS.SYS_RDF_PROP_NAME (RPN_URI, RPN_CATID) values (propname, prop_catid);\n"
+"insert replacing WS.WS.HOSTFS_RES_CACHE\n"
+"(RESC_ID , RESC_MOD_SCAN_TIME , RESC_DATA , RESC_TOPCOL_ID )\n"
+"values\n"
+"(r_id , now() , null , WS.WS.HOSTFS_RES_TOPCOL_ID (r_id) );\n"
"}\n"
-"if (is_del)\n"
-"delete from WS.WS.HOSTFS_RDF_INVERSE\n"
-"where\n"
-"(HRI_TOPCOL_ID = topcol_id) and (HRI_PROP_CATID = prop_catid) and\n"
-"(HRI_CATVALUE = \"CatFilter_ENCODE_CATVALUE\" (cast (xpath_eval (\'[xmlns:virt=\"virt\"] virt:value\', prop) as varchar))) and\n"
-"(HRI_RES_ID = r_id);\n"
"else\n"
-"insert soft WS.WS.HOSTFS_RDF_INVERSE (HRI_TOPCOL_ID, HRI_PROP_CATID, HRI_CATVALUE, HRI_RES_ID)\n"
-"values (\n"
-"topcol_id,\n"
-"prop_catid,\n"
-"\"CatFilter_ENCODE_CATVALUE\" (cast (xpath_eval (\'[xmlns:virt=\"virt\"] virt:value\', prop) as varchar)),\n"
-"r_id );\n"
+"{\n"
+"if (exists (select top 1 1 from WS.WS.HOSTFS_RES\n"
+"where RES_ID = r_id and\n"
+"((RES_LENGTH <> flen) or (RES_MOD_TIME <> mod_time) or (RES_TYPE <> mimetype) or (RES_FT_MODE <> ft_mode)) ) )\n"
+"{\n"
+"update WS.WS.HOSTFS_RES set RES_LENGTH = flen, RES_MOD_TIME = mod_time, RES_TYPE = mimetype, RES_FT_MODE = ft_mode, RES_SCAN_TIME = now() where RES_ID = r_id;\n"
+"\n"
+"update WS.WS.HOSTFS_RES_CACHE set RESC_MOD_SCAN_TIME = now();\n"
"}\n"
+"else\n"
+"{\n"
+"update WS.WS.HOSTFS_RES set RES_SCAN_TIME = now() where (RES_ID = r_id) and RES_SCAN_TIME <> now ();\n"
"}\n"
-"--src DET_HostFs.sql:96\n";
+"}\n"
+"}\n"
+"--src DET_HostFs.sql:381\n";
-static const char *trig38 =
-"#line 133 \"[executable]/DET_HostFs.sql\"\n"
-"create trigger HOSTFS_RES_META_I after insert on WS.WS.HOSTFS_RES_META referencing new as NP\n"
+static const char *proc432 =
+"#line 431 \"[executable]/DET_HostFs.sql\"\n"
+"create procedure\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (in full_path varchar)\n"
"{\n"
-"if (NP.RESM_DATA is not null)\n"
-"WS.WS.HOSTFS_FEED_RDF_INVERSE (NP.RESM_DATA, NP.RESM_ID, 0, NP.RESM_TOPCOL_ID);\n"
+"declare len, slash_pos integer;\n"
+"declare c_id, r_id integer;\n"
+"len := length (full_path);\n"
+"if ((len = 0) or full_path[len-1] = 47)\n"
+"return;\n"
+"slash_pos := strrchr (full_path, \'/\');\n"
+"c_id := coalesce ((select COL_ID from WS.WS.HOSTFS_COL where COL_FULL_PATH = subseq (full_path, 0, slash_pos + 1)));\n"
+"if (c_id is null)\n"
+"return;\n"
+"r_id := coalesce ((select RES_ID from WS.WS.HOSTFS_RES where RES_NAME = subseq (full_path, slash_pos + 1) and RES_COL = c_id));\n"
+"if (r_id is null)\n"
+"return;\n"
+"delete from WS.WS.HOSTFS_RES_CACHE where RESC_ID = r_id;\n"
+"delete from WS.WS.HOSTFS_RES where RES_ID = r_id;\n"
+"update WS.WS.HOSTFS_COL set COL_MOD_TIME = now() where COL_ID = c_id and COL_MOD_TIME < now();\n"
"}\n"
-"--src DET_HostFs.sql:131\n";
+"--src DET_HostFs.sql:429\n";
-static const char *trig39 =
-"#line 141 \"[executable]/DET_HostFs.sql\"\n"
-"create trigger HOSTFS_RES_META_D before delete on WS.WS.HOSTFS_RES_META referencing old as OP\n"
+static const char *proc433 =
+"#line 452 \"[executable]/DET_HostFs.sql\"\n"
+"create function\n"
+"WS.WS.HOSTFS_TOUCH_RES (in ospath varchar) returns integer\n"
"{\n"
-"if (OP.RESM_DATA is not null)\n"
-"WS.WS.HOSTFS_FEED_RDF_INVERSE (OP.RESM_DATA, OP.RESM_ID, 1, OP.RESM_TOPCOL_ID);\n"
+"declare mimetype, ft_mode varchar;\n"
+"declare cr_time, mod_time datetime;\n"
+"declare flen, rc integer;\n"
+"\n"
+"rc := WS.WS.HOSTFS_PATH_STAT (ospath, flen, cr_time, mod_time);\n"
+"if (rc < 0)\n"
+"{\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
+"return -1;\n"
"}\n"
-"--src DET_HostFs.sql:139\n";
+"WS.WS.HOSTFS_READ_TYPEINFO (ospath, mimetype, ft_mode);\n"
+"WS.WS.HOSTFS_HANDLE_RES_SCAN (ospath, null, flen, cr_time, mod_time, mimetype, ft_mode);\n"
+"return 0;\n"
+"}\n"
+"--src DET_HostFs.sql:450\n";
-static const char *trig40 =
-"#line 149 \"[executable]/DET_HostFs.sql\"\n"
-"create trigger HOSTFS_RES_META_U after update on WS.WS.HOSTFS_RES_META referencing old as OP, new as NP\n"
+static const char *proc434 =
+"#line 471 \"[executable]/DET_HostFs.sql\"\n"
+"create procedure\n"
+"WS.WS.HOSTFS_GLOBAL_RESET ()\n"
"{\n"
-"if (OP.RESM_DATA is not null)\n"
-"WS.WS.HOSTFS_FEED_RDF_INVERSE (OP.RESM_DATA, OP.RESM_ID, 1, OP.RESM_TOPCOL_ID);\n"
-"if (NP.RESM_DATA is not null)\n"
-"WS.WS.HOSTFS_FEED_RDF_INVERSE (NP.RESM_DATA, NP.RESM_ID, 0, NP.RESM_TOPCOL_ID);\n"
+"set isolation = \'serializable\';\n"
+"delete from WS.WS.HOSTFS_RES_META;\n"
+"delete from WS.WS.HOSTFS_RES_CACHE;\n"
+"delete from WS.WS.HOSTFS_RES;\n"
+"delete from WS.WS.HOSTFS_COL;\n"
+"sequence_set (\'WS.WS.HOSTFS_COL_ID\', 0, 0);\n"
+"sequence_set (\'WS.WS.HOSTFS_RES_ID\', 0, 0);\n"
"}\n"
-"--src DET_HostFs.sql:147\n";
+"--src DET_HostFs.sql:469\n";
-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 *proc417 =
-"#line 171 \"[executable]/DET_HostFs.sql\"\n"
-"create function WS.WS.HOSTFS_RES_TOPCOL_ID (in r_id integer) returns integer\n"
+static const char *proc435 =
+"#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"
"{\n"
-"declare res, parent integer;\n"
-"whenever not found goto nf;\n"
-"res := parent := (select RES_COL from WS.WS.HOSTFS_RES where RES_ID = r_id);\n"
-"while (parent is not null)\n"
+"declare tmp varchar;\n"
+"tmp := file_stat (full_path);\n"
+"if (not isstring (tmp))\n"
+"return -1;\n"
+"cr_time := mod_time := cast (tmp as datetime);\n"
+"flen := cast (file_stat (full_path, 1) as integer);\n"
+"return 0;\n"
+"}\n"
+"--src DET_HostFs.sql:482\n";
+
+static const char *proc436 =
+"#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"
"{\n"
-"res := parent;\n"
-"parent := (select COL_PARENT_ID from WS.WS.HOSTFS_COL where COL_ID = res);\n"
+"declare mt varchar;\n"
+"mt := http_mime_type (full_path);\n"
+"mimetype := mt;\n"
+"if (\'text/html\' = mt)\n"
+"ft_mode := \'x\';\n"
+"else if (\'text/xml\' = mt)\n"
+"ft_mode := \'x\';\n"
+"else if (\'text/xhtml\' = mt)\n"
+"ft_mode := \'x\';\n"
+"else if (\'%+xml\' = mt)\n"
+"ft_mode := \'x\';\n"
+"else if (mt like \'text/%\')\n"
+"ft_mode := \'t\';\n"
+"else\n"
+"ft_mode := \'N\';\n"
+"}\n"
+"--src DET_HostFs.sql:495\n";
+
+static const char *proc437 =
+"#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"
+"\n"
+"declare puid, pgid integer;\n"
+"declare pperms varchar;\n"
+"if (auth_uid < 0)\n"
+"return auth_uid;\n"
+"puid := http_dav_uid();\n"
+"pgid := coalesce (\n"
+"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
+"where G_NAME = \'HostFs_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'HostFs\'), \'\')\n"
+"), http_admin_gid() );\n"
+"pperms := \'110100100RR\';\n"
+"if ((what <> \'R\') and (what <> \'C\'))\n"
+"return -14;\n"
+"if (DAV_CHECK_PERM (pperms, req, auth_uid, null, pgid, puid))\n"
+"return auth_uid;\n"
+"return -13;\n"
+"}\n"
+"--src DET_HostFs.sql:517\n";
+
+static const char *proc438 =
+"#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"
+"declare rc integer;\n"
+"declare puid, pgid integer;\n"
+"declare u_password, pperms varchar;\n"
+"declare allow_anon integer;\n"
+"if (length (req) <> 3)\n"
+"return -15;\n"
+"\n"
+"whenever not found goto nf_col_or_res;\n"
+"puid := http_dav_uid();\n"
+"pgid := coalesce (\n"
+"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
+"where G_NAME = \'HostFs_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'HostFs\'), \'\')\n"
+"), http_admin_gid() );\n"
+"pperms := \'110100100RR\';\n"
+"if ((what <> \'R\') and (what <> \'C\'))\n"
+"return -14;\n"
+"allow_anon := WS.WS.PERM_COMP (substring (cast (pperms as varchar), 7, 3), req);\n"
+"if (a_uid is null)\n"
+"{\n"
+"if ((not allow_anon) or (\'\' <> WS.WS.FINDPARAM (a_lines, \'Authorization:\')))\n"
+"rc := WS.WS.GET_DAV_AUTH (a_lines, allow_anon, can_write_http, a_uname, u_password, a_uid, a_gid, _perms);\n"
+"if (rc < 0)\n"
+"return rc;\n"
+"}\n"
+"if (isinteger (a_uid))\n"
+"{\n"
+"if (a_uid < 0)\n"
+"return a_uid;\n"
+"if (a_uid = 1)\n"
+"{\n"
+"a_uid := http_nobody_uid ();\n"
+"a_gid := http_nogroup_gid ();\n"
"}\n"
-"return res;\n"
-"nf:\n"
-"return 0;\n"
"}\n"
-"--src DET_HostFs.sql:169\n";
+"if (DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
+"return a_uid;\n"
+"return -13;\n"
+"\n"
+"nf_col_or_res:\n"
+"return -1;\n"
+"}\n"
+"--src DET_HostFs.sql:538\n";
-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"
+static const char *proc439 =
+"#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"
-"declare resttype varchar;\n"
-"declare old_prop_id integer;\n"
-"declare html_start, full_xml any;\n"
-"declare old_n3, addon_n3 any;\n"
-"\n"
-"html_start := null;\n"
-"full_xml := null;\n"
-"\n"
-"restype := DAV_GUESS_MIME_TYPE (resname, rescontent, html_start);\n"
"\n"
-"if (restype is null)\n"
-"return;\n"
-"addon_n3 := call (\'DAV_EXTRACT_RDF_\' || restype)(resname, rescontent, html_start);\n"
+"return -20;\n"
+"}\n"
+"--src DET_HostFs.sql:583\n";
+
+static const char *proc440 =
+"#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"
+"declare ospath varchar;\n"
"\n"
-"if (addon_n3 is null)\n"
-"return;\n"
-"insert replacing WS.WS.HOSTFS_RES_META (RESM_ID, RESM_DATA, RESM_TOPCOL_ID)\n"
-"values\n"
-"(resid, xml_tree_doc (DAV_RDF_PREPROCESS_RDFXML (addon_n3, N\'http://local.virt/this\', 1)), topcol_id);\n"
-"return;\n"
+"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
"\n"
-"no_op:\n"
-" ;\n"
+"system (sprintf (\'mkdir \'\'%s\'\'\', ospath));\n"
+"WS.WS.HOSTFS_FIND_COL (ospath);\n"
+"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
"}\n"
-"--src DET_HostFs.sql:185\n";
+"--src DET_HostFs.sql:590\n";
-static const char *proc419 =
-"#line 215 \"[executable]/DET_HostFs.sql\"\n"
-"create procedure WS.WS.HOSTFS_TEST_RDF (in d_id integer)\n"
+static const char *proc441 =
+"#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"
"\n"
-"for select RES_COL, RES_NAME, RES_TYPE, RES_FT_MODE from WS.WS.HOSTFS_RES where RES_ID = d_id do\n"
+"return -20;\n"
+"}\n"
+"--src DET_HostFs.sql:602\n";
+
+static const char *proc442 =
+"#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"
"\n"
-"if (\'N\' = RES_FT_MODE)\n"
-"{\n"
-"return 1;\n"
+"return -20;\n"
"}\n"
-"else if ((\'T\' = RES_FT_MODE) or (\'X\' = RES_FT_MODE))\n"
-"{\n"
-"for select RESC_DATA, RESC_TOPCOL_ID from WS.WS.HOSTFS_RES_CACHE where RESC_ID = d_id do\n"
+"--src DET_HostFs.sql:609\n";
+
+static const char *proc443 =
+"#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"
-"WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (d_id, RES_NAME, RES_TYPE, RESC_DATA, RESC_TOPCOL_ID);\n"
-"}\n"
+"declare ospath varchar;\n"
+"\n"
+"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
+"\n"
+"system (sprintf (\'rm -rf \'\'%s\'\'\', ospath));\n"
"return 1;\n"
"}\n"
-"else if ((\'t\' = RES_FT_MODE) or (\'x\' = RES_FT_MODE))\n"
+"--src DET_HostFs.sql:616\n";
+
+static const char *tbl7 =
+"create table \"HostFs_DAV_RES_UPLOAD\" (ID varchar primary key, DT datetime, CNT long varchar)\n";
+
+static const char *proc444 =
+"#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"
-"for select COL_FULL_PATH from WS.WS.HOSTFS_COL where COL_ID = RES_COL do\n"
+"declare ospath varchar;\n"
+"declare rc integer;\n"
+"\n"
+"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
+"if (__tag (content) = 126)\n"
"{\n"
-"declare ses any;\n"
+"declare p varchar;\n"
+"p := \'[\' || serialize (now()) || \'][\' || serialize (detcol_id) || \'][\' || serialize (path_parts) || \']\';\n"
+"insert into \"HostFs_DAV_RES_UPLOAD\" values (p, now(), content);\n"
"\n"
-"ses := file_to_string_output (COL_FULL_PATH || RES_NAME);\n"
-"WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (d_id, RES_NAME, RES_TYPE, ses, WS.WS.HOSTFS_RES_TOPCOL_ID (d_id));\n"
-"}\n"
-"return 1;\n"
+"string_to_file (ospath, coalesce ((select CNT from \"HostFs_DAV_RES_UPLOAD\" where ID=p), 1), -2);\n"
"}\n"
+"else\n"
+"string_to_file (ospath, content, -2);\n"
+"rc := WS.WS.HOSTFS_TOUCH_RES (ospath);\n"
+"if (rc < 0)\n"
+"return -28;\n"
+"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
"}\n"
-"return 0;\n"
+"--src DET_HostFs.sql:630\n";
+
+static const char *proc445 =
+"#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"
+"\n"
+"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:213\n";
+"--src DET_HostFs.sql:653\n";
-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"
+static const char *proc446 =
+"#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"
"\n"
-"whenever sqlstate \'*\' goto done;\n"
-"for select RES_COL, RES_NAME, RES_TYPE, RES_FT_MODE from WS.WS.HOSTFS_RES where RES_ID = d_id do\n"
+"if (propname[0] = 58)\n"
+"{\n"
+"return -16;\n"
+"}\n"
+"return -20;\n"
+"}\n"
+"--src DET_HostFs.sql:660\n";
+
+static const char *proc447 =
+"#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"
+"declare ospath varchar;\n"
+"ospath := id[2];\n"
"\n"
-"if (\'N\' = RES_FT_MODE)\n"
+"if (not isstring (file_stat (ospath)))\n"
"{\n"
-"vt_batch_feed (vtb, RES_NAME, 0, 0);\n"
-"return 1;\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
+"return -1;\n"
"}\n"
-"else if ((\'T\' = RES_FT_MODE) or (\'X\' = RES_FT_MODE))\n"
+"return -11;\n"
+"}\n"
+"--src DET_HostFs.sql:671\n";
+
+static const char *proc448 =
+"#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"
-"for select RESC_DATA, RESC_TOPCOL_ID from WS.WS.HOSTFS_RES_CACHE where RESC_ID = d_id do\n"
+"declare ospath varchar;\n"
+"ospath := id[2];\n"
+"\n"
+"if (not isstring (file_stat (ospath)))\n"
"{\n"
-"vt_batch_feed (vtb, RESC_DATA, 0, case (RES_FT_MODE) when \'X\' then 2 else 0 end);\n"
-"WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (d_id, RES_NAME, RES_TYPE, RESC_DATA, RESC_TOPCOL_ID);\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
+"return -1;\n"
"}\n"
-"return 1;\n"
+"return vector ();\n"
"}\n"
-"else if ((\'t\' = RES_FT_MODE) or (\'x\' = RES_FT_MODE))\n"
+"--src DET_HostFs.sql:686\n";
+
+static const char *proc449 =
+"#line 703 \"[executable]/DET_HostFs.sql\"\n"
+"create function \"HostFs_ID_TO_OSPATH\" (in col any)\n"
"{\n"
-"for select COL_FULL_PATH from WS.WS.HOSTFS_COL where COL_ID = RES_COL do\n"
+"declare res varchar;\n"
+"declare ctr, len integer;\n"
+"if (isinteger (col))\n"
+"return coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID = col), \' no such \');\n"
+"return col[2];\n"
+"}\n"
+"--src DET_HostFs.sql:701\n";
+
+static const char *proc450 =
+"#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"
-"declare ses any;\n"
+"declare fullname, name, tmp, mimetype, ft_mode varchar;\n"
+"declare cr_time, mod_time datetime;\n"
+"declare puid, pgid, flen, rc integer;\n"
"\n"
-"ses := file_to_string_output (COL_FULL_PATH || RES_NAME);\n"
-"vt_batch_feed (vtb, ses, 0, case (RES_FT_MODE) when \'x\' then 2 else 0 end);\n"
-"WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (d_id, RES_NAME, RES_TYPE, ses, WS.WS.HOSTFS_RES_TOPCOL_ID (d_id));\n"
+"fullname := id[2];\n"
+"rc := WS.WS.HOSTFS_PATH_STAT (fullname, flen, cr_time, mod_time);\n"
+"if (rc < 0)\n"
+"{\n"
+"if (\'R\' = what)\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (fullname);\n"
+"else\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (fullname);\n"
+"return -1;\n"
"}\n"
-"return 1;\n"
+"name := subseq (fullname, strrchr (fullname, \'/\') + 1);\n"
+"if (path is null)\n"
+"path := \"HostFs_DAV_SEARCH_PATH\" (id, what);\n"
+"puid := http_dav_uid();\n"
+"pgid := coalesce (\n"
+"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
+"where G_NAME = \'HostFs_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'HostFs\'), \'\')\n"
+"), puid+1);\n"
+"if (\'R\' = what)\n"
+"{\n"
+"WS.WS.HOSTFS_READ_TYPEINFO (fullname, mimetype, ft_mode);\n"
+"WS.WS.HOSTFS_HANDLE_RES_SCAN (fullname, null, flen, cr_time, mod_time, mimetype, ft_mode);\n"
+"return vector (path, \'R\', flen, mod_time, id, \'110000000RR\', pgid, puid, cr_time, mimetype, name);\n"
"}\n"
+"if (\'C\' = what)\n"
+"{\n"
+"return vector (DAV_CONCAT_PATH (path, \'/\'), \'C\', flen, mod_time, id, \'110000000RR\', pgid, puid, cr_time, \'dav/unix-directory\', name);\n"
"}\n"
-"done:\n"
-"\n"
-"return 1;\n"
+"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:247\n";
+"--src DET_HostFs.sql:711\n";
-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"
+static const char *proc451 =
+"#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"
+"declare ospath, name, fullname, top_davpath varchar;\n"
+"declare stale_files, files, stale_dirs, dirs, res any;\n"
+"declare ctr, len integer;\n"
+"declare tmp, mimetype, ft_mode varchar;\n"
+"declare cr_time, mod_time datetime;\n"
+"declare puid, pgid, flen, rc, parent_c_id, r_id integer;\n"
+"\n"
+"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
+"top_davpath := DAV_CONCAT_PATH (detcol_path, path_parts);\n"
+"whenever sqlstate \'39000\' goto no_dir;\n"
+"dirs := sys_dirlist (ospath, 0);\n"
+"parent_c_id := WS.WS.HOSTFS_FIND_COL (ospath);\n"
+"if (parent_c_id is null)\n"
+"select VECTOR_AGG (COL_FULL_PATH) into stale_dirs from WS.WS.HOSTFS_COL where COL_PARENT_ID is null and 0 = position (COL_NAME, dirs);\n"
+"else\n"
+"select VECTOR_AGG (COL_FULL_PATH) into stale_dirs from WS.WS.HOSTFS_COL where COL_PARENT_ID = parent_c_id and 0 = position (COL_NAME, dirs);\n"
+"foreach (varchar stale_fullname in stale_dirs) do\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (stale_fullname);\n"
+"puid := http_dav_uid();\n"
+"pgid := coalesce (\n"
+"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
+"where G_NAME = \'HostFs_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID = detcol_id and COL_DET=\'HostFs\'), \'\')\n"
+"), puid+1);\n"
+"vectorbld_init (res);\n"
+"len := length (dirs);\n"
+"ctr := 0;\n"
+"while (ctr < len)\n"
"{\n"
-"whenever sqlstate \'*\' goto done;\n"
-"for select RES_COL, RES_NAME, RES_TYPE, RES_FT_MODE from WS.WS.HOSTFS_RES where RES_ID = d_id do\n"
+"name := dirs [ctr];\n"
+"if ((name <> \'.\') and (name <> \'..\'))\n"
"{\n"
-"if (\'N\' = RES_FT_MODE)\n"
+"fullname := DAV_CONCAT_PATH (ospath, name);\n"
+"\n"
+"rc := WS.WS.HOSTFS_PATH_STAT (fullname, flen, cr_time, mod_time);\n"
+"if (rc < 0)\n"
"{\n"
-"vt_batch_feed (vtb, RES_NAME, 1, 0);\n"
-"return 1;\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (fullname);\n"
"}\n"
-"else if ((\'T\' = RES_FT_MODE) or (\'X\' = RES_FT_MODE))\n"
+"else\n"
"{\n"
-"for select RESC_DATA from WS.WS.HOSTFS_RES_CACHE where RESC_ID = d_id do\n"
-"vt_batch_feed (vtb, RESC_DATA, 1, case (RES_FT_MODE) when \'X\' then 2 else 0 end);\n"
-"return 1;\n"
+"vectorbld_acc (res, vector (\n"
+"DAV_CONCAT_PATH (top_davpath, name) || \'/\', \'C\',\n"
+"flen,\n"
+"mod_time,\n"
+"vector (UNAME\'HostFs\', detcol_id, fullname),\n"
+"\'110100000RR\', pgid, puid,\n"
+"cr_time,\n"
+"\'dav/unix-directory\',\n"
+"name ) );\n"
+"if (recursive > 0)\n"
+"vectorbld_concat_acc (res,\n"
+"\"HostFs_DAV_DIR_LIST\" (detcol_id,\n"
+"vector_concat (subseq (path_parts, 0, length (path_parts)-1), vector (name, \'\')),\n"
+"concat (DAV_CONCAT_PATH (detcol_path, name), \'/\'), name_mask, recursive, auth_uid) );\n"
"}\n"
"}\n"
-"done:\n"
-"return 1;\n"
+"ctr := ctr + 1;\n"
"}\n"
-"--src DET_HostFs.sql:288\n";
-
-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 *proc422 =
-"#line 325 \"[executable]/DET_HostFs.sql\"\n"
-"create function\n"
-"WS.WS.HOSTFS_FIND_COL (in full_path varchar) returns integer\n"
-"{\n"
-"declare slash_pos, parent, len, res integer;\n"
-"declare parent_path, cname, tmp varchar;\n"
-"declare cr_time datetime;\n"
-"len := length (full_path);\n"
-"if ((len > 0) and full_path[len-1] = 47)\n"
-"full_path := subseq (full_path, 0, len-1);\n"
-"whenever not found goto not_found;\n"
-"select COL_ID into res from WS.WS.HOSTFS_COL where COL_FULL_PATH = full_path || \'/\';\n"
-"return res;\n"
-"not_found:\n"
-"slash_pos := strrchr (full_path, \'/\');\n"
-"if (slash_pos is null)\n"
+"files := sys_dirlist (ospath, 1);\n"
+"if (parent_c_id is null)\n"
+"select VECTOR_AGG (RES_NAME) into stale_files from WS.WS.HOSTFS_RES where RES_COL is null and 0 = position (RES_NAME, files);\n"
+"else\n"
+"select VECTOR_AGG (RES_NAME) into stale_files from WS.WS.HOSTFS_RES where RES_COL = parent_c_id and 0 = position (RES_NAME, files);\n"
+"foreach (varchar stale_name in stale_files) do\n"
"{\n"
-"parent := null;\n"
-"cname := full_path;\n"
+"r_id := coalesce ((select RES_ID from WS.WS.HOSTFS_RES where RES_COL = parent_c_id and RES_NAME = stale_name));\n"
+"delete from WS.WS.HOSTFS_RES_META where RESM_ID = r_id;\n"
+"delete from WS.WS.HOSTFS_RES_CACHE where RESC_ID = r_id;\n"
+"delete from WS.WS.HOSTFS_RES where RES_ID = r_id;\n"
"}\n"
-"else\n"
+"len := length (files);\n"
+"ctr := 0;\n"
+"while (ctr < len)\n"
"{\n"
-"parent := WS.WS.HOSTFS_FIND_COL (subseq (full_path, 0, slash_pos));\n"
-"cname := subseq (full_path, slash_pos + 1);\n"
+"name := files [ctr];\n"
+"fullname := DAV_CONCAT_PATH (ospath, name);\n"
+"rc := WS.WS.HOSTFS_PATH_STAT (fullname, flen, cr_time, mod_time);\n"
+"if (rc < 0)\n"
+"{\n"
+"delete from WS.WS.HOSTFS_RES_META where RESM_ID = r_id;\n"
+"delete from WS.WS.HOSTFS_RES_CACHE where RESC_ID = r_id;\n"
+"delete from WS.WS.HOSTFS_RES where RES_ID = r_id;\n"
"}\n"
-"tmp := file_stat (full_path);\n"
-"if (isstring (tmp))\n"
-"cr_time := cast (tmp as datetime);\n"
"else\n"
-"cr_time := null;\n"
-"res := sequence_next (\'WS.WS.HOSTFS_COL_ID\') + 1;\n"
-"insert into WS.WS.HOSTFS_COL\n"
-"(COL_ID , COL_FULL_PATH , COL_PARENT_ID , COL_CR_TIME , COL_MOD_TIME , COL_SCAN_TIME , COL_NEXT_SCAN_TIME , COL_NAME )\n"
-"values\n"
-"(res , full_path || \'/\' , parent , cr_time , cr_time , NULL , now () , cname );\n"
-"return res;\n"
-"}\n"
-"--src DET_HostFs.sql:323\n";
-
-static const char *proc423 =
-"#line 363 \"[executable]/DET_HostFs.sql\"\n"
-"create procedure\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (in full_path varchar)\n"
-"{\n"
-"declare len integer;\n"
-"len := length (full_path);\n"
-"if ((len > 0) and full_path[len-1] = 47)\n"
-"full_path := subseq (full_path, 0, len-1);\n"
-"for select COL_ID from WS.WS.HOSTFS_COL where COL_FULL_PATH between full_path || \'/\' and full_path || \'0\' do\n"
"{\n"
-"for select RES_ID from WS.WS.HOSTFS_RES where RES_COL = COL_ID do\n"
+"WS.WS.HOSTFS_READ_TYPEINFO (fullname, mimetype, ft_mode);\n"
+"WS.WS.HOSTFS_HANDLE_RES_SCAN (fullname, parent_c_id, flen, cr_time, mod_time, mimetype, ft_mode);\n"
+"if (name like name_mask)\n"
"{\n"
-"delete from WS.WS.HOSTFS_RES_META where RESM_ID = RES_ID;\n"
-"delete from WS.WS.HOSTFS_RES_CACHE where RESC_ID = RES_ID;\n"
+"\n"
+"vectorbld_acc (res, vector (\n"
+"DAV_CONCAT_PATH (top_davpath, name), \'R\',\n"
+"flen,\n"
+"mod_time,\n"
+"vector (UNAME\'HostFs\', detcol_id, fullname),\n"
+"\'110100000RR\', pgid, puid,\n"
+"cr_time,\n"
+"mimetype,\n"
+"name ) );\n"
"}\n"
-"delete from WS.WS.HOSTFS_RES where RES_COL = COL_ID;\n"
"}\n"
-"delete from WS.WS.HOSTFS_COL where COL_FULL_PATH between full_path || \'/\' and full_path || \'0\';\n"
+"ctr := ctr + 1;\n"
"}\n"
-"--src DET_HostFs.sql:361\n";
+"update WS.WS.HOSTFS_COL set COL_MOD_TIME = now() where COL_ID = parent_c_id and COL_MOD_TIME < now();\n"
+"vectorbld_final (res);\n"
+"\n"
+"return res;\n"
+"\n"
+"no_dir:\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
+"return vector();\n"
+"}\n"
+"--src DET_HostFs.sql:749\n";
-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"
-"{\n"
-"declare len, slash_pos integer;\n"
-"declare r_id integer;\n"
-"len := length (full_path);\n"
-"if ((len = 0) or (full_path[len-1] = 47))\n"
-"return;\n"
-"slash_pos := strrchr (full_path, \'/\');\n"
-"if (c_id is null)\n"
+static const char *proc452 =
+"#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"
-"if (slash_pos is null)\n"
-"c_id := WS.WS.HOSTFS_FIND_COL (\'\');\n"
-"else\n"
-"c_id := WS.WS.HOSTFS_FIND_COL (subseq (full_path, 0, slash_pos));\n"
+"\n"
+"return vector ();\n"
"}\n"
-"r_id := coalesce ((select RES_ID from WS.WS.HOSTFS_RES where RES_NAME = subseq (full_path, slash_pos + 1) and RES_COL = c_id));\n"
-"if (r_id is null)\n"
+"--src DET_HostFs.sql:866\n";
+
+static const char *proc453 =
+"#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"
-"r_id := sequence_next (\'WS.WS.HOSTFS_RES_ID\') + 1;\n"
-"insert into WS.WS.HOSTFS_RES\n"
-"(RES_ID , RES_NAME, RES_COL, RES_TYPE, RES_FT_MODE, RES_LENGTH, RES_CR_TIME, RES_MOD_TIME, RES_SCAN_TIME, RES_NEXT_SCAN_TIME, RES_PERMS)\n"
-"values\n"
-"(r_id , subseq (full_path, slash_pos + 1), c_id, mimetype, ft_mode, flen, cr_time, mod_time, now(), null, null);\n"
+"declare ospath, stat varchar;\n"
"\n"
-"insert replacing WS.WS.HOSTFS_RES_CACHE\n"
-"(RESC_ID , RESC_MOD_SCAN_TIME , RESC_DATA , RESC_TOPCOL_ID )\n"
-"values\n"
-"(r_id , now() , null , WS.WS.HOSTFS_RES_TOPCOL_ID (r_id) );\n"
+"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
+"stat := file_stat (ospath, 2);\n"
+"if (not isstring (stat))\n"
+"{\n"
+"\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
+"return -1;\n"
"}\n"
-"else\n"
+"if (what = \'R\')\n"
"{\n"
-"if (exists (select top 1 1 from WS.WS.HOSTFS_RES\n"
-"where RES_ID = r_id and\n"
-"((RES_LENGTH <> flen) or (RES_MOD_TIME <> mod_time) or (RES_TYPE <> mimetype) or (RES_FT_MODE <> ft_mode)) ) )\n"
+"if (0 = bit_and (32768, cast (stat as integer)))\n"
"{\n"
-"update WS.WS.HOSTFS_RES set RES_LENGTH = flen, RES_MOD_TIME = mod_time, RES_TYPE = mimetype, RES_FT_MODE = ft_mode, RES_SCAN_TIME = now() where RES_ID = r_id;\n"
"\n"
-"update WS.WS.HOSTFS_RES_CACHE set RESC_MOD_SCAN_TIME = now();\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
+"return -1;\n"
+"}\n"
"}\n"
"else\n"
"{\n"
-"update WS.WS.HOSTFS_RES set RES_SCAN_TIME = now() where (RES_ID = r_id) and RES_SCAN_TIME <> now ();\n"
+"if (0 = bit_and (16384, cast (stat as integer)))\n"
+"{\n"
+"\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
+"return -1;\n"
"}\n"
"}\n"
+"\n"
+"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
"}\n"
-"--src DET_HostFs.sql:381\n";
+"--src DET_HostFs.sql:874\n";
-static const char *proc425 =
-"#line 431 \"[executable]/DET_HostFs.sql\"\n"
-"create procedure\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (in full_path varchar)\n"
+static const char *proc454 =
+"#line 912 \"[executable]/DET_HostFs.sql\"\n"
+"create function \"HostFs_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
-"declare len, slash_pos integer;\n"
-"declare c_id, r_id integer;\n"
-"len := length (full_path);\n"
-"if ((len = 0) or full_path[len-1] = 47)\n"
-"return;\n"
-"slash_pos := strrchr (full_path, \'/\');\n"
-"c_id := coalesce ((select COL_ID from WS.WS.HOSTFS_COL where COL_FULL_PATH = subseq (full_path, 0, slash_pos + 1)));\n"
-"if (c_id is null)\n"
-"return;\n"
-"r_id := coalesce ((select RES_ID from WS.WS.HOSTFS_RES where RES_NAME = subseq (full_path, slash_pos + 1) and RES_COL = c_id));\n"
-"if (r_id is null)\n"
-"return;\n"
-"delete from WS.WS.HOSTFS_RES_CACHE where RESC_ID = r_id;\n"
-"delete from WS.WS.HOSTFS_RES where RES_ID = r_id;\n"
-"update WS.WS.HOSTFS_COL set COL_MOD_TIME = now() where COL_ID = c_id and COL_MOD_TIME < now();\n"
+"declare ospath varchar;\n"
+"declare slash_pos, detcol_fullpath integer;\n"
+"\n"
+"ospath := id[2];\n"
+"slash_pos := strchr (ospath, \'/\');\n"
+"detcol_fullpath := coalesce ((select WS.WS.COL_PATH (COL_ID) from WS.WS.SYS_DAV_COL where COL_ID = id[1] and COL_DET=\'HostFs\'));\n"
+"if (detcol_fullpath is null)\n"
+"return -23;\n"
+"if (not isstring (file_stat (ospath)))\n"
+"{\n"
+"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
+"return -23;\n"
"}\n"
-"--src DET_HostFs.sql:429\n";
+"return detcol_fullpath || subseq (ospath, slash_pos + 1);\n"
+"}\n"
+"--src DET_HostFs.sql:910\n";
-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"
+static const char *proc455 =
+"#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"
-"declare mimetype, ft_mode varchar;\n"
-"declare cr_time, mod_time datetime;\n"
-"declare flen, rc integer;\n"
+"declare ospath varchar;\n"
"\n"
-"rc := WS.WS.HOSTFS_PATH_STAT (ospath, flen, cr_time, mod_time);\n"
+"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
+"if (what = \'R\')\n"
+"{\n"
+"declare cnt any;\n"
+"declare mime_type varchar;\n"
+"declare rc integer;\n"
+"rc := DAV_RES_CONTENT_INT (source_id, cnt, mime_type, 0, 0);\n"
"if (rc < 0)\n"
"{\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
-"return -1;\n"
+"\n"
+"return rc;\n"
"}\n"
-"WS.WS.HOSTFS_READ_TYPEINFO (ospath, mimetype, ft_mode);\n"
-"WS.WS.HOSTFS_HANDLE_RES_SCAN (ospath, null, flen, cr_time, mod_time, mimetype, ft_mode);\n"
-"return 0;\n"
+"string_to_file (ospath, case (__tag (cnt)) when 126 then blob_to_string (cnt) else cnt end, -2);\n"
+"rc := WS.WS.HOSTFS_TOUCH_RES (ospath);\n"
+"if (rc < 0)\n"
+"return -28;\n"
+"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
"}\n"
-"--src DET_HostFs.sql:450\n";
+"return -20;\n"
+"}\n"
+"--src DET_HostFs.sql:930\n";
-static const char *proc427 =
-"#line 471 \"[executable]/DET_HostFs.sql\"\n"
-"create procedure\n"
-"WS.WS.HOSTFS_GLOBAL_RESET ()\n"
+static const char *proc456 =
+"#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"
-"set isolation = \'serializable\';\n"
-"delete from WS.WS.HOSTFS_RES_META;\n"
-"delete from WS.WS.HOSTFS_RES_CACHE;\n"
-"delete from WS.WS.HOSTFS_RES;\n"
-"delete from WS.WS.HOSTFS_COL;\n"
-"sequence_set (\'WS.WS.HOSTFS_COL_ID\', 0, 0);\n"
-"sequence_set (\'WS.WS.HOSTFS_RES_ID\', 0, 0);\n"
+"declare ospath, src_path varchar;\n"
+"\n"
+"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
+"if (what = \'R\')\n"
+"{\n"
+"declare cnt any;\n"
+"declare mime_type varchar;\n"
+"declare rc integer;\n"
+"rc := DAV_RES_CONTENT_INT (source_id, cnt, mime_type, 0, 0);\n"
+"if (rc < 0)\n"
+"{\n"
+"\n"
+"return rc;\n"
"}\n"
-"--src DET_HostFs.sql:469\n";
+"string_to_file (ospath, case (__tag (cnt)) when 126 then blob_to_string (cnt) else cnt end, -2);\n"
+"rc := WS.WS.HOSTFS_TOUCH_RES (ospath);\n"
+"if (rc < 0)\n"
+"return -28;\n"
+"src_path := DAV_SEARCH_PATH (source_id, \'R\');\n"
+"if (src_path is not null)\n"
+"DAV_DELETE_INT (src_path, 1, null, null, 0);\n"
+"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
+"}\n"
+"return -20;\n"
+"}\n"
+"--src DET_HostFs.sql:956\n";
-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"
+static const char *proc457 =
+"#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"
-"declare tmp varchar;\n"
-"tmp := file_stat (full_path);\n"
-"if (not isstring (tmp))\n"
-"return -1;\n"
-"cr_time := mod_time := cast (tmp as datetime);\n"
-"flen := cast (file_stat (full_path, 1) as integer);\n"
+"\n"
+"whenever sqlstate \'*\' goto no_res;\n"
+"declare ft_mode varchar;\n"
+"if ((content_mode = 0) or (content_mode = 2))\n"
+"content := file_to_string (id[2]);\n"
+"else if (content_mode = 1)\n"
+"file_append_to_string_output (id[2], content);\n"
+"else if (content_mode = 3)\n"
+"http_file (id[2]);\n"
+"WS.WS.HOSTFS_READ_TYPEINFO (id[2], type, ft_mode);\n"
"return 0;\n"
+"\n"
+"no_res:\n"
+"\n"
+"WS.WS.HOSTFS_RES_DISAPPEARS (id[2]);\n"
+"return -1;\n"
"}\n"
-"--src DET_HostFs.sql:482\n";
+"--src DET_HostFs.sql:985\n";
-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"
+static const char *proc458 =
+"#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"
-"declare mt varchar;\n"
-"mt := http_mime_type (full_path);\n"
-"mimetype := mt;\n"
-"if (\'text/html\' = mt)\n"
-"ft_mode := \'x\';\n"
-"else if (\'text/xml\' = mt)\n"
-"ft_mode := \'x\';\n"
-"else if (\'text/xhtml\' = mt)\n"
-"ft_mode := \'x\';\n"
-"else if (\'%+xml\' = mt)\n"
-"ft_mode := \'x\';\n"
-"else if (mt like \'text/%\')\n"
-"ft_mode := \'t\';\n"
-"else\n"
-"ft_mode := \'N\';\n"
+"\n"
+"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:495\n";
+"--src DET_HostFs.sql:1006\n";
-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"
+static const char *proc459 =
+"#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"
"\n"
-"declare puid, pgid integer;\n"
-"declare pperms varchar;\n"
-"if (auth_uid < 0)\n"
-"return auth_uid;\n"
-"puid := http_dav_uid();\n"
-"pgid := coalesce (\n"
-"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
-"where G_NAME = \'HostFs_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'HostFs\'), \'\')\n"
-"), http_admin_gid() );\n"
-"pperms := \'110100100RR\';\n"
-"if ((what <> \'R\') and (what <> \'C\'))\n"
-"return -14;\n"
-"if (DAV_CHECK_PERM (pperms, req, auth_uid, null, pgid, puid))\n"
-"return auth_uid;\n"
-"return -13;\n"
+"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:517\n";
+"--src DET_HostFs.sql:1013\n";
-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"
+static const char *proc460 =
+"#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"
-"declare rc integer;\n"
-"declare puid, pgid integer;\n"
-"declare u_password, pperms varchar;\n"
-"declare allow_anon integer;\n"
-"if (length (req) <> 3)\n"
-"return -15;\n"
"\n"
-"whenever not found goto nf_col_or_res;\n"
-"puid := http_dav_uid();\n"
-"pgid := coalesce (\n"
-"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
-"where G_NAME = \'HostFs_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'HostFs\'), \'\')\n"
-"), http_admin_gid() );\n"
-"pperms := \'110100100RR\';\n"
-"if ((what <> \'R\') and (what <> \'C\'))\n"
-"return -14;\n"
-"allow_anon := WS.WS.PERM_COMP (substring (cast (pperms as varchar), 7, 3), req);\n"
-"if (a_uid is null)\n"
-"{\n"
-"if ((not allow_anon) or (\'\' <> WS.WS.FINDPARAM (a_lines, \'Authorization:\')))\n"
-"rc := WS.WS.GET_DAV_AUTH (a_lines, allow_anon, can_write_http, a_uname, u_password, a_uid, a_gid, _perms);\n"
-"if (rc < 0)\n"
-"return rc;\n"
+"return -27;\n"
"}\n"
-"if (isinteger (a_uid))\n"
-"{\n"
-"if (a_uid < 0)\n"
-"return a_uid;\n"
-"if (a_uid = 1)\n"
+"--src DET_HostFs.sql:1020\n";
+
+static const char *proc461 =
+"#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"
-"a_uid := http_nobody_uid ();\n"
-"a_gid := http_nogroup_gid ();\n"
-"}\n"
-"}\n"
-"if (DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
-"return a_uid;\n"
-"return -13;\n"
+"declare rc integer;\n"
+"declare orig_id any;\n"
+"declare orig_type char(1);\n"
"\n"
-"nf_col_or_res:\n"
-"return -1;\n"
+"orig_id := id;\n"
+"id := orig_id[1];\n"
+"orig_type := type;\n"
+"type := \'C\';\n"
+"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if (rc <> 0)\n"
+"return rc;\n"
+"id := orig_id;\n"
+"type := orig_type;\n"
+"return 0;\n"
"}\n"
-"--src DET_HostFs.sql:538\n";
+"--src DET_HostFs.sql:1027\n";
-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"
+static const char *proc462 =
+"#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"
"\n"
-"return -20;\n"
+"return vector ();\n"
"}\n"
-"--src DET_HostFs.sql:583\n";
+"--src DET_HostFs.sql:1046\n";
-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"
+static const char *proc463 =
+"#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"
-"declare ospath varchar;\n"
+"declare topcol_name varchar;\n"
+"declare topcol_id integer;\n"
+"declare filter_length, p0_id, p1_id, p2_id, p3_id, p4_id, res0_id, res1_id, res2_id, res3_id, res4_id, res_last_id, res_id_max integer;\n"
+"declare plast_id integer;\n"
+"declare p0_val, p1_val, p2_val, p3_val, p4_val, v_last, v_max varchar;\n"
"\n"
-"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
"\n"
-"system (sprintf (\'mkdir \'\'%s\'\'\', ospath));\n"
-"WS.WS.HOSTFS_FIND_COL (ospath);\n"
-"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
-"}\n"
-"--src DET_HostFs.sql:590\n";
-
-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"
+"declare hit_ids any;\n"
+"declare c_last1 cursor for select HRI_CATVALUE from WS.WS.HOSTFS_RDF_INVERSE\n"
+"where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = plast_id and (v_max is null or HRI_CATVALUE > v_max)\n"
+"\n"
+"\n"
+" ;\n"
+"declare c_last2 cursor for select HRI_RES_ID, HRI_CATVALUE from WS.WS.HOSTFS_RDF_INVERSE\n"
+"where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = plast_id and (v_max is null or HRI_CATVALUE > v_max)\n"
+"\n"
+"\n"
+" ;\n"
+"declare c0 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p0_id and HRI_CATVALUE = p0_val and HRI_RES_ID >= res_id_max;\n"
+"declare c1 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p1_id and HRI_CATVALUE = p1_val and HRI_RES_ID >= res_id_max;\n"
+"declare c2 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p2_id and HRI_CATVALUE = p2_val and HRI_RES_ID >= res_id_max;\n"
+"declare c3 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p3_id and HRI_CATVALUE = p3_val and HRI_RES_ID >= res_id_max;\n"
+"declare c4 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p4_id and HRI_CATVALUE = p4_val and HRI_RES_ID >= res_id_max;\n"
"\n"
-"return -20;\n"
-"}\n"
-"--src DET_HostFs.sql:602\n";
-
-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"
+"topcol_name := coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID = detcol_id and COL_DET = \'HostFs\'));\n"
+"if (topcol_name is null)\n"
"{\n"
"\n"
-"return -20;\n"
+"return;\n"
"}\n"
-"--src DET_HostFs.sql:609\n";
-
-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"
-"declare ospath varchar;\n"
+"topcol_id := coalesce ((select COL_ID from WS.WS.HOSTFS_COL where COL_PARENT_ID is null and COL_NAME = topcol_name), WS.WS.HOSTFS_FIND_COL (topcol_name));\n"
+"filter_length := length (filter_data);\n"
+"plast_id := filter_data [filter_length - 1];\n"
+"res_id_max := 0;\n"
+"v_max := null;\n"
"\n"
-"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
"\n"
-"system (sprintf (\'rm -rf \'\'%s\'\'\', ospath));\n"
-"return 1;\n"
-"}\n"
-"--src DET_HostFs.sql:616\n";
-
-static const char *tbl7 =
-"create table \"HostFs_DAV_RES_UPLOAD\" (ID varchar primary key, DT datetime, CNT long varchar)\n";
-
-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"
+"if (filter_length = 2)\n"
"{\n"
-"declare ospath varchar;\n"
-"declare rc integer;\n"
+"whenever not found goto nf_c_last1;\n"
"\n"
-"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
-"if (__tag (content) = 126)\n"
+"open c_last1 (prefetch 1);\n"
+"while (1)\n"
"{\n"
-"declare p varchar;\n"
-"p := \'[\' || serialize (now()) || \'][\' || serialize (detcol_id) || \'][\' || serialize (path_parts) || \']\';\n"
-"insert into \"HostFs_DAV_RES_UPLOAD\" values (p, now(), content);\n"
+"fetch c_last1 into v_last;\n"
"\n"
-"string_to_file (ospath, coalesce ((select CNT from \"HostFs_DAV_RES_UPLOAD\" where ID=p), 1), -2);\n"
+"if (v_max is null or (v_last > v_max))\n"
+"{\n"
+"v_max := v_last;\n"
+"dict_put (distval_dict, v_last, 1);\n"
"}\n"
-"else\n"
-"string_to_file (ospath, content, -2);\n"
-"rc := WS.WS.HOSTFS_TOUCH_RES (ospath);\n"
-"if (rc < 0)\n"
-"return -28;\n"
-"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
"}\n"
-"--src DET_HostFs.sql:630\n";
-
-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"
-"\n"
-"return -20;\n"
+"nf_c_last1:\n"
+"close c_last1;\n"
+"return;\n"
"}\n"
-"--src DET_HostFs.sql:653\n";
-
-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"
"\n"
-"if (propname[0] = 58)\n"
+"res0_id := 0;\n"
+"res1_id := 0;\n"
+"res2_id := 0;\n"
+"res3_id := 0;\n"
+"res4_id := 0;\n"
+"hit_ids := dict_new ();\n"
+"\n"
+"p0_id := filter_data [1];\n"
+"p0_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [2]);\n"
+"if (filter_length = 6)\n"
"{\n"
-"return -16;\n"
-"}\n"
-"return -20;\n"
-"}\n"
-"--src DET_HostFs.sql:660\n";
-
-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"
+"whenever not found goto get_distincts_0;\n"
+"open c0 (prefetch 1);\n"
+"while (1)\n"
"{\n"
-"declare ospath varchar;\n"
-"ospath := id[2];\n"
+"while (res0_id <= res_id_max)\n"
+"fetch c0 into res0_id;\n"
+"res_id_max := res0_id;\n"
"\n"
-"if (not isstring (file_stat (ospath)))\n"
-"{\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
-"return -1;\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
"}\n"
-"return -11;\n"
"}\n"
-"--src DET_HostFs.sql:671\n";
-
-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"
-"declare ospath varchar;\n"
-"ospath := id[2];\n"
"\n"
-"if (not isstring (file_stat (ospath)))\n"
+"p1_id := filter_data [4+1];\n"
+"p1_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [4+2]);\n"
+"if (filter_length = 10)\n"
"{\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
-"return -1;\n"
-"}\n"
-"return vector ();\n"
-"}\n"
-"--src DET_HostFs.sql:686\n";
-
-static const char *proc442 =
-"#line 703 \"[executable]/DET_HostFs.sql\"\n"
-"create function \"HostFs_ID_TO_OSPATH\" (in col any)\n"
+"whenever not found goto get_distincts_1;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"while (1)\n"
"{\n"
-"declare res varchar;\n"
-"declare ctr, len integer;\n"
-"if (isinteger (col))\n"
-"return coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID = col), \' no such \');\n"
-"return col[2];\n"
-"}\n"
-"--src DET_HostFs.sql:701\n";
-
-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"
+"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max))\n"
"{\n"
-"declare fullname, name, tmp, mimetype, ft_mode varchar;\n"
-"declare cr_time, mod_time datetime;\n"
-"declare puid, pgid, flen, rc integer;\n"
"\n"
-"fullname := id[2];\n"
-"rc := WS.WS.HOSTFS_PATH_STAT (fullname, flen, cr_time, mod_time);\n"
-"if (rc < 0)\n"
-"{\n"
-"if (\'R\' = what)\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (fullname);\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
+"}\n"
"else\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (fullname);\n"
-"return -1;\n"
+"res_id_max := res_id_max + 1;\n"
+"\n"
"}\n"
-"name := subseq (fullname, strrchr (fullname, \'/\') + 1);\n"
-"if (path is null)\n"
-"path := \"HostFs_DAV_SEARCH_PATH\" (id, what);\n"
-"puid := http_dav_uid();\n"
-"pgid := coalesce (\n"
-"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
-"where G_NAME = \'HostFs_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'HostFs\'), \'\')\n"
-"), puid+1);\n"
-"if (\'R\' = what)\n"
-"{\n"
-"WS.WS.HOSTFS_READ_TYPEINFO (fullname, mimetype, ft_mode);\n"
-"WS.WS.HOSTFS_HANDLE_RES_SCAN (fullname, null, flen, cr_time, mod_time, mimetype, ft_mode);\n"
-"return vector (path, \'R\', flen, mod_time, id, \'110000000RR\', pgid, puid, cr_time, mimetype, name);\n"
"}\n"
-"if (\'C\' = what)\n"
+"\n"
+"p2_id := filter_data [8+1];\n"
+"p2_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [8+2]);\n"
+"if (filter_length = 14)\n"
"{\n"
-"return vector (DAV_CONCAT_PATH (path, \'/\'), \'C\', flen, mod_time, id, \'110000000RR\', pgid, puid, cr_time, \'dav/unix-directory\', name);\n"
+"whenever not found goto get_distincts_2;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"\n"
+"\n"
+"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
+"\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max))\n"
+"{\n"
+"\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
+"}\n"
"}\n"
-"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:711\n";
-
-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"
-"declare ospath, name, fullname, top_davpath varchar;\n"
-"declare stale_files, files, stale_dirs, dirs, res any;\n"
-"declare ctr, len integer;\n"
-"declare tmp, mimetype, ft_mode varchar;\n"
-"declare cr_time, mod_time datetime;\n"
-"declare puid, pgid, flen, rc, parent_c_id, r_id integer;\n"
"\n"
-"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
-"top_davpath := DAV_CONCAT_PATH (detcol_path, path_parts);\n"
-"whenever sqlstate \'39000\' goto no_dir;\n"
-"dirs := sys_dirlist (ospath, 0);\n"
-"parent_c_id := WS.WS.HOSTFS_FIND_COL (ospath);\n"
-"if (parent_c_id is null)\n"
-"select VECTOR_AGG (COL_FULL_PATH) into stale_dirs from WS.WS.HOSTFS_COL where COL_PARENT_ID is null and 0 = position (COL_NAME, dirs);\n"
-"else\n"
-"select VECTOR_AGG (COL_FULL_PATH) into stale_dirs from WS.WS.HOSTFS_COL where COL_PARENT_ID = parent_c_id and 0 = position (COL_NAME, dirs);\n"
-"foreach (varchar stale_fullname in stale_dirs) do\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (stale_fullname);\n"
-"puid := http_dav_uid();\n"
-"pgid := coalesce (\n"
-"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
-"where G_NAME = \'HostFs_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID = detcol_id and COL_DET=\'HostFs\'), \'\')\n"
-"), puid+1);\n"
-"vectorbld_init (res);\n"
-"len := length (dirs);\n"
-"ctr := 0;\n"
-"while (ctr < len)\n"
+"p3_id := filter_data [12+1];\n"
+"p3_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [12+2]);\n"
+"if (filter_length = 18)\n"
+"{\n"
+"whenever not found goto get_distincts_3;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"open c3 (prefetch 1);\n"
+"while (1)\n"
"{\n"
-"name := dirs [ctr];\n"
-"if ((name <> \'.\') and (name <> \'..\'))\n"
+"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
+"if (res3_id > res_id_max) res_id_max := res3_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max))\n"
"{\n"
-"fullname := DAV_CONCAT_PATH (ospath, name);\n"
"\n"
-"rc := WS.WS.HOSTFS_PATH_STAT (fullname, flen, cr_time, mod_time);\n"
-"if (rc < 0)\n"
-"{\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (fullname);\n"
-"}\n"
-"else\n"
-"{\n"
-"vectorbld_acc (res, vector (\n"
-"DAV_CONCAT_PATH (top_davpath, name) || \'/\', \'C\',\n"
-"flen,\n"
-"mod_time,\n"
-"vector (UNAME\'HostFs\', detcol_id, fullname),\n"
-"\'110100000RR\', pgid, puid,\n"
-"cr_time,\n"
-"\'dav/unix-directory\',\n"
-"name ) );\n"
-"if (recursive > 0)\n"
-"vectorbld_concat_acc (res,\n"
-"\"HostFs_DAV_DIR_LIST\" (detcol_id,\n"
-"vector_concat (subseq (path_parts, 0, length (path_parts)-1), vector (name, \'\')),\n"
-"concat (DAV_CONCAT_PATH (detcol_path, name), \'/\'), name_mask, recursive, auth_uid) );\n"
-"}\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
"}\n"
-"ctr := ctr + 1;\n"
"}\n"
-"files := sys_dirlist (ospath, 1);\n"
-"if (parent_c_id is null)\n"
-"select VECTOR_AGG (RES_NAME) into stale_files from WS.WS.HOSTFS_RES where RES_COL is null and 0 = position (RES_NAME, files);\n"
-"else\n"
-"select VECTOR_AGG (RES_NAME) into stale_files from WS.WS.HOSTFS_RES where RES_COL = parent_c_id and 0 = position (RES_NAME, files);\n"
-"foreach (varchar stale_name in stale_files) do\n"
-"{\n"
-"r_id := coalesce ((select RES_ID from WS.WS.HOSTFS_RES where RES_COL = parent_c_id and RES_NAME = stale_name));\n"
-"delete from WS.WS.HOSTFS_RES_META where RESM_ID = r_id;\n"
-"delete from WS.WS.HOSTFS_RES_CACHE where RESC_ID = r_id;\n"
-"delete from WS.WS.HOSTFS_RES where RES_ID = r_id;\n"
"}\n"
-"len := length (files);\n"
-"ctr := 0;\n"
-"while (ctr < len)\n"
+"\n"
+"p4_id := filter_data [16+1];\n"
+"p4_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [16+2]);\n"
+"if (filter_length = 22)\n"
"{\n"
-"name := files [ctr];\n"
-"fullname := DAV_CONCAT_PATH (ospath, name);\n"
-"rc := WS.WS.HOSTFS_PATH_STAT (fullname, flen, cr_time, mod_time);\n"
-"if (rc < 0)\n"
+"whenever not found goto get_distincts_4;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"open c3 (prefetch 1);\n"
+"open c4 (prefetch 1);\n"
+"while (1)\n"
"{\n"
-"delete from WS.WS.HOSTFS_RES_META where RESM_ID = r_id;\n"
-"delete from WS.WS.HOSTFS_RES_CACHE where RESC_ID = r_id;\n"
-"delete from WS.WS.HOSTFS_RES where RES_ID = r_id;\n"
+"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
+"if (res3_id > res_id_max) res_id_max := res3_id;\n"
+"while (res4_id < res_id_max) fetch c4 into res4_id;\n"
+"if (res4_id > res_id_max) res_id_max := res4_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max) and (res4_id = res_id_max))\n"
+"dict_put (hit_ids, res_id_max, 1);\n"
"}\n"
-"else\n"
+"}\n"
+"\n"
+"get_distincts_4:\n"
+"\n"
+"close c4;\n"
+"get_distincts_3:\n"
+"\n"
+"close c3;\n"
+"get_distincts_2:\n"
+"\n"
+"close c2;\n"
+"get_distincts_1:\n"
+"\n"
+"close c1;\n"
+"get_distincts_0:\n"
+"\n"
+"close c0;\n"
+"\n"
+"\n"
+"whenever not found goto nf_c_last2;\n"
+"open c_last2 (prefetch 1);\n"
+"while (1)\n"
"{\n"
-"WS.WS.HOSTFS_READ_TYPEINFO (fullname, mimetype, ft_mode);\n"
-"WS.WS.HOSTFS_HANDLE_RES_SCAN (fullname, parent_c_id, flen, cr_time, mod_time, mimetype, ft_mode);\n"
-"if (name like name_mask)\n"
+"fetch c_last2 into res_last_id, v_last;\n"
+"if (v_max is null or (v_last > v_max))\n"
"{\n"
"\n"
-"vectorbld_acc (res, vector (\n"
-"DAV_CONCAT_PATH (top_davpath, name), \'R\',\n"
-"flen,\n"
-"mod_time,\n"
-"vector (UNAME\'HostFs\', detcol_id, fullname),\n"
-"\'110100000RR\', pgid, puid,\n"
-"cr_time,\n"
-"mimetype,\n"
-"name ) );\n"
+"if (dict_get (hit_ids, res_last_id, 0))\n"
+"{\n"
+"\n"
+"v_max := v_last;\n"
+"dict_put (distval_dict, v_last, 1);\n"
"}\n"
"}\n"
-"ctr := ctr + 1;\n"
"}\n"
-"update WS.WS.HOSTFS_COL set COL_MOD_TIME = now() where COL_ID = parent_c_id and COL_MOD_TIME < now();\n"
-"vectorbld_final (res);\n"
-"\n"
-"return res;\n"
-"\n"
-"no_dir:\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
-"return vector();\n"
+"nf_c_last2:\n"
+"close c_last2;\n"
"}\n"
-"--src DET_HostFs.sql:749\n";
+"--src DET_HostFs.sql:1053\n";
-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"
+static const char *proc464 =
+"#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"
+"declare topcol_name varchar;\n"
+"declare topcol_id, acc_ctr, acc_len integer;\n"
+"declare filter_length, p0_id, p1_id, p2_id, p3_id, p4_id, res0_id, res1_id, res2_id, res3_id, res4_id, res_id_max integer;\n"
+"declare acc any;\n"
+"declare p0_val, p1_val, p2_val, p3_val, p4_val varchar;\n"
+"\n"
+"\n"
+"declare c0 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p0_id and HRI_CATVALUE = p0_val and HRI_RES_ID >= res_id_max\n"
+"\n"
+"\n"
+" ;\n"
+"declare c1 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p1_id and HRI_CATVALUE = p1_val and HRI_RES_ID >= res_id_max;\n"
+"declare c2 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p2_id and HRI_CATVALUE = p2_val and HRI_RES_ID >= res_id_max;\n"
+"declare c3 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p3_id and HRI_CATVALUE = p3_val and HRI_RES_ID >= res_id_max;\n"
+"declare c4 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p4_id and HRI_CATVALUE = p4_val and HRI_RES_ID >= res_id_max;\n"
+"\n"
+"topcol_name := coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID = detcol_id and COL_DET = \'HostFs\'));\n"
+"if (topcol_name is null)\n"
"{\n"
"\n"
"return vector ();\n"
"}\n"
-"--src DET_HostFs.sql:866\n";
-
-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"
+"topcol_id := coalesce ((select COL_ID from WS.WS.HOSTFS_COL where COL_PARENT_ID is null and COL_NAME = topcol_name), WS.WS.HOSTFS_FIND_COL (topcol_name));\n"
+"filter_length := length (filter_data);\n"
+"vectorbld_init (acc);\n"
+"\n"
+"res0_id := -1;\n"
+"res1_id := -1;\n"
+"res2_id := -1;\n"
+"res3_id := -1;\n"
+"res4_id := -1;\n"
+"res_id_max := 0;\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"p0_id := filter_data [1];\n"
+"p0_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [2]);\n"
+"if (filter_length = 4)\n"
"{\n"
-"declare ospath, stat varchar;\n"
+"whenever not found goto get_distincts_0;\n"
+"open c0 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"while (res0_id <= res_id_max)\n"
+"fetch c0 into res0_id;\n"
+"res_id_max := res0_id;\n"
"\n"
-"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
-"stat := file_stat (ospath, 2);\n"
-"if (not isstring (stat))\n"
+"vectorbld_acc (acc, res0_id);\n"
+"}\n"
+"}\n"
+"\n"
+"p1_id := filter_data [4+1];\n"
+"p1_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [4+2]);\n"
+"if (filter_length = 8)\n"
+"{\n"
+"whenever not found goto get_distincts_1;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max))\n"
"{\n"
"\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
-"return -1;\n"
+"vectorbld_acc (acc, res0_id);\n"
+"res_id_max := res_id_max + 1;\n"
"}\n"
-"if (what = \'R\')\n"
+"}\n"
+"}\n"
+"\n"
+"p2_id := filter_data [8+1];\n"
+"p2_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [8+2]);\n"
+"if (filter_length = 12)\n"
"{\n"
-"if (0 = bit_and (32768, cast (stat as integer)))\n"
+"whenever not found goto get_distincts_2;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"while (1)\n"
+"{\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max))\n"
"{\n"
"\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
-"return -1;\n"
+"vectorbld_acc (acc, res0_id);\n"
+"res_id_max := res_id_max + 1;\n"
"}\n"
"}\n"
-"else\n"
+"}\n"
+"\n"
+"p3_id := filter_data [12+1];\n"
+"p3_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [12+2]);\n"
+"if (filter_length = 16)\n"
+"{\n"
+"whenever not found goto get_distincts_3;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"open c3 (prefetch 1);\n"
+"while (1)\n"
"{\n"
-"if (0 = bit_and (16384, cast (stat as integer)))\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
+"if (res3_id > res_id_max) res_id_max := res3_id;\n"
+"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max))\n"
"{\n"
"\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
-"return -1;\n"
+"vectorbld_acc (acc, res0_id);\n"
+"res_id_max := res_id_max + 1;\n"
"}\n"
"}\n"
-"\n"
-"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
"}\n"
-"--src DET_HostFs.sql:874\n";
-
-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"
-"declare ospath varchar;\n"
-"declare slash_pos, detcol_fullpath integer;\n"
"\n"
-"ospath := id[2];\n"
-"slash_pos := strchr (ospath, \'/\');\n"
-"detcol_fullpath := coalesce ((select WS.WS.COL_PATH (COL_ID) from WS.WS.SYS_DAV_COL where COL_ID = id[1] and COL_DET=\'HostFs\'));\n"
-"if (detcol_fullpath is null)\n"
-"return -23;\n"
-"if (not isstring (file_stat (ospath)))\n"
-"{\n"
-"WS.WS.HOSTFS_COL_DISAPPEARS (ospath);\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (ospath);\n"
-"return -23;\n"
-"}\n"
-"return detcol_fullpath || subseq (ospath, slash_pos + 1);\n"
-"}\n"
-"--src DET_HostFs.sql:910\n";
-
-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"
+"p4_id := filter_data [16+1];\n"
+"p4_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [16+2]);\n"
+"if (filter_length = 20)\n"
"{\n"
-"declare ospath varchar;\n"
-"\n"
-"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
-"if (what = \'R\')\n"
+"whenever not found goto get_distincts_4;\n"
+"open c0 (prefetch 1);\n"
+"open c1 (prefetch 1);\n"
+"open c2 (prefetch 1);\n"
+"open c3 (prefetch 1);\n"
+"open c4 (prefetch 1);\n"
+"while (1)\n"
"{\n"
-"declare cnt any;\n"
-"declare mime_type varchar;\n"
-"declare rc integer;\n"
-"rc := DAV_RES_CONTENT_INT (source_id, cnt, mime_type, 0, 0);\n"
-"if (rc < 0)\n"
+"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
+"if (res1_id > res_id_max) res_id_max := res1_id;\n"
+"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
+"if (res2_id > res_id_max) res_id_max := res2_id;\n"
+"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
+"if (res3_id > res_id_max) res_id_max := res3_id;\n"
+"while (res4_id < res_id_max) fetch c4 into res4_id;\n"
+"if (res4_id > res_id_max) res_id_max := res4_id;\n"
+"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
+"if (res0_id > res_id_max) res_id_max := res0_id;\n"
+"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max) and (res4_id = res_id_max))\n"
"{\n"
"\n"
-"return rc;\n"
+"vectorbld_acc (acc, res0_id);\n"
+"res_id_max := res_id_max + 1;\n"
"}\n"
-"string_to_file (ospath, case (__tag (cnt)) when 126 then blob_to_string (cnt) else cnt end, -2);\n"
-"rc := WS.WS.HOSTFS_TOUCH_RES (ospath);\n"
-"if (rc < 0)\n"
-"return -28;\n"
-"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
"}\n"
-"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:930\n";
-
-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"
-"declare ospath, src_path varchar;\n"
"\n"
-"ospath := DAV_CONCAT_PATH (\"HostFs_ID_TO_OSPATH\" (detcol_id), path_parts);\n"
-"if (what = \'R\')\n"
+"get_distincts_4:\n"
+"close c4;\n"
+"get_distincts_3:\n"
+"close c3;\n"
+"get_distincts_2:\n"
+"close c2;\n"
+"get_distincts_1:\n"
+"close c1;\n"
+"get_distincts_0:\n"
+"close c0;\n"
+"\n"
+"finalize:\n"
+"vectorbld_final (acc);\n"
+"acc_len := length (acc);\n"
+"acc_ctr := 0;\n"
+"while (acc_ctr < acc_len)\n"
"{\n"
-"declare cnt any;\n"
-"declare mime_type varchar;\n"
-"declare rc integer;\n"
-"rc := DAV_RES_CONTENT_INT (source_id, cnt, mime_type, 0, 0);\n"
-"if (rc < 0)\n"
+"declare r_id integer;\n"
+"declare fullname varchar;\n"
+"declare full_id, diritm any;\n"
+"r_id := acc [acc_ctr];\n"
+"fullname := coalesce ((select top 1 COL_FULL_PATH || RES_NAME from WS.WS.HOSTFS_RES join WS.WS.HOSTFS_COL on (RES_COL = COL_ID) where RES_ID = r_id), \'\\377\\377\\377dead\');\n"
+"full_id := vector (UNAME\'HostFs\', detcol_id, fullname);\n"
+"if (make_diritems = 1)\n"
+"{\n"
+"diritm := \"HostFs_DAV_DIR_SINGLE\" (full_id, \'R\', \'(fake path)\', auth_uid);\n"
+"if (DAV_HIDE_ERROR (diritm) is not null)\n"
+"{\n"
+"diritm [0] := DAV_CONCAT_PATH (detcol_path, diritm[10]);\n"
+"acc [acc_ctr] := diritm;\n"
+"acc_ctr := acc_ctr + 1;\n"
+"}\n"
+"else\n"
"{\n"
+"if (acc_len > 1)\n"
+"{\n"
+"acc [acc_ctr] := acc [acc_len - 1];\n"
+"acc_len := acc_len - 1;\n"
"\n"
-"return rc;\n"
"}\n"
-"string_to_file (ospath, case (__tag (cnt)) when 126 then blob_to_string (cnt) else cnt end, -2);\n"
-"rc := WS.WS.HOSTFS_TOUCH_RES (ospath);\n"
-"if (rc < 0)\n"
-"return -28;\n"
-"src_path := DAV_SEARCH_PATH (source_id, \'R\');\n"
-"if (src_path is not null)\n"
-"DAV_DELETE_INT (src_path, 1, null, null, 0);\n"
-"return vector (UNAME\'HostFs\', detcol_id, ospath);\n"
"}\n"
-"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:956\n";
-
-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"
+"else\n"
"{\n"
-"\n"
-"whenever sqlstate \'*\' goto no_res;\n"
-"declare ft_mode varchar;\n"
-"if ((content_mode = 0) or (content_mode = 2))\n"
-"content := file_to_string (id[2]);\n"
-"else if (content_mode = 1)\n"
-"file_append_to_string_output (id[2], content);\n"
-"else if (content_mode = 3)\n"
-"http_file (id[2]);\n"
-"WS.WS.HOSTFS_READ_TYPEINFO (id[2], type, ft_mode);\n"
-"return 0;\n"
-"\n"
-"no_res:\n"
-"\n"
-"WS.WS.HOSTFS_RES_DISAPPEARS (id[2]);\n"
-"return -1;\n"
+"acc [acc_ctr] := full_id;\n"
+"acc_ctr := acc_ctr + 1;\n"
"}\n"
-"--src DET_HostFs.sql:985\n";
-
-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"
-"\n"
-"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:1006\n";
-
-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"
+"if (acc_len < length (acc))\n"
"{\n"
+"acc := subseq (acc, 0, acc_len);\n"
+"}\n"
"\n"
-"return -20;\n"
+"return acc;\n"
"}\n"
-"--src DET_HostFs.sql:1013\n";
+"--src DET_HostFs.sql:1282\n";
-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"
+static const char *proc465 =
+"#line 1502 \"[executable]/DET_HostFs.sql\"\n"
+"create procedure \"HostFs_RF_ID2SUFFIX\" (in id any, in what char(1))\n"
"{\n"
-"\n"
-"return -27;\n"
+"if (what=\'C\')\n"
+"{\n"
+"return sprintf (\'HostDir-%d-%d\',\n"
+"id[1], WS.WS.HOSTFS_FIND_COL (id[2]));\n"
"}\n"
-"--src DET_HostFs.sql:1020\n";
-
-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"
+"if (what=\'R\')\n"
"{\n"
-"declare rc integer;\n"
-"declare orig_id any;\n"
-"declare orig_type char(1);\n"
-"\n"
-"orig_id := id;\n"
-"id := orig_id[1];\n"
-"orig_type := type;\n"
-"type := \'C\';\n"
-"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
-"if (rc <> 0)\n"
-"return rc;\n"
-"id := orig_id;\n"
-"type := orig_type;\n"
-"return 0;\n"
+"declare full_path varchar;\n"
+"declare len, slash_pos integer;\n"
+"declare r_id, c_id integer;\n"
+"full_path := id[2];\n"
+"len := length (full_path);\n"
+"if ((len = 0) or (full_path[len-1] = 47))\n"
+"r_id := 0;\n"
+"else\n"
+"{\n"
+"slash_pos := strrchr (full_path, \'/\');\n"
+"if (c_id is null)\n"
+"{\n"
+"if (slash_pos is null)\n"
+"c_id := WS.WS.HOSTFS_FIND_COL (\'\');\n"
+"else\n"
+"c_id := WS.WS.HOSTFS_FIND_COL (subseq (full_path, 0, slash_pos));\n"
"}\n"
-"--src DET_HostFs.sql:1027\n";
+"r_id := coalesce ((select RES_ID from WS.WS.HOSTFS_RES where RES_NAME = subseq (full_path, slash_pos + 1) and RES_COL = c_id), 0);\n"
+"}\n"
+"return sprintf (\'HostFile-%d-%d\', id[1], r_id);\n"
+"}\n"
+"signal (\'OBLOM\', \'Invalid arguments for HostFs_RF_ID2SUFFIX\');\n"
+"}\n"
+"--src DET_HostFs.sql:1500\n";
-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"
+static const char *proc466 =
+"#line 1536 \"[executable]/DET_HostFs.sql\"\n"
+"create procedure \"HostFile_RF_SUFFIX2ID\" (in suffix varchar, in what char(1))\n"
+"{\n"
+"declare pairs any;\n"
+"declare r_id varchar;\n"
+"declare detcol_id integer;\n"
+"if (\'R\' <> what)\n"
+"return null;\n"
+"pairs := regexp_parse (\'^([1-9][0-9]*)-([1-9][0-9]*)\\044\', suffix, 0);\n"
+"if (pairs is null)\n"
"{\n"
"\n"
-"return vector ();\n"
+"return null;\n"
"}\n"
-"--src DET_HostFs.sql:1046\n";
+"detcol_id := cast (subseq (suffix, pairs[2], pairs[3]) as integer);\n"
+"whenever not found goto oblom;\n"
+"select vector (UNAME\'HostFs\', detcol_id, COL_FULL_PATH || RES_NAME) into r_id\n"
+"from WS.WS.HOSTFS_RES join WS.WS.HOSTFS_COL on (RES_COL = COL_ID)\n"
+"where RES_ID = cast (subseq (suffix, pairs[4], pairs[5]) as integer);\n"
+"return r_id;\n"
+"oblom:\n"
+"return null;\n"
+"}\n"
+"--src DET_HostFs.sql:1534\n";
-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"
+static const char *proc467 =
+"#line 1560 \"[executable]/DET_HostFs.sql\"\n"
+"create procedure \"HostDir_RF_SUFFIX2ID\" (in suffix varchar, in what char(1))\n"
"{\n"
-"declare topcol_name varchar;\n"
-"declare topcol_id integer;\n"
-"declare filter_length, p0_id, p1_id, p2_id, p3_id, p4_id, res0_id, res1_id, res2_id, res3_id, res4_id, res_last_id, res_id_max integer;\n"
-"declare plast_id integer;\n"
-"declare p0_val, p1_val, p2_val, p3_val, p4_val, v_last, v_max varchar;\n"
-"\n"
-"\n"
-"declare hit_ids any;\n"
-"declare c_last1 cursor for select HRI_CATVALUE from WS.WS.HOSTFS_RDF_INVERSE\n"
-"where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = plast_id and (v_max is null or HRI_CATVALUE > v_max)\n"
-"\n"
-"\n"
-" ;\n"
-"declare c_last2 cursor for select HRI_RES_ID, HRI_CATVALUE from WS.WS.HOSTFS_RDF_INVERSE\n"
-"where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = plast_id and (v_max is null or HRI_CATVALUE > v_max)\n"
-"\n"
-"\n"
-" ;\n"
-"declare c0 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p0_id and HRI_CATVALUE = p0_val and HRI_RES_ID >= res_id_max;\n"
-"declare c1 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p1_id and HRI_CATVALUE = p1_val and HRI_RES_ID >= res_id_max;\n"
-"declare c2 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p2_id and HRI_CATVALUE = p2_val and HRI_RES_ID >= res_id_max;\n"
-"declare c3 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p3_id and HRI_CATVALUE = p3_val and HRI_RES_ID >= res_id_max;\n"
-"declare c4 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p4_id and HRI_CATVALUE = p4_val and HRI_RES_ID >= res_id_max;\n"
-"\n"
-"topcol_name := coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID = detcol_id and COL_DET = \'HostFs\'));\n"
-"if (topcol_name is null)\n"
+"declare pairs any;\n"
+"declare c_id varchar;\n"
+"declare detcol_id integer;\n"
+"if (\'C\' <> what)\n"
+"return null;\n"
+"pairs := regexp_parse (\'^([1-9][0-9]*)-([1-9][0-9]*)\\044\', suffix, 0);\n"
+"if (pairs is null)\n"
"{\n"
"\n"
-"return;\n"
+"return null;\n"
"}\n"
-"topcol_id := coalesce ((select COL_ID from WS.WS.HOSTFS_COL where COL_PARENT_ID is null and COL_NAME = topcol_name), WS.WS.HOSTFS_FIND_COL (topcol_name));\n"
-"filter_length := length (filter_data);\n"
-"plast_id := filter_data [filter_length - 1];\n"
-"res_id_max := 0;\n"
-"v_max := null;\n"
-"\n"
-"\n"
-"\n"
-"if (filter_length = 2)\n"
-"{\n"
-"whenever not found goto nf_c_last1;\n"
-"\n"
-"open c_last1 (prefetch 1);\n"
-"while (1)\n"
+"detcol_id := cast (subseq (suffix, pairs[2], pairs[3]) as integer);\n"
+"whenever not found goto oblom;\n"
+"select vector (UNAME\'HostFs\', detcol_id, COL_FULL_PATH) into c_id\n"
+"from WS.WS.HOSTFS_RES join WS.WS.HOSTFS_COL on (RES_COL = COL_ID);\n"
+"return c_id;\n"
+"oblom:\n"
+"return NULL;\n"
+"}\n"
+"--src DET_HostFs.sql:1558\n";
+
+/* DET_ResFilter.sql */
+
+static const char *proc468 =
+"#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"
-"fetch c_last1 into v_last;\n"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_del_action any;\n"
+"declare spath_id integer;\n"
"\n"
-"if (v_max is null or (v_last > v_max))\n"
+"rfc_spath := null;\n"
+"if (DAV_HIDE_ERROR (\"ResFilter_GET_CONDITION\" (id[1], rfc_spath, rfc_list_cond, rfc_del_action)) is null)\n"
+"return -1;\n"
+"if (not (\'110\' like req))\n"
+"return -13;\n"
+"if (\'C\' = what)\n"
"{\n"
-"v_max := v_last;\n"
-"dict_put (distval_dict, v_last, 1);\n"
-"}\n"
-"}\n"
-"nf_c_last1:\n"
-"close c_last1;\n"
-"return;\n"
+"spath_id := DAV_SEARCH_ID (rfc_spath, \'C\');\n"
+"return DAV_AUTHENTICATE (spath_id, \'C\', req, auth_uname, auth_pwd, auth_uid);\n"
"}\n"
-"\n"
-"res0_id := 0;\n"
-"res1_id := 0;\n"
-"res2_id := 0;\n"
-"res3_id := 0;\n"
-"res4_id := 0;\n"
-"hit_ids := dict_new ();\n"
-"\n"
-"p0_id := filter_data [1];\n"
-"p0_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [2]);\n"
-"if (filter_length = 6)\n"
-"{\n"
-"whenever not found goto get_distincts_0;\n"
-"open c0 (prefetch 1);\n"
-"while (1)\n"
+"if (\'R\' = what)\n"
"{\n"
-"while (res0_id <= res_id_max)\n"
-"fetch c0 into res0_id;\n"
-"res_id_max := res0_id;\n"
-"\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
+"return DAV_AUTHENTICATE (id [2], \'R\', req, auth_uname, auth_pwd, auth_uid);\n"
"}\n"
+"return -14;\n"
"}\n"
-"\n"
-"p1_id := filter_data [4+1];\n"
-"p1_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [4+2]);\n"
-"if (filter_length = 10)\n"
+"--src DET_ResFilter.sql:24\n";
+
+static const char *proc469 =
+"#line 51 \"[executable]/DET_ResFilter.sql\"\n"
+"create function \"ResFilter_NORM\" (in value any) returns varchar\n"
"{\n"
-"whenever not found goto get_distincts_1;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"while (1)\n"
+"value := blob_to_string (value);\n"
+"if ((\'\' = value) or (193 <> value[0]))\n"
+"return value;\n"
+"value := deserialize (value)[1];\n"
+"if (isstring (value))\n"
+"return value;\n"
+"return cast (xml_tree_doc(value) as varchar);\n"
+"}\n"
+"--src DET_ResFilter.sql:49\n";
+
+static const char *proc470 =
+"#line 64 \"[executable]/DET_ResFilter.sql\"\n"
+"create function \"ResFilter_ENCODE_FILTER\" (in filt any) returns varchar\n"
"{\n"
-"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max))\n"
+"if (193 <> __tag (filt))\n"
+"signal (\'.....\', \'Invalid filter passed to ResFilter_ENCODE_FILTER\');\n"
+"filt := serialize (filt);\n"
+"filt[0] := 2;\n"
+"return filt;\n"
+"}\n"
+"--src DET_ResFilter.sql:62\n";
+
+static const char *proc471 =
+"#line 75 \"[executable]/DET_ResFilter.sql\"\n"
+"create function \"ResFilter_DECODE_FILTER\" (in value any) returns any\n"
"{\n"
-"\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
+"value := blob_to_string (value);\n"
+"if ((\'\' = value) or (value[0] <> 2))\n"
+"signal (\'.....\', \'Invalid filter serialization passed to ResFilter_DECODE_FILTER\');\n"
+"value [0] := 193;\n"
+"return deserialize (value);\n"
"}\n"
-"else\n"
-"res_id_max := res_id_max + 1;\n"
+"--src DET_ResFilter.sql:73\n";
+
+static const char *proc472 =
+"#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"
"\n"
+"whenever not found goto nf;\n"
+"if (isarray (detcol_id))\n"
+"return -20;\n"
+"select \"ResFilter_NORM\" (PROP_VALUE) into rfc_spath from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:ResFilter-SearchPath\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
+"select \"ResFilter_DECODE_FILTER\" (PROP_VALUE) into rfc_list_cond from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:ResFilter-ListCond\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
+"select \"ResFilter_DECODE_FILTER\" (PROP_VALUE) into rfc_del_action from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:ResFilter-DelAction\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
+"return 0;\n"
+"nf:\n"
+"return -1;\n"
"}\n"
-"}\n"
+"--src DET_ResFilter.sql:84\n";
+
+static const char *proc473 =
+"#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"
"\n"
-"p2_id := filter_data [8+1];\n"
-"p2_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [8+2]);\n"
-"if (filter_length = 14)\n"
+"declare has_rdf_preds integer;\n"
+"declare raw_filter any;\n"
+"has_rdf_preds := 0;\n"
+"raw_filter := get_keyword (\'\', rfc_list_cond);\n"
+"foreach (any pred in raw_filter) do\n"
"{\n"
-"whenever not found goto get_distincts_2;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"while (1)\n"
+"declare propid integer;\n"
+"declare old_value, pred_name, pred_cmp varchar;\n"
+"pred_name := pred [0];\n"
+"pred_cmp := pred [1];\n"
+"if ((\'PROP_VALUE\' = pred_name) and (\'=\' = pred_cmp))\n"
"{\n"
-"\n"
-"\n"
-"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
-"\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max))\n"
+"if (isarray (id))\n"
"{\n"
-"\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
-"}\n"
+"call (cast (id[0] as varchar) || \'_DAV_PROP_SET\')(id, what, pred[3], pred[2], 1, auth_uid);\n"
+"goto next_pred;\n"
"}\n"
+"whenever not found goto ins_prop;\n"
+"select p.PROP_ID, \"ResFilter_NORM\" (p.PROP_VALUE) into propid, old_value from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r where p.PROP_NAME = pred[3] and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id;\n"
+"if (old_value <> pred[2])\n"
+"update WS.WS.SYS_DAV_PROP set PROP_VALUE = pred[2] where PROP_ID = propid;\n"
+"goto next_pred;\n"
+"ins_prop:\n"
+"propid := WS.WS.GETID (\'P\');\n"
+"insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_VALUE, PROP_PARENT_ID, PROP_TYPE)\n"
+"values (propid, pred[3], pred[2], id, what);\n"
+"goto next_pred;\n"
"}\n"
-"\n"
-"p3_id := filter_data [12+1];\n"
-"p3_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [12+2]);\n"
-"if (filter_length = 18)\n"
-"{\n"
-"whenever not found goto get_distincts_3;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"open c3 (prefetch 1);\n"
-"while (1)\n"
+"if ((\'PROP_VALUE\' = pred_name) and (\'<>\' = pred_cmp))\n"
"{\n"
-"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
-"if (res3_id > res_id_max) res_id_max := res3_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max))\n"
+"if (isarray (id))\n"
"{\n"
-"\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
-"}\n"
+"call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\')(id, what, pred[3], 1, auth_uid);\n"
+"goto next_pred;\n"
"}\n"
+"whenever not found goto next_pred;\n"
+"select p.PROP_ID into propid from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r where p.PROP_NAME = pred[3] and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id and \"ResFilter_NORM\" (p.PROP_VALUE) = pred[2];\n"
+"delete from WS.WS.SYS_DAV_PROP where PROP_ID = propid;\n"
+"goto next_pred;\n"
"}\n"
-"\n"
-"p4_id := filter_data [16+1];\n"
-"p4_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [16+2]);\n"
-"if (filter_length = 22)\n"
+"if ((\'PROP_NAME\' = pred_name) and (\'not_exists\' = pred_cmp))\n"
"{\n"
-"whenever not found goto get_distincts_4;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"open c3 (prefetch 1);\n"
-"open c4 (prefetch 1);\n"
-"while (1)\n"
+"if (isarray (id))\n"
"{\n"
-"while (res0_id <= res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
-"if (res3_id > res_id_max) res_id_max := res3_id;\n"
-"while (res4_id < res_id_max) fetch c4 into res4_id;\n"
-"if (res4_id > res_id_max) res_id_max := res4_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max) and (res4_id = res_id_max))\n"
-"dict_put (hit_ids, res_id_max, 1);\n"
+"call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\')(id, what, pred[3], 1, auth_uid);\n"
+"goto next_pred;\n"
"}\n"
+"whenever not found goto next_pred;\n"
+"select p.PROP_ID into propid from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r where p.PROP_NAME = pred[2] and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id;\n"
+"delete from WS.WS.SYS_DAV_PROP where PROP_ID = propid;\n"
+"goto next_pred;\n"
"}\n"
-"\n"
-"get_distincts_4:\n"
-"\n"
-"close c4;\n"
-"get_distincts_3:\n"
-"\n"
-"close c3;\n"
-"get_distincts_2:\n"
-"\n"
-"close c2;\n"
-"get_distincts_1:\n"
-"\n"
-"close c1;\n"
-"get_distincts_0:\n"
-"\n"
-"close c0;\n"
-"\n"
-"\n"
-"whenever not found goto nf_c_last2;\n"
-"open c_last2 (prefetch 1);\n"
-"while (1)\n"
+"else if ((\'RDF_VALUE\' = pred_name) and ((\'=\' = pred_cmp) or (\'<>\' = pred_cmp)) and (5 = length (pred)) and (\'http://local.virt/DAV-RDF\' = pred [3]))\n"
"{\n"
-"fetch c_last2 into res_last_id, v_last;\n"
-"if (v_max is null or (v_last > v_max))\n"
+"has_rdf_preds := 1;\n"
+"goto next_pred;\n"
+"}\n"
+"else if ((\'RDF_PRED\' = pred_name) and (\'not_exists\' = pred_cmp) and (4 = length (pred)) and (\'http://local.virt/DAV-RDF\' = pred [3]))\n"
"{\n"
-"\n"
-"if (dict_get (hit_ids, res_last_id, 0))\n"
+"has_rdf_preds := 1;\n"
+"goto next_pred;\n"
+"}\n"
+"else\n"
"{\n"
"\n"
-"v_max := v_last;\n"
-"dict_put (distval_dict, v_last, 1);\n"
+"signal (\'.....\', \'Unsupported predicate in ResFilter_FIT_INTO_CONDITION\');\n"
"}\n"
+"next_pred: ;\n"
"}\n"
+"if (has_rdf_preds)\n"
+"{\n"
+"declare propid integer;\n"
+"declare old_prop, old_n3, acc_n3, new_n3, new_davxml any;\n"
+"declare top_path nvarchar;\n"
+"top_path := cast (DAV_SEARCH_PATH (id, what) as nvarchar);\n"
+"xte_nodebld_init (acc_n3);\n"
+"foreach (any pred in raw_filter) do\n"
+"{\n"
+"declare pred_name, pred_cmp varchar;\n"
+"pred_name := pred [0];\n"
+"pred_cmp := pred [1];\n"
+"if ((\'RDF_VALUE\' = pred_name) and (\'=\' = pred_cmp))\n"
+"{\n"
+"xte_nodebld_acc (acc_n3,\n"
+"xte_node (\n"
+"xte_head (\'N3\', \'N3S\', top_path, \'N3P\', pred [4]),\n"
+"pred [2] ) );\n"
"}\n"
-"nf_c_last2:\n"
-"close c_last2;\n"
"}\n"
-"--src DET_HostFs.sql:1053\n";
-
-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"
+"xte_nodebld_final (acc_n3, xte_head (\' root\'));\n"
+"acc_n3 := xml_tree_doc (acc_n3);\n"
+"old_n3 := null;\n"
+"propid := null;\n"
+"if (isarray (id))\n"
"{\n"
-"declare topcol_name varchar;\n"
-"declare topcol_id, acc_ctr, acc_len integer;\n"
-"declare filter_length, p0_id, p1_id, p2_id, p3_id, p4_id, res0_id, res1_id, res2_id, res3_id, res4_id, res_id_max integer;\n"
-"declare acc any;\n"
-"declare p0_val, p1_val, p2_val, p3_val, p4_val varchar;\n"
-"\n"
-"\n"
-"declare c0 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p0_id and HRI_CATVALUE = p0_val and HRI_RES_ID >= res_id_max\n"
-"\n"
-"\n"
-" ;\n"
-"declare c1 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p1_id and HRI_CATVALUE = p1_val and HRI_RES_ID >= res_id_max;\n"
-"declare c2 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p2_id and HRI_CATVALUE = p2_val and HRI_RES_ID >= res_id_max;\n"
-"declare c3 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p3_id and HRI_CATVALUE = p3_val and HRI_RES_ID >= res_id_max;\n"
-"declare c4 cursor for select HRI_RES_ID from WS.WS.HOSTFS_RDF_INVERSE where HRI_TOPCOL_ID = topcol_id and HRI_PROP_CATID = p4_id and HRI_CATVALUE = p4_val and HRI_RES_ID >= res_id_max;\n"
-"\n"
-"topcol_name := coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID = detcol_id and COL_DET = \'HostFs\'));\n"
-"if (topcol_name is null)\n"
+"old_prop := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\')(id, what, \'http://local.virt/DAV-RDF\', auth_uid);\n"
+"if (DAV_HIDE_ERROR (old_prop) is null)\n"
"{\n"
-"\n"
-"return vector ();\n"
+"goto do_merge;\n"
"}\n"
-"topcol_id := coalesce ((select COL_ID from WS.WS.HOSTFS_COL where COL_PARENT_ID is null and COL_NAME = topcol_name), WS.WS.HOSTFS_FIND_COL (topcol_name));\n"
-"filter_length := length (filter_data);\n"
-"vectorbld_init (acc);\n"
-"\n"
-"res0_id := -1;\n"
-"res1_id := -1;\n"
-"res2_id := -1;\n"
-"res3_id := -1;\n"
-"res4_id := -1;\n"
-"res_id_max := 0;\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"p0_id := filter_data [1];\n"
-"p0_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [2]);\n"
-"if (filter_length = 4)\n"
-"{\n"
-"whenever not found goto get_distincts_0;\n"
-"open c0 (prefetch 1);\n"
-"while (1)\n"
+"if (isentity (old_prop))\n"
"{\n"
-"while (res0_id <= res_id_max)\n"
-"fetch c0 into res0_id;\n"
-"res_id_max := res0_id;\n"
-"\n"
-"vectorbld_acc (acc, res0_id);\n"
+"old_n3 := xslt (\'http://local.virt/davxml2n3xml\', old_prop);\n"
+"goto do_merge;\n"
"}\n"
+"goto old_prop_found;\n"
"}\n"
-"\n"
-"p1_id := filter_data [4+1];\n"
-"p1_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [4+2]);\n"
-"if (filter_length = 8)\n"
-"{\n"
-"whenever not found goto get_distincts_1;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"while (1)\n"
+"whenever not found goto do_merge;\n"
+"select p.PROP_ID, blob_to_string (p.PROP_VALUE) into propid, old_prop\n"
+"from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r\n"
+"where p.PROP_NAME = \'http://local.virt/DAV-RDF\' and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id;\n"
+"goto do_merge;\n"
+"old_prop_found:\n"
+"old_prop := deserialize (cast (old_prop as varchar));\n"
+"old_n3 := xslt (\'http://local.virt/davxml2n3xml\', xml_tree_doc (old_prop));\n"
+"do_merge:\n"
+"new_n3 := DAV_RDF_MERGE (old_n3, acc_n3, null, -1);\n"
+"foreach (any pred in raw_filter) do\n"
"{\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max))\n"
+"declare pred_name, pred_cmp varchar;\n"
+"pred_name := pred [0];\n"
+"pred_cmp := pred [1];\n"
+"if ((\'RDF_PRED\' = pred_name) and (\'<>\' = pred_cmp))\n"
"{\n"
-"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"res_id_max := res_id_max + 1;\n"
+"new_n3 := XMLUpdate (new_n3, \'/N3[N3P=\' || WS.WS.STR_SQL_APOS (pred[4]) || \'][string (.) =\' || WS.WS.STR_SQL_APOS (pred[2]) || \']\', null);\n"
"}\n"
+"else\n"
+"if ((\'RDF_PRED\' = pred_name) and (\'not_exists\' = pred_cmp))\n"
+"{\n"
+"new_n3 := XMLUpdate (new_n3, \'/N3[N3P=\' || WS.WS.STR_SQL_APOS (pred[2]) || \']\', null);\n"
"}\n"
"}\n"
-"\n"
-"p2_id := filter_data [8+1];\n"
-"p2_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [8+2]);\n"
-"if (filter_length = 12)\n"
-"{\n"
-"whenever not found goto get_distincts_2;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"while (1)\n"
+"new_davxml := DAV_RDF_PREPROCESS_RDFXML (new_n3, top_path, 1);\n"
+"if (isarray (id))\n"
"{\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max))\n"
+"call (cast (id[0] as varchar) || \'_DAV_PROP_SET\')(id, what, \'http://local.virt/DAV-RDF\', new_davxml, 1, auth_uid);\n"
+"goto next_pred;\n"
+"}\n"
+"else if (propid is null)\n"
"{\n"
-"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"res_id_max := res_id_max + 1;\n"
+"propid := WS.WS.GETID (\'P\');\n"
+"insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_VALUE, PROP_PARENT_ID, PROP_TYPE)\n"
+"values (propid, \'http://local.virt/DAV-RDF\', serialize (new_davxml), id, what);\n"
+"}\n"
+"else\n"
+"update WS.WS.SYS_DAV_PROP set PROP_VALUE = serialize (new_davxml) where PROP_ID = propid;\n"
"}\n"
"}\n"
+"--src DET_ResFilter.sql:100\n";
+
+static const char *proc474 =
+"#line 256 \"[executable]/DET_ResFilter.sql\"\n"
+"create function \"ResFilter_MAKE_DEL_ACTION_FROM_CONDITION\" (inout rfc_list_cond any) returns any\n"
+"{\n"
+"\n"
+"declare raw_filter, res any;\n"
+"res := vector ();\n"
+"raw_filter := get_keyword (\'\', rfc_list_cond);\n"
+"foreach (any pred in raw_filter) do\n"
+"{\n"
+"declare propid integer;\n"
+"declare old_value, pred_name, pred_cmp varchar;\n"
+"pred_name := pred [0];\n"
+"pred_cmp := pred [1];\n"
+"if ((\'PROP_VALUE\' = pred_name) and (\'=\' = pred_cmp))\n"
+"{\n"
+"res := vector_concat (res, vector (vector (\'PROP_VALUE\', \'<>\', pred[2], pred [3])));\n"
"}\n"
-"\n"
-"p3_id := filter_data [12+1];\n"
-"p3_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [12+2]);\n"
-"if (filter_length = 16)\n"
+"else if ((\'PROP_VALUE\' = pred_name) and (\'<>\' = pred_cmp))\n"
"{\n"
-"whenever not found goto get_distincts_3;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"open c3 (prefetch 1);\n"
-"while (1)\n"
+"res := vector_concat (res, vector (vector (\'PROP_VALUE\', \'=\', pred[2], pred [3])));\n"
+"}\n"
+"else if ((\'RDF_VALUE\' = pred_name) and (\'=\' = pred_cmp) and (5 = length (pred)) and (\'http://local.virt/DAV-RDF\' = pred [3]))\n"
"{\n"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
-"if (res3_id > res_id_max) res_id_max := res3_id;\n"
-"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max))\n"
+"res := vector_concat (res, vector (vector (\'RDF_VALUE\', \'<>\', pred [2], \'http://local.virt/DAV-RDF\', pred [4])));\n"
+"}\n"
+"else if ((\'RDF_VALUE\' = pred_name) and (\'<>\' = pred_cmp) and (5 = length (pred)) and (\'http://local.virt/DAV-RDF\' = pred [3]))\n"
"{\n"
-"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"res_id_max := res_id_max + 1;\n"
+"res := vector_concat (res, vector (vector (\'RDF_VALUE\', \'=\', pred [2], \'http://local.virt/DAV-RDF\', pred [4])));\n"
"}\n"
+"else return vector ();\n"
"}\n"
+"return vector (\'\', res);\n"
"}\n"
-"\n"
-"p4_id := filter_data [16+1];\n"
-"p4_val := \"CatFilter_ENCODE_CATVALUE\" (filter_data [16+2]);\n"
-"if (filter_length = 20)\n"
-"{\n"
-"whenever not found goto get_distincts_4;\n"
-"open c0 (prefetch 1);\n"
-"open c1 (prefetch 1);\n"
-"open c2 (prefetch 1);\n"
-"open c3 (prefetch 1);\n"
-"open c4 (prefetch 1);\n"
-"while (1)\n"
+"--src DET_ResFilter.sql:254\n";
+
+static const char *proc475 =
+"#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"
-"while (res1_id < res_id_max) fetch c1 into res1_id;\n"
-"if (res1_id > res_id_max) res_id_max := res1_id;\n"
-"while (res2_id < res_id_max) fetch c2 into res2_id;\n"
-"if (res2_id > res_id_max) res_id_max := res2_id;\n"
-"while (res3_id < res_id_max) fetch c3 into res3_id;\n"
-"if (res3_id > res_id_max) res_id_max := res3_id;\n"
-"while (res4_id < res_id_max) fetch c4 into res4_id;\n"
-"if (res4_id > res_id_max) res_id_max := res4_id;\n"
-"while (res0_id < res_id_max) fetch c0 into res0_id;\n"
-"if (res0_id > res_id_max) res_id_max := res0_id;\n"
-"if ((res0_id = res_id_max) and (res1_id = res_id_max) and (res2_id = res_id_max) and (res3_id = res_id_max) and (res4_id = res_id_max))\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (id, what, rfc_del_action, auth_uid);\n"
+"return 0;\n"
+"}\n"
+"--src DET_ResFilter.sql:289\n";
+
+static const char *proc476 =
+"#line 299 \"[executable]/DET_ResFilter.sql\"\n"
+"create function \"ResFilter_FNMERGE\" (in path any, in id any) returns varchar\n"
"{\n"
+"declare pairs any;\n"
+"declare res varchar;\n"
+"pairs := regexp_parse (\'^(.*[/])?([^/][^./]*)([^/]*)\\044\', path, 0);\n"
+"if (pairs is null)\n"
+"signal (\'.....\', sprintf (\'Internal error: failed \"ResFilter_FNMERGE\" (%s, %d)\', path, id));\n"
+"if (isinteger (id))\n"
+"return sprintf (\'%s -RfId%d%s\', subseq (path, 0, pairs[5]), id, subseq (path, pairs[6]));\n"
+"id[0] := cast (id[0] as varchar);\n"
+"res := sprintf (\'%s -Rf%s%s\',\n"
+"subseq (path, 0, pairs[5]),\n"
+"call (cast (id[0] as varchar) || \'_RF_ID2SUFFIX\')(id, \'R\'),\n"
+"subseq (path, pairs[6]) );\n"
"\n"
-"vectorbld_acc (acc, res0_id);\n"
-"res_id_max := res_id_max + 1;\n"
-"}\n"
-"}\n"
+"return res;\n"
"}\n"
+"--src DET_ResFilter.sql:297\n";
+
+static const char *proc477 =
+"#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"
+"declare pairs any;\n"
+"declare fname, fext varchar;\n"
"\n"
-"get_distincts_4:\n"
-"close c4;\n"
-"get_distincts_3:\n"
-"close c3;\n"
-"get_distincts_2:\n"
-"close c2;\n"
-"get_distincts_1:\n"
-"close c1;\n"
-"get_distincts_0:\n"
-"close c0;\n"
+"pairs := regexp_parse (\'^(.*[/])?([^/][^./]*)([^/]*)\\044\', path, 0);\n"
+"if (pairs is null)\n"
+"signal (\'.....\', sprintf (\'Internal error: failed \"ResFilter_FNSPLIT\" (%s)\', path));\n"
+"colpath := subseq (path, 0, pairs[4]);\n"
+"fname := subseq (path, pairs[4], pairs[5]);\n"
+"fext := subseq (path, pairs[6], pairs[7]);\n"
"\n"
-"finalize:\n"
-"vectorbld_final (acc);\n"
-"acc_len := length (acc);\n"
-"acc_ctr := 0;\n"
-"while (acc_ctr < acc_len)\n"
-"{\n"
-"declare r_id integer;\n"
-"declare fullname varchar;\n"
-"declare full_id, diritm any;\n"
-"r_id := acc [acc_ctr];\n"
-"fullname := coalesce ((select top 1 COL_FULL_PATH || RES_NAME from WS.WS.HOSTFS_RES join WS.WS.HOSTFS_COL on (RES_COL = COL_ID) where RES_ID = r_id), \'\\377\\377\\377dead\');\n"
-"full_id := vector (UNAME\'HostFs\', detcol_id, fullname);\n"
-"if (make_diritems = 1)\n"
+"pairs := regexp_parse (\'^(.*) -RfId([1-9][0-9]*)\\044\', fname, 0);\n"
+"if (pairs is not null)\n"
"{\n"
-"diritm := \"HostFs_DAV_DIR_SINGLE\" (full_id, \'R\', \'(fake path)\', auth_uid);\n"
-"if (DAV_HIDE_ERROR (diritm) is not null)\n"
+"orig_fnameext := subseq (fname, pairs[2], pairs[3]) || fext;\n"
+"id := cast (subseq (fname, pairs[4], pairs[5]) as integer);\n"
+"\n"
+"return;\n"
+"}\n"
+"pairs := regexp_parse (\'^(.*) -Rf([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*)\\044\', fname, 0);\n"
+"if (pairs is not null)\n"
"{\n"
-"diritm [0] := DAV_CONCAT_PATH (detcol_path, diritm[10]);\n"
-"acc [acc_ctr] := diritm;\n"
-"acc_ctr := acc_ctr + 1;\n"
+"whenever sqlstate \'*\' goto oblom;\n"
+"orig_fnameext := subseq (fname, pairs[2], pairs[3]) || fext;\n"
+"id := call (subseq (fname, pairs[4], pairs[5]) || \'_RF_SUFFIX2ID\')(subseq (fname, pairs[6], pairs[7]), \'R\');\n"
+"\n"
+"return;\n"
"}\n"
-"else\n"
+"oblom:\n"
+"orig_fnameext := fname || fext;\n"
+"id := null;\n"
+"\n"
+"}\n"
+"--src DET_ResFilter.sql:317\n";
+
+static const char *proc478 =
+"#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"
-"if (acc_len > 1)\n"
+"declare colpath, orig_fnameext varchar;\n"
+"declare orig_id any;\n"
+"declare hitlist any;\n"
+"declare ext_cond any;\n"
+"\n"
+"if (\'R\' <> what)\n"
+"return -1;\n"
+"if (not (isstring (rfc_spath)))\n"
+"{\n"
+"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
"{\n"
-"acc [acc_ctr] := acc [acc_len - 1];\n"
-"acc_len := acc_len - 1;\n"
"\n"
+"return -1;\n"
"}\n"
"}\n"
-"}\n"
-"else\n"
+"if (1 <> length(path_parts) or (\'\' = path_parts[0]))\n"
"{\n"
-"acc [acc_ctr] := full_id;\n"
-"acc_ctr := acc_ctr + 1;\n"
+"\n"
+"return -1;\n"
"}\n"
+"\"ResFilter_FNSPLIT\" (path_parts[0], colpath, orig_fnameext, orig_id);\n"
+"\n"
+"if (orig_id is null)\n"
+"{\n"
+"ext_cond := vector (vector (\'RES_NAME\', \'=\', orig_fnameext));\n"
"}\n"
-"if (acc_len < length (acc))\n"
+"else\n"
"{\n"
-"acc := subseq (acc, 0, acc_len);\n"
+"if (isinteger (orig_id))\n"
+"ext_cond := vector (vector (\'RES_NAME\', \'=\', orig_fnameext), vector (\'RES_ID\', \'=\', orig_id));\n"
+"else\n"
+"ext_cond := vector (vector (\'RES_NAME\', \'=\', orig_fnameext), vector (\'RES_ID_SERIALIZED\', \'=\', serialize (orig_id)));\n"
"}\n"
+"ext_cond := vector (\'\',\n"
+"vector_concat (ext_cond, get_keyword (\'\', rfc_list_cond) ) );\n"
+"hitlist := DAV_DIR_FILTER_INT (rfc_spath, 1, ext_cond, null, null, http_dav_uid ());\n"
"\n"
-"return acc;\n"
+"if (length (hitlist) <> 1)\n"
+"return -1;\n"
+"return hitlist[0][4];\n"
"}\n"
-"--src DET_HostFs.sql:1282\n";
+"--src DET_ResFilter.sql:354\n";
-static const char *proc458 =
-"#line 1502 \"[executable]/DET_HostFs.sql\"\n"
-"create procedure \"HostFs_RF_ID2SUFFIX\" (in id any, in what char(1))\n"
+static const char *proc479 =
+"#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"
-"if (what=\'C\')\n"
+"declare rc integer;\n"
+"declare puid, pgid, ruid, rgid integer;\n"
+"declare u_password, pperms varchar;\n"
+"declare allow_anon integer;\n"
+"if (length (req) <> 3)\n"
+"return -15;\n"
+"\n"
+"whenever not found goto nf_col_or_res;\n"
+"puid := http_dav_uid();\n"
+"pgid := coalesce (\n"
+"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
+"where G_NAME = \'ResFilter_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'ResFilter\'), \'\')\n"
+"), puid+1);\n"
+"pperms := \'110100100NN\';\n"
+"if ((what <> \'R\') and (what <> \'C\'))\n"
+"return -14;\n"
+"allow_anon := WS.WS.PERM_COMP (substring (cast (pperms as varchar), 7, 3), req);\n"
+"if (a_uid is null)\n"
"{\n"
-"return sprintf (\'HostDir-%d-%d\',\n"
-"id[1], WS.WS.HOSTFS_FIND_COL (id[2]));\n"
+"if ((not allow_anon) or (\'\' <> WS.WS.FINDPARAM (a_lines, \'Authorization:\')))\n"
+"rc := WS.WS.GET_DAV_AUTH (a_lines, allow_anon, can_write_http, a_uname, u_password, a_uid, a_gid, _perms);\n"
+"if (rc < 0)\n"
+"return rc;\n"
"}\n"
-"if (what=\'R\')\n"
-"{\n"
-"declare full_path varchar;\n"
-"declare len, slash_pos integer;\n"
-"declare r_id, c_id integer;\n"
-"full_path := id[2];\n"
-"len := length (full_path);\n"
-"if ((len = 0) or (full_path[len-1] = 47))\n"
-"r_id := 0;\n"
-"else\n"
+"if (isinteger (a_uid))\n"
"{\n"
-"slash_pos := strrchr (full_path, \'/\');\n"
-"if (c_id is null)\n"
+"if (a_uid < 0)\n"
+"return a_uid;\n"
+"if (a_uid = 1)\n"
"{\n"
-"if (slash_pos is null)\n"
-"c_id := WS.WS.HOSTFS_FIND_COL (\'\');\n"
-"else\n"
-"c_id := WS.WS.HOSTFS_FIND_COL (subseq (full_path, 0, slash_pos));\n"
-"}\n"
-"r_id := coalesce ((select RES_ID from WS.WS.HOSTFS_RES where RES_NAME = subseq (full_path, slash_pos + 1) and RES_COL = c_id), 0);\n"
+"a_uid := 0;\n"
+"a_gid := 0;\n"
"}\n"
-"return sprintf (\'HostFile-%d-%d\', id[1], r_id);\n"
"}\n"
-"signal (\'OBLOM\', \'Invalid arguments for HostFs_RF_ID2SUFFIX\');\n"
+"if (not DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
+"return -13;\n"
+"\n"
+"if (isarray (id[2]))\n"
+"return -1;\n"
+"select RES_OWNER, RES_GROUP into ruid, rgid from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
+"if (not DAV_CHECK_PERM (pperms, req, a_uid, a_gid, rgid, ruid))\n"
+"return -13;\n"
+"\n"
+"return a_uid;\n"
+"\n"
+"nf_col_or_res:\n"
+"return -1;\n"
"}\n"
-"--src DET_HostFs.sql:1500\n";
+"--src DET_ResFilter.sql:400\n";
-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"
-"declare pairs any;\n"
-"declare r_id varchar;\n"
-"declare detcol_id integer;\n"
-"if (\'R\' <> what)\n"
-"return null;\n"
-"pairs := regexp_parse (\'^([1-9][0-9]*)-([1-9][0-9]*)\\044\', suffix, 0);\n"
-"if (pairs is null)\n"
+static const char *proc480 =
+"#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"
"\n"
-"return null;\n"
-"}\n"
-"detcol_id := cast (subseq (suffix, pairs[2], pairs[3]) as integer);\n"
-"whenever not found goto oblom;\n"
-"select vector (UNAME\'HostFs\', detcol_id, COL_FULL_PATH || RES_NAME) into r_id\n"
-"from WS.WS.HOSTFS_RES join WS.WS.HOSTFS_COL on (RES_COL = COL_ID)\n"
-"where RES_ID = cast (subseq (suffix, pairs[4], pairs[5]) as integer);\n"
-"return r_id;\n"
-"oblom:\n"
-"return null;\n"
+"if (st = \'R\')\n"
+"return id [1];\n"
+"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:1534\n";
+"--src DET_ResFilter.sql:453\n";
-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"
-"declare pairs any;\n"
-"declare c_id varchar;\n"
-"declare detcol_id integer;\n"
-"if (\'C\' <> what)\n"
-"return null;\n"
-"pairs := regexp_parse (\'^([1-9][0-9]*)-([1-9][0-9]*)\\044\', suffix, 0);\n"
-"if (pairs is null)\n"
+static const char *proc481 =
+"#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"
"\n"
-"return null;\n"
+"return -20;\n"
"}\n"
-"detcol_id := cast (subseq (suffix, pairs[2], pairs[3]) as integer);\n"
-"whenever not found goto oblom;\n"
-"select vector (UNAME\'HostFs\', detcol_id, COL_FULL_PATH) into c_id\n"
-"from WS.WS.HOSTFS_RES join WS.WS.HOSTFS_COL on (RES_COL = COL_ID);\n"
-"return c_id;\n"
-"oblom:\n"
-"return NULL;\n"
+"--src DET_ResFilter.sql:463\n";
+
+static const char *proc482 =
+"#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"
+"\n"
+"return -20;\n"
"}\n"
-"--src DET_HostFs.sql:1558\n";
+"--src DET_ResFilter.sql:471\n";
-/* DET_ResFilter.sql */
+static const char *proc483 =
+"#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"
+"\n"
+"return -20;\n"
+"}\n"
+"--src DET_ResFilter.sql:479\n";
-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"
+static const char *proc484 =
+"#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"
+"declare rc, orig_id integer;\n"
"declare rfc_spath varchar;\n"
"declare rfc_list_cond, rfc_del_action any;\n"
-"declare spath_id integer;\n"
"\n"
"rfc_spath := null;\n"
-"if (DAV_HIDE_ERROR (\"ResFilter_GET_CONDITION\" (id[1], rfc_spath, rfc_list_cond, rfc_del_action)) is null)\n"
-"return -1;\n"
-"if (not (\'110\' like req))\n"
-"return -13;\n"
-"if (\'C\' = what)\n"
-"{\n"
-"spath_id := DAV_SEARCH_ID (rfc_spath, \'C\');\n"
-"return DAV_AUTHENTICATE (spath_id, \'C\', req, auth_uname, auth_pwd, auth_uid);\n"
+"orig_id := \"ResFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, rfc_spath, rfc_list_cond, rfc_del_action);\n"
+"if (orig_id < 0)\n"
+"return orig_id;\n"
+"if (0 = length (rfc_del_action))\n"
+"return -20;\n"
+"return \"ResFilter_LEAVE_CONDITION\" (orig_id, what, rfc_del_action, auth_uid);\n"
"}\n"
-"if (\'R\' = what)\n"
+"--src DET_ResFilter.sql:487\n";
+
+static const char *proc485 =
+"#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"
-"return DAV_AUTHENTICATE (id [2], \'R\', req, auth_uname, auth_pwd, auth_uid);\n"
+"\n"
+"return -20;\n"
"}\n"
-"return -14;\n"
+"--src DET_ResFilter.sql:503\n";
+
+static const char *proc486 =
+"#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"
+"\n"
+"if (st <> \'R\')\n"
+"return -1;\n"
+"id := id[2];\n"
+"if (isarray (id))\n"
+"return call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\') (id, st, propname, silent, auth_uid);\n"
+"return DAV_PROP_REMOVE_RAW (id, st, propname, silent, auth_uid);\n"
"}\n"
-"--src DET_ResFilter.sql:24\n";
+"--src DET_ResFilter.sql:511\n";
-static const char *proc462 =
-"#line 51 \"[executable]/DET_ResFilter.sql\"\n"
-"create function \"ResFilter_NORM\" (in value any) returns varchar\n"
+static const char *proc487 =
+"#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"
-"value := blob_to_string (value);\n"
-"if ((\'\' = value) or (193 <> value[0]))\n"
-"return value;\n"
-"value := deserialize (value)[1];\n"
-"if (isstring (value))\n"
-"return value;\n"
-"return cast (xml_tree_doc(value) as varchar);\n"
+"declare pid integer;\n"
+"declare resv any;\n"
+"\n"
+"if (st <> \'R\')\n"
+"return -1;\n"
+"id := id[2];\n"
+"if (isarray (id))\n"
+"return call (cast (id[0] as varchar) || \'_DAV_PROP_SET\') (id, st, propname, propvalue, overwrite, auth_uid);\n"
+"return DAV_PROP_SET_RAW (id, st, propname, propvalue, overwrite, auth_uid);\n"
"}\n"
-"--src DET_ResFilter.sql:49\n";
+"--src DET_ResFilter.sql:524\n";
-static const char *proc463 =
-"#line 64 \"[executable]/DET_ResFilter.sql\"\n"
-"create function \"ResFilter_ENCODE_FILTER\" (in filt any) returns varchar\n"
+static const char *proc488 =
+"#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"
-"if (193 <> __tag (filt))\n"
-"signal (\'.....\', \'Invalid filter passed to ResFilter_ENCODE_FILTER\');\n"
-"filt := serialize (filt);\n"
-"filt[0] := 2;\n"
-"return filt;\n"
+"declare ret varchar;\n"
+"\n"
+"id := id[2];\n"
+"if (isarray (id))\n"
+"return call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
+"if (propname[0] = 58)\n"
+"return DAV_PROP_GET_INT (id, what, propname, 0, null, null, auth_uid);\n"
+"whenever not found goto no_prop;\n"
+"select blob_to_string (PROP_VALUE) into ret from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id and PROP_TYPE = what;\n"
+"return ret;\n"
+"\n"
+"no_prop:\n"
+"return -11;\n"
"}\n"
-"--src DET_ResFilter.sql:62\n";
+"--src DET_ResFilter.sql:539\n";
-static const char *proc464 =
-"#line 75 \"[executable]/DET_ResFilter.sql\"\n"
-"create function \"ResFilter_DECODE_FILTER\" (in value any) returns any\n"
+static const char *proc489 =
+"#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"
-"value := blob_to_string (value);\n"
-"if ((\'\' = value) or (value[0] <> 2))\n"
-"signal (\'.....\', \'Invalid filter serialization passed to ResFilter_DECODE_FILTER\');\n"
-"value [0] := 193;\n"
-"return deserialize (value);\n"
+"declare ret any;\n"
+"\n"
+"id := id[2];\n"
+"vectorbld_init (ret);\n"
+"for select PROP_NAME, PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_NAME like propmask and PROP_PARENT_ID = id and PROP_TYPE = what do {\n"
+"vectorbld_acc (ret, vector (PROP_NAME, blob_to_string (PROP_VALUE)));\n"
"}\n"
-"--src DET_ResFilter.sql:73\n";
+"vectorbld_final (ret);\n"
+"return ret;\n"
+"}\n"
+"--src DET_ResFilter.sql:558\n";
-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"
+static const char *proc490 =
+"#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"
"\n"
-"whenever not found goto nf;\n"
-"if (isarray (detcol_id))\n"
-"return -20;\n"
-"select \"ResFilter_NORM\" (PROP_VALUE) into rfc_spath from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:ResFilter-SearchPath\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
-"select \"ResFilter_DECODE_FILTER\" (PROP_VALUE) into rfc_list_cond from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:ResFilter-ListCond\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
-"select \"ResFilter_DECODE_FILTER\" (PROP_VALUE) into rfc_del_action from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:ResFilter-DelAction\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
-"return 0;\n"
-"nf:\n"
+"if (\'R\' <> what)\n"
+"return -1;\n"
+"for select RES_FULL_PATH, RES_ID, length (RES_CONTENT) as clen, RES_MOD_TIME,\n"
+"RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME as r1_RES_NAME\n"
+"from WS.WS.SYS_DAV_RES r1\n"
+"where RES_ID = id[2]\n"
+"do\n"
+"{\n"
+"declare merged varchar;\n"
+"\n"
+"if (regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', r1_RES_NAME, 0))\n"
+"{\n"
+"merged := \"ResFilter_FNMERGE\" (r1_RES_NAME, RES_ID);\n"
+"}\n"
+"else\n"
+"{\n"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_del_action varchar;\n"
+"declare tmp_comp, namesakes any;\n"
+"declare namesakes_no integer;\n"
+"if (0 > \"ResFilter_GET_CONDITION\" (id[1], rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"{\n"
+"\n"
+"return -1;\n"
+"}\n"
+"tmp_comp := vector (\'\',\n"
+"vector_concat (\n"
+"vector (vector (\'RES_NAME\', \'=\', r1_RES_NAME)),\n"
+"get_keyword (\'\', rfc_list_cond) ) );\n"
+"namesakes := DAV_DIR_FILTER_INT (rfc_spath, 1, tmp_comp, null, null, auth_uid);\n"
+"namesakes_no := length (namesakes);\n"
+"if (0 = namesakes_no)\n"
+"return -1;\n"
+"if (1 < namesakes_no)\n"
+"merged := \"ResFilter_FNMERGE\" (r1_RES_NAME, RES_ID);\n"
+"else\n"
+"merged := r1_RES_NAME;\n"
+"}\n"
+"\n"
+"return vector (DAV_CONCAT_PATH (DAV_SEARCH_PATH (id[1], \'C\'), merged), \'R\', clen, RES_MOD_TIME,\n"
+"\n"
+"id, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, merged);\n"
+"}\n"
"return -1;\n"
"}\n"
-"--src DET_ResFilter.sql:84\n";
+"--src DET_ResFilter.sql:573\n";
-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"
+static const char *proc491 =
+"#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"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_dec_action any;\n"
+"declare davpath, prev_raw_name varchar;\n"
+"declare res, itm, reps any;\n"
+"declare itm_ctr, itm_count, prev_is_patched integer;\n"
"\n"
-"declare has_rdf_preds integer;\n"
-"declare raw_filter any;\n"
-"has_rdf_preds := 0;\n"
-"raw_filter := get_keyword (\'\', rfc_list_cond);\n"
-"foreach (any pred in raw_filter) do\n"
-"{\n"
-"declare propid integer;\n"
-"declare old_value, pred_name, pred_cmp varchar;\n"
-"pred_name := pred [0];\n"
-"pred_cmp := pred [1];\n"
-"if ((\'PROP_VALUE\' = pred_name) and (\'=\' = pred_cmp))\n"
+"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_dec_action))\n"
"{\n"
-"if (isarray (id))\n"
+"\n"
+"return vector();\n"
+"}\n"
+"if (1 <> length(path_parts) or (\'\' <> path_parts[0]))\n"
"{\n"
-"call (cast (id[0] as varchar) || \'_DAV_PROP_SET\')(id, what, pred[3], pred[2], 1, auth_uid);\n"
-"goto next_pred;\n"
+"\n"
+"return vector();\n"
"}\n"
-"whenever not found goto ins_prop;\n"
-"select p.PROP_ID, \"ResFilter_NORM\" (p.PROP_VALUE) into propid, old_value from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r where p.PROP_NAME = pred[3] and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id;\n"
-"if (old_value <> pred[2])\n"
-"update WS.WS.SYS_DAV_PROP set PROP_VALUE = pred[2] where PROP_ID = propid;\n"
-"goto next_pred;\n"
-"ins_prop:\n"
-"propid := WS.WS.GETID (\'P\');\n"
-"insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_VALUE, PROP_PARENT_ID, PROP_TYPE)\n"
-"values (propid, pred[3], pred[2], id, what);\n"
-"goto next_pred;\n"
+"if (\'%\' = name_mask)\n"
+"res := DAV_DIR_FILTER_INT (rfc_spath, 1, rfc_list_cond, null, null, auth_uid);\n"
+"else\n"
+"{\n"
+"declare tmp_cond any;\n"
+"tmp_cond := vector (\'\',\n"
+"vector_concat (\n"
+"vector (vector (\'RES_NAME\', \'like\', name_mask)),\n"
+"get_keyword (\'\', rfc_list_cond) ) );\n"
+"res := DAV_DIR_FILTER_INT (rfc_spath, 1, tmp_cond, null, null, auth_uid);\n"
"}\n"
-"if ((\'PROP_VALUE\' = pred_name) and (\'<>\' = pred_cmp))\n"
+"reps := dict_new ();\n"
+"itm_count := length (res);\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
"{\n"
-"if (isarray (id))\n"
+"declare rname varchar;\n"
+"declare orig_id integer;\n"
+"itm := res [itm_ctr];\n"
+"rname := itm [10];\n"
+"orig_id := itm[4];\n"
+"if (regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', rname, 0))\n"
+"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
+"dict_put (reps, rname, dict_get (reps, rname, 0) + 1);\n"
+"}\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
"{\n"
-"call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\')(id, what, pred[3], 1, auth_uid);\n"
-"goto next_pred;\n"
+"declare rname varchar;\n"
+"declare orig_id integer;\n"
+"itm := res [itm_ctr];\n"
+"rname := itm [10];\n"
+"orig_id := itm[4];\n"
+"res[itm_ctr][4] := vector (UNAME\'ResFilter\', detcol_id, orig_id);\n"
+"if (dict_get (reps, rname, 0) > 1)\n"
+"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
+"res[itm_ctr][0] := DAV_CONCAT_PATH (detcol_path, rname);\n"
"}\n"
-"whenever not found goto next_pred;\n"
-"select p.PROP_ID into propid from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r where p.PROP_NAME = pred[3] and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id and \"ResFilter_NORM\" (p.PROP_VALUE) = pred[2];\n"
-"delete from WS.WS.SYS_DAV_PROP where PROP_ID = propid;\n"
-"goto next_pred;\n"
+"return res;\n"
"}\n"
-"if ((\'PROP_NAME\' = pred_name) and (\'not_exists\' = pred_cmp))\n"
+"--src DET_ResFilter.sql:624\n";
+
+static const char *proc492 =
+"#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"
-"if (isarray (id))\n"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_dec_action any;\n"
+"declare davpath, prev_raw_name varchar;\n"
+"declare res, itm, reps any;\n"
+"declare itm_ctr, itm_count, prev_is_patched integer;\n"
+"\n"
+"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_dec_action))\n"
"{\n"
-"call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\')(id, what, pred[3], 1, auth_uid);\n"
-"goto next_pred;\n"
+"\n"
+"return vector();\n"
"}\n"
-"whenever not found goto next_pred;\n"
-"select p.PROP_ID into propid from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r where p.PROP_NAME = pred[2] and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id;\n"
-"delete from WS.WS.SYS_DAV_PROP where PROP_ID = propid;\n"
-"goto next_pred;\n"
+"if (1 <> length(path_parts) or (\'\' <> path_parts[0]))\n"
+"{\n"
+"\n"
+"return vector();\n"
"}\n"
-"else if ((\'RDF_VALUE\' = pred_name) and ((\'=\' = pred_cmp) or (\'<>\' = pred_cmp)) and (5 = length (pred)) and (\'http://local.virt/DAV-RDF\' = pred [3]))\n"
+"if (0 = length (get_keyword (\'\', compilation)))\n"
+"res := DAV_DIR_FILTER_INT (rfc_spath, 1, rfc_list_cond, null, null, auth_uid);\n"
+"else\n"
"{\n"
-"has_rdf_preds := 1;\n"
-"goto next_pred;\n"
+"declare tmp_cond any;\n"
+"tmp_cond := vector (\'\',\n"
+"vector_concat (\n"
+"get_keyword (\'\', compilation),\n"
+"get_keyword (\'\', rfc_list_cond) ) );\n"
+"res := DAV_DIR_FILTER_INT (rfc_spath, 1, tmp_cond, null, null, auth_uid);\n"
"}\n"
-"else if ((\'RDF_PRED\' = pred_name) and (\'not_exists\' = pred_cmp) and (4 = length (pred)) and (\'http://local.virt/DAV-RDF\' = pred [3]))\n"
+"reps := dict_new ();\n"
+"itm_count := length (res);\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
"{\n"
-"has_rdf_preds := 1;\n"
-"goto next_pred;\n"
+"declare rname varchar;\n"
+"declare orig_id integer;\n"
+"itm := res [itm_ctr];\n"
+"rname := itm [10];\n"
+"orig_id := itm[4];\n"
+"if (regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', rname, 0))\n"
+"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
+"dict_put (reps, rname, dict_get (reps, rname, 0) + 1);\n"
"}\n"
-"else\n"
+"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
"{\n"
-"\n"
-"signal (\'.....\', \'Unsupported predicate in ResFilter_FIT_INTO_CONDITION\');\n"
+"declare rname varchar;\n"
+"declare orig_id integer;\n"
+"itm := res [itm_ctr];\n"
+"rname := itm [10];\n"
+"orig_id := itm[4];\n"
+"res[itm_ctr][4] := vector (UNAME\'ResFilter\', detcol_id, orig_id);\n"
+"if (dict_get (reps, rname, 0) > 1)\n"
+"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
+"res[itm_ctr][0] := DAV_CONCAT_PATH (detcol_path, rname);\n"
"}\n"
-"next_pred: ;\n"
+"return res;\n"
"}\n"
-"if (has_rdf_preds)\n"
-"{\n"
-"declare propid integer;\n"
-"declare old_prop, old_n3, acc_n3, new_n3, new_davxml any;\n"
-"declare top_path nvarchar;\n"
-"top_path := cast (DAV_SEARCH_PATH (id, what) as nvarchar);\n"
-"xte_nodebld_init (acc_n3);\n"
-"foreach (any pred in raw_filter) do\n"
+"--src DET_ResFilter.sql:683\n";
+
+static const char *proc493 =
+"#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"
-"declare pred_name, pred_cmp varchar;\n"
-"pred_name := pred [0];\n"
-"pred_cmp := pred [1];\n"
-"if ((\'RDF_VALUE\' = pred_name) and (\'=\' = pred_cmp))\n"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_del_action any;\n"
+"declare orig_id integer;\n"
+"\n"
+"rfc_spath := null;\n"
+"orig_id := \"ResFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, rfc_spath, rfc_list_cond, rfc_del_action);\n"
+"if (orig_id < 0)\n"
+"return orig_id;\n"
+"return vector (UNAME\'ResFilter\', detcol_id, orig_id);\n"
+"}\n"
+"--src DET_ResFilter.sql:742\n";
+
+static const char *proc494 =
+"#line 759 \"[executable]/DET_ResFilter.sql\"\n"
+"create function \"ResFilter_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
-"xte_nodebld_acc (acc_n3,\n"
-"xte_node (\n"
-"xte_head (\'N3\', \'N3S\', top_path, \'N3P\', pred [4]),\n"
-"pred [2] ) );\n"
+"\n"
+"return coalesce ((select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_ID = id[2]), null);\n"
"}\n"
+"--src DET_ResFilter.sql:757\n";
+
+static const char *proc495 =
+"#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"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_del_action any;\n"
+"declare rc integer;\n"
+"\n"
+"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"{\n"
+"\n"
+"return -2;\n"
"}\n"
-"xte_nodebld_final (acc_n3, xte_head (\' root\'));\n"
-"acc_n3 := xml_tree_doc (acc_n3);\n"
-"old_n3 := null;\n"
-"propid := null;\n"
-"if (isarray (id))\n"
+"if (0 = length (rfc_del_action))\n"
+"return -20;\n"
+"if (1 <> length (path_parts))\n"
+"return -2;\n"
+"if (\'R\' <> what)\n"
+"return -2;\n"
+"if (\'\' = path_parts[0])\n"
+"return -2;\n"
+"if (isinteger (source_id) and\n"
+"exists (select 1 from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = source_id and RES_NAME = path_parts[0] and (RES_FULL_PATH between rfc_spath and DAV_COL_PATH_BOUNDARY (rfc_spath)) ) )\n"
"{\n"
-"old_prop := call (cast (id[0] as varchar) || \'_DAV_PROP_GET\')(id, what, \'http://local.virt/DAV-RDF\', auth_uid);\n"
-"if (DAV_HIDE_ERROR (old_prop) is null)\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, rfc_list_cond, auth_uid);\n"
+"}\n"
+"else\n"
"{\n"
-"goto do_merge;\n"
+"declare new_full_path varchar;\n"
+"new_full_path := DAV_CONCAT_PATH (rfc_spath, path_parts[0]);\n"
+"rc := DAV_COPY_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, permissions,\n"
+"coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = uid), \'\'),\n"
+"coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = gid), \'\'),\n"
+"null, null, 0);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
+"if (DAV_HIDE_ERROR (source_id) is null)\n"
+"return source_id;\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, rfc_list_cond, auth_uid);\n"
"}\n"
-"if (isentity (old_prop))\n"
+"return 1;\n"
+"}\n"
+"--src DET_ResFilter.sql:765\n";
+
+static const char *proc496 =
+"#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"
+"declare rfc_spath varchar;\n"
+"declare rfc_list_cond, rfc_del_action any;\n"
+"declare rc integer;\n"
+"\n"
+"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
"{\n"
-"old_n3 := xslt (\'http://local.virt/davxml2n3xml\', old_prop);\n"
-"goto do_merge;\n"
-"}\n"
-"goto old_prop_found;\n"
+"\n"
+"return -2;\n"
"}\n"
-"whenever not found goto do_merge;\n"
-"select p.PROP_ID, blob_to_string (p.PROP_VALUE) into propid, old_prop\n"
-"from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r\n"
-"where p.PROP_NAME = \'http://local.virt/DAV-RDF\' and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id;\n"
-"goto do_merge;\n"
-"old_prop_found:\n"
-"old_prop := deserialize (cast (old_prop as varchar));\n"
-"old_n3 := xslt (\'http://local.virt/davxml2n3xml\', xml_tree_doc (old_prop));\n"
-"do_merge:\n"
-"new_n3 := DAV_RDF_MERGE (old_n3, acc_n3, null, -1);\n"
-"foreach (any pred in raw_filter) do\n"
-"{\n"
-"declare pred_name, pred_cmp varchar;\n"
-"pred_name := pred [0];\n"
-"pred_cmp := pred [1];\n"
-"if ((\'RDF_PRED\' = pred_name) and (\'<>\' = pred_cmp))\n"
+"if (0 = length (rfc_del_action))\n"
+"return -20;\n"
+"if (1 <> length (path_parts))\n"
+"return -2;\n"
+"if (\'R\' <> what)\n"
+"return -2;\n"
+"if (\'\' = path_parts[0])\n"
+"return -2;\n"
+"if (isinteger (source_id) and\n"
+"exists (select 1 from WS.WS.SYS_DAV_RES\n"
+"where RES_ID = source_id and RES_NAME = path_parts[0] and (RES_FULL_PATH between rfc_spath and DAV_COL_PATH_BOUNDARY (rfc_spath))))\n"
"{\n"
-"new_n3 := XMLUpdate (new_n3, \'/N3[N3P=\' || WS.WS.STR_SQL_APOS (pred[4]) || \'][string (.) =\' || WS.WS.STR_SQL_APOS (pred[2]) || \']\', null);\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, rfc_list_cond, auth_uid);\n"
"}\n"
"else\n"
-"if ((\'RDF_PRED\' = pred_name) and (\'not_exists\' = pred_cmp))\n"
"{\n"
-"new_n3 := XMLUpdate (new_n3, \'/N3[N3P=\' || WS.WS.STR_SQL_APOS (pred[2]) || \']\', null);\n"
+"declare new_full_path varchar;\n"
+"new_full_path := DAV_CONCAT_PATH (rfc_spath, path_parts[0]);\n"
+"rc := DAV_MOVE_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, null, null, 0, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
+"if (DAV_HIDE_ERROR (source_id) is null)\n"
+"return source_id;\n"
+"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, rfc_list_cond, auth_uid);\n"
"}\n"
+"return 1;\n"
"}\n"
-"new_davxml := DAV_RDF_PREPROCESS_RDFXML (new_n3, top_path, 1);\n"
-"if (isarray (id))\n"
+"--src DET_ResFilter.sql:810\n";
+
+static const char *proc497 =
+"#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"
-"call (cast (id[0] as varchar) || \'_DAV_PROP_SET\')(id, what, \'http://local.virt/DAV-RDF\', new_davxml, 1, auth_uid);\n"
-"goto next_pred;\n"
+"\n"
+"declare cont any;\n"
+"if ((content_mode = 0) or (content_mode = 2))\n"
+"select RES_CONTENT, RES_TYPE into content, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
+"else if (content_mode = 1)\n"
+"select http (RES_CONTENT, content), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
+"else if (content_mode = 3)\n"
+"select http (RES_CONTENT), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
+"return id[2];\n"
"}\n"
-"else if (propid is null)\n"
+"--src DET_ResFilter.sql:852\n";
+
+static const char *proc498 =
+"#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"
-"propid := WS.WS.GETID (\'P\');\n"
-"insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_VALUE, PROP_PARENT_ID, PROP_TYPE)\n"
-"values (propid, \'http://local.virt/DAV-RDF\', serialize (new_davxml), id, what);\n"
-"}\n"
-"else\n"
-"update WS.WS.SYS_DAV_PROP set PROP_VALUE = serialize (new_davxml) where PROP_ID = propid;\n"
+"\n"
+"return -20;\n"
"}\n"
+"--src DET_ResFilter.sql:867\n";
+
+static const char *proc499 =
+"#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"
+"declare rc, u_token, new_token varchar;\n"
+"\n"
+"if (\'R\' <> type)\n"
+"return -20;\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
+"return -20;\n"
+"if (isarray (id))\n"
+"return DAV_LOCK_INT (path, id[2], type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, null, null, auth_uid);\n"
+"return -20;\n"
"}\n"
-"--src DET_ResFilter.sql:100\n";
+"--src DET_ResFilter.sql:875\n";
-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"
+static const char *proc500 =
+"#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"
"\n"
-"declare raw_filter, res any;\n"
-"res := vector ();\n"
-"raw_filter := get_keyword (\'\', rfc_list_cond);\n"
-"foreach (any pred in raw_filter) do\n"
+"if (isarray (id))\n"
+"id := id [2];\n"
+"return DAV_UNLOCK_INT (id, type, token, null, null, auth_uid);\n"
+"}\n"
+"--src DET_ResFilter.sql:890\n";
+
+static const char *proc501 =
+"#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"
-"declare propid integer;\n"
-"declare old_value, pred_name, pred_cmp varchar;\n"
-"pred_name := pred [0];\n"
-"pred_cmp := pred [1];\n"
-"if ((\'PROP_VALUE\' = pred_name) and (\'=\' = pred_cmp))\n"
+"declare rc integer;\n"
+"declare orig_id any;\n"
+"declare orig_type char(1);\n"
+"\n"
+"orig_id := id;\n"
+"id := orig_id[2];\n"
+"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if (rc <> 0)\n"
+"return rc;\n"
+"id := orig_id[1];\n"
+"orig_type := type;\n"
+"type := \'C\';\n"
+"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if (rc <> 0)\n"
+"return rc;\n"
+"id := orig_id;\n"
+"type := orig_type;\n"
+"return 0;\n"
+"}\n"
+"--src DET_ResFilter.sql:900\n";
+
+static const char *proc502 =
+"#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"
-"res := vector_concat (res, vector (vector (\'PROP_VALUE\', \'<>\', pred[2], pred [3])));\n"
+"declare res any;\n"
+"\n"
+"id := id[2];\n"
+"if (isarray (id))\n"
+"return call (cast (id[0] as varchar) || \'_DAV_LIST_LOCKS\') (id, type, recursive);\n"
+"res := vector();\n"
+"for select LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO\n"
+"from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type do {\n"
+"res := vector_concat (res, vector (vector (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)));\n"
"}\n"
-"else if ((\'PROP_VALUE\' = pred_name) and (\'<>\' = pred_cmp))\n"
+"return res;\n"
+"}\n"
+"--src DET_ResFilter.sql:924\n";
+
+static const char *proc503 =
+"#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"
-"res := vector_concat (res, vector (vector (\'PROP_VALUE\', \'=\', pred[2], pred [3])));\n"
+"declare rc integer;\n"
+"declare colname varchar;\n"
+"declare compilation, del_act any;\n"
+"compilation := vector (\'\', filter);\n"
+"rc := DAV_DIR_FILTER_INT (search_path, 1, compilation, null, null, http_dav_uid ());\n"
+"if (isinteger (rc))\n"
+"return rc;\n"
+"if (not isinteger (col))\n"
+"return -20;\n"
+"colname := DAV_SEARCH_PATH (col, \'C\');\n"
+"if (not (isstring (colname)))\n"
+"return -23;\n"
+"rc := DAV_SEARCH_ID (search_path, \'C\');\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"if (search_path <> DAV_SEARCH_PATH (rc, \'C\'))\n"
+"return -2;\n"
+"if (search_path between colname and (colname || \'\\255\\255\\255\\255\'))\n"
+"return -28;\n"
+"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-SearchPath\', search_path, null, null, 0, 1, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-ListCond\', \"ResFilter_ENCODE_FILTER\" (compilation), null, null, 0, 1, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"del_act := \"ResFilter_MAKE_DEL_ACTION_FROM_CONDITION\" (compilation);\n"
+"\n"
+"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-DelAction\', \"ResFilter_ENCODE_FILTER\" (del_act), null, null, 0, 1, 1);\n"
+"if (DAV_HIDE_ERROR (rc) is null)\n"
+"return rc;\n"
+"update WS.WS.SYS_DAV_COL set COL_DET=\'ResFilter\' where COL_ID=col;\n"
+"return 0;\n"
"}\n"
-"else if ((\'RDF_VALUE\' = pred_name) and (\'=\' = pred_cmp) and (5 = length (pred)) and (\'http://local.virt/DAV-RDF\' = pred [3]))\n"
+"--src DET_ResFilter.sql:941\n";
+
+/* DET_PropFilter.sql */
+
+static const char *proc504 =
+"#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"
-"res := vector_concat (res, vector (vector (\'RDF_VALUE\', \'<>\', pred [2], \'http://local.virt/DAV-RDF\', pred [4])));\n"
+"\n"
+"if (auth_uid >= 0)\n"
+"return auth_uid;\n"
+"return -12;\n"
"}\n"
-"else if ((\'RDF_VALUE\' = pred_name) and (\'<>\' = pred_cmp) and (5 = length (pred)) and (\'http://local.virt/DAV-RDF\' = pred [3]))\n"
+"--src DET_PropFilter.sql:24\n";
+
+static const char *proc505 =
+"#line 36 \"[executable]/DET_PropFilter.sql\"\n"
+"create function \"PropFilter_NORM\" (in value any) returns varchar\n"
"{\n"
-"res := vector_concat (res, vector (vector (\'RDF_VALUE\', \'=\', pred [2], \'http://local.virt/DAV-RDF\', pred [4])));\n"
+"value := blob_to_string (value);\n"
+"if ((\'\' = value) or (193 <> value[0]))\n"
+"return value;\n"
+"value := deserialize (value)[1];\n"
+"if (isstring (value))\n"
+"return value;\n"
+"return cast (xml_tree_doc(value) as varchar);\n"
"}\n"
-"else return vector ();\n"
+"--src DET_PropFilter.sql:34\n";
+
+static const char *proc506 =
+"#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"
+"\n"
+"whenever not found goto nf;\n"
+"if (isarray (detcol_id))\n"
+"return -20;\n"
+"select \"PropFilter_NORM\" (PROP_VALUE) into pfc_spath from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:PropFilter-SearchPath\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
+"select \"PropFilter_NORM\" (PROP_VALUE) into pfc_name from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:PropFilter-PropName\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
+"select \"PropFilter_NORM\" (PROP_VALUE) into pfc_value from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:PropFilter-PropValue\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
+"return 0;\n"
+"nf:\n"
+"return -1;\n"
"}\n"
-"return vector (\'\', res);\n"
+"--src DET_PropFilter.sql:47\n";
+
+static const char *proc507 =
+"#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"
+"declare old_value varchar;\n"
+"declare propid integer;\n"
+"if (__tag (pfc_value) = 193)\n"
+"pfc_value := serialize (pfc_value);\n"
+"else if (not isstring (pfc_value))\n"
+"return -17;\n"
+"whenever not found goto ins;\n"
+"select p.PROP_ID, \"PropFilter_NORM\" (p.PROP_VALUE) into propid, old_value from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r where p.PROP_NAME = pfc_name and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id;\n"
+"if (old_value <> pfc_value)\n"
+"update WS.WS.SYS_DAV_PROP set PROP_VALUE = pfc_value where PROP_ID = propid;\n"
+"return propid;\n"
+"\n"
+"ins:\n"
+"propid := WS.WS.GETID (\'P\');\n"
+"insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_VALUE, PROP_PARENT_ID, PROP_TYPE)\n"
+"values (propid, pfc_name, pfc_value, id, what);\n"
+"return propid;\n"
"}\n"
-"--src DET_ResFilter.sql:254\n";
+"--src DET_PropFilter.sql:63\n";
-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"
+static const char *proc508 =
+"#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"
-"\"ResFilter_FIT_INTO_CONDITION\" (id, what, rfc_del_action, auth_uid);\n"
+"delete from WS.WS.SYS_DAV_PROP where PROP_NAME = pfc_name and PROP_PARENT_ID = id and PROP_TYPE = what and \"PropFilter_NORM\" (PROP_VALUE) = pfc_value;\n"
"return 0;\n"
"}\n"
-"--src DET_ResFilter.sql:289\n";
+"--src DET_PropFilter.sql:86\n";
-static const char *proc469 =
-"#line 299 \"[executable]/DET_ResFilter.sql\"\n"
-"create function \"ResFilter_FNMERGE\" (in path any, in id any) returns varchar\n"
+static const char *proc509 =
+"#line 96 \"[executable]/DET_PropFilter.sql\"\n"
+"create function \"PropFilter_FNMERGE\" (in path any, in id integer) returns varchar\n"
"{\n"
"declare pairs any;\n"
-"declare res varchar;\n"
"pairs := regexp_parse (\'^(.*[/])?([^/][^./]*)([^/]*)\\044\', path, 0);\n"
"if (pairs is null)\n"
-"signal (\'.....\', sprintf (\'Internal error: failed \"ResFilter_FNMERGE\" (%s, %d)\', path, id));\n"
-"if (isinteger (id))\n"
-"return sprintf (\'%s -RfId%d%s\', subseq (path, 0, pairs[5]), id, subseq (path, pairs[6]));\n"
-"id[0] := cast (id[0] as varchar);\n"
-"res := sprintf (\'%s -Rf%s%s\',\n"
-"subseq (path, 0, pairs[5]),\n"
-"call (cast (id[0] as varchar) || \'_RF_ID2SUFFIX\')(id, \'R\'),\n"
-"subseq (path, pairs[6]) );\n"
-"\n"
-"return res;\n"
+"signal (\'.....\', sprintf (\'Internal error: failed \"PropFilter_FNMERGE\" (%s, %d)\', path, id));\n"
+"return sprintf (\'%s-PfId%d%s\', subseq (path, 0, pairs[5]), id, subseq (path, pairs[6]));\n"
"}\n"
-"--src DET_ResFilter.sql:297\n";
+"--src DET_PropFilter.sql:94\n";
-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"
+static const char *proc510 =
+"#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"
"declare pairs any;\n"
"declare fname, fext varchar;\n"
-"\n"
"pairs := regexp_parse (\'^(.*[/])?([^/][^./]*)([^/]*)\\044\', path, 0);\n"
"if (pairs is null)\n"
-"signal (\'.....\', sprintf (\'Internal error: failed \"ResFilter_FNSPLIT\" (%s)\', path));\n"
+"signal (\'.....\', sprintf (\'Internal error: failed \"PropFilter_FNSPLIT\" (%s)\', path));\n"
"colpath := subseq (path, 0, pairs[4]);\n"
"fname := subseq (path, pairs[4], pairs[5]);\n"
"fext := subseq (path, pairs[6], pairs[7]);\n"
"\n"
-"pairs := regexp_parse (\'^(.*) -RfId([1-9][0-9]*)\\044\', fname, 0);\n"
-"if (pairs is not null)\n"
+"pairs := regexp_parse (\'^(.*)-PfId([1-9][0-9]*)\\044\', fname, 0);\n"
+"if (pairs is null)\n"
"{\n"
-"orig_fnameext := subseq (fname, pairs[2], pairs[3]) || fext;\n"
-"id := cast (subseq (fname, pairs[4], pairs[5]) as integer);\n"
-"\n"
-"return;\n"
+"orig_fnameext := fname || fext;\n"
+"id := null;\n"
"}\n"
-"pairs := regexp_parse (\'^(.*) -Rf([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*)\\044\', fname, 0);\n"
-"if (pairs is not null)\n"
+"else\n"
"{\n"
-"whenever sqlstate \'*\' goto oblom;\n"
"orig_fnameext := subseq (fname, pairs[2], pairs[3]) || fext;\n"
-"id := call (subseq (fname, pairs[4], pairs[5]) || \'_RF_SUFFIX2ID\')(subseq (fname, pairs[6], pairs[7]), \'R\');\n"
-"\n"
-"return;\n"
+"id := cast (subseq (fname, pairs[4], pairs[5]) as integer);\n"
"}\n"
-"oblom:\n"
-"orig_fnameext := fname || fext;\n"
-"id := null;\n"
-"\n"
"}\n"
-"--src DET_ResFilter.sql:317\n";
+"--src DET_PropFilter.sql:105\n";
-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"
+static const char *proc511 =
+"#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"
"declare colpath, orig_fnameext varchar;\n"
-"declare orig_id any;\n"
+"declare orig_id integer;\n"
"declare hitlist any;\n"
-"declare ext_cond any;\n"
"\n"
"if (\'R\' <> what)\n"
"return -1;\n"
-"if (not (isstring (rfc_spath)))\n"
+"if (not (isstring (pfc_spath)))\n"
"{\n"
-"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
"{\n"
"\n"
"return -1;\n"
@@ -22752,32 +24042,41 @@ static const char *proc471 =
"\n"
"return -1;\n"
"}\n"
-"\"ResFilter_FNSPLIT\" (path_parts[0], colpath, orig_fnameext, orig_id);\n"
+"\"PropFilter_FNSPLIT\" (path_parts[0], colpath, orig_fnameext, orig_id);\n"
"\n"
+"hitlist := vector();\n"
"if (orig_id is null)\n"
"{\n"
-"ext_cond := vector (vector (\'RES_NAME\', \'=\', orig_fnameext));\n"
+"for select RES_ID from WS.WS.SYS_DAV_RES inner join WS.WS.SYS_DAV_PROP on (RES_ID = PROP_PARENT_ID)\n"
+"where RES_NAME = orig_fnameext and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) and\n"
+"PROP_NAME = pfc_name and PROP_TYPE = \'R\' and \"PropFilter_NORM\" (PROP_VALUE) = pfc_value\n"
+"do\n"
+"{\n"
+"\n"
+"hitlist := vector_concat (hitlist, vector (RES_ID));\n"
+"}\n"
"}\n"
"else\n"
"{\n"
-"if (isinteger (orig_id))\n"
-"ext_cond := vector (vector (\'RES_NAME\', \'=\', orig_fnameext), vector (\'RES_ID\', \'=\', orig_id));\n"
-"else\n"
-"ext_cond := vector (vector (\'RES_NAME\', \'=\', orig_fnameext), vector (\'RES_ID_SERIALIZED\', \'=\', serialize (orig_id)));\n"
-"}\n"
-"ext_cond := vector (\'\',\n"
-"vector_concat (ext_cond, get_keyword (\'\', rfc_list_cond) ) );\n"
-"hitlist := DAV_DIR_FILTER_INT (rfc_spath, 1, ext_cond, null, null, http_dav_uid ());\n"
+"for select RES_ID from WS.WS.SYS_DAV_RES inner join WS.WS.SYS_DAV_PROP on (RES_ID = PROP_PARENT_ID)\n"
+"where RES_ID = orig_id and\n"
+"RES_NAME = orig_fnameext and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) and\n"
+"PROP_NAME = pfc_name and PROP_TYPE = \'R\' and \"PropFilter_NORM\" (PROP_VALUE) = pfc_value\n"
+"do\n"
+"{\n"
"\n"
+"hitlist := vector_concat (hitlist, vector (RES_ID));\n"
+"}\n"
+"}\n"
"if (length (hitlist) <> 1)\n"
"return -1;\n"
-"return hitlist[0][4];\n"
+"return hitlist[0];\n"
"}\n"
-"--src DET_ResFilter.sql:354\n";
+"--src DET_PropFilter.sql:131\n";
-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"
+static const char *proc512 =
+"#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"
"declare rc integer;\n"
"declare puid, pgid, ruid, rgid integer;\n"
@@ -22790,9 +24089,9 @@ static const char *proc472 =
"puid := http_dav_uid();\n"
"pgid := coalesce (\n"
"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
-"where G_NAME = \'ResFilter_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'ResFilter\'), \'\')\n"
+"where G_NAME = \'PropFilter_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'PropFilter\'), \'\')\n"
"), puid+1);\n"
-"pperms := \'110100100NN\';\n"
+"pperms := \'110100100R\';\n"
"if ((what <> \'R\') and (what <> \'C\'))\n"
"return -14;\n"
"allow_anon := WS.WS.PERM_COMP (substring (cast (pperms as varchar), 7, 3), req);\n"
@@ -22809,8 +24108,8 @@ static const char *proc472 =
"return a_uid;\n"
"if (a_uid = 1)\n"
"{\n"
-"a_uid := 0;\n"
-"a_gid := 0;\n"
+"a_uid := http_nobody_uid ();\n"
+"a_gid := http_nogroup_gid ();\n"
"}\n"
"}\n"
"if (not DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
@@ -22827,76 +24126,73 @@ static const char *proc472 =
"nf_col_or_res:\n"
"return -1;\n"
"}\n"
-"--src DET_ResFilter.sql:400\n";
+"--src DET_PropFilter.sql:185\n";
-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"
+static const char *proc513 =
+"#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"
"\n"
"if (st = \'R\')\n"
"return id [1];\n"
"return -20;\n"
"}\n"
-"--src DET_ResFilter.sql:453\n";
+"--src DET_PropFilter.sql:238\n";
-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"
+static const char *proc514 =
+"#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"
"\n"
"return -20;\n"
"}\n"
-"--src DET_ResFilter.sql:463\n";
+"--src DET_PropFilter.sql:248\n";
-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"
+static const char *proc515 =
+"#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"
"\n"
"return -20;\n"
"}\n"
-"--src DET_ResFilter.sql:471\n";
+"--src DET_PropFilter.sql:256\n";
-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"
+static const char *proc516 =
+"#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"
"\n"
"return -20;\n"
"}\n"
-"--src DET_ResFilter.sql:479\n";
+"--src DET_PropFilter.sql:264\n";
-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"
+static const char *proc517 =
+"#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"
"declare rc, orig_id integer;\n"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_del_action any;\n"
+"declare pfc_spath, pfc_name, pfc_value varchar;\n"
"\n"
-"rfc_spath := null;\n"
-"orig_id := \"ResFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, rfc_spath, rfc_list_cond, rfc_del_action);\n"
+"pfc_spath := null;\n"
+"orig_id := \"PropFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, pfc_spath, pfc_name, pfc_value);\n"
"if (orig_id < 0)\n"
"return orig_id;\n"
-"if (0 = length (rfc_del_action))\n"
-"return -20;\n"
-"return \"ResFilter_LEAVE_CONDITION\" (orig_id, what, rfc_del_action, auth_uid);\n"
+"return \"PropFilter_LEAVE_CONDITION\" (orig_id, what, pfc_name, pfc_value);\n"
"}\n"
-"--src DET_ResFilter.sql:487\n";
+"--src DET_PropFilter.sql:272\n";
-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"
+static const char *proc518 =
+"#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"
"\n"
"return -20;\n"
"}\n"
-"--src DET_ResFilter.sql:503\n";
+"--src DET_PropFilter.sql:286\n";
-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"
+static const char *proc519 =
+"#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"
"\n"
"if (st <> \'R\')\n"
@@ -22906,11 +24202,11 @@ static const char *proc479 =
"return call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\') (id, st, propname, silent, auth_uid);\n"
"return DAV_PROP_REMOVE_RAW (id, st, propname, silent, auth_uid);\n"
"}\n"
-"--src DET_ResFilter.sql:511\n";
+"--src DET_PropFilter.sql:294\n";
-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"
+static const char *proc520 =
+"#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"
"declare pid integer;\n"
"declare resv any;\n"
@@ -22922,11 +24218,11 @@ static const char *proc480 =
"return call (cast (id[0] as varchar) || \'_DAV_PROP_SET\') (id, st, propname, propvalue, overwrite, auth_uid);\n"
"return DAV_PROP_SET_RAW (id, st, propname, propvalue, overwrite, auth_uid);\n"
"}\n"
-"--src DET_ResFilter.sql:524\n";
+"--src DET_PropFilter.sql:307\n";
-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"
+static const char *proc521 =
+"#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"
"declare ret varchar;\n"
"\n"
@@ -22942,27 +24238,26 @@ static const char *proc481 =
"no_prop:\n"
"return -11;\n"
"}\n"
-"--src DET_ResFilter.sql:539\n";
+"--src DET_PropFilter.sql:322\n";
-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"
+static const char *proc522 =
+"#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"
"declare ret any;\n"
"\n"
"id := id[2];\n"
-"vectorbld_init (ret);\n"
+"ret := vector();\n"
"for select PROP_NAME, PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_NAME like propmask and PROP_PARENT_ID = id and PROP_TYPE = what do {\n"
-"vectorbld_acc (ret, vector (PROP_NAME, blob_to_string (PROP_VALUE)));\n"
+"ret := vector_concat (ret, vector (vector (PROP_NAME, blob_to_string (PROP_VALUE))));\n"
"}\n"
-"vectorbld_final (ret);\n"
"return ret;\n"
"}\n"
-"--src DET_ResFilter.sql:558\n";
+"--src DET_PropFilter.sql:341\n";
-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"
+static const char *proc523 =
+"#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"
"\n"
"if (\'R\' <> what)\n"
@@ -22975,31 +24270,27 @@ static const char *proc483 =
"{\n"
"declare merged varchar;\n"
"\n"
-"if (regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', r1_RES_NAME, 0))\n"
+"if (regexp_parse (\'^([^/][^./]*)-PfId([1-9][0-9]*)([^/]*)\\044\', r1_RES_NAME, 0))\n"
"{\n"
-"merged := \"ResFilter_FNMERGE\" (r1_RES_NAME, RES_ID);\n"
+"merged := \"PropFilter_FNMERGE\" (r1_RES_NAME, RES_ID);\n"
"}\n"
"else\n"
"{\n"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_del_action varchar;\n"
-"declare tmp_comp, namesakes any;\n"
+"declare pfc_spath, pfc_name, pfc_value varchar;\n"
"declare namesakes_no integer;\n"
-"if (0 > \"ResFilter_GET_CONDITION\" (id[1], rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"if (0 > \"PropFilter_GET_CONDITION\" (id[1], pfc_spath, pfc_name, pfc_value))\n"
"{\n"
"\n"
-"return -1;\n"
-"}\n"
-"tmp_comp := vector (\'\',\n"
-"vector_concat (\n"
-"vector (vector (\'RES_NAME\', \'=\', r1_RES_NAME)),\n"
-"get_keyword (\'\', rfc_list_cond) ) );\n"
-"namesakes := DAV_DIR_FILTER_INT (rfc_spath, 1, tmp_comp, null, null, auth_uid);\n"
-"namesakes_no := length (namesakes);\n"
+"return -1;\n"
+"}\n"
+"select count(1) into namesakes_no\n"
+"from WS.WS.SYS_DAV_RES r2 inner join WS.WS.SYS_DAV_PROP p2 on (r2.RES_ID = p2.PROP_PARENT_ID)\n"
+"where r2.RES_NAME = r1_RES_NAME and (r2.RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) and\n"
+"p2.PROP_NAME = pfc_name and p2.PROP_TYPE = \'R\' and \"PropFilter_NORM\" (p2.PROP_VALUE) = pfc_value;\n"
"if (0 = namesakes_no)\n"
"return -1;\n"
"if (1 < namesakes_no)\n"
-"merged := \"ResFilter_FNMERGE\" (r1_RES_NAME, RES_ID);\n"
+"merged := \"PropFilter_FNMERGE\" (r1_RES_NAME, RES_ID);\n"
"else\n"
"merged := r1_RES_NAME;\n"
"}\n"
@@ -23010,19 +24301,18 @@ static const char *proc483 =
"}\n"
"return -1;\n"
"}\n"
-"--src DET_ResFilter.sql:573\n";
+"--src DET_PropFilter.sql:355\n";
-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"
+static const char *proc524 =
+"#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"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_dec_action any;\n"
+"declare pfc_spath, pfc_name, pfc_value varchar;\n"
"declare davpath, prev_raw_name varchar;\n"
-"declare res, itm, reps any;\n"
-"declare itm_ctr, itm_count, prev_is_patched integer;\n"
+"declare files, filtered_files, res any;\n"
+"declare reslen, prev_is_patched integer;\n"
"\n"
-"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_dec_action))\n"
+"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
"{\n"
"\n"
"return vector();\n"
@@ -23032,57 +24322,73 @@ static const char *proc484 =
"\n"
"return vector();\n"
"}\n"
-"if (\'%\' = name_mask)\n"
-"res := DAV_DIR_FILTER_INT (rfc_spath, 1, rfc_list_cond, null, null, auth_uid);\n"
-"else\n"
+"res := vector();\n"
+"reslen := 0;\n"
+"prev_raw_name := \'\';\n"
+"prev_is_patched := 1;\n"
+"for select RES_FULL_PATH, RES_ID, length (RES_CONTENT) as clen, RES_MOD_TIME,\n"
+"RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME\n"
+"from WS.WS.SYS_DAV_RES inner join WS.WS.SYS_DAV_PROP on (RES_ID = PROP_PARENT_ID)\n"
+"where RES_NAME like name_mask and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) and\n"
+"PROP_NAME = pfc_name and PROP_TYPE = \'R\' and \"PropFilter_NORM\" (PROP_VALUE) = pfc_value\n"
+"order by RES_NAME, RES_ID\n"
+"do\n"
"{\n"
-"declare tmp_cond any;\n"
-"tmp_cond := vector (\'\',\n"
-"vector_concat (\n"
-"vector (vector (\'RES_NAME\', \'like\', name_mask)),\n"
-"get_keyword (\'\', rfc_list_cond) ) );\n"
-"res := DAV_DIR_FILTER_INT (rfc_spath, 1, tmp_cond, null, null, auth_uid);\n"
+"declare merged varchar;\n"
+"\n"
+"if (regexp_parse (\'^([^/][^./]*)-PfId([1-9][0-9]*)([^/]*)\\044\', RES_NAME, 0))\n"
+"{\n"
+"merged := \"PropFilter_FNMERGE\" (RES_NAME, RES_ID);\n"
+"prev_is_patched := 1;\n"
+"\n"
"}\n"
-"reps := dict_new ();\n"
-"itm_count := length (res);\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
+"else if (RES_NAME = prev_raw_name)\n"
"{\n"
-"declare rname varchar;\n"
-"declare orig_id integer;\n"
-"itm := res [itm_ctr];\n"
-"rname := itm [10];\n"
-"orig_id := itm[4];\n"
-"if (regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', rname, 0))\n"
-"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
-"dict_put (reps, rname, dict_get (reps, rname, 0) + 1);\n"
+"merged := \"PropFilter_FNMERGE\" (RES_NAME, RES_ID);\n"
+"if (not prev_is_patched)\n"
+"{\n"
+"declare prev_id integer;\n"
+"declare prev_merged varchar;\n"
+"prev_id := res[reslen-1][4][2];\n"
+"prev_merged := \"PropFilter_FNMERGE\" (RES_NAME, prev_id);\n"
+"res[reslen-1][10] := prev_merged;\n"
+"res[reslen-1][0] := DAV_CONCAT_PATH (detcol_path, prev_merged);\n"
+"\n"
"}\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
+"prev_is_patched := 1;\n"
+"}\n"
+"else\n"
"{\n"
-"declare rname varchar;\n"
-"declare orig_id integer;\n"
-"itm := res [itm_ctr];\n"
-"rname := itm [10];\n"
-"orig_id := itm[4];\n"
-"res[itm_ctr][4] := vector (UNAME\'ResFilter\', detcol_id, orig_id);\n"
-"if (dict_get (reps, rname, 0) > 1)\n"
-"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
-"res[itm_ctr][0] := DAV_CONCAT_PATH (detcol_path, rname);\n"
+"merged := RES_NAME;\n"
+"prev_is_patched := 0;\n"
+"\n"
+"}\n"
+"\n"
+"res := vector_concat (res, vector (vector (DAV_CONCAT_PATH (detcol_path, merged), \'R\', clen, RES_MOD_TIME,\n"
+"\n"
+"vector (UNAME\'PropFilter\', detcol_id, RES_ID), RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, merged ) ) );\n"
+"prev_raw_name := RES_NAME;\n"
+"reslen := reslen + 1;\n"
"}\n"
"return res;\n"
"}\n"
-"--src DET_ResFilter.sql:624\n";
+"--src DET_PropFilter.sql:402\n";
-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"
+static const char *proc525 =
+"#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"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_dec_action any;\n"
+"declare pfc_spath, pfc_name, pfc_value varchar;\n"
"declare davpath, prev_raw_name varchar;\n"
-"declare res, itm, reps any;\n"
-"declare itm_ctr, itm_count, prev_is_patched integer;\n"
+"declare reslen, prev_is_patched integer;\n"
+"declare execstate, execmessage, execmeta, execrows any;\n"
+"declare davcond varchar;\n"
"\n"
-"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_dec_action))\n"
+"davcond := get_keyword (\'DAV\', compilation);\n"
+"if (\'\' <> davcond)\n"
+"davcond := \' and \' || davcond;\n"
+"execstate := \'00000\';\n"
+"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
"{\n"
"\n"
"return vector();\n"
@@ -23092,86 +24398,101 @@ static const char *proc485 =
"\n"
"return vector();\n"
"}\n"
-"if (0 = length (get_keyword (\'\', compilation)))\n"
-"res := DAV_DIR_FILTER_INT (rfc_spath, 1, rfc_list_cond, null, null, auth_uid);\n"
-"else\n"
-"{\n"
-"declare tmp_cond any;\n"
-"tmp_cond := vector (\'\',\n"
-"vector_concat (\n"
-"get_keyword (\'\', compilation),\n"
-"get_keyword (\'\', rfc_list_cond) ) );\n"
-"res := DAV_DIR_FILTER_INT (rfc_spath, 1, tmp_cond, null, null, auth_uid);\n"
-"}\n"
-"reps := dict_new ();\n"
-"itm_count := length (res);\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
+"exec (\'select\n"
+"\n"
+"RES_NAME, \'\'R\'\', length (RES_CONTENT), RES_MOD_TIME,\n"
+"\n"
+"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME\n"
+"from WS.WS.SYS_DAV_RES inner join WS.WS.SYS_DAV_PROP on (RES_ID = PROP_PARENT_ID)\n"
+"where (RES_FULL_PATH between ? and ?) and\n"
+"(PROP_NAME = ?) and (PROP_TYPE = \'\'R\'\') and (\"PropFilter_NORM\" (PROP_VALUE) = ?)\' || davcond || \'\n"
+"order by RES_NAME, RES_ID\',\n"
+"execstate, execmessage, vector (pfc_spath, DAV_COL_PATH_BOUNDARY (pfc_spath), pfc_name, pfc_value), 100000000, execmeta, execrows );\n"
+"\n"
+"reslen := 0;\n"
+"prev_raw_name := \'\';\n"
+"prev_is_patched := 1;\n"
+"foreach (any itm in execrows) do\n"
"{\n"
-"declare rname varchar;\n"
+"declare orig_name varchar;\n"
"declare orig_id integer;\n"
-"itm := res [itm_ctr];\n"
-"rname := itm [10];\n"
+"declare merged varchar;\n"
+"orig_name := itm[0];\n"
"orig_id := itm[4];\n"
-"if (regexp_parse (\'^([^/][^./]*) -Rf((Id[1-9][0-9]*)|([A-Z][A-Za-z0-9]+)-([A-Za-z0-9~+-]*))([.][^/]*)?\\044\', rname, 0))\n"
-"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
-"dict_put (reps, rname, dict_get (reps, rname, 0) + 1);\n"
+"\n"
+"if (regexp_parse (\'^([^/][^./]*)-PfId([1-9][0-9]*)([^/]*)\\044\', orig_name, 0))\n"
+"{\n"
+"merged := \"PropFilter_FNMERGE\" (orig_name, orig_id);\n"
+"prev_is_patched := 1;\n"
+"\n"
"}\n"
-"for (itm_ctr := 0; itm_ctr < itm_count; itm_ctr := itm_ctr + 1)\n"
+"else if (orig_name = prev_raw_name)\n"
"{\n"
-"declare rname varchar;\n"
-"declare orig_id integer;\n"
-"itm := res [itm_ctr];\n"
-"rname := itm [10];\n"
-"orig_id := itm[4];\n"
-"res[itm_ctr][4] := vector (UNAME\'ResFilter\', detcol_id, orig_id);\n"
-"if (dict_get (reps, rname, 0) > 1)\n"
-"res [itm_ctr][10] := rname := \"ResFilter_FNMERGE\" (rname, orig_id);\n"
-"res[itm_ctr][0] := DAV_CONCAT_PATH (detcol_path, rname);\n"
+"merged := \"PropFilter_FNMERGE\" (orig_name, orig_id);\n"
+"if (not prev_is_patched)\n"
+"{\n"
+"declare prev_id integer;\n"
+"declare prev_merged varchar;\n"
+"prev_id := execrows[reslen-1][4][2];\n"
+"prev_merged := \"PropFilter_FNMERGE\" (orig_name, prev_id);\n"
+"execrows[reslen-1][10] := prev_merged;\n"
+"execrows[reslen-1][0] := DAV_CONCAT_PATH (detcol_path, prev_merged);\n"
+"\n"
"}\n"
-"return res;\n"
+"prev_is_patched := 1;\n"
"}\n"
-"--src DET_ResFilter.sql:683\n";
+"else\n"
+"{\n"
+"merged := orig_name;\n"
+"prev_is_patched := 0;\n"
+"\n"
+"}\n"
+"execrows[reslen][0] := DAV_CONCAT_PATH (detcol_path, merged);\n"
+"execrows[reslen][4] := vector (UNAME\'PropFilter\', detcol_id, orig_id);\n"
+"prev_raw_name := orig_name;\n"
+"reslen := reslen + 1;\n"
+"}\n"
+"\n"
+"return execrows;\n"
+"}\n"
+"--src DET_PropFilter.sql:472\n";
-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"
+static const char *proc526 =
+"#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"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_del_action any;\n"
+"declare pfc_spath, pfc_name, pfc_value varchar;\n"
"declare orig_id integer;\n"
"\n"
-"rfc_spath := null;\n"
-"orig_id := \"ResFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, rfc_spath, rfc_list_cond, rfc_del_action);\n"
+"pfc_spath := null;\n"
+"orig_id := \"PropFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, pfc_spath, pfc_name, pfc_value);\n"
"if (orig_id < 0)\n"
"return orig_id;\n"
-"return vector (UNAME\'ResFilter\', detcol_id, orig_id);\n"
+"return vector (UNAME\'PropFilter\', detcol_id, orig_id);\n"
"}\n"
-"--src DET_ResFilter.sql:742\n";
+"--src DET_PropFilter.sql:554\n";
-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"
+static const char *proc527 =
+"#line 570 \"[executable]/DET_PropFilter.sql\"\n"
+"create function \"PropFilter_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
"\n"
"return coalesce ((select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_ID = id[2]), null);\n"
"}\n"
-"--src DET_ResFilter.sql:757\n";
+"--src DET_PropFilter.sql:568\n";
-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"
+static const char *proc528 =
+"#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"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_del_action any;\n"
+"declare pfc_spath, pfc_name, pfc_value varchar;\n"
"declare rc integer;\n"
"\n"
-"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
"{\n"
"\n"
"return -2;\n"
"}\n"
-"if (0 = length (rfc_del_action))\n"
-"return -20;\n"
"if (1 <> length (path_parts))\n"
"return -2;\n"
"if (\'R\' <> what)\n"
@@ -23180,14 +24501,14 @@ static const char *proc488 =
"return -2;\n"
"if (isinteger (source_id) and\n"
"exists (select 1 from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = source_id and RES_NAME = path_parts[0] and (RES_FULL_PATH between rfc_spath and DAV_COL_PATH_BOUNDARY (rfc_spath)) ) )\n"
+"where RES_ID = source_id and RES_NAME = path_parts[0] and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) ) )\n"
"{\n"
-"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, rfc_list_cond, auth_uid);\n"
+"\"PropFilter_FIT_INTO_CONDITION\" (source_id, what, pfc_name, pfc_value);\n"
"}\n"
"else\n"
"{\n"
"declare new_full_path varchar;\n"
-"new_full_path := DAV_CONCAT_PATH (rfc_spath, path_parts[0]);\n"
+"new_full_path := DAV_CONCAT_PATH (pfc_spath, path_parts[0]);\n"
"rc := DAV_COPY_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, permissions,\n"
"coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = uid), \'\'),\n"
"coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = gid), \'\'),\n"
@@ -23197,27 +24518,24 @@ static const char *proc488 =
"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
"if (DAV_HIDE_ERROR (source_id) is null)\n"
"return source_id;\n"
-"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, rfc_list_cond, auth_uid);\n"
+"\"PropFilter_FIT_INTO_CONDITION\" (source_id, what, pfc_name, pfc_value);\n"
"}\n"
"return 1;\n"
"}\n"
-"--src DET_ResFilter.sql:765\n";
+"--src DET_PropFilter.sql:576\n";
-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"
+static const char *proc529 =
+"#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"
-"declare rfc_spath varchar;\n"
-"declare rfc_list_cond, rfc_del_action any;\n"
+"declare pfc_spath, pfc_name, pfc_value varchar;\n"
"declare rc integer;\n"
"\n"
-"if (0 > \"ResFilter_GET_CONDITION\" (detcol_id, rfc_spath, rfc_list_cond, rfc_del_action))\n"
+"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
"{\n"
"\n"
"return -2;\n"
"}\n"
-"if (0 = length (rfc_del_action))\n"
-"return -20;\n"
"if (1 <> length (path_parts))\n"
"return -2;\n"
"if (\'R\' <> what)\n"
@@ -23226,29 +24544,29 @@ static const char *proc489 =
"return -2;\n"
"if (isinteger (source_id) and\n"
"exists (select 1 from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = source_id and RES_NAME = path_parts[0] and (RES_FULL_PATH between rfc_spath and DAV_COL_PATH_BOUNDARY (rfc_spath))))\n"
+"where RES_ID = source_id and RES_NAME = path_parts[0] and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath))))\n"
"{\n"
-"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, rfc_list_cond, auth_uid);\n"
+"\"PropFilter_FIT_INTO_CONDITION\" (source_id, what, pfc_name, pfc_value);\n"
"}\n"
"else\n"
"{\n"
"declare new_full_path varchar;\n"
-"new_full_path := DAV_CONCAT_PATH (rfc_spath, path_parts[0]);\n"
-"rc := DAV_MOVE_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, null, null, 0, 1);\n"
+"new_full_path := DAV_CONCAT_PATH (pfc_spath, path_parts[0]);\n"
+"rc := DAV_MOVE_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, null, null, 0, 1);\n"
"if (DAV_HIDE_ERROR (rc) is null)\n"
"return rc;\n"
"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
"if (DAV_HIDE_ERROR (source_id) is null)\n"
"return source_id;\n"
-"\"ResFilter_FIT_INTO_CONDITION\" (source_id, what, rfc_list_cond, auth_uid);\n"
+"\"PropFilter_FIT_INTO_CONDITION\" (source_id, what, pfc_name, pfc_value);\n"
"}\n"
"return 1;\n"
"}\n"
-"--src DET_ResFilter.sql:810\n";
+"--src DET_PropFilter.sql:618\n";
-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"
+static const char *proc530 =
+"#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"
"\n"
"declare cont any;\n"
@@ -23260,303 +24578,131 @@ static const char *proc490 =
"select http (RES_CONTENT), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
"return id[2];\n"
"}\n"
-"--src DET_ResFilter.sql:852\n";
-
-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"
-"\n"
-"return -20;\n"
-"}\n"
-"--src DET_ResFilter.sql:867\n";
-
-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"
-"declare rc, u_token, new_token varchar;\n"
-"\n"
-"if (\'R\' <> type)\n"
-"return -20;\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
-"return -20;\n"
-"if (isarray (id))\n"
-"return DAV_LOCK_INT (path, id[2], type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, null, null, auth_uid);\n"
-"return -20;\n"
-"}\n"
-"--src DET_ResFilter.sql:875\n";
-
-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"
-"\n"
-"if (isarray (id))\n"
-"id := id [2];\n"
-"return DAV_UNLOCK_INT (id, type, token, null, null, auth_uid);\n"
-"}\n"
-"--src DET_ResFilter.sql:890\n";
-
-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"
-"declare rc integer;\n"
-"declare orig_id any;\n"
-"declare orig_type char(1);\n"
-"\n"
-"orig_id := id;\n"
-"id := orig_id[2];\n"
-"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
-"if (rc <> 0)\n"
-"return rc;\n"
-"id := orig_id[1];\n"
-"orig_type := type;\n"
-"type := \'C\';\n"
-"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
-"if (rc <> 0)\n"
-"return rc;\n"
-"id := orig_id;\n"
-"type := orig_type;\n"
-"return 0;\n"
-"}\n"
-"--src DET_ResFilter.sql:900\n";
-
-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"
-"declare res any;\n"
-"\n"
-"id := id[2];\n"
-"if (isarray (id))\n"
-"return call (cast (id[0] as varchar) || \'_DAV_LIST_LOCKS\') (id, type, recursive);\n"
-"res := vector();\n"
-"for select LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO\n"
-"from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type do {\n"
-"res := vector_concat (res, vector (vector (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)));\n"
-"}\n"
-"return res;\n"
-"}\n"
-"--src DET_ResFilter.sql:924\n";
-
-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"
-"declare rc integer;\n"
-"declare colname varchar;\n"
-"declare compilation, del_act any;\n"
-"compilation := vector (\'\', filter);\n"
-"rc := DAV_DIR_FILTER_INT (search_path, 1, compilation, null, null, http_dav_uid ());\n"
-"if (isinteger (rc))\n"
-"return rc;\n"
-"if (not isinteger (col))\n"
-"return -20;\n"
-"colname := DAV_SEARCH_PATH (col, \'C\');\n"
-"if (not (isstring (colname)))\n"
-"return -23;\n"
-"rc := DAV_SEARCH_ID (search_path, \'C\');\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"if (search_path <> DAV_SEARCH_PATH (rc, \'C\'))\n"
-"return -2;\n"
-"if (search_path between colname and (colname || \'\\255\\255\\255\\255\'))\n"
-"return -28;\n"
-"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-SearchPath\', search_path, null, null, 0, 1, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-ListCond\', \"ResFilter_ENCODE_FILTER\" (compilation), null, null, 0, 1, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"del_act := \"ResFilter_MAKE_DEL_ACTION_FROM_CONDITION\" (compilation);\n"
-"\n"
-"rc := DAV_PROP_SET_INT (colname, \'virt:ResFilter-DelAction\', \"ResFilter_ENCODE_FILTER\" (del_act), null, null, 0, 1, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"update WS.WS.SYS_DAV_COL set COL_DET=\'ResFilter\' where COL_ID=col;\n"
-"return 0;\n"
-"}\n"
-"--src DET_ResFilter.sql:941\n";
-
-/* DET_PropFilter.sql */
-
-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"
-"\n"
-"if (auth_uid >= 0)\n"
-"return auth_uid;\n"
-"return -12;\n"
-"}\n"
-"--src DET_PropFilter.sql:24\n";
-
-static const char *proc498 =
-"#line 36 \"[executable]/DET_PropFilter.sql\"\n"
-"create function \"PropFilter_NORM\" (in value any) returns varchar\n"
-"{\n"
-"value := blob_to_string (value);\n"
-"if ((\'\' = value) or (193 <> value[0]))\n"
-"return value;\n"
-"value := deserialize (value)[1];\n"
-"if (isstring (value))\n"
-"return value;\n"
-"return cast (xml_tree_doc(value) as varchar);\n"
-"}\n"
-"--src DET_PropFilter.sql:34\n";
-
-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"
-"\n"
-"whenever not found goto nf;\n"
-"if (isarray (detcol_id))\n"
-"return -20;\n"
-"select \"PropFilter_NORM\" (PROP_VALUE) into pfc_spath from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:PropFilter-SearchPath\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
-"select \"PropFilter_NORM\" (PROP_VALUE) into pfc_name from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:PropFilter-PropName\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
-"select \"PropFilter_NORM\" (PROP_VALUE) into pfc_value from WS.WS.SYS_DAV_PROP where PROP_NAME = \'virt:PropFilter-PropValue\' and PROP_PARENT_ID = detcol_id and PROP_TYPE = \'C\';\n"
-"return 0;\n"
-"nf:\n"
-"return -1;\n"
-"}\n"
-"--src DET_PropFilter.sql:47\n";
-
-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"
-"declare old_value varchar;\n"
-"declare propid integer;\n"
-"if (__tag (pfc_value) = 193)\n"
-"pfc_value := serialize (pfc_value);\n"
-"else if (not isstring (pfc_value))\n"
-"return -17;\n"
-"whenever not found goto ins;\n"
-"select p.PROP_ID, \"PropFilter_NORM\" (p.PROP_VALUE) into propid, old_value from WS.WS.SYS_DAV_PROP p, WS.WS.SYS_DAV_RES r where p.PROP_NAME = pfc_name and p.PROP_PARENT_ID = id and p.PROP_TYPE = what and r.RES_ID = id;\n"
-"if (old_value <> pfc_value)\n"
-"update WS.WS.SYS_DAV_PROP set PROP_VALUE = pfc_value where PROP_ID = propid;\n"
-"return propid;\n"
-"\n"
-"ins:\n"
-"propid := WS.WS.GETID (\'P\');\n"
-"insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_VALUE, PROP_PARENT_ID, PROP_TYPE)\n"
-"values (propid, pfc_name, pfc_value, id, what);\n"
-"return propid;\n"
-"}\n"
-"--src DET_PropFilter.sql:63\n";
-
-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"
-"delete from WS.WS.SYS_DAV_PROP where PROP_NAME = pfc_name and PROP_PARENT_ID = id and PROP_TYPE = what and \"PropFilter_NORM\" (PROP_VALUE) = pfc_value;\n"
-"return 0;\n"
-"}\n"
-"--src DET_PropFilter.sql:86\n";
-
-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"
-"declare pairs any;\n"
-"pairs := regexp_parse (\'^(.*[/])?([^/][^./]*)([^/]*)\\044\', path, 0);\n"
-"if (pairs is null)\n"
-"signal (\'.....\', sprintf (\'Internal error: failed \"PropFilter_FNMERGE\" (%s, %d)\', path, id));\n"
-"return sprintf (\'%s-PfId%d%s\', subseq (path, 0, pairs[5]), id, subseq (path, pairs[6]));\n"
-"}\n"
-"--src DET_PropFilter.sql:94\n";
+"--src DET_PropFilter.sql:657\n";
-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"
-"declare pairs any;\n"
-"declare fname, fext varchar;\n"
-"pairs := regexp_parse (\'^(.*[/])?([^/][^./]*)([^/]*)\\044\', path, 0);\n"
-"if (pairs is null)\n"
-"signal (\'.....\', sprintf (\'Internal error: failed \"PropFilter_FNSPLIT\" (%s)\', path));\n"
-"colpath := subseq (path, 0, pairs[4]);\n"
-"fname := subseq (path, pairs[4], pairs[5]);\n"
-"fext := subseq (path, pairs[6], pairs[7]);\n"
-"\n"
-"pairs := regexp_parse (\'^(.*)-PfId([1-9][0-9]*)\\044\', fname, 0);\n"
-"if (pairs is null)\n"
-"{\n"
-"orig_fnameext := fname || fext;\n"
-"id := null;\n"
-"}\n"
-"else\n"
+static const char *proc531 =
+"#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"
-"orig_fnameext := subseq (fname, pairs[2], pairs[3]) || fext;\n"
-"id := cast (subseq (fname, pairs[4], pairs[5]) as integer);\n"
-"}\n"
+"\n"
+"return -20;\n"
"}\n"
-"--src DET_PropFilter.sql:105\n";
+"--src DET_PropFilter.sql:672\n";
-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"
+static const char *proc532 =
+"#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"
-"declare colpath, orig_fnameext varchar;\n"
-"declare orig_id integer;\n"
-"declare hitlist any;\n"
+"declare rc, u_token, new_token varchar;\n"
"\n"
-"if (\'R\' <> what)\n"
-"return -1;\n"
-"if (not (isstring (pfc_spath)))\n"
-"{\n"
-"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
+"if (\'R\' <> type)\n"
+"return -20;\n"
+"if (DAV_HIDE_ERROR (id) is null)\n"
+"return -20;\n"
+"if (isarray (id))\n"
+"return DAV_LOCK_INT (path, id[2], type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, null, null, auth_uid);\n"
+"return -20;\n"
+"}\n"
+"--src DET_PropFilter.sql:680\n";
+
+static const char *proc533 =
+"#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"
"\n"
-"return -1;\n"
-"}\n"
+"if (isarray (id))\n"
+"id := id [2];\n"
+"return DAV_UNLOCK_INT (id, type, token, null, null, auth_uid);\n"
"}\n"
-"if (1 <> length(path_parts) or (\'\' = path_parts[0]))\n"
+"--src DET_PropFilter.sql:695\n";
+
+static const char *proc534 =
+"#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"
+"declare rc integer;\n"
+"declare orig_id any;\n"
+"declare orig_type char(1);\n"
"\n"
-"return -1;\n"
+"orig_id := id;\n"
+"id := orig_id[2];\n"
+"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if (rc <> 0)\n"
+"return rc;\n"
+"id := orig_id[1];\n"
+"orig_type := type;\n"
+"type := \'C\';\n"
+"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if (rc <> 0)\n"
+"return rc;\n"
+"id := orig_id;\n"
+"type := orig_type;\n"
+"return 0;\n"
"}\n"
-"\"PropFilter_FNSPLIT\" (path_parts[0], colpath, orig_fnameext, orig_id);\n"
-"\n"
-"hitlist := vector();\n"
-"if (orig_id is null)\n"
-"{\n"
-"for select RES_ID from WS.WS.SYS_DAV_RES inner join WS.WS.SYS_DAV_PROP on (RES_ID = PROP_PARENT_ID)\n"
-"where RES_NAME = orig_fnameext and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) and\n"
-"PROP_NAME = pfc_name and PROP_TYPE = \'R\' and \"PropFilter_NORM\" (PROP_VALUE) = pfc_value\n"
-"do\n"
+"--src DET_PropFilter.sql:705\n";
+
+static const char *proc535 =
+"#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"
+"declare res any;\n"
"\n"
-"hitlist := vector_concat (hitlist, vector (RES_ID));\n"
+"id := id[2];\n"
+"if (isarray (id))\n"
+"return call (cast (id[0] as varchar) || \'_DAV_LIST_LOCKS\') (id, type, recursive);\n"
+"res := vector();\n"
+"for select LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO\n"
+"from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type do {\n"
+"res := vector_concat (res, vector (vector (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)));\n"
"}\n"
+"return res;\n"
"}\n"
-"else\n"
+"--src DET_PropFilter.sql:729\n";
+
+/* DET_RDFData.sql */
+
+static const char *proc536 =
+"#line 26 \"[executable]/DET_RDFData.sql\"\n"
+"create procedure DB.DBA.RDFData_log_message (in x varchar)\n"
"{\n"
-"for select RES_ID from WS.WS.SYS_DAV_RES inner join WS.WS.SYS_DAV_PROP on (RES_ID = PROP_PARENT_ID)\n"
-"where RES_ID = orig_id and\n"
-"RES_NAME = orig_fnameext and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) and\n"
-"PROP_NAME = pfc_name and PROP_TYPE = \'R\' and \"PropFilter_NORM\" (PROP_VALUE) = pfc_value\n"
-"do\n"
+"if (0)\n"
+"log_message (cast (x as varchar));\n"
+"}\n"
+"--src DET_RDFData.sql:24\n";
+
+static const char *proc537 =
+"#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"
+"RDFData_log_message (current_proc_name ());\n"
"\n"
-"hitlist := vector_concat (hitlist, vector (RES_ID));\n"
+"\n"
+"if (not (\'110\' like req))\n"
+"{\n"
+"return -13;\n"
"}\n"
+"if (\'100\' like req and auth_uid >= 0)\n"
+"return auth_uid;\n"
+"\n"
+"if ((auth_uid <> id[3]) and (auth_uid <> http_dav_uid()))\n"
+"{\n"
+"\n"
+"return -13;\n"
"}\n"
-"if (length (hitlist) <> 1)\n"
-"return -1;\n"
-"return hitlist[0];\n"
+"if (auth_uid >= 0)\n"
+"return auth_uid;\n"
+"return -12;\n"
"}\n"
-"--src DET_PropFilter.sql:131\n";
+"--src DET_RDFData.sql:31\n";
-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"
+static const char *proc538 =
+"#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"
+"RDFData_log_message (current_proc_name ());\n"
+"\n"
"declare rc integer;\n"
-"declare puid, pgid, ruid, rgid integer;\n"
+"declare puid, pgid integer;\n"
"declare u_password, pperms varchar;\n"
"declare allow_anon integer;\n"
"if (length (req) <> 3)\n"
@@ -23566,9 +24712,9 @@ static const char *proc505 =
"puid := http_dav_uid();\n"
"pgid := coalesce (\n"
"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
-"where G_NAME = \'PropFilter_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'PropFilter\'), \'\')\n"
+"where G_NAME = \'RDFData_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'RDFData\'), \'\')\n"
"), puid+1);\n"
-"pperms := \'110100100R\';\n"
+"pperms := \'110100100NN\';\n"
"if ((what <> \'R\') and (what <> \'C\'))\n"
"return -14;\n"
"allow_anon := WS.WS.PERM_COMP (substring (cast (pperms as varchar), 7, 3), req);\n"
@@ -23589,1467 +24735,1869 @@ static const char *proc505 =
"a_gid := http_nogroup_gid ();\n"
"}\n"
"}\n"
-"if (not DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
-"return -13;\n"
-"\n"
-"if (isarray (id[2]))\n"
-"return -1;\n"
-"select RES_OWNER, RES_GROUP into ruid, rgid from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
-"if (not DAV_CHECK_PERM (pperms, req, a_uid, a_gid, rgid, ruid))\n"
-"return -13;\n"
-"\n"
+"if (DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
"return a_uid;\n"
+"return -13;\n"
"\n"
"nf_col_or_res:\n"
"return -1;\n"
"}\n"
-"--src DET_PropFilter.sql:185\n";
+"--src DET_RDFData.sql:54\n";
-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"
+static const char *proc539 =
+"#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"
-"\n"
-"if (st = \'R\')\n"
-"return id [1];\n"
+"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_PropFilter.sql:238\n";
+"--src DET_RDFData.sql:102\n";
-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"
+static const char *proc540 =
+"#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"
-"\n"
+"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_PropFilter.sql:248\n";
+"--src DET_RDFData.sql:109\n";
-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"
+static const char *proc541 =
+"#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"
-"\n"
+"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_PropFilter.sql:256\n";
+"--src DET_RDFData.sql:116\n";
-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"
+static const char *proc542 =
+"#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"
-"\n"
+"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_PropFilter.sql:264\n";
-
-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"
-"declare rc, orig_id integer;\n"
-"declare pfc_spath, pfc_name, pfc_value varchar;\n"
-"\n"
-"pfc_spath := null;\n"
-"orig_id := \"PropFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, pfc_spath, pfc_name, pfc_value);\n"
-"if (orig_id < 0)\n"
-"return orig_id;\n"
-"return \"PropFilter_LEAVE_CONDITION\" (orig_id, what, pfc_name, pfc_value);\n"
-"}\n"
-"--src DET_PropFilter.sql:272\n";
+"--src DET_RDFData.sql:123\n";
-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"
+static const char *proc543 =
+"#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"
-"\n"
+"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_PropFilter.sql:286\n";
+"--src DET_RDFData.sql:131\n";
-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"
+static const char *proc544 =
+"#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"
"\n"
-"if (st <> \'R\')\n"
-"return -1;\n"
-"id := id[2];\n"
-"if (isarray (id))\n"
-"return call (cast (id[0] as varchar) || \'_DAV_PROP_REMOVE\') (id, st, propname, silent, auth_uid);\n"
-"return DAV_PROP_REMOVE_RAW (id, st, propname, silent, auth_uid);\n"
+"return -20;\n"
"}\n"
-"--src DET_PropFilter.sql:294\n";
+"--src DET_RDFData.sql:138\n";
-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"
-"declare pid integer;\n"
-"declare resv any;\n"
-"\n"
-"if (st <> \'R\')\n"
-"return -1;\n"
-"id := id[2];\n"
-"if (isarray (id))\n"
-"return call (cast (id[0] as varchar) || \'_DAV_PROP_SET\') (id, st, propname, propvalue, overwrite, auth_uid);\n"
-"return DAV_PROP_SET_RAW (id, st, propname, propvalue, overwrite, auth_uid);\n"
+static const char *proc545 =
+"#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"
+"RDFData_log_message (current_proc_name ());\n"
+"return -20;\n"
"}\n"
-"--src DET_PropFilter.sql:307\n";
+"--src DET_RDFData.sql:146\n";
-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"
+static const char *proc546 =
+"#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"
-"declare ret varchar;\n"
-"\n"
-"id := id[2];\n"
-"if (isarray (id))\n"
-"return call (cast (id[0] as varchar) || \'_DAV_PROP_GET\') (id, what, propname, auth_uid);\n"
+"RDFData_log_message (current_proc_name ());\n"
"if (propname[0] = 58)\n"
-"return DAV_PROP_GET_INT (id, what, propname, 0, null, null, auth_uid);\n"
-"whenever not found goto no_prop;\n"
-"select blob_to_string (PROP_VALUE) into ret from WS.WS.SYS_DAV_PROP where PROP_NAME = propname and PROP_PARENT_ID = id and PROP_TYPE = what;\n"
-"return ret;\n"
-"\n"
-"no_prop:\n"
-"return -11;\n"
+"{\n"
+"return -16;\n"
"}\n"
-"--src DET_PropFilter.sql:322\n";
+"return -20;\n"
+"}\n"
+"--src DET_RDFData.sql:153\n";
-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"
+static const char *proc547 =
+"#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"
-"declare ret any;\n"
-"\n"
-"id := id[2];\n"
-"ret := vector();\n"
-"for select PROP_NAME, PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_NAME like propmask and PROP_PARENT_ID = id and PROP_TYPE = what do {\n"
-"ret := vector_concat (ret, vector (vector (PROP_NAME, blob_to_string (PROP_VALUE))));\n"
-"}\n"
-"return ret;\n"
+"RDFData_log_message (current_proc_name ());\n"
+"return -11;\n"
"}\n"
-"--src DET_PropFilter.sql:341\n";
+"--src DET_RDFData.sql:164\n";
-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"
+static const char *proc548 =
+"#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"
-"\n"
-"if (\'R\' <> what)\n"
-"return -1;\n"
-"for select RES_FULL_PATH, RES_ID, length (RES_CONTENT) as clen, RES_MOD_TIME,\n"
-"RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME as r1_RES_NAME\n"
-"from WS.WS.SYS_DAV_RES r1\n"
-"where RES_ID = id[2]\n"
-"do\n"
+"RDFData_log_message (current_proc_name ());\n"
+"return vector ();\n"
+"}\n"
+"--src DET_RDFData.sql:172\n";
+
+static const char *proc549 =
+"#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"
-"declare merged varchar;\n"
-"\n"
-"if (regexp_parse (\'^([^/][^./]*)-PfId([1-9][0-9]*)([^/]*)\\044\', r1_RES_NAME, 0))\n"
+"declare access_tmp varchar;\n"
+"whenever not found goto ret;\n"
+"access := \'000100100N\';\n"
+"gid := http_nogroup_gid ();\n"
+"uid := http_nobody_uid ();\n"
+"if (isinteger (detcol_id))\n"
"{\n"
-"merged := \"PropFilter_FNMERGE\" (r1_RES_NAME, RES_ID);\n"
+"select COL_PERMS, COL_GROUP, COL_OWNER into access_tmp, gid, uid from WS.WS.SYS_DAV_COL where COL_ID = detcol_id;\n"
+"}\n"
+"access[0] := access_tmp[0];\n"
+"access[1] := access_tmp[1];\n"
+"ret:\n"
+" ;\n"
"}\n"
+"--src DET_RDFData.sql:179\n";
+
+static const char *proc550 =
+"#line 199 \"[executable]/DET_RDFData.sql\"\n"
+"create procedure DB.DBA.RDFData_cast_dt_silent (in d any)\n"
+"{\n"
+"if (__tag (d) = 211)\n"
+"return d;\n"
"else\n"
"{\n"
-"declare pfc_spath, pfc_name, pfc_value varchar;\n"
-"declare namesakes_no integer;\n"
-"if (0 > \"PropFilter_GET_CONDITION\" (id[1], pfc_spath, pfc_name, pfc_value))\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"\n"
-"return -1;\n"
+"return now ();\n"
+"};\n"
+"return cast (d as datetime);\n"
"}\n"
-"select count(1) into namesakes_no\n"
-"from WS.WS.SYS_DAV_RES r2 inner join WS.WS.SYS_DAV_PROP p2 on (r2.RES_ID = p2.PROP_PARENT_ID)\n"
-"where r2.RES_NAME = r1_RES_NAME and (r2.RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) and\n"
-"p2.PROP_NAME = pfc_name and p2.PROP_TYPE = \'R\' and \"PropFilter_NORM\" (p2.PROP_VALUE) = pfc_value;\n"
-"if (0 = namesakes_no)\n"
-"return -1;\n"
-"if (1 < namesakes_no)\n"
-"merged := \"PropFilter_FNMERGE\" (r1_RES_NAME, RES_ID);\n"
-"else\n"
-"merged := r1_RES_NAME;\n"
"}\n"
+"--src DET_RDFData.sql:197\n";
+
+static const char *proc551 =
+"#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"
+"RDFData_log_message (current_proc_name ());\n"
"\n"
-"return vector (DAV_CONCAT_PATH (DAV_SEARCH_PATH (id[1], \'C\'), merged), \'R\', clen, RES_MOD_TIME,\n"
+"declare path_parts any;\n"
+"declare access, ownergid, owner_uid, mime any;\n"
+"declare len int;\n"
"\n"
-"id, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, merged);\n"
+"DB.DBA.\"RDFData_ACCESS_PARAMS\" (id[1], access, ownergid, owner_uid);\n"
+"\n"
+"if (isstring (path))\n"
+"path_parts := split_and_decode (path, 0, \'\\0\\0/\');\n"
+"else\n"
+"path_parts := path;\n"
+"len := length (path_parts);\n"
+"if (what = \'C\')\n"
+"return vector (DAV_CONCAT_PATH (path, \'\'), \'C\', 0, now (), id, access, ownergid, owner_uid, now (), \'dav/unix-directory\', path_parts [len - 2]);\n"
+"mime := \'application/rdf+xml\';\n"
+"if (is_http_ctx ())\n"
+"{\n"
+"declare lpath varchar;\n"
+"lpath := http_path ();\n"
+"if (lpath like \'%.ttl\' or lpath like \'%.n3\')\n"
+"mime := \'text/rdf+n3\';\n"
"}\n"
-"return -1;\n"
+"return vector (DAV_CONCAT_PATH (path, \'\'), \'R\', 0, now (), id, access, ownergid, owner_uid, now (), mime, path_parts [len - 1]);\n"
"}\n"
-"--src DET_PropFilter.sql:355\n";
+"--src DET_RDFData.sql:212\n";
-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"
-"declare pfc_spath, pfc_name, pfc_value varchar;\n"
-"declare davpath, prev_raw_name varchar;\n"
-"declare files, filtered_files, res any;\n"
-"declare reslen, prev_is_patched integer;\n"
-"\n"
-"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
+static const char *proc552 =
+"#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"
+"RDFData_log_message (current_proc_name ());\n"
+"declare top_davpath varchar;\n"
+"declare res any;\n"
+"declare top_id, descnames any;\n"
+"declare what char (1);\n"
+"declare access, filt_lg varchar;\n"
+"declare ownergid, owner_uid, dn_ctr, dn_count integer;\n"
+"declare gr, u_name any;\n"
"\n"
-"return vector();\n"
-"}\n"
-"if (1 <> length(path_parts) or (\'\' <> path_parts[0]))\n"
-"{\n"
+"vectorbld_init (res);\n"
"\n"
-"return vector();\n"
-"}\n"
-"res := vector();\n"
-"reslen := 0;\n"
-"prev_raw_name := \'\';\n"
-"prev_is_patched := 1;\n"
-"for select RES_FULL_PATH, RES_ID, length (RES_CONTENT) as clen, RES_MOD_TIME,\n"
-"RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME\n"
-"from WS.WS.SYS_DAV_RES inner join WS.WS.SYS_DAV_PROP on (RES_ID = PROP_PARENT_ID)\n"
-"where RES_NAME like name_mask and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) and\n"
-"PROP_NAME = pfc_name and PROP_TYPE = \'R\' and \"PropFilter_NORM\" (PROP_VALUE) = pfc_value\n"
-"order by RES_NAME, RES_ID\n"
-"do\n"
-"{\n"
-"declare merged varchar;\n"
+"DB.DBA.\"RDFData_ACCESS_PARAMS\" (detcol_id, access, ownergid, owner_uid);\n"
"\n"
-"if (regexp_parse (\'^([^/][^./]*)-PfId([1-9][0-9]*)([^/]*)\\044\', RES_NAME, 0))\n"
-"{\n"
-"merged := \"PropFilter_FNMERGE\" (RES_NAME, RES_ID);\n"
-"prev_is_patched := 1;\n"
"\n"
-"}\n"
-"else if (RES_NAME = prev_raw_name)\n"
-"{\n"
-"merged := \"PropFilter_FNMERGE\" (RES_NAME, RES_ID);\n"
-"if (not prev_is_patched)\n"
-"{\n"
-"declare prev_id integer;\n"
-"declare prev_merged varchar;\n"
-"prev_id := res[reslen-1][4][2];\n"
-"prev_merged := \"PropFilter_FNMERGE\" (RES_NAME, prev_id);\n"
-"res[reslen-1][10] := prev_merged;\n"
-"res[reslen-1][0] := DAV_CONCAT_PATH (detcol_path, prev_merged);\n"
"\n"
-"}\n"
-"prev_is_patched := 1;\n"
-"}\n"
+"if ((0 = length (path_parts)) or (\'\' = path_parts[length (path_parts) - 1]))\n"
+"what := \'C\';\n"
"else\n"
+"what := \'R\';\n"
+"if (\'C\' = what and 1 = length(path_parts))\n"
+"top_id := vector (UNAME\'RDFData\', detcol_id, null, owner_uid, null, null);\n"
+"else\n"
+"top_id := DB.DBA.\"RDFData_DAV_SEARCH_ID\" (detcol_id, path_parts, what);\n"
+"if (DAV_HIDE_ERROR (top_id) is null)\n"
"{\n"
-"merged := RES_NAME;\n"
-"prev_is_patched := 0;\n"
-"\n"
-"}\n"
-"\n"
-"res := vector_concat (res, vector (vector (DAV_CONCAT_PATH (detcol_path, merged), \'R\', clen, RES_MOD_TIME,\n"
-"\n"
-"vector (UNAME\'PropFilter\', detcol_id, RES_ID), RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, merged ) ) );\n"
-"prev_raw_name := RES_NAME;\n"
-"reslen := reslen + 1;\n"
+"return vector();\n"
"}\n"
-"return res;\n"
+"top_davpath := DAV_CONCAT_PATH (detcol_path, path_parts);\n"
+"if (\'R\' = what)\n"
+"{\n"
+"return vector (DB.DBA.\"RDFData_DAV_DIR_SINGLE\" (top_id, what, top_davpath, auth_uid));\n"
"}\n"
-"--src DET_PropFilter.sql:402\n";
-
-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"
+"gr := DAV_PROP_GET_INT (detcol_id, \'C\', \'virt:rdfdata_graph\', 0);\n"
+"filt_lg := DAV_PROP_GET_INT (detcol_id, \'C\', \'virt:rdfdata_lang\', 0);\n"
+"if (not isstring (gr) or length (gr) = 0)\n"
"{\n"
-"declare pfc_spath, pfc_name, pfc_value varchar;\n"
-"declare davpath, prev_raw_name varchar;\n"
-"declare reslen, prev_is_patched integer;\n"
-"declare execstate, execmessage, execmeta, execrows any;\n"
-"declare davcond varchar;\n"
-"\n"
-"davcond := get_keyword (\'DAV\', compilation);\n"
-"if (\'\' <> davcond)\n"
-"davcond := \' and \' || davcond;\n"
-"execstate := \'00000\';\n"
-"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
+"u_name := (select p.COL_NAME from WS.WS.SYS_DAV_COL p, WS.WS.SYS_DAV_COL c\n"
+"where c.COL_ID = detcol_id and p.COL_ID = c.COL_PARENT);\n"
+"gr := sioc..user_doc_iri (u_name);\n"
+"}\n"
+"if (not isstring (filt_lg))\n"
+"filt_lg := \'\';\n"
+"if (is_http_ctx () and filt_lg = \'*http*\')\n"
"{\n"
-"\n"
-"return vector();\n"
+"filt_lg := http_request_header (http_request_header (), \'Accept-Language\', null, \'\');\n"
"}\n"
-"if (1 <> length(path_parts) or (\'\' <> path_parts[0]))\n"
+"\n"
+"if (top_id[2] is null)\n"
"{\n"
"\n"
-"return vector();\n"
-"}\n"
-"exec (\'select\n"
"\n"
-"RES_NAME, \'\'R\'\', length (RES_CONTENT), RES_MOD_TIME,\n"
"\n"
-"RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME\n"
-"from WS.WS.SYS_DAV_RES inner join WS.WS.SYS_DAV_PROP on (RES_ID = PROP_PARENT_ID)\n"
-"where (RES_FULL_PATH between ? and ?) and\n"
-"(PROP_NAME = ?) and (PROP_TYPE = \'\'R\'\') and (\"PropFilter_NORM\" (PROP_VALUE) = ?)\' || davcond || \'\n"
-"order by RES_NAME, RES_ID\',\n"
-"execstate, execmessage, vector (pfc_spath, DAV_COL_PATH_BOUNDARY (pfc_spath), pfc_name, pfc_value), 100000000, execmeta, execrows );\n"
"\n"
-"reslen := 0;\n"
-"prev_raw_name := \'\';\n"
-"prev_is_patched := 1;\n"
-"foreach (any itm in execrows) do\n"
-"{\n"
-"declare orig_name varchar;\n"
-"declare orig_id integer;\n"
-"declare merged varchar;\n"
-"orig_name := itm[0];\n"
-"orig_id := itm[4];\n"
"\n"
-"if (regexp_parse (\'^([^/][^./]*)-PfId([1-9][0-9]*)([^/]*)\\044\', orig_name, 0))\n"
-"{\n"
-"merged := \"PropFilter_FNMERGE\" (orig_name, orig_id);\n"
-"prev_is_patched := 1;\n"
"\n"
-"}\n"
-"else if (orig_name = prev_raw_name)\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"FOR SELECT CLS FROM (\n"
+"sparql\n"
+"select distinct ?CLS\n"
+"where {\n"
+"graph `iri(?:gr)`\n"
"{\n"
-"merged := \"PropFilter_FNMERGE\" (orig_name, orig_id);\n"
-"if (not prev_is_patched)\n"
+"?x a ?CLS .\n"
+"} } ) sub do\n"
"{\n"
-"declare prev_id integer;\n"
-"declare prev_merged varchar;\n"
-"prev_id := execrows[reslen-1][4][2];\n"
-"prev_merged := \"PropFilter_FNMERGE\" (orig_name, prev_id);\n"
-"execrows[reslen-1][10] := prev_merged;\n"
-"execrows[reslen-1][0] := DAV_CONCAT_PATH (detcol_path, prev_merged);\n"
-"\n"
-"}\n"
-"prev_is_patched := 1;\n"
+"declare tmp, tit, pref any;\n"
+"declare p1, p2, p3, pos int;\n"
+"p1 := coalesce (strrchr (cls, \'#\'), -1);\n"
+"p2 := coalesce (strrchr (cls, \'/\'), -1);\n"
+"p3 := coalesce (strrchr (cls, \':\'), -1);\n"
+"pos := __max (p1, p2, p3);\n"
+"if (pos > 0)\n"
+"{\n"
+"tit := subseq (CLS, pos + 1);\n"
+"tmp := subseq (CLS, 0, pos + 1);\n"
+"pref := RDFData_std_pref (tmp);\n"
+"if (pref is not null)\n"
+"tit := pref || \':\' || tit;\n"
+"else\n"
+"tit := CLS;\n"
"}\n"
"else\n"
-"{\n"
-"merged := orig_name;\n"
-"prev_is_patched := 0;\n"
+"tit := CLS;\n"
+"tit := replace (tit, \'/\', \'^2f\');\n"
+"tit := replace (tit, \'#\', \'^23\');\n"
"\n"
+"vectorbld_acc (res,\n"
+"vector (\n"
+"DAV_CONCAT_PATH (top_davpath, tit) || \'/\',\n"
+"\'C\',\n"
+"0,\n"
+"now (),\n"
+"vector (UNAME\'RDFData\', detcol_id, iri_to_id (CLS)),\n"
+"access,\n"
+"ownergid,\n"
+"owner_uid,\n"
+"now (),\n"
+"\'dav/unix-directory\',\n"
+"tit)\n"
+");\n"
"}\n"
-"execrows[reslen][0] := DAV_CONCAT_PATH (detcol_path, merged);\n"
-"execrows[reslen][4] := vector (UNAME\'PropFilter\', detcol_id, orig_id);\n"
-"prev_raw_name := orig_name;\n"
-"reslen := reslen + 1;\n"
-"}\n"
-"\n"
-"return execrows;\n"
"}\n"
-"--src DET_PropFilter.sql:472\n";
-
-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"
+"else if (top_id[2] is not null and length (top_id) = 4)\n"
"{\n"
-"declare pfc_spath, pfc_name, pfc_value varchar;\n"
-"declare orig_id integer;\n"
+"declare cs any;\n"
+"declare qr, rset, mdta, h, dict, is_all any;\n"
+"declare inc, limit int;\n"
"\n"
-"pfc_spath := null;\n"
-"orig_id := \"PropFilter_DAV_SEARCH_ID_IMPL\" (detcol_id, path_parts, what, pfc_spath, pfc_name, pfc_value);\n"
-"if (orig_id < 0)\n"
-"return orig_id;\n"
-"return vector (UNAME\'PropFilter\', detcol_id, orig_id);\n"
-"}\n"
-"--src DET_PropFilter.sql:554\n";
-
-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"
+"limit := 1000;\n"
+"inc := 0;\n"
+"is_all := 0;\n"
+"cs := top_id[2];\n"
+"cs := id_to_iri (cs);\n"
+"if (cs = \'All\')\n"
"{\n"
-"\n"
-"return coalesce ((select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_ID = id[2]), null);\n"
+"is_all := 1;\n"
+"cs := \'?cls\';\n"
+"return vector ();\n"
"}\n"
-"--src DET_PropFilter.sql:568\n";
-
-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"
-"declare pfc_spath, pfc_name, pfc_value varchar;\n"
-"declare rc integer;\n"
+"else\n"
+"cs := sprintf (\'<%S>\', cs);\n"
"\n"
-"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
-"{\n"
"\n"
-"return -2;\n"
-"}\n"
-"if (1 <> length (path_parts))\n"
-"return -2;\n"
-"if (\'R\' <> what)\n"
-"return -2;\n"
-"if (\'\' = path_parts[0])\n"
-"return -2;\n"
-"if (isinteger (source_id) and\n"
-"exists (select 1 from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = source_id and RES_NAME = path_parts[0] and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath)) ) )\n"
+"qr := sprintf (\'sparql\n"
+"define output:valmode \"LONG\"\n"
+"prefix dc: <http://purl.org/dc/elements/1.1/>\n"
+"prefix dct: <http://purl.org/dc/terms/>\n"
+"prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"
+"prefix skos: <http://www.w3.org/2004/02/skos/core#>\n"
+"SELECT ?X ?L ?T ?PL ?CR ?MOD\n"
+"where\n"
"{\n"
-"\"PropFilter_FIT_INTO_CONDITION\" (source_id, what, pfc_name, pfc_value);\n"
+"graph <%S>\n"
+"{\n"
+"?X a %s\n"
+"optional { ?X rdfs:label ?L } .\n"
+"optional { ?X dc:title ?T } .\n"
+"optional { ?X skos:prefLabel ?PL } .\n"
+"optional { ?X dct:created ?CR } .\n"
+"optional { ?X dct:modified ?MOD } .\n"
"}\n"
+"}\', gr, cs);\n"
+"\n"
+"dict := dict_new ();\n"
+"exec (qr, null, null, vector (), 0, null, null, h);\n"
+"while (0 = exec_next (h, null, null, rset))\n"
+"{\n"
+"declare tit, lg any;\n"
+"declare X,L,T,PL,CR,MOD any;\n"
+"\n"
+"X := rset[0];\n"
+"L := rset[1];\n"
+"T := rset[2];\n"
+"PL := rset[3];\n"
+"CR := rset[4];\n"
+"MOD := rset[5];\n"
+"\n"
+"cr := coalesce (cr, now ());\n"
+"mod := coalesce (mod, now ());\n"
+"cr := RDFData_cast_dt_silent (cr);\n"
+"mod := RDFData_cast_dt_silent (mod);\n"
+"\n"
+"tit := coalesce (L, T, PL);\n"
+"\n"
+"lg := \'\';\n"
+"if (is_all)\n"
+"tit := \'iid\';\n"
+"else if (tit is null)\n"
+"tit := \'~unnamed~\';\n"
"else\n"
"{\n"
-"declare new_full_path varchar;\n"
-"new_full_path := DAV_CONCAT_PATH (pfc_spath, path_parts[0]);\n"
-"rc := DAV_COPY_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, permissions,\n"
-"coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = uid), \'\'),\n"
-"coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = gid), \'\'),\n"
-"null, null, 0);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
-"if (DAV_HIDE_ERROR (source_id) is null)\n"
-"return source_id;\n"
-"\"PropFilter_FIT_INTO_CONDITION\" (source_id, what, pfc_name, pfc_value);\n"
+"lg := DB.DBA.RDF_LANGUAGE_OF_LONG (tit, \'\');\n"
+"tit := DB.DBA.RDF_SQLVAL_OF_LONG (tit);\n"
"}\n"
-"return 1;\n"
+"\n"
+"if (filt_lg <> \'\' and lg <> \'\' and strstr (filt_lg, lg) is null)\n"
+"goto next_row;\n"
+"if (dict_get (dict, X) = 1)\n"
+"goto next_row;\n"
+"tit := sprintf (\'%s (%i).rdf\', tit, iri_id_num (iri_to_id (X)));\n"
+"\n"
+"\n"
+"vectorbld_acc (res,\n"
+"vector (\n"
+"DAV_CONCAT_PATH (top_davpath, tit),\n"
+"\'R\',\n"
+"0,\n"
+"mod,\n"
+"vector (UNAME\'RDFData\', detcol_id, cs, iri_to_id (X)),\n"
+"access,\n"
+"ownergid,\n"
+"owner_uid,\n"
+"cr,\n"
+"\'application/rdf+xml\',\n"
+"tit)\n"
+");\n"
+"dict_put (dict, X, 1);\n"
+"inc := inc + 1;\n"
+"if (inc > limit)\n"
+"goto end_loop;\n"
+"next_row:;\n"
"}\n"
-"--src DET_PropFilter.sql:576\n";
-
-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"
+"end_loop:;\n"
+"exec_close (h);\n"
+"}\n"
+"finalize_res:\n"
+"vectorbld_final (res);\n"
+"return res;\n"
+"}\n"
+"--src DET_RDFData.sql:242\n";
+
+static const char *proc553 =
+"#line 465 \"[executable]/DET_RDFData.sql\"\n"
+"create function RDFData_std_pref (in iri varchar, in rev int := 0)\n"
"{\n"
-"declare pfc_spath, pfc_name, pfc_value varchar;\n"
-"declare rc integer;\n"
+"declare v any;\n"
+"v := vector (\n"
+"\'http://xmlns.com/foaf/0.1/\', \'foaf\',\n"
+"\'http://rdfs.org/sioc/ns#\', \'sioc\',\n"
+"\'http://www.w3.org/1999/02/22-rdf-syntax-ns#\', \'rdf\',\n"
+"\'http://www.w3.org/2000/01/rdf-schema#\', \'rdfs\',\n"
+"\'http://www.w3.org/2003/01/geo/wgs84_pos#\', \'geo\',\n"
+"\'http://atomowl.org/ontologies/atomrdf#\', \'aowl\',\n"
+"\'http://purl.org/dc/elements/1.1/\', \'dc\',\n"
+"\'http://purl.org/dc/terms/\', \'dct\',\n"
+"\'http://www.w3.org/2004/02/skos/core#\', \'skos\',\n"
+"\'http://rdfs.org/sioc/types#\', \'sioct\',\n"
+"\'http://sw.deri.org/2005/04/wikipedia/wikiont.owl#\', \'wiki\',\n"
+"\'http://www.w3.org/2002/01/bookmark#\', \'bm\',\n"
+"\'http://www.w3.org/2003/12/exif/ns/\', \'exif\',\n"
+"\'http://www.w3.org/2000/10/annotation-ns#\', \'ann\',\n"
+"\'http://purl.org/vocab/bio/0.1/\', \'bio\',\n"
+"\'http://www.w3.org/2001/vcard-rdf/3.0#\', \'vcard\',\n"
+"\'http://www.w3.org/2002/12/cal#\', \'vcal\',\n"
+"\'http://www.w3.org/2002/07/owl#\', \'owl\',\n"
+"\'http://web.resource.org/cc/\', \'cc\',\n"
+"\'http://dbpedia.org/class/yago/\', \'dbp\'\n"
"\n"
-"if (0 > \"PropFilter_GET_CONDITION\" (detcol_id, pfc_spath, pfc_name, pfc_value))\n"
+");\n"
+"if (rev)\n"
"{\n"
-"\n"
-"return -2;\n"
-"}\n"
-"if (1 <> length (path_parts))\n"
-"return -2;\n"
-"if (\'R\' <> what)\n"
-"return -2;\n"
-"if (\'\' = path_parts[0])\n"
-"return -2;\n"
-"if (isinteger (source_id) and\n"
-"exists (select 1 from WS.WS.SYS_DAV_RES\n"
-"where RES_ID = source_id and RES_NAME = path_parts[0] and (RES_FULL_PATH between pfc_spath and DAV_COL_PATH_BOUNDARY (pfc_spath))))\n"
+"declare nv, l any;\n"
+"nv := make_array (length (v), \'any\');\n"
+"for (declare i, j int, j := 0, i := length (v) - 1; i >= 0; i := i - 2, j := j + 2)\n"
"{\n"
-"\"PropFilter_FIT_INTO_CONDITION\" (source_id, what, pfc_name, pfc_value);\n"
+"nv[j] := v[i];\n"
+"nv[j+1] := v[i-1];\n"
"}\n"
-"else\n"
-"{\n"
-"declare new_full_path varchar;\n"
-"new_full_path := DAV_CONCAT_PATH (pfc_spath, path_parts[0]);\n"
-"rc := DAV_MOVE_INT (DAV_SEARCH_PATH (source_id, what), new_full_path, overwrite, null, null, 0, 1);\n"
-"if (DAV_HIDE_ERROR (rc) is null)\n"
-"return rc;\n"
-"source_id := DAV_SEARCH_ID (new_full_path, what);\n"
-"if (DAV_HIDE_ERROR (source_id) is null)\n"
-"return source_id;\n"
-"\"PropFilter_FIT_INTO_CONDITION\" (source_id, what, pfc_name, pfc_value);\n"
+"return get_keyword (iri, nv, null);\n"
"}\n"
-"return 1;\n"
+"else\n"
+"return get_keyword (iri, v, null);\n"
"}\n"
-"--src DET_PropFilter.sql:618\n";
+"--src DET_RDFData.sql:463\n";
-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"
+static const char *proc554 =
+"#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"
+"RDFData_log_message (current_proc_name ());\n"
"\n"
-"declare cont any;\n"
-"if ((content_mode = 0) or (content_mode = 2))\n"
-"select RES_CONTENT, RES_TYPE into content, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
-"else if (content_mode = 1)\n"
-"select http (RES_CONTENT, content), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
-"else if (content_mode = 3)\n"
-"select http (RES_CONTENT), RES_TYPE into cont, type from WS.WS.SYS_DAV_RES where RES_ID = id[2];\n"
-"return id[2];\n"
+"return vector();\n"
"}\n"
-"--src DET_PropFilter.sql:657\n";
+"--src DET_RDFData.sql:505\n";
-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"
+static const char *proc555 =
+"#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"
+"RDFData_log_message (current_proc_name ());\n"
"\n"
-"return -20;\n"
-"}\n"
-"--src DET_PropFilter.sql:672\n";
-
-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"
-"declare rc, u_token, new_token varchar;\n"
+"declare orig_id, ctr, len integer;\n"
+"declare r_id, cl_id, cl any;\n"
+"declare access, ownergid, owner_uid any;\n"
+"DB.DBA.\"RDFData_ACCESS_PARAMS\" (detcol_id, access, ownergid, owner_uid);\n"
"\n"
-"if (\'R\' <> type)\n"
-"return -20;\n"
-"if (DAV_HIDE_ERROR (id) is null)\n"
-"return -20;\n"
-"if (isarray (id))\n"
-"return DAV_LOCK_INT (path, id[2], type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, null, null, auth_uid);\n"
-"return -20;\n"
-"}\n"
-"--src DET_PropFilter.sql:680\n";
-
-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"
+"if (path_parts[0] = \'\' or path_parts[0] is null)\n"
+"return -1;\n"
+"if (path_parts[0] <> \'\')\n"
"{\n"
-"\n"
-"if (isarray (id))\n"
-"id := id [2];\n"
-"return DAV_UNLOCK_INT (id, type, token, null, null, auth_uid);\n"
-"}\n"
-"--src DET_PropFilter.sql:695\n";
-
-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"
+"declare x, pos, pref, url any;\n"
+"cl := path_parts[0];\n"
+"pos := strchr (cl, \':\');\n"
+"pref := subseq (cl, 0, pos);\n"
+"url := RDFData_std_pref (pref, 1);\n"
+"if (url is null)\n"
"{\n"
-"declare rc integer;\n"
-"declare orig_id any;\n"
-"declare orig_type char(1);\n"
+"cl := replace (cl, \'^2f\', \'/\');\n"
+"cl := replace (cl, \'^23\', \'#\');\n"
+"cl_id := iri_to_id (cl);\n"
"\n"
-"orig_id := id;\n"
-"id := orig_id[2];\n"
-"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
-"if (rc <> 0)\n"
-"return rc;\n"
-"id := orig_id[1];\n"
-"orig_type := type;\n"
-"type := \'C\';\n"
-"rc := DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
-"if (rc <> 0)\n"
-"return rc;\n"
-"id := orig_id;\n"
-"type := orig_type;\n"
-"return 0;\n"
"}\n"
-"--src DET_PropFilter.sql:705\n";
-
-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"
+"else\n"
"{\n"
-"declare res any;\n"
-"\n"
-"id := id[2];\n"
-"if (isarray (id))\n"
-"return call (cast (id[0] as varchar) || \'_DAV_LIST_LOCKS\') (id, type, recursive);\n"
-"res := vector();\n"
-"for select LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO\n"
-"from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_ID = id and LOCK_PARENT_TYPE = type do {\n"
-"res := vector_concat (res, vector (vector (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO)));\n"
-"}\n"
-"return res;\n"
+"cl := subseq (cl, pos + 1);\n"
+"cl := url || cl;\n"
+"cl_id := iri_to_id (cl);\n"
"}\n"
-"--src DET_PropFilter.sql:729\n";
-
-/* DET_RDFData.sql */
-
-static const char *proc529 =
-"#line 26 \"[executable]/DET_RDFData.sql\"\n"
-"create procedure DB.DBA.RDFData_log_message (in x varchar)\n"
-"{\n"
-"if (0)\n"
-"log_message (cast (x as varchar));\n"
"}\n"
-"--src DET_RDFData.sql:24\n";
-
-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"
-"RDFData_log_message (current_proc_name ());\n"
-"\n"
-"\n"
-"if (not (\'110\' like req))\n"
+"if (length (path_parts) = 2 and what = \'C\')\n"
"{\n"
-"return -13;\n"
+"return vector (UNAME\'RDFData\', detcol_id, cl_id, owner_uid);\n"
"}\n"
-"if (\'100\' like req and auth_uid >= 0)\n"
-"return auth_uid;\n"
-"\n"
-"if ((auth_uid <> id[3]) and (auth_uid <> http_dav_uid()))\n"
+"else if (length (path_parts) = 2 and path_parts[1] <> \'\' and what = \'R\')\n"
"{\n"
+"declare t, arr any;\n"
+"t := path_parts[1];\n"
+"arr := sprintf_inverse (t, \'%s (%d).%s\', 1);\n"
+"if (3 > length (arr))\n"
+"return -1;\n"
+"r_id := iri_id_from_num (arr [1]);\n"
"\n"
-"return -13;\n"
+"return vector (UNAME\'RDFData\', detcol_id, cl_id, owner_uid, r_id);\n"
"}\n"
-"if (auth_uid >= 0)\n"
-"return auth_uid;\n"
-"return -12;\n"
+"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:31\n";
+"--src DET_RDFData.sql:513\n";
-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"
-"RDFData_log_message (current_proc_name ());\n"
-"\n"
-"declare rc integer;\n"
-"declare puid, pgid integer;\n"
-"declare u_password, pperms varchar;\n"
-"declare allow_anon integer;\n"
-"if (length (req) <> 3)\n"
-"return -15;\n"
-"\n"
-"whenever not found goto nf_col_or_res;\n"
-"puid := http_dav_uid();\n"
-"pgid := coalesce (\n"
-"( select G_ID from WS.WS.SYS_DAV_GROUP\n"
-"where G_NAME = \'RDFData_\' || coalesce ((select COL_NAME from WS.WS.SYS_DAV_COL where COL_ID=id[1] and COL_DET=\'RDFData\'), \'\')\n"
-"), puid+1);\n"
-"pperms := \'110100100NN\';\n"
-"if ((what <> \'R\') and (what <> \'C\'))\n"
-"return -14;\n"
-"allow_anon := WS.WS.PERM_COMP (substring (cast (pperms as varchar), 7, 3), req);\n"
-"if (a_uid is null)\n"
-"{\n"
-"if ((not allow_anon) or (\'\' <> WS.WS.FINDPARAM (a_lines, \'Authorization:\')))\n"
-"rc := WS.WS.GET_DAV_AUTH (a_lines, allow_anon, can_write_http, a_uname, u_password, a_uid, a_gid, _perms);\n"
-"if (rc < 0)\n"
-"return rc;\n"
-"}\n"
-"if (isinteger (a_uid))\n"
-"{\n"
-"if (a_uid < 0)\n"
-"return a_uid;\n"
-"if (a_uid = 1)\n"
+static const char *proc556 =
+"#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"
-"a_uid := http_nobody_uid ();\n"
-"a_gid := http_nogroup_gid ();\n"
-"}\n"
-"}\n"
-"if (DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
-"return a_uid;\n"
-"return -13;\n"
+"declare col_path varchar;\n"
+"declare ret any;\n"
+"RDFData_log_message (current_proc_name ());\n"
"\n"
-"nf_col_or_res:\n"
-"return -1;\n"
+"col_path := WS.WS.COL_PATH (id[1]);\n"
+"ret := sprintf (\'%s%s/iid (%d).rdf\', col_path, id_to_iri (id[2]), iri_id_num (id[4]));\n"
+"\n"
+"return ret;\n"
"}\n"
-"--src DET_RDFData.sql:54\n";
+"--src DET_RDFData.sql:564\n";
-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"
+static const char *proc557 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:102\n";
+"--src DET_RDFData.sql:577\n";
-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"
+static const char *proc558 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:109\n";
+"--src DET_RDFData.sql:584\n";
-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"
+static const char *proc559 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
+"declare iri, url, qr, _from any;\n"
+"declare path, params, lines, ses, gr any;\n"
+"\n"
+"if (id [4] is null)\n"
"return -20;\n"
+"type := \'application/rdf+xml\';\n"
+"if (is_http_ctx ())\n"
+"{\n"
+"declare lpath varchar;\n"
+"lpath := http_path ();\n"
+"if (lpath like \'%.rdf\')\n"
+"type := \'application/rdf+xml\';\n"
+"else if (lpath like \'%.nt\')\n"
+"type := \'text/n3\';\n"
+"else if (lpath like \'%.txt\')\n"
+"type := \'text/plain\';\n"
+"else if (lpath like \'%.json\')\n"
+"type := \'application/json\';\n"
+"else\n"
+"type := \'text/rdf+n3\';\n"
"}\n"
-"--src DET_RDFData.sql:116\n";
+"iri := id_to_iri (id [4]);\n"
+"\n"
+"_from := \'\';\n"
+"gr := DAV_PROP_GET_INT (id[1], \'C\', \'virt:rdfdata_graph\', 0);\n"
+"if (__proc_exists (\'sioc.DBA.get_graph\') is not null and gr = sioc.DBA.get_graph ())\n"
+"{\n"
+"declare pg any;\n"
+"declare tmp, uname any;\n"
+"declare pos int;\n"
+"pg := http_param (\'page\');\n"
+"if (not isstring (pg))\n"
+"pg := \'0\';\n"
+"pg := atoi (pg);\n"
+"\n"
+"\n"
+"if (regexp_match (\'https?://([^/]*)/dataspace/(person|organization)/(.*)\', iri) is not null and iri not like \'%/online_account/%\')\n"
+"{\n"
+"tmp := sprintf_inverse (iri, \'http%s://%s/dataspace/%s/%s\', 0);\n"
+"tmp := tmp[3];\n"
+"pos := coalesce (strchr (tmp, \'#\'), strchr (tmp, \'/\'));\n"
+"if (pos is not null)\n"
+"uname := subseq (tmp, 0, pos);\n"
+"else\n"
+"uname := tmp;\n"
+"ses := sioc..compose_foaf (uname, type, pg);\n"
+"goto ret_place2;\n"
+"}\n"
+"else if (__proc_exists (\'sioc.DBA.ods_obj_describe\') is not null)\n"
+"{\n"
+"ses := sioc..ods_obj_describe (iri, type, pg);\n"
+"goto ret_place2;\n"
+"}\n"
+"else if (regexp_match (\'https?://([^/]*)/dataspace/([^/]*)(#this|/sioc.rdf|/sioc.n3)?\\x24\', iri) is not null\n"
+"and __proc_exists (\'sioc.DBA.ods_sioc_obj_describe\') is not null)\n"
+"{\n"
+"tmp := sprintf_inverse (iri, \'http%s://%s/dataspace/%s\', 0);\n"
+"tmp := tmp[2];\n"
+"pos := coalesce (strchr (tmp, \'#\'), strchr (tmp, \'/\'));\n"
+"if (pos is not null)\n"
+"uname := subseq (tmp, 0, pos);\n"
+"else\n"
+"uname := tmp;\n"
+"ses := sioc..ods_sioc_obj_describe (uname, type, pg);\n"
+"goto ret_place2;\n"
+"}\n"
+"if (__proc_exists (\'sioc.DBA.ods_sioc_container_obj_describe\') is not null)\n"
+"{\n"
+"ses := sioc..ods_sioc_container_obj_describe (iri, type, pg);\n"
+"goto ret_place2;\n"
+"}\n"
+"else\n"
+"{\n"
+"DB.DBA.OdsIriDescribe (iri, type);\n"
+"goto ret_place;\n"
+"}\n"
+"}\n"
+"if (isstring (gr) and length (gr))\n"
+"_from := sprintf (\' FROM <%s>\', gr);\n"
+"\n"
+"qr := sprintf (\'describe <%s> %s\', iri, _from);\n"
+"path := vector ();\n"
+"\n"
+"params := vector (\'query\', qr, \'format\', \'application/rdf+xml\');\n"
+"lines := vector ();\n"
+"WS.WS.\"/!sparql/\" (path, params, lines);\n"
+"ret_place:\n"
+"ses := http_get_string_output (1);\n"
+"ret_place2:\n"
+"\n"
+"http_rewrite ();\n"
+"if (content_mode = 1)\n"
+"http (ses, content);\n"
+"else\n"
+"content := string_output_string (ses);\n"
+"return 0;\n"
+"}\n"
+"--src DET_RDFData.sql:591\n";
-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"
+static const char *proc560 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:123\n";
+"--src DET_RDFData.sql:693\n";
-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"
+static const char *proc561 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:131\n";
+"--src DET_RDFData.sql:700\n";
-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"
+static const char *proc562 =
+"#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"
-"\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:138\n";
+"--src DET_RDFData.sql:707\n";
-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"
+static const char *proc563 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:146\n";
+"--src DET_RDFData.sql:713\n";
-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"
+static const char *proc564 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
-"if (propname[0] = 58)\n"
-"{\n"
-"return -16;\n"
-"}\n"
-"return -20;\n"
+"return -27;\n"
"}\n"
-"--src DET_RDFData.sql:153\n";
+"--src DET_RDFData.sql:721\n";
-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"
+static const char *proc565 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
-"return -11;\n"
+"return 0;\n"
"}\n"
-"--src DET_RDFData.sql:164\n";
+"--src DET_RDFData.sql:728\n";
-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"
+static const char *proc566 =
+"#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"
"RDFData_log_message (current_proc_name ());\n"
"return vector ();\n"
"}\n"
-"--src DET_RDFData.sql:172\n";
+"--src DET_RDFData.sql:736\n";
-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"
-"declare access_tmp varchar;\n"
-"whenever not found goto ret;\n"
-"access := \'000100100N\';\n"
-"gid := http_nogroup_gid ();\n"
-"uid := http_nobody_uid ();\n"
-"if (isinteger (detcol_id))\n"
+static const char *proc567 =
+"#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"
-"select COL_PERMS, COL_GROUP, COL_OWNER into access_tmp, gid, uid from WS.WS.SYS_DAV_COL where COL_ID = detcol_id;\n"
-"}\n"
-"access[0] := access_tmp[0];\n"
-"access[1] := access_tmp[1];\n"
-"ret:\n"
-" ;\n"
+"declare colid int;\n"
+"colid := DAV_MAKE_DIR (path, http_dav_uid (), null, \'110100100N\');\n"
+"if (colid < 0)\n"
+"signal (\'42000\', \'Unable to create RDFData DET collection\');\n"
+"update WS.WS.SYS_DAV_COL set COL_DET=\'RDFData\' where COL_ID = colid;\n"
+"if (gr is not null)\n"
+"DAV_PROP_SET_INT (path, \'virt:rdfdata_graph\', gr, null, null, 0, 0, 1, http_dav_uid ());\n"
+"if (lg is not null)\n"
+"DAV_PROP_SET_INT (path, \'virt:rdfdata_lang\', lg, null, null, 0, 0, 1, http_dav_uid ());\n"
"}\n"
-"--src DET_RDFData.sql:179\n";
+"--src DET_RDFData.sql:743\n";
-static const char *proc543 =
-"#line 199 \"[executable]/DET_RDFData.sql\"\n"
-"create procedure DB.DBA.RDFData_cast_dt_silent (in d any)\n"
-"{\n"
-"if (__tag (d) = 211)\n"
-"return d;\n"
-"else\n"
-"{\n"
-"declare exit handler for sqlstate \'*\'\n"
+/* DET_S3.sql */
+
+static const char *proc568 =
+"#line 28 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_AUTHENTICATE\" (\n"
+"in id any,\n"
+"in what char(1),\n"
+"in req varchar,\n"
+"in auth_uname varchar,\n"
+"in auth_pwd varchar,\n"
+"in auth_uid integer)\n"
"{\n"
-"return now ();\n"
-"};\n"
-"return cast (d as datetime);\n"
-"}\n"
+"\n"
+"declare retValue any;\n"
+"\n"
+"retValue := DAV_AUTHENTICATE (id[2], what, req, auth_uname, auth_pwd, auth_uid);\n"
+"\n"
+"return retValue;\n"
"}\n"
-"--src DET_RDFData.sql:197\n";
+"--src DET_S3.sql:26\n";
-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"
+static const char *proc569 =
+"#line 50 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_AUTHENTICATE_HTTP\" (\n"
+"in id any,\n"
+"in what char(1),\n"
+"in req varchar,\n"
+"in can_write_http integer,\n"
+"inout a_lines any,\n"
+"inout a_uname varchar,\n"
+"inout a_pwd varchar,\n"
+"inout a_uid integer,\n"
+"inout a_gid integer,\n"
+"inout _perms varchar) returns integer\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
"\n"
-"declare path_parts any;\n"
-"declare access, ownergid, owner_uid, mime any;\n"
-"declare len int;\n"
+"declare retValue any;\n"
"\n"
-"DB.DBA.\"RDFData_ACCESS_PARAMS\" (id[1], access, ownergid, owner_uid);\n"
+"retValue := DAV_AUTHENTICATE_HTTP (id[2], what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);\n"
"\n"
-"if (isstring (path))\n"
-"path_parts := split_and_decode (path, 0, \'\\0\\0/\');\n"
-"else\n"
-"path_parts := path;\n"
-"len := length (path_parts);\n"
-"if (what = \'C\')\n"
-"return vector (DAV_CONCAT_PATH (path, \'\'), \'C\', 0, now (), id, access, ownergid, owner_uid, now (), \'dav/unix-directory\', path_parts [len - 2]);\n"
-"mime := \'application/rdf+xml\';\n"
-"if (is_http_ctx ())\n"
-"{\n"
-"declare lpath varchar;\n"
-"lpath := http_path ();\n"
-"if (lpath like \'%.ttl\' or lpath like \'%.n3\')\n"
-"mime := \'text/rdf+n3\';\n"
-"}\n"
-"return vector (DAV_CONCAT_PATH (path, \'\'), \'R\', 0, now (), id, access, ownergid, owner_uid, now (), mime, path_parts [len - 1]);\n"
+"return retValue;\n"
"}\n"
-"--src DET_RDFData.sql:212\n";
+"--src DET_S3.sql:48\n";
-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"
+static const char *proc570 =
+"#line 74 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_GET_PARENT\" (\n"
+"in id any,\n"
+"in what char(1),\n"
+"in path varchar) returns any\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"declare top_davpath varchar;\n"
-"declare res any;\n"
-"declare top_id, descnames any;\n"
-"declare what char (1);\n"
-"declare access, filt_lg varchar;\n"
-"declare ownergid, owner_uid, dn_ctr, dn_count integer;\n"
-"declare gr, u_name any;\n"
"\n"
-"vectorbld_init (res);\n"
+"declare retValue any;\n"
"\n"
-"DB.DBA.\"RDFData_ACCESS_PARAMS\" (detcol_id, access, ownergid, owner_uid);\n"
+"retValue := DAV_GET_PARENT (id[2], what, path);\n"
+"if (DAV_HIDE_ERROR (retValue) is not null)\n"
+"retValue := vector (DB.DBA.S3__detName (), id[1], retValue, \'C\');\n"
"\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:72\n";
+
+static const char *proc571 =
+"#line 92 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_COL_CREATE\" (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"in permissions varchar,\n"
+"in uid integer,\n"
+"in gid integer,\n"
+"in auth_uid integer,\n"
+"in extern integer := 0) returns any\n"
+"{\n"
"\n"
+"declare ouid, ogid integer;\n"
+"declare title, parentListID, listID, listItem varchar;\n"
+"declare url, body, header any;\n"
+"declare retValue, retHeader, result, save, parentID any;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
"\n"
-"if ((0 = length (path_parts)) or (\'\' = path_parts[length (path_parts) - 1]))\n"
-"what := \'C\';\n"
-"else\n"
-"what := \'R\';\n"
-"if (\'C\' = what and 1 = length(path_parts))\n"
-"top_id := vector (UNAME\'RDFData\', detcol_id, null, owner_uid, null, null);\n"
-"else\n"
-"top_id := DB.DBA.\"RDFData_DAV_SEARCH_ID\" (detcol_id, path_parts, what);\n"
-"if (DAV_HIDE_ERROR (top_id) is null)\n"
+"save := connection_get (\'dav_store\');\n"
+"if (save is null)\n"
"{\n"
-"return vector();\n"
-"}\n"
-"top_davpath := DAV_CONCAT_PATH (detcol_path, path_parts);\n"
-"if (\'R\' = what)\n"
+"result := DB.DBA.S3__putObject (detcol_id, path_parts, \'C\');\n"
+"if (DAV_HIDE_ERROR (result) is null)\n"
"{\n"
-"return vector (DB.DBA.\"RDFData_DAV_DIR_SINGLE\" (top_id, what, top_davpath, auth_uid));\n"
+"retValue := result;\n"
+"goto _exit;\n"
"}\n"
-"gr := DAV_PROP_GET_INT (detcol_id, \'C\', \'virt:rdfdata_graph\', 0);\n"
-"filt_lg := DAV_PROP_GET_INT (detcol_id, \'C\', \'virt:rdfdata_lang\', 0);\n"
-"if (not isstring (gr) or length (gr) = 0)\n"
-"{\n"
-"u_name := (select p.COL_NAME from WS.WS.SYS_DAV_COL p, WS.WS.SYS_DAV_COL c\n"
-"where c.COL_ID = detcol_id and p.COL_ID = c.COL_PARENT);\n"
-"gr := sioc..user_doc_iri (u_name);\n"
+"listItem := result;\n"
+"listID := get_keyword (\'path\', listItem);\n"
"}\n"
-"if (not isstring (filt_lg))\n"
-"filt_lg := \'\';\n"
-"if (is_http_ctx () and filt_lg = \'*http*\')\n"
+"connection_set (\'dav_store\', 1);\n"
+"DB.DBA.S3__owner (detcol_id, path_parts, DB.DBA.S3__user (uid, auth_uid), DB.DBA.S3__user (gid, auth_uid), ouid, ogid);\n"
+"retValue := DAV_COL_CREATE_INT (DB.DBA.S3__path (detcol_id, path_parts), permissions, DB.DBA.S3__user (uid, auth_uid), DB.DBA.S3__user (gid, auth_uid), DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()), 1, 0, 1, ouid, ogid);\n"
+"\n"
+"_exit:;\n"
+"connection_set (\'dav_store\', save);\n"
+"if (DAV_HIDE_ERROR (retValue) is not null)\n"
"{\n"
-"filt_lg := http_request_header (http_request_header (), \'Accept-Language\', null, \'\');\n"
+"if (save is null)\n"
+"{\n"
+"DB.DBA.S3__paramSet (retValue, \'C\', \'Entry\', DB.DBA.S3__obj2xml (listItem), 0);\n"
+"DB.DBA.S3__paramSet (retValue, \'C\', \'path\', listID, 0);\n"
+"}\n"
+"DB.DBA.S3__paramSet (retValue, \'C\', \'virt:DETCOL_ID\', cast (detcol_id as varchar), 0, 0);\n"
+"retValue := vector (DB.DBA.S3__detName (), detcol_id, retValue, \'C\');\n"
"}\n"
"\n"
-"if (top_id[2] is null)\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:90\n";
+
+static const char *proc572 =
+"#line 146 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_COL_MOUNT\" (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"in full_mount_path varchar,\n"
+"in mount_det varchar,\n"
+"in permissions varchar,\n"
+"in uid integer,\n"
+"in gid integer,\n"
+"in auth_uid integer) returns any\n"
"{\n"
"\n"
+"return -20;\n"
+"}\n"
+"--src DET_S3.sql:144\n";
+
+static const char *proc573 =
+"#line 162 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_COL_MOUNT_HERE\" (\n"
+"in parent_id any,\n"
+"in full_mount_path varchar,\n"
+"in permissions varchar,\n"
+"in uid integer,\n"
+"in gid integer,\n"
+"in auth_uid integer) returns any\n"
+"{\n"
"\n"
+"return -20;\n"
+"}\n"
+"--src DET_S3.sql:160\n";
+
+static const char *proc574 =
+"#line 176 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_DELETE\" (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"in what char(1),\n"
+"in silent integer,\n"
+"in auth_uid integer) returns integer\n"
+"{\n"
"\n"
+"declare path varchar;\n"
+"declare retValue, id, save any;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
"\n"
+"save := connection_get (\'dav_store\');\n"
+"path := DB.DBA.S3__path (detcol_id, path_parts);\n"
+"id := DB.DBA.DAV_SEARCH_ID (path, what);\n"
+"if (save is null)\n"
+"{\n"
+"retValue := DB.DBA.S3__deleteObject (detcol_id, path, id, what);\n"
+"if (DAV_HIDE_ERROR (retValue) is null)\n"
+"goto _exit;\n"
+"}\n"
+"connection_set (\'dav_store\', 1);\n"
+"if (what = \'R\')\n"
+"DB.DBA.S3__rdf_delete (detcol_id, id, what);\n"
+"retValue := DAV_DELETE_INT (path, 1, null, null, 0, 0);\n"
"\n"
+"_exit:;\n"
+"connection_set (\'dav_store\', save);\n"
"\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:174\n";
+
+static const char *proc575 =
+"#line 217 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_RES_UPLOAD\" (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"inout content any,\n"
+"in type varchar,\n"
+"in permissions varchar,\n"
+"in uid integer,\n"
+"in gid integer,\n"
+"in auth_uid integer) returns any\n"
+"{\n"
"\n"
+"declare ouid, ogid integer;\n"
+"declare name, path, parentListID, listID, listItem, rdf_graph varchar;\n"
+"declare url, header, body, params any;\n"
+"declare retValue, retHeader, result, save, parentID any;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"FOR SELECT CLS FROM (\n"
-"sparql\n"
-"select distinct ?CLS\n"
-"where {\n"
-"graph `iri(?:gr)`\n"
+"save := connection_get (\'dav_store\');\n"
+"path := DB.DBA.S3__path (detcol_id, path_parts);\n"
+"if (save is null)\n"
"{\n"
-"?x a ?CLS .\n"
-"} } ) sub do\n"
+"if (__tag (content) = 126)\n"
"{\n"
-"declare tmp, tit, pref any;\n"
-"declare p1, p2, p3, pos int;\n"
-"p1 := coalesce (strrchr (cls, \'#\'), -1);\n"
-"p2 := coalesce (strrchr (cls, \'/\'), -1);\n"
-"p3 := coalesce (strrchr (cls, \':\'), -1);\n"
-"pos := __max (p1, p2, p3);\n"
-"if (pos > 0)\n"
+"declare real_content any;\n"
+"\n"
+"real_content := http_body_read (1);\n"
+"content := string_output_string (real_content);\n"
+"}\n"
+"result := DB.DBA.S3__putObject (detcol_id, path_parts, \'R\', content, type);\n"
+"if (DAV_HIDE_ERROR (result) is null)\n"
"{\n"
-"tit := subseq (CLS, pos + 1);\n"
-"tmp := subseq (CLS, 0, pos + 1);\n"
-"pref := RDFData_std_pref (tmp);\n"
-"if (pref is not null)\n"
-"tit := pref || \':\' || tit;\n"
-"else\n"
-"tit := CLS;\n"
+"retValue := result;\n"
+"goto _exit;\n"
"}\n"
-"else\n"
-"tit := CLS;\n"
-"tit := replace (tit, \'/\', \'^2f\');\n"
-"tit := replace (tit, \'#\', \'^23\');\n"
+"listItem := result;\n"
+"listID := get_keyword (\'path\', listItem);\n"
+"}\n"
+"_skip_create:;\n"
+"connection_set (\'dav_store\', 1);\n"
+"DB.DBA.S3__owner (detcol_id, path_parts, DB.DBA.S3__user (uid, auth_uid), DB.DBA.S3__user (gid, auth_uid), ouid, ogid);\n"
+"retValue := DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, DB.DBA.S3__user (uid, auth_uid), DB.DBA.S3__user (gid, auth_uid), DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()), 0, ouid=>ouid, ogid=>ogid, check_locks=>0);\n"
"\n"
-"vectorbld_acc (res,\n"
-"vector (\n"
-"DAV_CONCAT_PATH (top_davpath, tit) || \'/\',\n"
-"\'C\',\n"
-"0,\n"
-"now (),\n"
-"vector (UNAME\'RDFData\', detcol_id, iri_to_id (CLS)),\n"
-"access,\n"
-"ownergid,\n"
-"owner_uid,\n"
-"now (),\n"
-"\'dav/unix-directory\',\n"
-"tit)\n"
-");\n"
+"_exit:;\n"
+"connection_set (\'dav_store\', save);\n"
+"if (DAV_HIDE_ERROR (retValue) is not null)\n"
+"{\n"
+"rdf_graph := DB.DBA.S3__paramGet (detcol_id, \'C\', \'graph\', 0);\n"
+"if (not DB.DBA.is_empty_or_null (rdf_graph))\n"
+"DB.DBA.S3__rdf (detcol_id, retValue, \'R\');\n"
+"\n"
+"if (save is null)\n"
+"{\n"
+"DB.DBA.S3__paramSet (retValue, \'R\', \'Entry\', DB.DBA.S3__obj2xml (listItem), 0);\n"
+"DB.DBA.S3__paramSet (retValue, \'R\', \'path\', listID, 0);\n"
"}\n"
+"DB.DBA.S3__paramSet (retValue, \'R\', \'virt:DETCOL_ID\', cast (detcol_id as varchar), 0, 0);\n"
+"retValue := vector (DB.DBA.S3__detName (), detcol_id, retValue, \'R\');\n"
"}\n"
-"else if (top_id[2] is not null and length (top_id) = 4)\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:215\n";
+
+static const char *proc576 =
+"#line 286 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_PROP_REMOVE\" (\n"
+"in id any,\n"
+"in what char(0),\n"
+"in propname varchar,\n"
+"in silent integer,\n"
+"in auth_uid integer) returns integer\n"
"{\n"
-"declare cs any;\n"
-"declare qr, rset, mdta, h, dict, is_all any;\n"
-"declare inc, limit int;\n"
"\n"
-"limit := 1000;\n"
-"inc := 0;\n"
-"is_all := 0;\n"
-"cs := top_id[2];\n"
-"cs := id_to_iri (cs);\n"
-"if (cs = \'All\')\n"
+"declare retValue any;\n"
+"\n"
+"retValue := DAV_PROP_REMOVE_RAW (id[2], what, propname, silent, auth_uid);\n"
+"\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:284\n";
+
+static const char *proc577 =
+"#line 304 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_PROP_SET\" (\n"
+"in id any,\n"
+"in what char(0),\n"
+"in propname varchar,\n"
+"in propvalue any,\n"
+"in overwrite integer,\n"
+"in auth_uid integer) returns any\n"
"{\n"
-"is_all := 1;\n"
-"cs := \'?cls\';\n"
-"return vector ();\n"
+"\n"
+"declare retValue any;\n"
+"\n"
+"id := id[2];\n"
+"retValue := DB.DBA.DAV_PROP_SET_RAW (id, what, propname, propvalue, 1, http_dav_uid ());\n"
+"\n"
+"return retValue;\n"
"}\n"
-"else\n"
-"cs := sprintf (\'<%S>\', cs);\n"
+"--src DET_S3.sql:302\n";
+
+static const char *proc578 =
+"#line 323 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_PROP_GET\" (\n"
+"in id any,\n"
+"in what char(0),\n"
+"in propname varchar,\n"
+"in auth_uid integer)\n"
+"{\n"
"\n"
+"declare retValue any;\n"
"\n"
-"qr := sprintf (\'sparql\n"
-"define output:valmode \"LONG\"\n"
-"prefix dc: <http://purl.org/dc/elements/1.1/>\n"
-"prefix dct: <http://purl.org/dc/terms/>\n"
-"prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"
-"prefix skos: <http://www.w3.org/2004/02/skos/core#>\n"
-"SELECT ?X ?L ?T ?PL ?CR ?MOD\n"
-"where\n"
+"retValue := DAV_PROP_GET_INT (id[2], what, propname, 0);\n"
+"\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:321\n";
+
+static const char *proc579 =
+"#line 340 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_PROP_LIST\" (\n"
+"in id any,\n"
+"in what char(0),\n"
+"in propmask varchar,\n"
+"in auth_uid integer)\n"
+"{\n"
+"\n"
+"declare retValue any;\n"
+"\n"
+"retValue := DAV_PROP_LIST_INT (id[2], what, propmask, 0);\n"
+"\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:338\n";
+
+static const char *proc580 =
+"#line 356 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_DIR_SINGLE\" (\n"
+"in id any,\n"
+"in what char(0),\n"
+"in path any,\n"
+"in auth_uid integer) returns any\n"
"{\n"
-"graph <%S>\n"
+"\n"
+"declare retValue, save any;\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"?X a %s\n"
-"optional { ?X rdfs:label ?L } .\n"
-"optional { ?X dc:title ?T } .\n"
-"optional { ?X skos:prefLabel ?PL } .\n"
-"optional { ?X dct:created ?CR } .\n"
-"optional { ?X dct:modified ?MOD } .\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
+"\n"
+"save := connection_get (\'dav_store\');\n"
+"connection_set (\'dav_store\', 1);\n"
+"retValue := DAV_DIR_SINGLE_INT (id[2], what, null, DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()), http_dav_uid ());\n"
+"connection_set (\'dav_store\', save);\n"
+"if ((DAV_HIDE_ERROR (retValue) is not null) and (save is null))\n"
+"retValue[4] := vector (DB.DBA.S3__detName (), id[1], retValue[4], what);\n"
+"\n"
+"return retValue;\n"
"}\n"
-"}\', gr, cs);\n"
+"--src DET_S3.sql:354\n";
+
+static const char *proc581 =
+"#line 382 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_DIR_LIST\" (\n"
+"in detcol_id any,\n"
+"in subPath_parts any,\n"
+"in detcol_parts varchar,\n"
+"in name_mask varchar,\n"
+"in recursive integer,\n"
+"in auth_uid integer) returns any\n"
+"{\n"
"\n"
-"dict := dict_new ();\n"
-"exec (qr, null, null, vector (), 0, null, null, h);\n"
-"while (0 = exec_next (h, null, null, rset))\n"
+"declare colId integer;\n"
+"declare what, colPath, movePath varchar;\n"
+"declare boxItem any;\n"
+"declare retValue, save, downloads, listItems, davItems, colEntry, xmlItems, davEntry, listIds, listId any;\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"declare tit, lg any;\n"
-"declare X,L,T,PL,CR,MOD any;\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
"\n"
-"X := rset[0];\n"
-"L := rset[1];\n"
-"T := rset[2];\n"
-"PL := rset[3];\n"
-"CR := rset[4];\n"
-"MOD := rset[5];\n"
+"save := connection_get (\'dav_store\');\n"
+"connection_set (\'dav_store\', null);\n"
+"what := case when ((length (subPath_parts) = 0) or (subPath_parts[length (subPath_parts) - 1] = \'\')) then \'C\' else \'R\' end;\n"
+"if ((what = \'R\') or (recursive = -1))\n"
+"return DB.DBA.S3_DAV_DIR_SINGLE (detcol_id, what, null, auth_uid);\n"
"\n"
-"cr := coalesce (cr, now ());\n"
-"mod := coalesce (mod, now ());\n"
-"cr := RDFData_cast_dt_silent (cr);\n"
-"mod := RDFData_cast_dt_silent (mod);\n"
+"colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);\n"
+"colId := DB.DBA.DAV_SEARCH_ID (colPath, \'C\');\n"
"\n"
-"tit := coalesce (L, T, PL);\n"
+"downloads := vector ();\n"
+"listItems := DB.DBA.S3__list (detcol_id, detcol_parts, subPath_parts);\n"
+"if (DAV_HIDE_ERROR (listItems) is null)\n"
+"goto _exit;\n"
"\n"
-"lg := \'\';\n"
-"if (is_all)\n"
-"tit := \'iid\';\n"
-"else if (tit is null)\n"
-"tit := \'~unnamed~\';\n"
-"else\n"
-"{\n"
-"lg := DB.DBA.RDF_LANGUAGE_OF_LONG (tit, \'\');\n"
-"tit := DB.DBA.RDF_SQLVAL_OF_LONG (tit);\n"
-"}\n"
+"if (isinteger (listItems))\n"
+"goto _exit;\n"
"\n"
-"if (filt_lg <> \'\' and lg <> \'\' and strstr (filt_lg, lg) is null)\n"
-"goto next_row;\n"
-"if (dict_get (dict, X) = 1)\n"
-"goto next_row;\n"
-"tit := sprintf (\'%s (%i).rdf\', tit, iri_id_num (iri_to_id (X)));\n"
+"DB.DBA.S3__activity (detcol_id, \'Sync started\');\n"
+"{\n"
+"declare _id, _what, _type, _content any;\n"
+"declare title varchar;\n"
+"{\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"DB.DBA.S3__activity (detcol_id, \'Exec error: \' || __SQL_MESSAGE);\n"
+"goto _exitSync;\n"
+"};\n"
"\n"
+"connection_set (\'dav_store\', 1);\n"
+"colEntry := DB.DBA.DAV_DIR_SINGLE_INT (colId, \'C\', \'\', null, null, http_dav_uid ());\n"
"\n"
-"vectorbld_acc (res,\n"
-"vector (\n"
-"DAV_CONCAT_PATH (top_davpath, tit),\n"
-"\'R\',\n"
-"0,\n"
-"mod,\n"
-"vector (UNAME\'RDFData\', detcol_id, cs, iri_to_id (X)),\n"
-"access,\n"
-"ownergid,\n"
-"owner_uid,\n"
-"cr,\n"
-"\'application/rdf+xml\',\n"
-"tit)\n"
-");\n"
-"dict_put (dict, X, 1);\n"
-"inc := inc + 1;\n"
-"if (inc > limit)\n"
-"goto end_loop;\n"
-"next_row:;\n"
+"listIds := vector ();\n"
+"davItems := DB.DBA.S3__davList (detcol_id, colId);\n"
+"foreach (any davItem in davItems) do\n"
+"{\n"
+"connection_set (\'dav_store\', 1);\n"
+"listID := DB.DBA.S3__paramGet (davItem[4], davItem[1], \'path\', 0);\n"
+"foreach (any listItem in listItems) do\n"
+"{\n"
+"title := get_keyword (\'name\', listItem);\n"
+"if ((listID = get_keyword (\'path\', listItem)) and (title = davItem[10]))\n"
+"{\n"
+"davEntry := DB.DBA.S3__paramGet (davItem[4], davItem[1], \'Entry\', 0);\n"
+"if (davEntry is not null)\n"
+"{\n"
+"listIds := vector_concat (listIds, vector (listID));\n"
+"davEntry := xtree_doc (davEntry);\n"
+"if (DB.DBA.S3__entryXPath (davEntry, \'/updated\', 1) <> datestring (get_keyword (\'updated\', listItem)))\n"
+"{\n"
+"set triggers off;\n"
+"DB.DBA.S3__paramSet (davItem[4], davItem[1], \':getlastmodified\', get_keyword (\'updated\', listItem), 0, 0);\n"
+"set triggers on;\n"
+"DB.DBA.S3__paramSet (davItem[4], davItem[1], \'Entry\', DB.DBA.S3__obj2xml (listItem), 0);\n"
"}\n"
-"end_loop:;\n"
-"exec_close (h);\n"
+"if (DB.DBA.S3__entryXPath (davEntry, \'/etag\', 1) <> get_keyword (\'etag\', listItem))\n"
+"{\n"
+"if (davItem[1] = \'R\')\n"
+"{\n"
+"DB.DBA.S3__paramSet (davItem[4], davItem[1], \'download\', \'0\', 0);\n"
+"downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));\n"
"}\n"
-"finalize_res:\n"
-"vectorbld_final (res);\n"
-"return res;\n"
"}\n"
-"--src DET_RDFData.sql:242\n";
-
-static const char *proc546 =
-"#line 465 \"[executable]/DET_RDFData.sql\"\n"
-"create function RDFData_std_pref (in iri varchar, in rev int := 0)\n"
+"else\n"
"{\n"
-"declare v any;\n"
-"v := vector (\n"
-"\'http://xmlns.com/foaf/0.1/\', \'foaf\',\n"
-"\'http://rdfs.org/sioc/ns#\', \'sioc\',\n"
-"\'http://www.w3.org/1999/02/22-rdf-syntax-ns#\', \'rdf\',\n"
-"\'http://www.w3.org/2000/01/rdf-schema#\', \'rdfs\',\n"
-"\'http://www.w3.org/2003/01/geo/wgs84_pos#\', \'geo\',\n"
-"\'http://atomowl.org/ontologies/atomrdf#\', \'aowl\',\n"
-"\'http://purl.org/dc/elements/1.1/\', \'dc\',\n"
-"\'http://purl.org/dc/terms/\', \'dct\',\n"
-"\'http://www.w3.org/2004/02/skos/core#\', \'skos\',\n"
-"\'http://rdfs.org/sioc/types#\', \'sioct\',\n"
-"\'http://sw.deri.org/2005/04/wikipedia/wikiont.owl#\', \'wiki\',\n"
-"\'http://www.w3.org/2002/01/bookmark#\', \'bm\',\n"
-"\'http://www.w3.org/2003/12/exif/ns/\', \'exif\',\n"
-"\'http://www.w3.org/2000/10/annotation-ns#\', \'ann\',\n"
-"\'http://purl.org/vocab/bio/0.1/\', \'bio\',\n"
-"\'http://www.w3.org/2001/vcard-rdf/3.0#\', \'vcard\',\n"
-"\'http://www.w3.org/2002/12/cal#\', \'vcal\',\n"
-"\'http://www.w3.org/2002/07/owl#\', \'owl\',\n"
-"\'http://web.resource.org/cc/\', \'cc\',\n"
-"\'http://dbpedia.org/class/yago/\', \'dbp\'\n"
+"declare downloaded integer;\n"
"\n"
-");\n"
-"if (rev)\n"
-"{\n"
-"declare nv, l any;\n"
-"nv := make_array (length (v), \'any\');\n"
-"for (declare i, j int, j := 0, i := length (v) - 1; i >= 0; i := i - 2, j := j + 2)\n"
+"downloaded := DB.DBA.S3__paramGet (davItem[4], davItem[1], \'download\', 0);\n"
+"if (downloaded is not null)\n"
"{\n"
-"nv[j] := v[i];\n"
-"nv[j+1] := v[i-1];\n"
+"downloaded := cast (downloaded as integer);\n"
+"if (downloaded <= 5)\n"
+"downloads := vector_concat (downloads, vector (vector (davItem[4], davItem[1])));\n"
"}\n"
-"return get_keyword (iri, nv, null);\n"
+"}\n"
+"goto _continue;\n"
+"}\n"
+"}\n"
+"}\n"
+"if (davItem[1] = \'R\')\n"
+"DB.DBA.S3__rdf_delete (detcol_id, davItem[4], davItem[1]);\n"
+"DAV_DELETE_INT (davItem[0], 1, null, null, 0, 0);\n"
+"\n"
+"_continue:;\n"
+"commit work;\n"
+"}\n"
+"foreach (any listItem in listItems) do\n"
+"{\n"
+"connection_set (\'dav_store\', 1);\n"
+"listID := get_keyword (\'path\', listItem);\n"
+"if (not position (listID, listIDs))\n"
+"{\n"
+"title := get_keyword (\'name\', listItem);\n"
+"connection_set (\'dav_store\', 1);\n"
+"if (get_keyword (\'type\', listItem) = \'C\')\n"
+"{\n"
+"_id := DB.DBA.DAV_COL_CREATE (colPath || title || \'/\', colEntry[5], colEntry[7], colEntry[6], DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()));\n"
+"_what := \'C\';\n"
"}\n"
"else\n"
-"return get_keyword (iri, v, null);\n"
+"{\n"
+"_content := \'\';\n"
+"_type := http_mime_type (title);\n"
+"_id := DB.DBA.DAV_RES_UPLOAD (colPath || title, _content, _type, colEntry[5], colEntry[7], colEntry[6], DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()));\n"
+"_what := \'R\';\n"
"}\n"
-"--src DET_RDFData.sql:463\n";
+"if (DAV_HIDE_ERROR (_id) is not null)\n"
+"{\n"
+"set triggers off;\n"
+"DB.DBA.S3__paramSet (_id, _what, \':creationdate\', get_keyword (\'updated\', listItem), 0, 0);\n"
+"DB.DBA.S3__paramSet (_id, _what, \':getlastmodified\', get_keyword (\'updated\', listItem), 0, 0);\n"
+"set triggers on;\n"
+"DB.DBA.S3__paramSet (_id, _what, \'path\', listID, 0);\n"
+"DB.DBA.S3__paramSet (_id, _what, \'virt:DETCOL_ID\', cast (detcol_id as varchar), 0, 0);\n"
+"DB.DBA.S3__paramSet (_id, _what, \'Entry\', DB.DBA.S3__obj2xml (listItem), 0);\n"
+"if (_what = \'R\')\n"
+"{\n"
+"DB.DBA.S3__paramSet (_id, _what, \'download\', \'0\', 0);\n"
+"downloads := vector_concat (downloads, vector (vector (_id, _what)));\n"
+"}\n"
+"}\n"
+"commit work;\n"
+"}\n"
+"}\n"
+"}\n"
+"_exitSync:\n"
+"connection_set (\'dav_store\', save);\n"
+"}\n"
+"DB.DBA.S3__activity (detcol_id, \'Sync ended\');\n"
+"\n"
+"_exit:;\n"
+"retValue := DB.DBA.S3__davList (detcol_id, colId);\n"
+"DB.DBA.S3__downloads (detcol_id, downloads);\n"
+"\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:380\n";
-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"
+static const char *proc582 =
+"#line 539 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_DIR_FILTER\" (\n"
+"in detcol_id any,\n"
+"in subPath_parts any,\n"
+"in detcol_parts varchar,\n"
+"inout compilation any,\n"
+"in recursive integer,\n"
+"in auth_uid integer) returns any\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
"\n"
"return vector();\n"
"}\n"
-"--src DET_RDFData.sql:505\n";
+"--src DET_S3.sql:537\n";
-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"
+static const char *proc583 =
+"#line 553 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_SEARCH_ID\" (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"in what char(1)) returns any\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"\n"
-"declare orig_id, ctr, len integer;\n"
-"declare r_id, cl_id, cl any;\n"
-"declare access, ownergid, owner_uid any;\n"
-"DB.DBA.\"RDFData_ACCESS_PARAMS\" (detcol_id, access, ownergid, owner_uid);\n"
"\n"
-"if (path_parts[0] = \'\' or path_parts[0] is null)\n"
-"return -1;\n"
-"if (path_parts[0] <> \'\')\n"
+"declare retValue, save any;\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"declare x, pos, pref, url any;\n"
-"cl := path_parts[0];\n"
-"pos := strchr (cl, \':\');\n"
-"pref := subseq (cl, 0, pos);\n"
-"url := RDFData_std_pref (pref, 1);\n"
-"if (url is null)\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
+"\n"
+"save := connection_get (\'dav_store\');\n"
+"connection_set (\'dav_store\', 1);\n"
+"retValue := DAV_SEARCH_ID (DB.DBA.S3__path (detcol_id, path_parts), what);\n"
+"\n"
+"connection_set (\'dav_store\', save);\n"
+"if ((DAV_HIDE_ERROR (retValue) is not null))\n"
"{\n"
-"cl := replace (cl, \'^2f\', \'/\');\n"
-"cl := replace (cl, \'^23\', \'#\');\n"
-"cl_id := iri_to_id (cl);\n"
+"if (isinteger (retValue) and (save is null))\n"
+"retValue := vector (DB.DBA.S3__detName (), detcol_id, retValue, what);\n"
"\n"
+"else if (isarray (retValue) and (save = 1))\n"
+"retValue := retValue[2];\n"
"}\n"
-"else\n"
-"{\n"
-"cl := subseq (cl, pos + 1);\n"
-"cl := url || cl;\n"
-"cl_id := iri_to_id (cl);\n"
+"return retValue;\n"
"}\n"
+"--src DET_S3.sql:551\n";
+
+static const char *proc584 =
+"#line 583 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_MAKE_ID\" (\n"
+"in detcol_id any,\n"
+"in id any,\n"
+"in what char(1)) returns any\n"
+"{\n"
+"\n"
+"declare retValue any;\n"
+"\n"
+"retValue := vector (DB.DBA.S3__detName (), detcol_id, id, what);\n"
+"\n"
+"return retValue;\n"
"}\n"
-"if (length (path_parts) = 2 and what = \'C\')\n"
+"--src DET_S3.sql:581\n";
+
+static const char *proc585 =
+"#line 598 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_SEARCH_PATH\" (\n"
+"in id any,\n"
+"in what char(1)) returns any\n"
"{\n"
-"return vector (UNAME\'RDFData\', detcol_id, cl_id, owner_uid);\n"
+"\n"
+"declare davId integer;\n"
+"declare retValue, save any;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
+"\n"
+"save := connection_get (\'dav_store\');\n"
+"connection_set (\'dav_store\', 1);\n"
+"davId := id[2];\n"
+"retValue := DB.DBA.DAV_SEARCH_PATH (davId, what);\n"
+"connection_set (\'dav_store\', save);\n"
+"\n"
+"return retValue;\n"
"}\n"
-"else if (length (path_parts) = 2 and path_parts[1] <> \'\' and what = \'R\')\n"
+"--src DET_S3.sql:596\n";
+
+static const char *proc586 =
+"#line 622 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_RES_UPLOAD_COPY\" (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"in source_id any,\n"
+"in what char(1),\n"
+"in overwrite_flags integer,\n"
+"in permissions varchar,\n"
+"in uid integer,\n"
+"in gid integer,\n"
+"in auth_uid integer) returns any\n"
"{\n"
-"declare t, arr any;\n"
-"t := path_parts[1];\n"
-"arr := sprintf_inverse (t, \'%s (%d).%s\', 1);\n"
-"if (3 > length (arr))\n"
-"return -1;\n"
-"r_id := iri_id_from_num (arr [1]);\n"
"\n"
-"return vector (UNAME\'RDFData\', detcol_id, cl_id, owner_uid, r_id);\n"
+"return -20;\n"
"}\n"
+"--src DET_S3.sql:620\n";
+
+static const char *proc587 =
+"#line 639 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_RES_UPLOAD_MOVE\" (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"in source_id any,\n"
+"in what char(1),\n"
+"in overwrite_flags integer,\n"
+"in auth_uid integer) returns any\n"
+"{\n"
+"\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:513\n";
+"--src DET_S3.sql:637\n";
-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"
+static const char *proc588 =
+"#line 654 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_RES_CONTENT\" (\n"
+"in id any,\n"
+"inout content any,\n"
+"out type varchar,\n"
+"in content_mode integer) returns integer\n"
"{\n"
-"declare col_path varchar;\n"
-"declare ret any;\n"
-"RDFData_log_message (current_proc_name ());\n"
"\n"
-"col_path := WS.WS.COL_PATH (id[1]);\n"
-"ret := sprintf (\'%s%s/iid (%d).rdf\', col_path, id_to_iri (id[2]), iri_id_num (id[4]));\n"
+"declare retValue any;\n"
"\n"
-"return ret;\n"
+"retValue := DAV_RES_CONTENT_INT (id[2], content, type, content_mode, 0);\n"
+"\n"
+"return retValue;\n"
"}\n"
-"--src DET_RDFData.sql:564\n";
+"--src DET_S3.sql:652\n";
-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"
+static const char *proc589 =
+"#line 670 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_SYMLINK\" (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"in source_id any,\n"
+"in what char(1),\n"
+"in overwrite integer,\n"
+"in uid integer,\n"
+"in gid integer,\n"
+"in auth_uid integer) returns any\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
+"\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:577\n";
+"--src DET_S3.sql:668\n";
-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"
+static const char *proc590 =
+"#line 686 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_DEREFERENCE_LIST\" (\n"
+"in detcol_id any,\n"
+"inout report_array any) returns any\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
+"\n"
"return -20;\n"
"}\n"
-"--src DET_RDFData.sql:584\n";
+"--src DET_S3.sql:684\n";
-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"
+static const char *proc591 =
+"#line 696 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_RESOLVE_PATH\" (\n"
+"in detcol_id any,\n"
+"inout reference_item any,\n"
+"inout old_base varchar,\n"
+"inout new_base varchar) returns any\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"declare iri, url, qr, _from any;\n"
-"declare path, params, lines, ses, gr any;\n"
"\n"
-"if (id [4] is null)\n"
"return -20;\n"
-"type := \'application/rdf+xml\';\n"
-"if (is_http_ctx ())\n"
-"{\n"
-"declare lpath varchar;\n"
-"lpath := http_path ();\n"
-"if (lpath like \'%.rdf\')\n"
-"type := \'application/rdf+xml\';\n"
-"else if (lpath like \'%.nt\')\n"
-"type := \'text/n3\';\n"
-"else if (lpath like \'%.txt\')\n"
-"type := \'text/plain\';\n"
-"else if (lpath like \'%.json\')\n"
-"type := \'application/json\';\n"
-"else\n"
-"type := \'text/rdf+n3\';\n"
"}\n"
-"iri := id_to_iri (id [4]);\n"
+"--src DET_S3.sql:694\n";
+
+static const char *proc592 =
+"#line 708 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_LOCK\" (\n"
+"in path any,\n"
+"in id any,\n"
+"in what char(1),\n"
+"inout locktype varchar,\n"
+"inout scope varchar,\n"
+"in token varchar,\n"
+"inout owner_name varchar,\n"
+"inout owned_tokens varchar,\n"
+"in depth varchar,\n"
+"in timeout_sec integer,\n"
+"in auth_uid integer) returns any\n"
+"{\n"
"\n"
-"_from := \'\';\n"
-"gr := DAV_PROP_GET_INT (id[1], \'C\', \'virt:rdfdata_graph\', 0);\n"
-"if (__proc_exists (\'sioc.DBA.get_graph\') is not null and gr = sioc.DBA.get_graph ())\n"
+"declare davId integer;\n"
+"declare retValue, save any;\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"declare pg any;\n"
-"declare tmp, uname any;\n"
-"declare pos int;\n"
-"pg := http_param (\'page\');\n"
-"if (not isstring (pg))\n"
-"pg := \'0\';\n"
-"pg := atoi (pg);\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
"\n"
+"save := connection_get (\'dav_store\');\n"
+"connection_set (\'dav_store\', 1);\n"
+"davId := id[2];\n"
+"retValue := DAV_LOCK_INT (path, davId, what, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, DB.DBA.S3__user (auth_uid), DB.DBA.S3__password (auth_uid), auth_uid);\n"
+"connection_set (\'dav_store\', save);\n"
"\n"
-"if (regexp_match (\'https?://([^/]*)/dataspace/(person|organization)/(.*)\', iri) is not null and iri not like \'%/online_account/%\')\n"
-"{\n"
-"tmp := sprintf_inverse (iri, \'http%s://%s/dataspace/%s/%s\', 0);\n"
-"tmp := tmp[3];\n"
-"pos := coalesce (strchr (tmp, \'#\'), strchr (tmp, \'/\'));\n"
-"if (pos is not null)\n"
-"uname := subseq (tmp, 0, pos);\n"
-"else\n"
-"uname := tmp;\n"
-"ses := sioc..compose_foaf (uname, type, pg);\n"
-"goto ret_place2;\n"
-"}\n"
-"else if (__proc_exists (\'sioc.DBA.ods_obj_describe\') is not null)\n"
-"{\n"
-"ses := sioc..ods_obj_describe (iri, type, pg);\n"
-"goto ret_place2;\n"
+"return retValue;\n"
"}\n"
-"else if (regexp_match (\'https?://([^/]*)/dataspace/([^/]*)(#this|/sioc.rdf|/sioc.n3)?\\x24\', iri) is not null\n"
-"and __proc_exists (\'sioc.DBA.ods_sioc_obj_describe\') is not null)\n"
+"--src DET_S3.sql:706\n";
+
+static const char *proc593 =
+"#line 741 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_UNLOCK\" (\n"
+"in id any,\n"
+"in what char(1),\n"
+"in token varchar,\n"
+"in auth_uid integer)\n"
"{\n"
-"tmp := sprintf_inverse (iri, \'http%s://%s/dataspace/%s\', 0);\n"
-"tmp := tmp[2];\n"
-"pos := coalesce (strchr (tmp, \'#\'), strchr (tmp, \'/\'));\n"
-"if (pos is not null)\n"
-"uname := subseq (tmp, 0, pos);\n"
-"else\n"
-"uname := tmp;\n"
-"ses := sioc..ods_sioc_obj_describe (uname, type, pg);\n"
-"goto ret_place2;\n"
-"}\n"
-"if (__proc_exists (\'sioc.DBA.ods_sioc_container_obj_describe\') is not null)\n"
+"\n"
+"declare davId integer;\n"
+"declare retValue, save any;\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"ses := sioc..ods_sioc_container_obj_describe (iri, type, pg);\n"
-"goto ret_place2;\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
+"\n"
+"save := connection_get (\'dav_store\');\n"
+"connection_set (\'dav_store\', 1);\n"
+"davId := id[2];\n"
+"retValue := DAV_UNLOCK_INT (davId, what, token, DB.DBA.S3__user (auth_uid), DB.DBA.S3__password (auth_uid), auth_uid);\n"
+"connection_set (\'dav_store\', save);\n"
+"\n"
+"return retValue;\n"
"}\n"
-"else\n"
+"--src DET_S3.sql:739\n";
+
+static const char *proc594 =
+"#line 768 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_IS_LOCKED\" (\n"
+"inout id any,\n"
+"inout what char(1),\n"
+"in owned_tokens varchar) returns integer\n"
"{\n"
-"DB.DBA.OdsIriDescribe (iri, type);\n"
-"goto ret_place;\n"
-"}\n"
-"}\n"
-"if (isstring (gr) and length (gr))\n"
-"_from := sprintf (\' FROM <%s>\', gr);\n"
"\n"
-"qr := sprintf (\'describe <%s> %s\', iri, _from);\n"
-"path := vector ();\n"
+"declare davId integer;\n"
+"declare retValue, save any;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
"\n"
-"params := vector (\'query\', qr, \'format\', \'application/rdf+xml\');\n"
-"lines := vector ();\n"
-"WS.WS.\"/!sparql/\" (path, params, lines);\n"
-"ret_place:\n"
-"ses := http_get_string_output (1);\n"
-"ret_place2:\n"
+"save := connection_get (\'dav_store\');\n"
+"connection_set (\'dav_store\', 1);\n"
+"davId := id[2];\n"
+"retValue := DAV_IS_LOCKED_INT (davId, what, owned_tokens);\n"
+"connection_set (\'dav_store\', save);\n"
"\n"
-"http_rewrite ();\n"
-"if (content_mode = 1)\n"
-"http (ses, content);\n"
-"else\n"
-"content := string_output_string (ses);\n"
-"return 0;\n"
+"return retValue;\n"
"}\n"
-"--src DET_RDFData.sql:591\n";
+"--src DET_S3.sql:766\n";
-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"
+static const char *proc595 =
+"#line 794 \"[executable]/DET_S3.sql\"\n"
+"create function \"S3_DAV_LIST_LOCKS\" (\n"
+"in id any,\n"
+"in what char(1),\n"
+"in recursive integer) returns any\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"return -20;\n"
+"\n"
+"declare davId integer;\n"
+"declare retValue, save any;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"connection_set (\'dav_store\', save);\n"
+"resignal;\n"
+"};\n"
+"\n"
+"save := connection_get (\'dav_store\');\n"
+"connection_set (\'dav_store\', 1);\n"
+"davId := id[2];\n"
+"retValue := DAV_LIST_LOCKS_INT (davId, what, recursive);\n"
+"connection_set (\'dav_store\', save);\n"
+"\n"
+"return retValue;\n"
"}\n"
-"--src DET_RDFData.sql:693\n";
+"--src DET_S3.sql:792\n";
-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"
+static const char *proc596 =
+"#line 820 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__encode (\n"
+"in S varchar)\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"return -20;\n"
+"S := sprintf (\'%U\', S);\n"
+"S := replace(S, \'\'\'\', \'%27\');\n"
+"S := replace(S, \'%2F\', \'/\');\n"
+"S := replace(S, \'%2C\', \',\');\n"
+"return S;\n"
"}\n"
-"--src DET_RDFData.sql:700\n";
+"--src DET_S3.sql:818\n";
-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"
+static const char *proc597 =
+"#line 833 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__md5 (\n"
+"in S varchar)\n"
"{\n"
-"return -20;\n"
+"declare md5_ctx, my_digest any;\n"
+"\n"
+"md5_ctx := md5_init ();\n"
+"md5_ctx := md5_update (md5_ctx, S);\n"
+"my_digest := md5_final (md5_ctx, 0);\n"
+"\n"
+"return encode_base64 (my_digest);\n"
"}\n"
-"--src DET_RDFData.sql:707\n";
+"--src DET_S3.sql:831\n";
-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"
+static const char *proc598 =
+"#line 848 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__detcolId (\n"
+"in id any)\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"return -20;\n"
+"if (isinteger (id))\n"
+"return id;\n"
+"\n"
+"return id[1];\n"
"}\n"
-"--src DET_RDFData.sql:713\n";
+"--src DET_S3.sql:846\n";
-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"
+static const char *proc599 =
+"#line 860 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__davId (\n"
+"in id any)\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"return -27;\n"
+"if (isinteger (id))\n"
+"return id;\n"
+"\n"
+"return id[2];\n"
"}\n"
-"--src DET_RDFData.sql:721\n";
+"--src DET_S3.sql:858\n";
-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"
+static const char *proc600 =
+"#line 872 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__user (\n"
+"in user_id integer,\n"
+"in default_id integer := null)\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"return 0;\n"
+"return coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = coalesce (user_id, default_id)), \'\');\n"
"}\n"
-"--src DET_RDFData.sql:728\n";
+"--src DET_S3.sql:870\n";
-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"
+static const char *proc601 =
+"#line 882 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__password (\n"
+"in user_id integer)\n"
"{\n"
-"RDFData_log_message (current_proc_name ());\n"
-"return vector ();\n"
+"return coalesce ((select pwd_magic_calc(U_NAME, U_PWD, 1) from WS.WS.SYS_DAV_USER where U_ID = user_id), \'\');\n"
"}\n"
-"--src DET_RDFData.sql:736\n";
+"--src DET_S3.sql:880\n";
-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"
+static const char *proc602 =
+"#line 891 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__owner (\n"
+"in detcol_id any,\n"
+"in subPath_parts any,\n"
+"in uid any,\n"
+"in gid any,\n"
+"inout ouid integer,\n"
+"inout ogid integer)\n"
"{\n"
-"declare colid int;\n"
-"colid := DAV_MAKE_DIR (path, http_dav_uid (), null, \'110100100N\');\n"
-"if (colid < 0)\n"
-"signal (\'42000\', \'Unable to create RDFData DET collection\');\n"
-"update WS.WS.SYS_DAV_COL set COL_DET=\'RDFData\' where COL_ID = colid;\n"
-"if (gr is not null)\n"
-"DAV_PROP_SET_INT (path, \'virt:rdfdata_graph\', gr, null, null, 0, 0, 1, http_dav_uid ());\n"
-"if (lg is not null)\n"
-"DAV_PROP_SET_INT (path, \'virt:rdfdata_lang\', lg, null, null, 0, 0, 1, http_dav_uid ());\n"
+"declare id any;\n"
+"declare path varchar;\n"
+"\n"
+"DB.DBA.DAV_OWNER_ID (uid, gid, ouid, ogid);\n"
+"if ((ouid = -12) or (ouid = 5))\n"
+"{\n"
+"path := DB.DBA.S3__path (detcol_id, subPath_parts);\n"
+"id := DB.DBA.DAV_SEARCH_ID (path, \'P\');\n"
+"if (DAV_HIDE_ERROR (id))\n"
+"{\n"
+"select COL_OWNER, COL_GROUP\n"
+"into ouid, ogid\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where COL_ID = id;\n"
"}\n"
-"--src DET_RDFData.sql:743\n";
-
-/* DET_S3.sql */
+"}\n"
+"}\n"
+"--src DET_S3.sql:889\n";
-static const char *proc561 =
-"#line 25 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__encode (\n"
-"in S varchar)\n"
-"{\n"
-"S := sprintf (\'%U\', S);\n"
-"S := replace(S, \'\'\'\', \'%27\');\n"
-"S := replace(S, \'%2F\', \'/\');\n"
-"return S;\n"
+static const char *proc603 =
+"#line 920 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__detName ()\n"
+"{\n"
+"return UNAME\'S3\';\n"
"}\n"
-"--src DET_S3.sql:23\n";
+"--src DET_S3.sql:918\n";
-static const char *proc562 =
-"#line 37 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__params (\n"
-"in colID integer,\n"
-"out bucket varchar,\n"
-"out accessCode varchar,\n"
-"out secretKey varchar)\n"
+static const char *proc604 =
+"#line 928 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__path (\n"
+"in detcol_id any,\n"
+"in subPath_parts any)\n"
"{\n"
-"bucket := DB.DBA.DAV_PROP_GET_INT (colID, \'C\', \'virt:S3-BucketName\', 0);\n"
-"accessCode := DB.DBA.DAV_PROP_GET_INT (colID, \'C\', \'virt:S3-AccessKeyID\', 0);\n"
-"secretKey := DB.DBA.DAV_PROP_GET_INT (colID, \'C\', \'virt:S3-SecretKey\', 0);\n"
+"declare N integer;\n"
+"declare path varchar;\n"
+"\n"
+"path := rtrim (DB.DBA.DAV_SEARCH_PATH (detcol_id, \'C\'), \'/\');\n"
+"for (N := 0; N < length (subPath_parts); N := N + 1)\n"
+"path := path || \'/\' || subPath_parts[N];\n"
+"\n"
+"return path;\n"
"}\n"
-"--src DET_S3.sql:35\n";
+"--src DET_S3.sql:926\n";
-static const char *proc563 =
-"#line 51 \"[executable]/DET_S3.sql\"\n"
+static const char *proc605 =
+"#line 945 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__parts2path (\n"
"in bucket varchar,\n"
"in pathParts any,\n"
"in what any)\n"
"{\n"
-"\n"
"declare path varchar;\n"
"\n"
"path := DB.DBA.DAV_CONCAT_PATH (pathParts, null);\n"
"if ((path <> \'\') and (chr (path[0]) <> \'/\'))\n"
"path := \'/\' || path;\n"
+"\n"
"if (bucket <> \'\')\n"
"path := \'/\' || bucket || path;\n"
"\n"
"path := rtrim (path, \'/\') || case when (what = \'C\') then \'/\' end;\n"
+"\n"
"return path;\n"
"}\n"
-"--src DET_S3.sql:49\n";
+"--src DET_S3.sql:943\n";
-static const char *proc564 =
-"#line 72 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__item2entry (\n"
-"in detcolID integer,\n"
-"in detcolPath varchar,\n"
-"in bucket varchar,\n"
-"in item any)\n"
+static const char *proc606 =
+"#line 967 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__workPath (\n"
+"in id any,\n"
+"in what any)\n"
"{\n"
+"declare path varchar;\n"
"\n"
-"declare entryPath, entryType varchar;\n"
-"declare detcolEntry any;\n"
+"path := DB.DBA.S3__paramGet (id, what, \'path\', 0);\n"
+"path := DB.DBA.S3__encode (path);\n"
+"if (trim (path, \'/\') <> DB.DBA.S3__bucketFromUrl (path))\n"
+"path := rtrim (path, \'/\') || case when (what = \'C\') then \'_\\$folder\\$\' end;\n"
"\n"
-"if (item is null)\n"
-"return null;\n"
+"path := DB.DBA.S3__pathFromUrl (path);\n"
+"return path;\n"
+"}\n"
+"--src DET_S3.sql:965\n";
+
+static const char *proc607 =
+"#line 985 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__params (\n"
+"in colId integer)\n"
+"{\n"
+"declare params any;\n"
"\n"
-"detcolEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcolID, \'C\', \'\', null, null, http_dav_uid ());\n"
-"entryPath := get_keyword (\'path\', item);\n"
-"if (not is_empty_or_null (bucket))\n"
-"entryPath := subseq (entryPath, length (bucket)+1);\n"
-"\n"
-"entryType := get_keyword (\'type\', item);\n"
-"if (\'C\' = entryType)\n"
-"return vector (detcolPath || ltrim (entryPath, \'/\'),\n"
-"entryType,\n"
-"get_keyword (\'size\', item),\n"
-"get_keyword (\'updated\', item),\n"
-"vector (UNAME\'S3\', detcolID, entryPath),\n"
-"detcolEntry[5],\n"
-"detcolEntry[6],\n"
-"detcolEntry[7],\n"
-"get_keyword (\'updated\', item),\n"
-"\'dav/unix-directory\',\n"
-"get_keyword (\'name\', item)\n"
-");\n"
-"if (\'R\' = entryType)\n"
-"return vector (detcolPath || ltrim (entryPath, \'/\'),\n"
-"entryType,\n"
-"get_keyword (\'size\', item),\n"
-"get_keyword (\'updated\', item),\n"
-"vector (UNAME\'S3\', detcolID, entryPath),\n"
-"detcolEntry[5],\n"
-"detcolEntry[6],\n"
-"detcolEntry[7],\n"
-"get_keyword (\'updated\', item),\n"
-"http_mime_type (detcolPath || entryPath),\n"
-"get_keyword (\'name\', item)\n"
+"colId := DB.DBA.S3__detcolId (colId);\n"
+"params := vector (\n"
+"\'authentication\', \'Yes\',\n"
+"\'bucket\', DB.DBA.S3__paramGet (colId, \'C\', \'BucketName\', 0),\n"
+"\'accessCode\', DB.DBA.S3__paramGet (colId, \'C\', \'AccessKeyID\', 0, 1, 0),\n"
+"\'secretKey\', DB.DBA.S3__paramGet (colId, \'C\', \'SecretKey\', 0, 1, 0),\n"
+"\'graph\', DB.DBA.S3__paramGet (colId, \'C\', \'graph\', 0)\n"
");\n"
+"return params;\n"
+"}\n"
+"--src DET_S3.sql:983\n";
+
+static const char *proc608 =
+"#line 1004 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__paramSet (\n"
+"in _id any,\n"
+"in _what varchar,\n"
+"in _propName varchar,\n"
+"in _propValue any,\n"
+"in _serialized integer := 1,\n"
+"in _prefixed integer := 1,\n"
+"in _encrypt integer := 0)\n"
+"{\n"
+"\n"
+"declare retValue any;\n"
+"\n"
+"if (_serialized)\n"
+"_propValue := serialize (_propValue);\n"
+"\n"
+"if (_encrypt)\n"
+"_propValue := pwd_magic_calc (\'s3\', _propValue);\n"
+"\n"
+"if (_prefixed)\n"
+"_propName := \'virt:S3-\' || _propName;\n"
+"\n"
+"_id := DB.DBA.S3__davId (_id);\n"
+"retValue := DB.DBA.DAV_PROP_SET_RAW (_id, _what, _propName, _propValue, 1, http_dav_uid ());\n"
+"\n"
+"return retValue;\n"
"}\n"
-"--src DET_S3.sql:70\n";
+"--src DET_S3.sql:1002\n";
-static const char *proc565 =
-"#line 121 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__headers2item (\n"
-"in headers varchat,\n"
-"in s3Path varchar,\n"
-"in what varchar)\n"
+static const char *proc609 =
+"#line 1034 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__paramGet (\n"
+"in _id any,\n"
+"in _what varchar,\n"
+"in _propName varchar,\n"
+"in _serialized integer := 1,\n"
+"in _prefixed integer := 1,\n"
+"in _decrypt integer := 0)\n"
"{\n"
-"declare item any;\n"
"\n"
-"item := vector (\'path\', s3Path,\n"
-"\'name\', DB.DBA.S3__getNameFromUrl (s3Path),\n"
-"\'type\', what,\n"
-"\'etag\', http_request_header (headers, \'ETag\'),\n"
-"\'size\', cast (http_request_header (headers, \'Content-Length\') as integer),\n"
-"\'mimeType\', http_request_header (headers, \'Content-Type\'),\n"
-"\'updated\', http_string_date (http_request_header (headers, \'Last-Modified\'))\n"
-");\n"
-"return item;\n"
+"declare propValue any;\n"
+"\n"
+"if (_prefixed)\n"
+"_propName := \'virt:S3-\' || _propName;\n"
+"\n"
+"propValue := DB.DBA.DAV_PROP_GET_INT (DB.DBA.S3__davId (_id), _what, _propName, 0, DB.DBA.S3__user (http_dav_uid ()), DB.DBA.S3__password (http_dav_uid ()), http_dav_uid ());\n"
+"if (isinteger (propValue))\n"
+"propValue := null;\n"
+"\n"
+"if (_serialized and not isnull (propValue))\n"
+"propValue := deserialize (propValue);\n"
+"\n"
+"if (_decrypt and not isnull (propValue))\n"
+"propValue := pwd_magic_calc (\'s3\', propValue, 1);\n"
+"\n"
+"return propValue;\n"
"}\n"
-"--src DET_S3.sql:119\n";
+"--src DET_S3.sql:1032\n";
-static const char *proc566 =
-"#line 143 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__makeHostUrl (\n"
+static const char *proc610 =
+"#line 1064 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__paramRemove (\n"
+"in _id any,\n"
+"in _what varchar,\n"
+"in _propName varchar,\n"
+"in _prefixed integer := 1)\n"
+"{\n"
+"\n"
+"if (_prefixed)\n"
+"_propName := \'virt:S3-\' || _propName;\n"
+"\n"
+"DB.DBA.DAV_PROP_REMOVE_RAW (DB.DBA.S3__davId (_id), _what, _propName, 1, http_dav_uid());\n"
+"}\n"
+"--src DET_S3.sql:1062\n";
+
+static const char *proc611 =
+"#line 1080 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__obj2xml (\n"
+"in item any)\n"
+"{\n"
+"return \'<entry>\' || ODS..obj2xml (item, 10) || \'</entry>\';\n"
+"}\n"
+"--src DET_S3.sql:1078\n";
+
+static const char *proc612 =
+"#line 1089 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__xml2string (\n"
+"in _xml any)\n"
+"{\n"
+"declare stream any;\n"
+"\n"
+"stream := string_output ();\n"
+"http_value (_xml, null, stream);\n"
+"return string_output_string (stream);\n"
+"}\n"
+"--src DET_S3.sql:1087\n";
+
+static const char *proc613 =
+"#line 1102 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__entryXPath (\n"
+"in _xml any,\n"
+"in _xpath varchar,\n"
+"in _cast integer := 0)\n"
+"{\n"
+"declare retValue any;\n"
+"\n"
+"if (_cast)\n"
+"{\n"
+"retValue := serialize_to_UTF8_xml (xpath_eval (sprintf (\'string (//entry%s)\', _xpath), _xml, 1));\n"
+"} else {\n"
+"retValue := xpath_eval (\'//entry\' || _xpath, _xml, 1);\n"
+"}\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:1100\n";
+
+static const char *proc614 =
+"#line 1121 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__entryXMLUpdate (\n"
+"in _xml any,\n"
+"in _tag varchar,\n"
+"in _value any)\n"
+"{\n"
+"declare _entity any;\n"
+"\n"
+"_entity := xpath_eval (sprintf (\'//entry/%s\', _tag), _xml);\n"
+"if (not isnull (_entity))\n"
+"_xml := XMLUpdate (_xml, (\'//entry/%s\', _tag), null);\n"
+"\n"
+"if (isnull (_value))\n"
+"return;\n"
+"\n"
+"_entity := xpath_eval (\'//entry\', _xml);\n"
+"XMLAppendChildren (_entity, xtree_doc (sprintf (\'<%s>%V</%s>\', _tag, cast (_value as varchar), _tag)));\n"
+"}\n"
+"--src DET_S3.sql:1119\n";
+
+static const char *proc615 =
+"#line 1142 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__removeKeyword (\n"
+"in name varchar,\n"
+"inout params any)\n"
+"{\n"
+"declare N integer;\n"
+"declare retValue any;\n"
+"\n"
+"retValue := vector ();\n"
+"for (N := 0; N < length (params); N := N + 2)\n"
+"if (params[N] <> name)\n"
+"retValue := vector_concat (retValue, vector (params[N], params[N+1]));\n"
+"\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:1140\n";
+
+static const char *proc616 =
+"#line 1160 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__makeUrl (\n"
"in path varchar,\n"
"in isSecure integer := 1)\n"
"{\n"
@@ -25065,25 +26613,27 @@ static const char *proc566 =
"s3URL := \'http://s3.amazonaws.com\';\n"
"}\n"
"path := ltrim (path, \'/\');\n"
-"bucket := DB.DBA.S3__getBucketFromUrl (path);\n"
+"bucket := DB.DBA.S3__bucketFromUrl (path);\n"
"dir := \'\';\n"
"if (length (bucket) < length (path))\n"
"dir := subseq (path, length (bucket)+1);\n"
"if ((lcase (bucket) = bucket) and (bucket <> \'\'))\n"
"{\n"
"hostUrl := s3Protocol || bucket || \'.s3.amazonaws.com/\' || dir;\n"
-"} else {\n"
+"}\n"
+"else\n"
+"{\n"
"if (bucket <> \'\')\n"
"bucket := bucket || \'/\';\n"
"hostUrl := s3Protocol || \'s3.amazonaws.com/\' || bucket || dir;\n"
"}\n"
"return hostUrl;\n"
"}\n"
-"--src DET_S3.sql:141\n";
+"--src DET_S3.sql:1158\n";
-static const char *proc567 =
-"#line 177 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__getBucketFromUrl (\n"
+static const char *proc617 =
+"#line 1196 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__bucketFromUrl (\n"
"in url varchar)\n"
"{\n"
"declare parts any;\n"
@@ -25091,13 +26641,14 @@ static const char *proc567 =
"parts := split_and_decode (trim (url, \'/\'), 0, \'\\0\\0/\');\n"
"if (length (parts) <> 0)\n"
"return parts[0];\n"
+"\n"
"return \'\';\n"
"}\n"
-"--src DET_S3.sql:175\n";
+"--src DET_S3.sql:1194\n";
-static const char *proc568 =
-"#line 191 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__getNameFromUrl (\n"
+static const char *proc618 =
+"#line 1211 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__nameFromUrl (\n"
"in url varchar)\n"
"{\n"
"declare parts any;\n"
@@ -25105,34 +26656,37 @@ static const char *proc568 =
"parts := split_and_decode (trim (url, \'/\'), 0, \'\\0\\0/\');\n"
"if (length (parts) <> 0)\n"
"return parts[length (parts) - 1];\n"
+"\n"
"return \'\';\n"
"}\n"
-"--src DET_S3.sql:189\n";
+"--src DET_S3.sql:1209\n";
-static const char *proc569 =
-"#line 205 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__getPathFromUrl (\n"
+static const char *proc619 =
+"#line 1226 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__pathFromUrl (\n"
"in url varchar)\n"
"{\n"
"declare bucket any;\n"
"\n"
-"bucket := DB.DBA.S3__getBucketFromUrl (url);\n"
+"bucket := DB.DBA.S3__bucketFromUrl (url);\n"
"if (isnull (bucket))\n"
"return \'\';\n"
+"\n"
"return ltrim (subseq (url, length (bucket)+1), \'/\');\n"
"}\n"
-"--src DET_S3.sql:203\n";
+"--src DET_S3.sql:1224\n";
-static const char *proc570 =
-"#line 219 \"[executable]/DET_S3.sql\"\n"
+static const char *proc620 =
+"#line 1241 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__makeAWSHeader (\n"
-"in accessCode varchar,\n"
-"in secretKey varchar,\n"
+"in params any,\n"
"in authHeader varchar,\n"
"in authMode integer := 0)\n"
"{\n"
-"declare S, T, hmacKey varchar;\n"
+"declare S, T, hmacKey, secretKey, accessCode varchar;\n"
"\n"
+"accessCode := get_keyword (\'accessCode\', params);\n"
+"secretKey := get_keyword (\'secretKey\', params);\n"
"hmacKey := xenc_key_RAW_read (null, encode_base64 (secretKey));\n"
"S := xenc_hmac_sha1_digest (authHeader, hmacKey);\n"
"xenc_key_remove (hmacKey);\n"
@@ -25142,35 +26696,150 @@ static const char *proc570 =
"\n"
"return T;\n"
"}\n"
-"--src DET_S3.sql:217\n";
+"--src DET_S3.sql:1239\n";
-static const char *proc571 =
-"#line 240 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__getBuckets (\n"
-"in accessCode varchar,\n"
-"in secretKey varchar,\n"
+static const char *proc621 =
+"#line 1263 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__exec_error (\n"
+"in _header any,\n"
+"in _silent integer := 0)\n"
+"{\n"
+"if ((_header[0] like \'HTTP/1._ 4__ %\') or (_header[0] like \'HTTP/1._ 5__ %\'))\n"
+"{\n"
+"if (not _silent)\n"
+"signal (\'22023\', trim (_header[0], \'\\r\\n\'));\n"
+"\n"
+"return 0;\n"
+"}\n"
+"return 1;\n"
+"}\n"
+"--src DET_S3.sql:1261\n";
+
+static const char *proc622 =
+"#line 1280 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__exec_code (\n"
+"in _header any)\n"
+"{\n"
+"return subseq (_header[0], 9, 12);\n"
+"}\n"
+"--src DET_S3.sql:1278\n";
+
+static const char *proc623 =
+"#line 1289 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__davList (\n"
+"inout detcol_id integer,\n"
+"inout colId integer)\n"
+"{\n"
+"declare retValue any;\n"
+"\n"
+"vectorbld_init (retValue);\n"
+"for (select vector (RES_FULL_PATH,\n"
+"\'R\',\n"
+"length (RES_CONTENT),\n"
+"RES_MOD_TIME,\n"
+"vector (DB.DBA.S3__detName (), detcol_id, RES_ID, \'R\'),\n"
+"RES_PERMS,\n"
+"RES_GROUP,\n"
+"RES_OWNER,\n"
+"RES_CR_TIME,\n"
+"RES_TYPE,\n"
+"RES_NAME ) as I\n"
+"from WS.WS.SYS_DAV_RES\n"
+"where RES_COL = DB.DBA.S3__davId (colId)) do\n"
+"{\n"
+"vectorbld_acc (retValue, i);\n"
+"}\n"
+"\n"
+"for (select vector (WS.WS.COL_PATH (COL_ID),\n"
+"\'C\',\n"
+"0,\n"
+"COL_MOD_TIME,\n"
+"vector (DB.DBA.S3__detName (), detcol_id, COL_ID, \'C\'),\n"
+"COL_PERMS,\n"
+"COL_GROUP,\n"
+"COL_OWNER,\n"
+"COL_CR_TIME,\n"
+"\'dav/unix-directory\',\n"
+"COL_NAME) as I\n"
+"from WS.WS.SYS_DAV_COL\n"
+"where COL_PARENT = DB.DBA.S3__davId (colId)) do\n"
+"{\n"
+"vectorbld_acc (retValue, i);\n"
+"}\n"
+"\n"
+"vectorbld_final (retValue);\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:1287\n";
+
+static const char *proc624 =
+"#line 1337 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__list (\n"
+"inout detcol_id any,\n"
+"inout detcol_parts varchar,\n"
+"inout subPath_parts varchar)\n"
+"{\n"
+"\n"
+"declare colId integer;\n"
+"declare colPath, bucket varchar;\n"
+"declare syncTime datetime;\n"
+"declare retValue, retHeader, params any;\n"
+"\n"
+"colPath := DB.DBA.DAV_CONCAT_PATH (detcol_parts, subPath_parts);\n"
+"colId := DB.DBA.S3__davId (DB.DBA.DAV_SEARCH_ID (colPath, \'C\'));\n"
+"if (DAV_HIDE_ERROR (colId) is null)\n"
+"return -28;\n"
+"\n"
+"syncTime := DB.DBA.S3__paramGet (colId, \'C\', \'syncTime\');\n"
+"if (not isnull (syncTime) and (datediff (\'second\', syncTime, now ()) < 300))\n"
+"return 0;\n"
+"\n"
+"params := DB.DBA.S3__params (detcol_id);\n"
+"bucket := get_keyword (\'bucket\', params);\n"
+"if (is_empty_or_null (bucket) and (length (subPath_parts) = 1) and subPath_parts[0] = \'\')\n"
+"{\n"
+"retValue := DB.DBA.S3__listBuckets (detcol_id, params);\n"
+"}\n"
+"else\n"
+"{\n"
+"retValue := DB.DBA.S3__listBucket (detcol_id, params, DB.DBA.S3__parts2path (bucket, subPath_parts, \'C\'));\n"
+"}\n"
+"if (not isinteger (retValue))\n"
+"DB.DBA.S3__paramSet (colId, \'C\', \'syncTime\', now ());\n"
+"\n"
+"return retValue;\n"
+"}\n"
+"--src DET_S3.sql:1335\n";
+
+static const char *proc625 =
+"#line 1376 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__listBuckets (\n"
+"inout detcol_id any,\n"
+"in params any,\n"
"in bucket varchar := null)\n"
"{\n"
"\n"
"declare dateUTC, authHeader, path, S varchar;\n"
-"declare reqHdr, resHdr varchar;\n"
+"declare reqHeader, retHeader varchar;\n"
"declare xt, xtItems, buckets any;\n"
"\n"
"path := \'/\';\n"
"dateUTC := date_rfc1123 (now());\n"
"S := sprintf (\'GET\\n\\n\\n%s\\n%s\', dateUTC, path);\n"
-"authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);\n"
-"reqHdr := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"\n"
"commit work;\n"
-"xt := http_client_ext (DB.DBA.S3__makeHostUrl (path),\n"
+"xt := http_client_ext (\n"
+"DB.DBA.S3__makeUrl (path),\n"
"http_method=>\'GET\',\n"
-"http_headers=>reqHdr,\n"
-"headers=>resHdr);\n"
-"\n"
-"if (resHdr[0] like \'HTTP/1._ 4__ %\' or resHdr[0] like \'HTTP/1._ 5__ %\')\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader\n"
+");\n"
+"if (not DB.DBA.S3__exec_error (retHeader, 1))\n"
"{\n"
-"\n"
-"return null;\n"
+"DB.DBA.S3__activity (detcol_id, \'HTTP error: \' || xt);\n"
+"return -28;\n"
"}\n"
"buckets := vector ();\n"
"xt := xml_tree_doc (xt);\n"
@@ -25183,7 +26852,11 @@ static const char *proc571 =
"if ((name = bucket) or isnull (bucket))\n"
"{\n"
"creationDate := stringdate (cast (xpath_eval (\'./CreationDate\', xtItem) as varchar));\n"
-"buckets := vector_concat (buckets, vector (\n"
+"buckets := vector_concat (\n"
+"buckets,\n"
+"vector (\n"
+"vector_concat (\n"
+"subseq (soap_box_structure (\'x\', 1), 0, 2),\n"
"vector (\'path\', \'/\' || name || \'/\',\n"
"\'name\', name,\n"
"\'type\', \'C\',\n"
@@ -25191,719 +26864,586 @@ static const char *proc571 =
"\'size\', 0\n"
")\n"
")\n"
+")\n"
");\n"
"}\n"
"}\n"
"return buckets;\n"
"}\n"
-"--src DET_S3.sql:238\n";
+"--src DET_S3.sql:1374\n";
-static const char *proc572 =
-"#line 296 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__getBucket (\n"
-"in accessCode varchar,\n"
-"in secretKey varchar,\n"
+static const char *proc626 =
+"#line 1437 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__listBucket (\n"
+"inout detcol_id any,\n"
+"in params any,\n"
"in url varchar,\n"
"in delimiter varchar := \'/\')\n"
"{\n"
"\n"
"declare N integer;\n"
"declare dateUTC, authHeader, S, bucket, bucketPath varchar;\n"
-"declare reqHdr, resHdr, params varchar;\n"
+"declare reqHeader, retHeader varchar;\n"
"declare xt, xtItems, buckets any;\n"
"\n"
-"\n"
-"\n"
-"bucket := \'/\' || DB.DBA.S3__getBucketFromUrl (url) || \'/\';\n"
-"bucketPath := DB.DBA.S3__getPathFromUrl (url);\n"
+"bucket := \'/\' || DB.DBA.S3__bucketFromUrl (url) || \'/\';\n"
+"bucketPath := DB.DBA.S3__pathFromUrl (url);\n"
"dateUTC := date_rfc1123 (now());\n"
"S := sprintf (\'GET\\n\\n\\n%s\\n%s\', dateUTC, bucket);\n"
-"authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);\n"
-"reqHdr := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
-"params := sprintf (\'?prefix=%U&marker=%s&delimiter=%s\', bucketPath, \'\', delimiter);\n"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"\n"
"commit work;\n"
-"xt := http_client_ext (url=>DB.DBA.S3__makeHostUrl (bucket) || params,\n"
+"xt := http_client_ext (\n"
+"url=>DB.DBA.S3__makeUrl (bucket) || sprintf (\'?prefix=%U&marker=%s&delimiter=%s\', bucketPath, \'\', delimiter),\n"
"http_method=>\'GET\',\n"
-"http_headers=>reqHdr,\n"
-"headers=>resHdr);\n"
-"\n"
-"if (resHdr[0] like \'HTTP/1._ 4__ %\' or resHdr[0] like \'HTTP/1._ 5__ %\')\n"
-"{\n"
-"\n"
-"return null;\n"
-"}\n"
-"\n"
-"buckets := vector ();\n"
-"xt := xml_tree_doc (xt);\n"
-"xtItems := xpath_eval (\'//Contents\', xt, 0);\n"
-"foreach (any xtItem in xtItems) do\n"
-"{\n"
-"declare keyName, itemPath, itemName, itemType, lastModified, itemSize, itemETag any;\n"
-"\n"
-"keyName := cast (xpath_eval (\'./Key\', xtItem) as varchar);\n"
-"keyName := replace (keyName, bucketPath, \'\');\n"
-"itemName := replace (keyName, \'_\\$folder\\$\', \'\');\n"
-"itemType := case when (itemName <> keyName) then \'C\' else \'R\' end;\n"
-"itemPath := url || itemName || case when (itemType = \'C\') then \'/\' end;\n"
-"lastModified := stringdate (cast (xpath_eval (\'./LastModified\', xtItem) as varchar));\n"
-"itemSize := cast (xpath_eval (\'./Size\', xtItem) as integer);\n"
-"itemETag := cast (xpath_eval (\'./ETag\', xtItem) as varchar);\n"
-"buckets := vector_concat (buckets, vector (\n"
-"vector (\'path\', itemPath,\n"
-"\'name\', itemName,\n"
-"\'type\', itemType,\n"
-"\'updated\', lastModified,\n"
-"\'size\', itemSize,\n"
-"\'etag\', itemETag\n"
-")\n"
-")\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader\n"
");\n"
-"}\n"
-"return buckets;\n"
-"}\n"
-"--src DET_S3.sql:294\n";
-
-static const char *proc573 =
-"#line 361 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__putObject (\n"
-"in accessCode varchar,\n"
-"in secretKey varchar,\n"
-"in s3Path varchar,\n"
-"inout s3Content any,\n"
-"inout s3Type any)\n"
-"{\n"
-"\n"
-"declare dateUTC, authHeader, S, what, workPath varchar;\n"
-"declare reqHdr, resHdr, xt varchar;\n"
-"\n"
-"what := case when (chr (s3Path [length (s3Path) - 1]) = \'/\') then \'C\' else \'R\' end;\n"
-"workPath := DB.DBA.S3__encode (s3Path);\n"
-"if (trim (s3Path, \'/\') <> DB.DBA.S3__getBucketFromUrl (s3Path))\n"
-"workPath := rtrim (workPath, \'/\') || case when (what = \'C\') then \'_\\$folder\\$\' end;\n"
-"dateUTC := date_rfc1123 (now());\n"
-"S := sprintf (\'PUT\\n\\n%s\\n%s\\n%s\', coalesce (s3Type, \'\'), dateUTC, workPath);\n"
-"authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);\n"
-"reqHdr := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
-"if (not isnull (s3Type))\n"
-"reqHdr := sprintf (\'%s\\r\\nContent-Type: %s\', reqHdr, s3Type);\n"
-"if (not isnull (s3Content))\n"
-"reqHdr := sprintf (\'%s\\r\\nContent-Length: %d\', reqHdr, length(s3Content));\n"
-"commit work;\n"
-"\n"
-"xt := http_client_ext (url=>DB.DBA.S3__makeHostUrl (workPath),\n"
-"http_method=>\'PUT\',\n"
-"http_headers=>reqHdr,\n"
-"headers=>resHdr,\n"
-"body=>s3Content);\n"
-"if (resHdr[0] like \'HTTP/1._ 4__ %\' or resHdr[0] like \'HTTP/1._ 5__ %\')\n"
-"{\n"
-"\n"
-"return -1;\n"
-"}\n"
-"return 1;\n"
-"}\n"
-"--src DET_S3.sql:359\n";
-
-static const char *proc574 =
-"#line 402 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__headObject (\n"
-"in accessCode varchar,\n"
-"in secretKey varchar,\n"
-"in s3Path varchar,\n"
-"in what varchar,\n"
-"in s3Mode integer := 1)\n"
-"{\n"
-"\n"
-"declare dateUTC, authHeader, S, workPath varchar;\n"
-"declare reqHdr, resHdr varchar;\n"
-"declare item, xt any;\n"
-"\n"
-"item := connection_get (\'S3__\' || s3Path);\n"
-"if (isnull (item))\n"
-"{\n"
-"if (trim (s3Path, \'/\') = DB.DBA.S3__getBucketFromUrl (s3Path))\n"
-"{\n"
-"\n"
-"item := DB.DBA.S3__getBuckets (accessCode, secretKey, trim (s3Path, \'/\'));\n"
-"if (length (item) < 1)\n"
-"return null;\n"
-"item := item[0];\n"
-"} else {\n"
-"\n"
-"workPath := DB.DBA.S3__encode (s3Path);\n"
-"workPath := rtrim (workPath, \'/\') || case when (what = \'C\') then \'_\\$folder\\$\' end;\n"
-"dateUTC := date_rfc1123 (now());\n"
-"S := sprintf (\'HEAD\\n\\n\\n%s\\n%s\', dateUTC, workPath);\n"
-"authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);\n"
-"reqHdr := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
-"commit work;\n"
-"xt := http_client_ext (url=>DB.DBA.S3__makeHostUrl (workPath),\n"
-"http_method=>\'HEAD\',\n"
-"http_headers=>reqHdr,\n"
-"headers=>resHdr);\n"
-"if (resHdr[0] like \'HTTP/1._ 4__ %\' or resHdr[0] like \'HTTP/1._ 5__ %\')\n"
+"if (not DB.DBA.S3__exec_error (retHeader, 1))\n"
"{\n"
-"\n"
-"return null;\n"
-"}\n"
-"item := DB.DBA.S3__headers2item (resHdr, s3Path, what);\n"
-"}\n"
-"connection_set (\'S3__\' || s3Path, item);\n"
-"}\n"
-"if (s3Mode)\n"
-"return 1;\n"
-"return item;\n"
+"DB.DBA.S3__activity (detcol_id, \'HTTP error: \' || xt);\n"
+"return -28;\n"
"}\n"
-"--src DET_S3.sql:400\n";
-
-static const char *proc575 =
-"#line 454 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__getObject (\n"
-"in accessCode varchar,\n"
-"in secretKey varchar,\n"
-"in s3Path varchar)\n"
-"{\n"
-"\n"
-"declare dateUTC, authHeader, S, what, workPath varchar;\n"
-"declare reqHdr, resHdr varchar;\n"
-"declare xt, item any;\n"
-"\n"
-"workPath := DB.DBA.S3__encode (s3Path);\n"
-"what := case when (chr (s3Path [length (s3Path) - 1]) = \'/\') then \'C\' else \'R\' end;\n"
-"workPath := rtrim (workPath, \'/\') || case when (what = \'C\') then \'_\\$folder\\$\' end;\n"
-"dateUTC := date_rfc1123 (now());\n"
-"S := sprintf (\'GET\\n\\n\\n%s\\n%s\', dateUTC, workPath);\n"
-"authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);\n"
-"reqHdr := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
-"commit work;\n"
-"xt := http_client_ext (url=>DB.DBA.S3__makeHostUrl (workPath),\n"
-"http_method=>\'GET\',\n"
-"http_headers=>reqHdr,\n"
-"headers=>resHdr);\n"
-"if (resHdr[0] like \'HTTP/1._ 4__ %\' or resHdr[0] like \'HTTP/1._ 5__ %\')\n"
+"buckets := vector ();\n"
+"xt := xml_tree_doc (xt);\n"
+"xtItems := xpath_eval (\'//Contents\', xt, 0);\n"
+"foreach (any xtItem in xtItems) do\n"
"{\n"
+"declare keyName, itemPath, itemName, itemType, lastModified, itemSize, itemETag, itemStorage any;\n"
"\n"
-"return null;\n"
+"keyName := serialize_to_UTF8_xml (xpath_eval (\'string (./Key)\', xtItem));\n"
+"keyName := replace (keyName, bucketPath, \'\');\n"
+"itemName := replace (keyName, \'_\\$folder\\$\', \'\');\n"
+"itemType := case when (itemName <> keyName) then \'C\' else \'R\' end;\n"
+"itemPath := url || itemName || case when (itemType = \'C\') then \'/\' end;\n"
+"lastModified := stringdate (cast (xpath_eval (\'./LastModified\', xtItem) as varchar));\n"
+"itemSize := cast (xpath_eval (\'./Size\', xtItem) as integer);\n"
+"itemETag := cast (xpath_eval (\'./ETag\', xtItem) as varchar);\n"
+"itemStorage := cast (xpath_eval (\'./StorageClass\', xtItem) as varchar);\n"
+"buckets := vector_concat (\n"
+"buckets,\n"
+"vector (\n"
+"vector_concat (\n"
+"subseq (soap_box_structure (\'x\', 1), 0, 2),\n"
+"vector (\'path\', itemPath,\n"
+"\'name\', itemName,\n"
+"\'type\', itemType,\n"
+"\'updated\', lastModified,\n"
+"\'size\', itemSize,\n"
+"\'etag\', itemETag,\n"
+"\'storage\', itemStorage\n"
+")\n"
+")\n"
+")\n"
+");\n"
"}\n"
-"\n"
-"item := vector_concat (vector (\'content\', xt), DB.DBA.S3__headers2item (resHdr, s3Path, what));\n"
-"return item;\n"
+"return buckets;\n"
"}\n"
-"--src DET_S3.sql:452\n";
+"--src DET_S3.sql:1435\n";
-static const char *proc576 =
-"#line 489 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.S3__deleteObject (\n"
-"in accessCode varchar,\n"
-"in secretKey varchar,\n"
-"in s3Path varchar)\n"
+static const char *proc627 =
+"#line 1507 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__putObject (\n"
+"in detcol_id any,\n"
+"in path_parts any,\n"
+"in what varchar,\n"
+"in content any := null,\n"
+"in type any := null)\n"
"{\n"
"\n"
-"declare dateUTC, authHeader, S, what, workPath varchar;\n"
-"declare reqHdr, resHdr varchar;\n"
-"declare items, xt any;\n"
+"declare dateUTC, authHeader, S, path, s3Path, workPath varchar;\n"
+"declare reqHeader, retHeader, retValue, acl varchar;\n"
+"declare params, item any;\n"
+"declare path, what, encryption varchar;\n"
+"declare id, davEntry any;\n"
"\n"
+"params := DB.DBA.S3__params (detcol_id);\n"
"dateUTC := date_rfc1123 (now());\n"
-"what := case when (chr (s3Path [length (s3Path) - 1]) = \'/\') then \'C\' else \'R\' end;\n"
-"items := vector (vector (\'path\', s3Path));\n"
-"if (what = \'c\')\n"
-"items := vector_concat (items, DB.DBA.S3__getBucket (accessCode, secretKey, s3Path, \'\'));\n"
+"s3Path := DB.DBA.S3__parts2path (get_keyword (\'bucket\', params), path_parts, what);\n"
"\n"
-"foreach (any item in items) do\n"
-"{\n"
-"s3Path := get_keyword (\'path\', item);\n"
-"what := case when (chr (s3Path [length (s3Path) - 1]) = \'/\') then \'C\' else \'R\' end;\n"
"workPath := DB.DBA.S3__encode (s3Path);\n"
-"if (trim (s3Path, \'/\') <> DB.DBA.S3__getBucketFromUrl (s3Path))\n"
+"if (trim (s3Path, \'/\') <> DB.DBA.S3__bucketFromUrl (s3Path))\n"
"workPath := rtrim (workPath, \'/\') || case when (what = \'C\') then \'_\\$folder\\$\' end;\n"
-"S := sprintf (\'DELETE\\n\\n\\n%s\\n%s\', dateUTC, workPath);\n"
-"authHeader := DB.DBA.S3__makeAWSHeader (accessCode, secretKey, S);\n"
-"reqHdr := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
-"commit work;\n"
-"http_client_ext (url=>DB.DBA.S3__makeHostUrl (workPath),\n"
-"http_method=>\'DELETE\',\n"
-"http_headers=>reqHdr,\n"
-"headers=>resHdr);\n"
-"if (resHdr[0] like \'HTTP/1._ 4__ %\' or resHdr[0] like \'HTTP/1._ 5__ %\')\n"
-"{\n"
-"\n"
-"return -1;\n"
-"}\n"
-"connection_set (\'S3__\' || s3Path, null);\n"
-"}\n"
-"return 1;\n"
-"}\n"
-"--src DET_S3.sql:487\n";
-
-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"
"\n"
-"if (auth_uid >= 0)\n"
-"return auth_uid;\n"
-"return -12;\n"
-"}\n"
-"--src DET_S3.sql:531\n";
-
-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"
"\n"
-"declare rc integer;\n"
-"declare puid, pgid integer;\n"
-"declare u_password, pperms varchar;\n"
-"declare allow_anon integer;\n"
+"S := sprintf (\'GET\\n\\n\\n%s\\n%s\', dateUTC, workPath || \'?acl\');\n"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"commit work;\n"
+"acl := http_client_ext (\n"
+"url=>DB.DBA.S3__makeUrl (workPath) || \'?acl\',\n"
+"http_method=>\'GET\',\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader\n"
+");\n"
+"if (not DB.DBA.S3__exec_error (retHeader, 1))\n"
+"acl := null;\n"
"\n"
-"if (length (req) <> 3)\n"
-"return -15;\n"
"\n"
-"whenever not found goto nf_col_or_res;\n"
-"puid := http_dav_uid();\n"
-"pgid := coalesce\n"
-"(\n"
-"( select G_ID\n"
-"from WS.WS.SYS_DAV_GROUP\n"
-"where G_NAME = \'S3_\' || coalesce ((select COL_NAME\n"
-"from WS.WS.SYS_DAV_COL\n"
-"where COL_ID = id[1] and COL_DET = \'S3\'), \'\')\n"
-"),\n"
-"puid+1\n"
-");\n"
-"pperms := \'110100100NN\';\n"
-"if ((what <> \'R\') and (what <> \'C\'))\n"
-"return -14;\n"
-"allow_anon := WS.WS.PERM_COMP (substring (cast (pperms as varchar), 7, 3), req);\n"
-"if (a_uid is null)\n"
+"encryption := connection_get (\'amz-server-side-encryption\');\n"
+"if (isnull (encryption))\n"
"{\n"
-"if ((not allow_anon) or (\'\' <> WS.WS.FINDPARAM (a_lines, \'Authorization:\')))\n"
-"rc := WS.WS.GET_DAV_AUTH (a_lines, allow_anon, can_write_http, a_uname, u_password, a_uid, a_gid, _perms);\n"
-"if (rc < 0)\n"
-"return rc;\n"
-"}\n"
-"if (isinteger (a_uid))\n"
+"path := DB.DBA.S3__path (detcol_id, path_parts);\n"
+"what := case when ((length (path_parts) = 0) or (path_parts[length (path_parts) - 1] = \'\')) then \'C\' else \'R\' end;\n"
+"id := DB.DBA.DAV_SEARCH_ID (path, what);\n"
+"if (DB.DBA.DAV_HIDE_ERROR (id) is not null)\n"
"{\n"
-"if (a_uid < 0)\n"
-"return a_uid;\n"
-"if (a_uid = 1)\n"
+"davEntry := DB.DBA.S3__paramGet (id, what, \'Entry\', 0);\n"
+"if (davEntry is not null)\n"
"{\n"
-"a_uid := http_nobody_uid ();\n"
-"a_gid := http_nogroup_gid ();\n"
+"davEntry := xtree_doc (davEntry);\n"
+"encryption := DB.DBA.S3__entryXPath (davEntry, \'/amz-server-side-encryption\', 1);\n"
"}\n"
"}\n"
-"if (DAV_CHECK_PERM (pperms, req, a_uid, a_gid, pgid, puid))\n"
-"return a_uid;\n"
-"return -13;\n"
-"\n"
-"nf_col_or_res:\n"
-"return -1;\n"
"}\n"
-"--src DET_S3.sql:545\n";
-
-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"
+"if (coalesce (encryption, \'\') = \'AES256\')\n"
"{\n"
-"\n"
-"return -20;\n"
+"encryption := sprintf (\'x-amz-server-side-encryption:%s\', encryption);\n"
+"S := sprintf (\'PUT\\n\\n%s\\n%s\\n%s\\n%s\', coalesce (type, \'\'), dateUTC, encryption, workPath);\n"
+"} else {\n"
+"encryption := \'\';\n"
+"S := sprintf (\'PUT\\n\\n%s\\n%s\\n%s\', coalesce (type, \'\'), dateUTC, workPath);\n"
"}\n"
-"--src DET_S3.sql:601\n";
-
-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"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"if (not isnull (type))\n"
+"reqHeader := sprintf (\'%s\\r\\nContent-Type: %s\', reqHeader, type);\n"
+"if (not isnull (content))\n"
+"reqHeader := sprintf (\'%s\\r\\nContent-Length: %d\', reqHeader, length (content));\n"
"\n"
-"declare bucket, accessCode, secretKey, s3Path, s3Content, s3Type varchar;\n"
+"if (coalesce (encryption, \'\') <> \'\')\n"
+"reqHeader := sprintf (\'%s\\r\\n%s\', reqHeader, encryption);\n"
"\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"s3Path := DB.DBA.S3__parts2path (bucket, pathParts, \'C\');\n"
-"s3Content := null;\n"
-"s3Type := null;\n"
-"if (DB.DBA.S3__putObject (accessCode, secretKey, s3Path, s3Content, s3Type) < 1)\n"
-"return -1;\n"
-"return vector (UNAME\'S3\', detcolID, s3Path);\n"
-"}\n"
-"--src DET_S3.sql:610\n";
-
-static const char *proc581 =
-"#line 628 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.\"S3_DAV_DELETE\" (\n"
-"in detcolID any,\n"
-"in pathParts any,\n"
-"in what char(1),\n"
-"in silent integer,\n"
-"in auth_uid integer) returns integer\n"
+"commit work;\n"
+"retValue := http_client_ext (\n"
+"url=>DB.DBA.S3__makeUrl (workPath),\n"
+"http_method=>\'PUT\',\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader,\n"
+"body=>content\n"
+");\n"
+"if (not DB.DBA.S3__exec_error (retHeader, 1))\n"
"{\n"
-"\n"
-"declare bucket, accessCode, secretKey, s3Path varchar;\n"
-"\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"s3Path := DB.DBA.S3__parts2path (bucket, pathParts, what);\n"
-"return DB.DBA.S3__deleteObject (accessCode, secretKey, s3Path);\n"
+"DB.DBA.S3__activity (detcol_id, \'HTTP error: \' || retValue);\n"
+"return -28;\n"
"}\n"
-"--src DET_S3.sql:626\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:656\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"
+"if (not isnull (acl))\n"
"{\n"
+"S := sprintf (\'PUT\\n\\n\\n%s\\n%s\', dateUTC, workPath || \'?acl\');\n"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"commit work;\n"
+"acl := http_client_ext (\n"
+"url=>DB.DBA.S3__makeUrl (workPath) || \'?acl\',\n"
+"http_method=>\'PUT\',\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader,\n"
+"body=>acl\n"
+");\n"
+"}\n"
"\n"
-"if (propname[0] = 58)\n"
-"return -16;\n"
"\n"
-"return -20;\n"
-"}\n"
-"--src DET_S3.sql:665\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"
+"S := sprintf (\'HEAD\\n\\n\\n%s\\n%s\', dateUTC, workPath);\n"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"commit work;\n"
+"retValue := http_client_ext (\n"
+"url=>DB.DBA.S3__makeUrl (workPath),\n"
+"http_method=>\'HEAD\',\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader\n"
+");\n"
+"if (not DB.DBA.S3__exec_error (retHeader, 1))\n"
"{\n"
-"\n"
-"return -11;\n"
+"DB.DBA.S3__activity (detcol_id, \'HTTP error: \' || retValue);\n"
+"return -28;\n"
"}\n"
-"--src DET_S3.sql:676\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"
+"item := vector_concat (\n"
+"subseq (soap_box_structure (\'x\', 1), 0, 2),\n"
+"vector (\'path\', s3Path,\n"
+"\'name\', DB.DBA.S3__nameFromUrl (s3Path),\n"
+"\'type\', what,\n"
+"\'etag\', http_request_header (retHeader, \'ETag\'),\n"
+"\'size\', cast (http_request_header (retHeader, \'Content-Length\') as integer),\n"
+"\'mimeType\', http_request_header (retHeader, \'Content-Type\'),\n"
+"\'updated\', http_string_date (coalesce (http_request_header (retHeader, \'Last-Modified\', null, null), http_request_header (retHeader, \'Date\', null, null))),\n"
+"\'storage\', \'STANDARD\',\n"
+"\'amz-server-side-encryption\', http_request_header (retHeader, \'x-amz-server-side-encryption\', null, null),\n"
+"\'amz-request-id\', http_request_header (retHeader, \'x-amz-request-id\', null, null),\n"
+"\'amz-id-2\', http_request_header (retHeader, \'x-amz-id-2\', null, null)\n"
+")\n"
+");\n"
+"return item;\n"
"}\n"
-"--src DET_S3.sql:685\n";
+"--src DET_S3.sql:1505\n";
-static const char *proc587 =
-"#line 695 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.\"S3_DAV_DIR_SINGLE\" (\n"
+static const char *proc628 =
+"#line 1645 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__deleteObject (\n"
+"in detcol_id any,\n"
+"in path varchar,\n"
"in id any,\n"
-"in what char(0),\n"
-"in path any,\n"
-"in auth_uid integer) returns any\n"
-"{\n"
-"\n"
-"declare detcolID integer;\n"
-"declare bucket, accessCode, secretKey, detcolPath, s3Path varchar;\n"
-"declare s3Object any;\n"
-"\n"
-"detcolID := id[1];\n"
-"s3Path := id[2];\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"s3Object := DB.DBA.S3__headObject (accessCode, secretKey, s3Path, what, 0);\n"
-"if (isnull (s3Object))\n"
-"return -1;\n"
-"detcolPath := DB.DBA.DAV_SEARCH_PATH (detcolID, \'C\');\n"
-"return DB.DBA.S3__item2entry (detcolID, detcolPath, bucket, s3Object);\n"
-"}\n"
-"--src DET_S3.sql:693\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"
-"in detcol_pathParts any,\n"
-"in name_mask varchar,\n"
-"in recursive integer,\n"
-"in auth_uid integer) returns any\n"
+"in what varchar)\n"
"{\n"
"\n"
"declare N integer;\n"
-"declare bucket, accessCode, secretKey, s3Path varchar;\n"
-"declare detcolPath varchar;\n"
-"declare res, items any;\n"
+"declare dateUTC, authHeader, S, s3Path, workPath varchar;\n"
+"declare reqHeader, retHeader, retValue, content varchar;\n"
+"declare params any;\n"
+"\n"
+"params := DB.DBA.S3__params (detcol_id);\n"
+"dateUTC := date_rfc1123 (now());\n"
+"s3Path := DB.DBA.S3__paramGet (id, what, \'path\', 0);\n"
"\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"if (is_empty_or_null (bucket) and (length (pathParts) = 1) and pathParts[0] = \'\')\n"
+"N := 0;\n"
+"content := \'<?xml version=\"1.0\" encoding=\"UTF-8\"?><Delete><Quiet>false</Quiet>\';\n"
+"if ((what = \'R\') or (trim (s3Path, \'/\') <> DB.DBA.S3__bucketFromUrl (s3Path)))\n"
"{\n"
-"s3Path := \'/\';\n"
-"items := DB.DBA.S3__getBuckets (accessCode, secretKey);\n"
+"N := N + 1;\n"
+"content := content || sprintf (\'<Object><Key>%V</Key></Object>\', DB.DBA.S3__workPath (id, what));\n"
"}\n"
-"else\n"
+"if (what = \'C\')\n"
"{\n"
-"s3Path := DB.DBA.S3__parts2path (bucket, pathParts, \'C\');\n"
-"items := DB.DBA.S3__getBucket (accessCode, secretKey, s3Path);\n"
+"for (select COL_ID from WS.WS.SYS_DAV_COL where WS.WS.COL_PATH (COL_ID) like path || \'%\' and WS.WS.COL_PATH (COL_ID) <> path) do\n"
+"{\n"
+"N := N + 1;\n"
+"content := content || sprintf (\'<Object><Key>%V</Key></Object>\', DB.DBA.S3__workPath (COL_ID, \'C\'));\n"
"}\n"
-"detcolPath := DB.DBA.DAV_CONCAT_PATH (detcol_pathParts, \'/\');\n"
-"res := vector ();\n"
-"for (N := 0; N < length (items); N := N + 1)\n"
+"for (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH like path || \'%\') do\n"
"{\n"
-"res := vector_concat (res, vector (DB.DBA.S3__item2entry (detcolID, detcolPath, bucket, items[N])));\n"
+"N := N + 1;\n"
+"content := content || sprintf (\'<Object><Key>%V</Key></Object>\', DB.DBA.S3__workPath (RES_ID, \'R\'));\n"
"}\n"
-"return res;\n"
"}\n"
-"--src DET_S3.sql:716\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"
+"content := content || \'</Delete>\';\n"
+"if (N = 0)\n"
+"goto _skip;\n"
"\n"
-"return vector();\n"
-"}\n"
-"--src DET_S3.sql:752\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"
-"in what char(1)) returns any\n"
+"workPath := DB.DBA.S3__encode (\'/\' || DB.DBA.S3__bucketFromUrl (s3Path) || \'/\');\n"
+"S := sprintf (\'POST\\n%s\\n%s\\n%s\\n%s\', DB.DBA.S3__md5 (content), \'text/xml\', dateUTC, workPath || \'?delete\');\n"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\n"
+"\'Authorization: %s\\r\\n\' ||\n"
+"\'Date: %s\\r\\n\' ||\n"
+"\'Content-MD5: %s\\r\\n\' ||\n"
+"\'Content-Type: %s\\r\\n\' ||\n"
+"\'Content-Length: %d\\r\\n\',\n"
+"authHeader,\n"
+"dateUTC,\n"
+"DB.DBA.S3__md5 (content),\n"
+"\'text/xml\',\n"
+"length (content)\n"
+");\n"
+"commit work;\n"
+"retValue := http_client_ext (\n"
+"url=>DB.DBA.S3__makeUrl (workPath) || \'?delete\',\n"
+"http_method=>\'POST\',\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader,\n"
+"body=>content\n"
+");\n"
+"if (not DB.DBA.S3__exec_error (retHeader, 1))\n"
"{\n"
+"DB.DBA.S3__activity (detcol_id, \'HTTP error: \' || retValue);\n"
+"return -28;\n"
+"}\n"
"\n"
-"declare bucket, accessCode, secretKey, s3Path varchar;\n"
-"declare s3Object any;\n"
+"_skip:;\n"
+"if ((what = \'C\') and (trim (s3Path, \'/\') = DB.DBA.S3__bucketFromUrl (s3Path)))\n"
+"{\n"
"\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"s3Path := DB.DBA.S3__parts2path (bucket, pathParts, what);\n"
-"s3Object := DB.DBA.S3__headObject (accessCode, secretKey, s3Path, what, 1);\n"
-"if (isnull (s3Object))\n"
-"return -1;\n"
-"return vector (UNAME\'S3\', detcolID, s3Path);\n"
+"workPath := DB.DBA.S3__encode (s3Path);\n"
+"S := sprintf (\'DELETE\\n\\n\\n%s\\n%s\', dateUTC, workPath);\n"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"commit work;\n"
+"retValue := http_client_ext (\n"
+"url=>DB.DBA.S3__makeUrl (workPath),\n"
+"http_method=>\'DELETE\',\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader\n"
+");\n"
+"if (not DB.DBA.S3__exec_error (retHeader, 1))\n"
+"{\n"
+"DB.DBA.S3__activity (detcol_id, \'HTTP error: \' || retValue);\n"
+"return -28;\n"
"}\n"
-"--src DET_S3.sql:760\n";
+"}\n"
+"return 1;\n"
+"}\n"
+"--src DET_S3.sql:1643\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"
+static const char *proc629 =
+"#line 1741 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__activity (\n"
+"in detcol_id integer,\n"
+"in text varchar)\n"
+"{\n"
+"\n"
+"declare parentId integer;\n"
+"declare parentPath varchar;\n"
+"declare activity_id integer;\n"
+"declare activity, activityName, activityPath, activityContent, activityType varchar;\n"
+"declare davEntry any;\n"
+"declare _errorCount integer;\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
+"if (__SQL_STATE = \'40001\')\n"
+"{\n"
+"rollback work;\n"
+"if (_errorCount > 5)\n"
+"resignal;\n"
"\n"
-"declare detcolID integer;\n"
-"declare bucket, accessCode, secretKey, detcolPath, s3Path varchar;\n"
-"declare s3Object any;\n"
-"\n"
-"detcolID := id[1];\n"
-"detcolPath := coalesce ((select WS.WS.COL_PATH (COL_ID) from WS.WS.SYS_DAV_COL where COL_ID = detcolID and COL_DET = \'S3\'));\n"
-"if (detcolPath is null)\n"
-"return -23;\n"
-"s3Path := id[2];\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"s3Object := DB.DBA.S3__headObject (accessCode, secretKey, s3Path, what, 0);\n"
-"if (isnull (s3Object))\n"
-"return -23;\n"
-"return rtrim (detcolPath, \'/\') || get_keyword (\'path\', s3Object);\n"
+"delay (1);\n"
+"_errorCount := _errorCount + 1;\n"
+"goto _start;\n"
"}\n"
-"--src DET_S3.sql:779\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"
-"inout content any,\n"
-"in type varchar,\n"
-"in permissions varchar,\n"
-"in uid integer,\n"
-"in gid integer,\n"
-"in auth_uid integer) returns any\n"
-"{\n"
+"return;\n"
+"};\n"
"\n"
-"declare bucket, accessCode, secretKey, s3Path varchar;\n"
+"_errorCount := 0;\n"
"\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"s3Path := DB.DBA.S3__parts2path (bucket, pathParts, \'R\');\n"
-"if (DB.DBA.S3__putObject (accessCode, secretKey, s3Path, content, type) < 1)\n"
-"return -1;\n"
-"return vector (UNAME\'S3\', detcolID, s3Path);\n"
-"}\n"
-"--src DET_S3.sql:801\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"
+"_start:;\n"
+"activity := DB.DBA.S3__paramGet (detcol_id, \'C\', \'activity\', 0);\n"
+"if (activity is null)\n"
+"return;\n"
"\n"
-"if (what = \'R\')\n"
-"{\n"
-"declare bucket, accessCode, secretKey, s3Path varchar;\n"
+"if (activity <> \'on\')\n"
+"return;\n"
"\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"s3Path := DB.DBA.S3__parts2path (bucket, pathParts, \'R\');\n"
+"davEntry := DB.DBA.DAV_DIR_SINGLE_INT (detcol_id, \'C\', \'\', null, null, http_dav_uid ());\n"
+"if (DB.DBA.DAV_HIDE_ERROR (davEntry) is null)\n"
+"return;\n"
"\n"
-"declare rc integer;\n"
-"declare sourceContent, sourceMimeType any;\n"
+"parentId := DB.DBA.DAV_SEARCH_ID (davEntry[0], \'P\');\n"
+"if (DB.DBA.DAV_HIDE_ERROR (parentId) is null)\n"
+"return;\n"
"\n"
-"rc := DB.DBA.DAV_RES_CONTENT_INT (sourceID, sourceContent, sourceMimeType, 0, 0);\n"
-"if (rc < 0)\n"
-"return rc;\n"
+"parentPath := DB.DBA.DAV_SEARCH_PATH (parentId, \'C\');\n"
+"if (DB.DBA.DAV_HIDE_ERROR (parentPath) is null)\n"
+"return;\n"
"\n"
-"sourceContent := case when (__tag (sourceContent) = 126) then blob_to_string (sourceContent) else sourceContent end;\n"
-"if (DB.DBA.S3__putObject (accessCode, secretKey, s3Path, sourceContent, sourceMimeType) < 1)\n"
-"return -28;\n"
+"activityContent := \'\';\n"
+"activityName := davEntry[10] || \'_activity.log\';\n"
+"activityPath := parentPath || activityName;\n"
+"activity_id := DB.DBA.DAV_SEARCH_ID (activityPath, \'R\');\n"
+"if (DB.DBA.DAV_HIDE_ERROR (activity_id) is not null)\n"
+"{\n"
+"DB.DBA.DAV_RES_CONTENT_INT (activity_id, activityContent, activityType, 0, 0);\n"
+"if (activityType <> \'text/plain\')\n"
+"return;\n"
"\n"
-"return vector (UNAME\'S3\', detcolID, s3Path);\n"
+"activityContent := cast (activityContent as varchar);\n"
"}\n"
-"return -20;\n"
+"activityContent := activityContent || sprintf (\'%s %s\\r\\n\', subseq (datestring (now ()), 0, 19), text);\n"
+"activityType := \'text/plain\';\n"
+"DB.DBA.DAV_RES_UPLOAD_STRSES_INT (activityPath, activityContent, activityType, \'110100000RR\', DB.DBA.S3__user (davEntry[6]), DB.DBA.S3__user (davEntry[7]), extern=>0, check_locks=>0);\n"
+"commit work;\n"
+"}\n"
+"--src DET_S3.sql:1739\n";
+
+static const char *proc630 =
+"#line 1810 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__downloads (\n"
+"in detcol_id integer,\n"
+"in downloads any)\n"
+"{\n"
+"declare aq any;\n"
+"\n"
+"if (length (downloads) = 0)\n"
+"return;\n"
+"\n"
+"set_user_id (\'dba\');\n"
+"aq := async_queue (1);\n"
+"aq_request (aq, \'DB.DBA.S3__downloads_aq\', vector (detcol_id, downloads));\n"
"}\n"
-"--src DET_S3.sql:823\n";
+"--src DET_S3.sql:1808\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"
+static const char *proc631 =
+"#line 1827 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__downloads_aq (\n"
+"in detcol_id integer,\n"
+"in downloads any)\n"
"{\n"
"\n"
-"if (what = \'R\')\n"
-"{\n"
-"declare rc integer;\n"
-"declare sourcePath, sourceContent, sourceMimeType any;\n"
-"declare bucket, accessCode, secretKey, s3Path varchar;\n"
+"declare N, downloaded integer;\n"
+"declare url, listID varchar;\n"
+"declare params, items, boxItem, listEntry, davEntry any;\n"
+"declare retValue, authHeader, reqHeader, retHeader any;\n"
+"declare S, dateUTC, path varchar;\n"
"\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"s3Path := DB.DBA.S3__parts2path (bucket, pathParts, \'R\');\n"
+"set_user_id (\'dba\');\n"
+"N := 0;\n"
+"items := vector ();\n"
+"DB.DBA.S3__activity (detcol_id, sprintf (\'Downloading %d file(s)\', length (downloads)));\n"
+"params := DB.DBA.S3__params (detcol_id);\n"
+"foreach (any download in downloads) do\n"
+"{\n"
+"downloaded := DB.DBA.S3__paramGet (download[0], download[1], \'download\', 0);\n"
+"if (downloaded is null)\n"
+"goto _continue;\n"
"\n"
-"rc := DB.DBA.DAV_RES_CONTENT_INT (sourceID, sourceContent, sourceMimeType, 0, 0);\n"
-"if (rc < 0)\n"
-"return rc;\n"
+"downloaded := cast (downloaded as integer);\n"
+"if (downloaded > 5)\n"
+"goto _continue;\n"
"\n"
-"sourceContent := case when (__tag (sourceContent) = 126) then blob_to_string (sourceContent) else sourceContent end;\n"
-"if (DB.DBA.S3__putObject (accessCode, secretKey, s3Path, sourceContent, sourceMimeType) < 1)\n"
-"return -28;\n"
+"listID := DB.DBA.S3__paramGet (download[0], download[1], \'path\', 0);\n"
+"if (listID is null)\n"
+"goto _continue;\n"
"\n"
-"sourcePath := DB.DBA.DAV_SEARCH_PATH (sourceID, \'R\');\n"
-"if (not isnull (sourcePath))\n"
-"DB.DBA.DAV_DELETE_INT (sourcePath, 1, null, null, 0);\n"
+"path := DB.DBA.S3__encode (listID);\n"
+"dateUTC := date_rfc1123 (now());\n"
+"S := sprintf (\'GET\\n\\n\\n%s\\n%s\', dateUTC, path);\n"
+"authHeader := DB.DBA.S3__makeAWSHeader (params, S);\n"
+"reqHeader := sprintf (\'Authorization: %s\\r\\nDate: %s\', authHeader, dateUTC);\n"
+"retValue := http_client_ext (url=>DB.DBA.S3__makeUrl (path),\n"
+"http_method=>\'GET\',\n"
+"http_headers=>reqHeader,\n"
+"headers=>retHeader);\n"
+"if (DAV_HIDE_ERROR (retValue) is not null)\n"
+"{\n"
+"update WS.WS.SYS_DAV_RES set RES_CONTENT = retValue where RES_ID = DB.DBA.S3__davId (download[0]);\n"
+"DB.DBA.S3__paramRemove (download[0], download[1], \'download\');\n"
+"davEntry := DB.DBA.S3__paramGet (download[0], download[1], \'Entry\', 0);\n"
+"if (davEntry is not null)\n"
+"{\n"
+"davEntry := xtree_doc (davEntry);\n"
+"DB.DBA.S3__entryXMLUpdate (davEntry, \'amz-server-side-encryption\', http_request_header (retHeader, \'x-amz-server-side-encryption\', null, null));\n"
+"DB.DBA.S3__entryXMLUpdate (davEntry, \'amz-request-id\', http_request_header (retHeader, \'x-amz-request-id\', null, null));\n"
+"DB.DBA.S3__entryXMLUpdate (davEntry, \'amz-id-2\', http_request_header (retHeader, \'x-amz-id-2\', null, null));\n"
+"DB.DBA.S3__paramSet (download[0], download[1], \'Entry\', DB.DBA.S3__xml2string (davEntry), 0);\n"
+"}\n"
+"items := vector_concat (items, vector (download));\n"
+"N := N + 1;\n"
+"}\n"
+"commit work;\n"
"\n"
-"return vector (UNAME\'S3\', detcolID, s3Path);\n"
+"_continue:;\n"
+"}\n"
+"DB.DBA.S3__activity (detcol_id, sprintf (\'Downloaded %d file(s)\', N));\n"
+"foreach (any item in items) do\n"
+"{\n"
+"DB.DBA.S3__rdf_delete (detcol_id, item[0], item[1]);\n"
+"DB.DBA.S3__rdf_insert (detcol_id, item[0], item[1]);\n"
"}\n"
-"return -20;\n"
"}\n"
-"--src DET_S3.sql:851\n";
+"--src DET_S3.sql:1825\n";
-static const char *proc595 =
-"#line 885 \"[executable]/DET_S3.sql\"\n"
-"create function DB.DBA.\"S3_DAV_RES_CONTENT\" (\n"
+static const char *proc632 =
+"#line 1897 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__rdf (\n"
+"in detcol_id integer,\n"
"in id any,\n"
-"inout content any,\n"
-"out type varchar,\n"
-"in content_mode integer) returns integer\n"
+"in what varchar)\n"
"{\n"
+"declare aq any;\n"
"\n"
-"declare detcolID integer;\n"
-"declare bucket, accessCode, secretKey, s3Path varchar;\n"
-"declare s3Object, s3Content any;\n"
-"\n"
-"detcolID := id[1];\n"
-"s3Path := id[2];\n"
-"DB.DBA.S3__params (detcolID, bucket, accessCode, secretKey);\n"
-"\n"
-"s3Object := DB.DBA.S3__getObject (accessCode, secretKey, s3Path);\n"
-"if (isnull (s3Object))\n"
-"return -1;\n"
-"\n"
-"s3Content := get_keyword (\'content\', s3Object);\n"
-"type := get_keyword (\'mimeType\', s3Object);\n"
-"if ((content_mode = 0) or (content_mode = 2))\n"
-"content := s3Content;\n"
-"else if (content_mode = 1)\n"
-"http (s3Content, content);\n"
-"else if (content_mode = 3)\n"
-"http (s3Content);\n"
-"\n"
-"return 0;\n"
+"set_user_id (\'dba\');\n"
+"aq := async_queue (1);\n"
+"aq_request (aq, \'DB.DBA.S3__rdf_aq\', vector (detcol_id, id, what));\n"
"}\n"
-"--src DET_S3.sql:883\n";
+"--src DET_S3.sql:1895\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"
+static const char *proc633 =
+"#line 1912 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__rdf_aq (\n"
+"in detcol_id integer,\n"
+"in id any,\n"
+"in what varchar)\n"
"{\n"
-"\n"
-"return -20;\n"
+"set_user_id (\'dba\');\n"
+"DB.DBA.S3__rdf_delete (detcol_id, id, what);\n"
+"DB.DBA.S3__rdf_insert (detcol_id, id, what);\n"
"}\n"
-"--src DET_S3.sql:916\n";
+"--src DET_S3.sql:1910\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"
+static const char *proc634 =
+"#line 1925 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__rdf_insert (\n"
+"in detcol_id integer,\n"
+"in id any,\n"
+"in what varchar,\n"
+"in rdf_graph varchar := null)\n"
"{\n"
"\n"
-"return -20;\n"
-"}\n"
-"--src DET_S3.sql:924\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"
+"declare permissions, rdf_graph2 varchar;\n"
+"declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;\n"
+"declare path, content, type any;\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
+"return;\n"
+"};\n"
"\n"
-"return -20;\n"
-"}\n"
-"--src DET_S3.sql:932\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"
+"if (isnull (rdf_graph))\n"
+"rdf_graph := DB.DBA.S3__paramGet (detcol_id, \'C\', \'graph\', 0);\n"
+"\n"
+"if (DB.DBA.is_empty_or_null (rdf_graph))\n"
+"return;\n"
+"\n"
+"permissions := DB.DBA.S3__paramGet (detcol_id, \'C\', \':virtpermissions\', 0, 0);\n"
+"if (permissions[6] = ascii(\'0\'))\n"
"{\n"
"\n"
-"return -20;\n"
+"if (not SIOC..private_graph_check (rdf_graph))\n"
+"return;\n"
"}\n"
-"--src DET_S3.sql:940\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"
+"id := DB.DBA.S3__davId (id);\n"
+"path := DB.DBA.DAV_SEARCH_PATH (id, what);\n"
+"content := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_ID = id);\n"
+"type := (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = id);\n"
+"rdf_sponger := coalesce (DB.DBA.S3__paramGet (detcol_id, \'C\', \'sponger\', 0), \'on\');\n"
+"rdf_cartridges := coalesce (DB.DBA.S3__paramGet (detcol_id, \'C\', \'cartridges\', 0), \'\');\n"
+"rdf_metaCartridges := coalesce (DB.DBA.S3__paramGet (detcol_id, \'C\', \'metaCartridges\', 0), \'\');\n"
+"\n"
+"RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges);\n"
"}\n"
-"--src DET_S3.sql:948\n";
+"--src DET_S3.sql:1923\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"
+static const char *proc635 =
+"#line 1968 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__rdf_delete (\n"
+"in detcol_id integer,\n"
+"in id any,\n"
+"in what varchar,\n"
+"in rdf_graph varchar := null)\n"
"{\n"
"\n"
-"declare rc integer;\n"
-"declare orig_id any;\n"
-"declare orig_type char(1);\n"
-"\n"
+"declare rdf_graph2 varchar;\n"
+"declare path varchar;\n"
"\n"
-"orig_id := id;\n"
-"orig_type := type;\n"
+"if (isnull (rdf_graph))\n"
+"rdf_graph := DB.DBA.S3__paramGet (detcol_id, \'C\', \'graph\', 0);\n"
"\n"
-"ID := orig_id[1];\n"
-"Type := \'C\';\n"
-"rc := DB.DBA.DAV_IS_LOCKED_INT (id, type, owned_tokens);\n"
+"if (DB.DBA.is_empty_or_null (rdf_graph))\n"
+"return;\n"
"\n"
+"path := DB.DBA.DAV_SEARCH_PATH (id, what);\n"
+"if (path like \'%.gz\')\n"
+"path := regexp_replace (path, \'\\.gz\\x24\', \'\');\n"
"\n"
-"id := orig_id;\n"
-"Type := orig_type;\n"
-"if (rc <> 0)\n"
-"return rc;\n"
-"return 0;\n"
+"rdf_graph2 := \'http://local.virt\' || path;\n"
+"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 DET_S3.sql:957\n";
+"--src DET_S3.sql:1966\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"
+static const char *proc636 =
+"#line 1996 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.S3__refresh (\n"
+"in path varchar)\n"
"{\n"
"\n"
-"return vector ();\n"
+"declare colId any;\n"
+"\n"
+"colId := DB.DBA.DAV_SEARCH_ID (path, \'C\');\n"
+"if (DAV_HIDE_ERROR (colId) is not null)\n"
+"DB.DBA.S3__paramRemove (colId, \'C\', \'syncTime\');\n"
"}\n"
-"--src DET_S3.sql:983\n";
+"--src DET_S3.sql:1994\n";
/* DET_DynaRes.sql */
@@ -25930,7 +27470,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 *proc603 =
+static const char *proc637 =
"#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"
@@ -25951,7 +27491,7 @@ static const char *proc603 =
"}\n"
"--src DET_DynaRes.sql:49\n";
-static const char *proc604 =
+static const char *proc638 =
"#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"
@@ -25975,7 +27515,7 @@ static const char *proc604 =
"}\n"
"--src DET_DynaRes.sql:70\n";
-static const char *proc605 =
+static const char *proc639 =
"#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"
@@ -26027,7 +27567,7 @@ static const char *proc605 =
"}\n"
"--src DET_DynaRes.sql:97\n";
-static const char *proc606 =
+static const char *proc640 =
"#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"
@@ -26038,7 +27578,7 @@ static const char *proc606 =
"}\n"
"--src DET_DynaRes.sql:149\n";
-static const char *proc607 =
+static const char *proc641 =
"#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"
@@ -26047,7 +27587,7 @@ static const char *proc607 =
"}\n"
"--src DET_DynaRes.sql:160\n";
-static const char *proc608 =
+static const char *proc642 =
"#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"
@@ -26056,7 +27596,7 @@ static const char *proc608 =
"}\n"
"--src DET_DynaRes.sql:168\n";
-static const char *proc609 =
+static const char *proc643 =
"#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"
@@ -26065,7 +27605,7 @@ static const char *proc609 =
"}\n"
"--src DET_DynaRes.sql:176\n";
-static const char *proc610 =
+static const char *proc644 =
"#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"
@@ -26081,7 +27621,7 @@ static const char *proc610 =
"}\n"
"--src DET_DynaRes.sql:185\n";
-static const char *proc611 =
+static const char *proc645 =
"#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"
@@ -26091,7 +27631,7 @@ static const char *proc611 =
"}\n"
"--src DET_DynaRes.sql:203\n";
-static const char *proc612 =
+static const char *proc646 =
"#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"
@@ -26100,7 +27640,7 @@ static const char *proc612 =
"}\n"
"--src DET_DynaRes.sql:214\n";
-static const char *proc613 =
+static const char *proc647 =
"#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"
@@ -26113,7 +27653,7 @@ static const char *proc613 =
"}\n"
"--src DET_DynaRes.sql:223\n";
-static const char *proc614 =
+static const char *proc648 =
"#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"
@@ -26122,7 +27662,7 @@ static const char *proc614 =
"}\n"
"--src DET_DynaRes.sql:235\n";
-static const char *proc615 =
+static const char *proc649 =
"#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"
@@ -26131,7 +27671,7 @@ static const char *proc615 =
"}\n"
"--src DET_DynaRes.sql:244\n";
-static const char *proc616 =
+static const char *proc650 =
"#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"
@@ -26165,7 +27705,7 @@ static const char *proc616 =
"}\n"
"--src DET_DynaRes.sql:252\n";
-static const char *proc617 =
+static const char *proc651 =
"#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"
@@ -26211,7 +27751,7 @@ static const char *proc617 =
"}\n"
"--src DET_DynaRes.sql:285\n";
-static const char *proc618 =
+static const char *proc652 =
"#line 332 \"[executable]/DET_DynaRes.sql\"\n"
"create procedure \"DynaRes_DAV_FC_PRED_METAS\" (inout pred_metas any)\n"
"{\n"
@@ -26244,7 +27784,7 @@ static const char *proc618 =
"}\n"
"--src DET_DynaRes.sql:330\n";
-static const char *proc619 =
+static const char *proc653 =
"#line 363 \"[executable]/DET_DynaRes.sql\"\n"
"create procedure \"DynaRes_DAV_FC_TABLE_METAS\" (inout table_metas any)\n"
"{\n"
@@ -26276,7 +27816,7 @@ static const char *proc619 =
"}\n"
"--src DET_DynaRes.sql:361\n";
-static const char *proc620 =
+static const char *proc654 =
"#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"
@@ -26293,7 +27833,7 @@ static const char *proc620 =
"}\n"
"--src DET_DynaRes.sql:393\n";
-static const char *proc621 =
+static const char *proc655 =
"#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"
@@ -26332,7 +27872,7 @@ static const char *proc621 =
"}\n"
"--src DET_DynaRes.sql:409\n";
-static const char *proc622 =
+static const char *proc656 =
"#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"
@@ -26378,22 +27918,22 @@ static const char *proc622 =
"}\n"
"--src DET_DynaRes.sql:447\n";
-static const char *proc623 =
+static const char *proc657 =
"#line 494 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
"\n"
-"if (what <> \'R\') \n"
+"if (what <> \'R\')\n"
"return NULL;\n"
"for select DR_NAME from WS.WS.DYNA_RES where DR_RES_ID = id[3] and DR_DETCOL_ID = id[1] do\n"
"{\n"
"return concat (DAV_SEARCH_PATH (id[1], \'C\'), DR_NAME);\n"
-"} \n"
-"return null; \n"
+"}\n"
+"return null;\n"
"}\n"
"--src DET_DynaRes.sql:492\n";
-static const char *proc624 =
+static const char *proc658 =
"#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"
@@ -26402,7 +27942,7 @@ static const char *proc624 =
"}\n"
"--src DET_DynaRes.sql:506\n";
-static const char *proc625 =
+static const char *proc659 =
"#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"
@@ -26411,7 +27951,7 @@ static const char *proc625 =
"}\n"
"--src DET_DynaRes.sql:514\n";
-static const char *proc626 =
+static const char *proc660 =
"#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"
@@ -26499,7 +28039,7 @@ static const char *proc626 =
"}\n"
"--src DET_DynaRes.sql:523\n";
-static const char *proc627 =
+static const char *proc661 =
"#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"
@@ -26508,7 +28048,7 @@ static const char *proc627 =
"}\n"
"--src DET_DynaRes.sql:610\n";
-static const char *proc628 =
+static const char *proc662 =
"#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"
@@ -26517,7 +28057,7 @@ static const char *proc628 =
"}\n"
"--src DET_DynaRes.sql:618\n";
-static const char *proc629 =
+static const char *proc663 =
"#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"
@@ -26526,7 +28066,7 @@ static const char *proc629 =
"}\n"
"--src DET_DynaRes.sql:626\n";
-static const char *proc630 =
+static const char *proc664 =
"#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"
@@ -26535,7 +28075,7 @@ static const char *proc630 =
"}\n"
"--src DET_DynaRes.sql:634\n";
-static const char *proc631 =
+static const char *proc665 =
"#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"
@@ -26544,7 +28084,7 @@ static const char *proc631 =
"}\n"
"--src DET_DynaRes.sql:643\n";
-static const char *proc632 =
+static const char *proc666 =
"#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"
@@ -26553,7 +28093,7 @@ static const char *proc632 =
"}\n"
"--src DET_DynaRes.sql:652\n";
-static const char *proc633 =
+static const char *proc667 =
"#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"
@@ -26562,7 +28102,7 @@ static const char *proc633 =
"}\n"
"--src DET_DynaRes.sql:662\n";
-static const char *proc634 =
+static const char *proc668 =
"#line 672 \"[executable]/DET_DynaRes.sql\"\n"
"create procedure \"DynaRes_CF_PROPNAME_TO_COLNAME\" (in prop varchar)\n"
"{\n"
@@ -26576,7 +28116,7 @@ static const char *proc634 =
"}\n"
"--src DET_DynaRes.sql:670\n";
-static const char *proc635 =
+static const char *proc669 =
"#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"
@@ -26627,7 +28167,7 @@ static const char *proc635 =
"}\n"
"--src DET_DynaRes.sql:682\n";
-static const char *proc636 =
+static const char *proc670 =
"#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"
@@ -26664,7 +28204,7 @@ static const char *proc636 =
"}\n"
"--src DET_DynaRes.sql:732\n";
-static const char *proc637 =
+static const char *proc671 =
"#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"
@@ -26733,7 +28273,7 @@ static const char *proc637 =
"}\n"
"--src DET_DynaRes.sql:767\n";
-static const char *proc638 =
+static const char *proc672 =
"#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"
@@ -26936,7 +28476,7 @@ static const char *trig43 =
"}\n"
"--src DET_Versioning.sql:165\n";
-static const char *proc639 =
+static const char *proc673 =
"#line 182 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_ADD_NEW_DIFF\" (in _res_id int,\n"
"in version_id int,\n"
@@ -27131,7 +28671,7 @@ static const char *trig45 =
"}\n"
"--src DET_Versioning.sql:295\n";
-static const char *proc640 =
+static const char *proc674 =
"#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"
@@ -27206,7 +28746,7 @@ static const char *proc640 =
"}\n"
"--src DET_Versioning.sql:369\n";
-static const char *proc641 =
+static const char *proc675 =
"#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"
@@ -27248,7 +28788,7 @@ static const char *proc641 =
"}\n"
"--src DET_Versioning.sql:443\n";
-static const char *proc642 =
+static const char *proc676 =
"#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"
@@ -27259,7 +28799,7 @@ static const char *proc642 =
"}\n"
"--src DET_Versioning.sql:487\n";
-static const char *proc643 =
+static const char *proc677 =
"#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"
@@ -27308,7 +28848,7 @@ static const char *proc643 =
"}\n"
"--src DET_Versioning.sql:501\n";
-static const char *proc644 =
+static const char *proc678 =
"#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"
@@ -27319,7 +28859,7 @@ static const char *proc644 =
"}\n"
"--src DET_Versioning.sql:550\n";
-static const char *proc645 =
+static const char *proc679 =
"#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"
@@ -27328,7 +28868,7 @@ static const char *proc645 =
"}\n"
"--src DET_Versioning.sql:561\n";
-static const char *proc646 =
+static const char *proc680 =
"#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"
@@ -27337,7 +28877,7 @@ static const char *proc646 =
"}\n"
"--src DET_Versioning.sql:569\n";
-static const char *proc647 =
+static const char *proc681 =
"#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"
@@ -27346,7 +28886,7 @@ static const char *proc647 =
"}\n"
"--src DET_Versioning.sql:577\n";
-static const char *proc648 =
+static const char *proc682 =
"#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"
@@ -27415,7 +28955,7 @@ static const char *proc648 =
"}\n"
"--src DET_Versioning.sql:586\n";
-static const char *proc649 =
+static const char *proc683 =
"#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"
@@ -27424,7 +28964,7 @@ static const char *proc649 =
"}\n"
"--src DET_Versioning.sql:657\n";
-static const char *proc650 =
+static const char *proc684 =
"#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"
@@ -27433,7 +28973,7 @@ static const char *proc650 =
"}\n"
"--src DET_Versioning.sql:667\n";
-static const char *proc651 =
+static const char *proc685 =
"#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"
@@ -27445,7 +28985,7 @@ static const char *proc651 =
"}\n"
"--src DET_Versioning.sql:676\n";
-static const char *proc652 =
+static const char *proc686 =
"#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"
@@ -27501,7 +29041,7 @@ static const char *proc652 =
"}\n"
"--src DET_Versioning.sql:687\n";
-static const char *proc653 =
+static const char *proc687 =
"#line 743 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_root_version\" (in _res_id int, in _hist_col varchar)\n"
"{\n"
@@ -27516,7 +29056,7 @@ static const char *proc653 =
"}\n"
"--src DET_Versioning.sql:741\n";
-static const char *proc654 =
+static const char *proc688 =
"#line 756 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_version_set\" (in _res_id int, in _hist_col varchar)\n"
"{\n"
@@ -27536,7 +29076,7 @@ static const char *proc654 =
"}\n"
"--src DET_Versioning.sql:754\n";
-static const char *proc655 =
+static const char *proc689 =
"#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"
@@ -27552,7 +29092,7 @@ static const char *proc655 =
"}\n"
"--src DET_Versioning.sql:774\n";
-static const char *proc656 =
+static const char *proc690 =
"#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"
@@ -27653,7 +29193,7 @@ static const char *proc656 =
"}\n"
"--src DET_Versioning.sql:789\n";
-static const char *proc657 =
+static const char *proc691 =
"#line 890 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_GET_BASE_PATH\" (in detcol_id int)\n"
"{\n"
@@ -27661,7 +29201,7 @@ static const char *proc657 =
"}\n"
"--src DET_Versioning.sql:888\n";
-static const char *proc658 =
+static const char *proc692 =
"#line 896 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_GET_ATTIC_PATH\" (in detcol_id int)\n"
"{\n"
@@ -27669,7 +29209,7 @@ static const char *proc658 =
"}\n"
"--src DET_Versioning.sql:894\n";
-static const char *proc659 =
+static const char *proc693 =
"#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"
@@ -27707,7 +29247,7 @@ static const char *proc659 =
"}\n"
"--src DET_Versioning.sql:902\n";
-static const char *proc660 =
+static const char *proc694 =
"#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"
@@ -27792,7 +29332,7 @@ static const char *proc660 =
"}\n"
"--src DET_Versioning.sql:941\n";
-static const char *proc661 =
+static const char *proc695 =
"#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"
@@ -27801,7 +29341,7 @@ static const char *proc661 =
"}\n"
"--src DET_Versioning.sql:1025\n";
-static const char *proc662 =
+static const char *proc696 =
"#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"
@@ -27861,7 +29401,7 @@ static const char *proc662 =
"}\n"
"--src DET_Versioning.sql:1033\n";
-static const char *proc663 =
+static const char *proc697 =
"#line 1094 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
@@ -27877,7 +29417,7 @@ static const char *proc663 =
"}\n"
"--src DET_Versioning.sql:1092\n";
-static const char *proc664 =
+static const char *proc698 =
"#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"
@@ -27886,7 +29426,7 @@ static const char *proc664 =
"}\n"
"--src DET_Versioning.sql:1107\n";
-static const char *proc665 =
+static const char *proc699 =
"#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"
@@ -27954,7 +29494,7 @@ static const char *proc665 =
"}\n"
"--src DET_Versioning.sql:1115\n";
-static const char *proc666 =
+static const char *proc700 =
"#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"
@@ -28003,7 +29543,7 @@ static const char *proc666 =
"}\n"
"--src DET_Versioning.sql:1183\n";
-static const char *proc667 =
+static const char *proc701 =
"#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"
@@ -28012,7 +29552,7 @@ static const char *proc667 =
"}\n"
"--src DET_Versioning.sql:1231\n";
-static const char *proc668 =
+static const char *proc702 =
"#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"
@@ -28021,7 +29561,7 @@ static const char *proc668 =
"}\n"
"--src DET_Versioning.sql:1239\n";
-static const char *proc669 =
+static const char *proc703 =
"#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"
@@ -28030,7 +29570,7 @@ static const char *proc669 =
"}\n"
"--src DET_Versioning.sql:1247\n";
-static const char *proc670 =
+static const char *proc704 =
"#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"
@@ -28039,7 +29579,7 @@ static const char *proc670 =
"}\n"
"--src DET_Versioning.sql:1255\n";
-static const char *proc671 =
+static const char *proc705 =
"#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"
@@ -28048,7 +29588,7 @@ static const char *proc671 =
"}\n"
"--src DET_Versioning.sql:1264\n";
-static const char *proc672 =
+static const char *proc706 =
"#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"
@@ -28057,7 +29597,7 @@ static const char *proc672 =
"}\n"
"--src DET_Versioning.sql:1273\n";
-static const char *proc673 =
+static const char *proc707 =
"#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"
@@ -28066,7 +29606,7 @@ static const char *proc673 =
"}\n"
"--src DET_Versioning.sql:1283\n";
-static const char *proc674 =
+static const char *proc708 =
"#line 1292 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_AUTO_VERSION_PROP\" (in _auto_version varchar)\n"
"{\n"
@@ -28084,7 +29624,7 @@ static const char *proc674 =
"}\n"
"--src DET_Versioning.sql:1290\n";
-static const char *proc675 =
+static const char *proc709 =
"#line 1310 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_SET_VERSIONING_PROPERTIES (in path varchar, in props any)\n"
"{\n"
@@ -28102,7 +29642,7 @@ static const char *proc675 =
"}\n"
"--src DET_Versioning.sql:1308\n";
-static const char *proc676 =
+static const char *proc710 =
"#line 1326 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_REMOVE_V_PROPERTIES\" (in _path varchar)\n"
"{\n"
@@ -28115,7 +29655,7 @@ static const char *proc676 =
"}\n"
"--src DET_Versioning.sql:1324\n";
-static const char *proc677 =
+static const char *proc711 =
"#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"
@@ -28140,7 +29680,7 @@ static const char *proc677 =
"}\n"
"--src DET_Versioning.sql:1336\n";
-static const char *proc678 =
+static const char *proc712 =
"#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"
@@ -28156,7 +29696,7 @@ static const char *proc678 =
"}\n"
"--src DET_Versioning.sql:1359\n";
-static const char *proc679 =
+static const char *proc713 =
"#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"
@@ -28219,7 +29759,7 @@ static const char *proc679 =
"}\n"
"--src DET_Versioning.sql:1374\n";
-static const char *proc680 =
+static const char *proc714 =
"#line 1439 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_MKWORKSPACE (in path varchar)\n"
"{\n"
@@ -28265,7 +29805,7 @@ static const char *proc680 =
"}\n"
"--src DET_Versioning.sql:1437\n";
-static const char *proc681 =
+static const char *proc715 =
"#line 1483 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_CHECKOUT (in path varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -28273,7 +29813,7 @@ static const char *proc681 =
"}\n"
"--src DET_Versioning.sql:1481\n";
-static const char *proc682 =
+static const char *proc716 =
"#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"
@@ -28323,7 +29863,7 @@ static const char *proc682 =
"}\n"
"--src DET_Versioning.sql:1487\n";
-static const char *proc683 =
+static const char *proc717 =
"#line 1537 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_CHECKIN (in path varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -28331,7 +29871,7 @@ static const char *proc683 =
"}\n"
"--src DET_Versioning.sql:1535\n";
-static const char *proc684 =
+static const char *proc718 =
"#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"
@@ -28428,7 +29968,7 @@ static const char *proc684 =
"}\n"
"--src DET_Versioning.sql:1541\n";
-static const char *proc685 =
+static const char *proc719 =
"#line 1638 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_CHECKOUT_INT\" (\n"
"in _id int,\n"
@@ -28477,7 +30017,7 @@ static const char *trig46 =
"}\n"
"--src DET_Versioning.sql:1660\n";
-static const char *proc686 =
+static const char *proc720 =
"#line 1685 \"[executable]/DET_Versioning.sql\"\n"
"create function DAV_VERSION_CONTROL (in path varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -28573,7 +30113,7 @@ static const char *proc686 =
"}\n"
"--src DET_Versioning.sql:1683\n";
-static const char *proc687 =
+static const char *proc721 =
"#line 1780 \"[executable]/DET_Versioning.sql\"\n"
"create function DAV_UNCHECKOUT (in path varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -28648,7 +30188,7 @@ static const char *proc687 =
"}\n"
"--src DET_Versioning.sql:1778\n";
-static const char *proc688 =
+static const char *proc722 =
"#line 1854 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_Attic\" (in _resource varchar)\n"
"{\n"
@@ -28667,7 +30207,7 @@ static const char *proc688 =
"}\n"
"--src DET_Versioning.sql:1852\n";
-static const char *proc689 =
+static const char *proc723 =
"#line 1871 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_OTHER_FILES_IN_VVC\" (in _res varchar)\n"
"{\n"
@@ -28676,7 +30216,7 @@ static const char *proc689 =
"}\n"
"--src DET_Versioning.sql:1869\n";
-static const char *proc690 =
+static const char *proc724 =
"#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"
@@ -28732,7 +30272,7 @@ static const char *proc690 =
"}\n"
"--src DET_Versioning.sql:1877\n";
-static const char *proc691 =
+static const char *proc725 =
"#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"
@@ -28829,7 +30369,7 @@ static const char *trig47 =
/* xml_view.sql */
-static const char *proc692 =
+static const char *proc726 =
"#line 32 \"[executable]/xml_view.sql\"\n"
"create procedure XML_VIEW_PUBLISH\n"
"(\n"
@@ -29052,7 +30592,7 @@ static const char *proc692 =
"}\n"
"--src xml_view.sql:30\n";
-static const char *proc693 =
+static const char *proc727 =
"#line 253 \"[executable]/xml_view.sql\"\n"
"create procedure XML_VIEW_DROP (in view_name varchar)\n"
"{\n"
@@ -29167,169 +30707,175 @@ 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.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);
+ 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);
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", proc50);
+ DEFINE_PROC ("WS.WS.UPDCHILD", proc54);
ddl_std_proc (trig4, 0x0);
- DEFINE_PROC ("WS.WS.DAV_VSP_INCLUDES_CHANGED", proc51);
- DEFINE_PROC ("WS.WS.EXPAND_INCLUDES", proc52);
+ DEFINE_PROC ("WS.WS.DAV_VSP_INCLUDES_CHANGED", proc55);
+ DEFINE_PROC ("WS.WS.EXPAND_INCLUDES", proc56);
ddl_std_proc (trig5, 0x0);
ddl_std_proc (trig6, 0x0);
- 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);
+ 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);
/* dav_api.sql */
- 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);
+ 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);
ddl_ensure_table ("DB.DBA.RDF_SINK_QUEUE", tbl0);
- 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);
+ 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);
ddl_std_proc (trig7, 0x0);
ddl_std_proc (trig8, 0x0);
ddl_std_proc (trig9, 0x0);
@@ -29337,190 +30883,191 @@ 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", proc157);
- DEFINE_PROC ("WS.WS.WAC_DELETE", proc158);
- DEFINE_PROC ("WS.WS.DAV_IRI", proc159);
+ DEFINE_PROC ("WS.WS.WAC_INSERT", proc163);
+ DEFINE_PROC ("WS.WS.WAC_DELETE", proc164);
+ DEFINE_PROC ("WS.WS.WAC_GRAPH", proc165);
+ DEFINE_PROC ("WS.WS.DAV_IRI", proc166);
ddl_std_proc (trig14, 0x0);
- DEFINE_PROC ("WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG", proc160);
+ DEFINE_PROC ("WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG", proc167);
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", 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);
+ DEFINE_PROC ("WS.WS.ACL_UPDATE", proc168);
+ DEFINE_PROC ("WS.WS.ACL_MAKE_INHERITED", proc169);
+ DEFINE_PROC ("WS.WS.ACL_DBG", proc170);
+ DEFINE_PROC ("WS.WS.ACL_SERIALIZE_INT", proc171);
+ DEFINE_PROC ("WS.WS.ACL_DESERIALIZE_INT", proc172);
+ DEFINE_PROC ("WS.WS.ACL_GET_ACLLENGTH", proc173);
+ DEFINE_PROC ("WS.WS.ACL_GET_ACESIZE", proc174);
+ DEFINE_PROC ("WS.WS.ACL_CREATE", proc175);
+ DEFINE_PROC ("WS.WS.ACL_IS_VALID", proc176);
+ DEFINE_PROC ("WS.WS.ACL_ADD_ENTRY", proc177);
+ DEFINE_PROC ("WS.WS.ACL_REMOVE_ENTRY", proc178);
+ DEFINE_PROC ("WS.WS.ACL_IS_GRANTED", proc179);
+ DEFINE_PROC ("WS.WS.ACL_SET_OWNER", proc180);
+ DEFINE_PROC ("WS.WS.ACL_OWNER", proc181);
+ DEFINE_PROC ("WS.WS.ACL_PARSE", proc182);
+ DEFINE_PROC ("WS.WS.ACL_COMPOSE", proc183);
+ DEFINE_PROC ("DAV_CAST_STRING_TO_INTEGER", proc184);
+ DEFINE_PROC ("DAV_CAST_STRING_TO_DATETIME", proc185);
+ DEFINE_PROC ("DAV_CAST_TEXT_TO_VARCHAR", proc186);
+ DEFINE_PROC ("DAV_CAST_TEXT_TO_INTEGER", proc187);
+ DEFINE_PROC ("DAV_CAST_TEXT_TO_DATETIME", proc188);
+ DEFINE_PROC ("DAV_FC_CONST_AS_SQL", proc189);
+ DEFINE_PROC ("DAV_FC_PRED_METAS", proc190);
+ DEFINE_PROC ("DAV_FC_CMP_METAS", proc191);
+ DEFINE_PROC ("DAV_FC_TABLE_METAS", proc192);
+ DEFINE_PROC ("DAV_FC_PRINT_COMPARISON", proc193);
+ DEFINE_PROC ("DAV_FC_PRINT_WHERE", proc194);
+ DEFINE_PROC ("DAV_FC_PRINT_WHERE_INT", proc195);
+ DEFINE_PROC ("DAV_REGISTER_RDF_SCHEMA", proc196);
+ DEFINE_PUBLIC_PROC ("DAV_RDF_SCHEMA_N3_LIST_PROPERTIES", proc197);
+ DEFINE_PROC ("DAV_CROP_URI_TO_CATNAME", proc198);
+ DEFINE_PUBLIC_PROC ("DAV_GET_RDF_SCHEMA_N3", proc199);
+ DEFINE_PROC ("DAV_DEPRECATE_RDF_SCHEMA", proc200);
+ DEFINE_PROC ("DAV_REGISTER_MIME_TYPE", proc201);
+ DEFINE_PROC ("DAV_REGISTER_MIME_RDF", proc202);
+ DEFINE_PROC ("DAV_DEPRECATE_MIME_RDF", proc203);
+ DEFINE_PUBLIC_PROC ("DAV_RDF_PROP_SET", proc204);
+ DEFINE_PUBLIC_PROC ("DAV_RDF_PROP_GET", proc205);
+ DEFINE_PROC ("DAV_RDF_PREPROCESS_RDFXML_SUB", proc206);
+ DEFINE_PROC ("DAV_RDF_PREPROCESS_RDFXML", proc207);
+ DEFINE_PROC ("DAV_RDF_PROP_SET_INT", proc208);
+ DEFINE_PROC ("DAV_RDF_PROP_GET_INT", proc209);
+ DEFINE_PROC ("DAV_RDF_MERGE", proc210);
+ DEFINE_PROC ("DAV_RDF_SUBTRACT", proc211);
ddl_std_proc (trig20, 0x0);
ddl_std_proc (trig21, 0x0);
ddl_std_proc (trig22, 0x0);
- 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);
+ DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF", proc212);
+ DEFINE_PROC ("DAV_GET_RES_TYPE_URI_BY_MIME_TYPE", proc213);
+ DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF_INT", proc214);
+ DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF_INT2", proc215);
+ DEFINE_PROC ("DAV_HOME_DIR_UPDATE", proc216);
/* dav_meta.sql */
- 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);
+ DEFINE_PROC ("DAV_GUESS_MIME_TYPE_BY_NAME", proc217);
+ DEFINE_PROC ("DAV_GUESS_MIME_TYPE", proc218);
+ DEFINE_PROC ("file_space_fmt", proc219);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-license", proc220);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_opendocument", proc221);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.text", proc222);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.database", proc223);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.graphics", proc224);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.presentation", proc225);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.spreadsheet", proc226);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.chart", proc227);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.formula", proc228);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.image", proc229);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-image", proc230);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-photo", proc231);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/audio", proc232);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/mpeg", proc233);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-flac", proc234);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-mp3", proc235);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-m4a", proc236);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-m4p", proc237);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/ogg", proc238);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msoffice+xml", proc239);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msexcel", proc240);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msaccess", proc241);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msproject", proc242);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/mspowerpoint", proc243);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msword", proc244);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/pdf", proc245);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/xbrl+xml", proc246);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/doap+rdf", proc247);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/xddl+xml", proc248);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/archive", proc249);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/tar", proc250);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/taz", proc251);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/gz", proc252);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msi", proc253);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/dmg", proc254);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/arj", proc255);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/bz", proc256);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/bz2", proc257);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/tgz", proc258);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/rar", proc259);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/zip", proc260);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/cab", proc261);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/lzh", proc262);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/ace", proc263);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/iso", proc264);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msword+xml", proc265);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msexcel+xml", proc266);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msproject+xml", proc267);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msvisio+xml", proc268);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/rss+xml", proc269);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/atom+xml", proc270);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/eml", proc271);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/xbel+xml", proc272);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/rdf+xml", proc273);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/rdf+ttl", proc274);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/rdf+n3", proc275);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/foaf+xml", proc276);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/mods+xml", proc277);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/opml+xml", proc278);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/ocs+xml", proc279);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/html", proc280);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vsp", proc281);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vspx+xml", proc282);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/bpel+xml", proc283);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/annotea+xml", proc284);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/google-kinds+xml", proc285);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/wsdl+xml", proc286);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/google-base+xml", proc287);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vad", proc288);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/wiki", proc289);
+ DEFINE_PROC ("IMC_TO_XML", proc290);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/directory", proc291);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_BY_METAS", proc292);
+ DEFINE_PROC ("DB.DBA.UNIX_DATETIME_PARSER", proc293);
ddl_ensure_table ("do this always", other1);
ddl_ensure_table ("do this always", other2);
- DEFINE_PROC ("DB.DBA.UNIX_DATE_PARSER", proc287);
+ DEFINE_PROC ("DB.DBA.UNIX_DATE_PARSER", proc294);
ddl_ensure_table ("do this always", other3);
ddl_ensure_table ("do this always", other4);
- DEFINE_PROC ("DB.DBA.BPEL_SPLIT_LIST", proc288);
+ DEFINE_PROC ("DB.DBA.BPEL_SPLIT_LIST", proc295);
ddl_ensure_table ("do this always", other5);
ddl_ensure_table ("do this always", other6);
- 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);
+ DEFINE_PROC ("DAV_EXTRACT_SPOTLIGHT", proc296);
+ DEFINE_PROC ("DAV_CONVERT_SPOTLIGHT_TO_VIRTUOSO", proc297);
+ DEFINE_PROC ("DAV_SPOTLIGHT_ADD", proc298);
+ DEFINE_PUBLIC_PROC ("DB.DBA.XML_UNIX_DATE_TO_ISO", proc299);
ddl_ensure_table ("do this always", other7);
ddl_ensure_table ("do this always", other8);
- DEFINE_PROC ("DAV_EXTRACT_META_AS_RDF_XML", proc293);
+ DEFINE_PROC ("DAV_EXTRACT_META_AS_RDF_XML", proc300);
/* dav_acct.sql */
- 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);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_PARENT", proc301);
+ DEFINE_PROC ("DAV_ADD_SPACE_QUOTA", proc302);
+ DEFINE_PROC ("DAV_DEL_SPACE_QUOTA", proc303);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_YELLOW_TRACK", proc304);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_SIGNAL", proc305);
+ DEFINE_PROC ("DAV_OWNER_DISABLED_SIGNAL", proc306);
+ DEFINE_PROC ("DAV_HOME_DISABLED_SIGNAL", proc307);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_RES_INSERT", proc308);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_RES_DELETE", proc309);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_RES_UPDATE", proc310);
/* dav_rdf_quad.sql */
- 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);
+ DEFINE_PROC ("DB.DBA.RDF_DELETE_ENTIRE_GRAPH", proc311);
+ DEFINE_PROC ("DB.DBA.DAV_FULL_PATH_TO_IRI", proc312);
+ DEFINE_PROC ("DB.DBA.DAV_AUTO_REPLICATE_TO_RDF_QUAD", proc313);
+ DEFINE_PROC ("DB.DBA.DAV_REPLICATE_ALL_TO_RDF_QUAD", proc314);
+ DEFINE_PROC ("DB.DBA.RDF_CBD_DELETE", proc315);
+ DEFINE_PROC ("DB.DBA.DAV_RDF_URI_RESOLVE", proc316);
+ DEFINE_PROC ("DB.DBA.DAV_RDF_REPLICATE_INT", proc317);
+ DEFINE_PROC ("DB.DBA.DAV_RDF_CBD_DELETE_PROP", proc318);
+ DEFINE_PROC ("DB.DBA.DAV_MAKE_USER_IRI", proc319);
+ DEFINE_PROC ("DB.DBA.DAV_REPLICATE_RES_TO_RDF_QUAD", proc320);
+ DEFINE_PROC ("DB.DBA.DAV_REPLICATE_COL_TO_RDF_QUAD", proc321);
ddl_std_proc (trig23, 0x0);
ddl_std_proc (trig24, 0x0);
ddl_std_proc (trig25, 0x0);
@@ -29531,58 +31078,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", proc315);
+ DEFINE_PROC ("DB.DBA.DAV_RDF_PROPAGATE_COL_PATH_CHANGE", proc322);
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", 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);
+ DEFINE_PROC ("WS.WS.COPY_PAGE", proc323);
+ DEFINE_PROC ("WS.WS.VFS_HTTP_RESP_CODE", proc324);
+ DEFINE_PROC ("WS.WS.VFS_ENSURE_NEW_SITE", proc325);
+ DEFINE_PROC ("WS.WS.VFS_GUESS_CONTENT_TYPE", proc326);
+ DEFINE_PROC ("WS.WS.COPY_PAGE_1", proc327);
+ DEFINE_PROC ("WS.WS.DELETE_LOCAL_COPY", proc328);
+ DEFINE_PROC ("WS.WS.VFS_RUN", proc329);
+ DEFINE_PROC ("WS.WS.VFS_STATUS_GET", proc330);
+ DEFINE_PROC ("WS.WS.VFS_STATUS_SET", proc331);
+ DEFINE_PROC ("WS.WS.SERV_QUEUE_TOP", proc332);
+ DEFINE_PROC ("WS.WS.SERV_QUEUE", proc333);
+ DEFINE_PROC ("ERR_MAIL_SEND", proc334);
+ DEFINE_PROC ("WS.WS.LOCAL_STORE", proc335);
+ DEFINE_PROC ("WS.WS.GET_URLS", proc336);
+ DEFINE_PROC ("WS.WS.SITEMAP_PROCESS", proc337);
+ DEFINE_PROC ("WS.WS.MAKE_URL", proc338);
+ DEFINE_PROC ("WS.WS.SPLIT_URL", proc339);
+ DEFINE_PROC ("WS.WS.EXPAND_URL_OLD", proc340);
+ DEFINE_PROC ("WS.WS.MKPATH", proc341);
+ DEFINE_PROC ("WS.WS.FOLLOW", proc342);
+ DEFINE_PROC ("WS.WS.REPLACE_HREF", proc343);
+ DEFINE_PROC ("WS.WS.FIND_URI", proc344);
+ DEFINE_PROC ("WS.WS.LFS_EXP", proc345);
+ DEFINE_PROC ("WS.WS.FIND_KEYWORD", proc346);
+ DEFINE_PROC ("WS.WS.GET_HREF_IN_ARRAY", proc347);
+ DEFINE_PROC ("WS.WS.DAV_EXP", proc348);
+ DEFINE_PROC ("WS.WS.DAV_HEAD", proc349);
+ DEFINE_PROC ("WS.WS.DAV_MKCOL", proc350);
+ DEFINE_PROC ("WS.WS.DAV_PUT", proc351);
+ DEFINE_PROC ("WS.WS.DAV_PROP", proc352);
+ DEFINE_PROC ("WS.WS.GET_HREF_FROM_XML", proc353);
+ DEFINE_PROC ("WS.WS.ISEMPTY", proc354);
+ DEFINE_PROC ("WS.WS.URL_BY_DATE", proc355);
+ DEFINE_PROC ("WS.WS.VFS_RECOVER_QUEUE_STAT", proc356);
+ DEFINE_PROC ("WS.WS.VFS_MAKE_ENTRY", proc357);
+ DEFINE_PROC ("WS.WS.VFS_GO", proc358);
+ DEFINE_PROC ("WS.WS.VFS_URI_COMPOSE", proc359);
+ DEFINE_PROC ("WS.WS.VFS_EXTRACT_RDF", proc360);
+ DEFINE_PROC ("WS.WS.SITEMAP_ENSURE_NEW_SITE", proc361);
+ DEFINE_PROC ("WS.WS.SITEMAP_URLS_REGISTER", proc362);
+ DEFINE_PROC ("WS.WS.SITEMAP_GET_LOC", proc363);
+ DEFINE_PROC ("WS.WS.SITEMAP_XML_PARSE", proc364);
+ DEFINE_PROC ("WS.WS.SITEMAP_RDF_STORE", proc365);
+ DEFINE_PROC ("VFS_ROBOTS_PARSE", proc366);
+ DEFINE_PROC ("VFS_ROBOTS_GET", proc367);
dk_free_box (bootstrap_cli->cli_qualifier);
bootstrap_cli->cli_qualifier = saved_qualifier;
@@ -29606,68 +31153,68 @@ sqls_define_dav (void)
/* uriqa.sql */
ddl_ensure_table ("WS.WS.URIQA_HANDLER", tbl1);
- DEFINE_PROC ("WS.WS.URIQA_CFG_ITEM_VALUE", proc361);
- DEFINE_PROC ("WS.WS.URIQA_LOAD_FROM_INI", proc362);
+ DEFINE_PROC ("WS.WS.URIQA_CFG_ITEM_VALUE", proc368);
+ DEFINE_PROC ("WS.WS.URIQA_LOAD_FROM_INI", proc369);
ddl_ensure_table ("do this always", other9);
- 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);
+ DEFINE_PROC ("WS.WS.URIQA_FULL_URI", proc370);
+ DEFINE_PROC ("WS.WS.URIQA_APPLY_TRIGGERS", proc371);
+ DEFINE_PROC ("WS.WS.URIQA_N3_DIR_LIST", proc372);
+ DEFINE_PROC ("DB.DBA.DAV_EXTRACT_DYN_RDF_application/xbel+xml", proc373);
+ DEFINE_PROC ("WS.WS.URIQA_HANDLER_LOCALDAV", proc374);
+ DEFINE_PROC ("WS.WS.URIQA_HANDLER_NATIVE_HTTP", proc375);
+ DEFINE_PROC ("WS.WS.URIQA_STATUS", proc376);
+ DEFINE_PROC ("WS.WS.MPUT", proc377);
+ DEFINE_PROC ("WS.WS.MGET", proc378);
+ DEFINE_PROC ("WS.WS.MDELETE", proc379);
+ DEFINE_PROC ("WS.WS./!URIQA/", proc380);
+ DEFINE_PROC ("WS.WS.URIQA_VHOST_RESET", proc381);
/* DET_CatFilter.sql */
- 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);
+ DEFINE_PROC ("CatFilter_DAV_AUTHENTICATE", proc382);
+ DEFINE_PROC ("CatFilter_GET_CONDITION", proc383);
+ DEFINE_PROC ("CatFilter_ENCODE_CATVALUE", proc384);
+ DEFINE_PROC ("CatFilter_DECODE_CATVALUE", proc385);
+ DEFINE_PROC ("CatFilter_PATH_PARTS_TO_FILTER", proc386);
+ DEFINE_PROC ("CatFilter_ACC_FILTER_DATA", proc387);
+ DEFINE_PROC ("CatFilter_DAV_SEARCH_ID_IMPL", proc388);
+ DEFINE_PROC ("CatFilter_DAV_AUTHENTICATE_HTTP", proc389);
+ DEFINE_PROC ("CatFilter_DAV_GET_PARENT", proc390);
+ DEFINE_PROC ("CatFilter_DAV_COL_CREATE", proc391);
+ DEFINE_PROC ("CatFilter_DAV_COL_MOUNT", proc392);
+ DEFINE_PROC ("CatFilter_DAV_COL_MOUNT_HERE", proc393);
+ DEFINE_PROC ("CatFilter_DAV_DELETE", proc394);
+ DEFINE_PROC ("CatFilter_FILTER_TO_CONDITION", proc395);
+ DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD", proc396);
+ DEFINE_PROC ("CatFilter_DAV_PROP_REMOVE", proc397);
+ DEFINE_PROC ("CatFilter_DAV_PROP_SET", proc398);
+ DEFINE_PROC ("CatFilter_DAV_PROP_GET", proc399);
+ DEFINE_PROC ("CatFilter_DAV_PROP_LIST", proc400);
+ DEFINE_PROC ("CatFilter_DAV_DIR_SINGLE", proc401);
+ DEFINE_PROC ("CatFilter_LIST_SCHEMAS", proc402);
+ DEFINE_PROC ("CatFilter_LIST_SCHEMA_PROPS", proc403);
+ DEFINE_PROC ("CatFilter_GET_RDF_INVERSE_HITS_DISTVALS", proc404);
+ DEFINE_PROC ("CatFilter_GET_RDF_INVERSE_HITS_RES_IDS", proc405);
+ DEFINE_PROC ("CatFilter_LIST_PROP_DISTVALS_AUX", proc406);
+ DEFINE_PROC ("CatFilter_LIST_PROP_DISTVALS", proc407);
+ DEFINE_PROC ("CatFilter_DAV_DIR_LIST", proc408);
+ DEFINE_PROC ("CatFilter_DAV_DIR_FILTER", proc409);
+ DEFINE_PROC ("CatFilter_DAV_SEARCH_ID", proc410);
+ DEFINE_PROC ("CatFilter_DAV_SEARCH_PATH", proc411);
+ DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD_COPY", proc412);
+ DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD_MOVE", proc413);
+ DEFINE_PROC ("CatFilter_DAV_RES_CONTENT", proc414);
+ DEFINE_PROC ("CatFilter_DAV_SYMLINK", proc415);
+ DEFINE_PROC ("CatFilter_DAV_LOCK", proc416);
+ DEFINE_PROC ("CatFilter_DAV_UNLOCK", proc417);
+ DEFINE_PROC ("CatFilter_DAV_IS_LOCKED", proc418);
+ DEFINE_PROC ("CatFilter_DAV_LIST_LOCKS", proc419);
+ DEFINE_PROC ("CatFilter_CONFIGURE", proc420);
+ DEFINE_PROC ("CatFilter_FEED_DAV_RDF_INVERSE", proc421);
ddl_std_proc (trig35, 0x0);
ddl_std_proc (trig36, 0x0);
ddl_std_proc (trig37, 0x0);
- DEFINE_PROC ("CatFilter_INIT_SYS_DAV_RDF_INVERSE", proc415);
+ DEFINE_PROC ("CatFilter_INIT_SYS_DAV_RDF_INVERSE", proc422);
/* DET_HostFs.sql */
@@ -29679,253 +31226,280 @@ 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", proc416);
+ DEFINE_PROC ("WS.WS.HOSTFS_FEED_RDF_INVERSE", proc423);
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", 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);
+ DEFINE_PROC ("WS.WS.HOSTFS_RES_TOPCOL_ID", proc424);
+ DEFINE_PROC ("WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF", proc425);
+ DEFINE_PROC ("WS.WS.HOSTFS_TEST_RDF", proc426);
+ DEFINE_PROC ("WS.WS.HOSTFS_RES_CACHE_RESC_DATA_INDEX_HOOK", proc427);
+ DEFINE_PROC ("WS.WS.HOSTFS_RES_CACHE_RESC_DATA_UNINDEX_HOOK", proc428);
ddl_ensure_table ("do this always", other12);
ddl_ensure_table ("do this always", other13);
- 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);
+ DEFINE_PROC ("WS.WS.HOSTFS_FIND_COL", proc429);
+ DEFINE_PROC ("WS.WS.HOSTFS_COL_DISAPPEARS", proc430);
+ DEFINE_PROC ("WS.WS.HOSTFS_HANDLE_RES_SCAN", proc431);
+ DEFINE_PROC ("WS.WS.HOSTFS_RES_DISAPPEARS", proc432);
+ DEFINE_PROC ("WS.WS.HOSTFS_TOUCH_RES", proc433);
+ DEFINE_PROC ("WS.WS.HOSTFS_GLOBAL_RESET", proc434);
+ DEFINE_PROC ("WS.WS.HOSTFS_PATH_STAT", proc435);
+ DEFINE_PROC ("WS.WS.HOSTFS_READ_TYPEINFO", proc436);
+ DEFINE_PROC ("HostFs_DAV_AUTHENTICATE", proc437);
+ DEFINE_PROC ("HostFs_DAV_AUTHENTICATE_HTTP", proc438);
+ DEFINE_PROC ("HostFs_DAV_GET_PARENT", proc439);
+ DEFINE_PROC ("HostFs_DAV_COL_CREATE", proc440);
+ DEFINE_PROC ("HostFs_DAV_COL_MOUNT", proc441);
+ DEFINE_PROC ("HostFs_DAV_COL_MOUNT_HERE", proc442);
+ DEFINE_PROC ("HostFs_DAV_DELETE", proc443);
ddl_ensure_table ("DB.DBA.HostFs_DAV_RES_UPLOAD", tbl7);
- 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);
+ DEFINE_PROC ("HostFs_DAV_RES_UPLOAD", proc444);
+ DEFINE_PROC ("HostFs_DAV_PROP_REMOVE", proc445);
+ DEFINE_PROC ("HostFs_DAV_PROP_SET", proc446);
+ DEFINE_PROC ("HostFs_DAV_PROP_GET", proc447);
+ DEFINE_PROC ("HostFs_DAV_PROP_LIST", proc448);
+ DEFINE_PROC ("HostFs_ID_TO_OSPATH", proc449);
+ DEFINE_PROC ("HostFs_DAV_DIR_SINGLE", proc450);
+ DEFINE_PROC ("HostFs_DAV_DIR_LIST", proc451);
+ DEFINE_PROC ("HostFs_DAV_DIR_FILTER", proc452);
+ DEFINE_PROC ("HostFs_DAV_SEARCH_ID", proc453);
+ DEFINE_PROC ("HostFs_DAV_SEARCH_PATH", proc454);
+ DEFINE_PROC ("HostFs_DAV_RES_UPLOAD_COPY", proc455);
+ DEFINE_PROC ("HostFs_DAV_RES_UPLOAD_MOVE", proc456);
+ DEFINE_PROC ("HostFs_DAV_RES_CONTENT", proc457);
+ DEFINE_PROC ("HostFs_DAV_SYMLINK", proc458);
+ DEFINE_PROC ("HostFs_DAV_LOCK", proc459);
+ DEFINE_PROC ("HostFs_DAV_UNLOCK", proc460);
+ DEFINE_PROC ("HostFs_DAV_IS_LOCKED", proc461);
+ DEFINE_PROC ("HostFs_DAV_LIST_LOCKS", proc462);
+ DEFINE_PROC ("HostFs_CF_LIST_PROP_DISTVALS", proc463);
+ DEFINE_PROC ("HostFs_CF_GET_RDF_HITS", proc464);
+ DEFINE_PROC ("HostFs_RF_ID2SUFFIX", proc465);
+ DEFINE_PROC ("HostFile_RF_SUFFIX2ID", proc466);
+ DEFINE_PROC ("HostDir_RF_SUFFIX2ID", proc467);
/* DET_ResFilter.sql */
- 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);
+ DEFINE_PROC ("ResFilter_DAV_AUTHENTICATE", proc468);
+ DEFINE_PROC ("ResFilter_NORM", proc469);
+ DEFINE_PROC ("ResFilter_ENCODE_FILTER", proc470);
+ DEFINE_PROC ("ResFilter_DECODE_FILTER", proc471);
+ DEFINE_PROC ("ResFilter_GET_CONDITION", proc472);
+ DEFINE_PROC ("ResFilter_FIT_INTO_CONDITION", proc473);
+ DEFINE_PROC ("ResFilter_MAKE_DEL_ACTION_FROM_CONDITION", proc474);
+ DEFINE_PROC ("ResFilter_LEAVE_CONDITION", proc475);
+ DEFINE_PROC ("ResFilter_FNMERGE", proc476);
+ DEFINE_PROC ("ResFilter_FNSPLIT", proc477);
+ DEFINE_PROC ("ResFilter_DAV_SEARCH_ID_IMPL", proc478);
+ DEFINE_PROC ("ResFilter_DAV_AUTHENTICATE_HTTP", proc479);
+ DEFINE_PROC ("ResFilter_DAV_GET_PARENT", proc480);
+ DEFINE_PROC ("ResFilter_DAV_COL_CREATE", proc481);
+ DEFINE_PROC ("ResFilter_DAV_COL_MOUNT", proc482);
+ DEFINE_PROC ("ResFilter_DAV_COL_MOUNT_HERE", proc483);
+ DEFINE_PROC ("ResFilter_DAV_DELETE", proc484);
+ DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD", proc485);
+ DEFINE_PROC ("ResFilter_DAV_PROP_REMOVE", proc486);
+ DEFINE_PROC ("ResFilter_DAV_PROP_SET", proc487);
+ DEFINE_PROC ("ResFilter_DAV_PROP_GET", proc488);
+ DEFINE_PROC ("ResFilter_DAV_PROP_LIST", proc489);
+ DEFINE_PROC ("ResFilter_DAV_DIR_SINGLE", proc490);
+ DEFINE_PROC ("ResFilter_DAV_DIR_LIST", proc491);
+ DEFINE_PROC ("ResFilter_DAV_DIR_FILTER", proc492);
+ DEFINE_PROC ("ResFilter_DAV_SEARCH_ID", proc493);
+ DEFINE_PROC ("ResFilter_DAV_SEARCH_PATH", proc494);
+ DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD_COPY", proc495);
+ DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD_MOVE", proc496);
+ DEFINE_PROC ("ResFilter_DAV_RES_CONTENT", proc497);
+ DEFINE_PROC ("ResFilter_DAV_SYMLINK", proc498);
+ DEFINE_PROC ("ResFilter_DAV_LOCK", proc499);
+ DEFINE_PROC ("ResFilter_DAV_UNLOCK", proc500);
+ DEFINE_PROC ("ResFilter_DAV_IS_LOCKED", proc501);
+ DEFINE_PROC ("ResFilter_DAV_LIST_LOCKS", proc502);
+ DEFINE_PROC ("ResFilter_CONFIGURE", proc503);
/* DET_PropFilter.sql */
- 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);
+ DEFINE_PROC ("PropFilter_DAV_AUTHENTICATE", proc504);
+ DEFINE_PROC ("PropFilter_NORM", proc505);
+ DEFINE_PROC ("PropFilter_GET_CONDITION", proc506);
+ DEFINE_PROC ("PropFilter_FIT_INTO_CONDITION", proc507);
+ DEFINE_PROC ("PropFilter_LEAVE_CONDITION", proc508);
+ DEFINE_PROC ("PropFilter_FNMERGE", proc509);
+ DEFINE_PROC ("PropFilter_FNSPLIT", proc510);
+ DEFINE_PROC ("PropFilter_DAV_SEARCH_ID_IMPL", proc511);
+ DEFINE_PROC ("PropFilter_DAV_AUTHENTICATE_HTTP", proc512);
+ DEFINE_PROC ("PropFilter_DAV_GET_PARENT", proc513);
+ DEFINE_PROC ("PropFilter_DAV_COL_CREATE", proc514);
+ DEFINE_PROC ("PropFilter_DAV_COL_MOUNT", proc515);
+ DEFINE_PROC ("PropFilter_DAV_COL_MOUNT_HERE", proc516);
+ DEFINE_PROC ("PropFilter_DAV_DELETE", proc517);
+ DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD", proc518);
+ DEFINE_PROC ("PropFilter_DAV_PROP_REMOVE", proc519);
+ DEFINE_PROC ("PropFilter_DAV_PROP_SET", proc520);
+ DEFINE_PROC ("PropFilter_DAV_PROP_GET", proc521);
+ DEFINE_PROC ("PropFilter_DAV_PROP_LIST", proc522);
+ DEFINE_PROC ("PropFilter_DAV_DIR_SINGLE", proc523);
+ DEFINE_PROC ("PropFilter_DAV_DIR_LIST", proc524);
+ DEFINE_PROC ("PropFilter_DAV_DIR_FILTER", proc525);
+ DEFINE_PROC ("PropFilter_DAV_SEARCH_ID", proc526);
+ DEFINE_PROC ("PropFilter_DAV_SEARCH_PATH", proc527);
+ DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD_COPY", proc528);
+ DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD_MOVE", proc529);
+ DEFINE_PROC ("PropFilter_DAV_RES_CONTENT", proc530);
+ DEFINE_PROC ("PropFilter_DAV_SYMLINK", proc531);
+ DEFINE_PROC ("PropFilter_DAV_LOCK", proc532);
+ DEFINE_PROC ("PropFilter_DAV_UNLOCK", proc533);
+ DEFINE_PROC ("PropFilter_DAV_IS_LOCKED", proc534);
+ DEFINE_PROC ("PropFilter_DAV_LIST_LOCKS", proc535);
/* DET_RDFData.sql */
- 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);
+ DEFINE_PROC ("DB.DBA.RDFData_log_message", proc536);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_AUTHENTICATE", proc537);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_AUTHENTICATE_HTTP", proc538);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_GET_PARENT", proc539);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_CREATE", proc540);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_MOUNT", proc541);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_MOUNT_HERE", proc542);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DELETE", proc543);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD", proc544);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_REMOVE", proc545);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_SET", proc546);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_GET", proc547);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_LIST", proc548);
+ DEFINE_PROC ("DB.DBA.RDFData_ACCESS_PARAMS", proc549);
+ DEFINE_PROC ("DB.DBA.RDFData_cast_dt_silent", proc550);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_SINGLE", proc551);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_LIST", proc552);
+ DEFINE_PROC ("RDFData_std_pref", proc553);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_FILTER", proc554);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_SEARCH_ID", proc555);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_SEARCH_PATH", proc556);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD_COPY", proc557);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD_MOVE", proc558);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_CONTENT", proc559);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_SYMLINK", proc560);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DEREFERENCE_LIST", proc561);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RESOLVE_PATH", proc562);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_LOCK", proc563);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_UNLOCK", proc564);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_IS_LOCKED", proc565);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_LIST_LOCKS", proc566);
+ DEFINE_PROC ("DB.DBA.RDFData_MAKE_DET_COL", proc567);
/* DET_S3.sql */
- 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);
+ DEFINE_PROC ("S3_DAV_AUTHENTICATE", proc568);
+ DEFINE_PROC ("S3_DAV_AUTHENTICATE_HTTP", proc569);
+ DEFINE_PROC ("S3_DAV_GET_PARENT", proc570);
+ DEFINE_PROC ("S3_DAV_COL_CREATE", proc571);
+ DEFINE_PROC ("S3_DAV_COL_MOUNT", proc572);
+ DEFINE_PROC ("S3_DAV_COL_MOUNT_HERE", proc573);
+ DEFINE_PROC ("S3_DAV_DELETE", proc574);
+ DEFINE_PROC ("S3_DAV_RES_UPLOAD", proc575);
+ DEFINE_PROC ("S3_DAV_PROP_REMOVE", proc576);
+ DEFINE_PROC ("S3_DAV_PROP_SET", proc577);
+ DEFINE_PROC ("S3_DAV_PROP_GET", proc578);
+ DEFINE_PROC ("S3_DAV_PROP_LIST", proc579);
+ DEFINE_PROC ("S3_DAV_DIR_SINGLE", proc580);
+ DEFINE_PROC ("S3_DAV_DIR_LIST", proc581);
+ DEFINE_PROC ("S3_DAV_DIR_FILTER", proc582);
+ DEFINE_PROC ("S3_DAV_SEARCH_ID", proc583);
+ DEFINE_PROC ("S3_DAV_MAKE_ID", proc584);
+ DEFINE_PROC ("S3_DAV_SEARCH_PATH", proc585);
+ DEFINE_PROC ("S3_DAV_RES_UPLOAD_COPY", proc586);
+ DEFINE_PROC ("S3_DAV_RES_UPLOAD_MOVE", proc587);
+ DEFINE_PROC ("S3_DAV_RES_CONTENT", proc588);
+ DEFINE_PROC ("S3_DAV_SYMLINK", proc589);
+ DEFINE_PROC ("S3_DAV_DEREFERENCE_LIST", proc590);
+ DEFINE_PROC ("S3_DAV_RESOLVE_PATH", proc591);
+ DEFINE_PROC ("S3_DAV_LOCK", proc592);
+ DEFINE_PROC ("S3_DAV_UNLOCK", proc593);
+ DEFINE_PROC ("S3_DAV_IS_LOCKED", proc594);
+ DEFINE_PROC ("S3_DAV_LIST_LOCKS", proc595);
+ DEFINE_PROC ("DB.DBA.S3__encode", proc596);
+ DEFINE_PROC ("DB.DBA.S3__md5", proc597);
+ DEFINE_PROC ("DB.DBA.S3__detcolId", proc598);
+ DEFINE_PROC ("DB.DBA.S3__davId", proc599);
+ DEFINE_PROC ("DB.DBA.S3__user", proc600);
+ DEFINE_PROC ("DB.DBA.S3__password", proc601);
+ DEFINE_PROC ("DB.DBA.S3__owner", proc602);
+ DEFINE_PROC ("DB.DBA.S3__detName", proc603);
+ DEFINE_PROC ("DB.DBA.S3__path", proc604);
+ DEFINE_PROC ("DB.DBA.S3__parts2path", proc605);
+ DEFINE_PROC ("DB.DBA.S3__workPath", proc606);
+ DEFINE_PROC ("DB.DBA.S3__params", proc607);
+ DEFINE_PROC ("DB.DBA.S3__paramSet", proc608);
+ DEFINE_PROC ("DB.DBA.S3__paramGet", proc609);
+ DEFINE_PROC ("DB.DBA.S3__paramRemove", proc610);
+ DEFINE_PROC ("DB.DBA.S3__obj2xml", proc611);
+ DEFINE_PROC ("DB.DBA.S3__xml2string", proc612);
+ DEFINE_PROC ("DB.DBA.S3__entryXPath", proc613);
+ DEFINE_PROC ("DB.DBA.S3__entryXMLUpdate", proc614);
+ DEFINE_PROC ("DB.DBA.S3__removeKeyword", proc615);
+ DEFINE_PROC ("DB.DBA.S3__makeUrl", proc616);
+ DEFINE_PROC ("DB.DBA.S3__bucketFromUrl", proc617);
+ DEFINE_PROC ("DB.DBA.S3__nameFromUrl", proc618);
+ DEFINE_PROC ("DB.DBA.S3__pathFromUrl", proc619);
+ DEFINE_PROC ("DB.DBA.S3__makeAWSHeader", proc620);
+ DEFINE_PROC ("DB.DBA.S3__exec_error", proc621);
+ DEFINE_PROC ("DB.DBA.S3__exec_code", proc622);
+ DEFINE_PROC ("DB.DBA.S3__davList", proc623);
+ DEFINE_PROC ("DB.DBA.S3__list", proc624);
+ DEFINE_PROC ("DB.DBA.S3__listBuckets", proc625);
+ DEFINE_PROC ("DB.DBA.S3__listBucket", proc626);
+ DEFINE_PROC ("DB.DBA.S3__putObject", proc627);
+ DEFINE_PROC ("DB.DBA.S3__deleteObject", proc628);
+ DEFINE_PROC ("DB.DBA.S3__activity", proc629);
+ DEFINE_PROC ("DB.DBA.S3__downloads", proc630);
+ DEFINE_PROC ("DB.DBA.S3__downloads_aq", proc631);
+ DEFINE_PROC ("DB.DBA.S3__rdf", proc632);
+ DEFINE_PROC ("DB.DBA.S3__rdf_aq", proc633);
+ DEFINE_PROC ("DB.DBA.S3__rdf_insert", proc634);
+ DEFINE_PROC ("DB.DBA.S3__rdf_delete", proc635);
+ DEFINE_PROC ("DB.DBA.S3__refresh", proc636);
/* DET_DynaRes.sql */
ddl_ensure_table ("WS.WS.DYNA_RES", tbl8);
- 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);
+ DEFINE_PROC ("DynaRes_ACCESS_PARAMS", proc637);
+ DEFINE_PROC ("DynaRes_DAV_AUTHENTICATE", proc638);
+ DEFINE_PROC ("DynaRes_DAV_AUTHENTICATE_HTTP", proc639);
+ DEFINE_PROC ("DynaRes_DAV_GET_PARENT", proc640);
+ DEFINE_PROC ("DynaRes_DAV_COL_CREATE", proc641);
+ DEFINE_PROC ("DynaRes_DAV_COL_MOUNT", proc642);
+ DEFINE_PROC ("DynaRes_DAV_COL_MOUNT_HERE", proc643);
+ DEFINE_PROC ("DynaRes_DAV_DELETE", proc644);
+ DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD", proc645);
+ DEFINE_PROC ("DynaRes_DAV_PROP_REMOVE", proc646);
+ DEFINE_PROC ("DynaRes_DAV_PROP_SET", proc647);
+ DEFINE_PROC ("DynaRes_DAV_PROP_GET", proc648);
+ DEFINE_PROC ("DynaRes_DAV_PROP_LIST", proc649);
+ DEFINE_PROC ("DynaRes_DAV_DIR_SINGLE", proc650);
+ DEFINE_PROC ("DynaRes_DAV_DIR_LIST", proc651);
+ DEFINE_PROC ("DynaRes_DAV_FC_PRED_METAS", proc652);
+ DEFINE_PROC ("DynaRes_DAV_FC_TABLE_METAS", proc653);
+ DEFINE_PROC ("DynaRes_DAV_FC_PRINT_WHERE", proc654);
+ DEFINE_PROC ("DynaRes_DAV_DIR_FILTER", proc655);
+ DEFINE_PROC ("DynaRes_DAV_SEARCH_ID", proc656);
+ DEFINE_PROC ("DynaRes_DAV_SEARCH_PATH", proc657);
+ DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD_COPY", proc658);
+ DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD_MOVE", proc659);
+ DEFINE_PROC ("DynaRes_DAV_RES_CONTENT", proc660);
+ DEFINE_PROC ("DynaRes_DAV_SYMLINK", proc661);
+ DEFINE_PROC ("DynaRes_DAV_DEREFERENCE_LIST", proc662);
+ DEFINE_PROC ("DynaRes_DAV_RESOLVE_PATH", proc663);
+ DEFINE_PROC ("DynaRes_DAV_LOCK", proc664);
+ DEFINE_PROC ("DynaRes_DAV_UNLOCK", proc665);
+ DEFINE_PROC ("DynaRes_DAV_IS_LOCKED", proc666);
+ DEFINE_PROC ("DynaRes_DAV_LIST_LOCKS", proc667);
+ DEFINE_PROC ("DynaRes_CF_PROPNAME_TO_COLNAME", proc668);
+ DEFINE_PROC ("DynaRes_CF_FEED_FROM_AND_WHERE", proc669);
+ DEFINE_PROC ("DynaRes_CF_LIST_PROP_DISTVALS", proc670);
+ DEFINE_PROC ("DynaRes_CF_GET_RDF_HITS", proc671);
+ DEFINE_PROC ("DynaRes_INSERT_RESOURCE", proc672);
/* DET_Versioning.sql */
@@ -29940,68 +31514,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", proc639);
+ DEFINE_PROC ("Versioning_ADD_NEW_DIFF", proc673);
ddl_std_proc (trig44, 0x0);
ddl_std_proc (trig45, 0x0);
- 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);
+ DEFINE_PROC ("DAV_GET_VERSION_CONTENT", proc674);
+ DEFINE_PROC ("DAV_RES_RESTORE", proc675);
+ DEFINE_PROC ("Versioning_DAV_AUTHENTICATE", proc676);
+ DEFINE_PROC ("Versioning_DAV_AUTHENTICATE_HTTP", proc677);
+ DEFINE_PROC ("Versioning_DAV_GET_PARENT", proc678);
+ DEFINE_PROC ("Versioning_DAV_COL_CREATE", proc679);
+ DEFINE_PROC ("Versioning_DAV_COL_MOUNT", proc680);
+ DEFINE_PROC ("Versioning_DAV_COL_MOUNT_HERE", proc681);
+ DEFINE_PROC ("Versioning_DAV_DELETE", proc682);
+ DEFINE_PROC ("Versioning_DAV_RES_UPLOAD", proc683);
+ DEFINE_PROC ("Versioning_DAV_PROP_REMOVE", proc684);
+ DEFINE_PROC ("Versioning_DAV_PROP_SET", proc685);
+ DEFINE_PROC ("Versioning_DAV_PROP_GET", proc686);
+ DEFINE_PROC ("Versioning_root_version", proc687);
+ DEFINE_PROC ("Versioning_version_set", proc688);
+ DEFINE_PROC ("Versioning_DAV_PROP_LIST", proc689);
+ DEFINE_PROC ("Versioning_DAV_DIR_SINGLE", proc690);
+ DEFINE_PROC ("Versioning_GET_BASE_PATH", proc691);
+ DEFINE_PROC ("Versioning_GET_ATTIC_PATH", proc692);
+ DEFINE_PROC ("Versioning_SET_LIST", proc693);
+ DEFINE_PROC ("Versioning_DAV_DIR_LIST", proc694);
+ DEFINE_PROC ("Versioning_DAV_DIR_FILTER", proc695);
+ DEFINE_PROC ("Versioning_DAV_SEARCH_ID", proc696);
+ DEFINE_PROC ("Versioning_DAV_SEARCH_PATH", proc697);
+ DEFINE_PROC ("Versioning_DAV_RES_UPLOAD_COPY", proc698);
+ DEFINE_PROC ("Versioning_DAV_RES_UPLOAD_MOVE", proc699);
+ DEFINE_PROC ("Versioning_DAV_RES_CONTENT", proc700);
+ DEFINE_PROC ("Versioning_DAV_SYMLINK", proc701);
+ DEFINE_PROC ("Versioning_DAV_DEREFERENCE_LIST", proc702);
+ DEFINE_PROC ("Versioning_DAV_RESOLVE_PATH", proc703);
+ DEFINE_PROC ("Versioning_DAV_LOCK", proc704);
+ DEFINE_PROC ("Versioning_DAV_UNLOCK", proc705);
+ DEFINE_PROC ("Versioning_DAV_IS_LOCKED", proc706);
+ DEFINE_PROC ("Versioning_DAV_LIST_LOCKS", proc707);
+ DEFINE_PROC ("Versioning_AUTO_VERSION_PROP", proc708);
+ DEFINE_PROC ("DAV_SET_VERSIONING_PROPERTIES", proc709);
+ DEFINE_PROC ("Versioning_REMOVE_V_PROPERTIES", proc710);
+ DEFINE_PROC ("DAV_REMOVE_VERSIONING_CONTROL_INT", proc711);
+ DEFINE_PROC ("Versioning_SETPROP", proc712);
+ DEFINE_PROC ("DAV_SET_VERSIONING_CONTROL", proc713);
+ DEFINE_PROC ("DAV_MKWORKSPACE", proc714);
+ DEFINE_PROC ("DAV_CHECKOUT", proc715);
+ DEFINE_PROC ("DAV_CHECKOUT_INT", proc716);
+ DEFINE_PROC ("DAV_CHECKIN", proc717);
+ DEFINE_PROC ("DAV_CHECKIN_INT", proc718);
+ DEFINE_PROC ("Versioning_CHECKOUT_INT", proc719);
ddl_std_proc (trig46, 0x0);
- 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);
+ DEFINE_PROC ("DAV_VERSION_CONTROL", proc720);
+ DEFINE_PROC ("DAV_UNCHECKOUT", proc721);
+ DEFINE_PROC ("Versioning_Attic", proc722);
+ DEFINE_PROC ("Versioning_OTHER_FILES_IN_VVC", proc723);
+ DEFINE_PUBLIC_PROC ("DAV_REMOVE_VERSION_CONTROL", proc724);
+ DEFINE_PUBLIC_PROC ("DAV_VERSION_FOLD_INT", proc725);
ddl_std_proc (trig47, 0x0);
/* xml_view.sql */
- DEFINE_PROC ("XML_VIEW_PUBLISH", proc692);
- DEFINE_PROC ("XML_VIEW_DROP", proc693);
+ DEFINE_PROC ("XML_VIEW_PUBLISH", proc726);
+ DEFINE_PROC ("XML_VIEW_DROP", proc727);
}
diff --git a/libsrc/Wi/sql_code_dbp.c b/libsrc/Wi/sql_code_dbp.c
index 1b8918b..1798f47 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-2011 OpenLink Software.</P></TD></TR>\');\n"
+"http (\' DBPUMP Interface - Copyright© 1998-2012 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 3b775dc..87aefe0 100644
--- a/libsrc/Wi/sql_code_ddk.c
+++ b/libsrc/Wi/sql_code_ddk.c
@@ -64,7 +64,7 @@ static const char *tbl3 =
"COL_PERMS char (11),\n"
"COL_DET varchar,\n"
"COL_ACL long varbinary,\n"
-"COL_IID IRI_ID,\n"
+"COL_IID IRI_ID_8,\n"
"COL_AUTO_VERSIONING char(1),\n"
"COL_FORK integer not null default 0,\n"
"COL_INHERIT char(1) default \'N\',\n"
@@ -90,7 +90,7 @@ static const char *tbl4 =
"RES_FULL_PATH varchar,\n"
"ROWGUID varchar,\n"
"RES_ACL long varbinary,\n"
-"RES_IID IRI_ID,\n"
+"RES_IID IRI_ID_8,\n"
"RES_STATUS varchar,\n"
"RES_VCR_ID integer,\n"
"RES_VCR_CO_VERSION integer,\n"
@@ -492,6 +492,12 @@ static const char *proc6 =
"while (_id > 0)\n"
"{\n"
"select COL_NAME, COL_PARENT into _name, _p_id from WS.WS.SYS_DAV_COL where COL_ID = _id;\n"
+"if (_id = _p_id)\n"
+"{\n"
+"log_message (sprintf (\'DAV collection %d is its own parent\', _id));\n"
+"_path := \'**circular**/\' || _path;\n"
+"return _path;\n"
+"}\n"
"_id := _p_id;\n"
"_path := concat (\'/\', _name, _path);\n"
"}\n"
@@ -502,7 +508,7 @@ static const char *proc6 =
"--src davddk.sql:539\n";
static const char *proc7 =
-"#line 562 \"[executable]/davddk.sql\"\n"
+"#line 568 \"[executable]/davddk.sql\"\n"
"create function DB.DBA.DAV_CHANGED_FUNCTIONS () returns any\n"
"{\n"
"return vector (\n"
@@ -940,10 +946,10 @@ static const char *proc7 =
"\'WS.WS.SYS_DAV_COL_INIT\'\n"
");\n"
"}\n"
-"--src davddk.sql:560\n";
+"--src davddk.sql:566\n";
static const char *proc8 =
-"#line 1003 \"[executable]/davddk.sql\"\n"
+"#line 1009 \"[executable]/davddk.sql\"\n"
"create procedure WS.WS.SYS_DAV_INIT ()\n"
"{\n"
"declare dav_status varchar;\n"
@@ -1073,25 +1079,36 @@ static const char *proc8 =
"values (http_nobody_uid (), \'nobody\',\'Special account\', \'nobody at example.domain\', pwd_magic_calc (\'nobody\', uuid()), http_admin_gid (), \'110100000\', 1, 0, 1);\n"
"insert soft DB.DBA.SYS_USERS (U_ID, U_NAME, U_FULL_NAME, U_E_MAIL, U_PASSWORD, U_GROUP, U_DEF_PERMS, U_ACCOUNT_DISABLED, U_SQL_ENABLE, U_DAV_ENABLE, U_IS_ROLE)\n"
"values (http_nogroup_gid (), \'nogroup\',\'Special group\', \'nobody at example.domain\', \'\', NULL, \'110100000\', 0, 0, 1, 1);\n"
+"if (not exists (select top 1 1 from DB.DBA.SYS_USERS where U_ID = __rdf_repl_uid()))\n"
+"{\n"
+"declare passwd varchar;\n"
+"passwd := uuid();\n"
+"insert replacing DB.DBA.SYS_USERS (U_ID, U_NAME, U_FULL_NAME, U_E_MAIL, U_PASSWORD, U_GROUP, U_DEF_PERMS, U_ACCOUNT_DISABLED, U_SQL_ENABLE, U_DAV_ENABLE)\n"
+"values (__rdf_repl_uid(), \'__rdf_repl\',\'Special account\', \'nobody at example.domain\', pwd_magic_calc (\'__rdf_repl\', passwd), http_admin_gid (), \'110100000\', 0, 1, 1);\n"
+"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'sec_set_user_struct (?,?,?,?,?,?,?)\', vector (\n"
+"\'__rdf_repl\', passwd, __rdf_repl_uid(), http_admin_gid (), concat (\'Q \', \'DB\'), 0, NULL, NULL));\n"
+"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'sec_user_enable (?, ?)\', vector (\'__rdf_repl\', 0));\n"
+"}\n"
+"commit work;\n"
"__atomic (0);\n"
"return;\n"
"}\n"
-"--src davddk.sql:1001\n";
+"--src davddk.sql:1007\n";
static const char *proc9 =
-"#line 1137 \"[executable]/davddk.sql\"\n"
+"#line 1154 \"[executable]/davddk.sql\"\n"
"create procedure WS.WS.SYS_DAV_INIT_1 ()\n"
"{\n"
"if (sys_stat (\'cl_run_local_only\') <> 1)\n"
"return;\n"
"WS.WS.SYS_DAV_INIT ();\n"
"}\n"
-"--src davddk.sql:1135\n";
+"--src davddk.sql:1152\n";
static const char *other6 =
"WS.WS.SYS_DAV_INIT_1 ()\n";
static const char *proc10 =
-"#line 1148 \"[executable]/davddk.sql\"\n"
+"#line 1165 \"[executable]/davddk.sql\"\n"
"create procedure\n"
"WS.WS.SYS_DAV_PROP_PROP_VALUE_INDEX_HOOK (inout vtb any, inout d_id integer)\n"
"{\n"
@@ -1116,10 +1133,10 @@ static const char *proc10 =
"}\n"
"return 1;\n"
"}\n"
-"--src davddk.sql:1146\n";
+"--src davddk.sql:1163\n";
static const char *proc11 =
-"#line 1174 \"[executable]/davddk.sql\"\n"
+"#line 1191 \"[executable]/davddk.sql\"\n"
"create procedure\n"
"WS.WS.SYS_DAV_PROP_PROP_VALUE_UNINDEX_HOOK (inout vtb any, inout d_id integer)\n"
"{\n"
@@ -1144,7 +1161,7 @@ static const char *proc11 =
"}\n"
"return 1;\n"
"}\n"
-"--src davddk.sql:1172\n";
+"--src davddk.sql:1189\n";
static const char *other7 =
"DB.DBA.vt_create_text_index (\'WS.WS.SYS_DAV_PROP\', \'PROP_VALUE\', \'PROP_ID\', 2, 0, vector (), 1, \'*ini*\', \'*ini*\')\n";
@@ -2829,32 +2846,32 @@ static const char *other846 =
static const char *other847 =
"select count(*) from WS.WS.SYS_DAV_RES_TYPES where http_mime_type_add (T_EXT, T_TYPE)\n";
static const char *trig0 =
-"#line 2889 \"[executable]/davddk.sql\"\n"
+"#line 2906 \"[executable]/davddk.sql\"\n"
"create trigger SYS_DAV_RES_TYPES_I after insert on WS.WS.SYS_DAV_RES_TYPES referencing new as N\n"
"{\n"
"http_mime_type_add (N.T_EXT, N.T_TYPE);\n"
"}\n"
-"--src davddk.sql:2887\n";
+"--src davddk.sql:2904\n";
static const char *trig1 =
-"#line 2895 \"[executable]/davddk.sql\"\n"
+"#line 2912 \"[executable]/davddk.sql\"\n"
"create trigger SYS_DAV_RES_TYPES_U after update on WS.WS.SYS_DAV_RES_TYPES referencing old as O, new as N\n"
"{\n"
"http_mime_type_add (N.T_EXT, N.T_TYPE);\n"
"http_mime_type_add (O.T_EXT, null);\n"
"}\n"
-"--src davddk.sql:2893\n";
+"--src davddk.sql:2910\n";
static const char *trig2 =
-"#line 2902 \"[executable]/davddk.sql\"\n"
+"#line 2919 \"[executable]/davddk.sql\"\n"
"create trigger SYS_DAV_RES_TYPES_D after delete on WS.WS.SYS_DAV_RES_TYPES referencing old as O\n"
"{\n"
"http_mime_type_add (O.T_EXT, null);\n"
"}\n"
-"--src davddk.sql:2900\n";
+"--src davddk.sql:2917\n";
static const char *proc12 =
-"#line 2908 \"[executable]/davddk.sql\"\n"
+"#line 2925 \"[executable]/davddk.sql\"\n"
"create procedure\n"
"DB.DBA.DAV_PLAIN_SUBCOLS_P (in root_id integer, in root_path varchar := null, in recursive integer := 1, in subcol_auth_uid varchar, in subcol_auth_pwd varchar)\n"
"{\n"
@@ -2881,10 +2898,10 @@ static const char *proc12 =
"}\n"
"}\n"
"}\n"
-"--src davddk.sql:2906\n";
+"--src davddk.sql:2923\n";
static const char *proc13 =
-"#line 2936 \"[executable]/davddk.sql\"\n"
+"#line 2953 \"[executable]/davddk.sql\"\n"
"create procedure\n"
"DB.DBA.DAV_PLAIN_SUBCOLS_P_INT (in root_id integer, in root_path varchar, in depth integer, in subcol_auth_uid varchar, in subcol_auth_pwd varchar)\n"
"{\n"
@@ -2895,13 +2912,13 @@ static const char *proc13 =
"DB.DBA.DAV_PLAIN_SUBCOLS_P_INT (COL_ID, full_path, depth + 1, subcol_auth_uid, subcol_auth_pwd);\n"
"}\n"
"}\n"
-"--src davddk.sql:2934\n";
+"--src davddk.sql:2951\n";
static const char *view6 =
"create procedure view DB.DBA.DAV_PLAIN_SUBCOLS as DB.DBA.DAV_PLAIN_SUBCOLS_P (root_id,root_path,recursive,subcol_auth_uid,subcol_auth_pwd) (SUBCOL_FULL_PATH varchar, SUBCOL_NAME varchar, SUBCOL_PARENT integer, SUBCOL_ID integer, SUBCOL_DEPTH integer, SUBCOL_DET varchar)\n";
static const char *proc14 =
-"#line 2953 \"[executable]/davddk.sql\"\n"
+"#line 2970 \"[executable]/davddk.sql\"\n"
"create procedure\n"
"DB.DBA.DAV_PLAIN_SUBMOUNTS_P (in root_id integer, in root_path varchar := null, in recursive integer := 1, in subcol_auth_uid varchar, in subcol_auth_pwd varchar)\n"
"{\n"
@@ -2928,10 +2945,10 @@ static const char *proc14 =
"}\n"
"}\n"
"}\n"
-"--src davddk.sql:2951\n";
+"--src davddk.sql:2968\n";
static const char *proc15 =
-"#line 2981 \"[executable]/davddk.sql\"\n"
+"#line 2998 \"[executable]/davddk.sql\"\n"
"create procedure\n"
"DB.DBA.DAV_PLAIN_SUBMOUNTS_P_INT (in root_id integer, in root_path varchar, in depth integer, in subcol_auth_uid varchar, in subcol_auth_pwd varchar)\n"
"{\n"
@@ -2943,13 +2960,13 @@ static const char *proc15 =
"DB.DBA.DAV_PLAIN_SUBMOUNTS_P_INT (COL_ID, full_path, depth + 1, subcol_auth_uid, subcol_auth_pwd);\n"
"}\n"
"}\n"
-"--src davddk.sql:2979\n";
+"--src davddk.sql:2996\n";
static const char *view7 =
"create procedure view DB.DBA.DAV_PLAIN_SUBMOUNTS as DB.DBA.DAV_PLAIN_SUBMOUNTS_P (root_id,root_path,recursive,subcol_auth_uid,subcol_auth_pwd) (SUBCOL_FULL_PATH varchar, SUBCOL_NAME varchar, SUBCOL_PARENT integer, SUBCOL_ID integer, SUBCOL_DEPTH integer, SUBCOL_DET varchar)\n";
static const char *proc16 =
-"#line 3000 \"[executable]/davddk.sql\"\n"
+"#line 3017 \"[executable]/davddk.sql\"\n"
" create procedure\n"
"DB.DBA.DAV_DIR_P (in path varchar := \'/DAV/\', in recursive integer := 0, in auth_uid varchar, in auth_pwd varchar)\n"
"{\n"
@@ -2978,7 +2995,7 @@ static const char *proc16 =
"i := i + 1;\n"
"}\n"
"}\n"
-"--src davddk.sql:2998\n";
+"--src davddk.sql:3015\n";
static const char *view8 =
"create procedure view DB.DBA.DAV_DIR as DB.DBA.DAV_DIR_P (path,recursive,auth_uid,auth_pwd) (FULL_PATH varchar, TYPE varchar, RLENGTH integer, MOD_TIME datetime, ID integer, PERMS varchar, GRP integer, OWNER integer, CR_TIME datetime, MIME_TYPE varchar, NAME varchar)\n";
@@ -4646,7 +4663,7 @@ static const char *proc41 =
"in header varchar := null,\n"
"in force varchar := null,\n"
"in \"output-format\" varchar := null,\n"
-"in get varchar := \'soft\',\n"
+"in get varchar := \'add\',\n"
"in login varchar := \'\') __SOAP_HTTP \'text/html\'\n"
"{\n"
"declare hdr, content, req_hdr any;\n"
@@ -4743,14 +4760,16 @@ static const char *proc41 =
"accept := \"output-format\";\n"
"}\n"
"stat := \'00000\';\n"
-"if (get not in (\'soft\', \'replacing\'))\n"
-"get := \'soft\';\n"
+"if (get not in (\'soft\', \'replacing\', \'add\'))\n"
+"get := \'add\';\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"
@@ -4765,6 +4784,7 @@ static const char *proc41 =
"url := \'nodeID:/\' || subseq (url, 6);\n"
"}\n"
"}\n"
+"}\n"
"\n"
"url := replace (url, \'\'\'\', \'%27\');\n"
"url := replace (url, \'<\', \'%3C\');\n"
@@ -4869,7 +4889,7 @@ static const char *proc41 =
"--src virtual_dir.sql:990\n";
static const char *proc42 =
-"#line 1220 \"[executable]/virtual_dir.sql\"\n"
+"#line 1223 \"[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"
@@ -4933,10 +4953,10 @@ static const char *proc42 =
"}\n"
"return string_output_string (ses);\n"
"}\n"
-"--src virtual_dir.sql:1218\n";
+"--src virtual_dir.sql:1221\n";
static const char *proc43 =
-"#line 1286 \"[executable]/virtual_dir.sql\"\n"
+"#line 1289 \"[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"
@@ -4971,10 +4991,10 @@ static const char *proc43 =
"}\n"
"return format;\n"
"}\n"
-"--src virtual_dir.sql:1284\n";
+"--src virtual_dir.sql:1287\n";
static const char *proc44 =
-"#line 1322 \"[executable]/virtual_dir.sql\"\n"
+"#line 1325 \"[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"
@@ -5021,10 +5041,10 @@ static const char *proc44 =
"signal (stat, msg);\n"
"return 0;\n"
"}\n"
-"--src virtual_dir.sql:1320\n";
+"--src virtual_dir.sql:1323\n";
static const char *proc45 =
-"#line 1370 \"[executable]/virtual_dir.sql\"\n"
+"#line 1373 \"[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"
@@ -5095,7 +5115,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:1368\n";
+"--src virtual_dir.sql:1371\n";
static const char *other868 =
"xslt_sheet (\'http://local.virt/dir_output\', xml_tree_doc (\'\n"
@@ -5148,7 +5168,7 @@ static const char *other868 =
"\n"
"</xsl:stylesheet>\'))\n";
static const char *proc46 =
-"#line 1495 \"[executable]/virtual_dir.sql\"\n"
+"#line 1498 \"[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"
@@ -5186,10 +5206,10 @@ static const char *proc46 =
"set http_charset=\'UTF-8\';\n"
"return http_value (xslt (ssheet_name, _xml));\n"
"}\n"
-"--src virtual_dir.sql:1493\n";
+"--src virtual_dir.sql:1496\n";
static const char *proc47 =
-"#line 1534 \"[executable]/virtual_dir.sql\"\n"
+"#line 1537 \"[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"
@@ -5223,7 +5243,7 @@ static const char *proc47 =
"}\n"
"http(\'</inspection>\');\n"
"}\n"
-"--src virtual_dir.sql:1532\n";
+"--src virtual_dir.sql:1535\n";
static const char *tbl32 =
"create table WS.WS.HTTP_HOST_META (\n"
@@ -5232,7 +5252,7 @@ static const char *tbl32 =
")\n";
static const char *proc48 =
-"#line 1577 \"[executable]/virtual_dir.sql\"\n"
+"#line 1580 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.host_meta_add (in app varchar, in meta varchar)\n"
"{\n"
"\n"
@@ -5240,18 +5260,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:1575\n";
+"--src virtual_dir.sql:1578\n";
static const char *proc49 =
-"#line 1586 \"[executable]/virtual_dir.sql\"\n"
+"#line 1589 \"[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:1584\n";
+"--src virtual_dir.sql:1587\n";
static const char *proc50 =
-"#line 1593 \"[executable]/virtual_dir.sql\"\n"
+"#line 1596 \"[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"
@@ -5282,10 +5302,10 @@ static const char *proc50 =
"}\n"
"return ret;\n"
"}\n"
-"--src virtual_dir.sql:1591\n";
+"--src virtual_dir.sql:1594\n";
static const char *proc51 =
-"#line 1625 \"[executable]/virtual_dir.sql\"\n"
+"#line 1628 \"[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"
@@ -5297,12 +5317,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:1623\n";
+"--src virtual_dir.sql:1626\n";
static const char *other869 =
"WS.WS.host_meta_init ()\n";
static const char *proc52 =
-"#line 1641 \"[executable]/virtual_dir.sql\"\n"
+"#line 1644 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.host_meta_dss ()\n"
"{\n"
"declare ses any;\n"
@@ -5334,7 +5354,7 @@ static const char *proc52 =
"http (\'</Signature>\\n\', ses);\n"
"return string_output_string (ses);\n"
"}\n"
-"--src virtual_dir.sql:1639\n";
+"--src virtual_dir.sql:1642\n";
/* url_rewrite.sql */
@@ -6542,7 +6562,7 @@ static const char *proc73 =
"declare rule_iri, in_path, qstr, meth varchar;\n"
"declare target_vhost_pkey, hf, accept, http_headers any;\n"
"declare result, http_redir, http_tcn_code, tcn_rc, keep_lpath int;\n"
-"declare http_tcn_headers varchar;\n"
+"declare http_tcn_headers, exp_fn varchar;\n"
"\n"
"\n"
"\n"
@@ -6552,12 +6572,14 @@ static const char *proc73 =
"in_path := \'/\';\n"
"accept := null;\n"
"qstr := null;\n"
+"exp_fn := null;\n"
"keep_lpath := 0;\n"
"meth := \'GET\';\n"
"\n"
"if (is_http_ctx ())\n"
"{\n"
"keep_lpath := http_map_get (\'url_rewrite_keep_lpath\');\n"
+"exp_fn := http_map_get (\'expiration_function\');\n"
"lines := http_request_header ();\n"
"if (length (lines))\n"
"{\n"
@@ -6577,6 +6599,12 @@ static const char *proc73 =
"lines := vector ();\n"
"}\n"
"\n"
+"if (isstring (exp_fn) and (__proc_exists (exp_fn) is not null) and (1 = call (exp_fn) (lines, http_map_get (\'options\'))))\n"
+"{\n"
+"http_body_read ();\n"
+"return 1;\n"
+"}\n"
+"\n"
"if (length (qstr))\n"
"in_path := in_path || \'?\' || qstr;\n"
"\n"
@@ -6683,7 +6711,7 @@ static const char *proc73 =
"--src url_rewrite.sql:1202\n";
static const char *proc74 =
-"#line 1353 \"[executable]/url_rewrite.sql\"\n"
+"#line 1361 \"[executable]/url_rewrite.sql\"\n"
"create procedure DB.DBA.URLREWRITE_DUMP_RULELIST_SQL (in rulelist_iri varchar)\n"
"{\n"
"declare ses, rules any;\n"
@@ -6752,12 +6780,231 @@ static const char *proc74 =
"\n"
"return string_output_string (ses);\n"
"}\n"
-"--src url_rewrite.sql:1351\n";
+"--src url_rewrite.sql:1359\n";
static const char *other870 =
"virt_proxy_init ()\n";
static const char *other871 =
"grant execute on ext_http_proxy to PROXY\n";
+static const char *proc75 =
+"#line 1449 \"[executable]/url_rewrite.sql\"\n"
+"create procedure\n"
+"url_rewrite_mime_types ()\n"
+"{\n"
+"return vector (\n"
+"vector (\'html\', \'text/html\', 1.0),\n"
+"vector (\'xml\', \'application/rdf+xml\', 0.95),\n"
+"vector (\'n3\', \'text/n3\', 0.80),\n"
+"vector (\'nt\', \'text/rdf+n3\', 0.80),\n"
+"vector (\'ttlx\', \'application/x-turtle\', 0.70),\n"
+"vector (\'ttl\', \'text/turtle\', 0.70),\n"
+"vector (\'n3s\', \'text/ntriples\', 0.70),\n"
+"vector (\'json\', \'application/json\', 0.60),\n"
+"vector (\'jrdf\', \'application/rdf+json\', 0.60),\n"
+"vector (\'atom\', \'application/atom+xml\', 0.50),\n"
+"vector (\'jsod\', \'application/odata+json\',0.50),\n"
+"vector (\'ld\', \'application/ld+json\',0.50),\n"
+"vector (\'md\', \'application/microdata+json\',0.50)\n"
+");\n"
+"}\n"
+"--src url_rewrite.sql:1447\n";
+
+static const char *proc76 =
+"#line 1470 \"[executable]/url_rewrite.sql\"\n"
+"create procedure\n"
+"url_rewrite_mime_pattern ()\n"
+"{\n"
+"declare x, res any;\n"
+"x := url_rewrite_mime_types ();\n"
+"res := \'\';\n"
+"foreach (varchar p in x) do\n"
+"{\n"
+"res := res || sprintf (\'(%s)|\', replace (p[1], \'+\', \'\\\\\\\\+\'));\n"
+"}\n"
+"return rtrim (res, \'|\');\n"
+"}\n"
+"--src url_rewrite.sql:1468\n";
+
+static const char *proc77 =
+"#line 1484 \"[executable]/url_rewrite.sql\"\n"
+"create procedure\n"
+"url_rewrite_gen_describe (in graph varchar, in iri_spf varchar)\n"
+"{\n"
+"declare ret, qr any;\n"
+"qr := sprintf (\'DESCRIBE <%s>\', iri_spf);\n"
+"ret := sprintf (\'/sparql?default-graph-uri=%U&query=%U\', graph, qr);\n"
+"ret := replace (ret, \'%\', \'%%\');\n"
+"ret := replace (ret, \'@@placeholder@@\', \'%s\');\n"
+"return ret;\n"
+"}\n"
+"--src url_rewrite.sql:1482\n";
+
+static const char *proc78 =
+"#line 1496 \"[executable]/url_rewrite.sql\"\n"
+"create procedure\n"
+"url_rewrite_gen_vsp (in graph varchar, in iri_spf varchar)\n"
+"{\n"
+"declare ret, qr any;\n"
+"ret := sprintf (\'/describe/?url=%s\', iri_spf);\n"
+"return ret;\n"
+"}\n"
+"--src url_rewrite.sql:1494\n";
+
+static const char *proc79 =
+"#line 1505 \"[executable]/url_rewrite.sql\"\n"
+"create procedure\n"
+"url_rewrite_from_template (in prefix varchar, in graph varchar, in iri_pattern varchar, in url_pattern varchar, in flags int := 0)\n"
+"{\n"
+"declare arr, h, iri_path, iri_regex, iri_spf, iri_tcn, url_spf, url_regex, url_tcn, iri_param, url_param, iri_vd, url_vd any;\n"
+"declare pos, nth, fct int;\n"
+"\n"
+"pos := 0; nth := 1;\n"
+"h := WS.WS.PARSE_URI (iri_pattern);\n"
+"arr := regexp_parse (\'{[[:alpha:]]+}\', h[2], pos);\n"
+"if (arr is null) signal (\'.....\', \'Invalid IRI pattern\');\n"
+"iri_vd := subseq (h[2], pos, arr[0]);\n"
+"iri_regex := iri_spf := iri_tcn := \'\';\n"
+"iri_param := vector ();\n"
+"while (arr is not null)\n"
+"{\n"
+"declare param any;\n"
+"param := subseq (h[2], arr[0], arr[1]);\n"
+"iri_regex := iri_regex || subseq (h[2], pos, arr[0]) || \'(.*)\';\n"
+"iri_spf := iri_spf || subseq (h[2], pos, arr[0]) || \'@@placeholder@@\';\n"
+"iri_tcn := iri_tcn || subseq (h[2], pos, arr[0]) || sprintf (\'\\\\x24%d\', nth);\n"
+"param := trim (param, \'{}\');\n"
+"iri_param := vector_concat (iri_param, vector (param));\n"
+"pos := arr[1];\n"
+"arr := regexp_parse (\'{[[:alpha:]]+}\', h[2], pos);\n"
+"nth := nth + 1;\n"
+"}\n"
+"iri_regex := iri_regex || subseq (h[2], pos);\n"
+"iri_spf := iri_spf || subseq (h[2], pos);\n"
+"iri_tcn := iri_tcn || subseq (h[2], pos);\n"
+"\n"
+"if (h[1] = \'{HostName}\') h[1] := registry_get (\'URIQADefaultHost\');\n"
+"h[2] := iri_spf;\n"
+"iri_spf := WS.WS.VFS_URI_COMPOSE (h);\n"
+"h[2] := iri_tcn;\n"
+"iri_tcn := WS.WS.VFS_URI_COMPOSE (h);\n"
+"\n"
+"pos := 0; nth := 1;\n"
+"h := WS.WS.PARSE_URI (url_pattern);\n"
+"arr := regexp_parse (\'{[[:alpha:]]+}\', h[2], pos);\n"
+"if (arr is null) signal (\'.....\', \'Invalid URL pattern\');\n"
+"url_spf := url_regex := url_tcn := \'\';\n"
+"url_param := vector ();\n"
+"url_vd := subseq (h[2], pos, arr[0]);\n"
+"while (arr is not null)\n"
+"{\n"
+"declare param any;\n"
+"param := subseq (h[2], arr[0], arr[1]);\n"
+"if (param <> \'{Extension}\')\n"
+"{\n"
+"url_spf := url_spf || subseq (h[2], pos, arr[0]) || \'%s\';\n"
+"url_regex := url_regex || subseq (h[2], pos, arr[0]) || \'(.*)\';\n"
+"url_tcn := url_tcn || subseq (h[2], pos, arr[0]) || sprintf (\'\\\\x24%d\', nth);\n"
+"param := trim (param, \'{}\');\n"
+"url_param := vector_concat (url_param, vector (param));\n"
+"nth := nth + 1;\n"
+"}\n"
+"else\n"
+"{\n"
+"url_spf := url_spf || subseq (h[2], pos, arr[0]) || param;\n"
+"url_regex := url_regex || subseq (h[2], pos, arr[0]) || param;\n"
+"url_tcn := url_tcn || subseq (h[2], pos, arr[0]) || param;\n"
+"}\n"
+"pos := arr[1];\n"
+"arr := regexp_parse (\'{[[:alpha:]]+}\', h[2], pos);\n"
+"}\n"
+"url_spf := url_spf || subseq (h[2], pos);\n"
+"url_regex := url_regex || subseq (h[2], pos);\n"
+"\n"
+"\n"
+"declare ses, mime_types any;\n"
+"ses := string_output ();\n"
+"\n"
+"iri_vd := rtrim (iri_vd, \'/\');\n"
+"url_vd := rtrim (url_vd, \'/\');\n"
+"\n"
+"http (\'-- Virtual Directories \\n\', ses);\n"
+"http (sprintf (\'DB.DBA.VHOST_REMOVE (lpath=>\\\'%s\\\');\\n\', iri_vd), ses);\n"
+"http (sprintf (\'DB.DBA.VHOST_REMOVE (lpath=>\\\'%s\\\');\\n\', url_vd), ses);\n"
+"http (sprintf (\'DB.DBA.VHOST_DEFINE (lpath=>\\\'%s\\\', ppath=>\\\'/\\\', is_dav=>0, opts=>vector (\\\'url_rewrite\\\', \\\'%s_iri_rule_list\\\'));\\n\', iri_vd, prefix), ses);\n"
+"http (sprintf (\'DB.DBA.VHOST_DEFINE (lpath=>\\\'%s\\\', ppath=>\\\'/404.html\\\', is_dav=>0, opts=>vector (\\\'url_rewrite\\\', \\\'%s_url_rule_list\\\'));\\n\', url_vd, prefix), ses);\n"
+"http (\'\\n\', ses);\n"
+"\n"
+"http (\'-- Rule list for abstract\\n\', ses);\n"
+"\n"
+"http (sprintf (\'DB.DBA.URLREWRITE_CREATE_RULELIST ( \\\'%s_iri_rule_list\\\', 1, vector (\\\'%s_iri_rule_1\\\', \\\'%s_iri_rule_2\\\'));\\n\', prefix, prefix, prefix), ses);\n"
+"http (sprintf (\'DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( \\\'%s_iri_rule_1\\\', 1, \\\'%s\\\', %s, 1, \\\'%s\\\', %s, null, null, 2, 406, null); \\n\',\n"
+"prefix,\n"
+"iri_regex,\n"
+"sys_sql_val_print (iri_param),\n"
+"rtrim (replace (replace (url_spf, \'{Extension}\', \'\'), \'//\', \'/\'), \'.\'),\n"
+"sys_sql_val_print (url_param)\n"
+"), ses);\n"
+"\n"
+"http (sprintf (\'DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( \\\'%s_iri_rule_2\\\', 1, \\\'%s\\\', %s, 1, \\\'%s\\\', %s, null,\\n \\\'%s\\\', 2, 303, null); \\n\',\n"
+"prefix,\n"
+"iri_regex,\n"
+"sys_sql_val_print (iri_param),\n"
+"rtrim (replace (replace (url_spf, \'{Extension}\', \'\'), \'//\', \'/\'), \'.\'),\n"
+"sys_sql_val_print (url_param),\n"
+"url_rewrite_mime_pattern ()\n"
+"), ses);\n"
+"\n"
+"http (\'\\n\', ses);\n"
+"http (sprintf (\'delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = \\\'%s_iri_rule_list\\\';\\n\', prefix), ses);\n"
+"if (flags and exists (select 1 from VAD.DBA.VAD_REGISTRY where R_KEY like \'/VAD/fct/%/resources/dav/%\'))\n"
+"fct := 1;\n"
+"mime_types := url_rewrite_mime_types ();\n"
+"foreach (any x in mime_types) do\n"
+"{\n"
+"declare redir varchar;\n"
+"if (fct and x[0] = \'html\')\n"
+"redir := url_rewrite_gen_vsp (graph, iri_tcn);\n"
+"else\n"
+"redir := replace (url_tcn, \'{Extension}\', x[0]);\n"
+"http (sprintf (\'DB.DBA.HTTP_VARIANT_ADD (\\\'%s_iri_rule_list\\\', \\\'%s\\\', \\\'%s\\\', \\\'%s\\\', %.2f);\\n\',\n"
+"prefix,\n"
+"rtrim (replace (replace (url_regex, \'{Extension}\', \'\'), \'//\', \'/\'), \'.\'),\n"
+"redir,\n"
+"x[1],\n"
+"x[2]\n"
+"), ses);\n"
+"}\n"
+"http (\'\\n\', ses);\n"
+"http (\'-- Rule list for data\\n\', ses);\n"
+"nth := 1;\n"
+"http (sprintf (\'DB.DBA.URLREWRITE_CREATE_RULELIST ( \\\'%s_url_rule_list\\\', 1, vector (\', prefix), ses);\n"
+"foreach (any x in mime_types) do\n"
+"{\n"
+"if (nth > 1) http (\',\', ses);\n"
+"http (sprintf (\'\\\'%s_url_rule_%d\\\'\', prefix, nth), ses);\n"
+"nth := nth + 1;\n"
+"}\n"
+"http (\'));\\n\', ses);\n"
+"\n"
+"nth := 1;\n"
+"foreach (any x in mime_types) do\n"
+"{\n"
+"declare redir any;\n"
+"redir := url_rewrite_gen_describe (graph, iri_spf) || replace (sprintf (\'&format=%U\', x[1]), \'%\', \'%%\');\n"
+"http (sprintf (\'DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( \\\'%s_url_rule_%d\\\', 1, \\\'%s\\\', %s, 1, \\\'%s\\\', %s, null, null, 2, null, \\\'Content-Type: %s\\\'); \\n\',\n"
+"prefix, nth,\n"
+"replace (url_regex, \'{Extension}\', x[0]),\n"
+"sys_sql_val_print (url_param),\n"
+"redir,\n"
+"sys_sql_val_print (iri_param),\n"
+"x[1]\n"
+"), ses);\n"
+"nth := nth + 1;\n"
+"}\n"
+"return string_output_string (ses);\n"
+"}\n"
+"--src url_rewrite.sql:1503\n";
+
static int
sch_proc_def_exists (client_connection_t *cli, const char *proc_name, const int report)
{
@@ -7840,6 +8087,11 @@ sqls_define_ddk (void)
DEFINE_PROC ("DB.DBA.URLREWRITE_DUMP_RULELIST_SQL", proc74);
ddl_ensure_table ("do this always", other870);
ddl_ensure_table ("do this always", other871);
+ DEFINE_PROC ("url_rewrite_mime_types", proc75);
+ DEFINE_PROC ("url_rewrite_mime_pattern", proc76);
+ DEFINE_PROC ("url_rewrite_gen_describe", proc77);
+ DEFINE_PROC ("url_rewrite_gen_vsp", proc78);
+ DEFINE_PROC ("url_rewrite_from_template", proc79);
}
diff --git a/libsrc/Wi/sql_code_pldbg.c b/libsrc/Wi/sql_code_pldbg.c
index 2a10aa2..50ac8be 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.1 2009/04/16 09:48:07 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2009 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:12 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 37ebc71..994fbbc 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_FAKE_0\n"
+"create table DB.DBA.SYS_IDONLY_EMPTY\n"
"(\n"
"ID integer not null primary key\n"
")\n";
static const char *tbl15 =
-"create table DB.DBA.SYS_FAKE_1\n"
+"create table DB.DBA.SYS_IDONLY_ONE\n"
"(\n"
"ID integer not null primary key\n"
")\n";
static const char *other3 =
-"insert soft DB.DBA.SYS_FAKE_1 (ID) values (0)\n";
+"insert soft DB.DBA.SYS_IDONLY_ONE (ID) values (0)\n";
static const char *other4 =
"sequence_set (\'RDF_URL_IID_NAMED\', 1000000, 1)\n";
static const char *other5 =
@@ -340,13 +340,15 @@ static const char *proc11 =
"DB.DBA.XML_SET_NS_DECL ( \'rdfdf\' , \'http://www.openlinksw.com/virtrdf-data-formats#\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'rdfs\' , \'http://www.w3.org/2000/01/rdf-schema#\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'sc\' , \'http://purl.org/science/owl/sciencecommons/\' , 2);\n"
+"DB.DBA.XML_SET_NS_DECL ( \'sd\' , \'http://www.w3.org/ns/sparql-service-description#\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'sioc\' , \'http://rdfs.org/sioc/ns#\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'skos\' , \'http://www.w3.org/2004/02/skos/core#\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'sql\' , \'sql:\' , 2);\n"
-"DB.DBA.XML_SET_NS_DECL ( \'virtrdf\' , \'http://www.openlinksw.com/schemas/virtrdf#\' , 2);\n"
-"DB.DBA.XML_SET_NS_DECL ( \'virtcxml\' , \'http://www.openlinksw.com/schemas/virtcxml#\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'vcard\' , \'http://www.w3.org/2001/vcard-rdf/3.0#\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'vcard2006\' , \'http://www.w3.org/2006/vcard/ns#\' , 2);\n"
+"DB.DBA.XML_SET_NS_DECL ( \'virtrdf\' , \'http://www.openlinksw.com/schemas/virtrdf#\' , 2);\n"
+"DB.DBA.XML_SET_NS_DECL ( \'virtcxml\' , \'http://www.openlinksw.com/schemas/virtcxml#\' , 2);\n"
+"DB.DBA.XML_SET_NS_DECL ( \'void\' , \'http://rdfs.org/ns/void#\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'xf\' , \'http://www.w3.org/2004/07/xpath-functions\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'xml\' , \'http://www.w3.org/XML/1998/namespace\' , 2);\n"
"DB.DBA.XML_SET_NS_DECL ( \'xsd\' , \'http://www.w3.org/2001/XMLSchema#\' , 2);\n"
@@ -362,7 +364,7 @@ static const char *other13 =
static const char *other14 =
"rdf_inf_const_init ()\n";
static const char *proc12 =
-"#line 395 \"[executable]/sparql.sql\"\n"
+"#line 397 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_LOAD_ALL_FT_RULES ()\n"
"{\n"
"whenever sqlstate \'*\' goto again;\n"
@@ -376,12 +378,12 @@ static const char *proc12 =
"__rdf_obj_ft_rule_add (rule_g_iid, rule_p_iid, reason);\n"
"}\n"
"}\n"
-"--src sparql.sql:393\n";
+"--src sparql.sql:395\n";
static const char *other15 =
"DB.DBA.RDF_LOAD_ALL_FT_RULES ()\n";
static const char *proc13 =
-"#line 413 \"[executable]/sparql.sql\"\n"
+"#line 415 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_START (in quiet integer := 0)\n"
"{\n"
"if (repl_this_server () is null)\n"
@@ -394,9 +396,9 @@ static const char *proc13 =
"}\n"
"for (select RGGM_MEMBER_IID from DB.DBA.RDF_GRAPH_GROUP_MEMBER\n"
"where RGGM_GROUP_IID = iri_to_id (UNAME\'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group\')\n"
-"and not (bit_and (__rdf_graph_approx_perms (RGGM_MEMBER_IID, http_nobody_uid()), 1)) ) do\n"
+"and not __rgs_ack_cbk (RGGM_MEMBER_IID, __rdf_repl_uid(), 1) ) do\n"
"{\n"
-"signal (\'RDF99\', \'RDF replication can not be enabled because it will violate security rules for public read access to graph <\' || id_to_iri(RGGM_MEMBER_IID) || \'>\');\n"
+"signal (\'RDF99\', \'RDF replication can not be enabled because it will violate security rules for read access to graph <\' || id_to_iri(RGGM_MEMBER_IID) || \'> by __rdf_repl account\');\n"
"}\n"
"repl_publish (\'__rdf_repl\', \'__rdf_repl.log\');\n"
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue()\');\n"
@@ -404,10 +406,10 @@ static const char *proc13 =
"registry_set (\'DB.DBA.RDF_REPL\', cast (now() as varchar));\n"
"exec (\'checkpoint\');\n"
"}\n"
-"--src sparql.sql:411\n";
+"--src sparql.sql:413\n";
static const char *proc14 =
-"#line 437 \"[executable]/sparql.sql\"\n"
+"#line 439 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_STOP (in quiet integer := 0)\n"
"{\n"
"if (not isstring (registry_get (\'DB.DBA.RDF_REPL\')))\n"
@@ -419,34 +421,30 @@ static const char *proc14 =
"repl_unpublish (\'__rdf_repl\');\n"
"registry_remove (\'DB.DBA.RDF_REPL\');\n"
"}\n"
-"--src sparql.sql:435\n";
+"--src sparql.sql:437\n";
static const char *proc15 =
-"#line 450 \"[executable]/sparql.sql\"\n"
+"#line 452 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_GRAPH_INS (in memb_iri varchar)\n"
"{\n"
"declare memb_iid IRI_ID;\n"
"memb_iid := iri_to_id (memb_iri);\n"
"memb_iri := id_to_iri (memb_iid);\n"
-"if (memb_iri = DB.DBA.JSO_SYS_GRAPH())\n"
-"signal (\'RDF99\', \'Can not enable RDF replication of <\' || memb_iri || \'> (the system metadata graph)\');\n"
"DB.DBA.RDF_GRAPH_GROUP_INS (UNAME\'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group\', memb_iri);\n"
-"if (not (bit_and (__rdf_graph_approx_perms (memb_iid, http_nobody_uid()), 1)))\n"
-"signal (\'RDF99\', \'Can not enable RDF replication of graph <\' || memb_iri || \'> because it is not readable by public\');\n"
"}\n"
-"--src sparql.sql:448\n";
+"--src sparql.sql:450\n";
static const char *proc16 =
-"#line 463 \"[executable]/sparql.sql\"\n"
+"#line 461 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_GRAPH_DEL (in memb_iri varchar)\n"
"{\n"
"declare memb_iid IRI_ID;\n"
"DB.DBA.RDF_GRAPH_GROUP_DEL (UNAME\'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group\', memb_iri);\n"
"}\n"
-"--src sparql.sql:461\n";
+"--src sparql.sql:459\n";
static const char *proc17 =
-"#line 470 \"[executable]/sparql.sql\"\n"
+"#line 468 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_SYNC (in publisher varchar, in u varchar, in pwd varchar)\n"
"{\n"
"declare lvl, stat integer;\n"
@@ -475,10 +473,10 @@ static const char *proc17 =
"}\n"
"goto retr;\n"
"}\n"
-"--src sparql.sql:468\n";
+"--src sparql.sql:466\n";
static const char *proc18 =
-"#line 501 \"[executable]/sparql.sql\"\n"
+"#line 499 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_INSERT_TRIPLES (in graph_iri varchar, inout triples any)\n"
"{\n"
"declare ctr integer;\n"
@@ -506,10 +504,10 @@ static const char *proc18 =
"}\n"
"}\n"
"}\n"
-"--src sparql.sql:499\n";
+"--src sparql.sql:497\n";
static const char *proc19 =
-"#line 530 \"[executable]/sparql.sql\"\n"
+"#line 528 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_DELETE_TRIPLES (in graph_iri varchar, inout triples any)\n"
"{\n"
"declare ctr integer;\n"
@@ -537,11 +535,11 @@ static const char *proc19 =
"}\n"
"}\n"
"}\n"
-"--src sparql.sql:528\n";
+"--src sparql.sql:526\n";
static const char *proc20 =
-"#line 560 \"[executable]/sparql.sql\"\n"
+"#line 558 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_GLOBAL_RESET (in hard integer := 0)\n"
"{\n"
"if (isstring (registry_get (\'DB.DBA.RDF_REPL\')))\n"
@@ -552,21 +550,50 @@ static const char *proc20 =
"__atomic (1);\n"
"iri_id_cache_flush ();\n"
"__rdf_obj_ft_rule_zap_all ();\n"
+"dict_zap (__rdf_graph_group_dict(), 2);\n"
+"dict_zap (__rdf_graph_group_of_privates_dict(), 2);\n"
+"dict_zap (__rdf_graph_default_perms_of_user_dict(0), 2);\n"
+"dict_zap (__rdf_graph_default_perms_of_user_dict(1), 2);\n"
+"dict_zap (__rdf_graph_public_perms_dict(), 2);\n"
"for select RS_NAME from DB.DBA.SYS_RDF_SCHEMA do\n"
"rdf_inf_clear (RS_NAME);\n"
"delete from sys_rdf_schema;\n"
"delete from DB.DBA.RDF_QUAD;\n"
"delete from DB.DBA.RDF_OBJ_FT_RULES;\n"
"delete from DB.DBA.RDF_GRAPH_GROUP;\n"
+"for (select __id2i(t.RGU_GRAPH_IID) as graph_iri from (select distinct RGU_GRAPH_IID from DB.DBA.RDF_GRAPH_USER) as t) do\n"
+"{\n"
+"if (graph_iri is not null)\n"
+"{\n"
+"jso_mark_affected (graph_iri);\n"
+"log_text (\'jso_mark_affected (?)\', graph_iri);\n"
+"}\n"
+"}\n"
+"for (select __id2i(t.RGGM_GROUP_IID) as group_iri from (select distinct RGGM_GROUP_IID from DB.DBA.RDF_GRAPH_GROUP_MEMBER) as t) do\n"
+"{\n"
+"jso_mark_affected (group_iri);\n"
+"log_text (\'jso_mark_affected (?)\', group_iri);\n"
+"}\n"
+"for (select __id2i(RGGM_MEMBER_IID) as memb_iri from DB.DBA.RDF_GRAPH_GROUP_MEMBER where RGGM_GROUP_IID = __i2id (\'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs\')) do\n"
+"{\n"
+"jso_mark_affected (memb_iri);\n"
+"log_text (\'jso_mark_affected (?)\', memb_iri);\n"
+"}\n"
+"for (sparql define input:storage \"\" select distinct str (?qms) as ?qms_iri from virtrdf: where { ?qms a virtrdf:QuadStorage } ) do\n"
+"{\n"
+"jso_mark_affected (\"qms_iri\");\n"
+"log_text (\'jso_mark_affected (?)\', \"qms_iri\");\n"
+"}\n"
+"jso_mark_affected (\'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs\');\n"
+"log_text (\'jso_mark_affected (?)\', \'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs\');\n"
+"jso_mark_affected (\'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage\');\n"
+"log_text (\'jso_mark_affected (?)\', \'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage\');\n"
+"jso_mark_affected (\'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap\');\n"
+"log_text (\'jso_mark_affected (?)\', \'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap\');\n"
"delete from DB.DBA.RDF_GRAPH_GROUP_MEMBER;\n"
"delete from DB.DBA.RDF_GRAPH_USER;\n"
"delete from DB.DBA.RDF_LABEL;\n"
"delete from DB.DBA.RDF_GEO;\n"
-"dict_zap (__rdf_graph_group_dict(), 2);\n"
-"dict_zap (__rdf_graph_group_of_privates_dict(), 2);\n"
-"dict_zap (__rdf_graph_default_perms_of_user_dict(0), 2);\n"
-"dict_zap (__rdf_graph_default_perms_of_user_dict(1), 2);\n"
-"dict_zap (__rdf_graph_public_perms_dict(), 2);\n"
"commit work;\n"
"if (hard)\n"
"{\n"
@@ -588,9 +615,9 @@ static const char *proc20 =
"sequence_set (\'RDF_RO_ID\', 1, 0);\n"
"sequence_set (\'RDF_DATATYPE_TWOBYTE\', 258, 0);\n"
"sequence_set (\'RDF_LANGUAGE_TWOBYTE\', 258, 0);\n"
-"__atomic (0);\n"
"exec (\'checkpoint\');\n"
"raw_exit ();\n"
+"__atomic (0);\n"
"}\n"
"sequence_set (\'RDF_URL_IID_NAMED\', 1000000, 1);\n"
"sequence_set (\'RDF_URL_IID_BLANK\', iri_id_num (min_bnode_iri_id ()), 1);\n"
@@ -645,21 +672,21 @@ static const char *proc20 =
"sequence_set (\'RDF_RO_ID\', 1001, 1);\n"
"iri_id_cache_flush ();\n"
"DB.DBA.SPARQL_RELOAD_QM_GRAPH ();\n"
-"__atomic (0);\n"
"exec (\'checkpoint\');\n"
+"__atomic (0);\n"
"}\n"
-"--src sparql.sql:558\n";
+"--src sparql.sql:556\n";
static const char *proc21 =
-"#line 672 \"[executable]/sparql.sql\"\n"
+"#line 699 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_IID_OF_QNAME (in qname varchar) returns IRI_ID\n"
"{\n"
"return iri_to_id (qname);\n"
"}\n"
-"--src sparql.sql:670\n";
+"--src sparql.sql:697\n";
static const char *proc22 =
-"#line 679 \"[executable]/sparql.sql\"\n"
+"#line 706 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_IID_OF_LONG (in qname any) returns IRI_ID\n"
"{\n"
"if (isiri_id (qname))\n"
@@ -673,10 +700,10 @@ static const char *proc22 =
"}\n"
"return iri_to_id_nosignal (qname);\n"
"}\n"
-"--src sparql.sql:677\n";
+"--src sparql.sql:704\n";
static const char *proc23 =
-"#line 694 \"[executable]/sparql.sql\"\n"
+"#line 721 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_GRAPH_IIDS_OF_QNAMES (in qnames any) returns any\n"
"{\n"
"if (__tag of vector <> __tag (qnames))\n"
@@ -695,10 +722,10 @@ static const char *proc23 =
"vectorbld_final (res_acc);\n"
"return res_acc;\n"
"}\n"
-"--src sparql.sql:692\n";
+"--src sparql.sql:719\n";
static const char *proc24 =
-"#line 717 \"[executable]/sparql.sql\"\n"
+"#line 744 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_TWOBYTE_OF_DATATYPE (in iid any) returns integer\n"
"{\n"
"declare res integer;\n"
@@ -755,10 +782,10 @@ static const char *proc24 =
"log_text (\'rdf_cache_id (\\\'t\\\', ?, ?)\', qname, res);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:715\n";
+"--src sparql.sql:742\n";
static const char *proc25 =
-"#line 775 \"[executable]/sparql.sql\"\n"
+"#line 802 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_TWOBYTE_OF_LANGUAGE (in id varchar) returns integer\n"
"{\n"
"declare res integer;\n"
@@ -801,34 +828,34 @@ static const char *proc25 =
"log_text (\'rdf_cache_id (\\\'l\\\', ?, ?)\', id, res);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:773\n";
+"--src sparql.sql:800\n";
static const char *proc26 =
-"#line 822 \"[executable]/sparql.sql\"\n"
+"#line 849 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RQ_LONG_OF_O (in o_col any) returns any\n"
"{\n"
"return __rdf_long_of_obj (o_col);\n"
"}\n"
-"--src sparql.sql:820\n";
+"--src sparql.sql:847\n";
static const char *proc27 =
-"#line 828 \"[executable]/sparql.sql\"\n"
+"#line 855 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_BOX_COMPLETE (inout o_col any)\n"
"{\n"
"__rdf_box_make_complete (o_col);\n"
"}\n"
-"--src sparql.sql:826\n";
+"--src sparql.sql:853\n";
static const char *proc28 =
-"#line 834 \"[executable]/sparql.sql\"\n"
+"#line 861 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RQ_SQLVAL_OF_O (in o_col any) returns any\n"
"{\n"
"return __rdf_sqlval_of_obj (o_col);\n"
"}\n"
-"--src sparql.sql:832\n";
+"--src sparql.sql:859\n";
static const char *proc29 =
-"#line 840 \"[executable]/sparql.sql\"\n"
+"#line 867 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RQ_BOOL_OF_O (in o_col any) returns any\n"
"{\n"
"declare t, len integer;\n"
@@ -870,36 +897,36 @@ static const char *proc29 =
"retnull:\n"
"return null;\n"
"}\n"
-"--src sparql.sql:838\n";
+"--src sparql.sql:865\n";
static const char *proc30 =
-"#line 883 \"[executable]/sparql.sql\"\n"
+"#line 910 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RQ_IID_OF_O (in shortobj any) returns IRI_ID\n"
"{\n"
"return id_to_iri_nosignal (shortobj);\n"
"}\n"
-"--src sparql.sql:881\n";
+"--src sparql.sql:908\n";
static const char *proc31 =
-"#line 889 \"[executable]/sparql.sql\"\n"
+"#line 916 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RQ_O_IS_LIT (in shortobj any) returns integer\n"
"{\n"
"if (isiri_id (shortobj))\n"
"return 0;\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:887\n";
+"--src sparql.sql:914\n";
static const char *proc32 =
-"#line 902 \"[executable]/sparql.sql\"\n"
+"#line 929 \"[executable]/sparql.sql\"\n"
"create procedure RDF_G_INS (in id int, in g any)\n"
"{\n"
"geo_insert (\'DB.DBA.RDF_GEO\', g, id);\n"
"}\n"
-"--src sparql.sql:900\n";
+"--src sparql.sql:927\n";
static const char *proc33 =
-"#line 908 \"[executable]/sparql.sql\"\n"
+"#line 935 \"[executable]/sparql.sql\"\n"
"create procedure cl_rdf_geo_insert (in id int, inout g any)\n"
"{\n"
"declare daq any;\n"
@@ -907,10 +934,10 @@ static const char *proc33 =
"daq_call (daq, \'DB.DBA.RDF_OBJ\', \'RDF_OBJ\', \'DB.DBA.RDF_G_INS\', vector (id, g), 1);\n"
"daq_results (daq);\n"
"}\n"
-"--src sparql.sql:906\n";
+"--src sparql.sql:933\n";
static const char *proc34 =
-"#line 917 \"[executable]/sparql.sql\"\n"
+"#line 944 \"[executable]/sparql.sql\"\n"
"create function rdf_geo_add (in v any)\n"
"{\n"
"declare id, h, ser, g any;\n"
@@ -952,10 +979,10 @@ static const char *proc34 =
"rdf_box_set_ro_id (v, id);\n"
"return v;\n"
"}\n"
-"--src sparql.sql:915\n";
+"--src sparql.sql:942\n";
static const char *proc35 =
-"#line 960 \"[executable]/sparql.sql\"\n"
+"#line 987 \"[executable]/sparql.sql\"\n"
"create function rdf_geo_set_id (inout v any)\n"
"{\n"
"declare id, h, ser, g any;\n"
@@ -982,10 +1009,10 @@ static const char *proc35 =
"}\n"
"return null;\n"
"}\n"
-"--src sparql.sql:958\n";
+"--src sparql.sql:985\n";
static const char *proc36 =
-"#line 987 \"[executable]/sparql.sql\"\n"
+"#line 1014 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_OBJ_ADD (in dt_twobyte integeR, in v varchar, in lang_twobyte integeR, in ro_id_dict any := null) returns varchar\n"
"{\n"
"declare llong, id, need_digest integer;\n"
@@ -1240,10 +1267,10 @@ static const char *proc36 =
"\n"
"signal (\'FUNNY\', \'Debug code of DB.DBA.RDF_OBJ_ADD() is reached. This can not happen (I believe). Please report this error.\');\n"
"}\n"
-"--src sparql.sql:985\n";
+"--src sparql.sql:1012\n";
static const char *proc37 =
-"#line 1243 \"[executable]/sparql.sql\"\n"
+"#line 1270 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FIND_RO_DIGEST (in dt_twobyte integeR, in v varchar, in lang_twobyte integeR) returns varchar\n"
"{\n"
"declare llong, dt_and_lang int;\n"
@@ -1287,10 +1314,10 @@ static const char *proc37 =
"and not (bit_and (RO_FLAGS, 2)) );\n"
"}\n"
"}\n"
-"--src sparql.sql:1241\n";
+"--src sparql.sql:1268\n";
static const char *proc38 =
-"#line 1288 \"[executable]/sparql.sql\"\n"
+"#line 1315 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL (in v any) returns any\n"
"{\n"
"declare t int;\n"
@@ -1303,13 +1330,14 @@ static const char *proc38 =
"v := cast (v as varchar);\n"
"return DB.DBA.RDF_OBJ_ADD (257, v, 257);\n"
"}\n"
-"--src sparql.sql:1286\n";
+"--src sparql.sql:1313\n";
static const char *proc39 =
-"#line 1302 \"[executable]/sparql.sql\"\n"
+"#line 1329 \"[executable]/sparql.sql\"\n"
"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"
@@ -1332,13 +1360,14 @@ static const char *proc39 =
"}\n"
"return DB.DBA.RDF_OBJ_ADD (257, v, 257, ro_id_dict);\n"
"}\n"
-"--src sparql.sql:1300\n";
+"--src sparql.sql:1327\n";
static const char *proc40 =
-"#line 1329 \"[executable]/sparql.sql\"\n"
+"#line 1357 \"[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"
@@ -1363,12 +1392,13 @@ 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:1327\n";
+"--src sparql.sql:1355\n";
static const char *proc41 =
-"#line 1360 \"[executable]/sparql.sql\"\n"
+"#line 1390 \"[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"
@@ -1412,13 +1442,14 @@ static const char *proc41 =
"}\n"
"return DB.DBA.RDF_OBJ_ADD (dt_twobyte, v, lang_twobyte, ro_id_dict);\n"
"}\n"
-"--src sparql.sql:1358\n";
+"--src sparql.sql:1388\n";
static const char *proc42 =
-"#line 1405 \"[executable]/sparql.sql\"\n"
+"#line 1435 \"[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"
@@ -1453,18 +1484,18 @@ static const char *proc42 =
"}\n"
"return DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL (o_val);\n"
"}\n"
-"--src sparql.sql:1403\n";
+"--src sparql.sql:1433\n";
static const char *proc43 =
-"#line 1444 \"[executable]/sparql.sql\"\n"
+"#line 1475 \"[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:1442\n";
+"--src sparql.sql:1473\n";
static const char *proc44 =
-"#line 1450 \"[executable]/sparql.sql\"\n"
+"#line 1481 \"[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"
@@ -1475,9 +1506,11 @@ 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"
@@ -1488,10 +1521,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:1448\n";
+"--src sparql.sql:1479\n";
static const char *proc45 =
-"#line 1475 \"[executable]/sparql.sql\"\n"
+"#line 1508 \"[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"
@@ -1502,9 +1535,11 @@ 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"
@@ -1514,18 +1549,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:1473\n";
+"--src sparql.sql:1506\n";
static const char *proc46 =
-"#line 1499 \"[executable]/sparql.sql\"\n"
+"#line 1534 \"[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:1497\n";
+"--src sparql.sql:1532\n";
static const char *proc47 =
-"#line 1505 \"[executable]/sparql.sql\"\n"
+"#line 1540 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_BOOL_OF_OBJ (in shortobj any) returns any\n"
"{\n"
"if (isiri_id (shortobj))\n"
@@ -1559,35 +1594,40 @@ 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:1503\n";
+"--src sparql.sql:1538\n";
static const char *proc48 =
-"#line 1540 \"[executable]/sparql.sql\"\n"
+"#line 1575 \"[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:1538\n";
+"--src sparql.sql:1573\n";
static const char *proc49 =
-"#line 1546 \"[executable]/sparql.sql\"\n"
+"#line 1581 \"[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:1544\n";
+"--src sparql.sql:1579\n";
static const char *proc50 =
-"#line 1552 \"[executable]/sparql.sql\"\n"
+"#line 1587 \"[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)))\n"
+"if (not (t in (__tag of varchar, 126, 217, __tag of nvarchar, 133, 226)))\n"
"return longobj;\n"
-"if (__tag of nvarchar = t)\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"
"longobj := charset_recode (longobj, \'_WIDE_\', \'UTF-8\');\n"
"else if (t in (126, 217))\n"
"longobj := cast (longobj as varchar);\n"
@@ -1599,10 +1639,10 @@ static const char *proc50 =
"return longobj;\n"
"return DB.DBA.RDF_OBJ_ADD (257, longobj, 257);\n"
"}\n"
-"--src sparql.sql:1550\n";
+"--src sparql.sql:1585\n";
static const char *proc51 =
-"#line 1597 \"[executable]/sparql.sql\"\n"
+"#line 1637 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_OBJ_OF_SQLVAL (in v any) returns any\n"
"{\n"
"declare t int;\n"
@@ -1621,10 +1661,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:1595\n";
+"--src sparql.sql:1635\n";
static const char *proc52 =
-"#line 1620 \"[executable]/sparql.sql\"\n"
+"#line 1660 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (in v any) returns any\n"
"{\n"
"declare t int;\n"
@@ -1641,10 +1681,10 @@ static const char *proc52 =
"res := rdf_box (v, 257, 257, 0, 1);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:1618\n";
+"--src sparql.sql:1658\n";
static const char *proc53 =
-"#line 1639 \"[executable]/sparql.sql\"\n"
+"#line 1679 \"[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"
@@ -1679,10 +1719,10 @@ static const char *proc53 =
"res := rdf_box (v, dt_twobyte, lang_twobyte, 0, 1);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:1637\n";
+"--src sparql.sql:1677\n";
static const char *proc54 =
-"#line 1675 \"[executable]/sparql.sql\"\n"
+"#line 1715 \"[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"
@@ -1706,26 +1746,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:1673\n";
+"--src sparql.sql:1713\n";
static const char *proc55 =
-"#line 1700 \"[executable]/sparql.sql\"\n"
+"#line 1740 \"[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:1698\n";
+"--src sparql.sql:1738\n";
static const char *proc56 =
-"#line 1706 \"[executable]/sparql.sql\"\n"
+"#line 1746 \"[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:1704\n";
+"--src sparql.sql:1744\n";
static const char *proc57 =
-"#line 1712 \"[executable]/sparql.sql\"\n"
+"#line 1752 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_BOOL_OF_LONG (in longobj any) returns any\n"
"{\n"
"if (isiri_id (longobj))\n"
@@ -1756,10 +1796,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:1710\n";
+"--src sparql.sql:1750\n";
static const char *proc58 =
-"#line 1744 \"[executable]/sparql.sql\"\n"
+"#line 1784 \"[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"
@@ -1780,10 +1820,10 @@ static const char *proc58 =
"return NULL;\n"
"return iri_to_id (__xsd_type (longobj, dflt));\n"
"}\n"
-"--src sparql.sql:1742\n";
+"--src sparql.sql:1782\n";
static const char *proc59 =
-"#line 1766 \"[executable]/sparql.sql\"\n"
+"#line 1806 \"[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"
@@ -1804,40 +1844,18 @@ static const char *proc59 =
"return NULL;\n"
"return __xsd_type (longobj, dflt);\n"
"}\n"
-"--src sparql.sql:1764\n";
+"--src sparql.sql:1804\n";
static const char *proc60 =
-"#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"
+"#line 1828 \"[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:1806\n";
+"--src sparql.sql:1826\n";
-static const char *proc62 =
-"#line 1814 \"[executable]/sparql.sql\"\n"
+static const char *proc61 =
+"#line 1834 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_WIDESTRSQLVAL_OF_LONG (in longobj any)\n"
"{\n"
"declare t, len integer;\n"
@@ -1898,10 +1916,10 @@ static const char *proc62 =
"}\n"
"return cast (longobj as nvarchar);\n"
"}\n"
-"--src sparql.sql:1812\n";
+"--src sparql.sql:1832\n";
-static const char *proc63 =
-"#line 1877 \"[executable]/sparql.sql\"\n"
+static const char *proc62 =
+"#line 1897 \"[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"
@@ -1922,10 +1940,10 @@ static const char *proc63 =
"}\n"
"return iri_to_id (__xsd_type (v, strg_datatype, default_res));\n"
"}\n"
-"--src sparql.sql:1875\n";
+"--src sparql.sql:1895\n";
-static const char *proc64 =
-"#line 1900 \"[executable]/sparql.sql\"\n"
+static const char *proc63 =
+"#line 1920 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_LONG_OF_SQLVAL (in v varchar) returns any\n"
"{\n"
"declare t int;\n"
@@ -1945,10 +1963,10 @@ static const char *proc64 =
"\n"
"return rdf_box (v, 257, 257, 0, 1);\n"
"}\n"
-"--src sparql.sql:1898\n";
+"--src sparql.sql:1918\n";
-static const char *proc65 =
-"#line 1925 \"[executable]/sparql.sql\"\n"
+static const char *proc64 =
+"#line 1945 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_STRSQLVAL_OF_SQLVAL (in sqlval any)\n"
"{\n"
"declare t, len integer;\n"
@@ -1974,10 +1992,10 @@ static const char *proc65 =
"return charset_recode (sqlval, \'_WIDE_\', \'UTF-8\');\n"
"return cast (sqlval as varchar);\n"
"}\n"
-"--src sparql.sql:1923\n";
+"--src sparql.sql:1943\n";
-static const char *proc66 =
-"#line 1953 \"[executable]/sparql.sql\"\n"
+static const char *proc65 =
+"#line 1973 \"[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"
@@ -1999,10 +2017,10 @@ static const char *proc66 =
"\n"
"\n"
"}\n"
-"--src sparql.sql:1951\n";
+"--src sparql.sql:1971\n";
-static const char *proc67 =
-"#line 1977 \"[executable]/sparql.sql\"\n"
+static const char *proc66 =
+"#line 1997 \"[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"
@@ -2019,10 +2037,10 @@ static const char *proc67 =
"}\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:1975\n";
+"--src sparql.sql:1995\n";
-static const char *proc68 =
-"#line 1996 \"[executable]/sparql.sql\"\n"
+static const char *proc67 =
+"#line 2016 \"[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"
@@ -2039,10 +2057,10 @@ static const char *proc68 =
"}\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:1994\n";
+"--src sparql.sql:2014\n";
-static const char *proc69 =
-"#line 2015 \"[executable]/sparql.sql\"\n"
+static const char *proc68 =
+"#line 2035 \"[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"
@@ -2051,10 +2069,10 @@ static const char *proc69 =
"return 1;\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:2013\n";
+"--src sparql.sql:2033\n";
-static const char *proc70 =
-"#line 2026 \"[executable]/sparql.sql\"\n"
+static const char *proc69 =
+"#line 2046 \"[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"
@@ -2063,10 +2081,10 @@ static const char *proc70 =
"return 0;\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:2024\n";
+"--src sparql.sql:2044\n";
-static const char *proc71 =
-"#line 2040 \"[executable]/sparql.sql\"\n"
+static const char *proc70 =
+"#line 2060 \"[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"
@@ -2080,10 +2098,10 @@ static const char *proc71 =
"return case (strg) when 0 then 0 else 1 end;\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2038\n";
+"--src sparql.sql:2058\n";
-static const char *proc72 =
-"#line 2056 \"[executable]/sparql.sql\"\n"
+static const char *proc71 =
+"#line 2076 \"[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"
@@ -2095,10 +2113,10 @@ static const char *proc72 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2054\n";
+"--src sparql.sql:2074\n";
-static const char *proc73 =
-"#line 2070 \"[executable]/sparql.sql\"\n"
+static const char *proc72 =
+"#line 2090 \"[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"
@@ -2110,10 +2128,10 @@ static const char *proc73 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2068\n";
+"--src sparql.sql:2088\n";
-static const char *proc74 =
-"#line 2084 \"[executable]/sparql.sql\"\n"
+static const char *proc73 =
+"#line 2104 \"[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"
@@ -2121,10 +2139,10 @@ static const char *proc74 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2082\n";
+"--src sparql.sql:2102\n";
-static const char *proc75 =
-"#line 2094 \"[executable]/sparql.sql\"\n"
+static const char *proc74 =
+"#line 2114 \"[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"
@@ -2132,10 +2150,10 @@ static const char *proc75 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2092\n";
+"--src sparql.sql:2112\n";
-static const char *proc76 =
-"#line 2104 \"[executable]/sparql.sql\"\n"
+static const char *proc75 =
+"#line 2124 \"[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"
@@ -2143,10 +2161,10 @@ static const char *proc76 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2102\n";
+"--src sparql.sql:2122\n";
-static const char *proc77 =
-"#line 2114 \"[executable]/sparql.sql\"\n"
+static const char *proc76 =
+"#line 2134 \"[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"
@@ -2154,10 +2172,10 @@ static const char *proc77 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2112\n";
+"--src sparql.sql:2132\n";
-static const char *proc78 =
-"#line 2124 \"[executable]/sparql.sql\"\n"
+static const char *proc77 =
+"#line 2144 \"[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"
@@ -2169,10 +2187,10 @@ static const char *proc78 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2122\n";
+"--src sparql.sql:2142\n";
-static const char *proc79 =
-"#line 2138 \"[executable]/sparql.sql\"\n"
+static const char *proc78 =
+"#line 2158 \"[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"
@@ -2189,40 +2207,227 @@ static const char *proc79 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2136\n";
+"--src sparql.sql:2156\n";
-static const char *proc80 =
-"#line 2160 \"[executable]/sparql.sql\"\n"
+static const char *proc79 =
+"#line 2180 \"[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:2158\n";
+"--src sparql.sql:2178\n";
-static const char *proc81 =
-"#line 2169 \"[executable]/sparql.sql\"\n"
+static const char *proc80 =
+"#line 2189 \"[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:2167\n";
+"--src sparql.sql:2187\n";
-static const char *proc82 =
-"#line 2178 \"[executable]/sparql.sql\"\n"
+static const char *proc81 =
+"#line 2198 \"[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:2176\n";
+"--src sparql.sql:2196\n";
+
+static const char *proc82 =
+"#line 2209 \"[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:2207\n";
static const char *proc83 =
-"#line 2190 \"[executable]/sparql.sql\"\n"
+"#line 2230 \"[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:2228\n";
+
+static const char *proc84 =
+"#line 2241 \"[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:2239\n";
+
+static const char *proc85 =
+"#line 2330 \"[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:2328\n";
+
+static const char *proc86 =
+"#line 2344 \"[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:2342\n";
+
+static const char *proc87 =
+"#line 2369 \"[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:2367\n";
+
+static const char *proc88 =
+"#line 2393 \"[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"
@@ -2236,10 +2441,10 @@ static const char *proc83 =
"iri_to_id (p_uri),\n"
"iri_to_id (o_uri) );\n"
"}\n"
-"--src sparql.sql:2188\n";
+"--src sparql.sql:2391\n";
-static const char *proc84 =
-"#line 2205 \"[executable]/sparql.sql\"\n"
+static const char *proc89 =
+"#line 2408 \"[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"
@@ -2267,10 +2472,10 @@ static const char *proc84 =
"}\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:2203\n";
+"--src sparql.sql:2406\n";
-static const char *proc85 =
-"#line 2234 \"[executable]/sparql.sql\"\n"
+static const char *proc90 =
+"#line 2437 \"[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"
@@ -2299,10 +2504,10 @@ static const char *proc85 =
"}\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:2232\n";
+"--src sparql.sql:2435\n";
-static const char *proc86 =
-"#line 2264 \"[executable]/sparql.sql\"\n"
+static const char *proc91 =
+"#line 2467 \"[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"
@@ -2315,11 +2520,16 @@ static const char *proc86 =
"t := __tag (o_val);\n"
"if (__tag of rdf_box <> t)\n"
"{\n"
-"if (not (t in (__tag of varchar, 126, 217, __tag of nvarchar)))\n"
+"if (not (t in (__tag of varchar, 126, 133, 217, __tag of nvarchar, 226)))\n"
"{\n"
"goto o_val_done;\n"
"}\n"
-"if (__tag of nvarchar = t)\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"
"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"
@@ -2347,10 +2557,10 @@ static const char *proc86 =
"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:2262\n";
+"--src sparql.sql:2465\n";
-static const char *proc87 =
-"#line 2310 \"[executable]/sparql.sql\"\n"
+static const char *proc92 =
+"#line 2518 \"[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"
@@ -2362,27 +2572,27 @@ static const char *proc87 =
"else\n"
"app_env[3] := null;\n"
"}\n"
-"--src sparql.sql:2308\n";
+"--src sparql.sql:2516\n";
-static const char *proc88 =
-"#line 2323 \"[executable]/sparql.sql\"\n"
+static const char *proc93 =
+"#line 2531 \"[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:2321\n";
+"--src sparql.sql:2529\n";
-static const char *proc89 =
-"#line 2329 \"[executable]/sparql.sql\"\n"
+static const char *proc94 =
+"#line 2537 \"[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:2327\n";
+"--src sparql.sql:2535\n";
-static const char *proc90 =
-"#line 2336 \"[executable]/sparql.sql\"\n"
+static const char *proc95 =
+"#line 2544 \"[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"
@@ -2393,10 +2603,10 @@ static const char *proc90 =
"__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:2334\n";
+"--src sparql.sql:2542\n";
-static const char *proc91 =
-"#line 2348 \"[executable]/sparql.sql\"\n"
+static const char *proc96 =
+"#line 2556 \"[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"
@@ -2474,10 +2684,10 @@ static const char *proc91 =
"o_val );\n"
"}\n"
"}\n"
-"--src sparql.sql:2346\n";
+"--src sparql.sql:2554\n";
-static const char *proc92 =
-"#line 2427 \"[executable]/sparql.sql\"\n"
+static const char *proc97 =
+"#line 2635 \"[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"
@@ -2487,10 +2697,10 @@ static const char *proc92 =
"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:2425\n";
+"--src sparql.sql:2633\n";
-static const char *proc93 =
-"#line 2438 \"[executable]/sparql.sql\"\n"
+static const char *proc98 =
+"#line 2646 \"[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"
@@ -2501,10 +2711,10 @@ static const char *proc93 =
"\n"
" ;\n"
"}\n"
-"--src sparql.sql:2436\n";
+"--src sparql.sql:2644\n";
-static const char *proc94 =
-"#line 2450 \"[executable]/sparql.sql\"\n"
+static const char *proc99 =
+"#line 2658 \"[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"
@@ -2519,10 +2729,10 @@ static const char *proc94 =
"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:2448\n";
+"--src sparql.sql:2656\n";
-static const char *proc95 =
-"#line 2466 \"[executable]/sparql.sql\"\n"
+static const char *proc100 =
+"#line 2674 \"[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"
@@ -2536,10 +2746,10 @@ static const char *proc95 =
"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:2464\n";
+"--src sparql.sql:2672\n";
-static const char *proc96 =
-"#line 2482 \"[executable]/sparql.sql\"\n"
+static const char *proc101 =
+"#line 2690 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.TTLP_XLAT_CONCAT (\n"
"inout iri varchar, inout env any )\n"
"{\n"
@@ -2549,10 +2759,10 @@ static const char *proc96 =
"return concat (env, subseq (iri, 7));\n"
"return iri;\n"
"}\n"
-"--src sparql.sql:2480\n";
+"--src sparql.sql:2688\n";
-static const char *proc97 =
-"#line 2493 \"[executable]/sparql.sql\"\n"
+static const char *proc102 =
+"#line 2701 \"[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"
@@ -2599,10 +2809,10 @@ static const char *proc97 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return ret;\n"
"}\n"
-"--src sparql.sql:2491\n";
+"--src sparql.sql:2699\n";
-static const char *proc98 =
-"#line 2541 \"[executable]/sparql.sql\"\n"
+static const char *proc103 =
+"#line 2749 \"[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"
@@ -2646,10 +2856,10 @@ static const char *proc98 =
"\'DB.DBA.TTLP_EV_REPORT_DEFAULT\' ),\n"
"app_env);\n"
"}\n"
-"--src sparql.sql:2539\n";
+"--src sparql.sql:2747\n";
-static const char *proc99 =
-"#line 2586 \"[executable]/sparql.sql\"\n"
+static const char *proc104 =
+"#line 2794 \"[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"
@@ -2660,10 +2870,10 @@ static const char *proc99 =
"vector (\'\', \'\', \'\', \'\', \'\', \'\', report_cbk),\n"
"app_env);\n"
"}\n"
-"--src sparql.sql:2584\n";
+"--src sparql.sql:2792\n";
-static const char *proc100 =
-"#line 2598 \"[executable]/sparql.sql\"\n"
+static const char *proc105 =
+"#line 2806 \"[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"
@@ -2674,54 +2884,54 @@ static const char *proc100 =
"vector (\'\', \'\', \'\', \'\', \'\', \'\', report_cbk),\n"
"app_env);\n"
"}\n"
-"--src sparql.sql:2596\n";
+"--src sparql.sql:2804\n";
-static const char *proc101 =
-"#line 2610 \"[executable]/sparql.sql\"\n"
+static const char *proc106 =
+"#line 2818 \"[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_LOAD_RDFXML()\');\n"
+"signal (\'22023\', \'Empty string is not a valid graph IRI in DB.DBA.RDF_VALIDATE_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() requires a valid IRI as a base argument if graph is not specified\');\n"
+"signal (\'22023\', \'DB.DBA.RDF_VALIDATE_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:2608\n";
+"--src sparql.sql:2816\n";
-static const char *proc102 =
-"#line 2627 \"[executable]/sparql.sql\"\n"
+static const char *proc107 =
+"#line 2835 \"[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:2625\n";
+"--src sparql.sql:2833\n";
-static const char *proc103 =
-"#line 2633 \"[executable]/sparql.sql\"\n"
+static const char *proc108 =
+"#line 2841 \"[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:2631\n";
+"--src sparql.sql:2839\n";
-static const char *proc104 =
-"#line 2639 \"[executable]/sparql.sql\"\n"
+static const char *proc109 =
+"#line 2847 \"[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:2637\n";
+"--src sparql.sql:2845\n";
-static const char *proc105 =
-"#line 2646 \"[executable]/sparql.sql\"\n"
+static const char *proc110 =
+"#line 2854 \"[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"
@@ -2731,10 +2941,10 @@ static const char *proc105 =
"vector (iri_to_id (s_uri), iri_to_id (p_uri), iri_to_id (o_uri)),\n"
"0 );\n"
"}\n"
-"--src sparql.sql:2644\n";
+"--src sparql.sql:2852\n";
-static const char *proc106 =
-"#line 2657 \"[executable]/sparql.sql\"\n"
+static const char *proc111 =
+"#line 2865 \"[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"
@@ -2749,15 +2959,72 @@ static const char *proc106 =
"iri_to_id (s_uri),\n"
"iri_to_id (p_uri),\n"
"DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (o_val,\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"
+"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:2655\n";
+"--src sparql.sql:2863\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"
+static const char *proc112 =
+"#line 2885 \"[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:2883\n";
+
+static const char *proc113 =
+"#line 2912 \"[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:2910\n";
+
+static const char *proc114 =
+"#line 2938 \"[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"
"res := dict_new ();\n"
@@ -2776,19 +3043,41 @@ static const char *proc107 =
"res);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:2675\n";
+"--src sparql.sql:2936\n";
-static const char *proc108 =
-"#line 2698 \"[executable]/sparql.sql\"\n"
+static const char *proc115 =
+"#line 2959 \"[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:2957\n";
+
+static const char *proc116 =
+"#line 2979 \"[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:2696\n";
+"--src sparql.sql:2977\n";
-static const char *proc109 =
-"#line 2705 \"[executable]/sparql.sql\"\n"
+static const char *proc117 =
+"#line 2986 \"[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"
@@ -2801,10 +3090,10 @@ static const char *proc109 =
"__bft (o_uri, 1) ),\n"
"0 );\n"
"}\n"
-"--src sparql.sql:2703\n";
+"--src sparql.sql:2984\n";
-static const char *proc110 =
-"#line 2719 \"[executable]/sparql.sql\"\n"
+static const char *proc118 =
+"#line 3000 \"[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"
@@ -2823,10 +3112,10 @@ static const char *proc110 =
"case (isstring (o_lang)) when 0 then null else o_lang end) ),\n"
"0 );\n"
"}\n"
-"--src sparql.sql:2717\n";
+"--src sparql.sql:2998\n";
-static const char *proc111 =
-"#line 2739 \"[executable]/sparql.sql\"\n"
+static const char *proc119 =
+"#line 3020 \"[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"
@@ -2846,22 +3135,22 @@ static const char *proc111 =
"res);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:2737\n";
+"--src sparql.sql:3018\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"
+static const char *proc120 =
+"#line 3041 \"[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"
"{\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()\');\n"
+"signal (\'22023\', \'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFXML() and the like\');\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() requires a valid IRI as a base argument if graph is not specified\');\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"
"}\n"
"old_log_mode := null;\n"
"if (transactional = 0)\n"
@@ -2874,13 +3163,13 @@ static const char *proc112 =
"old_log_mode := log_enable (log_enable, 1);\n"
"}\n"
"if (1 <> sys_stat (\'cl_run_local_only\'))\n"
-"return rdf_load_rdfxml_cl (strg, base, graph);\n"
+"return DB.DBA.RDF_LOAD_RDFXML_CL (strg, base, graph, parse_mode);\n"
"app_env := vector (\n"
"null,\n"
"null,\n"
"__max (length (strg) / 100, 100000),\n"
"null );\n"
-"rdf_load_rdfxml (strg, 0,\n"
+"rdf_load_rdfxml (strg, parse_mode,\n"
"graph,\n"
"vector (\n"
"\'DB.DBA.TTLP_EV_NEW_GRAPH\',\n"
@@ -2896,10 +3185,19 @@ static const char *proc112 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:2758\n";
+"--src sparql.sql:3039\n";
-static const char *proc113 =
-"#line 2808 \"[executable]/sparql.sql\"\n"
+static const char *proc121 =
+"#line 3089 \"[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:3087\n";
+
+static const char *proc122 =
+"#line 3097 \"[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"
@@ -2918,10 +3216,77 @@ static const char *proc113 =
"base );\n"
"return res;\n"
"}\n"
-"--src sparql.sql:2806\n";
+"--src sparql.sql:3095\n";
-static const char *proc114 =
-"#line 2829 \"[executable]/sparql.sql\"\n"
+static const char *proc123 =
+"#line 3117 \"[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:3115\n";
+
+static const char *proc124 =
+"#line 3138 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDFA_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, inout dict any, in xml_parse_mode int := 0)\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\',\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:3136\n";
+
+static const char *proc125 =
+"#line 3159 \"[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:3157\n";
+
+static const char *proc126 =
+"#line 3181 \"[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"
@@ -2985,50 +3350,21 @@ static const char *proc114 =
"vocab_is_set: ;\n"
"\n"
"}\n"
-"--src sparql.sql:2827\n";
+"--src sparql.sql:3179\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"
-"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"
+static const char *proc127 =
+"#line 3247 \"[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"
"{\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"
+"return DB.DBA.RDF_LOAD_RDFXML_IMPL (strg, base, graph, bit_or (2, bit_shift (xml_parse_mode, 8)), log_enable, transactional);\n"
"}\n"
-"--src sparql.sql:2893\n";
+"--src sparql.sql:3245\n";
-static const char *proc116 =
-"#line 2931 \"[executable]/sparql.sql\"\n"
+static const char *proc128 =
+"#line 3254 \"[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"
@@ -3064,10 +3400,10 @@ static const char *proc116 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:2929\n";
+"--src sparql.sql:3252\n";
-static const char *proc117 =
-"#line 2970 \"[executable]/sparql.sql\"\n"
+static const char *proc129 =
+"#line 3293 \"[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"
@@ -3086,10 +3422,19 @@ static const char *proc117 =
"base );\n"
"return res;\n"
"}\n"
-"--src sparql.sql:2968\n";
+"--src sparql.sql:3291\n";
-static const char *proc118 =
-"#line 2994 \"[executable]/sparql.sql\"\n"
+static const char *proc130 =
+"#line 3313 \"[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:3311\n";
+
+static const char *proc131 =
+"#line 3324 \"[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"
@@ -3133,10 +3478,10 @@ static const char *proc118 =
"http (\'> \', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:2992\n";
+"--src sparql.sql:3322\n";
-static const char *proc119 =
-"#line 3040 \"[executable]/sparql.sql\"\n"
+static const char *proc132 =
+"#line 3370 \"[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"
@@ -3180,18 +3525,18 @@ static const char *proc119 =
"else\n"
"http (\'\" \', ses);\n"
"}\n"
-"--src sparql.sql:3038\n";
+"--src sparql.sql:3368\n";
-static const char *proc120 =
-"#line 3086 \"[executable]/sparql.sql\"\n"
+static const char *proc133 =
+"#line 3416 \"[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:3084\n";
+"--src sparql.sql:3414\n";
-static const char *proc121 =
-"#line 3093 \"[executable]/sparql.sql\"\n"
+static const char *proc134 =
+"#line 3423 \"[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"
@@ -3202,10 +3547,10 @@ static const char *proc121 =
"DB.DBA.RDF_XML_IRI_TO_TTL (o_uri, app_env);\n"
"http (\'.\\n\', app_env);\n"
"}\n"
-"--src sparql.sql:3091\n";
+"--src sparql.sql:3421\n";
-static const char *proc122 =
-"#line 3106 \"[executable]/sparql.sql\"\n"
+static const char *proc135 =
+"#line 3436 \"[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"
@@ -3216,10 +3561,10 @@ static const char *proc122 =
"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:3104\n";
+"--src sparql.sql:3434\n";
-static const char *proc123 =
-"#line 3119 \"[executable]/sparql.sql\"\n"
+static const char *proc136 =
+"#line 3449 \"[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"
@@ -3235,10 +3580,10 @@ static const char *proc123 =
"ttl_ses,\n"
"base );\n"
"}\n"
-"--src sparql.sql:3117\n";
+"--src sparql.sql:3447\n";
-static const char *proc124 =
-"#line 3137 \"[executable]/sparql.sql\"\n"
+static const char *proc137 =
+"#line 3467 \"[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"
@@ -3247,10 +3592,10 @@ static const char *proc124 =
"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:3135\n";
+"--src sparql.sql:3465\n";
-static const char *proc125 =
-"#line 3150 \"[executable]/sparql.sql\"\n"
+static const char *proc138 =
+"#line 3480 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_LONG_TO_TTL (inout obj any, inout ses any)\n"
"{\n"
"declare res varchar;\n"
@@ -3352,10 +3697,18 @@ static const char *proc125 =
"http (\'> \', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:3148\n";
+"--src sparql.sql:3478\n";
-static const char *proc126 =
-"#line 3254 \"[executable]/sparql.sql\"\n"
+static const char *proc139 =
+"#line 3586 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (inout triples any)\n"
+"{\n"
+"return;\n"
+"}\n"
+"--src sparql.sql:3584\n";
+
+static const char *proc140 =
+"#line 3593 \"[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"
@@ -3405,6 +3758,7 @@ static const char *proc126 =
"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"
@@ -3485,10 +3839,18 @@ static const char *proc126 =
"}\n"
"http (\'.\\n\', ses);\n"
"}\n"
-"--src sparql.sql:3252\n";
+"--src sparql.sql:3591\n";
-static const char *proc127 =
-"#line 3385 \"[executable]/sparql.sql\"\n"
+static const char *proc141 =
+"#line 3725 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.RDF_TRIPLES_TO_TTL_ENV (in tcount integer)\n"
+"{\n"
+"return vector (dict_new (__min (tcount, 16000)), 0, \'\', \'\', \'\', 0, 0, 0, 0);\n"
+"}\n"
+"--src sparql.sql:3723\n";
+
+static const char *proc142 =
+"#line 3731 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_TTL (inout triples any, inout ses any)\n"
"{\n"
"declare env any;\n"
@@ -3500,7 +3862,7 @@ static const char *proc127 =
"http (\'# Empty TURTLE\\n\', ses);\n"
"return;\n"
"}\n"
-"env := vector (dict_new (__min (tcount, 16000)), 0, \'\', \'\', \'\', 0, 0, 0, 0);\n"
+"env := DB.DBA.RDF_TRIPLES_TO_TTL_ENV (tcount);\n"
"{ whenever sqlstate \'*\' goto end_pred_sort;\n"
"rowvector_subj_sort (triples, 1, 1);\n"
"end_pred_sort: ;\n"
@@ -3509,16 +3871,86 @@ static const char *proc127 =
"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:3383\n";
+"--src sparql.sql:3729\n";
-static const char *proc128 =
-"#line 3413 \"[executable]/sparql.sql\"\n"
+static const char *proc143 =
+"#line 3760 \"[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 := DB.DBA.RDF_TRIPLES_TO_TTL_ENV (tcount);\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:3758\n";
+
+static const char *proc144 =
+"#line 3827 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_NT (inout triples any, inout ses any)\n"
"{\n"
"declare env any;\n"
@@ -3531,15 +3963,16 @@ static const char *proc128 =
"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:3411\n";
+"--src sparql.sql:3825\n";
-static const char *proc129 =
-"#line 3432 \"[executable]/sparql.sql\"\n"
+static const char *proc145 =
+"#line 3847 \"[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"
@@ -3599,233 +4032,52 @@ static const char *proc129 =
"else\n"
"http (\'.\\n\', ses);\n"
"}\n"
-"--src sparql.sql:3430\n";
+"--src sparql.sql:3845\n";
-static const char *proc130 =
-"#line 3506 \"[executable]/sparql.sql\"\n"
+static const char *proc146 =
+"#line 3921 \"[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 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"
+"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"
-"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"
+"http_rdfxml_p_ns (env, triples[tctr][1], ses);\n"
"}\n"
-"else\n"
-"{\n"
-"subj := charset_recode (subj, \'UTF-8\', \'_WIDE_\');\n"
-"http (\' rdf:about=\"\', ses); http_value (subj, 0, ses); http (\'\">\', ses);\n"
+"http (\' >\', ses);\n"
"}\n"
+"{ whenever sqlstate \'*\' goto end_subj_sort;\n"
+"rowvector_subj_sort (triples, 0, 1);\n"
+"end_subj_sort: ;\n"
"}\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"
-"res := id_to_iri (subj);\n"
-"\n"
-"res := charset_recode (res, \'UTF-8\', \'_WIDE_\');\n"
-"http (\' rdf:about=\"\', ses); http_value (res, 0, ses); http (\'\">\', ses);\n"
-"}\n"
-"if (not isiri_id (pred))\n"
-"{\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"
-"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"
-"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"
-"pred_tagname := res;\n"
-"http (\'<\', ses); http (pred_tagname, ses);\n"
-"}\n"
-"else\n"
-"{\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"
-"else if (p_ns_uri = \'http://www.w3.org/2000/01/rdf-schema#\')\n"
-"{\n"
-"pred_tagname := \'rdfs:\' || subseq (res, delim+1);\n"
-"http (\'<\', ses); http (pred_tagname, ses);\n"
-"}\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"
-"}\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"
+"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"
"}\n"
+"if (isstring (env[2]))\n"
+"http (\'\\n </rdf:Description>\', ses);\n"
"if (print_top_level)\n"
"{\n"
"http (\'\\n</rdf:RDF>\', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:3504\n";
+"--src sparql.sql:3919\n";
-static const char *proc131 =
-"#line 3740 \"[executable]/sparql.sql\"\n"
+static const char *proc147 =
+"#line 3974 \"[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"
@@ -3841,6 +4093,7 @@ static const char *proc131 =
"\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"
@@ -3852,10 +4105,10 @@ static const char *proc131 =
"http (\' ] }\\n\', ses);\n"
"http (\'}\\n\', ses);\n"
"}\n"
-"--src sparql.sql:3738\n";
+"--src sparql.sql:3972\n";
-static const char *proc132 =
-"#line 3768 \"[executable]/sparql.sql\"\n"
+static const char *proc148 =
+"#line 4003 \"[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"
@@ -3871,7 +4124,8 @@ static const char *proc132 =
"\n"
"rowvector_subj_sort (triples, 1, 1);\n"
"rowvector_subj_sort (triples, 0, 1);\n"
-"http (\'{ \"@\": [\\n \', ses);\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"
"{\n"
@@ -3882,10 +4136,10 @@ static const char *proc132 =
"http (\' ] }\\n\', ses);\n"
"http (\'] }\\n\', ses);\n"
"}\n"
-"--src sparql.sql:3766\n";
+"--src sparql.sql:4001\n";
-static const char *proc133 =
-"#line 3796 \"[executable]/sparql.sql\"\n"
+static const char *proc149 =
+"#line 4032 \"[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"
@@ -3893,6 +4147,7 @@ static const char *proc133 =
"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"
@@ -3904,10 +4159,10 @@ static const char *proc133 =
"}\n"
"http (\' ] } }\', ses);\n"
"}\n"
-"--src sparql.sql:3794\n";
+"--src sparql.sql:4030\n";
-static const char *proc134 =
-"#line 3816 \"[executable]/sparql.sql\"\n"
+static const char *proc150 =
+"#line 4053 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_CSV (inout triples any, inout ses any)\n"
"{\n"
"declare env any;\n"
@@ -3917,6 +4172,7 @@ static const char *proc134 =
"\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"
@@ -3927,10 +4183,34 @@ static const char *proc134 =
"http (\'\\n\', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:3814\n";
+"--src sparql.sql:4051\n";
-static const char *proc135 =
-"#line 3837 \"[executable]/sparql.sql\"\n"
+static const char *proc151 =
+"#line 4075 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_TRIPLES_TO_TSV (inout triples any, inout ses any)\n"
+"{\n"
+"declare env any;\n"
+"declare tcount, tctr, status integer;\n"
+"http (\'\"subject\",\"predicate\",\"object\"\\n\', ses);\n"
+"tcount := length (triples);\n"
+"\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"
+"http (\'\\t\', ses);\n"
+"DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, triples[tctr][1]);\n"
+"http (\'\\t\', ses);\n"
+"DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, triples[tctr][2]);\n"
+"http (\'\\n\', ses);\n"
+"}\n"
+"}\n"
+"--src sparql.sql:4073\n";
+
+static const char *proc152 =
+"#line 4097 \"[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"
@@ -3950,6 +4230,7 @@ static const char *proc135 =
"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"
@@ -3970,7 +4251,7 @@ static const char *proc135 =
"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>\', ses);\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"
"env := vector (0, 0, 0, null);\n"
"rowvector_subj_sort (triples, 0, 1);\n"
"prev_subj := null;\n"
@@ -3988,31 +4269,31 @@ static const char *proc135 =
"if (prev_subj is null or (subj <> prev_subj))\n"
"{\n"
"if (prev_subj is not null)\n"
-"http (\'\\n</div>\', ses);\n"
-"http (\'\\n<div about=\"[\', ses);\n"
+"http (\'\\n</ul></li>\', ses);\n"
+"http (\'\\n<li 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 (\']\">\', ses);\n"
+"http (\']\">\\n<ul>\', ses);\n"
"}\n"
"else if (isstring (split[0]))\n"
"{\n"
"http_escape (concat (split[0], \':\', split[2]), 3, ses, 1, 1);\n"
-"http (\']\">\', ses);\n"
+"http (\']\">\\n<ul>\', 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 (\'\">\', ses);\n"
+"http (\'\">\\n<ul>\', 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<div property=\"\' else \'\\n<div rel=\"\' end, ses);\n"
+"http (case (isvector (obj_iri_split)) when 0 then \'\\n<li property=\"\' else \'\\n<li rel=\"\' end, ses);\n"
"split := sparql_iri_split_rdfa_qname (pred, nsdict, 2);\n"
"if (\'\' = split[1])\n"
"{\n"
@@ -4115,56 +4396,67 @@ static const char *proc135 =
"sqlval := charset_recode (sqlval, \'UTF-8\', \'_WIDE_\');\n"
"http_value (sqlval, 0, ses);\n"
"}\n"
-"http (\'</div>\', ses);\n"
+"http (\'</li>\', ses);\n"
"}\n"
"}\n"
"if (prev_subj is not null)\n"
-"http (\'\\n</div>\', ses);\n"
+"http (\'\\n</ul></li></ul>\', ses);\n"
"http (\'\\n</body></html>\\n\', ses);\n"
"}\n"
-"--src sparql.sql:3835\n";
+"--src sparql.sql:4095\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"
+static const char *proc153 =
+"#line 4291 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT (in ul_or_tr varchar)\n"
"{\n"
-"declare env, prev_subj, prev_pred, nsdict, nslist any;\n"
-"declare ctr, len, tcount, tctr, status, obj_needs_br integer;\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:4289\n";
+
+static const char *proc154 =
+"#line 4306 \"[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:4304\n";
+
+static const char *proc155 =
+"#line 4312 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_TRIPLES_TO_HTML_UL (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"
"tcount := length (triples);\n"
"\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"
"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"
+"<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"
"<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"
-"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"
+"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"
"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"
+"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"
"env := vector (0, 0, 0, null);\n"
"rowvector_subj_sort (triples, 1, 1);\n"
"rowvector_subj_sort (triples, 0, 1);\n"
@@ -4184,106 +4476,107 @@ static const char *proc136 =
"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"
+"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"
"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"
+"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"
"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"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_HTML_UL: 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"
+"if (isiri_id (obj))\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"
+"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"
"}\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"
+"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"
"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"
+"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"
-"\n"
-"\n"
-"\n"
-"\n"
-"\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"
-"\n"
+"dt := __xsd_type (sqlval);\n"
"}\n"
"else\n"
"sqlval := obj;\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\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 (\'\" xml:lang=\"\', ses);\n"
"http_escape (lang, 3, ses, 1, 1);\n"
-"http (\'\"\', ses);\n"
"}\n"
-"http (\'>\', ses);\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"
@@ -4297,29 +4590,44 @@ static const char *proc136 =
"sqlval := charset_recode (sqlval, \'UTF-8\', \'_WIDE_\');\n"
"http_value (sqlval, 0, ses);\n"
"}\n"
-"http (\'</span>\', ses);\n"
+"http (\'</li>\', ses);\n"
"}\n"
"}\n"
"if (prev_subj is not null)\n"
-"http (\'\\n</dd></dl>\', ses);\n"
+"http (\'\\n </ul></li></ul></li></ul>\', ses);\n"
"http (\'\\n</body></html>\\n\', ses);\n"
"}\n"
-"--src sparql.sql:4028\n";
+"--src sparql.sql:4310\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"
+static const char *proc156 =
+"#line 4480 \"[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 ctr, len, tcount, tctr, status, obj_needs_comma integer;\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"
-"http (\'{ \"items\" : [\', 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></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"
-"obj_needs_comma := 0;\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
"{\n"
"declare subj, pred, obj, split, obj_iri_split any;\n"
@@ -4333,70 +4641,263 @@ static const char *proc137 =
"\n"
"if (prev_subj is null or (subj <> prev_subj))\n"
"{\n"
-"declare subj_iri varchar;\n"
-"if (prev_subj is not null)\n"
-"http (\' ] } },\\n\', ses);\n"
+"declare trtd_ses any;\n"
"subj_iri := id_to_iri (subj);\n"
-"if (starts_with (subj_iri, \'nodeID://\'))\n"
-"subj_iri := \'_:\' || subseq (subj_iri, 9);\n"
-"http (\'\\n { \"id\" : \"\', ses); http_escape (subj_iri, 14, ses, 1, 1); http (\'\"\\n \"properties\" : {\', ses);\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"
-"prev_pred := null;\n"
"}\n"
"if (prev_pred is null or (pred <> prev_pred))\n"
"{\n"
-"if (prev_pred is not null)\n"
-"http (\' ] ,\', ses);\n"
-"http (\'\\n \"\', ses); http_escape (id_to_iri (pred), 14, ses, 1, 1); http (\'\" : [ \', ses);\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"
-"obj_needs_comma := 0;\n"
"}\n"
"if (obj is null)\n"
-"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_JSON_MICRODATA: object is NULL\');\n"
-"if (obj_needs_comma)\n"
-"http (\',\\n \', ses);\n"
-"else\n"
-"obj_needs_comma := 1;\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"
-"if (starts_with (obj_iri, \'nodeID://\'))\n"
-"obj_iri := \'_:\' || subseq (obj_iri, 9);\n"
-"http (\'{ \"id\" : \"\', ses); http_escape (obj_iri, 14, ses, 1, 1); http (\'\" }\', ses);\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"
-"\n"
-"\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:4478\n";
+
+static const char *proc157 =
+"#line 4640 \"[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"
-"else if (__tag (obj) not in (__tag of varchar, __tag of varbinary))\n"
+"if (prev_pred is null or (pred <> prev_pred))\n"
"{\n"
-"sqlval := obj;\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"
-"sqlval := obj;\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"
+"else\n"
+"sqlval := obj;\n"
"\n"
"\n"
"\n"
@@ -4419,51 +4920,197 @@ static const char *proc137 =
"\n"
"\n"
"\n"
-"if (__tag (sqlval) in (__tag of integer, __tag of real, __tag of double precision, __tag of decimal))\n"
-"http_value (sqlval, 0, ses);\n"
-"else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))\n"
+"if (isstring (lang))\n"
"{\n"
-"declare tmpses any;\n"
-"tmpses := string_output();\n"
-"http_value (sqlval, 0, tmpses);\n"
-"http (\'\"\', ses); http_escape (string_output_string (tmpses), 14, ses, 1, 1); http (\'\"\', ses);\n"
+"http (\' xml:lang=\"\', ses);\n"
+"http_escape (lang, 3, ses, 1, 1);\n"
+"http (\'\"\', ses);\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"
-"{\n"
-"http (\'\"\', ses); http_escape (sqlval, 14, ses, 1, 1); http (\'\"\', ses);\n"
-"}\n"
+"http_value (charset_recode (sqlval, \'UTF-8\', \'_WIDE_\'), 0, ses);\n"
"else\n"
"{\n"
"sqlval := __rdf_strsqlval (obj);\n"
-"http (\'\"\', ses); http_escape (sqlval, 14, ses, 1, 1); http (\'\"\', ses);\n"
+"if (__tag of varchar = __tag (sqlval))\n"
+"sqlval := charset_recode (sqlval, \'UTF-8\', \'_WIDE_\');\n"
+"http_value (sqlval, 0, ses);\n"
"}\n"
+"http (\'</span>\', ses);\n"
"}\n"
"}\n"
"if (prev_subj is not null)\n"
-"http (\'] } }\', ses);\n"
-"http (\' }\\n\', ses);\n"
+"http (\'\\n</dd></dl>\', ses);\n"
+"http (\'\\n</body></html>\\n\', ses);\n"
"}\n"
-"--src sparql.sql:4208\n";
+"--src sparql.sql:4638\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"
-"ses := string_output ();\n"
-"if (214 <> __tag (triples_dict))\n"
+static const char *proc158 =
+"#line 4827 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (inout triples any, inout ses any)\n"
"{\n"
-"triples := vector ();\n"
-"}\n"
-"else\n"
-"triples := dict_list_keys (triples_dict, 1);\n"
+"declare env, prev_subj, prev_pred any;\n"
+"declare ctr, len, tcount, tctr, status, obj_needs_comma integer;\n"
+"tcount := length (triples);\n"
+"\n"
+"http (\'{ \"items\" : [\', ses);\n"
+"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"
+"{\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 subj_iri varchar;\n"
+"if (prev_subj is not null)\n"
+"http (\' ] } },\\n\', ses);\n"
+"if (isstring (subj))\n"
+"subj_iri := subj;\n"
+"else\n"
+"subj_iri := id_to_iri (subj);\n"
+"if (starts_with (subj_iri, \'nodeID://\'))\n"
+"subj_iri := \'_:\' || subseq (subj_iri, 9);\n"
+"http (\'\\n { \"id\" : \"\', ses); http_escape (subj_iri, 14, ses, 1, 1); http (\'\"\\n \"properties\" : {\', 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 (\' ] ,\', ses);\n"
+"http (\'\\n \"\', ses); http_escape (case when isstring (pred) then pred else id_to_iri (pred) end, 14, ses, 1, 1); http (\'\" : [ \', ses);\n"
+"prev_pred := pred;\n"
+"obj_needs_comma := 0;\n"
+"}\n"
+"if (obj is null)\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_JSON_MICRODATA: object is NULL\');\n"
+"if (obj_needs_comma)\n"
+"http (\',\\n \', ses);\n"
+"else\n"
+"obj_needs_comma := 1;\n"
+"if (isiri_id (obj))\n"
+"{\n"
+"declare obj_iri varchar;\n"
+"obj_iri := id_to_iri (obj);\n"
+"if (starts_with (obj_iri, \'nodeID://\'))\n"
+"obj_iri := \'_:\' || subseq (obj_iri, 9);\n"
+"http (\'{ \"id\" : \"\', ses); http_escape (obj_iri, 14, ses, 1, 1); http (\'\" }\', ses);\n"
+"}\n"
+"else\n"
+"{\n"
+"declare sqlval any;\n"
+"declare dt, lang, strval any;\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"
+"else\n"
+"sqlval := obj;\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"if (__tag (sqlval) in (__tag of integer, __tag of real, __tag of double precision, __tag of decimal))\n"
+"http_value (sqlval, 0, ses);\n"
+"else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))\n"
+"{\n"
+"declare tmpses any;\n"
+"tmpses := string_output();\n"
+"http_value (sqlval, 0, tmpses);\n"
+"http (\'\"\', ses); http_escape (string_output_string (tmpses), 14, ses, 1, 1); http (\'\"\', ses);\n"
+"}\n"
+"else if (__tag of varchar = __tag (sqlval))\n"
+"{\n"
+"http (\'\"\', ses); http_escape (sqlval, 14, ses, 1, 1); http (\'\"\', ses);\n"
+"}\n"
+"else\n"
+"{\n"
+"sqlval := __rdf_strsqlval (obj);\n"
+"http (\'\"\', ses); http_escape (sqlval, 14, ses, 1, 1); http (\'\"\', ses);\n"
+"}\n"
+"}\n"
+"}\n"
+"if (prev_subj is not null)\n"
+"http (\'] } }\', ses);\n"
+"http (\' }\\n\', ses);\n"
+"}\n"
+"--src sparql.sql:4825\n";
+
+static const char *proc159 =
+"#line 4969 \"[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"
+"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_ATOM_XML_TEXT (triples, 1, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:4346\n";
+"--src sparql.sql:4967\n";
-static const char *proc139 =
-"#line 4363 \"[executable]/sparql.sql\"\n"
+static const char *proc160 =
+"#line 4984 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.ODATA_EDM_TYPE (in obj any)\n"
"{\n"
"if (__tag of int = __tag (obj))\n"
@@ -4488,10 +5135,10 @@ static const char *proc139 =
"return \'Binary\';\n"
"return null;\n"
"}\n"
-"--src sparql.sql:4361\n";
+"--src sparql.sql:4982\n";
-static const char *proc140 =
-"#line 4389 \"[executable]/sparql.sql\"\n"
+static const char *proc161 =
+"#line 5010 \"[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"
@@ -4505,10 +5152,10 @@ static const char *proc140 =
"DB.DBA.RDF_TRIPLES_TO_ODATA_JSON (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:4387\n";
+"--src sparql.sql:5008\n";
-static const char *proc141 =
-"#line 4404 \"[executable]/sparql.sql\"\n"
+static const char *proc162 =
+"#line 5025 \"[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"
@@ -4522,6 +5169,7 @@ static const char *proc141 =
"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"
@@ -4591,10 +5239,10 @@ static const char *proc141 =
"}\n"
"http (sprintf (\'\\n ], \"__count\": \"%d\"\\n } }\', tcount), ses);\n"
"}\n"
-"--src sparql.sql:4402\n";
+"--src sparql.sql:5023\n";
-static const char *proc142 =
-"#line 4488 \"[executable]/sparql.sql\"\n"
+static const char *proc163 =
+"#line 5110 \"[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"
@@ -4610,6 +5258,7 @@ static const char *proc142 =
"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"
@@ -4801,10 +5450,10 @@ static const char *proc142 =
"http (\'</feed>\', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:4486\n";
+"--src sparql.sql:5108\n";
-static const char *proc143 =
-"#line 4701 \"[executable]/sparql.sql\"\n"
+static const char *proc164 =
+"#line 5324 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_INIT (inout _env any)\n"
"{\n"
"_env := string_output();\n"
@@ -4813,10 +5462,10 @@ static const char *proc143 =
"@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .\n"
"[ rdf:type rs:results ;\', _env);\n"
"}\n"
-"--src sparql.sql:4699\n";
+"--src sparql.sql:5322\n";
-static const char *proc144 =
-"#line 4711 \"[executable]/sparql.sql\"\n"
+static const char *proc165 =
+"#line 5334 \"[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"
@@ -4862,10 +5511,10 @@ static const char *proc144 =
"}\n"
"http (\'\\n ] ;\', _env);\n"
"}\n"
-"--src sparql.sql:4709\n";
+"--src sparql.sql:5332\n";
-static const char *proc145 =
-"#line 4758 \"[executable]/sparql.sql\"\n"
+static const char *proc166 =
+"#line 5381 \"[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"
@@ -4874,15 +5523,15 @@ static const char *proc145 =
"http (\'\\n ] .\', _env);\n"
"return string_output_string (_env);\n"
"}\n"
-"--src sparql.sql:4756\n";
+"--src sparql.sql:5379\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 *proc146 =
-"#line 4774 \"[executable]/sparql.sql\"\n"
+static const char *proc167 =
+"#line 5397 \"[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"
@@ -4891,10 +5540,10 @@ static const char *proc146 =
"@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:4772\n";
+"--src sparql.sql:5395\n";
-static const char *proc147 =
-"#line 4784 \"[executable]/sparql.sql\"\n"
+static const char *proc168 =
+"#line 5407 \"[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"
@@ -4915,25 +5564,25 @@ static const char *proc147 =
"}\n"
"sparql_rset_nt_write_row (0, _env, colvalues);\n"
"}\n"
-"--src sparql.sql:4782\n";
+"--src sparql.sql:5405\n";
-static const char *proc148 =
-"#line 4806 \"[executable]/sparql.sql\"\n"
+static const char *proc169 =
+"#line 5429 \"[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:4804\n";
+"--src sparql.sql:5427\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 *proc149 =
-"#line 4819 \"[executable]/sparql.sql\"\n"
+static const char *proc170 =
+"#line 5442 \"[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"
@@ -4943,10 +5592,10 @@ static const char *proc149 =
"xmlns:xsd=\"http://www.w3.org/2001/XMLSchema#\" >\n"
"<rs:results rdf:nodeID=\"rset\">\', _env);\n"
"}\n"
-"--src sparql.sql:4817\n";
+"--src sparql.sql:5440\n";
-static const char *proc150 =
-"#line 4830 \"[executable]/sparql.sql\"\n"
+static const char *proc171 =
+"#line 5453 \"[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"
@@ -5014,10 +5663,10 @@ static const char *proc150 =
"}\n"
"http (\'\\n </rs:result>\', _env);\n"
"}\n"
-"--src sparql.sql:4828\n";
+"--src sparql.sql:5451\n";
-static const char *proc151 =
-"#line 4899 \"[executable]/sparql.sql\"\n"
+static const char *proc172 =
+"#line 5522 \"[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"
@@ -5026,23 +5675,23 @@ static const char *proc151 =
"http (\'\\n </rs:results>\\n</rdf:RDF>\', _env);\n"
"return string_output_string (_env);\n"
"}\n"
-"--src sparql.sql:4897\n";
+"--src sparql.sql:5520\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 *proc152 =
-"#line 4914 \"[executable]/sparql.sql\"\n"
+static const char *proc173 =
+"#line 5537 \"[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:4912\n";
+"--src sparql.sql:5535\n";
-static const char *proc153 =
-"#line 4920 \"[executable]/sparql.sql\"\n"
+static const char *proc174 =
+"#line 5543 \"[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"
@@ -5082,10 +5731,10 @@ static const char *proc153 =
"}\n"
"http(\'}\', _env);\n"
"}\n"
-"--src sparql.sql:4918\n";
+"--src sparql.sql:5541\n";
-static const char *proc154 =
-"#line 4961 \"[executable]/sparql.sql\"\n"
+static const char *proc175 =
+"#line 5584 \"[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"
@@ -5096,23 +5745,23 @@ static const char *proc154 =
"http (\' ] } }\', _env);\n"
"return string_output_string (_env);\n"
"}\n"
-"--src sparql.sql:4959\n";
+"--src sparql.sql:5582\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 *proc155 =
-"#line 4980 \"[executable]/sparql.sql\"\n"
+static const char *proc176 =
+"#line 5603 \"[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:4978\n";
+"--src sparql.sql:5601\n";
-static const char *proc156 =
-"#line 4986 \"[executable]/sparql.sql\"\n"
+static const char *proc177 =
+"#line 5609 \"[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"
@@ -5130,13 +5779,13 @@ static const char *proc156 =
"if (t = __tag of IRI_ID)\n"
"val := id_to_iri (val);\n"
"http (\'\"\', _env);\n"
-"http (replace (cast (val as varchar), \'\"\', \'\"\"\"\'), _env);\n"
+"http (replace (cast (val as varchar), \'\"\', \'\"\"\'), _env);\n"
"http (\'\"\', _env);\n"
"}\n"
-"--src sparql.sql:4984\n";
+"--src sparql.sql:5607\n";
-static const char *proc157 =
-"#line 5008 \"[executable]/sparql.sql\"\n"
+static const char *proc178 =
+"#line 5631 \"[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"
@@ -5165,33 +5814,70 @@ static const char *proc157 =
"}\n"
"http(\'\\n\', _env);\n"
"}\n"
-"--src sparql.sql:5006\n";
+"--src sparql.sql:5629\n";
-static const char *proc158 =
-"#line 5038 \"[executable]/sparql.sql\"\n"
+static const char *proc179 =
+"#line 5661 \"[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:5036\n";
+"--src sparql.sql:5659\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 *proc159 =
-"#line 5051 \"[executable]/sparql.sql\"\n"
+static const char *proc180 =
+"#line 5674 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV_ACC (inout _env any, inout colvalues any, inout colnames any)\n"
+"{\n"
+"declare sol_id varchar;\n"
+"declare col_ctr, col_count integer;\n"
+"declare blank_ids any;\n"
+"col_count := length (colnames);\n"
+"if (185 <> __tag(_env))\n"
+"{\n"
+"_env := string_output ();\n"
+"for (col_ctr := 0; col_ctr < col_count; col_ctr := col_ctr + 1)\n"
+"{\n"
+"if (col_ctr > 0)\n"
+"http(\'\\t\', _env);\n"
+"DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (_env, colnames[col_ctr]);\n"
+"}\n"
+"http (\'\\n\', _env);\n"
+"}\n"
+"for (col_ctr := 0; col_ctr < col_count; col_ctr := col_ctr + 1)\n"
+"{\n"
+"declare val any;\n"
+"val := colvalues[col_ctr];\n"
+"if (col_ctr > 0)\n"
+"http(\'\\t\', _env);\n"
+"if (val is not null)\n"
+"DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (_env, val);\n"
+"}\n"
+"http(\'\\n\', _env);\n"
+"}\n"
+"--src sparql.sql:5672\n";
+
+static const char *other21 =
+"create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV (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_TSV_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN\n"
+"order\n";
+
+static const char *proc181 =
+"#line 5709 \"[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:5049\n";
+"--src sparql.sql:5707\n";
-static const char *proc160 =
-"#line 5057 \"[executable]/sparql.sql\"\n"
+static const char *proc182 =
+"#line 5715 \"[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"
@@ -5208,10 +5894,10 @@ static const char *proc160 =
"vectorbld_acc (agg, colvalues_copy);\n"
"aset_zap_arg (_env, 0, agg);\n"
"}\n"
-"--src sparql.sql:5055\n";
+"--src sparql.sql:5713\n";
-static const char *proc161 =
-"#line 5075 \"[executable]/sparql.sql\"\n"
+static const char *proc183 =
+"#line 5733 \"[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"
@@ -5238,49 +5924,133 @@ static const char *proc161 =
"}\n"
"return string_output_string (ses);\n"
"}\n"
-"--src sparql.sql:5073\n";
+"--src sparql.sql:5731\n";
-static const char *other21 =
+static const char *other22 =
"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 *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"
-"ses := string_output ();\n"
-"if (214 <> __tag (triples_dict))\n"
+static const char *proc184 =
+"#line 5766 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (inout _env any)\n"
"{\n"
-"triples := vector ();\n"
-"}\n"
-"else\n"
-"triples := dict_list_keys (triples_dict, 1);\n"
-"DB.DBA.RDF_TRIPLES_TO_TTL (triples, ses);\n"
-"return ses;\n"
+"_env := vector (0, 0, string_output());\n"
"}\n"
-"--src sparql.sql:5106\n";
+"--src sparql.sql:5764\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"
+static const char *proc185 =
+"#line 5772 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_ACC (inout _env any, inout colvalues any, inout colnames any)\n"
"{\n"
-"declare triples, ses any;\n"
-"ses := string_output ();\n"
-"if (214 <> __tag (triples_dict))\n"
+"declare col_ctr, col_count integer;\n"
+"declare ses any;\n"
+"declare rowid varchar;\n"
+"declare blank_ids any;\n"
+"if (__tag of vector <> __tag(_env))\n"
+"DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (_env);\n"
+"if (isinteger (_env[1]))\n"
"{\n"
-"triples := vector ();\n"
+"if (185 <> __tag(_env))\n"
+"DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (_env);\n"
+"_env[1] := colnames;\n"
+"ses := aref_set_0 (_env, 2);\n"
+"http (\'BINDINGS\', ses);\n"
+"foreach (varchar colname in colnames) do { http (\' ?\' || colname, ses); }\n"
+"http (\' {\', ses);\n"
"}\n"
"else\n"
-"triples := dict_list_keys (triples_dict, 1);\n"
-"DB.DBA.RDF_TRIPLES_TO_NT (triples, ses);\n"
-"return ses;\n"
-"}\n"
-"--src sparql.sql:5121\n";
+"ses := aref_set_0 (_env, 2);\n"
+"http (\'\\n (\', ses);\n"
+"foreach (any val in colvalues) do\n"
+"{\n"
+"if (val is null)\n"
+"http (\'\\tUNDEF\', ses);\n"
+"else\n"
+"{\n"
+"http (\'\\t\', ses);\n"
+"http_nt_object (val, ses);\n"
+"}\n"
+"}\n"
+"http (\'\\t)\', ses);\n"
+"aset_zap_arg (_env, 2, ses);\n"
+"}\n"
+"--src sparql.sql:5770\n";
-static const char *proc164 =
-"#line 5138 \"[executable]/sparql.sql\"\n"
+static const char *proc186 =
+"#line 5808 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_FIN (inout _env any) returns long varchar\n"
+"{\n"
+"declare ses any;\n"
+"if (__tag of vector <> __tag(_env))\n"
+"DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (_env);\n"
+"if (isinteger (_env[1]))\n"
+"return \'BINDINGS ?EmptyResultSetStub { }\';\n"
+"ses := aref_set_0 (_env, 2);\n"
+"if (not isinteger (_env[1]))\n"
+"http (\'\\n}\', ses);\n"
+"return string_output_string (ses);\n"
+"}\n"
+"--src sparql.sql:5806\n";
+
+static const char *other23 =
+"create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS (in colvalues any, in colnames any) returns long varchar\n"
+"from DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_FIN\n"
+"order\n";
+
+static const char *proc187 =
+"#line 5827 \"[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"
+"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_TTL (triples, ses);\n"
+"return ses;\n"
+"}\n"
+"--src sparql.sql:5825\n";
+
+static const char *proc188 =
+"#line 5842 \"[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:5840\n";
+
+static const char *proc189 =
+"#line 5857 \"[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"
+"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_NT (triples, ses);\n"
+"return ses;\n"
+"}\n"
+"--src sparql.sql:5855\n";
+
+static const char *proc190 =
+"#line 5872 \"[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"
@@ -5294,10 +6064,10 @@ static const char *proc164 =
"DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT (triples, 1, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5136\n";
+"--src sparql.sql:5870\n";
-static const char *proc165 =
-"#line 5153 \"[executable]/sparql.sql\"\n"
+static const char *proc191 =
+"#line 5887 \"[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"
@@ -5311,10 +6081,10 @@ static const char *proc165 =
"DB.DBA.RDF_TRIPLES_TO_TALIS_JSON (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5151\n";
+"--src sparql.sql:5885\n";
-static const char *proc166 =
-"#line 5168 \"[executable]/sparql.sql\"\n"
+static const char *proc192 =
+"#line 5902 \"[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"
@@ -5328,10 +6098,44 @@ static const char *proc166 =
"DB.DBA.RDF_TRIPLES_TO_JSON_LD (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5166\n";
+"--src sparql.sql:5900\n";
-static const char *proc167 =
-"#line 5183 \"[executable]/sparql.sql\"\n"
+static const char *proc193 =
+"#line 5917 \"[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:5915\n";
+
+static const char *proc194 =
+"#line 5932 \"[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:5930\n";
+
+static const char *proc195 =
+"#line 5947 \"[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"
@@ -5345,10 +6149,10 @@ static const char *proc167 =
"DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5181\n";
+"--src sparql.sql:5945\n";
-static const char *proc168 =
-"#line 5198 \"[executable]/sparql.sql\"\n"
+static const char *proc196 =
+"#line 5962 \"[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"
@@ -5362,10 +6166,10 @@ static const char *proc168 =
"DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5196\n";
+"--src sparql.sql:5960\n";
-static const char *proc169 =
-"#line 5213 \"[executable]/sparql.sql\"\n"
+static const char *proc197 =
+"#line 5977 \"[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"
@@ -5379,10 +6183,27 @@ static const char *proc169 =
"DB.DBA.RDF_TRIPLES_TO_CSV (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5211\n";
+"--src sparql.sql:5975\n";
-static const char *proc170 =
-"#line 5228 \"[executable]/sparql.sql\"\n"
+static const char *proc198 =
+"#line 5992 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TSV (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_TSV (triples, ses);\n"
+"return ses;\n"
+"}\n"
+"--src sparql.sql:5990\n";
+
+static const char *proc199 =
+"#line 6007 \"[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"
@@ -5396,10 +6217,10 @@ static const char *proc170 =
"DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5226\n";
+"--src sparql.sql:6005\n";
-static const char *proc171 =
-"#line 5243 \"[executable]/sparql.sql\"\n"
+static const char *proc200 =
+"#line 6022 \"[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"
@@ -5416,10 +6237,10 @@ static const char *proc171 =
"DB.DBA.RDF_TRIPLES_TO_CXML (triples, ses, accept, add_http_headers, 0);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5241\n";
+"--src sparql.sql:6020\n";
-static const char *proc172 =
-"#line 5261 \"[executable]/sparql.sql\"\n"
+static const char *proc201 =
+"#line 6040 \"[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"
@@ -5436,26 +6257,26 @@ static const char *proc172 =
"DB.DBA.RDF_TRIPLES_TO_CXML (triples, ses, accept, add_http_headers, 1);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5259\n";
+"--src sparql.sql:6038\n";
-static const char *proc173 =
-"#line 5280 \"[executable]/sparql.sql\"\n"
+static const char *proc202 =
+"#line 6059 \"[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:5278\n";
+"--src sparql.sql:6057\n";
-static const char *proc174 =
-"#line 5287 \"[executable]/sparql.sql\"\n"
+static const char *proc203 =
+"#line 6066 \"[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:5285\n";
+"--src sparql.sql:6064\n";
-static const char *proc175 =
-"#line 5294 \"[executable]/sparql.sql\"\n"
+static const char *proc204 =
+"#line 6073 \"[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"
@@ -5471,30 +6292,30 @@ static const char *proc175 =
"</sparql>\', ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5292\n";
+"--src sparql.sql:6071\n";
-static const char *other22 =
+static const char *other24 =
"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 *proc176 =
-"#line 5316 \"[executable]/sparql.sql\"\n"
+static const char *proc205 =
+"#line 6095 \"[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:5314\n";
+"--src sparql.sql:6093\n";
-static const char *proc177 =
-"#line 5323 \"[executable]/sparql.sql\"\n"
+static const char *proc206 =
+"#line 6102 \"[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:5321\n";
+"--src sparql.sql:6100\n";
-static const char *proc178 =
-"#line 5330 \"[executable]/sparql.sql\"\n"
+static const char *proc207 =
+"#line 6109 \"[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"
@@ -5512,30 +6333,30 @@ static const char *proc178 =
"<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:5328\n";
+"--src sparql.sql:6107\n";
-static const char *other23 =
+static const char *other25 =
"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 *proc179 =
-"#line 5354 \"[executable]/sparql.sql\"\n"
+static const char *proc208 =
+"#line 6133 \"[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:5352\n";
+"--src sparql.sql:6131\n";
-static const char *proc180 =
-"#line 5361 \"[executable]/sparql.sql\"\n"
+static const char *proc209 =
+"#line 6140 \"[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:5359\n";
+"--src sparql.sql:6138\n";
-static const char *proc181 =
-"#line 5368 \"[executable]/sparql.sql\"\n"
+static const char *proc210 =
+"#line 6147 \"[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"
@@ -5550,14 +6371,14 @@ static const char *proc181 =
"http (sprintf (\'[] rdf:type rs:results ; rs:boolean %s .\', ans), ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5366\n";
+"--src sparql.sql:6145\n";
-static const char *other24 =
+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 *proc182 =
-"#line 5389 \"[executable]/sparql.sql\"\n"
+static const char *proc211 =
+"#line 6168 \"[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"
@@ -5570,20 +6391,20 @@ static const char *proc182 =
"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:5387\n";
+"--src sparql.sql:6166\n";
-static const char *other25 =
+static const char *other27 =
"create aggregate DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_NT (inout one any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_INIT,\n"
"DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC,\n"
"DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_NT_FIN\n";
-static const char *other26 =
+static const char *other28 =
"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 *proc183 =
-"#line 5415 \"[executable]/sparql.sql\"\n"
+static const char *proc212 =
+"#line 6194 \"[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"
@@ -5592,16 +6413,16 @@ static const char *proc183 =
"else\n"
"return \'\"bool\"\\n0\\n\';\n"
"}\n"
-"--src sparql.sql:5413\n";
+"--src sparql.sql:6192\n";
-static const char *other27 =
+static const char *other29 =
"create aggregate DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV (inout one any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_INIT,\n"
"DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC,\n"
"DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV_FIN\n";
-static const char *proc184 =
-"#line 5434 \"[executable]/sparql.sql\"\n"
+static const char *proc213 =
+"#line 6213 \"[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"
@@ -5668,10 +6489,10 @@ static const char *proc184 =
"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:5432\n";
+"--src sparql.sql:6211\n";
-static const char *proc185 =
-"#line 5502 \"[executable]/sparql.sql\"\n"
+static const char *proc214 =
+"#line 6281 \"[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"
@@ -5724,10 +6545,10 @@ static const char *proc185 =
"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:5500\n";
+"--src sparql.sql:6279\n";
-static const char *proc186 =
-"#line 5556 \"[executable]/sparql.sql\"\n"
+static const char *proc215 =
+"#line 6335 \"[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"
@@ -5757,10 +6578,10 @@ static const char *proc186 =
"}\n"
"log_enable (old_log_enable, 1);\n"
"}\n"
-"--src sparql.sql:5554\n";
+"--src sparql.sql:6333\n";
-static const char *proc187 =
-"#line 5588 \"[executable]/sparql.sql\"\n"
+static const char *proc216 =
+"#line 6367 \"[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"
@@ -5823,27 +6644,27 @@ static const char *proc187 =
"log_enable (old_log_enable, 1);\n"
"}\n"
"}\n"
-"--src sparql.sql:5586\n";
+"--src sparql.sql:6365\n";
-static const char *proc188 =
-"#line 5652 \"[executable]/sparql.sql\"\n"
+static const char *proc217 =
+"#line 6431 \"[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:5650\n";
+"--src sparql.sql:6429\n";
-static const char *proc189 =
-"#line 5660 \"[executable]/sparql.sql\"\n"
+static const char *proc218 =
+"#line 6439 \"[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:5658\n";
+"--src sparql.sql:6437\n";
-static const char *proc190 =
-"#line 5667 \"[executable]/sparql.sql\"\n"
+static const char *proc219 =
+"#line 6446 \"[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"
@@ -5932,10 +6753,10 @@ static const char *proc190 =
"_env[ctor_op] := _env[ctor_op] + action_ctr;\n"
"log_enable (old_log_enable, 1);\n"
"}\n"
-"--src sparql.sql:5665\n";
+"--src sparql.sql:6444\n";
-static const char *proc191 =
-"#line 5758 \"[executable]/sparql.sql\"\n"
+static const char *proc220 =
+"#line 6537 \"[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"
@@ -5944,10 +6765,10 @@ static const char *proc191 =
"__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:5756\n";
+"--src sparql.sql:6535\n";
-static const char *proc192 =
-"#line 5769 \"[executable]/sparql.sql\"\n"
+static const char *proc221 =
+"#line 6548 \"[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"
@@ -5957,10 +6778,10 @@ static const char *proc192 =
"__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:5767\n";
+"--src sparql.sql:6546\n";
-static const char *proc193 =
-"#line 5781 \"[executable]/sparql.sql\"\n"
+static const char *proc222 =
+"#line 6560 \"[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"
@@ -5970,10 +6791,10 @@ static const char *proc193 =
"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:5779\n";
+"--src sparql.sql:6558\n";
-static const char *proc194 =
-"#line 5793 \"[executable]/sparql.sql\"\n"
+static const char *proc223 =
+"#line 6572 \"[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"
@@ -5994,22 +6815,22 @@ static const char *proc194 =
"}\n"
"return _env;\n"
"}\n"
-"--src sparql.sql:5791\n";
+"--src sparql.sql:6570\n";
-static const char *other28 =
+static const char *other30 =
" 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"
"from DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_INIT, DB.DBA.SPARQL_DELETE_CTOR_ACC, DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_FIN\n";
-static const char *other29 =
+static const char *other31 =
" create aggregate DB.DBA.SPARQL_INSERT_CTOR (in graph_iri any, in 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_INSERT_CTOR_ACC, DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_FIN\n";
-static const char *other30 =
+static const char *other32 =
" 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 *proc195 =
-"#line 5830 \"[executable]/sparql.sql\"\n"
+static const char *proc224 =
+"#line 6609 \"[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"
@@ -6041,10 +6862,10 @@ static const char *proc195 =
"else\n"
"return ins_count;\n"
"}\n"
-"--src sparql.sql:5828\n";
+"--src sparql.sql:6607\n";
-static const char *proc196 =
-"#line 5863 \"[executable]/sparql.sql\"\n"
+static const char *proc225 =
+"#line 6642 \"[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"
@@ -6076,10 +6897,10 @@ static const char *proc196 =
"else\n"
"return del_count;\n"
"}\n"
-"--src sparql.sql:5861\n";
+"--src sparql.sql:6640\n";
-static const char *proc197 =
-"#line 5896 \"[executable]/sparql.sql\"\n"
+static const char *proc226 =
+"#line 6675 \"[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"
@@ -6111,10 +6932,10 @@ static const char *proc197 =
"else\n"
"return del_count + ins_count;\n"
"}\n"
-"--src sparql.sql:5894\n";
+"--src sparql.sql:6673\n";
-static const char *proc198 =
-"#line 5930 \"[executable]/sparql.sql\"\n"
+static const char *proc227 =
+"#line 6709 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_DEL (inout rquads any)\n"
"{\n"
"declare rquads_ctr, rquads_count, opcode integer;\n"
@@ -6183,50 +7004,66 @@ static const char *proc198 =
"connection_set (\'g_dict\', null);\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:5928\n";
+"--src sparql.sql:6707\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"
+static const char *proc228 =
+"#line 6782 \"[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"
"{\n"
-"declare g any;\n"
"declare g_iid IRI_ID;\n"
"declare old_log_enable integer;\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"
+"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"
"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);\n"
+"repl_text (\'__rdf_repl\', \'sparql define input:storage \"\" clear graph iri ( ?? )\', 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"
"exec (sprintf (\'\n"
"delete from DB.DBA.RDF_QUAD\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"
+"where G = __i2id (\'\'%S\'\') \', g_iri));\n"
+"DB.DBA.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;\n"
-"delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI like concat (\'destMD5=\', md5 (g), \'&graphMD5=%\');\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"
"}\n"
"/*091202 commit work; */\n"
"log_enable (old_log_enable, 1);\n"
"if (compose_report)\n"
-"return sprintf (\'Clear <%s> -- done\', g);\n"
-"else\n"
+"return txtreport;\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:6001\n";
+"--src sparql.sql:6780\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"
+static const char *proc229 =
+"#line 6835 \"[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"
"{\n"
"declare old_log_enable integer;\n"
"declare grab_params any;\n"
@@ -6234,18 +7071,21 @@ static const char *proc200 =
"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); resignal; };\n"
+"declare exit handler for sqlstate \'*\' { log_enable (old_log_enable, 1); if (silent) goto fail; resignal; };\n"
"grabbed := dict_new();\n"
"if (isiri_id (graph_iri))\n"
"graph_iri := id_to_iri (graph_iri);\n"
-"grab_params := vector (\'base_iri\', resource, \'get:destination\', graph_iri,\n"
+"grab_params := vector_concat (vector (\n"
+"\'base_iri\', resource,\n"
+"\'get:destination\', graph_iri,\n"
"\'resolver\', \'DB.DBA.RDF_GRAB_RESOLVER_DEFAULT\', \'loader\', \'DB.DBA.RDF_SPONGE_UP\',\n"
-"\'get:soft\', \'replacing\',\n"
-"\'get:refresh\', -1,\n"
-"\'get:error-recovery\', \'signal\',\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"
"\n"
-"\'get:strategy\', \'rdfa-only\',\n"
-"\'grabbed\', grabbed );\n"
+"\'get:strategy\', get_keyword (\'get:strategy\', options, \'rdfa-only\'),\n"
+"\'grabbed\', grabbed ),\n"
+"options );\n"
"commit work;\n"
"res := DB.DBA.RDF_GRAB_SINGLE (resource, grabbed, grab_params);\n"
"commit work;\n"
@@ -6264,12 +7104,50 @@ static const char *proc200 =
"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:6038\n";
+"--src sparql.sql:6833\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"
+static const char *proc230 =
+"#line 6884 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.SPARUL_LOAD_SERVICE_DATA (in service_iri any, in proxy_iri varchar, in uid integer, in log_mode integer, in compose_report integer, in options any := null, in silent integer := 0) returns any\n"
+"{\n"
+"declare old_log_enable integer;\n"
+"declare mdta, rows any;\n"
+"declare stat, msg varchar;\n"
+"__rgs_assert_cbk (service_iri, uid, 2, \'SPARUL LOAD SERVICE DATA\');\n"
+"\n"
+"old_log_enable := log_enable (log_mode, 1);\n"
+"stat := \'00000\';\n"
+"exec (\'DB.DBA.SPARQL_SD_PROBE (?, ?, 0, 0)\', stat, msg, vector (service_iri, proxy_iri), 10000, mdta, rows);\n"
+"log_enable (old_log_enable, 1);\n"
+"if (stat <> \'00000\')\n"
+"{\n"
+"if (not silent) signal (stat, msg);\n"
+"if (compose_report)\n"
+"return sprintf (\'Load service <%s> data failed: %s: %s\', service_iri, stat, msg);\n"
+"else\n"
+"return 0;\n"
+"}\n"
+"if (compose_report)\n"
+"{\n"
+"if (length (rows))\n"
+"return sprintf (\'Load service <%s> data -- done. %s\', service_iri, rows[length(rows)-1][1]);\n"
+"else\n"
+"return sprintf (\'Load service <%s> data -- nothing done\', service_iri);\n"
+"}\n"
+"else\n"
+"return 1;\n"
+"}\n"
+"--src sparql.sql:6882\n";
+
+static const char *proc231 =
+"#line 6915 \"[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"
"{\n"
"declare g_iid IRI_ID;\n"
"declare old_log_enable integer;\n"
@@ -6277,6 +7155,8 @@ static const char *proc201 =
"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"
@@ -6317,72 +7197,94 @@ static const char *proc201 =
"else\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:6079\n";
+"--src sparql.sql:6913\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"
+static const char *proc232 =
+"#line 6967 \"[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"
"{\n"
"declare g_iid IRI_ID;\n"
"declare old_log_enable integer;\n"
-"__rgs_assert_cbk (graph_iri, uid, 2, \'SPARUL DROP GRAPH\');\n"
-"g_iid := iri_to_id (graph_iri);\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"
"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 ( ?? )\', graph_iri);\n"
+"repl_text (\'__rdf_repl\', \'sparql define input:storage \"\" drop graph iri ( ?? )\', 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"
-"if (not exists (select top 1 1 from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = iri_to_id (graph_iri)))\n"
+"if (not exists (select top 1 1 from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid))\n"
"{\n"
"if (silent)\n"
"{\n"
-"if (exists (select top 1 1 from DB.DBA.RDF_QUAD where G = iri_to_id (graph_iri)))\n"
+"if (exists (select top 1 1 from DB.DBA.RDF_QUAD where G = g_iid))\n"
"{\n"
-"DB.DBA.SPARUL_CLEAR (graph_iri, 0, uid);\n"
+"DB.DBA.SPARUL_CLEAR (g_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\', graph_iri);\n"
+"return sprintf (\'Drop silent graph <%s> -- graph has not been explicitly created before, triples were removed\', g_iri);\n"
"else\n"
"return 2;\n"
"}\n"
"if (compose_report)\n"
-"return sprintf (\'Drop silent graph <%s> -- nothing to do\', graph_iri);\n"
+"return sprintf (\'Drop silent graph <%s> -- nothing to do\', g_iri);\n"
"else\n"
"return 0;\n"
"}\n"
"else\n"
-"signal (\'22023\', \'SPARUL_DROP() failed: graph <\' || graph_iri || \'> has not been explicitly created before\');\n"
+"signal (\'22023\', \'SPARUL_DROP() failed: graph <\' || g_iri || \'> has not been explicitly created before\');\n"
"}\n"
"if (silent)\n"
"{\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"
+"DB.DBA.SPARUL_CLEAR (g_iri, 0, uid);\n"
+"delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid;\n"
"/*091202 commit work; */\n"
"log_enable (old_log_enable, 1);\n"
"if (compose_report)\n"
-"return sprintf (\'Drop silent graph <%s> -- done\', graph_iri);\n"
+"return sprintf (\'Drop silent graph <%s> -- done\', g_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(?: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"
+"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"
"log_enable (old_log_enable, 1);\n"
"/*091202 commit work; */\n"
"if (compose_report)\n"
-"return sprintf (\'Drop graph <%s> -- done\', graph_iri);\n"
-"else\n"
+"return txtreport;\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:6129\n";
+"--src sparql.sql:6965\n";
-static const char *proc203 =
-"#line 6191 \"[executable]/sparql.sql\"\n"
+static const char *proc233 =
+"#line 7049 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.SPARUL_RUN (in results any, in compose_report integer := 0) returns any\n"
"{\n"
"\n"
@@ -6408,11 +7310,257 @@ static const char *proc203 =
"return res;\n"
"}\n"
"}\n"
-"--src sparql.sql:6189\n";
+"--src sparql.sql:7047\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"
+static const char *proc234 =
+"#line 7079 \"[executable]/sparql.sql\"\n"
+" create procedure DB.DBA.SPARQL_BINDINGS_VIEW_IMP (in dta any)\n"
+"{\n"
+"declare rcount, rctr integer;\n"
+"declare BND any;\n"
+"result_names (BND);\n"
+"rcount := length (dta);\n"
+"for (rctr := 0; rctr < rcount; rctr := rctr+1)\n"
+"result (dta[rctr]);\n"
+"}\n"
+"--src sparql.sql:7077\n";
+
+static const char *view0 =
+"create procedure view DB.DBA.SPARQL_BINDINGS_VIEW as DB.DBA.SPARQL_BINDINGS_VIEW_IMP (dta) (BND any)\n";
+
+static const char *other33 =
+"grant select on DB.DBA.SPARQL_BINDINGS_VIEW to public\n";
+static const char *proc235 =
+"#line 7098 \"[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"
+"{\n"
+"if (group_ctr)\n"
+"http (\'\\n\', res_ses);\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"
+"{\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"
+"}\n"
+"--src sparql.sql:7096\n";
+
+static const char *proc236 =
+"#line 7156 \"[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"
+"{\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"
+"}\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:7154\n";
+
+static const char *proc237 =
+"#line 7213 \"[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:7211\n";
+
+static const char *proc238 =
+"#line 7250 \"[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:7248\n";
+
+static const char *proc239 =
+"#line 7295 \"[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:7293\n";
+
+static const char *proc240 =
+"#line 7301 \"[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:7299\n";
+
+static const char *proc241 =
+"#line 7307 \"[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:7305\n";
+
+static const char *proc242 =
+"#line 7313 \"[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"
@@ -6421,6 +7569,8 @@ static const char *proc204 =
"declare GRAPH_IRI varchar;\n"
"declare GRAPH_IID IRI_ID;\n"
"declare ctr, len integer;\n"
+"if (lim is null)\n"
+"lim := 2000000000;\n"
"if (return_iris)\n"
"result_names (GRAPH_IRI);\n"
"else\n"
@@ -6498,10 +7648,10 @@ static const char *proc204 =
"else\n"
"result (specials[ctr]);\n"
"}\n"
-"--src sparql.sql:6216\n";
+"--src sparql.sql:7311\n";
-static const char *proc205 =
-"#line 6310 \"[executable]/sparql.sql\"\n"
+static const char *proc243 =
+"#line 7407 \"[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"
@@ -6510,10 +7660,10 @@ static const char *proc205 =
"return 1;\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:6308\n";
+"--src sparql.sql:7405\n";
-static const char *proc206 =
-"#line 6321 \"[executable]/sparql.sql\"\n"
+static const char *proc244 =
+"#line 7418 \"[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"
@@ -6532,18 +7682,18 @@ static const char *proc206 =
"return 1;\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:6319\n";
+"--src sparql.sql:7416\n";
-static const char *proc207 =
-"#line 6342 \"[executable]/sparql.sql\"\n"
+static const char *proc245 =
+"#line 7439 \"[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:6340\n";
+"--src sparql.sql:7437\n";
-static const char *proc208 =
-"#line 6349 \"[executable]/sparql.sql\"\n"
+static const char *proc246 =
+"#line 7446 \"[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"
@@ -6580,34 +7730,34 @@ static const char *proc208 =
"if (env[1] < pct)\n"
"env := vector (obj, pct);\n"
"}\n"
-"--src sparql.sql:6347\n";
+"--src sparql.sql:7444\n";
-static const char *proc209 =
-"#line 6388 \"[executable]/sparql.sql\"\n"
+static const char *proc247 =
+"#line 7485 \"[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:6386\n";
+"--src sparql.sql:7483\n";
-static const char *other31 =
+static const char *other34 =
" create aggregate DB.DBA.BEST_LANGMATCH (inout obj any, in range varchar, in dflt_lang varchar) from\n"
"DB.DBA.BEST_LANGMATCH_INIT,\n"
"DB.DBA.BEST_LANGMATCH_ACC,\n"
"DB.DBA.BEST_LANGMATCH_FINAL\n";
-static const char *proc210 =
-"#line 6404 \"[executable]/sparql.sql\"\n"
+static const char *proc248 =
+"#line 7501 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_CONSTRUCT_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:6402\n";
+"--src sparql.sql:7499\n";
-static const char *proc211 =
-"#line 6411 \"[executable]/sparql.sql\"\n"
+static const char *proc249 =
+"#line 7508 \"[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"
@@ -6624,11 +7774,22 @@ static const char *proc211 =
"blank_ids := 0;\n"
"for (triple_ctr := length (opcodes) - 1; triple_ctr >= 0; triple_ctr := triple_ctr-1)\n"
"{\n"
-"declare fld_ctr integer;\n"
+"declare fld_ctr, fld_count 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 := 2; fld_ctr >= 0; fld_ctr := fld_ctr - 1)\n"
+"for (fld_ctr := fld_count - 1; fld_ctr >= 0; fld_ctr := fld_ctr - 1)\n"
"{\n"
"declare op integer;\n"
"declare arg any;\n"
@@ -6636,137 +7797,451 @@ static const char *proc211 =
"arg := opcodes[triple_ctr][fld_ctr * 2 + 1];\n"
"if (1 = op)\n"
"{\n"
-"declare i any;\n"
-"i := vars[arg];\n"
-"if (i is null)\n"
-"goto end_of_adding_triple;\n"
-"if (isiri_id (i))\n"
+"declare i any;\n"
+"i := vars[arg];\n"
+"if (i is null)\n"
+"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"
+"}\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"
+"i := iri_to_id (i);\n"
+"}\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"
+"__rdf_strsqlval (i),\n"
+"case (fld_ctr) when 1 then \'predicate\' else \'subject\' end ) );\n"
+"triple_vec[fld_ctr] := i;\n"
+"}\n"
+"else if (2 = op)\n"
+"{\n"
+"if (isinteger (blank_ids))\n"
+"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"
+"triple_vec[fld_ctr] := blank_ids[arg];\n"
+"}\n"
+"else if (3 = op)\n"
+"{\n"
+"if (arg is null)\n"
+"goto end_of_adding_triple;\n"
+"\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"
+"}\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"
+"arg := iri_to_id (arg);\n"
+"}\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"
+"__rdf_strsqlval (arg),\n"
+"case (fld_ctr) when 1 then \'predicate\' else \'subject\' end ) );\n"
+"else if (__tag of vector = __tag (arg))\n"
+"arg := DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (arg[0], arg[1], arg[2]);\n"
+"triple_vec[fld_ctr] := arg;\n"
+"}\n"
+"else signal (\'RDFXX\', \'Bad opcode in DB.DBA.SPARQL_CONSTRUCT()\');\n"
+"}\n"
+"\n"
+"dict_put (_env, triple_vec, 0);\n"
+"end_of_adding_triple: ;\n"
+"}\n"
+"}\n"
+"--src sparql.sql:7506\n";
+
+static const char *proc250 =
+"#line 7616 \"[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:7614\n";
+
+static const char *other35 =
+" 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 *proc251 =
+"#line 7629 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.SPARQL_DESC_AGG_INIT (inout _env any)\n"
+"{\n"
+"_env := 0;\n"
+"}\n"
+"--src sparql.sql:7627\n";
+
+static const char *proc252 =
+"#line 7635 \"[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"
+"declare blank_ids any;\n"
+"if (214 <> __tag(_env))\n"
+"{\n"
+"_env := dict_new (31, sys_stat (\'sparql_result_set_max_rows\'), sys_stat (\'sparql_max_mem_in_use\'));\n"
+"}\n"
+"for (var_ctr := length (vars) - 1; var_ctr >= 0; var_ctr := var_ctr - 1)\n"
+"{\n"
+"declare i any;\n"
+"i := vars[var_ctr];\n"
+"if (isiri_id (i))\n"
+"dict_put (_env, i, 0);\n"
+"}\n"
+"}\n"
+"--src sparql.sql:7633\n";
+
+static const char *proc253 =
+"#line 7653 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.SPARQL_DESC_AGG_FIN (inout _env any)\n"
+"{\n"
+"declare subjects, options, res any;\n"
+"declare subj_ctr integer;\n"
+"if (214 <> __tag(_env))\n"
+"return dict_new ();\n"
+"return _env;\n"
+"}\n"
+"--src sparql.sql:7651\n";
+
+static const char *other36 =
+"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 *proc254 =
+"#line 7667 \"[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"
+"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, sameas 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"
+"sameas := get_keyword (\'same-as\', 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"
+"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_s, maps_o any;\n"
+"declare maps_s_len, maps_o_len integer;\n"
+"s := all_subj_descs [s_ctr];\n"
+"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);\n"
+"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);\n"
+"\n"
+"maps_s_len := length (maps_s);\n"
+"maps_o_len := length (maps_o);\n"
+"if ((inf_ruleset is null) and (sameas is null))\n"
+"{\n"
+"declare phys_as_s, phys_as_o integer;\n"
+"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;\n"
+"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;\n"
+"if (phys_as_s or phys_as_o)\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"
+"if (phys_as_s)\n"
+"{\n"
+"maps_s := subseq (maps_s, 0, maps_s_len-1);\n"
+"maps_s_len := maps_s_len - 1;\n"
+"}\n"
+"if (phys_as_o)\n"
+"{\n"
+"maps_o := subseq (maps_o, 0, maps_o_len-1);\n"
+"maps_o_len := maps_o_len - 1;\n"
+"}\n"
+"}\n"
+"}\n"
+"if ((maps_s_len > 0) or (maps_o_len > 0))\n"
+"all_subj_descs [s_ctr] := vector (s, maps_s, maps_o);\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_s, maps_o any;\n"
+"declare map_ctr, maps_s_len, maps_o_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 := s_desc[1];\n"
+"maps_o := s_desc[2];\n"
+"maps_s_len := length (maps_s);\n"
+"maps_o_len := length (maps_o);\n"
+"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)));\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_s_len; map_ctr := map_ctr + 1)\n"
+"{\n"
+"if (map_ctr > 0) http (\' union\\n\', ses);\n"
+"http (\' { quad map <\' || maps_s[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"
+"http (\' for (sparql define output:valmode \"LONG\" define input:storage <\' || storage_name || \'> \', ses);\n"
+"foreach (any g in sorted_bad_graphs) do\n"
"{\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"
+"http (\' define input:named-graph-exclude <\' || id_to_iri_nosignal (g) || \'>\\n\', ses);\n"
"}\n"
-"else if ((isstring (i) and (1 = __box_flags (i))) or (217 = __tag(i)))\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 ?s1 ?p1\\n\', ses);\n"
+"http (\' where { graph ?g1 {\\n\', ses);\n"
+"for (map_ctr := 0; map_ctr < maps_o_len; map_ctr := map_ctr + 1)\n"
"{\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"
+"if (map_ctr > 0) http (\' union\\n\', ses);\n"
+"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);\n"
"}\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"
-"__rdf_strsqlval (i),\n"
-"case (fld_ctr) when 1 then \'predicate\' else \'subject\' end ) );\n"
-"triple_vec[fld_ctr] := i;\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\", subj), 4); }\\n\', ses);\n"
+"http (\' }\\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"
-"else if (2 = op)\n"
+"if (graphs_listed)\n"
"{\n"
-"if (isinteger (blank_ids))\n"
-"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 (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"
+"call (\'DB.DBA.\' || fname)(s, res, sorted_good_graphs);\n"
"}\n"
-"else if (3 = op)\n"
+"else\n"
"{\n"
-"if (arg is null)\n"
-"goto end_of_adding_triple;\n"
"\n"
-"if (isiri_id (arg))\n"
-"{\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"
+"call (\'DB.DBA.\' || fname)(s, res);\n"
"}\n"
-"else if ((isstring (arg) and (1 = __box_flags (arg))) or (217 = __tag(arg)))\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"
-"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"
+"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"
-"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"
-"__rdf_strsqlval (arg),\n"
-"case (fld_ctr) when 1 then \'predicate\' else \'subject\' end ) );\n"
-"else if (__tag of vector = __tag (arg))\n"
-"arg := DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (arg[0], arg[1], arg[2]);\n"
-"triple_vec[fld_ctr] := arg;\n"
+"for (select S as s1, P as p1 from DB.DBA.RDF_QUAD\n"
+"where G = graph and O = subj and P <> rdf_type_iid\n"
+"option (QUIETCAST)) do\n"
+"{\n"
+"\n"
+"dict_bitor_or_put (res, vector (s1, p1, subj), 4);\n"
"}\n"
-"else signal (\'RDFXX\', \'Bad opcode in DB.DBA.SPARQL_CONSTRUCT()\');\n"
"}\n"
-"\n"
-"dict_put (_env, triple_vec, 0);\n"
-"end_of_adding_triple: ;\n"
"}\n"
+"return res;\n"
"}\n"
-"--src sparql.sql:6409\n";
-
-static const char *proc212 =
-"#line 6508 \"[executable]/sparql.sql\"\n"
-" create procedure DB.DBA.SPARQL_CONSTRUCT_FIN (inout _env any)\n"
+"g_dict := dict_new ();\n"
+"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
-"if (214 <> __tag(_env))\n"
-"_env := dict_new ();\n"
-"return _env;\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"
-"--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 *proc213 =
-"#line 6521 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_DESC_AGG_INIT (inout _env any)\n"
+"sorted_good_graphs := dict_list_keys (g_dict, 1);\n"
+"if (0 = length (sorted_good_graphs))\n"
"{\n"
-"_env := 0;\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"
-"--src sparql.sql:6519\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"
+"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 var_ctr integer;\n"
-"declare blank_ids any;\n"
-"if (214 <> __tag(_env))\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"
-"_env := dict_new (31, sys_stat (\'sparql_result_set_max_rows\'), sys_stat (\'sparql_max_mem_in_use\'));\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"
-"for (var_ctr := length (vars) - 1; var_ctr >= 0; var_ctr := var_ctr - 1)\n"
+"for (select S as s1, P as p1 from DB.DBA.RDF_QUAD\n"
+"where G = graph and O = subj and P <> rdf_type_iid\n"
+"option (QUIETCAST)) do\n"
"{\n"
-"declare i any;\n"
-"i := vars[var_ctr];\n"
-"if (isiri_id (i))\n"
-"dict_put (_env, i, 0);\n"
+"\n"
+"dict_bitor_or_put (res, vector (s1, p1, subj), 4);\n"
"}\n"
"}\n"
-"--src sparql.sql:6525\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"
-"declare subj_ctr integer;\n"
-"if (214 <> __tag(_env))\n"
-"return dict_new ();\n"
-"return _env;\n"
"}\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";
+"\n"
+"return res;\n"
+"}\n"
+"--src sparql.sql:7665\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"
+static const char *proc255 =
+"#line 7979 \"[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, g_dict, res any;\n"
+"declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, 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, sameas varchar;\n"
"declare rdf_type_iid IRI_ID;\n"
@@ -6840,20 +8315,13 @@ static const char *proc216 =
"\n"
"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
"{\n"
-"declare s, phys_s, maps_s, maps_o any;\n"
-"declare maps_s_len, maps_o_len integer;\n"
+"declare s, phys_s, maps any;\n"
+"declare maps_len integer;\n"
"s := all_subj_descs [s_ctr];\n"
-"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);\n"
-"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);\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_s_len := length (maps_s);\n"
-"maps_o_len := length (maps_o);\n"
-"if ((inf_ruleset is null) and (sameas is null))\n"
-"{\n"
-"declare phys_as_s, phys_as_o integer;\n"
-"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;\n"
-"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;\n"
-"if (phys_as_s or phys_as_o)\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"
@@ -6866,20 +8334,11 @@ static const char *proc216 =
"if (not isinteger (phys_s))\n"
"vectorbld_acc (phys_subjects, phys_s);\n"
"}\n"
-"if (phys_as_s)\n"
-"{\n"
-"maps_s := subseq (maps_s, 0, maps_s_len-1);\n"
-"maps_s_len := maps_s_len - 1;\n"
-"}\n"
-"if (phys_as_o)\n"
-"{\n"
-"maps_o := subseq (maps_o, 0, maps_o_len-1);\n"
-"maps_o_len := maps_o_len - 1;\n"
-"}\n"
-"}\n"
+"maps := subseq (maps, 0, maps_len-1);\n"
+"maps_len := maps_len - 1;\n"
"}\n"
-"if ((maps_s_len > 0) or (maps_o_len > 0))\n"
-"all_subj_descs [s_ctr] := vector (s, maps_s, maps_o);\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"
@@ -6888,18 +8347,16 @@ static const char *proc216 =
"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_s, maps_o any;\n"
-"declare map_ctr, maps_s_len, maps_o_len integer;\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 := s_desc[1];\n"
-"maps_o := s_desc[2];\n"
-"maps_s_len := length (maps_s);\n"
-"maps_o_len := length (maps_o);\n"
-"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)));\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"
@@ -6922,36 +8379,15 @@ static const char *proc216 =
"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_s_len; map_ctr := map_ctr + 1)\n"
-"{\n"
-"if (map_ctr > 0) http (\' union\\n\', ses);\n"
-"http (\' { quad map <\' || maps_s[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"
-"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 ?s1 ?p1\\n\', ses);\n"
-"http (\' where { graph ?g1 {\\n\', ses);\n"
-"for (map_ctr := 0; map_ctr < maps_o_len; map_ctr := map_ctr + 1)\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_o[map_ctr][0] || \'> { ?s1 ?p1 ?o1 . FILTER (?p1 != rdf:type) . FILTER(isREF (?o1)) . FILTER (?o1 = iri(?:subj_iri)) } }\\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 (\"s1\", \"p1\", subj), 4); }\\n\', ses);\n"
-"http (\' }\\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"
@@ -6996,12 +8432,117 @@ static const char *proc216 =
"\n"
"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
"}\n"
-"for (select S as s1, P as p1 from DB.DBA.RDF_QUAD\n"
-"where G = graph and O = subj and P <> rdf_type_iid\n"
-"option (QUIETCAST)) do\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 (s1, p1, subj), 4);\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:7977\n";
+
+static const char *proc256 =
+"#line 8194 \"[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"
@@ -7062,34 +8603,33 @@ static const char *proc216 =
"\n"
"\n"
"}\n"
-"for (select S as s1, P as p1 from DB.DBA.RDF_QUAD\n"
-"where G = graph and O = subj and P <> rdf_type_iid\n"
-"option (QUIETCAST)) do\n"
-"{\n"
"\n"
-"dict_bitor_or_put (res, vector (s1, p1, subj), 4);\n"
-"}\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
"}\n"
"}\n"
"\n"
"return res;\n"
"}\n"
-"--src sparql.sql:6557\n";
+"--src sparql.sql:8192\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"
+static const char *proc257 =
+"#line 8355 \"[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_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, res any;\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, sameas varchar;\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"
-"sameas := get_keyword (\'same-as\', 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"
@@ -7099,11 +8639,16 @@ static const char *proc217 =
"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"
+"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"
-"gvector_sort (all_subj_descs, 1, 0, 0);\n"
+"\n"
+"next_iteration:\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"
"else\n"
@@ -7133,12 +8678,12 @@ static const char *proc217 =
"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"
+"else if ((\'\' = storage_name) and (inf_ruleset 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"
+"s := all_subjs [s_ctr];\n"
"if (isiri_id (s))\n"
"vectorbld_acc (phys_subjects, s);\n"
"else\n"
@@ -7156,11 +8701,11 @@ static const char *proc217 =
"{\n"
"declare s, phys_s, maps any;\n"
"declare maps_len integer;\n"
-"s := all_subj_descs [s_ctr];\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 (sameas 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 (maps[maps_len-1][0] = UNAME\'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap\'))\n"
"{\n"
"if (isiri_id (s))\n"
"{\n"
@@ -7177,9 +8722,9 @@ static const char *proc217 =
"maps_len := maps_len - 1;\n"
"}\n"
"if (maps_len > 0)\n"
-"all_subj_descs [s_ctr] := vector (s, maps);\n"
+"all_subjs [s_ctr] := vector (s, maps);\n"
"else\n"
-"all_subj_descs [s_ctr] := 0;\n"
+"all_subjs [s_ctr] := 0;\n"
"\n"
"\n"
"}\n"
@@ -7189,18 +8734,18 @@ static const char *proc217 =
"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"
+"s_desc := all_subjs [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"
+"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 subj 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"
@@ -7214,19 +8759,29 @@ static const char *proc217 =
"}\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 (\'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] || \'> { ?:subj_iri ?p1 ?o1 } }\\n\', ses);\n"
"}\n"
-"http (\' } } ) do {\\n\', ses);\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 (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"
+"if (graphs_listed)\n"
+"http (\' } }\\n\', ses);\n"
+"http (\' } }\\n\', ses);\n"
"txt := string_output_string (ses);\n"
"\n"
"saved_user := user;\n"
@@ -7237,12 +8792,12 @@ static const char *proc217 =
"if (graphs_listed)\n"
"{\n"
"\n"
-"call (\'DB.DBA.\' || fname)(s, 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)(s, res);\n"
+"call (\'DB.DBA.\' || fname)(s, subj_dict, next_iter_subjs, res);\n"
"}\n"
"end_of_s: ;\n"
"}\n"
@@ -7270,11 +8825,22 @@ static const char *proc217 =
"{\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"
+"}\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"
@@ -7287,18 +8853,40 @@ static const char *proc217 =
"{\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"
-"--src sparql.sql:6869\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:8353\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"
+static const char *proc258 =
+"#line 8617 \"[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_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 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"
@@ -7314,11 +8902,16 @@ static const char *proc218 =
"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"
+"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"
-"gvector_sort (all_subj_descs, 1, 0, 0);\n"
+"\n"
+"next_iteration:\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"
"else\n"
@@ -7345,25 +8938,8 @@ static const char *proc218 =
"}\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"
+"if (0 = all_s_count)\n"
"return res;\n"
"\n"
"if (graphs_listed)\n"
@@ -7374,94 +8950,77 @@ static const char *proc218 =
"{\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"
+"for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
"declare subj any;\n"
-"subj := phys_subjects [s_ctr];\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 (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"
-"sorted_good_graphs := dict_list_keys (g_dict, 1);\n"
-"if (0 = length (sorted_good_graphs))\n"
+"else\n"
"{\n"
-"g_dict := dict_new ();\n"
-"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
+"for (s_ctr := all_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"
+"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"
+"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))) ) );\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"
+"(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"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\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"
+"ret_or_next_iter:\n"
+"if (0 = dict_size (next_iter_subjs))\n"
+"{\n"
+"\n"
"return res;\n"
"}\n"
-"--src sparql.sql:7084\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:8615\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"
+static const char *proc259 =
+"#line 8749 \"[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"
"{\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 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 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"
@@ -7475,18 +9034,18 @@ static const char *proc219 =
"return res;\n"
"foreach (any c in consts) do\n"
"{\n"
-"if (isiri_id (c))\n"
-"dict_put (subj_dict, c, 0);\n"
+"if (not isnumeric (c))\n"
+"dict_put (obj_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"
+"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"
"return res;\n"
"\n"
"next_iteration:\n"
-"all_s_count := length (all_subjs);\n"
-"gvector_sort (all_subjs, 1, 0, 0);\n"
+"all_obj_count := length (all_objs);\n"
+"gvector_sort (all_objs, 1, 0, 0);\n"
"\n"
"if (__tag of integer = __tag (good_graphs))\n"
"graphs_listed := 0;\n"
@@ -7495,7 +9054,7 @@ static const char *proc219 =
"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"
+"if (is_named_iri_id (g) 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"
@@ -7509,88 +9068,94 @@ static const char *proc219 =
"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"
+"if (is_named_iri_id (g))\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"
+"vectorbld_init (phys_objects);\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 (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
+"for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)\n"
"{\n"
-"declare s, phys_s any;\n"
-"s := all_subjs [s_ctr];\n"
-"if (isiri_id (s))\n"
-"vectorbld_acc (phys_subjects, s);\n"
+"declare obj, phys_obj any;\n"
+"obj := all_objs [obj_ctr];\n"
+"if (not isnumeric (obj))\n"
+"{\n"
+"if (isiri_id (obj))\n"
+"vectorbld_acc (phys_objects, obj);\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"
+"phys_obj := iri_to_id (obj, 0, 0);\n"
+"if (not isinteger (phys_obj))\n"
+"vectorbld_acc (phys_objects, phys_obj);\n"
"}\n"
"}\n"
-"vectorbld_final (phys_subjects);\n"
-"goto describe_physical_subjects;\n"
+"}\n"
+"vectorbld_final (phys_objects);\n"
+"goto describe_physical_objects;\n"
"}\n"
"\n"
-"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
+"for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)\n"
"{\n"
-"declare s, phys_s, maps any;\n"
+"declare obj, phys_obj, maps any;\n"
"declare maps_len integer;\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"
+"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"
"\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 (isiri_id (s))\n"
+"if (not isnumeric (obj))\n"
"{\n"
-"phys_s := s;\n"
-"vectorbld_acc (phys_subjects, phys_s);\n"
+"if (isiri_id (obj))\n"
+"{\n"
+"phys_obj := obj;\n"
+"vectorbld_acc (phys_objects, phys_obj);\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"
+"phys_obj := iri_to_id (obj, 0, 0);\n"
+"if (not isinteger (phys_obj))\n"
+"vectorbld_acc (phys_objects, phys_obj);\n"
+"}\n"
"}\n"
"maps := subseq (maps, 0, maps_len-1);\n"
"maps_len := maps_len - 1;\n"
"}\n"
"if (maps_len > 0)\n"
-"all_subjs [s_ctr] := vector (s, maps);\n"
+"all_objs [obj_ctr] := vector (obj, maps);\n"
"else\n"
-"all_subjs [s_ctr] := 0;\n"
+"all_objs [obj_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"
+"vectorbld_final (phys_objects);\n"
+"for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)\n"
"{\n"
-"declare s_desc, s, maps any;\n"
+"declare s_desc, obj, maps any;\n"
"declare map_ctr, maps_len integer;\n"
"declare fname varchar;\n"
-"s_desc := all_subjs [s_ctr];\n"
+"s_desc := all_objs [obj_ctr];\n"
"if (isinteger (s_desc))\n"
"goto end_of_s;\n"
-"s := s_desc[0];\n"
+"obj := 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_OBJCBD_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 subj any, in subj_dict any, in next_iter_subjs any, in res any\', ses);\n"
+"http (\'create procedure DB.DBA.\"\' || fname || \'\" (in obj any, in obj_dict any, in next_iter_objs 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 (\' declare obj_iri varchar;\\n\', ses);\n"
+"http (\' obj_iri := id_to_iri_nosignal (obj);\\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"
@@ -7598,26 +9163,26 @@ static const char *proc219 =
"}\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"
+"http (\'select ?g1 ?p1 ?s1 ?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] || \'> { ?:subj_iri ?p1 ?o1 } }\\n\', ses);\n"
+"http (\' { quad map <\' || maps[map_ctr][0] || \'> { ?s1 ?p1 ?:obj_iri } }\\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 (\' ?st2 a rdf:Statement ; rdf:object ?:obj_iri ; rdf:predicate ?p1 ; rdf:subject ?s1 } }\\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"
+"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"
"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 (\' 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"
"if (graphs_listed)\n"
"http (\' } }\\n\', ses);\n"
"http (\' } }\\n\', ses);\n"
@@ -7631,21 +9196,21 @@ static const char *proc219 =
"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)(obj, obj_dict, next_iter_objs, 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)(obj, obj_dict, next_iter_objs, 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"
+"describe_physical_objects:\n"
+"gvector_sort (phys_objects, 1, 0, 0);\n"
+"phys_obj_count := length (phys_objects);\n"
"\n"
-"if (0 = phys_s_count)\n"
+"if (0 = phys_obj_count)\n"
"return res;\n"
"\n"
"if (graphs_listed)\n"
@@ -7656,23 +9221,23 @@ static const char *proc219 =
"{\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"
+"for (obj_ctr := phys_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_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"
+"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"
"{\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"
+"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"
"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"
+"?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) 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"
+"if (position (\"g2\", sorted_good_graphs) and dict_get (obj_dict, \"st2\") is null)\n"
+"dict_put (next_iter_objs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
@@ -7680,52 +9245,52 @@ static const char *proc219 =
"}\n"
"else\n"
"{\n"
-"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
+"for (obj_ctr := phys_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_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"
+"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"
"0 = position (G, sorted_bad_graphs) and\n"
-"S = subj and\n"
+"O = obj 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"
-"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"
+"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"
"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"
+"?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do\n"
"{\n"
"if (0 = position (\"g2\", sorted_bad_graphs) and\n"
-"dict_get (subj_dict, \"st2\") is null and\n"
+"dict_get (obj_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"
+"dict_put (next_iter_objs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
"}\n"
"ret_or_next_iter:\n"
-"if (0 = dict_size (next_iter_subjs))\n"
+"if (0 = dict_size (next_iter_objs))\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"
+"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"
"goto next_iteration;\n"
"}\n"
-"--src sparql.sql:7245\n";
+"--src sparql.sql:8747\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"
+static const char *proc260 =
+"#line 9017 \"[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"
"{\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_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 gs_app_callback, gs_app_uid varchar;\n"
"declare rdf_type_iid IRI_ID;\n"
"uid := get_keyword (\'uid\', options, http_nobody_uid());\n"
@@ -7738,18 +9303,18 @@ static const char *proc220 =
"return res;\n"
"foreach (any c in consts) do\n"
"{\n"
-"if (isiri_id (c))\n"
-"dict_put (subj_dict, c, 0);\n"
+"if (not isnumeric (c))\n"
+"dict_put (obj_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"
+"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"
"return res;\n"
"\n"
"next_iteration:\n"
-"all_s_count := length (all_subjs);\n"
-"gvector_sort (all_subjs, 1, 0, 0);\n"
+"all_obj_count := length (all_objs);\n"
+"gvector_sort (all_objs, 1, 0, 0);\n"
"\n"
"if (__tag of integer = __tag (good_graphs))\n"
"graphs_listed := 0;\n"
@@ -7758,7 +9323,7 @@ static const char *proc220 =
"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"
+"if (is_named_iri_id (g) 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"
@@ -7772,13 +9337,13 @@ static const char *proc220 =
"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"
+"if (isnamed_iri_id (g))\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_s_count)\n"
+"if (0 = all_obj_count)\n"
"return res;\n"
"\n"
"if (graphs_listed)\n"
@@ -7789,23 +9354,23 @@ static const char *proc220 =
"{\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 (obj_ctr := all_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_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 G = graph and S = subj) do\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"
"{\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"
+"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"
"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"
+"?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) 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"
+"if (position (\"g2\", sorted_good_graphs) and dict_get (obj_dict, \"st2\") is null)\n"
+"dict_put (next_iter_objs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
@@ -7813,64 +9378,103 @@ static const char *proc220 =
"}\n"
"else\n"
"{\n"
-"for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
+"for (obj_ctr := all_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_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 obj any;\n"
+"obj := all_objs [obj_ctr];\n"
+"for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where\n"
"0 = position (G, sorted_bad_graphs) and\n"
-"S = subj and\n"
+"O = obj 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"
-"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"
+"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"
"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"
+"?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do\n"
"{\n"
"if (0 = position (\"g2\", sorted_bad_graphs) and\n"
-"dict_get (subj_dict, \"st2\") is null and\n"
+"dict_get (obj_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"
+"dict_put (next_iter_objs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
"}\n"
"\n"
"ret_or_next_iter:\n"
-"if (0 = dict_size (next_iter_subjs))\n"
+"if (0 = dict_size (next_iter_objs))\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"
+"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"
"goto next_iteration;\n"
"}\n"
-"--src sparql.sql:7507\n";
+"--src sparql.sql:9015\n";
-static const char *proc221 =
-"#line 7642 \"[executable]/sparql.sql\"\n"
+static const char *proc261 =
+"#line 9149 \"[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:9147\n";
+
+static const char *proc262 =
+"#line 9163 \"[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:9161\n";
+
+static const char *proc263 =
+"#line 9178 \"[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"
-"declare O any;\n"
+"declare triples, O any;\n"
"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"
-"result_names (S, P, O\n"
-");\n"
-"len := length (dict);\n"
+"triples := dict_list_keys (dict, destructive);\n"
+"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\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"
+"len := length (triples);\n"
"for (ctr := 0; ctr < len; ctr := ctr+1)\n"
"{\n"
-"S := id_to_iri (dict[ctr][0]);\n"
-"P := id_to_iri (dict[ctr][1]);\n"
-"O := dict[ctr][2];\n"
+"if (isiri_id (triples[ctr][0]))\n"
+"S := id_to_iri (triples[ctr][0]);\n"
+"else\n"
+"S := triples[ctr][0];\n"
+"\n"
+"if (isiri_id (triples[ctr][1]))\n"
+"P := id_to_iri (triples[ctr][1]);\n"
+"else\n"
+"P := triples[ctr][1];\n"
+"O := triples[ctr][2];\n"
"if (isiri_id (O))\n"
"{\n"
"result (S, P, id_to_iri (O)\n"
@@ -7886,15 +9490,59 @@ static const char *proc221 =
"\n"
"\n"
"\n"
-"else\n"
+"else if (S is not null and P is not null and O is not null)\n"
"result (S, P, O\n"
");\n"
"}\n"
"}\n"
-"--src sparql.sql:7640\n";
+"--src sparql.sql:9176\n";
-static const char *proc222 =
-"#line 7683 \"[executable]/sparql.sql\"\n"
+static const char *proc264 =
+"#line 9223 \"[executable]/sparql.sql\"\n"
+" create procedure DB.DBA.RDF_DICT_OF_TRIPLES_TO_FOUR_COLS (in dict any, in destructive integer := 0)\n"
+"{\n"
+"declare ctr, len integer;\n"
+"declare triples, O any;\n"
+"declare S, P, O_DT, O_LANG varchar;\n"
+"declare O_IS_IRI, dt_twobyte, lang_twobyte integer;\n"
+"triples := dict_list_keys (dict, destructive);\n"
+"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\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\', 182, 0, 2147483647, 1, 0, 0, 0, 0, 0, 0, 0), vector (\'O_TYPE\', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0)));\n"
+"len := length (triples);\n"
+"for (ctr := 0; ctr < len; ctr := ctr+1)\n"
+"{\n"
+"if (isiri_id (triples[ctr][0]))\n"
+"S := id_to_iri (triples[ctr][0]);\n"
+"else\n"
+"S := triples[ctr][0];\n"
+"\n"
+"if (isiri_id (triples[ctr][1]))\n"
+"P := id_to_iri (triples[ctr][1]);\n"
+"else\n"
+"P := triples[ctr][1];\n"
+"O := triples[ctr][2];\n"
+"if (isiri_id (O))\n"
+"{\n"
+"result (S, P, id_to_iri (O), NULL);\n"
+"}\n"
+"else if (is_rdf_box (O))\n"
+"{\n"
+"dt_twobyte := rdf_box_type (O);\n"
+"O_DT := case (dt_twobyte) when 257 then NULL else coalesce (\n"
+"(select id_to_iri (RDT_IID) from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = dt_twobyte) ) end;\n"
+"lang_twobyte := rdf_box_lang (O);\n"
+"\n"
+"\n"
+"result (S, P, O, coalesce (O_DT, \'\'));\n"
+"}\n"
+"else if (S is not null and P is not null and O is not null)\n"
+"result (S, P, O, coalesce (__xsd_type (O, NULL), \'\'));\n"
+"}\n"
+"}\n"
+"--src sparql.sql:9221\n";
+
+static const char *proc265 =
+"#line 9269 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_TYPEMIN_OF_OBJ (in obj any) returns any\n"
"{\n"
"declare tag integer;\n"
@@ -7911,10 +9559,10 @@ static const char *proc222 =
"return \'\';\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:7681\n";
+"--src sparql.sql:9267\n";
-static const char *proc223 =
-"#line 7701 \"[executable]/sparql.sql\"\n"
+static const char *proc266 =
+"#line 9287 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_TYPEMAX_OF_OBJ (in obj any) returns any\n"
"{\n"
"declare tag integer;\n"
@@ -7931,18 +9579,18 @@ static const char *proc223 =
"return \'\\377\\377\\377\\377\\377\\377\';\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:7699\n";
+"--src sparql.sql:9285\n";
-static const char *proc224 =
-"#line 7719 \"[executable]/sparql.sql\"\n"
+static const char *proc267 =
+"#line 9305 \"[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:7717\n";
+"--src sparql.sql:9303\n";
-static const char *proc225 =
-"#line 7725 \"[executable]/sparql.sql\"\n"
+static const char *proc268 =
+"#line 9311 \"[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"
@@ -8016,10 +9664,10 @@ static const char *proc225 =
"}\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:7723\n";
+"--src sparql.sql:9309\n";
-static const char *proc226 =
-"#line 7800 \"[executable]/sparql.sql\"\n"
+static const char *proc269 =
+"#line 9386 \"[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"
@@ -8063,10 +9711,10 @@ static const char *proc226 =
"}\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:7798\n";
+"--src sparql.sql:9384\n";
-static const char *proc227 =
-"#line 7847 \"[executable]/sparql.sql\"\n"
+static const char *proc270 =
+"#line 9433 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_DIST_SER_LONG (in val any) returns any\n"
"{\n"
"if (not (isstring (val)))\n"
@@ -8085,10 +9733,10 @@ static const char *proc227 =
"return val;\n"
"return serialize (val);\n"
"}\n"
-"--src sparql.sql:7845\n";
+"--src sparql.sql:9431\n";
-static const char *proc228 =
-"#line 7868 \"[executable]/sparql.sql\"\n"
+static const char *proc271 =
+"#line 9454 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_DIST_DESER_LONG (in strg any) returns any\n"
"{\n"
"if (not (isstring (strg)))\n"
@@ -8103,328 +9751,10 @@ static const char *proc228 =
"return res;\n"
"return rdf_box (res[0], res[1], res[2], 0, res[3]);\n"
"}\n"
-"--src sparql.sql:7866\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";
+"--src sparql.sql:9452\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"
+static const char *proc272 =
+"#line 9473 \"[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"
@@ -8434,18 +9764,23 @@ static const char *proc236 =
"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_%\') )\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"
"for update) do\n"
"{\n"
"exec (\'drop procedure DB.DBA.\"\' || subseq (P_NAME, 7) || \'\"\');\n"
"}\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:8191\n";
+"--src sparql.sql:9471\n";
-static const char *proc237 =
-"#line 8212 \"[executable]/sparql.sql\"\n"
+static const char *proc273 =
+"#line 9497 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.JSO_DUMP_IRI (in v varchar, inout ses any)\n"
"{\n"
"\n"
@@ -8476,10 +9811,10 @@ static const char *proc237 =
"http_escape (v, 12, ses, 1, 1);\n"
"http (\'>\', ses);\n"
"}\n"
-"--src sparql.sql:8210\n";
+"--src sparql.sql:9495\n";
-static const char *proc238 =
-"#line 8244 \"[executable]/sparql.sql\"\n"
+static const char *proc274 =
+"#line 9529 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.JSO_DUMP_FLD (in v any, inout ses any)\n"
"{\n"
"declare v_tag integer;\n"
@@ -8509,10 +9844,10 @@ static const char *proc238 =
"http (\'>\', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:8242\n";
+"--src sparql.sql:9527\n";
-static const char *proc239 =
-"#line 8275 \"[executable]/sparql.sql\"\n"
+static const char *proc275 =
+"#line 9560 \"[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"
@@ -8529,7 +9864,7 @@ static const char *proc239 =
"p := proplist[ctr][1];\n"
"o := proplist[ctr][2];\n"
"if (obj = prev_obj)\n"
-"http (\';\\n \', ses);\n"
+"http (\' ;\\n \', ses);\n"
"else\n"
"{\n"
"if (prev_obj is null)\n"
@@ -8542,7 +9877,7 @@ static const char *proc239 =
"@prefix rdfdf: <http://www.openlinksw.com/virtrdf-data-formats#> .\n"
"\', ses );\n"
"else\n"
-"http (\'.\\n\', ses);\n"
+"http (\' .\\n\', ses);\n"
"prev_obj := obj;\n"
"DB.DBA.JSO_DUMP_FLD (obj, ses);\n"
"http (\'\\n \', ses);\n"
@@ -8552,13 +9887,13 @@ static const char *proc239 =
"DB.DBA.JSO_DUMP_FLD (o, ses);\n"
"}\n"
"if (prev_obj is not null)\n"
-"http (\'.\\n\', ses);\n"
+"http (\' .\\n\', ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:8273\n";
+"--src sparql.sql:9558\n";
-static const char *proc240 =
-"#line 8319 \"[executable]/sparql.sql\"\n"
+static const char *proc276 =
+"#line 9604 \"[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"
@@ -8635,20 +9970,20 @@ static const char *proc240 =
"vectorbld_final (res);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:8317\n";
+"--src sparql.sql:9602\n";
-static const char *proc241 =
-"#line 8397 \"[executable]/sparql.sql\"\n"
+static const char *proc277 =
+"#line 9682 \"[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:8395\n";
+"--src sparql.sql:9680\n";
-static const char *proc242 =
-"#line 8408 \"[executable]/sparql.sql\"\n"
+static const char *proc278 =
+"#line 9693 \"[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"
@@ -8681,10 +10016,10 @@ static const char *proc242 =
"}\n"
"return backup_name;\n"
"}\n"
-"--src sparql.sql:8406\n";
+"--src sparql.sql:9691\n";
-static const char *proc243 =
-"#line 8442 \"[executable]/sparql.sql\"\n"
+static const char *proc279 =
+"#line 9727 \"[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"
@@ -8725,10 +10060,10 @@ static const char *proc243 =
"commit work;\n"
"return backup_name;\n"
"}\n"
-"--src sparql.sql:8440\n";
+"--src sparql.sql:9725\n";
-static const char *proc244 =
-"#line 8484 \"[executable]/sparql.sql\"\n"
+static const char *proc280 =
+"#line 9769 \"[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"
@@ -8963,10 +10298,10 @@ static const char *proc244 =
"result (\'42000\', \'The previous error can not be fixed automatically. Sorry.\');\n"
"return;\n"
"}\n"
-"--src sparql.sql:8482\n";
+"--src sparql.sql:9767\n";
-static const char *proc245 =
-"#line 8723 \"[executable]/sparql.sql\"\n"
+static const char *proc281 =
+"#line 10008 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_CHANGE (in warninglist any)\n"
"{\n"
"declare STATE, MESSAGE varchar;\n"
@@ -8978,10 +10313,10 @@ static const char *proc245 =
"}\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:8721\n";
+"--src sparql.sql:10006\n";
-static const char *proc246 =
-"#line 8736 \"[executable]/sparql.sql\"\n"
+static const char *proc282 =
+"#line 10021 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_CHANGE_OPT (in cmdlist any)\n"
"{\n"
"declare cmdctr, cmdcount integer;\n"
@@ -9012,7 +10347,10 @@ static const char *proc246 =
"}\n"
"http (\')\', exectext);\n"
"STATE := \'00000\';\n"
-"warnings := exec (string_output_string (exectext), STATE, MESSAGE, arglist, md, rs);\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"
"\n"
"if (__tag of vector = __tag (warnings))\n"
"{\n"
@@ -9035,10 +10373,10 @@ static const char *proc246 =
"}\n"
"result (\'00000\', sprintf (\'%d RDF metadata manipulation operations done\', cmdcount));\n"
"}\n"
-"--src sparql.sql:8734\n";
+"--src sparql.sql:10019\n";
-static const char *proc247 =
-"#line 8791 \"[executable]/sparql.sql\"\n"
+static const char *proc283 =
+"#line 10079 \"[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"
@@ -9046,16 +10384,22 @@ static const char *proc247 =
"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:8789\n";
+"--src sparql.sql:10077\n";
-static const char *proc248 =
-"#line 8806 \"[executable]/sparql.sql\"\n"
+static const char *proc284 =
+"#line 10100 \"[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"
@@ -9092,10 +10436,10 @@ static const char *proc248 =
"}\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:8804\n";
+"--src sparql.sql:10098\n";
-static const char *proc249 =
-"#line 8844 \"[executable]/sparql.sql\"\n"
+static const char *proc285 =
+"#line 10138 \"[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"
@@ -9116,10 +10460,10 @@ static const char *proc249 =
"return;\n"
"signal (\'22023\', \'The quad storage \"\' || storage || \'\" is not flagged as being edited, cannot change it\' );\n"
"}\n"
-"--src sparql.sql:8842\n";
+"--src sparql.sql:10136\n";
-static const char *proc250 =
-"#line 8866 \"[executable]/sparql.sql\"\n"
+static const char *proc286 =
+"#line 10160 \"[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"
@@ -9141,19 +10485,10 @@ static const char *proc250 =
"return;\n"
"signal (\'22023\', \'The quad storage \"\' || storage || \'\" does not contains quad map \' || qmid );\n"
"}\n"
-"--src sparql.sql:8864\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";
+"--src sparql.sql:10158\n";
-static const char *proc252 =
-"#line 8896 \"[executable]/sparql.sql\"\n"
+static const char *proc287 =
+"#line 10183 \"[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"
@@ -9299,10 +10634,10 @@ static const char *proc252 =
"\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:8894\n";
+"--src sparql.sql:10181\n";
-static const char *proc253 =
-"#line 9043 \"[executable]/sparql.sql\"\n"
+static const char *proc288 =
+"#line 10330 \"[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"
@@ -9322,10 +10657,10 @@ static const char *proc253 =
"}\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:9041\n";
+"--src sparql.sql:10328\n";
-static const char *proc254 =
-"#line 9064 \"[executable]/sparql.sql\"\n"
+static const char *proc289 =
+"#line 10351 \"[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"
@@ -9360,6 +10695,8 @@ static const char *proc254 =
"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"
@@ -9370,23 +10707,50 @@ static const char *proc254 =
"{ ?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 (\"st\", NULL, qmid);\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"
"}\n"
"DB.DBA.RDF_QM_GC_MAPPING_SUBTREE (qmid, 0);\n"
-"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> is deleted\'));\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"
"}\n"
"else\n"
"{\n"
+"if (not exists (sparql\n"
+"define input:storage \"\"\n"
+"select ?st where {\n"
+"graph <http://www.openlinksw.com/schemas/virtrdf#> {\n"
+"{ ?st virtrdf:qsUserMaps ?subm .\n"
+"?subm ?p `iri(?:qmid)` }\n"
+"union\n"
+"{ ?st virtrdf:qsDefaultMap `iri(?:qmid)` }\n"
+"filter (?st = iri(?:storage))\n"
+"} } ) )\n"
+"{\n"
+"if (silent)\n"
+"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> is not used in storage <\' || storage || \'>, the DROP statement is ignored due to SILENT option\'));\n"
+"signal (\'22023\', \'Quad map <\' || qmid || \'> is not used in storage <\' || storage || \'>\');\n"
+"}\n"
"DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (storage, NULL, qmid);\n"
"DB.DBA.RDF_QM_GC_MAPPING_SUBTREE (qmid, 1);\n"
"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> is no longer used in storage <\' || storage || \'>\'));\n"
"}\n"
"}\n"
-"--src sparql.sql:9062\n";
+"--src sparql.sql:10349\n";
-static const char *proc255 =
-"#line 9123 \"[executable]/sparql.sql\"\n"
+static const char *proc290 =
+"#line 10439 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_MACROEXPAND_TEMPLATE (in iritmpl varchar) returns varchar\n"
"{\n"
"declare pos integer;\n"
@@ -9425,10 +10789,10 @@ static const char *proc255 =
"}\n"
"return iritmpl;\n"
"}\n"
-"--src sparql.sql:9121\n";
+"--src sparql.sql:10437\n";
-static const char *proc256 =
-"#line 9163 \"[executable]/sparql.sql\"\n"
+static const char *proc291 =
+"#line 10479 \"[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"
@@ -9456,10 +10820,10 @@ static const char *proc256 =
"rowvector_digit_sort (descr, 1, 1);\n"
"return descr;\n"
"}\n"
-"--src sparql.sql:9161\n";
+"--src sparql.sql:10477\n";
-static const char *proc257 =
-"#line 9192 \"[executable]/sparql.sql\"\n"
+static const char *proc292 =
+"#line 10508 \"[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"
@@ -9664,10 +11028,10 @@ static const char *proc257 =
"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:9190\n";
+"--src sparql.sql:10506\n";
-static const char *proc258 =
-"#line 9398 \"[executable]/sparql.sql\"\n"
+static const char *proc293 =
+"#line 10714 \"[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"
@@ -9831,10 +11195,10 @@ static const char *proc258 =
"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:9396\n";
+"--src sparql.sql:10712\n";
-static const char *proc259 =
-"#line 9563 \"[executable]/sparql.sql\"\n"
+static const char *proc294 =
+"#line 10879 \"[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"
@@ -10039,10 +11403,10 @@ static const char *proc259 =
"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:9561\n";
+"--src sparql.sql:10877\n";
-static const char *proc260 =
-"#line 9769 \"[executable]/sparql.sql\"\n"
+static const char *proc295 =
+"#line 11085 \"[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"
@@ -10160,18 +11524,18 @@ static const char *proc260 =
"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:9767\n";
+"--src sparql.sql:11083\n";
-static const char *proc261 =
-"#line 9889 \"[executable]/sparql.sql\"\n"
+static const char *proc296 =
+"#line 11205 \"[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:9887\n";
+"--src sparql.sql:11203\n";
-static const char *proc262 =
-"#line 9896 \"[executable]/sparql.sql\"\n"
+static const char *proc297 =
+"#line 11212 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.SQLNAME_NOTATION_TO_NAME (in str varchar) returns varchar\n"
"{\n"
"if (\'\' = str)\n"
@@ -10180,10 +11544,10 @@ static const char *proc262 =
"return subseq (str, 1, length (str) - 1);\n"
"return fix_identifier_case (str);\n"
"}\n"
-"--src sparql.sql:9894\n";
+"--src sparql.sql:11210\n";
-static const char *proc263 =
-"#line 9907 \"[executable]/sparql.sql\"\n"
+static const char *proc298 =
+"#line 11223 \"[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"
@@ -10219,10 +11583,10 @@ static const char *proc263 =
"return NULL;\n"
"return res || name;\n"
"}\n"
-"--src sparql.sql:9905\n";
+"--src sparql.sql:11221\n";
-static const char *proc264 =
-"#line 9944 \"[executable]/sparql.sql\"\n"
+static const char *proc299 =
+"#line 11260 \"[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"
@@ -10307,10 +11671,10 @@ static const char *proc264 =
"signal (\'22023\', invdesc || \' function \' || uriparse[0] || \' should have nullable argument\');\n"
"}\n"
"}\n"
-"--src sparql.sql:9942\n";
+"--src sparql.sql:11258\n";
-static const char *proc265 =
-"#line 10030 \"[executable]/sparql.sql\"\n"
+static const char *proc300 =
+"#line 11346 \"[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"
@@ -10322,10 +11686,10 @@ static const char *proc265 =
"commit work;\n"
"return vector (vector (\'00000\', \'IRI class <\' || subclassiri || \'> is now known as a subclass of <\' || superclassiri || \'>\'));\n"
"}\n"
-"--src sparql.sql:10028\n";
+"--src sparql.sql:11344\n";
-static const char *proc266 =
-"#line 10043 \"[executable]/sparql.sql\"\n"
+static const char *proc301 =
+"#line 11359 \"[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"
@@ -10346,10 +11710,10 @@ static const char *proc266 =
"commit work;\n"
"return vector (vector (\'00000\', \'Previous definition of class <\' || classiri || \'> has been dropped\'));\n"
"}\n"
-"--src sparql.sql:10041\n";
+"--src sparql.sql:11357\n";
-static const char *proc267 =
-"#line 10065 \"[executable]/sparql.sql\"\n"
+static const char *proc302 =
+"#line 11381 \"[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"
@@ -10371,10 +11735,10 @@ static const char *proc267 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad storage <\' || storage || \'> is removed from the quad mapping schema\'));\n"
"}\n"
-"--src sparql.sql:10063\n";
+"--src sparql.sql:11379\n";
-static const char *proc268 =
-"#line 10088 \"[executable]/sparql.sql\"\n"
+static const char *proc303 =
+"#line 11404 \"[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"
@@ -10402,10 +11766,10 @@ static const char *proc268 =
"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:10086\n";
+"--src sparql.sql:11402\n";
-static const char *proc269 =
-"#line 10117 \"[executable]/sparql.sql\"\n"
+static const char *proc304 =
+"#line 11433 \"[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"
@@ -10418,10 +11782,10 @@ static const char *proc269 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad storage <\' || storage || \'> is flagged as being edited\'));\n"
"}\n"
-"--src sparql.sql:10115\n";
+"--src sparql.sql:11431\n";
-static const char *proc270 =
-"#line 10131 \"[executable]/sparql.sql\"\n"
+static const char *proc305 =
+"#line 11447 \"[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"
@@ -10436,10 +11800,10 @@ static const char *proc270 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad storage <\' || storage || \'> is unflagged and can be edited by other transactions\'));\n"
"}\n"
-"--src sparql.sql:10129\n";
+"--src sparql.sql:11445\n";
-static const char *proc271 =
-"#line 10147 \"[executable]/sparql.sql\"\n"
+static const char *proc306 =
+"#line 11463 \"[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"
@@ -10451,6 +11815,12 @@ static const char *proc271 =
"pair := atables [atablectr];\n"
"alias := pair[0];\n"
"qtable := pair[1];\n"
+"if (starts_with (qtable, \'/*[sqlquery[*/\'))\n"
+"{\n"
+"qtable := \'(\' || qtable || \')\';\n"
+"inner_id := qmvid || \'-atable-\' || alias || \'-sql-query\';\n"
+"}\n"
+"else\n"
"inner_id := qmvid || \'-atable-\' || alias || \'-\' || qtable;\n"
"sparql define input:storage \"\"\n"
"prefix rdfdf: <http://www.openlinksw.com/virtrdf-data-formats#>\n"
@@ -10468,10 +11838,10 @@ static const char *proc271 =
"virtrdf:qmvaTableName ?:qtable };\n"
"}\n"
"}\n"
-"--src sparql.sql:10145\n";
+"--src sparql.sql:11461\n";
-static const char *proc272 =
-"#line 10177 \"[executable]/sparql.sql\"\n"
+static const char *proc307 =
+"#line 11499 \"[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"
@@ -10535,10 +11905,10 @@ static const char *proc272 =
"}\n"
"return ftid;\n"
"}\n"
-"--src sparql.sql:10175\n";
+"--src sparql.sql:11497\n";
-static const char *proc273 =
-"#line 10242 \"[executable]/sparql.sql\"\n"
+static const char *proc308 =
+"#line 11564 \"[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"
@@ -10576,10 +11946,10 @@ static const char *proc273 =
"}\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:10240\n";
+"--src sparql.sql:11562\n";
-static const char *proc274 =
-"#line 10281 \"[executable]/sparql.sql\"\n"
+static const char *proc309 =
+"#line 11603 \"[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"
@@ -10590,6 +11960,7 @@ static const char *proc274 =
") */\n"
"declare atables, sqlcols, conds any;\n"
"declare ftextid varchar;\n"
+"declare qry_metas any;\n"
"declare atablectr, atablecount integer;\n"
"declare colctr, colcount, fmtcolcount integer;\n"
"declare condctr, condcount integer;\n"
@@ -10601,6 +11972,7 @@ static const char *proc274 =
"sqlcols := qmv[2];\n"
"conds := qmv[3];\n"
"ftextid := qmv[4];\n"
+"qry_metas := null;\n"
"atablecount := length (atables);\n"
"colcount := length (sqlcols);\n"
"condcount := length (conds);\n"
@@ -10620,23 +11992,54 @@ static const char *proc274 =
"for (colctr := 0; colctr < colcount; colctr := colctr + 1)\n"
"{\n"
"declare sqlcol any;\n"
-"declare final_tblname, final_colname varchar;\n"
+"declare alias_msg_txt, final_tblname, final_colname varchar;\n"
"sqlcol := sqlcols [colctr];\n"
-"final_tblname := DB.DBA.SQLQNAME_NOTATION_TO_QNAME (sqlcol[0], 3);\n"
"final_colname := DB.DBA.SQLNAME_NOTATION_TO_NAME (sqlcol[2]);\n"
-"if (not exists (select top 1 1 from DB.DBA.TABLE_COLS where \"TABLE\" = final_tblname))\n"
-"{\n"
"if (sqlcol[1] is not null)\n"
-"signal (\'22023\', \'No table \' || sqlcol[0] || \' (alias \' || sqlcol[1] || \') in database, please check spelling and character case\');\n"
+"alias_msg_txt := \' (alias \' || sqlcol[1] || \')\';\n"
"else\n"
-"signal (\'22023\', \'No table \' || sqlcol[0] || \' in database, please check spelling and character case\');\n"
-"}\n"
-"if (not exists (select top 1 1 from DB.DBA.TABLE_COLS where \"TABLE\" = final_tblname and \"COLUMN\" = final_colname))\n"
+"alias_msg_txt := \' (without alias)\';\n"
+"if (starts_with (sqlcol[0], \'/*[sqlquery[*/\'))\n"
"{\n"
-"if (sqlcol[1] is not null)\n"
-"signal (\'22023\', \'No column \' || sqlcol[2] || \' in table \' || sqlcol[0] || \' (alias \' || sqlcol[1] || \') in database, please check spelling and character case\');\n"
+"declare qry varchar;\n"
+"declare qry_colcount, qry_colctr integer;\n"
+"declare qry_mdata any;\n"
+"qry := sqlcol[0];\n"
+"if (qry_metas is null)\n"
+"qry_metas := dict_new (5);\n"
+"qry_mdata := dict_get (qry_metas, qry, null);\n"
+"if (qry_mdata is null)\n"
+"{\n"
+"declare stat, msg varchar;\n"
+"declare exec_metas any;\n"
+"stat := \'00000\';\n"
+"exec_metadata (sqlcol[0], stat, msg, exec_metas);\n"
+"if (stat <> \'00000\')\n"
+"signal (\'22023\', \'The compilation of SQLQUERY\' || alias_msg_txt || \' results in Error \' || stat || \': \' || msg);\n"
+"if (exec_metas[1] <> 1)\n"
+"signal (\'R2RML\', \'Dangerous DML in SQLQUERY\' || alias_msg_txt);\n"
+"exec_metas := exec_metas[0];\n"
+"qry_colcount := length (exec_metas);\n"
+"qry_mdata := make_array (qry_colcount*2, \'any\');\n"
+"for (qry_colctr := 0; qry_colctr < qry_colcount; qry_colctr := qry_colctr + 1)\n"
+"{\n"
+"qry_mdata[qry_colctr*2] := exec_metas[qry_colctr][0];\n"
+"qry_mdata[qry_colctr*2+1] := exec_metas[qry_colctr];\n"
+"}\n"
+"dict_put (qry_metas, qry, qry_mdata);\n"
+"\n"
+"}\n"
+"\n"
+"if (get_keyword (final_colname, qry_mdata) is null)\n"
+"signal (\'22023\', \'The result of SQLQUERY\' || alias_msg_txt || \' does not contain column \' || sqlcol[2] || \', please check spelling and character case\');\n"
+"}\n"
"else\n"
-"signal (\'22023\', \'No column \' || sqlcol[2] || \' in table \' || sqlcol[0] || \' in database, please check spelling and character case\');\n"
+"{\n"
+"final_tblname := DB.DBA.SQLQNAME_NOTATION_TO_QNAME (sqlcol[0], 3);\n"
+"if (not exists (select top 1 1 from DB.DBA.TABLE_COLS where \"TABLE\" = final_tblname))\n"
+"signal (\'22023\', \'No table \' || sqlcol[0] || alias_msg_txt || \' in database, please check spelling and character case\');\n"
+"if (not exists (select top 1 1 from DB.DBA.TABLE_COLS where \"TABLE\" = final_tblname and \"COLUMN\" = final_colname))\n"
+"signal (\'22023\', \'No column \' || sqlcol[2] || \' in table \' || sqlcol[0] || alias_msg_txt || \' in database, please check spelling and character case\');\n"
"}\n"
"if (tablename is null)\n"
"tablename := sqlcol[0];\n"
@@ -10652,10 +12055,20 @@ static const char *proc274 =
"declare coldtp, colnullable integer;\n"
"declare coltype varchar;\n"
"sqlcol := sqlcols [0];\n"
-"final_tblname := DB.DBA.SQLQNAME_NOTATION_TO_QNAME (sqlcol[0], 3);\n"
"final_colname := DB.DBA.SQLNAME_NOTATION_TO_NAME (sqlcol[2]);\n"
+"if (starts_with (sqlcol[0], \'/*[sqlquery[*/\'))\n"
+"{\n"
+"declare col_mdata any;\n"
+"col_mdata := get_keyword (final_colname, dict_get (qry_metas, sqlcol[0], null));\n"
+"coldtp := col_mdata[1];\n"
+"colnullable := col_mdata[4];\n"
+"}\n"
+"else\n"
+"{\n"
+"final_tblname := DB.DBA.SQLQNAME_NOTATION_TO_QNAME (sqlcol[0], 3);\n"
"select COL_DTP, coalesce (COL_NULLABLE, 1) into coldtp, colnullable\n"
"from DB.DBA.TABLE_COLS where \"TABLE\" = final_tblname and \"COLUMN\" = final_colname;\n"
+"}\n"
"coltype := case (coldtp)\n"
"when __tag of long varchar then \'longvarchar\'\n"
"when __tag of timestamp then \'datetime\'\n"
@@ -10855,10 +12268,10 @@ static const char *proc274 =
"}\n"
"return qmvid;\n"
"}\n"
-"--src sparql.sql:10279\n";
+"--src sparql.sql:11601\n";
-static const char *proc275 =
-"#line 10558 \"[executable]/sparql.sql\"\n"
+static const char *proc310 =
+"#line 11923 \"[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"
@@ -10879,10 +12292,10 @@ static const char *proc275 =
"qmvfix := qmv;\n"
"\n"
"}\n"
-"--src sparql.sql:10556\n";
+"--src sparql.sql:11921\n";
-static const char *proc276 =
-"#line 10580 \"[executable]/sparql.sql\"\n"
+static const char *proc311 =
+"#line 11945 \"[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"
@@ -10947,7 +12360,7 @@ static const char *proc276 =
"qm_empty := NULL;\n"
"if (tablename is null)\n"
"{\n"
-"tablename := \'DB.DBA.SYS_FAKE_1\';\n"
+"tablename := \'DB.DBA.SYS_IDONLY_ONE\';\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"
@@ -11062,10 +12475,10 @@ static const char *proc276 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> has been created and added to the <\' || storage || \'>\'));\n"
"}\n"
-"--src sparql.sql:10578\n";
+"--src sparql.sql:11943\n";
-static const char *proc277 =
-"#line 10761 \"[executable]/sparql.sql\"\n"
+static const char *proc312 =
+"#line 12126 \"[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"
@@ -11108,10 +12521,10 @@ static const char *proc277 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> is added to the storage <\' || storage || \'>\'));\n"
"}\n"
-"--src sparql.sql:10759\n";
+"--src sparql.sql:12124\n";
-static const char *proc278 =
-"#line 10805 \"[executable]/sparql.sql\"\n"
+static const char *proc313 =
+"#line 12170 \"[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"
@@ -11201,10 +12614,10 @@ static const char *proc278 =
"ctr := ctr + 1;\n"
"}\n"
"}\n"
-"--src sparql.sql:10803\n";
+"--src sparql.sql:12168\n";
-static const char *proc279 =
-"#line 10896 \"[executable]/sparql.sql\"\n"
+static const char *proc314 =
+"#line 12261 \"[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"
@@ -11263,13 +12676,14 @@ static const char *proc279 =
"declare ord integer;\n"
"id := itm[0];\n"
"ord := itm[2];\n"
-"if (iri_to_id (id, 0, 0) <> qmid)\n"
+"if (iri_to_id (id) <> qmid)\n"
"{\n"
"sparql define input:storage \"\"\n"
"insert in graph <http://www.openlinksw.com/schemas/virtrdf#> {\n"
"`iri(?:lstiri)`\n"
"`iri(bif:sprintf(\"%s%d\", str(rdf:_), ?:ctr))`\n"
"`iri(?:id)` . };\n"
+"\n"
"ctr := ctr + 1;\n"
"}\n"
"else\n"
@@ -11279,10 +12693,10 @@ static const char *proc279 =
"}\n"
"}\n"
"}\n"
-"--src sparql.sql:10894\n";
+"--src sparql.sql:12259\n";
-static const char *proc280 =
-"#line 10972 \"[executable]/sparql.sql\"\n"
+static const char *proc315 =
+"#line 12338 \"[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"
@@ -11301,10 +12715,198 @@ static const char *proc280 =
"insert in graph <http://www.openlinksw.com/schemas/virtrdf#> { `iri(?:storage)` virtrdf:qsDefaultMap `iri(?:qmid)` . };\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:10970\n";
+"--src sparql.sql:12336\n";
-static const char *proc281 =
-"#line 10992 \"[executable]/sparql.sql\"\n"
+static const char *proc316 =
+"#line 12358 \"[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:12356\n";
+
+static const char *proc317 =
+"#line 12407 \"[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:12405\n";
+
+static const char *proc318 =
+"#line 12445 \"[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:12443\n";
+
+static const char *proc319 =
+"#line 12507 \"[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:12505\n";
+
+static const char *proc320 =
+"#line 12538 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_ADD_qmAliasesKeyrefdByQuad (in qm_iri varchar)\n"
"{\n"
"declare kr_iri varchar;\n"
@@ -11358,10 +12960,10 @@ static const char *proc281 =
"}\n"
"\n"
"}\n"
-"--src sparql.sql:10990\n";
+"--src sparql.sql:12536\n";
-static const char *proc282 =
-"#line 11047 \"[executable]/sparql.sql\"\n"
+static const char *proc321 =
+"#line 12593 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_UPGRADE_QUAD_MAP (in qm_iri varchar)\n"
"{\n"
"declare keyrefd any;\n"
@@ -11370,10 +12972,10 @@ static const char *proc282 =
"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:11045\n";
+"--src sparql.sql:12591\n";
-static const char *proc283 =
-"#line 11057 \"[executable]/sparql.sql\"\n"
+static const char *proc322 =
+"#line 12603 \"[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"
@@ -11382,10 +12984,10 @@ static const char *proc283 =
"}\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:11055\n";
+"--src sparql.sql:12601\n";
-static const char *proc284 =
-"#line 11071 \"[executable]/sparql.sql\"\n"
+static const char *proc323 =
+"#line 12617 \"[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"
@@ -11448,10 +13050,10 @@ static const char *proc284 =
"rollback work;\n"
"goto again_2;\n"
"}\n"
-"--src sparql.sql:11069\n";
+"--src sparql.sql:12615\n";
-static const char *proc285 =
-"#line 11136 \"[executable]/sparql.sql\"\n"
+static const char *proc324 =
+"#line 12682 \"[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"
@@ -11523,10 +13125,10 @@ static const char *proc285 =
"rollback work;\n"
"goto again;\n"
"}\n"
-"--src sparql.sql:11134\n";
+"--src sparql.sql:12680\n";
-static const char *proc286 =
-"#line 11209 \"[executable]/sparql.sql\"\n"
+static const char *proc325 =
+"#line 12755 \"[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"
@@ -11538,10 +13140,10 @@ static const char *proc286 =
"else\n"
"app_env[4] := null;\n"
"}\n"
-"--src sparql.sql:11207\n";
+"--src sparql.sql:12753\n";
-static const char *proc287 =
-"#line 11222 \"[executable]/sparql.sql\"\n"
+static const char *proc326 =
+"#line 12768 \"[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"
@@ -11563,10 +13165,10 @@ static const char *proc287 =
"aq_wait_all (app_env[0]);\n"
"}\n"
"}\n"
-"--src sparql.sql:11220\n";
+"--src sparql.sql:12766\n";
-static const char *proc288 =
-"#line 11245 \"[executable]/sparql.sql\"\n"
+static const char *proc327 =
+"#line 12791 \"[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"
@@ -11600,10 +13202,10 @@ static const char *proc288 =
"aq_wait_all (app_env[0]);\n"
"}\n"
"}\n"
-"--src sparql.sql:11243\n";
+"--src sparql.sql:12789\n";
-static const char *proc289 =
-"#line 11280 \"[executable]/sparql.sql\"\n"
+static const char *proc328 =
+"#line 12826 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_COMMIT_A (\n"
"inout graph_iri varchar, inout app_env any )\n"
"{\n"
@@ -11614,10 +13216,10 @@ static const char *proc289 =
"DB.DBA.TTLP_EV_COMMIT (graph_iri, app_env[2]);\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:11278\n";
+"--src sparql.sql:12824\n";
-static const char *proc290 =
-"#line 11293 \"[executable]/sparql.sql\"\n"
+static const char *proc329 =
+"#line 12839 \"[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"
@@ -11637,10 +13239,10 @@ static const char *proc290 =
"DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH (g_iid, ro_id_dict);\n"
"}\n"
"}\n"
-"--src sparql.sql:11291\n";
+"--src sparql.sql:12837\n";
-static const char *proc291 =
-"#line 11314 \"[executable]/sparql.sql\"\n"
+static const char *proc330 =
+"#line 12860 \"[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"
@@ -11672,20 +13274,20 @@ static const char *proc291 =
"DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH (g_iid, ro_id_dict);\n"
"}\n"
"}\n"
-"--src sparql.sql:11312\n";
+"--src sparql.sql:12858\n";
-static const char *proc292 =
-"#line 11347 \"[executable]/sparql.sql\"\n"
+static const char *proc331 =
+"#line 12893 \"[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:11345\n";
+"--src sparql.sql:12891\n";
-static const char *proc293 =
-"#line 11355 \"[executable]/sparql.sql\"\n"
+static const char *proc332 =
+"#line 12901 \"[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"
@@ -11729,10 +13331,10 @@ static const char *proc293 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:11353\n";
+"--src sparql.sql:12899\n";
-static const char *proc294 =
-"#line 11400 \"[executable]/sparql.sql\"\n"
+static const char *proc333 =
+"#line 12946 \"[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"
@@ -11775,10 +13377,10 @@ static const char *proc294 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:11398\n";
+"--src sparql.sql:12944\n";
-static const char *proc295 =
-"#line 11444 \"[executable]/sparql.sql\"\n"
+static const char *proc334 =
+"#line 12990 \"[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"
@@ -11797,7 +13399,7 @@ static const char *proc295 =
"log_mode := log_mode + 2;\n"
"}\n"
"if (1 <> sys_stat (\'cl_run_local_only\'))\n"
-"return rdf_load_rdfxml_cl (strg, base, graph);\n"
+"return DB.DBA.RDF_LOAD_RDFXML_CL (strg, base, graph, 0);\n"
"if (__rdf_obj_ft_rule_count_in_graph (iri_to_id (graph)))\n"
"ro_id_dict := dict_new ();\n"
"else\n"
@@ -11824,10 +13426,10 @@ static const char *proc295 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:11442\n";
+"--src sparql.sql:12988\n";
-static const char *proc296 =
-"#line 11495 \"[executable]/sparql.sql\"\n"
+static const char *proc335 =
+"#line 13041 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.VT_DECODE_KEYWORD_ITM (inout vtdata varchar, inout ofs integer)\n"
"{\n"
"declare res integer;\n"
@@ -11837,10 +13439,10 @@ static const char *proc296 =
"ofs := ofs + 6;\n"
"return res;\n"
"}\n"
-"--src sparql.sql:11493\n";
+"--src sparql.sql:13039\n";
-static const char *proc297 =
-"#line 11506 \"[executable]/sparql.sql\"\n"
+static const char *proc336 =
+"#line 13052 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.VT_ENCODE_KEYWORD_ITM (in id integer, inout ses any)\n"
"{\n"
"declare strg varchar;\n"
@@ -11853,10 +13455,10 @@ static const char *proc297 =
"strg[0] := 5;\n"
"http (strg, ses);\n"
"}\n"
-"--src sparql.sql:11504\n";
+"--src sparql.sql:13050\n";
-static const char *proc298 =
-"#line 11520 \"[executable]/sparql.sql\"\n"
+static const char *proc337 =
+"#line 13066 \"[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"
@@ -11961,10 +13563,10 @@ static const char *proc298 =
"\n"
"return res_acc;\n"
"}\n"
-"--src sparql.sql:11518\n";
+"--src sparql.sql:13064\n";
-static const char *proc299 =
-"#line 11627 \"[executable]/sparql.sql\"\n"
+static const char *proc338 =
+"#line 13173 \"[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"
@@ -11977,10 +13579,10 @@ static const char *proc299 =
"err:\n"
"return \'^\"#nosuch\"\';\n"
"}\n"
-"--src sparql.sql:11625\n";
+"--src sparql.sql:13171\n";
-static const char *proc300 =
-"#line 11642 \"[executable]/sparql.sql\"\n"
+static const char *proc339 =
+"#line 13188 \"[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"
@@ -12009,10 +13611,10 @@ static const char *proc300 =
"err:\n"
"return \'^\"#nosuch\"\';\n"
"}\n"
-"--src sparql.sql:11640\n";
+"--src sparql.sql:13186\n";
-static const char *proc301 =
-"#line 11672 \"[executable]/sparql.sql\"\n"
+static const char *proc340 =
+"#line 13218 \"[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"
@@ -12066,10 +13668,10 @@ static const char *proc301 =
"rollback work;\n"
"goto again;\n"
"}\n"
-"--src sparql.sql:11670\n";
+"--src sparql.sql:13216\n";
-static const char *proc302 =
-"#line 11727 \"[executable]/sparql.sql\"\n"
+static const char *proc341 =
+"#line 13273 \"[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"
@@ -12195,10 +13797,10 @@ static const char *proc302 =
"rollback work;\n"
"goto again;\n"
"}\n"
-"--src sparql.sql:11725\n";
+"--src sparql.sql:13271\n";
-static const char *proc303 =
-"#line 11854 \"[executable]/sparql.sql\"\n"
+static const char *proc342 =
+"#line 13400 \"[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"
@@ -12336,10 +13938,10 @@ static const char *proc303 =
"__rdf_obj_ft_rule_add (rule_g_iid, rule_p_iid, reason);\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:11852\n";
+"--src sparql.sql:13398\n";
-static const char *proc304 =
-"#line 11993 \"[executable]/sparql.sql\"\n"
+static const char *proc343 =
+"#line 13539 \"[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"
@@ -12360,10 +13962,10 @@ static const char *proc304 =
"__rdf_obj_ft_rule_del (rule_g_iid, rule_p_iid, reason);\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:11991\n";
+"--src sparql.sql:13537\n";
-static const char *proc305 =
-"#line 12015 \"[executable]/sparql.sql\"\n"
+static const char *proc344 =
+"#line 13561 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_OBJ_FT_RECOVER ()\n"
"{\n"
"declare stat, msg, STRG varchar;\n"
@@ -12394,7 +13996,7 @@ static const char *proc305 =
"VT_INC_INDEX_DB_DBA_RDF_OBJ();\n"
"result (\'... done\');\n"
"}\n"
-"--src sparql.sql:12013\n";
+"--src sparql.sql:13559\n";
static const char *tbl16 =
"create table DB.DBA.RDF_GRAPH_GROUP (\n"
@@ -12423,8 +14025,8 @@ static const char *tbl18 =
")\n"
"alter index RDF_GRAPH_USER on DB.DBA.RDF_GRAPH_USER partition cluster replicated\n";
-static const char *proc306 =
-"#line 12077 \"[executable]/sparql.sql\"\n"
+static const char *proc345 =
+"#line 13623 \"[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"
@@ -12432,12 +14034,13 @@ static const char *proc306 =
"dict_put (__rdf_graph_id2iri_dict(), group_iid, __uname(group_iri));\n"
"dict_put (__rdf_graph_group_dict(), group_iid, vector ());\n"
"jso_mark_affected (group_iri);\n"
+"log_text (\'jso_mark_affected (?)\', group_iri);\n"
"__rdf_cli_mark_qr_to_recompile ();\n"
"}\n"
-"--src sparql.sql:12075\n";
+"--src sparql.sql:13621\n";
-static const char *proc307 =
-"#line 12088 \"[executable]/sparql.sql\"\n"
+static const char *proc346 =
+"#line 13635 \"[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"
@@ -12458,10 +14061,10 @@ static const char *proc307 =
"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:12086\n";
+"--src sparql.sql:13633\n";
-static const char *proc308 =
-"#line 12110 \"[executable]/sparql.sql\"\n"
+static const char *proc347 =
+"#line 13657 \"[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"
@@ -12470,19 +14073,23 @@ static const char *proc308 =
"dict_put (__rdf_graph_group_dict(), group_iid, vector ());\n"
"dict_remove (__rdf_graph_group_dict(), group_iid);\n"
"jso_mark_affected (group_iri);\n"
+"log_text (\'jso_mark_affected (?)\', group_iri);\n"
"if (group_iri = \'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs\')\n"
"{\n"
"declare privates any;\n"
"privates := dict_list_keys (__rdf_graph_group_of_privates_dict(), 2);\n"
"foreach (IRI_ID iid in privates) do\n"
+"{\n"
"jso_mark_affected (id_to_iri (iid));\n"
+"log_text (\'jso_mark_affected (?)\', id_to_iri (iid));\n"
+"}\n"
"}\n"
"__rdf_cli_mark_qr_to_recompile ();\n"
"}\n"
-"--src sparql.sql:12108\n";
+"--src sparql.sql:13655\n";
-static const char *proc309 =
-"#line 12129 \"[executable]/sparql.sql\"\n"
+static const char *proc348 =
+"#line 13680 \"[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"
@@ -12504,10 +14111,10 @@ static const char *proc309 =
"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:12127\n";
+"--src sparql.sql:13678\n";
-static const char *proc310 =
-"#line 12152 \"[executable]/sparql.sql\"\n"
+static const char *proc349 =
+"#line 13703 \"[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"
@@ -12534,10 +14141,10 @@ static const char *proc310 =
"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:12150\n";
+"--src sparql.sql:13701\n";
-static const char *proc311 =
-"#line 12180 \"[executable]/sparql.sql\"\n"
+static const char *proc350 =
+"#line 13731 \"[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"
@@ -12551,16 +14158,18 @@ static const char *proc311 =
"where RGGM_GROUP_IID = group_iid\n"
"order by RGGM_MEMBER_IID ) );\n"
"jso_mark_affected (group_iri);\n"
+"log_text (\'jso_mark_affected (?)\', group_iri);\n"
"if (group_iri = \'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs\')\n"
"{\n"
"dict_put (__rdf_graph_group_of_privates_dict(), memb_iid, 1);\n"
"jso_mark_affected (memb_iri);\n"
+"log_text (\'jso_mark_affected (?)\', memb_iri);\n"
"}\n"
"}\n"
-"--src sparql.sql:12178\n";
+"--src sparql.sql:13729\n";
-static const char *proc312 =
-"#line 12201 \"[executable]/sparql.sql\"\n"
+static const char *proc351 =
+"#line 13754 \"[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"
@@ -12573,16 +14182,37 @@ static const char *proc312 =
"if (not exists (select top 1 1 from DB.DBA.RDF_GRAPH_GROUP where RGG_IRI = group_iri))\n"
"signal (\'RDF99\', sprintf (\'Graph group <%s> does not exist\', group_iri));\n"
"if (group_iri = \'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs\')\n"
+"{\n"
"DB.DBA.RDF_GRAPH_CHECK_VISIBILITY_CHANGE (memb_iri, #i8192);\n"
+"if (isstring (registry_get (\'DB.DBA.RDF_REPL\'))\n"
+"and exists (select top 1 1 from DB.DBA.RDF_GRAPH_GROUP_MEMBER\n"
+"where RGGM_GROUP_IID = iri_to_id (UNAME\'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group\') and RGGM_MEMBER_IID = memb_iid)\n"
+"and not exists (select RGU_PERMISSIONS from DB.DBA.RDF_GRAPH_USER\n"
+"where RGU_GRAPH_IID = memb_iid and RGU_USER_ID = http_nobody_uid() and bit_and (RGU_PERMISSIONS, 1) )\n"
+"and not exists (select RGU_PERMISSIONS from DB.DBA.RDF_GRAPH_USER\n"
+"where RGU_GRAPH_IID = #i8192 and RGU_USER_ID = http_nobody_uid() and bit_and (RGU_PERMISSIONS, 1) )\n"
+"and not exists (select RGU_PERMISSIONS from DB.DBA.RDF_GRAPH_USER\n"
+"where RGU_GRAPH_IID = memb_iid and RGU_USER_ID = __rdf_repl_uid() and bit_and (RGU_PERMISSIONS, 1) )\n"
+"and not exists (select RGU_PERMISSIONS from DB.DBA.RDF_GRAPH_USER\n"
+"where RGU_GRAPH_IID = #i8192 and RGU_USER_ID = __rdf_repl_uid() and bit_and (RGU_PERMISSIONS, 1) ) )\n"
+"signal (\'RDF99\', \'Can not add graph <\' || memb_iri || \'> to group of private graphs <\' || group_iri || \'>; either stop the RDF replication of this graph or grant an explicit read permission to __rdf_repl account\');\n"
+"}\n"
+"else if (group_iri = \'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group\')\n"
+"{\n"
+"if (memb_iri = DB.DBA.JSO_SYS_GRAPH())\n"
+"signal (\'RDF99\', \'Graph group <\' || group_iri || \'> is for RDF replication; can not enable RDF replication of <\' || memb_iri || \'> (the system metadata graph)\');\n"
+"if (isstring (registry_get (\'DB.DBA.RDF_REPL\')) and not __rgs_ack_cbk (memb_iid, __rdf_repl_uid(), 1))\n"
+"signal (\'RDF99\', \'Graph group <\' || group_iri || \'> is for RDF replication; can not enable RDF replication of graph <\' || memb_iri || \'> because it is not readable by __rdf_repl account\');\n"
+"}\n"
"insert soft DB.DBA.RDF_GRAPH_GROUP_MEMBER (RGGM_GROUP_IID, RGGM_MEMBER_IID)\n"
"values (group_iid, memb_iid);\n"
"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:12199\n";
+"--src sparql.sql:13752\n";
-static const char *proc313 =
-"#line 12221 \"[executable]/sparql.sql\"\n"
+static const char *proc352 =
+"#line 13795 \"[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"
@@ -12596,16 +14226,18 @@ static const char *proc313 =
"where RGGM_GROUP_IID = group_iid\n"
"order by RGGM_MEMBER_IID ) );\n"
"jso_mark_affected (group_iri);\n"
+"log_text (\'jso_mark_affected (?)\', group_iri);\n"
"if (group_iri = \'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs\')\n"
"{\n"
"dict_remove (__rdf_graph_group_of_privates_dict(), memb_iid);\n"
"jso_mark_affected (memb_iri);\n"
+"log_text (\'jso_mark_affected (?)\', memb_iri);\n"
"}\n"
"}\n"
-"--src sparql.sql:12219\n";
+"--src sparql.sql:13793\n";
-static const char *proc314 =
-"#line 12242 \"[executable]/sparql.sql\"\n"
+static const char *proc353 =
+"#line 13818 \"[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"
@@ -12624,17 +14256,17 @@ static const char *proc314 =
"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:12240\n";
+"--src sparql.sql:13816\n";
-static const char *proc315 =
-"#line 12262 \"[executable]/sparql.sql\"\n"
+static const char *proc354 =
+"#line 13838 \"[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"
"declare res integer;\n"
"graph_iid := iri_to_id (graph_iri);\n"
"if (isstring (uid))\n"
-"uid := ((select U_ID from DB.DBA.SYS_USERS where U_NAME = uid and (U_NAME=\'nobody\' or (U_SQL_ENABLE and not U_ACCOUNT_DISABLED))));\n"
+"uid := (select U_ID from DB.DBA.SYS_USERS where U_NAME = uid and (U_NAME=\'nobody\' or U_SQL_ENABLE));\n"
"if (uid is null)\n"
"return 0;\n"
"if (uid = 0)\n"
@@ -12644,10 +14276,10 @@ static const char *proc315 =
"__rdf_graph_approx_perms (graph_iid, uid) );\n"
"return res;\n"
"}\n"
-"--src sparql.sql:12260\n";
+"--src sparql.sql:13836\n";
-static const char *proc316 =
-"#line 12280 \"[executable]/sparql.sql\"\n"
+static const char *proc355 =
+"#line 13856 \"[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"
@@ -12685,10 +14317,10 @@ static const char *proc316 =
"}\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:12278\n";
+"--src sparql.sql:13854\n";
-static const char *proc317 =
-"#line 12320 \"[executable]/sparql.sql\"\n"
+static const char *proc356 =
+"#line 13896 \"[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"
@@ -12701,10 +14333,10 @@ static const char *proc317 =
"return \'get-group-list\';\n"
"return sprintf (\'\"%d\"\', perms);\n"
"}\n"
-"--src sparql.sql:12318\n";
+"--src sparql.sql:13894\n";
-static const char *proc318 =
-"#line 12334 \"[executable]/sparql.sql\"\n"
+static const char *proc357 =
+"#line 13910 \"[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"
@@ -12750,22 +14382,25 @@ static const char *proc318 =
"}\n"
"return graph_iri;\n"
"}\n"
-"--src sparql.sql:12332\n";
+"--src sparql.sql:13908\n";
-static const char *proc319 =
-"#line 12381 \"[executable]/sparql.sql\"\n"
+static const char *proc358 =
+"#line 13957 \"[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"
"if (uid = http_nobody_uid())\n"
"dict_put (__rdf_graph_public_perms_dict(), special_iid, perms);\n"
"foreach (varchar jso_key in affected_jso) do\n"
+"{\n"
"jso_mark_affected (jso_key);\n"
+"log_text (\'jso_mark_affected (?)\', jso_key);\n"
"}\n"
-"--src sparql.sql:12379\n";
+"}\n"
+"--src sparql.sql:13955\n";
-static const char *proc320 =
-"#line 12391 \"[executable]/sparql.sql\"\n"
+static const char *proc359 =
+"#line 13970 \"[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"
@@ -12839,10 +14474,10 @@ static const char *proc320 =
"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:12389\n";
+"--src sparql.sql:13968\n";
-static const char *proc321 =
-"#line 12466 \"[executable]/sparql.sql\"\n"
+static const char *proc360 =
+"#line 14045 \"[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"
@@ -12853,11 +14488,12 @@ static const char *proc321 =
"else\n"
"__rdf_graph_specific_perms_of_user (graph_iid, uid, perms);\n"
"jso_mark_affected (graph_iri);\n"
+"log_text (\'jso_mark_affected (?)\', graph_iri);\n"
"}\n"
-"--src sparql.sql:12464\n";
+"--src sparql.sql:14043\n";
-static const char *proc322 =
-"#line 12479 \"[executable]/sparql.sql\"\n"
+static const char *proc361 =
+"#line 14059 \"[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"
@@ -12885,11 +14521,12 @@ static const char *proc322 =
"signal (\'RDF99\', sprintf (\'Default permissions of user \"%s\" on RDF quad store are broader than new permissions on specific graph <%s>\', uname, graph_iri));\n"
"if (uname = \'nobody\')\n"
"{\n"
-"jso_mark_affected (graph_iri);\n"
"if (isstring (registry_get (\'DB.DBA.RDF_REPL\')) and not (bit_and (perms, 1)) and\n"
"exists (select top 1 1 from DB.DBA.RDF_GRAPH_GROUP_MEMBER\n"
"where RGGM_GROUP_IID = iri_to_id (UNAME\'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group\') and RGGM_MEMBER_IID = graph_iid) )\n"
"signal (\'RDF99\', \'Can not disable public read access to <\' || id_to_iri (graph_iid) || \'> while it is included in RDF replication and the replication is enabled\');\n"
+"jso_mark_affected (graph_iri);\n"
+"log_text (\'jso_mark_affected (?)\', graph_iri);\n"
"}\n"
"else\n"
"{\n"
@@ -12899,6 +14536,10 @@ static const char *proc322 =
"15 );\n"
"if (bit_and (bit_not (perms), common_perms))\n"
"signal (\'RDF99\', sprintf (\'Permissions of unauthenticated user are broader than new permissions of user \"%s\" on specific graph <%s>\', uname, graph_iri));\n"
+"if ((uname = \'__rdf_repl\') and isstring (registry_get (\'DB.DBA.RDF_REPL\')) and not (bit_and (perms, 1)) and\n"
+"exists (select top 1 1 from DB.DBA.RDF_GRAPH_GROUP_MEMBER\n"
+"where RGGM_GROUP_IID = iri_to_id (UNAME\'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group\') and RGGM_MEMBER_IID = graph_iid) )\n"
+"signal (\'RDF99\', \'Can not disable read access of __rdf_repl account to <\' || id_to_iri (graph_iid) || \'> while it is included in RDF replication and the replication is enabled\');\n"
"}\n"
"if (not (exists (select top 1 1 from DB.DBA.RDF_GRAPH_USER where RGU_GRAPH_IID = #i0 and RGU_USER_ID = 0)))\n"
"DB.DBA.RDF_DEFAULT_USER_PERMS_SET (\'dba\', 1023);\n"
@@ -12910,10 +14551,47 @@ static const char *proc322 =
"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:12477\n";
+"--src sparql.sql:14057\n";
-static const char *proc323 =
-"#line 12533 \"[executable]/sparql.sql\"\n"
+static const char *proc362 =
+"#line 14118 \"[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"
+"log_text (\'jso_mark_affected (?)\', graph_iri);\n"
+"}\n"
+"--src sparql.sql:14116\n";
+
+static const char *proc363 =
+"#line 14132 \"[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:14130\n";
+
+static const char *proc364 =
+"#line 14151 \"[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"
@@ -12986,7 +14664,6 @@ static const char *proc323 =
"else\n"
"full_list := vector ();\n"
"}\n"
-"\n"
"if (bit_and (common_perms, req_perms) = req_perms)\n"
"{\n"
"declare ctr integer;\n"
@@ -13032,15 +14709,15 @@ static const char *proc323 =
"vectorbld_final (filtered_list);\n"
"return filtered_list;\n"
"}\n"
-"--src sparql.sql:12531\n";
+"--src sparql.sql:14149\n";
-static const char *proc324 =
-"#line 12656 \"[executable]/sparql.sql\"\n"
+static const char *proc365 =
+"#line 14273 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.SPARQL_RELOAD_QM_GRAPH ()\n"
"{\n"
"declare ver varchar;\n"
"declare inx int;\n"
-"ver := \'2011-09-01 0001v6g\';\n"
+"ver := \'2012-05-17 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"
@@ -13125,10 +14802,10 @@ static const char *proc324 =
"sequence_set (\'RDF_PREF_SEQ\', 101, 1);\n"
"sequence_set (\'RDF_RO_ID\', 1001, 1);\n"
"}\n"
-"--src sparql.sql:12654\n";
+"--src sparql.sql:14271\n";
-static const char *proc325 =
-"#line 12747 \"[executable]/sparql.sql\"\n"
+static const char *proc366 =
+"#line 14364 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()\n"
"{\n"
"declare state, msg varchar;\n"
@@ -13158,8 +14835,8 @@ static const char *proc325 =
"\'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_FAKE_0 to SPARQL_SELECT\',\n"
-"\'grant select on DB.DBA.SYS_FAKE_1 to SPARQL_SELECT\',\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 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"
@@ -13201,6 +14878,8 @@ static const char *proc325 =
"\'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"
@@ -13223,16 +14902,21 @@ static const char *proc325 =
"\'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"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_TALIS_JSON to SPARQL_SELECT\',\n"
"\'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_TSV 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"
@@ -13251,6 +14935,7 @@ static const char *proc325 =
"\'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_FIN to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC to SPARQL_SELECT\',\n"
+"\'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV_ACC to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_ACC to SPARQL_SELECT\',\n"
@@ -13265,6 +14950,7 @@ static const char *proc325 =
"\'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_MICRODATA to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_MICRODATA to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CSV to SPARQL_SELECT\',\n"
+"\'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TSV to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDFA_XHTML to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML_QRCODE to SPARQL_SELECT\',\n"
@@ -13273,12 +14959,20 @@ static const char *proc325 =
"\'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_LOAD to SPARQL_UPDATE\',\n"
+"\'grant execute on DB.DBA.SPARUL_COPY to SPARQL_UPDATE\',\n"
+"\'grant execute on SPARUL_LOAD_SERVICE_DATA to SPARQL_SPONGE\',\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_LOAD_SERVICE_DATA 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"
@@ -13289,6 +14983,10 @@ static const char *proc325 =
"\'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"
@@ -13310,18 +15008,18 @@ static const char *proc325 =
"\'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:12745\n";
+"--src sparql.sql:14362\n";
-static const char *proc326 =
-"#line 12938 \"[executable]/sparql.sql\"\n"
+static const char *proc367 =
+"#line 14576 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_AUDIT ()\n"
"{\n"
"declare stat, msg varchar;\n"
@@ -13392,10 +15090,10 @@ static const char *proc326 =
"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:12936\n";
+"--src sparql.sql:14574\n";
-static const char *proc327 =
-"#line 13010 \"[executable]/sparql.sql\"\n"
+static const char *proc368 =
+"#line 14648 \"[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"
@@ -13406,7 +15104,7 @@ static const char *proc327 =
"\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 RDF_QUAD))\n"
+"if (not exists (select top 1 1 from DB.DBA.RDF_QUAD))\n"
"{\n"
"registry_set (\'__rb_id_only_for_plain_ro_obj\', \'1\');\n"
"return;\n"
@@ -13416,7 +15114,7 @@ static const char *proc327 =
"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 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 DB.DBA.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"
@@ -13426,7 +15124,6 @@ static const char *proc327 =
"\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"
@@ -13477,18 +15174,18 @@ static const char *proc327 =
"}\n"
"\n"
"old_mode := log_enable (2, 1);\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"
+"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"
"if (c_main <> c_pogs)\n"
"log_message (\'* Existing indexes are damaged, will try to recover...\');\n"
-"c_op := (select count (1) from RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));\n"
+"c_op := (select count (1) from DB.DBA.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"
@@ -13500,7 +15197,7 @@ static const char *proc327 =
"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 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 DB.DBA.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"
@@ -13521,9 +15218,9 @@ static const char *proc327 =
"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 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"
+"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"
"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"
@@ -13536,11 +15233,11 @@ static const char *proc327 =
"\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"
@@ -13550,13 +15247,13 @@ static const char *proc327 =
"log_enable (old_mode, 1);\n"
"log_message (\'Update complete.\');\n"
"}\n"
-"--src sparql.sql:13008\n";
+"--src sparql.sql:14646\n";
-static const char *other34 =
+static const char *other37 =
" DB.DBA.RDF_QUAD_OUTLINE_ALL ()\n";
-static const char *proc328 =
-"#line 13171 \"[executable]/sparql.sql\"\n"
+static const char *proc369 =
+"#line 14808 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_FT_UPGRADE ()\n"
"{\n"
"declare stat, msg varchar;\n"
@@ -13591,6 +15288,9 @@ static const char *proc328 =
"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"
@@ -13626,29 +15326,29 @@ static const char *proc328 =
"\n"
"final_qm_reload:\n"
"DB.DBA.SPARQL_RELOAD_QM_GRAPH ();\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"
+"\n"
"\n"
"return;\n"
"}\n"
-"--src sparql.sql:13169\n";
+"--src sparql.sql:14806\n";
-static const char *other35 =
+static const char *other38 =
" DB.DBA.RDF_QUAD_FT_UPGRADE ()\n";
-static const char *other36 =
+static const char *other39 =
"DB.DBA.RDF_CREATE_SPARQL_ROLES ()\n";
-static const char *proc329 =
-"#line 13260 \"[executable]/sparql.sql\"\n"
+static const char *proc370 =
+"#line 14900 \"[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:13258\n";
+"--src sparql.sql:14898\n";
-static const char *proc330 =
-"#line 13268 \"[executable]/sparql.sql\"\n"
+static const char *proc371 =
+"#line 14908 \"[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"
@@ -13670,15 +15370,15 @@ static const char *proc330 =
"}\n"
"exec_close (cc);\n"
"}\n"
-"--src sparql.sql:13266\n";
+"--src sparql.sql:14906\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 *proc331 =
-"#line 13297 \"[executable]/sparql.sql\"\n"
+static const char *proc372 =
+"#line 14937 \"[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"
@@ -13833,26 +15533,27 @@ static const char *proc331 =
"rules_count := rules_count + length (v);\n"
"}\n"
"jso_mark_affected (ri_name);\n"
+"log_text (\'jso_mark_affected (?)\', ri_name);\n"
"\n"
"rdf_inf_dir (ri_name, null, null, 0);\n"
"return rules_count + 1;\n"
"}\n"
-"--src sparql.sql:13295\n";
+"--src sparql.sql:14935\n";
-static const char *proc332 =
-"#line 13458 \"[executable]/sparql.sql\"\n"
+static const char *proc373 =
+"#line 15098 \"[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:13456\n";
+"--src sparql.sql:15096\n";
-static const char *other37 =
+static const char *other40 =
"rdf_schema_ld ()\n";
-static const char *proc333 =
-"#line 13470 \"[executable]/sparql.sql\"\n"
+static const char *proc374 =
+"#line 15110 \"[executable]/sparql.sql\"\n"
"create function CL_RDF_INF_CHANGED_SRV (in name varchar) returns integer\n"
"{\n"
"declare res integer;\n"
@@ -13861,10 +15562,10 @@ static const char *proc333 =
"return case (rdfs_load_schema (name)) when 0 then 1 else 0 end;\n"
"return res;\n"
"}\n"
-"--src sparql.sql:13468\n";
+"--src sparql.sql:15108\n";
-static const char *proc334 =
-"#line 13480 \"[executable]/sparql.sql\"\n"
+static const char *proc375 =
+"#line 15120 \"[executable]/sparql.sql\"\n"
"create procedure CL_RDF_INF_CHANGED (in name varchar)\n"
"{\n"
"declare aq any;\n"
@@ -13874,10 +15575,10 @@ static const char *proc334 =
"aq_request (aq, \'DB.DBA.CL_RDF_INF_CHANGED_SRV\', vector (name));\n"
"aq_wait_all (aq);\n"
"}\n"
-"--src sparql.sql:13478\n";
+"--src sparql.sql:15118\n";
-static const char *proc335 =
-"#line 13491 \"[executable]/sparql.sql\"\n"
+static const char *proc376 =
+"#line 15131 \"[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"
@@ -13900,10 +15601,10 @@ static const char *proc335 =
"return res;\n"
"}\n"
"}\n"
-"--src sparql.sql:13489\n";
+"--src sparql.sql:15129\n";
-static const char *proc336 =
-"#line 13515 \"[executable]/sparql.sql\"\n"
+static const char *proc377 =
+"#line 15155 \"[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"
@@ -13911,10 +15612,10 @@ static const char *proc336 =
"retnull:\n"
"return null;\n"
"}\n"
-"--src sparql.sql:13513\n";
+"--src sparql.sql:15153\n";
-static const char *proc337 =
-"#line 13524 \"[executable]/sparql.sql\"\n"
+static const char *proc378 =
+"#line 15164 \"[executable]/sparql.sql\"\n"
"create procedure SPARQL_INI_PARAMS (inout metas any, inout dta any)\n"
"{\n"
"declare item_cnt int;\n"
@@ -13938,10 +15639,10 @@ static const char *proc337 =
"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:13522\n";
+"--src sparql.sql:15162\n";
-static const char *proc338 =
-"#line 13549 \"[executable]/sparql.sql\"\n"
+static const char *proc379 =
+"#line 15189 \"[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"
@@ -13960,10 +15661,10 @@ static const char *proc338 =
"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:13547\n";
+"--src sparql.sql:15187\n";
-static const char *proc339 =
-"#line 13569 \"[executable]/sparql.sql\"\n"
+static const char *proc380 =
+"#line 15209 \"[executable]/sparql.sql\"\n"
"create procedure cl_inx_recov_clean ()\n"
"{\n"
"if (registry_get (\'__rb_id_only_for_plain_ro_obj\') = \'1\')\n"
@@ -13978,10 +15679,10 @@ static const char *proc339 =
"goto again;\n"
"\n"
"}\n"
-"--src sparql.sql:13567\n";
+"--src sparql.sql:15207\n";
-static const char *proc340 =
-"#line 13585 \"[executable]/sparql.sql\"\n"
+static const char *proc381 =
+"#line 15225 \"[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"
@@ -13995,10 +15696,10 @@ static const char *proc340 =
"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:13583\n";
+"--src sparql.sql:15223\n";
-static const char *proc341 =
-"#line 13611 \"[executable]/sparql.sql\"\n"
+static const char *proc382 =
+"#line 15251 \"[executable]/sparql.sql\"\n"
"create procedure exec_from_daq (in cmd varchar)\n"
"{\n"
"declare aq any;\n"
@@ -14006,26 +15707,26 @@ static const char *proc341 =
"aq_request (aq, \'DB.DBA.AQ_EXEC_SRV\', vector (cmd));\n"
"aq_wait_all (aq);\n"
"}\n"
-"--src sparql.sql:13609\n";
+"--src sparql.sql:15249\n";
-static const char *proc342 =
-"#line 13620 \"[executable]/sparql.sql\"\n"
+static const char *proc383 =
+"#line 15260 \"[executable]/sparql.sql\"\n"
"create procedure cl_inx_recov (in force int := 0)\n"
"{\n"
"declare old_mode, tries int;\n"
"if (force)\n"
-"cl_exec (\'registry_remove (\'\'__rb_id_only_for_plain_ro_obj\'\')\');\n"
+"DB.DBA.CL_EXEC (\'registry_remove (\'\'__rb_id_only_for_plain_ro_obj\'\')\');\n"
"if (registry_get (\'__rb_id_only_for_plain_ro_obj\') = \'1\')\n"
"return;\n"
-"cl_exec (\'checkpoint_interval (0)\');\n"
+"DB.DBA.CL_EXEC (\'checkpoint_interval (0)\');\n"
"log_message (\'Automatic checkpoint is stopped, must enable manually once upgrade finished.\');\n"
-"cl_exec (\'__dbf_set (\'\'cl_max_keep_alives_missed\'\', 10000)\');\n"
-"cl_exec (\'__dbf_set (\'\'cl_non_logged_write_mode\'\', 1)\');\n"
-"cl_exec (\'checkpoint\');\n"
+"DB.DBA.CL_EXEC (\'__dbf_set (\'\'cl_max_keep_alives_missed\'\', 10000)\');\n"
+"DB.DBA.CL_EXEC (\'__dbf_set (\'\'cl_non_logged_write_mode\'\', 1)\');\n"
+"DB.DBA.CL_EXEC (\'checkpoint\');\n"
"old_mode := log_enable (2,1);\n"
-"cl_exec (\'exec_from_daq (\'\'cl_tmp_inx_recov_fill ()\'\')\');\n"
+"DB.DBA.CL_EXEC (\'exec_from_daq (\'\'cl_tmp_inx_recov_fill ()\'\')\');\n"
"clear_retry:\n"
-"cl_exec (\'exec_from_daq (\'\'cl_inx_recov_clean ()\'\')\');\n"
+"DB.DBA.CL_EXEC (\'exec_from_daq (\'\'cl_inx_recov_clean ()\'\')\');\n"
"if (\n"
"exists (select 1 from rdf_quad table option (index rdf_quad)) or\n"
"exists (select 1 from rdf_quad table option (index rdf_quad_pogs)) or\n"
@@ -14036,15 +15737,15 @@ static const char *proc342 =
"if (tries > 100)\n"
"{\n"
"log_message (\'Quad store can not be cleaned, data reloading is strictly recommended.\');\n"
-"cl_exec (\'raw_exit ()\');\n"
+"DB.DBA.CL_EXEC (\'raw_exit ()\');\n"
"}\n"
"log_message (sprintf (\'Quad store is not fully cleaned, will try again [%d]\', tries));\n"
"goto clear_retry;\n"
"}\n"
-"cl_exec (\'exec_from_daq (\'\'cl_inx_recov_fill_1 ()\'\')\');\n"
-"cl_exec (\'registry_set (\'\'__rb_id_only_for_plain_ro_obj\'\', \'\'1\'\')\');\n"
+"DB.DBA.CL_EXEC (\'exec_from_daq (\'\'cl_inx_recov_fill_1 ()\'\')\');\n"
+"DB.DBA.CL_EXEC (\'registry_set (\'\'__rb_id_only_for_plain_ro_obj\'\', \'\'1\'\')\');\n"
"if (not force)\n"
-"cl_exec (\'checkpoint\');\n"
+"DB.DBA.CL_EXEC (\'checkpoint\');\n"
"log_message (\'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)\n"
"where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s)))\n"
@@ -14055,16 +15756,16 @@ static const char *proc342 =
"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"
"log_enable (old_mode, 1);\n"
-"cl_exec (\'__dbf_set (\'\'cl_non_logged_write_mode\'\', 0)\');\n"
+"DB.DBA.CL_EXEC (\'__dbf_set (\'\'cl_non_logged_write_mode\'\', 0)\');\n"
"log_message (\'Update complete.\');\n"
"if (force)\n"
"log_message (\'Must do checkpoint to persist the db state.\');\n"
"}\n"
-"--src sparql.sql:13618\n";
+"--src sparql.sql:15258\n";
/* sparql_io.sql */
-static const char *proc343 =
+static const char *proc384 =
"#line 25 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_XML_WRITE_NS (inout ses any)\n"
"{\n"
@@ -14073,7 +15774,7 @@ static const char *proc343 =
"}\n"
"--src sparql_io.sql:23\n";
-static const char *proc344 =
+static const char *proc385 =
"#line 34 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_XML_WRITE_HEAD (inout ses any, in colnames any)\n"
"{\n"
@@ -14089,7 +15790,7 @@ static const char *proc344 =
"}\n"
"--src sparql_io.sql:32\n";
-static const char *proc345 =
+static const char *proc386 =
"#line 49 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_XML_HTTP_PRE (in colnames any, in accept varchar)\n"
"{\n"
@@ -14107,7 +15808,7 @@ static const char *proc345 =
"}\n"
"--src sparql_io.sql:47\n";
-static const char *proc346 =
+static const char *proc387 =
"#line 66 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_XML_HTTP_INIT (inout env any)\n"
"{\n"
@@ -14115,7 +15816,7 @@ static const char *proc346 =
"}\n"
"--src sparql_io.sql:64\n";
-static const char *proc347 =
+static const char *proc388 =
"#line 73 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_XML_HTTP_FINAL (inout env any)\n"
"{\n"
@@ -14124,14 +15825,14 @@ static const char *proc347 =
"}\n"
"--src sparql_io.sql:71\n";
-static const char *other38 =
+static const char *other41 =
" create aggregate DB.DBA.SPARQL_RSET_XML_HTTP (inout colnames any, inout row any) from\n"
"DB.DBA.SPARQL_RSET_XML_HTTP_INIT,\n"
"sparql_rset_xml_write_row,\n"
"DB.DBA.SPARQL_RSET_XML_HTTP_FINAL\n"
"order\n";
-static const char *proc348 =
+static const char *proc389 =
"#line 90 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_DICT_XML_HTTP_PRE (in colnames any, in accept varchar)\n"
"{\n"
@@ -14147,13 +15848,13 @@ static const char *proc348 =
"}\n"
"--src sparql_io.sql:88\n";
-static const char *other39 =
+static const char *other42 =
" create aggregate DB.DBA.SPARQL_DICT_XML_HTTP (inout colnames any, inout row any) from\n"
"DB.DBA.SPARQL_RSET_XML_HTTP_INIT,\n"
"sparql_dict_xml_write_row,\n"
"DB.DBA.SPARQL_RSET_XML_HTTP_FINAL\n";
-static const char *proc349 =
+static const char *proc390 =
"#line 113 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_TTL_WRITE_NS (inout ses any)\n"
"{\n"
@@ -14163,7 +15864,7 @@ static const char *proc349 =
"}\n"
"--src sparql_io.sql:111\n";
-static const char *proc350 =
+static const char *proc391 =
"#line 122 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_TTL_WRITE_HEAD (inout ses any, in colnames any)\n"
"{\n"
@@ -14182,7 +15883,7 @@ static const char *proc350 =
"}\n"
"--src sparql_io.sql:120\n";
-static const char *proc351 =
+static const char *proc392 =
"#line 140 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_TTL_HTTP_PRE (in colnames any, in accept varchar)\n"
"{\n"
@@ -14204,7 +15905,7 @@ static const char *proc351 =
"}\n"
"--src sparql_io.sql:138\n";
-static const char *proc352 =
+static const char *proc393 =
"#line 161 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_TTL_HTTP_INIT (inout env any)\n"
"{\n"
@@ -14212,7 +15913,7 @@ static const char *proc352 =
"}\n"
"--src sparql_io.sql:159\n";
-static const char *proc353 =
+static const char *proc394 =
"#line 168 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL (inout env any)\n"
"{\n"
@@ -14220,14 +15921,14 @@ static const char *proc353 =
"}\n"
"--src sparql_io.sql:166\n";
-static const char *other40 =
+static const char *other43 =
" create aggregate DB.DBA.SPARQL_RSET_TTL_HTTP (inout colnames any, inout row any) from\n"
"DB.DBA.SPARQL_RSET_TTL_HTTP_INIT,\n"
"sparql_rset_ttl_write_row,\n"
"DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL\n"
"order\n";
-static const char *proc354 =
+static const char *proc395 =
"#line 183 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_NT_WRITE_NS (inout ses any)\n"
"{\n"
@@ -14235,7 +15936,7 @@ static const char *proc354 =
"}\n"
"--src sparql_io.sql:181\n";
-static const char *proc355 =
+static const char *proc396 =
"#line 190 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_NT_WRITE_HEAD (inout ses any, in colnames any)\n"
"{\n"
@@ -14250,7 +15951,7 @@ static const char *proc355 =
"}\n"
"--src sparql_io.sql:188\n";
-static const char *proc356 =
+static const char *proc397 =
"#line 204 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_NT_HTTP_PRE (in colnames any, in accept varchar)\n"
"{\n"
@@ -14272,14 +15973,14 @@ static const char *proc356 =
"}\n"
"--src sparql_io.sql:202\n";
-static const char *other41 =
+static const char *other44 =
" create aggregate DB.DBA.SPARQL_RSET_NT_HTTP (inout colnames any, inout row any) from\n"
"DB.DBA.SPARQL_RSET_TTL_HTTP_INIT,\n"
"sparql_rset_nt_write_row,\n"
"DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL\n"
"order\n";
-static const char *proc357 =
+static const char *proc398 =
"#line 235 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_REXEC_INT (\n"
"in res_mode integer,\n"
@@ -14292,7 +15993,8 @@ static const char *proc357 =
"in maxrows integer,\n"
"inout metas any,\n"
"inout bnode_dict any,\n"
-"in expected_var_list any := null\n"
+"in expected_var_list any := null,\n"
+"in options any := null\n"
")\n"
"{\n"
"declare quest_pos integer;\n"
@@ -14323,9 +16025,12 @@ static const char *proc357 =
"http (sprintf (\'&maxrows=%d\', maxrows), req_body);\n"
"req_body := string_output_string (req_body);\n"
"local_req_hdr := \'Accept: application/sparql-results+xml, text/rdf+n3, text/rdf+ttl, text/rdf+turtle, text/turtle, application/turtle, application/x-turtle, application/rdf+xml, application/xml\';\n"
-"if (length (req_body) + length (service) >= 1900)\n"
+"req_method := coalesce (\n"
+"get_keyword (\'req_method\', options, null),\n"
+"(sparql define input:storage \"\" select ?mtd from virtrdf: where { `iri(?:service)` virtrdf:bestRequestMethod ?mtd }),\n"
+"case when (length (req_body) + length (service) >= 1900) then \'POST\' else \'GET\' end );\n"
+"if (\'POST\' = req_method)\n"
"{\n"
-"req_method := \'POST\';\n"
"req_uri := service;\n"
"local_req_hdr := local_req_hdr || \'\\r\\nContent-Type: application/x-www-form-urlencoded\';\n"
"}\n"
@@ -14574,8 +16279,8 @@ static const char *proc357 =
"}\n"
"--src sparql_io.sql:233\n";
-static const char *proc358 =
-"#line 528 \"[executable]/sparql_io.sql\"\n"
+static const char *proc399 =
+"#line 532 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_REXEC (\n"
"in service varchar,\n"
"in query varchar,\n"
@@ -14583,16 +16288,17 @@ static const char *proc358 =
"in named_graphs any,\n"
"in req_hdr any,\n"
"in maxrows integer,\n"
-"in bnode_dict any\n"
+"in bnode_dict any,\n"
+"in options any := null\n"
")\n"
"{\n"
"declare metas any;\n"
-"DB.DBA.SPARQL_REXEC_INT (0, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict);\n"
+"DB.DBA.SPARQL_REXEC_INT (0, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, options);\n"
"}\n"
-"--src sparql_io.sql:526\n";
+"--src sparql_io.sql:530\n";
-static const char *proc359 =
-"#line 543 \"[executable]/sparql_io.sql\"\n"
+static const char *proc400 =
+"#line 548 \"[executable]/sparql_io.sql\"\n"
"create function DB.DBA.SPARQL_REXEC_TO_ARRAY (\n"
"in service varchar,\n"
"in query varchar,\n"
@@ -14601,16 +16307,17 @@ static const char *proc359 =
"in req_hdr any,\n"
"in maxrows integer,\n"
"in bnode_dict any,\n"
-"in expected_var_list any := null\n"
+"in expected_var_list any := null,\n"
+"in options any := null\n"
") returns any\n"
"{\n"
"declare metas any;\n"
-"return DB.DBA.SPARQL_REXEC_INT (1, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, expected_var_list);\n"
+"return DB.DBA.SPARQL_REXEC_INT (1, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, expected_var_list, options);\n"
"}\n"
-"--src sparql_io.sql:541\n";
+"--src sparql_io.sql:546\n";
-static const char *proc360 =
-"#line 559 \"[executable]/sparql_io.sql\"\n"
+static const char *proc401 =
+"#line 565 \"[executable]/sparql_io.sql\"\n"
"create function DB.DBA.SPARQL_REXEC_TO_ARRAY_OF_OBJ (\n"
"in service varchar,\n"
"in query varchar,\n"
@@ -14619,16 +16326,17 @@ static const char *proc360 =
"in req_hdr any,\n"
"in maxrows integer,\n"
"in bnode_dict any,\n"
-"in expected_var_list any := null\n"
+"in expected_var_list any := null,\n"
+"in options any := null\n"
") returns any\n"
"{\n"
"declare metas any;\n"
-"return DB.DBA.SPARQL_REXEC_INT (1, 1, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, expected_var_list);\n"
+"return DB.DBA.SPARQL_REXEC_INT (1, 1, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metas, bnode_dict, expected_var_list, options);\n"
"}\n"
-"--src sparql_io.sql:557\n";
+"--src sparql_io.sql:563\n";
-static const char *proc361 =
-"#line 575 \"[executable]/sparql_io.sql\"\n"
+static const char *proc402 =
+"#line 582 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_REXEC_WITH_META (\n"
"in service varchar,\n"
"in query varchar,\n"
@@ -14638,16 +16346,277 @@ static const char *proc361 =
"in maxrows integer,\n"
"in bnode_dict any,\n"
"out metadata any,\n"
-"out resultset any\n"
+"out resultset any,\n"
+"in options any := null\n"
")\n"
"{\n"
-"resultset := DB.DBA.SPARQL_REXEC_INT (1, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metadata, bnode_dict);\n"
+"resultset := DB.DBA.SPARQL_REXEC_INT (1, 0, service, query, dflt_graph, named_graphs, req_hdr, maxrows, metadata, bnode_dict, options);\n"
"\n"
"}\n"
-"--src sparql_io.sql:573\n";
+"--src sparql_io.sql:580\n";
-static const char *proc362 =
-"#line 593 \"[executable]/sparql_io.sql\"\n"
+static const char *proc403 =
+"#line 600 \"[executable]/sparql_io.sql\"\n"
+"create procedure DB.DBA.SPARQL_SD_PROBE (in service_iri varchar, in proxy_iri varchar := null, in verbose integer := 0, in inside_resultset integer := 0)\n"
+"{\n"
+"declare STAT, MSG varchar;\n"
+"declare g_iri, lang_bits_hex varchar;\n"
+"declare guess_bits, lang_bits, get_is_ok, post_is_ok integer;\n"
+"if (not inside_resultset)\n"
+"result_names (STAT, MSG);\n"
+"lang_bits := 0;\n"
+"g_iri := null;\n"
+"get_is_ok := null;\n"
+"post_is_ok := null;\n"
+"if (isstring (registry_get (\'URIQADefaultHost\')) and strstr (service_iri, registry_get (\'URIQADefaultHost\')) is not null)\n"
+"signal (\'22023\', \'Can not load own service description\');\n"
+"if (exists (sparql define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"ask { graph `iri (?:service_iri)` { { ?s a sd:Service } union { ?s sd:endpoint ?ep } } } ) )\n"
+"{\n"
+"result (\'00000\', \'The graph <\' || service_iri || \'> contains old service description data, the graph will be erased first\');\n"
+"sparql define input:storage \"\" clear graph iri (?:service_iri);\n"
+"commit work;\n"
+"}\n"
+"if (proxy_iri is not null)\n"
+"{\n"
+"sparql load iri (?:proxy_iri);\n"
+"if (not exists (sparql define input:storage \"\" ask where { graph `iri(?:proxy_iri)` { ?s ?p ?o }}))\n"
+"signal (\'22023\', \'The resource <\' || proxy_iri || \'> exists but does not contain any RDF data\');\n"
+"if (not exists (sparql define input:storage \"\"\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"ask where { graph `iri(?:proxy_iri)` { ?s sd:endpoint ?o }}))\n"
+"signal (\'22023\', \'The resource <\' || proxy_iri || \'> exists but does not contain service description data\');\n"
+"if (not exists (sparql define input:storage \"\"\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"ask where { graph `iri(?:proxy_iri)` { ?s sd:endpoint ?o }}))\n"
+"{\n"
+"result (\'0000\', \'The resource <\' || proxy_iri || \'> exists and describes some services but not the desired service <\' || service_iri || \'>\');\n"
+"goto g_done;\n"
+"}\n"
+"g_iri := proxy_iri;\n"
+"goto g_done;\n"
+"}\n"
+"if (not (ends_with (service_iri, \'-sd\')))\n"
+"{\n"
+"declare sd_iri varchar;\n"
+"sd_iri := service_iri || \'-sd\';\n"
+"if (exists (sparql define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"ask { graph `iri (?:sd_iri)` { { ?s a sd:Service } union { ?s sd:endpoint ?ep } } }))\n"
+"{\n"
+"result (\'00000\', \'The graph <\' || sd_iri || \'> contains old service description data, the graph will be erased first\');\n"
+"sparql define input:storage \"\" clear graph iri (?:sd_iri);\n"
+"commit work;\n"
+"}\n"
+"whenever sqlstate \'*\' goto no_sd;\n"
+"result (\'00000\', \'Trying to load <\' || sd_iri || \'> as a standalone service description...\');\n"
+"sparql load iri (?:sd_iri);\n"
+"if (not exists (sparql define input:storage \"\" ask where { graph `iri(?:sd_iri)` { ?s ?p ?o }}))\n"
+"{\n"
+"result (\'00000\', \'The resource <\' || sd_iri || \'> does not contain any RDF data, ignored\');\n"
+"goto no_sd;\n"
+"}\n"
+"if (not exists (sparql define input:storage \"\"\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"ask where { graph `iri(?:sd_iri)` { ?s sd:endpoint ?o }}))\n"
+"{\n"
+"result (\'00000\', \'The resource <\' || sd_iri || \'> exists but does not contain service description data, ignored\');\n"
+"goto no_sd;\n"
+"}\n"
+"g_iri := sd_iri;\n"
+"result (\'00000\', \'The resource <\' || sd_iri || \'> contains service description data and is used as an authoritative source\');\n"
+"goto g_done;\n"
+"}\n"
+"no_sd:\n"
+"if (verbose)\n"
+"result (__SQL_STATE, __SQL_MESSAGE);\n"
+"{\n"
+"whenever sqlstate \'*\' goto g_done;\n"
+"result (\'00000\', \'Trying to load <\' || service_iri || \'> as self-description of the service...\');\n"
+"sparql load iri (?:service_iri);\n"
+"if (not exists (sparql define input:storage \"\" ask where { graph `iri(?:service_iri)` { ?s ?p ?o }}))\n"
+"{\n"
+"result (\'00000\', \'The resource <\' || service_iri || \'> exists but does not contain any RDF data, ignored\');\n"
+"goto g_done;\n"
+"}\n"
+"if (not exists (sparql define input:storage \"\"\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"ask where { graph `iri(?:service_iri)` { ?s sd:endpoint ?o }}))\n"
+"{\n"
+"result (\'00000\', \'The resource <\' || service_iri || \'> exists but does not contain service description data, ignored\');\n"
+"goto g_done;\n"
+"}\n"
+"g_iri := service_iri;\n"
+"goto g_done;\n"
+"}\n"
+"if (verbose)\n"
+"result (__SQL_STATE, __SQL_MESSAGE);\n"
+"g_done:\n"
+"if (g_iri is not null)\n"
+"{\n"
+"declare srv_iri varchar;\n"
+"srv_iri := (sparql define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"select ?srv where { graph `iri(?:g_iri)` { ?srv sd:endpoint `iri (?:service_iri)` } }\n"
+"order by desc (str (?srv)) limit 1 );\n"
+"if (srv_iri is null)\n"
+"signal (\'22023\', \'The resource <\' || g_iri || \'> is loaded but it does not contain metadata related to <\' || service_iri || \'> as a SPARQL web service endpoint\');\n"
+"for (sparql define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"select ?endpoint\n"
+"where { graph `iri(?:g_iri)` { `iri(?:srv_iri)` sd:endpoint ?endpoint } } ) do\n"
+"{\n"
+"sparql\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"insert in virtrdf: { `iri(?:endpoint)` virtrdf:isEndpointOfService `iri(?:srv_iri)` };\n"
+"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'jso_triple_add (?,?,?)\', vector (\"endpoint\", UNAME\'http://www.openlinksw.com/schemas/virtrdf#isEndpointOfService\', srv_iri));\n"
+"result (\'00000\', \'The IRI <\' || endpoint || \'> is registered as an web service endpoint of SPARQL service <\' || service_iri || \'>\');\n"
+"}\n"
+"declare feats any;\n"
+"feats := vector (\n"
+"\'QUAD_MAP\' , 0hex0001,\n"
+"\'OPTION\' , 0hex0002,\n"
+"\'BREAKUP\' , 0hex0004,\n"
+"\'PKSELFJOIN\' , 0hex0008,\n"
+"\'RVR\' , 0hex0010,\n"
+"\'IN\' , 0hex0020,\n"
+"\'LIKE\' , 0hex0040,\n"
+"\'GLOBALS\' , 0hex0080,\n"
+"\'BI\' , 0hex0100,\n"
+"\'VIRTSPECIFIC\' , 0hex0200,\n"
+"\'VOS_509\' , 0hex03FF,\n"
+"\'SERVICE\' , 0hex0400,\n"
+"\'VOS_5_LATEST\' , 0hex0FFF,\n"
+"\'TRANSIT\' , 0hex1000,\n"
+"\'VOS_6\' , 0hex1FFF,\n"
+"\'SPARQL11_DRAFT\' , 0hex2000,\n"
+"\'SPARQL11_FULL\' , 0hex4000,\n"
+"\'SPARQL11\' , 0hex6000 );\n"
+"for (sparql define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"select (bif:subseq (str(?le), bif:length (str(virtrdf:SSG_SD_)))) as ?feat\n"
+"where { graph `iri (?:g_iri)` { { `iri(?:srv_iri)` sd:languageExtension ?le } union { `iri(?:service_iri)` sd:languageExtension ?le } } } ) do\n"
+"{\n"
+"declare bits integer;\n"
+"bits := get_keyword (\"feat\", feats, 0);\n"
+"lang_bits := bit_or (lang_bits, bits);\n"
+"}\n"
+"if (lang_bits = 0)\n"
+"result (\'00000\', \'The service metadata does not contain enough data about language capabilities, they will be probed by sample requests\');\n"
+"else\n"
+"result (\'00000\', sprintf (\'The service metadata contains data about language capabilities: equivalent of define lang:dialect %d (hex %8x)\', lang_bits, lang_bits));\n"
+"for (sparql define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"select ?mtd\n"
+"where { graph `iri (?:g_iri)` { `iri(?:srv_iri)` virtrdf:requestMethod ?mtd } } ) do\n"
+"{\n"
+"if (\'POST\' = mtd) post_is_ok := 1;\n"
+"else if (\'GET\' = mtd) get_is_ok := 1;\n"
+"}\n"
+"}\n"
+"if (get_is_ok is null and post_is_ok is null)\n"
+"{\n"
+"{\n"
+"whenever sqlstate \'*\' goto bad_get_endpoint;\n"
+"result (\'00000\', \'Trying to query <\' || service_iri || \'> as SPARQL web service endpoint, GET mode...\');\n"
+"DB.DBA.SPARQL_REXEC_TO_ARRAY (service_iri, \'select ?s where { ?s ?p ?o } limit 1\', null, null, null, 1, null, null, vector (\'req_method\', \'GET\'));\n"
+"}\n"
+"get_is_ok := 1;\n"
+"goto get_done;\n"
+"bad_get_endpoint:\n"
+"if (verbose)\n"
+"result (__SQL_STATE, __SQL_MESSAGE);\n"
+"get_is_ok := 0;\n"
+"get_done: ;\n"
+"{\n"
+"whenever sqlstate \'*\' goto bad_post_endpoint;\n"
+"result (\'00000\', \'Trying to query <\' || service_iri || \'> as SPARQL web service endpoint, POST mode...\');\n"
+"DB.DBA.SPARQL_REXEC_TO_ARRAY (service_iri, \'select ?s where { ?s ?p ?o } limit 1\', null, null, null, 1, null, null, vector (\'req_method\', \'POST\'));\n"
+"}\n"
+"post_is_ok := 1;\n"
+"goto post_done;\n"
+"bad_post_endpoint:\n"
+"if (verbose)\n"
+"result (__SQL_STATE, __SQL_MESSAGE);\n"
+"post_is_ok := 0;\n"
+"post_done: ;\n"
+"}\n"
+"if (get_is_ok or post_is_ok)\n"
+"{\n"
+"declare req_method varchar;\n"
+"req_method := case when (get_is_ok and post_is_ok) then null when (get_is_ok) then \'GET\' when (post_is_ok) then \'POST\' else null end;\n"
+"sparql\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"delete from virtrdf: { `iri(?:service_iri)` virtrdf:bestRequestMethod ?o }\n"
+"from virtrdf: where { `iri(?:service_iri)` virtrdf:bestRequestMethod ?o };\n"
+"sparql\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"insert in virtrdf: { `iri(?:service_iri)` virtrdf:bestRequestMethod `(?:req_method)` };\n"
+"commit work;\n"
+"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'jso_triples_del (?,?,null)\', vector (service_iri, UNAME\'http://www.openlinksw.com/schemas/virtrdf#bestRequestMethod\'));\n"
+"if (req_method is not null)\n"
+"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'jso_triple_add (?,?,?)\', vector (service_iri, UNAME\'http://www.openlinksw.com/schemas/virtrdf#bestRequestMethod\', req_method));\n"
+"}\n"
+"else\n"
+"signal (\'22023\', \'The service <\' || service_iri || \'> has no description and the site is not responding as a SPARQL endpoint\');\n"
+"if (lang_bits = 0)\n"
+"{\n"
+"declare feats any;\n"
+"declare ctr, len integer;\n"
+"feats := vector (\n"
+"\'prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#> select ?s where { quad map virtrdf:DefaultQuadMap { ?s ?p ?o } } limit 1\' , 0hex0001,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o OPTION (TABLE_OPTION \"ORDER\") } } limit 1\' , 0hex0002,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o OPTION (BREAKUP) } } limit 1\' , 0hex0004,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o OPTION (PKSELFJOIN) } } limit 1\' , 0hex0008,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o OPTION (RVR) } } limit 1\' , 0hex0010,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o . filter (?o in ( 1, 2, 3)) } } limit 1\' , 0hex0020,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o . filter (?o like \"%qaz%\") } } limit 1\' , 0hex0040,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?:oglobal } } limit 1\' , 0hex0080,\n"
+"\'select (str(?s) as ?str) where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o } } group by ?s limit 1\' , 0hex0100,\n"
+"\'define input:storage \"\" select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o } } limit 1\' , 0hex0200,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> ?o } . service <http://dbpedia.org/sparql> { ?s <no-such-p-qazxswedc> ?t } } limit 1\' , 0hex0400,\n"
+"\'select ?s where { graph <no-such-g-qazxswedc> { ?s <no-such-p-qazxswedc> <no-such-o-qazxswedc> OPTION (TRANSITIVE) } } limit 1\' , 0hex1000,\n"
+"\'select (strdt (group_concat (?o), datatype (max(?o)) as ?gc) where { graph <no-such-g-qazxswedc> { { ?s <no-such-p-qazxswedc> ?o } MINUS { ?s <no-such-p-qazxswedc> <no-such-o-qazxswedc> } } group by ?s having ?o > 1 } limit 1\' , 0hex2000 );\n"
+"len := length (feats);\n"
+"for (ctr := 0; ctr < len; ctr := ctr + 2)\n"
+"{\n"
+"whenever sqlstate \'*\' goto no_such_feat;\n"
+"result (\'00000\', sprintf (\'Test query %d/%d: define lang:dialect %d (hex %08x)...\', ctr/2, len/2, feats[ctr+1], feats[ctr+1]));\n"
+"DB.DBA.SPARQL_REXEC_TO_ARRAY (service_iri, feats[ctr], null, null, null, 1, null);\n"
+"lang_bits := bit_or (lang_bits, feats[ctr+1]);\n"
+"result (\'00000\', sprintf (\'Test query %d/%d has found support for define lang:dialect %d (hex %08x)\', ctr/2, len/2, feats[ctr+1], feats[ctr+1]));\n"
+"goto probe_done;\n"
+"no_such_feat:\n"
+"if (verbose)\n"
+"result (__SQL_STATE, __SQL_MESSAGE);\n"
+"probe_done:;\n"
+"}\n"
+"result (\'00000\', sprintf (\'The endpoint <\' || service_iri || \'> has support for define lang:dialect %d (hex %08x)\', lang_bits, lang_bits));\n"
+"}\n"
+"sparql define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"delete from virtrdf: { `iri(?:service_iri)` virtrdf:dialect ?lb } from virtrdf: { `iri(?:service_iri)` virtrdf:dialect ?lb };\n"
+"lang_bits_hex := sprintf (\'%08x\', lang_bits);\n"
+"sparql define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"prefix sd: <http://www.w3.org/ns/sparql-service-description#>\n"
+"insert in virtrdf: { `iri(?:service_iri)` virtrdf:dialect ?:lang_bits_hex };\n"
+"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'jso_triples_del (?,?,null)\', vector (service_iri, UNAME\'http://www.openlinksw.com/schemas/virtrdf#dialect\'));\n"
+"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'jso_triple_add (?,?,?)\', vector (service_iri, UNAME\'http://www.openlinksw.com/schemas/virtrdf#dialect\', lang_bits_hex));\n"
+"}\n"
+"--src sparql_io.sql:598\n";
+
+static const char *proc404 =
+"#line 858 \"[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"
"declare RSET, retarray any;\n"
@@ -14686,13 +16655,13 @@ static const char *proc362 =
"result (retrow);\n"
"}\n"
"}\n"
-"--src sparql_io.sql:591\n";
+"--src sparql_io.sql:856\n";
-static const char *view0 =
+static const char *view1 =
"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 *proc363 =
-"#line 639 \"[executable]/sparql_io.sql\"\n"
+static const char *proc405 =
+"#line 904 \"[executable]/sparql_io.sql\"\n"
"create procedure \"querySoap\" (in \"Command\" varchar\n"
", in \"Properties\" any\n"
", out \"Error\" any __soap_fault \'__XML__\'\n"
@@ -14724,10 +16693,10 @@ static const char *proc363 =
"res := xml_tree_doc (ses);\n"
"return res;\n"
"}\n"
-"--src sparql_io.sql:637\n";
+"--src sparql_io.sql:902\n";
-static const char *proc364 =
-"#line 673 \"[executable]/sparql_io.sql\"\n"
+static const char *proc406 =
+"#line 938 \"[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"
"declare lctr, lcount integer;\n"
@@ -14744,10 +16713,10 @@ static const char *proc364 =
"http (sprintf (line_format, \'Exec Time\', cast (status[2] as varchar) || \' ms\'), ses);\n"
"http (sprintf (line_format, \'DB Activity\', cast (status[3] as varchar)), ses);\n"
"}\n"
-"--src sparql_io.sql:671\n";
+"--src sparql_io.sql:936\n";
-static const char *proc365 =
-"#line 692 \"[executable]/sparql_io.sql\"\n"
+static const char *proc407 =
+"#line 957 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_XML_WRITE_HEAD (inout ses any, in mdta any)\n"
"{\n"
"declare i, col_count integer;\n"
@@ -14772,10 +16741,10 @@ static const char *proc365 =
"\n"
"http (\'\\n </head>\', ses);\n"
"}\n"
-"--src sparql_io.sql:690\n";
+"--src sparql_io.sql:955\n";
-static const char *proc366 =
-"#line 718 \"[executable]/sparql_io.sql\"\n"
+static const char *proc408 =
+"#line 983 \"[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"
"http (\'\\n <results distinct=\"false\" ordered=\"true\">\', ses);\n"
@@ -14785,10 +16754,10 @@ static const char *proc366 =
"\n"
"http (\'\\n </results>\', ses);\n"
"}\n"
-"--src sparql_io.sql:716\n";
+"--src sparql_io.sql:981\n";
-static const char *proc367 =
-"#line 729 \"[executable]/sparql_io.sql\"\n"
+static const char *proc409 =
+"#line 994 \"[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"
"\n"
@@ -14876,7 +16845,7 @@ static const char *proc367 =
"if (__tag (sql_val) = __tag of varchar)\n"
"sql_val := charset_recode (sql_val, \'UTF-8\', \'_WIDE_\');\n"
"if (is_xml_lit) http (\'<![CDATA[\', ses);\n"
-"http_value (sql_val, 0, ses);\n"
+"http_value (__rdf_strsqlval (sql_val), 0, ses);\n"
"if (is_xml_lit) http (\']]>\', ses);\n"
"http (\'</literal></binding>\', ses);\n"
"}\n"
@@ -14885,20 +16854,20 @@ static const char *proc367 =
"\n"
"http (\'\\n </result>\', ses);\n"
"}\n"
-"--src sparql_io.sql:727\n";
+"--src sparql_io.sql:992\n";
-static const char *proc368 =
-"#line 827 \"[executable]/sparql_io.sql\"\n"
+static const char *proc410 =
+"#line 1092 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_NS (inout ses any)\n"
"{\n"
"http (\'<rdf:RDF xmlns:res=\"http://www.w3.org/2005/sparql-results#\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n"
"<rdf:Description rdf:nodeID=\"rset\">\n"
"<rdf:type rdf:resource=\"http://www.w3.org/2005/sparql-results#ResultSet\" />\', ses);\n"
"}\n"
-"--src sparql_io.sql:825\n";
+"--src sparql_io.sql:1090\n";
-static const char *proc369 =
-"#line 835 \"[executable]/sparql_io.sql\"\n"
+static const char *proc411 =
+"#line 1100 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_HEAD (inout ses any, in mdta any)\n"
"{\n"
"declare i, col_count integer;\n"
@@ -14918,10 +16887,10 @@ static const char *proc369 =
"i := i + 1;\n"
"}\n"
"}\n"
-"--src sparql_io.sql:833\n";
+"--src sparql_io.sql:1098\n";
-static const char *proc370 =
-"#line 856 \"[executable]/sparql_io.sql\"\n"
+static const char *proc412 =
+"#line 1121 \"[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"
"for (declare ctr integer, ctr := 0; ctr < length (dta); ctr := ctr + 1)\n"
@@ -14931,10 +16900,10 @@ static const char *proc370 =
"http (\'\\n </res:solution>\', ses);\n"
"}\n"
"}\n"
-"--src sparql_io.sql:854\n";
+"--src sparql_io.sql:1119\n";
-static const char *proc371 =
-"#line 867 \"[executable]/sparql_io.sql\"\n"
+static const char *proc413 =
+"#line 1132 \"[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"
"mdta := mdta[0];\n"
@@ -15012,27 +16981,27 @@ static const char *proc371 =
"_val := __rdf_sqlval_of_obj (_val, 1);\n"
"if (__tag (_val) = __tag of varchar)\n"
"_val := charset_recode (_val, \'UTF-8\', \'_WIDE_\');\n"
-"http_value (_val, 0, ses);\n"
+"http_value (__rdf_strsqlval (_val), 0, ses);\n"
"}\n"
"http (\'</res:value></res:binding>\', ses);\n"
"}\n"
"end_of_binding: ;\n"
"}\n"
"}\n"
-"--src sparql_io.sql:865\n";
+"--src sparql_io.sql:1130\n";
-static const char *proc372 =
-"#line 953 \"[executable]/sparql_io.sql\"\n"
+static const char *proc414 =
+"#line 1218 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_TTL_WRITE_NS (inout ses any)\n"
"{\n"
"http (\'@prefix res: <http://www.w3.org/2005/sparql-results#> .\n"
"@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n"
"_:_ a res:ResultSet .\\n\', ses);\n"
"}\n"
-"--src sparql_io.sql:951\n";
+"--src sparql_io.sql:1216\n";
-static const char *proc373 =
-"#line 961 \"[executable]/sparql_io.sql\"\n"
+static const char *proc415 =
+"#line 1226 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_TTL_WRITE_HEAD (inout ses any, in mdta any)\n"
"{\n"
"declare i, col_count integer;\n"
@@ -15058,10 +17027,10 @@ static const char *proc373 =
"}\n"
"http (\'\" .\\n\', ses);\n"
"}\n"
-"--src sparql_io.sql:959\n";
+"--src sparql_io.sql:1224\n";
-static const char *proc374 =
-"#line 988 \"[executable]/sparql_io.sql\"\n"
+static const char *proc416 =
+"#line 1253 \"[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"
"declare colctr, colcount, rowctr, len, fake_agg_ctx integer;\n"
@@ -15085,18 +17054,18 @@ static const char *proc374 =
"rowctr := rowctr + 1;\n"
"}\n"
"}\n"
-"--src sparql_io.sql:986\n";
+"--src sparql_io.sql:1251\n";
-static const char *proc375 =
-"#line 1013 \"[executable]/sparql_io.sql\"\n"
+static const char *proc417 =
+"#line 1278 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_NT_WRITE_NS (inout ses any)\n"
"{\n"
"http (\'_:ResultSet2053 rdf:type <http://www.w3.org/1999/02/22-rdf-syntax-ns#res:ResultSet> .\\n\', ses);\n"
"}\n"
-"--src sparql_io.sql:1011\n";
+"--src sparql_io.sql:1276\n";
-static const char *proc376 =
-"#line 1019 \"[executable]/sparql_io.sql\"\n"
+static const char *proc418 =
+"#line 1284 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_NT_WRITE_HEAD (inout ses any, in mdta any)\n"
"{\n"
"declare i, col_count integer;\n"
@@ -15118,10 +17087,10 @@ static const char *proc376 =
"i := i + 1;\n"
"}\n"
"}\n"
-"--src sparql_io.sql:1017\n";
+"--src sparql_io.sql:1282\n";
-static const char *proc377 =
-"#line 1042 \"[executable]/sparql_io.sql\"\n"
+static const char *proc419 =
+"#line 1307 \"[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"
"declare colctr, colcount, rowctr, len, fake_agg_ctx integer;\n"
@@ -15145,10 +17114,10 @@ static const char *proc377 =
"rowctr := rowctr + 1;\n"
"}\n"
"}\n"
-"--src sparql_io.sql:1040\n";
+"--src sparql_io.sql:1305\n";
-static const char *proc378 =
-"#line 1067 \"[executable]/sparql_io.sql\"\n"
+static const char *proc420 =
+"#line 1332 \"[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"
"declare varctr, varcount, resctr, rescount integer;\n"
@@ -15232,10 +17201,10 @@ static const char *proc378 =
"}\n"
"http (trnewline || \'</table>\', ses);\n"
"}\n"
-"--src sparql_io.sql:1065\n";
+"--src sparql_io.sql:1330\n";
-static const char *proc379 =
-"#line 1152 \"[executable]/sparql_io.sql\"\n"
+static const char *proc421 =
+"#line 1417 \"[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"
"http(\' \"\', ses);\n"
@@ -15328,10 +17297,10 @@ static const char *proc379 =
"}\n"
"http (\'\" }\', ses);\n"
"}\n"
-"--src sparql_io.sql:1150\n";
+"--src sparql_io.sql:1415\n";
-static const char *proc380 =
-"#line 1246 \"[executable]/sparql_io.sql\"\n"
+static const char *proc422 =
+"#line 1511 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_JSON_WRITE (inout ses any, inout metas any, inout rset any)\n"
"{\n"
"declare varctr, varcount, resctr, rescount integer;\n"
@@ -15373,10 +17342,10 @@ static const char *proc380 =
"}\n"
"http (\' ] } }\', ses);\n"
"}\n"
-"--src sparql_io.sql:1244\n";
+"--src sparql_io.sql:1509\n";
-static const char *proc381 =
-"#line 1289 \"[executable]/sparql_io.sql\"\n"
+static const char *proc423 =
+"#line 1554 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_CSV_WRITE (inout ses any, inout metas any, inout rset any)\n"
"{\n"
"declare varctr, varcount, resctr, rescount integer;\n"
@@ -15403,10 +17372,40 @@ static const char *proc381 =
"http(\'\\n\', ses);\n"
"}\n"
"}\n"
-"--src sparql_io.sql:1287\n";
+"--src sparql_io.sql:1552\n";
-static const char *proc382 =
-"#line 1318 \"[executable]/sparql_io.sql\"\n"
+static const char *proc424 =
+"#line 1582 \"[executable]/sparql_io.sql\"\n"
+"create procedure DB.DBA.SPARQL_RESULTS_TSV_WRITE (inout ses any, inout metas any, inout rset any)\n"
+"{\n"
+"declare varctr, varcount, resctr, rescount integer;\n"
+"varcount := length (metas[0]);\n"
+"rescount := length (rset);\n"
+"for (varctr := 0; varctr < varcount; varctr := varctr + 1)\n"
+"{\n"
+"if (varctr > 0)\n"
+"http(\'\\t\', ses);\n"
+"DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, metas[0][varctr][0]);\n"
+"}\n"
+"http (\'\\n\', ses);\n"
+"for (resctr := 0; resctr < rescount; resctr := resctr + 1)\n"
+"{\n"
+"for (varctr := 0; varctr < varcount; varctr := varctr + 1)\n"
+"{\n"
+"declare val any;\n"
+"val := rset[resctr][varctr];\n"
+"if (varctr > 0)\n"
+"http(\'\\t\', ses);\n"
+"if (val is not null)\n"
+"DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, val);\n"
+"}\n"
+"http(\'\\n\', ses);\n"
+"}\n"
+"}\n"
+"--src sparql_io.sql:1580\n";
+
+static const char *proc425 =
+"#line 1611 \"[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"
"declare singlefield varchar;\n"
@@ -15450,7 +17449,7 @@ static const char *proc382 =
"http (\'@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\\n at prefix rs: <http://www.w3.org/2005/sparql-results#> .\\n\', ses);\n"
"http (sprintf (\'[] rdf:type rs:results ; rs:boolean %s .\', case (length (rset)) when 0 then \'false\' else \'true\' end), ses);\n"
"}\n"
-"else if (ret_format = \'CSV\')\n"
+"else if (ret_format = \'CSV\' or ret_format = \'TSV\')\n"
"{\n"
"http (sprintf (\'\"bool\"\\n%d\\n\', case (length (rset)) when 0 then 0 else 1 end), ses);\n"
"}\n"
@@ -15476,6 +17475,8 @@ static const char *proc382 =
"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"
@@ -15486,6 +17487,16 @@ static const char *proc382 =
"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"
@@ -15503,6 +17514,8 @@ static const char *proc382 =
"DB.DBA.RDF_TRIPLES_TO_CXML (triples, ses, accept, add_http_headers, 1, status);\n"
"else if (ret_format = \'CSV\')\n"
"DB.DBA.RDF_TRIPLES_TO_CSV (triples, ses);\n"
+"else if (ret_format = \'TSV\')\n"
+"DB.DBA.RDF_TRIPLES_TO_TSV (triples, ses);\n"
"else if (ret_format = \'SOAP\')\n"
"{\n"
"declare soap_ns, spt_ns varchar;\n"
@@ -15644,6 +17657,12 @@ static const char *proc382 =
"DB.DBA.SPARQL_RESULTS_CSV_WRITE (ses, metas, rset);\n"
"goto body_complete;\n"
"}\n"
+"if (ret_format = \'TSV\')\n"
+"{\n"
+"ret_mime := \'text/tab-separated-values\';\n"
+"DB.DBA.SPARQL_RESULTS_TSV_WRITE (ses, metas, rset);\n"
+"goto body_complete;\n"
+"}\n"
"ret_mime := \'application/sparql-results+xml\';\n"
"SPARQL_RSET_XML_WRITE_NS (ses);\n"
"SPARQL_RESULTS_XML_WRITE_HEAD (ses, metas);\n"
@@ -15651,57 +17670,113 @@ static const char *proc382 =
"http (\'\\n</sparql>\', ses);\n"
"\n"
"body_complete:\n"
-"if (add_http_headers)\n"
+"if (add_http_headers and strcasestr (http_header_get (), \'Content-Type:\') is null)\n"
"http_header (coalesce (http_header_get (), \'\') || \'Content-Type: \' || ret_mime || \'; charset=UTF-8\\r\\n\');\n"
"return ret_mime;\n"
"}\n"
-"--src sparql_io.sql:1316\n";
+"--src sparql_io.sql:1609\n";
-static const char *proc383 =
-"#line 1572 \"[executable]/sparql_io.sql\"\n"
+static const char *proc426 =
+"#line 1884 \"[executable]/sparql_io.sql\"\n"
+"create procedure WS.WS.SPARQL_ENDPOINT_SVC_DESC ()\n"
+"{\n"
+"declare ses any;\n"
+"ses := string_output ();\n"
+"http (\' <div xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\\n\', ses);\n"
+"http (\' xmlns:rdfs=\"http://www.w3.org/2000/01/rdf-schema#\"\\n\', ses);\n"
+"http (\' xmlns=\"http://www.w3.org/1999/xhtml\"\\n\', ses);\n"
+"http (\' xmlns:sd=\"http://www.w3.org/ns/sparql-service-description#\"\\n\', ses);\n"
+"http (\' xmlns:xsd=\"http://www.w3.org/2001/XMLSchema#\"\\n\', ses);\n"
+"http (\' style=\"display:none\">\\n\', ses);\n"
+"http (\' <div class=\"description\" about=\"\" typeof=\"sd:Service\">\\n\', ses);\n"
+"http (sprintf (\' <div rel=\"sd:endpoint\" resource=\"http://%{WSHost}s/sparql\"/>\\n\', ses), ses);\n"
+"http (\' <div rel=\"sd:feature\"\\n\', ses);\n"
+"http (\' resource=\"http://www.w3.org/ns/sparql-service-description#UnionDefaultGraph\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:feature\"\\n\', ses);\n"
+"http (\' resource=\"http://www.w3.org/ns/sparql-service-description#DereferencesURIs\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:resultFormat\" resource=\"http://www.w3.org/ns/formats/RDF_XML\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:resultFormat\" resource=\"http://www.w3.org/ns/formats/Turtle\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:resultFormat\"\\n\', ses);\n"
+"http (\' resource=\"http://www.w3.org/ns/formats/SPARQL_Results_CSV\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:resultFormat\" resource=\"http://www.w3.org/ns/formats/N-Triples\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:resultFormat\" resource=\"http://www.w3.org/ns/formats/N3\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:resultFormat\"\\n\', ses);\n"
+"http (\' resource=\"http://www.w3.org/ns/formats/SPARQL_Results_JSON\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:resultFormat\" resource=\"http://www.w3.org/ns/formats/RDFa\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:resultFormat\"\\n\', ses);\n"
+"http (\' resource=\"http://www.w3.org/ns/formats/SPARQL_Results_XML\"/>\\n\', ses);\n"
+"http (\' <div rel=\"sd:supportedLanguage\"\\n\', ses);\n"
+"http (\' resource=\"http://www.w3.org/ns/sparql-service-description#SPARQL10Query\"/>\\n\', ses);\n"
+"http (sprintf (\' <div rel=\"sd:url\" resource=\"http://%{WSHost}s/sparql\"/>\\n\', ses), ses);\n"
+"http (\' </div>\\n\', ses);\n"
+"http (\' </div>\\n\', ses);\n"
+"return ses;\n"
+"}\n"
+"--src sparql_io.sql:1882\n";
+
+static const char *proc427 =
+"#line 1921 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_VHOST_RESET ()\n"
"{\n"
+"declare gr varchar;\n"
+"declare oopts any;\n"
+"oopts := null;\n"
"if (not exists (select 1 from \"DB\".\"DBA\".\"SYS_USERS\" where U_NAME = \'SPARQL\'))\n"
"{\n"
"DB.DBA.USER_CREATE (\'SPARQL\', uuid(), vector (\'DISABLED\', 1, \'LOGIN_QUALIFIER\', \'SPARQL\'));\n"
"DB.DBA.EXEC_STMT (\'grant SPARQL_SELECT to \"SPARQL\"\', 0);\n"
"}\n"
-"if (registry_get (\'__SPARQL_VHOST_RESET\') >= \'20110703\')\n"
+"if (registry_get (\'__SPARQL_VHOST_RESET\') >= \'20120519\')\n"
"return;\n"
"DB.DBA.VHOST_REMOVE (lpath=>\'/SPARQL\');\n"
+"DB.DBA.VHOST_REMOVE (lpath=>\'/services/sparql-query\');\n"
+"oopts := (select deserialize (HP_OPTIONS) from HTTP_PATH \n"
+"where HP_PPATH = \'/!sparql/\' and HP_LPATH = \'/sparql\' and HP_HOST = \'*ini*\' and HP_LISTEN_HOST = \'*ini*\');\n"
+"if (oopts is null) oopts := vector (\'noinherit\', 1);\n"
"DB.DBA.VHOST_REMOVE (lpath=>\'/sparql\');\n"
-"DB.DBA.VHOST_REMOVE (lpath=>\'/sparql-auth\');\n"
+"DB.DBA.VHOST_DEFINE (lpath=>\'/sparql/\', ppath => \'/!sparql/\', is_dav => 1, vsp_user => \'dba\', opts => oopts);\n"
+"oopts := (select deserialize (HP_OPTIONS) from HTTP_PATH \n"
+"where HP_PPATH = \'/!sparql-graph-crud/\' and HP_LPATH = \'/sparql-graph-crud\' and HP_HOST = \'*ini*\' and HP_LISTEN_HOST = \'*ini*\');\n"
+"if (oopts is null) oopts := vector (\'noinherit\', 1, \'exec_as_get\', 1);\n"
"DB.DBA.VHOST_REMOVE (lpath=>\'/sparql-graph-crud\');\n"
-"DB.DBA.VHOST_REMOVE (lpath=>\'/sparql-graph-crud-auth\');\n"
-"DB.DBA.VHOST_REMOVE (lpath=>\'/services/sparql-query\');\n"
-"DB.DBA.VHOST_DEFINE (lpath=>\'/sparql/\', ppath => \'/!sparql/\', is_dav => 1, vsp_user => \'dba\', opts => vector(\'noinherit\', 1));\n"
-"DB.DBA.VHOST_DEFINE (lpath=>\'/sparql-graph-crud/\', ppath => \'/!sparql-graph-crud/\', is_dav => 1, vsp_user => \'dba\', opts => vector(\'noinherit\', 1, \'exec_as_get\', 1));\n"
+"DB.DBA.VHOST_DEFINE (lpath=>\'/sparql-graph-crud/\', ppath => \'/!sparql-graph-crud/\', is_dav => 1, vsp_user => \'dba\', opts => oopts);\n"
+"oopts := (select deserialize (HP_OPTIONS) from HTTP_PATH \n"
+"where HP_PPATH = \'/!sparql/\' and HP_LPATH = \'/sparql-auth\' and HP_HOST = \'*ini*\' and HP_LISTEN_HOST = \'*ini*\');\n"
+"if (oopts is null) oopts := vector (\'noinherit\', 1);\n"
"DB.DBA.VHOST_REMOVE (lpath=>\'/sparql-auth\');\n"
"DB.DBA.VHOST_DEFINE (lpath=>\'/sparql-auth\',\n"
"ppath => \'/!sparql/\',\n"
"is_dav => 1,\n"
"vsp_user => \'dba\',\n"
-"opts => vector(\'noinherit\', 1),\n"
+"opts => oopts,\n"
"auth_fn=>\'DB.DBA.HP_AUTH_SPARQL_USER\',\n"
"realm=>\'SPARQL\',\n"
"sec=>\'digest\');\n"
+"oopts := (select deserialize (HP_OPTIONS) from HTTP_PATH \n"
+"where HP_PPATH = \'/!sparql-graph-crud/\' and HP_LPATH = \'/sparql-graph-crud-auth\' and HP_HOST = \'*ini*\' and HP_LISTEN_HOST = \'*ini*\');\n"
+"if (oopts is null) oopts := vector (\'noinherit\', 1, \'exec_as_get\', 1);\n"
+"DB.DBA.VHOST_REMOVE (lpath=>\'/sparql-graph-crud-auth\');\n"
"DB.DBA.VHOST_DEFINE (lpath=>\'/sparql-graph-crud-auth\',\n"
"ppath => \'/!sparql-graph-crud/\',\n"
"is_dav => 1,\n"
"vsp_user => \'dba\',\n"
-"opts => vector(\'noinherit\', 1, \'exec_as_get\', 1),\n"
+"opts => oopts,\n"
"auth_fn=>\'DB.DBA.HP_AUTH_SPARQL_USER\',\n"
"realm=>\'SPARQL\',\n"
"sec=>\'digest\');\n"
"\n"
"\n"
"\n"
-"registry_set (\'__SPARQL_VHOST_RESET\', \'20110703\');\n"
+"DB.DBA.VHOST_REMOVE (lpath=>\'/sparql-sd\');\n"
+"DB.DBA.VHOST_DEFINE (lpath=>\'/sparql-sd/\', ppath => \'/!sparql-sd/\', is_dav => 1, vsp_user => \'dba\', opts => vector(\'noinherit\', 1));\n"
+"gr := concat (\'http://\', registry_get (\'URIQADefaultHost\'), \'/sparql\');\n"
+"DB.DBA.RDF_LOAD_RDFA (WS.WS.SPARQL_ENDPOINT_SVC_DESC (), gr, gr);\n"
+"registry_set (\'__SPARQL_VHOST_RESET\', \'20120519\');\n"
"}\n"
-"--src sparql_io.sql:1570\n";
+"--src sparql_io.sql:1919\n";
-static const char *proc384 =
-"#line 1616 \"[executable]/sparql_io.sql\"\n"
+static const char *proc428 =
+"#line 1983 \"[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"
@@ -15748,10 +17823,10 @@ static const char *proc384 =
"http (query);\n"
"}\n"
"}\n"
-"--src sparql_io.sql:1614\n";
+"--src sparql_io.sql:1981\n";
-static const char *proc385 =
-"#line 1664 \"[executable]/sparql_io.sql\"\n"
+static const char *proc429 =
+"#line 2031 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_WSDL11 (in lines any)\n"
"{\n"
"declare host any;\n"
@@ -15769,10 +17844,10 @@ static const char *proc385 =
"</service>\n"
"</definitions>\', host));\n"
"}\n"
-"--src sparql_io.sql:1662\n";
+"--src sparql_io.sql:2029\n";
-static const char *proc386 =
-"#line 1683 \"[executable]/sparql_io.sql\"\n"
+static const char *proc430 =
+"#line 2050 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_WSDL (in lines any)\n"
"{\n"
"declare host any;\n"
@@ -15787,10 +17862,10 @@ static const char *proc386 =
"</service>\n"
"</description>\', host));\n"
"}\n"
-"--src sparql_io.sql:1681\n";
+"--src sparql_io.sql:2048\n";
-static const char *proc387 =
-"#line 1699 \"[executable]/sparql_io.sql\"\n"
+static const char *proc431 =
+"#line 2066 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_SOAP_NS (in ver int)\n"
"{\n"
"if (ver = 11)\n"
@@ -15800,18 +17875,18 @@ static const char *proc387 =
"else\n"
"signal (\'42000\', \'Un-supported SOAP version\');\n"
"}\n"
-"--src sparql_io.sql:1697\n";
+"--src sparql_io.sql:2064\n";
-static const char *proc388 =
-"#line 1710 \"[executable]/sparql_io.sql\"\n"
+static const char *proc432 =
+"#line 2077 \"[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:1708\n";
+"--src sparql_io.sql:2075\n";
-static const char *proc389 =
-"#line 1717 \"[executable]/sparql_io.sql\"\n"
+static const char *proc433 =
+"#line 2084 \"[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"
@@ -15859,20 +17934,20 @@ static const char *proc389 =
"vectorbld_final (res);\n"
"return res;\n"
"}\n"
-"--src sparql_io.sql:1715\n";
+"--src sparql_io.sql:2082\n";
-static const char *proc390 =
-"#line 1766 \"[executable]/sparql_io.sql\"\n"
+static const char *proc434 =
+"#line 2133 \"[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:1764\n";
+"--src sparql_io.sql:2131\n";
-static const char *other42 =
+static const char *other45 =
"grant execute on DB.DBA.rdf_find_str to public\n";
-static const char *proc391 =
-"#line 1776 \"[executable]/sparql_io.sql\"\n"
+static const char *proc435 =
+"#line 2143 \"[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"
@@ -15882,10 +17957,10 @@ static const char *proc391 =
"http(\' xml:lang=\"en\"\\n\');\n"
"http(\'>\\n\');\n"
"}\n"
-"--src sparql_io.sql:1774\n";
+"--src sparql_io.sql:2141\n";
-static const char *proc392 =
-"#line 1788 \"[executable]/sparql_io.sql\"\n"
+static const char *proc436 =
+"#line 2155 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_HTML_HEAD(in title varchar)\n"
"{\n"
"http(\' <title>\' || title || \'</title>\\n\');\n"
@@ -15893,10 +17968,10 @@ static const char *proc392 =
"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:1786\n";
+"--src sparql_io.sql:2153\n";
-static const char *proc393 =
-"#line 1798 \"[executable]/sparql_io.sql\"\n"
+static const char *proc437 =
+"#line 2165 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_STYLE ()\n"
"{\n"
"http(\'\\n\');\n"
@@ -16010,10 +18085,10 @@ static const char *proc393 =
"</style>\n"
"\');\n"
"}\n"
-"--src sparql_io.sql:1796\n";
+"--src sparql_io.sql:2163\n";
-static const char *proc394 =
-"#line 1914 \"[executable]/sparql_io.sql\"\n"
+static const char *proc438 =
+"#line 2281 \"[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"
@@ -16036,14 +18111,18 @@ static const char *proc394 =
"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+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"
+"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(\\\'TSV\\\',\\\'text/tab-separated-values\\\');\\n\');\n"
+"http(\' format.options[15] = new Option(\\\'TriG\\\',\\\'application/x-trig\\\');\\n\');\n"
"if (can_cxml)\n"
"{\n"
-"http(\' format.options[12] = new Option(\\\'CXML (Pivot Collection)\\\',\\\'text/cxml\\\');\\n\');\n"
+"http(\' format.options[15] = new Option(\\\'CXML (Pivot Collection)\\\',\\\'text/cxml\\\');\\n\');\n"
"if (can_qrcode)\n"
-"http(\' format.options[13] = new Option(\\\'CXML (Pivot Collection with QRcodes)\\\',\\\'text/cxml+qrcode\\\');\\n\');\n"
+"http(\' format.options[16] = 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"
@@ -16061,8 +18140,9 @@ static const char *proc394 =
"http(\' format.options[7] = new Option(\\\'RDF/XML\\\',\\\'application/rdf+xml\\\');\\n\');\n"
"http(\' format.options[8] = new Option(\\\'N-Triples\\\',\\\'text/plain\\\');\\n\');\n"
"http(\' format.options[9] = new Option(\\\'CSV\\\',\\\'text/csv\\\');\\n\');\n"
+"http(\' format.options[10] = new Option(\\\'TSV\\\',\\\'text/tab-separated-values\\\');\\n\');\n"
"if (can_cxml)\n"
-"http(\' format.options[10] = new Option(\\\'CXML (Pivot Collection)\\\',\\\'text/cxml\\\');\\n\');\n"
+"http(\' format.options[11] = new Option(\\\'CXML (Pivot Collection)\\\',\\\'text/cxml\\\');\\n\');\n"
"http(\' format.selectedIndex = 1;\\n\');\n"
"http(\' last_format = 1;\\n\');\n"
"http(\' }\\n\');\n"
@@ -16104,10 +18184,10 @@ static const char *proc394 =
"http(\' /*]]>*/\\n\');\n"
"http(\' </script>\\n\');\n"
"}\n"
-"--src sparql_io.sql:1912\n";
+"--src sparql_io.sql:2279\n";
-static const char *proc395 =
-"#line 2007 \"[executable]/sparql_io.sql\"\n"
+static const char *proc439 =
+"#line 2379 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_FOOTER()\n"
"{\n"
"http(\' <div id=\"footer\">\\n\');\n"
@@ -16119,10 +18199,10 @@ static const char *proc395 =
"http(sprintf(\'Cluster Edition (%d server processes)\\n\', sys_stat(\'cl_n_hosts\')));\n"
"http(\' </div>\\n\');\n"
"}\n"
-"--src sparql_io.sql:2005\n";
+"--src sparql_io.sql:2377\n";
-static const char *proc396 =
-"#line 2021 \"[executable]/sparql_io.sql\"\n"
+static const char *proc440 =
+"#line 2393 \"[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"
@@ -16133,16 +18213,16 @@ static const char *proc396 =
"{\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"
@@ -16154,49 +18234,53 @@ static const char *proc396 =
")\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\', \'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"
+"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 (\'text/tab-separated-values\' , \'TSV\' ),\n"
+"vector (\'application/x-trig\' , \'TriG\' ) );\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"
-");\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"
"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"
+"http(\' <option value=\"text/tab-separated-values\">TSV</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:2019\n";
+"--src sparql_io.sql:2391\n";
-static const char *proc397 =
-"#line 2093 \"[executable]/sparql_io.sql\"\n"
+static const char *proc441 =
+"#line 2469 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_SPONGE_OPTS (in params varchar)\n"
"{\n"
"declare s_param varchar;\n"
@@ -16217,10 +18301,10 @@ static const char *proc397 =
"x[0], case when s_param = x[0] then \'selected=\"selected\"\' else \'\' end , x[1]));\n"
"}\n"
"}\n"
-"--src sparql_io.sql:2091\n";
+"--src sparql_io.sql:2467\n";
-static const char *proc398 =
-"#line 2116 \"[executable]/sparql_io.sql\"\n"
+static const char *proc442 =
+"#line 2492 \"[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"
@@ -16264,10 +18348,10 @@ static const char *proc398 =
"\n"
"http (\' </select><br />\\n\');\n"
"}\n"
-"--src sparql_io.sql:2114\n";
+"--src sparql_io.sql:2490\n";
-static const char *proc399 =
-"#line 2162 \"[executable]/sparql_io.sql\"\n"
+static const char *proc443 =
+"#line 2538 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.sparql_predefined_nsdecl ()\n"
"{\n"
"declare label varchar;\n"
@@ -16300,13 +18384,13 @@ static const char *proc399 =
"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:2160\n";
+"--src sparql_io.sql:2536\n";
-static const char *proc400 =
-"#line 2200 \"[executable]/sparql_io.sql\"\n"
+static const char *proc444 =
+"#line 2576 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.sparql_predefined_rdfinf ()\n"
"{\n"
"declare label varchar;\n"
@@ -16339,13 +18423,13 @@ static const char *proc400 =
"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:2198\n";
+"--src sparql_io.sql:2574\n";
-static const char *proc401 =
-"#line 2237 \"[executable]/sparql_io.sql\"\n"
+static const char *proc445 =
+"#line 2613 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_GENERATE_FORM(\n"
"in params any,\n"
"in ini_dflt_graph varchar,\n"
@@ -16506,15 +18590,16 @@ static const char *proc401 =
"http(\' </form>\\n\');\n"
"http(\' </div>\\n\\n\');\n"
"WS.WS.SPARQL_ENDPOINT_FOOTER();\n"
+"http (WS.WS.SPARQL_ENDPOINT_SVC_DESC ());\n"
"http(\'</body>\\n\');\n"
"http(\'</html>\\n\');\n"
"\n"
"return;\n"
"}\n"
-"--src sparql_io.sql:2235\n";
+"--src sparql_io.sql:2611\n";
-static const char *proc402 =
-"#line 2406 \"[executable]/sparql_io.sql\"\n"
+static const char *proc446 =
+"#line 2784 \"[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"
@@ -16576,6 +18661,7 @@ static const char *proc402 =
"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"
@@ -16671,7 +18757,7 @@ static const char *proc402 =
"(((2 = paramcount) and (\'Content\' = params[0])) and soap_ver = 0) or\n"
"qtxt = 1)\n"
"{\n"
-"declare redir varchar;\n"
+"declare redir, acc varchar;\n"
"redir := registry_get (\'WS.WS.SPARQL_DEFAULT_REDIRECT\');\n"
"if (isstring (redir))\n"
"{\n"
@@ -16686,10 +18772,22 @@ static const char *proc402 =
"def_qry := \'SELECT * WHERE {?s ?p ?o}\';\n"
"}\n"
"\n"
+"if (qtxt <> 1)\n"
+"{\n"
+"acc := DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (http_request_header_full (lines, \'Accept\', \'*/*\'));\n"
+"if (strstr (acc, \'/rdf+xml\') is not null or strstr (acc, \'text/n3\') is not null or strstr (acc, \'text/turtle\') is not null)\n"
+"{\n"
+"query := sprintf (\'construct { ?s ?p ?o } from <http://%s/sparql> { ?s ?p ?o }\', registry_get (\'URIQADefaultHost\'));\n"
+"accept := acc;\n"
+"goto execute_query;\n"
+"}\n"
+"}\n"
+"\n"
"WS.WS.SPARQL_ENDPOINT_GENERATE_FORM(params, ini_dflt_graph, def_qry, timeout, debug, save_mode, dav_refresh);\n"
"\n"
"return;\n"
"}\n"
+"execute_query:\n"
"qry_params := dict_new (7);\n"
"for (paramctr := 0; paramctr < paramcount; paramctr := paramctr + 2)\n"
"{\n"
@@ -17109,6 +19207,7 @@ static const char *proc402 =
"full_query, state, msg, format);\n"
"return;\n"
"}\n"
+"\n"
"write_results:\n"
"if (save_mode is not null)\n"
"{\n"
@@ -17323,20 +19422,20 @@ static const char *proc402 =
"http(\'</body>\\n\');\n"
"http(\'</html>\\n\');\n"
"}\n"
-"--src sparql_io.sql:2404\n";
+"--src sparql_io.sql:2782\n";
-static const char *other43 =
+static const char *other46 =
"registry_set (\'/!sparql/\', \'no_vsp_recompile\')\n";
-static const char *proc403 =
-"#line 3220 \"[executable]/sparql_io.sql\"\n"
+static const char *proc447 =
+"#line 3612 \"[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:3218\n";
+"--src sparql_io.sql:3610\n";
-static const char *proc404 =
-"#line 3227 \"[executable]/sparql_io.sql\"\n"
+static const char *proc448 =
+"#line 3619 \"[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"
@@ -17344,10 +19443,10 @@ static const char *proc404 =
"{\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:3225\n";
+"--src sparql_io.sql:3617\n";
-static const char *proc405 =
-"#line 3237 \"[executable]/sparql_io.sql\"\n"
+static const char *proc449 =
+"#line 3629 \"[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"
@@ -17355,10 +19454,10 @@ static const char *proc405 =
"{\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:3235\n";
+"--src sparql_io.sql:3627\n";
-static const char *proc406 =
-"#line 3247 \"[executable]/sparql_io.sql\"\n"
+static const char *proc450 =
+"#line 3639 \"[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"
@@ -17367,10 +19466,10 @@ static const char *proc406 =
"app_env[0] := DB.DBA.XML_URI_RESOLVE_LIKE_GET (base_uri, graph_uri);\n"
"signal (\'ok001\', \'\');\n"
"}\n"
-"--src sparql_io.sql:3245\n";
+"--src sparql_io.sql:3637\n";
-static const char *proc407 =
-"#line 3258 \"[executable]/sparql_io.sql\"\n"
+static const char *proc451 =
+"#line 3650 \"[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"
@@ -17392,10 +19491,10 @@ static const char *proc407 =
"done:\n"
"return app_env[0];\n"
"}\n"
-"--src sparql_io.sql:3256\n";
+"--src sparql_io.sql:3648\n";
-static const char *proc408 =
-"#line 3282 \"[executable]/sparql_io.sql\"\n"
+static const char *proc452 =
+"#line 3674 \"[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"
@@ -17416,10 +19515,10 @@ static const char *proc408 =
"done:\n"
"return app_env[0];\n"
"}\n"
-"--src sparql_io.sql:3280\n";
+"--src sparql_io.sql:3672\n";
-static const char *proc409 =
-"#line 3304 \"[executable]/sparql_io.sql\"\n"
+static const char *proc453 =
+"#line 3696 \"[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"
@@ -17468,36 +19567,36 @@ static const char *proc409 =
"\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(\' <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(\' <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"
@@ -17561,6 +19660,24 @@ static const char *proc409 =
"}\n"
"DB.DBA.RDF_LOAD_RDFXML (res_file, full_graph_uri, full_graph_uri);\n"
"}\n"
+"else if (res_content_type = \'text/microdata+html\')\n"
+"{\n"
+"if (reqbegin like \'PUT%\')\n"
+"{\n"
+"sparql clear graph ?:full_graph_uri;\n"
+"commit work;\n"
+"}\n"
+"DB.DBA.RDF_LOAD_XHTML_MICRODATA (res_file, full_graph_uri /* base */, full_graph_uri /* dest graph */);\n"
+"}\n"
+"else if (res_content_type = \'application/xhtml+xml\')\n"
+"{\n"
+"if (reqbegin like \'PUT%\')\n"
+"{\n"
+"sparql clear graph ?:full_graph_uri;\n"
+"commit work;\n"
+"}\n"
+"DB.DBA.RDF_LOAD_RDFA (res_file, full_graph_uri /* base */, full_graph_uri /* dest graph */);\n"
+"}\n"
"else\n"
"signal (\'22023\', \'The PUT request for graph <\' || full_graph_uri || \'> is rejected: the submitted resource is of unsupported type \' || coalesce (res_content_type, \'\'));\n"
"if (graph_exists is null)\n"
@@ -17601,12 +19718,12 @@ static const char *proc409 =
"return;\n"
"}\n"
"}\n"
-"--src sparql_io.sql:3302\n";
+"--src sparql_io.sql:3694\n";
-static const char *other44 =
+static const char *other47 =
"registry_set (\'/!sparql-graph-crud/\', \'no_vsp_recompile\')\n";
-static const char *proc410 =
-"#line 3491 \"[executable]/sparql_io.sql\"\n"
+static const char *proc454 =
+"#line 3901 \"[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"
@@ -17633,10 +19750,10 @@ static const char *proc410 =
"http (\')\', ses);\n"
"result (ses);\n"
"}\n"
-"--src sparql_io.sql:3489\n";
+"--src sparql_io.sql:3899\n";
-static const char *proc411 =
-"#line 3522 \"[executable]/sparql_io.sql\"\n"
+static const char *proc455 =
+"#line 3932 \"[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"
@@ -17645,10 +19762,10 @@ static const char *proc411 =
"return subseq (graph_iri, 17);\n"
"return NULL;\n"
"}\n"
-"--src sparql_io.sql:3520\n";
+"--src sparql_io.sql:3930\n";
-static const char *proc412 =
-"#line 3532 \"[executable]/sparql_io.sql\"\n"
+static const char *proc456 =
+"#line 3942 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV (\n"
"in graph_iri varchar,\n"
"in opname varchar,\n"
@@ -17722,7 +19839,9 @@ static const char *proc412 =
"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 (\'text/plain\' = mime)\n"
+"else if (\'application/x-trig\' = mime)\n"
+"DB.DBA.RDF_TRIPLES_TO_TRIG (triples, out_ses);\n"
+"else if (\'text/plain\' = mime or \'text/ntriples\' = 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"
"DB.DBA.RDF_TRIPLES_TO_TALIS_JSON (triples, out_ses);\n"
@@ -17732,7 +19851,7 @@ static const char *proc412 =
"DB.DBA.RDF_TRIPLES_TO_JSON_LD (triples, out_ses);\n"
"else if (\'application/xhtml+xml\' = mime)\n"
"DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML (triples, out_ses);\n"
-"else if (\'text/html\' = mime)\n"
+"else if ((\'text/html\' = mime) or (\'text/microdata+html\' = mime) or (\'text/md+html\' = mime))\n"
"DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (triples, out_ses);\n"
"else if (\'application/microdata+json\' = mime)\n"
"DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (triples, out_ses);\n"
@@ -17743,28 +19862,28 @@ static const char *proc412 =
"if (not isinteger (final_res))\n"
"return final_res;\n"
"}\n"
-"--src sparql_io.sql:3530\n";
+"--src sparql_io.sql:3940\n";
-static const char *proc413 =
-"#line 3629 \"[executable]/sparql_io.sql\"\n"
+static const char *proc457 =
+"#line 4041 \"[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:3627\n";
+"--src sparql_io.sql:4039\n";
-static const char *proc414 =
-"#line 3636 \"[executable]/sparql_io.sql\"\n"
+static const char *proc458 =
+"#line 4048 \"[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:3634\n";
+"--src sparql_io.sql:4046\n";
-static const char *proc415 =
-"#line 3643 \"[executable]/sparql_io.sql\"\n"
+static const char *proc459 =
+"#line 4055 \"[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"
@@ -17801,6 +19920,7 @@ static const char *proc415 =
"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"
@@ -17821,10 +19941,164 @@ static const char *proc415 =
"http (content);\n"
"return \'\';\n"
"}\n"
-"--src sparql_io.sql:3641\n";
+"--src sparql_io.sql:4053\n";
-static const char *proc416 =
-"#line 3701 \"[executable]/sparql_io.sql\"\n"
+static const char *proc460 =
+"#line 4114 \"[executable]/sparql_io.sql\"\n"
+"create procedure DB.DBA.SPARQL_SD_TRIPLE (inout sd any, in s varchar, in p varchar, in o varchar)\n"
+"{\n"
+"if (starts_with (s, \'!\')) s := __xml_nsexpand_iristr (subseq (s, 1)); else s := __box_flags_tweak (s, 1);\n"
+"if (starts_with (p, \'!\')) p := __xml_nsexpand_iristr (subseq (p, 1)); else p := __box_flags_tweak (p, 1);\n"
+"if (starts_with (o, \'!\')) o := __xml_nsexpand_iristr (subseq (o, 1)); else o := __box_flags_tweak (o, 1);\n"
+"vectorbld_acc (sd, vector (s, p, o));\n"
+"}\n"
+"--src sparql_io.sql:4112\n";
+
+static const char *proc461 =
+"#line 4123 \"[executable]/sparql_io.sql\"\n"
+"create procedure DB.DBA.SPARQL_SD_TRIPLE_L (inout sd any, in s varchar, in p varchar, in o any)\n"
+"{\n"
+"if (starts_with (s, \'!\')) s := __xml_nsexpand_iristr (subseq (s, 1)); else s := __box_flags_tweak (s, 1);\n"
+"if (starts_with (p, \'!\')) p := __xml_nsexpand_iristr (subseq (p, 1)); else p := __box_flags_tweak (p, 1);\n"
+"vectorbld_acc (sd, vector (s, p, o));\n"
+"}\n"
+"--src sparql_io.sql:4121\n";
+
+static const char *proc462 =
+"#line 4131 \"[executable]/sparql_io.sql\"\n"
+"create procedure DB.DBA.SPARQL_SD_COMPOSE (inout sd any, in host varchar, in complete integer)\n"
+"{\n"
+"declare service_iri varchar;\n"
+"service_iri := \'http://\' || host || \'/sparql-sd\';\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!rdf:type\', \'!sd:Service\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:endpoint\', \'http://\' || host || \'/sparql\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:endpoint\', \'http://\' || host || \'/sparql-auth\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!virtrdf:graph-crud-endpoint\', \'http://\' || host || \'/sparql-graph-crud\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!virtrdf:graph-crud-endpoint\', \'http://\' || host || \'/sparql-graph-crud-auth\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:feature\', \'!sd:UnionDefaultGraph\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:feature\', \'!sd:RequiresDataset\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:feature\', \'!sd:EmptyGraphs\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:feature\', \'!sd:BasicFederatedQuery\');\n"
+"\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'http://www.w3.org/ns/formats/N3\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'http://www.w3.org/ns/formats/N-triples\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'http://www.w3.org/ns/formats/RDFa\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'http://www.w3.org/ns/formats/RDF_XML\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'http://www.w3.org/ns/formats/SPARQL_Results_XML\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'http://www.w3.org/ns/formats/SPARQL_Results_JSON\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'http://www.w3.org/ns/formats/SPARQL_Results_CSV\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'http://www.w3.org/ns/formats/Turtle\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_SPARQL_Results_HTML\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_SPARQL_Results_Spreadsheet\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_SPARQL_Results_Javascript\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_SPARQL_Results_CXML\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_SPARQL_Results_CXML_QR\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_RDF_JSON\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_XHTML_RDFa\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_ATOM_XML\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_ODATA_JSON\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_HTML_list\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_HTML_table\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_HTML_Microdata\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_Microdata_JSON\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_CSV\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_CXML\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Triples_CXML_QR\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:resultFormat\', \'!virtrdf:FileFormat_Quads_TriG\');\n"
+"\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'http://www.w3.org/ns/formats/N3\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'http://www.w3.org/ns/formats/N-triples\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'http://www.w3.org/ns/formats/RDFa\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'http://www.w3.org/ns/formats/RDF_XML\');\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'!virtrdf:FileFormat_Triples_XHTML_RDFa\');\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'!virtrdf:FileFormat_Triples_CSV\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'!virtrdf:FileFormat_Triples_CXML\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'!virtrdf:FileFormat_Triples_CXML_QR\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:inputFormat\', \'!virtrdf:FileFormat_Quads_TriG\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:supportedLanguage\', \'!sd:SPARQL10Query\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:supportedLanguage\', \'!sd:SPARQL11Query\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:supportedLanguage\', \'!sd:SPARQL11Update\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_QUAD_MAP\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_OPTION\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_BREAKUP\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_PKSELFJOIN\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_RVR\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_IN\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_LIKE\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_GLOBALS\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_BI\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_VIRTSPECIFIC\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_SERVICE\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_TRANSIT\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:languageExtension\', \'!virtrdf:SSG_SD_SPARQL11_DRAFT\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:propertyFeature\', \'!bif:contains\');\n"
+"if (complete)\n"
+"{\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:extensionFunction\', \'!bif:abs\');\n"
+"DB.DBA.SPARQL_SD_TRIPLE (sd, service_iri, \'!sd:extensionAggregate\', \'!sql:STDDEV\');\n"
+"}\n"
+"}\n"
+"--src sparql_io.sql:4129\n";
+
+static const char *proc463 =
+"#line 4221 \"[executable]/sparql_io.sql\"\n"
+"create procedure WS.WS.\"/!sparql-sd/\" (inout path varchar, inout params any, inout lines any)\n"
+"{\n"
+"declare sd, ses any;\n"
+"declare service_iri varchar;\n"
+"declare host, accept, formatter varchar;\n"
+"host := http_request_header (lines, \'Host\', null, \'\');\n"
+"accept := http_request_header (lines, \'Accept\', null, \'\');\n"
+"\n"
+"if ((2 < length (params)) or (params[0] <> \'Content\'))\n"
+"{\n"
+"WS.WS.\"/!sparql/\" (path, params, lines);\n"
+"return;\n"
+"}\n"
+"vectorbld_init (sd);\n"
+"if (host is not null and host <> \'\')\n"
+"DB.DBA.SPARQL_SD_COMPOSE (sd, host, 1);\n"
+"if (isstring (registry_get (\'URIQADefaultHost\')))\n"
+"DB.DBA.SPARQL_SD_COMPOSE (sd, registry_get (\'URIQADefaultHost\'), 1);\n"
+"vectorbld_final (sd);\n"
+"ses := null;\n"
+"if (strstr (accept, \'text/rdf+n3\') is not null)\n"
+"{ http_header (\'Content-Type: text/rdf+n3; charset=UTF-8\\r\\n\'); DB.DBA.RDF_TRIPLES_TO_NT (sd, ses); }\n"
+"else if (strstr (accept, \'text/rdf+ttl\') is not null)\n"
+"{ http_header (\'Content-Type: text/rdf+ttl; charset=UTF-8\\r\\n\'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }\n"
+"else if (strstr (accept, \'text/rdf+turtle\') is not null)\n"
+"{ http_header (\'Content-Type: text/rdf+turtle; charset=UTF-8\\r\\n\'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }\n"
+"else if (strstr (accept, \'text/turtle\') is not null)\n"
+"{ http_header (\'Content-Type: text/turtle; charset=UTF-8\\r\\n\'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }\n"
+"else if (strstr (accept, \'application/turtle\') is not null)\n"
+"{ http_header (\'Content-Type: application/turtle; charset=UTF-8\\r\\n\'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }\n"
+"else if (strstr (accept, \'application/turtle\') is not null)\n"
+"{ http_header (\'Content-Type: application/x-turtle; charset=UTF-8\\r\\n\'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }\n"
+"else\n"
+"{ http_header (\'Content-Type: text/turtle; charset=UTF-8\\r\\n\'); DB.DBA.RDF_TRIPLES_TO_TTL (sd, ses); }\n"
+"}\n"
+"--src sparql_io.sql:4219\n";
+
+static const char *other48 =
+"registry_set (\'/!sparql-sd/\', \'no_vsp_recompile\')\n";
+static const char *proc464 =
+"#line 4261 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.RDF_GRANT_SPARQL_IO ()\n"
"{\n"
"declare state, msg varchar;\n"
@@ -17835,8 +20109,10 @@ static const char *proc416 =
"\'grant execute on DB.DBA.SPARQL_REXEC_WITH_META to SPARQL_SELECT\',\n"
"\'grant execute on WS.WS.\"/!sparql/\" to \"SPARQL\"\',\n"
"\'grant execute on WS.WS.\"/!sparql-graph-crud/\" to \"SPARQL\"\',\n"
+"\'grant execute on WS.WS.\"/!sparql-sd/\" to \"SPARQL\"\',\n"
"\'grant execute on DB.DBA.SPARQL_REFRESH_DYNARES_RESULTS to \"SPARQL\"\',\n"
"\'grant execute on DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV to SPARQL_UPDATE\',\n"
+"\'grant execute on DB.DBA.SPARQL_SD_PROBE to SPARQL_SPONGE\',\n"
"\'grant execute on DB.DBA.SPARQL_SINV_IMP to SPARQL_SPONGE\',\n"
"\'grant select on DB.DBA.SPARQL_SINV_2 to SPARQL_SPONGE\' );\n"
"foreach (varchar cmd in cmds) do\n"
@@ -17844,15 +20120,15 @@ static const char *proc416 =
"exec (cmd, state, msg);\n"
"}\n"
"}\n"
-"--src sparql_io.sql:3699\n";
+"--src sparql_io.sql:4259\n";
-static const char *other45 =
+static const char *other49 =
" DB.DBA.RDF_GRANT_SPARQL_IO ()\n";
/* rdf_sponge.sql */
-static const char *proc417 =
-"#line 28 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc465 =
+"#line 50 \"[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"
@@ -17885,10 +20161,10 @@ static const char *proc417 =
"}\n"
"\n"
"}\n"
-"--src rdf_sponge.sql:26\n";
+"--src rdf_sponge.sql:48\n";
-static const char *proc418 =
-"#line 62 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc466 =
+"#line 84 \"[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"
@@ -17923,7 +20199,7 @@ static const char *proc418 =
"\'get:error-recovery\', get_keyword_ucase (\'get:error-recovery\', env)\n"
");\n"
"dict_put (grabbed, url, 1);\n"
-"call (get_keyword (\'loader\', env))(url, opts);\n"
+"call (get_keyword (\'loader\', env))(url, opts, user);\n"
"commit work;\n"
"dict_put (grabbed, url, coalesce (final_dest, dest));\n"
"\n"
@@ -17956,20 +20232,20 @@ static const char *proc418 =
"}\n"
"return 0;\n"
"}\n"
-"--src rdf_sponge.sql:60\n";
+"--src rdf_sponge.sql:82\n";
-static const char *proc419 =
-"#line 131 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc467 =
+"#line 153 \"[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:129\n";
+"--src rdf_sponge.sql:151\n";
-static const char *proc420 =
-"#line 139 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc468 =
+"#line 161 \"[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"
@@ -18061,10 +20337,10 @@ static const char *proc420 =
"return 4;\n"
"return 2;\n"
"}\n"
-"--src rdf_sponge.sql:137\n";
+"--src rdf_sponge.sql:159\n";
-static const char *proc421 =
-"#line 232 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc469 =
+"#line 254 \"[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"
@@ -18174,10 +20450,10 @@ static const char *proc421 =
"for (rctr := 0; rctr < rcount; rctr := rctr + 1)\n"
"result (rset[rctr]);\n"
"}\n"
-"--src rdf_sponge.sql:230\n";
+"--src rdf_sponge.sql:252\n";
-static const char *proc422 =
-"#line 343 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc470 =
+"#line 365 \"[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"
@@ -18216,10 +20492,10 @@ static const char *proc422 =
"get_method := \'GET\';\n"
"\n"
"}\n"
-"--src rdf_sponge.sql:341\n";
+"--src rdf_sponge.sql:363\n";
-static const char *proc423 =
-"#line 388 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc471 =
+"#line 410 \"[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"
@@ -18237,10 +20513,10 @@ static const char *proc423 =
"signal (state, msg);\n"
"return rset;\n"
"}\n"
-"--src rdf_sponge.sql:386\n";
+"--src rdf_sponge.sql:408\n";
-static const char *proc424 =
-"#line 407 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc472 =
+"#line 429 \"[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"
@@ -18256,13 +20532,16 @@ static const char *proc424 =
"if (state <> \'00000\')\n"
"signal (state, msg);\n"
"\n"
+"if (metas is not null)\n"
+"{\n"
"exec_result_names (metas[0]);\n"
"foreach (any row in rset) do\n"
"{\n"
"exec_result (row);\n"
"}\n"
"}\n"
-"--src rdf_sponge.sql:405\n";
+"}\n"
+"--src rdf_sponge.sql:427\n";
static const char *tbl20 =
"create table DB.DBA.SYS_HTTP_SPONGE (\n"
@@ -18289,8 +20568,22 @@ 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 *proc425 =
-"#line 465 \"[executable]/rdf_sponge.sql\"\n"
+static const char *tbl21 =
+"create table DB.DBA.SYS_HTTP_SPONGE_REFRESH_DEFAULTS (\n"
+"HSRD_DATA_SOURCE_URI_PATTERN varchar not null,\n"
+"HSRD_DEFAULT_REFRESH_INTERVAL_SECS integer,\n"
+"primary key (HSRD_DATA_SOURCE_URI_PATTERN)\n"
+")\n";
+
+static const char *tbl22 =
+"create table RDF_WEBID_ACL_GROUPS (\n"
+"AG_WEBID varchar,\n"
+"AG_GROUP varchar,\n"
+"primary key (AG_WEBID, AG_GROUP)\n"
+")\n";
+
+static const char *proc473 =
+"#line 504 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.SYS_HTTP_SPONGE_GET_CACHE_PARAMS\n"
"(\n"
"in explicit_refresh any,\n"
@@ -18324,9 +20617,11 @@ static const char *proc425 =
"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\n"
-"http_request_header (ret_hdr, \'Cache-Control\', null, null) like \'no-cache%\' )\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"
"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"
@@ -18369,10 +20664,10 @@ static const char *proc425 =
"new_expiration := __min (new_expiration, dateadd (\'second\', explicit_refresh, now()));\n"
"}\n"
"}\n"
-"--src rdf_sponge.sql:463\n";
+"--src rdf_sponge.sql:502\n";
-static const char *proc426 =
-"#line 548 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc474 =
+"#line 589 \"[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"
@@ -18417,10 +20712,10 @@ static const char *proc426 =
"}\n"
"return 1;\n"
"}\n"
-"--src rdf_sponge.sql:546\n";
+"--src rdf_sponge.sql:587\n";
-static const char *proc427 =
-"#line 594 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc475 =
+"#line 635 \"[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"
@@ -18433,10 +20728,10 @@ static const char *proc427 =
"str := replace (str, \'\\n\\n\', \'\\n\');\n"
"return split_and_decode (str, 0, \'\\0\\0\\n\');\n"
"}\n"
-"--src rdf_sponge.sql:592\n";
+"--src rdf_sponge.sql:633\n";
-static const char *proc428 =
-"#line 608 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc476 =
+"#line 649 \"[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"
@@ -18447,28 +20742,39 @@ static const char *proc428 =
"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"
"declare get_proxy varchar;\n"
"declare ret_dt_date, ret_dt_last_modified, ret_dt_expires, expiration, min_expiration datetime;\n"
"declare ret_304_not_modified integer;\n"
-"declare parser_rc, max_refresh int;\n"
+"declare parser_rc, max_refresh, default_refresh int;\n"
"declare stat, msg varchar;\n"
"\n"
"\n"
"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"
-"if (max_refresh is not null)\n"
+"max_refresh := atoi (coalesce (virtuoso_ini_item_value (\'SPARQL\', \'MaxCacheExpiration\'), \'-1\'));\n"
+"default_refresh := (select HSRD_DEFAULT_REFRESH_INTERVAL_SECS from DB.DBA.SYS_HTTP_SPONGE_REFRESH_DEFAULTS where regexp_match (HSRD_DATA_SOURCE_URI_PATTERN, local_iri) is not null);\n"
+"if (default_refresh is not null)\n"
+"{\n"
+"if (default_refresh >= 0)\n"
"{\n"
-"max_refresh := atoi (max_refresh);\n"
"if (max_refresh >= 0)\n"
+"explicit_refresh := __min (default_refresh, max_refresh);\n"
+"else\n"
+"explicit_refresh := default_refresh;\n"
+"}\n"
+"else if (max_refresh >= 0)\n"
"explicit_refresh := max_refresh;\n"
"}\n"
+"else if (max_refresh >= 0)\n"
+"explicit_refresh := max_refresh;\n"
"}\n"
"else if (isstring (explicit_refresh))\n"
"explicit_refresh := atoi (explicit_refresh);\n"
@@ -18559,8 +20865,12 @@ static const char *proc428 =
"\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"
@@ -18574,7 +20884,7 @@ static const char *proc428 =
"\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: 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"
+"|| \'Accept: \' || acc_hdr;\n"
"\n"
"\n"
"{\n"
@@ -18629,7 +20939,7 @@ static const char *proc428 =
"}\n"
"goto resp_received;\n"
"}\n"
-"if (eraser is not null)\n"
+"if (eraser is not null and (get_soft <> \'add\'))\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"
@@ -18696,7 +21006,7 @@ static const char *proc428 =
"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)\n"
+"if (eraser is not null and (get_soft <> \'add\'))\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"
@@ -18764,33 +21074,38 @@ static const char *proc428 =
"signal (stat, msg);\n"
"return local_iri;\n"
"}\n"
-"--src rdf_sponge.sql:606\n";
+"--src rdf_sponge.sql:647\n";
-static const char *proc429 =
-"#line 939 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc477 =
+"#line 995 \"[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)\n"
+"if (eraser is not null and (get_soft <> \'add\'))\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:937\n";
+"--src rdf_sponge.sql:993\n";
-static const char *proc430 =
-"#line 961 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc478 =
+"#line 1022 \"[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"
@@ -18809,16 +21124,29 @@ static const char *proc430 =
"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"
+"ret_begin := subseq (ret_body, 0, 65535);\n"
"if (isstring_session (ret_begin))\n"
"ret_begin := string_output_string (ret_begin);\n"
"\n"
"ret_html := xtree_doc (ret_begin, 2);\n"
"\n"
-"if (xpath_eval (\'/html|/xhtml\', ret_html) is not null)\n"
+"if (xpath_eval (\'[xmlns:xh=\"http://www.w3.org/1999/xhtml\"] /html|/xhtml|/xh:html|/xh:xhtml\', ret_html) is not null)\n"
+"{\n"
+"if (xpath_eval (\'[xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\"] /*/@grddl:transformation\', ret_html) is not null)\n"
+"return \'text/html\';\n"
+"if (xpath_eval (\'/*/head/@profile\', ret_html) is not null)\n"
+"return \'text/html\';\n"
+"if (xpath_eval (\'//*[exists(@itemscope) or exists(@itemprop) or exists(@itemid) or exists(@itemtype)]\', ret_html) is not null)\n"
+"return \'text/microdata+html\';\n"
+"\n"
+"if (xpath_eval (\'//*[exists(@typeof) or exists(@about)]\', ret_html) is not null)\n"
+"return \'application/xhtml+xml\';\n"
"return \'text/html\';\n"
+"}\n"
"if (xpath_eval (\'[xmlns:rset=\"http://www.w3.org/2005/sparql-results#\"] /rset:sparql\', ret_html) is not null\n"
"or xpath_eval (\'[xmlns:rset2=\"http://www.w3.org/2001/sw/DataAccess/rf1/result2\"] /rset2:sparql\', ret_html) is not null)\n"
"return \'application/sparql-results+xml\';\n"
@@ -18854,9 +21182,9 @@ static const char *proc430 =
"}\n"
"return ret_content_type;\n"
"}\n"
-"--src rdf_sponge.sql:959\n";
+"--src rdf_sponge.sql:1020\n";
-static const char *tbl21 =
+static const char *tbl23 =
"create table DB.DBA.SYS_RDF_MAPPERS (\n"
"RM_ID integer identity,\n"
"RM_PATTERN varchar,\n"
@@ -18872,8 +21200,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 *proc431 =
-"#line 1077 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc479 =
+"#line 1151 \"[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"
@@ -18922,10 +21250,10 @@ static const char *proc431 =
"\n"
"return content;\n"
"}\n"
-"--src rdf_sponge.sql:1075\n";
+"--src rdf_sponge.sql:1149\n";
-static const char *proc432 =
-"#line 1128 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc480 =
+"#line 1202 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_SW_PING (in endp varchar, in url varchar)\n"
"{\n"
"declare rc any;\n"
@@ -18965,27 +21293,28 @@ static const char *proc432 =
"commit work;\n"
"return;\n"
"}\n"
-"--src rdf_sponge.sql:1126\n";
+"--src rdf_sponge.sql:1200\n";
-static const char *proc433 =
-"#line 1169 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc481 =
+"#line 1243 \"[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:1167\n";
+"--src rdf_sponge.sql:1241\n";
-static const char *proc434 =
-"#line 1177 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc482 =
+"#line 1251 \"[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, cset, base, first_stat, first_msg varchar;\n"
+"declare dest, groupdest, get_soft, 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 integer;\n"
+"declare saved_log_mode, only_rdfa, retr_count, rdf_fmt integer;\n"
"aq := null;\n"
+"rdf_fmt := 0;\n"
"ps := virtuoso_ini_item_value (\'SPARQL\', \'PingService\');\n"
"if (length (ps))\n"
"{\n"
@@ -18993,11 +21322,16 @@ static const char *proc434 =
"}\n"
"\n"
"\n"
+"declare l any;\n"
+"l := ret_body;\n"
+"if (length (l) > 3 and l[0] = 0hexEF and l[1] = 0hexBB and l[2] = 0hexBF)\n"
+"ret_body := subseq (ret_body, 3);\n"
"ret_content_type := DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE (new_origin_uri, ret_content_type, ret_body);\n"
"\n"
"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"
@@ -19006,17 +21340,24 @@ static const char *proc434 =
"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"
"\n"
-"whenever sqlstate \'*\' goto load_grddl;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"if (registry_get (\'__sparql_mappers_debug\') = \'1\')\n"
+"dbg_printf (\'%s: SQL_MESSAGE: %s\', current_proc_name(), __SQL_MESSAGE);\n"
+"goto load_grddl;\n"
+"};\n"
"\n"
"xt := xtree_doc (ret_body);\n"
"\n"
"if (xpath_eval (\'[ xmlns:dv=\"http://www.w3.org/2003/g/data-view#\" ] /*[1]/@dv:transformation\', xt) is not null)\n"
"goto load_grddl;\n"
"DB.DBA.RDF_LOAD_RDFXML (ret_body, base, coalesce (dest, graph_iri));\n"
+"rdf_fmt := 1;\n"
"if (groupdest is not null)\n"
"DB.DBA.RDF_LOAD_RDFXML (ret_body, base, groupdest);\n"
"if (exists (select 1 from DB.DBA.SYS_RDF_MAPPERS where RM_TYPE = \'URL\' and regexp_match (RM_PATTERN, new_origin_uri) and RM_ENABLED = 1))\n"
@@ -19037,13 +21378,20 @@ static const char *proc434 =
"strstr (ret_content_type, \'application/rdf+n3\') is not null or\n"
"strstr (ret_content_type, \'application/rdf+turtle\') is not null or\n"
"strstr (ret_content_type, \'application/turtle\') is not null or\n"
+"strstr (ret_content_type, \'application/n-triples\') is not null or\n"
"strstr (ret_content_type, \'application/x-turtle\') is not null )\n"
"{\n"
-"whenever sqlstate \'*\' goto load_grddl_after_error;\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"if (registry_get (\'__sparql_mappers_debug\') = \'1\')\n"
+"dbg_printf (\'%s: SQL_MESSAGE: %s\', current_proc_name(), __SQL_MESSAGE);\n"
+"goto load_grddl_after_error;\n"
+"};\n"
"\n"
"\n"
"\n"
"DB.DBA.TTLP (ret_body, base, coalesce (dest, graph_iri), 255);\n"
+"rdf_fmt := 1;\n"
"if (groupdest is not null)\n"
"DB.DBA.TTLP (ret_body, base, groupdest);\n"
"if (exists (select 1 from DB.DBA.SYS_RDF_MAPPERS where RM_TYPE = \'URL\' and regexp_match (RM_PATTERN, new_origin_uri) and RM_ENABLED = 1))\n"
@@ -19055,13 +21403,37 @@ static const char *proc434 =
"aq_request (aq, \'DB.DBA.RDF_SW_PING\', vector (ps, new_origin_uri));\n"
"return 1;\n"
"}\n"
-"else if (only_rdfa = 1 and strstr (ret_content_type, \'text/html\') is not null)\n"
+"else if (strstr (ret_content_type, \'text/microdata+html\') is not null)\n"
+"{\n"
+"declare exit handler for sqlstate \'*\'\n"
+"{\n"
+"if (registry_get (\'__sparql_mappers_debug\') = \'1\')\n"
+"dbg_printf (\'%s: SQL_MESSAGE: %s\', current_proc_name(), __SQL_MESSAGE);\n"
+"goto load_grddl;\n"
+"};\n"
+"\n"
+"DB.DBA.RDF_LOAD_XHTML_MICRODATA (ret_body, base, coalesce (dest, graph_iri));\n"
+"rdf_fmt := 1;\n"
+"if (groupdest is not null and groupdest <> coalesce (dest, graph_iri))\n"
+"DB.DBA.RDF_LOAD_XHTML_MICRODATA (ret_body, base, groupdest);\n"
+"\n"
+"if (aq is not null)\n"
+"aq_request (aq, \'DB.DBA.RDF_SW_PING\', vector (ps, new_origin_uri));\n"
+"return 1;\n"
+"}\n"
+"else if ((only_rdfa = 1 and strstr (ret_content_type, \'text/html\') is not null) or (strstr (ret_content_type, \'application/xhtml+xml\') is not null))\n"
+"{\n"
+"declare exit handler for sqlstate \'*\'\n"
"{\n"
-"whenever sqlstate \'*\' goto load_grddl;\n"
+"if (registry_get (\'__sparql_mappers_debug\') = \'1\')\n"
+"dbg_printf (\'%s: SQL_MESSAGE: %s\', current_proc_name(), __SQL_MESSAGE);\n"
+"goto load_grddl;\n"
+"};\n"
"\n"
-"DB.DBA.RDF_LOAD_RDFA (ret_body, base, coalesce (dest, graph_iri), 2);\n"
+"DB.DBA.RDF_LOAD_RDFA (ret_body, base, coalesce (dest, graph_iri));\n"
+"rdf_fmt := 1;\n"
"if (groupdest is not null and groupdest <> coalesce (dest, graph_iri))\n"
-"DB.DBA.RDF_LOAD_RDFA (ret_body, base, groupdest, 2);\n"
+"DB.DBA.RDF_LOAD_RDFA (ret_body, base, groupdest);\n"
"\n"
"if (aq is not null)\n"
"aq_request (aq, \'DB.DBA.RDF_SW_PING\', vector (ps, new_origin_uri));\n"
@@ -19075,6 +21447,20 @@ static const char *proc434 =
"\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"
@@ -19135,7 +21521,7 @@ static const char *proc434 =
"}\n"
"if (__tag(rc) = 193 or rc < 0 or rc > 0)\n"
"{\n"
-"if (__proc_exists (\'DB.DBA.RDF_LOAD_POST_PROCESS\'))\n"
+"if (rc > 0 and __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"
@@ -19144,6 +21530,7 @@ static const char *proc434 =
"}\n"
"try_next_mapper:;\n"
"}\n"
+"}\n"
"\n"
"\n"
"\n"
@@ -19155,7 +21542,11 @@ static const char *proc434 =
"\n"
"\n"
"\n"
-"if (dest is null)\n"
+"\n"
+"if (rdf_fmt)\n"
+"return 1; \n"
+"\n"
+"if ((dest is null) and (get_soft is null or (get_soft <> \'add\')))\n"
"{\n"
"DB.DBA.SPARUL_CLEAR (graph_iri, 1, 0);\n"
"commit work;\n"
@@ -19195,12 +21586,18 @@ static const char *proc434 =
"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:1175\n";
+"--src rdf_sponge.sql:1249\n";
-static const char *proc435 =
-"#line 1398 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc483 =
+"#line 1541 \"[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"
@@ -19222,10 +21619,10 @@ static const char *proc435 =
"if (dest is null)\n"
"DB.DBA.SPARUL_CLEAR (graph_iri, 1, 0);\n"
"}\n"
-"--src rdf_sponge.sql:1396\n";
+"--src rdf_sponge.sql:1539\n";
-static const char *proc436 =
-"#line 1421 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc484 =
+"#line 1564 \"[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"
@@ -19258,10 +21655,10 @@ static const char *proc436 =
"local_iri := graph_iri;\n"
"return local_iri;\n"
"}\n"
-"--src rdf_sponge.sql:1419\n";
+"--src rdf_sponge.sql:1562\n";
-static const char *proc437 =
-"#line 1455 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc485 =
+"#line 1598 \"[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"
@@ -19306,14 +21703,14 @@ static const char *proc437 =
"\n"
"}\n"
"else\n"
-"if ((\'replacing\' = get_soft) or (\'replace\' = get_soft))\n"
+"if ((\'replacing\' = get_soft) or (\'replace\' = get_soft) or (\'add\' = get_soft))\n"
"{\n"
"\n"
" ;\n"
"}\n"
"else\n"
"signal (\'RDFZZ\', sprintf (\n"
-"\'This version of Virtuoso supports only \"soft\" and \"replacing\" values of \"define get:soft ...\", not \"%.500s\"\',\n"
+"\'This version of Virtuoso supports only \"soft\", \"replacing\" and \"add\" values of \"define get:soft ...\", not \"%.500s\"\',\n"
"get_soft ) );\n"
"if (not bit_and (perms, 4))\n"
"{\n"
@@ -19385,10 +21782,10 @@ static const char *proc437 =
"VT_INC_INDEX_DB_DBA_RDF_OBJ();\n"
"return res_graph_iri;\n"
"}\n"
-"--src rdf_sponge.sql:1453\n";
+"--src rdf_sponge.sql:1596\n";
-static const char *proc438 =
-"#line 1580 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc486 =
+"#line 1723 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.RDF_SPONGE_UP_LIST (in sources any)\n"
"{\n"
"declare need_reindex integer;\n"
@@ -19407,10 +21804,10 @@ static const char *proc438 =
"VT_INC_INDEX_DB_DBA_RDF_OBJ();\n"
"return 1;\n"
"}\n"
-"--src rdf_sponge.sql:1578\n";
+"--src rdf_sponge.sql:1721\n";
-static const char *proc439 =
-"#line 1601 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc487 =
+"#line 1744 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_GRANT_SPONGE ()\n"
"{\n"
"declare state, msg varchar;\n"
@@ -19433,14 +21830,14 @@ static const char *proc439 =
"exec (cmd, state, msg);\n"
"}\n"
"}\n"
-"--src rdf_sponge.sql:1599\n";
+"--src rdf_sponge.sql:1742\n";
-static const char *other46 =
+static const char *other50 =
" DB.DBA.RDF_GRANT_SPONGE ()\n";
/* rdf_schema_objects.sql */
-static const char *proc440 =
+static const char *proc488 =
"#line 31 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_tbl_opts (in tbls any, in cols any)\n"
"{\n"
@@ -19454,7 +21851,7 @@ static const char *proc440 =
"foreach (varchar t in tbls) do\n"
"{\n"
"declare col_cnt int;\n"
-"col_cnt := (select count(*) from TABLE_COLS where \"TABLE\" = t);\n"
+"col_cnt := (select count(*) from TABLE_COLS where \"TABLE\" = t and \"COLUMN\" <> \'_IDN\');\n"
"res [inx * 2] := t;\n"
"if (isarray (cols[inx]) and length (cols[inx]) = 2 and isarray (cols[inx][1]) and length (cols[inx][1]) = col_cnt)\n"
"res [(inx * 2) + 1] := cols [inx];\n"
@@ -19463,7 +21860,7 @@ static const char *proc440 =
"declare newcols, i any;\n"
"newcols := make_array (col_cnt, \'any\');\n"
"i := 0;\n"
-"for select \"COLUMN\", COL_DTP from TABLE_COLS where \"TABLE\" = t order by COL_ID do\n"
+"for select \"COLUMN\", COL_DTP from TABLE_COLS where \"TABLE\" = t and \"COLUMN\" <> \'_IDN\' order by COL_ID do\n"
"{\n"
"if (COL_DTP <> 131)\n"
"newcols [i] := vector (0, null);\n"
@@ -19479,7 +21876,7 @@ static const char *proc440 =
"}\n"
"--src rdf_schema_objects.sql:29\n";
-static const char *proc441 =
+static const char *proc489 =
"#line 68 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_tbl_pk_cols (inout tbls any, out pkcols any)\n"
"{\n"
@@ -19512,7 +21909,7 @@ static const char *proc441 =
"foreach (varchar c in tbls [i + 1]) do\n"
"{\n"
"cols[j] := (select vector (sc.\"COLUMN\", sc.\"COL_DTP\", sc.\"COL_SCALE\", sc.\"COL_PREC\")\n"
-"from DB.DBA.TABLE_COLS sc where upper (sc.\"COLUMN\") = upper (c) and upper (\"TABLE\") = upper (tbls[i]));\n"
+"from DB.DBA.TABLE_COLS sc where upper (sc.\"COLUMN\") = upper (c) and upper (\"TABLE\") = upper (tbls[i]) and \"COLUMN\" <> \'_IDN\');\n"
"if (length (cols[j]) = 0)\n"
"signal (\'22023\', sprintf (\'Non existing column %s for table %s\', c, tbls[i]));\n"
"j := j + 1;\n"
@@ -19544,7 +21941,7 @@ static const char *proc441 =
"}\n"
"--src rdf_schema_objects.sql:66\n";
-static const char *proc442 =
+static const char *proc490 =
"#line 131 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_ns_get (in cols any, in f int)\n"
"{\n"
@@ -19569,7 +21966,7 @@ static const char *proc442 =
"}\n"
"--src rdf_schema_objects.sql:129\n";
-static const char *proc443 =
+static const char *proc491 =
"#line 154 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_ns_get_1 (in cols any, inout dict any)\n"
"{\n"
@@ -19594,16 +21991,14 @@ static const char *proc443 =
"}\n"
"--src rdf_schema_objects.sql:152\n";
-static const char *proc444 =
+static const char *proc492 =
"#line 177 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
-"RDF_VIEW_DROP_STMT (in qualifier varchar)\n"
+"RDF_VIEW_DROP_STMT_BY_GRAPH (in gr 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"
@@ -19616,8 +22011,22 @@ static const char *proc444 =
"}\n"
"--src rdf_schema_objects.sql:175\n";
-static const char *proc445 =
-"#line 197 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc493 =
+"#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 *proc494 =
+"#line 207 \"[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"
@@ -19663,7 +22072,7 @@ static const char *proc445 =
"vname := _tbls[xx]||\'Count\';\n"
"total_select := total_select || sprintf (\'(cnt%d*cnt%d)+\', xx*2, (xx*2)+1);\n"
"total_tb := total_tb ||\n"
-"sprintf (\'\\n (select count(*) cnt%d from \"%I\".\"%I\".\"%I\") tb%d, \\n (select count(*)+1 as cnt%d from DB.DBA.TABLE_COLS where \"TABLE\" = \'\'%S\'\') tb%d,\',\n"
+"sprintf (\'\\n (select count(*) cnt%d from \"%I\".\"%I\".\"%I\") tb%d, \\n (select count(*)+1 as cnt%d from DB.DBA.TABLE_COLS where \"TABLE\" = \'\'%S\'\' and \"COLUMN\" <> \'\'_IDN\'\') tb%d,\',\n"
"xx*2, name_part (_tbls[xx], 0), name_part (_tbls[xx], 1), name_part (_tbls[xx], 2), xx*2, (xx*2)+1, _tbls[xx], (xx*2)+1);\n"
"if (not exists (select 1 from SYS_VIEWS where V_NAME = vname))\n"
"{\n"
@@ -19711,19 +22120,19 @@ static const char *proc445 =
"\n"
"return create_class_stmt || \'\\n\\n\' || create_count_count || create_view_stmt;\n"
"}\n"
-"--src rdf_schema_objects.sql:195\n";
+"--src rdf_schema_objects.sql:205\n";
-static const char *proc446 =
-"#line 292 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc495 =
+"#line 302 \"[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:290\n";
+"--src rdf_schema_objects.sql:300\n";
-static const char *proc447 =
-"#line 299 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc496 =
+"#line 309 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_sql_tb (in tb varchar)\n"
"{\n"
"declare q, o, n varchar;\n"
@@ -19732,10 +22141,10 @@ static const char *proc447 =
"n := name_part (tb, 2);\n"
"return sprintf (\'\"%I\".\"%I\".\"%I\"\', q, o, n);\n"
"}\n"
-"--src rdf_schema_objects.sql:297\n";
+"--src rdf_schema_objects.sql:307\n";
-static const char *proc448 =
-"#line 309 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc497 =
+"#line 319 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_tb (in tb varchar)\n"
"{\n"
"declare r varchar;\n"
@@ -19743,18 +22152,18 @@ static const char *proc448 =
"r := lower (r);\n"
"return r;\n"
"}\n"
-"--src rdf_schema_objects.sql:307\n";
+"--src rdf_schema_objects.sql:317\n";
-static const char *proc449 =
-"#line 318 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc498 =
+"#line 328 \"[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:316\n";
+"--src rdf_schema_objects.sql:326\n";
-static const char *proc450 =
-"#line 324 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc499 =
+"#line 334 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_col (in col varchar)\n"
"{\n"
"declare r varchar;\n"
@@ -19762,19 +22171,19 @@ static const char *proc450 =
"r := lower (r);\n"
"return r;\n"
"}\n"
-"--src rdf_schema_objects.sql:322\n";
+"--src rdf_schema_objects.sql:332\n";
-static const char *proc451 =
-"#line 333 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc500 =
+"#line 343 \"[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:331\n";
+"--src rdf_schema_objects.sql:341\n";
-static const char *proc452 =
-"#line 340 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc501 =
+"#line 350 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_get_ns (in uri varchar, out uriSearch varchar)\n"
"{\n"
"declare delim integer;\n"
@@ -19816,10 +22225,10 @@ static const char *proc452 =
"}\n"
"return nsPrefix;\n"
"}\n"
-"--src rdf_schema_objects.sql:338\n";
+"--src rdf_schema_objects.sql:348\n";
-static const char *proc453 =
-"#line 383 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc502 =
+"#line 393 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_uri_curie (in uri varchar)\n"
"{\n"
"declare delim integer;\n"
@@ -19848,10 +22257,10 @@ static const char *proc453 =
"}\n"
"return uri;\n"
"}\n"
-"--src rdf_schema_objects.sql:381\n";
+"--src rdf_schema_objects.sql:391\n";
-static const char *proc454 =
-"#line 413 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc503 =
+"#line 423 \"[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"
@@ -19859,10 +22268,10 @@ static const char *proc454 =
"else\n"
"return rdf_view_uri_curie (opts);\n"
"}\n"
-"--src rdf_schema_objects.sql:411\n";
+"--src rdf_schema_objects.sql:421\n";
-static const char *proc455 =
-"#line 422 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc504 =
+"#line 432 \"[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"
@@ -19905,7 +22314,7 @@ static const char *proc455 =
"ret := ret || rdf_view_sp (6) || sprintf (\' a %s ;\\n\', rdf_view_uri_curie (cols_arr[0]));\n"
"\n"
"inx := 0;\n"
-"for select \"COLUMN\" from TABLE_COLS where \"TABLE\" = tbl order by COL_ID do\n"
+"for select \"COLUMN\" from TABLE_COLS where \"TABLE\" = tbl and \"COLUMN\" <> \'_IDN\' order by COL_ID do\n"
"{\n"
"col_name := lower (\"COLUMN\");\n"
"if (cols_arr[1][inx][0] = 0 or cols_arr[1][inx][0] = 4)\n"
@@ -19934,7 +22343,7 @@ static const char *proc455 =
"ret := trim (ret, \';\');\n"
"ret := ret || \'.\\n\';\n"
"inx := 0;\n"
-"for select \"COLUMN\" from TABLE_COLS where \"TABLE\" = tbl order by COL_ID do\n"
+"for select \"COLUMN\" from TABLE_COLS where \"TABLE\" = tbl and \"COLUMN\" <> \'_IDN\' order by COL_ID do\n"
"{\n"
"col_name := lower (\"COLUMN\");\n"
"if (isstring (cols_arr[1][inx][0]))\n"
@@ -19951,10 +22360,10 @@ static const char *proc455 =
"ret := ret || \' }\\n }\\n\';\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:420\n";
+"--src rdf_schema_objects.sql:430\n";
-static const char *proc456 =
-"#line 512 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc505 =
+"#line 522 \"[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"
@@ -20011,10 +22420,10 @@ static const char *proc456 =
"ret := ret || \' }\\n }\';\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:510\n";
+"--src rdf_schema_objects.sql:520\n";
-static const char *proc457 =
-"#line 570 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc506 =
+"#line 580 \"[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"
@@ -20035,10 +22444,10 @@ static const char *proc457 =
"tbl := tbl_name_l;\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:568\n";
+"--src rdf_schema_objects.sql:578\n";
-static const char *proc458 =
-"#line 592 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc507 =
+"#line 602 \"[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"
@@ -20057,10 +22466,10 @@ static const char *proc458 =
"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:590\n";
+"--src rdf_schema_objects.sql:600\n";
-static const char *proc459 =
-"#line 612 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc508 =
+"#line 622 \"[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"
@@ -20081,10 +22490,10 @@ static const char *proc459 =
"}\n"
"return string_output_string (ret);\n"
"}\n"
-"--src rdf_schema_objects.sql:610\n";
+"--src rdf_schema_objects.sql:620\n";
-static const char *proc460 =
-"#line 634 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc509 =
+"#line 644 \"[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"
@@ -20105,10 +22514,10 @@ static const char *proc460 =
"}\n"
"return string_output_string (ret);\n"
"}\n"
-"--src rdf_schema_objects.sql:632\n";
+"--src rdf_schema_objects.sql:642\n";
-static const char *proc461 =
-"#line 656 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc510 =
+"#line 666 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_dv_to_printf_str_type (in _dv varchar, in sc int)\n"
"{\n"
@@ -20124,10 +22533,10 @@ static const char *proc461 =
"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:654\n";
+"--src rdf_schema_objects.sql:664\n";
-static const char *proc462 =
-"#line 673 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc511 =
+"#line 683 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_dv_to_sql_str_type (in _dv varchar)\n"
"{\n"
@@ -20143,15 +22552,15 @@ static const char *proc462 =
"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:671\n";
+"--src rdf_schema_objects.sql:681\n";
-static const char *proc463 =
-"#line 690 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc512 =
+"#line 700 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_dv_to_xsd_str_type (in _dv varchar)\n"
"{\n"
"if (_dv = 189 or _dv = 188 or _dv = 247) return \'int\';\n"
-"else if (_dv = 182 or _dv = 125 or _dv = 131) return \'string\';\n"
+"else if (_dv = 182 or _dv = 125 or _dv = 131 or _dv = 132) return \'string\';\n"
"else if (__tag of double precision = _dv) return \'numeric\';\n"
"else if (__tag of real = _dv) return \'float\';\n"
"else if (__tag of numeric = _dv) return \'numeric\';\n"
@@ -20162,10 +22571,10 @@ static const char *proc463 =
"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:688\n";
+"--src rdf_schema_objects.sql:698\n";
-static const char *proc464 =
-"#line 707 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc513 =
+"#line 717 \"[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"
@@ -20193,7 +22602,7 @@ static const char *proc464 =
"qualifier, tbl_name_l, _host, qualifier, tbl_name_l, sk_str, pk_text);\n"
"cols_arr := get_keyword (_tbl, cols);\n"
"inx := 0;\n"
-"for select \"COLUMN\" as col from TABLE_COLS where \"TABLE\" = _tbl order by COL_ID do\n"
+"for select \"COLUMN\" as col from TABLE_COLS where \"TABLE\" = _tbl and \"COLUMN\" <> \'_IDN\' order by COL_ID do\n"
"{\n"
"if (isstring (cols_arr[1][inx][0]))\n"
"{\n"
@@ -20211,19 +22620,19 @@ static const char *proc464 =
"}\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:705\n";
+"--src rdf_schema_objects.sql:715\n";
-static const char *proc465 =
-"#line 754 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc514 =
+"#line 764 \"[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:752\n";
+"--src rdf_schema_objects.sql:762\n";
-static const char *proc466 =
-"#line 761 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc515 =
+"#line 771 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_get_relations (in _tbl varchar, in _tbls varchar, in _suff varchar)\n"
"{\n"
@@ -20264,10 +22673,10 @@ static const char *proc466 =
"}\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:759\n";
+"--src rdf_schema_objects.sql:769\n";
-static const char *proc467 =
-"#line 803 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc516 =
+"#line 813 \"[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"
@@ -20302,7 +22711,7 @@ static const char *proc467 =
"cols_arr := get_keyword (tbl, cols);\n"
"if (length (cols_arr[0]))\n"
"http (sprintf (\'%s:%s rdfs:subClassOf %s .\\n\', qual, cls, rdf_view_uri_curie (cols_arr[0])), ses);\n"
-"for select \"COLUMN\" as col, COL_DTP as dtp from TABLE_COLS where \"TABLE\" = tbl order by COL_ID do\n"
+"for select \"COLUMN\" as col, COL_DTP as dtp from TABLE_COLS where \"TABLE\" = tbl and \"COLUMN\" <> \'_IDN\' order by COL_ID do\n"
"{\n"
"declare xsd, label varchar;\n"
"label := col;\n"
@@ -20360,10 +22769,10 @@ static const char *proc467 =
"}\n"
"return string_output_string (ses);\n"
"}\n"
-"--src rdf_schema_objects.sql:801\n";
+"--src rdf_schema_objects.sql:811\n";
-static const char *proc468 =
-"#line 897 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc517 =
+"#line 907 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure RDF_VIEW_GEN_VD (in qual varchar)\n"
"{\n"
"declare ses, pref any;\n"
@@ -20509,10 +22918,10 @@ static const char *proc468 =
"ses := replace (ses, \'<qual>\', qual);\n"
"return ses;\n"
"}\n"
-"--src rdf_schema_objects.sql:895\n";
+"--src rdf_schema_objects.sql:905\n";
-static const char *proc469 =
-"#line 1044 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc518 =
+"#line 1054 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure RDF_OWL_GEN_VD (in qual varchar)\n"
"{\n"
"declare fct_installed int;\n"
@@ -20582,10 +22991,10 @@ static const char *proc469 =
"ses := replace (ses, \'<qual>\', qual);\n"
"return ses;\n"
"}\n"
-"--src rdf_schema_objects.sql:1042\n";
+"--src rdf_schema_objects.sql:1052\n";
-static const char *proc470 =
-"#line 1115 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc519 =
+"#line 1125 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"RDF_VIEW_CHECK_SYNC_TB (in tb varchar)\n"
"{\n"
@@ -20597,26 +23006,50 @@ static const char *proc470 =
"return 0;\n"
"return 1;\n"
"}\n"
-"--src rdf_schema_objects.sql:1113\n";
+"--src rdf_schema_objects.sql:1123\n";
-static const char *proc471 =
-"#line 1128 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc520 =
+"#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 *proc521 =
+"#line 1147 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
-"RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0)\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"
"{\n"
"declare mask varchar;\n"
-"declare txt, tbls, err_ret any;\n"
-"declare stat, msg 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"
"\n"
+"if (load_atomic)\n"
+"__atomic (1);\n"
"tbls := vector ();\n"
"err_ret := vector ();\n"
-"mask := sprintf (\'http://%s/schemas/%s/qm-%%\', virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\'), qualifier);\n"
+"opt := vector ();\n"
+"gr := vgraph;\n"
+"if (length (pgraph))\n"
+"opt := vector (gr, pgraph);\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"
-"filter (?o like ?:mask)\n"
+"?o virtrdf:qmGraphRange-rvrFixedValue `iri(?:gr)` .\n"
"}\n"
"order by asc (bif:sprintf_inverse (bif:concat (str(rdf:_), \"%d\"), str (?p), 1))) x do\n"
"{\n"
@@ -20649,7 +23082,7 @@ static const char *proc471 =
"{\n"
"for (declare ctr int, ctr := 1; ctr <= 4; ctr := ctr + 1)\n"
"{\n"
-"txt := sparql_rdb2rdf_codegen (tb, ctr);\n"
+"txt := sparql_rdb2rdf_codegen (tb, ctr, opt);\n"
"stat := \'00000\';\n"
"if (isvector (txt))\n"
"{\n"
@@ -20679,13 +23112,151 @@ static const char *proc471 =
"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:1126\n";
+"--src rdf_schema_objects.sql:1145\n";
+
+static const char *proc522 =
+"#line 1251 \"[executable]/rdf_schema_objects.sql\"\n"
+"create procedure\n"
+"DB.DBA.R2RML_FROM_TBL (in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any := null, in qual_ns varchar := 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"
+"if (qual_ns is null)\n"
+"qual_ns := sprintf (\'http://%s/schemas/%s/\', virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\'), qualifier);\n"
+"sns := ns := sprintf (\'@prefix rr: <http://www.w3.org/ns/r2rml#> .\\n at prefix %s: <%s> .\\n\', qualifier, qual_ns);\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\' || DB.DBA.R2RML_CREATE_DATASET (inx, qualifier, qual_ns, _tbls, gen_stat, cols, pkcols, graph) || \'\';\n"
+"\n"
+"return create_view_stmt;\n"
+"}\n"
+"--src rdf_schema_objects.sql:1249\n";
+
+static const char *proc523 =
+"#line 1285 \"[executable]/rdf_schema_objects.sql\"\n"
+"create procedure\n"
+"DB.DBA.R2RML_QUAL_NOTATION (in qualifier varchar, in qual_ns varchar, in loc varchar)\n"
+"{\n"
+"if (sprintf (\'%U\', loc) = loc)\n"
+"return concat (qualifier, \':\', loc);\n"
+"return sprintf (\'<%s:%U>\', qual_ns, loc);\n"
+"}\n"
+"--src rdf_schema_objects.sql:1283\n";
+
+static const char *proc524 =
+"#line 1294 \"[executable]/rdf_schema_objects.sql\"\n"
+"create procedure\n"
+"DB.DBA.R2RML_CREATE_DATASET (in nth int, in qualifier varchar, in qual_ns 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 (\'/%U={%s}\', pks[i][0], 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%U> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema \"%s\" ; rr:tableOwner \"%s\" ; rr:tableName \"%s\" ]; \\n\',\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];\\n\',\n"
+"uriqa_str, qual, tbl_name_l, pk_text, DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, rdf_view_cls_name (tbl_name)), graph_def );\n"
+"\n"
+"inx := 0;\n"
+"for select \"COLUMN\", COL_DTP from TABLE_COLS where \"TABLE\" = tbl and \"COLUMN\" <> \'_IDN\' 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 ] ; rr:objectMap [ rr:column \"%s\" ]; ] ;\\n\',\n"
+"DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, 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"
+"pk_text := pk_text || sprintf (\'/%U={%s}\', FKCOLUMN_NAME, FKCOLUMN_NAME);\n"
+"ret := ret || sprintf (\'rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s ] ; rr:objectMap [ rr:termtype \"IRI\" ; rr:template \"http://%s/%s/%s%s\" ]; ] ;\\n\',\n"
+"DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, concat (tbl_name_l, \'_has_\', lower (name_part (pkt, 3)))),\n"
+"uriqa_str, qual, lower (name_part (pkt, 3)), pk_text );\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\" ] ;\', PKCOLUMN_NAME, FKCOLUMN_NAME);\n"
+"pk_text := pk_text || sprintf (\'/%U={%s}\', FKCOLUMN_NAME, FKCOLUMN_NAME);\n"
+"}\n"
+"if (tbl <> fkt)\n"
+"{ \n"
+"ret := ret || sprintf (\'rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMap%U>; %s ]; ] ;\\n\',\n"
+"DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, concat (tbl_name_l, \'_of_\', lower (name_part (fkt, 3)))),\n"
+"name_part (fkt, 3), jc );\n"
+"}\n"
+"else\n"
+"{\n"
+"ret := ret || sprintf (\'rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s ] ; rr:objectMap [ rr:termtype \"IRI\" ; rr:template \"http://%s/%s/%s%s\" ]; ] ;\\n\',\n"
+"DB.DBA.R2RML_QUAL_NOTATION (qualifier, qual_ns, concat (tbl_name_l, \'_has_\', lower (name_part (fkt, 3)))),\n"
+"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:1292\n";
/* rdf_void.sql */
-static const char *tbl22 =
+static const char *tbl24 =
"create table DB.DBA.RDF_VOID_GRAPH (\n"
"RVG_IID IRI_ID not null primary key,\n"
"RVG_IRI varchar not null,\n"
@@ -20694,7 +23265,7 @@ static const char *tbl22 =
"alter index RDF_VOID_GRAPH on DB.DBA.RDF_VOID_GRAPH partition cluster replicated\n"
"create index RDF_VOID_GRAPH_IRI on DB.DBA.RDF_VOID_GRAPH (RVG_IRI) partition cluster replicated\n";
-static const char *tbl23 =
+static const char *tbl25 =
"create table DB.DBA.RDF_VOID_GRAPH_MEMBER (\n"
"RVGM_GROUP_IID IRI_ID not null,\n"
"RVGM_MEMBER_IID IRI_ID not null,\n"
@@ -20702,7 +23273,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 *proc472 =
+static const char *proc525 =
"#line 43 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_INIT ()\n"
"{\n"
@@ -20713,9 +23284,9 @@ static const char *proc472 =
"}\n"
"--src rdf_void.sql:41\n";
-static const char *other47 =
+static const char *other51 =
"RDF_VOID_INIT ()\n";
-static const char *proc473 =
+static const char *proc526 =
"#line 55 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_SPLIT_IRI (in rel varchar, out pref varchar, out name varchar)\n"
"{\n"
@@ -20730,7 +23301,7 @@ static const char *proc473 =
"}\n"
"--src rdf_void.sql:53\n";
-static const char *proc474 =
+static const char *proc527 =
"#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"
@@ -20753,7 +23324,7 @@ static const char *proc474 =
"}\n"
"--src rdf_void.sql:66\n";
-static const char *proc475 =
+static const char *proc528 =
"#line 89 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_ALL_GEN (in target_graph varchar, in details int := 0)\n"
"{\n"
@@ -20818,7 +23389,7 @@ static const char *proc475 =
"}\n"
"--src rdf_void.sql:87\n";
-static const char *proc476 =
+static const char *proc529 =
"#line 152 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_NS (inout ses any)\n"
"{\n"
@@ -20831,7 +23402,7 @@ static const char *proc476 =
"}\n"
"--src rdf_void.sql:150\n";
-static const char *proc477 =
+static const char *proc530 =
"#line 163 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_GEN (in graph varchar, in gr_name varchar := null)\n"
"{\n"
@@ -20846,7 +23417,7 @@ static const char *proc477 =
"}\n"
"--src rdf_void.sql:161\n";
-static const char *proc478 =
+static const char *proc531 =
"#line 176 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_DIST_O_SRV (in graph any)\n"
"{\n"
@@ -20856,7 +23427,7 @@ static const char *proc478 =
"}\n"
"--src rdf_void.sql:174\n";
-static const char *proc479 =
+static const char *proc532 =
"#line 184 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_DIST_O (in graph varchar)\n"
"{\n"
@@ -20879,7 +23450,7 @@ static const char *proc479 =
"}\n"
"--src rdf_void.sql:182\n";
-static const char *proc480 =
+static const char *proc533 =
"#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"
@@ -21018,7 +23589,7 @@ static const char *proc480 =
/* rdflddir2.sql */
-static const char *tbl24 =
+static const char *tbl26 =
"create table DB.DBA.LOAD_LIST (\n"
"ll_file varchar,\n"
"ll_graph varchar,\n"
@@ -21032,13 +23603,13 @@ static const char *tbl24 =
"alter index LOAD_LIST on DB.DBA.LOAD_LIST partition (ll_file varchar)\n"
"create index LL_STATE on DB.DBA.LOAD_LIST (ll_state, ll_file, ll_graph) partition (ll_state int)\n";
-static const char *tbl25 =
+static const char *tbl27 =
"create table LDLOCK (id int primary key)\n"
"alter index LDLOCK on LDLOCK partition (id int)\n";
-static const char *other48 =
+static const char *other52 =
"insert soft DB.DBA.LDLOCK values (0)\n";
-static const char *proc481 =
+static const char *proc534 =
"#line 47 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"ld_dir (in path varchar, in mask varchar, in graph varchar)\n"
@@ -21077,7 +23648,7 @@ static const char *proc481 =
"}\n"
"--src rdflddir2.sql:45\n";
-static const char *proc482 =
+static const char *proc535 =
"#line 85 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"rdf_read_dir (in path varchar, in mask varchar, in graph varchar)\n"
@@ -21086,7 +23657,7 @@ static const char *proc482 =
"}\n"
"--src rdflddir2.sql:83\n";
-static const char *proc483 =
+static const char *proc536 =
"#line 93 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"ld_dir_all (in path varchar, in mask varchar, in graph varchar)\n"
@@ -21111,7 +23682,7 @@ static const char *proc483 =
"}\n"
"--src rdflddir2.sql:91\n";
-static const char *proc484 =
+static const char *proc537 =
"#line 116 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"ld_add (in _fname varchar, in _graph varchar)\n"
@@ -21128,7 +23699,7 @@ static const char *proc484 =
"}\n"
"--src rdflddir2.sql:114\n";
-static const char *proc485 =
+static const char *proc538 =
"#line 131 \"[executable]/rdflddir2.sql\"\n"
"create procedure ld_ttlp_flags (in fname varchar, in opt varchar)\n"
"{\n"
@@ -21144,7 +23715,7 @@ static const char *proc485 =
"}\n"
"--src rdflddir2.sql:129\n";
-static const char *proc486 =
+static const char *proc539 =
"#line 145 \"[executable]/rdflddir2.sql\"\n"
"create procedure ld_is_rdfxml (in f any)\n"
"{\n"
@@ -21154,7 +23725,7 @@ static const char *proc486 =
"}\n"
"--src rdflddir2.sql:143\n";
-static const char *proc487 =
+static const char *proc540 =
"#line 153 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"ld_file (in f varchar, in graph varchar)\n"
@@ -21203,7 +23774,7 @@ static const char *proc487 =
"}\n"
"--src rdflddir2.sql:151\n";
-static const char *proc488 =
+static const char *proc541 =
"#line 200 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"rdf_load_dir (in path varchar,\n"
@@ -21220,7 +23791,7 @@ static const char *proc488 =
"}\n"
"--src rdflddir2.sql:198\n";
-static const char *proc489 =
+static const char *proc542 =
"#line 216 \"[executable]/rdflddir2.sql\"\n"
"create procedure ld_array ()\n"
"{\n"
@@ -21268,7 +23839,7 @@ static const char *proc489 =
"}\n"
"--src rdflddir2.sql:214\n";
-static const char *proc490 =
+static const char *proc543 =
"#line 262 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"rdf_loader_run (in max_files integer := null, in log_enable int := 2)\n"
@@ -21357,7 +23928,7 @@ static const char *proc490 =
"}\n"
"--src rdflddir2.sql:260\n";
-static const char *proc491 =
+static const char *proc544 =
"#line 349 \"[executable]/rdflddir2.sql\"\n"
"create procedure rdf_load_stop (in force int := 0)\n"
"{\n"
@@ -21368,7 +23939,7 @@ static const char *proc491 =
"}\n"
"--src rdflddir2.sql:347\n";
-static const char *proc492 =
+static const char *proc545 =
"#line 359 \"[executable]/rdflddir2.sql\"\n"
"create procedure RDF_LOADER_RUN_1 (in x int, in y int)\n"
"{\n"
@@ -21376,7 +23947,7 @@ static const char *proc492 =
"}\n"
"--src rdflddir2.sql:357\n";
-static const char *proc493 =
+static const char *proc546 =
"#line 365 \"[executable]/rdflddir2.sql\"\n"
"create procedure rdf_ld_srv (in log_enable int := 2)\n"
"{\n"
@@ -21387,7 +23958,7 @@ static const char *proc493 =
"}\n"
"--src rdflddir2.sql:363\n";
-static const char *proc494 =
+static const char *proc547 =
"#line 375 \"[executable]/rdflddir2.sql\"\n"
"create procedure load_grdf (in f varchar)\n"
"{\n"
@@ -21466,8 +24037,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_FAKE_0", tbl14);
- ddl_ensure_table ("DB.DBA.SYS_FAKE_1", tbl15);
+ ddl_ensure_table ("DB.DBA.SYS_IDONLY_EMPTY", tbl14);
+ ddl_ensure_table ("DB.DBA.SYS_IDONLY_ONE", tbl15);
ddl_ensure_table ("do this always", other3);
ddl_ensure_table ("do this always", other4);
ddl_ensure_table ("do this always", other5);
@@ -21537,496 +24108,556 @@ 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_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);
+ 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", proc124);
+ DEFINE_PROC ("DB.DBA.RDFA_LOAD_DICT_XLAT", proc125);
+ DEFINE_PROC ("DB.DBA.RDF_RDFA11_FETCH_PROFILES", proc126);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFA", proc127);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION", proc128);
+ DEFINE_PROC ("DB.DBA.RDF_RDFA_TO_DICT", proc129);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_XHTML_MICRODATA", proc130);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_XML_IRI_TO_TTL", proc131);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_XML_OBJ_TO_TTL", proc132);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_NEW_BLANK", proc133);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_TRIPLE", proc134);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_TRIPLE_L", proc135);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL", proc136);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_FILE_TO_TTL_FILE", proc137);
+ DEFINE_PROC ("DB.DBA.RDF_LONG_TO_TTL", proc138);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_BATCH_COMPLETE", proc139);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_VERBOSE_TTL", proc140);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TTL_ENV", proc141);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TTL", proc142);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TRIG", proc143);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_NT", proc144);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_TO_TTL", proc145);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT", proc146);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TALIS_JSON", proc147);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON_LD", proc148);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON", proc149);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_CSV", proc150);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TSV", proc151);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML", proc152);
+ DEFINE_PROC ("DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT", proc153);
+ DEFINE_PROC ("DB.DBA.RDF_PIVOT_DESCRIBE_LINK", proc154);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_HTML_UL", proc155);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_HTML_TR", proc156);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA", proc157);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA", proc158);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ATOM_XML", proc159);
+ DEFINE_PROC ("DB.DBA.ODATA_EDM_TYPE", proc160);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ODATA_JSON", proc161);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_ODATA_JSON", proc162);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT", proc163);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_INIT", proc164);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_ACC", proc165);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_FIN", proc166);
ddl_ensure_table ("do this always", other16);
- 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);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_INIT", proc167);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_ACC", proc168);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_FIN", proc169);
ddl_ensure_table ("do this always", other17);
- 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);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_INIT", proc170);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_ACC", proc171);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_FIN", proc172);
ddl_ensure_table ("do this always", other18);
- 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);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_INIT", proc173);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_ACC", proc174);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_FIN", proc175);
ddl_ensure_table ("do this always", other19);
- 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);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT", proc176);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE", proc177);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC", proc178);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN", proc179);
ddl_ensure_table ("do this always", other20);
- 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);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV_ACC", proc180);
ddl_ensure_table ("do this always", other21);
- 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", 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", 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);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT", proc181);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_ACC", proc182);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_FIN", proc183);
+ ddl_ensure_table ("do this always", other22);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT", proc184);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_ACC", proc185);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_FIN", proc186);
+ ddl_ensure_table ("do this always", other23);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TTL", proc187);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TRIG", proc188);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_NT", proc189);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDF_XML", proc190);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TALIS_JSON", proc191);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_LD", proc192);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_UL", proc193);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_TR", proc194);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_MICRODATA", proc195);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_MICRODATA", proc196);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CSV", proc197);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TSV", proc198);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDFA_XHTML", proc199);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML", proc200);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML_QRCODE", proc201);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_INIT", proc202);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_ACC", proc203);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_FIN", proc204);
ddl_ensure_table ("do this always", other24);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_NT_FIN", proc182);
- ddl_ensure_table ("do this always", other25);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_INIT", proc205);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_ACC", proc206);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_FIN", proc207);
+ ddl_ensure_table ("do this always", other25);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_INIT", proc208);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC", proc209);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_FIN", proc210);
ddl_ensure_table ("do this always", other26);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV_FIN", proc183);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_NT_FIN", proc211);
ddl_ensure_table ("do this always", other27);
- 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", 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);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV_FIN", proc212);
+ ddl_ensure_table ("do this always", other29);
+ DEFINE_PROC ("DB.DBA.RDF_INSERT_TRIPLES_CL", proc213);
+ DEFINE_PROC ("DB.DBA.RDF_INSERT_TRIPLES", proc214);
+ DEFINE_PROC ("DB.DBA.RDF_DELETE_TRIPLES", proc215);
+ DEFINE_PROC ("DB.DBA.RDF_DELETE_TRIPLES_AGG", proc216);
+ DEFINE_PROC ("DB.DBA.RDF_MODIFY_TRIPLES", proc217);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_INIT", proc218);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL", proc219);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_DELETE_CTOR_ACC", proc220);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INSERT_CTOR_ACC", proc221);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_MODIFY_CTOR_ACC", proc222);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_FIN", proc223);
+ ddl_ensure_table ("do this always", other30);
ddl_ensure_table ("do this always", other31);
- 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", proc213);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_ACC", proc214);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_FIN", proc215);
+ DEFINE_PROC ("DB.DBA.SPARQL_INSERT_DICT_CONTENT", proc224);
+ DEFINE_PROC ("DB.DBA.SPARQL_DELETE_DICT_CONTENT", proc225);
+ DEFINE_PROC ("DB.DBA.SPARQL_MODIFY_BY_DICT_CONTENTS", proc226);
+ DEFINE_PROC ("DB.DBA.RDF_REPL_DEL", proc227);
+ DEFINE_PROC ("DB.DBA.SPARUL_CLEAR", proc228);
+ DEFINE_PROC ("DB.DBA.SPARUL_LOAD", proc229);
+ DEFINE_PROC ("DB.DBA.SPARUL_LOAD_SERVICE_DATA", proc230);
+ DEFINE_PROC ("DB.DBA.SPARUL_CREATE", proc231);
+ DEFINE_PROC ("DB.DBA.SPARUL_DROP", proc232);
+ DEFINE_PROC ("DB.DBA.SPARUL_RUN", proc233);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_BINDINGS_VIEW_IMP", proc234);
+ ddl_ensure_table ("DB.DBA.SPARQL_BINDINGS_VIEW", view0);
ddl_ensure_table ("do this always", other33);
- 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);
+ DEFINE_PROC ("DB.DBA.SPARQL_INSERT_QUAD_DICT_CONTENT", proc235);
+ DEFINE_PROC ("DB.DBA.SPARQL_DELETE_QUAD_DICT_CONTENT", proc236);
+ DEFINE_PROC ("DB.DBA.SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS", proc237);
+ DEFINE_PROC ("DB.DBA.SPARUL_COPYMOVEADD_IMPL", proc238);
+ DEFINE_PROC ("DB.DBA.SPARUL_COPY", proc239);
+ DEFINE_PROC ("DB.DBA.SPARUL_MOVE", proc240);
+ DEFINE_PROC ("DB.DBA.SPARUL_ADD", proc241);
+ DEFINE_PROC ("DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS", proc242);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_REGEX", proc243);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_LANGMATCHES", proc244);
+ DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_INIT", proc245);
+ DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_ACC", proc246);
+ DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_FINAL", proc247);
+ ddl_ensure_table ("do this always", other34);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_INIT", proc248);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_ACC", proc249);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_FIN", proc250);
+ ddl_ensure_table ("do this always", other35);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_INIT", proc251);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_ACC", proc252);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_FIN", proc253);
+ ddl_ensure_table ("do this always", other36);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT", proc254);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SPO", proc255);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL", proc256);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_CBD", proc257);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL", proc258);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_OBJCBD", proc259);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL", proc260);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SCBD", proc261);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SCBD_PHYSICAL", proc262);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS", proc263);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DICT_OF_TRIPLES_TO_FOUR_COLS", proc264);
+ DEFINE_PROC ("DB.DBA.RDF_TYPEMIN_OF_OBJ", proc265);
+ DEFINE_PROC ("DB.DBA.RDF_TYPEMAX_OF_OBJ", proc266);
+ DEFINE_PROC ("DB.DBA.RDF_IID_CMP", proc267);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_CMP", proc268);
+ DEFINE_PROC ("DB.DBA.RDF_LONG_CMP", proc269);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DIST_SER_LONG", proc270);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DIST_DESER_LONG", proc271);
+ DEFINE_PROC ("DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH", proc272);
+ DEFINE_PROC ("DB.DBA.JSO_DUMP_IRI", proc273);
+ DEFINE_PROC ("DB.DBA.JSO_DUMP_FLD", proc274);
+ DEFINE_PROC ("DB.DBA.JSO_VECTOR_TO_TTL", proc275);
+ DEFINE_PROC ("DB.DBA.JSO_FILTERED_PROPLIST", proc276);
+ DEFINE_PROC ("DB.DBA.JSO_DUMP_ALL", proc277);
+ DEFINE_PROC ("DB.DBA.RDF_BACKUP_METADATA", proc278);
+ DEFINE_PROC ("DB.DBA.RDF_RESTORE_METADATA", proc279);
+ DEFINE_PROC ("DB.DBA.RDF_AUDIT_METADATA", proc280);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CHANGE", proc281);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CHANGE_OPT", proc282);
+ DEFINE_PROC ("DB.DBA.RDF_QM_APPLY_CHANGES", proc283);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_JSO_TYPE", proc284);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_STORAGE_FLAG", proc285);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_STORAGE_CONTAINS_MAPPING", proc286);
+ DEFINE_PROC ("DB.DBA.RDF_QM_GC_SUBTREE", proc287);
+ DEFINE_PROC ("DB.DBA.RDF_QM_GC_MAPPING_SUBTREE", proc288);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DROP_MAPPING", proc289);
+ DEFINE_PROC ("DB.DBA.RDF_QM_MACROEXPAND_TEMPLATE", proc290);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CBD_OF_IRI_CLASS", proc291);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FORMAT", proc292);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FUNCTIONS", proc293);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FORMAT", proc294);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FUNCTIONS", proc295);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_BAD_CLASS_INV_FUNCTION", proc296);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SQLNAME_NOTATION_TO_NAME", proc297);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SQLQNAME_NOTATION_TO_QNAME", proc298);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CHECK_CLASS_FUNCTION_HEADERS", proc299);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_SUBCLASS", proc300);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DROP_CLASS", proc301);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DROP_QUAD_STORAGE", proc302);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_QUAD_STORAGE", proc303);
+ DEFINE_PROC ("DB.DBA.RDF_QM_BEGIN_ALTER_QUAD_STORAGE", proc304);
+ DEFINE_PROC ("DB.DBA.RDF_QM_END_ALTER_QUAD_STORAGE", proc305);
+ DEFINE_PROC ("DB.DBA.RDF_QM_STORE_ATABLES", proc306);
+ DEFINE_PROC ("DB.DBA.RDF_QM_FT_USAGE", proc307);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CHECK_COLUMNS_FORM_KEY", proc308);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_MAP_VALUE", proc309);
+ DEFINE_PROC ("DB.DBA.RDF_QM_NORMALIZE_QMV", proc310);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_MAPPING", proc311);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ATTACH_MAPPING", proc312);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ADD_MAPPING_TO_STORAGE", proc313);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE", proc314);
+ DEFINE_PROC ("DB.DBA.RDF_QM_SET_DEFAULT_MAPPING", proc315);
+ DEFINE_PROC ("DB.DBA.RDF_SML_DROP", proc316);
+ DEFINE_PROC ("DB.DBA.RDF_SML_CREATE", proc317);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY", proc318);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ATTACH_MACRO_LIBRARY", proc319);
+ DEFINE_PROC ("DB.DBA.RDF_ADD_qmAliasesKeyrefdByQuad", proc320);
+ DEFINE_PROC ("DB.DBA.RDF_UPGRADE_QUAD_MAP", proc321);
+ DEFINE_PROC ("DB.DBA.RDF_UPGRADE_METADATA", proc322);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_W", proc323);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_W", proc324);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_NEW_GRAPH_A", proc325);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_A", proc326);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_A", proc327);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_COMMIT_A", proc328);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_R", proc329);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_R", proc330);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_COMMIT_R", proc331);
+ DEFINE_PROC ("DB.DBA.TTLP_MT", proc332);
+ DEFINE_PROC ("DB.DBA.TTLP_MT_LOCAL_FILE", proc333);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFXML_MT", proc334);
+ DEFINE_PROC ("DB.DBA.VT_DECODE_KEYWORD_ITM", proc335);
+ DEFINE_PROC ("DB.DBA.VT_ENCODE_KEYWORD_ITM", proc336);
+ DEFINE_PROC ("DB.DBA.VT_COMPOSE_KEYWORD_INDEX_LINES", proc337);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_OBJ_PATCH_CONTAINS_BY_GRAPH", proc338);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_OBJ_PATCH_CONTAINS_BY_MANY_GRAPHS", proc339);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH", proc340);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH_OLD", proc341);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RULE_ADD", proc342);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RULE_DEL", proc343);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RECOVER", proc344);
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", 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", proc329);
- DEFINE_PROC ("rdf_owl_sas_p", proc330);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_CREATE_MEMONLY", proc345);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_CREATE", proc346);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DROP_MEMONLY", proc347);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DROP", proc348);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_CHECK_VISIBILITY_CHANGE", proc349);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_INS_MEMONLY", proc350);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_INS", proc351);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DEL_MEMONLY", proc352);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DEL", proc353);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_GET", proc354);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_ACK", proc355);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_GRAPH_USER_PERM_TITLE", proc356);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_ASSERT", proc357);
+ DEFINE_PROC ("DB.DBA.RDF_DEFAULT_USER_PERMS_SET_MEMONLY", proc358);
+ DEFINE_PROC ("DB.DBA.RDF_DEFAULT_USER_PERMS_SET", proc359);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_SET_MEMONLY", proc360);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_SET", proc361);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_DEL_MEMONLY", proc362);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_DEL", proc363);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_LIST_GET", proc364);
+ DEFINE_PROC ("DB.DBA.SPARQL_RELOAD_QM_GRAPH", proc365);
+ DEFINE_PROC ("DB.DBA.RDF_CREATE_SPARQL_ROLES", proc366);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_AUDIT", proc367);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_OUTLINE_ALL", proc368);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_FT_UPGRADE", proc369);
+ ddl_ensure_table ("do this always", other39);
+ DEFINE_PROC ("rdfs_pn", proc370);
+ DEFINE_PROC ("rdf_owl_sas_p", proc371);
ddl_ensure_table ("DB.DBA.SYS_RDF_SCHEMA", tbl19);
- 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", 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);
+ DEFINE_PROC ("rdfs_load_schema", proc372);
+ DEFINE_PROC ("rdf_schema_ld", proc373);
+ ddl_ensure_table ("do this always", other40);
+ DEFINE_PROC ("CL_RDF_INF_CHANGED_SRV", proc374);
+ DEFINE_PROC ("CL_RDF_INF_CHANGED", proc375);
+ DEFINE_PROC ("rdfs_rule_set", proc376);
+ DEFINE_PROC ("DB.DBA.RDF_IID_OF_QNAME", proc377);
+ DEFINE_PROC ("SPARQL_INI_PARAMS", proc378);
+ DEFINE_PROC ("cl_tmp_inx_recov_fill", proc379);
+ DEFINE_PROC ("cl_inx_recov_clean", proc380);
+ DEFINE_PROC ("cl_inx_recov_fill_1", proc381);
+ DEFINE_PROC ("exec_from_daq", proc382);
+ DEFINE_PROC ("cl_inx_recov", proc383);
/* sparql_io.sql */
- 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", proc348);
- ddl_ensure_table ("do this always", other39);
- 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", 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", 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", 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", 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);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_WRITE_NS", proc384);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_WRITE_HEAD", proc385);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_PRE", proc386);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_INIT", proc387);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_FINAL", proc388);
+ ddl_ensure_table ("do this always", other41);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_DICT_XML_HTTP_PRE", proc389);
+ ddl_ensure_table ("do this always", other42);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_WRITE_NS", proc390);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_WRITE_HEAD", proc391);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_PRE", proc392);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_INIT", proc393);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL", proc394);
ddl_ensure_table ("do this always", other43);
- 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);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_WRITE_NS", proc395);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_WRITE_HEAD", proc396);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_HTTP_PRE", proc397);
ddl_ensure_table ("do this always", other44);
- 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);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC_INT", proc398);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC", proc399);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC_TO_ARRAY", proc400);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC_TO_ARRAY_OF_OBJ", proc401);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC_WITH_META", proc402);
+ DEFINE_PROC ("DB.DBA.SPARQL_SD_PROBE", proc403);
+ DEFINE_PROC ("DB.DBA.SPARQL_SINV_IMP", proc404);
+ ddl_ensure_table ("DB.DBA.SPARQL_SINV_2", view1);
+ DEFINE_PROC ("querySoap", proc405);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_WRITE_EXEC_STATUS", proc406);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_HEAD", proc407);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_RES", proc408);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_ROW", proc409);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_NS", proc410);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_HEAD", proc411);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_RES", proc412);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_ROW", proc413);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_NS", proc414);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_HEAD", proc415);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_RES", proc416);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_NS", proc417);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_HEAD", proc418);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_RES", proc419);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JAVASCRIPT_HTML_WRITE", proc420);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JSON_WRITE_BINDING", proc421);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JSON_WRITE", proc422);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_CSV_WRITE", proc423);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TSV_WRITE", proc424);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_WRITE", proc425);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_SVC_DESC", proc426);
+ DEFINE_PROC ("WS.WS.SPARQL_VHOST_RESET", proc427);
+ DEFINE_PROC ("DB.DBA.SPARQL_PROTOCOL_ERROR_REPORT", proc428);
+ DEFINE_PROC ("DB.DBA.SPARQL_WSDL11", proc429);
+ DEFINE_PROC ("DB.DBA.SPARQL_WSDL", proc430);
+ DEFINE_PROC ("DB.DBA.SPARQL_SOAP_NS", proc431);
+ DEFINE_PROC ("DB.DBA.SPARQL_PT_NS", proc432);
+ DEFINE_PUBLIC_PROC ("DB.DBA.PARSE_SPARQL_WS_PARAMS", proc433);
+ DEFINE_PROC ("DB.DBA.rdf_find_str", proc434);
+ ddl_ensure_table ("do this always", other45);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_HTML_DOCTYPE", proc435);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_HTML_HEAD", proc436);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_STYLE", proc437);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_JAVASCRIPT", proc438);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_FOOTER", proc439);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_FORMAT_OPTS", proc440);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_SPONGE_OPTS", proc441);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_CXML_OPTION", proc442);
+ DEFINE_PROC ("WS.WS.sparql_predefined_nsdecl", proc443);
+ DEFINE_PROC ("WS.WS.sparql_predefined_rdfinf", proc444);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_GENERATE_FORM", proc445);
+ DEFINE_PROC ("WS.WS./!sparql/", proc446);
+ ddl_ensure_table ("do this always", other46);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_NEW_BLANK", proc447);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_TRIPLE", proc448);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_TRIPLE_L", proc449);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_NEW_BASE", proc450);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_TTL", proc451);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_RDFXML", proc452);
+ DEFINE_PROC ("WS.WS./!sparql-graph-crud/", proc453);
+ ddl_ensure_table ("do this always", other47);
+ DEFINE_PROC ("DB.DBA.SPARQL_REFRESH_DYNARES_RESULTS", proc454);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_ROUTE_IF_DAV", proc455);
+ DEFINE_PROC ("DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV", proc456);
+ DEFINE_PROC ("WS.WS.__http_handler_rq", proc457);
+ DEFINE_PROC ("WS.WS.__http_handler_head_rq", proc458);
+ DEFINE_PROC ("DB.DBA.http_rq_file_handler", proc459);
+ DEFINE_PROC ("DB.DBA.SPARQL_SD_TRIPLE", proc460);
+ DEFINE_PROC ("DB.DBA.SPARQL_SD_TRIPLE_L", proc461);
+ DEFINE_PROC ("DB.DBA.SPARQL_SD_COMPOSE", proc462);
+ DEFINE_PROC ("WS.WS./!sparql-sd/", proc463);
+ ddl_ensure_table ("do this always", other48);
+ DEFINE_PROC ("DB.DBA.RDF_GRANT_SPARQL_IO", proc464);
/* rdf_sponge.sql */
- 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);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FT_INDEX_GRABBED", proc465);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB_SINGLE", proc466);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB_SINGLE_ASYNC", proc467);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB_SEEALSO", proc468);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB", proc469);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB_RESOLVER_DEFAULT", proc470);
+ DEFINE_PROC ("DB.DBA.SPARQL_EVAL_TO_ARRAY", proc471);
+ DEFINE_PROC ("DB.DBA.SPARQL_EVAL", proc472);
ddl_ensure_table ("DB.DBA.SYS_HTTP_SPONGE", tbl20);
- 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", 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);
+ ddl_ensure_table ("DB.DBA.SYS_HTTP_SPONGE_REFRESH_DEFAULTS", tbl21);
+ ddl_ensure_table ("DB.DBA.RDF_WEBID_ACL_GROUPS", tbl22);
+ DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_GET_CACHE_PARAMS", proc473);
+ DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_DEP_URL_NOT_CHANGED", proc474);
+ DEFINE_PROC ("DB.DBA.RDF_HTTP_MAKE_HTTP_REQ", proc475);
+ DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_UP", proc476);
+ DEFINE_PROC ("DB.DBA.SYS_FILE_SPONGE_UP", proc477);
+ DEFINE_PROC ("DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE", proc478);
+ ddl_ensure_table ("DB.DBA.SYS_RDF_MAPPERS", tbl23);
+ DEFINE_PROC ("DB.DBA.RDF_HTTP_URL_GET", proc479);
+ DEFINE_PROC ("DB.DBA.RDF_SW_PING", proc480);
+ DEFINE_PROC ("DB.DBA.RDF_PROC_COLS", proc481);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_HTTP_RESPONSE", proc482);
+ DEFINE_PROC ("DB.DBA.RDF_FORGET_HTTP_RESPONSE", proc483);
+ DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP", proc484);
+ DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP_1", proc485);
+ DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP_LIST", proc486);
+ DEFINE_PROC ("DB.DBA.RDF_GRANT_SPONGE", proc487);
/* rdf_schema_objects.sql */
- 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);
+ DEFINE_PROC ("rdf_view_tbl_opts", proc488);
+ DEFINE_PROC ("rdf_view_tbl_pk_cols", proc489);
+ DEFINE_PROC ("rdf_view_ns_get", proc490);
+ DEFINE_PROC ("rdf_view_ns_get_1", proc491);
+ DEFINE_PROC ("RDF_VIEW_DROP_STMT_BY_GRAPH", proc492);
+ DEFINE_PROC ("RDF_VIEW_DROP_STMT", proc493);
+ DEFINE_PROC ("RDF_VIEW_FROM_TBL", proc494);
+ DEFINE_PROC ("rdf_view_sp", proc495);
+ DEFINE_PROC ("rdf_view_sql_tb", proc496);
+ DEFINE_PROC ("rdf_view_tb", proc497);
+ DEFINE_PROC ("rdf_view_sql_col", proc498);
+ DEFINE_PROC ("rdf_view_col", proc499);
+ DEFINE_PROC ("rdf_view_cls_name", proc500);
+ DEFINE_PROC ("rdf_view_get_ns", proc501);
+ DEFINE_PROC ("rdf_view_uri_curie", proc502);
+ DEFINE_PROC ("rdf_view_col_type", proc503);
+ DEFINE_PROC ("rdf_view_create_view", proc504);
+ DEFINE_PROC ("rdf_view_create_void_view", proc505);
+ DEFINE_PROC ("rdf_view_get_pk_rel", proc506);
+ DEFINE_PROC ("rdf_view_get_bin_rel", proc507);
+ DEFINE_PROC ("rdf_view_get_fk_pk_rel", proc508);
+ DEFINE_PROC ("rdf_view_get_pk_fk_rel", proc509);
+ DEFINE_PROC ("rdf_view_dv_to_printf_str_type", proc510);
+ DEFINE_PROC ("rdf_view_dv_to_sql_str_type", proc511);
+ DEFINE_PROC ("rdf_view_dv_to_xsd_str_type", proc512);
+ DEFINE_PROC ("rdf_view_create_class", proc513);
+ DEFINE_PROC ("rdf_view_get_primary_key", proc514);
+ DEFINE_PROC ("rdf_view_get_relations", proc515);
+ DEFINE_PROC ("RDF_OWL_FROM_TBL", proc516);
+ DEFINE_PROC ("RDF_VIEW_GEN_VD", proc517);
+ DEFINE_PROC ("RDF_OWL_GEN_VD", proc518);
+ DEFINE_PROC ("RDF_VIEW_CHECK_SYNC_TB", proc519);
+ DEFINE_PROC ("RDF_VIEW_DO_SYNC", proc520);
+ DEFINE_PROC ("RDF_VIEW_SYNC_TO_PHYSICAL", proc521);
+ DEFINE_PROC ("DB.DBA.R2RML_FROM_TBL", proc522);
+ DEFINE_PROC ("DB.DBA.R2RML_QUAL_NOTATION", proc523);
+ DEFINE_PROC ("DB.DBA.R2RML_CREATE_DATASET", proc524);
/* 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", proc472);
- ddl_ensure_table ("do this always", other47);
- 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);
+ ddl_ensure_table ("DB.DBA.RDF_VOID_GRAPH", tbl24);
+ ddl_ensure_table ("DB.DBA.RDF_VOID_GRAPH_MEMBER", tbl25);
+ DEFINE_PROC ("RDF_VOID_INIT", proc525);
+ ddl_ensure_table ("do this always", other51);
+ DEFINE_PROC ("RDF_VOID_SPLIT_IRI", proc526);
+ DEFINE_PROC ("RDF_VOID_STORE", proc527);
+ DEFINE_PROC ("RDF_VOID_ALL_GEN", proc528);
+ DEFINE_PROC ("RDF_VOID_NS", proc529);
+ DEFINE_PROC ("RDF_VOID_GEN", proc530);
+ DEFINE_PROC ("RDF_VOID_DIST_O_SRV", proc531);
+ DEFINE_PROC ("RDF_VOID_DIST_O", proc532);
+ DEFINE_PROC ("RDF_VOID_GEN_1", proc533);
/* 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", 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);
+ ddl_ensure_table ("DB.DBA.LOAD_LIST", tbl26);
+ ddl_ensure_table ("DB.DBA.LDLOCK", tbl27);
+ ddl_ensure_table ("do this always", other52);
+ DEFINE_PROC ("ld_dir", proc534);
+ DEFINE_PROC ("rdf_read_dir", proc535);
+ DEFINE_PROC ("ld_dir_all", proc536);
+ DEFINE_PROC ("ld_add", proc537);
+ DEFINE_PROC ("ld_ttlp_flags", proc538);
+ DEFINE_PROC ("ld_is_rdfxml", proc539);
+ DEFINE_PROC ("ld_file", proc540);
+ DEFINE_PROC ("rdf_load_dir", proc541);
+ DEFINE_PROC ("ld_array", proc542);
+ DEFINE_PROC ("rdf_loader_run", proc543);
+ DEFINE_PROC ("rdf_load_stop", proc544);
+ DEFINE_PROC ("RDF_LOADER_RUN_1", proc545);
+ DEFINE_PROC ("rdf_ld_srv", proc546);
+ DEFINE_PROC ("load_grdf", proc547);
}
@@ -22036,17 +24667,17 @@ sqls_arfw_define_sparql (void)
/* sparql.sql */
DEFINE_PROC ("DB.DBA.RDF_GLOBAL_RESET", proc20);
- ddl_ensure_table ("do this always", other34);
- ddl_ensure_table ("do this always", other35);
+ ddl_ensure_table ("do this always", other37);
+ ddl_ensure_table ("do this always", other38);
/* sparql_io.sql */
if (sch_proc_def_exists (bootstrap_cli, "DB.DBA.USER_CREATE", 0))
- ddl_ensure_table ("do this always", other45);
+ ddl_ensure_table ("do this always", other49);
/* rdf_sponge.sql */
if (sch_proc_def_exists (bootstrap_cli, "DB.DBA.USER_CREATE", 0))
- ddl_ensure_table ("do this always", other46);
+ ddl_ensure_table ("do this always", other50);
}
diff --git a/libsrc/Wi/sql_code_sparql_init.c b/libsrc/Wi/sql_code_sparql_init.c
new file mode 100644
index 0000000..4873599
--- /dev/null
+++ b/libsrc/Wi/sql_code_sparql_init.c
@@ -0,0 +1,1462 @@
+/* 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 *proc57 =
+"#line 357 \"[executable]/sparql_init.sql\"\n"
+"create procedure DB.DBA.RDF_INIT_SINGLE_SERVER ()\n"
+"{\n"
+"if (1 <> sys_stat (\'cl_run_local_only\'))\n"
+"return;\n"
+"DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO ();\n"
+"}\n"
+"--src sparql_init.sql:355\n";
+
+static const char *other34 =
+"DB.DBA.RDF_INIT_SINGLE_SERVER ()\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);
+ DEFINE_PROC ("DB.DBA.RDF_INIT_SINGLE_SERVER", proc57);
+ 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 3a14ceb..a53a256 100644
--- a/libsrc/Wi/sql_code_sys.c
+++ b/libsrc/Wi/sql_code_sys.c
@@ -145,8 +145,7 @@ static const char *proc1 =
static const char *proc2 =
"#line 199 \"[executable]/users.sql\"\n"
-"create procedure\n"
-"USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)\n"
+"create procedure DB.DBA.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"
@@ -177,7 +176,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 := get_keyword_ucase (\'E-MAIL\', options, \'\');\n"
+"_u_e_mail := coalesce (get_keyword_ucase (\'E-MAIL\', options), 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"
@@ -190,7 +189,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\', \'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\', \'E_MAIL\', \'FULL_NAME\', \'HOME\', \'PERMISSIONS\', \'DISABLED\'))\n"
"{\n"
"new_opts := vector_concat (new_opts, vector (options[i], options[i+1]));\n"
"}\n"
@@ -200,6 +199,9 @@ 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"
@@ -242,7 +244,7 @@ static const char *proc2 =
"--src users.sql:197\n";
static const char *proc3 =
-"#line 296 \"[executable]/users.sql\"\n"
+"#line 298 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_ROLE_CREATE (in _name varchar, in is_dav integer := 0)\n"
"{\n"
@@ -262,10 +264,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:294\n";
+"--src users.sql:296\n";
static const char *proc4 =
-"#line 317 \"[executable]/users.sql\"\n"
+"#line 319 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_ROLE_DROP (in _name varchar)\n"
"{\n"
@@ -281,13 +283,17 @@ 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:315\n";
+"--src users.sql:317\n";
static const char *proc5 =
-"#line 334 \"[executable]/users.sql\"\n"
+"#line 336 \"[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"
@@ -302,14 +308,16 @@ static const char *proc5 =
"else\n"
"signal (\'37000\', concat (\'The user \'\'\', _name, \'\'\' does not exist\'), \'U0009\');\n"
"}\n"
-"--src users.sql:332\n";
+"--src users.sql:334\n";
static const char *proc6 =
-"#line 353 \"[executable]/users.sql\"\n"
+"#line 359 \"[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"
@@ -325,10 +333,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:351\n";
+"--src users.sql:357\n";
static const char *proc7 =
-"#line 374 \"[executable]/users.sql\"\n"
+"#line 382 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_SET_QUALIFIER (in _name varchar, in qual varchar)\n"
"{\n"
@@ -344,19 +352,19 @@ static const char *proc7 =
"signal (\'37000\', concat (\'The user \'\'\', _name, \'\'\' does not exist\'), \'U0010\');\n"
"}\n"
"}\n"
-"--src users.sql:372\n";
+"--src users.sql:380\n";
static const char *proc8 =
-"#line 392 \"[executable]/users.sql\"\n"
+"#line 400 \"[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:390\n";
+"--src users.sql:398\n";
static const char *proc9 =
-"#line 399 \"[executable]/users.sql\"\n"
+"#line 407 \"[executable]/users.sql\"\n"
"create procedure\n"
"GET_INHERITED_GRANTS (in g_id integer, in prim integer, inout inh any)\n"
"{\n"
@@ -376,10 +384,10 @@ static const char *proc9 =
"}\n"
"}\n"
"}\n"
-"--src users.sql:397\n";
+"--src users.sql:405\n";
static const char *proc10 =
-"#line 421 \"[executable]/users.sql\"\n"
+"#line 429 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_GRANT_ROLE (in _name varchar, in _role varchar, in grant_opt integer := 0)\n"
"{\n"
@@ -440,10 +448,10 @@ static const char *proc10 =
"}\n"
"}\n"
"}\n"
-"--src users.sql:419\n";
+"--src users.sql:427\n";
static const char *proc11 =
-"#line 483 \"[executable]/users.sql\"\n"
+"#line 491 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_REVOKE_ROLE (in _name varchar, in _role varchar)\n"
"{\n"
@@ -478,10 +486,10 @@ static const char *proc11 =
"\n"
"\n"
"}\n"
-"--src users.sql:481\n";
+"--src users.sql:489\n";
static const char *proc12 =
-"#line 520 \"[executable]/users.sql\"\n"
+"#line 528 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_DROP (in _name varchar, in _cascade integer := 0)\n"
"{\n"
@@ -532,13 +540,14 @@ 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:518\n";
+"--src users.sql:526\n";
static const char *proc13 =
-"#line 575 \"[executable]/users.sql\"\n"
+"#line 584 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_SET_OPTION (in _name varchar, in opt varchar, in value any)\n"
"{\n"
@@ -622,10 +631,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:573\n";
+"--src users.sql:582\n";
static const char *proc14 =
-"#line 661 \"[executable]/users.sql\"\n"
+"#line 670 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_GET_OPTION (in _name varchar, in opt varchar)\n"
"{\n"
@@ -634,28 +643,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:659\n";
+"--src users.sql:668\n";
static const char *proc15 =
-"#line 672 \"[executable]/users.sql\"\n"
+"#line 681 \"[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:670\n";
+"--src users.sql:679\n";
static const char *proc16 =
-"#line 680 \"[executable]/users.sql\"\n"
+"#line 689 \"[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:678\n";
+"--src users.sql:687\n";
static const char *proc17 =
-"#line 698 \"[executable]/users.sql\"\n"
+"#line 707 \"[executable]/users.sql\"\n"
"create procedure\n"
"LIST_USER_ROLE_GRANTS ()\n"
"{\n"
@@ -683,10 +692,10 @@ static const char *proc17 =
"i := i + 2;\n"
"}\n"
"}\n"
-"--src users.sql:696\n";
+"--src users.sql:705\n";
static const char *proc18 =
-"#line 727 \"[executable]/users.sql\"\n"
+"#line 736 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_KEY_IS_FILE (in f varchar, out path varchar)\n"
"{\n"
@@ -702,10 +711,10 @@ static const char *proc18 =
"else\n"
"return 0;\n"
"}\n"
-"--src users.sql:725\n";
+"--src users.sql:734\n";
static const char *proc19 =
-"#line 745 \"[executable]/users.sql\"\n"
+"#line 754 \"[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"
@@ -731,10 +740,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:743\n";
+"--src users.sql:752\n";
static const char *proc20 =
-"#line 773 \"[executable]/users.sql\"\n"
+"#line 782 \"[executable]/users.sql\"\n"
" create procedure\n"
"USER_KEY_DELETE (in username varchar, in key_name varchar)\n"
"{\n"
@@ -752,10 +761,10 @@ static const char *proc20 =
"USER_SET_OPTION (username, \'KEYS\', keys);\n"
"}\n"
"}\n"
-"--src users.sql:771\n";
+"--src users.sql:780\n";
static const char *proc21 =
-"#line 793 \"[executable]/users.sql\"\n"
+"#line 802 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_KEYS_INIT (in username varchar, in opts any)\n"
"{\n"
@@ -838,10 +847,10 @@ static const char *proc21 =
"}\n"
"return 0;\n"
"}\n"
-"--src users.sql:791\n";
+"--src users.sql:800\n";
static const char *proc22 =
-"#line 877 \"[executable]/users.sql\"\n"
+"#line 886 \"[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"
@@ -873,10 +882,10 @@ static const char *proc22 =
"signal (\'22023\', \'Unknown key type\');\n"
"}\n"
"}\n"
-"--src users.sql:875\n";
+"--src users.sql:884\n";
static const char *proc23 =
-"#line 911 \"[executable]/users.sql\"\n"
+"#line 920 \"[executable]/users.sql\"\n"
" create procedure\n"
"USER_KEY_LOAD (\n"
"in key_name varchar,\n"
@@ -906,10 +915,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:909\n";
+"--src users.sql:918\n";
static const char *proc24 =
-"#line 942 \"[executable]/users.sql\"\n"
+"#line 951 \"[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"
@@ -942,10 +951,10 @@ static const char *proc24 =
"USER_SET_OPTION (username, \'LOGIN_CERTIFICATES\', certs);\n"
"sec_set_user_cert (username, cfp);\n"
"}\n"
-"--src users.sql:940\n";
+"--src users.sql:949\n";
static const char *proc25 =
-"#line 976 \"[executable]/users.sql\"\n"
+"#line 985 \"[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"
@@ -988,10 +997,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:974\n";
+"--src users.sql:983\n";
static const char *proc26 =
-"#line 1021 \"[executable]/users.sql\"\n"
+"#line 1030 \"[executable]/users.sql\"\n"
"create procedure\n"
"\"DB\".\"DBA\".\"USER_CERT_LOGIN\" (\n"
"inout user_name varchar,\n"
@@ -1052,10 +1061,10 @@ static const char *proc26 =
"}\n"
"return rc;\n"
"}\n"
-"--src users.sql:1019\n";
+"--src users.sql:1028\n";
static const char *proc27 =
-"#line 1083 \"[executable]/users.sql\"\n"
+"#line 1092 \"[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"
@@ -1072,12 +1081,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:1081\n";
+"--src users.sql:1090\n";
static const char *other0 =
"grant execute on \"DB.DBA.SET_USER_OS_ACOUNT\" to public\n";
static const char *proc28 =
-"#line 1104 \"[executable]/users.sql\"\n"
+"#line 1113 \"[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"
@@ -1136,10 +1145,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:1102\n";
+"--src users.sql:1111\n";
static const char *proc29 =
-"#line 1165 \"[executable]/users.sql\"\n"
+"#line 1174 \"[executable]/users.sql\"\n"
"create procedure DB.DBA.__DDL_GET_DROP_USER_TABLES (in owner varchar)\n"
"{\n"
"declare deps any;\n"
@@ -1153,10 +1162,10 @@ static const char *proc29 =
"\n"
"return deps;\n"
"}\n"
-"--src users.sql:1163\n";
+"--src users.sql:1172\n";
static const char *proc30 =
-"#line 1181 \"[executable]/users.sql\"\n"
+"#line 1190 \"[executable]/users.sql\"\n"
"create procedure DB.DBA.__UPDATE_SOAP_USERS_ACCESS ()\n"
"{\n"
"\n"
@@ -1185,7 +1194,7 @@ static const char *proc30 =
"log_message (\'The user petshop is deleted.\');\n"
"}\n"
"}\n"
-"--src users.sql:1179\n";
+"--src users.sql:1188\n";
static const char *other1 =
"DB.DBA.__UPDATE_SOAP_USERS_ACCESS ()\n";
@@ -1204,7 +1213,7 @@ static const char *tbl0 =
")\n";
static const char *proc31 =
-"#line 1231 \"[executable]/users.sql\"\n"
+"#line 1240 \"[executable]/users.sql\"\n"
"create procedure\n"
"DB.DBA.LDAP_LOGIN (inout user_name varchar, in digest varchar, in session_random varchar)\n"
"{\n"
@@ -1282,7 +1291,7 @@ static const char *proc31 =
"LDAP_VALIDATION_FAILURE:\n"
"return 0;\n"
"}\n"
-"--src users.sql:1229\n";
+"--src users.sql:1238\n";
static const char *tbl1 =
"create table SYS_USER_WEBID (UW_U_NAME varchar, UW_WEBID varchar, primary key (UW_WEBID))\n"
@@ -1290,13 +1299,35 @@ 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 1316 \"[executable]/users.sql\"\n"
+"#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"
"create procedure\n"
"DB.DBA.FOAF_SSL_LOGIN (inout user_name varchar, in digest varchar, in session_random varchar)\n"
"{\n"
"declare stat, msg, meta, data, info, qr, hf, graph, gr, alts any;\n"
"declare agent varchar;\n"
-"declare rc int;\n"
+"declare rc, vtype int;\n"
"rc := 0;\n"
"gr := null;\n"
"\n"
@@ -1310,6 +1341,12 @@ static const char *proc32 =
"if (client_attr (\'client_ssl\') = 0)\n"
"return 0;\n"
"\n"
+"if (__proc_exists (\'DB.DBA.WEBID_AUTH_GEN_2\') and DB.DBA.WEBID_AUTH_GEN_2 (null, 0, \'ODBC\', 0, 0, agent, gr, 0, vtype))\n"
+"{\n"
+"user_name := connection_get (\'SPARQLUserId\');\n"
+"return 1;\n"
+"}\n"
+"\n"
"info := get_certificate_info (9);\n"
"agent := get_certificate_info (7, null, null, null, \'2.5.29.17\');\n"
"\n"
@@ -1329,19 +1366,10 @@ static const char *proc32 =
"graph := WS.WS.VFS_URI_COMPOSE (hf);\n"
"qr := sprintf (\'sparql load <%S> into graph <%S>\', graph, gr);\n"
"stat := \'00000\';\n"
-"exec (qr, stat, msg);\n"
+"\n"
+"DB.DBA.SPARUL_LOAD (gr, graph, 0, 1, 0, vector ());\n"
"commit work;\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"
+"qr := FOAF_SSL_QRY (gr, agent);\n"
"stat := \'00000\';\n"
"exec (qr, stat, msg, vector (), 0, meta, data);\n"
"if (stat = \'00000\' and length (data))\n"
@@ -1363,14 +1391,15 @@ static const char *proc32 =
"}\n"
"err_ret:\n"
"if (gr is not null)\n"
-"exec (sprintf (\'sparql clear graph <%S>\', gr), stat, msg);\n"
+"DB.DBA.SPARUL_CLEAR (gr, 0, 0);\n"
+"\n"
"commit work;\n"
"return rc;\n"
"}\n"
-"--src users.sql:1314\n";
+"--src users.sql:1343\n";
-static const char *proc33 =
-"#line 1394 \"[executable]/users.sql\"\n"
+static const char *proc34 =
+"#line 1421 \"[executable]/users.sql\"\n"
"create procedure\n"
"USERS_GET_DEF_QUAL (in dta varchar)\n"
"{\n"
@@ -1381,7 +1410,7 @@ static const char *proc33 =
"dta := split_and_decode (dta, 0, \' \');\n"
"return (get_keyword (\'Q\', dta, \'\'));\n"
"}\n"
-"--src users.sql:1392\n";
+"--src users.sql:1419\n";
static int
sch_proc_def_exists (client_connection_t *cli, const char *proc_name, const int report)
@@ -1421,7 +1450,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 ("USER_CREATE", proc2);
+ DEFINE_PROC ("DB.DBA.USER_CREATE", proc2);
DEFINE_PROC ("USER_ROLE_CREATE", proc3);
DEFINE_PROC ("USER_ROLE_DROP", proc4);
DEFINE_PROC ("USER_CHANGE_PASSWORD", proc5);
@@ -1455,8 +1484,9 @@ 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 ("DB.DBA.FOAF_SSL_LOGIN", proc32);
- DEFINE_PROC ("USERS_GET_DEF_QUAL", proc33);
+ DEFINE_PROC ("FOAF_SSL_QRY", proc32);
+ DEFINE_PROC ("DB.DBA.FOAF_SSL_LOGIN", proc33);
+ DEFINE_PROC ("USERS_GET_DEF_QUAL", proc34);
}
diff --git a/libsrc/Wi/sql_code_vad.c b/libsrc/Wi/sql_code_vad.c
index b0230cd..0cfe227 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-2011 OpenLink Software.</P></TD></TR>\',\"VAD\".\"DBA\".\"VAD_VERSION\" ()));\n"
+"http (sprintf (\' VAD Interface (%s) - Copyright© 1998-2012 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 8bcbd90..b124354 100644
--- a/libsrc/Wi/sql_code_ws.c
+++ b/libsrc/Wi/sql_code_ws.c
@@ -693,7 +693,7 @@ static const char *proc24 =
"\n"
"http_request_status (\'HTTP/1.1 401 Unauthorized\');\n"
"require_encrypted := sys_stat (\'sql_encryption_on_password\');\n"
-"if (require_encrypted = 1 or require_encrypted = 2)\n"
+"if (allow_basic and (require_encrypted = 1 or require_encrypted = 2))\n"
"require_encrypted := 0;\n"
"else\n"
"require_encrypted := 1;\n"
@@ -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-2011 OpenLink Software.</SPAN></DIV>\n"
+"<DIV class=\"foot\"><SPAN class=\"foot\">Virtuoso Universal Server <?=sys_stat(\'st_dbms_ver\')?> - Copyright© 1998-2012 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 2007/03/16 09:56:12 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2007 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:15 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:15 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:15 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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.1 2010/11/05 10:56:48 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:13 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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.1 2010/11/05 10:56:48 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:15 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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.1 2010/11/05 10:56:49 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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.1 2009/04/16 09:48:07 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2009 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:15 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:13 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2009/04/09 13:22:13 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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 2006/08/15 22:09:21 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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)\n"
+"if (tree [0] <> 100 and tree[0] <> 113)\n"
"{\n"
"if (registry_get (\'XMLA-DML\') = \'1\')\n"
"{\n"
@@ -10423,6 +10423,22 @@ 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"
@@ -10453,7 +10469,7 @@ static const char *proc138 =
"--src xmla.sql:263\n";
static const char *proc139 =
-"#line 388 \"[executable]/xmla.sql\"\n"
+"#line 404 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_not_local_dsn (in dsn varchar)\n"
"{\n"
@@ -10465,10 +10481,10 @@ static const char *proc139 =
"return 0;\n"
"return 1;\n"
"}\n"
-"--src xmla.sql:386\n";
+"--src xmla.sql:402\n";
static const char *proc140 =
-"#line 401 \"[executable]/xmla.sql\"\n"
+"#line 417 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_meta (in dta any)\n"
"{\n"
@@ -10494,7 +10510,7 @@ static const char *proc140 =
"}\n"
"return res;\n"
"}\n"
-"--src xmla.sql:399\n";
+"--src xmla.sql:415\n";
static const char *other64 =
"create method\n"
@@ -10724,6 +10740,8 @@ 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"
@@ -10770,7 +10788,7 @@ static const char *other70 =
"}\n";
static const char *proc141 =
-"#line 706 \"[executable]/xmla.sql\"\n"
+"#line 724 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_xsd (inout mdta any)\n"
"{\n"
@@ -10825,10 +10843,10 @@ static const char *proc141 =
"mdta := xml_tree_doc (xsd);\n"
"return;\n"
"}\n"
-"--src xmla.sql:704\n";
+"--src xmla.sql:722\n";
static const char *proc142 =
-"#line 762 \"[executable]/xmla.sql\"\n"
+"#line 780 \"[executable]/xmla.sql\"\n"
"create procedure xmla_make_struct (inout mdta any, inout dta any)\n"
"{\n"
"declare res any;\n"
@@ -10844,10 +10862,10 @@ static const char *proc142 =
"dta := res;\n"
"xmla_make_xsd (mdta);\n"
"}\n"
-"--src xmla.sql:760\n";
+"--src xmla.sql:778\n";
static const char *proc143 =
-"#line 779 \"[executable]/xmla.sql\"\n"
+"#line 797 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_element (in mdta any, in dta any)\n"
"{\n"
@@ -10862,6 +10880,8 @@ 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"
@@ -10870,7 +10890,7 @@ static const char *proc143 =
"}\n"
"return res;\n"
"}\n"
-"--src xmla.sql:777\n";
+"--src xmla.sql:795\n";
static const char *other71 =
"create method xmla_dbschema_columns () for xmla_discover\n"
@@ -10884,6 +10904,15 @@ 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"
@@ -10892,36 +10921,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"
@@ -10959,53 +10988,102 @@ 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, cat, tb, col, sch any;\n"
-"declare uname, passwd, _tbl varchar;\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"
"\n"
"dsn := self.xmla_get_property (\'DataSourceInfo\', xmla_service_name ());\n"
"dsn := xmla_get_dsn_name (dsn);\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"
+"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 (not xmla_not_local_dsn (dsn))\n"
+"if (p_cat is null) \n"
"{\n"
-"set_user_id (uname, 1, passwd);\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"
+"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"
-"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"
+"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"
+"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"
+"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"
"}\n"
"else\n"
"{\n"
"dsn := xmla_get_dsn_name (dsn);\n"
-"stmt := \'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = \'\'\' || _tbl || \'\'\' AND FK_TABLE = \'\'\' || _tbl\n"
+"stmt := \'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = \'\'\' \n"
+"|| _ptbl || \'\'\' AND FK_TABLE = \'\'\' || _ftbl\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"
@@ -11016,35 +11094,66 @@ static const char *other73 =
"{\n"
"declare state, msg, dta, mdta, stmt any;\n"
"declare dsn, cat, tb, col, sch any;\n"
-"declare uname, passwd, _tbl varchar;\n"
+"declare _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"
-"uname := self.xmla_get_property (\'UserName\', null);\n"
-"passwd := self.xmla_get_property (\'Password\', null);\n"
+"\n"
+"if (cat is null)\n"
+"cat := \'%\';\n"
+"if (sch is null)\n"
+"sch := \'%\';\n"
+"if (tb is null)\n"
+"tb := \'%\';\n"
+"\n"
"cat := trim (cat, \'\"\');\n"
"sch := trim (sch, \'\"\');\n"
"tb := trim (tb, \'\"\');\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"
+"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"
"set_user_id (uname, 1, passwd);\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"
+"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"
"}\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"
@@ -11134,13 +11243,21 @@ static const char *other75 =
"create method xmla_dbschema_tables () for xmla_discover\n"
"{\n"
"declare dta, mdta any;\n"
-"declare dsn, cat, tb any;\n"
+"declare dsn, cat, sch, tb any;\n"
"\n"
"dsn := self.xmla_get_property (\'DataSourceInfo\', xmla_service_name ());\n"
"dsn := xmla_get_dsn_name (dsn);\n"
-"\n"
-"tb := self.xmla_get_restriction (\'TABLE_NAME\', \'%\');\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"
"if (not xmla_not_local_dsn (dsn))\n"
"{\n"
"declare uname, passwd varchar;\n"
@@ -11160,9 +11277,12 @@ 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) = ? 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"
+"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"
"}\n"
"else\n"
"{\n"
@@ -11185,7 +11305,7 @@ static const char *other76 =
"}\n";
static const char *proc144 =
-"#line 1120 \"[executable]/xmla.sql\"\n"
+"#line 1240 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_schs ()\n"
"{\n"
@@ -11201,12 +11321,11 @@ 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\', \'\', \'TABLE_TYPE\', \'\', \'COLUMN_NAME\', \'\')\n"
+"soap_box_structure (\'TABLE_CATALOG\', \'\', \'TABLE_SCHEMA\', \'\', \'TABLE_NAME\', \'\')\n"
",\'\'),\n"
"vector (\'DBSCHEMA_FOREIGN_KEYS\',\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"
+"soap_box_structure (\'PK_TABLE_CATALOG\', \'\', \'PK_TABLE_SCHEMA\', \'\', \'PK_TABLE_NAME\', \'\',\n"
+"\'FK_TABLE_CATALOG\', \'\', \'FK_TABLE_SCHEMA\', \'\', \'FK_TABLE_NAME\', \'\')\n"
",\'\'),\n"
"vector (\'DBSCHEMA_PROVIDER_TYPES\',\n"
"soap_box_structure (\'DATA_TYPE\', \'\', \'BEST_MATCH\', \'\')\n"
@@ -11231,10 +11350,10 @@ static const char *proc144 =
",\'\')\n"
");\n"
"}\n"
-"--src xmla.sql:1118\n";
+"--src xmla.sql:1238\n";
static const char *proc145 =
-"#line 1168 \"[executable]/xmla.sql\"\n"
+"#line 1287 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_props (in _dsn varchar := NULL)\n"
"{\n"
@@ -11275,20 +11394,20 @@ static const char *proc145 =
"vector (\'UserName\' , \'\', \'string\', \'R/W\', 0, \'\')\n"
");\n"
"}\n"
-"--src xmla.sql:1166\n";
+"--src xmla.sql:1285\n";
static const char *proc146 =
-"#line 1210 \"[executable]/xmla.sql\"\n"
+"#line 1329 \"[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:1208\n";
+"--src xmla.sql:1327\n";
static const char *proc147 =
-"#line 1218 \"[executable]/xmla.sql\"\n"
+"#line 1337 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_is_local_service (in _dsn varchar)\n"
"{\n"
@@ -11296,10 +11415,10 @@ static const char *proc147 =
"return 0;\n"
"return 1;\n"
"}\n"
-"--src xmla.sql:1216\n";
+"--src xmla.sql:1335\n";
static const char *proc148 =
-"#line 1227 \"[executable]/xmla.sql\"\n"
+"#line 1346 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_set_props (in properties any)\n"
"{\n"
@@ -11321,10 +11440,10 @@ static const char *proc148 =
"}\n"
"return def_prop;\n"
"}\n"
-"--src xmla.sql:1225\n";
+"--src xmla.sql:1344\n";
static const char *proc149 =
-"#line 1250 \"[executable]/xmla.sql\"\n"
+"#line 1369 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_enums ()\n"
"{\n"
@@ -11356,10 +11475,10 @@ static const char *proc149 =
"vector(\'MDXSupportLevel\',\'\',\'string\',\'None\',\'\',25)\n"
");\n"
"}\n"
-"--src xmla.sql:1248\n";
+"--src xmla.sql:1367\n";
static const char *proc150 =
-"#line 1283 \"[executable]/xmla.sql\"\n"
+"#line 1402 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_literals ()\n"
"{\n"
@@ -11383,19 +11502,19 @@ static const char *proc150 =
"vector (\'DBLITERAL_QUOTE_SUFFIX\', \'\"\', \'\', \'\', 0)\n"
");\n"
"}\n"
-"--src xmla.sql:1281\n";
+"--src xmla.sql:1400\n";
static const char *proc151 =
-"#line 1309 \"[executable]/xmla.sql\"\n"
+"#line 1428 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_service_name ()\n"
"{\n"
"return \'Local_Instance\';\n"
"}\n"
-"--src xmla.sql:1307\n";
+"--src xmla.sql:1426\n";
static const char *proc152 =
-"#line 1317 \"[executable]/xmla.sql\"\n"
+"#line 1436 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_kwds ()\n"
"{\n"
@@ -11432,10 +11551,10 @@ static const char *proc152 =
"\'VARBINARY\', \'VARCHAR\', \'VARIABLE\', \'VIEW\', \'WHEN\', \'WHENEVER\', \'WHERE\', \'WHILE\', \'WITH\', \'WORK\', \'XML\', \'XPATH\'\n"
");\n"
"}\n"
-"--src xmla.sql:1315\n";
+"--src xmla.sql:1434\n";
static const char *proc153 =
-"#line 1356 \"[executable]/xmla.sql\"\n"
+"#line 1475 \"[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"
@@ -11461,10 +11580,10 @@ static const char *proc153 =
"}\n"
"\n"
"}\n"
-"--src xmla.sql:1354\n";
+"--src xmla.sql:1473\n";
static const char *proc154 =
-"#line 1383 \"[executable]/xmla.sql\"\n"
+"#line 1502 \"[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"
@@ -11499,7 +11618,7 @@ static const char *proc154 =
"cast (_line[11] as nvarchar));\n"
"}\n"
"}\n"
-"--src xmla.sql:1381\n";
+"--src xmla.sql:1500\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"
@@ -11524,7 +11643,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 1447 \"[executable]/xmla.sql\"\n"
+"#line 1566 \"[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"
@@ -11553,10 +11672,10 @@ static const char *proc155 =
"NULL, NULL, NULL, NULL, NULL);\n"
"}\n"
"}\n"
-"--src xmla.sql:1445\n";
+"--src xmla.sql:1564\n";
static const char *proc156 =
-"#line 1478 \"[executable]/xmla.sql\"\n"
+"#line 1597 \"[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"
@@ -11577,10 +11696,10 @@ static const char *proc156 =
"\n"
"exec (stmt, state, msg, vector (), 0, mdta, dta);\n"
"}\n"
-"--src xmla.sql:1476\n";
+"--src xmla.sql:1595\n";
static const char *proc157 =
-"#line 1501 \"[executable]/xmla.sql\"\n"
+"#line 1620 \"[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"
@@ -11637,7 +11756,7 @@ static const char *proc157 =
"\n"
"}\n"
"}\n"
-"--src xmla.sql:1499\n";
+"--src xmla.sql:1618\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"
@@ -11657,7 +11776,7 @@ static const char *view4 =
"(COLUMN_NAME VARCHAR)\n";
static const char *proc158 =
-"#line 1582 \"[executable]/xmla.sql\"\n"
+"#line 1701 \"[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"
@@ -11681,10 +11800,10 @@ static const char *proc158 =
"result (_pk_tables[3]);\n"
"}\n"
"}\n"
-"--src xmla.sql:1580\n";
+"--src xmla.sql:1699\n";
static const char *proc159 =
-"#line 1607 \"[executable]/xmla.sql\"\n"
+"#line 1726 \"[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"
@@ -11748,17 +11867,17 @@ static const char *proc159 =
"_fk_tables[8], _fk_tables[9], _fk_tables[10], _fk_tables[11]);\n"
"}\n"
"}\n"
-"--src xmla.sql:1605\n";
+"--src xmla.sql:1724\n";
static const char *proc160 =
-"#line 1672 \"[executable]/xmla.sql\"\n"
+"#line 1791 \"[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:1670\n";
+"--src xmla.sql:1789\n";
static const char *other77 =
"XMLA_USER_INIT ()\n";
@@ -11796,7 +11915,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 1733 \"[executable]/xmla.sql\"\n"
+"#line 1852 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_cursor_stmt_change (in _props any, inout _stmt varchar)\n"
"{\n"
@@ -11844,13 +11963,15 @@ static const char *proc161 =
"_left_str_u := ucase (_left_str, 6);\n"
"\n"
"if (_left_str_u = \'SELECT\')\n"
-"_stmt := replace (_stmt, _left_str, new_stmpt, 1);\n"
+"_stmt := new_stmpt || \' * FROM (\' || _stmt || \') __xml_dt0\' ;\n"
+"\n"
+"\n"
"\n"
"}\n"
-"--src xmla.sql:1731\n";
+"--src xmla.sql:1850\n";
static const char *proc162 =
-"#line 1785 \"[executable]/xmla.sql\"\n"
+"#line 1906 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_cursors_state (in _props any, inout _dta any, in stmt any)\n"
"{\n"
@@ -11933,10 +12054,10 @@ static const char *proc162 =
"_dta := _new_dta;\n"
"}\n"
"}\n"
-"--src xmla.sql:1783\n";
+"--src xmla.sql:1904\n";
static const char *proc163 =
-"#line 1870 \"[executable]/xmla.sql\"\n"
+"#line 1991 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_skip (in _skip any, in _add int, in _dir int)\n"
"{\n"
@@ -11963,19 +12084,19 @@ static const char *proc163 =
"\n"
"return ret;\n"
"}\n"
-"--src xmla.sql:1868\n";
+"--src xmla.sql:1989\n";
static const char *proc164 =
-"#line 1898 \"[executable]/xmla.sql\"\n"
+"#line 2019 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_version ()\n"
"{\n"
"return \'1.01\';\n"
"}\n"
-"--src xmla.sql:1896\n";
+"--src xmla.sql:2017\n";
static const char *proc165 =
-"#line 1906 \"[executable]/xmla.sql\"\n"
+"#line 2027 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_format_mdta (inout mdta any)\n"
"{\n"
@@ -11994,10 +12115,10 @@ static const char *proc165 =
"\n"
"aset (mdta, 0, temp);\n"
"}\n"
-"--src xmla.sql:1904\n";
+"--src xmla.sql:2025\n";
static const char *proc166 =
-"#line 1927 \"[executable]/xmla.sql\"\n"
+"#line 2048 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_rows_from_stmt (in stmt any)\n"
"{\n"
@@ -12022,10 +12143,10 @@ static const char *proc166 =
"\n"
"return dta[0][0];\n"
"}\n"
-"--src xmla.sql:1925\n";
+"--src xmla.sql:2046\n";
static const char *proc167 =
-"#line 1954 \"[executable]/xmla.sql\"\n"
+"#line 2075 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_sparql_result (inout mdta any, inout dta any, in stmt any)\n"
"{\n"
@@ -12055,7 +12176,7 @@ static const char *proc167 =
"}\n"
"}\n"
"}\n"
-"--src xmla.sql:1952\n";
+"--src xmla.sql:2073\n";
/* openxml.sql */
@@ -18777,12 +18898,12 @@ static const char *xsl31[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_add_locations.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -18839,12 +18960,12 @@ static const char *xsl32[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_expand.xsl,v 1.3 2006/08/15 22:09:21 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -19345,12 +19466,12 @@ static const char *xsl33[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_pre_xsd.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -19451,12 +19572,12 @@ static const char *xsl34[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_pre_sql.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -19667,12 +19788,12 @@ static const char *xsl35[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_log_format.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -19781,7 +19902,7 @@ static const char *xsd36[]= {
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -22985,12 +23106,12 @@ static const char *xsl37[]= {
"]>\n"
"<!--\n"
" - \n"
-" - $Id: vspx.xsl,v 1.7 2008/03/13 13:52:04 source Exp $\n"
+" - $Id$\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2006 OpenLink Software\n"
+" - Copyright (C) 1998-2012 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"
@@ -23270,7 +23391,7 @@ static const char *xsl37[]= {
" <xsl:if test=\"@on-error-redirect or @on-deadlock-retry\">\n"
"<xsl:text/> method vc_error_handler_<xsl:value-of select=\"$vspx_local_class_name\" /> (state any, message any, deadl any) returns any,\n"
" </xsl:if>\n"
-"<xsl:text/> method vc_redirect (url varchar) returns any,\n"
+"<xsl:text/> method vc_redirect (url any) returns any,\n"
"<xsl:text/> method vc_render_<xsl:value-of select=\"$vspx_local_class_name\" /> (control vspx_page) returns any\n"
";\n",
"<!-- The page UDT declaration end -->\n"
@@ -23501,7 +23622,7 @@ static const char *xsl37[]= {
";\n",
"</xsl:if>\n"
"\n"
-"create method vc_redirect (in url varchar) for <xsl:value-of select=\"$vspx_full_class_name\" />\n"
+"create method vc_redirect (in url any) for <xsl:value-of select=\"$vspx_full_class_name\" />\n"
"{\n"
" if (length (self.sid))\n"
" url := vspx_uri_add_parameters (url, sprintf ('sid=%s&realm=%s', self.sid, self.realm));\n"
@@ -26132,7 +26253,7 @@ static const char *xsl37[]= {
" while (inx < len) {\n"
" declare ctrl vspx_control;\n"
" ctrl := node.vc_children[inx];\n"
-" if (ctrl and udt_instance_of (ctrl, fix_identifier_case ('vspx_button'))) {\n"
+" if (ctrl is not null 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 d524703..57ef36b 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.7 2011/09/12 20:08:51 source Exp $
+# $Id$
#
# Embeds SQL code into a C file
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -343,13 +343,7 @@ BEGIN {
# does escape the symbols
fun = $0
- q = "\\\\"
- if (PROCINFO["version"] ~ /^4/)
- gsub ( q, q q, fun)
- else
- gsub ( q, q, fun)
-
- #WAS: gsub ( /\\/, "\\\\", fun)
+ 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 3258681..915fe41 100644
--- a/libsrc/Wi/sqlbif.c
+++ b/libsrc/Wi/sqlbif.c
@@ -1,14 +1,14 @@
/*
* sqlbif.c
*
- * $Id: sqlbif.c,v 1.122.2.70 2011/10/25 19:36:36 source Exp $
+ * $Id$
*
* SQL Built In Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -79,6 +79,8 @@ 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)))
@@ -113,7 +115,6 @@ 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);
@@ -759,7 +760,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;
}
@@ -917,12 +918,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;
@@ -944,28 +945,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;
}
@@ -1546,7 +1547,7 @@ bif_type_set (bif_type_t *bt, state_slot_t *ret, state_slot_t **params)
return;
if (bt->bt_func)
{
- long dt, sc_ret, sc_prec;
+ long dt = 0, sc_ret = 0, sc_prec = 0;
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;
@@ -1810,6 +1811,45 @@ 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");
@@ -2059,7 +2099,7 @@ bif_make_array (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return an empty string.
*/
-static dk_session_t *
+dk_session_t *
strses_subseq (dk_session_t *ses, long from, long to)
{
dk_session_t *out = strses_allocate ();
@@ -2250,7 +2290,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, (long)to, (long)len);
+ (long)from+1, (long)to+1, (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)
@@ -2609,7 +2649,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");
@@ -2618,16 +2658,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 */
@@ -2729,7 +2769,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;
@@ -4172,7 +4212,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:
@@ -5844,9 +5884,10 @@ bif_isfinitenumeric (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
result = _finite (val) ? 1 : 0;
#else
double myNAN_d = 0.0/0.0;
+ double myNEGNAN_d = -0.0/0.0;
double myPOSINF_d = 1.0/0.0;
double myNEGINF_d = -1.0/0.0;
- result = (((val == myNAN_d) || (val == myPOSINF_d) || (val == myNEGINF_d)) ? 0 : 1);
+ result = (((val == myNAN_d) || (val == myNEGNAN_d) || (val == myPOSINF_d) || (val == myNEGINF_d)) ? 0 : 1);
#endif
break;
}
@@ -6132,9 +6173,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;
}
- notnull_found = 1;
- if (DVC_GREATER == cmp_boxes (a, best, coll, coll))
+ else if (DVC_GREATER == cmp_boxes (a, best, coll, coll))
best = a;
}
if (notnull_found)
@@ -6159,9 +6200,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;
}
- notnull_found = 1;
- if (DVC_LESS == cmp_boxes (a, best, coll, coll))
+ else if (DVC_LESS == cmp_boxes (a, best, coll, coll))
best = a;
}
if (notnull_found)
@@ -6566,7 +6607,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 (qst, args, 0, "abs");
+ caddr_t arg = bif_arg_unrdf (qst, args, 0, "abs");
dtp_t dtp = DV_TYPE_OF (arg);
switch (dtp)
{
@@ -6738,6 +6779,13 @@ 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)
@@ -7674,12 +7722,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 = (inputs + inputs_len);
+ end_ptr = (unsigned char *)(inputs + inputs_len);
/* First count the number of occurrences of ampersands in inputs */
{
occurrences = 1; /* Always at least one element. */
- ptr = inputs;
+ ptr = (unsigned char *)inputs;
while ((ptr < end_ptr)) /* (ptr = strchr(ptr,sep1)) */
{
if (sep1 == *ptr++)
@@ -7708,7 +7756,7 @@ bif_split_and_decode (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
/* Start scanning the inputs string again. */
{
- ptr = inputs;
+ ptr = (unsigned char *)inputs;
reading_value = 0;
counting_only = 1;
vec_inx = 0;
@@ -8075,14 +8123,18 @@ bif_get_keyword (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
char *me = "get_keyword";
int n_args = BOX_ELEMENTS (args);
caddr_t item = bif_arg (qst, args, 0, me);
- caddr_t arr = (caddr_t) bif_array_arg (qst, args, 1, me);
+ caddr_t arr = (caddr_t) bif_array_or_null_arg (qst, args, 1, me);
long is_set_0 = (long) ((n_args > 3) ? bif_long_arg (qst, args, 3, me) : 0);
int inx;
- dtp_t vectype = DV_TYPE_OF (arr);
- int boxlen = (is_string_type (vectype)
+ dtp_t vectype;
+ int boxlen, len;
+ if (NULL == arr)
+ return (n_args > 2 ? box_copy_tree (bif_arg (qst, args, 2, me)) : NEW_DB_NULL);
+ vectype = DV_TYPE_OF (arr);
+ boxlen = (is_string_type (vectype)
? box_length (arr) - 1
: box_length (arr));
- int len = (boxlen / get_itemsize_of_vector (vectype));
+ len = (boxlen / get_itemsize_of_vector (vectype));
/* Try also lvectors and dvectors.
if (DV_ARRAY_OF_POINTER != box_tag (arr))
sqlr_new_error ("42000", "XXX", "get_keyword expects a vector");
@@ -8157,12 +8209,15 @@ bif_get_keyword_ucase (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
char *me = "get_keyword_ucase";
int n_args = BOX_ELEMENTS (args);
caddr_t item = bif_string_or_uname_arg (qst, args, 0, me);
- caddr_t arr = (caddr_t) bif_array_arg (qst, args, 1, me);
+ caddr_t arr = (caddr_t) bif_array_or_null_arg (qst, args, 1, me);
long is_set_0 = (long) ((n_args > 3) ? bif_long_arg (qst, args, 3, me) : 0);
int inx;
- dtp_t vectype = DV_TYPE_OF (arr);
- int len = BOX_ELEMENTS (arr);
-
+ dtp_t vectype;
+ int len;
+ if (NULL == arr)
+ return (n_args > 2 ? box_copy_tree (bif_arg (qst, args, 2, me)) : NEW_DB_NULL);
+ vectype = DV_TYPE_OF (arr);
+ len = BOX_ELEMENTS (arr);
if (DV_ARRAY_OF_POINTER != box_tag (arr))
sqlr_new_error ("22023", "SR058", "get_keyword expects a vector");
@@ -8262,27 +8317,50 @@ bif_one_of_these (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
char *me = "one_of_these";
query_instance_t * qi = (query_instance_t *) qst;
int n_args = BOX_ELEMENTS (args);
- caddr_t item = bif_arg (qst, args, 0, me);
+ caddr_t raw_item = bif_arg /* no _unrdf */ (qst, args, 0, me);
+ dtp_t raw_item_dtp = DV_TYPE_OF (raw_item);
+ caddr_t item = (((DV_RDF == raw_item_dtp) && ((rdf_box_t *)raw_item)->rb_is_complete) ? ((rdf_box_t *)raw_item)->rb_box : raw_item);
dtp_t item_dtp = DV_TYPE_OF (item);
int inx;
- caddr_t value;
- dtp_t val_dtp;
int they_match;
-
for (inx = 1; inx < n_args; inx++)
{
- caddr_t values = qst_get (qst, args[inx]);
- int is_array = DV_ARRAY_OF_POINTER == DV_TYPE_OF (values);
- int nth, n_values = is_array ? BOX_ELEMENTS (values) : 1;
+ caddr_t raw_values = qst_get (qst, args[inx]);
+ caddr_t *values;
+ int nth, n_values;
+ if (DV_ARRAY_OF_POINTER == DV_TYPE_OF ((caddr_t)raw_values))
+ {
+ values = (caddr_t *)raw_values;
+ n_values = BOX_ELEMENTS (values);
+ }
+ else
+ {
+ values = (caddr_t *)(&raw_values);
+ n_values = 1;
+ }
for (nth = 0; nth < n_values; nth++)
{
- value = is_array ? ((caddr_t*)values)[nth] : values;
+ caddr_t value = values[nth];
+ dtp_t val_dtp = DV_TYPE_OF (value);
+ if (DV_RDF == val_dtp)
+ {
+ if (((rdf_box_t *)value)->rb_is_complete)
+ {
+ value = ((rdf_box_t *)value)->rb_box;
val_dtp = DV_TYPE_OF (value);
+ }
+ else if (DV_RDF != raw_item_dtp)
+ continue;
+ else if (((rdf_box_t *)value)->rb_ro_id != ((rdf_box_t *)raw_item)->rb_ro_id)
+ continue;
+ else
+ return box_bool (1);
+ }
if (IS_WIDE_STRING_DTP (item_dtp) && IS_STRING_DTP (val_dtp))
{
caddr_t wide = box_narrow_string_as_wide ((unsigned char *) value, NULL, 0, QST_CHARSET (qst), err_ret, 1);
if (*err_ret)
- return NULL;
+ return box_bool (0);
they_match = boxes_match (item, wide);
dk_free_box (wide);
}
@@ -8290,7 +8368,7 @@ bif_one_of_these (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t wide = box_narrow_string_as_wide ((unsigned char *) item, NULL, 0, QST_CHARSET (qst), err_ret, 1);
if (*err_ret)
- return NULL;
+ return box_bool (0);
they_match = boxes_match (wide, value);
dk_free_box (wide);
}
@@ -8305,7 +8383,7 @@ bif_one_of_these (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
*err_ret = NULL;
continue;
}
- return NULL;
+ return box_bool (0);
}
else
they_match = boxes_match (item, tmp_val);
@@ -8314,10 +8392,10 @@ bif_one_of_these (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
else
they_match = boxes_match (item, value);
if (they_match)
- return (box_num (inx));
+ return box_bool (1);
}
}
- return (box_num (0));
+ return box_bool (0);
}
@@ -8676,6 +8754,9 @@ bif_page_dump (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
}
END_DO_SET ();
+ if (dp < 0 || dp >= wi_inst.wi_master->dbs_n_pages)
+ sqlr_new_error ("22023", "SR...", "The page %ld is out of range", dp);
+
buf = &buf_auto;
memset (&buf_auto, 0, sizeof (buf_auto));
buf->bd_buffer = bd_buffer;
@@ -8726,7 +8807,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;
}
@@ -8738,7 +8819,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;
}
@@ -8750,7 +8831,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;
}
@@ -9120,7 +9201,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:
@@ -9136,7 +9217,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;
@@ -9174,16 +9255,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;
}
@@ -9207,7 +9288,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:
@@ -9253,43 +9334,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:
{
@@ -9395,11 +9476,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;
@@ -9475,7 +9556,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;
}
@@ -9501,7 +9582,6 @@ 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
@@ -9573,7 +9653,7 @@ caddr_t
bif_cast_internal (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t data = bif_arg (qst, args, 0, "__cast_internal");
- ST * dtp_st = (ST *) bif_arg (qst, args, 1, "cast_internal");
+ ST * dtp_st = (ST *) bif_arg (qst, args, 1, "__cast_internal");
dtp_t arg_dtp = DV_TYPE_OF (data);
if (DV_SHORT_STRING == arg_dtp || DV_LONG_STRING == arg_dtp)
@@ -9592,6 +9672,22 @@ bif_cast_internal (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return NULL;
}
+caddr_t
+bif_stub_impl (const char *fname)
+{
+ sqlr_new_error ("22023", "SR468", "%.200s() can not be called as plain built-in function, it's a macro handled by SQL compiler", fname);
+ return NULL;
+}
+
+#define BIF_STUB(bifname,fname) caddr_t bifname (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { return bif_stub_impl (fname); }
+
+BIF_STUB (bif_stub_ssl_const , "__ssl_const" )
+BIF_STUB (bif_stub_coalesce , "coalesce" )
+BIF_STUB (bif_stub_exists , "exists" )
+BIF_STUB (bif_stub_contains , "contains" )
+BIF_STUB (bif_stub_xpath_contains , "xpath_contains" )
+BIF_STUB (bif_stub_xquery_contains , "xquery_contains" )
+BIF_STUB (bif_stub_xcontains , "xcontains" )
caddr_t
@@ -10513,7 +10609,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
{
@@ -10685,7 +10781,8 @@ 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_arg (qst, args, 1, "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;
query_instance_t *qi = (query_instance_t *) (qst);
user_t *usr = sec_name_to_user (u_name);
@@ -10697,8 +10794,21 @@ 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 (strlen (u_pwd) == 0)
+ if ((DV_WIDE == DV_TYPE_OF (u_pwd)) ? (0 == ((wchar_t *)u_pwd)[0]) : ('\0' == 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)
@@ -10707,6 +10817,7 @@ 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;
@@ -10725,6 +10836,7 @@ 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;
}
@@ -11369,6 +11481,8 @@ 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;
@@ -12005,20 +12119,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));
@@ -12559,11 +12673,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];
@@ -12571,29 +12685,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;
}
@@ -12606,7 +12720,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];
@@ -13304,6 +13418,33 @@ 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 ()
{
@@ -13708,6 +13849,727 @@ 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 ((const unsigned char *)arg, box_length(arg)) );
+ case DV_WIDE:
+ return (caddr_t)box_num( virt_wcslen ((wchar_t *)(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 ((const char *)(src + max_bytes), VIRT_MB_CUR_MAX, &state);
+ }
+
+ box = dk_alloc_box (max_bytes + 1, DV_STRING);
+
+ strncpy (box, (const char *)(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 ((const unsigned char *)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 ((const wchar_t *)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);
+ 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
@@ -13761,6 +14623,7 @@ 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);
@@ -13978,6 +14841,14 @@ sql_bif_init (void)
bif_define ("blob_page", bif_blob_page);
bif_define_typed ("_cvt", bif_convert, &bt_convert);
bif_define ("__cast_internal", bif_cast_internal);
+ bif_define ("__ssl_const", bif_stub_ssl_const);
+ bif_define ("coalesce", bif_stub_coalesce);
+ bif_define ("exists", bif_stub_exists);
+ bif_define ("contains", bif_stub_contains);
+ bif_define ("xpath_contains", bif_stub_xpath_contains);
+ bif_define ("xquery_contains", bif_stub_xquery_contains);
+ bif_define ("xcontains", bif_stub_xcontains);
+ bif_define_typed ("exists", bif_stub_exists, &bt_integer);
st_varchar = (sql_tree_tmp *) list (3, DV_LONG_STRING, 0, 0);
st_nvarchar = (sql_tree_tmp *) list (3, DV_LONG_WIDE, 0, 0);
@@ -14050,6 +14921,7 @@ 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);
@@ -14145,6 +15017,8 @@ 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 f824e2e..8487190 100644
--- a/libsrc/Wi/sqlbif.h
+++ b/libsrc/Wi/sqlbif.h
@@ -1,14 +1,14 @@
/*
* sqlbif.h
*
- * $Id: sqlbif.h,v 1.29.2.12 2011/10/25 19:36:36 source Exp $
+ * $Id$
*
* SQL Built In Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -149,7 +149,7 @@ extern sql_tree_tmp * st_varchar;
extern sql_tree_tmp * st_nvarchar;
int is_allowed (char * path);
-extern void file_path_assert (caddr_t fname_cvt, caddr_t *err_ret, int free_fname_cvt);
+EXE_EXPORT (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,8 +198,10 @@ caddr_t box_hmac (caddr_t box, caddr_t key, int alg);
#define HMAC_ALG_RIPMD160 1
#endif
-int32 sqlbif_rnd (int32* seed);
-extern int32 rnd_seed_b;
+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 */
int virtuoso_sleep (long secs, long tms);
void sqls_define_2pc (void);
@@ -228,6 +230,7 @@ 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 e258058..fe68f56 100644
--- a/libsrc/Wi/sqlbif2.c
+++ b/libsrc/Wi/sqlbif2.c
@@ -1,14 +1,14 @@
/*
* sqlbif2.c
*
- * $Id: sqlbif2.c,v 1.31.2.15 2011/07/13 19:09:43 source Exp $
+ * $Id$
*
* SQL Built In Functions. Part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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 ((caddr_t)base_uri, base_cs, buffer_cs_upcase, &base_uri_is_temp, err_ret);
+ 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);
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 ((caddr_t)rel_uri, rel_cs, buffer_cs_upcase, &rel_uri_is_temp, err_ret);
+ 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);
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 (boxed_buffer, buffer_cs_upcase, output_cs_upcase, &res_is_new, err_ret);
+ res = charset_recode_from_named_to_named ((query_instance_t *)NULL, boxed_buffer, buffer_cs_upcase, output_cs_upcase, &res_is_new, err_ret);
if (res_is_new)
dk_free_box (boxed_buffer);
else
@@ -1374,6 +1374,8 @@ 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);
@@ -1598,13 +1600,110 @@ bif_format_number (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return res;
}
+static caddr_t
+soundex (caddr_t name)
+{
+#define raw_toupper(C) ((C) & (255-32))
+ char tmp[5] = {'0','0','0','0',0} , current_code = '\0', previous_code = '\0';
+ int inx = 0, i = 0;
+ if (box_length (name) > 1)
+ {
+ while (name[inx] && !isalpha (name[inx])) inx ++;
+ if (name[inx]) tmp[i++] = raw_toupper (name[inx++]);
+ for (; inx < box_length (name) - 1; inx ++)
+ {
+ char c;
+ c = raw_toupper (name[inx]);
+ if (!isalpha (c)) continue;
+ current_code = '\0';
+ if (strchr ("BFPV", c))
+ current_code = '1';
+ else if (strchr ("CSKGJQXZ", c))
+ current_code = '2';
+ else if (strchr ("DT", c))
+ current_code = '3';
+ else if (strchr ("L", c))
+ current_code = '4';
+ else if (strchr ("MN", c))
+ current_code = '5';
+ else if (strchr ("R", c))
+ current_code = '6';
+ if (current_code != previous_code && current_code != '\0')
+ tmp [i++] = current_code;
+ if (i >= 4) break;
+ /*if (current_code != '\0')*/
+ previous_code = current_code;
+ }
+ for (;i < 4; i ++)
+ tmp[i] = '0';
+ }
+ return box_dv_short_string (tmp);
+}
+
+static caddr_t
+bif_soundex (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+{
+ caddr_t name = bif_string_arg (qst, args, 0, "soundex");
+ return soundex (name);
+}
+
+static caddr_t
+bif_difference (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+{
+ caddr_t name1 = bif_string_arg (qst, args, 0, "difference");
+ caddr_t name2 = bif_string_arg (qst, args, 1, "difference");
+ caddr_t soundex1, soundex2;
+ int result = 0;
+ char tmp[3] = {0,0,0};
+ if (box_length (name1) <= 1 || box_length (name2) <= 1)
+ return box_num (0);
+ soundex1 = soundex (name1);
+ soundex2 = soundex (name2);
+ if (!strcmp (soundex1, soundex2))
+ {
+ result = 4;
+ goto ret;
+ }
+ if (soundex1[0] == soundex2[0])
+ result = 1;
+ if (strstr (soundex2, soundex1 + 1)) /* 2,3,4 */
+ {
+ result += 3;
+ goto ret;
+ }
+ if (strstr (soundex2, soundex1 + 2)) /* 3,4 */
+ {
+ result += 2;
+ goto ret;
+ }
+ memcpy (&tmp[0], soundex1 + 1, 2);
+ if (strstr (soundex2, tmp)) /* 2,3 */
+ {
+ result += 2;
+ goto ret;
+ }
+ if (strchr (soundex2, soundex1[1]))
+ result ++;
+ if (strchr (soundex2, soundex1[2]))
+ result ++;
+ if (strchr (soundex2, soundex1[3]))
+ result ++;
+ret:
+ dk_free_box (soundex1);
+ dk_free_box (soundex2);
+ return box_num (result);
+}
static caddr_t
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)
@@ -1635,7 +1734,10 @@ sqlbif2_init (void)
bif_define ("patch_restricted_xml_chars", bif_patch_restricted_xml_chars);
bif_define_typed ("format_number", bif_format_number, &bt_varchar);
bif_define ("__stop_cpt", bif_stop_cpt);
+ bif_define ("soundex", bif_soundex);
+ bif_define ("difference", bif_difference);
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 7f14c1e..97d6918 100644
--- a/libsrc/Wi/sqlcmps.h
+++ b/libsrc/Wi/sqlcmps.h
@@ -1,14 +1,14 @@
/*
* sqlcmps.h
*
- * $Id: sqlcmps.h,v 1.14.2.11 2010/11/15 16:51:56 source Exp $
+ * $Id$
*
* SQL Compiler Data Structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlcomp.c b/libsrc/Wi/sqlcomp.c
index 4ccfee5..93de019 100644
--- a/libsrc/Wi/sqlcomp.c
+++ b/libsrc/Wi/sqlcomp.c
@@ -1,14 +1,14 @@
/*
* sqlcomp.c
*
- * $Id: sqlcomp.c,v 1.7.2.7 2010/02/18 10:57:16 source Exp $
+ * $Id$
*
* Dynamic SQL Compiler
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlcomp.h b/libsrc/Wi/sqlcomp.h
index f263faa..0d0bb42 100644
--- a/libsrc/Wi/sqlcomp.h
+++ b/libsrc/Wi/sqlcomp.h
@@ -1,14 +1,14 @@
/*
* sqlcomp.h
*
- * $Id: sqlcomp.h,v 1.4.2.1 2009/04/18 21:55:15 source Exp $
+ * $Id$
*
* SQL Query Description
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlcomp2.c b/libsrc/Wi/sqlcomp2.c
index 26caacd..7f95a4a 100644
--- a/libsrc/Wi/sqlcomp2.c
+++ b/libsrc/Wi/sqlcomp2.c
@@ -1,14 +1,14 @@
/*
* sqlcomp2.c
*
- * $Id: sqlcomp2.c,v 1.21.2.10 2011/09/13 14:50:10 source Exp $
+ * $Id$
*
* Dynamic SQL Compiler, part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1465,8 +1465,11 @@ DBG_NAME(sql_compile_1) (DBG_PARAMS const char *string2, client_connection_t * c
is_ddl = sql_is_ddl (tree);
if (!is_ddl)
{
- semaphore_leave (parse_sem);
- inside_sem = 0;
+ if (inside_sem)
+ {
+ semaphore_leave (parse_sem);
+ inside_sem = 0;
+ }
}
else
sqlc_inside_sem = 1;
@@ -1715,7 +1718,18 @@ 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 = DBG_NAME(sql_compile_1) (DBG_ARGS string2, cli, &my_err, cr_type, NULL, 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);
if (NULL != err)
err[0] = my_err;
if (NULL == qr)
@@ -1805,7 +1819,18 @@ query_t *
sql_compile_static (const char *string2, client_connection_t * cli,
caddr_t * err, volatile int cr_type)
{
- query_t *qr = DBG_NAME(sql_compile_1) (DBG_ARGS string2, cli, err, cr_type, NULL, 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);
return qr;
}
#endif
diff --git a/libsrc/Wi/sqlcost.c b/libsrc/Wi/sqlcost.c
index 11ad87c..12c491f 100644
--- a/libsrc/Wi/sqlcost.c
+++ b/libsrc/Wi/sqlcost.c
@@ -1,14 +1,14 @@
/*
* sqlcost.c
*
- * $Id: sqlcost.c,v 1.30.2.37 2011/10/13 11:03:08 source Exp $
+ * $Id$
*
* sql cost functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -362,6 +362,12 @@ 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)
{
@@ -2026,8 +2032,13 @@ dfe_table_cost_ic_1 (df_elt_t * dfe, index_choice_t * ic, int inx_only)
else
{
/* here we should check if row spec was used to take samples */
- col_arity *= p_arity;
- col_cost += p_cost * col_arity;
+ if (!(sqlo_sample_dep_cols &&
+ (lower ? !sqlo_in_list (lower, NULL, NULL) && pred_const_rhs (lower) : 1) &&
+ (upper ? !sqlo_in_list (upper, NULL, NULL) && pred_const_rhs (upper) : 1)))
+ {
+ col_arity *= p_arity;
+ col_cost += p_cost * col_arity;
+ }
}
}
else
diff --git a/libsrc/Wi/sqlcr.c b/libsrc/Wi/sqlcr.c
index 75d1e30..1521dd3 100644
--- a/libsrc/Wi/sqlcr.c
+++ b/libsrc/Wi/sqlcr.c
@@ -1,14 +1,14 @@
/*
* sqlstmts.c
*
- * $Id: sqlcr.c,v 1.7.2.4 2010/11/15 16:51:56 source Exp $
+ * $Id$
*
* Dynamic SQL Statement Compilations
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlcstate.h b/libsrc/Wi/sqlcstate.h
index a8b43c0..39bd38b 100644
--- a/libsrc/Wi/sqlcstate.h
+++ b/libsrc/Wi/sqlcstate.h
@@ -1,12 +1,12 @@
/*
* sqlcstate.h
*
- * $Id: sqlcstate.h,v 1.4.2.2 2009/04/18 21:55:15 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqldf.c b/libsrc/Wi/sqldf.c
index 4f62b59..e827bc7 100644
--- a/libsrc/Wi/sqldf.c
+++ b/libsrc/Wi/sqldf.c
@@ -1,14 +1,14 @@
/*
* sqldf.c
*
- * $Id: sqldf.c,v 1.60.2.30 2011/06/22 13:29:31 source Exp $
+ * $Id$
*
* sql expression dependencies and code layout
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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
+ || (requiring->dfe_locus == required->dfe_locus && required->dfe_type != DFE_CALL) /* can happen it's a standard function in same scope but result required */
|| required->dfe_type == DFE_CONST)
return;
{
@@ -1667,6 +1667,32 @@ 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)
@@ -1876,6 +1902,8 @@ 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))
{
@@ -2349,6 +2377,7 @@ sqlo_cols_by_pos (sqlo_t *so, df_elt_t * dfe, ptrlong * list)
t_set_push (&res, t_list (3, COL_DOTTED, dfe->_.sub.ot->ot_new_prefix, sel[pos]->_.as_exp.name));
}
END_DO_BOX;
+ res = t_set_nreverse (res);
return res;
}
@@ -2433,6 +2462,7 @@ sqlo_trans_preds (dk_set_t * cols, dk_set_t preds, dk_set_t * pred_rhs_ret, dk_s
}
END_DO_SET();
*unused_preds_ret = t_set_union (*unused_preds_ret, t_set_diff (preds, used_preds));
+ pred_rhs_ret[0] = t_set_nreverse (pred_rhs_ret[0]);
}
@@ -2496,7 +2526,8 @@ sqlo_trans_dt_1_way (sqlo_t * so, df_elt_t * dfe, dk_set_t preds, ptrlong * in_p
t_set_push (&importable, (void*)pred_dfe);
}
END_DO_SET();
-
+ tl->tl_params = t_set_nreverse (tl->tl_params);
+ importable = t_set_nreverse (importable);
DO_SET (dk_set_t, out_pair, &out)
{
dk_set_t rhs = out_pair->next;
@@ -2507,6 +2538,7 @@ sqlo_trans_dt_1_way (sqlo_t * so, df_elt_t * dfe, dk_set_t preds, ptrlong * in_p
t_set_push (&tl->tl_target, rhs_dfe);
}
END_DO_SET();
+ tl->tl_target = t_set_nreverse (tl->tl_target);
save = dfe->_.sub.ot->ot_trans;
dfe->_.sub.ot->ot_trans = NULL;
copy_dfe = sqlo_dt_renamed_copy (so, dfe);
@@ -2617,12 +2649,13 @@ sqlo_place_trans_dt (sqlo_t * so, df_elt_t * dfe, dk_set_t preds)
rhs_dfe = sqlo_df (so, all_eq);
sqlo_place_exp (so, dfe->dfe_super, rhs_dfe);
t_set_push (&tl->tl_params, rhs_dfe);
-
pred = (ST*)in_pair->data;
pred_dfe = sqlo_df (so, pred);
t_set_push (&importable, (void*)pred_dfe);
}
END_DO_SET();
+ tl->tl_params = t_set_nreverse (tl->tl_params);
+ importable = t_set_nreverse (importable);
save = dfe->_.sub.ot->ot_trans;
dfe->_.sub.ot->ot_trans = NULL;
sqlo_place_dt (so, dfe, importable);
@@ -2649,12 +2682,13 @@ sqlo_place_trans_dt (sqlo_t * so, df_elt_t * dfe, dk_set_t preds)
rhs_dfe = sqlo_df (so, all_eq);
sqlo_place_exp (so, dfe->dfe_super, rhs_dfe);
t_set_push (&tl->tl_params, rhs_dfe);
-
pred = (ST*)in_pair->data;
pred_dfe = sqlo_df (so, pred);
t_set_push (&importable, (void*)pred_dfe);
}
END_DO_SET();
+ tl->tl_params = t_set_nreverse (tl->tl_params);
+ importable = t_set_nreverse (importable);
save = dfe->_.sub.ot->ot_trans;
dfe->_.sub.ot->ot_trans = NULL;
sqlo_place_dt (so, dfe, importable);
@@ -3275,7 +3309,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
@@ -3415,12 +3449,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;
}
@@ -5297,8 +5331,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)
{
@@ -5309,13 +5343,12 @@ 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))
@@ -5980,12 +6013,15 @@ sqlo_layout_1 (sqlo_t * so, op_table_t * ot, int is_top)
}
}
/* GK: all the predicates should be placed by now */
- DO_SET (df_elt_t *, pred, &so->so_this_dt->ot_preds)
+ if (so->so_this_dt->ot_from_dfes)
{
- if (!pred->dfe_is_placed)
- SQL_GPF_T1 (so->so_sc->sc_cc, "Unplaced predicate in select layout");
+ 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 ();
}
- 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 68d8452..c52b0c0 100644
--- a/libsrc/Wi/sqlexp.c
+++ b/libsrc/Wi/sqlexp.c
@@ -1,14 +1,14 @@
/*
* sqlexp.c
*
- * $Id: sqlexp.c,v 1.16.2.24 2011/07/19 23:38:34 source Exp $
+ * $Id$
*
* Dynamic SQL Expression Generator
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -239,8 +239,10 @@ 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 *)(act_params[n_params - 1]))[0] = aux_ssl->ssl_index;
+ ((ptrlong *)(new_pars[n_params - 1]))[0] = aux_ssl->ssl_index;
+ act_params = new_pars;
}
if (ret_param)
params = (state_slot_t **) t_alloc_box ((n_params + 1) * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
@@ -1382,9 +1384,12 @@ 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);
- pred_gen_1 (sc, tree->_.bin_exp.left, code, temp_succ, fail, unkn);
+ jmp_label_t temp_unkn = sqlc_new_label (sc);
+ pred_gen_1 (sc, tree->_.bin_exp.left, code, temp_succ, fail, temp_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 ca406e5..fa2ce13 100644
--- a/libsrc/Wi/sqlfn.h
+++ b/libsrc/Wi/sqlfn.h
@@ -1,12 +1,12 @@
/*
* sqlfn.h
*
- * $Id: sqlfn.h,v 1.46.2.15 2011/09/12 20:08:52 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -210,10 +210,7 @@ caddr_t qi_bunion_reset (query_instance_t * qi, query_t * qr, int is_subq);
-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);
+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_dml_array_exec (client_connection_t * cli, query_t * qr,
query_instance_t * caller, caddr_t cr_name, srv_stmt_t * stmt,
@@ -352,6 +349,8 @@ void ddl_node_input (ddl_node_t * ddl, caddr_t * inst, caddr_t * state);
void read_proc_tables (int remotes);
void ddl_read_constraints (char *spec_tb_name, caddr_t *qst);
+void read_proc_and_trigger_tables (int remotes);
+void read_utd_method_tables (void);
void ddl_init_schema (void);
diff --git a/libsrc/Wi/sqlgen.c b/libsrc/Wi/sqlgen.c
index 0889111..d0038b3 100644
--- a/libsrc/Wi/sqlgen.c
+++ b/libsrc/Wi/sqlgen.c
@@ -1,14 +1,14 @@
/*
* sqlgen.c
*
- * $Id: sqlgen.c,v 1.39.2.29 2011/09/21 15:22:37 source Exp $
+ * $Id$
*
* sql executable graph generation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -121,6 +121,13 @@ 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;
@@ -128,6 +135,7 @@ 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))
{
@@ -1515,7 +1523,7 @@ sqlg_make_trans_dt (sqlo_t * so, df_elt_t * dt_dfe, ST **target_names, dk_set_t
}
}
END_DO_BOX;
- tn->tn_input = (state_slot_t**)box_copy (trans->_.trans.in);
+ tn->tn_input = (state_slot_t**)box_copy ((caddr_t)(trans->_.trans.in));
inx = 0;
DO_SET (df_elt_t *, in, &tl->tl_params)
{
@@ -1525,7 +1533,7 @@ sqlg_make_trans_dt (sqlo_t * so, df_elt_t * dt_dfe, ST **target_names, dk_set_t
END_DO_SET();
if (tl->tl_target)
{
- tn->tn_target = dk_alloc_box_zero (sizeof (caddr_t) * dk_set_length (tl->tl_target), DV_BIN);
+ tn->tn_target = (state_slot_t **)dk_alloc_box_zero (sizeof (caddr_t) * dk_set_length (tl->tl_target), DV_BIN);
inx = 0;
DO_SET (df_elt_t *, in, &tl->tl_target)
{
@@ -1540,7 +1548,7 @@ sqlg_make_trans_dt (sqlo_t * so, df_elt_t * dt_dfe, ST **target_names, dk_set_t
tn->tn_inlined_step->qr_select_node->src_gen.src_input = (qn_input_fn) select_node_input_subq;
tn->tn_input_pos = (caddr_t*)box_copy_tree ((caddr_t) (TRANS_LR == tl->tl_direction ? trans->_.trans.in : trans->_.trans.out));
tn->tn_output_pos = (caddr_t*)box_copy_tree ((caddr_t) (TRANS_LR == tl->tl_direction ? trans->_.trans.out : trans->_.trans.in));
- tn->tn_output = (state_slot_t **) box_copy (trans->_.trans.out);
+ tn->tn_output = (state_slot_t **) box_copy ((caddr_t)(trans->_.trans.out));
DO_BOX (caddr_t, n, inx, tn->tn_output_pos)
{
tn->tn_output[inx] = tn_nth_col (sc, tn, unbox (n));
diff --git a/libsrc/Wi/sqlhash.c b/libsrc/Wi/sqlhash.c
index 6d828f9..7cfac01 100644
--- a/libsrc/Wi/sqlhash.c
+++ b/libsrc/Wi/sqlhash.c
@@ -1,14 +1,14 @@
/*
* sqlhash.c
*
- * $Id: sqlhash.c,v 1.5.2.9 2010/10/29 14:11:04 source Exp $
+ * $Id$
*
* Dynamic SQL Compiler, part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -223,8 +223,6 @@ 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 bdf9b26..e916da1 100644
--- a/libsrc/Wi/sqlintrp.c
+++ b/libsrc/Wi/sqlintrp.c
@@ -1,14 +1,14 @@
/*
* sqlintrp.c
*
- * $Id: sqlintrp.c,v 1.21.2.13 2010/11/15 16:51:56 source Exp $
+ * $Id$
*
* SQL interpreter
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -877,6 +877,7 @@ 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 bfefe06..4768607 100644
--- a/libsrc/Wi/sqlintrp.h
+++ b/libsrc/Wi/sqlintrp.h
@@ -1,14 +1,14 @@
/*
* sqlintrp.h
*
- * $Id: sqlintrp.h,v 1.6.2.3 2011/05/17 21:14:47 source Exp $
+ * $Id$
*
* SQL Interpreter Run Time Data
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlinx.c b/libsrc/Wi/sqlinx.c
index 2993aa0..03d6365 100644
--- a/libsrc/Wi/sqlinx.c
+++ b/libsrc/Wi/sqlinx.c
@@ -1,12 +1,12 @@
/*
- * $Id: sqlinx.c,v 1.1.2.7 2010/03/24 01:02:12 source Exp $
+ * $Id$
*
* Index selection
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlnode.h b/libsrc/Wi/sqlnode.h
index b8b9912..abc50fc 100644
--- a/libsrc/Wi/sqlnode.h
+++ b/libsrc/Wi/sqlnode.h
@@ -1,14 +1,14 @@
/*
* sqlnode.h
*
- * $Id: sqlnode.h,v 1.30.2.16 2010/10/29 14:12:27 source Exp $
+ * $Id$
*
* SQL query nodes
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1357,6 +1357,7 @@ caddr_t _br_cstm (caddr_t stmt);
#define U_ID_WS 4 /* the WS user is needed to define compatibile WebDAV views */
#define U_ID_NOBODY 5
#define U_ID_NOGROUP 6
+#define U_ID_RDF_REPL 7
#define U_ID_FIRST 100 /* first free U_ID, let reserve space for a future system accounts */
struct tp_data_s;
@@ -1598,6 +1599,7 @@ extern void sqls_define_uddi (void);
extern void sqls_define_imsg (void);
extern void sqls_define_auto (void);
extern void sqls_define_sparql (void);
+extern void sqls_define_sparql_init (void);
extern void sqls_define_sys (void);
extern void sqls_define_repl (void);
extern void sqls_define_ws (void);
diff --git a/libsrc/Wi/sqlo.c b/libsrc/Wi/sqlo.c
index 8833b6f..d16abe9 100644
--- a/libsrc/Wi/sqlo.c
+++ b/libsrc/Wi/sqlo.c
@@ -1,14 +1,14 @@
/*
* sqlo.c
*
- * $Id: sqlo.c,v 1.15.2.17 2011/03/17 13:55:20 source Exp $
+ * $Id$
*
* sql scope inference
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -36,6 +36,7 @@
#include "arith.h"
#include "security.h"
#include "sqlo.h"
+#include "remote.h"
#define CHECK_OBSERVER(tree_ptr) \
@@ -866,6 +867,7 @@ sqlo_add_table_ref (sqlo_t * so, ST ** tree_ret, dk_set_t *res)
view = (ST*) sch_view_def (so->so_sc->sc_cc->cc_schema, tb->tb_name);
if (!view || inside_view)
{
+ remote_table_t * rt = find_remote_table (tb->tb_name, 0);
t_NEW_VARZ (op_table_t, ot);
ot->ot_opts = ST_OPT (tree, caddr_t *, _.table.opts);
ot->ot_prefix = tree->_.table.prefix;
@@ -873,6 +875,7 @@ sqlo_add_table_ref (sqlo_t * so, ST ** tree_ret, dk_set_t *res)
ot->ot_new_prefix = t_box_string (tmp);
tree->_.table.prefix = ot->ot_new_prefix;
ot->ot_table = tb;
+ ot->ot_rds = rt ? rt->rt_rds : NULL;
ot->ot_u_id = (oid_t) unbox (tree->_.table.u_id);
ot->ot_g_id = (oid_t) unbox (tree->_.table.g_id);
if (ST_P (view, PROC_TABLE))
@@ -2992,6 +2995,8 @@ 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 47fcb9d..783523e 100644
--- a/libsrc/Wi/sqlo.h
+++ b/libsrc/Wi/sqlo.h
@@ -1,14 +1,14 @@
/*
* sqlo.h
*
- * $Id: sqlo.h,v 1.22.2.14 2011/10/13 11:05:09 source Exp $
+ * $Id$
*
* sql opt graph
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqloby.c b/libsrc/Wi/sqloby.c
index 22c27ec..fe09415 100644
--- a/libsrc/Wi/sqloby.c
+++ b/libsrc/Wi/sqloby.c
@@ -1,14 +1,14 @@
/*
* sqloby.c
*
- * $Id: sqloby.c,v 1.7.2.6 2010/03/08 12:04:13 source Exp $
+ * $Id$
*
* sql order and group compilation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -841,6 +841,7 @@ 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)
@@ -849,6 +850,13 @@ 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 efb97cb..526cdf9 100644
--- a/libsrc/Wi/sqlocr.c
+++ b/libsrc/Wi/sqlocr.c
@@ -1,14 +1,14 @@
/*
* sqlocr.c
*
- * $Id: sqlocr.c,v 1.4.2.3 2010/02/18 10:57:17 source Exp $
+ * $Id$
*
* sql opt cursors inference
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlocr.h b/libsrc/Wi/sqlocr.h
index 0b66764..0dcbfb5 100644
--- a/libsrc/Wi/sqlocr.h
+++ b/libsrc/Wi/sqlocr.h
@@ -1,12 +1,12 @@
/*
* sqlocr.h
*
- * $Id: sqlocr.h,v 1.4.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlofn.h b/libsrc/Wi/sqlofn.h
index c14f2a8..34e6792 100644
--- a/libsrc/Wi/sqlofn.h
+++ b/libsrc/Wi/sqlofn.h
@@ -1,14 +1,14 @@
/*
* sqlofn.h
*
- * $Id: sqlofn.h,v 1.3.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* sql opt export functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqloinv.c b/libsrc/Wi/sqloinv.c
index 38d1558..fd2057c 100644
--- a/libsrc/Wi/sqloinv.c
+++ b/libsrc/Wi/sqloinv.c
@@ -1,14 +1,14 @@
/*
* sqloinv.c
*
- * $Id: sqloinv.c,v 1.6.2.4 2010/02/18 10:57:17 source Exp $
+ * $Id$
*
* sql inverse functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqloinv.h b/libsrc/Wi/sqloinv.h
index 7733d53..6709d58 100644
--- a/libsrc/Wi/sqloinv.h
+++ b/libsrc/Wi/sqloinv.h
@@ -1,12 +1,12 @@
/*
* sqloinv.h
*
- * $Id: sqloinv.h,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqloinx.c b/libsrc/Wi/sqloinx.c
index 8010c40..76b2759 100644
--- a/libsrc/Wi/sqloinx.c
+++ b/libsrc/Wi/sqloinx.c
@@ -1,14 +1,14 @@
/*
* sqloinx.c
*
- * $Id: sqloinx.c,v 1.17.2.5 2010/02/15 19:46:03 source Exp $
+ * $Id$
*
* sql expression dependencies and code layout
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlopcod.h b/libsrc/Wi/sqlopcod.h
index ab45319..3de8d57 100644
--- a/libsrc/Wi/sqlopcod.h
+++ b/libsrc/Wi/sqlopcod.h
@@ -1,12 +1,12 @@
/*
* sqlopcod.h
*
- * $Id: sqlopcod.h,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqloprt.c b/libsrc/Wi/sqloprt.c
index 351b986..87f87a9 100644
--- a/libsrc/Wi/sqloprt.c
+++ b/libsrc/Wi/sqloprt.c
@@ -1,14 +1,14 @@
/*
* sqloprt.c
*
- * $Id: sqloprt.c,v 1.6.2.4 2011/06/22 13:30:38 source Exp $
+ * $Id$
*
* sql opt intermediate diag
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -332,11 +332,12 @@ sqlo_dfe_print (df_elt_t * dfe, int offset)
}
if (DFE_DT == dfe->dfe_type && dfe->_.sub.trans)
sqlo_print ((" dt transitive\n"));
- for (elt = dfe->_.sub.first->dfe_next; elt; elt = elt->dfe_next)
- {
- sqlo_dfe_print (elt, offset + OFS_INCR);
- sqlo_print (("\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"));
+ }
sqlo_print (("%*.*s", offset, offset, " "));
sqlo_print (("}\n"));
diff --git a/libsrc/Wi/sqlorder.c b/libsrc/Wi/sqlorder.c
index 1b629ee..06ed762 100644
--- a/libsrc/Wi/sqlorder.c
+++ b/libsrc/Wi/sqlorder.c
@@ -1,14 +1,14 @@
/*
* sqlorder.c
*
- * $Id: sqlorder.c,v 1.5.2.4 2009/09/27 22:03:57 source Exp $
+ * $Id$
*
* SQL ORDER BY
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlovdb.c b/libsrc/Wi/sqlovdb.c
index 3b02914..9579bf0 100644
--- a/libsrc/Wi/sqlovdb.c
+++ b/libsrc/Wi/sqlovdb.c
@@ -1,14 +1,14 @@
/*
* sqlovdb.c
*
- * $Id: sqlovdb.c,v 1.5.2.4 2010/09/17 16:50:59 source Exp $
+ * $Id$
*
* SQL remote table layout and emote SQL generation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -63,6 +63,11 @@ 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 1308e7f..bed30d6 100644
--- a/libsrc/Wi/sqlpar.h
+++ b/libsrc/Wi/sqlpar.h
@@ -1,14 +1,14 @@
/*
* sqlpar.h
*
- * $Id: sqlpar.h,v 1.3.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* SQL Parse Tree
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlparext.h b/libsrc/Wi/sqlparext.h
index 47c6da5..53ea468 100644
--- a/libsrc/Wi/sqlparext.h
+++ b/libsrc/Wi/sqlparext.h
@@ -1,14 +1,14 @@
/*
* sqlparext.h
*
- * $Id: sqlparext.h,v 1.12.2.7 2010/02/18 10:57:17 source Exp $
+ * $Id$
*
* SQL Parse Tree defines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlpfn.c b/libsrc/Wi/sqlpfn.c
index 7eda756..b7ff62b 100644
--- a/libsrc/Wi/sqlpfn.c
+++ b/libsrc/Wi/sqlpfn.c
@@ -1,14 +1,14 @@
/*
* sqlpfn.c
*
- * $Id: sqlpfn.c,v 1.20.2.8 2011/08/26 17:57:06 source Exp $
+ * $Id$
*
* Parser Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlpfn.h b/libsrc/Wi/sqlpfn.h
index 7f07b7a..9bfae6f 100644
--- a/libsrc/Wi/sqlpfn.h
+++ b/libsrc/Wi/sqlpfn.h
@@ -1,14 +1,14 @@
/*
* sqlpfn.h
*
- * $Id: sqlpfn.h,v 1.8.2.7 2011/08/26 17:57:06 source Exp $
+ * $Id$
*
* SQL Parser Utility Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -220,23 +220,6 @@ extern size_t get_yyleng (void);
int scn3_sprint_curr_line_loc (char *buf, size_t max_buf);
extern int scn3_pragmaline_depth;
void scn3_set_file_line (char *file, int file_nchars, int line_no);
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
-# else
-int yyparse ();
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-#ifdef __cplusplus
-}
-#endif
-
int bop_weight (int bop);
extern char *part_tok (char ** place);
diff --git a/libsrc/Wi/sqlprocc.c b/libsrc/Wi/sqlprocc.c
index 1184079..dad72cd 100644
--- a/libsrc/Wi/sqlprocc.c
+++ b/libsrc/Wi/sqlprocc.c
@@ -1,14 +1,14 @@
/*
* sqlprocc.c
*
- * $Id: sqlprocc.c,v 1.7.2.5 2010/10/29 14:12:27 source Exp $
+ * $Id$
*
* SQL Procedure Compiler
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlprt.c b/libsrc/Wi/sqlprt.c
index 6b1327c..bdd7463 100644
--- a/libsrc/Wi/sqlprt.c
+++ b/libsrc/Wi/sqlprt.c
@@ -1,14 +1,14 @@
/*
* sqlprt.c
*
- * $Id: sqlprt.c,v 1.6.2.3 2009/08/19 07:29:55 source Exp $
+ * $Id$
*
* SQL Statement Printer
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlrbuf.c b/libsrc/Wi/sqlrbuf.c
index c67d2d4..9ccbc6f 100644
--- a/libsrc/Wi/sqlrbuf.c
+++ b/libsrc/Wi/sqlrbuf.c
@@ -1,14 +1,14 @@
/*
* sqlrbuf.c
*
- * $Id: sqlrbuf.c,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* VDB SQL Remote query execution.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlrcomp.c b/libsrc/Wi/sqlrcomp.c
index 359a7bc..bf61607 100644
--- a/libsrc/Wi/sqlrcomp.c
+++ b/libsrc/Wi/sqlrcomp.c
@@ -1,14 +1,14 @@
/*
* sqlrcomp.c
*
- * $Id: sqlrcomp.c,v 1.7.2.7 2011/01/11 22:41:31 source Exp $
+ * $Id$
*
* SQL Compiler, VDB remote database access
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlrcomp.h b/libsrc/Wi/sqlrcomp.h
index 8c65600..d8e1dab 100644
--- a/libsrc/Wi/sqlrcomp.h
+++ b/libsrc/Wi/sqlrcomp.h
@@ -1,12 +1,12 @@
/*
* sqlrcomp.h
*
- * $Id: sqlrcomp.h,v 1.6.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlrrun.c b/libsrc/Wi/sqlrrun.c
index d684f63..22514ed 100644
--- a/libsrc/Wi/sqlrrun.c
+++ b/libsrc/Wi/sqlrrun.c
@@ -1,14 +1,14 @@
/*
* sqlrrun.c
*
- * $Id: sqlrrun.c,v 1.8.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* VDB SQL Remote query execution.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlrun.c b/libsrc/Wi/sqlrun.c
index 9a92539..3d1b60d 100644
--- a/libsrc/Wi/sqlrun.c
+++ b/libsrc/Wi/sqlrun.c
@@ -1,14 +1,14 @@
/*
* sqlrun.c
*
- * $Id: sqlrun.c,v 1.24.2.21 2011/03/11 18:26:43 source Exp $
+ * $Id$
*
* SQL query execution
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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,9 +3422,12 @@ qr_dml_array_exec (client_connection_t * cli, query_t * qr,
return err;
}
dk_free_box (detail);
- 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);
+ 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);
+ }
#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 8f9714a..f5a55dd 100644
--- a/libsrc/Wi/sqlsrv.c
+++ b/libsrc/Wi/sqlsrv.c
@@ -1,14 +1,14 @@
/*
* sqlsrv.c
*
- * $Id: sqlsrv.c,v 1.36.2.33 2011/08/26 17:59:53 source Exp $
+ * $Id$
*
* SQL server functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2353,6 +2353,12 @@ 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);
@@ -2865,6 +2871,10 @@ 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)
@@ -2874,7 +2884,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->sst_inst)
+ if (stmt && stmt->sst_inst)
{
query_instance_t *qi = stmt->sst_inst;
caddr_t val;
@@ -2892,7 +2902,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_send_bytes (qi->qi_trx, val, how_much, 0, BLOB_CHAR);
}
else
{
@@ -2992,15 +3002,14 @@ 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 is_wide, 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 blob_type, 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 = is_wide ? DV_BLOB_WIDE_HANDLE : DV_BLOB_HANDLE;
+ dtp_t bh_tag = blob_type == BLOB_WIDE ? DV_BLOB_WIDE_HANDLE : DV_BLOB_HANDLE;
blob_handle_t * bh = bh_alloc (bh_tag);
dbe_key_t *key;
@@ -3046,7 +3055,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_send_bytes (trx, (caddr_t) bh, how_much, 1, blob_type);
IN_TXN;
is_timeout = lt_leave (trx);
@@ -3061,8 +3070,9 @@ 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 is_wide, long timestamp),
- (dp_from, how_much, starting_at, bh_key_id, bh_frag_no, page_dir, page_array, is_wide, 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 blob_type,
+ long timestamp),
+ (dp_from, how_much, starting_at, bh_key_id, bh_frag_no, page_dir, page_array, blob_type, timestamp))
#define sf_sql_get_data_ac sf_sql_get_data_ac_w
#endif
@@ -3916,11 +3926,14 @@ 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 f66629a..0f24488 100644
--- a/libsrc/Wi/sqlstmts.c
+++ b/libsrc/Wi/sqlstmts.c
@@ -1,14 +1,14 @@
/*
* sqlstmts.c
*
- * $Id: sqlstmts.c,v 1.12.2.6 2011/07/19 23:30:14 source Exp $
+ * $Id$
*
* Dynamic SQL Statement Compilations
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqltrig.c b/libsrc/Wi/sqltrig.c
index 4d5161b..020391c 100644
--- a/libsrc/Wi/sqltrig.c
+++ b/libsrc/Wi/sqltrig.c
@@ -1,14 +1,14 @@
/*
* sqltrig.c
*
- * $Id: sqltrig.c,v 1.5.2.2 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* Triggers
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqltype.c b/libsrc/Wi/sqltype.c
index a22f1ba..fcf7ce0 100644
--- a/libsrc/Wi/sqltype.c
+++ b/libsrc/Wi/sqltype.c
@@ -1,14 +1,14 @@
/*
* sqltype.c
*
- * $Id: sqltype.c,v 1.16.2.8 2010/11/15 16:51:57 source Exp $
+ * $Id$
*
* User defined types routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqltype.h b/libsrc/Wi/sqltype.h
index 6ba3b9a..b0b7823 100644
--- a/libsrc/Wi/sqltype.h
+++ b/libsrc/Wi/sqltype.h
@@ -1,10 +1,10 @@
/*
- * $Id: sqltype.h,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqltype_c.h b/libsrc/Wi/sqltype_c.h
index caa3407..56bd0f3 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.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlver.c b/libsrc/Wi/sqlver.c
index 9b75dc0..089ca22 100644
--- a/libsrc/Wi/sqlver.c
+++ b/libsrc/Wi/sqlver.c
@@ -1,14 +1,14 @@
/*
* sqlver.c
*
- * $Id: sqlver.c,v 1.5.2.1 2009/04/18 21:55:16 source Exp $
+ * $Id$
*
* Build information
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlver.h b/libsrc/Wi/sqlver.h
index 11036c2..4990f47 100644
--- a/libsrc/Wi/sqlver.h
+++ b/libsrc/Wi/sqlver.h
@@ -1,14 +1,14 @@
/*
* sqlver.h
*
- * $Id: sqlver.h,v 1.49.2.15 2011/02/03 09:25:01 source Exp $
+ * $Id$
*
* Build & Version information, license control
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -25,7 +25,7 @@
*
*/
-#define PRODUCT_COPYRIGHT "Copyright (C) 1998-2011 OpenLink Software"
+#define PRODUCT_COPYRIGHT "Copyright (C) 1998-2012 OpenLink Software"
#define PRODUCT_NAME "OpenLink Virtuoso"
/* DBMS Server */
diff --git a/libsrc/Wi/sqlview.c b/libsrc/Wi/sqlview.c
index ee884fa..d4d0b97 100644
--- a/libsrc/Wi/sqlview.c
+++ b/libsrc/Wi/sqlview.c
@@ -1,14 +1,14 @@
/*
* sqlview.c
*
- * $Id: sqlview.c,v 1.7.2.4 2010/11/15 16:51:57 source Exp $
+ * $Id$
*
* SQL Compiler, view, derived table, union
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlwords.gperf b/libsrc/Wi/sqlwords.gperf
index 3540a86..a1d75d9 100644
--- a/libsrc/Wi/sqlwords.gperf
+++ b/libsrc/Wi/sqlwords.gperf
@@ -1,10 +1,10 @@
/*
- * $Id: sqlwords.gperf,v 1.11.2.3 2010/02/01 12:53:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/sqlwords.h b/libsrc/Wi/sqlwords.h
index 81b0a51..41d25c4 100644
--- a/libsrc/Wi/sqlwords.h
+++ b/libsrc/Wi/sqlwords.h
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.2 */
+/* ANSI-C code produced by gperf version 3.0.3 */
/* 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 87
-#define MAX_HASH_VALUE 2329
-/* maximum key range = 2243, duplicates = 0 */
+#define MIN_HASH_VALUE 153
+#define MAX_HASH_VALUE 2029
+/* maximum key range = 1877, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -50,34 +50,34 @@ hash (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 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
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 182, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 59, 252, 199, 337, 7,
+ 328, 214, 440, 277, 202, 89, 112, 241, 204, 191,
+ 393, 506, 104, 157, 183, 153, 505, 22, 486, 147,
+ 203, 2030, 2030, 2030, 2030, 433, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
+ 2030, 2030, 2030, 2030, 2030, 2030, 2030
};
- register int hval = len;
+ register int hval = (int)len;
switch (hval)
{
@@ -106,630 +106,630 @@ hash (register const char *str, register unsigned int len)
static const struct keyword wordlist[] =
{
-#line 67 "./sqlwords.gperf"
- {"C", C},
-#line 198 "./sqlwords.gperf"
- {"NAME", NAME_L},
+#line 255 "./sqlwords.gperf"
+ {"REVOKE", REVOKE},
+#line 186 "./sqlwords.gperf"
+ {"LEVEL", LEVEL_L},
+#line 120 "./sqlwords.gperf"
+ {"ELSE", ELSE},
+#line 246 "./sqlwords.gperf"
+ {"RENAME", RENAME},
#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 97 "./sqlwords.gperf"
- {"CUBE", CUBE},
-#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 107 "./sqlwords.gperf"
- {"DECLARE", DECLARE},
-#line 235 "./sqlwords.gperf"
- {"PUBLIC", PUBLIC},
-#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 50 "./sqlwords.gperf"
+ {"AS", AS},
+#line 67 "./sqlwords.gperf"
+ {"C", C},
#line 217 "./sqlwords.gperf"
{"OR", OR},
-#line 49 "./sqlwords.gperf"
- {"ARRAY", ARRAY},
-#line 181 "./sqlwords.gperf"
- {"JOIN", JOIN},
-#line 246 "./sqlwords.gperf"
- {"RENAME", RENAME},
-#line 199 "./sqlwords.gperf"
- {"NATURAL", NATURAL},
-#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 157 "./sqlwords.gperf"
- {"IN", IN_L},
+#line 256 "./sqlwords.gperf"
+ {"REXECUTE", REXECUTE},
+#line 45 "./sqlwords.gperf"
+ {"ALTER", ALTER},
+#line 184 "./sqlwords.gperf"
+ {"LANGUAGE", LANGUAGE},
+#line 261 "./sqlwords.gperf"
+ {"SAFE", SAFE_L},
+#line 182 "./sqlwords.gperf"
+ {"KEY", KEY},
#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 125 "./sqlwords.gperf"
- {"ESCAPE", ESCAPE},
-#line 51 "./sqlwords.gperf"
- {"ASC", ASC},
+#line 196 "./sqlwords.gperf"
+ {"MODULE", MODULE},
+#line 335 "./sqlwords.gperf"
+ {"WORK", WORK},
+#line 49 "./sqlwords.gperf"
+ {"ARRAY", ARRAY},
+#line 314 "./sqlwords.gperf"
+ {"UNDER", UNDER},
+#line 198 "./sqlwords.gperf"
+ {"NAME", NAME_L},
+#line 241 "./sqlwords.gperf"
+ {"REAL", REAL},
#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 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 58 "./sqlwords.gperf"
+ {"BEFORE", BEFORE},
+#line 48 "./sqlwords.gperf"
+ {"ARE", ARE},
+#line 269 "./sqlwords.gperf"
+ {"SET", SET},
+#line 243 "./sqlwords.gperf"
+ {"REFERENCES", REFERENCES},
+#line 268 "./sqlwords.gperf"
+ {"SERIALIZABLE", SERIALIZABLE_L},
+#line 188 "./sqlwords.gperf"
+ {"LIKE", LIKE},
+#line 185 "./sqlwords.gperf"
+ {"LEFT", LEFT},
+#line 125 "./sqlwords.gperf"
+ {"ESCAPE", ESCAPE},
+#line 303 "./sqlwords.gperf"
+ {"TEXT", TEXT_L},
+#line 240 "./sqlwords.gperf"
+ {"READS", READS},
+#line 44 "./sqlwords.gperf"
+ {"ALL", ALL},
+#line 260 "./sqlwords.gperf"
+ {"ROLE", ROLE_L},
#line 66 "./sqlwords.gperf"
{"BY", BY},
-#line 132 "./sqlwords.gperf"
- {"EXIT", EXIT},
-#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 285 "./sqlwords.gperf"
+ {"STYLE", STYLE},
+#line 124 "./sqlwords.gperf"
+ {"END", ENDX},
+#line 104 "./sqlwords.gperf"
+ {"DATE", DATE_L},
+#line 97 "./sqlwords.gperf"
+ {"CUBE", CUBE},
+#line 274 "./sqlwords.gperf"
+ {"SOME", SOME},
+#line 308 "./sqlwords.gperf"
+ {"TO", TO},
+#line 317 "./sqlwords.gperf"
+ {"UPDATE", UPDATE},
#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 196 "./sqlwords.gperf"
- {"MODULE", MODULE},
-#line 83 "./sqlwords.gperf"
- {"COBOL", COBOL},
-#line 184 "./sqlwords.gperf"
- {"LANGUAGE", LANGUAGE},
-#line 260 "./sqlwords.gperf"
- {"ROLE", ROLE_L},
-#line 27 "./sqlwords.gperf"
- {"__TAG", __TAG_L},
-#line 50 "./sqlwords.gperf"
- {"AS", AS},
-#line 120 "./sqlwords.gperf"
- {"ELSE", ELSE},
-#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 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 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 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 194 "./sqlwords.gperf"
- {"MODIFY", MODIFY},
-#line 228 "./sqlwords.gperf"
- {"PLI", PLI},
-#line 131 "./sqlwords.gperf"
- {"EXTRACT", EXTRACT},
+#line 316 "./sqlwords.gperf"
+ {"UNIQUE", UNIQUE},
+#line 204 "./sqlwords.gperf"
+ {"NO", NO_L},
+#line 144 "./sqlwords.gperf"
+ {"GENERAL", GENERAL},
+#line 176 "./sqlwords.gperf"
+ {"IS", IS},
+#line 199 "./sqlwords.gperf"
+ {"NATURAL", NATURAL},
+#line 146 "./sqlwords.gperf"
+ {"GO", GO},
+#line 214 "./sqlwords.gperf"
+ {"ON", ON},
+#line 109 "./sqlwords.gperf"
+ {"DELETE", DELETE_L},
#line 220 "./sqlwords.gperf"
{"OUTER", OUTER},
-#line 336 "./sqlwords.gperf"
- {"XML", XML},
+#line 313 "./sqlwords.gperf"
+ {"TRIGGER", TRIGGER},
+#line 46 "./sqlwords.gperf"
+ {"AND", AND},
+#line 103 "./sqlwords.gperf"
+ {"DATA", DATA},
+#line 68 "./sqlwords.gperf"
+ {"CALL", CALL},
+#line 47 "./sqlwords.gperf"
+ {"ANY", ANY},
+#line 250 "./sqlwords.gperf"
+ {"RESIGNAL", RESIGNAL},
+#line 72 "./sqlwords.gperf"
+ {"CAST", CAST},
+#line 60 "./sqlwords.gperf"
+ {"BEST", BEST},
+#line 61 "./sqlwords.gperf"
+ {"BETWEEN", BETWEEN},
+#line 254 "./sqlwords.gperf"
+ {"RETURNS", RETURNS},
+#line 262 "./sqlwords.gperf"
+ {"SAME_AS", SAME_AS},
#line 56 "./sqlwords.gperf"
{"AUTOREGISTER", AUTOREGISTER_L},
#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 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 42 "./sqlwords.gperf"
+ {"AFTER", AFTER},
+#line 213 "./sqlwords.gperf"
+ {"OLD", OLD},
+#line 95 "./sqlwords.gperf"
+ {"CREATE", CREATE},
+#line 242 "./sqlwords.gperf"
+ {"REF", REF},
+#line 252 "./sqlwords.gperf"
+ {"RESULT", RESULT},
+#line 54 "./sqlwords.gperf"
+ {"ATTRIBUTE", ATTRIBUTE},
+#line 183 "./sqlwords.gperf"
+ {"KEYSET", KEYSET},
+#line 306 "./sqlwords.gperf"
+ {"TIME", TIME},
+#line 332 "./sqlwords.gperf"
+ {"WHILE", WHILE},
+#line 253 "./sqlwords.gperf"
+ {"RETURN", RETURN},
+#line 219 "./sqlwords.gperf"
+ {"OUT", OUT_L},
+#line 157 "./sqlwords.gperf"
+ {"IN", IN_L},
+#line 258 "./sqlwords.gperf"
+ {"ROLLBACK", ROLLBACK},
#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 239 "./sqlwords.gperf"
+ {"READ", READ_L},
+#line 83 "./sqlwords.gperf"
+ {"COBOL", COBOL},
+#line 39 "./sqlwords.gperf"
+ {"ADA", ADA},
+#line 191 "./sqlwords.gperf"
+ {"LONG", LONG_L},
+#line 206 "./sqlwords.gperf"
+ {"NULL", NULLX},
+#line 236 "./sqlwords.gperf"
+ {"PURGE", PURGE},
+#line 78 "./sqlwords.gperf"
+ {"CLOSE", CLOSE},
+#line 115 "./sqlwords.gperf"
+ {"DO", DO},
+#line 201 "./sqlwords.gperf"
+ {"NEW", NEW},
+#line 102 "./sqlwords.gperf"
+ {"CURSOR", CURSOR},
+#line 110 "./sqlwords.gperf"
+ {"DESC", DESC},
+#line 320 "./sqlwords.gperf"
+ {"USING", USING},
+#line 203 "./sqlwords.gperf"
+ {"NOT", NOT},
#line 267 "./sqlwords.gperf"
{"SELF", SELF_L},
-#line 240 "./sqlwords.gperf"
- {"READS", READS},
-#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 194 "./sqlwords.gperf"
+ {"MODIFY", MODIFY},
+#line 40 "./sqlwords.gperf"
+ {"ADD", ADD},
+#line 55 "./sqlwords.gperf"
+ {"AUTHORIZATION", AUTHORIZATION},
+#line 319 "./sqlwords.gperf"
+ {"USER", USER},
+#line 273 "./sqlwords.gperf"
+ {"SOFT", SOFT},
+#line 171 "./sqlwords.gperf"
+ {"INTEGER", INTEGER},
+#line 147 "./sqlwords.gperf"
+ {"GOTO", GOTO},
+#line 51 "./sqlwords.gperf"
+ {"ASC", ASC},
#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 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 281 "./sqlwords.gperf"
- {"SQLSTATE", SQLSTATE_L},
-#line 225 "./sqlwords.gperf"
- {"PERCENT", PERCENT},
-#line 34 "./sqlwords.gperf"
- {"__SOAP_XML_TYPE", __SOAP_XML_TYPE},
+#line 148 "./sqlwords.gperf"
+ {"GRANT", GRANT},
+#line 197 "./sqlwords.gperf"
+ {"MUMPS", MUMPS},
+#line 251 "./sqlwords.gperf"
+ {"RESTRICT", RESTRICT},
+#line 163 "./sqlwords.gperf"
+ {"INDICATOR", INDICATOR},
+#line 88 "./sqlwords.gperf"
+ {"COMPRESS", COMPRESS},
+#line 315 "./sqlwords.gperf"
+ {"UNION", UNION},
+#line 266 "./sqlwords.gperf"
+ {"SELECT", SELECT},
+#line 284 "./sqlwords.gperf"
+ {"START", START_L},
#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 136 "./sqlwords.gperf"
+ {"FOR", FOR},
+#line 200 "./sqlwords.gperf"
+ {"NCHAR", NCHAR},
+#line 70 "./sqlwords.gperf"
+ {"CASCADE", CASCADE},
+#line 334 "./sqlwords.gperf"
+ {"WITHOUT", WITHOUT_L},
+#line 107 "./sqlwords.gperf"
+ {"DECLARE", DECLARE},
+#line 92 "./sqlwords.gperf"
+ {"CONTINUE", CONTINUE},
+#line 302 "./sqlwords.gperf"
+ {"TEMPORARY", TEMPORARY},
#line 331 "./sqlwords.gperf"
{"WHERE", WHERE},
-#line 156 "./sqlwords.gperf"
- {"IF", IF},
-#line 207 "./sqlwords.gperf"
- {"NULLIF", NULLIF},
+#line 181 "./sqlwords.gperf"
+ {"JOIN", JOIN},
+#line 52 "./sqlwords.gperf"
+ {"ASSEMBLY", ASSEMBLY_L},
+#line 151 "./sqlwords.gperf"
+ {"HANDLER", HANDLER},
+#line 41 "./sqlwords.gperf"
+ {"ADMIN", ADMIN_L},
+#line 82 "./sqlwords.gperf"
+ {"COALESCE", COALESCE},
+#line 322 "./sqlwords.gperf"
+ {"VALUE", VALUE},
+#line 170 "./sqlwords.gperf"
+ {"INT", INTEGER},
+#line 84 "./sqlwords.gperf"
+ {"COLLATE", COLLATE},
+#line 175 "./sqlwords.gperf"
+ {"INTO", INTO},
+#line 244 "./sqlwords.gperf"
+ {"REFERENCING", REFERENCING},
+#line 142 "./sqlwords.gperf"
+ {"FULL", FULL},
+#line 105 "./sqlwords.gperf"
+ {"DATETIME", DATETIME},
+#line 187 "./sqlwords.gperf"
+ {"LIBRARY", LIBRARY_L},
+#line 310 "./sqlwords.gperf"
+ {"TYPE", TYPE},
+#line 211 "./sqlwords.gperf"
+ {"OF", OF},
+#line 96 "./sqlwords.gperf"
+ {"CROSS", CROSS},
+#line 106 "./sqlwords.gperf"
+ {"DECIMAL", DECIMAL_L},
+#line 108 "./sqlwords.gperf"
+ {"DEFAULT", DEFAULT},
#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 118 "./sqlwords.gperf"
+ {"DTD", DTD},
+#line 275 "./sqlwords.gperf"
+ {"SOURCE", SOURCE},
+#line 93 "./sqlwords.gperf"
+ {"CONVERT", CONVERT},
+#line 321 "./sqlwords.gperf"
+ {"VALIDATE", VALIDATE_L},
+#line 195 "./sqlwords.gperf"
+ {"MODIFIES", MODIFIES},
+#line 132 "./sqlwords.gperf"
+ {"EXIT", EXIT},
+#line 168 "./sqlwords.gperf"
+ {"INSTANCE", INSTANCE_L},
+#line 325 "./sqlwords.gperf"
+ {"VARCHAR", VARCHAR},
+#line 205 "./sqlwords.gperf"
+ {"NOVALIDATE", NOVALIDATE_L},
+#line 333 "./sqlwords.gperf"
+ {"WITH", WITH},
#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 59 "./sqlwords.gperf"
+ {"BEGIN", BEGINX},
+#line 134 "./sqlwords.gperf"
+ {"FINAL", FINAL_L},
#line 100 "./sqlwords.gperf"
{"CURRENT_TIME", CURRENT_TIME},
-#line 65 "./sqlwords.gperf"
- {"BREAKUP", BREAKUP},
+#line 112 "./sqlwords.gperf"
+ {"DISABLE", DISABLE_L},
#line 247 "./sqlwords.gperf"
{"REPEATABLE", REPEATABLE_L},
+#line 133 "./sqlwords.gperf"
+ {"FETCH", FETCH},
+#line 79 "./sqlwords.gperf"
+ {"CLUSTER", CLUSTER},
+#line 156 "./sqlwords.gperf"
+ {"IF", IF},
+#line 189 "./sqlwords.gperf"
+ {"LOCATOR", LOCATOR},
#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 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 305 "./sqlwords.gperf"
+ {"TIES", TIES},
#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 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 308 "./sqlwords.gperf"
- {"TO", TO},
-#line 209 "./sqlwords.gperf"
- {"NVARCHAR", NVARCHAR},
-#line 174 "./sqlwords.gperf"
- {"INTERVAL", INTERVAL},
-#line 309 "./sqlwords.gperf"
- {"TOP", TOP},
+#line 225 "./sqlwords.gperf"
+ {"PERCENT", PERCENT},
+#line 152 "./sqlwords.gperf"
+ {"HAVING", HAVING},
+#line 232 "./sqlwords.gperf"
+ {"PRIMARY", PRIMARY},
+#line 173 "./sqlwords.gperf"
+ {"INTERNAL", INTERNAL},
+#line 190 "./sqlwords.gperf"
+ {"LOG", LOGX},
#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 293 "./sqlwords.gperf"
- {"T_FINAL_AS", T_FINAL_AS},
-#line 257 "./sqlwords.gperf"
- {"RIGHT", RIGHT},
-#line 244 "./sqlwords.gperf"
- {"REFERENCING", REFERENCING},
+#line 86 "./sqlwords.gperf"
+ {"COMMIT", COMMIT},
+#line 130 "./sqlwords.gperf"
+ {"EXTERNAL", EXTERNAL},
+#line 287 "./sqlwords.gperf"
+ {"SYSTEM", SYSTEM},
+#line 281 "./sqlwords.gperf"
+ {"SQLSTATE", SQLSTATE_L},
+#line 160 "./sqlwords.gperf"
+ {"INDEX", INDEX},
+#line 90 "./sqlwords.gperf"
+ {"CONSTRUCTOR", CONSTRUCTOR},
+#line 233 "./sqlwords.gperf"
+ {"PRIVILEGES", PRIVILEGES},
+#line 228 "./sqlwords.gperf"
+ {"PLI", PLI},
+#line 326 "./sqlwords.gperf"
+ {"VARIABLE", VARIABLE},
#line 283 "./sqlwords.gperf"
{"STATIC", STATIC_L},
-#line 183 "./sqlwords.gperf"
- {"KEYSET", KEYSET},
-#line 93 "./sqlwords.gperf"
- {"CONVERT", CONVERT},
+#line 329 "./sqlwords.gperf"
+ {"WHEN", WHEN},
+#line 73 "./sqlwords.gperf"
+ {"CHAR", CHARACTER},
+#line 257 "./sqlwords.gperf"
+ {"RIGHT", RIGHT},
+#line 127 "./sqlwords.gperf"
+ {"EXCLUSIVE", EXCLUSIVE},
+#line 129 "./sqlwords.gperf"
+ {"EXISTS", EXISTS},
+#line 128 "./sqlwords.gperf"
+ {"EXECUTE", EXECUTE},
+#line 278 "./sqlwords.gperf"
+ {"SQL", SQL_L},
+#line 63 "./sqlwords.gperf"
+ {"BINARY", BINARY},
+#line 135 "./sqlwords.gperf"
+ {"FLOAT", FLOAT_L},
+#line 91 "./sqlwords.gperf"
+ {"CONTAINS", CONTAINS},
+#line 294 "./sqlwords.gperf"
+ {"T_IN", T_IN},
+#line 296 "./sqlwords.gperf"
+ {"T_MIN", T_MIN},
+#line 276 "./sqlwords.gperf"
+ {"SPARQL", SPARQL_L},
+#line 131 "./sqlwords.gperf"
+ {"EXTRACT", EXTRACT},
+#line 167 "./sqlwords.gperf"
+ {"INSERT", INSERT},
+#line 208 "./sqlwords.gperf"
+ {"NUMERIC", NUMERIC},
+#line 85 "./sqlwords.gperf"
+ {"COLUMN", COLUMN},
+#line 123 "./sqlwords.gperf"
+ {"ENCODING", ENCODING},
+#line 116 "./sqlwords.gperf"
+ {"DOUBLE", DOUBLE_L},
+#line 75 "./sqlwords.gperf"
+ {"CHECK", CHECK},
+#line 165 "./sqlwords.gperf"
+ {"INOUT", INOUT_L},
+#line 327 "./sqlwords.gperf"
+ {"VECTOR", VECTOR_L},
#line 212 "./sqlwords.gperf"
{"OFF", OFF},
+#line 169 "./sqlwords.gperf"
+ {"INSTEAD", INSTEAD},
+#line 99 "./sqlwords.gperf"
+ {"CURRENT_DATE", CURRENT_DATE},
+#line 141 "./sqlwords.gperf"
+ {"FROM", FROM},
+#line 193 "./sqlwords.gperf"
+ {"METHOD", METHOD},
+#line 89 "./sqlwords.gperf"
+ {"CONSTRAINT", CONSTRAINT},
+#line 336 "./sqlwords.gperf"
+ {"XML", XML},
+#line 311 "./sqlwords.gperf"
+ {"TRANSACTION", TRANSACTION_L},
+#line 192 "./sqlwords.gperf"
+ {"LOOP", LOOP},
+#line 138 "./sqlwords.gperf"
+ {"FOREIGN", FOREIGN},
+#line 226 "./sqlwords.gperf"
+ {"PERMISSION_SET", PERMISSION_SET},
+#line 149 "./sqlwords.gperf"
+ {"GROUP", GROUP},
+#line 179 "./sqlwords.gperf"
+ {"IRI_ID_8", IRI_ID_8},
+#line 227 "./sqlwords.gperf"
+ {"PERSISTENT", PERSISTENT},
+#line 293 "./sqlwords.gperf"
+ {"T_FINAL_AS", T_FINAL_AS},
+#line 271 "./sqlwords.gperf"
+ {"SMALLINT", SMALLINT},
+#line 298 "./sqlwords.gperf"
+ {"T_NO_ORDER", T_NO_ORDER},
+#line 215 "./sqlwords.gperf"
+ {"OPEN", OPEN},
+#line 289 "./sqlwords.gperf"
+ {"T_DIRECTION", T_DIRECTION},
+#line 323 "./sqlwords.gperf"
+ {"VALUES", VALUES},
+#line 153 "./sqlwords.gperf"
+ {"HASH", HASH},
+#line 94 "./sqlwords.gperf"
+ {"CORRESPONDING", CORRESPONDING},
+#line 328 "./sqlwords.gperf"
+ {"VIEW", VIEW},
+#line 235 "./sqlwords.gperf"
+ {"PUBLIC", PUBLIC},
+#line 216 "./sqlwords.gperf"
+ {"OPTION", OPTION},
#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 145 "./sqlwords.gperf"
+ {"GENERATED", GENERATED},
+#line 119 "./sqlwords.gperf"
+ {"DYNAMIC", DYNAMIC},
+#line 304 "./sqlwords.gperf"
+ {"THEN", THEN},
#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 172 "./sqlwords.gperf"
+ {"INTERSECT", INTERSECT},
+#line 224 "./sqlwords.gperf"
+ {"PASSWORD", PASSWORD},
+#line 166 "./sqlwords.gperf"
+ {"INPUT", INPUT},
+#line 69 "./sqlwords.gperf"
+ {"CALLED", CALLED},
+#line 162 "./sqlwords.gperf"
+ {"INDEX_ONLY", INDEX_ONLY},
+#line 114 "./sqlwords.gperf"
+ {"DISTINCT", DISTINCT},
+#line 299 "./sqlwords.gperf"
+ {"T_OUT", T_OUT},
+#line 290 "./sqlwords.gperf"
+ {"T_DISTINCT", T_DISTINCT},
+#line 126 "./sqlwords.gperf"
+ {"EXCEPT", EXCEPT},
+#line 222 "./sqlwords.gperf"
+ {"PARTITION", PARTITION},
#line 150 "./sqlwords.gperf"
{"GROUPING", GROUPING},
-#line 298 "./sqlwords.gperf"
- {"T_NO_ORDER", T_NO_ORDER},
-#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 111 "./sqlwords.gperf"
+ {"DETERMINISTIC", DETERMINISTIC},
+#line 324 "./sqlwords.gperf"
+ {"VARBINARY", VARBINARY},
+#line 117 "./sqlwords.gperf"
+ {"DROP", DROP},
+#line 65 "./sqlwords.gperf"
+ {"BREAKUP", BREAKUP},
+#line 27 "./sqlwords.gperf"
+ {"__TAG", __TAG_L},
+#line 272 "./sqlwords.gperf"
+ {"SNAPSHOT", SNAPSHOT},
+#line 264 "./sqlwords.gperf"
+ {"UNRESTRICTED", UNRESTRICTED_L},
+#line 234 "./sqlwords.gperf"
+ {"PROCEDURE", PROCEDURE},
+#line 248 "./sqlwords.gperf"
+ {"REPLACING", REPLACING},
+#line 279 "./sqlwords.gperf"
+ {"SQLCODE", SQLCODE},
+#line 229 "./sqlwords.gperf"
+ {"POSITION", POSITION_L},
+#line 174 "./sqlwords.gperf"
+ {"INTERVAL", INTERVAL},
+#line 207 "./sqlwords.gperf"
+ {"NULLIF", NULLIF},
+#line 178 "./sqlwords.gperf"
+ {"IRI_ID", IRI_ID},
#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 309 "./sqlwords.gperf"
+ {"TOP", TOP},
+#line 53 "./sqlwords.gperf"
+ {"ATTACH", ATTACH},
#line 297 "./sqlwords.gperf"
{"T_NO_CYCLES", T_NO_CYCLES},
-#line 155 "./sqlwords.gperf"
- {"IDENTIFIED", IDENTIFIED},
-#line 305 "./sqlwords.gperf"
- {"TIES", TIES},
-#line 114 "./sqlwords.gperf"
- {"DISTINCT", DISTINCT},
-#line 94 "./sqlwords.gperf"
- {"CORRESPONDING", CORRESPONDING},
+#line 101 "./sqlwords.gperf"
+ {"CURRENT_TIMESTAMP", CURRENT_TIMESTAMP},
+#line 74 "./sqlwords.gperf"
+ {"CHARACTER", CHARACTER},
+#line 249 "./sqlwords.gperf"
+ {"REPLICATION", REPLICATION},
+#line 295 "./sqlwords.gperf"
+ {"T_MAX", T_MAX},
+#line 76 "./sqlwords.gperf"
+ {"CHECKED", CHECKED},
+#line 137 "./sqlwords.gperf"
+ {"FOREACH", FOREACH},
+#line 259 "./sqlwords.gperf"
+ {"ROLLUP", ROLLUP},
+#line 312 "./sqlwords.gperf"
+ {"TRANSITIVE", TRANSITIVE},
+#line 238 "./sqlwords.gperf"
+ {"RDF_BOX", RDF_BOX_L},
+#line 62 "./sqlwords.gperf"
+ {"BIGINT", BIGINT},
#line 158 "./sqlwords.gperf"
{"INCREMENTAL", INCREMENTAL},
-#line 273 "./sqlwords.gperf"
- {"SOFT", SOFT},
+#line 140 "./sqlwords.gperf"
+ {"FOUND", FOUND},
+#line 154 "./sqlwords.gperf"
+ {"IDENTITY", IDENTITY},
#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 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 230 "./sqlwords.gperf"
+ {"PRECISION", PRECISION},
+#line 330 "./sqlwords.gperf"
+ {"WHENEVER", WHENEVER},
+#line 277 "./sqlwords.gperf"
+ {"SPECIFIC", SPECIFIC},
+#line 177 "./sqlwords.gperf"
+ {"ISOLATION", ISOLATION_L},
+#line 159 "./sqlwords.gperf"
+ {"INCREMENT", INCREMENT_L},
+#line 237 "./sqlwords.gperf"
+ {"QUIETCAST", QUIETCAST_L},
+#line 282 "./sqlwords.gperf"
+ {"SQLWARNING", SQLWARNING},
+#line 57 "./sqlwords.gperf"
+ {"BACKUP", BACKUP},
+#line 231 "./sqlwords.gperf"
+ {"PREFETCH", PREFETCH},
+#line 87 "./sqlwords.gperf"
+ {"COMMITTED", COMMITTED_L},
+#line 263 "./sqlwords.gperf"
+ {"UNCOMMITTED", UNCOMMITTED_L},
+#line 64 "./sqlwords.gperf"
+ {"BITMAP", BITMAPPED},
+#line 161 "./sqlwords.gperf"
+ {"INDEX_NO_FILL", INDEX_NO_FILL},
+#line 280 "./sqlwords.gperf"
+ {"SQLEXCEPTION", SQLEXCEPTION},
+#line 270 "./sqlwords.gperf"
+ {"SHUTDOWN", SHUTDOWN},
+#line 80 "./sqlwords.gperf"
+ {"CLUSTERED", CLUSTERED},
+#line 209 "./sqlwords.gperf"
+ {"NVARCHAR", NVARCHAR},
+#line 32 "./sqlwords.gperf"
+ {"__SOAP_NAME", __SOAP_NAME},
+#line 30 "./sqlwords.gperf"
+ {"__SOAP_HEADER", __SOAP_HEADER},
+#line 155 "./sqlwords.gperf"
+ {"IDENTIFIED", IDENTIFIED},
+#line 26 "./sqlwords.gperf"
+ {"__COST", __COST},
+#line 337 "./sqlwords.gperf"
+ {"XPATH", XPATH},
+#line 33 "./sqlwords.gperf"
+ {"__SOAP_TYPE", __SOAP_TYPE},
+#line 307 "./sqlwords.gperf"
+ {"TIMESTAMP", TIMESTAMP},
+#line 288 "./sqlwords.gperf"
+ {"T_CYCLES_ONLY", T_CYCLES_ONLY},
+#line 291 "./sqlwords.gperf"
+ {"T_END_FLAG", T_END_FLAG},
+#line 29 "./sqlwords.gperf"
+ {"__SOAP_DOCW", __SOAP_DOCW},
+#line 37 "./sqlwords.gperf"
+ {"__SOAP_ENC_MIME", __SOAP_ENC_MIME},
+#line 35 "./sqlwords.gperf"
+ {"__SOAP_FAULT", __SOAP_FAULT},
+#line 34 "./sqlwords.gperf"
+ {"__SOAP_XML_TYPE", __SOAP_XML_TYPE},
#line 221 "./sqlwords.gperf"
{"OVERRIDING", OVERRIDING},
-#line 172 "./sqlwords.gperf"
- {"INTERSECT", INTERSECT},
-#line 271 "./sqlwords.gperf"
- {"SMALLINT", SMALLINT},
-#line 62 "./sqlwords.gperf"
- {"BIGINT", BIGINT}
+#line 77 "./sqlwords.gperf"
+ {"CHECKPOINT", CHECKPOINT},
+#line 28 "./sqlwords.gperf"
+ {"__SOAP_DOC", __SOAP_DOC},
+#line 36 "./sqlwords.gperf"
+ {"__SOAP_DIME_ENC", __SOAP_DIME_ENC},
+#line 38 "./sqlwords.gperf"
+ {"__SOAP_OPTIONS", __SOAP_OPTIONS},
+#line 31 "./sqlwords.gperf"
+ {"__SOAP_HTTP", __SOAP_HTTP}
};
static const short lookup[] =
@@ -742,193 +742,171 @@ 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, 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,
- 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, 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, 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, -1, -1, -1, -1, -1, -1,
- -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, -1, -1, -1, -1, -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, 2, -1, -1, -1, -1, -1, -1,
+ -1, -1, 3, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 4, -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, -1, 6, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 304, -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, 306, -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, 9, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 10, -1, -1, -1,
+ -1, -1, -1, 11, -1, -1, 12, -1, -1, -1,
+ -1, 13, -1, -1, -1, -1, -1, -1, -1, 14,
+ -1, -1, 15, 16, -1, -1, -1, -1, -1, 17,
+ -1, -1, -1, 18, -1, -1, -1, -1, -1, -1,
+ -1, -1, 19, 20, -1, -1, -1, -1, 21, 22,
+ -1, -1, -1, 23, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 24, -1, -1, -1, -1, -1, -1,
+ -1, 25, -1, 26, -1, -1, 27, -1, -1, -1,
+ -1, 28, 29, -1, -1, -1, -1, -1, -1, -1,
+ 30, 31, -1, -1, 32, 33, -1, 34, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 35, 36, -1,
+ -1, -1, -1, -1, -1, 37, -1, -1, 38, -1,
+ 39, -1, 40, 41, -1, -1, -1, 42, -1, -1,
+ -1, -1, -1, 43, -1, 44, -1, -1, -1, 45,
+ -1, -1, -1, -1, -1, -1, -1, -1, 46, -1,
+ 47, -1, -1, 48, 49, -1, -1, -1, 50, -1,
+ -1, 51, -1, -1, -1, 52, 53, 54, -1, -1,
+ 55, -1, 56, -1, -1, 57, 58, -1, 59, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 60, 61,
+ 62, -1, 63, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 64, -1, 65, -1, -1, 66, 67,
+ 68, 69, -1, -1, -1, -1, 70, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 71, -1, -1, -1,
+ 72, 73, -1, -1, -1, 74, 75, -1, 76, -1,
+ -1, -1, -1, 77, -1, -1, -1, 78, -1, -1,
+ -1, -1, 79, -1, -1, -1, -1, -1, 80, -1,
+ -1, -1, -1, -1, 81, -1, 82, -1, -1, -1,
+ 83, -1, 84, -1, 85, 86, 87, -1, -1, -1,
+ -1, 88, 89, 90, -1, -1, -1, -1, -1, -1,
+ 91, 92, -1, -1, 93, -1, -1, 94, -1, 95,
+ -1, -1, -1, 96, -1, 97, 98, -1, -1, 99,
+ -1, -1, 100, 101, -1, 102, -1, 103, 104, -1,
+ 105, -1, 106, -1, 107, -1, 108, -1, 109, -1,
+ -1, -1, -1, -1, -1, -1, -1, 110, -1, -1,
+ 111, 112, -1, 113, -1, -1, -1, -1, -1, 114,
+ -1, -1, 115, -1, -1, 116, -1, -1, -1, 117,
+ 118, 119, 120, 121, -1, -1, 122, -1, 123, 124,
+ -1, -1, -1, -1, 125, -1, -1, 126, -1, -1,
+ 127, -1, -1, -1, -1, -1, -1, -1, 128, 129,
+ -1, -1, -1, -1, 130, -1, -1, -1, 131, -1,
+ -1, 132, -1, -1, -1, -1, 133, 134, -1, 135,
+ -1, -1, -1, -1, -1, -1, -1, -1, 136, 137,
+ 138, -1, -1, -1, -1, 139, -1, 140, -1, -1,
+ -1, -1, -1, 141, -1, 142, -1, -1, -1, 143,
+ -1, 144, 145, 146, -1, -1, -1, -1, -1, -1,
+ -1, 147, -1, -1, 148, -1, 149, -1, -1, -1,
+ -1, -1, -1, 150, -1, -1, -1, -1, 151, -1,
+ -1, -1, -1, 152, -1, 153, -1, -1, -1, -1,
+ -1, -1, -1, 154, -1, -1, -1, -1, -1, 155,
+ -1, -1, -1, 156, 157, 158, -1, -1, -1, -1,
+ -1, -1, 159, -1, -1, -1, 160, -1, -1, 161,
+ 162, 163, -1, -1, -1, 164, -1, 165, 166, -1,
+ 167, -1, -1, -1, 168, -1, 169, -1, -1, -1,
+ 170, -1, -1, -1, -1, 171, -1, -1, 172, 173,
+ -1, -1, -1, 174, -1, 175, -1, 176, 177, -1,
+ -1, -1, -1, -1, -1, -1, 178, -1, 179, 180,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 181,
+ 182, -1, -1, -1, -1, 183, -1, -1, 184, 185,
+ 186, 187, -1, 188, -1, -1, 189, -1, -1, 190,
+ -1, -1, 191, -1, -1, 192, 193, -1, -1, -1,
+ -1, -1, -1, -1, 194, 195, -1, 196, -1, -1,
+ -1, -1, -1, 197, -1, -1, -1, -1, -1, -1,
+ -1, 198, 199, 200, 201, -1, -1, 202, -1, 203,
+ 204, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 205, 206, 207, -1, -1, -1, -1, -1, -1,
+ 208, -1, -1, 209, -1, -1, -1, -1, -1, -1,
+ -1, 210, 211, -1, -1, -1, -1, -1, -1, 212,
+ 213, 214, -1, -1, -1, 215, -1, -1, 216, 217,
+ 218, -1, 219, -1, -1, 220, 221, -1, -1, -1,
+ -1, -1, -1, -1, -1, 222, 223, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 224,
+ -1, 225, 226, -1, 227, -1, -1, -1, 228, 229,
+ -1, 230, -1, -1, -1, -1, 231, -1, -1, -1,
+ -1, 232, -1, -1, -1, 233, -1, -1, -1, 234,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 235, -1, 236, -1, -1, -1, -1, 237, 238, -1,
+ -1, -1, 239, -1, -1, -1, -1, -1, -1, 240,
+ 241, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 242, -1, -1, -1, -1, 243, 244, -1,
+ -1, 245, -1, -1, -1, -1, -1, 246, 247, -1,
+ -1, -1, -1, -1, 248, 249, -1, -1, -1, -1,
+ 250, -1, -1, 251, -1, 252, 253, -1, -1, 254,
+ 255, -1, -1, 256, -1, -1, 257, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 258, -1, -1, -1,
+ -1, 259, -1, -1, -1, -1, 260, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 261, 262, 263, -1,
+ -1, 264, -1, -1, -1, -1, -1, -1, 265, -1,
+ -1, -1, 266, -1, -1, -1, -1, -1, 267, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 268, 269,
+ -1, 270, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 271, 272, -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, 274, -1, -1, -1, -1, 275, 276,
+ -1, -1, -1, -1, -1, -1, -1, 277, -1, -1,
+ -1, -1, -1, 278, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 279, -1, -1,
+ -1, -1, -1, -1, 280, 281, 282, -1, -1, -1,
+ 283, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 284, -1, -1, -1,
+ 285, -1, -1, -1, -1, -1, 286, -1, -1, -1,
+ -1, -1, -1, -1, 287, -1, -1, -1, -1, 288,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 289, -1, -1, 290, 291, -1, -1, -1,
+ -1, -1, -1, 292, -1, -1, -1, -1, -1, 293,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 294, -1, -1, -1,
+ -1, -1, -1, 295, -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, 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, -1, -1, -1, -1, -1,
+ -1, -1, 299, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 300, -1,
+ 301, -1, -1, -1, -1, -1, 302, -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, 304, -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, -1, 306,
-1, -1, -1, -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,
@@ -937,20 +915,10 @@ 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, 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, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -959,18 +927,23 @@ 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, 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, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -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, -1, -1, -1, -1, -1, -1, -1, 311
};
#ifdef __GNUC__
__inline
+#ifdef __GNUC_STDC_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 5d31e29..78af4fe 100644
--- a/libsrc/Wi/srvcr.c
+++ b/libsrc/Wi/srvcr.c
@@ -1,14 +1,14 @@
/*
* sqlrun.c
*
- * $Id: srvcr.c,v 1.8.2.3 2010/01/29 02:02:18 source Exp $
+ * $Id$
*
* SQL query execution
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2073,19 +2073,19 @@ bif_scroll_cr_open (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t params_box_buf[5];
caddr_t params_box;
caddr_t **params;
- stmt_options_t *opts = (stmt_options_t *) dk_alloc_box_zero (sizeof (stmt_options_t), DV_ARRAY_OF_POINTER);
+ stmt_options_t *opts;
uint32 inx, n_pars = BOX_ELEMENTS (args) - 1;
BOX_AUTO (params_box, params_box_buf, sizeof (caddr_t), DV_ARRAY_OF_POINTER);
params = (caddr_t **)params_box;
-
- opts->so_use_bookmarks = 1;
params[0] = (caddr_t *) dk_alloc_box_zero (n_pars * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
for (inx = 0; inx < n_pars; inx++)
{
params[0][inx] = box_copy_tree (bif_arg (qst, args, inx + 1, "__scroll_cr_open"));
}
- memset (opts, 0, sizeof (opts));
+
+ opts = (stmt_options_t *) dk_alloc_box_zero (sizeof (stmt_options_t), DV_ARRAY_OF_POINTER);
+ opts->so_use_bookmarks = 1;
opts->so_concurrency = SQL_CONCUR_LOCK;
opts->so_cursor_type = stmt->sst_query->qr_cursor_type;
diff --git a/libsrc/Wi/srvmultibyte.c b/libsrc/Wi/srvmultibyte.c
index d90924c..9b375cc 100644
--- a/libsrc/Wi/srvmultibyte.c
+++ b/libsrc/Wi/srvmultibyte.c
@@ -1,12 +1,12 @@
/*
* srvmultibyte.c
*
- * $Id: srvmultibyte.c,v 1.12.2.3 2010/12/13 11:17:56 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -360,8 +360,7 @@ 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)
+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)
{
/* take current page at current place and make string of
n bytes from the place and write to client */
@@ -534,11 +533,9 @@ row_print_wide (caddr_t thing, dk_session_t * ses, dbe_column_t * col,
}
int
-compare_wide_to_utf8 (caddr_t _utf8_data, long utf8_len,
- caddr_t _wide_data, long wide_len, collation_t *collation)
+compare_wide_to_utf8_with_collation (wchar_t *wide_data, long wide_wcharcount, utf8char *utf8_data, long utf8_bytes,
+ 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;
@@ -546,23 +543,22 @@ compare_wide_to_utf8 (caddr_t _utf8_data, long utf8_len,
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_len)
+ if (ninx == utf8_bytes)
{
- if (winx == wide_len)
+ if (winx == wide_wcharcount)
return DVC_MATCH;
else
return DVC_LESS;
}
- if (winx == wide_len)
+ if (winx == wide_wcharcount)
return DVC_GREATER;
- rc = (int) virt_mbrtowc (&wtmp, utf8_data + ninx, utf8_len - ninx, &state);
+ rc = (int) virt_mbrtowc (&wtmp, utf8_data + ninx, utf8_bytes - ninx, &state);
if (rc <= 0)
GPF_T1 ("inconsistent wide char data");
if (((wchar_t *)collation->co_table)[wtmp] <
@@ -577,17 +573,17 @@ compare_wide_to_utf8 (caddr_t _utf8_data, long utf8_len,
else
while(1)
{
- if (ninx == utf8_len)
+ if (ninx == utf8_bytes)
{
- if (winx == wide_len)
+ if (winx == wide_wcharcount)
return DVC_MATCH;
else
return DVC_LESS;
}
- if (winx == wide_len)
+ if (winx == wide_wcharcount)
return DVC_GREATER;
- rc = (int) virt_mbrtowc (&wtmp, utf8_data + ninx, utf8_len - ninx, &state);
+ rc = (int) virt_mbrtowc (&wtmp, utf8_data + ninx, utf8_bytes - ninx, &state);
if (rc <= 0)
GPF_T1 ("inconsistent wide char data");
if (wtmp < wide_data[winx])
@@ -832,11 +828,10 @@ complete_charset_name (caddr_t _qi, char *cs_name)
int
-compare_wide_to_narrow (wchar_t *wbox1, long n1, unsigned char *box2, long n2)
+compare_wide_to_latin1 (wchar_t *wbox1, long n1, unsigned char *box2, long n2)
{
wchar_t temp;
long inx = 0;
-
while (1)
{
if (inx == n1) /* box1 in end? */
@@ -846,20 +841,15 @@ compare_wide_to_narrow (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 ecb84fe..505c789 100644
--- a/libsrc/Wi/srvmultibyte.h
+++ b/libsrc/Wi/srvmultibyte.h
@@ -1,12 +1,12 @@
/*
* srvmultibyte.h
*
- * $Id: srvmultibyte.h,v 1.9.2.2 2009/08/17 23:42:59 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -31,9 +31,8 @@
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); /* if omit!=0, it just run through blob part */
+ long get_chars, int omit, long blob_type); /* 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);
@@ -54,7 +53,8 @@ extern caddr_t default_charset_name;
caddr_t complete_charset_name (caddr_t qi, char *cs_name);
-int compare_wide_to_narrow (wchar_t *wbox1, long n1, unsigned char *box2, long n2);
+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);
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,7 +64,8 @@ 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;
-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);
+/*! 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_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 40b352e..480d282 100644
--- a/libsrc/Wi/srvstat.c
+++ b/libsrc/Wi/srvstat.c
@@ -1,14 +1,14 @@
/*
* srvstat.c
*
- * $Id: srvstat.c,v 1.29.2.34 2011/07/19 23:29:12 source Exp $
+ * $Id$
*
* Server Status Report
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1095,7 +1095,7 @@ status_report (const char * mode, query_instance_t * qi)
{
if (DV_TYPE_OF (data) == DV_C_STRING)
- rep_printf ("%.80s\n", data);
+ rep_printf ("%s\n", data);
else
rep_printf ("%12ld ", unbox (data));
dk_free_box (data);
@@ -1369,7 +1369,7 @@ stat_desc_t stat_descs [] =
{"st_cli_connects", &srv_connect_ctr, NULL},
{"st_cli_max_connected", &srv_max_clients, NULL},
{"st_cli_n_current_connections", &st_cli_n_current_connections, NULL},
- {"st_cli_n_http_threads", &http_threads, NULL},
+ {"st_cli_n_http_threads", &http_threads, SD_INT32},
{"st_rpc_stat", NULL, &st_rpc_stat},
{"st_inx_pages_changed", &isp_r_delta, NULL},
@@ -1439,6 +1439,7 @@ 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 81b76ed..6a0b4b3 100644
--- a/libsrc/Wi/srvstat.h
+++ b/libsrc/Wi/srvstat.h
@@ -1,14 +1,14 @@
/*
* srvstat.h
*
- * $Id: srvstat.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* stats collection
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/ssl.c b/libsrc/Wi/ssl.c
index 15ded3e..bd7df7f 100644
--- a/libsrc/Wi/ssl.c
+++ b/libsrc/Wi/ssl.c
@@ -1,10 +1,10 @@
/*
- * $Id: ssl.c,v 1.5.2.2 2009/05/14 13:52:33 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/statuslog.h b/libsrc/Wi/statuslog.h
index 60fe1f7..d05d380 100644
--- a/libsrc/Wi/statuslog.h
+++ b/libsrc/Wi/statuslog.h
@@ -1,12 +1,12 @@
/*
* statuslog.h
*
- * $Id: statuslog.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/string.c b/libsrc/Wi/string.c
index 0184c13..478dbf0 100644
--- a/libsrc/Wi/string.c
+++ b/libsrc/Wi/string.c
@@ -1,14 +1,14 @@
/*
* string.c
*
- * $Id: string.c,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* Wildcard and fuzzy matching functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/string_tmpl.c b/libsrc/Wi/string_tmpl.c
index 8e82a97..245d011 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.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* Wildcard and fuzzy matching functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/strlike.h b/libsrc/Wi/strlike.h
index ab7dc44..1feeeb7 100644
--- a/libsrc/Wi/strlike.h
+++ b/libsrc/Wi/strlike.h
@@ -1,12 +1,12 @@
/*
* strlike.h
*
- * $Id: strlike.h,v 1.2.2.3 2011/10/25 19:36:36 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/subseq.c b/libsrc/Wi/subseq.c
index c4e52f5..145df7d 100644
--- a/libsrc/Wi/subseq.c
+++ b/libsrc/Wi/subseq.c
@@ -1,10 +1,10 @@
/*
- * $Id: subseq.c,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/subseq.h b/libsrc/Wi/subseq.h
index 379d65c..c4fa1e9 100644
--- a/libsrc/Wi/subseq.h
+++ b/libsrc/Wi/subseq.h
@@ -1,10 +1,10 @@
/*
- * $Id: subseq.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/system.sql b/libsrc/Wi/system.sql
index b1c9426..c496e80 100644
--- a/libsrc/Wi/system.sql
+++ b/libsrc/Wi/system.sql
@@ -1,10 +1,10 @@
--
--- $Id: system.sql,v 1.41.2.24 2011/09/28 17:01:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -1039,20 +1039,22 @@ create procedure ddl_pk_change_1 (in tb varchar, in cols any)
COL_CHECK,
deserialize (COL_DEFAULT),
COL_NTH,
- COL_NULLABLE from DB.DBA.SYS_COLS
+ COL_NULLABLE,
+ COL_OPTIONS
+ from DB.DBA.SYS_COLS
where concat ('', "TABLE") = tb order by COL_ID;
whenever not found goto done;
open cr;
while (1)
{
- declare _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 any;
- fetch cr into _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10;
+ declare _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 any;
+ fetch cr into _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11;
_col1 := new_col_id (0);
_col2 := tname;
insert into DB.DBA.SYS_COLS
(COL_ID, "TABLE", "COLUMN", COL_DTP, COL_PREC, COL_SCALE, COL_CHECK, COL_DEFAULT,
- COL_NTH, COL_NULLABLE)
- values (_col1, _col2, _col3, _col4, _col5, _col6, _col7, serialize (_col8), _col9, _col10);
+ COL_NTH, COL_NULLABLE, COL_OPTIONS)
+ values (_col1, _col2, _col3, _col4, _col5, _col6, _col7, serialize (_col8), _col9, _col10, _col11);
}
done:
close cr;
@@ -4667,98 +4669,77 @@ returns integer
--!AWK PLBIF regexp_replace
create procedure REGEXP_REPLACE (in source_string any, in pattern any,
in replace_string varchar := '', in position integer := 1,
- in occurrence any := 1, in match_parameter integer := null)
+ in occurrence integer := 0, in match_parameter varchar := null)
{
+ declare hit_list any;
+ declare res, res_cs varchar;
if (source_string is null or pattern is null or replace_string is null)
return source_string;
+ if (match_parameter is null)
+ match_parameter := '';
+ if (iswidestring (source_string) or iswidestring (pattern) or iswidestring (replace_string))
+ {
+ if (iswidestring (source_string))
+ source_string := charset_recode (source_string, '_WIDE_', 'UTF-8');
else
{
- if ((not isstring (source_string)) and (not iswidestring (source_string)))
+ if (isstring (source_string))
+ source_string := charset_recode (source_string, null, 'UTF-8');
+ else
source_string := cast (source_string as varchar);
- if ((not isstring (pattern)) and (not iswidestring (pattern)))
- pattern := cast (pattern as varchar);
- if ((not isstring (replace_string)) and (not iswidestring (replace_string)))
- replace_string := cast (replace_string as varchar);
}
-
- if (match_parameter is not null)
- signal ('22023', 'match_parameter not supported yet', 'SR372');
- declare cur_pos, copied_up_to, nth integer;
- declare ret any;
-
- ret := either (iswidestring (source_string), N'', '');
- cur_pos := position - 1;
- copied_up_to := position - 1;
- nth := 1;
-
- while (cur_pos < length (source_string))
- {
- declare exprs any;
-
- exprs := regexp_parse (pattern, source_string, cur_pos);
-
- if (not isarray (exprs))
- goto done;
-
- declare start_inx, end_inx integer;
- start_inx := exprs[0];
- end_inx := exprs[1];
-
- if (occurrence is null or occurrence = nth)
- {
- if (start_inx > copied_up_to)
- ret := concat (ret, subseq (source_string, copied_up_to, start_inx));
-
- if (length (exprs) > 2)
- {
- declare expr_inx integer;
- declare replace_str any;
- declare replace_string_tmp any;
- replace_string_tmp := replace_string;
- expr_inx := 1;
-
- while (expr_inx * 2 < length (exprs))
+ if (iswidestring (pattern))
+ pattern := charset_recode (pattern, '_WIDE_', 'UTF-8');
+ else
{
- declare replace_str_found varchar;
-
- if (exprs[expr_inx * 2] >= 0 and exprs[expr_inx * 2 + 1] >= 0)
- replace_str_found := subseq (source_string, exprs[expr_inx * 2], exprs [expr_inx * 2 + 1]);
+ if (isstring (pattern))
+ pattern := charset_recode (pattern, null, 'UTF-8');
else
- replace_str_found := either (iswidestring (source_string), N'', '');
-
- replace_str := sprintf ('\\%d', expr_inx);
- if (iswidestring (source_string))
- replace_str := cast (replace_str as nvarchar);
- replace_string_tmp := replace (replace_string_tmp, replace_str,
- replace_str_found);
- expr_inx := expr_inx + 1;
+ pattern := cast (pattern as varchar);
}
- while (expr_inx < 10)
+ if (iswidestring (replace_string))
+ replace_string := charset_recode (replace_string, '_WIDE_', 'UTF-8');
+ else
{
- replace_str := sprintf ('\\%d', expr_inx);
- if (iswidestring (source_string))
- replace_str := cast (replace_str as nvarchar);
- replace_string_tmp := replace (replace_string_tmp, replace_str,
- either (iswidestring (source_string), N'', ''));
- expr_inx := expr_inx + 1;
+ if (isstring (replace_string))
+ replace_string := charset_recode (replace_string, null, 'UTF-8');
+ else
+ replace_string := cast (replace_string as varchar);
}
- ret := concat (ret, replace_string_tmp);
+ if (strchr (match_parameter, 'u') is null and strchr (match_parameter, 'U') is null)
+ match_parameter := match_parameter || 'u';
+ res_cs := '_WIDE_';
}
else
- ret := concat (ret, replace_string);
- copied_up_to := end_inx;
- if (occurrence is not null)
- goto done;
+ {
+ if (not isstring (source_string)) source_string := cast (source_string as varchar);
+ if (not isstring (pattern)) pattern := cast (pattern as varchar);
+ if (not isstring (replace_string)) replace_string := cast (replace_string as varchar);
+ res_cs := '';
+ }
+ if (0 = length (source_string))
+ return subseq (source_string, 0, 0);
+ if (occurrence is null)
+ occurrence := 0;
+ if (regexp_parse (pattern, '', 0, match_parameter) is not null)
+ signal ('22023', 'The REGEXP_REPLACE() function can not search for a pattern that can be found even in an empty string');
+ if (0 = occurrence)
+ {
+ hit_list := regexp_parse_list (pattern, source_string, position-1, match_parameter, 2097152);
+ if (0 = length (hit_list))
+ return source_string;
}
-
- nth := nth + 1;
- cur_pos := end_inx;
+ else
+ {
+ hit_list := regexp_parse_list (pattern, source_string, position-1, match_parameter, occurrence);
+ if (length (hit_list) < occurrence)
+ return source_string;
+ hit_list := vector (hit_list[occurrence-1]);
}
-done:
- if (copied_up_to < length (source_string))
- ret := concat (ret, subseq (source_string, copied_up_to, length (source_string)));
-
- return ret;
+ res := regexp_replace_hits_with_template (source_string, replace_string, hit_list, 0);
+ if (res_cs = '_WIDE_')
+ return charset_recode (res, 'UTF-8', '_WIDE_');
+ return res;
}
;
@@ -5523,8 +5504,12 @@ create procedure
DB.DBA.SYS_SQL_VAL_PRINT (in v any)
{
--no_c_escapes-
- if (isstring (v))
+ if (isstring (v) or __tag (v) = 183 or __tag (v) = 127)
return sprintf ('\'%S\'', replace (v, '\\', '\\\\'));
+ else if (iswidestring (v))
+ return sprintf ('\'%S\'', replace (charset_recode (v, '_WIDE_', 'UTF-8'), '\\', '\\\\'));
+ else if (__tag (v) = 230)
+ return sprintf ('\'%S\'', replace (serialize_to_UTF8_xml (v), '\\', '\\\\'));
else if (v is null)
return 'NULL';
else if (isinteger (v))
@@ -5537,6 +5522,12 @@ DB.DBA.SYS_SQL_VAL_PRINT (in v any)
{
return concat ('vector (',SYS_SQL_VECTOR_PRINT (v),')');
}
+ else if (__tag (v) = 255)
+ return '<tag 255>';
+ else if (__tag (v) = 211)
+ {
+ return sprintf ('stringdate (%s)', SYS_SQL_VAL_PRINT (datestring (v)));
+ }
else
signal ('22023', sprintf('Unsupported type %d', __tag (v)));
}
diff --git a/libsrc/Wi/system2.sql b/libsrc/Wi/system2.sql
index 2826df9..7705599 100644
--- a/libsrc/Wi/system2.sql
+++ b/libsrc/Wi/system2.sql
@@ -1,10 +1,10 @@
--
--- $Id: system2.sql,v 1.5.2.5 2010/08/02 07:40:54 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/text.c b/libsrc/Wi/text.c
index 46b02fb..99f0f91 100644
--- a/libsrc/Wi/text.c
+++ b/libsrc/Wi/text.c
@@ -1,14 +1,14 @@
/*
* text.c
*
- * $Id: text.c,v 1.16.2.7 2010/02/01 12:53:46 source Exp $
+ * $Id$
*
* Text search
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/text.h b/libsrc/Wi/text.h
index e972d3d..81bb08e 100644
--- a/libsrc/Wi/text.h
+++ b/libsrc/Wi/text.h
@@ -1,12 +1,12 @@
/*
* text.h
*
- * $Id: text.h,v 1.7.2.2 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/trans.c b/libsrc/Wi/trans.c
index fbcc747..e5b86be 100644
--- a/libsrc/Wi/trans.c
+++ b/libsrc/Wi/trans.c
@@ -1,14 +1,14 @@
/*
* trans.c
*
- * $Id: trans.c,v 1.1.2.10 2011/06/17 15:20:35 source Exp $
+ * $Id$
*
* Transitive Node
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -1190,6 +1190,25 @@ tn_results (trans_node_t * tn, caddr_t * inst)
}
void
+tn_reset (trans_node_t * tn, caddr_t * inst)
+{
+ query_instance_t * qi = (query_instance_t *)inst;
+ cl_op_t * itcl_clo;
+ itc_cluster_t * itcl;
+ id_hash_t * sets;
+
+ QST_INT (inst, tn->clb.clb_fill) = 0;
+ itcl_clo = clo_allocate (CLO_ITCL);
+ itcl_clo->_.itcl.itcl = itcl = itcl_allocate (qi->qi_trx, inst);
+ qst_set (inst, tn->clb.clb_itcl, (caddr_t)itcl_clo);
+ SET_THR_TMP_POOL (itcl->itcl_pool);
+ sets = t_id_hash_allocate (tn->clb.clb_batch_size, sizeof (caddr_t), sizeof (caddr_t), treehash, treehashcmp);
+ QST_BOX (id_hash_t *, inst, tn->tn_input_sets) = sets;
+ QST_INT (inst, tn->clb.clb_nth_set) = -1;
+ QST_INT (inst, tn->tn_nth_cache_result) = 0;
+}
+
+void
trans_node_start (trans_node_t * tn, caddr_t * inst, caddr_t * state)
{
int inx;
@@ -1220,6 +1239,11 @@ trans_node_start (trans_node_t * tn, caddr_t * inst, caddr_t * state)
QST_INT (inst, tn->clb.clb_nth_set) = -1;
QST_INT (inst, tn->tn_nth_cache_result) = 0;
nth = 0;
+ if (tn->tn_complement && tn->tn_is_primary)
+ {
+ tn_reset (tn->tn_complement, inst);
+ SET_THR_TMP_POOL (itcl->itcl_pool);
+ }
}
else
{
diff --git a/libsrc/Wi/turtle_l.c b/libsrc/Wi/turtle_l.c
index 833e9c6..24163b2 100644
--- a/libsrc/Wi/turtle_l.c
+++ b/libsrc/Wi/turtle_l.c
@@ -350,8 +350,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 105
-#define YY_END_OF_BUFFER 106
+#define YY_NUM_RULES 108
+#define YY_END_OF_BUFFER 109
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -359,50 +359,53 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[384] =
+static yyconst flex_int16_t yy_accept[410] =
{ 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, 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,
- 19, 52, 20, 52, 52, 2, 50, 49, 48, 29,
- 48, 48, 81, 0, 0, 82, 0, 0, 93, 0,
- 0, 94, 0, 0, 0, 61, 0, 0, 0, 62,
- 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,
- 0, 0, 0, 0, 0, 44, 44, 52, 52, 52,
- 52, 0, 0, 0, 0, 0, 0, 0, 0, 44,
- 24, 52, 52, 23, 0, 0, 0, 0, 0, 0,
- 0, 44, 25, 52, 0, 0, 0, 0, 0, 0,
- 0, 44, 22, 0, 0, 0, 0, 0, 0, 0,
- 44, 0, 0
+ 109, 104, 103, 101, 101, 15, 77, 102, 76, 36,
+ 37, 104, 5, 104, 9, 98, 10, 11, 47, 12,
+ 104, 104, 51, 51, 51, 38, 40, 3, 51, 31,
+ 51, 51, 51, 51, 51, 41, 42, 108, 86, 82,
+ 82, 78, 88, 87, 83, 83, 79, 89, 94, 90,
+ 92, 92, 96, 94, 95, 91, 93, 93, 97, 95,
+ 74, 70, 68, 68, 74, 72, 75, 71, 69, 69,
+ 75, 73, 59, 58, 56, 56, 107, 107, 103, 101,
+
+ 0, 60, 102, 101, 101, 0, 60, 0, 98, 0,
+ 0, 0, 8, 6, 7, 7, 99, 99, 0, 49,
+ 49, 0, 48, 47, 47, 0, 14, 43, 47, 13,
+ 54, 55, 16, 55, 55, 55, 55, 55, 55, 55,
+ 55, 51, 0, 50, 51, 51, 39, 1, 2, 2,
+ 4, 51, 0, 0, 51, 51, 33, 34, 51, 51,
+ 86, 0, 82, 80, 84, 84, 86, 0, 0, 87,
+ 0, 83, 81, 85, 85, 87, 0, 0, 90, 0,
+ 92, 0, 90, 0, 0, 91, 0, 93, 0, 91,
+ 0, 0, 70, 0, 0, 68, 68, 68, 0, 70,
+
+ 0, 0, 71, 0, 0, 69, 69, 69, 0, 71,
+ 0, 0, 58, 58, 56, 0, 56, 105, 106, 106,
+ 60, 63, 61, 101, 62, 0, 0, 0, 7, 99,
+ 0, 100, 49, 49, 49, 48, 0, 0, 0, 45,
+ 43, 0, 47, 47, 47, 54, 0, 0, 55, 55,
+ 55, 19, 55, 20, 55, 55, 27, 28, 2, 53,
+ 52, 51, 32, 51, 51, 84, 0, 0, 85, 0,
+ 0, 96, 0, 0, 97, 0, 0, 0, 64, 0,
+ 0, 0, 65, 0, 0, 56, 57, 106, 27, 28,
+ 26, 48, 49, 0, 0, 46, 0, 0, 0, 44,
+
+ 47, 47, 55, 55, 55, 18, 55, 55, 55, 52,
+ 0, 51, 35, 30, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 64, 66, 0, 0, 65, 67,
+ 0, 0, 44, 0, 0, 47, 47, 17, 55, 55,
+ 55, 55, 21, 52, 29, 0, 0, 0, 0, 96,
+ 0, 0, 97, 0, 0, 0, 0, 0, 0, 0,
+ 0, 47, 47, 55, 55, 55, 55, 0, 0, 0,
+ 0, 0, 0, 0, 0, 47, 24, 55, 55, 23,
+ 0, 0, 0, 0, 0, 0, 0, 47, 25, 55,
+ 0, 0, 0, 0, 0, 0, 0, 47, 22, 0,
+
+ 0, 0, 0, 0, 0, 0, 47, 0, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -413,438 +416,460 @@ static yyconst flex_int32_t yy_ec[256] =
1, 5, 6, 7, 8, 9, 10, 10, 11, 12,
13, 10, 14, 15, 16, 17, 18, 19, 19, 19,
19, 19, 19, 19, 19, 19, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 28, 28, 29, 28,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 31, 30, 32, 30, 30, 30, 30, 30,
- 33, 34, 35, 36, 37, 9, 38, 39, 40, 41,
-
- 42, 43, 44, 45, 46, 44, 47, 48, 49, 50,
- 51, 52, 44, 53, 54, 55, 56, 50, 57, 58,
- 59, 44, 60, 9, 61, 9, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 9
+ 23, 24, 25, 26, 27, 28, 28, 28, 29, 30,
+ 31, 31, 32, 31, 31, 31, 31, 33, 31, 31,
+ 31, 31, 34, 31, 35, 31, 31, 31, 31, 31,
+ 36, 37, 38, 39, 40, 9, 41, 42, 43, 44,
+
+ 45, 46, 47, 48, 49, 47, 50, 51, 52, 53,
+ 54, 55, 47, 56, 57, 58, 59, 53, 60, 61,
+ 62, 47, 63, 9, 64, 9, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 9
} ;
-static yyconst flex_int32_t yy_meta[63] =
+static yyconst flex_int32_t yy_meta[67] =
{ 0,
1, 2, 3, 4, 2, 5, 6, 7, 5, 7,
8, 5, 5, 9, 10, 11, 12, 9, 13, 14,
- 10, 15, 7, 5, 7, 9, 16, 16, 16, 17,
- 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
+ 10, 15, 7, 5, 7, 9, 16, 16, 16, 16,
+ 17, 17, 17, 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
} ;
-static yyconst flex_int16_t yy_base[546] =
+static yyconst flex_int16_t yy_base[577] =
{ 0,
- 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
+ 0, 0, 66, 70, 75, 82, 87, 91, 107, 114,
+ 119, 134, 139, 151, 217, 0, 84, 96, 0, 0,
+ 951, 2481, 70, 946, 946, 2481, 940, 93, 935, 2481,
+ 2481, 130, 2481, 142, 162, 153, 276, 2481, 283, 914,
+ 0, 153, 89, 173, 109, 899, 2481, 306, 114, 166,
+ 172, 280, 295, 296, 302, 2481, 2481, 2481, 898, 930,
+ 930, 898, 300, 886, 918, 918, 893, 314, 2481, 881,
+ 906, 906, 881, 45, 2481, 869, 901, 893, 869, 125,
+ 2481, 167, 890, 890, 320, 156, 2481, 132, 887, 887,
+ 323, 279, 2481, 0, 193, 358, 2481, 351, 323, 2481,
+
+ 875, 161, 193, 877, 329, 868, 318, 859, 317, 844,
+ 827, 834, 2481, 2481, 862, 862, 318, 322, 350, 386,
+ 400, 414, 428, 375, 453, 324, 457, 2481, 492, 2481,
+ 846, 846, 838, 52, 327, 84, 282, 352, 324, 349,
+ 68, 355, 363, 544, 399, 410, 2481, 2481, 849, 848,
+ 2481, 833, 832, 455, 432, 427, 447, 449, 453, 465,
+ 803, 336, 2481, 2481, 835, 835, 800, 0, 0, 798,
+ 433, 2481, 2481, 830, 823, 788, 0, 0, 786, 441,
+ 2481, 0, 785, 0, 0, 784, 451, 2481, 0, 774,
+ 0, 0, 365, 396, 452, 2481, 806, 806, 494, 404,
+
+ 0, 0, 481, 482, 456, 2481, 802, 793, 505, 486,
+ 0, 0, 0, 779, 485, 0, 555, 2481, 785, 782,
+ 758, 2481, 2481, 763, 2481, 736, 732, 732, 2481, 501,
+ 733, 732, 583, 597, 0, 611, 625, 397, 532, 2481,
+ 2481, 478, 650, 685, 729, 728, 724, 0, 490, 501,
+ 498, 724, 117, 706, 368, 161, 505, 523, 2481, 0,
+ 639, 524, 548, 555, 559, 2481, 0, 0, 2481, 0,
+ 0, 702, 0, 0, 694, 0, 0, 671, 424, 0,
+ 0, 656, 500, 0, 0, 670, 0, 2481, 2481, 2481,
+ 2481, 653, 0, 535, 549, 2481, 589, 0, 0, 2481,
+
+ 773, 801, 582, 533, 641, 580, 550, 578, 561, 673,
+ 515, 582, 621, 649, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 517, 2481, 0, 0, 514, 2481,
+ 0, 0, 2481, 0, 0, 829, 857, 456, 614, 628,
+ 630, 642, 366, 274, 660, 0, 0, 0, 0, 273,
+ 0, 0, 271, 0, 0, 0, 0, 0, 0, 0,
+ 0, 885, 913, 643, 564, 576, 624, 0, 0, 0,
+ 0, 0, 0, 0, 0, 941, 200, 676, 679, 198,
+ 0, 0, 0, 0, 0, 0, 0, 969, 111, 644,
+ 0, 0, 0, 0, 0, 0, 0, 997, 89, 0,
+
+ 0, 0, 0, 0, 0, 0, 1025, 0, 2481, 1071,
+ 1094, 1117, 1140, 1163, 1186, 1209, 1232, 1255, 1278, 1301,
+ 1324, 1341, 1362, 1370, 1377, 1388, 1400, 1421, 1441, 1461,
+ 1481, 1501, 1518, 1538, 1555, 1575, 1592, 1612, 1629, 1640,
+ 1651, 1662, 1677, 1693, 1709, 1730, 1749, 1762, 1778, 1790,
+ 1806, 1827, 1844, 684, 686, 1864, 1881, 690, 703, 1901,
+ 1918, 1924, 704, 721, 1944, 1961, 1967, 722, 723, 1987,
+ 2004, 733, 734, 2024, 2041, 747, 748, 2052, 2063, 2074,
+ 2083, 2094, 2109, 2125, 2141, 2162, 2180, 2200, 2222, 2235,
+ 2245, 2256, 2267, 2283, 2299, 765, 766, 767, 777, 2311,
+
+ 778, 791, 2322, 792, 811, 2342, 820, 839, 2363, 848,
+ 867, 2375, 2384, 2401, 876, 895, 2414, 904, 923, 932,
+ 951, 2424, 960, 979, 2433, 988, 1007, 1016, 1035, 1044,
+ 1435, 1437, 1475, 1477, 1488, 1512, 1514, 1549, 1551, 1586,
+ 1588, 1623, 1625, 1639, 1650, 1838, 1840, 1875, 1877, 1888,
+ 1912, 1914, 1955, 1957, 1998, 2000, 2035, 2037, 2051, 2062,
+ 2073, 2174, 2176, 2255, 2310, 2321, 2374, 2431, 2440, 2442,
+ 2444, 2446, 2453, 2455, 2457, 2459
} ;
-static yyconst flex_int16_t yy_def[546] =
+static yyconst flex_int16_t yy_def[577] =
{ 0,
- 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
+ 409, 1, 410, 410, 411, 411, 412, 412, 413, 413,
+ 414, 414, 415, 415, 409, 15, 416, 416, 417, 417,
+ 409, 409, 409, 409, 409, 409, 418, 419, 420, 409,
+ 409, 409, 409, 409, 421, 409, 422, 409, 423, 409,
+ 424, 425, 426, 426, 426, 409, 409, 409, 427, 426,
+ 426, 426, 426, 426, 426, 409, 409, 409, 428, 409,
+ 409, 409, 429, 430, 409, 409, 409, 431, 409, 432,
+ 409, 409, 409, 433, 409, 434, 409, 409, 409, 435,
+ 409, 436, 409, 409, 436, 437, 409, 438, 409, 409,
+ 438, 439, 409, 440, 441, 442, 409, 409, 409, 409,
+
+ 418, 409, 419, 409, 419, 420, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 443,
+ 444, 443, 445, 446, 423, 447, 423, 409, 446, 409,
+ 448, 425, 425, 425, 425, 425, 425, 425, 425, 425,
+ 425, 426, 426, 449, 426, 426, 409, 409, 409, 409,
+ 409, 450, 450, 451, 426, 426, 426, 426, 426, 426,
+ 452, 453, 409, 409, 409, 409, 452, 454, 455, 456,
+ 457, 409, 409, 409, 409, 456, 458, 459, 460, 461,
+ 409, 462, 460, 463, 464, 465, 466, 409, 467, 465,
+ 468, 469, 470, 470, 471, 409, 409, 409, 470, 470,
+
+ 472, 473, 474, 474, 475, 409, 409, 409, 474, 474,
+ 476, 477, 478, 479, 480, 481, 482, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 483, 483, 234, 484, 485, 486, 486, 409,
+ 409, 487, 488, 489, 489, 490, 490, 491, 492, 492,
+ 492, 492, 492, 492, 492, 492, 493, 493, 409, 494,
+ 495, 493, 493, 493, 493, 409, 496, 497, 409, 498,
+ 499, 500, 501, 502, 503, 504, 505, 506, 409, 507,
+ 508, 509, 409, 510, 511, 512, 513, 409, 409, 409,
+ 409, 485, 292, 486, 486, 409, 514, 515, 516, 409,
+
+ 489, 301, 491, 492, 492, 492, 492, 492, 492, 495,
+ 517, 493, 493, 493, 518, 519, 520, 521, 522, 523,
+ 524, 525, 526, 527, 409, 409, 528, 529, 409, 409,
+ 530, 531, 409, 532, 533, 301, 301, 492, 492, 492,
+ 492, 492, 492, 517, 493, 534, 535, 536, 537, 522,
+ 538, 539, 525, 540, 541, 542, 543, 544, 545, 546,
+ 547, 301, 301, 492, 492, 492, 492, 548, 549, 550,
+ 551, 552, 553, 554, 555, 301, 492, 492, 492, 492,
+ 556, 557, 558, 559, 560, 561, 562, 301, 492, 492,
+ 563, 564, 565, 566, 567, 568, 569, 301, 492, 570,
+
+ 571, 572, 573, 574, 575, 576, 301, 555, 0, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409
} ;
-static yyconst flex_int16_t yy_nxt[2398] =
+static yyconst flex_int16_t yy_nxt[2548] =
{ 0,
22, 23, 24, 25, 23, 26, 27, 28, 22, 22,
- 29, 30, 31, 32, 33, 32, 34, 22, 35, 36,
- 37, 38, 39, 22, 40, 41, 42, 42, 42, 42,
- 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, 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, 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,
+ 29, 30, 31, 32, 33, 34, 35, 22, 36, 37,
+ 38, 39, 40, 22, 41, 42, 43, 43, 43, 43,
+ 43, 44, 45, 43, 43, 46, 22, 47, 48, 49,
+ 50, 43, 43, 43, 43, 51, 43, 52, 53, 43,
+ 43, 43, 43, 54, 43, 43, 43, 55, 43, 43,
+ 43, 43, 56, 57, 43, 22, 58, 248, 60, 61,
+ 58, 99, 60, 61, 99, 58, 62, 65, 66, 184,
+ 62, 67, 58, 248, 65, 66, 58, 69, 67, 71,
+ 72, 69, 249, 71, 72, 104, 105, 73, 58, 248,
+
+ 98, 73, 63, 185, 248, 143, 63, 75, 144, 77,
+ 78, 68, 98, 79, 75, 256, 77, 78, 68, 81,
+ 79, 83, 84, 74, 251, 143, 248, 74, 144, 85,
+ 153, 58, 248, 154, 81, 58, 83, 84, 204, 87,
+ 58, 89, 90, 80, 85, 91, 108, 58, 109, 146,
+ 80, 87, 69, 89, 90, 86, 69, 91, 108, 191,
+ 109, 110, 111, 114, 115, 116, 114, 222, 205, 118,
+ 86, 109, 75, 112, 111, 92, 248, 194, 307, 75,
+ 117, 119, 143, 192, 81, 144, 223, 92, 143, 143,
+ 201, 144, 144, 133, 134, 104, 105, 119, 135, 81,
+
+ 136, 137, 138, 195, 87, 145, 139, 140, 214, 309,
+ 141, 213, 155, 248, 202, 248, 87, 93, 93, 58,
+ 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 94, 93, 93, 94, 93, 93, 93, 93,
+ 93, 93, 93, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 93, 93, 93, 93, 93, 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,
+ 96, 96, 96, 96, 96, 96, 96, 96, 96, 93,
+ 93, 93, 93, 120, 124, 120, 322, 124, 319, 120,
+ 311, 121, 122, 120, 121, 120, 143, 248, 120, 144,
+
+ 120, 120, 165, 166, 126, 127, 128, 148, 149, 150,
+ 148, 143, 143, 211, 144, 144, 174, 175, 143, 129,
+ 156, 144, 197, 198, 99, 207, 208, 99, 225, 209,
+ 199, 224, 105, 118, 168, 109, 117, 212, 252, 248,
+ 230, 158, 248, 223, 151, 119, 119, 241, 177, 159,
+ 119, 157, 218, 219, 220, 218, 195, 160, 169, 205,
+ 242, 119, 119, 231, 248, 231, 119, 248, 232, 254,
+ 168, 143, 178, 214, 144, 194, 213, 238, 239, 143,
+ 250, 248, 409, 248, 215, 215, 215, 215, 215, 215,
+ 215, 215, 215, 233, 169, 233, 253, 216, 240, 233,
+
+ 295, 195, 235, 233, 255, 233, 278, 120, 233, 120,
+ 233, 233, 308, 120, 194, 143, 122, 120, 144, 120,
+ 296, 233, 120, 233, 120, 120, 143, 233, 257, 144,
+ 235, 233, 195, 233, 325, 120, 233, 120, 233, 233,
+ 195, 120, 258, 143, 237, 120, 144, 120, 143, 326,
+ 120, 144, 120, 120, 124, 238, 239, 124, 124, 238,
+ 239, 124, 260, 143, 260, 143, 144, 177, 144, 143,
+ 260, 248, 144, 260, 126, 184, 128, 260, 126, 260,
+ 128, 143, 262, 263, 144, 191, 201, 204, 282, 129,
+ 211, 178, 204, 129, 238, 239, 197, 198, 243, 185,
+
+ 214, 264, 243, 213, 279, 248, 329, 207, 208, 192,
+ 202, 283, 298, 248, 212, 240, 248, 205, 205, 230,
+ 329, 143, 205, 265, 144, 330, 244, 325, 243, 119,
+ 195, 311, 243, 243, 295, 409, 299, 243, 409, 143,
+ 143, 205, 144, 144, 243, 119, 304, 243, 248, 243,
+ 245, 120, 409, 120, 306, 296, 305, 120, 296, 121,
+ 122, 120, 121, 120, 143, 248, 120, 144, 120, 120,
+ 214, 143, 296, 213, 144, 143, 248, 338, 144, 248,
+ 312, 215, 215, 215, 215, 215, 215, 215, 215, 215,
+ 233, 248, 233, 248, 216, 248, 233, 248, 143, 235,
+
+ 233, 144, 233, 314, 233, 233, 233, 233, 233, 341,
+ 233, 313, 333, 235, 233, 378, 233, 343, 120, 233,
+ 120, 233, 233, 342, 120, 242, 345, 237, 120, 248,
+ 120, 379, 233, 120, 233, 120, 120, 143, 233, 248,
+ 144, 293, 233, 248, 233, 248, 260, 233, 260, 233,
+ 233, 124, 238, 239, 124, 311, 248, 248, 248, 248,
+ 233, 260, 233, 260, 364, 143, 233, 339, 144, 293,
+ 233, 297, 233, 300, 340, 233, 143, 233, 233, 144,
+ 260, 365, 260, 366, 380, 214, 129, 238, 239, 311,
+ 367, 248, 205, 377, 248, 260, 267, 260, 268, 267,
+
+ 399, 268, 270, 301, 267, 270, 268, 195, 240, 322,
+ 270, 301, 301, 301, 301, 271, 273, 319, 271, 273,
+ 389, 248, 390, 271, 273, 301, 301, 301, 301, 301,
+ 301, 238, 239, 274, 276, 277, 274, 276, 277, 248,
+ 247, 274, 276, 277, 247, 280, 281, 302, 280, 281,
+ 232, 232, 240, 280, 281, 302, 302, 302, 302, 284,
+ 285, 291, 284, 285, 290, 289, 100, 284, 285, 302,
+ 302, 302, 302, 302, 302, 238, 239, 315, 316, 317,
+ 315, 316, 317, 223, 288, 315, 316, 317, 288, 318,
+ 320, 336, 318, 320, 213, 206, 240, 318, 320, 336,
+
+ 336, 336, 336, 321, 323, 206, 321, 323, 196, 196,
+ 187, 321, 323, 336, 336, 336, 336, 336, 336, 337,
+ 187, 180, 180, 324, 171, 269, 324, 337, 337, 337,
+ 337, 324, 327, 269, 171, 327, 162, 266, 266, 162,
+ 327, 337, 337, 337, 337, 337, 337, 362, 153, 153,
+ 259, 328, 259, 248, 328, 362, 362, 362, 362, 328,
+ 331, 248, 247, 331, 229, 229, 228, 227, 331, 362,
+ 362, 362, 362, 362, 362, 363, 226, 117, 221, 332,
+ 100, 221, 332, 363, 363, 363, 363, 332, 334, 206,
+ 206, 334, 196, 196, 189, 188, 334, 363, 363, 363,
+
+ 363, 363, 363, 376, 188, 187, 182, 335, 181, 181,
+ 335, 376, 376, 376, 376, 335, 346, 180, 173, 346,
+ 172, 172, 171, 164, 346, 376, 376, 376, 376, 376,
+ 376, 243, 163, 163, 162, 347, 147, 130, 347, 243,
+ 243, 243, 243, 347, 348, 107, 102, 348, 100, 100,
+ 409, 409, 348, 243, 243, 243, 243, 243, 243, 388,
+ 409, 409, 409, 349, 409, 409, 349, 388, 388, 388,
+ 388, 349, 351, 409, 409, 351, 409, 409, 409, 409,
+ 351, 388, 388, 388, 388, 388, 388, 398, 409, 409,
+ 409, 352, 409, 409, 352, 398, 398, 398, 398, 352,
+
+ 354, 409, 409, 354, 409, 409, 409, 409, 354, 398,
+ 398, 398, 398, 398, 398, 407, 409, 409, 409, 355,
+ 409, 409, 355, 407, 407, 407, 407, 355, 356, 409,
+ 409, 356, 409, 409, 409, 409, 356, 407, 407, 407,
+ 407, 407, 407, 243, 409, 409, 409, 357, 409, 409,
+ 357, 243, 243, 243, 243, 357, 358, 409, 409, 358,
+ 409, 409, 409, 409, 358, 243, 243, 243, 243, 243,
+ 243, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 64, 64, 64, 64, 64, 64,
+
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+ 76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+ 76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+ 76, 76, 76, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 88, 88, 88, 88,
+ 88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
+
+ 88, 88, 88, 88, 88, 88, 88, 88, 88, 97,
+ 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,
+ 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,
+ 97, 97, 58, 58, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 58, 101, 101, 409, 101, 101,
+ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+ 101, 101, 101, 409, 101, 101, 101, 101, 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, 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, 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,
+ 103, 106, 106, 409, 106, 106, 106, 106, 106, 106,
+ 106, 106, 106, 106, 106, 106, 106, 106, 106, 409,
+ 106, 106, 106, 106, 113, 113, 113, 113, 113, 113,
+ 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
+ 113, 113, 113, 113, 113, 113, 113, 123, 409, 123,
+ 409, 123, 123, 123, 123, 409, 123, 123, 123, 409,
+ 123, 123, 123, 125, 409, 409, 125, 125, 125, 125,
+ 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
+ 125, 125, 125, 125, 125, 131, 131, 131, 409, 131,
+ 131, 131, 132, 132, 132, 409, 409, 132, 142, 142,
+
+ 142, 142, 409, 142, 142, 142, 409, 142, 142, 142,
+ 152, 152, 152, 152, 409, 152, 152, 152, 409, 152,
+ 152, 152, 161, 409, 409, 161, 161, 161, 409, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 167, 167, 409, 167, 359, 167, 360,
+ 359, 409, 360, 409, 409, 359, 409, 360, 167, 167,
+ 409, 167, 170, 409, 409, 170, 409, 170, 170, 170,
+ 170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
+ 170, 170, 170, 176, 176, 409, 176, 361, 176, 368,
+ 361, 409, 368, 409, 409, 361, 409, 368, 176, 176,
+
+ 167, 176, 179, 167, 409, 179, 179, 179, 167, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 183, 369, 183, 176, 369, 409, 176,
+ 409, 409, 369, 409, 176, 183, 183, 409, 183, 186,
+ 409, 409, 186, 409, 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,
+ 190, 370, 190, 183, 370, 409, 183, 409, 409, 370,
+ 409, 183, 190, 190, 409, 190, 193, 409, 409, 193,
+ 193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+ 193, 193, 193, 193, 193, 193, 193, 200, 371, 200,
+
+ 190, 371, 409, 190, 409, 409, 371, 409, 190, 200,
+ 200, 409, 200, 203, 409, 409, 203, 203, 203, 203,
+ 203, 203, 203, 203, 203, 203, 203, 203, 203, 203,
+ 203, 203, 203, 203, 210, 372, 210, 200, 372, 409,
+ 200, 409, 409, 372, 409, 200, 210, 210, 409, 210,
+ 213, 373, 213, 409, 373, 213, 213, 213, 409, 373,
+ 213, 215, 210, 215, 409, 210, 215, 215, 215, 409,
+ 210, 215, 217, 409, 217, 409, 409, 217, 217, 217,
+ 409, 217, 217, 234, 409, 234, 409, 234, 234, 234,
+ 234, 409, 234, 234, 234, 409, 234, 234, 234, 121,
+
+ 409, 121, 409, 121, 121, 121, 121, 409, 121, 121,
+ 121, 409, 121, 121, 121, 236, 409, 236, 409, 236,
+ 236, 236, 236, 409, 236, 236, 236, 409, 236, 236,
+ 236, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 409, 124, 124, 124, 124, 124,
+ 124, 124, 124, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 246, 246, 246, 409, 409, 246, 246, 246,
+ 409, 246, 246, 246, 123, 409, 123, 409, 123, 123,
+ 123, 123, 409, 123, 123, 123, 409, 123, 123, 123,
+
+ 152, 152, 152, 409, 409, 152, 152, 152, 409, 152,
+ 152, 152, 261, 409, 409, 409, 261, 409, 261, 409,
+ 409, 261, 261, 261, 409, 261, 261, 261, 161, 409,
+ 409, 161, 161, 161, 409, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161, 161, 167,
+ 374, 167, 375, 374, 409, 375, 409, 409, 374, 409,
+ 375, 167, 167, 409, 167, 170, 409, 409, 170, 409,
+ 170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
+ 170, 170, 170, 170, 170, 170, 176, 381, 176, 382,
+ 381, 409, 382, 409, 409, 381, 409, 382, 176, 176,
+
+ 383, 176, 179, 383, 409, 179, 179, 179, 383, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 183, 384, 183, 385, 384, 409, 385,
+ 409, 409, 384, 409, 385, 183, 183, 409, 183, 272,
+ 272, 272, 409, 409, 272, 186, 409, 409, 186, 409,
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
-
+ 186, 186, 186, 186, 186, 186, 190, 386, 190, 387,
+ 386, 409, 387, 409, 409, 386, 409, 387, 190, 190,
+ 409, 190, 275, 275, 275, 409, 409, 275, 193, 409,
+ 409, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+
+ 193, 193, 193, 193, 193, 193, 193, 193, 193, 200,
+ 297, 200, 391, 297, 409, 391, 409, 409, 297, 409,
+ 391, 200, 200, 409, 200, 203, 409, 409, 203, 203,
+ 203, 203, 203, 203, 203, 203, 203, 203, 203, 203,
+ 203, 203, 203, 203, 203, 203, 210, 392, 210, 393,
+ 392, 409, 393, 409, 409, 392, 409, 393, 210, 210,
+ 409, 210, 213, 394, 213, 409, 394, 213, 213, 213,
+ 409, 394, 213, 286, 395, 286, 409, 395, 286, 286,
+ 286, 409, 395, 286, 215, 396, 215, 409, 396, 215,
+ 215, 215, 409, 396, 215, 287, 409, 409, 287, 287,
+
+ 287, 409, 409, 287, 217, 409, 217, 409, 409, 217,
+ 217, 217, 409, 217, 217, 234, 409, 234, 409, 234,
+ 234, 234, 234, 409, 234, 234, 234, 409, 234, 234,
+ 234, 236, 409, 236, 409, 236, 236, 236, 236, 409,
+ 236, 236, 236, 409, 236, 236, 236, 292, 409, 292,
+ 409, 292, 292, 292, 292, 409, 292, 292, 292, 409,
+ 292, 292, 292, 294, 409, 294, 294, 409, 294, 409,
+ 294, 409, 294, 409, 294, 294, 409, 294, 294, 294,
+ 409, 294, 294, 294, 294, 297, 397, 297, 400, 397,
+ 409, 400, 409, 409, 397, 409, 400, 297, 297, 409,
+
+ 297, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+ 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+ 243, 243, 243, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 409, 124, 124, 124,
+ 124, 124, 124, 124, 124, 246, 246, 246, 409, 409,
+ 246, 246, 246, 409, 246, 246, 246, 303, 409, 409,
+ 303, 303, 303, 409, 409, 303, 132, 401, 409, 409,
+ 401, 132, 132, 132, 409, 401, 132, 142, 142, 142,
+ 142, 409, 142, 142, 142, 409, 142, 142, 142, 260,
+ 409, 409, 409, 260, 409, 260, 409, 409, 260, 260,
+
+ 260, 409, 260, 260, 260, 310, 409, 409, 409, 310,
+ 310, 310, 409, 409, 310, 310, 310, 409, 310, 310,
+ 310, 272, 402, 409, 409, 402, 272, 272, 272, 409,
+ 402, 272, 275, 403, 409, 409, 403, 275, 275, 275,
+ 409, 403, 275, 193, 409, 409, 193, 193, 193, 409,
+ 193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+ 193, 193, 193, 193, 203, 409, 409, 203, 409, 203,
+ 203, 203, 203, 203, 203, 203, 203, 203, 203, 203,
+ 203, 203, 203, 203, 203, 286, 404, 286, 409, 404,
+ 286, 286, 286, 409, 404, 286, 287, 409, 409, 287,
+
+ 287, 287, 409, 409, 287, 297, 297, 297, 297, 297,
+ 297, 297, 297, 297, 297, 297, 297, 297, 297, 297,
+ 297, 297, 297, 297, 344, 344, 344, 409, 409, 344,
+ 344, 344, 409, 344, 344, 344, 350, 409, 409, 350,
+ 350, 350, 409, 405, 350, 353, 405, 409, 353, 353,
+ 353, 405, 406, 353, 167, 406, 176, 167, 183, 176,
+ 406, 183, 167, 409, 176, 190, 183, 200, 190, 210,
+ 200, 408, 210, 190, 408, 200, 409, 210, 409, 408,
+ 21, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409
} ;
-static yyconst flex_int16_t yy_chk[2398] =
+static yyconst flex_int16_t yy_chk[2548] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -852,264 +877,280 @@ static yyconst flex_int16_t yy_chk[2398] =
1, 1, 1, 1, 1, 1, 1, 1, 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, 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,
+ 1, 1, 1, 1, 1, 1, 3, 134, 3, 3,
+ 4, 23, 4, 4, 23, 5, 3, 5, 5, 74,
+ 4, 5, 6, 141, 6, 6, 17, 7, 6, 7,
+ 7, 8, 134, 8, 8, 28, 28, 7, 18, 136,
+
+ 17, 8, 3, 74, 399, 43, 4, 9, 43, 9,
+ 9, 5, 18, 9, 10, 141, 10, 10, 6, 11,
+ 10, 11, 11, 7, 136, 45, 389, 8, 45, 11,
+ 49, 3, 253, 49, 12, 4, 12, 12, 88, 13,
+ 5, 13, 13, 9, 12, 13, 32, 6, 32, 45,
+ 10, 14, 7, 14, 14, 11, 8, 14, 34, 80,
+ 34, 32, 32, 35, 35, 35, 35, 102, 88, 36,
+ 12, 36, 9, 34, 34, 13, 256, 82, 253, 10,
+ 35, 36, 50, 80, 11, 50, 102, 14, 51, 44,
+ 86, 51, 44, 42, 42, 103, 103, 36, 42, 12,
+
+ 42, 42, 42, 82, 13, 44, 42, 42, 95, 256,
+ 42, 95, 51, 380, 86, 377, 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, 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, 0, 394, 394, 394, 395, 395,
- 395, 395, 395, 395, 395, 395, 395, 395, 395, 395,
-
- 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, 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,
+ 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 37, 39, 37, 353, 39, 350, 37,
+ 344, 37, 37, 37, 37, 37, 52, 137, 37, 52,
+
+ 37, 37, 63, 63, 39, 39, 39, 48, 48, 48,
+ 48, 53, 54, 92, 53, 54, 68, 68, 55, 39,
+ 52, 55, 85, 85, 99, 91, 91, 99, 107, 91,
+ 85, 105, 105, 109, 63, 109, 117, 92, 137, 139,
+ 118, 54, 135, 107, 48, 109, 117, 126, 68, 55,
+ 118, 53, 98, 98, 98, 98, 85, 55, 63, 91,
+ 126, 109, 117, 119, 140, 119, 118, 138, 119, 139,
+ 162, 142, 68, 96, 142, 193, 96, 124, 124, 143,
+ 135, 343, 143, 255, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 120, 162, 120, 138, 96, 124, 120,
+
+ 238, 193, 120, 120, 140, 120, 194, 121, 120, 121,
+ 120, 120, 255, 121, 200, 145, 121, 121, 145, 121,
+ 238, 122, 121, 122, 121, 121, 146, 122, 145, 146,
+ 122, 122, 194, 122, 279, 123, 122, 123, 122, 122,
+ 200, 123, 146, 156, 123, 123, 156, 123, 155, 279,
+ 123, 155, 123, 123, 125, 125, 125, 125, 127, 127,
+ 127, 127, 154, 157, 154, 158, 157, 171, 158, 159,
+ 154, 338, 159, 154, 125, 180, 125, 154, 127, 154,
+ 127, 160, 155, 156, 160, 187, 195, 203, 204, 125,
+ 205, 171, 210, 127, 129, 129, 199, 199, 129, 180,
+
+ 215, 159, 129, 215, 199, 249, 283, 209, 209, 187,
+ 195, 209, 242, 251, 205, 129, 250, 203, 204, 230,
+ 329, 257, 210, 160, 257, 283, 129, 325, 129, 230,
+ 199, 311, 129, 129, 239, 239, 242, 129, 294, 258,
+ 262, 209, 258, 262, 129, 230, 249, 129, 304, 129,
+ 129, 144, 295, 144, 251, 239, 250, 144, 294, 144,
+ 144, 144, 144, 144, 263, 307, 144, 263, 144, 144,
+ 217, 264, 295, 217, 264, 265, 309, 304, 265, 365,
+ 262, 217, 217, 217, 217, 217, 217, 217, 217, 217,
+ 233, 366, 233, 308, 217, 306, 233, 303, 312, 233,
+
+ 233, 312, 233, 265, 234, 233, 234, 233, 233, 307,
+ 234, 264, 297, 234, 234, 365, 234, 309, 236, 234,
+ 236, 234, 234, 308, 236, 297, 312, 236, 236, 339,
+ 236, 366, 237, 236, 237, 236, 236, 313, 237, 367,
+ 313, 237, 237, 340, 237, 341, 261, 237, 261, 237,
+ 237, 243, 243, 243, 243, 261, 305, 342, 364, 390,
+ 292, 261, 292, 261, 339, 314, 292, 305, 314, 292,
+ 292, 243, 292, 243, 305, 292, 345, 292, 292, 345,
+ 310, 340, 310, 341, 367, 286, 243, 244, 244, 310,
+ 342, 378, 282, 364, 379, 310, 454, 310, 455, 454,
+
+ 390, 455, 458, 244, 454, 458, 455, 278, 244, 275,
+ 458, 244, 244, 244, 244, 459, 463, 272, 459, 463,
+ 378, 254, 379, 459, 463, 244, 244, 244, 244, 244,
+ 244, 245, 245, 464, 468, 469, 464, 468, 469, 252,
+ 247, 464, 468, 469, 246, 472, 473, 245, 472, 473,
+ 232, 231, 245, 472, 473, 245, 245, 245, 245, 476,
+ 477, 228, 476, 477, 227, 226, 224, 476, 477, 245,
+ 245, 245, 245, 245, 245, 301, 301, 496, 497, 498,
+ 496, 497, 498, 221, 220, 496, 497, 498, 219, 499,
+ 501, 301, 499, 501, 214, 208, 301, 499, 501, 301,
+
+ 301, 301, 301, 502, 504, 207, 502, 504, 198, 197,
+ 190, 502, 504, 301, 301, 301, 301, 301, 301, 302,
+ 186, 183, 179, 505, 176, 175, 505, 302, 302, 302,
+ 302, 505, 507, 174, 170, 507, 167, 166, 165, 161,
+ 507, 302, 302, 302, 302, 302, 302, 336, 153, 152,
+ 150, 508, 149, 133, 508, 336, 336, 336, 336, 508,
+ 510, 132, 131, 510, 116, 115, 112, 111, 510, 336,
+ 336, 336, 336, 336, 336, 337, 110, 108, 106, 511,
+ 104, 101, 511, 337, 337, 337, 337, 511, 515, 90,
+ 89, 515, 84, 83, 79, 78, 515, 337, 337, 337,
+
+ 337, 337, 337, 362, 77, 76, 73, 516, 72, 71,
+ 516, 362, 362, 362, 362, 516, 518, 70, 67, 518,
+ 66, 65, 64, 62, 518, 362, 362, 362, 362, 362,
+ 362, 363, 61, 60, 59, 519, 46, 40, 519, 363,
+ 363, 363, 363, 519, 520, 29, 27, 520, 25, 24,
+ 21, 0, 520, 363, 363, 363, 363, 363, 363, 376,
+ 0, 0, 0, 521, 0, 0, 521, 376, 376, 376,
+ 376, 521, 523, 0, 0, 523, 0, 0, 0, 0,
+ 523, 376, 376, 376, 376, 376, 376, 388, 0, 0,
+ 0, 524, 0, 0, 524, 388, 388, 388, 388, 524,
+
+ 526, 0, 0, 526, 0, 0, 0, 0, 526, 388,
+ 388, 388, 388, 388, 388, 398, 0, 0, 0, 527,
+ 0, 0, 527, 398, 398, 398, 398, 527, 528, 0,
+ 0, 528, 0, 0, 0, 0, 528, 398, 398, 398,
+ 398, 398, 398, 407, 0, 0, 0, 529, 0, 0,
+ 529, 407, 407, 407, 407, 529, 530, 0, 0, 530,
+ 0, 0, 0, 0, 530, 407, 407, 407, 407, 407,
+ 407, 410, 410, 410, 410, 410, 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,
+ 410, 410, 410, 410, 411, 411, 411, 411, 411, 411,
- 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, 0, 420, 420, 420, 420, 420, 420, 420,
+ 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
+ 411, 411, 411, 411, 411, 411, 411, 412, 412, 412,
+ 412, 412, 412, 412, 412, 412, 412, 412, 412, 412,
+ 412, 412, 412, 412, 412, 412, 412, 412, 412, 412,
+ 413, 413, 413, 413, 413, 413, 413, 413, 413, 413,
+ 413, 413, 413, 413, 413, 413, 413, 413, 413, 413,
+ 413, 413, 413, 414, 414, 414, 414, 414, 414, 414,
+ 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
+ 414, 414, 414, 414, 414, 414, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 416,
+ 416, 416, 416, 416, 416, 416, 416, 416, 416, 416,
+ 416, 416, 416, 416, 416, 416, 416, 416, 416, 416,
+ 416, 416, 417, 417, 417, 417, 417, 417, 417, 417,
+ 417, 417, 417, 417, 417, 417, 417, 417, 417, 417,
+ 417, 417, 417, 417, 417, 418, 418, 0, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 0, 418, 418, 418, 418, 419, 419,
+ 419, 419, 419, 419, 419, 419, 419, 419, 419, 419,
+ 419, 419, 419, 419, 419, 419, 419, 419, 419, 419,
+
+ 419, 420, 420, 0, 420, 420, 420, 420, 420, 420,
+ 420, 420, 420, 420, 420, 420, 420, 420, 420, 0,
+ 420, 420, 420, 420, 421, 421, 421, 421, 421, 421,
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
-
+ 421, 421, 421, 421, 421, 421, 421, 422, 0, 422,
+ 0, 422, 422, 422, 422, 0, 422, 422, 422, 0,
+ 422, 422, 422, 423, 0, 0, 423, 423, 423, 423,
+ 423, 423, 423, 423, 423, 423, 423, 423, 423, 423,
+ 423, 423, 423, 423, 423, 424, 424, 424, 0, 424,
+ 424, 424, 425, 425, 425, 0, 0, 425, 426, 426,
+
+ 426, 426, 0, 426, 426, 426, 0, 426, 426, 426,
+ 427, 427, 427, 427, 0, 427, 427, 427, 0, 427,
+ 427, 427, 428, 0, 0, 428, 428, 428, 0, 428,
+ 428, 428, 428, 428, 428, 428, 428, 428, 428, 428,
+ 428, 428, 428, 429, 429, 0, 429, 531, 429, 532,
+ 531, 0, 532, 0, 0, 531, 0, 532, 429, 429,
+ 0, 429, 430, 0, 0, 430, 0, 430, 430, 430,
+ 430, 430, 430, 430, 430, 430, 430, 430, 430, 430,
+ 430, 430, 430, 431, 431, 0, 431, 533, 431, 534,
+ 533, 0, 534, 0, 0, 533, 0, 534, 431, 431,
+
+ 535, 431, 432, 535, 0, 432, 432, 432, 535, 432,
+ 432, 432, 432, 432, 432, 432, 432, 432, 432, 432,
+ 432, 432, 432, 433, 536, 433, 537, 536, 0, 537,
+ 0, 0, 536, 0, 537, 433, 433, 0, 433, 434,
+ 0, 0, 434, 0, 434, 434, 434, 434, 434, 434,
+ 434, 434, 434, 434, 434, 434, 434, 434, 434, 434,
+ 435, 538, 435, 539, 538, 0, 539, 0, 0, 538,
+ 0, 539, 435, 435, 0, 435, 436, 0, 0, 436,
+ 436, 436, 436, 436, 436, 436, 436, 436, 436, 436,
+ 436, 436, 436, 436, 436, 436, 436, 437, 540, 437,
+
+ 541, 540, 0, 541, 0, 0, 540, 0, 541, 437,
+ 437, 0, 437, 438, 0, 0, 438, 438, 438, 438,
+ 438, 438, 438, 438, 438, 438, 438, 438, 438, 438,
+ 438, 438, 438, 438, 439, 542, 439, 543, 542, 0,
+ 543, 0, 0, 542, 0, 543, 439, 439, 0, 439,
+ 440, 544, 440, 0, 544, 440, 440, 440, 0, 544,
+ 440, 441, 545, 441, 0, 545, 441, 441, 441, 0,
+ 545, 441, 442, 0, 442, 0, 0, 442, 442, 442,
+ 0, 442, 442, 443, 0, 443, 0, 443, 443, 443,
+ 443, 0, 443, 443, 443, 0, 443, 443, 443, 444,
+
+ 0, 444, 0, 444, 444, 444, 444, 0, 444, 444,
+ 444, 0, 444, 444, 444, 445, 0, 445, 0, 445,
+ 445, 445, 445, 0, 445, 445, 445, 0, 445, 445,
+ 445, 446, 446, 446, 446, 446, 446, 446, 446, 446,
+ 446, 446, 446, 446, 0, 446, 446, 446, 446, 446,
+ 446, 446, 446, 447, 447, 447, 447, 447, 447, 447,
+ 447, 447, 447, 447, 447, 447, 447, 447, 447, 447,
+ 447, 447, 448, 448, 448, 0, 0, 448, 448, 448,
+ 0, 448, 448, 448, 449, 0, 449, 0, 449, 449,
+ 449, 449, 0, 449, 449, 449, 0, 449, 449, 449,
+
+ 450, 450, 450, 0, 0, 450, 450, 450, 0, 450,
+ 450, 450, 451, 0, 0, 0, 451, 0, 451, 0,
+ 0, 451, 451, 451, 0, 451, 451, 451, 452, 0,
+ 0, 452, 452, 452, 0, 452, 452, 452, 452, 452,
+ 452, 452, 452, 452, 452, 452, 452, 452, 452, 453,
+ 546, 453, 547, 546, 0, 547, 0, 0, 546, 0,
+ 547, 453, 453, 0, 453, 456, 0, 0, 456, 0,
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+ 456, 456, 456, 456, 456, 456, 457, 548, 457, 549,
+ 548, 0, 549, 0, 0, 548, 0, 549, 457, 457,
+
+ 550, 457, 460, 550, 0, 460, 460, 460, 550, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 461, 551, 461, 552, 551, 0, 552,
+ 0, 0, 551, 0, 552, 461, 461, 0, 461, 462,
+ 462, 462, 0, 0, 462, 465, 0, 0, 465, 0,
+ 465, 465, 465, 465, 465, 465, 465, 465, 465, 465,
+ 465, 465, 465, 465, 465, 465, 466, 553, 466, 554,
+ 553, 0, 554, 0, 0, 553, 0, 554, 466, 466,
+ 0, 466, 467, 467, 467, 0, 0, 467, 470, 0,
+ 0, 470, 470, 470, 470, 470, 470, 470, 470, 470,
+
+ 470, 470, 470, 470, 470, 470, 470, 470, 470, 471,
+ 555, 471, 556, 555, 0, 556, 0, 0, 555, 0,
+ 556, 471, 471, 0, 471, 474, 0, 0, 474, 474,
+ 474, 474, 474, 474, 474, 474, 474, 474, 474, 474,
+ 474, 474, 474, 474, 474, 474, 475, 557, 475, 558,
+ 557, 0, 558, 0, 0, 557, 0, 558, 475, 475,
+ 0, 475, 478, 559, 478, 0, 559, 478, 478, 478,
+ 0, 559, 478, 479, 560, 479, 0, 560, 479, 479,
+ 479, 0, 560, 479, 480, 561, 480, 0, 561, 480,
+ 480, 480, 0, 561, 480, 481, 0, 0, 481, 481,
+
+ 481, 0, 0, 481, 482, 0, 482, 0, 0, 482,
+ 482, 482, 0, 482, 482, 483, 0, 483, 0, 483,
+ 483, 483, 483, 0, 483, 483, 483, 0, 483, 483,
+ 483, 484, 0, 484, 0, 484, 484, 484, 484, 0,
+ 484, 484, 484, 0, 484, 484, 484, 485, 0, 485,
+ 0, 485, 485, 485, 485, 0, 485, 485, 485, 0,
+ 485, 485, 485, 486, 0, 486, 486, 0, 486, 0,
+ 486, 0, 486, 0, 486, 486, 0, 486, 486, 486,
+ 0, 486, 486, 486, 486, 487, 562, 487, 563, 562,
+ 0, 563, 0, 0, 562, 0, 563, 487, 487, 0,
+
+ 487, 488, 488, 488, 488, 488, 488, 488, 488, 488,
+ 488, 488, 488, 488, 488, 488, 488, 488, 488, 488,
+ 488, 488, 488, 489, 489, 489, 489, 489, 489, 489,
+ 489, 489, 489, 489, 489, 489, 0, 489, 489, 489,
+ 489, 489, 489, 489, 489, 490, 490, 490, 0, 0,
+ 490, 490, 490, 0, 490, 490, 490, 491, 0, 0,
+ 491, 491, 491, 0, 0, 491, 492, 564, 0, 0,
+ 564, 492, 492, 492, 0, 564, 492, 493, 493, 493,
+ 493, 0, 493, 493, 493, 0, 493, 493, 493, 494,
+ 0, 0, 0, 494, 0, 494, 0, 0, 494, 494,
+
+ 494, 0, 494, 494, 494, 495, 0, 0, 0, 495,
+ 495, 495, 0, 0, 495, 495, 495, 0, 495, 495,
+ 495, 500, 565, 0, 0, 565, 500, 500, 500, 0,
+ 565, 500, 503, 566, 0, 0, 566, 503, 503, 503,
+ 0, 566, 503, 506, 0, 0, 506, 506, 506, 0,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 509, 0, 0, 509, 0, 509,
+ 509, 509, 509, 509, 509, 509, 509, 509, 509, 509,
+ 509, 509, 509, 509, 509, 512, 567, 512, 0, 567,
+ 512, 512, 512, 0, 567, 512, 513, 0, 0, 513,
+
+ 513, 513, 0, 0, 513, 514, 514, 514, 514, 514,
+ 514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
+ 514, 514, 514, 514, 517, 517, 517, 0, 0, 517,
+ 517, 517, 0, 517, 517, 517, 522, 0, 0, 522,
+ 522, 522, 0, 568, 522, 525, 568, 0, 525, 525,
+ 525, 568, 569, 525, 570, 569, 571, 570, 572, 571,
+ 569, 572, 570, 0, 571, 573, 572, 574, 573, 575,
+ 574, 576, 575, 573, 576, 574, 0, 575, 0, 576,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+ 409, 409, 409, 409, 409, 409, 409
} ;
/* The intent behind this definition is that it'll catch
@@ -1121,12 +1162,12 @@ static yyconst flex_int16_t yy_chk[2398] =
#define YY_RESTORE_YY_MORE_OFFSET
#line 1 "./turtle_l.l"
/*
- * $Id: turtle_l.l,v 1.21.2.17 2011/05/16 09:04:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -1151,6 +1192,7 @@ static yyconst flex_int16_t yy_chk[2398] =
#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
@@ -1256,7 +1298,7 @@ extern int ttlyydebug;
/* Special unreacheable state to fill the first item of ttlp_arg[0].ttlp_lexstates */
-#line 1260 "turtle_l.c"
+#line 1302 "turtle_l.c"
#define INITIAL 0
#define TURTLE_SQ 1
@@ -1419,7 +1461,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1504,10 +1546,10 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 179 "./turtle_l.l"
+#line 180 "./turtle_l.l"
-#line 1511 "turtle_l.c"
+#line 1553 "turtle_l.c"
yylval = yylval_param;
@@ -1568,13 +1610,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 >= 384 )
+ if ( yy_current_state >= 410 )
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 != 383 );
+ while ( yy_current_state != 409 );
yy_cp = yyg->yy_last_accepting_cpos;
yy_current_state = yyg->yy_last_accepting_state;
@@ -1596,224 +1638,239 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 181 "./turtle_l.l"
+#line 182 "./turtle_l.l"
{ return _CARET_WS ; }
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 182 "./turtle_l.l"
+#line 183 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; return _CARET_WS ; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 183 "./turtle_l.l"
+#line 184 "./turtle_l.l"
{ return _CARET_NOWS ; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 184 "./turtle_l.l"
+#line 185 "./turtle_l.l"
{ return _CARET_CARET ; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 185 "./turtle_l.l"
+#line 186 "./turtle_l.l"
{ return _COMMA; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 186 "./turtle_l.l"
+#line 187 "./turtle_l.l"
{ return _DOT_WS; }
YY_BREAK
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 187 "./turtle_l.l"
+#line 188 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; return _DOT_WS; }
YY_BREAK
case 8:
/* rule 8 can match eol */
YY_RULE_SETUP
-#line 188 "./turtle_l.l"
+#line 189 "./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 189 "./turtle_l.l"
+#line 190 "./turtle_l.l"
{ return _DOT_WS; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 190 "./turtle_l.l"
+#line 191 "./turtle_l.l"
{ return _COLON; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 191 "./turtle_l.l"
+#line 192 "./turtle_l.l"
{ return _SEMI; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 192 "./turtle_l.l"
+#line 193 "./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 193 "./turtle_l.l"
+#line 194 "./turtle_l.l"
{ return _EQ_GT; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 194 "./turtle_l.l"
+#line 195 "./turtle_l.l"
{ return _LT_EQ; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 195 "./turtle_l.l"
+#line 196 "./turtle_l.l"
{ return _BANG; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 197 "./turtle_l.l"
+#line 198 "./turtle_l.l"
{ return _AT_a_L; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 198 "./turtle_l.l"
+#line 199 "./turtle_l.l"
{ return _AT_base_L; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 199 "./turtle_l.l"
+#line 200 "./turtle_l.l"
{ return _AT_has_L; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 200 "./turtle_l.l"
+#line 201 "./turtle_l.l"
{ return _AT_is_L; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 201 "./turtle_l.l"
+#line 202 "./turtle_l.l"
{ return _AT_of_L; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 202 "./turtle_l.l"
+#line 203 "./turtle_l.l"
{ return _AT_this_L; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 203 "./turtle_l.l"
+#line 204 "./turtle_l.l"
{ return _AT_keywords_L; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 204 "./turtle_l.l"
+#line 205 "./turtle_l.l"
{ return _AT_prefix_L; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 205 "./turtle_l.l"
+#line 206 "./turtle_l.l"
{ ttlyyerror ("Current version of Virtuoso does not support @forAll keyword"); }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 206 "./turtle_l.l"
+#line 207 "./turtle_l.l"
{ ttlyyerror ("Current version of Virtuoso does not support @forSome keyword"); }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 207 "./turtle_l.l"
-{ return false_L; }
+#line 208 "./turtle_l.l"
+{ return _MINUS_INF_L; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 208 "./turtle_l.l"
-{ return true_L; }
+#line 209 "./turtle_l.l"
+{ return INF_L; }
YY_BREAK
case 28:
YY_RULE_SETUP
#line 210 "./turtle_l.l"
-{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_A, _AT_a_L) }
+{ return NaN_L; }
YY_BREAK
case 29:
YY_RULE_SETUP
#line 211 "./turtle_l.l"
-{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_HAS, _AT_has_L) }
+{ return false_L; }
YY_BREAK
case 30:
YY_RULE_SETUP
#line 212 "./turtle_l.l"
-{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_IS, _AT_is_L) }
+{ return true_L; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 213 "./turtle_l.l"
-{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_OF, _AT_of_L) }
+#line 214 "./turtle_l.l"
+{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_A, _AT_a_L) }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 214 "./turtle_l.l"
-{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_THIS, _AT_this_L) }
+#line 215 "./turtle_l.l"
+{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_HAS, _AT_has_L) }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 217 "./turtle_l.l"
-{ ttlp_arg[0].ttlp_lexdepth++; return _LPAR; }
+#line 216 "./turtle_l.l"
+{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_IS, _AT_is_L) }
YY_BREAK
case 34:
YY_RULE_SETUP
+#line 217 "./turtle_l.l"
+{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_OF, _AT_of_L) }
+ YY_BREAK
+case 35:
+YY_RULE_SETUP
#line 218 "./turtle_l.l"
+{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_THIS, _AT_this_L) }
+ YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 221 "./turtle_l.l"
+{ ttlp_arg[0].ttlp_lexdepth++; return _LPAR; }
+ YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 222 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth--; return _RPAR; }
YY_BREAK
-case 35:
+case 38:
YY_RULE_SETUP
-#line 219 "./turtle_l.l"
+#line 223 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth++; return _LSQBRA; }
YY_BREAK
-case 36:
+case 39:
YY_RULE_SETUP
-#line 220 "./turtle_l.l"
+#line 224 "./turtle_l.l"
{ return _LSQBRA_RSQBRA; }
YY_BREAK
-case 37:
+case 40:
YY_RULE_SETUP
-#line 221 "./turtle_l.l"
+#line 225 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth--; return _RSQBRA; }
YY_BREAK
-case 38:
+case 41:
YY_RULE_SETUP
-#line 222 "./turtle_l.l"
+#line 226 "./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);
}
YY_BREAK
-case 39:
+case 42:
YY_RULE_SETUP
-#line 226 "./turtle_l.l"
+#line 230 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth--; return _RBRA; }
YY_BREAK
-case 40:
+case 43:
YY_RULE_SETUP
-#line 228 "./turtle_l.l"
+#line 232 "./turtle_l.l"
{
ttlyylval.box = box_dv_short_nchars (yytext + 1, yyleng - 2);
return Q_IRI_REF;
}
YY_BREAK
-case 41:
+case 44:
YY_RULE_SETUP
-#line 233 "./turtle_l.l"
+#line 237 "./turtle_l.l"
{
ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_LTGT, '>');
return Q_IRI_REF;
}
YY_BREAK
-case 42:
+case 45:
YY_RULE_SETUP
-#line 238 "./turtle_l.l"
+#line 242 "./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");
@@ -1822,10 +1879,10 @@ YY_RULE_SETUP
return Q_IRI_REF;
}
YY_BREAK
-case 43:
-/* rule 43 can match eol */
+case 46:
+/* rule 46 can match eol */
YY_RULE_SETUP
-#line 246 "./turtle_l.l"
+#line 250 "./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");
@@ -1835,80 +1892,80 @@ YY_RULE_SETUP
return Q_IRI_REF;
}
YY_BREAK
-case 44:
+case 47:
YY_RULE_SETUP
-#line 255 "./turtle_l.l"
+#line 259 "./turtle_l.l"
{
TTLYYERROR_OR_REPORT ("Invalid characters in angle-bracketed name");
BEGIN (TURTLE_SKIP_TO_DOT_WS); yymore (); }
YY_BREAK
-case 45:
+case 48:
YY_RULE_SETUP
-#line 259 "./turtle_l.l"
+#line 263 "./turtle_l.l"
{ TTL_TOKBOX_Q(0,QNAME,"qualified URI"); }
YY_BREAK
-case 46:
+case 49:
YY_RULE_SETUP
-#line 260 "./turtle_l.l"
+#line 264 "./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");
tf_report (ttlp_arg[0].ttlp_tf, 'W', NULL, NULL, "Invalid characters in local part of QName");
TTL_TOKBOX_Q(0,QNAME,"qualified URI"); }
YY_BREAK
-case 47:
+case 50:
YY_RULE_SETUP
-#line 266 "./turtle_l.l"
+#line 270 "./turtle_l.l"
{ TTL_TOKBOX_Q(0,QNAME_NS,"namespace"); }
YY_BREAK
-case 48:
+case 51:
YY_RULE_SETUP
-#line 267 "./turtle_l.l"
+#line 271 "./turtle_l.l"
{ TTL_TOKBOX_Q(0,QNAME,"name without prefix"); }
YY_BREAK
-case 49:
+case 52:
YY_RULE_SETUP
-#line 268 "./turtle_l.l"
+#line 272 "./turtle_l.l"
{ TTL_TOKBOX_BNODE(0,BLANK_NODE_LABEL,"blank node label"); }
YY_BREAK
-case 50:
+case 53:
YY_RULE_SETUP
-#line 270 "./turtle_l.l"
+#line 274 "./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");
tf_report (ttlp_arg[0].ttlp_tf, 'W', NULL, NULL, "Ill formed blank node label");
TTL_TOKBOX_BNODE(0,BLANK_NODE_LABEL,"blank node label"); }
YY_BREAK
-case 51:
+case 54:
YY_RULE_SETUP
-#line 276 "./turtle_l.l"
+#line 280 "./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");
tf_report (ttlp_arg[0].ttlp_tf, 'W', NULL, NULL, "Full N3 syntax allow variables, TURTLE does not");
TTL_TOKBOX_Q(0,VARIABLE,"variable name"); }
YY_BREAK
-case 52:
+case 55:
YY_RULE_SETUP
-#line 282 "./turtle_l.l"
+#line 286 "./turtle_l.l"
{
ttlyylval.box = box_dv_short_nchars (yytext + 1, yyleng - 1);
return KEYWORD;
}
YY_BREAK
-case 53:
+case 56:
YY_RULE_SETUP
-#line 287 "./turtle_l.l"
+#line 291 "./turtle_l.l"
{
BEGIN INITIAL;
ttlyylval.box = box_dv_short_nchars (yytext, yyleng);
return LANGTAG;
}
YY_BREAK
-case 54:
+case 57:
YY_RULE_SETUP
-#line 293 "./turtle_l.l"
+#line 297 "./turtle_l.l"
{
char *tail;
BEGIN INITIAL;
@@ -1922,151 +1979,151 @@ YY_RULE_SETUP
return LANGTAG;
}
YY_BREAK
-case 55:
+case 58:
YY_RULE_SETUP
-#line 306 "./turtle_l.l"
+#line 310 "./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 307 "./turtle_l.l"
+#line 311 "./turtle_l.l"
{ TTLYYERROR_OR_RECOVER ("Missing language id after '@' at the end of quoted literal"); }
YY_BREAK
-case 56:
+case 59:
YY_RULE_SETUP
-#line 308 "./turtle_l.l"
+#line 312 "./turtle_l.l"
{ TTLYYERROR_OR_RECOVER ("Bad character instead of language id after '@' at the end of quoted literal"); }
YY_BREAK
-case 57:
+case 60:
YY_RULE_SETUP
-#line 311 "./turtle_l.l"
+#line 315 "./turtle_l.l"
{
ttlyylval.box = box_dv_short_nchars (yytext+1, yyleng - 2);
return TURTLE_STRING;
}
YY_BREAK
-case 58:
+case 61:
YY_RULE_SETUP
-#line 316 "./turtle_l.l"
+#line 320 "./turtle_l.l"
{
ttlyylval.box = box_dv_short_nchars (yytext+1, yyleng - 3);
BEGIN TURTLE_AT_AFTER_QUOTED;
return TURTLE_STRING;
}
YY_BREAK
-case 59:
+case 62:
YY_RULE_SETUP
-#line 322 "./turtle_l.l"
+#line 326 "./turtle_l.l"
{ yymore(); BEGIN TURTLE_SSSQ; }
YY_BREAK
-case 60:
+case 63:
YY_RULE_SETUP
-#line 323 "./turtle_l.l"
+#line 327 "./turtle_l.l"
{ yymore(); BEGIN TURTLE_DDDQ; }
YY_BREAK
-case 61:
+case 64:
YY_RULE_SETUP
-#line 324 "./turtle_l.l"
+#line 328 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_3QUOT, '\''); BEGIN INITIAL; return TURTLE_STRING; }
YY_BREAK
-case 62:
+case 65:
YY_RULE_SETUP
-#line 325 "./turtle_l.l"
+#line 329 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_3QUOT, '\"'); BEGIN INITIAL; return TURTLE_STRING; }
YY_BREAK
-case 63:
+case 66:
YY_RULE_SETUP
-#line 326 "./turtle_l.l"
+#line 330 "./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:
+case 67:
YY_RULE_SETUP
-#line 327 "./turtle_l.l"
+#line 331 "./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 */
+case 68:
+/* rule 68 can match eol */
YY_RULE_SETUP
-#line 328 "./turtle_l.l"
+#line 332 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
-case 66:
-/* rule 66 can match eol */
+case 69:
+/* rule 69 can match eol */
YY_RULE_SETUP
-#line 329 "./turtle_l.l"
+#line 333 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
-case 67:
+case 70:
YY_RULE_SETUP
-#line 330 "./turtle_l.l"
+#line 334 "./turtle_l.l"
{ yymore(); }
YY_BREAK
-case 68:
+case 71:
YY_RULE_SETUP
-#line 331 "./turtle_l.l"
+#line 335 "./turtle_l.l"
{ yymore(); }
YY_BREAK
-case 69:
+case 72:
YY_RULE_SETUP
-#line 332 "./turtle_l.l"
+#line 336 "./turtle_l.l"
{ ttlyyerror ("Bad escape sequence in a long single-quoted string"); }
YY_BREAK
-case 70:
+case 73:
YY_RULE_SETUP
-#line 333 "./turtle_l.l"
+#line 337 "./turtle_l.l"
{ ttlyyerror ("Bad escape sequence in a long double-quoted string"); }
YY_BREAK
-case 71:
+case 74:
YY_RULE_SETUP
-#line 334 "./turtle_l.l"
+#line 338 "./turtle_l.l"
{ ttlyyerror ("Bad character in a long single-quoted string"); }
YY_BREAK
-case 72:
+case 75:
YY_RULE_SETUP
-#line 335 "./turtle_l.l"
+#line 339 "./turtle_l.l"
{ ttlyyerror ("Bad character in a long double-quoted string"); }
YY_BREAK
case YY_STATE_EOF(TURTLE_SSSQ):
-#line 336 "./turtle_l.l"
+#line 340 "./turtle_l.l"
{ ttlyyerror ("Unterminated long single-quoted string"); }
YY_BREAK
case YY_STATE_EOF(TURTLE_DDDQ):
-#line 337 "./turtle_l.l"
+#line 341 "./turtle_l.l"
{ ttlyyerror ("Unterminated long double-quoted string"); }
YY_BREAK
-case 73:
+case 76:
YY_RULE_SETUP
-#line 340 "./turtle_l.l"
+#line 344 "./turtle_l.l"
{ yymore(); BEGIN TURTLE_SQ; }
YY_BREAK
-case 74:
+case 77:
YY_RULE_SETUP
-#line 341 "./turtle_l.l"
+#line 345 "./turtle_l.l"
{ yymore(); BEGIN TURTLE_DQ; }
YY_BREAK
-case 75:
+case 78:
YY_RULE_SETUP
-#line 342 "./turtle_l.l"
+#line 346 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_QUOT, '\''); BEGIN INITIAL; return TURTLE_STRING; }
YY_BREAK
-case 76:
+case 79:
YY_RULE_SETUP
-#line 343 "./turtle_l.l"
+#line 347 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_QUOT, '\"'); BEGIN INITIAL; return TURTLE_STRING; }
YY_BREAK
-case 77:
+case 80:
YY_RULE_SETUP
-#line 344 "./turtle_l.l"
+#line 348 "./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:
+case 81:
YY_RULE_SETUP
-#line 345 "./turtle_l.l"
+#line 349 "./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 */
+case 82:
+/* rule 82 can match eol */
YY_RULE_SETUP
-#line 346 "./turtle_l.l"
+#line 350 "./turtle_l.l"
{
if (!(TTLP_STRING_MAY_CONTAIN_CRLF & ttlp_arg[0].ttlp_flags))
{
@@ -2077,10 +2134,10 @@ YY_RULE_SETUP
tf_report (ttlp_arg[0].ttlp_tf, 'W', NULL, NULL, "End-of-line in a short single-quoted string");
ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
-case 80:
-/* rule 80 can match eol */
+case 83:
+/* rule 83 can match eol */
YY_RULE_SETUP
-#line 355 "./turtle_l.l"
+#line 359 "./turtle_l.l"
{
if (!(TTLP_STRING_MAY_CONTAIN_CRLF & ttlp_arg[0].ttlp_flags))
{
@@ -2091,10 +2148,10 @@ YY_RULE_SETUP
tf_report (ttlp_arg[0].ttlp_tf, 'W', NULL, NULL, "End-of-line in a short double-quoted string");
ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
-case 81:
-/* rule 81 can match eol */
+case 84:
+/* rule 84 can match eol */
YY_RULE_SETUP
-#line 364 "./turtle_l.l"
+#line 368 "./turtle_l.l"
{
if (!(TTLP_STRING_MAY_CONTAIN_CRLF & ttlp_arg[0].ttlp_flags))
{
@@ -2103,10 +2160,10 @@ YY_RULE_SETUP
}
ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
-case 82:
-/* rule 82 can match eol */
+case 85:
+/* rule 85 can match eol */
YY_RULE_SETUP
-#line 371 "./turtle_l.l"
+#line 375 "./turtle_l.l"
{
if (!(TTLP_STRING_MAY_CONTAIN_CRLF & ttlp_arg[0].ttlp_flags))
{
@@ -2115,148 +2172,148 @@ YY_RULE_SETUP
}
ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
-case 83:
+case 86:
YY_RULE_SETUP
-#line 378 "./turtle_l.l"
+#line 382 "./turtle_l.l"
{ yymore(); }
YY_BREAK
-case 84:
+case 87:
YY_RULE_SETUP
-#line 379 "./turtle_l.l"
+#line 383 "./turtle_l.l"
{ yymore(); }
YY_BREAK
-case 85:
+case 88:
YY_RULE_SETUP
-#line 380 "./turtle_l.l"
+#line 384 "./turtle_l.l"
{
TTLYYERROR_OR_REPORT ("Bad escape sequence in a short single-quoted string");
BEGIN (TURTLE_BAD_SQ); yymore(); }
YY_BREAK
-case 86:
+case 89:
YY_RULE_SETUP
-#line 383 "./turtle_l.l"
+#line 387 "./turtle_l.l"
{
TTLYYERROR_OR_REPORT ("Bad escape sequence in a short double-quoted string");
BEGIN (TURTLE_BAD_DQ); yymore(); }
YY_BREAK
-case 87:
+case 90:
YY_RULE_SETUP
-#line 386 "./turtle_l.l"
+#line 390 "./turtle_l.l"
{}
YY_BREAK
-case 88:
+case 91:
YY_RULE_SETUP
-#line 387 "./turtle_l.l"
+#line 391 "./turtle_l.l"
{}
YY_BREAK
-case 89:
-/* rule 89 can match eol */
+case 92:
+/* rule 92 can match eol */
YY_RULE_SETUP
-#line 388 "./turtle_l.l"
+#line 392 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
-case 90:
-/* rule 90 can match eol */
+case 93:
+/* rule 93 can match eol */
YY_RULE_SETUP
-#line 389 "./turtle_l.l"
+#line 393 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
-case 91:
-/* rule 91 can match eol */
+case 94:
+/* rule 94 can match eol */
YY_RULE_SETUP
-#line 390 "./turtle_l.l"
+#line 394 "./turtle_l.l"
{}
YY_BREAK
-case 92:
-/* rule 92 can match eol */
+case 95:
+/* rule 95 can match eol */
YY_RULE_SETUP
-#line 391 "./turtle_l.l"
+#line 395 "./turtle_l.l"
{}
YY_BREAK
-case 93:
+case 96:
YY_RULE_SETUP
-#line 392 "./turtle_l.l"
+#line 396 "./turtle_l.l"
{ BEGIN INITIAL; return TTL_RECOVERABLE_ERROR; }
YY_BREAK
-case 94:
+case 97:
YY_RULE_SETUP
-#line 393 "./turtle_l.l"
+#line 397 "./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 395 "./turtle_l.l"
+#line 399 "./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 396 "./turtle_l.l"
+#line 400 "./turtle_l.l"
{ ttlyyerror ("Unterminated short double-quoted string"); }
YY_BREAK
-case 95:
+case 98:
YY_RULE_SETUP
-#line 398 "./turtle_l.l"
+#line 402 "./turtle_l.l"
{ return ttlp_NUMBER_int (yylval, ttlp_arg, yyg); }
YY_BREAK
-case 96:
+case 99:
YY_RULE_SETUP
-#line 399 "./turtle_l.l"
+#line 403 "./turtle_l.l"
{ return ttlp_NUMBER_decimal (yylval, ttlp_arg, yyg); }
YY_BREAK
-case 97:
+case 100:
YY_RULE_SETUP
-#line 400 "./turtle_l.l"
+#line 404 "./turtle_l.l"
{ return ttlp_NUMBER_double (yylval, ttlp_arg, yyg); }
YY_BREAK
-case 98:
-/* rule 98 can match eol */
+case 101:
+/* rule 101 can match eol */
YY_RULE_SETUP
-#line 402 "./turtle_l.l"
+#line 406 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; }
YY_BREAK
-case 99:
+case 102:
YY_RULE_SETUP
-#line 403 "./turtle_l.l"
+#line 407 "./turtle_l.l"
{ }
YY_BREAK
-case 100:
+case 103:
YY_RULE_SETUP
-#line 404 "./turtle_l.l"
+#line 408 "./turtle_l.l"
{ }
YY_BREAK
-case 101:
+case 104:
YY_RULE_SETUP
-#line 405 "./turtle_l.l"
+#line 409 "./turtle_l.l"
{
char buf[100]; sprintf (buf, "Unexpected character '%c'", yytext[yyleng-1]);
TTLYYERROR_OR_REPORT (buf);
BEGIN TURTLE_SKIP_TO_DOT_WS; yymore(); }
YY_BREAK
-case 102:
+case 105:
YY_RULE_SETUP
-#line 409 "./turtle_l.l"
+#line 413 "./turtle_l.l"
{ BEGIN INITIAL; yyless (yyleng-2); return _GARBAGE_BEFORE_DOT_WS; }
YY_BREAK
-case 103:
-/* rule 103 can match eol */
+case 106:
+/* rule 106 can match eol */
YY_RULE_SETUP
-#line 410 "./turtle_l.l"
+#line 414 "./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:
+case 107:
YY_RULE_SETUP
-#line 411 "./turtle_l.l"
+#line 415 "./turtle_l.l"
{
if (yyleng > 8000)
{ char buf[100]; sprintf (buf, "Failed to recover syntax error at \"%.50s...\"", yytext); ttlyyerror (buf); }
yymore(); }
YY_BREAK
-case 105:
+case 108:
YY_RULE_SETUP
-#line 416 "./turtle_l.l"
+#line 420 "./turtle_l.l"
ECHO;
YY_BREAK
-#line 2260 "turtle_l.c"
+#line 2317 "turtle_l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(TURTLE_SKIP_TO_DOT_WS):
case YY_STATE_EOF(UNREACHEABLE):
@@ -2544,7 +2601,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)] : 9);
+ register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 66);
if ( yy_accept[yy_current_state] )
{
yyg->yy_last_accepting_state = yy_current_state;
@@ -2553,7 +2610,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 >= 384 )
+ if ( yy_current_state >= 410 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2573,7 +2630,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 = 9;
+ register YY_CHAR yy_c = 66;
if ( yy_accept[yy_current_state] )
{
yyg->yy_last_accepting_state = yy_current_state;
@@ -2582,11 +2639,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 >= 384 )
+ if ( yy_current_state >= 410 )
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 == 383);
+ yy_is_jam = (yy_current_state == 409);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -3462,7 +3519,7 @@ void ttlyyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 416 "./turtle_l.l"
+#line 420 "./turtle_l.l"
@@ -3656,33 +3713,15 @@ 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://...>");
- srcfile = fopen (fname, "rb");
+ 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");
if (NULL == srcfile)
{
ttlp_free (ttlp);
- sqlr_new_error ("42000", "SR598", "TURTLE parser has failed to open file '%s' for reading", fname);
+ sqlr_new_error ("42000", "SR598", "TURTLE parser has failed to open file '%s' for reading", tf->tf_boxed_input_name);
}
- 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 50fe6fb..62cc7d9 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.17 2011/05/16 09:04:22 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -38,6 +38,7 @@
#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
@@ -159,8 +160,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 ([^\\''\r\n])
-SPAR_DQ_PLAIN ([^\\""\r\n])
+SPAR_SQ_PLAIN ([^\x00-\x1f\\''\r\n]|[\t])
+SPAR_DQ_PLAIN ([^\x00-\x1f\\""\r\n]|[\t])
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]+)
@@ -204,6 +205,9 @@ SPAR_NCNAME_X (([A-Za-z0-9_./#%+?&=@*:\x7f-\xfe-]*[A-Za-z0-9_/#%+?&=@*:\x7f-\xf
<INITIAL>"@prefix" { return _AT_prefix_L; }
<INITIAL>"@forAll" { ttlyyerror ("Current version of Virtuoso does not support @forAll keyword"); }
<INITIAL>"@forSome" { ttlyyerror ("Current version of Virtuoso does not support @forSome keyword"); }
+<INITIAL>"-INF" { return _MINUS_INF_L; }
+<INITIAL>[+]?"INF" { return INF_L; }
+<INITIAL>[+-]?"NaN" { return NaN_L; }
<INITIAL>"false" { return false_L; }
<INITIAL>"true" { return true_L; }
@@ -605,33 +609,15 @@ 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://...>");
- srcfile = fopen (fname, "rb");
+ 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");
if (NULL == srcfile)
{
ttlp_free (ttlp);
- sqlr_new_error ("42000", "SR598", "TURTLE parser has failed to open file '%s' for reading", fname);
+ sqlr_new_error ("42000", "SR598", "TURTLE parser has failed to open file '%s' for reading", tf->tf_boxed_input_name);
}
- 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 1839562..8307ffc 100644
--- a/libsrc/Wi/turtle_p.c
+++ b/libsrc/Wi/turtle_p.c
@@ -103,24 +103,27 @@
_AT_of_L = 284,
_AT_prefix_L = 285,
_AT_this_L = 286,
- false_L = 287,
- true_L = 288,
- __TTL_PUNCT_END = 289,
- __TTL_NONPUNCT_START = 290,
- TURTLE_INTEGER = 291,
- TURTLE_DECIMAL = 292,
- TURTLE_DOUBLE = 293,
- TURTLE_STRING = 294,
- KEYWORD = 295,
- LANGTAG = 296,
- QNAME = 297,
- QNAME_NS = 298,
- VARIABLE = 299,
- BLANK_NODE_LABEL = 300,
- Q_IRI_REF = 301,
- _GARBAGE_BEFORE_DOT_WS = 302,
- TTL_RECOVERABLE_ERROR = 303,
- __TTL_NONPUNCT_END = 304
+ _MINUS_INF_L = 287,
+ INF_L = 288,
+ NaN_L = 289,
+ false_L = 290,
+ true_L = 291,
+ __TTL_PUNCT_END = 292,
+ __TTL_NONPUNCT_START = 293,
+ TURTLE_INTEGER = 294,
+ TURTLE_DECIMAL = 295,
+ TURTLE_DOUBLE = 296,
+ TURTLE_STRING = 297,
+ KEYWORD = 298,
+ LANGTAG = 299,
+ QNAME = 300,
+ QNAME_NS = 301,
+ VARIABLE = 302,
+ BLANK_NODE_LABEL = 303,
+ Q_IRI_REF = 304,
+ _GARBAGE_BEFORE_DOT_WS = 305,
+ TTL_RECOVERABLE_ERROR = 306,
+ __TTL_NONPUNCT_END = 307
};
#endif
/* Tokens. */
@@ -153,24 +156,27 @@
#define _AT_of_L 284
#define _AT_prefix_L 285
#define _AT_this_L 286
-#define false_L 287
-#define true_L 288
-#define __TTL_PUNCT_END 289
-#define __TTL_NONPUNCT_START 290
-#define TURTLE_INTEGER 291
-#define TURTLE_DECIMAL 292
-#define TURTLE_DOUBLE 293
-#define TURTLE_STRING 294
-#define KEYWORD 295
-#define LANGTAG 296
-#define QNAME 297
-#define QNAME_NS 298
-#define VARIABLE 299
-#define BLANK_NODE_LABEL 300
-#define Q_IRI_REF 301
-#define _GARBAGE_BEFORE_DOT_WS 302
-#define TTL_RECOVERABLE_ERROR 303
-#define __TTL_NONPUNCT_END 304
+#define _MINUS_INF_L 287
+#define INF_L 288
+#define NaN_L 289
+#define false_L 290
+#define true_L 291
+#define __TTL_PUNCT_END 292
+#define __TTL_NONPUNCT_START 293
+#define TURTLE_INTEGER 294
+#define TURTLE_DECIMAL 295
+#define TURTLE_DOUBLE 296
+#define TURTLE_STRING 297
+#define KEYWORD 298
+#define LANGTAG 299
+#define QNAME 300
+#define QNAME_NS 301
+#define VARIABLE 302
+#define BLANK_NODE_LABEL 303
+#define Q_IRI_REF 304
+#define _GARBAGE_BEFORE_DOT_WS 305
+#define TTL_RECOVERABLE_ERROR 306
+#define __TTL_NONPUNCT_END 307
@@ -244,8 +250,8 @@ typedef union YYSTYPE
void *nothing;
ptrlong lexlineno;
}
-/* Line 187 of yacc.c. */
-#line 249 "turtle_p.c"
+/* Line 193 of yacc.c. */
+#line 255 "turtle_p.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -258,7 +264,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 262 "turtle_p.c"
+#line 268 "turtle_p.c"
#ifdef short
# undef short
@@ -308,7 +314,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -473,20 +479,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 514
+#define YYLAST 635
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 50
+#define YYNTOKENS 53
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 61
+#define YYNNTS 65
/* YYNRULES -- Number of rules. */
-#define YYNRULES 156
+#define YYNRULES 166
/* YYNRULES -- Number of states. */
-#define YYNSTATES 217
+#define YYNSTATES 226
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 304
+#define YYMAXUTOK 307
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -524,7 +530,7 @@ static const yytype_uint8 yytranslate[] =
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
+ 45, 46, 47, 48, 49, 50, 51, 52
};
#if YYDEBUG
@@ -532,88 +538,92 @@ static const yytype_uint8 yytranslate[] =
YYRHS. */
static const yytype_uint16 yyprhs[] =
{
- 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
+ 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, 342, 344,
+ 346, 349, 353, 355, 359, 363, 367, 369, 371, 372,
+ 376, 377, 381, 382, 386, 387, 390, 394, 396, 397,
+ 401, 402, 405, 406, 410, 412, 414
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 51, 0, -1, -1, 51, 52, -1, -1, 28, 53,
- 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
+ 54, 0, -1, -1, 54, 55, -1, -1, 28, 56,
+ 81, 61, -1, 59, 61, -1, 60, 61, -1, -1,
+ 117, 57, 63, -1, 76, -1, -1, 11, 58, 66,
+ 62, 61, -1, 1, -1, 25, 49, -1, 30, 46,
+ 49, -1, 30, 7, 49, -1, -1, 9, -1, 9,
+ 15, -1, 15, -1, 87, 9, -1, -1, 65, 64,
+ 66, 62, 61, -1, 11, -1, 20, 11, -1, 20,
+ 1, -1, 67, -1, 66, 9, 67, -1, 59, -1,
+ 60, -1, 69, -1, 69, -1, 68, 9, 69, -1,
+ -1, 117, 70, 84, 83, -1, 71, -1, -1, 47,
+ 72, 87, -1, -1, 105, 73, 87, -1, -1, 101,
+ 74, 87, -1, -1, 51, 75, 87, -1, 50, -1,
+ -1, 47, 77, 87, 9, -1, -1, 105, 78, 86,
+ -1, -1, 101, 79, 87, 9, -1, -1, 51, 80,
+ 87, 9, -1, 50, 9, -1, 82, -1, 81, 8,
+ 82, -1, 45, -1, 24, -1, 26, -1, 27, -1,
+ 29, -1, 31, -1, -1, 18, -1, 89, -1, -1,
+ 10, 85, 115, -1, 88, 83, 9, -1, 88, 83,
+ 50, 9, -1, 9, -1, 50, 9, -1, 89, 83,
+ -1, 89, 83, 50, -1, 50, -1, 91, -1, 88,
+ 18, 90, -1, 8, -1, 18, -1, 1, -1, 91,
+ -1, 89, 18, 90, -1, 8, -1, 18, -1, 9,
+ -1, 1, -1, 91, -1, 91, 50, -1, 50, -1,
+ -1, 97, 92, 95, -1, -1, 100, 93, 95, -1,
+ -1, 51, 94, 95, -1, 96, -1, 50, -1, 104,
+ -1, 96, 8, 103, -1, 8, -1, 18, -1, 9,
+ -1, 1, -1, 117, -1, 47, -1, 24, -1, 19,
+ -1, 21, -1, 14, -1, 48, -1, -1, 13, 98,
+ 109, -1, -1, 12, 99, 112, -1, 27, 117, 29,
+ -1, 27, 47, 29, -1, 22, -1, 36, -1, 35,
+ -1, 39, -1, 40, -1, 41, -1, 42, -1, 42,
+ 44, -1, -1, 42, 102, 6, 117, -1, 104, -1,
+ 50, -1, 117, -1, 47, -1, 105, -1, 36, -1,
+ 35, -1, 39, -1, 40, -1, 41, -1, 34, -1,
+ 33, -1, 32, -1, 42, -1, 42, 44, -1, 42,
+ 6, 117, -1, 51, -1, 42, 6, 51, -1, 51,
+ 6, 117, -1, 51, 6, 51, -1, 48, -1, 14,
+ -1, -1, 13, 106, 109, -1, -1, 12, 107, 112,
+ -1, -1, 10, 108, 115, -1, -1, 110, 111, -1,
+ 89, 83, 17, -1, 17, -1, -1, 113, 114, 16,
+ -1, -1, 114, 104, -1, -1, 116, 68, 15, -1,
+ 49, -1, 45, -1, 46, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 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
+ 0, 154, 154, 156, 160, 160, 161, 162, 163, 163,
+ 167, 168, 168, 174, 178, 186, 208, 215, 217, 221,
+ 222, 226, 227, 227, 239, 240, 241, 245, 246, 250,
+ 251, 252, 256, 257, 261, 261, 265, 269, 269, 272,
+ 272, 275, 275, 279, 279, 282, 286, 286, 289, 289,
+ 292, 292, 296, 296, 299, 303, 304, 308, 309, 310,
+ 311, 312, 313, 316, 318, 322, 324, 323, 330, 331,
+ 332, 333, 337, 338, 339, 343, 344, 345, 346, 347,
+ 351, 352, 353, 354, 355, 356, 360, 361, 362, 367,
+ 366, 370, 369, 373, 373, 380, 381, 385, 386, 387,
+ 388, 389, 390, 394, 395, 396, 397, 398, 399, 406,
+ 420, 419, 432, 431, 446, 447, 448, 452, 453, 454,
+ 455, 456, 457, 458, 459, 459, 465, 466, 470, 475,
+ 479, 483, 485, 487, 491, 495, 499, 505, 511, 517,
+ 521, 527, 534, 535, 538, 541, 545, 557, 564, 563,
+ 575, 574, 586, 585, 600, 600, 610, 616, 625, 625,
+ 659, 660, 679, 679, 699, 706, 714
};
#endif
@@ -627,17 +637,19 @@ static const char *const yytname[] =
"_LBRA_TOP_TRIG", "_LPAR", "_LSQBRA", "_LSQBRA_RSQBRA", "_RBRA", "_RPAR",
"_RSQBRA", "_SEMI", "_EQ", "_EQ_TOP_TRIG", "_EQ_GT", "_LT_EQ", "_BANG",
"_AT_a_L", "_AT_base_L", "_AT_has_L", "_AT_is_L", "_AT_keywords_L",
- "_AT_of_L", "_AT_prefix_L", "_AT_this_L", "false_L", "true_L",
- "__TTL_PUNCT_END", "__TTL_NONPUNCT_START", "TURTLE_INTEGER",
- "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", "dot_opt",
+ "_AT_of_L", "_AT_prefix_L", "_AT_this_L", "_MINUS_INF_L", "INF_L",
+ "NaN_L", "false_L", "true_L", "__TTL_PUNCT_END", "__TTL_NONPUNCT_START",
+ "TURTLE_INTEGER", "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", "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",
+ "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",
"top_blank_predicate_object_list_or_garbage_with_dot",
"predicate_object_list_or_garbage", "top_blank_predicate_object_list",
@@ -659,46 +671,49 @@ static const yytype_uint16 yytoknum[] =
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304
+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+ 305, 306, 307
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 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
+ 0, 53, 54, 54, 56, 55, 55, 55, 57, 55,
+ 55, 58, 55, 55, 59, 60, 60, 61, 61, 62,
+ 62, 63, 64, 63, 65, 65, 65, 66, 66, 67,
+ 67, 67, 68, 68, 70, 69, 69, 72, 71, 73,
+ 71, 74, 71, 75, 71, 71, 77, 76, 78, 76,
+ 79, 76, 80, 76, 76, 81, 81, 82, 82, 82,
+ 82, 82, 82, 83, 83, 84, 85, 84, 86, 86,
+ 86, 86, 87, 87, 87, 88, 88, 88, 88, 88,
+ 89, 89, 89, 89, 89, 89, 90, 90, 90, 92,
+ 91, 93, 91, 94, 91, 95, 95, 96, 96, 96,
+ 96, 96, 96, 97, 97, 97, 97, 97, 97, 97,
+ 98, 97, 99, 97, 100, 100, 100, 101, 101, 101,
+ 101, 101, 101, 101, 102, 101, 103, 103, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 105, 105, 106, 105,
+ 107, 105, 108, 105, 110, 109, 111, 111, 113, 112,
+ 114, 114, 116, 115, 117, 117, 117
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
- 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,
+ 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,
+ 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, 1, 1, 1,
2, 3, 1, 3, 3, 3, 1, 1, 0, 3,
0, 3, 0, 3, 0, 2, 3, 1, 0, 3,
@@ -710,226 +725,253 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 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
+ 2, 0, 1, 13, 152, 11, 150, 148, 147, 0,
+ 4, 0, 118, 117, 119, 120, 121, 122, 165, 166,
+ 46, 146, 164, 0, 52, 3, 17, 17, 10, 50,
+ 48, 8, 162, 0, 158, 154, 14, 0, 0, 0,
+ 123, 0, 0, 54, 0, 18, 6, 7, 0, 0,
+ 0, 153, 0, 37, 45, 43, 29, 30, 0, 27,
+ 31, 36, 41, 39, 34, 151, 160, 149, 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, 157, 63,
+ 155, 0, 5, 125, 158, 154, 0, 0, 0, 47,
+ 64, 72, 0, 0, 53, 51, 71, 64, 0, 26,
+ 25, 0, 21, 0, 163, 38, 44, 19, 28, 12,
+ 42, 40, 66, 63, 65, 159, 138, 137, 136, 132,
+ 131, 133, 134, 135, 139, 129, 142, 161, 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, 162, 64, 35, 0, 0,
+ 140, 0, 156, 0, 87, 69, 17, 67, 143, 141,
+ 145, 144, 127, 98, 126, 23
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -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
+ -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, 205, 109, 96, 110, 97, 195, 98, 142,
+ 143, 138, 191, 192, 99, 135, 134, 100, 62, 41,
+ 223, 193, 63, 35, 34, 32, 67, 68, 130, 65,
+ 66, 127, 51, 52, 101
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -117
+#define YYPACT_NINF -123
static const yytype_int16 yypact[] =
{
- -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
+ -123, 135, -123, -123, -123, -123, -123, -123, -123, -30,
+ -123, 6, -123, -123, -123, -123, -123, 9, -123, -123,
+ -123, -123, -123, 2, -123, -123, 19, 19, -123, -123,
+ -123, -123, -123, 537, -123, -123, -123, 31, -13, -5,
+ -123, 50, 21, -123, 21, -123, -123, -123, 21, 288,
+ 237, -123, 230, -123, -123, -123, -123, -123, 11, -123,
+ -123, -123, -123, -123, -123, -123, -123, -123, 339, -123,
+ -123, -123, -123, -123, -123, 38, -123, -123, -123, -8,
+ -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
+ -123, 53, -123, -123, -123, -123, 66, 41, -123, -123,
+ -123, -123, 71, 74, -123, -123, -123, -123, 75, -123,
+ 67, -123, -123, 13, -123, -123, 79, 16, -123, 21,
+ 21, 413, -123, 19, 21, 21, 388, 455, -123, 41,
+ -123, 31, -123, -123, -123, -123, 60, 63, 186, -123,
+ 584, 43, 186, 186, -123, -123, -123, 584, 0, -123,
+ -123, 537, -123, 230, -123, -123, -123, -123, -123, -123,
+ -123, -123, -123, 77, 78, -123, -123, -123, -123, -123,
+ -123, -123, -123, -123, 10, -123, 97, -123, -123, -123,
+ 87, -123, -123, -123, -123, -123, -123, -123, -123, -123,
+ -123, -123, 98, -123, -123, -123, 57, -123, -123, -123,
+ -123, -123, 99, 11, -123, -123, -123, -123, 544, -28,
+ -123, 28, -123, 495, -123, -123, 19, -123, -123, -123,
+ -123, -123, -123, -123, -123, -123
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -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
+ -123, -123, -123, -123, -123, -123, 108, 109, -26, -92,
+ -123, -123, -123, -39, -7, -123, -48, -123, -123, -123,
+ -123, -123, -123, -123, -123, -123, -123, -123, -123, -18,
+ -102, -123, -123, -123, -38, -123, -61, -32, -46, -123,
+ -123, -123, -79, -123, -123, -123, -123, -123, 115, -123,
+ -123, -122, 1, -123, -123, -123, -17, -123, -123, -15,
+ -123, -123, -88, -123, -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 -118
+#define YYTABLE_NINF -125
static const yytype_int16 yytable[] =
{
- 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,
+ 31, 47, 30, 111, 118, 177, 102, 129, 148, 201,
+ 103, 43, 116, 38, 149, -124, 209, 18, 19, 36,
+ 121, 22, 80, 218, 150, 153, 122, 180, 45, 81,
+ 82, 154, 64, 83, 84, 85, 77, 18, 19, 86,
+ 87, 22, 88, 89, 78, 90, 131, 45, 91, 132,
+ 202, 64, 39, 40, 210, 69, 79, 70, 71, 140,
+ 72, 207, 73, 198, 199, 164, 18, 19, 92, 93,
+ 22, 94, 95, 18, 19, 139, 74, 22, 133, 220,
+ 144, 155, 156, 145, 146, 147, 160, 161, 152, 184,
+ 137, 224, 185, 197, 196, 206, 208, 159, 18, 19,
+ 136, 196, 22, 211, 212, 204, 213, 214, 215, 26,
+ 27, 216, 203, 181, 158, 200, 29, 217, 183, 182,
+ 64, 0, 0, 0, 0, 0, 179, 0, 178, 0,
+ 0, 0, 0, 0, 0, 2, 3, 179, 0, 178,
+ 0, 179, 179, 178, 178, 4, 5, 6, 7, 8,
+ 64, 0, 64, 0, 0, 0, 0, 0, 0, 0,
+ 9, 0, 196, 10, 0, 11, 0, 0, 0, 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
+ 18, 19, 20, 21, 22, 23, 24, 186, 0, 0,
+ 225, 0, 0, 0, 187, 188, 4, 0, 6, 7,
+ 8, 0, 0, 0, 189, 0, 0, 0, 219, 0,
+ 221, 0, 179, 0, 178, 0, 0, 0, 166, 167,
+ 168, 169, 170, 0, 0, 171, 172, 173, 174, 0,
+ 0, 18, 19, 175, 21, 22, 190, 176, 80, 0,
+ 4, 0, 6, 7, 8, 81, 82, 0, 112, 83,
+ 84, 85, 0, 0, 0, 86, 87, 113, 88, 89,
+ 0, 90, 0, 0, 91, 12, 13, 0, 0, 14,
+ 15, 16, 17, 0, 0, 18, 19, 53, 21, 22,
+ 54, 55, 18, 19, 92, 93, 22, 94, 95, 104,
+ 0, 0, 0, 0, 0, 0, 105, 106, 0, 0,
+ 83, 84, 85, 0, 0, 0, 107, 87, 0, 88,
+ 89, 0, 90, 0, 0, 91, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 18, 19, 92, 93, 22, 108, 95,
+ 80, 0, 0, 0, 0, 0, 0, 81, 82, 0,
+ 0, 83, 84, 85, 0, 0, 128, 86, 87, 0,
+ 88, 89, 0, 90, 0, 0, 91, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 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,
+ 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, 0, 0, 0, 12, 13,
+ 0, 0, 14, 15, 16, 17, 0, 0, 18, 19,
+ 53, 21, 22, 54, 55, 4, 0, 6, 7, 8,
+ 0, 165, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 166, 167, 168,
+ 169, 170, 0, 0, 171, 172, 173, 174, 0, 0,
+ 18, 19, 175, 21, 22, 4, 176, 6, 7, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 166, 167, 168,
+ 169, 170, 0, 0, 171, 172, 173, 174, 0, 0,
+ 18, 19, 175, 21, 22, 222, 176, 4, 0, 6,
+ 7, 8, 0, 0, 0, 0, 83, 84, 85, 0,
+ 0, 0, 9, 87, 0, 88, 89, 11, 90, 0,
+ 0, 91, 12, 13, 0, 0, 14, 15, 16, 17,
+ 0, 0, 18, 19, 53, 21, 22, 54, 55, 18,
+ 19, 92, 93, 22, 194, 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, 0, 0, 0, 18,
+ 19, 92, 93, 22, 0, 95
};
static const yytype_int16 yycheck[] =
{
- 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,
- 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, 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
+ 1, 27, 1, 49, 52, 127, 44, 68, 110, 9,
+ 48, 9, 50, 7, 1, 6, 6, 45, 46, 49,
+ 9, 49, 1, 51, 11, 9, 15, 129, 9, 8,
+ 9, 15, 33, 12, 13, 14, 49, 45, 46, 18,
+ 19, 49, 21, 22, 49, 24, 8, 9, 27, 75,
+ 50, 52, 46, 44, 44, 24, 6, 26, 27, 18,
+ 29, 163, 31, 142, 143, 126, 45, 46, 47, 48,
+ 49, 50, 51, 45, 46, 9, 45, 49, 79, 51,
+ 9, 119, 120, 9, 9, 18, 124, 125, 9, 29,
+ 91, 213, 29, 50, 140, 18, 18, 123, 45, 46,
+ 47, 147, 49, 6, 17, 153, 8, 50, 9, 1,
+ 1, 203, 151, 131, 121, 147, 1, 205, 135, 134,
+ 121, -1, -1, -1, -1, -1, 127, -1, 127, -1,
+ -1, -1, -1, -1, -1, 0, 1, 138, -1, 138,
+ -1, 142, 143, 142, 143, 10, 11, 12, 13, 14,
+ 151, -1, 153, -1, -1, -1, -1, -1, -1, -1,
+ 25, -1, 208, 28, -1, 30, -1, -1, -1, -1,
+ 35, 36, -1, -1, 39, 40, 41, 42, -1, -1,
+ 45, 46, 47, 48, 49, 50, 51, 1, -1, -1,
+ 216, -1, -1, -1, 8, 9, 10, -1, 12, 13,
+ 14, -1, -1, -1, 18, -1, -1, -1, 209, -1,
+ 211, -1, 213, -1, 213, -1, -1, -1, 32, 33,
+ 34, 35, 36, -1, -1, 39, 40, 41, 42, -1,
+ -1, 45, 46, 47, 48, 49, 50, 51, 1, -1,
+ 10, -1, 12, 13, 14, 8, 9, -1, 11, 12,
+ 13, 14, -1, -1, -1, 18, 19, 20, 21, 22,
+ -1, 24, -1, -1, 27, 35, 36, -1, -1, 39,
+ 40, 41, 42, -1, -1, 45, 46, 47, 48, 49,
+ 50, 51, 45, 46, 47, 48, 49, 50, 51, 1,
+ -1, -1, -1, -1, -1, -1, 8, 9, -1, -1,
+ 12, 13, 14, -1, -1, -1, 18, 19, -1, 21,
+ 22, -1, 24, -1, -1, 27, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 45, 46, 47, 48, 49, 50, 51,
+ 1, -1, -1, -1, -1, -1, -1, 8, 9, -1,
+ -1, 12, 13, 14, -1, -1, 17, 18, 19, -1,
+ 21, 22, -1, 24, -1, -1, 27, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 45, 46, 47, 48, 49, 1,
+ 51, -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,
+ -1, -1, -1, 10, -1, 12, 13, 14, 15, -1,
+ -1, -1, -1, 45, 46, 47, 48, 49, 25, 51,
+ -1, -1, -1, 30, -1, -1, -1, -1, 35, 36,
+ -1, -1, 39, 40, 41, 42, -1, -1, 45, 46,
+ 47, 48, 49, 50, 51, 10, -1, 12, 13, 14,
+ -1, 16, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 32, 33, 34,
+ 35, 36, -1, -1, 39, 40, 41, 42, -1, -1,
+ 45, 46, 47, 48, 49, 10, 51, 12, 13, 14,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 32, 33, 34,
+ 35, 36, -1, -1, 39, 40, 41, 42, -1, -1,
+ 45, 46, 47, 48, 49, 50, 51, 10, -1, 12,
+ 13, 14, -1, -1, -1, -1, 12, 13, 14, -1,
+ -1, -1, 25, 19, -1, 21, 22, 30, 24, -1,
+ -1, 27, 35, 36, -1, -1, 39, 40, 41, 42,
+ -1, -1, 45, 46, 47, 48, 49, 50, 51, 45,
+ 46, 47, 48, 49, 50, 51, 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, -1, -1, -1, 45,
+ 46, 47, 48, 49, -1, 51
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
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, 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
+ 0, 54, 0, 1, 10, 11, 12, 13, 14, 25,
+ 28, 30, 35, 36, 39, 40, 41, 42, 45, 46,
+ 47, 48, 49, 50, 51, 55, 59, 60, 76, 101,
+ 105, 117, 108, 58, 107, 106, 49, 56, 7, 46,
+ 44, 102, 77, 9, 80, 9, 61, 61, 79, 78,
+ 57, 115, 116, 47, 50, 51, 59, 60, 66, 67,
+ 69, 71, 101, 105, 117, 112, 113, 109, 110, 24,
+ 26, 27, 29, 31, 45, 81, 82, 49, 49, 6,
+ 1, 8, 9, 12, 13, 14, 18, 19, 21, 22,
+ 24, 27, 47, 48, 50, 51, 87, 89, 91, 97,
+ 100, 117, 87, 87, 1, 8, 9, 18, 50, 86,
+ 88, 91, 11, 20, 63, 65, 87, 68, 69, 72,
+ 75, 9, 15, 62, 74, 73, 70, 114, 17, 89,
+ 111, 8, 61, 117, 99, 98, 47, 117, 94, 9,
+ 18, 83, 92, 93, 9, 9, 9, 18, 83, 1,
+ 11, 64, 9, 9, 15, 87, 87, 15, 67, 61,
+ 87, 87, 10, 84, 89, 16, 32, 33, 34, 35,
+ 36, 39, 40, 41, 42, 47, 51, 104, 105, 117,
+ 83, 82, 112, 109, 29, 29, 1, 8, 9, 18,
+ 50, 95, 96, 104, 50, 90, 91, 50, 95, 95,
+ 90, 9, 50, 66, 69, 85, 18, 83, 18, 6,
+ 44, 6, 17, 8, 50, 9, 62, 115, 51, 117,
+ 51, 117, 50, 103, 104, 61
};
#define yyerrok (yyerrstatus = 0)
@@ -1003,7 +1045,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -1757,313 +1799,324 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 157 "./turtle_p.y"
+#line 160 "./turtle_p.y"
{ ttlp_arg->ttlp_special_qnames = ~0; }
break;
- case 6:
-#line 158 "./turtle_p.y"
- { TF_CHANGE_BASE_AND_DEFAULT_GRAPH(ttlp_arg->ttlp_tf,(yyvsp[(2) - (3)].box)); }
+ case 8:
+#line 163 "./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 168 "./turtle_p.y"
+ {
+ triple_feed_t *tf = ttlp_arg->ttlp_tf;
+ ttlp_enter_trig_group (ttlp_arg);
+ TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
+ break;
+
+ case 12:
+#line 172 "./turtle_p.y"
+ {
+ ttlp_leave_trig_group (ttlp_arg); }
+ break;
+
+ case 13:
+#line 174 "./turtle_p.y"
+ { ttlyyerror_action ("Only a triple or a special clause (like prefix declaration) is allowed here"); }
break;
- case 7:
-#line 159 "./turtle_p.y"
+ case 14:
+#line 178 "./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 186 "./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 != ttlp_arg->ttlp_namespaces_prefix2iri)
- old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, &((yyvsp[(2) - (4)].box)));
+ if (NULL != local_hash_ptr[0])
+ old_uri_ptr = (caddr_t *)id_hash_get (local_hash_ptr[0], (caddr_t)(&((yyvsp[(2) - (3)].box))));
else
{
- ttlp_arg->ttlp_namespaces_prefix2iri = (id_hash_t *)box_dv_dict_hashtable (31);
+ local_hash_ptr[0] = (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) - (4)].box));
- dk_free_box ((yyvsp[(2) - (4)].box));
- dk_free_box ((yyvsp[(3) - (4)].box));
+ 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));
if (err)
ttlyyerror_action ("Namespace prefix is re-used for a different namespace IRI");
}
else
- 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; }
+ id_hash_set (local_hash_ptr[0], (caddr_t)(&((yyvsp[(2) - (3)].box))), (caddr_t)(&((yyvsp[(3) - (3)].box)))); }
break;
- case 12:
-#line 186 "./turtle_p.y"
+ case 16:
+#line 208 "./turtle_p.y"
{
- triple_feed_t *tf = ttlp_arg->ttlp_tf;
- TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
- break;
-
- case 13:
-#line 189 "./turtle_p.y"
- {
- triple_feed_t *tf = ttlp_arg->ttlp_tf; }
- break;
-
- case 14:
-#line 192 "./turtle_p.y"
- { ttlyyerror_action ("Only a triple or a special clause (like prefix declaration) is allowed here"); }
+ 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); }
break;
- case 20:
-#line 207 "./turtle_p.y"
+ case 22:
+#line 227 "./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");
- TF_CHANGE_GRAPH (tf, ttlp_arg->ttlp_subj_uri); }
+ ttlp_enter_trig_group (ttlp_arg);
+ TF_CHANGE_GRAPH (tf, ttlp_arg->ttlp_subj_uri); }
break;
- case 21:
-#line 211 "./turtle_p.y"
+ case 23:
+#line 232 "./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 24:
-#line 219 "./turtle_p.y"
+ case 26:
+#line 241 "./turtle_p.y"
{ ttlyyerror_action ("No '{' after an equality sign in TriG"); }
break;
- case 27:
-#line 228 "./turtle_p.y"
+ case 34:
+#line 261 "./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 30:
-#line 236 "./turtle_p.y"
+ case 37:
+#line 269 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
- case 32:
-#line 239 "./turtle_p.y"
+ case 39:
+#line 272 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
- case 34:
-#line 242 "./turtle_p.y"
+ case 41:
+#line 275 "./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 36:
-#line 246 "./turtle_p.y"
+ case 43:
+#line 279 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = NULL; }
break;
- case 39:
-#line 253 "./turtle_p.y"
+ case 46:
+#line 286 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
- case 41:
-#line 256 "./turtle_p.y"
+ case 48:
+#line 289 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
- case 43:
-#line 259 "./turtle_p.y"
+ case 50:
+#line 292 "./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 45:
-#line 263 "./turtle_p.y"
+ case 52:
+#line 296 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = NULL; }
break;
- case 48:
-#line 270 "./turtle_p.y"
+ case 55:
+#line 303 "./turtle_p.y"
{ ttlp_arg->ttlp_special_qnames &= ~((yyvsp[(1) - (1)].token_type)); }
break;
- case 49:
-#line 271 "./turtle_p.y"
+ case 56:
+#line 304 "./turtle_p.y"
{ ttlp_arg->ttlp_special_qnames &= ~((yyvsp[(3) - (3)].token_type)); }
break;
- case 50:
-#line 275 "./turtle_p.y"
+ case 57:
+#line 308 "./turtle_p.y"
{ (yyval.token_type) = ttlp_bit_of_special_qname ((yyvsp[(1) - (1)].box)); }
break;
- case 51:
-#line 276 "./turtle_p.y"
+ case 58:
+#line 309 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_A; }
break;
- case 52:
-#line 277 "./turtle_p.y"
+ case 59:
+#line 310 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_HAS; }
break;
- case 53:
-#line 278 "./turtle_p.y"
+ case 60:
+#line 311 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_IS; }
break;
- case 54:
-#line 279 "./turtle_p.y"
+ case 61:
+#line 312 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_OF; }
break;
- case 55:
-#line 280 "./turtle_p.y"
+ case 62:
+#line 313 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_THIS; }
break;
- case 59:
-#line 291 "./turtle_p.y"
+ case 66:
+#line 324 "./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 63:
-#line 299 "./turtle_p.y"
+ case 70:
+#line 332 "./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 70:
-#line 312 "./turtle_p.y"
+ case 77:
+#line 345 "./turtle_p.y"
{ ttlyyerror_action ("Missing object between top-level blank node and a comma"); }
break;
- case 71:
-#line 313 "./turtle_p.y"
+ case 78:
+#line 346 "./turtle_p.y"
{ ttlyyerror_action ("Missing predicate and object between top-level blank node and a semicolon"); }
break;
- case 72:
-#line 314 "./turtle_p.y"
+ case 79:
+#line 347 "./turtle_p.y"
{ ttlyyerror_action ("Predicate expected after top-level blank node"); }
break;
- case 75:
-#line 320 "./turtle_p.y"
+ case 82:
+#line 353 "./turtle_p.y"
{ ttlyyerror_action ("Missing object before comma"); }
break;
- case 76:
-#line 321 "./turtle_p.y"
+ case 83:
+#line 354 "./turtle_p.y"
{ ttlyyerror_action ("Missing predicate and object before semicolon"); }
break;
- case 77:
-#line 322 "./turtle_p.y"
+ case 84:
+#line 355 "./turtle_p.y"
{ ttlyyerror_action ("Missing predicate and object before dot"); }
break;
- case 78:
-#line 323 "./turtle_p.y"
+ case 85:
+#line 356 "./turtle_p.y"
{ ttlyyerror_action ("Predicate expected"); }
break;
- case 82:
-#line 334 "./turtle_p.y"
+ case 89:
+#line 367 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = (yyvsp[(1) - (1)].box); }
break;
- case 84:
-#line 337 "./turtle_p.y"
+ case 91:
+#line 370 "./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 85:
-#line 339 "./turtle_p.y"
+ case 92:
+#line 372 "./turtle_p.y"
{ ttlp_arg->ttlp_pred_is_reverse = 0; }
break;
- case 86:
-#line 340 "./turtle_p.y"
+ case 93:
+#line 373 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_uri = NULL; }
break;
- case 90:
-#line 352 "./turtle_p.y"
+ case 97:
+#line 385 "./turtle_p.y"
{; /* triple is made by object */ }
break;
- case 91:
-#line 353 "./turtle_p.y"
+ case 98:
+#line 386 "./turtle_p.y"
{; /* triple is made by object */ }
break;
- case 92:
-#line 354 "./turtle_p.y"
+ case 99:
+#line 387 "./turtle_p.y"
{ ttlyyerror_action ("Missing object before comma"); }
break;
- case 93:
-#line 355 "./turtle_p.y"
+ case 100:
+#line 388 "./turtle_p.y"
{ ttlyyerror_action ("Missing object before semicolon"); }
break;
- case 94:
-#line 356 "./turtle_p.y"
+ case 101:
+#line 389 "./turtle_p.y"
{ ttlyyerror_action ("Missing object before dot"); }
break;
- case 95:
-#line 357 "./turtle_p.y"
+ case 102:
+#line 390 "./turtle_p.y"
{ ttlyyerror_action ("Object expected"); }
break;
- case 96:
-#line 361 "./turtle_p.y"
+ case 103:
+#line 394 "./turtle_p.y"
{ (yyval.box) = ttlp_arg->ttlp_last_complete_uri; ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 97:
-#line 362 "./turtle_p.y"
+ case 104:
+#line 395 "./turtle_p.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 98:
-#line 363 "./turtle_p.y"
+ case 105:
+#line 396 "./turtle_p.y"
{ (yyval.box) = uname_rdf_ns_uri_type; }
break;
- case 99:
-#line 364 "./turtle_p.y"
+ case 106:
+#line 397 "./turtle_p.y"
{ (yyval.box) = box_dv_uname_string ("http://www.w3.org/2002/07/owl#sameAs"); }
break;
- case 100:
-#line 365 "./turtle_p.y"
+ case 107:
+#line 398 "./turtle_p.y"
{ (yyval.box) = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); }
break;
- case 101:
-#line 367 "./turtle_p.y"
+ case 108:
+#line 400 "./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);
@@ -2072,21 +2125,24 @@ yyreduce:
}
break;
- case 102:
-#line 374 "./turtle_p.y"
+ case 109:
+#line 407 "./turtle_p.y"
{
+ caddr_t label_copy_for_debug = NULL;
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_DEBUG_BNODES & ttlp_arg->ttlp_flags)
+ label_copy_for_debug = box_copy ((yyvsp[(1) - (1)].box));
+ 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));
+ ttlp_triples_for_bnodes_debug (ttlp_arg, (yyval.box), ttlp_arg->ttlp_lexlineno, label_copy_for_debug);
}
break;
- case 103:
-#line 384 "./turtle_p.y"
+ case 110:
+#line 420 "./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)
@@ -2094,8 +2150,8 @@ yyreduce:
}
break;
- case 104:
-#line 390 "./turtle_p.y"
+ case 111:
+#line 426 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2103,8 +2159,8 @@ yyreduce:
}
break;
- case 105:
-#line 396 "./turtle_p.y"
+ case 112:
+#line 432 "./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)
@@ -2112,8 +2168,8 @@ yyreduce:
}
break;
- case 106:
-#line 402 "./turtle_p.y"
+ case 113:
+#line 438 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2121,60 +2177,60 @@ yyreduce:
}
break;
- case 107:
-#line 410 "./turtle_p.y"
+ case 114:
+#line 446 "./turtle_p.y"
{ (yyval.box) = ttlp_arg->ttlp_last_complete_uri; ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 108:
-#line 411 "./turtle_p.y"
+ case 115:
+#line 447 "./turtle_p.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
- case 109:
-#line 412 "./turtle_p.y"
+ case 116:
+#line 448 "./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 112:
-#line 418 "./turtle_p.y"
+ case 119:
+#line 454 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 113:
-#line 419 "./turtle_p.y"
+ case 120:
+#line 455 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 114:
-#line 420 "./turtle_p.y"
+ case 121:
+#line 456 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 115:
-#line 421 "./turtle_p.y"
+ case 122:
+#line 457 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 116:
-#line 422 "./turtle_p.y"
+ case 123:
+#line 458 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (2)].box)); dk_free_tree ((yyvsp[(2) - (2)].box)); }
break;
- case 117:
-#line 423 "./turtle_p.y"
+ case 124:
+#line 459 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 118:
-#line 423 "./turtle_p.y"
+ case 125:
+#line 459 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 121:
-#line 434 "./turtle_p.y"
+ case 128:
+#line 470 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = ttlp_arg->ttlp_last_complete_uri;
@@ -2182,68 +2238,98 @@ yyreduce:
ttlp_triple_and_inf (ttlp_arg, ttlp_arg->ttlp_obj); }
break;
- case 122:
-#line 439 "./turtle_p.y"
+ case 129:
+#line 475 "./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 123:
-#line 443 "./turtle_p.y"
+ case 130:
+#line 479 "./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 124:
-#line 447 "./turtle_p.y"
+ case 131:
+#line 483 "./turtle_p.y"
{
ttlp_triple_l_and_inf (ttlp_arg, (caddr_t)((ptrlong)1), uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
- case 125:
-#line 449 "./turtle_p.y"
+ case 132:
+#line 485 "./turtle_p.y"
{
ttlp_triple_l_and_inf (ttlp_arg, (caddr_t)((ptrlong)0), uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
- case 126:
-#line 451 "./turtle_p.y"
+ case 133:
+#line 487 "./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 127:
-#line 455 "./turtle_p.y"
+ case 134:
+#line 491 "./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 128:
-#line 459 "./turtle_p.y"
+ case 135:
+#line 495 "./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 129:
-#line 463 "./turtle_p.y"
+ case 136:
+#line 499 "./turtle_p.y"
+ {
+ double myZERO = 0.0;
+ double myNAN_d = 0.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myNAN_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ break;
+
+ case 137:
+#line 505 "./turtle_p.y"
+ {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myPOSINF_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ break;
+
+ case 138:
+#line 511 "./turtle_p.y"
+ {
+ double myZERO = 0.0;
+ double myNEGINF_d = -1.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myNEGINF_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ break;
+
+ case 139:
+#line 517 "./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 130:
-#line 467 "./turtle_p.y"
+ case 140:
+#line 521 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (2)].box);
@@ -2252,8 +2338,8 @@ yyreduce:
ttlp_triple_l_and_inf (ttlp_arg, (yyvsp[(1) - (2)].box), NULL, (yyvsp[(2) - (2)].box)); }
break;
- case 131:
-#line 473 "./turtle_p.y"
+ case 141:
+#line 527 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (3)].box);
@@ -2263,44 +2349,47 @@ yyreduce:
ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, ttlp_arg->ttlp_obj_type, NULL); }
break;
- case 132:
-#line 480 "./turtle_p.y"
+ case 142:
+#line 534 "./turtle_p.y"
{ }
break;
- case 133:
-#line 481 "./turtle_p.y"
+ case 143:
+#line 535 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (3)].box); }
break;
- case 134:
-#line 484 "./turtle_p.y"
+ case 144:
+#line 538 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 135:
-#line 487 "./turtle_p.y"
+ case 145:
+#line 541 "./turtle_p.y"
{ }
break;
- case 136:
-#line 492 "./turtle_p.y"
+ case 146:
+#line 546 "./turtle_p.y"
{
- if (ttlp_arg->ttlp_formula_iid)
+ caddr_t label_copy_for_debug = NULL;
+ if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
+ label_copy_for_debug = box_copy ((yyvsp[(1) - (1)].box));
+ 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));
+ ttlp_triples_for_bnodes_debug (ttlp_arg, (yyval.box), ttlp_arg->ttlp_lexlineno, label_copy_for_debug);
}
break;
- case 137:
-#line 501 "./turtle_p.y"
+ case 147:
+#line 558 "./turtle_p.y"
{
(yyval.box) = tf_bnode_iid (ttlp_arg->ttlp_tf, NULL);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2308,16 +2397,16 @@ yyreduce:
}
break;
- case 138:
-#line 507 "./turtle_p.y"
+ case 148:
+#line 564 "./turtle_p.y"
{
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
(yyval.lexlineno) = ttlp_arg->ttlp_lexlineno;
}
break;
- case 139:
-#line 512 "./turtle_p.y"
+ case 149:
+#line 569 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2325,16 +2414,16 @@ yyreduce:
}
break;
- case 140:
-#line 518 "./turtle_p.y"
+ case 150:
+#line 575 "./turtle_p.y"
{
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
(yyval.lexlineno) = ttlp_arg->ttlp_lexlineno;
}
break;
- case 141:
-#line 523 "./turtle_p.y"
+ case 151:
+#line 580 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2342,16 +2431,16 @@ yyreduce:
}
break;
- case 142:
-#line 529 "./turtle_p.y"
+ case 152:
+#line 586 "./turtle_p.y"
{
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
(yyval.lexlineno) = ttlp_arg->ttlp_lexlineno;
}
break;
- case 143:
-#line 534 "./turtle_p.y"
+ case 153:
+#line 591 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2359,41 +2448,41 @@ yyreduce:
}
break;
- case 144:
-#line 543 "./turtle_p.y"
+ case 154:
+#line 600 "./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 145:
-#line 549 "./turtle_p.y"
+ case 155:
+#line 606 "./turtle_p.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 146:
-#line 554 "./turtle_p.y"
+ case 156:
+#line 611 "./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 147:
-#line 560 "./turtle_p.y"
+ case 157:
+#line 617 "./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 148:
-#line 568 "./turtle_p.y"
+ case 158:
+#line 625 "./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);
@@ -2408,8 +2497,8 @@ yyreduce:
ttlp_arg->ttlp_pred_uri = uname_rdf_ns_uri_first; }
break;
- case 149:
-#line 580 "./turtle_p.y"
+ case 159:
+#line 637 "./turtle_p.y"
{
caddr_t first_node;
dk_set_push (&(ttlp_arg->ttlp_unused_seq_bnodes), ttlp_arg->ttlp_subj_uri);
@@ -2431,13 +2520,13 @@ yyreduce:
(yyval.box) = first_node; }
break;
- case 150:
-#line 602 "./turtle_p.y"
+ case 160:
+#line 659 "./turtle_p.y"
{}
break;
- case 151:
-#line 603 "./turtle_p.y"
+ case 161:
+#line 660 "./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));
@@ -2455,8 +2544,8 @@ yyreduce:
ttlp_arg->ttlp_pred_uri = uname_rdf_ns_uri_first; }
break;
- case 152:
-#line 622 "./turtle_p.y"
+ case 162:
+#line 679 "./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);
@@ -2468,8 +2557,8 @@ yyreduce:
ttlp_arg->ttlp_pred_uri = NULL; }
break;
- case 153:
-#line 632 "./turtle_p.y"
+ case 163:
+#line 689 "./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);
@@ -2479,20 +2568,20 @@ yyreduce:
ttlp_arg->ttlp_formula_iid = dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
break;
- case 154:
-#line 643 "./turtle_p.y"
+ case 164:
+#line 700 "./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 155:
-#line 650 "./turtle_p.y"
+ case 165:
+#line 707 "./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);
@@ -2500,10 +2589,10 @@ yyreduce:
}
break;
- case 156:
-#line 658 "./turtle_p.y"
+ case 166:
+#line 715 "./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);
@@ -2513,7 +2602,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 2517 "turtle_p.c"
+#line 2606 "turtle_p.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/libsrc/Wi/turtle_p.h b/libsrc/Wi/turtle_p.h
index 5bacf36..cf1aaa2 100644
--- a/libsrc/Wi/turtle_p.h
+++ b/libsrc/Wi/turtle_p.h
@@ -68,24 +68,27 @@
_AT_of_L = 284,
_AT_prefix_L = 285,
_AT_this_L = 286,
- false_L = 287,
- true_L = 288,
- __TTL_PUNCT_END = 289,
- __TTL_NONPUNCT_START = 290,
- TURTLE_INTEGER = 291,
- TURTLE_DECIMAL = 292,
- TURTLE_DOUBLE = 293,
- TURTLE_STRING = 294,
- KEYWORD = 295,
- LANGTAG = 296,
- QNAME = 297,
- QNAME_NS = 298,
- VARIABLE = 299,
- BLANK_NODE_LABEL = 300,
- Q_IRI_REF = 301,
- _GARBAGE_BEFORE_DOT_WS = 302,
- TTL_RECOVERABLE_ERROR = 303,
- __TTL_NONPUNCT_END = 304
+ _MINUS_INF_L = 287,
+ INF_L = 288,
+ NaN_L = 289,
+ false_L = 290,
+ true_L = 291,
+ __TTL_PUNCT_END = 292,
+ __TTL_NONPUNCT_START = 293,
+ TURTLE_INTEGER = 294,
+ TURTLE_DECIMAL = 295,
+ TURTLE_DOUBLE = 296,
+ TURTLE_STRING = 297,
+ KEYWORD = 298,
+ LANGTAG = 299,
+ QNAME = 300,
+ QNAME_NS = 301,
+ VARIABLE = 302,
+ BLANK_NODE_LABEL = 303,
+ Q_IRI_REF = 304,
+ _GARBAGE_BEFORE_DOT_WS = 305,
+ TTL_RECOVERABLE_ERROR = 306,
+ __TTL_NONPUNCT_END = 307
};
#endif
/* Tokens. */
@@ -118,24 +121,27 @@
#define _AT_of_L 284
#define _AT_prefix_L 285
#define _AT_this_L 286
-#define false_L 287
-#define true_L 288
-#define __TTL_PUNCT_END 289
-#define __TTL_NONPUNCT_START 290
-#define TURTLE_INTEGER 291
-#define TURTLE_DECIMAL 292
-#define TURTLE_DOUBLE 293
-#define TURTLE_STRING 294
-#define KEYWORD 295
-#define LANGTAG 296
-#define QNAME 297
-#define QNAME_NS 298
-#define VARIABLE 299
-#define BLANK_NODE_LABEL 300
-#define Q_IRI_REF 301
-#define _GARBAGE_BEFORE_DOT_WS 302
-#define TTL_RECOVERABLE_ERROR 303
-#define __TTL_NONPUNCT_END 304
+#define _MINUS_INF_L 287
+#define INF_L 288
+#define NaN_L 289
+#define false_L 290
+#define true_L 291
+#define __TTL_PUNCT_END 292
+#define __TTL_NONPUNCT_START 293
+#define TURTLE_INTEGER 294
+#define TURTLE_DECIMAL 295
+#define TURTLE_DOUBLE 296
+#define TURTLE_STRING 297
+#define KEYWORD 298
+#define LANGTAG 299
+#define QNAME 300
+#define QNAME_NS 301
+#define VARIABLE 302
+#define BLANK_NODE_LABEL 303
+#define Q_IRI_REF 304
+#define _GARBAGE_BEFORE_DOT_WS 305
+#define TTL_RECOVERABLE_ERROR 306
+#define __TTL_NONPUNCT_END 307
@@ -149,8 +155,8 @@ typedef union YYSTYPE
void *nothing;
ptrlong lexlineno;
}
-/* Line 1489 of yacc.c. */
-#line 154 "turtle_p.h"
+/* Line 1529 of yacc.c. */
+#line 160 "turtle_p.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
diff --git a/libsrc/Wi/turtle_p.y b/libsrc/Wi/turtle_p.y
index 6cde88e..d00fbc3 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.11 2011/10/13 12:14:27 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
@@ -107,6 +107,9 @@ extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
%token _AT_of_L /*:: PUNCT_TTL_LAST("@of") ::*/
%token _AT_prefix_L /*:: PUNCT_TTL_LAST("@prefix") ::*/
%token _AT_this_L /*:: PUNCT_TTL_LAST("@this") ::*/
+%token _MINUS_INF_L /*:: PUNCT_TTL_LAST("-INF") ::*/
+%token INF_L /*:: PUNCT_TTL_LAST("INF") ::*/
+%token NaN_L /*:: PUNCT_TTL_LAST("NaN") ::*/
%token false_L /*:: PUNCT_TTL_LAST("false") ::*/
%token true_L /*:: PUNCT_TTL_LAST("true") ::*/
@@ -149,20 +152,47 @@ 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
- | _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 {
+ : _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) );
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, &($2));
+ if (NULL != local_hash_ptr[0])
+ old_uri_ptr = (caddr_t *)id_hash_get (local_hash_ptr[0], (caddr_t)(&($2)));
else
{
- ttlp_arg->ttlp_namespaces_prefix2iri = (id_hash_t *)box_dv_dict_hashtable (31);
+ local_hash_ptr[0] = (id_hash_t *)box_dv_dict_hashtable (31);
old_uri_ptr = NULL;
}
if (NULL != old_uri_ptr)
@@ -174,24 +204,14 @@ clause
ttlyyerror_action ("Namespace prefix is re-used for a different namespace IRI");
}
else
- 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);
+ 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);
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 */
| _DOT_WS
@@ -207,9 +227,11 @@ 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");
- TF_CHANGE_GRAPH (tf, ttlp_arg->ttlp_subj_uri); }
- inner_triple_clauses trig_group_end dot_opt {
+ 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 {
triple_feed_t *tf = ttlp_arg->ttlp_tf;
+ ttlp_leave_trig_group (ttlp_arg);
TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
;
@@ -219,6 +241,17 @@ 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
@@ -243,7 +276,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
@@ -260,7 +293,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
@@ -283,11 +316,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
@@ -309,18 +342,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
@@ -337,7 +370,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
@@ -351,10 +384,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
@@ -362,7 +395,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");
@@ -372,15 +405,18 @@ verb
}
| BLANK_NODE_LABEL
{
+ caddr_t label_copy_for_debug = NULL;
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_DEBUG_BNODES & ttlp_arg->ttlp_flags)
+ label_copy_for_debug = box_copy ($1);
+ 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);
+ ttlp_triples_for_bnodes_debug (ttlp_arg, $$, ttlp_arg->ttlp_lexlineno, label_copy_for_debug);
}
- | _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)
@@ -392,7 +428,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)
@@ -409,7 +445,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
@@ -460,6 +496,24 @@ object
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = $1;
ttlp_triple_l_and_inf (ttlp_arg, $1, uname_xmlschema_ns_uri_hash_double, NULL); }
+ | NaN_L {
+ double myZERO = 0.0;
+ double myNAN_d = 0.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myNAN_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ | INF_L {
+ double myZERO = 0.0;
+ double myPOSINF_d = 1.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myPOSINF_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
+ | _MINUS_INF_L {
+ double myZERO = 0.0;
+ double myNEGINF_d = -1.0/myZERO;
+ dk_free_tree (ttlp_arg->ttlp_obj);
+ ttlp_arg->ttlp_obj = box_double (myNEGINF_d);
+ ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, uname_xmlschema_ns_uri_hash_double, NULL); }
| TURTLE_STRING {
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = $1;
@@ -477,25 +531,28 @@ 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)
+ caddr_t label_copy_for_debug = NULL;
+ if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
+ label_copy_for_debug = box_copy ($1);
+ 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);
+ ttlp_triples_for_bnodes_debug (ttlp_arg, $$, ttlp_arg->ttlp_lexlineno, label_copy_for_debug);
}
| _LSQBRA_RSQBRA
{
@@ -539,9 +596,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);
@@ -550,18 +607,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
@@ -641,14 +698,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);
@@ -656,7 +713,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 65b9cff..7a67b84 100644
--- a/libsrc/Wi/uddi.sql
+++ b/libsrc/Wi/uddi.sql
@@ -1,14 +1,14 @@
--
-- uddi.sql
--
--- $Id: uddi.sql,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+-- $Id$
--
-- UDDI support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/uname_const_decl.c b/libsrc/Wi/uname_const_decl.c
index aaa87bf..e74b927 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.5 2011/10/13 12:14:27 source Exp $
+ * $Id$
*
* Constant declarations of commonly used UNAMEs.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -85,10 +85,11 @@ caddr_t uname_virtrdf_ns_uri_SparqlMacroLibrary;
caddr_t uname_virtrdf_ns_uri_SyncToQuads;
caddr_t uname_virtrdf_ns_uri_array_of_any;
caddr_t uname_virtrdf_ns_uri_array_of_string;
+caddr_t uname_virtrdf_ns_uri_bitmask;
caddr_t uname_virtrdf_ns_uri_bnode_base;
caddr_t uname_virtrdf_ns_uri_bnode_label;
caddr_t uname_virtrdf_ns_uri_bnode_row;
-caddr_t uname_virtrdf_ns_uri_bitmask;
+caddr_t uname_virtrdf_ns_uri_dialect;
caddr_t uname_virtrdf_ns_uri_isSpecialPredicate;
caddr_t uname_virtrdf_ns_uri_isSubclassOf;
caddr_t uname_virtrdf_ns_uri_loadAs;
@@ -219,6 +220,7 @@ static uname_const_decl_t uname_const_decls[] = {
{ &uname_virtrdf_ns_uri_bnode_base , VIRTRDF_NS_URI "bnode-base" },
{ &uname_virtrdf_ns_uri_bnode_label , VIRTRDF_NS_URI "bnode-label" },
{ &uname_virtrdf_ns_uri_bnode_row , VIRTRDF_NS_URI "bnode-row" },
+ { &uname_virtrdf_ns_uri_dialect , VIRTRDF_NS_URI "dialect" },
{ &uname_virtrdf_ns_uri_isSpecialPredicate , VIRTRDF_NS_URI "isSpecialPredicate" },
{ &uname_virtrdf_ns_uri_isSubclassOf , VIRTRDF_NS_URI "isSubclassOf" },
{ &uname_virtrdf_ns_uri_loadAs , VIRTRDF_NS_URI "loadAs" },
diff --git a/libsrc/Wi/uname_const_decl.h b/libsrc/Wi/uname_const_decl.h
index 4a16a01..48ab536 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.4 2011/10/13 12:14:27 source Exp $
+ * $Id$
*
* Constant declarations of commonly used UNAMEs.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
@@ -107,6 +107,7 @@ extern caddr_t uname_virtrdf_ns_uri_bitmask;
extern caddr_t uname_virtrdf_ns_uri_bnode_base;
extern caddr_t uname_virtrdf_ns_uri_bnode_label;
extern caddr_t uname_virtrdf_ns_uri_bnode_row;
+extern caddr_t uname_virtrdf_ns_uri_dialect;
extern caddr_t uname_virtrdf_ns_uri_isSpecialPredicate;
extern caddr_t uname_virtrdf_ns_uri_isSubclassOf;
extern caddr_t uname_virtrdf_ns_uri_loadAs;
diff --git a/libsrc/Wi/update.c b/libsrc/Wi/update.c
index eb9398d..884f05d 100644
--- a/libsrc/Wi/update.c
+++ b/libsrc/Wi/update.c
@@ -1,14 +1,14 @@
/*
* update.c
*
- * $Id: update.c,v 1.11.2.13 2011/10/19 15:18:21 source Exp $
+ * $Id$
*
* UPDATE statements
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/url_rewrite.sql b/libsrc/Wi/url_rewrite.sql
index b55ef4a..559585b 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.17 2011/09/28 17:01:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2009 OpenLink Software
+-- 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
@@ -1210,7 +1210,7 @@ create procedure DB.DBA.HTTP_URLREWRITE (in path varchar, in rule_list varchar,
declare rule_iri, in_path, qstr, meth varchar;
declare target_vhost_pkey, hf, accept, http_headers any;
declare result, http_redir, http_tcn_code, tcn_rc, keep_lpath int;
- declare http_tcn_headers varchar;
+ declare http_tcn_headers, exp_fn varchar;
-- XXX: the path is just path string, no fragment no query no host
--hf := rfc1808_parse_uri (path);
@@ -1220,12 +1220,14 @@ create procedure DB.DBA.HTTP_URLREWRITE (in path varchar, in rule_list varchar,
in_path := '/';
accept := null;
qstr := null;
+ exp_fn := null;
keep_lpath := 0;
meth := 'GET';
if (is_http_ctx ())
{
keep_lpath := http_map_get ('url_rewrite_keep_lpath');
+ exp_fn := http_map_get ('expiration_function');
lines := http_request_header ();
if (length (lines))
{
@@ -1245,6 +1247,12 @@ create procedure DB.DBA.HTTP_URLREWRITE (in path varchar, in rule_list varchar,
lines := vector ();
}
+ if (isstring (exp_fn) and (__proc_exists (exp_fn) is not null) and (1 = call (exp_fn) (lines, http_map_get ('options'))))
+ {
+ http_body_read ();
+ return 1;
+ }
+
if (length (qstr))
in_path := in_path || '?' || qstr;
@@ -1432,3 +1440,219 @@ virt_proxy_init ()
grant execute on ext_http_proxy to PROXY
;
+-- /* Example for 'denote' and 'entity' IRI patterns */
+-- http://{HostName}/resource/{Local}
+-- http://{HostName}/data/{Local}.{Extension}
+
+
+-- supported mime types
+create procedure
+url_rewrite_mime_types ()
+{
+ return vector (
+ vector ('html', 'text/html', 1.0),
+ vector ('xml', 'application/rdf+xml', 0.95),
+ vector ('n3', 'text/n3', 0.80),
+ vector ('nt', 'text/rdf+n3', 0.80),
+ vector ('ttlx', 'application/x-turtle', 0.70),
+ vector ('ttl', 'text/turtle', 0.70),
+ vector ('n3s', 'text/ntriples', 0.70),
+ vector ('json', 'application/json', 0.60),
+ vector ('jrdf', 'application/rdf+json', 0.60),
+ vector ('atom', 'application/atom+xml', 0.50),
+ vector ('jsod', 'application/odata+json',0.50),
+ vector ('ld', 'application/ld+json',0.50),
+ vector ('md', 'application/microdata+json',0.50)
+ );
+}
+;
+
+create procedure
+url_rewrite_mime_pattern ()
+{
+ declare x, res any;
+ x := url_rewrite_mime_types ();
+ res := '';
+ foreach (varchar p in x) do
+ {
+ res := res || sprintf ('(%s)|', replace (p[1], '+', '\\\\+'));
+ }
+ return rtrim (res, '|');
+}
+;
+
+create procedure
+url_rewrite_gen_describe (in graph varchar, in iri_spf varchar)
+{
+ declare ret, qr any;
+ qr := sprintf ('DESCRIBE <%s>', iri_spf);
+ ret := sprintf ('/sparql?default-graph-uri=%U&query=%U', graph, qr);
+ ret := replace (ret, '%', '%%');
+ ret := replace (ret, '@@placeholder@@', '%s');
+ return ret;
+}
+;
+
+create procedure
+url_rewrite_gen_vsp (in graph varchar, in iri_spf varchar)
+{
+ declare ret, qr any;
+ ret := sprintf ('/describe/?url=%s', iri_spf);
+ return ret;
+}
+;
+
+create procedure
+url_rewrite_from_template (in prefix varchar, in graph varchar, in iri_pattern varchar, in url_pattern varchar, in flags int := 0)
+{
+ declare arr, h, iri_path, iri_regex, iri_spf, iri_tcn, url_spf, url_regex, url_tcn, iri_param, url_param, iri_vd, url_vd any;
+ declare pos, nth, fct int;
+
+ pos := 0; nth := 1;
+ h := WS.WS.PARSE_URI (iri_pattern);
+ arr := regexp_parse ('{[[:alpha:]]+}', h[2], pos);
+ if (arr is null) signal ('.....', 'Invalid IRI pattern');
+ iri_vd := subseq (h[2], pos, arr[0]);
+ iri_regex := iri_spf := iri_tcn := '';
+ iri_param := vector ();
+ while (arr is not null)
+ {
+ declare param any;
+ param := subseq (h[2], arr[0], arr[1]);
+ iri_regex := iri_regex || subseq (h[2], pos, arr[0]) || '(.*)';
+ iri_spf := iri_spf || subseq (h[2], pos, arr[0]) || '@@placeholder@@';
+ iri_tcn := iri_tcn || subseq (h[2], pos, arr[0]) || sprintf ('\\x24%d', nth);
+ param := trim (param, '{}');
+ iri_param := vector_concat (iri_param, vector (param));
+ pos := arr[1];
+ arr := regexp_parse ('{[[:alpha:]]+}', h[2], pos);
+ nth := nth + 1;
+ }
+ iri_regex := iri_regex || subseq (h[2], pos);
+ iri_spf := iri_spf || subseq (h[2], pos);
+ iri_tcn := iri_tcn || subseq (h[2], pos);
+
+ if (h[1] = '{HostName}') h[1] := registry_get ('URIQADefaultHost');
+ h[2] := iri_spf;
+ iri_spf := WS.WS.VFS_URI_COMPOSE (h);
+ h[2] := iri_tcn;
+ iri_tcn := WS.WS.VFS_URI_COMPOSE (h);
+
+ pos := 0; nth := 1;
+ h := WS.WS.PARSE_URI (url_pattern);
+ arr := regexp_parse ('{[[:alpha:]]+}', h[2], pos);
+ if (arr is null) signal ('.....', 'Invalid URL pattern');
+ url_spf := url_regex := url_tcn := '';
+ url_param := vector ();
+ url_vd := subseq (h[2], pos, arr[0]);
+ while (arr is not null)
+ {
+ declare param any;
+ param := subseq (h[2], arr[0], arr[1]);
+ if (param <> '{Extension}')
+ {
+ url_spf := url_spf || subseq (h[2], pos, arr[0]) || '%s';
+ url_regex := url_regex || subseq (h[2], pos, arr[0]) || '(.*)';
+ url_tcn := url_tcn || subseq (h[2], pos, arr[0]) || sprintf ('\\x24%d', nth);
+ param := trim (param, '{}');
+ url_param := vector_concat (url_param, vector (param));
+ nth := nth + 1;
+ }
+ else
+ {
+ url_spf := url_spf || subseq (h[2], pos, arr[0]) || param;
+ url_regex := url_regex || subseq (h[2], pos, arr[0]) || param;
+ url_tcn := url_tcn || subseq (h[2], pos, arr[0]) || param;
+ }
+ pos := arr[1];
+ arr := regexp_parse ('{[[:alpha:]]+}', h[2], pos);
+ }
+ url_spf := url_spf || subseq (h[2], pos);
+ url_regex := url_regex || subseq (h[2], pos);
+ --dbg_obj_print_vars (iri_regex, iri_param, url_spf, url_regex, url_param);
+
+ declare ses, mime_types any;
+ ses := string_output ();
+
+ iri_vd := rtrim (iri_vd, '/');
+ url_vd := rtrim (url_vd, '/');
+
+ http ('-- Virtual Directories \n', ses);
+ http (sprintf ('DB.DBA.VHOST_REMOVE (lpath=>\'%s\');\n', iri_vd), ses);
+ http (sprintf ('DB.DBA.VHOST_REMOVE (lpath=>\'%s\');\n', url_vd), ses);
+ http (sprintf ('DB.DBA.VHOST_DEFINE (lpath=>\'%s\', ppath=>\'/\', is_dav=>0, opts=>vector (\'url_rewrite\', \'%s_iri_rule_list\'));\n', iri_vd, prefix), ses);
+ http (sprintf ('DB.DBA.VHOST_DEFINE (lpath=>\'%s\', ppath=>\'/404.html\', is_dav=>0, opts=>vector (\'url_rewrite\', \'%s_url_rule_list\'));\n', url_vd, prefix), ses);
+ http ('\n', ses);
+
+ http ('-- Rule list for abstract\n', ses);
+ --http (sprintf ('DB.DBA.URLREWRITE_CREATE_RULELIST ( \'%s_iri_rule_list\', 1, vector (\'%s_iri_rule_2\'));\n', prefix, prefix, prefix), ses);
+ http (sprintf ('DB.DBA.URLREWRITE_CREATE_RULELIST ( \'%s_iri_rule_list\', 1, vector (\'%s_iri_rule_1\', \'%s_iri_rule_2\'));\n', prefix, prefix, prefix), ses);
+ http (sprintf ('DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( \'%s_iri_rule_1\', 1, \'%s\', %s, 1, \'%s\', %s, null, null, 2, 406, null); \n',
+ prefix,
+ iri_regex,
+ sys_sql_val_print (iri_param),
+ rtrim (replace (replace (url_spf, '{Extension}', ''), '//', '/'), '.'),
+ sys_sql_val_print (url_param)
+ ), ses);
+
+ http (sprintf ('DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( \'%s_iri_rule_2\', 1, \'%s\', %s, 1, \'%s\', %s, null,\n \'%s\', 2, 303, null); \n',
+ prefix,
+ iri_regex,
+ sys_sql_val_print (iri_param),
+ rtrim (replace (replace (url_spf, '{Extension}', ''), '//', '/'), '.'),
+ sys_sql_val_print (url_param),
+ url_rewrite_mime_pattern ()
+ ), ses);
+
+ http ('\n', ses);
+ http (sprintf ('delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = \'%s_iri_rule_list\';\n', prefix), ses);
+ if (flags and exists (select 1 from VAD.DBA.VAD_REGISTRY where R_KEY like '/VAD/fct/%/resources/dav/%'))
+ fct := 1;
+ mime_types := url_rewrite_mime_types ();
+ foreach (any x in mime_types) do
+ {
+ declare redir varchar;
+ if (fct and x[0] = 'html')
+ redir := url_rewrite_gen_vsp (graph, iri_tcn);
+ else
+ redir := replace (url_tcn, '{Extension}', x[0]);
+ http (sprintf ('DB.DBA.HTTP_VARIANT_ADD (\'%s_iri_rule_list\', \'%s\', \'%s\', \'%s\', %.2f);\n',
+ prefix,
+ rtrim (replace (replace (url_regex, '{Extension}', ''), '//', '/'), '.'),
+ redir,
+ x[1],
+ x[2]
+ ), ses);
+ }
+ http ('\n', ses);
+ http ('-- Rule list for data\n', ses);
+ nth := 1;
+ http (sprintf ('DB.DBA.URLREWRITE_CREATE_RULELIST ( \'%s_url_rule_list\', 1, vector (', prefix), ses);
+ foreach (any x in mime_types) do
+ {
+ if (nth > 1) http (',', ses);
+ http (sprintf ('\'%s_url_rule_%d\'', prefix, nth), ses);
+ nth := nth + 1;
+ }
+ http ('));\n', ses);
+
+ nth := 1;
+ foreach (any x in mime_types) do
+ {
+ declare redir any;
+ redir := url_rewrite_gen_describe (graph, iri_spf) || replace (sprintf ('&format=%U', x[1]), '%', '%%');
+ http (sprintf ('DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( \'%s_url_rule_%d\', 1, \'%s\', %s, 1, \'%s\', %s, null, null, 2, null, \'Content-Type: %s\'); \n',
+ prefix, nth,
+ replace (url_regex, '{Extension}', x[0]),
+ sys_sql_val_print (url_param),
+ redir,
+ sys_sql_val_print (iri_param),
+ x[1]
+ ), ses);
+ nth := nth + 1;
+ }
+ return string_output_string (ses);
+}
+;
+
+-- url_rewrite_from_template ('my_dbase', 'http://my.graph.org', 'http://{HostName}/dbase/id/{Local}', '/dbase/data/{Local}.{Extension}');
diff --git a/libsrc/Wi/useraggr.sql b/libsrc/Wi/useraggr.sql
index 664a4e3..c0874a5 100644
--- a/libsrc/Wi/useraggr.sql
+++ b/libsrc/Wi/useraggr.sql
@@ -1,10 +1,10 @@
--
--- $Id: useraggr.sql,v 1.3.2.6 2011/07/19 23:40:07 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/users.sql b/libsrc/Wi/users.sql
index 1eb29b7..c56724d 100644
--- a/libsrc/Wi/users.sql
+++ b/libsrc/Wi/users.sql
@@ -1,14 +1,14 @@
--
-- users.sql
--
--- $Id: users.sql,v 1.12.2.12 2011/10/18 12:41:34 source Exp $
+-- $Id$
--
-- Unified user model
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -196,8 +196,7 @@ create procedure DB.DBA.SECURITY_CL_EXEC_AND_LOG (in txt varchar, in args any)
}
;
-create procedure
-USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)
+create procedure DB.DBA.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;
@@ -228,7 +227,7 @@ USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)
_login_qual := get_keyword_ucase ('LOGIN_QUALIFIER', options, 'DB');
_prim_group := get_keyword_ucase ('PRIMARY_GROUP', options, NULL);
- _u_e_mail := get_keyword_ucase ('E-MAIL', options, '');
+ _u_e_mail := coalesce (get_keyword_ucase ('E-MAIL', options), 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');
@@ -241,7 +240,7 @@ USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)
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', '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', 'E_MAIL', 'FULL_NAME', 'HOME', 'PERMISSIONS', 'DISABLED'))
{
new_opts := vector_concat (new_opts, vector (options[i], options[i+1]));
}
@@ -251,6 +250,9 @@ USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)
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);
@@ -334,6 +336,10 @@ 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))
@@ -354,6 +360,8 @@ 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);
@@ -567,6 +575,7 @@ 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));
}
@@ -1313,12 +1322,32 @@ 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)
{
declare stat, msg, meta, data, info, qr, hf, graph, gr, alts any;
declare agent varchar;
- declare rc int;
+ declare rc, vtype int;
rc := 0;
gr := null;
@@ -1332,6 +1361,12 @@ DB.DBA.FOAF_SSL_LOGIN (inout user_name varchar, in digest varchar, in session_ra
if (client_attr ('client_ssl') = 0)
return 0;
+ if (__proc_exists ('DB.DBA.WEBID_AUTH_GEN_2') and DB.DBA.WEBID_AUTH_GEN_2 (null, 0, 'ODBC', 0, 0, agent, gr, 0, vtype))
+ {
+ user_name := connection_get ('SPARQLUserId');
+ return 1;
+ }
+
info := get_certificate_info (9);
agent := get_certificate_info (7, null, null, null, '2.5.29.17');
@@ -1351,19 +1386,10 @@ DB.DBA.FOAF_SSL_LOGIN (inout user_name varchar, in digest varchar, in session_ra
graph := WS.WS.VFS_URI_COMPOSE (hf);
qr := sprintf ('sparql load <%S> into graph <%S>', graph, gr);
stat := '00000';
- exec (qr, stat, msg);
+ --exec (qr, stat, msg);
+ DB.DBA.SPARUL_LOAD (gr, graph, 0, 1, 0, vector ());
commit work;
- 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);
+ qr := FOAF_SSL_QRY (gr, agent);
stat := '00000';
exec (qr, stat, msg, vector (), 0, meta, data);
if (stat = '00000' and length (data))
@@ -1385,7 +1411,8 @@ DB.DBA.FOAF_SSL_LOGIN (inout user_name varchar, in digest varchar, in session_ra
}
err_ret:
if (gr is not null)
- exec (sprintf ('sparql clear graph <%S>', gr), stat, msg);
+ DB.DBA.SPARUL_CLEAR (gr, 0, 0);
+ --exec (sprintf ('sparql clear graph <%S>', gr), stat, msg);
commit work;
return rc;
}
diff --git a/libsrc/Wi/uuencode.c b/libsrc/Wi/uuencode.c
index 16fd29b..f97e444 100644
--- a/libsrc/Wi/uuencode.c
+++ b/libsrc/Wi/uuencode.c
@@ -1,10 +1,10 @@
/*
- * $Id: uuencode.c,v 1.6.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/uuencode_impl.h b/libsrc/Wi/uuencode_impl.h
index ff3c3d8..d9193f8 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.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/vdb.sql b/libsrc/Wi/vdb.sql
index ad7494f..1dc7499 100644
--- a/libsrc/Wi/vdb.sql
+++ b/libsrc/Wi/vdb.sql
@@ -1,10 +1,10 @@
--
--- $Id: vdb.sql,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/virtext.h b/libsrc/Wi/virtext.h
index 9b1ff45..e578c6c 100644
--- a/libsrc/Wi/virtext.h
+++ b/libsrc/Wi/virtext.h
@@ -1,14 +1,14 @@
/*
* virtext.h
*
- * $Id: virtext.h,v 1.3.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* Virtuoso UDBC Client Extensions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/virtpwd.h b/libsrc/Wi/virtpwd.h
index 9cefa7f..2fd815e 100644
--- a/libsrc/Wi/virtpwd.h
+++ b/libsrc/Wi/virtpwd.h
@@ -1,14 +1,14 @@
/*
* virtpwd.h
*
- * $Id: virtpwd.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* password encryption
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/virtual_dir.sql b/libsrc/Wi/virtual_dir.sql
index eb5dd11..74875ba 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.28 2011/09/28 17:01:17 source Exp $
+-- $Id$
--
-- Virtual Web directories support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -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 := 'soft',
+ in get varchar := 'add',
in login varchar := '') __SOAP_HTTP 'text/html'
{
declare hdr, content, req_hdr any;
@@ -1092,14 +1092,16 @@ end_loop:;
accept := "output-format";
}
stat := '00000';
- if (get not in ('soft', 'replacing'))
- get := 'soft';
+ if (get not in ('soft', 'replacing', 'add'))
+ get := 'add';
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 || '/';
@@ -1114,6 +1116,7 @@ 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 eada27b..e1edcc0 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.2 2009/04/18 21:55:17 source Exp $
+-- $Id$
--
-- Text triggers support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/wi.h b/libsrc/Wi/wi.h
index 2fab348..86d4058 100644
--- a/libsrc/Wi/wi.h
+++ b/libsrc/Wi/wi.h
@@ -1,14 +1,14 @@
/*
* wi.h
*
- * $Id: wi.h,v 1.23.2.22 2011/10/13 11:09:41 source Exp $
+ * $Id$
*
* Data structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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 (!wi_inst.wi_checkpoint_atomic) \
+ if (__lt && !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 9325a92..127abe4 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.4 2009/07/21 19:24:58 source Exp $
+ * $Id$
*
* Functions to deal with XID structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/wi_xid.h b/libsrc/Wi/wi_xid.h
index 5374dc4..58cb192 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.2 2009/06/19 10:23:39 source Exp $
+ * $Id$
*
* Functions to deal with XID structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/widd.h b/libsrc/Wi/widd.h
index e39f9fd..0cf32ba 100644
--- a/libsrc/Wi/widd.h
+++ b/libsrc/Wi/widd.h
@@ -1,14 +1,14 @@
/*
* widd.h
*
- * $Id: widd.h,v 1.6.2.7 2011/02/14 11:48:50 source Exp $
+ * $Id$
*
* Data Dictionary
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/widisk.h b/libsrc/Wi/widisk.h
index 8591d3a..27d4d6a 100644
--- a/libsrc/Wi/widisk.h
+++ b/libsrc/Wi/widisk.h
@@ -1,14 +1,14 @@
/*
* widisk.h
*
- * $Id: widisk.h,v 1.12.2.9 2011/10/13 11:09:41 source Exp $
+ * $Id$
*
* Disk Based Data Structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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 2d2e457..23980e6 100644
--- a/libsrc/Wi/widv.h
+++ b/libsrc/Wi/widv.h
@@ -1,12 +1,12 @@
/*
* widv.h
*
- * $Id: widv.h,v 1.16.2.4 2010/05/07 09:14:32 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/wifn.h b/libsrc/Wi/wifn.h
index a161caf..08681a7 100644
--- a/libsrc/Wi/wifn.h
+++ b/libsrc/Wi/wifn.h
@@ -1,14 +1,14 @@
/*
* wifn.h
*
- * $Id: wifn.h,v 1.40.2.26 2011/08/26 17:57:06 source Exp $
+ * $Id$
*
* Internal Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -42,6 +42,7 @@ 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);
@@ -434,6 +435,7 @@ index_tree_t * it_allocate (dbe_storage_t *);
index_tree_t * it_temp_allocate (dbe_storage_t *);
void it_temp_free (index_tree_t * it);
int it_temp_tree (index_tree_t * it);
+void it_free (index_tree_t * it);
#if !defined (__APPLE__)
void it_not_in_any (du_thread_t * self, index_tree_t * except);
#endif
@@ -838,7 +840,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);
+void blob_send_bytes (lock_trx_t * lt, caddr_t bh, long n_bytes, int send_position, long blob_type);
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
@@ -1069,7 +1071,10 @@ 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 nic_id_name (name_id_cache_t * nic, boxint id);
+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
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);
@@ -1190,7 +1195,7 @@ extern unsigned blob_page_dir_threshold;
extern int virtuoso_server_initialized;
extern int dive_pa_mode;
extern unsigned int bp_hit_ctr;
-extern int c_compress_mode;
+extern int32 c_compress_mode;
extern int rdf_no_string_inline;
/* geo.c */
diff --git a/libsrc/Wi/wirpc.c b/libsrc/Wi/wirpc.c
index 12f4841..41c0613 100644
--- a/libsrc/Wi/wirpc.c
+++ b/libsrc/Wi/wirpc.c
@@ -1,14 +1,14 @@
/*
* wirpc.c
*
- * $Id: wirpc.c,v 1.2.2.2 2011/01/05 12:51:53 source Exp $
+ * $Id$
*
* Global RPC call hooks
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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? */
+ DV_LONG_INT, 1,/* is_wide or is_bin ? */
DV_LONG_INT, 1);/* blob timestamp */
diff --git a/libsrc/Wi/wirpce.h b/libsrc/Wi/wirpce.h
index 163d1df..5a6c356 100644
--- a/libsrc/Wi/wirpce.h
+++ b/libsrc/Wi/wirpce.h
@@ -1,12 +1,12 @@
/*
* wirpce.h
*
- * $Id: wirpce.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/wiservic.c b/libsrc/Wi/wiservic.c
index d70d32c..f47bb03 100644
--- a/libsrc/Wi/wiservic.c
+++ b/libsrc/Wi/wiservic.c
@@ -1,14 +1,14 @@
/*
* wiservic.c
*
- * $Id: wiservic.c,v 1.3.2.2 2010/05/21 12:40:48 source Exp $
+ * $Id$
*
* Windows NT services
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/wiservic.h b/libsrc/Wi/wiservic.h
index 111700d..e2fbce8 100644
--- a/libsrc/Wi/wiservic.h
+++ b/libsrc/Wi/wiservic.h
@@ -1,12 +1,12 @@
/*
* wiservic.h
*
- * $Id: wiservic.h,v 1.3.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/wsdl2rdf.xsl b/libsrc/Wi/wsdl2rdf.xsl
index 78552f0..f79d09f 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.1 2009/04/16 09:48:07 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2009 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/wsdl_expand.xsl b/libsrc/Wi/wsdl_expand.xsl
index 8d9375b..ea62f00 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.1 2010/11/05 10:56:48 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/wsdl_import.xsl b/libsrc/Wi/wsdl_import.xsl
index 64938fc..9587c53 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.1 2010/11/05 10:56:49 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/wsdl_parts.xsl b/libsrc/Wi/wsdl_parts.xsl
index 337c9bd..09e67f7 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 2009/04/09 13:22:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/wsrp_error.xsl b/libsrc/Wi/wsrp_error.xsl
index 78ecbb7..baaaff9 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 2009/04/09 13:22:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/wsrp_interm.xsl b/libsrc/Wi/wsrp_interm.xsl
index 35b3c6e..21bbad7 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 2009/04/09 13:22:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/wsrp_resp.xsl b/libsrc/Wi/wsrp_resp.xsl
index 49b0f6e..66373c1 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 2009/04/09 13:22:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/wsrp_ultim.xsl b/libsrc/Wi/wsrp_ultim.xsl
index cd23dfe..c80e2dc 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 2007/03/16 09:56:12 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2007 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/xml.h b/libsrc/Wi/xml.h
index 7f859f3..c661aab 100644
--- a/libsrc/Wi/xml.h
+++ b/libsrc/Wi/xml.h
@@ -1,12 +1,12 @@
/*
* xml.h
*
- * $Id: xml.h,v 1.4.2.1 2009/04/18 21:55:17 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xml_a.sql b/libsrc/Wi/xml_a.sql
index 65dbb16..c5dca6f 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.1 2009/04/18 21:55:17 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/xml_view.sql b/libsrc/Wi/xml_view.sql
index c9101e6..65276ee 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.1 2009/04/18 21:55:17 source Exp $
+-- $Id$
--
-- Publishing xml views as WebDAV resources.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
diff --git a/libsrc/Wi/xmla.sql b/libsrc/Wi/xmla.sql
index 4397d0f..3a9bfb3 100644
--- a/libsrc/Wi/xmla.sql
+++ b/libsrc/Wi/xmla.sql
@@ -1,10 +1,10 @@
--
--- $Id: xmla.sql,v 1.14.2.2 2010/08/31 12:12:00 source Exp $
+-- $Id$
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2006 OpenLink Software
+-- 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
@@ -342,7 +342,7 @@ create procedure
stmt := sprintf ('SELECT CAST (%s as VARCHAR)', stmt);
tree := sql_parse (stmt);
}
- if (tree [0] <> 100)
+ if (tree [0] <> 100 and tree[0] <> 113)
{
if (registry_get ('XMLA-DML') = '1')
{
@@ -350,11 +350,27 @@ 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'));
@@ -657,6 +673,8 @@ 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))
{
@@ -790,6 +808,8 @@ 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;
@@ -812,6 +832,15 @@ 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;
@@ -820,49 +849,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
{
@@ -888,53 +917,102 @@ 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, cat, tb, col, sch any;
- declare uname, passwd, _tbl varchar;
+ declare dsn any;
+ declare p_cat, p_tbl, p_sch any;
+ declare f_cat, f_tbl, f_sch any;
+ declare _ptbl, _ftbl 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;
- if (uname is null or passwd is null)
- signal ('00002', 'Unable to process the request, because the UserName property is not set or incorrect');
+ 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 (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);
- 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 || '''';
+ 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);
}
else
{
dsn := xmla_get_dsn_name (dsn);
- stmt := 'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = ''' || _tbl || ''' AND FK_TABLE = ''' || _tbl
- || ''' AND DSN = ''' || 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);
}
- exec (stmt, state, msg, vector (), 0, mdta, dta);
xmla_make_struct (mdta, dta);
self.metadata := mdta;
return dta;
@@ -946,35 +1024,66 @@ create method xmla_dbschema_primary_keys () for xmla_discover
{
declare state, msg, dta, mdta, stmt any;
declare dsn, cat, tb, col, sch any;
- declare uname, passwd, _tbl varchar;
+ declare _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', '%');
- uname := self.xmla_get_property ('UserName', null);
- passwd := self.xmla_get_property ('Password', null);
+
+ if (cat is null)
+ cat := '%';
+ if (sch is null)
+ sch := '%';
+ if (tb is null)
+ tb := '%';
+
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);
- 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);
+ 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);
}
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;
@@ -1066,13 +1175,21 @@ create method xmla_dbschema_provider_types () for xmla_discover
create method xmla_dbschema_tables () for xmla_discover
{
declare dta, mdta any;
- declare dsn, cat, tb any;
+ declare dsn, cat, sch, tb any;
dsn := self.xmla_get_property ('DataSourceInfo', xmla_service_name ());
dsn := xmla_get_dsn_name (dsn);
- --cat := self.xmla_get_property ('Catalog', 'DB');
- tb := self.xmla_get_restriction ('TABLE_NAME', '%');
cat := self.xmla_get_restriction ('TABLE_CATALOG', 'DB');
+ sch := self.xmla_get_restriction ('TABLE_SCHEMA', '%');
+ tb := self.xmla_get_restriction ('TABLE_NAME', '%');
+
+ if (cat is null)
+ cat := 'DB';
+ if (sch is null)
+ sch := '%';
+ if (tb is null)
+ tb := '%';
+
if (not xmla_not_local_dsn (dsn))
{
declare uname, passwd varchar;
@@ -1092,9 +1209,12 @@ 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) = ? 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);
+ 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);
}
else
{
@@ -1132,12 +1252,11 @@ 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', '', 'TABLE_TYPE', '', 'COLUMN_NAME', '')
+ soap_box_structure ('TABLE_CATALOG', '', 'TABLE_SCHEMA', '', 'TABLE_NAME', '')
,''),
vector ('DBSCHEMA_FOREIGN_KEYS',
- 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', '')
+ soap_box_structure ('PK_TABLE_CATALOG', '', 'PK_TABLE_SCHEMA', '', 'PK_TABLE_NAME', '',
+ 'FK_TABLE_CATALOG', '', 'FK_TABLE_SCHEMA', '', 'FK_TABLE_NAME', '')
,''),
vector ('DBSCHEMA_PROVIDER_TYPES',
soap_box_structure ('DATA_TYPE', '', 'BEST_MATCH', '')
@@ -1777,7 +1896,9 @@ xmla_cursor_stmt_change (in _props any, inout _stmt varchar)
_left_str_u := ucase (_left_str, 6);
if (_left_str_u = 'SELECT')
- _stmt := replace (_stmt, _left_str, new_stmpt, 1);
+ _stmt := new_stmpt || ' * FROM (' || _stmt || ') __xml_dt0' ;
+
+ --_stmt := replace (_stmt, _left_str, new_stmpt, 1);
}
;
diff --git a/libsrc/Wi/xmlenc-dec.c b/libsrc/Wi/xmlenc-dec.c
index 1088799..69263fe 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.4 2010/10/07 23:31:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlenc.c b/libsrc/Wi/xmlenc.c
index 1ededfc..53101b1 100644
--- a/libsrc/Wi/xmlenc.c
+++ b/libsrc/Wi/xmlenc.c
@@ -1,12 +1,12 @@
/*
* xmlenc.c
*
- * $Id: xmlenc.c,v 1.16.2.17 2011/10/13 11:04:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -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,6 +6284,7 @@ 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;
@@ -6292,6 +6293,10 @@ 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)
@@ -6370,7 +6375,7 @@ bif_xenc_x509_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
for (i = 0; i < BOX_ELEMENTS (subj); i += 2)
{
- if (DV_STRINGP (subj[i]) && DV_STRINGP (subj[i + 1]) && box_length (subj[i + 1]) &&
+ if (DV_STRINGP (subj[i]) && DV_STRINGP (subj[i + 1]) && box_length (subj[i + 1]) > 1 &&
0 == X509_NAME_add_entry_by_txt (name, subj[i], MBSTRING_ASC, (unsigned char *) subj[i+1], -1, -1, 0))
{
sqlr_warning ("01V01", "QW001", "Unknown name entry %s", subj[i]);
@@ -6386,7 +6391,7 @@ bif_xenc_x509_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
for (i = 0; i < BOX_ELEMENTS (exts); i += 2)
{
int nid;
- if (!DV_STRINGP (exts[i]) || !DV_STRINGP (exts[i + 1]) || !box_length (exts[i + 1]))
+ if (!DV_STRINGP (exts[i]) || !DV_STRINGP (exts[i + 1]) || box_length (exts[i + 1]) < 2)
continue;
nid = OBJ_sn2nid (exts[i]);
if (nid == NID_undef)
@@ -6397,7 +6402,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, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1()) ))
+ if (!X509_sign (x, pk, digest))
{
pk = NULL; /* keep one in the xenc_key */
*err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
@@ -6423,6 +6428,8 @@ 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;
@@ -6431,6 +6438,10 @@ 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)
{
@@ -6511,7 +6522,7 @@ bif_xenc_x509_ss_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** arg
for (i = 0; i < BOX_ELEMENTS (subj); i += 2)
{
- if (DV_STRINGP (subj[i]) && DV_STRINGP (subj[i + 1]) && box_length (subj[i + 1]) &&
+ if (DV_STRINGP (subj[i]) && DV_STRINGP (subj[i + 1]) && box_length (subj[i + 1]) > 1 &&
0 == X509_NAME_add_entry_by_txt (name, subj[i], MBSTRING_ASC, (unsigned char *) subj[i+1], -1, -1, 0))
{
sqlr_warning ("01V01", "QW001", "Unknown name entry %s", subj[i]);
@@ -6527,7 +6538,7 @@ bif_xenc_x509_ss_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** arg
for (i = 0; i < BOX_ELEMENTS (exts); i += 2)
{
int nid;
- if (!DV_STRINGP (exts[i]) || !DV_STRINGP (exts[i + 1]) || !box_length (exts[i + 1]))
+ if (!DV_STRINGP (exts[i]) || !DV_STRINGP (exts[i + 1]) || box_length (exts[i + 1]) < 2)
continue;
nid = OBJ_sn2nid (exts[i]);
if (nid == NID_undef)
@@ -6538,7 +6549,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, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
+ if (!X509_sign (x, pk, digest))
{
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)));
@@ -6648,7 +6659,7 @@ bif_xenc_x509_csr_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** ar
for (i = 0; i < BOX_ELEMENTS (subj); i += 2)
{
- if (DV_STRINGP (subj[i]) && DV_STRINGP (subj[i + 1]) && box_length (subj[i + 1]) &&
+ if (DV_STRINGP (subj[i]) && DV_STRINGP (subj[i + 1]) && box_length (subj[i + 1]) > 1 &&
0 == X509_NAME_add_entry_by_txt (name, subj[i], MBSTRING_ASC, (unsigned char *) subj[i+1], -1, -1, 0))
{
sqlr_warning ("01V01", "QW001", "Unknown name entry %s", subj[i]);
@@ -6659,7 +6670,7 @@ bif_xenc_x509_csr_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** ar
{
int nid;
X509_EXTENSION *ex;
- if (!DV_STRINGP (exts[i]) || !DV_STRINGP (exts[i + 1]) || !box_length (exts[i + 1]))
+ if (!DV_STRINGP (exts[i]) || !DV_STRINGP (exts[i + 1]) || box_length (exts[i + 1]) < 2)
continue;
nid = OBJ_sn2nid (exts[i]);
if (nid == NID_undef)
@@ -6918,8 +6929,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)
@@ -6962,22 +6973,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);
@@ -7002,6 +7013,61 @@ 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;
@@ -7082,6 +7148,83 @@ 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)
{
@@ -7238,7 +7381,9 @@ 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 d44384f..958ef70 100644
--- a/libsrc/Wi/xmlenc.h
+++ b/libsrc/Wi/xmlenc.h
@@ -1,12 +1,12 @@
/*
* xmlenc.h
*
- * $Id: xmlenc.h,v 1.6.2.4 2010/10/13 12:12:21 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlenc_algos.c b/libsrc/Wi/xmlenc_algos.c
index 3092b21..841b98f 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.3 2010/10/13 12:12:21 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlenc_algos.h b/libsrc/Wi/xmlenc_algos.h
index 8b0e6bc..da073f1 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.2 2010/10/13 12:12:21 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlenc_test.h b/libsrc/Wi/xmlenc_test.h
index 3c97305..a4a2f89 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.1 2009/04/18 21:55:18 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlgen.h b/libsrc/Wi/xmlgen.h
index 67ebe47..37f5c81 100644
--- a/libsrc/Wi/xmlgen.h
+++ b/libsrc/Wi/xmlgen.h
@@ -1,12 +1,12 @@
/*
* xmlgen.h
*
- * $Id: xmlgen.h,v 1.2.2.1 2009/04/18 21:55:18 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmllazy.c b/libsrc/Wi/xmllazy.c
index a624c67..d7ab9e2 100644
--- a/libsrc/Wi/xmllazy.c
+++ b/libsrc/Wi/xmllazy.c
@@ -1,14 +1,14 @@
/*
* xmllazy.c
*
- * $Id: xmllazy.c,v 1.3.2.2 2010/10/06 09:35:04 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlnode.h b/libsrc/Wi/xmlnode.h
index ad88d21..da4bb5f 100644
--- a/libsrc/Wi/xmlnode.h
+++ b/libsrc/Wi/xmlnode.h
@@ -1,12 +1,12 @@
/*
* xmlnode.h
*
- * $Id: xmlnode.h,v 1.4.2.4 2010/02/01 12:53:46 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlres.h b/libsrc/Wi/xmlres.h
index 17bb5f5..1f33d56 100644
--- a/libsrc/Wi/xmlres.h
+++ b/libsrc/Wi/xmlres.h
@@ -1,12 +1,12 @@
/*
* xmlres.h
*
- * $Id: xmlres.h,v 1.2.2.1 2009/04/18 21:55:18 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlrpc_soap.xsl b/libsrc/Wi/xmlrpc_soap.xsl
index ffbfbf9..bbc0b37 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 2009/04/09 13:22:15 source Exp $
+ - $Id$
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2006 OpenLink Software
+ - 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
diff --git a/libsrc/Wi/xmlschema.c b/libsrc/Wi/xmlschema.c
index 177ba02..7c01561 100644
--- a/libsrc/Wi/xmlschema.c
+++ b/libsrc/Wi/xmlschema.c
@@ -1,14 +1,14 @@
/*
* xmlschema.c
*
- * $Id: xmlschema.c,v 1.6.2.4 2010/02/01 12:53:46 source Exp $
+ * $Id$
*
* Dynamic SQL Compiler, part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlsearch.c b/libsrc/Wi/xmlsearch.c
index 114f039..62eda6a 100644
--- a/libsrc/Wi/xmlsearch.c
+++ b/libsrc/Wi/xmlsearch.c
@@ -1,14 +1,14 @@
/*
* xmlsearch.c
*
- * $Id: xmlsearch.c,v 1.3.2.2 2009/04/18 21:55:18 source Exp $
+ * $Id$
*
* Search
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmlsql.c b/libsrc/Wi/xmlsql.c
index e3b4024..6856353 100644
--- a/libsrc/Wi/xmlsql.c
+++ b/libsrc/Wi/xmlsql.c
@@ -1,14 +1,14 @@
/*
* xmlsql.c
*
- * $Id: xmlsql.c,v 1.18.2.4 2011/08/26 17:59:53 source Exp $
+ * $Id$
*
* Dynamic SQL Compiler, part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xmltree.c b/libsrc/Wi/xmltree.c
index 54f2a35..42a9616 100644
--- a/libsrc/Wi/xmltree.c
+++ b/libsrc/Wi/xmltree.c
@@ -1,14 +1,14 @@
/*
* xmltree.c
*
- * $Id: xmltree.c,v 1.43.2.24 2011/08/15 15:30:15 source Exp $
+ * $Id$
*
* XPATH interpreter
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -4490,6 +4490,8 @@ 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)
{
@@ -4527,11 +4529,14 @@ 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;
+ 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);
for (inx = 0; inx < param_count; inx ++)
{
- XT *funcall = xqr->xqr_tree;
- XT *fake_var = funcall->_.xp_func.argtrees[inx];
+ XT *fake_var = funcall->_.xp_func.argtrees[inx * param_step + param_ofs];
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
@@ -4545,6 +4550,7 @@ 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
@@ -4615,6 +4621,18 @@ 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;
}
@@ -9707,11 +9725,15 @@ caddr_t bif_XMLAddAttribute (caddr_t * qst, caddr_t * err_ret, state_slot_t ** a
attr_value = attr_xe->_->xe_currattrvalue (attr_xe);
break;
default:
- attr_name = box_dv_uname_string (box_cast_to_UTF8 (qst, raw_attr_name));
- attr_value = bif_arg (qst, args, 3, "XMLAddAttribute");
- if (DV_DB_NULL == DV_TYPE_OF (attr_value))
- return box_num (0);
- attr_value = box_cast_to_UTF8 (qst, attr_value);
+ {
+ caddr_t box = box_cast_to_UTF8 (qst, raw_attr_name);
+ attr_name = box_dv_uname_string (box);
+ dk_free_box (box);
+ attr_value = bif_arg (qst, args, 3, "XMLAddAttribute");
+ if (DV_DB_NULL == DV_TYPE_OF (attr_value))
+ return box_num (0);
+ attr_value = box_cast_to_UTF8 (qst, attr_value);
+ }
break;
}
if (('\0' == attr_name[0]) || (' ' == attr_name[0]) || !strncmp (attr_name, "xmlns", 5))
@@ -9937,8 +9959,8 @@ caddr_t bif_xtree_tridgell32 (caddr_t * qst, caddr_t * err_ret, state_slot_t **
#endif
#define SUM64(data,lo,med,hi) \
- end = data + box_length_inline (data) - 1; \
- for (tail = data; tail < end; tail++) \
+ end = (data) + box_length_inline ((data)) - 1; \
+ for (tail = (data); tail < end; tail++) \
{ lo += tail[0]; med += lo; hi += med; }
static void
@@ -9967,7 +9989,7 @@ xte_sum64_iter (caddr_t *tree, unsigned *lo_ptr, unsigned *med_ptr, unsigned *hi
caddr_t *items = (caddr_t *)data;
DO_BOX_FAST (caddr_t, item, item_ctr, items)
{
- SUM64(item,lon,medn,hin)
+ SUM64((unsigned char *)(item),lon,medn,hin)
}
END_DO_BOX_FAST;
}
@@ -10021,8 +10043,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, (ccaddr_t)((ptrlong)1) for unsupported, 2 for NULL, UNAME for others */
-ccaddr_t
+/*! \returns NULL for string, (caddr_t)((ptrlong)1) for unsupported, 2 for NULL, UNAME for others */
+caddr_t
xsd_type_of_box (caddr_t arg)
{
dtp_t dtp = DV_TYPE_OF (arg);
@@ -10043,17 +10065,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 (ccaddr_t)((ptrlong)2);
+ return (caddr_t)((ptrlong)2);
case DV_RDF:
{
rdf_box_t *rb = (rdf_box_t *)arg;
if (RDF_BOX_DEFAULT_TYPE != rb->rb_type)
{
- ccaddr_t res = rdf_type_twobyte_to_iri (rb->rb_type);
+ caddr_t res = rdf_type_twobyte_to_iri (rb->rb_type);
if (NULL == res)
- return (ccaddr_t)((ptrlong)2);
+ return (caddr_t)((ptrlong)2);
box_flags (res) |= BF_IRI;
- return box_copy (res);
+ return res;
}
dtp = ((rb->rb_is_outlined) ? ((rdf_bigbox_t *)rb)->rbb_box_dtp : DV_TYPE_OF (rb->rb_box));
goto again; /* see above */
@@ -10061,7 +10083,7 @@ again:
case DV_XML_ENTITY:
return uname_rdf_ns_uri_XMLLiteral;
default:
- return (ccaddr_t)((ptrlong)1);
+ return (caddr_t)((ptrlong)1);
}
}
@@ -10070,7 +10092,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 = (caddr_t) xsd_type_of_box (arg);
+ caddr_t res = xsd_type_of_box (arg);
if (IS_BOX_POINTER (res))
return res;
switch ((ptrlong)(res))
@@ -10162,7 +10184,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)(((xml_tree_ent_t *)(xe))->xte_stack_top->xteb_current);
+ chld_hash = (int32)((ptrlong)(((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 */
@@ -10338,6 +10360,55 @@ bif_xml_get_ns_uri (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
}
caddr_t
+bif_xml_ns_uname (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+{
+ caddr_t pref = bif_string_or_uname_arg (qst, args, 0, "__xml_ns_uname");
+ caddr_t local = bif_string_or_uname_arg (qst, args, 1, "__xml_ns_uname");
+ caddr_t ns_uri = xml_get_ns_uri (((query_instance_t *)qst)->qi_client, pref, 0xffff, 0);
+ caddr_t res;
+ if (NULL == ns_uri)
+ sqlr_new_error ("22023", "SR648", "Unknown XML namespace prefix \"%.50s\"", pref);
+ BOX_DV_UNAME_CONCAT (res, ns_uri, local);
+ dk_free_box (ns_uri);
+ return res;
+}
+
+caddr_t
+bif_xml_ns_iristr (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+{
+ caddr_t pref = bif_string_or_uname_arg (qst, args, 0, "__xml_ns_iristr");
+ caddr_t local = bif_string_or_uname_arg (qst, args, 1, "__xml_ns_iristr");
+ caddr_t ns_uri = xml_get_ns_uri (((query_instance_t *)qst)->qi_client, pref, 0xffff, 0);
+ caddr_t res;
+ if (NULL == ns_uri)
+ sqlr_new_error ("22023", "SR648", "Unknown XML namespace prefix \"%.50s\"", pref);
+ res = box_dv_short_concat (ns_uri, local);
+ dk_free_box (ns_uri);
+ box_flags (res) = BF_IRI;
+ return res;
+}
+
+caddr_t
+bif_xml_nsexpand_iristr (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
+{
+ caddr_t src = bif_string_or_uname_arg (qst, args, 0, "__xml_nsexpand_iristr");
+ const char *colon = strchr (src, ':');
+ caddr_t ns_pref, ns_uri;
+ caddr_t res;
+ if (NULL == colon)
+ sqlr_new_error ("22023", "SR649", "No XML namespace prefix in string \"%.200s\"", src);
+ ns_pref = box_dv_short_nchars (src, colon - src);
+ ns_uri = xml_get_ns_uri (((query_instance_t *)qst)->qi_client, ns_pref, 0xffff, 0);
+ dk_free_box (ns_pref);
+ if (NULL == ns_uri)
+ sqlr_new_error ("22023", "SR648", "Unknown XML namespace prefix in IRI \"%.200s\"", src);
+ res = box_dv_short_strconcat (ns_uri, colon+1);
+ dk_free_box (ns_uri);
+ box_flags (res) = BF_IRI;
+ return res;
+}
+
+caddr_t
bif_xml_get_all_ns_decls (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
ptrlong persistent = bif_long_arg (qst, args, 0, "__xml_get_all_ns_decls");
@@ -10622,6 +10693,9 @@ xml_tree_init (void)
bif_define ("__xml_set_ns_decl", bif_xml_set_ns_decl);
bif_define ("__xml_get_ns_prefix", bif_xml_get_ns_prefix);
bif_define ("__xml_get_ns_uri", bif_xml_get_ns_uri);
+ bif_define ("__xml_ns_uname", bif_xml_ns_uname);
+ bif_define ("__xml_ns_iristr", bif_xml_ns_iristr);
+ bif_define ("__xml_nsexpand_iristr", bif_xml_nsexpand_iristr);
bif_define ("__xml_get_all_ns_decls", bif_xml_get_all_ns_decls);
bif_define ("__xml_remove_ns_by_prefix", bif_xml_remove_ns_by_prefix);
bif_define ("__xml_clear_all_ns_decls", bif_xml_clear_all_ns_decls);
diff --git a/libsrc/Wi/xmltree.h b/libsrc/Wi/xmltree.h
index 816334f..5db8bc4 100644
--- a/libsrc/Wi/xmltree.h
+++ b/libsrc/Wi/xmltree.h
@@ -1,12 +1,12 @@
/*
* xmltree.h
*
- * $Id: xmltree.h,v 1.27.2.15 2011/07/19 23:38:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -632,119 +632,6 @@ 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;
@@ -830,7 +717,7 @@ typedef struct xslt_sheet_s
extern xslt_number_format_t *xsnf_default;
-/*! Context of an XML parsers (XML, XSLT, RDF/XML, RDFa) */
+/*! Context of an XML parsers (XML, XSLT, RDF/XML, RDFa, Microdata) */
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) */
@@ -870,16 +757,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) */
- 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;
+ 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;
} xparse_ctx_t;
-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_free_rdf_parser_fields (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);
@@ -1106,6 +993,7 @@ extern caddr_t dbg_box_cast_to_UTF8 (DBG_PARAMS caddr_t * qst, caddr_t data);
extern caddr_t box_cast_to_UTF8 (caddr_t * qst, caddr_t data);
#endif
+extern caddr_t box_cast_to_UTF8_xsd (caddr_t *qst, caddr_t data);
extern caddr_t box_cast_to_UTF8_uname (caddr_t *qst, caddr_t raw_name);
#define XQ_SQL_COLUMN_FORMAT "sql:column(%s)"
diff --git a/libsrc/Wi/xpath.c b/libsrc/Wi/xpath.c
index a78c309..a07341d 100644
--- a/libsrc/Wi/xpath.c
+++ b/libsrc/Wi/xpath.c
@@ -1,14 +1,14 @@
/*
* xpath.c
*
- * $Id: xpath.c,v 1.15.2.14 2011/07/19 23:38:35 source Exp $
+ * $Id$
*
* XPATH to SQL
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -844,7 +844,7 @@ xp_make_pred (xpp_t *xpp, XT * expr)
XT * xp_make_flwr (xpp_t *xpp, dk_set_t forlets, XT *where_expn, dk_set_t ordering, XT *return_expn)
{
-#ifdef DEBUG
+#ifdef XPATH_DEBUG
XT *raw_return_expn = return_expn;
#endif
XT **ordering_array = NULL;
@@ -928,7 +928,7 @@ XT * xp_make_flwr (xpp_t *xpp, dk_set_t forlets, XT *where_expn, dk_set_t orderi
default: xp_error (xpp, "internal XQuery error in compilation of FLWR expression");
}
}
-#ifdef DEBUG
+#ifdef XPATH_DEBUG
dk_check_tree (raw_return_expn);
dk_check_tree (return_expn);
#endif
@@ -3057,7 +3057,7 @@ void xp_set_encoding_option (xpp_t *xpp, caddr_t enc_name)
}
-void xpyyparse (xpp_t *xpp);
+int xpyyparse (xpp_t *xpp);
void xpyyrestart (FILE *input_file);
@@ -3924,7 +3924,7 @@ XT *xp_make_module (xpp_t *xpp, caddr_t ns_prefix, caddr_t ns_uri, XT * expn)
XT **fundefs = (XT **)list_to_array (xpp->xpp_local_fundefs);
XT **defglobals = (XT **)list_to_array (NCONC (xpp->xpp_global_vars_external, dk_set_nreverse (xpp->xpp_global_vars_preset)));
XT *res;
-#ifdef MALLOC_DEBUG
+#ifdef XPATH_DEBUG
dk_check_tree (fundefs);
#endif
xpp->xpp_local_fundefs = NULL;
@@ -4528,7 +4528,9 @@ substitute_with_undefined:
res = cart;
}
}
+#ifdef XPATH_DEBUG
dk_check_tree (res);
+#endif
return res;
}
@@ -4867,14 +4869,15 @@ 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;
+ int argctr, allctr, iterctr, itercount;
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 = dk_alloc_box (argcount * sizeof (XT *), DV_ARRAY_OF_POINTER);
+ XT **arg_array = (XT **)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;
@@ -4889,15 +4892,63 @@ 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;
}
- xqr->xqr_tree = xtlist_with_tail (&l_xpp, 8, (caddr_t)arg_array, CALL_STMT,
+ call = 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 0a7e3ba..4c26753 100644
--- a/libsrc/Wi/xpath.h
+++ b/libsrc/Wi/xpath.h
@@ -1,12 +1,12 @@
/*
* xpath.h
*
- * $Id: xpath.h,v 1.5.2.5 2011/01/28 13:28:03 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xpathp.c b/libsrc/Wi/xpathp.c
index 071152c..84269f8 100644
--- a/libsrc/Wi/xpathp.c
+++ b/libsrc/Wi/xpathp.c
@@ -544,11 +544,9 @@
/* Copy the first part of user declarations. */
-#line 30 "./xpathp.y"
+#line 32 "./xpathp.y"
-#define YYPARSE_PARAM xpp_as_void
-#define YYLEX_PARAM YYPARSE_PARAM
#include "libutil.h"
#include "sqlnode.h"
#include "xpathp_impl.h"
@@ -556,12 +554,10 @@
#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))
+#define xpyyerror(xpp_arg, strg) xpyyerror_impl_1(xpp_arg, NULL, yystate, yyssa, yyssp, (strg))
#else
-#define xpyyerror(strg) xpyyerror_impl(xpp_arg, NULL, (strg))
+#define xpyyerror(xpp_arg, strg) xpyyerror_impl(xpp_arg, NULL, (strg))
#endif
#ifdef XPYYDEBUG
@@ -607,7 +603,7 @@ int xpyylex_from_xpp_bufs (caddr_t *yylval, xpp_t *xpp)
#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); \
+ xpyyerror (xpp_arg, "The prolog contains more than one declaration of " name); \
xpp_arg->xpp_xp_env->field = val; \
} while (0)
@@ -633,7 +629,7 @@ int xpyylex_from_xpp_bufs (caddr_t *yylval, xpp_t *xpp)
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 99 "./xpathp.y"
+#line 97 "./xpathp.y"
{
caddr_t box;
ptrlong token_type;
@@ -645,8 +641,8 @@ typedef union YYSTYPE
xp_lexbmk_t *bookmark;
void *nothing;
}
-/* Line 187 of yacc.c. */
-#line 650 "xpathp.c"
+/* Line 193 of yacc.c. */
+#line 646 "xpathp.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -659,7 +655,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 663 "xpathp.c"
+#line 659 "xpathp.c"
#ifdef short
# undef short
@@ -709,7 +705,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -1162,55 +1158,55 @@ static const yytype_int16 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 517, 517, 516, 523, 522, 528, 528, 529, 530,
- 534, 535, 540, 539, 550, 554, 555, 559, 566, 568,
- 569, 573, 576, 578, 579, 582, 584, 585, 589, 590,
- 591, 592, 593, 594, 595, 596, 597, 598, 599, 600,
- 601, 605, 606, 607, 610, 613, 614, 615, 619, 633,
- 634, 635, 636, 640, 641, 645, 646, 650, 659, 660,
- 661, 665, 672, 673, 679, 680, 684, 685, 686, 687,
- 688, 689, 690, 691, 692, 693, 694, 695, 696, 697,
- 698, 699, 700, 701, 702, 703, 707, 708, 709, 710,
- 711, 712, 713, 714, 715, 716, 720, 721, 722, 726,
- 727, 728, 729, 730, 734, 735, 736, 737, 738, 742,
- 746, 750, 751, 752, 753, 754, 758, 759, 760, 764,
- 765, 766, 771, 770, 808, 809, 810, 814, 815, 819,
- 820, 824, 848, 858, 859, 863, 864, 868, 869, 873,
- 874, 878, 879, 883, 884, 888, 889, 893, 894, 898,
- 899, 903, 904, 908, 909, 913, 914, 918, 919, 923,
- 924, 926, 930, 934, 938, 939, 940, 941, 942, 943,
- 944, 945, 946, 947, 948, 949, 950, 951, 956, 960,
- 961, 962, 963, 967, 968, 969, 970, 971, 972, 974,
- 979, 983, 987, 988, 992, 993, 997, 998, 1002, 1014,
- 1015, 1016, 1020, 1021, 1022, 1026, 1027, 1031, 1032, 1036,
- 1037, 1041, 1042, 1046, 1050, 1051, 1056, 1055, 1068, 1072,
- 1073, 1077, 1081, 1082, 1086, 1087, 1088, 1092, 1093, 1097,
- 1098, 1102, 1103, 1107, 1108, 1109, 1110, 1118, 1119, 1120,
- 1121, 1122, 1123, 1124, 1125, 1126, 1131, 1142, 1150, 1151,
- 1152, 1153, 1154, 1158, 1159, 1163, 1168, 1173, 1182, 1183,
- 1187, 1187, 1191, 1192, 1200, 1201, 1202, 1203, 1204, 1205,
- 1206, 1207, 1208, 1210, 1209, 1217, 1218, 1223, 1224, 1228,
- 1229, 1230, 1231, 1235, 1236, 1237, 1241, 1245, 1249, 1254,
- 1262, 1263, 1264, 1265, 1269, 1270, 1274, 1275, 1279, 1280,
- 1286, 1290, 1295, 1300, 1305, 1310, 1314, 1318, 1323, 1331,
- 1332, 1336, 1337, 1341, 1342, 1343, 1344, 1350, 1351, 1352,
- 1357, 1360, 1356, 1372, 1373, 1377, 1378, 1382, 1383, 1384,
- 1388, 1389, 1390, 1391, 1395, 1396, 1397, 1402, 1403, 1404,
- 1408, 1409, 1410, 1411, 1412, 1413, 1418, 1422, 1430, 1434,
- 1442, 1443, 1447, 1448, 1449, 1450, 1451, 1452, 1514, 1519,
- 1529, 1530, 1534, 1535, 1539, 1540, 1541, 1551, 1552, 1556,
- 1557, 1561, 1562, 1563, 1567, 1568, 1569, 1570, 1571, 1572,
- 1573, 1574, 1575, 1582, 1590, 1591, 1598, 1599, 1600, 1601,
- 1609, 1610, 1611, 1612, 1613, 1614, 1615, 1616, 1617, 1618,
- 1619, 1620, 1621, 1622, 1623, 1624, 1625, 1630, 1636, 1637,
- 1638, 1643, 1644, 1645, 1650, 1651, 1656, 1657, 1658, 1659,
- 1664, 1665, 1670, 1671, 1672, 1673, 1674, 1675, 1676, 1677,
- 1678, 1679, 1680, 1681, 1682, 1687, 1688, 1689, 1690, 1691,
- 1692, 1693, 1694, 1695, 1696, 1697, 1698, 1699, 1703, 1704,
- 1708, 1708, 1712, 1713, 1718, 1719, 1724, 1725, 1726, 1727,
- 1732, 1736, 1744, 1745, 1746, 1752, 1753, 1754, 1755, 1760,
- 1761, 1768, 1769, 1773, 1774, 1775, 1779, 1781, 1783, 1785,
- 1791, 1792, 1793, 1794, 1795, 1796, 1797, 1798, 1799, 1800
+ 0, 515, 515, 514, 521, 520, 526, 526, 527, 528,
+ 532, 533, 538, 537, 548, 552, 553, 557, 564, 566,
+ 567, 571, 574, 576, 577, 580, 582, 583, 587, 588,
+ 589, 590, 591, 592, 593, 594, 595, 596, 597, 598,
+ 599, 603, 604, 605, 608, 611, 612, 613, 617, 631,
+ 632, 633, 634, 638, 639, 643, 644, 648, 657, 658,
+ 659, 663, 670, 671, 677, 678, 682, 683, 684, 685,
+ 686, 687, 688, 689, 690, 691, 692, 693, 694, 695,
+ 696, 697, 698, 699, 700, 701, 705, 706, 707, 708,
+ 709, 710, 711, 712, 713, 714, 718, 719, 720, 724,
+ 725, 726, 727, 728, 732, 733, 734, 735, 736, 740,
+ 744, 748, 749, 750, 751, 752, 756, 757, 758, 762,
+ 763, 764, 769, 768, 806, 807, 808, 812, 813, 817,
+ 818, 822, 846, 856, 857, 861, 862, 866, 867, 871,
+ 872, 876, 877, 881, 882, 886, 887, 891, 892, 896,
+ 897, 901, 902, 906, 907, 911, 912, 916, 917, 921,
+ 922, 924, 928, 932, 936, 937, 938, 939, 940, 941,
+ 942, 943, 944, 945, 946, 947, 948, 949, 954, 958,
+ 959, 960, 961, 965, 966, 967, 968, 969, 970, 972,
+ 977, 981, 985, 986, 990, 991, 995, 996, 1000, 1012,
+ 1013, 1014, 1018, 1019, 1020, 1024, 1025, 1029, 1030, 1034,
+ 1035, 1039, 1040, 1044, 1048, 1049, 1054, 1053, 1066, 1070,
+ 1071, 1075, 1079, 1080, 1084, 1085, 1086, 1090, 1091, 1095,
+ 1096, 1100, 1101, 1105, 1106, 1107, 1108, 1116, 1117, 1118,
+ 1119, 1120, 1121, 1122, 1123, 1124, 1129, 1140, 1148, 1149,
+ 1150, 1151, 1152, 1156, 1157, 1161, 1166, 1171, 1180, 1181,
+ 1185, 1185, 1189, 1190, 1198, 1199, 1200, 1201, 1202, 1203,
+ 1204, 1205, 1206, 1208, 1207, 1215, 1216, 1221, 1222, 1226,
+ 1227, 1228, 1229, 1233, 1234, 1235, 1239, 1243, 1247, 1252,
+ 1260, 1261, 1262, 1263, 1267, 1268, 1272, 1273, 1277, 1278,
+ 1284, 1288, 1293, 1298, 1303, 1308, 1312, 1316, 1321, 1329,
+ 1330, 1334, 1335, 1339, 1340, 1341, 1342, 1348, 1349, 1350,
+ 1355, 1358, 1354, 1370, 1371, 1375, 1376, 1380, 1381, 1382,
+ 1386, 1387, 1388, 1389, 1393, 1394, 1395, 1400, 1401, 1402,
+ 1406, 1407, 1408, 1409, 1410, 1411, 1416, 1420, 1428, 1432,
+ 1440, 1441, 1445, 1446, 1447, 1448, 1449, 1450, 1512, 1517,
+ 1527, 1528, 1532, 1533, 1537, 1538, 1539, 1549, 1550, 1554,
+ 1555, 1559, 1560, 1561, 1565, 1566, 1567, 1568, 1569, 1570,
+ 1571, 1572, 1573, 1580, 1588, 1589, 1596, 1597, 1598, 1599,
+ 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615, 1616,
+ 1617, 1618, 1619, 1620, 1621, 1622, 1623, 1628, 1634, 1635,
+ 1636, 1641, 1642, 1643, 1648, 1649, 1654, 1655, 1656, 1657,
+ 1662, 1663, 1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675,
+ 1676, 1677, 1678, 1679, 1680, 1685, 1686, 1687, 1688, 1689,
+ 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697, 1701, 1702,
+ 1706, 1706, 1710, 1711, 1716, 1717, 1722, 1723, 1724, 1725,
+ 1730, 1734, 1742, 1743, 1744, 1750, 1751, 1752, 1753, 1758,
+ 1759, 1766, 1767, 1771, 1772, 1773, 1777, 1779, 1781, 1783,
+ 1789, 1790, 1791, 1792, 1793, 1794, 1795, 1796, 1797, 1798
};
#endif
@@ -3013,7 +3009,7 @@ do \
} \
else \
{ \
- yyerror (YY_("syntax error: cannot back up")); \
+ yyerror (xpp_arg, YY_("syntax error: cannot back up")); \
YYERROR; \
} \
while (YYID (0))
@@ -3054,7 +3050,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -3070,7 +3066,7 @@ while (YYID (0))
#ifdef YYLEX_PARAM
# define YYLEX yylex (&yylval, YYLEX_PARAM)
#else
-# define YYLEX yylex (&yylval)
+# define YYLEX yylex (&yylval, xpp_arg)
#endif
/* Enable debugging if requested. */
@@ -3093,7 +3089,7 @@ do { \
{ \
YYFPRINTF (stderr, "%s ", Title); \
yy_symbol_print (stderr, \
- Type, Value); \
+ Type, Value, xpp_arg); \
YYFPRINTF (stderr, "\n"); \
} \
} while (YYID (0))
@@ -3107,17 +3103,19 @@ do { \
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, xpp_t * xpp_arg)
#else
static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, xpp_arg)
FILE *yyoutput;
int yytype;
YYSTYPE const * const yyvaluep;
+ xpp_t * xpp_arg;
#endif
{
if (!yyvaluep)
return;
+ YYUSE (xpp_arg);
# ifdef YYPRINT
if (yytype < YYNTOKENS)
YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
@@ -3139,13 +3137,14 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, xpp_t * xpp_arg)
#else
static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
+yy_symbol_print (yyoutput, yytype, yyvaluep, xpp_arg)
FILE *yyoutput;
int yytype;
YYSTYPE const * const yyvaluep;
+ xpp_t * xpp_arg;
#endif
{
if (yytype < YYNTOKENS)
@@ -3153,7 +3152,7 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
else
YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+ yy_symbol_value_print (yyoutput, yytype, yyvaluep, xpp_arg);
YYFPRINTF (yyoutput, ")");
}
@@ -3193,12 +3192,13 @@ do { \
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, xpp_t * xpp_arg)
#else
static void
-yy_reduce_print (yyvsp, yyrule)
+yy_reduce_print (yyvsp, yyrule, xpp_arg)
YYSTYPE *yyvsp;
int yyrule;
+ xpp_t * xpp_arg;
#endif
{
int yynrhs = yyr2[yyrule];
@@ -3212,7 +3212,7 @@ yy_reduce_print (yyvsp, yyrule)
fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
- );
+ , xpp_arg);
fprintf (stderr, "\n");
}
}
@@ -3220,7 +3220,7 @@ yy_reduce_print (yyvsp, yyrule)
# define YY_REDUCE_PRINT(Rule) \
do { \
if (yydebug) \
- yy_reduce_print (yyvsp, Rule); \
+ yy_reduce_print (yyvsp, Rule, xpp_arg); \
} while (YYID (0))
/* Nonzero means print parse trace. It is left uninitialized so that
@@ -3471,16 +3471,18 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, xpp_t * xpp_arg)
#else
static void
-yydestruct (yymsg, yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep, xpp_arg)
const char *yymsg;
int yytype;
YYSTYPE *yyvaluep;
+ xpp_t * xpp_arg;
#endif
{
YYUSE (yyvaluep);
+ YYUSE (xpp_arg);
if (!yymsg)
yymsg = "Deleting";
@@ -3505,7 +3507,7 @@ int yyparse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
+int yyparse (xpp_t * xpp_arg);
#else
int yyparse ();
#endif
@@ -3534,11 +3536,11 @@ yyparse (YYPARSE_PARAM)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
int
-yyparse (void)
+yyparse (xpp_t * xpp_arg)
#else
int
-yyparse ()
-
+yyparse (xpp_arg)
+ xpp_t * xpp_arg;
#endif
#endif
{
@@ -3795,7 +3797,7 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 517 "./xpathp.y"
+#line 515 "./xpathp.y"
{
xpp_arg->xpp_allowed_options = XP_XQUERY_OPTS | XP_XPATH_OPTS | XP_FREETEXT_OPTS;
xp_register_default_namespace_prefixes (xpp_arg);
@@ -3803,12 +3805,12 @@ yyreduce:
break;
case 3:
-#line 521 "./xpathp.y"
+#line 519 "./xpathp.y"
{ xpp_arg->xpp_expr = (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
case 4:
-#line 523 "./xpathp.y"
+#line 521 "./xpathp.y"
{
xpp_arg->xpp_allowed_options = XP_XPATH_OPTS | XP_FREETEXT_OPTS;
xp_register_default_namespace_prefixes (xpp_arg);
@@ -3816,177 +3818,177 @@ yyreduce:
break;
case 5:
-#line 527 "./xpathp.y"
+#line 525 "./xpathp.y"
{ xpp_arg->xpp_expr = (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
case 6:
-#line 528 "./xpathp.y"
+#line 526 "./xpathp.y"
{ xpp_arg->xpp_allowed_options = XP_FREETEXT_OPTS; }
break;
case 7:
-#line 528 "./xpathp.y"
+#line 526 "./xpathp.y"
{ xpp_arg->xpp_expr = (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
case 8:
-#line 529 "./xpathp.y"
+#line 527 "./xpathp.y"
{ (yyval.tree) = NULL; /* This never happens and it's here solely to remove warnings */ }
break;
case 9:
-#line 530 "./xpathp.y"
- { yyerror ("(internal SQL processing error) XQuery, XPath or Free-Text mark expected"); }
+#line 528 "./xpathp.y"
+ { xpyyerror (xpp_arg, "(internal SQL processing error) XQuery, XPath or Free-Text mark expected"); }
break;
case 10:
-#line 534 "./xpathp.y"
- { yyerror ("The XQuery expression is totally empty"); }
+#line 532 "./xpathp.y"
+ { xpyyerror (xpp_arg, "The XQuery expression is totally empty"); }
break;
case 11:
-#line 536 "./xpathp.y"
+#line 534 "./xpathp.y"
{
(yyval.tree) = xp_make_module (xpp_arg, NULL, NULL, (yyvsp[(3) - (4)].tree));
}
break;
case 12:
-#line 540 "./xpathp.y"
+#line 538 "./xpathp.y"
{
xp_register_namespace_prefix (xpp_arg, (yyvsp[(3) - (6)].box), (yyvsp[(5) - (6)].box));
}
break;
case 13:
-#line 544 "./xpathp.y"
+#line 542 "./xpathp.y"
{
(yyval.tree) = xp_make_module (xpp_arg, box_copy ((yyvsp[(3) - (9)].box)), box_copy ((yyvsp[(5) - (9)].box)), NULL);
}
break;
case 14:
-#line 550 "./xpathp.y"
+#line 548 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 17:
-#line 559 "./xpathp.y"
+#line 557 "./xpathp.y"
{ (yyval.tree) = (XT*)((yyvsp[(2) - (3)].fts)); }
break;
case 19:
-#line 568 "./xpathp.y"
+#line 566 "./xpathp.y"
{ ; }
break;
case 20:
-#line 569 "./xpathp.y"
+#line 567 "./xpathp.y"
{ ; }
break;
case 24:
-#line 579 "./xpathp.y"
- { yyerror ("Missing semicolon after prolog (setter) declaration"); }
+#line 577 "./xpathp.y"
+ { xpyyerror (xpp_arg, "Missing semicolon after prolog (setter) declaration"); }
break;
case 27:
-#line 585 "./xpathp.y"
- { yyerror ("Prolog setter declaration can not appear after a non-setter declaration"); }
+#line 583 "./xpathp.y"
+ { xpyyerror (xpp_arg, "Prolog setter declaration can not appear after a non-setter declaration"); }
break;
case 28:
-#line 589 "./xpathp.y"
+#line 587 "./xpathp.y"
{ XPP_PROLOG_SET (xe_xmlspace_mode, "xmlspace mode", XPP_XMLSPACE_PRESERVE); }
break;
case 29:
-#line 590 "./xpathp.y"
+#line 588 "./xpathp.y"
{ XPP_PROLOG_SET (xe_xmlspace_mode, "xmlspace mode", XPP_XMLSPACE_STRIP); }
break;
case 30:
-#line 591 "./xpathp.y"
+#line 589 "./xpathp.y"
{ XPP_PROLOG_SET (xe_dflt_collation, "default collation", box_copy ((yyvsp[(2) - (2)].box))); }
break;
case 31:
-#line 592 "./xpathp.y"
+#line 590 "./xpathp.y"
{ XPP_PROLOG_SET (xe_base_uri, "base-uri", box_copy ((yyvsp[(2) - (2)].box))); }
break;
case 32:
-#line 593 "./xpathp.y"
+#line 591 "./xpathp.y"
{ XPP_PROLOG_SET (xe_construction_mode, "construction mode", XPP_TYPE_PRESERVE); }
break;
case 33:
-#line 594 "./xpathp.y"
+#line 592 "./xpathp.y"
{ XPP_PROLOG_SET (xe_construction_mode, "construction mode", XPP_TYPE_STRIP); }
break;
case 34:
-#line 595 "./xpathp.y"
+#line 593 "./xpathp.y"
{ XPP_PROLOG_SET (xe_dflt_elt_namespace, "default element namespace", box_copy ((yyvsp[(3) - (3)].box))); }
break;
case 35:
-#line 596 "./xpathp.y"
+#line 594 "./xpathp.y"
{ XPP_PROLOG_SET (xe_dflt_fn_namespace, "default function namespace", box_copy ((yyvsp[(3) - (3)].box))); }
break;
case 36:
-#line 597 "./xpathp.y"
+#line 595 "./xpathp.y"
{ XPP_PROLOG_SET (xe_ordering_mode, "ordering mode", XPP_ORDERING_ORDERED); }
break;
case 37:
-#line 598 "./xpathp.y"
+#line 596 "./xpathp.y"
{ XPP_PROLOG_SET (xe_ordering_mode, "ordering mode", XPP_ORDERING_UNORDERED); }
break;
case 38:
-#line 599 "./xpathp.y"
+#line 597 "./xpathp.y"
{ XPP_PROLOG_SET (xe_validation_mode, "validation mode", XPP_VALIDATION_LAX); }
break;
case 39:
-#line 600 "./xpathp.y"
+#line 598 "./xpathp.y"
{ XPP_PROLOG_SET (xe_validation_mode, "validation mode", XPP_VALIDATION_SKIP); }
break;
case 40:
-#line 601 "./xpathp.y"
+#line 599 "./xpathp.y"
{ XPP_PROLOG_SET (xe_validation_mode, "validation mode", XPP_VALIDATION_STRICT); }
break;
case 43:
-#line 607 "./xpathp.y"
+#line 605 "./xpathp.y"
{
xp_register_namespace_prefix (xpp_arg, (yyvsp[(2) - (5)].box), (yyvsp[(4) - (5)].box));
}
break;
case 44:
-#line 610 "./xpathp.y"
+#line 608 "./xpathp.y"
{
xp_register_namespace_prefix (xpp_arg, (yyvsp[(2) - (5)].box), (yyvsp[(4) - (5)].box));
}
break;
case 46:
-#line 614 "./xpathp.y"
+#line 612 "./xpathp.y"
{ /* dk_set_push (&(xpp_arg->xpp_preamble_decls), $1) */ ; }
break;
case 47:
-#line 615 "./xpathp.y"
+#line 613 "./xpathp.y"
{ /* dk_set_push (&(xpp_arg->xpp_preamble_decls), $1) */ ; }
break;
case 48:
-#line 620 "./xpathp.y"
+#line 618 "./xpathp.y"
{
if ((yyvsp[(2) - (4)].box))
{
@@ -4000,47 +4002,47 @@ yyreduce:
break;
case 49:
-#line 633 "./xpathp.y"
+#line 631 "./xpathp.y"
{ (yyval.box) = NULL; }
break;
case 50:
-#line 634 "./xpathp.y"
+#line 632 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
case 51:
-#line 635 "./xpathp.y"
+#line 633 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
case 52:
-#line 636 "./xpathp.y"
+#line 634 "./xpathp.y"
{ (yyval.box) = (void *)1; }
break;
case 53:
-#line 640 "./xpathp.y"
+#line 638 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 54:
-#line 641 "./xpathp.y"
+#line 639 "./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 645 "./xpathp.y"
+#line 643 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 56:
-#line 646 "./xpathp.y"
+#line 644 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].box)); }
break;
case 57:
-#line 651 "./xpathp.y"
+#line 649 "./xpathp.y"
{
if ((yyvsp[(2) - (4)].box))
xp_register_namespace_prefix (xpp_arg, (yyvsp[(2) - (4)].box), (yyvsp[(3) - (4)].box));
@@ -4049,299 +4051,299 @@ yyreduce:
break;
case 58:
-#line 659 "./xpathp.y"
+#line 657 "./xpathp.y"
{ (yyval.box) = NULL; }
break;
case 59:
-#line 660 "./xpathp.y"
+#line 658 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
case 60:
-#line 661 "./xpathp.y"
+#line 659 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
case 61:
-#line 666 "./xpathp.y"
+#line 664 "./xpathp.y"
{
xp_var_decl (xpp_arg, box_copy ((yyvsp[(2) - (4)].box)), (yyvsp[(3) - (4)].tree), (yyvsp[(4) - (4)].tree));
}
break;
case 62:
-#line 672 "./xpathp.y"
+#line 670 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 63:
-#line 673 "./xpathp.y"
+#line 671 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 64:
-#line 679 "./xpathp.y"
+#line 677 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 65:
-#line 680 "./xpathp.y"
+#line 678 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 67:
-#line 685 "./xpathp.y"
+#line 683 "./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 686 "./xpathp.y"
+#line 684 "./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 687 "./xpathp.y"
+#line 685 "./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 688 "./xpathp.y"
+#line 686 "./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 689 "./xpathp.y"
+#line 687 "./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 691 "./xpathp.y"
+#line 689 "./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 692 "./xpathp.y"
+#line 690 "./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 694 "./xpathp.y"
+#line 692 "./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 695 "./xpathp.y"
+#line 693 "./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 696 "./xpathp.y"
+#line 694 "./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 697 "./xpathp.y"
+#line 695 "./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 698 "./xpathp.y"
+#line 696 "./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 699 "./xpathp.y"
+#line 697 "./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 700 "./xpathp.y"
+#line 698 "./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 701 "./xpathp.y"
+#line 699 "./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 702 "./xpathp.y"
+#line 700 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 85:
-#line 703 "./xpathp.y"
+#line 701 "./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 707 "./xpathp.y"
+#line 705 "./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 709 "./xpathp.y"
+#line 707 "./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 710 "./xpathp.y"
+#line 708 "./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 712 "./xpathp.y"
+#line 710 "./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 713 "./xpathp.y"
+#line 711 "./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 714 "./xpathp.y"
+#line 712 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, COMMENT_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 94:
-#line 715 "./xpathp.y"
+#line 713 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, TEXT_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 95:
-#line 716 "./xpathp.y"
+#line 714 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, NODE_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 96:
-#line 720 "./xpathp.y"
+#line 718 "./xpathp.y"
{ (yyval.token_type) = XQ_SEQTYPE_REQ_MANY; }
break;
case 97:
-#line 721 "./xpathp.y"
+#line 719 "./xpathp.y"
{ (yyval.token_type) = XQ_SEQTYPE_OPT_ONE; }
break;
case 98:
-#line 722 "./xpathp.y"
+#line 720 "./xpathp.y"
{ (yyval.token_type) = XQ_SEQTYPE_OPT_MANY; }
break;
case 99:
-#line 726 "./xpathp.y"
+#line 724 "./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 727 "./xpathp.y"
+#line 725 "./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 728 "./xpathp.y"
+#line 726 "./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 729 "./xpathp.y"
+#line 727 "./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 730 "./xpathp.y"
+#line 728 "./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 734 "./xpathp.y"
+#line 732 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 105:
-#line 735 "./xpathp.y"
+#line 733 "./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 736 "./xpathp.y"
+#line 734 "./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 737 "./xpathp.y"
+#line 735 "./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 738 "./xpathp.y"
+#line 736 "./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 742 "./xpathp.y"
+#line 740 "./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 746 "./xpathp.y"
+#line 744 "./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 750 "./xpathp.y"
+#line 748 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 112:
-#line 751 "./xpathp.y"
+#line 749 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 113:
-#line 752 "./xpathp.y"
+#line 750 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 114:
-#line 753 "./xpathp.y"
+#line 751 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 115:
-#line 754 "./xpathp.y"
+#line 752 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 117:
-#line 759 "./xpathp.y"
+#line 757 "./xpathp.y"
{ (yyval.box) = box_dv_uname_string ("not"); }
break;
case 118:
-#line 760 "./xpathp.y"
+#line 758 "./xpathp.y"
{ (yyval.box) = NULL; }
break;
case 119:
-#line 764 "./xpathp.y"
+#line 762 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 120:
-#line 765 "./xpathp.y"
+#line 763 "./xpathp.y"
{ (yyval.tree) = (XT *)(yyvsp[(1) - (1)].box); }
break;
case 121:
-#line 766 "./xpathp.y"
+#line 764 "./xpathp.y"
{ (yyval.tree) = (XT *)(yyvsp[(1) - (1)].box); }
break;
case 122:
-#line 771 "./xpathp.y"
+#line 769 "./xpathp.y"
{
caddr_t fname = xp_make_extfunction_name (xpp_arg, NULL, (yyvsp[(2) - (4)].box));
xp_env_push (xpp_arg, "function", fname, 1);
@@ -4350,7 +4352,7 @@ yyreduce:
break;
case 123:
-#line 777 "./xpathp.y"
+#line 775 "./xpathp.y"
{
#ifdef MALLOC_DEBUG
dk_check_tree ((yyvsp[(6) - (6)].tree));
@@ -4382,42 +4384,42 @@ yyreduce:
break;
case 124:
-#line 808 "./xpathp.y"
+#line 806 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 125:
-#line 809 "./xpathp.y"
+#line 807 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
case 126:
-#line 810 "./xpathp.y"
+#line 808 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 127:
-#line 814 "./xpathp.y"
+#line 812 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 129:
-#line 819 "./xpathp.y"
+#line 817 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 130:
-#line 820 "./xpathp.y"
+#line 818 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
case 131:
-#line 824 "./xpathp.y"
+#line 822 "./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 849 "./xpathp.y"
+#line 847 "./xpathp.y"
{
if (dk_set_length((yyvsp[(1) - (1)].backstack)) > 1)
(yyval.tree) = xp_make_call (xpp_arg, "append", revlist_to_array ((yyvsp[(1) - (1)].backstack)));
@@ -4427,323 +4429,323 @@ yyreduce:
break;
case 133:
-#line 858 "./xpathp.y"
+#line 856 "./xpathp.y"
{ (yyval.tree) = xp_make_sortby (xpp_arg, (yyvsp[(1) - (2)].tree), (yyvsp[(2) - (2)].backstack)); }
break;
case 134:
-#line 860 "./xpathp.y"
+#line 858 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "or", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 135:
-#line 863 "./xpathp.y"
- { yyerror ("operand expected after 'OR'"); }
+#line 861 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'OR'"); }
break;
case 136:
-#line 865 "./xpathp.y"
+#line 863 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "and", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 137:
-#line 868 "./xpathp.y"
- { yyerror ("operand expected after 'AND'"); }
+#line 866 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'AND'"); }
break;
case 138:
-#line 870 "./xpathp.y"
+#line 868 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "not", list (1, (yyvsp[(2) - (2)].tree)));
}
break;
case 139:
-#line 873 "./xpathp.y"
- { yyerror ("operand expected after 'NOT'"); }
+#line 871 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'NOT'"); }
break;
case 140:
-#line 875 "./xpathp.y"
+#line 873 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "EQ operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 141:
-#line 878 "./xpathp.y"
- { yyerror ("operand expected after 'eq'"); }
+#line 876 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'eq'"); }
break;
case 142:
-#line 880 "./xpathp.y"
+#line 878 "./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)));
}
break;
case 143:
-#line 883 "./xpathp.y"
- { yyerror ("operand expected after 'ge'"); }
+#line 881 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'ge'"); }
break;
case 144:
-#line 885 "./xpathp.y"
+#line 883 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "GT operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 145:
-#line 888 "./xpathp.y"
- { yyerror ("operand expected after 'gt'"); }
+#line 886 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'gt'"); }
break;
case 146:
-#line 890 "./xpathp.y"
+#line 888 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "LE operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 147:
-#line 893 "./xpathp.y"
- { yyerror ("operand expected after 'le'"); }
+#line 891 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'le'"); }
break;
case 148:
-#line 895 "./xpathp.y"
+#line 893 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "LT operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 149:
-#line 898 "./xpathp.y"
- { yyerror ("operand expected after 'lt'"); }
+#line 896 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'lt'"); }
break;
case 150:
-#line 900 "./xpathp.y"
+#line 898 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "NE operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 151:
-#line 903 "./xpathp.y"
- { yyerror ("operand expected after 'ne'"); }
+#line 901 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'ne'"); }
break;
case 152:
-#line 905 "./xpathp.y"
+#line 903 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "BEFORE operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 153:
-#line 908 "./xpathp.y"
- { yyerror ("operand expected after '<<'"); }
+#line 906 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after '<<'"); }
break;
case 154:
-#line 910 "./xpathp.y"
+#line 908 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "BEFORE operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 155:
-#line 913 "./xpathp.y"
- { yyerror ("operand expected after 'before'"); }
+#line 911 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'before'"); }
break;
case 156:
-#line 915 "./xpathp.y"
+#line 913 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "AFTER operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 157:
-#line 918 "./xpathp.y"
- { yyerror ("operand expected after '>>'"); }
+#line 916 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after '>>'"); }
break;
case 158:
-#line 920 "./xpathp.y"
+#line 918 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "AFTER operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 159:
-#line 923 "./xpathp.y"
- { yyerror ("operand expected after 'after'"); }
+#line 921 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'after'"); }
break;
case 160:
-#line 925 "./xpathp.y"
+#line 923 "./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 927 "./xpathp.y"
+#line 925 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "if", list (3, (yyvsp[(2) - (7)].tree), (yyvsp[(5) - (7)].tree), (yyvsp[(7) - (7)].tree)));
}
break;
case 162:
-#line 931 "./xpathp.y"
+#line 929 "./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)));
}
break;
case 163:
-#line 935 "./xpathp.y"
+#line 933 "./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)));
}
break;
case 164:
-#line 938 "./xpathp.y"
+#line 936 "./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 939 "./xpathp.y"
+#line 937 "./xpathp.y"
{ (yyval.tree) = xp_make_cast (xpp_arg, XQ_CAST_AS_CNAME, NULL, (yyvsp[(1) - (2)].tree)); }
break;
case 166:
-#line 940 "./xpathp.y"
+#line 938 "./xpathp.y"
{ (yyval.tree) = xp_make_cast (xpp_arg, XQ_CASTABLE_AS_CNAME, NULL, (yyvsp[(1) - (2)].tree)); }
break;
case 167:
-#line 941 "./xpathp.y"
+#line 939 "./xpathp.y"
{ (yyval.tree) = xp_make_cast (xpp_arg, TREAT_AS_L, NULL, (yyvsp[(1) - (2)].tree)); }
break;
case 168:
-#line 942 "./xpathp.y"
+#line 940 "./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 943 "./xpathp.y"
+#line 941 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_EQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 170:
-#line 944 "./xpathp.y"
+#line 942 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_NEQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 171:
-#line 945 "./xpathp.y"
+#line 943 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_SAME, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 172:
-#line 946 "./xpathp.y"
+#line 944 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_NSAME, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 173:
-#line 947 "./xpathp.y"
+#line 945 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LIKE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 174:
-#line 948 "./xpathp.y"
+#line 946 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 175:
-#line 949 "./xpathp.y"
+#line 947 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 176:
-#line 950 "./xpathp.y"
+#line 948 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_GT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 177:
-#line 951 "./xpathp.y"
+#line 949 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_GTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 178:
-#line 957 "./xpathp.y"
+#line 955 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "TO operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 179:
-#line 960 "./xpathp.y"
+#line 958 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_PLUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 180:
-#line 961 "./xpathp.y"
+#line 959 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MINUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 181:
-#line 962 "./xpathp.y"
+#line 960 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_TIMES, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 182:
-#line 964 "./xpathp.y"
+#line 962 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "IDIV operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 183:
-#line 967 "./xpathp.y"
- { yyerror ("operand expected after 'idiv'"); }
+#line 965 "./xpathp.y"
+ { xpyyerror (xpp_arg, "operand expected after 'idiv'"); }
break;
case 184:
-#line 968 "./xpathp.y"
+#line 966 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_DIV, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 185:
-#line 969 "./xpathp.y"
+#line 967 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MOD, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 186:
-#line 970 "./xpathp.y"
+#line 968 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 187:
-#line 971 "./xpathp.y"
+#line 969 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MINUS, box_num_nonull (0), (yyvsp[(2) - (2)].tree)); }
break;
case 188:
-#line 973 "./xpathp.y"
+#line 971 "./xpathp.y"
{ (yyval.tree) = xp_make_call (xpp_arg, "union", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree))); }
break;
case 189:
-#line 975 "./xpathp.y"
+#line 973 "./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),
xe_new_xqst (xpp_arg, XQST_REF), xe_new_xqst (xpp_arg, XQST_REF),
@@ -4751,46 +4753,46 @@ yyreduce:
break;
case 190:
-#line 980 "./xpathp.y"
+#line 978 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "intersect", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 191:
-#line 984 "./xpathp.y"
+#line 982 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "except", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
}
break;
case 192:
-#line 987 "./xpathp.y"
+#line 985 "./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 992 "./xpathp.y"
+#line 990 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
case 195:
-#line 993 "./xpathp.y"
- { yyerror ("')' or ',' expected"); }
+#line 991 "./xpathp.y"
+ { xpyyerror (xpp_arg, "')' or ',' expected"); }
break;
case 196:
-#line 997 "./xpathp.y"
+#line 995 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 197:
-#line 998 "./xpathp.y"
+#line 996 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
case 198:
-#line 1003 "./xpathp.y"
+#line 1001 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 7, (yyvsp[(2) - (5)].token_type),
NULL, /* xs_query */
(yyvsp[(1) - (5)].tree), /* xs_tree */
@@ -4802,82 +4804,82 @@ yyreduce:
break;
case 199:
-#line 1014 "./xpathp.y"
+#line 1012 "./xpathp.y"
{ (yyval.token_type) = XQ_ASCENDING; }
break;
case 200:
-#line 1015 "./xpathp.y"
+#line 1013 "./xpathp.y"
{ (yyval.token_type) = XQ_ASCENDING; }
break;
case 201:
-#line 1016 "./xpathp.y"
+#line 1014 "./xpathp.y"
{ (yyval.token_type) = XQ_DESCENDING; }
break;
case 202:
-#line 1020 "./xpathp.y"
+#line 1018 "./xpathp.y"
{ (yyval.token_type) = XQ_EMPTY_SQL_ORDER; }
break;
case 203:
-#line 1021 "./xpathp.y"
+#line 1019 "./xpathp.y"
{ (yyval.token_type) = XQ_EMPTY_GREATEST; }
break;
case 204:
-#line 1022 "./xpathp.y"
+#line 1020 "./xpathp.y"
{ (yyval.token_type) = XQ_EMPTY_LEAST; }
break;
case 205:
-#line 1026 "./xpathp.y"
+#line 1024 "./xpathp.y"
{ (yyval.box) = NULL; }
break;
case 206:
-#line 1027 "./xpathp.y"
+#line 1025 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 207:
-#line 1031 "./xpathp.y"
+#line 1029 "./xpathp.y"
{ (yyval.box) = DV_UNKNOWN; }
break;
case 208:
-#line 1032 "./xpathp.y"
+#line 1030 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 209:
-#line 1036 "./xpathp.y"
+#line 1034 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].backstack)); }
break;
case 210:
-#line 1037 "./xpathp.y"
+#line 1035 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].backstack)); }
break;
case 213:
-#line 1046 "./xpathp.y"
+#line 1044 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (2)].backstack); dk_set_push (&((yyval.backstack)), (void *)(XQ_FOR)); }
break;
case 214:
-#line 1050 "./xpathp.y"
+#line 1048 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 215:
-#line 1051 "./xpathp.y"
+#line 1049 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (4)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(4) - (4)].tree)); }
break;
case 216:
-#line 1056 "./xpathp.y"
+#line 1054 "./xpathp.y"
{
(yyval.bookmark) = dk_alloc_box (sizeof (xp_lexbmk_t), DV_ARRAY_OF_LONG);
((yyval.bookmark))[0] = xpp_arg->xpp_curr_lexem_bmk;
@@ -4885,7 +4887,7 @@ yyreduce:
break;
case 217:
-#line 1061 "./xpathp.y"
+#line 1059 "./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)));
dk_free_box ((yyvsp[(3) - (4)].bookmark));
@@ -4893,132 +4895,132 @@ yyreduce:
break;
case 218:
-#line 1068 "./xpathp.y"
+#line 1066 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (2)].backstack); dk_set_push (&((yyval.backstack)), (void *)(XQ_LET)); }
break;
case 219:
-#line 1072 "./xpathp.y"
+#line 1070 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 220:
-#line 1073 "./xpathp.y"
+#line 1071 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (4)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(4) - (4)].tree)); }
break;
case 221:
-#line 1077 "./xpathp.y"
+#line 1075 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 3, XQ_ASSIGN, box_copy ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].tree)); }
break;
case 222:
-#line 1081 "./xpathp.y"
+#line 1079 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 223:
-#line 1082 "./xpathp.y"
+#line 1080 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 224:
-#line 1086 "./xpathp.y"
+#line 1084 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 225:
-#line 1087 "./xpathp.y"
+#line 1085 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (2)].backstack); dk_set_push (&((yyval.backstack)), (void *)((ptrlong)ORDER_BY_L)); }
break;
case 226:
-#line 1088 "./xpathp.y"
+#line 1086 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (2)].backstack); dk_set_push (&((yyval.backstack)), (void *)((ptrlong)STABLE_ORDER_BY_L)); }
break;
case 227:
-#line 1092 "./xpathp.y"
+#line 1090 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)); }
break;
case 228:
-#line 1093 "./xpathp.y"
+#line 1091 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].trees)); }
break;
case 229:
-#line 1097 "./xpathp.y"
+#line 1095 "./xpathp.y"
{ (yyval.trees) = (XT **) list (3, (yyvsp[(5) - (7)].tree), (yyvsp[(3) - (7)].box), (yyvsp[(7) - (7)].tree)); }
break;
case 230:
-#line 1098 "./xpathp.y"
+#line 1096 "./xpathp.y"
{ (yyval.trees) = (XT **) list (3, (yyvsp[(2) - (4)].tree), NULL, (yyvsp[(4) - (4)].tree)); }
break;
case 231:
-#line 1102 "./xpathp.y"
+#line 1100 "./xpathp.y"
{ (yyval.trees) = (XT **) list (3, NULL, (yyvsp[(3) - (5)].box), (yyvsp[(5) - (5)].tree)); }
break;
case 232:
-#line 1103 "./xpathp.y"
+#line 1101 "./xpathp.y"
{ (yyval.trees) = (XT **) list (3, NULL, NULL, (yyvsp[(3) - (3)].tree)); }
break;
case 233:
-#line 1107 "./xpathp.y"
+#line 1105 "./xpathp.y"
{ (yyval.token_type) = xpp_arg->xpp_xp_env->xe_validation_mode; }
break;
case 234:
-#line 1108 "./xpathp.y"
+#line 1106 "./xpathp.y"
{ (yyval.token_type) = XPP_VALIDATION_LAX; }
break;
case 235:
-#line 1109 "./xpathp.y"
+#line 1107 "./xpathp.y"
{ (yyval.token_type) = XPP_VALIDATION_STRICT; }
break;
case 236:
-#line 1110 "./xpathp.y"
+#line 1108 "./xpathp.y"
{ (yyval.token_type) = XPP_VALIDATION_SKIP; }
break;
case 239:
-#line 1120 "./xpathp.y"
+#line 1118 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), 0); }
break;
case 240:
-#line 1121 "./xpathp.y"
+#line 1119 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_SLASH_SLASH); }
break;
case 241:
-#line 1122 "./xpathp.y"
+#line 1120 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_DEREF); }
break;
case 242:
-#line 1123 "./xpathp.y"
+#line 1121 "./xpathp.y"
{ (yyval.tree) = xp_absolute (xpp_arg, (yyvsp[(2) - (2)].tree), XP_ABS_CHILD); }
break;
case 243:
-#line 1124 "./xpathp.y"
+#line 1122 "./xpathp.y"
{ (yyval.tree) = xp_absolute (xpp_arg, (yyvsp[(2) - (2)].tree), XP_ABS_SLASH_SLASH); }
break;
case 244:
-#line 1125 "./xpathp.y"
+#line 1123 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_ROOT, (XT*) XP_NODE, NULL); }
break;
case 245:
-#line 1127 "./xpathp.y"
+#line 1125 "./xpathp.y"
{
XT *src = (yyvsp[(1) - (3)].tree);
(yyval.tree) = xp_make_call (xpp_arg, "map", list (2, src, (yyvsp[(3) - (3)].tree)));
@@ -5026,7 +5028,7 @@ yyreduce:
break;
case 246:
-#line 1132 "./xpathp.y"
+#line 1130 "./xpathp.y"
{
XT *left = (yyvsp[(1) - (3)].tree);
XT *node_type = xp_make_seq_type (xpp_arg, NODE_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE);
@@ -5037,39 +5039,39 @@ yyreduce:
break;
case 247:
-#line 1143 "./xpathp.y"
+#line 1141 "./xpathp.y"
{
(yyval.tree) = xp_make_filters (xpp_arg, (yyvsp[(1) - (2)].tree), dk_set_nreverse ((yyvsp[(2) - (2)].backstack)));
}
break;
case 248:
-#line 1150 "./xpathp.y"
+#line 1148 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, NULL, (yyvsp[(1) - (1)].tree), XP_BY_MAIN_STEP); }
break;
case 249:
-#line 1151 "./xpathp.y"
+#line 1149 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, NULL, (yyvsp[(1) - (1)].tree), XP_BY_MAIN_STEP); }
break;
case 250:
-#line 1152 "./xpathp.y"
+#line 1150 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_BY_MAIN_STEP); }
break;
case 251:
-#line 1153 "./xpathp.y"
+#line 1151 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_SLASH_SLASH); }
break;
case 252:
-#line 1154 "./xpathp.y"
+#line 1152 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_DEREF); }
break;
case 255:
-#line 1164 "./xpathp.y"
+#line 1162 "./xpathp.y"
{
(yyval.tree) = xp_make_step (xpp_arg, (yyvsp[(1) - (3)].token_type), (yyvsp[(2) - (3)].tree),
((NULL == (yyvsp[(3) - (3)].backstack)) ? NULL :
@@ -5077,12 +5079,12 @@ yyreduce:
break;
case 256:
-#line 1169 "./xpathp.y"
+#line 1167 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_PARENT, (XT *)XP_NODE, NULL); }
break;
case 257:
-#line 1174 "./xpathp.y"
+#line 1172 "./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))));
/* $$ = xp_make_filters (xpp_arg, $1, dk_set_nreverse ($2)); */
@@ -5090,118 +5092,118 @@ yyreduce:
break;
case 258:
-#line 1182 "./xpathp.y"
+#line 1180 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 259:
-#line 1183 "./xpathp.y"
+#line 1181 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
case 260:
-#line 1187 "./xpathp.y"
+#line 1185 "./xpathp.y"
{ xp_pred_start (xpp_arg); }
break;
case 261:
-#line 1187 "./xpathp.y"
+#line 1185 "./xpathp.y"
{ (yyval.tree) = xp_make_pred (xpp_arg, (yyvsp[(3) - (4)].tree)); }
break;
case 263:
-#line 1192 "./xpathp.y"
- { yyerror ("Unknown axis name"); }
+#line 1190 "./xpathp.y"
+ { xpyyerror (xpp_arg, "Unknown axis name"); }
break;
case 264:
-#line 1200 "./xpathp.y"
+#line 1198 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 266:
-#line 1202 "./xpathp.y"
+#line 1200 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 267:
-#line 1203 "./xpathp.y"
+#line 1201 "./xpathp.y"
{ (yyval.tree) = xp_make_call (xpp_arg, "append", list(0)); }
break;
case 268:
-#line 1204 "./xpathp.y"
+#line 1202 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_SELF, (XT *) XP_NODE, NULL); }
break;
case 273:
-#line 1210 "./xpathp.y"
+#line 1208 "./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);
}
break;
case 274:
-#line 1213 "./xpathp.y"
+#line 1211 "./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 1217 "./xpathp.y"
+#line 1215 "./xpathp.y"
{ (yyval.token_type) = XPP_ORDERING_ORDERED; }
break;
case 276:
-#line 1218 "./xpathp.y"
+#line 1216 "./xpathp.y"
{ (yyval.token_type) = XPP_ORDERING_UNORDERED; }
break;
case 280:
-#line 1229 "./xpathp.y"
+#line 1227 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 281:
-#line 1230 "./xpathp.y"
+#line 1228 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 282:
-#line 1231 "./xpathp.y"
+#line 1229 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 283:
-#line 1235 "./xpathp.y"
+#line 1233 "./xpathp.y"
{ (yyval.tree) = (XT *) XP_ELT; }
break;
case 284:
-#line 1236 "./xpathp.y"
+#line 1234 "./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 1237 "./xpathp.y"
+#line 1235 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 4, XP_NAME_LOCAL, XP_STAR, box_copy ((yyvsp[(1) - (1)].box)), NULL); }
break;
case 286:
-#line 1242 "./xpathp.y"
+#line 1240 "./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))));
}
break;
case 287:
-#line 1246 "./xpathp.y"
+#line 1244 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (2)].box), list(0));
}
break;
case 288:
-#line 1250 "./xpathp.y"
+#line 1248 "./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))));
(yyval.tree) = xp_make_call (xpp_arg, "not", list(1, (yyval.tree)));
@@ -5209,7 +5211,7 @@ yyreduce:
break;
case 289:
-#line 1255 "./xpathp.y"
+#line 1253 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (2)].box), list(0));
(yyval.tree) = xp_make_call (xpp_arg, "not", list(1, (yyval.tree)));
@@ -5217,44 +5219,44 @@ yyreduce:
break;
case 290:
-#line 1262 "./xpathp.y"
+#line 1260 "./xpathp.y"
{ (yyval.tree) = xp_make_sqlcolumn_ref (xpp_arg, (yyvsp[(3) - (4)].box)); }
break;
case 291:
-#line 1263 "./xpathp.y"
- { yyerror ("')' expected after column name"); }
+#line 1261 "./xpathp.y"
+ { xpyyerror (xpp_arg, "')' expected after column name"); }
break;
case 292:
-#line 1264 "./xpathp.y"
- { yyerror ("Column name in sql:column must be a string constant"); }
+#line 1262 "./xpathp.y"
+ { xpyyerror (xpp_arg, "Column name in sql:column must be a string constant"); }
break;
case 293:
-#line 1265 "./xpathp.y"
- { yyerror ("'(' expected after sql:column"); }
+#line 1263 "./xpathp.y"
+ { xpyyerror (xpp_arg, "'(' expected after sql:column"); }
break;
case 294:
-#line 1269 "./xpathp.y"
+#line 1267 "./xpathp.y"
{ (yyval.tree) = xp_make_variable_ref (xpp_arg, (yyvsp[(2) - (2)].box)); }
break;
case 295:
-#line 1270 "./xpathp.y"
+#line 1268 "./xpathp.y"
{ (yyval.tree) = xp_make_variable_ref (xpp_arg, (yyvsp[(1) - (1)].box)); }
break;
case 300:
-#line 1287 "./xpathp.y"
+#line 1285 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "DOCUMENT computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
}
break;
case 301:
-#line 1291 "./xpathp.y"
+#line 1289 "./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));
(yyval.tree) = xp_make_call (xpp_arg, "ELEMENT computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
@@ -5262,7 +5264,7 @@ yyreduce:
break;
case 302:
-#line 1296 "./xpathp.y"
+#line 1294 "./xpathp.y"
{
dk_set_push (&((yyvsp[(5) - (6)].backstack)), (yyvsp[(2) - (6)].tree));
(yyval.tree) = xp_make_call (xpp_arg, "ELEMENT computed constructor", revlist_to_array ((yyvsp[(5) - (6)].backstack)));
@@ -5270,7 +5272,7 @@ yyreduce:
break;
case 303:
-#line 1301 "./xpathp.y"
+#line 1299 "./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));
(yyval.tree) = xp_make_call (xpp_arg, "ATTRIBUTE computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
@@ -5278,7 +5280,7 @@ yyreduce:
break;
case 304:
-#line 1306 "./xpathp.y"
+#line 1304 "./xpathp.y"
{
dk_set_push (&((yyvsp[(5) - (6)].backstack)), (yyvsp[(2) - (6)].tree));
(yyval.tree) = xp_make_call (xpp_arg, "ATTRIBUTE computed constructor", revlist_to_array ((yyvsp[(5) - (6)].backstack)));
@@ -5286,21 +5288,21 @@ yyreduce:
break;
case 305:
-#line 1311 "./xpathp.y"
+#line 1309 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "TEXT computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
}
break;
case 306:
-#line 1315 "./xpathp.y"
+#line 1313 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "COMMENT computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
}
break;
case 307:
-#line 1319 "./xpathp.y"
+#line 1317 "./xpathp.y"
{
dk_set_push (&((yyvsp[(2) - (3)].backstack)), xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (3)].box), 1));
(yyval.tree) = xp_make_call (xpp_arg, "PROCESSING-INSTRUCTION computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
@@ -5308,7 +5310,7 @@ yyreduce:
break;
case 308:
-#line 1324 "./xpathp.y"
+#line 1322 "./xpathp.y"
{
dk_set_push (&((yyvsp[(5) - (6)].backstack)), (yyvsp[(2) - (6)].tree));
(yyval.tree) = xp_make_call (xpp_arg, "PROCESSING-INSTRUCTION computed constructor", revlist_to_array ((yyvsp[(5) - (6)].backstack)));
@@ -5316,61 +5318,61 @@ yyreduce:
break;
case 309:
-#line 1331 "./xpathp.y"
+#line 1329 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 311:
-#line 1336 "./xpathp.y"
+#line 1334 "./xpathp.y"
{ (yyval.backstack) = NULL; if ((yyvsp[(1) - (1)].tree)) dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 312:
-#line 1337 "./xpathp.y"
+#line 1335 "./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 1342 "./xpathp.y"
+#line 1340 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 315:
-#line 1343 "./xpathp.y"
+#line 1341 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 316:
-#line 1344 "./xpathp.y"
+#line 1342 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 318:
-#line 1351 "./xpathp.y"
+#line 1349 "./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 1352 "./xpathp.y"
+#line 1350 "./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 1357 "./xpathp.y"
+#line 1355 "./xpathp.y"
{
(yyval.list) = xp_bookmark_namespaces (xpp_arg);
}
break;
case 321:
-#line 1360 "./xpathp.y"
+#line 1358 "./xpathp.y"
{
(yyval.box) = xpp_arg->xpp_xp_env->xe_dflt_elt_namespace;
}
break;
case 322:
-#line 1364 "./xpathp.y"
+#line 1362 "./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)));
xp_unregister_local_namespaces (xpp_arg, (yyvsp[(2) - (6)].list));
@@ -5379,114 +5381,114 @@ yyreduce:
break;
case 323:
-#line 1372 "./xpathp.y"
+#line 1370 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 324:
-#line 1373 "./xpathp.y"
+#line 1371 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
case 325:
-#line 1377 "./xpathp.y"
+#line 1375 "./xpathp.y"
{ /* no default action */; }
break;
case 326:
-#line 1378 "./xpathp.y"
+#line 1376 "./xpathp.y"
{ /*dk_free_box ($2)*/; }
break;
case 327:
-#line 1382 "./xpathp.y"
+#line 1380 "./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 1383 "./xpathp.y"
+#line 1381 "./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 1384 "./xpathp.y"
+#line 1382 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 330:
-#line 1388 "./xpathp.y"
+#line 1386 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 331:
-#line 1389 "./xpathp.y"
+#line 1387 "./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 1390 "./xpathp.y"
+#line 1388 "./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 1391 "./xpathp.y"
+#line 1389 "./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 1395 "./xpathp.y"
+#line 1393 "./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 1396 "./xpathp.y"
+#line 1394 "./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 1397 "./xpathp.y"
+#line 1395 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 340:
-#line 1408 "./xpathp.y"
+#line 1406 "./xpathp.y"
{ (yyval.list) = NULL; dk_set_push (&((yyval.list)), (yyvsp[(1) - (1)].tree)); }
break;
case 341:
-#line 1409 "./xpathp.y"
+#line 1407 "./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 1410 "./xpathp.y"
+#line 1408 "./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 1411 "./xpathp.y"
+#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 344:
-#line 1412 "./xpathp.y"
+#line 1410 "./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 1413 "./xpathp.y"
+#line 1411 "./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 1419 "./xpathp.y"
+#line 1417 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack);
PUSH_STRING_ARG_OF_CONCAT((yyval.backstack), (yyvsp[(2) - (2)].box));
}
break;
case 347:
-#line 1423 "./xpathp.y"
+#line 1421 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack);
PUSH_STRING_ARG_OF_CONCAT((yyval.backstack), (yyvsp[(2) - (3)].box));
(yyval.backstack) = dk_set_conc ((yyvsp[(3) - (3)].backstack), (yyval.backstack));
@@ -5494,14 +5496,14 @@ yyreduce:
break;
case 348:
-#line 1431 "./xpathp.y"
+#line 1429 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack);
PUSH_STRING_ARG_OF_CONCAT((yyval.backstack), (yyvsp[(2) - (2)].box));
}
break;
case 349:
-#line 1435 "./xpathp.y"
+#line 1433 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack);
PUSH_STRING_ARG_OF_CONCAT((yyval.backstack), (yyvsp[(2) - (3)].box));
(yyval.backstack) = dk_set_conc ((yyvsp[(3) - (3)].backstack), (yyval.backstack));
@@ -5509,42 +5511,42 @@ yyreduce:
break;
case 350:
-#line 1442 "./xpathp.y"
+#line 1440 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 351:
-#line 1443 "./xpathp.y"
+#line 1441 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
case 354:
-#line 1449 "./xpathp.y"
+#line 1447 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 355:
-#line 1450 "./xpathp.y"
+#line 1448 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 356:
-#line 1451 "./xpathp.y"
+#line 1449 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 357:
-#line 1452 "./xpathp.y"
+#line 1450 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(2) - (2)].box), 1); }
break;
case 358:
-#line 1514 "./xpathp.y"
+#line 1512 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 359:
-#line 1520 "./xpathp.y"
+#line 1518 "./xpathp.y"
{
/* if (1 == dk_set_length($1))
$$ = dk_set_pop (&($1));
@@ -5554,97 +5556,97 @@ yyreduce:
break;
case 360:
-#line 1529 "./xpathp.y"
+#line 1527 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 362:
-#line 1534 "./xpathp.y"
+#line 1532 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 363:
-#line 1535 "./xpathp.y"
+#line 1533 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
case 367:
-#line 1551 "./xpathp.y"
+#line 1549 "./xpathp.y"
{ ; }
break;
case 368:
-#line 1552 "./xpathp.y"
+#line 1550 "./xpathp.y"
{ ; }
break;
case 369:
-#line 1556 "./xpathp.y"
+#line 1554 "./xpathp.y"
{ ; }
break;
case 370:
-#line 1557 "./xpathp.y"
- { yyerror ("']' or option expected"); }
+#line 1555 "./xpathp.y"
+ { xpyyerror (xpp_arg, "']' or option expected"); }
break;
case 371:
-#line 1561 "./xpathp.y"
+#line 1559 "./xpathp.y"
{ ; }
break;
case 372:
-#line 1562 "./xpathp.y"
+#line 1560 "./xpathp.y"
{ ; }
break;
case 373:
-#line 1563 "./xpathp.y"
+#line 1561 "./xpathp.y"
{ ; }
break;
case 374:
-#line 1567 "./xpathp.y"
+#line 1565 "./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 1568 "./xpathp.y"
+#line 1566 "./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 1569 "./xpathp.y"
+#line 1567 "./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 1570 "./xpathp.y"
+#line 1568 "./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 1571 "./xpathp.y"
+#line 1569 "./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 1572 "./xpathp.y"
+#line 1570 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_is_quiet = 1; }
break;
case 380:
-#line 1573 "./xpathp.y"
+#line 1571 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_is_davprop = 1; }
break;
case 381:
-#line 1574 "./xpathp.y"
+#line 1572 "./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 1575 "./xpathp.y"
+#line 1573 "./xpathp.y"
{
#ifdef OLD_VXML_TABLES
xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_xp_env->xe_doc_spec = box_copy_tree ((yyvsp[(2) - (2)].box));
@@ -5655,7 +5657,7 @@ yyreduce:
break;
case 383:
-#line 1582 "./xpathp.y"
+#line 1580 "./xpathp.y"
{
xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS);
if (NULL != xpp_arg->xpp_xp_env->xe_view)
@@ -5667,38 +5669,38 @@ yyreduce:
break;
case 384:
-#line 1590 "./xpathp.y"
+#line 1588 "./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 1591 "./xpathp.y"
+#line 1589 "./xpathp.y"
{
xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS);
if (!strncmp ((yyvsp[(1) - (3)].box), "xmlns:", 6))
xp_register_namespace_prefix (xpp_arg, (yyvsp[(1) - (3)].box)+6, (yyvsp[(3) - (3)].box));
else
- xpyyerror("Only xmlns special namespace may be used in parameter name");
+ xpyyerror(xpp_arg, "Only xmlns special namespace may be used in parameter name");
}
break;
case 386:
-#line 1598 "./xpathp.y"
+#line 1596 "./xpathp.y"
{ XPP_PROLOG_SET (xe_dflt_elt_namespace, "default element namespace", (yyvsp[(3) - (3)].box)); }
break;
case 387:
-#line 1599 "./xpathp.y"
+#line 1597 "./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 1600 "./xpathp.y"
+#line 1598 "./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 1601 "./xpathp.y"
+#line 1599 "./xpathp.y"
{
dk_set_push (&(xpp_arg->xpp_dtd_config_tmp_set), box_dv_short_string ((yyvsp[(1) - (3)].box)));
dk_set_push (&(xpp_arg->xpp_dtd_config_tmp_set), box_dv_short_string ((yyvsp[(3) - (3)].box)));
@@ -5706,82 +5708,82 @@ yyreduce:
break;
case 391:
-#line 1610 "./xpathp.y"
+#line 1608 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_OR, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 392:
-#line 1611 "./xpathp.y"
+#line 1609 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_AND, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 393:
-#line 1612 "./xpathp.y"
+#line 1610 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree), NULL); }
break;
case 394:
-#line 1613 "./xpathp.y"
+#line 1611 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_EQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 395:
-#line 1614 "./xpathp.y"
+#line 1612 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_NEQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 396:
-#line 1615 "./xpathp.y"
+#line 1613 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 397:
-#line 1616 "./xpathp.y"
+#line 1614 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 398:
-#line 1617 "./xpathp.y"
+#line 1615 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_GT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 399:
-#line 1618 "./xpathp.y"
+#line 1616 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_GTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 400:
-#line 1619 "./xpathp.y"
+#line 1617 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LIKE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 401:
-#line 1620 "./xpathp.y"
+#line 1618 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MINUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 402:
-#line 1621 "./xpathp.y"
+#line 1619 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_PLUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 403:
-#line 1622 "./xpathp.y"
+#line 1620 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_TIMES, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 404:
-#line 1623 "./xpathp.y"
+#line 1621 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_DIV, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 405:
-#line 1624 "./xpathp.y"
+#line 1622 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MOD, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 406:
-#line 1626 "./xpathp.y"
+#line 1624 "./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),
xe_new_xqst (xpp_arg, XQST_REF), xe_new_xqst (xpp_arg, XQST_REF),
@@ -5789,254 +5791,254 @@ yyreduce:
break;
case 407:
-#line 1630 "./xpathp.y"
+#line 1628 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MINUS, box_num_nonull (0), (yyvsp[(2) - (2)].tree)); }
break;
case 410:
-#line 1638 "./xpathp.y"
+#line 1636 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_ROOT, (XT*) XP_NODE, NULL); }
break;
case 411:
-#line 1643 "./xpathp.y"
+#line 1641 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, NULL, (yyvsp[(1) - (1)].tree), XP_BY_MAIN_STEP); }
break;
case 412:
-#line 1644 "./xpathp.y"
+#line 1642 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_BY_MAIN_STEP); }
break;
case 413:
-#line 1645 "./xpathp.y"
+#line 1643 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_SLASH_SLASH); }
break;
case 414:
-#line 1650 "./xpathp.y"
+#line 1648 "./xpathp.y"
{ (yyval.tree) = xp_absolute (xpp_arg, (yyvsp[(2) - (2)].tree), XP_ABS_CHILD); }
break;
case 415:
-#line 1651 "./xpathp.y"
+#line 1649 "./xpathp.y"
{ (yyval.tree) = xp_absolute (xpp_arg, (yyvsp[(2) - (2)].tree), XP_ABS_SLASH_SLASH); }
break;
case 416:
-#line 1656 "./xpathp.y"
+#line 1654 "./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 1657 "./xpathp.y"
+#line 1655 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_CHILD, (yyvsp[(1) - (2)].tree), (yyvsp[(2) - (2)].trees)); }
break;
case 418:
-#line 1658 "./xpathp.y"
+#line 1656 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_SELF, (XT*) XP_NODE, (yyvsp[(2) - (2)].trees)); }
break;
case 419:
-#line 1659 "./xpathp.y"
+#line 1657 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_PARENT, (XT*) XP_NODE, (yyvsp[(2) - (2)].trees)); }
break;
case 421:
-#line 1665 "./xpathp.y"
+#line 1663 "./xpathp.y"
{ (yyval.token_type) = XP_ATTRIBUTE; }
break;
case 422:
-#line 1670 "./xpathp.y"
+#line 1668 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 423:
-#line 1671 "./xpathp.y"
+#line 1669 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, box_dv_uname_string ("not"), 0); }
break;
case 424:
-#line 1672 "./xpathp.y"
+#line 1670 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 425:
-#line 1673 "./xpathp.y"
+#line 1671 "./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 1674 "./xpathp.y"
+#line 1672 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 4, XP_NAME_LOCAL, XP_STAR, box_copy ((yyvsp[(1) - (1)].box)), NULL); }
break;
case 427:
-#line 1675 "./xpathp.y"
+#line 1673 "./xpathp.y"
{ (yyval.tree) = (XT *) XP_ELT; }
break;
case 428:
-#line 1676 "./xpathp.y"
+#line 1674 "./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 1677 "./xpathp.y"
+#line 1675 "./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 1678 "./xpathp.y"
+#line 1676 "./xpathp.y"
{ (yyval.tree) = (XT*) XP_PI; }
break;
case 431:
-#line 1679 "./xpathp.y"
+#line 1677 "./xpathp.y"
{ (yyval.tree) = (XT*) XP_COMMENT; }
break;
case 432:
-#line 1680 "./xpathp.y"
+#line 1678 "./xpathp.y"
{ (yyval.tree) = (XT*) XP_TEXT; }
break;
case 433:
-#line 1681 "./xpathp.y"
+#line 1679 "./xpathp.y"
{ (yyval.tree) = (XT*) XP_NODE; }
break;
case 434:
-#line 1682 "./xpathp.y"
+#line 1680 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 435:
-#line 1687 "./xpathp.y"
+#line 1685 "./xpathp.y"
{ (yyval.token_type) = XP_ANCESTOR; }
break;
case 436:
-#line 1688 "./xpathp.y"
+#line 1686 "./xpathp.y"
{ (yyval.token_type) = XP_ANCESTOR_OR_SELF; }
break;
case 437:
-#line 1689 "./xpathp.y"
+#line 1687 "./xpathp.y"
{ (yyval.token_type) = XP_ATTRIBUTE; }
break;
case 438:
-#line 1690 "./xpathp.y"
+#line 1688 "./xpathp.y"
{ (yyval.token_type) = XP_CHILD; }
break;
case 439:
-#line 1691 "./xpathp.y"
+#line 1689 "./xpathp.y"
{ (yyval.token_type) = XP_DESCENDANT; }
break;
case 440:
-#line 1692 "./xpathp.y"
+#line 1690 "./xpathp.y"
{ (yyval.token_type) = XP_DESCENDANT_OR_SELF; }
break;
case 441:
-#line 1693 "./xpathp.y"
+#line 1691 "./xpathp.y"
{ (yyval.token_type) = XP_FOLLOWING; }
break;
case 442:
-#line 1694 "./xpathp.y"
+#line 1692 "./xpathp.y"
{ (yyval.token_type) = XP_FOLLOWING_SIBLING; }
break;
case 443:
-#line 1695 "./xpathp.y"
- { (yyval.token_type) = XP_NAMESPACE; yyerror ("namespace axis not allowed"); }
+#line 1693 "./xpathp.y"
+ { (yyval.token_type) = XP_NAMESPACE; xpyyerror (xpp_arg, "namespace axis not allowed"); }
break;
case 444:
-#line 1696 "./xpathp.y"
+#line 1694 "./xpathp.y"
{ (yyval.token_type) = XP_PARENT; }
break;
case 445:
-#line 1697 "./xpathp.y"
+#line 1695 "./xpathp.y"
{ (yyval.token_type) = XP_PRECEDING; }
break;
case 446:
-#line 1698 "./xpathp.y"
+#line 1696 "./xpathp.y"
{ (yyval.token_type) = XP_PRECEDING_SIBLING; }
break;
case 447:
-#line 1699 "./xpathp.y"
+#line 1697 "./xpathp.y"
{ (yyval.token_type) = XP_SELF; }
break;
case 448:
-#line 1703 "./xpathp.y"
+#line 1701 "./xpathp.y"
{ (yyval.trees) = NULL; }
break;
case 449:
-#line 1704 "./xpathp.y"
+#line 1702 "./xpathp.y"
{ (yyval.trees) = (XT **) list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 450:
-#line 1708 "./xpathp.y"
+#line 1706 "./xpathp.y"
{ xp_pred_start (xpp_arg); }
break;
case 451:
-#line 1708 "./xpathp.y"
+#line 1706 "./xpathp.y"
{ (yyval.tree) = xp_make_pred (xpp_arg, (yyvsp[(3) - (4)].tree)); }
break;
case 452:
-#line 1712 "./xpathp.y"
+#line 1710 "./xpathp.y"
{ (yyval.list) = CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 453:
-#line 1713 "./xpathp.y"
+#line 1711 "./xpathp.y"
{ (yyval.list) = NCONC ((yyvsp[(1) - (2)].list), CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 454:
-#line 1718 "./xpathp.y"
+#line 1716 "./xpathp.y"
{ (yyval.tree) = xp_make_variable_ref(xpp_arg, (yyvsp[(2) - (2)].box)); }
break;
case 455:
-#line 1719 "./xpathp.y"
+#line 1717 "./xpathp.y"
{ (yyval.tree) = xp_make_variable_ref(xpp_arg, (yyvsp[(1) - (1)].box)); }
break;
case 457:
-#line 1725 "./xpathp.y"
+#line 1723 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 459:
-#line 1727 "./xpathp.y"
+#line 1725 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 460:
-#line 1733 "./xpathp.y"
+#line 1731 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (3)].box), list_to_array ((yyvsp[(2) - (3)].list)));
}
break;
case 461:
-#line 1737 "./xpathp.y"
+#line 1735 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (3)].box), list_to_array ((yyvsp[(2) - (3)].list)));
(yyval.tree) = xp_make_call (xpp_arg, "not", list(1, (yyval.tree)));
@@ -6044,109 +6046,109 @@ yyreduce:
break;
case 462:
-#line 1744 "./xpathp.y"
+#line 1742 "./xpathp.y"
{ (yyval.list) = NULL; }
break;
case 463:
-#line 1745 "./xpathp.y"
+#line 1743 "./xpathp.y"
{ (yyval.list) = CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 464:
-#line 1746 "./xpathp.y"
+#line 1744 "./xpathp.y"
{ (yyval.list) = NCONC ((yyvsp[(1) - (3)].list), CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 467:
-#line 1754 "./xpathp.y"
+#line 1752 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), 0); }
break;
case 468:
-#line 1755 "./xpathp.y"
+#line 1753 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_SLASH_SLASH); }
break;
case 470:
-#line 1761 "./xpathp.y"
+#line 1759 "./xpathp.y"
{ (yyval.tree) = xp_make_filter (xpp_arg, (yyvsp[(1) - (2)].tree), (yyvsp[(2) - (2)].tree)); }
break;
case 476:
-#line 1780 "./xpathp.y"
+#line 1778 "./xpathp.y"
{ (yyval.box) = xp_xml_view_name (xpp_arg, NULL, NULL, (yyvsp[(1) - (1)].box)); }
break;
case 477:
-#line 1782 "./xpathp.y"
+#line 1780 "./xpathp.y"
{ (yyval.box) = xp_xml_view_name (xpp_arg, NULL, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].box)); }
break;
case 478:
-#line 1784 "./xpathp.y"
+#line 1782 "./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 1786 "./xpathp.y"
+#line 1784 "./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 1791 "./xpathp.y"
+#line 1789 "./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 1792 "./xpathp.y"
+#line 1790 "./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 1793 "./xpathp.y"
+#line 1791 "./xpathp.y"
{ (yyval.fts) = xp_word_from_exact_string (xpp_arg, (yyvsp[(2) - (2)].box), xpp_arg->xpp_enc, 1); }
break;
case 483:
-#line 1794 "./xpathp.y"
+#line 1792 "./xpathp.y"
{TBIN_OP ((yyval.fts), BOP_AND, (yyvsp[(1) - (3)].fts), (yyvsp[(3) - (3)].fts)); }
break;
case 484:
-#line 1795 "./xpathp.y"
+#line 1793 "./xpathp.y"
{ TBIN_OP ((yyval.fts), XP_AND_NOT, (yyvsp[(1) - (4)].fts), (yyvsp[(4) - (4)].fts)); }
break;
case 485:
-#line 1796 "./xpathp.y"
+#line 1794 "./xpathp.y"
{ TBIN_OP ((yyval.fts), BOP_OR, (yyvsp[(1) - (3)].fts), (yyvsp[(3) - (3)].fts)); }
break;
case 486:
-#line 1797 "./xpathp.y"
+#line 1795 "./xpathp.y"
{ TBIN_OP ((yyval.fts), XP_NEAR, (yyvsp[(1) - (3)].fts), (yyvsp[(3) - (3)].fts)); }
break;
case 487:
-#line 1798 "./xpathp.y"
+#line 1796 "./xpathp.y"
{ (yyval.fts) = (yyvsp[(2) - (3)].fts); }
break;
case 488:
-#line 1799 "./xpathp.y"
+#line 1797 "./xpathp.y"
{ (yyval.fts) = (yyvsp[(4) - (5)].fts); }
break;
case 489:
-#line 1800 "./xpathp.y"
- { yyerror ("']' or option expected"); }
+#line 1798 "./xpathp.y"
+ { xpyyerror (xpp_arg, "']' or option expected"); }
break;
/* Line 1267 of yacc.c. */
-#line 6150 "xpathp.c"
+#line 6152 "xpathp.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -6182,7 +6184,7 @@ yyerrlab:
{
++yynerrs;
#if ! YYERROR_VERBOSE
- yyerror (YY_("syntax error"));
+ yyerror (xpp_arg, YY_("syntax error"));
#else
{
YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
@@ -6206,11 +6208,11 @@ yyerrlab:
if (0 < yysize && yysize <= yymsg_alloc)
{
(void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
+ yyerror (xpp_arg, yymsg);
}
else
{
- yyerror (YY_("syntax error"));
+ yyerror (xpp_arg, YY_("syntax error"));
if (yysize != 0)
goto yyexhaustedlab;
}
@@ -6234,7 +6236,7 @@ yyerrlab:
else
{
yydestruct ("Error: discarding",
- yytoken, &yylval);
+ yytoken, &yylval, xpp_arg);
yychar = YYEMPTY;
}
}
@@ -6290,7 +6292,7 @@ yyerrlab1:
yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
+ yystos[yystate], yyvsp, xpp_arg);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -6328,7 +6330,7 @@ yyabortlab:
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
yyexhaustedlab:
- yyerror (YY_("memory exhausted"));
+ yyerror (xpp_arg, YY_("memory exhausted"));
yyresult = 2;
/* Fall through. */
#endif
@@ -6336,7 +6338,7 @@ yyexhaustedlab:
yyreturn:
if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
+ yytoken, &yylval, xpp_arg);
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -6344,7 +6346,7 @@ yyreturn:
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[*yyssp], yyvsp, xpp_arg);
YYPOPSTACK (1);
}
#ifndef yyoverflow
diff --git a/libsrc/Wi/xpathp.h b/libsrc/Wi/xpathp.h
index aca5c15..053fe69 100644
--- a/libsrc/Wi/xpathp.h
+++ b/libsrc/Wi/xpathp.h
@@ -510,7 +510,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 99 "./xpathp.y"
+#line 97 "./xpathp.y"
{
caddr_t box;
ptrlong token_type;
@@ -522,7 +522,7 @@ typedef union YYSTYPE
xp_lexbmk_t *bookmark;
void *nothing;
}
-/* Line 1489 of yacc.c. */
+/* Line 1529 of yacc.c. */
#line 527 "xpathp.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/libsrc/Wi/xpathp.y b/libsrc/Wi/xpathp.y
index bba18cc..1f9de60 100644
--- a/libsrc/Wi/xpathp.y
+++ b/libsrc/Wi/xpathp.y
@@ -1,14 +1,14 @@
/*
* xpathp.y
*
- * $Id: xpathp.y,v 1.9.2.2 2009/04/24 16:02:09 source Exp $
+ * $Id$
*
* SQL Parser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -26,11 +26,11 @@
*/
%pure_parser
+%parse-param {xpp_t * xpp_arg}
+%lex-param {xpp_t * xpp_arg}
%{
-#define YYPARSE_PARAM xpp_as_void
-#define YYLEX_PARAM YYPARSE_PARAM
#include "libutil.h"
#include "sqlnode.h"
#include "xpathp_impl.h"
@@ -38,12 +38,10 @@
#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))
+#define xpyyerror(xpp_arg, strg) xpyyerror_impl_1(xpp_arg, NULL, yystate, yyssa, yyssp, (strg))
#else
-#define xpyyerror(strg) xpyyerror_impl(xpp_arg, NULL, (strg))
+#define xpyyerror(xpp_arg, strg) xpyyerror_impl(xpp_arg, NULL, (strg))
#endif
#ifdef XPYYDEBUG
@@ -89,7 +87,7 @@ int xpyylex_from_xpp_bufs (caddr_t *yylval, xpp_t *xpp)
#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); \
+ xpyyerror (xpp_arg, "The prolog contains more than one declaration of " name); \
xpp_arg->xpp_xp_env->field = val; \
} while (0)
@@ -527,11 +525,11 @@ sql
top_xp { xpp_arg->xpp_expr = $$ = $3; }
| START_OF_FT_TEXT { xpp_arg->xpp_allowed_options = XP_FREETEXT_OPTS; } top_ft { xpp_arg->xpp_expr = $$ = $3; }
| __PUNCT_BEGIN __PUNCT_END __NONPUNCT_START __NONPUNCT_END EXEC_SQL_XPATH { $$ = NULL; /* This never happens and it's here solely to remove warnings */ }
- | error { yyerror ("(internal SQL processing error) XQuery, XPath or Free-Text mark expected"); }
+ | error { xpyyerror (xpp_arg, "(internal SQL processing error) XQuery, XPath or Free-Text mark expected"); }
;
top_xq /* XQ2003[30] Module, XQ2003[31] MainModule, XQ2003[32] LibraryModule */
- : END_OF_XPSCN_TEXT { yyerror ("The XQuery expression is totally empty"); }
+ : END_OF_XPSCN_TEXT { xpyyerror (xpp_arg, "The XQuery expression is totally empty"); }
| xq_version_decl_opt xq_prolog xq_expr END_OF_XPSCN_TEXT
{
$$ = xp_make_module (xpp_arg, NULL, NULL, $3);
@@ -576,13 +574,13 @@ xq_prolog
xq_prolog_setters_opt
: /* empty */
| xq_prolog_setters_opt xq_prolog_setter ';'
- | xq_prolog_setters_opt xq_prolog_setter error { yyerror ("Missing semicolon after prolog (setter) declaration"); }
+ | xq_prolog_setters_opt xq_prolog_setter error { xpyyerror (xpp_arg, "Missing semicolon after prolog (setter) declaration"); }
;
xq_prolog_decls_opt
: /* empty */
| xq_prolog_decls_opt xq_prolog_decl
- | xq_prolog_decls_opt xq_prolog_decl xq_prolog_setter { yyerror ("Prolog setter declaration can not appear after a non-setter declaration"); }
+ | xq_prolog_decls_opt xq_prolog_decl xq_prolog_setter { xpyyerror (xpp_arg, "Prolog setter declaration can not appear after a non-setter declaration"); }
;
xq_prolog_setter
@@ -834,7 +832,7 @@ xq_query_or_dml_stmts
else
$$ = xp_make_call (xpp_arg, "progn", list_to_array (dk_set_nreverse ($1)));
}* /
- | error { yyerror ("A Query or Data Manipulation Statement expected"); }
+ | error { xpyyerror (xpp_arg, "A Query or Data Manipulation Statement expected"); }
;
xq_query
@@ -860,67 +858,67 @@ xq_expr_single
{
$$ = xp_make_call (xpp_arg, "or", list (2, $1, $3));
}
- | xq_expr_single K_OR error { yyerror ("operand expected after 'OR'"); }
+ | xq_expr_single K_OR error { xpyyerror (xpp_arg, "operand expected after 'OR'"); }
| xq_expr_single K_AND xq_expr_single %prec K_AND
{
$$ = xp_make_call (xpp_arg, "and", list (2, $1, $3));
}
- | xq_expr_single K_AND error { yyerror ("operand expected after 'AND'"); }
+ | xq_expr_single K_AND error { xpyyerror (xpp_arg, "operand expected after 'AND'"); }
| K_NOT xq_expr_single %prec K_NOT
{
$$ = xp_make_call (xpp_arg, "not", list (1, $2));
}
- | K_NOT error %prec K_NOT { yyerror ("operand expected after 'NOT'"); }
+ | K_NOT error %prec K_NOT { xpyyerror (xpp_arg, "operand expected after 'NOT'"); }
| xq_expr_single K2_EQ_L xq_expr_single
{
$$ = xp_make_call (xpp_arg, "EQ operator", list (2, $1, $3));
}
- | xq_expr_single K2_EQ_L error { yyerror ("operand expected after 'eq'"); }
+ | xq_expr_single K2_EQ_L error { xpyyerror (xpp_arg, "operand expected after 'eq'"); }
| xq_expr_single K2_GE_L xq_expr_single
{
$$ = xp_make_call (xpp_arg, box_dv_uname_string("GE operator"), list (2, $1, $3));
}
- | xq_expr_single K2_GE_L error { yyerror ("operand expected after 'ge'"); }
+ | xq_expr_single K2_GE_L error { xpyyerror (xpp_arg, "operand expected after 'ge'"); }
| xq_expr_single K2_GT_L xq_expr_single
{
$$ = xp_make_call (xpp_arg, "GT operator", list (2, $1, $3));
}
- | xq_expr_single K2_GT_L error { yyerror ("operand expected after 'gt'"); }
+ | xq_expr_single K2_GT_L error { xpyyerror (xpp_arg, "operand expected after 'gt'"); }
| xq_expr_single K2_LE_L xq_expr_single
{
$$ = xp_make_call (xpp_arg, "LE operator", list (2, $1, $3));
}
- | xq_expr_single K2_LE_L error { yyerror ("operand expected after 'le'"); }
+ | xq_expr_single K2_LE_L error { xpyyerror (xpp_arg, "operand expected after 'le'"); }
| xq_expr_single K2_LT_L xq_expr_single
{
$$ = xp_make_call (xpp_arg, "LT operator", list (2, $1, $3));
}
- | xq_expr_single K2_LT_L error { yyerror ("operand expected after 'lt'"); }
+ | xq_expr_single K2_LT_L error { xpyyerror (xpp_arg, "operand expected after 'lt'"); }
| xq_expr_single K2_NE_L xq_expr_single
{
$$ = xp_make_call (xpp_arg, "NE operator", list (2, $1, $3));
}
- | xq_expr_single K2_NE_L error { yyerror ("operand expected after 'ne'"); }
+ | xq_expr_single K2_NE_L error { xpyyerror (xpp_arg, "operand expected after 'ne'"); }
| xq_expr_single _LT_LT xq_expr_single
{
$$ = xp_make_call (xpp_arg, "BEFORE operator", list (2, $1, $3));
}
- | xq_expr_single _LT_LT error { yyerror ("operand expected after '<<'"); }
+ | xq_expr_single _LT_LT error { xpyyerror (xpp_arg, "operand expected after '<<'"); }
| xq_expr_single BEFORE_L xq_expr_single
{
$$ = xp_make_call (xpp_arg, "BEFORE operator", list (2, $1, $3));
}
- | xq_expr_single BEFORE_L error { yyerror ("operand expected after 'before'"); }
+ | xq_expr_single BEFORE_L error { xpyyerror (xpp_arg, "operand expected after 'before'"); }
| xq_expr_single _GT_GT xq_expr_single
{
$$ = xp_make_call (xpp_arg, "AFTER operator", list (2, $1, $3));
}
- | xq_expr_single _GT_GT error { yyerror ("operand expected after '>>'"); }
+ | xq_expr_single _GT_GT error { xpyyerror (xpp_arg, "operand expected after '>>'"); }
| xq_expr_single AFTER_L xq_expr_single
{
$$ = xp_make_call (xpp_arg, "AFTER operator", list (2, $1, $3));
}
- | xq_expr_single AFTER_L error { yyerror ("operand expected after 'after'"); }
+ | xq_expr_single AFTER_L error { xpyyerror (xpp_arg, "operand expected after 'after'"); }
| xq_expr_flwr_forlets xq_expr_flwr_where_opt xq_expr_flwr_order_opt RETURN_L xq_expr_single
{ $$ = xp_make_flwr (xpp_arg, $1, $2, $3, $5); }
| IF_LPAR_L xq_expr ')' THEN_L xq_expr_single ELSE_L xq_expr_single
@@ -964,7 +962,7 @@ xq_expr_single
{
$$ = xp_make_call (xpp_arg, "IDIV operator", list (2, $1, $3));
}
- | xq_expr_single K_IDIV error { yyerror ("operand expected after 'idiv'"); }
+ | xq_expr_single K_IDIV error { xpyyerror (xpp_arg, "operand expected after 'idiv'"); }
| xq_expr_single K_DIV xq_expr_single { XBIN_OP ($$, BOP_DIV, $1, $3); }
| xq_expr_single K_MOD xq_expr_single { XBIN_OP ($$, BOP_MOD, $1, $3); }
| _PLUS xq_expr_single %prec UPLUS { $$ = $2; }
@@ -990,7 +988,7 @@ xq_expr_single
xq_expr_sortby
: SORTBY_LPAR_L xq_expr_sort_specs ')' { $$ = $2; }
- | SORTBY_LPAR_L xq_expr_sort_specs error { yyerror ("')' or ',' expected"); }
+ | SORTBY_LPAR_L xq_expr_sort_specs error { xpyyerror (xpp_arg, "')' or ',' expected"); }
;
xq_expr_sort_specs /* XQ[8] */
@@ -1189,7 +1187,7 @@ xq_path_step_qualif
xq_path_axis /* Like XQ[37] */
: axis_spec
- | XQNCNAME _COLON_COLON { yyerror ("Unknown axis name"); }
+ | XQNCNAME _COLON_COLON { xpyyerror (xpp_arg, "Unknown axis name"); }
;
/* XQ path expressions -- end */
@@ -1260,9 +1258,9 @@ xq_expr_funcall /* Like XQ[49] */
xq_expr_syscall /* Virtuoso extension, like Yukon */
: SQL_COLON_COLUMN '(' xq_strg ')' { $$ = xp_make_sqlcolumn_ref (xpp_arg, $3); }
- | SQL_COLON_COLUMN '(' xq_strg error { yyerror ("')' expected after column name"); }
- | SQL_COLON_COLUMN '(' error { yyerror ("Column name in sql:column must be a string constant"); }
- | SQL_COLON_COLUMN error { yyerror ("'(' expected after sql:column"); }
+ | SQL_COLON_COLUMN '(' xq_strg error { xpyyerror (xpp_arg, "')' expected after column name"); }
+ | SQL_COLON_COLUMN '(' error { xpyyerror (xpp_arg, "Column name in sql:column must be a string constant"); }
+ | SQL_COLON_COLUMN error { xpyyerror (xpp_arg, "'(' expected after sql:column"); }
;
xq_expr_variable
@@ -1472,39 +1470,39 @@ xq_sdml_stmt
: xq_sdml_stmt_insert xq_sdml_locator xq_expr { $$ = xtlist (xpp_arg, 3, XQ_INSERT, $1, $2, $3); }
| xq_sdml_stmt_move xq_sdml_locator xq_expr { $$ = xtlist (xpp_arg, 3, XQ_MOVE, $1, $2, $3); }
| UPSERT xq_expr xq_sdml_stmt_with xq_sdml_locator xq_expr { $$ = xtlist (xpp_arg, 3, XQ_UPSERT, $2, $3, $4, $5); }
- | UPSERT error { yyerror ("error in UPSERT DML statement"); }
+ | UPSERT error { xpyyerror (xpp_arg, "error in UPSERT DML statement"); }
| DELETE_L xq_expr { $$ = xtlist (xpp_arg, 2, XQ_DELETE, $2); }
- | DELETE_L error { yyerror ("error in DELETE DML statement"); }
+ | DELETE_L error { xpyyerror (xpp_arg, "error in DELETE DML statement"); }
| xq_sdml_stmt_rename TO_L xq_expr { $$ = xtlist (xpp_arg, 3, XQ_RENAME, $1, $3); }
| REPLACE xq_expr xq_sdml_stmt_with { $$ = xtlist (xpp_arg, 3, XQ_REPLACE, $2, $3); }
- | REPLACE error { yyerror ("error in REPLACE DML statement"); }
+ | REPLACE error { xpyyerror (xpp_arg, "error in REPLACE DML statement"); }
;
xq_sdml_stmt_insert
: INSERT xq_expr %prec INSERT { $$ = $2; }
- | INSERT error { yyerror ("error in INSERT DML statement"); }
+ | INSERT error { xpyyerror (xpp_arg, "error in INSERT DML statement"); }
;
xq_sdml_stmt_move
: MOVE xq_expr %prec MOVE { $$ = $2; }
- | MOVE error { yyerror ("error in MOVE DML statement"); }
+ | MOVE error { xpyyerror (xpp_arg, "error in MOVE DML statement"); }
;
xq_sdml_stmt_rename
: RENAME xq_expr %prec RENAME { $$ = $2; }
- | RENAME error { yyerror ("error in RENAME DML statement"); }
+ | RENAME error { xpyyerror (xpp_arg, "error in RENAME DML statement"); }
;
xq_sdml_stmt_with
: WITH xq_expr %prec RENAME { $$ = $2; }
- | WITH error { yyerror ("expression expected after WITH in DML statement"); }
+ | WITH error { xpyyerror (xpp_arg, "expression expected after WITH in DML statement"); }
;
xq_sdml_locator
: INTO { $$ = INTO; }
| AFTER { $$ = AFTER; }
| BEFORE { $$ = BEFORE; }
- | error { yyerror ("INTO, AFTER or BEFORE (i.e., a \"DML locator\") expected"); }
+ | error { xpyyerror (xpp_arg, "INTO, AFTER or BEFORE (i.e., a \"DML locator\") expected"); }
;
*/
@@ -1554,7 +1552,7 @@ xp_options_seq_opt
xp_options_seq
: '[' xp_options ']' { ; }
- | '[' xp_options error { yyerror ("']' or option expected"); }
+ | '[' xp_options error { xpyyerror (xpp_arg, "']' or option expected"); }
;
xp_options
@@ -1593,7 +1591,7 @@ xp_option
if (!strncmp ($1, "xmlns:", 6))
xp_register_namespace_prefix (xpp_arg, $1+6, $3);
else
- xpyyerror("Only xmlns special namespace may be used in parameter name");
+ xpyyerror(xpp_arg, "Only xmlns special namespace may be used in parameter name");
}
| XMLNS _EQ literal_strg { XPP_PROLOG_SET (xe_dflt_elt_namespace, "default element namespace", $3); }
| O_LANG literal_strg { xp_reject_option_if_not_allowed (xpp_arg, XP_FREETEXT_OPTS); xpp_arg->xpp_lang = lh_get_handler ($2); }
@@ -1692,7 +1690,7 @@ axis_name
| A_DESCENDANT_OR_SELF { $$ = XP_DESCENDANT_OR_SELF; }
| A_FOLLOWING { $$ = XP_FOLLOWING; }
| A_FOLLOWING_SIBLING { $$ = XP_FOLLOWING_SIBLING; }
- | A_NAMESPACE { $$ = XP_NAMESPACE; yyerror ("namespace axis not allowed"); }
+ | A_NAMESPACE { $$ = XP_NAMESPACE; xpyyerror (xpp_arg, "namespace axis not allowed"); }
| A_PARENT { $$ = XP_PARENT; }
| A_PRECEDING { $$ = XP_PRECEDING; }
| A_PRECEDING_SIBLING { $$ = XP_PRECEDING_SIBLING; }
@@ -1797,5 +1795,5 @@ text_exp
| text_exp K_NEAR text_exp { TBIN_OP ($$, XP_NEAR, $1, $3); }
| '(' text_exp ')' { $$ = $2; }
| _LPAR_LSQBRA xp_options ']' text_exp ')' { $$ = $4; }
- | _LPAR_LSQBRA xp_options error { yyerror ("']' or option expected"); }
+ | _LPAR_LSQBRA xp_options error { xpyyerror (xpp_arg, "']' or option expected"); }
;
diff --git a/libsrc/Wi/xpathp_impl.h b/libsrc/Wi/xpathp_impl.h
index 71784bc..9cb74e3 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.1 2009/04/18 21:55:18 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xpf.c b/libsrc/Wi/xpf.c
index 42df108..657c55d 100644
--- a/libsrc/Wi/xpf.c
+++ b/libsrc/Wi/xpf.c
@@ -1,12 +1,12 @@
/*
* xpf.c
*
- * $Id: xpf.c,v 1.11.2.5 2011/07/29 10:04:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -2527,29 +2527,43 @@ void
xpf_lang (xp_instance_t * xqi, XT * tree, xml_entity_t * ctx_xe)
{
caddr_t lang = xpf_arg (xqi, tree, ctx_xe, DV_C_STRING, 0);
- xml_entity_t *xe = ctx_xe->_->xe_copy (ctx_xe);
+ ptrlong res = 0;
caddr_t lang_in_effect = NULL;
- ptrlong res;
- XT *test = xtlist (NULL, 4, XP_NAME_EXACT, uname_xml, uname_lang, uname_xml_colon_lang);
- while (!lang_in_effect)
+ switch (DV_TYPE_OF (ctx_xe))
{
- if (XI_NO_ATTRIBUTE == xe->_->xe_attribute (xe, -1, test, &lang_in_effect, NULL))
- if (XI_AT_END == xe->_->xe_up (xe, (XT *) XP_NODE, 0 /* no XE_UP_MAY_TRANSIT! */))
- break;
+ case DV_XML_ENTITY:
+ {
+ xml_entity_t *xe = ctx_xe->_->xe_copy (ctx_xe);
+ XT *test = xtlist (NULL, 4, XP_NAME_EXACT, uname_xml, uname_lang, uname_xml_colon_lang);
+ while (!lang_in_effect)
+ {
+ if (XI_NO_ATTRIBUTE == xe->_->xe_attribute (xe, -1, test, &lang_in_effect, NULL))
+ if (XI_AT_END == xe->_->xe_up (xe, (XT *) XP_NODE, 0 /* no XE_UP_MAY_TRANSIT! */))
+ break;
+ }
+ dk_free_tree ((box_t) xe);
+ dk_free_tree ((box_t) test);
+ break;
+ }
+ case DV_RDF:
+ {
+ rdf_box_t *rb = (rdf_box_t *)ctx_xe;
+ if (!rb->rb_is_complete)
+ rb_complete (rb, xqi->xqi_qi->qi_trx, xqi->xqi_qi);
+ if (RDF_BOX_DEFAULT_LANG != rb->rb_lang)
+ lang_in_effect = rdf_lang_twobyte_to_string (rb->rb_lang);
+ break;
+ }
}
- dk_free_tree ((box_t) xe);
if (DV_STRINGP (lang_in_effect))
{
char *minus = strchr (lang_in_effect, '-');
if (minus)
- res = 0 == strnicmp (lang, lang_in_effect, lang_in_effect - minus);
+ res = (0 == strnicmp (lang, lang_in_effect, lang_in_effect - minus)) ? 1 : 0;
else
- res = 0 == stricmp (lang, lang_in_effect);
+ res = (0 == stricmp (lang, lang_in_effect)) ? 1 : 0;
}
- else
- res = 0;
dk_free_tree (lang_in_effect);
- dk_free_tree ((box_t) test);
XQI_SET (xqi, tree->_.xp_func.res, (caddr_t) res);
}
@@ -4575,7 +4589,7 @@ xpf_extension (xp_instance_t * xqi, XT * tree, xml_entity_t * ctx_xe)
{
caddr_t retc = (((caddr_t *)lc->lc_proc_ret)[1]);
caddr_t ent;
-#ifdef DEBUG
+#ifdef XPATH_DEBUG
dk_check_tree (retc);
#endif
switch (DV_TYPE_OF(retc))
@@ -4606,7 +4620,7 @@ err_end:
#if defined (NO_XPF_EXT_CALL_CACHE)
qr_free (qr);
#endif
-#ifdef DEBUG
+#ifdef XPATH_DEBUG
dk_check_tree (XQI_GET (xqi, tree->_.xp_func.var->_.var.init));
#endif
if (err)
diff --git a/libsrc/Wi/xpf.h b/libsrc/Wi/xpf.h
index 8f3b6d6..c5b85b3 100644
--- a/libsrc/Wi/xpf.h
+++ b/libsrc/Wi/xpf.h
@@ -1,12 +1,12 @@
/*
* xpf.h
*
- * $Id: xpf.h,v 1.2.2.2 2011/07/19 23:38:35 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xpscn.c b/libsrc/Wi/xpscn.c
index 2f012f0..18cf883 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.1 2009/04/18 21:55:18 source Exp $
+ * $Id$
*
* XQuery scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -3634,7 +3634,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t 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 2c70488..df84915 100644
--- a/libsrc/Wi/xpscn.l
+++ b/libsrc/Wi/xpscn.l
@@ -1,14 +1,14 @@
/*
* xpscn.l
*
- * $Id: xpscn.l,v 1.8.2.1 2009/04/18 21:55:18 source Exp $
+ * $Id$
*
* XQuery scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xqf.c b/libsrc/Wi/xqf.c
index c484a67..75b2011 100644
--- a/libsrc/Wi/xqf.c
+++ b/libsrc/Wi/xqf.c
@@ -1,12 +1,12 @@
/*
* xqf.c
*
- * $Id: xqf.c,v 1.21.2.13 2011/09/21 13:27:32 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -3378,11 +3378,11 @@ static xqf_str_parser_desc_t xqf_str_parser_descs[] = {
{ "double" , __float_from_string , NULL , XQ_DOUBLE , 0 , 0 , DV_DOUBLE_FLOAT, "__xqf_str_parse_double" , "DOUBLE PRECISION" },
{ "duration" , __duration_from_string , NULL /*???*/ , 0 , 0 , 1 , 0 , "__xqf_str_parse_datetime" , NULL },
{ "float" , __float_from_string , NULL , XQ_FLOAT , 0 , 0 , DV_SINGLE_FLOAT, "__xqf_str_parse_float" , "REAL" },
- { "gDay" , __datetime_from_string , __datetime_rcheck , XQ_DAY , 0 , 1 , 0 , "__xqf_str_parse_datetime" , NULL },
- { "gMonth" , __datetime_from_string , __datetime_rcheck , XQ_MONTH , 0 , 1 , 0 , "__xqf_str_parse_datetime" , NULL },
- { "gMonthDay" , __datetime_from_string , __datetime_rcheck , XQ_MONTHDAY , 0 , 1 , 0 , "__xqf_str_parse_datetime" , NULL },
- { "gYear" , __datetime_from_string , __datetime_rcheck , XQ_YEAR , 0 , 1 , 0 , "__xqf_str_parse_datetime" , NULL },
- { "gYearMonth" , __datetime_from_string , __datetime_rcheck , XQ_YEARMONTH , 0 , 1 , 0 , "__xqf_str_parse_datetime" , NULL },
+ { "gDay" , __datetime_from_string , __datetime_rcheck , XQ_DAY , 0 , 1 , DV_DATETIME , "__xqf_str_parse_datetime" , NULL },
+ { "gMonth" , __datetime_from_string , __datetime_rcheck , XQ_MONTH , 0 , 1 , DV_DATETIME , "__xqf_str_parse_datetime" , NULL },
+ { "gMonthDay" , __datetime_from_string , __datetime_rcheck , XQ_MONTHDAY , 0 , 1 , DV_DATETIME , "__xqf_str_parse_datetime" , NULL },
+ { "gYear" , __datetime_from_string , __datetime_rcheck , XQ_YEAR , 0 , 1 , DV_DATETIME , "__xqf_str_parse_datetime" , NULL },
+ { "gYearMonth" , __datetime_from_string , __datetime_rcheck , XQ_YEARMONTH , 0 , 1 , DV_DATETIME , "__xqf_str_parse_datetime" , NULL },
{ "int" , __integer_from_string , __integer_rcheck , XQ_INT32 , 0 , 1 , DV_LONG_INT , "__xqf_str_parse_integer" , NULL },
{ "integer" , __integer_from_string , __integer_rcheck , XQ_INT , 0 , 0 , DV_LONG_INT , "__xqf_str_parse_integer" , "INTEGER" },
{ "long" , __integer_from_string , __integer_rcheck , XQ_INT64 , 0 , 1 , DV_LONG_INT , "__xqf_str_parse_integer" , "INTEGER" },
@@ -3528,7 +3528,11 @@ 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 = 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;
+
+ 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);
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 cb80aad..f1e272b 100644
--- a/libsrc/Wi/xqf.h
+++ b/libsrc/Wi/xqf.h
@@ -1,12 +1,12 @@
/*
* xqf.h
*
- * $Id: xqf.h,v 1.4.2.3 2011/03/03 11:56:45 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xslt.c b/libsrc/Wi/xslt.c
index 84ee3a6..8a30fe3 100644
--- a/libsrc/Wi/xslt.c
+++ b/libsrc/Wi/xslt.c
@@ -1,14 +1,14 @@
/*
* xslt.c
*
- * $Id: xslt.c,v 1.32.2.27 2011/10/13 12:54:56 source Exp $
+ * $Id$
*
* XSLT
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -1242,6 +1242,7 @@ void
xslt_pop_params (xparse_ctx_t * xp, xqi_binding_t *old_locals)
{
xqi_binding_t * xb = xp->xp_locals;
+#ifdef XPATH_DEBUG
#ifdef MALLOC_DEBUG
{
xqi_binding_t * xb1 = xp->xp_locals;
@@ -1267,6 +1268,7 @@ xslt_pop_params (xparse_ctx_t * xp, xqi_binding_t *old_locals)
GPF_T1 ("Failed xslt_pop_params()");
}
#endif
+#endif
while (xb != old_locals)
{
xqi_binding_t * next = xb->xb_next;
@@ -4508,8 +4510,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 = NULL;
- dtp_t key_dtp = 0;
+ caddr_t key;
+ dtp_t key_dtp;
if (DV_ARRAY_OF_POINTER != DV_TYPE_OF(row))
{
dk_free ((void *)src, group_count * sizeof (dsort_itm_t));
@@ -4524,7 +4526,17 @@ 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)
+ 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
{
dk_free ((void *)src, group_count * sizeof (dsort_itm_t));
if (1 == block_elts)
@@ -4537,9 +4549,8 @@ 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)
@@ -4667,6 +4678,13 @@ 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);
@@ -4682,6 +4700,135 @@ 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;
+#if 0
+ vector_sort_t specs;
+ 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)
{
@@ -4939,6 +5086,8 @@ 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 8c344b4..ba131c4 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.2 2010/09/17 11:18:20 source Exp $
+ * $Id$
*
* XSLT formatting routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xslt_impl.h b/libsrc/Wi/xslt_impl.h
index 6f5c8f5..851a0b0 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.5 2010/09/17 22:49:26 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2009 OpenLink Software
+ * 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
diff --git a/libsrc/Wi/xslt_opt.c b/libsrc/Wi/xslt_opt.c
index 7b94fea..2746cd5 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.6 2011/01/18 10:32:06 source Exp $
+ * $Id$
*
* XSLT translator
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/Makefile.am b/libsrc/Xml.new/Makefile.am
index 2100742..90b60ee 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/Xml.new/Makefile.in b/libsrc/Xml.new/Makefile.in
index 7895735..d3eb3da 100644
--- a/libsrc/Xml.new/Makefile.in
+++ b/libsrc/Xml.new/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libxml_la_LIBADD =
am_libxml_la_OBJECTS = libxml_la-xmlparser.lo libxml_la-xmlgram.lo \
@@ -84,10 +81,9 @@ libxml_la_OBJECTS = $(am_libxml_la_OBJECTS)
libxml_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libxml_la_CFLAGS) \
$(CFLAGS) $(libxml_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -190,7 +186,6 @@ 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@
@@ -274,7 +269,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -295,7 +289,6 @@ 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@
@@ -343,14 +336,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Xml.new/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/Xml.new/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/Xml.new/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/Xml.new/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -368,7 +361,6 @@ $(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):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -400,94 +392,94 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libxml_la-xmlparser.lo: xmlparser.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-xmlparser.lo -MD -MP -MF $(DEPDIR)/libxml_la-xmlparser.Tpo -c -o libxml_la-xmlparser.lo `test -f 'xmlparser.c' || echo '$(srcdir)/'`xmlparser.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-xmlparser.Tpo $(DEPDIR)/libxml_la-xmlparser.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-xmlparser.lo -MD -MP -MF $(DEPDIR)/libxml_la-xmlparser.Tpo -c -o libxml_la-xmlparser.lo `test -f 'xmlparser.c' || echo '$(srcdir)/'`xmlparser.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-xmlparser.Tpo $(DEPDIR)/libxml_la-xmlparser.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlparser.c' object='libxml_la-xmlparser.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-xmlparser.lo `test -f 'xmlparser.c' || echo '$(srcdir)/'`xmlparser.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-xmlparser.lo `test -f 'xmlparser.c' || echo '$(srcdir)/'`xmlparser.c
libxml_la-xmlgram.lo: xmlgram.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-xmlgram.lo -MD -MP -MF $(DEPDIR)/libxml_la-xmlgram.Tpo -c -o libxml_la-xmlgram.lo `test -f 'xmlgram.c' || echo '$(srcdir)/'`xmlgram.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-xmlgram.Tpo $(DEPDIR)/libxml_la-xmlgram.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-xmlgram.lo -MD -MP -MF $(DEPDIR)/libxml_la-xmlgram.Tpo -c -o libxml_la-xmlgram.lo `test -f 'xmlgram.c' || echo '$(srcdir)/'`xmlgram.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-xmlgram.Tpo $(DEPDIR)/libxml_la-xmlgram.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlgram.c' object='libxml_la-xmlgram.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-xmlgram.lo `test -f 'xmlgram.c' || echo '$(srcdir)/'`xmlgram.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-xmlgram.lo `test -f 'xmlgram.c' || echo '$(srcdir)/'`xmlgram.c
libxml_la-xmlread.lo: xmlread.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-xmlread.lo -MD -MP -MF $(DEPDIR)/libxml_la-xmlread.Tpo -c -o libxml_la-xmlread.lo `test -f 'xmlread.c' || echo '$(srcdir)/'`xmlread.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-xmlread.Tpo $(DEPDIR)/libxml_la-xmlread.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-xmlread.lo -MD -MP -MF $(DEPDIR)/libxml_la-xmlread.Tpo -c -o libxml_la-xmlread.lo `test -f 'xmlread.c' || echo '$(srcdir)/'`xmlread.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-xmlread.Tpo $(DEPDIR)/libxml_la-xmlread.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlread.c' object='libxml_la-xmlread.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-xmlread.lo `test -f 'xmlread.c' || echo '$(srcdir)/'`xmlread.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-xmlread.lo `test -f 'xmlread.c' || echo '$(srcdir)/'`xmlread.c
libxml_la-xml_ecm.lo: xml_ecm.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-xml_ecm.lo -MD -MP -MF $(DEPDIR)/libxml_la-xml_ecm.Tpo -c -o libxml_la-xml_ecm.lo `test -f 'xml_ecm.c' || echo '$(srcdir)/'`xml_ecm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-xml_ecm.Tpo $(DEPDIR)/libxml_la-xml_ecm.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-xml_ecm.lo -MD -MP -MF $(DEPDIR)/libxml_la-xml_ecm.Tpo -c -o libxml_la-xml_ecm.lo `test -f 'xml_ecm.c' || echo '$(srcdir)/'`xml_ecm.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-xml_ecm.Tpo $(DEPDIR)/libxml_la-xml_ecm.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xml_ecm.c' object='libxml_la-xml_ecm.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-xml_ecm.lo `test -f 'xml_ecm.c' || echo '$(srcdir)/'`xml_ecm.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-xml_ecm.lo `test -f 'xml_ecm.c' || echo '$(srcdir)/'`xml_ecm.c
libxml_la-html_mode.lo: html_mode.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-html_mode.lo -MD -MP -MF $(DEPDIR)/libxml_la-html_mode.Tpo -c -o libxml_la-html_mode.lo `test -f 'html_mode.c' || echo '$(srcdir)/'`html_mode.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-html_mode.Tpo $(DEPDIR)/libxml_la-html_mode.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-html_mode.lo -MD -MP -MF $(DEPDIR)/libxml_la-html_mode.Tpo -c -o libxml_la-html_mode.lo `test -f 'html_mode.c' || echo '$(srcdir)/'`html_mode.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-html_mode.Tpo $(DEPDIR)/libxml_la-html_mode.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='html_mode.c' object='libxml_la-html_mode.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-html_mode.lo `test -f 'html_mode.c' || echo '$(srcdir)/'`html_mode.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-html_mode.lo `test -f 'html_mode.c' || echo '$(srcdir)/'`html_mode.c
libxml_la-charclasses.lo: charclasses.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-charclasses.lo -MD -MP -MF $(DEPDIR)/libxml_la-charclasses.Tpo -c -o libxml_la-charclasses.lo `test -f 'charclasses.c' || echo '$(srcdir)/'`charclasses.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-charclasses.Tpo $(DEPDIR)/libxml_la-charclasses.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-charclasses.lo -MD -MP -MF $(DEPDIR)/libxml_la-charclasses.Tpo -c -o libxml_la-charclasses.lo `test -f 'charclasses.c' || echo '$(srcdir)/'`charclasses.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-charclasses.Tpo $(DEPDIR)/libxml_la-charclasses.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='charclasses.c' object='libxml_la-charclasses.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-charclasses.lo `test -f 'charclasses.c' || echo '$(srcdir)/'`charclasses.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-charclasses.lo `test -f 'charclasses.c' || echo '$(srcdir)/'`charclasses.c
libxml_la-dtd.lo: dtd.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-dtd.lo -MD -MP -MF $(DEPDIR)/libxml_la-dtd.Tpo -c -o libxml_la-dtd.lo `test -f 'dtd.c' || echo '$(srcdir)/'`dtd.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-dtd.Tpo $(DEPDIR)/libxml_la-dtd.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-dtd.lo -MD -MP -MF $(DEPDIR)/libxml_la-dtd.Tpo -c -o libxml_la-dtd.lo `test -f 'dtd.c' || echo '$(srcdir)/'`dtd.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-dtd.Tpo $(DEPDIR)/libxml_la-dtd.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dtd.c' object='libxml_la-dtd.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-dtd.lo `test -f 'dtd.c' || echo '$(srcdir)/'`dtd.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-dtd.lo `test -f 'dtd.c' || echo '$(srcdir)/'`dtd.c
libxml_la-schema.lo: schema.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-schema.lo -MD -MP -MF $(DEPDIR)/libxml_la-schema.Tpo -c -o libxml_la-schema.lo `test -f 'schema.c' || echo '$(srcdir)/'`schema.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-schema.Tpo $(DEPDIR)/libxml_la-schema.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-schema.lo -MD -MP -MF $(DEPDIR)/libxml_la-schema.Tpo -c -o libxml_la-schema.lo `test -f 'schema.c' || echo '$(srcdir)/'`schema.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-schema.Tpo $(DEPDIR)/libxml_la-schema.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='schema.c' object='libxml_la-schema.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-schema.lo `test -f 'schema.c' || echo '$(srcdir)/'`schema.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-schema.lo `test -f 'schema.c' || echo '$(srcdir)/'`schema.c
libxml_la-datatypes.lo: datatypes.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-datatypes.lo -MD -MP -MF $(DEPDIR)/libxml_la-datatypes.Tpo -c -o libxml_la-datatypes.lo `test -f 'datatypes.c' || echo '$(srcdir)/'`datatypes.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-datatypes.Tpo $(DEPDIR)/libxml_la-datatypes.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-datatypes.lo -MD -MP -MF $(DEPDIR)/libxml_la-datatypes.Tpo -c -o libxml_la-datatypes.lo `test -f 'datatypes.c' || echo '$(srcdir)/'`datatypes.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-datatypes.Tpo $(DEPDIR)/libxml_la-datatypes.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='datatypes.c' object='libxml_la-datatypes.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-datatypes.lo `test -f 'datatypes.c' || echo '$(srcdir)/'`datatypes.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-datatypes.lo `test -f 'datatypes.c' || echo '$(srcdir)/'`datatypes.c
libxml_la-schema_fsm.lo: schema_fsm.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-schema_fsm.lo -MD -MP -MF $(DEPDIR)/libxml_la-schema_fsm.Tpo -c -o libxml_la-schema_fsm.lo `test -f 'schema_fsm.c' || echo '$(srcdir)/'`schema_fsm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxml_la-schema_fsm.Tpo $(DEPDIR)/libxml_la-schema_fsm.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -MT libxml_la-schema_fsm.lo -MD -MP -MF $(DEPDIR)/libxml_la-schema_fsm.Tpo -c -o libxml_la-schema_fsm.lo `test -f 'schema_fsm.c' || echo '$(srcdir)/'`schema_fsm.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libxml_la-schema_fsm.Tpo $(DEPDIR)/libxml_la-schema_fsm.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='schema_fsm.c' object='libxml_la-schema_fsm.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-schema_fsm.lo `test -f 'schema_fsm.c' || echo '$(srcdir)/'`schema_fsm.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxml_la_CFLAGS) $(CFLAGS) -c -o libxml_la-schema_fsm.lo `test -f 'schema_fsm.c' || echo '$(srcdir)/'`schema_fsm.c
mostlyclean-libtool:
-rm -f *.lo
@@ -500,49 +492,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -563,17 +551,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -603,7 +587,6 @@ clean-generic:
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"
@@ -626,8 +609,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -636,28 +617,18 @@ install-data-am:
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
@@ -680,7 +651,7 @@ ps-am:
uninstall-am:
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -705,7 +676,6 @@ xhtml_ent.h: $(srcdir)/xhtml_ent.gperf
-k1,2,3,4,5,$$ \
-Nxhtml_ent_gperf \
$(srcdir)/xhtml_ent.gperf
-
# 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/libsrc/Xml.new/charclasses.c b/libsrc/Xml.new/charclasses.c
index ff6b4b8..be65854 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/charclasses.h b/libsrc/Xml.new/charclasses.h
index 890215c..9e0646c 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/datatypes.c b/libsrc/Xml.new/datatypes.c
index 40a5297..5a3f3e8 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/dtd.c b/libsrc/Xml.new/dtd.c
index d624e51..41f8e7a 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.3 2011/04/11 21:44:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/html_mode.c b/libsrc/Xml.new/html_mode.c
index 25fec6a..1c7c755 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/html_mode.h b/libsrc/Xml.new/html_mode.h
index f1e8d89..c6481c0 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/schema.c b/libsrc/Xml.new/schema.c
index 55bd6a0..1a5dc57 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/schema.h b/libsrc/Xml.new/schema.h
index 8372606..261bd30 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/schema_ecm.h b/libsrc/Xml.new/schema_ecm.h
index 34004c4..19b80b6 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/schema_fsm.c b/libsrc/Xml.new/schema_fsm.c
index 1f7643e..3e1eab3 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/test.c b/libsrc/Xml.new/test.c
index 2091f1f..a3efaed 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/tst.c b/libsrc/Xml.new/tst.c
index 3a357ca..d849eaa 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/xhtml_ent.h b/libsrc/Xml.new/xhtml_ent.h
index e20370d..18b7b8c 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.2 */
+/* ANSI-C code produced by gperf version 3.0.3 */
/* 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 183
-#define MAX_HASH_VALUE 1206
-/* maximum key range = 1024, duplicates = 0 */
+#define MIN_HASH_VALUE 120
+#define MAX_HASH_VALUE 1383
+/* maximum key range = 1264, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -50,34 +50,34 @@ hash (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 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
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 136,
+ 230, 120, 177, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 82, 18, 28, 187, 1,
+ 175, 74, 27, 26, 1384, 236, 128, 123, 222, 68,
+ 49, 1384, 4, 207, 215, 179, 1384, 1384, 191, 123,
+ 234, 1384, 1384, 1384, 1384, 1384, 1384, 223, 16, 18,
+ 62, 209, 146, 19, 37, 237, 59, 98, 52, 187,
+ 44, 67, 47, 169, 41, 59, 243, 255, 91, 7,
+ 227, 241, 9, 47, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1384,
+ 1384, 1384, 1384, 1384, 1384, 1384, 1384
};
- register int hval = len;
+ register int hval = (int)len;
switch (hval)
{
@@ -102,512 +102,512 @@ hash (register const char *str, register unsigned int len)
static const struct xhtml_ent_s wordlist[] =
{
-#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 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 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 225 "./xhtml_ent.gperf"
+ {"cap", 8745 , DESCR("intersection = cap; UNICODE(2229) TABLE(ISOtech)")},
+#line 250 "./xhtml_ent.gperf"
+ {"rang", 9002 , DESCR("right-pointing angle bracket = ket; UNICODE(232A) TABLE(ISOtech)")},
+#line 230 "./xhtml_ent.gperf"
+ {"cong", 8773 , DESCR("approximately equal to; UNICODE(2245) TABLE(ISOtech)")},
+#line 249 "./xhtml_ent.gperf"
+ {"lang", 9001 , DESCR("left-pointing angle bracket = bra; UNICODE(2329) TABLE(ISOtech)")},
+#line 109 "./xhtml_ent.gperf"
+ {"circ", 710 , DESCR(" modifier letter circumflex accent; UNICODE(02C6) TABLE(ISOpub)")},
+#line 224 "./xhtml_ent.gperf"
+ {"or", 8744 , DESCR("logical or = vee; UNICODE(2228) TABLE(ISOtech)")},
+#line 200 "./xhtml_ent.gperf"
+ {"harr", 8596 , DESCR("left right arrow; UNICODE(2194) TABLE(ISOamsa)")},
+#line 206 "./xhtml_ent.gperf"
+ {"hArr", 8660 , DESCR("left right double arrow; UNICODE(21D4) TABLE(ISOamsa)")},
+#line 198 "./xhtml_ent.gperf"
+ {"rarr", 8594 , DESCR("rightwards arrow; UNICODE(2192) TABLE(ISOnum)")},
#line 236 "./xhtml_ent.gperf"
{"sub", 8834 , DESCR("subset of; UNICODE(2282) TABLE(ISOtech)")},
-#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 204 "./xhtml_ent.gperf"
+ {"rArr", 8658 , DESCR("rightwards double arrow; UNICODE(21D2) TABLE(ISOtech)")},
+#line 196 "./xhtml_ent.gperf"
+ {"larr", 8592 , DESCR("leftwards arrow; UNICODE(2190) TABLE(ISOnum)")},
+#line 202 "./xhtml_ent.gperf"
+ {"lArr", 8656 , DESCR("leftwards double arrow; UNICODE(21D0) TABLE(ISOtech)")},
+#line 199 "./xhtml_ent.gperf"
+ {"darr", 8595 , DESCR("downwards arrow; UNICODE(2193) TABLE(ISOnum)")},
+#line 226 "./xhtml_ent.gperf"
+ {"cup", 8746 , DESCR("union = cup; UNICODE(222A) TABLE(ISOtech)")},
+#line 205 "./xhtml_ent.gperf"
+ {"dArr", 8659 , DESCR("downwards double arrow; UNICODE(21D3) TABLE(ISOamsa)")},
#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 17 "./xhtml_ent.gperf"
+ {"reg", 174 , DESCR("registered sign = registered trade mark sign; UNICODE(00AE) TABLE(ISOnum)")},
+#line 51 "./xhtml_ent.gperf"
+ {"ETH", 208 , DESCR("latin capital letter ETH; UNICODE(00D0) TABLE(ISOlat1)")},
+#line 237 "./xhtml_ent.gperf"
+ {"sup", 8835 , DESCR("superset of; UNICODE(2283) TABLE(ISOtech)")},
+#line 19 "./xhtml_ent.gperf"
+ {"deg", 176 , DESCR("degree sign; UNICODE(00B0) TABLE(ISOnum)")},
+#line 185 "./xhtml_ent.gperf"
+ {"bull", 8226 , DESCR("bullet = black small circle; UNICODE(2022) TABLE(ISOpub)")},
+#line 220 "./xhtml_ent.gperf"
+ {"prop", 8733 , DESCR("proportional to; UNICODE(221D) TABLE(ISOtech)")},
+#line 184 "./xhtml_ent.gperf"
+ {"piv", 982 , DESCR("greek pi symbol; UNICODE(03D6) ISOgrk3")},
+#line 248 "./xhtml_ent.gperf"
+ {"rfloor", 8971 , DESCR("right floor; UNICODE(230B) TABLE(ISOamsc)")},
+#line 215 "./xhtml_ent.gperf"
+ {"prod", 8719 , DESCR("n-ary product = product sign; UNICODE(220F) TABLE(ISOamsb)")},
+#line 247 "./xhtml_ent.gperf"
+ {"lfloor", 8970 , DESCR("left floor = apl downstile; UNICODE(230A) TABLE(ISOamsc)")},
+#line 18 "./xhtml_ent.gperf"
+ {"macr", 175 , DESCR("macron = spacing macron = overline = APL overbar; UNICODE(00AF) TABLE(ISOdia)")},
+#line 222 "./xhtml_ent.gperf"
+ {"ang", 8736 , DESCR("angle; UNICODE(2220) TABLE(ISOamso)")},
+#line 243 "./xhtml_ent.gperf"
+ {"perp", 8869 , DESCR("up tack = orthogonal to = perpendicular; UNICODE(22A5) 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 172 "./xhtml_ent.gperf"
+ {"pi", 960 , DESCR("greek small letter pi; UNICODE(03C0) ISOgrk3")},
+#line 148 "./xhtml_ent.gperf"
+ {"Pi", 928 , DESCR("greek capital letter pi; UNICODE(03A0) ISOgrk3")},
+#line 115 "./xhtml_ent.gperf"
+ {"zwj", 8205 , DESCR("zero width joiner; UNICODE(200D) NEW TABLE(RFC2070)")},
#line 100 "./xhtml_ent.gperf"
{"amp", 38 , DESCR(" ampersand; UNICODE(0026) 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 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 14 "./xhtml_ent.gperf"
- {"laquo", 171 , DESCR("left-pointing double angle quotation mark = left pointing guillemet; UNICODE(00AB) TABLE(ISOnum)")},
+#line 126 "./xhtml_ent.gperf"
+ {"dagger", 8224 , DESCR("dagger; UNICODE(2020) TABLE(ISOpub)")},
#line 235 "./xhtml_ent.gperf"
{"ge", 8805 , DESCR("greater-than or equal to; UNICODE(2265) TABLE(ISOtech)")},
-#line 180 "./xhtml_ent.gperf"
- {"psi", 968 , DESCR("greek small letter psi; UNICODE(03C8) ISOgrk3")},
+#line 149 "./xhtml_ent.gperf"
+ {"Rho", 929 , DESCR("greek capital letter rho; UNICODE(03A1)")},
+#line 45 "./xhtml_ent.gperf"
+ {"Ecirc", 202 , DESCR("latin capital letter E with circumflex; UNICODE(00CA) TABLE(ISOlat1)")},
+#line 46 "./xhtml_ent.gperf"
+ {"Euml", 203 , DESCR("latin capital letter E with diaeresis; UNICODE(00CB) TABLE(ISOlat1)")},
+#line 169 "./xhtml_ent.gperf"
+ {"nu", 957 , DESCR("greek small letter nu; UNICODE(03BD) ISOgrk3")},
+#line 219 "./xhtml_ent.gperf"
+ {"radic", 8730 , DESCR("square root = radical sign; UNICODE(221A) TABLE(ISOtech)")},
+#line 197 "./xhtml_ent.gperf"
+ {"uarr", 8593 , DESCR("upwards arrow; UNICODE(2191) TABLE(ISOnum)")},
+#line 203 "./xhtml_ent.gperf"
+ {"uArr", 8657 , DESCR("upwards double arrow; UNICODE(21D1) TABLE(ISOamsa)")},
+#line 232 "./xhtml_ent.gperf"
+ {"ne", 8800 , DESCR("not equal to; UNICODE(2260) TABLE(ISOtech)")},
+#line 114 "./xhtml_ent.gperf"
+ {"zwnj", 8204 , DESCR("zero width non-joiner; UNICODE(200C) NEW TABLE(RFC2070)")},
+#line 11 "./xhtml_ent.gperf"
+ {"uml", 168 , DESCR("diaeresis = spacing diaeresis; UNICODE(00A8) TABLE(ISOdia)")},
+#line 49 "./xhtml_ent.gperf"
+ {"Icirc", 206 , DESCR("latin capital letter I with circumflex; UNICODE(00CE) TABLE(ISOlat1)")},
#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 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 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 50 "./xhtml_ent.gperf"
+ {"Iuml", 207 , DESCR("latin capital letter I with diaeresis; UNICODE(00CF) TABLE(ISOlat1)")},
+#line 173 "./xhtml_ent.gperf"
+ {"rho", 961 , DESCR("greek small letter rho; UNICODE(03C1) ISOgrk3")},
+#line 223 "./xhtml_ent.gperf"
+ {"and", 8743 , DESCR("logical and = wedge; UNICODE(2227) TABLE(ISOtech)")},
+#line 201 "./xhtml_ent.gperf"
+ {"crarr", 8629 , DESCR("downwards arrow with corner leftwards = carriage return; UNICODE(21B5) NEW")},
+#line 111 "./xhtml_ent.gperf"
+ {"ensp", 8194 , DESCR("en space; UNICODE(2002) TABLE(ISOpub)")},
+#line 66 "./xhtml_ent.gperf"
+ {"szlig", 223 , DESCR("latin small letter sharp s = ess-zed; UNICODE(00DF) TABLE(ISOlat1)")},
#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 24 "./xhtml_ent.gperf"
+ {"micro", 181 , DESCR("micro sign; UNICODE(00B5) TABLE(ISOnum)")},
+#line 87 "./xhtml_ent.gperf"
+ {"ocirc", 244 , DESCR("latin small letter o with circumflex; UNICODE(00F4) TABLE(ISOlat1)")},
+#line 55 "./xhtml_ent.gperf"
+ {"Ocirc", 212 , DESCR("latin capital letter O with circumflex; UNICODE(00D4) TABLE(ISOlat1)")},
+#line 7 "./xhtml_ent.gperf"
+ {"curren", 164 , DESCR("currency sign; UNICODE(00A4) TABLE(ISOnum)")},
+#line 9 "./xhtml_ent.gperf"
+ {"brvbar", 166 , DESCR("broken bar = broken vertical bar; UNICODE(00A6) TABLE(ISOnum)")},
+#line 89 "./xhtml_ent.gperf"
+ {"ouml", 246 , DESCR("latin small letter o with diaeresis; UNICODE(00F6) TABLE(ISOlat1)")},
+#line 57 "./xhtml_ent.gperf"
+ {"Ouml", 214 , DESCR("latin capital letter O with diaeresis; UNICODE(00D6) TABLE(ISOlat1)")},
#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 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 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 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 37 "./xhtml_ent.gperf"
+ {"Acirc", 194 , DESCR("latin capital letter A with circumflex; UNICODE(00C2) TABLE(ISOlat1)")},
+#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 39 "./xhtml_ent.gperf"
+ {"Auml", 196 , DESCR("latin capital letter A with diaeresis; UNICODE(00C4) TABLE(ISOlat1)")},
+#line 144 "./xhtml_ent.gperf"
+ {"Mu", 924 , DESCR("greek capital letter mu; UNICODE(039C)")},
#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 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 8 "./xhtml_ent.gperf"
+ {"yen", 165 , DESCR("yen sign = yuan sign; UNICODE(00A5) TABLE(ISOnum)")},
+#line 131 "./xhtml_ent.gperf"
+ {"euro", 8364 , DESCR(" euro sign; UNICODE(20AC) NEW")},
+#line 13 "./xhtml_ent.gperf"
+ {"ordf", 170 , DESCR("feminine ordinal indicator; UNICODE(00AA) TABLE(ISOnum)")},
+#line 116 "./xhtml_ent.gperf"
+ {"lrm", 8206 , DESCR("left-to-right mark; UNICODE(200E) NEW TABLE(RFC2070)")},
+#line 146 "./xhtml_ent.gperf"
+ {"Xi", 926 , DESCR("greek capital letter xi; UNICODE(039E) ISOgrk3")},
+#line 229 "./xhtml_ent.gperf"
+ {"sim", 8764 , DESCR("tilde operator = varies with = similar to; UNICODE(223C) TABLE(ISOtech)")},
+#line 127 "./xhtml_ent.gperf"
+ {"Dagger", 8225 , DESCR("double dagger; UNICODE(2021) TABLE(ISOpub)")},
#line 107 "./xhtml_ent.gperf"
{"scaron", 353 , DESCR(" latin small letter s with caron; UNICODE(0161) TABLE(ISOlat2)")},
-#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 193 "./xhtml_ent.gperf"
+ {"real", 8476 , DESCR("blackletter capital R = real part symbol; UNICODE(211C) TABLE(ISOamso)")},
+#line 102 "./xhtml_ent.gperf"
+ {"gt", 62 , DESCR(" greater-than sign; UNICODE(003E) TABLE(ISOnum)")},
#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 170 "./xhtml_ent.gperf"
+ {"xi", 958 , DESCR("greek small letter xi; UNICODE(03BE) ISOgrk3")},
+#line 216 "./xhtml_ent.gperf"
+ {"sum", 8721 , DESCR("n-ary sumation; UNICODE(2211) TABLE(ISOamsb)")},
+#line 168 "./xhtml_ent.gperf"
+ {"mu", 956 , DESCR("greek small letter mu; UNICODE(03BC) ISOgrk3")},
+#line 83 "./xhtml_ent.gperf"
+ {"eth", 240 , DESCR("latin small letter eth; UNICODE(00F0) TABLE(ISOlat1)")},
+#line 105 "./xhtml_ent.gperf"
+ {"oelig", 339 , DESCR(" latin small ligature oe; UNICODE(0153) TABLE(ISOlat2)")},
+#line 101 "./xhtml_ent.gperf"
+ {"lt", 60 , DESCR(" less-than sign; UNICODE(003C) TABLE(ISOnum)")},
+#line 25 "./xhtml_ent.gperf"
+ {"para", 182 , DESCR("pilcrow sign = paragraph sign; UNICODE(00B6) TABLE(ISOnum)")},
+#line 62 "./xhtml_ent.gperf"
+ {"Ucirc", 219 , DESCR("latin capital letter U with circumflex; UNICODE(00DB) TABLE(ISOlat1)")},
+#line 167 "./xhtml_ent.gperf"
+ {"lambda", 955 , DESCR("greek small letter lambda; UNICODE(03BB) ISOgrk3")},
+#line 63 "./xhtml_ent.gperf"
+ {"Uuml", 220 , DESCR("latin capital letter U with diaeresis; UNICODE(00DC) TABLE(ISOlat1)")},
+#line 29 "./xhtml_ent.gperf"
+ {"ordm", 186 , DESCR("masculine ordinal indicator; UNICODE(00BA) TABLE(ISOnum)")},
+#line 207 "./xhtml_ent.gperf"
+ {"forall", 8704 , DESCR("for all; UNICODE(2200) TABLE(ISOtech)")},
+#line 137 "./xhtml_ent.gperf"
+ {"Epsilon", 917 , DESCR("greek capital letter epsilon; UNICODE(0395)")},
+#line 145 "./xhtml_ent.gperf"
+ {"Nu", 925 , DESCR("greek capital letter nu; UNICODE(039D)")},
+#line 27 "./xhtml_ent.gperf"
+ {"cedil", 184 , DESCR("cedilla = spacing cedilla; UNICODE(00B8) TABLE(ISOdia)")},
+#line 104 "./xhtml_ent.gperf"
+ {"OElig", 338 , DESCR(" latin capital ligature OE; UNICODE(0152) TABLE(ISOlat2)")},
+#line 132 "./xhtml_ent.gperf"
+ {"fnof", 402 , DESCR("latin small f with hook = function = florin; UNICODE(0192) TABLE(ISOtech)")},
+#line 186 "./xhtml_ent.gperf"
+ {"hellip", 8230 , DESCR("horizontal ellipsis = three dot leader; UNICODE(2026) TABLE(ISOpub)")},
+#line 238 "./xhtml_ent.gperf"
+ {"nsub", 8836 , DESCR("not a subset of; UNICODE(2284) ISOamsn")},
+#line 211 "./xhtml_ent.gperf"
+ {"nabla", 8711 , DESCR("nabla = backward difference; UNICODE(2207) TABLE(ISOtech)")},
+#line 15 "./xhtml_ent.gperf"
+ {"not", 172 , DESCR("not sign = discretionary hyphen; UNICODE(00AC) TABLE(ISOnum)")},
+#line 103 "./xhtml_ent.gperf"
+ {"apos", 39 , DESCR(" apostrophe mark; UNICODE(0027) TABLE(ISOnum)")},
+#line 239 "./xhtml_ent.gperf"
+ {"sube", 8838 , DESCR("subset of or equal to; UNICODE(2286) TABLE(ISOtech)")},
+#line 41 "./xhtml_ent.gperf"
+ {"AElig", 198 , DESCR("latin capital letter AE = latin capital ligature AE; UNICODE(00C6) TABLE(ISOlat1)")},
+#line 77 "./xhtml_ent.gperf"
+ {"ecirc", 234 , DESCR("latin small letter e with circumflex; UNICODE(00EA) TABLE(ISOlat1)")},
+#line 208 "./xhtml_ent.gperf"
+ {"part", 8706 , DESCR("partial differential; UNICODE(2202) TABLE(ISOtech)")},
+#line 78 "./xhtml_ent.gperf"
+ {"euml", 235 , DESCR("latin small letter e with diaeresis; UNICODE(00EB) TABLE(ISOlat1)")},
+#line 190 "./xhtml_ent.gperf"
+ {"frasl", 8260 , DESCR("fraction slash; UNICODE(2044) NEW")},
#line 12 "./xhtml_ent.gperf"
{"copy", 169 , DESCR("copyright sign; UNICODE(00A9) TABLE(ISOnum)")},
+#line 253 "./xhtml_ent.gperf"
+ {"clubs", 9827 , DESCR("black club suit = shamrock; UNICODE(2663) TABLE(ISOpub)")},
+#line 69 "./xhtml_ent.gperf"
+ {"acirc", 226 , DESCR("latin small letter a with circumflex; UNICODE(00E2) TABLE(ISOlat1)")},
#line 117 "./xhtml_ent.gperf"
{"rlm", 8207 , DESCR("right-to-left mark; UNICODE(200F) NEW TABLE(RFC2070)")},
-#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 72 "./xhtml_ent.gperf"
+ {"aring", 229 , DESCR("latin small letter a with ring above = latin small letter a ring; UNICODE(00E5) TABLE(ISOlat1)")},
+#line 43 "./xhtml_ent.gperf"
+ {"Egrave", 200 , DESCR("latin capital letter E with grave; UNICODE(00C8) TABLE(ISOlat1)")},
+#line 71 "./xhtml_ent.gperf"
+ {"auml", 228 , DESCR("latin small letter a with diaeresis; UNICODE(00E4) TABLE(ISOlat1)")},
+#line 118 "./xhtml_ent.gperf"
+ {"ndash", 8211 , DESCR("en dash; UNICODE(2013) TABLE(ISOpub)")},
+#line 81 "./xhtml_ent.gperf"
+ {"icirc", 238 , DESCR("latin small letter i with circumflex; UNICODE(00EE) TABLE(ISOlat1)")},
+#line 240 "./xhtml_ent.gperf"
+ {"supe", 8839 , DESCR("superset of or equal to; UNICODE(2287) TABLE(ISOtech)")},
+#line 30 "./xhtml_ent.gperf"
+ {"raquo", 187 , DESCR("right-pointing double angle quotation mark = right pointing guillemet; UNICODE(00BB) TABLE(ISOnum)")},
+#line 82 "./xhtml_ent.gperf"
+ {"iuml", 239 , DESCR("latin small letter i with diaeresis; UNICODE(00EF) TABLE(ISOlat1)")},
+#line 98 "./xhtml_ent.gperf"
+ {"yuml", 255 , DESCR("latin small letter y with diaeresis; UNICODE(00FF) TABLE(ISOlat1)")},
+#line 14 "./xhtml_ent.gperf"
+ {"laquo", 171 , DESCR("left-pointing double angle quotation mark = left pointing guillemet; UNICODE(00AB) TABLE(ISOnum)")},
+#line 47 "./xhtml_ent.gperf"
+ {"Igrave", 204 , DESCR("latin capital letter I with grave; UNICODE(00CC) TABLE(ISOlat1)")},
+#line 94 "./xhtml_ent.gperf"
+ {"ucirc", 251 , DESCR("latin small letter u with circumflex; UNICODE(00FB) TABLE(ISOlat1)")},
#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 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 143 "./xhtml_ent.gperf"
+ {"Lambda", 923 , DESCR("greek capital letter lambda; UNICODE(039B) ISOgrk3")},
+#line 122 "./xhtml_ent.gperf"
+ {"sbquo", 8218 , DESCR("single low-9 quotation mark; UNICODE(201A) NEW")},
#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 74 "./xhtml_ent.gperf"
+ {"ccedil", 231 , DESCR("latin small letter c with cedilla; UNICODE(00E7) TABLE(ISOlat1)")},
+#line 106 "./xhtml_ent.gperf"
+ {"Scaron", 352 , DESCR(" latin capital letter S with caron; UNICODE(0160) TABLE(ISOlat2)")},
+#line 255 "./xhtml_ent.gperf"
+ {"diams", 9830 , DESCR("black diamond suit; UNICODE(2666) TABLE(ISOpub)")},
+#line 42 "./xhtml_ent.gperf"
+ {"Ccedil", 199 , DESCR("latin capital letter C with cedilla; UNICODE(00C7) TABLE(ISOlat1)")},
+#line 246 "./xhtml_ent.gperf"
+ {"rceil", 8969 , DESCR("right ceiling; UNICODE(2309) TABLE(ISOamsc)")},
#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 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 21 "./xhtml_ent.gperf"
+ {"sup2", 178 , DESCR("superscript two = superscript digit two = squared; UNICODE(00B2) TABLE(ISOnum)")},
+#line 213 "./xhtml_ent.gperf"
+ {"notin", 8713 , DESCR("not an element of; UNICODE(2209) TABLE(ISOtech)")},
+#line 241 "./xhtml_ent.gperf"
+ {"oplus", 8853 , DESCR("circled plus = direct sum; UNICODE(2295) TABLE(ISOamsb)")},
+#line 217 "./xhtml_ent.gperf"
+ {"minus", 8722 , DESCR("minus sign; UNICODE(2212) TABLE(ISOtech)")},
+#line 245 "./xhtml_ent.gperf"
+ {"lceil", 8968 , DESCR("left ceiling = apl upstile; UNICODE(2308) TABLE(ISOamsc)")},
+#line 85 "./xhtml_ent.gperf"
+ {"ograve", 242 , DESCR("latin small letter o with grave; UNICODE(00F2) TABLE(ISOlat1)")},
+#line 53 "./xhtml_ent.gperf"
+ {"Ograve", 210 , DESCR("latin capital letter O with grave; UNICODE(00D2) TABLE(ISOlat1)")},
+#line 97 "./xhtml_ent.gperf"
+ {"thorn", 254 , DESCR("latin small letter thorn with; UNICODE(00FE) TABLE(ISOlat1)")},
+#line 26 "./xhtml_ent.gperf"
+ {"middot", 183 , DESCR("middle dot = Georgian comma = Greek middle dot; UNICODE(00B7) TABLE(ISOnum)")},
+#line 91 "./xhtml_ent.gperf"
+ {"oslash", 248 , DESCR("latin small letter o with stroke; = latin small letter o slash; UNICODE(00F8) TABLE(ISOlat1)")},
+#line 59 "./xhtml_ent.gperf"
+ {"Oslash", 216 , DESCR("latin capital letter O with stroke = latin capital letter O slash; UNICODE(00D8) TABLE(ISOlat1)")},
+#line 35 "./xhtml_ent.gperf"
+ {"Agrave", 192 , DESCR("latin capital letter A with grave = latin capital letter A grave; UNICODE(00C0) TABLE(ISOlat1)")},
+#line 191 "./xhtml_ent.gperf"
+ {"weierp", 8472 , DESCR("script capital P = power set = Weierstrass p; UNICODE(2118) TABLE(ISOamso)")},
+#line 5 "./xhtml_ent.gperf"
+ {"cent", 162 , DESCR("cent sign; UNICODE(00A2) TABLE(ISOnum)")},
+#line 174 "./xhtml_ent.gperf"
+ {"sigmaf", 962 , DESCR("greek small letter final sigma; UNICODE(03C2) ISOgrk3")},
+#line 73 "./xhtml_ent.gperf"
+ {"aelig", 230 , DESCR("latin small letter ae = latin small ligature ae; UNICODE(00E6) TABLE(ISOlat1)")},
+#line 139 "./xhtml_ent.gperf"
+ {"Eta", 919 , DESCR("greek capital letter eta; UNICODE(0397)")},
+#line 10 "./xhtml_ent.gperf"
+ {"sect", 167 , DESCR("section sign; UNICODE(00A7) TABLE(ISOnum)")},
+#line 128 "./xhtml_ent.gperf"
+ {"permil", 8240 , DESCR("per mille sign; UNICODE(2030) TABLE(ISOtech)")},
+#line 90 "./xhtml_ent.gperf"
+ {"divide", 247 , DESCR("division sign; UNICODE(00F7) TABLE(ISOnum)")},
+#line 179 "./xhtml_ent.gperf"
+ {"chi", 967 , DESCR("greek small letter chi; UNICODE(03C7) ISOgrk3")},
#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 154 "./xhtml_ent.gperf"
+ {"Chi", 935 , DESCR("greek capital letter chi; UNICODE(03A7)")},
+#line 151 "./xhtml_ent.gperf"
+ {"Tau", 932 , DESCR("greek capital letter tau; UNICODE(03A4)")},
+#line 152 "./xhtml_ent.gperf"
+ {"Upsilon", 933 , DESCR("greek capital letter upsilon; UNICODE(03A5) ISOgrk3")},
#line 44 "./xhtml_ent.gperf"
{"Eacute", 201 , DESCR("latin capital letter E with acute; UNICODE(00C9) TABLE(ISOlat1)")},
-#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 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 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 254 "./xhtml_ent.gperf"
+ {"hearts", 9829 , DESCR("black heart suit = valentine; UNICODE(2665) TABLE(ISOpub)")},
+#line 119 "./xhtml_ent.gperf"
+ {"mdash", 8212 , DESCR("em dash; UNICODE(2014) TABLE(ISOpub)")},
+#line 178 "./xhtml_ent.gperf"
+ {"phi", 966 , DESCR("greek small letter phi; UNICODE(03C6) ISOgrk3")},
+#line 65 "./xhtml_ent.gperf"
+ {"THORN", 222 , DESCR("latin capital letter THORN; UNICODE(00DE) TABLE(ISOlat1)")},
+#line 153 "./xhtml_ent.gperf"
+ {"Phi", 934 , DESCR("greek capital letter phi; UNICODE(03A6) ISOgrk3")},
+#line 31 "./xhtml_ent.gperf"
+ {"frac14", 188 , DESCR("vulgar fraction one quarter = fraction one quarter; UNICODE(00BC) TABLE(ISOnum)")},
+#line 141 "./xhtml_ent.gperf"
+ {"Iota", 921 , DESCR("greek capital letter iota; UNICODE(0399)")},
+#line 180 "./xhtml_ent.gperf"
+ {"psi", 968 , DESCR("greek small letter psi; UNICODE(03C8) ISOgrk3")},
+#line 155 "./xhtml_ent.gperf"
+ {"Psi", 936 , DESCR("greek capital letter psi; UNICODE(03A8) ISOgrk3")},
+#line 176 "./xhtml_ent.gperf"
+ {"tau", 964 , DESCR("greek small letter tau; UNICODE(03C4) ISOgrk3")},
+#line 48 "./xhtml_ent.gperf"
+ {"Iacute", 205 , DESCR("latin capital letter I with acute; UNICODE(00CD) TABLE(ISOlat1)")},
+#line 175 "./xhtml_ent.gperf"
+ {"sigma", 963 , DESCR("greek small letter sigma; UNICODE(03C3) ISOgrk3")},
+#line 161 "./xhtml_ent.gperf"
+ {"epsilon", 949 , DESCR("greek small letter epsilon; UNICODE(03B5) ISOgrk3")},
+#line 221 "./xhtml_ent.gperf"
+ {"infin", 8734 , DESCR("infinity; UNICODE(221E) TABLE(ISOtech)")},
+#line 16 "./xhtml_ent.gperf"
+ {"shy", 173 , DESCR("soft hyphen = discretionary hyphen; UNICODE(00AD) TABLE(ISOnum)")},
+#line 20 "./xhtml_ent.gperf"
+ {"plusmn", 177 , DESCR("plus-minus sign = plus-or-minus sign; UNICODE(00B1) TABLE(ISOnum)")},
+#line 60 "./xhtml_ent.gperf"
+ {"Ugrave", 217 , DESCR("latin capital letter U with grave; UNICODE(00D9) TABLE(ISOlat1)")},
+#line 252 "./xhtml_ent.gperf"
+ {"spades", 9824 , DESCR("black spade suit; UNICODE(2660) TABLE(ISOpub)")},
+#line 125 "./xhtml_ent.gperf"
+ {"bdquo", 8222 , DESCR("double low-9 quotation mark; UNICODE(201E) NEW")},
+#line 181 "./xhtml_ent.gperf"
+ {"omega", 969 , DESCR("greek small letter omega; UNICODE(03C9) 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 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 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 227 "./xhtml_ent.gperf"
+ {"int", 8747 , DESCR("integral; UNICODE(222B) TABLE(ISOtech)")},
#line 142 "./xhtml_ent.gperf"
{"Kappa", 922 , DESCR("greek capital letter kappa; UNICODE(039A)")},
+#line 183 "./xhtml_ent.gperf"
+ {"upsih", 978 , DESCR("greek upsilon with hook symbol; UNICODE(03D2) NEW")},
+#line 133 "./xhtml_ent.gperf"
+ {"Alpha", 913 , DESCR("greek capital letter alpha; UNICODE(0391)")},
+#line 212 "./xhtml_ent.gperf"
+ {"isin", 8712 , DESCR("element of; UNICODE(2208) TABLE(ISOtech)")},
+#line 124 "./xhtml_ent.gperf"
+ {"rdquo", 8221 , DESCR("right double quotation mark; UNICODE(201D) TABLE(ISOnum)")},
+#line 86 "./xhtml_ent.gperf"
+ {"oacute", 243 , DESCR("latin small letter o with acute; UNICODE(00F3) TABLE(ISOlat1)")},
+#line 54 "./xhtml_ent.gperf"
+ {"Oacute", 211 , DESCR("latin capital letter O with acute; UNICODE(00D3) TABLE(ISOlat1)")},
+#line 75 "./xhtml_ent.gperf"
+ {"egrave", 232 , DESCR("latin small letter e with grave; UNICODE(00E8) TABLE(ISOlat1)")},
+#line 99 "./xhtml_ent.gperf"
+ {"quot", 34 , DESCR(" quotation mark = APL quote; UNICODE(0022) TABLE(ISOnum)")},
+#line 32 "./xhtml_ent.gperf"
+ {"frac12", 189 , DESCR("vulgar fraction one half = fraction one half; UNICODE(00BD) TABLE(ISOnum)")},
+#line 58 "./xhtml_ent.gperf"
+ {"times", 215 , DESCR("multiplication sign; UNICODE(00D7) TABLE(ISOnum)")},
+#line 177 "./xhtml_ent.gperf"
+ {"upsilon", 965 , DESCR("greek small letter upsilon; UNICODE(03C5) ISOgrk3")},
+#line 123 "./xhtml_ent.gperf"
+ {"ldquo", 8220 , DESCR("left double quotation mark; UNICODE(201C) TABLE(ISOnum)")},
+#line 244 "./xhtml_ent.gperf"
+ {"sdot", 8901 , DESCR("dot operator; UNICODE(22C5) TABLE(ISOamsb)")},
+#line 36 "./xhtml_ent.gperf"
+ {"Aacute", 193 , DESCR("latin capital letter A with acute; UNICODE(00C1) 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 110 "./xhtml_ent.gperf"
+ {"tilde", 732 , DESCR(" small tilde; UNICODE(02DC) TABLE(ISOdia)")},
+#line 79 "./xhtml_ent.gperf"
+ {"igrave", 236 , DESCR("latin small letter i with grave; UNICODE(00EC) TABLE(ISOlat1)")},
+#line 121 "./xhtml_ent.gperf"
+ {"rsquo", 8217 , DESCR("right single quotation mark; UNICODE(2019) TABLE(ISOnum)")},
+#line 162 "./xhtml_ent.gperf"
+ {"zeta", 950 , DESCR("greek small letter zeta; UNICODE(03B6) ISOgrk3")},
+#line 158 "./xhtml_ent.gperf"
+ {"beta", 946 , DESCR("greek small letter beta; UNICODE(03B2) ISOgrk3")},
+#line 134 "./xhtml_ent.gperf"
+ {"Beta", 914 , DESCR("greek capital letter beta; UNICODE(0392)")},
+#line 120 "./xhtml_ent.gperf"
+ {"lsquo", 8216 , DESCR("left single quotation mark; UNICODE(2018) TABLE(ISOnum)")},
+#line 159 "./xhtml_ent.gperf"
+ {"gamma", 947 , DESCR("greek small letter gamma; UNICODE(03B3) ISOgrk3")},
+#line 92 "./xhtml_ent.gperf"
+ {"ugrave", 249 , DESCR("latin small letter u with grave; UNICODE(00F9) TABLE(ISOlat1)")},
+#line 84 "./xhtml_ent.gperf"
+ {"ntilde", 241 , DESCR("latin small letter n with tilde; UNICODE(00F1) TABLE(ISOlat1)")},
+#line 64 "./xhtml_ent.gperf"
+ {"Yacute", 221 , DESCR("latin capital letter Y with acute; UNICODE(00DD) TABLE(ISOlat1)")},
+#line 113 "./xhtml_ent.gperf"
+ {"thinsp", 8201 , DESCR("thin space; UNICODE(2009) TABLE(ISOpub)")},
+#line 88 "./xhtml_ent.gperf"
+ {"otilde", 245 , DESCR("latin small letter o with tilde; UNICODE(00F5) TABLE(ISOlat1)")},
#line 56 "./xhtml_ent.gperf"
{"Otilde", 213 , DESCR("latin capital letter O with tilde; UNICODE(00D5) 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 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 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 163 "./xhtml_ent.gperf"
+ {"eta", 951 , DESCR("greek small letter eta; UNICODE(03B7) ISOgrk3")},
+#line 135 "./xhtml_ent.gperf"
+ {"Gamma", 915 , DESCR("greek capital letter gamma; UNICODE(0393) ISOgrk3")},
+#line 150 "./xhtml_ent.gperf"
+ {"Sigma", 931 , DESCR("greek capital letter sigma; UNICODE(03A3) ISOgrk3")},
+#line 61 "./xhtml_ent.gperf"
+ {"Uacute", 218 , DESCR("latin capital letter U with acute; UNICODE(00DA) TABLE(ISOlat1)")},
+#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 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 187 "./xhtml_ent.gperf"
+ {"prime", 8242 , DESCR("prime = minutes = feet; UNICODE(2032) TABLE(ISOtech)")},
+#line 160 "./xhtml_ent.gperf"
+ {"delta", 948 , DESCR("greek small letter delta; UNICODE(03B4) ISOgrk3")},
#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 76 "./xhtml_ent.gperf"
+ {"eacute", 233 , DESCR("latin small letter e with acute; UNICODE(00E9) TABLE(ISOlat1)")},
+#line 189 "./xhtml_ent.gperf"
+ {"oline", 8254 , DESCR("overline = spacing overscore; UNICODE(203E) NEW")},
+#line 68 "./xhtml_ent.gperf"
+ {"aacute", 225 , DESCR("latin small letter a with acute; UNICODE(00E1) TABLE(ISOlat1)")},
+#line 165 "./xhtml_ent.gperf"
+ {"iota", 953 , DESCR("greek small letter iota; UNICODE(03B9) ISOgrk3")},
+#line 80 "./xhtml_ent.gperf"
+ {"iacute", 237 , DESCR("latin small letter i with acute; UNICODE(00ED) TABLE(ISOlat1)")},
+#line 96 "./xhtml_ent.gperf"
+ {"yacute", 253 , DESCR("latin small letter y with acute; UNICODE(00FD) TABLE(ISOlat1)")},
+#line 231 "./xhtml_ent.gperf"
+ {"asymp", 8776 , DESCR("almost equal to = asymptotic to; UNICODE(2248) ISOamsr")},
+#line 93 "./xhtml_ent.gperf"
+ {"uacute", 250 , DESCR("latin small letter u with acute; UNICODE(00FA) TABLE(ISOlat1)")},
+#line 130 "./xhtml_ent.gperf"
+ {"rsaquo", 8250 , DESCR("single right-pointing angle quotation mark; UNICODE(203A) ISO proposed")},
+#line 194 "./xhtml_ent.gperf"
+ {"trade", 8482 , DESCR("trade mark sign; UNICODE(2122) TABLE(ISOnum)")},
+#line 129 "./xhtml_ent.gperf"
+ {"lsaquo", 8249 , DESCR("single left-pointing angle quotation mark; UNICODE(2039) ISO proposed")},
+#line 195 "./xhtml_ent.gperf"
+ {"alefsym", 8501 , DESCR("alef symbol = first transfinite cardinal; UNICODE(2135) NEW")},
+#line 242 "./xhtml_ent.gperf"
+ {"otimes", 8855 , DESCR("circled times = vector product; UNICODE(2297) TABLE(ISOamsb)")},
+#line 210 "./xhtml_ent.gperf"
+ {"empty", 8709 , DESCR("empty set = null set = diameter; UNICODE(2205) TABLE(ISOamso)")},
+#line 52 "./xhtml_ent.gperf"
+ {"Ntilde", 209 , DESCR("latin capital letter N with tilde; UNICODE(00D1) 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)")},
-#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 34 "./xhtml_ent.gperf"
+ {"iquest", 191 , DESCR("inverted question mark = turned question mark; UNICODE(00BF) TABLE(ISOnum)")},
+#line 138 "./xhtml_ent.gperf"
+ {"Zeta", 918 , DESCR("greek capital letter zeta; UNICODE(0396)")},
+#line 136 "./xhtml_ent.gperf"
+ {"Delta", 916 , DESCR("greek capital letter delta; UNICODE(0394) ISOgrk3")},
#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)")}
+#line 23 "./xhtml_ent.gperf"
+ {"acute", 180 , DESCR("acute accent = spacing acute; UNICODE(00B4) TABLE(ISOdia)")},
+#line 209 "./xhtml_ent.gperf"
+ {"exist", 8707 , DESCR("there exists; UNICODE(2203) TABLE(ISOtech)")},
+#line 182 "./xhtml_ent.gperf"
+ {"thetasym", 977 , DESCR("greek small letter theta symbol; UNICODE(03D1) NEW")},
+#line 140 "./xhtml_ent.gperf"
+ {"Theta", 920 , DESCR("greek capital letter theta; UNICODE(0398) ISOgrk3")},
+#line 164 "./xhtml_ent.gperf"
+ {"theta", 952 , DESCR("greek small letter theta; UNICODE(03B8) ISOgrk3")}
};
static const short lookup[] =
@@ -624,119 +624,140 @@ 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,
+ 0, -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, 3, -1, -1, 4, -1, -1, -1, 5, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 6,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 7, -1, 8, -1, 9, 10, 11, -1, -1, -1,
+ -1, -1, -1, -1, -1, 12, -1, 13, -1, -1,
+ -1, -1, -1, -1, -1, 14, 15, 16, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 17,
+ -1, -1, -1, -1, -1, -1, -1, -1, 18, -1,
+ -1, -1, -1, -1, -1, -1, -1, 19, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 20, -1, 21,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 22, -1, -1,
+ -1, 23, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 24, -1, 25, -1, -1, -1, -1, -1, -1,
+ -1, 26, -1, -1, 27, -1, -1, 28, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 29, 30, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 31, -1, -1, 32, -1, 33, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 34, -1, -1,
+ -1, -1, -1, -1, 35, -1, -1, -1, -1, -1,
+ -1, -1, 36, -1, -1, -1, 37, -1, 38, -1,
+ -1, -1, 39, -1, -1, -1, -1, 40, -1, -1,
+ -1, -1, 41, -1, -1, -1, -1, 42, 43, -1,
+ 44, 45, 46, -1, -1, -1, 47, 48, -1, 49,
+ 50, -1, 51, -1, -1, 52, -1, 53, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 54, -1,
+ -1, -1, -1, 55, -1, -1, -1, -1, 56, -1,
+ -1, 57, -1, -1, 58, -1, -1, -1, 59, 60,
+ 61, -1, 62, 63, 64, -1, -1, -1, 65, 66,
+ -1, -1, -1, 67, -1, 68, -1, -1, 69, -1,
+ -1, 70, -1, 71, -1, -1, -1, -1, 72, 73,
+ -1, -1, -1, -1, 74, -1, -1, -1, 75, 76,
+ -1, -1, -1, -1, -1, 77, -1, 78, -1, -1,
+ -1, -1, 79, -1, -1, -1, -1, -1, -1, 80,
+ -1, -1, -1, -1, -1, -1, -1, -1, 81, 82,
+ -1, -1, 83, -1, -1, 84, -1, 85, -1, -1,
+ -1, -1, -1, -1, -1, 86, -1, -1, -1, -1,
+ -1, 87, -1, -1, -1, 88, -1, -1, -1, -1,
+ -1, -1, 89, -1, 90, -1, -1, -1, -1, -1,
+ 91, -1, 92, -1, -1, 93, 94, 95, -1, 96,
+ 97, -1, 98, -1, -1, 99, 100, 101, 102, 103,
+ 104, 105, -1, -1, -1, -1, -1, -1, 106, 107,
+ 108, -1, -1, -1, 109, 110, 111, -1, 112, 113,
+ -1, -1, -1, -1, 114, 115, 116, -1, 117, 118,
+ -1, -1, -1, -1, 119, -1, -1, -1, 120, 121,
+ 122, -1, -1, 123, -1, -1, -1, 124, -1, -1,
+ -1, 125, -1, 126, -1, -1, 127, 128, 129, -1,
+ 130, 131, -1, -1, -1, -1, 132, -1, -1, -1,
+ 133, -1, -1, -1, 134, -1, 135, -1, 136, 137,
+ -1, 138, -1, -1, 139, -1, 140, -1, 141, 142,
+ -1, -1, -1, -1, 143, 144, -1, -1, -1, -1,
+ -1, 145, -1, -1, -1, -1, 146, 147, 148, 149,
+ -1, -1, -1, 150, -1, -1, -1, -1, 151, 152,
+ -1, 153, -1, -1, -1, 154, -1, -1, -1, -1,
+ -1, -1, -1, 155, -1, -1, 156, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 157, -1, -1, -1,
+ -1, -1, 158, -1, -1, -1, -1, 159, -1, -1,
+ -1, -1, 160, -1, 161, -1, -1, 162, 163, 164,
+ -1, -1, -1, -1, -1, 165, -1, 166, -1, -1,
+ -1, 167, 168, 169, -1, 170, 171, 172, -1, 173,
+ -1, -1, 174, 175, -1, 176, -1, 177, -1, -1,
+ 178, 179, -1, -1, -1, 180, 181, 182, 183, -1,
+ 184, 185, -1, 186, -1, -1, -1, 187, -1, 188,
+ -1, -1, -1, -1, 189, -1, -1, -1, -1, 190,
+ -1, -1, -1, 191, 192, 193, 194, 195, 196, -1,
+ -1, 197, -1, 198, 199, 200, -1, -1, -1, 201,
+ 202, -1, -1, -1, -1, -1, -1, -1, -1, 203,
+ -1, -1, -1, -1, 204, -1, -1, 205, 206, -1,
+ -1, -1, -1, -1, -1, 207, -1, 208, 209, -1,
+ 210, -1, 211, -1, -1, 212, -1, -1, -1, -1,
+ 213, -1, -1, 214, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 215, 216,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 0, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 217, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 218, -1, 219, -1, -1, -1, -1,
+ -1, -1, -1, 220, -1, -1, 221, -1, -1, 222,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 223, 224, -1, -1, -1,
+ -1, -1, -1, 225, 226, 227, 228, -1, 229, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 230, -1, -1, -1, -1, -1, -1, 231, -1, -1,
+ -1, -1, -1, -1, 232, -1, -1, -1, 233, -1,
+ -1, -1, -1, 234, -1, -1, -1, -1, -1, -1,
+ -1, -1, 235, -1, 236, -1, -1, -1, -1, -1,
+ 237, -1, -1, -1, -1, 238, -1, -1, 239, -1,
+ 240, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 241, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 242, 243, -1, -1, -1, -1, -1,
+ 244, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 245, -1, -1, -1, -1, -1, 246,
-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, 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, -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, 11, 12, -1, -1, -1, -1,
- -1, -1, 13, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -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,
- 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, 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
+ -1, -1, -1, -1, -1, -1, 248, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 249, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 250, -1, -1, -1, -1, 251, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -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 32978be..9eb503e 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.1 2010/01/28 00:38:14 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/xml_ecm.h b/libsrc/Xml.new/xml_ecm.h
index 344cc64..e1b8717 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/xml_ecm_test.c b/libsrc/Xml.new/xml_ecm_test.c
index d473ef8..99805ae 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/xmlgram.c b/libsrc/Xml.new/xmlgram.c
index 897e51b..240dba8 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 2009/04/09 19:09:34 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/xmlparser.c b/libsrc/Xml.new/xmlparser.c
index b08576a..e36f111 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.3 2011/03/08 11:52:56 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/xmlparser.h b/libsrc/Xml.new/xmlparser.h
index 23622e2..a0ab426 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.3 2011/10/28 21:46:53 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/xmlparser_impl.h b/libsrc/Xml.new/xmlparser_impl.h
index 5e10b91..c697005 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.2 2011/03/08 11:52:56 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/Xml.new/xmlread.c b/libsrc/Xml.new/xmlread.c
index 51316b0..4018788 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.4 2011/03/08 11:52:57 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/Makefile.am b/libsrc/langfunc/Makefile.am
index 9be36d6..038aa7d 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-2006 OpenLink Software
+# 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
@@ -54,7 +54,7 @@ generate:
.PHONY: rclean
rclean: clean
- $(RM) unicode3_*.h
+ rm -f unicode3_*.h
# ----------------------------------------------------------------------
diff --git a/libsrc/langfunc/Makefile.in b/libsrc/langfunc/Makefile.in
index c2a9986..9568fee 100644
--- a/libsrc/langfunc/Makefile.in
+++ b/libsrc/langfunc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
liblangfunc_la_LIBADD =
am_liblangfunc_la_OBJECTS = liblangfunc_la-encoding_basic.lo \
@@ -88,10 +85,9 @@ liblangfunc_la_OBJECTS = $(am_liblangfunc_la_OBJECTS)
liblangfunc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblangfunc_la_CFLAGS) \
$(CFLAGS) $(liblangfunc_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -194,7 +190,6 @@ 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@
@@ -278,7 +273,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -299,7 +293,6 @@ 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@
@@ -347,14 +340,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/langfunc/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/langfunc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/langfunc/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/langfunc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -372,7 +365,6 @@ $(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):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -406,108 +398,108 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
liblangfunc_la-encoding_basic.lo: encoding_basic.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-encoding_basic.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-encoding_basic.Tpo -c -o liblangfunc_la-encoding_basic.lo `test -f 'encoding_basic.c' || echo '$(srcdir)/'`encoding_basic.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-encoding_basic.Tpo $(DEPDIR)/liblangfunc_la-encoding_basic.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-encoding_basic.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-encoding_basic.Tpo -c -o liblangfunc_la-encoding_basic.lo `test -f 'encoding_basic.c' || echo '$(srcdir)/'`encoding_basic.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-encoding_basic.Tpo $(DEPDIR)/liblangfunc_la-encoding_basic.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='encoding_basic.c' object='liblangfunc_la-encoding_basic.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-encoding_basic.lo `test -f 'encoding_basic.c' || echo '$(srcdir)/'`encoding_basic.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-encoding_basic.lo `test -f 'encoding_basic.c' || echo '$(srcdir)/'`encoding_basic.c
liblangfunc_la-encoding_charsets.lo: encoding_charsets.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-encoding_charsets.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-encoding_charsets.Tpo -c -o liblangfunc_la-encoding_charsets.lo `test -f 'encoding_charsets.c' || echo '$(srcdir)/'`encoding_charsets.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-encoding_charsets.Tpo $(DEPDIR)/liblangfunc_la-encoding_charsets.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-encoding_charsets.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-encoding_charsets.Tpo -c -o liblangfunc_la-encoding_charsets.lo `test -f 'encoding_charsets.c' || echo '$(srcdir)/'`encoding_charsets.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-encoding_charsets.Tpo $(DEPDIR)/liblangfunc_la-encoding_charsets.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='encoding_charsets.c' object='liblangfunc_la-encoding_charsets.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-encoding_charsets.lo `test -f 'encoding_charsets.c' || echo '$(srcdir)/'`encoding_charsets.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-encoding_charsets.lo `test -f 'encoding_charsets.c' || echo '$(srcdir)/'`encoding_charsets.c
liblangfunc_la-encoding_html.lo: encoding_html.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-encoding_html.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-encoding_html.Tpo -c -o liblangfunc_la-encoding_html.lo `test -f 'encoding_html.c' || echo '$(srcdir)/'`encoding_html.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-encoding_html.Tpo $(DEPDIR)/liblangfunc_la-encoding_html.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-encoding_html.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-encoding_html.Tpo -c -o liblangfunc_la-encoding_html.lo `test -f 'encoding_html.c' || echo '$(srcdir)/'`encoding_html.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-encoding_html.Tpo $(DEPDIR)/liblangfunc_la-encoding_html.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='encoding_html.c' object='liblangfunc_la-encoding_html.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-encoding_html.lo `test -f 'encoding_html.c' || echo '$(srcdir)/'`encoding_html.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-encoding_html.lo `test -f 'encoding_html.c' || echo '$(srcdir)/'`encoding_html.c
liblangfunc_la-encoding_ucm.lo: encoding_ucm.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-encoding_ucm.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-encoding_ucm.Tpo -c -o liblangfunc_la-encoding_ucm.lo `test -f 'encoding_ucm.c' || echo '$(srcdir)/'`encoding_ucm.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-encoding_ucm.Tpo $(DEPDIR)/liblangfunc_la-encoding_ucm.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-encoding_ucm.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-encoding_ucm.Tpo -c -o liblangfunc_la-encoding_ucm.lo `test -f 'encoding_ucm.c' || echo '$(srcdir)/'`encoding_ucm.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-encoding_ucm.Tpo $(DEPDIR)/liblangfunc_la-encoding_ucm.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='encoding_ucm.c' object='liblangfunc_la-encoding_ucm.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-encoding_ucm.lo `test -f 'encoding_ucm.c' || echo '$(srcdir)/'`encoding_ucm.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-encoding_ucm.lo `test -f 'encoding_ucm.c' || echo '$(srcdir)/'`encoding_ucm.c
liblangfunc_la-langfunc.lo: langfunc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-langfunc.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-langfunc.Tpo -c -o liblangfunc_la-langfunc.lo `test -f 'langfunc.c' || echo '$(srcdir)/'`langfunc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-langfunc.Tpo $(DEPDIR)/liblangfunc_la-langfunc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-langfunc.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-langfunc.Tpo -c -o liblangfunc_la-langfunc.lo `test -f 'langfunc.c' || echo '$(srcdir)/'`langfunc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-langfunc.Tpo $(DEPDIR)/liblangfunc_la-langfunc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='langfunc.c' object='liblangfunc_la-langfunc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-langfunc.lo `test -f 'langfunc.c' || echo '$(srcdir)/'`langfunc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-langfunc.lo `test -f 'langfunc.c' || echo '$(srcdir)/'`langfunc.c
liblangfunc_la-langman.lo: langman.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-langman.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-langman.Tpo -c -o liblangfunc_la-langman.lo `test -f 'langman.c' || echo '$(srcdir)/'`langman.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-langman.Tpo $(DEPDIR)/liblangfunc_la-langman.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-langman.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-langman.Tpo -c -o liblangfunc_la-langman.lo `test -f 'langman.c' || echo '$(srcdir)/'`langman.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-langman.Tpo $(DEPDIR)/liblangfunc_la-langman.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='langman.c' object='liblangfunc_la-langman.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-langman.lo `test -f 'langman.c' || echo '$(srcdir)/'`langman.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-langman.lo `test -f 'langman.c' || echo '$(srcdir)/'`langman.c
liblangfunc_la-language__en_US.lo: language__en_US.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-language__en_US.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-language__en_US.Tpo -c -o liblangfunc_la-language__en_US.lo `test -f 'language__en_US.c' || echo '$(srcdir)/'`language__en_US.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-language__en_US.Tpo $(DEPDIR)/liblangfunc_la-language__en_US.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-language__en_US.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-language__en_US.Tpo -c -o liblangfunc_la-language__en_US.lo `test -f 'language__en_US.c' || echo '$(srcdir)/'`language__en_US.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-language__en_US.Tpo $(DEPDIR)/liblangfunc_la-language__en_US.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='language__en_US.c' object='liblangfunc_la-language__en_US.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-language__en_US.lo `test -f 'language__en_US.c' || echo '$(srcdir)/'`language__en_US.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-language__en_US.lo `test -f 'language__en_US.c' || echo '$(srcdir)/'`language__en_US.c
liblangfunc_la-language__x_ViDoc.lo: language__x_ViDoc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-language__x_ViDoc.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-language__x_ViDoc.Tpo -c -o liblangfunc_la-language__x_ViDoc.lo `test -f 'language__x_ViDoc.c' || echo '$(srcdir)/'`language__x_ViDoc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-language__x_ViDoc.Tpo $(DEPDIR)/liblangfunc_la-language__x_ViDoc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-language__x_ViDoc.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-language__x_ViDoc.Tpo -c -o liblangfunc_la-language__x_ViDoc.lo `test -f 'language__x_ViDoc.c' || echo '$(srcdir)/'`language__x_ViDoc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-language__x_ViDoc.Tpo $(DEPDIR)/liblangfunc_la-language__x_ViDoc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='language__x_ViDoc.c' object='liblangfunc_la-language__x_ViDoc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-language__x_ViDoc.lo `test -f 'language__x_ViDoc.c' || echo '$(srcdir)/'`language__x_ViDoc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-language__x_ViDoc.lo `test -f 'language__x_ViDoc.c' || echo '$(srcdir)/'`language__x_ViDoc.c
liblangfunc_la-language__x_ViAny.lo: language__x_ViAny.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-language__x_ViAny.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-language__x_ViAny.Tpo -c -o liblangfunc_la-language__x_ViAny.lo `test -f 'language__x_ViAny.c' || echo '$(srcdir)/'`language__x_ViAny.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-language__x_ViAny.Tpo $(DEPDIR)/liblangfunc_la-language__x_ViAny.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-language__x_ViAny.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-language__x_ViAny.Tpo -c -o liblangfunc_la-language__x_ViAny.lo `test -f 'language__x_ViAny.c' || echo '$(srcdir)/'`language__x_ViAny.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-language__x_ViAny.Tpo $(DEPDIR)/liblangfunc_la-language__x_ViAny.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='language__x_ViAny.c' object='liblangfunc_la-language__x_ViAny.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-language__x_ViAny.lo `test -f 'language__x_ViAny.c' || echo '$(srcdir)/'`language__x_ViAny.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-language__x_ViAny.lo `test -f 'language__x_ViAny.c' || echo '$(srcdir)/'`language__x_ViAny.c
liblangfunc_la-latin1ctype.lo: latin1ctype.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-latin1ctype.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-latin1ctype.Tpo -c -o liblangfunc_la-latin1ctype.lo `test -f 'latin1ctype.c' || echo '$(srcdir)/'`latin1ctype.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-latin1ctype.Tpo $(DEPDIR)/liblangfunc_la-latin1ctype.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-latin1ctype.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-latin1ctype.Tpo -c -o liblangfunc_la-latin1ctype.lo `test -f 'latin1ctype.c' || echo '$(srcdir)/'`latin1ctype.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-latin1ctype.Tpo $(DEPDIR)/liblangfunc_la-latin1ctype.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='latin1ctype.c' object='liblangfunc_la-latin1ctype.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-latin1ctype.lo `test -f 'latin1ctype.c' || echo '$(srcdir)/'`latin1ctype.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-latin1ctype.lo `test -f 'latin1ctype.c' || echo '$(srcdir)/'`latin1ctype.c
liblangfunc_la-ucm2enc.lo: ucm2enc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-ucm2enc.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-ucm2enc.Tpo -c -o liblangfunc_la-ucm2enc.lo `test -f 'ucm2enc.c' || echo '$(srcdir)/'`ucm2enc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-ucm2enc.Tpo $(DEPDIR)/liblangfunc_la-ucm2enc.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-ucm2enc.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-ucm2enc.Tpo -c -o liblangfunc_la-ucm2enc.lo `test -f 'ucm2enc.c' || echo '$(srcdir)/'`ucm2enc.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-ucm2enc.Tpo $(DEPDIR)/liblangfunc_la-ucm2enc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ucm2enc.c' object='liblangfunc_la-ucm2enc.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-ucm2enc.lo `test -f 'ucm2enc.c' || echo '$(srcdir)/'`ucm2enc.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-ucm2enc.lo `test -f 'ucm2enc.c' || echo '$(srcdir)/'`ucm2enc.c
liblangfunc_la-unicode3.lo: unicode3.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-unicode3.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-unicode3.Tpo -c -o liblangfunc_la-unicode3.lo `test -f 'unicode3.c' || echo '$(srcdir)/'`unicode3.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblangfunc_la-unicode3.Tpo $(DEPDIR)/liblangfunc_la-unicode3.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -MT liblangfunc_la-unicode3.lo -MD -MP -MF $(DEPDIR)/liblangfunc_la-unicode3.Tpo -c -o liblangfunc_la-unicode3.lo `test -f 'unicode3.c' || echo '$(srcdir)/'`unicode3.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liblangfunc_la-unicode3.Tpo $(DEPDIR)/liblangfunc_la-unicode3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unicode3.c' object='liblangfunc_la-unicode3.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-unicode3.lo `test -f 'unicode3.c' || echo '$(srcdir)/'`unicode3.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblangfunc_la_CFLAGS) $(CFLAGS) -c -o liblangfunc_la-unicode3.lo `test -f 'unicode3.c' || echo '$(srcdir)/'`unicode3.c
mostlyclean-libtool:
-rm -f *.lo
@@ -520,49 +512,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -583,17 +571,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -621,7 +605,6 @@ clean-generic:
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"
@@ -643,8 +626,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -653,28 +634,18 @@ install-data-am:
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
@@ -719,8 +690,7 @@ generate:
.PHONY: rclean
rclean: clean
- $(RM) unicode3_*.h
-
+ rm -f unicode3_*.h
# 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/libsrc/langfunc/encoding_basic.c b/libsrc/langfunc/encoding_basic.c
index 6c507f7..d1d1973 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/encoding_charsets.c b/libsrc/langfunc/encoding_charsets.c
index aa079b9..e18ccf6 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/encoding_ucm.c b/libsrc/langfunc/encoding_ucm.c
index 9312bcf..bd9e740 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/encoding_wide.c b/libsrc/langfunc/encoding_wide.c
index ea5d919..e76d066 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/lang25.c b/libsrc/langfunc/lang25.c
index acf1177..476d748 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/langfunc.c b/libsrc/langfunc/langfunc.c
index f83142d..96d114b 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/langfunc.h b/libsrc/langfunc/langfunc.h
index c9b7dde..36722c0 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-2006 OpenLink Software
+ * 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
@@ -112,12 +112,16 @@ 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 141d39b..05be81d 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/langman.c b/libsrc/langfunc/langman.c
index 95b990f..a881483 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/language__en_UK.c b/libsrc/langfunc/language__en_UK.c
index 8ced98c..ca766cb 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/language__en_US.c b/libsrc/langfunc/language__en_US.c
index 990674e..ca84b4e 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/language__ru_RU.c b/libsrc/langfunc/language__ru_RU.c
index 8c93be3..196d117 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/language__x_ViAny.c b/libsrc/langfunc/language__x_ViAny.c
index 4468736..25699f7 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.1 2009/08/09 00:09:06 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2008 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/language__x_ViDoc.c b/libsrc/langfunc/language__x_ViDoc.c
index 74a9a13..b03dc3b 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/ucm.h b/libsrc/langfunc/ucm.h
index 14853ca..aff3e12 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/ucm2enc.c b/libsrc/langfunc/ucm2enc.c
index d51cda3..783dbaa 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/unicode3.c b/libsrc/langfunc/unicode3.c
index b9105da..e6f2ddb 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/unicode3_all_chars.h b/libsrc/langfunc/unicode3_all_chars.h
index 4ec8214..628e9b5 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/unicode3_basechars.h b/libsrc/langfunc/unicode3_basechars.h
index 2639a98..f5150fa 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/unicode3_lowers.h b/libsrc/langfunc/unicode3_lowers.h
index 73a46ad..4fb38fc 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/unicode3_spaces.h b/libsrc/langfunc/unicode3_spaces.h
index 6be1ff9..23dd91e 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/unicode3_uppers.h b/libsrc/langfunc/unicode3_uppers.h
index 0ace8da..74ae9b4 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/langfunc/unicodetab2h.sh b/libsrc/langfunc/unicodetab2h.sh
index 8ac453a..e318354 100755
--- a/libsrc/langfunc/unicodetab2h.sh
+++ b/libsrc/langfunc/unicodetab2h.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: unicodetab2h.sh,v 1.3.2.1 2011/01/18 14:36:37 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
@@ -71,7 +71,7 @@ cat > $2 <<-EOF
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/libutil.h b/libsrc/libutil.h
index ba29432..ab99ce2 100644
--- a/libsrc/libutil.h
+++ b/libsrc/libutil.h
@@ -1,12 +1,12 @@
/*
* libutil.h
*
- * $Id: libutil.h,v 1.4 2007/07/18 12:33:29 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/odbcsdk/Makefile.am b/libsrc/odbcsdk/Makefile.am
index 51dd68a..af68e21 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/odbcsdk/Makefile.in b/libsrc/odbcsdk/Makefile.in
index cd159cc..e74f762 100644
--- a/libsrc/odbcsdk/Makefile.in
+++ b/libsrc/odbcsdk/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -37,9 +36,8 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,7 +67,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +157,6 @@ 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@
@@ -244,7 +240,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -265,7 +260,6 @@ 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@
@@ -290,14 +284,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/odbcsdk/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/odbcsdk/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/odbcsdk/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/odbcsdk/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -315,7 +309,6 @@ $(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
@@ -345,17 +338,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -383,7 +372,6 @@ clean-generic:
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"
@@ -402,8 +390,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -412,28 +398,18 @@ install-data-am:
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
@@ -467,7 +443,6 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
# 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/libsrc/odbcsdk/include/iodbcext.h b/libsrc/odbcsdk/include/iodbcext.h
index 6d4e93e..a8f9132 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-2006 OpenLink Software
+ * 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
@@ -23,7 +23,7 @@
/*
* iodbcext.h
*
- * $Id: iodbcext.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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 bcef411..85586c4 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* iODBC Installer defines
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2005 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 957007d..0ed4534 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* ODBC defines for Unix
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2004 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 0d3ee39..d876149 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* iODBC defines
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 2249dbc..288e644 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* iODBC defines (ext)
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 4858ee0..5a62606 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* iODBC typedefs
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 4bae7bc..55589fd 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* iODBC Installer defines
*
* The iODBC driver manager.
*
- * Copyright (C) 1999-2005 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1999-2012 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 7900013..6036737 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* ODBC defines
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 658f969..93321f6 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* ODBC defines (ext)
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 5c50630..e616dab 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* ODBC typedefs
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2003 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 50179ab..45381db 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* ODBC Unicode defines
*
* The iODBC driver manager.
*
- * Copyright (C) 1996-2003 by OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2012 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 839623b..39a431b 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-2006 OpenLink Software
+# 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
diff --git a/libsrc/plugin/Makefile.in b/libsrc/plugin/Makefile.in
index 9390652..b00c2e2 100644
--- a/libsrc/plugin/Makefile.in
+++ b/libsrc/plugin/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -39,9 +38,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -72,7 +70,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
hosting_sample_la_LIBADD =
am_hosting_sample_la_OBJECTS = hosting_sample_la-hosting_sample.lo
@@ -97,10 +94,9 @@ plugin_sample_la_OBJECTS = $(am_plugin_sample_la_OBJECTS)
plugin_sample_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(plugin_sample_la_CFLAGS) \
$(CFLAGS) $(plugin_sample_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -205,7 +201,6 @@ 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@
@@ -289,7 +284,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -310,7 +304,6 @@ 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@
@@ -407,14 +400,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/plugin/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/plugin/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/plugin/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/plugin/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -432,7 +425,6 @@ $(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):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -466,80 +458,80 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
hosting_sample_la-hosting_sample.lo: hosting_sample.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_sample_la_CFLAGS) $(CFLAGS) -MT hosting_sample_la-hosting_sample.lo -MD -MP -MF $(DEPDIR)/hosting_sample_la-hosting_sample.Tpo -c -o hosting_sample_la-hosting_sample.lo `test -f 'hosting_sample.c' || echo '$(srcdir)/'`hosting_sample.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hosting_sample_la-hosting_sample.Tpo $(DEPDIR)/hosting_sample_la-hosting_sample.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_sample_la_CFLAGS) $(CFLAGS) -MT hosting_sample_la-hosting_sample.lo -MD -MP -MF $(DEPDIR)/hosting_sample_la-hosting_sample.Tpo -c -o hosting_sample_la-hosting_sample.lo `test -f 'hosting_sample.c' || echo '$(srcdir)/'`hosting_sample.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hosting_sample_la-hosting_sample.Tpo $(DEPDIR)/hosting_sample_la-hosting_sample.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosting_sample.c' object='hosting_sample_la-hosting_sample.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(hosting_sample_la_CFLAGS) $(CFLAGS) -c -o hosting_sample_la-hosting_sample.lo `test -f 'hosting_sample.c' || echo '$(srcdir)/'`hosting_sample.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hosting_sample_la_CFLAGS) $(CFLAGS) -c -o hosting_sample_la-hosting_sample.lo `test -f 'hosting_sample.c' || echo '$(srcdir)/'`hosting_sample.c
libplugin_la-plugin.lo: plugin.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-plugin.lo -MD -MP -MF $(DEPDIR)/libplugin_la-plugin.Tpo -c -o libplugin_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libplugin_la-plugin.Tpo $(DEPDIR)/libplugin_la-plugin.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-plugin.lo -MD -MP -MF $(DEPDIR)/libplugin_la-plugin.Tpo -c -o libplugin_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libplugin_la-plugin.Tpo $(DEPDIR)/libplugin_la-plugin.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plugin.c' object='libplugin_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
libplugin_la-dlf.lo: dlf.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-dlf.lo -MD -MP -MF $(DEPDIR)/libplugin_la-dlf.Tpo -c -o libplugin_la-dlf.lo `test -f 'dlf.c' || echo '$(srcdir)/'`dlf.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libplugin_la-dlf.Tpo $(DEPDIR)/libplugin_la-dlf.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-dlf.lo -MD -MP -MF $(DEPDIR)/libplugin_la-dlf.Tpo -c -o libplugin_la-dlf.lo `test -f 'dlf.c' || echo '$(srcdir)/'`dlf.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libplugin_la-dlf.Tpo $(DEPDIR)/libplugin_la-dlf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dlf.c' object='libplugin_la-dlf.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-dlf.lo `test -f 'dlf.c' || echo '$(srcdir)/'`dlf.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-dlf.lo `test -f 'dlf.c' || echo '$(srcdir)/'`dlf.c
libplugin_la-plugin_unix.lo: plugin_unix.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-plugin_unix.lo -MD -MP -MF $(DEPDIR)/libplugin_la-plugin_unix.Tpo -c -o libplugin_la-plugin_unix.lo `test -f 'plugin_unix.c' || echo '$(srcdir)/'`plugin_unix.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libplugin_la-plugin_unix.Tpo $(DEPDIR)/libplugin_la-plugin_unix.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-plugin_unix.lo -MD -MP -MF $(DEPDIR)/libplugin_la-plugin_unix.Tpo -c -o libplugin_la-plugin_unix.lo `test -f 'plugin_unix.c' || echo '$(srcdir)/'`plugin_unix.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libplugin_la-plugin_unix.Tpo $(DEPDIR)/libplugin_la-plugin_unix.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plugin_unix.c' object='libplugin_la-plugin_unix.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-plugin_unix.lo `test -f 'plugin_unix.c' || echo '$(srcdir)/'`plugin_unix.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-plugin_unix.lo `test -f 'plugin_unix.c' || echo '$(srcdir)/'`plugin_unix.c
libplugin_la-export_gate_virtuoso.lo: export_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-export_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/libplugin_la-export_gate_virtuoso.Tpo -c -o libplugin_la-export_gate_virtuoso.lo `test -f 'export_gate_virtuoso.c' || echo '$(srcdir)/'`export_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libplugin_la-export_gate_virtuoso.Tpo $(DEPDIR)/libplugin_la-export_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-export_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/libplugin_la-export_gate_virtuoso.Tpo -c -o libplugin_la-export_gate_virtuoso.lo `test -f 'export_gate_virtuoso.c' || echo '$(srcdir)/'`export_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libplugin_la-export_gate_virtuoso.Tpo $(DEPDIR)/libplugin_la-export_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='export_gate_virtuoso.c' object='libplugin_la-export_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-export_gate_virtuoso.lo `test -f 'export_gate_virtuoso.c' || echo '$(srcdir)/'`export_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-export_gate_virtuoso.lo `test -f 'export_gate_virtuoso.c' || echo '$(srcdir)/'`export_gate_virtuoso.c
libplugin_la-gate_virtuoso_stubs.lo: gate_virtuoso_stubs.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-gate_virtuoso_stubs.lo -MD -MP -MF $(DEPDIR)/libplugin_la-gate_virtuoso_stubs.Tpo -c -o libplugin_la-gate_virtuoso_stubs.lo `test -f 'gate_virtuoso_stubs.c' || echo '$(srcdir)/'`gate_virtuoso_stubs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libplugin_la-gate_virtuoso_stubs.Tpo $(DEPDIR)/libplugin_la-gate_virtuoso_stubs.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -MT libplugin_la-gate_virtuoso_stubs.lo -MD -MP -MF $(DEPDIR)/libplugin_la-gate_virtuoso_stubs.Tpo -c -o libplugin_la-gate_virtuoso_stubs.lo `test -f 'gate_virtuoso_stubs.c' || echo '$(srcdir)/'`gate_virtuoso_stubs.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libplugin_la-gate_virtuoso_stubs.Tpo $(DEPDIR)/libplugin_la-gate_virtuoso_stubs.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gate_virtuoso_stubs.c' object='libplugin_la-gate_virtuoso_stubs.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-gate_virtuoso_stubs.lo `test -f 'gate_virtuoso_stubs.c' || echo '$(srcdir)/'`gate_virtuoso_stubs.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplugin_la_CFLAGS) $(CFLAGS) -c -o libplugin_la-gate_virtuoso_stubs.lo `test -f 'gate_virtuoso_stubs.c' || echo '$(srcdir)/'`gate_virtuoso_stubs.c
plugin_sample_la-plugin_sample.lo: plugin_sample.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugin_sample_la_CFLAGS) $(CFLAGS) -MT plugin_sample_la-plugin_sample.lo -MD -MP -MF $(DEPDIR)/plugin_sample_la-plugin_sample.Tpo -c -o plugin_sample_la-plugin_sample.lo `test -f 'plugin_sample.c' || echo '$(srcdir)/'`plugin_sample.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/plugin_sample_la-plugin_sample.Tpo $(DEPDIR)/plugin_sample_la-plugin_sample.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugin_sample_la_CFLAGS) $(CFLAGS) -MT plugin_sample_la-plugin_sample.lo -MD -MP -MF $(DEPDIR)/plugin_sample_la-plugin_sample.Tpo -c -o plugin_sample_la-plugin_sample.lo `test -f 'plugin_sample.c' || echo '$(srcdir)/'`plugin_sample.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/plugin_sample_la-plugin_sample.Tpo $(DEPDIR)/plugin_sample_la-plugin_sample.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plugin_sample.c' object='plugin_sample_la-plugin_sample.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(plugin_sample_la_CFLAGS) $(CFLAGS) -c -o plugin_sample_la-plugin_sample.lo `test -f 'plugin_sample.c' || echo '$(srcdir)/'`plugin_sample.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugin_sample_la_CFLAGS) $(CFLAGS) -c -o plugin_sample_la-plugin_sample.lo `test -f 'plugin_sample.c' || echo '$(srcdir)/'`plugin_sample.c
plugin_sample_la-import_gate_virtuoso.lo: import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugin_sample_la_CFLAGS) $(CFLAGS) -MT plugin_sample_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/plugin_sample_la-import_gate_virtuoso.Tpo -c -o plugin_sample_la-import_gate_virtuoso.lo `test -f 'import_gate_virtuoso.c' || echo '$(srcdir)/'`import_gate_virtuoso.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/plugin_sample_la-import_gate_virtuoso.Tpo $(DEPDIR)/plugin_sample_la-import_gate_virtuoso.Plo
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugin_sample_la_CFLAGS) $(CFLAGS) -MT plugin_sample_la-import_gate_virtuoso.lo -MD -MP -MF $(DEPDIR)/plugin_sample_la-import_gate_virtuoso.Tpo -c -o plugin_sample_la-import_gate_virtuoso.lo `test -f 'import_gate_virtuoso.c' || echo '$(srcdir)/'`import_gate_virtuoso.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/plugin_sample_la-import_gate_virtuoso.Tpo $(DEPDIR)/plugin_sample_la-import_gate_virtuoso.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='import_gate_virtuoso.c' object='plugin_sample_la-import_gate_virtuoso.lo' libtool=yes @AMDEPBACKSLASH@
@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) $(plugin_sample_la_CFLAGS) $(CFLAGS) -c -o plugin_sample_la-import_gate_virtuoso.lo `test -f 'import_gate_virtuoso.c' || echo '$(srcdir)/'`import_gate_virtuoso.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugin_sample_la_CFLAGS) $(CFLAGS) -c -o plugin_sample_la-import_gate_virtuoso.lo `test -f 'import_gate_virtuoso.c' || echo '$(srcdir)/'`import_gate_virtuoso.c
mostlyclean-libtool:
-rm -f *.lo
@@ -552,49 +544,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -615,17 +603,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -655,7 +639,6 @@ clean-generic:
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)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -679,8 +662,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -689,28 +670,18 @@ install-data-am:
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
@@ -733,7 +704,7 @@ ps-am:
uninstall-am:
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -755,7 +726,6 @@ $(generated_code): .generated
cd $(top_srcdir)/libsrc/plugin; ./gen_all_gates.sh
-rm -rf tmp
touch .generated
-
# 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/libsrc/plugin/dlf.c b/libsrc/plugin/dlf.c
index 03bb575..855e89c 100644
--- a/libsrc/plugin/dlf.c
+++ b/libsrc/plugin/dlf.c
@@ -1,14 +1,14 @@
/*
* dlf.c
*
- * $Id: dlf.c,v 1.4 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* dynamic load functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/dlf.h b/libsrc/plugin/dlf.h
index 21c5337..ba07571 100644
--- a/libsrc/plugin/dlf.h
+++ b/libsrc/plugin/dlf.h
@@ -1,14 +1,14 @@
/*
* dlf.h
*
- * $Id: dlf.h,v 1.4 2008/09/16 14:52:23 source Exp $
+ * $Id$
*
* dynamic load functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/exe_export.h b/libsrc/plugin/exe_export.h
index a84c727..4b1656b 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 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/export_gate_virtuoso.c b/libsrc/plugin/export_gate_virtuoso.c
index b4913eb..4a7fea0 100644
--- a/libsrc/plugin/export_gate_virtuoso.c
+++ b/libsrc/plugin/export_gate_virtuoso.c
@@ -140,9 +140,11 @@ _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" },
@@ -236,6 +238,7 @@ _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" },
@@ -254,6 +257,7 @@ _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" },
@@ -290,6 +294,7 @@ _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 5affa44..466d904 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 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/gate_virtuoso_stubs.c b/libsrc/plugin/gate_virtuoso_stubs.c
index 6ee7392..7131287 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 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/gate_virtuoso_stubs.h b/libsrc/plugin/gate_virtuoso_stubs.h
index c8981f9..2305072 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 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/gen_all_gates.sh b/libsrc/plugin/gen_all_gates.sh
index 46aef12..0381ad5 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 2009/04/14 12:16:50 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/libsrc/plugin/gen_gate.sh b/libsrc/plugin/gen_gate.sh
index de233c8..ea7a66b 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.1 2010/02/03 19:14:35 source Exp $
+# $Id$
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2009 OpenLink Software
+# 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
diff --git a/libsrc/plugin/hosting_sample.c b/libsrc/plugin/hosting_sample.c
index 76ca80f..e59d8fc 100644
--- a/libsrc/plugin/hosting_sample.c
+++ b/libsrc/plugin/hosting_sample.c
@@ -1,10 +1,10 @@
/*
- * $Id: hosting_sample.c,v 1.2 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/import_gate_virtuoso.c b/libsrc/plugin/import_gate_virtuoso.c
index d884f2b..549de0e 100644
--- a/libsrc/plugin/import_gate_virtuoso.c
+++ b/libsrc/plugin/import_gate_virtuoso.c
@@ -60,9 +60,11 @@ 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" },
@@ -156,6 +158,7 @@ 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" },
@@ -174,6 +177,7 @@ 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" },
@@ -210,6 +214,7 @@ 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 931beed..73397be 100644
--- a/libsrc/plugin/import_gate_virtuoso.h
+++ b/libsrc/plugin/import_gate_virtuoso.h
@@ -112,9 +112,11 @@ 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;
@@ -208,6 +210,7 @@ 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;
@@ -226,6 +229,7 @@ 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;
@@ -262,6 +266,7 @@ 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;
@@ -348,9 +353,11 @@ 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)
@@ -444,6 +451,7 @@ 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)
@@ -462,6 +470,7 @@ 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)
@@ -498,6 +507,7 @@ 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 55da0ea..61fe194 100644
--- a/libsrc/plugin/msdtc_plugin.c
+++ b/libsrc/plugin/msdtc_plugin.c
@@ -1,10 +1,10 @@
/*
- * $Id: msdtc_plugin.c,v 1.2 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/plugin.c b/libsrc/plugin/plugin.c
index 1fc1f0e..1fe7fd1 100644
--- a/libsrc/plugin/plugin.c
+++ b/libsrc/plugin/plugin.c
@@ -1,12 +1,12 @@
/*
* plugin.c
*
- * $Id: plugin.c,v 1.3 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/plugin.h b/libsrc/plugin/plugin.h
index d4b261a..1c5f230 100644
--- a/libsrc/plugin/plugin.h
+++ b/libsrc/plugin/plugin.h
@@ -1,12 +1,12 @@
/*
* plugin.h
*
- * $Id: plugin.h,v 1.4 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/plugin_lang25.h b/libsrc/plugin/plugin_lang25.h
index f72954c..e680120 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 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/plugin_msdtc.h b/libsrc/plugin/plugin_msdtc.h
index cbc9fbe..c14765b 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 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/plugin_sample.c b/libsrc/plugin/plugin_sample.c
index e28cd43..d376345 100644
--- a/libsrc/plugin/plugin_sample.c
+++ b/libsrc/plugin/plugin_sample.c
@@ -1,10 +1,10 @@
/*
- * $Id: plugin_sample.c,v 1.3 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/plugin_unix.c b/libsrc/plugin/plugin_unix.c
index 8c23cc0..35b9b43 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 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/plugin/plugin_win32.c b/libsrc/plugin/plugin_win32.c
index fc353fe..6c4c3b7 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 2009/04/09 17:53:08 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/Makefile.am b/libsrc/util/Makefile.am
index 9525c04..0b93a5a 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-2006 OpenLink Software
+# 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
@@ -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
+ startup.h strfuns.h utalloc.h utf8funs.h uuid.h uuidP.h sslengine.h
libutil_la_CFLAGS = @VIRT_AM_CFLAGS@
libutil_la_CFLAGS += -D_GNU_SOURCE -DIN_LIBUTIL -DGLOBALREF=extern
@@ -64,6 +64,7 @@ libutil_la_SOURCES = \
regsub.c \
rtrim.c \
setext.c \
+ sslengine.c \
startup.c \
stpcpy.c \
strcpyin.c \
@@ -81,6 +82,7 @@ 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 eb93fd1..cf8c332 100644
--- a/libsrc/util/Makefile.in
+++ b/libsrc/util/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 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.
+# 2003, 2004, 2005, 2006 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.
@@ -19,7 +18,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2006 OpenLink Software
+# 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
@@ -38,9 +37,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -71,7 +69,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libutil_la_LIBADD =
am_libutil_la_OBJECTS = libutil_la-buildarg.lo libutil_la-cfg2.lo \
@@ -87,15 +84,16 @@ 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-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-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-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 \
@@ -111,10 +109,9 @@ libutil_la_OBJECTS = $(am_libutil_la_OBJECTS)
libutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libutil_la_CFLAGS) \
$(CFLAGS) $(libutil_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/libsrc/Dk
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/libsrc/Dk at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/binsrc/config/depcomp
am__depfiles_maybe = depfiles
-am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -217,7 +214,6 @@ 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@
@@ -301,7 +297,6 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -322,7 +317,6 @@ 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@
@@ -331,7 +325,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
+ startup.h strfuns.h utalloc.h utf8funs.h uuid.h uuidP.h sslengine.h
libutil_la_CFLAGS = @VIRT_AM_CFLAGS@ -D_GNU_SOURCE -DIN_LIBUTIL \
-DGLOBALREF=extern -I$(top_srcdir)/libsrc \
@@ -368,6 +362,7 @@ libutil_la_SOURCES = \
regsub.c \
rtrim.c \
setext.c \
+ sslengine.c \
startup.c \
stpcpy.c \
strcpyin.c \
@@ -385,6 +380,7 @@ libutil_la_SOURCES = \
usage.c \
uuid.c \
wcslen.c \
+ virt_mbrlen.c \
virt_mbrtowc.c \
virt_mbsnrtowcs.c \
virt_wcrtomb.c \
@@ -439,14 +435,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@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; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/util/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libsrc/util/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsrc/util/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu libsrc/util/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -464,7 +460,6 @@ $(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):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -530,6 +525,7 @@ 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@
@@ -546,6 +542,7 @@ 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@
@@ -555,507 +552,521 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libutil_la-buildarg.lo: buildarg.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-buildarg.lo -MD -MP -MF $(DEPDIR)/libutil_la-buildarg.Tpo -c -o libutil_la-buildarg.lo `test -f 'buildarg.c' || echo '$(srcdir)/'`buildarg.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-buildarg.Tpo $(DEPDIR)/libutil_la-buildarg.Plo
+ 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-buildarg.lo -MD -MP -MF $(DEPDIR)/libutil_la-buildarg.Tpo -c -o libutil_la-buildarg.lo `test -f 'buildarg.c' || echo '$(srcdir)/'`buildarg.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-buildarg.Tpo $(DEPDIR)/libutil_la-buildarg.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='buildarg.c' object='libutil_la-buildarg.lo' libtool=yes @AMDEPBACKSLASH@
@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-buildarg.lo `test -f 'buildarg.c' || echo '$(srcdir)/'`buildarg.c
+ 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-buildarg.lo `test -f 'buildarg.c' || echo '$(srcdir)/'`buildarg.c
libutil_la-cfg2.lo: cfg2.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-cfg2.lo -MD -MP -MF $(DEPDIR)/libutil_la-cfg2.Tpo -c -o libutil_la-cfg2.lo `test -f 'cfg2.c' || echo '$(srcdir)/'`cfg2.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-cfg2.Tpo $(DEPDIR)/libutil_la-cfg2.Plo
+ 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-cfg2.lo -MD -MP -MF $(DEPDIR)/libutil_la-cfg2.Tpo -c -o libutil_la-cfg2.lo `test -f 'cfg2.c' || echo '$(srcdir)/'`cfg2.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-cfg2.Tpo $(DEPDIR)/libutil_la-cfg2.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cfg2.c' object='libutil_la-cfg2.lo' libtool=yes @AMDEPBACKSLASH@
@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-cfg2.lo `test -f 'cfg2.c' || echo '$(srcdir)/'`cfg2.c
+ 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-cfg2.lo `test -f 'cfg2.c' || echo '$(srcdir)/'`cfg2.c
libutil_la-cslentry.lo: cslentry.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-cslentry.lo -MD -MP -MF $(DEPDIR)/libutil_la-cslentry.Tpo -c -o libutil_la-cslentry.lo `test -f 'cslentry.c' || echo '$(srcdir)/'`cslentry.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-cslentry.Tpo $(DEPDIR)/libutil_la-cslentry.Plo
+ 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-cslentry.lo -MD -MP -MF $(DEPDIR)/libutil_la-cslentry.Tpo -c -o libutil_la-cslentry.lo `test -f 'cslentry.c' || echo '$(srcdir)/'`cslentry.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-cslentry.Tpo $(DEPDIR)/libutil_la-cslentry.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cslentry.c' object='libutil_la-cslentry.lo' libtool=yes @AMDEPBACKSLASH@
@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-cslentry.lo `test -f 'cslentry.c' || echo '$(srcdir)/'`cslentry.c
+ 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-cslentry.lo `test -f 'cslentry.c' || echo '$(srcdir)/'`cslentry.c
libutil_la-csllkup.lo: csllkup.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-csllkup.lo -MD -MP -MF $(DEPDIR)/libutil_la-csllkup.Tpo -c -o libutil_la-csllkup.lo `test -f 'csllkup.c' || echo '$(srcdir)/'`csllkup.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-csllkup.Tpo $(DEPDIR)/libutil_la-csllkup.Plo
+ 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-csllkup.lo -MD -MP -MF $(DEPDIR)/libutil_la-csllkup.Tpo -c -o libutil_la-csllkup.lo `test -f 'csllkup.c' || echo '$(srcdir)/'`csllkup.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-csllkup.Tpo $(DEPDIR)/libutil_la-csllkup.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='csllkup.c' object='libutil_la-csllkup.lo' libtool=yes @AMDEPBACKSLASH@
@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-csllkup.lo `test -f 'csllkup.c' || echo '$(srcdir)/'`csllkup.c
+ 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-csllkup.lo `test -f 'csllkup.c' || echo '$(srcdir)/'`csllkup.c
libutil_la-cslnment.lo: cslnment.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-cslnment.lo -MD -MP -MF $(DEPDIR)/libutil_la-cslnment.Tpo -c -o libutil_la-cslnment.lo `test -f 'cslnment.c' || echo '$(srcdir)/'`cslnment.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-cslnment.Tpo $(DEPDIR)/libutil_la-cslnment.Plo
+ 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-cslnment.lo -MD -MP -MF $(DEPDIR)/libutil_la-cslnment.Tpo -c -o libutil_la-cslnment.lo `test -f 'cslnment.c' || echo '$(srcdir)/'`cslnment.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-cslnment.Tpo $(DEPDIR)/libutil_la-cslnment.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cslnment.c' object='libutil_la-cslnment.lo' libtool=yes @AMDEPBACKSLASH@
@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-cslnment.lo `test -f 'cslnment.c' || echo '$(srcdir)/'`cslnment.c
+ 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-cslnment.lo `test -f 'cslnment.c' || echo '$(srcdir)/'`cslnment.c
libutil_la-dbgmal.lo: dbgmal.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-dbgmal.lo -MD -MP -MF $(DEPDIR)/libutil_la-dbgmal.Tpo -c -o libutil_la-dbgmal.lo `test -f 'dbgmal.c' || echo '$(srcdir)/'`dbgmal.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-dbgmal.Tpo $(DEPDIR)/libutil_la-dbgmal.Plo
+ 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-dbgmal.lo -MD -MP -MF $(DEPDIR)/libutil_la-dbgmal.Tpo -c -o libutil_la-dbgmal.lo `test -f 'dbgmal.c' || echo '$(srcdir)/'`dbgmal.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-dbgmal.Tpo $(DEPDIR)/libutil_la-dbgmal.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dbgmal.c' object='libutil_la-dbgmal.lo' libtool=yes @AMDEPBACKSLASH@
@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-dbgmal.lo `test -f 'dbgmal.c' || echo '$(srcdir)/'`dbgmal.c
+ 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-dbgmal.lo `test -f 'dbgmal.c' || echo '$(srcdir)/'`dbgmal.c
libutil_la-debug.lo: debug.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-debug.lo -MD -MP -MF $(DEPDIR)/libutil_la-debug.Tpo -c -o libutil_la-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-debug.Tpo $(DEPDIR)/libutil_la-debug.Plo
+ 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-debug.lo -MD -MP -MF $(DEPDIR)/libutil_la-debug.Tpo -c -o libutil_la-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-debug.Tpo $(DEPDIR)/libutil_la-debug.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='debug.c' object='libutil_la-debug.lo' libtool=yes @AMDEPBACKSLASH@
@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-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c
+ 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-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c
libutil_la-dyntab.lo: dyntab.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-dyntab.lo -MD -MP -MF $(DEPDIR)/libutil_la-dyntab.Tpo -c -o libutil_la-dyntab.lo `test -f 'dyntab.c' || echo '$(srcdir)/'`dyntab.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-dyntab.Tpo $(DEPDIR)/libutil_la-dyntab.Plo
+ 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-dyntab.lo -MD -MP -MF $(DEPDIR)/libutil_la-dyntab.Tpo -c -o libutil_la-dyntab.lo `test -f 'dyntab.c' || echo '$(srcdir)/'`dyntab.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-dyntab.Tpo $(DEPDIR)/libutil_la-dyntab.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dyntab.c' object='libutil_la-dyntab.lo' libtool=yes @AMDEPBACKSLASH@
@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-dyntab.lo `test -f 'dyntab.c' || echo '$(srcdir)/'`dyntab.c
+ 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-dyntab.lo `test -f 'dyntab.c' || echo '$(srcdir)/'`dyntab.c
libutil_la-expandav.lo: expandav.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-expandav.lo -MD -MP -MF $(DEPDIR)/libutil_la-expandav.Tpo -c -o libutil_la-expandav.lo `test -f 'expandav.c' || echo '$(srcdir)/'`expandav.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-expandav.Tpo $(DEPDIR)/libutil_la-expandav.Plo
+ 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-expandav.lo -MD -MP -MF $(DEPDIR)/libutil_la-expandav.Tpo -c -o libutil_la-expandav.lo `test -f 'expandav.c' || echo '$(srcdir)/'`expandav.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-expandav.Tpo $(DEPDIR)/libutil_la-expandav.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='expandav.c' object='libutil_la-expandav.lo' libtool=yes @AMDEPBACKSLASH@
@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-expandav.lo `test -f 'expandav.c' || echo '$(srcdir)/'`expandav.c
+ 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-expandav.lo `test -f 'expandav.c' || echo '$(srcdir)/'`expandav.c
libutil_la-fnmatch.lo: fnmatch.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-fnmatch.lo -MD -MP -MF $(DEPDIR)/libutil_la-fnmatch.Tpo -c -o libutil_la-fnmatch.lo `test -f 'fnmatch.c' || echo '$(srcdir)/'`fnmatch.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-fnmatch.Tpo $(DEPDIR)/libutil_la-fnmatch.Plo
+ 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-fnmatch.lo -MD -MP -MF $(DEPDIR)/libutil_la-fnmatch.Tpo -c -o libutil_la-fnmatch.lo `test -f 'fnmatch.c' || echo '$(srcdir)/'`fnmatch.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-fnmatch.Tpo $(DEPDIR)/libutil_la-fnmatch.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fnmatch.c' object='libutil_la-fnmatch.lo' libtool=yes @AMDEPBACKSLASH@
@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-fnmatch.lo `test -f 'fnmatch.c' || echo '$(srcdir)/'`fnmatch.c
+ 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-fnmatch.lo `test -f 'fnmatch.c' || echo '$(srcdir)/'`fnmatch.c
libutil_la-fnqual.lo: fnqual.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-fnqual.lo -MD -MP -MF $(DEPDIR)/libutil_la-fnqual.Tpo -c -o libutil_la-fnqual.lo `test -f 'fnqual.c' || echo '$(srcdir)/'`fnqual.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-fnqual.Tpo $(DEPDIR)/libutil_la-fnqual.Plo
+ 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-fnqual.lo -MD -MP -MF $(DEPDIR)/libutil_la-fnqual.Tpo -c -o libutil_la-fnqual.lo `test -f 'fnqual.c' || echo '$(srcdir)/'`fnqual.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-fnqual.Tpo $(DEPDIR)/libutil_la-fnqual.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fnqual.c' object='libutil_la-fnqual.lo' libtool=yes @AMDEPBACKSLASH@
@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-fnqual.lo `test -f 'fnqual.c' || echo '$(srcdir)/'`fnqual.c
+ 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-fnqual.lo `test -f 'fnqual.c' || echo '$(srcdir)/'`fnqual.c
libutil_la-fnsearch.lo: fnsearch.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-fnsearch.lo -MD -MP -MF $(DEPDIR)/libutil_la-fnsearch.Tpo -c -o libutil_la-fnsearch.lo `test -f 'fnsearch.c' || echo '$(srcdir)/'`fnsearch.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-fnsearch.Tpo $(DEPDIR)/libutil_la-fnsearch.Plo
+ 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-fnsearch.lo -MD -MP -MF $(DEPDIR)/libutil_la-fnsearch.Tpo -c -o libutil_la-fnsearch.lo `test -f 'fnsearch.c' || echo '$(srcdir)/'`fnsearch.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-fnsearch.Tpo $(DEPDIR)/libutil_la-fnsearch.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fnsearch.c' object='libutil_la-fnsearch.lo' libtool=yes @AMDEPBACKSLASH@
@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-fnsearch.lo `test -f 'fnsearch.c' || echo '$(srcdir)/'`fnsearch.c
+ 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-fnsearch.lo `test -f 'fnsearch.c' || echo '$(srcdir)/'`fnsearch.c
libutil_la-fntodos.lo: fntodos.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-fntodos.lo -MD -MP -MF $(DEPDIR)/libutil_la-fntodos.Tpo -c -o libutil_la-fntodos.lo `test -f 'fntodos.c' || echo '$(srcdir)/'`fntodos.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-fntodos.Tpo $(DEPDIR)/libutil_la-fntodos.Plo
+ 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-fntodos.lo -MD -MP -MF $(DEPDIR)/libutil_la-fntodos.Tpo -c -o libutil_la-fntodos.lo `test -f 'fntodos.c' || echo '$(srcdir)/'`fntodos.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-fntodos.Tpo $(DEPDIR)/libutil_la-fntodos.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fntodos.c' object='libutil_la-fntodos.lo' libtool=yes @AMDEPBACKSLASH@
@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-fntodos.lo `test -f 'fntodos.c' || echo '$(srcdir)/'`fntodos.c
+ 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-fntodos.lo `test -f 'fntodos.c' || echo '$(srcdir)/'`fntodos.c
libutil_la-fnundos.lo: fnundos.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-fnundos.lo -MD -MP -MF $(DEPDIR)/libutil_la-fnundos.Tpo -c -o libutil_la-fnundos.lo `test -f 'fnundos.c' || echo '$(srcdir)/'`fnundos.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-fnundos.Tpo $(DEPDIR)/libutil_la-fnundos.Plo
+ 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-fnundos.lo -MD -MP -MF $(DEPDIR)/libutil_la-fnundos.Tpo -c -o libutil_la-fnundos.lo `test -f 'fnundos.c' || echo '$(srcdir)/'`fnundos.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-fnundos.Tpo $(DEPDIR)/libutil_la-fnundos.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fnundos.c' object='libutil_la-fnundos.lo' libtool=yes @AMDEPBACKSLASH@
@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-fnundos.lo `test -f 'fnundos.c' || echo '$(srcdir)/'`fnundos.c
+ 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-fnundos.lo `test -f 'fnundos.c' || echo '$(srcdir)/'`fnundos.c
libutil_la-getdate.lo: getdate.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-getdate.lo -MD -MP -MF $(DEPDIR)/libutil_la-getdate.Tpo -c -o libutil_la-getdate.lo `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-getdate.Tpo $(DEPDIR)/libutil_la-getdate.Plo
+ 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-getdate.lo -MD -MP -MF $(DEPDIR)/libutil_la-getdate.Tpo -c -o libutil_la-getdate.lo `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-getdate.Tpo $(DEPDIR)/libutil_la-getdate.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getdate.c' object='libutil_la-getdate.lo' libtool=yes @AMDEPBACKSLASH@
@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-getdate.lo `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
+ 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-getdate.lo `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
libutil_la-getopt1.lo: getopt1.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-getopt1.lo -MD -MP -MF $(DEPDIR)/libutil_la-getopt1.Tpo -c -o libutil_la-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-getopt1.Tpo $(DEPDIR)/libutil_la-getopt1.Plo
+ 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-getopt1.lo -MD -MP -MF $(DEPDIR)/libutil_la-getopt1.Tpo -c -o libutil_la-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-getopt1.Tpo $(DEPDIR)/libutil_la-getopt1.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt1.c' object='libutil_la-getopt1.lo' libtool=yes @AMDEPBACKSLASH@
@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-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c
+ 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-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c
libutil_la-getopt.lo: getopt.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-getopt.lo -MD -MP -MF $(DEPDIR)/libutil_la-getopt.Tpo -c -o libutil_la-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-getopt.Tpo $(DEPDIR)/libutil_la-getopt.Plo
+ 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-getopt.lo -MD -MP -MF $(DEPDIR)/libutil_la-getopt.Tpo -c -o libutil_la-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-getopt.Tpo $(DEPDIR)/libutil_la-getopt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt.c' object='libutil_la-getopt.lo' libtool=yes @AMDEPBACKSLASH@
@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-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
+ 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-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
libutil_la-gettimeofday.lo: gettimeofday.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-gettimeofday.lo -MD -MP -MF $(DEPDIR)/libutil_la-gettimeofday.Tpo -c -o libutil_la-gettimeofday.lo `test -f 'gettimeofday.c' || echo '$(srcdir)/'`gettimeofday.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-gettimeofday.Tpo $(DEPDIR)/libutil_la-gettimeofday.Plo
+ 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-gettimeofday.lo -MD -MP -MF $(DEPDIR)/libutil_la-gettimeofday.Tpo -c -o libutil_la-gettimeofday.lo `test -f 'gettimeofday.c' || echo '$(srcdir)/'`gettimeofday.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-gettimeofday.Tpo $(DEPDIR)/libutil_la-gettimeofday.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gettimeofday.c' object='libutil_la-gettimeofday.lo' libtool=yes @AMDEPBACKSLASH@
@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-gettimeofday.lo `test -f 'gettimeofday.c' || echo '$(srcdir)/'`gettimeofday.c
+ 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-gettimeofday.lo `test -f 'gettimeofday.c' || echo '$(srcdir)/'`gettimeofday.c
libutil_la-login_digest.lo: login_digest.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-login_digest.lo -MD -MP -MF $(DEPDIR)/libutil_la-login_digest.Tpo -c -o libutil_la-login_digest.lo `test -f 'login_digest.c' || echo '$(srcdir)/'`login_digest.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-login_digest.Tpo $(DEPDIR)/libutil_la-login_digest.Plo
+ 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-login_digest.lo -MD -MP -MF $(DEPDIR)/libutil_la-login_digest.Tpo -c -o libutil_la-login_digest.lo `test -f 'login_digest.c' || echo '$(srcdir)/'`login_digest.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-login_digest.Tpo $(DEPDIR)/libutil_la-login_digest.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='login_digest.c' object='libutil_la-login_digest.lo' libtool=yes @AMDEPBACKSLASH@
@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-login_digest.lo `test -f 'login_digest.c' || echo '$(srcdir)/'`login_digest.c
+ 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-login_digest.lo `test -f 'login_digest.c' || echo '$(srcdir)/'`login_digest.c
libutil_la-logmsg.lo: logmsg.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-logmsg.lo -MD -MP -MF $(DEPDIR)/libutil_la-logmsg.Tpo -c -o libutil_la-logmsg.lo `test -f 'logmsg.c' || echo '$(srcdir)/'`logmsg.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-logmsg.Tpo $(DEPDIR)/libutil_la-logmsg.Plo
+ 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-logmsg.lo -MD -MP -MF $(DEPDIR)/libutil_la-logmsg.Tpo -c -o libutil_la-logmsg.lo `test -f 'logmsg.c' || echo '$(srcdir)/'`logmsg.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-logmsg.Tpo $(DEPDIR)/libutil_la-logmsg.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='logmsg.c' object='libutil_la-logmsg.lo' libtool=yes @AMDEPBACKSLASH@
@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-logmsg.lo `test -f 'logmsg.c' || echo '$(srcdir)/'`logmsg.c
+ 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-logmsg.lo `test -f 'logmsg.c' || echo '$(srcdir)/'`logmsg.c
libutil_la-ltrim.lo: ltrim.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-ltrim.lo -MD -MP -MF $(DEPDIR)/libutil_la-ltrim.Tpo -c -o libutil_la-ltrim.lo `test -f 'ltrim.c' || echo '$(srcdir)/'`ltrim.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-ltrim.Tpo $(DEPDIR)/libutil_la-ltrim.Plo
+ 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-ltrim.lo -MD -MP -MF $(DEPDIR)/libutil_la-ltrim.Tpo -c -o libutil_la-ltrim.lo `test -f 'ltrim.c' || echo '$(srcdir)/'`ltrim.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-ltrim.Tpo $(DEPDIR)/libutil_la-ltrim.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltrim.c' object='libutil_la-ltrim.lo' libtool=yes @AMDEPBACKSLASH@
@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-ltrim.lo `test -f 'ltrim.c' || echo '$(srcdir)/'`ltrim.c
+ 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-ltrim.lo `test -f 'ltrim.c' || echo '$(srcdir)/'`ltrim.c
libutil_la-make_env.lo: make_env.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-make_env.lo -MD -MP -MF $(DEPDIR)/libutil_la-make_env.Tpo -c -o libutil_la-make_env.lo `test -f 'make_env.c' || echo '$(srcdir)/'`make_env.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-make_env.Tpo $(DEPDIR)/libutil_la-make_env.Plo
+ 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-make_env.lo -MD -MP -MF $(DEPDIR)/libutil_la-make_env.Tpo -c -o libutil_la-make_env.lo `test -f 'make_env.c' || echo '$(srcdir)/'`make_env.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-make_env.Tpo $(DEPDIR)/libutil_la-make_env.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='make_env.c' object='libutil_la-make_env.lo' libtool=yes @AMDEPBACKSLASH@
@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-make_env.lo `test -f 'make_env.c' || echo '$(srcdir)/'`make_env.c
+ 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-make_env.lo `test -f 'make_env.c' || echo '$(srcdir)/'`make_env.c
libutil_la-mpl.lo: mpl.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-mpl.lo -MD -MP -MF $(DEPDIR)/libutil_la-mpl.Tpo -c -o libutil_la-mpl.lo `test -f 'mpl.c' || echo '$(srcdir)/'`mpl.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-mpl.Tpo $(DEPDIR)/libutil_la-mpl.Plo
+ 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-mpl.lo -MD -MP -MF $(DEPDIR)/libutil_la-mpl.Tpo -c -o libutil_la-mpl.lo `test -f 'mpl.c' || echo '$(srcdir)/'`mpl.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-mpl.Tpo $(DEPDIR)/libutil_la-mpl.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpl.c' object='libutil_la-mpl.lo' libtool=yes @AMDEPBACKSLASH@
@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-mpl.lo `test -f 'mpl.c' || echo '$(srcdir)/'`mpl.c
+ 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-mpl.lo `test -f 'mpl.c' || echo '$(srcdir)/'`mpl.c
libutil_la-ncfg.lo: ncfg.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-ncfg.lo -MD -MP -MF $(DEPDIR)/libutil_la-ncfg.Tpo -c -o libutil_la-ncfg.lo `test -f 'ncfg.c' || echo '$(srcdir)/'`ncfg.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-ncfg.Tpo $(DEPDIR)/libutil_la-ncfg.Plo
+ 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-ncfg.lo -MD -MP -MF $(DEPDIR)/libutil_la-ncfg.Tpo -c -o libutil_la-ncfg.lo `test -f 'ncfg.c' || echo '$(srcdir)/'`ncfg.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-ncfg.Tpo $(DEPDIR)/libutil_la-ncfg.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ncfg.c' object='libutil_la-ncfg.lo' libtool=yes @AMDEPBACKSLASH@
@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-ncfg.lo `test -f 'ncfg.c' || echo '$(srcdir)/'`ncfg.c
+ 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-ncfg.lo `test -f 'ncfg.c' || echo '$(srcdir)/'`ncfg.c
libutil_la-ntapp.lo: ntapp.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-ntapp.lo -MD -MP -MF $(DEPDIR)/libutil_la-ntapp.Tpo -c -o libutil_la-ntapp.lo `test -f 'ntapp.c' || echo '$(srcdir)/'`ntapp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-ntapp.Tpo $(DEPDIR)/libutil_la-ntapp.Plo
+ 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-ntapp.lo -MD -MP -MF $(DEPDIR)/libutil_la-ntapp.Tpo -c -o libutil_la-ntapp.lo `test -f 'ntapp.c' || echo '$(srcdir)/'`ntapp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-ntapp.Tpo $(DEPDIR)/libutil_la-ntapp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntapp.c' object='libutil_la-ntapp.lo' libtool=yes @AMDEPBACKSLASH@
@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-ntapp.lo `test -f 'ntapp.c' || echo '$(srcdir)/'`ntapp.c
+ 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-ntapp.lo `test -f 'ntapp.c' || echo '$(srcdir)/'`ntapp.c
libutil_la-regerror.lo: regerror.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-regerror.lo -MD -MP -MF $(DEPDIR)/libutil_la-regerror.Tpo -c -o libutil_la-regerror.lo `test -f 'regerror.c' || echo '$(srcdir)/'`regerror.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-regerror.Tpo $(DEPDIR)/libutil_la-regerror.Plo
+ 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-regerror.lo -MD -MP -MF $(DEPDIR)/libutil_la-regerror.Tpo -c -o libutil_la-regerror.lo `test -f 'regerror.c' || echo '$(srcdir)/'`regerror.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-regerror.Tpo $(DEPDIR)/libutil_la-regerror.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regerror.c' object='libutil_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
@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-regerror.lo `test -f 'regerror.c' || echo '$(srcdir)/'`regerror.c
+ 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-regerror.lo `test -f 'regerror.c' || echo '$(srcdir)/'`regerror.c
libutil_la-regexp.lo: regexp.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-regexp.lo -MD -MP -MF $(DEPDIR)/libutil_la-regexp.Tpo -c -o libutil_la-regexp.lo `test -f 'regexp.c' || echo '$(srcdir)/'`regexp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-regexp.Tpo $(DEPDIR)/libutil_la-regexp.Plo
+ 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-regexp.lo -MD -MP -MF $(DEPDIR)/libutil_la-regexp.Tpo -c -o libutil_la-regexp.lo `test -f 'regexp.c' || echo '$(srcdir)/'`regexp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-regexp.Tpo $(DEPDIR)/libutil_la-regexp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regexp.c' object='libutil_la-regexp.lo' libtool=yes @AMDEPBACKSLASH@
@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-regexp.lo `test -f 'regexp.c' || echo '$(srcdir)/'`regexp.c
+ 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-regexp.lo `test -f 'regexp.c' || echo '$(srcdir)/'`regexp.c
libutil_la-regsub.lo: regsub.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-regsub.lo -MD -MP -MF $(DEPDIR)/libutil_la-regsub.Tpo -c -o libutil_la-regsub.lo `test -f 'regsub.c' || echo '$(srcdir)/'`regsub.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-regsub.Tpo $(DEPDIR)/libutil_la-regsub.Plo
+ 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-regsub.lo -MD -MP -MF $(DEPDIR)/libutil_la-regsub.Tpo -c -o libutil_la-regsub.lo `test -f 'regsub.c' || echo '$(srcdir)/'`regsub.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-regsub.Tpo $(DEPDIR)/libutil_la-regsub.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regsub.c' object='libutil_la-regsub.lo' libtool=yes @AMDEPBACKSLASH@
@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-regsub.lo `test -f 'regsub.c' || echo '$(srcdir)/'`regsub.c
+ 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-regsub.lo `test -f 'regsub.c' || echo '$(srcdir)/'`regsub.c
libutil_la-rtrim.lo: rtrim.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-rtrim.lo -MD -MP -MF $(DEPDIR)/libutil_la-rtrim.Tpo -c -o libutil_la-rtrim.lo `test -f 'rtrim.c' || echo '$(srcdir)/'`rtrim.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-rtrim.Tpo $(DEPDIR)/libutil_la-rtrim.Plo
+ 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-rtrim.lo -MD -MP -MF $(DEPDIR)/libutil_la-rtrim.Tpo -c -o libutil_la-rtrim.lo `test -f 'rtrim.c' || echo '$(srcdir)/'`rtrim.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-rtrim.Tpo $(DEPDIR)/libutil_la-rtrim.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rtrim.c' object='libutil_la-rtrim.lo' libtool=yes @AMDEPBACKSLASH@
@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-rtrim.lo `test -f 'rtrim.c' || echo '$(srcdir)/'`rtrim.c
+ 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-rtrim.lo `test -f 'rtrim.c' || echo '$(srcdir)/'`rtrim.c
libutil_la-setext.lo: setext.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-setext.lo -MD -MP -MF $(DEPDIR)/libutil_la-setext.Tpo -c -o libutil_la-setext.lo `test -f 'setext.c' || echo '$(srcdir)/'`setext.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-setext.Tpo $(DEPDIR)/libutil_la-setext.Plo
+ 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-setext.lo -MD -MP -MF $(DEPDIR)/libutil_la-setext.Tpo -c -o libutil_la-setext.lo `test -f 'setext.c' || echo '$(srcdir)/'`setext.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-setext.Tpo $(DEPDIR)/libutil_la-setext.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='setext.c' object='libutil_la-setext.lo' libtool=yes @AMDEPBACKSLASH@
@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-setext.lo `test -f 'setext.c' || echo '$(srcdir)/'`setext.c
+ 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-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@ mv -f $(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
- 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-startup.lo -MD -MP -MF $(DEPDIR)/libutil_la-startup.Tpo -c -o libutil_la-startup.lo `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-startup.Tpo $(DEPDIR)/libutil_la-startup.Plo
+ 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-startup.lo -MD -MP -MF $(DEPDIR)/libutil_la-startup.Tpo -c -o libutil_la-startup.lo `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-startup.Tpo $(DEPDIR)/libutil_la-startup.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='startup.c' object='libutil_la-startup.lo' libtool=yes @AMDEPBACKSLASH@
@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-startup.lo `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
+ 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-startup.lo `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
libutil_la-stpcpy.lo: stpcpy.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-stpcpy.lo -MD -MP -MF $(DEPDIR)/libutil_la-stpcpy.Tpo -c -o libutil_la-stpcpy.lo `test -f 'stpcpy.c' || echo '$(srcdir)/'`stpcpy.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-stpcpy.Tpo $(DEPDIR)/libutil_la-stpcpy.Plo
+ 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-stpcpy.lo -MD -MP -MF $(DEPDIR)/libutil_la-stpcpy.Tpo -c -o libutil_la-stpcpy.lo `test -f 'stpcpy.c' || echo '$(srcdir)/'`stpcpy.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-stpcpy.Tpo $(DEPDIR)/libutil_la-stpcpy.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stpcpy.c' object='libutil_la-stpcpy.lo' libtool=yes @AMDEPBACKSLASH@
@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-stpcpy.lo `test -f 'stpcpy.c' || echo '$(srcdir)/'`stpcpy.c
+ 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-stpcpy.lo `test -f 'stpcpy.c' || echo '$(srcdir)/'`stpcpy.c
libutil_la-strcpyin.lo: strcpyin.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-strcpyin.lo -MD -MP -MF $(DEPDIR)/libutil_la-strcpyin.Tpo -c -o libutil_la-strcpyin.lo `test -f 'strcpyin.c' || echo '$(srcdir)/'`strcpyin.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strcpyin.Tpo $(DEPDIR)/libutil_la-strcpyin.Plo
+ 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-strcpyin.lo -MD -MP -MF $(DEPDIR)/libutil_la-strcpyin.Tpo -c -o libutil_la-strcpyin.lo `test -f 'strcpyin.c' || echo '$(srcdir)/'`strcpyin.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strcpyin.Tpo $(DEPDIR)/libutil_la-strcpyin.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strcpyin.c' object='libutil_la-strcpyin.lo' libtool=yes @AMDEPBACKSLASH@
@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-strcpyin.lo `test -f 'strcpyin.c' || echo '$(srcdir)/'`strcpyin.c
+ 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-strcpyin.lo `test -f 'strcpyin.c' || echo '$(srcdir)/'`strcpyin.c
libutil_la-strerror.lo: strerror.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-strerror.lo -MD -MP -MF $(DEPDIR)/libutil_la-strerror.Tpo -c -o libutil_la-strerror.lo `test -f 'strerror.c' || echo '$(srcdir)/'`strerror.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strerror.Tpo $(DEPDIR)/libutil_la-strerror.Plo
+ 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-strerror.lo -MD -MP -MF $(DEPDIR)/libutil_la-strerror.Tpo -c -o libutil_la-strerror.lo `test -f 'strerror.c' || echo '$(srcdir)/'`strerror.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strerror.Tpo $(DEPDIR)/libutil_la-strerror.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strerror.c' object='libutil_la-strerror.lo' libtool=yes @AMDEPBACKSLASH@
@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-strerror.lo `test -f 'strerror.c' || echo '$(srcdir)/'`strerror.c
+ 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-strerror.lo `test -f 'strerror.c' || echo '$(srcdir)/'`strerror.c
libutil_la-stricmp.lo: stricmp.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-stricmp.lo -MD -MP -MF $(DEPDIR)/libutil_la-stricmp.Tpo -c -o libutil_la-stricmp.lo `test -f 'stricmp.c' || echo '$(srcdir)/'`stricmp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-stricmp.Tpo $(DEPDIR)/libutil_la-stricmp.Plo
+ 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-stricmp.lo -MD -MP -MF $(DEPDIR)/libutil_la-stricmp.Tpo -c -o libutil_la-stricmp.lo `test -f 'stricmp.c' || echo '$(srcdir)/'`stricmp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-stricmp.Tpo $(DEPDIR)/libutil_la-stricmp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stricmp.c' object='libutil_la-stricmp.lo' libtool=yes @AMDEPBACKSLASH@
@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-stricmp.lo `test -f 'stricmp.c' || echo '$(srcdir)/'`stricmp.c
+ 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-stricmp.lo `test -f 'stricmp.c' || echo '$(srcdir)/'`stricmp.c
libutil_la-strindex.lo: strindex.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-strindex.lo -MD -MP -MF $(DEPDIR)/libutil_la-strindex.Tpo -c -o libutil_la-strindex.lo `test -f 'strindex.c' || echo '$(srcdir)/'`strindex.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strindex.Tpo $(DEPDIR)/libutil_la-strindex.Plo
+ 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-strindex.lo -MD -MP -MF $(DEPDIR)/libutil_la-strindex.Tpo -c -o libutil_la-strindex.lo `test -f 'strindex.c' || echo '$(srcdir)/'`strindex.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strindex.Tpo $(DEPDIR)/libutil_la-strindex.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strindex.c' object='libutil_la-strindex.lo' libtool=yes @AMDEPBACKSLASH@
@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-strindex.lo `test -f 'strindex.c' || echo '$(srcdir)/'`strindex.c
+ 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-strindex.lo `test -f 'strindex.c' || echo '$(srcdir)/'`strindex.c
libutil_la-strinsrt.lo: strinsrt.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-strinsrt.lo -MD -MP -MF $(DEPDIR)/libutil_la-strinsrt.Tpo -c -o libutil_la-strinsrt.lo `test -f 'strinsrt.c' || echo '$(srcdir)/'`strinsrt.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strinsrt.Tpo $(DEPDIR)/libutil_la-strinsrt.Plo
+ 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-strinsrt.lo -MD -MP -MF $(DEPDIR)/libutil_la-strinsrt.Tpo -c -o libutil_la-strinsrt.lo `test -f 'strinsrt.c' || echo '$(srcdir)/'`strinsrt.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strinsrt.Tpo $(DEPDIR)/libutil_la-strinsrt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strinsrt.c' object='libutil_la-strinsrt.lo' libtool=yes @AMDEPBACKSLASH@
@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-strinsrt.lo `test -f 'strinsrt.c' || echo '$(srcdir)/'`strinsrt.c
+ 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-strinsrt.lo `test -f 'strinsrt.c' || echo '$(srcdir)/'`strinsrt.c
libutil_la-strlwr.lo: strlwr.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-strlwr.lo -MD -MP -MF $(DEPDIR)/libutil_la-strlwr.Tpo -c -o libutil_la-strlwr.lo `test -f 'strlwr.c' || echo '$(srcdir)/'`strlwr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strlwr.Tpo $(DEPDIR)/libutil_la-strlwr.Plo
+ 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-strlwr.lo -MD -MP -MF $(DEPDIR)/libutil_la-strlwr.Tpo -c -o libutil_la-strlwr.lo `test -f 'strlwr.c' || echo '$(srcdir)/'`strlwr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strlwr.Tpo $(DEPDIR)/libutil_la-strlwr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strlwr.c' object='libutil_la-strlwr.lo' libtool=yes @AMDEPBACKSLASH@
@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-strlwr.lo `test -f 'strlwr.c' || echo '$(srcdir)/'`strlwr.c
+ 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-strlwr.lo `test -f 'strlwr.c' || echo '$(srcdir)/'`strlwr.c
libutil_la-strnicmp.lo: strnicmp.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-strnicmp.lo -MD -MP -MF $(DEPDIR)/libutil_la-strnicmp.Tpo -c -o libutil_la-strnicmp.lo `test -f 'strnicmp.c' || echo '$(srcdir)/'`strnicmp.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strnicmp.Tpo $(DEPDIR)/libutil_la-strnicmp.Plo
+ 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-strnicmp.lo -MD -MP -MF $(DEPDIR)/libutil_la-strnicmp.Tpo -c -o libutil_la-strnicmp.lo `test -f 'strnicmp.c' || echo '$(srcdir)/'`strnicmp.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strnicmp.Tpo $(DEPDIR)/libutil_la-strnicmp.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strnicmp.c' object='libutil_la-strnicmp.lo' libtool=yes @AMDEPBACKSLASH@
@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-strnicmp.lo `test -f 'strnicmp.c' || echo '$(srcdir)/'`strnicmp.c
+ 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-strnicmp.lo `test -f 'strnicmp.c' || echo '$(srcdir)/'`strnicmp.c
libutil_la-strquote.lo: strquote.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-strquote.lo -MD -MP -MF $(DEPDIR)/libutil_la-strquote.Tpo -c -o libutil_la-strquote.lo `test -f 'strquote.c' || echo '$(srcdir)/'`strquote.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strquote.Tpo $(DEPDIR)/libutil_la-strquote.Plo
+ 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-strquote.lo -MD -MP -MF $(DEPDIR)/libutil_la-strquote.Tpo -c -o libutil_la-strquote.lo `test -f 'strquote.c' || echo '$(srcdir)/'`strquote.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strquote.Tpo $(DEPDIR)/libutil_la-strquote.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strquote.c' object='libutil_la-strquote.lo' libtool=yes @AMDEPBACKSLASH@
@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-strquote.lo `test -f 'strquote.c' || echo '$(srcdir)/'`strquote.c
+ 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-strquote.lo `test -f 'strquote.c' || echo '$(srcdir)/'`strquote.c
libutil_la-strtok_r.lo: strtok_r.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-strtok_r.lo -MD -MP -MF $(DEPDIR)/libutil_la-strtok_r.Tpo -c -o libutil_la-strtok_r.lo `test -f 'strtok_r.c' || echo '$(srcdir)/'`strtok_r.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strtok_r.Tpo $(DEPDIR)/libutil_la-strtok_r.Plo
+ 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-strtok_r.lo -MD -MP -MF $(DEPDIR)/libutil_la-strtok_r.Tpo -c -o libutil_la-strtok_r.lo `test -f 'strtok_r.c' || echo '$(srcdir)/'`strtok_r.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strtok_r.Tpo $(DEPDIR)/libutil_la-strtok_r.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strtok_r.c' object='libutil_la-strtok_r.lo' libtool=yes @AMDEPBACKSLASH@
@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-strtok_r.lo `test -f 'strtok_r.c' || echo '$(srcdir)/'`strtok_r.c
+ 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-strtok_r.lo `test -f 'strtok_r.c' || echo '$(srcdir)/'`strtok_r.c
libutil_la-strupr.lo: strupr.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-strupr.lo -MD -MP -MF $(DEPDIR)/libutil_la-strupr.Tpo -c -o libutil_la-strupr.lo `test -f 'strupr.c' || echo '$(srcdir)/'`strupr.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strupr.Tpo $(DEPDIR)/libutil_la-strupr.Plo
+ 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-strupr.lo -MD -MP -MF $(DEPDIR)/libutil_la-strupr.Tpo -c -o libutil_la-strupr.lo `test -f 'strupr.c' || echo '$(srcdir)/'`strupr.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strupr.Tpo $(DEPDIR)/libutil_la-strupr.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strupr.c' object='libutil_la-strupr.lo' libtool=yes @AMDEPBACKSLASH@
@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-strupr.lo `test -f 'strupr.c' || echo '$(srcdir)/'`strupr.c
+ 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-strupr.lo `test -f 'strupr.c' || echo '$(srcdir)/'`strupr.c
libutil_la-strxpect.lo: strxpect.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-strxpect.lo -MD -MP -MF $(DEPDIR)/libutil_la-strxpect.Tpo -c -o libutil_la-strxpect.lo `test -f 'strxpect.c' || echo '$(srcdir)/'`strxpect.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-strxpect.Tpo $(DEPDIR)/libutil_la-strxpect.Plo
+ 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-strxpect.lo -MD -MP -MF $(DEPDIR)/libutil_la-strxpect.Tpo -c -o libutil_la-strxpect.lo `test -f 'strxpect.c' || echo '$(srcdir)/'`strxpect.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-strxpect.Tpo $(DEPDIR)/libutil_la-strxpect.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strxpect.c' object='libutil_la-strxpect.lo' libtool=yes @AMDEPBACKSLASH@
@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-strxpect.lo `test -f 'strxpect.c' || echo '$(srcdir)/'`strxpect.c
+ 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-strxpect.lo `test -f 'strxpect.c' || echo '$(srcdir)/'`strxpect.c
libutil_la-terminat.lo: terminat.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-terminat.lo -MD -MP -MF $(DEPDIR)/libutil_la-terminat.Tpo -c -o libutil_la-terminat.lo `test -f 'terminat.c' || echo '$(srcdir)/'`terminat.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-terminat.Tpo $(DEPDIR)/libutil_la-terminat.Plo
+ 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-terminat.lo -MD -MP -MF $(DEPDIR)/libutil_la-terminat.Tpo -c -o libutil_la-terminat.lo `test -f 'terminat.c' || echo '$(srcdir)/'`terminat.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-terminat.Tpo $(DEPDIR)/libutil_la-terminat.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='terminat.c' object='libutil_la-terminat.lo' libtool=yes @AMDEPBACKSLASH@
@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-terminat.lo `test -f 'terminat.c' || echo '$(srcdir)/'`terminat.c
+ 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-terminat.lo `test -f 'terminat.c' || echo '$(srcdir)/'`terminat.c
libutil_la-usage.lo: usage.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-usage.lo -MD -MP -MF $(DEPDIR)/libutil_la-usage.Tpo -c -o libutil_la-usage.lo `test -f 'usage.c' || echo '$(srcdir)/'`usage.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-usage.Tpo $(DEPDIR)/libutil_la-usage.Plo
+ 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-usage.lo -MD -MP -MF $(DEPDIR)/libutil_la-usage.Tpo -c -o libutil_la-usage.lo `test -f 'usage.c' || echo '$(srcdir)/'`usage.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-usage.Tpo $(DEPDIR)/libutil_la-usage.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='usage.c' object='libutil_la-usage.lo' libtool=yes @AMDEPBACKSLASH@
@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-usage.lo `test -f 'usage.c' || echo '$(srcdir)/'`usage.c
+ 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-usage.lo `test -f 'usage.c' || echo '$(srcdir)/'`usage.c
libutil_la-uuid.lo: uuid.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-uuid.lo -MD -MP -MF $(DEPDIR)/libutil_la-uuid.Tpo -c -o libutil_la-uuid.lo `test -f 'uuid.c' || echo '$(srcdir)/'`uuid.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-uuid.Tpo $(DEPDIR)/libutil_la-uuid.Plo
+ 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-uuid.lo -MD -MP -MF $(DEPDIR)/libutil_la-uuid.Tpo -c -o libutil_la-uuid.lo `test -f 'uuid.c' || echo '$(srcdir)/'`uuid.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-uuid.Tpo $(DEPDIR)/libutil_la-uuid.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uuid.c' object='libutil_la-uuid.lo' libtool=yes @AMDEPBACKSLASH@
@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-uuid.lo `test -f 'uuid.c' || echo '$(srcdir)/'`uuid.c
+ 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-uuid.lo `test -f 'uuid.c' || echo '$(srcdir)/'`uuid.c
libutil_la-wcslen.lo: wcslen.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-wcslen.lo -MD -MP -MF $(DEPDIR)/libutil_la-wcslen.Tpo -c -o libutil_la-wcslen.lo `test -f 'wcslen.c' || echo '$(srcdir)/'`wcslen.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-wcslen.Tpo $(DEPDIR)/libutil_la-wcslen.Plo
+ 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-wcslen.lo -MD -MP -MF $(DEPDIR)/libutil_la-wcslen.Tpo -c -o libutil_la-wcslen.lo `test -f 'wcslen.c' || echo '$(srcdir)/'`wcslen.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-wcslen.Tpo $(DEPDIR)/libutil_la-wcslen.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wcslen.c' object='libutil_la-wcslen.lo' libtool=yes @AMDEPBACKSLASH@
@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-wcslen.lo `test -f 'wcslen.c' || echo '$(srcdir)/'`wcslen.c
+ 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-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@ mv -f $(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
- 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_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
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-virt_mbrtowc.Tpo $(DEPDIR)/libutil_la-virt_mbrtowc.Plo
+ 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_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
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-virt_mbrtowc.Tpo $(DEPDIR)/libutil_la-virt_mbrtowc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_mbrtowc.c' object='libutil_la-virt_mbrtowc.lo' libtool=yes @AMDEPBACKSLASH@
@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_mbrtowc.lo `test -f 'virt_mbrtowc.c' || echo '$(srcdir)/'`virt_mbrtowc.c
+ 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_mbrtowc.lo `test -f 'virt_mbrtowc.c' || echo '$(srcdir)/'`virt_mbrtowc.c
libutil_la-virt_mbsnrtowcs.lo: virt_mbsnrtowcs.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_mbsnrtowcs.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_mbsnrtowcs.Tpo -c -o libutil_la-virt_mbsnrtowcs.lo `test -f 'virt_mbsnrtowcs.c' || echo '$(srcdir)/'`virt_mbsnrtowcs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-virt_mbsnrtowcs.Tpo $(DEPDIR)/libutil_la-virt_mbsnrtowcs.Plo
+ 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_mbsnrtowcs.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_mbsnrtowcs.Tpo -c -o libutil_la-virt_mbsnrtowcs.lo `test -f 'virt_mbsnrtowcs.c' || echo '$(srcdir)/'`virt_mbsnrtowcs.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-virt_mbsnrtowcs.Tpo $(DEPDIR)/libutil_la-virt_mbsnrtowcs.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_mbsnrtowcs.c' object='libutil_la-virt_mbsnrtowcs.lo' libtool=yes @AMDEPBACKSLASH@
@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_mbsnrtowcs.lo `test -f 'virt_mbsnrtowcs.c' || echo '$(srcdir)/'`virt_mbsnrtowcs.c
+ 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_mbsnrtowcs.lo `test -f 'virt_mbsnrtowcs.c' || echo '$(srcdir)/'`virt_mbsnrtowcs.c
libutil_la-virt_wcrtomb.lo: virt_wcrtomb.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_wcrtomb.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_wcrtomb.Tpo -c -o libutil_la-virt_wcrtomb.lo `test -f 'virt_wcrtomb.c' || echo '$(srcdir)/'`virt_wcrtomb.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-virt_wcrtomb.Tpo $(DEPDIR)/libutil_la-virt_wcrtomb.Plo
+ 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_wcrtomb.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_wcrtomb.Tpo -c -o libutil_la-virt_wcrtomb.lo `test -f 'virt_wcrtomb.c' || echo '$(srcdir)/'`virt_wcrtomb.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-virt_wcrtomb.Tpo $(DEPDIR)/libutil_la-virt_wcrtomb.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_wcrtomb.c' object='libutil_la-virt_wcrtomb.lo' libtool=yes @AMDEPBACKSLASH@
@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_wcrtomb.lo `test -f 'virt_wcrtomb.c' || echo '$(srcdir)/'`virt_wcrtomb.c
+ 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_wcrtomb.lo `test -f 'virt_wcrtomb.c' || echo '$(srcdir)/'`virt_wcrtomb.c
libutil_la-virt_wcs_mask.lo: virt_wcs_mask.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_wcs_mask.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_wcs_mask.Tpo -c -o libutil_la-virt_wcs_mask.lo `test -f 'virt_wcs_mask.c' || echo '$(srcdir)/'`virt_wcs_mask.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-virt_wcs_mask.Tpo $(DEPDIR)/libutil_la-virt_wcs_mask.Plo
+ 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_wcs_mask.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_wcs_mask.Tpo -c -o libutil_la-virt_wcs_mask.lo `test -f 'virt_wcs_mask.c' || echo '$(srcdir)/'`virt_wcs_mask.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-virt_wcs_mask.Tpo $(DEPDIR)/libutil_la-virt_wcs_mask.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_wcs_mask.c' object='libutil_la-virt_wcs_mask.lo' libtool=yes @AMDEPBACKSLASH@
@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_wcs_mask.lo `test -f 'virt_wcs_mask.c' || echo '$(srcdir)/'`virt_wcs_mask.c
+ 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_wcs_mask.lo `test -f 'virt_wcs_mask.c' || echo '$(srcdir)/'`virt_wcs_mask.c
libutil_la-virt_wcsnrtombs.lo: virt_wcsnrtombs.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_wcsnrtombs.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_wcsnrtombs.Tpo -c -o libutil_la-virt_wcsnrtombs.lo `test -f 'virt_wcsnrtombs.c' || echo '$(srcdir)/'`virt_wcsnrtombs.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-virt_wcsnrtombs.Tpo $(DEPDIR)/libutil_la-virt_wcsnrtombs.Plo
+ 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_wcsnrtombs.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_wcsnrtombs.Tpo -c -o libutil_la-virt_wcsnrtombs.lo `test -f 'virt_wcsnrtombs.c' || echo '$(srcdir)/'`virt_wcsnrtombs.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-virt_wcsnrtombs.Tpo $(DEPDIR)/libutil_la-virt_wcsnrtombs.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_wcsnrtombs.c' object='libutil_la-virt_wcsnrtombs.lo' libtool=yes @AMDEPBACKSLASH@
@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_wcsnrtombs.lo `test -f 'virt_wcsnrtombs.c' || echo '$(srcdir)/'`virt_wcsnrtombs.c
+ 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_wcsnrtombs.lo `test -f 'virt_wcsnrtombs.c' || echo '$(srcdir)/'`virt_wcsnrtombs.c
libutil_la-pcre_chartables.lo: pcrelib/pcre_chartables.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-pcre_chartables.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_chartables.Tpo -c -o libutil_la-pcre_chartables.lo `test -f 'pcrelib/pcre_chartables.c' || echo '$(srcdir)/'`pcrelib/pcre_chartables.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_chartables.Tpo $(DEPDIR)/libutil_la-pcre_chartables.Plo
+ 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-pcre_chartables.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_chartables.Tpo -c -o libutil_la-pcre_chartables.lo `test -f 'pcrelib/pcre_chartables.c' || echo '$(srcdir)/'`pcrelib/pcre_chartables.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_chartables.Tpo $(DEPDIR)/libutil_la-pcre_chartables.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_chartables.c' object='libutil_la-pcre_chartables.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_chartables.lo `test -f 'pcrelib/pcre_chartables.c' || echo '$(srcdir)/'`pcrelib/pcre_chartables.c
+ 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-pcre_chartables.lo `test -f 'pcrelib/pcre_chartables.c' || echo '$(srcdir)/'`pcrelib/pcre_chartables.c
libutil_la-pcre_compile.lo: pcrelib/pcre_compile.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-pcre_compile.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_compile.Tpo -c -o libutil_la-pcre_compile.lo `test -f 'pcrelib/pcre_compile.c' || echo '$(srcdir)/'`pcrelib/pcre_compile.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_compile.Tpo $(DEPDIR)/libutil_la-pcre_compile.Plo
+ 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-pcre_compile.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_compile.Tpo -c -o libutil_la-pcre_compile.lo `test -f 'pcrelib/pcre_compile.c' || echo '$(srcdir)/'`pcrelib/pcre_compile.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_compile.Tpo $(DEPDIR)/libutil_la-pcre_compile.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_compile.c' object='libutil_la-pcre_compile.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_compile.lo `test -f 'pcrelib/pcre_compile.c' || echo '$(srcdir)/'`pcrelib/pcre_compile.c
+ 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-pcre_compile.lo `test -f 'pcrelib/pcre_compile.c' || echo '$(srcdir)/'`pcrelib/pcre_compile.c
libutil_la-pcre_config.lo: pcrelib/pcre_config.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-pcre_config.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_config.Tpo -c -o libutil_la-pcre_config.lo `test -f 'pcrelib/pcre_config.c' || echo '$(srcdir)/'`pcrelib/pcre_config.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_config.Tpo $(DEPDIR)/libutil_la-pcre_config.Plo
+ 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-pcre_config.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_config.Tpo -c -o libutil_la-pcre_config.lo `test -f 'pcrelib/pcre_config.c' || echo '$(srcdir)/'`pcrelib/pcre_config.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_config.Tpo $(DEPDIR)/libutil_la-pcre_config.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_config.c' object='libutil_la-pcre_config.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_config.lo `test -f 'pcrelib/pcre_config.c' || echo '$(srcdir)/'`pcrelib/pcre_config.c
+ 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-pcre_config.lo `test -f 'pcrelib/pcre_config.c' || echo '$(srcdir)/'`pcrelib/pcre_config.c
libutil_la-pcre_dfa_exec.lo: pcrelib/pcre_dfa_exec.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-pcre_dfa_exec.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_dfa_exec.Tpo -c -o libutil_la-pcre_dfa_exec.lo `test -f 'pcrelib/pcre_dfa_exec.c' || echo '$(srcdir)/'`pcrelib/pcre_dfa_exec.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_dfa_exec.Tpo $(DEPDIR)/libutil_la-pcre_dfa_exec.Plo
+ 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-pcre_dfa_exec.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_dfa_exec.Tpo -c -o libutil_la-pcre_dfa_exec.lo `test -f 'pcrelib/pcre_dfa_exec.c' || echo '$(srcdir)/'`pcrelib/pcre_dfa_exec.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_dfa_exec.Tpo $(DEPDIR)/libutil_la-pcre_dfa_exec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_dfa_exec.c' object='libutil_la-pcre_dfa_exec.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_dfa_exec.lo `test -f 'pcrelib/pcre_dfa_exec.c' || echo '$(srcdir)/'`pcrelib/pcre_dfa_exec.c
+ 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-pcre_dfa_exec.lo `test -f 'pcrelib/pcre_dfa_exec.c' || echo '$(srcdir)/'`pcrelib/pcre_dfa_exec.c
libutil_la-pcre_exec.lo: pcrelib/pcre_exec.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-pcre_exec.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_exec.Tpo -c -o libutil_la-pcre_exec.lo `test -f 'pcrelib/pcre_exec.c' || echo '$(srcdir)/'`pcrelib/pcre_exec.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_exec.Tpo $(DEPDIR)/libutil_la-pcre_exec.Plo
+ 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-pcre_exec.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_exec.Tpo -c -o libutil_la-pcre_exec.lo `test -f 'pcrelib/pcre_exec.c' || echo '$(srcdir)/'`pcrelib/pcre_exec.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_exec.Tpo $(DEPDIR)/libutil_la-pcre_exec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_exec.c' object='libutil_la-pcre_exec.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_exec.lo `test -f 'pcrelib/pcre_exec.c' || echo '$(srcdir)/'`pcrelib/pcre_exec.c
+ 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-pcre_exec.lo `test -f 'pcrelib/pcre_exec.c' || echo '$(srcdir)/'`pcrelib/pcre_exec.c
libutil_la-pcre_fullinfo.lo: pcrelib/pcre_fullinfo.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-pcre_fullinfo.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_fullinfo.Tpo -c -o libutil_la-pcre_fullinfo.lo `test -f 'pcrelib/pcre_fullinfo.c' || echo '$(srcdir)/'`pcrelib/pcre_fullinfo.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_fullinfo.Tpo $(DEPDIR)/libutil_la-pcre_fullinfo.Plo
+ 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-pcre_fullinfo.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_fullinfo.Tpo -c -o libutil_la-pcre_fullinfo.lo `test -f 'pcrelib/pcre_fullinfo.c' || echo '$(srcdir)/'`pcrelib/pcre_fullinfo.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_fullinfo.Tpo $(DEPDIR)/libutil_la-pcre_fullinfo.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_fullinfo.c' object='libutil_la-pcre_fullinfo.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_fullinfo.lo `test -f 'pcrelib/pcre_fullinfo.c' || echo '$(srcdir)/'`pcrelib/pcre_fullinfo.c
+ 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-pcre_fullinfo.lo `test -f 'pcrelib/pcre_fullinfo.c' || echo '$(srcdir)/'`pcrelib/pcre_fullinfo.c
libutil_la-pcre_get.lo: pcrelib/pcre_get.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-pcre_get.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_get.Tpo -c -o libutil_la-pcre_get.lo `test -f 'pcrelib/pcre_get.c' || echo '$(srcdir)/'`pcrelib/pcre_get.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_get.Tpo $(DEPDIR)/libutil_la-pcre_get.Plo
+ 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-pcre_get.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_get.Tpo -c -o libutil_la-pcre_get.lo `test -f 'pcrelib/pcre_get.c' || echo '$(srcdir)/'`pcrelib/pcre_get.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_get.Tpo $(DEPDIR)/libutil_la-pcre_get.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_get.c' object='libutil_la-pcre_get.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_get.lo `test -f 'pcrelib/pcre_get.c' || echo '$(srcdir)/'`pcrelib/pcre_get.c
+ 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-pcre_get.lo `test -f 'pcrelib/pcre_get.c' || echo '$(srcdir)/'`pcrelib/pcre_get.c
libutil_la-pcre_globals.lo: pcrelib/pcre_globals.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-pcre_globals.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_globals.Tpo -c -o libutil_la-pcre_globals.lo `test -f 'pcrelib/pcre_globals.c' || echo '$(srcdir)/'`pcrelib/pcre_globals.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_globals.Tpo $(DEPDIR)/libutil_la-pcre_globals.Plo
+ 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-pcre_globals.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_globals.Tpo -c -o libutil_la-pcre_globals.lo `test -f 'pcrelib/pcre_globals.c' || echo '$(srcdir)/'`pcrelib/pcre_globals.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_globals.Tpo $(DEPDIR)/libutil_la-pcre_globals.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_globals.c' object='libutil_la-pcre_globals.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_globals.lo `test -f 'pcrelib/pcre_globals.c' || echo '$(srcdir)/'`pcrelib/pcre_globals.c
+ 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-pcre_globals.lo `test -f 'pcrelib/pcre_globals.c' || echo '$(srcdir)/'`pcrelib/pcre_globals.c
libutil_la-pcre_newline.lo: pcrelib/pcre_newline.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-pcre_newline.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_newline.Tpo -c -o libutil_la-pcre_newline.lo `test -f 'pcrelib/pcre_newline.c' || echo '$(srcdir)/'`pcrelib/pcre_newline.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_newline.Tpo $(DEPDIR)/libutil_la-pcre_newline.Plo
+ 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-pcre_newline.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_newline.Tpo -c -o libutil_la-pcre_newline.lo `test -f 'pcrelib/pcre_newline.c' || echo '$(srcdir)/'`pcrelib/pcre_newline.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_newline.Tpo $(DEPDIR)/libutil_la-pcre_newline.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_newline.c' object='libutil_la-pcre_newline.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_newline.lo `test -f 'pcrelib/pcre_newline.c' || echo '$(srcdir)/'`pcrelib/pcre_newline.c
+ 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-pcre_newline.lo `test -f 'pcrelib/pcre_newline.c' || echo '$(srcdir)/'`pcrelib/pcre_newline.c
libutil_la-pcre_ord2utf8.lo: pcrelib/pcre_ord2utf8.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-pcre_ord2utf8.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_ord2utf8.Tpo -c -o libutil_la-pcre_ord2utf8.lo `test -f 'pcrelib/pcre_ord2utf8.c' || echo '$(srcdir)/'`pcrelib/pcre_ord2utf8.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_ord2utf8.Tpo $(DEPDIR)/libutil_la-pcre_ord2utf8.Plo
+ 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-pcre_ord2utf8.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_ord2utf8.Tpo -c -o libutil_la-pcre_ord2utf8.lo `test -f 'pcrelib/pcre_ord2utf8.c' || echo '$(srcdir)/'`pcrelib/pcre_ord2utf8.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_ord2utf8.Tpo $(DEPDIR)/libutil_la-pcre_ord2utf8.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_ord2utf8.c' object='libutil_la-pcre_ord2utf8.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_ord2utf8.lo `test -f 'pcrelib/pcre_ord2utf8.c' || echo '$(srcdir)/'`pcrelib/pcre_ord2utf8.c
+ 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-pcre_ord2utf8.lo `test -f 'pcrelib/pcre_ord2utf8.c' || echo '$(srcdir)/'`pcrelib/pcre_ord2utf8.c
libutil_la-pcre_study.lo: pcrelib/pcre_study.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-pcre_study.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_study.Tpo -c -o libutil_la-pcre_study.lo `test -f 'pcrelib/pcre_study.c' || echo '$(srcdir)/'`pcrelib/pcre_study.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_study.Tpo $(DEPDIR)/libutil_la-pcre_study.Plo
+ 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-pcre_study.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_study.Tpo -c -o libutil_la-pcre_study.lo `test -f 'pcrelib/pcre_study.c' || echo '$(srcdir)/'`pcrelib/pcre_study.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_study.Tpo $(DEPDIR)/libutil_la-pcre_study.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_study.c' object='libutil_la-pcre_study.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_study.lo `test -f 'pcrelib/pcre_study.c' || echo '$(srcdir)/'`pcrelib/pcre_study.c
+ 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-pcre_study.lo `test -f 'pcrelib/pcre_study.c' || echo '$(srcdir)/'`pcrelib/pcre_study.c
libutil_la-pcre_tables.lo: pcrelib/pcre_tables.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-pcre_tables.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_tables.Tpo -c -o libutil_la-pcre_tables.lo `test -f 'pcrelib/pcre_tables.c' || echo '$(srcdir)/'`pcrelib/pcre_tables.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_tables.Tpo $(DEPDIR)/libutil_la-pcre_tables.Plo
+ 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-pcre_tables.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_tables.Tpo -c -o libutil_la-pcre_tables.lo `test -f 'pcrelib/pcre_tables.c' || echo '$(srcdir)/'`pcrelib/pcre_tables.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_tables.Tpo $(DEPDIR)/libutil_la-pcre_tables.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_tables.c' object='libutil_la-pcre_tables.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_tables.lo `test -f 'pcrelib/pcre_tables.c' || echo '$(srcdir)/'`pcrelib/pcre_tables.c
+ 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-pcre_tables.lo `test -f 'pcrelib/pcre_tables.c' || echo '$(srcdir)/'`pcrelib/pcre_tables.c
libutil_la-pcre_try_flipped.lo: pcrelib/pcre_try_flipped.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-pcre_try_flipped.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_try_flipped.Tpo -c -o libutil_la-pcre_try_flipped.lo `test -f 'pcrelib/pcre_try_flipped.c' || echo '$(srcdir)/'`pcrelib/pcre_try_flipped.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_try_flipped.Tpo $(DEPDIR)/libutil_la-pcre_try_flipped.Plo
+ 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-pcre_try_flipped.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_try_flipped.Tpo -c -o libutil_la-pcre_try_flipped.lo `test -f 'pcrelib/pcre_try_flipped.c' || echo '$(srcdir)/'`pcrelib/pcre_try_flipped.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_try_flipped.Tpo $(DEPDIR)/libutil_la-pcre_try_flipped.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_try_flipped.c' object='libutil_la-pcre_try_flipped.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_try_flipped.lo `test -f 'pcrelib/pcre_try_flipped.c' || echo '$(srcdir)/'`pcrelib/pcre_try_flipped.c
+ 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-pcre_try_flipped.lo `test -f 'pcrelib/pcre_try_flipped.c' || echo '$(srcdir)/'`pcrelib/pcre_try_flipped.c
libutil_la-pcre_ucd.lo: pcrelib/pcre_ucd.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-pcre_ucd.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_ucd.Tpo -c -o libutil_la-pcre_ucd.lo `test -f 'pcrelib/pcre_ucd.c' || echo '$(srcdir)/'`pcrelib/pcre_ucd.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_ucd.Tpo $(DEPDIR)/libutil_la-pcre_ucd.Plo
+ 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-pcre_ucd.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_ucd.Tpo -c -o libutil_la-pcre_ucd.lo `test -f 'pcrelib/pcre_ucd.c' || echo '$(srcdir)/'`pcrelib/pcre_ucd.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_ucd.Tpo $(DEPDIR)/libutil_la-pcre_ucd.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_ucd.c' object='libutil_la-pcre_ucd.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_ucd.lo `test -f 'pcrelib/pcre_ucd.c' || echo '$(srcdir)/'`pcrelib/pcre_ucd.c
+ 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-pcre_ucd.lo `test -f 'pcrelib/pcre_ucd.c' || echo '$(srcdir)/'`pcrelib/pcre_ucd.c
libutil_la-pcre_valid_utf8.lo: pcrelib/pcre_valid_utf8.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-pcre_valid_utf8.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_valid_utf8.Tpo -c -o libutil_la-pcre_valid_utf8.lo `test -f 'pcrelib/pcre_valid_utf8.c' || echo '$(srcdir)/'`pcrelib/pcre_valid_utf8.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_valid_utf8.Tpo $(DEPDIR)/libutil_la-pcre_valid_utf8.Plo
+ 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-pcre_valid_utf8.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_valid_utf8.Tpo -c -o libutil_la-pcre_valid_utf8.lo `test -f 'pcrelib/pcre_valid_utf8.c' || echo '$(srcdir)/'`pcrelib/pcre_valid_utf8.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_valid_utf8.Tpo $(DEPDIR)/libutil_la-pcre_valid_utf8.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_valid_utf8.c' object='libutil_la-pcre_valid_utf8.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_valid_utf8.lo `test -f 'pcrelib/pcre_valid_utf8.c' || echo '$(srcdir)/'`pcrelib/pcre_valid_utf8.c
+ 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-pcre_valid_utf8.lo `test -f 'pcrelib/pcre_valid_utf8.c' || echo '$(srcdir)/'`pcrelib/pcre_valid_utf8.c
libutil_la-pcre_version.lo: pcrelib/pcre_version.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-pcre_version.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_version.Tpo -c -o libutil_la-pcre_version.lo `test -f 'pcrelib/pcre_version.c' || echo '$(srcdir)/'`pcrelib/pcre_version.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_version.Tpo $(DEPDIR)/libutil_la-pcre_version.Plo
+ 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-pcre_version.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_version.Tpo -c -o libutil_la-pcre_version.lo `test -f 'pcrelib/pcre_version.c' || echo '$(srcdir)/'`pcrelib/pcre_version.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_version.Tpo $(DEPDIR)/libutil_la-pcre_version.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_version.c' object='libutil_la-pcre_version.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_version.lo `test -f 'pcrelib/pcre_version.c' || echo '$(srcdir)/'`pcrelib/pcre_version.c
+ 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-pcre_version.lo `test -f 'pcrelib/pcre_version.c' || echo '$(srcdir)/'`pcrelib/pcre_version.c
libutil_la-pcre_xclass.lo: pcrelib/pcre_xclass.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-pcre_xclass.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_xclass.Tpo -c -o libutil_la-pcre_xclass.lo `test -f 'pcrelib/pcre_xclass.c' || echo '$(srcdir)/'`pcrelib/pcre_xclass.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-pcre_xclass.Tpo $(DEPDIR)/libutil_la-pcre_xclass.Plo
+ 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-pcre_xclass.lo -MD -MP -MF $(DEPDIR)/libutil_la-pcre_xclass.Tpo -c -o libutil_la-pcre_xclass.lo `test -f 'pcrelib/pcre_xclass.c' || echo '$(srcdir)/'`pcrelib/pcre_xclass.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libutil_la-pcre_xclass.Tpo $(DEPDIR)/libutil_la-pcre_xclass.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcrelib/pcre_xclass.c' object='libutil_la-pcre_xclass.lo' libtool=yes @AMDEPBACKSLASH@
@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-pcre_xclass.lo `test -f 'pcrelib/pcre_xclass.c' || echo '$(srcdir)/'`pcrelib/pcre_xclass.c
+ 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-pcre_xclass.lo `test -f 'pcrelib/pcre_xclass.c' || echo '$(srcdir)/'`pcrelib/pcre_xclass.c
mostlyclean-libtool:
-rm -f *.lo
@@ -1068,49 +1079,45 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- set x; \
+ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
+ $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1131,17 +1138,13 @@ distdir: $(DISTFILES)
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 {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -1171,7 +1174,6 @@ clean-generic:
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"
@@ -1194,8 +1196,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -1204,28 +1204,18 @@ install-data-am:
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
@@ -1248,7 +1238,7 @@ ps-am:
uninstall-am:
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -1266,7 +1256,6 @@ uninstall-am:
getdate.c: getdate.y
@$(GEN) $(YACC) -o getdate.c $(top_srcdir)/libsrc/util/getdate.y
-
# 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/libsrc/util/buildarg.c b/libsrc/util/buildarg.c
index f4e976c..3cd6c5c 100644
--- a/libsrc/util/buildarg.c
+++ b/libsrc/util/buildarg.c
@@ -1,14 +1,14 @@
/*
* buildarg.c
*
- * $Id: buildarg.c,v 1.2 2006/04/18 19:49:56 source Exp $
+ * $Id$
*
* Parse a string into argv[], argc
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/cfg2.c b/libsrc/util/cfg2.c
index eb448d9..0f3f082 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Configuration Management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/cslentry.c b/libsrc/util/cslentry.c
index 156907d..b816407 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Return an entry from a comma seperated list
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/csllkup.c b/libsrc/util/csllkup.c
index c8cdf5c..1580967 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Find an entry in a comma separated list
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/cslnment.c b/libsrc/util/cslnment.c
index 7b7dd49..5810f6e 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Return # entries in comma seperated list
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/dbgmal.c b/libsrc/util/dbgmal.c
index 0f74893..6f0c47d 100644
--- a/libsrc/util/dbgmal.c
+++ b/libsrc/util/dbgmal.c
@@ -1,14 +1,14 @@
/*
* dbgmal.c
*
- * $Id: dbgmal.c,v 1.4 2008/11/25 12:35:44 source Exp $
+ * $Id$
*
* Debugging malloc package
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/dbgmal.h b/libsrc/util/dbgmal.h
index 460c0f7..dbe364b 100644
--- a/libsrc/util/dbgmal.h
+++ b/libsrc/util/dbgmal.h
@@ -1,14 +1,14 @@
/*
* dbgmal.h
*
- * $Id: dbgmal.h,v 1.4 2008/11/25 12:35:44 source Exp $
+ * $Id$
*
* Debugging malloc package
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/debug.c b/libsrc/util/debug.c
index 36b72b9..e5d2d83 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Code for debugging
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/dyntab.c b/libsrc/util/dyntab.c
index 102a32d..6febcc6 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Dynamic Tables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/dyntab.h b/libsrc/util/dyntab.h
index fbde14e..e041c2a 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Dynamic Tables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/expandav.c b/libsrc/util/expandav.c
index 8adfc5c..a91ad40 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Commandline expansion
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/fnqual.c b/libsrc/util/fnqual.c
index 7f37f4d..d9b931d 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Filename qualification
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/fnsearch.c b/libsrc/util/fnsearch.c
index f64b336..62f566e 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Search a file in a search path
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/fntodos.c b/libsrc/util/fntodos.c
index eeb2ab0..ef38284 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Convert unix filenames to dos filenames
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/fnundos.c b/libsrc/util/fnundos.c
index 22d9bc9..e835633 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Convert dos filenames to unix filenames
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/getdate.c b/libsrc/util/getdate.c
index 729fd76..8326efe 100644
--- a/libsrc/util/getdate.c
+++ b/libsrc/util/getdate.c
@@ -303,7 +303,7 @@ typedef union YYSTYPE
int Number;
enum _MERIDIAN Meridian;
}
-/* Line 187 of yacc.c. */
+/* Line 193 of yacc.c. */
#line 308 "getdate.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -367,7 +367,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -826,7 +826,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
diff --git a/libsrc/util/getdate.h b/libsrc/util/getdate.h
index c80df88..583c081 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/gettimeofday.c b/libsrc/util/gettimeofday.c
index c047699..5bfd668 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* gettimeofday emulation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/itypes.h b/libsrc/util/itypes.h
index 89b9b42..1105136 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/listmac.h b/libsrc/util/listmac.h
index 6685f48..b17fd34 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* List macros
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/login_digest.c b/libsrc/util/login_digest.c
index 298ea52..df4d236 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.1 2010/01/29 02:02:54 source Exp $
+ * $Id$
*
* login digest calculator
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/logmsg.c b/libsrc/util/logmsg.c
index d408b5b..8e00519 100644
--- a/libsrc/util/logmsg.c
+++ b/libsrc/util/logmsg.c
@@ -1,14 +1,14 @@
/*
* logmsg.c
*
- * $Id: logmsg.c,v 1.5 2007/09/26 15:25:02 source Exp $
+ * $Id$
*
* Logfile routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -671,7 +671,10 @@ 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)
- return NULL;
+ {
+ fclose (fp);
+ return NULL;
+ }
log->user_data = fp;
diff --git a/libsrc/util/logmsg.h b/libsrc/util/logmsg.h
index 2ffc6e4..df4f068 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Alternate logging module
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/ltrim.c b/libsrc/util/ltrim.c
index 35a1b56..0d19a22 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/make_env.c b/libsrc/util/make_env.c
index e4f6e3f..211dd77 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Add a variable to the environment
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/md5.h b/libsrc/util/md5.h
index 1ec0f70..515e4ba 100644
--- a/libsrc/util/md5.h
+++ b/libsrc/util/md5.h
@@ -1,10 +1,10 @@
/*
- * $Id: md5.h,v 1.1.1.1.2.1 2010/01/29 02:02:54 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2010 OpenLink Software
+ * 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
diff --git a/libsrc/util/mpl.c b/libsrc/util/mpl.c
index f6d617f..7beecc8 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/mpl.h b/libsrc/util/mpl.h
index 0b08d8d..ce5d865 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/ncfg.c b/libsrc/util/ncfg.c
index 5286be2..206fc23 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.1 2010/01/29 02:02:54 source Exp $
+ * $Id$
*
* New Configuration File Management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/ncfg.h b/libsrc/util/ncfg.h
index 6fdaaf7..6cea51c 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* New Configuration File Management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/ntapp.c b/libsrc/util/ntapp.c
index e2589d6..e0baf49 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/oplthr.h b/libsrc/util/oplthr.h
index fbae650..aae7816 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Macros for locking & multihreading
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/regerror.c b/libsrc/util/regerror.c
index c077b83..390402b 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/regexp.c b/libsrc/util/regexp.c
index 157e82c..c4c8c42 100644
--- a/libsrc/util/regexp.c
+++ b/libsrc/util/regexp.c
@@ -239,7 +239,10 @@ regcomp (const char *exp)
regcode = r->program;
regc (MAGIC);
if (reg (0, &flags) == NULL)
- return (NULL);
+ {
+ free (r);
+ 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 564b13b..a45bb1f 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/regmagic.h b/libsrc/util/regmagic.h
index 9c84185..665dd07 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/rtrim.c b/libsrc/util/rtrim.c
index 3efd496..4d02ca4 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/setext.c b/libsrc/util/setext.c
index 58f2bee..d7c0295 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/setext.h b/libsrc/util/setext.h
index 49f4c4f..80cd8f5 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/sslengine.c b/libsrc/util/sslengine.c
new file mode 100644
index 0000000..a0833fa
--- /dev/null
+++ b/libsrc/util/sslengine.c
@@ -0,0 +1,89 @@
+/*
+ * sslengine.c
+ *
+ * $Id$
+ *
+ * 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
new file mode 100644
index 0000000..ea0cb8b
--- /dev/null
+++ b/libsrc/util/sslengine.h
@@ -0,0 +1,38 @@
+/*
+ * sslengine.c
+ *
+ * $Id$
+ *
+ * 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 36673a0..b48d22f 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Provides default program initialization
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -251,6 +251,8 @@ 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)
@@ -313,6 +315,8 @@ 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 2608146..79daf29 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Includes for startup.c
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/stpcpy.c b/libsrc/util/stpcpy.c
index 80b835f..dae62c9 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Like strcpy, but returns a ptr to \0
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strcpyin.c b/libsrc/util/strcpyin.c
index 72d97a7..1cf1fc2 100644
--- a/libsrc/util/strcpyin.c
+++ b/libsrc/util/strcpyin.c
@@ -1,12 +1,12 @@
/*
* strcpyin.c
*
- * $Id: strcpyin.c,v 1.2 2006/04/18 19:49:56 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strerror.c b/libsrc/util/strerror.c
index 553ed3e..d91edac 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Return error string
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strfuns.h b/libsrc/util/strfuns.h
index 41ecf54..46bdc9b 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/stricmp.c b/libsrc/util/stricmp.c
index 69b3eec..8a3849c 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strindex.c b/libsrc/util/strindex.c
index 532c352..82b1ba0 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strinsrt.c b/libsrc/util/strinsrt.c
index 6a3ff85..6c247eb 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strlwr.c b/libsrc/util/strlwr.c
index ec201cb..bdea572 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strnicmp.c b/libsrc/util/strnicmp.c
index 1d0db76..eda2f0d 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strquote.c b/libsrc/util/strquote.c
index 75ecd3d..3532ea1 100644
--- a/libsrc/util/strquote.c
+++ b/libsrc/util/strquote.c
@@ -1,7 +1,7 @@
/*
* strquote.c
*
- * $Id: strquote.c,v 1.2 2006/04/18 19:49:56 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strupr.c b/libsrc/util/strupr.c
index c02ccc1..1dcf922 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/strxpect.c b/libsrc/util/strxpect.c
index b726075..f9d3fb2 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/terminat.c b/libsrc/util/terminat.c
index 4593788..8174305 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/usage.c b/libsrc/util/usage.c
index 9a9c02c..af4778c 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* Stub for startup.c
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/utalloc.h b/libsrc/util/utalloc.h
index 6e0d093..7c254ee 100644
--- a/libsrc/util/utalloc.h
+++ b/libsrc/util/utalloc.h
@@ -1,12 +1,12 @@
/*
* utalloc.h
*
- * $Id: utalloc.h,v 1.2 2006/04/18 19:49:56 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/utf8funs.h b/libsrc/util/utf8funs.h
index ff534d6..ceec769 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
@@ -45,6 +45,7 @@ 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
new file mode 100644
index 0000000..db66589
--- /dev/null
+++ b/libsrc/util/virt_mbrlen.c
@@ -0,0 +1,109 @@
+/*
+ * virt_mbrlen.c
+ *
+ * Platform-intependent clone of mbrlen - determine number of bytes in next multibyte character
+ *
+ * $Id$
+ *
+ * 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 c6ebb31..9002034 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/virt_mbsnrtowcs.c b/libsrc/util/virt_mbsnrtowcs.c
index d0f90b8..f485b70 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/virt_wcrtomb.c b/libsrc/util/virt_wcrtomb.c
index 9d61385..e936213 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/virt_wcs_mask.c b/libsrc/util/virt_wcs_mask.c
index 29238ee..6ddc74c 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/virt_wcsnrtombs.c b/libsrc/util/virt_wcsnrtombs.c
index d5b92e7..1237253 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/wcslen.c b/libsrc/util/wcslen.c
index 5717bac..470d6b8 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 2006/04/11 17:56:16 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/win32/ptrlong.h b/libsrc/util/win32/ptrlong.h
index 77e7b3c..8249e0c 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-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/win32/syslog.c b/libsrc/util/win32/syslog.c
index f169ccc..801054e 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 2006/04/13 18:48:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/libsrc/util/win32/syslog.h b/libsrc/util/win32/syslog.h
index 2709e05..6587d9d 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 2006/04/13 18:48:10 source Exp $
+ * $Id$
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2006 OpenLink Software
+ * 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
diff --git a/win32/ab_vad.vcproj b/win32/ab_vad.vcproj
deleted file mode 100644
index c883103..0000000
--- a/win32/ab_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 7181ae1..0000000
--- a/win32/blobs.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index 16d022b..0000000
--- a/win32/blog_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index bbf73cb..0000000
--- a/win32/bookmark_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index cbe9868..0000000
--- a/win32/bpel_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index f972f0b..0000000
--- a/win32/briefcase_vad.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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
deleted file mode 100644
index 7cecbe0..0000000
--- a/win32/burstoff.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index 00e6c1e..0000000
--- a/win32/calendar_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index b12cbd5..0000000
--- a/win32/community_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 26c5168..0000000
--- a/win32/conductor_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 444f9a9..0000000
--- a/win32/creolewiki.vcproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?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
deleted file mode 100644
index a2d4d21..0000000
--- a/win32/cursor.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index a5f9685..0000000
--- a/win32/cutter.vcproj
+++ /dev/null
@@ -1,221 +0,0 @@
-<?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
deleted file mode 100644
index b491099..0000000
--- a/win32/demodb.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 10c97ec..0000000
--- a/win32/dk1t.vcproj
+++ /dev/null
@@ -1,274 +0,0 @@
-<?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
deleted file mode 100644
index cdc6d81..0000000
--- a/win32/dksrv.vcproj
+++ /dev/null
@@ -1,343 +0,0 @@
-<?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
deleted file mode 100644
index 6910133..0000000
--- a/win32/doc_vad.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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
deleted file mode 100644
index 2890130..0000000
--- a/win32/feeds_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 0864d85..0000000
--- a/win32/gallery_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 182f9a3..0000000
--- a/win32/getdata.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index 912d701..0000000
--- a/win32/hosting_perl.vcproj
+++ /dev/null
@@ -1,276 +0,0 @@
-<?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
deleted file mode 100644
index fccc61c..0000000
--- a/win32/hosting_php.vcproj
+++ /dev/null
@@ -1,244 +0,0 @@
-<?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
deleted file mode 100644
index 0859afb..0000000
--- a/win32/hosting_python.vcproj
+++ /dev/null
@@ -1,276 +0,0 @@
-<?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
deleted file mode 100644
index 5b5f3a0..0000000
--- a/win32/hslookup.vcproj
+++ /dev/null
@@ -1,250 +0,0 @@
-<?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
deleted file mode 100644
index 389a89c..0000000
--- a/win32/im.vcproj
+++ /dev/null
@@ -1,251 +0,0 @@
-<?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
deleted file mode 100644
index 20d529d..0000000
--- a/win32/ins.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index 092881c..0000000
--- a/win32/isparql_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 5bc78c9..0000000
--- a/win32/isql.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index d980674..0000000
--- a/win32/isql_native.vcproj
+++ /dev/null
@@ -1,240 +0,0 @@
-<?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
deleted file mode 100644
index c811e43..0000000
--- a/win32/libvirtuoso_odbc_t.vcproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?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
deleted file mode 100644
index 9998a42..0000000
--- a/win32/mail_vad.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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
deleted file mode 100644
index 5f97225..0000000
--- a/win32/maildrop.vcproj
+++ /dev/null
@@ -1,304 +0,0 @@
-<?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
deleted file mode 100644
index a31453e..0000000
--- a/win32/mediawiki.vcproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?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
deleted file mode 100644
index 2ef8da0..0000000
--- a/win32/mkperlenv.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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
deleted file mode 100644
index 501fd71..0000000
--- a/win32/mkpythonenv.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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
deleted file mode 100644
index d2bbf0a..0000000
--- a/win32/nntpf_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 22e96d1..0000000
--- a/win32/odbcmail.vcproj
+++ /dev/null
@@ -1,245 +0,0 @@
-<?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
deleted file mode 100644
index a70ce8c..0000000
--- a/win32/ods_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index ad835ce..0000000
--- a/win32/polls_vad.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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
deleted file mode 100644
index e31a71e..0000000
--- a/win32/rdf_mappers.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 99b1713..0000000
--- a/win32/scroll.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index 2419b02..0000000
--- a/win32/setcurs.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index e02f05b..0000000
--- a/win32/sparql_demo_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 1efa355..0000000
--- a/win32/sqlcode.bat
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index c56c1e9..0000000
--- a/win32/threads.vcproj
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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
deleted file mode 100644
index e9a1971..0000000
--- a/win32/threadw.vcproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?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
deleted file mode 100644
index 220f8e6..0000000
--- a/win32/tidy.vcproj
+++ /dev/null
@@ -1,248 +0,0 @@
-<?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
deleted file mode 100644
index da994a0..0000000
--- a/win32/tpcc.vcproj
+++ /dev/null
@@ -1,251 +0,0 @@
-<?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
deleted file mode 100644
index 3f63bf3..0000000
--- a/win32/tutorial_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 334ae51..0000000
--- a/win32/urlsimu.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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
deleted file mode 100644
index c16fc90..0000000
--- a/win32/util.vcproj
+++ /dev/null
@@ -1,631 +0,0 @@
-<?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
deleted file mode 100644
index 7410dd7..0000000
--- a/win32/virtodbc.vcproj
+++ /dev/null
@@ -1,342 +0,0 @@
-<?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
deleted file mode 100644
index 0428c52..0000000
--- a/win32/virtoledb.vcproj
+++ /dev/null
@@ -1,536 +0,0 @@
-<?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
deleted file mode 100644
index 7478643..0000000
--- a/win32/virtuoso-opensource.sln
+++ /dev/null
@@ -1,607 +0,0 @@
-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
deleted file mode 100644
index 8fed7c2..0000000
--- a/win32/virtuoso_odbc_clr_t.vcproj
+++ /dev/null
@@ -1,312 +0,0 @@
-<?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
deleted file mode 100644
index e97a780..0000000
--- a/win32/virtuoso_odbc_javavm_t.vcproj
+++ /dev/null
@@ -1,301 +0,0 @@
-<?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
deleted file mode 100644
index 85e2c37..0000000
--- a/win32/virtuoso_odbc_sample_t.vcproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?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
deleted file mode 100644
index fb41750..0000000
--- a/win32/virtuoso_odbc_t.vcproj
+++ /dev/null
@@ -1,259 +0,0 @@
-<?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
deleted file mode 100644
index 5b35679..0000000
--- a/win32/wbxml2.vcproj
+++ /dev/null
@@ -1,251 +0,0 @@
-<?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
deleted file mode 100644
index 24fecfa..0000000
--- a/win32/wi.vcproj
+++ /dev/null
@@ -1,1792 +0,0 @@
-<?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
deleted file mode 100644
index 6af1d08..0000000
--- a/win32/wic.vcproj
+++ /dev/null
@@ -1,267 +0,0 @@
-<?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
deleted file mode 100644
index a210a78..0000000
--- a/win32/wiki_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index a28e44a..0000000
--- a/win32/wikiv.vcproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?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
deleted file mode 100644
index ce536f9..0000000
--- a/win32/xml.vcproj
+++ /dev/null
@@ -1,283 +0,0 @@
-<?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
deleted file mode 100644
index 6190f12..0000000
--- a/win32/zlib.vcproj
+++ /dev/null
@@ -1,242 +0,0 @@
-<?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
deleted file mode 100644
index b05f1ca..0000000
--- a/win64/blobs.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index ecd391b..0000000
--- a/win64/blog_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index fde6f65..0000000
--- a/win64/bookmark_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 4f8a71d..0000000
--- a/win64/bpel_vad.vcproj
+++ /dev/null
@@ -1,323 +0,0 @@
-<?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
deleted file mode 100644
index 76399a0..0000000
--- a/win64/briefcase_vad.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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
deleted file mode 100644
index e78e75a..0000000
--- a/win64/burstoff.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index 0af624b..0000000
--- a/win64/community_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index dcb3d73..0000000
--- a/win64/conductor_vad.vcproj
+++ /dev/null
@@ -1,321 +0,0 @@
-<?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
deleted file mode 100644
index 5b33a93..0000000
--- a/win64/cursor.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index 30c00af..0000000
--- a/win64/cutter.vcproj
+++ /dev/null
@@ -1,400 +0,0 @@
-<?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
deleted file mode 100644
index 8909889..0000000
--- a/win64/demodb.vcproj
+++ /dev/null
@@ -1,323 +0,0 @@
-<?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
deleted file mode 100644
index 78ddae4..0000000
--- a/win64/dk1t.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index f482554..0000000
--- a/win64/dksrv.vcproj
+++ /dev/null
@@ -1,493 +0,0 @@
-<?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
deleted file mode 100644
index e58f3cb..0000000
--- a/win64/doc_vad.vcproj
+++ /dev/null
@@ -1,321 +0,0 @@
-<?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
deleted file mode 100644
index 5374c9b..0000000
--- a/win64/feeds_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index c6ba6dd..0000000
--- a/win64/gallery_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 07a2f87..0000000
--- a/win64/getdata.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index b3c1394..0000000
--- a/win64/hosting_perl.vcproj
+++ /dev/null
@@ -1,490 +0,0 @@
-<?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
deleted file mode 100644
index 2e53634..0000000
--- a/win64/hosting_php.vcproj
+++ /dev/null
@@ -1,450 +0,0 @@
-<?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
deleted file mode 100644
index cd1eb59..0000000
--- a/win64/hosting_python.vcproj
+++ /dev/null
@@ -1,490 +0,0 @@
-<?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
deleted file mode 100644
index 7a29637..0000000
--- a/win64/im.vcproj
+++ /dev/null
@@ -1,441 +0,0 @@
-<?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
deleted file mode 100644
index f52cfa7..0000000
--- a/win64/ins.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index a43cf2b..0000000
--- a/win64/isparql_vad.vcproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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
deleted file mode 100644
index 5bc30a0..0000000
--- a/win64/isql.vcproj
+++ /dev/null
@@ -1,423 +0,0 @@
-<?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
deleted file mode 100644
index d7064c0..0000000
--- a/win64/isql_native.vcproj
+++ /dev/null
@@ -1,424 +0,0 @@
-<?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
deleted file mode 100644
index f815ee9..0000000
--- a/win64/libvirtuoso_odbc_t.vcproj
+++ /dev/null
@@ -1,405 +0,0 @@
-<?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
deleted file mode 100644
index 14c8858..0000000
--- a/win64/mail_vad.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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
deleted file mode 100644
index b232b27..0000000
--- a/win64/maildrop.vcproj
+++ /dev/null
@@ -1,487 +0,0 @@
-<?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
deleted file mode 100644
index 94f4a1b..0000000
--- a/win64/mediawiki.vcproj
+++ /dev/null
@@ -1,550 +0,0 @@
-<?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
deleted file mode 100644
index c899efa..0000000
--- a/win64/nntpf_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 2fd4f85..0000000
--- a/win64/odbcmail.vcproj
+++ /dev/null
@@ -1,442 +0,0 @@
-<?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
deleted file mode 100644
index 4e03eab..0000000
--- a/win64/ods_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index 39cb587..0000000
--- a/win64/polls_vad.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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
deleted file mode 100644
index ffff7f7..0000000
--- a/win64/scroll.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index 0df012e..0000000
--- a/win64/setcurs.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index fbdacfd..0000000
--- a/win64/threads.vcproj
+++ /dev/null
@@ -1,359 +0,0 @@
-<?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
deleted file mode 100644
index 692e39d..0000000
--- a/win64/threadw.vcproj
+++ /dev/null
@@ -1,365 +0,0 @@
-<?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
deleted file mode 100644
index cc65d40..0000000
--- a/win64/tidy.vcproj
+++ /dev/null
@@ -1,397 +0,0 @@
-<?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
deleted file mode 100644
index f8c95df..0000000
--- a/win64/tpcc.vcproj
+++ /dev/null
@@ -1,434 +0,0 @@
-<?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
deleted file mode 100644
index 745786c..0000000
--- a/win64/tutorial_vad.vcproj
+++ /dev/null
@@ -1,321 +0,0 @@
-<?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
deleted file mode 100644
index 2518e57..0000000
--- a/win64/urlsimu.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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
deleted file mode 100644
index 08a2784..0000000
--- a/win64/util.vcproj
+++ /dev/null
@@ -1,814 +0,0 @@
-<?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
deleted file mode 100644
index 19c3d01..0000000
--- a/win64/virtodbc.vcproj
+++ /dev/null
@@ -1,534 +0,0 @@
-<?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
deleted file mode 100644
index 4f61221..0000000
--- a/win64/virtoledb.vcproj
+++ /dev/null
@@ -1,727 +0,0 @@
-<?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
deleted file mode 100644
index ae614ea..0000000
--- a/win64/virtuoso-opensource.sln
+++ /dev/null
@@ -1,1132 +0,0 @@
-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
deleted file mode 100644
index 6f005d9..0000000
--- a/win64/virtuoso_odbc_clr_t.vcproj
+++ /dev/null
@@ -1,527 +0,0 @@
-<?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
deleted file mode 100644
index d37cf62..0000000
--- a/win64/virtuoso_odbc_javavm_t.vcproj
+++ /dev/null
@@ -1,525 +0,0 @@
-<?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
deleted file mode 100644
index 7e96e89..0000000
--- a/win64/virtuoso_odbc_sample_t.vcproj
+++ /dev/null
@@ -1,387 +0,0 @@
-<?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
deleted file mode 100644
index 02e2073..0000000
--- a/win64/virtuoso_odbc_t.vcproj
+++ /dev/null
@@ -1,431 +0,0 @@
-<?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
deleted file mode 100644
index 56e6fd2..0000000
--- a/win64/wi.vcproj
+++ /dev/null
@@ -1,2495 +0,0 @@
-<?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
deleted file mode 100644
index 1ef37b2..0000000
--- a/win64/wic.vcproj
+++ /dev/null
@@ -1,417 +0,0 @@
-<?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
deleted file mode 100644
index 5a8b4b6..0000000
--- a/win64/wiki_vad.vcproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
deleted file mode 100644
index b1bb03c..0000000
--- a/win64/wikiv.vcproj
+++ /dev/null
@@ -1,534 +0,0 @@
-<?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
deleted file mode 100644
index 683c6e9..0000000
--- a/win64/xml.vcproj
+++ /dev/null
@@ -1,465 +0,0 @@
-<?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
deleted file mode 100644
index ef2d75d..0000000
--- a/win64/zlib.vcproj
+++ /dev/null
@@ -1,394 +0,0 @@
-<?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
new file mode 100644
index 0000000..a16c5eb
--- /dev/null
+++ b/windows/blobs.vcxproj
@@ -0,0 +1,168 @@
+<?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
new file mode 100644
index 0000000..18d61d5
--- /dev/null
+++ b/windows/burstoff.vcxproj
@@ -0,0 +1,164 @@
+<?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
new file mode 100644
index 0000000..b1f1877
--- /dev/null
+++ b/windows/creolewiki.vcxproj
@@ -0,0 +1,249 @@
+<?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
new file mode 100644
index 0000000..538c0cd
--- /dev/null
+++ b/windows/cursor.vcxproj
@@ -0,0 +1,168 @@
+<?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
new file mode 100644
index 0000000..3191383
--- /dev/null
+++ b/windows/cutter.vcxproj
@@ -0,0 +1,143 @@
+<?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
new file mode 100644
index 0000000..4367d51
--- /dev/null
+++ b/windows/dk1t.vcxproj
@@ -0,0 +1,140 @@
+<?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
new file mode 100644
index 0000000..0c30a3f
--- /dev/null
+++ b/windows/dksrv.vcxproj
@@ -0,0 +1,163 @@
+<?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
new file mode 100644
index 0000000..f8085f1
--- /dev/null
+++ b/windows/getdata.vcxproj
@@ -0,0 +1,168 @@
+<?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
new file mode 100644
index 0000000..eba81f2
--- /dev/null
+++ b/windows/hosting_perl.vcxproj
@@ -0,0 +1,224 @@
+<?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
new file mode 100644
index 0000000..abcc806
--- /dev/null
+++ b/windows/hosting_php.vcxproj
@@ -0,0 +1,181 @@
+<?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
new file mode 100644
index 0000000..564c8ee
--- /dev/null
+++ b/windows/hosting_python.vcxproj
@@ -0,0 +1,224 @@
+<?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
new file mode 100644
index 0000000..1b89f33
--- /dev/null
+++ b/windows/im.vcxproj
@@ -0,0 +1,169 @@
+<?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
new file mode 100644
index 0000000..29cc8cc
--- /dev/null
+++ b/windows/ins.vcxproj
@@ -0,0 +1,168 @@
+<?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
new file mode 100644
index 0000000..8a61c83
--- /dev/null
+++ b/windows/isql.vcxproj
@@ -0,0 +1,169 @@
+<?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
new file mode 100644
index 0000000..95c44af
--- /dev/null
+++ b/windows/isql_native.vcxproj
@@ -0,0 +1,169 @@
+<?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
new file mode 100644
index 0000000..47d0baf
--- /dev/null
+++ b/windows/libvirtuoso_odbc_t.vcxproj
@@ -0,0 +1,160 @@
+<?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
new file mode 100644
index 0000000..d314329
--- /dev/null
+++ b/windows/maildrop.vcxproj
@@ -0,0 +1,181 @@
+<?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
new file mode 100644
index 0000000..68fdee1
--- /dev/null
+++ b/windows/mediawiki.vcxproj
@@ -0,0 +1,255 @@
+<?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
new file mode 100644
index 0000000..f477789
--- /dev/null
+++ b/windows/odbcmail.vcxproj
@@ -0,0 +1,170 @@
+<?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
new file mode 100644
index 0000000..69327a4
--- /dev/null
+++ b/windows/scroll.vcxproj
@@ -0,0 +1,168 @@
+<?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
new file mode 100644
index 0000000..c3206b0
--- /dev/null
+++ b/windows/setcurs.vcxproj
@@ -0,0 +1,168 @@
+<?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
new file mode 100644
index 0000000..2037645
--- /dev/null
+++ b/windows/sqlcode.bat
@@ -0,0 +1,62 @@
+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
new file mode 100644
index 0000000..c312c74
--- /dev/null
+++ b/windows/threads.vcxproj
@@ -0,0 +1,127 @@
+<?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
new file mode 100644
index 0000000..0d73e7b
--- /dev/null
+++ b/windows/threadw.vcxproj
@@ -0,0 +1,127 @@
+<?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
new file mode 100644
index 0000000..1aeb0fa
--- /dev/null
+++ b/windows/tidy.vcxproj
@@ -0,0 +1,137 @@
+<?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
new file mode 100644
index 0000000..b4ac393
--- /dev/null
+++ b/windows/tpcc.vcxproj
@@ -0,0 +1,173 @@
+<?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
new file mode 100644
index 0000000..237f0bb
--- /dev/null
+++ b/windows/urlsimu.vcxproj
@@ -0,0 +1,168 @@
+<?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
new file mode 100644
index 0000000..e032f08
--- /dev/null
+++ b/windows/util.vcxproj
@@ -0,0 +1,269 @@
+<?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
new file mode 100644
index 0000000..7e61b88
--- /dev/null
+++ b/windows/virtodbc.vcxproj
@@ -0,0 +1,211 @@
+<?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
new file mode 100644
index 0000000..a9de723
--- /dev/null
+++ b/windows/virtoledb.vcxproj
@@ -0,0 +1,254 @@
+<?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
new file mode 100644
index 0000000..51630c6
--- /dev/null
+++ b/windows/virtuoso-opensource.sln
@@ -0,0 +1,552 @@
+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
new file mode 100644
index 0000000..8016d14
--- /dev/null
+++ b/windows/virtuoso_odbc_clr_t.vcxproj
@@ -0,0 +1,288 @@
+<?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
new file mode 100644
index 0000000..5a67453
--- /dev/null
+++ b/windows/virtuoso_odbc_javavm_t.vcxproj
@@ -0,0 +1,293 @@
+<?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
new file mode 100644
index 0000000..cf422f2
--- /dev/null
+++ b/windows/virtuoso_odbc_sample_t.vcxproj
@@ -0,0 +1,139 @@
+<?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
new file mode 100644
index 0000000..5336b94
--- /dev/null
+++ b/windows/virtuoso_odbc_t.vcxproj
@@ -0,0 +1,183 @@
+<?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
new file mode 100644
index 0000000..2a91561
--- /dev/null
+++ b/windows/wbxml2.vcxproj
@@ -0,0 +1,163 @@
+<?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
new file mode 100644
index 0000000..a6b26cf
--- /dev/null
+++ b/windows/wi.vcxproj
@@ -0,0 +1,1080 @@
+<?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
new file mode 100644
index 0000000..83d9a8d
--- /dev/null
+++ b/windows/wic.vcxproj
@@ -0,0 +1,142 @@
+<?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
new file mode 100644
index 0000000..0aab809
--- /dev/null
+++ b/windows/wikiv.vcxproj
@@ -0,0 +1,258 @@
+<?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
new file mode 100644
index 0000000..432887b
--- /dev/null
+++ b/windows/xml.vcxproj
@@ -0,0 +1,164 @@
+<?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
new file mode 100644
index 0000000..7310240
--- /dev/null
+++ b/windows/zlib.vcxproj
@@ -0,0 +1,140 @@
+<?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